diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 23365feffb7..792dacd8032 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -46,6 +46,8 @@
 - This PR fixes or closes issue: fixes #
 - This PR is related to issue: 
 - Link to documentation pull request: 
+- Link to developer documentation pull request: 
+- Link to frontend pull request: 
 
 ## Checklist
 <!--
diff --git a/.github/assets/screenshot-integrations.png b/.github/assets/screenshot-integrations.png
index 8d71bf538d6..abbc0f76ff0 100644
Binary files a/.github/assets/screenshot-integrations.png and b/.github/assets/screenshot-integrations.png differ
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
new file mode 100644
index 00000000000..06499d62b9e
--- /dev/null
+++ b/.github/copilot-instructions.md
@@ -0,0 +1,100 @@
+# Instructions for GitHub Copilot
+
+This repository holds the core of Home Assistant, a Python 3 based home
+automation application.
+
+- Python code must be compatible with Python 3.13
+- Use the newest Python language features if possible:
+  - Pattern matching
+  - Type hints
+  - f-strings for string formatting over `%` or `.format()`
+  - Dataclasses
+  - Walrus operator
+- Code quality tools:
+  - Formatting: Ruff
+  - Linting: PyLint and Ruff
+  - Type checking: MyPy
+  - Testing: pytest with plain functions and fixtures
+- Inline code documentation:
+  - File headers should be short and concise:
+    ```python
+    """Integration for Peblar EV chargers."""
+    ```
+  - Every method and function needs a docstring:
+    ```python
+    async def async_setup_entry(hass: HomeAssistant, entry: PeblarConfigEntry) -> bool:
+        """Set up Peblar from a config entry."""
+        ...
+    ```
+- All code and comments and other text are written in American English
+- Follow existing code style patterns as much as possible
+- Core locations:
+  - Shared constants: `homeassistant/const.py`, use them instead of hardcoding
+    strings or creating duplicate integration constants.
+  - Integration files:
+    - Constants: `homeassistant/components/{domain}/const.py`
+    - Models: `homeassistant/components/{domain}/models.py`
+    - Coordinator: `homeassistant/components/{domain}/coordinator.py`
+    - Config flow: `homeassistant/components/{domain}/config_flow.py`
+    - Platform code: `homeassistant/components/{domain}/{platform}.py`
+- All external I/O operations must be async
+- Async patterns:
+  - Avoid sleeping in loops
+  - Avoid awaiting in loops, gather instead
+  - No blocking calls
+- Polling:
+  - Follow update coordinator pattern, when possible
+  - Polling interval may not be configurable by the user
+  - For local network polling, the minimum interval is 5 seconds
+  - For cloud polling, the minimum interval is 60 seconds
+- Error handling:
+  - Use specific exceptions from `homeassistant.exceptions`
+  - Setup failures:
+    - Temporary: Raise `ConfigEntryNotReady`
+    - Permanent: Use `ConfigEntryError`
+- Logging:
+  - Message format:
+    - No periods at end
+    - No integration names or domains (added automatically)
+    - No sensitive data (keys, tokens, passwords), even when those are incorrect.
+  - Be very restrictive on the use of logging info messages, use debug for
+    anything which is not targeting the user.
+  - Use lazy logging (no f-strings):
+    ```python
+    _LOGGER.debug("This is a log message with %s", variable)
+    ```
+- Entities:
+  - Ensure unique IDs for state persistence:
+    - Unique IDs should not contain values that are subject to user or network change.
+    - An ID needs to be unique per platform, not per integration.
+    - The ID does not have to contain the integration domain or platform.
+    - Acceptable examples:
+      - Serial number of a device
+      - MAC address of a device formatted using `homeassistant.helpers.device_registry.format_mac`
+        Do not obtain the MAC address through arp cache of local network access,
+        only use the MAC address provided by discovery or the device itself.
+      - Unique identifier that is physically printed on the device or burned into an EEPROM
+    - Not acceptable examples:
+      - IP Address
+      - Device name
+      - Hostname
+      - URL
+      - Email address
+      - Username
+    - For entities that are setup by a config entry, the config entry ID
+      can be used as a last resort if no other Unique ID is available.
+      For example: `f"{entry.entry_id}-battery"`
+  - If the state value is unknown, use `None`
+  - Do not use the `unavailable` string as a state value,
+    implement the `available()` property method instead
+  - Do not use the `unknown` string as a state value, use `None` instead
+- Extra entity state attributes:
+  - The keys of all state attributes should always be present
+  - If the value is unknown, use `None`
+  - Provide descriptive state attributes
+- Testing:
+  - Test location: `tests/components/{domain}/`
+  - Use pytest fixtures from `tests.common`
+  - Mock external dependencies
+  - Use snapshots for complex data
+  - Follow existing test patterns
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 5b1cf48df68..ce89d8c2b10 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -32,7 +32,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -69,7 +69,7 @@ jobs:
         run: find ./homeassistant/components/*/translations -name "*.json" | tar zcvf translations.tar.gz -T -
 
       - name: Upload translations
-        uses: actions/upload-artifact@v4.6.0
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: translations
           path: translations.tar.gz
@@ -94,7 +94,7 @@ jobs:
 
       - name: Download nightly wheels of frontend
         if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@v8
+        uses: dawidd6/action-download-artifact@v9
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           repo: home-assistant/frontend
@@ -105,7 +105,7 @@ jobs:
 
       - name: Download nightly wheels of intents
         if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@v8
+        uses: dawidd6/action-download-artifact@v9
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           repo: home-assistant/intents-package
@@ -116,7 +116,7 @@ jobs:
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         if: needs.init.outputs.channel == 'dev'
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -175,7 +175,7 @@ jobs:
           sed -i "s|pykrakenapi|# pykrakenapi|g" requirements_all.txt
 
       - name: Download translations
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.2.1
         with:
           name: translations
 
@@ -190,14 +190,14 @@ jobs:
           echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > rootfs/OFFICIAL_IMAGE
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.4.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2024.08.2
+        uses: home-assistant/builder@2025.03.0
         with:
           args: |
             $BUILD_ARGS \
@@ -256,14 +256,14 @@ jobs:
           fi
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.4.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2024.08.2
+        uses: home-assistant/builder@2025.03.0
         with:
           args: |
             $BUILD_ARGS \
@@ -324,20 +324,20 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Install Cosign
-        uses: sigstore/cosign-installer@v3.7.0
+        uses: sigstore/cosign-installer@v3.8.1
         with:
           cosign-release: "v2.2.3"
 
       - name: Login to DockerHub
         if: matrix.registry == 'docker.io/homeassistant'
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.4.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
         if: matrix.registry == 'ghcr.io/home-assistant'
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.4.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -448,18 +448,21 @@ jobs:
     environment: ${{ needs.init.outputs.channel }}
     needs: ["init", "build_base"]
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
     if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v4.2.2
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
       - name: Download translations
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.2.1
         with:
           name: translations
 
@@ -473,16 +476,13 @@ jobs:
         run: |
           # Remove dist, build, and homeassistant.egg-info
           # when build locally for testing!
-          pip install twine build
+          pip install build
           python -m build
 
-      - name: Upload package
-        shell: bash
-        run: |
-          export TWINE_USERNAME="__token__"
-          export TWINE_PASSWORD="${{ secrets.TWINE_TOKEN }}"
-
-          twine upload dist/* --skip-existing
+      - name: Upload package to PyPI
+        uses: pypa/gh-action-pypi-publish@v1.12.4
+        with:
+          skip-existing: true
 
   hassfest-image:
     name: Build and test hassfest image
@@ -502,14 +502,14 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0
+        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
         with:
           context: . # So action will not pull the repository again
           file: ./script/hassfest/docker/Dockerfile
@@ -522,7 +522,7 @@ jobs:
       - name: Push Docker image
         if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
         id: push
-        uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0
+        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
         with:
           context: . # So action will not pull the repository again
           file: ./script/hassfest/docker/Dockerfile
@@ -531,7 +531,7 @@ jobs:
 
       - name: Generate artifact attestation
         if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
-        uses: actions/attest-build-provenance@520d128f165991a6c774bcb264f323e3d70747f4 # v2.2.0
+        uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
         with:
           subject-name: ${{ env.HASSFEST_IMAGE_NAME }}
           subject-digest: ${{ steps.push.outputs.digest }}
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 6527a09e15f..a843133f1a5 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -37,10 +37,10 @@ on:
         type: boolean
 
 env:
-  CACHE_VERSION: 11
+  CACHE_VERSION: 12
   UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 9
-  HA_SHORT_VERSION: "2025.2"
+  HA_SHORT_VERSION: "2025.5"
   DEFAULT_PYTHON: "3.13"
   ALL_PYTHON_VERSIONS: "['3.13']"
   # 10.3 is the oldest supported version
@@ -89,6 +89,7 @@ jobs:
       test_groups: ${{ steps.info.outputs.test_groups }}
       tests_glob: ${{ steps.info.outputs.tests_glob }}
       tests: ${{ steps.info.outputs.tests }}
+      lint_only: ${{ steps.info.outputs.lint_only }}
       skip_coverage: ${{ steps.info.outputs.skip_coverage }}
     runs-on: ubuntu-24.04
     steps:
@@ -142,6 +143,7 @@ jobs:
           test_group_count=10
           tests="[]"
           tests_glob=""
+          lint_only=""
           skip_coverage=""
 
           if [[ "${{ steps.integrations.outputs.changes }}" != "[]" ]];
@@ -192,6 +194,17 @@ jobs:
             test_full_suite="true"
           fi
 
+          if [[ "${{ github.event.inputs.lint-only }}" == "true" ]] \
+            || [[ "${{ github.event.inputs.pylint-only }}" == "true" ]] \
+            || [[ "${{ github.event.inputs.mypy-only }}" == "true" ]] \
+            || [[ "${{ github.event.inputs.audit-licenses-only }}" == "true" ]] \
+            || [[ "${{ github.event_name }}" == "push" \
+              && "${{ github.event.repository.full_name }}" != "home-assistant/core" ]];
+          then
+            lint_only="true"
+            skip_coverage="true"
+          fi
+
           if [[ "${{ github.event.inputs.skip-coverage }}" == "true" ]] \
             || [[ "${{ contains(github.event.pull_request.labels.*.name, 'ci-skip-coverage') }}" == "true" ]];
           then
@@ -217,6 +230,8 @@ jobs:
           echo "tests=${tests}" >> $GITHUB_OUTPUT
           echo "tests_glob: ${tests_glob}"
           echo "tests_glob=${tests_glob}" >> $GITHUB_OUTPUT
+          echo "lint_only": ${lint_only}
+          echo "lint_only=${lint_only}" >> $GITHUB_OUTPUT
           echo "skip_coverage: ${skip_coverage}"
           echo "skip_coverage=${skip_coverage}" >> $GITHUB_OUTPUT
 
@@ -234,13 +249,13 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.2.0
+        uses: actions/cache@v4.2.3
         with:
           path: venv
           key: >-
@@ -256,7 +271,7 @@ jobs:
           uv pip install "$(cat requirements_test.txt | grep pre-commit)"
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v4.2.0
+        uses: actions/cache@v4.2.3
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           lookup-only: true
@@ -279,14 +294,14 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.2.0
+        uses: actions/cache/restore@v4.2.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -295,7 +310,7 @@ jobs:
               needs.info.outputs.pre-commit_cache_key }}
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache/restore@v4.2.0
+        uses: actions/cache/restore@v4.2.3
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
@@ -319,14 +334,14 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.2.0
+        uses: actions/cache/restore@v4.2.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -335,7 +350,7 @@ jobs:
               needs.info.outputs.pre-commit_cache_key }}
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache/restore@v4.2.0
+        uses: actions/cache/restore@v4.2.3
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
@@ -359,14 +374,14 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.2.0
+        uses: actions/cache/restore@v4.2.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -375,7 +390,7 @@ jobs:
               needs.info.outputs.pre-commit_cache_key }}
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache/restore@v4.2.0
+        uses: actions/cache/restore@v4.2.3
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
@@ -469,7 +484,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -482,7 +497,7 @@ jobs:
             env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.2.0
+        uses: actions/cache@v4.2.3
         with:
           path: venv
           key: >-
@@ -490,7 +505,7 @@ jobs:
             needs.info.outputs.python_cache_key }}
       - name: Restore uv wheel cache
         if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: actions/cache@v4.2.0
+        uses: actions/cache@v4.2.3
         with:
           path: ${{ env.UV_CACHE_DIR }}
           key: >-
@@ -537,7 +552,7 @@ jobs:
           python --version
           uv pip freeze >> pip_freeze.txt
       - name: Upload pip_freeze artifact
-        uses: actions/upload-artifact@v4.6.0
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: pip-freeze-${{ matrix.python-version }}
           path: pip_freeze.txt
@@ -572,13 +587,13 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.2.0
+        uses: actions/cache/restore@v4.2.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -605,13 +620,13 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.2.0
+        uses: actions/cache/restore@v4.2.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -623,6 +638,25 @@ jobs:
           . venv/bin/activate
           python -m script.gen_requirements_all validate
 
+  dependency-review:
+    name: Dependency review
+    runs-on: ubuntu-24.04
+    needs:
+      - info
+      - base
+    if: |
+      github.event.inputs.pylint-only != 'true'
+      && github.event.inputs.mypy-only != 'true'
+      && needs.info.outputs.requirements == 'true'
+      && github.event_name == 'pull_request'
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v4.2.2
+      - name: Dependency review
+        uses: actions/dependency-review-action@v4.5.0
+        with:
+          license-check: false # We use our own license audit checks
+
   audit-licenses:
     name: Audit licenses
     runs-on: ubuntu-24.04
@@ -643,13 +677,13 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.2.0
+        uses: actions/cache/restore@v4.2.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -661,7 +695,7 @@ jobs:
           . venv/bin/activate
           python -m script.licenses extract --output-file=licenses-${{ matrix.python-version }}.json
       - name: Upload licenses
-        uses: actions/upload-artifact@v4.6.0
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: licenses-${{ github.run_number }}-${{ matrix.python-version }}
           path: licenses-${{ matrix.python-version }}.json
@@ -686,13 +720,13 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.2.0
+        uses: actions/cache/restore@v4.2.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -733,13 +767,13 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.2.0
+        uses: actions/cache/restore@v4.2.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -778,7 +812,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -791,7 +825,7 @@ jobs:
             env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
       - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.2.0
+        uses: actions/cache/restore@v4.2.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -799,7 +833,7 @@ jobs:
             ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
       - name: Restore mypy cache
-        uses: actions/cache@v4.2.0
+        uses: actions/cache@v4.2.3
         with:
           path: .mypy_cache
           key: >-
@@ -829,11 +863,7 @@ jobs:
   prepare-pytest-full:
     runs-on: ubuntu-24.04
     if: |
-      (github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
-      && github.event.inputs.lint-only != 'true'
-      && github.event.inputs.pylint-only != 'true'
-      && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
+      needs.info.outputs.lint_only != 'true'
       && needs.info.outputs.test_full_suite == 'true'
     needs:
       - info
@@ -859,13 +889,13 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.2.0
+        uses: actions/cache/restore@v4.2.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -877,7 +907,7 @@ jobs:
           . venv/bin/activate
           python -m script.split_tests ${{ needs.info.outputs.test_group_count }} tests
       - name: Upload pytest_buckets
-        uses: actions/upload-artifact@v4.6.0
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: pytest_buckets
           path: pytest_buckets.txt
@@ -886,11 +916,7 @@ jobs:
   pytest-full:
     runs-on: ubuntu-24.04
     if: |
-      (github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
-      && github.event.inputs.lint-only != 'true'
-      && github.event.inputs.pylint-only != 'true'
-      && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
+      needs.info.outputs.lint_only != 'true'
       && needs.info.outputs.test_full_suite == 'true'
     needs:
       - info
@@ -923,13 +949,13 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.2.0
+        uses: actions/cache/restore@v4.2.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -942,7 +968,7 @@ jobs:
         run: |
           echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
       - name: Download pytest_buckets
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.2.1
         with:
           name: pytest_buckets
       - name: Compile English translations
@@ -962,6 +988,7 @@ jobs:
           if [[ "${{ needs.info.outputs.skip_coverage }}" != "true" ]]; then
             cov_params+=(--cov="homeassistant")
             cov_params+=(--cov-report=xml)
+            cov_params+=(--junitxml=junit.xml -o junit_family=legacy)
           fi
 
           echo "Test group ${{ matrix.group }}: $(sed -n "${{ matrix.group }},1p" pytest_buckets.txt)"
@@ -975,22 +1002,29 @@ jobs:
             ${cov_params[@]} \
             -o console_output_style=count \
             -p no:sugar \
+            --exclude-warning-annotations \
             $(sed -n "${{ matrix.group }},1p" pytest_buckets.txt) \
               2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-full.conclusion == 'failure'
-        uses: actions/upload-artifact@v4.6.0
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{ matrix.group }}
           path: pytest-*.txt
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@v4.6.0
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
           path: coverage.xml
           overwrite: true
+      - name: Upload test results artifact
+        if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
+        uses: actions/upload-artifact@v4.6.2
+        with:
+          name: test-results-full-${{ matrix.python-version }}-${{ matrix.group }}
+          path: junit.xml
       - name: Remove pytest_buckets
         run: rm pytest_buckets.txt
       - name: Check dirty
@@ -1008,11 +1042,7 @@ jobs:
           MYSQL_ROOT_PASSWORD: password
         options: --health-cmd="mysqladmin ping -uroot -ppassword" --health-interval=5s --health-timeout=2s --health-retries=3
     if: |
-      (github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
-      && github.event.inputs.lint-only != 'true'
-      && github.event.inputs.pylint-only != 'true'
-      && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
+      needs.info.outputs.lint_only != 'true'
       && needs.info.outputs.mariadb_groups != '[]'
     needs:
       - info
@@ -1044,13 +1074,13 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.2.0
+        uses: actions/cache/restore@v4.2.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -1087,6 +1117,7 @@ jobs:
             cov_params+=(--cov="homeassistant.components.recorder")
             cov_params+=(--cov-report=xml)
             cov_params+=(--cov-report=term-missing)
+            cov_params+=(--junitxml=junit.xml -o junit_family=legacy)
           fi
 
           python3 -b -X dev -m pytest \
@@ -1098,6 +1129,7 @@ jobs:
             -o console_output_style=count \
             --durations=10 \
             -p no:sugar \
+            --exclude-warning-annotations \
             --dburl=mysql://root:password@127.0.0.1/homeassistant-test \
             tests/components/history \
             tests/components/logbook \
@@ -1106,7 +1138,7 @@ jobs:
               2>&1 | tee pytest-${{ matrix.python-version }}-${mariadb}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@v4.6.0
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.mariadb }}
@@ -1114,12 +1146,19 @@ jobs:
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@v4.6.0
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: coverage-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.mariadb }}
           path: coverage.xml
           overwrite: true
+      - name: Upload test results artifact
+        if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
+        uses: actions/upload-artifact@v4.6.2
+        with:
+          name: test-results-mariadb-${{ matrix.python-version }}-${{
+            steps.pytest-partial.outputs.mariadb }}
+          path: junit.xml
       - name: Check dirty
         run: |
           ./script/check_dirty
@@ -1135,11 +1174,7 @@ jobs:
           POSTGRES_PASSWORD: password
         options: --health-cmd="pg_isready -hlocalhost -Upostgres" --health-interval=5s --health-timeout=2s --health-retries=3
     if: |
-      (github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
-      && github.event.inputs.lint-only != 'true'
-      && github.event.inputs.pylint-only != 'true'
-      && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
+      needs.info.outputs.lint_only != 'true'
       && needs.info.outputs.postgresql_groups != '[]'
     needs:
       - info
@@ -1173,13 +1208,13 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.2.0
+        uses: actions/cache/restore@v4.2.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -1216,6 +1251,7 @@ jobs:
             cov_params+=(--cov="homeassistant.components.recorder")
             cov_params+=(--cov-report=xml)
             cov_params+=(--cov-report=term-missing)
+            cov_params+=(--junitxml=junit.xml -o junit_family=legacy)
           fi
 
           python3 -b -X dev -m pytest \
@@ -1228,6 +1264,7 @@ jobs:
             --durations=0 \
             --durations-min=10 \
             -p no:sugar \
+            --exclude-warning-annotations \
             --dburl=postgresql://postgres:password@127.0.0.1/homeassistant-test \
             tests/components/history \
             tests/components/logbook \
@@ -1236,7 +1273,7 @@ jobs:
               2>&1 | tee pytest-${{ matrix.python-version }}-${postgresql}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@v4.6.0
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.postgresql }}
@@ -1244,12 +1281,19 @@ jobs:
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@v4.6.0
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: coverage-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.postgresql }}
           path: coverage.xml
           overwrite: true
+      - name: Upload test results artifact
+        if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
+        uses: actions/upload-artifact@v4.6.2
+        with:
+          name: test-results-postgres-${{ matrix.python-version }}-${{
+            steps.pytest-partial.outputs.postgresql }}
+          path: junit.xml
       - name: Check dirty
         run: |
           ./script/check_dirty
@@ -1268,12 +1312,12 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v4.2.2
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.2.1
         with:
           pattern: coverage-*
       - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'true'
-        uses: codecov/codecov-action@v5.3.0
+        uses: codecov/codecov-action@v5.4.0
         with:
           fail_ci_if_error: true
           flags: full-suite
@@ -1282,11 +1326,7 @@ jobs:
   pytest-partial:
     runs-on: ubuntu-24.04
     if: |
-      (github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
-      && github.event.inputs.lint-only != 'true'
-      && github.event.inputs.pylint-only != 'true'
-      && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
+      needs.info.outputs.lint_only != 'true'
       && needs.info.outputs.tests_glob
       && needs.info.outputs.test_full_suite == 'false'
     needs:
@@ -1319,13 +1359,13 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.2.0
+        uses: actions/cache/restore@v4.2.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -1362,6 +1402,7 @@ jobs:
             cov_params+=(--cov="homeassistant.components.${{ matrix.group }}")
             cov_params+=(--cov-report=xml)
             cov_params+=(--cov-report=term-missing)
+            cov_params+=(--junitxml=junit.xml -o junit_family=legacy)
           fi
 
           python3 -b -X dev -m pytest \
@@ -1374,22 +1415,29 @@ jobs:
             --durations=0 \
             --durations-min=1 \
             -p no:sugar \
+            --exclude-warning-annotations \
             tests/components/${{ matrix.group }} \
               2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@v4.6.0
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{ matrix.group }}
           path: pytest-*.txt
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@v4.6.0
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
           path: coverage.xml
           overwrite: true
+      - name: Upload test results artifact
+        if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
+        uses: actions/upload-artifact@v4.6.2
+        with:
+          name: test-results-partial-${{ matrix.python-version }}-${{ matrix.group }}
+          path: junit.xml
       - name: Check dirty
         run: |
           ./script/check_dirty
@@ -1406,12 +1454,37 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v4.2.2
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.2.1
         with:
           pattern: coverage-*
       - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'false'
-        uses: codecov/codecov-action@v5.3.0
+        uses: codecov/codecov-action@v5.4.0
         with:
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}
+
+  upload-test-results:
+    name: Upload test results to Codecov
+    # codecov/test-results-action currently doesn't support tokenless uploads
+    # therefore we can't run it on forks
+    if: ${{ (github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork) && needs.info.outputs.skip_coverage != 'true' && !cancelled() }}
+    runs-on: ubuntu-24.04
+    needs:
+      - info
+      - pytest-partial
+      - pytest-full
+      - pytest-postgres
+      - pytest-mariadb
+    timeout-minutes: 10
+    steps:
+      - name: Download all coverage artifacts
+        uses: actions/download-artifact@v4.2.1
+        with:
+          pattern: test-results-*
+      - name: Upload test results to Codecov
+        uses: codecov/test-results-action@v1
+        with:
+          fail_ci_if_error: true
+          verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index ee7fad4bb4e..bd072752d16 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -24,11 +24,11 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.28.4
+        uses: github/codeql-action/init@v3.28.13
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.28.4
+        uses: github/codeql-action/analyze@v3.28.13
         with:
           category: "/language:python"
diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml
index fa3c2305190..0b6abe8fe2c 100644
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 00f0c507414..d27a62bab80 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -36,7 +36,7 @@ jobs:
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -91,7 +91,7 @@ jobs:
           ) > build_constraints.txt
 
       - name: Upload env_file
-        uses: actions/upload-artifact@v4.6.0
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: env_file
           path: ./.env_file
@@ -99,14 +99,14 @@ jobs:
           overwrite: true
 
       - name: Upload build_constraints
-        uses: actions/upload-artifact@v4.6.0
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: build_constraints
           path: ./build_constraints.txt
           overwrite: true
 
       - name: Upload requirements_diff
-        uses: actions/upload-artifact@v4.6.0
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: requirements_diff
           path: ./requirements_diff.txt
@@ -118,7 +118,7 @@ jobs:
           python -m script.gen_requirements_all ci
 
       - name: Upload requirements_all_wheels
-        uses: actions/upload-artifact@v4.6.0
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: requirements_all_wheels
           path: ./requirements_all_wheels_*.txt
@@ -131,24 +131,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        abi: ["cp312", "cp313"]
+        abi: ["cp313"]
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v4.2.2
 
       - name: Download env_file
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.2.1
         with:
           name: env_file
 
       - name: Download build_constraints
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.2.1
         with:
           name: build_constraints
 
       - name: Download requirements_diff
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.2.1
         with:
           name: requirements_diff
 
@@ -159,7 +159,7 @@ jobs:
           sed -i "/uv/d" requirements_diff.txt
 
       - name: Build wheels
-        uses: home-assistant/wheels@2024.11.0
+        uses: home-assistant/wheels@2025.03.0
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
@@ -180,29 +180,29 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        abi: ["cp312", "cp313"]
+        abi: ["cp313"]
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v4.2.2
 
       - name: Download env_file
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.2.1
         with:
           name: env_file
 
       - name: Download build_constraints
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.2.1
         with:
           name: build_constraints
 
       - name: Download requirements_diff
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.2.1
         with:
           name: requirements_diff
 
       - name: Download requirements_all_wheels
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.2.1
         with:
           name: requirements_all_wheels
 
@@ -218,16 +218,8 @@ jobs:
           sed -i "/uv/d" requirements.txt
           sed -i "/uv/d" requirements_diff.txt
 
-      - name: Split requirements all
-        run: |
-          # We split requirements all into multiple files.
-          # This is to prevent the build from running out of memory when
-          # resolving packages on 32-bits systems (like armhf, armv7).
-
-          split -l $(expr $(expr $(cat requirements_all.txt | wc -l) + 1) / 3) requirements_all_wheels_${{ matrix.arch }}.txt requirements_all.txt
-
-      - name: Build wheels (part 1)
-        uses: home-assistant/wheels@2024.11.0
+      - name: Build wheels
+        uses: home-assistant/wheels@2025.03.0
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
@@ -238,32 +230,4 @@ jobs:
           skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;pymicro-vad;yarl
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
-          requirements: "requirements_all.txtaa"
-
-      - name: Build wheels (part 2)
-        uses: home-assistant/wheels@2024.11.0
-        with:
-          abi: ${{ matrix.abi }}
-          tag: musllinux_1_2
-          arch: ${{ matrix.arch }}
-          wheels-key: ${{ secrets.WHEELS_KEY }}
-          env-file: true
-          apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm;zlib-ng-dev"
-          skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;pymicro-vad;yarl
-          constraints: "homeassistant/package_constraints.txt"
-          requirements-diff: "requirements_diff.txt"
-          requirements: "requirements_all.txtab"
-
-      - name: Build wheels (part 3)
-        uses: home-assistant/wheels@2024.11.0
-        with:
-          abi: ${{ matrix.abi }}
-          tag: musllinux_1_2
-          arch: ${{ matrix.arch }}
-          wheels-key: ${{ secrets.WHEELS_KEY }}
-          env-file: true
-          apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm;zlib-ng-dev"
-          skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;pymicro-vad;yarl
-          constraints: "homeassistant/package_constraints.txt"
-          requirements-diff: "requirements_diff.txt"
-          requirements: "requirements_all.txtac"
+          requirements: "requirements_all.txt"
diff --git a/.gitignore b/.gitignore
index 241255253c5..5aa51c9d762 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,6 +69,7 @@ test-reports/
 test-results.xml
 test-output.xml
 pytest-*.txt
+junit.xml
 
 # Translations
 *.mo
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 805e3ac4dbd..42e05a869c3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.1
+    rev: v0.11.0
     hooks:
       - id: ruff
         args:
@@ -8,7 +8,7 @@ repos:
       - id: ruff-format
         files: ^((homeassistant|pylint|script|tests)/.+)?[^/]+\.(py|pyi)$
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.1
     hooks:
       - id: codespell
         args:
diff --git a/.strict-typing b/.strict-typing
index 1c0456a745d..e0c4e569f4b 100644
--- a/.strict-typing
+++ b/.strict-typing
@@ -103,6 +103,7 @@ homeassistant.components.auth.*
 homeassistant.components.automation.*
 homeassistant.components.awair.*
 homeassistant.components.axis.*
+homeassistant.components.azure_storage.*
 homeassistant.components.backup.*
 homeassistant.components.baf.*
 homeassistant.components.bang_olufsen.*
@@ -118,7 +119,9 @@ homeassistant.components.bluetooth_adapters.*
 homeassistant.components.bluetooth_tracker.*
 homeassistant.components.bmw_connected_drive.*
 homeassistant.components.bond.*
+homeassistant.components.bosch_alarm.*
 homeassistant.components.braviatv.*
+homeassistant.components.bring.*
 homeassistant.components.brother.*
 homeassistant.components.browser.*
 homeassistant.components.bryant_evolution.*
@@ -134,6 +137,7 @@ homeassistant.components.clicksend.*
 homeassistant.components.climate.*
 homeassistant.components.cloud.*
 homeassistant.components.co2signal.*
+homeassistant.components.comelit.*
 homeassistant.components.command_line.*
 homeassistant.components.config.*
 homeassistant.components.configurator.*
@@ -217,6 +221,7 @@ homeassistant.components.goalzero.*
 homeassistant.components.google.*
 homeassistant.components.google_assistant_sdk.*
 homeassistant.components.google_cloud.*
+homeassistant.components.google_drive.*
 homeassistant.components.google_photos.*
 homeassistant.components.google_sheets.*
 homeassistant.components.govee_ble.*
@@ -227,10 +232,12 @@ homeassistant.components.guardian.*
 homeassistant.components.habitica.*
 homeassistant.components.hardkernel.*
 homeassistant.components.hardware.*
+homeassistant.components.heos.*
 homeassistant.components.here_travel_time.*
 homeassistant.components.history.*
 homeassistant.components.history_stats.*
 homeassistant.components.holiday.*
+homeassistant.components.home_connect.*
 homeassistant.components.homeassistant.*
 homeassistant.components.homeassistant_alerts.*
 homeassistant.components.homeassistant_green.*
@@ -316,6 +323,7 @@ homeassistant.components.manual.*
 homeassistant.components.mastodon.*
 homeassistant.components.matrix.*
 homeassistant.components.matter.*
+homeassistant.components.mcp.*
 homeassistant.components.mcp_server.*
 homeassistant.components.mealie.*
 homeassistant.components.media_extractor.*
@@ -358,6 +366,7 @@ homeassistant.components.number.*
 homeassistant.components.nut.*
 homeassistant.components.onboarding.*
 homeassistant.components.oncue.*
+homeassistant.components.onedrive.*
 homeassistant.components.onewire.*
 homeassistant.components.onkyo.*
 homeassistant.components.open_meteo.*
@@ -389,6 +398,7 @@ homeassistant.components.pure_energie.*
 homeassistant.components.purpleair.*
 homeassistant.components.pushbullet.*
 homeassistant.components.pvoutput.*
+homeassistant.components.pyload.*
 homeassistant.components.python_script.*
 homeassistant.components.qbus.*
 homeassistant.components.qnap_qsw.*
@@ -401,7 +411,9 @@ homeassistant.components.raspberry_pi.*
 homeassistant.components.rdw.*
 homeassistant.components.recollect_waste.*
 homeassistant.components.recorder.*
+homeassistant.components.remember_the_milk.*
 homeassistant.components.remote.*
+homeassistant.components.remote_calendar.*
 homeassistant.components.renault.*
 homeassistant.components.reolink.*
 homeassistant.components.repairs.*
@@ -432,6 +444,7 @@ homeassistant.components.select.*
 homeassistant.components.sensibo.*
 homeassistant.components.sensirion_ble.*
 homeassistant.components.sensor.*
+homeassistant.components.sensorpush_cloud.*
 homeassistant.components.sensoterra.*
 homeassistant.components.senz.*
 homeassistant.components.sfr_box.*
@@ -519,6 +532,7 @@ homeassistant.components.vallox.*
 homeassistant.components.valve.*
 homeassistant.components.velbus.*
 homeassistant.components.vlc_telnet.*
+homeassistant.components.vodafone_station.*
 homeassistant.components.wake_on_lan.*
 homeassistant.components.wake_word.*
 homeassistant.components.wallbox.*
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 7b77a1c9bfd..459a9e6acc5 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -38,10 +38,17 @@
       "module": "pytest",
       "justMyCode": false,
       "args": [
-        "--timeout=10",
         "--picked"
       ],
     },
+    {
+      "name": "Home Assistant: Debug Current Test File",
+      "type": "debugpy",
+      "request": "launch",
+      "module": "pytest",
+      "console": "integratedTerminal",
+      "args": ["-vv", "${file}"]
+    },
     {
       // Debug by attaching to local Home Assistant server using Remote Python Debugger.
       // See https://www.home-assistant.io/integrations/debugpy/
@@ -77,4 +84,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 7425e7a2533..09c1d374299 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -4,7 +4,7 @@
     {
       "label": "Run Home Assistant Core",
       "type": "shell",
-      "command": "hass -c ./config",
+      "command": "${command:python.interpreterPath} -m homeassistant -c ./config",
       "group": "test",
       "presentation": {
         "reveal": "always",
@@ -148,7 +148,7 @@
     {
       "label": "Install all Test Requirements",
       "type": "shell",
-      "command": "uv pip install -r requirements_test_all.txt",
+      "command": "uv pip install -r requirements.txt -r requirements_test_all.txt",
       "group": {
         "kind": "build",
         "isDefault": true
diff --git a/CODEOWNERS b/CODEOWNERS
index 489b848c772..9a8d8b2fc64 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -180,6 +180,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/azure_event_hub/ @eavanvalkenburg
 /tests/components/azure_event_hub/ @eavanvalkenburg
 /homeassistant/components/azure_service_bus/ @hfurubotten
+/homeassistant/components/azure_storage/ @zweckj
+/tests/components/azure_storage/ @zweckj
 /homeassistant/components/backup/ @home-assistant/core
 /tests/components/backup/ @home-assistant/core
 /homeassistant/components/baf/ @bdraco @jfroy
@@ -214,6 +216,8 @@ build.json @home-assistant/supervisor
 /tests/components/bmw_connected_drive/ @gerard33 @rikroe
 /homeassistant/components/bond/ @bdraco @prystupa @joshs85 @marciogranzotto
 /tests/components/bond/ @bdraco @prystupa @joshs85 @marciogranzotto
+/homeassistant/components/bosch_alarm/ @mag1024 @sanjay900
+/tests/components/bosch_alarm/ @mag1024 @sanjay900
 /homeassistant/components/bosch_shc/ @tschamm
 /tests/components/bosch_shc/ @tschamm
 /homeassistant/components/braviatv/ @bieniu @Drafteed
@@ -566,8 +570,10 @@ build.json @home-assistant/supervisor
 /tests/components/google_assistant_sdk/ @tronikos
 /homeassistant/components/google_cloud/ @lufton @tronikos
 /tests/components/google_cloud/ @lufton @tronikos
-/homeassistant/components/google_generative_ai_conversation/ @tronikos
-/tests/components/google_generative_ai_conversation/ @tronikos
+/homeassistant/components/google_drive/ @tronikos
+/tests/components/google_drive/ @tronikos
+/homeassistant/components/google_generative_ai_conversation/ @tronikos @ivanlh
+/tests/components/google_generative_ai_conversation/ @tronikos @ivanlh
 /homeassistant/components/google_mail/ @tkdrob
 /tests/components/google_mail/ @tkdrob
 /homeassistant/components/google_photos/ @allenporter
@@ -623,8 +629,8 @@ build.json @home-assistant/supervisor
 /tests/components/hlk_sw16/ @jameshilliard
 /homeassistant/components/holiday/ @jrieger @gjohansson-ST
 /tests/components/holiday/ @jrieger @gjohansson-ST
-/homeassistant/components/home_connect/ @DavidMStraub @Diegorro98
-/tests/components/home_connect/ @DavidMStraub @Diegorro98
+/homeassistant/components/home_connect/ @DavidMStraub @Diegorro98 @MartinHjelmare
+/tests/components/home_connect/ @DavidMStraub @Diegorro98 @MartinHjelmare
 /homeassistant/components/homeassistant/ @home-assistant/core
 /tests/components/homeassistant/ @home-assistant/core
 /homeassistant/components/homeassistant_alerts/ @home-assistant/core
@@ -729,6 +735,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/intent/ @home-assistant/core @synesthesiam
 /tests/components/intent/ @home-assistant/core @synesthesiam
 /homeassistant/components/intesishome/ @jnimmo
+/homeassistant/components/iometer/ @MaestroOnICe
+/tests/components/iometer/ @MaestroOnICe
 /homeassistant/components/ios/ @robbiet480
 /tests/components/ios/ @robbiet480
 /homeassistant/components/iotawatt/ @gtdiehl @jyavenard
@@ -763,8 +771,8 @@ build.json @home-assistant/supervisor
 /tests/components/ituran/ @shmuelzon
 /homeassistant/components/izone/ @Swamp-Ig
 /tests/components/izone/ @Swamp-Ig
-/homeassistant/components/jellyfin/ @j-stienstra @ctalkington
-/tests/components/jellyfin/ @j-stienstra @ctalkington
+/homeassistant/components/jellyfin/ @RunC0deRun @ctalkington
+/tests/components/jellyfin/ @RunC0deRun @ctalkington
 /homeassistant/components/jewish_calendar/ @tsvi
 /tests/components/jewish_calendar/ @tsvi
 /homeassistant/components/juicenet/ @jesserockz
@@ -891,6 +899,8 @@ build.json @home-assistant/supervisor
 /tests/components/matrix/ @PaarthShah
 /homeassistant/components/matter/ @home-assistant/matter
 /tests/components/matter/ @home-assistant/matter
+/homeassistant/components/mcp/ @allenporter
+/tests/components/mcp/ @allenporter
 /homeassistant/components/mcp_server/ @allenporter
 /tests/components/mcp_server/ @allenporter
 /homeassistant/components/mealie/ @joostlek @andrew-codechimp
@@ -961,8 +971,8 @@ build.json @home-assistant/supervisor
 /tests/components/motionblinds_ble/ @LennP @jerrybboy
 /homeassistant/components/motioneye/ @dermotduffy
 /tests/components/motioneye/ @dermotduffy
-/homeassistant/components/motionmount/ @RJPoelstra
-/tests/components/motionmount/ @RJPoelstra
+/homeassistant/components/motionmount/ @laiho-vogels
+/tests/components/motionmount/ @laiho-vogels
 /homeassistant/components/mqtt/ @emontnemery @jbouwh @bdraco
 /tests/components/mqtt/ @emontnemery @jbouwh @bdraco
 /homeassistant/components/msteams/ @peroyvind
@@ -1045,8 +1055,8 @@ build.json @home-assistant/supervisor
 /tests/components/numato/ @clssn
 /homeassistant/components/number/ @home-assistant/core @Shulyaka
 /tests/components/number/ @home-assistant/core @Shulyaka
-/homeassistant/components/nut/ @bdraco @ollo69 @pestevez
-/tests/components/nut/ @bdraco @ollo69 @pestevez
+/homeassistant/components/nut/ @bdraco @ollo69 @pestevez @tdfountain
+/tests/components/nut/ @bdraco @ollo69 @pestevez @tdfountain
 /homeassistant/components/nws/ @MatthewFlamm @kamiyo
 /tests/components/nws/ @MatthewFlamm @kamiyo
 /homeassistant/components/nyt_games/ @joostlek
@@ -1069,6 +1079,8 @@ build.json @home-assistant/supervisor
 /tests/components/oncue/ @bdraco @peterager
 /homeassistant/components/ondilo_ico/ @JeromeHXP
 /tests/components/ondilo_ico/ @JeromeHXP
+/homeassistant/components/onedrive/ @zweckj
+/tests/components/onedrive/ @zweckj
 /homeassistant/components/onewire/ @garbled1 @epenet
 /tests/components/onewire/ @garbled1 @epenet
 /homeassistant/components/onkyo/ @arturpragacz @eclair4151
@@ -1130,12 +1142,14 @@ build.json @home-assistant/supervisor
 /tests/components/permobil/ @IsakNyberg
 /homeassistant/components/persistent_notification/ @home-assistant/core
 /tests/components/persistent_notification/ @home-assistant/core
+/homeassistant/components/pglab/ @pglab-electronics
+/tests/components/pglab/ @pglab-electronics
 /homeassistant/components/philips_js/ @elupus
 /tests/components/philips_js/ @elupus
 /homeassistant/components/pi_hole/ @shenxn
 /tests/components/pi_hole/ @shenxn
-/homeassistant/components/picnic/ @corneyl
-/tests/components/picnic/ @corneyl
+/homeassistant/components/picnic/ @corneyl @codesalatdev
+/tests/components/picnic/ @corneyl @codesalatdev
 /homeassistant/components/ping/ @jpbede
 /tests/components/ping/ @jpbede
 /homeassistant/components/plaato/ @JohNan
@@ -1171,6 +1185,8 @@ build.json @home-assistant/supervisor
 /tests/components/prusalink/ @balloob
 /homeassistant/components/ps4/ @ktnrg45
 /tests/components/ps4/ @ktnrg45
+/homeassistant/components/pterodactyl/ @elmurato
+/tests/components/pterodactyl/ @elmurato
 /homeassistant/components/pure_energie/ @klaasnicolaas
 /tests/components/pure_energie/ @klaasnicolaas
 /homeassistant/components/purpleair/ @bachya
@@ -1240,6 +1256,8 @@ build.json @home-assistant/supervisor
 /tests/components/refoss/ @ashionky
 /homeassistant/components/remote/ @home-assistant/core
 /tests/components/remote/ @home-assistant/core
+/homeassistant/components/remote_calendar/ @Thomas55555
+/tests/components/remote_calendar/ @Thomas55555
 /homeassistant/components/renault/ @epenet
 /tests/components/renault/ @epenet
 /homeassistant/components/renson/ @jimmyd-be
@@ -1332,6 +1350,8 @@ build.json @home-assistant/supervisor
 /tests/components/sensorpro/ @bdraco
 /homeassistant/components/sensorpush/ @bdraco
 /tests/components/sensorpush/ @bdraco
+/homeassistant/components/sensorpush_cloud/ @sstallion
+/tests/components/sensorpush_cloud/ @sstallion
 /homeassistant/components/sensoterra/ @markruys
 /tests/components/sensoterra/ @markruys
 /homeassistant/components/sentry/ @dcramer @frenck
@@ -1387,6 +1407,8 @@ build.json @home-assistant/supervisor
 /tests/components/smappee/ @bsmappee
 /homeassistant/components/smart_meter_texas/ @grahamwetzler
 /tests/components/smart_meter_texas/ @grahamwetzler
+/homeassistant/components/smartthings/ @joostlek
+/tests/components/smartthings/ @joostlek
 /homeassistant/components/smarttub/ @mdz
 /tests/components/smarttub/ @mdz
 /homeassistant/components/smarty/ @z0mbieprocess
@@ -1401,6 +1423,8 @@ build.json @home-assistant/supervisor
 /tests/components/snapcast/ @luar123
 /homeassistant/components/snmp/ @nmaggioni
 /tests/components/snmp/ @nmaggioni
+/homeassistant/components/snoo/ @Lash-L
+/tests/components/snoo/ @Lash-L
 /homeassistant/components/snooz/ @AustinBrunkhorst
 /tests/components/snooz/ @AustinBrunkhorst
 /homeassistant/components/solaredge/ @frenck @bdraco
@@ -1408,8 +1432,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/solaredge_local/ @drobtravels @scheric
 /homeassistant/components/solarlog/ @Ernst79 @dontinelli
 /tests/components/solarlog/ @Ernst79 @dontinelli
-/homeassistant/components/solax/ @squishykid
-/tests/components/solax/ @squishykid
+/homeassistant/components/solax/ @squishykid @Darsstar
+/tests/components/solax/ @squishykid @Darsstar
 /homeassistant/components/soma/ @ratsept @sebfortier2288
 /tests/components/soma/ @ratsept @sebfortier2288
 /homeassistant/components/sonarr/ @ctalkington
@@ -1511,8 +1535,8 @@ build.json @home-assistant/supervisor
 /tests/components/tedee/ @patrickhilker @zweckj
 /homeassistant/components/tellduslive/ @fredrike
 /tests/components/tellduslive/ @fredrike
-/homeassistant/components/template/ @PhracturedBlue @home-assistant/core
-/tests/components/template/ @PhracturedBlue @home-assistant/core
+/homeassistant/components/template/ @Petro31 @PhracturedBlue @home-assistant/core
+/tests/components/template/ @Petro31 @PhracturedBlue @home-assistant/core
 /homeassistant/components/tesla_fleet/ @Bre77
 /tests/components/tesla_fleet/ @Bre77
 /homeassistant/components/tesla_wall_connector/ @einarhauks
@@ -1681,6 +1705,8 @@ build.json @home-assistant/supervisor
 /tests/components/weatherflow_cloud/ @jeeftor
 /homeassistant/components/weatherkit/ @tjhorner
 /tests/components/weatherkit/ @tjhorner
+/homeassistant/components/webdav/ @jpbede
+/tests/components/webdav/ @jpbede
 /homeassistant/components/webhook/ @home-assistant/core
 /tests/components/webhook/ @home-assistant/core
 /homeassistant/components/webmin/ @autinerd
diff --git a/Dockerfile b/Dockerfile
index 171d08731a9..0a74e0a3aac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,8 +12,26 @@ ENV \
 
 ARG QEMU_CPU
 
+# Home Assistant S6-Overlay
+COPY rootfs /
+
+# Needs to be redefined inside the FROM statement to be set for RUN commands
+ARG BUILD_ARCH
+# Get go2rtc binary
+RUN \
+    case "${BUILD_ARCH}" in \
+        "aarch64") go2rtc_suffix='arm64' ;; \
+        "armhf") go2rtc_suffix='armv6' ;; \
+        "armv7") go2rtc_suffix='arm' ;; \
+        *) go2rtc_suffix=${BUILD_ARCH} ;; \
+    esac \
+    && curl -L https://github.com/AlexxIT/go2rtc/releases/download/v1.9.9/go2rtc_linux_${go2rtc_suffix} --output /bin/go2rtc \
+    && chmod +x /bin/go2rtc \
+    # Verify go2rtc can be executed
+    && go2rtc --version
+
 # Install uv
-RUN pip3 install uv==0.5.21
+RUN pip3 install uv==0.6.10
 
 WORKDIR /usr/src
 
@@ -42,22 +60,4 @@ RUN \
     && python3 -m compileall \
         homeassistant/homeassistant
 
-# Home Assistant S6-Overlay
-COPY rootfs /
-
-# Needs to be redefined inside the FROM statement to be set for RUN commands
-ARG BUILD_ARCH
-# Get go2rtc binary
-RUN \
-    case "${BUILD_ARCH}" in \
-        "aarch64") go2rtc_suffix='arm64' ;; \
-        "armhf") go2rtc_suffix='armv6' ;; \
-        "armv7") go2rtc_suffix='arm' ;; \
-        *) go2rtc_suffix=${BUILD_ARCH} ;; \
-    esac \
-    && curl -L https://github.com/AlexxIT/go2rtc/releases/download/v1.9.8/go2rtc_linux_${go2rtc_suffix} --output /bin/go2rtc \
-    && chmod +x /bin/go2rtc \
-    # Verify go2rtc can be executed
-    && go2rtc --version
-
 WORKDIR /config
diff --git a/build.yaml b/build.yaml
index e6e149cf700..87dad1bf5ef 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1,10 +1,10 @@
 image: ghcr.io/home-assistant/{arch}-homeassistant
 build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2024.12.0
-  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2024.12.0
-  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2024.12.0
-  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2024.12.0
-  i386: ghcr.io/home-assistant/i386-homeassistant-base:2024.12.0
+  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2025.02.1
+  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2025.02.1
+  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2025.02.1
+  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2025.02.1
+  i386: ghcr.io/home-assistant/i386-homeassistant-base:2025.02.1
 codenotary:
   signer: notary@home-assistant.io
   base_image: notary@home-assistant.io
@@ -19,4 +19,4 @@ labels:
   org.opencontainers.image.authors: The Home Assistant Authors
   org.opencontainers.image.url: https://www.home-assistant.io/
   org.opencontainers.image.documentation: https://www.home-assistant.io/docs/
-  org.opencontainers.image.licenses: Apache License 2.0
+  org.opencontainers.image.licenses: Apache-2.0
diff --git a/homeassistant/auth/providers/trusted_networks.py b/homeassistant/auth/providers/trusted_networks.py
index 799fd4d2e16..83299859de9 100644
--- a/homeassistant/auth/providers/trusted_networks.py
+++ b/homeassistant/auth/providers/trusted_networks.py
@@ -21,7 +21,7 @@ import voluptuous as vol
 
 from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.network import is_cloud_connection
 
 from .. import InvalidAuthError
diff --git a/homeassistant/backup_restore.py b/homeassistant/backup_restore.py
index 3d24d807a06..4d309469017 100644
--- a/homeassistant/backup_restore.py
+++ b/homeassistant/backup_restore.py
@@ -18,6 +18,7 @@ import securetar
 from .const import __version__ as HA_VERSION
 
 RESTORE_BACKUP_FILE = ".HA_RESTORE"
+RESTORE_BACKUP_RESULT_FILE = ".HA_RESTORE_RESULT"
 KEEP_BACKUPS = ("backups",)
 KEEP_DATABASE = (
     "home-assistant_v2.db",
@@ -62,7 +63,10 @@ def restore_backup_file_content(config_dir: Path) -> RestoreBackupFileContent |
             restore_database=instruction_content["restore_database"],
             restore_homeassistant=instruction_content["restore_homeassistant"],
         )
-    except (FileNotFoundError, KeyError, json.JSONDecodeError):
+    except FileNotFoundError:
+        return None
+    except (KeyError, json.JSONDecodeError) as err:
+        _write_restore_result_file(config_dir, False, err)
         return None
     finally:
         # Always remove the backup instruction file to prevent a boot loop
@@ -142,6 +146,7 @@ def _extract_backup(
                     config_dir,
                     dirs_exist_ok=True,
                     ignore=shutil.ignore_patterns(*(keep)),
+                    ignore_dangling_symlinks=True,
                 )
             elif restore_content.restore_database:
                 for entry in KEEP_DATABASE:
@@ -159,6 +164,23 @@ def _extract_backup(
                     )
 
 
+def _write_restore_result_file(
+    config_dir: Path, success: bool, error: Exception | None
+) -> None:
+    """Write the restore result file."""
+    result_path = config_dir.joinpath(RESTORE_BACKUP_RESULT_FILE)
+    result_path.write_text(
+        json.dumps(
+            {
+                "success": success,
+                "error": str(error) if error else None,
+                "error_type": str(type(error).__name__) if error else None,
+            }
+        ),
+        encoding="utf-8",
+    )
+
+
 def restore_backup(config_dir_path: str) -> bool:
     """Restore the backup file if any.
 
@@ -177,7 +199,14 @@ def restore_backup(config_dir_path: str) -> bool:
             restore_content=restore_content,
         )
     except FileNotFoundError as err:
-        raise ValueError(f"Backup file {backup_file_path} does not exist") from err
+        file_not_found = ValueError(f"Backup file {backup_file_path} does not exist")
+        _write_restore_result_file(config_dir, False, file_not_found)
+        raise file_not_found from err
+    except Exception as err:
+        _write_restore_result_file(config_dir, False, err)
+        raise
+    else:
+        _write_restore_result_file(config_dir, True, None)
     if restore_content.remove_after_restore:
         backup_file_path.unlink(missing_ok=True)
     _LOGGER.info("Restore complete, restarting")
diff --git a/homeassistant/block_async_io.py b/homeassistant/block_async_io.py
index d224b0b151d..eb81268434b 100644
--- a/homeassistant/block_async_io.py
+++ b/homeassistant/block_async_io.py
@@ -178,6 +178,15 @@ _BLOCKING_CALLS: tuple[BlockingCall, ...] = (
         strict_core=False,
         skip_for_tests=True,
     ),
+    BlockingCall(
+        original_func=SSLContext.set_default_verify_paths,
+        object=SSLContext,
+        function="set_default_verify_paths",
+        check_allowed=None,
+        strict=False,
+        strict_core=False,
+        skip_for_tests=True,
+    ),
     BlockingCall(
         original_func=Path.open,
         object=Path,
diff --git a/homeassistant/bootstrap.py b/homeassistant/bootstrap.py
index d89a9595868..02a3b8c8fcc 100644
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -74,12 +74,14 @@ from .core_config import async_process_ha_core_config
 from .exceptions import HomeAssistantError
 from .helpers import (
     area_registry,
+    backup,
     category_registry,
     config_validation as cv,
     device_registry,
     entity,
     entity_registry,
     floor_registry,
+    frame,
     issue_registry,
     label_registry,
     recorder,
@@ -91,6 +93,7 @@ from .helpers.dispatcher import async_dispatcher_send_internal
 from .helpers.storage import get_internal_store_manager
 from .helpers.system_info import async_get_system_info
 from .helpers.typing import ConfigType
+from .loader import Integration
 from .setup import (
     # _setup_started is marked as protected to make it clear
     # that it is not part of the public API and should not be used
@@ -134,14 +137,12 @@ DATA_REGISTRIES_LOADED: HassKey[None] = HassKey("bootstrap_registries_loaded")
 LOG_SLOW_STARTUP_INTERVAL = 60
 SLOW_STARTUP_CHECK_INTERVAL = 1
 
+STAGE_0_SUBSTAGE_TIMEOUT = 60
 STAGE_1_TIMEOUT = 120
 STAGE_2_TIMEOUT = 300
 WRAP_UP_TIMEOUT = 300
 COOLDOWN_TIME = 60
 
-
-DEBUGGER_INTEGRATIONS = {"debugpy"}
-
 # Core integrations are unconditionally loaded
 CORE_INTEGRATIONS = {"homeassistant", "persistent_notification"}
 
@@ -152,6 +153,10 @@ LOGGING_AND_HTTP_DEPS_INTEGRATIONS = {
     "isal",
     # Set log levels
     "logger",
+    # Ensure network config is available
+    # before hassio or any other integration is
+    # loaded that might create an aiohttp client session
+    "network",
     # Error logging
     "system_log",
     "sentry",
@@ -162,12 +167,27 @@ FRONTEND_INTEGRATIONS = {
     # visible in frontend
     "frontend",
 }
-RECORDER_INTEGRATIONS = {
-    # Setup after frontend
-    # To record data
-    "recorder",
-}
-DISCOVERY_INTEGRATIONS = ("bluetooth", "dhcp", "ssdp", "usb", "zeroconf")
+# Stage 0 is divided into substages. Each substage has a name, a set of integrations and a timeout.
+# The substage containing recorder should have no timeout, as it could cancel a database migration.
+# Recorder freezes "recorder" timeout during a migration, but it does not freeze other timeouts.
+# The substages preceding it should also have no timeout, until we ensure that the recorder
+# is not accidentally promoted as a dependency of any of the integrations in them.
+# If we add timeouts to the frontend substages, we should make sure they don't apply in recovery mode.
+STAGE_0_INTEGRATIONS = (
+    # Load logging and http deps as soon as possible
+    ("logging, http deps", LOGGING_AND_HTTP_DEPS_INTEGRATIONS, None),
+    # Setup frontend
+    ("frontend", FRONTEND_INTEGRATIONS, None),
+    # Setup recorder
+    ("recorder", {"recorder"}, None),
+    # Start up debuggers. Start these first in case they want to wait.
+    ("debugger", {"debugpy"}, STAGE_0_SUBSTAGE_TIMEOUT),
+    # Zeroconf is used for mdns resolution in aiohttp client helper.
+    ("zeroconf", {"zeroconf"}, STAGE_0_SUBSTAGE_TIMEOUT),
+)
+
+DISCOVERY_INTEGRATIONS = ("bluetooth", "dhcp", "ssdp", "usb")
+# Stage 1 integrations are not to be preimported in bootstrap.
 STAGE_1_INTEGRATIONS = {
     # We need to make sure discovery integrations
     # update their deps before stage 2 integrations
@@ -182,6 +202,7 @@ STAGE_1_INTEGRATIONS = {
     # Ensure supervisor is available
     "hassio",
 }
+
 DEFAULT_INTEGRATIONS = {
     # These integrations are set up unless recovery mode is activated.
     #
@@ -222,22 +243,12 @@ DEFAULT_INTEGRATIONS_SUPERVISOR = {
     # These integrations are set up if using the Supervisor
     "hassio",
 }
+
 CRITICAL_INTEGRATIONS = {
     # Recovery mode is activated if these integrations fail to set up
     "frontend",
 }
 
-SETUP_ORDER = (
-    # Load logging and http deps as soon as possible
-    ("logging, http deps", LOGGING_AND_HTTP_DEPS_INTEGRATIONS),
-    # Setup frontend
-    ("frontend", FRONTEND_INTEGRATIONS),
-    # Setup recorder
-    ("recorder", RECORDER_INTEGRATIONS),
-    # Start up debuggers. Start these first in case they want to wait.
-    ("debugger", DEBUGGER_INTEGRATIONS),
-)
-
 #
 # Storage keys we are likely to load during startup
 # in order of when we expect to load them.
@@ -289,14 +300,6 @@ async def async_setup_hass(
 
         return hass
 
-    async def stop_hass(hass: core.HomeAssistant) -> None:
-        """Stop hass."""
-        # Ask integrations to shut down. It's messy but we can't
-        # do a clean stop without knowing what is broken
-        with contextlib.suppress(TimeoutError):
-            async with hass.timeout.async_timeout(10):
-                await hass.async_stop()
-
     hass = await create_hass()
 
     if runtime_config.skip_pip or runtime_config.skip_pip_packages:
@@ -312,10 +315,10 @@ async def async_setup_hass(
 
     block_async_io.enable()
 
-    config_dict = None
-    basic_setup_success = False
-
     if not (recovery_mode := runtime_config.recovery_mode):
+        config_dict = None
+        basic_setup_success = False
+
         await hass.async_add_executor_job(conf_util.process_ha_config_upgrade, hass)
 
         try:
@@ -333,39 +336,43 @@ async def async_setup_hass(
                 await async_from_config_dict(config_dict, hass) is not None
             )
 
-    if config_dict is None:
-        recovery_mode = True
-        await stop_hass(hass)
-        hass = await create_hass()
+        if config_dict is None:
+            recovery_mode = True
+            await hass.async_stop(force=True)
+            hass = await create_hass()
 
-    elif not basic_setup_success:
-        _LOGGER.warning("Unable to set up core integrations. Activating recovery mode")
-        recovery_mode = True
-        await stop_hass(hass)
-        hass = await create_hass()
+        elif not basic_setup_success:
+            _LOGGER.warning(
+                "Unable to set up core integrations. Activating recovery mode"
+            )
+            recovery_mode = True
+            await hass.async_stop(force=True)
+            hass = await create_hass()
 
-    elif any(domain not in hass.config.components for domain in CRITICAL_INTEGRATIONS):
-        _LOGGER.warning(
-            "Detected that %s did not load. Activating recovery mode",
-            ",".join(CRITICAL_INTEGRATIONS),
-        )
+        elif any(
+            domain not in hass.config.components for domain in CRITICAL_INTEGRATIONS
+        ):
+            _LOGGER.warning(
+                "Detected that %s did not load. Activating recovery mode",
+                ",".join(CRITICAL_INTEGRATIONS),
+            )
 
-        old_config = hass.config
-        old_logging = hass.data.get(DATA_LOGGING)
+            old_config = hass.config
+            old_logging = hass.data.get(DATA_LOGGING)
 
-        recovery_mode = True
-        await stop_hass(hass)
-        hass = await create_hass()
+            recovery_mode = True
+            await hass.async_stop(force=True)
+            hass = await create_hass()
 
-        if old_logging:
-            hass.data[DATA_LOGGING] = old_logging
-        hass.config.debug = old_config.debug
-        hass.config.skip_pip = old_config.skip_pip
-        hass.config.skip_pip_packages = old_config.skip_pip_packages
-        hass.config.internal_url = old_config.internal_url
-        hass.config.external_url = old_config.external_url
-        # Setup loader cache after the config dir has been set
-        loader.async_setup(hass)
+            if old_logging:
+                hass.data[DATA_LOGGING] = old_logging
+            hass.config.debug = old_config.debug
+            hass.config.skip_pip = old_config.skip_pip
+            hass.config.skip_pip_packages = old_config.skip_pip_packages
+            hass.config.internal_url = old_config.internal_url
+            hass.config.external_url = old_config.external_url
+            # Setup loader cache after the config dir has been set
+            loader.async_setup(hass)
 
     if recovery_mode:
         _LOGGER.info("Starting in recovery mode")
@@ -428,9 +435,10 @@ async def async_load_base_functionality(hass: core.HomeAssistant) -> None:
     if DATA_REGISTRIES_LOADED in hass.data:
         return
     hass.data[DATA_REGISTRIES_LOADED] = None
-    translation.async_setup(hass)
     entity.async_setup(hass)
+    frame.async_setup(hass)
     template.async_setup(hass)
+    translation.async_setup(hass)
     await asyncio.gather(
         create_eager_task(get_internal_store_manager(hass).async_initialize()),
         create_eager_task(area_registry.async_load(hass)),
@@ -651,11 +659,10 @@ def _create_log_file(
         err_handler = _RotatingFileHandlerWithoutShouldRollOver(
             err_log_path, backupCount=1
         )
-
-    try:
-        err_handler.doRollover()
-    except OSError as err:
-        _LOGGER.error("Error rolling over log file: %s", err)
+        try:
+            err_handler.doRollover()
+        except OSError as err:
+            _LOGGER.error("Error rolling over log file: %s", err)
 
     return err_handler
 
@@ -684,7 +691,6 @@ async def async_mount_local_lib_path(config_dir: str) -> str:
     return deps_dir
 
 
-@core.callback
 def _get_domains(hass: core.HomeAssistant, config: dict[str, Any]) -> set[str]:
     """Get domains of components to set up."""
     # Filter out the repeating and common config section [homeassistant]
@@ -706,6 +712,258 @@ def _get_domains(hass: core.HomeAssistant, config: dict[str, Any]) -> set[str]:
     return domains
 
 
+async def _async_resolve_domains_and_preload(
+    hass: core.HomeAssistant, config: dict[str, Any]
+) -> tuple[dict[str, Integration], dict[str, Integration]]:
+    """Resolve all dependencies and return integrations to set up.
+
+    The return value is a tuple of two dictionaries:
+    - The first dictionary contains integrations
+      specified by the configuration (including config entries).
+    - The second dictionary contains the same integrations as the first dictionary
+      together with all their dependencies.
+    """
+    domains_to_setup = _get_domains(hass, config)
+    platform_integrations = conf_util.extract_platform_integrations(
+        config, BASE_PLATFORMS
+    )
+    # Ensure base platforms that have platform integrations are added to `domains`,
+    # so they can be setup first instead of discovering them later when a config
+    # entry setup task notices that it's needed and there is already a long line
+    # to use the import executor.
+    #
+    # For example if we have
+    # sensor:
+    #   - platform: template
+    #
+    # `template` has to be loaded to validate the config for sensor
+    # so we want to start loading `sensor` as soon as we know
+    # it will be needed. The more platforms under `sensor:`, the longer
+    # it will take to finish setup for `sensor` because each of these
+    # platforms has to be imported before we can validate the config.
+    #
+    # Thankfully we are migrating away from the platform pattern
+    # so this will be less of a problem in the future.
+    domains_to_setup.update(platform_integrations)
+
+    # Additionally process base platforms since we do not require the manifest
+    # to list them as dependencies.
+    # We want to later avoid lock contention when multiple integrations try to load
+    # their manifests at once.
+    # Also process integrations that are defined under base platforms
+    # to speed things up.
+    additional_domains_to_process = {
+        *BASE_PLATFORMS,
+        *chain.from_iterable(platform_integrations.values()),
+    }
+
+    # Resolve all dependencies so we know all integrations
+    # that will have to be loaded and start right-away
+    integrations_or_excs = await loader.async_get_integrations(
+        hass, {*domains_to_setup, *additional_domains_to_process}
+    )
+    # Eliminate those missing or with invalid manifest
+    integrations_to_process = {
+        domain: itg
+        for domain, itg in integrations_or_excs.items()
+        if isinstance(itg, Integration)
+    }
+    integrations_dependencies = await loader.resolve_integrations_dependencies(
+        hass, integrations_to_process.values()
+    )
+    # Eliminate those without valid dependencies
+    integrations_to_process = {
+        domain: integrations_to_process[domain] for domain in integrations_dependencies
+    }
+
+    integrations_to_setup = {
+        domain: itg
+        for domain, itg in integrations_to_process.items()
+        if domain in domains_to_setup
+    }
+    all_integrations_to_setup = integrations_to_setup.copy()
+    all_integrations_to_setup.update(
+        (dep, loader.async_get_loaded_integration(hass, dep))
+        for domain in integrations_to_setup
+        for dep in integrations_dependencies[domain].difference(
+            all_integrations_to_setup
+        )
+    )
+
+    # Gather requirements for all integrations,
+    # their dependencies and after dependencies.
+    # To gather all the requirements we must ignore exceptions here.
+    # The exceptions will be detected and handled later in the bootstrap process.
+    integrations_after_dependencies = (
+        await loader.resolve_integrations_after_dependencies(
+            hass, integrations_to_process.values(), ignore_exceptions=True
+        )
+    )
+    integrations_requirements = {
+        domain: itg.requirements for domain, itg in integrations_to_process.items()
+    }
+    integrations_requirements.update(
+        (dep, loader.async_get_loaded_integration(hass, dep).requirements)
+        for deps in integrations_after_dependencies.values()
+        for dep in deps.difference(integrations_requirements)
+    )
+    all_requirements = set(chain.from_iterable(integrations_requirements.values()))
+
+    # Optimistically check if requirements are already installed
+    # ahead of setting up the integrations so we can prime the cache
+    # We do not wait for this since it's an optimization only
+    hass.async_create_background_task(
+        requirements.async_load_installed_versions(hass, all_requirements),
+        "check installed requirements",
+        eager_start=True,
+    )
+
+    # Start loading translations for all integrations we are going to set up
+    # in the background so they are ready when we need them. This avoids a
+    # lot of waiting for the translation load lock and a thundering herd of
+    # tasks trying to load the same translations at the same time as each
+    # integration is loaded.
+    #
+    # We do not wait for this since as soon as the task runs it will
+    # hold the translation load lock and if anything is fast enough to
+    # wait for the translation load lock, loading will be done by the
+    # time it gets to it.
+    translations_to_load = {*all_integrations_to_setup, *additional_domains_to_process}
+    hass.async_create_background_task(
+        translation.async_load_integrations(hass, translations_to_load),
+        "load translations",
+        eager_start=True,
+    )
+
+    # Preload storage for all integrations we are going to set up
+    # so we do not have to wait for it to be loaded when we need it
+    # in the setup process.
+    hass.async_create_background_task(
+        get_internal_store_manager(hass).async_preload(
+            [*PRELOAD_STORAGE, *all_integrations_to_setup]
+        ),
+        "preload storage",
+        eager_start=True,
+    )
+
+    return integrations_to_setup, all_integrations_to_setup
+
+
+async def _async_set_up_integrations(
+    hass: core.HomeAssistant, config: dict[str, Any]
+) -> None:
+    """Set up all the integrations."""
+    watcher = _WatchPendingSetups(hass, _setup_started(hass))
+    watcher.async_start()
+
+    integrations, all_integrations = await _async_resolve_domains_and_preload(
+        hass, config
+    )
+    all_domains = set(all_integrations)
+    domains = set(integrations)
+
+    _LOGGER.info(
+        "Domains to be set up: %s | %s",
+        domains,
+        all_domains - domains,
+    )
+
+    # Initialize recorder
+    if "recorder" in all_domains:
+        recorder.async_initialize_recorder(hass)
+
+    # Initialize backup
+    if "backup" in all_domains:
+        backup.async_initialize_backup(hass)
+
+    stages: list[tuple[str, set[str], int | None]] = [
+        *(
+            (name, domain_group, timeout)
+            for name, domain_group, timeout in STAGE_0_INTEGRATIONS
+        ),
+        ("1", STAGE_1_INTEGRATIONS, STAGE_1_TIMEOUT),
+        ("2", domains, STAGE_2_TIMEOUT),
+    ]
+
+    _LOGGER.info("Setting up stage 0")
+    for name, domain_group, timeout in stages:
+        stage_domains_unfiltered = domain_group & all_domains
+        if not stage_domains_unfiltered:
+            _LOGGER.info("Nothing to set up in stage %s: %s", name, domain_group)
+            continue
+
+        stage_domains = stage_domains_unfiltered - hass.config.components
+        if not stage_domains:
+            _LOGGER.info("Already set up stage %s: %s", name, stage_domains_unfiltered)
+            continue
+
+        stage_dep_domains_unfiltered = {
+            dep
+            for domain in stage_domains
+            for dep in all_integrations[domain].all_dependencies
+            if dep not in stage_domains
+        }
+        stage_dep_domains = stage_dep_domains_unfiltered - hass.config.components
+
+        stage_all_domains = stage_domains | stage_dep_domains
+        stage_all_integrations = {
+            domain: all_integrations[domain] for domain in stage_all_domains
+        }
+        # Detect all cycles
+        stage_integrations_after_dependencies = (
+            await loader.resolve_integrations_after_dependencies(
+                hass, stage_all_integrations.values(), stage_all_domains
+            )
+        )
+        stage_all_domains = set(stage_integrations_after_dependencies)
+        stage_domains &= stage_all_domains
+        stage_dep_domains &= stage_all_domains
+
+        _LOGGER.info(
+            "Setting up stage %s: %s | %s\nDependencies: %s | %s",
+            name,
+            stage_domains,
+            stage_domains_unfiltered - stage_domains,
+            stage_dep_domains,
+            stage_dep_domains_unfiltered - stage_dep_domains,
+        )
+
+        async_set_domains_to_be_loaded(hass, stage_all_domains)
+
+        if timeout is None:
+            await _async_setup_multi_components(hass, stage_all_domains, config)
+            continue
+        try:
+            async with hass.timeout.async_timeout(timeout, cool_down=COOLDOWN_TIME):
+                await _async_setup_multi_components(hass, stage_all_domains, config)
+        except TimeoutError:
+            _LOGGER.warning(
+                "Setup timed out for stage %s waiting on %s - moving forward",
+                name,
+                hass._active_tasks,  # noqa: SLF001
+            )
+
+    # Wrap up startup
+    _LOGGER.debug("Waiting for startup to wrap up")
+    try:
+        async with hass.timeout.async_timeout(WRAP_UP_TIMEOUT, cool_down=COOLDOWN_TIME):
+            await hass.async_block_till_done()
+    except TimeoutError:
+        _LOGGER.warning(
+            "Setup timed out for bootstrap waiting on %s - moving forward",
+            hass._active_tasks,  # noqa: SLF001
+        )
+
+    watcher.async_stop()
+
+    if _LOGGER.isEnabledFor(logging.DEBUG):
+        setup_time = async_get_setup_timings(hass)
+        _LOGGER.debug(
+            "Integration setup times: %s",
+            dict(sorted(setup_time.items(), key=itemgetter(1), reverse=True)),
+        )
+
+
 class _WatchPendingSetups:
     """Periodic log and dispatch of setups that are pending."""
 
@@ -777,14 +1035,12 @@ class _WatchPendingSetups:
             self._handle = None
 
 
-async def async_setup_multi_components(
+async def _async_setup_multi_components(
     hass: core.HomeAssistant,
     domains: set[str],
     config: dict[str, Any],
 ) -> None:
     """Set up multiple domains. Log on failure."""
-    # Avoid creating tasks for domains that were setup in a previous stage
-    domains_not_yet_setup = domains - hass.config.components
     # Create setup tasks for base platforms first since everything will have
     # to wait to be imported, and the sooner we can get the base platforms
     # loaded the sooner we can start loading the rest of the integrations.
@@ -794,9 +1050,7 @@ async def async_setup_multi_components(
             f"setup component {domain}",
             eager_start=True,
         )
-        for domain in sorted(
-            domains_not_yet_setup, key=SETUP_ORDER_SORT_KEY, reverse=True
-        )
+        for domain in sorted(domains, key=SETUP_ORDER_SORT_KEY, reverse=True)
     }
     results = await asyncio.gather(*futures.values(), return_exceptions=True)
     for idx, domain in enumerate(futures):
@@ -807,278 +1061,3 @@ async def async_setup_multi_components(
                 domain,
                 exc_info=(type(result), result, result.__traceback__),
             )
-
-
-async def _async_resolve_domains_to_setup(
-    hass: core.HomeAssistant, config: dict[str, Any]
-) -> tuple[set[str], dict[str, loader.Integration]]:
-    """Resolve all dependencies and return list of domains to set up."""
-    domains_to_setup = _get_domains(hass, config)
-    needed_requirements: set[str] = set()
-    platform_integrations = conf_util.extract_platform_integrations(
-        config, BASE_PLATFORMS
-    )
-    # Ensure base platforms that have platform integrations are added to
-    # to `domains_to_setup so they can be setup first instead of
-    # discovering them when later when a config entry setup task
-    # notices its needed and there is already a long line to use
-    # the import executor.
-    #
-    # For example if we have
-    # sensor:
-    #   - platform: template
-    #
-    # `template` has to be loaded to validate the config for sensor
-    # so we want to start loading `sensor` as soon as we know
-    # it will be needed. The more platforms under `sensor:`, the longer
-    # it will take to finish setup for `sensor` because each of these
-    # platforms has to be imported before we can validate the config.
-    #
-    # Thankfully we are migrating away from the platform pattern
-    # so this will be less of a problem in the future.
-    domains_to_setup.update(platform_integrations)
-
-    # Load manifests for base platforms and platform based integrations
-    # that are defined under base platforms right away since we do not require
-    # the manifest to list them as dependencies and we want to avoid the lock
-    # contention when multiple integrations try to load them at once
-    additional_manifests_to_load = {
-        *BASE_PLATFORMS,
-        *chain.from_iterable(platform_integrations.values()),
-    }
-
-    translations_to_load = additional_manifests_to_load.copy()
-
-    # Resolve all dependencies so we know all integrations
-    # that will have to be loaded and start right-away
-    integration_cache: dict[str, loader.Integration] = {}
-    to_resolve: set[str] = domains_to_setup
-    while to_resolve or additional_manifests_to_load:
-        old_to_resolve: set[str] = to_resolve
-        to_resolve = set()
-
-        if additional_manifests_to_load:
-            to_get = {*old_to_resolve, *additional_manifests_to_load}
-            additional_manifests_to_load.clear()
-        else:
-            to_get = old_to_resolve
-
-        manifest_deps: set[str] = set()
-        resolve_dependencies_tasks: list[asyncio.Task[bool]] = []
-        integrations_to_process: list[loader.Integration] = []
-
-        for domain, itg in (await loader.async_get_integrations(hass, to_get)).items():
-            if not isinstance(itg, loader.Integration):
-                continue
-            integration_cache[domain] = itg
-            needed_requirements.update(itg.requirements)
-
-            # Make sure manifests for dependencies are loaded in the next
-            # loop to try to group as many as manifest loads in a single
-            # call to avoid the creating one-off executor jobs later in
-            # the setup process
-            additional_manifests_to_load.update(
-                dep
-                for dep in chain(itg.dependencies, itg.after_dependencies)
-                if dep not in integration_cache
-            )
-
-            if domain not in old_to_resolve:
-                continue
-
-            integrations_to_process.append(itg)
-            manifest_deps.update(itg.dependencies)
-            manifest_deps.update(itg.after_dependencies)
-            if not itg.all_dependencies_resolved:
-                resolve_dependencies_tasks.append(
-                    create_eager_task(
-                        itg.resolve_dependencies(),
-                        name=f"resolve dependencies {domain}",
-                        loop=hass.loop,
-                    )
-                )
-
-        if unseen_deps := manifest_deps - integration_cache.keys():
-            # If there are dependencies, try to preload all
-            # the integrations manifest at once and add them
-            # to the list of requirements we need to install
-            # so we can try to check if they are already installed
-            # in a single call below which avoids each integration
-            # having to wait for the lock to do it individually
-            deps = await loader.async_get_integrations(hass, unseen_deps)
-            for dependant_domain, dependant_itg in deps.items():
-                if isinstance(dependant_itg, loader.Integration):
-                    integration_cache[dependant_domain] = dependant_itg
-                    needed_requirements.update(dependant_itg.requirements)
-
-        if resolve_dependencies_tasks:
-            await asyncio.gather(*resolve_dependencies_tasks)
-
-        for itg in integrations_to_process:
-            try:
-                all_deps = itg.all_dependencies
-            except RuntimeError:
-                # Integration.all_dependencies raises RuntimeError if
-                # dependencies could not be resolved
-                continue
-            for dep in all_deps:
-                if dep in domains_to_setup:
-                    continue
-                domains_to_setup.add(dep)
-                to_resolve.add(dep)
-
-    _LOGGER.info("Domains to be set up: %s", domains_to_setup)
-
-    # Optimistically check if requirements are already installed
-    # ahead of setting up the integrations so we can prime the cache
-    # We do not wait for this since its an optimization only
-    hass.async_create_background_task(
-        requirements.async_load_installed_versions(hass, needed_requirements),
-        "check installed requirements",
-        eager_start=True,
-    )
-
-    #
-    # Only add the domains_to_setup after we finish resolving
-    # as new domains are likely to added in the process
-    #
-    translations_to_load.update(domains_to_setup)
-    # Start loading translations for all integrations we are going to set up
-    # in the background so they are ready when we need them. This avoids a
-    # lot of waiting for the translation load lock and a thundering herd of
-    # tasks trying to load the same translations at the same time as each
-    # integration is loaded.
-    #
-    # We do not wait for this since as soon as the task runs it will
-    # hold the translation load lock and if anything is fast enough to
-    # wait for the translation load lock, loading will be done by the
-    # time it gets to it.
-    hass.async_create_background_task(
-        translation.async_load_integrations(hass, translations_to_load),
-        "load translations",
-        eager_start=True,
-    )
-
-    # Preload storage for all integrations we are going to set up
-    # so we do not have to wait for it to be loaded when we need it
-    # in the setup process.
-    hass.async_create_background_task(
-        get_internal_store_manager(hass).async_preload(
-            [*PRELOAD_STORAGE, *domains_to_setup]
-        ),
-        "preload storage",
-        eager_start=True,
-    )
-
-    return domains_to_setup, integration_cache
-
-
-async def _async_set_up_integrations(
-    hass: core.HomeAssistant, config: dict[str, Any]
-) -> None:
-    """Set up all the integrations."""
-    watcher = _WatchPendingSetups(hass, _setup_started(hass))
-    watcher.async_start()
-
-    domains_to_setup, integration_cache = await _async_resolve_domains_to_setup(
-        hass, config
-    )
-
-    # Initialize recorder
-    if "recorder" in domains_to_setup:
-        recorder.async_initialize_recorder(hass)
-
-    pre_stage_domains = [
-        (name, domains_to_setup & domain_group) for name, domain_group in SETUP_ORDER
-    ]
-
-    # calculate what components to setup in what stage
-    stage_1_domains: set[str] = set()
-
-    # Find all dependencies of any dependency of any stage 1 integration that
-    # we plan on loading and promote them to stage 1. This is done only to not
-    # get misleading log messages
-    deps_promotion: set[str] = STAGE_1_INTEGRATIONS
-    while deps_promotion:
-        old_deps_promotion = deps_promotion
-        deps_promotion = set()
-
-        for domain in old_deps_promotion:
-            if domain not in domains_to_setup or domain in stage_1_domains:
-                continue
-
-            stage_1_domains.add(domain)
-
-            if (dep_itg := integration_cache.get(domain)) is None:
-                continue
-
-            deps_promotion.update(dep_itg.all_dependencies)
-
-    stage_2_domains = domains_to_setup - stage_1_domains
-
-    for name, domain_group in pre_stage_domains:
-        if domain_group:
-            stage_2_domains -= domain_group
-            _LOGGER.info("Setting up %s: %s", name, domain_group)
-            to_be_loaded = domain_group.copy()
-            to_be_loaded.update(
-                dep
-                for domain in domain_group
-                if (integration := integration_cache.get(domain)) is not None
-                for dep in integration.all_dependencies
-            )
-            async_set_domains_to_be_loaded(hass, to_be_loaded)
-            await async_setup_multi_components(hass, domain_group, config)
-
-    # Enables after dependencies when setting up stage 1 domains
-    async_set_domains_to_be_loaded(hass, stage_1_domains)
-
-    # Start setup
-    if stage_1_domains:
-        _LOGGER.info("Setting up stage 1: %s", stage_1_domains)
-        try:
-            async with hass.timeout.async_timeout(
-                STAGE_1_TIMEOUT, cool_down=COOLDOWN_TIME
-            ):
-                await async_setup_multi_components(hass, stage_1_domains, config)
-        except TimeoutError:
-            _LOGGER.warning(
-                "Setup timed out for stage 1 waiting on %s - moving forward",
-                hass._active_tasks,  # noqa: SLF001
-            )
-
-    # Add after dependencies when setting up stage 2 domains
-    async_set_domains_to_be_loaded(hass, stage_2_domains)
-
-    if stage_2_domains:
-        _LOGGER.info("Setting up stage 2: %s", stage_2_domains)
-        try:
-            async with hass.timeout.async_timeout(
-                STAGE_2_TIMEOUT, cool_down=COOLDOWN_TIME
-            ):
-                await async_setup_multi_components(hass, stage_2_domains, config)
-        except TimeoutError:
-            _LOGGER.warning(
-                "Setup timed out for stage 2 waiting on %s - moving forward",
-                hass._active_tasks,  # noqa: SLF001
-            )
-
-    # Wrap up startup
-    _LOGGER.debug("Waiting for startup to wrap up")
-    try:
-        async with hass.timeout.async_timeout(WRAP_UP_TIMEOUT, cool_down=COOLDOWN_TIME):
-            await hass.async_block_till_done()
-    except TimeoutError:
-        _LOGGER.warning(
-            "Setup timed out for bootstrap waiting on %s - moving forward",
-            hass._active_tasks,  # noqa: SLF001
-        )
-
-    watcher.async_stop()
-
-    if _LOGGER.isEnabledFor(logging.DEBUG):
-        setup_time = async_get_setup_timings(hass)
-        _LOGGER.debug(
-            "Integration setup times: %s",
-            dict(sorted(setup_time.items(), key=itemgetter(1), reverse=True)),
-        )
diff --git a/homeassistant/brands/google.json b/homeassistant/brands/google.json
index 028fa544a5f..872cfc0aac5 100644
--- a/homeassistant/brands/google.json
+++ b/homeassistant/brands/google.json
@@ -5,6 +5,7 @@
     "google_assistant",
     "google_assistant_sdk",
     "google_cloud",
+    "google_drive",
     "google_generative_ai_conversation",
     "google_mail",
     "google_maps",
diff --git a/homeassistant/brands/microsoft.json b/homeassistant/brands/microsoft.json
index 4d9eb5f95f3..918f67f06dd 100644
--- a/homeassistant/brands/microsoft.json
+++ b/homeassistant/brands/microsoft.json
@@ -6,11 +6,13 @@
     "azure_devops",
     "azure_event_hub",
     "azure_service_bus",
+    "azure_storage",
     "microsoft_face_detect",
     "microsoft_face_identify",
     "microsoft_face",
     "microsoft",
     "msteams",
+    "onedrive",
     "xbox"
   ]
 }
diff --git a/homeassistant/brands/motionblinds.json b/homeassistant/brands/motionblinds.json
index 67013e75966..5a48b573b4d 100644
--- a/homeassistant/brands/motionblinds.json
+++ b/homeassistant/brands/motionblinds.json
@@ -1,5 +1,6 @@
 {
   "domain": "motionblinds",
   "name": "Motionblinds",
-  "integrations": ["motion_blinds", "motionblinds_ble"]
+  "integrations": ["motion_blinds", "motionblinds_ble"],
+  "iot_standards": ["matter"]
 }
diff --git a/homeassistant/brands/sensorpush.json b/homeassistant/brands/sensorpush.json
new file mode 100644
index 00000000000..b7e528948f8
--- /dev/null
+++ b/homeassistant/brands/sensorpush.json
@@ -0,0 +1,5 @@
+{
+  "domain": "sensorpush",
+  "name": "SensorPush",
+  "integrations": ["sensorpush", "sensorpush_cloud"]
+}
diff --git a/homeassistant/components/abode/alarm_control_panel.py b/homeassistant/components/abode/alarm_control_panel.py
index 4ec59ca4c39..554cf932fca 100644
--- a/homeassistant/components/abode/alarm_control_panel.py
+++ b/homeassistant/components/abode/alarm_control_panel.py
@@ -11,7 +11,7 @@ from homeassistant.components.alarm_control_panel import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AbodeSystem
 from .const import DOMAIN
@@ -19,7 +19,9 @@ from .entity import AbodeDevice
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Abode alarm control panel device."""
     data: AbodeSystem = hass.data[DOMAIN]
diff --git a/homeassistant/components/abode/binary_sensor.py b/homeassistant/components/abode/binary_sensor.py
index ca9679a5aaa..6f64fa46c0a 100644
--- a/homeassistant/components/abode/binary_sensor.py
+++ b/homeassistant/components/abode/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
 
 from . import AbodeSystem
@@ -21,7 +21,9 @@ from .entity import AbodeDevice
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Abode binary sensor devices."""
     data: AbodeSystem = hass.data[DOMAIN]
diff --git a/homeassistant/components/abode/camera.py b/homeassistant/components/abode/camera.py
index 58107f16462..3587c8c1799 100644
--- a/homeassistant/components/abode/camera.py
+++ b/homeassistant/components/abode/camera.py
@@ -15,7 +15,7 @@ from homeassistant.components.camera import Camera
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import Event, HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import Throttle
 
 from . import AbodeSystem
@@ -26,7 +26,9 @@ MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=90)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Abode camera devices."""
     data: AbodeSystem = hass.data[DOMAIN]
diff --git a/homeassistant/components/abode/cover.py b/homeassistant/components/abode/cover.py
index b5b1e878b96..bc9df9d4a25 100644
--- a/homeassistant/components/abode/cover.py
+++ b/homeassistant/components/abode/cover.py
@@ -7,7 +7,7 @@ from jaraco.abode.devices.cover import Cover
 from homeassistant.components.cover import CoverEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AbodeSystem
 from .const import DOMAIN
@@ -15,7 +15,9 @@ from .entity import AbodeDevice
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Abode cover devices."""
     data: AbodeSystem = hass.data[DOMAIN]
diff --git a/homeassistant/components/abode/light.py b/homeassistant/components/abode/light.py
index e2d0a331f0a..9614e84ebad 100644
--- a/homeassistant/components/abode/light.py
+++ b/homeassistant/components/abode/light.py
@@ -18,7 +18,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AbodeSystem
 from .const import DOMAIN
@@ -26,7 +26,9 @@ from .entity import AbodeDevice
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Abode light devices."""
     data: AbodeSystem = hass.data[DOMAIN]
diff --git a/homeassistant/components/abode/lock.py b/homeassistant/components/abode/lock.py
index ceff263e6b5..94832ed41f9 100644
--- a/homeassistant/components/abode/lock.py
+++ b/homeassistant/components/abode/lock.py
@@ -7,7 +7,7 @@ from jaraco.abode.devices.lock import Lock
 from homeassistant.components.lock import LockEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AbodeSystem
 from .const import DOMAIN
@@ -15,7 +15,9 @@ from .entity import AbodeDevice
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Abode lock devices."""
     data: AbodeSystem = hass.data[DOMAIN]
diff --git a/homeassistant/components/abode/sensor.py b/homeassistant/components/abode/sensor.py
index d6a5389029b..ee168c16509 100644
--- a/homeassistant/components/abode/sensor.py
+++ b/homeassistant/components/abode/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import LIGHT_LUX, PERCENTAGE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AbodeSystem
 from .const import DOMAIN
@@ -61,7 +61,9 @@ SENSOR_TYPES: tuple[AbodeSensorDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Abode sensor devices."""
     data: AbodeSystem = hass.data[DOMAIN]
diff --git a/homeassistant/components/abode/switch.py b/homeassistant/components/abode/switch.py
index 7dad750c8d5..f6018d99fc8 100644
--- a/homeassistant/components/abode/switch.py
+++ b/homeassistant/components/abode/switch.py
@@ -10,7 +10,7 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AbodeSystem
 from .const import DOMAIN
@@ -20,7 +20,9 @@ DEVICE_TYPES = ["switch", "valve"]
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Abode switch devices."""
     data: AbodeSystem = hass.data[DOMAIN]
diff --git a/homeassistant/components/acaia/binary_sensor.py b/homeassistant/components/acaia/binary_sensor.py
index ecb7ac06eb5..d720488faa0 100644
--- a/homeassistant/components/acaia/binary_sensor.py
+++ b/homeassistant/components/acaia/binary_sensor.py
@@ -11,7 +11,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import AcaiaConfigEntry
 from .entity import AcaiaEntity
@@ -40,7 +40,7 @@ BINARY_SENSORS: tuple[AcaiaBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AcaiaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up binary sensors."""
 
diff --git a/homeassistant/components/acaia/button.py b/homeassistant/components/acaia/button.py
index a41233bfc17..446f6134789 100644
--- a/homeassistant/components/acaia/button.py
+++ b/homeassistant/components/acaia/button.py
@@ -8,7 +8,7 @@ from aioacaia.acaiascale import AcaiaScale
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import AcaiaConfigEntry
 from .entity import AcaiaEntity
@@ -45,7 +45,7 @@ BUTTONS: tuple[AcaiaButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AcaiaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up button entities and services."""
 
diff --git a/homeassistant/components/acaia/sensor.py b/homeassistant/components/acaia/sensor.py
index 7ba44958eca..f62b93ddf1d 100644
--- a/homeassistant/components/acaia/sensor.py
+++ b/homeassistant/components/acaia/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, UnitOfMass, UnitOfVolumeFlowRate
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import AcaiaConfigEntry
 from .entity import AcaiaEntity
@@ -77,7 +77,7 @@ RESTORE_SENSORS: tuple[AcaiaSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AcaiaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors."""
 
diff --git a/homeassistant/components/accuweather/config_flow.py b/homeassistant/components/accuweather/config_flow.py
index 71f7de89528..3e65374f391 100644
--- a/homeassistant/components/accuweather/config_flow.py
+++ b/homeassistant/components/accuweather/config_flow.py
@@ -12,8 +12,8 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 
 from .const import DOMAIN
 
diff --git a/homeassistant/components/accuweather/const.py b/homeassistant/components/accuweather/const.py
index 1bbf5a36187..7216f5a0b9b 100644
--- a/homeassistant/components/accuweather/const.py
+++ b/homeassistant/components/accuweather/const.py
@@ -24,7 +24,7 @@ from homeassistant.components.weather import (
 
 API_METRIC: Final = "Metric"
 ATTRIBUTION: Final = "Data provided by AccuWeather"
-ATTR_CATEGORY: Final = "Category"
+ATTR_CATEGORY_VALUE = "CategoryValue"
 ATTR_DIRECTION: Final = "Direction"
 ATTR_ENGLISH: Final = "English"
 ATTR_LEVEL: Final = "level"
@@ -55,5 +55,18 @@ CONDITION_MAP = {
     for cond_ha, cond_codes in CONDITION_CLASSES.items()
     for cond_code in cond_codes
 }
+AIR_QUALITY_CATEGORY_MAP = {
+    1: "good",
+    2: "moderate",
+    3: "unhealthy",
+    4: "very_unhealthy",
+    5: "hazardous",
+}
+POLLEN_CATEGORY_MAP = {
+    1: "low",
+    2: "moderate",
+    3: "high",
+    4: "very_high",
+}
 UPDATE_INTERVAL_OBSERVATION = timedelta(minutes=40)
 UPDATE_INTERVAL_DAILY_FORECAST = timedelta(hours=6)
diff --git a/homeassistant/components/accuweather/coordinator.py b/homeassistant/components/accuweather/coordinator.py
index 40ff3ad2c87..780c977f930 100644
--- a/homeassistant/components/accuweather/coordinator.py
+++ b/homeassistant/components/accuweather/coordinator.py
@@ -75,7 +75,11 @@ class AccuWeatherObservationDataUpdateCoordinator(
             async with timeout(10):
                 result = await self.accuweather.async_get_current_conditions()
         except EXCEPTIONS as error:
-            raise UpdateFailed(error) from error
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="current_conditions_update_error",
+                translation_placeholders={"error": repr(error)},
+            ) from error
 
         _LOGGER.debug("Requests remaining: %d", self.accuweather.requests_remaining)
 
@@ -117,9 +121,15 @@ class AccuWeatherDailyForecastDataUpdateCoordinator(
         """Update data via library."""
         try:
             async with timeout(10):
-                result = await self.accuweather.async_get_daily_forecast()
+                result = await self.accuweather.async_get_daily_forecast(
+                    language=self.hass.config.language
+                )
         except EXCEPTIONS as error:
-            raise UpdateFailed(error) from error
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="forecast_update_error",
+                translation_placeholders={"error": repr(error)},
+            ) from error
 
         _LOGGER.debug("Requests remaining: %d", self.accuweather.requests_remaining)
 
diff --git a/homeassistant/components/accuweather/manifest.json b/homeassistant/components/accuweather/manifest.json
index 75f4a265b5f..810557519eb 100644
--- a/homeassistant/components/accuweather/manifest.json
+++ b/homeassistant/components/accuweather/manifest.json
@@ -7,6 +7,6 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["accuweather"],
-  "requirements": ["accuweather==4.0.0"],
+  "requirements": ["accuweather==4.2.0"],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/accuweather/sensor.py b/homeassistant/components/accuweather/sensor.py
index 001edc5f197..415df402d55 100644
--- a/homeassistant/components/accuweather/sensor.py
+++ b/homeassistant/components/accuweather/sensor.py
@@ -25,12 +25,13 @@ from homeassistant.const import (
     UnitOfVolumetricFlux,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
+    AIR_QUALITY_CATEGORY_MAP,
     API_METRIC,
-    ATTR_CATEGORY,
+    ATTR_CATEGORY_VALUE,
     ATTR_DIRECTION,
     ATTR_ENGLISH,
     ATTR_LEVEL,
@@ -38,6 +39,7 @@ from .const import (
     ATTR_VALUE,
     ATTRIBUTION,
     MAX_FORECAST_DAYS,
+    POLLEN_CATEGORY_MAP,
 )
 from .coordinator import (
     AccuWeatherConfigEntry,
@@ -59,9 +61,9 @@ class AccuWeatherSensorDescription(SensorEntityDescription):
 FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
     AccuWeatherSensorDescription(
         key="AirQuality",
-        value_fn=lambda data: cast(str, data[ATTR_CATEGORY]),
+        value_fn=lambda data: AIR_QUALITY_CATEGORY_MAP[data[ATTR_CATEGORY_VALUE]],
         device_class=SensorDeviceClass.ENUM,
-        options=["good", "hazardous", "high", "low", "moderate", "unhealthy"],
+        options=list(AIR_QUALITY_CATEGORY_MAP.values()),
         translation_key="air_quality",
     ),
     AccuWeatherSensorDescription(
@@ -83,7 +85,9 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         entity_registry_enabled_default=False,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
         value_fn=lambda data: cast(int, data[ATTR_VALUE]),
-        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+        attr_fn=lambda data: {
+            ATTR_LEVEL: POLLEN_CATEGORY_MAP[data[ATTR_CATEGORY_VALUE]]
+        },
         translation_key="grass_pollen",
     ),
     AccuWeatherSensorDescription(
@@ -107,7 +111,9 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         entity_registry_enabled_default=False,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
         value_fn=lambda data: cast(int, data[ATTR_VALUE]),
-        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+        attr_fn=lambda data: {
+            ATTR_LEVEL: POLLEN_CATEGORY_MAP[data[ATTR_CATEGORY_VALUE]]
+        },
         translation_key="mold_pollen",
     ),
     AccuWeatherSensorDescription(
@@ -115,7 +121,9 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
         entity_registry_enabled_default=False,
         value_fn=lambda data: cast(int, data[ATTR_VALUE]),
-        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+        attr_fn=lambda data: {
+            ATTR_LEVEL: POLLEN_CATEGORY_MAP[data[ATTR_CATEGORY_VALUE]]
+        },
         translation_key="ragweed_pollen",
     ),
     AccuWeatherSensorDescription(
@@ -181,14 +189,18 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
         entity_registry_enabled_default=False,
         value_fn=lambda data: cast(int, data[ATTR_VALUE]),
-        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+        attr_fn=lambda data: {
+            ATTR_LEVEL: POLLEN_CATEGORY_MAP[data[ATTR_CATEGORY_VALUE]]
+        },
         translation_key="tree_pollen",
     ),
     AccuWeatherSensorDescription(
         key="UVIndex",
         native_unit_of_measurement=UV_INDEX,
         value_fn=lambda data: cast(int, data[ATTR_VALUE]),
-        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+        attr_fn=lambda data: {
+            ATTR_LEVEL: POLLEN_CATEGORY_MAP[data[ATTR_CATEGORY_VALUE]]
+        },
         translation_key="uv_index_forecast",
     ),
     AccuWeatherSensorDescription(
@@ -375,7 +387,7 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AccuWeatherConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add AccuWeather entities from a config_entry."""
     observation_coordinator: AccuWeatherObservationDataUpdateCoordinator = (
diff --git a/homeassistant/components/accuweather/strings.json b/homeassistant/components/accuweather/strings.json
index 78a49b8b877..e1a71c5e1a5 100644
--- a/homeassistant/components/accuweather/strings.json
+++ b/homeassistant/components/accuweather/strings.json
@@ -16,7 +16,7 @@
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]",
-      "requests_exceeded": "The allowed number of requests to Accuweather API has been exceeded. You have to wait or change API Key."
+      "requests_exceeded": "The allowed number of requests to the AccuWeather API has been exceeded. You have to wait or change the API key."
     }
   },
   "entity": {
@@ -26,10 +26,20 @@
         "state": {
           "good": "Good",
           "hazardous": "Hazardous",
-          "high": "High",
-          "low": "Low",
           "moderate": "Moderate",
-          "unhealthy": "Unhealthy"
+          "unhealthy": "Unhealthy",
+          "very_unhealthy": "Very unhealthy"
+        },
+        "state_attributes": {
+          "options": {
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]",
+              "very_unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::very_unhealthy%]"
+            }
+          }
         }
       },
       "apparent_temperature": {
@@ -62,12 +72,10 @@
           "level": {
             "name": "Level",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
+              "high": "High",
+              "low": "Low",
+              "moderate": "Moderate",
+              "very_high": "Very high"
             }
           }
         }
@@ -81,12 +89,10 @@
           "level": {
             "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
+              "high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
+              "very_high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::very_high%]"
             }
           }
         }
@@ -100,6 +106,15 @@
           "steady": "Steady",
           "rising": "Rising",
           "falling": "Falling"
+        },
+        "state_attributes": {
+          "options": {
+            "state": {
+              "falling": "[%key:component::accuweather::entity::sensor::pressure_tendency::state::falling%]",
+              "rising": "[%key:component::accuweather::entity::sensor::pressure_tendency::state::rising%]",
+              "steady": "[%key:component::accuweather::entity::sensor::pressure_tendency::state::steady%]"
+            }
+          }
         }
       },
       "ragweed_pollen": {
@@ -108,12 +123,10 @@
           "level": {
             "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
+              "high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
+              "very_high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::very_high%]"
             }
           }
         }
@@ -154,12 +167,10 @@
           "level": {
             "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
+              "high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
+              "very_high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::very_high%]"
             }
           }
         }
@@ -170,12 +181,10 @@
           "level": {
             "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
+              "high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
+              "very_high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::very_high%]"
             }
           }
         }
@@ -186,12 +195,10 @@
           "level": {
             "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
+              "high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
+              "very_high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::very_high%]"
             }
           }
         }
@@ -222,6 +229,14 @@
       }
     }
   },
+  "exceptions": {
+    "current_conditions_update_error": {
+      "message": "An error occurred while retrieving weather current conditions data from the AccuWeather API: {error}"
+    },
+    "forecast_update_error": {
+      "message": "An error occurred while retrieving weather forecast data from the AccuWeather API: {error}"
+    }
+  },
   "system_health": {
     "info": {
       "can_reach_server": "Reach AccuWeather server",
diff --git a/homeassistant/components/accuweather/weather.py b/homeassistant/components/accuweather/weather.py
index 7d754278d91..770f2b64f20 100644
--- a/homeassistant/components/accuweather/weather.py
+++ b/homeassistant/components/accuweather/weather.py
@@ -30,7 +30,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.dt import utc_from_timestamp
 
 from .const import (
@@ -54,7 +54,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AccuWeatherConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add a AccuWeather weather entity from a config_entry."""
     async_add_entities([AccuWeatherEntity(entry.runtime_data)])
diff --git a/homeassistant/components/acer_projector/switch.py b/homeassistant/components/acer_projector/switch.py
index c1463cd9a08..846164202d8 100644
--- a/homeassistant/components/acer_projector/switch.py
+++ b/homeassistant/components/acer_projector/switch.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/acmeda/__init__.py b/homeassistant/components/acmeda/__init__.py
index 62a62795a05..ec7abe258cf 100644
--- a/homeassistant/components/acmeda/__init__.py
+++ b/homeassistant/components/acmeda/__init__.py
@@ -3,7 +3,7 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from .hub import PulseHub
 
diff --git a/homeassistant/components/acmeda/cover.py b/homeassistant/components/acmeda/cover.py
index 77099e86adc..d09ba4bac08 100644
--- a/homeassistant/components/acmeda/cover.py
+++ b/homeassistant/components/acmeda/cover.py
@@ -11,7 +11,7 @@ from homeassistant.components.cover import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AcmedaConfigEntry
 from .const import ACMEDA_HUB_UPDATE
@@ -22,7 +22,7 @@ from .helpers import async_add_acmeda_entities
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AcmedaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Acmeda Rollers from a config entry."""
     hub = config_entry.runtime_data
diff --git a/homeassistant/components/acmeda/helpers.py b/homeassistant/components/acmeda/helpers.py
index 52af7d586de..4c0f9b32cff 100644
--- a/homeassistant/components/acmeda/helpers.py
+++ b/homeassistant/components/acmeda/helpers.py
@@ -9,7 +9,7 @@ from aiopulse import Roller
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, LOGGER
 
@@ -23,7 +23,7 @@ def async_add_acmeda_entities(
     entity_class: type,
     config_entry: AcmedaConfigEntry,
     current: set[int],
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add any new entities."""
     hub = config_entry.runtime_data
diff --git a/homeassistant/components/acmeda/sensor.py b/homeassistant/components/acmeda/sensor.py
index f5df1bf013d..515146f3d1a 100644
--- a/homeassistant/components/acmeda/sensor.py
+++ b/homeassistant/components/acmeda/sensor.py
@@ -6,7 +6,7 @@ from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AcmedaConfigEntry
 from .const import ACMEDA_HUB_UPDATE
@@ -17,7 +17,7 @@ from .helpers import async_add_acmeda_entities
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AcmedaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Acmeda Rollers from a config entry."""
     hub = config_entry.runtime_data
diff --git a/homeassistant/components/actiontec/device_tracker.py b/homeassistant/components/actiontec/device_tracker.py
index 273ca6a772f..41876ce478f 100644
--- a/homeassistant/components/actiontec/device_tracker.py
+++ b/homeassistant/components/actiontec/device_tracker.py
@@ -15,7 +15,7 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import LEASES_REGEX
diff --git a/homeassistant/components/adax/climate.py b/homeassistant/components/adax/climate.py
index 15022ba3c9f..078640cd367 100644
--- a/homeassistant/components/adax/climate.py
+++ b/homeassistant/components/adax/climate.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import ACCOUNT_ID, CONNECTION_TYPE, DOMAIN, LOCAL
 
@@ -33,7 +33,7 @@ from .const import ACCOUNT_ID, CONNECTION_TYPE, DOMAIN, LOCAL
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Adax thermostat with config flow."""
     if entry.data.get(CONNECTION_TYPE) == LOCAL:
diff --git a/homeassistant/components/adax/strings.json b/homeassistant/components/adax/strings.json
index 6157b7dfc91..9ba497a9aca 100644
--- a/homeassistant/components/adax/strings.json
+++ b/homeassistant/components/adax/strings.json
@@ -5,14 +5,14 @@
         "data": {
           "connection_type": "Select connection type"
         },
-        "description": "Select connection type. Local requires heaters with bluetooth"
+        "description": "Select connection type. Local requires heaters with Bluetooth"
       },
       "local": {
         "data": {
           "wifi_ssid": "Wi-Fi SSID",
-          "wifi_pswd": "Wi-Fi Password"
+          "wifi_pswd": "Wi-Fi password"
         },
-        "description": "Reset the heater by pressing + and OK until display shows 'Reset'. Then press and hold OK button on the heater until the blue led starts blinking before pressing Submit. Configuring heater might take some minutes."
+        "description": "Reset the heater by pressing + and OK until display shows 'Reset'. Then press and hold OK button on the heater until the blue LED starts blinking before pressing Submit. Configuring heater might take some minutes."
       },
       "cloud": {
         "data": {
diff --git a/homeassistant/components/adguard/__init__.py b/homeassistant/components/adguard/__init__.py
index f8ddeba6767..bbc763d7ec3 100644
--- a/homeassistant/components/adguard/__init__.py
+++ b/homeassistant/components/adguard/__init__.py
@@ -7,7 +7,7 @@ from dataclasses import dataclass
 from adguardhome import AdGuardHome, AdGuardHomeConnectionError
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_HOST,
     CONF_NAME,
@@ -123,12 +123,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AdGuardConfigEntry) -> b
 async def async_unload_entry(hass: HomeAssistant, entry: AdGuardConfigEntry) -> bool:
     """Unload AdGuard Home config entry."""
     unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    loaded_entries = [
-        entry
-        for entry in hass.config_entries.async_entries(DOMAIN)
-        if entry.state == ConfigEntryState.LOADED
-    ]
-    if len(loaded_entries) == 1:
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
         # This is the last loaded instance of AdGuard, deregister any services
         hass.services.async_remove(DOMAIN, SERVICE_ADD_URL)
         hass.services.async_remove(DOMAIN, SERVICE_REMOVE_URL)
diff --git a/homeassistant/components/adguard/sensor.py b/homeassistant/components/adguard/sensor.py
index b2404a88278..f1af8ac32a4 100644
--- a/homeassistant/components/adguard/sensor.py
+++ b/homeassistant/components/adguard/sensor.py
@@ -12,7 +12,7 @@ from adguardhome import AdGuardHome
 from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
 from homeassistant.const import PERCENTAGE, UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AdGuardConfigEntry, AdGuardData
 from .const import DOMAIN
@@ -85,7 +85,7 @@ SENSORS: tuple[AdGuardHomeEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AdGuardConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AdGuard Home sensor based on a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/adguard/strings.json b/homeassistant/components/adguard/strings.json
index 5b6a5a546f7..44f4a388e6e 100644
--- a/homeassistant/components/adguard/strings.json
+++ b/homeassistant/components/adguard/strings.json
@@ -79,7 +79,7 @@
   "services": {
     "add_url": {
       "name": "Add URL",
-      "description": "Add a new filter subscription to AdGuard Home.",
+      "description": "Adds a new filter subscription to AdGuard Home.",
       "fields": {
         "name": {
           "name": "[%key:common::config_flow::data::name%]",
@@ -123,11 +123,11 @@
     },
     "refresh": {
       "name": "Refresh",
-      "description": "Refresh all filter subscriptions in AdGuard Home.",
+      "description": "Refreshes all filter subscriptions in AdGuard Home.",
       "fields": {
         "force": {
           "name": "Force",
-          "description": "Force update (bypasses AdGuard Home throttling). \"true\" to force, or \"false\" to omit for a regular refresh."
+          "description": "Force update (bypasses AdGuard Home throttling), omit for a regular refresh."
         }
       }
     }
diff --git a/homeassistant/components/adguard/switch.py b/homeassistant/components/adguard/switch.py
index 3ea4f9d1d93..5128102a955 100644
--- a/homeassistant/components/adguard/switch.py
+++ b/homeassistant/components/adguard/switch.py
@@ -11,7 +11,7 @@ from adguardhome import AdGuardHome, AdGuardHomeError
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AdGuardConfigEntry, AdGuardData
 from .const import DOMAIN, LOGGER
@@ -79,7 +79,7 @@ SWITCHES: tuple[AdGuardHomeSwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AdGuardConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AdGuard Home switch based on a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/ads/__init__.py b/homeassistant/components/ads/__init__.py
index 892390a91eb..da34bd36e2c 100644
--- a/homeassistant/components/ads/__init__.py
+++ b/homeassistant/components/ads/__init__.py
@@ -12,7 +12,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import CONF_ADS_VAR, DATA_ADS, DOMAIN, AdsType
diff --git a/homeassistant/components/ads/binary_sensor.py b/homeassistant/components/ads/binary_sensor.py
index 72a12506dc1..560d090caf0 100644
--- a/homeassistant/components/ads/binary_sensor.py
+++ b/homeassistant/components/ads/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import CONF_DEVICE_CLASS, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/ads/cover.py b/homeassistant/components/ads/cover.py
index c7b0f4f2f8a..15d5b3a7d09 100644
--- a/homeassistant/components/ads/cover.py
+++ b/homeassistant/components/ads/cover.py
@@ -17,7 +17,7 @@ from homeassistant.components.cover import (
 )
 from homeassistant.const import CONF_DEVICE_CLASS, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/ads/light.py b/homeassistant/components/ads/light.py
index 5ea4868bf11..3de223e5fc4 100644
--- a/homeassistant/components/ads/light.py
+++ b/homeassistant/components/ads/light.py
@@ -15,7 +15,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/ads/select.py b/homeassistant/components/ads/select.py
index 39f813dec27..e31e089d669 100644
--- a/homeassistant/components/ads/select.py
+++ b/homeassistant/components/ads/select.py
@@ -11,7 +11,7 @@ from homeassistant.components.select import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/ads/sensor.py b/homeassistant/components/ads/sensor.py
index 09579161a94..0fd1b84ffd1 100644
--- a/homeassistant/components/ads/sensor.py
+++ b/homeassistant/components/ads/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_DEVICE_CLASS, CONF_NAME, CONF_UNIT_OF_MEASUREMENT
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, StateType
 
diff --git a/homeassistant/components/ads/switch.py b/homeassistant/components/ads/switch.py
index 0412a127c95..2506757e9d2 100644
--- a/homeassistant/components/ads/switch.py
+++ b/homeassistant/components/ads/switch.py
@@ -13,7 +13,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/ads/valve.py b/homeassistant/components/ads/valve.py
index b94215ec9ea..a251e14b3c3 100644
--- a/homeassistant/components/ads/valve.py
+++ b/homeassistant/components/ads/valve.py
@@ -14,7 +14,7 @@ from homeassistant.components.valve import (
 )
 from homeassistant.const import CONF_DEVICE_CLASS, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/advantage_air/binary_sensor.py b/homeassistant/components/advantage_air/binary_sensor.py
index 601b10aeb4a..dd306b82c8a 100644
--- a/homeassistant/components/advantage_air/binary_sensor.py
+++ b/homeassistant/components/advantage_air/binary_sensor.py
@@ -8,7 +8,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AdvantageAirDataConfigEntry
 from .entity import AdvantageAirAcEntity, AdvantageAirZoneEntity
@@ -20,7 +20,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AdvantageAirDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AdvantageAir Binary Sensor platform."""
 
diff --git a/homeassistant/components/advantage_air/climate.py b/homeassistant/components/advantage_air/climate.py
index d07a3182ed7..1d593c5c3c8 100644
--- a/homeassistant/components/advantage_air/climate.py
+++ b/homeassistant/components/advantage_air/climate.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from decimal import Decimal
 import logging
 from typing import Any
 
@@ -14,12 +15,13 @@ from homeassistant.components.climate import (
     FAN_MEDIUM,
     ClimateEntity,
     ClimateEntityFeature,
+    HVACAction,
     HVACMode,
 )
 from homeassistant.const import ATTR_TEMPERATURE, PRECISION_WHOLE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AdvantageAirDataConfigEntry
 from .const import (
@@ -49,6 +51,14 @@ ADVANTAGE_AIR_MYTEMP_ENABLED = "climateControlModeEnabled"
 ADVANTAGE_AIR_HEAT_TARGET = "myAutoHeatTargetTemp"
 ADVANTAGE_AIR_COOL_TARGET = "myAutoCoolTargetTemp"
 ADVANTAGE_AIR_MYFAN = "autoAA"
+ADVANTAGE_AIR_MYAUTO_MODE_SET = "myAutoModeCurrentSetMode"
+
+HVAC_ACTIONS = {
+    "cool": HVACAction.COOLING,
+    "heat": HVACAction.HEATING,
+    "vent": HVACAction.FAN,
+    "dry": HVACAction.DRYING,
+}
 
 HVAC_MODES = [
     HVACMode.OFF,
@@ -76,7 +86,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AdvantageAirDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AdvantageAir climate platform."""
 
@@ -175,6 +185,17 @@ class AdvantageAirAC(AdvantageAirAcEntity, ClimateEntity):
             return ADVANTAGE_AIR_HVAC_MODES.get(self._ac["mode"])
         return HVACMode.OFF
 
+    @property
+    def hvac_action(self) -> HVACAction | None:
+        """Return the current running HVAC action."""
+        if self._ac["state"] == ADVANTAGE_AIR_STATE_OFF:
+            return HVACAction.OFF
+        if self._ac["mode"] == "myauto":
+            return HVAC_ACTIONS.get(
+                self._ac.get(ADVANTAGE_AIR_MYAUTO_MODE_SET, HVACAction.OFF)
+            )
+        return HVAC_ACTIONS.get(self._ac["mode"])
+
     @property
     def fan_mode(self) -> str | None:
         """Return the current fan modes."""
@@ -273,6 +294,22 @@ class AdvantageAirZone(AdvantageAirZoneEntity, ClimateEntity):
             return HVACMode.HEAT_COOL
         return HVACMode.OFF
 
+    @property
+    def hvac_action(self) -> HVACAction | None:
+        """Return the HVAC action, inheriting from master AC if zone is open but idle if air is <= 5%."""
+        if self._ac["state"] == ADVANTAGE_AIR_STATE_OFF:
+            return HVACAction.OFF
+        master_action = HVAC_ACTIONS.get(self._ac["mode"], HVACAction.OFF)
+        if self._ac["mode"] == "myauto":
+            master_action = HVAC_ACTIONS.get(
+                str(self._ac.get(ADVANTAGE_AIR_MYAUTO_MODE_SET)), HVACAction.OFF
+            )
+        if self._zone["state"] == ADVANTAGE_AIR_STATE_OPEN:
+            if self._zone["value"] <= Decimal(5):
+                return HVACAction.IDLE
+            return master_action
+        return HVACAction.OFF
+
     @property
     def current_temperature(self) -> float | None:
         """Return the current temperature."""
diff --git a/homeassistant/components/advantage_air/const.py b/homeassistant/components/advantage_air/const.py
index 6ae0a0e06d5..103ca57f6ef 100644
--- a/homeassistant/components/advantage_air/const.py
+++ b/homeassistant/components/advantage_air/const.py
@@ -7,3 +7,4 @@ ADVANTAGE_AIR_STATE_CLOSE = "close"
 ADVANTAGE_AIR_STATE_ON = "on"
 ADVANTAGE_AIR_STATE_OFF = "off"
 ADVANTAGE_AIR_AUTOFAN_ENABLED = "aaAutoFanModeEnabled"
+ADVANTAGE_AIR_NIGHT_MODE_ENABLED = "quietNightModeEnabled"
diff --git a/homeassistant/components/advantage_air/cover.py b/homeassistant/components/advantage_air/cover.py
index b091f0077a1..e764d484128 100644
--- a/homeassistant/components/advantage_air/cover.py
+++ b/homeassistant/components/advantage_air/cover.py
@@ -9,7 +9,7 @@ from homeassistant.components.cover import (
     CoverEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AdvantageAirDataConfigEntry
 from .const import ADVANTAGE_AIR_STATE_CLOSE, ADVANTAGE_AIR_STATE_OPEN
@@ -22,7 +22,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AdvantageAirDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AdvantageAir cover platform."""
 
@@ -41,7 +41,7 @@ async def async_setup_entry(
                 entities.append(
                     AdvantageAirThingCover(instance, thing, CoverDeviceClass.BLIND)
                 )
-            elif thing["channelDipState"] == 3:  # 3 = "Garage door"
+            elif thing["channelDipState"] in [3, 10]:  # 3 & 10 = "Garage door"
                 entities.append(
                     AdvantageAirThingCover(instance, thing, CoverDeviceClass.GARAGE)
                 )
diff --git a/homeassistant/components/advantage_air/light.py b/homeassistant/components/advantage_air/light.py
index 7dd0a0a183b..ffd502663b0 100644
--- a/homeassistant/components/advantage_air/light.py
+++ b/homeassistant/components/advantage_air/light.py
@@ -5,7 +5,7 @@ from typing import Any
 from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AdvantageAirDataConfigEntry
 from .const import ADVANTAGE_AIR_STATE_ON, DOMAIN as ADVANTAGE_AIR_DOMAIN
@@ -16,7 +16,7 @@ from .models import AdvantageAirData
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AdvantageAirDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AdvantageAir light platform."""
 
diff --git a/homeassistant/components/advantage_air/select.py b/homeassistant/components/advantage_air/select.py
index 84c37f38d7f..320bfd35aba 100644
--- a/homeassistant/components/advantage_air/select.py
+++ b/homeassistant/components/advantage_air/select.py
@@ -2,7 +2,7 @@
 
 from homeassistant.components.select import SelectEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AdvantageAirDataConfigEntry
 from .entity import AdvantageAirAcEntity
@@ -14,7 +14,7 @@ ADVANTAGE_AIR_INACTIVE = "Inactive"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AdvantageAirDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AdvantageAir select platform."""
 
diff --git a/homeassistant/components/advantage_air/sensor.py b/homeassistant/components/advantage_air/sensor.py
index ab1a1c4f9a0..2abcc3b5a68 100644
--- a/homeassistant/components/advantage_air/sensor.py
+++ b/homeassistant/components/advantage_air/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AdvantageAirDataConfigEntry
 from .const import ADVANTAGE_AIR_STATE_OPEN
@@ -32,7 +32,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AdvantageAirDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AdvantageAir sensor platform."""
 
diff --git a/homeassistant/components/advantage_air/switch.py b/homeassistant/components/advantage_air/switch.py
index 876875a2510..8560c9a9138 100644
--- a/homeassistant/components/advantage_air/switch.py
+++ b/homeassistant/components/advantage_air/switch.py
@@ -4,11 +4,12 @@ from typing import Any
 
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AdvantageAirDataConfigEntry
 from .const import (
     ADVANTAGE_AIR_AUTOFAN_ENABLED,
+    ADVANTAGE_AIR_NIGHT_MODE_ENABLED,
     ADVANTAGE_AIR_STATE_OFF,
     ADVANTAGE_AIR_STATE_ON,
 )
@@ -19,7 +20,7 @@ from .models import AdvantageAirData
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AdvantageAirDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AdvantageAir switch platform."""
 
@@ -32,6 +33,8 @@ async def async_setup_entry(
                 entities.append(AdvantageAirFreshAir(instance, ac_key))
             if ADVANTAGE_AIR_AUTOFAN_ENABLED in ac_device["info"]:
                 entities.append(AdvantageAirMyFan(instance, ac_key))
+            if ADVANTAGE_AIR_NIGHT_MODE_ENABLED in ac_device["info"]:
+                entities.append(AdvantageAirNightMode(instance, ac_key))
     if things := instance.coordinator.data.get("myThings"):
         entities.extend(
             AdvantageAirRelay(instance, thing)
@@ -93,6 +96,32 @@ class AdvantageAirMyFan(AdvantageAirAcEntity, SwitchEntity):
         await self.async_update_ac({ADVANTAGE_AIR_AUTOFAN_ENABLED: False})
 
 
+class AdvantageAirNightMode(AdvantageAirAcEntity, SwitchEntity):
+    """Representation of Advantage 'MySleep$aver' Mode control."""
+
+    _attr_icon = "mdi:weather-night"
+    _attr_name = "MySleep$aver"
+    _attr_device_class = SwitchDeviceClass.SWITCH
+
+    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
+        """Initialize an Advantage Air Night Mode control."""
+        super().__init__(instance, ac_key)
+        self._attr_unique_id += "-nightmode"
+
+    @property
+    def is_on(self) -> bool:
+        """Return the Night Mode status."""
+        return self._ac[ADVANTAGE_AIR_NIGHT_MODE_ENABLED]
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn Night Mode on."""
+        await self.async_update_ac({ADVANTAGE_AIR_NIGHT_MODE_ENABLED: True})
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn Night Mode off."""
+        await self.async_update_ac({ADVANTAGE_AIR_NIGHT_MODE_ENABLED: False})
+
+
 class AdvantageAirRelay(AdvantageAirThingEntity, SwitchEntity):
     """Representation of Advantage Air Thing."""
 
diff --git a/homeassistant/components/advantage_air/update.py b/homeassistant/components/advantage_air/update.py
index b639e4df867..92a162303dd 100644
--- a/homeassistant/components/advantage_air/update.py
+++ b/homeassistant/components/advantage_air/update.py
@@ -3,7 +3,7 @@
 from homeassistant.components.update import UpdateEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AdvantageAirDataConfigEntry
 from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN
@@ -14,7 +14,7 @@ from .models import AdvantageAirData
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AdvantageAirDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AdvantageAir update platform."""
 
diff --git a/homeassistant/components/aemet/image.py b/homeassistant/components/aemet/image.py
index ffc53022e4c..ba9986a5ccc 100644
--- a/homeassistant/components/aemet/image.py
+++ b/homeassistant/components/aemet/image.py
@@ -9,7 +9,7 @@ from aemet_opendata.helpers import dict_nested_value
 
 from homeassistant.components.image import Image, ImageEntity, ImageEntityDescription
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import AemetConfigEntry, WeatherUpdateCoordinator
 from .entity import AemetEntity
@@ -25,7 +25,7 @@ AEMET_IMAGES: Final[tuple[ImageEntityDescription, ...]] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AemetConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AEMET OpenData image entities based on a config entry."""
     domain_data = config_entry.runtime_data
diff --git a/homeassistant/components/aemet/sensor.py b/homeassistant/components/aemet/sensor.py
index 88eb34b6f84..9077b2bc44d 100644
--- a/homeassistant/components/aemet/sensor.py
+++ b/homeassistant/components/aemet/sensor.py
@@ -52,7 +52,7 @@ from homeassistant.const import (
     UnitOfVolumetricFlux,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from .const import (
@@ -358,7 +358,7 @@ WEATHER_SENSORS: Final[tuple[AemetSensorEntityDescription, ...]] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AemetConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AEMET OpenData sensor entities based on a config entry."""
     domain_data = config_entry.runtime_data
diff --git a/homeassistant/components/aemet/weather.py b/homeassistant/components/aemet/weather.py
index a156652eadd..3a17430300d 100644
--- a/homeassistant/components/aemet/weather.py
+++ b/homeassistant/components/aemet/weather.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONDITIONS_MAP
 from .coordinator import AemetConfigEntry, WeatherUpdateCoordinator
@@ -35,7 +35,7 @@ from .entity import AemetEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AemetConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AEMET OpenData weather entity based on a config entry."""
     domain_data = config_entry.runtime_data
diff --git a/homeassistant/components/aftership/const.py b/homeassistant/components/aftership/const.py
index 385570e145f..c5d7b00a942 100644
--- a/homeassistant/components/aftership/const.py
+++ b/homeassistant/components/aftership/const.py
@@ -7,7 +7,7 @@ from typing import Final
 
 import voluptuous as vol
 
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 DOMAIN: Final = "aftership"
 
diff --git a/homeassistant/components/aftership/sensor.py b/homeassistant/components/aftership/sensor.py
index c019634197d..7e0c6f524ab 100644
--- a/homeassistant/components/aftership/sensor.py
+++ b/homeassistant/components/aftership/sensor.py
@@ -9,12 +9,12 @@ from pyaftership import AfterShip, AfterShipException
 
 from homeassistant.components.sensor import SensorEntity
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import Throttle
 
 from . import AfterShipConfigEntry
@@ -42,7 +42,7 @@ PLATFORM_SCHEMA: Final = cv.removed(DOMAIN, raise_if_present=False)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AfterShipConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AfterShip sensor entities based on a config entry."""
     aftership = config_entry.runtime_data
diff --git a/homeassistant/components/aftership/strings.json b/homeassistant/components/aftership/strings.json
index ace8eb6d2d3..c3817a0cd24 100644
--- a/homeassistant/components/aftership/strings.json
+++ b/homeassistant/components/aftership/strings.json
@@ -51,7 +51,7 @@
   "issues": {
     "deprecated_yaml_import_issue_cannot_connect": {
       "title": "The {integration_title} YAML configuration import failed",
-      "description": "Configuring {integration_title} using YAML is being removed but there was an connection error importing your YAML configuration.\n\nEnsure connection to {integration_title} works and restart Home Assistant to try again or remove the {integration_title} YAML configuration from your configuration.yaml file and continue to [set up the integration]({url}) manually."
+      "description": "Configuring {integration_title} using YAML is being removed but there was a connection error importing your YAML configuration.\n\nEnsure connection to {integration_title} works and restart Home Assistant to try again or remove the {integration_title} YAML configuration from your configuration.yaml file and continue to [set up the integration]({url}) manually."
     }
   }
 }
diff --git a/homeassistant/components/agent_dvr/alarm_control_panel.py b/homeassistant/components/agent_dvr/alarm_control_panel.py
index 23328315e42..1ac808c87ad 100644
--- a/homeassistant/components/agent_dvr/alarm_control_panel.py
+++ b/homeassistant/components/agent_dvr/alarm_control_panel.py
@@ -9,7 +9,7 @@ from homeassistant.components.alarm_control_panel import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AgentDVRConfigEntry
 from .const import DOMAIN as AGENT_DOMAIN
@@ -24,7 +24,7 @@ CONST_ALARM_CONTROL_PANEL_NAME = "Alarm Panel"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AgentDVRConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Agent DVR Alarm Control Panels."""
     async_add_entities([AgentBaseStation(config_entry.runtime_data)])
diff --git a/homeassistant/components/agent_dvr/camera.py b/homeassistant/components/agent_dvr/camera.py
index 933d0c6b40b..3de7f095b13 100644
--- a/homeassistant/components/agent_dvr/camera.py
+++ b/homeassistant/components/agent_dvr/camera.py
@@ -10,7 +10,7 @@ from homeassistant.components.mjpeg import MjpegCamera, filter_urllib3_logging
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import (
-    AddEntitiesCallback,
+    AddConfigEntryEntitiesCallback,
     async_get_current_platform,
 )
 
@@ -39,7 +39,7 @@ CAMERA_SERVICES = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AgentDVRConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Agent cameras."""
     filter_urllib3_logging()
diff --git a/homeassistant/components/airgradient/__init__.py b/homeassistant/components/airgradient/__init__.py
index 3b27d6cda5e..8f7fd86847d 100644
--- a/homeassistant/components/airgradient/__init__.py
+++ b/homeassistant/components/airgradient/__init__.py
@@ -4,12 +4,11 @@ from __future__ import annotations
 
 from airgradient import AirGradientClient
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .coordinator import AirGradientCoordinator
+from .coordinator import AirGradientConfigEntry, AirGradientCoordinator
 
 PLATFORMS: list[Platform] = [
     Platform.BUTTON,
@@ -21,9 +20,6 @@ PLATFORMS: list[Platform] = [
 ]
 
 
-type AirGradientConfigEntry = ConfigEntry[AirGradientCoordinator]
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: AirGradientConfigEntry) -> bool:
     """Set up Airgradient from a config entry."""
 
@@ -31,7 +27,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirGradientConfigEntry)
         entry.data[CONF_HOST], session=async_get_clientsession(hass)
     )
 
-    coordinator = AirGradientCoordinator(hass, client)
+    coordinator = AirGradientCoordinator(hass, entry, client)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/airgradient/button.py b/homeassistant/components/airgradient/button.py
index ea7b12062e8..5e6f857f686 100644
--- a/homeassistant/components/airgradient/button.py
+++ b/homeassistant/components/airgradient/button.py
@@ -13,7 +13,7 @@ from homeassistant.components.button import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AirGradientConfigEntry
 from .const import DOMAIN
@@ -47,7 +47,7 @@ LED_BAR_TEST = AirGradientButtonEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirGradientConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AirGradient button entities based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/airgradient/coordinator.py b/homeassistant/components/airgradient/coordinator.py
index d2fc2a9de1b..7484c7e85a9 100644
--- a/homeassistant/components/airgradient/coordinator.py
+++ b/homeassistant/components/airgradient/coordinator.py
@@ -4,18 +4,17 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 from datetime import timedelta
-from typing import TYPE_CHECKING
 
 from airgradient import AirGradientClient, AirGradientError, Config, Measures
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN, LOGGER
 
-if TYPE_CHECKING:
-    from . import AirGradientConfigEntry
+type AirGradientConfigEntry = ConfigEntry[AirGradientCoordinator]
 
 
 @dataclass
@@ -32,11 +31,17 @@ class AirGradientCoordinator(DataUpdateCoordinator[AirGradientData]):
     config_entry: AirGradientConfigEntry
     _current_version: str
 
-    def __init__(self, hass: HomeAssistant, client: AirGradientClient) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: AirGradientConfigEntry,
+        client: AirGradientClient,
+    ) -> None:
         """Initialize coordinator."""
         super().__init__(
             hass,
             logger=LOGGER,
+            config_entry=config_entry,
             name=f"AirGradient {client.host}",
             update_interval=timedelta(minutes=1),
         )
diff --git a/homeassistant/components/airgradient/manifest.json b/homeassistant/components/airgradient/manifest.json
index 13764142697..afaf2698ced 100644
--- a/homeassistant/components/airgradient/manifest.json
+++ b/homeassistant/components/airgradient/manifest.json
@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/airgradient",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "requirements": ["airgradient==0.9.1"],
+  "requirements": ["airgradient==0.9.2"],
   "zeroconf": ["_airgradient._tcp.local."]
 }
diff --git a/homeassistant/components/airgradient/number.py b/homeassistant/components/airgradient/number.py
index 4265215fa25..eeb24867845 100644
--- a/homeassistant/components/airgradient/number.py
+++ b/homeassistant/components/airgradient/number.py
@@ -14,7 +14,7 @@ from homeassistant.components.number import (
 from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AirGradientConfigEntry
 from .const import DOMAIN
@@ -60,7 +60,7 @@ LED_BAR_BRIGHTNESS = AirGradientNumberEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirGradientConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AirGradient number entities based on a config entry."""
 
diff --git a/homeassistant/components/airgradient/select.py b/homeassistant/components/airgradient/select.py
index 8c15102ad3a..f288055ebf4 100644
--- a/homeassistant/components/airgradient/select.py
+++ b/homeassistant/components/airgradient/select.py
@@ -14,7 +14,7 @@ from homeassistant.components.select import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AirGradientConfigEntry
 from .const import DOMAIN, PM_STANDARD, PM_STANDARD_REVERSE
@@ -142,7 +142,7 @@ CONTROL_ENTITIES: tuple[AirGradientSelectEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirGradientConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AirGradient select entities based on a config entry."""
 
diff --git a/homeassistant/components/airgradient/sensor.py b/homeassistant/components/airgradient/sensor.py
index 3b20b31f923..a4944a6196e 100644
--- a/homeassistant/components/airgradient/sensor.py
+++ b/homeassistant/components/airgradient/sensor.py
@@ -27,7 +27,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import AirGradientConfigEntry
@@ -225,7 +225,7 @@ CONFIG_DISPLAY_SENSOR_TYPES: tuple[AirGradientConfigSensorEntityDescription, ...
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirGradientConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AirGradient sensor entities based on a config entry."""
 
diff --git a/homeassistant/components/airgradient/strings.json b/homeassistant/components/airgradient/strings.json
index 4cf3a6a34ea..2d9b6be529d 100644
--- a/homeassistant/components/airgradient/strings.json
+++ b/homeassistant/components/airgradient/strings.json
@@ -11,7 +11,7 @@
         }
       },
       "discovery_confirm": {
-        "description": "Do you want to setup {model}?"
+        "description": "Do you want to set up {model}?"
       }
     },
     "abort": {
diff --git a/homeassistant/components/airgradient/switch.py b/homeassistant/components/airgradient/switch.py
index 55835fa30a6..0d404ed0f15 100644
--- a/homeassistant/components/airgradient/switch.py
+++ b/homeassistant/components/airgradient/switch.py
@@ -15,7 +15,7 @@ from homeassistant.components.switch import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AirGradientConfigEntry
 from .const import DOMAIN
@@ -45,7 +45,7 @@ POST_DATA_TO_AIRGRADIENT = AirGradientSwitchEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirGradientConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AirGradient switch entities based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/airgradient/update.py b/homeassistant/components/airgradient/update.py
index 12cec65f791..97cb8576e79 100644
--- a/homeassistant/components/airgradient/update.py
+++ b/homeassistant/components/airgradient/update.py
@@ -6,7 +6,7 @@ from propcache.api import cached_property
 
 from homeassistant.components.update import UpdateDeviceClass, UpdateEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AirGradientConfigEntry, AirGradientCoordinator
 from .entity import AirGradientEntity
@@ -18,7 +18,7 @@ SCAN_INTERVAL = timedelta(hours=1)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AirGradientConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Airgradient update platform."""
 
diff --git a/homeassistant/components/airly/__init__.py b/homeassistant/components/airly/__init__.py
index ad3ee5fca4d..18ad1c8c402 100644
--- a/homeassistant/components/airly/__init__.py
+++ b/homeassistant/components/airly/__init__.py
@@ -6,21 +6,18 @@ from datetime import timedelta
 import logging
 
 from homeassistant.components.air_quality import DOMAIN as AIR_QUALITY_PLATFORM
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import CONF_USE_NEAREST, DOMAIN, MIN_UPDATE_INTERVAL
-from .coordinator import AirlyDataUpdateCoordinator
+from .coordinator import AirlyConfigEntry, AirlyDataUpdateCoordinator
 
 PLATFORMS = [Platform.SENSOR]
 
 _LOGGER = logging.getLogger(__name__)
 
-type AirlyConfigEntry = ConfigEntry[AirlyDataUpdateCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: AirlyConfigEntry) -> bool:
     """Set up Airly as config entry."""
@@ -60,7 +57,14 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirlyConfigEntry) -> boo
     update_interval = timedelta(minutes=MIN_UPDATE_INTERVAL)
 
     coordinator = AirlyDataUpdateCoordinator(
-        hass, websession, api_key, latitude, longitude, update_interval, use_nearest
+        hass,
+        entry,
+        websession,
+        api_key,
+        latitude,
+        longitude,
+        update_interval,
+        use_nearest,
     )
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/airly/config_flow.py b/homeassistant/components/airly/config_flow.py
index 2811156ac90..de60ef84efa 100644
--- a/homeassistant/components/airly/config_flow.py
+++ b/homeassistant/components/airly/config_flow.py
@@ -13,8 +13,8 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 
 from .const import CONF_USE_NEAREST, DOMAIN, NO_AIRLY_SENSORS
 
diff --git a/homeassistant/components/airly/coordinator.py b/homeassistant/components/airly/coordinator.py
index fa826ba6efc..668cabdae63 100644
--- a/homeassistant/components/airly/coordinator.py
+++ b/homeassistant/components/airly/coordinator.py
@@ -10,6 +10,7 @@ from aiohttp.client_exceptions import ClientConnectorError
 from airly import Airly
 from airly.exceptions import AirlyError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from homeassistant.util import dt as dt_util
@@ -27,6 +28,8 @@ from .const import (
 
 _LOGGER = logging.getLogger(__name__)
 
+type AirlyConfigEntry = ConfigEntry[AirlyDataUpdateCoordinator]
+
 
 def set_update_interval(instances_count: int, requests_remaining: int) -> timedelta:
     """Return data update interval.
@@ -58,9 +61,12 @@ def set_update_interval(instances_count: int, requests_remaining: int) -> timede
 class AirlyDataUpdateCoordinator(DataUpdateCoordinator[dict[str, str | float | int]]):
     """Define an object to hold Airly data."""
 
+    config_entry: AirlyConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: AirlyConfigEntry,
         session: ClientSession,
         api_key: str,
         latitude: float,
@@ -76,7 +82,13 @@ class AirlyDataUpdateCoordinator(DataUpdateCoordinator[dict[str, str | float | i
         self.airly = Airly(api_key, session, language=language)
         self.use_nearest = use_nearest
 
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval)
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=update_interval,
+        )
 
     async def _async_update_data(self) -> dict[str, str | float | int]:
         """Update data via library."""
@@ -93,7 +105,14 @@ class AirlyDataUpdateCoordinator(DataUpdateCoordinator[dict[str, str | float | i
             try:
                 await measurements.update()
             except (AirlyError, ClientConnectorError) as error:
-                raise UpdateFailed(error) from error
+                raise UpdateFailed(
+                    translation_domain=DOMAIN,
+                    translation_key="update_error",
+                    translation_placeholders={
+                        "entry": self.config_entry.title,
+                        "error": repr(error),
+                    },
+                ) from error
 
         _LOGGER.debug(
             "Requests remaining: %s/%s",
@@ -114,7 +133,11 @@ class AirlyDataUpdateCoordinator(DataUpdateCoordinator[dict[str, str | float | i
         standards = measurements.current["standards"]
 
         if index["description"] == NO_AIRLY_SENSORS:
-            raise UpdateFailed("Can't retrieve data: no Airly sensors in this area")
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="no_station",
+                translation_placeholders={"entry": self.config_entry.title},
+            )
         for value in values:
             data[value["name"]] = value["value"]
         for standard in standards:
diff --git a/homeassistant/components/airly/diagnostics.py b/homeassistant/components/airly/diagnostics.py
index 8bf75baf1d1..6e9e55a4311 100644
--- a/homeassistant/components/airly/diagnostics.py
+++ b/homeassistant/components/airly/diagnostics.py
@@ -13,7 +13,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 
-from . import AirlyConfigEntry
+from .coordinator import AirlyConfigEntry
 
 TO_REDACT = {CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_UNIQUE_ID}
 
diff --git a/homeassistant/components/airly/sensor.py b/homeassistant/components/airly/sensor.py
index 2126b838269..2aa99d9c792 100644
--- a/homeassistant/components/airly/sensor.py
+++ b/homeassistant/components/airly/sensor.py
@@ -21,10 +21,9 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import AirlyConfigEntry, AirlyDataUpdateCoordinator
 from .const import (
     ATTR_ADVICE,
     ATTR_API_ADVICE,
@@ -52,6 +51,7 @@ from .const import (
     SUFFIX_PERCENT,
     URL,
 )
+from .coordinator import AirlyConfigEntry, AirlyDataUpdateCoordinator
 
 PARALLEL_UPDATES = 1
 
@@ -175,7 +175,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirlyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Airly sensor entities based on a config entry."""
     name = entry.data[CONF_NAME]
diff --git a/homeassistant/components/airly/strings.json b/homeassistant/components/airly/strings.json
index 33ee8bbe4c9..fe4ccbb4745 100644
--- a/homeassistant/components/airly/strings.json
+++ b/homeassistant/components/airly/strings.json
@@ -36,5 +36,13 @@
         "name": "[%key:component::sensor::entity_component::carbon_monoxide::name%]"
       }
     }
+  },
+  "exceptions": {
+    "update_error": {
+      "message": "An error occurred while retrieving data from the Airly API for {entry}: {error}"
+    },
+    "no_station": {
+      "message": "An error occurred while retrieving data from the Airly API for {entry}: no measuring stations in this area"
+    }
   }
 }
diff --git a/homeassistant/components/airly/system_health.py b/homeassistant/components/airly/system_health.py
index 688b6d06189..629cb255122 100644
--- a/homeassistant/components/airly/system_health.py
+++ b/homeassistant/components/airly/system_health.py
@@ -9,8 +9,8 @@ from airly import Airly
 from homeassistant.components import system_health
 from homeassistant.core import HomeAssistant, callback
 
-from . import AirlyConfigEntry
 from .const import DOMAIN
+from .coordinator import AirlyConfigEntry
 
 
 @callback
diff --git a/homeassistant/components/airnow/__init__.py b/homeassistant/components/airnow/__init__.py
index 2047a9d41bc..6fb7e90502f 100644
--- a/homeassistant/components/airnow/__init__.py
+++ b/homeassistant/components/airnow/__init__.py
@@ -15,13 +15,11 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .coordinator import AirNowDataUpdateCoordinator
+from .coordinator import AirNowConfigEntry, AirNowDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 PLATFORMS = [Platform.SENSOR]
 
-type AirNowConfigEntry = ConfigEntry[AirNowDataUpdateCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: AirNowConfigEntry) -> bool:
     """Set up AirNow from a config entry."""
@@ -38,7 +36,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirNowConfigEntry) -> bo
     # Setup the Coordinator
     session = async_get_clientsession(hass)
     coordinator = AirNowDataUpdateCoordinator(
-        hass, session, api_key, latitude, longitude, distance, update_interval
+        hass, entry, session, api_key, latitude, longitude, distance, update_interval
     )
 
     # Sync with Coordinator
diff --git a/homeassistant/components/airnow/config_flow.py b/homeassistant/components/airnow/config_flow.py
index d0ab16e9758..7cd113125a8 100644
--- a/homeassistant/components/airnow/config_flow.py
+++ b/homeassistant/components/airnow/config_flow.py
@@ -18,8 +18,8 @@ from homeassistant.config_entries import (
 from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_RADIUS
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 
 from .const import DOMAIN
 
diff --git a/homeassistant/components/airnow/coordinator.py b/homeassistant/components/airnow/coordinator.py
index 9434d368dbe..ee5bf4a1dd7 100644
--- a/homeassistant/components/airnow/coordinator.py
+++ b/homeassistant/components/airnow/coordinator.py
@@ -10,6 +10,7 @@ from pyairnow import WebServiceAPI
 from pyairnow.conv import aqi_to_concentration
 from pyairnow.errors import AirNowError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -34,13 +35,18 @@ from .const import (
 
 _LOGGER = logging.getLogger(__name__)
 
+type AirNowConfigEntry = ConfigEntry[AirNowDataUpdateCoordinator]
+
 
 class AirNowDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """The AirNow update coordinator."""
 
+    config_entry: AirNowConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: AirNowConfigEntry,
         session: ClientSession,
         api_key: str,
         latitude: float,
@@ -55,7 +61,13 @@ class AirNowDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
 
         self.airnow = WebServiceAPI(api_key, session=session)
 
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval)
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=update_interval,
+        )
 
     async def _async_update_data(self) -> dict[str, Any]:
         """Update data via library."""
diff --git a/homeassistant/components/airnow/diagnostics.py b/homeassistant/components/airnow/diagnostics.py
index 76cc35fb13c..bd6dab9dc47 100644
--- a/homeassistant/components/airnow/diagnostics.py
+++ b/homeassistant/components/airnow/diagnostics.py
@@ -13,7 +13,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 
-from . import AirNowConfigEntry
+from .coordinator import AirNowConfigEntry
 
 ATTR_LATITUDE_CAP = "Latitude"
 ATTR_LONGITUDE_CAP = "Longitude"
diff --git a/homeassistant/components/airnow/sensor.py b/homeassistant/components/airnow/sensor.py
index 1abf93514a5..db579de4976 100644
--- a/homeassistant/components/airnow/sensor.py
+++ b/homeassistant/components/airnow/sensor.py
@@ -21,11 +21,10 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import AirNowConfigEntry, AirNowDataUpdateCoordinator
 from .const import (
     ATTR_API_AQI,
     ATTR_API_AQI_DESCRIPTION,
@@ -43,6 +42,7 @@ from .const import (
     DOMAIN,
     US_TZ_OFFSETS,
 )
+from .coordinator import AirNowConfigEntry, AirNowDataUpdateCoordinator
 
 ATTRIBUTION = "Data provided by AirNow"
 
@@ -130,7 +130,7 @@ SENSOR_TYPES: tuple[AirNowEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AirNowConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AirNow sensor entities based on a config entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/airnow/strings.json b/homeassistant/components/airnow/strings.json
index d5fb22106f9..a69f67948cb 100644
--- a/homeassistant/components/airnow/strings.json
+++ b/homeassistant/components/airnow/strings.json
@@ -7,7 +7,7 @@
           "api_key": "[%key:common::config_flow::data::api_key%]",
           "latitude": "[%key:common::config_flow::data::latitude%]",
           "longitude": "[%key:common::config_flow::data::longitude%]",
-          "radius": "Station Radius (miles; optional)"
+          "radius": "Station radius (miles; optional)"
         }
       }
     },
@@ -25,7 +25,7 @@
     "step": {
       "init": {
         "data": {
-          "radius": "Station Radius (miles)"
+          "radius": "Station radius (miles)"
         }
       }
     }
diff --git a/homeassistant/components/airq/config_flow.py b/homeassistant/components/airq/config_flow.py
index 0c57b399b1b..f87b73b5283 100644
--- a/homeassistant/components/airq/config_flow.py
+++ b/homeassistant/components/airq/config_flow.py
@@ -83,6 +83,7 @@ class AirQConfigFlow(ConfigFlow, domain=DOMAIN):
             await self.async_set_unique_id(device_info["id"])
             self._abort_if_unique_id_configured()
 
+            _LOGGER.debug("Creating an entry for %s", device_info["name"])
             return self.async_create_entry(title=device_info["name"], data=user_input)
 
         return self.async_show_form(
diff --git a/homeassistant/components/airq/coordinator.py b/homeassistant/components/airq/coordinator.py
index 362b65b5828..743d12d40e5 100644
--- a/homeassistant/components/airq/coordinator.py
+++ b/homeassistant/components/airq/coordinator.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from datetime import timedelta
 import logging
 
-from aioairq import AirQ
+from aioairq.core import AirQ, identify_warming_up_sensors
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_IP_ADDRESS, CONF_PASSWORD
@@ -22,6 +22,8 @@ _LOGGER = logging.getLogger(__name__)
 class AirQCoordinator(DataUpdateCoordinator):
     """Coordinator is responsible for querying the device at a specified route."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
@@ -33,6 +35,7 @@ class AirQCoordinator(DataUpdateCoordinator):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=UPDATE_INTERVAL),
         )
@@ -52,6 +55,9 @@ class AirQCoordinator(DataUpdateCoordinator):
     async def _async_update_data(self) -> dict:
         """Fetch the data from the device."""
         if "name" not in self.device_info:
+            _LOGGER.debug(
+                "'name' not found in AirQCoordinator.device_info, fetching from the device"
+            )
             info = await self.airq.fetch_device_info()
             self.device_info.update(
                 DeviceInfo(
@@ -61,7 +67,16 @@ class AirQCoordinator(DataUpdateCoordinator):
                     hw_version=info["hw_version"],
                 )
             )
-        return await self.airq.get_latest_data(  # type: ignore[no-any-return]
+            _LOGGER.debug(
+                "Updated AirQCoordinator.device_info for 'name' %s",
+                self.device_info.get("name"),
+            )
+        data: dict = await self.airq.get_latest_data(
             return_average=self.return_average,
             clip_negative_values=self.clip_negative,
         )
+        if warming_up_sensors := identify_warming_up_sensors(data):
+            _LOGGER.debug(
+                "Following sensors are still warming up: %s", warming_up_sensors
+            )
+        return data
diff --git a/homeassistant/components/airq/manifest.json b/homeassistant/components/airq/manifest.json
index 1ae7da14875..d4a6e9c295f 100644
--- a/homeassistant/components/airq/manifest.json
+++ b/homeassistant/components/airq/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["aioairq"],
-  "requirements": ["aioairq==0.4.3"]
+  "requirements": ["aioairq==0.4.4"]
 }
diff --git a/homeassistant/components/airq/sensor.py b/homeassistant/components/airq/sensor.py
index c465d710406..08a344ae9f4 100644
--- a/homeassistant/components/airq/sensor.py
+++ b/homeassistant/components/airq/sensor.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import AirQConfigEntry, AirQCoordinator
@@ -399,7 +399,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirQConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensor entities based on a config entry."""
 
diff --git a/homeassistant/components/airq/strings.json b/homeassistant/components/airq/strings.json
index 26b944467e6..9c16975a3ab 100644
--- a/homeassistant/components/airq/strings.json
+++ b/homeassistant/components/airq/strings.json
@@ -91,7 +91,7 @@
         "name": "Hydrogen fluoride"
       },
       "health_index": {
-        "name": "Health Index"
+        "name": "Health index"
       },
       "absolute_humidity": {
         "name": "Absolute humidity"
@@ -112,10 +112,10 @@
         "name": "Oxygen"
       },
       "performance_index": {
-        "name": "Performance Index"
+        "name": "Performance index"
       },
       "hydrogen_phosphide": {
-        "name": "Hydrogen Phosphide"
+        "name": "Hydrogen phosphide"
       },
       "relative_pressure": {
         "name": "Relative pressure"
@@ -127,22 +127,22 @@
         "name": "Refrigerant"
       },
       "silicon_hydride": {
-        "name": "Silicon Hydride"
+        "name": "Silicon hydride"
       },
       "noise": {
         "name": "Noise"
       },
       "maximum_noise": {
-        "name": "Noise (Maximum)"
+        "name": "Noise (maximum)"
       },
       "radon": {
         "name": "Radon"
       },
       "industrial_volatile_organic_compounds": {
-        "name": "VOCs (Industrial)"
+        "name": "VOCs (industrial)"
       },
       "virus_index": {
-        "name": "Virus Index"
+        "name": "Virus index"
       }
     }
   }
diff --git a/homeassistant/components/airthings/sensor.py b/homeassistant/components/airthings/sensor.py
index 1b604d72032..a0d9c97c8c8 100644
--- a/homeassistant/components/airthings/sensor.py
+++ b/homeassistant/components/airthings/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -114,7 +114,7 @@ SENSORS: dict[str, SensorEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirthingsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Airthings sensor."""
 
diff --git a/homeassistant/components/airthings_ble/config_flow.py b/homeassistant/components/airthings_ble/config_flow.py
index 48c7219cbaf..2d32fa6e7df 100644
--- a/homeassistant/components/airthings_ble/config_flow.py
+++ b/homeassistant/components/airthings_ble/config_flow.py
@@ -102,7 +102,8 @@ class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
             device = await self._get_device_data(discovery_info)
         except AirthingsDeviceUpdateError:
             return self.async_abort(reason="cannot_connect")
-        except Exception:  # noqa: BLE001
+        except Exception:
+            _LOGGER.exception("Unknown error occurred")
             return self.async_abort(reason="unknown")
 
         name = get_name(device)
@@ -144,7 +145,7 @@ class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
 
             return self.async_create_entry(title=discovery.name, data={})
 
-        current_addresses = self._async_current_ids()
+        current_addresses = self._async_current_ids(include_ignore=False)
         for discovery_info in async_discovered_service_info(self.hass):
             address = discovery_info.address
             if address in current_addresses or address in self._discovered_devices:
@@ -160,7 +161,8 @@ class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
                 device = await self._get_device_data(discovery_info)
             except AirthingsDeviceUpdateError:
                 return self.async_abort(reason="cannot_connect")
-            except Exception:  # noqa: BLE001
+            except Exception:
+                _LOGGER.exception("Unknown error occurred")
                 return self.async_abort(reason="unknown")
             name = get_name(device)
             self._discovered_devices[address] = Discovery(name, discovery_info, device)
diff --git a/homeassistant/components/airthings_ble/sensor.py b/homeassistant/components/airthings_ble/sensor.py
index 248561706a3..9c1a2af7a9f 100644
--- a/homeassistant/components/airthings_ble/sensor.py
+++ b/homeassistant/components/airthings_ble/sensor.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.device_registry import CONNECTION_BLUETOOTH, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.entity_registry import (
     RegistryEntry,
     async_entries_for_device,
@@ -153,7 +153,7 @@ def async_migrate(hass: HomeAssistant, address: str, sensor_name: str) -> None:
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirthingsBLEConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Airthings BLE sensors."""
     is_metric = hass.config.units is METRIC_SYSTEM
diff --git a/homeassistant/components/airtouch4/climate.py b/homeassistant/components/airtouch4/climate.py
index 0af920bd7a9..6d393ed0c99 100644
--- a/homeassistant/components/airtouch4/climate.py
+++ b/homeassistant/components/airtouch4/climate.py
@@ -19,7 +19,7 @@ from homeassistant.components.climate import (
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import AirTouch4ConfigEntry
@@ -64,7 +64,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AirTouch4ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Airtouch 4."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/airtouch5/climate.py b/homeassistant/components/airtouch5/climate.py
index 16566f5d664..f3b914bf341 100644
--- a/homeassistant/components/airtouch5/climate.py
+++ b/homeassistant/components/airtouch5/climate.py
@@ -37,7 +37,7 @@ from homeassistant.components.climate import (
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import Airtouch5ConfigEntry
 from .const import DOMAIN, FAN_INTELLIGENT_AUTO, FAN_TURBO
@@ -93,7 +93,7 @@ FAN_MODE_TO_SET_AC_FAN_SPEED = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: Airtouch5ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Airtouch 5 Climate entities."""
     client = config_entry.runtime_data
diff --git a/homeassistant/components/airtouch5/config_flow.py b/homeassistant/components/airtouch5/config_flow.py
index d96aaed96b7..38c85e45fb8 100644
--- a/homeassistant/components/airtouch5/config_flow.py
+++ b/homeassistant/components/airtouch5/config_flow.py
@@ -32,7 +32,8 @@ class AirTouch5ConfigFlow(ConfigFlow, domain=DOMAIN):
             client = Airtouch5SimpleClient(user_input[CONF_HOST])
             try:
                 await client.test_connection()
-            except Exception:  # noqa: BLE001
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
                 errors = {"base": "cannot_connect"}
             else:
                 await self.async_set_unique_id(user_input[CONF_HOST])
diff --git a/homeassistant/components/airtouch5/cover.py b/homeassistant/components/airtouch5/cover.py
index 62cf7938fc2..b811ed5c451 100644
--- a/homeassistant/components/airtouch5/cover.py
+++ b/homeassistant/components/airtouch5/cover.py
@@ -20,7 +20,7 @@ from homeassistant.components.cover import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import Airtouch5ConfigEntry
 from .const import DOMAIN
@@ -32,7 +32,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: Airtouch5ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Airtouch 5 Cover entities."""
     client = config_entry.runtime_data
diff --git a/homeassistant/components/airvisual/sensor.py b/homeassistant/components/airvisual/sensor.py
index 88a670edb82..1f406bd8f36 100644
--- a/homeassistant/components/airvisual/sensor.py
+++ b/homeassistant/components/airvisual/sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
     CONF_STATE,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from . import AirVisualConfigEntry
@@ -108,7 +108,7 @@ POLLUTANT_UNITS = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirVisualConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AirVisual sensors based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/airvisual_pro/sensor.py b/homeassistant/components/airvisual_pro/sensor.py
index 58ad730bc31..215370736fe 100644
--- a/homeassistant/components/airvisual_pro/sensor.py
+++ b/homeassistant/components/airvisual_pro/sensor.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AirVisualProConfigEntry
 from .entity import AirVisualProEntity
@@ -130,7 +130,7 @@ def async_get_aqi_locale(settings: dict[str, Any]) -> str:
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirVisualProConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AirVisual sensors based on a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/airzone/__init__.py b/homeassistant/components/airzone/__init__.py
index aa168dce858..a56f2cc2445 100644
--- a/homeassistant/components/airzone/__init__.py
+++ b/homeassistant/components/airzone/__init__.py
@@ -15,7 +15,6 @@ from aioairzone.const import (
 )
 from aioairzone.localapi import AirzoneLocalApi, ConnectionOptions
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_ID, CONF_PORT, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import (
@@ -25,7 +24,7 @@ from homeassistant.helpers import (
 )
 
 from .const import DOMAIN, MANUFACTURER
-from .coordinator import AirzoneUpdateCoordinator
+from .coordinator import AirzoneConfigEntry, AirzoneUpdateCoordinator
 
 PLATFORMS: list[Platform] = [
     Platform.BINARY_SENSOR,
@@ -38,8 +37,6 @@ PLATFORMS: list[Platform] = [
 
 _LOGGER = logging.getLogger(__name__)
 
-type AirzoneConfigEntry = ConfigEntry[AirzoneUpdateCoordinator]
-
 
 async def _async_migrate_unique_ids(
     hass: HomeAssistant,
@@ -90,7 +87,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirzoneConfigEntry) -> b
     )
 
     airzone = AirzoneLocalApi(aiohttp_client.async_get_clientsession(hass), options)
-    coordinator = AirzoneUpdateCoordinator(hass, airzone)
+    coordinator = AirzoneUpdateCoordinator(hass, entry, airzone)
     await coordinator.async_config_entry_first_refresh()
     await _async_migrate_unique_ids(hass, entry, coordinator)
 
diff --git a/homeassistant/components/airzone/binary_sensor.py b/homeassistant/components/airzone/binary_sensor.py
index eec78156fe0..7274df44261 100644
--- a/homeassistant/components/airzone/binary_sensor.py
+++ b/homeassistant/components/airzone/binary_sensor.py
@@ -23,10 +23,9 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import AirzoneConfigEntry
-from .coordinator import AirzoneUpdateCoordinator
+from .coordinator import AirzoneConfigEntry, AirzoneUpdateCoordinator
 from .entity import AirzoneEntity, AirzoneSystemEntity, AirzoneZoneEntity
 
 
@@ -77,7 +76,7 @@ ZONE_BINARY_SENSOR_TYPES: Final[tuple[AirzoneBinarySensorEntityDescription, ...]
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirzoneConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Airzone binary sensors from a config_entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone/climate.py b/homeassistant/components/airzone/climate.py
index 4ed54286cff..39e70e58e6d 100644
--- a/homeassistant/components/airzone/climate.py
+++ b/homeassistant/components/airzone/climate.py
@@ -48,11 +48,10 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import AirzoneConfigEntry
 from .const import API_TEMPERATURE_STEP, TEMP_UNIT_LIB_TO_HASS
-from .coordinator import AirzoneUpdateCoordinator
+from .coordinator import AirzoneConfigEntry, AirzoneUpdateCoordinator
 from .entity import AirzoneZoneEntity
 
 BASE_FAN_SPEEDS: Final[dict[int, str]] = {
@@ -101,7 +100,7 @@ HVAC_MODE_HASS_TO_LIB: Final[dict[HVACMode, OperationMode]] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirzoneConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Airzone climate from a config_entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone/coordinator.py b/homeassistant/components/airzone/coordinator.py
index 8ec2cbe07ca..4b4519beed8 100644
--- a/homeassistant/components/airzone/coordinator.py
+++ b/homeassistant/components/airzone/coordinator.py
@@ -10,6 +10,7 @@ from typing import Any
 from aioairzone.exceptions import AirzoneError
 from aioairzone.localapi import AirzoneLocalApi
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -19,17 +20,27 @@ SCAN_INTERVAL = timedelta(seconds=60)
 
 _LOGGER = logging.getLogger(__name__)
 
+type AirzoneConfigEntry = ConfigEntry[AirzoneUpdateCoordinator]
+
 
 class AirzoneUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Class to manage fetching data from the Airzone device."""
 
-    def __init__(self, hass: HomeAssistant, airzone: AirzoneLocalApi) -> None:
+    config_entry: AirzoneConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: AirzoneConfigEntry,
+        airzone: AirzoneLocalApi,
+    ) -> None:
         """Initialize."""
         self.airzone = airzone
 
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/airzone/diagnostics.py b/homeassistant/components/airzone/diagnostics.py
index 2945df7b6fb..e745a85ee5e 100644
--- a/homeassistant/components/airzone/diagnostics.py
+++ b/homeassistant/components/airzone/diagnostics.py
@@ -10,7 +10,7 @@ from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_UNIQUE_ID
 from homeassistant.core import HomeAssistant
 
-from . import AirzoneConfigEntry
+from .coordinator import AirzoneConfigEntry
 
 TO_REDACT_API = [
     API_MAC,
diff --git a/homeassistant/components/airzone/entity.py b/homeassistant/components/airzone/entity.py
index 59d58fb62b0..c0d7901981b 100644
--- a/homeassistant/components/airzone/entity.py
+++ b/homeassistant/components/airzone/entity.py
@@ -31,9 +31,8 @@ from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import AirzoneConfigEntry
 from .const import DOMAIN, MANUFACTURER
-from .coordinator import AirzoneUpdateCoordinator
+from .coordinator import AirzoneConfigEntry, AirzoneUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/airzone/select.py b/homeassistant/components/airzone/select.py
index 2bc11bc4228..c00e83f2c5b 100644
--- a/homeassistant/components/airzone/select.py
+++ b/homeassistant/components/airzone/select.py
@@ -25,10 +25,9 @@ from homeassistant.components.select import SelectEntity, SelectEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import AirzoneConfigEntry
-from .coordinator import AirzoneUpdateCoordinator
+from .coordinator import AirzoneConfigEntry, AirzoneUpdateCoordinator
 from .entity import AirzoneEntity, AirzoneZoneEntity
 
 
@@ -118,7 +117,7 @@ ZONE_SELECT_TYPES: Final[tuple[AirzoneSelectDescription, ...]] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirzoneConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Airzone select from a config_entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone/sensor.py b/homeassistant/components/airzone/sensor.py
index ef8ddbb3b65..f76eb1466a3 100644
--- a/homeassistant/components/airzone/sensor.py
+++ b/homeassistant/components/airzone/sensor.py
@@ -28,11 +28,10 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import AirzoneConfigEntry
 from .const import TEMP_UNIT_LIB_TO_HASS
-from .coordinator import AirzoneUpdateCoordinator
+from .coordinator import AirzoneConfigEntry, AirzoneUpdateCoordinator
 from .entity import (
     AirzoneEntity,
     AirzoneHotWaterEntity,
@@ -80,7 +79,7 @@ ZONE_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirzoneConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Airzone sensors from a config_entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone/switch.py b/homeassistant/components/airzone/switch.py
index 93136810604..07278970e03 100644
--- a/homeassistant/components/airzone/switch.py
+++ b/homeassistant/components/airzone/switch.py
@@ -14,10 +14,9 @@ from homeassistant.components.switch import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import AirzoneConfigEntry
-from .coordinator import AirzoneUpdateCoordinator
+from .coordinator import AirzoneConfigEntry, AirzoneUpdateCoordinator
 from .entity import AirzoneEntity, AirzoneZoneEntity
 
 
@@ -40,7 +39,7 @@ ZONE_SWITCH_TYPES: Final[tuple[AirzoneSwitchDescription, ...]] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirzoneConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Airzone switch from a config_entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone/water_heater.py b/homeassistant/components/airzone/water_heater.py
index 8fd563b33d8..eb1537dc222 100644
--- a/homeassistant/components/airzone/water_heater.py
+++ b/homeassistant/components/airzone/water_heater.py
@@ -28,11 +28,10 @@ from homeassistant.components.water_heater import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, STATE_OFF
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import AirzoneConfigEntry
 from .const import TEMP_UNIT_LIB_TO_HASS
-from .coordinator import AirzoneUpdateCoordinator
+from .coordinator import AirzoneConfigEntry, AirzoneUpdateCoordinator
 from .entity import AirzoneHotWaterEntity
 
 OPERATION_LIB_TO_HASS: Final[dict[HotWaterOperation, str]] = {
@@ -59,7 +58,7 @@ OPERATION_MODE_TO_DHW_PARAMS: Final[dict[str, dict[str, Any]]] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirzoneConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Airzone Water Heater from a config_entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone_cloud/__init__.py b/homeassistant/components/airzone_cloud/__init__.py
index 5baa0bcea10..a5a29263140 100644
--- a/homeassistant/components/airzone_cloud/__init__.py
+++ b/homeassistant/components/airzone_cloud/__init__.py
@@ -5,12 +5,11 @@ from __future__ import annotations
 from aioairzone_cloud.cloudapi import AirzoneCloudApi
 from aioairzone_cloud.common import ConnectionOptions
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ID, CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import aiohttp_client
 
-from .coordinator import AirzoneUpdateCoordinator
+from .coordinator import AirzoneCloudConfigEntry, AirzoneUpdateCoordinator
 
 PLATFORMS: list[Platform] = [
     Platform.BINARY_SENSOR,
@@ -21,8 +20,6 @@ PLATFORMS: list[Platform] = [
     Platform.WATER_HEATER,
 ]
 
-type AirzoneCloudConfigEntry = ConfigEntry[AirzoneUpdateCoordinator]
-
 
 async def async_setup_entry(
     hass: HomeAssistant, entry: AirzoneCloudConfigEntry
@@ -42,7 +39,7 @@ async def async_setup_entry(
             airzone.select_installation(inst)
             await airzone.update_installation(inst)
 
-    coordinator = AirzoneUpdateCoordinator(hass, airzone)
+    coordinator = AirzoneUpdateCoordinator(hass, entry, airzone)
     await coordinator.async_config_entry_first_refresh()
 
     entry.runtime_data = coordinator
diff --git a/homeassistant/components/airzone_cloud/binary_sensor.py b/homeassistant/components/airzone_cloud/binary_sensor.py
index 3d6f6b42901..64fa8cb5151 100644
--- a/homeassistant/components/airzone_cloud/binary_sensor.py
+++ b/homeassistant/components/airzone_cloud/binary_sensor.py
@@ -26,10 +26,9 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import AirzoneCloudConfigEntry
-from .coordinator import AirzoneUpdateCoordinator
+from .coordinator import AirzoneCloudConfigEntry, AirzoneUpdateCoordinator
 from .entity import (
     AirzoneAidooEntity,
     AirzoneEntity,
@@ -112,7 +111,7 @@ ZONE_BINARY_SENSOR_TYPES: Final[tuple[AirzoneBinarySensorEntityDescription, ...]
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirzoneCloudConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Airzone Cloud binary sensors from a config_entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone_cloud/climate.py b/homeassistant/components/airzone_cloud/climate.py
index b98473072e4..115f6e32dbf 100644
--- a/homeassistant/components/airzone_cloud/climate.py
+++ b/homeassistant/components/airzone_cloud/climate.py
@@ -56,10 +56,9 @@ from homeassistant.components.climate import (
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import AirzoneCloudConfigEntry
-from .coordinator import AirzoneUpdateCoordinator
+from .coordinator import AirzoneCloudConfigEntry, AirzoneUpdateCoordinator
 from .entity import (
     AirzoneAidooEntity,
     AirzoneEntity,
@@ -120,7 +119,7 @@ HVAC_MODE_HASS_TO_LIB: Final[dict[HVACMode, OperationMode]] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirzoneCloudConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Airzone climate from a config_entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone_cloud/coordinator.py b/homeassistant/components/airzone_cloud/coordinator.py
index e510dcfb401..840bfec0d1b 100644
--- a/homeassistant/components/airzone_cloud/coordinator.py
+++ b/homeassistant/components/airzone_cloud/coordinator.py
@@ -10,6 +10,7 @@ from typing import Any
 from aioairzone_cloud.cloudapi import AirzoneCloudApi
 from aioairzone_cloud.exceptions import AirzoneCloudError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -19,11 +20,20 @@ SCAN_INTERVAL = timedelta(seconds=60)
 
 _LOGGER = logging.getLogger(__name__)
 
+type AirzoneCloudConfigEntry = ConfigEntry[AirzoneUpdateCoordinator]
+
 
 class AirzoneUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Class to manage fetching data from the Airzone Cloud device."""
 
-    def __init__(self, hass: HomeAssistant, airzone: AirzoneCloudApi) -> None:
+    config_entry: AirzoneCloudConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: AirzoneCloudConfigEntry,
+        airzone: AirzoneCloudApi,
+    ) -> None:
         """Initialize."""
         self.airzone = airzone
         self.airzone.set_update_callback(self.async_set_updated_data)
@@ -31,6 +41,7 @@ class AirzoneUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/airzone_cloud/diagnostics.py b/homeassistant/components/airzone_cloud/diagnostics.py
index b6744e36d8c..04aac7e2aa8 100644
--- a/homeassistant/components/airzone_cloud/diagnostics.py
+++ b/homeassistant/components/airzone_cloud/diagnostics.py
@@ -25,7 +25,7 @@ from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 
-from . import AirzoneCloudConfigEntry
+from .coordinator import AirzoneCloudConfigEntry
 
 TO_REDACT_API = [
     API_CITY,
diff --git a/homeassistant/components/airzone_cloud/manifest.json b/homeassistant/components/airzone_cloud/manifest.json
index 0e21e57ec52..3b6f94df57c 100644
--- a/homeassistant/components/airzone_cloud/manifest.json
+++ b/homeassistant/components/airzone_cloud/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/airzone_cloud",
   "iot_class": "cloud_push",
   "loggers": ["aioairzone_cloud"],
-  "requirements": ["aioairzone-cloud==0.6.10"]
+  "requirements": ["aioairzone-cloud==0.6.11"]
 }
diff --git a/homeassistant/components/airzone_cloud/select.py b/homeassistant/components/airzone_cloud/select.py
index 895796a1073..816544efdf8 100644
--- a/homeassistant/components/airzone_cloud/select.py
+++ b/homeassistant/components/airzone_cloud/select.py
@@ -21,10 +21,9 @@ from aioairzone_cloud.const import (
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import AirzoneCloudConfigEntry
-from .coordinator import AirzoneUpdateCoordinator
+from .coordinator import AirzoneCloudConfigEntry, AirzoneUpdateCoordinator
 from .entity import AirzoneEntity, AirzoneZoneEntity
 
 
@@ -90,7 +89,7 @@ ZONE_SELECT_TYPES: Final[tuple[AirzoneSelectDescription, ...]] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirzoneCloudConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Airzone Cloud select from a config_entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone_cloud/sensor.py b/homeassistant/components/airzone_cloud/sensor.py
index 70d2fd079d4..43526c3aa52 100644
--- a/homeassistant/components/airzone_cloud/sensor.py
+++ b/homeassistant/components/airzone_cloud/sensor.py
@@ -47,10 +47,9 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import AirzoneCloudConfigEntry
-from .coordinator import AirzoneUpdateCoordinator
+from .coordinator import AirzoneCloudConfigEntry, AirzoneUpdateCoordinator
 from .entity import (
     AirzoneAidooEntity,
     AirzoneEntity,
@@ -222,7 +221,7 @@ ZONE_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirzoneCloudConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Airzone Cloud sensors from a config_entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone_cloud/switch.py b/homeassistant/components/airzone_cloud/switch.py
index 0eb907ff792..ab703cd537a 100644
--- a/homeassistant/components/airzone_cloud/switch.py
+++ b/homeassistant/components/airzone_cloud/switch.py
@@ -13,10 +13,9 @@ from homeassistant.components.switch import (
     SwitchEntityDescription,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import AirzoneCloudConfigEntry
-from .coordinator import AirzoneUpdateCoordinator
+from .coordinator import AirzoneCloudConfigEntry, AirzoneUpdateCoordinator
 from .entity import AirzoneEntity, AirzoneZoneEntity
 
 
@@ -39,7 +38,7 @@ ZONE_SWITCH_TYPES: Final[tuple[AirzoneSwitchDescription, ...]] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirzoneCloudConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Airzone Cloud switch from a config_entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone_cloud/water_heater.py b/homeassistant/components/airzone_cloud/water_heater.py
index 51228ae6b90..41d43002569 100644
--- a/homeassistant/components/airzone_cloud/water_heater.py
+++ b/homeassistant/components/airzone_cloud/water_heater.py
@@ -29,10 +29,9 @@ from homeassistant.components.water_heater import (
 )
 from homeassistant.const import ATTR_TEMPERATURE, STATE_OFF, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import AirzoneCloudConfigEntry
-from .coordinator import AirzoneUpdateCoordinator
+from .coordinator import AirzoneCloudConfigEntry, AirzoneUpdateCoordinator
 from .entity import AirzoneHotWaterEntity
 
 OPERATION_LIB_TO_HASS: Final[dict[HotWaterOperation, str]] = {
@@ -69,7 +68,7 @@ OPERATION_MODE_TO_DHW_PARAMS: Final[dict[str, dict[str, Any]]] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AirzoneCloudConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Airzone Cloud Water Heater from a config_entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/aladdin_connect/__init__.py b/homeassistant/components/aladdin_connect/__init__.py
index 6d3f1d642b5..af50147a8ef 100644
--- a/homeassistant/components/aladdin_connect/__init__.py
+++ b/homeassistant/components/aladdin_connect/__init__.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import issue_registry as ir
 
@@ -28,11 +28,13 @@ async def async_setup_entry(hass: HomeAssistant, _: ConfigEntry) -> bool:
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    if all(
-        config_entry.state is ConfigEntryState.NOT_LOADED
-        for config_entry in hass.config_entries.async_entries(DOMAIN)
-        if config_entry.entry_id != entry.entry_id
-    ):
-        ir.async_delete_issue(hass, DOMAIN, DOMAIN)
-
     return True
+
+
+async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Remove a config entry."""
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
+        ir.async_delete_issue(hass, DOMAIN, DOMAIN)
+        # Remove any remaining disabled or ignored entries
+        for _entry in hass.config_entries.async_entries(DOMAIN):
+            hass.async_create_task(hass.config_entries.async_remove(_entry.entry_id))
diff --git a/homeassistant/components/alarm_control_panel/__init__.py b/homeassistant/components/alarm_control_panel/__init__.py
index 80a676a40fa..fde4638e179 100644
--- a/homeassistant/components/alarm_control_panel/__init__.py
+++ b/homeassistant/components/alarm_control_panel/__init__.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ServiceValidationError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.config_validation import make_entity_service_schema
 from homeassistant.helpers.entity import Entity, EntityDescription
 from homeassistant.helpers.entity_component import EntityComponent
diff --git a/homeassistant/components/alarm_control_panel/device_action.py b/homeassistant/components/alarm_control_panel/device_action.py
index 72b1084d072..6779eada070 100644
--- a/homeassistant/components/alarm_control_panel/device_action.py
+++ b/homeassistant/components/alarm_control_panel/device_action.py
@@ -23,8 +23,7 @@ from homeassistant.const import (
     SERVICE_ALARM_TRIGGER,
 )
 from homeassistant.core import Context, HomeAssistant
-from homeassistant.helpers import entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.entity import get_supported_features
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
 
diff --git a/homeassistant/components/alarm_control_panel/strings.json b/homeassistant/components/alarm_control_panel/strings.json
index 5f718280566..ed02b2d0ee8 100644
--- a/homeassistant/components/alarm_control_panel/strings.json
+++ b/homeassistant/components/alarm_control_panel/strings.json
@@ -90,7 +90,7 @@
     },
     "alarm_arm_home": {
       "name": "Arm home",
-      "description": "Sets the alarm to: _armed, but someone is home_.",
+      "description": "Arms the alarm in the home mode.",
       "fields": {
         "code": {
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
@@ -100,7 +100,7 @@
     },
     "alarm_arm_away": {
       "name": "Arm away",
-      "description": "Sets the alarm to: _armed, no one home_.",
+      "description": "Arms the alarm in the away mode.",
       "fields": {
         "code": {
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
@@ -110,7 +110,7 @@
     },
     "alarm_arm_night": {
       "name": "Arm night",
-      "description": "Sets the alarm to: _armed for the night_.",
+      "description": "Arms the alarm in the night mode.",
       "fields": {
         "code": {
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
@@ -120,7 +120,7 @@
     },
     "alarm_arm_vacation": {
       "name": "Arm vacation",
-      "description": "Sets the alarm to: _armed for vacation_.",
+      "description": "Arms the alarm in the vacation mode.",
       "fields": {
         "code": {
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
@@ -130,7 +130,7 @@
     },
     "alarm_trigger": {
       "name": "Trigger",
-      "description": "Trigger the alarm manually.",
+      "description": "Triggers the alarm manually.",
       "fields": {
         "code": {
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
diff --git a/homeassistant/components/alarmdecoder/alarm_control_panel.py b/homeassistant/components/alarmdecoder/alarm_control_panel.py
index cf72133ea12..52687f04bf9 100644
--- a/homeassistant/components/alarmdecoder/alarm_control_panel.py
+++ b/homeassistant/components/alarmdecoder/alarm_control_panel.py
@@ -12,10 +12,9 @@ from homeassistant.components.alarm_control_panel import (
 )
 from homeassistant.const import ATTR_CODE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_platform
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AlarmDecoderConfigEntry
 from .const import (
@@ -37,7 +36,7 @@ ATTR_KEYPRESS = "keypress"
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AlarmDecoderConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up for AlarmDecoder alarm panels."""
     options = entry.options
diff --git a/homeassistant/components/alarmdecoder/binary_sensor.py b/homeassistant/components/alarmdecoder/binary_sensor.py
index 1234c9f349b..b025da70d59 100644
--- a/homeassistant/components/alarmdecoder/binary_sensor.py
+++ b/homeassistant/components/alarmdecoder/binary_sensor.py
@@ -5,7 +5,7 @@ import logging
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AlarmDecoderConfigEntry
 from .const import (
@@ -40,7 +40,7 @@ ATTR_RF_LOOP1 = "rf_loop1"
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AlarmDecoderConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up for AlarmDecoder sensor."""
 
diff --git a/homeassistant/components/alarmdecoder/manifest.json b/homeassistant/components/alarmdecoder/manifest.json
index ae1a2f4684d..c2c12792801 100644
--- a/homeassistant/components/alarmdecoder/manifest.json
+++ b/homeassistant/components/alarmdecoder/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "device",
   "iot_class": "local_push",
   "loggers": ["adext", "alarmdecoder"],
-  "requirements": ["adext==0.4.3"]
+  "requirements": ["adext==0.4.4"]
 }
diff --git a/homeassistant/components/alarmdecoder/sensor.py b/homeassistant/components/alarmdecoder/sensor.py
index f5e744457fd..8fdc6d57c67 100644
--- a/homeassistant/components/alarmdecoder/sensor.py
+++ b/homeassistant/components/alarmdecoder/sensor.py
@@ -3,7 +3,7 @@
 from homeassistant.components.sensor import SensorEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AlarmDecoderConfigEntry
 from .const import SIGNAL_PANEL_MESSAGE
@@ -13,7 +13,7 @@ from .entity import AlarmDecoderEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AlarmDecoderConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up for AlarmDecoder sensor."""
 
diff --git a/homeassistant/components/alert/__init__.py b/homeassistant/components/alert/__init__.py
index 12341c158c0..b6ce87941f6 100644
--- a/homeassistant/components/alert/__init__.py
+++ b/homeassistant/components/alert/__init__.py
@@ -15,7 +15,7 @@ from homeassistant.const import (
     STATE_ON,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/alert/entity.py b/homeassistant/components/alert/entity.py
index 629047b15ba..a11b281428f 100644
--- a/homeassistant/components/alert/entity.py
+++ b/homeassistant/components/alert/entity.py
@@ -14,7 +14,7 @@ from homeassistant.components.notify import (
 )
 from homeassistant.const import STATE_IDLE, STATE_OFF, STATE_ON
 from homeassistant.core import Event, EventStateChangedData, HassJob, HomeAssistant
-from homeassistant.exceptions import ServiceNotFound
+from homeassistant.exceptions import ServiceNotFound, ServiceValidationError
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.event import (
     async_track_point_in_time,
@@ -195,7 +195,8 @@ class AlertEntity(Entity):
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Async Acknowledge alert."""
-        LOGGER.debug("Acknowledged Alert: %s", self._attr_name)
+        if not self._can_ack:
+            raise ServiceValidationError("This alert cannot be acknowledged")
         self._ack = True
         self.async_write_ha_state()
 
diff --git a/homeassistant/components/alexa/capabilities.py b/homeassistant/components/alexa/capabilities.py
index c5b4ad15904..897037987a7 100644
--- a/homeassistant/components/alexa/capabilities.py
+++ b/homeassistant/components/alexa/capabilities.py
@@ -50,8 +50,7 @@ from homeassistant.const import (
     UnitOfVolume,
 )
 from homeassistant.core import HomeAssistant, State
-import homeassistant.util.color as color_util
-import homeassistant.util.dt as dt_util
+from homeassistant.util import color as color_util, dt as dt_util
 
 from .const import (
     API_TEMP_UNITS,
@@ -1439,7 +1438,7 @@ class AlexaModeController(AlexaCapability):
         # Fan preset_mode
         if self.instance == f"{fan.DOMAIN}.{fan.ATTR_PRESET_MODE}":
             mode = self.entity.attributes.get(fan.ATTR_PRESET_MODE, None)
-            if mode in self.entity.attributes.get(fan.ATTR_PRESET_MODES, None):
+            if mode in self.entity.attributes.get(fan.ATTR_PRESET_MODES, ()):
                 return f"{fan.ATTR_PRESET_MODE}.{mode}"
 
         # Humidifier mode
diff --git a/homeassistant/components/alexa/flash_briefings.py b/homeassistant/components/alexa/flash_briefings.py
index 0d75ee04b7a..a37a95e59d5 100644
--- a/homeassistant/components/alexa/flash_briefings.py
+++ b/homeassistant/components/alexa/flash_briefings.py
@@ -12,7 +12,7 @@ from homeassistant.const import CONF_PASSWORD
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import template
 from homeassistant.helpers.typing import ConfigType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import (
     API_PASSWORD,
diff --git a/homeassistant/components/alexa/handlers.py b/homeassistant/components/alexa/handlers.py
index 04bef105546..8bd393e2d11 100644
--- a/homeassistant/components/alexa/handlers.py
+++ b/homeassistant/components/alexa/handlers.py
@@ -1531,7 +1531,7 @@ async def async_api_adjust_range(
     data: dict[str, Any] = {ATTR_ENTITY_ID: entity.entity_id}
     range_delta = directive.payload["rangeValueDelta"]
     range_delta_default = bool(directive.payload["rangeValueDeltaDefault"])
-    response_value: int | None = 0
+    response_value: float | None = 0
 
     # Cover Position
     if instance == f"{cover.DOMAIN}.{cover.ATTR_POSITION}":
diff --git a/homeassistant/components/alexa/state_report.py b/homeassistant/components/alexa/state_report.py
index 03b6a22007c..20e3ef1d7c7 100644
--- a/homeassistant/components/alexa/state_report.py
+++ b/homeassistant/components/alexa/state_report.py
@@ -24,7 +24,7 @@ from homeassistant.core import (
 )
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.significant_change import create_checker
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.json import JsonObjectType, json_loads_object
 
 from .const import (
diff --git a/homeassistant/components/alpha_vantage/sensor.py b/homeassistant/components/alpha_vantage/sensor.py
index 506cb41659a..48d3ae6f526 100644
--- a/homeassistant/components/alpha_vantage/sensor.py
+++ b/homeassistant/components/alpha_vantage/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_API_KEY, CONF_CURRENCY, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/amazon_polly/manifest.json b/homeassistant/components/amazon_polly/manifest.json
index e7fbf8edc74..f684292d9a2 100644
--- a/homeassistant/components/amazon_polly/manifest.json
+++ b/homeassistant/components/amazon_polly/manifest.json
@@ -6,5 +6,5 @@
   "iot_class": "cloud_push",
   "loggers": ["boto3", "botocore", "s3transfer"],
   "quality_scale": "legacy",
-  "requirements": ["boto3==1.34.131"]
+  "requirements": ["boto3==1.37.1"]
 }
diff --git a/homeassistant/components/amazon_polly/tts.py b/homeassistant/components/amazon_polly/tts.py
index 62852848a9c..985b3b6dd7c 100644
--- a/homeassistant/components/amazon_polly/tts.py
+++ b/homeassistant/components/amazon_polly/tts.py
@@ -22,7 +22,7 @@ from homeassistant.generated.amazon_polly import (
     SUPPORTED_REGIONS,
     SUPPORTED_VOICES,
 )
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import (
diff --git a/homeassistant/components/amberelectric/__init__.py b/homeassistant/components/amberelectric/__init__.py
index 29d8f166f2a..9eab6f42ad3 100644
--- a/homeassistant/components/amberelectric/__init__.py
+++ b/homeassistant/components/amberelectric/__init__.py
@@ -2,14 +2,11 @@
 
 import amberelectric
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_TOKEN
 from homeassistant.core import HomeAssistant
 
 from .const import CONF_SITE_ID, PLATFORMS
-from .coordinator import AmberUpdateCoordinator
-
-type AmberConfigEntry = ConfigEntry[AmberUpdateCoordinator]
+from .coordinator import AmberConfigEntry, AmberUpdateCoordinator
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: AmberConfigEntry) -> bool:
@@ -19,7 +16,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AmberConfigEntry) -> boo
     api_instance = amberelectric.AmberApi(api_client)
     site_id = entry.data[CONF_SITE_ID]
 
-    coordinator = AmberUpdateCoordinator(hass, api_instance, site_id)
+    coordinator = AmberUpdateCoordinator(hass, entry, api_instance, site_id)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
diff --git a/homeassistant/components/amberelectric/binary_sensor.py b/homeassistant/components/amberelectric/binary_sensor.py
index a9fa00d0129..3ee27f19849 100644
--- a/homeassistant/components/amberelectric/binary_sensor.py
+++ b/homeassistant/components/amberelectric/binary_sensor.py
@@ -9,12 +9,11 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import AmberConfigEntry
 from .const import ATTRIBUTION
-from .coordinator import AmberUpdateCoordinator
+from .coordinator import AmberConfigEntry, AmberUpdateCoordinator
 
 PRICE_SPIKE_ICONS = {
     "none": "mdi:power-plug",
@@ -86,7 +85,7 @@ class AmberDemandWindowBinarySensor(AmberPriceGridSensor):
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AmberConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/amberelectric/coordinator.py b/homeassistant/components/amberelectric/coordinator.py
index 57028e07d21..1edf64ba0d6 100644
--- a/homeassistant/components/amberelectric/coordinator.py
+++ b/homeassistant/components/amberelectric/coordinator.py
@@ -13,11 +13,14 @@ from amberelectric.models.forecast_interval import ForecastInterval
 from amberelectric.models.price_descriptor import PriceDescriptor
 from amberelectric.rest import ApiException
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import LOGGER
 
+type AmberConfigEntry = ConfigEntry[AmberUpdateCoordinator]
+
 
 def is_current(interval: ActualInterval | CurrentInterval | ForecastInterval) -> bool:
     """Return true if the supplied interval is a CurrentInterval."""
@@ -70,13 +73,20 @@ def normalize_descriptor(descriptor: PriceDescriptor | None) -> str | None:
 class AmberUpdateCoordinator(DataUpdateCoordinator):
     """AmberUpdateCoordinator - In charge of downloading the data for a site, which all the sensors read."""
 
+    config_entry: AmberConfigEntry
+
     def __init__(
-        self, hass: HomeAssistant, api: amberelectric.AmberApi, site_id: str
+        self,
+        hass: HomeAssistant,
+        config_entry: AmberConfigEntry,
+        api: amberelectric.AmberApi,
+        site_id: str,
     ) -> None:
         """Initialise the data service."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name="amberelectric",
             update_interval=timedelta(minutes=1),
         )
diff --git a/homeassistant/components/amberelectric/sensor.py b/homeassistant/components/amberelectric/sensor.py
index cdf40e5804d..7276ddb26a5 100644
--- a/homeassistant/components/amberelectric/sensor.py
+++ b/homeassistant/components/amberelectric/sensor.py
@@ -19,12 +19,11 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CURRENCY_DOLLAR, PERCENTAGE, UnitOfEnergy
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import AmberConfigEntry
 from .const import ATTRIBUTION
-from .coordinator import AmberUpdateCoordinator, normalize_descriptor
+from .coordinator import AmberConfigEntry, AmberUpdateCoordinator, normalize_descriptor
 
 UNIT = f"{CURRENCY_DOLLAR}/{UnitOfEnergy.KILO_WATT_HOUR}"
 
@@ -197,7 +196,7 @@ class AmberGridSensor(CoordinatorEntity[AmberUpdateCoordinator], SensorEntity):
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AmberConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/ambient_network/__init__.py b/homeassistant/components/ambient_network/__init__.py
index e9443a676b5..5c39982eb91 100644
--- a/homeassistant/components/ambient_network/__init__.py
+++ b/homeassistant/components/ambient_network/__init__.py
@@ -4,13 +4,10 @@ from __future__ import annotations
 
 from aioambient.open_api import OpenAPI
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-from .coordinator import AmbientNetworkDataUpdateCoordinator
-
-type AmbientNetworkConfigEntry = ConfigEntry[AmbientNetworkDataUpdateCoordinator]
+from .coordinator import AmbientNetworkConfigEntry, AmbientNetworkDataUpdateCoordinator
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
@@ -21,7 +18,7 @@ async def async_setup_entry(
     """Set up the Ambient Weather Network from a config entry."""
 
     api = OpenAPI()
-    coordinator = AmbientNetworkDataUpdateCoordinator(hass, api)
+    coordinator = AmbientNetworkDataUpdateCoordinator(hass, entry, api)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
diff --git a/homeassistant/components/ambient_network/coordinator.py b/homeassistant/components/ambient_network/coordinator.py
index 2f51c3bc0cb..5fb1939f6b4 100644
--- a/homeassistant/components/ambient_network/coordinator.py
+++ b/homeassistant/components/ambient_network/coordinator.py
@@ -19,17 +19,27 @@ from .helper import get_station_name
 
 SCAN_INTERVAL = timedelta(minutes=5)
 
+type AmbientNetworkConfigEntry = ConfigEntry[AmbientNetworkDataUpdateCoordinator]
+
 
 class AmbientNetworkDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """The Ambient Network Data Update Coordinator."""
 
-    config_entry: ConfigEntry
+    config_entry: AmbientNetworkConfigEntry
     station_name: str
     last_measured: datetime | None = None
 
-    def __init__(self, hass: HomeAssistant, api: OpenAPI) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: AmbientNetworkConfigEntry, api: OpenAPI
+    ) -> None:
         """Initialize the coordinator."""
-        super().__init__(hass, LOGGER, name=DOMAIN, update_interval=SCAN_INTERVAL)
+        super().__init__(
+            hass,
+            LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=SCAN_INTERVAL,
+        )
         self.api = api
 
     async def _async_update_data(self) -> dict[str, Any]:
diff --git a/homeassistant/components/ambient_network/sensor.py b/homeassistant/components/ambient_network/sensor.py
index 336745f88ff..b96da9863a1 100644
--- a/homeassistant/components/ambient_network/sensor.py
+++ b/homeassistant/components/ambient_network/sensor.py
@@ -25,11 +25,10 @@ from homeassistant.const import (
     UnitOfVolumetricFlux,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
-from . import AmbientNetworkConfigEntry
-from .coordinator import AmbientNetworkDataUpdateCoordinator
+from .coordinator import AmbientNetworkConfigEntry, AmbientNetworkDataUpdateCoordinator
 from .entity import AmbientNetworkEntity
 
 TYPE_AQI_PM25 = "aqi_pm25"
@@ -240,6 +239,8 @@ SENSOR_DESCRIPTIONS = (
         native_unit_of_measurement=DEGREE,
         suggested_display_precision=0,
         entity_registry_enabled_default=False,
+        device_class=SensorDeviceClass.WIND_DIRECTION,
+        state_class=SensorStateClass.MEASUREMENT_ANGLE,
     ),
     SensorEntityDescription(
         key=TYPE_WINDGUSTMPH,
@@ -271,7 +272,7 @@ SENSOR_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AmbientNetworkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Ambient Network sensor entities."""
 
diff --git a/homeassistant/components/ambient_station/__init__.py b/homeassistant/components/ambient_station/__init__.py
index 469ad7e6e06..374c313a144 100644
--- a/homeassistant/components/ambient_station/__init__.py
+++ b/homeassistant/components/ambient_station/__init__.py
@@ -17,9 +17,8 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_send
-import homeassistant.helpers.entity_registry as er
 
 from .const import (
     ATTR_LAST_DATA,
diff --git a/homeassistant/components/ambient_station/binary_sensor.py b/homeassistant/components/ambient_station/binary_sensor.py
index a79788a4c38..9a7c89db95e 100644
--- a/homeassistant/components/ambient_station/binary_sensor.py
+++ b/homeassistant/components/ambient_station/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import ATTR_NAME, EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AmbientStationConfigEntry
 from .const import ATTR_LAST_DATA
@@ -381,7 +381,7 @@ BINARY_SENSOR_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AmbientStationConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Ambient PWS binary sensors based on a config entry."""
     ambient = entry.runtime_data
diff --git a/homeassistant/components/ambient_station/sensor.py b/homeassistant/components/ambient_station/sensor.py
index dfbd2d1b4a0..1b4334774d4 100644
--- a/homeassistant/components/ambient_station/sensor.py
+++ b/homeassistant/components/ambient_station/sensor.py
@@ -27,7 +27,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AmbientStation, AmbientStationConfigEntry
 from .const import ATTR_LAST_DATA, TYPE_SOLARRADIATION, TYPE_SOLARRADIATION_LX
@@ -608,21 +608,26 @@ SENSOR_DESCRIPTIONS = (
         key=TYPE_WINDDIR,
         translation_key="wind_direction",
         native_unit_of_measurement=DEGREE,
+        device_class=SensorDeviceClass.WIND_DIRECTION,
+        state_class=SensorStateClass.MEASUREMENT_ANGLE,
     ),
     SensorEntityDescription(
         key=TYPE_WINDDIR_AVG10M,
         translation_key="wind_direction_average_10m",
         native_unit_of_measurement=DEGREE,
+        device_class=SensorDeviceClass.WIND_DIRECTION,
     ),
     SensorEntityDescription(
         key=TYPE_WINDDIR_AVG2M,
         translation_key="wind_direction_average_2m",
         native_unit_of_measurement=DEGREE,
+        device_class=SensorDeviceClass.WIND_DIRECTION,
     ),
     SensorEntityDescription(
         key=TYPE_WINDGUSTDIR,
         translation_key="wind_gust_direction",
         native_unit_of_measurement=DEGREE,
+        device_class=SensorDeviceClass.WIND_DIRECTION,
     ),
     SensorEntityDescription(
         key=TYPE_WINDGUSTMPH,
@@ -662,7 +667,7 @@ SENSOR_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AmbientStationConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Ambient PWS sensors based on a config entry."""
     ambient = entry.runtime_data
diff --git a/homeassistant/components/amcrest/__init__.py b/homeassistant/components/amcrest/__init__.py
index 624e0145b86..313d3263932 100644
--- a/homeassistant/components/amcrest/__init__.py
+++ b/homeassistant/components/amcrest/__init__.py
@@ -37,8 +37,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import Unauthorized, UnknownUser
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.dispatcher import async_dispatcher_send, dispatcher_send
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.service import async_extract_entity_ids
diff --git a/homeassistant/components/ampio/air_quality.py b/homeassistant/components/ampio/air_quality.py
index 05581df6371..ce2830d5b14 100644
--- a/homeassistant/components/ampio/air_quality.py
+++ b/homeassistant/components/ampio/air_quality.py
@@ -14,8 +14,8 @@ from homeassistant.components.air_quality import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/analytics/__init__.py b/homeassistant/components/analytics/__init__.py
index 9bcddcb868f..0df3b8138e2 100644
--- a/homeassistant/components/analytics/__init__.py
+++ b/homeassistant/components/analytics/__init__.py
@@ -7,7 +7,7 @@ import voluptuous as vol
 from homeassistant.components import websocket_api
 from homeassistant.const import EVENT_HOMEASSISTANT_STARTED
 from homeassistant.core import Event, HassJob, HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import async_call_later, async_track_time_interval
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.hass_dict import HassKey
diff --git a/homeassistant/components/analytics/analytics.py b/homeassistant/components/analytics/analytics.py
index b63475c80a4..9339e2986e5 100644
--- a/homeassistant/components/analytics/analytics.py
+++ b/homeassistant/components/analytics/analytics.py
@@ -11,6 +11,7 @@ import uuid
 
 import aiohttp
 
+from homeassistant import config as conf_util
 from homeassistant.components import hassio
 from homeassistant.components.api import ATTR_INSTALLATION_TYPE
 from homeassistant.components.automation import DOMAIN as AUTOMATION_DOMAIN
@@ -22,13 +23,12 @@ from homeassistant.components.recorder import (
     DOMAIN as RECORDER_DOMAIN,
     get_instance as get_recorder_instance,
 )
-import homeassistant.config as conf_util
 from homeassistant.config_entries import SOURCE_IGNORE
 from homeassistant.const import ATTR_DOMAIN, __version__ as HA_VERSION
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.entity_registry as er
 from homeassistant.helpers.hassio import is_hassio
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.system_info import async_get_system_info
diff --git a/homeassistant/components/analytics_insights/__init__.py b/homeassistant/components/analytics_insights/__init__.py
index 69ad98db9df..ee7f6611c65 100644
--- a/homeassistant/components/analytics_insights/__init__.py
+++ b/homeassistant/components/analytics_insights/__init__.py
@@ -48,7 +48,7 @@ async def async_setup_entry(
             continue
         names[integration] = integrations[integration].title
 
-    coordinator = HomeassistantAnalyticsDataUpdateCoordinator(hass, client)
+    coordinator = HomeassistantAnalyticsDataUpdateCoordinator(hass, entry, client)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/analytics_insights/config_flow.py b/homeassistant/components/analytics_insights/config_flow.py
index da77a35f789..b2648f7c13c 100644
--- a/homeassistant/components/analytics_insights/config_flow.py
+++ b/homeassistant/components/analytics_insights/config_flow.py
@@ -8,7 +8,7 @@ from python_homeassistant_analytics import (
     HomeassistantAnalyticsClient,
     HomeassistantAnalyticsConnectionError,
 )
-from python_homeassistant_analytics.models import IntegrationType
+from python_homeassistant_analytics.models import Environment, IntegrationType
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult, OptionsFlow
@@ -81,7 +81,7 @@ class HomeassistantAnalyticsConfigFlow(ConfigFlow, domain=DOMAIN):
         )
         try:
             addons = await client.get_addons()
-            integrations = await client.get_integrations()
+            integrations = await client.get_integrations(Environment.NEXT)
             custom_integrations = await client.get_custom_integrations()
         except HomeassistantAnalyticsConnectionError:
             LOGGER.exception("Error connecting to Home Assistant analytics")
@@ -165,7 +165,7 @@ class HomeassistantAnalyticsOptionsFlowHandler(OptionsFlow):
         )
         try:
             addons = await client.get_addons()
-            integrations = await client.get_integrations()
+            integrations = await client.get_integrations(Environment.NEXT)
             custom_integrations = await client.get_custom_integrations()
         except HomeassistantAnalyticsConnectionError:
             LOGGER.exception("Error connecting to Home Assistant analytics")
diff --git a/homeassistant/components/analytics_insights/coordinator.py b/homeassistant/components/analytics_insights/coordinator.py
index 701f1a8dbd4..fefd43ed8df 100644
--- a/homeassistant/components/analytics_insights/coordinator.py
+++ b/homeassistant/components/analytics_insights/coordinator.py
@@ -46,12 +46,16 @@ class HomeassistantAnalyticsDataUpdateCoordinator(DataUpdateCoordinator[Analytic
     config_entry: AnalyticsInsightsConfigEntry
 
     def __init__(
-        self, hass: HomeAssistant, client: HomeassistantAnalyticsClient
+        self,
+        hass: HomeAssistant,
+        config_entry: AnalyticsInsightsConfigEntry,
+        client: HomeassistantAnalyticsClient,
     ) -> None:
         """Initialize the Homeassistant Analytics data coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(hours=12),
         )
diff --git a/homeassistant/components/analytics_insights/manifest.json b/homeassistant/components/analytics_insights/manifest.json
index bf99d89e073..ab3c2e2fe24 100644
--- a/homeassistant/components/analytics_insights/manifest.json
+++ b/homeassistant/components/analytics_insights/manifest.json
@@ -7,6 +7,6 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["python_homeassistant_analytics"],
-  "requirements": ["python-homeassistant-analytics==0.8.1"],
+  "requirements": ["python-homeassistant-analytics==0.9.0"],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/analytics_insights/sensor.py b/homeassistant/components/analytics_insights/sensor.py
index 324ca6991d2..830d914b311 100644
--- a/homeassistant/components/analytics_insights/sensor.py
+++ b/homeassistant/components/analytics_insights/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -94,7 +94,7 @@ GENERAL_SENSORS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AnalyticsInsightsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize the entries."""
 
diff --git a/homeassistant/components/android_ip_webcam/binary_sensor.py b/homeassistant/components/android_ip_webcam/binary_sensor.py
index 1846889bfda..67816664752 100644
--- a/homeassistant/components/android_ip_webcam/binary_sensor.py
+++ b/homeassistant/components/android_ip_webcam/binary_sensor.py
@@ -8,7 +8,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import MOTION_ACTIVE
 from .coordinator import AndroidIPCamConfigEntry, AndroidIPCamDataUpdateCoordinator
@@ -24,7 +24,7 @@ BINARY_SENSOR_DESCRIPTION = BinarySensorEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AndroidIPCamConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the IP Webcam sensors from config entry."""
 
diff --git a/homeassistant/components/android_ip_webcam/camera.py b/homeassistant/components/android_ip_webcam/camera.py
index 95d4fb9f67a..833b9a0d296 100644
--- a/homeassistant/components/android_ip_webcam/camera.py
+++ b/homeassistant/components/android_ip_webcam/camera.py
@@ -11,7 +11,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import AndroidIPCamConfigEntry, AndroidIPCamDataUpdateCoordinator
@@ -20,7 +20,7 @@ from .coordinator import AndroidIPCamConfigEntry, AndroidIPCamDataUpdateCoordina
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AndroidIPCamConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the IP Webcam camera from config entry."""
     filter_urllib3_logging()
diff --git a/homeassistant/components/android_ip_webcam/coordinator.py b/homeassistant/components/android_ip_webcam/coordinator.py
index fd6e1fcc4b9..c72d6ae1177 100644
--- a/homeassistant/components/android_ip_webcam/coordinator.py
+++ b/homeassistant/components/android_ip_webcam/coordinator.py
@@ -35,6 +35,7 @@ class AndroidIPCamDataUpdateCoordinator(DataUpdateCoordinator[None]):
         super().__init__(
             self.hass,
             _LOGGER,
+            config_entry=config_entry,
             name=f"{DOMAIN} {config_entry.data[CONF_HOST]}",
             update_interval=timedelta(seconds=10),
         )
diff --git a/homeassistant/components/android_ip_webcam/sensor.py b/homeassistant/components/android_ip_webcam/sensor.py
index 9b2454d6c09..e9d5f8514e8 100644
--- a/homeassistant/components/android_ip_webcam/sensor.py
+++ b/homeassistant/components/android_ip_webcam/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .coordinator import AndroidIPCamConfigEntry, AndroidIPCamDataUpdateCoordinator
@@ -119,7 +119,7 @@ SENSOR_TYPES: tuple[AndroidIPWebcamSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AndroidIPCamConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the IP Webcam sensors from config entry."""
 
diff --git a/homeassistant/components/android_ip_webcam/switch.py b/homeassistant/components/android_ip_webcam/switch.py
index f813415df0b..3ceaf6e59b9 100644
--- a/homeassistant/components/android_ip_webcam/switch.py
+++ b/homeassistant/components/android_ip_webcam/switch.py
@@ -11,7 +11,7 @@ from pydroid_ipcam import PyDroidIPCam
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import AndroidIPCamConfigEntry, AndroidIPCamDataUpdateCoordinator
 from .entity import AndroidIPCamBaseEntity
@@ -112,7 +112,7 @@ SWITCH_TYPES: tuple[AndroidIPWebcamSwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AndroidIPCamConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the IP Webcam switches from config entry."""
 
diff --git a/homeassistant/components/androidtv/config_flow.py b/homeassistant/components/androidtv/config_flow.py
index afaba5175da..d56d4e64b0f 100644
--- a/homeassistant/components/androidtv/config_flow.py
+++ b/homeassistant/components/androidtv/config_flow.py
@@ -387,4 +387,4 @@ def _validate_state_det_rules(state_det_rules: Any) -> list[Any] | None:
     except ValueError as exc:
         _LOGGER.warning("Invalid state detection rules: %s", exc)
         return None
-    return json_rules  # type: ignore[no-any-return]
+    return json_rules
diff --git a/homeassistant/components/androidtv/media_player.py b/homeassistant/components/androidtv/media_player.py
index 728411ddf42..c9e62908cac 100644
--- a/homeassistant/components/androidtv/media_player.py
+++ b/homeassistant/components/androidtv/media_player.py
@@ -21,7 +21,7 @@ from homeassistant.const import ATTR_COMMAND
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.dt import utcnow
 
 from . import AndroidTVConfigEntry
@@ -65,7 +65,7 @@ ANDROIDTV_STATES = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AndroidTVConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Android Debug Bridge entity."""
     device_class = entry.runtime_data.aftv.DEVICE_CLASS
diff --git a/homeassistant/components/androidtv/remote.py b/homeassistant/components/androidtv/remote.py
index db48b0cf1b6..026d1485e07 100644
--- a/homeassistant/components/androidtv/remote.py
+++ b/homeassistant/components/androidtv/remote.py
@@ -12,7 +12,7 @@ from homeassistant.components.remote import ATTR_NUM_REPEATS, RemoteEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_TURN_OFF_COMMAND, CONF_TURN_ON_COMMAND, DOMAIN
 from .entity import AndroidTVEntity, adb_decorator
@@ -21,7 +21,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the AndroidTV remote from a config entry."""
     async_add_entities([AndroidTVRemote(entry)])
diff --git a/homeassistant/components/androidtv_remote/__init__.py b/homeassistant/components/androidtv_remote/__init__.py
index 6a55e9971ac..28a372da4ea 100644
--- a/homeassistant/components/androidtv_remote/__init__.py
+++ b/homeassistant/components/androidtv_remote/__init__.py
@@ -35,16 +35,12 @@ async def async_setup_entry(
 
     @callback
     def is_available_updated(is_available: bool) -> None:
-        if is_available:
-            _LOGGER.info(
-                "Reconnected to %s at %s", entry.data[CONF_NAME], entry.data[CONF_HOST]
-            )
-        else:
-            _LOGGER.warning(
-                "Disconnected from %s at %s",
-                entry.data[CONF_NAME],
-                entry.data[CONF_HOST],
-            )
+        _LOGGER.info(
+            "%s %s at %s",
+            "Reconnected to" if is_available else "Disconnected from",
+            entry.data[CONF_NAME],
+            entry.data[CONF_HOST],
+        )
 
     api.add_is_available_updated_callback(is_available_updated)
 
diff --git a/homeassistant/components/androidtv_remote/manifest.json b/homeassistant/components/androidtv_remote/manifest.json
index d9c2dd05c44..89cc0fc3965 100644
--- a/homeassistant/components/androidtv_remote/manifest.json
+++ b/homeassistant/components/androidtv_remote/manifest.json
@@ -7,6 +7,6 @@
   "integration_type": "device",
   "iot_class": "local_push",
   "loggers": ["androidtvremote2"],
-  "requirements": ["androidtvremote2==0.1.2"],
+  "requirements": ["androidtvremote2==0.2.1"],
   "zeroconf": ["_androidtvremote2._tcp.local."]
 }
diff --git a/homeassistant/components/androidtv_remote/media_player.py b/homeassistant/components/androidtv_remote/media_player.py
index cdc307a0472..3d3a97092bc 100644
--- a/homeassistant/components/androidtv_remote/media_player.py
+++ b/homeassistant/components/androidtv_remote/media_player.py
@@ -18,7 +18,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AndroidTVRemoteConfigEntry
 from .const import CONF_APP_ICON, CONF_APP_NAME
@@ -30,7 +30,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AndroidTVRemoteConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Android TV media player entity based on a config entry."""
     api = config_entry.runtime_data
diff --git a/homeassistant/components/androidtv_remote/remote.py b/homeassistant/components/androidtv_remote/remote.py
index c9a261c8735..212b0491d2d 100644
--- a/homeassistant/components/androidtv_remote/remote.py
+++ b/homeassistant/components/androidtv_remote/remote.py
@@ -18,7 +18,7 @@ from homeassistant.components.remote import (
     RemoteEntityFeature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AndroidTVRemoteConfigEntry
 from .const import CONF_APP_NAME
@@ -30,7 +30,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AndroidTVRemoteConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Android TV remote entity based on a config entry."""
     api = config_entry.runtime_data
diff --git a/homeassistant/components/anel_pwrctrl/switch.py b/homeassistant/components/anel_pwrctrl/switch.py
index 6b27a61e065..97691c8b028 100644
--- a/homeassistant/components/anel_pwrctrl/switch.py
+++ b/homeassistant/components/anel_pwrctrl/switch.py
@@ -15,7 +15,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/anova/__init__.py b/homeassistant/components/anova/__init__.py
index 4ae4750b9a9..9307cfc4bdd 100644
--- a/homeassistant/components/anova/__init__.py
+++ b/homeassistant/components/anova/__init__.py
@@ -18,8 +18,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import aiohttp_client
 
-from .coordinator import AnovaCoordinator
-from .models import AnovaConfigEntry, AnovaData
+from .coordinator import AnovaConfigEntry, AnovaCoordinator, AnovaData
 
 PLATFORMS = [Platform.SENSOR]
 
@@ -59,7 +58,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AnovaConfigEntry) -> boo
         # websocket client
         assert api.websocket_handler is not None
     devices = list(api.websocket_handler.devices.values())
-    coordinators = [AnovaCoordinator(hass, device) for device in devices]
+    coordinators = [AnovaCoordinator(hass, entry, device) for device in devices]
     entry.runtime_data = AnovaData(api_jwt=api.jwt, coordinators=coordinators, api=api)
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
diff --git a/homeassistant/components/anova/config_flow.py b/homeassistant/components/anova/config_flow.py
index bc4723b1dba..f382606baba 100644
--- a/homeassistant/components/anova/config_flow.py
+++ b/homeassistant/components/anova/config_flow.py
@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+import logging
+
 from anova_wifi import AnovaApi, InvalidLogin
 import voluptuous as vol
 
@@ -11,8 +13,10 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DOMAIN
 
+_LOGGER = logging.getLogger(__name__)
 
-class AnovaConfligFlow(ConfigFlow, domain=DOMAIN):
+
+class AnovaConfigFlow(ConfigFlow, domain=DOMAIN):
     """Sets up a config flow for Anova."""
 
     VERSION = 1
@@ -35,7 +39,8 @@ class AnovaConfligFlow(ConfigFlow, domain=DOMAIN):
                 await api.authenticate()
             except InvalidLogin:
                 errors["base"] = "invalid_auth"
-            except Exception:  # noqa: BLE001
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
                 return self.async_create_entry(
diff --git a/homeassistant/components/anova/coordinator.py b/homeassistant/components/anova/coordinator.py
index 93c6fdbf1c5..61d118ed0a5 100644
--- a/homeassistant/components/anova/coordinator.py
+++ b/homeassistant/components/anova/coordinator.py
@@ -1,8 +1,11 @@
 """Support for Anova Coordinators."""
 
+from __future__ import annotations
+
+from dataclasses import dataclass
 import logging
 
-from anova_wifi import APCUpdate, APCWifiDevice
+from anova_wifi import AnovaApi, APCUpdate, APCWifiDevice
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -14,15 +17,33 @@ from .const import DOMAIN
 _LOGGER = logging.getLogger(__name__)
 
 
+@dataclass
+class AnovaData:
+    """Data for the Anova integration."""
+
+    api_jwt: str
+    coordinators: list[AnovaCoordinator]
+    api: AnovaApi
+
+
+type AnovaConfigEntry = ConfigEntry[AnovaData]
+
+
 class AnovaCoordinator(DataUpdateCoordinator[APCUpdate]):
     """Anova custom coordinator."""
 
-    config_entry: ConfigEntry
+    config_entry: AnovaConfigEntry
 
-    def __init__(self, hass: HomeAssistant, anova_device: APCWifiDevice) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: AnovaConfigEntry,
+        anova_device: APCWifiDevice,
+    ) -> None:
         """Set up Anova Coordinator."""
         super().__init__(
             hass,
+            config_entry=config_entry,
             name="Anova Precision Cooker",
             logger=_LOGGER,
         )
diff --git a/homeassistant/components/anova/models.py b/homeassistant/components/anova/models.py
deleted file mode 100644
index eef8180cf88..00000000000
--- a/homeassistant/components/anova/models.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""Dataclass models for the Anova integration."""
-
-from dataclasses import dataclass
-
-from anova_wifi import AnovaApi
-
-from homeassistant.config_entries import ConfigEntry
-
-from .coordinator import AnovaCoordinator
-
-type AnovaConfigEntry = ConfigEntry[AnovaData]
-
-
-@dataclass
-class AnovaData:
-    """Data for the Anova integration."""
-
-    api_jwt: str
-    coordinators: list[AnovaCoordinator]
-    api: AnovaApi
diff --git a/homeassistant/components/anova/sensor.py b/homeassistant/components/anova/sensor.py
index aa572a0ee9b..c3a3d3861f2 100644
--- a/homeassistant/components/anova/sensor.py
+++ b/homeassistant/components/anova/sensor.py
@@ -15,12 +15,11 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import UnitOfTemperature, UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from .coordinator import AnovaCoordinator
+from .coordinator import AnovaConfigEntry, AnovaCoordinator
 from .entity import AnovaDescriptionEntity
-from .models import AnovaConfigEntry
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -98,7 +97,7 @@ SENSOR_DESCRIPTIONS: list[AnovaSensorEntityDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AnovaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Anova device."""
     anova_data = entry.runtime_data
@@ -109,7 +108,7 @@ async def async_setup_entry(
 
 def setup_coordinator(
     coordinator: AnovaCoordinator,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up an individual Anova Coordinator."""
 
diff --git a/homeassistant/components/anova/strings.json b/homeassistant/components/anova/strings.json
index bfe3a61282e..e9905e4cce5 100644
--- a/homeassistant/components/anova/strings.json
+++ b/homeassistant/components/anova/strings.json
@@ -39,7 +39,7 @@
           "idle": "[%key:common::state::idle%]",
           "cook": "Cooking",
           "low_water": "Low water",
-          "ota": "Ota",
+          "ota": "OTA update",
           "provisioning": "Provisioning",
           "high_temp": "High temperature",
           "device_failure": "Device failure"
diff --git a/homeassistant/components/anthemav/config_flow.py b/homeassistant/components/anthemav/config_flow.py
index 400ac6d5899..fe9c6513041 100644
--- a/homeassistant/components/anthemav/config_flow.py
+++ b/homeassistant/components/anthemav/config_flow.py
@@ -12,7 +12,7 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_MAC, CONF_MODEL, CONF_PORT
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.device_registry import format_mac
 
 from .const import DEFAULT_NAME, DEFAULT_PORT, DEVICE_TIMEOUT_SECONDS, DOMAIN
diff --git a/homeassistant/components/anthemav/media_player.py b/homeassistant/components/anthemav/media_player.py
index be5a6ad2258..317498e96b5 100644
--- a/homeassistant/components/anthemav/media_player.py
+++ b/homeassistant/components/anthemav/media_player.py
@@ -16,18 +16,19 @@ from homeassistant.const import CONF_MAC, CONF_MODEL
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AnthemavConfigEntry
 from .const import ANTHEMAV_UPDATE_SIGNAL, DOMAIN, MANUFACTURER
 
 _LOGGER = logging.getLogger(__name__)
+VOLUME_STEP = 0.01
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AnthemavConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry."""
     name = config_entry.title
@@ -60,6 +61,7 @@ class AnthemAVR(MediaPlayerEntity):
         | MediaPlayerEntityFeature.TURN_OFF
         | MediaPlayerEntityFeature.SELECT_SOURCE
     )
+    _attr_volume_step = VOLUME_STEP
 
     def __init__(
         self,
diff --git a/homeassistant/components/anthemav/strings.json b/homeassistant/components/anthemav/strings.json
index 1f1dd0ec75b..15e365b3e63 100644
--- a/homeassistant/components/anthemav/strings.json
+++ b/homeassistant/components/anthemav/strings.json
@@ -10,7 +10,7 @@
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "cannot_receive_deviceinfo": "Failed to retreive MAC Address. Make sure the device is turned on"
+      "cannot_receive_deviceinfo": "Failed to retrieve MAC Address. Make sure the device is turned on"
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
diff --git a/homeassistant/components/anthropic/__init__.py b/homeassistant/components/anthropic/__init__.py
index aa6cf509fa1..a9745d1a6a5 100644
--- a/homeassistant/components/anthropic/__init__.py
+++ b/homeassistant/components/anthropic/__init__.py
@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from functools import partial
+
 import anthropic
 
 from homeassistant.config_entries import ConfigEntry
@@ -10,7 +12,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import config_validation as cv
 
-from .const import DOMAIN, LOGGER
+from .const import CONF_CHAT_MODEL, DOMAIN, LOGGER, RECOMMENDED_CHAT_MODEL
 
 PLATFORMS = (Platform.CONVERSATION,)
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
@@ -20,14 +22,13 @@ type AnthropicConfigEntry = ConfigEntry[anthropic.AsyncClient]
 
 async def async_setup_entry(hass: HomeAssistant, entry: AnthropicConfigEntry) -> bool:
     """Set up Anthropic from a config entry."""
-    client = anthropic.AsyncAnthropic(api_key=entry.data[CONF_API_KEY])
+    client = await hass.async_add_executor_job(
+        partial(anthropic.AsyncAnthropic, api_key=entry.data[CONF_API_KEY])
+    )
     try:
-        await client.messages.create(
-            model="claude-3-haiku-20240307",
-            max_tokens=1,
-            messages=[{"role": "user", "content": "Hi"}],
-            timeout=10.0,
-        )
+        model_id = entry.options.get(CONF_CHAT_MODEL, RECOMMENDED_CHAT_MODEL)
+        model = await client.models.retrieve(model_id=model_id, timeout=10.0)
+        LOGGER.debug("Anthropic model: %s", model.display_name)
     except anthropic.AuthenticationError as err:
         LOGGER.error("Invalid API key: %s", err)
         return False
diff --git a/homeassistant/components/anthropic/config_flow.py b/homeassistant/components/anthropic/config_flow.py
index fa43a3c4bcc..e53a479d7d4 100644
--- a/homeassistant/components/anthropic/config_flow.py
+++ b/homeassistant/components/anthropic/config_flow.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from functools import partial
 import logging
 from types import MappingProxyType
 from typing import Any
@@ -33,10 +34,12 @@ from .const import (
     CONF_PROMPT,
     CONF_RECOMMENDED,
     CONF_TEMPERATURE,
+    CONF_THINKING_BUDGET,
     DOMAIN,
     RECOMMENDED_CHAT_MODEL,
     RECOMMENDED_MAX_TOKENS,
     RECOMMENDED_TEMPERATURE,
+    RECOMMENDED_THINKING_BUDGET,
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -59,13 +62,10 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> None:
 
     Data has the keys from STEP_USER_DATA_SCHEMA with values provided by the user.
     """
-    client = anthropic.AsyncAnthropic(api_key=data[CONF_API_KEY])
-    await client.messages.create(
-        model="claude-3-haiku-20240307",
-        max_tokens=1,
-        messages=[{"role": "user", "content": "Hi"}],
-        timeout=10.0,
+    client = await hass.async_add_executor_job(
+        partial(anthropic.AsyncAnthropic, api_key=data[CONF_API_KEY])
     )
+    await client.models.list(timeout=10.0)
 
 
 class AnthropicConfigFlow(ConfigFlow, domain=DOMAIN):
@@ -130,21 +130,29 @@ class AnthropicOptionsFlow(OptionsFlow):
     ) -> ConfigFlowResult:
         """Manage the options."""
         options: dict[str, Any] | MappingProxyType[str, Any] = self.config_entry.options
+        errors: dict[str, str] = {}
 
         if user_input is not None:
             if user_input[CONF_RECOMMENDED] == self.last_rendered_recommended:
                 if user_input[CONF_LLM_HASS_API] == "none":
                     user_input.pop(CONF_LLM_HASS_API)
-                return self.async_create_entry(title="", data=user_input)
 
-            # Re-render the options again, now with the recommended options shown/hidden
-            self.last_rendered_recommended = user_input[CONF_RECOMMENDED]
+                if user_input.get(
+                    CONF_THINKING_BUDGET, RECOMMENDED_THINKING_BUDGET
+                ) >= user_input.get(CONF_MAX_TOKENS, RECOMMENDED_MAX_TOKENS):
+                    errors[CONF_THINKING_BUDGET] = "thinking_budget_too_large"
 
-            options = {
-                CONF_RECOMMENDED: user_input[CONF_RECOMMENDED],
-                CONF_PROMPT: user_input[CONF_PROMPT],
-                CONF_LLM_HASS_API: user_input[CONF_LLM_HASS_API],
-            }
+                if not errors:
+                    return self.async_create_entry(title="", data=user_input)
+            else:
+                # Re-render the options again, now with the recommended options shown/hidden
+                self.last_rendered_recommended = user_input[CONF_RECOMMENDED]
+
+                options = {
+                    CONF_RECOMMENDED: user_input[CONF_RECOMMENDED],
+                    CONF_PROMPT: user_input[CONF_PROMPT],
+                    CONF_LLM_HASS_API: user_input[CONF_LLM_HASS_API],
+                }
 
         suggested_values = options.copy()
         if not suggested_values.get(CONF_PROMPT):
@@ -158,6 +166,7 @@ class AnthropicOptionsFlow(OptionsFlow):
         return self.async_show_form(
             step_id="init",
             data_schema=schema,
+            errors=errors or None,
         )
 
 
@@ -207,6 +216,10 @@ def anthropic_config_option_schema(
                 CONF_TEMPERATURE,
                 default=RECOMMENDED_TEMPERATURE,
             ): NumberSelector(NumberSelectorConfig(min=0, max=1, step=0.05)),
+            vol.Optional(
+                CONF_THINKING_BUDGET,
+                default=RECOMMENDED_THINKING_BUDGET,
+            ): int,
         }
     )
     return schema
diff --git a/homeassistant/components/anthropic/const.py b/homeassistant/components/anthropic/const.py
index 0dbf9c51ac1..38e4270e6e1 100644
--- a/homeassistant/components/anthropic/const.py
+++ b/homeassistant/components/anthropic/const.py
@@ -13,3 +13,8 @@ CONF_MAX_TOKENS = "max_tokens"
 RECOMMENDED_MAX_TOKENS = 1024
 CONF_TEMPERATURE = "temperature"
 RECOMMENDED_TEMPERATURE = 1.0
+CONF_THINKING_BUDGET = "thinking_budget"
+RECOMMENDED_THINKING_BUDGET = 0
+MIN_THINKING_BUDGET = 1024
+
+THINKING_MODELS = ["claude-3-7-sonnet-20250219", "claude-3-7-sonnet-latest"]
diff --git a/homeassistant/components/anthropic/conversation.py b/homeassistant/components/anthropic/conversation.py
index e45e849adf6..5e5ad464eaa 100644
--- a/homeassistant/components/anthropic/conversation.py
+++ b/homeassistant/components/anthropic/conversation.py
@@ -1,33 +1,46 @@
 """Conversation support for Anthropic."""
 
-from collections.abc import Callable
+from collections.abc import AsyncGenerator, Callable, Iterable
 import json
 from typing import Any, Literal, cast
 
 import anthropic
+from anthropic import AsyncStream
 from anthropic._types import NOT_GIVEN
 from anthropic.types import (
-    Message,
+    InputJSONDelta,
     MessageParam,
+    MessageStreamEvent,
+    RawContentBlockDeltaEvent,
+    RawContentBlockStartEvent,
+    RawContentBlockStopEvent,
+    RawMessageStartEvent,
+    RawMessageStopEvent,
+    RedactedThinkingBlock,
+    RedactedThinkingBlockParam,
+    SignatureDelta,
     TextBlock,
     TextBlockParam,
+    TextDelta,
+    ThinkingBlock,
+    ThinkingBlockParam,
+    ThinkingConfigDisabledParam,
+    ThinkingConfigEnabledParam,
+    ThinkingDelta,
     ToolParam,
     ToolResultBlockParam,
     ToolUseBlock,
     ToolUseBlockParam,
 )
-import voluptuous as vol
 from voluptuous_openapi import convert
 
 from homeassistant.components import conversation
-from homeassistant.components.conversation import trace
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_LLM_HASS_API, MATCH_ALL
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError, TemplateError
-from homeassistant.helpers import device_registry as dr, intent, llm, template
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util import ulid as ulid_util
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import device_registry as dr, intent, llm
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AnthropicConfigEntry
 from .const import (
@@ -35,11 +48,15 @@ from .const import (
     CONF_MAX_TOKENS,
     CONF_PROMPT,
     CONF_TEMPERATURE,
+    CONF_THINKING_BUDGET,
     DOMAIN,
     LOGGER,
+    MIN_THINKING_BUDGET,
     RECOMMENDED_CHAT_MODEL,
     RECOMMENDED_MAX_TOKENS,
     RECOMMENDED_TEMPERATURE,
+    RECOMMENDED_THINKING_BUDGET,
+    THINKING_MODELS,
 )
 
 # Max number of back and forth with the LLM to generate a response
@@ -49,7 +66,7 @@ MAX_TOOL_ITERATIONS = 10
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AnthropicConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up conversation entities."""
     agent = AnthropicConversationEntity(config_entry)
@@ -67,26 +84,211 @@ def _format_tool(
     )
 
 
-def _message_convert(
-    message: Message,
-) -> MessageParam:
-    """Convert from class to TypedDict."""
-    param_content: list[TextBlockParam | ToolUseBlockParam] = []
+def _convert_content(
+    chat_content: Iterable[conversation.Content],
+) -> list[MessageParam]:
+    """Transform HA chat_log content into Anthropic API format."""
+    messages: list[MessageParam] = []
 
-    for message_content in message.content:
-        if isinstance(message_content, TextBlock):
-            param_content.append(TextBlockParam(type="text", text=message_content.text))
-        elif isinstance(message_content, ToolUseBlock):
-            param_content.append(
-                ToolUseBlockParam(
-                    type="tool_use",
-                    id=message_content.id,
-                    name=message_content.name,
-                    input=message_content.input,
-                )
+    for content in chat_content:
+        if isinstance(content, conversation.ToolResultContent):
+            tool_result_block = ToolResultBlockParam(
+                type="tool_result",
+                tool_use_id=content.tool_call_id,
+                content=json.dumps(content.tool_result),
             )
+            if not messages or messages[-1]["role"] != "user":
+                messages.append(
+                    MessageParam(
+                        role="user",
+                        content=[tool_result_block],
+                    )
+                )
+            elif isinstance(messages[-1]["content"], str):
+                messages[-1]["content"] = [
+                    TextBlockParam(type="text", text=messages[-1]["content"]),
+                    tool_result_block,
+                ]
+            else:
+                messages[-1]["content"].append(tool_result_block)  # type: ignore[attr-defined]
+        elif isinstance(content, conversation.UserContent):
+            # Combine consequent user messages
+            if not messages or messages[-1]["role"] != "user":
+                messages.append(
+                    MessageParam(
+                        role="user",
+                        content=content.content,
+                    )
+                )
+            elif isinstance(messages[-1]["content"], str):
+                messages[-1]["content"] = [
+                    TextBlockParam(type="text", text=messages[-1]["content"]),
+                    TextBlockParam(type="text", text=content.content),
+                ]
+            else:
+                messages[-1]["content"].append(  # type: ignore[attr-defined]
+                    TextBlockParam(type="text", text=content.content)
+                )
+        elif isinstance(content, conversation.AssistantContent):
+            # Combine consequent assistant messages
+            if not messages or messages[-1]["role"] != "assistant":
+                messages.append(
+                    MessageParam(
+                        role="assistant",
+                        content=[],
+                    )
+                )
 
-    return MessageParam(role=message.role, content=param_content)
+            if content.content:
+                messages[-1]["content"].append(  # type: ignore[union-attr]
+                    TextBlockParam(type="text", text=content.content)
+                )
+            if content.tool_calls:
+                messages[-1]["content"].extend(  # type: ignore[union-attr]
+                    [
+                        ToolUseBlockParam(
+                            type="tool_use",
+                            id=tool_call.id,
+                            name=tool_call.tool_name,
+                            input=tool_call.tool_args,
+                        )
+                        for tool_call in content.tool_calls
+                    ]
+                )
+        else:
+            # Note: We don't pass SystemContent here as its passed to the API as the prompt
+            raise TypeError(f"Unexpected content type: {type(content)}")
+
+    return messages
+
+
+async def _transform_stream(
+    result: AsyncStream[MessageStreamEvent],
+    messages: list[MessageParam],
+) -> AsyncGenerator[conversation.AssistantContentDeltaDict]:
+    """Transform the response stream into HA format.
+
+    A typical stream of responses might look something like the following:
+    - RawMessageStartEvent with no content
+    - RawContentBlockStartEvent with an empty ThinkingBlock (if extended thinking is enabled)
+    - RawContentBlockDeltaEvent with a ThinkingDelta
+    - RawContentBlockDeltaEvent with a ThinkingDelta
+    - RawContentBlockDeltaEvent with a ThinkingDelta
+    - ...
+    - RawContentBlockDeltaEvent with a SignatureDelta
+    - RawContentBlockStopEvent
+    - RawContentBlockStartEvent with a RedactedThinkingBlock (occasionally)
+    - RawContentBlockStopEvent (RedactedThinkingBlock does not have a delta)
+    - RawContentBlockStartEvent with an empty TextBlock
+    - RawContentBlockDeltaEvent with a TextDelta
+    - RawContentBlockDeltaEvent with a TextDelta
+    - RawContentBlockDeltaEvent with a TextDelta
+    - ...
+    - RawContentBlockStopEvent
+    - RawContentBlockStartEvent with ToolUseBlock specifying the function name
+    - RawContentBlockDeltaEvent with a InputJSONDelta
+    - RawContentBlockDeltaEvent with a InputJSONDelta
+    - ...
+    - RawContentBlockStopEvent
+    - RawMessageDeltaEvent with a stop_reason='tool_use'
+    - RawMessageStopEvent(type='message_stop')
+
+    Each message could contain multiple blocks of the same type.
+    """
+    if result is None:
+        raise TypeError("Expected a stream of messages")
+
+    current_message: MessageParam | None = None
+    current_block: (
+        TextBlockParam
+        | ToolUseBlockParam
+        | ThinkingBlockParam
+        | RedactedThinkingBlockParam
+        | None
+    ) = None
+    current_tool_args: str
+
+    async for response in result:
+        LOGGER.debug("Received response: %s", response)
+
+        if isinstance(response, RawMessageStartEvent):
+            if response.message.role != "assistant":
+                raise ValueError("Unexpected message role")
+            current_message = MessageParam(role=response.message.role, content=[])
+        elif isinstance(response, RawContentBlockStartEvent):
+            if isinstance(response.content_block, ToolUseBlock):
+                current_block = ToolUseBlockParam(
+                    type="tool_use",
+                    id=response.content_block.id,
+                    name=response.content_block.name,
+                    input="",
+                )
+                current_tool_args = ""
+            elif isinstance(response.content_block, TextBlock):
+                current_block = TextBlockParam(
+                    type="text", text=response.content_block.text
+                )
+                yield {"role": "assistant"}
+                if response.content_block.text:
+                    yield {"content": response.content_block.text}
+            elif isinstance(response.content_block, ThinkingBlock):
+                current_block = ThinkingBlockParam(
+                    type="thinking",
+                    thinking=response.content_block.thinking,
+                    signature=response.content_block.signature,
+                )
+            elif isinstance(response.content_block, RedactedThinkingBlock):
+                current_block = RedactedThinkingBlockParam(
+                    type="redacted_thinking", data=response.content_block.data
+                )
+                LOGGER.debug(
+                    "Some of Claude’s internal reasoning has been automatically "
+                    "encrypted for safety reasons. This doesn’t affect the quality of "
+                    "responses"
+                )
+        elif isinstance(response, RawContentBlockDeltaEvent):
+            if current_block is None:
+                raise ValueError("Unexpected delta without a block")
+            if isinstance(response.delta, InputJSONDelta):
+                current_tool_args += response.delta.partial_json
+            elif isinstance(response.delta, TextDelta):
+                text_block = cast(TextBlockParam, current_block)
+                text_block["text"] += response.delta.text
+                yield {"content": response.delta.text}
+            elif isinstance(response.delta, ThinkingDelta):
+                thinking_block = cast(ThinkingBlockParam, current_block)
+                thinking_block["thinking"] += response.delta.thinking
+            elif isinstance(response.delta, SignatureDelta):
+                thinking_block = cast(ThinkingBlockParam, current_block)
+                thinking_block["signature"] += response.delta.signature
+        elif isinstance(response, RawContentBlockStopEvent):
+            if current_block is None:
+                raise ValueError("Unexpected stop event without a current block")
+            if current_block["type"] == "tool_use":
+                tool_block = cast(ToolUseBlockParam, current_block)
+                tool_args = json.loads(current_tool_args)
+                tool_block["input"] = tool_args
+                yield {
+                    "tool_calls": [
+                        llm.ToolInput(
+                            id=tool_block["id"],
+                            tool_name=tool_block["name"],
+                            tool_args=tool_args,
+                        )
+                    ]
+                }
+            elif current_block["type"] == "thinking":
+                thinking_block = cast(ThinkingBlockParam, current_block)
+                LOGGER.debug("Thinking: %s", thinking_block["thinking"])
+
+            if current_message is None:
+                raise ValueError("Unexpected stop event without a current message")
+            current_message["content"].append(current_block)  # type: ignore[union-attr]
+            current_block = None
+        elif isinstance(response, RawMessageStopEvent):
+            if current_message is not None:
+                messages.append(current_message)
+                current_message = None
 
 
 class AnthropicConversationEntity(
@@ -100,7 +302,6 @@ class AnthropicConversationEntity(
     def __init__(self, entry: AnthropicConfigEntry) -> None:
         """Initialize the agent."""
         self.entry = entry
-        self.history: dict[str, list[MessageParam]] = {}
         self._attr_unique_id = entry.entry_id
         self._attr_device_info = dr.DeviceInfo(
             identifiers={(DOMAIN, entry.entry_id)},
@@ -125,187 +326,92 @@ class AnthropicConversationEntity(
             self.entry.add_update_listener(self._async_entry_update_listener)
         )
 
-    async def async_process(
-        self, user_input: conversation.ConversationInput
+    async def _async_handle_message(
+        self,
+        user_input: conversation.ConversationInput,
+        chat_log: conversation.ChatLog,
     ) -> conversation.ConversationResult:
-        """Process a sentence."""
+        """Call the API."""
         options = self.entry.options
-        intent_response = intent.IntentResponse(language=user_input.language)
-        llm_api: llm.APIInstance | None = None
-        tools: list[ToolParam] | None = None
-        user_name: str | None = None
-        llm_context = llm.LLMContext(
-            platform=DOMAIN,
-            context=user_input.context,
-            user_prompt=user_input.text,
-            language=user_input.language,
-            assistant=conversation.DOMAIN,
-            device_id=user_input.device_id,
-        )
-
-        if options.get(CONF_LLM_HASS_API):
-            try:
-                llm_api = await llm.async_get_api(
-                    self.hass,
-                    options[CONF_LLM_HASS_API],
-                    llm_context,
-                )
-            except HomeAssistantError as err:
-                LOGGER.error("Error getting LLM API: %s", err)
-                intent_response.async_set_error(
-                    intent.IntentResponseErrorCode.UNKNOWN,
-                    f"Error preparing LLM API: {err}",
-                )
-                return conversation.ConversationResult(
-                    response=intent_response, conversation_id=user_input.conversation_id
-                )
-            tools = [
-                _format_tool(tool, llm_api.custom_serializer) for tool in llm_api.tools
-            ]
-
-        if user_input.conversation_id is None:
-            conversation_id = ulid_util.ulid_now()
-            messages = []
-
-        elif user_input.conversation_id in self.history:
-            conversation_id = user_input.conversation_id
-            messages = self.history[conversation_id]
-
-        else:
-            # Conversation IDs are ULIDs. We generate a new one if not provided.
-            # If an old OLID is passed in, we will generate a new one to indicate
-            # a new conversation was started. If the user picks their own, they
-            # want to track a conversation and we respect it.
-            try:
-                ulid_util.ulid_to_bytes(user_input.conversation_id)
-                conversation_id = ulid_util.ulid_now()
-            except ValueError:
-                conversation_id = user_input.conversation_id
-
-            messages = []
-
-        if (
-            user_input.context
-            and user_input.context.user_id
-            and (
-                user := await self.hass.auth.async_get_user(user_input.context.user_id)
-            )
-        ):
-            user_name = user.name
 
         try:
-            prompt_parts = [
-                template.Template(
-                    llm.BASE_PROMPT
-                    + options.get(CONF_PROMPT, llm.DEFAULT_INSTRUCTIONS_PROMPT),
-                    self.hass,
-                ).async_render(
-                    {
-                        "ha_name": self.hass.config.location_name,
-                        "user_name": user_name,
-                        "llm_context": llm_context,
-                    },
-                    parse_result=False,
-                )
+            await chat_log.async_update_llm_data(
+                DOMAIN,
+                user_input,
+                options.get(CONF_LLM_HASS_API),
+                options.get(CONF_PROMPT),
+            )
+        except conversation.ConverseError as err:
+            return err.as_conversation_result()
+
+        tools: list[ToolParam] | None = None
+        if chat_log.llm_api:
+            tools = [
+                _format_tool(tool, chat_log.llm_api.custom_serializer)
+                for tool in chat_log.llm_api.tools
             ]
 
-        except TemplateError as err:
-            LOGGER.error("Error rendering prompt: %s", err)
-            intent_response.async_set_error(
-                intent.IntentResponseErrorCode.UNKNOWN,
-                f"Sorry, I had a problem with my template: {err}",
-            )
-            return conversation.ConversationResult(
-                response=intent_response, conversation_id=conversation_id
-            )
-
-        if llm_api:
-            prompt_parts.append(llm_api.api_prompt)
-
-        prompt = "\n".join(prompt_parts)
-
-        # Create a copy of the variable because we attach it to the trace
-        messages = [*messages, MessageParam(role="user", content=user_input.text)]
-
-        LOGGER.debug("Prompt: %s", messages)
-        LOGGER.debug("Tools: %s", tools)
-        trace.async_conversation_trace_append(
-            trace.ConversationTraceEventType.AGENT_DETAIL,
-            {"system": prompt, "messages": messages},
-        )
+        system = chat_log.content[0]
+        if not isinstance(system, conversation.SystemContent):
+            raise TypeError("First message must be a system message")
+        messages = _convert_content(chat_log.content[1:])
 
         client = self.entry.runtime_data
 
+        thinking_budget = options.get(CONF_THINKING_BUDGET, RECOMMENDED_THINKING_BUDGET)
+        model = options.get(CONF_CHAT_MODEL, RECOMMENDED_CHAT_MODEL)
+
         # To prevent infinite loops, we limit the number of iterations
         for _iteration in range(MAX_TOOL_ITERATIONS):
+            model_args = {
+                "model": model,
+                "messages": messages,
+                "tools": tools or NOT_GIVEN,
+                "max_tokens": options.get(CONF_MAX_TOKENS, RECOMMENDED_MAX_TOKENS),
+                "system": system.content,
+                "stream": True,
+            }
+            if model in THINKING_MODELS and thinking_budget >= MIN_THINKING_BUDGET:
+                model_args["thinking"] = ThinkingConfigEnabledParam(
+                    type="enabled", budget_tokens=thinking_budget
+                )
+            else:
+                model_args["thinking"] = ThinkingConfigDisabledParam(type="disabled")
+                model_args["temperature"] = options.get(
+                    CONF_TEMPERATURE, RECOMMENDED_TEMPERATURE
+                )
+
             try:
-                response = await client.messages.create(
-                    model=options.get(CONF_CHAT_MODEL, RECOMMENDED_CHAT_MODEL),
-                    messages=messages,
-                    tools=tools or NOT_GIVEN,
-                    max_tokens=options.get(CONF_MAX_TOKENS, RECOMMENDED_MAX_TOKENS),
-                    system=prompt,
-                    temperature=options.get(CONF_TEMPERATURE, RECOMMENDED_TEMPERATURE),
-                )
+                stream = await client.messages.create(**model_args)
             except anthropic.AnthropicError as err:
-                intent_response.async_set_error(
-                    intent.IntentResponseErrorCode.UNKNOWN,
-                    f"Sorry, I had a problem talking to Anthropic: {err}",
-                )
-                return conversation.ConversationResult(
-                    response=intent_response, conversation_id=conversation_id
+                raise HomeAssistantError(
+                    f"Sorry, I had a problem talking to Anthropic: {err}"
+                ) from err
+
+            messages.extend(
+                _convert_content(
+                    [
+                        content
+                        async for content in chat_log.async_add_delta_content_stream(
+                            user_input.agent_id, _transform_stream(stream, messages)
+                        )
+                        if not isinstance(content, conversation.AssistantContent)
+                    ]
                 )
+            )
 
-            LOGGER.debug("Response %s", response)
-
-            messages.append(_message_convert(response))
-
-            if response.stop_reason != "tool_use" or not llm_api:
-                break
-
-            tool_results: list[ToolResultBlockParam] = []
-            for tool_call in response.content:
-                if isinstance(tool_call, TextBlock):
-                    LOGGER.info(tool_call.text)
-
-                if not isinstance(tool_call, ToolUseBlock):
-                    continue
-
-                tool_input = llm.ToolInput(
-                    tool_name=tool_call.name,
-                    tool_args=cast(dict[str, Any], tool_call.input),
-                )
-                LOGGER.debug(
-                    "Tool call: %s(%s)", tool_input.tool_name, tool_input.tool_args
-                )
-
-                try:
-                    tool_response = await llm_api.async_call_tool(tool_input)
-                except (HomeAssistantError, vol.Invalid) as e:
-                    tool_response = {"error": type(e).__name__}
-                    if str(e):
-                        tool_response["error_text"] = str(e)
-
-                LOGGER.debug("Tool response: %s", tool_response)
-                tool_results.append(
-                    ToolResultBlockParam(
-                        type="tool_result",
-                        tool_use_id=tool_call.id,
-                        content=json.dumps(tool_response),
-                    )
-                )
-
-            messages.append(MessageParam(role="user", content=tool_results))
-
-        self.history[conversation_id] = messages
-
-        for content in response.content:
-            if isinstance(content, TextBlock):
-                intent_response.async_set_speech(content.text)
+            if not chat_log.unresponded_tool_results:
                 break
 
+        response_content = chat_log.content[-1]
+        if not isinstance(response_content, conversation.AssistantContent):
+            raise TypeError("Last message must be an assistant message")
+        intent_response = intent.IntentResponse(language=user_input.language)
+        intent_response.async_set_speech(response_content.content or "")
         return conversation.ConversationResult(
-            response=intent_response, conversation_id=conversation_id
+            response=intent_response,
+            conversation_id=chat_log.conversation_id,
+            continue_conversation=chat_log.continue_conversation,
         )
 
     async def _async_entry_update_listener(
diff --git a/homeassistant/components/anthropic/manifest.json b/homeassistant/components/anthropic/manifest.json
index b5cbb36c034..797a7299d16 100644
--- a/homeassistant/components/anthropic/manifest.json
+++ b/homeassistant/components/anthropic/manifest.json
@@ -8,5 +8,5 @@
   "documentation": "https://www.home-assistant.io/integrations/anthropic",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["anthropic==0.44.0"]
+  "requirements": ["anthropic==0.47.2"]
 }
diff --git a/homeassistant/components/anthropic/strings.json b/homeassistant/components/anthropic/strings.json
index 9550a1a6672..c2caf3a6666 100644
--- a/homeassistant/components/anthropic/strings.json
+++ b/homeassistant/components/anthropic/strings.json
@@ -23,12 +23,17 @@
           "max_tokens": "Maximum tokens to return in response",
           "temperature": "Temperature",
           "llm_hass_api": "[%key:common::config_flow::data::llm_hass_api%]",
-          "recommended": "Recommended model settings"
+          "recommended": "Recommended model settings",
+          "thinking_budget_tokens": "Thinking budget"
         },
         "data_description": {
-          "prompt": "Instruct how the LLM should respond. This can be a template."
+          "prompt": "Instruct how the LLM should respond. This can be a template.",
+          "thinking_budget_tokens": "The number of tokens the model can use to think about the response out of the total maximum number of tokens. Set to 1024 or greater to enable extended thinking."
         }
       }
+    },
+    "error": {
+      "thinking_budget_too_large": "Maximum tokens must be greater than the thinking budget."
     }
   }
 }
diff --git a/homeassistant/components/aosmith/__init__.py b/homeassistant/components/aosmith/__init__.py
index dd60f69c4b9..7593365c573 100644
--- a/homeassistant/components/aosmith/__init__.py
+++ b/homeassistant/components/aosmith/__init__.py
@@ -2,31 +2,22 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass
-
 from py_aosmith import AOSmithAPIClient
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import aiohttp_client, device_registry as dr
 
 from .const import DOMAIN
-from .coordinator import AOSmithEnergyCoordinator, AOSmithStatusCoordinator
+from .coordinator import (
+    AOSmithConfigEntry,
+    AOSmithData,
+    AOSmithEnergyCoordinator,
+    AOSmithStatusCoordinator,
+)
 
 PLATFORMS: list[Platform] = [Platform.SENSOR, Platform.WATER_HEATER]
 
-type AOSmithConfigEntry = ConfigEntry[AOSmithData]
-
-
-@dataclass
-class AOSmithData:
-    """Data for the A. O. Smith integration."""
-
-    client: AOSmithAPIClient
-    status_coordinator: AOSmithStatusCoordinator
-    energy_coordinator: AOSmithEnergyCoordinator
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: AOSmithConfigEntry) -> bool:
     """Set up A. O. Smith from a config entry."""
@@ -36,7 +27,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AOSmithConfigEntry) -> b
     session = aiohttp_client.async_get_clientsession(hass)
     client = AOSmithAPIClient(email, password, session)
 
-    status_coordinator = AOSmithStatusCoordinator(hass, client)
+    status_coordinator = AOSmithStatusCoordinator(hass, entry, client)
     await status_coordinator.async_config_entry_first_refresh()
 
     device_registry = dr.async_get(hass)
@@ -53,7 +44,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AOSmithConfigEntry) -> b
         )
 
     energy_coordinator = AOSmithEnergyCoordinator(
-        hass, client, list(status_coordinator.data)
+        hass, entry, client, list(status_coordinator.data)
     )
     await energy_coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/aosmith/coordinator.py b/homeassistant/components/aosmith/coordinator.py
index 3bf97e49cae..16cacfcbc10 100644
--- a/homeassistant/components/aosmith/coordinator.py
+++ b/homeassistant/components/aosmith/coordinator.py
@@ -1,5 +1,8 @@
 """The data update coordinator for the A. O. Smith integration."""
 
+from __future__ import annotations
+
+from dataclasses import dataclass
 import logging
 
 from py_aosmith import (
@@ -9,6 +12,7 @@ from py_aosmith import (
 )
 from py_aosmith.models import Device as AOSmithDevice
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -17,13 +21,37 @@ from .const import DOMAIN, ENERGY_USAGE_INTERVAL, FAST_INTERVAL, REGULAR_INTERVA
 
 _LOGGER = logging.getLogger(__name__)
 
+type AOSmithConfigEntry = ConfigEntry[AOSmithData]
+
+
+@dataclass
+class AOSmithData:
+    """Data for the A. O. Smith integration."""
+
+    client: AOSmithAPIClient
+    status_coordinator: AOSmithStatusCoordinator
+    energy_coordinator: AOSmithEnergyCoordinator
+
 
 class AOSmithStatusCoordinator(DataUpdateCoordinator[dict[str, AOSmithDevice]]):
     """Coordinator for device status, updating with a frequent interval."""
 
-    def __init__(self, hass: HomeAssistant, client: AOSmithAPIClient) -> None:
+    config_entry: AOSmithConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: AOSmithConfigEntry,
+        client: AOSmithAPIClient,
+    ) -> None:
         """Initialize the coordinator."""
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=REGULAR_INTERVAL)
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=REGULAR_INTERVAL,
+        )
         self.client = client
 
     async def _async_update_data(self) -> dict[str, AOSmithDevice]:
@@ -51,15 +79,22 @@ class AOSmithStatusCoordinator(DataUpdateCoordinator[dict[str, AOSmithDevice]]):
 class AOSmithEnergyCoordinator(DataUpdateCoordinator[dict[str, float]]):
     """Coordinator for energy usage data, updating with a slower interval."""
 
+    config_entry: AOSmithConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: AOSmithConfigEntry,
         client: AOSmithAPIClient,
         junction_ids: list[str],
     ) -> None:
         """Initialize the coordinator."""
         super().__init__(
-            hass, _LOGGER, name=DOMAIN, update_interval=ENERGY_USAGE_INTERVAL
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=ENERGY_USAGE_INTERVAL,
         )
         self.client = client
         self.junction_ids = junction_ids
diff --git a/homeassistant/components/aosmith/diagnostics.py b/homeassistant/components/aosmith/diagnostics.py
index 94726731f75..4019bee4dc8 100644
--- a/homeassistant/components/aosmith/diagnostics.py
+++ b/homeassistant/components/aosmith/diagnostics.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.core import HomeAssistant
 
-from . import AOSmithConfigEntry
+from .coordinator import AOSmithConfigEntry
 
 TO_REDACT = {
     "address",
diff --git a/homeassistant/components/aosmith/sensor.py b/homeassistant/components/aosmith/sensor.py
index b1c9852f647..071407e7b17 100644
--- a/homeassistant/components/aosmith/sensor.py
+++ b/homeassistant/components/aosmith/sensor.py
@@ -13,10 +13,13 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, UnitOfEnergy
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import AOSmithConfigEntry
-from .coordinator import AOSmithEnergyCoordinator, AOSmithStatusCoordinator
+from .coordinator import (
+    AOSmithConfigEntry,
+    AOSmithEnergyCoordinator,
+    AOSmithStatusCoordinator,
+)
 from .entity import AOSmithEnergyEntity, AOSmithStatusEntity
 
 
@@ -40,7 +43,7 @@ STATUS_ENTITY_DESCRIPTIONS: tuple[AOSmithStatusSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AOSmithConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up A. O. Smith sensor platform."""
     data = entry.runtime_data
diff --git a/homeassistant/components/aosmith/water_heater.py b/homeassistant/components/aosmith/water_heater.py
index f3dc8b3413f..d29b00955b6 100644
--- a/homeassistant/components/aosmith/water_heater.py
+++ b/homeassistant/components/aosmith/water_heater.py
@@ -15,10 +15,9 @@ from homeassistant.components.water_heater import (
 from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import AOSmithConfigEntry
-from .coordinator import AOSmithStatusCoordinator
+from .coordinator import AOSmithConfigEntry, AOSmithStatusCoordinator
 from .entity import AOSmithStatusEntity
 
 MODE_HA_TO_AOSMITH = {
@@ -46,7 +45,7 @@ DEFAULT_OPERATION_MODE_PRIORITY = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AOSmithConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up A. O. Smith water heater platform."""
     data = entry.runtime_data
diff --git a/homeassistant/components/apache_kafka/__init__.py b/homeassistant/components/apache_kafka/__init__.py
index 68d3f58a63a..40f71ec4e4b 100644
--- a/homeassistant/components/apache_kafka/__init__.py
+++ b/homeassistant/components/apache_kafka/__init__.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     EVENT_STATE_CHANGED,
 )
 from homeassistant.core import Event, EventStateChangedData, HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entityfilter import FILTER_SCHEMA, EntityFilter
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import ssl as ssl_util
diff --git a/homeassistant/components/apcupsd/__init__.py b/homeassistant/components/apcupsd/__init__.py
index 44edc5c151f..e444f1cd735 100644
--- a/homeassistant/components/apcupsd/__init__.py
+++ b/homeassistant/components/apcupsd/__init__.py
@@ -4,13 +4,10 @@ from __future__ import annotations
 
 from typing import Final
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PORT, Platform
 from homeassistant.core import HomeAssistant
 
-from .coordinator import APCUPSdCoordinator
-
-type APCUPSdConfigEntry = ConfigEntry[APCUPSdCoordinator]
+from .coordinator import APCUPSdConfigEntry, APCUPSdCoordinator
 
 PLATFORMS: Final = (Platform.BINARY_SENSOR, Platform.SENSOR)
 
@@ -20,7 +17,7 @@ async def async_setup_entry(
 ) -> bool:
     """Use config values to set up a function enabling status retrieval."""
     host, port = config_entry.data[CONF_HOST], config_entry.data[CONF_PORT]
-    coordinator = APCUPSdCoordinator(hass, host, port)
+    coordinator = APCUPSdCoordinator(hass, config_entry, host, port)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/apcupsd/binary_sensor.py b/homeassistant/components/apcupsd/binary_sensor.py
index cd9e60f7ae4..f3829b41f61 100644
--- a/homeassistant/components/apcupsd/binary_sensor.py
+++ b/homeassistant/components/apcupsd/binary_sensor.py
@@ -9,11 +9,10 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import APCUPSdConfigEntry
-from .coordinator import APCUPSdCoordinator
+from .coordinator import APCUPSdConfigEntry, APCUPSdCoordinator
 
 PARALLEL_UPDATES = 0
 
@@ -28,7 +27,7 @@ _VALUE_ONLINE_MASK: Final = 0b1000
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: APCUPSdConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up an APCUPSd Online Status binary sensor."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/apcupsd/config_flow.py b/homeassistant/components/apcupsd/config_flow.py
index 00f757a1fd7..b65c9c33265 100644
--- a/homeassistant/components/apcupsd/config_flow.py
+++ b/homeassistant/components/apcupsd/config_flow.py
@@ -10,8 +10,7 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PORT
-from homeassistant.helpers import selector
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, selector
 
 from .const import CONNECTION_TIMEOUT, DOMAIN
 from .coordinator import APCUPSdData
diff --git a/homeassistant/components/apcupsd/coordinator.py b/homeassistant/components/apcupsd/coordinator.py
index 1ae12d8c4b0..e2c1af50cee 100644
--- a/homeassistant/components/apcupsd/coordinator.py
+++ b/homeassistant/components/apcupsd/coordinator.py
@@ -25,6 +25,8 @@ _LOGGER = logging.getLogger(__name__)
 UPDATE_INTERVAL: Final = timedelta(seconds=60)
 REQUEST_REFRESH_COOLDOWN: Final = 5
 
+type APCUPSdConfigEntry = ConfigEntry[APCUPSdCoordinator]
+
 
 class APCUPSdData(dict[str, str]):
     """Store data about an APCUPSd and provide a few helper methods for easier accesses."""
@@ -57,13 +59,20 @@ class APCUPSdCoordinator(DataUpdateCoordinator[APCUPSdData]):
     updates from the server.
     """
 
-    config_entry: ConfigEntry
+    config_entry: APCUPSdConfigEntry
 
-    def __init__(self, hass: HomeAssistant, host: str, port: int) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: APCUPSdConfigEntry,
+        host: str,
+        port: int,
+    ) -> None:
         """Initialize the data object."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=UPDATE_INTERVAL,
             request_refresh_debouncer=Debouncer(
diff --git a/homeassistant/components/apcupsd/diagnostics.py b/homeassistant/components/apcupsd/diagnostics.py
index fa0908f3144..a4bbf2191d2 100644
--- a/homeassistant/components/apcupsd/diagnostics.py
+++ b/homeassistant/components/apcupsd/diagnostics.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.core import HomeAssistant
 
-from . import APCUPSdConfigEntry
+from .coordinator import APCUPSdConfigEntry
 
 TO_REDACT = {"SERIALNO", "HOSTNAME"}
 
diff --git a/homeassistant/components/apcupsd/sensor.py b/homeassistant/components/apcupsd/sensor.py
index 9e0abcb1dd9..02016efa4ca 100644
--- a/homeassistant/components/apcupsd/sensor.py
+++ b/homeassistant/components/apcupsd/sensor.py
@@ -21,12 +21,11 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import APCUPSdConfigEntry
 from .const import LAST_S_TEST
-from .coordinator import APCUPSdCoordinator
+from .coordinator import APCUPSdConfigEntry, APCUPSdCoordinator
 
 PARALLEL_UPDATES = 0
 
@@ -407,7 +406,7 @@ INFERRED_UNITS = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: APCUPSdConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the APCUPSd sensors from config entries."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/apcupsd/strings.json b/homeassistant/components/apcupsd/strings.json
index 93102ac1393..fb5df9ec390 100644
--- a/homeassistant/components/apcupsd/strings.json
+++ b/homeassistant/components/apcupsd/strings.json
@@ -57,7 +57,7 @@
         "name": "Status date"
       },
       "dip_switch_settings": {
-        "name": "Dip switch settings"
+        "name": "DIP switch settings"
       },
       "low_battery_signal": {
         "name": "Low battery signal"
diff --git a/homeassistant/components/api/__init__.py b/homeassistant/components/api/__init__.py
index ba71fb0def1..d183d46a717 100644
--- a/homeassistant/components/api/__init__.py
+++ b/homeassistant/components/api/__init__.py
@@ -11,6 +11,7 @@ from aiohttp import web
 from aiohttp.web_exceptions import HTTPBadRequest
 import voluptuous as vol
 
+from homeassistant import core as ha
 from homeassistant.auth.models import User
 from homeassistant.auth.permissions.const import POLICY_READ
 from homeassistant.components.http import (
@@ -36,7 +37,6 @@ from homeassistant.const import (
     URL_API_STREAM,
     URL_API_TEMPLATE,
 )
-import homeassistant.core as ha
 from homeassistant.core import Event, EventStateChangedData, HomeAssistant
 from homeassistant.exceptions import (
     InvalidEntityFormatError,
diff --git a/homeassistant/components/apollo_automation/__init__.py b/homeassistant/components/apollo_automation/__init__.py
new file mode 100644
index 00000000000..7815b17818f
--- /dev/null
+++ b/homeassistant/components/apollo_automation/__init__.py
@@ -0,0 +1 @@
+"""Virtual integration: Apollo Automation."""
diff --git a/homeassistant/components/apollo_automation/manifest.json b/homeassistant/components/apollo_automation/manifest.json
new file mode 100644
index 00000000000..8e4c58f3f3d
--- /dev/null
+++ b/homeassistant/components/apollo_automation/manifest.json
@@ -0,0 +1,6 @@
+{
+  "domain": "apollo_automation",
+  "name": "Apollo Automation",
+  "integration_type": "virtual",
+  "supported_by": "esphome"
+}
diff --git a/homeassistant/components/apple_tv/__init__.py b/homeassistant/components/apple_tv/__init__.py
index f4417134b37..b911b3cec99 100644
--- a/homeassistant/components/apple_tv/__init__.py
+++ b/homeassistant/components/apple_tv/__init__.py
@@ -233,7 +233,6 @@ class AppleTVManager(DeviceListener):
             pass
         except Exception:
             _LOGGER.exception("Failed to connect")
-            await self.disconnect()
 
     async def _connect_loop(self) -> None:
         """Connect loop background task function."""
diff --git a/homeassistant/components/apple_tv/config_flow.py b/homeassistant/components/apple_tv/config_flow.py
index 5c317755d05..76c4681a30d 100644
--- a/homeassistant/components/apple_tv/config_flow.py
+++ b/homeassistant/components/apple_tv/config_flow.py
@@ -134,7 +134,7 @@ class AppleTVConfigFlow(ConfigFlow, domain=DOMAIN):
         unique_id for said entry. When a new (zeroconf) service or device is
         discovered, the identifier is first used to look up if it belongs to an
         existing config entry. If that's the case, the unique_id from that entry is
-        re-used, otherwise the newly discovered identifier is used instead.
+        reused, otherwise the newly discovered identifier is used instead.
         """
         assert self.atv
         all_identifiers = set(self.atv.all_identifiers)
diff --git a/homeassistant/components/apple_tv/media_player.py b/homeassistant/components/apple_tv/media_player.py
index c6b71c64b4f..b68d74e6115 100644
--- a/homeassistant/components/apple_tv/media_player.py
+++ b/homeassistant/components/apple_tv/media_player.py
@@ -39,8 +39,8 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from . import AppleTvConfigEntry, AppleTVManager
 from .browse_media import build_app_list
@@ -100,7 +100,7 @@ SUPPORT_FEATURE_MAPPING = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AppleTvConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Load Apple TV media player based on a config entry."""
     name: str = config_entry.data[CONF_NAME]
diff --git a/homeassistant/components/apple_tv/remote.py b/homeassistant/components/apple_tv/remote.py
index 7f2c9f1b591..97e31bd4bb0 100644
--- a/homeassistant/components/apple_tv/remote.py
+++ b/homeassistant/components/apple_tv/remote.py
@@ -17,7 +17,7 @@ from homeassistant.components.remote import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AppleTvConfigEntry
 from .entity import AppleTVEntity
@@ -38,7 +38,7 @@ COMMAND_TO_ATTRIBUTE = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AppleTvConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Load Apple TV remote based on a config entry."""
     name: str = config_entry.data[CONF_NAME]
diff --git a/homeassistant/components/application_credentials/__init__.py b/homeassistant/components/application_credentials/__init__.py
index 58146818624..68f10df7886 100644
--- a/homeassistant/components/application_credentials/__init__.py
+++ b/homeassistant/components/application_credentials/__init__.py
@@ -26,8 +26,11 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import collection, config_entry_oauth2_flow
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import (
+    collection,
+    config_entry_oauth2_flow,
+    config_validation as cv,
+)
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.typing import ConfigType, VolDictType
 from homeassistant.loader import (
@@ -143,8 +146,6 @@ class ApplicationCredentialsStorageCollection(collection.DictStorageCollection):
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up Application Credentials."""
-    hass.data[DOMAIN] = {}
-
     id_manager = collection.IDManager()
     storage_collection = ApplicationCredentialsStorageCollection(
         Store(hass, STORAGE_VERSION, STORAGE_KEY),
diff --git a/homeassistant/components/apprise/notify.py b/homeassistant/components/apprise/notify.py
index eb4e21c127f..a2efcb577d3 100644
--- a/homeassistant/components/apprise/notify.py
+++ b/homeassistant/components/apprise/notify.py
@@ -17,7 +17,7 @@ from homeassistant.components.notify import (
 )
 from homeassistant.const import CONF_URL
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/aprilaire/climate.py b/homeassistant/components/aprilaire/climate.py
index 194453046e6..5116e06b58f 100644
--- a/homeassistant/components/aprilaire/climate.py
+++ b/homeassistant/components/aprilaire/climate.py
@@ -18,7 +18,7 @@ from homeassistant.components.climate import (
 )
 from homeassistant.const import PRECISION_HALVES, PRECISION_WHOLE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     FAN_CIRCULATE,
@@ -63,7 +63,7 @@ FAN_MODE_MAP = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AprilaireConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add climates for passed config_entry in HA."""
 
diff --git a/homeassistant/components/aprilaire/config_flow.py b/homeassistant/components/aprilaire/config_flow.py
index f6c33f75e53..0b4f9af3401 100644
--- a/homeassistant/components/aprilaire/config_flow.py
+++ b/homeassistant/components/aprilaire/config_flow.py
@@ -10,7 +10,7 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PORT
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.device_registry import format_mac
 
 from .const import DOMAIN
diff --git a/homeassistant/components/aprilaire/coordinator.py b/homeassistant/components/aprilaire/coordinator.py
index 6b132cfcc95..a5126eda95e 100644
--- a/homeassistant/components/aprilaire/coordinator.py
+++ b/homeassistant/components/aprilaire/coordinator.py
@@ -11,7 +11,7 @@ from pyaprilaire.const import MODELS, Attribute, FunctionalDomain
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import BaseDataUpdateCoordinatorProtocol
 
diff --git a/homeassistant/components/aprilaire/humidifier.py b/homeassistant/components/aprilaire/humidifier.py
index 8a173e5e95e..fdb9233a0e3 100644
--- a/homeassistant/components/aprilaire/humidifier.py
+++ b/homeassistant/components/aprilaire/humidifier.py
@@ -15,7 +15,7 @@ from homeassistant.components.humidifier import (
     HumidifierEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .coordinator import AprilaireConfigEntry, AprilaireCoordinator
@@ -40,7 +40,7 @@ DEHUMIDIFIER_ACTION_MAP: dict[StateType, HumidifierAction] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AprilaireConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Aprilaire humidifier devices."""
 
diff --git a/homeassistant/components/aprilaire/manifest.json b/homeassistant/components/aprilaire/manifest.json
index 577de8ae88d..b40460dd61b 100644
--- a/homeassistant/components/aprilaire/manifest.json
+++ b/homeassistant/components/aprilaire/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "device",
   "iot_class": "local_push",
   "loggers": ["pyaprilaire"],
-  "requirements": ["pyaprilaire==0.7.7"]
+  "requirements": ["pyaprilaire==0.8.1"]
 }
diff --git a/homeassistant/components/aprilaire/select.py b/homeassistant/components/aprilaire/select.py
index d8f6137f53d..c38c9e94501 100644
--- a/homeassistant/components/aprilaire/select.py
+++ b/homeassistant/components/aprilaire/select.py
@@ -10,7 +10,7 @@ from pyaprilaire.const import Attribute
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import AprilaireConfigEntry, AprilaireCoordinator
 from .entity import BaseAprilaireEntity
@@ -24,7 +24,7 @@ FRESH_AIR_MODE_MAP = {0: "off", 1: "automatic"}
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AprilaireConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Aprilaire select devices."""
 
diff --git a/homeassistant/components/aprilaire/sensor.py b/homeassistant/components/aprilaire/sensor.py
index e1909746364..bf3bd12f43d 100644
--- a/homeassistant/components/aprilaire/sensor.py
+++ b/homeassistant/components/aprilaire/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .coordinator import AprilaireConfigEntry, AprilaireCoordinator
@@ -75,7 +75,7 @@ def get_entities(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AprilaireConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Aprilaire sensor devices."""
 
diff --git a/homeassistant/components/aprs/device_tracker.py b/homeassistant/components/aprs/device_tracker.py
index fc23fc5e436..fc3dbcabfe8 100644
--- a/homeassistant/components/aprs/device_tracker.py
+++ b/homeassistant/components/aprs/device_tracker.py
@@ -26,7 +26,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.core import Event, HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import slugify
 
diff --git a/homeassistant/components/apsystems/__init__.py b/homeassistant/components/apsystems/__init__.py
index c437f5584db..cdc4563b92d 100644
--- a/homeassistant/components/apsystems/__init__.py
+++ b/homeassistant/components/apsystems/__init__.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass
-
 from APsystemsEZ1 import APsystemsEZ1M
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_IP_ADDRESS, CONF_PORT, Platform
 from homeassistant.core import HomeAssistant
 
 from .const import DEFAULT_PORT
-from .coordinator import ApSystemsDataCoordinator
+from .coordinator import ApSystemsConfigEntry, ApSystemsData, ApSystemsDataCoordinator
 
 PLATFORMS: list[Platform] = [
     Platform.BINARY_SENSOR,
@@ -21,17 +18,6 @@ PLATFORMS: list[Platform] = [
 ]
 
 
-@dataclass
-class ApSystemsData:
-    """Store runtime data."""
-
-    coordinator: ApSystemsDataCoordinator
-    device_id: str
-
-
-type ApSystemsConfigEntry = ConfigEntry[ApSystemsData]
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: ApSystemsConfigEntry) -> bool:
     """Set up this integration using UI."""
     api = APsystemsEZ1M(
@@ -40,7 +26,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ApSystemsConfigEntry) ->
         timeout=8,
         enable_debounce=True,
     )
-    coordinator = ApSystemsDataCoordinator(hass, api)
+    coordinator = ApSystemsDataCoordinator(hass, entry, api)
     await coordinator.async_config_entry_first_refresh()
     assert entry.unique_id
     entry.runtime_data = ApSystemsData(
@@ -51,6 +37,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ApSystemsConfigEntry) ->
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ApSystemsConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/apsystems/binary_sensor.py b/homeassistant/components/apsystems/binary_sensor.py
index 9e361ca883e..202d878014d 100644
--- a/homeassistant/components/apsystems/binary_sensor.py
+++ b/homeassistant/components/apsystems/binary_sensor.py
@@ -14,11 +14,10 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import ApSystemsConfigEntry, ApSystemsData
-from .coordinator import ApSystemsDataCoordinator
+from .coordinator import ApSystemsConfigEntry, ApSystemsData, ApSystemsDataCoordinator
 from .entity import ApSystemsEntity
 
 
@@ -64,7 +63,7 @@ BINARY_SENSORS: tuple[ApsystemsLocalApiBinarySensorDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ApSystemsConfigEntry,
-    add_entities: AddEntitiesCallback,
+    add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the binary sensor platform."""
     config = config_entry.runtime_data
diff --git a/homeassistant/components/apsystems/config_flow.py b/homeassistant/components/apsystems/config_flow.py
index 5f2f1393aa0..9be0b5f4cf7 100644
--- a/homeassistant/components/apsystems/config_flow.py
+++ b/homeassistant/components/apsystems/config_flow.py
@@ -8,8 +8,8 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_IP_ADDRESS, CONF_PORT
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 
 from .const import DEFAULT_PORT, DOMAIN
 
diff --git a/homeassistant/components/apsystems/coordinator.py b/homeassistant/components/apsystems/coordinator.py
index 2535c66c4ac..ca423055176 100644
--- a/homeassistant/components/apsystems/coordinator.py
+++ b/homeassistant/components/apsystems/coordinator.py
@@ -12,6 +12,7 @@ from APsystemsEZ1 import (
     ReturnOutputData,
 )
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -26,16 +27,34 @@ class ApSystemsSensorData:
     alarm_info: ReturnAlarmInfo
 
 
+@dataclass
+class ApSystemsData:
+    """Store runtime data."""
+
+    coordinator: ApSystemsDataCoordinator
+    device_id: str
+
+
+type ApSystemsConfigEntry = ConfigEntry[ApSystemsData]
+
+
 class ApSystemsDataCoordinator(DataUpdateCoordinator[ApSystemsSensorData]):
     """Coordinator used for all sensors."""
 
+    config_entry: ApSystemsConfigEntry
     device_version: str
 
-    def __init__(self, hass: HomeAssistant, api: APsystemsEZ1M) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: ApSystemsConfigEntry,
+        api: APsystemsEZ1M,
+    ) -> None:
         """Initialize my coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name="APSystems Data",
             update_interval=timedelta(seconds=12),
         )
diff --git a/homeassistant/components/apsystems/entity.py b/homeassistant/components/apsystems/entity.py
index 7770b451680..2ce8becbf80 100644
--- a/homeassistant/components/apsystems/entity.py
+++ b/homeassistant/components/apsystems/entity.py
@@ -5,8 +5,8 @@ from __future__ import annotations
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import Entity
 
-from . import ApSystemsData
 from .const import DOMAIN
+from .coordinator import ApSystemsData
 
 
 class ApSystemsEntity(Entity):
@@ -19,10 +19,20 @@ class ApSystemsEntity(Entity):
         data: ApSystemsData,
     ) -> None:
         """Initialize the APsystems entity."""
+
+        # Handle device version safely
+        sw_version = None
+        if data.coordinator.device_version:
+            version_parts = data.coordinator.device_version.split(" ")
+            if len(version_parts) > 1:
+                sw_version = version_parts[1]
+            else:
+                sw_version = version_parts[0]
+
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, data.device_id)},
             manufacturer="APsystems",
             model="EZ1-M",
             serial_number=data.device_id,
-            sw_version=data.coordinator.device_version.split(" ")[1],
+            sw_version=sw_version,
         )
diff --git a/homeassistant/components/apsystems/number.py b/homeassistant/components/apsystems/number.py
index b5ed60a7754..b43b21f2b71 100644
--- a/homeassistant/components/apsystems/number.py
+++ b/homeassistant/components/apsystems/number.py
@@ -7,17 +7,17 @@ from aiohttp import ClientConnectorError
 from homeassistant.components.number import NumberDeviceClass, NumberEntity, NumberMode
 from homeassistant.const import UnitOfPower
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import DiscoveryInfoType
 
-from . import ApSystemsConfigEntry, ApSystemsData
+from .coordinator import ApSystemsConfigEntry, ApSystemsData
 from .entity import ApSystemsEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ApSystemsConfigEntry,
-    add_entities: AddEntitiesCallback,
+    add_entities: AddConfigEntryEntitiesCallback,
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the sensor platform."""
diff --git a/homeassistant/components/apsystems/sensor.py b/homeassistant/components/apsystems/sensor.py
index f87bc0f3f26..6e654cfbf61 100644
--- a/homeassistant/components/apsystems/sensor.py
+++ b/homeassistant/components/apsystems/sensor.py
@@ -15,12 +15,11 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import UnitOfEnergy, UnitOfPower
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import DiscoveryInfoType, StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import ApSystemsConfigEntry, ApSystemsData
-from .coordinator import ApSystemsDataCoordinator
+from .coordinator import ApSystemsConfigEntry, ApSystemsData, ApSystemsDataCoordinator
 from .entity import ApSystemsEntity
 
 
@@ -110,7 +109,7 @@ SENSORS: tuple[ApsystemsLocalApiSensorDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ApSystemsConfigEntry,
-    add_entities: AddEntitiesCallback,
+    add_entities: AddConfigEntryEntitiesCallback,
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the sensor platform."""
diff --git a/homeassistant/components/apsystems/switch.py b/homeassistant/components/apsystems/switch.py
index 73914845445..e1017f95448 100644
--- a/homeassistant/components/apsystems/switch.py
+++ b/homeassistant/components/apsystems/switch.py
@@ -9,16 +9,16 @@ from APsystemsEZ1 import InverterReturnedError
 
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import ApSystemsConfigEntry, ApSystemsData
+from .coordinator import ApSystemsConfigEntry, ApSystemsData
 from .entity import ApSystemsEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ApSystemsConfigEntry,
-    add_entities: AddEntitiesCallback,
+    add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the switch platform."""
 
diff --git a/homeassistant/components/aquacell/__init__.py b/homeassistant/components/aquacell/__init__.py
index e44c0f00fa8..60787840fcb 100644
--- a/homeassistant/components/aquacell/__init__.py
+++ b/homeassistant/components/aquacell/__init__.py
@@ -5,18 +5,15 @@ from __future__ import annotations
 from aioaquacell import AquacellApi
 from aioaquacell.const import Brand
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import CONF_BRAND
-from .coordinator import AquacellCoordinator
+from .coordinator import AquacellConfigEntry, AquacellCoordinator
 
 PLATFORMS = [Platform.SENSOR]
 
-type AquacellConfigEntry = ConfigEntry[AquacellCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: AquacellConfigEntry) -> bool:
     """Set up Aquacell from a config entry."""
@@ -26,7 +23,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AquacellConfigEntry) ->
 
     aquacell_api = AquacellApi(session, brand)
 
-    coordinator = AquacellCoordinator(hass, aquacell_api)
+    coordinator = AquacellCoordinator(hass, entry, aquacell_api)
 
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
@@ -36,6 +33,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: AquacellConfigEntry) ->
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: AquacellConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/aquacell/config_flow.py b/homeassistant/components/aquacell/config_flow.py
index 1ee89035d93..277cb742486 100644
--- a/homeassistant/components/aquacell/config_flow.py
+++ b/homeassistant/components/aquacell/config_flow.py
@@ -60,7 +60,7 @@ class AquaCellConfigFlow(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "cannot_connect"
             except AuthenticationFailed:
                 errors["base"] = "invalid_auth"
-            except Exception:  # pylint: disable=broad-except
+            except Exception:
                 _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
diff --git a/homeassistant/components/aquacell/coordinator.py b/homeassistant/components/aquacell/coordinator.py
index ee4afb451b9..135ab0ecb50 100644
--- a/homeassistant/components/aquacell/coordinator.py
+++ b/homeassistant/components/aquacell/coordinator.py
@@ -26,17 +26,25 @@ from .const import (
 
 _LOGGER = logging.getLogger(__name__)
 
+type AquacellConfigEntry = ConfigEntry[AquacellCoordinator]
+
 
 class AquacellCoordinator(DataUpdateCoordinator[dict[str, Softener]]):
     """My aquacell coordinator."""
 
-    config_entry: ConfigEntry
+    config_entry: AquacellConfigEntry
 
-    def __init__(self, hass: HomeAssistant, aquacell_api: AquacellApi) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: AquacellConfigEntry,
+        aquacell_api: AquacellApi,
+    ) -> None:
         """Initialize coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="Aquacell Coordinator",
             update_interval=UPDATE_INTERVAL,
         )
diff --git a/homeassistant/components/aquacell/sensor.py b/homeassistant/components/aquacell/sensor.py
index 702d75a0215..77cd3cdd60a 100644
--- a/homeassistant/components/aquacell/sensor.py
+++ b/homeassistant/components/aquacell/sensor.py
@@ -15,11 +15,10 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import AquacellConfigEntry
-from .coordinator import AquacellCoordinator
+from .coordinator import AquacellConfigEntry, AquacellCoordinator
 from .entity import AquacellEntity
 
 PARALLEL_UPDATES = 1
@@ -84,7 +83,7 @@ SENSORS: tuple[SoftenerSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AquacellConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensors."""
     softeners = config_entry.runtime_data.data
diff --git a/homeassistant/components/aqualogic/sensor.py b/homeassistant/components/aqualogic/sensor.py
index 9c2ee9957af..e0cae5df162 100644
--- a/homeassistant/components/aqualogic/sensor.py
+++ b/homeassistant/components/aqualogic/sensor.py
@@ -19,7 +19,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/aqualogic/switch.py b/homeassistant/components/aqualogic/switch.py
index ed0cc463263..667842a020c 100644
--- a/homeassistant/components/aqualogic/switch.py
+++ b/homeassistant/components/aqualogic/switch.py
@@ -13,7 +13,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import CONF_MONITORED_CONDITIONS
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/aquostv/media_player.py b/homeassistant/components/aquostv/media_player.py
index 343cb6492da..90660028b83 100644
--- a/homeassistant/components/aquostv/media_player.py
+++ b/homeassistant/components/aquostv/media_player.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
     CONF_USERNAME,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/aranet/config_flow.py b/homeassistant/components/aranet/config_flow.py
index db89124c54d..876b175126e 100644
--- a/homeassistant/components/aranet/config_flow.py
+++ b/homeassistant/components/aranet/config_flow.py
@@ -92,7 +92,7 @@ class AranetConfigFlow(ConfigFlow, domain=DOMAIN):
                 title=self._discovered_devices[address][0], data={}
             )
 
-        current_addresses = self._async_current_ids()
+        current_addresses = self._async_current_ids(include_ignore=False)
         for discovery_info in async_discovered_service_info(self.hass, False):
             address = discovery_info.address
             if address in current_addresses or address in self._discovered_devices:
diff --git a/homeassistant/components/aranet/manifest.json b/homeassistant/components/aranet/manifest.json
index ac45e352bb6..3131b00cda6 100644
--- a/homeassistant/components/aranet/manifest.json
+++ b/homeassistant/components/aranet/manifest.json
@@ -19,5 +19,5 @@
   "documentation": "https://www.home-assistant.io/integrations/aranet",
   "integration_type": "device",
   "iot_class": "local_push",
-  "requirements": ["aranet4==2.5.0"]
+  "requirements": ["aranet4==2.5.1"]
 }
diff --git a/homeassistant/components/aranet/sensor.py b/homeassistant/components/aranet/sensor.py
index b5187cba1f4..ee2eb8c8a75 100644
--- a/homeassistant/components/aranet/sensor.py
+++ b/homeassistant/components/aranet/sensor.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Any
 
-from aranet4.client import Aranet4Advertisement
+from aranet4.client import Aranet4Advertisement, Color
 from bleak.backends.device import BLEDevice
 
 from homeassistant.components.bluetooth.passive_update_processor import (
@@ -35,7 +35,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AranetConfigEntry
 from .const import ARANET_MANUFACTURER_NAME
@@ -74,6 +74,13 @@ SENSOR_DESCRIPTIONS = {
         native_unit_of_measurement=UnitOfPressure.HPA,
         state_class=SensorStateClass.MEASUREMENT,
     ),
+    "status": AranetSensorEntityDescription(
+        key="threshold",
+        translation_key="threshold",
+        name="Threshold",
+        device_class=SensorDeviceClass.ENUM,
+        options=[status.name.lower() for status in Color],
+    ),
     "co2": AranetSensorEntityDescription(
         key="co2",
         name="Carbon Dioxide",
@@ -161,7 +168,10 @@ def sensor_update_to_bluetooth_data_update(
         val = getattr(adv.readings, key)
         if val == -1:
             continue
-        val *= desc.scale
+        if key == "status":
+            val = val.name.lower()
+        else:
+            val *= desc.scale
         data[tag] = val
         names[tag] = desc.name
         descs[tag] = desc
@@ -176,7 +186,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AranetConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Aranet sensors."""
     processor = PassiveBluetoothDataProcessor(sensor_update_to_bluetooth_data_update)
diff --git a/homeassistant/components/aranet/strings.json b/homeassistant/components/aranet/strings.json
index 1cc695637d4..f786f4b2d4d 100644
--- a/homeassistant/components/aranet/strings.json
+++ b/homeassistant/components/aranet/strings.json
@@ -21,5 +21,17 @@
       "no_devices_found": "No unconfigured Aranet devices found.",
       "outdated_version": "This device is using outdated firmware. Please update it to at least v1.2.0 and try again."
     }
+  },
+  "entity": {
+    "sensor": {
+      "threshold": {
+        "state": {
+          "error": "Error",
+          "green": "Green",
+          "yellow": "Yellow",
+          "red": "Red"
+        }
+      }
+    }
   }
 }
diff --git a/homeassistant/components/arcam_fmj/manifest.json b/homeassistant/components/arcam_fmj/manifest.json
index 39d289f9cb1..41396eca5d6 100644
--- a/homeassistant/components/arcam_fmj/manifest.json
+++ b/homeassistant/components/arcam_fmj/manifest.json
@@ -6,7 +6,7 @@
   "documentation": "https://www.home-assistant.io/integrations/arcam_fmj",
   "iot_class": "local_polling",
   "loggers": ["arcam"],
-  "requirements": ["arcam-fmj==1.5.2"],
+  "requirements": ["arcam-fmj==1.8.1"],
   "ssdp": [
     {
       "deviceType": "urn:schemas-upnp-org:device:MediaRenderer:1",
diff --git a/homeassistant/components/arcam_fmj/media_player.py b/homeassistant/components/arcam_fmj/media_player.py
index 7a133777a0a..cd4ed7bbb05 100644
--- a/homeassistant/components/arcam_fmj/media_player.py
+++ b/homeassistant/components/arcam_fmj/media_player.py
@@ -24,7 +24,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import ArcamFmjConfigEntry
 from .const import (
@@ -41,7 +41,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ArcamFmjConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the configuration entry."""
 
diff --git a/homeassistant/components/arest/binary_sensor.py b/homeassistant/components/arest/binary_sensor.py
index 00d4d6bbf9b..a99ef049543 100644
--- a/homeassistant/components/arest/binary_sensor.py
+++ b/homeassistant/components/arest/binary_sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import CONF_DEVICE_CLASS, CONF_NAME, CONF_PIN, CONF_RESOURCE
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/arest/sensor.py b/homeassistant/components/arest/sensor.py
index 8c68c13018b..6554704b230 100644
--- a/homeassistant/components/arest/sensor.py
+++ b/homeassistant/components/arest/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import TemplateError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/arest/switch.py b/homeassistant/components/arest/switch.py
index bcdba36cb58..7539336c38b 100644
--- a/homeassistant/components/arest/switch.py
+++ b/homeassistant/components/arest/switch.py
@@ -15,7 +15,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import CONF_NAME, CONF_RESOURCE
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/arris_tg2492lg/device_tracker.py b/homeassistant/components/arris_tg2492lg/device_tracker.py
index c3650587690..828528508ec 100644
--- a/homeassistant/components/arris_tg2492lg/device_tracker.py
+++ b/homeassistant/components/arris_tg2492lg/device_tracker.py
@@ -13,8 +13,8 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_HOST, CONF_PASSWORD
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 DEFAULT_HOST = "192.168.178.1"
diff --git a/homeassistant/components/aruba/device_tracker.py b/homeassistant/components/aruba/device_tracker.py
index 911fab441e5..c2f0d44a6f8 100644
--- a/homeassistant/components/aruba/device_tracker.py
+++ b/homeassistant/components/aruba/device_tracker.py
@@ -16,7 +16,7 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/arve/__init__.py b/homeassistant/components/arve/__init__.py
index a1b4aa7042e..c5900967bde 100644
--- a/homeassistant/components/arve/__init__.py
+++ b/homeassistant/components/arve/__init__.py
@@ -13,7 +13,7 @@ PLATFORMS: list[Platform] = [Platform.SENSOR]
 async def async_setup_entry(hass: HomeAssistant, entry: ArveConfigEntry) -> bool:
     """Set up Arve from a config entry."""
 
-    coordinator = ArveCoordinator(hass)
+    coordinator = ArveCoordinator(hass, entry)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/arve/coordinator.py b/homeassistant/components/arve/coordinator.py
index f02220e28e2..4b08efd639e 100644
--- a/homeassistant/components/arve/coordinator.py
+++ b/homeassistant/components/arve/coordinator.py
@@ -30,11 +30,12 @@ class ArveCoordinator(DataUpdateCoordinator[ArveSensProData]):
     config_entry: ArveConfigEntry
     devices: ArveDevices
 
-    def __init__(self, hass: HomeAssistant) -> None:
+    def __init__(self, hass: HomeAssistant, config_entry: ArveConfigEntry) -> None:
         """Initialize Arve coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=60),
         )
diff --git a/homeassistant/components/arve/sensor.py b/homeassistant/components/arve/sensor.py
index 64d9f6f8874..dea7110f611 100644
--- a/homeassistant/components/arve/sensor.py
+++ b/homeassistant/components/arve/sensor.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import ArveConfigEntry
 from .entity import ArveDeviceEntity
@@ -83,7 +83,9 @@ SENSORS: tuple[ArveDeviceEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ArveConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ArveConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Arve device based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/arwn/sensor.py b/homeassistant/components/arwn/sensor.py
index ada96c07340..4cc4feed2d4 100644
--- a/homeassistant/components/arwn/sensor.py
+++ b/homeassistant/components/arwn/sensor.py
@@ -6,7 +6,11 @@ import logging
 from typing import Any
 
 from homeassistant.components import mqtt
-from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorStateClass,
+)
 from homeassistant.const import DEGREE, UnitOfPrecipitationDepth, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -92,7 +96,13 @@ def discover_sensors(topic: str, payload: dict[str, Any]) -> list[ArwnSensor] |
                 device_class=SensorDeviceClass.WIND_SPEED,
             ),
             ArwnSensor(
-                topic + "/dir", "Wind Direction", "direction", DEGREE, "mdi:compass"
+                topic + "/dir",
+                "Wind Direction",
+                "direction",
+                DEGREE,
+                "mdi:compass",
+                device_class=SensorDeviceClass.WIND_DIRECTION,
+                state_class=SensorStateClass.MEASUREMENT_ANGLE,
             ),
         ]
     return None
@@ -173,6 +183,7 @@ class ArwnSensor(SensorEntity):
         units: str,
         icon: str | None = None,
         device_class: SensorDeviceClass | None = None,
+        state_class: SensorStateClass | None = None,
     ) -> None:
         """Initialize the sensor."""
         self.entity_id = _slug(name)
@@ -183,6 +194,7 @@ class ArwnSensor(SensorEntity):
         self._attr_native_unit_of_measurement = units
         self._attr_icon = icon
         self._attr_device_class = device_class
+        self._attr_state_class = state_class
 
     def set_event(self, event: dict[str, Any]) -> None:
         """Update the sensor with the most recent event."""
diff --git a/homeassistant/components/aseko_pool_live/__init__.py b/homeassistant/components/aseko_pool_live/__init__.py
index 52d74398818..012b5a19b0f 100644
--- a/homeassistant/components/aseko_pool_live/__init__.py
+++ b/homeassistant/components/aseko_pool_live/__init__.py
@@ -26,7 +26,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AsekoConfigEntry) -> boo
     except AsekoNotLoggedIn as err:
         raise ConfigEntryAuthFailed from err
 
-    coordinator = AsekoDataUpdateCoordinator(hass, aseko)
+    coordinator = AsekoDataUpdateCoordinator(hass, entry, aseko)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
diff --git a/homeassistant/components/aseko_pool_live/binary_sensor.py b/homeassistant/components/aseko_pool_live/binary_sensor.py
index c8cc31dc795..15c72614ee1 100644
--- a/homeassistant/components/aseko_pool_live/binary_sensor.py
+++ b/homeassistant/components/aseko_pool_live/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import AsekoConfigEntry
 from .entity import AsekoEntity
@@ -37,7 +37,7 @@ BINARY_SENSORS: tuple[AsekoBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AsekoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Aseko Pool Live binary sensors."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/aseko_pool_live/coordinator.py b/homeassistant/components/aseko_pool_live/coordinator.py
index 96893912361..d54aa756ddd 100644
--- a/homeassistant/components/aseko_pool_live/coordinator.py
+++ b/homeassistant/components/aseko_pool_live/coordinator.py
@@ -21,13 +21,18 @@ type AsekoConfigEntry = ConfigEntry[AsekoDataUpdateCoordinator]
 class AsekoDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Unit]]):
     """Class to manage fetching Aseko unit data from single endpoint."""
 
-    def __init__(self, hass: HomeAssistant, aseko: Aseko) -> None:
+    config_entry: AsekoConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: AsekoConfigEntry, aseko: Aseko
+    ) -> None:
         """Initialize global Aseko unit data updater."""
         self._aseko = aseko
 
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(minutes=2),
         )
diff --git a/homeassistant/components/aseko_pool_live/sensor.py b/homeassistant/components/aseko_pool_live/sensor.py
index 3fe7cdd5272..f9a7287a9f1 100644
--- a/homeassistant/components/aseko_pool_live/sensor.py
+++ b/homeassistant/components/aseko_pool_live/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import UnitOfElectricPotential, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .coordinator import AsekoConfigEntry
@@ -86,7 +86,7 @@ SENSORS: list[AsekoSensorEntityDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AsekoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Aseko Pool Live sensors."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/assist_pipeline/__init__.py b/homeassistant/components/assist_pipeline/__init__.py
index cc7ecc1c426..59bd987d90e 100644
--- a/homeassistant/components/assist_pipeline/__init__.py
+++ b/homeassistant/components/assist_pipeline/__init__.py
@@ -9,6 +9,7 @@ import voluptuous as vol
 
 from homeassistant.components import stt
 from homeassistant.core import Context, HomeAssistant
+from homeassistant.helpers import chat_session
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
@@ -114,24 +115,25 @@ async def async_pipeline_from_audio_stream(
 
     Raises PipelineNotFound if no pipeline is found.
     """
-    pipeline_input = PipelineInput(
-        conversation_id=conversation_id,
-        device_id=device_id,
-        stt_metadata=stt_metadata,
-        stt_stream=stt_stream,
-        wake_word_phrase=wake_word_phrase,
-        conversation_extra_system_prompt=conversation_extra_system_prompt,
-        run=PipelineRun(
-            hass,
-            context=context,
-            pipeline=async_get_pipeline(hass, pipeline_id=pipeline_id),
-            start_stage=start_stage,
-            end_stage=end_stage,
-            event_callback=event_callback,
-            tts_audio_output=tts_audio_output,
-            wake_word_settings=wake_word_settings,
-            audio_settings=audio_settings or AudioSettings(),
-        ),
-    )
-    await pipeline_input.validate()
-    await pipeline_input.execute()
+    with chat_session.async_get_chat_session(hass, conversation_id) as session:
+        pipeline_input = PipelineInput(
+            session=session,
+            device_id=device_id,
+            stt_metadata=stt_metadata,
+            stt_stream=stt_stream,
+            wake_word_phrase=wake_word_phrase,
+            conversation_extra_system_prompt=conversation_extra_system_prompt,
+            run=PipelineRun(
+                hass,
+                context=context,
+                pipeline=async_get_pipeline(hass, pipeline_id=pipeline_id),
+                start_stage=start_stage,
+                end_stage=end_stage,
+                event_callback=event_callback,
+                tts_audio_output=tts_audio_output,
+                wake_word_settings=wake_word_settings,
+                audio_settings=audio_settings or AudioSettings(),
+            ),
+        )
+        await pipeline_input.validate()
+        await pipeline_input.execute()
diff --git a/homeassistant/components/assist_pipeline/logbook.py b/homeassistant/components/assist_pipeline/logbook.py
index 50c5176bb22..b7ab24d2f2f 100644
--- a/homeassistant/components/assist_pipeline/logbook.py
+++ b/homeassistant/components/assist_pipeline/logbook.py
@@ -7,7 +7,7 @@ from collections.abc import Callable
 from homeassistant.components.logbook import LOGBOOK_ENTRY_MESSAGE, LOGBOOK_ENTRY_NAME
 from homeassistant.const import ATTR_DEVICE_ID
 from homeassistant.core import Event, HomeAssistant, callback
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import device_registry as dr
 
 from .const import DOMAIN, EVENT_RECORDING
 
diff --git a/homeassistant/components/assist_pipeline/pipeline.py b/homeassistant/components/assist_pipeline/pipeline.py
index 9353bbe0007..a205db4e615 100644
--- a/homeassistant/components/assist_pipeline/pipeline.py
+++ b/homeassistant/components/assist_pipeline/pipeline.py
@@ -13,27 +13,20 @@ from pathlib import Path
 from queue import Empty, Queue
 from threading import Thread
 import time
-from typing import Any, Literal, cast
+from typing import TYPE_CHECKING, Any, Literal, cast
 import wave
 
 import hass_nabucasa
 import voluptuous as vol
 
-from homeassistant.components import (
-    conversation,
-    media_source,
-    stt,
-    tts,
-    wake_word,
-    websocket_api,
-)
+from homeassistant.components import conversation, stt, tts, wake_word, websocket_api
 from homeassistant.components.tts import (
     generate_media_source_id as tts_generate_media_source_id,
 )
-from homeassistant.const import MATCH_ALL
+from homeassistant.const import ATTR_SUPPORTED_FEATURES, MATCH_ALL
 from homeassistant.core import Context, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import intent
+from homeassistant.helpers import chat_session, intent
 from homeassistant.helpers.collection import (
     CHANGE_UPDATED,
     CollectionError,
@@ -81,6 +74,9 @@ from .error import (
 )
 from .vad import AudioBuffer, VoiceActivityTimeout, VoiceCommandSegmenter, chunk_samples
 
+if TYPE_CHECKING:
+    from hassil.recognize import RecognizeResult
+
 _LOGGER = logging.getLogger(__name__)
 
 STORAGE_KEY = f"{DOMAIN}.pipelines"
@@ -93,6 +89,9 @@ ENGINE_LANGUAGE_PAIRS = (
 )
 
 KEY_ASSIST_PIPELINE: HassKey[PipelineData] = HassKey(DOMAIN)
+KEY_PIPELINE_CONVERSATION_DATA: HassKey[dict[str, PipelineConversationData]] = HassKey(
+    "pipeline_conversation_data"
+)
 
 
 def validate_language(data: dict[str, Any]) -> Any:
@@ -123,6 +122,12 @@ STORED_PIPELINE_RUNS = 10
 SAVE_DELAY = 10
 
 
+@callback
+def _async_local_fallback_intent_filter(result: RecognizeResult) -> bool:
+    """Filter out intents that are not local fallback."""
+    return result.intent.name in (intent.INTENT_GET_STATE)
+
+
 @callback
 def _async_resolve_default_pipeline_settings(
     hass: HomeAssistant,
@@ -374,6 +379,7 @@ class PipelineEventType(StrEnum):
     STT_VAD_END = "stt-vad-end"
     STT_END = "stt-end"
     INTENT_START = "intent-start"
+    INTENT_PROGRESS = "intent-progress"
     INTENT_END = "intent-end"
     TTS_START = "tts-start"
     TTS_END = "tts-end"
@@ -556,8 +562,7 @@ class PipelineRun:
 
     id: str = field(default_factory=ulid_util.ulid_now)
     stt_provider: stt.SpeechToTextEntity | stt.Provider = field(init=False, repr=False)
-    tts_engine: str = field(init=False, repr=False)
-    tts_options: dict | None = field(init=False, default=None)
+    tts_stream: tts.ResultStream | None = field(init=False, default=None)
     wake_word_entity_id: str | None = field(init=False, default=None, repr=False)
     wake_word_entity: wake_word.WakeWordDetectionEntity = field(init=False, repr=False)
 
@@ -580,6 +585,12 @@ class PipelineRun:
     _device_id: str | None = None
     """Optional device id set during run start."""
 
+    _conversation_data: PipelineConversationData | None = None
+    """Data tied to the conversation ID."""
+
+    _intent_agent_only = False
+    """If request should only be handled by agent, ignoring sentence triggers and local processing."""
+
     def __post_init__(self) -> None:
         """Set language for pipeline."""
         self.language = self.pipeline.language or self.hass.config.language
@@ -624,17 +635,24 @@ class PipelineRun:
             return
         pipeline_data.pipeline_debug[self.pipeline.id][self.id].events.append(event)
 
-    def start(self, device_id: str | None) -> None:
+    def start(self, conversation_id: str, device_id: str | None) -> None:
         """Emit run start event."""
         self._device_id = device_id
         self._start_debug_recording_thread()
 
-        data = {
+        data: dict[str, Any] = {
             "pipeline": self.pipeline.id,
             "language": self.language,
+            "conversation_id": conversation_id,
         }
         if self.runner_data is not None:
             data["runner_data"] = self.runner_data
+        if self.tts_stream:
+            data["tts_output"] = {
+                "token": self.tts_stream.token,
+                "url": self.tts_stream.url,
+                "mime_type": self.tts_stream.content_type,
+            }
 
         self.process_event(PipelineEvent(PipelineEventType.RUN_START, data))
 
@@ -996,31 +1014,48 @@ class PipelineRun:
 
             yield chunk.audio
 
-    async def prepare_recognize_intent(self) -> None:
+    async def prepare_recognize_intent(self, session: chat_session.ChatSession) -> None:
         """Prepare recognizing an intent."""
-        agent_info = conversation.async_get_agent_info(
-            self.hass,
-            self.pipeline.conversation_engine or conversation.HOME_ASSISTANT_AGENT,
+        self._conversation_data = async_get_pipeline_conversation_data(
+            self.hass, session
         )
 
-        if agent_info is None:
-            engine = self.pipeline.conversation_engine or "default"
-            raise IntentRecognitionError(
-                code="intent-not-supported",
-                message=f"Intent recognition engine {engine} is not found",
+        if self._conversation_data.continue_conversation_agent is not None:
+            agent_info = conversation.async_get_agent_info(
+                self.hass, self._conversation_data.continue_conversation_agent
             )
+            self._conversation_data.continue_conversation_agent = None
+            if agent_info is None:
+                raise IntentRecognitionError(
+                    code="intent-agent-not-found",
+                    message=f"Intent recognition engine {self._conversation_data.continue_conversation_agent} asked for follow-up but is no longer found",
+                )
+            self._intent_agent_only = True
+
+        else:
+            agent_info = conversation.async_get_agent_info(
+                self.hass,
+                self.pipeline.conversation_engine or conversation.HOME_ASSISTANT_AGENT,
+            )
+
+            if agent_info is None:
+                engine = self.pipeline.conversation_engine or "default"
+                raise IntentRecognitionError(
+                    code="intent-not-supported",
+                    message=f"Intent recognition engine {engine} is not found",
+                )
 
         self.intent_agent = agent_info.id
 
     async def recognize_intent(
         self,
         intent_input: str,
-        conversation_id: str | None,
+        conversation_id: str,
         device_id: str | None,
         conversation_extra_system_prompt: str | None,
     ) -> str:
         """Run intent recognition portion of pipeline. Returns text to speak."""
-        if self.intent_agent is None:
+        if self.intent_agent is None or self._conversation_data is None:
             raise RuntimeError("Recognize intent was not prepared")
 
         if self.pipeline.conversation_language == MATCH_ALL:
@@ -1063,11 +1098,11 @@ class PipelineRun:
                 agent_id=self.intent_agent,
                 extra_system_prompt=conversation_extra_system_prompt,
             )
-            processed_locally = self.intent_agent == conversation.HOME_ASSISTANT_AGENT
 
-            agent_id = user_input.agent_id
+            agent_id = self.intent_agent
+            processed_locally = agent_id == conversation.HOME_ASSISTANT_AGENT
             intent_response: intent.IntentResponse | None = None
-            if user_input.agent_id != conversation.HOME_ASSISTANT_AGENT:
+            if not processed_locally and not self._intent_agent_only:
                 # Sentence triggers override conversation agent
                 if (
                     trigger_response_text
@@ -1082,51 +1117,88 @@ class PipelineRun:
                     )
                     intent_response.async_set_speech(trigger_response_text)
 
-                # Try local intents first, if preferred.
-                elif self.pipeline.prefer_local_intents and (
-                    intent_response := await conversation.async_handle_intents(
-                        self.hass, user_input
+                intent_filter: Callable[[RecognizeResult], bool] | None = None
+                # If the LLM has API access, we filter out some sentences that are
+                # interfering with LLM operation.
+                if (
+                    intent_agent_state := self.hass.states.get(self.intent_agent)
+                ) and intent_agent_state.attributes.get(
+                    ATTR_SUPPORTED_FEATURES, 0
+                ) & conversation.ConversationEntityFeature.CONTROL:
+                    intent_filter = _async_local_fallback_intent_filter
+
+                # Try local intents
+                if (
+                    intent_response is None
+                    and self.pipeline.prefer_local_intents
+                    and (
+                        intent_response := await conversation.async_handle_intents(
+                            self.hass,
+                            user_input,
+                            intent_filter=intent_filter,
+                        )
                     )
                 ):
                     # Local intent matched
                     agent_id = conversation.HOME_ASSISTANT_AGENT
                     processed_locally = True
 
-            # It was already handled, create response and add to chat history
-            if intent_response is not None:
-                async with conversation.async_get_chat_session(
-                    self.hass, user_input
-                ) as chat_session:
+            @callback
+            def chat_log_delta_listener(
+                chat_log: conversation.ChatLog, delta: dict
+            ) -> None:
+                """Handle chat log delta."""
+                self.process_event(
+                    PipelineEvent(
+                        PipelineEventType.INTENT_PROGRESS,
+                        {
+                            "chat_log_delta": delta,
+                        },
+                    )
+                )
+
+            with (
+                chat_session.async_get_chat_session(
+                    self.hass, user_input.conversation_id
+                ) as session,
+                conversation.async_get_chat_log(
+                    self.hass,
+                    session,
+                    user_input,
+                    chat_log_delta_listener=chat_log_delta_listener,
+                ) as chat_log,
+            ):
+                # It was already handled, create response and add to chat history
+                if intent_response is not None:
                     speech: str = intent_response.speech.get("plain", {}).get(
                         "speech", ""
                     )
-                    chat_session.async_add_message(
-                        conversation.ChatMessage(
-                            role="assistant",
+                    chat_log.async_add_assistant_content_without_tools(
+                        conversation.AssistantContent(
                             agent_id=agent_id,
                             content=speech,
-                            native=intent_response,
                         )
                     )
                     conversation_result = conversation.ConversationResult(
                         response=intent_response,
-                        conversation_id=chat_session.conversation_id,
+                        conversation_id=session.conversation_id,
                     )
 
-            else:
-                # Fall back to pipeline conversation agent
-                conversation_result = await conversation.async_converse(
-                    hass=self.hass,
-                    text=user_input.text,
-                    conversation_id=user_input.conversation_id,
-                    device_id=user_input.device_id,
-                    context=user_input.context,
-                    language=user_input.language,
-                    agent_id=user_input.agent_id,
-                )
-                speech = conversation_result.response.speech.get("plain", {}).get(
-                    "speech", ""
-                )
+                else:
+                    # Fall back to pipeline conversation agent
+                    conversation_result = await conversation.async_converse(
+                        hass=self.hass,
+                        text=user_input.text,
+                        conversation_id=user_input.conversation_id,
+                        device_id=user_input.device_id,
+                        context=user_input.context,
+                        language=user_input.language,
+                        agent_id=user_input.agent_id,
+                        extra_system_prompt=user_input.extra_system_prompt,
+                    )
+                    speech = conversation_result.response.speech.get("plain", {}).get(
+                        "speech", ""
+                    )
 
         except Exception as src_error:
             _LOGGER.exception("Unexpected error during intent recognition")
@@ -1147,6 +1219,9 @@ class PipelineRun:
             )
         )
 
+        if conversation_result.continue_conversation:
+            self._conversation_data.continue_conversation_agent = agent_id
+
         return speech
 
     async def prepare_text_to_speech(self) -> None:
@@ -1169,36 +1244,31 @@ class PipelineRun:
                 tts_options[tts.ATTR_PREFERRED_SAMPLE_BYTES] = SAMPLE_WIDTH
 
         try:
-            options_supported = await tts.async_support_options(
-                self.hass,
-                engine,
-                self.pipeline.tts_language,
-                tts_options,
+            self.tts_stream = tts.async_create_stream(
+                hass=self.hass,
+                engine=engine,
+                language=self.pipeline.tts_language,
+                options=tts_options,
             )
         except HomeAssistantError as err:
-            raise TextToSpeechError(
-                code="tts-not-supported",
-                message=f"Text-to-speech engine '{engine}' not found",
-            ) from err
-        if not options_supported:
             raise TextToSpeechError(
                 code="tts-not-supported",
                 message=(
                     f"Text-to-speech engine {engine} "
-                    f"does not support language {self.pipeline.tts_language} or options {tts_options}"
+                    f"does not support language {self.pipeline.tts_language} or options {tts_options}:"
+                    f" {err}"
                 ),
-            )
-
-        self.tts_engine = engine
-        self.tts_options = tts_options
+            ) from err
 
     async def text_to_speech(self, tts_input: str) -> None:
         """Run text-to-speech portion of pipeline."""
+        assert self.tts_stream is not None
+
         self.process_event(
             PipelineEvent(
                 PipelineEventType.TTS_START,
                 {
-                    "engine": self.tts_engine,
+                    "engine": self.tts_stream.engine,
                     "language": self.pipeline.tts_language,
                     "voice": self.pipeline.tts_voice,
                     "tts_input": tts_input,
@@ -1211,14 +1281,9 @@ class PipelineRun:
             tts_media_id = tts_generate_media_source_id(
                 self.hass,
                 tts_input,
-                engine=self.tts_engine,
-                language=self.pipeline.tts_language,
-                options=self.tts_options,
-            )
-            tts_media = await media_source.async_resolve_media(
-                self.hass,
-                tts_media_id,
-                None,
+                engine=self.tts_stream.engine,
+                language=self.tts_stream.language,
+                options=self.tts_stream.options,
             )
         except Exception as src_error:
             _LOGGER.exception("Unexpected error during text-to-speech")
@@ -1227,10 +1292,13 @@ class PipelineRun:
                 message="Unexpected error during text-to-speech",
             ) from src_error
 
-        _LOGGER.debug("TTS result %s", tts_media)
+        self.tts_stream.async_set_message(tts_input)
+
         tts_output = {
             "media_id": tts_media_id,
-            **asdict(tts_media),
+            "token": self.tts_stream.token,
+            "url": self.tts_stream.url,
+            "mime_type": self.tts_stream.content_type,
         }
 
         self.process_event(
@@ -1404,12 +1472,15 @@ def _pipeline_debug_recording_thread_proc(
             wav_writer.close()
 
 
-@dataclass
+@dataclass(kw_only=True)
 class PipelineInput:
     """Input to a pipeline run."""
 
     run: PipelineRun
 
+    session: chat_session.ChatSession
+    """Session for the conversation."""
+
     stt_metadata: stt.SpeechMetadata | None = None
     """Metadata of stt input audio. Required when start_stage = stt."""
 
@@ -1425,9 +1496,6 @@ class PipelineInput:
     tts_input: str | None = None
     """Input for text-to-speech. Required when start_stage = tts."""
 
-    conversation_id: str | None = None
-    """Identifier for the conversation."""
-
     conversation_extra_system_prompt: str | None = None
     """Extra prompt information for the conversation agent."""
 
@@ -1436,7 +1504,9 @@ class PipelineInput:
 
     async def execute(self) -> None:
         """Run pipeline."""
-        self.run.start(device_id=self.device_id)
+        self.run.start(
+            conversation_id=self.session.conversation_id, device_id=self.device_id
+        )
         current_stage: PipelineStage | None = self.run.start_stage
         stt_audio_buffer: list[EnhancedAudioChunk] = []
         stt_processed_stream: AsyncIterable[EnhancedAudioChunk] | None = None
@@ -1520,7 +1590,7 @@ class PipelineInput:
                     assert intent_input is not None
                     tts_input = await self.run.recognize_intent(
                         intent_input,
-                        self.conversation_id,
+                        self.session.conversation_id,
                         self.device_id,
                         self.conversation_extra_system_prompt,
                     )
@@ -1604,7 +1674,7 @@ class PipelineInput:
             <= PIPELINE_STAGE_ORDER.index(PipelineStage.INTENT)
             <= end_stage_index
         ):
-            prepare_tasks.append(self.run.prepare_recognize_intent())
+            prepare_tasks.append(self.run.prepare_recognize_intent(self.session))
 
         if (
             start_stage_index
@@ -1883,7 +1953,7 @@ class PipelineRunDebug:
 
 
 class PipelineStore(Store[SerializedPipelineStorageCollection]):
-    """Store entity registry data."""
+    """Store pipeline data."""
 
     async def _async_migrate_func(
         self,
@@ -1965,3 +2035,37 @@ async def async_run_migrations(hass: HomeAssistant) -> None:
 
     for pipeline, attr_updates in updates:
         await async_update_pipeline(hass, pipeline, **attr_updates)
+
+
+@dataclass
+class PipelineConversationData:
+    """Hold data for the duration of a conversation."""
+
+    continue_conversation_agent: str | None = None
+    """The agent that requested the conversation to be continued."""
+
+
+@callback
+def async_get_pipeline_conversation_data(
+    hass: HomeAssistant, session: chat_session.ChatSession
+) -> PipelineConversationData:
+    """Get the pipeline data for a specific conversation."""
+    all_conversation_data = hass.data.get(KEY_PIPELINE_CONVERSATION_DATA)
+    if all_conversation_data is None:
+        all_conversation_data = {}
+        hass.data[KEY_PIPELINE_CONVERSATION_DATA] = all_conversation_data
+
+    data = all_conversation_data.get(session.conversation_id)
+
+    if data is not None:
+        return data
+
+    @callback
+    def do_cleanup() -> None:
+        """Handle cleanup."""
+        all_conversation_data.pop(session.conversation_id)
+
+    session.async_on_cleanup(do_cleanup)
+
+    data = all_conversation_data[session.conversation_id] = PipelineConversationData()
+    return data
diff --git a/homeassistant/components/assist_pipeline/websocket_api.py b/homeassistant/components/assist_pipeline/websocket_api.py
index 69f917fcf83..937b3a0ea45 100644
--- a/homeassistant/components/assist_pipeline/websocket_api.py
+++ b/homeassistant/components/assist_pipeline/websocket_api.py
@@ -14,7 +14,11 @@ import voluptuous as vol
 from homeassistant.components import conversation, stt, tts, websocket_api
 from homeassistant.const import ATTR_DEVICE_ID, ATTR_SECONDS, MATCH_ALL
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import config_validation as cv, entity_registry as er
+from homeassistant.helpers import (
+    chat_session,
+    config_validation as cv,
+    entity_registry as er,
+)
 from homeassistant.util import language as language_util
 
 from .const import (
@@ -145,7 +149,6 @@ async def websocket_run(
 
     # Arguments to PipelineInput
     input_args: dict[str, Any] = {
-        "conversation_id": msg.get("conversation_id"),
         "device_id": msg.get("device_id"),
     }
 
@@ -233,38 +236,42 @@ async def websocket_run(
         audio_settings=audio_settings or AudioSettings(),
     )
 
-    pipeline_input = PipelineInput(**input_args)
+    with chat_session.async_get_chat_session(
+        hass, msg.get("conversation_id")
+    ) as session:
+        input_args["session"] = session
+        pipeline_input = PipelineInput(**input_args)
 
-    try:
-        await pipeline_input.validate()
-    except PipelineError as error:
-        # Report more specific error when possible
-        connection.send_error(msg["id"], error.code, error.message)
-        return
+        try:
+            await pipeline_input.validate()
+        except PipelineError as error:
+            # Report more specific error when possible
+            connection.send_error(msg["id"], error.code, error.message)
+            return
 
-    # Confirm subscription
-    connection.send_result(msg["id"])
+        # Confirm subscription
+        connection.send_result(msg["id"])
 
-    run_task = hass.async_create_task(pipeline_input.execute())
+        run_task = hass.async_create_task(pipeline_input.execute())
 
-    # Cancel pipeline if user unsubscribes
-    connection.subscriptions[msg["id"]] = run_task.cancel
+        # Cancel pipeline if user unsubscribes
+        connection.subscriptions[msg["id"]] = run_task.cancel
 
-    try:
-        # Task contains a timeout
-        async with asyncio.timeout(timeout):
-            await run_task
-    except TimeoutError:
-        pipeline_input.run.process_event(
-            PipelineEvent(
-                PipelineEventType.ERROR,
-                {"code": "timeout", "message": "Timeout running pipeline"},
+        try:
+            # Task contains a timeout
+            async with asyncio.timeout(timeout):
+                await run_task
+        except TimeoutError:
+            pipeline_input.run.process_event(
+                PipelineEvent(
+                    PipelineEventType.ERROR,
+                    {"code": "timeout", "message": "Timeout running pipeline"},
+                )
             )
-        )
-    finally:
-        if unregister_handler is not None:
-            # Unregister binary handler
-            unregister_handler()
+        finally:
+            if unregister_handler is not None:
+                # Unregister binary handler
+                unregister_handler()
 
 
 @callback
diff --git a/homeassistant/components/assist_satellite/__init__.py b/homeassistant/components/assist_satellite/__init__.py
index 47b0123a244..bc2157b10b2 100644
--- a/homeassistant/components/assist_satellite/__init__.py
+++ b/homeassistant/components/assist_satellite/__init__.py
@@ -1,9 +1,11 @@
 """Base class for assist satellite entities."""
 
 import logging
+from pathlib import Path
 
 import voluptuous as vol
 
+from homeassistant.components.http import StaticPathConfig
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
@@ -15,6 +17,8 @@ from .const import (
     CONNECTION_TEST_DATA,
     DATA_COMPONENT,
     DOMAIN,
+    PREANNOUNCE_FILENAME,
+    PREANNOUNCE_URL,
     AssistSatelliteEntityFeature,
 )
 from .entity import (
@@ -56,6 +60,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                 {
                     vol.Optional("message"): str,
                     vol.Optional("media_id"): str,
+                    vol.Optional("preannounce_media_id"): vol.Any(str, None),
                 }
             ),
             cv.has_at_least_one_key("message", "media_id"),
@@ -63,10 +68,35 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         "async_internal_announce",
         [AssistSatelliteEntityFeature.ANNOUNCE],
     )
+    component.async_register_entity_service(
+        "start_conversation",
+        vol.All(
+            cv.make_entity_service_schema(
+                {
+                    vol.Optional("start_message"): str,
+                    vol.Optional("start_media_id"): str,
+                    vol.Optional("preannounce_media_id"): vol.Any(str, None),
+                    vol.Optional("extra_system_prompt"): str,
+                }
+            ),
+            cv.has_at_least_one_key("start_message", "start_media_id"),
+        ),
+        "async_internal_start_conversation",
+        [AssistSatelliteEntityFeature.START_CONVERSATION],
+    )
     hass.data[CONNECTION_TEST_DATA] = {}
     async_register_websocket_api(hass)
     hass.http.register_view(ConnectionTestView())
 
+    # Default preannounce sound
+    await hass.http.async_register_static_paths(
+        [
+            StaticPathConfig(
+                PREANNOUNCE_URL, str(Path(__file__).parent / PREANNOUNCE_FILENAME)
+            )
+        ]
+    )
+
     return True
 
 
diff --git a/homeassistant/components/assist_satellite/const.py b/homeassistant/components/assist_satellite/const.py
index 61ac7ecb39d..7fca88f3b12 100644
--- a/homeassistant/components/assist_satellite/const.py
+++ b/homeassistant/components/assist_satellite/const.py
@@ -20,9 +20,15 @@ CONNECTION_TEST_DATA: HassKey[dict[str, asyncio.Event]] = HassKey(
     f"{DOMAIN}_connection_tests"
 )
 
+PREANNOUNCE_FILENAME = "preannounce.mp3"
+PREANNOUNCE_URL = f"/api/assist_satellite/static/{PREANNOUNCE_FILENAME}"
+
 
 class AssistSatelliteEntityFeature(IntFlag):
     """Supported features of Assist satellite entity."""
 
     ANNOUNCE = 1
     """Device supports remotely triggered announcements."""
+
+    START_CONVERSATION = 2
+    """Device supports starting conversations."""
diff --git a/homeassistant/components/assist_satellite/entity.py b/homeassistant/components/assist_satellite/entity.py
index e9a5d22c0d0..7b4c1b92d8c 100644
--- a/homeassistant/components/assist_satellite/entity.py
+++ b/homeassistant/components/assist_satellite/entity.py
@@ -8,9 +8,9 @@ from dataclasses import dataclass
 from enum import StrEnum
 import logging
 import time
-from typing import Any, Final, Literal, final
+from typing import Any, Literal, final
 
-from homeassistant.components import media_source, stt, tts
+from homeassistant.components import conversation, media_source, stt, tts
 from homeassistant.components.assist_pipeline import (
     OPTION_PREFERRED,
     AudioSettings,
@@ -23,18 +23,14 @@ from homeassistant.components.assist_pipeline import (
     vad,
 )
 from homeassistant.components.media_player import async_process_play_media_url
-from homeassistant.components.tts import (
-    generate_media_source_id as tts_generate_media_source_id,
-)
 from homeassistant.core import Context, callback
-from homeassistant.helpers import entity
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import chat_session, entity
 from homeassistant.helpers.entity import EntityDescription
 
-from .const import AssistSatelliteEntityFeature
+from .const import PREANNOUNCE_URL, AssistSatelliteEntityFeature
 from .errors import AssistSatelliteError, SatelliteBusyError
 
-_CONVERSATION_TIMEOUT_SEC: Final = 5 * 60  # 5 minutes
-
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -99,9 +95,15 @@ class AssistSatelliteAnnouncement:
     original_media_id: str
     """The raw media ID before processing."""
 
+    tts_token: str | None
+    """The TTS token of the media."""
+
     media_id_source: Literal["url", "media_id", "tts"]
     """Source of the media ID."""
 
+    preannounce_media_id: str | None = None
+    """Media ID to be played before announcement."""
+
 
 class AssistSatelliteEntity(entity.Entity):
     """Entity encapsulating the state and functionality of an Assist satellite."""
@@ -113,10 +115,10 @@ class AssistSatelliteEntity(entity.Entity):
     _attr_vad_sensitivity_entity_id: str | None = None
 
     _conversation_id: str | None = None
-    _conversation_id_time: float | None = None
 
     _run_has_tts: bool = False
     _is_announcing = False
+    _extra_system_prompt: str | None = None
     _wake_word_intercept_future: asyncio.Future[str | None] | None = None
     _attr_tts_options: dict[str, Any] | None = None
     _pipeline_task: asyncio.Task | None = None
@@ -178,6 +180,7 @@ class AssistSatelliteEntity(entity.Entity):
         self,
         message: str | None = None,
         media_id: str | None = None,
+        preannounce_media_id: str | None = PREANNOUNCE_URL,
     ) -> None:
         """Play and show an announcement on the satellite.
 
@@ -187,6 +190,9 @@ class AssistSatelliteEntity(entity.Entity):
         If media_id is provided, it is played directly. It is possible
         to omit the message and the satellite will not show any text.
 
+        If preannounce_media_id is provided, it overrides the default sound.
+        If preannounce_media_id is None, no sound is played.
+
         Calls async_announce with message and media id.
         """
         await self._cancel_running_pipeline()
@@ -194,7 +200,9 @@ class AssistSatelliteEntity(entity.Entity):
         if message is None:
             message = ""
 
-        announcement = await self._resolve_announcement_media_id(message, media_id)
+        announcement = await self._resolve_announcement_media_id(
+            message, media_id, preannounce_media_id
+        )
 
         if self._is_announcing:
             raise SatelliteBusyError
@@ -216,6 +224,85 @@ class AssistSatelliteEntity(entity.Entity):
         """
         raise NotImplementedError
 
+    async def async_internal_start_conversation(
+        self,
+        start_message: str | None = None,
+        start_media_id: str | None = None,
+        extra_system_prompt: str | None = None,
+        preannounce_media_id: str | None = PREANNOUNCE_URL,
+    ) -> None:
+        """Start a conversation from the satellite.
+
+        If start_media_id is not provided, message is synthesized to
+        audio with the selected pipeline.
+
+        If start_media_id is provided, it is played directly. It is possible
+        to omit the message and the satellite will not show any text.
+
+        If preannounce_media_id is provided, it is played before the announcement.
+        If preannounce_media_id is None, no sound is played.
+
+        Calls async_start_conversation.
+        """
+        await self._cancel_running_pipeline()
+
+        # The Home Assistant built-in agent doesn't support conversations.
+        pipeline = async_get_pipeline(self.hass, self._resolve_pipeline())
+        if pipeline.conversation_engine == conversation.HOME_ASSISTANT_AGENT:
+            raise HomeAssistantError(
+                "Built-in conversation agent does not support starting conversations"
+            )
+
+        if start_message is None:
+            start_message = ""
+
+        announcement = await self._resolve_announcement_media_id(
+            start_message, start_media_id, preannounce_media_id
+        )
+
+        if self._is_announcing:
+            raise SatelliteBusyError
+
+        self._is_announcing = True
+        self._set_state(AssistSatelliteState.RESPONDING)
+
+        # Provide our start info to the LLM so it understands context of incoming message
+        if extra_system_prompt is not None:
+            self._extra_system_prompt = extra_system_prompt
+        else:
+            self._extra_system_prompt = start_message or None
+
+        with (
+            # Not passing in a conversation ID will force a new one to be created
+            chat_session.async_get_chat_session(self.hass) as session,
+            conversation.async_get_chat_log(self.hass, session) as chat_log,
+        ):
+            self._conversation_id = session.conversation_id
+
+            if start_message:
+                chat_log.async_add_assistant_content_without_tools(
+                    conversation.AssistantContent(
+                        agent_id=self.entity_id, content=start_message
+                    )
+                )
+
+        try:
+            await self.async_start_conversation(announcement)
+        except Exception:
+            # Clear prompt on error
+            self._conversation_id = None
+            self._extra_system_prompt = None
+            raise
+        finally:
+            self._is_announcing = False
+            self._set_state(AssistSatelliteState.IDLE)
+
+    async def async_start_conversation(
+        self, start_announcement: AssistSatelliteAnnouncement
+    ) -> None:
+        """Start a conversation from the satellite."""
+        raise NotImplementedError
+
     async def async_accept_pipeline_from_satellite(
         self,
         audio_stream: AsyncIterable[bytes],
@@ -226,6 +313,10 @@ class AssistSatelliteEntity(entity.Entity):
         """Triggers an Assist pipeline in Home Assistant from a satellite."""
         await self._cancel_running_pipeline()
 
+        # Consume system prompt in first pipeline
+        extra_system_prompt = self._extra_system_prompt
+        self._extra_system_prompt = None
+
         if self._wake_word_intercept_future and start_stage in (
             PipelineStage.WAKE_WORD,
             PipelineStage.STT,
@@ -266,50 +357,52 @@ class AssistSatelliteEntity(entity.Entity):
 
         assert self._context is not None
 
-        # Reset conversation id if necessary
-        if self._conversation_id_time and (
-            (time.monotonic() - self._conversation_id_time) > _CONVERSATION_TIMEOUT_SEC
-        ):
-            self._conversation_id = None
-            self._conversation_id_time = None
-
         # Set entity state based on pipeline events
         self._run_has_tts = False
 
         assert self.platform.config_entry is not None
-        self._pipeline_task = self.platform.config_entry.async_create_background_task(
-            self.hass,
-            async_pipeline_from_audio_stream(
-                self.hass,
-                context=self._context,
-                event_callback=self._internal_on_pipeline_event,
-                stt_metadata=stt.SpeechMetadata(
-                    language="",  # set in async_pipeline_from_audio_stream
-                    format=stt.AudioFormats.WAV,
-                    codec=stt.AudioCodecs.PCM,
-                    bit_rate=stt.AudioBitRates.BITRATE_16,
-                    sample_rate=stt.AudioSampleRates.SAMPLERATE_16000,
-                    channel=stt.AudioChannels.CHANNEL_MONO,
-                ),
-                stt_stream=audio_stream,
-                pipeline_id=self._resolve_pipeline(),
-                conversation_id=self._conversation_id,
-                device_id=device_id,
-                tts_audio_output=self.tts_options,
-                wake_word_phrase=wake_word_phrase,
-                audio_settings=AudioSettings(
-                    silence_seconds=self._resolve_vad_sensitivity()
-                ),
-                start_stage=start_stage,
-                end_stage=end_stage,
-            ),
-            f"{self.entity_id}_pipeline",
-        )
 
-        try:
-            await self._pipeline_task
-        finally:
-            self._pipeline_task = None
+        with chat_session.async_get_chat_session(
+            self.hass, self._conversation_id
+        ) as session:
+            # Store the conversation ID. If it is no longer valid, get_chat_session will reset it
+            self._conversation_id = session.conversation_id
+            self._pipeline_task = (
+                self.platform.config_entry.async_create_background_task(
+                    self.hass,
+                    async_pipeline_from_audio_stream(
+                        self.hass,
+                        context=self._context,
+                        event_callback=self._internal_on_pipeline_event,
+                        stt_metadata=stt.SpeechMetadata(
+                            language="",  # set in async_pipeline_from_audio_stream
+                            format=stt.AudioFormats.WAV,
+                            codec=stt.AudioCodecs.PCM,
+                            bit_rate=stt.AudioBitRates.BITRATE_16,
+                            sample_rate=stt.AudioSampleRates.SAMPLERATE_16000,
+                            channel=stt.AudioChannels.CHANNEL_MONO,
+                        ),
+                        stt_stream=audio_stream,
+                        pipeline_id=self._resolve_pipeline(),
+                        conversation_id=session.conversation_id,
+                        device_id=device_id,
+                        tts_audio_output=self.tts_options,
+                        wake_word_phrase=wake_word_phrase,
+                        audio_settings=AudioSettings(
+                            silence_seconds=self._resolve_vad_sensitivity()
+                        ),
+                        start_stage=start_stage,
+                        end_stage=end_stage,
+                        conversation_extra_system_prompt=extra_system_prompt,
+                    ),
+                    f"{self.entity_id}_pipeline",
+                )
+            )
+
+            try:
+                await self._pipeline_task
+            finally:
+                self._pipeline_task = None
 
     async def _cancel_running_pipeline(self) -> None:
         """Cancel the current pipeline if it's running."""
@@ -328,16 +421,14 @@ class AssistSatelliteEntity(entity.Entity):
     def _internal_on_pipeline_event(self, event: PipelineEvent) -> None:
         """Set state based on pipeline stage."""
         if event.type is PipelineEventType.WAKE_WORD_START:
-            self._set_state(AssistSatelliteState.IDLE)
+            # Only return to idle if we're not currently responding.
+            # The state will return to idle in tts_response_finished.
+            if self.state != AssistSatelliteState.RESPONDING:
+                self._set_state(AssistSatelliteState.IDLE)
         elif event.type is PipelineEventType.STT_START:
             self._set_state(AssistSatelliteState.LISTENING)
         elif event.type is PipelineEventType.INTENT_START:
             self._set_state(AssistSatelliteState.PROCESSING)
-        elif event.type is PipelineEventType.INTENT_END:
-            assert event.data is not None
-            # Update timeout
-            self._conversation_id_time = time.monotonic()
-            self._conversation_id = event.data["intent_output"]["conversation_id"]
         elif event.type is PipelineEventType.TTS_START:
             # Wait until tts_response_finished is called to return to waiting state
             self._run_has_tts = True
@@ -395,20 +486,27 @@ class AssistSatelliteEntity(entity.Entity):
         return vad.VadSensitivity.to_seconds(vad_sensitivity)
 
     async def _resolve_announcement_media_id(
-        self, message: str, media_id: str | None
+        self,
+        message: str,
+        media_id: str | None,
+        preannounce_media_id: str | None = None,
     ) -> AssistSatelliteAnnouncement:
         """Resolve the media ID."""
         media_id_source: Literal["url", "media_id", "tts"] | None = None
+        tts_token: str | None = None
 
         if media_id:
             original_media_id = media_id
-
         else:
             media_id_source = "tts"
             # Synthesize audio and get URL
             pipeline_id = self._resolve_pipeline()
             pipeline = async_get_pipeline(self.hass, pipeline_id)
 
+            engine = tts.async_resolve_engine(self.hass, pipeline.tts_engine)
+            if engine is None:
+                raise HomeAssistantError(f"TTS engine {pipeline.tts_engine} not found")
+
             tts_options: dict[str, Any] = {}
             if pipeline.tts_voice is not None:
                 tts_options[tts.ATTR_VOICE] = pipeline.tts_voice
@@ -416,14 +514,23 @@ class AssistSatelliteEntity(entity.Entity):
             if self.tts_options is not None:
                 tts_options.update(self.tts_options)
 
-            media_id = tts_generate_media_source_id(
+            stream = tts.async_create_stream(
                 self.hass,
-                message,
-                engine=pipeline.tts_engine,
+                engine=engine,
+                language=pipeline.tts_language,
+                options=tts_options,
+            )
+            stream.async_set_message(message)
+
+            tts_token = stream.token
+            media_id = stream.url
+            original_media_id = tts.generate_media_source_id(
+                self.hass,
+                message,
+                engine=engine,
                 language=pipeline.tts_language,
                 options=tts_options,
             )
-            original_media_id = media_id
 
         if media_source.is_media_source_id(media_id):
             if not media_id_source:
@@ -441,6 +548,26 @@ class AssistSatelliteEntity(entity.Entity):
         # Resolve to full URL
         media_id = async_process_play_media_url(self.hass, media_id)
 
+        # Resolve preannounce media id
+        if preannounce_media_id:
+            if media_source.is_media_source_id(preannounce_media_id):
+                preannounce_media = await media_source.async_resolve_media(
+                    self.hass,
+                    preannounce_media_id,
+                    None,
+                )
+                preannounce_media_id = preannounce_media.url
+
+            # Resolve to full URL
+            preannounce_media_id = async_process_play_media_url(
+                self.hass, preannounce_media_id
+            )
+
         return AssistSatelliteAnnouncement(
-            message, media_id, original_media_id, media_id_source
+            message=message,
+            media_id=media_id,
+            original_media_id=original_media_id,
+            tts_token=tts_token,
+            media_id_source=media_id_source,
+            preannounce_media_id=preannounce_media_id,
         )
diff --git a/homeassistant/components/assist_satellite/icons.json b/homeassistant/components/assist_satellite/icons.json
index a98c3aefc5b..1ed29541621 100644
--- a/homeassistant/components/assist_satellite/icons.json
+++ b/homeassistant/components/assist_satellite/icons.json
@@ -7,6 +7,9 @@
   "services": {
     "announce": {
       "service": "mdi:bullhorn"
+    },
+    "start_conversation": {
+      "service": "mdi:forum"
     }
   }
 }
diff --git a/homeassistant/components/assist_satellite/intent.py b/homeassistant/components/assist_satellite/intent.py
index 75396cf138f..7612753e8c4 100644
--- a/homeassistant/components/assist_satellite/intent.py
+++ b/homeassistant/components/assist_satellite/intent.py
@@ -1,5 +1,7 @@
 """Assist Satellite intents."""
 
+from typing import Final
+
 import voluptuous as vol
 
 from homeassistant.core import HomeAssistant
@@ -7,6 +9,8 @@ from homeassistant.helpers import entity_registry as er, intent
 
 from .const import DOMAIN, AssistSatelliteEntityFeature
 
+EXCLUDED_DOMAINS: Final[set[str]] = {"voip"}
+
 
 async def async_setup_intents(hass: HomeAssistant) -> None:
     """Set up the intents."""
@@ -30,19 +34,36 @@ class BroadcastIntentHandler(intent.IntentHandler):
         ent_reg = er.async_get(hass)
 
         # Find all assist satellite entities that are not the one invoking the intent
-        entities = {
-            entity: entry
-            for entity in hass.states.async_entity_ids(DOMAIN)
-            if (entry := ent_reg.async_get(entity))
-            and entry.supported_features & AssistSatelliteEntityFeature.ANNOUNCE
-        }
+        entities: dict[str, er.RegistryEntry] = {}
+        for entity in hass.states.async_entity_ids(DOMAIN):
+            entry = ent_reg.async_get(entity)
+            if (
+                (entry is None)
+                or (
+                    # Supports announce
+                    not (
+                        entry.supported_features & AssistSatelliteEntityFeature.ANNOUNCE
+                    )
+                )
+                # Not the invoking device
+                or (intent_obj.device_id and (entry.device_id == intent_obj.device_id))
+            ):
+                # Skip satellite
+                continue
 
-        if intent_obj.device_id:
-            entities = {
-                entity: entry
-                for entity, entry in entities.items()
-                if entry.device_id != intent_obj.device_id
-            }
+            # Check domain of config entry against excluded domains
+            if (
+                entry.config_entry_id
+                and (
+                    config_entry := hass.config_entries.async_get_entry(
+                        entry.config_entry_id
+                    )
+                )
+                and (config_entry.domain in EXCLUDED_DOMAINS)
+            ):
+                continue
+
+            entities[entity] = entry
 
         await hass.services.async_call(
             DOMAIN,
@@ -54,7 +75,6 @@ class BroadcastIntentHandler(intent.IntentHandler):
         )
 
         response = intent_obj.create_response()
-        response.async_set_speech("Done")
         response.response_type = intent.IntentResponseType.ACTION_DONE
         response.async_set_results(
             success_results=[
diff --git a/homeassistant/components/assist_satellite/preannounce.mp3 b/homeassistant/components/assist_satellite/preannounce.mp3
new file mode 100644
index 00000000000..6e2fa0aba3e
Binary files /dev/null and b/homeassistant/components/assist_satellite/preannounce.mp3 differ
diff --git a/homeassistant/components/assist_satellite/services.yaml b/homeassistant/components/assist_satellite/services.yaml
index e7fefc4705f..fd6a4f23ccc 100644
--- a/homeassistant/components/assist_satellite/services.yaml
+++ b/homeassistant/components/assist_satellite/services.yaml
@@ -14,3 +14,31 @@ announce:
       required: false
       selector:
         text:
+    preannounce_media_id:
+      required: false
+      selector:
+        text:
+start_conversation:
+  target:
+    entity:
+      domain: assist_satellite
+      supported_features:
+        - assist_satellite.AssistSatelliteEntityFeature.START_CONVERSATION
+  fields:
+    start_message:
+      required: false
+      example: "You left the lights on in the living room. Turn them off?"
+      selector:
+        text:
+    start_media_id:
+      required: false
+      selector:
+        text:
+    extra_system_prompt:
+      required: false
+      selector:
+        text:
+    preannounce_media_id:
+      required: false
+      selector:
+        text:
diff --git a/homeassistant/components/assist_satellite/strings.json b/homeassistant/components/assist_satellite/strings.json
index 7f1426ef529..2bb61516bca 100644
--- a/homeassistant/components/assist_satellite/strings.json
+++ b/homeassistant/components/assist_satellite/strings.json
@@ -14,7 +14,7 @@
   "services": {
     "announce": {
       "name": "Announce",
-      "description": "Let the satellite announce a message.",
+      "description": "Lets a satellite announce a message.",
       "fields": {
         "message": {
           "name": "Message",
@@ -23,6 +23,32 @@
         "media_id": {
           "name": "Media ID",
           "description": "The media ID to announce instead of using text-to-speech."
+        },
+        "preannounce_media_id": {
+          "name": "Preannounce Media ID",
+          "description": "The media ID to play before the announcement."
+        }
+      }
+    },
+    "start_conversation": {
+      "name": "Start conversation",
+      "description": "Starts a conversation from a satellite.",
+      "fields": {
+        "start_message": {
+          "name": "Message",
+          "description": "The message to start with."
+        },
+        "start_media_id": {
+          "name": "Media ID",
+          "description": "The media ID to start with instead of using text-to-speech."
+        },
+        "extra_system_prompt": {
+          "name": "Extra system prompt",
+          "description": "Provide background information to the AI about the request."
+        },
+        "preannounce_media_id": {
+          "name": "Preannounce Media ID",
+          "description": "The media ID to play before the start message or media."
         }
       }
     }
diff --git a/homeassistant/components/assist_satellite/websocket_api.py b/homeassistant/components/assist_satellite/websocket_api.py
index c81648c6ee3..4fc1708b866 100644
--- a/homeassistant/components/assist_satellite/websocket_api.py
+++ b/homeassistant/components/assist_satellite/websocket_api.py
@@ -10,7 +10,6 @@ from homeassistant.components import websocket_api
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.util import uuid as uuid_util
 
 from .connection_test import CONNECTION_TEST_URL_BASE
@@ -20,7 +19,7 @@ from .const import (
     DOMAIN,
     AssistSatelliteEntityFeature,
 )
-from .entity import AssistSatelliteEntity
+from .entity import AssistSatelliteConfiguration
 
 CONNECTION_TEST_TIMEOUT = 30
 
@@ -93,7 +92,16 @@ def websocket_get_configuration(
         )
         return
 
-    config_dict = asdict(satellite.async_get_configuration())
+    try:
+        config_dict = asdict(satellite.async_get_configuration())
+    except NotImplementedError:
+        # Stub configuration
+        config_dict = asdict(
+            AssistSatelliteConfiguration(
+                available_wake_words=[], active_wake_words=[], max_active_wake_words=1
+            )
+        )
+
     config_dict["pipeline_entity_id"] = satellite.pipeline_entity_id
     config_dict["vad_entity_id"] = satellite.vad_sensitivity_entity_id
 
@@ -167,7 +175,7 @@ async def websocket_test_connection(
 
     Send an announcement to the device with a special media id.
     """
-    component: EntityComponent[AssistSatelliteEntity] = hass.data[DOMAIN]
+    component = hass.data[DATA_COMPONENT]
     satellite = component.get_entity(msg["entity_id"])
     if satellite is None:
         connection.send_error(
diff --git a/homeassistant/components/asuswrt/device_tracker.py b/homeassistant/components/asuswrt/device_tracker.py
index 95d2e4c8000..ee6c3f96fc4 100644
--- a/homeassistant/components/asuswrt/device_tracker.py
+++ b/homeassistant/components/asuswrt/device_tracker.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from homeassistant.components.device_tracker import ScannerEntity
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AsusWrtConfigEntry
 from .router import AsusWrtDevInfo, AsusWrtRouter
@@ -18,7 +18,7 @@ DEFAULT_DEVICE_NAME = "Unknown device"
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AsusWrtConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up device tracker for AsusWrt component."""
     router = entry.runtime_data
@@ -38,7 +38,9 @@ async def async_setup_entry(
 
 @callback
 def add_entities(
-    router: AsusWrtRouter, async_add_entities: AddEntitiesCallback, tracked: set[str]
+    router: AsusWrtRouter,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+    tracked: set[str],
 ) -> None:
     """Add new tracker entities from the router."""
     new_tracked = []
diff --git a/homeassistant/components/asuswrt/sensor.py b/homeassistant/components/asuswrt/sensor.py
index fb43e574379..c4bd5e4bded 100644
--- a/homeassistant/components/asuswrt/sensor.py
+++ b/homeassistant/components/asuswrt/sensor.py
@@ -19,7 +19,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -246,7 +246,7 @@ CONNECTION_SENSORS: tuple[AsusWrtSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AsusWrtConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensors."""
     router = entry.runtime_data
diff --git a/homeassistant/components/asuswrt/strings.json b/homeassistant/components/asuswrt/strings.json
index 9d50f50c7e9..cac37c0cfd0 100644
--- a/homeassistant/components/asuswrt/strings.json
+++ b/homeassistant/components/asuswrt/strings.json
@@ -66,28 +66,28 @@
         "name": "Upload"
       },
       "load_avg_1m": {
-        "name": "Average load (1m)"
+        "name": "Average load (1 min)"
       },
       "load_avg_5m": {
-        "name": "Average load (5m)"
+        "name": "Average load (5 min)"
       },
       "load_avg_15m": {
-        "name": "Average load (15m)"
+        "name": "Average load (15 min)"
       },
       "24ghz_temperature": {
-        "name": "2.4GHz Temperature"
+        "name": "2.4GHz temperature"
       },
       "5ghz_temperature": {
-        "name": "5GHz Temperature"
+        "name": "5GHz temperature"
       },
       "cpu_temperature": {
-        "name": "CPU Temperature"
+        "name": "CPU temperature"
       },
       "5ghz_2_temperature": {
-        "name": "5GHz Temperature (Radio 2)"
+        "name": "5GHz temperature (Radio 2)"
       },
       "6ghz_temperature": {
-        "name": "6GHz Temperature"
+        "name": "6GHz temperature"
       },
       "cpu_usage": {
         "name": "CPU usage"
diff --git a/homeassistant/components/atag/climate.py b/homeassistant/components/atag/climate.py
index a362b71fbc8..8f1ded150f1 100644
--- a/homeassistant/components/atag/climate.py
+++ b/homeassistant/components/atag/climate.py
@@ -14,7 +14,7 @@ from homeassistant.components.climate import (
 )
 from homeassistant.const import ATTR_TEMPERATURE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
 
 from .coordinator import AtagConfigEntry, AtagDataUpdateCoordinator
@@ -32,7 +32,9 @@ HVAC_MODES = [HVACMode.AUTO, HVACMode.HEAT]
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: AtagConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: AtagConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Load a config entry."""
     async_add_entities([AtagThermostat(entry.runtime_data, "climate")])
diff --git a/homeassistant/components/atag/coordinator.py b/homeassistant/components/atag/coordinator.py
index 6d542471384..f590bc1dc6a 100644
--- a/homeassistant/components/atag/coordinator.py
+++ b/homeassistant/components/atag/coordinator.py
@@ -19,17 +19,22 @@ type AtagConfigEntry = ConfigEntry[AtagDataUpdateCoordinator]
 class AtagDataUpdateCoordinator(DataUpdateCoordinator[None]):
     """Atag data update coordinator."""
 
-    def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
+    config_entry: AtagConfigEntry
+
+    def __init__(self, hass: HomeAssistant, config_entry: AtagConfigEntry) -> None:
         """Initialize Atag coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="Atag",
             update_interval=timedelta(seconds=60),
         )
 
         self.atag = AtagOne(
-            session=async_get_clientsession(hass), **entry.data, device=entry.unique_id
+            session=async_get_clientsession(hass),
+            **config_entry.data,
+            device=config_entry.unique_id,
         )
 
     async def _async_update_data(self) -> None:
diff --git a/homeassistant/components/atag/sensor.py b/homeassistant/components/atag/sensor.py
index bd39f0b3458..ca5bbd5e614 100644
--- a/homeassistant/components/atag/sensor.py
+++ b/homeassistant/components/atag/sensor.py
@@ -8,7 +8,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import AtagConfigEntry, AtagDataUpdateCoordinator
 from .entity import AtagEntity
@@ -28,7 +28,7 @@ SENSORS = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AtagConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize sensor platform from config entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/atag/water_heater.py b/homeassistant/components/atag/water_heater.py
index 6b013b36885..00761f47324 100644
--- a/homeassistant/components/atag/water_heater.py
+++ b/homeassistant/components/atag/water_heater.py
@@ -9,7 +9,7 @@ from homeassistant.components.water_heater import (
 )
 from homeassistant.const import ATTR_TEMPERATURE, STATE_OFF, Platform, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import AtagConfigEntry
 from .entity import AtagEntity
@@ -20,7 +20,7 @@ OPERATION_LIST = [STATE_OFF, STATE_ECO, STATE_PERFORMANCE]
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AtagConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize DHW device from config entry."""
     async_add_entities(
diff --git a/homeassistant/components/aten_pe/switch.py b/homeassistant/components/aten_pe/switch.py
index 39b18089284..30afab16011 100644
--- a/homeassistant/components/aten_pe/switch.py
+++ b/homeassistant/components/aten_pe/switch.py
@@ -16,7 +16,7 @@ from homeassistant.components.switch import (
 from homeassistant.const import CONF_HOST, CONF_PORT, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/atome/sensor.py b/homeassistant/components/atome/sensor.py
index fd8250e899f..a1254c1ff49 100644
--- a/homeassistant/components/atome/sensor.py
+++ b/homeassistant/components/atome/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     UnitOfPower,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/august/binary_sensor.py b/homeassistant/components/august/binary_sensor.py
index fb877252010..b4c440599c4 100644
--- a/homeassistant/components/august/binary_sensor.py
+++ b/homeassistant/components/august/binary_sensor.py
@@ -21,7 +21,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 
 from . import AugustConfigEntry, AugustData
@@ -92,7 +92,7 @@ SENSOR_TYPES_DOORBELL: tuple[AugustDoorbellBinarySensorEntityDescription, ...] =
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AugustConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the August binary sensors."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/august/button.py b/homeassistant/components/august/button.py
index 79f2b67888a..4971d0cccf5 100644
--- a/homeassistant/components/august/button.py
+++ b/homeassistant/components/august/button.py
@@ -2,7 +2,7 @@
 
 from homeassistant.components.button import ButtonEntity
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AugustConfigEntry
 from .entity import AugustEntity
@@ -11,7 +11,7 @@ from .entity import AugustEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AugustConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up August lock wake buttons."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/august/camera.py b/homeassistant/components/august/camera.py
index f4398455256..7b013022299 100644
--- a/homeassistant/components/august/camera.py
+++ b/homeassistant/components/august/camera.py
@@ -12,7 +12,7 @@ from yalexs.util import update_doorbell_image_from_activity
 from homeassistant.components.camera import Camera
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import aiohttp_client
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AugustConfigEntry, AugustData
 from .const import DEFAULT_NAME, DEFAULT_TIMEOUT
@@ -24,7 +24,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AugustConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up August cameras."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/august/event.py b/homeassistant/components/august/event.py
index 49b14630337..0abc840bc69 100644
--- a/homeassistant/components/august/event.py
+++ b/homeassistant/components/august/event.py
@@ -16,7 +16,7 @@ from homeassistant.components.event import (
     EventEntityDescription,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AugustConfigEntry, AugustData
 from .entity import AugustDescriptionEntity
@@ -59,7 +59,7 @@ TYPES_DOORBELL: tuple[AugustEventEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AugustConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the august event platform."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/august/lock.py b/homeassistant/components/august/lock.py
index fe5d90371ad..4a37149772a 100644
--- a/homeassistant/components/august/lock.py
+++ b/homeassistant/components/august/lock.py
@@ -14,9 +14,9 @@ from yalexs.util import get_latest_activity, update_lock_detail_from_activity
 from homeassistant.components.lock import ATTR_CHANGED_BY, LockEntity, LockEntityFeature
 from homeassistant.const import ATTR_BATTERY_LEVEL
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import AugustConfigEntry, AugustData
 from .entity import AugustEntity
@@ -29,7 +29,7 @@ LOCK_JAMMED_ERR = 531
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AugustConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up August locks."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/august/manifest.json b/homeassistant/components/august/manifest.json
index 652f1a7b966..5e16a22af76 100644
--- a/homeassistant/components/august/manifest.json
+++ b/homeassistant/components/august/manifest.json
@@ -28,5 +28,5 @@
   "documentation": "https://www.home-assistant.io/integrations/august",
   "iot_class": "cloud_push",
   "loggers": ["pubnub", "yalexs"],
-  "requirements": ["yalexs==8.10.0", "yalexs-ble==2.5.6"]
+  "requirements": ["yalexs==8.10.0", "yalexs-ble==2.5.7"]
 }
diff --git a/homeassistant/components/august/sensor.py b/homeassistant/components/august/sensor.py
index b7c0d618492..94a5461149f 100644
--- a/homeassistant/components/august/sensor.py
+++ b/homeassistant/components/august/sensor.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
     EntityCategory,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AugustConfigEntry
 from .const import (
@@ -82,7 +82,7 @@ SENSOR_TYPE_KEYPAD_BATTERY = AugustSensorEntityDescription[KeypadDetail](
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AugustConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the August sensors."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/aurora/__init__.py b/homeassistant/components/aurora/__init__.py
index b6c47cf36b2..a48d704141f 100644
--- a/homeassistant/components/aurora/__init__.py
+++ b/homeassistant/components/aurora/__init__.py
@@ -1,20 +1,17 @@
 """The aurora component."""
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
 from .const import CONF_THRESHOLD, DEFAULT_THRESHOLD
-from .coordinator import AuroraDataUpdateCoordinator
+from .coordinator import AuroraConfigEntry, AuroraDataUpdateCoordinator
 
 PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR]
 
-type AuroraConfigEntry = ConfigEntry[AuroraDataUpdateCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: AuroraConfigEntry) -> bool:
     """Set up Aurora from a config entry."""
-    coordinator = AuroraDataUpdateCoordinator(hass=hass)
+    coordinator = AuroraDataUpdateCoordinator(hass=hass, config_entry=entry)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/aurora/binary_sensor.py b/homeassistant/components/aurora/binary_sensor.py
index b8fb5002ff5..73e732dc44a 100644
--- a/homeassistant/components/aurora/binary_sensor.py
+++ b/homeassistant/components/aurora/binary_sensor.py
@@ -4,16 +4,16 @@ from __future__ import annotations
 
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import AuroraConfigEntry
+from .coordinator import AuroraConfigEntry
 from .entity import AuroraEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AuroraConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the binary_sensor platform."""
     async_add_entities(
diff --git a/homeassistant/components/aurora/coordinator.py b/homeassistant/components/aurora/coordinator.py
index 9771cc53652..a7b87baec22 100644
--- a/homeassistant/components/aurora/coordinator.py
+++ b/homeassistant/components/aurora/coordinator.py
@@ -4,11 +4,11 @@ from __future__ import annotations
 
 from datetime import timedelta
 import logging
-from typing import TYPE_CHECKING
 
 from aiohttp import ClientError
 from auroranoaa import AuroraForecast
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -16,23 +16,23 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .const import CONF_THRESHOLD, DEFAULT_THRESHOLD
 
-if TYPE_CHECKING:
-    from . import AuroraConfigEntry
-
 _LOGGER = logging.getLogger(__name__)
 
+type AuroraConfigEntry = ConfigEntry[AuroraDataUpdateCoordinator]
+
 
 class AuroraDataUpdateCoordinator(DataUpdateCoordinator[int]):
     """Class to manage fetching data from the NOAA Aurora API."""
 
     config_entry: AuroraConfigEntry
 
-    def __init__(self, hass: HomeAssistant) -> None:
+    def __init__(self, hass: HomeAssistant, config_entry: AuroraConfigEntry) -> None:
         """Initialize the data updater."""
 
         super().__init__(
             hass=hass,
             logger=_LOGGER,
+            config_entry=config_entry,
             name="Aurora",
             update_interval=timedelta(minutes=5),
         )
diff --git a/homeassistant/components/aurora/sensor.py b/homeassistant/components/aurora/sensor.py
index 35d39289598..d424b7e98ab 100644
--- a/homeassistant/components/aurora/sensor.py
+++ b/homeassistant/components/aurora/sensor.py
@@ -5,16 +5,16 @@ from __future__ import annotations
 from homeassistant.components.sensor import SensorEntity, SensorStateClass
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import AuroraConfigEntry
+from .coordinator import AuroraConfigEntry
 from .entity import AuroraEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AuroraConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor platform."""
 
diff --git a/homeassistant/components/aurora_abb_powerone/__init__.py b/homeassistant/components/aurora_abb_powerone/__init__.py
index 749d40aeb5c..91166d5c8f5 100644
--- a/homeassistant/components/aurora_abb_powerone/__init__.py
+++ b/homeassistant/components/aurora_abb_powerone/__init__.py
@@ -23,7 +23,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AuroraAbbConfigEntry) ->
 
     comport = entry.data[CONF_PORT]
     address = entry.data[CONF_ADDRESS]
-    coordinator = AuroraAbbDataUpdateCoordinator(hass, comport, address)
+    coordinator = AuroraAbbDataUpdateCoordinator(hass, entry, comport, address)
     await coordinator.async_config_entry_first_refresh()
 
     entry.runtime_data = coordinator
diff --git a/homeassistant/components/aurora_abb_powerone/coordinator.py b/homeassistant/components/aurora_abb_powerone/coordinator.py
index c3d05da95f3..d38f0716b44 100644
--- a/homeassistant/components/aurora_abb_powerone/coordinator.py
+++ b/homeassistant/components/aurora_abb_powerone/coordinator.py
@@ -21,12 +21,26 @@ type AuroraAbbConfigEntry = ConfigEntry[AuroraAbbDataUpdateCoordinator]
 class AuroraAbbDataUpdateCoordinator(DataUpdateCoordinator[dict[str, float]]):
     """Class to manage fetching AuroraAbbPowerone data."""
 
-    def __init__(self, hass: HomeAssistant, comport: str, address: int) -> None:
+    config_entry: AuroraAbbConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: AuroraAbbConfigEntry,
+        comport: str,
+        address: int,
+    ) -> None:
         """Initialize the data update coordinator."""
         self.available_prev = False
         self.available = False
         self.client = AuroraSerialClient(address, comport, parity="N", timeout=1)
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=SCAN_INTERVAL)
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=SCAN_INTERVAL,
+        )
 
     def _update_data(self) -> dict[str, float]:
         """Fetch new state data for the sensors.
diff --git a/homeassistant/components/aurora_abb_powerone/sensor.py b/homeassistant/components/aurora_abb_powerone/sensor.py
index 29d5cab2667..d35d8a2d8cb 100644
--- a/homeassistant/components/aurora_abb_powerone/sensor.py
+++ b/homeassistant/components/aurora_abb_powerone/sensor.py
@@ -26,7 +26,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -130,7 +130,7 @@ SENSOR_TYPES = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AuroraAbbConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up aurora_abb_powerone sensor based on a config entry."""
 
diff --git a/homeassistant/components/aurora_abb_powerone/strings.json b/homeassistant/components/aurora_abb_powerone/strings.json
index 319bcb0adc4..6b28d9d8c1c 100644
--- a/homeassistant/components/aurora_abb_powerone/strings.json
+++ b/homeassistant/components/aurora_abb_powerone/strings.json
@@ -11,7 +11,7 @@
     },
     "error": {
       "cannot_connect": "Unable to connect, please check serial port, address, electrical connection and that inverter is on (in daylight)",
-      "invalid_serial_port": "Serial port is not a valid device or could not be openned",
+      "invalid_serial_port": "Serial port is not a valid device or could not be opened",
       "cannot_open_serial_port": "Cannot open serial port, please check and try again"
     },
     "abort": {
diff --git a/homeassistant/components/aussie_broadband/__init__.py b/homeassistant/components/aussie_broadband/__init__.py
index 52b48b1d0d6..673df594e89 100644
--- a/homeassistant/components/aussie_broadband/__init__.py
+++ b/homeassistant/components/aussie_broadband/__init__.py
@@ -45,7 +45,7 @@ async def async_setup_entry(
     # Initiate a Data Update Coordinator for each service
     for service in services:
         service["coordinator"] = AussieBroadbandDataUpdateCoordinator(
-            hass, client, service["service_id"]
+            hass, entry, client, service["service_id"]
         )
         await service["coordinator"].async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/aussie_broadband/coordinator.py b/homeassistant/components/aussie_broadband/coordinator.py
index 844442985c0..20987c5f30f 100644
--- a/homeassistant/components/aussie_broadband/coordinator.py
+++ b/homeassistant/components/aussie_broadband/coordinator.py
@@ -34,11 +34,20 @@ type AussieBroadbandConfigEntry = ConfigEntry[list[AussieBroadbandServiceData]]
 class AussieBroadbandDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Aussie Broadand data update coordinator."""
 
-    def __init__(self, hass: HomeAssistant, client: AussieBB, service_id: str) -> None:
+    config_entry: AussieBroadbandConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: AussieBroadbandConfigEntry,
+        client: AussieBB,
+        service_id: str,
+    ) -> None:
         """Initialize Atag coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=f"Aussie Broadband {service_id}",
             update_interval=timedelta(minutes=DEFAULT_UPDATE_INTERVAL),
         )
diff --git a/homeassistant/components/aussie_broadband/sensor.py b/homeassistant/components/aussie_broadband/sensor.py
index 49da78da8de..41a2f164095 100644
--- a/homeassistant/components/aussie_broadband/sensor.py
+++ b/homeassistant/components/aussie_broadband/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import UnitOfInformation, UnitOfTime
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -123,7 +123,7 @@ SENSOR_DESCRIPTIONS: tuple[SensorValueEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AussieBroadbandConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Aussie Broadband sensor platform from a config entry."""
 
diff --git a/homeassistant/components/autarco/__init__.py b/homeassistant/components/autarco/__init__.py
index f42bfdf4a0e..a524535c122 100644
--- a/homeassistant/components/autarco/__init__.py
+++ b/homeassistant/components/autarco/__init__.py
@@ -6,18 +6,15 @@ import asyncio
 
 from autarco import Autarco, AutarcoConnectionError
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .coordinator import AutarcoDataUpdateCoordinator
+from .coordinator import AutarcoConfigEntry, AutarcoDataUpdateCoordinator
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
-type AutarcoConfigEntry = ConfigEntry[list[AutarcoDataUpdateCoordinator]]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: AutarcoConfigEntry) -> bool:
     """Set up Autarco from a config entry."""
@@ -34,7 +31,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: AutarcoConfigEntry) -> b
         raise ConfigEntryNotReady from err
 
     coordinators: list[AutarcoDataUpdateCoordinator] = [
-        AutarcoDataUpdateCoordinator(hass, client, site) for site in account_sites
+        AutarcoDataUpdateCoordinator(hass, entry, client, site)
+        for site in account_sites
     ]
 
     await asyncio.gather(
diff --git a/homeassistant/components/autarco/coordinator.py b/homeassistant/components/autarco/coordinator.py
index dd8786bca25..deb40155443 100644
--- a/homeassistant/components/autarco/coordinator.py
+++ b/homeassistant/components/autarco/coordinator.py
@@ -22,6 +22,8 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .const import DOMAIN, LOGGER, SCAN_INTERVAL
 
+type AutarcoConfigEntry = ConfigEntry[list[AutarcoDataUpdateCoordinator]]
+
 
 class AutarcoData(NamedTuple):
     """Class for defining data in dict."""
@@ -35,11 +37,12 @@ class AutarcoData(NamedTuple):
 class AutarcoDataUpdateCoordinator(DataUpdateCoordinator[AutarcoData]):
     """Class to manage fetching Autarco data from the API."""
 
-    config_entry: ConfigEntry
+    config_entry: AutarcoConfigEntry
 
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: AutarcoConfigEntry,
         client: Autarco,
         account_site: AccountSite,
     ) -> None:
@@ -47,6 +50,7 @@ class AutarcoDataUpdateCoordinator(DataUpdateCoordinator[AutarcoData]):
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/autarco/diagnostics.py b/homeassistant/components/autarco/diagnostics.py
index c865a38ffd8..a2dd0c5a361 100644
--- a/homeassistant/components/autarco/diagnostics.py
+++ b/homeassistant/components/autarco/diagnostics.py
@@ -6,7 +6,7 @@ from typing import Any
 
 from homeassistant.core import HomeAssistant
 
-from . import AutarcoConfigEntry, AutarcoDataUpdateCoordinator
+from .coordinator import AutarcoConfigEntry, AutarcoDataUpdateCoordinator
 
 
 async def async_get_config_entry_diagnostics(
diff --git a/homeassistant/components/autarco/sensor.py b/homeassistant/components/autarco/sensor.py
index c870197a504..1635adefdb8 100644
--- a/homeassistant/components/autarco/sensor.py
+++ b/homeassistant/components/autarco/sensor.py
@@ -16,13 +16,12 @@ from homeassistant.components.sensor import (
 from homeassistant.const import PERCENTAGE, UnitOfEnergy, UnitOfPower
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import AutarcoConfigEntry
 from .const import DOMAIN
-from .coordinator import AutarcoDataUpdateCoordinator
+from .coordinator import AutarcoConfigEntry, AutarcoDataUpdateCoordinator
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -173,7 +172,7 @@ SENSORS_INVERTER: tuple[AutarcoInverterSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AutarcoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Autarco sensors based on a config entry."""
     entities: list[SensorEntity] = []
diff --git a/homeassistant/components/auth/mfa_setup_flow.py b/homeassistant/components/auth/mfa_setup_flow.py
index c9efb081a01..6c85f5b7f55 100644
--- a/homeassistant/components/auth/mfa_setup_flow.py
+++ b/homeassistant/components/auth/mfa_setup_flow.py
@@ -12,7 +12,7 @@ from homeassistant import data_entry_flow
 from homeassistant.components import websocket_api
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.data_entry_flow import FlowContext
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.util.hass_dict import HassKey
 
 WS_TYPE_SETUP_MFA = "auth/setup_mfa"
diff --git a/homeassistant/components/automation/__init__.py b/homeassistant/components/automation/__init__.py
index 4e6b098ef1e..856060f8c75 100644
--- a/homeassistant/components/automation/__init__.py
+++ b/homeassistant/components/automation/__init__.py
@@ -48,8 +48,7 @@ from homeassistant.core import (
     valid_entity_id,
 )
 from homeassistant.exceptions import HomeAssistantError, ServiceNotFound, TemplateError
-from homeassistant.helpers import condition
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import condition, config_validation as cv
 from homeassistant.helpers.entity import ToggleEntity
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.issue_registry import (
diff --git a/homeassistant/components/avea/light.py b/homeassistant/components/avea/light.py
index 48471b41633..ec39a6f371c 100644
--- a/homeassistant/components/avea/light.py
+++ b/homeassistant/components/avea/light.py
@@ -16,7 +16,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.color as color_util
+from homeassistant.util import color as color_util
 
 
 def setup_platform(
diff --git a/homeassistant/components/avion/light.py b/homeassistant/components/avion/light.py
index 687405e3064..5b9371e0e2b 100644
--- a/homeassistant/components/avion/light.py
+++ b/homeassistant/components/avion/light.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
     CONF_USERNAME,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/awair/coordinator.py b/homeassistant/components/awair/coordinator.py
index 78f0d9d65f2..62725693522 100644
--- a/homeassistant/components/awair/coordinator.py
+++ b/homeassistant/components/awair/coordinator.py
@@ -40,17 +40,24 @@ class AwairResult:
 class AwairDataUpdateCoordinator(DataUpdateCoordinator[dict[str, AwairResult]]):
     """Define a wrapper class to update Awair data."""
 
+    config_entry: AwairConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
-        config_entry: ConfigEntry,
+        config_entry: AwairConfigEntry,
         update_interval: timedelta | None,
     ) -> None:
         """Set up the AwairDataUpdateCoordinator class."""
-        self._config_entry = config_entry
         self.title = config_entry.title
 
-        super().__init__(hass, LOGGER, name=DOMAIN, update_interval=update_interval)
+        super().__init__(
+            hass,
+            LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=update_interval,
+        )
 
     async def _fetch_air_data(self, device: AwairBaseDevice) -> AwairResult:
         """Fetch latest air quality data."""
@@ -64,7 +71,10 @@ class AwairCloudDataUpdateCoordinator(AwairDataUpdateCoordinator):
     """Define a wrapper class to update Awair data from Cloud API."""
 
     def __init__(
-        self, hass: HomeAssistant, config_entry: ConfigEntry, session: ClientSession
+        self,
+        hass: HomeAssistant,
+        config_entry: AwairConfigEntry,
+        session: ClientSession,
     ) -> None:
         """Set up the AwairCloudDataUpdateCoordinator class."""
         access_token = config_entry.data[CONF_ACCESS_TOKEN]
@@ -95,7 +105,10 @@ class AwairLocalDataUpdateCoordinator(AwairDataUpdateCoordinator):
     _device: AwairLocalDevice | None = None
 
     def __init__(
-        self, hass: HomeAssistant, config_entry: ConfigEntry, session: ClientSession
+        self,
+        hass: HomeAssistant,
+        config_entry: AwairConfigEntry,
+        session: ClientSession,
     ) -> None:
         """Set up the AwairLocalDataUpdateCoordinator class."""
         self._awair = AwairLocal(
diff --git a/homeassistant/components/awair/sensor.py b/homeassistant/components/awair/sensor.py
index c92009d9b1b..a0c4b5ba8fe 100644
--- a/homeassistant/components/awair/sensor.py
+++ b/homeassistant/components/awair/sensor.py
@@ -29,7 +29,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
@@ -133,7 +133,7 @@ SENSOR_TYPES_DUST: tuple[AwairSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AwairConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Awair sensor entity based on a config entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/aws/manifest.json b/homeassistant/components/aws/manifest.json
index 12149e4388a..92ae37c857b 100644
--- a/homeassistant/components/aws/manifest.json
+++ b/homeassistant/components/aws/manifest.json
@@ -6,5 +6,5 @@
   "iot_class": "cloud_push",
   "loggers": ["aiobotocore", "botocore"],
   "quality_scale": "legacy",
-  "requirements": ["aiobotocore==2.13.1", "botocore==1.34.131"]
+  "requirements": ["aiobotocore==2.21.1", "botocore==1.37.1"]
 }
diff --git a/homeassistant/components/axis/binary_sensor.py b/homeassistant/components/axis/binary_sensor.py
index d6f132874b6..6933380c094 100644
--- a/homeassistant/components/axis/binary_sensor.py
+++ b/homeassistant/components/axis/binary_sensor.py
@@ -18,7 +18,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 
 from . import AxisConfigEntry
@@ -178,7 +178,7 @@ ENTITY_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AxisConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Axis binary sensor."""
     config_entry.runtime_data.entity_loader.register_platform(
diff --git a/homeassistant/components/axis/camera.py b/homeassistant/components/axis/camera.py
index a5a00bcd1ab..089a018ee5b 100644
--- a/homeassistant/components/axis/camera.py
+++ b/homeassistant/components/axis/camera.py
@@ -7,7 +7,7 @@ from homeassistant.components.mjpeg import MjpegCamera, filter_urllib3_logging
 from homeassistant.const import HTTP_DIGEST_AUTHENTICATION
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AxisConfigEntry
 from .const import DEFAULT_STREAM_PROFILE, DEFAULT_VIDEO_SOURCE
@@ -18,7 +18,7 @@ from .hub import AxisHub
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AxisConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Axis camera video stream."""
     filter_urllib3_logging()
diff --git a/homeassistant/components/axis/light.py b/homeassistant/components/axis/light.py
index d0d144a28fa..0c6015efced 100644
--- a/homeassistant/components/axis/light.py
+++ b/homeassistant/components/axis/light.py
@@ -12,7 +12,7 @@ from homeassistant.components.light import (
     LightEntityDescription,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AxisConfigEntry
 from .entity import TOPIC_TO_EVENT_TYPE, AxisEventDescription, AxisEventEntity
@@ -46,7 +46,7 @@ ENTITY_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AxisConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Axis light platform."""
     config_entry.runtime_data.entity_loader.register_platform(
diff --git a/homeassistant/components/axis/switch.py b/homeassistant/components/axis/switch.py
index 17824302871..55250b5f489 100644
--- a/homeassistant/components/axis/switch.py
+++ b/homeassistant/components/axis/switch.py
@@ -12,7 +12,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AxisConfigEntry
 from .entity import AxisEventDescription, AxisEventEntity
@@ -39,7 +39,7 @@ ENTITY_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: AxisConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Axis switch platform."""
     config_entry.runtime_data.entity_loader.register_platform(
diff --git a/homeassistant/components/azure_devops/__init__.py b/homeassistant/components/azure_devops/__init__.py
index 9890d47fbb5..0522e9778df 100644
--- a/homeassistant/components/azure_devops/__init__.py
+++ b/homeassistant/components/azure_devops/__init__.py
@@ -9,9 +9,7 @@ from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
 from .const import CONF_PAT, CONF_PROJECT
-from .coordinator import AzureDevOpsDataUpdateCoordinator
-
-type AzureDevOpsConfigEntry = ConfigEntry[AzureDevOpsDataUpdateCoordinator]
+from .coordinator import AzureDevOpsConfigEntry, AzureDevOpsDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -22,11 +20,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AzureDevOpsConfigEntry)
     """Set up Azure DevOps from a config entry."""
 
     # Create the data update coordinator
-    coordinator = AzureDevOpsDataUpdateCoordinator(
-        hass,
-        _LOGGER,
-        entry=entry,
-    )
+    coordinator = AzureDevOpsDataUpdateCoordinator(hass, entry, _LOGGER)
 
     # Store the coordinator in runtime data
     entry.runtime_data = coordinator
diff --git a/homeassistant/components/azure_devops/coordinator.py b/homeassistant/components/azure_devops/coordinator.py
index 21fb76560c3..efbecfbcd19 100644
--- a/homeassistant/components/azure_devops/coordinator.py
+++ b/homeassistant/components/azure_devops/coordinator.py
@@ -28,6 +28,8 @@ from .data import AzureDevOpsData
 BUILDS_QUERY: Final = "?queryOrder=queueTimeDescending&maxBuildsPerDefinition=1"
 IGNORED_CATEGORIES: Final[list[Category]] = [Category.COMPLETED, Category.REMOVED]
 
+type AzureDevOpsConfigEntry = ConfigEntry[AzureDevOpsDataUpdateCoordinator]
+
 
 def ado_exception_none_handler(func: Callable) -> Callable:
     """Handle exceptions or None to always return a value or raise."""
@@ -50,28 +52,29 @@ class AzureDevOpsDataUpdateCoordinator(DataUpdateCoordinator[AzureDevOpsData]):
     """Class to manage and fetch Azure DevOps data."""
 
     client: DevOpsClient
+    config_entry: AzureDevOpsConfigEntry
     organization: str
     project: Project
 
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: AzureDevOpsConfigEntry,
         logger: logging.Logger,
-        *,
-        entry: ConfigEntry,
     ) -> None:
         """Initialize global Azure DevOps data updater."""
-        self.title = entry.title
+        self.title = config_entry.title
 
         super().__init__(
             hass=hass,
             logger=logger,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=300),
         )
 
         self.client = DevOpsClient(session=async_get_clientsession(hass))
-        self.organization = entry.data[CONF_ORG]
+        self.organization = config_entry.data[CONF_ORG]
 
     @ado_exception_none_handler
     async def authorize(
diff --git a/homeassistant/components/azure_devops/sensor.py b/homeassistant/components/azure_devops/sensor.py
index fd47115214a..55c821a119e 100644
--- a/homeassistant/components/azure_devops/sensor.py
+++ b/homeassistant/components/azure_devops/sensor.py
@@ -17,12 +17,11 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util import dt as dt_util
 
-from . import AzureDevOpsConfigEntry
-from .coordinator import AzureDevOpsDataUpdateCoordinator
+from .coordinator import AzureDevOpsConfigEntry, AzureDevOpsDataUpdateCoordinator
 from .entity import AzureDevOpsEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -146,7 +145,7 @@ def parse_datetime(value: str | None) -> datetime | None:
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AzureDevOpsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Azure DevOps sensor based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/azure_devops/strings.json b/homeassistant/components/azure_devops/strings.json
index f5fe5cd06a7..611a8b9a758 100644
--- a/homeassistant/components/azure_devops/strings.json
+++ b/homeassistant/components/azure_devops/strings.json
@@ -14,7 +14,7 @@
           "personal_access_token": "Personal Access Token (PAT)"
         },
         "description": "Set up an Azure DevOps instance to access your project. A Personal Access Token is only required for a private project.",
-        "title": "Add Azure DevOps Project"
+        "title": "Add Azure DevOps project"
       },
       "reauth_confirm": {
         "data": {
@@ -32,7 +32,7 @@
   "entity": {
     "sensor": {
       "build_id": {
-        "name": "{definition_name} latest build id"
+        "name": "{definition_name} latest build ID"
       },
       "finish_time": {
         "name": "{definition_name} latest build finish time"
@@ -59,7 +59,7 @@
         "name": "{definition_name} latest build start time"
       },
       "url": {
-        "name": "{definition_name} latest build url"
+        "name": "{definition_name} latest build URL"
       },
       "work_item_count": {
         "name": "{item_type} {item_state} work items"
@@ -68,7 +68,7 @@
   },
   "exceptions": {
     "authentication_failed": {
-      "message": "Could not authorize with Azure DevOps for {title}. You will need to update your personal access token."
+      "message": "Could not authorize with Azure DevOps for {title}. You will need to update your Personal Access Token."
     }
   }
 }
diff --git a/homeassistant/components/azure_event_hub/__init__.py b/homeassistant/components/azure_event_hub/__init__.py
index bc9d34e728e..abe6cdfe15f 100644
--- a/homeassistant/components/azure_event_hub/__init__.py
+++ b/homeassistant/components/azure_event_hub/__init__.py
@@ -19,7 +19,7 @@ from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import MATCH_ALL
 from homeassistant.core import Event, HomeAssistant, State
 from homeassistant.exceptions import ConfigEntryNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entityfilter import FILTER_SCHEMA, EntityFilter
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.json import JSONEncoder
diff --git a/homeassistant/components/azure_service_bus/notify.py b/homeassistant/components/azure_service_bus/notify.py
index a0aa36804c3..83eb8076fef 100644
--- a/homeassistant/components/azure_service_bus/notify.py
+++ b/homeassistant/components/azure_service_bus/notify.py
@@ -23,7 +23,7 @@ from homeassistant.components.notify import (
 )
 from homeassistant.const import CONTENT_TYPE_JSON
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 CONF_CONNECTION_STRING = "connection_string"
diff --git a/homeassistant/components/azure_storage/__init__.py b/homeassistant/components/azure_storage/__init__.py
new file mode 100644
index 00000000000..f22e7b70c12
--- /dev/null
+++ b/homeassistant/components/azure_storage/__init__.py
@@ -0,0 +1,86 @@
+"""The Azure Storage integration."""
+
+from aiohttp import ClientTimeout
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceNotFoundError,
+)
+from azure.core.pipeline.transport._aiohttp import (
+    AioHttpTransport,
+)  # need to import from private file, as it is not properly imported in the init
+from azure.storage.blob.aio import ContainerClient
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import (
+    ConfigEntryAuthFailed,
+    ConfigEntryError,
+    ConfigEntryNotReady,
+)
+from homeassistant.helpers.aiohttp_client import async_create_clientsession
+
+from .const import (
+    CONF_ACCOUNT_NAME,
+    CONF_CONTAINER_NAME,
+    CONF_STORAGE_ACCOUNT_KEY,
+    DATA_BACKUP_AGENT_LISTENERS,
+    DOMAIN,
+)
+
+type AzureStorageConfigEntry = ConfigEntry[ContainerClient]
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: AzureStorageConfigEntry
+) -> bool:
+    """Set up Azure Storage integration."""
+    # set increase aiohttp timeout for long running operations (up/download)
+    session = async_create_clientsession(
+        hass, timeout=ClientTimeout(connect=10, total=12 * 60 * 60)
+    )
+    container_client = ContainerClient(
+        account_url=f"https://{entry.data[CONF_ACCOUNT_NAME]}.blob.core.windows.net/",
+        container_name=entry.data[CONF_CONTAINER_NAME],
+        credential=entry.data[CONF_STORAGE_ACCOUNT_KEY],
+        transport=AioHttpTransport(session=session),
+    )
+
+    try:
+        if not await container_client.exists():
+            await container_client.create_container()
+    except ResourceNotFoundError as err:
+        raise ConfigEntryError(
+            translation_domain=DOMAIN,
+            translation_key="account_not_found",
+            translation_placeholders={CONF_ACCOUNT_NAME: entry.data[CONF_ACCOUNT_NAME]},
+        ) from err
+    except ClientAuthenticationError as err:
+        raise ConfigEntryAuthFailed(
+            translation_domain=DOMAIN,
+            translation_key="invalid_auth",
+            translation_placeholders={CONF_ACCOUNT_NAME: entry.data[CONF_ACCOUNT_NAME]},
+        ) from err
+    except HttpResponseError as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="cannot_connect",
+            translation_placeholders={CONF_ACCOUNT_NAME: entry.data[CONF_ACCOUNT_NAME]},
+        ) from err
+
+    entry.runtime_data = container_client
+
+    def _async_notify_backup_listeners() -> None:
+        for listener in hass.data.get(DATA_BACKUP_AGENT_LISTENERS, []):
+            listener()
+
+    entry.async_on_unload(entry.async_on_state_change(_async_notify_backup_listeners))
+
+    return True
+
+
+async def async_unload_entry(
+    hass: HomeAssistant, entry: AzureStorageConfigEntry
+) -> bool:
+    """Unload an Azure Storage config entry."""
+    return True
diff --git a/homeassistant/components/azure_storage/backup.py b/homeassistant/components/azure_storage/backup.py
new file mode 100644
index 00000000000..4d897126d3d
--- /dev/null
+++ b/homeassistant/components/azure_storage/backup.py
@@ -0,0 +1,182 @@
+"""Support for Azure Storage backup."""
+
+from __future__ import annotations
+
+from collections.abc import AsyncIterator, Callable, Coroutine
+from functools import wraps
+import json
+import logging
+from typing import Any, Concatenate
+
+from azure.core.exceptions import HttpResponseError
+from azure.storage.blob import BlobProperties
+
+from homeassistant.components.backup import (
+    AgentBackup,
+    BackupAgent,
+    BackupAgentError,
+    BackupNotFound,
+    suggested_filename,
+)
+from homeassistant.core import HomeAssistant, callback
+
+from . import AzureStorageConfigEntry
+from .const import DATA_BACKUP_AGENT_LISTENERS, DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+METADATA_VERSION = "1"
+
+
+async def async_get_backup_agents(
+    hass: HomeAssistant,
+) -> list[BackupAgent]:
+    """Return a list of backup agents."""
+    entries: list[AzureStorageConfigEntry] = hass.config_entries.async_loaded_entries(
+        DOMAIN
+    )
+    return [AzureStorageBackupAgent(hass, entry) for entry in entries]
+
+
+@callback
+def async_register_backup_agents_listener(
+    hass: HomeAssistant,
+    *,
+    listener: Callable[[], None],
+    **kwargs: Any,
+) -> Callable[[], None]:
+    """Register a listener to be called when agents are added or removed."""
+    hass.data.setdefault(DATA_BACKUP_AGENT_LISTENERS, []).append(listener)
+
+    @callback
+    def remove_listener() -> None:
+        """Remove the listener."""
+        hass.data[DATA_BACKUP_AGENT_LISTENERS].remove(listener)
+        if not hass.data[DATA_BACKUP_AGENT_LISTENERS]:
+            hass.data.pop(DATA_BACKUP_AGENT_LISTENERS)
+
+    return remove_listener
+
+
+def handle_backup_errors[_R, **P](
+    func: Callable[Concatenate[AzureStorageBackupAgent, P], Coroutine[Any, Any, _R]],
+) -> Callable[Concatenate[AzureStorageBackupAgent, P], Coroutine[Any, Any, _R]]:
+    """Handle backup errors."""
+
+    @wraps(func)
+    async def wrapper(
+        self: AzureStorageBackupAgent, *args: P.args, **kwargs: P.kwargs
+    ) -> _R:
+        try:
+            return await func(self, *args, **kwargs)
+        except HttpResponseError as err:
+            _LOGGER.debug(
+                "Error during backup in %s: Status %s, message %s",
+                func.__name__,
+                err.status_code,
+                err.message,
+                exc_info=True,
+            )
+            raise BackupAgentError(
+                f"Error during backup operation in {func.__name__}:"
+                f" Status {err.status_code}, message: {err.message}"
+            ) from err
+
+    return wrapper
+
+
+class AzureStorageBackupAgent(BackupAgent):
+    """Azure storage backup agent."""
+
+    domain = DOMAIN
+
+    def __init__(self, hass: HomeAssistant, entry: AzureStorageConfigEntry) -> None:
+        """Initialize the Azure storage backup agent."""
+        super().__init__()
+        self._client = entry.runtime_data
+        self.name = entry.title
+        self.unique_id = entry.entry_id
+
+    @handle_backup_errors
+    async def async_download_backup(
+        self,
+        backup_id: str,
+        **kwargs: Any,
+    ) -> AsyncIterator[bytes]:
+        """Download a backup file."""
+        blob = await self._find_blob_by_backup_id(backup_id)
+        if blob is None:
+            raise BackupNotFound(f"Backup {backup_id} not found")
+        download_stream = await self._client.download_blob(blob.name)
+        return download_stream.chunks()
+
+    @handle_backup_errors
+    async def async_upload_backup(
+        self,
+        *,
+        open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
+        backup: AgentBackup,
+        **kwargs: Any,
+    ) -> None:
+        """Upload a backup."""
+
+        metadata = {
+            "metadata_version": METADATA_VERSION,
+            "backup_id": backup.backup_id,
+            "backup_metadata": json.dumps(backup.as_dict()),
+        }
+
+        await self._client.upload_blob(
+            name=suggested_filename(backup),
+            metadata=metadata,
+            data=await open_stream(),
+            length=backup.size,
+        )
+
+    @handle_backup_errors
+    async def async_delete_backup(
+        self,
+        backup_id: str,
+        **kwargs: Any,
+    ) -> None:
+        """Delete a backup file."""
+        blob = await self._find_blob_by_backup_id(backup_id)
+        if blob is None:
+            raise BackupNotFound(f"Backup {backup_id} not found")
+        await self._client.delete_blob(blob.name)
+
+    @handle_backup_errors
+    async def async_list_backups(self, **kwargs: Any) -> list[AgentBackup]:
+        """List backups."""
+        backups: list[AgentBackup] = []
+        async for blob in self._client.list_blobs(include="metadata"):
+            metadata = blob.metadata
+
+            if metadata.get("metadata_version") == METADATA_VERSION:
+                backups.append(
+                    AgentBackup.from_dict(json.loads(metadata["backup_metadata"]))
+                )
+
+        return backups
+
+    @handle_backup_errors
+    async def async_get_backup(
+        self,
+        backup_id: str,
+        **kwargs: Any,
+    ) -> AgentBackup:
+        """Return a backup."""
+        blob = await self._find_blob_by_backup_id(backup_id)
+        if blob is None:
+            raise BackupNotFound(f"Backup {backup_id} not found")
+
+        return AgentBackup.from_dict(json.loads(blob.metadata["backup_metadata"]))
+
+    async def _find_blob_by_backup_id(self, backup_id: str) -> BlobProperties | None:
+        """Find a blob by backup id."""
+        async for blob in self._client.list_blobs(include="metadata"):
+            if (
+                backup_id == blob.metadata.get("backup_id", "")
+                and blob.metadata.get("metadata_version") == METADATA_VERSION
+            ):
+                return blob
+        return None
diff --git a/homeassistant/components/azure_storage/config_flow.py b/homeassistant/components/azure_storage/config_flow.py
new file mode 100644
index 00000000000..2862d290f95
--- /dev/null
+++ b/homeassistant/components/azure_storage/config_flow.py
@@ -0,0 +1,160 @@
+"""Config flow for Azure Storage integration."""
+
+from collections.abc import Mapping
+import logging
+from typing import Any
+
+from azure.core.exceptions import ClientAuthenticationError, ResourceNotFoundError
+from azure.core.pipeline.transport._aiohttp import (
+    AioHttpTransport,
+)  # need to import from private file, as it is not properly imported in the init
+from azure.storage.blob.aio import ContainerClient
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+
+from .const import (
+    CONF_ACCOUNT_NAME,
+    CONF_CONTAINER_NAME,
+    CONF_STORAGE_ACCOUNT_KEY,
+    DOMAIN,
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class AzureStorageConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for azure storage."""
+
+    def get_account_url(self, account_name: str) -> str:
+        """Get the account URL."""
+        return f"https://{account_name}.blob.core.windows.net/"
+
+    async def validate_config(
+        self, container_client: ContainerClient
+    ) -> dict[str, str]:
+        """Validate the configuration."""
+        errors: dict[str, str] = {}
+        try:
+            await container_client.exists()
+        except ResourceNotFoundError:
+            errors["base"] = "cannot_connect"
+        except ClientAuthenticationError:
+            errors[CONF_STORAGE_ACCOUNT_KEY] = "invalid_auth"
+        except Exception:
+            _LOGGER.exception("Unknown exception occurred")
+            errors["base"] = "unknown"
+        return errors
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """User step for Azure Storage."""
+
+        errors: dict[str, str] = {}
+
+        if user_input is not None:
+            self._async_abort_entries_match(
+                {CONF_ACCOUNT_NAME: user_input[CONF_ACCOUNT_NAME]}
+            )
+            container_client = ContainerClient(
+                account_url=self.get_account_url(user_input[CONF_ACCOUNT_NAME]),
+                container_name=user_input[CONF_CONTAINER_NAME],
+                credential=user_input[CONF_STORAGE_ACCOUNT_KEY],
+                transport=AioHttpTransport(session=async_get_clientsession(self.hass)),
+            )
+            errors = await self.validate_config(container_client)
+
+            if not errors:
+                return self.async_create_entry(
+                    title=f"{user_input[CONF_ACCOUNT_NAME]}/{user_input[CONF_CONTAINER_NAME]}",
+                    data=user_input,
+                )
+
+        return self.async_show_form(
+            data_schema=vol.Schema(
+                {
+                    vol.Required(CONF_ACCOUNT_NAME): str,
+                    vol.Required(
+                        CONF_CONTAINER_NAME, default="home-assistant-backups"
+                    ): str,
+                    vol.Required(CONF_STORAGE_ACCOUNT_KEY): str,
+                }
+            ),
+            errors=errors,
+        )
+
+    async def async_step_reauth(
+        self, entry_data: Mapping[str, Any]
+    ) -> ConfigFlowResult:
+        """Perform reauth upon an API authentication error."""
+        return await self.async_step_reauth_confirm()
+
+    async def async_step_reauth_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Confirm reauth dialog."""
+        errors: dict[str, str] = {}
+        reauth_entry = self._get_reauth_entry()
+
+        if user_input is not None:
+            container_client = ContainerClient(
+                account_url=self.get_account_url(reauth_entry.data[CONF_ACCOUNT_NAME]),
+                container_name=reauth_entry.data[CONF_CONTAINER_NAME],
+                credential=user_input[CONF_STORAGE_ACCOUNT_KEY],
+                transport=AioHttpTransport(session=async_get_clientsession(self.hass)),
+            )
+            errors = await self.validate_config(container_client)
+            if not errors:
+                return self.async_update_reload_and_abort(
+                    reauth_entry,
+                    data={**reauth_entry.data, **user_input},
+                )
+        return self.async_show_form(
+            step_id="reauth_confirm",
+            data_schema=vol.Schema(
+                {
+                    vol.Required(CONF_STORAGE_ACCOUNT_KEY): str,
+                }
+            ),
+            errors=errors,
+        )
+
+    async def async_step_reconfigure(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Reconfigure the entry."""
+        errors: dict[str, str] = {}
+        reconfigure_entry = self._get_reconfigure_entry()
+
+        if user_input is not None:
+            container_client = ContainerClient(
+                account_url=self.get_account_url(
+                    reconfigure_entry.data[CONF_ACCOUNT_NAME]
+                ),
+                container_name=user_input[CONF_CONTAINER_NAME],
+                credential=user_input[CONF_STORAGE_ACCOUNT_KEY],
+                transport=AioHttpTransport(session=async_get_clientsession(self.hass)),
+            )
+            errors = await self.validate_config(container_client)
+            if not errors:
+                return self.async_update_reload_and_abort(
+                    reconfigure_entry,
+                    data={**reconfigure_entry.data, **user_input},
+                )
+        return self.async_show_form(
+            data_schema=vol.Schema(
+                {
+                    vol.Required(
+                        CONF_CONTAINER_NAME,
+                        default=reconfigure_entry.data[CONF_CONTAINER_NAME],
+                    ): str,
+                    vol.Required(
+                        CONF_STORAGE_ACCOUNT_KEY,
+                        default=reconfigure_entry.data[CONF_STORAGE_ACCOUNT_KEY],
+                    ): str,
+                }
+            ),
+            errors=errors,
+        )
diff --git a/homeassistant/components/azure_storage/const.py b/homeassistant/components/azure_storage/const.py
new file mode 100644
index 00000000000..efcb338a096
--- /dev/null
+++ b/homeassistant/components/azure_storage/const.py
@@ -0,0 +1,16 @@
+"""Constants for the Azure Storage integration."""
+
+from collections.abc import Callable
+from typing import Final
+
+from homeassistant.util.hass_dict import HassKey
+
+DOMAIN: Final = "azure_storage"
+
+CONF_STORAGE_ACCOUNT_KEY: Final = "storage_account_key"
+CONF_ACCOUNT_NAME: Final = "account_name"
+CONF_CONTAINER_NAME: Final = "container_name"
+
+DATA_BACKUP_AGENT_LISTENERS: HassKey[list[Callable[[], None]]] = HassKey(
+    f"{DOMAIN}.backup_agent_listeners"
+)
diff --git a/homeassistant/components/azure_storage/manifest.json b/homeassistant/components/azure_storage/manifest.json
new file mode 100644
index 00000000000..729334f851d
--- /dev/null
+++ b/homeassistant/components/azure_storage/manifest.json
@@ -0,0 +1,12 @@
+{
+  "domain": "azure_storage",
+  "name": "Azure Storage",
+  "codeowners": ["@zweckj"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/azure_storage",
+  "integration_type": "service",
+  "iot_class": "cloud_polling",
+  "loggers": ["azure-storage-blob"],
+  "quality_scale": "platinum",
+  "requirements": ["azure-storage-blob==12.24.0"]
+}
diff --git a/homeassistant/components/azure_storage/quality_scale.yaml b/homeassistant/components/azure_storage/quality_scale.yaml
new file mode 100644
index 00000000000..6199ba514a3
--- /dev/null
+++ b/homeassistant/components/azure_storage/quality_scale.yaml
@@ -0,0 +1,133 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: Integration does not register custom actions.
+  appropriate-polling:
+    status: exempt
+    comment: |
+      This integration does not poll.
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: |
+      This integration does not have any custom actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup:
+    status: exempt
+    comment: |
+      Entities of this integration does not explicitly subscribe to events.
+  entity-unique-id:
+    status: exempt
+    comment: |
+      This integration does not have entities.
+  has-entity-name:
+    status: exempt
+    comment: |
+      This integration does not have entities.
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions: done
+  config-entry-unloading: done
+  docs-configuration-parameters:
+    status: exempt
+    comment: |
+      This integration does not have any configuration parameters.
+  docs-installation-parameters: done
+  entity-unavailable:
+    status: exempt
+    comment: |
+      This integration does not have entities.
+  integration-owner: done
+  log-when-unavailable:
+    status: exempt
+    comment: |
+      This integration does not have entities.
+  parallel-updates:
+    status: exempt
+    comment: |
+      This integration does not have platforms.
+  reauthentication-flow: done
+  test-coverage: done
+
+  # Gold
+  devices:
+    status: exempt
+    comment: |
+      This integration connects to a single service.
+  diagnostics:
+    status: exempt
+    comment: |
+      There is no data to diagnose.
+  discovery-update-info:
+    status: exempt
+    comment: |
+      This integration is a cloud service and does not support discovery.
+  discovery:
+    status: exempt
+    comment: |
+      This integration is a cloud service and does not support discovery.
+  docs-data-update:
+    status: exempt
+    comment: |
+      This integration does not poll or push.
+  docs-examples:
+    status: exempt
+    comment: |
+      This integration only serves backup.
+  docs-known-limitations: done
+  docs-supported-devices:
+    status: exempt
+    comment: |
+      This integration is a cloud service.
+  docs-supported-functions:
+    status: exempt
+    comment: |
+      This integration does not have entities.
+  docs-troubleshooting: done
+  docs-use-cases: done
+  dynamic-devices:
+    status: exempt
+    comment: |
+      This integration connects to a single service.
+  entity-category:
+    status: exempt
+    comment: |
+      This integration does not have entities.
+  entity-device-class:
+    status: exempt
+    comment: |
+      This integration does not have entities.
+  entity-disabled-by-default:
+    status: exempt
+    comment: |
+      This integration does not have entities.
+  entity-translations:
+    status: exempt
+    comment: |
+      This integration does not have entities.
+  exception-translations: done
+  icon-translations:
+    status: exempt
+    comment: |
+      This integration does not have entities.
+  reconfiguration-flow: done
+  repair-issues: done
+  stale-devices:
+    status: exempt
+    comment: |
+      This integration connects to a single service.
+  # Platinum
+  async-dependency: done
+  inject-websession: done
+  strict-typing: done
diff --git a/homeassistant/components/azure_storage/strings.json b/homeassistant/components/azure_storage/strings.json
new file mode 100644
index 00000000000..e9053f113cc
--- /dev/null
+++ b/homeassistant/components/azure_storage/strings.json
@@ -0,0 +1,72 @@
+{
+  "config": {
+    "error": {
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "step": {
+      "user": {
+        "data": {
+          "storage_account_key": "Storage account key",
+          "account_name": "Account name",
+          "container_name": "Container name"
+        },
+        "data_description": {
+          "storage_account_key": "Storage account access key used for authorization",
+          "account_name": "Name of the storage account",
+          "container_name": "Name of the storage container to be used (will be created if it does not exist)"
+        },
+        "description": "Set up an Azure (Blob) storage account to be used for backups.",
+        "title": "Add Azure storage account"
+      },
+      "reauth_confirm": {
+        "data": {
+          "storage_account_key": "[%key:component::azure_storage::config::step::user::data::storage_account_key%]"
+        },
+        "data_description": {
+          "storage_account_key": "[%key:component::azure_storage::config::step::user::data_description::storage_account_key%]"
+        },
+        "description": "Provide a new storage account key.",
+        "title": "Reauthenticate Azure storage account"
+      },
+      "reconfigure": {
+        "data": {
+          "container_name": "[%key:component::azure_storage::config::step::user::data::container_name%]",
+          "storage_account_key": "[%key:component::azure_storage::config::step::user::data::storage_account_key%]"
+        },
+        "data_description": {
+          "container_name": "[%key:component::azure_storage::config::step::user::data_description::container_name%]",
+          "storage_account_key": "[%key:component::azure_storage::config::step::user::data_description::storage_account_key%]"
+        },
+        "description": "Change the settings of the Azure storage integration.",
+        "title": "Reconfigure Azure storage account"
+      }
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
+    }
+  },
+  "issues": {
+    "container_not_found": {
+      "title": "Storage container not found",
+      "description": "The storage container {container_name} has not been found in the storage account. Please re-create it manually, then fix this issue."
+    }
+  },
+  "exceptions": {
+    "account_not_found": {
+      "message": "Storage account {account_name} not found"
+    },
+    "cannot_connect": {
+      "message": "Can not connect to storage account {account_name}"
+    },
+    "invalid_auth": {
+      "message": "Authentication failed for storage account {account_name}"
+    },
+    "container_not_found": {
+      "message": "Storage container {container_name} not found"
+    }
+  }
+}
diff --git a/homeassistant/components/backup/__init__.py b/homeassistant/components/backup/__init__.py
index 8d25a0c25cb..124ce8b872c 100644
--- a/homeassistant/components/backup/__init__.py
+++ b/homeassistant/components/backup/__init__.py
@@ -1,7 +1,10 @@
 """The Backup integration."""
 
+from homeassistant.config_entries import SOURCE_SYSTEM
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, ServiceCall
-from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery_flow
+from homeassistant.helpers.backup import DATA_BACKUP
 from homeassistant.helpers.hassio import is_hassio
 from homeassistant.helpers.typing import ConfigType
 
@@ -15,22 +18,33 @@ from .agent import (
     BackupAgentPlatformProtocol,
     LocalBackupAgent,
 )
+from .config import BackupConfig, CreateBackupParametersDict
 from .const import DATA_MANAGER, DOMAIN
+from .coordinator import BackupConfigEntry, BackupDataUpdateCoordinator
 from .http import async_register_http_views
 from .manager import (
     BackupManager,
+    BackupManagerError,
+    BackupPlatformEvent,
     BackupPlatformProtocol,
     BackupReaderWriter,
     BackupReaderWriterError,
     CoreBackupReaderWriter,
     CreateBackupEvent,
+    CreateBackupStage,
+    CreateBackupState,
+    IdleEvent,
     IncorrectPasswordError,
     ManagerBackup,
+    ManagerStateEvent,
     NewBackup,
     RestoreBackupEvent,
+    RestoreBackupStage,
+    RestoreBackupState,
     WrittenBackup,
 )
-from .models import AddonInfo, AgentBackup, Folder
+from .models import AddonInfo, AgentBackup, BackupNotFound, Folder
+from .util import suggested_filename, suggested_filename_from_name_date
 from .websocket import async_register_websocket_handlers
 
 __all__ = [
@@ -39,19 +53,34 @@ __all__ = [
     "BackupAgent",
     "BackupAgentError",
     "BackupAgentPlatformProtocol",
+    "BackupConfig",
+    "BackupManagerError",
+    "BackupNotFound",
+    "BackupPlatformEvent",
     "BackupPlatformProtocol",
     "BackupReaderWriter",
     "BackupReaderWriterError",
     "CreateBackupEvent",
+    "CreateBackupParametersDict",
+    "CreateBackupStage",
+    "CreateBackupState",
     "Folder",
+    "IdleEvent",
     "IncorrectPasswordError",
     "LocalBackupAgent",
     "ManagerBackup",
+    "ManagerStateEvent",
     "NewBackup",
     "RestoreBackupEvent",
+    "RestoreBackupStage",
+    "RestoreBackupState",
     "WrittenBackup",
+    "suggested_filename",
+    "suggested_filename_from_name_date",
 ]
 
+PLATFORMS = [Platform.SENSOR]
+
 CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 
 
@@ -70,7 +99,13 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
     backup_manager = BackupManager(hass, reader_writer)
     hass.data[DATA_MANAGER] = backup_manager
-    await backup_manager.async_setup()
+    try:
+        await backup_manager.async_setup()
+    except Exception as err:
+        hass.data[DATA_BACKUP].manager_ready.set_exception(err)
+        raise
+    else:
+        hass.data[DATA_BACKUP].manager_ready.set_result(None)
 
     async_register_websocket_handlers(hass, with_hassio)
 
@@ -90,18 +125,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
     async def async_handle_create_automatic_service(call: ServiceCall) -> None:
         """Service handler for creating automatic backups."""
-        config_data = backup_manager.config.data
-        await backup_manager.async_create_backup(
-            agent_ids=config_data.create_backup.agent_ids,
-            include_addons=config_data.create_backup.include_addons,
-            include_all_addons=config_data.create_backup.include_all_addons,
-            include_database=config_data.create_backup.include_database,
-            include_folders=config_data.create_backup.include_folders,
-            include_homeassistant=True,  # always include HA
-            name=config_data.create_backup.name,
-            password=config_data.create_backup.password,
-            with_automatic_settings=True,
-        )
+        await backup_manager.async_create_automatic_backup()
 
     if not with_hassio:
         hass.services.async_register(DOMAIN, "create", async_handle_create_service)
@@ -111,4 +135,28 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
     async_register_http_views(hass)
 
+    discovery_flow.async_create_flow(
+        hass, DOMAIN, context={"source": SOURCE_SYSTEM}, data={}
+    )
+
     return True
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: BackupConfigEntry) -> bool:
+    """Set up a config entry."""
+    backup_manager: BackupManager = hass.data[DATA_MANAGER]
+    coordinator = BackupDataUpdateCoordinator(hass, entry, backup_manager)
+    await coordinator.async_config_entry_first_refresh()
+
+    entry.async_on_unload(coordinator.async_unsubscribe)
+
+    entry.runtime_data = coordinator
+
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: BackupConfigEntry) -> bool:
+    """Unload a config entry."""
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/backup/agent.py b/homeassistant/components/backup/agent.py
index cb03327e941..8093ac88338 100644
--- a/homeassistant/components/backup/agent.py
+++ b/homeassistant/components/backup/agent.py
@@ -10,18 +10,14 @@ from typing import Any, Protocol
 from propcache.api import cached_property
 
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.exceptions import HomeAssistantError
 
-from .models import AgentBackup
-
-
-class BackupAgentError(HomeAssistantError):
-    """Base class for backup agent errors."""
+from .models import AgentBackup, BackupAgentError
 
 
 class BackupAgentUnreachableError(BackupAgentError):
     """Raised when the agent can't reach its API."""
 
+    error_code = "backup_agent_unreachable"
     _message = "The backup agent is unreachable."
 
 
@@ -30,11 +26,12 @@ class BackupAgent(abc.ABC):
 
     domain: str
     name: str
+    unique_id: str
 
     @cached_property
     def agent_id(self) -> str:
         """Return the agent_id."""
-        return f"{self.domain}.{self.name}"
+        return f"{self.domain}.{self.unique_id}"
 
     @abc.abstractmethod
     async def async_download_backup(
@@ -44,6 +41,8 @@ class BackupAgent(abc.ABC):
     ) -> AsyncIterator[bytes]:
         """Download a backup file.
 
+        Raises BackupNotFound if the backup does not exist.
+
         :param backup_id: The ID of the backup that was returned in async_list_backups.
         :return: An async iterator that yields bytes.
         """
@@ -70,6 +69,8 @@ class BackupAgent(abc.ABC):
     ) -> None:
         """Delete a backup file.
 
+        Raises BackupNotFound if the backup does not exist.
+
         :param backup_id: The ID of the backup that was returned in async_list_backups.
         """
 
@@ -82,8 +83,11 @@ class BackupAgent(abc.ABC):
         self,
         backup_id: str,
         **kwargs: Any,
-    ) -> AgentBackup | None:
-        """Return a backup."""
+    ) -> AgentBackup:
+        """Return a backup.
+
+        Raises BackupNotFound if the backup does not exist.
+        """
 
 
 class LocalBackupAgent(BackupAgent):
@@ -91,11 +95,16 @@ class LocalBackupAgent(BackupAgent):
 
     @abc.abstractmethod
     def get_backup_path(self, backup_id: str) -> Path:
-        """Return the local path to a backup.
+        """Return the local path to an existing backup.
 
         The method should return the path to the backup file with the specified id.
+        Raises BackupAgentError if the backup does not exist.
         """
 
+    @abc.abstractmethod
+    def get_new_backup_path(self, backup: AgentBackup) -> Path:
+        """Return the local path to a new backup."""
+
 
 class BackupAgentPlatformProtocol(Protocol):
     """Define the format of backup platforms which implement backup agents."""
diff --git a/homeassistant/components/backup/backup.py b/homeassistant/components/backup/backup.py
index ef4924161c2..de2cfecb1a5 100644
--- a/homeassistant/components/backup/backup.py
+++ b/homeassistant/components/backup/backup.py
@@ -13,8 +13,8 @@ from homeassistant.helpers.hassio import is_hassio
 
 from .agent import BackupAgent, LocalBackupAgent
 from .const import DOMAIN, LOGGER
-from .models import AgentBackup
-from .util import read_backup
+from .models import AgentBackup, BackupNotFound
+from .util import read_backup, suggested_filename
 
 
 async def async_get_backup_agents(
@@ -32,13 +32,14 @@ class CoreLocalBackupAgent(LocalBackupAgent):
 
     domain = DOMAIN
     name = "local"
+    unique_id = "local"
 
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize the backup agent."""
         super().__init__()
         self._hass = hass
         self._backup_dir = Path(hass.config.path("backups"))
-        self._backups: dict[str, AgentBackup] = {}
+        self._backups: dict[str, tuple[AgentBackup, Path]] = {}
         self._loaded_backups = False
 
     async def _load_backups(self) -> None:
@@ -48,13 +49,13 @@ class CoreLocalBackupAgent(LocalBackupAgent):
         self._backups = backups
         self._loaded_backups = True
 
-    def _read_backups(self) -> dict[str, AgentBackup]:
+    def _read_backups(self) -> dict[str, tuple[AgentBackup, Path]]:
         """Read backups from disk."""
-        backups: dict[str, AgentBackup] = {}
+        backups: dict[str, tuple[AgentBackup, Path]] = {}
         for backup_path in self._backup_dir.glob("*.tar"):
             try:
                 backup = read_backup(backup_path)
-                backups[backup.backup_id] = backup
+                backups[backup.backup_id] = (backup, backup_path)
             except (OSError, TarError, json.JSONDecodeError, KeyError) as err:
                 LOGGER.warning("Unable to read backup %s: %s", backup_path, err)
         return backups
@@ -75,27 +76,27 @@ class CoreLocalBackupAgent(LocalBackupAgent):
         **kwargs: Any,
     ) -> None:
         """Upload a backup."""
-        self._backups[backup.backup_id] = backup
+        self._backups[backup.backup_id] = (backup, self.get_new_backup_path(backup))
 
     async def async_list_backups(self, **kwargs: Any) -> list[AgentBackup]:
         """List backups."""
         if not self._loaded_backups:
             await self._load_backups()
-        return list(self._backups.values())
+        return [backup for backup, _ in self._backups.values()]
 
     async def async_get_backup(
         self,
         backup_id: str,
         **kwargs: Any,
-    ) -> AgentBackup | None:
+    ) -> AgentBackup:
         """Return a backup."""
         if not self._loaded_backups:
             await self._load_backups()
 
-        if not (backup := self._backups.get(backup_id)):
-            return None
+        if backup_id not in self._backups:
+            raise BackupNotFound(f"Backup {backup_id} not found")
 
-        backup_path = self.get_backup_path(backup_id)
+        backup, backup_path = self._backups[backup_id]
         if not await self._hass.async_add_executor_job(backup_path.exists):
             LOGGER.debug(
                 (
@@ -106,18 +107,28 @@ class CoreLocalBackupAgent(LocalBackupAgent):
                 backup_path,
             )
             self._backups.pop(backup_id)
-            return None
+            raise BackupNotFound(f"Backup {backup_id} not found")
 
         return backup
 
     def get_backup_path(self, backup_id: str) -> Path:
-        """Return the local path to a backup."""
-        return self._backup_dir / f"{backup_id}.tar"
+        """Return the local path to an existing backup.
+
+        Raises BackupAgentError if the backup does not exist.
+        """
+        try:
+            return self._backups[backup_id][1]
+        except KeyError as err:
+            raise BackupNotFound(f"Backup {backup_id} does not exist") from err
+
+    def get_new_backup_path(self, backup: AgentBackup) -> Path:
+        """Return the local path to a new backup."""
+        return self._backup_dir / suggested_filename(backup)
 
     async def async_delete_backup(self, backup_id: str, **kwargs: Any) -> None:
         """Delete a backup file."""
-        if await self.async_get_backup(backup_id) is None:
-            return
+        if not self._loaded_backups:
+            await self._load_backups()
 
         backup_path = self.get_backup_path(backup_id)
         await self._hass.async_add_executor_job(backup_path.unlink, True)
diff --git a/homeassistant/components/backup/basic_websocket.py b/homeassistant/components/backup/basic_websocket.py
new file mode 100644
index 00000000000..614dc23a927
--- /dev/null
+++ b/homeassistant/components/backup/basic_websocket.py
@@ -0,0 +1,38 @@
+"""Websocket commands for the Backup integration."""
+
+from typing import Any
+
+import voluptuous as vol
+
+from homeassistant.components import websocket_api
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.backup import async_subscribe_events
+
+from .const import DATA_MANAGER
+from .manager import ManagerStateEvent
+
+
+@callback
+def async_register_websocket_handlers(hass: HomeAssistant) -> None:
+    """Register websocket commands."""
+    websocket_api.async_register_command(hass, handle_subscribe_events)
+
+
+@websocket_api.require_admin
+@websocket_api.websocket_command({vol.Required("type"): "backup/subscribe_events"})
+@websocket_api.async_response
+async def handle_subscribe_events(
+    hass: HomeAssistant,
+    connection: websocket_api.ActiveConnection,
+    msg: dict[str, Any],
+) -> None:
+    """Subscribe to backup events."""
+
+    def on_event(event: ManagerStateEvent) -> None:
+        connection.send_message(websocket_api.event_message(msg["id"], event))
+
+    if DATA_MANAGER in hass.data:
+        manager = hass.data[DATA_MANAGER]
+        on_event(manager.last_event)
+    connection.subscriptions[msg["id"]] = async_subscribe_events(hass, on_event)
+    connection.send_result(msg["id"])
diff --git a/homeassistant/components/backup/config.py b/homeassistant/components/backup/config.py
index 8edd6cf0f2b..f4fa2e8bac6 100644
--- a/homeassistant/components/backup/config.py
+++ b/homeassistant/components/backup/config.py
@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-import asyncio
-from collections.abc import Callable
 from dataclasses import dataclass, field, replace
 import datetime as dt
 from datetime import datetime, timedelta
@@ -14,16 +12,19 @@ from typing import TYPE_CHECKING, Self, TypedDict
 from cronsim import CronSim
 
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import issue_registry as ir
 from homeassistant.helpers.event import async_call_later, async_track_point_in_time
 from homeassistant.helpers.typing import UNDEFINED, UndefinedType
 from homeassistant.util import dt as dt_util
 
-from .const import LOGGER
+from .const import DOMAIN, LOGGER
 from .models import BackupManagerError, Folder
 
 if TYPE_CHECKING:
     from .manager import BackupManager, ManagerBackup
 
+AUTOMATIC_BACKUP_AGENTS_UNAVAILABLE_ISSUE_ID = "automatic_backup_agents_unavailable"
+
 CRON_PATTERN_DAILY = "{m} {h} * * *"
 CRON_PATTERN_WEEKLY = "{m} {h} * * {d}"
 
@@ -40,6 +41,8 @@ BACKUP_START_TIME_JITTER = 60 * 60
 class StoredBackupConfig(TypedDict):
     """Represent the stored backup config."""
 
+    agents: dict[str, StoredAgentConfig]
+    automatic_backups_configured: bool
     create_backup: StoredCreateBackupConfig
     last_attempted_automatic_backup: str | None
     last_completed_automatic_backup: str | None
@@ -51,6 +54,8 @@ class StoredBackupConfig(TypedDict):
 class BackupConfigData:
     """Represent loaded backup config data."""
 
+    agents: dict[str, AgentConfig]
+    automatic_backups_configured: bool  # only used by frontend
     create_backup: CreateBackupConfig
     last_attempted_automatic_backup: datetime | None = None
     last_completed_automatic_backup: datetime | None = None
@@ -84,6 +89,11 @@ class BackupConfigData:
         days = [Day(day) for day in data["schedule"]["days"]]
 
         return cls(
+            agents={
+                agent_id: AgentConfig(protected=agent_data["protected"])
+                for agent_id, agent_data in data["agents"].items()
+            },
+            automatic_backups_configured=data["automatic_backups_configured"],
             create_backup=CreateBackupConfig(
                 agent_ids=data["create_backup"]["agent_ids"],
                 include_addons=data["create_backup"]["include_addons"],
@@ -120,6 +130,10 @@ class BackupConfigData:
             last_completed = None
 
         return StoredBackupConfig(
+            agents={
+                agent_id: agent.to_dict() for agent_id, agent in self.agents.items()
+            },
+            automatic_backups_configured=self.automatic_backups_configured,
             create_backup=self.create_backup.to_dict(),
             last_attempted_automatic_backup=last_attempted,
             last_completed_automatic_backup=last_completed,
@@ -134,10 +148,13 @@ class BackupConfig:
     def __init__(self, hass: HomeAssistant, manager: BackupManager) -> None:
         """Initialize backup config."""
         self.data = BackupConfigData(
+            agents={},
+            automatic_backups_configured=False,
             create_backup=CreateBackupConfig(),
             retention=RetentionConfig(),
             schedule=BackupSchedule(),
         )
+        self._hass = hass
         self._manager = manager
 
     def load(self, stored_config: StoredBackupConfig) -> None:
@@ -146,16 +163,31 @@ class BackupConfig:
         self.data.retention.apply(self._manager)
         self.data.schedule.apply(self._manager)
 
-    async def update(
+    @callback
+    def update(
         self,
         *,
+        agents: dict[str, AgentParametersDict] | UndefinedType = UNDEFINED,
+        automatic_backups_configured: bool | UndefinedType = UNDEFINED,
         create_backup: CreateBackupParametersDict | UndefinedType = UNDEFINED,
         retention: RetentionParametersDict | UndefinedType = UNDEFINED,
         schedule: ScheduleParametersDict | UndefinedType = UNDEFINED,
     ) -> None:
         """Update config."""
+        if agents is not UNDEFINED:
+            for agent_id, agent_config in agents.items():
+                if agent_id not in self.data.agents:
+                    self.data.agents[agent_id] = AgentConfig(**agent_config)
+                else:
+                    self.data.agents[agent_id] = replace(
+                        self.data.agents[agent_id], **agent_config
+                    )
+        if automatic_backups_configured is not UNDEFINED:
+            self.data.automatic_backups_configured = automatic_backups_configured
         if create_backup is not UNDEFINED:
             self.data.create_backup = replace(self.data.create_backup, **create_backup)
+            if "agent_ids" in create_backup:
+                check_unavailable_agents(self._hass, self._manager)
         if retention is not UNDEFINED:
             new_retention = RetentionConfig(**retention)
             if new_retention != self.data.retention:
@@ -170,6 +202,31 @@ class BackupConfig:
         self._manager.store.save()
 
 
+@dataclass(kw_only=True)
+class AgentConfig:
+    """Represent the config for an agent."""
+
+    protected: bool
+
+    def to_dict(self) -> StoredAgentConfig:
+        """Convert agent config to a dict."""
+        return {
+            "protected": self.protected,
+        }
+
+
+class StoredAgentConfig(TypedDict):
+    """Represent the stored config for an agent."""
+
+    protected: bool
+
+
+class AgentParametersDict(TypedDict, total=False):
+    """Represent the parameters for an agent."""
+
+    protected: bool
+
+
 @dataclass(kw_only=True)
 class RetentionConfig:
     """Represent the backup retention configuration."""
@@ -208,7 +265,7 @@ class RetentionConfig:
             """Delete backups older than days."""
             self._schedule_next(manager)
 
-            def _backups_filter(
+            def _delete_filter(
                 backups: dict[str, ManagerBackup],
             ) -> dict[str, ManagerBackup]:
                 """Return backups older than days to delete."""
@@ -225,7 +282,9 @@ class RetentionConfig:
                     < now
                 }
 
-            await _delete_filtered_backups(manager, _backups_filter)
+            await manager.async_delete_filtered_backups(
+                include_filter=_automatic_backups_filter, delete_filter=_delete_filter
+            )
 
         manager.remove_next_delete_event = async_call_later(
             manager.hass, timedelta(days=1), _delete_backups
@@ -390,22 +449,11 @@ class BackupSchedule:
         async def _create_backup(now: datetime) -> None:
             """Create backup."""
             manager.remove_next_backup_event = None
-            config_data = manager.config.data
             self._schedule_next(cron_pattern, manager)
 
             # create the backup
             try:
-                await manager.async_create_backup(
-                    agent_ids=config_data.create_backup.agent_ids,
-                    include_addons=config_data.create_backup.include_addons,
-                    include_all_addons=config_data.create_backup.include_all_addons,
-                    include_database=config_data.create_backup.include_database,
-                    include_folders=config_data.create_backup.include_folders,
-                    include_homeassistant=True,  # always include HA
-                    name=config_data.create_backup.name,
-                    password=config_data.create_backup.password,
-                    with_automatic_settings=True,
-                )
+                await manager.async_create_automatic_backup()
             except BackupManagerError as err:
                 LOGGER.error("Error creating backup: %s", err)
             except Exception:  # noqa: BLE001
@@ -488,74 +536,21 @@ class CreateBackupParametersDict(TypedDict, total=False):
     password: str | None
 
 
-async def _delete_filtered_backups(
-    manager: BackupManager,
-    backup_filter: Callable[[dict[str, ManagerBackup]], dict[str, ManagerBackup]],
-) -> None:
-    """Delete backups parsed with a filter.
-
-    :param manager: The backup manager.
-    :param backup_filter: A filter that should return the backups to delete.
-    """
-    backups, get_agent_errors = await manager.async_get_backups()
-    if get_agent_errors:
-        LOGGER.debug(
-            "Error getting backups; continuing anyway: %s",
-            get_agent_errors,
-        )
-
-    # only delete backups that are created with the saved automatic settings
-    backups = {
+def _automatic_backups_filter(
+    backups: dict[str, ManagerBackup],
+) -> dict[str, ManagerBackup]:
+    """Return automatic backups."""
+    return {
         backup_id: backup
         for backup_id, backup in backups.items()
         if backup.with_automatic_settings
     }
 
-    LOGGER.debug("Total automatic backups: %s", backups)
-
-    filtered_backups = backup_filter(backups)
-
-    if not filtered_backups:
-        return
-
-    # always delete oldest backup first
-    filtered_backups = dict(
-        sorted(
-            filtered_backups.items(),
-            key=lambda backup_item: backup_item[1].date,
-        )
-    )
-
-    if len(filtered_backups) >= len(backups):
-        # Never delete the last backup.
-        last_backup = filtered_backups.popitem()
-        LOGGER.debug("Keeping the last backup: %s", last_backup)
-
-    LOGGER.debug("Backups to delete: %s", filtered_backups)
-
-    if not filtered_backups:
-        return
-
-    backup_ids = list(filtered_backups)
-    delete_results = await asyncio.gather(
-        *(manager.async_delete_backup(backup_id) for backup_id in filtered_backups)
-    )
-    agent_errors = {
-        backup_id: error
-        for backup_id, error in zip(backup_ids, delete_results, strict=True)
-        if error
-    }
-    if agent_errors:
-        LOGGER.error(
-            "Error deleting old copies: %s",
-            agent_errors,
-        )
-
 
 async def delete_backups_exceeding_configured_count(manager: BackupManager) -> None:
     """Delete backups exceeding the configured retention count."""
 
-    def _backups_filter(
+    def _delete_filter(
         backups: dict[str, ManagerBackup],
     ) -> dict[str, ManagerBackup]:
         """Return oldest backups more numerous than copies to delete."""
@@ -570,4 +565,49 @@ async def delete_backups_exceeding_configured_count(manager: BackupManager) -> N
             )[: max(len(backups) - manager.config.data.retention.copies, 0)]
         )
 
-    await _delete_filtered_backups(manager, _backups_filter)
+    await manager.async_delete_filtered_backups(
+        include_filter=_automatic_backups_filter, delete_filter=_delete_filter
+    )
+
+
+@callback
+def check_unavailable_agents(hass: HomeAssistant, manager: BackupManager) -> None:
+    """Check for unavailable agents."""
+    if missing_agent_ids := set(manager.config.data.create_backup.agent_ids) - set(
+        manager.backup_agents
+    ):
+        LOGGER.debug(
+            "Agents %s are configured for automatic backup but are unavailable",
+            missing_agent_ids,
+        )
+
+    # Remove issues for unavailable agents that are not unavailable anymore.
+    issue_registry = ir.async_get(hass)
+    existing_missing_agent_issue_ids = {
+        issue_id
+        for domain, issue_id in issue_registry.issues
+        if domain == DOMAIN
+        and issue_id.startswith(AUTOMATIC_BACKUP_AGENTS_UNAVAILABLE_ISSUE_ID)
+    }
+    current_missing_agent_issue_ids = {
+        f"{AUTOMATIC_BACKUP_AGENTS_UNAVAILABLE_ISSUE_ID}_{agent_id}": agent_id
+        for agent_id in missing_agent_ids
+    }
+    for issue_id in existing_missing_agent_issue_ids - set(
+        current_missing_agent_issue_ids
+    ):
+        ir.async_delete_issue(hass, DOMAIN, issue_id)
+    for issue_id, agent_id in current_missing_agent_issue_ids.items():
+        ir.async_create_issue(
+            hass,
+            DOMAIN,
+            issue_id,
+            is_fixable=False,
+            learn_more_url="homeassistant://config/backup",
+            severity=ir.IssueSeverity.WARNING,
+            translation_key="automatic_backup_agents_unavailable",
+            translation_placeholders={
+                "agent_id": agent_id,
+                "backup_settings": "/config/backup/settings",
+            },
+        )
diff --git a/homeassistant/components/backup/config_flow.py b/homeassistant/components/backup/config_flow.py
new file mode 100644
index 00000000000..ab1f884ea86
--- /dev/null
+++ b/homeassistant/components/backup/config_flow.py
@@ -0,0 +1,21 @@
+"""Config flow for Home Assistant Backup integration."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+
+from .const import DOMAIN
+
+
+class BackupConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Home Assistant Backup."""
+
+    VERSION = 1
+
+    async def async_step_system(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the initial step."""
+        return self.async_create_entry(title="Backup", data={})
diff --git a/homeassistant/components/backup/const.py b/homeassistant/components/backup/const.py
index c2070a37b2d..773deaef174 100644
--- a/homeassistant/components/backup/const.py
+++ b/homeassistant/components/backup/const.py
@@ -16,8 +16,8 @@ DATA_MANAGER: HassKey[BackupManager] = HassKey(DOMAIN)
 LOGGER = getLogger(__package__)
 
 EXCLUDE_FROM_BACKUP = [
-    "__pycache__/*",
-    ".DS_Store",
+    "**/__pycache__/*",
+    "**/.DS_Store",
     ".HA_RESTORE",
     "*.db-shm",
     "*.log.*",
diff --git a/homeassistant/components/backup/coordinator.py b/homeassistant/components/backup/coordinator.py
new file mode 100644
index 00000000000..377f23567e0
--- /dev/null
+++ b/homeassistant/components/backup/coordinator.py
@@ -0,0 +1,81 @@
+"""Coordinator for Home Assistant Backup integration."""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+from datetime import datetime
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.backup import (
+    async_subscribe_events,
+    async_subscribe_platform_events,
+)
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+
+from .const import DOMAIN, LOGGER
+from .manager import (
+    BackupManager,
+    BackupManagerState,
+    BackupPlatformEvent,
+    ManagerStateEvent,
+)
+
+type BackupConfigEntry = ConfigEntry[BackupDataUpdateCoordinator]
+
+
+@dataclass
+class BackupCoordinatorData:
+    """Class to hold backup data."""
+
+    backup_manager_state: BackupManagerState
+    last_successful_automatic_backup: datetime | None
+    next_scheduled_automatic_backup: datetime | None
+
+
+class BackupDataUpdateCoordinator(DataUpdateCoordinator[BackupCoordinatorData]):
+    """Class to retrieve backup status."""
+
+    config_entry: ConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        backup_manager: BackupManager,
+    ) -> None:
+        """Initialize coordinator."""
+        super().__init__(
+            hass,
+            LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=None,
+        )
+        self.unsubscribe: list[Callable[[], None]] = [
+            async_subscribe_events(hass, self._on_event),
+            async_subscribe_platform_events(hass, self._on_event),
+        ]
+
+        self.backup_manager = backup_manager
+
+    @callback
+    def _on_event(self, event: ManagerStateEvent | BackupPlatformEvent) -> None:
+        """Handle new event."""
+        LOGGER.debug("Received backup event: %s", event)
+        self.config_entry.async_create_task(self.hass, self.async_refresh())
+
+    async def _async_update_data(self) -> BackupCoordinatorData:
+        """Update backup manager data."""
+        return BackupCoordinatorData(
+            self.backup_manager.state,
+            self.backup_manager.config.data.last_completed_automatic_backup,
+            self.backup_manager.config.data.schedule.next_automatic_backup,
+        )
+
+    @callback
+    def async_unsubscribe(self) -> None:
+        """Unsubscribe from events."""
+        for unsub in self.unsubscribe:
+            unsub()
diff --git a/homeassistant/components/backup/diagnostics.py b/homeassistant/components/backup/diagnostics.py
new file mode 100644
index 00000000000..9c3e28bde5b
--- /dev/null
+++ b/homeassistant/components/backup/diagnostics.py
@@ -0,0 +1,27 @@
+"""Diagnostics support for Home Assistant Backup integration."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.const import CONF_PASSWORD
+from homeassistant.core import HomeAssistant
+
+from .coordinator import BackupConfigEntry
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, entry: BackupConfigEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+    coordinator = entry.runtime_data
+    return {
+        "backup_agents": [
+            {"name": agent.name, "agent_id": agent.agent_id}
+            for agent in coordinator.backup_manager.backup_agents.values()
+        ],
+        "backup_config": async_redact_data(
+            coordinator.backup_manager.config.data.to_dict(), [CONF_PASSWORD]
+        ),
+    }
diff --git a/homeassistant/components/backup/entity.py b/homeassistant/components/backup/entity.py
new file mode 100644
index 00000000000..ff7c7889dc5
--- /dev/null
+++ b/homeassistant/components/backup/entity.py
@@ -0,0 +1,36 @@
+"""Base for backup entities."""
+
+from __future__ import annotations
+
+from homeassistant.const import __version__ as HA_VERSION
+from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
+from homeassistant.helpers.entity import EntityDescription
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+from .coordinator import BackupDataUpdateCoordinator
+
+
+class BackupManagerEntity(CoordinatorEntity[BackupDataUpdateCoordinator]):
+    """Base entity for backup manager."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: BackupDataUpdateCoordinator,
+        entity_description: EntityDescription,
+    ) -> None:
+        """Initialize base entity."""
+        super().__init__(coordinator)
+        self.entity_description = entity_description
+        self._attr_unique_id = entity_description.key
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, "backup_manager")},
+            manufacturer="Home Assistant",
+            model="Home Assistant Backup",
+            sw_version=HA_VERSION,
+            name="Backup",
+            entry_type=DeviceEntryType.SERVICE,
+            configuration_url="homeassistant://config/backup",
+        )
diff --git a/homeassistant/components/backup/http.py b/homeassistant/components/backup/http.py
index b909b2728a7..8f241e6363d 100644
--- a/homeassistant/components/backup/http.py
+++ b/homeassistant/components/backup/http.py
@@ -15,12 +15,14 @@ from multidict import istr
 from homeassistant.components.http import KEY_HASS, HomeAssistantView, require_admin
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import frame
 from homeassistant.util import slugify
 
 from . import util
 from .agent import BackupAgent
 from .const import DATA_MANAGER
 from .manager import BackupManager
+from .models import BackupNotFound
 
 
 @callback
@@ -58,24 +60,35 @@ class DownloadBackupView(HomeAssistantView):
         if agent_id not in manager.backup_agents:
             return Response(status=HTTPStatus.BAD_REQUEST)
         agent = manager.backup_agents[agent_id]
-        backup = await agent.async_get_backup(backup_id)
+        try:
+            backup = await agent.async_get_backup(backup_id)
+        except BackupNotFound:
+            return Response(status=HTTPStatus.NOT_FOUND)
 
-        # We don't need to check if the path exists, aiohttp.FileResponse will handle
-        # that
-        if backup is None:
+        # Check for None to be backwards compatible with the old BackupAgent API,
+        # this can be removed in HA Core 2025.10
+        if not backup:
+            frame.report_usage(
+                "returns None from BackupAgent.async_get_backup",
+                breaks_in_ha_version="2025.10",
+                integration_domain=agent_id.partition(".")[0],
+            )
             return Response(status=HTTPStatus.NOT_FOUND)
 
         headers = {
             CONTENT_DISPOSITION: f"attachment; filename={slugify(backup.name)}.tar"
         }
 
-        if not password:
-            return await self._send_backup_no_password(
-                request, headers, backup_id, agent_id, agent, manager
+        try:
+            if not password or not backup.protected:
+                return await self._send_backup_no_password(
+                    request, headers, backup_id, agent_id, agent, manager
+                )
+            return await self._send_backup_with_password(
+                hass, request, headers, backup_id, agent_id, password, agent, manager
             )
-        return await self._send_backup_with_password(
-            hass, request, headers, backup_id, agent_id, password, agent, manager
-        )
+        except BackupNotFound:
+            return Response(status=HTTPStatus.NOT_FOUND)
 
     async def _send_backup_no_password(
         self,
@@ -88,6 +101,8 @@ class DownloadBackupView(HomeAssistantView):
     ) -> StreamResponse | FileResponse | Response:
         if agent_id in manager.local_backup_agents:
             local_agent = manager.local_backup_agents[agent_id]
+            # We don't need to check if the path exists, aiohttp.FileResponse will
+            # handle that
             path = local_agent.get_backup_path(backup_id)
             return FileResponse(path=path.as_posix(), headers=headers)
 
@@ -123,13 +138,13 @@ class DownloadBackupView(HomeAssistantView):
 
         worker_done_event = asyncio.Event()
 
-        def on_done() -> None:
+        def on_done(error: Exception | None) -> None:
             """Call by the worker thread when it's done."""
             hass.loop.call_soon_threadsafe(worker_done_event.set)
 
         stream = util.AsyncIteratorWriter(hass)
         worker = threading.Thread(
-            target=util.decrypt_backup, args=[reader, stream, password, on_done]
+            target=util.decrypt_backup, args=[reader, stream, password, on_done, 0, []]
         )
         try:
             worker.start()
@@ -144,13 +159,17 @@ class DownloadBackupView(HomeAssistantView):
 
 
 class UploadBackupView(HomeAssistantView):
-    """Generate backup view."""
+    """Upload backup view."""
 
     url = "/api/backup/upload"
     name = "api:backup:upload"
 
     @require_admin
     async def post(self, request: Request) -> Response:
+        """Upload a backup file."""
+        return await self._post(request)
+
+    async def _post(self, request: Request) -> Response:
         """Upload a backup file."""
         try:
             agent_ids = request.query.getall("agent_id")
@@ -161,7 +180,9 @@ class UploadBackupView(HomeAssistantView):
         contents = cast(BodyPartReader, await reader.next())
 
         try:
-            await manager.async_receive_backup(contents=contents, agent_ids=agent_ids)
+            backup_id = await manager.async_receive_backup(
+                contents=contents, agent_ids=agent_ids
+            )
         except OSError as err:
             return Response(
                 body=f"Can't write backup file: {err}",
@@ -175,4 +196,4 @@ class UploadBackupView(HomeAssistantView):
         except asyncio.CancelledError:
             return Response(status=HTTPStatus.INTERNAL_SERVER_ERROR)
 
-        return Response(status=HTTPStatus.CREATED)
+        return self.json({"backup_id": backup_id}, status_code=HTTPStatus.CREATED)
diff --git a/homeassistant/components/backup/manager.py b/homeassistant/components/backup/manager.py
index 32979194980..43a7be6db8d 100644
--- a/homeassistant/components/backup/manager.py
+++ b/homeassistant/components/backup/manager.py
@@ -4,14 +4,17 @@ from __future__ import annotations
 
 import abc
 import asyncio
+from collections import defaultdict
 from collections.abc import AsyncIterator, Callable, Coroutine
-from dataclasses import dataclass
+from dataclasses import dataclass, replace
 from enum import StrEnum
 import hashlib
 import io
+from itertools import chain
 import json
 from pathlib import Path, PurePath
 import shutil
+import sys
 import tarfile
 import time
 from typing import IO, TYPE_CHECKING, Any, Protocol, TypedDict, cast
@@ -19,17 +22,23 @@ from typing import IO, TYPE_CHECKING, Any, Protocol, TypedDict, cast
 import aiohttp
 from securetar import SecureTarFile, atomic_contents_add
 
-from homeassistant.backup_restore import RESTORE_BACKUP_FILE, password_to_key
+from homeassistant.backup_restore import (
+    RESTORE_BACKUP_FILE,
+    RESTORE_BACKUP_RESULT_FILE,
+    password_to_key,
+)
 from homeassistant.const import __version__ as HAVERSION
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import (
+    frame,
     instance_id,
     integration_platform,
     issue_registry as ir,
+    start,
 )
+from homeassistant.helpers.backup import DATA_BACKUP
 from homeassistant.helpers.json import json_bytes
-from homeassistant.util import dt as dt_util
+from homeassistant.util import dt as dt_util, json as json_util
 
 from . import util as backup_util
 from .agent import (
@@ -38,7 +47,12 @@ from .agent import (
     BackupAgentPlatformProtocol,
     LocalBackupAgent,
 )
-from .config import BackupConfig, delete_backups_exceeding_configured_count
+from .config import (
+    BackupConfig,
+    CreateBackupParametersDict,
+    check_unavailable_agents,
+    delete_backups_exceeding_configured_count,
+)
 from .const import (
     BUF_SIZE,
     DATA_MANAGER,
@@ -47,10 +61,20 @@ from .const import (
     EXCLUDE_FROM_BACKUP,
     LOGGER,
 )
-from .models import AgentBackup, BackupManagerError, Folder
+from .models import (
+    AgentBackup,
+    BackupError,
+    BackupManagerError,
+    BackupNotFound,
+    BackupReaderWriterError,
+    BaseBackup,
+    Folder,
+)
 from .store import BackupStore
 from .util import (
     AsyncIteratorReader,
+    DecryptedBackupStreamer,
+    EncryptedBackupStreamer,
     make_backup_dir,
     read_backup,
     validate_password,
@@ -66,10 +90,18 @@ class NewBackup:
 
 
 @dataclass(frozen=True, kw_only=True, slots=True)
-class ManagerBackup(AgentBackup):
+class AgentBackupStatus:
+    """Agent specific backup attributes."""
+
+    protected: bool
+    size: int
+
+
+@dataclass(frozen=True, kw_only=True, slots=True)
+class ManagerBackup(BaseBackup):
     """Backup class."""
 
-    agent_ids: list[str]
+    agents: dict[str, AgentBackupStatus]
     failed_agent_ids: list[str]
     with_automatic_settings: bool | None
 
@@ -88,6 +120,7 @@ class BackupManagerState(StrEnum):
 
     IDLE = "idle"
     CREATE_BACKUP = "create_backup"
+    BLOCKED = "blocked"
     RECEIVE_BACKUP = "receive_backup"
     RESTORE_BACKUP = "restore_backup"
 
@@ -171,6 +204,7 @@ class CreateBackupEvent(ManagerStateEvent):
     """Backup in progress."""
 
     manager_state: BackupManagerState = BackupManagerState.CREATE_BACKUP
+    reason: str | None
     stage: CreateBackupStage | None
     state: CreateBackupState
 
@@ -180,6 +214,7 @@ class ReceiveBackupEvent(ManagerStateEvent):
     """Backup receive."""
 
     manager_state: BackupManagerState = BackupManagerState.RECEIVE_BACKUP
+    reason: str | None
     stage: ReceiveBackupStage | None
     state: ReceiveBackupState
 
@@ -189,10 +224,25 @@ class RestoreBackupEvent(ManagerStateEvent):
     """Backup restore."""
 
     manager_state: BackupManagerState = BackupManagerState.RESTORE_BACKUP
+    reason: str | None
     stage: RestoreBackupStage | None
     state: RestoreBackupState
 
 
+@dataclass(frozen=True, kw_only=True, slots=True)
+class BackupPlatformEvent:
+    """Backup platform class."""
+
+    domain: str
+
+
+@dataclass(frozen=True, kw_only=True, slots=True)
+class BlockedEvent(ManagerStateEvent):
+    """Backup manager blocked, Home Assistant is starting."""
+
+    manager_state: BackupManagerState = BackupManagerState.BLOCKED
+
+
 class BackupPlatformProtocol(Protocol):
     """Define the format that backup platforms can have."""
 
@@ -249,23 +299,39 @@ class BackupReaderWriter(abc.ABC):
     ) -> None:
         """Restore a backup."""
 
+    @abc.abstractmethod
+    async def async_resume_restore_progress_after_restart(
+        self,
+        *,
+        on_progress: Callable[[RestoreBackupEvent | IdleEvent], None],
+    ) -> None:
+        """Get restore events after core restart."""
 
-class BackupReaderWriterError(HomeAssistantError):
-    """Backup reader/writer error."""
+    @abc.abstractmethod
+    async def async_validate_config(self, *, config: BackupConfig) -> None:
+        """Validate backup config."""
 
 
 class IncorrectPasswordError(BackupReaderWriterError):
     """Raised when the password is incorrect."""
 
+    error_code = "password_incorrect"
     _message = "The password provided is incorrect."
 
 
 class DecryptOnDowloadNotSupported(BackupManagerError):
     """Raised when on-the-fly decryption is not supported."""
 
+    error_code = "decrypt_on_download_not_supported"
     _message = "On-the-fly decryption is not supported for this backup."
 
 
+class BackupManagerExceptionGroup(BackupManagerError, ExceptionGroup):
+    """Raised when multiple exceptions occur."""
+
+    error_code = "multiple_errors"
+
+
 class BackupManager:
     """Define the format that backup managers can have."""
 
@@ -291,8 +357,14 @@ class BackupManager:
         self.remove_next_delete_event: Callable[[], None] | None = None
 
         # Latest backup event and backup event subscribers
-        self.last_event: ManagerStateEvent = IdleEvent()
-        self._backup_event_subscriptions: list[Callable[[ManagerStateEvent], None]] = []
+        self.last_event: ManagerStateEvent = BlockedEvent()
+        self.last_action_event: ManagerStateEvent | None = None
+        self._backup_event_subscriptions = hass.data[
+            DATA_BACKUP
+        ].backup_event_subscriptions
+        self._backup_platform_event_subscriptions = hass.data[
+            DATA_BACKUP
+        ].backup_platform_event_subscriptions
 
     async def async_setup(self) -> None:
         """Set up the backup manager."""
@@ -301,6 +373,20 @@ class BackupManager:
             self.config.load(stored["config"])
             self.known_backups.load(stored["backups"])
 
+        await self._reader_writer.async_validate_config(config=self.config)
+
+        await self._reader_writer.async_resume_restore_progress_after_restart(
+            on_progress=self.async_on_backup_event
+        )
+
+        async def set_manager_idle_after_start(hass: HomeAssistant) -> None:
+            """Set manager to idle after start."""
+            self.async_on_backup_event(IdleEvent())
+
+        if self.state == BackupManagerState.BLOCKED:
+            # If we're not finishing a restore job, set the manager to idle after start
+            start.async_at_started(self.hass, set_manager_idle_after_start)
+
         await self.load_platforms()
 
     @property
@@ -369,6 +455,13 @@ class BackupManager:
             }
         )
 
+        @callback
+        def check_unavailable_agents_after_start(hass: HomeAssistant) -> None:
+            """Check unavailable agents after start."""
+            check_unavailable_agents(hass, self)
+
+        start.async_at_started(self.hass, check_unavailable_agents_after_start)
+
     async def _add_platform(
         self,
         hass: HomeAssistant,
@@ -382,6 +475,9 @@ class BackupManager:
         LOGGER.debug("%s platforms loaded in total", len(self.platforms))
         LOGGER.debug("%s agents loaded in total", len(self.backup_agents))
         LOGGER.debug("%s local agents loaded in total", len(self.local_backup_agents))
+        event = BackupPlatformEvent(domain=integration_domain)
+        for subscription in self._backup_platform_event_subscriptions:
+            subscription(event)
 
     async def async_pre_backup_actions(self) -> None:
         """Perform pre backup actions."""
@@ -430,20 +526,61 @@ class BackupManager:
         backup: AgentBackup,
         agent_ids: list[str],
         open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
+        password: str | None,
     ) -> dict[str, Exception]:
         """Upload a backup to selected agents."""
         agent_errors: dict[str, Exception] = {}
 
         LOGGER.debug("Uploading backup %s to agents %s", backup.backup_id, agent_ids)
 
-        sync_backup_results = await asyncio.gather(
-            *(
-                self.backup_agents[agent_id].async_upload_backup(
-                    open_stream=open_stream,
-                    backup=backup,
+        async def upload_backup_to_agent(agent_id: str) -> None:
+            """Upload backup to a single agent, and encrypt or decrypt as needed."""
+            config = self.config.data.agents.get(agent_id)
+            should_encrypt = config.protected if config else password is not None
+            streamer: DecryptedBackupStreamer | EncryptedBackupStreamer | None = None
+            if should_encrypt == backup.protected or password is None:
+                # The backup we're uploading is already in the correct state, or we
+                # don't have a password to encrypt or decrypt it
+                LOGGER.debug(
+                    "Uploading backup %s to agent %s as is", backup.backup_id, agent_id
                 )
-                for agent_id in agent_ids
-            ),
+                open_stream_func = open_stream
+                _backup = backup
+            elif should_encrypt:
+                # The backup we're uploading is not encrypted, but the agent requires it
+                LOGGER.debug(
+                    "Uploading encrypted backup %s to agent %s",
+                    backup.backup_id,
+                    agent_id,
+                )
+                streamer = EncryptedBackupStreamer(
+                    self.hass, backup, open_stream, password
+                )
+            else:
+                # The backup we're uploading is encrypted, but the agent requires it
+                # decrypted
+                LOGGER.debug(
+                    "Uploading decrypted backup %s to agent %s",
+                    backup.backup_id,
+                    agent_id,
+                )
+                streamer = DecryptedBackupStreamer(
+                    self.hass, backup, open_stream, password
+                )
+            if streamer:
+                open_stream_func = streamer.open_stream
+                _backup = replace(
+                    backup, protected=should_encrypt, size=streamer.size()
+                )
+            await self.backup_agents[agent_id].async_upload_backup(
+                open_stream=open_stream_func,
+                backup=_backup,
+            )
+            if streamer:
+                await streamer.wait()
+
+        sync_backup_results = await asyncio.gather(
+            *(upload_backup_to_agent(agent_id) for agent_id in agent_ids),
             return_exceptions=True,
         )
         for idx, result in enumerate(sync_backup_results):
@@ -484,8 +621,15 @@ class BackupManager:
             return_exceptions=True,
         )
         for idx, result in enumerate(list_backups_results):
+            agent_id = agent_ids[idx]
             if isinstance(result, BackupAgentError):
-                agent_errors[agent_ids[idx]] = result
+                agent_errors[agent_id] = result
+                continue
+            if isinstance(result, Exception):
+                agent_errors[agent_id] = result
+                LOGGER.error(
+                    "Unexpected error for %s: %s", agent_id, result, exc_info=result
+                )
                 continue
             if isinstance(result, BaseException):
                 raise result  # unexpected error
@@ -499,7 +643,7 @@ class BackupManager:
                         agent_backup, await instance_id.async_get(self.hass)
                     )
                     backups[backup_id] = ManagerBackup(
-                        agent_ids=[],
+                        agents={},
                         addons=agent_backup.addons,
                         backup_id=backup_id,
                         date=agent_backup.date,
@@ -510,11 +654,12 @@ class BackupManager:
                         homeassistant_included=agent_backup.homeassistant_included,
                         homeassistant_version=agent_backup.homeassistant_version,
                         name=agent_backup.name,
-                        protected=agent_backup.protected,
-                        size=agent_backup.size,
                         with_automatic_settings=with_automatic_settings,
                     )
-                backups[backup_id].agent_ids.append(agent_ids[idx])
+                backups[backup_id].agents[agent_id] = AgentBackupStatus(
+                    protected=agent_backup.protected,
+                    size=agent_backup.size,
+                )
 
         return (backups, agent_errors)
 
@@ -534,12 +679,28 @@ class BackupManager:
             return_exceptions=True,
         )
         for idx, result in enumerate(get_backup_results):
+            agent_id = agent_ids[idx]
+            if isinstance(result, BackupNotFound):
+                continue
             if isinstance(result, BackupAgentError):
-                agent_errors[agent_ids[idx]] = result
+                agent_errors[agent_id] = result
+                continue
+            if isinstance(result, Exception):
+                agent_errors[agent_id] = result
+                LOGGER.error(
+                    "Unexpected error for %s: %s", agent_id, result, exc_info=result
+                )
                 continue
             if isinstance(result, BaseException):
                 raise result  # unexpected error
+            # Check for None to be backwards compatible with the old BackupAgent API,
+            # this can be removed in HA Core 2025.10
             if not result:
+                frame.report_usage(
+                    "returns None from BackupAgent.async_get_backup",
+                    breaks_in_ha_version="2025.10",
+                    integration_domain=agent_id.partition(".")[0],
+                )
                 continue
             if backup is None:
                 if known_backup := self.known_backups.get(backup_id):
@@ -550,7 +711,7 @@ class BackupManager:
                     result, await instance_id.async_get(self.hass)
                 )
                 backup = ManagerBackup(
-                    agent_ids=[],
+                    agents={},
                     addons=result.addons,
                     backup_id=result.backup_id,
                     date=result.date,
@@ -561,11 +722,12 @@ class BackupManager:
                     homeassistant_included=result.homeassistant_included,
                     homeassistant_version=result.homeassistant_version,
                     name=result.name,
-                    protected=result.protected,
-                    size=result.size,
                     with_automatic_settings=with_automatic_settings,
                 )
-            backup.agent_ids.append(agent_ids[idx])
+            backup.agents[agent_id] = AgentBackupStatus(
+                protected=result.protected,
+                size=result.size,
+            )
 
         return (backup, agent_errors)
 
@@ -585,21 +747,33 @@ class BackupManager:
             return None
         return with_automatic_settings
 
-    async def async_delete_backup(self, backup_id: str) -> dict[str, Exception]:
+    async def async_delete_backup(
+        self, backup_id: str, *, agent_ids: list[str] | None = None
+    ) -> dict[str, Exception]:
         """Delete a backup."""
         agent_errors: dict[str, Exception] = {}
-        agent_ids = list(self.backup_agents)
+        if agent_ids is None:
+            agent_ids = list(self.backup_agents)
 
         delete_backup_results = await asyncio.gather(
             *(
-                agent.async_delete_backup(backup_id)
-                for agent in self.backup_agents.values()
+                self.backup_agents[agent_id].async_delete_backup(backup_id)
+                for agent_id in agent_ids
             ),
             return_exceptions=True,
         )
         for idx, result in enumerate(delete_backup_results):
+            agent_id = agent_ids[idx]
+            if isinstance(result, BackupNotFound):
+                continue
             if isinstance(result, BackupAgentError):
-                agent_errors[agent_ids[idx]] = result
+                agent_errors[agent_id] = result
+                continue
+            if isinstance(result, Exception):
+                agent_errors[agent_id] = result
+                LOGGER.error(
+                    "Unexpected error for %s: %s", agent_id, result, exc_info=result
+                )
                 continue
             if isinstance(result, BaseException):
                 raise result  # unexpected error
@@ -609,29 +783,144 @@ class BackupManager:
 
         return agent_errors
 
+    async def async_delete_filtered_backups(
+        self,
+        *,
+        include_filter: Callable[[dict[str, ManagerBackup]], dict[str, ManagerBackup]],
+        delete_filter: Callable[[dict[str, ManagerBackup]], dict[str, ManagerBackup]],
+    ) -> None:
+        """Delete backups parsed with a filter.
+
+        :param include_filter: A filter that should return the backups to consider for
+        deletion. Note: The newest of the backups returned by include_filter will
+        unconditionally be kept, even if delete_filter returns all backups.
+        :param delete_filter: A filter that should return the backups to delete.
+        """
+        backups, get_agent_errors = await self.async_get_backups()
+        if get_agent_errors:
+            LOGGER.debug(
+                "Error getting backups; continuing anyway: %s",
+                get_agent_errors,
+            )
+
+        # Run the include filter first to ensure we only consider backups that
+        # should be included in the deletion process.
+        backups = include_filter(backups)
+        backups_by_agent: dict[str, dict[str, ManagerBackup]] = defaultdict(dict)
+        for backup_id, backup in backups.items():
+            for agent_id in backup.agents:
+                backups_by_agent[agent_id][backup_id] = backup
+
+        LOGGER.debug("Backups returned by include filter: %s", backups)
+        LOGGER.debug(
+            "Backups returned by include filter by agent: %s",
+            {agent_id: list(backups) for agent_id, backups in backups_by_agent.items()},
+        )
+
+        backups_to_delete = delete_filter(backups)
+
+        LOGGER.debug("Backups returned by delete filter: %s", backups_to_delete)
+
+        if not backups_to_delete:
+            return
+
+        # always delete oldest backup first
+        backups_to_delete_by_agent: dict[str, dict[str, ManagerBackup]] = defaultdict(
+            dict
+        )
+        for backup_id, backup in sorted(
+            backups_to_delete.items(),
+            key=lambda backup_item: backup_item[1].date,
+        ):
+            for agent_id in backup.agents:
+                backups_to_delete_by_agent[agent_id][backup_id] = backup
+        LOGGER.debug(
+            "Backups returned by delete filter by agent: %s",
+            {
+                agent_id: list(backups)
+                for agent_id, backups in backups_to_delete_by_agent.items()
+            },
+        )
+        for agent_id, to_delete_from_agent in backups_to_delete_by_agent.items():
+            if len(to_delete_from_agent) >= len(backups_by_agent[agent_id]):
+                # Never delete the last backup.
+                last_backup = to_delete_from_agent.popitem()
+                LOGGER.debug(
+                    "Keeping the last backup %s for agent %s", last_backup, agent_id
+                )
+
+        LOGGER.debug(
+            "Backups to delete by agent: %s",
+            {
+                agent_id: list(backups)
+                for agent_id, backups in backups_to_delete_by_agent.items()
+            },
+        )
+
+        backup_ids_to_delete: dict[str, set[str]] = defaultdict(set)
+        for agent_id, to_delete in backups_to_delete_by_agent.items():
+            for backup_id in to_delete:
+                backup_ids_to_delete[backup_id].add(agent_id)
+
+        if not backup_ids_to_delete:
+            return
+
+        backup_ids = list(backup_ids_to_delete)
+        delete_results = await asyncio.gather(
+            *(
+                self.async_delete_backup(backup_id, agent_ids=list(agent_ids))
+                for backup_id, agent_ids in backup_ids_to_delete.items()
+            )
+        )
+        agent_errors = {
+            backup_id: error
+            for backup_id, error in zip(backup_ids, delete_results, strict=True)
+            if error and not isinstance(error, BackupNotFound)
+        }
+        if agent_errors:
+            LOGGER.error(
+                "Error deleting old copies: %s",
+                agent_errors,
+            )
+
     async def async_receive_backup(
         self,
         *,
         agent_ids: list[str],
         contents: aiohttp.BodyPartReader,
-    ) -> None:
+    ) -> str:
         """Receive and store a backup file from upload."""
         if self.state is not BackupManagerState.IDLE:
             raise BackupManagerError(f"Backup manager busy: {self.state}")
         self.async_on_backup_event(
-            ReceiveBackupEvent(stage=None, state=ReceiveBackupState.IN_PROGRESS)
+            ReceiveBackupEvent(
+                reason=None,
+                stage=None,
+                state=ReceiveBackupState.IN_PROGRESS,
+            )
         )
         try:
-            await self._async_receive_backup(agent_ids=agent_ids, contents=contents)
+            backup_id = await self._async_receive_backup(
+                agent_ids=agent_ids, contents=contents
+            )
         except Exception:
             self.async_on_backup_event(
-                ReceiveBackupEvent(stage=None, state=ReceiveBackupState.FAILED)
+                ReceiveBackupEvent(
+                    reason="unknown_error",
+                    stage=None,
+                    state=ReceiveBackupState.FAILED,
+                )
             )
             raise
         else:
             self.async_on_backup_event(
-                ReceiveBackupEvent(stage=None, state=ReceiveBackupState.COMPLETED)
+                ReceiveBackupEvent(
+                    reason=None,
+                    stage=None,
+                    state=ReceiveBackupState.COMPLETED,
+                )
             )
+            return backup_id
         finally:
             self.async_on_backup_event(IdleEvent())
 
@@ -640,11 +929,12 @@ class BackupManager:
         *,
         agent_ids: list[str],
         contents: aiohttp.BodyPartReader,
-    ) -> None:
+    ) -> str:
         """Receive and store a backup file from upload."""
         contents.chunk_size = BUF_SIZE
         self.async_on_backup_event(
             ReceiveBackupEvent(
+                reason=None,
                 stage=ReceiveBackupStage.RECEIVE_FILE,
                 state=ReceiveBackupState.IN_PROGRESS,
             )
@@ -656,6 +946,7 @@ class BackupManager:
         )
         self.async_on_backup_event(
             ReceiveBackupEvent(
+                reason=None,
                 stage=ReceiveBackupStage.UPLOAD_TO_AGENTS,
                 state=ReceiveBackupState.IN_PROGRESS,
             )
@@ -664,14 +955,19 @@ class BackupManager:
             backup=written_backup.backup,
             agent_ids=agent_ids,
             open_stream=written_backup.open_stream,
+            # When receiving a backup, we don't decrypt or encrypt it according to the
+            # agent settings, we just upload it as is.
+            password=None,
         )
         await written_backup.release_stream()
-        self.known_backups.add(written_backup.backup, agent_errors)
+        self.known_backups.add(written_backup.backup, agent_errors, [])
+        return written_backup.backup.backup_id
 
     async def async_create_backup(
         self,
         *,
         agent_ids: list[str],
+        extra_metadata: dict[str, bool | str] | None = None,
         include_addons: list[str] | None,
         include_all_addons: bool,
         include_database: bool,
@@ -684,6 +980,7 @@ class BackupManager:
         """Create a backup."""
         new_backup = await self.async_initiate_backup(
             agent_ids=agent_ids,
+            extra_metadata=extra_metadata,
             include_addons=include_addons,
             include_all_addons=include_all_addons,
             include_database=include_database,
@@ -698,10 +995,26 @@ class BackupManager:
         await self._backup_finish_task
         return new_backup
 
+    async def async_create_automatic_backup(self) -> NewBackup:
+        """Create a backup with automatic backup settings."""
+        config_data = self.config.data
+        return await self.async_create_backup(
+            agent_ids=config_data.create_backup.agent_ids,
+            include_addons=config_data.create_backup.include_addons,
+            include_all_addons=config_data.create_backup.include_all_addons,
+            include_database=config_data.create_backup.include_database,
+            include_folders=config_data.create_backup.include_folders,
+            include_homeassistant=True,  # always include HA
+            name=config_data.create_backup.name,
+            password=config_data.create_backup.password,
+            with_automatic_settings=True,
+        )
+
     async def async_initiate_backup(
         self,
         *,
         agent_ids: list[str],
+        extra_metadata: dict[str, bool | str] | None = None,
         include_addons: list[str] | None,
         include_all_addons: bool,
         include_database: bool,
@@ -721,11 +1034,16 @@ class BackupManager:
             self.store.save()
 
         self.async_on_backup_event(
-            CreateBackupEvent(stage=None, state=CreateBackupState.IN_PROGRESS)
+            CreateBackupEvent(
+                reason=None,
+                stage=None,
+                state=CreateBackupState.IN_PROGRESS,
+            )
         )
         try:
             return await self._async_create_backup(
                 agent_ids=agent_ids,
+                extra_metadata=extra_metadata,
                 include_addons=include_addons,
                 include_all_addons=include_all_addons,
                 include_database=include_database,
@@ -736,9 +1054,14 @@ class BackupManager:
                 raise_task_error=raise_task_error,
                 with_automatic_settings=with_automatic_settings,
             )
-        except Exception:
+        except Exception as err:
+            reason = err.error_code if isinstance(err, BackupError) else "unknown_error"
             self.async_on_backup_event(
-                CreateBackupEvent(stage=None, state=CreateBackupState.FAILED)
+                CreateBackupEvent(
+                    reason=reason,
+                    stage=None,
+                    state=CreateBackupState.FAILED,
+                )
             )
             self.async_on_backup_event(IdleEvent())
             if with_automatic_settings:
@@ -749,6 +1072,7 @@ class BackupManager:
         self,
         *,
         agent_ids: list[str],
+        extra_metadata: dict[str, bool | str] | None,
         include_addons: list[str] | None,
         include_all_addons: bool,
         include_database: bool,
@@ -760,30 +1084,43 @@ class BackupManager:
         with_automatic_settings: bool,
     ) -> NewBackup:
         """Initiate generating a backup."""
-        if not agent_ids:
-            raise BackupManagerError("At least one agent must be selected")
-        if invalid_agents := [
+        unavailable_agents = [
             agent_id for agent_id in agent_ids if agent_id not in self.backup_agents
-        ]:
-            raise BackupManagerError(f"Invalid agents selected: {invalid_agents}")
+        ]
+        if not (
+            available_agents := [
+                agent_id for agent_id in agent_ids if agent_id in self.backup_agents
+            ]
+        ):
+            raise BackupManagerError(
+                f"At least one available backup agent must be selected, got {agent_ids}"
+            )
+        if unavailable_agents:
+            LOGGER.warning(
+                "Backup agents %s are not available, will backupp to %s",
+                unavailable_agents,
+                available_agents,
+            )
         if include_all_addons and include_addons:
             raise BackupManagerError(
                 "Cannot include all addons and specify specific addons"
             )
 
         backup_name = (
-            name
+            (name if name is None else name.strip())
             or f"{'Automatic' if with_automatic_settings else 'Custom'} backup {HAVERSION}"
         )
+        extra_metadata = extra_metadata or {}
 
         try:
             (
                 new_backup,
                 self._backup_task,
             ) = await self._reader_writer.async_create_backup(
-                agent_ids=agent_ids,
+                agent_ids=available_agents,
                 backup_name=backup_name,
-                extra_metadata={
+                extra_metadata=extra_metadata
+                | {
                     "instance_id": await instance_id.async_get(self.hass),
                     "with_automatic_settings": with_automatic_settings,
                 },
@@ -799,7 +1136,9 @@ class BackupManager:
             raise BackupManagerError(str(err)) from err
 
         backup_finish_task = self._backup_finish_task = self.hass.async_create_task(
-            self._async_finish_backup(agent_ids, with_automatic_settings),
+            self._async_finish_backup(
+                available_agents, unavailable_agents, with_automatic_settings, password
+            ),
             name="backup_manager_finish_backup",
         )
         if not raise_task_error:
@@ -816,7 +1155,11 @@ class BackupManager:
         return new_backup
 
     async def _async_finish_backup(
-        self, agent_ids: list[str], with_automatic_settings: bool
+        self,
+        available_agents: list[str],
+        unavailable_agents: list[str],
+        with_automatic_settings: bool,
+        password: str | None,
     ) -> None:
         """Finish a backup."""
         if TYPE_CHECKING:
@@ -835,10 +1178,11 @@ class BackupManager:
             LOGGER.debug(
                 "Generated new backup with backup_id %s, uploading to agents %s",
                 written_backup.backup.backup_id,
-                agent_ids,
+                available_agents,
             )
             self.async_on_backup_event(
                 CreateBackupEvent(
+                    reason=None,
                     stage=CreateBackupStage.UPLOAD_TO_AGENTS,
                     state=CreateBackupState.IN_PROGRESS,
                 )
@@ -847,12 +1191,15 @@ class BackupManager:
             try:
                 agent_errors = await self._async_upload_backup(
                     backup=written_backup.backup,
-                    agent_ids=agent_ids,
+                    agent_ids=available_agents,
                     open_stream=written_backup.open_stream,
+                    password=password,
                 )
             finally:
                 await written_backup.release_stream()
-            self.known_backups.add(written_backup.backup, agent_errors)
+            self.known_backups.add(
+                written_backup.backup, agent_errors, unavailable_agents
+            )
             if not agent_errors:
                 if with_automatic_settings:
                     # create backup was successful, update last_completed_automatic_backup
@@ -861,7 +1208,7 @@ class BackupManager:
                 backup_success = True
 
             if with_automatic_settings:
-                self._update_issue_after_agent_upload(agent_errors)
+                self._update_issue_after_agent_upload(agent_errors, unavailable_agents)
             # delete old backups more numerous than copies
             # try this regardless of agent errors above
             await delete_backups_exceeding_configured_count(self)
@@ -869,14 +1216,22 @@ class BackupManager:
         finally:
             self._backup_task = None
             self._backup_finish_task = None
-            self.async_on_backup_event(
-                CreateBackupEvent(
-                    stage=None,
-                    state=CreateBackupState.COMPLETED
-                    if backup_success
-                    else CreateBackupState.FAILED,
+            if backup_success:
+                self.async_on_backup_event(
+                    CreateBackupEvent(
+                        reason=None,
+                        stage=None,
+                        state=CreateBackupState.COMPLETED,
+                    )
+                )
+            else:
+                self.async_on_backup_event(
+                    CreateBackupEvent(
+                        reason="upload_failed",
+                        stage=None,
+                        state=CreateBackupState.FAILED,
+                    )
                 )
-            )
             self.async_on_backup_event(IdleEvent())
 
     async def async_restore_backup(
@@ -895,7 +1250,11 @@ class BackupManager:
             raise BackupManagerError(f"Backup manager busy: {self.state}")
 
         self.async_on_backup_event(
-            RestoreBackupEvent(stage=None, state=RestoreBackupState.IN_PROGRESS)
+            RestoreBackupEvent(
+                reason=None,
+                stage=None,
+                state=RestoreBackupState.IN_PROGRESS,
+            )
         )
         try:
             await self._async_restore_backup(
@@ -908,11 +1267,28 @@ class BackupManager:
                 restore_homeassistant=restore_homeassistant,
             )
             self.async_on_backup_event(
-                RestoreBackupEvent(stage=None, state=RestoreBackupState.COMPLETED)
+                RestoreBackupEvent(
+                    reason=None,
+                    stage=None,
+                    state=RestoreBackupState.COMPLETED,
+                )
             )
+        except BackupError as err:
+            self.async_on_backup_event(
+                RestoreBackupEvent(
+                    reason=err.error_code,
+                    stage=None,
+                    state=RestoreBackupState.FAILED,
+                )
+            )
+            raise
         except Exception:
             self.async_on_backup_event(
-                RestoreBackupEvent(stage=None, state=RestoreBackupState.FAILED)
+                RestoreBackupEvent(
+                    reason="unknown_error",
+                    stage=None,
+                    state=RestoreBackupState.FAILED,
+                )
             )
             raise
         finally:
@@ -931,7 +1307,20 @@ class BackupManager:
     ) -> None:
         """Initiate restoring a backup."""
         agent = self.backup_agents[agent_id]
-        if not await agent.async_get_backup(backup_id):
+        try:
+            backup = await agent.async_get_backup(backup_id)
+        except BackupNotFound as err:
+            raise BackupManagerError(
+                f"Backup {backup_id} not found in agent {agent_id}"
+            ) from err
+        # Check for None to be backwards compatible with the old BackupAgent API,
+        # this can be removed in HA Core 2025.10
+        if not backup:
+            frame.report_usage(
+                "returns None from BackupAgent.async_get_backup",
+                breaks_in_ha_version="2025.10",
+                integration_domain=agent_id.partition(".")[0],
+            )
             raise BackupManagerError(
                 f"Backup {backup_id} not found in agent {agent_id}"
             )
@@ -960,22 +1349,11 @@ class BackupManager:
         if (current_state := self.state) != (new_state := event.manager_state):
             LOGGER.debug("Backup state: %s -> %s", current_state, new_state)
         self.last_event = event
+        if not isinstance(event, (BlockedEvent, IdleEvent)):
+            self.last_action_event = event
         for subscription in self._backup_event_subscriptions:
             subscription(event)
 
-    @callback
-    def async_subscribe_events(
-        self,
-        on_event: Callable[[ManagerStateEvent], None],
-    ) -> Callable[[], None]:
-        """Subscribe events."""
-
-        def remove_subscription() -> None:
-            self._backup_event_subscriptions.remove(on_event)
-
-        self._backup_event_subscriptions.append(on_event)
-        return remove_subscription
-
     def _update_issue_backup_failed(self) -> None:
         """Update issue registry when a backup fails."""
         ir.async_create_issue(
@@ -990,10 +1368,10 @@ class BackupManager:
         )
 
     def _update_issue_after_agent_upload(
-        self, agent_errors: dict[str, Exception]
+        self, agent_errors: dict[str, Exception], unavailable_agents: list[str]
     ) -> None:
         """Update issue registry after a backup is uploaded to agents."""
-        if not agent_errors:
+        if not agent_errors and not unavailable_agents:
             ir.async_delete_issue(self.hass, DOMAIN, "automatic_backup_failed")
             return
         ir.async_create_issue(
@@ -1005,7 +1383,17 @@ class BackupManager:
             learn_more_url="homeassistant://config/backup",
             severity=ir.IssueSeverity.WARNING,
             translation_key="automatic_backup_failed_upload_agents",
-            translation_placeholders={"failed_agents": ", ".join(agent_errors)},
+            translation_placeholders={
+                "failed_agents": ", ".join(
+                    chain(
+                        (
+                            self.backup_agents[agent_id].name
+                            for agent_id in agent_errors
+                        ),
+                        unavailable_agents,
+                    )
+                )
+            },
         )
 
     async def async_can_decrypt_on_download(
@@ -1020,7 +1408,20 @@ class BackupManager:
             agent = self.backup_agents[agent_id]
         except KeyError as err:
             raise BackupManagerError(f"Invalid agent selected: {agent_id}") from err
-        if not await agent.async_get_backup(backup_id):
+        try:
+            backup = await agent.async_get_backup(backup_id)
+        except BackupNotFound as err:
+            raise BackupManagerError(
+                f"Backup {backup_id} not found in agent {agent_id}"
+            ) from err
+        # Check for None to be backwards compatible with the old BackupAgent API,
+        # this can be removed in HA Core 2025.10
+        if not backup:
+            frame.report_usage(
+                "returns None from BackupAgent.async_get_backup",
+                breaks_in_ha_version="2025.10",
+                integration_domain=agent_id.partition(".")[0],
+            )
             raise BackupManagerError(
                 f"Backup {backup_id} not found in agent {agent_id}"
             )
@@ -1033,7 +1434,9 @@ class BackupManager:
             backup_stream = await agent.async_download_backup(backup_id)
             reader = cast(IO[bytes], AsyncIteratorReader(self.hass, backup_stream))
         try:
-            validate_password_stream(reader, password)
+            await self.hass.async_add_executor_job(
+                validate_password_stream, reader, password
+            )
         except backup_util.IncorrectPassword as err:
             raise IncorrectPasswordError from err
         except backup_util.UnsupportedSecureTarVersion as err:
@@ -1070,11 +1473,12 @@ class KnownBackups:
         self,
         backup: AgentBackup,
         agent_errors: dict[str, Exception],
+        unavailable_agents: list[str],
     ) -> None:
         """Add a backup."""
         self._backups[backup.backup_id] = KnownBackup(
             backup_id=backup.backup_id,
-            failed_agent_ids=list(agent_errors),
+            failed_agent_ids=list(chain(agent_errors, unavailable_agents)),
         )
         self._manager.store.save()
 
@@ -1179,13 +1583,36 @@ class CoreBackupReaderWriter(BackupReaderWriter):
         """Generate a backup."""
         manager = self._hass.data[DATA_MANAGER]
 
+        agent_config = manager.config.data.agents.get(self._local_agent_id)
+        if (
+            self._local_agent_id in agent_ids
+            and agent_config
+            and not agent_config.protected
+        ):
+            password = None
+
+        backup = AgentBackup(
+            addons=[],
+            backup_id=backup_id,
+            database_included=include_database,
+            date=date_str,
+            extra_metadata=extra_metadata,
+            folders=[],
+            homeassistant_included=True,
+            homeassistant_version=HAVERSION,
+            name=backup_name,
+            protected=password is not None,
+            size=0,
+        )
+
         local_agent_tar_file_path = None
         if self._local_agent_id in agent_ids:
             local_agent = manager.local_backup_agents[self._local_agent_id]
-            local_agent_tar_file_path = local_agent.get_backup_path(backup_id)
+            local_agent_tar_file_path = local_agent.get_new_backup_path(backup)
 
         on_progress(
             CreateBackupEvent(
+                reason=None,
                 stage=CreateBackupStage.HOME_ASSISTANT,
                 state=CreateBackupState.IN_PROGRESS,
             )
@@ -1223,19 +1650,7 @@ class CoreBackupReaderWriter(BackupReaderWriter):
             # ValueError from json_bytes
             raise BackupReaderWriterError(str(err)) from err
         else:
-            backup = AgentBackup(
-                addons=[],
-                backup_id=backup_id,
-                database_included=include_database,
-                date=date_str,
-                extra_metadata=extra_metadata,
-                folders=[],
-                homeassistant_included=True,
-                homeassistant_version=HAVERSION,
-                name=backup_name,
-                protected=password is not None,
-                size=size_in_bytes,
-            )
+            backup = replace(backup, size=size_in_bytes)
 
             async_add_executor_job = self._hass.async_add_executor_job
 
@@ -1266,10 +1681,24 @@ class CoreBackupReaderWriter(BackupReaderWriter):
             )
         finally:
             # Inform integrations the backup is done
+            # If there's an unhandled exception, we keep it so we can rethrow it in case
+            # the post backup actions also fail.
+            unhandled_exc = sys.exception()
             try:
-                await manager.async_post_backup_actions()
-            except BackupManagerError as err:
-                raise BackupReaderWriterError(str(err)) from err
+                try:
+                    await manager.async_post_backup_actions()
+                except BackupManagerError as err:
+                    raise BackupReaderWriterError(str(err)) from err
+            except Exception as err:
+                if not unhandled_exc:
+                    raise
+                # If there's an unhandled exception, we wrap both that and the exception
+                # from the post backup actions in an ExceptionGroup so the caller is
+                # aware of both exceptions.
+                raise BackupManagerExceptionGroup(
+                    f"Multiple errors when creating backup: {unhandled_exc}, {err}",
+                    [unhandled_exc, err],
+                ) from None
 
     def _mkdir_and_generate_backup_contents(
         self,
@@ -1281,7 +1710,13 @@ class CoreBackupReaderWriter(BackupReaderWriter):
         """Generate backup contents and return the size."""
         if not tar_file_path:
             tar_file_path = self.temp_backup_dir / f"{backup_data['slug']}.tar"
-        make_backup_dir(tar_file_path.parent)
+        try:
+            make_backup_dir(tar_file_path.parent)
+        except OSError as err:
+            raise BackupReaderWriterError(
+                f"Failed to create dir {tar_file_path.parent}: "
+                f"{err} ({err.__class__.__name__})"
+            ) from err
 
         excludes = EXCLUDE_FROM_BACKUP
         if not database_included:
@@ -1291,7 +1726,9 @@ class CoreBackupReaderWriter(BackupReaderWriter):
             """Filter to filter excludes."""
 
             for exclude in excludes:
-                if not path.match(exclude):
+                # The home assistant core configuration directory is added as "data"
+                # in the tar file, so we need to prefix that path to the filters.
+                if not path.full_match(f"data/{exclude}"):
                     continue
                 LOGGER.debug("Ignoring %s because of %s", path, exclude)
                 return True
@@ -1319,7 +1756,14 @@ class CoreBackupReaderWriter(BackupReaderWriter):
                     file_filter=is_excluded_by_filter,
                     arcname="data",
                 )
-        return (tar_file_path, tar_file_path.stat().st_size)
+        try:
+            stat_result = tar_file_path.stat()
+        except OSError as err:
+            raise BackupReaderWriterError(
+                f"Error getting size of {tar_file_path}: "
+                f"{err} ({err.__class__.__name__})"
+            ) from err
+        return (tar_file_path, stat_result.st_size)
 
     async def async_receive_backup(
         self,
@@ -1349,7 +1793,7 @@ class CoreBackupReaderWriter(BackupReaderWriter):
         manager = self._hass.data[DATA_MANAGER]
         if self._local_agent_id in agent_ids:
             local_agent = manager.local_backup_agents[self._local_agent_id]
-            tar_file_path = local_agent.get_backup_path(backup.backup_id)
+            tar_file_path = local_agent.get_new_backup_path(backup)
             await async_add_executor_job(make_backup_dir, tar_file_path.parent)
             await async_add_executor_job(shutil.move, temp_file, tar_file_path)
         else:
@@ -1445,10 +1889,100 @@ class CoreBackupReaderWriter(BackupReaderWriter):
 
         await self._hass.async_add_executor_job(_write_restore_file)
         on_progress(
-            RestoreBackupEvent(stage=None, state=RestoreBackupState.CORE_RESTART)
+            RestoreBackupEvent(
+                reason=None,
+                stage=None,
+                state=RestoreBackupState.CORE_RESTART,
+            )
         )
         await self._hass.services.async_call("homeassistant", "restart", blocking=True)
 
+    async def async_resume_restore_progress_after_restart(
+        self,
+        *,
+        on_progress: Callable[[RestoreBackupEvent | IdleEvent], None],
+    ) -> None:
+        """Check restore status after core restart."""
+
+        def _read_restore_file() -> json_util.JsonObjectType | None:
+            """Read the restore file."""
+            result_path = Path(self._hass.config.path(RESTORE_BACKUP_RESULT_FILE))
+
+            try:
+                restore_result = json_util.json_loads_object(result_path.read_bytes())
+            except FileNotFoundError:
+                return None
+            finally:
+                try:
+                    result_path.unlink(missing_ok=True)
+                except OSError as err:
+                    LOGGER.warning(
+                        "Unexpected error deleting backup restore result file: %s %s",
+                        type(err),
+                        err,
+                    )
+
+            return restore_result
+
+        restore_result = await self._hass.async_add_executor_job(_read_restore_file)
+        if not restore_result:
+            return
+
+        success = restore_result["success"]
+        if not success:
+            LOGGER.warning(
+                "Backup restore failed with %s: %s",
+                restore_result["error_type"],
+                restore_result["error"],
+            )
+        state = RestoreBackupState.COMPLETED if success else RestoreBackupState.FAILED
+        on_progress(
+            RestoreBackupEvent(
+                reason=cast(str, restore_result["error"]),
+                stage=None,
+                state=state,
+            )
+        )
+        on_progress(IdleEvent())
+
+    async def async_validate_config(self, *, config: BackupConfig) -> None:
+        """Validate backup config.
+
+        Update automatic backup settings to not include addons or folders and remove
+        hassio agents in case a backup created by supervisor was restored.
+        """
+        create_backup = config.data.create_backup
+        if (
+            not create_backup.include_addons
+            and not create_backup.include_all_addons
+            and not create_backup.include_folders
+            and not any(a_id.startswith("hassio.") for a_id in create_backup.agent_ids)
+        ):
+            LOGGER.debug("Backup settings don't need to be adjusted")
+            return
+
+        LOGGER.info(
+            "Adjusting backup settings to not include addons, folders or supervisor locations"
+        )
+        automatic_agents = [
+            agent_id
+            for agent_id in create_backup.agent_ids
+            if not agent_id.startswith("hassio.")
+        ]
+        if (
+            self._local_agent_id not in automatic_agents
+            and "hassio.local" in create_backup.agent_ids
+        ):
+            automatic_agents = [self._local_agent_id, *automatic_agents]
+        config.update(
+            create_backup=CreateBackupParametersDict(
+                agent_ids=automatic_agents,
+                include_addons=None,
+                include_all_addons=False,
+                include_folders=None,
+            )
+        )
+
 
 def _generate_backup_id(date: str, name: str) -> str:
     """Generate a backup ID."""
diff --git a/homeassistant/components/backup/manifest.json b/homeassistant/components/backup/manifest.json
index ffaed260c88..3c7b1e5e014 100644
--- a/homeassistant/components/backup/manifest.json
+++ b/homeassistant/components/backup/manifest.json
@@ -5,8 +5,9 @@
   "codeowners": ["@home-assistant/core"],
   "dependencies": ["http", "websocket_api"],
   "documentation": "https://www.home-assistant.io/integrations/backup",
-  "integration_type": "system",
+  "integration_type": "service",
   "iot_class": "calculated",
   "quality_scale": "internal",
-  "requirements": ["cronsim==2.6", "securetar==2025.1.3"]
+  "requirements": ["cronsim==2.6", "securetar==2025.2.1"],
+  "single_config_entry": true
 }
diff --git a/homeassistant/components/backup/models.py b/homeassistant/components/backup/models.py
index 81c00d699c6..95c5ef9809d 100644
--- a/homeassistant/components/backup/models.py
+++ b/homeassistant/components/backup/models.py
@@ -28,7 +28,7 @@ class Folder(StrEnum):
 
 
 @dataclass(frozen=True, kw_only=True)
-class AgentBackup:
+class BaseBackup:
     """Base backup class."""
 
     addons: list[AddonInfo]
@@ -40,6 +40,12 @@ class AgentBackup:
     homeassistant_included: bool
     homeassistant_version: str | None  # None if homeassistant_included is False
     name: str
+
+
+@dataclass(frozen=True, kw_only=True)
+class AgentBackup(BaseBackup):
+    """Agent backup class."""
+
     protected: bool
     size: int
 
@@ -47,12 +53,6 @@ class AgentBackup:
         """Return a dict representation of this backup."""
         return asdict(self)
 
-    def as_frontend_json(self) -> dict:
-        """Return a dict representation of this backup for sending to frontend."""
-        return {
-            key: val for key, val in asdict(self).items() if key != "extra_metadata"
-        }
-
     @classmethod
     def from_dict(cls, data: dict[str, Any]) -> Self:
         """Create an instance from a JSON serialization."""
@@ -71,5 +71,31 @@ class AgentBackup:
         )
 
 
-class BackupManagerError(HomeAssistantError):
+class BackupError(HomeAssistantError):
+    """Base class for backup errors."""
+
+    error_code = "unknown"
+
+
+class BackupAgentError(BackupError):
+    """Base class for backup agent errors."""
+
+    error_code = "backup_agent_error"
+
+
+class BackupManagerError(BackupError):
     """Backup manager error."""
+
+    error_code = "backup_manager_error"
+
+
+class BackupReaderWriterError(BackupError):
+    """Backup reader/writer error."""
+
+    error_code = "backup_reader_writer_error"
+
+
+class BackupNotFound(BackupAgentError, BackupManagerError):
+    """Raised when a backup is not found."""
+
+    error_code = "backup_not_found"
diff --git a/homeassistant/components/backup/sensor.py b/homeassistant/components/backup/sensor.py
new file mode 100644
index 00000000000..59e98ae7c2d
--- /dev/null
+++ b/homeassistant/components/backup/sensor.py
@@ -0,0 +1,75 @@
+"""Sensor platform for Home Assistant Backup integration."""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+from datetime import datetime
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import BackupConfigEntry, BackupCoordinatorData
+from .entity import BackupManagerEntity
+from .manager import BackupManagerState
+
+
+@dataclass(kw_only=True, frozen=True)
+class BackupSensorEntityDescription(SensorEntityDescription):
+    """Description for Home Assistant Backup sensor entities."""
+
+    value_fn: Callable[[BackupCoordinatorData], str | datetime | None]
+
+
+BACKUP_MANAGER_DESCRIPTIONS = (
+    BackupSensorEntityDescription(
+        key="backup_manager_state",
+        translation_key="backup_manager_state",
+        device_class=SensorDeviceClass.ENUM,
+        options=[state.value for state in BackupManagerState],
+        value_fn=lambda data: data.backup_manager_state,
+    ),
+    BackupSensorEntityDescription(
+        key="next_scheduled_automatic_backup",
+        translation_key="next_scheduled_automatic_backup",
+        device_class=SensorDeviceClass.TIMESTAMP,
+        value_fn=lambda data: data.next_scheduled_automatic_backup,
+    ),
+    BackupSensorEntityDescription(
+        key="last_successful_automatic_backup",
+        translation_key="last_successful_automatic_backup",
+        device_class=SensorDeviceClass.TIMESTAMP,
+        value_fn=lambda data: data.last_successful_automatic_backup,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: BackupConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Sensor set up for backup config entry."""
+
+    coordinator = config_entry.runtime_data
+
+    async_add_entities(
+        BackupManagerSensor(coordinator, description)
+        for description in BACKUP_MANAGER_DESCRIPTIONS
+    )
+
+
+class BackupManagerSensor(BackupManagerEntity, SensorEntity):
+    """Sensor to track backup manager state."""
+
+    entity_description: BackupSensorEntityDescription
+
+    @property
+    def native_value(self) -> str | datetime | None:
+        """Return native value of entity."""
+        return self.entity_description.value_fn(self.coordinator.data)
diff --git a/homeassistant/components/backup/store.py b/homeassistant/components/backup/store.py
index 0e1c49426c5..883447853e6 100644
--- a/homeassistant/components/backup/store.py
+++ b/homeassistant/components/backup/store.py
@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 STORE_DELAY_SAVE = 30
 STORAGE_KEY = DOMAIN
 STORAGE_VERSION = 1
-STORAGE_VERSION_MINOR = 2
+STORAGE_VERSION_MINOR = 5
 
 
 class StoredBackupData(TypedDict):
@@ -47,8 +47,12 @@ class _BackupStore(Store[StoredBackupData]):
         """Migrate to the new version."""
         data = old_data
         if old_major_version == 1:
-            if old_minor_version < 2:
-                # Version 1.2 adds configurable backup time and custom days
+            if old_minor_version < 3:
+                # Version 1.2 bumped to 1.3 because 1.2 was changed several
+                # times during development.
+                # Version 1.3 adds per agent settings, configurable backup time
+                # and custom days
+                data["config"]["agents"] = {}
                 data["config"]["schedule"]["time"] = None
                 if (state := data["config"]["schedule"]["state"]) in ("daily", "never"):
                     data["config"]["schedule"]["days"] = []
@@ -56,6 +60,18 @@ class _BackupStore(Store[StoredBackupData]):
                 else:
                     data["config"]["schedule"]["days"] = [state]
                     data["config"]["schedule"]["recurrence"] = "custom_days"
+            if old_minor_version < 4:
+                # Workaround for a bug in frontend which incorrectly set days to 0
+                # instead of to None for unlimited retention.
+                if data["config"]["retention"]["copies"] == 0:
+                    data["config"]["retention"]["copies"] = None
+                if data["config"]["retention"]["days"] == 0:
+                    data["config"]["retention"]["days"] = None
+            if old_minor_version < 5:
+                # Version 1.5 adds automatic_backups_configured
+                data["config"]["automatic_backups_configured"] = (
+                    data["config"]["create_backup"]["password"] is not None
+                )
 
         # Note: We allow reading data with major version 2.
         # Reject if major version is higher than 2.
diff --git a/homeassistant/components/backup/strings.json b/homeassistant/components/backup/strings.json
index 32d76ded049..487fdd89a7c 100644
--- a/homeassistant/components/backup/strings.json
+++ b/homeassistant/components/backup/strings.json
@@ -1,5 +1,9 @@
 {
   "issues": {
+    "automatic_backup_agents_unavailable": {
+      "title": "The backup location {agent_id} is unavailable",
+      "description": "The backup location `{agent_id}` is unavailable but is still configured for automatic backups.\n\nPlease visit the [automatic backup configuration page]({backup_settings}) to review and update your backup locations. Backups will not be uploaded to selected locations that are unavailable."
+    },
     "automatic_backup_failed_create": {
       "title": "Automatic backup could not be created",
       "description": "The automatic backup could not be created. Please check the logs for more information. Another attempt will be made at the next scheduled time if a backup schedule is configured."
@@ -18,5 +22,24 @@
       "name": "Create automatic backup",
       "description": "Creates a new backup with automatic backup settings."
     }
+  },
+  "entity": {
+    "sensor": {
+      "backup_manager_state": {
+        "name": "Backup Manager State",
+        "state": {
+          "idle": "Idle",
+          "create_backup": "Creating a backup",
+          "receive_backup": "Receiving a backup",
+          "restore_backup": "Restoring a backup"
+        }
+      },
+      "next_scheduled_automatic_backup": {
+        "name": "Next scheduled automatic backup"
+      },
+      "last_successful_automatic_backup": {
+        "name": "Last successful automatic backup"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/backup/util.py b/homeassistant/components/backup/util.py
index e5acf974012..bd77880738e 100644
--- a/homeassistant/components/backup/util.py
+++ b/homeassistant/components/backup/util.py
@@ -3,14 +3,18 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import AsyncIterator, Callable
+from collections.abc import AsyncIterator, Callable, Coroutine
+from concurrent.futures import CancelledError, Future
 import copy
+from dataclasses import dataclass, replace
 from io import BytesIO
 import json
+import os
 from pathlib import Path, PurePath
 from queue import SimpleQueue
 import tarfile
-from typing import IO, Self, cast
+import threading
+from typing import IO, Any, Self, cast
 
 import aiohttp
 from securetar import SecureTarError, SecureTarFile, SecureTarReadError
@@ -18,6 +22,7 @@ from securetar import SecureTarError, SecureTarFile, SecureTarReadError
 from homeassistant.backup_restore import password_to_key
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.util import dt as dt_util
 from homeassistant.util.json import JsonObjectType, json_loads_object
 
 from .const import BUF_SIZE, LOGGER
@@ -30,6 +35,12 @@ class DecryptError(HomeAssistantError):
     _message = "Unexpected error during decryption."
 
 
+class EncryptError(HomeAssistantError):
+    """Error during encryption."""
+
+    _message = "Unexpected error during encryption."
+
+
 class UnsupportedSecureTarVersion(DecryptError):
     """Unsupported securetar version."""
 
@@ -48,6 +59,12 @@ class BackupEmpty(DecryptError):
     _message = "No tar files found in the backup."
 
 
+class AbortCipher(HomeAssistantError):
+    """Abort the cipher operation."""
+
+    _message = "Abort cipher operation."
+
+
 def make_backup_dir(path: Path) -> None:
     """Create a backup directory if it does not exist."""
     path.mkdir(exist_ok=True)
@@ -87,12 +104,15 @@ def read_backup(backup_path: Path) -> AgentBackup:
                 bool, homeassistant.get("exclude_database", False)
             )
 
+        extra_metadata = cast(dict[str, bool | str], data.get("extra", {}))
+        date = extra_metadata.get("supervisor.backup_request_date", data["date"])
+
         return AgentBackup(
             addons=addons,
             backup_id=cast(str, data["slug"]),
             database_included=database_included,
-            date=cast(str, data["date"]),
-            extra_metadata=cast(dict[str, bool | str], data.get("extra", {})),
+            date=cast(str, date),
+            extra_metadata=extra_metadata,
             folders=folders,
             homeassistant_included=homeassistant_included,
             homeassistant_version=homeassistant_version,
@@ -102,6 +122,17 @@ def read_backup(backup_path: Path) -> AgentBackup:
         )
 
 
+def suggested_filename_from_name_date(name: str, date_str: str) -> str:
+    """Suggest a filename for the backup."""
+    date = dt_util.parse_datetime(date_str, raise_on_error=True)
+    return "_".join(f"{name} {date.strftime('%Y-%m-%d %H.%M %S%f')}.tar".split())
+
+
+def suggested_filename(backup: AgentBackup) -> str:
+    """Suggest a filename for the backup."""
+    return suggested_filename_from_name_date(backup.name, backup.date)
+
+
 def validate_password(path: Path, password: str | None) -> bool:
     """Validate the password."""
     with tarfile.open(path, "r:", bufsize=BUF_SIZE) as backup_file:
@@ -140,23 +171,38 @@ class AsyncIteratorReader:
 
     def __init__(self, hass: HomeAssistant, stream: AsyncIterator[bytes]) -> None:
         """Initialize the wrapper."""
+        self._aborted = False
         self._hass = hass
         self._stream = stream
         self._buffer: bytes | None = None
+        self._next_future: Future[bytes | None] | None = None
         self._pos: int = 0
 
     async def _next(self) -> bytes | None:
         """Get the next chunk from the iterator."""
         return await anext(self._stream, None)
 
+    def abort(self) -> None:
+        """Abort the reader."""
+        self._aborted = True
+        if self._next_future is not None:
+            self._next_future.cancel()
+
     def read(self, n: int = -1, /) -> bytes:
         """Read data from the iterator."""
         result = bytearray()
         while n < 0 or len(result) < n:
             if not self._buffer:
-                self._buffer = asyncio.run_coroutine_threadsafe(
+                self._next_future = asyncio.run_coroutine_threadsafe(
                     self._next(), self._hass.loop
-                ).result()
+                )
+                if self._aborted:
+                    self._next_future.cancel()
+                    raise AbortCipher
+                try:
+                    self._buffer = self._next_future.result()
+                except CancelledError as err:
+                    raise AbortCipher from err
                 self._pos = 0
             if not self._buffer:
                 # The stream is exhausted
@@ -178,8 +224,11 @@ class AsyncIteratorWriter:
 
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize the wrapper."""
+        self._aborted = False
         self._hass = hass
+        self._pos: int = 0
         self._queue: asyncio.Queue[bytes | None] = asyncio.Queue(maxsize=1)
+        self._write_future: Future[bytes | None] | None = None
 
     def __aiter__(self) -> Self:
         """Return the iterator."""
@@ -191,9 +240,29 @@ class AsyncIteratorWriter:
             return data
         raise StopAsyncIteration
 
+    def abort(self) -> None:
+        """Abort the writer."""
+        self._aborted = True
+        if self._write_future is not None:
+            self._write_future.cancel()
+
+    def tell(self) -> int:
+        """Return the current position in the iterator."""
+        return self._pos
+
     def write(self, s: bytes, /) -> int:
         """Write data to the iterator."""
-        asyncio.run_coroutine_threadsafe(self._queue.put(s), self._hass.loop).result()
+        self._write_future = asyncio.run_coroutine_threadsafe(
+            self._queue.put(s), self._hass.loop
+        )
+        if self._aborted:
+            self._write_future.cancel()
+            raise AbortCipher
+        try:
+            self._write_future.result()
+        except CancelledError as err:
+            raise AbortCipher from err
+        self._pos += len(s)
         return len(s)
 
 
@@ -230,24 +299,37 @@ def decrypt_backup(
     input_stream: IO[bytes],
     output_stream: IO[bytes],
     password: str | None,
-    on_done: Callable[[], None],
+    on_done: Callable[[Exception | None], None],
+    minimum_size: int,
+    nonces: list[bytes],
 ) -> None:
     """Decrypt a backup."""
+    error: Exception | None = None
     try:
-        with (
-            tarfile.open(
-                fileobj=input_stream, mode="r|", bufsize=BUF_SIZE
-            ) as input_tar,
-            tarfile.open(
-                fileobj=output_stream, mode="w|", bufsize=BUF_SIZE
-            ) as output_tar,
-        ):
-            _decrypt_backup(input_tar, output_tar, password)
-    except (DecryptError, SecureTarError, tarfile.TarError) as err:
-        LOGGER.warning("Error decrypting backup: %s", err)
+        try:
+            with (
+                tarfile.open(
+                    fileobj=input_stream, mode="r|", bufsize=BUF_SIZE
+                ) as input_tar,
+                tarfile.open(
+                    fileobj=output_stream, mode="w|", bufsize=BUF_SIZE
+                ) as output_tar,
+            ):
+                _decrypt_backup(input_tar, output_tar, password)
+        except (DecryptError, SecureTarError, tarfile.TarError) as err:
+            LOGGER.warning("Error decrypting backup: %s", err)
+            error = err
+        else:
+            # Pad the output stream to the requested minimum size
+            padding = max(minimum_size - output_stream.tell(), 0)
+            output_stream.write(b"\0" * padding)
+        finally:
+            # Write an empty chunk to signal the end of the stream
+            output_stream.write(b"")
+    except AbortCipher:
+        LOGGER.debug("Cipher operation aborted")
     finally:
-        output_stream.write(b"")  # Write an empty chunk to signal the end of the stream
-        on_done()
+        on_done(error)
 
 
 def _decrypt_backup(
@@ -288,6 +370,192 @@ def _decrypt_backup(
             output_tar.addfile(decrypted_obj, decrypted)
 
 
+def encrypt_backup(
+    input_stream: IO[bytes],
+    output_stream: IO[bytes],
+    password: str | None,
+    on_done: Callable[[Exception | None], None],
+    minimum_size: int,
+    nonces: list[bytes],
+) -> None:
+    """Encrypt a backup."""
+    error: Exception | None = None
+    try:
+        try:
+            with (
+                tarfile.open(
+                    fileobj=input_stream, mode="r|", bufsize=BUF_SIZE
+                ) as input_tar,
+                tarfile.open(
+                    fileobj=output_stream, mode="w|", bufsize=BUF_SIZE
+                ) as output_tar,
+            ):
+                _encrypt_backup(input_tar, output_tar, password, nonces)
+        except (EncryptError, SecureTarError, tarfile.TarError) as err:
+            LOGGER.warning("Error encrypting backup: %s", err)
+            error = err
+        else:
+            # Pad the output stream to the requested minimum size
+            padding = max(minimum_size - output_stream.tell(), 0)
+            output_stream.write(b"\0" * padding)
+        finally:
+            # Write an empty chunk to signal the end of the stream
+            output_stream.write(b"")
+    except AbortCipher:
+        LOGGER.debug("Cipher operation aborted")
+    finally:
+        on_done(error)
+
+
+def _encrypt_backup(
+    input_tar: tarfile.TarFile,
+    output_tar: tarfile.TarFile,
+    password: str | None,
+    nonces: list[bytes],
+) -> None:
+    """Encrypt a backup."""
+    inner_tar_idx = 0
+    for obj in input_tar:
+        # We compare with PurePath to avoid issues with different path separators,
+        # for example when backup.json is added as "./backup.json"
+        if PurePath(obj.name) == PurePath("backup.json"):
+            # Rewrite the backup.json file to indicate that the backup is encrypted
+            if not (reader := input_tar.extractfile(obj)):
+                raise EncryptError
+            metadata = json_loads_object(reader.read())
+            metadata["protected"] = True
+            updated_metadata_b = json.dumps(metadata).encode()
+            metadata_obj = copy.deepcopy(obj)
+            metadata_obj.size = len(updated_metadata_b)
+            output_tar.addfile(metadata_obj, BytesIO(updated_metadata_b))
+            continue
+        if not obj.name.endswith((".tar", ".tgz", ".tar.gz")):
+            output_tar.addfile(obj, input_tar.extractfile(obj))
+            continue
+        istf = SecureTarFile(
+            None,  # Not used
+            gzip=False,
+            key=password_to_key(password) if password is not None else None,
+            mode="r",
+            fileobj=input_tar.extractfile(obj),
+            nonce=nonces[inner_tar_idx],
+        )
+        inner_tar_idx += 1
+        with istf.encrypt(obj) as encrypted:
+            encrypted_obj = copy.deepcopy(obj)
+            encrypted_obj.size = encrypted.encrypted_size
+            output_tar.addfile(encrypted_obj, encrypted)
+
+
+@dataclass(kw_only=True)
+class _CipherWorkerStatus:
+    done: asyncio.Event
+    error: Exception | None = None
+    reader: AsyncIteratorReader
+    thread: threading.Thread
+    writer: AsyncIteratorWriter
+
+
+class _CipherBackupStreamer:
+    """Encrypt or decrypt a backup."""
+
+    _cipher_func: Callable[
+        [
+            IO[bytes],
+            IO[bytes],
+            str | None,
+            Callable[[Exception | None], None],
+            int,
+            list[bytes],
+        ],
+        None,
+    ]
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        backup: AgentBackup,
+        open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
+        password: str | None,
+    ) -> None:
+        """Initialize."""
+        self._workers: list[_CipherWorkerStatus] = []
+        self._backup = backup
+        self._hass = hass
+        self._open_stream = open_stream
+        self._password = password
+        self._nonces: list[bytes] = []
+
+    def size(self) -> int:
+        """Return the maximum size of the decrypted or encrypted backup."""
+        return self._backup.size + self._num_tar_files() * tarfile.RECORDSIZE
+
+    def _num_tar_files(self) -> int:
+        """Return the number of inner tar files."""
+        b = self._backup
+        return len(b.addons) + len(b.folders) + b.homeassistant_included + 1
+
+    async def open_stream(self) -> AsyncIterator[bytes]:
+        """Open a stream."""
+
+        def on_done(error: Exception | None) -> None:
+            """Call by the worker thread when it's done."""
+            worker_status.error = error
+            self._hass.loop.call_soon_threadsafe(worker_status.done.set)
+
+        stream = await self._open_stream()
+        reader = AsyncIteratorReader(self._hass, stream)
+        writer = AsyncIteratorWriter(self._hass)
+        worker = threading.Thread(
+            target=self._cipher_func,
+            args=[reader, writer, self._password, on_done, self.size(), self._nonces],
+        )
+        worker_status = _CipherWorkerStatus(
+            done=asyncio.Event(), reader=reader, thread=worker, writer=writer
+        )
+        self._workers.append(worker_status)
+        worker.start()
+        return writer
+
+    async def wait(self) -> None:
+        """Wait for the worker threads to finish."""
+        for worker in self._workers:
+            worker.reader.abort()
+            worker.writer.abort()
+        await asyncio.gather(*(worker.done.wait() for worker in self._workers))
+
+
+class DecryptedBackupStreamer(_CipherBackupStreamer):
+    """Decrypt a backup."""
+
+    _cipher_func = staticmethod(decrypt_backup)
+
+    def backup(self) -> AgentBackup:
+        """Return the decrypted backup."""
+        return replace(self._backup, protected=False, size=self.size())
+
+
+class EncryptedBackupStreamer(_CipherBackupStreamer):
+    """Encrypt a backup."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        backup: AgentBackup,
+        open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
+        password: str | None,
+    ) -> None:
+        """Initialize."""
+        super().__init__(hass, backup, open_stream, password)
+        self._nonces = [os.urandom(16) for _ in range(self._num_tar_files())]
+
+    _cipher_func = staticmethod(encrypt_backup)
+
+    def backup(self) -> AgentBackup:
+        """Return the encrypted backup."""
+        return replace(self._backup, protected=True, size=self.size())
+
+
 async def receive_file(
     hass: HomeAssistant, contents: aiohttp.BodyPartReader, path: Path
 ) -> None:
diff --git a/homeassistant/components/backup/websocket.py b/homeassistant/components/backup/websocket.py
index 70fc568c05c..4c370a4224d 100644
--- a/homeassistant/components/backup/websocket.py
+++ b/homeassistant/components/backup/websocket.py
@@ -10,12 +10,8 @@ from homeassistant.helpers import config_validation as cv
 
 from .config import Day, ScheduleRecurrence
 from .const import DATA_MANAGER, LOGGER
-from .manager import (
-    DecryptOnDowloadNotSupported,
-    IncorrectPasswordError,
-    ManagerStateEvent,
-)
-from .models import Folder
+from .manager import DecryptOnDowloadNotSupported, IncorrectPasswordError
+from .models import BackupNotFound, Folder
 
 
 @callback
@@ -34,7 +30,6 @@ def async_register_websocket_handlers(hass: HomeAssistant, with_hassio: bool) ->
     websocket_api.async_register_command(hass, handle_create_with_automatic_settings)
     websocket_api.async_register_command(hass, handle_delete)
     websocket_api.async_register_command(hass, handle_restore)
-    websocket_api.async_register_command(hass, handle_subscribe_events)
 
     websocket_api.async_register_command(hass, handle_config_info)
     websocket_api.async_register_command(hass, handle_config_update)
@@ -57,11 +52,13 @@ async def handle_info(
             "agent_errors": {
                 agent_id: str(err) for agent_id, err in agent_errors.items()
             },
-            "backups": [backup.as_frontend_json() for backup in backups.values()],
+            "backups": list(backups.values()),
             "last_attempted_automatic_backup": manager.config.data.last_attempted_automatic_backup,
             "last_completed_automatic_backup": manager.config.data.last_completed_automatic_backup,
+            "last_action_event": manager.last_action_event,
             "next_automatic_backup": manager.config.data.schedule.next_automatic_backup,
             "next_automatic_backup_additional": manager.config.data.schedule.next_automatic_backup_additional,
+            "state": manager.state,
         },
     )
 
@@ -89,7 +86,7 @@ async def handle_details(
             "agent_errors": {
                 agent_id: str(err) for agent_id, err in agent_errors.items()
             },
-            "backup": backup.as_frontend_json() if backup else None,
+            "backup": backup,
         },
     )
 
@@ -149,6 +146,8 @@ async def handle_restore(
             restore_folders=msg.get("restore_folders"),
             restore_homeassistant=msg["restore_homeassistant"],
         )
+    except BackupNotFound:
+        connection.send_error(msg["id"], "backup_not_found", "Backup not found")
     except IncorrectPasswordError:
         connection.send_error(msg["id"], "password_incorrect", "Incorrect password")
     else:
@@ -177,6 +176,8 @@ async def handle_can_decrypt_on_download(
             agent_id=msg["agent_id"],
             password=msg.get("password"),
         )
+    except BackupNotFound:
+        connection.send_error(msg["id"], "backup_not_found", "Backup not found")
     except IncorrectPasswordError:
         connection.send_error(msg["id"], "password_incorrect", "Incorrect password")
     except DecryptOnDowloadNotSupported:
@@ -197,8 +198,8 @@ async def handle_can_decrypt_on_download(
         vol.Optional("include_database", default=True): bool,
         vol.Optional("include_folders"): [vol.Coerce(Folder)],
         vol.Optional("include_homeassistant", default=True): bool,
-        vol.Optional("name"): str,
-        vol.Optional("password"): str,
+        vol.Optional("name"): vol.Any(str, None),
+        vol.Optional("password"): vol.Any(str, None),
     }
 )
 @websocket_api.async_response
@@ -306,7 +307,10 @@ async def backup_agents_info(
     connection.send_result(
         msg["id"],
         {
-            "agents": [{"agent_id": agent_id} for agent_id in manager.backup_agents],
+            "agents": [
+                {"agent_id": agent.agent_id, "name": agent.name}
+                for agent in manager.backup_agents.values()
+            ],
         },
     )
 
@@ -337,10 +341,13 @@ async def handle_config_info(
     )
 
 
+@callback
 @websocket_api.require_admin
 @websocket_api.websocket_command(
     {
         vol.Required("type"): "backup/config/update",
+        vol.Optional("agents"): vol.Schema({str: {"protected": bool}}),
+        vol.Optional("automatic_backups_configured"): bool,
         vol.Optional("create_backup"): vol.Schema(
             {
                 vol.Optional("agent_ids"): vol.All([str], vol.Unique()),
@@ -358,8 +365,10 @@ async def handle_config_info(
         ),
         vol.Optional("retention"): vol.Schema(
             {
-                vol.Optional("copies"): vol.Any(int, None),
-                vol.Optional("days"): vol.Any(int, None),
+                # Note: We can't use cv.positive_int because it allows 0 even
+                # though 0 is not positive.
+                vol.Optional("copies"): vol.Any(vol.All(int, vol.Range(min=1)), None),
+                vol.Optional("days"): vol.Any(vol.All(int, vol.Range(min=1)), None),
             },
         ),
         vol.Optional("schedule"): vol.Schema(
@@ -375,8 +384,7 @@ async def handle_config_info(
         ),
     }
 )
-@websocket_api.async_response
-async def handle_config_update(
+def handle_config_update(
     hass: HomeAssistant,
     connection: websocket_api.ActiveConnection,
     msg: dict[str, Any],
@@ -386,24 +394,5 @@ async def handle_config_update(
     changes = dict(msg)
     changes.pop("id")
     changes.pop("type")
-    await manager.config.update(**changes)
-    connection.send_result(msg["id"])
-
-
-@websocket_api.require_admin
-@websocket_api.websocket_command({vol.Required("type"): "backup/subscribe_events"})
-@websocket_api.async_response
-async def handle_subscribe_events(
-    hass: HomeAssistant,
-    connection: websocket_api.ActiveConnection,
-    msg: dict[str, Any],
-) -> None:
-    """Subscribe to backup events."""
-
-    def on_event(event: ManagerStateEvent) -> None:
-        connection.send_message(websocket_api.event_message(msg["id"], event))
-
-    manager = hass.data[DATA_MANAGER]
-    on_event(manager.last_event)
-    connection.subscriptions[msg["id"]] = manager.async_subscribe_events(on_event)
+    manager.config.update(**changes)
     connection.send_result(msg["id"])
diff --git a/homeassistant/components/baf/binary_sensor.py b/homeassistant/components/baf/binary_sensor.py
index 7c855711712..e12bfd8b90c 100644
--- a/homeassistant/components/baf/binary_sensor.py
+++ b/homeassistant/components/baf/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BAFConfigEntry
 from .entity import BAFDescriptionEntity
@@ -41,7 +41,7 @@ OCCUPANCY_SENSORS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BAFConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up BAF binary sensors."""
     device = entry.runtime_data
diff --git a/homeassistant/components/baf/climate.py b/homeassistant/components/baf/climate.py
index c30d49e8c9d..abcc2afe254 100644
--- a/homeassistant/components/baf/climate.py
+++ b/homeassistant/components/baf/climate.py
@@ -12,7 +12,7 @@ from homeassistant.components.climate import (
 )
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BAFConfigEntry
 from .entity import BAFEntity
@@ -21,7 +21,7 @@ from .entity import BAFEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BAFConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up BAF fan auto comfort."""
     device = entry.runtime_data
diff --git a/homeassistant/components/baf/fan.py b/homeassistant/components/baf/fan.py
index 8f7aab40b79..c990a248588 100644
--- a/homeassistant/components/baf/fan.py
+++ b/homeassistant/components/baf/fan.py
@@ -14,7 +14,7 @@ from homeassistant.components.fan import (
     FanEntityFeature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
     ranged_value_to_percentage,
@@ -28,7 +28,7 @@ from .entity import BAFEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BAFConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SenseME fans."""
     device = entry.runtime_data
diff --git a/homeassistant/components/baf/light.py b/homeassistant/components/baf/light.py
index 4c0b1e353fe..e8298a8e4d4 100644
--- a/homeassistant/components/baf/light.py
+++ b/homeassistant/components/baf/light.py
@@ -13,7 +13,7 @@ from homeassistant.components.light import (
     LightEntity,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BAFConfigEntry
 from .entity import BAFEntity
@@ -22,7 +22,7 @@ from .entity import BAFEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BAFConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up BAF lights."""
     device = entry.runtime_data
diff --git a/homeassistant/components/baf/number.py b/homeassistant/components/baf/number.py
index a2e5e704e4d..87b5cdc095b 100644
--- a/homeassistant/components/baf/number.py
+++ b/homeassistant/components/baf/number.py
@@ -15,7 +15,7 @@ from homeassistant.components.number import (
 )
 from homeassistant.const import EntityCategory, UnitOfTime
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BAFConfigEntry
 from .const import HALF_DAY_SECS, ONE_DAY_SECS, ONE_MIN_SECS, SPEED_RANGE
@@ -116,7 +116,7 @@ LIGHT_NUMBER_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BAFConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up BAF numbers."""
     device = entry.runtime_data
diff --git a/homeassistant/components/baf/sensor.py b/homeassistant/components/baf/sensor.py
index 7e664254a38..e9b8965b7c4 100644
--- a/homeassistant/components/baf/sensor.py
+++ b/homeassistant/components/baf/sensor.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BAFConfigEntry
 from .entity import BAFDescriptionEntity
@@ -93,7 +93,7 @@ FAN_SENSORS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BAFConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up BAF fan sensors."""
     device = entry.runtime_data
diff --git a/homeassistant/components/baf/strings.json b/homeassistant/components/baf/strings.json
index e2f02a6095e..64956984bb8 100644
--- a/homeassistant/components/baf/strings.json
+++ b/homeassistant/components/baf/strings.json
@@ -23,7 +23,7 @@
   "entity": {
     "climate": {
       "auto_comfort": {
-        "name": "Auto comfort"
+        "name": "Auto Comfort"
       }
     },
     "fan": {
@@ -39,25 +39,25 @@
     },
     "number": {
       "comfort_min_speed": {
-        "name": "Auto Comfort Minimum Speed"
+        "name": "Auto Comfort minimum speed"
       },
       "comfort_max_speed": {
-        "name": "Auto Comfort Maximum Speed"
+        "name": "Auto Comfort maximum speed"
       },
       "comfort_heat_assist_speed": {
-        "name": "Auto Comfort Heat Assist Speed"
+        "name": "Auto Comfort Heat Assist speed"
       },
       "return_to_auto_timeout": {
-        "name": "Return to Auto Timeout"
+        "name": "Return to Auto timeout"
       },
       "motion_sense_timeout": {
-        "name": "Motion Sense Timeout"
+        "name": "Motion sense timeout"
       },
       "light_return_to_auto_timeout": {
-        "name": "Light Return to Auto Timeout"
+        "name": "Light return to Auto timeout"
       },
       "light_auto_motion_timeout": {
-        "name": "Light Motion Sense Timeout"
+        "name": "Light motion sense timeout"
       }
     },
     "sensor": {
@@ -76,10 +76,10 @@
     },
     "switch": {
       "legacy_ir_remote_enable": {
-        "name": "Legacy IR Remote"
+        "name": "Legacy IR remote"
       },
       "led_indicators_enable": {
-        "name": "Led Indicators"
+        "name": "LED indicators"
       },
       "comfort_heat_assist_enable": {
         "name": "Auto Comfort Heat Assist"
@@ -88,10 +88,10 @@
         "name": "Beep"
       },
       "eco_enable": {
-        "name": "Eco Mode"
+        "name": "Eco mode"
       },
       "motion_sense_enable": {
-        "name": "Motion Sense"
+        "name": "Motion sense"
       },
       "return_to_auto_enable": {
         "name": "Return to Auto"
@@ -103,7 +103,7 @@
         "name": "Dim to Warm"
       },
       "light_return_to_auto_enable": {
-        "name": "Light Return to Auto"
+        "name": "Light return to Auto"
       }
     }
   }
diff --git a/homeassistant/components/baf/switch.py b/homeassistant/components/baf/switch.py
index e18e26ddcaa..50bd90a6107 100644
--- a/homeassistant/components/baf/switch.py
+++ b/homeassistant/components/baf/switch.py
@@ -11,7 +11,7 @@ from aiobafi6 import Device
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BAFConfigEntry
 from .entity import BAFDescriptionEntity
@@ -103,7 +103,7 @@ LIGHT_SWITCHES = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BAFConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up BAF fan switches."""
     device = entry.runtime_data
diff --git a/homeassistant/components/baidu/tts.py b/homeassistant/components/baidu/tts.py
index cdb6697d143..064dfb8d24c 100644
--- a/homeassistant/components/baidu/tts.py
+++ b/homeassistant/components/baidu/tts.py
@@ -11,7 +11,7 @@ from homeassistant.components.tts import (
     Provider,
 )
 from homeassistant.const import CONF_API_KEY
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/balboa/__init__.py b/homeassistant/components/balboa/__init__.py
index 7838db16820..54ae569bb78 100644
--- a/homeassistant/components/balboa/__init__.py
+++ b/homeassistant/components/balboa/__init__.py
@@ -12,7 +12,7 @@ from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.event import async_track_time_interval
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import CONF_SYNC_TIME, DEFAULT_SYNC_TIME
 
@@ -21,12 +21,14 @@ _LOGGER = logging.getLogger(__name__)
 PLATFORMS = [
     Platform.BINARY_SENSOR,
     Platform.CLIMATE,
+    Platform.EVENT,
     Platform.FAN,
     Platform.LIGHT,
     Platform.SELECT,
+    Platform.SWITCH,
+    Platform.TIME,
 ]
 
-
 KEEP_ALIVE_INTERVAL = timedelta(minutes=1)
 SYNC_TIME_INTERVAL = timedelta(hours=1)
 
diff --git a/homeassistant/components/balboa/binary_sensor.py b/homeassistant/components/balboa/binary_sensor.py
index b8c62ce8abf..437a01866b8 100644
--- a/homeassistant/components/balboa/binary_sensor.py
+++ b/homeassistant/components/balboa/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BalboaConfigEntry
 from .entity import BalboaEntity
@@ -22,7 +22,7 @@ from .entity import BalboaEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BalboaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the spa's binary sensors."""
     spa = entry.runtime_data
diff --git a/homeassistant/components/balboa/climate.py b/homeassistant/components/balboa/climate.py
index 76b02f0e165..3fb2457d610 100644
--- a/homeassistant/components/balboa/climate.py
+++ b/homeassistant/components/balboa/climate.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BalboaConfigEntry
 from .const import DOMAIN
@@ -47,7 +47,7 @@ TEMPERATURE_UNIT_MAP = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BalboaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the spa climate entity."""
     async_add_entities([BalboaClimateEntity(entry.runtime_data)])
diff --git a/homeassistant/components/balboa/config_flow.py b/homeassistant/components/balboa/config_flow.py
index fccfeceb331..24375ad4e55 100644
--- a/homeassistant/components/balboa/config_flow.py
+++ b/homeassistant/components/balboa/config_flow.py
@@ -10,7 +10,7 @@ from pybalboa.exceptions import SpaConnectionError
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntry, ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_HOST
+from homeassistant.const import CONF_HOST, CONF_MODEL
 from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import format_mac
@@ -18,6 +18,7 @@ from homeassistant.helpers.schema_config_entry_flow import (
     SchemaFlowFormStep,
     SchemaOptionsFlowHandler,
 )
+from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 
 from .const import CONF_SYNC_TIME, DOMAIN
 
@@ -55,7 +56,8 @@ class BalboaSpaClientFlowHandler(ConfigFlow, domain=DOMAIN):
 
     VERSION = 1
 
-    _host: str | None
+    _host: str
+    _model: str
 
     @staticmethod
     @callback
@@ -63,6 +65,43 @@ class BalboaSpaClientFlowHandler(ConfigFlow, domain=DOMAIN):
         """Get the options flow for this handler."""
         return SchemaOptionsFlowHandler(config_entry, OPTIONS_FLOW)
 
+    async def async_step_dhcp(
+        self, discovery_info: DhcpServiceInfo
+    ) -> ConfigFlowResult:
+        """Handle DHCP discovery."""
+        await self.async_set_unique_id(format_mac(discovery_info.macaddress))
+        self._abort_if_unique_id_configured(updates={CONF_HOST: discovery_info.ip})
+        self._async_abort_entries_match({CONF_HOST: discovery_info.ip})
+
+        error = None
+        try:
+            info = await validate_input({CONF_HOST: discovery_info.ip})
+        except CannotConnect:
+            error = "cannot_connect"
+        except Exception:
+            _LOGGER.exception("Unexpected exception")
+            error = "unknown"
+        if not error:
+            self._host = discovery_info.ip
+            self._model = info["title"]
+            self.context["title_placeholders"] = {CONF_MODEL: self._model}
+            return await self.async_step_discovery_confirm()
+        return self.async_abort(reason=error)
+
+    async def async_step_discovery_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Allow the user to confirm adding the device."""
+        if user_input is not None:
+            data = {CONF_HOST: self._host}
+            return self.async_create_entry(title=self._model, data=data)
+
+        self._set_confirm_only()
+        return self.async_show_form(
+            step_id="discovery_confirm",
+            description_placeholders={CONF_HOST: self._host},
+        )
+
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -78,7 +117,9 @@ class BalboaSpaClientFlowHandler(ConfigFlow, domain=DOMAIN):
                 _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
-                await self.async_set_unique_id(info["formatted_mac"])
+                await self.async_set_unique_id(
+                    info["formatted_mac"], raise_on_progress=False
+                )
                 self._abort_if_unique_id_configured()
                 return self.async_create_entry(title=info["title"], data=user_input)
 
diff --git a/homeassistant/components/balboa/event.py b/homeassistant/components/balboa/event.py
new file mode 100644
index 00000000000..57263c34783
--- /dev/null
+++ b/homeassistant/components/balboa/event.py
@@ -0,0 +1,91 @@
+"""Support for Balboa events."""
+
+from __future__ import annotations
+
+from datetime import datetime, timedelta
+
+from pybalboa import EVENT_UPDATE, SpaClient
+
+from homeassistant.components.event import EventEntity
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.event import async_track_time_interval
+
+from . import BalboaConfigEntry
+from .entity import BalboaEntity
+
+FAULT = "fault"
+FAULT_DATE = "fault_date"
+REQUEST_FAULT_LOG_INTERVAL = timedelta(minutes=5)
+
+FAULT_MESSAGE_CODE_MAP: dict[int, str] = {
+    15: "sensor_out_of_sync",
+    16: "low_flow",
+    17: "flow_failed",
+    18: "settings_reset",
+    19: "priming_mode",
+    20: "clock_failed",
+    21: "settings_reset",
+    22: "memory_failure",
+    26: "service_sensor_sync",
+    27: "heater_dry",
+    28: "heater_may_be_dry",
+    29: "water_too_hot",
+    30: "heater_too_hot",
+    31: "sensor_a_fault",
+    32: "sensor_b_fault",
+    34: "pump_stuck",
+    35: "hot_fault",
+    36: "gfci_test_failed",
+    37: "standby_mode",
+}
+FAULT_EVENT_TYPES = sorted(set(FAULT_MESSAGE_CODE_MAP.values()))
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: BalboaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the spa's events."""
+    async_add_entities([BalboaEventEntity(entry.runtime_data)])
+
+
+class BalboaEventEntity(BalboaEntity, EventEntity):
+    """Representation of a Balboa event entity."""
+
+    _attr_event_types = FAULT_EVENT_TYPES
+    _attr_translation_key = FAULT
+
+    def __init__(self, spa: SpaClient) -> None:
+        """Initialize a Balboa event entity."""
+        super().__init__(spa, FAULT)
+
+    @callback
+    def _async_handle_event(self) -> None:
+        """Handle the fault event."""
+        if not (fault := self._client.fault):
+            return
+        fault_date = fault.fault_datetime.isoformat()
+        if self.state_attributes.get(FAULT_DATE) != fault_date:
+            self._trigger_event(
+                FAULT_MESSAGE_CODE_MAP.get(fault.message_code, fault.message),
+                {FAULT_DATE: fault_date, "code": fault.message_code},
+            )
+            self.async_write_ha_state()
+
+    async def async_added_to_hass(self) -> None:
+        """Run when entity about to be added to hass."""
+        await super().async_added_to_hass()
+        self.async_on_remove(self._client.on(EVENT_UPDATE, self._async_handle_event))
+
+        async def request_fault_log(now: datetime | None = None) -> None:
+            """Request the most recent fault log."""
+            await self._client.request_fault_log()
+
+        await request_fault_log()
+        self.async_on_remove(
+            async_track_time_interval(
+                self.hass, request_fault_log, REQUEST_FAULT_LOG_INTERVAL
+            )
+        )
diff --git a/homeassistant/components/balboa/fan.py b/homeassistant/components/balboa/fan.py
index 3ecfec53a1e..b0d4379594b 100644
--- a/homeassistant/components/balboa/fan.py
+++ b/homeassistant/components/balboa/fan.py
@@ -10,7 +10,7 @@ from pybalboa.enums import OffOnState, UnknownState
 
 from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
     ranged_value_to_percentage,
@@ -23,7 +23,7 @@ from .entity import BalboaEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BalboaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the spa's pumps."""
     spa = entry.runtime_data
diff --git a/homeassistant/components/balboa/light.py b/homeassistant/components/balboa/light.py
index 21e4dfc5e08..2f48747c084 100644
--- a/homeassistant/components/balboa/light.py
+++ b/homeassistant/components/balboa/light.py
@@ -9,7 +9,7 @@ from pybalboa.enums import OffOnState, UnknownState
 
 from homeassistant.components.light import ColorMode, LightEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BalboaConfigEntry
 from .entity import BalboaEntity
@@ -18,7 +18,7 @@ from .entity import BalboaEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BalboaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the spa's lights."""
     spa = entry.runtime_data
diff --git a/homeassistant/components/balboa/manifest.json b/homeassistant/components/balboa/manifest.json
index d7c15bab88f..38d32adc4af 100644
--- a/homeassistant/components/balboa/manifest.json
+++ b/homeassistant/components/balboa/manifest.json
@@ -3,8 +3,16 @@
   "name": "Balboa Spa Client",
   "codeowners": ["@garbled1", "@natekspencer"],
   "config_flow": true,
+  "dhcp": [
+    {
+      "registered_devices": true
+    },
+    {
+      "macaddress": "001527*"
+    }
+  ],
   "documentation": "https://www.home-assistant.io/integrations/balboa",
   "iot_class": "local_push",
   "loggers": ["pybalboa"],
-  "requirements": ["pybalboa==1.0.2"]
+  "requirements": ["pybalboa==1.1.3"]
 }
diff --git a/homeassistant/components/balboa/select.py b/homeassistant/components/balboa/select.py
index e88e40ab063..ea82760744c 100644
--- a/homeassistant/components/balboa/select.py
+++ b/homeassistant/components/balboa/select.py
@@ -5,7 +5,7 @@ from pybalboa.enums import LowHighRange
 
 from homeassistant.components.select import SelectEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BalboaConfigEntry
 from .entity import BalboaEntity
@@ -14,7 +14,7 @@ from .entity import BalboaEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BalboaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the spa select entity."""
     spa = entry.runtime_data
diff --git a/homeassistant/components/balboa/strings.json b/homeassistant/components/balboa/strings.json
index 6ced7dfd8c3..784ce8533a8 100644
--- a/homeassistant/components/balboa/strings.json
+++ b/homeassistant/components/balboa/strings.json
@@ -1,5 +1,6 @@
 {
   "config": {
+    "flow_title": "{model}",
     "step": {
       "user": {
         "description": "Connect to the Balboa Wi-Fi device",
@@ -9,6 +10,9 @@
         "data_description": {
           "host": "Hostname or IP address of your Balboa Spa Wi-Fi Device. For example, 192.168.1.58."
         }
+      },
+      "confirm_discovery": {
+        "description": "Do you want to set up the spa at {host}?"
       }
     },
     "error": {
@@ -53,6 +57,35 @@
         }
       }
     },
+    "event": {
+      "fault": {
+        "name": "Fault",
+        "state_attributes": {
+          "event_type": {
+            "state": {
+              "sensor_out_of_sync": "Sensors are out of sync",
+              "low_flow": "The water flow is low",
+              "flow_failed": "The water flow has failed",
+              "settings_reset": "The settings have been reset",
+              "priming_mode": "Priming mode",
+              "clock_failed": "The clock has failed",
+              "memory_failure": "Program memory failure",
+              "service_sensor_sync": "Sensors are out of sync -- call for service",
+              "heater_dry": "The heater is dry",
+              "heater_may_be_dry": "The heater may be dry",
+              "water_too_hot": "The water is too hot",
+              "heater_too_hot": "The heater is too hot",
+              "sensor_a_fault": "Sensor A fault",
+              "sensor_b_fault": "Sensor B fault",
+              "pump_stuck": "A pump may be stuck on",
+              "hot_fault": "Hot fault",
+              "gfci_test_failed": "The GFCI test failed",
+              "standby_mode": "Standby mode (hold mode)"
+            }
+          }
+        }
+      }
+    },
     "fan": {
       "pump": {
         "name": "Pump {index}"
@@ -74,6 +107,19 @@
           "high": "High"
         }
       }
+    },
+    "switch": {
+      "filter_cycle_2_enabled": {
+        "name": "Filter cycle 2 enabled"
+      }
+    },
+    "time": {
+      "filter_cycle_start": {
+        "name": "Filter cycle {index} start"
+      },
+      "filter_cycle_end": {
+        "name": "Filter cycle {index} end"
+      }
     }
   }
 }
diff --git a/homeassistant/components/balboa/switch.py b/homeassistant/components/balboa/switch.py
new file mode 100644
index 00000000000..c8c947f499d
--- /dev/null
+++ b/homeassistant/components/balboa/switch.py
@@ -0,0 +1,48 @@
+"""Support for Balboa switches."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from pybalboa import SpaClient
+
+from homeassistant.components.switch import SwitchEntity
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import BalboaConfigEntry
+from .entity import BalboaEntity
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: BalboaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the spa's switches."""
+    spa = entry.runtime_data
+    async_add_entities([BalboaSwitchEntity(spa)])
+
+
+class BalboaSwitchEntity(BalboaEntity, SwitchEntity):
+    """Representation of a Balboa switch entity."""
+
+    def __init__(self, spa: SpaClient) -> None:
+        """Initialize a Balboa switch entity."""
+        super().__init__(spa, "filter_cycle_2_enabled")
+        self._attr_entity_category = EntityCategory.CONFIG
+        self._attr_translation_key = "filter_cycle_2_enabled"
+
+    @property
+    def is_on(self) -> bool:
+        """Return True if entity is on."""
+        return self._client.filter_cycle_2_enabled
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the entity on."""
+        await self._client.configure_filter_cycle(2, enabled=True)
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the entity off."""
+        await self._client.configure_filter_cycle(2, enabled=False)
diff --git a/homeassistant/components/balboa/time.py b/homeassistant/components/balboa/time.py
new file mode 100644
index 00000000000..83467de8777
--- /dev/null
+++ b/homeassistant/components/balboa/time.py
@@ -0,0 +1,56 @@
+"""Support for Balboa times."""
+
+from __future__ import annotations
+
+from datetime import time
+import itertools
+from typing import Any
+
+from pybalboa import SpaClient
+
+from homeassistant.components.time import TimeEntity
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import BalboaConfigEntry
+from .entity import BalboaEntity
+
+FILTER_CYCLE = "filter_cycle_"
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: BalboaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the spa's times."""
+    spa = entry.runtime_data
+    async_add_entities(
+        BalboaTimeEntity(spa, index, period)
+        for index, period in itertools.product((1, 2), ("start", "end"))
+    )
+
+
+class BalboaTimeEntity(BalboaEntity, TimeEntity):
+    """Representation of a Balboa time entity."""
+
+    entity_category = EntityCategory.CONFIG
+
+    def __init__(self, spa: SpaClient, index: int, period: str) -> None:
+        """Initialize a Balboa time entity."""
+        super().__init__(spa, f"{FILTER_CYCLE}{index}_{period}")
+        self.index = index
+        self.period = period
+        self._attr_translation_key = f"{FILTER_CYCLE}{period}"
+        self._attr_translation_placeholders = {"index": str(index)}
+
+    @property
+    def native_value(self) -> time | None:
+        """Return the value reported by the time."""
+        return getattr(self._client, f"{FILTER_CYCLE}{self.index}_{self.period}")
+
+    async def async_set_value(self, value: time) -> None:
+        """Change the time."""
+        args: dict[str, Any] = {self.period: value}
+        await self._client.configure_filter_cycle(self.index, **args)
diff --git a/homeassistant/components/bang_olufsen/__init__.py b/homeassistant/components/bang_olufsen/__init__.py
index b80e625e8d4..eab2bb3d4e5 100644
--- a/homeassistant/components/bang_olufsen/__init__.py
+++ b/homeassistant/components/bang_olufsen/__init__.py
@@ -17,7 +17,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_MODEL, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import device_registry as dr
 from homeassistant.util.ssl import get_default_context
 
 from .const import DOMAIN
diff --git a/homeassistant/components/bang_olufsen/diagnostics.py b/homeassistant/components/bang_olufsen/diagnostics.py
index cab7eae5e25..3835de7c551 100644
--- a/homeassistant/components/bang_olufsen/diagnostics.py
+++ b/homeassistant/components/bang_olufsen/diagnostics.py
@@ -4,12 +4,13 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
 
+from homeassistant.components.event import DOMAIN as EVENT_DOMAIN
 from homeassistant.components.media_player import DOMAIN as MEDIA_PLAYER_DOMAIN
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from . import BangOlufsenConfigEntry
-from .const import DOMAIN
+from .const import DEVICE_BUTTONS, DOMAIN
 
 
 async def async_get_config_entry_diagnostics(
@@ -25,8 +26,9 @@ async def async_get_config_entry_diagnostics(
     if TYPE_CHECKING:
         assert config_entry.unique_id
 
-    # Add media_player entity's state
     entity_registry = er.async_get(hass)
+
+    # Add media_player entity's state
     if entity_id := entity_registry.async_get_entity_id(
         MEDIA_PLAYER_DOMAIN, DOMAIN, config_entry.unique_id
     ):
@@ -37,4 +39,16 @@ async def async_get_config_entry_diagnostics(
             state_dict.pop("context")
             data["media_player"] = state_dict
 
+    # Add button Event entity states (if enabled)
+    for device_button in DEVICE_BUTTONS:
+        if entity_id := entity_registry.async_get_entity_id(
+            EVENT_DOMAIN, DOMAIN, f"{config_entry.unique_id}_{device_button}"
+        ):
+            if state := hass.states.get(entity_id):
+                state_dict = dict(state.as_dict())
+
+                # Remove context as it is not relevant
+                state_dict.pop("context")
+                data[f"{device_button}_event"] = state_dict
+
     return data
diff --git a/homeassistant/components/bang_olufsen/event.py b/homeassistant/components/bang_olufsen/event.py
index 80ad4060c5e..91e04b92330 100644
--- a/homeassistant/components/bang_olufsen/event.py
+++ b/homeassistant/components/bang_olufsen/event.py
@@ -6,7 +6,7 @@ from homeassistant.components.event import EventDeviceClass, EventEntity
 from homeassistant.const import CONF_MODEL
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BangOlufsenConfigEntry
 from .const import (
@@ -19,11 +19,13 @@ from .const import (
 )
 from .entity import BangOlufsenEntity
 
+PARALLEL_UPDATES = 0
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BangOlufsenConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Sensor entities from config entry."""
 
diff --git a/homeassistant/components/bang_olufsen/media_player.py b/homeassistant/components/bang_olufsen/media_player.py
index 282ecdd2ae5..efb6843356b 100644
--- a/homeassistant/components/bang_olufsen/media_player.py
+++ b/homeassistant/components/bang_olufsen/media_player.py
@@ -64,7 +64,7 @@ from homeassistant.helpers import (
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import (
-    AddEntitiesCallback,
+    AddConfigEntryEntitiesCallback,
     async_get_current_platform,
 )
 from homeassistant.util.dt import utcnow
@@ -118,7 +118,7 @@ BANG_OLUFSEN_FEATURES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BangOlufsenConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Media Player entity from config entry."""
     # Add MediaPlayer entity
diff --git a/homeassistant/components/bang_olufsen/strings.json b/homeassistant/components/bang_olufsen/strings.json
index 57ab828f9fb..422dc4be567 100644
--- a/homeassistant/components/bang_olufsen/strings.json
+++ b/homeassistant/components/bang_olufsen/strings.json
@@ -29,7 +29,7 @@
         "description": "Manually configure your Bang & Olufsen device."
       },
       "zeroconf_confirm": {
-        "title": "Setup Bang & Olufsen device",
+        "title": "Set up Bang & Olufsen device",
         "description": "Confirm the configuration of the {model}-{serial_number} @ {host}."
       }
     }
@@ -197,11 +197,11 @@
   "services": {
     "beolink_allstandby": {
       "name": "Beolink all standby",
-      "description": "Set all Connected Beolink devices to standby."
+      "description": "Sets all connected Beolink devices to standby."
     },
     "beolink_expand": {
       "name": "Beolink expand",
-      "description": "Expand current Beolink experience.",
+      "description": "Adds devices to the current Beolink experience.",
       "fields": {
         "all_discovered": {
           "name": "All discovered",
@@ -221,7 +221,7 @@
     },
     "beolink_join": {
       "name": "Beolink join",
-      "description": "Join a Beolink experience.",
+      "description": "Joins a Beolink experience.",
       "fields": {
         "beolink_jid": {
           "name": "Beolink JID",
@@ -241,11 +241,11 @@
     },
     "beolink_leave": {
       "name": "Beolink leave",
-      "description": "Leave a Beolink experience."
+      "description": "Leaves a Beolink experience."
     },
     "beolink_unexpand": {
       "name": "Beolink unexpand",
-      "description": "Unexpand from current Beolink experience.",
+      "description": "Removes devices from the current Beolink experience.",
       "fields": {
         "beolink_jids": {
           "name": "Beolink JIDs",
@@ -274,7 +274,7 @@
       "message": "An error occurred while attempting to play {media_type}: {error_message}."
     },
     "invalid_grouping_entity": {
-      "message": "Entity with id: {entity_id} can't be added to the Beolink session. Is the entity a Bang & Olufsen media_player?"
+      "message": "Entity with ID {entity_id} can't be added to the Beolink session. Is the entity a Bang & Olufsen media_player?"
     },
     "invalid_sound_mode": {
       "message": "{invalid_sound_mode} is an invalid sound mode. Valid values are: {valid_sound_modes}."
diff --git a/homeassistant/components/bayesian/binary_sensor.py b/homeassistant/components/bayesian/binary_sensor.py
index 74e3db34b68..32f43983991 100644
--- a/homeassistant/components/bayesian/binary_sensor.py
+++ b/homeassistant/components/bayesian/binary_sensor.py
@@ -31,8 +31,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, EventStateChangedData, HomeAssistant, callback
 from homeassistant.exceptions import ConditionError, TemplateError
-from homeassistant.helpers import condition
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import condition, config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import (
     TrackTemplate,
diff --git a/homeassistant/components/bayesian/strings.json b/homeassistant/components/bayesian/strings.json
index 9ebccedc88d..00de79a2229 100644
--- a/homeassistant/components/bayesian/strings.json
+++ b/homeassistant/components/bayesian/strings.json
@@ -5,14 +5,14 @@
       "title": "Manual YAML fix required for Bayesian"
     },
     "no_prob_given_false": {
-      "description": "In the Bayesian integration `prob_given_false` is now a required configuration variable as there was no mathematical rationale for the previous default value. Please add this to your `configuration.yml` for `bayesian/{entity}`. These observations will be ignored until you do.",
+      "description": "In the Bayesian integration `prob_given_false` is now a required configuration variable as there was no mathematical rationale for the previous default value. Please add this to your `configuration.yaml` for `bayesian/{entity}`. These observations will be ignored until you do.",
       "title": "Manual YAML addition required for Bayesian"
     }
   },
   "services": {
     "reload": {
       "name": "[%key:common::action::reload%]",
-      "description": "Reloads bayesian sensors from the YAML-configuration."
+      "description": "Reloads Bayesian sensors from the YAML-configuration."
     }
   }
 }
diff --git a/homeassistant/components/bbox/device_tracker.py b/homeassistant/components/bbox/device_tracker.py
index 12174d395f7..18b62f2a506 100644
--- a/homeassistant/components/bbox/device_tracker.py
+++ b/homeassistant/components/bbox/device_tracker.py
@@ -16,10 +16,9 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.util import Throttle
-import homeassistant.util.dt as dt_util
+from homeassistant.util import Throttle, dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/bbox/sensor.py b/homeassistant/components/bbox/sensor.py
index 72fa870efbf..fed059247d0 100644
--- a/homeassistant/components/bbox/sensor.py
+++ b/homeassistant/components/bbox/sensor.py
@@ -18,7 +18,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_MONITORED_VARIABLES, CONF_NAME, UnitOfDataRate
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/beewi_smartclim/sensor.py b/homeassistant/components/beewi_smartclim/sensor.py
index 1c80f62e64f..3a0a6f21f98 100644
--- a/homeassistant/components/beewi_smartclim/sensor.py
+++ b/homeassistant/components/beewi_smartclim/sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_MAC, CONF_NAME, PERCENTAGE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/bitcoin/sensor.py b/homeassistant/components/bitcoin/sensor.py
index e4da2ddc2f4..cb7bc5a043b 100644
--- a/homeassistant/components/bitcoin/sensor.py
+++ b/homeassistant/components/bitcoin/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_CURRENCY, CONF_DISPLAY_OPTIONS, UnitOfTime
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/bizkaibus/sensor.py b/homeassistant/components/bizkaibus/sensor.py
index 3efddf0b0d7..085c0093073 100644
--- a/homeassistant/components/bizkaibus/sensor.py
+++ b/homeassistant/components/bizkaibus/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_NAME, UnitOfTime
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/blackbird/media_player.py b/homeassistant/components/blackbird/media_player.py
index 37672e98e0b..2d39512cbe0 100644
--- a/homeassistant/components/blackbird/media_player.py
+++ b/homeassistant/components/blackbird/media_player.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     CONF_TYPE,
 )
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/blebox/binary_sensor.py b/homeassistant/components/blebox/binary_sensor.py
index 2aa86059ee2..b9032e6e705 100644
--- a/homeassistant/components/blebox/binary_sensor.py
+++ b/homeassistant/components/blebox/binary_sensor.py
@@ -8,7 +8,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BleBoxConfigEntry
 from .entity import BleBoxEntity
@@ -24,7 +24,7 @@ BINARY_SENSOR_TYPES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BleBoxConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a BleBox entry."""
     entities = [
diff --git a/homeassistant/components/blebox/button.py b/homeassistant/components/blebox/button.py
index 90356c8ae14..15867f84029 100644
--- a/homeassistant/components/blebox/button.py
+++ b/homeassistant/components/blebox/button.py
@@ -6,7 +6,7 @@ import blebox_uniapi.button
 
 from homeassistant.components.button import ButtonEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BleBoxConfigEntry
 from .entity import BleBoxEntity
@@ -15,7 +15,7 @@ from .entity import BleBoxEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BleBoxConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a BleBox button entry."""
     entities = [
diff --git a/homeassistant/components/blebox/climate.py b/homeassistant/components/blebox/climate.py
index 2c528d50e3e..dbf4a326990 100644
--- a/homeassistant/components/blebox/climate.py
+++ b/homeassistant/components/blebox/climate.py
@@ -13,7 +13,7 @@ from homeassistant.components.climate import (
 )
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BleBoxConfigEntry
 from .entity import BleBoxEntity
@@ -38,7 +38,7 @@ BLEBOX_TO_HVACACTION = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BleBoxConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a BleBox climate entity."""
     entities = [
diff --git a/homeassistant/components/blebox/cover.py b/homeassistant/components/blebox/cover.py
index 4f2a7eeef11..c52c551bbac 100644
--- a/homeassistant/components/blebox/cover.py
+++ b/homeassistant/components/blebox/cover.py
@@ -16,7 +16,7 @@ from homeassistant.components.cover import (
     CoverState,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BleBoxConfigEntry
 from .entity import BleBoxEntity
@@ -45,7 +45,7 @@ BLEBOX_TO_HASS_COVER_STATES = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BleBoxConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a BleBox entry."""
     entities = [
diff --git a/homeassistant/components/blebox/light.py b/homeassistant/components/blebox/light.py
index c3c9de8be51..86ec8993779 100644
--- a/homeassistant/components/blebox/light.py
+++ b/homeassistant/components/blebox/light.py
@@ -21,7 +21,7 @@ from homeassistant.components.light import (
     LightEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import color as color_util
 
 from . import BleBoxConfigEntry
@@ -35,7 +35,7 @@ SCAN_INTERVAL = timedelta(seconds=5)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BleBoxConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a BleBox entry."""
     entities = [
diff --git a/homeassistant/components/blebox/sensor.py b/homeassistant/components/blebox/sensor.py
index c0abff31257..5120a7a3c98 100644
--- a/homeassistant/components/blebox/sensor.py
+++ b/homeassistant/components/blebox/sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BleBoxConfigEntry
 from .entity import BleBoxEntity
@@ -116,7 +116,7 @@ SENSOR_TYPES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BleBoxConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a BleBox entry."""
     entities = [
diff --git a/homeassistant/components/blebox/switch.py b/homeassistant/components/blebox/switch.py
index c6f439e27c5..1598d4db6fa 100644
--- a/homeassistant/components/blebox/switch.py
+++ b/homeassistant/components/blebox/switch.py
@@ -7,7 +7,7 @@ import blebox_uniapi.switch
 
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BleBoxConfigEntry
 from .entity import BleBoxEntity
@@ -18,7 +18,7 @@ SCAN_INTERVAL = timedelta(seconds=5)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BleBoxConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a BleBox switch entity."""
     entities = [
diff --git a/homeassistant/components/blink/__init__.py b/homeassistant/components/blink/__init__.py
index f6516434cd2..d328849e6fe 100644
--- a/homeassistant/components/blink/__init__.py
+++ b/homeassistant/components/blink/__init__.py
@@ -85,7 +85,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: BlinkConfigEntry) -> boo
     auth_data = deepcopy(dict(entry.data))
     blink.auth = Auth(auth_data, no_prompt=True, session=session)
     blink.refresh_rate = entry.options.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL)
-    coordinator = BlinkUpdateCoordinator(hass, blink)
+    coordinator = BlinkUpdateCoordinator(hass, entry, blink)
 
     try:
         await blink.start()
diff --git a/homeassistant/components/blink/alarm_control_panel.py b/homeassistant/components/blink/alarm_control_panel.py
index bfb8aa9a3a0..17fd003742f 100644
--- a/homeassistant/components/blink/alarm_control_panel.py
+++ b/homeassistant/components/blink/alarm_control_panel.py
@@ -15,7 +15,7 @@ from homeassistant.const import ATTR_ATTRIBUTION
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DEFAULT_ATTRIBUTION, DEFAULT_BRAND, DOMAIN
@@ -27,7 +27,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BlinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Blink Alarm Control Panels."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/blink/binary_sensor.py b/homeassistant/components/blink/binary_sensor.py
index c11d4cfea23..3d5430c8d1f 100644
--- a/homeassistant/components/blink/binary_sensor.py
+++ b/homeassistant/components/blink/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
@@ -48,7 +48,7 @@ BINARY_SENSORS_TYPES: tuple[BinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BlinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the blink binary sensors."""
 
diff --git a/homeassistant/components/blink/camera.py b/homeassistant/components/blink/camera.py
index 56a84135a9b..04bd125d249 100644
--- a/homeassistant/components/blink/camera.py
+++ b/homeassistant/components/blink/camera.py
@@ -13,10 +13,9 @@ from homeassistant.components.camera import Camera
 from homeassistant.const import CONF_FILE_PATH, CONF_FILENAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers import entity_platform
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
@@ -39,7 +38,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BlinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Blink Camera."""
 
diff --git a/homeassistant/components/blink/coordinator.py b/homeassistant/components/blink/coordinator.py
index 7278dabe083..b9a0db101b4 100644
--- a/homeassistant/components/blink/coordinator.py
+++ b/homeassistant/components/blink/coordinator.py
@@ -23,12 +23,17 @@ type BlinkConfigEntry = ConfigEntry[BlinkUpdateCoordinator]
 class BlinkUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """BlinkUpdateCoordinator - In charge of downloading the data for a site."""
 
-    def __init__(self, hass: HomeAssistant, api: Blink) -> None:
+    config_entry: BlinkConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: BlinkConfigEntry, api: Blink
+    ) -> None:
         """Initialize the data service."""
         self.api = api
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=SCAN_INTERVAL),
         )
diff --git a/homeassistant/components/blink/sensor.py b/homeassistant/components/blink/sensor.py
index e0b5989cc80..1df708c3a10 100644
--- a/homeassistant/components/blink/sensor.py
+++ b/homeassistant/components/blink/sensor.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DEFAULT_BRAND, DOMAIN, TYPE_TEMPERATURE, TYPE_WIFI_STRENGTH
@@ -47,7 +47,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BlinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize a Blink sensor."""
 
diff --git a/homeassistant/components/blink/switch.py b/homeassistant/components/blink/switch.py
index 8eabd5c0e59..4f490e28310 100644
--- a/homeassistant/components/blink/switch.py
+++ b/homeassistant/components/blink/switch.py
@@ -12,7 +12,7 @@ from homeassistant.components.switch import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DEFAULT_BRAND, DOMAIN, TYPE_CAMERA_ARMED
@@ -30,7 +30,7 @@ SWITCH_TYPES: tuple[SwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BlinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Blink switches."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/blinksticklight/light.py b/homeassistant/components/blinksticklight/light.py
index 19ac5f80242..01e5c90aadf 100644
--- a/homeassistant/components/blinksticklight/light.py
+++ b/homeassistant/components/blinksticklight/light.py
@@ -17,10 +17,10 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.color as color_util
+from homeassistant.util import color as color_util
 
 CONF_SERIAL = "serial"
 
diff --git a/homeassistant/components/blockchain/sensor.py b/homeassistant/components/blockchain/sensor.py
index 8ae091fa95e..a6aedb2c472 100644
--- a/homeassistant/components/blockchain/sensor.py
+++ b/homeassistant/components/blockchain/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/blue_current/sensor.py b/homeassistant/components/blue_current/sensor.py
index be39e9571ec..9ea444f9ec2 100644
--- a/homeassistant/components/blue_current/sensor.py
+++ b/homeassistant/components/blue_current/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
     UnitOfPower,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BlueCurrentConfigEntry, Connector
 from .const import DOMAIN
@@ -212,7 +212,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BlueCurrentConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Blue Current sensors."""
     connector = entry.runtime_data
diff --git a/homeassistant/components/blue_current/strings.json b/homeassistant/components/blue_current/strings.json
index 0154c794c33..2e48d768a74 100644
--- a/homeassistant/components/blue_current/strings.json
+++ b/homeassistant/components/blue_current/strings.json
@@ -28,7 +28,7 @@
         "name": "Activity",
         "state": {
           "available": "Available",
-          "charging": "Charging",
+          "charging": "[%key:common::state::charging%]",
           "unavailable": "Unavailable",
           "error": "Error",
           "offline": "Offline"
diff --git a/homeassistant/components/bluemaestro/sensor.py b/homeassistant/components/bluemaestro/sensor.py
index 57702d4ff31..1163f8a1ff6 100644
--- a/homeassistant/components/bluemaestro/sensor.py
+++ b/homeassistant/components/bluemaestro/sensor.py
@@ -27,7 +27,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from . import BlueMaestroConfigEntry
@@ -116,7 +116,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BlueMaestroConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the BlueMaestro BLE sensors."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/blueprint/importer.py b/homeassistant/components/blueprint/importer.py
index 8582761bafb..83afa511b68 100644
--- a/homeassistant/components/blueprint/importer.py
+++ b/homeassistant/components/blueprint/importer.py
@@ -6,6 +6,7 @@ from contextlib import suppress
 from dataclasses import dataclass
 import html
 import re
+from typing import TYPE_CHECKING
 
 import voluptuous as vol
 import yarl
@@ -195,8 +196,8 @@ async def fetch_blueprint_from_github_gist_url(
     )
     gist = await resp.json()
 
-    blueprint = None
-    filename = None
+    blueprint: Blueprint | None = None
+    filename: str | None = None
     content: str
 
     for filename, info in gist["files"].items():
@@ -218,6 +219,8 @@ async def fetch_blueprint_from_github_gist_url(
             "No valid blueprint found in the gist. The blueprint file needs to end with"
             " '.yaml'"
         )
+    if TYPE_CHECKING:
+        assert isinstance(filename, str)
 
     return ImportedBlueprint(
         f"{gist['owner']['login']}/{filename[:-5]}", content, blueprint
diff --git a/homeassistant/components/bluesound/__init__.py b/homeassistant/components/bluesound/__init__.py
index 6cf1957f799..37e83ce2c47 100644
--- a/homeassistant/components/bluesound/__init__.py
+++ b/homeassistant/components/bluesound/__init__.py
@@ -1,8 +1,6 @@
 """The bluesound component."""
 
-from dataclasses import dataclass
-
-from pyblu import Player, SyncStatus
+from pyblu import Player
 from pyblu.errors import PlayerUnreachableError
 
 from homeassistant.config_entries import ConfigEntry
@@ -14,7 +12,11 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
-from .coordinator import BluesoundCoordinator
+from .coordinator import (
+    BluesoundConfigEntry,
+    BluesoundCoordinator,
+    BluesoundRuntimeData,
+)
 
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
@@ -23,18 +25,6 @@ PLATFORMS = [
 ]
 
 
-@dataclass
-class BluesoundRuntimeData:
-    """Bluesound data class."""
-
-    player: Player
-    sync_status: SyncStatus
-    coordinator: BluesoundCoordinator
-
-
-type BluesoundConfigEntry = ConfigEntry[BluesoundRuntimeData]
-
-
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Bluesound."""
     return True
@@ -53,7 +43,7 @@ async def async_setup_entry(
     except PlayerUnreachableError as ex:
         raise ConfigEntryNotReady(f"Error connecting to {host}:{port}") from ex
 
-    coordinator = BluesoundCoordinator(hass, player, sync_status)
+    coordinator = BluesoundCoordinator(hass, config_entry, player, sync_status)
     await coordinator.async_config_entry_first_refresh()
 
     config_entry.runtime_data = BluesoundRuntimeData(player, sync_status, coordinator)
diff --git a/homeassistant/components/bluesound/config_flow.py b/homeassistant/components/bluesound/config_flow.py
index 2f002b70e1d..cfb6646d829 100644
--- a/homeassistant/components/bluesound/config_flow.py
+++ b/homeassistant/components/bluesound/config_flow.py
@@ -75,6 +75,9 @@ class BluesoundConfigFlow(ConfigFlow, domain=DOMAIN):
         self, discovery_info: ZeroconfServiceInfo
     ) -> ConfigFlowResult:
         """Handle a flow initialized by zeroconf discovery."""
+        # the player can have an ipv6 address, but the api is only available on ipv4
+        if discovery_info.ip_address.version != 4:
+            return self.async_abort(reason="no_ipv4_address")
         if discovery_info.port is not None:
             self._port = discovery_info.port
 
diff --git a/homeassistant/components/bluesound/coordinator.py b/homeassistant/components/bluesound/coordinator.py
index e62f3ef96cf..ceaf0b392eb 100644
--- a/homeassistant/components/bluesound/coordinator.py
+++ b/homeassistant/components/bluesound/coordinator.py
@@ -12,6 +12,7 @@ import logging
 from pyblu import Input, Player, Preset, Status, SyncStatus
 from pyblu.errors import PlayerUnreachableError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -21,6 +22,15 @@ NODE_OFFLINE_CHECK_TIMEOUT = timedelta(minutes=3)
 PRESET_AND_INPUTS_INTERVAL = timedelta(minutes=15)
 
 
+@dataclass
+class BluesoundRuntimeData:
+    """Bluesound data class."""
+
+    player: Player
+    sync_status: SyncStatus
+    coordinator: BluesoundCoordinator
+
+
 @dataclass
 class BluesoundData:
     """Define a class to hold Bluesound data."""
@@ -31,6 +41,9 @@ class BluesoundData:
     inputs: list[Input]
 
 
+type BluesoundConfigEntry = ConfigEntry[BluesoundRuntimeData]
+
+
 def cancel_task(task: asyncio.Task) -> Callable[[], Coroutine[None, None, None]]:
     """Cancel a task."""
 
@@ -45,8 +58,14 @@ def cancel_task(task: asyncio.Task) -> Callable[[], Coroutine[None, None, None]]
 class BluesoundCoordinator(DataUpdateCoordinator[BluesoundData]):
     """Define an object to hold Bluesound data."""
 
+    config_entry: BluesoundConfigEntry
+
     def __init__(
-        self, hass: HomeAssistant, player: Player, sync_status: SyncStatus
+        self,
+        hass: HomeAssistant,
+        config_entry: BluesoundConfigEntry,
+        player: Player,
+        sync_status: SyncStatus,
     ) -> None:
         """Initialize."""
         self.player = player
@@ -55,12 +74,11 @@ class BluesoundCoordinator(DataUpdateCoordinator[BluesoundData]):
         super().__init__(
             hass,
             logger=_LOGGER,
+            config_entry=config_entry,
             name=sync_status.name,
         )
 
     async def _async_setup(self) -> None:
-        assert self.config_entry is not None
-
         preset = await self.player.presets()
         inputs = await self.player.inputs()
         status = await self.player.status()
diff --git a/homeassistant/components/bluesound/media_player.py b/homeassistant/components/bluesound/media_player.py
index 12e2f537935..135d1b5d27e 100644
--- a/homeassistant/components/bluesound/media_player.py
+++ b/homeassistant/components/bluesound/media_player.py
@@ -32,9 +32,9 @@ from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import ATTR_BLUESOUND_GROUP, ATTR_MASTER, DOMAIN
 from .coordinator import BluesoundCoordinator
@@ -61,7 +61,7 @@ POLL_TIMEOUT = 120
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BluesoundConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Bluesound entry."""
     bluesound_player = BluesoundPlayer(
diff --git a/homeassistant/components/bluesound/strings.json b/homeassistant/components/bluesound/strings.json
index c85014fedc3..1170e0b92e0 100644
--- a/homeassistant/components/bluesound/strings.json
+++ b/homeassistant/components/bluesound/strings.json
@@ -19,7 +19,8 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]"
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "no_ipv4_address": "No IPv4 address found."
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
@@ -28,7 +29,7 @@
   "services": {
     "join": {
       "name": "Join",
-      "description": "Group player together.",
+      "description": "Groups players together under a single master speaker.",
       "fields": {
         "master": {
           "name": "Master",
@@ -36,23 +37,23 @@
         },
         "entity_id": {
           "name": "Entity",
-          "description": "Name of entity that will coordinate the grouping. Platform dependent."
+          "description": "Name of entity that will group to master speaker. Platform dependent."
         }
       }
     },
     "unjoin": {
       "name": "Unjoin",
-      "description": "Unjoin the player from a group.",
+      "description": "Separates a player from a group.",
       "fields": {
         "entity_id": {
           "name": "Entity",
-          "description": "Name of entity that will be unjoined from their group. Platform dependent."
+          "description": "Name of entity that will be separated from their group. Platform dependent."
         }
       }
     },
     "set_sleep_timer": {
       "name": "Set sleep timer",
-      "description": "Set a Bluesound timer. It will increase timer in steps: 15, 30, 45, 60, 90, 0.",
+      "description": "Sets a Bluesound timer that will turn off the speaker. It will increase in steps: 15, 30, 45, 60, 90, 0.",
       "fields": {
         "entity_id": {
           "name": "Entity",
@@ -62,7 +63,7 @@
     },
     "clear_sleep_timer": {
       "name": "Clear sleep timer",
-      "description": "Clear a Bluesound timer.",
+      "description": "Clears a Bluesound timer.",
       "fields": {
         "entity_id": {
           "name": "Entity",
diff --git a/homeassistant/components/bluetooth/__init__.py b/homeassistant/components/bluetooth/__init__.py
index 5edec1ccc23..7abc929fde5 100644
--- a/homeassistant/components/bluetooth/__init__.py
+++ b/homeassistant/components/bluetooth/__init__.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 import datetime
 import logging
 import platform
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
 from bleak_retry_connector import BleakSlotManager
 from bluetooth_adapters import (
@@ -80,6 +80,7 @@ from .const import (
     CONF_DETAILS,
     CONF_PASSIVE,
     CONF_SOURCE_CONFIG_ENTRY_ID,
+    CONF_SOURCE_DEVICE_ID,
     CONF_SOURCE_DOMAIN,
     CONF_SOURCE_MODEL,
     DOMAIN,
@@ -297,7 +298,11 @@ async def async_discover_adapters(
 
 
 async def async_update_device(
-    hass: HomeAssistant, entry: ConfigEntry, adapter: str, details: AdapterDetails
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    adapter: str,
+    details: AdapterDetails,
+    via_device_id: str | None = None,
 ) -> None:
     """Update device registry entry.
 
@@ -306,15 +311,34 @@ async def async_update_device(
     update the device with the new location so they can
     figure out where the adapter is.
     """
-    dr.async_get(hass).async_get_or_create(
+    address = details[ADAPTER_ADDRESS]
+    connections = {(dr.CONNECTION_BLUETOOTH, address)}
+    device_registry = dr.async_get(hass)
+    # We only have one device for the config entry
+    # so if the address has been corrected, make
+    # sure the device entry reflects the correct
+    # address
+    for device in dr.async_entries_for_config_entry(device_registry, entry.entry_id):
+        for conn_type, conn_value in device.connections:
+            if conn_type == dr.CONNECTION_BLUETOOTH and conn_value != address:
+                device_registry.async_update_device(
+                    device.id, new_connections=connections
+                )
+                break
+    device_entry = device_registry.async_get_or_create(
         config_entry_id=entry.entry_id,
-        name=adapter_human_name(adapter, details[ADAPTER_ADDRESS]),
-        connections={(dr.CONNECTION_BLUETOOTH, details[ADAPTER_ADDRESS])},
+        name=adapter_human_name(adapter, address),
+        connections=connections,
         manufacturer=details[ADAPTER_MANUFACTURER],
         model=adapter_model(details),
         sw_version=details.get(ADAPTER_SW_VERSION),
         hw_version=details.get(ADAPTER_HW_VERSION),
     )
+    if via_device_id and (via_device_entry := device_registry.async_get(via_device_id)):
+        kwargs: dict[str, Any] = {"via_device_id": via_device_id}
+        if not device_entry.area_id and via_device_entry.area_id:
+            kwargs["area_id"] = via_device_entry.area_id
+        device_registry.async_update_device(device_entry.id, **kwargs)
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
@@ -331,9 +355,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
                     )
                 )
             )
+            return True
         address = entry.unique_id
         assert address is not None
-        assert source_entry is not None
         source_domain = entry.data[CONF_SOURCE_DOMAIN]
         if mac_manufacturer := await get_manufacturer_from_mac(address):
             manufacturer = f"{mac_manufacturer} ({source_domain})"
@@ -349,6 +373,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             entry,
             source_entry.title,
             details,
+            entry.data.get(CONF_SOURCE_DEVICE_ID),
         )
         return True
     manager = _get_manager(hass)
diff --git a/homeassistant/components/bluetooth/api.py b/homeassistant/components/bluetooth/api.py
index 9db570c4cba..00e585fa266 100644
--- a/homeassistant/components/bluetooth/api.py
+++ b/homeassistant/components/bluetooth/api.py
@@ -181,10 +181,16 @@ def async_register_scanner(
     source_domain: str | None = None,
     source_model: str | None = None,
     source_config_entry_id: str | None = None,
+    source_device_id: str | None = None,
 ) -> CALLBACK_TYPE:
     """Register a BleakScanner."""
     return _get_manager(hass).async_register_hass_scanner(
-        scanner, connection_slots, source_domain, source_model, source_config_entry_id
+        scanner,
+        connection_slots,
+        source_domain,
+        source_model,
+        source_config_entry_id,
+        source_device_id,
     )
 
 
diff --git a/homeassistant/components/bluetooth/config_flow.py b/homeassistant/components/bluetooth/config_flow.py
index 5bfe5e7089c..328707bd722 100644
--- a/homeassistant/components/bluetooth/config_flow.py
+++ b/homeassistant/components/bluetooth/config_flow.py
@@ -37,6 +37,7 @@ from .const import (
     CONF_PASSIVE,
     CONF_SOURCE,
     CONF_SOURCE_CONFIG_ENTRY_ID,
+    CONF_SOURCE_DEVICE_ID,
     CONF_SOURCE_DOMAIN,
     CONF_SOURCE_MODEL,
     DOMAIN,
@@ -139,7 +140,7 @@ class BluetoothConfigFlow(ConfigFlow, domain=DOMAIN):
                 title=adapter_title(adapter, details), data={}
             )
 
-        configured_addresses = self._async_current_ids()
+        configured_addresses = self._async_current_ids(include_ignore=False)
         bluetooth_adapters = get_adapters()
         await bluetooth_adapters.refresh()
         self._adapters = bluetooth_adapters.adapters
@@ -154,12 +155,8 @@ class BluetoothConfigFlow(ConfigFlow, domain=DOMAIN):
             and not (system == "Linux" and details[ADAPTER_ADDRESS] == DEFAULT_ADDRESS)
         ]
         if not unconfigured_adapters:
-            ignored_adapters = len(
-                self._async_current_entries(include_ignore=True)
-            ) - len(self._async_current_entries(include_ignore=False))
             return self.async_abort(
                 reason="no_adapters",
-                description_placeholders={"ignored_adapters": str(ignored_adapters)},
             )
         if len(unconfigured_adapters) == 1:
             self._adapter = list(self._adapters)[0]
@@ -189,15 +186,28 @@ class BluetoothConfigFlow(ConfigFlow, domain=DOMAIN):
         """Handle a flow initialized by an external scanner."""
         source = user_input[CONF_SOURCE]
         await self.async_set_unique_id(source)
+        source_config_entry_id = user_input[CONF_SOURCE_CONFIG_ENTRY_ID]
         data = {
             CONF_SOURCE: source,
             CONF_SOURCE_MODEL: user_input[CONF_SOURCE_MODEL],
             CONF_SOURCE_DOMAIN: user_input[CONF_SOURCE_DOMAIN],
-            CONF_SOURCE_CONFIG_ENTRY_ID: user_input[CONF_SOURCE_CONFIG_ENTRY_ID],
+            CONF_SOURCE_CONFIG_ENTRY_ID: source_config_entry_id,
+            CONF_SOURCE_DEVICE_ID: user_input[CONF_SOURCE_DEVICE_ID],
         }
         self._abort_if_unique_id_configured(updates=data)
-        manager = get_manager()
-        scanner = manager.async_scanner_by_source(source)
+        for entry in self._async_current_entries(include_ignore=False):
+            # If the mac address needs to be corrected, migrate
+            # the config entry to the new mac address
+            if (
+                entry.data.get(CONF_SOURCE_CONFIG_ENTRY_ID) == source_config_entry_id
+                and entry.unique_id != source
+            ):
+                self.hass.config_entries.async_update_entry(
+                    entry, unique_id=source, data={**entry.data, **data}
+                )
+                self.hass.config_entries.async_schedule_reload(entry.entry_id)
+                return self.async_abort(reason="already_configured")
+        scanner = get_manager().async_scanner_by_source(source)
         assert scanner is not None
         return self.async_create_entry(title=scanner.name, data=data)
 
@@ -211,10 +221,16 @@ class BluetoothConfigFlow(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(
         config_entry: ConfigEntry,
-    ) -> SchemaOptionsFlowHandler | RemoteAdapterOptionsFlowHandler:
+    ) -> (
+        SchemaOptionsFlowHandler
+        | RemoteAdapterOptionsFlowHandler
+        | LocalNoPassiveOptionsFlowHandler
+    ):
         """Get the options flow for this handler."""
         if CONF_SOURCE in config_entry.data:
             return RemoteAdapterOptionsFlowHandler()
+        if not (manager := get_manager()) or not manager.supports_passive_scan:
+            return LocalNoPassiveOptionsFlowHandler()
         return SchemaOptionsFlowHandler(config_entry, OPTIONS_FLOW)
 
     @classmethod
@@ -232,3 +248,13 @@ class RemoteAdapterOptionsFlowHandler(OptionsFlow):
     ) -> ConfigFlowResult:
         """Handle options flow."""
         return self.async_abort(reason="remote_adapters_not_supported")
+
+
+class LocalNoPassiveOptionsFlowHandler(OptionsFlow):
+    """Handle a option flow for local adapters with no passive support."""
+
+    async def async_step_init(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle options flow."""
+        return self.async_abort(reason="local_adapters_no_passive_support")
diff --git a/homeassistant/components/bluetooth/const.py b/homeassistant/components/bluetooth/const.py
index d4b187d4605..22c885b4f8b 100644
--- a/homeassistant/components/bluetooth/const.py
+++ b/homeassistant/components/bluetooth/const.py
@@ -22,7 +22,7 @@ CONF_SOURCE: Final = "source"
 CONF_SOURCE_DOMAIN: Final = "source_domain"
 CONF_SOURCE_MODEL: Final = "source_model"
 CONF_SOURCE_CONFIG_ENTRY_ID: Final = "source_config_entry_id"
-
+CONF_SOURCE_DEVICE_ID: Final = "source_device_id"
 
 SOURCE_LOCAL: Final = "local"
 
diff --git a/homeassistant/components/bluetooth/manager.py b/homeassistant/components/bluetooth/manager.py
index 09be8f960e9..46c5425c730 100644
--- a/homeassistant/components/bluetooth/manager.py
+++ b/homeassistant/components/bluetooth/manager.py
@@ -25,6 +25,7 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from .const import (
     CONF_SOURCE,
     CONF_SOURCE_CONFIG_ENTRY_ID,
+    CONF_SOURCE_DEVICE_ID,
     CONF_SOURCE_DOMAIN,
     CONF_SOURCE_MODEL,
     DOMAIN,
@@ -254,6 +255,7 @@ class HomeAssistantBluetoothManager(BluetoothManager):
         source_domain: str | None = None,
         source_model: str | None = None,
         source_config_entry_id: str | None = None,
+        source_device_id: str | None = None,
     ) -> CALLBACK_TYPE:
         """Register a scanner."""
         cancel = self.async_register_scanner(scanner, connection_slots)
@@ -261,9 +263,6 @@ class HomeAssistantBluetoothManager(BluetoothManager):
             isinstance(scanner, BaseHaRemoteScanner)
             and source_domain
             and source_config_entry_id
-            and not self.hass.config_entries.async_entry_for_domain_unique_id(
-                DOMAIN, scanner.source
-            )
         ):
             self.hass.async_create_task(
                 self.hass.config_entries.flow.async_init(
@@ -274,6 +273,7 @@ class HomeAssistantBluetoothManager(BluetoothManager):
                         CONF_SOURCE_DOMAIN: source_domain,
                         CONF_SOURCE_MODEL: source_model,
                         CONF_SOURCE_CONFIG_ENTRY_ID: source_config_entry_id,
+                        CONF_SOURCE_DEVICE_ID: source_device_id,
                     },
                 )
             )
diff --git a/homeassistant/components/bluetooth/manifest.json b/homeassistant/components/bluetooth/manifest.json
index 22f8aa8fdb8..e4257221374 100644
--- a/homeassistant/components/bluetooth/manifest.json
+++ b/homeassistant/components/bluetooth/manifest.json
@@ -16,11 +16,11 @@
   "quality_scale": "internal",
   "requirements": [
     "bleak==0.22.3",
-    "bleak-retry-connector==3.8.0",
-    "bluetooth-adapters==0.21.1",
-    "bluetooth-auto-recovery==1.4.2",
-    "bluetooth-data-tools==1.22.0",
-    "dbus-fast==2.30.2",
-    "habluetooth==3.12.0"
+    "bleak-retry-connector==3.9.0",
+    "bluetooth-adapters==0.21.4",
+    "bluetooth-auto-recovery==1.4.5",
+    "bluetooth-data-tools==1.26.1",
+    "dbus-fast==2.43.0",
+    "habluetooth==3.37.0"
   ]
 }
diff --git a/homeassistant/components/bluetooth/match.py b/homeassistant/components/bluetooth/match.py
index 6307d3ca93b..c37fa4615f6 100644
--- a/homeassistant/components/bluetooth/match.py
+++ b/homeassistant/components/bluetooth/match.py
@@ -411,7 +411,7 @@ def ble_device_matches(
     ) and service_data_uuid not in service_info.service_data:
         return False
 
-    if manufacturer_id := matcher.get(MANUFACTURER_ID):
+    if (manufacturer_id := matcher.get(MANUFACTURER_ID)) is not None:
         if manufacturer_id not in service_info.manufacturer_data:
             return False
 
diff --git a/homeassistant/components/bluetooth/strings.json b/homeassistant/components/bluetooth/strings.json
index 1b8231c66ca..866b76c0985 100644
--- a/homeassistant/components/bluetooth/strings.json
+++ b/homeassistant/components/bluetooth/strings.json
@@ -23,7 +23,7 @@
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
-      "no_adapters": "No unconfigured Bluetooth adapters found. There are {ignored_adapters} ignored adapters."
+      "no_adapters": "No unconfigured Bluetooth adapters found."
     }
   },
   "options": {
@@ -35,7 +35,8 @@
       }
     },
     "abort": {
-      "remote_adapters_not_supported": "Bluetooth configuration for remote adapters is not supported."
+      "remote_adapters_not_supported": "Bluetooth configuration for remote adapters is not supported.",
+      "local_adapters_no_passive_support": "Local Bluetooth adapters that do not support passive scanning cannot be configured."
     }
   }
 }
diff --git a/homeassistant/components/bluetooth/util.py b/homeassistant/components/bluetooth/util.py
index 8c7ad13294a..738a61b6f33 100644
--- a/homeassistant/components/bluetooth/util.py
+++ b/homeassistant/components/bluetooth/util.py
@@ -11,13 +11,23 @@ from bluetooth_adapters import (
     adapter_unique_name,
 )
 from bluetooth_data_tools import monotonic_time_coarse
+from habluetooth import get_manager
 
-from homeassistant.core import callback
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
 
 from .models import BluetoothServiceInfoBleak
 from .storage import BluetoothStorage
 
 
+class InvalidConfigEntryID(HomeAssistantError):
+    """Invalid config entry id."""
+
+
+class InvalidSource(HomeAssistantError):
+    """Invalid source."""
+
+
 @callback
 def async_load_history_from_system(
     adapters: BluetoothAdapters, storage: BluetoothStorage
@@ -29,6 +39,10 @@ def async_load_history_from_system(
     now_monotonic = monotonic_time_coarse()
     connectable_loaded_history: dict[str, BluetoothServiceInfoBleak] = {}
     all_loaded_history: dict[str, BluetoothServiceInfoBleak] = {}
+    adapter_to_source_address = {
+        adapter: details[ADAPTER_ADDRESS]
+        for adapter, details in adapters.adapters.items()
+    }
 
     # Restore local adapters
     for address, history in adapters.history.items():
@@ -40,7 +54,11 @@ def async_load_history_from_system(
                 BluetoothServiceInfoBleak.from_device_and_advertisement_data(
                     history.device,
                     history.advertisement_data,
-                    history.source,
+                    # history.source is really the adapter name
+                    # for historical compatibility since BlueZ
+                    # does not know the MAC address of the adapter
+                    # so we need to convert it to the source address (MAC)
+                    adapter_to_source_address.get(history.source, history.source),
                     now_monotonic,
                     True,
                 )
@@ -85,3 +103,14 @@ def adapter_title(adapter: str, details: AdapterDetails) -> str:
     model = details.get(ADAPTER_PRODUCT, "Unknown")
     manufacturer = details[ADAPTER_MANUFACTURER] or "Unknown"
     return f"{manufacturer} {model} ({unique_name})"
+
+
+def config_entry_id_to_source(hass: HomeAssistant, config_entry_id: str) -> str:
+    """Convert a config entry id to a source."""
+    if not (entry := hass.config_entries.async_get_entry(config_entry_id)):
+        raise InvalidConfigEntryID(f"Config entry {config_entry_id} not found")
+    source = entry.unique_id
+    assert source is not None
+    if not get_manager().async_scanner_by_source(source):
+        raise InvalidSource(f"Source {source} not found")
+    return source
diff --git a/homeassistant/components/bluetooth/websocket_api.py b/homeassistant/components/bluetooth/websocket_api.py
index 45445a7a00f..d21b11b050f 100644
--- a/homeassistant/components/bluetooth/websocket_api.py
+++ b/homeassistant/components/bluetooth/websocket_api.py
@@ -7,7 +7,12 @@ from functools import lru_cache, partial
 import time
 from typing import Any
 
-from habluetooth import BluetoothScanningMode
+from habluetooth import (
+    BluetoothScanningMode,
+    HaBluetoothSlotAllocations,
+    HaScannerRegistration,
+    HaScannerRegistrationEvent,
+)
 from home_assistant_bluetooth import BluetoothServiceInfoBleak
 import voluptuous as vol
 
@@ -16,14 +21,18 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.json import json_bytes
 
 from .api import _get_manager, async_register_callback
+from .const import DOMAIN
 from .match import BluetoothCallbackMatcher
 from .models import BluetoothChange
+from .util import InvalidConfigEntryID, InvalidSource, config_entry_id_to_source
 
 
 @callback
 def async_setup(hass: HomeAssistant) -> None:
     """Set up the bluetooth websocket API."""
     websocket_api.async_register_command(hass, ws_subscribe_advertisements)
+    websocket_api.async_register_command(hass, ws_subscribe_connection_allocations)
+    websocket_api.async_register_command(hass, ws_subscribe_scanner_details)
 
 
 @lru_cache(maxsize=1024)
@@ -135,6 +144,7 @@ class _AdvertisementSubscription:
         self._async_added((service_info,))
 
 
+@websocket_api.require_admin
 @websocket_api.websocket_command(
     {
         vol.Required("type"): "bluetooth/subscribe_advertisements",
@@ -148,3 +158,98 @@ async def ws_subscribe_advertisements(
     _AdvertisementSubscription(
         hass, connection, msg["id"], BluetoothCallbackMatcher(connectable=False)
     ).async_start()
+
+
+@websocket_api.require_admin
+@websocket_api.websocket_command(
+    {
+        vol.Required("type"): "bluetooth/subscribe_connection_allocations",
+        vol.Optional("config_entry_id"): str,
+    }
+)
+@websocket_api.async_response
+async def ws_subscribe_connection_allocations(
+    hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict[str, Any]
+) -> None:
+    """Handle subscribe advertisements websocket command."""
+    ws_msg_id = msg["id"]
+    source: str | None = None
+    if config_entry_id := msg.get("config_entry_id"):
+        try:
+            source = config_entry_id_to_source(hass, config_entry_id)
+        except InvalidConfigEntryID as err:
+            connection.send_error(ws_msg_id, "invalid_config_entry_id", str(err))
+            return
+        except InvalidSource as err:
+            connection.send_error(ws_msg_id, "invalid_source", str(err))
+            return
+
+    def _async_allocations_changed(allocations: HaBluetoothSlotAllocations) -> None:
+        connection.send_message(
+            json_bytes(websocket_api.event_message(ws_msg_id, [allocations]))
+        )
+
+    manager = _get_manager(hass)
+    connection.subscriptions[ws_msg_id] = manager.async_register_allocation_callback(
+        _async_allocations_changed, source
+    )
+    connection.send_message(json_bytes(websocket_api.result_message(ws_msg_id)))
+    if current_allocations := manager.async_current_allocations(source):
+        connection.send_message(
+            json_bytes(websocket_api.event_message(ws_msg_id, current_allocations))
+        )
+
+
+@websocket_api.require_admin
+@websocket_api.websocket_command(
+    {
+        vol.Required("type"): "bluetooth/subscribe_scanner_details",
+        vol.Optional("config_entry_id"): str,
+    }
+)
+@websocket_api.async_response
+async def ws_subscribe_scanner_details(
+    hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict[str, Any]
+) -> None:
+    """Handle subscribe scanner details websocket command."""
+    ws_msg_id = msg["id"]
+    source: str | None = None
+    if config_entry_id := msg.get("config_entry_id"):
+        if (
+            not (entry := hass.config_entries.async_get_entry(config_entry_id))
+            or entry.domain != DOMAIN
+        ):
+            connection.send_error(
+                ws_msg_id,
+                "invalid_config_entry_id",
+                f"Invalid config entry id: {config_entry_id}",
+            )
+            return
+        source = entry.unique_id
+        assert source is not None
+
+    def _async_event_message(message: dict[str, Any]) -> None:
+        connection.send_message(
+            json_bytes(websocket_api.event_message(ws_msg_id, message))
+        )
+
+    def _async_registration_changed(registration: HaScannerRegistration) -> None:
+        added_event = HaScannerRegistrationEvent.ADDED
+        event_type = "add" if registration.event == added_event else "remove"
+        _async_event_message({event_type: [registration.scanner.details]})
+
+    manager = _get_manager(hass)
+    connection.subscriptions[ws_msg_id] = (
+        manager.async_register_scanner_registration_callback(
+            _async_registration_changed, source
+        )
+    )
+    connection.send_message(json_bytes(websocket_api.result_message(ws_msg_id)))
+    if (scanners := manager.async_current_scanners()) and (
+        matching_scanners := [
+            scanner.details
+            for scanner in scanners
+            if source is None or scanner.source == source
+        ]
+    ):
+        _async_event_message({"add": matching_scanners})
diff --git a/homeassistant/components/bluetooth_le_tracker/device_tracker.py b/homeassistant/components/bluetooth_le_tracker/device_tracker.py
index 25e620ff15d..25a1aa60a1d 100644
--- a/homeassistant/components/bluetooth_le_tracker/device_tracker.py
+++ b/homeassistant/components/bluetooth_le_tracker/device_tracker.py
@@ -24,10 +24,10 @@ from homeassistant.components.device_tracker.legacy import (
 )
 from homeassistant.const import CONF_SCAN_INTERVAL, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import Event, HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/bluetooth_tracker/device_tracker.py b/homeassistant/components/bluetooth_tracker/device_tracker.py
index 1d64d31a248..17d166f2b32 100644
--- a/homeassistant/components/bluetooth_tracker/device_tracker.py
+++ b/homeassistant/components/bluetooth_tracker/device_tracker.py
@@ -27,7 +27,7 @@ from homeassistant.components.device_tracker.legacy import (
 )
 from homeassistant.const import CONF_DEVICE_ID
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/bmw_connected_drive/__init__.py b/homeassistant/components/bmw_connected_drive/__init__.py
index 05fa3e3cab0..287cb226b51 100644
--- a/homeassistant/components/bmw_connected_drive/__init__.py
+++ b/homeassistant/components/bmw_connected_drive/__init__.py
@@ -9,11 +9,11 @@ import voluptuous as vol
 from homeassistant.const import CONF_DEVICE_ID, CONF_ENTITY_ID, CONF_NAME, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import (
+    config_validation as cv,
     device_registry as dr,
     discovery,
     entity_registry as er,
 )
-import homeassistant.helpers.config_validation as cv
 
 from .const import ATTR_VIN, CONF_READ_ONLY, DOMAIN
 from .coordinator import BMWConfigEntry, BMWDataUpdateCoordinator
diff --git a/homeassistant/components/bmw_connected_drive/binary_sensor.py b/homeassistant/components/bmw_connected_drive/binary_sensor.py
index 5a58c707d6a..01cdbbdc94d 100644
--- a/homeassistant/components/bmw_connected_drive/binary_sensor.py
+++ b/homeassistant/components/bmw_connected_drive/binary_sensor.py
@@ -18,7 +18,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.unit_system import UnitSystem
 
 from . import BMWConfigEntry
@@ -200,7 +200,7 @@ SENSOR_TYPES: tuple[BMWBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BMWConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the BMW binary sensors from config entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/bmw_connected_drive/button.py b/homeassistant/components/bmw_connected_drive/button.py
index a7c31d0ef79..f8980201f3f 100644
--- a/homeassistant/components/bmw_connected_drive/button.py
+++ b/homeassistant/components/bmw_connected_drive/button.py
@@ -14,7 +14,7 @@ from bimmer_connected.vehicle.remote_services import RemoteServiceStatus
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN as BMW_DOMAIN, BMWConfigEntry
 from .entity import BMWBaseEntity
@@ -69,7 +69,7 @@ BUTTON_TYPES: tuple[BMWButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BMWConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the BMW buttons from config entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/bmw_connected_drive/device_tracker.py b/homeassistant/components/bmw_connected_drive/device_tracker.py
index 74df8693f7a..23273cc8ba9 100644
--- a/homeassistant/components/bmw_connected_drive/device_tracker.py
+++ b/homeassistant/components/bmw_connected_drive/device_tracker.py
@@ -9,7 +9,7 @@ from bimmer_connected.vehicle import MyBMWVehicle
 
 from homeassistant.components.device_tracker import TrackerEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BMWConfigEntry
 from .const import ATTR_DIRECTION
@@ -24,7 +24,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BMWConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the MyBMW tracker from config entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/bmw_connected_drive/lock.py b/homeassistant/components/bmw_connected_drive/lock.py
index 4bec12e796b..9d8965d6ebf 100644
--- a/homeassistant/components/bmw_connected_drive/lock.py
+++ b/homeassistant/components/bmw_connected_drive/lock.py
@@ -12,7 +12,7 @@ from bimmer_connected.vehicle.doors_windows import LockState
 from homeassistant.components.lock import LockEntity
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN as BMW_DOMAIN, BMWConfigEntry
 from .coordinator import BMWDataUpdateCoordinator
@@ -28,7 +28,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BMWConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the MyBMW lock from config entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/bmw_connected_drive/number.py b/homeassistant/components/bmw_connected_drive/number.py
index c6a328ecc20..8361306ba9d 100644
--- a/homeassistant/components/bmw_connected_drive/number.py
+++ b/homeassistant/components/bmw_connected_drive/number.py
@@ -16,7 +16,7 @@ from homeassistant.components.number import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN as BMW_DOMAIN, BMWConfigEntry
 from .coordinator import BMWDataUpdateCoordinator
@@ -58,7 +58,7 @@ NUMBER_TYPES: list[BMWNumberEntityDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BMWConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the MyBMW number from config entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/bmw_connected_drive/select.py b/homeassistant/components/bmw_connected_drive/select.py
index 385b45fd9fa..f144d3a71df 100644
--- a/homeassistant/components/bmw_connected_drive/select.py
+++ b/homeassistant/components/bmw_connected_drive/select.py
@@ -13,7 +13,7 @@ from homeassistant.components.select import SelectEntity, SelectEntityDescriptio
 from homeassistant.const import UnitOfElectricCurrent
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN as BMW_DOMAIN, BMWConfigEntry
 from .coordinator import BMWDataUpdateCoordinator
@@ -65,7 +65,7 @@ SELECT_TYPES: tuple[BMWSelectEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BMWConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the MyBMW lock from config entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/bmw_connected_drive/sensor.py b/homeassistant/components/bmw_connected_drive/sensor.py
index b7be367d57d..114412ef9f2 100644
--- a/homeassistant/components/bmw_connected_drive/sensor.py
+++ b/homeassistant/components/bmw_connected_drive/sensor.py
@@ -27,7 +27,7 @@ from homeassistant.const import (
     UnitOfVolume,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from . import BMWConfigEntry
@@ -190,7 +190,7 @@ SENSOR_TYPES: list[BMWSensorEntityDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BMWConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the MyBMW sensors from config entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/bmw_connected_drive/strings.json b/homeassistant/components/bmw_connected_drive/strings.json
index edb0d5cfb12..4b16b719d8d 100644
--- a/homeassistant/components/bmw_connected_drive/strings.json
+++ b/homeassistant/components/bmw_connected_drive/strings.json
@@ -138,7 +138,7 @@
         "name": "Charging status",
         "state": {
           "default": "Default",
-          "charging": "Charging",
+          "charging": "[%key:common::state::charging%]",
           "error": "Error",
           "complete": "Complete",
           "fully_charged": "Fully charged",
diff --git a/homeassistant/components/bmw_connected_drive/switch.py b/homeassistant/components/bmw_connected_drive/switch.py
index 600ad41165a..f46969f3e9b 100644
--- a/homeassistant/components/bmw_connected_drive/switch.py
+++ b/homeassistant/components/bmw_connected_drive/switch.py
@@ -12,7 +12,7 @@ from bimmer_connected.vehicle.fuel_and_battery import ChargingState
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN as BMW_DOMAIN, BMWConfigEntry
 from .coordinator import BMWDataUpdateCoordinator
@@ -66,7 +66,7 @@ NUMBER_TYPES: list[BMWSwitchEntityDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BMWConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the MyBMW switch from config entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/bond/button.py b/homeassistant/components/bond/button.py
index 42915c7dc0b..9cea0251b41 100644
--- a/homeassistant/components/bond/button.py
+++ b/homeassistant/components/bond/button.py
@@ -8,7 +8,7 @@ from bond_async import Action
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BondConfigEntry
 from .entity import BondEntity
@@ -91,6 +91,13 @@ BUTTONS: tuple[BondButtonEntityDescription, ...] = (
         mutually_exclusive=Action.SET_BRIGHTNESS,
         argument=None,
     ),
+    BondButtonEntityDescription(
+        key=Action.TOGGLE_LIGHT_TEMP,
+        name="Toggle Light Temperature",
+        translation_key="toggle_light_temp",
+        mutually_exclusive=None,  # No mutually exclusive action
+        argument=None,
+    ),
     BondButtonEntityDescription(
         key=Action.START_UP_LIGHT_DIMMER,
         name="Start Up Light Dimmer",
@@ -257,7 +264,7 @@ BUTTONS: tuple[BondButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BondConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Bond button devices."""
     data = entry.runtime_data
diff --git a/homeassistant/components/bond/cover.py b/homeassistant/components/bond/cover.py
index 66344a1913d..d2a78819fae 100644
--- a/homeassistant/components/bond/cover.py
+++ b/homeassistant/components/bond/cover.py
@@ -13,7 +13,7 @@ from homeassistant.components.cover import (
     CoverEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BondConfigEntry
 from .entity import BondEntity
@@ -34,7 +34,7 @@ def _hass_to_bond_position(hass_position: int) -> int:
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BondConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Bond cover devices."""
     data = entry.runtime_data
diff --git a/homeassistant/components/bond/fan.py b/homeassistant/components/bond/fan.py
index 76a0daa46f9..c228c7355dd 100644
--- a/homeassistant/components/bond/fan.py
+++ b/homeassistant/components/bond/fan.py
@@ -19,7 +19,7 @@ from homeassistant.components.fan import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
     ranged_value_to_percentage,
@@ -40,7 +40,7 @@ PRESET_MODE_BREEZE = "Breeze"
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BondConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Bond fan devices."""
     data = entry.runtime_data
diff --git a/homeassistant/components/bond/light.py b/homeassistant/components/bond/light.py
index c3cf23e4fad..9c51165ebdb 100644
--- a/homeassistant/components/bond/light.py
+++ b/homeassistant/components/bond/light.py
@@ -14,7 +14,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BondConfigEntry
 from .const import (
@@ -42,7 +42,7 @@ ENTITY_SERVICES = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BondConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Bond light devices."""
     data = entry.runtime_data
diff --git a/homeassistant/components/bond/strings.json b/homeassistant/components/bond/strings.json
index 8986905c6ee..d65966d7701 100644
--- a/homeassistant/components/bond/strings.json
+++ b/homeassistant/components/bond/strings.json
@@ -31,7 +31,7 @@
   "services": {
     "set_fan_speed_tracked_state": {
       "name": "Set fan speed tracked state",
-      "description": "Sets the tracked fan speed for a bond fan.",
+      "description": "Sets the tracked fan speed for a Bond fan.",
       "fields": {
         "entity_id": {
           "name": "Entity",
@@ -45,7 +45,7 @@
     },
     "set_switch_power_tracked_state": {
       "name": "Set switch power tracked state",
-      "description": "Sets the tracked power state of a bond switch.",
+      "description": "Sets the tracked power state of a Bond switch.",
       "fields": {
         "entity_id": {
           "name": "Entity",
@@ -59,7 +59,7 @@
     },
     "set_light_power_tracked_state": {
       "name": "Set light power tracked state",
-      "description": "Sets the tracked power state of a bond light.",
+      "description": "Sets the tracked power state of a Bond light.",
       "fields": {
         "entity_id": {
           "name": "Entity",
@@ -73,7 +73,7 @@
     },
     "set_light_brightness_tracked_state": {
       "name": "Set light brightness tracked state",
-      "description": "Sets the tracked brightness state of a bond light.",
+      "description": "Sets the tracked brightness state of a Bond light.",
       "fields": {
         "entity_id": {
           "name": "Entity",
@@ -87,15 +87,15 @@
     },
     "start_increasing_brightness": {
       "name": "Start increasing brightness",
-      "description": "Start increasing the brightness of the light. (deprecated)."
+      "description": "Starts increasing the brightness of the light (deprecated)."
     },
     "start_decreasing_brightness": {
       "name": "Start decreasing brightness",
-      "description": "Start decreasing the brightness of the light. (deprecated)."
+      "description": "Starts decreasing the brightness of the light (deprecated)."
     },
     "stop": {
       "name": "[%key:common::action::stop%]",
-      "description": "Stop any in-progress action and empty the queue. (deprecated)."
+      "description": "Stops any in-progress action and empty the queue (deprecated)."
     }
   }
 }
diff --git a/homeassistant/components/bond/switch.py b/homeassistant/components/bond/switch.py
index ace6d307e6d..fa2ccd2ca93 100644
--- a/homeassistant/components/bond/switch.py
+++ b/homeassistant/components/bond/switch.py
@@ -12,7 +12,7 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BondConfigEntry
 from .const import ATTR_POWER_STATE, SERVICE_SET_POWER_TRACKED_STATE
@@ -22,7 +22,7 @@ from .entity import BondEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BondConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Bond generic devices."""
     data = entry.runtime_data
diff --git a/homeassistant/components/bosch_alarm/__init__.py b/homeassistant/components/bosch_alarm/__init__.py
new file mode 100644
index 00000000000..bc7fee46f60
--- /dev/null
+++ b/homeassistant/components/bosch_alarm/__init__.py
@@ -0,0 +1,62 @@
+"""The Bosch Alarm integration."""
+
+from __future__ import annotations
+
+from ssl import SSLError
+
+from bosch_alarm_mode2 import Panel
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers import device_registry as dr
+
+from .const import CONF_INSTALLER_CODE, CONF_USER_CODE, DOMAIN
+
+PLATFORMS: list[Platform] = [Platform.ALARM_CONTROL_PANEL]
+
+type BoschAlarmConfigEntry = ConfigEntry[Panel]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: BoschAlarmConfigEntry) -> bool:
+    """Set up Bosch Alarm from a config entry."""
+
+    panel = Panel(
+        host=entry.data[CONF_HOST],
+        port=entry.data[CONF_PORT],
+        automation_code=entry.data.get(CONF_PASSWORD),
+        installer_or_user_code=entry.data.get(
+            CONF_INSTALLER_CODE, entry.data.get(CONF_USER_CODE)
+        ),
+    )
+    try:
+        await panel.connect()
+    except (PermissionError, ValueError) as err:
+        await panel.disconnect()
+        raise ConfigEntryNotReady from err
+    except (TimeoutError, OSError, ConnectionRefusedError, SSLError) as err:
+        await panel.disconnect()
+        raise ConfigEntryNotReady("Connection failed") from err
+
+    entry.runtime_data = panel
+
+    device_registry = dr.async_get(hass)
+
+    device_registry.async_get_or_create(
+        config_entry_id=entry.entry_id,
+        identifiers={(DOMAIN, entry.unique_id or entry.entry_id)},
+        name=f"Bosch {panel.model}",
+        manufacturer="Bosch Security Systems",
+        model=panel.model,
+        sw_version=panel.firmware_version,
+    )
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: BoschAlarmConfigEntry) -> bool:
+    """Unload a config entry."""
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+        await entry.runtime_data.disconnect()
+    return unload_ok
diff --git a/homeassistant/components/bosch_alarm/alarm_control_panel.py b/homeassistant/components/bosch_alarm/alarm_control_panel.py
new file mode 100644
index 00000000000..a1d8a7b90f4
--- /dev/null
+++ b/homeassistant/components/bosch_alarm/alarm_control_panel.py
@@ -0,0 +1,109 @@
+"""Support for Bosch Alarm Panel."""
+
+from __future__ import annotations
+
+from bosch_alarm_mode2 import Panel
+
+from homeassistant.components.alarm_control_panel import (
+    AlarmControlPanelEntity,
+    AlarmControlPanelEntityFeature,
+    AlarmControlPanelState,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import BoschAlarmConfigEntry
+from .const import DOMAIN
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: BoschAlarmConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up control panels for each area."""
+    panel = config_entry.runtime_data
+
+    async_add_entities(
+        AreaAlarmControlPanel(
+            panel,
+            area_id,
+            config_entry.unique_id or config_entry.entry_id,
+        )
+        for area_id in panel.areas
+    )
+
+
+class AreaAlarmControlPanel(AlarmControlPanelEntity):
+    """An alarm control panel entity for a bosch alarm panel."""
+
+    _attr_has_entity_name = True
+    _attr_supported_features = (
+        AlarmControlPanelEntityFeature.ARM_HOME
+        | AlarmControlPanelEntityFeature.ARM_AWAY
+    )
+    _attr_code_arm_required = False
+    _attr_name = None
+
+    def __init__(self, panel: Panel, area_id: int, unique_id: str) -> None:
+        """Initialise a Bosch Alarm control panel entity."""
+        self.panel = panel
+        self._area = panel.areas[area_id]
+        self._area_id = area_id
+        self._attr_unique_id = f"{unique_id}_area_{area_id}"
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, self._attr_unique_id)},
+            name=self._area.name,
+            manufacturer="Bosch Security Systems",
+            via_device=(
+                DOMAIN,
+                unique_id,
+            ),
+        )
+
+    @property
+    def alarm_state(self) -> AlarmControlPanelState | None:
+        """Return the state of the alarm."""
+        if self._area.is_triggered():
+            return AlarmControlPanelState.TRIGGERED
+        if self._area.is_disarmed():
+            return AlarmControlPanelState.DISARMED
+        if self._area.is_arming():
+            return AlarmControlPanelState.ARMING
+        if self._area.is_pending():
+            return AlarmControlPanelState.PENDING
+        if self._area.is_part_armed():
+            return AlarmControlPanelState.ARMED_HOME
+        if self._area.is_all_armed():
+            return AlarmControlPanelState.ARMED_AWAY
+        return None
+
+    async def async_alarm_disarm(self, code: str | None = None) -> None:
+        """Disarm this panel."""
+        await self.panel.area_disarm(self._area_id)
+
+    async def async_alarm_arm_home(self, code: str | None = None) -> None:
+        """Send arm home command."""
+        await self.panel.area_arm_part(self._area_id)
+
+    async def async_alarm_arm_away(self, code: str | None = None) -> None:
+        """Send arm away command."""
+        await self.panel.area_arm_all(self._area_id)
+
+    @property
+    def available(self) -> bool:
+        """Return True if entity is available."""
+        return self.panel.connection_status()
+
+    async def async_added_to_hass(self) -> None:
+        """Run when entity attached to hass."""
+        await super().async_added_to_hass()
+        self._area.status_observer.attach(self.schedule_update_ha_state)
+        self.panel.connection_status_observer.attach(self.schedule_update_ha_state)
+
+    async def async_will_remove_from_hass(self) -> None:
+        """Run when entity removed from hass."""
+        await super().async_will_remove_from_hass()
+        self._area.status_observer.detach(self.schedule_update_ha_state)
+        self.panel.connection_status_observer.detach(self.schedule_update_ha_state)
diff --git a/homeassistant/components/bosch_alarm/config_flow.py b/homeassistant/components/bosch_alarm/config_flow.py
new file mode 100644
index 00000000000..e48f2a11944
--- /dev/null
+++ b/homeassistant/components/bosch_alarm/config_flow.py
@@ -0,0 +1,165 @@
+"""Config flow for Bosch Alarm integration."""
+
+from __future__ import annotations
+
+import asyncio
+import logging
+import ssl
+from typing import Any
+
+from bosch_alarm_mode2 import Panel
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.const import (
+    CONF_CODE,
+    CONF_HOST,
+    CONF_MODEL,
+    CONF_PASSWORD,
+    CONF_PORT,
+)
+import homeassistant.helpers.config_validation as cv
+
+from .const import CONF_INSTALLER_CODE, CONF_USER_CODE, DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+STEP_USER_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_HOST): str,
+        vol.Required(CONF_PORT, default=7700): cv.positive_int,
+    }
+)
+
+STEP_AUTH_DATA_SCHEMA_SOLUTION = vol.Schema(
+    {
+        vol.Required(CONF_USER_CODE): str,
+    }
+)
+
+STEP_AUTH_DATA_SCHEMA_AMAX = vol.Schema(
+    {
+        vol.Required(CONF_INSTALLER_CODE): str,
+        vol.Required(CONF_PASSWORD): str,
+    }
+)
+
+STEP_AUTH_DATA_SCHEMA_BG = vol.Schema(
+    {
+        vol.Required(CONF_PASSWORD): str,
+    }
+)
+
+STEP_INIT_DATA_SCHEMA = vol.Schema({vol.Optional(CONF_CODE): str})
+
+
+async def try_connect(
+    data: dict[str, Any], load_selector: int = 0
+) -> tuple[str, int | None]:
+    """Validate the user input allows us to connect.
+
+    Data has the keys from STEP_USER_DATA_SCHEMA with values provided by the user.
+    """
+    panel = Panel(
+        host=data[CONF_HOST],
+        port=data[CONF_PORT],
+        automation_code=data.get(CONF_PASSWORD),
+        installer_or_user_code=data.get(CONF_INSTALLER_CODE, data.get(CONF_USER_CODE)),
+    )
+
+    try:
+        await panel.connect(load_selector)
+    finally:
+        await panel.disconnect()
+
+    return (panel.model, panel.serial_number)
+
+
+class BoschAlarmConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Bosch Alarm."""
+
+    def __init__(self) -> None:
+        """Init config flow."""
+
+        self._data: dict[str, Any] = {}
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the initial step."""
+        errors: dict[str, str] = {}
+
+        if user_input is not None:
+            try:
+                # Use load_selector = 0 to fetch the panel model without authentication.
+                (model, serial) = await try_connect(user_input, 0)
+            except (
+                OSError,
+                ConnectionRefusedError,
+                ssl.SSLError,
+                asyncio.exceptions.TimeoutError,
+            ) as e:
+                _LOGGER.error("Connection Error: %s", e)
+                errors["base"] = "cannot_connect"
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
+                errors["base"] = "unknown"
+            else:
+                self._data = user_input
+                self._data[CONF_MODEL] = model
+                return await self.async_step_auth()
+        return self.async_show_form(
+            step_id="user",
+            data_schema=self.add_suggested_values_to_schema(
+                STEP_USER_DATA_SCHEMA, user_input
+            ),
+            errors=errors,
+        )
+
+    async def async_step_auth(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the auth step."""
+        errors: dict[str, str] = {}
+
+        # Each model variant requires a different authentication flow
+        if "Solution" in self._data[CONF_MODEL]:
+            schema = STEP_AUTH_DATA_SCHEMA_SOLUTION
+        elif "AMAX" in self._data[CONF_MODEL]:
+            schema = STEP_AUTH_DATA_SCHEMA_AMAX
+        else:
+            schema = STEP_AUTH_DATA_SCHEMA_BG
+
+        if user_input is not None:
+            self._data.update(user_input)
+            try:
+                (model, serial_number) = await try_connect(
+                    self._data, Panel.LOAD_EXTENDED_INFO
+                )
+            except (PermissionError, ValueError) as e:
+                errors["base"] = "invalid_auth"
+                _LOGGER.error("Authentication Error: %s", e)
+            except (
+                OSError,
+                ConnectionRefusedError,
+                ssl.SSLError,
+                TimeoutError,
+            ) as e:
+                _LOGGER.error("Connection Error: %s", e)
+                errors["base"] = "cannot_connect"
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
+                errors["base"] = "unknown"
+            else:
+                if serial_number:
+                    await self.async_set_unique_id(str(serial_number))
+                    self._abort_if_unique_id_configured()
+                else:
+                    self._async_abort_entries_match({CONF_HOST: self._data[CONF_HOST]})
+                return self.async_create_entry(title=f"Bosch {model}", data=self._data)
+
+        return self.async_show_form(
+            step_id="auth",
+            data_schema=self.add_suggested_values_to_schema(schema, user_input),
+            errors=errors,
+        )
diff --git a/homeassistant/components/bosch_alarm/const.py b/homeassistant/components/bosch_alarm/const.py
new file mode 100644
index 00000000000..7205831391c
--- /dev/null
+++ b/homeassistant/components/bosch_alarm/const.py
@@ -0,0 +1,6 @@
+"""Constants for the Bosch Alarm integration."""
+
+DOMAIN = "bosch_alarm"
+HISTORY_ATTR = "history"
+CONF_INSTALLER_CODE = "installer_code"
+CONF_USER_CODE = "user_code"
diff --git a/homeassistant/components/bosch_alarm/manifest.json b/homeassistant/components/bosch_alarm/manifest.json
new file mode 100644
index 00000000000..a54ace71782
--- /dev/null
+++ b/homeassistant/components/bosch_alarm/manifest.json
@@ -0,0 +1,11 @@
+{
+  "domain": "bosch_alarm",
+  "name": "Bosch Alarm",
+  "codeowners": ["@mag1024", "@sanjay900"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/bosch_alarm",
+  "integration_type": "device",
+  "iot_class": "local_push",
+  "quality_scale": "bronze",
+  "requirements": ["bosch-alarm-mode2==0.4.3"]
+}
diff --git a/homeassistant/components/bosch_alarm/quality_scale.yaml b/homeassistant/components/bosch_alarm/quality_scale.yaml
new file mode 100644
index 00000000000..467760fb863
--- /dev/null
+++ b/homeassistant/components/bosch_alarm/quality_scale.yaml
@@ -0,0 +1,84 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: |
+      No custom actions defined
+  appropriate-polling:
+    status: exempt
+    comment: |
+      No polling
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: |
+      No custom actions are defined.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup: done
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions:
+    status: exempt
+    comment: |
+      No custom actions are defined.
+  config-entry-unloading: done
+  docs-configuration-parameters: todo
+  docs-installation-parameters: todo
+  entity-unavailable: todo
+  integration-owner: done
+  log-when-unavailable: todo
+  parallel-updates: todo
+  reauthentication-flow: todo
+  test-coverage: done
+
+  # Gold
+  devices: done
+  diagnostics: todo
+  discovery-update-info: todo
+  discovery: todo
+  docs-data-update: todo
+  docs-examples: todo
+  docs-known-limitations: todo
+  docs-supported-devices: todo
+  docs-supported-functions: todo
+  docs-troubleshooting: todo
+  docs-use-cases: todo
+  dynamic-devices:
+    status: exempt
+    comment: |
+      Device type integration
+  entity-category: todo
+  entity-device-class: todo
+  entity-disabled-by-default: todo
+  entity-translations: todo
+  exception-translations: todo
+  icon-translations: todo
+  reconfiguration-flow: todo
+  repair-issues:
+    status: exempt
+    comment: |
+      No repairs
+  stale-devices:
+    status: exempt
+    comment: |
+      Device type integration
+
+  # Platinum
+  async-dependency: done
+  inject-websession:
+    status: exempt
+    comment: |
+      Integration does not make any HTTP requests.
+  strict-typing: done
diff --git a/homeassistant/components/bosch_alarm/strings.json b/homeassistant/components/bosch_alarm/strings.json
new file mode 100644
index 00000000000..f4846021b55
--- /dev/null
+++ b/homeassistant/components/bosch_alarm/strings.json
@@ -0,0 +1,36 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]",
+          "port": "[%key:common::config_flow::data::port%]"
+        },
+        "data_description": {
+          "host": "The hostname or IP address of your Bosch alarm panel",
+          "port": "The port used to connect to your Bosch alarm panel. This is usually 7700"
+        }
+      },
+      "auth": {
+        "data": {
+          "password": "[%key:common::config_flow::data::password%]",
+          "installer_code": "Installer code",
+          "user_code": "User code"
+        },
+        "data_description": {
+          "password": "The Mode 2 automation code from your panel",
+          "installer_code": "The installer code from your panel",
+          "user_code": "The user code from your panel"
+        }
+      }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    }
+  }
+}
diff --git a/homeassistant/components/bosch_shc/binary_sensor.py b/homeassistant/components/bosch_shc/binary_sensor.py
index dd0f31ea6f9..30d823fd608 100644
--- a/homeassistant/components/bosch_shc/binary_sensor.py
+++ b/homeassistant/components/bosch_shc/binary_sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BoschConfigEntry
 from .entity import SHCEntity
@@ -19,7 +19,7 @@ from .entity import SHCEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BoschConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the SHC binary sensor platform."""
     session = config_entry.runtime_data
diff --git a/homeassistant/components/bosch_shc/cover.py b/homeassistant/components/bosch_shc/cover.py
index 55d6bfc35de..766dcf37ce9 100644
--- a/homeassistant/components/bosch_shc/cover.py
+++ b/homeassistant/components/bosch_shc/cover.py
@@ -11,7 +11,7 @@ from homeassistant.components.cover import (
     CoverEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BoschConfigEntry
 from .entity import SHCEntity
@@ -20,7 +20,7 @@ from .entity import SHCEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BoschConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the SHC cover platform."""
     session = config_entry.runtime_data
diff --git a/homeassistant/components/bosch_shc/sensor.py b/homeassistant/components/bosch_shc/sensor.py
index 6408e21654e..885908804c0 100644
--- a/homeassistant/components/bosch_shc/sensor.py
+++ b/homeassistant/components/bosch_shc/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import BoschConfigEntry
@@ -126,7 +126,7 @@ SENSOR_DESCRIPTIONS: dict[str, SHCSensorEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BoschConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the SHC sensor platform."""
     session = config_entry.runtime_data
diff --git a/homeassistant/components/bosch_shc/strings.json b/homeassistant/components/bosch_shc/strings.json
index 88eb817bbd9..7aa3b0ace32 100644
--- a/homeassistant/components/bosch_shc/strings.json
+++ b/homeassistant/components/bosch_shc/strings.json
@@ -24,7 +24,7 @@
       },
       "reauth_confirm": {
         "title": "[%key:common::config_flow::title::reauth%]",
-        "description": "The bosch_shc integration needs to re-authenticate your account",
+        "description": "The Bosch SHC integration needs to re-authenticate your account",
         "data": {
           "host": "[%key:common::config_flow::data::host%]"
         }
@@ -34,7 +34,7 @@
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "pairing_failed": "Pairing failed; please check the Bosch Smart Home Controller is in pairing mode (LED flashing) as well as your password is correct.",
-      "session_error": "Session error: API return Non-OK result.",
+      "session_error": "Session error: API returned Non-OK result.",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
diff --git a/homeassistant/components/bosch_shc/switch.py b/homeassistant/components/bosch_shc/switch.py
index 76b1da3e534..bf1d5d39ee5 100644
--- a/homeassistant/components/bosch_shc/switch.py
+++ b/homeassistant/components/bosch_shc/switch.py
@@ -21,7 +21,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import BoschConfigEntry
@@ -79,7 +79,7 @@ SWITCH_TYPES: dict[str, SHCSwitchEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BoschConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the SHC switch platform."""
     session = config_entry.runtime_data
diff --git a/homeassistant/components/braviatv/__init__.py b/homeassistant/components/braviatv/__init__.py
index 6593afb75d1..52fcf82b38b 100644
--- a/homeassistant/components/braviatv/__init__.py
+++ b/homeassistant/components/braviatv/__init__.py
@@ -7,14 +7,11 @@ from typing import Final
 from aiohttp import CookieJar
 from pybravia import BraviaClient
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_MAC, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_create_clientsession
 
-from .coordinator import BraviaTVCoordinator
-
-BraviaTVConfigEntry = ConfigEntry[BraviaTVCoordinator]
+from .coordinator import BraviaTVConfigEntry, BraviaTVCoordinator
 
 PLATFORMS: Final[list[Platform]] = [
     Platform.BUTTON,
@@ -36,8 +33,8 @@ async def async_setup_entry(
     client = BraviaClient(host, mac, session=session)
     coordinator = BraviaTVCoordinator(
         hass=hass,
+        config_entry=config_entry,
         client=client,
-        config=config_entry.data,
     )
     config_entry.async_on_unload(config_entry.add_update_listener(update_listener))
 
diff --git a/homeassistant/components/braviatv/button.py b/homeassistant/components/braviatv/button.py
index 358255bd85b..20250949bcb 100644
--- a/homeassistant/components/braviatv/button.py
+++ b/homeassistant/components/braviatv/button.py
@@ -12,10 +12,9 @@ from homeassistant.components.button import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import BraviaTVConfigEntry
-from .coordinator import BraviaTVCoordinator
+from .coordinator import BraviaTVConfigEntry, BraviaTVCoordinator
 from .entity import BraviaTVEntity
 
 
@@ -45,7 +44,7 @@ BUTTONS: tuple[BraviaTVButtonDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BraviaTVConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Bravia TV Button entities."""
 
diff --git a/homeassistant/components/braviatv/coordinator.py b/homeassistant/components/braviatv/coordinator.py
index e08e88073f3..039726de94d 100644
--- a/homeassistant/components/braviatv/coordinator.py
+++ b/homeassistant/components/braviatv/coordinator.py
@@ -6,7 +6,6 @@ from collections.abc import Awaitable, Callable, Coroutine, Iterable
 from datetime import datetime, timedelta
 from functools import wraps
 import logging
-from types import MappingProxyType
 from typing import Any, Concatenate, Final
 
 from pybravia import (
@@ -20,6 +19,7 @@ from pybravia import (
 )
 
 from homeassistant.components.media_player import MediaType
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_CLIENT_ID, CONF_PIN
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
@@ -39,6 +39,8 @@ _LOGGER = logging.getLogger(__name__)
 
 SCAN_INTERVAL: Final = timedelta(seconds=10)
 
+type BraviaTVConfigEntry = ConfigEntry[BraviaTVCoordinator]
+
 
 def catch_braviatv_errors[_BraviaTVCoordinatorT: BraviaTVCoordinator, **_P](
     func: Callable[Concatenate[_BraviaTVCoordinatorT, _P], Awaitable[None]],
@@ -64,19 +66,21 @@ def catch_braviatv_errors[_BraviaTVCoordinatorT: BraviaTVCoordinator, **_P](
 class BraviaTVCoordinator(DataUpdateCoordinator[None]):
     """Representation of a Bravia TV Coordinator."""
 
+    config_entry: BraviaTVConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: BraviaTVConfigEntry,
         client: BraviaClient,
-        config: MappingProxyType[str, Any],
     ) -> None:
         """Initialize Bravia TV Client."""
 
         self.client = client
-        self.pin = config[CONF_PIN]
-        self.use_psk = config.get(CONF_USE_PSK, False)
-        self.client_id = config.get(CONF_CLIENT_ID, LEGACY_CLIENT_ID)
-        self.nickname = config.get(CONF_NICKNAME, NICKNAME_PREFIX)
+        self.pin = config_entry.data[CONF_PIN]
+        self.use_psk = config_entry.data.get(CONF_USE_PSK, False)
+        self.client_id = config_entry.data.get(CONF_CLIENT_ID, LEGACY_CLIENT_ID)
+        self.nickname = config_entry.data.get(CONF_NICKNAME, NICKNAME_PREFIX)
         self.source: str | None = None
         self.source_list: list[str] = []
         self.source_map: dict[str, dict] = {}
@@ -98,6 +102,7 @@ class BraviaTVCoordinator(DataUpdateCoordinator[None]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
             request_refresh_debouncer=Debouncer(
diff --git a/homeassistant/components/braviatv/diagnostics.py b/homeassistant/components/braviatv/diagnostics.py
index 0969674d5c9..b858fd41c09 100644
--- a/homeassistant/components/braviatv/diagnostics.py
+++ b/homeassistant/components/braviatv/diagnostics.py
@@ -6,7 +6,7 @@ from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_MAC, CONF_PIN
 from homeassistant.core import HomeAssistant
 
-from . import BraviaTVConfigEntry
+from .coordinator import BraviaTVConfigEntry
 
 TO_REDACT = {CONF_MAC, CONF_PIN, "macAddr"}
 
diff --git a/homeassistant/components/braviatv/entity.py b/homeassistant/components/braviatv/entity.py
index 75540b316a7..b4e370f20d2 100644
--- a/homeassistant/components/braviatv/entity.py
+++ b/homeassistant/components/braviatv/entity.py
@@ -3,8 +3,8 @@
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import BraviaTVCoordinator
 from .const import ATTR_MANUFACTURER, DOMAIN
+from .coordinator import BraviaTVCoordinator
 
 
 class BraviaTVEntity(CoordinatorEntity[BraviaTVCoordinator]):
diff --git a/homeassistant/components/braviatv/media_player.py b/homeassistant/components/braviatv/media_player.py
index 4de167a6def..fe9c386b060 100644
--- a/homeassistant/components/braviatv/media_player.py
+++ b/homeassistant/components/braviatv/media_player.py
@@ -16,17 +16,17 @@ from homeassistant.components.media_player import (
     MediaType,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import BraviaTVConfigEntry
 from .const import SourceType
+from .coordinator import BraviaTVConfigEntry
 from .entity import BraviaTVEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BraviaTVConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Bravia TV Media Player from a config_entry."""
 
diff --git a/homeassistant/components/braviatv/remote.py b/homeassistant/components/braviatv/remote.py
index 9344d6ec455..0611e367445 100644
--- a/homeassistant/components/braviatv/remote.py
+++ b/homeassistant/components/braviatv/remote.py
@@ -7,16 +7,16 @@ from typing import Any
 
 from homeassistant.components.remote import ATTR_NUM_REPEATS, RemoteEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import BraviaTVConfigEntry
+from .coordinator import BraviaTVConfigEntry
 from .entity import BraviaTVEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BraviaTVConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Bravia TV Remote from a config entry."""
 
diff --git a/homeassistant/components/bring/__init__.py b/homeassistant/components/bring/__init__.py
index 0ee8e3b3155..6dd2d36351c 100644
--- a/homeassistant/components/bring/__init__.py
+++ b/homeassistant/components/bring/__init__.py
@@ -6,19 +6,16 @@ import logging
 
 from bring_api import Bring
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .coordinator import BringDataUpdateCoordinator
+from .coordinator import BringConfigEntry, BringDataUpdateCoordinator
 
-PLATFORMS: list[Platform] = [Platform.SENSOR, Platform.TODO]
+PLATFORMS: list[Platform] = [Platform.EVENT, Platform.SENSOR, Platform.TODO]
 
 _LOGGER = logging.getLogger(__name__)
 
-type BringConfigEntry = ConfigEntry[BringDataUpdateCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: BringConfigEntry) -> bool:
     """Set up Bring! from a config entry."""
@@ -26,7 +23,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: BringConfigEntry) -> boo
     session = async_get_clientsession(hass)
     bring = Bring(session, entry.data[CONF_EMAIL], entry.data[CONF_PASSWORD])
 
-    coordinator = BringDataUpdateCoordinator(hass, bring)
+    coordinator = BringDataUpdateCoordinator(hass, entry, bring)
     await coordinator.async_config_entry_first_refresh()
 
     entry.runtime_data = coordinator
@@ -36,6 +33,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: BringConfigEntry) -> boo
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: BringConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/bring/config_flow.py b/homeassistant/components/bring/config_flow.py
index b8ee9d1e6ae..9e5f4da8356 100644
--- a/homeassistant/components/bring/config_flow.py
+++ b/homeassistant/components/bring/config_flow.py
@@ -63,11 +63,18 @@ class BringConfigFlow(ConfigFlow, domain=DOMAIN):
         ):
             self._abort_if_unique_id_configured()
             return self.async_create_entry(
-                title=self.info.get("name") or user_input[CONF_EMAIL], data=user_input
+                title=self.info.name or user_input[CONF_EMAIL],
+                data=user_input,
             )
 
         return self.async_show_form(
-            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
+            step_id="user",
+            data_schema=STEP_USER_DATA_SCHEMA,
+            errors=errors,
+            description_placeholders={
+                "google_play": "https://play.google.com/store/apps/details?id=ch.publisheria.bring",
+                "app_store": "https://itunes.apple.com/app/apple-store/id580669177",
+            },
         )
 
     async def async_step_reauth(
@@ -100,6 +107,29 @@ class BringConfigFlow(ConfigFlow, domain=DOMAIN):
             errors=errors,
         )
 
+    async def async_step_reconfigure(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle reconfiguration of the integration."""
+        errors: dict[str, str] = {}
+        reconf_entry = self._get_reconfigure_entry()
+
+        if user_input:
+            if not (errors := await self.validate_input(user_input)):
+                self._abort_if_unique_id_mismatch()
+                return self.async_update_reload_and_abort(
+                    reconf_entry, data_updates=user_input
+                )
+
+        return self.async_show_form(
+            step_id="reconfigure",
+            data_schema=self.add_suggested_values_to_schema(
+                data_schema=STEP_USER_DATA_SCHEMA,
+                suggested_values={CONF_EMAIL: reconf_entry.data[CONF_EMAIL]},
+            ),
+            errors=errors,
+        )
+
     async def validate_input(self, user_input: Mapping[str, Any]) -> dict[str, str]:
         """Auth Helper."""
 
diff --git a/homeassistant/components/bring/coordinator.py b/homeassistant/components/bring/coordinator.py
index d02237e84eb..e1f9fa45ac8 100644
--- a/homeassistant/components/bring/coordinator.py
+++ b/homeassistant/components/bring/coordinator.py
@@ -2,84 +2,116 @@
 
 from __future__ import annotations
 
+from dataclasses import dataclass
 from datetime import timedelta
 import logging
 
 from bring_api import (
     Bring,
+    BringActivityResponse,
     BringAuthException,
+    BringItemsResponse,
+    BringList,
     BringParseException,
     BringRequestException,
+    BringUserSettingsResponse,
+    BringUsersResponse,
 )
-from bring_api.types import BringItemsResponse, BringList, BringUserSettingsResponse
+from mashumaro.mixins.orjson import DataClassORJSONMixin
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_EMAIL
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
+type BringConfigEntry = ConfigEntry[BringDataUpdateCoordinator]
 
-class BringData(BringList, BringItemsResponse):
+
+@dataclass(frozen=True)
+class BringData(DataClassORJSONMixin):
     """Coordinator data class."""
 
+    lst: BringList
+    content: BringItemsResponse
+    activity: BringActivityResponse
+    users: BringUsersResponse
+
 
 class BringDataUpdateCoordinator(DataUpdateCoordinator[dict[str, BringData]]):
     """A Bring Data Update Coordinator."""
 
-    config_entry: ConfigEntry
+    config_entry: BringConfigEntry
     user_settings: BringUserSettingsResponse
+    lists: list[BringList]
 
-    def __init__(self, hass: HomeAssistant, bring: Bring) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: BringConfigEntry, bring: Bring
+    ) -> None:
         """Initialize the Bring data coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=90),
         )
         self.bring = bring
+        self.previous_lists: set[str] = set()
 
     async def _async_update_data(self) -> dict[str, BringData]:
+        """Fetch the latest data from bring."""
+
         try:
-            lists_response = await self.bring.load_lists()
+            self.lists = (await self.bring.load_lists()).lists
         except BringRequestException as e:
-            raise UpdateFailed("Unable to connect and retrieve data from bring") from e
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="setup_request_exception",
+            ) from e
         except BringParseException as e:
-            raise UpdateFailed("Unable to parse response from bring") from e
-        except BringAuthException:
-            # try to recover by refreshing access token, otherwise
-            # initiate reauth flow
-            try:
-                await self.bring.retrieve_new_access_token()
-            except (BringRequestException, BringParseException) as exc:
-                raise UpdateFailed("Refreshing authentication token failed") from exc
-            except BringAuthException as exc:
-                raise ConfigEntryAuthFailed(
-                    translation_domain=DOMAIN,
-                    translation_key="setup_authentication_exception",
-                    translation_placeholders={CONF_EMAIL: self.bring.mail},
-                ) from exc
-            return self.data
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="setup_parse_exception",
+            ) from e
+        except BringAuthException as e:
+            raise ConfigEntryAuthFailed(
+                translation_domain=DOMAIN,
+                translation_key="setup_authentication_exception",
+                translation_placeholders={CONF_EMAIL: self.bring.mail},
+            ) from e
+
+        if self.previous_lists - (
+            current_lists := {lst.listUuid for lst in self.lists}
+        ):
+            self._purge_deleted_lists()
+        self.previous_lists = current_lists
 
         list_dict: dict[str, BringData] = {}
-        for lst in lists_response["lists"]:
-            if (ctx := set(self.async_contexts())) and lst["listUuid"] not in ctx:
+        for lst in self.lists:
+            if (ctx := set(self.async_contexts())) and lst.listUuid not in ctx:
                 continue
             try:
-                items = await self.bring.get_list(lst["listUuid"])
+                items = await self.bring.get_list(lst.listUuid)
+                activity = await self.bring.get_activity(lst.listUuid)
+                users = await self.bring.get_list_users(lst.listUuid)
             except BringRequestException as e:
                 raise UpdateFailed(
-                    "Unable to connect and retrieve data from bring"
+                    translation_domain=DOMAIN,
+                    translation_key="setup_request_exception",
                 ) from e
             except BringParseException as e:
-                raise UpdateFailed("Unable to parse response from bring") from e
+                raise UpdateFailed(
+                    translation_domain=DOMAIN,
+                    translation_key="setup_parse_exception",
+                ) from e
             else:
-                list_dict[lst["listUuid"]] = BringData(**lst, **items)
+                list_dict[lst.listUuid] = BringData(lst, items, activity, users)
 
         return list_dict
 
@@ -89,6 +121,7 @@ class BringDataUpdateCoordinator(DataUpdateCoordinator[dict[str, BringData]]):
         try:
             await self.bring.login()
             self.user_settings = await self.bring.get_all_user_settings()
+            self.lists = (await self.bring.load_lists()).lists
         except BringRequestException as e:
             raise ConfigEntryNotReady(
                 translation_domain=DOMAIN,
@@ -105,3 +138,21 @@ class BringDataUpdateCoordinator(DataUpdateCoordinator[dict[str, BringData]]):
                 translation_key="setup_authentication_exception",
                 translation_placeholders={CONF_EMAIL: self.bring.mail},
             ) from e
+        self._purge_deleted_lists()
+
+    def _purge_deleted_lists(self) -> None:
+        """Purge device entries of deleted lists."""
+
+        device_reg = dr.async_get(self.hass)
+        identifiers = {
+            (DOMAIN, f"{self.config_entry.unique_id}_{lst.listUuid}")
+            for lst in self.lists
+        }
+        for device in dr.async_entries_for_config_entry(
+            device_reg, self.config_entry.entry_id
+        ):
+            if not set(device.identifiers) & identifiers:
+                _LOGGER.debug("Removing obsolete device entry %s", device.name)
+                device_reg.async_update_device(
+                    device.id, remove_config_entry_id=self.config_entry.entry_id
+                )
diff --git a/homeassistant/components/bring/diagnostics.py b/homeassistant/components/bring/diagnostics.py
index f4193a9993c..e5cafd30ab5 100644
--- a/homeassistant/components/bring/diagnostics.py
+++ b/homeassistant/components/bring/diagnostics.py
@@ -2,15 +2,27 @@
 
 from __future__ import annotations
 
+from typing import Any
+
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.const import CONF_EMAIL, CONF_NAME
 from homeassistant.core import HomeAssistant
 
-from . import BringConfigEntry
-from .coordinator import BringData
+from .coordinator import BringConfigEntry
+
+TO_REDACT = {CONF_NAME, CONF_EMAIL}
 
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: BringConfigEntry
-) -> dict[str, BringData]:
+) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
 
-    return config_entry.runtime_data.data
+    return {
+        "data": {
+            k: async_redact_data(v.to_dict(), TO_REDACT)
+            for k, v in config_entry.runtime_data.data.items()
+        },
+        "lists": [lst.to_dict() for lst in config_entry.runtime_data.lists],
+        "user_settings": config_entry.runtime_data.user_settings.to_dict(),
+    }
diff --git a/homeassistant/components/bring/entity.py b/homeassistant/components/bring/entity.py
index a1e0cb2edc0..ee90f22beef 100644
--- a/homeassistant/components/bring/entity.py
+++ b/homeassistant/components/bring/entity.py
@@ -2,11 +2,13 @@
 
 from __future__ import annotations
 
+from bring_api import BringList
+
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
-from .coordinator import BringData, BringDataUpdateCoordinator
+from .coordinator import BringDataUpdateCoordinator
 
 
 class BringBaseEntity(CoordinatorEntity[BringDataUpdateCoordinator]):
@@ -17,20 +19,20 @@ class BringBaseEntity(CoordinatorEntity[BringDataUpdateCoordinator]):
     def __init__(
         self,
         coordinator: BringDataUpdateCoordinator,
-        bring_list: BringData,
+        bring_list: BringList,
     ) -> None:
         """Initialize the entity."""
-        super().__init__(coordinator, bring_list["listUuid"])
+        super().__init__(coordinator, bring_list.listUuid)
 
-        self._list_uuid = bring_list["listUuid"]
+        self._list_uuid = bring_list.listUuid
 
         self.device_info = DeviceInfo(
             entry_type=DeviceEntryType.SERVICE,
-            name=bring_list["name"],
+            name=bring_list.name,
             identifiers={
                 (DOMAIN, f"{coordinator.config_entry.unique_id}_{self._list_uuid}")
             },
             manufacturer="Bring! Labs AG",
             model="Bring! Grocery Shopping List",
-            configuration_url=f"https://web.getbring.com/app/lists/{list(self.coordinator.data.keys()).index(self._list_uuid)}",
+            configuration_url=f"https://web.getbring.com/app/lists/{list(self.coordinator.lists).index(bring_list)}",
         )
diff --git a/homeassistant/components/bring/event.py b/homeassistant/components/bring/event.py
new file mode 100644
index 00000000000..403856405ce
--- /dev/null
+++ b/homeassistant/components/bring/event.py
@@ -0,0 +1,111 @@
+"""Event platform for Bring integration."""
+
+from __future__ import annotations
+
+from dataclasses import asdict
+from datetime import datetime
+
+from bring_api import ActivityType, BringList
+
+from homeassistant.components.event import EventEntity
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import BringConfigEntry
+from .coordinator import BringDataUpdateCoordinator
+from .entity import BringBaseEntity
+
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: BringConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the event platform."""
+    coordinator = config_entry.runtime_data
+    lists_added: set[str] = set()
+
+    @callback
+    def add_entities() -> None:
+        """Add event entities."""
+        nonlocal lists_added
+
+        if new_lists := {lst.listUuid for lst in coordinator.lists} - lists_added:
+            async_add_entities(
+                BringEventEntity(
+                    coordinator,
+                    bring_list,
+                )
+                for bring_list in coordinator.lists
+                if bring_list.listUuid in new_lists
+            )
+            lists_added |= new_lists
+
+    coordinator.async_add_listener(add_entities)
+    add_entities()
+
+
+class BringEventEntity(BringBaseEntity, EventEntity):
+    """An event entity."""
+
+    _attr_translation_key = "activities"
+
+    def __init__(
+        self,
+        coordinator: BringDataUpdateCoordinator,
+        bring_list: BringList,
+    ) -> None:
+        """Initialize the entity."""
+        super().__init__(coordinator, bring_list)
+        self._attr_unique_id = (
+            f"{coordinator.config_entry.unique_id}_{self._list_uuid}_activities"
+        )
+        self._attr_event_types = [event.name.lower() for event in ActivityType]
+
+    def _async_handle_event(self) -> None:
+        """Handle the activity event."""
+        bring_list = self.coordinator.data[self._list_uuid]
+        last_event_triggered = self.state
+        if bring_list.activity.timeline and (
+            last_event_triggered is None
+            or datetime.fromisoformat(last_event_triggered)
+            < bring_list.activity.timestamp
+        ):
+            activity = bring_list.activity.timeline[0]
+            attributes = asdict(activity.content)
+
+            attributes["last_activity_by"] = next(
+                (
+                    x.name
+                    for x in bring_list.users.users
+                    if x.publicUuid == activity.content.publicUserUuid
+                ),
+                None,
+            )
+
+            self._trigger_event(
+                activity.type.name.lower(),
+                attributes,
+            )
+            self.async_write_ha_state()
+
+    @property
+    def entity_picture(self) -> str | None:
+        """Return the entity picture to use in the frontend, if any."""
+
+        return (
+            f"https://api.getbring.com/rest/v2/bringusers/profilepictures/{public_uuid}"
+            if (public_uuid := self.state_attributes.get("publicUserUuid"))
+            else super().entity_picture
+        )
+
+    async def async_added_to_hass(self) -> None:
+        """Register callbacks with your device API/library."""
+        await super().async_added_to_hass()
+        self._async_handle_event()
+
+    def _handle_coordinator_update(self) -> None:
+        self._async_handle_event()
+        return super()._handle_coordinator_update()
diff --git a/homeassistant/components/bring/icons.json b/homeassistant/components/bring/icons.json
index c670ef87700..ea4f4e877bc 100644
--- a/homeassistant/components/bring/icons.json
+++ b/homeassistant/components/bring/icons.json
@@ -1,5 +1,10 @@
 {
   "entity": {
+    "event": {
+      "activity": {
+        "default": "mdi:bell"
+      }
+    },
     "sensor": {
       "urgent": {
         "default": "mdi:run-fast"
diff --git a/homeassistant/components/bring/manifest.json b/homeassistant/components/bring/manifest.json
index 71fe733ccf5..b2d42835cce 100644
--- a/homeassistant/components/bring/manifest.json
+++ b/homeassistant/components/bring/manifest.json
@@ -7,5 +7,6 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["bring_api"],
-  "requirements": ["bring-api==0.9.1"]
+  "quality_scale": "platinum",
+  "requirements": ["bring-api==1.1.0"]
 }
diff --git a/homeassistant/components/bring/quality_scale.yaml b/homeassistant/components/bring/quality_scale.yaml
index 1fdb3f13f1b..2d7d67be12e 100644
--- a/homeassistant/components/bring/quality_scale.yaml
+++ b/homeassistant/components/bring/quality_scale.yaml
@@ -7,12 +7,12 @@ rules:
   brands: done
   common-modules: done
   config-flow-test-coverage: done
-  config-flow: todo
+  config-flow: done
   dependency-transparency: done
   docs-actions: done
-  docs-high-level-description: todo
-  docs-installation-instructions: todo
-  docs-removal-instructions: todo
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
   entity-event-setup:
     status: exempt
     comment: The integration registers no events
@@ -26,8 +26,10 @@ rules:
   # Silver
   action-exceptions: done
   config-entry-unloading: done
-  docs-configuration-parameters: todo
-  docs-installation-parameters: todo
+  docs-configuration-parameters:
+    status: exempt
+    comment: Integration has no configuration parameters
+  docs-installation-parameters: done
   entity-unavailable: done
   integration-owner: done
   log-when-unavailable:
@@ -46,27 +48,29 @@ rules:
   discovery:
     status: exempt
     comment: Integration is a service and has no devices.
-  docs-data-update: todo
-  docs-examples: todo
-  docs-known-limitations: todo
-  docs-supported-devices: todo
-  docs-supported-functions: todo
-  docs-troubleshooting: todo
-  docs-use-cases: todo
-  dynamic-devices: todo
+  docs-data-update: done
+  docs-examples: done
+  docs-known-limitations: done
+  docs-supported-devices:
+    status: exempt
+    comment: Integration is a service and has no devices.
+  docs-supported-functions: done
+  docs-troubleshooting: done
+  docs-use-cases: done
+  dynamic-devices: done
   entity-category: done
   entity-device-class: done
   entity-disabled-by-default: done
   entity-translations: done
-  exception-translations: todo
+  exception-translations: done
   icon-translations: done
-  reconfiguration-flow: todo
+  reconfiguration-flow: done
   repair-issues:
     status: exempt
     comment: |
       no repairs
-  stale-devices: todo
+  stale-devices: done
   # Platinum
   async-dependency: done
   inject-websession: done
-  strict-typing: todo
+  strict-typing: done
diff --git a/homeassistant/components/bring/sensor.py b/homeassistant/components/bring/sensor.py
index bd33ce9bf88..2a09d574607 100644
--- a/homeassistant/components/bring/sensor.py
+++ b/homeassistant/components/bring/sensor.py
@@ -6,7 +6,7 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from enum import StrEnum
 
-from bring_api import BringUserSettingsResponse
+from bring_api import BringList, BringUserSettingsResponse
 from bring_api.const import BRING_SUPPORTED_LOCALES
 
 from homeassistant.components.sensor import (
@@ -15,12 +15,11 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
 )
 from homeassistant.const import EntityCategory
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import BringConfigEntry
-from .coordinator import BringData, BringDataUpdateCoordinator
+from .coordinator import BringConfigEntry, BringData, BringDataUpdateCoordinator
 from .entity import BringBaseEntity
 from .util import list_language, sum_attributes
 
@@ -65,7 +64,7 @@ SENSOR_DESCRIPTIONS: tuple[BringSensorEntityDescription, ...] = (
         translation_key=BringSensor.LIST_LANGUAGE,
         value_fn=(
             lambda lst, settings: x.lower()
-            if (x := list_language(lst["listUuid"], settings))
+            if (x := list_language(lst.lst.listUuid, settings))
             else None
         ),
         entity_category=EntityCategory.DIAGNOSTIC,
@@ -75,7 +74,7 @@ SENSOR_DESCRIPTIONS: tuple[BringSensorEntityDescription, ...] = (
     BringSensorEntityDescription(
         key=BringSensor.LIST_ACCESS,
         translation_key=BringSensor.LIST_ACCESS,
-        value_fn=lambda lst, _: lst["status"].lower(),
+        value_fn=lambda lst, _: lst.content.status.value.lower(),
         entity_category=EntityCategory.DIAGNOSTIC,
         options=["registered", "shared", "invitation"],
         device_class=SensorDeviceClass.ENUM,
@@ -86,20 +85,32 @@ SENSOR_DESCRIPTIONS: tuple[BringSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BringConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor platform."""
     coordinator = config_entry.runtime_data
+    lists_added: set[str] = set()
 
-    async_add_entities(
-        BringSensorEntity(
-            coordinator,
-            bring_list,
-            description,
-        )
-        for description in SENSOR_DESCRIPTIONS
-        for bring_list in coordinator.data.values()
-    )
+    @callback
+    def add_entities() -> None:
+        """Add sensor entities."""
+        nonlocal lists_added
+
+        if new_lists := {lst.listUuid for lst in coordinator.lists} - lists_added:
+            async_add_entities(
+                BringSensorEntity(
+                    coordinator,
+                    bring_list,
+                    description,
+                )
+                for description in SENSOR_DESCRIPTIONS
+                for bring_list in coordinator.lists
+                if bring_list.listUuid in new_lists
+            )
+            lists_added |= new_lists
+
+    coordinator.async_add_listener(add_entities)
+    add_entities()
 
 
 class BringSensorEntity(BringBaseEntity, SensorEntity):
@@ -110,7 +121,7 @@ class BringSensorEntity(BringBaseEntity, SensorEntity):
     def __init__(
         self,
         coordinator: BringDataUpdateCoordinator,
-        bring_list: BringData,
+        bring_list: BringList,
         entity_description: BringSensorEntityDescription,
     ) -> None:
         """Initialize the entity."""
diff --git a/homeassistant/components/bring/strings.json b/homeassistant/components/bring/strings.json
index ea9af03484e..1dbe0adbf6c 100644
--- a/homeassistant/components/bring/strings.json
+++ b/homeassistant/components/bring/strings.json
@@ -5,9 +5,15 @@
   "config": {
     "step": {
       "user": {
+        "title": "Bring! Grocery shopping list",
+        "description": "Connect your Bring! account to sync your shopping lists with Home Assistant.\n\nDon't have a Bring! account? Download the app on [Google Play for Android]({google_play}) or the [App Store for iOS]({app_store}) to sign up.",
         "data": {
           "email": "[%key:common::config_flow::data::email%]",
           "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "email": "The email address associated with your Bring! account.",
+          "password": "The password to login to your Bring! account."
         }
       },
       "reauth_confirm": {
@@ -16,21 +22,53 @@
         "data": {
           "email": "[%key:common::config_flow::data::email%]",
           "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "email": "[%key:component::bring::config::step::user::data_description::email%]",
+          "password": "[%key:component::bring::config::step::user::data_description::password%]"
+        }
+      },
+      "reconfigure": {
+        "title": "Bring! configuration",
+        "description": "Update your credentials if you have changed your Bring! account email or password.",
+        "data": {
+          "email": "[%key:common::config_flow::data::email%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "email": "[%key:component::bring::config::step::user::data_description::email%]",
+          "password": "[%key:component::bring::config::step::user::data_description::password%]"
         }
       }
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
+      "unknown": "[%key:common::config_flow::error::unknown%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]"
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "unique_id_mismatch": "The login details correspond to a different account. Please re-authenticate to the previously configured account."
+      "unique_id_mismatch": "The login details correspond to a different account. Please re-authenticate to the previously configured account.",
+      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
     }
   },
   "entity": {
+    "event": {
+      "activities": {
+        "name": "Activities",
+        "state_attributes": {
+          "event_type": {
+            "state": {
+              "list_items_added": "Items added",
+              "list_items_changed": "Items changed",
+              "list_items_removed": "Items removed"
+            }
+          }
+        }
+      }
+    },
     "sensor": {
       "urgent": {
         "name": "Urgent",
diff --git a/homeassistant/components/bring/todo.py b/homeassistant/components/bring/todo.py
index 75657e2fd64..d1eb9e78341 100644
--- a/homeassistant/components/bring/todo.py
+++ b/homeassistant/components/bring/todo.py
@@ -2,12 +2,14 @@
 
 from __future__ import annotations
 
+from itertools import chain
 from typing import TYPE_CHECKING
 import uuid
 
 from bring_api import (
     BringItem,
     BringItemOperation,
+    BringList,
     BringNotificationType,
     BringRequestException,
 )
@@ -19,19 +21,18 @@ from homeassistant.components.todo import (
     TodoListEntity,
     TodoListEntityFeature,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import BringConfigEntry
 from .const import (
     ATTR_ITEM_NAME,
     ATTR_NOTIFICATION_TYPE,
     DOMAIN,
     SERVICE_PUSH_NOTIFICATION,
 )
-from .coordinator import BringData, BringDataUpdateCoordinator
+from .coordinator import BringConfigEntry, BringData, BringDataUpdateCoordinator
 from .entity import BringBaseEntity
 
 PARALLEL_UPDATES = 0
@@ -40,18 +41,27 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BringConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor from a config entry created in the integrations UI."""
     coordinator = config_entry.runtime_data
+    lists_added: set[str] = set()
 
-    async_add_entities(
-        BringTodoListEntity(
-            coordinator,
-            bring_list=bring_list,
-        )
-        for bring_list in coordinator.data.values()
-    )
+    @callback
+    def add_entities() -> None:
+        """Add or remove todo list entities."""
+        nonlocal lists_added
+
+        if new_lists := {lst.listUuid for lst in coordinator.lists} - lists_added:
+            async_add_entities(
+                BringTodoListEntity(coordinator, bring_list)
+                for bring_list in coordinator.lists
+                if bring_list.listUuid in new_lists
+            )
+            lists_added |= new_lists
+
+    coordinator.async_add_listener(add_entities)
+    add_entities()
 
     platform = entity_platform.async_get_current_platform()
 
@@ -59,7 +69,7 @@ async def async_setup_entry(
         SERVICE_PUSH_NOTIFICATION,
         {
             vol.Required(ATTR_NOTIFICATION_TYPE): vol.All(
-                vol.Upper, cv.enum(BringNotificationType)
+                vol.Upper, vol.Coerce(BringNotificationType)
             ),
             vol.Optional(ATTR_ITEM_NAME): cv.string,
         },
@@ -80,7 +90,7 @@ class BringTodoListEntity(BringBaseEntity, TodoListEntity):
     )
 
     def __init__(
-        self, coordinator: BringDataUpdateCoordinator, bring_list: BringData
+        self, coordinator: BringDataUpdateCoordinator, bring_list: BringList
     ) -> None:
         """Initialize the entity."""
         super().__init__(coordinator, bring_list)
@@ -92,21 +102,21 @@ class BringTodoListEntity(BringBaseEntity, TodoListEntity):
         return [
             *(
                 TodoItem(
-                    uid=item["uuid"],
-                    summary=item["itemId"],
-                    description=item["specification"] or "",
+                    uid=item.uuid,
+                    summary=item.itemId,
+                    description=item.specification,
                     status=TodoItemStatus.NEEDS_ACTION,
                 )
-                for item in self.bring_list["purchase"]
+                for item in self.bring_list.content.items.purchase
             ),
             *(
                 TodoItem(
-                    uid=item["uuid"],
-                    summary=item["itemId"],
-                    description=item["specification"] or "",
+                    uid=item.uuid,
+                    summary=item.itemId,
+                    description=item.specification,
                     status=TodoItemStatus.COMPLETED,
                 )
-                for item in self.bring_list["recently"]
+                for item in self.bring_list.content.items.recently
             ),
         ]
 
@@ -119,7 +129,7 @@ class BringTodoListEntity(BringBaseEntity, TodoListEntity):
         """Add an item to the To-do list."""
         try:
             await self.coordinator.bring.save_item(
-                self.bring_list["listUuid"],
+                self._list_uuid,
                 item.summary or "",
                 item.description or "",
                 str(uuid.uuid4()),
@@ -154,26 +164,25 @@ class BringTodoListEntity(BringBaseEntity, TodoListEntity):
 
         bring_list = self.bring_list
 
-        bring_purchase_item = next(
-            (i for i in bring_list["purchase"] if i["uuid"] == item.uid),
+        current_item = next(
+            (
+                i
+                for i in chain(
+                    bring_list.content.items.purchase, bring_list.content.items.recently
+                )
+                if i.uuid == item.uid
+            ),
             None,
         )
 
-        bring_recently_item = next(
-            (i for i in bring_list["recently"] if i["uuid"] == item.uid),
-            None,
-        )
-
-        current_item = bring_purchase_item or bring_recently_item
-
         if TYPE_CHECKING:
             assert item.uid
             assert current_item
 
-        if item.summary == current_item["itemId"]:
+        if item.summary == current_item.itemId:
             try:
                 await self.coordinator.bring.batch_update_list(
-                    bring_list["listUuid"],
+                    self._list_uuid,
                     BringItem(
                         itemId=item.summary or "",
                         spec=item.description or "",
@@ -192,10 +201,10 @@ class BringTodoListEntity(BringBaseEntity, TodoListEntity):
         else:
             try:
                 await self.coordinator.bring.batch_update_list(
-                    bring_list["listUuid"],
+                    self._list_uuid,
                     [
                         BringItem(
-                            itemId=current_item["itemId"],
+                            itemId=current_item.itemId,
                             spec=item.description or "",
                             uuid=item.uid,
                             operation=BringItemOperation.REMOVE,
@@ -225,7 +234,7 @@ class BringTodoListEntity(BringBaseEntity, TodoListEntity):
 
         try:
             await self.coordinator.bring.batch_update_list(
-                self.bring_list["listUuid"],
+                self._list_uuid,
                 [
                     BringItem(
                         itemId=uid,
diff --git a/homeassistant/components/bring/util.py b/homeassistant/components/bring/util.py
index b706156a3d3..9a075f7bb89 100644
--- a/homeassistant/components/bring/util.py
+++ b/homeassistant/components/bring/util.py
@@ -14,27 +14,25 @@ def list_language(
     """Get the lists language setting."""
     try:
         list_settings = next(
-            filter(
-                lambda x: x["listUuid"] == list_uuid,
-                user_settings["userlistsettings"],
-            )
+            filter(lambda x: x.listUuid == list_uuid, user_settings.userlistsettings)
         )
 
-        return next(
-            filter(
-                lambda x: x["key"] == "listArticleLanguage",
-                list_settings["usersettings"],
+        return (
+            next(
+                filter(
+                    lambda x: x.key == "listArticleLanguage", list_settings.usersettings
+                )
             )
-        )["value"]
+        ).value
 
-    except (StopIteration, KeyError):
+    except StopIteration:
         return None
 
 
 def sum_attributes(bring_list: BringData, attribute: str) -> int:
     """Count items with given attribute set."""
     return sum(
-        item["attributes"][0]["content"][attribute]
-        for item in bring_list["purchase"]
-        if len(item.get("attributes", []))
+        getattr(item.attributes[0].content, attribute)
+        for item in bring_list.content.items.purchase
+        if item.attributes
     )
diff --git a/homeassistant/components/broadlink/climate.py b/homeassistant/components/broadlink/climate.py
index 25a6bbd60a5..5be04c24f0d 100644
--- a/homeassistant/components/broadlink/climate.py
+++ b/homeassistant/components/broadlink/climate.py
@@ -13,7 +13,7 @@ from homeassistant.components.climate import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PRECISION_HALVES, Platform, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, DOMAINS_AND_TYPES
 from .device import BroadlinkDevice
@@ -31,7 +31,7 @@ class SensorMode(IntEnum):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Broadlink climate entities."""
     device = hass.data[DOMAIN].devices[config_entry.entry_id]
diff --git a/homeassistant/components/broadlink/entity.py b/homeassistant/components/broadlink/entity.py
index 6c956d8c80a..a97374680f9 100644
--- a/homeassistant/components/broadlink/entity.py
+++ b/homeassistant/components/broadlink/entity.py
@@ -17,13 +17,13 @@ class BroadlinkEntity(Entity):
         self._device = device
         self._coordinator = device.update_manager.coordinator
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Call when the entity is added to hass."""
         self.async_on_remove(self._coordinator.async_add_listener(self._recv_data))
         if self._coordinator.data:
             self._update_state(self._coordinator.data)
 
-    async def async_update(self):
+    async def async_update(self) -> None:
         """Update the state of the entity."""
         await self._coordinator.async_request_refresh()
 
@@ -49,7 +49,7 @@ class BroadlinkEntity(Entity):
         """
 
     @property
-    def available(self):
+    def available(self) -> bool:
         """Return True if the entity is available."""
         return self._device.available
 
diff --git a/homeassistant/components/broadlink/light.py b/homeassistant/components/broadlink/light.py
index 39d6caaa49f..64698e57249 100644
--- a/homeassistant/components/broadlink/light.py
+++ b/homeassistant/components/broadlink/light.py
@@ -14,7 +14,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import BroadlinkEntity
@@ -29,7 +29,7 @@ BROADLINK_COLOR_MODE_SCENES = 2
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Broadlink light."""
     device = hass.data[DOMAIN].devices[config_entry.entry_id]
diff --git a/homeassistant/components/broadlink/remote.py b/homeassistant/components/broadlink/remote.py
index 18a3a82017c..c1196b03310 100644
--- a/homeassistant/components/broadlink/remote.py
+++ b/homeassistant/components/broadlink/remote.py
@@ -37,7 +37,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_COMMAND, STATE_OFF
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.storage import Store
 from homeassistant.util import dt as dt_util
@@ -92,7 +92,7 @@ SERVICE_DELETE_SCHEMA = COMMAND_SCHEMA.extend(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Broadlink remote."""
     device = hass.data[DOMAIN].devices[config_entry.entry_id]
diff --git a/homeassistant/components/broadlink/select.py b/homeassistant/components/broadlink/select.py
index 6253adc308a..661fc62600d 100644
--- a/homeassistant/components/broadlink/select.py
+++ b/homeassistant/components/broadlink/select.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.select import SelectEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BroadlinkDevice
 from .const import DOMAIN
@@ -28,7 +28,7 @@ DAY_NAME_TO_ID = {v: k for k, v in DAY_ID_TO_NAME.items()}
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Broadlink select."""
     device = hass.data[DOMAIN].devices[config_entry.entry_id]
diff --git a/homeassistant/components/broadlink/sensor.py b/homeassistant/components/broadlink/sensor.py
index b7ae71ff803..e7d420f0c0e 100644
--- a/homeassistant/components/broadlink/sensor.py
+++ b/homeassistant/components/broadlink/sensor.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import BroadlinkEntity
@@ -86,7 +86,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Broadlink sensor."""
     device = hass.data[DOMAIN].devices[config_entry.entry_id]
diff --git a/homeassistant/components/broadlink/switch.py b/homeassistant/components/broadlink/switch.py
index cc3b9dad464..d6869ac4c9c 100644
--- a/homeassistant/components/broadlink/switch.py
+++ b/homeassistant/components/broadlink/switch.py
@@ -29,8 +29,11 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
@@ -85,7 +88,7 @@ async def async_setup_platform(
 
     if switches := config.get(CONF_SWITCHES):
         platform_data = hass.data[DOMAIN].platforms.get(Platform.SWITCH, {})
-        async_add_entities_config_entry: AddEntitiesCallback
+        async_add_entities_config_entry: AddConfigEntryEntitiesCallback
         device: BroadlinkDevice
         async_add_entities_config_entry, device = platform_data.get(
             mac_addr, (None, None)
@@ -111,7 +114,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Broadlink switch."""
     device = hass.data[DOMAIN].devices[config_entry.entry_id]
diff --git a/homeassistant/components/broadlink/time.py b/homeassistant/components/broadlink/time.py
index 3dcb045fead..4687df6b8b6 100644
--- a/homeassistant/components/broadlink/time.py
+++ b/homeassistant/components/broadlink/time.py
@@ -8,7 +8,7 @@ from typing import Any
 from homeassistant.components.time import TimeEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from . import BroadlinkDevice
@@ -19,7 +19,7 @@ from .entity import BroadlinkEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Broadlink time."""
     device = hass.data[DOMAIN].devices[config_entry.entry_id]
diff --git a/homeassistant/components/brother/__init__.py b/homeassistant/components/brother/__init__.py
index e828d35f9c7..1c1768b58fd 100644
--- a/homeassistant/components/brother/__init__.py
+++ b/homeassistant/components/brother/__init__.py
@@ -5,17 +5,15 @@ from __future__ import annotations
 from brother import Brother, SnmpError
 
 from homeassistant.components.snmp import async_get_snmp_engine
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_TYPE, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 
-from .coordinator import BrotherDataUpdateCoordinator
+from .const import DOMAIN
+from .coordinator import BrotherConfigEntry, BrotherDataUpdateCoordinator
 
 PLATFORMS = [Platform.SENSOR]
 
-type BrotherConfigEntry = ConfigEntry[BrotherDataUpdateCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: BrotherConfigEntry) -> bool:
     """Set up Brother from a config entry."""
@@ -28,9 +26,16 @@ async def async_setup_entry(hass: HomeAssistant, entry: BrotherConfigEntry) -> b
             host, printer_type=printer_type, snmp_engine=snmp_engine
         )
     except (ConnectionError, SnmpError, TimeoutError) as error:
-        raise ConfigEntryNotReady from error
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="cannot_connect",
+            translation_placeholders={
+                "device": entry.title,
+                "error": repr(error),
+            },
+        ) from error
 
-    coordinator = BrotherDataUpdateCoordinator(hass, brother)
+    coordinator = BrotherDataUpdateCoordinator(hass, entry, brother)
     await coordinator.async_config_entry_first_refresh()
 
     entry.runtime_data = coordinator
diff --git a/homeassistant/components/brother/coordinator.py b/homeassistant/components/brother/coordinator.py
index 69463d107e4..a3c337f27f7 100644
--- a/homeassistant/components/brother/coordinator.py
+++ b/homeassistant/components/brother/coordinator.py
@@ -5,6 +5,7 @@ import logging
 
 from brother import Brother, BrotherSensors, SnmpError, UnsupportedModelError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -12,17 +13,25 @@ from .const import DOMAIN, UPDATE_INTERVAL
 
 _LOGGER = logging.getLogger(__name__)
 
+type BrotherConfigEntry = ConfigEntry[BrotherDataUpdateCoordinator]
+
 
 class BrotherDataUpdateCoordinator(DataUpdateCoordinator[BrotherSensors]):
     """Class to manage fetching Brother data from the printer."""
 
-    def __init__(self, hass: HomeAssistant, brother: Brother) -> None:
+    config_entry: BrotherConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: BrotherConfigEntry, brother: Brother
+    ) -> None:
         """Initialize."""
         self.brother = brother
+        self.device_name = config_entry.title
 
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=UPDATE_INTERVAL,
         )
@@ -33,5 +42,12 @@ class BrotherDataUpdateCoordinator(DataUpdateCoordinator[BrotherSensors]):
             async with timeout(20):
                 data = await self.brother.async_update()
         except (ConnectionError, SnmpError, UnsupportedModelError) as error:
-            raise UpdateFailed(error) from error
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="update_error",
+                translation_placeholders={
+                    "device": self.device_name,
+                    "error": repr(error),
+                },
+            ) from error
         return data
diff --git a/homeassistant/components/brother/diagnostics.py b/homeassistant/components/brother/diagnostics.py
index d4a6c6c5400..33b2e8297e4 100644
--- a/homeassistant/components/brother/diagnostics.py
+++ b/homeassistant/components/brother/diagnostics.py
@@ -7,7 +7,7 @@ from typing import Any
 
 from homeassistant.core import HomeAssistant
 
-from . import BrotherConfigEntry
+from .coordinator import BrotherConfigEntry
 
 
 async def async_get_config_entry_diagnostics(
diff --git a/homeassistant/components/brother/sensor.py b/homeassistant/components/brother/sensor.py
index d49ebdf07ca..a09fe8ebc60 100644
--- a/homeassistant/components/brother/sensor.py
+++ b/homeassistant/components/brother/sensor.py
@@ -20,12 +20,12 @@ from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import BrotherConfigEntry, BrotherDataUpdateCoordinator
 from .const import DOMAIN
+from .coordinator import BrotherConfigEntry, BrotherDataUpdateCoordinator
 
 ATTR_COUNTER = "counter"
 ATTR_REMAINING_PAGES = "remaining_pages"
@@ -303,7 +303,7 @@ SENSOR_TYPES: tuple[BrotherSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BrotherConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Brother entities from a config_entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/brother/strings.json b/homeassistant/components/brother/strings.json
index b502ed7e3b9..d0714a199c4 100644
--- a/homeassistant/components/brother/strings.json
+++ b/homeassistant/components/brother/strings.json
@@ -159,5 +159,13 @@
         "name": "Last restart"
       }
     }
+  },
+  "exceptions": {
+    "cannot_connect": {
+      "message": "An error occurred while connecting to the {device} printer: {error}"
+    },
+    "update_error": {
+      "message": "An error occurred while retrieving data from the {device} printer: {error}"
+    }
   }
 }
diff --git a/homeassistant/components/brottsplatskartan/sensor.py b/homeassistant/components/brottsplatskartan/sensor.py
index 6725a32bb40..60f9a8163de 100644
--- a/homeassistant/components/brottsplatskartan/sensor.py
+++ b/homeassistant/components/brottsplatskartan/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_APP_ID, CONF_AREA, DOMAIN, LOGGER
 
@@ -21,7 +21,9 @@ SCAN_INTERVAL = timedelta(minutes=30)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Brottsplatskartan sensor entry."""
 
diff --git a/homeassistant/components/brunt/cover.py b/homeassistant/components/brunt/cover.py
index bb97f42bd36..95931d3449e 100644
--- a/homeassistant/components/brunt/cover.py
+++ b/homeassistant/components/brunt/cover.py
@@ -16,7 +16,7 @@ from homeassistant.components.cover import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
@@ -34,7 +34,7 @@ from .coordinator import BruntConfigEntry, BruntCoordinator
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BruntConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the brunt platform."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/bryant_evolution/climate.py b/homeassistant/components/bryant_evolution/climate.py
index 2d54ced8217..bd053229a1a 100644
--- a/homeassistant/components/bryant_evolution/climate.py
+++ b/homeassistant/components/bryant_evolution/climate.py
@@ -17,7 +17,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BryantEvolutionConfigEntry, names
 from .const import CONF_SYSTEM_ZONE, DOMAIN
@@ -31,7 +31,7 @@ SCAN_INTERVAL = timedelta(seconds=60)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BryantEvolutionConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a config entry."""
 
diff --git a/homeassistant/components/bsblan/climate.py b/homeassistant/components/bsblan/climate.py
index 2833d6549b4..bef0388a57d 100644
--- a/homeassistant/components/bsblan/climate.py
+++ b/homeassistant/components/bsblan/climate.py
@@ -19,7 +19,7 @@ from homeassistant.const import ATTR_TEMPERATURE
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers.device_registry import format_mac
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
 
 from . import BSBLanConfigEntry, BSBLanData
@@ -43,7 +43,7 @@ PRESET_MODES = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BSBLanConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up BSBLAN device based on a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/bsblan/coordinator.py b/homeassistant/components/bsblan/coordinator.py
index be9030d95b0..5c5e23efa8a 100644
--- a/homeassistant/components/bsblan/coordinator.py
+++ b/homeassistant/components/bsblan/coordinator.py
@@ -38,6 +38,7 @@ class BSBLanUpdateCoordinator(DataUpdateCoordinator[BSBLanCoordinatorData]):
         super().__init__(
             hass,
             logger=LOGGER,
+            config_entry=config_entry,
             name=f"{DOMAIN}_{config_entry.data[CONF_HOST]}",
             update_interval=self._get_update_interval(),
         )
diff --git a/homeassistant/components/bsblan/sensor.py b/homeassistant/components/bsblan/sensor.py
index c13b4ad7650..6a6784a4542 100644
--- a/homeassistant/components/bsblan/sensor.py
+++ b/homeassistant/components/bsblan/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import BSBLanConfigEntry, BSBLanData
@@ -51,7 +51,7 @@ SENSOR_TYPES: tuple[BSBLanSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BSBLanConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up BSB-Lan sensor based on a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/bsblan/strings.json b/homeassistant/components/bsblan/strings.json
index a73a89ca1cc..93562763999 100644
--- a/homeassistant/components/bsblan/strings.json
+++ b/homeassistant/components/bsblan/strings.json
@@ -30,7 +30,7 @@
       "message": "Can't set preset mode to {preset_mode} when HVAC mode is not set to auto"
     },
     "set_data_error": {
-      "message": "An error occurred while sending the data to the BSBLAN device"
+      "message": "An error occurred while sending the data to the BSB-Lan device"
     },
     "set_temperature_error": {
       "message": "An error occurred while setting the temperature"
diff --git a/homeassistant/components/bsblan/water_heater.py b/homeassistant/components/bsblan/water_heater.py
index 318408a9124..a3aee4cdc15 100644
--- a/homeassistant/components/bsblan/water_heater.py
+++ b/homeassistant/components/bsblan/water_heater.py
@@ -16,7 +16,7 @@ from homeassistant.const import ATTR_TEMPERATURE, STATE_ON
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import format_mac
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BSBLanConfigEntry, BSBLanData
 from .const import DOMAIN
@@ -37,7 +37,7 @@ OPERATION_MODES_REVERSE = {v: k for k, v in OPERATION_MODES.items()}
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BSBLanConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up BSBLAN water heater based on a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/bt_home_hub_5/device_tracker.py b/homeassistant/components/bt_home_hub_5/device_tracker.py
index cbd06381578..84450573989 100644
--- a/homeassistant/components/bt_home_hub_5/device_tracker.py
+++ b/homeassistant/components/bt_home_hub_5/device_tracker.py
@@ -14,7 +14,7 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/bt_smarthub/device_tracker.py b/homeassistant/components/bt_smarthub/device_tracker.py
index 29f60bd317f..57ceb01700d 100644
--- a/homeassistant/components/bt_smarthub/device_tracker.py
+++ b/homeassistant/components/bt_smarthub/device_tracker.py
@@ -15,7 +15,7 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/bthome/binary_sensor.py b/homeassistant/components/bthome/binary_sensor.py
index bcc420df4a8..97ed85c1204 100644
--- a/homeassistant/components/bthome/binary_sensor.py
+++ b/homeassistant/components/bthome/binary_sensor.py
@@ -17,7 +17,7 @@ from homeassistant.components.bluetooth.passive_update_processor import (
     PassiveBluetoothProcessorEntity,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from .coordinator import BTHomePassiveBluetoothDataProcessor
@@ -169,7 +169,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BTHomeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the BTHome BLE binary sensors."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/bthome/config_flow.py b/homeassistant/components/bthome/config_flow.py
index 24fdddf2cc7..524365c1183 100644
--- a/homeassistant/components/bthome/config_flow.py
+++ b/homeassistant/components/bthome/config_flow.py
@@ -132,7 +132,7 @@ class BTHomeConfigFlow(ConfigFlow, domain=DOMAIN):
 
             return self._async_get_or_create_entry()
 
-        current_addresses = self._async_current_ids()
+        current_addresses = self._async_current_ids(include_ignore=False)
         for discovery_info in async_discovered_service_info(self.hass, False):
             address = discovery_info.address
             if address in current_addresses or address in self._discovered_devices:
diff --git a/homeassistant/components/bthome/event.py b/homeassistant/components/bthome/event.py
index a6ee79f4e05..99799819e43 100644
--- a/homeassistant/components/bthome/event.py
+++ b/homeassistant/components/bthome/event.py
@@ -12,7 +12,7 @@ from homeassistant.components.event import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import format_discovered_event_class, format_event_dispatcher_name
 from .const import (
@@ -104,7 +104,7 @@ class BTHomeEventEntity(EventEntity):
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BTHomeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up BTHome event."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/bthome/manifest.json b/homeassistant/components/bthome/manifest.json
index ad06f648d14..4130606ff5c 100644
--- a/homeassistant/components/bthome/manifest.json
+++ b/homeassistant/components/bthome/manifest.json
@@ -20,5 +20,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/bthome",
   "iot_class": "local_push",
-  "requirements": ["bthome-ble==3.9.1"]
+  "requirements": ["bthome-ble==3.12.4"]
 }
diff --git a/homeassistant/components/bthome/sensor.py b/homeassistant/components/bthome/sensor.py
index 417df9f5068..7025929abd8 100644
--- a/homeassistant/components/bthome/sensor.py
+++ b/homeassistant/components/bthome/sensor.py
@@ -42,7 +42,7 @@ from homeassistant.const import (
     UnitOfVolumeFlowRate,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from .coordinator import BTHomePassiveBluetoothDataProcessor
@@ -67,6 +67,21 @@ SENSOR_DESCRIPTIONS = {
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
+    # Channel (-)
+    (BTHomeExtendedSensorDeviceClass.CHANNEL, None): SensorEntityDescription(
+        key=str(BTHomeExtendedSensorDeviceClass.CHANNEL),
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    # Conductivity (µS/cm)
+    (
+        BTHomeSensorDeviceClass.CONDUCTIVITY,
+        Units.CONDUCTIVITY,
+    ): SensorEntityDescription(
+        key=f"{BTHomeSensorDeviceClass.CONDUCTIVITY}_{Units.CONDUCTIVITY}",
+        device_class=SensorDeviceClass.CONDUCTIVITY,
+        native_unit_of_measurement=UnitOfConductivity.MICROSIEMENS_PER_CM,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
     # Count (-)
     (BTHomeSensorDeviceClass.COUNT, None): SensorEntityDescription(
         key=str(BTHomeSensorDeviceClass.COUNT),
@@ -99,6 +114,12 @@ SENSOR_DESCRIPTIONS = {
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
     ),
+    # Directions (°)
+    (BTHomeExtendedSensorDeviceClass.DIRECTION, Units.DEGREE): SensorEntityDescription(
+        key=f"{BTHomeExtendedSensorDeviceClass.DIRECTION}_{Units.DEGREE}",
+        native_unit_of_measurement=DEGREE,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
     # Distance (mm)
     (
         BTHomeSensorDeviceClass.DISTANCE,
@@ -221,6 +242,16 @@ SENSOR_DESCRIPTIONS = {
         native_unit_of_measurement=UnitOfPower.WATT,
         state_class=SensorStateClass.MEASUREMENT,
     ),
+    # Precipitation (mm)
+    (
+        BTHomeExtendedSensorDeviceClass.PRECIPITATION,
+        Units.LENGTH_MILLIMETERS,
+    ): SensorEntityDescription(
+        key=f"{BTHomeExtendedSensorDeviceClass.PRECIPITATION}_{Units.LENGTH_MILLIMETERS}",
+        device_class=SensorDeviceClass.PRECIPITATION,
+        native_unit_of_measurement=UnitOfLength.MILLIMETERS,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
     # Pressure (mbar)
     (BTHomeSensorDeviceClass.PRESSURE, Units.PRESSURE_MBAR): SensorEntityDescription(
         key=f"{BTHomeSensorDeviceClass.PRESSURE}_{Units.PRESSURE_MBAR}",
@@ -357,16 +388,6 @@ SENSOR_DESCRIPTIONS = {
         native_unit_of_measurement=UnitOfVolume.LITERS,
         state_class=SensorStateClass.TOTAL,
     ),
-    # Conductivity (µS/cm)
-    (
-        BTHomeSensorDeviceClass.CONDUCTIVITY,
-        Units.CONDUCTIVITY,
-    ): SensorEntityDescription(
-        key=f"{BTHomeSensorDeviceClass.CONDUCTIVITY}_{Units.CONDUCTIVITY}",
-        device_class=SensorDeviceClass.CONDUCTIVITY,
-        native_unit_of_measurement=UnitOfConductivity.MICROSIEMENS_PER_CM,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
 }
 
 
@@ -402,7 +423,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BTHomeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the BTHome BLE sensors."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/buienradar/camera.py b/homeassistant/components/buienradar/camera.py
index 45ff2d6de52..15d08281911 100644
--- a/homeassistant/components/buienradar/camera.py
+++ b/homeassistant/components/buienradar/camera.py
@@ -13,7 +13,7 @@ from homeassistant.components.camera import Camera
 from homeassistant.const import CONF_COUNTRY_CODE, CONF_LATITUDE, CONF_LONGITUDE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from . import BuienRadarConfigEntry
@@ -31,7 +31,7 @@ SUPPORTED_COUNTRY_CODES = ["NL", "BE"]
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BuienRadarConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up buienradar radar-loop camera component."""
     config = entry.data
diff --git a/homeassistant/components/buienradar/config_flow.py b/homeassistant/components/buienradar/config_flow.py
index 45ad9028eb0..12f292036df 100644
--- a/homeassistant/components/buienradar/config_flow.py
+++ b/homeassistant/components/buienradar/config_flow.py
@@ -10,8 +10,7 @@ import voluptuous as vol
 from homeassistant.config_entries import ConfigEntry, ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_COUNTRY_CODE, CONF_LATITUDE, CONF_LONGITUDE
 from homeassistant.core import callback
-from homeassistant.helpers import selector
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, selector
 from homeassistant.helpers.schema_config_entry_flow import (
     SchemaCommonFlowHandler,
     SchemaFlowFormStep,
diff --git a/homeassistant/components/buienradar/sensor.py b/homeassistant/components/buienradar/sensor.py
index 712f765237e..586543de129 100644
--- a/homeassistant/components/buienradar/sensor.py
+++ b/homeassistant/components/buienradar/sensor.py
@@ -45,7 +45,7 @@ from homeassistant.const import (
     UnitOfVolumetricFlux,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from . import BuienRadarConfigEntry
@@ -169,6 +169,8 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
         translation_key="windazimuth",
         native_unit_of_measurement=DEGREE,
         icon="mdi:compass-outline",
+        device_class=SensorDeviceClass.WIND_DIRECTION,
+        state_class=SensorStateClass.MEASUREMENT_ANGLE,
     ),
     SensorEntityDescription(
         key="pressure",
@@ -530,30 +532,35 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
         translation_key="windazimuth_1d",
         native_unit_of_measurement=DEGREE,
         icon="mdi:compass-outline",
+        device_class=SensorDeviceClass.WIND_DIRECTION,
     ),
     SensorEntityDescription(
         key="windazimuth_2d",
         translation_key="windazimuth_2d",
         native_unit_of_measurement=DEGREE,
         icon="mdi:compass-outline",
+        device_class=SensorDeviceClass.WIND_DIRECTION,
     ),
     SensorEntityDescription(
         key="windazimuth_3d",
         translation_key="windazimuth_3d",
         native_unit_of_measurement=DEGREE,
         icon="mdi:compass-outline",
+        device_class=SensorDeviceClass.WIND_DIRECTION,
     ),
     SensorEntityDescription(
         key="windazimuth_4d",
         translation_key="windazimuth_4d",
         native_unit_of_measurement=DEGREE,
         icon="mdi:compass-outline",
+        device_class=SensorDeviceClass.WIND_DIRECTION,
     ),
     SensorEntityDescription(
         key="windazimuth_5d",
         translation_key="windazimuth_5d",
         native_unit_of_measurement=DEGREE,
         icon="mdi:compass-outline",
+        device_class=SensorDeviceClass.WIND_DIRECTION,
     ),
     SensorEntityDescription(
         key="condition_1d",
@@ -691,7 +698,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BuienRadarConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create the buienradar sensor."""
     config = entry.data
diff --git a/homeassistant/components/buienradar/weather.py b/homeassistant/components/buienradar/weather.py
index 8b71032bace..4b71024c241 100644
--- a/homeassistant/components/buienradar/weather.py
+++ b/homeassistant/components/buienradar/weather.py
@@ -51,7 +51,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BuienRadarConfigEntry
 from .const import DEFAULT_TIMEFRAME
@@ -94,7 +94,7 @@ CONDITION_MAP = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: BuienRadarConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the buienradar platform."""
     config = entry.data
diff --git a/homeassistant/components/burbank_water_and_power/__init__.py b/homeassistant/components/burbank_water_and_power/__init__.py
new file mode 100644
index 00000000000..2b82c8bd56b
--- /dev/null
+++ b/homeassistant/components/burbank_water_and_power/__init__.py
@@ -0,0 +1 @@
+"""Virtual integration: Burbank Water and Power (BWP)."""
diff --git a/homeassistant/components/burbank_water_and_power/manifest.json b/homeassistant/components/burbank_water_and_power/manifest.json
new file mode 100644
index 00000000000..7b938d3b98b
--- /dev/null
+++ b/homeassistant/components/burbank_water_and_power/manifest.json
@@ -0,0 +1,6 @@
+{
+  "domain": "burbank_water_and_power",
+  "name": "Burbank Water and Power (BWP)",
+  "integration_type": "virtual",
+  "supported_by": "opower"
+}
diff --git a/homeassistant/components/button/device_action.py b/homeassistant/components/button/device_action.py
index f4db7b619f8..30c0cc36835 100644
--- a/homeassistant/components/button/device_action.py
+++ b/homeassistant/components/button/device_action.py
@@ -13,8 +13,7 @@ from homeassistant.const import (
     CONF_TYPE,
 )
 from homeassistant.core import Context, HomeAssistant
-from homeassistant.helpers import entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
 
 from .const import DOMAIN, SERVICE_PRESS
diff --git a/homeassistant/components/caldav/calendar.py b/homeassistant/components/caldav/calendar.py
index fb53947a723..be909a02ea5 100644
--- a/homeassistant/components/caldav/calendar.py
+++ b/homeassistant/components/caldav/calendar.py
@@ -23,9 +23,12 @@ from homeassistant.const import (
     CONF_VERIFY_SSL,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import async_generate_entity_id
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -143,7 +146,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: CalDavConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the CalDav calendar platform for a config entry."""
     calendars = await async_get_calendars(hass, entry.runtime_data, SUPPORTED_COMPONENT)
@@ -174,7 +177,7 @@ class WebDavCalendarEntity(CoordinatorEntity[CalDavUpdateCoordinator], CalendarE
 
     def __init__(
         self,
-        name: str,
+        name: str | None,
         entity_id: str,
         coordinator: CalDavUpdateCoordinator,
         unique_id: str | None = None,
diff --git a/homeassistant/components/caldav/todo.py b/homeassistant/components/caldav/todo.py
index cbd7963b595..73f172dabec 100644
--- a/homeassistant/components/caldav/todo.py
+++ b/homeassistant/components/caldav/todo.py
@@ -20,7 +20,7 @@ from homeassistant.components.todo import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from . import CalDavConfigEntry
@@ -46,7 +46,7 @@ TODO_STATUS_MAP_INV: dict[TodoItemStatus, str] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: CalDavConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the CalDav todo platform for a config entry."""
     calendars = await async_get_calendars(hass, entry.runtime_data, SUPPORTED_COMPONENT)
@@ -138,6 +138,8 @@ class WebDavTodoListEntity(TodoListEntity):
             await self.hass.async_add_executor_job(
                 partial(self._calendar.save_todo, **item_data),
             )
+            # refreshing async otherwise it would take too much time
+            self.hass.async_create_task(self.async_update_ha_state(force_refresh=True))
         except (requests.ConnectionError, DAVError) as err:
             raise HomeAssistantError(f"CalDAV save error: {err}") from err
 
@@ -172,6 +174,8 @@ class WebDavTodoListEntity(TodoListEntity):
                     obj_type="todo",
                 ),
             )
+            # refreshing async otherwise it would take too much time
+            self.hass.async_create_task(self.async_update_ha_state(force_refresh=True))
         except (requests.ConnectionError, DAVError) as err:
             raise HomeAssistantError(f"CalDAV save error: {err}") from err
 
@@ -195,3 +199,5 @@ class WebDavTodoListEntity(TodoListEntity):
                 await self.hass.async_add_executor_job(item.delete)
             except (requests.ConnectionError, DAVError) as err:
                 raise HomeAssistantError(f"CalDAV delete error: {err}") from err
+        # refreshing async otherwise it would take too much time
+        self.hass.async_create_task(self.async_update_ha_state(force_refresh=True))
diff --git a/homeassistant/components/calendar/__init__.py b/homeassistant/components/calendar/__init__.py
index 40d6952fa64..96bf717c3ac 100644
--- a/homeassistant/components/calendar/__init__.py
+++ b/homeassistant/components/calendar/__init__.py
@@ -153,6 +153,27 @@ def _has_min_duration(
     return validate
 
 
+def _has_positive_interval(
+    start_key: str, end_key: str, duration_key: str
+) -> Callable[[dict[str, Any]], dict[str, Any]]:
+    """Verify that the time span between start and end is greater than zero."""
+
+    def validate(obj: dict[str, Any]) -> dict[str, Any]:
+        if (duration := obj.get(duration_key)) is not None:
+            if duration <= datetime.timedelta(seconds=0):
+                raise vol.Invalid(f"Expected positive duration ({duration})")
+            return obj
+
+        if (start := obj.get(start_key)) and (end := obj.get(end_key)):
+            if start >= end:
+                raise vol.Invalid(
+                    f"Expected end time to be after start time ({start}, {end})"
+                )
+        return obj
+
+    return validate
+
+
 def _has_same_type(*keys: Any) -> Callable[[dict[str, Any]], dict[str, Any]]:
     """Verify that all values are of the same type."""
 
@@ -281,6 +302,7 @@ SERVICE_GET_EVENTS_SCHEMA: Final = vol.All(
             ),
         }
     ),
+    _has_positive_interval(EVENT_START_DATETIME, EVENT_END_DATETIME, EVENT_DURATION),
 )
 
 
@@ -870,6 +892,7 @@ async def async_get_events_service(
         end = start + service_call.data[EVENT_DURATION]
     else:
         end = service_call.data[EVENT_END_DATETIME]
+
     calendar_event_list = await calendar.async_get_events(
         calendar.hass, dt_util.as_local(start), dt_util.as_local(end)
     )
diff --git a/homeassistant/components/cambridge_audio/manifest.json b/homeassistant/components/cambridge_audio/manifest.json
index 14a389587d2..88d28e256aa 100644
--- a/homeassistant/components/cambridge_audio/manifest.json
+++ b/homeassistant/components/cambridge_audio/manifest.json
@@ -8,6 +8,6 @@
   "iot_class": "local_push",
   "loggers": ["aiostreammagic"],
   "quality_scale": "platinum",
-  "requirements": ["aiostreammagic==2.10.0"],
+  "requirements": ["aiostreammagic==2.11.0"],
   "zeroconf": ["_stream-magic._tcp.local.", "_smoip._tcp.local."]
 }
diff --git a/homeassistant/components/cambridge_audio/media_player.py b/homeassistant/components/cambridge_audio/media_player.py
index 042178d5781..d18898fa916 100644
--- a/homeassistant/components/cambridge_audio/media_player.py
+++ b/homeassistant/components/cambridge_audio/media_player.py
@@ -23,7 +23,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import CambridgeAudioConfigEntry, media_browser
 from .const import (
@@ -65,7 +65,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: CambridgeAudioConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Cambridge Audio device based on a config entry."""
     client: StreamMagicClient = entry.runtime_data
diff --git a/homeassistant/components/cambridge_audio/select.py b/homeassistant/components/cambridge_audio/select.py
index 6bfe83c2539..e7d9136711f 100644
--- a/homeassistant/components/cambridge_audio/select.py
+++ b/homeassistant/components/cambridge_audio/select.py
@@ -9,7 +9,7 @@ from aiostreammagic.models import DisplayBrightness
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import CambridgeAudioConfigEntry
 from .entity import CambridgeAudioEntity, command
@@ -82,7 +82,7 @@ CONTROL_ENTITIES: tuple[CambridgeAudioSelectEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: CambridgeAudioConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Cambridge Audio select entities based on a config entry."""
 
diff --git a/homeassistant/components/cambridge_audio/switch.py b/homeassistant/components/cambridge_audio/switch.py
index 065a1da4f94..0cebe8266c4 100644
--- a/homeassistant/components/cambridge_audio/switch.py
+++ b/homeassistant/components/cambridge_audio/switch.py
@@ -9,7 +9,7 @@ from aiostreammagic import StreamMagicClient
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import CambridgeAudioConfigEntry
 from .entity import CambridgeAudioEntity, command
@@ -46,7 +46,7 @@ CONTROL_ENTITIES: tuple[CambridgeAudioSwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: CambridgeAudioConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Cambridge Audio switch entities based on a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/camera/__init__.py b/homeassistant/components/camera/__init__.py
index 556f8d75fc4..aa5d766c874 100644
--- a/homeassistant/components/camera/__init__.py
+++ b/homeassistant/components/camera/__init__.py
@@ -1175,12 +1175,17 @@ async def async_handle_snapshot_service(
             f"Cannot write `{snapshot_file}`, no access to path; `allowlist_external_dirs` may need to be adjusted in `configuration.yaml`"
         )
 
-    async with asyncio.timeout(CAMERA_IMAGE_TIMEOUT):
-        image = (
-            await _async_get_stream_image(camera, wait_for_next_keyframe=True)
-            if camera.use_stream_for_stills
-            else await camera.async_camera_image()
-        )
+    try:
+        async with asyncio.timeout(CAMERA_IMAGE_TIMEOUT):
+            image = (
+                await _async_get_stream_image(camera, wait_for_next_keyframe=True)
+                if camera.use_stream_for_stills
+                else await camera.async_camera_image()
+            )
+    except TimeoutError as err:
+        raise HomeAssistantError(
+            f"Unable to get snapshot: Timed out after {CAMERA_IMAGE_TIMEOUT} seconds"
+        ) from err
 
     if image is None:
         return
@@ -1194,7 +1199,7 @@ async def async_handle_snapshot_service(
     try:
         await hass.async_add_executor_job(_write_image, snapshot_file, image)
     except OSError as err:
-        _LOGGER.error("Can't write image to file: %s", err)
+        raise HomeAssistantError(f"Can't write image to file: {err}") from err
 
 
 async def async_handle_play_stream_service(
diff --git a/homeassistant/components/canary/__init__.py b/homeassistant/components/canary/__init__.py
index a28c37580ce..b0e59e49a6f 100644
--- a/homeassistant/components/canary/__init__.py
+++ b/homeassistant/components/canary/__init__.py
@@ -15,7 +15,7 @@ from homeassistant.config_entries import SOURCE_IMPORT
 from homeassistant.const import CONF_PASSWORD, CONF_TIMEOUT, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
diff --git a/homeassistant/components/canary/alarm_control_panel.py b/homeassistant/components/canary/alarm_control_panel.py
index 443944da8c3..9fe2dfb598d 100644
--- a/homeassistant/components/canary/alarm_control_panel.py
+++ b/homeassistant/components/canary/alarm_control_panel.py
@@ -13,7 +13,7 @@ from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelState,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .coordinator import CanaryConfigEntry, CanaryDataUpdateCoordinator
@@ -22,7 +22,7 @@ from .coordinator import CanaryConfigEntry, CanaryDataUpdateCoordinator
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: CanaryConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Canary alarm control panels based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/canary/camera.py b/homeassistant/components/canary/camera.py
index 8f4a01c9968..07645f2f403 100644
--- a/homeassistant/components/canary/camera.py
+++ b/homeassistant/components/canary/camera.py
@@ -22,7 +22,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_aiohttp_proxy_stream
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import dt as dt_util
 
@@ -48,7 +48,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: CanaryConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Canary sensors based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/canary/sensor.py b/homeassistant/components/canary/sensor.py
index 22f3eada2cb..d92166926e9 100644
--- a/homeassistant/components/canary/sensor.py
+++ b/homeassistant/components/canary/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, MANUFACTURER
@@ -64,7 +64,7 @@ STATE_AIR_QUALITY_VERY_ABNORMAL: Final = "very_abnormal"
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: CanaryConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Canary sensors based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/canary/strings.json b/homeassistant/components/canary/strings.json
index 699e8b25e11..8be11a48b5e 100644
--- a/homeassistant/components/canary/strings.json
+++ b/homeassistant/components/canary/strings.json
@@ -21,8 +21,8 @@
     "step": {
       "init": {
         "data": {
-          "ffmpeg_arguments": "Arguments passed to ffmpeg for cameras",
-          "timeout": "Request Timeout (seconds)"
+          "ffmpeg_arguments": "Arguments passed to FFmpeg for cameras",
+          "timeout": "Request timeout (seconds)"
         }
       }
     }
diff --git a/homeassistant/components/cast/config_flow.py b/homeassistant/components/cast/config_flow.py
index 034cf856023..6c33eac230f 100644
--- a/homeassistant/components/cast/config_flow.py
+++ b/homeassistant/components/cast/config_flow.py
@@ -16,12 +16,21 @@ from homeassistant.config_entries import (
 from homeassistant.const import CONF_UUID
 from homeassistant.core import callback
 from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.selector import SelectSelector, SelectSelectorConfig
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
 from .const import CONF_IGNORE_CEC, CONF_KNOWN_HOSTS, DOMAIN
 
 IGNORE_CEC_SCHEMA = vol.Schema(vol.All(cv.ensure_list, [cv.string]))
-KNOWN_HOSTS_SCHEMA = vol.Schema(vol.All(cv.ensure_list, [cv.string]))
+KNOWN_HOSTS_SCHEMA = vol.Schema(
+    {
+        vol.Optional(
+            CONF_KNOWN_HOSTS,
+        ): SelectSelector(
+            SelectSelectorConfig(custom_value=True, options=[], multiple=True),
+        )
+    }
+)
 WANTED_UUID_SCHEMA = vol.Schema(vol.All(cv.ensure_list, [cv.string]))
 
 
@@ -30,12 +39,6 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
 
     VERSION = 1
 
-    def __init__(self) -> None:
-        """Initialize flow."""
-        self._ignore_cec = set[str]()
-        self._known_hosts = set[str]()
-        self._wanted_uuid = set[str]()
-
     @staticmethod
     @callback
     def async_get_options_flow(
@@ -62,48 +65,31 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Confirm the setup."""
-        errors = {}
-        data = {CONF_KNOWN_HOSTS: self._known_hosts}
-
         if user_input is not None:
-            bad_hosts = False
-            known_hosts = user_input[CONF_KNOWN_HOSTS]
-            known_hosts = [x.strip() for x in known_hosts.split(",") if x.strip()]
-            try:
-                known_hosts = KNOWN_HOSTS_SCHEMA(known_hosts)
-            except vol.Invalid:
-                errors["base"] = "invalid_known_hosts"
-                bad_hosts = True
-            else:
-                self._known_hosts = known_hosts
-                data = self._get_data()
-            if not bad_hosts:
-                return self.async_create_entry(title="Google Cast", data=data)
+            known_hosts = _trim_items(user_input.get(CONF_KNOWN_HOSTS, []))
+            return self.async_create_entry(
+                title="Google Cast",
+                data=self._get_data(known_hosts=known_hosts),
+            )
 
-        fields = {}
-        fields[vol.Optional(CONF_KNOWN_HOSTS, default="")] = str
-
-        return self.async_show_form(
-            step_id="config", data_schema=vol.Schema(fields), errors=errors
-        )
+        return self.async_show_form(step_id="config", data_schema=KNOWN_HOSTS_SCHEMA)
 
     async def async_step_confirm(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Confirm the setup."""
-
-        data = self._get_data()
-
         if user_input is not None or not onboarding.async_is_onboarded(self.hass):
-            return self.async_create_entry(title="Google Cast", data=data)
+            return self.async_create_entry(title="Google Cast", data=self._get_data())
 
         return self.async_show_form(step_id="confirm")
 
-    def _get_data(self):
+    def _get_data(
+        self, *, known_hosts: list[str] | None = None
+    ) -> dict[str, list[str]]:
         return {
-            CONF_IGNORE_CEC: list(self._ignore_cec),
-            CONF_KNOWN_HOSTS: list(self._known_hosts),
-            CONF_UUID: list(self._wanted_uuid),
+            CONF_IGNORE_CEC: [],
+            CONF_KNOWN_HOSTS: known_hosts or [],
+            CONF_UUID: [],
         }
 
 
@@ -123,31 +109,24 @@ class CastOptionsFlowHandler(OptionsFlow):
     ) -> ConfigFlowResult:
         """Manage the Google Cast options."""
         errors: dict[str, str] = {}
-        current_config = self.config_entry.data
         if user_input is not None:
-            bad_hosts, known_hosts = _string_to_list(
-                user_input.get(CONF_KNOWN_HOSTS, ""), KNOWN_HOSTS_SCHEMA
+            known_hosts = _trim_items(user_input.get(CONF_KNOWN_HOSTS, []))
+            self.updated_config = dict(self.config_entry.data)
+            self.updated_config[CONF_KNOWN_HOSTS] = known_hosts
+
+            if self.show_advanced_options:
+                return await self.async_step_advanced_options()
+
+            self.hass.config_entries.async_update_entry(
+                self.config_entry, data=self.updated_config
             )
-
-            if not bad_hosts:
-                self.updated_config = dict(current_config)
-                self.updated_config[CONF_KNOWN_HOSTS] = known_hosts
-
-                if self.show_advanced_options:
-                    return await self.async_step_advanced_options()
-
-                self.hass.config_entries.async_update_entry(
-                    self.config_entry, data=self.updated_config
-                )
-                return self.async_create_entry(title="", data={})
-
-        fields: dict[vol.Marker, type[str]] = {}
-        suggested_value = _list_to_string(current_config.get(CONF_KNOWN_HOSTS))
-        _add_with_suggestion(fields, CONF_KNOWN_HOSTS, suggested_value)
+            return self.async_create_entry(title="", data={})
 
         return self.async_show_form(
             step_id="basic_options",
-            data_schema=vol.Schema(fields),
+            data_schema=self.add_suggested_values_to_schema(
+                KNOWN_HOSTS_SCHEMA, self.config_entry.data
+            ),
             errors=errors,
             last_step=not self.show_advanced_options,
         )
@@ -206,6 +185,10 @@ def _string_to_list(string, schema):
     return invalid, items
 
 
+def _trim_items(items: list[str]) -> list[str]:
+    return [x.strip() for x in items if x.strip()]
+
+
 def _add_with_suggestion(
     fields: dict[vol.Marker, type[str]], key: str, suggested_value: str
 ) -> None:
diff --git a/homeassistant/components/cast/const.py b/homeassistant/components/cast/const.py
index 056ee054d1d..0a85a0007b3 100644
--- a/homeassistant/components/cast/const.py
+++ b/homeassistant/components/cast/const.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, TypedDict
+from typing import TYPE_CHECKING, NotRequired, TypedDict
 
 from homeassistant.util.signal_type import SignalType
 
@@ -46,3 +46,4 @@ class HomeAssistantControllerData(TypedDict):
     hass_uuid: str
     client_id: str | None
     refresh_token: str
+    app_id: NotRequired[str]
diff --git a/homeassistant/components/cast/helpers.py b/homeassistant/components/cast/helpers.py
index 8f4af197b8e..c45bbb4fbbc 100644
--- a/homeassistant/components/cast/helpers.py
+++ b/homeassistant/components/cast/helpers.py
@@ -7,6 +7,7 @@ from dataclasses import dataclass
 import logging
 from typing import TYPE_CHECKING, ClassVar
 from urllib.parse import urlparse
+from uuid import UUID
 
 import aiohttp
 import attr
@@ -40,7 +41,7 @@ class ChromecastInfo:
     is_dynamic_group = attr.ib(type=bool | None, default=None)
 
     @property
-    def friendly_name(self) -> str:
+    def friendly_name(self) -> str | None:
         """Return the Friendly Name."""
         return self.cast_info.friendly_name
 
@@ -50,7 +51,7 @@ class ChromecastInfo:
         return self.cast_info.cast_type == CAST_TYPE_GROUP
 
     @property
-    def uuid(self) -> bool:
+    def uuid(self) -> UUID:
         """Return the UUID."""
         return self.cast_info.uuid
 
@@ -80,7 +81,7 @@ class ChromecastInfo:
                     "+label%3A%22integration%3A+cast%22"
                 )
 
-                _LOGGER.debug(
+                _LOGGER.info(
                     (
                         "Fetched cast details for unknown model '%s' manufacturer:"
                         " '%s', type: '%s'. Please %s"
@@ -111,7 +112,10 @@ class ChromecastInfo:
         is_dynamic_group = False
         http_group_status = None
         http_group_status = dial.get_multizone_status(
-            None,
+            # We pass services which will be used for the HTTP request, and we
+            # don't care about the host in http_group_status.dynamic_groups so
+            # we pass an empty string to simplify the code.
+            "",
             services=self.cast_info.services,
             zconf=ChromeCastZeroconf.get_zeroconf(),
         )
diff --git a/homeassistant/components/cast/manifest.json b/homeassistant/components/cast/manifest.json
index 0650f267544..6c8b0536e2f 100644
--- a/homeassistant/components/cast/manifest.json
+++ b/homeassistant/components/cast/manifest.json
@@ -14,7 +14,7 @@
   "documentation": "https://www.home-assistant.io/integrations/cast",
   "iot_class": "local_polling",
   "loggers": ["casttube", "pychromecast"],
-  "requirements": ["PyChromecast==14.0.5"],
+  "requirements": ["PyChromecast==14.0.7"],
   "single_config_entry": true,
   "zeroconf": ["_googlecast._tcp.local."]
 }
diff --git a/homeassistant/components/cast/media_player.py b/homeassistant/components/cast/media_player.py
index 28db97a857d..8ff078dfafd 100644
--- a/homeassistant/components/cast/media_player.py
+++ b/homeassistant/components/cast/media_player.py
@@ -51,9 +51,9 @@ from homeassistant.core import CALLBACK_TYPE, Event, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.network import NoURLAvailableError, get_url, is_hass_url
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.logging import async_create_catching_coro
 
 from .const import (
@@ -140,7 +140,7 @@ def _async_create_cast_device(hass: HomeAssistant, info: ChromecastInfo):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Cast from a config entry."""
     hass.data.setdefault(ADDED_CAST_DEVICES_KEY, set())
diff --git a/homeassistant/components/cast/services.yaml b/homeassistant/components/cast/services.yaml
index e2e23ad40a2..45b36f6d983 100644
--- a/homeassistant/components/cast/services.yaml
+++ b/homeassistant/components/cast/services.yaml
@@ -7,11 +7,11 @@ show_lovelace_view:
           integration: cast
           domain: media_player
     dashboard_path:
-      required: true
       example: lovelace-cast
       selector:
         text:
     view_path:
+      required: true
       example: downstairs
       selector:
         text:
diff --git a/homeassistant/components/cast/strings.json b/homeassistant/components/cast/strings.json
index 9c49813bd83..8c7c7c0cff0 100644
--- a/homeassistant/components/cast/strings.json
+++ b/homeassistant/components/cast/strings.json
@@ -6,9 +6,11 @@
       },
       "config": {
         "title": "Google Cast configuration",
-        "description": "Known Hosts - A comma-separated list of hostnames or IP-addresses of cast devices, use if mDNS discovery is not working.",
         "data": {
-          "known_hosts": "Known hosts"
+          "known_hosts": "Add known host"
+        },
+        "data_description": {
+          "known_hosts": "Hostnames or IP-addresses of cast devices, use if mDNS discovery is not working"
         }
       }
     },
@@ -20,9 +22,11 @@
     "step": {
       "basic_options": {
         "title": "[%key:component::cast::config::step::config::title%]",
-        "description": "[%key:component::cast::config::step::config::description%]",
         "data": {
           "known_hosts": "[%key:component::cast::config::step::config::data::known_hosts%]"
+        },
+        "data_description": {
+          "known_hosts": "[%key:component::cast::config::step::config::data_description::known_hosts%]"
         }
       },
       "advanced_options": {
@@ -49,7 +53,7 @@
         },
         "dashboard_path": {
           "name": "Dashboard path",
-          "description": "The URL path of the dashboard to show."
+          "description": "The URL path of the dashboard to show, defaults to lovelace if not specified."
         },
         "view_path": {
           "name": "View path",
diff --git a/homeassistant/components/ccm15/climate.py b/homeassistant/components/ccm15/climate.py
index 099b91ec02c..df321395b9e 100644
--- a/homeassistant/components/ccm15/climate.py
+++ b/homeassistant/components/ccm15/climate.py
@@ -20,7 +20,7 @@ from homeassistant.components.climate import (
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import CONST_CMD_FAN_MAP, CONST_CMD_STATE_MAP, DOMAIN
@@ -32,7 +32,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: CCM15ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up all climate."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/ccm15/config_flow.py b/homeassistant/components/ccm15/config_flow.py
index 0e49e0929e5..c059796045c 100644
--- a/homeassistant/components/ccm15/config_flow.py
+++ b/homeassistant/components/ccm15/config_flow.py
@@ -10,7 +10,7 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PORT
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import DEFAULT_TIMEOUT, DOMAIN
 
diff --git a/homeassistant/components/cert_expiry/__init__.py b/homeassistant/components/cert_expiry/__init__.py
index bc6ae29ee8e..adf1e0e981c 100644
--- a/homeassistant/components/cert_expiry/__init__.py
+++ b/homeassistant/components/cert_expiry/__init__.py
@@ -2,24 +2,21 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PORT, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.start import async_at_started
 
-from .coordinator import CertExpiryDataUpdateCoordinator
+from .coordinator import CertExpiryConfigEntry, CertExpiryDataUpdateCoordinator
 
 PLATFORMS = [Platform.SENSOR]
 
-type CertExpiryConfigEntry = ConfigEntry[CertExpiryDataUpdateCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: CertExpiryConfigEntry) -> bool:
     """Load the saved entities."""
     host: str = entry.data[CONF_HOST]
     port: int = entry.data[CONF_PORT]
 
-    coordinator = CertExpiryDataUpdateCoordinator(hass, host, port)
+    coordinator = CertExpiryDataUpdateCoordinator(hass, entry, host, port)
 
     entry.runtime_data = coordinator
 
@@ -34,6 +31,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: CertExpiryConfigEntry) -
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: CertExpiryConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/cert_expiry/coordinator.py b/homeassistant/components/cert_expiry/coordinator.py
index 80c91f1d890..644e3ee3d00 100644
--- a/homeassistant/components/cert_expiry/coordinator.py
+++ b/homeassistant/components/cert_expiry/coordinator.py
@@ -5,6 +5,7 @@ from __future__ import annotations
 from datetime import datetime, timedelta
 import logging
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -14,11 +15,21 @@ from .helper import get_cert_expiry_timestamp
 
 _LOGGER = logging.getLogger(__name__)
 
+type CertExpiryConfigEntry = ConfigEntry[CertExpiryDataUpdateCoordinator]
+
 
 class CertExpiryDataUpdateCoordinator(DataUpdateCoordinator[datetime | None]):
     """Class to manage fetching Cert Expiry data from single endpoint."""
 
-    def __init__(self, hass: HomeAssistant, host: str, port: int) -> None:
+    config_entry: CertExpiryConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: CertExpiryConfigEntry,
+        host: str,
+        port: int,
+    ) -> None:
         """Initialize global Cert Expiry data updater."""
         self.host = host
         self.port = port
@@ -31,6 +42,7 @@ class CertExpiryDataUpdateCoordinator(DataUpdateCoordinator[datetime | None]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=name,
             update_interval=timedelta(hours=12),
             always_update=False,
diff --git a/homeassistant/components/cert_expiry/sensor.py b/homeassistant/components/cert_expiry/sensor.py
index 4fd0846f0f3..3854dfc109e 100644
--- a/homeassistant/components/cert_expiry/sensor.py
+++ b/homeassistant/components/cert_expiry/sensor.py
@@ -7,18 +7,17 @@ from datetime import datetime
 from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import CertExpiryConfigEntry
 from .const import DOMAIN
-from .coordinator import CertExpiryDataUpdateCoordinator
+from .coordinator import CertExpiryConfigEntry, CertExpiryDataUpdateCoordinator
 from .entity import CertExpiryEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: CertExpiryConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add cert-expiry entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/chacon_dio/config_flow.py b/homeassistant/components/chacon_dio/config_flow.py
index 54604b81153..daaf38e0edc 100644
--- a/homeassistant/components/chacon_dio/config_flow.py
+++ b/homeassistant/components/chacon_dio/config_flow.py
@@ -44,7 +44,7 @@ class ChaconDioConfigFlow(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "cannot_connect"
             except DIOChaconInvalidAuthError:
                 errors["base"] = "invalid_auth"
-            except Exception:  # pylint: disable=broad-except
+            except Exception:
                 _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
 
diff --git a/homeassistant/components/chacon_dio/cover.py b/homeassistant/components/chacon_dio/cover.py
index 3a4955adf5c..ea80116be8a 100644
--- a/homeassistant/components/chacon_dio/cover.py
+++ b/homeassistant/components/chacon_dio/cover.py
@@ -12,7 +12,7 @@ from homeassistant.components.cover import (
     CoverEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import ChaconDioConfigEntry
 from .entity import ChaconDioEntity
@@ -23,7 +23,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ChaconDioConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Chacon Dio cover devices."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/chacon_dio/switch.py b/homeassistant/components/chacon_dio/switch.py
index be178c3c3b5..05b55552615 100644
--- a/homeassistant/components/chacon_dio/switch.py
+++ b/homeassistant/components/chacon_dio/switch.py
@@ -7,7 +7,7 @@ from dio_chacon_wifi_api.const import DeviceTypeEnum
 
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import ChaconDioConfigEntry
 from .entity import ChaconDioEntity
@@ -18,7 +18,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ChaconDioConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Chacon Dio switch devices."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/cisco_ios/device_tracker.py b/homeassistant/components/cisco_ios/device_tracker.py
index b882f046a8e..6cc403817cf 100644
--- a/homeassistant/components/cisco_ios/device_tracker.py
+++ b/homeassistant/components/cisco_ios/device_tracker.py
@@ -14,7 +14,7 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
@@ -104,7 +104,7 @@ class CiscoDeviceScanner(DeviceScanner):
         """Open connection to the router and get arp entries."""
 
         try:
-            cisco_ssh: pxssh.pxssh[str] = pxssh.pxssh(encoding="uft-8")
+            cisco_ssh: pxssh.pxssh[str] = pxssh.pxssh(encoding="utf-8")
             cisco_ssh.login(
                 self.host,
                 self.username,
diff --git a/homeassistant/components/cisco_mobility_express/device_tracker.py b/homeassistant/components/cisco_mobility_express/device_tracker.py
index 2c7398ae172..78bbcc9edbc 100644
--- a/homeassistant/components/cisco_mobility_express/device_tracker.py
+++ b/homeassistant/components/cisco_mobility_express/device_tracker.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     CONF_VERIFY_SSL,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/cisco_webex_teams/notify.py b/homeassistant/components/cisco_webex_teams/notify.py
index 74d033c62d4..2f76ed8f65a 100644
--- a/homeassistant/components/cisco_webex_teams/notify.py
+++ b/homeassistant/components/cisco_webex_teams/notify.py
@@ -14,7 +14,7 @@ from homeassistant.components.notify import (
 )
 from homeassistant.const import CONF_TOKEN
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/citybikes/sensor.py b/homeassistant/components/citybikes/sensor.py
index 6cd401989c8..e08b651dd70 100644
--- a/homeassistant/components/citybikes/sensor.py
+++ b/homeassistant/components/citybikes/sensor.py
@@ -28,8 +28,8 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import async_generate_entity_id
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_time_interval
diff --git a/homeassistant/components/clementine/media_player.py b/homeassistant/components/clementine/media_player.py
index 233ffc840c0..04c1305cb13 100644
--- a/homeassistant/components/clementine/media_player.py
+++ b/homeassistant/components/clementine/media_player.py
@@ -17,7 +17,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_HOST, CONF_NAME, CONF_PORT
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/clickatell/notify.py b/homeassistant/components/clickatell/notify.py
index c8d96d48faf..9a5a5160ada 100644
--- a/homeassistant/components/clickatell/notify.py
+++ b/homeassistant/components/clickatell/notify.py
@@ -15,7 +15,7 @@ from homeassistant.components.notify import (
 )
 from homeassistant.const import CONF_API_KEY, CONF_RECIPIENT
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/clicksend/notify.py b/homeassistant/components/clicksend/notify.py
index d00d7b413cc..53f16875d6f 100644
--- a/homeassistant/components/clicksend/notify.py
+++ b/homeassistant/components/clicksend/notify.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     CONTENT_TYPE_JSON,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/clicksend_tts/notify.py b/homeassistant/components/clicksend_tts/notify.py
index 6b5f2040448..5a08ccd7988 100644
--- a/homeassistant/components/clicksend_tts/notify.py
+++ b/homeassistant/components/clicksend_tts/notify.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     CONTENT_TYPE_JSON,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/climate/__init__.py b/homeassistant/components/climate/__init__.py
index af64b06ebe6..287a2397121 100644
--- a/homeassistant/components/climate/__init__.py
+++ b/homeassistant/components/climate/__init__.py
@@ -68,7 +68,7 @@ from .const import (  # noqa: F401
     FAN_ON,
     FAN_TOP,
     HVAC_MODES,
-    INTENT_GET_TEMPERATURE,
+    INTENT_SET_TEMPERATURE,
     PRESET_ACTIVITY,
     PRESET_AWAY,
     PRESET_BOOST,
diff --git a/homeassistant/components/climate/const.py b/homeassistant/components/climate/const.py
index 111401a2251..ecc0066cd93 100644
--- a/homeassistant/components/climate/const.py
+++ b/homeassistant/components/climate/const.py
@@ -126,7 +126,7 @@ DEFAULT_MAX_HUMIDITY = 99
 
 DOMAIN = "climate"
 
-INTENT_GET_TEMPERATURE = "HassClimateGetTemperature"
+INTENT_SET_TEMPERATURE = "HassClimateSetTemperature"
 
 SERVICE_SET_AUX_HEAT = "set_aux_heat"
 SERVICE_SET_FAN_MODE = "set_fan_mode"
diff --git a/homeassistant/components/climate/device_action.py b/homeassistant/components/climate/device_action.py
index 84f166b752e..c9d098d7be6 100644
--- a/homeassistant/components/climate/device_action.py
+++ b/homeassistant/components/climate/device_action.py
@@ -17,8 +17,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Context, HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.entity import get_capability, get_supported_features
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
 
diff --git a/homeassistant/components/climate/intent.py b/homeassistant/components/climate/intent.py
index 9a8dfdda4ec..7691a2db0f1 100644
--- a/homeassistant/components/climate/intent.py
+++ b/homeassistant/components/climate/intent.py
@@ -1,28 +1,39 @@
-"""Intents for the client integration."""
+"""Intents for the climate integration."""
 
 from __future__ import annotations
 
 import voluptuous as vol
 
+from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import intent
+from homeassistant.helpers import config_validation as cv, intent
 
-from . import DOMAIN, INTENT_GET_TEMPERATURE
+from . import (
+    ATTR_TEMPERATURE,
+    DOMAIN,
+    INTENT_SET_TEMPERATURE,
+    SERVICE_SET_TEMPERATURE,
+    ClimateEntityFeature,
+)
 
 
 async def async_setup_intents(hass: HomeAssistant) -> None:
     """Set up the climate intents."""
-    intent.async_register(hass, GetTemperatureIntent())
+    intent.async_register(hass, SetTemperatureIntent())
 
 
-class GetTemperatureIntent(intent.IntentHandler):
-    """Handle GetTemperature intents."""
+class SetTemperatureIntent(intent.IntentHandler):
+    """Handle SetTemperature intents."""
 
-    intent_type = INTENT_GET_TEMPERATURE
-    description = "Gets the current temperature of a climate device or entity"
+    intent_type = INTENT_SET_TEMPERATURE
+    description = "Sets the target temperature of a climate device or entity"
     slot_schema = {
+        vol.Required("temperature"): vol.Coerce(float),
         vol.Optional("area"): intent.non_empty_string,
         vol.Optional("name"): intent.non_empty_string,
+        vol.Optional("floor"): intent.non_empty_string,
+        vol.Optional("preferred_area_id"): cv.string,
+        vol.Optional("preferred_floor_id"): cv.string,
     }
     platforms = {DOMAIN}
 
@@ -31,24 +42,62 @@ class GetTemperatureIntent(intent.IntentHandler):
         hass = intent_obj.hass
         slots = self.async_validate_slots(intent_obj.slots)
 
+        temperature: float = slots["temperature"]["value"]
+
         name: str | None = None
         if "name" in slots:
             name = slots["name"]["value"]
 
-        area: str | None = None
+        area_name: str | None = None
         if "area" in slots:
-            area = slots["area"]["value"]
+            area_name = slots["area"]["value"]
+
+        floor_name: str | None = None
+        if "floor" in slots:
+            floor_name = slots["floor"]["value"]
 
         match_constraints = intent.MatchTargetsConstraints(
-            name=name, area_name=area, domains=[DOMAIN], assistant=intent_obj.assistant
+            name=name,
+            area_name=area_name,
+            floor_name=floor_name,
+            domains=[DOMAIN],
+            assistant=intent_obj.assistant,
+            features=ClimateEntityFeature.TARGET_TEMPERATURE,
+            single_target=True,
+        )
+        match_preferences = intent.MatchTargetsPreferences(
+            area_id=slots.get("preferred_area_id", {}).get("value"),
+            floor_id=slots.get("preferred_floor_id", {}).get("value"),
+        )
+        match_result = intent.async_match_targets(
+            hass, match_constraints, match_preferences
         )
-        match_result = intent.async_match_targets(hass, match_constraints)
         if not match_result.is_match:
             raise intent.MatchFailedError(
                 result=match_result, constraints=match_constraints
             )
 
+        assert match_result.states
+        climate_state = match_result.states[0]
+
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_SET_TEMPERATURE,
+            service_data={ATTR_TEMPERATURE: temperature},
+            target={ATTR_ENTITY_ID: climate_state.entity_id},
+            blocking=True,
+        )
+
         response = intent_obj.create_response()
-        response.response_type = intent.IntentResponseType.QUERY_ANSWER
-        response.async_set_states(matched_states=match_result.states)
+        response.response_type = intent.IntentResponseType.ACTION_DONE
+        response.async_set_results(
+            success_results=[
+                intent.IntentResponseTarget(
+                    type=intent.IntentResponseTargetType.ENTITY,
+                    name=climate_state.name,
+                    id=climate_state.entity_id,
+                )
+            ]
+        )
+        response.async_set_states(matched_states=[climate_state])
         return response
diff --git a/homeassistant/components/cloud/__init__.py b/homeassistant/components/cloud/__init__.py
index 55ffedd2781..97210b4197c 100644
--- a/homeassistant/components/cloud/__init__.py
+++ b/homeassistant/components/cloud/__init__.py
@@ -6,6 +6,7 @@ import asyncio
 from collections.abc import Awaitable, Callable
 from datetime import datetime, timedelta
 from enum import Enum
+import logging
 from typing import cast
 
 from hass_nabucasa import Cloud
@@ -19,6 +20,7 @@ from homeassistant.const import (
     CONF_NAME,
     CONF_REGION,
     EVENT_HOMEASSISTANT_STOP,
+    FORMAT_DATETIME,
     Platform,
 )
 from homeassistant.core import Event, HassJob, HomeAssistant, ServiceCall, callback
@@ -33,7 +35,7 @@ from homeassistant.helpers.dispatcher import (
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.service import async_register_admin_service
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.loader import bind_hass
+from homeassistant.loader import async_get_integration, bind_hass
 from homeassistant.util.signal_type import SignalType
 
 # Pre-import backup to avoid it being imported
@@ -62,11 +64,13 @@ from .const import (
     CONF_THINGTALK_SERVER,
     CONF_USER_POOL_ID,
     DATA_CLOUD,
+    DATA_CLOUD_LOG_HANDLER,
     DATA_PLATFORMS_SETUP,
     DOMAIN,
     MODE_DEV,
     MODE_PROD,
 )
+from .helpers import FixedSizeQueueLogHandler
 from .prefs import CloudPreferences
 from .repairs import async_manage_legacy_subscription_issue
 from .subscription import async_subscription_info
@@ -245,6 +249,8 @@ def async_remote_ui_url(hass: HomeAssistant) -> str:
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Initialize the Home Assistant cloud."""
+    log_handler = hass.data[DATA_CLOUD_LOG_HANDLER] = await _setup_log_handler(hass)
+
     # Process configs
     if DOMAIN in config:
         kwargs = dict(config[DOMAIN])
@@ -267,6 +273,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     async def _shutdown(event: Event) -> None:
         """Shutdown event."""
         await cloud.stop()
+        logging.root.removeHandler(log_handler)
+        del hass.data[DATA_CLOUD_LOG_HANDLER]
 
     hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _shutdown)
 
@@ -405,3 +413,19 @@ def _setup_services(hass: HomeAssistant, prefs: CloudPreferences) -> None:
     async_register_admin_service(
         hass, DOMAIN, SERVICE_REMOTE_DISCONNECT, _service_handler
     )
+
+
+async def _setup_log_handler(hass: HomeAssistant) -> FixedSizeQueueLogHandler:
+    fmt = (
+        "%(asctime)s.%(msecs)03d %(levelname)s (%(threadName)s) [%(name)s] %(message)s"
+    )
+    handler = FixedSizeQueueLogHandler()
+    handler.setFormatter(logging.Formatter(fmt, datefmt=FORMAT_DATETIME))
+
+    integration = await async_get_integration(hass, DOMAIN)
+    loggers: set[str] = {integration.pkg_path, *(integration.loggers or [])}
+
+    for logger_name in loggers:
+        logging.getLogger(logger_name).addHandler(handler)
+
+    return handler
diff --git a/homeassistant/components/cloud/assist_pipeline.py b/homeassistant/components/cloud/assist_pipeline.py
index c97e5bdc0a2..0e3736d9da8 100644
--- a/homeassistant/components/cloud/assist_pipeline.py
+++ b/homeassistant/components/cloud/assist_pipeline.py
@@ -14,7 +14,7 @@ from homeassistant.components.stt import DOMAIN as STT_DOMAIN
 from homeassistant.components.tts import DOMAIN as TTS_DOMAIN
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from .const import (
     DATA_PLATFORMS_SETUP,
diff --git a/homeassistant/components/cloud/backup.py b/homeassistant/components/cloud/backup.py
index 153d0741770..f4426eabeed 100644
--- a/homeassistant/components/cloud/backup.py
+++ b/homeassistant/components/cloud/backup.py
@@ -3,23 +3,28 @@
 from __future__ import annotations
 
 import asyncio
-import base64
 from collections.abc import AsyncIterator, Callable, Coroutine, Mapping
-import hashlib
+from http import HTTPStatus
 import logging
 import random
 from typing import Any
 
-from aiohttp import ClientError, ClientTimeout
+from aiohttp import ClientError, ClientResponseError
 from hass_nabucasa import Cloud, CloudError
+from hass_nabucasa.api import CloudApiError, CloudApiNonRetryableError
 from hass_nabucasa.cloud_api import (
+    FilesHandlerListEntry,
     async_files_delete_file,
-    async_files_download_details,
     async_files_list,
-    async_files_upload_details,
 )
+from hass_nabucasa.files import FilesError, StorageType, calculate_b64md5
 
-from homeassistant.components.backup import AgentBackup, BackupAgent, BackupAgentError
+from homeassistant.components.backup import (
+    AgentBackup,
+    BackupAgent,
+    BackupAgentError,
+    BackupNotFound,
+)
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.aiohttp_client import ChunkAsyncStreamIterator
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -28,20 +33,11 @@ from .client import CloudClient
 from .const import DATA_CLOUD, DOMAIN, EVENT_CLOUD_EVENT
 
 _LOGGER = logging.getLogger(__name__)
-_STORAGE_BACKUP = "backup"
 _RETRY_LIMIT = 5
 _RETRY_SECONDS_MIN = 60
 _RETRY_SECONDS_MAX = 600
 
 
-async def _b64md5(stream: AsyncIterator[bytes]) -> str:
-    """Calculate the MD5 hash of a file."""
-    file_hash = hashlib.md5()
-    async for chunk in stream:
-        file_hash.update(chunk)
-    return base64.b64encode(file_hash.digest()).decode()
-
-
 async def async_get_backup_agents(
     hass: HomeAssistant,
     **kwargs: Any,
@@ -82,8 +78,7 @@ def async_register_backup_agents_listener(
 class CloudBackupAgent(BackupAgent):
     """Cloud backup agent."""
 
-    domain = DOMAIN
-    name = DOMAIN
+    domain = name = unique_id = DOMAIN
 
     def __init__(self, hass: HomeAssistant, cloud: Cloud[CloudClient]) -> None:
         """Initialize the cloud backup sync agent."""
@@ -91,11 +86,6 @@ class CloudBackupAgent(BackupAgent):
         self._cloud = cloud
         self._hass = hass
 
-    @callback
-    def _get_backup_filename(self) -> str:
-        """Return the backup filename."""
-        return f"{self._cloud.client.prefs.instance_id}.tar"
-
     async def async_download_backup(
         self,
         backup_id: str,
@@ -106,67 +96,16 @@ class CloudBackupAgent(BackupAgent):
         :param backup_id: The ID of the backup that was returned in async_list_backups.
         :return: An async iterator that yields bytes.
         """
-        if not await self.async_get_backup(backup_id):
-            raise BackupAgentError("Backup not found")
-
+        backup = await self._async_get_backup(backup_id)
         try:
-            details = await async_files_download_details(
-                self._cloud,
-                storage_type=_STORAGE_BACKUP,
-                filename=self._get_backup_filename(),
+            content = await self._cloud.files.download(
+                storage_type=StorageType.BACKUP,
+                filename=backup["Key"],
             )
-        except (ClientError, CloudError) as err:
-            raise BackupAgentError("Failed to get download details") from err
+        except CloudError as err:
+            raise BackupAgentError(f"Failed to download backup: {err}") from err
 
-        try:
-            resp = await self._cloud.websession.get(
-                details["url"],
-                timeout=ClientTimeout(connect=10.0, total=43200.0),  # 43200s == 12h
-            )
-
-            resp.raise_for_status()
-        except ClientError as err:
-            raise BackupAgentError("Failed to download backup") from err
-
-        return ChunkAsyncStreamIterator(resp.content)
-
-    async def _async_do_upload_backup(
-        self,
-        *,
-        open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
-        filename: str,
-        base64md5hash: str,
-        metadata: dict[str, Any],
-        size: int,
-    ) -> None:
-        """Upload a backup."""
-        try:
-            details = await async_files_upload_details(
-                self._cloud,
-                storage_type=_STORAGE_BACKUP,
-                filename=filename,
-                metadata=metadata,
-                size=size,
-                base64md5hash=base64md5hash,
-            )
-        except (ClientError, CloudError) as err:
-            raise BackupAgentError("Failed to get upload details") from err
-
-        try:
-            upload_status = await self._cloud.websession.put(
-                details["url"],
-                data=await open_stream(),
-                headers=details["headers"] | {"content-length": str(size)},
-                timeout=ClientTimeout(connect=10.0, total=43200.0),  # 43200s == 12h
-            )
-            _LOGGER.log(
-                logging.DEBUG if upload_status.status < 400 else logging.WARNING,
-                "Backup upload status: %s",
-                upload_status.status,
-            )
-            upload_status.raise_for_status()
-        except (TimeoutError, ClientError) as err:
-            raise BackupAgentError("Failed to upload backup") from err
+        return ChunkAsyncStreamIterator(content)
 
     async def async_upload_backup(
         self,
@@ -182,16 +121,22 @@ class CloudBackupAgent(BackupAgent):
         """
         if not backup.protected:
             raise BackupAgentError("Cloud backups must be protected")
+        if self._cloud.subscription_expired:
+            raise BackupAgentError("Cloud subscription has expired")
 
-        base64md5hash = await _b64md5(await open_stream())
-        filename = self._get_backup_filename()
-        metadata = backup.as_dict()
         size = backup.size
+        try:
+            base64md5hash = await calculate_b64md5(open_stream, size)
+        except FilesError as err:
+            raise BackupAgentError(err) from err
+        filename = f"{self._cloud.client.prefs.instance_id}.tar"
+        metadata = backup.as_dict()
 
         tries = 1
         while tries <= _RETRY_LIMIT:
             try:
-                await self._async_do_upload_backup(
+                await self._cloud.files.upload(
+                    storage_type=StorageType.BACKUP,
                     open_stream=open_stream,
                     filename=filename,
                     base64md5hash=base64md5hash,
@@ -199,9 +144,26 @@ class CloudBackupAgent(BackupAgent):
                     size=size,
                 )
                 break
-            except BackupAgentError as err:
+            except CloudApiNonRetryableError as err:
+                if err.code == "NC-SH-FH-03":
+                    raise BackupAgentError(
+                        translation_domain=DOMAIN,
+                        translation_key="backup_size_too_large",
+                        translation_placeholders={
+                            "size": str(round(size / (1024**3), 2))
+                        },
+                    ) from err
+                raise BackupAgentError(f"Failed to upload backup {err}") from err
+            except CloudError as err:
+                if (
+                    isinstance(err, CloudApiError)
+                    and isinstance(err.orig_exc, ClientResponseError)
+                    and err.orig_exc.status == HTTPStatus.FORBIDDEN
+                    and self._cloud.subscription_expired
+                ):
+                    raise BackupAgentError("Cloud subscription has expired") from err
                 if tries == _RETRY_LIMIT:
-                    raise
+                    raise BackupAgentError(f"Failed to upload backup {err}") from err
                 tries += 1
                 retry_timer = random.randint(_RETRY_SECONDS_MIN, _RETRY_SECONDS_MAX)
                 _LOGGER.info(
@@ -222,38 +184,48 @@ class CloudBackupAgent(BackupAgent):
 
         :param backup_id: The ID of the backup that was returned in async_list_backups.
         """
-        if not await self.async_get_backup(backup_id):
-            return
-
+        backup = await self._async_get_backup(backup_id)
         try:
             await async_files_delete_file(
                 self._cloud,
-                storage_type=_STORAGE_BACKUP,
-                filename=self._get_backup_filename(),
+                storage_type=StorageType.BACKUP,
+                filename=backup["Key"],
             )
         except (ClientError, CloudError) as err:
             raise BackupAgentError("Failed to delete backup") from err
 
     async def async_list_backups(self, **kwargs: Any) -> list[AgentBackup]:
+        """List backups."""
+        backups = await self._async_list_backups()
+        return [AgentBackup.from_dict(backup["Metadata"]) for backup in backups]
+
+    async def _async_list_backups(self) -> list[FilesHandlerListEntry]:
         """List backups."""
         try:
-            backups = await async_files_list(self._cloud, storage_type=_STORAGE_BACKUP)
-            _LOGGER.debug("Cloud backups: %s", backups)
+            backups = await async_files_list(
+                self._cloud, storage_type=StorageType.BACKUP
+            )
         except (ClientError, CloudError) as err:
             raise BackupAgentError("Failed to list backups") from err
 
-        return [AgentBackup.from_dict(backup["Metadata"]) for backup in backups]
+        _LOGGER.debug("Cloud backups: %s", backups)
+        return backups
 
     async def async_get_backup(
         self,
         backup_id: str,
         **kwargs: Any,
-    ) -> AgentBackup | None:
+    ) -> AgentBackup:
         """Return a backup."""
-        backups = await self.async_list_backups()
+        backup = await self._async_get_backup(backup_id)
+        return AgentBackup.from_dict(backup["Metadata"])
+
+    async def _async_get_backup(self, backup_id: str) -> FilesHandlerListEntry:
+        """Return a backup."""
+        backups = await self._async_list_backups()
 
         for backup in backups:
-            if backup.backup_id == backup_id:
+            if backup["Metadata"]["backup_id"] == backup_id:
                 return backup
 
-        return None
+        raise BackupNotFound(f"Backup {backup_id} not found")
diff --git a/homeassistant/components/cloud/binary_sensor.py b/homeassistant/components/cloud/binary_sensor.py
index 75cbd3c9f3d..0df13fe4c7b 100644
--- a/homeassistant/components/cloud/binary_sensor.py
+++ b/homeassistant/components/cloud/binary_sensor.py
@@ -15,7 +15,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .client import CloudClient
 from .const import DATA_CLOUD, DISPATCHER_REMOTE_UPDATE
@@ -26,7 +26,7 @@ WAIT_UNTIL_CHANGE = 3
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Home Assistant Cloud binary sensors."""
     cloud = hass.data[DATA_CLOUD]
diff --git a/homeassistant/components/cloud/const.py b/homeassistant/components/cloud/const.py
index 3883f19d1b7..e0c15c74cab 100644
--- a/homeassistant/components/cloud/const.py
+++ b/homeassistant/components/cloud/const.py
@@ -12,12 +12,14 @@ if TYPE_CHECKING:
     from hass_nabucasa import Cloud
 
     from .client import CloudClient
+    from .helpers import FixedSizeQueueLogHandler
 
 DOMAIN = "cloud"
 DATA_CLOUD: HassKey[Cloud[CloudClient]] = HassKey(DOMAIN)
 DATA_PLATFORMS_SETUP: HassKey[dict[str, asyncio.Event]] = HassKey(
     "cloud_platforms_setup"
 )
+DATA_CLOUD_LOG_HANDLER: HassKey[FixedSizeQueueLogHandler] = HassKey("cloud_log_handler")
 EVENT_CLOUD_EVENT = "cloud_event"
 
 REQUEST_TIMEOUT = 10
diff --git a/homeassistant/components/cloud/helpers.py b/homeassistant/components/cloud/helpers.py
new file mode 100644
index 00000000000..7795a314fb7
--- /dev/null
+++ b/homeassistant/components/cloud/helpers.py
@@ -0,0 +1,31 @@
+"""Helpers for the cloud component."""
+
+from collections import deque
+import logging
+
+from homeassistant.core import HomeAssistant
+
+
+class FixedSizeQueueLogHandler(logging.Handler):
+    """Log handler to store messages, with auto rotation."""
+
+    MAX_RECORDS = 500
+
+    def __init__(self) -> None:
+        """Initialize a new LogHandler."""
+        super().__init__()
+        self._records: deque[logging.LogRecord] = deque(maxlen=self.MAX_RECORDS)
+
+    def emit(self, record: logging.LogRecord) -> None:
+        """Store log message."""
+        self._records.append(record)
+
+    async def get_logs(self, hass: HomeAssistant) -> list[str]:
+        """Get stored logs."""
+
+        def _get_logs() -> list[str]:
+            # copy the queue since it can mutate while iterating
+            records = self._records.copy()
+            return [self.format(record) for record in records]
+
+        return await hass.async_add_executor_job(_get_logs)
diff --git a/homeassistant/components/cloud/http_api.py b/homeassistant/components/cloud/http_api.py
index 473f553593a..6f18cc424cd 100644
--- a/homeassistant/components/cloud/http_api.py
+++ b/homeassistant/components/cloud/http_api.py
@@ -8,14 +8,15 @@ from contextlib import suppress
 import dataclasses
 from functools import wraps
 from http import HTTPStatus
+import json
 import logging
 import time
-from typing import Any, Concatenate
+from typing import Any, Concatenate, cast
 
 import aiohttp
 from aiohttp import web
 import attr
-from hass_nabucasa import Cloud, auth, thingtalk
+from hass_nabucasa import AlreadyConnectedError, Cloud, auth, thingtalk
 from hass_nabucasa.const import STATE_DISCONNECTED
 from hass_nabucasa.voice import TTS_VOICES
 import voluptuous as vol
@@ -29,6 +30,7 @@ from homeassistant.components.google_assistant import helpers as google_helpers
 from homeassistant.components.homeassistant import exposed_entities
 from homeassistant.components.http import KEY_HASS, HomeAssistantView, require_admin
 from homeassistant.components.http.data_validator import RequestDataValidator
+from homeassistant.components.system_health import get_info as get_system_health_info
 from homeassistant.const import CLOUD_NEVER_EXPOSED_ENTITIES
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
@@ -42,6 +44,7 @@ from .assist_pipeline import async_create_cloud_pipeline
 from .client import CloudClient
 from .const import (
     DATA_CLOUD,
+    DATA_CLOUD_LOG_HANDLER,
     EVENT_CLOUD_EVENT,
     LOGIN_MFA_TIMEOUT,
     PREF_ALEXA_REPORT_STATE,
@@ -62,7 +65,9 @@ from .subscription import async_subscription_info
 _LOGGER = logging.getLogger(__name__)
 
 
-_CLOUD_ERRORS: dict[type[Exception], tuple[HTTPStatus, str]] = {
+_CLOUD_ERRORS: dict[
+    type[Exception], tuple[HTTPStatus, Callable[[Exception], str] | str]
+] = {
     TimeoutError: (
         HTTPStatus.BAD_GATEWAY,
         "Unable to reach the Home Assistant cloud.",
@@ -107,6 +112,7 @@ def async_setup(hass: HomeAssistant) -> None:
     hass.http.register_view(CloudRegisterView)
     hass.http.register_view(CloudResendConfirmView)
     hass.http.register_view(CloudForgotPasswordView)
+    hass.http.register_view(DownloadSupportPackageView)
 
     _CLOUD_ERRORS.update(
         {
@@ -130,6 +136,10 @@ def async_setup(hass: HomeAssistant) -> None:
                 HTTPStatus.BAD_REQUEST,
                 "Multi-factor authentication expired, or not started. Please try again.",
             ),
+            AlreadyConnectedError: (
+                HTTPStatus.CONFLICT,
+                lambda x: json.dumps(cast(AlreadyConnectedError, x).details),
+            ),
         }
     )
 
@@ -194,7 +204,11 @@ def _process_cloud_exception(exc: Exception, where: str) -> tuple[HTTPStatus, st
 
     for err, value_info in _CLOUD_ERRORS.items():
         if isinstance(exc, err):
-            err_info = value_info
+            status, content = value_info
+            err_info = (
+                status,
+                content if isinstance(content, str) else content(exc),
+            )
             break
 
     if err_info is None:
@@ -231,12 +245,17 @@ class CloudLoginView(HomeAssistantView):
     name = "api:cloud:login"
 
     @require_admin
+    async def post(self, request: web.Request) -> web.Response:
+        """Handle login request."""
+        return await self._post(request)
+
     @_handle_cloud_errors
     @RequestDataValidator(
         vol.Schema(
             vol.All(
                 {
                     vol.Required("email"): str,
+                    vol.Optional("check_connection", default=False): bool,
                     vol.Exclusive("password", "login"): str,
                     vol.Exclusive("code", "login"): str,
                 },
@@ -244,7 +263,7 @@ class CloudLoginView(HomeAssistantView):
             )
         )
     )
-    async def post(self, request: web.Request, data: dict[str, Any]) -> web.Response:
+    async def _post(self, request: web.Request, data: dict[str, Any]) -> web.Response:
         """Handle login request."""
         hass = request.app[KEY_HASS]
         cloud = hass.data[DATA_CLOUD]
@@ -255,7 +274,11 @@ class CloudLoginView(HomeAssistantView):
             code = data.get("code")
 
             if email and password:
-                await cloud.login(email, password)
+                await cloud.login(
+                    email,
+                    password,
+                    check_connection=data["check_connection"],
+                )
 
             else:
                 if (
@@ -267,7 +290,12 @@ class CloudLoginView(HomeAssistantView):
                 # Voluptuous should ensure that code is not None because password is
                 assert code is not None
 
-                await cloud.login_verify_totp(email, code, self._mfa_tokens)
+                await cloud.login_verify_totp(
+                    email,
+                    code,
+                    self._mfa_tokens,
+                    check_connection=data["check_connection"],
+                )
                 self._mfa_tokens = {}
                 self._mfa_tokens_set_time = 0
 
@@ -292,8 +320,12 @@ class CloudLogoutView(HomeAssistantView):
     name = "api:cloud:logout"
 
     @require_admin
-    @_handle_cloud_errors
     async def post(self, request: web.Request) -> web.Response:
+        """Handle logout request."""
+        return await self._post(request)
+
+    @_handle_cloud_errors
+    async def _post(self, request: web.Request) -> web.Response:
         """Handle logout request."""
         hass = request.app[KEY_HASS]
         cloud = hass.data[DATA_CLOUD]
@@ -376,9 +408,13 @@ class CloudForgotPasswordView(HomeAssistantView):
     name = "api:cloud:forgot_password"
 
     @require_admin
+    async def post(self, request: web.Request) -> web.Response:
+        """Handle forgot password request."""
+        return await self._post(request)
+
     @_handle_cloud_errors
     @RequestDataValidator(vol.Schema({vol.Required("email"): str}))
-    async def post(self, request: web.Request, data: dict[str, Any]) -> web.Response:
+    async def _post(self, request: web.Request, data: dict[str, Any]) -> web.Response:
         """Handle forgot password request."""
         hass = request.app[KEY_HASS]
         cloud = hass.data[DATA_CLOUD]
@@ -389,6 +425,73 @@ class CloudForgotPasswordView(HomeAssistantView):
         return self.json_message("ok")
 
 
+class DownloadSupportPackageView(HomeAssistantView):
+    """Download support package view."""
+
+    url = "/api/cloud/support_package"
+    name = "api:cloud:support_package"
+
+    async def _generate_markdown(
+        self,
+        hass: HomeAssistant,
+        hass_info: dict[str, Any],
+        domains_info: dict[str, dict[str, str]],
+    ) -> str:
+        def get_domain_table_markdown(domain_info: dict[str, Any]) -> str:
+            if len(domain_info) == 0:
+                return "No information available\n"
+
+            markdown = ""
+            first = True
+            for key, value in domain_info.items():
+                markdown += f"{key} | {value}\n"
+                if first:
+                    markdown += "--- | ---\n"
+                    first = False
+            return markdown + "\n"
+
+        markdown = "## System Information\n\n"
+        markdown += get_domain_table_markdown(hass_info)
+
+        for domain, domain_info in domains_info.items():
+            domain_info_md = get_domain_table_markdown(domain_info)
+            markdown += (
+                f"<details><summary>{domain}</summary>\n\n"
+                f"{domain_info_md}"
+                "</details>\n\n"
+            )
+
+        log_handler = hass.data[DATA_CLOUD_LOG_HANDLER]
+        logs = "\n".join(await log_handler.get_logs(hass))
+        markdown += (
+            "## Full logs\n\n"
+            "<details><summary>Logs</summary>\n\n"
+            "```logs\n"
+            f"{logs}\n"
+            "```\n\n"
+            "</details>\n"
+        )
+
+        return markdown
+
+    async def get(self, request: web.Request) -> web.Response:
+        """Download support package file."""
+
+        hass = request.app[KEY_HASS]
+        domain_health = await get_system_health_info(hass)
+
+        hass_info = domain_health.pop("homeassistant", {})
+        markdown = await self._generate_markdown(hass, hass_info, domain_health)
+
+        return web.Response(
+            body=markdown,
+            content_type="text/markdown",
+            headers={
+                "Content-Disposition": 'attachment; filename="support_package.md"'
+            },
+        )
+
+
 @websocket_api.require_admin
 @websocket_api.websocket_command({vol.Required("type"): "cloud/remove_data"})
 @websocket_api.async_response
diff --git a/homeassistant/components/cloud/manifest.json b/homeassistant/components/cloud/manifest.json
index 0f415b1738a..7f448f2f614 100644
--- a/homeassistant/components/cloud/manifest.json
+++ b/homeassistant/components/cloud/manifest.json
@@ -12,7 +12,7 @@
   "documentation": "https://www.home-assistant.io/integrations/cloud",
   "integration_type": "system",
   "iot_class": "cloud_push",
-  "loggers": ["hass_nabucasa"],
-  "requirements": ["hass-nabucasa==0.88.1"],
+  "loggers": ["acme", "hass_nabucasa", "snitun"],
+  "requirements": ["hass-nabucasa==0.94.0"],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/cloud/strings.json b/homeassistant/components/cloud/strings.json
index 1da91f67813..6380ee9c312 100644
--- a/homeassistant/components/cloud/strings.json
+++ b/homeassistant/components/cloud/strings.json
@@ -17,6 +17,11 @@
       "subscription_expiration": "Subscription expiration"
     }
   },
+  "exceptions": {
+    "backup_size_too_large": {
+      "message": "The backup size of {size}GB is too large to be uploaded to Home Assistant Cloud."
+    }
+  },
   "issues": {
     "deprecated_gender": {
       "title": "The {deprecated_option} text-to-speech option is deprecated",
diff --git a/homeassistant/components/cloud/stt.py b/homeassistant/components/cloud/stt.py
index b2154448d3a..df377c9a410 100644
--- a/homeassistant/components/cloud/stt.py
+++ b/homeassistant/components/cloud/stt.py
@@ -22,7 +22,7 @@ from homeassistant.components.stt import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.setup import async_when_setup
 
 from .assist_pipeline import async_migrate_cloud_pipeline_engine
@@ -35,7 +35,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Home Assistant Cloud speech platform via config entry."""
     stt_platform_loaded = hass.data[DATA_PLATFORMS_SETUP][Platform.STT]
diff --git a/homeassistant/components/cloud/tts.py b/homeassistant/components/cloud/tts.py
index 4dbee10fbaf..f901adfa99e 100644
--- a/homeassistant/components/cloud/tts.py
+++ b/homeassistant/components/cloud/tts.py
@@ -22,8 +22,8 @@ from homeassistant.components.tts import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PLATFORM, Platform
 from homeassistant.core import HomeAssistant, async_get_hass, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.setup import async_when_setup
@@ -38,6 +38,156 @@ ATTR_GENDER = "gender"
 DEPRECATED_VOICES = {"XiaoxuanNeural": "XiaozhenNeural"}
 SUPPORT_LANGUAGES = list(TTS_VOICES)
 
+DEFAULT_VOICES = {
+    "af-ZA": "AdriNeural",
+    "am-ET": "MekdesNeural",
+    "ar-AE": "FatimaNeural",
+    "ar-BH": "LailaNeural",
+    "ar-DZ": "AminaNeural",
+    "ar-EG": "SalmaNeural",
+    "ar-IQ": "RanaNeural",
+    "ar-JO": "SanaNeural",
+    "ar-KW": "NouraNeural",
+    "ar-LB": "LaylaNeural",
+    "ar-LY": "ImanNeural",
+    "ar-MA": "MounaNeural",
+    "ar-OM": "AbdullahNeural",
+    "ar-QA": "AmalNeural",
+    "ar-SA": "ZariyahNeural",
+    "ar-SY": "AmanyNeural",
+    "ar-TN": "ReemNeural",
+    "ar-YE": "MaryamNeural",
+    "az-AZ": "BabekNeural",
+    "bg-BG": "KalinaNeural",
+    "bn-BD": "NabanitaNeural",
+    "bn-IN": "TanishaaNeural",
+    "bs-BA": "GoranNeural",
+    "ca-ES": "JoanaNeural",
+    "cs-CZ": "VlastaNeural",
+    "cy-GB": "NiaNeural",
+    "da-DK": "ChristelNeural",
+    "de-AT": "IngridNeural",
+    "de-CH": "LeniNeural",
+    "de-DE": "KatjaNeural",
+    "el-GR": "AthinaNeural",
+    "en-AU": "NatashaNeural",
+    "en-CA": "ClaraNeural",
+    "en-GB": "LibbyNeural",
+    "en-HK": "YanNeural",
+    "en-IE": "EmilyNeural",
+    "en-IN": "NeerjaNeural",
+    "en-KE": "AsiliaNeural",
+    "en-NG": "EzinneNeural",
+    "en-NZ": "MollyNeural",
+    "en-PH": "RosaNeural",
+    "en-SG": "LunaNeural",
+    "en-TZ": "ImaniNeural",
+    "en-US": "JennyNeural",
+    "en-ZA": "LeahNeural",
+    "es-AR": "ElenaNeural",
+    "es-BO": "SofiaNeural",
+    "es-CL": "CatalinaNeural",
+    "es-CO": "SalomeNeural",
+    "es-CR": "MariaNeural",
+    "es-CU": "BelkysNeural",
+    "es-DO": "RamonaNeural",
+    "es-EC": "AndreaNeural",
+    "es-ES": "ElviraNeural",
+    "es-GQ": "TeresaNeural",
+    "es-GT": "MartaNeural",
+    "es-HN": "KarlaNeural",
+    "es-MX": "DaliaNeural",
+    "es-NI": "YolandaNeural",
+    "es-PA": "MargaritaNeural",
+    "es-PE": "CamilaNeural",
+    "es-PR": "KarinaNeural",
+    "es-PY": "TaniaNeural",
+    "es-SV": "LorenaNeural",
+    "es-US": "PalomaNeural",
+    "es-UY": "ValentinaNeural",
+    "es-VE": "PaolaNeural",
+    "et-EE": "AnuNeural",
+    "eu-ES": "AinhoaNeural",
+    "fa-IR": "DilaraNeural",
+    "fi-FI": "SelmaNeural",
+    "fil-PH": "BlessicaNeural",
+    "fr-BE": "CharlineNeural",
+    "fr-CA": "SylvieNeural",
+    "fr-CH": "ArianeNeural",
+    "fr-FR": "DeniseNeural",
+    "ga-IE": "OrlaNeural",
+    "gl-ES": "SabelaNeural",
+    "gu-IN": "DhwaniNeural",
+    "he-IL": "HilaNeural",
+    "hi-IN": "SwaraNeural",
+    "hr-HR": "GabrijelaNeural",
+    "hu-HU": "NoemiNeural",
+    "hy-AM": "AnahitNeural",
+    "id-ID": "GadisNeural",
+    "is-IS": "GudrunNeural",
+    "it-IT": "ElsaNeural",
+    "ja-JP": "NanamiNeural",
+    "jv-ID": "SitiNeural",
+    "ka-GE": "EkaNeural",
+    "kk-KZ": "AigulNeural",
+    "km-KH": "SreymomNeural",
+    "kn-IN": "SapnaNeural",
+    "ko-KR": "SunHiNeural",
+    "lo-LA": "KeomanyNeural",
+    "lt-LT": "OnaNeural",
+    "lv-LV": "EveritaNeural",
+    "mk-MK": "MarijaNeural",
+    "ml-IN": "SobhanaNeural",
+    "mn-MN": "BataaNeural",
+    "mr-IN": "AarohiNeural",
+    "ms-MY": "YasminNeural",
+    "mt-MT": "GraceNeural",
+    "my-MM": "NilarNeural",
+    "nb-NO": "IselinNeural",
+    "ne-NP": "HemkalaNeural",
+    "nl-BE": "DenaNeural",
+    "nl-NL": "ColetteNeural",
+    "pl-PL": "AgnieszkaNeural",
+    "ps-AF": "LatifaNeural",
+    "pt-BR": "FranciscaNeural",
+    "pt-PT": "RaquelNeural",
+    "ro-RO": "AlinaNeural",
+    "ru-RU": "SvetlanaNeural",
+    "si-LK": "ThiliniNeural",
+    "sk-SK": "ViktoriaNeural",
+    "sl-SI": "PetraNeural",
+    "so-SO": "UbaxNeural",
+    "sq-AL": "AnilaNeural",
+    "sr-RS": "SophieNeural",
+    "su-ID": "TutiNeural",
+    "sv-SE": "SofieNeural",
+    "sw-KE": "ZuriNeural",
+    "sw-TZ": "RehemaNeural",
+    "ta-IN": "PallaviNeural",
+    "ta-LK": "SaranyaNeural",
+    "ta-MY": "KaniNeural",
+    "ta-SG": "VenbaNeural",
+    "te-IN": "ShrutiNeural",
+    "th-TH": "AcharaNeural",
+    "tr-TR": "EmelNeural",
+    "uk-UA": "PolinaNeural",
+    "ur-IN": "GulNeural",
+    "ur-PK": "UzmaNeural",
+    "uz-UZ": "MadinaNeural",
+    "vi-VN": "HoaiMyNeural",
+    "wuu-CN": "XiaotongNeural",
+    "yue-CN": "XiaoMinNeural",
+    "zh-CN": "XiaoxiaoNeural",
+    "zh-CN-henan": "YundengNeural",
+    "zh-CN-liaoning": "XiaobeiNeural",
+    "zh-CN-shaanxi": "XiaoniNeural",
+    "zh-CN-shandong": "YunxiangNeural",
+    "zh-CN-sichuan": "YunxiNeural",
+    "zh-HK": "HiuMaanNeural",
+    "zh-TW": "HsiaoChenNeural",
+    "zu-ZA": "ThandoNeural",
+}
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -106,7 +256,7 @@ async def async_get_engine(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Home Assistant Cloud text-to-speech platform."""
     tts_platform_loaded = hass.data[DATA_PLATFORMS_SETUP][Platform.TTS]
@@ -136,7 +286,7 @@ class CloudTTSEntity(TextToSpeechEntity):
         return self._language
 
     @property
-    def default_options(self) -> dict[str, Any]:
+    def default_options(self) -> dict[str, str]:
         """Return a dict include default options."""
         return {
             ATTR_AUDIO_OUTPUT: AudioOutput.MP3,
@@ -186,12 +336,13 @@ class CloudTTSEntity(TextToSpeechEntity):
         """Load TTS from Home Assistant Cloud."""
         gender: Gender | str | None = options.get(ATTR_GENDER)
         gender = handle_deprecated_gender(self.hass, gender)
-        original_voice: str | None = options.get(ATTR_VOICE)
-        if original_voice is None and language == self._language:
-            original_voice = self._voice
+        original_voice: str = options.get(
+            ATTR_VOICE,
+            self._voice if language == self._language else DEFAULT_VOICES[language],
+        )
         voice = handle_deprecated_voice(self.hass, original_voice)
         if voice not in TTS_VOICES[language]:
-            default_voice = TTS_VOICES[language][0]
+            default_voice = DEFAULT_VOICES[language]
             _LOGGER.debug(
                 "Unsupported voice %s detected, falling back to default %s for %s",
                 voice,
@@ -212,7 +363,7 @@ class CloudTTSEntity(TextToSpeechEntity):
             _LOGGER.error("Voice error: %s", err)
             return (None, None)
 
-        return (str(options[ATTR_AUDIO_OUTPUT].value), data)
+        return (options[ATTR_AUDIO_OUTPUT], data)
 
 
 class CloudProvider(Provider):
@@ -253,7 +404,7 @@ class CloudProvider(Provider):
         return [Voice(voice, voice) for voice in voices]
 
     @property
-    def default_options(self) -> dict[str, Any]:
+    def default_options(self) -> dict[str, str]:
         """Return a dict include default options."""
         return {
             ATTR_AUDIO_OUTPUT: AudioOutput.MP3,
@@ -266,12 +417,13 @@ class CloudProvider(Provider):
         assert self.hass is not None
         gender: Gender | str | None = options.get(ATTR_GENDER)
         gender = handle_deprecated_gender(self.hass, gender)
-        original_voice: str | None = options.get(ATTR_VOICE)
-        if original_voice is None and language == self._language:
-            original_voice = self._voice
+        original_voice: str = options.get(
+            ATTR_VOICE,
+            self._voice if language == self._language else DEFAULT_VOICES[language],
+        )
         voice = handle_deprecated_voice(self.hass, original_voice)
         if voice not in TTS_VOICES[language]:
-            default_voice = TTS_VOICES[language][0]
+            default_voice = DEFAULT_VOICES[language]
             _LOGGER.debug(
                 "Unsupported voice %s detected, falling back to default %s for %s",
                 voice,
@@ -292,7 +444,7 @@ class CloudProvider(Provider):
             _LOGGER.error("Voice error: %s", err)
             return (None, None)
 
-        return (str(options[ATTR_AUDIO_OUTPUT].value), data)
+        return options[ATTR_AUDIO_OUTPUT], data
 
 
 @callback
diff --git a/homeassistant/components/cloudflare/config_flow.py b/homeassistant/components/cloudflare/config_flow.py
index c3845a447e4..1fad38c5afc 100644
--- a/homeassistant/components/cloudflare/config_flow.py
+++ b/homeassistant/components/cloudflare/config_flow.py
@@ -9,7 +9,6 @@ from typing import Any
 import pycfdns
 import voluptuous as vol
 
-from homeassistant.components import persistent_notification
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_API_TOKEN, CONF_ZONE
 from homeassistant.core import HomeAssistant
@@ -118,8 +117,6 @@ class CloudflareConfigFlow(ConfigFlow, domain=DOMAIN):
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle a flow initiated by the user."""
-        persistent_notification.async_dismiss(self.hass, "cloudflare_setup")
-
         errors: dict[str, str] = {}
 
         if user_input is not None:
diff --git a/homeassistant/components/cloudflare/strings.json b/homeassistant/components/cloudflare/strings.json
index 8c8ec57b074..453135f47a0 100644
--- a/homeassistant/components/cloudflare/strings.json
+++ b/homeassistant/components/cloudflare/strings.json
@@ -4,19 +4,19 @@
     "step": {
       "user": {
         "title": "Connect to Cloudflare",
-        "description": "This integration requires an API Token created with Zone:Zone:Read and Zone:DNS:Edit permissions for all zones in your account.",
+        "description": "This integration requires an API token created with Zone:Zone:Read and Zone:DNS:Edit permissions for all zones in your account.",
         "data": {
           "api_token": "[%key:common::config_flow::data::api_token%]"
         }
       },
       "zone": {
-        "title": "Choose the Zone to Update",
+        "title": "Choose the zone to update",
         "data": {
           "zone": "Zone"
         }
       },
       "records": {
-        "title": "Choose the Records to Update",
+        "title": "Choose the records to update",
         "data": {
           "records": "Records"
         }
@@ -40,7 +40,7 @@
   "services": {
     "update_records": {
       "name": "Update records",
-      "description": "Manually trigger update to Cloudflare records."
+      "description": "Manually triggers an update of Cloudflare records."
     }
   }
 }
diff --git a/homeassistant/components/cmus/media_player.py b/homeassistant/components/cmus/media_player.py
index d55e9ca8f0b..a1f303809d0 100644
--- a/homeassistant/components/cmus/media_player.py
+++ b/homeassistant/components/cmus/media_player.py
@@ -17,7 +17,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/co2signal/__init__.py b/homeassistant/components/co2signal/__init__.py
index e84ba387194..612610eff43 100644
--- a/homeassistant/components/co2signal/__init__.py
+++ b/homeassistant/components/co2signal/__init__.py
@@ -4,23 +4,20 @@ from __future__ import annotations
 
 from aioelectricitymaps import ElectricityMaps
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .coordinator import CO2SignalCoordinator
+from .coordinator import CO2SignalConfigEntry, CO2SignalCoordinator
 
 PLATFORMS = [Platform.SENSOR]
 
-type CO2SignalConfigEntry = ConfigEntry[CO2SignalCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: CO2SignalConfigEntry) -> bool:
     """Set up CO2 Signal from a config entry."""
     session = async_get_clientsession(hass)
     coordinator = CO2SignalCoordinator(
-        hass, ElectricityMaps(token=entry.data[CONF_API_KEY], session=session)
+        hass, entry, ElectricityMaps(token=entry.data[CONF_API_KEY], session=session)
     )
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/co2signal/config_flow.py b/homeassistant/components/co2signal/config_flow.py
index 0d357cce199..00acd2829a6 100644
--- a/homeassistant/components/co2signal/config_flow.py
+++ b/homeassistant/components/co2signal/config_flow.py
@@ -3,11 +3,11 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
+import logging
 from typing import Any
 
 from aioelectricitymaps import (
     ElectricityMaps,
-    ElectricityMapsError,
     ElectricityMapsInvalidTokenError,
     ElectricityMapsNoDataError,
 )
@@ -20,8 +20,8 @@ from homeassistant.const import (
     CONF_LATITUDE,
     CONF_LONGITUDE,
 )
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.selector import (
     SelectSelector,
     SelectSelectorConfig,
@@ -36,6 +36,8 @@ TYPE_USE_HOME = "use_home_location"
 TYPE_SPECIFY_COORDINATES = "specify_coordinates"
 TYPE_SPECIFY_COUNTRY = "specify_country_code"
 
+_LOGGER = logging.getLogger(__name__)
+
 
 class ElectricityMapsConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Co2signal."""
@@ -158,7 +160,8 @@ class ElectricityMapsConfigFlow(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "invalid_auth"
             except ElectricityMapsNoDataError:
                 errors["base"] = "no_data"
-            except ElectricityMapsError:
+            except Exception:
+                _LOGGER.exception("Unexpected error occurred while checking API key")
                 errors["base"] = "unknown"
             else:
                 if self.source == SOURCE_REAUTH:
diff --git a/homeassistant/components/co2signal/coordinator.py b/homeassistant/components/co2signal/coordinator.py
index 475ebd1225d..be2036292e3 100644
--- a/homeassistant/components/co2signal/coordinator.py
+++ b/homeassistant/components/co2signal/coordinator.py
@@ -22,16 +22,27 @@ from .helpers import fetch_latest_carbon_intensity
 
 _LOGGER = logging.getLogger(__name__)
 
+type CO2SignalConfigEntry = ConfigEntry[CO2SignalCoordinator]
+
 
 class CO2SignalCoordinator(DataUpdateCoordinator[CarbonIntensityResponse]):
     """Data update coordinator."""
 
-    config_entry: ConfigEntry
+    config_entry: CO2SignalConfigEntry
 
-    def __init__(self, hass: HomeAssistant, client: ElectricityMaps) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: CO2SignalConfigEntry,
+        client: ElectricityMaps,
+    ) -> None:
         """Initialize the coordinator."""
         super().__init__(
-            hass, _LOGGER, name=DOMAIN, update_interval=timedelta(minutes=15)
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=timedelta(minutes=15),
         )
         self.client = client
 
diff --git a/homeassistant/components/co2signal/diagnostics.py b/homeassistant/components/co2signal/diagnostics.py
index a071950440f..840ba759a7b 100644
--- a/homeassistant/components/co2signal/diagnostics.py
+++ b/homeassistant/components/co2signal/diagnostics.py
@@ -9,7 +9,7 @@ from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_API_KEY
 from homeassistant.core import HomeAssistant
 
-from . import CO2SignalConfigEntry
+from .coordinator import CO2SignalConfigEntry
 
 TO_REDACT = {CONF_API_KEY}
 
diff --git a/homeassistant/components/co2signal/sensor.py b/homeassistant/components/co2signal/sensor.py
index 1b964edf591..a8e962532b8 100644
--- a/homeassistant/components/co2signal/sensor.py
+++ b/homeassistant/components/co2signal/sensor.py
@@ -15,12 +15,11 @@ from homeassistant.components.sensor import (
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import CO2SignalConfigEntry
 from .const import ATTRIBUTION, DOMAIN
-from .coordinator import CO2SignalCoordinator
+from .coordinator import CO2SignalConfigEntry, CO2SignalCoordinator
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -55,7 +54,7 @@ SENSORS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: CO2SignalConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the CO2signal sensor."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/coinbase/__init__.py b/homeassistant/components/coinbase/__init__.py
index a29154d9c1b..317759f820d 100644
--- a/homeassistant/components/coinbase/__init__.py
+++ b/homeassistant/components/coinbase/__init__.py
@@ -140,8 +140,10 @@ def get_accounts(client, version):
             API_ACCOUNT_ID: account[API_V3_ACCOUNT_ID],
             API_ACCOUNT_NAME: account[API_ACCOUNT_NAME],
             API_ACCOUNT_CURRENCY: account[API_ACCOUNT_CURRENCY],
-            API_ACCOUNT_AMOUNT: account[API_ACCOUNT_AVALIABLE][API_ACCOUNT_VALUE]
-            + account[API_ACCOUNT_HOLD][API_ACCOUNT_VALUE],
+            API_ACCOUNT_AMOUNT: (
+                float(account[API_ACCOUNT_AVALIABLE][API_ACCOUNT_VALUE])
+                + float(account[API_ACCOUNT_HOLD][API_ACCOUNT_VALUE])
+            ),
             ACCOUNT_IS_VAULT: account[API_RESOURCE_TYPE] == API_V3_TYPE_VAULT,
         }
         for account in accounts
diff --git a/homeassistant/components/coinbase/config_flow.py b/homeassistant/components/coinbase/config_flow.py
index 2b58f2b2f37..3234ec29679 100644
--- a/homeassistant/components/coinbase/config_flow.py
+++ b/homeassistant/components/coinbase/config_flow.py
@@ -15,7 +15,7 @@ from homeassistant.config_entries import ConfigFlow, ConfigFlowResult, OptionsFl
 from homeassistant.const import CONF_API_KEY, CONF_API_TOKEN, CONF_API_VERSION
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from . import CoinbaseConfigEntry, get_accounts
 from .const import (
diff --git a/homeassistant/components/coinbase/const.py b/homeassistant/components/coinbase/const.py
index 0f47d4bc208..f20b23dad7a 100644
--- a/homeassistant/components/coinbase/const.py
+++ b/homeassistant/components/coinbase/const.py
@@ -132,6 +132,7 @@ WALLETS = {
     "GYD": "GYD",
     "HKD": "HKD",
     "HNL": "HNL",
+    "HNT": "HNT",
     "HRK": "HRK",
     "HTG": "HTG",
     "HUF": "HUF",
@@ -410,6 +411,7 @@ RATES = {
     "GYEN": "GYEN",
     "HKD": "HKD",
     "HNL": "HNL",
+    "HNT": "HNT",
     "HRK": "HRK",
     "HTG": "HTG",
     "HUF": "HUF",
diff --git a/homeassistant/components/coinbase/sensor.py b/homeassistant/components/coinbase/sensor.py
index 37509160247..578877e7d90 100644
--- a/homeassistant/components/coinbase/sensor.py
+++ b/homeassistant/components/coinbase/sensor.py
@@ -7,7 +7,7 @@ import logging
 from homeassistant.components.sensor import SensorEntity, SensorStateClass
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import CoinbaseConfigEntry, CoinbaseData
 from .const import (
@@ -45,7 +45,7 @@ ATTRIBUTION = "Data provided by coinbase.com"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: CoinbaseConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Coinbase sensor platform."""
     instance = config_entry.runtime_data
diff --git a/homeassistant/components/coinbase/strings.json b/homeassistant/components/coinbase/strings.json
index 96bf021e394..74510731b7a 100644
--- a/homeassistant/components/coinbase/strings.json
+++ b/homeassistant/components/coinbase/strings.json
@@ -2,19 +2,19 @@
   "config": {
     "step": {
       "user": {
-        "title": "Coinbase API Key Details",
+        "title": "Coinbase API key details",
         "description": "Please enter the details of your API key as provided by Coinbase.",
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]",
-          "api_token": "API Secret"
+          "api_token": "API secret"
         }
       }
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "invalid_auth_key": "API credentials rejected by Coinbase due to an invalid API Key.",
-      "invalid_auth_secret": "API credentials rejected by Coinbase due to an invalid API Secret.",
+      "invalid_auth_key": "API credentials rejected by Coinbase due to an invalid API key.",
+      "invalid_auth_secret": "API credentials rejected by Coinbase due to an invalid API secret.",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
@@ -24,12 +24,12 @@
   "options": {
     "step": {
       "init": {
-        "description": "Adjust Coinbase Options",
+        "description": "Adjust Coinbase options",
         "data": {
           "account_balance_currencies": "Wallet balances to report.",
           "exchange_rate_currencies": "Exchange rates to report.",
           "exchange_base": "Base currency for exchange rate sensors.",
-          "exchnage_rate_precision": "Number of decimal places for exchange rates."
+          "exchange_rate_precision": "Number of decimal places for exchange rates."
         }
       }
     },
diff --git a/homeassistant/components/color_extractor/__init__.py b/homeassistant/components/color_extractor/__init__.py
index 81cd55564b9..775adb6a7d5 100644
--- a/homeassistant/components/color_extractor/__init__.py
+++ b/homeassistant/components/color_extractor/__init__.py
@@ -17,8 +17,7 @@ from homeassistant.components.light import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import SERVICE_TURN_ON as LIGHT_SERVICE_TURN_ON
 from homeassistant.core import HomeAssistant, ServiceCall
-from homeassistant.helpers import aiohttp_client
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import aiohttp_client, config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import ATTR_PATH, ATTR_URL, DOMAIN, SERVICE_TURN_ON
diff --git a/homeassistant/components/comed_hourly_pricing/sensor.py b/homeassistant/components/comed_hourly_pricing/sensor.py
index b47255828e8..ac217eeb353 100644
--- a/homeassistant/components/comed_hourly_pricing/sensor.py
+++ b/homeassistant/components/comed_hourly_pricing/sensor.py
@@ -17,8 +17,8 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_NAME, CONF_OFFSET, CURRENCY_CENT, UnitOfEnergy
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/comelit/alarm_control_panel.py b/homeassistant/components/comelit/alarm_control_panel.py
index f694c2b392b..1ad26905dd1 100644
--- a/homeassistant/components/comelit/alarm_control_panel.py
+++ b/homeassistant/components/comelit/alarm_control_panel.py
@@ -6,7 +6,7 @@ import logging
 from typing import cast
 
 from aiocomelit.api import ComelitVedoAreaObject
-from aiocomelit.const import ALARM_AREAS, AlarmAreaState
+from aiocomelit.const import AlarmAreaState
 
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
@@ -15,11 +15,14 @@ from homeassistant.components.alarm_control_panel import (
     CodeFormat,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .coordinator import ComelitConfigEntry, ComelitVedoSystem
 
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
+
 _LOGGER = logging.getLogger(__name__)
 
 AWAY = "away"
@@ -38,6 +41,7 @@ ALARM_ACTIONS: dict[str, str] = {
 
 
 ALARM_AREA_ARMED_STATUS: dict[str, int] = {
+    DISABLE: 0,
     HOME_P1: 1,
     HOME_P2: 2,
     NIGHT: 3,
@@ -48,7 +52,7 @@ ALARM_AREA_ARMED_STATUS: dict[str, int] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ComelitConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Comelit VEDO system alarm control panel devices."""
 
@@ -56,7 +60,7 @@ async def async_setup_entry(
 
     async_add_entities(
         ComelitAlarmEntity(coordinator, device, config_entry.entry_id)
-        for device in coordinator.data[ALARM_AREAS].values()
+        for device in coordinator.data["alarm_areas"].values()
     )
 
 
@@ -92,7 +96,7 @@ class ComelitAlarmEntity(CoordinatorEntity[ComelitVedoSystem], AlarmControlPanel
     @property
     def _area(self) -> ComelitVedoAreaObject:
         """Return area object."""
-        return self.coordinator.data[ALARM_AREAS][self._area_index]
+        return self.coordinator.data["alarm_areas"][self._area_index]
 
     @property
     def available(self) -> bool:
@@ -125,20 +129,38 @@ class ComelitAlarmEntity(CoordinatorEntity[ComelitVedoSystem], AlarmControlPanel
             AlarmAreaState.TRIGGERED: AlarmControlPanelState.TRIGGERED,
         }.get(self._area.human_status)
 
+    async def _async_update_state(self, area_state: AlarmAreaState, armed: int) -> None:
+        """Update state after action."""
+        self._area.human_status = area_state
+        self._area.armed = armed
+        await self.async_update_ha_state()
+
     async def async_alarm_disarm(self, code: str | None = None) -> None:
         """Send disarm command."""
         if code != str(self._api.device_pin):
             return
         await self._api.set_zone_status(self._area.index, ALARM_ACTIONS[DISABLE])
+        await self._async_update_state(
+            AlarmAreaState.DISARMED, ALARM_AREA_ARMED_STATUS[DISABLE]
+        )
 
     async def async_alarm_arm_away(self, code: str | None = None) -> None:
         """Send arm away command."""
         await self._api.set_zone_status(self._area.index, ALARM_ACTIONS[AWAY])
+        await self._async_update_state(
+            AlarmAreaState.ARMED, ALARM_AREA_ARMED_STATUS[AWAY]
+        )
 
     async def async_alarm_arm_home(self, code: str | None = None) -> None:
         """Send arm home command."""
         await self._api.set_zone_status(self._area.index, ALARM_ACTIONS[HOME])
+        await self._async_update_state(
+            AlarmAreaState.ARMED, ALARM_AREA_ARMED_STATUS[HOME_P1]
+        )
 
     async def async_alarm_arm_night(self, code: str | None = None) -> None:
         """Send arm night command."""
         await self._api.set_zone_status(self._area.index, ALARM_ACTIONS[NIGHT])
+        await self._async_update_state(
+            AlarmAreaState.ARMED, ALARM_AREA_ARMED_STATUS[NIGHT]
+        )
diff --git a/homeassistant/components/comelit/binary_sensor.py b/homeassistant/components/comelit/binary_sensor.py
index fa51e0b1fda..dfa6d3e97f3 100644
--- a/homeassistant/components/comelit/binary_sensor.py
+++ b/homeassistant/components/comelit/binary_sensor.py
@@ -5,23 +5,25 @@ from __future__ import annotations
 from typing import cast
 
 from aiocomelit import ComelitVedoZoneObject
-from aiocomelit.const import ALARM_ZONES
 
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .coordinator import ComelitConfigEntry, ComelitVedoSystem
 
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ComelitConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Comelit VEDO presence sensors."""
 
@@ -29,7 +31,7 @@ async def async_setup_entry(
 
     async_add_entities(
         ComelitVedoBinarySensorEntity(coordinator, device, config_entry.entry_id)
-        for device in coordinator.data[ALARM_ZONES].values()
+        for device in coordinator.data["alarm_zones"].values()
     )
 
 
@@ -49,7 +51,7 @@ class ComelitVedoBinarySensorEntity(
     ) -> None:
         """Init sensor entity."""
         self._api = coordinator.api
-        self._zone = zone
+        self._zone_index = zone.index
         super().__init__(coordinator)
         # Use config_entry.entry_id as base for unique_id
         # because no serial number or mac is available
@@ -59,4 +61,6 @@ class ComelitVedoBinarySensorEntity(
     @property
     def is_on(self) -> bool:
         """Presence detected."""
-        return self.coordinator.data[ALARM_ZONES][self._zone.index].status_api == "0001"
+        return (
+            self.coordinator.data["alarm_zones"][self._zone_index].status_api == "0001"
+        )
diff --git a/homeassistant/components/comelit/climate.py b/homeassistant/components/comelit/climate.py
index 1baa777bf99..3ec79001d55 100644
--- a/homeassistant/components/comelit/climate.py
+++ b/homeassistant/components/comelit/climate.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from enum import StrEnum
-from typing import Any, cast
+from typing import Any, TypedDict, cast
 
 from aiocomelit import ComelitSerialBridgeObject
 from aiocomelit.const import CLIMATE
@@ -16,12 +16,17 @@ from homeassistant.components.climate import (
     UnitOfTemperature,
 )
 from homeassistant.const import ATTR_TEMPERATURE, PRECISION_TENTHS
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
+from .const import DOMAIN
 from .coordinator import ComelitConfigEntry, ComelitSerialBridge
 
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
+
 
 class ClimaComelitMode(StrEnum):
     """Serial Bridge clima modes."""
@@ -42,22 +47,23 @@ class ClimaComelitCommand(StrEnum):
     AUTO = "auto"
 
 
-API_STATUS: dict[str, dict[str, Any]] = {
-    ClimaComelitMode.OFF: {
-        "action": "off",
-        "hvac_mode": HVACMode.OFF,
-        "hvac_action": HVACAction.OFF,
-    },
-    ClimaComelitMode.LOWER: {
-        "action": "lower",
-        "hvac_mode": HVACMode.COOL,
-        "hvac_action": HVACAction.COOLING,
-    },
-    ClimaComelitMode.UPPER: {
-        "action": "upper",
-        "hvac_mode": HVACMode.HEAT,
-        "hvac_action": HVACAction.HEATING,
-    },
+class ClimaComelitApiStatus(TypedDict):
+    """Comelit Clima API status."""
+
+    hvac_mode: HVACMode
+    hvac_action: HVACAction
+
+
+API_STATUS: dict[str, ClimaComelitApiStatus] = {
+    ClimaComelitMode.OFF: ClimaComelitApiStatus(
+        hvac_mode=HVACMode.OFF, hvac_action=HVACAction.OFF
+    ),
+    ClimaComelitMode.LOWER: ClimaComelitApiStatus(
+        hvac_mode=HVACMode.COOL, hvac_action=HVACAction.COOLING
+    ),
+    ClimaComelitMode.UPPER: ClimaComelitApiStatus(
+        hvac_mode=HVACMode.HEAT, hvac_action=HVACAction.HEATING
+    ),
 }
 
 MODE_TO_ACTION: dict[HVACMode, ClimaComelitCommand] = {
@@ -71,7 +77,7 @@ MODE_TO_ACTION: dict[HVACMode, ClimaComelitCommand] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ComelitConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Comelit climates."""
 
@@ -113,70 +119,50 @@ class ComelitClimateEntity(CoordinatorEntity[ComelitSerialBridge], ClimateEntity
         # because no serial number or mac is available
         self._attr_unique_id = f"{config_entry_entry_id}-{device.index}"
         self._attr_device_info = coordinator.platform_device_info(device, device.type)
+        self._update_attributes()
+
+    def _update_attributes(self) -> None:
+        """Update class attributes."""
+        device = self.coordinator.data[CLIMATE][self._device.index]
+        if not isinstance(device.val, list):
+            raise HomeAssistantError(
+                translation_domain=DOMAIN, translation_key="invalid_clima_data"
+            )
 
-    @property
-    def _clima(self) -> list[Any]:
-        """Return clima device data."""
         # CLIMATE has a 2 item tuple:
         # - first  for Clima
         # - second for Humidifier
-        return self.coordinator.data[CLIMATE][self._device.index].val[0]
+        values = device.val[0]
 
-    @property
-    def _api_mode(self) -> str:
-        """Return device mode."""
-        # Values from API: "O", "L", "U"
-        return self._clima[2]
+        _active = values[1]
+        _mode = values[2]  # Values from API: "O", "L", "U"
+        _automatic = values[3] == ClimaComelitMode.AUTO
 
-    @property
-    def _api_active(self) -> bool:
-        "Return device active/idle."
-        return self._clima[1]
+        self._attr_current_temperature = values[0] / 10
 
-    @property
-    def _api_automatic(self) -> bool:
-        """Return device in automatic/manual mode."""
-        return self._clima[3] == ClimaComelitMode.AUTO
+        self._attr_hvac_action = None
+        if _mode == ClimaComelitMode.OFF:
+            self._attr_hvac_action = HVACAction.OFF
+        if not _active:
+            self._attr_hvac_action = HVACAction.IDLE
+        if _mode in API_STATUS:
+            self._attr_hvac_action = API_STATUS[_mode]["hvac_action"]
 
-    @property
-    def target_temperature(self) -> float:
-        """Set target temperature."""
-        return self._clima[4] / 10
+        self._attr_hvac_mode = None
+        if _mode == ClimaComelitMode.OFF:
+            self._attr_hvac_mode = HVACMode.OFF
+        if _automatic:
+            self._attr_hvac_mode = HVACMode.AUTO
+        if _mode in API_STATUS:
+            self._attr_hvac_mode = API_STATUS[_mode]["hvac_mode"]
 
-    @property
-    def current_temperature(self) -> float:
-        """Return current temperature."""
-        return self._clima[0] / 10
+        self._attr_target_temperature = values[4] / 10
 
-    @property
-    def hvac_mode(self) -> HVACMode | None:
-        """HVAC current mode."""
-
-        if self._api_mode == ClimaComelitMode.OFF:
-            return HVACMode.OFF
-
-        if self._api_automatic:
-            return HVACMode.AUTO
-
-        if self._api_mode in API_STATUS:
-            return API_STATUS[self._api_mode]["hvac_mode"]
-
-        return None
-
-    @property
-    def hvac_action(self) -> HVACAction | None:
-        """HVAC current action."""
-
-        if self._api_mode == ClimaComelitMode.OFF:
-            return HVACAction.OFF
-
-        if not self._api_active:
-            return HVACAction.IDLE
-
-        if self._api_mode in API_STATUS:
-            return API_STATUS[self._api_mode]["hvac_action"]
-
-        return None
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
+        self._update_attributes()
+        super()._handle_coordinator_update()
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
@@ -191,6 +177,8 @@ class ComelitClimateEntity(CoordinatorEntity[ComelitSerialBridge], ClimateEntity
         await self.coordinator.api.set_clima_status(
             self._device.index, ClimaComelitCommand.SET, target_temp
         )
+        self._attr_target_temperature = target_temp
+        self.async_write_ha_state()
 
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set hvac mode."""
@@ -202,3 +190,5 @@ class ComelitClimateEntity(CoordinatorEntity[ComelitSerialBridge], ClimateEntity
         await self.coordinator.api.set_clima_status(
             self._device.index, MODE_TO_ACTION[hvac_mode]
         )
+        self._attr_hvac_mode = hvac_mode
+        self.async_write_ha_state()
diff --git a/homeassistant/components/comelit/config_flow.py b/homeassistant/components/comelit/config_flow.py
index 46fc13796a0..f29cc62136b 100644
--- a/homeassistant/components/comelit/config_flow.py
+++ b/homeassistant/components/comelit/config_flow.py
@@ -18,7 +18,7 @@ from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PIN, CONF_PORT, CONF_TYPE
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import _LOGGER, DEFAULT_PORT, DEVICE_TYPE_LIST, DOMAIN
 
diff --git a/homeassistant/components/comelit/const.py b/homeassistant/components/comelit/const.py
index 84d8fbd6315..f52f33fd6da 100644
--- a/homeassistant/components/comelit/const.py
+++ b/homeassistant/components/comelit/const.py
@@ -9,3 +9,5 @@ _LOGGER = logging.getLogger(__package__)
 DOMAIN = "comelit"
 DEFAULT_PORT = 80
 DEVICE_TYPE_LIST = [BRIDGE, VEDO]
+
+SCAN_INTERVAL = 5
diff --git a/homeassistant/components/comelit/coordinator.py b/homeassistant/components/comelit/coordinator.py
index fcb149b21d6..df4965d9945 100644
--- a/homeassistant/components/comelit/coordinator.py
+++ b/homeassistant/components/comelit/coordinator.py
@@ -2,18 +2,19 @@
 
 from abc import abstractmethod
 from datetime import timedelta
-from typing import Any
+from typing import TypeVar
 
-from aiocomelit import (
+from aiocomelit.api import (
+    AlarmDataObject,
+    ComelitCommonApi,
     ComeliteSerialBridgeApi,
     ComelitSerialBridgeObject,
     ComelitVedoApi,
     ComelitVedoAreaObject,
     ComelitVedoZoneObject,
-    exceptions,
 )
-from aiocomelit.api import ComelitCommonApi
 from aiocomelit.const import BRIDGE, VEDO
+from aiocomelit.exceptions import CannotAuthenticate, CannotConnect, CannotRetrieveData
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -21,12 +22,18 @@ from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import _LOGGER, DOMAIN
+from .const import _LOGGER, DOMAIN, SCAN_INTERVAL
 
 type ComelitConfigEntry = ConfigEntry[ComelitBaseCoordinator]
 
 
-class ComelitBaseCoordinator(DataUpdateCoordinator[dict[str, Any]]):
+T = TypeVar(
+    "T",
+    bound=dict[str, dict[int, ComelitSerialBridgeObject]] | AlarmDataObject,
+)
+
+
+class ComelitBaseCoordinator(DataUpdateCoordinator[T]):
     """Base coordinator for Comelit Devices."""
 
     _hw_version: str
@@ -46,7 +53,7 @@ class ComelitBaseCoordinator(DataUpdateCoordinator[dict[str, Any]]):
             logger=_LOGGER,
             config_entry=entry,
             name=f"{DOMAIN}-{host}-coordinator",
-            update_interval=timedelta(seconds=5),
+            update_interval=timedelta(seconds=SCAN_INTERVAL),
         )
         device_registry = dr.async_get(self.hass)
         device_registry.async_get_or_create(
@@ -81,23 +88,25 @@ class ComelitBaseCoordinator(DataUpdateCoordinator[dict[str, Any]]):
             hw_version=self._hw_version,
         )
 
-    async def _async_update_data(self) -> dict[str, Any]:
+    async def _async_update_data(self) -> T:
         """Update device data."""
         _LOGGER.debug("Polling Comelit %s host: %s", self._device, self._host)
         try:
             await self.api.login()
             return await self._async_update_system_data()
-        except (exceptions.CannotConnect, exceptions.CannotRetrieveData) as err:
+        except (CannotConnect, CannotRetrieveData) as err:
             raise UpdateFailed(repr(err)) from err
-        except exceptions.CannotAuthenticate as err:
+        except CannotAuthenticate as err:
             raise ConfigEntryAuthFailed from err
 
     @abstractmethod
-    async def _async_update_system_data(self) -> dict[str, Any]:
+    async def _async_update_system_data(self) -> T:
         """Class method for updating data."""
 
 
-class ComelitSerialBridge(ComelitBaseCoordinator):
+class ComelitSerialBridge(
+    ComelitBaseCoordinator[dict[str, dict[int, ComelitSerialBridgeObject]]]
+):
     """Queries Comelit Serial Bridge."""
 
     _hw_version = "20003101"
@@ -115,12 +124,14 @@ class ComelitSerialBridge(ComelitBaseCoordinator):
         self.api = ComeliteSerialBridgeApi(host, port, pin)
         super().__init__(hass, entry, BRIDGE, host)
 
-    async def _async_update_system_data(self) -> dict[str, Any]:
+    async def _async_update_system_data(
+        self,
+    ) -> dict[str, dict[int, ComelitSerialBridgeObject]]:
         """Specific method for updating data."""
         return await self.api.get_all_devices()
 
 
-class ComelitVedoSystem(ComelitBaseCoordinator):
+class ComelitVedoSystem(ComelitBaseCoordinator[AlarmDataObject]):
     """Queries Comelit VEDO system."""
 
     _hw_version = "VEDO IP"
@@ -138,6 +149,8 @@ class ComelitVedoSystem(ComelitBaseCoordinator):
         self.api = ComelitVedoApi(host, port, pin)
         super().__init__(hass, entry, VEDO, host)
 
-    async def _async_update_system_data(self) -> dict[str, Any]:
+    async def _async_update_system_data(
+        self,
+    ) -> AlarmDataObject:
         """Specific method for updating data."""
         return await self.api.get_all_areas_and_zones()
diff --git a/homeassistant/components/comelit/cover.py b/homeassistant/components/comelit/cover.py
index abb84824621..9bcf52ac111 100644
--- a/homeassistant/components/comelit/cover.py
+++ b/homeassistant/components/comelit/cover.py
@@ -9,17 +9,20 @@ from aiocomelit.const import COVER, STATE_COVER, STATE_OFF, STATE_ON
 
 from homeassistant.components.cover import CoverDeviceClass, CoverEntity, CoverState
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .coordinator import ComelitConfigEntry, ComelitSerialBridge
 
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ComelitConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Comelit covers."""
 
diff --git a/homeassistant/components/comelit/humidifier.py b/homeassistant/components/comelit/humidifier.py
index d8058074c16..ad8f49ed5e2 100644
--- a/homeassistant/components/comelit/humidifier.py
+++ b/homeassistant/components/comelit/humidifier.py
@@ -16,14 +16,17 @@ from homeassistant.components.humidifier import (
     HumidifierEntity,
     HumidifierEntityFeature,
 )
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
 from .coordinator import ComelitConfigEntry, ComelitSerialBridge
 
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
+
 
 class HumidifierComelitMode(StrEnum):
     """Serial Bridge humidifier modes."""
@@ -55,7 +58,7 @@ MODE_TO_ACTION: dict[str, HumidifierComelitCommand] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ComelitConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Comelit humidifiers."""
 
@@ -121,62 +124,41 @@ class ComelitHumidifierEntity(CoordinatorEntity[ComelitSerialBridge], Humidifier
         self._active_mode = active_mode
         self._active_action = active_action
         self._set_command = set_command
+        self._update_attributes()
+
+    def _update_attributes(self) -> None:
+        """Update class attributes."""
+        device = self.coordinator.data[CLIMATE][self._device.index]
+        if not isinstance(device.val, list):
+            raise HomeAssistantError(
+                translation_domain=DOMAIN, translation_key="invalid_clima_data"
+            )
 
-    @property
-    def _humidifier(self) -> list[Any]:
-        """Return humidifier device data."""
         # CLIMATE has a 2 item tuple:
         # - first  for Clima
         # - second for Humidifier
-        return self.coordinator.data[CLIMATE][self._device.index].val[1]
+        values = device.val[1]
 
-    @property
-    def _api_mode(self) -> str:
-        """Return device mode."""
-        # Values from API: "O", "L", "U"
-        return self._humidifier[2]
+        _active = values[1]
+        _mode = values[2]  # Values from API: "O", "L", "U"
+        _automatic = values[3] == HumidifierComelitMode.AUTO
 
-    @property
-    def _api_active(self) -> bool:
-        "Return device active/idle."
-        return self._humidifier[1]
+        self._attr_action = HumidifierAction.IDLE
+        if _mode == HumidifierComelitMode.OFF:
+            self._attr_action = HumidifierAction.OFF
+        if _active and _mode == self._active_mode:
+            self._attr_action = self._active_action
 
-    @property
-    def _api_automatic(self) -> bool:
-        """Return device in automatic/manual mode."""
-        return self._humidifier[3] == HumidifierComelitMode.AUTO
+        self._attr_current_humidity = values[0] / 10
+        self._attr_is_on = _mode == self._active_mode
+        self._attr_mode = MODE_AUTO if _automatic else MODE_NORMAL
+        self._attr_target_humidity = values[4] / 10
 
-    @property
-    def target_humidity(self) -> float:
-        """Set target humidity."""
-        return self._humidifier[4] / 10
-
-    @property
-    def current_humidity(self) -> float:
-        """Return current humidity."""
-        return self._humidifier[0] / 10
-
-    @property
-    def is_on(self) -> bool | None:
-        """Return true is humidifier is on."""
-        return self._api_mode == self._active_mode
-
-    @property
-    def mode(self) -> str | None:
-        """Return current mode."""
-        return MODE_AUTO if self._api_automatic else MODE_NORMAL
-
-    @property
-    def action(self) -> HumidifierAction | None:
-        """Return current action."""
-
-        if self._api_mode == HumidifierComelitMode.OFF:
-            return HumidifierAction.OFF
-
-        if self._api_active and self._api_mode == self._active_mode:
-            return self._active_action
-
-        return HumidifierAction.IDLE
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
+        self._update_attributes()
+        super()._handle_coordinator_update()
 
     async def async_set_humidity(self, humidity: int) -> None:
         """Set new target humidity."""
@@ -192,12 +174,16 @@ class ComelitHumidifierEntity(CoordinatorEntity[ComelitSerialBridge], Humidifier
         await self.coordinator.api.set_humidity_status(
             self._device.index, HumidifierComelitCommand.SET, humidity
         )
+        self._attr_target_humidity = humidity
+        self.async_write_ha_state()
 
     async def async_set_mode(self, mode: str) -> None:
         """Set humidifier mode."""
         await self.coordinator.api.set_humidity_status(
             self._device.index, MODE_TO_ACTION[mode]
         )
+        self._attr_mode = mode
+        self.async_write_ha_state()
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn on."""
diff --git a/homeassistant/components/comelit/light.py b/homeassistant/components/comelit/light.py
index 9736c9ac2a0..09180d628a6 100644
--- a/homeassistant/components/comelit/light.py
+++ b/homeassistant/components/comelit/light.py
@@ -9,16 +9,19 @@ from aiocomelit.const import LIGHT, STATE_OFF, STATE_ON
 
 from homeassistant.components.light import ColorMode, LightEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .coordinator import ComelitConfigEntry, ComelitSerialBridge
 
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ComelitConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Comelit lights."""
 
diff --git a/homeassistant/components/comelit/manifest.json b/homeassistant/components/comelit/manifest.json
index 238dede8546..3abfc222e7d 100644
--- a/homeassistant/components/comelit/manifest.json
+++ b/homeassistant/components/comelit/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["aiocomelit"],
-  "requirements": ["aiocomelit==0.10.1"]
+  "requirements": ["aiocomelit==0.11.3"]
 }
diff --git a/homeassistant/components/comelit/sensor.py b/homeassistant/components/comelit/sensor.py
index efb2418244e..c93ccd30eb6 100644
--- a/homeassistant/components/comelit/sensor.py
+++ b/homeassistant/components/comelit/sensor.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from typing import Final, cast
 
 from aiocomelit import ComelitSerialBridgeObject, ComelitVedoZoneObject
-from aiocomelit.const import ALARM_ZONES, BRIDGE, OTHER, AlarmZoneState
+from aiocomelit.const import BRIDGE, OTHER, AlarmZoneState
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -14,12 +14,15 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_TYPE, UnitOfPower
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .coordinator import ComelitConfigEntry, ComelitSerialBridge, ComelitVedoSystem
 
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
+
 SENSOR_BRIDGE_TYPES: Final = (
     SensorEntityDescription(
         key="power",
@@ -42,7 +45,7 @@ SENSOR_VEDO_TYPES: Final = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ComelitConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Comelit sensors."""
 
@@ -55,7 +58,7 @@ async def async_setup_entry(
 async def async_setup_bridge_entry(
     hass: HomeAssistant,
     config_entry: ComelitConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Comelit Bridge sensors."""
 
@@ -75,14 +78,14 @@ async def async_setup_bridge_entry(
 async def async_setup_vedo_entry(
     hass: HomeAssistant,
     config_entry: ComelitConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Comelit VEDO sensors."""
 
     coordinator = cast(ComelitVedoSystem, config_entry.runtime_data)
 
     entities: list[ComelitVedoSensorEntity] = []
-    for device in coordinator.data[ALARM_ZONES].values():
+    for device in coordinator.data["alarm_zones"].values():
         entities.extend(
             ComelitVedoSensorEntity(
                 coordinator, device, config_entry.entry_id, sensor_desc
@@ -119,9 +122,12 @@ class ComelitBridgeSensorEntity(CoordinatorEntity[ComelitSerialBridge], SensorEn
     @property
     def native_value(self) -> StateType:
         """Sensor value."""
-        return getattr(
-            self.coordinator.data[OTHER][self._device.index],
-            self.entity_description.key,
+        return cast(
+            StateType,
+            getattr(
+                self.coordinator.data[OTHER][self._device.index],
+                self.entity_description.key,
+            ),
         )
 
 
@@ -139,7 +145,7 @@ class ComelitVedoSensorEntity(CoordinatorEntity[ComelitVedoSystem], SensorEntity
     ) -> None:
         """Init sensor entity."""
         self._api = coordinator.api
-        self._zone = zone
+        self._zone_index = zone.index
         super().__init__(coordinator)
         # Use config_entry.entry_id as base for unique_id
         # because no serial number or mac is available
@@ -151,7 +157,7 @@ class ComelitVedoSensorEntity(CoordinatorEntity[ComelitVedoSystem], SensorEntity
     @property
     def _zone_object(self) -> ComelitVedoZoneObject:
         """Zone object."""
-        return self.coordinator.data[ALARM_ZONES][self._zone.index]
+        return self.coordinator.data["alarm_zones"][self._zone_index]
 
     @property
     def available(self) -> bool:
@@ -164,4 +170,4 @@ class ComelitVedoSensorEntity(CoordinatorEntity[ComelitVedoSystem], SensorEntity
         if (status := self._zone_object.human_status) == AlarmZoneState.UNKNOWN:
             return None
 
-        return status.value
+        return cast(str, status.value)
diff --git a/homeassistant/components/comelit/strings.json b/homeassistant/components/comelit/strings.json
index 14d947c7323..496d62655a9 100644
--- a/homeassistant/components/comelit/strings.json
+++ b/homeassistant/components/comelit/strings.json
@@ -3,19 +3,25 @@
     "flow_title": "{host}",
     "step": {
       "reauth_confirm": {
-        "description": "Please enter the correct PIN for {host}",
         "data": {
           "pin": "[%key:common::config_flow::data::pin%]"
+        },
+        "data_description": {
+          "pin": "The PIN of your Comelit device."
         }
       },
       "user": {
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
           "port": "[%key:common::config_flow::data::port%]",
-          "pin": "[%key:common::config_flow::data::pin%]"
+          "pin": "[%key:common::config_flow::data::pin%]",
+          "type": "Device type"
         },
         "data_description": {
-          "host": "The hostname or IP address of your Comelit device."
+          "host": "The hostname or IP address of your Comelit device.",
+          "port": "The port of your Comelit device.",
+          "pin": "[%key:component::comelit::config::step::reauth_confirm::data_description::pin%]",
+          "type": "The type of your Comelit device."
         }
       }
     },
@@ -58,6 +64,9 @@
   "exceptions": {
     "humidity_while_off": {
       "message": "Cannot change humidity while off"
+    },
+    "invalid_clima_data": {
+      "message": "Invalid 'clima' data"
     }
   }
 }
diff --git a/homeassistant/components/comelit/switch.py b/homeassistant/components/comelit/switch.py
index 26d3b81ebde..db89bd082f6 100644
--- a/homeassistant/components/comelit/switch.py
+++ b/homeassistant/components/comelit/switch.py
@@ -9,16 +9,19 @@ from aiocomelit.const import IRRIGATION, OTHER, STATE_OFF, STATE_ON
 
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .coordinator import ComelitConfigEntry, ComelitSerialBridge
 
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ComelitConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Comelit switches."""
 
@@ -77,7 +80,4 @@ class ComelitSwitchEntity(CoordinatorEntity[ComelitSerialBridge], SwitchEntity):
     @property
     def is_on(self) -> bool:
         """Return True if switch is on."""
-        return (
-            self.coordinator.data[self._device.type][self._device.index].status
-            == STATE_ON
-        )
+        return self.coordinator.data[OTHER][self._device.index].status == STATE_ON
diff --git a/homeassistant/components/comfoconnect/__init__.py b/homeassistant/components/comfoconnect/__init__.py
index 4e0671fd134..b28f7a748e1 100644
--- a/homeassistant/components/comfoconnect/__init__.py
+++ b/homeassistant/components/comfoconnect/__init__.py
@@ -14,8 +14,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import Event, HomeAssistant
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.dispatcher import dispatcher_send
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/comfoconnect/sensor.py b/homeassistant/components/comfoconnect/sensor.py
index 6a15e37f3f1..fbe958e6d67 100644
--- a/homeassistant/components/comfoconnect/sensor.py
+++ b/homeassistant/components/comfoconnect/sensor.py
@@ -48,7 +48,7 @@ from homeassistant.const import (
     UnitOfVolumeFlowRate,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/command_line/__init__.py b/homeassistant/components/command_line/__init__.py
index 2440fcde76c..1832e83e7dd 100644
--- a/homeassistant/components/command_line/__init__.py
+++ b/homeassistant/components/command_line/__init__.py
@@ -52,8 +52,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import Event, HomeAssistant, ServiceCall
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.entity_platform import async_get_platforms
 from homeassistant.helpers.reload import async_integration_yaml_config
 from homeassistant.helpers.service import async_register_admin_service
diff --git a/homeassistant/components/command_line/binary_sensor.py b/homeassistant/components/command_line/binary_sensor.py
index f5d9ad9d63d..fab56ae6887 100644
--- a/homeassistant/components/command_line/binary_sensor.py
+++ b/homeassistant/components/command_line/binary_sensor.py
@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import asyncio
 from datetime import datetime, timedelta
-from typing import cast
 
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.const import (
@@ -43,9 +42,7 @@ async def async_setup_platform(
     if not discovery_info:
         return
 
-    discovery_info = cast(DiscoveryInfoType, discovery_info)
     binary_sensor_config = discovery_info
-
     command: str = binary_sensor_config[CONF_COMMAND]
     payload_off: str = binary_sensor_config[CONF_PAYLOAD_OFF]
     payload_on: str = binary_sensor_config[CONF_PAYLOAD_ON]
diff --git a/homeassistant/components/command_line/cover.py b/homeassistant/components/command_line/cover.py
index 8ddfd399ba8..7f1bc12264c 100644
--- a/homeassistant/components/command_line/cover.py
+++ b/homeassistant/components/command_line/cover.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import asyncio
 from datetime import datetime, timedelta
-from typing import TYPE_CHECKING, Any, cast
+from typing import TYPE_CHECKING, Any
 
 from homeassistant.components.cover import CoverEntity
 from homeassistant.const import (
@@ -41,7 +41,6 @@ async def async_setup_platform(
         return
 
     covers = []
-    discovery_info = cast(DiscoveryInfoType, discovery_info)
     entities: dict[str, dict[str, Any]] = {
         slugify(discovery_info[CONF_NAME]): discovery_info
     }
diff --git a/homeassistant/components/command_line/notify.py b/homeassistant/components/command_line/notify.py
index 4f5a4e4b499..ec1b51a47c7 100644
--- a/homeassistant/components/command_line/notify.py
+++ b/homeassistant/components/command_line/notify.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import logging
 import subprocess
-from typing import Any, cast
+from typing import Any
 
 from homeassistant.components.notify import BaseNotificationService
 from homeassistant.const import CONF_COMMAND
@@ -26,7 +26,6 @@ def get_service(
     if not discovery_info:
         return None
 
-    discovery_info = cast(DiscoveryInfoType, discovery_info)
     notify_config = discovery_info
     command: str = notify_config[CONF_COMMAND]
     timeout: int = notify_config[CONF_COMMAND_TIMEOUT]
diff --git a/homeassistant/components/command_line/sensor.py b/homeassistant/components/command_line/sensor.py
index e4c1370d5f7..b7c36a005fa 100644
--- a/homeassistant/components/command_line/sensor.py
+++ b/homeassistant/components/command_line/sensor.py
@@ -6,7 +6,7 @@ import asyncio
 from collections.abc import Mapping
 from datetime import datetime, timedelta
 import json
-from typing import Any, cast
+from typing import Any
 
 from jsonpath import jsonpath
 
@@ -51,9 +51,7 @@ async def async_setup_platform(
     if not discovery_info:
         return
 
-    discovery_info = cast(DiscoveryInfoType, discovery_info)
     sensor_config = discovery_info
-
     command: str = sensor_config[CONF_COMMAND]
     command_timeout: int = sensor_config[CONF_COMMAND_TIMEOUT]
     json_attributes: list[str] | None = sensor_config.get(CONF_JSON_ATTRIBUTES)
diff --git a/homeassistant/components/command_line/switch.py b/homeassistant/components/command_line/switch.py
index e42c2226cf2..31400048ddc 100644
--- a/homeassistant/components/command_line/switch.py
+++ b/homeassistant/components/command_line/switch.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import asyncio
 from datetime import datetime, timedelta
-from typing import TYPE_CHECKING, Any, cast
+from typing import TYPE_CHECKING, Any
 
 from homeassistant.components.switch import ENTITY_ID_FORMAT, SwitchEntity
 from homeassistant.const import (
@@ -40,7 +40,6 @@ async def async_setup_platform(
         return
 
     switches = []
-    discovery_info = cast(DiscoveryInfoType, discovery_info)
     entities: dict[str, dict[str, Any]] = {
         slugify(discovery_info[CONF_NAME]): discovery_info
     }
diff --git a/homeassistant/components/concord232/alarm_control_panel.py b/homeassistant/components/concord232/alarm_control_panel.py
index 02453b56376..61cf2aebb31 100644
--- a/homeassistant/components/concord232/alarm_control_panel.py
+++ b/homeassistant/components/concord232/alarm_control_panel.py
@@ -18,7 +18,7 @@ from homeassistant.components.alarm_control_panel import (
 )
 from homeassistant.const import CONF_CODE, CONF_HOST, CONF_MODE, CONF_NAME, CONF_PORT
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/concord232/binary_sensor.py b/homeassistant/components/concord232/binary_sensor.py
index 2b86e72e63c..a60cf31a646 100644
--- a/homeassistant/components/concord232/binary_sensor.py
+++ b/homeassistant/components/concord232/binary_sensor.py
@@ -17,10 +17,10 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import CONF_HOST, CONF_PORT
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/config/config_entries.py b/homeassistant/components/config/config_entries.py
index da50f7e93a1..74c9b5a9d0c 100644
--- a/homeassistant/components/config/config_entries.py
+++ b/homeassistant/components/config/config_entries.py
@@ -17,7 +17,7 @@ from homeassistant.components.http import KEY_HASS, HomeAssistantView, require_a
 from homeassistant.components.http.data_validator import RequestDataValidator
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import DependencyError, Unauthorized
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.data_entry_flow import (
     FlowManagerIndexView,
     FlowManagerResourceView,
@@ -46,6 +46,13 @@ def async_setup(hass: HomeAssistant) -> bool:
     hass.http.register_view(OptionManagerFlowIndexView(hass.config_entries.options))
     hass.http.register_view(OptionManagerFlowResourceView(hass.config_entries.options))
 
+    hass.http.register_view(
+        SubentryManagerFlowIndexView(hass.config_entries.subentries)
+    )
+    hass.http.register_view(
+        SubentryManagerFlowResourceView(hass.config_entries.subentries)
+    )
+
     websocket_api.async_register_command(hass, config_entries_get)
     websocket_api.async_register_command(hass, config_entry_disable)
     websocket_api.async_register_command(hass, config_entry_get_single)
@@ -54,6 +61,9 @@ def async_setup(hass: HomeAssistant) -> bool:
     websocket_api.async_register_command(hass, config_entries_progress)
     websocket_api.async_register_command(hass, ignore_config_flow)
 
+    websocket_api.async_register_command(hass, config_subentry_delete)
+    websocket_api.async_register_command(hass, config_subentry_list)
+
     return True
 
 
@@ -285,6 +295,66 @@ class OptionManagerFlowResourceView(
         return await super().post(request, flow_id)
 
 
+class SubentryManagerFlowIndexView(
+    FlowManagerIndexView[config_entries.ConfigSubentryFlowManager]
+):
+    """View to create subentry flows."""
+
+    url = "/api/config/config_entries/subentries/flow"
+    name = "api:config:config_entries:subentries:flow"
+
+    @require_admin(
+        error=Unauthorized(perm_category=CAT_CONFIG_ENTRIES, permission=POLICY_EDIT)
+    )
+    @RequestDataValidator(
+        vol.Schema(
+            {
+                vol.Required("handler"): vol.All(vol.Coerce(tuple), (str, str)),
+                vol.Optional("show_advanced_options", default=False): cv.boolean,
+            },
+            extra=vol.ALLOW_EXTRA,
+        )
+    )
+    async def post(self, request: web.Request, data: dict[str, Any]) -> web.Response:
+        """Handle a POST request.
+
+        handler in request is [entry_id, subentry_type].
+        """
+        return await super()._post_impl(request, data)
+
+    def get_context(self, data: dict[str, Any]) -> dict[str, Any]:
+        """Return context."""
+        context = super().get_context(data)
+        context["source"] = config_entries.SOURCE_USER
+        if subentry_id := data.get("subentry_id"):
+            context["source"] = config_entries.SOURCE_RECONFIGURE
+            context["subentry_id"] = subentry_id
+        return context
+
+
+class SubentryManagerFlowResourceView(
+    FlowManagerResourceView[config_entries.ConfigSubentryFlowManager]
+):
+    """View to interact with the subentry flow manager."""
+
+    url = "/api/config/config_entries/subentries/flow/{flow_id}"
+    name = "api:config:config_entries:subentries:flow:resource"
+
+    @require_admin(
+        error=Unauthorized(perm_category=CAT_CONFIG_ENTRIES, permission=POLICY_EDIT)
+    )
+    async def get(self, request: web.Request, /, flow_id: str) -> web.Response:
+        """Get the current state of a data_entry_flow."""
+        return await super().get(request, flow_id)
+
+    @require_admin(
+        error=Unauthorized(perm_category=CAT_CONFIG_ENTRIES, permission=POLICY_EDIT)
+    )
+    async def post(self, request: web.Request, flow_id: str) -> web.Response:
+        """Handle a POST request."""
+        return await super().post(request, flow_id)
+
+
 @websocket_api.require_admin
 @websocket_api.websocket_command({"type": "config_entries/flow/progress"})
 def config_entries_progress(
@@ -302,7 +372,8 @@ def config_entries_progress(
         [
             flw
             for flw in hass.config_entries.flow.async_progress()
-            if flw["context"]["source"] != config_entries.SOURCE_USER
+            if flw["context"]["source"]
+            not in (config_entries.SOURCE_RECONFIGURE, config_entries.SOURCE_USER)
         ],
     )
 
@@ -588,3 +659,63 @@ async def _async_matching_config_entries_json_fragments(
         )
         or (filter_is_not_helper and entry.domain not in integrations)
     ]
+
+
+@websocket_api.require_admin
+@websocket_api.websocket_command(
+    {
+        "type": "config_entries/subentries/list",
+        "entry_id": str,
+    }
+)
+@websocket_api.async_response
+async def config_subentry_list(
+    hass: HomeAssistant,
+    connection: websocket_api.ActiveConnection,
+    msg: dict[str, Any],
+) -> None:
+    """List subentries of a config entry."""
+    entry = get_entry(hass, connection, msg["entry_id"], msg["id"])
+    if entry is None:
+        return
+
+    result = [
+        {
+            "subentry_id": subentry.subentry_id,
+            "subentry_type": subentry.subentry_type,
+            "title": subentry.title,
+            "unique_id": subentry.unique_id,
+        }
+        for subentry in entry.subentries.values()
+    ]
+    connection.send_result(msg["id"], result)
+
+
+@websocket_api.require_admin
+@websocket_api.websocket_command(
+    {
+        "type": "config_entries/subentries/delete",
+        "entry_id": str,
+        "subentry_id": str,
+    }
+)
+@websocket_api.async_response
+async def config_subentry_delete(
+    hass: HomeAssistant,
+    connection: websocket_api.ActiveConnection,
+    msg: dict[str, Any],
+) -> None:
+    """Delete a subentry of a config entry."""
+    entry = get_entry(hass, connection, msg["entry_id"], msg["id"])
+    if entry is None:
+        return
+
+    try:
+        hass.config_entries.async_remove_subentry(entry, msg["subentry_id"])
+    except config_entries.UnknownSubEntry:
+        connection.send_error(
+            msg["id"], websocket_api.const.ERR_NOT_FOUND, "Config subentry not found"
+        )
+        return
+
+    connection.send_result(msg["id"])
diff --git a/homeassistant/components/control4/__init__.py b/homeassistant/components/control4/__init__.py
index 8d0eb72a73b..df5771fe5bb 100644
--- a/homeassistant/components/control4/__init__.py
+++ b/homeassistant/components/control4/__init__.py
@@ -2,8 +2,10 @@
 
 from __future__ import annotations
 
+from dataclasses import dataclass
 import json
 import logging
+from typing import Any
 
 from aiohttp import client_exceptions
 from pyControl4.account import C4Account
@@ -25,14 +27,7 @@ from homeassistant.helpers import aiohttp_client, device_registry as dr
 
 from .const import (
     API_RETRY_TIMES,
-    CONF_ACCOUNT,
-    CONF_CONFIG_LISTENER,
     CONF_CONTROLLER_UNIQUE_ID,
-    CONF_DIRECTOR,
-    CONF_DIRECTOR_ALL_ITEMS,
-    CONF_DIRECTOR_MODEL,
-    CONF_DIRECTOR_SW_VERSION,
-    CONF_UI_CONFIGURATION,
     DEFAULT_SCAN_INTERVAL,
     DOMAIN,
 )
@@ -42,6 +37,23 @@ _LOGGER = logging.getLogger(__name__)
 PLATFORMS = [Platform.LIGHT, Platform.MEDIA_PLAYER]
 
 
+@dataclass
+class Control4RuntimeData:
+    """Control4 runtime data."""
+
+    account: C4Account
+    controller_unique_id: str
+    director: C4Director
+    director_all_items: list[dict[str, Any]]
+    director_model: str
+    director_sw_version: str
+    scan_interval: int
+    ui_configuration: dict[str, Any] | None
+
+
+type Control4ConfigEntry = ConfigEntry[Control4RuntimeData]
+
+
 async def call_c4_api_retry(func, *func_args):
     """Call C4 API function and retry on failure."""
     # Ruff doesn't understand this loop - the exception is always raised after the retries
@@ -54,10 +66,8 @@ async def call_c4_api_retry(func, *func_args):
                 raise ConfigEntryNotReady(exception) from exception
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: Control4ConfigEntry) -> bool:
     """Set up Control4 from a config entry."""
-    hass.data.setdefault(DOMAIN, {})
-    entry_data = hass.data[DOMAIN].setdefault(entry.entry_id, {})
     account_session = aiohttp_client.async_get_clientsession(hass)
 
     config = entry.data
@@ -76,10 +86,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             exception,
         )
         return False
-    entry_data[CONF_ACCOUNT] = account
 
-    controller_unique_id = config[CONF_CONTROLLER_UNIQUE_ID]
-    entry_data[CONF_CONTROLLER_UNIQUE_ID] = controller_unique_id
+    controller_unique_id: str = config[CONF_CONTROLLER_UNIQUE_ID]
 
     director_token_dict = await call_c4_api_retry(
         account.getDirectorBearerToken, controller_unique_id
@@ -89,15 +97,14 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     director = C4Director(
         config[CONF_HOST], director_token_dict[CONF_TOKEN], director_session
     )
-    entry_data[CONF_DIRECTOR] = director
 
     controller_href = (await call_c4_api_retry(account.getAccountControllers))["href"]
-    entry_data[CONF_DIRECTOR_SW_VERSION] = await call_c4_api_retry(
+    director_sw_version = await call_c4_api_retry(
         account.getControllerOSVersion, controller_href
     )
 
     _, model, mac_address = controller_unique_id.split("_", 3)
-    entry_data[CONF_DIRECTOR_MODEL] = model.upper()
+    director_model = model.upper()
 
     device_registry = dr.async_get(hass)
     device_registry.async_get_or_create(
@@ -106,57 +113,60 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         connections={(dr.CONNECTION_NETWORK_MAC, mac_address)},
         manufacturer="Control4",
         name=controller_unique_id,
-        model=entry_data[CONF_DIRECTOR_MODEL],
-        sw_version=entry_data[CONF_DIRECTOR_SW_VERSION],
+        model=director_model,
+        sw_version=director_sw_version,
     )
 
     # Store all items found on controller for platforms to use
-    director_all_items = await director.getAllItemInfo()
-    director_all_items = json.loads(director_all_items)
-    entry_data[CONF_DIRECTOR_ALL_ITEMS] = director_all_items
-
-    # Check if OS version is 3 or higher to get UI configuration
-    entry_data[CONF_UI_CONFIGURATION] = None
-    if int(entry_data[CONF_DIRECTOR_SW_VERSION].split(".")[0]) >= 3:
-        entry_data[CONF_UI_CONFIGURATION] = json.loads(
-            await director.getUiConfiguration()
-        )
-
-    # Load options from config entry
-    entry_data[CONF_SCAN_INTERVAL] = entry.options.get(
-        CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL
+    director_all_items: list[dict[str, Any]] = json.loads(
+        await director.getAllItemInfo()
     )
 
-    entry_data[CONF_CONFIG_LISTENER] = entry.add_update_listener(update_listener)
+    # Check if OS version is 3 or higher to get UI configuration
+    ui_configuration: dict[str, Any] | None = None
+    if int(director_sw_version.split(".")[0]) >= 3:
+        ui_configuration = json.loads(await director.getUiConfiguration())
+
+    # Load options from config entry
+    scan_interval: int = entry.options.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL)
+
+    entry.runtime_data = Control4RuntimeData(
+        account=account,
+        controller_unique_id=controller_unique_id,
+        director=director,
+        director_all_items=director_all_items,
+        director_model=director_model,
+        director_sw_version=director_sw_version,
+        scan_interval=scan_interval,
+        ui_configuration=ui_configuration,
+    )
+
+    entry.async_on_unload(entry.add_update_listener(update_listener))
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def update_listener(hass: HomeAssistant, config_entry: ConfigEntry) -> None:
+async def update_listener(
+    hass: HomeAssistant, config_entry: Control4ConfigEntry
+) -> None:
     """Update when config_entry options update."""
     _LOGGER.debug("Config entry was updated, rerunning setup")
     await hass.config_entries.async_reload(config_entry.entry_id)
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: Control4ConfigEntry) -> bool:
     """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-
-    hass.data[DOMAIN][entry.entry_id][CONF_CONFIG_LISTENER]()
-    if unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
-        _LOGGER.debug("Unloaded entry for %s", entry.entry_id)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
-async def get_items_of_category(hass: HomeAssistant, entry: ConfigEntry, category: str):
+async def get_items_of_category(
+    hass: HomeAssistant, entry: Control4ConfigEntry, category: str
+):
     """Return a list of all Control4 items with the specified category."""
-    director_all_items = hass.data[DOMAIN][entry.entry_id][CONF_DIRECTOR_ALL_ITEMS]
     return [
         item
-        for item in director_all_items
+        for item in entry.runtime_data.director_all_items
         if "categories" in item and category in item["categories"]
     ]
diff --git a/homeassistant/components/control4/config_flow.py b/homeassistant/components/control4/config_flow.py
index 19fae1ef7ca..3ca96ca4e52 100644
--- a/homeassistant/components/control4/config_flow.py
+++ b/homeassistant/components/control4/config_flow.py
@@ -11,12 +11,7 @@ from pyControl4.director import C4Director
 from pyControl4.error_handling import NotFound, Unauthorized
 import voluptuous as vol
 
-from homeassistant.config_entries import (
-    ConfigEntry,
-    ConfigFlow,
-    ConfigFlowResult,
-    OptionsFlow,
-)
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult, OptionsFlow
 from homeassistant.const import (
     CONF_HOST,
     CONF_PASSWORD,
@@ -28,6 +23,7 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import aiohttp_client, config_validation as cv
 from homeassistant.helpers.device_registry import format_mac
 
+from . import Control4ConfigEntry
 from .const import (
     CONF_CONTROLLER_UNIQUE_ID,
     DEFAULT_SCAN_INTERVAL,
@@ -151,7 +147,7 @@ class Control4ConfigFlow(ConfigFlow, domain=DOMAIN):
     @staticmethod
     @callback
     def async_get_options_flow(
-        config_entry: ConfigEntry,
+        config_entry: Control4ConfigEntry,
     ) -> OptionsFlowHandler:
         """Get the options flow for this handler."""
         return OptionsFlowHandler()
diff --git a/homeassistant/components/control4/const.py b/homeassistant/components/control4/const.py
index 57074c00108..2fe9c42849b 100644
--- a/homeassistant/components/control4/const.py
+++ b/homeassistant/components/control4/const.py
@@ -7,14 +7,6 @@ MIN_SCAN_INTERVAL = 1
 
 API_RETRY_TIMES = 5
 
-CONF_ACCOUNT = "account"
-CONF_DIRECTOR = "director"
-CONF_DIRECTOR_SW_VERSION = "director_sw_version"
-CONF_DIRECTOR_MODEL = "director_model"
-CONF_DIRECTOR_ALL_ITEMS = "director_all_items"
-CONF_UI_CONFIGURATION = "ui_configuration"
 CONF_CONTROLLER_UNIQUE_ID = "controller_unique_id"
 
-CONF_CONFIG_LISTENER = "config_listener"
-
 CONTROL4_ENTITY_TYPE = 7
diff --git a/homeassistant/components/control4/director_utils.py b/homeassistant/components/control4/director_utils.py
index 5e57237337c..a26c5f9f413 100644
--- a/homeassistant/components/control4/director_utils.py
+++ b/homeassistant/components/control4/director_utils.py
@@ -8,21 +8,21 @@ from pyControl4.account import C4Account
 from pyControl4.director import C4Director
 from pyControl4.error_handling import BadToken
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_TOKEN, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import aiohttp_client
 
-from .const import CONF_ACCOUNT, CONF_CONTROLLER_UNIQUE_ID, CONF_DIRECTOR, DOMAIN
+from . import Control4ConfigEntry
+from .const import CONF_CONTROLLER_UNIQUE_ID
 
 _LOGGER = logging.getLogger(__name__)
 
 
 async def _update_variables_for_config_entry(
-    hass: HomeAssistant, entry: ConfigEntry, variable_names: set[str]
+    hass: HomeAssistant, entry: Control4ConfigEntry, variable_names: set[str]
 ) -> dict[int, dict[str, Any]]:
     """Retrieve data from the Control4 director."""
-    director: C4Director = hass.data[DOMAIN][entry.entry_id][CONF_DIRECTOR]
+    director = entry.runtime_data.director
     data = await director.getAllItemVariableValue(variable_names)
     result_dict: defaultdict[int, dict[str, Any]] = defaultdict(dict)
     for item in data:
@@ -31,7 +31,7 @@ async def _update_variables_for_config_entry(
 
 
 async def update_variables_for_config_entry(
-    hass: HomeAssistant, entry: ConfigEntry, variable_names: set[str]
+    hass: HomeAssistant, entry: Control4ConfigEntry, variable_names: set[str]
 ) -> dict[int, dict[str, Any]]:
     """Try to Retrieve data from the Control4 director for update_coordinator."""
     try:
@@ -42,8 +42,8 @@ async def update_variables_for_config_entry(
         return await _update_variables_for_config_entry(hass, entry, variable_names)
 
 
-async def refresh_tokens(hass: HomeAssistant, entry: ConfigEntry):
-    """Store updated authentication and director tokens in hass.data."""
+async def refresh_tokens(hass: HomeAssistant, entry: Control4ConfigEntry):
+    """Store updated authentication and director tokens in runtime_data."""
     config = entry.data
     account_session = aiohttp_client.async_get_clientsession(hass)
 
@@ -59,6 +59,5 @@ async def refresh_tokens(hass: HomeAssistant, entry: ConfigEntry):
     )
 
     _LOGGER.debug("Saving new tokens in hass data")
-    entry_data = hass.data[DOMAIN][entry.entry_id]
-    entry_data[CONF_ACCOUNT] = account
-    entry_data[CONF_DIRECTOR] = director
+    entry.runtime_data.account = account
+    entry.runtime_data.director = director
diff --git a/homeassistant/components/control4/entity.py b/homeassistant/components/control4/entity.py
index fdb22e6578d..f7ca0e1fabc 100644
--- a/homeassistant/components/control4/entity.py
+++ b/homeassistant/components/control4/entity.py
@@ -10,7 +10,8 @@ from homeassistant.helpers.update_coordinator import (
     DataUpdateCoordinator,
 )
 
-from .const import CONF_CONTROLLER_UNIQUE_ID, DOMAIN
+from . import Control4RuntimeData
+from .const import DOMAIN
 
 
 class Control4Entity(CoordinatorEntity[Any]):
@@ -18,7 +19,7 @@ class Control4Entity(CoordinatorEntity[Any]):
 
     def __init__(
         self,
-        entry_data: dict,
+        runtime_data: Control4RuntimeData,
         coordinator: DataUpdateCoordinator[Any],
         name: str | None,
         idx: int,
@@ -29,11 +30,11 @@ class Control4Entity(CoordinatorEntity[Any]):
     ) -> None:
         """Initialize a Control4 entity."""
         super().__init__(coordinator)
-        self.entry_data = entry_data
+        self.runtime_data = runtime_data
         self._attr_name = name
         self._attr_unique_id = str(idx)
         self._idx = idx
-        self._controller_unique_id = entry_data[CONF_CONTROLLER_UNIQUE_ID]
+        self._controller_unique_id = runtime_data.controller_unique_id
         self._device_name = device_name
         self._device_manufacturer = device_manufacturer
         self._device_model = device_model
diff --git a/homeassistant/components/control4/light.py b/homeassistant/components/control4/light.py
index 927f4643619..d2d0f85f476 100644
--- a/homeassistant/components/control4/light.py
+++ b/homeassistant/components/control4/light.py
@@ -17,14 +17,12 @@ from homeassistant.components.light import (
     LightEntity,
     LightEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_SCAN_INTERVAL
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from . import get_items_of_category
-from .const import CONF_DIRECTOR, CONTROL4_ENTITY_TYPE, DOMAIN
+from . import Control4ConfigEntry, Control4RuntimeData, get_items_of_category
+from .const import CONTROL4_ENTITY_TYPE
 from .director_utils import update_variables_for_config_entry
 from .entity import Control4Entity
 
@@ -36,15 +34,13 @@ CONTROL4_DIMMER_VARS = ["LIGHT_LEVEL", "Brightness Percent"]
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: Control4ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Control4 lights from a config entry."""
-    entry_data = hass.data[DOMAIN][entry.entry_id]
-    scan_interval = entry_data[CONF_SCAN_INTERVAL]
-    _LOGGER.debug(
-        "Scan interval = %s",
-        scan_interval,
-    )
+    runtime_data = entry.runtime_data
+    _LOGGER.debug("Scan interval = %s", runtime_data.scan_interval)
 
     async def async_update_data_non_dimmer() -> dict[int, dict[str, Any]]:
         """Fetch data from Control4 director for non-dimmer lights."""
@@ -69,14 +65,14 @@ async def async_setup_entry(
         _LOGGER,
         name="light",
         update_method=async_update_data_non_dimmer,
-        update_interval=timedelta(seconds=scan_interval),
+        update_interval=timedelta(seconds=runtime_data.scan_interval),
     )
     dimmer_coordinator = DataUpdateCoordinator[dict[int, dict[str, Any]]](
         hass,
         _LOGGER,
         name="light",
         update_method=async_update_data_dimmer,
-        update_interval=timedelta(seconds=scan_interval),
+        update_interval=timedelta(seconds=runtime_data.scan_interval),
     )
 
     # Fetch initial data so we have data when entities subscribe
@@ -118,7 +114,7 @@ async def async_setup_entry(
             item_is_dimmer = False
             item_coordinator = non_dimmer_coordinator
         else:
-            director = entry_data[CONF_DIRECTOR]
+            director = runtime_data.director
             item_variables = await director.getItemVariables(item_id)
             _LOGGER.warning(
                 (
@@ -132,7 +128,7 @@ async def async_setup_entry(
 
         entity_list.append(
             Control4Light(
-                entry_data,
+                runtime_data,
                 item_coordinator,
                 item_name,
                 item_id,
@@ -154,7 +150,7 @@ class Control4Light(Control4Entity, LightEntity):
 
     def __init__(
         self,
-        entry_data: dict,
+        runtime_data: Control4RuntimeData,
         coordinator: DataUpdateCoordinator[dict[int, dict[str, Any]]],
         name: str,
         idx: int,
@@ -166,7 +162,7 @@ class Control4Light(Control4Entity, LightEntity):
     ) -> None:
         """Initialize Control4 light entity."""
         super().__init__(
-            entry_data,
+            runtime_data,
             coordinator,
             name,
             idx,
@@ -188,7 +184,7 @@ class Control4Light(Control4Entity, LightEntity):
 
         This exists so the director token used is always the latest one, without needing to re-init the entire entity.
         """
-        return C4Light(self.entry_data[CONF_DIRECTOR], self._idx)
+        return C4Light(self.runtime_data.director, self._idx)
 
     @property
     def is_on(self):
diff --git a/homeassistant/components/control4/media_player.py b/homeassistant/components/control4/media_player.py
index 9e3421817a3..824ce431aea 100644
--- a/homeassistant/components/control4/media_player.py
+++ b/homeassistant/components/control4/media_player.py
@@ -18,13 +18,11 @@ from homeassistant.components.media_player import (
     MediaPlayerState,
     MediaType,
 )
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_SCAN_INTERVAL
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import CONF_DIRECTOR, CONF_DIRECTOR_ALL_ITEMS, CONF_UI_CONFIGURATION, DOMAIN
+from . import Control4ConfigEntry, Control4RuntimeData
 from .director_utils import update_variables_for_config_entry
 from .entity import Control4Entity
 
@@ -67,22 +65,23 @@ class _RoomSource:
     name: str
 
 
-async def get_rooms(hass: HomeAssistant, entry: ConfigEntry):
+async def get_rooms(hass: HomeAssistant, entry: Control4ConfigEntry):
     """Return a list of all Control4 rooms."""
-    director_all_items = hass.data[DOMAIN][entry.entry_id][CONF_DIRECTOR_ALL_ITEMS]
     return [
         item
-        for item in director_all_items
+        for item in entry.runtime_data.director_all_items
         if "typeName" in item and item["typeName"] == "room"
     ]
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: Control4ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Control4 rooms from a config entry."""
-    entry_data = hass.data[DOMAIN][entry.entry_id]
-    ui_config = entry_data[CONF_UI_CONFIGURATION]
+    runtime_data = entry.runtime_data
+    ui_config = runtime_data.ui_configuration
 
     # OS 2 will not have a ui_configuration
     if not ui_config:
@@ -93,7 +92,7 @@ async def async_setup_entry(
     if not all_rooms:
         return
 
-    scan_interval = entry_data[CONF_SCAN_INTERVAL]
+    scan_interval = runtime_data.scan_interval
     _LOGGER.debug("Scan interval = %s", scan_interval)
 
     async def async_update_data() -> dict[int, dict[str, Any]]:
@@ -116,10 +115,7 @@ async def async_setup_entry(
     # Fetch initial data so we have data when entities subscribe
     await coordinator.async_refresh()
 
-    items_by_id = {
-        item["id"]: item
-        for item in hass.data[DOMAIN][entry.entry_id][CONF_DIRECTOR_ALL_ITEMS]
-    }
+    items_by_id = {item["id"]: item for item in runtime_data.director_all_items}
     item_to_parent_map = {
         k: item["parentId"]
         for k, item in items_by_id.items()
@@ -156,7 +152,7 @@ async def async_setup_entry(
             hidden = room["roomHidden"]
             entity_list.append(
                 Control4Room(
-                    entry_data,
+                    runtime_data,
                     coordinator,
                     room["name"],
                     room_id,
@@ -182,7 +178,7 @@ class Control4Room(Control4Entity, MediaPlayerEntity):
 
     def __init__(
         self,
-        entry_data: dict,
+        runtime_data: Control4RuntimeData,
         coordinator: DataUpdateCoordinator[dict[int, dict[str, Any]]],
         name: str,
         room_id: int,
@@ -192,7 +188,7 @@ class Control4Room(Control4Entity, MediaPlayerEntity):
     ) -> None:
         """Initialize Control4 room entity."""
         super().__init__(
-            entry_data,
+            runtime_data,
             coordinator,
             None,
             room_id,
@@ -220,7 +216,7 @@ class Control4Room(Control4Entity, MediaPlayerEntity):
 
         This exists so the director token used is always the latest one, without needing to re-init the entire entity.
         """
-        return C4Room(self.entry_data[CONF_DIRECTOR], self._idx)
+        return C4Room(self.runtime_data.director, self._idx)
 
     def _get_device_from_variable(self, var: str) -> int | None:
         current_device = self.coordinator.data[self._idx][var]
diff --git a/homeassistant/components/conversation/__init__.py b/homeassistant/components/conversation/__init__.py
index 9c1db128f15..25aaf6df290 100644
--- a/homeassistant/components/conversation/__init__.py
+++ b/homeassistant/components/conversation/__init__.py
@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable
 import logging
-import re
 from typing import Literal
 
+from hassil.recognize import RecognizeResult
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntry
@@ -30,6 +31,17 @@ from .agent_manager import (
     async_get_agent,
     get_agent_manager,
 )
+from .chat_log import (
+    AssistantContent,
+    AssistantContentDeltaDict,
+    ChatLog,
+    Content,
+    ConverseError,
+    SystemContent,
+    ToolResultContent,
+    UserContent,
+    async_get_chat_log,
+)
 from .const import (
     ATTR_AGENT_ID,
     ATTR_CONVERSATION_ID,
@@ -48,25 +60,29 @@ from .default_agent import DefaultAgent, async_setup_default_agent
 from .entity import ConversationEntity
 from .http import async_setup as async_setup_conversation_http
 from .models import AbstractConversationAgent, ConversationInput, ConversationResult
-from .session import ChatMessage, ChatSession, ConverseError, async_get_chat_session
 from .trace import ConversationTraceEventType, async_conversation_trace_append
 
 __all__ = [
     "DOMAIN",
     "HOME_ASSISTANT_AGENT",
     "OLD_HOME_ASSISTANT_AGENT",
-    "ChatMessage",
-    "ChatSession",
+    "AssistantContent",
+    "AssistantContentDeltaDict",
+    "ChatLog",
+    "Content",
     "ConversationEntity",
     "ConversationEntityFeature",
     "ConversationInput",
     "ConversationResult",
     "ConversationTraceEventType",
     "ConverseError",
+    "SystemContent",
+    "ToolResultContent",
+    "UserContent",
     "async_conversation_trace_append",
     "async_converse",
     "async_get_agent_info",
-    "async_get_chat_session",
+    "async_get_chat_log",
     "async_set_agent",
     "async_setup",
     "async_unset_agent",
@@ -74,8 +90,6 @@ __all__ = [
 
 _LOGGER = logging.getLogger(__name__)
 
-REGEX_TYPE = type(re.compile(""))
-
 SERVICE_PROCESS_SCHEMA = vol.Schema(
     {
         vol.Required(ATTR_TEXT): cv.string,
@@ -226,7 +240,10 @@ async def async_handle_sentence_triggers(
 
 
 async def async_handle_intents(
-    hass: HomeAssistant, user_input: ConversationInput
+    hass: HomeAssistant,
+    user_input: ConversationInput,
+    *,
+    intent_filter: Callable[[RecognizeResult], bool] | None = None,
 ) -> intent.IntentResponse | None:
     """Try to match input against registered intents and return response.
 
@@ -235,7 +252,9 @@ async def async_handle_intents(
     default_agent = async_get_agent(hass)
     assert isinstance(default_agent, DefaultAgent)
 
-    return await default_agent.async_handle_intents(user_input)
+    return await default_agent.async_handle_intents(
+        user_input, intent_filter=intent_filter
+    )
 
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
diff --git a/homeassistant/components/conversation/agent_manager.py b/homeassistant/components/conversation/agent_manager.py
index 97dc5e1292e..5ff47977d88 100644
--- a/homeassistant/components/conversation/agent_manager.py
+++ b/homeassistant/components/conversation/agent_manager.py
@@ -9,7 +9,8 @@ from typing import Any
 import voluptuous as vol
 
 from homeassistant.core import Context, HomeAssistant, async_get_hass, callback
-from homeassistant.helpers import config_validation as cv, singleton
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_validation as cv, intent, singleton
 
 from .const import (
     DATA_COMPONENT,
@@ -78,6 +79,9 @@ async def async_converse(
     extra_system_prompt: str | None = None,
 ) -> ConversationResult:
     """Process text and get intent."""
+    if agent_id is None:
+        agent_id = HOME_ASSISTANT_AGENT
+
     agent = async_get_agent(hass, agent_id)
 
     if agent is None:
@@ -109,7 +113,19 @@ async def async_converse(
                 dataclasses.asdict(conversation_input),
             )
         )
-        result = await method(conversation_input)
+        try:
+            result = await method(conversation_input)
+        except HomeAssistantError as err:
+            intent_response = intent.IntentResponse(language=language)
+            intent_response.async_set_error(
+                intent.IntentResponseErrorCode.UNKNOWN,
+                str(err),
+            )
+            result = ConversationResult(
+                response=intent_response,
+                conversation_id=conversation_id,
+            )
+
         trace.set_result(**result.as_dict())
         return result
 
diff --git a/homeassistant/components/conversation/chat_log.py b/homeassistant/components/conversation/chat_log.py
new file mode 100644
index 00000000000..cb7b8dd22f7
--- /dev/null
+++ b/homeassistant/components/conversation/chat_log.py
@@ -0,0 +1,471 @@
+"""Conversation chat log."""
+
+from __future__ import annotations
+
+import asyncio
+from collections.abc import AsyncGenerator, AsyncIterable, Callable, Generator
+from contextlib import contextmanager
+from contextvars import ContextVar
+from dataclasses import asdict, dataclass, field, replace
+import logging
+from typing import Any, Literal, TypedDict
+
+import voluptuous as vol
+
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError, TemplateError
+from homeassistant.helpers import chat_session, intent, llm, template
+from homeassistant.util.hass_dict import HassKey
+from homeassistant.util.json import JsonObjectType
+
+from . import trace
+from .const import DOMAIN
+from .models import ConversationInput, ConversationResult
+
+DATA_CHAT_LOGS: HassKey[dict[str, ChatLog]] = HassKey("conversation_chat_logs")
+
+LOGGER = logging.getLogger(__name__)
+
+current_chat_log: ContextVar[ChatLog | None] = ContextVar(
+    "current_chat_log", default=None
+)
+
+
+@contextmanager
+def async_get_chat_log(
+    hass: HomeAssistant,
+    session: chat_session.ChatSession,
+    user_input: ConversationInput | None = None,
+    *,
+    chat_log_delta_listener: Callable[[ChatLog, dict], None] | None = None,
+) -> Generator[ChatLog]:
+    """Return chat log for a specific chat session."""
+    # If a chat log is already active and it's the requested conversation ID,
+    # return that. We won't update the last updated time in this case.
+    if (
+        chat_log := current_chat_log.get()
+    ) and chat_log.conversation_id == session.conversation_id:
+        if chat_log_delta_listener is not None:
+            raise RuntimeError(
+                "Cannot attach chat log delta listener unless initial caller"
+            )
+        if user_input is not None and (
+            (content := chat_log.content[-1]).role != "user"
+            or content.content != user_input.text
+        ):
+            chat_log.async_add_user_content(UserContent(content=user_input.text))
+
+        yield chat_log
+        return
+
+    all_chat_logs = hass.data.get(DATA_CHAT_LOGS)
+    if all_chat_logs is None:
+        all_chat_logs = {}
+        hass.data[DATA_CHAT_LOGS] = all_chat_logs
+
+    if chat_log := all_chat_logs.get(session.conversation_id):
+        chat_log = replace(chat_log, content=chat_log.content.copy())
+    else:
+        chat_log = ChatLog(hass, session.conversation_id)
+
+    if chat_log_delta_listener:
+        chat_log.delta_listener = chat_log_delta_listener
+
+    if user_input is not None:
+        chat_log.async_add_user_content(UserContent(content=user_input.text))
+
+    last_message = chat_log.content[-1]
+
+    token = current_chat_log.set(chat_log)
+    yield chat_log
+    current_chat_log.reset(token)
+
+    if chat_log.content[-1] is last_message:
+        LOGGER.debug(
+            "Chat Log opened but no assistant message was added, ignoring update"
+        )
+        return
+
+    if session.conversation_id not in all_chat_logs:
+
+        @callback
+        def do_cleanup() -> None:
+            """Handle cleanup."""
+            all_chat_logs.pop(session.conversation_id)
+
+        session.async_on_cleanup(do_cleanup)
+
+    if chat_log_delta_listener:
+        chat_log.delta_listener = None
+
+    all_chat_logs[session.conversation_id] = chat_log
+
+
+class ConverseError(HomeAssistantError):
+    """Error during initialization of conversation.
+
+    Will not be stored in the history.
+    """
+
+    def __init__(
+        self, message: str, conversation_id: str, response: intent.IntentResponse
+    ) -> None:
+        """Initialize the error."""
+        super().__init__(message)
+        self.conversation_id = conversation_id
+        self.response = response
+
+    def as_conversation_result(self) -> ConversationResult:
+        """Return the error as a conversation result."""
+        return ConversationResult(
+            response=self.response,
+            conversation_id=self.conversation_id,
+        )
+
+
+@dataclass(frozen=True)
+class SystemContent:
+    """Base class for chat messages."""
+
+    role: Literal["system"] = field(init=False, default="system")
+    content: str
+
+
+@dataclass(frozen=True)
+class UserContent:
+    """Assistant content."""
+
+    role: Literal["user"] = field(init=False, default="user")
+    content: str
+
+
+@dataclass(frozen=True)
+class AssistantContent:
+    """Assistant content."""
+
+    role: Literal["assistant"] = field(init=False, default="assistant")
+    agent_id: str
+    content: str | None = None
+    tool_calls: list[llm.ToolInput] | None = None
+
+
+@dataclass(frozen=True)
+class ToolResultContent:
+    """Tool result content."""
+
+    role: Literal["tool_result"] = field(init=False, default="tool_result")
+    agent_id: str
+    tool_call_id: str
+    tool_name: str
+    tool_result: JsonObjectType
+
+
+type Content = SystemContent | UserContent | AssistantContent | ToolResultContent
+
+
+class AssistantContentDeltaDict(TypedDict, total=False):
+    """Partial content to define an AssistantContent."""
+
+    role: Literal["assistant"]
+    content: str | None
+    tool_calls: list[llm.ToolInput] | None
+
+
+@dataclass
+class ChatLog:
+    """Class holding the chat history of a specific conversation."""
+
+    hass: HomeAssistant
+    conversation_id: str
+    content: list[Content] = field(default_factory=lambda: [SystemContent(content="")])
+    extra_system_prompt: str | None = None
+    llm_api: llm.APIInstance | None = None
+    delta_listener: Callable[[ChatLog, dict], None] | None = None
+
+    @property
+    def continue_conversation(self) -> bool:
+        """Return whether the conversation should continue."""
+        if not self.content:
+            return False
+
+        last_msg = self.content[-1]
+
+        return (
+            last_msg.role == "assistant"
+            and last_msg.content is not None
+            and last_msg.content.strip().endswith(
+                (
+                    "?",
+                    ";",  # Greek question mark
+                )
+            )
+        )
+
+    @property
+    def unresponded_tool_results(self) -> bool:
+        """Return if there are unresponded tool results."""
+        return self.content[-1].role == "tool_result"
+
+    @callback
+    def async_add_user_content(self, content: UserContent) -> None:
+        """Add user content to the log."""
+        LOGGER.debug("Adding user content: %s", content)
+        self.content.append(content)
+
+    @callback
+    def async_add_assistant_content_without_tools(
+        self, content: AssistantContent
+    ) -> None:
+        """Add assistant content to the log."""
+        LOGGER.debug("Adding assistant content: %s", content)
+        if content.tool_calls is not None:
+            raise ValueError("Tool calls not allowed")
+        self.content.append(content)
+
+    async def async_add_assistant_content(
+        self,
+        content: AssistantContent,
+        /,
+        tool_call_tasks: dict[str, asyncio.Task] | None = None,
+    ) -> AsyncGenerator[ToolResultContent]:
+        """Add assistant content and execute tool calls.
+
+        tool_call_tasks can contains tasks for tool calls that are already in progress.
+
+        This method is an async generator and will yield the tool results as they come in.
+        """
+        LOGGER.debug("Adding assistant content: %s", content)
+        self.content.append(content)
+
+        if content.tool_calls is None:
+            return
+
+        if self.llm_api is None:
+            raise ValueError("No LLM API configured")
+
+        if tool_call_tasks is None:
+            tool_call_tasks = {}
+        for tool_input in content.tool_calls:
+            if tool_input.id not in tool_call_tasks:
+                tool_call_tasks[tool_input.id] = self.hass.async_create_task(
+                    self.llm_api.async_call_tool(tool_input),
+                    name=f"llm_tool_{tool_input.id}",
+                )
+
+        for tool_input in content.tool_calls:
+            LOGGER.debug(
+                "Tool call: %s(%s)", tool_input.tool_name, tool_input.tool_args
+            )
+
+            try:
+                tool_result = await tool_call_tasks[tool_input.id]
+            except (HomeAssistantError, vol.Invalid) as e:
+                tool_result = {"error": type(e).__name__}
+                if str(e):
+                    tool_result["error_text"] = str(e)
+            LOGGER.debug("Tool response: %s", tool_result)
+
+            response_content = ToolResultContent(
+                agent_id=content.agent_id,
+                tool_call_id=tool_input.id,
+                tool_name=tool_input.tool_name,
+                tool_result=tool_result,
+            )
+            self.content.append(response_content)
+            yield response_content
+
+    async def async_add_delta_content_stream(
+        self, agent_id: str, stream: AsyncIterable[AssistantContentDeltaDict]
+    ) -> AsyncGenerator[AssistantContent | ToolResultContent]:
+        """Stream content into the chat log.
+
+        Returns a generator with all content that was added to the chat log.
+
+        stream iterates over dictionaries with optional keys role, content and tool_calls.
+
+        When a delta contains a role key, the current message is considered complete and
+        a new message is started.
+
+        The keys content and tool_calls will be concatenated if they appear multiple times.
+        """
+        current_content = ""
+        current_tool_calls: list[llm.ToolInput] = []
+        tool_call_tasks: dict[str, asyncio.Task] = {}
+
+        async for delta in stream:
+            LOGGER.debug("Received delta: %s", delta)
+
+            # Indicates update to current message
+            if "role" not in delta:
+                if delta_content := delta.get("content"):
+                    current_content += delta_content
+                if delta_tool_calls := delta.get("tool_calls"):
+                    if self.llm_api is None:
+                        raise ValueError("No LLM API configured")
+                    current_tool_calls += delta_tool_calls
+
+                    # Start processing the tool calls as soon as we know about them
+                    for tool_call in delta_tool_calls:
+                        tool_call_tasks[tool_call.id] = self.hass.async_create_task(
+                            self.llm_api.async_call_tool(tool_call),
+                            name=f"llm_tool_{tool_call.id}",
+                        )
+                if self.delta_listener:
+                    self.delta_listener(self, delta)  # type: ignore[arg-type]
+                continue
+
+            # Starting a new message
+
+            if delta["role"] != "assistant":
+                raise ValueError(f"Only assistant role expected. Got {delta['role']}")
+
+            # Yield the previous message if it has content
+            if current_content or current_tool_calls:
+                content = AssistantContent(
+                    agent_id=agent_id,
+                    content=current_content or None,
+                    tool_calls=current_tool_calls or None,
+                )
+                yield content
+                async for tool_result in self.async_add_assistant_content(
+                    content, tool_call_tasks=tool_call_tasks
+                ):
+                    yield tool_result
+                    if self.delta_listener:
+                        self.delta_listener(self, asdict(tool_result))
+
+            current_content = delta.get("content") or ""
+            current_tool_calls = delta.get("tool_calls") or []
+
+            if self.delta_listener:
+                self.delta_listener(self, delta)  # type: ignore[arg-type]
+
+        if current_content or current_tool_calls:
+            content = AssistantContent(
+                agent_id=agent_id,
+                content=current_content or None,
+                tool_calls=current_tool_calls or None,
+            )
+            yield content
+            async for tool_result in self.async_add_assistant_content(
+                content, tool_call_tasks=tool_call_tasks
+            ):
+                yield tool_result
+                if self.delta_listener:
+                    self.delta_listener(self, asdict(tool_result))
+
+    async def async_update_llm_data(
+        self,
+        conversing_domain: str,
+        user_input: ConversationInput,
+        user_llm_hass_api: str | None = None,
+        user_llm_prompt: str | None = None,
+    ) -> None:
+        """Set the LLM system prompt."""
+        llm_context = llm.LLMContext(
+            platform=conversing_domain,
+            context=user_input.context,
+            user_prompt=user_input.text,
+            language=user_input.language,
+            assistant=DOMAIN,
+            device_id=user_input.device_id,
+        )
+
+        llm_api: llm.APIInstance | None = None
+
+        if user_llm_hass_api:
+            try:
+                llm_api = await llm.async_get_api(
+                    self.hass,
+                    user_llm_hass_api,
+                    llm_context,
+                )
+            except HomeAssistantError as err:
+                LOGGER.error(
+                    "Error getting LLM API %s for %s: %s",
+                    user_llm_hass_api,
+                    conversing_domain,
+                    err,
+                )
+                intent_response = intent.IntentResponse(language=user_input.language)
+                intent_response.async_set_error(
+                    intent.IntentResponseErrorCode.UNKNOWN,
+                    "Error preparing LLM API",
+                )
+                raise ConverseError(
+                    f"Error getting LLM API {user_llm_hass_api}",
+                    conversation_id=self.conversation_id,
+                    response=intent_response,
+                ) from err
+
+        user_name: str | None = None
+
+        if (
+            user_input.context
+            and user_input.context.user_id
+            and (
+                user := await self.hass.auth.async_get_user(user_input.context.user_id)
+            )
+        ):
+            user_name = user.name
+
+        try:
+            prompt_parts = [
+                template.Template(
+                    llm.BASE_PROMPT
+                    + (user_llm_prompt or llm.DEFAULT_INSTRUCTIONS_PROMPT),
+                    self.hass,
+                ).async_render(
+                    {
+                        "ha_name": self.hass.config.location_name,
+                        "user_name": user_name,
+                        "llm_context": llm_context,
+                    },
+                    parse_result=False,
+                )
+            ]
+
+        except TemplateError as err:
+            LOGGER.error("Error rendering prompt: %s", err)
+            intent_response = intent.IntentResponse(language=user_input.language)
+            intent_response.async_set_error(
+                intent.IntentResponseErrorCode.UNKNOWN,
+                "Sorry, I had a problem with my template",
+            )
+            raise ConverseError(
+                "Error rendering prompt",
+                conversation_id=self.conversation_id,
+                response=intent_response,
+            ) from err
+
+        if llm_api:
+            prompt_parts.append(llm_api.api_prompt)
+
+        if extra_system_prompt := (
+            # Take new system prompt if one was given
+            user_input.extra_system_prompt or self.extra_system_prompt
+        ):
+            prompt_parts.append(extra_system_prompt)
+
+        prompt = "\n".join(prompt_parts)
+
+        self.llm_api = llm_api
+        self.extra_system_prompt = extra_system_prompt
+        self.content[0] = SystemContent(content=prompt)
+
+        LOGGER.debug("Prompt: %s", self.content)
+        LOGGER.debug("Tools: %s", self.llm_api.tools if self.llm_api else None)
+
+        self.async_trace(
+            {
+                "messages": self.content,
+                "tools": self.llm_api.tools if self.llm_api else None,
+            }
+        )
+
+    def async_trace(self, agent_details: dict[str, Any]) -> None:
+        """Append agent specific details to the conversation trace."""
+        trace.async_conversation_trace_append(
+            trace.ConversationTraceEventType.AGENT_DETAIL,
+            agent_details,
+        )
diff --git a/homeassistant/components/conversation/default_agent.py b/homeassistant/components/conversation/default_agent.py
index bb815698941..c30e8bb4a92 100644
--- a/homeassistant/components/conversation/default_agent.py
+++ b/homeassistant/components/conversation/default_agent.py
@@ -52,8 +52,10 @@ from homeassistant.helpers import (
 )
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.event import async_track_state_added_domain
+from homeassistant.util import language as language_util
 from homeassistant.util.json import JsonObjectType, json_loads_object
 
+from .chat_log import AssistantContent, ChatLog
 from .const import (
     DATA_DEFAULT_ENTITY,
     DEFAULT_EXPOSED_ATTRIBUTES,
@@ -62,7 +64,6 @@ from .const import (
 )
 from .entity import ConversationEntity
 from .models import ConversationInput, ConversationResult
-from .session import ChatMessage, async_get_chat_session
 from .trace import ConversationTraceEventType, async_conversation_trace_append
 
 _LOGGER = logging.getLogger(__name__)
@@ -183,21 +184,6 @@ class IntentCache:
         self.cache.clear()
 
 
-def _get_language_variations(language: str) -> Iterable[str]:
-    """Generate language codes with and without region."""
-    yield language
-
-    parts = re.split(r"([-_])", language)
-    if len(parts) == 3:
-        lang, sep, region = parts
-        if sep == "_":
-            # en_US -> en-US
-            yield f"{lang}-{region}"
-
-        # en-US -> en
-        yield lang
-
-
 async def async_setup_default_agent(
     hass: core.HomeAssistant,
     entity_component: EntityComponent[ConversationEntity],
@@ -345,46 +331,46 @@ class DefaultAgent(ConversationEntity):
 
         return result
 
-    async def async_process(self, user_input: ConversationInput) -> ConversationResult:
-        """Process a sentence."""
+    async def _async_handle_message(
+        self,
+        user_input: ConversationInput,
+        chat_log: ChatLog,
+    ) -> ConversationResult:
+        """Handle a message."""
         response: intent.IntentResponse | None = None
-        async with async_get_chat_session(self.hass, user_input) as chat_session:
-            # Check if a trigger matched
-            if trigger_result := await self.async_recognize_sentence_trigger(
-                user_input
-            ):
-                # Process callbacks and get response
-                response_text = await self._handle_trigger_result(
-                    trigger_result, user_input
-                )
 
-                # Convert to conversation result
-                response = intent.IntentResponse(
-                    language=user_input.language or self.hass.config.language
-                )
-                response.response_type = intent.IntentResponseType.ACTION_DONE
-                response.async_set_speech(response_text)
-
-            if response is None:
-                # Match intents
-                intent_result = await self.async_recognize_intent(user_input)
-                response = await self._async_process_intent_result(
-                    intent_result, user_input
-                )
-
-            speech: str = response.speech.get("plain", {}).get("speech", "")
-            chat_session.async_add_message(
-                ChatMessage(
-                    role="assistant",
-                    agent_id=user_input.agent_id,
-                    content=speech,
-                    native=response,
-                )
+        # Check if a trigger matched
+        if trigger_result := await self.async_recognize_sentence_trigger(user_input):
+            # Process callbacks and get response
+            response_text = await self._handle_trigger_result(
+                trigger_result, user_input
             )
 
-            return ConversationResult(
-                response=response, conversation_id=chat_session.conversation_id
+            # Convert to conversation result
+            response = intent.IntentResponse(
+                language=user_input.language or self.hass.config.language
             )
+            response.response_type = intent.IntentResponseType.ACTION_DONE
+            response.async_set_speech(response_text)
+
+        if response is None:
+            # Match intents
+            intent_result = await self.async_recognize_intent(user_input)
+            response = await self._async_process_intent_result(
+                intent_result, user_input
+            )
+
+        speech: str = response.speech.get("plain", {}).get("speech", "")
+        chat_log.async_add_assistant_content_without_tools(
+            AssistantContent(
+                agent_id=user_input.agent_id,
+                content=speech,
+            )
+        )
+
+        return ConversationResult(
+            response=response, conversation_id=chat_log.conversation_id
+        )
 
     async def _async_process_intent_result(
         self,
@@ -910,26 +896,20 @@ class DefaultAgent(ConversationEntity):
     def _load_intents(self, language: str) -> LanguageIntents | None:
         """Load all intents for language (run inside executor)."""
         intents_dict: dict[str, Any] = {}
-        language_variant: str | None = None
         supported_langs = set(get_languages())
 
         # Choose a language variant upfront and commit to it for custom
         # sentences, etc.
-        all_language_variants = {lang.lower(): lang for lang in supported_langs}
+        lang_matches = language_util.matches(language, supported_langs)
 
-        # en-US, en_US, en, ...
-        for maybe_variant in _get_language_variations(language):
-            matching_variant = all_language_variants.get(maybe_variant.lower())
-            if matching_variant:
-                language_variant = matching_variant
-                break
-
-        if not language_variant:
+        if not lang_matches:
             _LOGGER.warning(
                 "Unable to find supported language variant for %s", language
             )
             return None
 
+        language_variant = lang_matches[0]
+
         # Load intents for this language variant
         lang_variant_intents = get_intents(language_variant, json_load=json_load)
 
@@ -1325,6 +1305,8 @@ class DefaultAgent(ConversationEntity):
     async def async_handle_intents(
         self,
         user_input: ConversationInput,
+        *,
+        intent_filter: Callable[[RecognizeResult], bool] | None = None,
     ) -> intent.IntentResponse | None:
         """Try to match sentence against registered intents and return response.
 
@@ -1332,7 +1314,9 @@ class DefaultAgent(ConversationEntity):
         Returns None if no match or a matching error occurred.
         """
         result = await self.async_recognize_intent(user_input, strict_intents_only=True)
-        if not isinstance(result, RecognizeResult):
+        if not isinstance(result, RecognizeResult) or (
+            intent_filter is not None and intent_filter(result)
+        ):
             # No error message on failed match
             return None
 
diff --git a/homeassistant/components/conversation/entity.py b/homeassistant/components/conversation/entity.py
index d9598dee7eb..ca4d18ab9f5 100644
--- a/homeassistant/components/conversation/entity.py
+++ b/homeassistant/components/conversation/entity.py
@@ -4,9 +4,11 @@ from abc import abstractmethod
 from typing import Literal, final
 
 from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN
+from homeassistant.helpers.chat_session import async_get_chat_session
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.util import dt as dt_util
 
+from .chat_log import ChatLog, async_get_chat_log
 from .const import ConversationEntityFeature
 from .models import ConversationInput, ConversationResult
 
@@ -51,9 +53,21 @@ class ConversationEntity(RestoreEntity):
     def supported_languages(self) -> list[str] | Literal["*"]:
         """Return a list of supported languages."""
 
-    @abstractmethod
     async def async_process(self, user_input: ConversationInput) -> ConversationResult:
         """Process a sentence."""
+        with (
+            async_get_chat_session(self.hass, user_input.conversation_id) as session,
+            async_get_chat_log(self.hass, session, user_input) as chat_log,
+        ):
+            return await self._async_handle_message(user_input, chat_log)
+
+    async def _async_handle_message(
+        self,
+        user_input: ConversationInput,
+        chat_log: ChatLog,
+    ) -> ConversationResult:
+        """Call the API."""
+        raise NotImplementedError
 
     async def async_prepare(self, language: str | None = None) -> None:
         """Load intents for a language."""
diff --git a/homeassistant/components/conversation/http.py b/homeassistant/components/conversation/http.py
index 8134ecb0eee..efcdcb8d69b 100644
--- a/homeassistant/components/conversation/http.py
+++ b/homeassistant/components/conversation/http.py
@@ -3,11 +3,13 @@
 from __future__ import annotations
 
 from collections.abc import Iterable
+from dataclasses import asdict
 from typing import Any
 
 from aiohttp import web
 from hassil.recognize import MISSING_ENTITY, RecognizeResult
 from hassil.string_matcher import UnmatchedRangeEntity, UnmatchedTextEntity
+from home_assistant_intents import get_language_scores
 import voluptuous as vol
 
 from homeassistant.components import http, websocket_api
@@ -38,6 +40,7 @@ def async_setup(hass: HomeAssistant) -> None:
     websocket_api.async_register_command(hass, websocket_list_agents)
     websocket_api.async_register_command(hass, websocket_list_sentences)
     websocket_api.async_register_command(hass, websocket_hass_agent_debug)
+    websocket_api.async_register_command(hass, websocket_hass_agent_language_scores)
 
 
 @websocket_api.websocket_command(
@@ -195,7 +198,7 @@ async def websocket_hass_agent_debug(
             conversation_id=None,
             device_id=msg.get("device_id"),
             language=msg.get("language", hass.config.language),
-            agent_id=None,
+            agent_id=agent.entity_id,
         )
         result_dict: dict[str, Any] | None = None
 
@@ -336,6 +339,36 @@ def _get_unmatched_slots(
     return unmatched_slots
 
 
+@websocket_api.websocket_command(
+    {
+        vol.Required("type"): "conversation/agent/homeassistant/language_scores",
+        vol.Optional("language"): str,
+        vol.Optional("country"): str,
+    }
+)
+@websocket_api.async_response
+async def websocket_hass_agent_language_scores(
+    hass: HomeAssistant,
+    connection: websocket_api.ActiveConnection,
+    msg: dict[str, Any],
+) -> None:
+    """Get support scores per language."""
+    language = msg.get("language", hass.config.language)
+    country = msg.get("country", hass.config.country)
+
+    scores = await hass.async_add_executor_job(get_language_scores)
+    matching_langs = language_util.matches(language, scores.keys(), country=country)
+    preferred_lang = matching_langs[0] if matching_langs else language
+    result = {
+        "languages": {
+            lang_key: asdict(lang_scores) for lang_key, lang_scores in scores.items()
+        },
+        "preferred_language": preferred_lang,
+    }
+
+    connection.send_result(msg["id"], result)
+
+
 class ConversationProcessView(http.HomeAssistantView):
     """View to process text."""
 
diff --git a/homeassistant/components/conversation/manifest.json b/homeassistant/components/conversation/manifest.json
index 979ea7538c4..acaa2ef0967 100644
--- a/homeassistant/components/conversation/manifest.json
+++ b/homeassistant/components/conversation/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/conversation",
   "integration_type": "system",
   "quality_scale": "internal",
-  "requirements": ["hassil==2.1.0", "home-assistant-intents==2025.1.1"]
+  "requirements": ["hassil==2.2.3", "home-assistant-intents==2025.3.24"]
 }
diff --git a/homeassistant/components/conversation/models.py b/homeassistant/components/conversation/models.py
index 9462c597f23..7bdd13afc01 100644
--- a/homeassistant/components/conversation/models.py
+++ b/homeassistant/components/conversation/models.py
@@ -37,7 +37,7 @@ class ConversationInput:
     language: str
     """Language of the request."""
 
-    agent_id: str | None = None
+    agent_id: str
     """Agent to use for processing."""
 
     extra_system_prompt: str | None = None
@@ -62,12 +62,14 @@ class ConversationResult:
 
     response: intent.IntentResponse
     conversation_id: str | None = None
+    continue_conversation: bool = False
 
     def as_dict(self) -> dict[str, Any]:
         """Return result as a dict."""
         return {
             "response": self.response.as_dict(),
             "conversation_id": self.conversation_id,
+            "continue_conversation": self.continue_conversation,
         }
 
 
diff --git a/homeassistant/components/conversation/session.py b/homeassistant/components/conversation/session.py
deleted file mode 100644
index 48040e8ac9c..00000000000
--- a/homeassistant/components/conversation/session.py
+++ /dev/null
@@ -1,328 +0,0 @@
-"""Conversation history."""
-
-from __future__ import annotations
-
-from collections.abc import AsyncGenerator
-from contextlib import asynccontextmanager
-from dataclasses import dataclass, field, replace
-from datetime import datetime, timedelta
-import logging
-from typing import Literal
-
-from homeassistant.const import EVENT_HOMEASSISTANT_STOP
-from homeassistant.core import (
-    CALLBACK_TYPE,
-    Event,
-    HassJob,
-    HassJobType,
-    HomeAssistant,
-    callback,
-)
-from homeassistant.exceptions import HomeAssistantError, TemplateError
-from homeassistant.helpers import intent, llm, template
-from homeassistant.helpers.event import async_call_later
-from homeassistant.util import dt as dt_util, ulid as ulid_util
-from homeassistant.util.hass_dict import HassKey
-
-from .const import DOMAIN
-from .models import ConversationInput, ConversationResult
-
-DATA_CHAT_HISTORY: HassKey[dict[str, ChatSession]] = HassKey(
-    "conversation_chat_session"
-)
-DATA_CHAT_HISTORY_CLEANUP: HassKey[SessionCleanup] = HassKey(
-    "conversation_chat_session_cleanup"
-)
-
-LOGGER = logging.getLogger(__name__)
-CONVERSATION_TIMEOUT = timedelta(minutes=5)
-
-
-class SessionCleanup:
-    """Helper to clean up the history."""
-
-    unsub: CALLBACK_TYPE | None = None
-
-    def __init__(self, hass: HomeAssistant) -> None:
-        """Initialize the history cleanup."""
-        self.hass = hass
-        hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, self._on_hass_stop)
-        self.cleanup_job = HassJob(
-            self._cleanup, "conversation_history_cleanup", job_type=HassJobType.Callback
-        )
-
-    @callback
-    def schedule(self) -> None:
-        """Schedule the cleanup."""
-        if self.unsub:
-            return
-        self.unsub = async_call_later(
-            self.hass,
-            CONVERSATION_TIMEOUT.total_seconds() + 1,
-            self.cleanup_job,
-        )
-
-    @callback
-    def _on_hass_stop(self, event: Event) -> None:
-        """Cancel the cleanup on shutdown."""
-        if self.unsub:
-            self.unsub()
-        self.unsub = None
-
-    @callback
-    def _cleanup(self, now: datetime) -> None:
-        """Clean up the history and schedule follow-up if necessary."""
-        self.unsub = None
-        all_history = self.hass.data[DATA_CHAT_HISTORY]
-
-        # We mutate original object because current commands could be
-        # yielding history based on it.
-        for conversation_id, history in list(all_history.items()):
-            if history.last_updated + CONVERSATION_TIMEOUT < now:
-                del all_history[conversation_id]
-
-        # Still conversations left, check again in timeout time.
-        if all_history:
-            self.schedule()
-
-
-@asynccontextmanager
-async def async_get_chat_session(
-    hass: HomeAssistant,
-    user_input: ConversationInput,
-) -> AsyncGenerator[ChatSession]:
-    """Return chat session."""
-    all_history = hass.data.get(DATA_CHAT_HISTORY)
-    if all_history is None:
-        all_history = {}
-        hass.data[DATA_CHAT_HISTORY] = all_history
-        hass.data[DATA_CHAT_HISTORY_CLEANUP] = SessionCleanup(hass)
-
-    history: ChatSession | None = None
-
-    if user_input.conversation_id is None:
-        conversation_id = ulid_util.ulid_now()
-
-    elif history := all_history.get(user_input.conversation_id):
-        conversation_id = user_input.conversation_id
-
-    else:
-        # Conversation IDs are ULIDs. We generate a new one if not provided.
-        # If an old OLID is passed in, we will generate a new one to indicate
-        # a new conversation was started. If the user picks their own, they
-        # want to track a conversation and we respect it.
-        try:
-            ulid_util.ulid_to_bytes(user_input.conversation_id)
-            conversation_id = ulid_util.ulid_now()
-        except ValueError:
-            conversation_id = user_input.conversation_id
-
-    if history:
-        history = replace(history, messages=history.messages.copy())
-    else:
-        history = ChatSession(hass, conversation_id)
-
-    message: ChatMessage = ChatMessage(
-        role="user",
-        agent_id=user_input.agent_id,
-        content=user_input.text,
-    )
-    history.async_add_message(message)
-
-    yield history
-
-    if history.messages[-1] is message:
-        LOGGER.debug(
-            "History opened but no assistant message was added, ignoring update"
-        )
-        return
-
-    history.last_updated = dt_util.utcnow()
-    all_history[conversation_id] = history
-    hass.data[DATA_CHAT_HISTORY_CLEANUP].schedule()
-
-
-class ConverseError(HomeAssistantError):
-    """Error during initialization of conversation.
-
-    Will not be stored in the history.
-    """
-
-    def __init__(
-        self, message: str, conversation_id: str, response: intent.IntentResponse
-    ) -> None:
-        """Initialize the error."""
-        super().__init__(message)
-        self.conversation_id = conversation_id
-        self.response = response
-
-    def as_conversation_result(self) -> ConversationResult:
-        """Return the error as a conversation result."""
-        return ConversationResult(
-            response=self.response,
-            conversation_id=self.conversation_id,
-        )
-
-
-@dataclass
-class ChatMessage[_NativeT]:
-    """Base class for chat messages.
-
-    When role is native, the content is to be ignored and message
-    is only meant for storing the native object.
-    """
-
-    role: Literal["system", "assistant", "user", "native"]
-    agent_id: str | None
-    content: str
-    native: _NativeT | None = field(default=None)
-
-    # Validate in post-init that if role is native, there is no content and a native object exists
-    def __post_init__(self) -> None:
-        """Validate native message."""
-        if self.role == "native" and self.native is None:
-            raise ValueError("Native message must have a native object")
-
-
-@dataclass
-class ChatSession[_NativeT]:
-    """Class holding all information for a specific conversation."""
-
-    hass: HomeAssistant
-    conversation_id: str
-    user_name: str | None = None
-    messages: list[ChatMessage[_NativeT]] = field(
-        default_factory=lambda: [ChatMessage(role="system", agent_id=None, content="")]
-    )
-    extra_system_prompt: str | None = None
-    llm_api: llm.APIInstance | None = None
-    last_updated: datetime = field(default_factory=dt_util.utcnow)
-
-    @callback
-    def async_add_message(self, message: ChatMessage[_NativeT]) -> None:
-        """Process intent."""
-        if message.role == "system":
-            raise ValueError("Cannot add system messages to history")
-        if message.role != "native" and self.messages[-1].role == message.role:
-            raise ValueError("Cannot add two assistant or user messages in a row")
-
-        self.messages.append(message)
-
-    @callback
-    def async_get_messages(self, agent_id: str | None) -> list[ChatMessage[_NativeT]]:
-        """Get messages for a specific agent ID.
-
-        This will filter out any native message tied to other agent IDs.
-        It can still include assistant/user messages generated by other agents.
-        """
-        return [
-            message
-            for message in self.messages
-            if message.role != "native" or message.agent_id == agent_id
-        ]
-
-    async def async_update_llm_data(
-        self,
-        conversing_domain: str,
-        user_input: ConversationInput,
-        user_llm_hass_api: str | None = None,
-        user_llm_prompt: str | None = None,
-    ) -> None:
-        """Set the LLM system prompt."""
-        llm_context = llm.LLMContext(
-            platform=conversing_domain,
-            context=user_input.context,
-            user_prompt=user_input.text,
-            language=user_input.language,
-            assistant=DOMAIN,
-            device_id=user_input.device_id,
-        )
-
-        llm_api: llm.APIInstance | None = None
-
-        if user_llm_hass_api:
-            try:
-                llm_api = await llm.async_get_api(
-                    self.hass,
-                    user_llm_hass_api,
-                    llm_context,
-                )
-            except HomeAssistantError as err:
-                LOGGER.error(
-                    "Error getting LLM API %s for %s: %s",
-                    user_llm_hass_api,
-                    conversing_domain,
-                    err,
-                )
-                intent_response = intent.IntentResponse(language=user_input.language)
-                intent_response.async_set_error(
-                    intent.IntentResponseErrorCode.UNKNOWN,
-                    "Error preparing LLM API",
-                )
-                raise ConverseError(
-                    f"Error getting LLM API {user_llm_hass_api}",
-                    conversation_id=self.conversation_id,
-                    response=intent_response,
-                ) from err
-
-        user_name: str | None = None
-
-        if (
-            user_input.context
-            and user_input.context.user_id
-            and (
-                user := await self.hass.auth.async_get_user(user_input.context.user_id)
-            )
-        ):
-            user_name = user.name
-
-        try:
-            prompt_parts = [
-                template.Template(
-                    llm.BASE_PROMPT
-                    + (user_llm_prompt or llm.DEFAULT_INSTRUCTIONS_PROMPT),
-                    self.hass,
-                ).async_render(
-                    {
-                        "ha_name": self.hass.config.location_name,
-                        "user_name": user_name,
-                        "llm_context": llm_context,
-                    },
-                    parse_result=False,
-                )
-            ]
-
-        except TemplateError as err:
-            LOGGER.error("Error rendering prompt: %s", err)
-            intent_response = intent.IntentResponse(language=user_input.language)
-            intent_response.async_set_error(
-                intent.IntentResponseErrorCode.UNKNOWN,
-                "Sorry, I had a problem with my template",
-            )
-            raise ConverseError(
-                "Error rendering prompt",
-                conversation_id=self.conversation_id,
-                response=intent_response,
-            ) from err
-
-        if llm_api:
-            prompt_parts.append(llm_api.api_prompt)
-
-        extra_system_prompt = (
-            # Take new system prompt if one was given
-            user_input.extra_system_prompt or self.extra_system_prompt
-        )
-
-        if extra_system_prompt:
-            prompt_parts.append(extra_system_prompt)
-
-        prompt = "\n".join(prompt_parts)
-
-        self.llm_api = llm_api
-        self.user_name = user_name
-        self.extra_system_prompt = extra_system_prompt
-        self.messages[0] = ChatMessage(
-            role="system",
-            agent_id=user_input.agent_id,
-            content=prompt,
-        )
diff --git a/homeassistant/components/conversation/trigger.py b/homeassistant/components/conversation/trigger.py
index 24eb54c5694..752e294a8b3 100644
--- a/homeassistant/components/conversation/trigger.py
+++ b/homeassistant/components/conversation/trigger.py
@@ -5,12 +5,17 @@ from __future__ import annotations
 from typing import Any
 
 from hassil.recognize import RecognizeResult
-from hassil.util import PUNCTUATION_ALL
+from hassil.util import (
+    PUNCTUATION_END,
+    PUNCTUATION_END_WORD,
+    PUNCTUATION_START,
+    PUNCTUATION_START_WORD,
+)
 import voluptuous as vol
 
 from homeassistant.const import CONF_COMMAND, CONF_PLATFORM
 from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.script import ScriptRunResult
 from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
 from homeassistant.helpers.typing import UNDEFINED, ConfigType
@@ -22,7 +27,12 @@ from .models import ConversationInput
 def has_no_punctuation(value: list[str]) -> list[str]:
     """Validate result does not contain punctuation."""
     for sentence in value:
-        if PUNCTUATION_ALL.search(sentence):
+        if (
+            PUNCTUATION_START.search(sentence)
+            or PUNCTUATION_END.search(sentence)
+            or PUNCTUATION_START_WORD.search(sentence)
+            or PUNCTUATION_END_WORD.search(sentence)
+        ):
             raise vol.Invalid("sentence should not contain punctuation")
 
     return value
diff --git a/homeassistant/components/conversation/util.py b/homeassistant/components/conversation/util.py
deleted file mode 100644
index 4326c95cb66..00000000000
--- a/homeassistant/components/conversation/util.py
+++ /dev/null
@@ -1,37 +0,0 @@
-"""Util for Conversation."""
-
-from __future__ import annotations
-
-import re
-
-
-def create_matcher(utterance: str) -> re.Pattern[str]:
-    """Create a regex that matches the utterance."""
-    # Split utterance into parts that are type: NORMAL, GROUP or OPTIONAL
-    # Pattern matches (GROUP|OPTIONAL): Change light to [the color] {name}
-    parts = re.split(r"({\w+}|\[[\w\s]+\] *)", utterance)
-    # Pattern to extract name from GROUP part. Matches {name}
-    group_matcher = re.compile(r"{(\w+)}")
-    # Pattern to extract text from OPTIONAL part. Matches [the color]
-    optional_matcher = re.compile(r"\[([\w ]+)\] *")
-
-    pattern = ["^"]
-    for part in parts:
-        group_match = group_matcher.match(part)
-        optional_match = optional_matcher.match(part)
-
-        # Normal part
-        if group_match is None and optional_match is None:
-            pattern.append(part)
-            continue
-
-        # Group part
-        if group_match is not None:
-            pattern.append(rf"(?P<{group_match.groups()[0]}>[\w ]+?)\s*")
-
-        # Optional part
-        elif optional_match is not None:
-            pattern.append(rf"(?:{optional_match.groups()[0]} *)?")
-
-    pattern.append("$")
-    return re.compile("".join(pattern), re.IGNORECASE)
diff --git a/homeassistant/components/cookidoo/__init__.py b/homeassistant/components/cookidoo/__init__.py
index 67095422e65..bff4c8123d6 100644
--- a/homeassistant/components/cookidoo/__init__.py
+++ b/homeassistant/components/cookidoo/__init__.py
@@ -14,7 +14,7 @@ from .const import DOMAIN
 from .coordinator import CookidooConfigEntry, CookidooDataUpdateCoordinator
 from .helpers import cookidoo_from_config_entry
 
-PLATFORMS: list[Platform] = [Platform.BUTTON, Platform.TODO]
+PLATFORMS: list[Platform] = [Platform.BUTTON, Platform.SENSOR, Platform.TODO]
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/cookidoo/button.py b/homeassistant/components/cookidoo/button.py
index b292a7309ba..97136deb031 100644
--- a/homeassistant/components/cookidoo/button.py
+++ b/homeassistant/components/cookidoo/button.py
@@ -8,7 +8,7 @@ from cookidoo_api import Cookidoo, CookidooException
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import CookidooConfigEntry, CookidooDataUpdateCoordinator
@@ -35,7 +35,7 @@ TODO_CLEAR = CookidooButtonEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: CookidooConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Cookidoo button entities based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/cookidoo/const.py b/homeassistant/components/cookidoo/const.py
index 37c584404a0..0381e18725d 100644
--- a/homeassistant/components/cookidoo/const.py
+++ b/homeassistant/components/cookidoo/const.py
@@ -1,3 +1,9 @@
 """Constants for the Cookidoo integration."""
 
 DOMAIN = "cookidoo"
+
+SUBSCRIPTION_MAP = {
+    "NONE": "free",
+    "TRIAL": "trial",
+    "REGULAR": "premium",
+}
diff --git a/homeassistant/components/cookidoo/coordinator.py b/homeassistant/components/cookidoo/coordinator.py
index ad86d1fb9f1..2ce61306afe 100644
--- a/homeassistant/components/cookidoo/coordinator.py
+++ b/homeassistant/components/cookidoo/coordinator.py
@@ -13,6 +13,8 @@ from cookidoo_api import (
     CookidooException,
     CookidooIngredientItem,
     CookidooRequestException,
+    CookidooSubscription,
+    CookidooUserInfo,
 )
 
 from homeassistant.config_entries import ConfigEntry
@@ -34,12 +36,14 @@ class CookidooData:
 
     ingredient_items: list[CookidooIngredientItem]
     additional_items: list[CookidooAdditionalItem]
+    subscription: CookidooSubscription | None
 
 
 class CookidooDataUpdateCoordinator(DataUpdateCoordinator[CookidooData]):
     """A Cookidoo Data Update Coordinator."""
 
     config_entry: CookidooConfigEntry
+    user: CookidooUserInfo
 
     def __init__(
         self, hass: HomeAssistant, cookidoo: Cookidoo, entry: CookidooConfigEntry
@@ -57,6 +61,7 @@ class CookidooDataUpdateCoordinator(DataUpdateCoordinator[CookidooData]):
     async def _async_setup(self) -> None:
         try:
             await self.cookidoo.login()
+            self.user = await self.cookidoo.get_user_info()
         except CookidooRequestException as e:
             raise UpdateFailed(
                 translation_domain=DOMAIN,
@@ -75,6 +80,7 @@ class CookidooDataUpdateCoordinator(DataUpdateCoordinator[CookidooData]):
         try:
             ingredient_items = await self.cookidoo.get_ingredient_items()
             additional_items = await self.cookidoo.get_additional_items()
+            subscription = await self.cookidoo.get_active_subscription()
         except CookidooAuthException:
             try:
                 await self.cookidoo.refresh_token()
@@ -97,5 +103,7 @@ class CookidooDataUpdateCoordinator(DataUpdateCoordinator[CookidooData]):
             ) from e
 
         return CookidooData(
-            ingredient_items=ingredient_items, additional_items=additional_items
+            ingredient_items=ingredient_items,
+            additional_items=additional_items,
+            subscription=subscription,
         )
diff --git a/homeassistant/components/cookidoo/diagnostics.py b/homeassistant/components/cookidoo/diagnostics.py
new file mode 100644
index 00000000000..f981317df19
--- /dev/null
+++ b/homeassistant/components/cookidoo/diagnostics.py
@@ -0,0 +1,26 @@
+"""Diagnostics for the Cookidoo integration."""
+
+from dataclasses import asdict
+from typing import Any
+
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.const import CONF_PASSWORD
+from homeassistant.core import HomeAssistant
+
+from .coordinator import CookidooConfigEntry
+
+TO_REDACT = [
+    CONF_PASSWORD,
+]
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, entry: CookidooConfigEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+
+    return {
+        "entry_data": async_redact_data(entry.data, TO_REDACT),
+        "data": asdict(entry.runtime_data.data),
+        "user": asdict(entry.runtime_data.user),
+    }
diff --git a/homeassistant/components/cookidoo/icons.json b/homeassistant/components/cookidoo/icons.json
index 0e411a70fc2..cf4d9dc2858 100644
--- a/homeassistant/components/cookidoo/icons.json
+++ b/homeassistant/components/cookidoo/icons.json
@@ -1,5 +1,18 @@
 {
   "entity": {
+    "sensor": {
+      "subscription": {
+        "default": "mdi:account",
+        "state": {
+          "free": "mdi:account",
+          "trial": "mdi:account-question",
+          "regular": "mdi:account-star"
+        }
+      },
+      "expiration": {
+        "default": "mdi:account-reactivate"
+      }
+    },
     "button": {
       "todo_clear": {
         "default": "mdi:cart-off"
diff --git a/homeassistant/components/cookidoo/quality_scale.yaml b/homeassistant/components/cookidoo/quality_scale.yaml
index 95a35829079..209f2ce5686 100644
--- a/homeassistant/components/cookidoo/quality_scale.yaml
+++ b/homeassistant/components/cookidoo/quality_scale.yaml
@@ -63,7 +63,7 @@ rules:
   stale-devices:
     status: exempt
     comment: No stale entities possible
-  diagnostics: todo
+  diagnostics: done
   exception-translations: done
   icon-translations: done
   reconfiguration-flow: done
diff --git a/homeassistant/components/cookidoo/sensor.py b/homeassistant/components/cookidoo/sensor.py
new file mode 100644
index 00000000000..6df41383a75
--- /dev/null
+++ b/homeassistant/components/cookidoo/sensor.py
@@ -0,0 +1,111 @@
+"""Sensor platform for the Cookidoo integration."""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+from datetime import datetime
+from enum import StrEnum
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+)
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.typing import StateType
+from homeassistant.util import dt as dt_util
+
+from .const import SUBSCRIPTION_MAP
+from .coordinator import (
+    CookidooConfigEntry,
+    CookidooData,
+    CookidooDataUpdateCoordinator,
+)
+from .entity import CookidooBaseEntity
+
+PARALLEL_UPDATES = 0
+
+
+@dataclass(kw_only=True, frozen=True)
+class CookidooSensorEntityDescription(SensorEntityDescription):
+    """Cookidoo Sensor Description."""
+
+    value_fn: Callable[[CookidooData], StateType | datetime]
+
+
+class CookidooSensor(StrEnum):
+    """Cookidoo sensors."""
+
+    SUBSCRIPTION = "subscription"
+    EXPIRES = "expires"
+
+
+SENSOR_DESCRIPTIONS: tuple[CookidooSensorEntityDescription, ...] = (
+    CookidooSensorEntityDescription(
+        key=CookidooSensor.SUBSCRIPTION,
+        translation_key=CookidooSensor.SUBSCRIPTION,
+        value_fn=(
+            lambda data: SUBSCRIPTION_MAP[data.subscription.type]
+            if data.subscription
+            else SUBSCRIPTION_MAP["NONE"]
+        ),
+        entity_category=EntityCategory.DIAGNOSTIC,
+        options=list(SUBSCRIPTION_MAP.values()),
+        device_class=SensorDeviceClass.ENUM,
+    ),
+    CookidooSensorEntityDescription(
+        key=CookidooSensor.EXPIRES,
+        translation_key=CookidooSensor.EXPIRES,
+        value_fn=(
+            lambda data: dt_util.parse_datetime(data.subscription.expires)
+            if data.subscription
+            else None
+        ),
+        entity_category=EntityCategory.DIAGNOSTIC,
+        device_class=SensorDeviceClass.TIMESTAMP,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: CookidooConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the sensor platform."""
+    coordinator = config_entry.runtime_data
+
+    async_add_entities(
+        CookidooSensorEntity(
+            coordinator,
+            description,
+        )
+        for description in SENSOR_DESCRIPTIONS
+    )
+
+
+class CookidooSensorEntity(CookidooBaseEntity, SensorEntity):
+    """A sensor entity."""
+
+    entity_description: CookidooSensorEntityDescription
+
+    def __init__(
+        self,
+        coordinator: CookidooDataUpdateCoordinator,
+        entity_description: CookidooSensorEntityDescription,
+    ) -> None:
+        """Initialize the entity."""
+        super().__init__(coordinator)
+        self.entity_description = entity_description
+        self._attr_unique_id = (
+            f"{coordinator.config_entry.unique_id}_{self.entity_description.key}"
+        )
+
+    @property
+    def native_value(self) -> StateType | datetime:
+        """Return the state of the sensor."""
+
+        return self.entity_description.value_fn(self.coordinator.data)
diff --git a/homeassistant/components/cookidoo/strings.json b/homeassistant/components/cookidoo/strings.json
index 8a2a288d11b..ae384fb6635 100644
--- a/homeassistant/components/cookidoo/strings.json
+++ b/homeassistant/components/cookidoo/strings.json
@@ -49,6 +49,19 @@
     }
   },
   "entity": {
+    "sensor": {
+      "subscription": {
+        "name": "Subscription",
+        "state": {
+          "free": "Free",
+          "trial": "Trial",
+          "premium": "Premium"
+        }
+      },
+      "expires": {
+        "name": "Subscription expiration date"
+      }
+    },
     "button": {
       "todo_clear": {
         "name": "Clear shopping list and additional purchases"
diff --git a/homeassistant/components/cookidoo/todo.py b/homeassistant/components/cookidoo/todo.py
index 3d5264f4e01..c577b845657 100644
--- a/homeassistant/components/cookidoo/todo.py
+++ b/homeassistant/components/cookidoo/todo.py
@@ -18,7 +18,7 @@ from homeassistant.components.todo import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import CookidooConfigEntry, CookidooDataUpdateCoordinator
@@ -30,7 +30,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: CookidooConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the todo list from a config entry created in the integrations UI."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/coolmaster/binary_sensor.py b/homeassistant/components/coolmaster/binary_sensor.py
index ab2718b9352..5c1f19fd14c 100644
--- a/homeassistant/components/coolmaster/binary_sensor.py
+++ b/homeassistant/components/coolmaster/binary_sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import CoolmasterConfigEntry
 from .entity import CoolmasterEntity
@@ -18,7 +18,7 @@ from .entity import CoolmasterEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: CoolmasterConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the CoolMasterNet binary_sensor platform."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/coolmaster/button.py b/homeassistant/components/coolmaster/button.py
index 5463566d1ef..7cc8fc56c80 100644
--- a/homeassistant/components/coolmaster/button.py
+++ b/homeassistant/components/coolmaster/button.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import CoolmasterConfigEntry
 from .entity import CoolmasterEntity
@@ -14,7 +14,7 @@ from .entity import CoolmasterEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: CoolmasterConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the CoolMasterNet button platform."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/coolmaster/climate.py b/homeassistant/components/coolmaster/climate.py
index cd1659e1666..52fdfaaca3f 100644
--- a/homeassistant/components/coolmaster/climate.py
+++ b/homeassistant/components/coolmaster/climate.py
@@ -15,7 +15,7 @@ from homeassistant.components.climate import (
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_SUPPORTED_MODES
 from .coordinator import CoolmasterConfigEntry, CoolmasterDataUpdateCoordinator
@@ -39,7 +39,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: CoolmasterConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the CoolMasterNet climate platform."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/coolmaster/sensor.py b/homeassistant/components/coolmaster/sensor.py
index 2b835565bae..32dceb83c5f 100644
--- a/homeassistant/components/coolmaster/sensor.py
+++ b/homeassistant/components/coolmaster/sensor.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import CoolmasterConfigEntry
 from .entity import CoolmasterEntity
@@ -14,7 +14,7 @@ from .entity import CoolmasterEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: CoolmasterConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the CoolMasterNet sensor platform."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/counter/__init__.py b/homeassistant/components/counter/__init__.py
index f0a14aa7951..e84a92328b2 100644
--- a/homeassistant/components/counter/__init__.py
+++ b/homeassistant/components/counter/__init__.py
@@ -16,8 +16,7 @@ from homeassistant.const import (
     CONF_NAME,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import collection
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import collection, config_validation as cv
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.storage import Store
diff --git a/homeassistant/components/cover/device_action.py b/homeassistant/components/cover/device_action.py
index acef2cde4d8..a982e99776b 100644
--- a/homeassistant/components/cover/device_action.py
+++ b/homeassistant/components/cover/device_action.py
@@ -20,8 +20,7 @@ from homeassistant.const import (
     SERVICE_STOP_COVER,
 )
 from homeassistant.core import Context, HomeAssistant
-from homeassistant.helpers import entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.entity import get_supported_features
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
 
diff --git a/homeassistant/components/cover/reproduce_state.py b/homeassistant/components/cover/reproduce_state.py
index 307fe5f11bd..de3e0cebfb7 100644
--- a/homeassistant/components/cover/reproduce_state.py
+++ b/homeassistant/components/cover/reproduce_state.py
@@ -3,12 +3,14 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Iterable
+from collections.abc import Coroutine, Iterable
+from functools import partial
 import logging
-from typing import Any
+from typing import Any, Final
 
 from homeassistant.const import (
     ATTR_ENTITY_ID,
+    ATTR_SUPPORTED_FEATURES,
     SERVICE_CLOSE_COVER,
     SERVICE_CLOSE_COVER_TILT,
     SERVICE_OPEN_COVER,
@@ -16,7 +18,8 @@ from homeassistant.const import (
     SERVICE_SET_COVER_POSITION,
     SERVICE_SET_COVER_TILT_POSITION,
 )
-from homeassistant.core import Context, HomeAssistant, State
+from homeassistant.core import Context, HomeAssistant, ServiceResponse, State
+from homeassistant.util.enum import try_parse_enum
 
 from . import (
     ATTR_CURRENT_POSITION,
@@ -24,17 +27,140 @@ from . import (
     ATTR_POSITION,
     ATTR_TILT_POSITION,
     DOMAIN,
+    CoverEntityFeature,
     CoverState,
 )
 
 _LOGGER = logging.getLogger(__name__)
 
-VALID_STATES = {
-    CoverState.CLOSED,
-    CoverState.CLOSING,
-    CoverState.OPEN,
-    CoverState.OPENING,
-}
+
+OPENING_STATES = {CoverState.OPENING, CoverState.OPEN}
+CLOSING_STATES = {CoverState.CLOSING, CoverState.CLOSED}
+VALID_STATES: set[CoverState] = OPENING_STATES | CLOSING_STATES
+
+FULL_OPEN: Final = 100
+FULL_CLOSE: Final = 0
+
+
+def _determine_features(current_attrs: dict[str, Any]) -> CoverEntityFeature:
+    """Determine supported features based on current attributes."""
+    features = CoverEntityFeature(0)
+    if ATTR_CURRENT_POSITION in current_attrs:
+        features |= (
+            CoverEntityFeature.SET_POSITION
+            | CoverEntityFeature.OPEN
+            | CoverEntityFeature.CLOSE
+        )
+    if ATTR_CURRENT_TILT_POSITION in current_attrs:
+        features |= (
+            CoverEntityFeature.SET_TILT_POSITION
+            | CoverEntityFeature.OPEN_TILT
+            | CoverEntityFeature.CLOSE_TILT
+        )
+    if features == CoverEntityFeature(0):
+        features = CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE
+    return features
+
+
+async def _async_set_position(
+    service_call: partial[Coroutine[Any, Any, ServiceResponse]],
+    service_data: dict[str, Any],
+    features: CoverEntityFeature,
+    target_position: int,
+) -> bool:
+    """Set the position of the cover.
+
+    Returns True if the position was set, False if there is no
+    supported method for setting the position.
+    """
+    if target_position == FULL_CLOSE and CoverEntityFeature.CLOSE in features:
+        await service_call(SERVICE_CLOSE_COVER, service_data)
+    elif target_position == FULL_OPEN and CoverEntityFeature.OPEN in features:
+        await service_call(SERVICE_OPEN_COVER, service_data)
+    elif CoverEntityFeature.SET_POSITION in features:
+        await service_call(
+            SERVICE_SET_COVER_POSITION, service_data | {ATTR_POSITION: target_position}
+        )
+    else:
+        # Requested a position but the cover doesn't support it
+        return False
+    return True
+
+
+async def _async_set_tilt_position(
+    service_call: partial[Coroutine[Any, Any, ServiceResponse]],
+    service_data: dict[str, Any],
+    features: CoverEntityFeature,
+    target_tilt_position: int,
+) -> bool:
+    """Set the tilt position of the cover.
+
+    Returns True if the tilt position was set, False if there is no
+    supported method for setting the tilt position.
+    """
+    if target_tilt_position == FULL_CLOSE and CoverEntityFeature.CLOSE_TILT in features:
+        await service_call(SERVICE_CLOSE_COVER_TILT, service_data)
+    elif target_tilt_position == FULL_OPEN and CoverEntityFeature.OPEN_TILT in features:
+        await service_call(SERVICE_OPEN_COVER_TILT, service_data)
+    elif CoverEntityFeature.SET_TILT_POSITION in features:
+        await service_call(
+            SERVICE_SET_COVER_TILT_POSITION,
+            service_data | {ATTR_TILT_POSITION: target_tilt_position},
+        )
+    else:
+        # Requested a tilt position but the cover doesn't support it
+        return False
+    return True
+
+
+async def _async_close_cover(
+    service_call: partial[Coroutine[Any, Any, ServiceResponse]],
+    service_data: dict[str, Any],
+    features: CoverEntityFeature,
+    set_position: bool,
+    set_tilt: bool,
+) -> None:
+    """Close the cover if it was not closed by setting the position."""
+    if not set_position:
+        if CoverEntityFeature.CLOSE in features:
+            await service_call(SERVICE_CLOSE_COVER, service_data)
+        elif CoverEntityFeature.SET_POSITION in features:
+            await service_call(
+                SERVICE_SET_COVER_POSITION, service_data | {ATTR_POSITION: FULL_CLOSE}
+            )
+    if not set_tilt:
+        if CoverEntityFeature.CLOSE_TILT in features:
+            await service_call(SERVICE_CLOSE_COVER_TILT, service_data)
+        elif CoverEntityFeature.SET_TILT_POSITION in features:
+            await service_call(
+                SERVICE_SET_COVER_TILT_POSITION,
+                service_data | {ATTR_TILT_POSITION: FULL_CLOSE},
+            )
+
+
+async def _async_open_cover(
+    service_call: partial[Coroutine[Any, Any, ServiceResponse]],
+    service_data: dict[str, Any],
+    features: CoverEntityFeature,
+    set_position: bool,
+    set_tilt: bool,
+) -> None:
+    """Open the cover if it was not opened by setting the position."""
+    if not set_position:
+        if CoverEntityFeature.OPEN in features:
+            await service_call(SERVICE_OPEN_COVER, service_data)
+        elif CoverEntityFeature.SET_POSITION in features:
+            await service_call(
+                SERVICE_SET_COVER_POSITION, service_data | {ATTR_POSITION: FULL_OPEN}
+            )
+    if not set_tilt:
+        if CoverEntityFeature.OPEN_TILT in features:
+            await service_call(SERVICE_OPEN_COVER_TILT, service_data)
+        elif CoverEntityFeature.SET_TILT_POSITION in features:
+            await service_call(
+                SERVICE_SET_COVER_TILT_POSITION,
+                service_data | {ATTR_TILT_POSITION: FULL_OPEN},
+            )
 
 
 async def _async_reproduce_state(
@@ -45,74 +171,72 @@ async def _async_reproduce_state(
     reproduce_options: dict[str, Any] | None = None,
 ) -> None:
     """Reproduce a single state."""
-    if (cur_state := hass.states.get(state.entity_id)) is None:
-        _LOGGER.warning("Unable to find entity %s", state.entity_id)
+    entity_id = state.entity_id
+    if (cur_state := hass.states.get(entity_id)) is None:
+        _LOGGER.warning("Unable to find entity %s", entity_id)
         return
 
-    if state.state not in VALID_STATES:
-        _LOGGER.warning(
-            "Invalid state specified for %s: %s", state.entity_id, state.state
-        )
+    if (target_state := state.state) not in VALID_STATES:
+        _LOGGER.warning("Invalid state specified for %s: %s", entity_id, target_state)
         return
 
+    current_attrs = cur_state.attributes
+    target_attrs = state.attributes
+
+    current_position = current_attrs.get(ATTR_CURRENT_POSITION)
+    target_position = target_attrs.get(ATTR_CURRENT_POSITION)
+    position_matches = current_position == target_position
+
+    current_tilt_position = current_attrs.get(ATTR_CURRENT_TILT_POSITION)
+    target_tilt_position = target_attrs.get(ATTR_CURRENT_TILT_POSITION)
+    tilt_position_matches = current_tilt_position == target_tilt_position
+
+    state_matches = cur_state.state == target_state
     # Return if we are already at the right state.
-    if (
-        cur_state.state == state.state
-        and cur_state.attributes.get(ATTR_CURRENT_POSITION)
-        == state.attributes.get(ATTR_CURRENT_POSITION)
-        and cur_state.attributes.get(ATTR_CURRENT_TILT_POSITION)
-        == state.attributes.get(ATTR_CURRENT_TILT_POSITION)
-    ):
+    if state_matches and position_matches and tilt_position_matches:
         return
 
-    service_data = {ATTR_ENTITY_ID: state.entity_id}
-    service_data_tilting = {ATTR_ENTITY_ID: state.entity_id}
+    features = try_parse_enum(
+        CoverEntityFeature, current_attrs.get(ATTR_SUPPORTED_FEATURES)
+    )
+    if features is None:
+        # Backwards compatibility for integrations that
+        # don't set supported features since it previously
+        # worked without it.
+        _LOGGER.warning("Supported features is not set for %s", entity_id)
+        features = _determine_features(current_attrs)
 
-    if not (
-        cur_state.state == state.state
-        and cur_state.attributes.get(ATTR_CURRENT_POSITION)
-        == state.attributes.get(ATTR_CURRENT_POSITION)
-    ):
-        # Open/Close
-        if state.state in [CoverState.CLOSED, CoverState.CLOSING]:
-            service = SERVICE_CLOSE_COVER
-        elif state.state in [CoverState.OPEN, CoverState.OPENING]:
-            if (
-                ATTR_CURRENT_POSITION in cur_state.attributes
-                and ATTR_CURRENT_POSITION in state.attributes
-            ):
-                service = SERVICE_SET_COVER_POSITION
-                service_data[ATTR_POSITION] = state.attributes[ATTR_CURRENT_POSITION]
-            else:
-                service = SERVICE_OPEN_COVER
+    service_call = partial(
+        hass.services.async_call,
+        DOMAIN,
+        context=context,
+        blocking=True,
+    )
+    service_data = {ATTR_ENTITY_ID: entity_id}
 
-        await hass.services.async_call(
-            DOMAIN, service, service_data, context=context, blocking=True
+    set_position = (
+        not position_matches
+        and target_position is not None
+        and await _async_set_position(
+            service_call, service_data, features, target_position
+        )
+    )
+    set_tilt = (
+        not tilt_position_matches
+        and target_tilt_position is not None
+        and await _async_set_tilt_position(
+            service_call, service_data, features, target_tilt_position
+        )
+    )
+
+    if target_state in CLOSING_STATES:
+        await _async_close_cover(
+            service_call, service_data, features, set_position, set_tilt
         )
 
-    if (
-        ATTR_CURRENT_TILT_POSITION in state.attributes
-        and ATTR_CURRENT_TILT_POSITION in cur_state.attributes
-        and cur_state.attributes.get(ATTR_CURRENT_TILT_POSITION)
-        != state.attributes.get(ATTR_CURRENT_TILT_POSITION)
-    ):
-        # Tilt position
-        if state.attributes.get(ATTR_CURRENT_TILT_POSITION) == 100:
-            service_tilting = SERVICE_OPEN_COVER_TILT
-        elif state.attributes.get(ATTR_CURRENT_TILT_POSITION) == 0:
-            service_tilting = SERVICE_CLOSE_COVER_TILT
-        else:
-            service_tilting = SERVICE_SET_COVER_TILT_POSITION
-            service_data_tilting[ATTR_TILT_POSITION] = state.attributes[
-                ATTR_CURRENT_TILT_POSITION
-            ]
-
-        await hass.services.async_call(
-            DOMAIN,
-            service_tilting,
-            service_data_tilting,
-            context=context,
-            blocking=True,
+    elif target_state in OPENING_STATES:
+        await _async_open_cover(
+            service_call, service_data, features, set_position, set_tilt
         )
 
 
diff --git a/homeassistant/components/cppm_tracker/device_tracker.py b/homeassistant/components/cppm_tracker/device_tracker.py
index b6fdc0a8889..3b2682d4e32 100644
--- a/homeassistant/components/cppm_tracker/device_tracker.py
+++ b/homeassistant/components/cppm_tracker/device_tracker.py
@@ -15,7 +15,7 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_API_KEY, CONF_CLIENT_ID, CONF_HOST
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 SCAN_INTERVAL = timedelta(seconds=120)
diff --git a/homeassistant/components/cpuspeed/sensor.py b/homeassistant/components/cpuspeed/sensor.py
index 6a14f7ad13f..11f683b1434 100644
--- a/homeassistant/components/cpuspeed/sensor.py
+++ b/homeassistant/components/cpuspeed/sensor.py
@@ -9,7 +9,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfFrequency
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 
@@ -24,7 +24,7 @@ HZ_ADVERTISED = "hz_advertised"
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the platform from config_entry."""
     async_add_entities([CPUSpeedSensor(entry)], True)
diff --git a/homeassistant/components/crownstone/__init__.py b/homeassistant/components/crownstone/__init__.py
index e1443eb9516..8f5739f9172 100644
--- a/homeassistant/components/crownstone/__init__.py
+++ b/homeassistant/components/crownstone/__init__.py
@@ -2,25 +2,42 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
-from .entry_manager import CrownstoneEntryManager
+from .const import PLATFORMS
+from .entry_manager import CrownstoneConfigEntry, CrownstoneEntryManager
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: CrownstoneConfigEntry) -> bool:
     """Initiate setup for a Crownstone config entry."""
     manager = CrownstoneEntryManager(hass, entry)
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = manager
+    if not await manager.async_setup():
+        return False
 
-    return await manager.async_setup()
+    entry.runtime_data = manager
+
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    # HA specific listeners
+    entry.async_on_unload(entry.add_update_listener(async_update_listener))
+    entry.async_on_unload(
+        hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, manager.on_shutdown)
+    )
+
+    return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: CrownstoneConfigEntry) -> bool:
     """Unload a config entry."""
-    unload_ok: bool = await hass.data[DOMAIN][entry.entry_id].async_unload()
-    if len(hass.data[DOMAIN]) == 0:
-        hass.data.pop(DOMAIN)
-    return unload_ok
+    entry.runtime_data.async_unload()
+
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+
+async def async_update_listener(
+    hass: HomeAssistant, entry: CrownstoneConfigEntry
+) -> None:
+    """Handle options update."""
+    await hass.config_entries.async_reload(entry.entry_id)
diff --git a/homeassistant/components/crownstone/config_flow.py b/homeassistant/components/crownstone/config_flow.py
index 2a96098421a..5f5af4f51a4 100644
--- a/homeassistant/components/crownstone/config_flow.py
+++ b/homeassistant/components/crownstone/config_flow.py
@@ -16,7 +16,6 @@ import voluptuous as vol
 
 from homeassistant.components import usb
 from homeassistant.config_entries import (
-    ConfigEntry,
     ConfigEntryBaseFlow,
     ConfigFlow,
     ConfigFlowResult,
@@ -37,6 +36,7 @@ from .const import (
     MANUAL_PATH,
     REFRESH_LIST,
 )
+from .entry_manager import CrownstoneConfigEntry
 from .helpers import list_ports_as_str
 
 CONFIG_FLOW = "config_flow"
@@ -140,7 +140,7 @@ class CrownstoneConfigFlowHandler(BaseCrownstoneFlowHandler, ConfigFlow, domain=
     @staticmethod
     @callback
     def async_get_options_flow(
-        config_entry: ConfigEntry,
+        config_entry: CrownstoneConfigEntry,
     ) -> CrownstoneOptionsFlowHandler:
         """Return the Crownstone options."""
         return CrownstoneOptionsFlowHandler(config_entry)
@@ -210,7 +210,9 @@ class CrownstoneConfigFlowHandler(BaseCrownstoneFlowHandler, ConfigFlow, domain=
 class CrownstoneOptionsFlowHandler(BaseCrownstoneFlowHandler, OptionsFlow):
     """Handle Crownstone options."""
 
-    def __init__(self, config_entry: ConfigEntry) -> None:
+    config_entry: CrownstoneConfigEntry
+
+    def __init__(self, config_entry: CrownstoneConfigEntry) -> None:
         """Initialize Crownstone options."""
         super().__init__(OPTIONS_FLOW, self.async_create_new_entry)
         self.options = config_entry.options.copy()
@@ -219,9 +221,7 @@ class CrownstoneOptionsFlowHandler(BaseCrownstoneFlowHandler, OptionsFlow):
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Manage Crownstone options."""
-        self.cloud: CrownstoneCloud = self.hass.data[DOMAIN][
-            self.config_entry.entry_id
-        ].cloud
+        self.cloud = self.config_entry.runtime_data.cloud
 
         spheres = {sphere.name: sphere.cloud_id for sphere in self.cloud.cloud_data}
         usb_path = self.config_entry.options.get(CONF_USB_PATH)
diff --git a/homeassistant/components/crownstone/entry_manager.py b/homeassistant/components/crownstone/entry_manager.py
index efee05a19c8..e414e3c7055 100644
--- a/homeassistant/components/crownstone/entry_manager.py
+++ b/homeassistant/components/crownstone/entry_manager.py
@@ -16,7 +16,7 @@ from crownstone_uart.Exceptions import UartException
 
 from homeassistant.components import persistent_notification
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, EVENT_HOMEASSISTANT_STOP
+from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import aiohttp_client
@@ -26,7 +26,6 @@ from .const import (
     CONF_USB_PATH,
     CONF_USB_SPHERE,
     DOMAIN,
-    PLATFORMS,
     PROJECT_NAME,
     SSE_LISTENERS,
     UART_LISTENERS,
@@ -36,6 +35,8 @@ from .listeners import setup_sse_listeners, setup_uart_listeners
 
 _LOGGER = logging.getLogger(__name__)
 
+type CrownstoneConfigEntry = ConfigEntry[CrownstoneEntryManager]
+
 
 class CrownstoneEntryManager:
     """Manage a Crownstone config entry."""
@@ -44,7 +45,9 @@ class CrownstoneEntryManager:
     cloud: CrownstoneCloud
     sse: CrownstoneSSEAsync
 
-    def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: CrownstoneConfigEntry
+    ) -> None:
         """Initialize the hub."""
         self.hass = hass
         self.config_entry = config_entry
@@ -100,18 +103,6 @@ class CrownstoneEntryManager:
         # Makes HA aware of the Crownstone environment HA is placed in, a user can have multiple
         self.usb_sphere_id = self.config_entry.options[CONF_USB_SPHERE]
 
-        await self.hass.config_entries.async_forward_entry_setups(
-            self.config_entry, PLATFORMS
-        )
-
-        # HA specific listeners
-        self.config_entry.async_on_unload(
-            self.config_entry.add_update_listener(_async_update_listener)
-        )
-        self.config_entry.async_on_unload(
-            self.hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, self.on_shutdown)
-        )
-
         return True
 
     async def async_process_events(self, sse_client: CrownstoneSSEAsync) -> None:
@@ -161,11 +152,12 @@ class CrownstoneEntryManager:
 
         setup_uart_listeners(self)
 
-    async def async_unload(self) -> bool:
+    @callback
+    def async_unload(self) -> None:
         """Unload the current config entry."""
         # Authentication failed
         if self.cloud.cloud_data is None:
-            return True
+            return
 
         self.sse.close_client()
         for sse_unsub in self.listeners[SSE_LISTENERS]:
@@ -176,23 +168,9 @@ class CrownstoneEntryManager:
             for subscription_id in self.listeners[UART_LISTENERS]:
                 UartEventBus.unsubscribe(subscription_id)
 
-        unload_ok = await self.hass.config_entries.async_unload_platforms(
-            self.config_entry, PLATFORMS
-        )
-
-        if unload_ok:
-            self.hass.data[DOMAIN].pop(self.config_entry.entry_id)
-
-        return unload_ok
-
     @callback
     def on_shutdown(self, _: Event) -> None:
         """Close all IO connections."""
         self.sse.close_client()
         if self.uart:
             self.uart.stop()
-
-
-async def _async_update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
-    """Handle options update."""
-    await hass.config_entries.async_reload(entry.entry_id)
diff --git a/homeassistant/components/crownstone/light.py b/homeassistant/components/crownstone/light.py
index 16faa3a36d2..dc29ad93072 100644
--- a/homeassistant/components/crownstone/light.py
+++ b/homeassistant/components/crownstone/light.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from functools import partial
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 from crownstone_cloud.cloud_models.crownstones import Crownstone
 from crownstone_cloud.const import DIMMING_ABILITY
@@ -11,33 +11,29 @@ from crownstone_cloud.exceptions import CrownstoneAbilityError
 from crownstone_uart import CrownstoneUart
 
 from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CROWNSTONE_INCLUDE_TYPES,
     CROWNSTONE_SUFFIX,
-    DOMAIN,
     SIG_CROWNSTONE_STATE_UPDATE,
     SIG_UART_STATE_CHANGE,
 )
 from .entity import CrownstoneEntity
+from .entry_manager import CrownstoneConfigEntry
 from .helpers import map_from_to
 
-if TYPE_CHECKING:
-    from .entry_manager import CrownstoneEntryManager
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: CrownstoneConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up crownstones from a config entry."""
-    manager: CrownstoneEntryManager = hass.data[DOMAIN][config_entry.entry_id]
+    manager = config_entry.runtime_data
 
     entities: list[CrownstoneLightEntity] = []
 
diff --git a/homeassistant/components/cups/sensor.py b/homeassistant/components/cups/sensor.py
index 7f45e99f93d..701bad3f104 100644
--- a/homeassistant/components/cups/sensor.py
+++ b/homeassistant/components/cups/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import CONF_HOST, CONF_PORT, PERCENTAGE
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/currencylayer/sensor.py b/homeassistant/components/currencylayer/sensor.py
index 01dec10efe0..7c985b12ba4 100644
--- a/homeassistant/components/currencylayer/sensor.py
+++ b/homeassistant/components/currencylayer/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_API_KEY, CONF_BASE, CONF_NAME, CONF_QUOTE
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/daikin/climate.py b/homeassistant/components/daikin/climate.py
index 06ee0a03860..648a65c0d30 100644
--- a/homeassistant/components/daikin/climate.py
+++ b/homeassistant/components/daikin/climate.py
@@ -21,7 +21,7 @@ from homeassistant.components.climate import (
 )
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     ATTR_INSIDE_TEMPERATURE,
@@ -83,7 +83,7 @@ DAIKIN_ATTR_ADVANCED = "adv"
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DaikinConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Daikin climate based on config_entry."""
     daikin_api = entry.runtime_data
diff --git a/homeassistant/components/daikin/manifest.json b/homeassistant/components/daikin/manifest.json
index f794d97a9ba..86fc804ec92 100644
--- a/homeassistant/components/daikin/manifest.json
+++ b/homeassistant/components/daikin/manifest.json
@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/daikin",
   "iot_class": "local_polling",
   "loggers": ["pydaikin"],
-  "requirements": ["pydaikin==2.13.8"],
+  "requirements": ["pydaikin==2.14.1"],
   "zeroconf": ["_dkapi._tcp.local."]
 }
diff --git a/homeassistant/components/daikin/sensor.py b/homeassistant/components/daikin/sensor.py
index 982aac1f3f2..c1aa28fbe67 100644
--- a/homeassistant/components/daikin/sensor.py
+++ b/homeassistant/components/daikin/sensor.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     ATTR_COMPRESSOR_FREQUENCY,
@@ -134,7 +134,7 @@ SENSOR_TYPES: tuple[DaikinSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DaikinConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Daikin climate based on config_entry."""
     daikin_api = entry.runtime_data
diff --git a/homeassistant/components/daikin/switch.py b/homeassistant/components/daikin/switch.py
index 8a3a15d367f..20a56ac321c 100644
--- a/homeassistant/components/daikin/switch.py
+++ b/homeassistant/components/daikin/switch.py
@@ -6,7 +6,7 @@ from typing import Any
 
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import DaikinConfigEntry, DaikinCoordinator
 from .entity import DaikinEntity
@@ -19,7 +19,7 @@ DAIKIN_ATTR_MODE = "mode"
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DaikinConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Daikin climate based on config_entry."""
     daikin_api = entry.runtime_data
diff --git a/homeassistant/components/danfoss_air/__init__.py b/homeassistant/components/danfoss_air/__init__.py
index 5e4880705d5..d7c16d5da09 100644
--- a/homeassistant/components/danfoss_air/__init__.py
+++ b/homeassistant/components/danfoss_air/__init__.py
@@ -9,8 +9,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import Throttle
 
diff --git a/homeassistant/components/datadog/__init__.py b/homeassistant/components/datadog/__init__.py
index 2d550e48e2f..fa852399b09 100644
--- a/homeassistant/components/datadog/__init__.py
+++ b/homeassistant/components/datadog/__init__.py
@@ -14,8 +14,7 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import state as state_helper
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, state as state_helper
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/ddwrt/device_tracker.py b/homeassistant/components/ddwrt/device_tracker.py
index d72496e4d1e..e93b7e14e05 100644
--- a/homeassistant/components/ddwrt/device_tracker.py
+++ b/homeassistant/components/ddwrt/device_tracker.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     CONF_VERIFY_SSL,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/deako/light.py b/homeassistant/components/deako/light.py
index 75b01935c9a..12f42c36f29 100644
--- a/homeassistant/components/deako/light.py
+++ b/homeassistant/components/deako/light.py
@@ -7,7 +7,7 @@ from pydeako import Deako
 from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DeakoConfigEntry
 from .const import DOMAIN
@@ -20,7 +20,7 @@ MODEL_DIMMER = "dimmer"
 async def async_setup_entry(
     hass: HomeAssistant,
     config: DeakoConfigEntry,
-    add_entities: AddEntitiesCallback,
+    add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Configure the platform."""
     client = config.runtime_data
diff --git a/homeassistant/components/debugpy/__init__.py b/homeassistant/components/debugpy/__init__.py
index 5caf517a483..cef98211d9e 100644
--- a/homeassistant/components/debugpy/__init__.py
+++ b/homeassistant/components/debugpy/__init__.py
@@ -11,7 +11,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_HOST, CONF_PORT
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.service import async_register_admin_service
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/debugpy/manifest.json b/homeassistant/components/debugpy/manifest.json
index 078af8c67a5..21211d334df 100644
--- a/homeassistant/components/debugpy/manifest.json
+++ b/homeassistant/components/debugpy/manifest.json
@@ -6,5 +6,5 @@
   "integration_type": "service",
   "iot_class": "local_push",
   "quality_scale": "internal",
-  "requirements": ["debugpy==1.8.11"]
+  "requirements": ["debugpy==1.8.13"]
 }
diff --git a/homeassistant/components/deconz/__init__.py b/homeassistant/components/deconz/__init__.py
index 42c81e69740..7de091c1292 100644
--- a/homeassistant/components/deconz/__init__.py
+++ b/homeassistant/components/deconz/__init__.py
@@ -18,6 +18,8 @@ from .util import get_master_hub
 
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
+type DeconzConfigEntry = ConfigEntry[DeconzHub]
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up services."""
@@ -25,14 +27,14 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     return True
 
 
-async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_setup_entry(
+    hass: HomeAssistant, config_entry: DeconzConfigEntry
+) -> bool:
     """Set up a deCONZ bridge for a config entry.
 
     Load config, group, light and sensor data for server information.
     Start websocket for push notification of state changes from deCONZ.
     """
-    hass.data.setdefault(DOMAIN, {})
-
     if not config_entry.options:
         await async_update_master_hub(hass, config_entry)
 
@@ -43,7 +45,8 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     except AuthenticationRequired as err:
         raise ConfigEntryAuthFailed from err
 
-    hub = hass.data[DOMAIN][config_entry.entry_id] = DeconzHub(hass, config_entry, api)
+    hub = DeconzHub(hass, config_entry, api)
+    config_entry.runtime_data = hub
     await hub.async_update_device_registry()
 
     config_entry.async_on_unload(
@@ -62,32 +65,44 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, config_entry: DeconzConfigEntry
+) -> bool:
     """Unload deCONZ config entry."""
-    hub: DeconzHub = hass.data[DOMAIN].pop(config_entry.entry_id)
+    hub = config_entry.runtime_data
     async_unload_events(hub)
 
-    if hass.data[DOMAIN] and hub.master:
-        await async_update_master_hub(hass, config_entry)
-        new_master_hub = next(iter(hass.data[DOMAIN].values()))
-        await async_update_master_hub(hass, new_master_hub.config_entry)
+    other_loaded_entries: list[DeconzConfigEntry] = [
+        e
+        for e in hass.config_entries.async_loaded_entries(DOMAIN)
+        # exclude the config entry being unloaded
+        if e.entry_id != config_entry.entry_id
+    ]
+    if other_loaded_entries and hub.master:
+        await async_update_master_hub(hass, config_entry, master=False)
+        new_master_hub = next(iter(other_loaded_entries)).runtime_data
+        await async_update_master_hub(hass, new_master_hub.config_entry, master=True)
 
     return await hub.async_reset()
 
 
 async def async_update_master_hub(
-    hass: HomeAssistant, config_entry: ConfigEntry
+    hass: HomeAssistant,
+    config_entry: DeconzConfigEntry,
+    *,
+    master: bool | None = None,
 ) -> None:
     """Update master hub boolean.
 
     Called by setup_entry and unload_entry.
     Makes sure there is always one master available.
     """
-    try:
-        master_hub = get_master_hub(hass)
-        master = master_hub.config_entry == config_entry
-    except ValueError:
-        master = True
+    if master is None:
+        try:
+            master_hub = get_master_hub(hass)
+            master = master_hub.config_entry == config_entry
+        except ValueError:
+            master = True
 
     options = {**config_entry.options, CONF_MASTER_GATEWAY: master}
 
diff --git a/homeassistant/components/deconz/alarm_control_panel.py b/homeassistant/components/deconz/alarm_control_panel.py
index 678e441a7a9..85ca32d76e6 100644
--- a/homeassistant/components/deconz/alarm_control_panel.py
+++ b/homeassistant/components/deconz/alarm_control_panel.py
@@ -16,10 +16,10 @@ from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelState,
     CodeFormat,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import DeconzConfigEntry
 from .entity import DeconzDevice
 from .hub import DeconzHub
 
@@ -47,11 +47,11 @@ def get_alarm_system_id_for_unique_id(hub: DeconzHub, unique_id: str) -> str | N
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DeconzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the deCONZ alarm control panel devices."""
-    hub = DeconzHub.get_hub(hass, config_entry)
+    hub = config_entry.runtime_data
     hub.entities[ALARM_CONTROl_PANEL_DOMAIN] = set()
 
     @callback
diff --git a/homeassistant/components/deconz/binary_sensor.py b/homeassistant/components/deconz/binary_sensor.py
index a5496d3bc10..fcbb61a4e4f 100644
--- a/homeassistant/components/deconz/binary_sensor.py
+++ b/homeassistant/components/deconz/binary_sensor.py
@@ -23,11 +23,11 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import DeconzConfigEntry
 from .const import ATTR_DARK, ATTR_ON
 from .entity import DeconzDevice
 from .hub import DeconzHub
@@ -160,11 +160,11 @@ ENTITY_DESCRIPTIONS: tuple[DeconzBinarySensorDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DeconzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the deCONZ binary sensor."""
-    hub = DeconzHub.get_hub(hass, config_entry)
+    hub = config_entry.runtime_data
     hub.entities[BINARY_SENSOR_DOMAIN] = set()
 
     @callback
diff --git a/homeassistant/components/deconz/button.py b/homeassistant/components/deconz/button.py
index ecf28b5e22c..1d96f9867a7 100644
--- a/homeassistant/components/deconz/button.py
+++ b/homeassistant/components/deconz/button.py
@@ -14,11 +14,11 @@ from homeassistant.components.button import (
     ButtonEntity,
     ButtonEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import DeconzConfigEntry
 from .entity import DeconzDevice, DeconzSceneMixin
 from .hub import DeconzHub
 
@@ -46,11 +46,11 @@ ENTITY_DESCRIPTIONS = {
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DeconzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the deCONZ button entity."""
-    hub = DeconzHub.get_hub(hass, config_entry)
+    hub = config_entry.runtime_data
     hub.entities[BUTTON_DOMAIN] = set()
 
     @callback
diff --git a/homeassistant/components/deconz/climate.py b/homeassistant/components/deconz/climate.py
index 690f943379d..26597c195e7 100644
--- a/homeassistant/components/deconz/climate.py
+++ b/homeassistant/components/deconz/climate.py
@@ -28,11 +28,11 @@ from homeassistant.components.climate import (
     HVACAction,
     HVACMode,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import DeconzConfigEntry
 from .const import ATTR_LOCKED, ATTR_OFFSET, ATTR_VALVE
 from .entity import DeconzDevice
 from .hub import DeconzHub
@@ -76,11 +76,11 @@ DECONZ_TO_PRESET_MODE = {value: key for key, value in PRESET_MODE_TO_DECONZ.item
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DeconzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the deCONZ climate devices."""
-    hub = DeconzHub.get_hub(hass, config_entry)
+    hub = config_entry.runtime_data
     hub.entities[CLIMATE_DOMAIN] = set()
 
     @callback
diff --git a/homeassistant/components/deconz/cover.py b/homeassistant/components/deconz/cover.py
index 030c4b12709..d68e0fec09c 100644
--- a/homeassistant/components/deconz/cover.py
+++ b/homeassistant/components/deconz/cover.py
@@ -17,10 +17,10 @@ from homeassistant.components.cover import (
     CoverEntity,
     CoverEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import DeconzConfigEntry
 from .entity import DeconzDevice
 from .hub import DeconzHub
 
@@ -33,11 +33,11 @@ DECONZ_TYPE_TO_DEVICE_CLASS = {
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DeconzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up covers for deCONZ component."""
-    hub = DeconzHub.get_hub(hass, config_entry)
+    hub = config_entry.runtime_data
     hub.entities[COVER_DOMAIN] = set()
 
     @callback
diff --git a/homeassistant/components/deconz/device_trigger.py b/homeassistant/components/deconz/device_trigger.py
index 2aeeece3ac5..158ac391b9b 100644
--- a/homeassistant/components/deconz/device_trigger.py
+++ b/homeassistant/components/deconz/device_trigger.py
@@ -22,7 +22,7 @@ from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
 from homeassistant.helpers.typing import ConfigType
 
-from . import DOMAIN
+from . import DOMAIN, DeconzConfigEntry
 from .deconz_event import (
     CONF_DECONZ_EVENT,
     CONF_GESTURE,
@@ -31,7 +31,6 @@ from .deconz_event import (
     DeconzPresenceEvent,
     DeconzRelativeRotaryEvent,
 )
-from .hub import DeconzHub
 
 CONF_SUBTYPE = "subtype"
 
@@ -684,9 +683,9 @@ def _get_deconz_event_from_device(
     device: dr.DeviceEntry,
 ) -> DeconzAlarmEvent | DeconzEvent | DeconzPresenceEvent | DeconzRelativeRotaryEvent:
     """Resolve deconz event from device."""
-    hubs: dict[str, DeconzHub] = hass.data.get(DOMAIN, {})
-    for hub in hubs.values():
-        for deconz_event in hub.events:
+    entry: DeconzConfigEntry
+    for entry in hass.config_entries.async_loaded_entries(DOMAIN):
+        for deconz_event in entry.runtime_data.events:
             if device.id == deconz_event.device_id:
                 return deconz_event
 
diff --git a/homeassistant/components/deconz/diagnostics.py b/homeassistant/components/deconz/diagnostics.py
index fcd5dec120f..284b538d1dd 100644
--- a/homeassistant/components/deconz/diagnostics.py
+++ b/homeassistant/components/deconz/diagnostics.py
@@ -5,21 +5,20 @@ 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_UNIQUE_ID
 from homeassistant.core import HomeAssistant
 
-from .hub import DeconzHub
+from . import DeconzConfigEntry
 
 REDACT_CONFIG = {CONF_API_KEY, CONF_UNIQUE_ID}
 REDACT_DECONZ_CONFIG = {"bridgeid", "mac", "panid"}
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, config_entry: ConfigEntry
+    hass: HomeAssistant, config_entry: DeconzConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    hub = DeconzHub.get_hub(hass, config_entry)
+    hub = config_entry.runtime_data
     diag: dict[str, Any] = {}
 
     diag["config"] = async_redact_data(config_entry.as_dict(), REDACT_CONFIG)
diff --git a/homeassistant/components/deconz/fan.py b/homeassistant/components/deconz/fan.py
index 26e4d3328b8..324ada807e0 100644
--- a/homeassistant/components/deconz/fan.py
+++ b/homeassistant/components/deconz/fan.py
@@ -12,14 +12,14 @@ from homeassistant.components.fan import (
     FanEntity,
     FanEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     ordered_list_item_to_percentage,
     percentage_to_ordered_list_item,
 )
 
+from . import DeconzConfigEntry
 from .entity import DeconzDevice
 from .hub import DeconzHub
 
@@ -33,11 +33,11 @@ ORDERED_NAMED_FAN_SPEEDS: list[LightFanSpeed] = [
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DeconzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up fans for deCONZ component."""
-    hub = DeconzHub.get_hub(hass, config_entry)
+    hub = config_entry.runtime_data
     hub.entities[FAN_DOMAIN] = set()
 
     @callback
diff --git a/homeassistant/components/deconz/hub/api.py b/homeassistant/components/deconz/hub/api.py
index 916c34672d8..c00a2178eb0 100644
--- a/homeassistant/components/deconz/hub/api.py
+++ b/homeassistant/components/deconz/hub/api.py
@@ -3,10 +3,10 @@
 from __future__ import annotations
 
 import asyncio
+from typing import TYPE_CHECKING
 
 from pydeconz import DeconzSession, errors
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import aiohttp_client
 
@@ -14,9 +14,12 @@ from ..const import LOGGER
 from ..errors import AuthenticationRequired, CannotConnect
 from .config import DeconzConfig
 
+if TYPE_CHECKING:
+    from .. import DeconzConfigEntry
+
 
 async def get_deconz_api(
-    hass: HomeAssistant, config_entry: ConfigEntry
+    hass: HomeAssistant, config_entry: DeconzConfigEntry
 ) -> DeconzSession:
     """Create a gateway object and verify configuration."""
     session = aiohttp_client.async_get_clientsession(hass)
diff --git a/homeassistant/components/deconz/hub/config.py b/homeassistant/components/deconz/hub/config.py
index 06d2dc10542..5acbe816833 100644
--- a/homeassistant/components/deconz/hub/config.py
+++ b/homeassistant/components/deconz/hub/config.py
@@ -3,9 +3,8 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Self
+from typing import TYPE_CHECKING, Self
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_HOST, CONF_PORT
 
 from ..const import (
@@ -17,12 +16,15 @@ from ..const import (
     DEFAULT_ALLOW_NEW_DEVICES,
 )
 
+if TYPE_CHECKING:
+    from .. import DeconzConfigEntry
+
 
 @dataclass
 class DeconzConfig:
     """Represent a deCONZ config entry."""
 
-    entry: ConfigEntry
+    entry: DeconzConfigEntry
 
     host: str
     port: int
@@ -33,7 +35,7 @@ class DeconzConfig:
     allow_new_devices: bool
 
     @classmethod
-    def from_config_entry(cls, config_entry: ConfigEntry) -> Self:
+    def from_config_entry(cls, config_entry: DeconzConfigEntry) -> Self:
         """Create object from config entry."""
         config = config_entry.data
         options = config_entry.options
diff --git a/homeassistant/components/deconz/hub/hub.py b/homeassistant/components/deconz/hub/hub.py
index ff958bbda50..3020d624f97 100644
--- a/homeassistant/components/deconz/hub/hub.py
+++ b/homeassistant/components/deconz/hub/hub.py
@@ -11,7 +11,7 @@ from pydeconz.interfaces.api_handlers import APIHandler, GroupedAPIHandler
 from pydeconz.interfaces.groups import GroupHandler
 from pydeconz.models.event import EventType
 
-from homeassistant.config_entries import SOURCE_HASSIO, ConfigEntry
+from homeassistant.config_entries import SOURCE_HASSIO
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
@@ -26,6 +26,7 @@ from ..const import (
 from .config import DeconzConfig
 
 if TYPE_CHECKING:
+    from .. import DeconzConfigEntry
     from ..deconz_event import (
         DeconzAlarmEvent,
         DeconzEvent,
@@ -67,7 +68,7 @@ class DeconzHub:
     """Manages a single deCONZ gateway."""
 
     def __init__(
-        self, hass: HomeAssistant, config_entry: ConfigEntry, api: DeconzSession
+        self, hass: HomeAssistant, config_entry: DeconzConfigEntry, api: DeconzSession
     ) -> None:
         """Initialize the system."""
         self.hass = hass
@@ -94,12 +95,6 @@ class DeconzHub:
         self.deconz_groups: set[tuple[Callable[[EventType, str], None], str]] = set()
         self.ignored_devices: set[tuple[Callable[[EventType, str], None], str]] = set()
 
-    @callback
-    @staticmethod
-    def get_hub(hass: HomeAssistant, config_entry: ConfigEntry) -> DeconzHub:
-        """Return hub with a matching config entry ID."""
-        return cast(DeconzHub, hass.data[DECONZ_DOMAIN][config_entry.entry_id])
-
     @property
     def bridgeid(self) -> str:
         """Return the unique identifier of the gateway."""
@@ -208,7 +203,7 @@ class DeconzHub:
 
     @staticmethod
     async def async_config_entry_updated(
-        hass: HomeAssistant, config_entry: ConfigEntry
+        hass: HomeAssistant, config_entry: DeconzConfigEntry
     ) -> None:
         """Handle signals of config entry being updated.
 
@@ -217,11 +212,7 @@ class DeconzHub:
         Causes for this is either discovery updating host address or
         config entry options changing.
         """
-        if config_entry.entry_id not in hass.data[DECONZ_DOMAIN]:
-            # A race condition can occur if multiple config entries are
-            # unloaded in parallel
-            return
-        hub = DeconzHub.get_hub(hass, config_entry)
+        hub = config_entry.runtime_data
         previous_config = hub.config
         hub.config = DeconzConfig.from_config_entry(config_entry)
         if previous_config.host != hub.config.host:
diff --git a/homeassistant/components/deconz/light.py b/homeassistant/components/deconz/light.py
index d82c05f14eb..b61a1d39333 100644
--- a/homeassistant/components/deconz/light.py
+++ b/homeassistant/components/deconz/light.py
@@ -28,16 +28,16 @@ from homeassistant.components.light import (
     LightEntity,
     LightEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.color import (
     color_hs_to_xy,
     color_temperature_kelvin_to_mired,
     color_temperature_mired_to_kelvin,
 )
 
+from . import DeconzConfigEntry
 from .const import DOMAIN as DECONZ_DOMAIN, POWER_PLUGS
 from .entity import DeconzDevice
 from .hub import DeconzHub
@@ -141,11 +141,11 @@ def update_color_state(
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DeconzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the deCONZ lights and groups from a config entry."""
-    hub = DeconzHub.get_hub(hass, config_entry)
+    hub = config_entry.runtime_data
     hub.entities[LIGHT_DOMAIN] = set()
 
     @callback
diff --git a/homeassistant/components/deconz/lock.py b/homeassistant/components/deconz/lock.py
index 50375e99778..77b9ea435c7 100644
--- a/homeassistant/components/deconz/lock.py
+++ b/homeassistant/components/deconz/lock.py
@@ -9,21 +9,20 @@ from pydeconz.models.light.lock import Lock
 from pydeconz.models.sensor.door_lock import DoorLock
 
 from homeassistant.components.lock import DOMAIN as LOCK_DOMAIN, LockEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import DeconzConfigEntry
 from .entity import DeconzDevice
-from .hub import DeconzHub
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DeconzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up locks for deCONZ component."""
-    hub = DeconzHub.get_hub(hass, config_entry)
+    hub = config_entry.runtime_data
     hub.entities[LOCK_DOMAIN] = set()
 
     @callback
diff --git a/homeassistant/components/deconz/logbook.py b/homeassistant/components/deconz/logbook.py
index 3ef14eca657..28dfb603d8b 100644
--- a/homeassistant/components/deconz/logbook.py
+++ b/homeassistant/components/deconz/logbook.py
@@ -7,7 +7,7 @@ from collections.abc import Callable
 from homeassistant.components.logbook import LOGBOOK_ENTRY_MESSAGE, LOGBOOK_ENTRY_NAME
 from homeassistant.const import ATTR_DEVICE_ID, CONF_EVENT, CONF_ID
 from homeassistant.core import Event, HomeAssistant, callback
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import device_registry as dr
 
 from .const import CONF_GESTURE, DOMAIN as DECONZ_DOMAIN
 from .deconz_event import CONF_DECONZ_ALARM_EVENT, CONF_DECONZ_EVENT
diff --git a/homeassistant/components/deconz/manifest.json b/homeassistant/components/deconz/manifest.json
index 93ae8e392c8..5664e6abc8a 100644
--- a/homeassistant/components/deconz/manifest.json
+++ b/homeassistant/components/deconz/manifest.json
@@ -7,7 +7,7 @@
   "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["pydeconz"],
-  "requirements": ["pydeconz==118"],
+  "requirements": ["pydeconz==120"],
   "ssdp": [
     {
       "manufacturer": "Royal Philips Electronics",
diff --git a/homeassistant/components/deconz/number.py b/homeassistant/components/deconz/number.py
index 53461960573..d5ba8cc28d5 100644
--- a/homeassistant/components/deconz/number.py
+++ b/homeassistant/components/deconz/number.py
@@ -17,11 +17,11 @@ from homeassistant.components.number import (
     NumberEntity,
     NumberEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import DeconzConfigEntry
 from .entity import DeconzDevice
 from .hub import DeconzHub
 
@@ -69,11 +69,11 @@ ENTITY_DESCRIPTIONS: tuple[DeconzNumberDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DeconzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the deCONZ number entity."""
-    hub = DeconzHub.get_hub(hass, config_entry)
+    hub = config_entry.runtime_data
     hub.entities[NUMBER_DOMAIN] = set()
 
     @callback
diff --git a/homeassistant/components/deconz/scene.py b/homeassistant/components/deconz/scene.py
index 70b9f3f21b5..0aff2b3ca8c 100644
--- a/homeassistant/components/deconz/scene.py
+++ b/homeassistant/components/deconz/scene.py
@@ -7,21 +7,20 @@ from typing import Any
 from pydeconz.models.event import EventType
 
 from homeassistant.components.scene import DOMAIN as SCENE_DOMAIN, Scene
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import DeconzConfigEntry
 from .entity import DeconzSceneMixin
-from .hub import DeconzHub
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DeconzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up scenes for deCONZ integration."""
-    hub = DeconzHub.get_hub(hass, config_entry)
+    hub = config_entry.runtime_data
     hub.entities[SCENE_DOMAIN] = set()
 
     @callback
diff --git a/homeassistant/components/deconz/select.py b/homeassistant/components/deconz/select.py
index cbd96a4faf9..4d92b465cdc 100644
--- a/homeassistant/components/deconz/select.py
+++ b/homeassistant/components/deconz/select.py
@@ -12,13 +12,12 @@ from pydeconz.models.sensor.presence import (
 )
 
 from homeassistant.components.select import DOMAIN as SELECT_DOMAIN, SelectEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import DeconzConfigEntry
 from .entity import DeconzDevice
-from .hub import DeconzHub
 
 SENSITIVITY_TO_DECONZ = {
     "High": PresenceConfigSensitivity.HIGH.value,
@@ -30,11 +29,11 @@ DECONZ_TO_SENSITIVITY = {value: key for key, value in SENSITIVITY_TO_DECONZ.item
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DeconzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the deCONZ button entity."""
-    hub = DeconzHub.get_hub(hass, config_entry)
+    hub = config_entry.runtime_data
     hub.entities[SELECT_DOMAIN] = set()
 
     @callback
diff --git a/homeassistant/components/deconz/sensor.py b/homeassistant/components/deconz/sensor.py
index 241ba015c67..d318db6e2bf 100644
--- a/homeassistant/components/deconz/sensor.py
+++ b/homeassistant/components/deconz/sensor.py
@@ -34,7 +34,6 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_TEMPERATURE,
     ATTR_VOLTAGE,
@@ -51,10 +50,11 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
+from . import DeconzConfigEntry
 from .const import ATTR_DARK, ATTR_ON
 from .entity import DeconzDevice
 from .hub import DeconzHub
@@ -331,11 +331,11 @@ ENTITY_DESCRIPTIONS: tuple[DeconzSensorDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DeconzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the deCONZ sensors."""
-    hub = DeconzHub.get_hub(hass, config_entry)
+    hub = config_entry.runtime_data
     hub.entities[SENSOR_DOMAIN] = set()
 
     known_device_entities: dict[str, set[str]] = {
@@ -468,7 +468,7 @@ class DeconzBatteryTracker:
         sensor_id: str,
         hub: DeconzHub,
         description: DeconzSensorDescription,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up tracker."""
         self.sensor = hub.api.sensors[sensor_id]
diff --git a/homeassistant/components/deconz/services.py b/homeassistant/components/deconz/services.py
index 6127fe44308..1f032f3866a 100644
--- a/homeassistant/components/deconz/services.py
+++ b/homeassistant/components/deconz/services.py
@@ -1,5 +1,7 @@
 """deCONZ services."""
 
+from typing import TYPE_CHECKING
+
 from pydeconz.utils import normalize_bridge_id
 import voluptuous as vol
 
@@ -16,6 +18,10 @@ from .const import CONF_BRIDGE_ID, DOMAIN, LOGGER
 from .hub import DeconzHub
 from .util import get_master_hub
 
+if TYPE_CHECKING:
+    from . import DeconzConfigEntry
+
+
 DECONZ_SERVICES = "deconz_services"
 
 SERVICE_FIELD = "field"
@@ -65,7 +71,9 @@ def async_setup_services(hass: HomeAssistant) -> None:
             found_hub = False
             bridge_id = normalize_bridge_id(service_data[CONF_BRIDGE_ID])
 
-            for possible_hub in hass.data[DOMAIN].values():
+            entry: DeconzConfigEntry
+            for entry in hass.config_entries.async_loaded_entries(DOMAIN):
+                possible_hub = entry.runtime_data
                 if possible_hub.bridgeid == bridge_id:
                     hub = possible_hub
                     found_hub = True
diff --git a/homeassistant/components/deconz/siren.py b/homeassistant/components/deconz/siren.py
index 982a0bd1b9e..4c15cf8ccfe 100644
--- a/homeassistant/components/deconz/siren.py
+++ b/homeassistant/components/deconz/siren.py
@@ -13,21 +13,20 @@ from homeassistant.components.siren import (
     SirenEntity,
     SirenEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import DeconzConfigEntry
 from .entity import DeconzDevice
-from .hub import DeconzHub
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DeconzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sirens for deCONZ component."""
-    hub = DeconzHub.get_hub(hass, config_entry)
+    hub = config_entry.runtime_data
     hub.entities[SIREN_DOMAIN] = set()
 
     @callback
diff --git a/homeassistant/components/deconz/switch.py b/homeassistant/components/deconz/switch.py
index c79cd7b28db..49904642804 100644
--- a/homeassistant/components/deconz/switch.py
+++ b/homeassistant/components/deconz/switch.py
@@ -8,25 +8,24 @@ from pydeconz.models.event import EventType
 from pydeconz.models.light.light import Light
 
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN, SwitchEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import DeconzConfigEntry
 from .const import POWER_PLUGS
 from .entity import DeconzDevice
-from .hub import DeconzHub
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DeconzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switches for deCONZ component.
 
     Switches are based on the same device class as lights in deCONZ.
     """
-    hub = DeconzHub.get_hub(hass, config_entry)
+    hub = config_entry.runtime_data
     hub.entities[SWITCH_DOMAIN] = set()
 
     @callback
diff --git a/homeassistant/components/deconz/util.py b/homeassistant/components/deconz/util.py
index bcf338b2d6d..c4dc9df08ce 100644
--- a/homeassistant/components/deconz/util.py
+++ b/homeassistant/components/deconz/util.py
@@ -2,11 +2,16 @@
 
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from homeassistant.core import HomeAssistant, callback
 
 from .const import DOMAIN
 from .hub import DeconzHub
 
+if TYPE_CHECKING:
+    from . import DeconzConfigEntry
+
 
 def serial_from_unique_id(unique_id: str | None) -> str | None:
     """Get a device serial number from a unique ID, if possible."""
@@ -18,8 +23,9 @@ def serial_from_unique_id(unique_id: str | None) -> str | None:
 @callback
 def get_master_hub(hass: HomeAssistant) -> DeconzHub:
     """Return the gateway which is marked as master."""
+    entry: DeconzConfigEntry
     hub: DeconzHub
-    for hub in hass.data[DOMAIN].values():
-        if hub.master:
+    for entry in hass.config_entries.async_loaded_entries(DOMAIN):
+        if (hub := entry.runtime_data).master:
             return hub
     raise ValueError
diff --git a/homeassistant/components/decora/light.py b/homeassistant/components/decora/light.py
index cef7b98a2c1..a7d14b83aca 100644
--- a/homeassistant/components/decora/light.py
+++ b/homeassistant/components/decora/light.py
@@ -21,7 +21,7 @@ from homeassistant.components.light import (
     LightEntity,
 )
 from homeassistant.const import CONF_API_KEY, CONF_DEVICES, CONF_NAME
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 if TYPE_CHECKING:
     from homeassistant.core import HomeAssistant
diff --git a/homeassistant/components/decora_wifi/light.py b/homeassistant/components/decora_wifi/light.py
index 63ab5c2bf02..9ad1d9ced04 100644
--- a/homeassistant/components/decora_wifi/light.py
+++ b/homeassistant/components/decora_wifi/light.py
@@ -22,7 +22,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/delijn/sensor.py b/homeassistant/components/delijn/sensor.py
index 017a4c5b2fa..7f94f272c0d 100644
--- a/homeassistant/components/delijn/sensor.py
+++ b/homeassistant/components/delijn/sensor.py
@@ -16,8 +16,8 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_API_KEY
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/deluge/__init__.py b/homeassistant/components/deluge/__init__.py
index 9b07ae9c875..f9972570df3 100644
--- a/homeassistant/components/deluge/__init__.py
+++ b/homeassistant/components/deluge/__init__.py
@@ -7,7 +7,6 @@ from ssl import SSLError
 
 from deluge_client.client import DelugeRPCClient
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_HOST,
     CONF_PASSWORD,
@@ -19,12 +18,11 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 
 from .const import CONF_WEB_PORT
-from .coordinator import DelugeDataUpdateCoordinator
+from .coordinator import DelugeConfigEntry, DelugeDataUpdateCoordinator
 
 PLATFORMS = [Platform.SENSOR, Platform.SWITCH]
 
 _LOGGER = logging.getLogger(__name__)
-type DelugeConfigEntry = ConfigEntry[DelugeDataUpdateCoordinator]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: DelugeConfigEntry) -> bool:
diff --git a/homeassistant/components/deluge/config_flow.py b/homeassistant/components/deluge/config_flow.py
index d58f23464d1..78eced64c7c 100644
--- a/homeassistant/components/deluge/config_flow.py
+++ b/homeassistant/components/deluge/config_flow.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
+import logging
 from ssl import SSLError
 from typing import Any
 
@@ -11,7 +12,7 @@ import voluptuous as vol
 
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import (
     CONF_WEB_PORT,
@@ -21,6 +22,8 @@ from .const import (
     DOMAIN,
 )
 
+_LOGGER = logging.getLogger(__name__)
+
 
 class DelugeFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Deluge."""
@@ -86,7 +89,8 @@ class DelugeFlowHandler(ConfigFlow, domain=DOMAIN):
             await self.hass.async_add_executor_job(api.connect)
         except (ConnectionRefusedError, TimeoutError, SSLError):
             return "cannot_connect"
-        except Exception as ex:  # noqa: BLE001
+        except Exception as ex:
+            _LOGGER.exception("Unexpected error")
             if type(ex).__name__ == "BadLoginError":
                 return "invalid_auth"
             return "unknown"
diff --git a/homeassistant/components/deluge/coordinator.py b/homeassistant/components/deluge/coordinator.py
index 7f4bf9e884e..c5836243b9d 100644
--- a/homeassistant/components/deluge/coordinator.py
+++ b/homeassistant/components/deluge/coordinator.py
@@ -4,10 +4,11 @@ from __future__ import annotations
 
 from datetime import timedelta
 from ssl import SSLError
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 from deluge_client.client import DelugeRPCClient, FailedToReconnectException
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
@@ -15,8 +16,7 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .const import LOGGER, DelugeGetSessionStatusKeys
 
-if TYPE_CHECKING:
-    from . import DelugeConfigEntry
+type DelugeConfigEntry = ConfigEntry[DelugeDataUpdateCoordinator]
 
 
 class DelugeDataUpdateCoordinator(
@@ -33,11 +33,11 @@ class DelugeDataUpdateCoordinator(
         super().__init__(
             hass=hass,
             logger=LOGGER,
+            config_entry=entry,
             name=entry.title,
             update_interval=timedelta(seconds=30),
         )
         self.api = api
-        self.config_entry = entry
 
     async def _async_update_data(self) -> dict[Platform, dict[str, Any]]:
         """Get the latest data from Deluge and updates the state."""
diff --git a/homeassistant/components/deluge/sensor.py b/homeassistant/components/deluge/sensor.py
index 5ebf3d01eeb..d6809967703 100644
--- a/homeassistant/components/deluge/sensor.py
+++ b/homeassistant/components/deluge/sensor.py
@@ -14,12 +14,11 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import STATE_IDLE, Platform, UnitOfDataRate
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import DelugeConfigEntry
 from .const import DelugeGetSessionStatusKeys, DelugeSensorType
-from .coordinator import DelugeDataUpdateCoordinator
+from .coordinator import DelugeConfigEntry, DelugeDataUpdateCoordinator
 from .entity import DelugeEntity
 
 
@@ -117,7 +116,7 @@ SENSOR_TYPES: tuple[DelugeSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DelugeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Deluge sensor."""
     async_add_entities(
diff --git a/homeassistant/components/deluge/switch.py b/homeassistant/components/deluge/switch.py
index d81f02eee29..342442ee727 100644
--- a/homeassistant/components/deluge/switch.py
+++ b/homeassistant/components/deluge/switch.py
@@ -7,17 +7,16 @@ from typing import Any
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import DelugeConfigEntry
-from .coordinator import DelugeDataUpdateCoordinator
+from .coordinator import DelugeConfigEntry, DelugeDataUpdateCoordinator
 from .entity import DelugeEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DelugeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Deluge switch."""
     async_add_entities([DelugeSwitch(entry.runtime_data)])
diff --git a/homeassistant/components/demo/__init__.py b/homeassistant/components/demo/__init__.py
index d088dfb140b..dbc65119bfa 100644
--- a/homeassistant/components/demo/__init__.py
+++ b/homeassistant/components/demo/__init__.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import asyncio
 
-from homeassistant import config_entries, setup
+from homeassistant import config_entries, core as ha, setup
 from homeassistant.components import persistent_notification
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -13,7 +13,6 @@ from homeassistant.const import (
     Platform,
     UnitOfSoundPressure,
 )
-import homeassistant.core as ha
 from homeassistant.core import Event, HomeAssistant
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
@@ -49,6 +48,7 @@ COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM = [
     Platform.TIME,
     Platform.UPDATE,
     Platform.VACUUM,
+    Platform.VALVE,
     Platform.WATER_HEATER,
     Platform.WEATHER,
 ]
diff --git a/homeassistant/components/demo/air_quality.py b/homeassistant/components/demo/air_quality.py
index 551f2c8e88a..4e247812efe 100644
--- a/homeassistant/components/demo/air_quality.py
+++ b/homeassistant/components/demo/air_quality.py
@@ -5,13 +5,13 @@ from __future__ import annotations
 from homeassistant.components.air_quality import AirQualityEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Demo config entry."""
     async_add_entities(
diff --git a/homeassistant/components/demo/alarm_control_panel.py b/homeassistant/components/demo/alarm_control_panel.py
index d34830042d7..64474b4beb6 100644
--- a/homeassistant/components/demo/alarm_control_panel.py
+++ b/homeassistant/components/demo/alarm_control_panel.py
@@ -9,13 +9,13 @@ from homeassistant.components.manual.alarm_control_panel import ManualAlarm
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ARMING_TIME, CONF_DELAY_TIME, CONF_TRIGGER_TIME
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Demo config entry."""
     async_add_entities(
diff --git a/homeassistant/components/demo/binary_sensor.py b/homeassistant/components/demo/binary_sensor.py
index bc1d7b9daf2..b210e726205 100644
--- a/homeassistant/components/demo/binary_sensor.py
+++ b/homeassistant/components/demo/binary_sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 
@@ -17,7 +17,7 @@ from . import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the demo binary sensor platform."""
     async_add_entities(
diff --git a/homeassistant/components/demo/button.py b/homeassistant/components/demo/button.py
index a3b8dd9ff0c..25212f38989 100644
--- a/homeassistant/components/demo/button.py
+++ b/homeassistant/components/demo/button.py
@@ -7,7 +7,7 @@ from homeassistant.components.button import ButtonEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 
@@ -15,7 +15,7 @@ from . import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the demo button platform."""
     async_add_entities(
diff --git a/homeassistant/components/demo/calendar.py b/homeassistant/components/demo/calendar.py
index d513bc38250..b0e82acfa61 100644
--- a/homeassistant/components/demo/calendar.py
+++ b/homeassistant/components/demo/calendar.py
@@ -7,14 +7,14 @@ import datetime
 from homeassistant.components.calendar import CalendarEntity, CalendarEvent
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Demo Calendar config entry."""
     async_add_entities(
diff --git a/homeassistant/components/demo/camera.py b/homeassistant/components/demo/camera.py
index 9fae6468207..69ba7efda01 100644
--- a/homeassistant/components/demo/camera.py
+++ b/homeassistant/components/demo/camera.py
@@ -7,13 +7,13 @@ from pathlib import Path
 from homeassistant.components.camera import Camera, CameraEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Demo config entry."""
     async_add_entities(
diff --git a/homeassistant/components/demo/climate.py b/homeassistant/components/demo/climate.py
index d5b763caa5a..f68714695f3 100644
--- a/homeassistant/components/demo/climate.py
+++ b/homeassistant/components/demo/climate.py
@@ -17,7 +17,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 
@@ -27,7 +27,7 @@ SUPPORT_FLAGS = ClimateEntityFeature(0)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the demo climate platform."""
     async_add_entities(
diff --git a/homeassistant/components/demo/config_flow.py b/homeassistant/components/demo/config_flow.py
index 53c1678aa81..6f8ee26f511 100644
--- a/homeassistant/components/demo/config_flow.py
+++ b/homeassistant/components/demo/config_flow.py
@@ -13,7 +13,7 @@ from homeassistant.config_entries import (
     OptionsFlow,
 )
 from homeassistant.core import callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from . import DOMAIN
 
diff --git a/homeassistant/components/demo/cover.py b/homeassistant/components/demo/cover.py
index adddb6a3a7d..ed13f24cfd7 100644
--- a/homeassistant/components/demo/cover.py
+++ b/homeassistant/components/demo/cover.py
@@ -15,7 +15,7 @@ from homeassistant.components.cover import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_track_utc_time_change
 
 from . import DOMAIN
@@ -24,7 +24,7 @@ from . import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the demo cover platform."""
     async_add_entities(
diff --git a/homeassistant/components/demo/date.py b/homeassistant/components/demo/date.py
index b67c4248123..875075a381d 100644
--- a/homeassistant/components/demo/date.py
+++ b/homeassistant/components/demo/date.py
@@ -8,7 +8,7 @@ from homeassistant.components.date import DateEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 
@@ -16,7 +16,7 @@ from . import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the demo date platform."""
     async_add_entities(
diff --git a/homeassistant/components/demo/datetime.py b/homeassistant/components/demo/datetime.py
index 920bc14cdc5..353ed8311bb 100644
--- a/homeassistant/components/demo/datetime.py
+++ b/homeassistant/components/demo/datetime.py
@@ -8,7 +8,7 @@ from homeassistant.components.datetime import DateTimeEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 
@@ -16,7 +16,7 @@ from . import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the demo datetime platform."""
     async_add_entities(
diff --git a/homeassistant/components/demo/event.py b/homeassistant/components/demo/event.py
index c58b5f5fc2e..f593a833123 100644
--- a/homeassistant/components/demo/event.py
+++ b/homeassistant/components/demo/event.py
@@ -6,7 +6,7 @@ from homeassistant.components.event import EventDeviceClass, EventEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 
@@ -14,7 +14,7 @@ from . import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the demo event platform."""
     async_add_entities([DemoEvent()])
diff --git a/homeassistant/components/demo/fan.py b/homeassistant/components/demo/fan.py
index 42e7f9e2434..9f48628688e 100644
--- a/homeassistant/components/demo/fan.py
+++ b/homeassistant/components/demo/fan.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 PRESET_MODE_AUTO = "auto"
 PRESET_MODE_SMART = "smart"
@@ -29,7 +29,7 @@ LIMITED_SUPPORT = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Demo config entry."""
     async_add_entities(
diff --git a/homeassistant/components/demo/humidifier.py b/homeassistant/components/demo/humidifier.py
index 7245d96eaf0..2bdbd22eef8 100644
--- a/homeassistant/components/demo/humidifier.py
+++ b/homeassistant/components/demo/humidifier.py
@@ -12,7 +12,7 @@ from homeassistant.components.humidifier import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 SUPPORT_FLAGS = HumidifierEntityFeature(0)
 
@@ -20,7 +20,7 @@ SUPPORT_FLAGS = HumidifierEntityFeature(0)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Demo humidifier devices config entry."""
     async_add_entities(
diff --git a/homeassistant/components/demo/light.py b/homeassistant/components/demo/light.py
index ec98a056b3e..c00f2b42828 100644
--- a/homeassistant/components/demo/light.py
+++ b/homeassistant/components/demo/light.py
@@ -22,7 +22,7 @@ from homeassistant.components.light import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 
@@ -39,7 +39,7 @@ SUPPORT_DEMO_HS_WHITE = {ColorMode.HS, ColorMode.WHITE}
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the demo light platform."""
     async_add_entities(
diff --git a/homeassistant/components/demo/lock.py b/homeassistant/components/demo/lock.py
index 1f25445af7f..081e1cf1d53 100644
--- a/homeassistant/components/demo/lock.py
+++ b/homeassistant/components/demo/lock.py
@@ -8,7 +8,7 @@ from typing import Any
 from homeassistant.components.lock import LockEntity, LockEntityFeature, LockState
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 LOCK_UNLOCK_DELAY = 2  # Used to give a realistic lock/unlock experience in frontend
 
@@ -16,7 +16,7 @@ LOCK_UNLOCK_DELAY = 2  # Used to give a realistic lock/unlock experience in fron
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Demo config entry."""
     async_add_entities(
diff --git a/homeassistant/components/demo/media_player.py b/homeassistant/components/demo/media_player.py
index 8ce77bcd615..de2a2cb3937 100644
--- a/homeassistant/components/demo/media_player.py
+++ b/homeassistant/components/demo/media_player.py
@@ -15,14 +15,14 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Demo config entry."""
     async_add_entities(
diff --git a/homeassistant/components/demo/notify.py b/homeassistant/components/demo/notify.py
index 7524517e6e8..d26e13cc541 100644
--- a/homeassistant/components/demo/notify.py
+++ b/homeassistant/components/demo/notify.py
@@ -10,7 +10,7 @@ from homeassistant.components.notify import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 EVENT_NOTIFY = "notify"
 
@@ -18,7 +18,7 @@ EVENT_NOTIFY = "notify"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the demo entity platform."""
     async_add_entities([DemoNotifyEntity(unique_id="notify", device_name="Notifier")])
diff --git a/homeassistant/components/demo/number.py b/homeassistant/components/demo/number.py
index 8c3f5ec3477..c7b62bdc3e0 100644
--- a/homeassistant/components/demo/number.py
+++ b/homeassistant/components/demo/number.py
@@ -7,7 +7,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 
@@ -15,7 +15,7 @@ from . import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the demo number platform."""
     async_add_entities(
diff --git a/homeassistant/components/demo/remote.py b/homeassistant/components/demo/remote.py
index 774f375dd27..ffd6fd6e609 100644
--- a/homeassistant/components/demo/remote.py
+++ b/homeassistant/components/demo/remote.py
@@ -9,13 +9,13 @@ from homeassistant.components.remote import RemoteEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import DEVICE_DEFAULT_NAME
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Demo config entry."""
     async_add_entities(
diff --git a/homeassistant/components/demo/select.py b/homeassistant/components/demo/select.py
index ff664a31d2f..fce90bc9b4f 100644
--- a/homeassistant/components/demo/select.py
+++ b/homeassistant/components/demo/select.py
@@ -6,7 +6,7 @@ from homeassistant.components.select import SelectEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 
@@ -14,7 +14,7 @@ from . import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the demo select platform."""
     async_add_entities(
diff --git a/homeassistant/components/demo/sensor.py b/homeassistant/components/demo/sensor.py
index 0c61faae00e..ae9ff26eca9 100644
--- a/homeassistant/components/demo/sensor.py
+++ b/homeassistant/components/demo/sensor.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_track_time_interval
 
 from . import DOMAIN
@@ -33,7 +33,7 @@ from . import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the demo sensor platform."""
     async_add_entities(
diff --git a/homeassistant/components/demo/siren.py b/homeassistant/components/demo/siren.py
index 235d98f5875..ddaa5101e0f 100644
--- a/homeassistant/components/demo/siren.py
+++ b/homeassistant/components/demo/siren.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.siren import SirenEntity, SirenEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 SUPPORT_FLAGS = SirenEntityFeature.TURN_OFF | SirenEntityFeature.TURN_ON
 
@@ -15,7 +15,7 @@ SUPPORT_FLAGS = SirenEntityFeature.TURN_OFF | SirenEntityFeature.TURN_ON
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Demo siren devices config entry."""
     async_add_entities(
diff --git a/homeassistant/components/demo/stt.py b/homeassistant/components/demo/stt.py
index 95eebe44588..1757e4a8b88 100644
--- a/homeassistant/components/demo/stt.py
+++ b/homeassistant/components/demo/stt.py
@@ -17,7 +17,7 @@ from homeassistant.components.stt import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 SUPPORT_LANGUAGES = ["en", "de"]
 
@@ -25,7 +25,7 @@ SUPPORT_LANGUAGES = ["en", "de"]
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Demo speech platform via config entry."""
     async_add_entities([DemoProviderEntity()])
diff --git a/homeassistant/components/demo/switch.py b/homeassistant/components/demo/switch.py
index 5dc05398bf1..dd288f285af 100644
--- a/homeassistant/components/demo/switch.py
+++ b/homeassistant/components/demo/switch.py
@@ -8,7 +8,7 @@ from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 
@@ -16,7 +16,7 @@ from . import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the demo switch platform."""
     async_add_entities(
diff --git a/homeassistant/components/demo/text.py b/homeassistant/components/demo/text.py
index 1730f414fdf..3219821ef98 100644
--- a/homeassistant/components/demo/text.py
+++ b/homeassistant/components/demo/text.py
@@ -6,7 +6,7 @@ from homeassistant.components.text import TextEntity, TextMode
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 
@@ -14,7 +14,7 @@ from . import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Demo text platform."""
     async_add_entities(
diff --git a/homeassistant/components/demo/time.py b/homeassistant/components/demo/time.py
index f5f0322f9be..296155e9bec 100644
--- a/homeassistant/components/demo/time.py
+++ b/homeassistant/components/demo/time.py
@@ -8,7 +8,7 @@ from homeassistant.components.time import TimeEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 
@@ -16,7 +16,7 @@ from . import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the demo time platform."""
     async_add_entities([DemoTime("time", "Time", time(12, 0, 0), False)])
diff --git a/homeassistant/components/demo/update.py b/homeassistant/components/demo/update.py
index 3fa037f6b02..916646416e9 100644
--- a/homeassistant/components/demo/update.py
+++ b/homeassistant/components/demo/update.py
@@ -13,7 +13,7 @@ from homeassistant.components.update import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 
@@ -23,7 +23,7 @@ FAKE_INSTALL_SLEEP_TIME = 0.5
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up demo update platform."""
     async_add_entities(
diff --git a/homeassistant/components/demo/vacuum.py b/homeassistant/components/demo/vacuum.py
index 3dd945ab82e..38019cff3c1 100644
--- a/homeassistant/components/demo/vacuum.py
+++ b/homeassistant/components/demo/vacuum.py
@@ -14,7 +14,7 @@ from homeassistant.components.vacuum import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import event
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 SUPPORT_MINIMAL_SERVICES = VacuumEntityFeature.TURN_ON | VacuumEntityFeature.TURN_OFF
 
@@ -63,7 +63,7 @@ DEMO_VACUUM_NONE = "4_Fourth_floor"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Demo config entry."""
     async_add_entities(
diff --git a/homeassistant/components/demo/valve.py b/homeassistant/components/demo/valve.py
new file mode 100644
index 00000000000..03f0123dd96
--- /dev/null
+++ b/homeassistant/components/demo/valve.py
@@ -0,0 +1,89 @@
+"""Demo valve platform that implements valves."""
+
+from __future__ import annotations
+
+import asyncio
+from typing import Any
+
+from homeassistant.components.valve import ValveEntity, ValveEntityFeature, ValveState
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+OPEN_CLOSE_DELAY = 2  # Used to give a realistic open/close experience in frontend
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the Demo config entry."""
+    async_add_entities(
+        [
+            DemoValve("Front Garden", ValveState.OPEN),
+            DemoValve("Orchard", ValveState.CLOSED),
+        ]
+    )
+
+
+class DemoValve(ValveEntity):
+    """Representation of a Demo valve."""
+
+    _attr_should_poll = False
+
+    def __init__(
+        self,
+        name: str,
+        state: str,
+        moveable: bool = True,
+    ) -> None:
+        """Initialize the valve."""
+        self._attr_name = name
+        if moveable:
+            self._attr_supported_features = (
+                ValveEntityFeature.OPEN | ValveEntityFeature.CLOSE
+            )
+        self._state = state
+        self._moveable = moveable
+
+    @property
+    def is_open(self) -> bool:
+        """Return true if valve is open."""
+        return self._state == ValveState.OPEN
+
+    @property
+    def is_opening(self) -> bool:
+        """Return true if valve is opening."""
+        return self._state == ValveState.OPENING
+
+    @property
+    def is_closing(self) -> bool:
+        """Return true if valve is closing."""
+        return self._state == ValveState.CLOSING
+
+    @property
+    def is_closed(self) -> bool:
+        """Return true if valve is closed."""
+        return self._state == ValveState.CLOSED
+
+    @property
+    def reports_position(self) -> bool:
+        """Return True if entity reports position, False otherwise."""
+        return False
+
+    async def async_open_valve(self, **kwargs: Any) -> None:
+        """Open the valve."""
+        self._state = ValveState.OPENING
+        self.async_write_ha_state()
+        await asyncio.sleep(OPEN_CLOSE_DELAY)
+        self._state = ValveState.OPEN
+        self.async_write_ha_state()
+
+    async def async_close_valve(self, **kwargs: Any) -> None:
+        """Close the valve."""
+        self._state = ValveState.CLOSING
+        self.async_write_ha_state()
+        await asyncio.sleep(OPEN_CLOSE_DELAY)
+        self._state = ValveState.CLOSED
+        self.async_write_ha_state()
diff --git a/homeassistant/components/demo/water_heater.py b/homeassistant/components/demo/water_heater.py
index f295780b190..9e12bb9e1d5 100644
--- a/homeassistant/components/demo/water_heater.py
+++ b/homeassistant/components/demo/water_heater.py
@@ -11,7 +11,7 @@ from homeassistant.components.water_heater import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 SUPPORT_FLAGS_HEATER = (
     WaterHeaterEntityFeature.TARGET_TEMPERATURE
@@ -24,16 +24,21 @@ SUPPORT_FLAGS_HEATER = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Demo config entry."""
     async_add_entities(
         [
             DemoWaterHeater(
-                "Demo Water Heater", 119, UnitOfTemperature.FAHRENHEIT, False, "eco"
+                "Demo Water Heater", 119, UnitOfTemperature.FAHRENHEIT, False, "eco", 1
             ),
             DemoWaterHeater(
-                "Demo Water Heater Celsius", 45, UnitOfTemperature.CELSIUS, True, "eco"
+                "Demo Water Heater Celsius",
+                45,
+                UnitOfTemperature.CELSIUS,
+                True,
+                "eco",
+                1,
             ),
         ]
     )
@@ -52,6 +57,7 @@ class DemoWaterHeater(WaterHeaterEntity):
         unit_of_measurement: str,
         away: bool,
         current_operation: str,
+        target_temperature_step: float,
     ) -> None:
         """Initialize the water_heater device."""
         self._attr_name = name
@@ -74,6 +80,7 @@ class DemoWaterHeater(WaterHeaterEntity):
             "gas",
             "off",
         ]
+        self._attr_target_temperature_step = target_temperature_step
 
     def set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperatures."""
diff --git a/homeassistant/components/demo/weather.py b/homeassistant/components/demo/weather.py
index fbc2b660efb..d1f829fee1b 100644
--- a/homeassistant/components/demo/weather.py
+++ b/homeassistant/components/demo/weather.py
@@ -26,9 +26,9 @@ from homeassistant.components.weather import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfPressure, UnitOfSpeed, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_track_time_interval
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 CONDITION_CLASSES: dict[str, list[str]] = {
     ATTR_CONDITION_CLOUDY: [],
@@ -58,7 +58,7 @@ WEATHER_UPDATE_INTERVAL = timedelta(minutes=30)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Demo config entry."""
     async_add_entities(
diff --git a/homeassistant/components/denon/media_player.py b/homeassistant/components/denon/media_player.py
index 2f46cd42294..9e7cebe0702 100644
--- a/homeassistant/components/denon/media_player.py
+++ b/homeassistant/components/denon/media_player.py
@@ -15,7 +15,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.const import CONF_HOST, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/denonavr/media_player.py b/homeassistant/components/denonavr/media_player.py
index 818d530ddab..a67c76f6525 100644
--- a/homeassistant/components/denonavr/media_player.py
+++ b/homeassistant/components/denonavr/media_player.py
@@ -39,7 +39,7 @@ from homeassistant.const import ATTR_COMMAND, CONF_HOST, CONF_MODEL, CONF_TYPE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DenonavrConfigEntry
 from .const import (
@@ -109,7 +109,7 @@ DENON_STATE_MAPPING = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: DenonavrConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the DenonAVR receiver from a config entry."""
     entities = []
diff --git a/homeassistant/components/denonavr/strings.json b/homeassistant/components/denonavr/strings.json
index 6c055c5932a..192ab3bd71f 100644
--- a/homeassistant/components/denonavr/strings.json
+++ b/homeassistant/components/denonavr/strings.json
@@ -23,14 +23,14 @@
       }
     },
     "error": {
-      "discovery_error": "Failed to discover a Denon AVR Network Receiver"
+      "discovery_error": "Failed to discover a Denon AVR network receiver"
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
-      "cannot_connect": "Failed to connect, please try again, disconnecting mains power and ethernet cables and reconnecting them may help",
-      "not_denonavr_manufacturer": "Not a Denon AVR Network Receiver, discovered manufacturer did not match",
-      "not_denonavr_missing": "Not a Denon AVR Network Receiver, discovery information not complete"
+      "cannot_connect": "Failed to connect, please try again, disconnecting mains power and Ethernet cables and reconnecting them may help",
+      "not_denonavr_manufacturer": "Not a Denon AVR network receiver, discovered manufacturer did not match",
+      "not_denonavr_missing": "Not a Denon AVR network receiver, discovery information not complete"
     }
   },
   "options": {
@@ -64,7 +64,7 @@
       "fields": {
         "dynamic_eq": {
           "name": "Dynamic equalizer",
-          "description": "True/false for enable/disable."
+          "description": "Whether DynamicEQ should be enabled or disabled."
         }
       }
     },
diff --git a/homeassistant/components/derivative/sensor.py b/homeassistant/components/derivative/sensor.py
index 988da5e938b..f6c2b45ef9c 100644
--- a/homeassistant/components/derivative/sensor.py
+++ b/homeassistant/components/derivative/sensor.py
@@ -24,12 +24,25 @@ from homeassistant.const import (
     STATE_UNKNOWN,
     UnitOfTime,
 )
-from homeassistant.core import Event, EventStateChangedData, HomeAssistant, callback
+from homeassistant.core import (
+    Event,
+    EventStateChangedData,
+    EventStateReportedData,
+    HomeAssistant,
+    State,
+    callback,
+)
 from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.device import async_device_info_to_link_from_entity
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.event import async_track_state_change_event
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
+from homeassistant.helpers.event import (
+    async_track_state_change_event,
+    async_track_state_report_event,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import (
@@ -83,7 +96,7 @@ PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize Derivative config entry."""
     registry = er.async_get(hass)
@@ -197,13 +210,33 @@ class DerivativeSensor(RestoreSensor, SensorEntity):
                 _LOGGER.warning("Could not restore last state: %s", err)
 
         @callback
-        def calc_derivative(event: Event[EventStateChangedData]) -> None:
+        def on_state_reported(event: Event[EventStateReportedData]) -> None:
+            """Handle constant sensor state."""
+            if self._attr_native_value == Decimal(0):
+                # If the derivative is zero, and the source sensor hasn't
+                # changed state, then we know it will still be zero.
+                return
+            new_state = event.data["new_state"]
+            if new_state is not None:
+                calc_derivative(
+                    new_state, new_state.state, event.data["old_last_reported"]
+                )
+
+        @callback
+        def on_state_changed(event: Event[EventStateChangedData]) -> None:
+            """Handle changed sensor state."""
+            new_state = event.data["new_state"]
+            old_state = event.data["old_state"]
+            if new_state is not None and old_state is not None:
+                calc_derivative(new_state, old_state.state, old_state.last_reported)
+
+        def calc_derivative(
+            new_state: State, old_value: str, old_last_reported: datetime
+        ) -> None:
             """Handle the sensor state changes."""
-            if (
-                (old_state := event.data["old_state"]) is None
-                or old_state.state in (STATE_UNKNOWN, STATE_UNAVAILABLE)
-                or (new_state := event.data["new_state"]) is None
-                or new_state.state in (STATE_UNKNOWN, STATE_UNAVAILABLE)
+            if old_value in (STATE_UNKNOWN, STATE_UNAVAILABLE) or new_state.state in (
+                STATE_UNKNOWN,
+                STATE_UNAVAILABLE,
             ):
                 return
 
@@ -217,15 +250,15 @@ class DerivativeSensor(RestoreSensor, SensorEntity):
             self._state_list = [
                 (time_start, time_end, state)
                 for time_start, time_end, state in self._state_list
-                if (new_state.last_updated - time_end).total_seconds()
+                if (new_state.last_reported - time_end).total_seconds()
                 < self._time_window
             ]
 
             try:
                 elapsed_time = (
-                    new_state.last_updated - old_state.last_updated
+                    new_state.last_reported - old_last_reported
                 ).total_seconds()
-                delta_value = Decimal(new_state.state) - Decimal(old_state.state)
+                delta_value = Decimal(new_state.state) - Decimal(old_value)
                 new_derivative = (
                     delta_value
                     / Decimal(elapsed_time)
@@ -237,7 +270,7 @@ class DerivativeSensor(RestoreSensor, SensorEntity):
                 _LOGGER.warning("While calculating derivative: %s", err)
             except DecimalException as err:
                 _LOGGER.warning(
-                    "Invalid state (%s > %s): %s", old_state.state, new_state.state, err
+                    "Invalid state (%s > %s): %s", old_value, new_state.state, err
                 )
             except AssertionError as err:
                 _LOGGER.error("Could not calculate derivative: %s", err)
@@ -254,7 +287,7 @@ class DerivativeSensor(RestoreSensor, SensorEntity):
 
             # add latest derivative to the window list
             self._state_list.append(
-                (old_state.last_updated, new_state.last_updated, new_derivative)
+                (old_last_reported, new_state.last_reported, new_derivative)
             )
 
             def calculate_weight(
@@ -274,13 +307,19 @@ class DerivativeSensor(RestoreSensor, SensorEntity):
             else:
                 derivative = Decimal("0.00")
                 for start, end, value in self._state_list:
-                    weight = calculate_weight(start, end, new_state.last_updated)
+                    weight = calculate_weight(start, end, new_state.last_reported)
                     derivative = derivative + (value * Decimal(weight))
             self._attr_native_value = round(derivative, self._round_digits)
             self.async_write_ha_state()
 
         self.async_on_remove(
             async_track_state_change_event(
-                self.hass, self._sensor_source_id, calc_derivative
+                self.hass, self._sensor_source_id, on_state_changed
+            )
+        )
+
+        self.async_on_remove(
+            async_track_state_report_event(
+                self.hass, self._sensor_source_id, on_state_reported
             )
         )
diff --git a/homeassistant/components/devialet/__init__.py b/homeassistant/components/devialet/__init__.py
index 2eccdb2a4b6..be641ad58a5 100644
--- a/homeassistant/components/devialet/__init__.py
+++ b/homeassistant/components/devialet/__init__.py
@@ -4,29 +4,28 @@ from __future__ import annotations
 
 from devialet import DevialetApi
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import DOMAIN
+from .coordinator import DevialetConfigEntry, DevialetCoordinator
 
 PLATFORMS = [Platform.MEDIA_PLAYER]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: DevialetConfigEntry) -> bool:
     """Set up Devialet from a config entry."""
     session = async_get_clientsession(hass)
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = DevialetApi(
-        entry.data[CONF_HOST], session
-    )
+    client = DevialetApi(entry.data[CONF_HOST], session)
+    coordinator = DevialetCoordinator(hass, entry, client)
+    await coordinator.async_config_entry_first_refresh()
+
+    entry.runtime_data = coordinator
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: DevialetConfigEntry) -> bool:
     """Unload Devialet config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        del hass.data[DOMAIN][entry.entry_id]
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/devialet/coordinator.py b/homeassistant/components/devialet/coordinator.py
index 9cfeb797373..7b022b921f8 100644
--- a/homeassistant/components/devialet/coordinator.py
+++ b/homeassistant/components/devialet/coordinator.py
@@ -5,6 +5,7 @@ import logging
 
 from devialet import DevialetApi
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -14,15 +15,22 @@ _LOGGER = logging.getLogger(__name__)
 
 SCAN_INTERVAL = timedelta(seconds=5)
 
+type DevialetConfigEntry = ConfigEntry[DevialetCoordinator]
+
 
 class DevialetCoordinator(DataUpdateCoordinator[None]):
     """Devialet update coordinator."""
 
-    def __init__(self, hass: HomeAssistant, client: DevialetApi) -> None:
+    config_entry: DevialetConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, entry: DevialetConfigEntry, client: DevialetApi
+    ) -> None:
         """Initialize the coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/devialet/diagnostics.py b/homeassistant/components/devialet/diagnostics.py
index ae887dd1c8c..75d6e7aa222 100644
--- a/homeassistant/components/devialet/diagnostics.py
+++ b/homeassistant/components/devialet/diagnostics.py
@@ -4,18 +4,13 @@ from __future__ import annotations
 
 from typing import Any
 
-from devialet import DevialetApi
-
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
+from .coordinator import DevialetConfigEntry
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: ConfigEntry
+    hass: HomeAssistant, entry: DevialetConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    client: DevialetApi = hass.data[DOMAIN][entry.entry_id]
-
-    return await client.async_get_diagnostics()
+    return await entry.runtime_data.client.async_get_diagnostics()
diff --git a/homeassistant/components/devialet/media_player.py b/homeassistant/components/devialet/media_player.py
index 8789516650a..6fa6d40e17d 100644
--- a/homeassistant/components/devialet/media_player.py
+++ b/homeassistant/components/devialet/media_player.py
@@ -9,15 +9,14 @@ from homeassistant.components.media_player import (
     MediaPlayerEntityFeature,
     MediaPlayerState,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, MANUFACTURER, SOUND_MODES
-from .coordinator import DevialetCoordinator
+from .coordinator import DevialetConfigEntry, DevialetCoordinator
 
 SUPPORT_DEVIALET = (
     MediaPlayerEntityFeature.VOLUME_SET
@@ -37,14 +36,12 @@ DEVIALET_TO_HA_FEATURE_MAP = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: DevialetConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Devialet entry."""
-    client = hass.data[DOMAIN][entry.entry_id]
-    coordinator = DevialetCoordinator(hass, client)
-    await coordinator.async_config_entry_first_refresh()
-
-    async_add_entities([DevialetMediaPlayerEntity(coordinator, entry)])
+    async_add_entities([DevialetMediaPlayerEntity(entry.runtime_data)])
 
 
 class DevialetMediaPlayerEntity(
@@ -55,18 +52,18 @@ class DevialetMediaPlayerEntity(
     _attr_has_entity_name = True
     _attr_name = None
 
-    def __init__(self, coordinator: DevialetCoordinator, entry: ConfigEntry) -> None:
+    def __init__(self, coordinator: DevialetCoordinator) -> None:
         """Initialize the Devialet device."""
-        self.coordinator = coordinator
         super().__init__(coordinator)
+        entry = coordinator.config_entry
 
         self._attr_unique_id = str(entry.unique_id)
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, self._attr_unique_id)},
             manufacturer=MANUFACTURER,
-            model=self.coordinator.client.model,
+            model=coordinator.client.model,
             name=entry.data[CONF_NAME],
-            sw_version=self.coordinator.client.version,
+            sw_version=coordinator.client.version,
         )
 
     @callback
diff --git a/homeassistant/components/device_sun_light_trigger/__init__.py b/homeassistant/components/device_sun_light_trigger/__init__.py
index 6781b9afaf7..ee427eb1ba6 100644
--- a/homeassistant/components/device_sun_light_trigger/__init__.py
+++ b/homeassistant/components/device_sun_light_trigger/__init__.py
@@ -29,14 +29,14 @@ from homeassistant.const import (
     SUN_EVENT_SUNSET,
 )
 from homeassistant.core import Event, EventStateChangedData, HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import (
     async_track_point_in_utc_time,
     async_track_state_change_event,
 )
 from homeassistant.helpers.sun import get_astral_event_next, is_up
 from homeassistant.helpers.typing import ConfigType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 DOMAIN = "device_sun_light_trigger"
 CONF_DEVICE_GROUP = "device_group"
diff --git a/homeassistant/components/devolo_home_control/binary_sensor.py b/homeassistant/components/devolo_home_control/binary_sensor.py
index d24033a80b9..7a88b12c48a 100644
--- a/homeassistant/components/devolo_home_control/binary_sensor.py
+++ b/homeassistant/components/devolo_home_control/binary_sensor.py
@@ -11,7 +11,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DevoloHomeControlConfigEntry
 from .entity import DevoloDeviceEntity
@@ -29,7 +29,7 @@ DEVICE_CLASS_MAPPING = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DevoloHomeControlConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Get all binary sensor and multi level sensor devices and setup them via config entry."""
     entities: list[BinarySensorEntity] = []
diff --git a/homeassistant/components/devolo_home_control/climate.py b/homeassistant/components/devolo_home_control/climate.py
index 1f407eb6804..3fdfa60870a 100644
--- a/homeassistant/components/devolo_home_control/climate.py
+++ b/homeassistant/components/devolo_home_control/climate.py
@@ -15,7 +15,7 @@ from homeassistant.components.climate import (
 )
 from homeassistant.const import PRECISION_HALVES, PRECISION_TENTHS, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DevoloHomeControlConfigEntry
 from .devolo_multi_level_switch import DevoloMultiLevelSwitchDeviceEntity
@@ -24,7 +24,7 @@ from .devolo_multi_level_switch import DevoloMultiLevelSwitchDeviceEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DevoloHomeControlConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Get all cover devices and setup them via config entry."""
 
diff --git a/homeassistant/components/devolo_home_control/cover.py b/homeassistant/components/devolo_home_control/cover.py
index f49a9d0f0be..f23244f1b50 100644
--- a/homeassistant/components/devolo_home_control/cover.py
+++ b/homeassistant/components/devolo_home_control/cover.py
@@ -10,7 +10,7 @@ from homeassistant.components.cover import (
     CoverEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DevoloHomeControlConfigEntry
 from .devolo_multi_level_switch import DevoloMultiLevelSwitchDeviceEntity
@@ -19,7 +19,7 @@ from .devolo_multi_level_switch import DevoloMultiLevelSwitchDeviceEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DevoloHomeControlConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Get all cover devices and setup them via config entry."""
 
diff --git a/homeassistant/components/devolo_home_control/light.py b/homeassistant/components/devolo_home_control/light.py
index c855574b83a..8a88081ed05 100644
--- a/homeassistant/components/devolo_home_control/light.py
+++ b/homeassistant/components/devolo_home_control/light.py
@@ -9,7 +9,7 @@ from devolo_home_control_api.homecontrol import HomeControl
 
 from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DevoloHomeControlConfigEntry
 from .devolo_multi_level_switch import DevoloMultiLevelSwitchDeviceEntity
@@ -18,7 +18,7 @@ from .devolo_multi_level_switch import DevoloMultiLevelSwitchDeviceEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DevoloHomeControlConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Get all light devices and setup them via config entry."""
 
diff --git a/homeassistant/components/devolo_home_control/sensor.py b/homeassistant/components/devolo_home_control/sensor.py
index 8d0a7f0313c..22581267eea 100644
--- a/homeassistant/components/devolo_home_control/sensor.py
+++ b/homeassistant/components/devolo_home_control/sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DevoloHomeControlConfigEntry
 from .entity import DevoloDeviceEntity
@@ -40,7 +40,7 @@ STATE_CLASS_MAPPING = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DevoloHomeControlConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Get all sensor devices and setup them via config entry."""
     entities: list[SensorEntity] = []
diff --git a/homeassistant/components/devolo_home_control/siren.py b/homeassistant/components/devolo_home_control/siren.py
index e896f4d3ed8..5e4df944b3c 100644
--- a/homeassistant/components/devolo_home_control/siren.py
+++ b/homeassistant/components/devolo_home_control/siren.py
@@ -7,7 +7,7 @@ from devolo_home_control_api.homecontrol import HomeControl
 
 from homeassistant.components.siren import ATTR_TONE, SirenEntity, SirenEntityFeature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DevoloHomeControlConfigEntry
 from .devolo_multi_level_switch import DevoloMultiLevelSwitchDeviceEntity
@@ -16,7 +16,7 @@ from .devolo_multi_level_switch import DevoloMultiLevelSwitchDeviceEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DevoloHomeControlConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Get all binary sensor and multi level sensor devices and setup them via config entry."""
 
diff --git a/homeassistant/components/devolo_home_control/switch.py b/homeassistant/components/devolo_home_control/switch.py
index a6f16229046..378e23a5f5f 100644
--- a/homeassistant/components/devolo_home_control/switch.py
+++ b/homeassistant/components/devolo_home_control/switch.py
@@ -9,7 +9,7 @@ from devolo_home_control_api.homecontrol import HomeControl
 
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DevoloHomeControlConfigEntry
 from .entity import DevoloDeviceEntity
@@ -18,7 +18,7 @@ from .entity import DevoloDeviceEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DevoloHomeControlConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Get all devices and setup the switch devices via config entry."""
 
diff --git a/homeassistant/components/devolo_home_network/binary_sensor.py b/homeassistant/components/devolo_home_network/binary_sensor.py
index 5752956ffb5..2c258d758da 100644
--- a/homeassistant/components/devolo_home_network/binary_sensor.py
+++ b/homeassistant/components/devolo_home_network/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DevoloHomeNetworkConfigEntry
 from .const import CONNECTED_PLC_DEVICES, CONNECTED_TO_ROUTER
@@ -54,7 +54,7 @@ SENSOR_TYPES: dict[str, DevoloBinarySensorEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DevoloHomeNetworkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Get all devices and sensors and setup them via config entry."""
     coordinators = entry.runtime_data.coordinators
diff --git a/homeassistant/components/devolo_home_network/button.py b/homeassistant/components/devolo_home_network/button.py
index 06822ff199e..fe6b1786363 100644
--- a/homeassistant/components/devolo_home_network/button.py
+++ b/homeassistant/components/devolo_home_network/button.py
@@ -16,7 +16,7 @@ from homeassistant.components.button import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DevoloHomeNetworkConfigEntry
 from .const import DOMAIN, IDENTIFY, PAIRING, RESTART, START_WPS
@@ -59,7 +59,7 @@ BUTTON_TYPES: dict[str, DevoloButtonEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DevoloHomeNetworkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Get all devices and buttons and setup them via config entry."""
     device = entry.runtime_data.device
diff --git a/homeassistant/components/devolo_home_network/device_tracker.py b/homeassistant/components/devolo_home_network/device_tracker.py
index 583f022df84..c5862738bd1 100644
--- a/homeassistant/components/devolo_home_network/device_tracker.py
+++ b/homeassistant/components/devolo_home_network/device_tracker.py
@@ -12,7 +12,7 @@ from homeassistant.components.device_tracker import (
 from homeassistant.const import STATE_UNKNOWN, UnitOfFrequency
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import DevoloHomeNetworkConfigEntry
@@ -25,7 +25,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DevoloHomeNetworkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Get all devices and sensors and setup them via config entry."""
     device = entry.runtime_data.device
diff --git a/homeassistant/components/devolo_home_network/entity.py b/homeassistant/components/devolo_home_network/entity.py
index 93ec1b9a3a2..64d8ff131e8 100644
--- a/homeassistant/components/devolo_home_network/entity.py
+++ b/homeassistant/components/devolo_home_network/entity.py
@@ -8,6 +8,7 @@ from devolo_plc_api.device_api import (
     WifiGuestAccessGet,
 )
 from devolo_plc_api.plcnet_api import DataRate, LogicalNetwork
+from yarl import URL
 
 from homeassistant.const import ATTR_CONNECTIONS
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
@@ -43,7 +44,7 @@ class DevoloEntity(Entity):
         self.entry = entry
 
         self._attr_device_info = DeviceInfo(
-            configuration_url=f"http://{self.device.ip}",
+            configuration_url=URL.build(scheme="http", host=self.device.ip),
             identifiers={(DOMAIN, str(self.device.serial_number))},
             manufacturer="devolo",
             model=self.device.product,
diff --git a/homeassistant/components/devolo_home_network/image.py b/homeassistant/components/devolo_home_network/image.py
index 240686ed3bb..46a3eb3426a 100644
--- a/homeassistant/components/devolo_home_network/image.py
+++ b/homeassistant/components/devolo_home_network/image.py
@@ -12,8 +12,8 @@ from devolo_plc_api.device_api import WifiGuestAccessGet
 from homeassistant.components.image import ImageEntity, ImageEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from . import DevoloHomeNetworkConfigEntry
 from .const import IMAGE_GUEST_WIFI, SWITCH_GUEST_WIFI
@@ -42,7 +42,7 @@ IMAGE_TYPES: dict[str, DevoloImageEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DevoloHomeNetworkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Get all devices and sensors and setup them via config entry."""
     coordinators = entry.runtime_data.coordinators
diff --git a/homeassistant/components/devolo_home_network/sensor.py b/homeassistant/components/devolo_home_network/sensor.py
index 220ab66312a..d9a6f3f1110 100644
--- a/homeassistant/components/devolo_home_network/sensor.py
+++ b/homeassistant/components/devolo_home_network/sensor.py
@@ -19,7 +19,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import EntityCategory, UnitOfDataRate
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.dt import utcnow
 
 from . import DevoloHomeNetworkConfigEntry
@@ -123,7 +123,7 @@ SENSOR_TYPES: dict[str, DevoloSensorEntityDescription[Any, Any]] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DevoloHomeNetworkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Get all devices and sensors and setup them via config entry."""
     device = entry.runtime_data.device
diff --git a/homeassistant/components/devolo_home_network/switch.py b/homeassistant/components/devolo_home_network/switch.py
index 8ff35dcc4b6..0271270fa09 100644
--- a/homeassistant/components/devolo_home_network/switch.py
+++ b/homeassistant/components/devolo_home_network/switch.py
@@ -14,7 +14,7 @@ from homeassistant.components.switch import SwitchEntity, SwitchEntityDescriptio
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DevoloHomeNetworkConfigEntry
 from .const import DOMAIN, SWITCH_GUEST_WIFI, SWITCH_LEDS
@@ -55,7 +55,7 @@ SWITCH_TYPES: dict[str, DevoloSwitchEntityDescription[Any]] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DevoloHomeNetworkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Get all devices and sensors and setup them via config entry."""
     device = entry.runtime_data.device
diff --git a/homeassistant/components/devolo_home_network/update.py b/homeassistant/components/devolo_home_network/update.py
index 5091ce8e1e7..aaaf72af359 100644
--- a/homeassistant/components/devolo_home_network/update.py
+++ b/homeassistant/components/devolo_home_network/update.py
@@ -19,7 +19,7 @@ from homeassistant.components.update import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DevoloHomeNetworkConfigEntry
 from .const import DOMAIN, REGULAR_FIRMWARE
@@ -51,7 +51,7 @@ UPDATE_TYPES: dict[str, DevoloUpdateEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DevoloHomeNetworkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Get all devices and sensors and setup them via config entry."""
     coordinators = entry.runtime_data.coordinators
diff --git a/homeassistant/components/dexcom/config_flow.py b/homeassistant/components/dexcom/config_flow.py
index 90917e0ce2c..ed6dc94e764 100644
--- a/homeassistant/components/dexcom/config_flow.py
+++ b/homeassistant/components/dexcom/config_flow.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import logging
 from typing import Any
 
 from pydexcom import AccountError, Dexcom, SessionError
@@ -12,6 +13,8 @@ from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 
 from .const import CONF_SERVER, DOMAIN, SERVER_OUS, SERVER_US
 
+_LOGGER = logging.getLogger(__name__)
+
 DATA_SCHEMA = vol.Schema(
     {
         vol.Required(CONF_USERNAME): str,
@@ -43,7 +46,8 @@ class DexcomConfigFlow(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "cannot_connect"
             except AccountError:
                 errors["base"] = "invalid_auth"
-            except Exception:  # noqa: BLE001
+            except Exception:
+                _LOGGER.exception("Unexpected error")
                 errors["base"] = "unknown"
 
             if "base" not in errors:
diff --git a/homeassistant/components/dexcom/sensor.py b/homeassistant/components/dexcom/sensor.py
index cdb1894b675..eac0134f010 100644
--- a/homeassistant/components/dexcom/sensor.py
+++ b/homeassistant/components/dexcom/sensor.py
@@ -6,7 +6,7 @@ from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.const import CONF_USERNAME, UnitOfBloodGlucoseConcentration
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
@@ -26,7 +26,7 @@ TRENDS = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: DexcomConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Dexcom sensors."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/dhcp/manifest.json b/homeassistant/components/dhcp/manifest.json
index ba773782e1c..64fd2ff38c6 100644
--- a/homeassistant/components/dhcp/manifest.json
+++ b/homeassistant/components/dhcp/manifest.json
@@ -14,8 +14,8 @@
   ],
   "quality_scale": "internal",
   "requirements": [
-    "aiodhcpwatcher==1.0.2",
-    "aiodiscover==2.1.0",
-    "cached-ipaddress==0.8.0"
+    "aiodhcpwatcher==1.1.1",
+    "aiodiscover==2.6.1",
+    "cached-ipaddress==0.10.0"
   ]
 }
diff --git a/homeassistant/components/diagnostics/__init__.py b/homeassistant/components/diagnostics/__init__.py
index b23b7cef2bd..7bc43f2c3f5 100644
--- a/homeassistant/components/diagnostics/__init__.py
+++ b/homeassistant/components/diagnostics/__init__.py
@@ -33,6 +33,7 @@ from homeassistant.loader import (
     async_get_integration,
 )
 from homeassistant.setup import async_get_domain_setup_times
+from homeassistant.util.hass_dict import HassKey
 from homeassistant.util.json import format_unserializable_data
 
 from .const import DOMAIN, REDACTED, DiagnosticsSubType, DiagnosticsType
@@ -44,6 +45,7 @@ _LOGGER = logging.getLogger(__name__)
 
 
 CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+_DIAGNOSTICS_DATA: HassKey[DiagnosticsData] = HassKey(DOMAIN)
 
 
 @dataclass(slots=True)
@@ -72,7 +74,7 @@ class DiagnosticsData:
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up Diagnostics from a config entry."""
-    hass.data[DOMAIN] = DiagnosticsData()
+    hass.data[_DIAGNOSTICS_DATA] = DiagnosticsData()
 
     await integration_platform.async_process_integration_platforms(
         hass, DOMAIN, _register_diagnostics_platform
@@ -104,7 +106,7 @@ def _register_diagnostics_platform(
     hass: HomeAssistant, integration_domain: str, platform: DiagnosticsProtocol
 ) -> None:
     """Register a diagnostics platform."""
-    diagnostics_data: DiagnosticsData = hass.data[DOMAIN]
+    diagnostics_data = hass.data[_DIAGNOSTICS_DATA]
     diagnostics_data.platforms[integration_domain] = DiagnosticsPlatformData(
         getattr(platform, "async_get_config_entry_diagnostics", None),
         getattr(platform, "async_get_device_diagnostics", None),
@@ -118,7 +120,7 @@ def handle_info(
     hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict
 ) -> None:
     """List all possible diagnostic handlers."""
-    diagnostics_data: DiagnosticsData = hass.data[DOMAIN]
+    diagnostics_data = hass.data[_DIAGNOSTICS_DATA]
     result = [
         {
             "domain": domain,
@@ -145,7 +147,7 @@ def handle_get(
 ) -> None:
     """List all diagnostic handlers for a domain."""
     domain = msg["domain"]
-    diagnostics_data: DiagnosticsData = hass.data[DOMAIN]
+    diagnostics_data = hass.data[_DIAGNOSTICS_DATA]
 
     if (info := diagnostics_data.platforms.get(domain)) is None:
         connection.send_error(
@@ -267,7 +269,7 @@ class DownloadDiagnosticsView(http.HomeAssistantView):
         if (config_entry := hass.config_entries.async_get_entry(d_id)) is None:
             return web.Response(status=HTTPStatus.NOT_FOUND)
 
-        diagnostics_data: DiagnosticsData = hass.data[DOMAIN]
+        diagnostics_data = hass.data[_DIAGNOSTICS_DATA]
         if (info := diagnostics_data.platforms.get(config_entry.domain)) is None:
             return web.Response(status=HTTPStatus.NOT_FOUND)
 
diff --git a/homeassistant/components/digital_ocean/__init__.py b/homeassistant/components/digital_ocean/__init__.py
index e5b62d430b6..306ddc8e9a5 100644
--- a/homeassistant/components/digital_ocean/__init__.py
+++ b/homeassistant/components/digital_ocean/__init__.py
@@ -8,7 +8,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_ACCESS_TOKEN, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import Throttle
 
diff --git a/homeassistant/components/digital_ocean/binary_sensor.py b/homeassistant/components/digital_ocean/binary_sensor.py
index 0d4b31faa2c..f0bb6eba049 100644
--- a/homeassistant/components/digital_ocean/binary_sensor.py
+++ b/homeassistant/components/digital_ocean/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/digital_ocean/switch.py b/homeassistant/components/digital_ocean/switch.py
index 856c9301cfd..409fa63c1c2 100644
--- a/homeassistant/components/digital_ocean/switch.py
+++ b/homeassistant/components/digital_ocean/switch.py
@@ -12,7 +12,7 @@ from homeassistant.components.switch import (
     SwitchEntity,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/directv/media_player.py b/homeassistant/components/directv/media_player.py
index 8998e050a75..91934a2da3a 100644
--- a/homeassistant/components/directv/media_player.py
+++ b/homeassistant/components/directv/media_player.py
@@ -15,7 +15,7 @@ from homeassistant.components.media_player import (
     MediaType,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from . import DirecTVConfigEntry
@@ -55,7 +55,7 @@ SUPPORT_DTV_CLIENT = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DirecTVConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the DirecTV config entry."""
     dtv = entry.runtime_data
diff --git a/homeassistant/components/directv/remote.py b/homeassistant/components/directv/remote.py
index dbaab5fa4e6..c9aacaae4d3 100644
--- a/homeassistant/components/directv/remote.py
+++ b/homeassistant/components/directv/remote.py
@@ -11,7 +11,7 @@ from directv import DIRECTV, DIRECTVError
 
 from homeassistant.components.remote import ATTR_NUM_REPEATS, RemoteEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DirecTVConfigEntry
 from .entity import DIRECTVEntity
@@ -24,7 +24,7 @@ SCAN_INTERVAL = timedelta(minutes=2)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DirecTVConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Load DirecTV remote based on a config entry."""
     dtv = entry.runtime_data
diff --git a/homeassistant/components/discogs/sensor.py b/homeassistant/components/discogs/sensor.py
index 3cea6ec4dac..3c64b9020c3 100644
--- a/homeassistant/components/discogs/sensor.py
+++ b/homeassistant/components/discogs/sensor.py
@@ -16,8 +16,8 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_MONITORED_CONDITIONS, CONF_NAME, CONF_TOKEN
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import SERVER_SOFTWARE
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/discovergy/__init__.py b/homeassistant/components/discovergy/__init__.py
index 81c33adc052..0a8b7422f84 100644
--- a/homeassistant/components/discovergy/__init__.py
+++ b/homeassistant/components/discovergy/__init__.py
@@ -6,25 +6,22 @@ from pydiscovergy import Discovergy
 from pydiscovergy.authentication import BasicAuth
 import pydiscovergy.error as discovergyError
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers.httpx_client import get_async_client
+from homeassistant.helpers.httpx_client import create_async_httpx_client
 
-from .coordinator import DiscovergyUpdateCoordinator
+from .coordinator import DiscovergyConfigEntry, DiscovergyUpdateCoordinator
 
 PLATFORMS = [Platform.SENSOR]
 
-type DiscovergyConfigEntry = ConfigEntry[list[DiscovergyUpdateCoordinator]]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: DiscovergyConfigEntry) -> bool:
     """Set up Discovergy from a config entry."""
     client = Discovergy(
         email=entry.data[CONF_EMAIL],
         password=entry.data[CONF_PASSWORD],
-        httpx_client=get_async_client(hass),
+        httpx_client=create_async_httpx_client(hass),
         authentication=BasicAuth(),
     )
 
@@ -46,6 +43,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: DiscovergyConfigEntry) -
         # so we have data when entities are added
         coordinator = DiscovergyUpdateCoordinator(
             hass=hass,
+            config_entry=entry,
             meter=meter,
             discovergy_client=client,
         )
diff --git a/homeassistant/components/discovergy/coordinator.py b/homeassistant/components/discovergy/coordinator.py
index 3be4c71c987..e3f26ad49f8 100644
--- a/homeassistant/components/discovergy/coordinator.py
+++ b/homeassistant/components/discovergy/coordinator.py
@@ -9,19 +9,25 @@ from pydiscovergy import Discovergy
 from pydiscovergy.error import DiscovergyClientError, HTTPError, InvalidLogin
 from pydiscovergy.models import Meter, Reading
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 _LOGGER = logging.getLogger(__name__)
 
+type DiscovergyConfigEntry = ConfigEntry[list[DiscovergyUpdateCoordinator]]
+
 
 class DiscovergyUpdateCoordinator(DataUpdateCoordinator[Reading]):
     """The Discovergy update coordinator."""
 
+    config_entry: DiscovergyConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: DiscovergyConfigEntry,
         meter: Meter,
         discovergy_client: Discovergy,
     ) -> None:
@@ -32,6 +38,7 @@ class DiscovergyUpdateCoordinator(DataUpdateCoordinator[Reading]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=f"Discovergy meter {meter.meter_id}",
             update_interval=timedelta(seconds=30),
         )
@@ -44,9 +51,7 @@ class DiscovergyUpdateCoordinator(DataUpdateCoordinator[Reading]):
             )
         except InvalidLogin as err:
             raise ConfigEntryAuthFailed(
-                f"Auth expired while fetching last reading for meter {self.meter.meter_id}"
+                "Auth expired while fetching last reading"
             ) from err
         except (HTTPError, DiscovergyClientError) as err:
-            raise UpdateFailed(
-                f"Error while fetching last reading for meter {self.meter.meter_id}"
-            ) from err
+            raise UpdateFailed(f"Error while fetching last reading: {err}") from err
diff --git a/homeassistant/components/discovergy/diagnostics.py b/homeassistant/components/discovergy/diagnostics.py
index 3857404db81..f4d6a3397d0 100644
--- a/homeassistant/components/discovergy/diagnostics.py
+++ b/homeassistant/components/discovergy/diagnostics.py
@@ -8,7 +8,7 @@ from typing import Any
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.core import HomeAssistant
 
-from . import DiscovergyConfigEntry
+from .coordinator import DiscovergyConfigEntry
 
 TO_REDACT_METER = {
     "serial_number",
diff --git a/homeassistant/components/discovergy/sensor.py b/homeassistant/components/discovergy/sensor.py
index a3ec132db9b..7d4bb6cb052 100644
--- a/homeassistant/components/discovergy/sensor.py
+++ b/homeassistant/components/discovergy/sensor.py
@@ -21,12 +21,11 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import DiscovergyConfigEntry
 from .const import DOMAIN, MANUFACTURER
-from .coordinator import DiscovergyUpdateCoordinator
+from .coordinator import DiscovergyConfigEntry, DiscovergyUpdateCoordinator
 
 PARALLEL_UPDATES = 0
 
@@ -167,7 +166,7 @@ ADDITIONAL_SENSORS: tuple[DiscovergySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DiscovergyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Discovergy sensors."""
     entities: list[DiscovergySensor] = []
diff --git a/homeassistant/components/dlib_face_identify/image_processing.py b/homeassistant/components/dlib_face_identify/image_processing.py
index e17f892a7fe..fee9f8dab3c 100644
--- a/homeassistant/components/dlib_face_identify/image_processing.py
+++ b/homeassistant/components/dlib_face_identify/image_processing.py
@@ -15,7 +15,7 @@ from homeassistant.components.image_processing import (
 )
 from homeassistant.const import ATTR_NAME, CONF_ENTITY_ID, CONF_NAME, CONF_SOURCE
 from homeassistant.core import HomeAssistant, split_entity_id
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/dlink/switch.py b/homeassistant/components/dlink/switch.py
index 54322cc6875..ef1348f613d 100644
--- a/homeassistant/components/dlink/switch.py
+++ b/homeassistant/components/dlink/switch.py
@@ -8,7 +8,7 @@ from typing import Any
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DLinkConfigEntry
 from .const import ATTR_TOTAL_CONSUMPTION
@@ -24,7 +24,7 @@ SWITCH_TYPE = SwitchEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DLinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the D-Link Power Plug switch."""
     async_add_entities([SmartPlugSwitch(entry, SWITCH_TYPE)], True)
diff --git a/homeassistant/components/dlna_dmr/media_player.py b/homeassistant/components/dlna_dmr/media_player.py
index 563ed209b7d..d93d55e62be 100644
--- a/homeassistant/components/dlna_dmr/media_player.py
+++ b/homeassistant/components/dlna_dmr/media_player.py
@@ -32,7 +32,7 @@ from homeassistant.components.media_player import (
 from homeassistant.const import CONF_DEVICE_ID, CONF_MAC, CONF_TYPE, CONF_URL
 from homeassistant.core import CoreState, HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.service_info.ssdp import SsdpServiceInfo
 
 from .const import (
@@ -92,7 +92,7 @@ def catch_request_errors[_DlnaDmrEntityT: DlnaDmrEntity, **_P, _R](
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the DlnaDmrEntity from a config entry."""
     _LOGGER.debug("media_player.async_setup_entry %s (%s)", entry.entry_id, entry.title)
diff --git a/homeassistant/components/dnsip/config_flow.py b/homeassistant/components/dnsip/config_flow.py
index 8c2cfa5e556..9e98178e718 100644
--- a/homeassistant/components/dnsip/config_flow.py
+++ b/homeassistant/components/dnsip/config_flow.py
@@ -18,7 +18,7 @@ from homeassistant.config_entries import (
 )
 from homeassistant.const import CONF_NAME, CONF_PORT
 from homeassistant.core import callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import (
     CONF_HOSTNAME,
diff --git a/homeassistant/components/dnsip/sensor.py b/homeassistant/components/dnsip/sensor.py
index 34730e934a0..6708baefe8c 100644
--- a/homeassistant/components/dnsip/sensor.py
+++ b/homeassistant/components/dnsip/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, CONF_PORT
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CONF_HOSTNAME,
@@ -45,7 +45,9 @@ def sort_ips(ips: list, querytype: str) -> list:
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the dnsip sensor entry."""
 
diff --git a/homeassistant/components/dominos/__init__.py b/homeassistant/components/dominos/__init__.py
index 9b11b667e84..6fccecfec5c 100644
--- a/homeassistant/components/dominos/__init__.py
+++ b/homeassistant/components/dominos/__init__.py
@@ -9,7 +9,7 @@ import voluptuous as vol
 from homeassistant.components import http
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.typing import ConfigType
diff --git a/homeassistant/components/doods/image_processing.py b/homeassistant/components/doods/image_processing.py
index 7b055c6dd05..bcc6e7a8050 100644
--- a/homeassistant/components/doods/image_processing.py
+++ b/homeassistant/components/doods/image_processing.py
@@ -25,8 +25,7 @@ from homeassistant.const import (
     CONF_URL,
 )
 from homeassistant.core import HomeAssistant, split_entity_id
-from homeassistant.helpers import template
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, template
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util.pil import draw_box
diff --git a/homeassistant/components/doorbird/__init__.py b/homeassistant/components/doorbird/__init__.py
index c943fa68766..5090f309c49 100644
--- a/homeassistant/components/doorbird/__init__.py
+++ b/homeassistant/components/doorbird/__init__.py
@@ -17,9 +17,8 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import issue_registry as ir
+from homeassistant.helpers import config_validation as cv, issue_registry as ir
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import CONF_EVENTS, DOMAIN, PLATFORMS
diff --git a/homeassistant/components/doorbird/button.py b/homeassistant/components/doorbird/button.py
index 62631e51abc..173c2e923e4 100644
--- a/homeassistant/components/doorbird/button.py
+++ b/homeassistant/components/doorbird/button.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .device import ConfiguredDoorBird, async_reset_device_favorites
 from .entity import DoorBirdEntity
@@ -45,7 +45,7 @@ BUTTON_DESCRIPTIONS: tuple[DoorbirdButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: DoorBirdConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the DoorBird button platform."""
     door_bird_data = config_entry.runtime_data
diff --git a/homeassistant/components/doorbird/camera.py b/homeassistant/components/doorbird/camera.py
index 640d6630c18..a41e7c41b28 100644
--- a/homeassistant/components/doorbird/camera.py
+++ b/homeassistant/components/doorbird/camera.py
@@ -9,8 +9,8 @@ import aiohttp
 
 from homeassistant.components.camera import Camera, CameraEntityFeature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from .entity import DoorBirdEntity
 from .models import DoorBirdConfigEntry, DoorBirdData
@@ -25,7 +25,7 @@ _TIMEOUT = 15  # seconds
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: DoorBirdConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the DoorBird camera platform."""
     door_bird_data = config_entry.runtime_data
diff --git a/homeassistant/components/doorbird/event.py b/homeassistant/components/doorbird/event.py
index 4c20098fc80..688f8b2fbeb 100644
--- a/homeassistant/components/doorbird/event.py
+++ b/homeassistant/components/doorbird/event.py
@@ -9,7 +9,7 @@ from homeassistant.components.event import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .device import DoorbirdEvent
@@ -35,7 +35,7 @@ EVENT_DESCRIPTIONS = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: DoorBirdConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the DoorBird event platform."""
     door_bird_data = config_entry.runtime_data
diff --git a/homeassistant/components/doorbird/strings.json b/homeassistant/components/doorbird/strings.json
index 090ba4f161f..ad43e8c1c1c 100644
--- a/homeassistant/components/doorbird/strings.json
+++ b/homeassistant/components/doorbird/strings.json
@@ -6,7 +6,7 @@
           "events": "Comma separated list of events."
         },
         "data_description": {
-          "events": "Add an comma separated event name for each event you wish to track. After entering them here, use the DoorBird app to assign them to a specific event.\n\nExample: somebody_pressed_the_button, motion"
+          "events": "Add a comma separated event name for each event you wish to track. After entering them here, use the DoorBird app to assign them to a specific event.\n\nExample: somebody_pressed_the_button, motion"
         }
       }
     }
diff --git a/homeassistant/components/dormakaba_dkey/binary_sensor.py b/homeassistant/components/dormakaba_dkey/binary_sensor.py
index 56b991bf908..a8870ed224b 100644
--- a/homeassistant/components/dormakaba_dkey/binary_sensor.py
+++ b/homeassistant/components/dormakaba_dkey/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import DormakabaDkeyConfigEntry, DormakabaDkeyCoordinator
 from .entity import DormakabaDkeyEntity
@@ -45,7 +45,7 @@ BINARY_SENSOR_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DormakabaDkeyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the binary sensor platform for Dormakaba dKey."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/dormakaba_dkey/config_flow.py b/homeassistant/components/dormakaba_dkey/config_flow.py
index 0d23b822231..369accb83d8 100644
--- a/homeassistant/components/dormakaba_dkey/config_flow.py
+++ b/homeassistant/components/dormakaba_dkey/config_flow.py
@@ -57,7 +57,7 @@ class DormkabaConfigFlow(ConfigFlow, domain=DOMAIN):
             self._discovery_info = self._discovered_devices[address]
             return await self.async_step_associate()
 
-        current_addresses = self._async_current_ids()
+        current_addresses = self._async_current_ids(include_ignore=False)
         for discovery in async_discovered_service_info(self.hass):
             if (
                 discovery.address in current_addresses
diff --git a/homeassistant/components/dormakaba_dkey/lock.py b/homeassistant/components/dormakaba_dkey/lock.py
index 352e7cbe0ac..12a553adba3 100644
--- a/homeassistant/components/dormakaba_dkey/lock.py
+++ b/homeassistant/components/dormakaba_dkey/lock.py
@@ -8,7 +8,7 @@ from py_dormakaba_dkey.commands import UnlockStatus
 
 from homeassistant.components.lock import LockEntity
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import DormakabaDkeyConfigEntry, DormakabaDkeyCoordinator
 from .entity import DormakabaDkeyEntity
@@ -17,7 +17,7 @@ from .entity import DormakabaDkeyEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DormakabaDkeyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the lock platform for Dormakaba dKey."""
     async_add_entities([DormakabaDkeyLock(entry.runtime_data)])
diff --git a/homeassistant/components/dormakaba_dkey/sensor.py b/homeassistant/components/dormakaba_dkey/sensor.py
index b1e941bc7e1..413ea1c56b1 100644
--- a/homeassistant/components/dormakaba_dkey/sensor.py
+++ b/homeassistant/components/dormakaba_dkey/sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import DormakabaDkeyConfigEntry, DormakabaDkeyCoordinator
 from .entity import DormakabaDkeyEntity
@@ -28,7 +28,7 @@ BINARY_SENSOR_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DormakabaDkeyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the lock platform for Dormakaba dKey."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/dovado/__init__.py b/homeassistant/components/dovado/__init__.py
index 5f63bbd0b2b..0a5fb602a08 100644
--- a/homeassistant/components/dovado/__init__.py
+++ b/homeassistant/components/dovado/__init__.py
@@ -15,7 +15,7 @@ from homeassistant.const import (
     DEVICE_DEFAULT_NAME,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import Throttle
 
diff --git a/homeassistant/components/dovado/sensor.py b/homeassistant/components/dovado/sensor.py
index 013b51bfc8f..e35fdeb2dc0 100644
--- a/homeassistant/components/dovado/sensor.py
+++ b/homeassistant/components/dovado/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_SENSORS, PERCENTAGE, UnitOfInformation
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/downloader/__init__.py b/homeassistant/components/downloader/__init__.py
index 75e1103a712..1a45886879a 100644
--- a/homeassistant/components/downloader/__init__.py
+++ b/homeassistant/components/downloader/__init__.py
@@ -12,7 +12,7 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.service import async_register_admin_service
 from homeassistant.util import raise_if_invalid_filename, raise_if_invalid_path
 
diff --git a/homeassistant/components/dremel_3d_printer/__init__.py b/homeassistant/components/dremel_3d_printer/__init__.py
index 632c42d9b54..33a8ad0e67f 100644
--- a/homeassistant/components/dremel_3d_printer/__init__.py
+++ b/homeassistant/components/dremel_3d_printer/__init__.py
@@ -29,7 +29,7 @@ async def async_setup_entry(
             f"Unable to connect to Dremel 3D Printer: {ex}"
         ) from ex
 
-    coordinator = Dremel3DPrinterDataUpdateCoordinator(hass, api)
+    coordinator = Dremel3DPrinterDataUpdateCoordinator(hass, config_entry, api)
     await coordinator.async_config_entry_first_refresh()
     config_entry.runtime_data = coordinator
     platforms = list(PLATFORMS)
diff --git a/homeassistant/components/dremel_3d_printer/binary_sensor.py b/homeassistant/components/dremel_3d_printer/binary_sensor.py
index 972945a84bb..923bcdad09c 100644
--- a/homeassistant/components/dremel_3d_printer/binary_sensor.py
+++ b/homeassistant/components/dremel_3d_printer/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import DremelConfigEntry
 from .entity import Dremel3DPrinterEntity
@@ -43,7 +43,7 @@ BINARY_SENSOR_TYPES: tuple[Dremel3DPrinterBinarySensorEntityDescription, ...] =
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: DremelConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the available Dremel binary sensors."""
     async_add_entities(
diff --git a/homeassistant/components/dremel_3d_printer/button.py b/homeassistant/components/dremel_3d_printer/button.py
index f91c1b0ea51..880b179650f 100644
--- a/homeassistant/components/dremel_3d_printer/button.py
+++ b/homeassistant/components/dremel_3d_printer/button.py
@@ -10,7 +10,7 @@ from dremel3dpy import Dremel3DPrinter
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import DremelConfigEntry
 from .entity import Dremel3DPrinterEntity
@@ -45,7 +45,7 @@ BUTTON_TYPES: tuple[Dremel3DPrinterButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: DremelConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Dremel 3D Printer control buttons."""
     async_add_entities(
diff --git a/homeassistant/components/dremel_3d_printer/camera.py b/homeassistant/components/dremel_3d_printer/camera.py
index f4293915a25..ccb7eeaa658 100644
--- a/homeassistant/components/dremel_3d_printer/camera.py
+++ b/homeassistant/components/dremel_3d_printer/camera.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from homeassistant.components.camera import CameraEntityDescription
 from homeassistant.components.mjpeg import MjpegCamera
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import Dremel3DPrinterDataUpdateCoordinator, DremelConfigEntry
 from .entity import Dremel3DPrinterEntity
@@ -19,7 +19,7 @@ CAMERA_TYPE = CameraEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: DremelConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a MJPEG IP Camera for the 3D45 Model. The 3D20 and 3D40 models don't have built in cameras."""
     async_add_entities([Dremel3D45Camera(config_entry.runtime_data, CAMERA_TYPE)])
diff --git a/homeassistant/components/dremel_3d_printer/config_flow.py b/homeassistant/components/dremel_3d_printer/config_flow.py
index 913180db0f7..0cb5c7d9cfc 100644
--- a/homeassistant/components/dremel_3d_printer/config_flow.py
+++ b/homeassistant/components/dremel_3d_printer/config_flow.py
@@ -11,7 +11,7 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import DOMAIN, LOGGER
 
diff --git a/homeassistant/components/dremel_3d_printer/coordinator.py b/homeassistant/components/dremel_3d_printer/coordinator.py
index 3323569c05f..f2c1876fe0a 100644
--- a/homeassistant/components/dremel_3d_printer/coordinator.py
+++ b/homeassistant/components/dremel_3d_printer/coordinator.py
@@ -18,11 +18,14 @@ class Dremel3DPrinterDataUpdateCoordinator(DataUpdateCoordinator[None]):
 
     config_entry: DremelConfigEntry
 
-    def __init__(self, hass: HomeAssistant, api: Dremel3DPrinter) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: DremelConfigEntry, api: Dremel3DPrinter
+    ) -> None:
         """Initialize Dremel 3D Printer data update coordinator."""
         super().__init__(
             hass=hass,
             logger=LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=10),
         )
diff --git a/homeassistant/components/dremel_3d_printer/sensor.py b/homeassistant/components/dremel_3d_printer/sensor.py
index 002a5fc4adb..1f02b1fe239 100644
--- a/homeassistant/components/dremel_3d_printer/sensor.py
+++ b/homeassistant/components/dremel_3d_printer/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util.dt import utcnow
 from homeassistant.util.variance import ignore_variance
@@ -235,7 +235,7 @@ SENSOR_TYPES: tuple[Dremel3DPrinterSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: DremelConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the available Dremel 3D Printer sensors."""
     async_add_entities(
diff --git a/homeassistant/components/drop_connect/__init__.py b/homeassistant/components/drop_connect/__init__.py
index bc700456398..52b8f5a7d6e 100644
--- a/homeassistant/components/drop_connect/__init__.py
+++ b/homeassistant/components/drop_connect/__init__.py
@@ -7,12 +7,11 @@ from typing import TYPE_CHECKING
 
 from homeassistant.components import mqtt
 from homeassistant.components.mqtt import ReceiveMessage
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 
-from .const import CONF_DATA_TOPIC, CONF_DEVICE_TYPE, DOMAIN
-from .coordinator import DROPDeviceDataUpdateCoordinator
+from .const import CONF_DATA_TOPIC, CONF_DEVICE_TYPE
+from .coordinator import DROPConfigEntry, DROPDeviceDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -24,7 +23,7 @@ PLATFORMS: list[Platform] = [
 ]
 
 
-async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, config_entry: DROPConfigEntry) -> bool:
     """Set up DROP from a config entry."""
 
     # Make sure MQTT integration is enabled and the client is available.
@@ -34,9 +33,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
 
     if TYPE_CHECKING:
         assert config_entry.unique_id is not None
-    drop_data_coordinator = DROPDeviceDataUpdateCoordinator(
-        hass, config_entry.unique_id
-    )
+    drop_data_coordinator = DROPDeviceDataUpdateCoordinator(hass, config_entry)
 
     @callback
     def mqtt_callback(msg: ReceiveMessage) -> None:
@@ -58,15 +55,13 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
         config_entry.data[CONF_DATA_TOPIC],
     )
 
-    hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = drop_data_coordinator
+    config_entry.runtime_data = drop_data_coordinator
     await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, config_entry: DROPConfigEntry
+) -> bool:
     """Unload a config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(
-        config_entry, PLATFORMS
-    ):
-        hass.data[DOMAIN].pop(config_entry.entry_id)
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(config_entry, PLATFORMS)
diff --git a/homeassistant/components/drop_connect/binary_sensor.py b/homeassistant/components/drop_connect/binary_sensor.py
index 093c5bcbb8e..f133be431f0 100644
--- a/homeassistant/components/drop_connect/binary_sensor.py
+++ b/homeassistant/components/drop_connect/binary_sensor.py
@@ -11,9 +11,8 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CONF_DEVICE_TYPE,
@@ -25,9 +24,8 @@ from .const import (
     DEV_RO_FILTER,
     DEV_SALT_SENSOR,
     DEV_SOFTENER,
-    DOMAIN,
 )
-from .coordinator import DROPDeviceDataUpdateCoordinator
+from .coordinator import DROPConfigEntry, DROPDeviceDataUpdateCoordinator
 from .entity import DROPEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -106,8 +104,8 @@ DEVICE_BINARY_SENSORS: dict[str, list[str]] = {
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DROPConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the DROP binary sensors from config entry."""
     _LOGGER.debug(
@@ -116,9 +114,10 @@ async def async_setup_entry(
         config_entry.entry_id,
     )
 
+    coordinator = config_entry.runtime_data
     if config_entry.data[CONF_DEVICE_TYPE] in DEVICE_BINARY_SENSORS:
         async_add_entities(
-            DROPBinarySensor(hass.data[DOMAIN][config_entry.entry_id], sensor)
+            DROPBinarySensor(coordinator, sensor)
             for sensor in BINARY_SENSORS
             if sensor.key in DEVICE_BINARY_SENSORS[config_entry.data[CONF_DEVICE_TYPE]]
         )
diff --git a/homeassistant/components/drop_connect/coordinator.py b/homeassistant/components/drop_connect/coordinator.py
index 0861e091153..d37127d89ed 100644
--- a/homeassistant/components/drop_connect/coordinator.py
+++ b/homeassistant/components/drop_connect/coordinator.py
@@ -16,14 +16,19 @@ from .const import CONF_COMMAND_TOPIC, DOMAIN
 _LOGGER = logging.getLogger(__name__)
 
 
+type DROPConfigEntry = ConfigEntry[DROPDeviceDataUpdateCoordinator]
+
+
 class DROPDeviceDataUpdateCoordinator(DataUpdateCoordinator[None]):
     """DROP device object."""
 
-    config_entry: ConfigEntry
+    config_entry: DROPConfigEntry
 
-    def __init__(self, hass: HomeAssistant, unique_id: str) -> None:
+    def __init__(self, hass: HomeAssistant, entry: DROPConfigEntry) -> None:
         """Initialize the device."""
-        super().__init__(hass, _LOGGER, name=f"{DOMAIN}-{unique_id}")
+        super().__init__(
+            hass, _LOGGER, config_entry=entry, name=f"{DOMAIN}-{entry.unique_id}"
+        )
         self.drop_api = DropAPI()
 
     async def set_water(self, value: int) -> None:
diff --git a/homeassistant/components/drop_connect/select.py b/homeassistant/components/drop_connect/select.py
index ad06576c9f3..e198033d0f7 100644
--- a/homeassistant/components/drop_connect/select.py
+++ b/homeassistant/components/drop_connect/select.py
@@ -8,12 +8,11 @@ import logging
 from typing import Any
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import CONF_DEVICE_TYPE, DEV_HUB, DOMAIN
-from .coordinator import DROPDeviceDataUpdateCoordinator
+from .const import CONF_DEVICE_TYPE, DEV_HUB
+from .coordinator import DROPConfigEntry, DROPDeviceDataUpdateCoordinator
 from .entity import DROPEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -50,8 +49,8 @@ DEVICE_SELECTS: dict[str, list[str]] = {
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DROPConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the DROP selects from config entry."""
     _LOGGER.debug(
@@ -60,9 +59,10 @@ async def async_setup_entry(
         config_entry.entry_id,
     )
 
+    coordinator = config_entry.runtime_data
     if config_entry.data[CONF_DEVICE_TYPE] in DEVICE_SELECTS:
         async_add_entities(
-            DROPSelect(hass.data[DOMAIN][config_entry.entry_id], select)
+            DROPSelect(coordinator, select)
             for select in SELECTS
             if select.key in DEVICE_SELECTS[config_entry.data[CONF_DEVICE_TYPE]]
         )
diff --git a/homeassistant/components/drop_connect/sensor.py b/homeassistant/components/drop_connect/sensor.py
index ad123ee13c7..c69e2e12ea0 100644
--- a/homeassistant/components/drop_connect/sensor.py
+++ b/homeassistant/components/drop_connect/sensor.py
@@ -12,7 +12,6 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONCENTRATION_PARTS_PER_MILLION,
     PERCENTAGE,
@@ -23,7 +22,7 @@ from homeassistant.const import (
     UnitOfVolumeFlowRate,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CONF_DEVICE_TYPE,
@@ -35,9 +34,8 @@ from .const import (
     DEV_PUMP_CONTROLLER,
     DEV_RO_FILTER,
     DEV_SOFTENER,
-    DOMAIN,
 )
-from .coordinator import DROPDeviceDataUpdateCoordinator
+from .coordinator import DROPConfigEntry, DROPDeviceDataUpdateCoordinator
 from .entity import DROPEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -243,8 +241,8 @@ DEVICE_SENSORS: dict[str, list[str]] = {
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DROPConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the DROP sensors from config entry."""
     _LOGGER.debug(
@@ -253,9 +251,10 @@ async def async_setup_entry(
         config_entry.entry_id,
     )
 
+    coordinator = config_entry.runtime_data
     if config_entry.data[CONF_DEVICE_TYPE] in DEVICE_SENSORS:
         async_add_entities(
-            DROPSensor(hass.data[DOMAIN][config_entry.entry_id], sensor)
+            DROPSensor(coordinator, sensor)
             for sensor in SENSORS
             if sensor.key in DEVICE_SENSORS[config_entry.data[CONF_DEVICE_TYPE]]
         )
diff --git a/homeassistant/components/drop_connect/switch.py b/homeassistant/components/drop_connect/switch.py
index 98841d7ca24..d52d17c5ea0 100644
--- a/homeassistant/components/drop_connect/switch.py
+++ b/homeassistant/components/drop_connect/switch.py
@@ -8,9 +8,8 @@ import logging
 from typing import Any
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CONF_DEVICE_TYPE,
@@ -18,9 +17,8 @@ from .const import (
     DEV_HUB,
     DEV_PROTECTION_VALVE,
     DEV_SOFTENER,
-    DOMAIN,
 )
-from .coordinator import DROPDeviceDataUpdateCoordinator
+from .coordinator import DROPConfigEntry, DROPDeviceDataUpdateCoordinator
 from .entity import DROPEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -66,8 +64,8 @@ DEVICE_SWITCHES: dict[str, list[str]] = {
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DROPConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the DROP switches from config entry."""
     _LOGGER.debug(
@@ -76,9 +74,10 @@ async def async_setup_entry(
         config_entry.entry_id,
     )
 
+    coordinator = config_entry.runtime_data
     if config_entry.data[CONF_DEVICE_TYPE] in DEVICE_SWITCHES:
         async_add_entities(
-            DROPSwitch(hass.data[DOMAIN][config_entry.entry_id], switch)
+            DROPSwitch(coordinator, switch)
             for switch in SWITCHES
             if switch.key in DEVICE_SWITCHES[config_entry.data[CONF_DEVICE_TYPE]]
         )
diff --git a/homeassistant/components/dsmr/config_flow.py b/homeassistant/components/dsmr/config_flow.py
index 7d6a641b006..6f15f99517b 100644
--- a/homeassistant/components/dsmr/config_flow.py
+++ b/homeassistant/components/dsmr/config_flow.py
@@ -59,7 +59,7 @@ class DSMRConnection:
         self._equipment_identifier = obis_ref.EQUIPMENT_IDENTIFIER
         if dsmr_version == "5B":
             self._equipment_identifier = obis_ref.BELGIUM_EQUIPMENT_IDENTIFIER
-        if dsmr_version == "5L":
+        if dsmr_version in ("5L", "5EONHU"):
             self._equipment_identifier = obis_ref.LUXEMBOURG_EQUIPMENT_IDENTIFIER
         if dsmr_version == "Q3D":
             self._equipment_identifier = obis_ref.Q3D_EQUIPMENT_IDENTIFIER
diff --git a/homeassistant/components/dsmr/const.py b/homeassistant/components/dsmr/const.py
index 4c6cb31ca4d..2682b4df1cc 100644
--- a/homeassistant/components/dsmr/const.py
+++ b/homeassistant/components/dsmr/const.py
@@ -28,7 +28,7 @@ DEVICE_NAME_GAS = "Gas Meter"
 DEVICE_NAME_WATER = "Water Meter"
 DEVICE_NAME_HEAT = "Heat Meter"
 
-DSMR_VERSIONS = {"2.2", "4", "5", "5B", "5L", "5S", "Q3D"}
+DSMR_VERSIONS = {"2.2", "4", "5", "5B", "5L", "5S", "Q3D", "5EONHU"}
 
 DSMR_PROTOCOL = "dsmr_protocol"
 RFXTRX_DSMR_PROTOCOL = "rfxtrx_dsmr_protocol"
diff --git a/homeassistant/components/dsmr/sensor.py b/homeassistant/components/dsmr/sensor.py
index e05785b8b26..ba528271824 100644
--- a/homeassistant/components/dsmr/sensor.py
+++ b/homeassistant/components/dsmr/sensor.py
@@ -43,7 +43,7 @@ from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util import Throttle
 
@@ -115,7 +115,7 @@ SENSORS: tuple[DSMRSensorEntityDescription, ...] = (
         key="electricity_active_tariff",
         translation_key="electricity_active_tariff",
         obis_reference="ELECTRICITY_ACTIVE_TARIFF",
-        dsmr_versions={"2.2", "4", "5", "5B", "5L"},
+        dsmr_versions={"2.2", "4", "5", "5B", "5L", "5EONHU"},
         device_class=SensorDeviceClass.ENUM,
         options=["low", "normal"],
     ),
@@ -123,7 +123,7 @@ SENSORS: tuple[DSMRSensorEntityDescription, ...] = (
         key="electricity_used_tariff_1",
         translation_key="electricity_used_tariff_1",
         obis_reference="ELECTRICITY_USED_TARIFF_1",
-        dsmr_versions={"2.2", "4", "5", "5B", "5L"},
+        dsmr_versions={"2.2", "4", "5", "5B", "5L", "5EONHU"},
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
@@ -131,7 +131,25 @@ SENSORS: tuple[DSMRSensorEntityDescription, ...] = (
         key="electricity_used_tariff_2",
         translation_key="electricity_used_tariff_2",
         obis_reference="ELECTRICITY_USED_TARIFF_2",
-        dsmr_versions={"2.2", "4", "5", "5B", "5L"},
+        dsmr_versions={"2.2", "4", "5", "5B", "5L", "5EONHU"},
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+    ),
+    DSMRSensorEntityDescription(
+        key="electricity_used_tariff_3",
+        translation_key="electricity_used_tariff_3",
+        obis_reference="ELECTRICITY_USED_TARIFF_3",
+        dsmr_versions={"5EONHU"},
+        force_update=True,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+    ),
+    DSMRSensorEntityDescription(
+        key="electricity_used_tariff_4",
+        translation_key="electricity_used_tariff_4",
+        obis_reference="ELECTRICITY_USED_TARIFF_4",
+        dsmr_versions={"5EONHU"},
+        force_update=True,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
@@ -139,7 +157,7 @@ SENSORS: tuple[DSMRSensorEntityDescription, ...] = (
         key="electricity_delivered_tariff_1",
         translation_key="electricity_delivered_tariff_1",
         obis_reference="ELECTRICITY_DELIVERED_TARIFF_1",
-        dsmr_versions={"2.2", "4", "5", "5B", "5L"},
+        dsmr_versions={"2.2", "4", "5", "5B", "5L", "5EONHU"},
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
@@ -147,7 +165,25 @@ SENSORS: tuple[DSMRSensorEntityDescription, ...] = (
         key="electricity_delivered_tariff_2",
         translation_key="electricity_delivered_tariff_2",
         obis_reference="ELECTRICITY_DELIVERED_TARIFF_2",
-        dsmr_versions={"2.2", "4", "5", "5B", "5L"},
+        dsmr_versions={"2.2", "4", "5", "5B", "5L", "5EONHU"},
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+    ),
+    DSMRSensorEntityDescription(
+        key="electricity_delivered_tariff_3",
+        translation_key="electricity_delivered_tariff_3",
+        obis_reference="ELECTRICITY_DELIVERED_TARIFF_3",
+        dsmr_versions={"5EONHU"},
+        force_update=True,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+    ),
+    DSMRSensorEntityDescription(
+        key="electricity_delivered_tariff_4",
+        translation_key="electricity_delivered_tariff_4",
+        obis_reference="ELECTRICITY_DELIVERED_TARIFF_4",
+        dsmr_versions={"5EONHU"},
+        force_update=True,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
@@ -341,7 +377,7 @@ SENSORS: tuple[DSMRSensorEntityDescription, ...] = (
         key="electricity_imported_total",
         translation_key="electricity_imported_total",
         obis_reference="ELECTRICITY_IMPORTED_TOTAL",
-        dsmr_versions={"5L", "5S", "Q3D"},
+        dsmr_versions={"5L", "5S", "Q3D", "5EONHU"},
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
@@ -349,7 +385,7 @@ SENSORS: tuple[DSMRSensorEntityDescription, ...] = (
         key="electricity_exported_total",
         translation_key="electricity_exported_total",
         obis_reference="ELECTRICITY_EXPORTED_TOTAL",
-        dsmr_versions={"5L", "5S", "Q3D"},
+        dsmr_versions={"5L", "5S", "Q3D", "5EONHU"},
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
@@ -387,6 +423,113 @@ SENSORS: tuple[DSMRSensorEntityDescription, ...] = (
         device_class=SensorDeviceClass.GAS,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
+    DSMRSensorEntityDescription(
+        key="actual_threshold_electricity",
+        translation_key="actual_threshold_electricity",
+        obis_reference="ACTUAL_TRESHOLD_ELECTRICITY",  # Misspelled in external tool
+        dsmr_versions={"5EONHU"},
+        device_class=SensorDeviceClass.POWER,
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    DSMRSensorEntityDescription(
+        key="eon_hu_electricity_combined",
+        translation_key="electricity_combined",
+        obis_reference="EON_HU_ELECTRICITY_COMBINED",
+        dsmr_versions={"5EONHU"},
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL,
+    ),
+    DSMRSensorEntityDescription(
+        key="eon_hu_instantaneous_power_factor_total",
+        translation_key="instantaneous_power_factor_total",
+        obis_reference="EON_HU_INSTANTANEOUS_POWER_FACTOR_TOTAL",
+        dsmr_versions={"5EONHU"},
+        entity_registry_enabled_default=False,
+        device_class=SensorDeviceClass.POWER_FACTOR,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    DSMRSensorEntityDescription(
+        key="eon_hu_instantaneous_power_factor_l1",
+        translation_key="instantaneous_power_factor_l1",
+        obis_reference="EON_HU_INSTANTANEOUS_POWER_FACTOR_L1",
+        dsmr_versions={"5EONHU"},
+        entity_registry_enabled_default=False,
+        device_class=SensorDeviceClass.POWER_FACTOR,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    DSMRSensorEntityDescription(
+        key="eon_hu_instantaneous_power_factor_l2",
+        translation_key="instantaneous_power_factor_l2",
+        obis_reference="EON_HU_INSTANTANEOUS_POWER_FACTOR_L2",
+        dsmr_versions={"5EONHU"},
+        entity_registry_enabled_default=False,
+        device_class=SensorDeviceClass.POWER_FACTOR,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    DSMRSensorEntityDescription(
+        key="eon_hu_instantaneous_power_factor_l3",
+        translation_key="instantaneous_power_factor_l3",
+        obis_reference="EON_HU_INSTANTANEOUS_POWER_FACTOR_L3",
+        dsmr_versions={"5EONHU"},
+        entity_registry_enabled_default=False,
+        device_class=SensorDeviceClass.POWER_FACTOR,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    DSMRSensorEntityDescription(
+        key="eon_hu_frequency",
+        translation_key="frequency",
+        obis_reference="EON_HU_FREQUENCY",
+        dsmr_versions={"5EONHU"},
+        entity_registry_enabled_default=False,
+        device_class=SensorDeviceClass.FREQUENCY,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    DSMRSensorEntityDescription(
+        key="fuse_threshold_l1",
+        translation_key="fuse_threshold_l1",
+        obis_reference="FUSE_THRESHOLD_L1",
+        dsmr_versions={"5EONHU"},
+        device_class=SensorDeviceClass.CURRENT,
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    DSMRSensorEntityDescription(
+        key="fuse_threshold_l2",
+        translation_key="fuse_threshold_l2",
+        obis_reference="FUSE_THRESHOLD_L2",
+        dsmr_versions={"5EONHU"},
+        device_class=SensorDeviceClass.CURRENT,
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    DSMRSensorEntityDescription(
+        key="fuse_threshold_l3",
+        translation_key="fuse_threshold_l3",
+        obis_reference="FUSE_THRESHOLD_L3",
+        dsmr_versions={"5EONHU"},
+        device_class=SensorDeviceClass.CURRENT,
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    DSMRSensorEntityDescription(
+        key="text_message",
+        translation_key="text_message",
+        obis_reference="TEXT_MESSAGE",
+        dsmr_versions={"5EONHU"},
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
 )
 
 SENSORS_MBUS_DEVICE_TYPE: dict[int, tuple[DSMRSensorEntityDescription, ...]] = {
@@ -549,7 +692,9 @@ def get_dsmr_object(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: DsmrConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: DsmrConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the DSMR sensor."""
     dsmr_version = entry.data[CONF_DSMR_VERSION]
@@ -842,8 +987,9 @@ class DSMREntity(SensorEntity):
     def translate_tariff(value: str, dsmr_version: str) -> str | None:
         """Convert 2/1 to normal/low depending on DSMR version."""
         # DSMR V5B: Note: In Belgium values are swapped:
+        # DSMR V5EONHU: Note: In EON HUngary values are swapped:
         # Rate code 2 is used for low rate and rate code 1 is used for normal rate.
-        if dsmr_version == "5B":
+        if dsmr_version in ("5B", "5EONHU"):
             if value == "0001":
                 value = "0002"
             elif value == "0002":
diff --git a/homeassistant/components/dsmr/strings.json b/homeassistant/components/dsmr/strings.json
index 055c0c41264..871dd382f2b 100644
--- a/homeassistant/components/dsmr/strings.json
+++ b/homeassistant/components/dsmr/strings.json
@@ -61,6 +61,12 @@
       "electricity_delivered_tariff_2": {
         "name": "Energy production (tarif 2)"
       },
+      "electricity_delivered_tariff_3": {
+        "name": "Energy production (tarif 3)"
+      },
+      "electricity_delivered_tariff_4": {
+        "name": "Energy production (tarif 4)"
+      },
       "electricity_exported_total": {
         "name": "Energy production (total)"
       },
@@ -73,6 +79,12 @@
       "electricity_used_tariff_2": {
         "name": "Energy consumption (tarif 2)"
       },
+      "electricity_used_tariff_3": {
+        "name": "Energy consumption (tarif 3)"
+      },
+      "electricity_used_tariff_4": {
+        "name": "Energy consumption (tarif 4)"
+      },
       "gas_meter_reading": {
         "name": "Gas consumption"
       },
@@ -150,6 +162,57 @@
       },
       "water_meter_reading": {
         "name": "Water consumption"
+      },
+      "actual_threshold_electricity": {
+        "name": "Actual threshold electricity"
+      },
+      "electricity_reactive_imported_total": {
+        "name": "Imported reactive electricity (total)"
+      },
+      "electricity_reactive_exported_total": {
+        "name": "Exported reactive electricity (total)"
+      },
+      "electricity_reactive_total_q1": {
+        "name": "Reactive electricity (Q1)"
+      },
+      "electricity_reactive_total_q2": {
+        "name": "Reactive electricity (Q2)"
+      },
+      "electricity_reactive_total_q3": {
+        "name": "Reactive electricity (Q3)"
+      },
+      "electricity_reactive_total_q4": {
+        "name": "Reactive electricity (Q4)"
+      },
+      "electricity_combined": {
+        "name": "Energy combined"
+      },
+      "instantaneous_power_factor_total": {
+        "name": "Instantaneous power factor (total)"
+      },
+      "instantaneous_power_factor_l1": {
+        "name": "Instantaneous power factor L1"
+      },
+      "instantaneous_power_factor_l2": {
+        "name": "Instantaneous power factor L2"
+      },
+      "instantaneous_power_factor_l3": {
+        "name": "Instantaneous power factor L3"
+      },
+      "frequency": {
+        "name": "Frequency"
+      },
+      "fuse_threshold_l1": {
+        "name": "Fuse threshold on L1"
+      },
+      "fuse_threshold_l2": {
+        "name": "Fuse threshold on L2"
+      },
+      "fuse_threshold_l3": {
+        "name": "Fuse threshold on L3"
+      },
+      "text_message": {
+        "name": "Text message"
       }
     }
   },
diff --git a/homeassistant/components/dsmr_reader/sensor.py b/homeassistant/components/dsmr_reader/sensor.py
index 784a4cdec51..c9bd9c9fff2 100644
--- a/homeassistant/components/dsmr_reader/sensor.py
+++ b/homeassistant/components/dsmr_reader/sensor.py
@@ -7,7 +7,7 @@ from homeassistant.components.sensor import SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.util import slugify
 
@@ -18,7 +18,7 @@ from .definitions import SENSORS, DSMRReaderSensorEntityDescription
 async def async_setup_entry(
     _: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up DSMR Reader sensors from config entry."""
     async_add_entities(DSMRSensor(description, config_entry) for description in SENSORS)
diff --git a/homeassistant/components/dublin_bus_transport/sensor.py b/homeassistant/components/dublin_bus_transport/sensor.py
index 5fc3453fca6..8720be7330f 100644
--- a/homeassistant/components/dublin_bus_transport/sensor.py
+++ b/homeassistant/components/dublin_bus_transport/sensor.py
@@ -20,10 +20,10 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_NAME, UnitOfTime
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 _RESOURCE = "https://data.dublinked.ie/cgi-bin/rtpi/realtimebusinformation"
 
diff --git a/homeassistant/components/duckdns/__init__.py b/homeassistant/components/duckdns/__init__.py
index 557178de571..a49bfde2785 100644
--- a/homeassistant/components/duckdns/__init__.py
+++ b/homeassistant/components/duckdns/__init__.py
@@ -18,8 +18,8 @@ from homeassistant.core import (
     ServiceCall,
     callback,
 )
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import bind_hass
diff --git a/homeassistant/components/duke_energy/__init__.py b/homeassistant/components/duke_energy/__init__.py
index 6eacc15880f..bfa89d81c69 100644
--- a/homeassistant/components/duke_energy/__init__.py
+++ b/homeassistant/components/duke_energy/__init__.py
@@ -10,7 +10,7 @@ from .coordinator import DukeEnergyConfigEntry, DukeEnergyCoordinator
 async def async_setup_entry(hass: HomeAssistant, entry: DukeEnergyConfigEntry) -> bool:
     """Set up Duke Energy from a config entry."""
 
-    coordinator = DukeEnergyCoordinator(hass, entry.data)
+    coordinator = DukeEnergyCoordinator(hass, entry)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
 
diff --git a/homeassistant/components/duke_energy/coordinator.py b/homeassistant/components/duke_energy/coordinator.py
index 2b0ae46b405..a76168475c0 100644
--- a/homeassistant/components/duke_energy/coordinator.py
+++ b/homeassistant/components/duke_energy/coordinator.py
@@ -2,14 +2,17 @@
 
 from datetime import datetime, timedelta
 import logging
-from types import MappingProxyType
 from typing import Any, cast
 
 from aiodukeenergy import DukeEnergy
 from aiohttp import ClientError
 
 from homeassistant.components.recorder import get_instance
-from homeassistant.components.recorder.models import StatisticData, StatisticMetaData
+from homeassistant.components.recorder.models import (
+    StatisticData,
+    StatisticMeanType,
+    StatisticMetaData,
+)
 from homeassistant.components.recorder.statistics import (
     async_add_external_statistics,
     get_last_statistics,
@@ -37,22 +40,21 @@ class DukeEnergyCoordinator(DataUpdateCoordinator[None]):
     config_entry: DukeEnergyConfigEntry
 
     def __init__(
-        self,
-        hass: HomeAssistant,
-        entry_data: MappingProxyType[str, Any],
+        self, hass: HomeAssistant, config_entry: DukeEnergyConfigEntry
     ) -> None:
         """Initialize the data handler."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="Duke Energy",
             # Data is updated daily on Duke Energy.
             # Refresh every 12h to be at most 12h behind.
             update_interval=timedelta(hours=12),
         )
         self.api = DukeEnergy(
-            entry_data[CONF_USERNAME],
-            entry_data[CONF_PASSWORD],
+            config_entry.data[CONF_USERNAME],
+            config_entry.data[CONF_PASSWORD],
             async_get_clientsession(hass),
         )
         self._statistic_ids: set = set()
@@ -139,7 +141,7 @@ class DukeEnergyCoordinator(DataUpdateCoordinator[None]):
                 f"Duke Energy {meter['serviceType'].capitalize()} {serial_number}"
             )
             consumption_metadata = StatisticMetaData(
-                has_mean=False,
+                mean_type=StatisticMeanType.NONE,
                 has_sum=True,
                 name=f"{name_prefix} Consumption",
                 source=DOMAIN,
diff --git a/homeassistant/components/dunehd/media_player.py b/homeassistant/components/dunehd/media_player.py
index db903cac2bf..b3093221385 100644
--- a/homeassistant/components/dunehd/media_player.py
+++ b/homeassistant/components/dunehd/media_player.py
@@ -17,7 +17,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DuneHDConfigEntry
 from .const import ATTR_MANUFACTURER, DEFAULT_NAME, DOMAIN
@@ -39,7 +39,7 @@ DUNEHD_PLAYER_SUPPORT: Final[MediaPlayerEntityFeature] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DuneHDConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Dune HD entities from a config_entry."""
     async_add_entities(
diff --git a/homeassistant/components/duotecno/binary_sensor.py b/homeassistant/components/duotecno/binary_sensor.py
index aadef47b998..e2431b5eade 100644
--- a/homeassistant/components/duotecno/binary_sensor.py
+++ b/homeassistant/components/duotecno/binary_sensor.py
@@ -6,7 +6,7 @@ from duotecno.unit import ControlUnit, VirtualUnit
 
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DuotecnoConfigEntry
 from .entity import DuotecnoEntity
@@ -15,7 +15,7 @@ from .entity import DuotecnoEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DuotecnoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Duotecno binary sensor on config_entry."""
     async_add_entities(
diff --git a/homeassistant/components/duotecno/climate.py b/homeassistant/components/duotecno/climate.py
index 83a211d97f5..0ae6735feb5 100644
--- a/homeassistant/components/duotecno/climate.py
+++ b/homeassistant/components/duotecno/climate.py
@@ -13,7 +13,7 @@ from homeassistant.components.climate import (
 )
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DuotecnoConfigEntry
 from .entity import DuotecnoEntity, api_call
@@ -32,7 +32,7 @@ PRESETMODES_REVERSE: Final = {value: key for key, value in PRESETMODES.items()}
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DuotecnoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Duotecno climate based on config_entry."""
     async_add_entities(
diff --git a/homeassistant/components/duotecno/cover.py b/homeassistant/components/duotecno/cover.py
index 7d879741555..e184cf7ffb3 100644
--- a/homeassistant/components/duotecno/cover.py
+++ b/homeassistant/components/duotecno/cover.py
@@ -8,7 +8,7 @@ from duotecno.unit import DuoswitchUnit
 
 from homeassistant.components.cover import CoverEntity, CoverEntityFeature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DuotecnoConfigEntry
 from .entity import DuotecnoEntity, api_call
@@ -17,7 +17,7 @@ from .entity import DuotecnoEntity, api_call
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DuotecnoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the duoswitch endities."""
     async_add_entities(
diff --git a/homeassistant/components/duotecno/light.py b/homeassistant/components/duotecno/light.py
index 7b41cbaef22..38617c92748 100644
--- a/homeassistant/components/duotecno/light.py
+++ b/homeassistant/components/duotecno/light.py
@@ -6,7 +6,7 @@ from duotecno.unit import DimUnit
 
 from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DuotecnoConfigEntry
 from .entity import DuotecnoEntity, api_call
@@ -15,7 +15,7 @@ from .entity import DuotecnoEntity, api_call
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DuotecnoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Duotecno light based on config_entry."""
     async_add_entities(
diff --git a/homeassistant/components/duotecno/switch.py b/homeassistant/components/duotecno/switch.py
index 0c01a6ca4de..cef7715e946 100644
--- a/homeassistant/components/duotecno/switch.py
+++ b/homeassistant/components/duotecno/switch.py
@@ -6,7 +6,7 @@ from duotecno.unit import SwitchUnit
 
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DuotecnoConfigEntry
 from .entity import DuotecnoEntity, api_call
@@ -15,7 +15,7 @@ from .entity import DuotecnoEntity, api_call
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DuotecnoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Velbus switch based on config_entry."""
     async_add_entities(
diff --git a/homeassistant/components/dwd_weather_warnings/__init__.py b/homeassistant/components/dwd_weather_warnings/__init__.py
index 7a56299a35b..727fcf95339 100644
--- a/homeassistant/components/dwd_weather_warnings/__init__.py
+++ b/homeassistant/components/dwd_weather_warnings/__init__.py
@@ -16,7 +16,7 @@ async def async_setup_entry(
     device_registry = dr.async_get(hass)
     if device_registry.async_get_device(identifiers={(DOMAIN, entry.entry_id)}):
         device_registry.async_clear_config_entry(entry.entry_id)
-    coordinator = DwdWeatherWarningsCoordinator(hass)
+    coordinator = DwdWeatherWarningsCoordinator(hass, entry)
     await coordinator.async_config_entry_first_refresh()
 
     entry.runtime_data = coordinator
diff --git a/homeassistant/components/dwd_weather_warnings/config_flow.py b/homeassistant/components/dwd_weather_warnings/config_flow.py
index f148f4e05ac..064cf52d04d 100644
--- a/homeassistant/components/dwd_weather_warnings/config_flow.py
+++ b/homeassistant/components/dwd_weather_warnings/config_flow.py
@@ -8,8 +8,7 @@ from dwdwfsapi import DwdWeatherWarningsAPI
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.helpers import entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.selector import EntitySelector, EntitySelectorConfig
 
 from .const import CONF_REGION_DEVICE_TRACKER, CONF_REGION_IDENTIFIER, DOMAIN
diff --git a/homeassistant/components/dwd_weather_warnings/coordinator.py b/homeassistant/components/dwd_weather_warnings/coordinator.py
index be61304bc06..61656a82de6 100644
--- a/homeassistant/components/dwd_weather_warnings/coordinator.py
+++ b/homeassistant/components/dwd_weather_warnings/coordinator.py
@@ -28,10 +28,16 @@ class DwdWeatherWarningsCoordinator(DataUpdateCoordinator[None]):
     config_entry: DwdWeatherWarningsConfigEntry
     api: DwdWeatherWarningsAPI
 
-    def __init__(self, hass: HomeAssistant) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: DwdWeatherWarningsConfigEntry
+    ) -> None:
         """Initialize the dwd_weather_warnings coordinator."""
         super().__init__(
-            hass, LOGGER, name=DOMAIN, update_interval=DEFAULT_SCAN_INTERVAL
+            hass,
+            LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=DEFAULT_SCAN_INTERVAL,
         )
 
         self._device_tracker = None
diff --git a/homeassistant/components/dwd_weather_warnings/sensor.py b/homeassistant/components/dwd_weather_warnings/sensor.py
index c6aa5727b74..1c2817350a5 100644
--- a/homeassistant/components/dwd_weather_warnings/sensor.py
+++ b/homeassistant/components/dwd_weather_warnings/sensor.py
@@ -3,7 +3,7 @@
 Data is fetched from DWD:
 https://rcccm.dwd.de/DE/wetter/warnungen_aktuell/objekt_einbindung/objekteinbindung.html
 
-Warnungen vor extremem Unwetter (Stufe 4)  # codespell:ignore vor
+Warnungen vor extremem Unwetter (Stufe 4)  # codespell:ignore vor,extremem
 Unwetterwarnungen (Stufe 3)
 Warnungen vor markantem Wetter (Stufe 2)  # codespell:ignore vor
 Wetterwarnungen (Stufe 1)
@@ -16,7 +16,7 @@ from typing import Any
 from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
@@ -55,7 +55,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: DwdWeatherWarningsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entities from config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/dweet/__init__.py b/homeassistant/components/dweet/__init__.py
index c1232bab2cf..b43ce3db8c1 100644
--- a/homeassistant/components/dweet/__init__.py
+++ b/homeassistant/components/dweet/__init__.py
@@ -14,8 +14,7 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import state as state_helper
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, state as state_helper
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import Throttle
 
diff --git a/homeassistant/components/dweet/sensor.py b/homeassistant/components/dweet/sensor.py
index 10109189eb0..6110f17f826 100644
--- a/homeassistant/components/dweet/sensor.py
+++ b/homeassistant/components/dweet/sensor.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     CONF_VALUE_TEMPLATE,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/dynalite/__init__.py b/homeassistant/components/dynalite/__init__.py
index a1a6a38c8ab..3411882b725 100644
--- a/homeassistant/components/dynalite/__init__.py
+++ b/homeassistant/components/dynalite/__init__.py
@@ -16,11 +16,11 @@ from .services import setup_services
 
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
+type DynaliteConfigEntry = ConfigEntry[DynaliteBridge]
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Dynalite platform."""
-    hass.data[DOMAIN] = {}
-
     setup_services(hass)
 
     await async_register_dynalite_frontend(hass)
@@ -28,35 +28,30 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     return True
 
 
-async def async_entry_changed(hass: HomeAssistant, entry: ConfigEntry) -> None:
+async def async_entry_changed(hass: HomeAssistant, entry: DynaliteConfigEntry) -> None:
     """Reload entry since the data has changed."""
     LOGGER.debug("Reconfiguring entry %s", entry.data)
-    bridge = hass.data[DOMAIN][entry.entry_id]
+    bridge = entry.runtime_data
     bridge.reload_config(entry.data)
     LOGGER.debug("Reconfiguring entry finished %s", entry.data)
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: DynaliteConfigEntry) -> bool:
     """Set up a bridge from a config entry."""
     LOGGER.debug("Setting up entry %s", entry.data)
     bridge = DynaliteBridge(hass, convert_config(entry.data))
-    # need to do it before the listener
-    hass.data[DOMAIN][entry.entry_id] = bridge
-    entry.async_on_unload(entry.add_update_listener(async_entry_changed))
 
     if not await bridge.async_setup():
         LOGGER.error("Could not set up bridge for entry %s", entry.data)
-        hass.data[DOMAIN][entry.entry_id] = None
         raise ConfigEntryNotReady
 
+    entry.runtime_data = bridge
+    entry.async_on_unload(entry.add_update_listener(async_entry_changed))
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: DynaliteConfigEntry) -> bool:
     """Unload a config entry."""
     LOGGER.debug("Unloading entry %s", entry.data)
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/dynalite/bridge.py b/homeassistant/components/dynalite/bridge.py
index 6f090371eee..0e491281619 100644
--- a/homeassistant/components/dynalite/bridge.py
+++ b/homeassistant/components/dynalite/bridge.py
@@ -16,6 +16,7 @@ from dynalite_devices_lib.dynalite_devices import (
     DynaliteNotification,
 )
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_send
@@ -23,6 +24,8 @@ from homeassistant.helpers.dispatcher import async_dispatcher_send
 from .const import ATTR_AREA, ATTR_HOST, ATTR_PACKET, ATTR_PRESET, LOGGER, PLATFORMS
 from .convert_config import convert_config
 
+type DynaliteConfigEntry = ConfigEntry[DynaliteBridge]
+
 
 class DynaliteBridge:
     """Manages a single Dynalite bridge."""
diff --git a/homeassistant/components/dynalite/cover.py b/homeassistant/components/dynalite/cover.py
index d7f366d919c..2cd473a2977 100644
--- a/homeassistant/components/dynalite/cover.py
+++ b/homeassistant/components/dynalite/cover.py
@@ -7,19 +7,18 @@ from homeassistant.components.cover import (
     CoverDeviceClass,
     CoverEntity,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
 
-from .bridge import DynaliteBridge
+from .bridge import DynaliteBridge, DynaliteConfigEntry
 from .entity import DynaliteBase, async_setup_entry_base
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DynaliteConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Record the async_add_entities function to add them later when received from Dynalite."""
 
diff --git a/homeassistant/components/dynalite/entity.py b/homeassistant/components/dynalite/entity.py
index 62667dc19c3..7957e9c8515 100644
--- a/homeassistant/components/dynalite/entity.py
+++ b/homeassistant/components/dynalite/entity.py
@@ -6,27 +6,26 @@ from abc import ABC, abstractmethod
 from collections.abc import Callable
 from typing import Any
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
-from .bridge import DynaliteBridge
+from .bridge import DynaliteBridge, DynaliteConfigEntry
 from .const import DOMAIN, LOGGER
 
 
 def async_setup_entry_base(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: DynaliteConfigEntry,
     async_add_entities: AddEntitiesCallback,
     platform: str,
     entity_from_device: Callable,
 ) -> None:
     """Record the async_add_entities function to add them later when received from Dynalite."""
     LOGGER.debug("Setting up %s entry = %s", platform, config_entry.data)
-    bridge = hass.data[DOMAIN][config_entry.entry_id]
+    bridge = config_entry.runtime_data
 
     @callback
     def async_add_entities_platform(devices):
diff --git a/homeassistant/components/dynalite/light.py b/homeassistant/components/dynalite/light.py
index e0dd8b147aa..e9816c828db 100644
--- a/homeassistant/components/dynalite/light.py
+++ b/homeassistant/components/dynalite/light.py
@@ -3,17 +3,17 @@
 from typing import Any
 
 from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from .bridge import DynaliteConfigEntry
 from .entity import DynaliteBase, async_setup_entry_base
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DynaliteConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Record the async_add_entities function to add them later when received from Dynalite."""
     async_setup_entry_base(
diff --git a/homeassistant/components/dynalite/services.py b/homeassistant/components/dynalite/services.py
index 14160cced9d..d0d57a582b4 100644
--- a/homeassistant/components/dynalite/services.py
+++ b/homeassistant/components/dynalite/services.py
@@ -23,9 +23,9 @@ from .const import (
 def _get_bridges(service_call: ServiceCall) -> list[DynaliteBridge]:
     host = service_call.data.get(ATTR_HOST, "")
     bridges = [
-        bridge
-        for bridge in service_call.hass.data[DOMAIN].values()
-        if not host or bridge.host == host
+        entry.runtime_data
+        for entry in service_call.hass.config_entries.async_loaded_entries(DOMAIN)
+        if not host or entry.runtime_data.host == host
     ]
     LOGGER.debug("Selected bridges for service call: %s", bridges)
     return bridges
diff --git a/homeassistant/components/dynalite/strings.json b/homeassistant/components/dynalite/strings.json
index 468cdebf0b1..4f73f91113b 100644
--- a/homeassistant/components/dynalite/strings.json
+++ b/homeassistant/components/dynalite/strings.json
@@ -36,7 +36,7 @@
     },
     "request_channel_level": {
       "name": "Request channel level",
-      "description": "Requests Dynalite to report the level of a specific channel.",
+      "description": "Requests Dynalite to report the brightness level of a specific channel.",
       "fields": {
         "host": {
           "name": "[%key:common::config_flow::data::host%]",
@@ -48,7 +48,7 @@
         },
         "channel": {
           "name": "Channel",
-          "description": "Channel to request the level for."
+          "description": "Channel to request the brightness level for."
         }
       }
     }
diff --git a/homeassistant/components/dynalite/switch.py b/homeassistant/components/dynalite/switch.py
index d24a098056a..29f78ecbc20 100644
--- a/homeassistant/components/dynalite/switch.py
+++ b/homeassistant/components/dynalite/switch.py
@@ -3,18 +3,18 @@
 from typing import Any
 
 from homeassistant.components.switch import SwitchEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_ON
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from .bridge import DynaliteConfigEntry
 from .entity import DynaliteBase, async_setup_entry_base
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: DynaliteConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Record the async_add_entities function to add them later when received from Dynalite."""
     async_setup_entry_base(
diff --git a/homeassistant/components/eafm/__init__.py b/homeassistant/components/eafm/__init__.py
index dc618a983f3..e2af2bae9f5 100644
--- a/homeassistant/components/eafm/__init__.py
+++ b/homeassistant/components/eafm/__init__.py
@@ -1,64 +1,22 @@
 """UK Environment Agency Flood Monitoring Integration."""
 
-import asyncio
-from datetime import timedelta
-import logging
-from typing import Any
-
-from aioeafm import get_station
-
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
-from .const import DOMAIN
+from .coordinator import EafmConfigEntry, EafmCoordinator
 
 PLATFORMS = [Platform.SENSOR]
 
-_LOGGER = logging.getLogger(__name__)
 
-
-def get_measures(station_data):
-    """Force measure key to always be a list."""
-    if "measures" not in station_data:
-        return []
-    if isinstance(station_data["measures"], dict):
-        return [station_data["measures"]]
-    return station_data["measures"]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: EafmConfigEntry) -> bool:
     """Set up flood monitoring sensors for this config entry."""
-    station_key = entry.data["station"]
-    session = async_get_clientsession(hass=hass)
-
-    async def _async_update_data() -> dict[str, dict[str, Any]]:
-        # DataUpdateCoordinator will handle aiohttp ClientErrors and timeouts
-        async with asyncio.timeout(30):
-            data = await get_station(session, station_key)
-
-        measures = get_measures(data)
-        # Turn data.measures into a dict rather than a list so easier for entities to
-        # find themselves.
-        data["measures"] = {measure["@id"]: measure for measure in measures}
-        return data
-
-    coordinator = DataUpdateCoordinator[dict[str, dict[str, Any]]](
-        hass,
-        _LOGGER,
-        config_entry=entry,
-        name="sensor",
-        update_method=_async_update_data,
-        update_interval=timedelta(seconds=15 * 60),
-    )
+    coordinator = EafmCoordinator(hass, entry=entry)
     await coordinator.async_config_entry_first_refresh()
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+    entry.runtime_data = coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: EafmConfigEntry) -> bool:
     """Unload flood monitoring sensors."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/eafm/coordinator.py b/homeassistant/components/eafm/coordinator.py
new file mode 100644
index 00000000000..375368210a5
--- /dev/null
+++ b/homeassistant/components/eafm/coordinator.py
@@ -0,0 +1,57 @@
+"""UK Environment Agency Flood Monitoring Integration."""
+
+import asyncio
+from datetime import timedelta
+import logging
+from typing import Any
+
+from aioeafm import get_station
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+
+PLATFORMS = [Platform.SENSOR]
+
+_LOGGER = logging.getLogger(__name__)
+
+type EafmConfigEntry = ConfigEntry[EafmCoordinator]
+
+
+def _get_measures(station_data: dict[str, Any]) -> list[dict[str, Any]]:
+    """Force measure key to always be a list."""
+    if "measures" not in station_data:
+        return []
+    if isinstance(station_data["measures"], dict):
+        return [station_data["measures"]]
+    return station_data["measures"]
+
+
+class EafmCoordinator(DataUpdateCoordinator[dict[str, dict[str, Any]]]):
+    """Class to manage fetching UK Flood Monitoring data."""
+
+    def __init__(self, hass: HomeAssistant, entry: EafmConfigEntry) -> None:
+        """Initialize."""
+        self._station_key = entry.data["station"]
+        self._session = async_get_clientsession(hass=hass)
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=entry,
+            name="sensor",
+            update_interval=timedelta(seconds=15 * 60),
+        )
+
+    async def _async_update_data(self) -> dict[str, dict[str, Any]]:
+        """Fetch the latest data from the source."""
+        # DataUpdateCoordinator will handle aiohttp ClientErrors and timeouts
+        async with asyncio.timeout(30):
+            data = await get_station(self._session, self._station_key)
+
+        measures = _get_measures(data)
+        # Turn data.measures into a dict rather than a list so easier for entities to
+        # find themselves.
+        data["measures"] = {measure["@id"]: measure for measure in measures}
+        return data
diff --git a/homeassistant/components/eafm/sensor.py b/homeassistant/components/eafm/sensor.py
index 297f4d6d2c8..5d0af596521 100644
--- a/homeassistant/components/eafm/sensor.py
+++ b/homeassistant/components/eafm/sensor.py
@@ -3,17 +3,14 @@
 from typing import Any
 
 from homeassistant.components.sensor import SensorEntity, SensorStateClass
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfLength
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.update_coordinator import (
-    CoordinatorEntity,
-    DataUpdateCoordinator,
-)
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
+from .coordinator import EafmConfigEntry, EafmCoordinator
 
 UNIT_MAPPING = {
     "http://qudt.org/1.1/vocab/unit#Meter": UnitOfLength.METERS,
@@ -22,11 +19,11 @@ UNIT_MAPPING = {
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: EafmConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up UK Flood Monitoring Sensors."""
-    coordinator: DataUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
     created_entities: set[str] = set()
 
     @callback
@@ -70,7 +67,7 @@ class Measurement(CoordinatorEntity, SensorEntity):
     _attr_has_entity_name = True
     _attr_name = None
 
-    def __init__(self, coordinator, key):
+    def __init__(self, coordinator: EafmCoordinator, key: str) -> None:
         """Initialise the gauge with a data instance and station."""
         super().__init__(coordinator)
         self.key = key
diff --git a/homeassistant/components/easyenergy/sensor.py b/homeassistant/components/easyenergy/sensor.py
index 6976a38da49..35fab870af3 100644
--- a/homeassistant/components/easyenergy/sensor.py
+++ b/homeassistant/components/easyenergy/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, SERVICE_TYPE_DEVICE_NAMES
@@ -213,7 +213,7 @@ def get_gas_price(data: EasyEnergyData, hours: int) -> float | None:
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: EasyEnergyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up easyEnergy sensors based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/easyenergy/strings.json b/homeassistant/components/easyenergy/strings.json
index 96afffdf78f..502db7920a3 100644
--- a/homeassistant/components/easyenergy/strings.json
+++ b/homeassistant/components/easyenergy/strings.json
@@ -60,12 +60,12 @@
       "description": "Requests gas prices from easyEnergy.",
       "fields": {
         "config_entry": {
-          "name": "Config Entry",
+          "name": "Config entry",
           "description": "The configuration entry to use for this action."
         },
         "incl_vat": {
-          "name": "VAT Included",
-          "description": "Include or exclude VAT in the prices, default is true."
+          "name": "VAT included",
+          "description": "Whether the prices should include VAT."
         },
         "start": {
           "name": "Start",
diff --git a/homeassistant/components/ebox/sensor.py b/homeassistant/components/ebox/sensor.py
index 691e9dd8275..a7628e78a9a 100644
--- a/homeassistant/components/ebox/sensor.py
+++ b/homeassistant/components/ebox/sensor.py
@@ -29,8 +29,8 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/ebusd/__init__.py b/homeassistant/components/ebusd/__init__.py
index c9386999fae..4cb8d92c391 100644
--- a/homeassistant/components/ebusd/__init__.py
+++ b/homeassistant/components/ebusd/__init__.py
@@ -13,7 +13,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import load_platform
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/ebusd/sensor.py b/homeassistant/components/ebusd/sensor.py
index 2eaaddf7e2f..ccd04be585e 100644
--- a/homeassistant/components/ebusd/sensor.py
+++ b/homeassistant/components/ebusd/sensor.py
@@ -9,8 +9,7 @@ from homeassistant.components.sensor import SensorEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import Throttle
-import homeassistant.util.dt as dt_util
+from homeassistant.util import Throttle, dt as dt_util
 
 from .const import DOMAIN
 
diff --git a/homeassistant/components/ecoal_boiler/__init__.py b/homeassistant/components/ecoal_boiler/__init__.py
index e9b519c7095..0648dfb56bf 100644
--- a/homeassistant/components/ecoal_boiler/__init__.py
+++ b/homeassistant/components/ecoal_boiler/__init__.py
@@ -15,7 +15,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import load_platform
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/ecobee/__init__.py b/homeassistant/components/ecobee/__init__.py
index 54af6c0f801..c34211e9ff0 100644
--- a/homeassistant/components/ecobee/__init__.py
+++ b/homeassistant/components/ecobee/__init__.py
@@ -3,72 +3,36 @@
 from datetime import timedelta
 
 from pyecobee import ECOBEE_API_KEY, ECOBEE_REFRESH_TOKEN, Ecobee, ExpiredTokenError
-import voluptuous as vol
 
-from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import Throttle
 
-from .const import (
-    _LOGGER,
-    CONF_REFRESH_TOKEN,
-    DATA_ECOBEE_CONFIG,
-    DATA_HASS_CONFIG,
-    DOMAIN,
-    PLATFORMS,
-)
+from .const import _LOGGER, CONF_REFRESH_TOKEN, PLATFORMS
 
 MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=180)
 
-CONFIG_SCHEMA = vol.Schema(
-    {DOMAIN: vol.Schema({vol.Optional(CONF_API_KEY): cv.string})}, extra=vol.ALLOW_EXTRA
-)
+type EcobeeConfigEntry = ConfigEntry[EcobeeData]
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Ecobee uses config flow for configuration.
-
-    But, an "ecobee:" entry in configuration.yaml will trigger an import flow
-    if a config entry doesn't already exist. If ecobee.conf exists, the import
-    flow will attempt to import it and create a config entry, to assist users
-    migrating from the old ecobee integration. Otherwise, the user will have to
-    continue setting up the integration via the config flow.
-    """
-
-    hass.data[DATA_ECOBEE_CONFIG] = config.get(DOMAIN, {})
-    hass.data[DATA_HASS_CONFIG] = config
-
-    if not hass.config_entries.async_entries(DOMAIN) and hass.data[DATA_ECOBEE_CONFIG]:
-        # No config entry exists and configuration.yaml config exists, trigger the import flow.
-        hass.async_create_task(
-            hass.config_entries.flow.async_init(
-                DOMAIN, context={"source": SOURCE_IMPORT}
-            )
-        )
-
-    return True
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: EcobeeConfigEntry) -> bool:
     """Set up ecobee via a config entry."""
     api_key = entry.data[CONF_API_KEY]
     refresh_token = entry.data[CONF_REFRESH_TOKEN]
 
-    data = EcobeeData(hass, entry, api_key=api_key, refresh_token=refresh_token)
+    runtime_data = EcobeeData(hass, entry, api_key=api_key, refresh_token=refresh_token)
 
-    if not await data.refresh():
+    if not await runtime_data.refresh():
         return False
 
-    await data.update()
+    await runtime_data.update()
 
-    if data.ecobee.thermostats is None:
+    if runtime_data.ecobee.thermostats is None:
         _LOGGER.error("No ecobee devices found to set up")
         return False
 
-    hass.data[DOMAIN] = data
+    entry.runtime_data = runtime_data
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
@@ -117,9 +81,6 @@ class EcobeeData:
         return False
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: EcobeeConfigEntry) -> bool:
     """Unload the config entry and platforms."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if unload_ok:
-        hass.data.pop(DOMAIN)
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/ecobee/binary_sensor.py b/homeassistant/components/ecobee/binary_sensor.py
index 2a021442a63..76b3399ec6e 100644
--- a/homeassistant/components/ecobee/binary_sensor.py
+++ b/homeassistant/components/ecobee/binary_sensor.py
@@ -6,21 +6,21 @@ from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import EcobeeConfigEntry
 from .const import DOMAIN, ECOBEE_MODEL_TO_NAME, MANUFACTURER
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: EcobeeConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up ecobee binary (occupancy) sensors."""
-    data = hass.data[DOMAIN]
+    data = config_entry.runtime_data
     dev = []
     for index in range(len(data.ecobee.thermostats)):
         for sensor in data.ecobee.get_remote_sensors(index):
diff --git a/homeassistant/components/ecobee/climate.py b/homeassistant/components/ecobee/climate.py
index bfb2635481c..26fb362ba03 100644
--- a/homeassistant/components/ecobee/climate.py
+++ b/homeassistant/components/ecobee/climate.py
@@ -21,7 +21,6 @@ from homeassistant.components.climate import (
     HVACAction,
     HVACMode,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_TEMPERATURE,
@@ -33,13 +32,16 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers import device_registry as dr, entity_platform
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    entity_platform,
+)
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.unit_conversion import TemperatureConverter
 
-from . import EcobeeData
+from . import EcobeeConfigEntry, EcobeeData
 from .const import (
     _LOGGER,
     ATTR_ACTIVE_SENSORS,
@@ -201,12 +203,12 @@ SUPPORT_FLAGS = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: EcobeeConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ecobee thermostat."""
 
-    data = hass.data[DOMAIN]
+    data = config_entry.runtime_data
     entities = []
 
     for index in range(len(data.ecobee.thermostats)):
diff --git a/homeassistant/components/ecobee/config_flow.py b/homeassistant/components/ecobee/config_flow.py
index 687d9173a66..ac834e92ca8 100644
--- a/homeassistant/components/ecobee/config_flow.py
+++ b/homeassistant/components/ecobee/config_flow.py
@@ -2,20 +2,15 @@
 
 from typing import Any
 
-from pyecobee import (
-    ECOBEE_API_KEY,
-    ECOBEE_CONFIG_FILENAME,
-    ECOBEE_REFRESH_TOKEN,
-    Ecobee,
-)
+from pyecobee import ECOBEE_API_KEY, Ecobee
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_API_KEY
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.util.json import load_json_object
 
-from .const import _LOGGER, CONF_REFRESH_TOKEN, DATA_ECOBEE_CONFIG, DOMAIN
+from .const import CONF_REFRESH_TOKEN, DOMAIN
+
+_USER_SCHEMA = vol.Schema({vol.Required(CONF_API_KEY): str})
 
 
 class EcobeeFlowHandler(ConfigFlow, domain=DOMAIN):
@@ -30,11 +25,6 @@ class EcobeeFlowHandler(ConfigFlow, domain=DOMAIN):
     ) -> ConfigFlowResult:
         """Handle a flow initiated by the user."""
         errors = {}
-        stored_api_key = (
-            self.hass.data[DATA_ECOBEE_CONFIG].get(CONF_API_KEY)
-            if DATA_ECOBEE_CONFIG in self.hass.data
-            else ""
-        )
 
         if user_input is not None:
             # Use the user-supplied API key to attempt to obtain a PIN from ecobee.
@@ -47,9 +37,7 @@ class EcobeeFlowHandler(ConfigFlow, domain=DOMAIN):
 
         return self.async_show_form(
             step_id="user",
-            data_schema=vol.Schema(
-                {vol.Required(CONF_API_KEY, default=stored_api_key): str}
-            ),
+            data_schema=_USER_SCHEMA,
             errors=errors,
         )
 
@@ -75,50 +63,3 @@ class EcobeeFlowHandler(ConfigFlow, domain=DOMAIN):
             errors=errors,
             description_placeholders={"pin": self._ecobee.pin},
         )
-
-    async def async_step_import(self, import_data: None) -> ConfigFlowResult:
-        """Import ecobee config from configuration.yaml.
-
-        Triggered by async_setup only if a config entry doesn't already exist.
-        If ecobee.conf exists, we will attempt to validate the credentials
-        and create an entry if valid. Otherwise, we will delegate to the user
-        step so that the user can continue the config flow.
-        """
-        try:
-            legacy_config = await self.hass.async_add_executor_job(
-                load_json_object, self.hass.config.path(ECOBEE_CONFIG_FILENAME)
-            )
-            config = {
-                ECOBEE_API_KEY: legacy_config[ECOBEE_API_KEY],
-                ECOBEE_REFRESH_TOKEN: legacy_config[ECOBEE_REFRESH_TOKEN],
-            }
-        except (HomeAssistantError, KeyError):
-            _LOGGER.debug(
-                "No valid ecobee.conf configuration found for import, delegating to"
-                " user step"
-            )
-            return await self.async_step_user(
-                user_input={
-                    CONF_API_KEY: self.hass.data[DATA_ECOBEE_CONFIG].get(CONF_API_KEY)
-                }
-            )
-
-        ecobee = Ecobee(config=config)
-        if await self.hass.async_add_executor_job(ecobee.refresh_tokens):
-            # Credentials found and validated; create the entry.
-            _LOGGER.debug(
-                "Valid ecobee configuration found for import, creating configuration"
-                " entry"
-            )
-            return self.async_create_entry(
-                title=DOMAIN,
-                data={
-                    CONF_API_KEY: ecobee.api_key,
-                    CONF_REFRESH_TOKEN: ecobee.refresh_token,
-                },
-            )
-        return await self.async_step_user(
-            user_input={
-                CONF_API_KEY: self.hass.data[DATA_ECOBEE_CONFIG].get(CONF_API_KEY)
-            }
-        )
diff --git a/homeassistant/components/ecobee/const.py b/homeassistant/components/ecobee/const.py
index d0e9ba8e8e9..115c91eceeb 100644
--- a/homeassistant/components/ecobee/const.py
+++ b/homeassistant/components/ecobee/const.py
@@ -20,8 +20,6 @@ from homeassistant.const import Platform
 _LOGGER = logging.getLogger(__package__)
 
 DOMAIN = "ecobee"
-DATA_ECOBEE_CONFIG = "ecobee_config"
-DATA_HASS_CONFIG = "ecobee_hass_config"
 ATTR_CONFIG_ENTRY_ID = "entry_id"
 ATTR_AVAILABLE_SENSORS = "available_sensors"
 ATTR_ACTIVE_SENSORS = "active_sensors"
diff --git a/homeassistant/components/ecobee/humidifier.py b/homeassistant/components/ecobee/humidifier.py
index d9616383ab6..a6f3c16f84a 100644
--- a/homeassistant/components/ecobee/humidifier.py
+++ b/homeassistant/components/ecobee/humidifier.py
@@ -3,20 +3,22 @@
 from __future__ import annotations
 
 from datetime import timedelta
+from typing import Any
 
 from homeassistant.components.humidifier import (
     DEFAULT_MAX_HUMIDITY,
     DEFAULT_MIN_HUMIDITY,
     MODE_AUTO,
+    HumidifierAction,
     HumidifierDeviceClass,
     HumidifierEntity,
     HumidifierEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import EcobeeConfigEntry
 from .const import DOMAIN, ECOBEE_MODEL_TO_NAME, MANUFACTURER
 
 SCAN_INTERVAL = timedelta(minutes=3)
@@ -27,11 +29,11 @@ MODE_OFF = "off"
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: EcobeeConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ecobee thermostat humidifier entity."""
-    data = hass.data[DOMAIN]
+    data = config_entry.runtime_data
     entities = []
     for index in range(len(data.ecobee.thermostats)):
         thermostat = data.ecobee.get_thermostat(index)
@@ -41,6 +43,12 @@ async def async_setup_entry(
     async_add_entities(entities, True)
 
 
+ECOBEE_HUMIDIFIER_ACTION_TO_HASS = {
+    "humidifier": HumidifierAction.HUMIDIFYING,
+    "dehumidifier": HumidifierAction.DRYING,
+}
+
+
 class EcobeeHumidifier(HumidifierEntity):
     """A humidifier class for an ecobee thermostat with humidifier attached."""
 
@@ -52,7 +60,7 @@ class EcobeeHumidifier(HumidifierEntity):
     _attr_has_entity_name = True
     _attr_name = None
 
-    def __init__(self, data, thermostat_index):
+    def __init__(self, data, thermostat_index) -> None:
         """Initialize ecobee humidifier platform."""
         self.data = data
         self.thermostat_index = thermostat_index
@@ -80,11 +88,11 @@ class EcobeeHumidifier(HumidifierEntity):
         )
 
     @property
-    def available(self):
+    def available(self) -> bool:
         """Return if device is available."""
         return self.thermostat["runtime"]["connected"]
 
-    async def async_update(self):
+    async def async_update(self) -> None:
         """Get the latest state from the thermostat."""
         if self.update_without_throttle:
             await self.data.update(no_throttle=True)
@@ -96,12 +104,20 @@ class EcobeeHumidifier(HumidifierEntity):
             self._last_humidifier_on_mode = self.mode
 
     @property
-    def is_on(self):
+    def action(self) -> HumidifierAction:
+        """Return the current action."""
+        for status in self.thermostat["equipmentStatus"].split(","):
+            if status in ECOBEE_HUMIDIFIER_ACTION_TO_HASS:
+                return ECOBEE_HUMIDIFIER_ACTION_TO_HASS[status]
+        return HumidifierAction.IDLE if self.is_on else HumidifierAction.OFF
+
+    @property
+    def is_on(self) -> bool:
         """Return True if the humidifier is on."""
         return self.mode != MODE_OFF
 
     @property
-    def mode(self):
+    def mode(self) -> str:
         """Return the current mode, e.g., off, auto, manual."""
         return self.thermostat["settings"]["humidifierMode"]
 
@@ -118,9 +134,11 @@ class EcobeeHumidifier(HumidifierEntity):
         except KeyError:
             return None
 
-    def set_mode(self, mode):
+    def set_mode(self, mode: str) -> None:
         """Set humidifier mode (auto, off, manual)."""
-        if mode.lower() not in (self.available_modes):
+        if self.available_modes is None:
+            raise NotImplementedError("Humidifier does not support modes.")
+        if mode.lower() not in self.available_modes:
             raise ValueError(
                 f"Invalid mode value: {mode}  Valid values are"
                 f" {', '.join(self.available_modes)}."
@@ -134,10 +152,10 @@ class EcobeeHumidifier(HumidifierEntity):
         self.data.ecobee.set_humidity(self.thermostat_index, humidity)
         self.update_without_throttle = True
 
-    def turn_off(self, **kwargs):
+    def turn_off(self, **kwargs: Any) -> None:
         """Set humidifier to off mode."""
         self.set_mode(MODE_OFF)
 
-    def turn_on(self, **kwargs):
+    def turn_on(self, **kwargs: Any) -> None:
         """Set humidifier to on mode."""
         self.set_mode(self._last_humidifier_on_mode)
diff --git a/homeassistant/components/ecobee/notify.py b/homeassistant/components/ecobee/notify.py
index 70860003b2a..2cf6a30acd7 100644
--- a/homeassistant/components/ecobee/notify.py
+++ b/homeassistant/components/ecobee/notify.py
@@ -3,22 +3,20 @@
 from __future__ import annotations
 
 from homeassistant.components.notify import NotifyEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import EcobeeData
-from .const import DOMAIN
+from . import EcobeeConfigEntry, EcobeeData
 from .entity import EcobeeBaseEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: EcobeeConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ecobee thermostat."""
-    data: EcobeeData = hass.data[DOMAIN]
+    data = config_entry.runtime_data
     async_add_entities(
         EcobeeNotifyEntity(data, index) for index in range(len(data.ecobee.thermostats))
     )
diff --git a/homeassistant/components/ecobee/number.py b/homeassistant/components/ecobee/number.py
index ed3744bf11e..50e9170394d 100644
--- a/homeassistant/components/ecobee/number.py
+++ b/homeassistant/components/ecobee/number.py
@@ -12,13 +12,11 @@ from homeassistant.components.number import (
     NumberEntityDescription,
     NumberMode,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfTemperature, UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import EcobeeData
-from .const import DOMAIN
+from . import EcobeeConfigEntry, EcobeeData
 from .entity import EcobeeBaseEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -54,11 +52,11 @@ VENTILATOR_NUMBERS = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: EcobeeConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ecobee thermostat number entity."""
-    data: EcobeeData = hass.data[DOMAIN]
+    data = config_entry.runtime_data
 
     assert data is not None
 
diff --git a/homeassistant/components/ecobee/sensor.py b/homeassistant/components/ecobee/sensor.py
index fe0442fb885..759f167ec1c 100644
--- a/homeassistant/components/ecobee/sensor.py
+++ b/homeassistant/components/ecobee/sensor.py
@@ -12,7 +12,6 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     CONCENTRATION_PARTS_PER_MILLION,
@@ -21,8 +20,9 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import EcobeeConfigEntry
 from .const import DOMAIN, ECOBEE_MODEL_TO_NAME, MANUFACTURER
 
 
@@ -73,11 +73,11 @@ SENSOR_TYPES: tuple[EcobeeSensorEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: EcobeeConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up ecobee sensors."""
-    data = hass.data[DOMAIN]
+    data = config_entry.runtime_data
     entities = [
         EcobeeSensor(data, sensor["name"], index, description)
         for index in range(len(data.ecobee.thermostats))
diff --git a/homeassistant/components/ecobee/strings.json b/homeassistant/components/ecobee/strings.json
index 7713a8fb4b9..078643ee789 100644
--- a/homeassistant/components/ecobee/strings.json
+++ b/homeassistant/components/ecobee/strings.json
@@ -25,7 +25,7 @@
         "state_attributes": {
           "preset_mode": {
             "state": {
-              "away_indefinitely": "Away Indefinitely"
+              "away_indefinitely": "Away indefinitely"
             }
           }
         }
@@ -91,7 +91,7 @@
         },
         "fan_min_on_time": {
           "name": "Fan minimum on time",
-          "description": "Minimum number of minutes to run the fan each hour (0 to 60) during the vacation."
+          "description": "Minimum number of minutes to run the fan each hour during the vacation."
         }
       }
     },
@@ -125,7 +125,7 @@
     },
     "set_fan_min_on_time": {
       "name": "Set fan minimum on time",
-      "description": "Sets the minimum fan on time.",
+      "description": "Sets the minimum amount of time that the fan will run per hour.",
       "fields": {
         "entity_id": {
           "name": "Entity",
@@ -133,12 +133,12 @@
         },
         "fan_min_on_time": {
           "name": "[%key:component::ecobee::services::create_vacation::fields::fan_min_on_time::name%]",
-          "description": "New value of fan min on time."
+          "description": "Minimum number of minutes to run the fan each hour."
         }
       }
     },
     "set_dst_mode": {
-      "name": "Set Daylight savings time mode",
+      "name": "Set daylight savings time mode",
       "description": "Enables/disables automatic daylight savings time.",
       "fields": {
         "dst_enabled": {
@@ -172,8 +172,8 @@
       }
     },
     "set_sensors_used_in_climate": {
-      "name": "Set Sensors Used in Climate",
-      "description": "Sets the participating sensors for a climate.",
+      "name": "Set sensors used in climate",
+      "description": "Sets the participating sensors for a climate program.",
       "fields": {
         "entity_id": {
           "name": "Entity",
@@ -198,7 +198,7 @@
       "message": "Invalid sensor for thermostat, available options are: {options}"
     },
     "sensor_lookup_failed": {
-      "message": "There was an error getting the sensor ids from sensor names. Try reloading the ecobee integration."
+      "message": "There was an error getting the sensor IDs from sensor names. Try reloading the ecobee integration."
     }
   },
   "issues": {
diff --git a/homeassistant/components/ecobee/switch.py b/homeassistant/components/ecobee/switch.py
index 89ee433c072..e0848913b39 100644
--- a/homeassistant/components/ecobee/switch.py
+++ b/homeassistant/components/ecobee/switch.py
@@ -8,14 +8,13 @@ from typing import Any
 
 from homeassistant.components.climate import HVACMode
 from homeassistant.components.switch import SwitchEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
-from . import EcobeeData
+from . import EcobeeConfigEntry, EcobeeData
 from .climate import HASS_TO_ECOBEE_HVAC
-from .const import DOMAIN, ECOBEE_AUX_HEAT_ONLY
+from .const import ECOBEE_AUX_HEAT_ONLY
 from .entity import EcobeeBaseEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -25,11 +24,11 @@ DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: EcobeeConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ecobee thermostat switch entity."""
-    data: EcobeeData = hass.data[DOMAIN]
+    data = config_entry.runtime_data
 
     entities: list[SwitchEntity] = [
         EcobeeVentilator20MinSwitch(
diff --git a/homeassistant/components/ecobee/weather.py b/homeassistant/components/ecobee/weather.py
index b6378504c65..126f8dd5061 100644
--- a/homeassistant/components/ecobee/weather.py
+++ b/homeassistant/components/ecobee/weather.py
@@ -17,7 +17,6 @@ from homeassistant.components.weather import (
     WeatherEntity,
     WeatherEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     UnitOfLength,
     UnitOfPressure,
@@ -26,9 +25,10 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
+from . import EcobeeConfigEntry
 from .const import (
     DOMAIN,
     ECOBEE_MODEL_TO_NAME,
@@ -39,11 +39,11 @@ from .const import (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: EcobeeConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ecobee weather platform."""
-    data = hass.data[DOMAIN]
+    data = config_entry.runtime_data
     dev = []
     for index in range(len(data.ecobee.thermostats)):
         thermostat = data.ecobee.get_thermostat(index)
diff --git a/homeassistant/components/ecoforest/__init__.py b/homeassistant/components/ecoforest/__init__.py
index 4d5aaa40576..e5350beba8e 100644
--- a/homeassistant/components/ecoforest/__init__.py
+++ b/homeassistant/components/ecoforest/__init__.py
@@ -11,20 +11,18 @@ from pyecoforest.exceptions import (
     EcoforestConnectionError,
 )
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 
-from .const import DOMAIN
-from .coordinator import EcoforestCoordinator
+from .coordinator import EcoforestConfigEntry, EcoforestCoordinator
 
 PLATFORMS: list[Platform] = [Platform.NUMBER, Platform.SENSOR, Platform.SWITCH]
 
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: EcoforestConfigEntry) -> bool:
     """Set up Ecoforest from a config entry."""
 
     host = entry.data[CONF_HOST]
@@ -41,20 +39,17 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         _LOGGER.error("Error communicating with device %s", host)
         raise ConfigEntryNotReady from err
 
-    coordinator = EcoforestCoordinator(hass, api)
+    coordinator = EcoforestCoordinator(hass, entry, api)
 
     await coordinator.async_config_entry_first_refresh()
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+    entry.runtime_data = coordinator
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: EcoforestConfigEntry) -> bool:
     """Unload a config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/ecoforest/coordinator.py b/homeassistant/components/ecoforest/coordinator.py
index 3b04325bd50..603fde38388 100644
--- a/homeassistant/components/ecoforest/coordinator.py
+++ b/homeassistant/components/ecoforest/coordinator.py
@@ -6,6 +6,7 @@ from pyecoforest.api import EcoforestApi
 from pyecoforest.exceptions import EcoforestError
 from pyecoforest.models.device import Device
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -13,16 +14,21 @@ from .const import POLLING_INTERVAL
 
 _LOGGER = logging.getLogger(__name__)
 
+type EcoforestConfigEntry = ConfigEntry[EcoforestCoordinator]
+
 
 class EcoforestCoordinator(DataUpdateCoordinator[Device]):
     """DataUpdateCoordinator to gather data from ecoforest device."""
 
-    def __init__(self, hass: HomeAssistant, api: EcoforestApi) -> None:
+    def __init__(
+        self, hass: HomeAssistant, entry: EcoforestConfigEntry, api: EcoforestApi
+    ) -> None:
         """Initialize DataUpdateCoordinator."""
 
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             name="ecoforest",
             update_interval=POLLING_INTERVAL,
         )
diff --git a/homeassistant/components/ecoforest/number.py b/homeassistant/components/ecoforest/number.py
index db3275c1fcc..c1d5f5f3055 100644
--- a/homeassistant/components/ecoforest/number.py
+++ b/homeassistant/components/ecoforest/number.py
@@ -8,12 +8,10 @@ from dataclasses import dataclass
 from pyecoforest.models.device import Device
 
 from homeassistant.components.number import NumberEntity, NumberEntityDescription
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN
-from .coordinator import EcoforestCoordinator
+from .coordinator import EcoforestConfigEntry
 from .entity import EcoforestEntity
 
 
@@ -38,11 +36,11 @@ NUMBER_ENTITIES = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: EcoforestConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Ecoforest number platform."""
-    coordinator: EcoforestCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
 
     entities = [
         EcoforestNumberEntity(coordinator, description)
diff --git a/homeassistant/components/ecoforest/sensor.py b/homeassistant/components/ecoforest/sensor.py
index 997b02436cc..d0e4c17abe1 100644
--- a/homeassistant/components/ecoforest/sensor.py
+++ b/homeassistant/components/ecoforest/sensor.py
@@ -13,7 +13,6 @@ from homeassistant.components.sensor import (
     SensorEntity,
     SensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     PERCENTAGE,
     UnitOfPressure,
@@ -21,11 +20,10 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from .const import DOMAIN
-from .coordinator import EcoforestCoordinator
+from .coordinator import EcoforestConfigEntry
 from .entity import EcoforestEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -134,7 +132,7 @@ SENSOR_TYPES: tuple[EcoforestSensorEntityDescription, ...] = (
     ),
     EcoforestSensorEntityDescription(
         key="convecto_air_flow",
-        translation_key="convecto_air_flow",
+        translation_key="convector_air_flow",
         native_unit_of_measurement=PERCENTAGE,
         entity_registry_enabled_default=False,
         value_fn=lambda data: data.convecto_air_flow,
@@ -143,10 +141,12 @@ SENSOR_TYPES: tuple[EcoforestSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: EcoforestConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Ecoforest sensor platform."""
-    coordinator: EcoforestCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
 
     entities = [
         EcoforestSensor(coordinator, description) for description in SENSOR_TYPES
diff --git a/homeassistant/components/ecoforest/strings.json b/homeassistant/components/ecoforest/strings.json
index 1094e10ada3..d0e807b5f2a 100644
--- a/homeassistant/components/ecoforest/strings.json
+++ b/homeassistant/components/ecoforest/strings.json
@@ -78,8 +78,8 @@
       "extractor": {
         "name": "Extractor"
       },
-      "convecto_air_flow": {
-        "name": "Convecto air flow"
+      "convector_air_flow": {
+        "name": "Convector air flow"
       }
     },
     "number": {
diff --git a/homeassistant/components/ecoforest/switch.py b/homeassistant/components/ecoforest/switch.py
index d643217bebc..bd83bfc9ee5 100644
--- a/homeassistant/components/ecoforest/switch.py
+++ b/homeassistant/components/ecoforest/switch.py
@@ -10,12 +10,10 @@ from pyecoforest.api import EcoforestApi
 from pyecoforest.models.device import Device
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN
-from .coordinator import EcoforestCoordinator
+from .coordinator import EcoforestConfigEntry
 from .entity import EcoforestEntity
 
 
@@ -39,11 +37,11 @@ SWITCH_TYPES: tuple[EcoforestSwitchEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: EcoforestConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Ecoforest switch platform."""
-    coordinator: EcoforestCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
 
     entities = [
         EcoforestSwitchEntity(coordinator, description) for description in SWITCH_TYPES
diff --git a/homeassistant/components/econet/__init__.py b/homeassistant/components/econet/__init__.py
index 4fd920a5ecc..40bece93599 100644
--- a/homeassistant/components/econet/__init__.py
+++ b/homeassistant/components/econet/__init__.py
@@ -6,7 +6,7 @@ import logging
 
 from aiohttp.client_exceptions import ClientError
 from pyeconet import EcoNetApiInterface
-from pyeconet.equipment import EquipmentType
+from pyeconet.equipment import Equipment, EquipmentType
 from pyeconet.errors import (
     GenericHTTPError,
     InvalidCredentialsError,
@@ -21,7 +21,7 @@ from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.dispatcher import dispatcher_send
 from homeassistant.helpers.event import async_track_time_interval
 
-from .const import API_CLIENT, DOMAIN, EQUIPMENT, PUSH_UPDATE
+from .const import PUSH_UPDATE
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -36,7 +36,12 @@ PLATFORMS = [
 INTERVAL = timedelta(minutes=60)
 
 
-async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+type EconetConfigEntry = ConfigEntry[dict[EquipmentType, list[Equipment]]]
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, config_entry: EconetConfigEntry
+) -> bool:
     """Set up EcoNet as config entry."""
 
     email = config_entry.data[CONF_EMAIL]
@@ -57,9 +62,8 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
         )
     except (ClientError, GenericHTTPError, InvalidResponseFormat) as err:
         raise ConfigEntryNotReady from err
-    hass.data.setdefault(DOMAIN, {API_CLIENT: {}, EQUIPMENT: {}})
-    hass.data[DOMAIN][API_CLIENT][config_entry.entry_id] = api
-    hass.data[DOMAIN][EQUIPMENT][config_entry.entry_id] = equipment
+
+    config_entry.runtime_data = equipment
 
     await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
 
@@ -89,10 +93,6 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: EconetConfigEntry) -> bool:
     """Unload a EcoNet config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if unload_ok:
-        hass.data[DOMAIN][API_CLIENT].pop(entry.entry_id)
-        hass.data[DOMAIN][EQUIPMENT].pop(entry.entry_id)
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/econet/binary_sensor.py b/homeassistant/components/econet/binary_sensor.py
index 0f5cb6f92af..0d041dfca5a 100644
--- a/homeassistant/components/econet/binary_sensor.py
+++ b/homeassistant/components/econet/binary_sensor.py
@@ -2,18 +2,17 @@
 
 from __future__ import annotations
 
-from pyeconet.equipment import EquipmentType
+from pyeconet.equipment import Equipment, EquipmentType
 
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN, EQUIPMENT
+from . import EconetConfigEntry
 from .entity import EcoNetEntity
 
 BINARY_SENSOR_TYPES: tuple[BinarySensorEntityDescription, ...] = (
@@ -41,10 +40,12 @@ BINARY_SENSOR_TYPES: tuple[BinarySensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: EconetConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up EcoNet binary sensor based on a config entry."""
-    equipment = hass.data[DOMAIN][EQUIPMENT][entry.entry_id]
+    equipment = entry.runtime_data
     all_equipment = equipment[EquipmentType.WATER_HEATER].copy()
     all_equipment.extend(equipment[EquipmentType.THERMOSTAT].copy())
 
@@ -62,7 +63,7 @@ class EcoNetBinarySensor(EcoNetEntity, BinarySensorEntity):
     """Define a Econet binary sensor."""
 
     def __init__(
-        self, econet_device, description: BinarySensorEntityDescription
+        self, econet_device: Equipment, description: BinarySensorEntityDescription
     ) -> None:
         """Initialize."""
         super().__init__(econet_device)
diff --git a/homeassistant/components/econet/climate.py b/homeassistant/components/econet/climate.py
index cdf82f6817f..e7ccec33310 100644
--- a/homeassistant/components/econet/climate.py
+++ b/homeassistant/components/econet/climate.py
@@ -3,7 +3,11 @@
 from typing import Any
 
 from pyeconet.equipment import EquipmentType
-from pyeconet.equipment.thermostat import ThermostatFanMode, ThermostatOperationMode
+from pyeconet.equipment.thermostat import (
+    Thermostat,
+    ThermostatFanMode,
+    ThermostatOperationMode,
+)
 
 from homeassistant.components.climate import (
     ATTR_TARGET_TEMP_HIGH,
@@ -16,13 +20,13 @@ from homeassistant.components.climate import (
     ClimateEntityFeature,
     HVACMode,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.issue_registry import IssueSeverity, create_issue
 
-from .const import DOMAIN, EQUIPMENT
+from . import EconetConfigEntry
+from .const import DOMAIN
 from .entity import EcoNetEntity
 
 ECONET_STATE_TO_HA = {
@@ -31,8 +35,13 @@ ECONET_STATE_TO_HA = {
     ThermostatOperationMode.OFF: HVACMode.OFF,
     ThermostatOperationMode.AUTO: HVACMode.HEAT_COOL,
     ThermostatOperationMode.FAN_ONLY: HVACMode.FAN_ONLY,
+    ThermostatOperationMode.EMERGENCY_HEAT: HVACMode.HEAT,
+}
+HA_STATE_TO_ECONET = {
+    value: key
+    for key, value in ECONET_STATE_TO_HA.items()
+    if key != ThermostatOperationMode.EMERGENCY_HEAT
 }
-HA_STATE_TO_ECONET = {value: key for key, value in ECONET_STATE_TO_HA.items()}
 
 ECONET_FAN_STATE_TO_HA = {
     ThermostatFanMode.AUTO: FAN_AUTO,
@@ -51,10 +60,12 @@ SUPPORT_FLAGS_THERMOSTAT = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: EconetConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up EcoNet thermostat based on a config entry."""
-    equipment = hass.data[DOMAIN][EQUIPMENT][entry.entry_id]
+    equipment = entry.runtime_data
     async_add_entities(
         [
             EcoNetThermostat(thermostat)
@@ -63,13 +74,13 @@ async def async_setup_entry(
     )
 
 
-class EcoNetThermostat(EcoNetEntity, ClimateEntity):
+class EcoNetThermostat(EcoNetEntity[Thermostat], ClimateEntity):
     """Define an Econet thermostat."""
 
     _attr_should_poll = True
     _attr_temperature_unit = UnitOfTemperature.FAHRENHEIT
 
-    def __init__(self, thermostat):
+    def __init__(self, thermostat: Thermostat) -> None:
         """Initialize."""
         super().__init__(thermostat)
         self._attr_hvac_modes = []
@@ -90,24 +101,24 @@ class EcoNetThermostat(EcoNetEntity, ClimateEntity):
             )
 
     @property
-    def current_temperature(self):
+    def current_temperature(self) -> int:
         """Return the current temperature."""
         return self._econet.set_point
 
     @property
-    def current_humidity(self):
+    def current_humidity(self) -> int:
         """Return the current humidity."""
         return self._econet.humidity
 
     @property
-    def target_humidity(self):
+    def target_humidity(self) -> int | None:
         """Return the humidity we try to reach."""
         if self._econet.supports_humidifier:
             return self._econet.dehumidifier_set_point
         return None
 
     @property
-    def target_temperature(self):
+    def target_temperature(self) -> int | None:
         """Return the temperature we try to reach."""
         if self.hvac_mode == HVACMode.COOL:
             return self._econet.cool_set_point
@@ -116,14 +127,14 @@ class EcoNetThermostat(EcoNetEntity, ClimateEntity):
         return None
 
     @property
-    def target_temperature_low(self):
+    def target_temperature_low(self) -> int | None:
         """Return the lower bound temperature we try to reach."""
         if self.hvac_mode == HVACMode.HEAT_COOL:
             return self._econet.heat_set_point
         return None
 
     @property
-    def target_temperature_high(self):
+    def target_temperature_high(self) -> int | None:
         """Return the higher bound temperature we try to reach."""
         if self.hvac_mode == HVACMode.HEAT_COOL:
             return self._econet.cool_set_point
@@ -140,7 +151,7 @@ class EcoNetThermostat(EcoNetEntity, ClimateEntity):
             self._econet.set_set_point(None, target_temp_high, target_temp_low)
 
     @property
-    def is_aux_heat(self):
+    def is_aux_heat(self) -> bool:
         """Return true if aux heater."""
         return self._econet.mode == ThermostatOperationMode.EMERGENCY_HEAT
 
@@ -169,7 +180,7 @@ class EcoNetThermostat(EcoNetEntity, ClimateEntity):
         self._econet.set_dehumidifier_set_point(humidity)
 
     @property
-    def fan_mode(self):
+    def fan_mode(self) -> str:
         """Return the current fan mode."""
         econet_fan_mode = self._econet.fan_mode
 
@@ -183,7 +194,7 @@ class EcoNetThermostat(EcoNetEntity, ClimateEntity):
         return _current_fan_mode
 
     @property
-    def fan_modes(self):
+    def fan_modes(self) -> list[str]:
         """Return the fan modes."""
         return [
             ECONET_FAN_STATE_TO_HA[mode]
@@ -203,7 +214,7 @@ class EcoNetThermostat(EcoNetEntity, ClimateEntity):
 
     def turn_aux_heat_on(self) -> None:
         """Turn auxiliary heater on."""
-        async_create_issue(
+        create_issue(
             self.hass,
             DOMAIN,
             "migrate_aux_heat",
@@ -217,7 +228,7 @@ class EcoNetThermostat(EcoNetEntity, ClimateEntity):
 
     def turn_aux_heat_off(self) -> None:
         """Turn auxiliary heater off."""
-        async_create_issue(
+        create_issue(
             self.hass,
             DOMAIN,
             "migrate_aux_heat",
diff --git a/homeassistant/components/econet/const.py b/homeassistant/components/econet/const.py
index ee8d4fc8a46..78384f7683d 100644
--- a/homeassistant/components/econet/const.py
+++ b/homeassistant/components/econet/const.py
@@ -1,7 +1,5 @@
 """Constants for Econet integration."""
 
 DOMAIN = "econet"
-API_CLIENT = "api_client"
-EQUIPMENT = "equipment"
 
 PUSH_UPDATE = "econet.push_update"
diff --git a/homeassistant/components/econet/entity.py b/homeassistant/components/econet/entity.py
index 44488f0b133..2ec8af83dd0 100644
--- a/homeassistant/components/econet/entity.py
+++ b/homeassistant/components/econet/entity.py
@@ -1,5 +1,7 @@
 """Support for EcoNet products."""
 
+from pyeconet.equipment import Equipment
+
 from homeassistant.core import callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -8,18 +10,18 @@ from homeassistant.helpers.entity import Entity
 from .const import DOMAIN, PUSH_UPDATE
 
 
-class EcoNetEntity(Entity):
+class EcoNetEntity[_EquipmentT: Equipment = Equipment](Entity):
     """Define a base EcoNet entity."""
 
     _attr_should_poll = False
 
-    def __init__(self, econet):
+    def __init__(self, econet: _EquipmentT) -> None:
         """Initialize."""
         self._econet = econet
         self._attr_name = econet.device_name
         self._attr_unique_id = f"{econet.device_id}_{econet.device_name}"
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Subscribe to device events."""
         await super().async_added_to_hass()
         self.async_on_remove(
@@ -27,12 +29,12 @@ class EcoNetEntity(Entity):
         )
 
     @callback
-    def on_update_received(self):
+    def on_update_received(self) -> None:
         """Update was pushed from the ecoent API."""
         self.async_write_ha_state()
 
     @property
-    def available(self):
+    def available(self) -> bool:
         """Return if the device is online or not."""
         return self._econet.connected
 
diff --git a/homeassistant/components/econet/manifest.json b/homeassistant/components/econet/manifest.json
index 6586af92d1f..bc7505740d7 100644
--- a/homeassistant/components/econet/manifest.json
+++ b/homeassistant/components/econet/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/econet",
   "iot_class": "cloud_push",
   "loggers": ["paho_mqtt", "pyeconet"],
-  "requirements": ["pyeconet==0.1.23"]
+  "requirements": ["pyeconet==0.1.28"]
 }
diff --git a/homeassistant/components/econet/sensor.py b/homeassistant/components/econet/sensor.py
index 19bac8c9e1f..1cc806ca8d5 100644
--- a/homeassistant/components/econet/sensor.py
+++ b/homeassistant/components/econet/sensor.py
@@ -10,7 +10,6 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS,
@@ -19,9 +18,9 @@ from homeassistant.const import (
     UnitOfVolume,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN, EQUIPMENT
+from . import EconetConfigEntry
 from .entity import EcoNetEntity
 
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
@@ -82,11 +81,13 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: EconetConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up EcoNet sensor based on a config entry."""
 
-    data = hass.data[DOMAIN][EQUIPMENT][entry.entry_id]
+    data = entry.runtime_data
     equipment = data[EquipmentType.WATER_HEATER].copy()
     equipment.extend(data[EquipmentType.THERMOSTAT].copy())
 
diff --git a/homeassistant/components/econet/switch.py b/homeassistant/components/econet/switch.py
index e36f6c834b1..ff7f017b49f 100644
--- a/homeassistant/components/econet/switch.py
+++ b/homeassistant/components/econet/switch.py
@@ -6,14 +6,13 @@ import logging
 from typing import Any
 
 from pyeconet.equipment import EquipmentType
-from pyeconet.equipment.thermostat import ThermostatOperationMode
+from pyeconet.equipment.thermostat import Thermostat, ThermostatOperationMode
 
 from homeassistant.components.switch import SwitchEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN, EQUIPMENT
+from . import EconetConfigEntry
 from .entity import EcoNetEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -21,21 +20,21 @@ _LOGGER = logging.getLogger(__name__)
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: EconetConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ecobee thermostat switch entity."""
-    equipment = hass.data[DOMAIN][EQUIPMENT][entry.entry_id]
+    equipment = entry.runtime_data
     async_add_entities(
         EcoNetSwitchAuxHeatOnly(thermostat)
         for thermostat in equipment[EquipmentType.THERMOSTAT]
     )
 
 
-class EcoNetSwitchAuxHeatOnly(EcoNetEntity, SwitchEntity):
+class EcoNetSwitchAuxHeatOnly(EcoNetEntity[Thermostat], SwitchEntity):
     """Representation of a aux_heat_only EcoNet switch."""
 
-    def __init__(self, thermostat) -> None:
+    def __init__(self, thermostat: Thermostat) -> None:
         """Initialize EcoNet ventilator platform."""
         super().__init__(thermostat)
         self._attr_name = f"{thermostat.device_name} emergency heat"
diff --git a/homeassistant/components/econet/water_heater.py b/homeassistant/components/econet/water_heater.py
index efe4196993c..fb74ae8b4a5 100644
--- a/homeassistant/components/econet/water_heater.py
+++ b/homeassistant/components/econet/water_heater.py
@@ -5,7 +5,7 @@ import logging
 from typing import Any
 
 from pyeconet.equipment import EquipmentType
-from pyeconet.equipment.water_heater import WaterHeaterOperationMode
+from pyeconet.equipment.water_heater import WaterHeater, WaterHeaterOperationMode
 
 from homeassistant.components.water_heater import (
     STATE_ECO,
@@ -17,12 +17,11 @@ from homeassistant.components.water_heater import (
     WaterHeaterEntity,
     WaterHeaterEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, STATE_OFF, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN, EQUIPMENT
+from . import EconetConfigEntry
 from .entity import EcoNetEntity
 
 SCAN_INTERVAL = timedelta(hours=1)
@@ -47,10 +46,12 @@ SUPPORT_FLAGS_HEATER = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: EconetConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up EcoNet water heater based on a config entry."""
-    equipment = hass.data[DOMAIN][EQUIPMENT][entry.entry_id]
+    equipment = entry.runtime_data
     async_add_entities(
         [
             EcoNetWaterHeater(water_heater)
@@ -60,24 +61,24 @@ async def async_setup_entry(
     )
 
 
-class EcoNetWaterHeater(EcoNetEntity, WaterHeaterEntity):
+class EcoNetWaterHeater(EcoNetEntity[WaterHeater], WaterHeaterEntity):
     """Define an Econet water heater."""
 
     _attr_should_poll = True  # Override False default from EcoNetEntity
     _attr_temperature_unit = UnitOfTemperature.FAHRENHEIT
 
-    def __init__(self, water_heater):
+    def __init__(self, water_heater: WaterHeater) -> None:
         """Initialize."""
         super().__init__(water_heater)
         self.water_heater = water_heater
 
     @property
-    def is_away_mode_on(self):
+    def is_away_mode_on(self) -> bool:
         """Return true if away mode is on."""
         return self._econet.away
 
     @property
-    def current_operation(self):
+    def current_operation(self) -> str:
         """Return current operation."""
         econet_mode = self.water_heater.mode
         _current_op = STATE_OFF
@@ -87,7 +88,7 @@ class EcoNetWaterHeater(EcoNetEntity, WaterHeaterEntity):
         return _current_op
 
     @property
-    def operation_list(self):
+    def operation_list(self) -> list[str]:
         """List of available operation modes."""
         econet_modes = self.water_heater.modes
         op_list = []
@@ -130,7 +131,7 @@ class EcoNetWaterHeater(EcoNetEntity, WaterHeaterEntity):
             _LOGGER.error("Invalid operation mode: %s", operation_mode)
 
     @property
-    def target_temperature(self):
+    def target_temperature(self) -> int:
         """Return the temperature we try to reach."""
         return self.water_heater.set_point
 
diff --git a/homeassistant/components/ecovacs/binary_sensor.py b/homeassistant/components/ecovacs/binary_sensor.py
index d755d01a4ae..552a8152cc5 100644
--- a/homeassistant/components/ecovacs/binary_sensor.py
+++ b/homeassistant/components/ecovacs/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import EcovacsConfigEntry
 from .entity import EcovacsCapabilityEntityDescription, EcovacsDescriptionEntity, EventT
@@ -45,7 +45,7 @@ ENTITY_DESCRIPTIONS: tuple[EcovacsBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: EcovacsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add entities for passed config_entry in HA."""
     async_add_entities(
diff --git a/homeassistant/components/ecovacs/button.py b/homeassistant/components/ecovacs/button.py
index 2759ca972df..04eb0af02e6 100644
--- a/homeassistant/components/ecovacs/button.py
+++ b/homeassistant/components/ecovacs/button.py
@@ -13,7 +13,7 @@ from deebot_client.events import LifeSpan
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import EcovacsConfigEntry
 from .const import SUPPORTED_LIFESPANS, SUPPORTED_STATION_ACTIONS
@@ -81,7 +81,7 @@ LIFESPAN_ENTITY_DESCRIPTIONS = tuple(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: EcovacsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add entities for passed config_entry in HA."""
     controller = config_entry.runtime_data
diff --git a/homeassistant/components/ecovacs/event.py b/homeassistant/components/ecovacs/event.py
index 3249b466c77..488767b472d 100644
--- a/homeassistant/components/ecovacs/event.py
+++ b/homeassistant/components/ecovacs/event.py
@@ -7,7 +7,7 @@ from deebot_client.events import CleanJobStatus, ReportStatsEvent
 from homeassistant.components.event import EventEntity, EventEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import EcovacsConfigEntry
 from .entity import EcovacsEntity
@@ -17,7 +17,7 @@ from .util import get_name_key
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: EcovacsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add entities for passed config_entry in HA."""
     controller = config_entry.runtime_data
diff --git a/homeassistant/components/ecovacs/image.py b/homeassistant/components/ecovacs/image.py
index d8b69084cec..f8a89b0cfa0 100644
--- a/homeassistant/components/ecovacs/image.py
+++ b/homeassistant/components/ecovacs/image.py
@@ -7,7 +7,7 @@ from deebot_client.events.map import CachedMapInfoEvent, MapChangedEvent
 from homeassistant.components.image import ImageEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import EcovacsConfigEntry
 from .entity import EcovacsEntity
@@ -16,7 +16,7 @@ from .entity import EcovacsEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: EcovacsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add entities for passed config_entry in HA."""
     controller = config_entry.runtime_data
diff --git a/homeassistant/components/ecovacs/lawn_mower.py b/homeassistant/components/ecovacs/lawn_mower.py
index bf773207dc5..b9af67fafcd 100644
--- a/homeassistant/components/ecovacs/lawn_mower.py
+++ b/homeassistant/components/ecovacs/lawn_mower.py
@@ -16,7 +16,7 @@ from homeassistant.components.lawn_mower import (
     LawnMowerEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import EcovacsConfigEntry
 from .entity import EcovacsEntity
@@ -37,7 +37,7 @@ _STATE_TO_MOWER_STATE = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: EcovacsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Ecovacs mowers."""
     controller = config_entry.runtime_data
diff --git a/homeassistant/components/ecovacs/manifest.json b/homeassistant/components/ecovacs/manifest.json
index 157d5b4a5ea..acb5b620719 100644
--- a/homeassistant/components/ecovacs/manifest.json
+++ b/homeassistant/components/ecovacs/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/ecovacs",
   "iot_class": "cloud_push",
   "loggers": ["sleekxmppfs", "sucks", "deebot_client"],
-  "requirements": ["py-sucks==0.9.10", "deebot-client==11.0.0"]
+  "requirements": ["py-sucks==0.9.10", "deebot-client==12.4.0"]
 }
diff --git a/homeassistant/components/ecovacs/number.py b/homeassistant/components/ecovacs/number.py
index adf282560a9..7a74b02ceca 100644
--- a/homeassistant/components/ecovacs/number.py
+++ b/homeassistant/components/ecovacs/number.py
@@ -16,7 +16,7 @@ from homeassistant.components.number import (
 )
 from homeassistant.const import DEGREE, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import EcovacsConfigEntry
 from .entity import (
@@ -83,7 +83,7 @@ ENTITY_DESCRIPTIONS: tuple[EcovacsNumberEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: EcovacsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add entities for passed config_entry in HA."""
     controller = config_entry.runtime_data
diff --git a/homeassistant/components/ecovacs/select.py b/homeassistant/components/ecovacs/select.py
index 3c3852f05ec..a7b9baf1c4a 100644
--- a/homeassistant/components/ecovacs/select.py
+++ b/homeassistant/components/ecovacs/select.py
@@ -11,7 +11,7 @@ from deebot_client.events import WaterInfoEvent, WorkModeEvent
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import EcovacsConfigEntry
 from .entity import EcovacsCapabilityEntityDescription, EcovacsDescriptionEntity, EventT
@@ -54,7 +54,7 @@ ENTITY_DESCRIPTIONS: tuple[EcovacsSelectEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: EcovacsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add entities for passed config_entry in HA."""
     controller = config_entry.runtime_data
diff --git a/homeassistant/components/ecovacs/sensor.py b/homeassistant/components/ecovacs/sensor.py
index 0e906c6cb16..6c8ae080fc3 100644
--- a/homeassistant/components/ecovacs/sensor.py
+++ b/homeassistant/components/ecovacs/sensor.py
@@ -35,7 +35,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import EcovacsConfigEntry
@@ -192,7 +192,7 @@ LEGACY_LIFESPAN_SENSORS = tuple(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: EcovacsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add entities for passed config_entry in HA."""
     controller = config_entry.runtime_data
diff --git a/homeassistant/components/ecovacs/strings.json b/homeassistant/components/ecovacs/strings.json
index 723bdef17f8..44c51c7ae43 100644
--- a/homeassistant/components/ecovacs/strings.json
+++ b/homeassistant/components/ecovacs/strings.json
@@ -250,7 +250,7 @@
       "message": "Params are required for the command: {command}"
     },
     "vacuum_raw_get_positions_not_supported": {
-      "message": "Getting the positions of the chargers and the device itself is not supported"
+      "message": "Retrieving the positions of the chargers and the device itself is not supported"
     }
   },
   "selector": {
@@ -264,7 +264,7 @@
   "services": {
     "raw_get_positions": {
       "name": "Get raw positions",
-      "description": "Get the raw response for the positions of the chargers and the device itself."
+      "description": "Retrieves a raw response containing the positions of the chargers and the device itself."
     }
   }
 }
diff --git a/homeassistant/components/ecovacs/switch.py b/homeassistant/components/ecovacs/switch.py
index 288d092d391..dd379dbb199 100644
--- a/homeassistant/components/ecovacs/switch.py
+++ b/homeassistant/components/ecovacs/switch.py
@@ -9,7 +9,7 @@ from deebot_client.events import EnableEvent
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import EcovacsConfigEntry
 from .entity import (
@@ -105,7 +105,7 @@ ENTITY_DESCRIPTIONS: tuple[EcovacsSwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: EcovacsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add entities for passed config_entry in HA."""
     controller = config_entry.runtime_data
diff --git a/homeassistant/components/ecovacs/vacuum.py b/homeassistant/components/ecovacs/vacuum.py
index bc78981d1db..6570b80e920 100644
--- a/homeassistant/components/ecovacs/vacuum.py
+++ b/homeassistant/components/ecovacs/vacuum.py
@@ -21,7 +21,7 @@ from homeassistant.components.vacuum import (
 from homeassistant.core import HomeAssistant, SupportsResponse
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.icon import icon_for_battery_level
 from homeassistant.util import slugify
 
@@ -41,7 +41,7 @@ SERVICE_RAW_GET_POSITIONS = "raw_get_positions"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: EcovacsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Ecovacs vacuums."""
 
diff --git a/homeassistant/components/ecowitt/binary_sensor.py b/homeassistant/components/ecowitt/binary_sensor.py
index 5bc782e3589..1d36f5232db 100644
--- a/homeassistant/components/ecowitt/binary_sensor.py
+++ b/homeassistant/components/ecowitt/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import EcowittConfigEntry
 from .entity import EcowittEntity
@@ -26,13 +26,16 @@ ECOWITT_BINARYSENSORS_MAPPING: Final = {
         device_class=BinarySensorDeviceClass.BATTERY,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
+    EcoWittSensorTypes.RAIN_STATE: BinarySensorEntityDescription(
+        key="RAIN_STATE", device_class=BinarySensorDeviceClass.MOISTURE
+    ),
 }
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: EcowittConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add sensors if new."""
     ecowitt = entry.runtime_data
diff --git a/homeassistant/components/ecowitt/manifest.json b/homeassistant/components/ecowitt/manifest.json
index 175960ab57d..3ce66f48f95 100644
--- a/homeassistant/components/ecowitt/manifest.json
+++ b/homeassistant/components/ecowitt/manifest.json
@@ -6,5 +6,5 @@
   "dependencies": ["webhook"],
   "documentation": "https://www.home-assistant.io/integrations/ecowitt",
   "iot_class": "local_push",
-  "requirements": ["aioecowitt==2024.2.1"]
+  "requirements": ["aioecowitt==2025.3.1"]
 }
diff --git a/homeassistant/components/ecowitt/sensor.py b/homeassistant/components/ecowitt/sensor.py
index 23af2f2a3af..7d37aa40b86 100644
--- a/homeassistant/components/ecowitt/sensor.py
+++ b/homeassistant/components/ecowitt/sensor.py
@@ -32,7 +32,7 @@ from homeassistant.const import (
     UnitOfVolumetricFlux,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util.unit_system import METRIC_SYSTEM, US_CUSTOMARY_SYSTEM
 
@@ -65,7 +65,10 @@ ECOWITT_SENSORS_MAPPING: Final = {
         state_class=SensorStateClass.MEASUREMENT,
     ),
     EcoWittSensorTypes.DEGREE: SensorEntityDescription(
-        key="DEGREE", native_unit_of_measurement=DEGREE
+        key="DEGREE",
+        native_unit_of_measurement=DEGREE,
+        device_class=SensorDeviceClass.WIND_DIRECTION,
+        state_class=SensorStateClass.MEASUREMENT_ANGLE,
     ),
     EcoWittSensorTypes.WATT_METERS_SQUARED: SensorEntityDescription(
         key="WATT_METERS_SQUARED",
@@ -218,7 +221,7 @@ ECOWITT_SENSORS_MAPPING: Final = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: EcowittConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add sensors if new."""
     ecowitt = entry.runtime_data
diff --git a/homeassistant/components/eddystone_temperature/sensor.py b/homeassistant/components/eddystone_temperature/sensor.py
index 5dc30a575d7..1047c52e111 100644
--- a/homeassistant/components/eddystone_temperature/sensor.py
+++ b/homeassistant/components/eddystone_temperature/sensor.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import Event, HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/edimax/switch.py b/homeassistant/components/edimax/switch.py
index e0d063eb9fd..5482143fc37 100644
--- a/homeassistant/components/edimax/switch.py
+++ b/homeassistant/components/edimax/switch.py
@@ -13,7 +13,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/edl21/sensor.py b/homeassistant/components/edl21/sensor.py
index 4474893d9b6..3194781d71c 100644
--- a/homeassistant/components/edl21/sensor.py
+++ b/homeassistant/components/edl21/sensor.py
@@ -30,7 +30,7 @@ from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.dt import utcnow
 
 from .const import (
@@ -289,11 +289,11 @@ SENSOR_UNIT_MAPPING = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the EDL21 sensor."""
-    hass.data[DOMAIN] = EDL21(hass, config_entry.data, async_add_entities)
-    await hass.data[DOMAIN].connect()
+    api = EDL21(hass, config_entry.data, async_add_entities)
+    await api.connect()
 
 
 class EDL21:
@@ -317,7 +317,7 @@ class EDL21:
         self,
         hass: HomeAssistant,
         config: Mapping[str, Any],
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Initialize an EDL21 object."""
         self._registered_obis: set[tuple[str, str]] = set()
diff --git a/homeassistant/components/efergy/sensor.py b/homeassistant/components/efergy/sensor.py
index 419c4da591d..6b54e4779a0 100644
--- a/homeassistant/components/efergy/sensor.py
+++ b/homeassistant/components/efergy/sensor.py
@@ -17,7 +17,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import UnitOfEnergy, UnitOfPower
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import EfergyConfigEntry
@@ -108,7 +108,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: EfergyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Efergy sensors."""
     api = entry.runtime_data
diff --git a/homeassistant/components/egardia/__init__.py b/homeassistant/components/egardia/__init__.py
index 89dae7d23c9..eb6b4cd49d8 100644
--- a/homeassistant/components/egardia/__init__.py
+++ b/homeassistant/components/egardia/__init__.py
@@ -16,8 +16,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/eheimdigital/__init__.py b/homeassistant/components/eheimdigital/__init__.py
index cf08f45bed5..26e6bea4d4a 100644
--- a/homeassistant/components/eheimdigital/__init__.py
+++ b/homeassistant/components/eheimdigital/__init__.py
@@ -2,17 +2,14 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntry
 
 from .const import DOMAIN
-from .coordinator import EheimDigitalUpdateCoordinator
+from .coordinator import EheimDigitalConfigEntry, EheimDigitalUpdateCoordinator
 
-PLATFORMS = [Platform.LIGHT]
-
-type EheimDigitalConfigEntry = ConfigEntry[EheimDigitalUpdateCoordinator]
+PLATFORMS = [Platform.CLIMATE, Platform.LIGHT]
 
 
 async def async_setup_entry(
@@ -20,7 +17,7 @@ async def async_setup_entry(
 ) -> bool:
     """Set up EHEIM Digital from a config entry."""
 
-    coordinator = EheimDigitalUpdateCoordinator(hass)
+    coordinator = EheimDigitalUpdateCoordinator(hass, entry)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
 
diff --git a/homeassistant/components/eheimdigital/climate.py b/homeassistant/components/eheimdigital/climate.py
new file mode 100644
index 00000000000..3cde9e758cd
--- /dev/null
+++ b/homeassistant/components/eheimdigital/climate.py
@@ -0,0 +1,144 @@
+"""EHEIM Digital climate."""
+
+from typing import Any
+
+from eheimdigital.device import EheimDigitalDevice
+from eheimdigital.heater import EheimDigitalHeater
+from eheimdigital.types import EheimDigitalClientError, HeaterMode, HeaterUnit
+
+from homeassistant.components.climate import (
+    PRESET_NONE,
+    ClimateEntity,
+    ClimateEntityFeature,
+    HVACAction,
+    HVACMode,
+)
+from homeassistant.const import (
+    ATTR_TEMPERATURE,
+    PRECISION_HALVES,
+    PRECISION_TENTHS,
+    UnitOfTemperature,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .const import HEATER_BIO_MODE, HEATER_PRESET_TO_HEATER_MODE, HEATER_SMART_MODE
+from .coordinator import EheimDigitalConfigEntry, EheimDigitalUpdateCoordinator
+from .entity import EheimDigitalEntity
+
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: EheimDigitalConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the callbacks for the coordinator so climate entities can be added as devices are found."""
+    coordinator = entry.runtime_data
+
+    def async_setup_device_entities(
+        device_address: dict[str, EheimDigitalDevice],
+    ) -> None:
+        """Set up the climate entities for one or multiple devices."""
+        entities: list[EheimDigitalHeaterClimate] = []
+        for device in device_address.values():
+            if isinstance(device, EheimDigitalHeater):
+                entities.append(EheimDigitalHeaterClimate(coordinator, device))
+                coordinator.known_devices.add(device.mac_address)
+
+        async_add_entities(entities)
+
+    coordinator.add_platform_callback(async_setup_device_entities)
+
+    async_setup_device_entities(coordinator.hub.devices)
+
+
+class EheimDigitalHeaterClimate(EheimDigitalEntity[EheimDigitalHeater], ClimateEntity):
+    """Represent an EHEIM Digital heater."""
+
+    _attr_hvac_modes = [HVACMode.OFF, HVACMode.AUTO]
+    _attr_hvac_mode = HVACMode.OFF
+    _attr_precision = PRECISION_TENTHS
+    _attr_supported_features = (
+        ClimateEntityFeature.TARGET_TEMPERATURE
+        | ClimateEntityFeature.TURN_ON
+        | ClimateEntityFeature.TURN_OFF
+        | ClimateEntityFeature.PRESET_MODE
+    )
+    _attr_target_temperature_step = PRECISION_HALVES
+    _attr_preset_modes = [PRESET_NONE, HEATER_BIO_MODE, HEATER_SMART_MODE]
+    _attr_temperature_unit = UnitOfTemperature.CELSIUS
+    _attr_preset_mode = PRESET_NONE
+    _attr_translation_key = "heater"
+    _attr_name = None
+
+    def __init__(
+        self, coordinator: EheimDigitalUpdateCoordinator, device: EheimDigitalHeater
+    ) -> None:
+        """Initialize an EHEIM Digital thermocontrol climate entity."""
+        super().__init__(coordinator, device)
+        self._attr_unique_id = self._device_address
+        self._async_update_attrs()
+
+    async def async_set_preset_mode(self, preset_mode: str) -> None:
+        """Set the preset mode."""
+        try:
+            if preset_mode in HEATER_PRESET_TO_HEATER_MODE:
+                await self._device.set_operation_mode(
+                    HEATER_PRESET_TO_HEATER_MODE[preset_mode]
+                )
+        except EheimDigitalClientError as err:
+            raise HomeAssistantError from err
+
+    async def async_set_temperature(self, **kwargs: Any) -> None:
+        """Set a new temperature."""
+        try:
+            if ATTR_TEMPERATURE in kwargs:
+                await self._device.set_target_temperature(kwargs[ATTR_TEMPERATURE])
+        except EheimDigitalClientError as err:
+            raise HomeAssistantError from err
+
+    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
+        """Set the heating mode."""
+        try:
+            match hvac_mode:
+                case HVACMode.OFF:
+                    await self._device.set_active(active=False)
+                case HVACMode.AUTO:
+                    await self._device.set_active(active=True)
+        except EheimDigitalClientError as err:
+            raise HomeAssistantError from err
+
+    def _async_update_attrs(self) -> None:
+        if self._device.temperature_unit == HeaterUnit.CELSIUS:
+            self._attr_min_temp = 18
+            self._attr_max_temp = 32
+            self._attr_temperature_unit = UnitOfTemperature.CELSIUS
+        elif self._device.temperature_unit == HeaterUnit.FAHRENHEIT:
+            self._attr_min_temp = 64
+            self._attr_max_temp = 90
+            self._attr_temperature_unit = UnitOfTemperature.FAHRENHEIT
+
+        self._attr_current_temperature = self._device.current_temperature
+        self._attr_target_temperature = self._device.target_temperature
+
+        if self._device.is_heating:
+            self._attr_hvac_action = HVACAction.HEATING
+            self._attr_hvac_mode = HVACMode.AUTO
+        elif self._device.is_active:
+            self._attr_hvac_action = HVACAction.IDLE
+            self._attr_hvac_mode = HVACMode.AUTO
+        else:
+            self._attr_hvac_action = HVACAction.OFF
+            self._attr_hvac_mode = HVACMode.OFF
+
+        match self._device.operation_mode:
+            case HeaterMode.MANUAL:
+                self._attr_preset_mode = PRESET_NONE
+            case HeaterMode.BIO:
+                self._attr_preset_mode = HEATER_BIO_MODE
+            case HeaterMode.SMART:
+                self._attr_preset_mode = HEATER_SMART_MODE
diff --git a/homeassistant/components/eheimdigital/config_flow.py b/homeassistant/components/eheimdigital/config_flow.py
index c6535608b0c..b0432267c8e 100644
--- a/homeassistant/components/eheimdigital/config_flow.py
+++ b/homeassistant/components/eheimdigital/config_flow.py
@@ -62,6 +62,7 @@ class EheimDigitalConfigFlow(ConfigFlow, domain=DOMAIN):
         except (ClientError, TimeoutError):
             return self.async_abort(reason="cannot_connect")
         except Exception:  # noqa: BLE001
+            LOGGER.exception("Unknown exception occurred")
             return self.async_abort(reason="unknown")
         await self.async_set_unique_id(hub.main.mac_address)
         self._abort_if_unique_id_configured(updates={CONF_HOST: host})
diff --git a/homeassistant/components/eheimdigital/const.py b/homeassistant/components/eheimdigital/const.py
index 5ed9303be40..61b391b6c63 100644
--- a/homeassistant/components/eheimdigital/const.py
+++ b/homeassistant/components/eheimdigital/const.py
@@ -2,8 +2,9 @@
 
 from logging import Logger, getLogger
 
-from eheimdigital.types import LightMode
+from eheimdigital.types import HeaterMode, LightMode
 
+from homeassistant.components.climate import PRESET_NONE
 from homeassistant.components.light import EFFECT_OFF
 
 LOGGER: Logger = getLogger(__package__)
@@ -15,3 +16,12 @@ EFFECT_TO_LIGHT_MODE = {
     EFFECT_DAYCL_MODE: LightMode.DAYCL_MODE,
     EFFECT_OFF: LightMode.MAN_MODE,
 }
+
+HEATER_BIO_MODE = "bio_mode"
+HEATER_SMART_MODE = "smart_mode"
+
+HEATER_PRESET_TO_HEATER_MODE = {
+    HEATER_BIO_MODE: HeaterMode.BIO,
+    HEATER_SMART_MODE: HeaterMode.SMART,
+    PRESET_NONE: HeaterMode.MANUAL,
+}
diff --git a/homeassistant/components/eheimdigital/coordinator.py b/homeassistant/components/eheimdigital/coordinator.py
index f122a1227c5..df5475b6567 100644
--- a/homeassistant/components/eheimdigital/coordinator.py
+++ b/homeassistant/components/eheimdigital/coordinator.py
@@ -2,24 +2,27 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable, Coroutine
-from typing import Any
+import asyncio
+from collections.abc import Callable
 
 from aiohttp import ClientError
 from eheimdigital.device import EheimDigitalDevice
 from eheimdigital.hub import EheimDigitalHub
-from eheimdigital.types import EheimDeviceType
+from eheimdigital.types import EheimDeviceType, EheimDigitalClientError
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.entity_component import DEFAULT_SCAN_INTERVAL
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN, LOGGER
 
-type AsyncSetupDeviceEntitiesCallback = Callable[[str], Coroutine[Any, Any, None]]
+type AsyncSetupDeviceEntitiesCallback = Callable[[dict[str, EheimDigitalDevice]], None]
+
+type EheimDigitalConfigEntry = ConfigEntry[EheimDigitalUpdateCoordinator]
 
 
 class EheimDigitalUpdateCoordinator(
@@ -27,19 +30,27 @@ class EheimDigitalUpdateCoordinator(
 ):
     """The EHEIM Digital data update coordinator."""
 
-    config_entry: ConfigEntry
+    config_entry: EheimDigitalConfigEntry
 
-    def __init__(self, hass: HomeAssistant) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: EheimDigitalConfigEntry
+    ) -> None:
         """Initialize the EHEIM Digital data update coordinator."""
         super().__init__(
-            hass, LOGGER, name=DOMAIN, update_interval=DEFAULT_SCAN_INTERVAL
+            hass,
+            LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=DEFAULT_SCAN_INTERVAL,
         )
+        self.main_device_added_event = asyncio.Event()
         self.hub = EheimDigitalHub(
             host=self.config_entry.data[CONF_HOST],
             session=async_get_clientsession(hass),
             loop=hass.loop,
             receive_callback=self._async_receive_callback,
             device_found_callback=self._async_device_found,
+            main_device_added_event=self.main_device_added_event,
         )
         self.known_devices: set[str] = set()
         self.platform_callbacks: set[AsyncSetupDeviceEntitiesCallback] = set()
@@ -61,14 +72,23 @@ class EheimDigitalUpdateCoordinator(
 
         if device_address not in self.known_devices:
             for platform_callback in self.platform_callbacks:
-                await platform_callback(device_address)
+                platform_callback({device_address: self.hub.devices[device_address]})
 
     async def _async_receive_callback(self) -> None:
         self.async_set_updated_data(self.hub.devices)
 
     async def _async_setup(self) -> None:
-        await self.hub.connect()
-        await self.hub.update()
+        try:
+            await self.hub.connect()
+            async with asyncio.timeout(2):
+                # This event gets triggered when the first message is received from
+                # the device, it contains the data necessary to create the main device.
+                # This removes the race condition where the main device is accessed
+                # before the response from the device is parsed.
+                await self.main_device_added_event.wait()
+            await self.hub.update()
+        except (TimeoutError, EheimDigitalClientError) as err:
+            raise ConfigEntryNotReady from err
 
     async def _async_update_data(self) -> dict[str, EheimDigitalDevice]:
         try:
diff --git a/homeassistant/components/eheimdigital/light.py b/homeassistant/components/eheimdigital/light.py
index a119e0bda8d..2725315befd 100644
--- a/homeassistant/components/eheimdigital/light.py
+++ b/homeassistant/components/eheimdigital/light.py
@@ -3,6 +3,7 @@
 from typing import Any
 
 from eheimdigital.classic_led_ctrl import EheimDigitalClassicLEDControl
+from eheimdigital.device import EheimDigitalDevice
 from eheimdigital.types import EheimDigitalClientError, LightMode
 
 from homeassistant.components.light import (
@@ -15,12 +16,11 @@ from homeassistant.components.light import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.color import brightness_to_value, value_to_brightness
 
-from . import EheimDigitalConfigEntry
 from .const import EFFECT_DAYCL_MODE, EFFECT_TO_LIGHT_MODE
-from .coordinator import EheimDigitalUpdateCoordinator
+from .coordinator import EheimDigitalConfigEntry, EheimDigitalUpdateCoordinator
 from .entity import EheimDigitalEntity
 
 BRIGHTNESS_SCALE = (1, 100)
@@ -32,29 +32,31 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: EheimDigitalConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the callbacks for the coordinator so lights can be added as devices are found."""
     coordinator = entry.runtime_data
 
-    async def async_setup_device_entities(device_address: str) -> None:
-        """Set up the light entities for a device."""
-        device = coordinator.hub.devices[device_address]
+    def async_setup_device_entities(
+        device_address: dict[str, EheimDigitalDevice],
+    ) -> None:
+        """Set up the light entities for one or multiple devices."""
         entities: list[EheimDigitalClassicLEDControlLight] = []
+        for device in device_address.values():
+            if isinstance(device, EheimDigitalClassicLEDControl):
+                for channel in range(2):
+                    if len(device.tankconfig[channel]) > 0:
+                        entities.append(
+                            EheimDigitalClassicLEDControlLight(
+                                coordinator, device, channel
+                            )
+                        )
+                        coordinator.known_devices.add(device.mac_address)
 
-        if isinstance(device, EheimDigitalClassicLEDControl):
-            for channel in range(2):
-                if len(device.tankconfig[channel]) > 0:
-                    entities.append(
-                        EheimDigitalClassicLEDControlLight(coordinator, device, channel)
-                    )
-                    coordinator.known_devices.add(device.mac_address)
         async_add_entities(entities)
 
     coordinator.add_platform_callback(async_setup_device_entities)
-
-    for device_address in entry.runtime_data.hub.devices:
-        await async_setup_device_entities(device_address)
+    async_setup_device_entities(coordinator.hub.devices)
 
 
 class EheimDigitalClassicLEDControlLight(
diff --git a/homeassistant/components/eheimdigital/manifest.json b/homeassistant/components/eheimdigital/manifest.json
index 7747ca4f95d..1d1ca6f84c7 100644
--- a/homeassistant/components/eheimdigital/manifest.json
+++ b/homeassistant/components/eheimdigital/manifest.json
@@ -8,7 +8,7 @@
   "iot_class": "local_polling",
   "loggers": ["eheimdigital"],
   "quality_scale": "bronze",
-  "requirements": ["eheimdigital==1.0.5"],
+  "requirements": ["eheimdigital==1.0.6"],
   "zeroconf": [
     { "type": "_http._tcp.local.", "name": "eheimdigital._http._tcp.local." }
   ]
diff --git a/homeassistant/components/eheimdigital/strings.json b/homeassistant/components/eheimdigital/strings.json
index 0e6fa6a0814..ef6f6b10d0a 100644
--- a/homeassistant/components/eheimdigital/strings.json
+++ b/homeassistant/components/eheimdigital/strings.json
@@ -23,6 +23,18 @@
     }
   },
   "entity": {
+    "climate": {
+      "heater": {
+        "state_attributes": {
+          "preset_mode": {
+            "state": {
+              "bio_mode": "Bio mode",
+              "smart_mode": "Smart mode"
+            }
+          }
+        }
+      }
+    },
     "light": {
       "channel": {
         "name": "Channel {channel_id}",
diff --git a/homeassistant/components/eight_sleep/__init__.py b/homeassistant/components/eight_sleep/__init__.py
index 9df39bbe314..cfb2cfba845 100644
--- a/homeassistant/components/eight_sleep/__init__.py
+++ b/homeassistant/components/eight_sleep/__init__.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import issue_registry as ir
 
@@ -28,11 +28,13 @@ async def async_setup_entry(hass: HomeAssistant, _: ConfigEntry) -> bool:
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    if all(
-        config_entry.state is ConfigEntryState.NOT_LOADED
-        for config_entry in hass.config_entries.async_entries(DOMAIN)
-        if config_entry.entry_id != entry.entry_id
-    ):
-        ir.async_delete_issue(hass, DOMAIN, DOMAIN)
-
     return True
+
+
+async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Remove a config entry."""
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
+        ir.async_delete_issue(hass, DOMAIN, DOMAIN)
+        # Remove any remaining disabled or ignored entries
+        for _entry in hass.config_entries.async_entries(DOMAIN):
+            hass.async_create_task(hass.config_entries.async_remove(_entry.entry_id))
diff --git a/homeassistant/components/electrasmart/__init__.py b/homeassistant/components/electrasmart/__init__.py
index b8e5eb1bdd8..27cebc9aee9 100644
--- a/homeassistant/components/electrasmart/__init__.py
+++ b/homeassistant/components/electrasmart/__init__.py
@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-from typing import cast
-
 from electrasmart.api import ElectraAPI, ElectraApiError
 
 from homeassistant.config_entries import ConfigEntry
@@ -12,36 +10,40 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import CONF_IMEI, DOMAIN
+from .const import CONF_IMEI
 
 PLATFORMS: list[Platform] = [Platform.CLIMATE]
 
+type ElectraSmartConfigEntry = ConfigEntry[ElectraAPI]
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ElectraSmartConfigEntry
+) -> bool:
     """Set up Electra Smart Air Conditioner from a config entry."""
-    hass.data.setdefault(DOMAIN, {})
-    entry.async_on_unload(entry.add_update_listener(update_listener))
-    hass.data[DOMAIN][entry.entry_id] = ElectraAPI(
+    api = ElectraAPI(
         async_get_clientsession(hass), entry.data[CONF_IMEI], entry.data[CONF_TOKEN]
     )
-
     try:
-        await cast(ElectraAPI, hass.data[DOMAIN][entry.entry_id]).fetch_devices()
+        await api.fetch_devices()
     except ElectraApiError as exp:
         raise ConfigEntryNotReady(f"Error communicating with API: {exp}") from exp
 
+    entry.async_on_unload(entry.add_update_listener(update_listener))
+    entry.runtime_data = api
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, entry: ElectraSmartConfigEntry
+) -> bool:
     """Unload a config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
-async def update_listener(hass: HomeAssistant, config_entry: ConfigEntry) -> None:
+async def update_listener(
+    hass: HomeAssistant, config_entry: ElectraSmartConfigEntry
+) -> None:
     """Update listener."""
     await hass.config_entries.async_reload(config_entry.entry_id)
diff --git a/homeassistant/components/electrasmart/climate.py b/homeassistant/components/electrasmart/climate.py
index 04e4742554b..bdf94f606db 100644
--- a/homeassistant/components/electrasmart/climate.py
+++ b/homeassistant/components/electrasmart/climate.py
@@ -24,13 +24,13 @@ from homeassistant.components.climate import (
     ClimateEntityFeature,
     HVACMode,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import ElectraSmartConfigEntry
 from .const import (
     API_DELAY,
     CONSECUTIVE_FAILURE_THRESHOLD,
@@ -89,10 +89,12 @@ PARALLEL_UPDATES = 0
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ElectraSmartConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Electra AC devices."""
-    api: ElectraAPI = hass.data[DOMAIN][entry.entry_id]
+    api = entry.runtime_data
 
     _LOGGER.debug("Discovered %i Electra devices", len(api.devices))
     async_add_entities(
diff --git a/homeassistant/components/electric_kiwi/__init__.py b/homeassistant/components/electric_kiwi/__init__.py
index 8c9a0b3950e..825dbc54013 100644
--- a/homeassistant/components/electric_kiwi/__init__.py
+++ b/homeassistant/components/electric_kiwi/__init__.py
@@ -4,25 +4,31 @@ from __future__ import annotations
 
 import aiohttp
 from electrickiwi_api import ElectricKiwiApi
-from electrickiwi_api.exceptions import ApiException
+from electrickiwi_api.exceptions import ApiException, AuthException
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import aiohttp_client, config_entry_oauth2_flow
+from homeassistant.helpers import (
+    aiohttp_client,
+    config_entry_oauth2_flow,
+    entity_registry as er,
+)
 
 from . import api
-from .const import ACCOUNT_COORDINATOR, DOMAIN, HOP_COORDINATOR
 from .coordinator import (
     ElectricKiwiAccountDataCoordinator,
+    ElectricKiwiConfigEntry,
     ElectricKiwiHOPDataCoordinator,
+    ElectricKiwiRuntimeData,
 )
 
 PLATFORMS: list[Platform] = [Platform.SELECT, Platform.SENSOR]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ElectricKiwiConfigEntry
+) -> bool:
     """Set up Electric Kiwi from a config entry."""
     implementation = (
         await config_entry_oauth2_flow.async_get_config_entry_implementation(
@@ -42,31 +48,83 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         raise ConfigEntryNotReady from err
 
     ek_api = ElectricKiwiApi(
-        api.AsyncConfigEntryAuth(aiohttp_client.async_get_clientsession(hass), session)
+        api.ConfigEntryElectricKiwiAuth(
+            aiohttp_client.async_get_clientsession(hass), session
+        )
     )
-    hop_coordinator = ElectricKiwiHOPDataCoordinator(hass, ek_api)
-    account_coordinator = ElectricKiwiAccountDataCoordinator(hass, ek_api)
+    hop_coordinator = ElectricKiwiHOPDataCoordinator(hass, entry, ek_api)
+    account_coordinator = ElectricKiwiAccountDataCoordinator(hass, entry, ek_api)
 
     try:
         await ek_api.set_active_session()
         await hop_coordinator.async_config_entry_first_refresh()
         await account_coordinator.async_config_entry_first_refresh()
+    except AuthException as err:
+        raise ConfigEntryAuthFailed from err
     except ApiException as err:
         raise ConfigEntryNotReady from err
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {
-        HOP_COORDINATOR: hop_coordinator,
-        ACCOUNT_COORDINATOR: account_coordinator,
-    }
+    entry.runtime_data = ElectricKiwiRuntimeData(
+        hop=hop_coordinator, account=account_coordinator
+    )
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, entry: ElectricKiwiConfigEntry
+) -> bool:
     """Unload a config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        hass.data[DOMAIN].pop(entry.entry_id)
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
-    return unload_ok
+
+async def async_migrate_entry(
+    hass: HomeAssistant, config_entry: ElectricKiwiConfigEntry
+) -> bool:
+    """Migrate old entry."""
+    if config_entry.version == 1 and config_entry.minor_version == 1:
+        implementation = (
+            await config_entry_oauth2_flow.async_get_config_entry_implementation(
+                hass, config_entry
+            )
+        )
+
+        session = config_entry_oauth2_flow.OAuth2Session(
+            hass, config_entry, implementation
+        )
+
+        ek_api = ElectricKiwiApi(
+            api.ConfigEntryElectricKiwiAuth(
+                aiohttp_client.async_get_clientsession(hass), session
+            )
+        )
+        try:
+            await ek_api.set_active_session()
+            connection_details = await ek_api.get_connection_details()
+        except AuthException:
+            config_entry.async_start_reauth(hass)
+            return False
+        except ApiException:
+            return False
+        unique_id = str(ek_api.customer_number)
+        identifier = ek_api.electricity.identifier
+        hass.config_entries.async_update_entry(
+            config_entry, unique_id=unique_id, minor_version=2
+        )
+        entity_registry = er.async_get(hass)
+        entity_entries = er.async_entries_for_config_entry(
+            entity_registry, config_entry_id=config_entry.entry_id
+        )
+
+        for entity in entity_entries:
+            assert entity.config_entry_id
+            entity_registry.async_update_entity(
+                entity.entity_id,
+                new_unique_id=entity.unique_id.replace(
+                    f"{unique_id}_{connection_details.id}", f"{unique_id}_{identifier}"
+                ),
+            )
+
+    return True
diff --git a/homeassistant/components/electric_kiwi/api.py b/homeassistant/components/electric_kiwi/api.py
index dead8a6a3c0..9f7ff333378 100644
--- a/homeassistant/components/electric_kiwi/api.py
+++ b/homeassistant/components/electric_kiwi/api.py
@@ -2,17 +2,16 @@
 
 from __future__ import annotations
 
-from typing import cast
-
 from aiohttp import ClientSession
 from electrickiwi_api import AbstractAuth
 
-from homeassistant.helpers import config_entry_oauth2_flow
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import aiohttp_client, config_entry_oauth2_flow
 
 from .const import API_BASE_URL
 
 
-class AsyncConfigEntryAuth(AbstractAuth):
+class ConfigEntryElectricKiwiAuth(AbstractAuth):
     """Provide Electric Kiwi authentication tied to an OAuth2 based config entry."""
 
     def __init__(
@@ -29,4 +28,21 @@ class AsyncConfigEntryAuth(AbstractAuth):
         """Return a valid access token."""
         await self._oauth_session.async_ensure_token_valid()
 
-        return cast(str, self._oauth_session.token["access_token"])
+        return str(self._oauth_session.token["access_token"])
+
+
+class ConfigFlowElectricKiwiAuth(AbstractAuth):
+    """Provide Electric Kiwi authentication tied to an OAuth2 based config flow."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        token: str,
+    ) -> None:
+        """Initialize ConfigFlowFitbitApi."""
+        super().__init__(aiohttp_client.async_get_clientsession(hass), API_BASE_URL)
+        self._token = token
+
+    async def async_get_access_token(self) -> str:
+        """Return the token for the Electric Kiwi API."""
+        return self._token
diff --git a/homeassistant/components/electric_kiwi/config_flow.py b/homeassistant/components/electric_kiwi/config_flow.py
index b74ab4268e2..b83fd89c4c6 100644
--- a/homeassistant/components/electric_kiwi/config_flow.py
+++ b/homeassistant/components/electric_kiwi/config_flow.py
@@ -6,9 +6,14 @@ from collections.abc import Mapping
 import logging
 from typing import Any
 
-from homeassistant.config_entries import ConfigFlowResult
+from electrickiwi_api import ElectricKiwiApi
+from electrickiwi_api.exceptions import ApiException
+
+from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
+from homeassistant.const import CONF_NAME
 from homeassistant.helpers import config_entry_oauth2_flow
 
+from . import api
 from .const import DOMAIN, SCOPE_VALUES
 
 
@@ -17,6 +22,8 @@ class ElectricKiwiOauth2FlowHandler(
 ):
     """Config flow to handle Electric Kiwi OAuth2 authentication."""
 
+    VERSION = 1
+    MINOR_VERSION = 2
     DOMAIN = DOMAIN
 
     @property
@@ -40,12 +47,30 @@ class ElectricKiwiOauth2FlowHandler(
     ) -> ConfigFlowResult:
         """Dialog that informs the user that reauth is required."""
         if user_input is None:
-            return self.async_show_form(step_id="reauth_confirm")
+            return self.async_show_form(
+                step_id="reauth_confirm",
+                description_placeholders={CONF_NAME: self._get_reauth_entry().title},
+            )
         return await self.async_step_user()
 
     async def async_oauth_create_entry(self, data: dict) -> ConfigFlowResult:
         """Create an entry for Electric Kiwi."""
-        existing_entry = await self.async_set_unique_id(DOMAIN)
-        if existing_entry:
-            return self.async_update_reload_and_abort(existing_entry, data=data)
-        return await super().async_oauth_create_entry(data)
+        ek_api = ElectricKiwiApi(
+            api.ConfigFlowElectricKiwiAuth(self.hass, data["token"]["access_token"])
+        )
+
+        try:
+            session = await ek_api.get_active_session()
+        except ApiException:
+            return self.async_abort(reason="connection_error")
+
+        unique_id = str(session.data.customer_number)
+        await self.async_set_unique_id(unique_id)
+        if self.source == SOURCE_REAUTH:
+            self._abort_if_unique_id_mismatch(reason="wrong_account")
+            return self.async_update_reload_and_abort(
+                self._get_reauth_entry(), data=data
+            )
+
+        self._abort_if_unique_id_configured()
+        return self.async_create_entry(title=unique_id, data=data)
diff --git a/homeassistant/components/electric_kiwi/const.py b/homeassistant/components/electric_kiwi/const.py
index 0b455b045cf..c51422a7c72 100644
--- a/homeassistant/components/electric_kiwi/const.py
+++ b/homeassistant/components/electric_kiwi/const.py
@@ -8,7 +8,4 @@ OAUTH2_AUTHORIZE = "https://welcome.electrickiwi.co.nz/oauth/authorize"
 OAUTH2_TOKEN = "https://welcome.electrickiwi.co.nz/oauth/token"
 API_BASE_URL = "https://api.electrickiwi.co.nz"
 
-SCOPE_VALUES = "read_connection_detail read_billing_frequency read_account_running_balance read_consumption_summary read_consumption_averages read_hop_intervals_config read_hop_connection save_hop_connection read_session"
-
-HOP_COORDINATOR = "hop_coordinator"
-ACCOUNT_COORDINATOR = "account_coordinator"
+SCOPE_VALUES = "read_customer_details read_connection_detail read_connection read_billing_address get_bill_address read_billing_frequency read_billing_details read_billing_bills read_billing_bill read_billing_bill_id read_billing_bill_file read_account_running_balance read_customer_account_summary read_consumption_summary download_consumption_file read_consumption_averages get_consumption_averages read_hop_intervals_config read_hop_intervals read_hop_connection read_hop_specific_connection save_hop_connection save_hop_specific_connection read_outage_contact get_outage_contact_info_for_icp read_session read_session_data_login"
diff --git a/homeassistant/components/electric_kiwi/coordinator.py b/homeassistant/components/electric_kiwi/coordinator.py
index a10be5eafdd..635b55b2bc0 100644
--- a/homeassistant/components/electric_kiwi/coordinator.py
+++ b/homeassistant/components/electric_kiwi/coordinator.py
@@ -1,14 +1,18 @@
 """Electric Kiwi coordinators."""
 
+from __future__ import annotations
+
 import asyncio
 from collections import OrderedDict
+from dataclasses import dataclass
 from datetime import timedelta
 import logging
 
 from electrickiwi_api import ElectricKiwiApi
 from electrickiwi_api.exceptions import ApiException, AuthException
-from electrickiwi_api.model import AccountBalance, Hop, HopIntervals
+from electrickiwi_api.model import AccountSummary, Hop, HopIntervals
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -19,24 +23,41 @@ ACCOUNT_SCAN_INTERVAL = timedelta(hours=6)
 HOP_SCAN_INTERVAL = timedelta(minutes=20)
 
 
-class ElectricKiwiAccountDataCoordinator(DataUpdateCoordinator[AccountBalance]):
+@dataclass
+class ElectricKiwiRuntimeData:
+    """ElectricKiwi runtime data."""
+
+    hop: ElectricKiwiHOPDataCoordinator
+    account: ElectricKiwiAccountDataCoordinator
+
+
+type ElectricKiwiConfigEntry = ConfigEntry[ElectricKiwiRuntimeData]
+
+
+class ElectricKiwiAccountDataCoordinator(DataUpdateCoordinator[AccountSummary]):
     """ElectricKiwi Account Data object."""
 
-    def __init__(self, hass: HomeAssistant, ek_api: ElectricKiwiApi) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        entry: ElectricKiwiConfigEntry,
+        ek_api: ElectricKiwiApi,
+    ) -> None:
         """Initialize ElectricKiwiAccountDataCoordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             name="Electric Kiwi Account Data",
             update_interval=ACCOUNT_SCAN_INTERVAL,
         )
-        self._ek_api = ek_api
+        self.ek_api = ek_api
 
-    async def _async_update_data(self) -> AccountBalance:
+    async def _async_update_data(self) -> AccountSummary:
         """Fetch data from Account balance API endpoint."""
         try:
             async with asyncio.timeout(60):
-                return await self._ek_api.get_account_balance()
+                return await self.ek_api.get_account_summary()
         except AuthException as auth_err:
             raise ConfigEntryAuthFailed from auth_err
         except ApiException as api_err:
@@ -48,17 +69,23 @@ class ElectricKiwiAccountDataCoordinator(DataUpdateCoordinator[AccountBalance]):
 class ElectricKiwiHOPDataCoordinator(DataUpdateCoordinator[Hop]):
     """ElectricKiwi HOP Data object."""
 
-    def __init__(self, hass: HomeAssistant, ek_api: ElectricKiwiApi) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        entry: ElectricKiwiConfigEntry,
+        ek_api: ElectricKiwiApi,
+    ) -> None:
         """Initialize ElectricKiwiAccountDataCoordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             # Name of the data. For logging purposes.
             name="Electric Kiwi HOP Data",
             # Polling interval. Will only be polled if there are subscribers.
             update_interval=HOP_SCAN_INTERVAL,
         )
-        self._ek_api = ek_api
+        self.ek_api = ek_api
         self.hop_intervals: HopIntervals | None = None
 
     def get_hop_options(self) -> dict[str, int]:
@@ -73,7 +100,7 @@ class ElectricKiwiHOPDataCoordinator(DataUpdateCoordinator[Hop]):
     async def async_update_hop(self, hop_interval: int) -> Hop:
         """Update selected hop and data."""
         try:
-            self.async_set_updated_data(await self._ek_api.post_hop(hop_interval))
+            self.async_set_updated_data(await self.ek_api.post_hop(hop_interval))
         except AuthException as auth_err:
             raise ConfigEntryAuthFailed from auth_err
         except ApiException as api_err:
@@ -91,7 +118,7 @@ class ElectricKiwiHOPDataCoordinator(DataUpdateCoordinator[Hop]):
         try:
             async with asyncio.timeout(60):
                 if self.hop_intervals is None:
-                    hop_intervals: HopIntervals = await self._ek_api.get_hop_intervals()
+                    hop_intervals: HopIntervals = await self.ek_api.get_hop_intervals()
                     hop_intervals.intervals = OrderedDict(
                         filter(
                             lambda pair: pair[1].active == 1,
@@ -100,7 +127,7 @@ class ElectricKiwiHOPDataCoordinator(DataUpdateCoordinator[Hop]):
                     )
 
                     self.hop_intervals = hop_intervals
-                return await self._ek_api.get_hop()
+                return await self.ek_api.get_hop()
         except AuthException as auth_err:
             raise ConfigEntryAuthFailed from auth_err
         except ApiException as api_err:
diff --git a/homeassistant/components/electric_kiwi/icons.json b/homeassistant/components/electric_kiwi/icons.json
index 1932ce19432..e5dbbb5ac48 100644
--- a/homeassistant/components/electric_kiwi/icons.json
+++ b/homeassistant/components/electric_kiwi/icons.json
@@ -13,6 +13,11 @@
       "hop_power_savings": {
         "default": "mdi:percent"
       }
+    },
+    "select": {
+      "hop_selector": {
+        "default": "mdi:lightning-bolt"
+      }
     }
   }
 }
diff --git a/homeassistant/components/electric_kiwi/manifest.json b/homeassistant/components/electric_kiwi/manifest.json
index 8ddb4c1af7c..b2f19000825 100644
--- a/homeassistant/components/electric_kiwi/manifest.json
+++ b/homeassistant/components/electric_kiwi/manifest.json
@@ -7,5 +7,6 @@
   "documentation": "https://www.home-assistant.io/integrations/electric_kiwi",
   "integration_type": "hub",
   "iot_class": "cloud_polling",
-  "requirements": ["electrickiwi-api==0.8.5"]
+  "quality_scale": "bronze",
+  "requirements": ["electrickiwi-api==0.9.14"]
 }
diff --git a/homeassistant/components/electric_kiwi/quality_scale.yaml b/homeassistant/components/electric_kiwi/quality_scale.yaml
new file mode 100644
index 00000000000..a7db8d203b6
--- /dev/null
+++ b/homeassistant/components/electric_kiwi/quality_scale.yaml
@@ -0,0 +1,105 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: |
+      No custom actions.
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: |
+      No custom actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup:
+    status: exempt
+    comment: |
+      Does not subscribe to event explicitly.
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions:
+    status: exempt
+    comment: |
+      No actions
+  config-entry-unloading: done
+  docs-configuration-parameters:
+    status: exempt
+    comment: |
+      Has no options flow
+  docs-installation-parameters:
+    status: exempt
+    comment: |
+      Handled by OAuth flow (HA is only one with credentials, users cannot get them)
+  entity-unavailable: done
+  integration-owner: done
+  log-when-unavailable: done
+  parallel-updates: done
+  reauthentication-flow: done
+  test-coverage: todo
+
+  # Gold
+  devices:
+    status: exempt
+    comment: |
+      Web services only
+  diagnostics: todo
+  discovery-update-info:
+    status: exempt
+    comment: |
+      Web services only
+  discovery:
+    status: exempt
+    comment: |
+      Web services only
+  docs-data-update: todo
+  docs-examples: done
+  docs-known-limitations: done
+  docs-supported-devices:
+    status: exempt
+    comment: |
+      No devices
+  docs-supported-functions: todo
+  docs-troubleshooting: todo
+  docs-use-cases: done
+  dynamic-devices:
+    status: exempt
+    comment: |
+      No devices
+  entity-category: done
+  entity-device-class: done
+  entity-disabled-by-default:
+    status: exempt
+    comment: |
+      No unnecessary or noisy entities
+  entity-translations: done
+  exception-translations: todo
+  icon-translations: done
+  reconfiguration-flow:
+    status: exempt
+    comment: |
+      Handled by OAuth
+  repair-issues:
+    status: exempt
+    comment: |
+      Does not have any repairs
+  stale-devices:
+    status: exempt
+    comment: |
+      Does not have devices
+
+  # Platinum
+  async-dependency: todo
+  inject-websession: todo
+  strict-typing: todo
diff --git a/homeassistant/components/electric_kiwi/select.py b/homeassistant/components/electric_kiwi/select.py
index a3f073b8ca2..2ba2a089557 100644
--- a/homeassistant/components/electric_kiwi/select.py
+++ b/homeassistant/components/electric_kiwi/select.py
@@ -5,14 +5,15 @@ from __future__ import annotations
 import logging
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .const import ATTRIBUTION, DOMAIN, HOP_COORDINATOR
-from .coordinator import ElectricKiwiHOPDataCoordinator
+from .const import ATTRIBUTION
+from .coordinator import ElectricKiwiConfigEntry, ElectricKiwiHOPDataCoordinator
+
+PARALLEL_UPDATES = 1
 
 _LOGGER = logging.getLogger(__name__)
 ATTR_EK_HOP_SELECT = "hop_select"
@@ -25,12 +26,12 @@ HOP_SELECT = SelectEntityDescription(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ElectricKiwiConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Electric Kiwi select setup."""
-    hop_coordinator: ElectricKiwiHOPDataCoordinator = hass.data[DOMAIN][entry.entry_id][
-        HOP_COORDINATOR
-    ]
+    hop_coordinator = entry.runtime_data.hop
 
     _LOGGER.debug("Setting up select entity")
     async_add_entities([ElectricKiwiSelectHOPEntity(hop_coordinator, HOP_SELECT)])
@@ -54,8 +55,8 @@ class ElectricKiwiSelectHOPEntity(
         """Initialise the HOP selection entity."""
         super().__init__(coordinator)
         self._attr_unique_id = (
-            f"{coordinator._ek_api.customer_number}"  # noqa: SLF001
-            f"_{coordinator._ek_api.connection_id}_{description.key}"  # noqa: SLF001
+            f"{coordinator.ek_api.customer_number}"
+            f"_{coordinator.ek_api.electricity.identifier}_{description.key}"
         )
         self.entity_description = description
         self.values_dict = coordinator.get_hop_options()
diff --git a/homeassistant/components/electric_kiwi/sensor.py b/homeassistant/components/electric_kiwi/sensor.py
index 7672466106b..27f13a82e09 100644
--- a/homeassistant/components/electric_kiwi/sensor.py
+++ b/homeassistant/components/electric_kiwi/sensor.py
@@ -6,7 +6,7 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 
-from electrickiwi_api.model import AccountBalance, Hop
+from electrickiwi_api.model import AccountSummary, Hop
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -14,19 +14,21 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CURRENCY_DOLLAR, PERCENTAGE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import dt as dt_util
 
-from .const import ACCOUNT_COORDINATOR, ATTRIBUTION, DOMAIN, HOP_COORDINATOR
+from .const import ATTRIBUTION
 from .coordinator import (
     ElectricKiwiAccountDataCoordinator,
+    ElectricKiwiConfigEntry,
     ElectricKiwiHOPDataCoordinator,
 )
 
+PARALLEL_UPDATES = 0
+
 ATTR_EK_HOP_START = "hop_power_start"
 ATTR_EK_HOP_END = "hop_power_end"
 ATTR_TOTAL_RUNNING_BALANCE = "total_running_balance"
@@ -39,7 +41,15 @@ ATTR_HOP_PERCENTAGE = "hop_percentage"
 class ElectricKiwiAccountSensorEntityDescription(SensorEntityDescription):
     """Describes Electric Kiwi sensor entity."""
 
-    value_func: Callable[[AccountBalance], float | datetime]
+    value_func: Callable[[AccountSummary], float | datetime]
+
+
+def _get_hop_percentage(account_balance: AccountSummary) -> float:
+    """Return the hop percentage from account summary."""
+    if power := account_balance.services.get("power"):
+        if connection := power.connections[0]:
+            return float(connection.hop_percentage)
+    return 0.0
 
 
 ACCOUNT_SENSOR_TYPES: tuple[ElectricKiwiAccountSensorEntityDescription, ...] = (
@@ -72,9 +82,7 @@ ACCOUNT_SENSOR_TYPES: tuple[ElectricKiwiAccountSensorEntityDescription, ...] = (
         translation_key="hop_power_savings",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
-        value_func=lambda account_balance: float(
-            account_balance.connections[0].hop_percentage
-        ),
+        value_func=_get_hop_percentage,
     ),
 )
 
@@ -122,12 +130,12 @@ HOP_SENSOR_TYPES: tuple[ElectricKiwiHOPSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ElectricKiwiConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Electric Kiwi Sensors Setup."""
-    account_coordinator: ElectricKiwiAccountDataCoordinator = hass.data[DOMAIN][
-        entry.entry_id
-    ][ACCOUNT_COORDINATOR]
+    account_coordinator = entry.runtime_data.account
 
     entities: list[SensorEntity] = [
         ElectricKiwiAccountEntity(
@@ -137,9 +145,7 @@ async def async_setup_entry(
         for description in ACCOUNT_SENSOR_TYPES
     ]
 
-    hop_coordinator: ElectricKiwiHOPDataCoordinator = hass.data[DOMAIN][entry.entry_id][
-        HOP_COORDINATOR
-    ]
+    hop_coordinator = entry.runtime_data.hop
     entities.extend(
         [
             ElectricKiwiHOPEntity(hop_coordinator, description)
@@ -167,8 +173,8 @@ class ElectricKiwiAccountEntity(
         super().__init__(coordinator)
 
         self._attr_unique_id = (
-            f"{coordinator._ek_api.customer_number}"  # noqa: SLF001
-            f"_{coordinator._ek_api.connection_id}_{description.key}"  # noqa: SLF001
+            f"{coordinator.ek_api.customer_number}"
+            f"_{coordinator.ek_api.electricity.identifier}_{description.key}"
         )
         self.entity_description = description
 
@@ -196,8 +202,8 @@ class ElectricKiwiHOPEntity(
         super().__init__(coordinator)
 
         self._attr_unique_id = (
-            f"{coordinator._ek_api.customer_number}"  # noqa: SLF001
-            f"_{coordinator._ek_api.connection_id}_{description.key}"  # noqa: SLF001
+            f"{coordinator.ek_api.customer_number}"
+            f"_{coordinator.ek_api.electricity.identifier}_{description.key}"
         )
         self.entity_description = description
 
diff --git a/homeassistant/components/electric_kiwi/strings.json b/homeassistant/components/electric_kiwi/strings.json
index 410d32909ba..5e0a2ef168d 100644
--- a/homeassistant/components/electric_kiwi/strings.json
+++ b/homeassistant/components/electric_kiwi/strings.json
@@ -21,7 +21,8 @@
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
       "oauth_timeout": "[%key:common::config_flow::abort::oauth2_timeout%]",
       "oauth_unauthorized": "[%key:common::config_flow::abort::oauth2_unauthorized%]",
-      "oauth_failed": "[%key:common::config_flow::abort::oauth2_failed%]"
+      "oauth_failed": "[%key:common::config_flow::abort::oauth2_failed%]",
+      "connection_error": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "create_entry": {
       "default": "[%key:common::config_flow::create_entry::authenticated%]"
diff --git a/homeassistant/components/elevenlabs/strings.json b/homeassistant/components/elevenlabs/strings.json
index b346f94a963..8b0205a9e9a 100644
--- a/homeassistant/components/elevenlabs/strings.json
+++ b/homeassistant/components/elevenlabs/strings.json
@@ -6,7 +6,7 @@
           "api_key": "[%key:common::config_flow::data::api_key%]"
         },
         "data_description": {
-          "api_key": "Your Elevenlabs API key."
+          "api_key": "Your ElevenLabs API key."
         }
       }
     },
diff --git a/homeassistant/components/elevenlabs/tts.py b/homeassistant/components/elevenlabs/tts.py
index 008cd106615..efcadb3f440 100644
--- a/homeassistant/components/elevenlabs/tts.py
+++ b/homeassistant/components/elevenlabs/tts.py
@@ -20,7 +20,7 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import ElevenLabsConfigEntry
 from .const import (
@@ -58,7 +58,7 @@ def to_voice_settings(options: MappingProxyType[str, Any]) -> VoiceSettings:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ElevenLabsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up ElevenLabs tts platform via config entry."""
     client = config_entry.runtime_data.client
diff --git a/homeassistant/components/elgato/button.py b/homeassistant/components/elgato/button.py
index 505eff36b44..23ed65ded33 100644
--- a/homeassistant/components/elgato/button.py
+++ b/homeassistant/components/elgato/button.py
@@ -16,7 +16,7 @@ from homeassistant.components.button import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import ElgatoConfigEntry, ElgatoDataUpdateCoordinator
 from .entity import ElgatoEntity
@@ -50,7 +50,7 @@ BUTTONS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ElgatoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Elgato button based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/elgato/light.py b/homeassistant/components/elgato/light.py
index 990a0606fce..7d2010f7ba4 100644
--- a/homeassistant/components/elgato/light.py
+++ b/homeassistant/components/elgato/light.py
@@ -16,7 +16,7 @@ from homeassistant.components.light import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import (
-    AddEntitiesCallback,
+    AddConfigEntryEntitiesCallback,
     async_get_current_platform,
 )
 from homeassistant.util import color as color_util
@@ -31,7 +31,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ElgatoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Elgato Light based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/elgato/sensor.py b/homeassistant/components/elgato/sensor.py
index 529d2f7c76e..02dbc2aeef6 100644
--- a/homeassistant/components/elgato/sensor.py
+++ b/homeassistant/components/elgato/sensor.py
@@ -19,7 +19,7 @@ from homeassistant.const import (
     UnitOfPower,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import ElgatoConfigEntry, ElgatoData, ElgatoDataUpdateCoordinator
 from .entity import ElgatoEntity
@@ -104,7 +104,7 @@ SENSORS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ElgatoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Elgato sensor based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/elgato/switch.py b/homeassistant/components/elgato/switch.py
index 3b2420b0ace..1b24f621807 100644
--- a/homeassistant/components/elgato/switch.py
+++ b/homeassistant/components/elgato/switch.py
@@ -12,7 +12,7 @@ from homeassistant.components.switch import SwitchEntity, SwitchEntityDescriptio
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import ElgatoConfigEntry, ElgatoData, ElgatoDataUpdateCoordinator
 from .entity import ElgatoEntity
@@ -54,7 +54,7 @@ SWITCHES = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ElgatoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Elgato switches based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/eliqonline/sensor.py b/homeassistant/components/eliqonline/sensor.py
index 7c9f76824e8..1a5490da0a5 100644
--- a/homeassistant/components/eliqonline/sensor.py
+++ b/homeassistant/components/eliqonline/sensor.py
@@ -16,8 +16,8 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_NAME, UnitOfPower
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/elkm1/__init__.py b/homeassistant/components/elkm1/__init__.py
index 34a35fbeb09..4bf51b99de1 100644
--- a/homeassistant/components/elkm1/__init__.py
+++ b/homeassistant/components/elkm1/__init__.py
@@ -32,7 +32,7 @@ from homeassistant.exceptions import ConfigEntryNotReady, HomeAssistantError
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.typing import ConfigType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.network import is_ip_address
 
 from .const import (
@@ -101,9 +101,11 @@ def hostname_from_url(url: str) -> str:
 
 def _host_validator(config: dict[str, str]) -> dict[str, str]:
     """Validate that a host is properly configured."""
-    if config[CONF_HOST].startswith("elks://"):
+    if config[CONF_HOST].startswith(("elks://", "elksv1_2://")):
         if CONF_USERNAME not in config or CONF_PASSWORD not in config:
-            raise vol.Invalid("Specify username and password for elks://")
+            raise vol.Invalid(
+                "Specify username and password for elks:// or elksv1_2://"
+            )
     elif not config[CONF_HOST].startswith("elk://") and not config[
         CONF_HOST
     ].startswith("serial://"):
diff --git a/homeassistant/components/elkm1/alarm_control_panel.py b/homeassistant/components/elkm1/alarm_control_panel.py
index f1ecf626263..393845f65ff 100644
--- a/homeassistant/components/elkm1/alarm_control_panel.py
+++ b/homeassistant/components/elkm1/alarm_control_panel.py
@@ -19,9 +19,8 @@ from homeassistant.components.alarm_control_panel import (
     CodeFormat,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_platform
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv, entity_platform
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import VolDictType
 
@@ -56,7 +55,7 @@ SERVICE_ALARM_CLEAR_BYPASS = "alarm_clear_bypass"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ElkM1ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ElkM1 alarm platform."""
     elk_data = config_entry.runtime_data
@@ -106,6 +105,7 @@ class ElkArea(ElkAttachedEntity, AlarmControlPanelEntity, RestoreEntity):
         AlarmControlPanelEntityFeature.ARM_HOME
         | AlarmControlPanelEntityFeature.ARM_AWAY
         | AlarmControlPanelEntityFeature.ARM_NIGHT
+        | AlarmControlPanelEntityFeature.ARM_VACATION
     )
     _element: Area
 
@@ -205,7 +205,7 @@ class ElkArea(ElkAttachedEntity, AlarmControlPanelEntity, RestoreEntity):
             ArmedStatus.ARMED_STAY_INSTANT: AlarmControlPanelState.ARMED_HOME,
             ArmedStatus.ARMED_TO_NIGHT: AlarmControlPanelState.ARMED_NIGHT,
             ArmedStatus.ARMED_TO_NIGHT_INSTANT: AlarmControlPanelState.ARMED_NIGHT,
-            ArmedStatus.ARMED_TO_VACATION: AlarmControlPanelState.ARMED_AWAY,
+            ArmedStatus.ARMED_TO_VACATION: AlarmControlPanelState.ARMED_VACATION,
         }
 
         if self._element.alarm_state is None:
diff --git a/homeassistant/components/elkm1/binary_sensor.py b/homeassistant/components/elkm1/binary_sensor.py
index 73f6b925e8c..ba6a375c29b 100644
--- a/homeassistant/components/elkm1/binary_sensor.py
+++ b/homeassistant/components/elkm1/binary_sensor.py
@@ -10,7 +10,7 @@ from elkm1_lib.zones import Zone
 
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import ElkM1ConfigEntry
 from .entity import ElkAttachedEntity, ElkEntity
@@ -19,7 +19,7 @@ from .entity import ElkAttachedEntity, ElkEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ElkM1ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create the Elk-M1 sensor platform."""
     elk_data = config_entry.runtime_data
diff --git a/homeassistant/components/elkm1/climate.py b/homeassistant/components/elkm1/climate.py
index 1448acc6079..55af0cfa29c 100644
--- a/homeassistant/components/elkm1/climate.py
+++ b/homeassistant/components/elkm1/climate.py
@@ -19,7 +19,7 @@ from homeassistant.components.climate import (
 )
 from homeassistant.const import PRECISION_WHOLE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 
 from . import ElkM1ConfigEntry
@@ -60,7 +60,7 @@ ELK_TO_HASS_FAN_MODES = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ElkM1ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create the Elk-M1 thermostat platform."""
     elk_data = config_entry.runtime_data
diff --git a/homeassistant/components/elkm1/light.py b/homeassistant/components/elkm1/light.py
index c041c9c9d65..b5e2f0acacf 100644
--- a/homeassistant/components/elkm1/light.py
+++ b/homeassistant/components/elkm1/light.py
@@ -10,7 +10,7 @@ from elkm1_lib.lights import Light
 
 from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import ElkM1ConfigEntry
 from .entity import ElkEntity, create_elk_entities
@@ -20,7 +20,7 @@ from .models import ELKM1Data
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ElkM1ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Elk light platform."""
     elk_data = config_entry.runtime_data
diff --git a/homeassistant/components/elkm1/scene.py b/homeassistant/components/elkm1/scene.py
index d8a1d83f326..5da240aee2d 100644
--- a/homeassistant/components/elkm1/scene.py
+++ b/homeassistant/components/elkm1/scene.py
@@ -8,7 +8,7 @@ from elkm1_lib.tasks import Task
 
 from homeassistant.components.scene import Scene
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import ElkM1ConfigEntry
 from .entity import ElkAttachedEntity, ElkEntity, create_elk_entities
@@ -17,7 +17,7 @@ from .entity import ElkAttachedEntity, ElkEntity, create_elk_entities
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ElkM1ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create the Elk-M1 scene platform."""
     elk_data = config_entry.runtime_data
diff --git a/homeassistant/components/elkm1/sensor.py b/homeassistant/components/elkm1/sensor.py
index 2ca932ec134..328672edbed 100644
--- a/homeassistant/components/elkm1/sensor.py
+++ b/homeassistant/components/elkm1/sensor.py
@@ -19,7 +19,7 @@ from homeassistant.const import EntityCategory, UnitOfElectricPotential
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import VolDictType
 
 from . import ElkM1ConfigEntry
@@ -40,7 +40,7 @@ ELK_SET_COUNTER_SERVICE_SCHEMA: VolDictType = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ElkM1ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create the Elk-M1 sensor platform."""
     elk_data = config_entry.runtime_data
diff --git a/homeassistant/components/elkm1/strings.json b/homeassistant/components/elkm1/strings.json
index f184483646d..b50c1817838 100644
--- a/homeassistant/components/elkm1/strings.json
+++ b/homeassistant/components/elkm1/strings.json
@@ -53,7 +53,7 @@
       "fields": {
         "code": {
           "name": "Code",
-          "description": "An code to authorize the bypass of the alarm control panel."
+          "description": "Alarm code to authorize the bypass of the alarm control panel."
         }
       }
     },
@@ -63,7 +63,7 @@
       "fields": {
         "code": {
           "name": "Code",
-          "description": "An code to authorize the bypass clear of the alarm control panel."
+          "description": "Alarm code to authorize the bypass clear of the alarm control panel."
         }
       }
     },
@@ -73,7 +73,7 @@
       "fields": {
         "code": {
           "name": "Code",
-          "description": "An code to arm the alarm control panel."
+          "description": "Alarm code to arm the alarm control panel."
         }
       }
     },
@@ -181,7 +181,7 @@
       "fields": {
         "code": {
           "name": "Code",
-          "description": "An code to authorize the bypass of the zone."
+          "description": "Alarm code to authorize the bypass of the zone."
         }
       }
     },
diff --git a/homeassistant/components/elkm1/switch.py b/homeassistant/components/elkm1/switch.py
index 3e0f4849518..d91d65512a2 100644
--- a/homeassistant/components/elkm1/switch.py
+++ b/homeassistant/components/elkm1/switch.py
@@ -12,7 +12,7 @@ from elkm1_lib.thermostats import Thermostat
 
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import ElkM1ConfigEntry
 from .entity import ElkAttachedEntity, ElkEntity, create_elk_entities
@@ -22,7 +22,7 @@ from .models import ELKM1Data
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ElkM1ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create the Elk-M1 switch platform."""
     elk_data = config_entry.runtime_data
diff --git a/homeassistant/components/elmax/__init__.py b/homeassistant/components/elmax/__init__.py
index d85e5778a39..ec293be8273 100644
--- a/homeassistant/components/elmax/__init__.py
+++ b/homeassistant/components/elmax/__init__.py
@@ -2,14 +2,10 @@
 
 from __future__ import annotations
 
-from datetime import timedelta
-import logging
-
 from elmax_api.exceptions import ElmaxBadLoginError
 from elmax_api.http import Elmax, ElmaxLocal, GenericElmax
 from elmax_api.model.panel import PanelEntry
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import Event, HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
@@ -27,17 +23,13 @@ from .const import (
     CONF_ELMAX_PANEL_PIN,
     CONF_ELMAX_PASSWORD,
     CONF_ELMAX_USERNAME,
-    DOMAIN,
     ELMAX_PLATFORMS,
-    POLLING_SECONDS,
 )
-from .coordinator import ElmaxCoordinator
-
-_LOGGER = logging.getLogger(__name__)
+from .coordinator import ElmaxConfigEntry, ElmaxCoordinator
 
 
 async def _load_elmax_panel_client(
-    entry: ConfigEntry,
+    entry: ElmaxConfigEntry,
 ) -> tuple[GenericElmax, PanelEntry]:
     # Connection mode was not present in initial version, default to cloud if not set
     mode = entry.data.get(CONF_ELMAX_MODE, CONF_ELMAX_MODE_CLOUD)
@@ -87,7 +79,7 @@ async def _check_cloud_panel_status(client: Elmax, panel_id: str) -> PanelEntry:
     return panel
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ElmaxConfigEntry) -> bool:
     """Set up elmax-cloud from a config entry."""
     try:
         client, panel = await _load_elmax_panel_client(entry)
@@ -98,11 +90,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     # if there is something wrong with user credentials
     coordinator = ElmaxCoordinator(
         hass=hass,
-        logger=_LOGGER,
+        entry=entry,
         elmax_api_client=client,
         panel=panel,
-        name=f"Elmax Cloud {entry.entry_id}",
-        update_interval=timedelta(seconds=POLLING_SECONDS),
     )
 
     async def _async_on_hass_stop(_: Event) -> None:
@@ -117,7 +107,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     await coordinator.async_config_entry_first_refresh()
 
     # Store a global reference to the coordinator for later use
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+    entry.runtime_data = coordinator
 
     entry.async_on_unload(entry.add_update_listener(async_reload_entry))
 
@@ -126,15 +116,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return True
 
 
-async def async_reload_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
+async def async_reload_entry(hass: HomeAssistant, entry: ElmaxConfigEntry) -> None:
     """Handle an options update."""
     await hass.config_entries.async_reload(entry.entry_id)
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ElmaxConfigEntry) -> bool:
     """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, ELMAX_PLATFORMS)
-    if unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, ELMAX_PLATFORMS)
diff --git a/homeassistant/components/elmax/alarm_control_panel.py b/homeassistant/components/elmax/alarm_control_panel.py
index 841b94a3d72..a90c8f2652c 100644
--- a/homeassistant/components/elmax/alarm_control_panel.py
+++ b/homeassistant/components/elmax/alarm_control_panel.py
@@ -13,23 +13,22 @@ from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelState,
     CodeFormat,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError, InvalidStateError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
-from .coordinator import ElmaxCoordinator
+from .coordinator import ElmaxConfigEntry
 from .entity import ElmaxEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: ElmaxConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Elmax area platform."""
-    coordinator: ElmaxCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
     known_devices = set()
 
     def _discover_new_devices():
diff --git a/homeassistant/components/elmax/binary_sensor.py b/homeassistant/components/elmax/binary_sensor.py
index ec51f861819..d9ec3e75901 100644
--- a/homeassistant/components/elmax/binary_sensor.py
+++ b/homeassistant/components/elmax/binary_sensor.py
@@ -8,22 +8,20 @@ from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN
-from .coordinator import ElmaxCoordinator
+from .coordinator import ElmaxConfigEntry
 from .entity import ElmaxEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: ElmaxConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Elmax sensor platform."""
-    coordinator: ElmaxCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
     known_devices = set()
 
     def _discover_new_devices():
diff --git a/homeassistant/components/elmax/config_flow.py b/homeassistant/components/elmax/config_flow.py
index b8697552626..98e49cc8056 100644
--- a/homeassistant/components/elmax/config_flow.py
+++ b/homeassistant/components/elmax/config_flow.py
@@ -498,7 +498,11 @@ class ElmaxConfigFlow(ConfigFlow, domain=DOMAIN):
         self, discovery_info: ZeroconfServiceInfo
     ) -> ConfigFlowResult:
         """Handle device found via zeroconf."""
-        host = discovery_info.host
+        host = (
+            f"[{discovery_info.ip_address}]"
+            if discovery_info.ip_address.version == 6
+            else str(discovery_info.ip_address)
+        )
         https_port = (
             int(discovery_info.port)
             if discovery_info.port is not None
diff --git a/homeassistant/components/elmax/coordinator.py b/homeassistant/components/elmax/coordinator.py
index 844a3413089..abcc098359e 100644
--- a/homeassistant/components/elmax/coordinator.py
+++ b/homeassistant/components/elmax/coordinator.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from asyncio import timeout
 from datetime import timedelta
-from logging import Logger
+import logging
 
 from elmax_api.exceptions import (
     ElmaxApiError,
@@ -22,11 +22,16 @@ from elmax_api.model.panel import PanelEntry, PanelStatus
 from elmax_api.push.push import PushNotificationHandler
 from httpx import ConnectError, ConnectTimeout
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, HomeAssistantError
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import DEFAULT_TIMEOUT
+from .const import DEFAULT_TIMEOUT, POLLING_SECONDS
+
+_LOGGER = logging.getLogger(__name__)
+
+type ElmaxConfigEntry = ConfigEntry[ElmaxCoordinator]
 
 
 class ElmaxCoordinator(DataUpdateCoordinator[PanelStatus]):
@@ -37,11 +42,9 @@ class ElmaxCoordinator(DataUpdateCoordinator[PanelStatus]):
     def __init__(
         self,
         hass: HomeAssistant,
-        logger: Logger,
+        entry: ElmaxConfigEntry,
         elmax_api_client: GenericElmax,
         panel: PanelEntry,
-        name: str,
-        update_interval: timedelta,
     ) -> None:
         """Instantiate the object."""
         self._client = elmax_api_client
@@ -49,7 +52,11 @@ class ElmaxCoordinator(DataUpdateCoordinator[PanelStatus]):
         self._state_by_endpoint = {}
         self._push_notification_handler = None
         super().__init__(
-            hass=hass, logger=logger, name=name, update_interval=update_interval
+            hass=hass,
+            config_entry=entry,
+            logger=_LOGGER,
+            name=f"Elmax Cloud {entry.entry_id}",
+            update_interval=timedelta(seconds=POLLING_SECONDS),
         )
 
     @property
diff --git a/homeassistant/components/elmax/cover.py b/homeassistant/components/elmax/cover.py
index 403bc51dbff..6993d5e44be 100644
--- a/homeassistant/components/elmax/cover.py
+++ b/homeassistant/components/elmax/cover.py
@@ -9,12 +9,10 @@ from elmax_api.model.command import CoverCommand
 from elmax_api.model.cover_status import CoverStatus
 
 from homeassistant.components.cover import CoverEntity, CoverEntityFeature
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN
-from .coordinator import ElmaxCoordinator
+from .coordinator import ElmaxConfigEntry
 from .entity import ElmaxEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -28,11 +26,11 @@ _COMMAND_BY_MOTION_STATUS = {  # Maps the stop command to use for every cover mo
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: ElmaxConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Elmax cover platform."""
-    coordinator: ElmaxCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
     # Add the cover feature only if supported by the current panel.
     if coordinator.data is None or not coordinator.data.cover_feature:
         return
diff --git a/homeassistant/components/elmax/switch.py b/homeassistant/components/elmax/switch.py
index d0e52c556f6..28a97fefd91 100644
--- a/homeassistant/components/elmax/switch.py
+++ b/homeassistant/components/elmax/switch.py
@@ -8,12 +8,10 @@ from elmax_api.model.command import SwitchCommand
 from elmax_api.model.panel import PanelStatus
 
 from homeassistant.components.switch import SwitchEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN
-from .coordinator import ElmaxCoordinator
+from .coordinator import ElmaxConfigEntry
 from .entity import ElmaxEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -21,11 +19,11 @@ _LOGGER = logging.getLogger(__name__)
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: ElmaxConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Elmax switch platform."""
-    coordinator: ElmaxCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
     known_devices = set()
 
     def _discover_new_devices():
diff --git a/homeassistant/components/elv/__init__.py b/homeassistant/components/elv/__init__.py
index 208d19a0f8e..97f08c786f4 100644
--- a/homeassistant/components/elv/__init__.py
+++ b/homeassistant/components/elv/__init__.py
@@ -4,8 +4,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_DEVICE, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 DOMAIN = "elv"
diff --git a/homeassistant/components/elvia/importer.py b/homeassistant/components/elvia/importer.py
index 4e8b7f716ef..caca787237c 100644
--- a/homeassistant/components/elvia/importer.py
+++ b/homeassistant/components/elvia/importer.py
@@ -7,7 +7,11 @@ from typing import TYPE_CHECKING, cast
 
 from elvia import Elvia, error as ElviaError
 
-from homeassistant.components.recorder.models import StatisticData, StatisticMetaData
+from homeassistant.components.recorder.models import (
+    StatisticData,
+    StatisticMeanType,
+    StatisticMetaData,
+)
 from homeassistant.components.recorder.statistics import (
     async_add_external_statistics,
     get_last_statistics,
@@ -144,7 +148,7 @@ class ElviaImporter:
         async_add_external_statistics(
             hass=self.hass,
             metadata=StatisticMetaData(
-                has_mean=False,
+                mean_type=StatisticMeanType.NONE,
                 has_sum=True,
                 name=f"{self.metering_point_id} Consumption",
                 source=DOMAIN,
diff --git a/homeassistant/components/elvia/strings.json b/homeassistant/components/elvia/strings.json
index 888a5ab8e76..a2c3cb81f54 100644
--- a/homeassistant/components/elvia/strings.json
+++ b/homeassistant/components/elvia/strings.json
@@ -19,7 +19,7 @@
     },
     "abort": {
       "metering_point_id_already_configured": "Metering point with ID `{metering_point_id}` is already configured.",
-      "no_metering_points": "The provived API token has no metering points."
+      "no_metering_points": "The provided API token has no metering points."
     }
   }
 }
diff --git a/homeassistant/components/emby/media_player.py b/homeassistant/components/emby/media_player.py
index 21ee6449c11..812e58ecc19 100644
--- a/homeassistant/components/emby/media_player.py
+++ b/homeassistant/components/emby/media_player.py
@@ -24,10 +24,10 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/emoncms/__init__.py b/homeassistant/components/emoncms/__init__.py
index 581948bbc6f..012abcc8c9a 100644
--- a/homeassistant/components/emoncms/__init__.py
+++ b/homeassistant/components/emoncms/__init__.py
@@ -2,7 +2,6 @@
 
 from pyemoncms import EmoncmsClient
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_URL, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
@@ -10,12 +9,10 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 
 from .const import DOMAIN, EMONCMS_UUID_DOC_URL, LOGGER
-from .coordinator import EmoncmsCoordinator
+from .coordinator import EmonCMSConfigEntry, EmoncmsCoordinator
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
-type EmonCMSConfigEntry = ConfigEntry[EmoncmsCoordinator]
-
 
 def _migrate_unique_id(
     hass: HomeAssistant, entry: EmonCMSConfigEntry, emoncms_unique_id: str
@@ -68,7 +65,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: EmonCMSConfigEntry) -> b
         session=async_get_clientsession(hass),
     )
     await _check_unique_id_migration(hass, entry, emoncms_client)
-    coordinator = EmoncmsCoordinator(hass, emoncms_client)
+    coordinator = EmoncmsCoordinator(hass, entry, emoncms_client)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
 
@@ -77,11 +74,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: EmonCMSConfigEntry) -> b
     return True
 
 
-async def update_listener(hass: HomeAssistant, entry: ConfigEntry):
+async def update_listener(hass: HomeAssistant, entry: EmonCMSConfigEntry):
     """Handle options update."""
     await hass.config_entries.async_reload(entry.entry_id)
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: EmonCMSConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/emoncms/coordinator.py b/homeassistant/components/emoncms/coordinator.py
index c6fda5ed7c8..ec439b400d5 100644
--- a/homeassistant/components/emoncms/coordinator.py
+++ b/homeassistant/components/emoncms/coordinator.py
@@ -5,24 +5,31 @@ from typing import Any
 
 from pyemoncms import EmoncmsClient
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import CONF_MESSAGE, CONF_SUCCESS, LOGGER
 
+type EmonCMSConfigEntry = ConfigEntry[EmoncmsCoordinator]
+
 
 class EmoncmsCoordinator(DataUpdateCoordinator[list[dict[str, Any]] | None]):
     """Emoncms Data Update Coordinator."""
 
+    config_entry: EmonCMSConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: EmonCMSConfigEntry,
         emoncms_client: EmoncmsClient,
     ) -> None:
         """Initialize the emoncms data coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name="emoncms_coordinator",
             update_interval=timedelta(seconds=60),
         )
diff --git a/homeassistant/components/emoncms/sensor.py b/homeassistant/components/emoncms/sensor.py
index 291ecad0bd3..6321ccfafcd 100644
--- a/homeassistant/components/emoncms/sensor.py
+++ b/homeassistant/components/emoncms/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
+from homeassistant.config_entries import SOURCE_IMPORT
 from homeassistant.const import (
     CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     CONCENTRATION_PARTS_PER_MILLION,
@@ -38,9 +38,11 @@ from homeassistant.const import (
 )
 from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, callback
 from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.helpers import template
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv, template
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -54,7 +56,7 @@ from .const import (
     FEED_NAME,
     FEED_TAG,
 )
-from .coordinator import EmoncmsCoordinator
+from .coordinator import EmonCMSConfigEntry, EmoncmsCoordinator
 
 SENSORS: dict[str | None, SensorEntityDescription] = {
     "kWh": SensorEntityDescription(
@@ -289,8 +291,8 @@ async def async_setup_platform(
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: EmonCMSConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the emoncms sensors."""
     name = sensor_name(entry.data[CONF_URL])
diff --git a/homeassistant/components/emoncms/strings.json b/homeassistant/components/emoncms/strings.json
index 77216a3fb2f..451a3fb88e5 100644
--- a/homeassistant/components/emoncms/strings.json
+++ b/homeassistant/components/emoncms/strings.json
@@ -1,7 +1,7 @@
 {
   "config": {
     "error": {
-      "api_error": "An error occured in the pyemoncms API : {details}"
+      "api_error": "An error occurred in the pyemoncms API : {details}"
     },
     "step": {
       "user": {
diff --git a/homeassistant/components/emoncms_history/__init__.py b/homeassistant/components/emoncms_history/__init__.py
index 00af1fec6c6..2ab00d6ca42 100644
--- a/homeassistant/components/emoncms_history/__init__.py
+++ b/homeassistant/components/emoncms_history/__init__.py
@@ -16,8 +16,7 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import state as state_helper
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, state as state_helper
 from homeassistant.helpers.event import track_point_in_time
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import dt as dt_util
diff --git a/homeassistant/components/emonitor/sensor.py b/homeassistant/components/emonitor/sensor.py
index 39ed61741ae..be9e2ecb4cc 100644
--- a/homeassistant/components/emonitor/sensor.py
+++ b/homeassistant/components/emonitor/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.const import UnitOfPower
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -38,7 +38,7 @@ SENSORS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: EmonitorConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/emulated_hue/__init__.py b/homeassistant/components/emulated_hue/__init__.py
index 3e229d07b6c..556831496c6 100644
--- a/homeassistant/components/emulated_hue/__init__.py
+++ b/homeassistant/components/emulated_hue/__init__.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.core import Event, HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .config import (
diff --git a/homeassistant/components/emulated_hue/hue_api.py b/homeassistant/components/emulated_hue/hue_api.py
index 464d2bcb7e7..9ccb8a64367 100644
--- a/homeassistant/components/emulated_hue/hue_api.py
+++ b/homeassistant/components/emulated_hue/hue_api.py
@@ -322,8 +322,10 @@ class HueOneLightStateView(HomeAssistantView):
 
         if hass_entity_id is None:
             _LOGGER.error(
-                "Unknown entity number: %s not found in emulated_hue_ids.json",
+                "Unknown entity number: %s not found in emulated_hue_ids.json, "
+                "state request from %s",
                 entity_id,
+                request.remote,
             )
             return self.json_message("Entity not found", HTTPStatus.NOT_FOUND)
 
diff --git a/homeassistant/components/emulated_kasa/__init__.py b/homeassistant/components/emulated_kasa/__init__.py
index 408d8c4eff8..11f4ce80490 100644
--- a/homeassistant/components/emulated_kasa/__init__.py
+++ b/homeassistant/components/emulated_kasa/__init__.py
@@ -15,8 +15,7 @@ from homeassistant.const import (
     STATE_ON,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.template import Template, is_template_string
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/emulated_kasa/manifest.json b/homeassistant/components/emulated_kasa/manifest.json
index da3912a9d25..fc54fb50064 100644
--- a/homeassistant/components/emulated_kasa/manifest.json
+++ b/homeassistant/components/emulated_kasa/manifest.json
@@ -6,5 +6,5 @@
   "iot_class": "local_push",
   "loggers": ["sense_energy"],
   "quality_scale": "internal",
-  "requirements": ["sense-energy==0.13.4"]
+  "requirements": ["sense-energy==0.13.7"]
 }
diff --git a/homeassistant/components/emulated_roku/__init__.py b/homeassistant/components/emulated_roku/__init__.py
index 4ebd31730bf..d4466f47ef2 100644
--- a/homeassistant/components/emulated_roku/__init__.py
+++ b/homeassistant/components/emulated_roku/__init__.py
@@ -7,7 +7,7 @@ from homeassistant.components.network import async_get_source_ip
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .binding import EmulatedRoku
diff --git a/homeassistant/components/energenie_power_sockets/__init__.py b/homeassistant/components/energenie_power_sockets/__init__.py
index 12ddb0d1389..0496c6f9b92 100644
--- a/homeassistant/components/energenie_power_sockets/__init__.py
+++ b/homeassistant/components/energenie_power_sockets/__init__.py
@@ -8,12 +8,14 @@ from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryError, ConfigEntryNotReady
 
-from .const import CONF_DEVICE_API_ID, DOMAIN
+from .const import CONF_DEVICE_API_ID
 
 PLATFORMS = [Platform.SWITCH]
 
+type EnergenieConfigEntry = ConfigEntry[PowerStripUSB]
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+
+async def async_setup_entry(hass: HomeAssistant, entry: EnergenieConfigEntry) -> bool:
     """Set up Energenie Power Sockets."""
     try:
         powerstrip: PowerStripUSB | None = get_device(entry.data[CONF_DEVICE_API_ID])
@@ -26,19 +28,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             "Can't access Energenie Power Sockets, will retry later."
         )
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = powerstrip
+    entry.runtime_data = powerstrip
+    entry.async_on_unload(powerstrip.release)
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: EnergenieConfigEntry) -> bool:
     """Unload config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        powerstrip = hass.data[DOMAIN].pop(entry.entry_id)
-        powerstrip.release()
-
-    if not hass.data[DOMAIN]:
-        hass.data.pop(DOMAIN)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/energenie_power_sockets/strings.json b/homeassistant/components/energenie_power_sockets/strings.json
index e193b06b25f..bd536568d2c 100644
--- a/homeassistant/components/energenie_power_sockets/strings.json
+++ b/homeassistant/components/energenie_power_sockets/strings.json
@@ -1,9 +1,9 @@
 {
-  "title": "Energenie Power Sockets Integration.",
+  "title": "Energenie Power Sockets",
   "config": {
     "step": {
       "user": {
-        "title": "Searching for Energenie-Power-Sockets Devices.",
+        "title": "Searching for Energenie Power Sockets devices",
         "description": "Choose a discovered device.",
         "data": {
           "device": "[%key:common::config_flow::data::device%]"
@@ -13,7 +13,7 @@
     "abort": {
       "usb_error": "Couldn't access USB devices!",
       "no_device": "Unable to discover any (new) supported device.",
-      "device_not_found": "No device was found for the given id.",
+      "device_not_found": "No device was found for the given ID.",
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
diff --git a/homeassistant/components/energenie_power_sockets/switch.py b/homeassistant/components/energenie_power_sockets/switch.py
index 1d5b9ed5197..825566887bc 100644
--- a/homeassistant/components/energenie_power_sockets/switch.py
+++ b/homeassistant/components/energenie_power_sockets/switch.py
@@ -7,22 +7,22 @@ from pyegps.exceptions import EgpsException
 from pyegps.powerstrip import PowerStrip
 
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import EnergenieConfigEntry
 from .const import DOMAIN
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: EnergenieConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add EGPS sockets for passed config_entry in HA."""
-    powerstrip: PowerStrip = hass.data[DOMAIN][config_entry.entry_id]
+    powerstrip = config_entry.runtime_data
 
     async_add_entities(
         (
diff --git a/homeassistant/components/energy/data.py b/homeassistant/components/energy/data.py
index ff86177cf41..442aedf23b0 100644
--- a/homeassistant/components/energy/data.py
+++ b/homeassistant/components/energy/data.py
@@ -139,6 +139,10 @@ class DeviceConsumption(TypedDict):
     # An optional custom name for display in energy graphs
     name: str | None
 
+    # An optional statistic_id identifying a device
+    # that includes this device's consumption in its total
+    included_in_stat: str | None
+
 
 class EnergyPreferences(TypedDict):
     """Dictionary holding the energy data."""
@@ -291,6 +295,7 @@ DEVICE_CONSUMPTION_SCHEMA = vol.Schema(
     {
         vol.Required("stat_consumption"): str,
         vol.Optional("name"): str,
+        vol.Optional("included_in_stat"): str,
     }
 )
 
diff --git a/homeassistant/components/energy/sensor.py b/homeassistant/components/energy/sensor.py
index 199d18d6b07..eec92c32f98 100644
--- a/homeassistant/components/energy/sensor.py
+++ b/homeassistant/components/energy/sensor.py
@@ -29,8 +29,7 @@ from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import unit_conversion
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util, unit_conversion
 from homeassistant.util.unit_system import METRIC_SYSTEM
 
 from .const import DOMAIN
diff --git a/homeassistant/components/energy/strings.json b/homeassistant/components/energy/strings.json
index e9d72247319..5eb2c93161e 100644
--- a/homeassistant/components/energy/strings.json
+++ b/homeassistant/components/energy/strings.json
@@ -7,7 +7,7 @@
     },
     "recorder_untracked": {
       "title": "Entity not tracked",
-      "description": "The recorder has been configured to exclude these configured entities:"
+      "description": "Home Assistant Recorder has been configured to exclude these configured entities:"
     },
     "entity_unavailable": {
       "title": "Entity unavailable",
diff --git a/homeassistant/components/energyzero/sensor.py b/homeassistant/components/energyzero/sensor.py
index 141ac793fba..38349b89ff7 100644
--- a/homeassistant/components/energyzero/sensor.py
+++ b/homeassistant/components/energyzero/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, SERVICE_TYPE_DEVICE_NAMES
@@ -147,7 +147,7 @@ def get_gas_price(data: EnergyZeroData, hours: int) -> float | None:
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: EnergyZeroConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up EnergyZero Sensors based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/energyzero/strings.json b/homeassistant/components/energyzero/strings.json
index 7788f4d4d8e..48682ab31ee 100644
--- a/homeassistant/components/energyzero/strings.json
+++ b/homeassistant/components/energyzero/strings.json
@@ -54,10 +54,10 @@
   "services": {
     "get_gas_prices": {
       "name": "Get gas prices",
-      "description": "Request gas prices from EnergyZero.",
+      "description": "Requests gas prices from EnergyZero.",
       "fields": {
         "config_entry": {
-          "name": "Config Entry",
+          "name": "Config entry",
           "description": "The config entry to use for this action."
         },
         "incl_vat": {
@@ -76,7 +76,7 @@
     },
     "get_energy_prices": {
       "name": "Get energy prices",
-      "description": "Request energy prices from EnergyZero.",
+      "description": "Requests energy prices from EnergyZero.",
       "fields": {
         "config_entry": {
           "name": "[%key:component::energyzero::services::get_gas_prices::fields::config_entry::name%]",
diff --git a/homeassistant/components/enigma2/__init__.py b/homeassistant/components/enigma2/__init__.py
index da78f3dac5c..16295c7f228 100644
--- a/homeassistant/components/enigma2/__init__.py
+++ b/homeassistant/components/enigma2/__init__.py
@@ -1,12 +1,9 @@
 """Support for Enigma2 devices."""
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-from .coordinator import Enigma2UpdateCoordinator
-
-type Enigma2ConfigEntry = ConfigEntry[Enigma2UpdateCoordinator]
+from .coordinator import Enigma2ConfigEntry, Enigma2UpdateCoordinator
 
 PLATFORMS = [Platform.MEDIA_PLAYER]
 
@@ -22,6 +19,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: Enigma2ConfigEntry) -> b
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: Enigma2ConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/enigma2/config_flow.py b/homeassistant/components/enigma2/config_flow.py
index b0649a8368d..876d55128cf 100644
--- a/homeassistant/components/enigma2/config_flow.py
+++ b/homeassistant/components/enigma2/config_flow.py
@@ -1,5 +1,6 @@
 """Config flow for Enigma2."""
 
+import logging
 from typing import Any, cast
 
 from aiohttp.client_exceptions import ClientError
@@ -63,6 +64,8 @@ CONFIG_SCHEMA = vol.Schema(
     }
 )
 
+_LOGGER = logging.getLogger(__name__)
+
 
 async def get_options_schema(handler: SchemaCommonFlowHandler) -> vol.Schema:
     """Get the options schema."""
@@ -130,7 +133,8 @@ class Enigma2ConfigFlowHandler(ConfigFlow, domain=DOMAIN):
             errors = {"base": "invalid_auth"}
         except ClientError:
             errors = {"base": "cannot_connect"}
-        except Exception:  # noqa: BLE001
+        except Exception:
+            _LOGGER.exception("Unexpected exception")
             errors = {"base": "unknown"}
         else:
             unique_id = about["info"]["ifaces"][0]["mac"] or self.unique_id
diff --git a/homeassistant/components/enigma2/coordinator.py b/homeassistant/components/enigma2/coordinator.py
index d5bbf2c0ce5..9710d7f547f 100644
--- a/homeassistant/components/enigma2/coordinator.py
+++ b/homeassistant/components/enigma2/coordinator.py
@@ -30,18 +30,25 @@ from .const import CONF_SOURCE_BOUQUET, DOMAIN
 
 LOGGER = logging.getLogger(__package__)
 
+type Enigma2ConfigEntry = ConfigEntry[Enigma2UpdateCoordinator]
+
 
 class Enigma2UpdateCoordinator(DataUpdateCoordinator[OpenWebIfStatus]):
     """The Enigma2 data update coordinator."""
 
+    config_entry: Enigma2ConfigEntry
     device: OpenWebIfDevice
     unique_id: str | None
 
-    def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
+    def __init__(self, hass: HomeAssistant, config_entry: Enigma2ConfigEntry) -> None:
         """Initialize the Enigma2 data update coordinator."""
 
         super().__init__(
-            hass, logger=LOGGER, name=DOMAIN, update_interval=DEFAULT_SCAN_INTERVAL
+            hass,
+            logger=LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=DEFAULT_SCAN_INTERVAL,
         )
 
         base_url = URL.build(
diff --git a/homeassistant/components/enigma2/media_player.py b/homeassistant/components/enigma2/media_player.py
index 1012997ff7f..a3cdd1858ed 100644
--- a/homeassistant/components/enigma2/media_player.py
+++ b/homeassistant/components/enigma2/media_player.py
@@ -15,11 +15,10 @@ from homeassistant.components.media_player import (
     MediaType,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import Enigma2ConfigEntry
-from .coordinator import Enigma2UpdateCoordinator
+from .coordinator import Enigma2ConfigEntry, Enigma2UpdateCoordinator
 
 ATTR_MEDIA_CURRENTLY_RECORDING = "media_currently_recording"
 ATTR_MEDIA_DESCRIPTION = "media_description"
@@ -32,7 +31,7 @@ _LOGGER = getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: Enigma2ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Enigma2 media player platform."""
     async_add_entities([Enigma2Device(entry.runtime_data)])
diff --git a/homeassistant/components/enocean/__init__.py b/homeassistant/components/enocean/__init__.py
index 6dcec5ec218..c1db27c1c34 100644
--- a/homeassistant/components/enocean/__init__.py
+++ b/homeassistant/components/enocean/__init__.py
@@ -5,7 +5,7 @@ import voluptuous as vol
 from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import CONF_DEVICE
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DATA_ENOCEAN, DOMAIN, ENOCEAN_DONGLE
@@ -47,7 +47,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
 
 
 async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
-    """Unload ENOcean config entry."""
+    """Unload EnOcean config entry."""
 
     enocean_dongle = hass.data[DATA_ENOCEAN][ENOCEAN_DONGLE]
     enocean_dongle.unload()
diff --git a/homeassistant/components/enocean/binary_sensor.py b/homeassistant/components/enocean/binary_sensor.py
index 01e39f96510..26039036ca0 100644
--- a/homeassistant/components/enocean/binary_sensor.py
+++ b/homeassistant/components/enocean/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import CONF_DEVICE_CLASS, CONF_ID, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/enocean/config_flow.py b/homeassistant/components/enocean/config_flow.py
index 2452d27b168..fd25b0c6ce1 100644
--- a/homeassistant/components/enocean/config_flow.py
+++ b/homeassistant/components/enocean/config_flow.py
@@ -1,4 +1,4 @@
-"""Config flows for the ENOcean integration."""
+"""Config flows for the EnOcean integration."""
 
 from typing import Any
 
@@ -6,6 +6,11 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_DEVICE
+from homeassistant.helpers.selector import (
+    SelectSelector,
+    SelectSelectorConfig,
+    SelectSelectorMode,
+)
 
 from . import dongle
 from .const import DOMAIN, ERROR_INVALID_DONGLE_PATH, LOGGER
@@ -15,7 +20,7 @@ class EnOceanFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle the enOcean config flows."""
 
     VERSION = 1
-    MANUAL_PATH_VALUE = "Custom path"
+    MANUAL_PATH_VALUE = "manual"
 
     def __init__(self) -> None:
         """Initialize the EnOcean config flow."""
@@ -52,14 +57,24 @@ class EnOceanFlowHandler(ConfigFlow, domain=DOMAIN):
                 return self.create_enocean_entry(user_input)
             errors = {CONF_DEVICE: ERROR_INVALID_DONGLE_PATH}
 
-        bridges = await self.hass.async_add_executor_job(dongle.detect)
-        if len(bridges) == 0:
+        devices = await self.hass.async_add_executor_job(dongle.detect)
+        if len(devices) == 0:
             return await self.async_step_manual(user_input)
+        devices.append(self.MANUAL_PATH_VALUE)
 
-        bridges.append(self.MANUAL_PATH_VALUE)
         return self.async_show_form(
             step_id="detect",
-            data_schema=vol.Schema({vol.Required(CONF_DEVICE): vol.In(bridges)}),
+            data_schema=vol.Schema(
+                {
+                    vol.Required(CONF_DEVICE): SelectSelector(
+                        SelectSelectorConfig(
+                            options=devices,
+                            translation_key="devices",
+                            mode=SelectSelectorMode.LIST,
+                        )
+                    )
+                }
+            ),
             errors=errors,
         )
 
diff --git a/homeassistant/components/enocean/const.py b/homeassistant/components/enocean/const.py
index 3624493b42e..0f3271655d8 100644
--- a/homeassistant/components/enocean/const.py
+++ b/homeassistant/components/enocean/const.py
@@ -1,4 +1,4 @@
-"""Constants for the ENOcean integration."""
+"""Constants for the EnOcean integration."""
 
 import logging
 
diff --git a/homeassistant/components/enocean/dongle.py b/homeassistant/components/enocean/dongle.py
index 2d9a3f8787e..43214b12064 100644
--- a/homeassistant/components/enocean/dongle.py
+++ b/homeassistant/components/enocean/dongle.py
@@ -18,7 +18,7 @@ _LOGGER = logging.getLogger(__name__)
 class EnOceanDongle:
     """Representation of an EnOcean dongle.
 
-    The dongle is responsible for receiving the ENOcean frames,
+    The dongle is responsible for receiving the EnOcean frames,
     creating devices if needed, and dispatching messages to platforms.
     """
 
@@ -53,7 +53,7 @@ class EnOceanDongle:
     def callback(self, packet):
         """Handle EnOcean device's callback.
 
-        This is the callback function called by python-enocan whenever there
+        This is the callback function called by python-enocean whenever there
         is an incoming packet.
         """
 
@@ -63,7 +63,7 @@ class EnOceanDongle:
 
 
 def detect():
-    """Return a list of candidate paths for USB ENOcean dongles.
+    """Return a list of candidate paths for USB EnOcean dongles.
 
     This method is currently a bit simplistic, it may need to be
     improved to support more configurations and OS.
diff --git a/homeassistant/components/enocean/entity.py b/homeassistant/components/enocean/entity.py
index 5c12fc12a68..b2d73e65443 100644
--- a/homeassistant/components/enocean/entity.py
+++ b/homeassistant/components/enocean/entity.py
@@ -16,7 +16,7 @@ class EnOceanEntity(Entity):
         """Initialize the device."""
         self.dev_id = dev_id
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Register callbacks."""
         self.async_on_remove(
             async_dispatcher_connect(
diff --git a/homeassistant/components/enocean/light.py b/homeassistant/components/enocean/light.py
index aae84e73848..6586714c1b6 100644
--- a/homeassistant/components/enocean/light.py
+++ b/homeassistant/components/enocean/light.py
@@ -16,7 +16,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import CONF_ID, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/enocean/sensor.py b/homeassistant/components/enocean/sensor.py
index 98e32ce1a4f..2a4b9364d81 100644
--- a/homeassistant/components/enocean/sensor.py
+++ b/homeassistant/components/enocean/sensor.py
@@ -26,7 +26,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/enocean/strings.json b/homeassistant/components/enocean/strings.json
index 1a6f08cbf37..9baf4386eda 100644
--- a/homeassistant/components/enocean/strings.json
+++ b/homeassistant/components/enocean/strings.json
@@ -1,16 +1,23 @@
 {
   "config": {
+    "flow_title": "{name}",
     "step": {
       "detect": {
-        "title": "Select the path to your EnOcean dongle",
+        "description": "Select your EnOcean USB dongle.",
         "data": {
-          "path": "USB dongle path"
+          "device": "USB dongle"
+        },
+        "data_description": {
+          "device": "Path to your EnOcean USB dongle."
         }
       },
       "manual": {
-        "title": "Enter the path to your EnOcean dongle",
+        "description": "Enter the path to your EnOcean USB dongle.",
         "data": {
-          "path": "[%key:component::enocean::config::step::detect::data::path%]"
+          "device": "[%key:component::enocean::config::step::detect::data::device%]"
+        },
+        "data_description": {
+          "device": "[%key:component::enocean::config::step::detect::data_description::device%]"
         }
       }
     },
@@ -20,5 +27,12 @@
     "abort": {
       "invalid_dongle_path": "Invalid dongle path"
     }
+  },
+  "selector": {
+    "devices": {
+      "options": {
+        "manual": "Custom path"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/enphase_envoy/binary_sensor.py b/homeassistant/components/enphase_envoy/binary_sensor.py
index 0258281661a..dcffef8271b 100644
--- a/homeassistant/components/enphase_envoy/binary_sensor.py
+++ b/homeassistant/components/enphase_envoy/binary_sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import EnphaseConfigEntry, EnphaseUpdateCoordinator
@@ -75,7 +75,7 @@ ENPOWER_SENSORS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: EnphaseConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up envoy binary sensor platform."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/enphase_envoy/coordinator.py b/homeassistant/components/enphase_envoy/coordinator.py
index d92b998e731..b8cda03a451 100644
--- a/homeassistant/components/enphase_envoy/coordinator.py
+++ b/homeassistant/components/enphase_envoy/coordinator.py
@@ -16,7 +16,7 @@ from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN, INVALID_AUTH_ERRORS
 
@@ -55,6 +55,7 @@ class EnphaseUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             name=entry_data[CONF_NAME],
             update_interval=SCAN_INTERVAL,
             always_update=False,
diff --git a/homeassistant/components/enphase_envoy/entity.py b/homeassistant/components/enphase_envoy/entity.py
index 491951625ee..04987d861d2 100644
--- a/homeassistant/components/enphase_envoy/entity.py
+++ b/homeassistant/components/enphase_envoy/entity.py
@@ -2,13 +2,22 @@
 
 from __future__ import annotations
 
-from pyenphase import EnvoyData
+from collections.abc import Callable, Coroutine
+from typing import Any, Concatenate
 
+from httpx import HTTPError
+from pyenphase import EnvoyData
+from pyenphase.exceptions import EnvoyError
+
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
+from .const import DOMAIN
 from .coordinator import EnphaseUpdateCoordinator
 
+ACTIONERRORS = (EnvoyError, HTTPError)
+
 
 class EnvoyBaseEntity(CoordinatorEntity[EnphaseUpdateCoordinator]):
     """Defines a base envoy entity."""
@@ -33,3 +42,29 @@ class EnvoyBaseEntity(CoordinatorEntity[EnphaseUpdateCoordinator]):
         data = self.coordinator.envoy.data
         assert data is not None
         return data
+
+
+def exception_handler[_EntityT: EnvoyBaseEntity, **_P](
+    func: Callable[Concatenate[_EntityT, _P], Coroutine[Any, Any, Any]],
+) -> Callable[Concatenate[_EntityT, _P], Coroutine[Any, Any, None]]:
+    """Decorate Enphase Envoy calls to handle exceptions.
+
+    A decorator that wraps the passed in function, catches enphase_envoy errors.
+    """
+
+    async def handler(self: _EntityT, *args: _P.args, **kwargs: _P.kwargs) -> None:
+        try:
+            await func(self, *args, **kwargs)
+        except ACTIONERRORS as error:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="action_error",
+                translation_placeholders={
+                    "host": self.coordinator.envoy.host,
+                    "args": error.args[0],
+                    "action": func.__name__,
+                    "entity": self.entity_id,
+                },
+            ) from error
+
+    return handler
diff --git a/homeassistant/components/enphase_envoy/manifest.json b/homeassistant/components/enphase_envoy/manifest.json
index 0b1fd8b04b9..e51a7427504 100644
--- a/homeassistant/components/enphase_envoy/manifest.json
+++ b/homeassistant/components/enphase_envoy/manifest.json
@@ -6,7 +6,7 @@
   "documentation": "https://www.home-assistant.io/integrations/enphase_envoy",
   "iot_class": "local_polling",
   "loggers": ["pyenphase"],
-  "requirements": ["pyenphase==1.23.1"],
+  "requirements": ["pyenphase==1.25.1"],
   "zeroconf": [
     {
       "type": "_enphase-envoy._tcp.local."
diff --git a/homeassistant/components/enphase_envoy/number.py b/homeassistant/components/enphase_envoy/number.py
index a62913a4c0b..91e93d9c59b 100644
--- a/homeassistant/components/enphase_envoy/number.py
+++ b/homeassistant/components/enphase_envoy/number.py
@@ -19,11 +19,11 @@ from homeassistant.components.number import (
 from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import EnphaseConfigEntry, EnphaseUpdateCoordinator
-from .entity import EnvoyBaseEntity
+from .entity import EnvoyBaseEntity, exception_handler
 
 PARALLEL_UPDATES = 1
 
@@ -73,7 +73,7 @@ STORAGE_RESERVE_SOC_ENTITY = EnvoyStorageSettingsNumberEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: EnphaseConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Enphase Envoy number platform."""
     coordinator = config_entry.runtime_data
@@ -132,6 +132,7 @@ class EnvoyRelayNumberEntity(EnvoyBaseEntity, NumberEntity):
             self.data.dry_contact_settings[self._relay_id]
         )
 
+    @exception_handler
     async def async_set_native_value(self, value: float) -> None:
         """Update the relay."""
         await self.envoy.update_dry_contact(
@@ -185,6 +186,7 @@ class EnvoyStorageSettingsNumberEntity(EnvoyBaseEntity, NumberEntity):
         assert self.data.tariff.storage_settings is not None
         return self.entity_description.value_fn(self.data.tariff.storage_settings)
 
+    @exception_handler
     async def async_set_native_value(self, value: float) -> None:
         """Update the storage setting."""
         await self.entity_description.update_fn(self.envoy, value)
diff --git a/homeassistant/components/enphase_envoy/select.py b/homeassistant/components/enphase_envoy/select.py
index 7dc275aab37..42b47e5d793 100644
--- a/homeassistant/components/enphase_envoy/select.py
+++ b/homeassistant/components/enphase_envoy/select.py
@@ -14,11 +14,11 @@ from pyenphase.models.tariff import EnvoyStorageMode, EnvoyStorageSettings
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import EnphaseConfigEntry, EnphaseUpdateCoordinator
-from .entity import EnvoyBaseEntity
+from .entity import EnvoyBaseEntity, exception_handler
 
 PARALLEL_UPDATES = 1
 
@@ -130,7 +130,7 @@ STORAGE_MODE_ENTITY = EnvoyStorageSettingsSelectEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: EnphaseConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Enphase Envoy select platform."""
     coordinator = config_entry.runtime_data
@@ -192,6 +192,7 @@ class EnvoyRelaySelectEntity(EnvoyBaseEntity, SelectEntity):
         """Return the state of the Enpower switch."""
         return self.entity_description.value_fn(self.relay)
 
+    @exception_handler
     async def async_select_option(self, option: str) -> None:
         """Update the relay."""
         await self.entity_description.update_fn(self.envoy, self.relay, option)
@@ -243,6 +244,7 @@ class EnvoyStorageSettingsSelectEntity(EnvoyBaseEntity, SelectEntity):
         assert self.data.tariff.storage_settings is not None
         return self.entity_description.value_fn(self.data.tariff.storage_settings)
 
+    @exception_handler
     async def async_select_option(self, option: str) -> None:
         """Update the relay."""
         await self.entity_description.update_fn(self.envoy, option)
diff --git a/homeassistant/components/enphase_envoy/sensor.py b/homeassistant/components/enphase_envoy/sensor.py
index dcf062a5417..594f5f34088 100644
--- a/homeassistant/components/enphase_envoy/sensor.py
+++ b/homeassistant/components/enphase_envoy/sensor.py
@@ -49,7 +49,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN
@@ -806,7 +806,7 @@ AGGREGATE_BATTERY_SENSORS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: EnphaseConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up envoy sensor platform."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/enphase_envoy/strings.json b/homeassistant/components/enphase_envoy/strings.json
index 589dc52f71d..ce3a8593226 100644
--- a/homeassistant/components/enphase_envoy/strings.json
+++ b/homeassistant/components/enphase_envoy/strings.json
@@ -57,7 +57,7 @@
       "init": {
         "title": "Envoy {serial} {host} options",
         "data": {
-          "diagnostics_include_fixtures": "Include test fixture data in diagnostic report. Use when requested to provide test data for troubleshooting or development activies. With this option enabled the diagnostic report may take more time to download. When report is created best disable this option again.",
+          "diagnostics_include_fixtures": "Include test fixture data in diagnostic report. Use when requested to provide test data for troubleshooting or development activities. With this option enabled the diagnostic report may take more time to download. When report is created best disable this option again.",
           "disable_keep_alive": "Always use a new connection when requesting data from the Envoy. May resolve communication issues with some Envoy firmwares."
         },
         "data_description": {
@@ -187,13 +187,13 @@
         "name": "Lifetime energy consumption {phase_name}"
       },
       "balanced_net_consumption": {
-        "name": "balanced net power consumption"
+        "name": "Balanced net power consumption"
       },
       "lifetime_balanced_net_consumption": {
         "name": "Lifetime balanced net energy consumption"
       },
       "balanced_net_consumption_phase": {
-        "name": "balanced net power consumption {phase_name}"
+        "name": "Balanced net power consumption {phase_name}"
       },
       "lifetime_balanced_net_consumption_phase": {
         "name": "Lifetime balanced net energy consumption {phase_name}"
@@ -217,7 +217,7 @@
         "name": "Net consumption CT current"
       },
       "net_ct_powerfactor": {
-        "name": "Powerfactor net consumption CT"
+        "name": "Power factor net consumption CT"
       },
       "net_ct_metering_status": {
         "name": "Metering status net consumption CT"
@@ -235,7 +235,7 @@
         "name": "Production CT current"
       },
       "production_ct_powerfactor": {
-        "name": "powerfactor production CT"
+        "name": "Power factor production CT"
       },
       "production_ct_metering_status": {
         "name": "Metering status production CT"
@@ -262,7 +262,7 @@
         "name": "Storage CT current"
       },
       "storage_ct_powerfactor": {
-        "name": "Powerfactor storage CT"
+        "name": "Power factor storage CT"
       },
       "storage_ct_metering_status": {
         "name": "Metering status storage CT"
@@ -289,7 +289,7 @@
         "name": "Net consumption CT current {phase_name}"
       },
       "net_ct_powerfactor_phase": {
-        "name": "Powerfactor net consumption CT {phase_name}"
+        "name": "Power factor net consumption CT {phase_name}"
       },
       "net_ct_metering_status_phase": {
         "name": "Metering status net consumption CT {phase_name}"
@@ -307,7 +307,7 @@
         "name": "Production CT current {phase_name}"
       },
       "production_ct_powerfactor_phase": {
-        "name": "Powerfactor production CT {phase_name}"
+        "name": "Power factor production CT {phase_name}"
       },
       "production_ct_metering_status_phase": {
         "name": "Metering status production CT {phase_name}"
@@ -334,7 +334,7 @@
         "name": "Storage CT current {phase_name}"
       },
       "storage_ct_powerfactor_phase": {
-        "name": "Powerfactor storage CT {phase_name}"
+        "name": "Power factor storage CT {phase_name}"
       },
       "storage_ct_metering_status_phase": {
         "name": "Metering status storage CT {phase_name}"
@@ -360,9 +360,9 @@
       "acb_battery_state": {
         "name": "Battery state",
         "state": {
-          "discharging": "Discharging",
+          "discharging": "[%key:common::state::discharging%]",
           "idle": "[%key:common::state::idle%]",
-          "charging": "Charging",
+          "charging": "[%key:common::state::charging%]",
           "full": "Full"
         }
       },
@@ -400,6 +400,9 @@
     },
     "envoy_error": {
       "message": "Error communicating with Envoy API on {host}: {args}"
+    },
+    "action_error": {
+      "message": "Failed to execute {action} for {entity}, host: {host}: {args}"
     }
   }
 }
diff --git a/homeassistant/components/enphase_envoy/switch.py b/homeassistant/components/enphase_envoy/switch.py
index 7074f341cc8..bb4ed874b1d 100644
--- a/homeassistant/components/enphase_envoy/switch.py
+++ b/homeassistant/components/enphase_envoy/switch.py
@@ -14,11 +14,11 @@ from pyenphase.models.tariff import EnvoyStorageSettings
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import EnphaseConfigEntry, EnphaseUpdateCoordinator
-from .entity import EnvoyBaseEntity
+from .entity import EnvoyBaseEntity, exception_handler
 
 PARALLEL_UPDATES = 1
 
@@ -78,7 +78,7 @@ CHARGE_FROM_GRID_SWITCH = EnvoyStorageSettingsSwitchEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: EnphaseConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Enphase Envoy switch platform."""
     coordinator = config_entry.runtime_data
@@ -147,11 +147,13 @@ class EnvoyEnpowerSwitchEntity(EnvoyBaseEntity, SwitchEntity):
         assert enpower is not None
         return self.entity_description.value_fn(enpower)
 
+    @exception_handler
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn on the Enpower switch."""
         await self.entity_description.turn_on_fn(self.envoy)
         await self.coordinator.async_request_refresh()
 
+    @exception_handler
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn off the Enpower switch."""
         await self.entity_description.turn_off_fn(self.envoy)
@@ -195,11 +197,13 @@ class EnvoyDryContactSwitchEntity(EnvoyBaseEntity, SwitchEntity):
         assert relay is not None
         return self.entity_description.value_fn(relay)
 
+    @exception_handler
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn on (close) the dry contact."""
         if await self.entity_description.turn_on_fn(self.envoy, self.relay_id):
             self.async_write_ha_state()
 
+    @exception_handler
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn off (open) the dry contact."""
         if await self.entity_description.turn_off_fn(self.envoy, self.relay_id):
@@ -252,11 +256,13 @@ class EnvoyStorageSettingsSwitchEntity(EnvoyBaseEntity, SwitchEntity):
         assert self.data.tariff.storage_settings is not None
         return self.entity_description.value_fn(self.data.tariff.storage_settings)
 
+    @exception_handler
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn on the storage settings switch."""
         await self.entity_description.turn_on_fn(self.envoy)
         await self.coordinator.async_request_refresh()
 
+    @exception_handler
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn off the storage switch."""
         await self.entity_description.turn_off_fn(self.envoy)
diff --git a/homeassistant/components/entur_public_transport/sensor.py b/homeassistant/components/entur_public_transport/sensor.py
index f88bb99cea0..8fa8a06e369 100644
--- a/homeassistant/components/entur_public_transport/sensor.py
+++ b/homeassistant/components/entur_public_transport/sensor.py
@@ -20,12 +20,11 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import Throttle
-import homeassistant.util.dt as dt_util
+from homeassistant.util import Throttle, dt as dt_util
 
 API_CLIENT_NAME = "homeassistant-{}"
 
diff --git a/homeassistant/components/environment_canada/__init__.py b/homeassistant/components/environment_canada/__init__.py
index 0b6eadf6d13..6afea2f983d 100644
--- a/homeassistant/components/environment_canada/__init__.py
+++ b/homeassistant/components/environment_canada/__init__.py
@@ -5,14 +5,12 @@ import logging
 
 from env_canada import ECAirQuality, ECRadar, ECWeather
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_LANGUAGE, CONF_LATITUDE, CONF_LONGITUDE, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 
-from .const import CONF_STATION, DOMAIN
-from .coordinator import ECDataUpdateCoordinator
+from .const import CONF_STATION
+from .coordinator import ECConfigEntry, ECDataUpdateCoordinator, ECRuntimeData
 
 DEFAULT_RADAR_UPDATE_INTERVAL = timedelta(minutes=5)
 DEFAULT_WEATHER_UPDATE_INTERVAL = timedelta(minutes=5)
@@ -22,14 +20,13 @@ PLATFORMS = [Platform.CAMERA, Platform.SENSOR, Platform.WEATHER]
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, config_entry: ECConfigEntry) -> bool:
     """Set up EC as config entry."""
     lat = config_entry.data.get(CONF_LATITUDE)
     lon = config_entry.data.get(CONF_LONGITUDE)
     station = config_entry.data.get(CONF_STATION)
     lang = config_entry.data.get(CONF_LANGUAGE, "English")
 
-    coordinators = {}
     errors = 0
 
     weather_data = ECWeather(
@@ -37,31 +34,31 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
         coordinates=(lat, lon),
         language=lang.lower(),
     )
-    coordinators["weather_coordinator"] = ECDataUpdateCoordinator(
-        hass, weather_data, "weather", DEFAULT_WEATHER_UPDATE_INTERVAL
+    weather_coordinator = ECDataUpdateCoordinator(
+        hass, config_entry, weather_data, "weather", DEFAULT_WEATHER_UPDATE_INTERVAL
     )
     try:
-        await coordinators["weather_coordinator"].async_config_entry_first_refresh()
+        await weather_coordinator.async_config_entry_first_refresh()
     except ConfigEntryNotReady:
         errors = errors + 1
         _LOGGER.warning("Unable to retrieve Environment Canada weather")
 
     radar_data = ECRadar(coordinates=(lat, lon))
-    coordinators["radar_coordinator"] = ECDataUpdateCoordinator(
-        hass, radar_data, "radar", DEFAULT_RADAR_UPDATE_INTERVAL
+    radar_coordinator = ECDataUpdateCoordinator(
+        hass, config_entry, radar_data, "radar", DEFAULT_RADAR_UPDATE_INTERVAL
     )
     try:
-        await coordinators["radar_coordinator"].async_config_entry_first_refresh()
+        await radar_coordinator.async_config_entry_first_refresh()
     except ConfigEntryNotReady:
         errors = errors + 1
         _LOGGER.warning("Unable to retrieve Environment Canada radar")
 
     aqhi_data = ECAirQuality(coordinates=(lat, lon))
-    coordinators["aqhi_coordinator"] = ECDataUpdateCoordinator(
-        hass, aqhi_data, "AQHI", DEFAULT_WEATHER_UPDATE_INTERVAL
+    aqhi_coordinator = ECDataUpdateCoordinator(
+        hass, config_entry, aqhi_data, "AQHI", DEFAULT_WEATHER_UPDATE_INTERVAL
     )
     try:
-        await coordinators["aqhi_coordinator"].async_config_entry_first_refresh()
+        await aqhi_coordinator.async_config_entry_first_refresh()
     except ConfigEntryNotReady:
         errors = errors + 1
         _LOGGER.warning("Unable to retrieve Environment Canada AQHI")
@@ -69,31 +66,17 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     if errors == 3:
         raise ConfigEntryNotReady
 
-    hass.data.setdefault(DOMAIN, {})
-    hass.data[DOMAIN][config_entry.entry_id] = coordinators
+    config_entry.runtime_data = ECRuntimeData(
+        aqhi_coordinator=aqhi_coordinator,
+        radar_coordinator=radar_coordinator,
+        weather_coordinator=weather_coordinator,
+    )
 
     await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, config_entry: ECConfigEntry) -> bool:
     """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(
-        config_entry, PLATFORMS
-    )
-
-    hass.data[DOMAIN].pop(config_entry.entry_id)
-
-    return unload_ok
-
-
-def device_info(config_entry: ConfigEntry) -> DeviceInfo:
-    """Build and return the device info for EC."""
-    return DeviceInfo(
-        entry_type=DeviceEntryType.SERVICE,
-        identifiers={(DOMAIN, config_entry.entry_id)},
-        manufacturer="Environment Canada",
-        name=config_entry.title,
-        configuration_url="https://weather.gc.ca/",
-    )
+    return await hass.config_entries.async_unload_platforms(config_entry, PLATFORMS)
diff --git a/homeassistant/components/environment_canada/camera.py b/homeassistant/components/environment_canada/camera.py
index 1625cd253da..b051c572816 100644
--- a/homeassistant/components/environment_canada/camera.py
+++ b/homeassistant/components/environment_canada/camera.py
@@ -2,20 +2,20 @@
 
 from __future__ import annotations
 
+from env_canada import ECRadar
 import voluptuous as vol
 
 from homeassistant.components.camera import Camera
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import (
-    AddEntitiesCallback,
+    AddConfigEntryEntitiesCallback,
     async_get_current_platform,
 )
 from homeassistant.helpers.typing import VolDictType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import device_info
-from .const import ATTR_OBSERVATION_TIME, DOMAIN
+from .const import ATTR_OBSERVATION_TIME
+from .coordinator import ECConfigEntry, ECDataUpdateCoordinator
 
 SERVICE_SET_RADAR_TYPE = "set_radar_type"
 SET_RADAR_TYPE_SCHEMA: VolDictType = {
@@ -25,12 +25,12 @@ SET_RADAR_TYPE_SCHEMA: VolDictType = {
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: ECConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add a weather entity from a config_entry."""
-    coordinator = hass.data[DOMAIN][config_entry.entry_id]["radar_coordinator"]
-    async_add_entities([ECCamera(coordinator)])
+    coordinator = config_entry.runtime_data.radar_coordinator
+    async_add_entities([ECCameraEntity(coordinator)])
 
     platform = async_get_current_platform()
     platform.async_register_entity_service(
@@ -40,13 +40,13 @@ async def async_setup_entry(
     )
 
 
-class ECCamera(CoordinatorEntity, Camera):
+class ECCameraEntity(CoordinatorEntity[ECDataUpdateCoordinator[ECRadar]], Camera):
     """Implementation of an Environment Canada radar camera."""
 
     _attr_has_entity_name = True
     _attr_translation_key = "radar"
 
-    def __init__(self, coordinator):
+    def __init__(self, coordinator: ECDataUpdateCoordinator[ECRadar]) -> None:
         """Initialize the camera."""
         super().__init__(coordinator)
         Camera.__init__(self)
@@ -55,7 +55,7 @@ class ECCamera(CoordinatorEntity, Camera):
         self._attr_unique_id = f"{coordinator.config_entry.unique_id}-radar"
         self._attr_attribution = self.radar_object.metadata["attribution"]
         self._attr_entity_registry_enabled_default = False
-        self._attr_device_info = device_info(coordinator.config_entry)
+        self._attr_device_info = coordinator.device_info
 
         self.content_type = "image/gif"
 
diff --git a/homeassistant/components/environment_canada/const.py b/homeassistant/components/environment_canada/const.py
index f1f6db2e0df..c2b58d8dcce 100644
--- a/homeassistant/components/environment_canada/const.py
+++ b/homeassistant/components/environment_canada/const.py
@@ -5,3 +5,4 @@ ATTR_STATION = "station"
 CONF_STATION = "station"
 CONF_TITLE = "title"
 DOMAIN = "environment_canada"
+SERVICE_ENVIRONMENT_CANADA_FORECASTS = "get_forecasts"
diff --git a/homeassistant/components/environment_canada/coordinator.py b/homeassistant/components/environment_canada/coordinator.py
index 8e77b309c78..e31e847cd2d 100644
--- a/homeassistant/components/environment_canada/coordinator.py
+++ b/homeassistant/components/environment_canada/coordinator.py
@@ -1,29 +1,67 @@
 """Coordinator for the Environment Canada (EC) component."""
 
+from __future__ import annotations
+
+from dataclasses import dataclass
+from datetime import timedelta
 import logging
 import xml.etree.ElementTree as ET
 
-from env_canada import ec_exc
+from env_canada import ECAirQuality, ECRadar, ECWeather, ec_exc
 
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
+type ECConfigEntry = ConfigEntry[ECRuntimeData]
+type ECDataType = ECAirQuality | ECRadar | ECWeather
 
-class ECDataUpdateCoordinator(DataUpdateCoordinator):
+
+@dataclass
+class ECRuntimeData:
+    """Class to hold EC runtime data."""
+
+    aqhi_coordinator: ECDataUpdateCoordinator[ECAirQuality]
+    radar_coordinator: ECDataUpdateCoordinator[ECRadar]
+    weather_coordinator: ECDataUpdateCoordinator[ECWeather]
+
+
+class ECDataUpdateCoordinator[DataT: ECDataType](DataUpdateCoordinator[DataT]):
     """Class to manage fetching EC data."""
 
-    def __init__(self, hass, ec_data, name, update_interval):
+    config_entry: ECConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        entry: ECConfigEntry,
+        ec_data: DataT,
+        name: str,
+        update_interval: timedelta,
+    ) -> None:
         """Initialize global EC data updater."""
         super().__init__(
-            hass, _LOGGER, name=f"{DOMAIN} {name}", update_interval=update_interval
+            hass,
+            _LOGGER,
+            config_entry=entry,
+            name=f"{DOMAIN} {name}",
+            update_interval=update_interval,
         )
         self.ec_data = ec_data
         self.last_update_success = False
+        self.device_info = DeviceInfo(
+            entry_type=DeviceEntryType.SERVICE,
+            identifiers={(DOMAIN, entry.entry_id)},
+            manufacturer="Environment Canada",
+            configuration_url="https://weather.gc.ca/",
+        )
 
-    async def _async_update_data(self):
+    async def _async_update_data(self) -> DataT:
         """Fetch data from EC."""
         try:
             await self.ec_data.update()
diff --git a/homeassistant/components/environment_canada/diagnostics.py b/homeassistant/components/environment_canada/diagnostics.py
index 0fb565fda59..024cca15f12 100644
--- a/homeassistant/components/environment_canada/diagnostics.py
+++ b/homeassistant/components/environment_canada/diagnostics.py
@@ -5,23 +5,21 @@ 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
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
+from .coordinator import ECConfigEntry
 
 TO_REDACT = {CONF_LATITUDE, CONF_LONGITUDE}
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, config_entry: ConfigEntry
+    hass: HomeAssistant, config_entry: ECConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    coordinators = hass.data[DOMAIN][config_entry.entry_id]
-    weather_coord = coordinators["weather_coordinator"]
-
     return {
         "config_entry_data": async_redact_data(dict(config_entry.data), TO_REDACT),
-        "weather_data": dict(weather_coord.ec_data.conditions),
+        "weather_data": dict(
+            config_entry.runtime_data.weather_coordinator.ec_data.conditions
+        ),
     }
diff --git a/homeassistant/components/environment_canada/icons.json b/homeassistant/components/environment_canada/icons.json
index c3562ce1840..ca55254cc12 100644
--- a/homeassistant/components/environment_canada/icons.json
+++ b/homeassistant/components/environment_canada/icons.json
@@ -21,6 +21,9 @@
   "services": {
     "set_radar_type": {
       "service": "mdi:radar"
+    },
+    "get_forecasts": {
+      "service": "mdi:weather-cloudy-clock"
     }
   }
 }
diff --git a/homeassistant/components/environment_canada/manifest.json b/homeassistant/components/environment_canada/manifest.json
index 76534662ff7..fc05e093b33 100644
--- a/homeassistant/components/environment_canada/manifest.json
+++ b/homeassistant/components/environment_canada/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/environment_canada",
   "iot_class": "cloud_polling",
   "loggers": ["env_canada"],
-  "requirements": ["env-canada==0.7.2"]
+  "requirements": ["env-canada==0.8.0"]
 }
diff --git a/homeassistant/components/environment_canada/sensor.py b/homeassistant/components/environment_canada/sensor.py
index 1a5d096203d..1685888d2bc 100644
--- a/homeassistant/components/environment_canada/sensor.py
+++ b/homeassistant/components/environment_canada/sensor.py
@@ -6,13 +6,14 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from typing import Any
 
+from env_canada import ECWeather
+
 from homeassistant.components.sensor import (
     SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_LOCATION,
     DEGREE,
@@ -24,11 +25,11 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import device_info
-from .const import ATTR_STATION, DOMAIN
+from .const import ATTR_STATION
+from .coordinator import ECConfigEntry, ECDataType, ECDataUpdateCoordinator
 
 ATTR_TIME = "alert time"
 
@@ -166,6 +167,8 @@ SENSOR_TYPES: tuple[ECSensorEntityDescription, ...] = (
         translation_key="wind_bearing",
         native_unit_of_measurement=DEGREE,
         value_fn=lambda data: data.conditions.get("wind_bearing", {}).get("value"),
+        device_class=SensorDeviceClass.WIND_DIRECTION,
+        state_class=SensorStateClass.MEASUREMENT_ANGLE,
     ),
     ECSensorEntityDescription(
         key="wind_chill",
@@ -251,32 +254,44 @@ ALERT_TYPES: tuple[ECSensorEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: ECConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add a weather entity from a config_entry."""
-    coordinator = hass.data[DOMAIN][config_entry.entry_id]["weather_coordinator"]
-    sensors: list[ECBaseSensor] = [ECSensor(coordinator, desc) for desc in SENSOR_TYPES]
-    sensors.extend([ECAlertSensor(coordinator, desc) for desc in ALERT_TYPES])
-    aqhi_coordinator = hass.data[DOMAIN][config_entry.entry_id]["aqhi_coordinator"]
-    sensors.append(ECSensor(aqhi_coordinator, AQHI_SENSOR))
+    weather_coordinator = config_entry.runtime_data.weather_coordinator
+    sensors: list[ECBaseSensorEntity] = [
+        ECSensorEntity(weather_coordinator, desc) for desc in SENSOR_TYPES
+    ]
+    sensors.extend(
+        [ECAlertSensorEntity(weather_coordinator, desc) for desc in ALERT_TYPES]
+    )
+
+    sensors.append(
+        ECSensorEntity(config_entry.runtime_data.aqhi_coordinator, AQHI_SENSOR)
+    )
     async_add_entities(sensors)
 
 
-class ECBaseSensor(CoordinatorEntity, SensorEntity):
+class ECBaseSensorEntity[DataT: ECDataType](
+    CoordinatorEntity[ECDataUpdateCoordinator[DataT]], SensorEntity
+):
     """Environment Canada sensor base."""
 
     entity_description: ECSensorEntityDescription
     _attr_has_entity_name = True
 
-    def __init__(self, coordinator, description):
+    def __init__(
+        self,
+        coordinator: ECDataUpdateCoordinator[DataT],
+        description: ECSensorEntityDescription,
+    ) -> None:
         """Initialize the base sensor."""
         super().__init__(coordinator)
         self.entity_description = description
         self._ec_data = coordinator.ec_data
         self._attr_attribution = self._ec_data.metadata["attribution"]
         self._attr_unique_id = f"{coordinator.config_entry.title}-{description.key}"
-        self._attr_device_info = device_info(coordinator.config_entry)
+        self._attr_device_info = coordinator.device_info
 
     @property
     def native_value(self):
@@ -287,10 +302,14 @@ class ECBaseSensor(CoordinatorEntity, SensorEntity):
         return value
 
 
-class ECSensor(ECBaseSensor):
+class ECSensorEntity[DataT: ECDataType](ECBaseSensorEntity[DataT]):
     """Environment Canada sensor for conditions."""
 
-    def __init__(self, coordinator, description):
+    def __init__(
+        self,
+        coordinator: ECDataUpdateCoordinator[DataT],
+        description: ECSensorEntityDescription,
+    ) -> None:
         """Initialize the sensor."""
         super().__init__(coordinator, description)
         self._attr_extra_state_attributes = {
@@ -299,7 +318,7 @@ class ECSensor(ECBaseSensor):
         }
 
 
-class ECAlertSensor(ECBaseSensor):
+class ECAlertSensorEntity(ECBaseSensorEntity[ECWeather]):
     """Environment Canada sensor for alerts."""
 
     @property
diff --git a/homeassistant/components/environment_canada/services.yaml b/homeassistant/components/environment_canada/services.yaml
index 4293b313f5c..0e33aeec933 100644
--- a/homeassistant/components/environment_canada/services.yaml
+++ b/homeassistant/components/environment_canada/services.yaml
@@ -1,3 +1,9 @@
+get_forecasts:
+  target:
+    entity:
+      integration: environment_canada
+      domain: weather
+
 set_radar_type:
   target:
     entity:
diff --git a/homeassistant/components/environment_canada/strings.json b/homeassistant/components/environment_canada/strings.json
index 28ca55c6195..1ccff145bb3 100644
--- a/homeassistant/components/environment_canada/strings.json
+++ b/homeassistant/components/environment_canada/strings.json
@@ -113,6 +113,10 @@
     }
   },
   "services": {
+    "get_forecasts": {
+      "name": "Get forecasts",
+      "description": "Retrieves the forecast from selected weather services."
+    },
     "set_radar_type": {
       "name": "Set radar type",
       "description": "Sets the type of radar image to retrieve.",
diff --git a/homeassistant/components/environment_canada/weather.py b/homeassistant/components/environment_canada/weather.py
index 1871062c2e9..dd7632032ec 100644
--- a/homeassistant/components/environment_canada/weather.py
+++ b/homeassistant/components/environment_canada/weather.py
@@ -4,6 +4,8 @@ from __future__ import annotations
 
 from typing import Any
 
+from env_canada import ECWeather
+
 from homeassistant.components.weather import (
     ATTR_CONDITION_CLEAR_NIGHT,
     ATTR_CONDITION_CLOUDY,
@@ -27,19 +29,23 @@ from homeassistant.components.weather import (
     SingleCoordinatorWeatherEntity,
     WeatherEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     UnitOfLength,
     UnitOfPressure,
     UnitOfSpeed,
     UnitOfTemperature,
 )
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.core import (
+    HomeAssistant,
+    ServiceResponse,
+    SupportsResponse,
+    callback,
+)
+from homeassistant.helpers import entity_platform, entity_registry as er
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import device_info
-from .const import DOMAIN
+from .const import DOMAIN, SERVICE_ENVIRONMENT_CANADA_FORECASTS
+from .coordinator import ECConfigEntry, ECDataUpdateCoordinator
 
 # Icon codes from http://dd.weatheroffice.ec.gc.ca/citypage_weather/
 # docs/current_conditions_icon_code_descriptions_e.csv
@@ -61,11 +67,10 @@ ICON_CONDITION_MAP = {
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: ECConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add a weather entity from a config_entry."""
-    coordinator = hass.data[DOMAIN][config_entry.entry_id]["weather_coordinator"]
     entity_registry = er.async_get(hass)
 
     # Remove hourly entity from legacy config entries
@@ -76,7 +81,15 @@ async def async_setup_entry(
     ):
         entity_registry.async_remove(hourly_entity_id)
 
-    async_add_entities([ECWeather(coordinator)])
+    async_add_entities([ECWeatherEntity(config_entry.runtime_data.weather_coordinator)])
+
+    platform = entity_platform.async_get_current_platform()
+    platform.async_register_entity_service(
+        SERVICE_ENVIRONMENT_CANADA_FORECASTS,
+        None,
+        "_async_environment_canada_forecasts",
+        supports_response=SupportsResponse.ONLY,
+    )
 
 
 def _calculate_unique_id(config_entry_unique_id: str | None, hourly: bool) -> str:
@@ -84,7 +97,9 @@ def _calculate_unique_id(config_entry_unique_id: str | None, hourly: bool) -> st
     return f"{config_entry_unique_id}{'-hourly' if hourly else '-daily'}"
 
 
-class ECWeather(SingleCoordinatorWeatherEntity):
+class ECWeatherEntity(
+    SingleCoordinatorWeatherEntity[ECDataUpdateCoordinator[ECWeather]]
+):
     """Representation of a weather condition."""
 
     _attr_has_entity_name = True
@@ -96,7 +111,7 @@ class ECWeather(SingleCoordinatorWeatherEntity):
         WeatherEntityFeature.FORECAST_DAILY | WeatherEntityFeature.FORECAST_HOURLY
     )
 
-    def __init__(self, coordinator):
+    def __init__(self, coordinator: ECDataUpdateCoordinator[ECWeather]) -> None:
         """Initialize Environment Canada weather."""
         super().__init__(coordinator)
         self.ec_data = coordinator.ec_data
@@ -105,7 +120,7 @@ class ECWeather(SingleCoordinatorWeatherEntity):
         self._attr_unique_id = _calculate_unique_id(
             coordinator.config_entry.unique_id, False
         )
-        self._attr_device_info = device_info(coordinator.config_entry)
+        self._attr_device_info = coordinator.device_info
 
     @property
     def native_temperature(self):
@@ -183,6 +198,23 @@ class ECWeather(SingleCoordinatorWeatherEntity):
         """Return the hourly forecast in native units."""
         return get_forecast(self.ec_data, True)
 
+    def _async_environment_canada_forecasts(self) -> ServiceResponse:
+        """Return the native Environment Canada forecast."""
+        daily = []
+        for f in self.ec_data.daily_forecasts:
+            day = f.copy()
+            day["timestamp"] = day["timestamp"].isoformat()
+            daily.append(day)
+
+        hourly = []
+        for f in self.ec_data.hourly_forecasts:
+            hour = f.copy()
+            hour["timestamp"] = hour["period"].isoformat()
+            del hour["period"]
+            hourly.append(hour)
+
+        return {"daily_forecast": daily, "hourly_forecast": hourly}
+
 
 def get_forecast(ec_data, hourly) -> list[Forecast] | None:
     """Build the forecast array."""
diff --git a/homeassistant/components/envisalink/__init__.py b/homeassistant/components/envisalink/__init__.py
index 0146b650c22..919704a6728 100644
--- a/homeassistant/components/envisalink/__init__.py
+++ b/homeassistant/components/envisalink/__init__.py
@@ -14,7 +14,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.typing import ConfigType
diff --git a/homeassistant/components/envisalink/alarm_control_panel.py b/homeassistant/components/envisalink/alarm_control_panel.py
index ce65178b8d8..9d1b6d0d7a1 100644
--- a/homeassistant/components/envisalink/alarm_control_panel.py
+++ b/homeassistant/components/envisalink/alarm_control_panel.py
@@ -14,7 +14,7 @@ from homeassistant.components.alarm_control_panel import (
 )
 from homeassistant.const import ATTR_ENTITY_ID, CONF_CODE
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/ephember/climate.py b/homeassistant/components/ephember/climate.py
index cedad8b76e2..f92be005db6 100644
--- a/homeassistant/components/ephember/climate.py
+++ b/homeassistant/components/ephember/climate.py
@@ -33,7 +33,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/epic_games_store/__init__.py b/homeassistant/components/epic_games_store/__init__.py
index af25eb98137..d9fb3bee529 100644
--- a/homeassistant/components/epic_games_store/__init__.py
+++ b/homeassistant/components/epic_games_store/__init__.py
@@ -2,34 +2,29 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
-from .coordinator import EGSCalendarUpdateCoordinator
+from .coordinator import EGSCalendarUpdateCoordinator, EGSConfigEntry
 
 PLATFORMS: list[Platform] = [
     Platform.CALENDAR,
 ]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: EGSConfigEntry) -> bool:
     """Set up Epic Games Store from a config entry."""
 
     coordinator = EGSCalendarUpdateCoordinator(hass, entry)
     await coordinator.async_config_entry_first_refresh()
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+    entry.runtime_data = coordinator
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: EGSConfigEntry) -> bool:
     """Unload a config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/epic_games_store/calendar.py b/homeassistant/components/epic_games_store/calendar.py
index 2ebb381341e..41edb5e31a7 100644
--- a/homeassistant/components/epic_games_store/calendar.py
+++ b/homeassistant/components/epic_games_store/calendar.py
@@ -7,25 +7,24 @@ from datetime import datetime
 from typing import Any
 
 from homeassistant.components.calendar import CalendarEntity, CalendarEvent
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, CalendarType
-from .coordinator import EGSCalendarUpdateCoordinator
+from .coordinator import EGSCalendarUpdateCoordinator, EGSConfigEntry
 
 DateRange = namedtuple("DateRange", ["start", "end"])  # noqa: PYI024
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: EGSConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the local calendar platform."""
-    coordinator: EGSCalendarUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
 
     entities = [
         EGSCalendar(coordinator, entry.entry_id, CalendarType.FREE),
diff --git a/homeassistant/components/epic_games_store/coordinator.py b/homeassistant/components/epic_games_store/coordinator.py
index d9c48f5da02..0653a3da9b3 100644
--- a/homeassistant/components/epic_games_store/coordinator.py
+++ b/homeassistant/components/epic_games_store/coordinator.py
@@ -20,13 +20,15 @@ SCAN_INTERVAL = timedelta(days=1)
 
 _LOGGER = logging.getLogger(__name__)
 
+type EGSConfigEntry = ConfigEntry[EGSCalendarUpdateCoordinator]
+
 
 class EGSCalendarUpdateCoordinator(
     DataUpdateCoordinator[dict[str, list[dict[str, Any]]]]
 ):
     """Class to manage fetching data from the Epic Game Store."""
 
-    def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
+    def __init__(self, hass: HomeAssistant, entry: EGSConfigEntry) -> None:
         """Initialize."""
         self._api = EpicGamesStoreAPI(
             entry.data[CONF_LANGUAGE],
@@ -37,6 +39,7 @@ class EGSCalendarUpdateCoordinator(
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/epion/__init__.py b/homeassistant/components/epion/__init__.py
index fec975c5098..c04c77f760d 100644
--- a/homeassistant/components/epion/__init__.py
+++ b/homeassistant/components/epion/__init__.py
@@ -4,30 +4,25 @@ from __future__ import annotations
 
 from epion import Epion
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, Platform
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
-from .coordinator import EpionCoordinator
+from .coordinator import EpionConfigEntry, EpionCoordinator
 
 PLATFORMS = [Platform.SENSOR]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: EpionConfigEntry) -> bool:
     """Set up the Epion coordinator from a config entry."""
     api = Epion(entry.data[CONF_API_KEY])
-    coordinator = EpionCoordinator(hass, api)
+    coordinator = EpionCoordinator(hass, entry, api)
     await coordinator.async_config_entry_first_refresh()
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+    entry.runtime_data = coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: EpionConfigEntry) -> bool:
     """Unload Epion config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if unload_ok:
-        del hass.data[DOMAIN][entry.entry_id]
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/epion/coordinator.py b/homeassistant/components/epion/coordinator.py
index 3eb7efb5dc7..9eb31331097 100644
--- a/homeassistant/components/epion/coordinator.py
+++ b/homeassistant/components/epion/coordinator.py
@@ -5,6 +5,7 @@ from typing import Any
 
 from epion import Epion, EpionAuthenticationError, EpionConnectionError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -13,15 +14,20 @@ from .const import REFRESH_INTERVAL
 
 _LOGGER = logging.getLogger(__name__)
 
+type EpionConfigEntry = ConfigEntry[EpionCoordinator]
+
 
 class EpionCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Epion data update coordinator."""
 
-    def __init__(self, hass: HomeAssistant, epion_api: Epion) -> None:
+    def __init__(
+        self, hass: HomeAssistant, entry: EpionConfigEntry, epion_api: Epion
+    ) -> None:
         """Initialize the Epion coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             name="Epion",
             update_interval=REFRESH_INTERVAL,
         )
diff --git a/homeassistant/components/epion/sensor.py b/homeassistant/components/epion/sensor.py
index 4717c095bfe..360c1f1d8a7 100644
--- a/homeassistant/components/epion/sensor.py
+++ b/homeassistant/components/epion/sensor.py
@@ -10,7 +10,6 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONCENTRATION_PARTS_PER_MILLION,
     PERCENTAGE,
@@ -19,11 +18,11 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
-from .coordinator import EpionCoordinator
+from .coordinator import EpionConfigEntry, EpionCoordinator
 
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
@@ -59,11 +58,11 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: EpionConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add an Epion entry."""
-    coordinator: EpionCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
 
     entities = [
         EpionSensor(coordinator, epion_device_id, description)
diff --git a/homeassistant/components/epson/__init__.py b/homeassistant/components/epson/__init__.py
index 715b55824b4..27dbaa93734 100644
--- a/homeassistant/components/epson/__init__.py
+++ b/homeassistant/components/epson/__init__.py
@@ -13,13 +13,15 @@ from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import CONF_CONNECTION_TYPE, DOMAIN, HTTP
+from .const import CONF_CONNECTION_TYPE, HTTP
 from .exceptions import CannotConnect, PoweredOff
 
 PLATFORMS = [Platform.MEDIA_PLAYER]
 
 _LOGGER = logging.getLogger(__name__)
 
+type EpsonConfigEntry = ConfigEntry[Projector]
+
 
 async def validate_projector(
     hass: HomeAssistant,
@@ -45,7 +47,7 @@ async def validate_projector(
     return epson_proj
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: EpsonConfigEntry) -> bool:
     """Set up epson from a config entry."""
     projector = await validate_projector(
         hass=hass,
@@ -54,23 +56,21 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         check_power=False,
         check_powered_on=False,
     )
-    hass.data.setdefault(DOMAIN, {})
-    hass.data[DOMAIN][entry.entry_id] = projector
+    entry.runtime_data = projector
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    entry.async_on_unload(projector.close)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: EpsonConfigEntry) -> bool:
     """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if unload_ok:
-        projector = hass.data[DOMAIN].pop(entry.entry_id)
-        projector.close()
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
-async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_migrate_entry(
+    hass: HomeAssistant, config_entry: EpsonConfigEntry
+) -> bool:
     """Migrate old entry."""
     _LOGGER.debug(
         "Migrating configuration from version %s.%s",
diff --git a/homeassistant/components/epson/config_flow.py b/homeassistant/components/epson/config_flow.py
index c54bff2eea9..077b9cc31f7 100644
--- a/homeassistant/components/epson/config_flow.py
+++ b/homeassistant/components/epson/config_flow.py
@@ -72,5 +72,7 @@ class EpsonConfigFlow(ConfigFlow, domain=DOMAIN):
                 if projector:
                     projector.close()
         return self.async_show_form(
-            step_id="user", data_schema=DATA_SCHEMA, errors=errors
+            step_id="user",
+            data_schema=self.add_suggested_values_to_schema(DATA_SCHEMA, user_input),
+            errors=errors,
         )
diff --git a/homeassistant/components/epson/media_player.py b/homeassistant/components/epson/media_player.py
index a901e9df216..c1582d6f0e5 100644
--- a/homeassistant/components/epson/media_player.py
+++ b/homeassistant/components/epson/media_player.py
@@ -43,8 +43,9 @@ from homeassistant.helpers import (
     entity_registry as er,
 )
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import EpsonConfigEntry
 from .const import ATTR_CMODE, DOMAIN, SERVICE_SELECT_CMODE
 
 _LOGGER = logging.getLogger(__name__)
@@ -52,13 +53,12 @@ _LOGGER = logging.getLogger(__name__)
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: EpsonConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Epson projector from a config entry."""
-    projector: Projector = hass.data[DOMAIN][config_entry.entry_id]
     projector_entity = EpsonProjectorMediaPlayer(
-        projector=projector,
+        projector=config_entry.runtime_data,
         unique_id=config_entry.unique_id or config_entry.entry_id,
         entry=config_entry,
     )
diff --git a/homeassistant/components/eq3btsmart/binary_sensor.py b/homeassistant/components/eq3btsmart/binary_sensor.py
index 27525d47972..55b1f4d6ced 100644
--- a/homeassistant/components/eq3btsmart/binary_sensor.py
+++ b/homeassistant/components/eq3btsmart/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import Eq3ConfigEntry
 from .const import ENTITY_KEY_BATTERY, ENTITY_KEY_DST, ENTITY_KEY_WINDOW
@@ -51,7 +51,7 @@ BINARY_SENSOR_ENTITY_DESCRIPTIONS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: Eq3ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the entry."""
 
diff --git a/homeassistant/components/eq3btsmart/climate.py b/homeassistant/components/eq3btsmart/climate.py
index ae01d0fc9a7..738efa99187 100644
--- a/homeassistant/components/eq3btsmart/climate.py
+++ b/homeassistant/components/eq3btsmart/climate.py
@@ -19,7 +19,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import CONNECTION_BLUETOOTH
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import Eq3ConfigEntry
 from .const import (
@@ -37,7 +37,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: Eq3ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Handle config entry setup."""
 
diff --git a/homeassistant/components/eq3btsmart/manifest.json b/homeassistant/components/eq3btsmart/manifest.json
index 43f524516a8..ab62c962982 100644
--- a/homeassistant/components/eq3btsmart/manifest.json
+++ b/homeassistant/components/eq3btsmart/manifest.json
@@ -22,5 +22,5 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["eq3btsmart"],
-  "requirements": ["eq3btsmart==1.4.1", "bleak-esphome==2.1.1"]
+  "requirements": ["eq3btsmart==1.4.1", "bleak-esphome==2.12.0"]
 }
diff --git a/homeassistant/components/eq3btsmart/number.py b/homeassistant/components/eq3btsmart/number.py
index 2e069180fa3..c3cbd8eae31 100644
--- a/homeassistant/components/eq3btsmart/number.py
+++ b/homeassistant/components/eq3btsmart/number.py
@@ -21,7 +21,7 @@ from homeassistant.components.number import (
 )
 from homeassistant.const import EntityCategory, UnitOfTemperature, UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import Eq3ConfigEntry
 from .const import (
@@ -109,7 +109,7 @@ NUMBER_ENTITY_DESCRIPTIONS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: Eq3ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the entry."""
 
diff --git a/homeassistant/components/eq3btsmart/sensor.py b/homeassistant/components/eq3btsmart/sensor.py
index bd2605042f4..aab3cbf1925 100644
--- a/homeassistant/components/eq3btsmart/sensor.py
+++ b/homeassistant/components/eq3btsmart/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 from homeassistant.components.sensor.const import SensorStateClass
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import Eq3ConfigEntry
 from .const import ENTITY_KEY_AWAY_UNTIL, ENTITY_KEY_VALVE
@@ -51,7 +51,7 @@ SENSOR_ENTITY_DESCRIPTIONS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: Eq3ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the entry."""
 
diff --git a/homeassistant/components/eq3btsmart/switch.py b/homeassistant/components/eq3btsmart/switch.py
index 7525d8ca494..61da133cb71 100644
--- a/homeassistant/components/eq3btsmart/switch.py
+++ b/homeassistant/components/eq3btsmart/switch.py
@@ -9,7 +9,7 @@ from eq3btsmart.models import Status
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import Eq3ConfigEntry
 from .const import ENTITY_KEY_AWAY, ENTITY_KEY_BOOST, ENTITY_KEY_LOCK
@@ -49,7 +49,7 @@ SWITCH_ENTITY_DESCRIPTIONS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: Eq3ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the entry."""
 
diff --git a/homeassistant/components/escea/climate.py b/homeassistant/components/escea/climate.py
index c3fb0015e68..a1ac83844a2 100644
--- a/homeassistant/components/escea/climate.py
+++ b/homeassistant/components/escea/climate.py
@@ -21,7 +21,7 @@ from homeassistant.const import ATTR_TEMPERATURE, PRECISION_WHOLE, UnitOfTempera
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     DATA_DISCOVERY_SERVICE,
@@ -47,7 +47,7 @@ _HA_FAN_TO_ESCEA = {v: k for k, v in _ESCEA_FAN_TO_HA.items()}
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize an Escea Controller."""
     discovery_service = hass.data[DATA_DISCOVERY_SERVICE]
diff --git a/homeassistant/components/esphome/__init__.py b/homeassistant/components/esphome/__init__.py
index 5934c9a6f68..1e1a2763b59 100644
--- a/homeassistant/components/esphome/__init__.py
+++ b/homeassistant/components/esphome/__init__.py
@@ -13,10 +13,10 @@ from homeassistant.const import (
     __version__ as ha_version,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
-from .const import CONF_NOISE_PSK, DATA_FFMPEG_PROXY, DOMAIN
+from .const import CONF_BLUETOOTH_MAC_ADDRESS, CONF_NOISE_PSK, DATA_FFMPEG_PROXY, DOMAIN
 from .dashboard import async_setup as async_setup_dashboard
 from .domain_data import DomainData
 
@@ -87,6 +87,6 @@ async def async_unload_entry(hass: HomeAssistant, entry: ESPHomeConfigEntry) ->
 
 async def async_remove_entry(hass: HomeAssistant, entry: ESPHomeConfigEntry) -> None:
     """Remove an esphome config entry."""
-    if mac_address := entry.unique_id:
-        async_remove_scanner(hass, mac_address.upper())
+    if bluetooth_mac_address := entry.data.get(CONF_BLUETOOTH_MAC_ADDRESS):
+        async_remove_scanner(hass, bluetooth_mac_address.upper())
     await DomainData.get(hass).get_or_create_store(hass, entry).async_remove()
diff --git a/homeassistant/components/esphome/assist_satellite.py b/homeassistant/components/esphome/assist_satellite.py
index f60668b0a06..a129a7723dd 100644
--- a/homeassistant/components/esphome/assist_satellite.py
+++ b/homeassistant/components/esphome/assist_satellite.py
@@ -39,7 +39,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import EsphomeAssistEntity
@@ -87,7 +87,7 @@ _CONFIG_TIMEOUT_SEC = 5
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ESPHomeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Assist satellite entity."""
     entry_data = entry.runtime_data
@@ -253,6 +253,11 @@ class EsphomeAssistSatellite(
             # Will use media player for TTS/announcements
             self._update_tts_format()
 
+        if feature_flags & VoiceAssistantFeature.START_CONVERSATION:
+            self._attr_supported_features |= (
+                assist_satellite.AssistSatelliteEntityFeature.START_CONVERSATION
+            )
+
         # Update wake word select when config is updated
         self.async_on_remove(
             self.entry_data.async_register_assist_satellite_set_wake_word_callback(
@@ -284,7 +289,10 @@ class EsphomeAssistSatellite(
         elif event_type == VoiceAssistantEventType.VOICE_ASSISTANT_INTENT_END:
             assert event.data is not None
             data_to_send = {
-                "conversation_id": event.data["intent_output"]["conversation_id"] or "",
+                "conversation_id": event.data["intent_output"]["conversation_id"],
+                "continue_conversation": str(
+                    int(event.data["intent_output"]["continue_conversation"])
+                ),
             }
         elif event_type == VoiceAssistantEventType.VOICE_ASSISTANT_TTS_START:
             assert event.data is not None
@@ -339,14 +347,33 @@ class EsphomeAssistSatellite(
 
         Should block until the announcement is done playing.
         """
+        await self._do_announce(announcement, run_pipeline_after=False)
+
+    async def async_start_conversation(
+        self, start_announcement: assist_satellite.AssistSatelliteAnnouncement
+    ) -> None:
+        """Start a conversation from the satellite."""
+        await self._do_announce(start_announcement, run_pipeline_after=True)
+
+    async def _do_announce(
+        self,
+        announcement: assist_satellite.AssistSatelliteAnnouncement,
+        run_pipeline_after: bool,
+    ) -> None:
+        """Announce media on the satellite.
+
+        Optionally run a voice pipeline after the announcement has finished.
+        """
         _LOGGER.debug(
             "Waiting for announcement to finished (message=%s, media_id=%s)",
             announcement.message,
             announcement.media_id,
         )
         media_id = announcement.media_id
-        if announcement.media_id_source != "tts":
-            # Route non-TTS media through the proxy
+        is_media_tts = announcement.media_id_source == "tts"
+        preannounce_media_id = announcement.preannounce_media_id
+        if (not is_media_tts) or preannounce_media_id:
+            # Route media through the proxy
             format_to_use: MediaPlayerSupportedFormat | None = None
             for supported_format in chain(
                 *self.entry_data.media_player_formats.values()
@@ -359,19 +386,33 @@ class EsphomeAssistSatellite(
                 assert (self.registry_entry is not None) and (
                     self.registry_entry.device_id is not None
                 )
-                proxy_url = async_create_proxy_url(
-                    self.hass,
-                    self.registry_entry.device_id,
-                    media_id,
+
+                make_proxy_url = partial(
+                    async_create_proxy_url,
+                    hass=self.hass,
+                    device_id=self.registry_entry.device_id,
                     media_format=format_to_use.format,
                     rate=format_to_use.sample_rate or None,
                     channels=format_to_use.num_channels or None,
                     width=format_to_use.sample_bytes or None,
                 )
-                media_id = async_process_play_media_url(self.hass, proxy_url)
+
+                if not is_media_tts:
+                    media_id = async_process_play_media_url(
+                        self.hass, make_proxy_url(media_url=media_id)
+                    )
+
+                if preannounce_media_id:
+                    preannounce_media_id = async_process_play_media_url(
+                        self.hass, make_proxy_url(media_url=preannounce_media_id)
+                    )
 
         await self.cli.send_voice_assistant_announcement_await_response(
-            media_id, _ANNOUNCEMENT_TIMEOUT_SEC, announcement.message
+            media_id,
+            _ANNOUNCEMENT_TIMEOUT_SEC,
+            announcement.message,
+            start_conversation=run_pipeline_after,
+            preannounce_media_id=preannounce_media_id or "",
         )
 
     async def handle_pipeline_start(
diff --git a/homeassistant/components/esphome/binary_sensor.py b/homeassistant/components/esphome/binary_sensor.py
index ac759aa7b17..02b13748fb6 100644
--- a/homeassistant/components/esphome/binary_sensor.py
+++ b/homeassistant/components/esphome/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import issue_registry as ir
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
 
 from .const import DOMAIN
@@ -24,7 +24,7 @@ from .entry_data import ESPHomeConfigEntry
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ESPHomeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up ESPHome binary sensors based on a config entry."""
     await platform_async_setup_entry(
diff --git a/homeassistant/components/esphome/bluetooth.py b/homeassistant/components/esphome/bluetooth.py
index da342913d3d..27abb19909f 100644
--- a/homeassistant/components/esphome/bluetooth.py
+++ b/homeassistant/components/esphome/bluetooth.py
@@ -28,6 +28,7 @@ def async_connect_scanner(
     entry_data: RuntimeEntryData,
     cli: APIClient,
     device_info: DeviceInfo,
+    device_id: str,
 ) -> CALLBACK_TYPE:
     """Connect scanner."""
     client_data = connect_scanner(cli, device_info, entry_data.available)
@@ -45,6 +46,7 @@ def async_connect_scanner(
                 source_domain=DOMAIN,
                 source_model=device_info.model,
                 source_config_entry_id=entry_data.entry_id,
+                source_device_id=device_id,
             ),
             scanner.async_setup(),
         ],
diff --git a/homeassistant/components/esphome/climate.py b/homeassistant/components/esphome/climate.py
index 478ce9bae2c..b651f16dfd7 100644
--- a/homeassistant/components/esphome/climate.py
+++ b/homeassistant/components/esphome/climate.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from functools import partial
+from math import isfinite
 from typing import Any, cast
 
 from aioesphomeapi import (
@@ -238,9 +239,13 @@ class EsphomeClimateEntity(EsphomeEntity[ClimateInfo, ClimateState], ClimateEnti
     @esphome_state_property
     def current_humidity(self) -> int | None:
         """Return the current humidity."""
-        if not self._static_info.supports_current_humidity:
+        if (
+            not self._static_info.supports_current_humidity
+            or (val := self._state.current_humidity) is None
+            or not isfinite(val)
+        ):
             return None
-        return round(self._state.current_humidity)
+        return round(val)
 
     @property
     @esphome_float_state_property
diff --git a/homeassistant/components/esphome/config_flow.py b/homeassistant/components/esphome/config_flow.py
index 695131b19f7..955a93cd2b7 100644
--- a/homeassistant/components/esphome/config_flow.py
+++ b/homeassistant/components/esphome/config_flow.py
@@ -41,6 +41,7 @@ from .const import (
     CONF_ALLOW_SERVICE_CALLS,
     CONF_DEVICE_NAME,
     CONF_NOISE_PSK,
+    CONF_SUBSCRIBE_LOGS,
     DEFAULT_ALLOW_SERVICE_CALLS,
     DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS,
     DOMAIN,
@@ -508,6 +509,10 @@ class OptionsFlowHandler(OptionsFlow):
                         CONF_ALLOW_SERVICE_CALLS, DEFAULT_ALLOW_SERVICE_CALLS
                     ),
                 ): bool,
+                vol.Required(
+                    CONF_SUBSCRIBE_LOGS,
+                    default=self.config_entry.options.get(CONF_SUBSCRIBE_LOGS, False),
+                ): bool,
             }
         )
         return self.async_show_form(step_id="init", data_schema=data_schema)
diff --git a/homeassistant/components/esphome/const.py b/homeassistant/components/esphome/const.py
index 143aaa6342a..c7cd7fdcdf0 100644
--- a/homeassistant/components/esphome/const.py
+++ b/homeassistant/components/esphome/const.py
@@ -5,18 +5,22 @@ from awesomeversion import AwesomeVersion
 DOMAIN = "esphome"
 
 CONF_ALLOW_SERVICE_CALLS = "allow_service_calls"
+CONF_SUBSCRIBE_LOGS = "subscribe_logs"
 CONF_DEVICE_NAME = "device_name"
 CONF_NOISE_PSK = "noise_psk"
+CONF_BLUETOOTH_MAC_ADDRESS = "bluetooth_mac_address"
 
 DEFAULT_ALLOW_SERVICE_CALLS = True
 DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS = False
 
 
-STABLE_BLE_VERSION_STR = "2023.8.0"
+STABLE_BLE_VERSION_STR = "2025.2.2"
 STABLE_BLE_VERSION = AwesomeVersion(STABLE_BLE_VERSION_STR)
 PROJECT_URLS = {
     "esphome.bluetooth-proxy": "https://esphome.github.io/bluetooth-proxies/",
 }
-DEFAULT_URL = f"https://esphome.io/changelog/{STABLE_BLE_VERSION_STR}.html"
+# ESPHome always uses .0 for the changelog URL
+STABLE_BLE_URL_VERSION = f"{STABLE_BLE_VERSION.major}.{STABLE_BLE_VERSION.minor}.0"
+DEFAULT_URL = f"https://esphome.io/changelog/{STABLE_BLE_URL_VERSION}.html"
 
 DATA_FFMPEG_PROXY = f"{DOMAIN}.ffmpeg_proxy"
diff --git a/homeassistant/components/esphome/dashboard.py b/homeassistant/components/esphome/dashboard.py
index 334c16e5730..290feec1e2a 100644
--- a/homeassistant/components/esphome/dashboard.py
+++ b/homeassistant/components/esphome/dashboard.py
@@ -6,7 +6,7 @@ import asyncio
 import logging
 from typing import Any
 
-from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntryState
+from homeassistant.config_entries import SOURCE_REAUTH
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import CALLBACK_TYPE, Event, HomeAssistant, callback
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -108,8 +108,7 @@ class ESPHomeDashboardManager:
 
         reloads = [
             hass.config_entries.async_reload(entry.entry_id)
-            for entry in hass.config_entries.async_entries(DOMAIN)
-            if entry.state is ConfigEntryState.LOADED
+            for entry in hass.config_entries.async_loaded_entries(DOMAIN)
         ]
         # Re-auth flows will check the dashboard for encryption key when the form is requested
         # but we only trigger reauth if the dashboard is available.
diff --git a/homeassistant/components/esphome/datetime.py b/homeassistant/components/esphome/datetime.py
index 20d0d651bba..d1bb0bb77ff 100644
--- a/homeassistant/components/esphome/datetime.py
+++ b/homeassistant/components/esphome/datetime.py
@@ -8,7 +8,7 @@ from functools import partial
 from aioesphomeapi import DateTimeInfo, DateTimeState
 
 from homeassistant.components.datetime import DateTimeEntity
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .entity import EsphomeEntity, esphome_state_property, platform_async_setup_entry
 
diff --git a/homeassistant/components/esphome/diagnostics.py b/homeassistant/components/esphome/diagnostics.py
index 58c9a8fe666..0903e874a15 100644
--- a/homeassistant/components/esphome/diagnostics.py
+++ b/homeassistant/components/esphome/diagnostics.py
@@ -13,9 +13,7 @@ from . import CONF_NOISE_PSK
 from .dashboard import async_get_dashboard
 from .entry_data import ESPHomeConfigEntry
 
-CONF_MAC_ADDRESS = "mac_address"
-
-REDACT_KEYS = {CONF_NOISE_PSK, CONF_PASSWORD, CONF_MAC_ADDRESS}
+REDACT_KEYS = {CONF_NOISE_PSK, CONF_PASSWORD, "mac_address", "bluetooth_mac_address"}
 
 
 async def async_get_config_entry_diagnostics(
@@ -27,13 +25,17 @@ async def async_get_config_entry_diagnostics(
     diag["config"] = config_entry.as_dict()
 
     entry_data = config_entry.runtime_data
+    device_info = entry_data.device_info
 
     if (storage_data := await entry_data.store.async_load()) is not None:
         diag["storage_data"] = storage_data
 
     if (
-        config_entry.unique_id
-        and (scanner := async_scanner_by_source(hass, config_entry.unique_id.upper()))
+        device_info
+        and (
+            scanner_mac := device_info.bluetooth_mac_address or device_info.mac_address
+        )
+        and (scanner := async_scanner_by_source(hass, scanner_mac.upper()))
         and (bluetooth_device := entry_data.bluetooth_device)
     ):
         diag["bluetooth"] = {
diff --git a/homeassistant/components/esphome/entity.py b/homeassistant/components/esphome/entity.py
index 455a3f8d105..ff08e5f578a 100644
--- a/homeassistant/components/esphome/entity.py
+++ b/homeassistant/components/esphome/entity.py
@@ -19,9 +19,11 @@ import voluptuous as vol
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import entity_platform
-import homeassistant.helpers.config_validation as cv
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    entity_platform,
+)
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
diff --git a/homeassistant/components/esphome/manager.py b/homeassistant/components/esphome/manager.py
index b382622281e..0a47fb66815 100644
--- a/homeassistant/components/esphome/manager.py
+++ b/homeassistant/components/esphome/manager.py
@@ -5,6 +5,7 @@ from __future__ import annotations
 import asyncio
 from functools import partial
 import logging
+import re
 from typing import TYPE_CHECKING, Any, NamedTuple
 
 from aioesphomeapi import (
@@ -16,6 +17,7 @@ from aioesphomeapi import (
     HomeassistantServiceCall,
     InvalidAuthAPIError,
     InvalidEncryptionKeyAPIError,
+    LogLevel,
     ReconnectLogic,
     RequiresEncryptionAPIError,
     UserService,
@@ -33,6 +35,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import (
+    CALLBACK_TYPE,
     Event,
     EventStateChangedData,
     HomeAssistant,
@@ -41,9 +44,11 @@ from homeassistant.core import (
     callback,
 )
 from homeassistant.exceptions import TemplateError
-from homeassistant.helpers import template
-import homeassistant.helpers.config_validation as cv
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    template,
+)
 from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.helpers.issue_registry import (
@@ -58,7 +63,9 @@ from homeassistant.util.async_ import create_eager_task
 from .bluetooth import async_connect_scanner
 from .const import (
     CONF_ALLOW_SERVICE_CALLS,
+    CONF_BLUETOOTH_MAC_ADDRESS,
     CONF_DEVICE_NAME,
+    CONF_SUBSCRIBE_LOGS,
     DEFAULT_ALLOW_SERVICE_CALLS,
     DEFAULT_URL,
     DOMAIN,
@@ -72,8 +79,38 @@ from .domain_data import DomainData
 # Import config flow so that it's added to the registry
 from .entry_data import ESPHomeConfigEntry, RuntimeEntryData
 
+if TYPE_CHECKING:
+    from aioesphomeapi.api_pb2 import (  # type: ignore[attr-defined]
+        SubscribeLogsResponse,
+    )
+
+
 _LOGGER = logging.getLogger(__name__)
 
+LOG_LEVEL_TO_LOGGER = {
+    LogLevel.LOG_LEVEL_NONE: logging.DEBUG,
+    LogLevel.LOG_LEVEL_ERROR: logging.ERROR,
+    LogLevel.LOG_LEVEL_WARN: logging.WARNING,
+    LogLevel.LOG_LEVEL_INFO: logging.INFO,
+    LogLevel.LOG_LEVEL_CONFIG: logging.INFO,
+    LogLevel.LOG_LEVEL_DEBUG: logging.DEBUG,
+    LogLevel.LOG_LEVEL_VERBOSE: logging.DEBUG,
+    LogLevel.LOG_LEVEL_VERY_VERBOSE: logging.DEBUG,
+}
+LOGGER_TO_LOG_LEVEL = {
+    logging.NOTSET: LogLevel.LOG_LEVEL_VERY_VERBOSE,
+    logging.DEBUG: LogLevel.LOG_LEVEL_VERY_VERBOSE,
+    logging.INFO: LogLevel.LOG_LEVEL_CONFIG,
+    logging.WARNING: LogLevel.LOG_LEVEL_WARN,
+    logging.ERROR: LogLevel.LOG_LEVEL_ERROR,
+    logging.CRITICAL: LogLevel.LOG_LEVEL_ERROR,
+}
+# 7-bit and 8-bit C1 ANSI sequences
+# https://stackoverflow.com/questions/14693701/how-can-i-remove-the-ansi-escape-sequences-from-a-string-in-python
+ANSI_ESCAPE_78BIT = re.compile(
+    rb"(?:\x1B[@-Z\\-_]|[\x80-\x9A\x9C-\x9F]|(?:\x1B\[|\x9B)[0-?]*[ -/]*[@-~])"
+)
+
 
 @callback
 def _async_check_firmware_version(
@@ -134,6 +171,8 @@ class ESPHomeManager:
     """Class to manage an ESPHome connection."""
 
     __slots__ = (
+        "_cancel_subscribe_logs",
+        "_log_level",
         "cli",
         "device_id",
         "domain_data",
@@ -167,6 +206,8 @@ class ESPHomeManager:
         self.reconnect_logic: ReconnectLogic | None = None
         self.zeroconf_instance = zeroconf_instance
         self.entry_data = entry.runtime_data
+        self._cancel_subscribe_logs: CALLBACK_TYPE | None = None
+        self._log_level = LogLevel.LOG_LEVEL_NONE
 
     async def on_stop(self, event: Event) -> None:
         """Cleanup the socket client on HA close."""
@@ -339,6 +380,34 @@ class ESPHomeManager:
             # Re-connection logic will trigger after this
             await self.cli.disconnect()
 
+    def _async_on_log(self, msg: SubscribeLogsResponse) -> None:
+        """Handle a log message from the API."""
+        log: bytes = msg.message
+        _LOGGER.log(
+            LOG_LEVEL_TO_LOGGER.get(msg.level, logging.DEBUG),
+            "%s: %s",
+            self.entry.title,
+            ANSI_ESCAPE_78BIT.sub(b"", log).decode("utf-8", "backslashreplace"),
+        )
+
+    @callback
+    def _async_get_equivalent_log_level(self) -> LogLevel:
+        """Get the equivalent ESPHome log level for the current logger."""
+        return LOGGER_TO_LOG_LEVEL.get(
+            _LOGGER.getEffectiveLevel(), LogLevel.LOG_LEVEL_VERY_VERBOSE
+        )
+
+    @callback
+    def _async_subscribe_logs(self, log_level: LogLevel) -> None:
+        """Subscribe to logs."""
+        if self._cancel_subscribe_logs is not None:
+            self._cancel_subscribe_logs()
+            self._cancel_subscribe_logs = None
+        self._log_level = log_level
+        self._cancel_subscribe_logs = self.cli.subscribe_logs(
+            self._async_on_log, self._log_level
+        )
+
     async def _on_connnect(self) -> None:
         """Subscribe to states and list entities on successful API login."""
         entry = self.entry
@@ -350,6 +419,8 @@ class ESPHomeManager:
         cli = self.cli
         stored_device_name = entry.data.get(CONF_DEVICE_NAME)
         unique_id_is_mac_address = unique_id and ":" in unique_id
+        if entry.options.get(CONF_SUBSCRIBE_LOGS):
+            self._async_subscribe_logs(self._async_get_equivalent_log_level())
         results = await asyncio.gather(
             create_eager_task(cli.device_info()),
             create_eager_task(cli.list_entities_services()),
@@ -361,6 +432,13 @@ class ESPHomeManager:
 
         device_mac = format_mac(device_info.mac_address)
         mac_address_matches = unique_id == device_mac
+        if (
+            bluetooth_mac_address := device_info.bluetooth_mac_address
+        ) and entry.data.get(CONF_BLUETOOTH_MAC_ADDRESS) != bluetooth_mac_address:
+            hass.config_entries.async_update_entry(
+                entry,
+                data={**entry.data, CONF_BLUETOOTH_MAC_ADDRESS: bluetooth_mac_address},
+            )
         #
         # Migrate config entry to new unique ID if the current
         # unique id is not a mac address.
@@ -423,10 +501,14 @@ class ESPHomeManager:
 
         if device_info.bluetooth_proxy_feature_flags_compat(api_version):
             entry_data.disconnect_callbacks.add(
-                async_connect_scanner(hass, entry_data, cli, device_info)
+                async_connect_scanner(
+                    hass, entry_data, cli, device_info, self.device_id
+                )
             )
         else:
-            bluetooth.async_remove_scanner(hass, device_info.mac_address)
+            bluetooth.async_remove_scanner(
+                hass, device_info.bluetooth_mac_address or device_info.mac_address
+            )
 
         if device_info.voice_assistant_feature_flags_compat(api_version) and (
             Platform.ASSIST_SATELLITE not in entry_data.loaded_platforms
@@ -499,6 +581,10 @@ class ESPHomeManager:
     def _async_handle_logging_changed(self, _event: Event) -> None:
         """Handle when the logging level changes."""
         self.cli.set_debug(_LOGGER.isEnabledFor(logging.DEBUG))
+        if self.entry.options.get(CONF_SUBSCRIBE_LOGS) and self._log_level != (
+            new_log_level := self._async_get_equivalent_log_level()
+        ):
+            self._async_subscribe_logs(new_log_level)
 
     async def async_start(self) -> None:
         """Start the esphome connection manager."""
@@ -541,11 +627,22 @@ class ESPHomeManager:
             )
         _setup_services(hass, entry_data, services)
 
-        if entry_data.device_info is not None and entry_data.device_info.name:
-            reconnect_logic.name = entry_data.device_info.name
+        if (device_info := entry_data.device_info) is not None:
+            if device_info.name:
+                reconnect_logic.name = device_info.name
+            if (
+                bluetooth_mac_address := device_info.bluetooth_mac_address
+            ) and entry.data.get(CONF_BLUETOOTH_MAC_ADDRESS) != bluetooth_mac_address:
+                hass.config_entries.async_update_entry(
+                    entry,
+                    data={
+                        **entry.data,
+                        CONF_BLUETOOTH_MAC_ADDRESS: bluetooth_mac_address,
+                    },
+                )
             if entry.unique_id is None:
                 hass.config_entries.async_update_entry(
-                    entry, unique_id=format_mac(entry_data.device_info.mac_address)
+                    entry, unique_id=format_mac(device_info.mac_address)
                 )
 
         await reconnect_logic.start()
@@ -569,7 +666,9 @@ def _async_setup_device_registry(
 
     configuration_url = None
     if device_info.webserver_port > 0:
-        configuration_url = f"http://{entry.data['host']}:{device_info.webserver_port}"
+        entry_host = entry.data["host"]
+        host = f"[{entry_host}]" if ":" in entry_host else entry_host
+        configuration_url = f"http://{host}:{device_info.webserver_port}"
     elif (
         (dashboard := async_get_dashboard(hass))
         and dashboard.data
diff --git a/homeassistant/components/esphome/manifest.json b/homeassistant/components/esphome/manifest.json
index 4682be1c5c7..075185dffbb 100644
--- a/homeassistant/components/esphome/manifest.json
+++ b/homeassistant/components/esphome/manifest.json
@@ -16,9 +16,9 @@
   "loggers": ["aioesphomeapi", "noiseprotocol", "bleak_esphome"],
   "mqtt": ["esphome/discover/#"],
   "requirements": [
-    "aioesphomeapi==28.0.1",
+    "aioesphomeapi==29.7.0",
     "esphome-dashboard-api==1.2.3",
-    "bleak-esphome==2.1.1"
+    "bleak-esphome==2.12.0"
   ],
   "zeroconf": ["_esphomelib._tcp.local."]
 }
diff --git a/homeassistant/components/esphome/select.py b/homeassistant/components/esphome/select.py
index 71a21186d3d..67bcbbbd221 100644
--- a/homeassistant/components/esphome/select.py
+++ b/homeassistant/components/esphome/select.py
@@ -13,7 +13,7 @@ from homeassistant.components.select import SelectEntity, SelectEntityDescriptio
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import restore_state
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import (
@@ -29,7 +29,7 @@ from .entry_data import ESPHomeConfigEntry, RuntimeEntryData
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ESPHomeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up esphome selects based on a config entry."""
     await platform_async_setup_entry(
diff --git a/homeassistant/components/esphome/sensor.py b/homeassistant/components/esphome/sensor.py
index 670c92d291e..26f33f4fb47 100644
--- a/homeassistant/components/esphome/sensor.py
+++ b/homeassistant/components/esphome/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 from homeassistant.util.enum import try_parse_enum
 
@@ -31,7 +31,9 @@ from .enum_mapper import EsphomeEnumMapper
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up esphome sensors based on a config entry."""
     await platform_async_setup_entry(
diff --git a/homeassistant/components/esphome/strings.json b/homeassistant/components/esphome/strings.json
index 81b58de8df2..c6916a3636d 100644
--- a/homeassistant/components/esphome/strings.json
+++ b/homeassistant/components/esphome/strings.json
@@ -4,7 +4,7 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "mdns_missing_mac": "Missing MAC address in MDNS properties.",
+      "mdns_missing_mac": "Missing MAC address in mDNS properties.",
       "service_received": "Action received",
       "mqtt_missing_mac": "Missing MAC address in MQTT properties.",
       "mqtt_missing_api": "Missing API port in MQTT properties.",
@@ -54,7 +54,8 @@
     "step": {
       "init": {
         "data": {
-          "allow_service_calls": "Allow the device to perform Home Assistant actions."
+          "allow_service_calls": "Allow the device to perform Home Assistant actions.",
+          "subscribe_logs": "Subscribe to logs from the device. When enabled, the device will send logs to Home Assistant and you can view them in the logs panel."
         }
       }
     }
diff --git a/homeassistant/components/esphome/update.py b/homeassistant/components/esphome/update.py
index 2b593051742..60d4989063b 100644
--- a/homeassistant/components/esphome/update.py
+++ b/homeassistant/components/esphome/update.py
@@ -23,7 +23,7 @@ from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util.enum import try_parse_enum
 
@@ -46,7 +46,7 @@ NO_FEATURES = UpdateEntityFeature(0)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up ESPHome update based on a config entry."""
     await platform_async_setup_entry(
diff --git a/homeassistant/components/etherscan/sensor.py b/homeassistant/components/etherscan/sensor.py
index e64b596a119..3e48307e8bf 100644
--- a/homeassistant/components/etherscan/sensor.py
+++ b/homeassistant/components/etherscan/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_ADDRESS, CONF_NAME, CONF_TOKEN
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/eufy/__init__.py b/homeassistant/components/eufy/__init__.py
index 8ebe3e08843..57f90503049 100644
--- a/homeassistant/components/eufy/__init__.py
+++ b/homeassistant/components/eufy/__init__.py
@@ -14,8 +14,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 DOMAIN = "eufy"
diff --git a/homeassistant/components/eufy/light.py b/homeassistant/components/eufy/light.py
index 95ad8a15d1c..dcce52612ee 100644
--- a/homeassistant/components/eufy/light.py
+++ b/homeassistant/components/eufy/light.py
@@ -16,7 +16,7 @@ from homeassistant.components.light import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.color as color_util
+from homeassistant.util import color as color_util
 
 EUFYHOME_MAX_KELVIN = 6500
 EUFYHOME_MIN_KELVIN = 2700
diff --git a/homeassistant/components/eufylife_ble/__init__.py b/homeassistant/components/eufylife_ble/__init__.py
index f66cf7df30d..8a58c50c8e4 100644
--- a/homeassistant/components/eufylife_ble/__init__.py
+++ b/homeassistant/components/eufylife_ble/__init__.py
@@ -6,17 +6,15 @@ from eufylife_ble_client import EufyLifeBLEDevice
 
 from homeassistant.components import bluetooth
 from homeassistant.components.bluetooth.match import ADDRESS, BluetoothCallbackMatcher
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_MODEL, EVENT_HOMEASSISTANT_STOP, Platform
 from homeassistant.core import Event, HomeAssistant, callback
 
-from .const import DOMAIN
-from .models import EufyLifeData
+from .models import EufyLifeConfigEntry, EufyLifeData
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: EufyLifeConfigEntry) -> bool:
     """Set up EufyLife device from a config entry."""
     address = entry.unique_id
     assert address is not None
@@ -45,11 +43,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         )
     )
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = EufyLifeData(
-        address,
-        model,
-        client,
-    )
+    entry.runtime_data = EufyLifeData(address, model, client)
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
@@ -63,9 +57,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: EufyLifeConfigEntry) -> bool:
     """Unload a config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/eufylife_ble/models.py b/homeassistant/components/eufylife_ble/models.py
index eb937fc4f3d..26154a74fac 100644
--- a/homeassistant/components/eufylife_ble/models.py
+++ b/homeassistant/components/eufylife_ble/models.py
@@ -6,6 +6,10 @@ from dataclasses import dataclass
 
 from eufylife_ble_client import EufyLifeBLEDevice
 
+from homeassistant.config_entries import ConfigEntry
+
+type EufyLifeConfigEntry = ConfigEntry[EufyLifeData]
+
 
 @dataclass
 class EufyLifeData:
diff --git a/homeassistant/components/eufylife_ble/sensor.py b/homeassistant/components/eufylife_ble/sensor.py
index 5e3ae64aabf..0c65be89879 100644
--- a/homeassistant/components/eufylife_ble/sensor.py
+++ b/homeassistant/components/eufylife_ble/sensor.py
@@ -6,7 +6,6 @@ from typing import Any
 
 from eufylife_ble_client import MODEL_TO_NAME
 
-from homeassistant import config_entries
 from homeassistant.components.bluetooth import async_address_present
 from homeassistant.components.sensor import (
     RestoreSensor,
@@ -17,22 +16,21 @@ from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN, UnitOfMass
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM
 
-from .const import DOMAIN
-from .models import EufyLifeData
+from .models import EufyLifeConfigEntry, EufyLifeData
 
 IGNORED_STATES = {STATE_UNAVAILABLE, STATE_UNKNOWN}
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: EufyLifeConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the EufyLife sensors."""
-    data: EufyLifeData = hass.data[DOMAIN][entry.entry_id]
+    data = entry.runtime_data
 
     entities = [
         EufyLifeWeightSensorEntity(data),
diff --git a/homeassistant/components/everlights/light.py b/homeassistant/components/everlights/light.py
index 2ba47978353..c153f01e83c 100644
--- a/homeassistant/components/everlights/light.py
+++ b/homeassistant/components/everlights/light.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from datetime import timedelta
 import logging
-from typing import Any
+from typing import Any, cast
 
 import pyeverlights
 import voluptuous as vol
@@ -21,11 +21,11 @@ from homeassistant.components.light import (
 from homeassistant.const import CONF_HOSTS
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.color as color_util
+from homeassistant.util import color as color_util
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -84,7 +84,7 @@ class EverLightsLight(LightEntity):
         api: pyeverlights.EverLights,
         channel: int,
         status: dict[str, Any],
-        effects,
+        effects: list[str],
     ) -> None:
         """Initialize the light."""
         self._api = api
@@ -106,8 +106,10 @@ class EverLightsLight(LightEntity):
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the light on."""
-        hs_color = kwargs.get(ATTR_HS_COLOR, self._attr_hs_color)
-        brightness = kwargs.get(ATTR_BRIGHTNESS, self._attr_brightness)
+        hs_color = cast(
+            tuple[float, float], kwargs.get(ATTR_HS_COLOR, self._attr_hs_color)
+        )
+        brightness = cast(int, kwargs.get(ATTR_BRIGHTNESS, self._attr_brightness))
         effect = kwargs.get(ATTR_EFFECT)
 
         if effect is not None:
@@ -116,7 +118,7 @@ class EverLightsLight(LightEntity):
             rgb = color_int_to_rgb(colors[0])
             hsv = color_util.color_RGB_to_hsv(*rgb)
             hs_color = hsv[:2]
-            brightness = hsv[2] / 100 * 255
+            brightness = round(hsv[2] / 100 * 255)
 
         else:
             rgb = color_util.color_hsv_to_RGB(
diff --git a/homeassistant/components/evil_genius_labs/__init__.py b/homeassistant/components/evil_genius_labs/__init__.py
index d5bc3a564a2..7fb7430a044 100644
--- a/homeassistant/components/evil_genius_labs/__init__.py
+++ b/homeassistant/components/evil_genius_labs/__init__.py
@@ -4,38 +4,32 @@ from __future__ import annotations
 
 import pyevilgenius
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import aiohttp_client
 
-from .const import DOMAIN
-from .coordinator import EvilGeniusUpdateCoordinator
+from .coordinator import EvilGeniusConfigEntry, EvilGeniusUpdateCoordinator
 
 PLATFORMS = [Platform.LIGHT]
 
 UPDATE_INTERVAL = 10
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: EvilGeniusConfigEntry) -> bool:
     """Set up Evil Genius Labs from a config entry."""
     coordinator = EvilGeniusUpdateCoordinator(
         hass,
-        entry.title,
+        entry,
         pyevilgenius.EvilGeniusDevice(
             entry.data["host"], aiohttp_client.async_get_clientsession(hass)
         ),
     )
     await coordinator.async_config_entry_first_refresh()
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+    entry.runtime_data = coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: EvilGeniusConfigEntry) -> bool:
     """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/evil_genius_labs/coordinator.py b/homeassistant/components/evil_genius_labs/coordinator.py
index 9f0f0df02af..202dcaf6ba7 100644
--- a/homeassistant/components/evil_genius_labs/coordinator.py
+++ b/homeassistant/components/evil_genius_labs/coordinator.py
@@ -10,11 +10,16 @@ from typing import cast
 from aiohttp import ContentTypeError
 import pyevilgenius
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 UPDATE_INTERVAL = 10
 
+_LOGGER = logging.getLogger(__name__)
+
+type EvilGeniusConfigEntry = ConfigEntry[EvilGeniusUpdateCoordinator]
+
 
 class EvilGeniusUpdateCoordinator(DataUpdateCoordinator[dict]):
     """Update coordinator for Evil Genius data."""
@@ -24,14 +29,18 @@ class EvilGeniusUpdateCoordinator(DataUpdateCoordinator[dict]):
     product: dict | None
 
     def __init__(
-        self, hass: HomeAssistant, name: str, client: pyevilgenius.EvilGeniusDevice
+        self,
+        hass: HomeAssistant,
+        entry: EvilGeniusConfigEntry,
+        client: pyevilgenius.EvilGeniusDevice,
     ) -> None:
         """Initialize the data update coordinator."""
         self.client = client
         super().__init__(
             hass,
-            logging.getLogger(__name__),
-            name=name,
+            _LOGGER,
+            config_entry=entry,
+            name=entry.title,
             update_interval=timedelta(seconds=UPDATE_INTERVAL),
         )
 
diff --git a/homeassistant/components/evil_genius_labs/diagnostics.py b/homeassistant/components/evil_genius_labs/diagnostics.py
index c9c79acc1bb..371e0c85b35 100644
--- a/homeassistant/components/evil_genius_labs/diagnostics.py
+++ b/homeassistant/components/evil_genius_labs/diagnostics.py
@@ -5,20 +5,18 @@ 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
 
-from .const import DOMAIN
-from .coordinator import EvilGeniusUpdateCoordinator
+from .coordinator import EvilGeniusConfigEntry
 
 TO_REDACT = {"wiFiSsidDefault", "wiFiSSID"}
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, config_entry: ConfigEntry
+    hass: HomeAssistant, config_entry: EvilGeniusConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    coordinator: EvilGeniusUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
 
     return {
         "info": async_redact_data(coordinator.info, TO_REDACT),
diff --git a/homeassistant/components/evil_genius_labs/light.py b/homeassistant/components/evil_genius_labs/light.py
index 3556672dcce..3dd9b763ae1 100644
--- a/homeassistant/components/evil_genius_labs/light.py
+++ b/homeassistant/components/evil_genius_labs/light.py
@@ -7,12 +7,10 @@ from typing import Any, cast
 
 from homeassistant.components import light
 from homeassistant.components.light import ColorMode, LightEntity, LightEntityFeature
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN
-from .coordinator import EvilGeniusUpdateCoordinator
+from .coordinator import EvilGeniusConfigEntry, EvilGeniusUpdateCoordinator
 from .entity import EvilGeniusEntity
 from .util import update_when_done
 
@@ -22,12 +20,11 @@ FIB_NO_EFFECT = "Solid Color"
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: EvilGeniusConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Evil Genius light platform."""
-    coordinator: EvilGeniusUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
-    async_add_entities([EvilGeniusLight(coordinator)])
+    async_add_entities([EvilGeniusLight(config_entry.runtime_data)])
 
 
 class EvilGeniusLight(EvilGeniusEntity, LightEntity):
diff --git a/homeassistant/components/evohome/__init__.py b/homeassistant/components/evohome/__init__.py
index 612131919d4..9dce352df30 100644
--- a/homeassistant/components/evohome/__init__.py
+++ b/homeassistant/components/evohome/__init__.py
@@ -2,64 +2,57 @@
 
 Such systems provide heating/cooling and DHW and include Evohome, Round Thermostat, and
 others.
+
+Note that the API used by this integration's client does not support cooling.
 """
 
 from __future__ import annotations
 
+from dataclasses import dataclass
 from datetime import timedelta
 import logging
-from typing import Any, Final
+from typing import Final
 
-import evohomeasync as ev1
-from evohomeasync.schema import SZ_SESSION_ID
-import evohomeasync2 as evo
-from evohomeasync2.schema.const import (
-    SZ_AUTO_WITH_RESET,
-    SZ_CAN_BE_TEMPORARY,
-    SZ_SYSTEM_MODE,
-    SZ_TIMING_MODE,
+import evohomeasync as ec1
+import evohomeasync2 as ec2
+from evohomeasync2.const import SZ_CAN_BE_TEMPORARY, SZ_SYSTEM_MODE, SZ_TIMING_MODE
+from evohomeasync2.schemas.const import (
+    S2_DURATION as SZ_DURATION,
+    S2_PERIOD as SZ_PERIOD,
+    SystemMode as EvoSystemMode,
 )
 import voluptuous as vol
 
 from homeassistant.const import (
     ATTR_ENTITY_ID,
+    ATTR_MODE,
     CONF_PASSWORD,
     CONF_SCAN_INTERVAL,
     CONF_USERNAME,
     Platform,
 )
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.service import verify_domain_control
-from homeassistant.helpers.storage import Store
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
-import homeassistant.util.dt as dt_util
+from homeassistant.util.hass_dict import HassKey
 
 from .const import (
-    ACCESS_TOKEN,
-    ACCESS_TOKEN_EXPIRES,
-    ATTR_DURATION_DAYS,
-    ATTR_DURATION_HOURS,
+    ATTR_DURATION,
     ATTR_DURATION_UNTIL,
-    ATTR_SYSTEM_MODE,
-    ATTR_ZONE_TEMP,
+    ATTR_PERIOD,
+    ATTR_SETPOINT,
     CONF_LOCATION_IDX,
     DOMAIN,
-    REFRESH_TOKEN,
     SCAN_INTERVAL_DEFAULT,
     SCAN_INTERVAL_MINIMUM,
-    STORAGE_KEY,
-    STORAGE_VER,
-    USER_DATA,
     EvoService,
 )
-from .coordinator import EvoBroker
-from .helpers import dt_aware_to_naive, dt_local_to_aware, handle_evo_exception
+from .coordinator import EvoDataUpdateCoordinator
+from .storage import TokenManager
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -88,7 +81,7 @@ RESET_ZONE_OVERRIDE_SCHEMA: Final = vol.Schema(
 SET_ZONE_OVERRIDE_SCHEMA: Final = vol.Schema(
     {
         vol.Required(ATTR_ENTITY_ID): cv.entity_id,
-        vol.Required(ATTR_ZONE_TEMP): vol.All(
+        vol.Required(ATTR_SETPOINT): vol.All(
             vol.Coerce(float), vol.Range(min=4.0, max=35.0)
         ),
         vol.Optional(ATTR_DURATION_UNTIL): vol.All(
@@ -97,177 +90,69 @@ SET_ZONE_OVERRIDE_SCHEMA: Final = vol.Schema(
     }
 )
 
+EVOHOME_KEY: HassKey[EvoData] = HassKey(DOMAIN)
 
-class EvoSession:
-    """Class for evohome client instantiation & authentication."""
 
-    def __init__(self, hass: HomeAssistant) -> None:
-        """Initialize the evohome broker and its data structure."""
+@dataclass
+class EvoData:
+    """Dataclass for storing evohome data."""
 
-        self.hass = hass
-
-        self._session = async_get_clientsession(hass)
-        self._store = Store[dict[str, Any]](hass, STORAGE_VER, STORAGE_KEY)
-
-        # the main client, which uses the newer API
-        self.client_v2: evo.EvohomeClient | None = None
-        self._tokens: dict[str, Any] = {}
-
-        # the older client can be used to obtain high-precision temps (only)
-        self.client_v1: ev1.EvohomeClient | None = None
-        self.session_id: str | None = None
-
-    async def authenticate(self, username: str, password: str) -> None:
-        """Check the user credentials against the web API.
-
-        Will raise evo.AuthenticationFailed if the credentials are invalid.
-        """
-
-        if (
-            self.client_v2 is None
-            or username != self.client_v2.username
-            or password != self.client_v2.password
-        ):
-            await self._load_auth_tokens(username)
-
-            client_v2 = evo.EvohomeClient(
-                username,
-                password,
-                **self._tokens,
-                session=self._session,
-            )
-
-        else:  # force a re-authentication
-            client_v2 = self.client_v2
-            client_v2._user_account = None  # noqa: SLF001
-
-        await client_v2.login()
-        self.client_v2 = client_v2  # only set attr if authentication succeeded
-
-        await self.save_auth_tokens()
-
-        self.client_v1 = ev1.EvohomeClient(
-            username,
-            password,
-            session_id=self.session_id,
-            session=self._session,
-        )
-
-    async def _load_auth_tokens(self, username: str) -> None:
-        """Load access tokens and session_id from the store and validate them.
-
-        Sets self._tokens and self._session_id to the latest values.
-        """
-
-        app_storage: dict[str, Any] = dict(await self._store.async_load() or {})
-
-        if app_storage.pop(CONF_USERNAME, None) != username:
-            # any tokens won't be valid, and store might be corrupt
-            await self._store.async_save({})
-
-            self.session_id = None
-            self._tokens = {}
-
-            return
-
-        # evohomeasync2 requires naive/local datetimes as strings
-        if app_storage.get(ACCESS_TOKEN_EXPIRES) is not None and (
-            expires := dt_util.parse_datetime(app_storage[ACCESS_TOKEN_EXPIRES])
-        ):
-            app_storage[ACCESS_TOKEN_EXPIRES] = dt_aware_to_naive(expires)
-
-        user_data: dict[str, str] = app_storage.pop(USER_DATA, {}) or {}
-
-        self.session_id = user_data.get(SZ_SESSION_ID)
-        self._tokens = app_storage
-
-    async def save_auth_tokens(self) -> None:
-        """Save access tokens and session_id to the store.
-
-        Sets self._tokens and self._session_id to the latest values.
-        """
-
-        if self.client_v2 is None:
-            await self._store.async_save({})
-            return
-
-        # evohomeasync2 uses naive/local datetimes
-        access_token_expires = dt_local_to_aware(
-            self.client_v2.access_token_expires  # type: ignore[arg-type]
-        )
-
-        self._tokens = {
-            CONF_USERNAME: self.client_v2.username,
-            REFRESH_TOKEN: self.client_v2.refresh_token,
-            ACCESS_TOKEN: self.client_v2.access_token,
-            ACCESS_TOKEN_EXPIRES: access_token_expires.isoformat(),
-        }
-
-        self.session_id = self.client_v1.broker.session_id if self.client_v1 else None
-
-        app_storage = self._tokens
-        if self.client_v1:
-            app_storage[USER_DATA] = {SZ_SESSION_ID: self.session_id}
-
-        await self._store.async_save(app_storage)
+    coordinator: EvoDataUpdateCoordinator
+    loc_idx: int
+    tcs: ec2.ControlSystem
 
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Evohome integration."""
 
-    sess = EvoSession(hass)
-
-    try:
-        await sess.authenticate(
-            config[DOMAIN][CONF_USERNAME],
-            config[DOMAIN][CONF_PASSWORD],
-        )
-
-    except (evo.AuthenticationFailed, evo.RequestFailed) as err:
-        handle_evo_exception(err)
-        return False
-
-    finally:
-        config[DOMAIN][CONF_PASSWORD] = "REDACTED"
-
-    broker = EvoBroker(sess)
-
-    if not broker.validate_location(
-        config[DOMAIN][CONF_LOCATION_IDX],
-    ):
-        return False
-
-    coordinator = DataUpdateCoordinator(
+    token_manager = TokenManager(
+        hass,
+        config[DOMAIN][CONF_USERNAME],
+        config[DOMAIN][CONF_PASSWORD],
+        async_get_clientsession(hass),
+    )
+    coordinator = EvoDataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=None,
+        ec2.EvohomeClient(token_manager),
         name=f"{DOMAIN}_coordinator",
         update_interval=config[DOMAIN][CONF_SCAN_INTERVAL],
-        update_method=broker.async_update,
+        location_idx=config[DOMAIN][CONF_LOCATION_IDX],
+        client_v1=ec1.EvohomeClient(token_manager),
     )
+
     await coordinator.async_register_shutdown()
+    await coordinator.async_first_refresh()
 
-    hass.data[DOMAIN] = {"broker": broker, "coordinator": coordinator}
+    if not coordinator.last_update_success:
+        _LOGGER.error(f"Failed to fetch initial data: {coordinator.last_exception}")  # noqa: G004
+        return False
 
-    # without a listener, _schedule_refresh() won't be invoked by _async_refresh()
-    coordinator.async_add_listener(lambda: None)
-    await coordinator.async_refresh()  # get initial state
+    assert coordinator.tcs is not None  # mypy
+
+    hass.data[EVOHOME_KEY] = EvoData(
+        coordinator=coordinator,
+        loc_idx=coordinator.loc_idx,
+        tcs=coordinator.tcs,
+    )
 
     hass.async_create_task(
         async_load_platform(hass, Platform.CLIMATE, DOMAIN, {}, config)
     )
-    if broker.tcs.hotwater:
+    if coordinator.tcs.hotwater:
         hass.async_create_task(
             async_load_platform(hass, Platform.WATER_HEATER, DOMAIN, {}, config)
         )
 
-    setup_service_functions(hass, broker)
+    setup_service_functions(hass, coordinator)
 
     return True
 
 
 @callback
-def setup_service_functions(hass: HomeAssistant, broker: EvoBroker) -> None:
+def setup_service_functions(
+    hass: HomeAssistant, coordinator: EvoDataUpdateCoordinator
+) -> None:
     """Set up the service handlers for the system/zone operating modes.
 
     Not all Honeywell TCC-compatible systems support all operating modes. In addition,
@@ -280,13 +165,15 @@ def setup_service_functions(hass: HomeAssistant, broker: EvoBroker) -> None:
     @verify_domain_control(hass, DOMAIN)
     async def force_refresh(call: ServiceCall) -> None:
         """Obtain the latest state data via the vendor's RESTful API."""
-        await broker.async_update()
+        await coordinator.async_refresh()
 
     @verify_domain_control(hass, DOMAIN)
     async def set_system_mode(call: ServiceCall) -> None:
         """Set the system mode."""
+        assert coordinator.tcs is not None  # mypy
+
         payload = {
-            "unique_id": broker.tcs.systemId,
+            "unique_id": coordinator.tcs.id,
             "service": call.service,
             "data": call.data,
         }
@@ -314,33 +201,39 @@ def setup_service_functions(hass: HomeAssistant, broker: EvoBroker) -> None:
 
         async_dispatcher_send(hass, DOMAIN, payload)
 
+    assert coordinator.tcs is not None  # mypy
+
     hass.services.async_register(DOMAIN, EvoService.REFRESH_SYSTEM, force_refresh)
 
     # Enumerate which operating modes are supported by this system
-    modes = broker.tcs.allowedSystemModes
+    modes = list(coordinator.tcs.allowed_system_modes)
 
     # Not all systems support "AutoWithReset": register this handler only if required
-    if [m[SZ_SYSTEM_MODE] for m in modes if m[SZ_SYSTEM_MODE] == SZ_AUTO_WITH_RESET]:
+    if any(
+        m[SZ_SYSTEM_MODE]
+        for m in modes
+        if m[SZ_SYSTEM_MODE] == EvoSystemMode.AUTO_WITH_RESET
+    ):
         hass.services.async_register(DOMAIN, EvoService.RESET_SYSTEM, set_system_mode)
 
     system_mode_schemas = []
-    modes = [m for m in modes if m[SZ_SYSTEM_MODE] != SZ_AUTO_WITH_RESET]
+    modes = [m for m in modes if m[SZ_SYSTEM_MODE] != EvoSystemMode.AUTO_WITH_RESET]
 
     # Permanent-only modes will use this schema
     perm_modes = [m[SZ_SYSTEM_MODE] for m in modes if not m[SZ_CAN_BE_TEMPORARY]]
     if perm_modes:  # any of: "Auto", "HeatingOff": permanent only
-        schema = vol.Schema({vol.Required(ATTR_SYSTEM_MODE): vol.In(perm_modes)})
+        schema = vol.Schema({vol.Required(ATTR_MODE): vol.In(perm_modes)})
         system_mode_schemas.append(schema)
 
     modes = [m for m in modes if m[SZ_CAN_BE_TEMPORARY]]
 
     # These modes are set for a number of hours (or indefinitely): use this schema
-    temp_modes = [m[SZ_SYSTEM_MODE] for m in modes if m[SZ_TIMING_MODE] == "Duration"]
+    temp_modes = [m[SZ_SYSTEM_MODE] for m in modes if m[SZ_TIMING_MODE] == SZ_DURATION]
     if temp_modes:  # any of: "AutoWithEco", permanent or for 0-24 hours
         schema = vol.Schema(
             {
-                vol.Required(ATTR_SYSTEM_MODE): vol.In(temp_modes),
-                vol.Optional(ATTR_DURATION_HOURS): vol.All(
+                vol.Required(ATTR_MODE): vol.In(temp_modes),
+                vol.Optional(ATTR_DURATION): vol.All(
                     cv.time_period,
                     vol.Range(min=timedelta(hours=0), max=timedelta(hours=24)),
                 ),
@@ -349,12 +242,12 @@ def setup_service_functions(hass: HomeAssistant, broker: EvoBroker) -> None:
         system_mode_schemas.append(schema)
 
     # These modes are set for a number of days (or indefinitely): use this schema
-    temp_modes = [m[SZ_SYSTEM_MODE] for m in modes if m[SZ_TIMING_MODE] == "Period"]
+    temp_modes = [m[SZ_SYSTEM_MODE] for m in modes if m[SZ_TIMING_MODE] == SZ_PERIOD]
     if temp_modes:  # any of: "Away", "Custom", "DayOff", permanent or for 1-99 days
         schema = vol.Schema(
             {
-                vol.Required(ATTR_SYSTEM_MODE): vol.In(temp_modes),
-                vol.Optional(ATTR_DURATION_DAYS): vol.All(
+                vol.Required(ATTR_MODE): vol.In(temp_modes),
+                vol.Optional(ATTR_PERIOD): vol.All(
                     cv.time_period,
                     vol.Range(min=timedelta(days=1), max=timedelta(days=99)),
                 ),
diff --git a/homeassistant/components/evohome/climate.py b/homeassistant/components/evohome/climate.py
index c71831fa4bc..b44dc9791b0 100644
--- a/homeassistant/components/evohome/climate.py
+++ b/homeassistant/components/evohome/climate.py
@@ -4,20 +4,20 @@ from __future__ import annotations
 
 from datetime import datetime, timedelta
 import logging
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 import evohomeasync2 as evo
-from evohomeasync2.schema.const import (
-    SZ_ACTIVE_FAULTS,
+from evohomeasync2.const import (
     SZ_SETPOINT_STATUS,
-    SZ_SYSTEM_ID,
     SZ_SYSTEM_MODE,
     SZ_SYSTEM_MODE_STATUS,
     SZ_TEMPERATURE_STATUS,
-    SZ_UNTIL,
-    SZ_ZONE_ID,
-    ZoneModelType,
-    ZoneType,
+)
+from evohomeasync2.schemas.const import (
+    SystemMode as EvoSystemMode,
+    ZoneMode as EvoZoneMode,
+    ZoneModelType as EvoZoneModelType,
+    ZoneType as EvoZoneType,
 )
 
 from homeassistant.components.climate import (
@@ -29,68 +29,46 @@ from homeassistant.components.climate import (
     ClimateEntityFeature,
     HVACMode,
 )
-from homeassistant.const import PRECISION_TENTHS, UnitOfTemperature
-from homeassistant.core import HomeAssistant
+from homeassistant.const import ATTR_MODE, PRECISION_TENTHS, UnitOfTemperature
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
+from . import EVOHOME_KEY
 from .const import (
-    ATTR_DURATION_DAYS,
-    ATTR_DURATION_HOURS,
+    ATTR_DURATION,
     ATTR_DURATION_UNTIL,
-    ATTR_SYSTEM_MODE,
-    ATTR_ZONE_TEMP,
-    DOMAIN,
-    EVO_AUTO,
-    EVO_AUTOECO,
-    EVO_AWAY,
-    EVO_CUSTOM,
-    EVO_DAYOFF,
-    EVO_FOLLOW,
-    EVO_HEATOFF,
-    EVO_PERMOVER,
-    EVO_RESET,
-    EVO_TEMPOVER,
+    ATTR_PERIOD,
+    ATTR_SETPOINT,
     EvoService,
 )
-from .entity import EvoChild, EvoDevice
-
-if TYPE_CHECKING:
-    from . import EvoBroker
-
+from .coordinator import EvoDataUpdateCoordinator
+from .entity import EvoChild, EvoEntity
 
 _LOGGER = logging.getLogger(__name__)
 
-PRESET_RESET = "Reset"  # reset all child zones to EVO_FOLLOW
+PRESET_RESET = "Reset"  # reset all child zones to EvoZoneMode.FOLLOW_SCHEDULE
 PRESET_CUSTOM = "Custom"
 
 TCS_PRESET_TO_HA = {
-    EVO_AWAY: PRESET_AWAY,
-    EVO_CUSTOM: PRESET_CUSTOM,
-    EVO_AUTOECO: PRESET_ECO,
-    EVO_DAYOFF: PRESET_HOME,
-    EVO_RESET: PRESET_RESET,
-}  # EVO_AUTO: None,
+    EvoSystemMode.AWAY: PRESET_AWAY,
+    EvoSystemMode.CUSTOM: PRESET_CUSTOM,
+    EvoSystemMode.AUTO_WITH_ECO: PRESET_ECO,
+    EvoSystemMode.DAY_OFF: PRESET_HOME,
+    EvoSystemMode.AUTO_WITH_RESET: PRESET_RESET,
+}  # EvoSystemMode.AUTO: None,
 
 HA_PRESET_TO_TCS = {v: k for k, v in TCS_PRESET_TO_HA.items()}
 
 EVO_PRESET_TO_HA = {
-    EVO_FOLLOW: PRESET_NONE,
-    EVO_TEMPOVER: "temporary",
-    EVO_PERMOVER: "permanent",
+    EvoZoneMode.FOLLOW_SCHEDULE: PRESET_NONE,
+    EvoZoneMode.TEMPORARY_OVERRIDE: "temporary",
+    EvoZoneMode.PERMANENT_OVERRIDE: "permanent",
 }
 HA_PRESET_TO_EVO = {v: k for k, v in EVO_PRESET_TO_HA.items()}
 
-STATE_ATTRS_TCS = [SZ_SYSTEM_ID, SZ_ACTIVE_FAULTS, SZ_SYSTEM_MODE_STATUS]
-STATE_ATTRS_ZONES = [
-    SZ_ZONE_ID,
-    SZ_ACTIVE_FAULTS,
-    SZ_SETPOINT_STATUS,
-    SZ_TEMPERATURE_STATUS,
-]
-
 
 async def async_setup_platform(
     hass: HomeAssistant,
@@ -102,32 +80,34 @@ async def async_setup_platform(
     if discovery_info is None:
         return
 
-    broker: EvoBroker = hass.data[DOMAIN]["broker"]
+    coordinator = hass.data[EVOHOME_KEY].coordinator
+    loc_idx = hass.data[EVOHOME_KEY].loc_idx
+    tcs = hass.data[EVOHOME_KEY].tcs
 
     _LOGGER.debug(
         "Found the Location/Controller (%s), id=%s, name=%s (location_idx=%s)",
-        broker.tcs.modelType,
-        broker.tcs.systemId,
-        broker.loc.name,
-        broker.loc_idx,
+        tcs.model,
+        tcs.id,
+        tcs.location.name,
+        loc_idx,
     )
 
-    entities: list[EvoClimateEntity] = [EvoController(broker, broker.tcs)]
+    entities: list[EvoController | EvoZone] = [EvoController(coordinator, tcs)]
 
-    for zone in broker.tcs.zones.values():
+    for zone in tcs.zones:
         if (
-            zone.modelType == ZoneModelType.HEATING_ZONE
-            or zone.zoneType == ZoneType.THERMOSTAT
+            zone.model == EvoZoneModelType.HEATING_ZONE
+            or zone.type == EvoZoneType.THERMOSTAT
         ):
             _LOGGER.debug(
                 "Adding: %s (%s), id=%s, name=%s",
-                zone.zoneType,
-                zone.modelType,
-                zone.zoneId,
+                zone.type,
+                zone.model,
+                zone.id,
                 zone.name,
             )
 
-            new_entity = EvoZone(broker, zone)
+            new_entity = EvoZone(coordinator, zone)
             entities.append(new_entity)
 
         else:
@@ -136,16 +116,19 @@ async def async_setup_platform(
                     "Ignoring: %s (%s), id=%s, name=%s: unknown/invalid zone type, "
                     "report as an issue if you feel this zone type should be supported"
                 ),
-                zone.zoneType,
-                zone.modelType,
-                zone.zoneId,
+                zone.type,
+                zone.model,
+                zone.id,
                 zone.name,
             )
 
-    async_add_entities(entities, update_before_add=True)
+    async_add_entities(entities)
+
+    for entity in entities:
+        await entity.update_attrs()
 
 
-class EvoClimateEntity(EvoDevice, ClimateEntity):
+class EvoClimateEntity(EvoEntity, ClimateEntity):
     """Base for any evohome-compatible climate entity (controller, zone)."""
 
     _attr_hvac_modes = [HVACMode.OFF, HVACMode.HEAT]
@@ -157,25 +140,29 @@ class EvoZone(EvoChild, EvoClimateEntity):
 
     _attr_preset_modes = list(HA_PRESET_TO_EVO)
 
-    _evo_device: evo.Zone  # mypy hint
+    _evo_device: evo.Zone
+    _evo_id_attr = "zone_id"
+    _evo_state_attr_names = (SZ_SETPOINT_STATUS, SZ_TEMPERATURE_STATUS)
 
-    def __init__(self, evo_broker: EvoBroker, evo_device: evo.Zone) -> None:
+    def __init__(
+        self, coordinator: EvoDataUpdateCoordinator, evo_device: evo.Zone
+    ) -> None:
         """Initialize an evohome-compatible heating zone."""
 
-        super().__init__(evo_broker, evo_device)
-        self._evo_id = evo_device.zoneId
+        super().__init__(coordinator, evo_device)
+        self._evo_id = evo_device.id
 
-        if evo_device.modelType.startswith("VisionProWifi"):
+        if evo_device.model.startswith("VisionProWifi"):
             # this system does not have a distinct ID for the zone
-            self._attr_unique_id = f"{evo_device.zoneId}z"
+            self._attr_unique_id = f"{evo_device.id}z"
         else:
-            self._attr_unique_id = evo_device.zoneId
+            self._attr_unique_id = evo_device.id
 
-        if evo_broker.client_v1:
+        if coordinator.client_v1:
             self._attr_precision = PRECISION_TENTHS
         else:
-            self._attr_precision = self._evo_device.setpointCapabilities[
-                "valueResolution"
+            self._attr_precision = self._evo_device.setpoint_capabilities[
+                "value_resolution"
             ]
 
         self._attr_supported_features = (
@@ -188,24 +175,24 @@ class EvoZone(EvoChild, EvoClimateEntity):
     async def async_zone_svc_request(self, service: str, data: dict[str, Any]) -> None:
         """Process a service request (setpoint override) for a zone."""
         if service == EvoService.RESET_ZONE_OVERRIDE:
-            await self._evo_broker.call_client_api(self._evo_device.reset_mode())
+            await self.coordinator.call_client_api(self._evo_device.reset())
             return
 
         # otherwise it is EvoService.SET_ZONE_OVERRIDE
-        temperature = max(min(data[ATTR_ZONE_TEMP], self.max_temp), self.min_temp)
+        temperature = max(min(data[ATTR_SETPOINT], self.max_temp), self.min_temp)
 
         if ATTR_DURATION_UNTIL in data:
             duration: timedelta = data[ATTR_DURATION_UNTIL]
             if duration.total_seconds() == 0:
                 await self._update_schedule()
-                until = dt_util.parse_datetime(self.setpoints.get("next_sp_from", ""))
+                until = self.setpoints.get("next_sp_from")
             else:
                 until = dt_util.now() + data[ATTR_DURATION_UNTIL]
         else:
             until = None  # indefinitely
 
         until = dt_util.as_utc(until) if until else None
-        await self._evo_broker.call_client_api(
+        await self.coordinator.call_client_api(
             self._evo_device.set_temperature(temperature, until=until)
         )
 
@@ -217,7 +204,7 @@ class EvoZone(EvoChild, EvoClimateEntity):
     @property
     def hvac_mode(self) -> HVACMode | None:
         """Return the current operating mode of a Zone."""
-        if self._evo_tcs.system_mode in (EVO_AWAY, EVO_HEATOFF):
+        if self._evo_tcs.mode in (EvoSystemMode.AWAY, EvoSystemMode.HEATING_OFF):
             return HVACMode.AUTO
         if self.target_temperature is None:
             return None
@@ -233,10 +220,8 @@ class EvoZone(EvoChild, EvoClimateEntity):
     @property
     def preset_mode(self) -> str | None:
         """Return the current preset mode, e.g., home, away, temp."""
-        if self._evo_tcs.system_mode in (EVO_AWAY, EVO_HEATOFF):
-            return TCS_PRESET_TO_HA.get(self._evo_tcs.system_mode)
-        if self._evo_device.mode is None:
-            return None
+        if self._evo_tcs.mode in (EvoSystemMode.AWAY, EvoSystemMode.HEATING_OFF):
+            return TCS_PRESET_TO_HA.get(self._evo_tcs.mode)
         return EVO_PRESET_TO_HA.get(self._evo_device.mode)
 
     @property
@@ -245,8 +230,6 @@ class EvoZone(EvoChild, EvoClimateEntity):
 
         The default is 5, but is user-configurable within 5-21 (in Celsius).
         """
-        if self._evo_device.min_heat_setpoint is None:
-            return 5
         return self._evo_device.min_heat_setpoint
 
     @property
@@ -255,33 +238,27 @@ class EvoZone(EvoChild, EvoClimateEntity):
 
         The default is 35, but is user-configurable within 21-35 (in Celsius).
         """
-        if self._evo_device.max_heat_setpoint is None:
-            return 35
         return self._evo_device.max_heat_setpoint
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set a new target temperature."""
 
-        assert self._evo_device.setpointStatus is not None  # mypy check
-
         temperature = kwargs["temperature"]
 
         if (until := kwargs.get("until")) is None:
-            if self._evo_device.mode == EVO_FOLLOW:
+            if self._evo_device.mode == EvoZoneMode.TEMPORARY_OVERRIDE:
+                until = self._evo_device.until
+            if self._evo_device.mode == EvoZoneMode.FOLLOW_SCHEDULE:
                 await self._update_schedule()
-                until = dt_util.parse_datetime(self.setpoints.get("next_sp_from", ""))
-            elif self._evo_device.mode == EVO_TEMPOVER:
-                until = dt_util.parse_datetime(
-                    self._evo_device.setpointStatus[SZ_UNTIL]
-                )
+                until = self.setpoints.get("next_sp_from")
 
         until = dt_util.as_utc(until) if until else None
-        await self._evo_broker.call_client_api(
+        await self.coordinator.call_client_api(
             self._evo_device.set_temperature(temperature, until=until)
         )
 
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
-        """Set a Zone to one of its native EVO_* operating modes.
+        """Set a Zone to one of its native operating modes.
 
         Zones inherit their _effective_ operating mode from their Controller.
 
@@ -298,41 +275,34 @@ class EvoZone(EvoChild, EvoClimateEntity):
         and 'Away', Zones to (by default) 12C.
         """
         if hvac_mode == HVACMode.OFF:
-            await self._evo_broker.call_client_api(
+            await self.coordinator.call_client_api(
                 self._evo_device.set_temperature(self.min_temp, until=None)
             )
         else:  # HVACMode.HEAT
-            await self._evo_broker.call_client_api(self._evo_device.reset_mode())
+            await self.coordinator.call_client_api(self._evo_device.reset())
 
     async def async_set_preset_mode(self, preset_mode: str) -> None:
         """Set the preset mode; if None, then revert to following the schedule."""
-        evo_preset_mode = HA_PRESET_TO_EVO.get(preset_mode, EVO_FOLLOW)
+        evo_preset_mode = HA_PRESET_TO_EVO.get(preset_mode, EvoZoneMode.FOLLOW_SCHEDULE)
 
-        if evo_preset_mode == EVO_FOLLOW:
-            await self._evo_broker.call_client_api(self._evo_device.reset_mode())
+        if evo_preset_mode == EvoZoneMode.FOLLOW_SCHEDULE:
+            await self.coordinator.call_client_api(self._evo_device.reset())
             return
 
-        if evo_preset_mode == EVO_TEMPOVER:
+        if evo_preset_mode == EvoZoneMode.TEMPORARY_OVERRIDE:
             await self._update_schedule()
-            until = dt_util.parse_datetime(self.setpoints.get("next_sp_from", ""))
-        else:  # EVO_PERMOVER
+            until = self.setpoints.get("next_sp_from")
+        else:  # EvoZoneMode.PERMANENT_OVERRIDE
             until = None
 
         temperature = self._evo_device.target_heat_temperature
         assert temperature is not None  # mypy check
 
         until = dt_util.as_utc(until) if until else None
-        await self._evo_broker.call_client_api(
+        await self.coordinator.call_client_api(
             self._evo_device.set_temperature(temperature, until=until)
         )
 
-    async def async_update(self) -> None:
-        """Get the latest state data for a Zone."""
-        await super().async_update()
-
-        for attr in STATE_ATTRS_ZONES:
-            self._device_state_attrs[attr] = getattr(self._evo_device, attr)
-
 
 class EvoController(EvoClimateEntity):
     """Base for any evohome-compatible controller.
@@ -347,18 +317,22 @@ class EvoController(EvoClimateEntity):
     _attr_icon = "mdi:thermostat"
     _attr_precision = PRECISION_TENTHS
 
-    _evo_device: evo.ControlSystem  # mypy hint
+    _evo_device: evo.ControlSystem
+    _evo_id_attr = "system_id"
+    _evo_state_attr_names = (SZ_SYSTEM_MODE_STATUS,)
 
-    def __init__(self, evo_broker: EvoBroker, evo_device: evo.ControlSystem) -> None:
+    def __init__(
+        self, coordinator: EvoDataUpdateCoordinator, evo_device: evo.ControlSystem
+    ) -> None:
         """Initialize an evohome-compatible controller."""
 
-        super().__init__(evo_broker, evo_device)
-        self._evo_id = evo_device.systemId
+        super().__init__(coordinator, evo_device)
+        self._evo_id = evo_device.id
 
-        self._attr_unique_id = evo_device.systemId
+        self._attr_unique_id = evo_device.id
         self._attr_name = evo_device.location.name
 
-        self._evo_modes = [m[SZ_SYSTEM_MODE] for m in evo_device.allowedSystemModes]
+        self._evo_modes = [m[SZ_SYSTEM_MODE] for m in evo_device.allowed_system_modes]
         self._attr_preset_modes = [
             TCS_PRESET_TO_HA[m] for m in self._evo_modes if m in list(TCS_PRESET_TO_HA)
         ]
@@ -374,34 +348,40 @@ class EvoController(EvoClimateEntity):
         Data validation is not required, it will have been done upstream.
         """
         if service == EvoService.SET_SYSTEM_MODE:
-            mode = data[ATTR_SYSTEM_MODE]
+            mode = data[ATTR_MODE]
         else:  # otherwise it is EvoService.RESET_SYSTEM
-            mode = EVO_RESET
+            mode = EvoSystemMode.AUTO_WITH_RESET
 
-        if ATTR_DURATION_DAYS in data:
+        if ATTR_PERIOD in data:
             until = dt_util.start_of_local_day()
-            until += data[ATTR_DURATION_DAYS]
+            until += data[ATTR_PERIOD]
 
-        elif ATTR_DURATION_HOURS in data:
-            until = dt_util.now() + data[ATTR_DURATION_HOURS]
+        elif ATTR_DURATION in data:
+            until = dt_util.now() + data[ATTR_DURATION]
 
         else:
             until = None
 
         await self._set_tcs_mode(mode, until=until)
 
-    async def _set_tcs_mode(self, mode: str, until: datetime | None = None) -> None:
-        """Set a Controller to any of its native EVO_* operating modes."""
+    async def _set_tcs_mode(
+        self, mode: EvoSystemMode, until: datetime | None = None
+    ) -> None:
+        """Set a Controller to any of its native operating modes."""
         until = dt_util.as_utc(until) if until else None
-        await self._evo_broker.call_client_api(
-            self._evo_device.set_mode(mode, until=until)  # type: ignore[arg-type]
+        await self.coordinator.call_client_api(
+            self._evo_device.set_mode(mode, until=until)
         )
 
     @property
     def hvac_mode(self) -> HVACMode:
         """Return the current operating mode of a Controller."""
-        evo_mode = self._evo_device.system_mode
-        return HVACMode.OFF if evo_mode in (EVO_HEATOFF, "Off") else HVACMode.HEAT
+        evo_mode = self._evo_device.mode
+        return (
+            HVACMode.OFF
+            if evo_mode in (EvoSystemMode.HEATING_OFF, EvoSystemMode.OFF)
+            else HVACMode.HEAT
+        )
 
     @property
     def current_temperature(self) -> float | None:
@@ -410,18 +390,14 @@ class EvoController(EvoClimateEntity):
         Controllers do not have a current temp, but one is expected by HA.
         """
         temps = [
-            z.temperature
-            for z in self._evo_device.zones.values()
-            if z.temperature is not None
+            z.temperature for z in self._evo_device.zones if z.temperature is not None
         ]
         return round(sum(temps) / len(temps), 1) if temps else None
 
     @property
     def preset_mode(self) -> str | None:
         """Return the current preset mode, e.g., home, away, temp."""
-        if not self._evo_device.system_mode:
-            return None
-        return TCS_PRESET_TO_HA.get(self._evo_device.system_mode)
+        return TCS_PRESET_TO_HA.get(self._evo_device.mode)
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Raise exception as Controllers don't have a target temperature."""
@@ -429,25 +405,40 @@ class EvoController(EvoClimateEntity):
 
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set an operating mode for a Controller."""
+
+        evo_mode: EvoSystemMode
+
         if hvac_mode == HVACMode.HEAT:
-            evo_mode = EVO_AUTO if EVO_AUTO in self._evo_modes else "Heat"
+            evo_mode = (
+                EvoSystemMode.AUTO
+                if EvoSystemMode.AUTO in self._evo_modes
+                else EvoSystemMode.HEAT
+            )
         elif hvac_mode == HVACMode.OFF:
-            evo_mode = EVO_HEATOFF if EVO_HEATOFF in self._evo_modes else "Off"
+            evo_mode = (
+                EvoSystemMode.HEATING_OFF
+                if EvoSystemMode.HEATING_OFF in self._evo_modes
+                else EvoSystemMode.OFF
+            )
         else:
             raise HomeAssistantError(f"Invalid hvac_mode: {hvac_mode}")
         await self._set_tcs_mode(evo_mode)
 
     async def async_set_preset_mode(self, preset_mode: str) -> None:
         """Set the preset mode; if None, then revert to 'Auto' mode."""
-        await self._set_tcs_mode(HA_PRESET_TO_TCS.get(preset_mode, EVO_AUTO))
+        await self._set_tcs_mode(HA_PRESET_TO_TCS.get(preset_mode, EvoSystemMode.AUTO))
 
-    async def async_update(self) -> None:
-        """Get the latest state data for a Controller."""
-        self._device_state_attrs = {}
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
 
-        attrs = self._device_state_attrs
-        for attr in STATE_ATTRS_TCS:
-            if attr == SZ_ACTIVE_FAULTS:
-                attrs["activeSystemFaults"] = getattr(self._evo_device, attr)
-            else:
-                attrs[attr] = getattr(self._evo_device, attr)
+        self._device_state_attrs = {
+            "activeSystemFaults": self._evo_device.active_faults
+            + self._evo_device.gateway.active_faults
+        }
+
+        super()._handle_coordinator_update()
+
+    async def update_attrs(self) -> None:
+        """Update the entity's extra state attrs."""
+        self._handle_coordinator_update()
diff --git a/homeassistant/components/evohome/const.py b/homeassistant/components/evohome/const.py
index 3ebe6954fea..9da5969df1e 100644
--- a/homeassistant/components/evohome/const.py
+++ b/homeassistant/components/evohome/const.py
@@ -11,41 +11,17 @@ DOMAIN: Final = "evohome"
 STORAGE_VER: Final = 1
 STORAGE_KEY: Final = DOMAIN
 
-# The Parent's (i.e. TCS, Controller) operating mode is one of:
-EVO_RESET: Final = "AutoWithReset"
-EVO_AUTO: Final = "Auto"
-EVO_AUTOECO: Final = "AutoWithEco"
-EVO_AWAY: Final = "Away"
-EVO_DAYOFF: Final = "DayOff"
-EVO_CUSTOM: Final = "Custom"
-EVO_HEATOFF: Final = "HeatingOff"
-
-# The Children's (i.e. Dhw, Zone) operating mode is one of:
-EVO_FOLLOW: Final = "FollowSchedule"  # the operating mode is 'inherited' from the TCS
-EVO_TEMPOVER: Final = "TemporaryOverride"
-EVO_PERMOVER: Final = "PermanentOverride"
-
-# These two are used only to help prevent E501 (line too long) violations
-GWS: Final = "gateways"
-TCS: Final = "temperatureControlSystems"
-
-UTC_OFFSET: Final = "currentOffsetMinutes"
-
 CONF_LOCATION_IDX: Final = "location_idx"
 
-ACCESS_TOKEN: Final = "access_token"
-ACCESS_TOKEN_EXPIRES: Final = "access_token_expires"
-REFRESH_TOKEN: Final = "refresh_token"
 USER_DATA: Final = "user_data"
 
 SCAN_INTERVAL_DEFAULT: Final = timedelta(seconds=300)
 SCAN_INTERVAL_MINIMUM: Final = timedelta(seconds=60)
 
-ATTR_SYSTEM_MODE: Final = "mode"
-ATTR_DURATION_DAYS: Final = "period"
-ATTR_DURATION_HOURS: Final = "duration"
+ATTR_PERIOD: Final = "period"  # number of days
+ATTR_DURATION: Final = "duration"  # number of minutes, <24h
 
-ATTR_ZONE_TEMP: Final = "setpoint"
+ATTR_SETPOINT: Final = "setpoint"
 ATTR_DURATION_UNTIL: Final = "duration"
 
 
diff --git a/homeassistant/components/evohome/coordinator.py b/homeassistant/components/evohome/coordinator.py
index 943bd6605b4..33af90089a4 100644
--- a/homeassistant/components/evohome/coordinator.py
+++ b/homeassistant/components/evohome/coordinator.py
@@ -4,109 +4,147 @@ from __future__ import annotations
 
 from collections.abc import Awaitable
 from datetime import timedelta
+from http import HTTPStatus
 import logging
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
-import evohomeasync as ev1
-from evohomeasync.schema import SZ_ID, SZ_TEMP
-import evohomeasync2 as evo
-from evohomeasync2.schema.const import (
+import evohomeasync as ec1
+import evohomeasync2 as ec2
+from evohomeasync2.const import (
+    SZ_DHW,
     SZ_GATEWAY_ID,
     SZ_GATEWAY_INFO,
+    SZ_GATEWAYS,
     SZ_LOCATION_ID,
     SZ_LOCATION_INFO,
+    SZ_TEMPERATURE_CONTROL_SYSTEMS,
     SZ_TIME_ZONE,
+    SZ_USE_DAYLIGHT_SAVE_SWITCHING,
+    SZ_ZONES,
 )
+from evohomeasync2.schemas.typedefs import EvoLocStatusResponseT, EvoTcsConfigResponseT
 
-from homeassistant.helpers.dispatcher import async_dispatcher_send
-
-from .const import CONF_LOCATION_IDX, DOMAIN, GWS, TCS, UTC_OFFSET
-from .helpers import handle_evo_exception
-
-if TYPE_CHECKING:
-    from . import EvoSession
-
-_LOGGER = logging.getLogger(__name__.rpartition(".")[0])
+from homeassistant.const import CONF_SCAN_INTERVAL
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 
-class EvoBroker:
-    """Broker for evohome client broker."""
+class EvoDataUpdateCoordinator(DataUpdateCoordinator):
+    """Coordinator for evohome integration/client."""
 
-    loc_idx: int
-    loc: evo.Location
-    loc_utc_offset: timedelta
-    tcs: evo.ControlSystem
+    # These will not be None after _async_setup())
+    loc: ec2.Location
+    tcs: ec2.ControlSystem
 
-    def __init__(self, sess: EvoSession) -> None:
-        """Initialize the evohome broker and its data structure."""
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        logger: logging.Logger,
+        client_v2: ec2.EvohomeClient,
+        *,
+        name: str,
+        update_interval: timedelta,
+        location_idx: int,
+        client_v1: ec1.EvohomeClient | None = None,
+    ) -> None:
+        """Class to manage fetching data."""
 
-        self._sess = sess
-        self.hass = sess.hass
+        super().__init__(
+            hass,
+            logger,
+            config_entry=None,
+            name=name,
+            update_interval=update_interval,
+        )
 
-        assert sess.client_v2 is not None  # mypy
+        self.client = client_v2
+        self.client_v1 = client_v1
 
-        self.client = sess.client_v2
-        self.client_v1 = sess.client_v1
+        self.loc_idx = location_idx
 
+        self.data: EvoLocStatusResponseT = None  # type: ignore[assignment]
         self.temps: dict[str, float | None] = {}
 
-    def validate_location(self, loc_idx: int) -> bool:
-        """Get the default TCS of the specified location."""
+        self._first_refresh_done = False  # get schedules only after first refresh
 
-        self.loc_idx = loc_idx
+    # our version of async_config_entry_first_refresh()...
+    async def async_first_refresh(self) -> None:
+        """Refresh data for the first time when integration is setup.
 
-        assert self.client.installation_info is not None  # mypy
+        This integration does not have config flow, so it is inappropriate to
+        invoke `async_config_entry_first_refresh()`.
+        """
+
+        # can't replicate `if not await self.__wrap_async_setup():` (is mangled), so...
+        if not await self._DataUpdateCoordinator__wrap_async_setup():  # type: ignore[attr-defined]
+            return
+
+        await self._async_refresh(
+            log_failures=False, raise_on_auth_failed=True, raise_on_entry_error=True
+        )
+
+    async def _async_setup(self) -> None:
+        """Set up the coordinator.
+
+        Fetch the user information, and the configuration of their locations.
+        """
 
         try:
-            loc_config = self.client.installation_info[loc_idx]
-        except IndexError:
-            _LOGGER.error(
-                (
-                    "Config error: '%s' = %s, but the valid range is 0-%s. "
-                    "Unable to continue. Fix any configuration errors and restart HA"
-                ),
-                CONF_LOCATION_IDX,
-                loc_idx,
-                len(self.client.installation_info) - 1,
-            )
-            return False
+            await self.client.update(dont_update_status=True)  # only config for now
+        except ec2.EvohomeError as err:
+            raise UpdateFailed(err) from err
 
-        self.loc = self.client.locations[loc_idx]
-        self.loc_utc_offset = timedelta(minutes=self.loc.timeZone[UTC_OFFSET])
-        self.tcs = self.loc._gateways[0]._control_systems[0]  # noqa: SLF001
+        try:
+            self.loc = self.client.locations[self.loc_idx]
+        except IndexError as err:
+            raise UpdateFailed(
+                f"""
+                    Config error: 'location_idx' = {self.loc_idx},
+                    but the valid range is 0-{len(self.client.locations) - 1}.
+                    Unable to continue. Fix any configuration errors and restart HA
+                """
+            ) from err
 
-        if _LOGGER.isEnabledFor(logging.DEBUG):
+        self.tcs = self.loc.gateways[0].systems[0]
+
+        if self.logger.isEnabledFor(logging.DEBUG):
             loc_info = {
-                SZ_LOCATION_ID: loc_config[SZ_LOCATION_INFO][SZ_LOCATION_ID],
-                SZ_TIME_ZONE: loc_config[SZ_LOCATION_INFO][SZ_TIME_ZONE],
+                SZ_LOCATION_ID: self.loc.id,
+                SZ_TIME_ZONE: self.loc.config[SZ_TIME_ZONE],
+                SZ_USE_DAYLIGHT_SAVE_SWITCHING: self.loc.config[
+                    SZ_USE_DAYLIGHT_SAVE_SWITCHING
+                ],
             }
+            tcs_info: EvoTcsConfigResponseT = self.tcs.config  # type: ignore[assignment]
+            tcs_info[SZ_ZONES] = [zone.config for zone in self.tcs.zones]
+            if self.tcs.hotwater:
+                tcs_info[SZ_DHW] = self.tcs.hotwater.config
             gwy_info = {
-                SZ_GATEWAY_ID: loc_config[GWS][0][SZ_GATEWAY_INFO][SZ_GATEWAY_ID],
-                TCS: loc_config[GWS][0][TCS],
+                SZ_GATEWAY_ID: self.loc.gateways[0].id,
+                SZ_TEMPERATURE_CONTROL_SYSTEMS: [tcs_info],
             }
             config = {
                 SZ_LOCATION_INFO: loc_info,
-                GWS: [{SZ_GATEWAY_INFO: gwy_info}],
+                SZ_GATEWAYS: [{SZ_GATEWAY_INFO: gwy_info}],
             }
-            _LOGGER.debug("Config = %s", config)
-
-        return True
+            self.logger.debug("Config = %s", [config])
 
     async def call_client_api(
         self,
         client_api: Awaitable[dict[str, Any] | None],
-        update_state: bool = True,
+        request_refresh: bool = True,
     ) -> dict[str, Any] | None:
-        """Call a client API and update the broker state if required."""
+        """Call a client API and update the Coordinator state if required."""
 
         try:
             result = await client_api
-        except evo.RequestFailed as err:
-            handle_evo_exception(err)
+
+        except ec2.ApiRequestFailedError as err:
+            self.logger.error(err)
             return None
 
-        if update_state:  # wait a moment for system to quiesce before updating state
-            await self.hass.data[DOMAIN]["coordinator"].async_request_refresh()
+        if request_refresh:  # wait a moment for system to quiesce before updating state
+            await self.async_request_refresh()  # hass.async_create_task() won't help
 
         return result
 
@@ -115,80 +153,90 @@ class EvoBroker:
 
         assert self.client_v1 is not None  # mypy check
 
-        old_session_id = self._sess.session_id
-
         try:
-            temps = await self.client_v1.get_temperatures()
+            await self.client_v1.update()
 
-        except ev1.InvalidSchema as err:
-            _LOGGER.warning(
+        except ec1.BadUserCredentialsError as err:
+            self.logger.warning(
                 (
                     "Unable to obtain high-precision temperatures. "
-                    "It appears the JSON schema is not as expected, "
-                    "so the high-precision feature will be disabled until next restart."
-                    "Message is: %s"
+                    "The feature will be disabled until next restart: %r"
                 ),
                 err,
             )
             self.client_v1 = None
 
-        except ev1.RequestFailed as err:
-            _LOGGER.warning(
+        except ec1.EvohomeError as err:
+            self.logger.warning(
                 (
                     "Unable to obtain the latest high-precision temperatures. "
-                    "Check your network and the vendor's service status page. "
-                    "Proceeding without high-precision temperatures for now. "
-                    "Message is: %s"
+                    "They will be ignored this refresh cycle: %r"
                 ),
                 err,
             )
             self.temps = {}  # high-precision temps now considered stale
 
-        except Exception:
-            self.temps = {}  # high-precision temps now considered stale
-            raise
-
         else:
-            if str(self.client_v1.location_id) != self.loc.locationId:
-                _LOGGER.warning(
-                    "The v2 API's configured location doesn't match "
-                    "the v1 API's default location (there is more than one location), "
-                    "so the high-precision feature will be disabled until next restart"
-                )
-                self.client_v1 = None
-            else:
-                self.temps = {str(i[SZ_ID]): i[SZ_TEMP] for i in temps}
+            self.temps = await self.client_v1.location_by_id[
+                self.loc.id
+            ].get_temperatures(dont_update_status=True)
 
-        finally:
-            if self.client_v1 and self.client_v1.broker.session_id != old_session_id:
-                await self._sess.save_auth_tokens()
-
-        _LOGGER.debug("Temperatures = %s", self.temps)
+        self.logger.debug("Status (high-res temps) = %s", self.temps)
 
     async def _update_v2_api_state(self, *args: Any) -> None:
         """Get the latest modes, temperatures, setpoints of a Location."""
 
-        access_token = self.client.access_token  # maybe receive a new token?
-
         try:
-            status = await self.loc.refresh_status()
-        except evo.RequestFailed as err:
-            handle_evo_exception(err)
-        else:
-            async_dispatcher_send(self.hass, DOMAIN)
-            _LOGGER.debug("Status = %s", status)
-        finally:
-            if access_token != self.client.access_token:
-                await self._sess.save_auth_tokens()
+            status = await self.loc.update()
 
-    async def async_update(self, *args: Any) -> None:
-        """Get the latest state data of an entire Honeywell TCC Location.
+        except ec2.ApiRequestFailedError as err:
+            if err.status != HTTPStatus.TOO_MANY_REQUESTS:
+                raise UpdateFailed(err) from err
+
+            raise UpdateFailed(
+                f"""
+                    The vendor's API rate limit has been exceeded.
+                    Consider increasing the {CONF_SCAN_INTERVAL}
+                """
+            ) from err
+
+        except ec2.EvohomeError as err:
+            raise UpdateFailed(err) from err
+
+        self.logger.debug("Status = %s", status)
+
+    async def _update_v2_schedules(self) -> None:
+        for zone in self.tcs.zones:
+            try:
+                await zone.get_schedule()
+            except ec2.InvalidScheduleError as err:
+                self.logger.warning(
+                    "Zone '%s' has an invalid/missing schedule: %r", zone.name, err
+                )
+
+        if dhw := self.tcs.hotwater:
+            try:
+                await dhw.get_schedule()
+            except ec2.InvalidScheduleError as err:
+                self.logger.warning("DHW has an invalid/missing schedule: %r", err)
+
+    async def _async_update_data(self) -> EvoLocStatusResponseT:  # type: ignore[override]
+        """Fetch the latest state of an entire TCC Location.
 
         This includes state data for a Controller and all its child devices, such as the
         operating mode of the Controller and the current temp of its children (e.g.
         Zones, DHW controller).
         """
-        await self._update_v2_api_state()
 
+        await self._update_v2_api_state()  # may raise UpdateFailed
         if self.client_v1:
-            await self._update_v1_api_temps()
+            await self._update_v1_api_temps()  # will never raise UpdateFailed
+
+        # to speed up HA startup, don't update entity schedules during initial
+        # async_first_refresh(), only during subsequent async_refresh()...
+        if self._first_refresh_done:
+            await self._update_v2_schedules()
+        else:
+            self._first_refresh_done = True
+
+        return self.loc.status
diff --git a/homeassistant/components/evohome/entity.py b/homeassistant/components/evohome/entity.py
index b5842c1073a..2f93f0fb143 100644
--- a/homeassistant/components/evohome/entity.py
+++ b/homeassistant/components/evohome/entity.py
@@ -1,55 +1,50 @@
 """Base for evohome entity."""
 
-from datetime import datetime, timedelta, timezone
+from collections.abc import Mapping
+from datetime import UTC, datetime
 import logging
 from typing import Any
 
 import evohomeasync2 as evo
-from evohomeasync2.schema.const import (
-    SZ_HEAT_SETPOINT,
-    SZ_SETPOINT_STATUS,
-    SZ_STATE_STATUS,
-    SZ_SYSTEM_MODE_STATUS,
-    SZ_TIME_UNTIL,
-    SZ_UNTIL,
-)
+from evohomeasync2.schemas.typedefs import DayOfWeekDhwT
 
+from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity import Entity
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import EvoBroker, EvoService
-from .const import DOMAIN
-from .helpers import convert_dict, convert_until
+from .const import DOMAIN, EvoService
+from .coordinator import EvoDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class EvoDevice(Entity):
+class EvoEntity(CoordinatorEntity[EvoDataUpdateCoordinator]):
     """Base for any evohome-compatible entity (controller, DHW, zone).
 
     This includes the controller, (1 to 12) heating zones and (optionally) a
     DHW controller.
     """
 
-    _attr_should_poll = False
+    _evo_device: evo.ControlSystem | evo.HotWater | evo.Zone
+    _evo_id_attr: str
+    _evo_state_attr_names: tuple[str, ...]
 
     def __init__(
         self,
-        evo_broker: EvoBroker,
+        coordinator: EvoDataUpdateCoordinator,
         evo_device: evo.ControlSystem | evo.HotWater | evo.Zone,
     ) -> None:
         """Initialize an evohome-compatible entity (TCS, DHW, zone)."""
+        super().__init__(coordinator, context=evo_device.id)
         self._evo_device = evo_device
-        self._evo_broker = evo_broker
 
         self._device_state_attrs: dict[str, Any] = {}
 
-    async def async_refresh(self, payload: dict | None = None) -> None:
+    async def process_signal(self, payload: dict | None = None) -> None:
         """Process any signals."""
+
         if payload is None:
-            self.async_schedule_update_ha_state(force_refresh=True)
-            return
+            raise NotImplementedError
         if payload["unique_id"] != self._attr_unique_id:
             return
         if payload["service"] in (
@@ -69,40 +64,46 @@ class EvoDevice(Entity):
         raise NotImplementedError
 
     @property
-    def extra_state_attributes(self) -> dict[str, Any]:
+    def extra_state_attributes(self) -> Mapping[str, Any]:
         """Return the evohome-specific state attributes."""
-        status = self._device_state_attrs
-        if SZ_SYSTEM_MODE_STATUS in status:
-            convert_until(status[SZ_SYSTEM_MODE_STATUS], SZ_TIME_UNTIL)
-        if SZ_SETPOINT_STATUS in status:
-            convert_until(status[SZ_SETPOINT_STATUS], SZ_UNTIL)
-        if SZ_STATE_STATUS in status:
-            convert_until(status[SZ_STATE_STATUS], SZ_UNTIL)
-
-        return {"status": convert_dict(status)}
+        return {"status": self._device_state_attrs}
 
     async def async_added_to_hass(self) -> None:
         """Run when entity about to be added to hass."""
-        async_dispatcher_connect(self.hass, DOMAIN, self.async_refresh)
+        await super().async_added_to_hass()
+
+        async_dispatcher_connect(self.hass, DOMAIN, self.process_signal)
+
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
+
+        self._device_state_attrs[self._evo_id_attr] = self._evo_device.id
+
+        for attr in self._evo_state_attr_names:
+            self._device_state_attrs[attr] = getattr(self._evo_device, attr)
+
+        super()._handle_coordinator_update()
 
 
-class EvoChild(EvoDevice):
+class EvoChild(EvoEntity):
     """Base for any evohome-compatible child entity (DHW, zone).
 
     This includes (1 to 12) heating zones and (optionally) a DHW controller.
     """
 
-    _evo_id: str  # mypy hint
+    _evo_device: evo.HotWater | evo.Zone
+    _evo_id: str
 
     def __init__(
-        self, evo_broker: EvoBroker, evo_device: evo.HotWater | evo.Zone
+        self, coordinator: EvoDataUpdateCoordinator, evo_device: evo.HotWater | evo.Zone
     ) -> None:
         """Initialize an evohome-compatible child entity (DHW, zone)."""
-        super().__init__(evo_broker, evo_device)
+        super().__init__(coordinator, evo_device)
 
         self._evo_tcs = evo_device.tcs
 
-        self._schedule: dict[str, Any] = {}
+        self._schedule: list[DayOfWeekDhwT] | None = None
         self._setpoints: dict[str, Any] = {}
 
     @property
@@ -111,101 +112,81 @@ class EvoChild(EvoDevice):
 
         assert isinstance(self._evo_device, evo.HotWater | evo.Zone)  # mypy check
 
-        if (temp := self._evo_broker.temps.get(self._evo_id)) is not None:
+        if (temp := self.coordinator.temps.get(self._evo_id)) is not None:
             # use high-precision temps if available
             return temp
         return self._evo_device.temperature
 
     @property
-    def setpoints(self) -> dict[str, Any]:
+    def setpoints(self) -> Mapping[str, Any]:
         """Return the current/next setpoints from the schedule.
 
         Only Zones & DHW controllers (but not the TCS) can have schedules.
         """
 
-        def _dt_evo_to_aware(dt_naive: datetime, utc_offset: timedelta) -> datetime:
-            dt_aware = dt_naive.replace(tzinfo=dt_util.UTC) - utc_offset
-            return dt_util.as_local(dt_aware)
+        if not self._schedule:
+            return self._setpoints
 
-        if not (schedule := self._schedule.get("DailySchedules")):
-            return {}  # no scheduled setpoints when {'DailySchedules': []}
+        this_sp_dtm, this_sp_val = self._evo_device.this_switchpoint
+        next_sp_dtm, next_sp_val = self._evo_device.next_switchpoint
 
-        # get dt in the same TZ as the TCS location, so we can compare schedule times
-        day_time = dt_util.now().astimezone(timezone(self._evo_broker.loc_utc_offset))
-        day_of_week = day_time.weekday()  # for evohome, 0 is Monday
-        time_of_day = day_time.strftime("%H:%M:%S")
+        key = "temp" if isinstance(self._evo_device, evo.Zone) else "state"
 
-        try:
-            # Iterate today's switchpoints until past the current time of day...
-            day = schedule[day_of_week]
-            sp_idx = -1  # last switchpoint of the day before
-            for i, tmp in enumerate(day["Switchpoints"]):
-                if time_of_day > tmp["TimeOfDay"]:
-                    sp_idx = i  # current setpoint
-                else:
-                    break
-
-            # Did this setpoint start yesterday? Does the next setpoint start tomorrow?
-            this_sp_day = -1 if sp_idx == -1 else 0
-            next_sp_day = 1 if sp_idx + 1 == len(day["Switchpoints"]) else 0
-
-            for key, offset, idx in (
-                ("this", this_sp_day, sp_idx),
-                ("next", next_sp_day, (sp_idx + 1) * (1 - next_sp_day)),
-            ):
-                sp_date = (day_time + timedelta(days=offset)).strftime("%Y-%m-%d")
-                day = schedule[(day_of_week + offset) % 7]
-                switchpoint = day["Switchpoints"][idx]
-
-                switchpoint_time_of_day = dt_util.parse_datetime(
-                    f"{sp_date}T{switchpoint['TimeOfDay']}"
-                )
-                assert switchpoint_time_of_day is not None  # mypy check
-                dt_aware = _dt_evo_to_aware(
-                    switchpoint_time_of_day, self._evo_broker.loc_utc_offset
-                )
-
-                self._setpoints[f"{key}_sp_from"] = dt_aware.isoformat()
-                try:
-                    self._setpoints[f"{key}_sp_temp"] = switchpoint[SZ_HEAT_SETPOINT]
-                except KeyError:
-                    self._setpoints[f"{key}_sp_state"] = switchpoint["DhwState"]
-
-        except IndexError:
-            self._setpoints = {}
-            _LOGGER.warning(
-                "Failed to get setpoints, report as an issue if this error persists",
-                exc_info=True,
-            )
+        self._setpoints = {
+            "this_sp_from": this_sp_dtm,
+            f"this_sp_{key}": this_sp_val,
+            "next_sp_from": next_sp_dtm,
+            f"next_sp_{key}": next_sp_val,
+        }
 
         return self._setpoints
 
-    async def _update_schedule(self) -> None:
+    async def _update_schedule(self, force_refresh: bool = False) -> None:
         """Get the latest schedule, if any."""
 
-        assert isinstance(self._evo_device, evo.HotWater | evo.Zone)  # mypy check
+        async def get_schedule() -> None:
+            try:
+                schedule = await self.coordinator.call_client_api(
+                    self._evo_device.get_schedule(),  # type: ignore[arg-type]
+                    request_refresh=False,
+                )
+            except evo.InvalidScheduleError as err:
+                _LOGGER.warning(
+                    "%s: Unable to retrieve a valid schedule: %s",
+                    self._evo_device,
+                    err,
+                )
+                self._schedule = []
+                return
+            else:
+                self._schedule = schedule  # type: ignore[assignment]
 
-        try:
-            schedule = await self._evo_broker.call_client_api(
-                self._evo_device.get_schedule(), update_state=False
+            _LOGGER.debug("Schedule['%s'] = %s", self.name, schedule)
+
+        if (
+            force_refresh
+            or self._schedule is None
+            or (
+                (until := self._setpoints.get("next_sp_from")) is not None
+                and until < datetime.now(UTC)
             )
-        except evo.InvalidSchedule as err:
-            _LOGGER.warning(
-                "%s: Unable to retrieve a valid schedule: %s",
-                self._evo_device,
-                err,
-            )
-            self._schedule = {}
-        else:
-            self._schedule = schedule or {}
+        ):  # must use self._setpoints, not self.setpoints
+            await get_schedule()
 
-        _LOGGER.debug("Schedule['%s'] = %s", self.name, self._schedule)
+        _ = self.setpoints  # update the setpoints attr
 
-    async def async_update(self) -> None:
-        """Get the latest state data."""
-        next_sp_from = self._setpoints.get("next_sp_from", "2000-01-01T00:00:00+00:00")
-        next_sp_from_dt = dt_util.parse_datetime(next_sp_from)
-        if next_sp_from_dt is None or dt_util.now() >= next_sp_from_dt:
-            await self._update_schedule()  # no schedule, or it's out-of-date
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
 
-        self._device_state_attrs = {"setpoints": self.setpoints}
+        self._device_state_attrs = {
+            "activeFaults": self._evo_device.active_faults,
+            "setpoints": self._setpoints,
+        }
+
+        super()._handle_coordinator_update()
+
+    async def update_attrs(self) -> None:
+        """Update the entity's extra state attrs."""
+        await self._update_schedule()
+        self._handle_coordinator_update()
diff --git a/homeassistant/components/evohome/helpers.py b/homeassistant/components/evohome/helpers.py
deleted file mode 100644
index f84d2945779..00000000000
--- a/homeassistant/components/evohome/helpers.py
+++ /dev/null
@@ -1,110 +0,0 @@
-"""Support for (EMEA/EU-based) Honeywell TCC systems."""
-
-from __future__ import annotations
-
-from datetime import datetime, timedelta
-from http import HTTPStatus
-import logging
-import re
-from typing import Any
-
-import evohomeasync2 as evo
-
-from homeassistant.const import CONF_SCAN_INTERVAL
-import homeassistant.util.dt as dt_util
-
-_LOGGER = logging.getLogger(__name__)
-
-
-def dt_local_to_aware(dt_naive: datetime) -> datetime:
-    """Convert a local/naive datetime to TZ-aware."""
-    dt_aware = dt_util.now() + (dt_naive - datetime.now())
-    if dt_aware.microsecond >= 500000:
-        dt_aware += timedelta(seconds=1)
-    return dt_aware.replace(microsecond=0)
-
-
-def dt_aware_to_naive(dt_aware: datetime) -> datetime:
-    """Convert a TZ-aware datetime to naive/local."""
-    dt_naive = datetime.now() + (dt_aware - dt_util.now())
-    if dt_naive.microsecond >= 500000:
-        dt_naive += timedelta(seconds=1)
-    return dt_naive.replace(microsecond=0)
-
-
-def convert_until(status_dict: dict, until_key: str) -> None:
-    """Reformat a dt str from "%Y-%m-%dT%H:%M:%SZ" as local/aware/isoformat."""
-    if until_key in status_dict and (  # only present for certain modes
-        dt_utc_naive := dt_util.parse_datetime(status_dict[until_key])
-    ):
-        status_dict[until_key] = dt_util.as_local(dt_utc_naive).isoformat()
-
-
-def convert_dict(dictionary: dict[str, Any]) -> dict[str, Any]:
-    """Recursively convert a dict's keys to snake_case."""
-
-    def convert_key(key: str) -> str:
-        """Convert a string to snake_case."""
-        string = re.sub(r"[\-\.\s]", "_", str(key))
-        return (
-            (string[0]).lower()
-            + re.sub(
-                r"[A-Z]",
-                lambda matched: f"_{matched.group(0).lower()}",  # type:ignore[str-bytes-safe]
-                string[1:],
-            )
-        )
-
-    return {
-        (convert_key(k) if isinstance(k, str) else k): (
-            convert_dict(v) if isinstance(v, dict) else v
-        )
-        for k, v in dictionary.items()
-    }
-
-
-def handle_evo_exception(err: evo.RequestFailed) -> None:
-    """Return False if the exception can't be ignored."""
-
-    try:
-        raise err
-
-    except evo.AuthenticationFailed:
-        _LOGGER.error(
-            (
-                "Failed to authenticate with the vendor's server. Check your username"
-                " and password. NB: Some special password characters that work"
-                " correctly via the website will not work via the web API. Message"
-                " is: %s"
-            ),
-            err,
-        )
-
-    except evo.RequestFailed:
-        if err.status is None:
-            _LOGGER.warning(
-                (
-                    "Unable to connect with the vendor's server. "
-                    "Check your network and the vendor's service status page. "
-                    "Message is: %s"
-                ),
-                err,
-            )
-
-        elif err.status == HTTPStatus.SERVICE_UNAVAILABLE:
-            _LOGGER.warning(
-                "The vendor says their server is currently unavailable. "
-                "Check the vendor's service status page"
-            )
-
-        elif err.status == HTTPStatus.TOO_MANY_REQUESTS:
-            _LOGGER.warning(
-                (
-                    "The vendor's API rate limit has been exceeded. "
-                    "If this message persists, consider increasing the %s"
-                ),
-                CONF_SCAN_INTERVAL,
-            )
-
-        else:
-            raise  # we don't expect/handle any other Exceptions
diff --git a/homeassistant/components/evohome/manifest.json b/homeassistant/components/evohome/manifest.json
index 22edadad7f4..44e4cdb1128 100644
--- a/homeassistant/components/evohome/manifest.json
+++ b/homeassistant/components/evohome/manifest.json
@@ -4,7 +4,7 @@
   "codeowners": ["@zxdavb"],
   "documentation": "https://www.home-assistant.io/integrations/evohome",
   "iot_class": "cloud_polling",
-  "loggers": ["evohomeasync", "evohomeasync2"],
+  "loggers": ["evohome", "evohomeasync", "evohomeasync2"],
   "quality_scale": "legacy",
-  "requirements": ["evohome-async==0.4.21"]
+  "requirements": ["evohome-async==1.0.4"]
 }
diff --git a/homeassistant/components/evohome/storage.py b/homeassistant/components/evohome/storage.py
new file mode 100644
index 00000000000..b078c33b305
--- /dev/null
+++ b/homeassistant/components/evohome/storage.py
@@ -0,0 +1,118 @@
+"""Support for (EMEA/EU-based) Honeywell TCC systems."""
+
+from __future__ import annotations
+
+from datetime import UTC, datetime, timedelta
+from typing import Any, NotRequired, TypedDict
+
+from evohomeasync.auth import (
+    SZ_SESSION_ID,
+    SZ_SESSION_ID_EXPIRES,
+    AbstractSessionManager,
+)
+from evohomeasync2.auth import AbstractTokenManager
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.storage import Store
+
+from .const import STORAGE_KEY, STORAGE_VER
+
+
+class _SessionIdEntryT(TypedDict):
+    session_id: str
+    session_id_expires: NotRequired[str]  # dt.isoformat()  # TZ-aware
+
+
+class _TokenStoreT(TypedDict):
+    username: str
+    refresh_token: str
+    access_token: str
+    access_token_expires: str  # dt.isoformat()  # TZ-aware
+    session_id: NotRequired[str]
+    session_id_expires: NotRequired[str]  # dt.isoformat()  # TZ-aware
+
+
+class TokenManager(AbstractTokenManager, AbstractSessionManager):
+    """A token manager that uses a cache file to store the tokens."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        *args: Any,
+        **kwargs: Any,
+    ) -> None:
+        """Initialise the token manager."""
+        super().__init__(*args, **kwargs)
+
+        self._store = Store(hass, STORAGE_VER, STORAGE_KEY)  # type: ignore[var-annotated]
+        self._store_initialized = False  # True once cache loaded first time
+
+    async def get_access_token(self) -> str:
+        """Return a valid access token.
+
+        If the cached entry is not valid, will fetch a new access token.
+        """
+
+        if not self._store_initialized:
+            await self._load_cache_from_store()
+
+        return await super().get_access_token()
+
+    async def get_session_id(self) -> str:
+        """Return a valid session id.
+
+        If the cached entry is not valid, will fetch a new session id.
+        """
+
+        if not self._store_initialized:
+            await self._load_cache_from_store()
+
+        return await super().get_session_id()
+
+    async def _load_cache_from_store(self) -> None:
+        """Load the user entry from the cache.
+
+        Assumes single reader/writer. Reads only once, at initialization.
+        """
+
+        cache: _TokenStoreT = await self._store.async_load() or {}  # type: ignore[assignment]
+        self._store_initialized = True
+
+        if not cache or cache["username"] != self._client_id:
+            return
+
+        if SZ_SESSION_ID in cache:
+            self._import_session_id(cache)  # type: ignore[arg-type]
+        self._import_access_token(cache)
+
+    def _import_session_id(self, session: _SessionIdEntryT) -> None:  # type: ignore[override]
+        """Extract the session id from a (serialized) dictionary."""
+        # base class method overridden because session_id_expired is NotRequired here
+
+        self._session_id = session[SZ_SESSION_ID]
+
+        session_id_expires = session.get(SZ_SESSION_ID_EXPIRES)
+        if session_id_expires is None:
+            self._session_id_expires = datetime.now(tz=UTC) + timedelta(minutes=15)
+        else:
+            self._session_id_expires = datetime.fromisoformat(session_id_expires)
+
+    async def save_access_token(self) -> None:  # an abstractmethod
+        """Save the access token (and expiry dtm, refresh token) to the cache."""
+        await self.save_cache_to_store()
+
+    async def save_session_id(self) -> None:  # an abstractmethod
+        """Save the session id (and expiry dtm) to the cache."""
+        await self.save_cache_to_store()
+
+    async def save_cache_to_store(self) -> None:
+        """Save the access token (and session id, if any) to the cache.
+
+        Assumes a single reader/writer. Writes whenever new data has been fetched.
+        """
+
+        cache = {"username": self._client_id} | self._export_access_token()
+        if self._session_id:
+            cache |= self._export_session_id()
+
+        await self._store.async_save(cache)
diff --git a/homeassistant/components/evohome/strings.json b/homeassistant/components/evohome/strings.json
index ca032643c9d..4fc51c30b97 100644
--- a/homeassistant/components/evohome/strings.json
+++ b/homeassistant/components/evohome/strings.json
@@ -10,17 +10,17 @@
         },
         "period": {
           "name": "Period",
-          "description": "A period of time in days; used only with Away, DayOff, or Custom. The system will revert to Auto at midnight (up to 99 days, today is day 1)."
+          "description": "A period of time in days; used only with Away, DayOff, or Custom mode. The system will revert to Auto mode at midnight (up to 99 days, today is day 1)."
         },
         "duration": {
           "name": "Duration",
-          "description": "The duration in hours; used only with AutoWithEco (up to 24 hours)."
+          "description": "The duration in hours; used only with AutoWithEco mode (up to 24 hours)."
         }
       }
     },
     "reset_system": {
       "name": "Reset system",
-      "description": "Sets the system to Auto mode and reset all the zones to follow their schedules. Not all Evohome systems support this feature (i.e. AutoWithReset mode)."
+      "description": "Sets the system to Auto mode and resets all the zones to follow their schedules. Not all Evohome systems support this feature (i.e. AutoWithReset mode)."
     },
     "refresh_system": {
       "name": "Refresh system",
diff --git a/homeassistant/components/evohome/water_heater.py b/homeassistant/components/evohome/water_heater.py
index a50e16b5dda..7ea0fb3a2d9 100644
--- a/homeassistant/components/evohome/water_heater.py
+++ b/homeassistant/components/evohome/water_heater.py
@@ -3,17 +3,11 @@
 from __future__ import annotations
 
 import logging
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 import evohomeasync2 as evo
-from evohomeasync2.schema.const import (
-    SZ_ACTIVE_FAULTS,
-    SZ_DHW_ID,
-    SZ_OFF,
-    SZ_ON,
-    SZ_STATE_STATUS,
-    SZ_TEMPERATURE_STATUS,
-)
+from evohomeasync2.const import SZ_STATE_STATUS, SZ_TEMPERATURE_STATUS
+from evohomeasync2.schemas.const import DhwState as EvoDhwState, ZoneMode as EvoZoneMode
 
 from homeassistant.components.water_heater import (
     WaterHeaterEntity,
@@ -29,24 +23,19 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
-from .const import DOMAIN, EVO_FOLLOW, EVO_PERMOVER
+from . import EVOHOME_KEY
+from .coordinator import EvoDataUpdateCoordinator
 from .entity import EvoChild
 
-if TYPE_CHECKING:
-    from . import EvoBroker
-
-
 _LOGGER = logging.getLogger(__name__)
 
 STATE_AUTO = "auto"
 
-HA_STATE_TO_EVO = {STATE_AUTO: "", STATE_ON: SZ_ON, STATE_OFF: SZ_OFF}
+HA_STATE_TO_EVO = {STATE_AUTO: "", STATE_ON: EvoDhwState.ON, STATE_OFF: EvoDhwState.OFF}
 EVO_STATE_TO_HA = {v: k for k, v in HA_STATE_TO_EVO.items() if k != ""}
 
-STATE_ATTRS_DHW = [SZ_DHW_ID, SZ_ACTIVE_FAULTS, SZ_STATE_STATUS, SZ_TEMPERATURE_STATUS]
-
 
 async def async_setup_platform(
     hass: HomeAssistant,
@@ -58,19 +47,22 @@ async def async_setup_platform(
     if discovery_info is None:
         return
 
-    broker: EvoBroker = hass.data[DOMAIN]["broker"]
+    coordinator = hass.data[EVOHOME_KEY].coordinator
+    tcs = hass.data[EVOHOME_KEY].tcs
 
-    assert broker.tcs.hotwater is not None  # mypy check
+    assert tcs.hotwater is not None  # mypy check
 
     _LOGGER.debug(
         "Adding: DhwController (%s), id=%s",
-        broker.tcs.hotwater.TYPE,
-        broker.tcs.hotwater.dhwId,
+        tcs.hotwater.type,
+        tcs.hotwater.id,
     )
 
-    new_entity = EvoDHW(broker, broker.tcs.hotwater)
+    entity = EvoDHW(coordinator, tcs.hotwater)
 
-    async_add_entities([new_entity], update_before_add=True)
+    async_add_entities([entity])
+
+    await entity.update_attrs()
 
 
 class EvoDHW(EvoChild, WaterHeaterEntity):
@@ -81,19 +73,23 @@ class EvoDHW(EvoChild, WaterHeaterEntity):
     _attr_operation_list = list(HA_STATE_TO_EVO)
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
 
-    _evo_device: evo.HotWater  # mypy hint
+    _evo_device: evo.HotWater
+    _evo_id_attr = "dhw_id"
+    _evo_state_attr_names = (SZ_STATE_STATUS, SZ_TEMPERATURE_STATUS)
 
-    def __init__(self, evo_broker: EvoBroker, evo_device: evo.HotWater) -> None:
+    def __init__(
+        self, coordinator: EvoDataUpdateCoordinator, evo_device: evo.HotWater
+    ) -> None:
         """Initialize an evohome-compatible DHW controller."""
 
-        super().__init__(evo_broker, evo_device)
-        self._evo_id = evo_device.dhwId
+        super().__init__(coordinator, evo_device)
+        self._evo_id = evo_device.id
 
-        self._attr_unique_id = evo_device.dhwId
+        self._attr_unique_id = evo_device.id
         self._attr_name = evo_device.name  # is static
 
         self._attr_precision = (
-            PRECISION_TENTHS if evo_broker.client_v1 else PRECISION_WHOLE
+            PRECISION_TENTHS if coordinator.client_v1 else PRECISION_WHOLE
         )
         self._attr_supported_features = (
             WaterHeaterEntityFeature.AWAY_MODE | WaterHeaterEntityFeature.OPERATION_MODE
@@ -102,19 +98,15 @@ class EvoDHW(EvoChild, WaterHeaterEntity):
     @property
     def current_operation(self) -> str | None:
         """Return the current operating mode (Auto, On, or Off)."""
-        if self._evo_device.mode == EVO_FOLLOW:
+        if self._evo_device.mode == EvoZoneMode.FOLLOW_SCHEDULE:
             return STATE_AUTO
-        if (device_state := self._evo_device.state) is None:
-            return None
-        return EVO_STATE_TO_HA[device_state]
+        return EVO_STATE_TO_HA[self._evo_device.state]
 
     @property
     def is_away_mode_on(self) -> bool | None:
         """Return True if away mode is on."""
-        if self._evo_device.state is None:
-            return None
         is_off = EVO_STATE_TO_HA[self._evo_device.state] == STATE_OFF
-        is_permanent = self._evo_device.mode == EVO_PERMOVER
+        is_permanent = self._evo_device.mode == EvoZoneMode.PERMANENT_OVERRIDE
         return is_off and is_permanent
 
     async def async_set_operation_mode(self, operation_mode: str) -> None:
@@ -123,40 +115,31 @@ class EvoDHW(EvoChild, WaterHeaterEntity):
         Except for Auto, the mode is only until the next SetPoint.
         """
         if operation_mode == STATE_AUTO:
-            await self._evo_broker.call_client_api(self._evo_device.reset_mode())
+            await self.coordinator.call_client_api(self._evo_device.reset())
         else:
             await self._update_schedule()
-            until = dt_util.parse_datetime(self.setpoints.get("next_sp_from", ""))
+            until = self.setpoints.get("next_sp_from")
             until = dt_util.as_utc(until) if until else None
 
             if operation_mode == STATE_ON:
-                await self._evo_broker.call_client_api(
-                    self._evo_device.set_on(until=until)
-                )
+                await self.coordinator.call_client_api(self._evo_device.on(until=until))
             else:  # STATE_OFF
-                await self._evo_broker.call_client_api(
-                    self._evo_device.set_off(until=until)
+                await self.coordinator.call_client_api(
+                    self._evo_device.off(until=until)
                 )
 
     async def async_turn_away_mode_on(self) -> None:
         """Turn away mode on."""
-        await self._evo_broker.call_client_api(self._evo_device.set_off())
+        await self.coordinator.call_client_api(self._evo_device.off())
 
     async def async_turn_away_mode_off(self) -> None:
         """Turn away mode off."""
-        await self._evo_broker.call_client_api(self._evo_device.reset_mode())
+        await self.coordinator.call_client_api(self._evo_device.reset())
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn on."""
-        await self._evo_broker.call_client_api(self._evo_device.set_on())
+        await self.coordinator.call_client_api(self._evo_device.on())
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn off."""
-        await self._evo_broker.call_client_api(self._evo_device.set_off())
-
-    async def async_update(self) -> None:
-        """Get the latest state data for a DHW controller."""
-        await super().async_update()
-
-        for attr in STATE_ATTRS_DHW:
-            self._device_state_attrs[attr] = getattr(self._evo_device, attr)
+        await self.coordinator.call_client_api(self._evo_device.off())
diff --git a/homeassistant/components/ezviz/__init__.py b/homeassistant/components/ezviz/__init__.py
index 6885304e0de..43a71458fb2 100644
--- a/homeassistant/components/ezviz/__init__.py
+++ b/homeassistant/components/ezviz/__init__.py
@@ -11,7 +11,6 @@ from pyezviz.exceptions import (
     PyEzvizError,
 )
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_TIMEOUT, CONF_TYPE, CONF_URL, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
@@ -22,12 +21,11 @@ from .const import (
     CONF_FFMPEG_ARGUMENTS,
     CONF_RFSESSION_ID,
     CONF_SESSION_ID,
-    DATA_COORDINATOR,
     DEFAULT_FFMPEG_ARGUMENTS,
     DEFAULT_TIMEOUT,
     DOMAIN,
 )
-from .coordinator import EzvizDataUpdateCoordinator
+from .coordinator import EzvizConfigEntry, EzvizDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -50,9 +48,8 @@ PLATFORMS_BY_TYPE: dict[str, list] = {
 }
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: EzvizConfigEntry) -> bool:
     """Set up EZVIZ from a config entry."""
-    hass.data.setdefault(DOMAIN, {})
     sensor_type: str = entry.data[CONF_TYPE]
     ezviz_client = None
 
@@ -90,20 +87,20 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             raise ConfigEntryNotReady from error
 
         coordinator = EzvizDataUpdateCoordinator(
-            hass, api=ezviz_client, api_timeout=entry.options[CONF_TIMEOUT]
+            hass, entry, api=ezviz_client, api_timeout=entry.options[CONF_TIMEOUT]
         )
 
         await coordinator.async_config_entry_first_refresh()
 
-        hass.data[DOMAIN][entry.entry_id] = {DATA_COORDINATOR: coordinator}
+        entry.runtime_data = coordinator
 
     entry.async_on_unload(entry.add_update_listener(_async_update_listener))
 
     # Check EZVIZ cloud account entity is present, reload cloud account entities for camera entity change to take effect.
     # Cameras are accessed via local RTSP stream with unique credentials per camera.
     # Separate camera entities allow for credential changes per camera.
-    if sensor_type == ATTR_TYPE_CAMERA and hass.data[DOMAIN]:
-        for item in hass.config_entries.async_entries(domain=DOMAIN):
+    if sensor_type == ATTR_TYPE_CAMERA:
+        for item in hass.config_entries.async_loaded_entries(domain=DOMAIN):
             if item.data.get(CONF_TYPE) == ATTR_TYPE_CLOUD:
                 _LOGGER.debug("Reload Ezviz main account with camera entry")
                 await hass.config_entries.async_reload(item.entry_id)
@@ -116,19 +113,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: EzvizConfigEntry) -> bool:
     """Unload a config entry."""
     sensor_type = entry.data[CONF_TYPE]
 
-    unload_ok = await hass.config_entries.async_unload_platforms(
+    return await hass.config_entries.async_unload_platforms(
         entry, PLATFORMS_BY_TYPE[sensor_type]
     )
-    if sensor_type == ATTR_TYPE_CLOUD and unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
 
 
-async def _async_update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+async def _async_update_listener(hass: HomeAssistant, entry: EzvizConfigEntry) -> None:
     """Handle options update."""
     await hass.config_entries.async_reload(entry.entry_id)
diff --git a/homeassistant/components/ezviz/alarm_control_panel.py b/homeassistant/components/ezviz/alarm_control_panel.py
index f30a7852b4e..08fa0a68ee8 100644
--- a/homeassistant/components/ezviz/alarm_control_panel.py
+++ b/homeassistant/components/ezviz/alarm_control_panel.py
@@ -15,14 +15,13 @@ from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntityFeature,
     AlarmControlPanelState,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DATA_COORDINATOR, DOMAIN, MANUFACTURER
-from .coordinator import EzvizDataUpdateCoordinator
+from .const import DOMAIN, MANUFACTURER
+from .coordinator import EzvizConfigEntry, EzvizDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -49,12 +48,12 @@ ALARM_TYPE = EzvizAlarmControlPanelEntityDescription(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: EzvizConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Ezviz alarm control panel."""
-    coordinator: EzvizDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
-        DATA_COORDINATOR
-    ]
+    coordinator = entry.runtime_data
 
     device_info = DeviceInfo(
         identifiers={(DOMAIN, entry.unique_id)},  # type: ignore[arg-type]
diff --git a/homeassistant/components/ezviz/binary_sensor.py b/homeassistant/components/ezviz/binary_sensor.py
index c13375cb487..5e069e0277a 100644
--- a/homeassistant/components/ezviz/binary_sensor.py
+++ b/homeassistant/components/ezviz/binary_sensor.py
@@ -7,12 +7,10 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DATA_COORDINATOR, DOMAIN
-from .coordinator import EzvizDataUpdateCoordinator
+from .coordinator import EzvizConfigEntry, EzvizDataUpdateCoordinator
 from .entity import EzvizEntity
 
 PARALLEL_UPDATES = 1
@@ -34,12 +32,12 @@ BINARY_SENSOR_TYPES: dict[str, BinarySensorEntityDescription] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: EzvizConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up EZVIZ sensors based on a config entry."""
-    coordinator: EzvizDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
-        DATA_COORDINATOR
-    ]
+    coordinator = entry.runtime_data
 
     async_add_entities(
         [
diff --git a/homeassistant/components/ezviz/button.py b/homeassistant/components/ezviz/button.py
index 3c89677da09..6dbb419c903 100644
--- a/homeassistant/components/ezviz/button.py
+++ b/homeassistant/components/ezviz/button.py
@@ -11,13 +11,11 @@ from pyezviz.constants import SupportExt
 from pyezviz.exceptions import HTTPError, PyEzvizError
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DATA_COORDINATOR, DOMAIN
-from .coordinator import EzvizDataUpdateCoordinator
+from .coordinator import EzvizConfigEntry, EzvizDataUpdateCoordinator
 from .entity import EzvizEntity
 
 PARALLEL_UPDATES = 1
@@ -68,12 +66,12 @@ BUTTON_ENTITIES = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: EzvizConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up EZVIZ button based on a config entry."""
-    coordinator: EzvizDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
-        DATA_COORDINATOR
-    ]
+    coordinator = entry.runtime_data
 
     # Add button entities if supportExt value indicates PTZ capbility.
     # Could be missing or "0" for unsupported.
diff --git a/homeassistant/components/ezviz/camera.py b/homeassistant/components/ezviz/camera.py
index 3c4a5f70ff4..e3d01bef83e 100644
--- a/homeassistant/components/ezviz/camera.py
+++ b/homeassistant/components/ezviz/camera.py
@@ -10,42 +10,37 @@ from homeassistant.components import ffmpeg
 from homeassistant.components.camera import Camera, CameraEntityFeature
 from homeassistant.components.ffmpeg import get_ffmpeg_manager
 from homeassistant.components.stream import CONF_USE_WALLCLOCK_AS_TIMESTAMPS
-from homeassistant.config_entries import (
-    SOURCE_IGNORE,
-    SOURCE_INTEGRATION_DISCOVERY,
-    ConfigEntry,
-)
+from homeassistant.config_entries import SOURCE_IGNORE, SOURCE_INTEGRATION_DISCOVERY
 from homeassistant.const import CONF_IP_ADDRESS, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import discovery_flow
 from homeassistant.helpers.entity_platform import (
-    AddEntitiesCallback,
+    AddConfigEntryEntitiesCallback,
     async_get_current_platform,
 )
 
 from .const import (
     ATTR_SERIAL,
     CONF_FFMPEG_ARGUMENTS,
-    DATA_COORDINATOR,
     DEFAULT_CAMERA_USERNAME,
     DEFAULT_FFMPEG_ARGUMENTS,
     DOMAIN,
     SERVICE_WAKE_DEVICE,
 )
-from .coordinator import EzvizDataUpdateCoordinator
+from .coordinator import EzvizConfigEntry, EzvizDataUpdateCoordinator
 from .entity import EzvizEntity
 
 _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: EzvizConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up EZVIZ cameras based on a config entry."""
 
-    coordinator: EzvizDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
-        DATA_COORDINATOR
-    ]
+    coordinator = entry.runtime_data
 
     camera_entities = []
 
@@ -146,11 +141,6 @@ class EzvizCamera(EzvizEntity, Camera):
         if camera_password:
             self._attr_supported_features = CameraEntityFeature.STREAM
 
-    @property
-    def available(self) -> bool:
-        """Return True if entity is available."""
-        return self.data["status"] != 2
-
     @property
     def is_on(self) -> bool:
         """Return true if on."""
diff --git a/homeassistant/components/ezviz/config_flow.py b/homeassistant/components/ezviz/config_flow.py
index a7551737c10..845656c1d1d 100644
--- a/homeassistant/components/ezviz/config_flow.py
+++ b/homeassistant/components/ezviz/config_flow.py
@@ -17,12 +17,7 @@ from pyezviz.exceptions import (
 from pyezviz.test_cam_rtsp import TestRTSPAuth
 import voluptuous as vol
 
-from homeassistant.config_entries import (
-    ConfigEntry,
-    ConfigFlow,
-    ConfigFlowResult,
-    OptionsFlow,
-)
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult, OptionsFlow
 from homeassistant.const import (
     CONF_CUSTOMIZE,
     CONF_IP_ADDRESS,
@@ -48,6 +43,7 @@ from .const import (
     EU_URL,
     RUSSIA_URL,
 )
+from .coordinator import EzvizConfigEntry
 
 _LOGGER = logging.getLogger(__name__)
 DEFAULT_OPTIONS = {
@@ -148,7 +144,9 @@ class EzvizConfigFlow(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(config_entry: ConfigEntry) -> EzvizOptionsFlowHandler:
+    def async_get_options_flow(
+        config_entry: EzvizConfigEntry,
+    ) -> EzvizOptionsFlowHandler:
         """Get the options flow for this handler."""
         return EzvizOptionsFlowHandler()
 
diff --git a/homeassistant/components/ezviz/const.py b/homeassistant/components/ezviz/const.py
index 651110dd5d7..e6de538335c 100644
--- a/homeassistant/components/ezviz/const.py
+++ b/homeassistant/components/ezviz/const.py
@@ -33,6 +33,3 @@ RUSSIA_URL = "apirus.ezvizru.com"
 DEFAULT_CAMERA_USERNAME = "admin"
 DEFAULT_TIMEOUT = 25
 DEFAULT_FFMPEG_ARGUMENTS = ""
-
-# Data
-DATA_COORDINATOR = "coordinator"
diff --git a/homeassistant/components/ezviz/coordinator.py b/homeassistant/components/ezviz/coordinator.py
index c983371f4f8..0830784a501 100644
--- a/homeassistant/components/ezviz/coordinator.py
+++ b/homeassistant/components/ezviz/coordinator.py
@@ -13,6 +13,7 @@ from pyezviz.exceptions import (
     PyEzvizError,
 )
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -21,19 +22,32 @@ from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
+type EzvizConfigEntry = ConfigEntry[EzvizDataUpdateCoordinator]
+
 
 class EzvizDataUpdateCoordinator(DataUpdateCoordinator):
     """Class to manage fetching EZVIZ data."""
 
     def __init__(
-        self, hass: HomeAssistant, *, api: EzvizClient, api_timeout: int
+        self,
+        hass: HomeAssistant,
+        entry: EzvizConfigEntry,
+        *,
+        api: EzvizClient,
+        api_timeout: int,
     ) -> None:
         """Initialize global EZVIZ data updater."""
         self.ezviz_client = api
         self._api_timeout = api_timeout
         update_interval = timedelta(seconds=30)
 
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval)
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=entry,
+            name=DOMAIN,
+            update_interval=update_interval,
+        )
 
     async def _async_update_data(self) -> dict:
         """Fetch data from EZVIZ."""
diff --git a/homeassistant/components/ezviz/entity.py b/homeassistant/components/ezviz/entity.py
index 44de4a0c9c7..54614e4899a 100644
--- a/homeassistant/components/ezviz/entity.py
+++ b/homeassistant/components/ezviz/entity.py
@@ -42,6 +42,11 @@ class EzvizEntity(CoordinatorEntity[EzvizDataUpdateCoordinator], Entity):
         """Return coordinator data for this entity."""
         return self.coordinator.data[self._serial]
 
+    @property
+    def available(self) -> bool:
+        """Return True if entity is available."""
+        return self.data["status"] != 2
+
 
 class EzvizBaseEntity(Entity):
     """Generic entity for EZVIZ individual poll entities."""
@@ -72,3 +77,8 @@ class EzvizBaseEntity(Entity):
     def data(self) -> dict[str, Any]:
         """Return coordinator data for this entity."""
         return self.coordinator.data[self._serial]
+
+    @property
+    def available(self) -> bool:
+        """Return True if entity is available."""
+        return self.data["status"] != 2
diff --git a/homeassistant/components/ezviz/image.py b/homeassistant/components/ezviz/image.py
index 73c09244222..28ebc7279e6 100644
--- a/homeassistant/components/ezviz/image.py
+++ b/homeassistant/components/ezviz/image.py
@@ -4,18 +4,19 @@ from __future__ import annotations
 
 import logging
 
+from propcache.api import cached_property
 from pyezviz.exceptions import PyEzvizError
 from pyezviz.utils import decrypt_image
 
 from homeassistant.components.image import Image, ImageEntity, ImageEntityDescription
-from homeassistant.config_entries import SOURCE_IGNORE, ConfigEntry
+from homeassistant.config_entries import SOURCE_IGNORE
 from homeassistant.const import CONF_PASSWORD
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
-from .const import DATA_COORDINATOR, DOMAIN
-from .coordinator import EzvizDataUpdateCoordinator
+from .const import DOMAIN
+from .coordinator import EzvizConfigEntry, EzvizDataUpdateCoordinator
 from .entity import EzvizEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -27,13 +28,13 @@ IMAGE_TYPE = ImageEntityDescription(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: EzvizConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up EZVIZ image entities based on a config entry."""
 
-    coordinator: EzvizDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
-        DATA_COORDINATOR
-    ]
+    coordinator = entry.runtime_data
 
     async_add_entities(
         EzvizLastMotion(hass, coordinator, camera) for camera in coordinator.data
@@ -62,6 +63,11 @@ class EzvizLastMotion(EzvizEntity, ImageEntity):
             else None
         )
 
+    @cached_property
+    def available(self) -> bool:
+        """Entity gets data from ezviz API so always available."""
+        return True
+
     async def _async_load_image_from_url(self, url: str) -> Image | None:
         """Load an image by url."""
         if response := await self._fetch_url(url):
diff --git a/homeassistant/components/ezviz/light.py b/homeassistant/components/ezviz/light.py
index c35b53b47b7..ba398dd3ed4 100644
--- a/homeassistant/components/ezviz/light.py
+++ b/homeassistant/components/ezviz/light.py
@@ -8,17 +8,15 @@ from pyezviz.constants import DeviceCatagories, DeviceSwitchType, SupportExt
 from pyezviz.exceptions import HTTPError, PyEzvizError
 
 from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
     ranged_value_to_percentage,
 )
 
-from .const import DATA_COORDINATOR, DOMAIN
-from .coordinator import EzvizDataUpdateCoordinator
+from .coordinator import EzvizConfigEntry, EzvizDataUpdateCoordinator
 from .entity import EzvizEntity
 
 PARALLEL_UPDATES = 1
@@ -26,12 +24,12 @@ BRIGHTNESS_RANGE = (1, 255)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: EzvizConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up EZVIZ lights based on a config entry."""
-    coordinator: EzvizDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
-        DATA_COORDINATOR
-    ]
+    coordinator = entry.runtime_data
 
     async_add_entities(
         EzvizLight(coordinator, camera)
diff --git a/homeassistant/components/ezviz/number.py b/homeassistant/components/ezviz/number.py
index 08fbd3afb34..9bdd1feb81d 100644
--- a/homeassistant/components/ezviz/number.py
+++ b/homeassistant/components/ezviz/number.py
@@ -16,14 +16,12 @@ from pyezviz.exceptions import (
 )
 
 from homeassistant.components.number import NumberEntity, NumberEntityDescription
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DATA_COORDINATOR, DOMAIN
-from .coordinator import EzvizDataUpdateCoordinator
+from .coordinator import EzvizConfigEntry, EzvizDataUpdateCoordinator
 from .entity import EzvizBaseEntity
 
 SCAN_INTERVAL = timedelta(seconds=3600)
@@ -51,12 +49,12 @@ NUMBER_TYPE = EzvizNumberEntityDescription(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: EzvizConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up EZVIZ sensors based on a config entry."""
-    coordinator: EzvizDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
-        DATA_COORDINATOR
-    ]
+    coordinator = entry.runtime_data
 
     async_add_entities(
         EzvizNumber(coordinator, camera, value, entry.entry_id)
diff --git a/homeassistant/components/ezviz/select.py b/homeassistant/components/ezviz/select.py
index d6dc3dc8550..486564bff6e 100644
--- a/homeassistant/components/ezviz/select.py
+++ b/homeassistant/components/ezviz/select.py
@@ -8,14 +8,12 @@ from pyezviz.constants import DeviceSwitchType, SoundMode
 from pyezviz.exceptions import HTTPError, PyEzvizError
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DATA_COORDINATOR, DOMAIN
-from .coordinator import EzvizDataUpdateCoordinator
+from .coordinator import EzvizConfigEntry, EzvizDataUpdateCoordinator
 from .entity import EzvizEntity
 
 PARALLEL_UPDATES = 1
@@ -38,12 +36,12 @@ SELECT_TYPE = EzvizSelectEntityDescription(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: EzvizConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up EZVIZ select entities based on a config entry."""
-    coordinator: EzvizDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
-        DATA_COORDINATOR
-    ]
+    coordinator = entry.runtime_data
 
     async_add_entities(
         EzvizSelect(coordinator, camera)
diff --git a/homeassistant/components/ezviz/sensor.py b/homeassistant/components/ezviz/sensor.py
index e0750b985fc..c441b34b42d 100644
--- a/homeassistant/components/ezviz/sensor.py
+++ b/homeassistant/components/ezviz/sensor.py
@@ -7,13 +7,11 @@ from homeassistant.components.sensor import (
     SensorEntity,
     SensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DATA_COORDINATOR, DOMAIN
-from .coordinator import EzvizDataUpdateCoordinator
+from .coordinator import EzvizConfigEntry, EzvizDataUpdateCoordinator
 from .entity import EzvizEntity
 
 PARALLEL_UPDATES = 1
@@ -72,12 +70,12 @@ SENSOR_TYPES: dict[str, SensorEntityDescription] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: EzvizConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up EZVIZ sensors based on a config entry."""
-    coordinator: EzvizDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
-        DATA_COORDINATOR
-    ]
+    coordinator = entry.runtime_data
 
     async_add_entities(
         [
diff --git a/homeassistant/components/ezviz/siren.py b/homeassistant/components/ezviz/siren.py
index 8bacceff29f..a2c88f58972 100644
--- a/homeassistant/components/ezviz/siren.py
+++ b/homeassistant/components/ezviz/siren.py
@@ -13,16 +13,14 @@ from homeassistant.components.siren import (
     SirenEntityDescription,
     SirenEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_ON
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.helpers.event as evt
+from homeassistant.helpers import event as evt
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
-from .const import DATA_COORDINATOR, DOMAIN
-from .coordinator import EzvizDataUpdateCoordinator
+from .coordinator import EzvizConfigEntry, EzvizDataUpdateCoordinator
 from .entity import EzvizBaseEntity
 
 PARALLEL_UPDATES = 1
@@ -35,12 +33,12 @@ SIREN_ENTITY_TYPE = SirenEntityDescription(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: EzvizConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up EZVIZ sensors based on a config entry."""
-    coordinator: EzvizDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
-        DATA_COORDINATOR
-    ]
+    coordinator = entry.runtime_data
 
     async_add_entities(
         EzvizSirenEntity(coordinator, camera, SIREN_ENTITY_TYPE)
diff --git a/homeassistant/components/ezviz/strings.json b/homeassistant/components/ezviz/strings.json
index f1653661cdd..cd8bbc9d199 100644
--- a/homeassistant/components/ezviz/strings.json
+++ b/homeassistant/components/ezviz/strings.json
@@ -54,7 +54,7 @@
       "init": {
         "data": {
           "timeout": "Request timeout (seconds)",
-          "ffmpeg_arguments": "Arguments passed to ffmpeg for cameras"
+          "ffmpeg_arguments": "Arguments passed to FFmpeg for cameras"
         }
       }
     }
diff --git a/homeassistant/components/ezviz/switch.py b/homeassistant/components/ezviz/switch.py
index 65fb7b9f36b..01f7cac1a55 100644
--- a/homeassistant/components/ezviz/switch.py
+++ b/homeassistant/components/ezviz/switch.py
@@ -13,13 +13,11 @@ from homeassistant.components.switch import (
     SwitchEntity,
     SwitchEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DATA_COORDINATOR, DOMAIN
-from .coordinator import EzvizDataUpdateCoordinator
+from .coordinator import EzvizConfigEntry, EzvizDataUpdateCoordinator
 from .entity import EzvizEntity
 
 
@@ -107,12 +105,12 @@ SWITCH_TYPES: dict[int, EzvizSwitchEntityDescription] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: EzvizConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up EZVIZ switch based on a config entry."""
-    coordinator: EzvizDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
-        DATA_COORDINATOR
-    ]
+    coordinator = entry.runtime_data
 
     async_add_entities(
         EzvizSwitch(coordinator, camera, switch_number)
diff --git a/homeassistant/components/ezviz/update.py b/homeassistant/components/ezviz/update.py
index 25a506a0052..c9f8038b336 100644
--- a/homeassistant/components/ezviz/update.py
+++ b/homeassistant/components/ezviz/update.py
@@ -12,13 +12,11 @@ from homeassistant.components.update import (
     UpdateEntityDescription,
     UpdateEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DATA_COORDINATOR, DOMAIN
-from .coordinator import EzvizDataUpdateCoordinator
+from .coordinator import EzvizConfigEntry, EzvizDataUpdateCoordinator
 from .entity import EzvizEntity
 
 PARALLEL_UPDATES = 1
@@ -30,12 +28,12 @@ UPDATE_ENTITY_TYPES = UpdateEntityDescription(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: EzvizConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up EZVIZ sensors based on a config entry."""
-    coordinator: EzvizDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
-        DATA_COORDINATOR
-    ]
+    coordinator = entry.runtime_data
 
     async_add_entities(
         EzvizUpdateEntity(coordinator, camera, sensor, UPDATE_ENTITY_TYPES)
diff --git a/homeassistant/components/faa_delays/__init__.py b/homeassistant/components/faa_delays/__init__.py
index 750b1f4a833..e33ccc9fe48 100644
--- a/homeassistant/components/faa_delays/__init__.py
+++ b/homeassistant/components/faa_delays/__init__.py
@@ -1,33 +1,27 @@
 """The FAA Delays integration."""
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ID, Platform
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
-from .coordinator import FAADataUpdateCoordinator
+from .coordinator import FAAConfigEntry, FAADataUpdateCoordinator
 
 PLATFORMS = [Platform.BINARY_SENSOR]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: FAAConfigEntry) -> bool:
     """Set up FAA Delays from a config entry."""
     code = entry.data[CONF_ID]
 
-    coordinator = FAADataUpdateCoordinator(hass, code)
+    coordinator = FAADataUpdateCoordinator(hass, entry, code)
     await coordinator.async_config_entry_first_refresh()
 
-    hass.data.setdefault(DOMAIN, {})
-    hass.data[DOMAIN][entry.entry_id] = coordinator
+    entry.runtime_data = coordinator
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: FAAConfigEntry) -> bool:
     """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/faa_delays/binary_sensor.py b/homeassistant/components/faa_delays/binary_sensor.py
index 6a01bf6ebed..6822e2620fd 100644
--- a/homeassistant/components/faa_delays/binary_sensor.py
+++ b/homeassistant/components/faa_delays/binary_sensor.py
@@ -12,13 +12,12 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import FAADataUpdateCoordinator
+from . import FAAConfigEntry, FAADataUpdateCoordinator
 from .const import DOMAIN
 
 
@@ -84,10 +83,12 @@ FAA_BINARY_SENSORS: tuple[FaaDelaysBinarySensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: FAAConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a FAA sensor based on a config entry."""
-    coordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
 
     entities = [
         FAABinarySensor(coordinator, entry.entry_id, description)
diff --git a/homeassistant/components/faa_delays/coordinator.py b/homeassistant/components/faa_delays/coordinator.py
index 9de10b2ebbb..aefc8d72487 100644
--- a/homeassistant/components/faa_delays/coordinator.py
+++ b/homeassistant/components/faa_delays/coordinator.py
@@ -7,6 +7,7 @@ import logging
 from aiohttp import ClientConnectionError
 from faadelays import Airport
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import aiohttp_client
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -15,14 +16,20 @@ from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
+type FAAConfigEntry = ConfigEntry[FAADataUpdateCoordinator]
+
 
 class FAADataUpdateCoordinator(DataUpdateCoordinator[Airport]):
     """Class to manage fetching FAA API data from a single endpoint."""
 
-    def __init__(self, hass: HomeAssistant, code: str) -> None:
+    def __init__(self, hass: HomeAssistant, entry: FAAConfigEntry, code: str) -> None:
         """Initialize the coordinator."""
         super().__init__(
-            hass, _LOGGER, name=DOMAIN, update_interval=timedelta(minutes=1)
+            hass,
+            _LOGGER,
+            config_entry=entry,
+            name=DOMAIN,
+            update_interval=timedelta(minutes=1),
         )
         self.session = aiohttp_client.async_get_clientsession(hass)
         self.data = Airport(code, self.session)
diff --git a/homeassistant/components/facebook/notify.py b/homeassistant/components/facebook/notify.py
index 3319f6bdebd..edd46d24982 100644
--- a/homeassistant/components/facebook/notify.py
+++ b/homeassistant/components/facebook/notify.py
@@ -17,7 +17,7 @@ from homeassistant.components.notify import (
 )
 from homeassistant.const import CONTENT_TYPE_JSON
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/fail2ban/sensor.py b/homeassistant/components/fail2ban/sensor.py
index 9e6d23556d2..d71d404c7a0 100644
--- a/homeassistant/components/fail2ban/sensor.py
+++ b/homeassistant/components/fail2ban/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_FILE_PATH, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/familyhub/camera.py b/homeassistant/components/familyhub/camera.py
index 462983278b0..6be13b23568 100644
--- a/homeassistant/components/familyhub/camera.py
+++ b/homeassistant/components/familyhub/camera.py
@@ -11,8 +11,8 @@ from homeassistant.components.camera import (
 )
 from homeassistant.const import CONF_IP_ADDRESS, CONF_NAME
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/fastdotcom/__init__.py b/homeassistant/components/fastdotcom/__init__.py
index 967e7ef8e35..59cb3f984d2 100644
--- a/homeassistant/components/fastdotcom/__init__.py
+++ b/homeassistant/components/fastdotcom/__init__.py
@@ -4,20 +4,20 @@ from __future__ import annotations
 
 import logging
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.start import async_at_started
 
-from .const import DOMAIN, PLATFORMS
-from .coordinator import FastdotcomDataUpdateCoordinator
+from .const import PLATFORMS
+from .coordinator import FastdotcomConfigEntry, FastdotcomDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: FastdotcomConfigEntry) -> bool:
     """Set up Fast.com from a config entry."""
-    coordinator = FastdotcomDataUpdateCoordinator(hass)
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+    coordinator = FastdotcomDataUpdateCoordinator(hass, entry)
+    entry.runtime_data = coordinator
 
     await hass.config_entries.async_forward_entry_setups(
         entry,
@@ -36,8 +36,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: FastdotcomConfigEntry) -> bool:
     """Unload Fast.com config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        hass.data[DOMAIN].pop(entry.entry_id)
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/fastdotcom/coordinator.py b/homeassistant/components/fastdotcom/coordinator.py
index 75ac55b8314..8365692804c 100644
--- a/homeassistant/components/fastdotcom/coordinator.py
+++ b/homeassistant/components/fastdotcom/coordinator.py
@@ -6,20 +6,24 @@ from datetime import timedelta
 
 from fastdotcom import fast_com
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DEFAULT_INTERVAL, DOMAIN, LOGGER
 
+type FastdotcomConfigEntry = ConfigEntry[FastdotcomDataUpdateCoordinator]
+
 
 class FastdotcomDataUpdateCoordinator(DataUpdateCoordinator[float]):
     """Class to manage fetching Fast.com data API."""
 
-    def __init__(self, hass: HomeAssistant) -> None:
+    def __init__(self, hass: HomeAssistant, entry: FastdotcomConfigEntry) -> None:
         """Initialize the coordinator for Fast.com."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=entry,
             name=DOMAIN,
             update_interval=timedelta(hours=DEFAULT_INTERVAL),
         )
diff --git a/homeassistant/components/fastdotcom/diagnostics.py b/homeassistant/components/fastdotcom/diagnostics.py
index d7383ef0c6a..42f4e32f49e 100644
--- a/homeassistant/components/fastdotcom/diagnostics.py
+++ b/homeassistant/components/fastdotcom/diagnostics.py
@@ -4,21 +4,13 @@ from __future__ import annotations
 
 from typing import Any
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
-from .coordinator import FastdotcomDataUpdateCoordinator
+from .coordinator import FastdotcomConfigEntry
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, config_entry: ConfigEntry
+    hass: HomeAssistant, config_entry: FastdotcomConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for the config entry."""
-    coordinator: FastdotcomDataUpdateCoordinator = hass.data[DOMAIN][
-        config_entry.entry_id
-    ]
-
-    return {
-        "coordinator_data": coordinator.data,
-    }
+    return {"coordinator_data": config_entry.runtime_data.data}
diff --git a/homeassistant/components/fastdotcom/sensor.py b/homeassistant/components/fastdotcom/sensor.py
index 721290e8c0d..5b6429b0754 100644
--- a/homeassistant/components/fastdotcom/sensor.py
+++ b/homeassistant/components/fastdotcom/sensor.py
@@ -7,25 +7,23 @@ from homeassistant.components.sensor import (
     SensorEntity,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfDataRate
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
-from .coordinator import FastdotcomDataUpdateCoordinator
+from .coordinator import FastdotcomConfigEntry, FastdotcomDataUpdateCoordinator
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: FastdotcomConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Fast.com sensor."""
-    coordinator: FastdotcomDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
-    async_add_entities([SpeedtestSensor(entry.entry_id, coordinator)])
+    async_add_entities([SpeedtestSensor(entry.entry_id, entry.runtime_data)])
 
 
 class SpeedtestSensor(CoordinatorEntity[FastdotcomDataUpdateCoordinator], SensorEntity):
diff --git a/homeassistant/components/feedreader/__init__.py b/homeassistant/components/feedreader/__init__.py
index 9faed54c041..31617cb220b 100644
--- a/homeassistant/components/feedreader/__init__.py
+++ b/homeassistant/components/feedreader/__init__.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_URL, Platform
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.util.hass_dict import HassKey
 
-from .const import CONF_MAX_ENTRIES, DOMAIN
-from .coordinator import FeedReaderCoordinator, StoredData
-
-type FeedReaderConfigEntry = ConfigEntry[FeedReaderCoordinator]
+from .const import DOMAIN
+from .coordinator import FeedReaderConfigEntry, FeedReaderCoordinator, StoredData
 
 CONF_URLS = "urls"
 
@@ -23,12 +20,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: FeedReaderConfigEntry) -
     if not storage.is_initialized:
         await storage.async_setup()
 
-    coordinator = FeedReaderCoordinator(
-        hass,
-        entry.data[CONF_URL],
-        entry.options[CONF_MAX_ENTRIES],
-        storage,
-    )
+    coordinator = FeedReaderCoordinator(hass, entry, storage)
 
     await coordinator.async_setup()
 
diff --git a/homeassistant/components/feedreader/config_flow.py b/homeassistant/components/feedreader/config_flow.py
index f3e56ad1778..3d0fec1a6f5 100644
--- a/homeassistant/components/feedreader/config_flow.py
+++ b/homeassistant/components/feedreader/config_flow.py
@@ -18,7 +18,7 @@ from homeassistant.config_entries import (
 )
 from homeassistant.const import CONF_URL
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.selector import (
     TextSelector,
     TextSelectorConfig,
diff --git a/homeassistant/components/feedreader/coordinator.py b/homeassistant/components/feedreader/coordinator.py
index fc338d63268..9901bd9f1b4 100644
--- a/homeassistant/components/feedreader/coordinator.py
+++ b/homeassistant/components/feedreader/coordinator.py
@@ -13,13 +13,14 @@ from urllib.error import URLError
 import feedparser
 
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_URL
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from homeassistant.util import dt as dt_util
 
-from .const import DEFAULT_SCAN_INTERVAL, DOMAIN, EVENT_FEEDREADER
+from .const import CONF_MAX_ENTRIES, DEFAULT_SCAN_INTERVAL, DOMAIN, EVENT_FEEDREADER
 
 DELAY_SAVE = 30
 STORAGE_VERSION = 1
@@ -27,37 +28,39 @@ STORAGE_VERSION = 1
 
 _LOGGER = getLogger(__name__)
 
+type FeedReaderConfigEntry = ConfigEntry[FeedReaderCoordinator]
+
 
 class FeedReaderCoordinator(
     DataUpdateCoordinator[list[feedparser.FeedParserDict] | None]
 ):
     """Abstraction over Feedparser module."""
 
-    config_entry: ConfigEntry
+    config_entry: FeedReaderConfigEntry
 
     def __init__(
         self,
         hass: HomeAssistant,
-        url: str,
-        max_entries: int,
+        config_entry: FeedReaderConfigEntry,
         storage: StoredData,
     ) -> None:
         """Initialize the FeedManager object, poll as per scan interval."""
-        super().__init__(
-            hass=hass,
-            logger=_LOGGER,
-            name=f"{DOMAIN} {url}",
-            update_interval=DEFAULT_SCAN_INTERVAL,
-        )
-        self.url = url
+        self.url = config_entry.data[CONF_URL]
         self.feed_author: str | None = None
         self.feed_version: str | None = None
-        self._max_entries = max_entries
+        self._max_entries = config_entry.options[CONF_MAX_ENTRIES]
         self._storage = storage
         self._last_entry_timestamp: struct_time | None = None
         self._event_type = EVENT_FEEDREADER
         self._feed: feedparser.FeedParserDict | None = None
-        self._feed_id = url
+        self._feed_id = self.url
+        super().__init__(
+            hass=hass,
+            logger=_LOGGER,
+            config_entry=config_entry,
+            name=f"{DOMAIN} {self.url}",
+            update_interval=DEFAULT_SCAN_INTERVAL,
+        )
 
     @callback
     def _log_no_entries(self) -> None:
diff --git a/homeassistant/components/feedreader/event.py b/homeassistant/components/feedreader/event.py
index ad6aed0fc76..578b5b1e175 100644
--- a/homeassistant/components/feedreader/event.py
+++ b/homeassistant/components/feedreader/event.py
@@ -10,7 +10,7 @@ from feedparser import FeedParserDict
 from homeassistant.components.event import EventEntity
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import FeedReaderConfigEntry
@@ -28,7 +28,7 @@ ATTR_TITLE = "title"
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FeedReaderConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up event entities for feedreader."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/feedreader/strings.json b/homeassistant/components/feedreader/strings.json
index 0f0492eb6c9..35022e82bb1 100644
--- a/homeassistant/components/feedreader/strings.json
+++ b/homeassistant/components/feedreader/strings.json
@@ -36,7 +36,7 @@
   "issues": {
     "import_yaml_error_url_error": {
       "title": "The Feedreader YAML configuration import failed",
-      "description": "Configuring the Feedreader using YAML is being removed but there was a connection error when trying to import the YAML configuration for `{url}`.\n\nPlease verify that url is reachable and accessable for Home Assistant and restart Home Assistant to try again or remove the Feedreader YAML configuration from your configuration.yaml file and continue to set up the integration manually."
+      "description": "Configuring the Feedreader using YAML is being removed but there was a connection error when trying to import the YAML configuration for `{url}`.\n\nPlease verify that the URL is reachable and accessible for Home Assistant and restart Home Assistant to try again or remove the Feedreader YAML configuration from your configuration.yaml file and continue to set up the integration manually."
     }
   }
 }
diff --git a/homeassistant/components/ffmpeg/__init__.py b/homeassistant/components/ffmpeg/__init__.py
index 6957702523f..fc5341b025e 100644
--- a/homeassistant/components/ffmpeg/__init__.py
+++ b/homeassistant/components/ffmpeg/__init__.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.core import Event, HomeAssistant, ServiceCall, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
diff --git a/homeassistant/components/ffmpeg/camera.py b/homeassistant/components/ffmpeg/camera.py
index 2c46c4c29d1..03566ba162c 100644
--- a/homeassistant/components/ffmpeg/camera.py
+++ b/homeassistant/components/ffmpeg/camera.py
@@ -16,8 +16,8 @@ from homeassistant.components.camera import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_aiohttp_proxy_stream
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/ffmpeg/strings.json b/homeassistant/components/ffmpeg/strings.json
index 66c1f19de5b..cac7fcfc48c 100644
--- a/homeassistant/components/ffmpeg/strings.json
+++ b/homeassistant/components/ffmpeg/strings.json
@@ -2,7 +2,7 @@
   "services": {
     "restart": {
       "name": "[%key:common::action::restart%]",
-      "description": "Sends a restart command to a ffmpeg based sensor.",
+      "description": "Sends a restart command to an FFmpeg-based sensor.",
       "fields": {
         "entity_id": {
           "name": "Entity",
@@ -12,7 +12,7 @@
     },
     "start": {
       "name": "[%key:common::action::start%]",
-      "description": "Sends a start command to a ffmpeg based sensor.",
+      "description": "Sends a start command to an FFmpeg-based sensor.",
       "fields": {
         "entity_id": {
           "name": "Entity",
@@ -22,7 +22,7 @@
     },
     "stop": {
       "name": "[%key:common::action::stop%]",
-      "description": "Sends a stop command to a ffmpeg based sensor.",
+      "description": "Sends a stop command to an FFmpeg-based sensor.",
       "fields": {
         "entity_id": {
           "name": "Entity",
diff --git a/homeassistant/components/ffmpeg_motion/binary_sensor.py b/homeassistant/components/ffmpeg_motion/binary_sensor.py
index 7dc32fd96a3..3adae8441df 100644
--- a/homeassistant/components/ffmpeg_motion/binary_sensor.py
+++ b/homeassistant/components/ffmpeg_motion/binary_sensor.py
@@ -23,7 +23,7 @@ from homeassistant.components.ffmpeg import (
 )
 from homeassistant.const import CONF_NAME, CONF_REPEAT
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/ffmpeg_noise/binary_sensor.py b/homeassistant/components/ffmpeg_noise/binary_sensor.py
index abbf77eba6b..1623d7c7660 100644
--- a/homeassistant/components/ffmpeg_noise/binary_sensor.py
+++ b/homeassistant/components/ffmpeg_noise/binary_sensor.py
@@ -22,7 +22,7 @@ from homeassistant.components.ffmpeg import (
 from homeassistant.components.ffmpeg_motion.binary_sensor import FFmpegBinarySensor
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/fibaro/__init__.py b/homeassistant/components/fibaro/__init__.py
index 8ede0169482..33b2598a636 100644
--- a/homeassistant/components/fibaro/__init__.py
+++ b/homeassistant/components/fibaro/__init__.py
@@ -7,21 +7,21 @@ from collections.abc import Callable, Mapping
 import logging
 from typing import Any
 
-from pyfibaro.fibaro_client import FibaroClient
+from pyfibaro.fibaro_client import (
+    FibaroAuthenticationFailed,
+    FibaroClient,
+    FibaroConnectFailed,
+)
+from pyfibaro.fibaro_data_helper import read_rooms
 from pyfibaro.fibaro_device import DeviceModel
-from pyfibaro.fibaro_room import RoomModel
+from pyfibaro.fibaro_info import InfoModel
 from pyfibaro.fibaro_scene import SceneModel
 from pyfibaro.fibaro_state_resolver import FibaroEvent, FibaroStateResolver
-from requests.exceptions import HTTPError
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_URL, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import (
-    ConfigEntryAuthFailed,
-    ConfigEntryNotReady,
-    HomeAssistantError,
-)
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceEntry, DeviceInfo
 from homeassistant.util import slugify
@@ -74,63 +74,31 @@ FIBARO_TYPEMAP = {
 class FibaroController:
     """Initiate Fibaro Controller Class."""
 
-    def __init__(self, config: Mapping[str, Any]) -> None:
+    def __init__(
+        self, fibaro_client: FibaroClient, info: InfoModel, import_plugins: bool
+    ) -> None:
         """Initialize the Fibaro controller."""
-
-        # The FibaroClient uses the correct API version automatically
-        self._client = FibaroClient(config[CONF_URL])
-        self._client.set_authentication(config[CONF_USERNAME], config[CONF_PASSWORD])
+        self._client = fibaro_client
+        self._fibaro_info = info
 
         # Whether to import devices from plugins
-        self._import_plugins = config[CONF_IMPORT_PLUGINS]
-        self._room_map: dict[int, RoomModel]  # Mapping roomId to room object
+        self._import_plugins = import_plugins
+        # Mapping roomId to room object
+        self._room_map = read_rooms(fibaro_client)
         self._device_map: dict[int, DeviceModel]  # Mapping deviceId to device object
         self.fibaro_devices: dict[Platform, list[DeviceModel]] = defaultdict(
             list
         )  # List of devices by entity platform
         # All scenes
-        self._scenes: list[SceneModel] = []
+        self._scenes = self._client.read_scenes()
         self._callbacks: dict[int, list[Any]] = {}  # Update value callbacks by deviceId
         # Event callbacks by device id
         self._event_callbacks: dict[int, list[Callable[[FibaroEvent], None]]] = {}
-        self.hub_serial: str  # Unique serial number of the hub
-        self.hub_name: str  # The friendly name of the hub
-        self.hub_model: str
-        self.hub_software_version: str
-        self.hub_api_url: str = config[CONF_URL]
+        # Unique serial number of the hub
+        self.hub_serial = info.serial_number
         # Device infos by fibaro device id
         self._device_infos: dict[int, DeviceInfo] = {}
-
-    def connect(self) -> None:
-        """Start the communication with the Fibaro controller."""
-
-        # Return value doesn't need to be checked,
-        # it is only relevant when connecting without credentials
-        self._client.connect()
-        info = self._client.read_info()
-        self.hub_serial = info.serial_number
-        self.hub_name = info.hc_name
-        self.hub_model = info.platform
-        self.hub_software_version = info.current_version
-
-        self._room_map = {room.fibaro_id: room for room in self._client.read_rooms()}
         self._read_devices()
-        self._scenes = self._client.read_scenes()
-
-    def connect_with_error_handling(self) -> None:
-        """Translate connect errors to easily differentiate auth and connect failures.
-
-        When there is a better error handling in the used library this can be improved.
-        """
-        try:
-            self.connect()
-        except HTTPError as http_ex:
-            if http_ex.response.status_code == 403:
-                raise FibaroAuthFailed from http_ex
-
-            raise FibaroConnectFailed from http_ex
-        except Exception as ex:
-            raise FibaroConnectFailed from ex
 
     def enable_state_handler(self) -> None:
         """Start StateHandler thread for monitoring updates."""
@@ -302,14 +270,20 @@ class FibaroController:
 
     def get_room_name(self, room_id: int) -> str | None:
         """Get the room name by room id."""
-        assert self._room_map
-        room = self._room_map.get(room_id)
-        return room.name if room else None
+        return self._room_map.get(room_id)
 
     def read_scenes(self) -> list[SceneModel]:
         """Return list of scenes."""
         return self._scenes
 
+    def read_fibaro_info(self) -> InfoModel:
+        """Return the general info about the hub."""
+        return self._fibaro_info
+
+    def get_frontend_url(self) -> str:
+        """Return the url to the Fibaro hub web UI."""
+        return self._client.frontend_url()
+
     def _read_devices(self) -> None:
         """Read and process the device list."""
         devices = self._client.read_devices()
@@ -319,20 +293,17 @@ class FibaroController:
         for device in devices:
             try:
                 device.fibaro_controller = self
-                if device.room_id == 0:
+                room_name = self.get_room_name(device.room_id)
+                if not room_name:
                     room_name = "Unknown"
-                else:
-                    room_name = self._room_map[device.room_id].name
                 device.room_name = room_name
                 device.friendly_name = f"{room_name} {device.name}"
                 device.ha_id = (
                     f"{slugify(room_name)}_{slugify(device.name)}_{device.fibaro_id}"
                 )
                 if device.enabled and (not device.is_plugin or self._import_plugins):
-                    device.mapped_platform = self._map_device_to_platform(device)
-                else:
-                    device.mapped_platform = None
-                if (platform := device.mapped_platform) is None:
+                    platform = self._map_device_to_platform(device)
+                if platform is None:
                     continue
                 device.unique_id_str = f"{slugify(self.hub_serial)}.{device.fibaro_id}"
                 self._create_device_info(device, devices)
@@ -375,11 +346,17 @@ class FibaroController:
                 pass
 
 
+def connect_fibaro_client(data: Mapping[str, Any]) -> tuple[InfoModel, FibaroClient]:
+    """Connect to the fibaro hub and read some basic data."""
+    client = FibaroClient(data[CONF_URL])
+    info = client.connect_with_credentials(data[CONF_USERNAME], data[CONF_PASSWORD])
+    return (info, client)
+
+
 def init_controller(data: Mapping[str, Any]) -> FibaroController:
-    """Validate the user input allows us to connect to fibaro."""
-    controller = FibaroController(data)
-    controller.connect_with_error_handling()
-    return controller
+    """Connect to the fibaro hub and init the controller."""
+    info, client = connect_fibaro_client(data)
+    return FibaroController(client, info, data[CONF_IMPORT_PLUGINS])
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: FibaroConfigEntry) -> bool:
@@ -393,22 +370,24 @@ async def async_setup_entry(hass: HomeAssistant, entry: FibaroConfigEntry) -> bo
         raise ConfigEntryNotReady(
             f"Could not connect to controller at {entry.data[CONF_URL]}"
         ) from connect_ex
-    except FibaroAuthFailed as auth_ex:
+    except FibaroAuthenticationFailed as auth_ex:
         raise ConfigEntryAuthFailed from auth_ex
 
     entry.runtime_data = controller
 
     # register the hub device info separately as the hub has sometimes no entities
+    fibaro_info = controller.read_fibaro_info()
     device_registry = dr.async_get(hass)
     device_registry.async_get_or_create(
         config_entry_id=entry.entry_id,
         identifiers={(DOMAIN, controller.hub_serial)},
         serial_number=controller.hub_serial,
-        manufacturer="Fibaro",
-        name=controller.hub_name,
-        model=controller.hub_model,
-        sw_version=controller.hub_software_version,
-        configuration_url=controller.hub_api_url.removesuffix("/api/"),
+        manufacturer=fibaro_info.manufacturer_name,
+        name=fibaro_info.hc_name,
+        model=fibaro_info.model_name,
+        sw_version=fibaro_info.current_version,
+        configuration_url=controller.get_frontend_url(),
+        connections={(dr.CONNECTION_NETWORK_MAC, fibaro_info.mac_address)},
     )
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
@@ -443,11 +422,3 @@ async def async_remove_config_entry_device(
             return False
 
     return True
-
-
-class FibaroConnectFailed(HomeAssistantError):
-    """Error to indicate we cannot connect to fibaro home center."""
-
-
-class FibaroAuthFailed(HomeAssistantError):
-    """Error to indicate that authentication failed on fibaro home center."""
diff --git a/homeassistant/components/fibaro/binary_sensor.py b/homeassistant/components/fibaro/binary_sensor.py
index 16e79c0c1d0..14c8f03f3ec 100644
--- a/homeassistant/components/fibaro/binary_sensor.py
+++ b/homeassistant/components/fibaro/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import FibaroConfigEntry
 from .entity import FibaroEntity
@@ -42,7 +42,7 @@ SENSOR_TYPES = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FibaroConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Perform the setup for Fibaro controller devices."""
     controller = entry.runtime_data
diff --git a/homeassistant/components/fibaro/climate.py b/homeassistant/components/fibaro/climate.py
index 45f700026a0..7a8cc3fd2a9 100644
--- a/homeassistant/components/fibaro/climate.py
+++ b/homeassistant/components/fibaro/climate.py
@@ -19,7 +19,7 @@ from homeassistant.components.climate import (
 )
 from homeassistant.const import ATTR_TEMPERATURE, Platform, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import FibaroConfigEntry
 from .entity import FibaroEntity
@@ -110,7 +110,7 @@ OP_MODE_ACTIONS = ("setMode", "setOperatingMode", "setThermostatMode")
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FibaroConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Perform the setup for Fibaro controller devices."""
     controller = entry.runtime_data
@@ -129,13 +129,13 @@ class FibaroThermostat(FibaroEntity, ClimateEntity):
     def __init__(self, fibaro_device: DeviceModel) -> None:
         """Initialize the Fibaro device."""
         super().__init__(fibaro_device)
-        self._temp_sensor_device: FibaroEntity | None = None
-        self._target_temp_device: FibaroEntity | None = None
-        self._op_mode_device: FibaroEntity | None = None
-        self._fan_mode_device: FibaroEntity | None = None
+        self._temp_sensor_device: DeviceModel | None = None
+        self._target_temp_device: DeviceModel | None = None
+        self._op_mode_device: DeviceModel | None = None
+        self._fan_mode_device: DeviceModel | None = None
         self.entity_id = ENTITY_ID_FORMAT.format(self.ha_id)
 
-        siblings = fibaro_device.fibaro_controller.get_siblings(fibaro_device)
+        siblings = self.controller.get_siblings(fibaro_device)
         _LOGGER.debug("%s siblings: %s", fibaro_device.ha_id, siblings)
         tempunit = "C"
         for device in siblings:
@@ -147,23 +147,23 @@ class FibaroThermostat(FibaroEntity, ClimateEntity):
                 and (device.value.has_value or device.has_heating_thermostat_setpoint)
                 and device.unit in ("C", "F")
             ):
-                self._temp_sensor_device = FibaroEntity(device)
+                self._temp_sensor_device = device
                 tempunit = device.unit
 
             if any(
                 action for action in TARGET_TEMP_ACTIONS if action in device.actions
             ):
-                self._target_temp_device = FibaroEntity(device)
+                self._target_temp_device = device
                 self._attr_supported_features |= ClimateEntityFeature.TARGET_TEMPERATURE
                 if device.has_unit:
                     tempunit = device.unit
 
             if any(action for action in OP_MODE_ACTIONS if action in device.actions):
-                self._op_mode_device = FibaroEntity(device)
+                self._op_mode_device = device
                 self._attr_supported_features |= ClimateEntityFeature.PRESET_MODE
 
             if "setFanMode" in device.actions:
-                self._fan_mode_device = FibaroEntity(device)
+                self._fan_mode_device = device
                 self._attr_supported_features |= ClimateEntityFeature.FAN_MODE
 
         if tempunit == "F":
@@ -172,7 +172,7 @@ class FibaroThermostat(FibaroEntity, ClimateEntity):
             self._attr_temperature_unit = UnitOfTemperature.CELSIUS
 
         if self._fan_mode_device:
-            fan_modes = self._fan_mode_device.fibaro_device.supported_modes
+            fan_modes = self._fan_mode_device.supported_modes
             self._attr_fan_modes = []
             for mode in fan_modes:
                 if mode not in FANMODES:
@@ -184,7 +184,7 @@ class FibaroThermostat(FibaroEntity, ClimateEntity):
         if self._op_mode_device:
             self._attr_preset_modes = []
             self._attr_hvac_modes: list[HVACMode] = []
-            device = self._op_mode_device.fibaro_device
+            device = self._op_mode_device
             if device.has_supported_thermostat_modes:
                 for mode in device.supported_thermostat_modes:
                     try:
@@ -222,15 +222,15 @@ class FibaroThermostat(FibaroEntity, ClimateEntity):
                 "- _fan_mode_device %s"
             ),
             self.ha_id,
-            self._temp_sensor_device.ha_id if self._temp_sensor_device else "None",
-            self._target_temp_device.ha_id if self._target_temp_device else "None",
-            self._op_mode_device.ha_id if self._op_mode_device else "None",
-            self._fan_mode_device.ha_id if self._fan_mode_device else "None",
+            self._temp_sensor_device.fibaro_id if self._temp_sensor_device else "None",
+            self._target_temp_device.fibaro_id if self._target_temp_device else "None",
+            self._op_mode_device.fibaro_id if self._op_mode_device else "None",
+            self._fan_mode_device.fibaro_id if self._fan_mode_device else "None",
         )
         await super().async_added_to_hass()
 
         # Register update callback for child devices
-        siblings = self.fibaro_device.fibaro_controller.get_siblings(self.fibaro_device)
+        siblings = self.controller.get_siblings(self.fibaro_device)
         for device in siblings:
             if device != self.fibaro_device:
                 self.controller.register(device.fibaro_id, self._update_callback)
@@ -240,14 +240,14 @@ class FibaroThermostat(FibaroEntity, ClimateEntity):
         """Return the fan setting."""
         if not self._fan_mode_device:
             return None
-        mode = self._fan_mode_device.fibaro_device.mode
+        mode = self._fan_mode_device.mode
         return FANMODES[mode]
 
     def set_fan_mode(self, fan_mode: str) -> None:
         """Set new target fan mode."""
         if not self._fan_mode_device:
             return
-        self._fan_mode_device.action("setFanMode", HA_FANMODES[fan_mode])
+        self._fan_mode_device.execute_action("setFanMode", [HA_FANMODES[fan_mode]])
 
     @property
     def fibaro_op_mode(self) -> str | int:
@@ -255,7 +255,7 @@ class FibaroThermostat(FibaroEntity, ClimateEntity):
         if not self._op_mode_device:
             return HA_OPMODES_HVAC[HVACMode.AUTO]
 
-        device = self._op_mode_device.fibaro_device
+        device = self._op_mode_device
 
         if device.has_operating_mode:
             return device.operating_mode
@@ -281,17 +281,17 @@ class FibaroThermostat(FibaroEntity, ClimateEntity):
         if not self._op_mode_device:
             return
 
-        if "setOperatingMode" in self._op_mode_device.fibaro_device.actions:
-            self._op_mode_device.action("setOperatingMode", HA_OPMODES_HVAC[hvac_mode])
-        elif "setThermostatMode" in self._op_mode_device.fibaro_device.actions:
-            device = self._op_mode_device.fibaro_device
+        device = self._op_mode_device
+        if "setOperatingMode" in device.actions:
+            device.execute_action("setOperatingMode", [HA_OPMODES_HVAC[hvac_mode]])
+        elif "setThermostatMode" in device.actions:
             if device.has_supported_thermostat_modes:
                 for mode in device.supported_thermostat_modes:
                     if mode.lower() == hvac_mode:
-                        self._op_mode_device.action("setThermostatMode", mode)
+                        device.execute_action("setThermostatMode", [mode])
                         break
-        elif "setMode" in self._op_mode_device.fibaro_device.actions:
-            self._op_mode_device.action("setMode", HA_OPMODES_HVAC[hvac_mode])
+        elif "setMode" in device.actions:
+            device.execute_action("setMode", [HA_OPMODES_HVAC[hvac_mode]])
 
     @property
     def hvac_action(self) -> HVACAction | None:
@@ -299,7 +299,7 @@ class FibaroThermostat(FibaroEntity, ClimateEntity):
         if not self._op_mode_device:
             return None
 
-        device = self._op_mode_device.fibaro_device
+        device = self._op_mode_device
         if device.has_thermostat_operating_state:
             with suppress(ValueError):
                 return HVACAction(device.thermostat_operating_state.lower())
@@ -315,15 +315,15 @@ class FibaroThermostat(FibaroEntity, ClimateEntity):
         if not self._op_mode_device:
             return None
 
-        if self._op_mode_device.fibaro_device.has_thermostat_mode:
-            mode = self._op_mode_device.fibaro_device.thermostat_mode
+        if self._op_mode_device.has_thermostat_mode:
+            mode = self._op_mode_device.thermostat_mode
             if self.preset_modes is not None and mode in self.preset_modes:
                 return mode
             return None
-        if self._op_mode_device.fibaro_device.has_operating_mode:
-            mode = self._op_mode_device.fibaro_device.operating_mode
+        if self._op_mode_device.has_operating_mode:
+            mode = self._op_mode_device.operating_mode
         else:
-            mode = self._op_mode_device.fibaro_device.mode
+            mode = self._op_mode_device.mode
 
         if mode not in OPMODES_PRESET:
             return None
@@ -334,20 +334,22 @@ class FibaroThermostat(FibaroEntity, ClimateEntity):
         if self._op_mode_device is None:
             return
 
-        if "setThermostatMode" in self._op_mode_device.fibaro_device.actions:
-            self._op_mode_device.action("setThermostatMode", preset_mode)
-        elif "setOperatingMode" in self._op_mode_device.fibaro_device.actions:
-            self._op_mode_device.action(
-                "setOperatingMode", HA_OPMODES_PRESET[preset_mode]
+        if "setThermostatMode" in self._op_mode_device.actions:
+            self._op_mode_device.execute_action("setThermostatMode", [preset_mode])
+        elif "setOperatingMode" in self._op_mode_device.actions:
+            self._op_mode_device.execute_action(
+                "setOperatingMode", [HA_OPMODES_PRESET[preset_mode]]
+            )
+        elif "setMode" in self._op_mode_device.actions:
+            self._op_mode_device.execute_action(
+                "setMode", [HA_OPMODES_PRESET[preset_mode]]
             )
-        elif "setMode" in self._op_mode_device.fibaro_device.actions:
-            self._op_mode_device.action("setMode", HA_OPMODES_PRESET[preset_mode])
 
     @property
     def current_temperature(self) -> float | None:
         """Return the current temperature."""
         if self._temp_sensor_device:
-            device = self._temp_sensor_device.fibaro_device
+            device = self._temp_sensor_device
             if device.has_heating_thermostat_setpoint:
                 return device.heating_thermostat_setpoint
             return device.value.float_value()
@@ -357,7 +359,7 @@ class FibaroThermostat(FibaroEntity, ClimateEntity):
     def target_temperature(self) -> float | None:
         """Return the temperature we try to reach."""
         if self._target_temp_device:
-            device = self._target_temp_device.fibaro_device
+            device = self._target_temp_device
             if device.has_heating_thermostat_setpoint_future:
                 return device.heating_thermostat_setpoint_future
             return device.target_level
@@ -368,9 +370,11 @@ class FibaroThermostat(FibaroEntity, ClimateEntity):
         temperature = kwargs.get(ATTR_TEMPERATURE)
         target = self._target_temp_device
         if target is not None and temperature is not None:
-            if "setThermostatSetpoint" in target.fibaro_device.actions:
-                target.action("setThermostatSetpoint", self.fibaro_op_mode, temperature)
-            elif "setHeatingThermostatSetpoint" in target.fibaro_device.actions:
-                target.action("setHeatingThermostatSetpoint", temperature)
+            if "setThermostatSetpoint" in target.actions:
+                target.execute_action(
+                    "setThermostatSetpoint", [self.fibaro_op_mode, temperature]
+                )
+            elif "setHeatingThermostatSetpoint" in target.actions:
+                target.execute_action("setHeatingThermostatSetpoint", [temperature])
             else:
-                target.action("setTargetLevel", temperature)
+                target.execute_action("setTargetLevel", [temperature])
diff --git a/homeassistant/components/fibaro/config_flow.py b/homeassistant/components/fibaro/config_flow.py
index 0ffd9aaa48f..d941ceab37f 100644
--- a/homeassistant/components/fibaro/config_flow.py
+++ b/homeassistant/components/fibaro/config_flow.py
@@ -6,6 +6,7 @@ from collections.abc import Mapping
 import logging
 from typing import Any
 
+from pyfibaro.fibaro_client import FibaroAuthenticationFailed, FibaroConnectFailed
 from slugify import slugify
 import voluptuous as vol
 
@@ -13,7 +14,7 @@ from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_NAME, CONF_PASSWORD, CONF_URL, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 
-from . import FibaroAuthFailed, FibaroConnectFailed, init_controller
+from . import connect_fibaro_client
 from .const import CONF_IMPORT_PLUGINS, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
@@ -33,16 +34,16 @@ async def _validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str
 
     Data has the keys from STEP_USER_DATA_SCHEMA with values provided by the user.
     """
-    controller = await hass.async_add_executor_job(init_controller, data)
+    info, _ = await hass.async_add_executor_job(connect_fibaro_client, data)
 
     _LOGGER.debug(
         "Successfully connected to fibaro home center %s with name %s",
-        controller.hub_serial,
-        controller.hub_name,
+        info.serial_number,
+        info.hc_name,
     )
     return {
-        "serial_number": slugify(controller.hub_serial),
-        "name": controller.hub_name,
+        "serial_number": slugify(info.serial_number),
+        "name": info.hc_name,
     }
 
 
@@ -75,7 +76,7 @@ class FibaroConfigFlow(ConfigFlow, domain=DOMAIN):
                 info = await _validate_input(self.hass, user_input)
             except FibaroConnectFailed:
                 errors["base"] = "cannot_connect"
-            except FibaroAuthFailed:
+            except FibaroAuthenticationFailed:
                 errors["base"] = "invalid_auth"
             else:
                 await self.async_set_unique_id(info["serial_number"])
@@ -106,7 +107,7 @@ class FibaroConfigFlow(ConfigFlow, domain=DOMAIN):
                 await _validate_input(self.hass, new_data)
             except FibaroConnectFailed:
                 errors["base"] = "cannot_connect"
-            except FibaroAuthFailed:
+            except FibaroAuthenticationFailed:
                 errors["base"] = "invalid_auth"
             else:
                 return self.async_update_reload_and_abort(
diff --git a/homeassistant/components/fibaro/cover.py b/homeassistant/components/fibaro/cover.py
index bfebbf87bd2..0008b56345e 100644
--- a/homeassistant/components/fibaro/cover.py
+++ b/homeassistant/components/fibaro/cover.py
@@ -15,7 +15,7 @@ from homeassistant.components.cover import (
 )
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import FibaroConfigEntry
 from .entity import FibaroEntity
@@ -24,7 +24,7 @@ from .entity import FibaroEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FibaroConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Fibaro covers."""
     controller = entry.runtime_data
diff --git a/homeassistant/components/fibaro/entity.py b/homeassistant/components/fibaro/entity.py
index 6a8e12136c8..5375b058315 100644
--- a/homeassistant/components/fibaro/entity.py
+++ b/homeassistant/components/fibaro/entity.py
@@ -11,6 +11,8 @@ from pyfibaro.fibaro_device import DeviceModel
 from homeassistant.const import ATTR_ARMED, ATTR_BATTERY_LEVEL
 from homeassistant.helpers.entity import Entity
 
+from . import FibaroController
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -22,7 +24,7 @@ class FibaroEntity(Entity):
     def __init__(self, fibaro_device: DeviceModel) -> None:
         """Initialize the device."""
         self.fibaro_device = fibaro_device
-        self.controller = fibaro_device.fibaro_controller
+        self.controller: FibaroController = fibaro_device.fibaro_controller
         self.ha_id = fibaro_device.ha_id
         self._attr_name = fibaro_device.friendly_name
         self._attr_unique_id = fibaro_device.unique_id_str
@@ -54,15 +56,6 @@ class FibaroEntity(Entity):
             return self.fibaro_device.value_2.int_value()
         return None
 
-    def dont_know_message(self, cmd: str) -> None:
-        """Make a warning in case we don't know how to perform an action."""
-        _LOGGER.warning(
-            "Not sure how to %s: %s (available actions: %s)",
-            cmd,
-            str(self.ha_id),
-            str(self.fibaro_device.actions),
-        )
-
     def set_level(self, level: int) -> None:
         """Set the level of Fibaro device."""
         self.action("setValue", level)
@@ -97,11 +90,7 @@ class FibaroEntity(Entity):
 
     def action(self, cmd: str, *args: Any) -> None:
         """Perform an action on the Fibaro HC."""
-        if cmd in self.fibaro_device.actions:
-            self.fibaro_device.execute_action(cmd, args)
-            _LOGGER.debug("-> %s.%s%s called", str(self.ha_id), str(cmd), str(args))
-        else:
-            self.dont_know_message(cmd)
+        self.fibaro_device.execute_action(cmd, args)
 
     @property
     def current_binary_state(self) -> bool:
diff --git a/homeassistant/components/fibaro/event.py b/homeassistant/components/fibaro/event.py
index a2d5da7f877..0beea2e336e 100644
--- a/homeassistant/components/fibaro/event.py
+++ b/homeassistant/components/fibaro/event.py
@@ -12,7 +12,7 @@ from homeassistant.components.event import (
 )
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import FibaroConfigEntry
 from .entity import FibaroEntity
@@ -21,7 +21,7 @@ from .entity import FibaroEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FibaroConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Fibaro event entities."""
     controller = entry.runtime_data
diff --git a/homeassistant/components/fibaro/light.py b/homeassistant/components/fibaro/light.py
index d40e26244f3..446b9b9f7ff 100644
--- a/homeassistant/components/fibaro/light.py
+++ b/homeassistant/components/fibaro/light.py
@@ -19,7 +19,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import FibaroConfigEntry
 from .entity import FibaroEntity
@@ -51,7 +51,7 @@ def scaleto99(value: int | None) -> int:
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FibaroConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Perform the setup for Fibaro controller devices."""
     controller = entry.runtime_data
diff --git a/homeassistant/components/fibaro/lock.py b/homeassistant/components/fibaro/lock.py
index 62a9dfa43b1..a1e76109e2d 100644
--- a/homeassistant/components/fibaro/lock.py
+++ b/homeassistant/components/fibaro/lock.py
@@ -9,7 +9,7 @@ from pyfibaro.fibaro_device import DeviceModel
 from homeassistant.components.lock import ENTITY_ID_FORMAT, LockEntity
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import FibaroConfigEntry
 from .entity import FibaroEntity
@@ -18,7 +18,7 @@ from .entity import FibaroEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FibaroConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Fibaro locks."""
     controller = entry.runtime_data
diff --git a/homeassistant/components/fibaro/manifest.json b/homeassistant/components/fibaro/manifest.json
index d2a1186b05b..cd4d1de838c 100644
--- a/homeassistant/components/fibaro/manifest.json
+++ b/homeassistant/components/fibaro/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["pyfibaro"],
-  "requirements": ["pyfibaro==0.8.0"]
+  "requirements": ["pyfibaro==0.8.2"]
 }
diff --git a/homeassistant/components/fibaro/scene.py b/homeassistant/components/fibaro/scene.py
index a4c0f1bd7f1..8a594506f27 100644
--- a/homeassistant/components/fibaro/scene.py
+++ b/homeassistant/components/fibaro/scene.py
@@ -9,7 +9,7 @@ from pyfibaro.fibaro_scene import SceneModel
 from homeassistant.components.scene import Scene
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import slugify
 
 from . import FibaroConfigEntry, FibaroController
@@ -19,7 +19,7 @@ from .const import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FibaroConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Perform the setup for Fibaro scenes."""
     controller = entry.runtime_data
diff --git a/homeassistant/components/fibaro/sensor.py b/homeassistant/components/fibaro/sensor.py
index 245a0d087d8..9034bd7d05e 100644
--- a/homeassistant/components/fibaro/sensor.py
+++ b/homeassistant/components/fibaro/sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import convert
 
 from . import FibaroConfigEntry
@@ -102,7 +102,7 @@ FIBARO_TO_HASS_UNIT: dict[str, str] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FibaroConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Fibaro controller devices."""
 
diff --git a/homeassistant/components/fibaro/switch.py b/homeassistant/components/fibaro/switch.py
index f67683dff6a..8d77685c1e7 100644
--- a/homeassistant/components/fibaro/switch.py
+++ b/homeassistant/components/fibaro/switch.py
@@ -9,7 +9,7 @@ from pyfibaro.fibaro_device import DeviceModel
 from homeassistant.components.switch import ENTITY_ID_FORMAT, SwitchEntity
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import FibaroConfigEntry
 from .entity import FibaroEntity
@@ -18,7 +18,7 @@ from .entity import FibaroEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FibaroConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Fibaro switches."""
     controller = entry.runtime_data
diff --git a/homeassistant/components/fido/sensor.py b/homeassistant/components/fido/sensor.py
index bc6e6340111..86e81a596d7 100644
--- a/homeassistant/components/fido/sensor.py
+++ b/homeassistant/components/fido/sensor.py
@@ -28,8 +28,8 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/file/notify.py b/homeassistant/components/file/notify.py
index 10e3d4a4ac6..90af1677bce 100644
--- a/homeassistant/components/file/notify.py
+++ b/homeassistant/components/file/notify.py
@@ -14,8 +14,8 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_FILE_PATH, CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from .const import CONF_TIMESTAMP, DEFAULT_NAME, DOMAIN, FILE_ICON
 
@@ -23,7 +23,7 @@ from .const import CONF_TIMESTAMP, DEFAULT_NAME, DOMAIN, FILE_ICON
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up notify entity."""
     unique_id = entry.entry_id
diff --git a/homeassistant/components/file/sensor.py b/homeassistant/components/file/sensor.py
index 879c06e29f3..b8d174afe2c 100644
--- a/homeassistant/components/file/sensor.py
+++ b/homeassistant/components/file/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
     CONF_VALUE_TEMPLATE,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.template import Template
 
 from .const import DEFAULT_NAME, FILE_ICON
@@ -27,7 +27,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the file sensor."""
     config = dict(entry.data)
diff --git a/homeassistant/components/file_upload/__init__.py b/homeassistant/components/file_upload/__init__.py
index 97b3f83d5bc..6b0a1423e49 100644
--- a/homeassistant/components/file_upload/__init__.py
+++ b/homeassistant/components/file_upload/__init__.py
@@ -21,9 +21,11 @@ from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import raise_if_invalid_filename
+from homeassistant.util.hass_dict import HassKey
 from homeassistant.util.ulid import ulid_hex
 
 DOMAIN = "file_upload"
+_DATA: HassKey[FileUploadData] = HassKey(DOMAIN)
 
 ONE_MEGABYTE = 1024 * 1024
 MAX_SIZE = 100 * ONE_MEGABYTE
@@ -41,7 +43,7 @@ def process_uploaded_file(hass: HomeAssistant, file_id: str) -> Iterator[Path]:
     if DOMAIN not in hass.data:
         raise ValueError("File does not exist")
 
-    file_upload_data: FileUploadData = hass.data[DOMAIN]
+    file_upload_data = hass.data[_DATA]
 
     if not file_upload_data.has_file(file_id):
         raise ValueError("File does not exist")
@@ -149,10 +151,10 @@ class FileUploadView(HomeAssistantView):
         hass = request.app[KEY_HASS]
         file_id = ulid_hex()
 
-        if DOMAIN not in hass.data:
-            hass.data[DOMAIN] = await FileUploadData.create(hass)
+        if _DATA not in hass.data:
+            hass.data[_DATA] = await FileUploadData.create(hass)
 
-        file_upload_data: FileUploadData = hass.data[DOMAIN]
+        file_upload_data = hass.data[_DATA]
         file_dir = file_upload_data.file_dir(file_id)
         queue: SimpleQueue[tuple[bytes, asyncio.Future[None] | None] | None] = (
             SimpleQueue()
@@ -206,7 +208,7 @@ class FileUploadView(HomeAssistantView):
             raise web.HTTPNotFound
 
         file_id = data["file_id"]
-        file_upload_data: FileUploadData = hass.data[DOMAIN]
+        file_upload_data = hass.data[_DATA]
 
         if file_upload_data.files.pop(file_id, None) is None:
             raise web.HTTPNotFound
diff --git a/homeassistant/components/filesize/__init__.py b/homeassistant/components/filesize/__init__.py
index 602eac1f24d..b10125de67c 100644
--- a/homeassistant/components/filesize/__init__.py
+++ b/homeassistant/components/filesize/__init__.py
@@ -2,19 +2,15 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_FILE_PATH
 from homeassistant.core import HomeAssistant
 
 from .const import PLATFORMS
-from .coordinator import FileSizeCoordinator
-
-type FileSizeConfigEntry = ConfigEntry[FileSizeCoordinator]
+from .coordinator import FileSizeConfigEntry, FileSizeCoordinator
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: FileSizeConfigEntry) -> bool:
     """Set up from a config entry."""
-    coordinator = FileSizeCoordinator(hass, entry.data[CONF_FILE_PATH])
+    coordinator = FileSizeCoordinator(hass, entry)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
 
@@ -22,6 +18,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: FileSizeConfigEntry) ->
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: FileSizeConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/filesize/coordinator.py b/homeassistant/components/filesize/coordinator.py
index 8350cee91bf..87f59f1a53e 100644
--- a/homeassistant/components/filesize/coordinator.py
+++ b/homeassistant/components/filesize/coordinator.py
@@ -7,30 +7,36 @@ import logging
 import os
 import pathlib
 
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_FILE_PATH
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
+type FileSizeConfigEntry = ConfigEntry[FileSizeCoordinator]
+
 
 class FileSizeCoordinator(DataUpdateCoordinator[dict[str, int | float | datetime]]):
     """Filesize coordinator."""
 
+    config_entry: FileSizeConfigEntry
     path: pathlib.Path
 
-    def __init__(self, hass: HomeAssistant, unresolved_path: str) -> None:
+    def __init__(self, hass: HomeAssistant, config_entry: FileSizeConfigEntry) -> None:
         """Initialize filesize coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=60),
             always_update=False,
         )
-        self._unresolved_path = unresolved_path
+        self._unresolved_path = self.config_entry.data[CONF_FILE_PATH]
 
     def _get_full_path(self) -> pathlib.Path:
         """Check if path is valid, allowed and return full path."""
diff --git a/homeassistant/components/filesize/sensor.py b/homeassistant/components/filesize/sensor.py
index 2eb170af99d..966e253660d 100644
--- a/homeassistant/components/filesize/sensor.py
+++ b/homeassistant/components/filesize/sensor.py
@@ -14,12 +14,11 @@ from homeassistant.components.sensor import (
 from homeassistant.const import EntityCategory, UnitOfInformation
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import FileSizeConfigEntry
 from .const import DOMAIN
-from .coordinator import FileSizeCoordinator
+from .coordinator import FileSizeConfigEntry, FileSizeCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -60,7 +59,7 @@ SENSOR_TYPES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FileSizeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the platform from config entry."""
     async_add_entities(
diff --git a/homeassistant/components/filter/__init__.py b/homeassistant/components/filter/__init__.py
index 7f3f6cbfffc..9a4f4913c9f 100644
--- a/homeassistant/components/filter/__init__.py
+++ b/homeassistant/components/filter/__init__.py
@@ -1,6 +1,25 @@
 """The filter component."""
 
-from homeassistant.const import Platform
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
 
-DOMAIN = "filter"
-PLATFORMS = [Platform.SENSOR]
+from .const import PLATFORMS
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up Filter from a config entry."""
+
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    entry.async_on_unload(entry.add_update_listener(update_listener))
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload Filter config entry."""
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+
+async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Handle options update."""
+    await hass.config_entries.async_reload(entry.entry_id)
diff --git a/homeassistant/components/filter/config_flow.py b/homeassistant/components/filter/config_flow.py
new file mode 100644
index 00000000000..dac2d8995bf
--- /dev/null
+++ b/homeassistant/components/filter/config_flow.py
@@ -0,0 +1,243 @@
+"""Config flow for filter."""
+
+from __future__ import annotations
+
+from collections.abc import Mapping
+from typing import Any, cast
+
+import voluptuous as vol
+
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
+from homeassistant.const import CONF_ENTITY_ID, CONF_NAME
+from homeassistant.helpers.schema_config_entry_flow import (
+    SchemaCommonFlowHandler,
+    SchemaConfigFlowHandler,
+    SchemaFlowFormStep,
+)
+from homeassistant.helpers.selector import (
+    DurationSelector,
+    DurationSelectorConfig,
+    EntitySelector,
+    EntitySelectorConfig,
+    NumberSelector,
+    NumberSelectorConfig,
+    NumberSelectorMode,
+    SelectSelector,
+    SelectSelectorConfig,
+    SelectSelectorMode,
+    TextSelector,
+)
+
+from .const import (
+    CONF_FILTER_LOWER_BOUND,
+    CONF_FILTER_NAME,
+    CONF_FILTER_PRECISION,
+    CONF_FILTER_RADIUS,
+    CONF_FILTER_TIME_CONSTANT,
+    CONF_FILTER_UPPER_BOUND,
+    CONF_FILTER_WINDOW_SIZE,
+    CONF_TIME_SMA_TYPE,
+    DEFAULT_FILTER_RADIUS,
+    DEFAULT_FILTER_TIME_CONSTANT,
+    DEFAULT_NAME,
+    DEFAULT_PRECISION,
+    DEFAULT_WINDOW_SIZE,
+    DOMAIN,
+    FILTER_NAME_LOWPASS,
+    FILTER_NAME_OUTLIER,
+    FILTER_NAME_RANGE,
+    FILTER_NAME_THROTTLE,
+    FILTER_NAME_TIME_SMA,
+    FILTER_NAME_TIME_THROTTLE,
+    TIME_SMA_LAST,
+)
+
+FILTERS = [
+    FILTER_NAME_LOWPASS,
+    FILTER_NAME_OUTLIER,
+    FILTER_NAME_RANGE,
+    FILTER_NAME_THROTTLE,
+    FILTER_NAME_TIME_SMA,
+    FILTER_NAME_TIME_THROTTLE,
+]
+
+
+async def get_next_step(user_input: dict[str, Any]) -> str:
+    """Return next step for options."""
+    return cast(str, user_input[CONF_FILTER_NAME])
+
+
+async def validate_options(
+    handler: SchemaCommonFlowHandler, user_input: dict[str, Any]
+) -> dict[str, Any]:
+    """Validate options selected."""
+
+    if CONF_FILTER_WINDOW_SIZE in user_input and isinstance(
+        user_input[CONF_FILTER_WINDOW_SIZE], float
+    ):
+        user_input[CONF_FILTER_WINDOW_SIZE] = int(user_input[CONF_FILTER_WINDOW_SIZE])
+    if CONF_FILTER_TIME_CONSTANT in user_input:
+        user_input[CONF_FILTER_TIME_CONSTANT] = int(
+            user_input[CONF_FILTER_TIME_CONSTANT]
+        )
+    if CONF_FILTER_PRECISION in user_input:
+        user_input[CONF_FILTER_PRECISION] = int(user_input[CONF_FILTER_PRECISION])
+
+    handler.parent_handler._async_abort_entries_match({**handler.options, **user_input})  # noqa: SLF001
+
+    return user_input
+
+
+DATA_SCHEMA_SETUP = vol.Schema(
+    {
+        vol.Required(CONF_NAME, default=DEFAULT_NAME): TextSelector(),
+        vol.Required(CONF_ENTITY_ID): EntitySelector(
+            EntitySelectorConfig(domain=[SENSOR_DOMAIN])
+        ),
+        vol.Required(CONF_FILTER_NAME): SelectSelector(
+            SelectSelectorConfig(
+                options=FILTERS,
+                mode=SelectSelectorMode.DROPDOWN,
+                translation_key=CONF_FILTER_NAME,
+            )
+        ),
+    }
+)
+
+BASE_OPTIONS_SCHEMA = {
+    vol.Optional(CONF_FILTER_PRECISION, default=DEFAULT_PRECISION): NumberSelector(
+        NumberSelectorConfig(min=0, step=1, mode=NumberSelectorMode.BOX)
+    )
+}
+
+OUTLIER_SCHEMA = vol.Schema(
+    {
+        vol.Optional(
+            CONF_FILTER_WINDOW_SIZE, default=DEFAULT_WINDOW_SIZE
+        ): NumberSelector(
+            NumberSelectorConfig(min=0, step=1, mode=NumberSelectorMode.BOX)
+        ),
+        vol.Optional(CONF_FILTER_RADIUS, default=DEFAULT_FILTER_RADIUS): NumberSelector(
+            NumberSelectorConfig(min=0, step="any", mode=NumberSelectorMode.BOX)
+        ),
+    }
+).extend(BASE_OPTIONS_SCHEMA)
+
+LOWPASS_SCHEMA = vol.Schema(
+    {
+        vol.Optional(
+            CONF_FILTER_WINDOW_SIZE, default=DEFAULT_WINDOW_SIZE
+        ): NumberSelector(
+            NumberSelectorConfig(min=0, step=1, mode=NumberSelectorMode.BOX)
+        ),
+        vol.Optional(
+            CONF_FILTER_TIME_CONSTANT, default=DEFAULT_FILTER_TIME_CONSTANT
+        ): NumberSelector(
+            NumberSelectorConfig(min=0, step=1, mode=NumberSelectorMode.BOX)
+        ),
+    }
+).extend(BASE_OPTIONS_SCHEMA)
+
+RANGE_SCHEMA = vol.Schema(
+    {
+        vol.Optional(CONF_FILTER_LOWER_BOUND): NumberSelector(
+            NumberSelectorConfig(min=0, step="any", mode=NumberSelectorMode.BOX)
+        ),
+        vol.Optional(CONF_FILTER_UPPER_BOUND): NumberSelector(
+            NumberSelectorConfig(min=0, step="any", mode=NumberSelectorMode.BOX)
+        ),
+    }
+).extend(BASE_OPTIONS_SCHEMA)
+
+TIME_SMA_SCHEMA = vol.Schema(
+    {
+        vol.Optional(CONF_TIME_SMA_TYPE, default=TIME_SMA_LAST): SelectSelector(
+            SelectSelectorConfig(
+                options=[TIME_SMA_LAST],
+                mode=SelectSelectorMode.DROPDOWN,
+                translation_key=CONF_TIME_SMA_TYPE,
+            )
+        ),
+        vol.Required(CONF_FILTER_WINDOW_SIZE): DurationSelector(
+            DurationSelectorConfig(enable_day=False, allow_negative=False)
+        ),
+    }
+).extend(BASE_OPTIONS_SCHEMA)
+
+THROTTLE_SCHEMA = vol.Schema(
+    {
+        vol.Optional(
+            CONF_FILTER_WINDOW_SIZE, default=DEFAULT_WINDOW_SIZE
+        ): NumberSelector(
+            NumberSelectorConfig(min=0, step=1, mode=NumberSelectorMode.BOX)
+        ),
+    }
+).extend(BASE_OPTIONS_SCHEMA)
+
+TIME_THROTTLE_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_FILTER_WINDOW_SIZE): DurationSelector(
+            DurationSelectorConfig(enable_day=False, allow_negative=False)
+        ),
+    }
+).extend(BASE_OPTIONS_SCHEMA)
+
+CONFIG_FLOW = {
+    "user": SchemaFlowFormStep(
+        schema=DATA_SCHEMA_SETUP,
+        next_step=get_next_step,
+    ),
+    "lowpass": SchemaFlowFormStep(
+        schema=LOWPASS_SCHEMA, validate_user_input=validate_options
+    ),
+    "outlier": SchemaFlowFormStep(
+        schema=OUTLIER_SCHEMA, validate_user_input=validate_options
+    ),
+    "range": SchemaFlowFormStep(
+        schema=RANGE_SCHEMA, validate_user_input=validate_options
+    ),
+    "time_simple_moving_average": SchemaFlowFormStep(
+        schema=TIME_SMA_SCHEMA, validate_user_input=validate_options
+    ),
+    "throttle": SchemaFlowFormStep(
+        schema=THROTTLE_SCHEMA, validate_user_input=validate_options
+    ),
+    "time_throttle": SchemaFlowFormStep(
+        schema=TIME_THROTTLE_SCHEMA, validate_user_input=validate_options
+    ),
+}
+OPTIONS_FLOW = {
+    "init": SchemaFlowFormStep(
+        schema=None,
+        next_step=get_next_step,
+    ),
+    "lowpass": SchemaFlowFormStep(
+        schema=LOWPASS_SCHEMA, validate_user_input=validate_options
+    ),
+    "outlier": SchemaFlowFormStep(
+        schema=OUTLIER_SCHEMA, validate_user_input=validate_options
+    ),
+    "range": SchemaFlowFormStep(
+        schema=RANGE_SCHEMA, validate_user_input=validate_options
+    ),
+    "time_simple_moving_average": SchemaFlowFormStep(
+        schema=TIME_SMA_SCHEMA, validate_user_input=validate_options
+    ),
+    "throttle": SchemaFlowFormStep(
+        schema=THROTTLE_SCHEMA, validate_user_input=validate_options
+    ),
+    "time_throttle": SchemaFlowFormStep(
+        schema=TIME_THROTTLE_SCHEMA, validate_user_input=validate_options
+    ),
+}
+
+
+class FilterConfigFlowHandler(SchemaConfigFlowHandler, domain=DOMAIN):
+    """Handle a config flow for Filter."""
+
+    config_flow = CONFIG_FLOW
+    options_flow = OPTIONS_FLOW
+
+    def async_config_entry_title(self, options: Mapping[str, Any]) -> str:
+        """Return config entry title."""
+        return cast(str, options[CONF_NAME])
diff --git a/homeassistant/components/filter/const.py b/homeassistant/components/filter/const.py
new file mode 100644
index 00000000000..92d2498528e
--- /dev/null
+++ b/homeassistant/components/filter/const.py
@@ -0,0 +1,36 @@
+"""The filter component constants."""
+
+from homeassistant.const import Platform
+
+DOMAIN = "filter"
+PLATFORMS = [Platform.SENSOR]
+
+CONF_INDEX = "index"
+
+FILTER_NAME_RANGE = "range"
+FILTER_NAME_LOWPASS = "lowpass"
+FILTER_NAME_OUTLIER = "outlier"
+FILTER_NAME_THROTTLE = "throttle"
+FILTER_NAME_TIME_THROTTLE = "time_throttle"
+FILTER_NAME_TIME_SMA = "time_simple_moving_average"
+
+CONF_FILTERS = "filters"
+CONF_FILTER_NAME = "filter"
+CONF_FILTER_WINDOW_SIZE = "window_size"
+CONF_FILTER_PRECISION = "precision"
+CONF_FILTER_RADIUS = "radius"
+CONF_FILTER_TIME_CONSTANT = "time_constant"
+CONF_FILTER_LOWER_BOUND = "lower_bound"
+CONF_FILTER_UPPER_BOUND = "upper_bound"
+CONF_TIME_SMA_TYPE = "type"
+
+TIME_SMA_LAST = "last"
+
+WINDOW_SIZE_UNIT_NUMBER_EVENTS = 1
+WINDOW_SIZE_UNIT_TIME = 2
+
+DEFAULT_NAME = "Filtered sensor"
+DEFAULT_WINDOW_SIZE = 1
+DEFAULT_PRECISION = 2
+DEFAULT_FILTER_RADIUS = 2.0
+DEFAULT_FILTER_TIME_CONSTANT = 10
diff --git a/homeassistant/components/filter/manifest.json b/homeassistant/components/filter/manifest.json
index 4d9a8992036..392351a235d 100644
--- a/homeassistant/components/filter/manifest.json
+++ b/homeassistant/components/filter/manifest.json
@@ -2,6 +2,7 @@
   "domain": "filter",
   "name": "Filter",
   "codeowners": ["@dgomes"],
+  "config_flow": true,
   "dependencies": ["recorder"],
   "documentation": "https://www.home-assistant.io/integrations/filter",
   "integration_type": "helper",
diff --git a/homeassistant/components/filter/sensor.py b/homeassistant/components/filter/sensor.py
index 549d74ffd09..eb1337002e4 100644
--- a/homeassistant/components/filter/sensor.py
+++ b/homeassistant/components/filter/sensor.py
@@ -24,6 +24,7 @@ from homeassistant.components.sensor import (
     SensorDeviceClass,
     SensorEntity,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_DEVICE_CLASS,
     ATTR_ENTITY_ID,
@@ -42,48 +43,49 @@ from homeassistant.core import (
     State,
     callback,
 )
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.helpers.reload import async_setup_reload_service
 from homeassistant.helpers.start import async_at_started
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, StateType
+from homeassistant.util import dt as dt_util
 from homeassistant.util.decorator import Registry
-import homeassistant.util.dt as dt_util
 
-from . import DOMAIN, PLATFORMS
+from .const import (
+    CONF_FILTER_LOWER_BOUND,
+    CONF_FILTER_NAME,
+    CONF_FILTER_PRECISION,
+    CONF_FILTER_RADIUS,
+    CONF_FILTER_TIME_CONSTANT,
+    CONF_FILTER_UPPER_BOUND,
+    CONF_FILTER_WINDOW_SIZE,
+    CONF_FILTERS,
+    CONF_TIME_SMA_TYPE,
+    DEFAULT_FILTER_RADIUS,
+    DEFAULT_FILTER_TIME_CONSTANT,
+    DEFAULT_PRECISION,
+    DEFAULT_WINDOW_SIZE,
+    DOMAIN,
+    FILTER_NAME_LOWPASS,
+    FILTER_NAME_OUTLIER,
+    FILTER_NAME_RANGE,
+    FILTER_NAME_THROTTLE,
+    FILTER_NAME_TIME_SMA,
+    FILTER_NAME_TIME_THROTTLE,
+    PLATFORMS,
+    TIME_SMA_LAST,
+    WINDOW_SIZE_UNIT_NUMBER_EVENTS,
+    WINDOW_SIZE_UNIT_TIME,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
-FILTER_NAME_RANGE = "range"
-FILTER_NAME_LOWPASS = "lowpass"
-FILTER_NAME_OUTLIER = "outlier"
-FILTER_NAME_THROTTLE = "throttle"
-FILTER_NAME_TIME_THROTTLE = "time_throttle"
-FILTER_NAME_TIME_SMA = "time_simple_moving_average"
 FILTERS: Registry[str, type[Filter]] = Registry()
 
-CONF_FILTERS = "filters"
-CONF_FILTER_NAME = "filter"
-CONF_FILTER_WINDOW_SIZE = "window_size"
-CONF_FILTER_PRECISION = "precision"
-CONF_FILTER_RADIUS = "radius"
-CONF_FILTER_TIME_CONSTANT = "time_constant"
-CONF_FILTER_LOWER_BOUND = "lower_bound"
-CONF_FILTER_UPPER_BOUND = "upper_bound"
-CONF_TIME_SMA_TYPE = "type"
-
-TIME_SMA_LAST = "last"
-
-WINDOW_SIZE_UNIT_NUMBER_EVENTS = 1
-WINDOW_SIZE_UNIT_TIME = 2
-
-DEFAULT_WINDOW_SIZE = 1
-DEFAULT_PRECISION = 2
-DEFAULT_FILTER_RADIUS = 2.0
-DEFAULT_FILTER_TIME_CONSTANT = 10
-
-NAME_TEMPLATE = "{} filter"
 ICON = "mdi:chart-line-variant"
 
 FILTER_SCHEMA = vol.Schema({vol.Optional(CONF_FILTER_PRECISION): vol.Coerce(int)})
@@ -199,6 +201,32 @@ async def async_setup_platform(
     async_add_entities([SensorFilter(name, unique_id, entity_id, filters)])
 
 
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the Filter sensor entry."""
+    name: str = entry.options[CONF_NAME]
+    entity_id: str = entry.options[CONF_ENTITY_ID]
+
+    filter_config = {
+        k: v for k, v in entry.options.items() if k not in (CONF_NAME, CONF_ENTITY_ID)
+    }
+    if CONF_FILTER_WINDOW_SIZE in filter_config and isinstance(
+        filter_config[CONF_FILTER_WINDOW_SIZE], dict
+    ):
+        filter_config[CONF_FILTER_WINDOW_SIZE] = timedelta(
+            **filter_config[CONF_FILTER_WINDOW_SIZE]
+        )
+
+    filters = [
+        FILTERS[filter_config.pop(CONF_FILTER_NAME)](entity=entity_id, **filter_config)
+    ]
+
+    async_add_entities([SensorFilter(name, entry.entry_id, entity_id, filters)])
+
+
 class SensorFilter(SensorEntity):
     """Representation of a Filter Sensor."""
 
diff --git a/homeassistant/components/filter/strings.json b/homeassistant/components/filter/strings.json
index 2a83a05bb96..b0403227fd4 100644
--- a/homeassistant/components/filter/strings.json
+++ b/homeassistant/components/filter/strings.json
@@ -1,5 +1,197 @@
 {
   "title": "Filter",
+  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
+    },
+    "step": {
+      "user": {
+        "description": "Add a filter sensor. UI configuration is limited to a single filter, use YAML for filter chain.",
+        "data": {
+          "name": "[%key:common::config_flow::data::name%]",
+          "entity_id": "Entity",
+          "filter": "Filter"
+        },
+        "data_description": {
+          "name": "Name for the created entity.",
+          "entity_id": "Entity to filter from.",
+          "filter": "Select filter to configure."
+        }
+      },
+      "outlier": {
+        "description": "Read the documentation for further details on how to configure the filter sensor using these options.",
+        "data": {
+          "window_size": "Window size",
+          "precision": "Precision",
+          "radius": "Radius"
+        },
+        "data_description": {
+          "window_size": "Size of the window of previous states.",
+          "precision": "Defines the number of decimal places of the calculated sensor value.",
+          "radius": "Band radius from median of previous states."
+        }
+      },
+      "lowpass": {
+        "description": "[%key:component::filter::config::step::outlier::description%]",
+        "data": {
+          "window_size": "[%key:component::filter::config::step::outlier::data::window_size%]",
+          "precision": "[%key:component::filter::config::step::outlier::data::precision%]",
+          "time_constant": "Time constant"
+        },
+        "data_description": {
+          "window_size": "[%key:component::filter::config::step::outlier::data_description::window_size%]",
+          "precision": "[%key:component::filter::config::step::outlier::data_description::precision%]",
+          "time_constant": "Loosely relates to the amount of time it takes for a state to influence the output."
+        }
+      },
+      "range": {
+        "description": "[%key:component::filter::config::step::outlier::description%]",
+        "data": {
+          "precision": "[%key:component::filter::config::step::outlier::data::precision%]",
+          "lower_bound": "Lower bound",
+          "upper_bound": "Upper bound"
+        },
+        "data_description": {
+          "precision": "[%key:component::filter::config::step::outlier::data_description::precision%]",
+          "lower_bound": "Lower bound for filter range.",
+          "upper_bound": "Upper bound for filter range."
+        }
+      },
+      "time_simple_moving_average": {
+        "description": "[%key:component::filter::config::step::outlier::description%]",
+        "data": {
+          "window_size": "[%key:component::filter::config::step::outlier::data::window_size%]",
+          "precision": "[%key:component::filter::config::step::outlier::data::precision%]",
+          "type": "Type"
+        },
+        "data_description": {
+          "window_size": "[%key:component::filter::config::step::outlier::data_description::window_size%]",
+          "precision": "[%key:component::filter::config::step::outlier::data_description::precision%]",
+          "type": "Defines the type of Simple Moving Average."
+        }
+      },
+      "throttle": {
+        "description": "[%key:component::filter::config::step::outlier::description%]",
+        "data": {
+          "window_size": "[%key:component::filter::config::step::outlier::data::window_size%]",
+          "precision": "[%key:component::filter::config::step::outlier::data::precision%]"
+        },
+        "data_description": {
+          "window_size": "[%key:component::filter::config::step::outlier::data_description::window_size%]",
+          "precision": "[%key:component::filter::config::step::outlier::data_description::precision%]"
+        }
+      },
+      "time_throttle": {
+        "description": "[%key:component::filter::config::step::outlier::description%]",
+        "data": {
+          "window_size": "[%key:component::filter::config::step::outlier::data::window_size%]",
+          "precision": "[%key:component::filter::config::step::outlier::data::precision%]"
+        },
+        "data_description": {
+          "window_size": "[%key:component::filter::config::step::outlier::data_description::window_size%]",
+          "precision": "[%key:component::filter::config::step::outlier::data_description::precision%]"
+        }
+      }
+    }
+  },
+  "options": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
+    },
+    "step": {
+      "outlier": {
+        "description": "[%key:component::filter::config::step::outlier::description%]",
+        "data": {
+          "window_size": "[%key:component::filter::config::step::outlier::data::window_size%]",
+          "precision": "[%key:component::filter::config::step::outlier::data::precision%]",
+          "radius": "[%key:component::filter::config::step::outlier::data::radius%]"
+        },
+        "data_description": {
+          "window_size": "[%key:component::filter::config::step::outlier::data_description::window_size%]",
+          "precision": "[%key:component::filter::config::step::outlier::data_description::precision%]",
+          "radius": "[%key:component::filter::config::step::outlier::data_description::radius%]"
+        }
+      },
+      "lowpass": {
+        "description": "[%key:component::filter::config::step::outlier::description%]",
+        "data": {
+          "window_size": "[%key:component::filter::config::step::outlier::data::window_size%]",
+          "precision": "[%key:component::filter::config::step::outlier::data::precision%]",
+          "time_constant": "[%key:component::filter::config::step::lowpass::data::time_constant%]"
+        },
+        "data_description": {
+          "window_size": "[%key:component::filter::config::step::outlier::data_description::window_size%]",
+          "precision": "[%key:component::filter::config::step::outlier::data_description::precision%]",
+          "time_constant": "[%key:component::filter::config::step::lowpass::data_description::time_constant%]"
+        }
+      },
+      "range": {
+        "description": "[%key:component::filter::config::step::outlier::description%]",
+        "data": {
+          "precision": "[%key:component::filter::config::step::outlier::data::precision%]",
+          "lower_bound": "[%key:component::filter::config::step::range::data::lower_bound%]",
+          "upper_bound": "[%key:component::filter::config::step::range::data::upper_bound%]"
+        },
+        "data_description": {
+          "precision": "[%key:component::filter::config::step::outlier::data_description::precision%]",
+          "lower_bound": "[%key:component::filter::config::step::range::data_description::lower_bound%]",
+          "upper_bound": "[%key:component::filter::config::step::range::data_description::upper_bound%]"
+        }
+      },
+      "time_simple_moving_average": {
+        "description": "[%key:component::filter::config::step::outlier::description%]",
+        "data": {
+          "window_size": "[%key:component::filter::config::step::outlier::data::window_size%]",
+          "precision": "[%key:component::filter::config::step::outlier::data::precision%]",
+          "type": "[%key:component::filter::config::step::time_simple_moving_average::data::type%]"
+        },
+        "data_description": {
+          "window_size": "[%key:component::filter::config::step::outlier::data_description::window_size%]",
+          "precision": "[%key:component::filter::config::step::outlier::data_description::precision%]",
+          "type": "[%key:component::filter::config::step::time_simple_moving_average::data_description::type%]"
+        }
+      },
+      "throttle": {
+        "description": "[%key:component::filter::config::step::outlier::description%]",
+        "data": {
+          "window_size": "[%key:component::filter::config::step::outlier::data::window_size%]",
+          "precision": "[%key:component::filter::config::step::outlier::data::precision%]"
+        },
+        "data_description": {
+          "window_size": "[%key:component::filter::config::step::outlier::data_description::window_size%]",
+          "precision": "[%key:component::filter::config::step::outlier::data_description::precision%]"
+        }
+      },
+      "time_throttle": {
+        "description": "[%key:component::filter::config::step::outlier::description%]",
+        "data": {
+          "window_size": "[%key:component::filter::config::step::outlier::data::window_size%]",
+          "precision": "[%key:component::filter::config::step::outlier::data::precision%]"
+        },
+        "data_description": {
+          "window_size": "[%key:component::filter::config::step::outlier::data_description::window_size%]",
+          "precision": "[%key:component::filter::config::step::outlier::data_description::precision%]"
+        }
+      }
+    }
+  },
+  "selector": {
+    "filter": {
+      "options": {
+        "range": "Range",
+        "lowpass": "Lowpass",
+        "outlier": "Outlier",
+        "throttle": "Throttle",
+        "time_throttle": "Time throttle",
+        "time_simple_moving_average": "Moving Average (Time based)"
+      }
+    },
+    "type": {
+      "options": {
+        "last": "Last"
+      }
+    }
+  },
   "services": {
     "reload": {
       "name": "[%key:common::action::reload%]",
diff --git a/homeassistant/components/fints/sensor.py b/homeassistant/components/fints/sensor.py
index c85f08ba3d0..f5188d5bf21 100644
--- a/homeassistant/components/fints/sensor.py
+++ b/homeassistant/components/fints/sensor.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from collections import namedtuple
 from datetime import timedelta
 import logging
-from typing import Any
+from typing import Any, cast
 
 from fints.client import FinTS3PinTanClient
 from fints.models import SEPAAccount
@@ -18,7 +18,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_NAME, CONF_PIN, CONF_URL, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
@@ -73,7 +73,7 @@ def setup_platform(
     credentials = BankCredentials(
         config[CONF_BIN], config[CONF_USERNAME], config[CONF_PIN], config[CONF_URL]
     )
-    fints_name = config.get(CONF_NAME, config[CONF_BIN])
+    fints_name = cast(str, config.get(CONF_NAME, config[CONF_BIN]))
 
     account_config = {
         acc[CONF_ACCOUNT]: acc[CONF_NAME] for acc in config[CONF_ACCOUNTS]
diff --git a/homeassistant/components/fireservicerota/__init__.py b/homeassistant/components/fireservicerota/__init__.py
index aa303a08795..0f30a29cfba 100644
--- a/homeassistant/components/fireservicerota/__init__.py
+++ b/homeassistant/components/fireservicerota/__init__.py
@@ -3,236 +3,44 @@
 from __future__ import annotations
 
 from datetime import timedelta
-import logging
 
-from pyfireservicerota import (
-    ExpiredTokenError,
-    FireServiceRota,
-    FireServiceRotaIncidents,
-    InvalidAuthError,
-    InvalidTokenError,
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+
+from .coordinator import (
+    FireServiceConfigEntry,
+    FireServiceRotaClient,
+    FireServiceUpdateCoordinator,
 )
 
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_TOKEN, CONF_URL, CONF_USERNAME, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed
-from homeassistant.helpers.dispatcher import dispatcher_send
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
-
-from .const import DATA_CLIENT, DATA_COORDINATOR, DOMAIN, WSS_BWRURL
-
 MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=60)
 
-_LOGGER = logging.getLogger(__name__)
-
 PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR, Platform.SWITCH]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: FireServiceConfigEntry) -> bool:
     """Set up FireServiceRota from a config entry."""
 
-    hass.data.setdefault(DOMAIN, {})
-
     client = FireServiceRotaClient(hass, entry)
     await client.setup()
 
     if client.token_refresh_failure:
         return False
 
-    async def async_update_data():
-        return await client.async_update()
-
-    coordinator = DataUpdateCoordinator(
-        hass,
-        _LOGGER,
-        config_entry=entry,
-        name="duty binary sensor",
-        update_method=async_update_data,
-        update_interval=MIN_TIME_BETWEEN_UPDATES,
-    )
+    entry.async_on_unload(client.async_stop_listener)
+    coordinator = FireServiceUpdateCoordinator(hass, client, entry)
 
     await coordinator.async_config_entry_first_refresh()
 
-    hass.data[DOMAIN][entry.entry_id] = {
-        DATA_CLIENT: client,
-        DATA_COORDINATOR: coordinator,
-    }
+    entry.runtime_data = coordinator
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, entry: FireServiceConfigEntry
+) -> bool:
     """Unload FireServiceRota config entry."""
-
-    await hass.async_add_executor_job(
-        hass.data[DOMAIN][entry.entry_id].websocket.stop_listener
-    )
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if unload_ok:
-        del hass.data[DOMAIN][entry.entry_id]
-    return unload_ok
-
-
-class FireServiceRotaOauth:
-    """Handle authentication tokens."""
-
-    def __init__(self, hass, entry, fsr):
-        """Initialize the oauth object."""
-        self._hass = hass
-        self._entry = entry
-
-        self._url = entry.data[CONF_URL]
-        self._username = entry.data[CONF_USERNAME]
-        self._fsr = fsr
-
-    async def async_refresh_tokens(self) -> bool:
-        """Refresh tokens and update config entry."""
-        _LOGGER.debug("Refreshing authentication tokens after expiration")
-
-        try:
-            token_info = await self._hass.async_add_executor_job(
-                self._fsr.refresh_tokens
-            )
-
-        except (InvalidAuthError, InvalidTokenError) as err:
-            raise ConfigEntryAuthFailed(
-                "Error refreshing tokens, triggered reauth workflow"
-            ) from err
-
-        _LOGGER.debug("Saving new tokens in config entry")
-        self._hass.config_entries.async_update_entry(
-            self._entry,
-            data={
-                "auth_implementation": DOMAIN,
-                CONF_URL: self._url,
-                CONF_USERNAME: self._username,
-                CONF_TOKEN: token_info,
-            },
-        )
-
-        return True
-
-
-class FireServiceRotaWebSocket:
-    """Define a FireServiceRota websocket manager object."""
-
-    def __init__(self, hass, entry):
-        """Initialize the websocket object."""
-        self._hass = hass
-        self._entry = entry
-
-        self._fsr_incidents = FireServiceRotaIncidents(on_incident=self._on_incident)
-        self.incident_data = None
-
-    def _construct_url(self) -> str:
-        """Return URL with latest access token."""
-        return WSS_BWRURL.format(
-            self._entry.data[CONF_URL], self._entry.data[CONF_TOKEN]["access_token"]
-        )
-
-    def _on_incident(self, data) -> None:
-        """Received new incident, update data."""
-        _LOGGER.debug("Received new incident via websocket: %s", data)
-        self.incident_data = data
-        dispatcher_send(self._hass, f"{DOMAIN}_{self._entry.entry_id}_update")
-
-    def start_listener(self) -> None:
-        """Start the websocket listener."""
-        _LOGGER.debug("Starting incidents listener")
-        self._fsr_incidents.start(self._construct_url())
-
-    def stop_listener(self) -> None:
-        """Stop the websocket listener."""
-        _LOGGER.debug("Stopping incidents listener")
-        self._fsr_incidents.stop()
-
-
-class FireServiceRotaClient:
-    """Getting the latest data from fireservicerota."""
-
-    def __init__(self, hass, entry):
-        """Initialize the data object."""
-        self._hass = hass
-        self._entry = entry
-
-        self._url = entry.data[CONF_URL]
-        self._tokens = entry.data[CONF_TOKEN]
-
-        self.entry_id = entry.entry_id
-        self.unique_id = entry.unique_id
-
-        self.token_refresh_failure = False
-        self.incident_id = None
-        self.on_duty = False
-
-        self.fsr = FireServiceRota(base_url=self._url, token_info=self._tokens)
-
-        self.oauth = FireServiceRotaOauth(
-            self._hass,
-            self._entry,
-            self.fsr,
-        )
-
-        self.websocket = FireServiceRotaWebSocket(self._hass, self._entry)
-
-    async def setup(self) -> None:
-        """Set up the data client."""
-        await self._hass.async_add_executor_job(self.websocket.start_listener)
-
-    async def update_call(self, func, *args):
-        """Perform update call and return data."""
-        if self.token_refresh_failure:
-            return None
-
-        try:
-            return await self._hass.async_add_executor_job(func, *args)
-        except (ExpiredTokenError, InvalidTokenError):
-            await self._hass.async_add_executor_job(self.websocket.stop_listener)
-            self.token_refresh_failure = True
-
-            if await self.oauth.async_refresh_tokens():
-                self.token_refresh_failure = False
-                await self._hass.async_add_executor_job(self.websocket.start_listener)
-
-                return await self._hass.async_add_executor_job(func, *args)
-
-    async def async_update(self) -> dict | None:
-        """Get the latest availability data."""
-        data = await self.update_call(
-            self.fsr.get_availability, str(self._hass.config.time_zone)
-        )
-
-        if not data:
-            return None
-
-        self.on_duty = bool(data.get("available"))
-
-        _LOGGER.debug("Updated availability data: %s", data)
-        return data
-
-    async def async_response_update(self) -> dict | None:
-        """Get the latest incident response data."""
-
-        if not self.incident_id:
-            return None
-
-        _LOGGER.debug("Updating response data for incident id %s", self.incident_id)
-
-        return await self.update_call(self.fsr.get_incident_response, self.incident_id)
-
-    async def async_set_response(self, value) -> None:
-        """Set incident response status."""
-
-        if not self.incident_id:
-            return
-
-        _LOGGER.debug(
-            "Setting incident response for incident id '%s' to state '%s'",
-            self.incident_id,
-            value,
-        )
-
-        await self.update_call(self.fsr.set_incident_response, self.incident_id, value)
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/fireservicerota/binary_sensor.py b/homeassistant/components/fireservicerota/binary_sensor.py
index a22991f2008..be7add191c0 100644
--- a/homeassistant/components/fireservicerota/binary_sensor.py
+++ b/homeassistant/components/fireservicerota/binary_sensor.py
@@ -7,33 +7,32 @@ from typing import Any
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.update_coordinator import (
-    CoordinatorEntity,
-    DataUpdateCoordinator,
-)
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import FireServiceRotaClient
-from .const import DATA_CLIENT, DATA_COORDINATOR, DOMAIN as FIRESERVICEROTA_DOMAIN
+from .coordinator import (
+    FireServiceConfigEntry,
+    FireServiceRotaClient,
+    FireServiceUpdateCoordinator,
+)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: FireServiceConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up FireServiceRota binary sensor based on a config entry."""
 
-    client: FireServiceRotaClient = hass.data[FIRESERVICEROTA_DOMAIN][entry.entry_id][
-        DATA_CLIENT
-    ]
-
-    coordinator: DataUpdateCoordinator = hass.data[FIRESERVICEROTA_DOMAIN][
-        entry.entry_id
-    ][DATA_COORDINATOR]
+    coordinator = entry.runtime_data
+    client = coordinator.client
 
     async_add_entities([ResponseBinarySensor(coordinator, client, entry)])
 
 
-class ResponseBinarySensor(CoordinatorEntity, BinarySensorEntity):
+class ResponseBinarySensor(
+    CoordinatorEntity[FireServiceUpdateCoordinator], BinarySensorEntity
+):
     """Representation of an FireServiceRota sensor."""
 
     _attr_has_entity_name = True
@@ -41,7 +40,7 @@ class ResponseBinarySensor(CoordinatorEntity, BinarySensorEntity):
 
     def __init__(
         self,
-        coordinator: DataUpdateCoordinator,
+        coordinator: FireServiceUpdateCoordinator,
         client: FireServiceRotaClient,
         entry: ConfigEntry,
     ) -> None:
diff --git a/homeassistant/components/fireservicerota/coordinator.py b/homeassistant/components/fireservicerota/coordinator.py
new file mode 100644
index 00000000000..6815bf39104
--- /dev/null
+++ b/homeassistant/components/fireservicerota/coordinator.py
@@ -0,0 +1,226 @@
+"""The FireServiceRota integration."""
+
+from __future__ import annotations
+
+from datetime import timedelta
+import logging
+
+from pyfireservicerota import (
+    ExpiredTokenError,
+    FireServiceRota,
+    FireServiceRotaIncidents,
+    InvalidAuthError,
+    InvalidTokenError,
+)
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_TOKEN, CONF_URL, CONF_USERNAME, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryAuthFailed
+from homeassistant.helpers.dispatcher import dispatcher_send
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+
+from .const import DOMAIN, WSS_BWRURL
+
+MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=60)
+
+_LOGGER = logging.getLogger(__name__)
+
+PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR, Platform.SWITCH]
+
+type FireServiceConfigEntry = ConfigEntry[FireServiceUpdateCoordinator]
+
+
+class FireServiceUpdateCoordinator(DataUpdateCoordinator[dict | None]):
+    """Data update coordinator for FireServiceRota."""
+
+    config_entry: FireServiceConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        client: FireServiceRotaClient,
+        entry: FireServiceConfigEntry,
+    ) -> None:
+        """Initialize the FireServiceRota DataUpdateCoordinator."""
+        super().__init__(
+            hass,
+            _LOGGER,
+            name="duty binary sensor",
+            config_entry=entry,
+            update_interval=MIN_TIME_BETWEEN_UPDATES,
+        )
+
+        self.client = client
+
+    async def _async_update_data(self) -> dict | None:
+        """Get the latest availability data."""
+        return await self.client.async_update()
+
+
+class FireServiceRotaOauth:
+    """Handle authentication tokens."""
+
+    def __init__(
+        self, hass: HomeAssistant, entry: ConfigEntry, fsr: FireServiceRota
+    ) -> None:
+        """Initialize the oauth object."""
+        self._hass = hass
+        self._entry = entry
+
+        self._url = entry.data[CONF_URL]
+        self._username = entry.data[CONF_USERNAME]
+        self._fsr = fsr
+
+    async def async_refresh_tokens(self) -> bool:
+        """Refresh tokens and update config entry."""
+        _LOGGER.debug("Refreshing authentication tokens after expiration")
+
+        try:
+            token_info = await self._hass.async_add_executor_job(
+                self._fsr.refresh_tokens
+            )
+
+        except (InvalidAuthError, InvalidTokenError) as err:
+            raise ConfigEntryAuthFailed(
+                "Error refreshing tokens, triggered reauth workflow"
+            ) from err
+
+        _LOGGER.debug("Saving new tokens in config entry")
+        self._hass.config_entries.async_update_entry(
+            self._entry,
+            data={
+                "auth_implementation": DOMAIN,
+                CONF_URL: self._url,
+                CONF_USERNAME: self._username,
+                CONF_TOKEN: token_info,
+            },
+        )
+
+        return True
+
+
+class FireServiceRotaWebSocket:
+    """Define a FireServiceRota websocket manager object."""
+
+    def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
+        """Initialize the websocket object."""
+        self._hass = hass
+        self._entry = entry
+
+        self._fsr_incidents = FireServiceRotaIncidents(on_incident=self._on_incident)
+        self.incident_data = None
+
+    def _construct_url(self) -> str:
+        """Return URL with latest access token."""
+        return WSS_BWRURL.format(
+            self._entry.data[CONF_URL], self._entry.data[CONF_TOKEN]["access_token"]
+        )
+
+    def _on_incident(self, data) -> None:
+        """Received new incident, update data."""
+        _LOGGER.debug("Received new incident via websocket: %s", data)
+        self.incident_data = data
+        dispatcher_send(self._hass, f"{DOMAIN}_{self._entry.entry_id}_update")
+
+    def start_listener(self) -> None:
+        """Start the websocket listener."""
+        _LOGGER.debug("Starting incidents listener")
+        self._fsr_incidents.start(self._construct_url())
+
+    def stop_listener(self) -> None:
+        """Stop the websocket listener."""
+        _LOGGER.debug("Stopping incidents listener")
+        self._fsr_incidents.stop()
+
+
+class FireServiceRotaClient:
+    """Getting the latest data from fireservicerota."""
+
+    def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
+        """Initialize the data object."""
+        self._hass = hass
+        self._entry = entry
+
+        self._url = entry.data[CONF_URL]
+        self._tokens = entry.data[CONF_TOKEN]
+
+        self.entry_id = entry.entry_id
+        self.unique_id = entry.unique_id
+
+        self.token_refresh_failure = False
+        self.incident_id = None
+        self.on_duty = False
+
+        self.fsr = FireServiceRota(base_url=self._url, token_info=self._tokens)
+
+        self.oauth = FireServiceRotaOauth(
+            self._hass,
+            self._entry,
+            self.fsr,
+        )
+
+        self.websocket = FireServiceRotaWebSocket(self._hass, self._entry)
+
+    async def setup(self) -> None:
+        """Set up the data client."""
+        await self._hass.async_add_executor_job(self.websocket.start_listener)
+
+    async def update_call(self, func, *args):
+        """Perform update call and return data."""
+        if self.token_refresh_failure:
+            return None
+
+        try:
+            return await self._hass.async_add_executor_job(func, *args)
+        except (ExpiredTokenError, InvalidTokenError):
+            await self._hass.async_add_executor_job(self.websocket.stop_listener)
+            self.token_refresh_failure = True
+
+            if await self.oauth.async_refresh_tokens():
+                self.token_refresh_failure = False
+                await self._hass.async_add_executor_job(self.websocket.start_listener)
+
+                return await self._hass.async_add_executor_job(func, *args)
+
+    async def async_update(self) -> dict | None:
+        """Get the latest availability data."""
+        data = await self.update_call(
+            self.fsr.get_availability, str(self._hass.config.time_zone)
+        )
+
+        if not data:
+            return None
+
+        self.on_duty = bool(data.get("available"))
+
+        _LOGGER.debug("Updated availability data: %s", data)
+        return data
+
+    async def async_response_update(self) -> dict | None:
+        """Get the latest incident response data."""
+
+        if not self.incident_id:
+            return None
+
+        _LOGGER.debug("Updating response data for incident id %s", self.incident_id)
+
+        return await self.update_call(self.fsr.get_incident_response, self.incident_id)
+
+    async def async_set_response(self, value) -> None:
+        """Set incident response status."""
+
+        if not self.incident_id:
+            return
+
+        _LOGGER.debug(
+            "Setting incident response for incident id '%s' to state '%s'",
+            self.incident_id,
+            value,
+        )
+
+        await self.update_call(self.fsr.set_incident_response, self.incident_id, value)
+
+    async def async_stop_listener(self) -> None:
+        """Stop listener."""
+        await self._hass.async_add_executor_job(self.websocket.stop_listener)
diff --git a/homeassistant/components/fireservicerota/manifest.json b/homeassistant/components/fireservicerota/manifest.json
index 7826115fa3f..945ef141887 100644
--- a/homeassistant/components/fireservicerota/manifest.json
+++ b/homeassistant/components/fireservicerota/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/fireservicerota",
   "iot_class": "cloud_polling",
   "loggers": ["pyfireservicerota"],
-  "requirements": ["pyfireservicerota==0.0.43"]
+  "requirements": ["pyfireservicerota==0.0.46"]
 }
diff --git a/homeassistant/components/fireservicerota/sensor.py b/homeassistant/components/fireservicerota/sensor.py
index 864838ddaff..5ed65609dc8 100644
--- a/homeassistant/components/fireservicerota/sensor.py
+++ b/homeassistant/components/fireservicerota/sensor.py
@@ -4,24 +4,24 @@ import logging
 from typing import Any
 
 from homeassistant.components.sensor import SensorEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
-from .const import DATA_CLIENT, DOMAIN as FIRESERVICEROTA_DOMAIN
+from .const import DOMAIN as FIRESERVICEROTA_DOMAIN
+from .coordinator import FireServiceConfigEntry, FireServiceRotaClient
 
 _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: FireServiceConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up FireServiceRota sensor based on a config entry."""
-    client = hass.data[FIRESERVICEROTA_DOMAIN][entry.entry_id][DATA_CLIENT]
-
-    async_add_entities([IncidentsSensor(client)])
+    async_add_entities([IncidentsSensor(entry.runtime_data.client)])
 
 
 # pylint: disable-next=hass-invalid-inheritance # needs fixing
@@ -32,13 +32,13 @@ class IncidentsSensor(RestoreEntity, SensorEntity):
     _attr_has_entity_name = True
     _attr_translation_key = "incidents"
 
-    def __init__(self, client):
+    def __init__(self, client: FireServiceRotaClient) -> None:
         """Initialize."""
         self._client = client
         self._entry_id = self._client.entry_id
         self._attr_unique_id = f"{self._client.unique_id}_Incidents"
-        self._state = None
-        self._state_attributes = {}
+        self._state: str | None = None
+        self._state_attributes: dict[str, Any] = {}
 
     @property
     def icon(self) -> str:
@@ -52,7 +52,7 @@ class IncidentsSensor(RestoreEntity, SensorEntity):
         return "mdi:fire-truck"
 
     @property
-    def native_value(self) -> str:
+    def native_value(self) -> str | None:
         """Return the state of the sensor."""
         return self._state
 
diff --git a/homeassistant/components/fireservicerota/switch.py b/homeassistant/components/fireservicerota/switch.py
index 22287653788..d9fe382e4b1 100644
--- a/homeassistant/components/fireservicerota/switch.py
+++ b/homeassistant/components/fireservicerota/switch.py
@@ -7,20 +7,26 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DATA_CLIENT, DATA_COORDINATOR, DOMAIN as FIRESERVICEROTA_DOMAIN
+from .const import DOMAIN as FIRESERVICEROTA_DOMAIN
+from .coordinator import (
+    FireServiceConfigEntry,
+    FireServiceRotaClient,
+    FireServiceUpdateCoordinator,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: FireServiceConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up FireServiceRota switch based on a config entry."""
-    client = hass.data[FIRESERVICEROTA_DOMAIN][entry.entry_id][DATA_CLIENT]
-
-    coordinator = hass.data[FIRESERVICEROTA_DOMAIN][entry.entry_id][DATA_COORDINATOR]
+    coordinator = entry.runtime_data
+    client = coordinator.client
 
     async_add_entities([ResponseSwitch(coordinator, client, entry)])
 
@@ -32,15 +38,20 @@ class ResponseSwitch(SwitchEntity):
     _attr_has_entity_name = True
     _attr_translation_key = "incident_response"
 
-    def __init__(self, coordinator, client, entry):
+    def __init__(
+        self,
+        coordinator: FireServiceUpdateCoordinator,
+        client: FireServiceRotaClient,
+        entry: ConfigEntry,
+    ) -> None:
         """Initialize."""
         self._coordinator = coordinator
         self._client = client
         self._attr_unique_id = f"{entry.unique_id}_Response"
         self._entry_id = entry.entry_id
 
-        self._state = None
-        self._state_attributes = {}
+        self._state: bool | None = None
+        self._state_attributes: dict[str, Any] = {}
         self._state_icon = None
 
     @property
@@ -54,7 +65,7 @@ class ResponseSwitch(SwitchEntity):
         return "mdi:forum"
 
     @property
-    def is_on(self) -> bool:
+    def is_on(self) -> bool | None:
         """Get the assumed state of the switch."""
         return self._state
 
diff --git a/homeassistant/components/firmata/__init__.py b/homeassistant/components/firmata/__init__.py
index 26fbe596aa8..45cae276967 100644
--- a/homeassistant/components/firmata/__init__.py
+++ b/homeassistant/components/firmata/__init__.py
@@ -122,6 +122,8 @@ CONFIG_SCHEMA = vol.Schema(
     {DOMAIN: vol.All(cv.ensure_list, [BOARD_CONFIG_SCHEMA])}, extra=vol.ALLOW_EXTRA
 )
 
+type FirmataConfigEntry = ConfigEntry[FirmataBoard]
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Firmata domain."""
@@ -158,11 +160,10 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     return True
 
 
-async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_setup_entry(
+    hass: HomeAssistant, config_entry: FirmataConfigEntry
+) -> bool:
     """Set up a Firmata board for a config entry."""
-    if DOMAIN not in hass.data:
-        hass.data[DOMAIN] = {}
-
     _LOGGER.debug(
         "Setting up Firmata id %s, name %s, config %s",
         config_entry.entry_id,
@@ -175,13 +176,11 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     if not await board.async_setup():
         return False
 
-    hass.data[DOMAIN][config_entry.entry_id] = board
+    config_entry.runtime_data = board
 
     async def handle_shutdown(event) -> None:
         """Handle shutdown of board when Home Assistant shuts down."""
-        # Ensure board was not already removed previously before shutdown
-        if config_entry.entry_id in hass.data[DOMAIN]:
-            await board.async_reset()
+        await board.async_reset()
 
     config_entry.async_on_unload(
         hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, handle_shutdown)
@@ -208,7 +207,9 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, config_entry: FirmataConfigEntry
+) -> bool:
     """Shutdown and close a Firmata board for a config entry."""
     _LOGGER.debug("Closing Firmata board %s", config_entry.data[CONF_NAME])
     results: list[bool] = []
@@ -220,6 +221,6 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
         results.append(
             await hass.config_entries.async_unload_platforms(config_entry, platforms)
         )
-    results.append(await hass.data[DOMAIN].pop(config_entry.entry_id).async_reset())
+    results.append(await config_entry.runtime_data.async_reset())
 
     return False not in results
diff --git a/homeassistant/components/firmata/binary_sensor.py b/homeassistant/components/firmata/binary_sensor.py
index c25a61ddac7..de79f676ae6 100644
--- a/homeassistant/components/firmata/binary_sensor.py
+++ b/homeassistant/components/firmata/binary_sensor.py
@@ -3,12 +3,12 @@
 import logging
 
 from homeassistant.components.binary_sensor import BinarySensorEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, CONF_PIN
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import CONF_NEGATE_STATE, CONF_PIN_MODE, DOMAIN
+from . import FirmataConfigEntry
+from .const import CONF_NEGATE_STATE, CONF_PIN_MODE
 from .entity import FirmataPinEntity
 from .pin import FirmataBinaryDigitalInput, FirmataPinUsedException
 
@@ -17,13 +17,13 @@ _LOGGER = logging.getLogger(__name__)
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FirmataConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Firmata binary sensors."""
     new_entities = []
 
-    board = hass.data[DOMAIN][config_entry.entry_id]
+    board = config_entry.runtime_data
     for binary_sensor in board.binary_sensors:
         pin = binary_sensor[CONF_PIN]
         pin_mode = binary_sensor[CONF_PIN_MODE]
diff --git a/homeassistant/components/firmata/light.py b/homeassistant/components/firmata/light.py
index 00453762c14..f866ce9dbe5 100644
--- a/homeassistant/components/firmata/light.py
+++ b/homeassistant/components/firmata/light.py
@@ -9,10 +9,11 @@ from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEnti
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_MAXIMUM, CONF_MINIMUM, CONF_NAME, CONF_PIN
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import FirmataConfigEntry
 from .board import FirmataPinType
-from .const import CONF_INITIAL_STATE, CONF_PIN_MODE, DOMAIN
+from .const import CONF_INITIAL_STATE, CONF_PIN_MODE
 from .entity import FirmataPinEntity
 from .pin import FirmataBoardPin, FirmataPinUsedException, FirmataPWMOutput
 
@@ -21,13 +22,13 @@ _LOGGER = logging.getLogger(__name__)
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FirmataConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Firmata lights."""
     new_entities = []
 
-    board = hass.data[DOMAIN][config_entry.entry_id]
+    board = config_entry.runtime_data
     for light in board.lights:
         pin = light[CONF_PIN]
         pin_mode = light[CONF_PIN_MODE]
diff --git a/homeassistant/components/firmata/sensor.py b/homeassistant/components/firmata/sensor.py
index 32559b9197d..7b49950e948 100644
--- a/homeassistant/components/firmata/sensor.py
+++ b/homeassistant/components/firmata/sensor.py
@@ -3,12 +3,12 @@
 import logging
 
 from homeassistant.components.sensor import SensorEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, CONF_PIN
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import CONF_DIFFERENTIAL, CONF_PIN_MODE, DOMAIN
+from . import FirmataConfigEntry
+from .const import CONF_DIFFERENTIAL, CONF_PIN_MODE
 from .entity import FirmataPinEntity
 from .pin import FirmataAnalogInput, FirmataPinUsedException
 
@@ -17,13 +17,13 @@ _LOGGER = logging.getLogger(__name__)
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FirmataConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Firmata sensors."""
     new_entities = []
 
-    board = hass.data[DOMAIN][config_entry.entry_id]
+    board = config_entry.runtime_data
     for sensor in board.sensors:
         pin = sensor[CONF_PIN]
         pin_mode = sensor[CONF_PIN_MODE]
diff --git a/homeassistant/components/firmata/switch.py b/homeassistant/components/firmata/switch.py
index 4203b221d4f..e84b18e9c74 100644
--- a/homeassistant/components/firmata/switch.py
+++ b/homeassistant/components/firmata/switch.py
@@ -4,12 +4,12 @@ import logging
 from typing import Any
 
 from homeassistant.components.switch import SwitchEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, CONF_PIN
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import CONF_INITIAL_STATE, CONF_NEGATE_STATE, CONF_PIN_MODE, DOMAIN
+from . import FirmataConfigEntry
+from .const import CONF_INITIAL_STATE, CONF_NEGATE_STATE, CONF_PIN_MODE
 from .entity import FirmataPinEntity
 from .pin import FirmataBinaryDigitalOutput, FirmataPinUsedException
 
@@ -18,13 +18,13 @@ _LOGGER = logging.getLogger(__name__)
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FirmataConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Firmata switches."""
     new_entities = []
 
-    board = hass.data[DOMAIN][config_entry.entry_id]
+    board = config_entry.runtime_data
     for switch in board.switches:
         pin = switch[CONF_PIN]
         pin_mode = switch[CONF_PIN_MODE]
diff --git a/homeassistant/components/fitbit/__init__.py b/homeassistant/components/fitbit/__init__.py
index 22d0e302d63..f2378797d8d 100644
--- a/homeassistant/components/fitbit/__init__.py
+++ b/homeassistant/components/fitbit/__init__.py
@@ -1,24 +1,21 @@
 """The fitbit component."""
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import config_entry_oauth2_flow
 
 from . import api
-from .const import DOMAIN, FitbitScope
-from .coordinator import FitbitData, FitbitDeviceCoordinator
+from .const import FitbitScope
+from .coordinator import FitbitConfigEntry, FitbitData, FitbitDeviceCoordinator
 from .exceptions import FitbitApiException, FitbitAuthException
 from .model import config_from_entry_data
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: FitbitConfigEntry) -> bool:
     """Set up fitbit from a config entry."""
-    hass.data.setdefault(DOMAIN, {})
-
     implementation = (
         await config_entry_oauth2_flow.async_get_config_entry_implementation(
             hass, entry
@@ -38,21 +35,16 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     fitbit_config = config_from_entry_data(entry.data)
     coordinator: FitbitDeviceCoordinator | None = None
     if fitbit_config.is_allowed_resource(FitbitScope.DEVICE, "devices/battery"):
-        coordinator = FitbitDeviceCoordinator(hass, fitbit_api)
+        coordinator = FitbitDeviceCoordinator(hass, entry, fitbit_api)
         await coordinator.async_config_entry_first_refresh()
 
-    hass.data[DOMAIN][entry.entry_id] = FitbitData(
-        api=fitbit_api, device_coordinator=coordinator
-    )
+    entry.runtime_data = FitbitData(api=fitbit_api, device_coordinator=coordinator)
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: FitbitConfigEntry) -> bool:
     """Unload a config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/fitbit/coordinator.py b/homeassistant/components/fitbit/coordinator.py
index 2126129d261..867723419dd 100644
--- a/homeassistant/components/fitbit/coordinator.py
+++ b/homeassistant/components/fitbit/coordinator.py
@@ -6,6 +6,7 @@ import datetime
 import logging
 from typing import Final
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -19,13 +20,25 @@ _LOGGER = logging.getLogger(__name__)
 UPDATE_INTERVAL: Final = datetime.timedelta(minutes=30)
 TIMEOUT = 10
 
+type FitbitConfigEntry = ConfigEntry[FitbitData]
+
 
 class FitbitDeviceCoordinator(DataUpdateCoordinator[dict[str, FitbitDevice]]):
     """Coordinator for fetching fitbit devices from the API."""
 
-    def __init__(self, hass: HomeAssistant, api: FitbitApi) -> None:
+    config_entry: FitbitConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: FitbitConfigEntry, api: FitbitApi
+    ) -> None:
         """Initialize FitbitDeviceCoordinator."""
-        super().__init__(hass, _LOGGER, name="Fitbit", update_interval=UPDATE_INTERVAL)
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name="Fitbit",
+            update_interval=UPDATE_INTERVAL,
+        )
         self._api = api
 
     async def _async_update_data(self) -> dict[str, FitbitDevice]:
diff --git a/homeassistant/components/fitbit/quality_scale.yaml b/homeassistant/components/fitbit/quality_scale.yaml
index abf127cdb98..04ed2817a07 100644
--- a/homeassistant/components/fitbit/quality_scale.yaml
+++ b/homeassistant/components/fitbit/quality_scale.yaml
@@ -20,11 +20,7 @@ rules:
     comment: Fitbit is a polling integration that does use async events.
   entity-unique-id: done
   has-entity-name: done
-  runtime-data:
-    status: todo
-    comment: |
-      The integration uses `hass.data` for data associated with a configuration
-      entry and needs to be updated to use `runtime_data`.
+  runtime-data: done
   test-before-configure: done
   test-before-setup: done
   unique-config-entry: done
diff --git a/homeassistant/components/fitbit/sensor.py b/homeassistant/components/fitbit/sensor.py
index d58dad4ca67..f5c8a81ca26 100644
--- a/homeassistant/components/fitbit/sensor.py
+++ b/homeassistant/components/fitbit/sensor.py
@@ -14,7 +14,6 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     PERCENTAGE,
     EntityCategory,
@@ -25,13 +24,13 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.icon import icon_for_battery_level
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .api import FitbitApi
 from .const import ATTRIBUTION, BATTERY_LEVELS, DOMAIN, FitbitScope, FitbitUnitSystem
-from .coordinator import FitbitData, FitbitDeviceCoordinator
+from .coordinator import FitbitConfigEntry, FitbitDeviceCoordinator
 from .exceptions import FitbitApiException, FitbitAuthException
 from .model import FitbitDevice, config_from_entry_data
 
@@ -131,7 +130,7 @@ class FitbitSensorEntityDescription(SensorEntityDescription):
 
 
 def _build_device_info(
-    config_entry: ConfigEntry, entity_description: FitbitSensorEntityDescription
+    config_entry: FitbitConfigEntry, entity_description: FitbitSensorEntityDescription
 ) -> DeviceInfo:
     """Build device info for sensor entities info across devices."""
     unique_id = cast(str, config_entry.unique_id)
@@ -524,12 +523,12 @@ FITBIT_RESOURCE_BATTERY_LEVEL = FitbitSensorEntityDescription(
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: FitbitConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Fitbit sensor platform."""
 
-    data: FitbitData = hass.data[DOMAIN][entry.entry_id]
+    data = entry.runtime_data
     api = data.api
 
     # These are run serially to reuse the cached user profile, not gathered
@@ -601,7 +600,7 @@ class FitbitSensor(SensorEntity):
 
     def __init__(
         self,
-        config_entry: ConfigEntry,
+        config_entry: FitbitConfigEntry,
         api: FitbitApi,
         user_profile_id: str,
         description: FitbitSensorEntityDescription,
diff --git a/homeassistant/components/fivem/__init__.py b/homeassistant/components/fivem/__init__.py
index 25d24502846..c69a8172272 100644
--- a/homeassistant/components/fivem/__init__.py
+++ b/homeassistant/components/fivem/__init__.py
@@ -6,20 +6,18 @@ import logging
 
 from fivem import FiveMServerOfflineError
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PORT, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 
-from .const import DOMAIN
-from .coordinator import FiveMDataUpdateCoordinator
+from .coordinator import FiveMConfigEntry, FiveMDataUpdateCoordinator
 
 PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR]
 
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: FiveMConfigEntry) -> bool:
     """Set up FiveM from a config entry."""
     _LOGGER.debug(
         "Create FiveM server instance for '%s:%s'",
@@ -27,7 +25,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         entry.data[CONF_PORT],
     )
 
-    coordinator = FiveMDataUpdateCoordinator(hass, entry.data, entry.entry_id)
+    coordinator = FiveMDataUpdateCoordinator(hass, entry)
 
     try:
         await coordinator.initialize()
@@ -36,16 +34,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     await coordinator.async_config_entry_first_refresh()
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+    entry.runtime_data = coordinator
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: FiveMConfigEntry) -> bool:
     """Unload a config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/fivem/binary_sensor.py b/homeassistant/components/fivem/binary_sensor.py
index de58ea52fb6..92aab58349b 100644
--- a/homeassistant/components/fivem/binary_sensor.py
+++ b/homeassistant/components/fivem/binary_sensor.py
@@ -7,11 +7,11 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN, NAME_STATUS
+from .const import NAME_STATUS
+from .coordinator import FiveMConfigEntry
 from .entity import FiveMEntity, FiveMEntityDescription
 
 
@@ -33,11 +33,11 @@ BINARY_SENSORS: tuple[FiveMBinarySensorEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: FiveMConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the FiveM binary sensor platform."""
-    coordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
 
     async_add_entities(
         [FiveMSensorEntity(coordinator, description) for description in BINARY_SENSORS]
diff --git a/homeassistant/components/fivem/config_flow.py b/homeassistant/components/fivem/config_flow.py
index b5ced70b846..d5132627b9d 100644
--- a/homeassistant/components/fivem/config_flow.py
+++ b/homeassistant/components/fivem/config_flow.py
@@ -10,7 +10,7 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PORT
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import DOMAIN
 
diff --git a/homeassistant/components/fivem/coordinator.py b/homeassistant/components/fivem/coordinator.py
index 1fdf87fb2b7..2fcad7e0c98 100644
--- a/homeassistant/components/fivem/coordinator.py
+++ b/homeassistant/components/fivem/coordinator.py
@@ -2,13 +2,13 @@
 
 from __future__ import annotations
 
-from collections.abc import Mapping
 from datetime import timedelta
 import logging
 from typing import Any
 
 from fivem import FiveM, FiveMServerOfflineError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PORT
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -26,26 +26,32 @@ from .const import (
 
 _LOGGER = logging.getLogger(__name__)
 
+type FiveMConfigEntry = ConfigEntry[FiveMDataUpdateCoordinator]
+
 
 class FiveMDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Class to manage fetching FiveM data."""
 
-    def __init__(
-        self, hass: HomeAssistant, config_data: Mapping[str, Any], unique_id: str
-    ) -> None:
+    def __init__(self, hass: HomeAssistant, entry: FiveMConfigEntry) -> None:
         """Initialize server instance."""
-        self.unique_id = unique_id
+        self.unique_id = entry.entry_id
         self.server = None
         self.version = None
         self.game_name: str | None = None
 
-        self.host = config_data[CONF_HOST]
+        self.host = entry.data[CONF_HOST]
 
-        self._fivem = FiveM(self.host, config_data[CONF_PORT])
+        self._fivem = FiveM(self.host, entry.data[CONF_PORT])
 
         update_interval = timedelta(seconds=SCAN_INTERVAL)
 
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval)
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=entry,
+            name=DOMAIN,
+            update_interval=update_interval,
+        )
 
     async def initialize(self) -> None:
         """Initialize the FiveM server."""
diff --git a/homeassistant/components/fivem/sensor.py b/homeassistant/components/fivem/sensor.py
index b63f3b9082f..c4f5856c636 100644
--- a/homeassistant/components/fivem/sensor.py
+++ b/homeassistant/components/fivem/sensor.py
@@ -3,15 +3,13 @@
 from dataclasses import dataclass
 
 from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .const import (
     ATTR_PLAYERS_LIST,
     ATTR_RESOURCES_LIST,
-    DOMAIN,
     NAME_PLAYERS_MAX,
     NAME_PLAYERS_ONLINE,
     NAME_RESOURCES,
@@ -19,6 +17,7 @@ from .const import (
     UNIT_PLAYERS_ONLINE,
     UNIT_RESOURCES,
 )
+from .coordinator import FiveMConfigEntry
 from .entity import FiveMEntity, FiveMEntityDescription
 
 
@@ -50,11 +49,11 @@ SENSORS: tuple[FiveMSensorEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: FiveMConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the FiveM sensor platform."""
-    coordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
 
     # Add sensor entities.
     async_add_entities(
diff --git a/homeassistant/components/fivem/strings.json b/homeassistant/components/fivem/strings.json
index fd58922a481..f925a625259 100644
--- a/homeassistant/components/fivem/strings.json
+++ b/homeassistant/components/fivem/strings.json
@@ -14,7 +14,7 @@
     },
     "error": {
       "cannot_connect": "Failed to connect. Please check the host and port and try again. Also ensure that you are running the latest FiveM server.",
-      "invalid_game_name": "The api of the game you are trying to connect to is not a FiveM game.",
+      "invalid_game_name": "The API of the game you are trying to connect to is not a FiveM game.",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
diff --git a/homeassistant/components/fixer/sensor.py b/homeassistant/components/fixer/sensor.py
index f8b4546d4c7..3fb241208ad 100644
--- a/homeassistant/components/fixer/sensor.py
+++ b/homeassistant/components/fixer/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_API_KEY, CONF_NAME, CONF_TARGET
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/fjaraskupan/__init__.py b/homeassistant/components/fjaraskupan/__init__.py
index d95cb1d1006..961be04fd8d 100644
--- a/homeassistant/components/fjaraskupan/__init__.py
+++ b/homeassistant/components/fjaraskupan/__init__.py
@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 from collections.abc import Callable
-from dataclasses import dataclass
 import logging
 
 from fjaraskupan import Device
@@ -16,7 +15,6 @@ from homeassistant.components.bluetooth import (
     async_rediscover_address,
     async_register_callback,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
@@ -29,7 +27,7 @@ from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DISPATCH_DETECTION, DOMAIN
-from .coordinator import FjaraskupanCoordinator
+from .coordinator import FjaraskupanConfigEntry, FjaraskupanCoordinator
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
@@ -42,26 +40,17 @@ PLATFORMS = [
 _LOGGER = logging.getLogger(__name__)
 
 
-@dataclass
-class EntryState:
-    """Store state of config entry."""
-
-    coordinators: dict[str, FjaraskupanCoordinator]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: FjaraskupanConfigEntry) -> bool:
     """Set up Fjäråskupan from a config entry."""
 
-    state = EntryState({})
-    hass.data.setdefault(DOMAIN, {})
-    hass.data[DOMAIN][entry.entry_id] = state
+    entry.runtime_data = {}
 
     def detection_callback(
         service_info: BluetoothServiceInfoBleak, change: BluetoothChange
     ) -> None:
         if change != BluetoothChange.ADVERTISEMENT:
             return
-        if data := state.coordinators.get(service_info.address):
+        if data := entry.runtime_data.get(service_info.address):
             _LOGGER.debug("Update: %s", service_info)
             data.detection_callback(service_info)
         else:
@@ -76,11 +65,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             )
 
             coordinator: FjaraskupanCoordinator = FjaraskupanCoordinator(
-                hass, device, device_info
+                hass, entry, device, device_info
             )
             coordinator.detection_callback(service_info)
 
-            state.coordinators[service_info.address] = coordinator
+            entry.runtime_data[service_info.address] = coordinator
             async_dispatcher_send(
                 hass, f"{DISPATCH_DETECTION}.{entry.entry_id}", coordinator
             )
@@ -105,16 +94,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 @callback
 def async_setup_entry_platform(
     hass: HomeAssistant,
-    entry: ConfigEntry,
+    entry: FjaraskupanConfigEntry,
     async_add_entities: AddEntitiesCallback,
     constructor: Callable[[FjaraskupanCoordinator], list[Entity]],
 ) -> None:
     """Set up a platform with added entities."""
 
-    entry_state: EntryState = hass.data[DOMAIN][entry.entry_id]
     async_add_entities(
         entity
-        for coordinator in entry_state.coordinators.values()
+        for coordinator in entry.runtime_data.values()
         for entity in constructor(coordinator)
     )
 
@@ -129,12 +117,12 @@ def async_setup_entry_platform(
     )
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, entry: FjaraskupanConfigEntry
+) -> bool:
     """Unload a config entry."""
     unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
     if unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
-
         for device_entry in dr.async_entries_for_config_entry(
             dr.async_get(hass), entry.entry_id
         ):
diff --git a/homeassistant/components/fjaraskupan/binary_sensor.py b/homeassistant/components/fjaraskupan/binary_sensor.py
index 93886a2ac6a..7364fa85b2e 100644
--- a/homeassistant/components/fjaraskupan/binary_sensor.py
+++ b/homeassistant/components/fjaraskupan/binary_sensor.py
@@ -12,15 +12,14 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import async_setup_entry_platform
-from .coordinator import FjaraskupanCoordinator
+from .coordinator import FjaraskupanConfigEntry, FjaraskupanCoordinator
 
 
 @dataclass(frozen=True)
@@ -48,8 +47,8 @@ SENSORS = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FjaraskupanConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors dynamically through discovery."""
 
diff --git a/homeassistant/components/fjaraskupan/coordinator.py b/homeassistant/components/fjaraskupan/coordinator.py
index 90b2c617239..7fc4585a722 100644
--- a/homeassistant/components/fjaraskupan/coordinator.py
+++ b/homeassistant/components/fjaraskupan/coordinator.py
@@ -21,6 +21,7 @@ from homeassistant.components.bluetooth import (
     async_address_present,
     async_ble_device_from_address,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
@@ -28,6 +29,8 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .const import DOMAIN
 
+type FjaraskupanConfigEntry = ConfigEntry[dict[str, FjaraskupanCoordinator]]
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -64,8 +67,14 @@ class UnableToConnect(HomeAssistantError):
 class FjaraskupanCoordinator(DataUpdateCoordinator[State]):
     """Update coordinator for each device."""
 
+    config_entry: FjaraskupanConfigEntry
+
     def __init__(
-        self, hass: HomeAssistant, device: Device, device_info: DeviceInfo
+        self,
+        hass: HomeAssistant,
+        config_entry: FjaraskupanConfigEntry,
+        device: Device,
+        device_info: DeviceInfo,
     ) -> None:
         """Initialize the coordinator."""
         self.device = device
@@ -73,7 +82,11 @@ class FjaraskupanCoordinator(DataUpdateCoordinator[State]):
         self._refresh_was_scheduled = False
 
         super().__init__(
-            hass, _LOGGER, name="Fjäråskupan", update_interval=timedelta(seconds=120)
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name="Fjäråskupan",
+            update_interval=timedelta(seconds=120),
         )
 
     async def _async_refresh(
diff --git a/homeassistant/components/fjaraskupan/fan.py b/homeassistant/components/fjaraskupan/fan.py
index 540a7dd410d..b35bb728131 100644
--- a/homeassistant/components/fjaraskupan/fan.py
+++ b/homeassistant/components/fjaraskupan/fan.py
@@ -13,11 +13,10 @@ from fjaraskupan import (
 )
 
 from homeassistant.components.fan import FanEntity, FanEntityFeature
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util.percentage import (
     ordered_list_item_to_percentage,
@@ -25,7 +24,7 @@ from homeassistant.util.percentage import (
 )
 
 from . import async_setup_entry_platform
-from .coordinator import FjaraskupanCoordinator
+from .coordinator import FjaraskupanConfigEntry, FjaraskupanCoordinator
 
 ORDERED_NAMED_FAN_SPEEDS = ["1", "2", "3", "4", "5", "6", "7", "8"]
 
@@ -51,8 +50,8 @@ class UnsupportedPreset(HomeAssistantError):
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FjaraskupanConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors dynamically through discovery."""
 
diff --git a/homeassistant/components/fjaraskupan/light.py b/homeassistant/components/fjaraskupan/light.py
index f0083591d4d..c39e3ca4736 100644
--- a/homeassistant/components/fjaraskupan/light.py
+++ b/homeassistant/components/fjaraskupan/light.py
@@ -5,21 +5,20 @@ from __future__ import annotations
 from typing import Any
 
 from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import async_setup_entry_platform
-from .coordinator import FjaraskupanCoordinator
+from .coordinator import FjaraskupanConfigEntry, FjaraskupanCoordinator
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FjaraskupanConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up tuya sensors dynamically through tuya discovery."""
 
diff --git a/homeassistant/components/fjaraskupan/number.py b/homeassistant/components/fjaraskupan/number.py
index 1828c4cdea5..93fd31273e9 100644
--- a/homeassistant/components/fjaraskupan/number.py
+++ b/homeassistant/components/fjaraskupan/number.py
@@ -3,22 +3,21 @@
 from __future__ import annotations
 
 from homeassistant.components.number import NumberEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, UnitOfTime
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import async_setup_entry_platform
-from .coordinator import FjaraskupanCoordinator
+from .coordinator import FjaraskupanConfigEntry, FjaraskupanCoordinator
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FjaraskupanConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up number entities dynamically through discovery."""
 
diff --git a/homeassistant/components/fjaraskupan/sensor.py b/homeassistant/components/fjaraskupan/sensor.py
index 36db4d7ed9f..039feb5913c 100644
--- a/homeassistant/components/fjaraskupan/sensor.py
+++ b/homeassistant/components/fjaraskupan/sensor.py
@@ -9,23 +9,22 @@ from homeassistant.components.sensor import (
     SensorEntity,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import SIGNAL_STRENGTH_DECIBELS_MILLIWATT, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import async_setup_entry_platform
-from .coordinator import FjaraskupanCoordinator
+from .coordinator import FjaraskupanConfigEntry, FjaraskupanCoordinator
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FjaraskupanConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors dynamically through discovery."""
 
diff --git a/homeassistant/components/fleetgo/device_tracker.py b/homeassistant/components/fleetgo/device_tracker.py
index 008c0765c07..71f6c174dde 100644
--- a/homeassistant/components/fleetgo/device_tracker.py
+++ b/homeassistant/components/fleetgo/device_tracker.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     CONF_USERNAME,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import track_utc_time_change
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/flexit/climate.py b/homeassistant/components/flexit/climate.py
index 8be5df4eca7..32c94638b1f 100644
--- a/homeassistant/components/flexit/climate.py
+++ b/homeassistant/components/flexit/climate.py
@@ -29,7 +29,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/flexit_bacnet/__init__.py b/homeassistant/components/flexit_bacnet/__init__.py
index 6b42310d181..01e0051f53f 100644
--- a/homeassistant/components/flexit_bacnet/__init__.py
+++ b/homeassistant/components/flexit_bacnet/__init__.py
@@ -2,12 +2,10 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_DEVICE_ID, Platform
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
-from .coordinator import FlexitCoordinator
+from .coordinator import FlexitConfigEntry, FlexitCoordinator
 
 PLATFORMS: list[Platform] = [
     Platform.BINARY_SENSOR,
@@ -18,23 +16,18 @@ PLATFORMS: list[Platform] = [
 ]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: FlexitConfigEntry) -> bool:
     """Set up Flexit Nordic (BACnet) from a config entry."""
 
-    device_id = entry.data[CONF_DEVICE_ID]
-
-    coordinator = FlexitCoordinator(hass, device_id)
+    coordinator = FlexitCoordinator(hass, entry)
     await coordinator.async_config_entry_first_refresh()
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+    entry.runtime_data = coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: FlexitConfigEntry) -> bool:
     """Unload the Flexit Nordic (BACnet) config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/flexit_bacnet/binary_sensor.py b/homeassistant/components/flexit_bacnet/binary_sensor.py
index 901cc52de47..50c49f45e3e 100644
--- a/homeassistant/components/flexit_bacnet/binary_sensor.py
+++ b/homeassistant/components/flexit_bacnet/binary_sensor.py
@@ -10,12 +10,10 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import FlexitCoordinator
-from .const import DOMAIN
+from .coordinator import FlexitConfigEntry, FlexitCoordinator
 from .entity import FlexitEntity
 
 
@@ -38,17 +36,21 @@ SENSOR_TYPES: tuple[FlexitBinarySensorEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FlexitConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Flexit (bacnet) binary sensor from a config entry."""
-    coordinator: FlexitCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
 
     async_add_entities(
         FlexitBinarySensor(coordinator, description) for description in SENSOR_TYPES
     )
 
 
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
+
+
 class FlexitBinarySensor(FlexitEntity, BinarySensorEntity):
     """Representation of a Flexit binary Sensor."""
 
diff --git a/homeassistant/components/flexit_bacnet/climate.py b/homeassistant/components/flexit_bacnet/climate.py
index a2291dea9d6..878b63f938f 100644
--- a/homeassistant/components/flexit_bacnet/climate.py
+++ b/homeassistant/components/flexit_bacnet/climate.py
@@ -19,11 +19,10 @@ from homeassistant.components.climate import (
     HVACAction,
     HVACMode,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, PRECISION_HALVES, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     DOMAIN,
@@ -32,19 +31,20 @@ from .const import (
     PRESET_TO_VENTILATION_MODE_MAP,
     VENTILATION_TO_PRESET_MODE_MAP,
 )
-from .coordinator import FlexitCoordinator
+from .coordinator import FlexitConfigEntry, FlexitCoordinator
 from .entity import FlexitEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FlexitConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Flexit Nordic unit."""
-    coordinator: FlexitCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    async_add_entities([FlexitClimateEntity(config_entry.runtime_data)])
 
-    async_add_entities([FlexitClimateEntity(coordinator)])
+
+PARALLEL_UPDATES = 1
 
 
 class FlexitClimateEntity(FlexitEntity, ClimateEntity):
@@ -80,10 +80,6 @@ class FlexitClimateEntity(FlexitEntity, ClimateEntity):
         super().__init__(coordinator)
         self._attr_unique_id = coordinator.device.serial_number
 
-    async def async_update(self) -> None:
-        """Refresh unit state."""
-        await self.device.update()
-
     @property
     def hvac_action(self) -> HVACAction | None:
         """Return current HVAC action."""
@@ -115,7 +111,13 @@ class FlexitClimateEntity(FlexitEntity, ClimateEntity):
             else:
                 await self.device.set_air_temp_setpoint_home(temperature)
         except (asyncio.exceptions.TimeoutError, ConnectionError, DecodingError) as exc:
-            raise HomeAssistantError from exc
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="set_temperature",
+                translation_placeholders={
+                    "temperature": str(temperature),
+                },
+            ) from exc
         finally:
             await self.coordinator.async_refresh()
 
@@ -134,7 +136,13 @@ class FlexitClimateEntity(FlexitEntity, ClimateEntity):
         try:
             await self.device.set_ventilation_mode(ventilation_mode)
         except (asyncio.exceptions.TimeoutError, ConnectionError, DecodingError) as exc:
-            raise HomeAssistantError from exc
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="set_preset_mode",
+                translation_placeholders={
+                    "preset": str(ventilation_mode),
+                },
+            ) from exc
         finally:
             await self.coordinator.async_refresh()
 
@@ -154,6 +162,12 @@ class FlexitClimateEntity(FlexitEntity, ClimateEntity):
             else:
                 await self.device.set_ventilation_mode(VENTILATION_MODE_HOME)
         except (asyncio.exceptions.TimeoutError, ConnectionError, DecodingError) as exc:
-            raise HomeAssistantError from exc
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="set_hvac_mode",
+                translation_placeholders={
+                    "mode": str(hvac_mode),
+                },
+            ) from exc
         finally:
             await self.coordinator.async_refresh()
diff --git a/homeassistant/components/flexit_bacnet/coordinator.py b/homeassistant/components/flexit_bacnet/coordinator.py
index 79f3b6a05ad..9148ec87883 100644
--- a/homeassistant/components/flexit_bacnet/coordinator.py
+++ b/homeassistant/components/flexit_bacnet/coordinator.py
@@ -1,5 +1,7 @@
 """DataUpdateCoordinator for Flexit Nordic (BACnet) integration.."""
 
+from __future__ import annotations
+
 import asyncio.exceptions
 from datetime import timedelta
 import logging
@@ -17,18 +19,21 @@ from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
+type FlexitConfigEntry = ConfigEntry[FlexitCoordinator]
+
 
 class FlexitCoordinator(DataUpdateCoordinator[FlexitBACnet]):
     """Class to manage fetching data from a Flexit Nordic (BACnet) device."""
 
-    config_entry: ConfigEntry
+    config_entry: FlexitConfigEntry
 
-    def __init__(self, hass: HomeAssistant, device_id: str) -> None:
+    def __init__(self, hass: HomeAssistant, config_entry: FlexitConfigEntry) -> None:
         """Initialize my coordinator."""
         super().__init__(
             hass,
             _LOGGER,
-            name=f"{DOMAIN}_{device_id}",
+            config_entry=config_entry,
+            name=f"{DOMAIN}_{config_entry.data[CONF_DEVICE_ID]}",
             update_interval=timedelta(seconds=60),
         )
 
@@ -44,7 +49,11 @@ class FlexitCoordinator(DataUpdateCoordinator[FlexitBACnet]):
             await self.device.update()
         except (asyncio.exceptions.TimeoutError, ConnectionError, DecodingError) as exc:
             raise ConfigEntryNotReady(
-                f"Timeout while connecting to {self.config_entry.data[CONF_IP_ADDRESS]}"
+                translation_domain=DOMAIN,
+                translation_key="not_ready",
+                translation_placeholders={
+                    "ip": str(self.config_entry.data[CONF_IP_ADDRESS]),
+                },
             ) from exc
 
         return self.device
diff --git a/homeassistant/components/flexit_bacnet/icons.json b/homeassistant/components/flexit_bacnet/icons.json
index 7ce8b116a27..d03cffab9ad 100644
--- a/homeassistant/components/flexit_bacnet/icons.json
+++ b/homeassistant/components/flexit_bacnet/icons.json
@@ -30,6 +30,9 @@
       },
       "home_supply_fan_setpoint": {
         "default": "mdi:fan-plus"
+      },
+      "fireplace_mode_runtime": {
+        "default": "mdi:fireplace"
       }
     },
     "switch": {
@@ -38,6 +41,18 @@
         "state": {
           "off": "mdi:radiator-off"
         }
+      },
+      "fireplace_mode": {
+        "default": "mdi:fireplace",
+        "state": {
+          "off": "mdi:fireplace-off"
+        }
+      },
+      "cooker_hood_mode": {
+        "default": "mdi:kettle-steam",
+        "state": {
+          "off": "mdi:kettle"
+        }
       }
     }
   }
diff --git a/homeassistant/components/flexit_bacnet/manifest.json b/homeassistant/components/flexit_bacnet/manifest.json
index 40390162ce6..2e94dd2f4c7 100644
--- a/homeassistant/components/flexit_bacnet/manifest.json
+++ b/homeassistant/components/flexit_bacnet/manifest.json
@@ -6,5 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/flexit_bacnet",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "requirements": ["flexit_bacnet==2.2.1"]
+  "quality_scale": "silver",
+  "requirements": ["flexit_bacnet==2.2.3"]
 }
diff --git a/homeassistant/components/flexit_bacnet/number.py b/homeassistant/components/flexit_bacnet/number.py
index 6e405e8e8ac..b8c329bd1d4 100644
--- a/homeassistant/components/flexit_bacnet/number.py
+++ b/homeassistant/components/flexit_bacnet/number.py
@@ -13,19 +13,21 @@ from homeassistant.components.number import (
     NumberEntityDescription,
     NumberMode,
 )
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import PERCENTAGE
+from homeassistant.const import PERCENTAGE, UnitOfTime
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import FlexitCoordinator
 from .const import DOMAIN
+from .coordinator import FlexitConfigEntry, FlexitCoordinator
 from .entity import FlexitEntity
 
 _MAX_FAN_SETPOINT = 100
 _MIN_FAN_SETPOINT = 30
 
+_MAX_RUNTIME_DURATION = 360
+_MIN_RUNTIME_DURATION = 1
+
 
 @dataclass(kw_only=True, frozen=True)
 class FlexitNumberEntityDescription(NumberEntityDescription):
@@ -176,22 +178,37 @@ NUMBERS: tuple[FlexitNumberEntityDescription, ...] = (
         native_max_value_fn=lambda _: _MAX_FAN_SETPOINT,
         native_min_value_fn=lambda device: int(device.fan_setpoint_supply_air_away),
     ),
+    FlexitNumberEntityDescription(
+        key="fireplace_mode_runtime",
+        translation_key="fireplace_mode_runtime",
+        device_class=NumberDeviceClass.DURATION,
+        native_step=1,
+        mode=NumberMode.SLIDER,
+        native_value_fn=lambda device: device.fireplace_mode_runtime,
+        set_native_value_fn=lambda device: device.set_fireplace_mode_runtime,
+        native_unit_of_measurement=UnitOfTime.MINUTES,
+        native_max_value_fn=lambda _: _MAX_RUNTIME_DURATION,
+        native_min_value_fn=lambda _: _MIN_RUNTIME_DURATION,
+    ),
 )
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FlexitConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Flexit (bacnet) number from a config entry."""
-    coordinator: FlexitCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
 
     async_add_entities(
         FlexitNumber(coordinator, description) for description in NUMBERS
     )
 
 
+PARALLEL_UPDATES = 1
+
+
 class FlexitNumber(FlexitEntity, NumberEntity):
     """Representation of a Flexit Number."""
 
@@ -233,6 +250,12 @@ class FlexitNumber(FlexitEntity, NumberEntity):
         try:
             await set_native_value_fn(int(value))
         except (asyncio.exceptions.TimeoutError, ConnectionError, DecodingError) as exc:
-            raise HomeAssistantError from exc
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="set_value_error",
+                translation_placeholders={
+                    "value": str(value),
+                },
+            ) from exc
         finally:
             await self.coordinator.async_refresh()
diff --git a/homeassistant/components/flexit_bacnet/quality_scale.yaml b/homeassistant/components/flexit_bacnet/quality_scale.yaml
new file mode 100644
index 00000000000..7a98eda4eb3
--- /dev/null
+++ b/homeassistant/components/flexit_bacnet/quality_scale.yaml
@@ -0,0 +1,91 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: |
+      Integration does not define custom actions.
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: |
+      This integration does not use any actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup:
+    status: exempt
+    comment: |
+      Entities don't subscribe to events explicitly
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup:
+    status: done
+    comment: |
+      Done implicitly with `await coordinator.async_config_entry_first_refresh()`.
+  unique-config-entry: done
+  # Silver
+  action-exceptions: done
+  config-entry-unloading: done
+  docs-configuration-parameters:
+    status: exempt
+    comment: |
+      Integration does not use options flow.
+  docs-installation-parameters: done
+  entity-unavailable:
+    status: done
+    comment: |
+      Done implicitly with coordinator.
+  integration-owner: done
+  log-when-unavailable:
+    status: done
+    comment: |
+      Done implicitly with coordinator.
+  parallel-updates: done
+  reauthentication-flow:
+    status: exempt
+    comment: |
+      Integration doesn't require any form of authentication.
+  test-coverage: done
+  # Gold
+  entity-translations: done
+  entity-device-class: done
+  devices: done
+  entity-category: todo
+  entity-disabled-by-default: todo
+  discovery: todo
+  stale-devices:
+    status: exempt
+    comment: |
+      Device type integration.
+  diagnostics: todo
+  exception-translations: done
+  icon-translations: done
+  reconfiguration-flow: todo
+  dynamic-devices:
+    status: exempt
+    comment: |
+      Device type integration.
+  discovery-update-info: todo
+  repair-issues:
+    status: exempt
+    comment: |
+      This is not applicable for this integration.
+  docs-use-cases: todo
+  docs-supported-devices: todo
+  docs-supported-functions: todo
+  docs-data-update: done
+  docs-known-limitations: todo
+  docs-troubleshooting: todo
+  docs-examples: todo
+
+  # Platinum
+  async-dependency: todo
+  inject-websession: todo
+  strict-typing: done
diff --git a/homeassistant/components/flexit_bacnet/sensor.py b/homeassistant/components/flexit_bacnet/sensor.py
index be5f12e480e..0506b13892b 100644
--- a/homeassistant/components/flexit_bacnet/sensor.py
+++ b/homeassistant/components/flexit_bacnet/sensor.py
@@ -11,7 +11,6 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     PERCENTAGE,
     REVOLUTIONS_PER_MINUTE,
@@ -20,11 +19,10 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import FlexitCoordinator
-from .const import DOMAIN
+from .coordinator import FlexitConfigEntry, FlexitCoordinator
 from .entity import FlexitEntity
 
 
@@ -152,17 +150,21 @@ SENSOR_TYPES: tuple[FlexitSensorEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FlexitConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Flexit (bacnet) sensor from a config entry."""
-    coordinator: FlexitCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
 
     async_add_entities(
         FlexitSensor(coordinator, description) for description in SENSOR_TYPES
     )
 
 
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
+
+
 class FlexitSensor(FlexitEntity, SensorEntity):
     """Representation of a Flexit (bacnet) Sensor."""
 
diff --git a/homeassistant/components/flexit_bacnet/strings.json b/homeassistant/components/flexit_bacnet/strings.json
index 7f763674d00..6364d59e4e8 100644
--- a/homeassistant/components/flexit_bacnet/strings.json
+++ b/homeassistant/components/flexit_bacnet/strings.json
@@ -5,6 +5,10 @@
         "data": {
           "ip_address": "[%key:common::config_flow::data::ip%]",
           "device_id": "[%key:common::config_flow::data::device%]"
+        },
+        "data_description": {
+          "ip_address": "The IP address of the Flexit Nordic device",
+          "device_id": "The device ID of the Flexit Nordic device"
         }
       }
     },
@@ -52,6 +56,9 @@
       },
       "home_supply_fan_setpoint": {
         "name": "Home supply fan setpoint"
+      },
+      "fireplace_mode_runtime": {
+        "name": "Fireplace mode runtime"
       }
     },
     "sensor": {
@@ -104,7 +111,33 @@
     "switch": {
       "electric_heater": {
         "name": "Electric heater"
+      },
+      "fireplace_mode": {
+        "name": "Fireplace mode"
+      },
+      "cooker_hood_mode": {
+        "name": "Cooker hood mode"
       }
     }
+  },
+  "exceptions": {
+    "set_value_error": {
+      "message": "Failed setting the value {value}."
+    },
+    "switch_turn": {
+      "message": "Failed to turn the switch {state}."
+    },
+    "set_preset_mode": {
+      "message": "Failed to set preset mode {preset}."
+    },
+    "set_temperature": {
+      "message": "Failed to set temperature {temperature}."
+    },
+    "set_hvac_mode": {
+      "message": "Failed to set HVAC mode {mode}."
+    },
+    "not_ready": {
+      "message": "Timeout while connecting to {ip}."
+    }
   }
 }
diff --git a/homeassistant/components/flexit_bacnet/switch.py b/homeassistant/components/flexit_bacnet/switch.py
index c58e35cda75..bdeff006181 100644
--- a/homeassistant/components/flexit_bacnet/switch.py
+++ b/homeassistant/components/flexit_bacnet/switch.py
@@ -13,13 +13,12 @@ from homeassistant.components.switch import (
     SwitchEntity,
     SwitchEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import FlexitCoordinator
 from .const import DOMAIN
+from .coordinator import FlexitConfigEntry, FlexitCoordinator
 from .entity import FlexitEntity
 
 
@@ -40,22 +39,39 @@ SWITCHES: tuple[FlexitSwitchEntityDescription, ...] = (
         turn_on_fn=lambda data: data.enable_electric_heater(),
         turn_off_fn=lambda data: data.disable_electric_heater(),
     ),
+    FlexitSwitchEntityDescription(
+        key="fireplace_mode",
+        translation_key="fireplace_mode",
+        is_on_fn=lambda data: data.fireplace_ventilation_status,
+        turn_on_fn=lambda data: data.trigger_fireplace_mode(),
+        turn_off_fn=lambda data: data.trigger_fireplace_mode(),
+    ),
+    FlexitSwitchEntityDescription(
+        key="cooker_hood_mode",
+        translation_key="cooker_hood_mode",
+        is_on_fn=lambda data: data.cooker_hood_status,
+        turn_on_fn=lambda data: data.activate_cooker_hood(),
+        turn_off_fn=lambda data: data.deactivate_cooker_hood(),
+    ),
 )
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FlexitConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Flexit (bacnet) switch from a config entry."""
-    coordinator: FlexitCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
 
     async_add_entities(
         FlexitSwitch(coordinator, description) for description in SWITCHES
     )
 
 
+PARALLEL_UPDATES = 1
+
+
 class FlexitSwitch(FlexitEntity, SwitchEntity):
     """Representation of a Flexit Switch."""
 
@@ -82,19 +98,31 @@ class FlexitSwitch(FlexitEntity, SwitchEntity):
         return self.entity_description.is_on_fn(self.coordinator.data)
 
     async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn electric heater on."""
+        """Turn switch on."""
         try:
             await self.entity_description.turn_on_fn(self.coordinator.data)
         except (asyncio.exceptions.TimeoutError, ConnectionError, DecodingError) as exc:
-            raise HomeAssistantError from exc
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="switch_turn",
+                translation_placeholders={
+                    "state": "on",
+                },
+            ) from exc
         finally:
             await self.coordinator.async_refresh()
 
     async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn electric heater off."""
+        """Turn switch off."""
         try:
             await self.entity_description.turn_off_fn(self.coordinator.data)
         except (asyncio.exceptions.TimeoutError, ConnectionError, DecodingError) as exc:
-            raise HomeAssistantError from exc
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="switch_turn",
+                translation_placeholders={
+                    "state": "off",
+                },
+            ) from exc
         finally:
             await self.coordinator.async_refresh()
diff --git a/homeassistant/components/flic/binary_sensor.py b/homeassistant/components/flic/binary_sensor.py
index cd160480674..281e960f222 100644
--- a/homeassistant/components/flic/binary_sensor.py
+++ b/homeassistant/components/flic/binary_sensor.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/flick_electric/__init__.py b/homeassistant/components/flick_electric/__init__.py
index 3ffddee1c7d..ad772c06b2e 100644
--- a/homeassistant/components/flick_electric/__init__.py
+++ b/homeassistant/components/flick_electric/__init__.py
@@ -9,7 +9,6 @@ from pyflick import FlickAPI
 from pyflick.authentication import SimpleFlickAuth
 from pyflick.const import DEFAULT_CLIENT_ID, DEFAULT_CLIENT_SECRET
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_ACCESS_TOKEN,
     CONF_CLIENT_ID,
@@ -35,9 +34,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: FlickConfigEntry) -> boo
     """Set up Flick Electric from a config entry."""
     auth = HassFlickAuth(hass, entry)
 
-    coordinator = FlickElectricDataCoordinator(
-        hass, FlickAPI(auth), entry.data[CONF_SUPPLY_NODE_REF]
-    )
+    coordinator = FlickElectricDataCoordinator(hass, entry, FlickAPI(auth))
 
     await coordinator.async_config_entry_first_refresh()
 
@@ -53,7 +50,9 @@ async def async_unload_entry(hass: HomeAssistant, entry: FlickConfigEntry) -> bo
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
-async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_migrate_entry(
+    hass: HomeAssistant, config_entry: FlickConfigEntry
+) -> bool:
     """Migrate old entry."""
     _LOGGER.debug(
         "Migrating configuration from version %s.%s",
diff --git a/homeassistant/components/flick_electric/coordinator.py b/homeassistant/components/flick_electric/coordinator.py
index 474efc5297d..114b364635f 100644
--- a/homeassistant/components/flick_electric/coordinator.py
+++ b/homeassistant/components/flick_electric/coordinator.py
@@ -13,6 +13,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
+from .const import CONF_SUPPLY_NODE_REF
+
 _LOGGER = logging.getLogger(__name__)
 
 SCAN_INTERVAL = timedelta(minutes=5)
@@ -23,17 +25,23 @@ type FlickConfigEntry = ConfigEntry[FlickElectricDataCoordinator]
 class FlickElectricDataCoordinator(DataUpdateCoordinator[FlickPrice]):
     """Coordinator for flick power price."""
 
+    config_entry: FlickConfigEntry
+
     def __init__(
-        self, hass: HomeAssistant, api: FlickAPI, supply_node_ref: str
+        self,
+        hass: HomeAssistant,
+        config_entry: FlickConfigEntry,
+        api: FlickAPI,
     ) -> None:
         """Initialize FlickElectricDataCoordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="Flick Electric",
             update_interval=SCAN_INTERVAL,
         )
-        self.supply_node_ref = supply_node_ref
+        self.supply_node_ref = config_entry.data[CONF_SUPPLY_NODE_REF]
         self._api = api
 
     async def _async_update_data(self) -> FlickPrice:
diff --git a/homeassistant/components/flick_electric/sensor.py b/homeassistant/components/flick_electric/sensor.py
index 73b6f8793fb..636d12525ad 100644
--- a/homeassistant/components/flick_electric/sensor.py
+++ b/homeassistant/components/flick_electric/sensor.py
@@ -8,7 +8,7 @@ from typing import Any
 from homeassistant.components.sensor import SensorEntity
 from homeassistant.const import CURRENCY_CENT, UnitOfEnergy
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import ATTR_COMPONENTS, ATTR_END_AT, ATTR_START_AT
@@ -21,7 +21,7 @@ SCAN_INTERVAL = timedelta(minutes=5)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FlickConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Flick Sensor Setup."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/flipr/__init__.py b/homeassistant/components/flipr/__init__.py
index 99bddb5a0d0..81e61f2554a 100644
--- a/homeassistant/components/flipr/__init__.py
+++ b/homeassistant/components/flipr/__init__.py
@@ -1,7 +1,6 @@
 """The Flipr integration."""
 
 from collections import Counter
-from dataclasses import dataclass
 import logging
 
 from flipr_api import FliprAPIRestClient
@@ -13,24 +12,18 @@ from homeassistant.exceptions import ConfigEntryError
 from homeassistant.helpers import issue_registry as ir
 
 from .const import DOMAIN
-from .coordinator import FliprDataUpdateCoordinator, FliprHubDataUpdateCoordinator
+from .coordinator import (
+    FliprConfigEntry,
+    FliprData,
+    FliprDataUpdateCoordinator,
+    FliprHubDataUpdateCoordinator,
+)
 
 PLATFORMS = [Platform.BINARY_SENSOR, Platform.SELECT, Platform.SENSOR, Platform.SWITCH]
 
 _LOGGER = logging.getLogger(__name__)
 
 
-@dataclass
-class FliprData:
-    """The Flipr data class."""
-
-    flipr_coordinators: list[FliprDataUpdateCoordinator]
-    hub_coordinators: list[FliprHubDataUpdateCoordinator]
-
-
-type FliprConfigEntry = ConfigEntry[FliprData]
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: FliprConfigEntry) -> bool:
     """Set up flipr from a config entry."""
 
@@ -50,13 +43,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: FliprConfigEntry) -> boo
 
     flipr_coordinators = []
     for flipr_id in ids["flipr"]:
-        flipr_coordinator = FliprDataUpdateCoordinator(hass, client, flipr_id)
+        flipr_coordinator = FliprDataUpdateCoordinator(hass, entry, client, flipr_id)
         await flipr_coordinator.async_config_entry_first_refresh()
         flipr_coordinators.append(flipr_coordinator)
 
     hub_coordinators = []
     for hub_id in ids["hub"]:
-        hub_coordinator = FliprHubDataUpdateCoordinator(hass, client, hub_id)
+        hub_coordinator = FliprHubDataUpdateCoordinator(hass, entry, client, hub_id)
         await hub_coordinator.async_config_entry_first_refresh()
         hub_coordinators.append(hub_coordinator)
 
diff --git a/homeassistant/components/flipr/binary_sensor.py b/homeassistant/components/flipr/binary_sensor.py
index cc6a9d36abc..899d045ad86 100644
--- a/homeassistant/components/flipr/binary_sensor.py
+++ b/homeassistant/components/flipr/binary_sensor.py
@@ -8,9 +8,9 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import FliprConfigEntry
+from .coordinator import FliprConfigEntry
 from .entity import FliprEntity
 
 BINARY_SENSORS_TYPES: tuple[BinarySensorEntityDescription, ...] = (
@@ -30,7 +30,7 @@ BINARY_SENSORS_TYPES: tuple[BinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: FliprConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Defer sensor setup of flipr binary sensors."""
 
diff --git a/homeassistant/components/flipr/coordinator.py b/homeassistant/components/flipr/coordinator.py
index 12fd174fe7d..82de5ae34d5 100644
--- a/homeassistant/components/flipr/coordinator.py
+++ b/homeassistant/components/flipr/coordinator.py
@@ -1,5 +1,8 @@
 """DataUpdateCoordinator for flipr integration."""
 
+from __future__ import annotations
+
+from dataclasses import dataclass
 from datetime import timedelta
 import logging
 from typing import Any
@@ -14,13 +17,28 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 _LOGGER = logging.getLogger(__name__)
 
 
+@dataclass
+class FliprData:
+    """The Flipr data class."""
+
+    flipr_coordinators: list[FliprDataUpdateCoordinator]
+    hub_coordinators: list[FliprHubDataUpdateCoordinator]
+
+
+type FliprConfigEntry = ConfigEntry[FliprData]
+
+
 class BaseDataUpdateCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
     """Parent class to hold Flipr and Hub data retrieval."""
 
-    config_entry: ConfigEntry
+    config_entry: FliprConfigEntry
 
     def __init__(
-        self, hass: HomeAssistant, client: FliprAPIRestClient, flipr_or_hub_id: str
+        self,
+        hass: HomeAssistant,
+        config_entry: FliprConfigEntry,
+        client: FliprAPIRestClient,
+        flipr_or_hub_id: str,
     ) -> None:
         """Initialize."""
         self.device_id = flipr_or_hub_id
@@ -29,6 +47,7 @@ class BaseDataUpdateCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=f"Flipr or Hub data measure for {self.device_id}",
             update_interval=timedelta(minutes=15),
         )
diff --git a/homeassistant/components/flipr/select.py b/homeassistant/components/flipr/select.py
index b8a8f0db60a..c10e9c6e91b 100644
--- a/homeassistant/components/flipr/select.py
+++ b/homeassistant/components/flipr/select.py
@@ -4,9 +4,9 @@ import logging
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import FliprConfigEntry
+from .coordinator import FliprConfigEntry
 from .entity import FliprEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -23,7 +23,7 @@ SELECT_TYPES: tuple[SelectEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: FliprConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up select for Flipr hub mode."""
     coordinators = config_entry.runtime_data.hub_coordinators
diff --git a/homeassistant/components/flipr/sensor.py b/homeassistant/components/flipr/sensor.py
index ba863718182..296bcaac68d 100644
--- a/homeassistant/components/flipr/sensor.py
+++ b/homeassistant/components/flipr/sensor.py
@@ -10,9 +10,9 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, UnitOfElectricPotential, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import FliprConfigEntry
+from .coordinator import FliprConfigEntry
 from .entity import FliprEntity
 
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
@@ -57,7 +57,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: FliprConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Defer sensor setup to the shared sensor module."""
     coordinators = config_entry.runtime_data.flipr_coordinators
diff --git a/homeassistant/components/flipr/switch.py b/homeassistant/components/flipr/switch.py
index 65e729ec280..4db8b54af8a 100644
--- a/homeassistant/components/flipr/switch.py
+++ b/homeassistant/components/flipr/switch.py
@@ -5,9 +5,9 @@ from typing import Any
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import FliprConfigEntry
+from .coordinator import FliprConfigEntry
 from .entity import FliprEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -23,7 +23,7 @@ SWITCH_TYPES: tuple[SwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: FliprConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switch for Flipr hub."""
     coordinators = config_entry.runtime_data.hub_coordinators
diff --git a/homeassistant/components/flo/__init__.py b/homeassistant/components/flo/__init__.py
index b619df91d59..88824b041e7 100644
--- a/homeassistant/components/flo/__init__.py
+++ b/homeassistant/components/flo/__init__.py
@@ -6,27 +6,23 @@ import logging
 from aioflo import async_get_api
 from aioflo.errors import RequestError
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import CLIENT, DOMAIN
-from .coordinator import FloDeviceDataUpdateCoordinator
+from .coordinator import FloConfigEntry, FloDeviceDataUpdateCoordinator, FloRuntimeData
 
 _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR, Platform.SWITCH]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: FloConfigEntry) -> bool:
     """Set up flo from a config entry."""
     session = async_get_clientsession(hass)
-    hass.data.setdefault(DOMAIN, {})
-    hass.data[DOMAIN][entry.entry_id] = {}
     try:
-        hass.data[DOMAIN][entry.entry_id][CLIENT] = client = await async_get_api(
+        client = await async_get_api(
             entry.data[CONF_USERNAME], entry.data[CONF_PASSWORD], session=session
         )
     except RequestError as err:
@@ -36,8 +32,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     _LOGGER.debug("Flo user information with locations: %s", user_info)
 
-    hass.data[DOMAIN][entry.entry_id]["devices"] = devices = [
-        FloDeviceDataUpdateCoordinator(hass, client, location["id"], device["id"])
+    devices = [
+        FloDeviceDataUpdateCoordinator(
+            hass, entry, client, location["id"], device["id"]
+        )
         for location in user_info["locations"]
         for device in location["devices"]
     ]
@@ -45,14 +43,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     tasks = [device.async_refresh() for device in devices]
     await asyncio.gather(*tasks)
 
+    entry.runtime_data = FloRuntimeData(client=client, devices=devices)
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: FloConfigEntry) -> bool:
     """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/flo/binary_sensor.py b/homeassistant/components/flo/binary_sensor.py
index 20f5d7822d2..89f317fd3c6 100644
--- a/homeassistant/components/flo/binary_sensor.py
+++ b/homeassistant/components/flo/binary_sensor.py
@@ -6,24 +6,20 @@ from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN as FLO_DOMAIN
-from .coordinator import FloDeviceDataUpdateCoordinator
+from .coordinator import FloConfigEntry
 from .entity import FloEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FloConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Flo sensors from config entry."""
-    devices: list[FloDeviceDataUpdateCoordinator] = hass.data[FLO_DOMAIN][
-        config_entry.entry_id
-    ]["devices"]
+    devices = config_entry.runtime_data.devices
     entities: list[BinarySensorEntity] = []
     for device in devices:
         if device.device_type == "puck_oem":
diff --git a/homeassistant/components/flo/const.py b/homeassistant/components/flo/const.py
index 9eb00ebfa62..5b1d926d9f4 100644
--- a/homeassistant/components/flo/const.py
+++ b/homeassistant/components/flo/const.py
@@ -4,7 +4,6 @@ import logging
 
 LOGGER = logging.getLogger(__package__)
 
-CLIENT = "client"
 DOMAIN = "flo"
 FLO_HOME = "home"
 FLO_AWAY = "away"
diff --git a/homeassistant/components/flo/coordinator.py b/homeassistant/components/flo/coordinator.py
index 0edb80004fd..9f540b230f4 100644
--- a/homeassistant/components/flo/coordinator.py
+++ b/homeassistant/components/flo/coordinator.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import asyncio
+from dataclasses import dataclass
 from datetime import datetime, timedelta
 from typing import Any
 
@@ -10,20 +11,37 @@ from aioflo.api import API
 from aioflo.errors import RequestError
 from orjson import JSONDecodeError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN as FLO_DOMAIN, LOGGER
 
+type FloConfigEntry = ConfigEntry[FloRuntimeData]
+
+
+@dataclass
+class FloRuntimeData:
+    """Flo runtime data."""
+
+    client: API
+    devices: list[FloDeviceDataUpdateCoordinator]
+
 
 class FloDeviceDataUpdateCoordinator(DataUpdateCoordinator):
     """Flo device object."""
 
+    config_entry: ConfigEntry
     _failure_count: int = 0
 
     def __init__(
-        self, hass: HomeAssistant, api_client: API, location_id: str, device_id: str
+        self,
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        api_client: API,
+        location_id: str,
+        device_id: str,
     ) -> None:
         """Initialize the device."""
         self.hass: HomeAssistant = hass
@@ -36,6 +54,7 @@ class FloDeviceDataUpdateCoordinator(DataUpdateCoordinator):
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=f"{FLO_DOMAIN}-{device_id}",
             update_interval=timedelta(seconds=60),
         )
diff --git a/homeassistant/components/flo/entity.py b/homeassistant/components/flo/entity.py
index b0cf8d04313..072afbae4f2 100644
--- a/homeassistant/components/flo/entity.py
+++ b/homeassistant/components/flo/entity.py
@@ -45,10 +45,10 @@ class FloEntity(Entity):
         """Return True if device is available."""
         return self._device.available
 
-    async def async_update(self):
+    async def async_update(self) -> None:
         """Update Flo entity."""
         await self._device.async_request_refresh()
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """When entity is added to hass."""
         self.async_on_remove(self._device.async_add_listener(self.async_write_ha_state))
diff --git a/homeassistant/components/flo/sensor.py b/homeassistant/components/flo/sensor.py
index 7419b0a1c3b..ca763839b87 100644
--- a/homeassistant/components/flo/sensor.py
+++ b/homeassistant/components/flo/sensor.py
@@ -7,7 +7,6 @@ from homeassistant.components.sensor import (
     SensorEntity,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     PERCENTAGE,
     UnitOfPressure,
@@ -16,22 +15,19 @@ from homeassistant.const import (
     UnitOfVolumeFlowRate,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN as FLO_DOMAIN
-from .coordinator import FloDeviceDataUpdateCoordinator
+from .coordinator import FloConfigEntry
 from .entity import FloEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FloConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Flo sensors from config entry."""
-    devices: list[FloDeviceDataUpdateCoordinator] = hass.data[FLO_DOMAIN][
-        config_entry.entry_id
-    ]["devices"]
+    devices = config_entry.runtime_data.devices
     entities = []
     for device in devices:
         if device.device_type == "puck_oem":
diff --git a/homeassistant/components/flo/strings.json b/homeassistant/components/flo/strings.json
index 3444911fbd4..64e22bedec3 100644
--- a/homeassistant/components/flo/strings.json
+++ b/homeassistant/components/flo/strings.json
@@ -60,11 +60,11 @@
       "fields": {
         "sleep_minutes": {
           "name": "Sleep minutes",
-          "description": "The time to sleep in minutes."
+          "description": "The duration to sleep in minutes."
         },
         "revert_to_mode": {
           "name": "Revert to mode",
-          "description": "The mode to revert to after sleep_minutes has elapsed."
+          "description": "The mode to revert to after the 'Sleep minutes' duration has elapsed."
         }
       }
     },
@@ -78,7 +78,7 @@
     },
     "run_health_test": {
       "name": "Run health test",
-      "description": "Have the Flo device run a health test."
+      "description": "Requests the Flo device to run a health test."
     }
   }
 }
diff --git a/homeassistant/components/flo/switch.py b/homeassistant/components/flo/switch.py
index f0460839837..12e242db5c8 100644
--- a/homeassistant/components/flo/switch.py
+++ b/homeassistant/components/flo/switch.py
@@ -8,13 +8,11 @@ from aioflo.location import SLEEP_MINUTE_OPTIONS, SYSTEM_MODE_HOME, SYSTEM_REVER
 import voluptuous as vol
 
 from homeassistant.components.switch import SwitchEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN as FLO_DOMAIN
-from .coordinator import FloDeviceDataUpdateCoordinator
+from .coordinator import FloConfigEntry, FloDeviceDataUpdateCoordinator
 from .entity import FloEntity
 
 ATTR_REVERT_TO_MODE = "revert_to_mode"
@@ -27,13 +25,11 @@ SERVICE_RUN_HEALTH_TEST = "run_health_test"
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FloConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Flo switches from config entry."""
-    devices: list[FloDeviceDataUpdateCoordinator] = hass.data[FLO_DOMAIN][
-        config_entry.entry_id
-    ]["devices"]
+    devices = config_entry.runtime_data.devices
 
     async_add_entities(
         [FloSwitch(device) for device in devices if device.device_type != "puck_oem"]
diff --git a/homeassistant/components/flock/notify.py b/homeassistant/components/flock/notify.py
index 811ee51749c..f50e04cba36 100644
--- a/homeassistant/components/flock/notify.py
+++ b/homeassistant/components/flock/notify.py
@@ -14,8 +14,8 @@ from homeassistant.components.notify import (
 )
 from homeassistant.const import CONF_ACCESS_TOKEN
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/flume/__init__.py b/homeassistant/components/flume/__init__.py
index d91c6b175cf..d229665ca62 100644
--- a/homeassistant/components/flume/__init__.py
+++ b/homeassistant/components/flume/__init__.py
@@ -7,7 +7,7 @@ from requests import Session
 from requests.exceptions import RequestException
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import (
     CONF_CLIENT_ID,
     CONF_CLIENT_SECRET,
@@ -24,28 +24,24 @@ from homeassistant.core import (
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers.selector import ConfigEntrySelector
 
-from .const import (
-    BASE_TOKEN_FILENAME,
-    DOMAIN,
-    FLUME_AUTH,
-    FLUME_DEVICES,
-    FLUME_HTTP_SESSION,
-    FLUME_NOTIFICATIONS_COORDINATOR,
-    PLATFORMS,
+from .const import BASE_TOKEN_FILENAME, DOMAIN, PLATFORMS
+from .coordinator import (
+    FlumeConfigEntry,
+    FlumeNotificationDataUpdateCoordinator,
+    FlumeRuntimeData,
 )
-from .coordinator import FlumeNotificationDataUpdateCoordinator
 
 SERVICE_LIST_NOTIFICATIONS = "list_notifications"
 CONF_CONFIG_ENTRY = "config_entry"
 LIST_NOTIFICATIONS_SERVICE_SCHEMA = vol.All(
     {
-        vol.Required(CONF_CONFIG_ENTRY): ConfigEntrySelector(),
+        vol.Required(CONF_CONFIG_ENTRY): ConfigEntrySelector({"integration": DOMAIN}),
     },
 )
 
 
 def _setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry
+    hass: HomeAssistant, entry: FlumeConfigEntry
 ) -> tuple[FlumeAuth, FlumeDeviceList, Session]:
     """Config entry set up in executor."""
     config = entry.data
@@ -76,22 +72,22 @@ def _setup_entry(
     return flume_auth, flume_devices, http_session
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: FlumeConfigEntry) -> bool:
     """Set up flume from a config entry."""
 
     flume_auth, flume_devices, http_session = await hass.async_add_executor_job(
         _setup_entry, hass, entry
     )
     notification_coordinator = FlumeNotificationDataUpdateCoordinator(
-        hass=hass, auth=flume_auth
+        hass=hass, config_entry=entry, auth=flume_auth
     )
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {
-        FLUME_DEVICES: flume_devices,
-        FLUME_AUTH: flume_auth,
-        FLUME_HTTP_SESSION: http_session,
-        FLUME_NOTIFICATIONS_COORDINATOR: notification_coordinator,
-    }
+    entry.runtime_data = FlumeRuntimeData(
+        devices=flume_devices,
+        auth=flume_auth,
+        http_session=http_session,
+        notifications_coordinator=notification_coordinator,
+    )
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     setup_service(hass)
@@ -99,16 +95,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: FlumeConfigEntry) -> bool:
     """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-
-    hass.data[DOMAIN][entry.entry_id][FLUME_HTTP_SESSION].close()
-
-    if unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
+    entry.runtime_data.http_session.close()
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
 def setup_service(hass: HomeAssistant) -> None:
@@ -118,15 +108,13 @@ def setup_service(hass: HomeAssistant) -> None:
     def list_notifications(call: ServiceCall) -> ServiceResponse:
         """Return the user notifications."""
         entry_id: str = call.data[CONF_CONFIG_ENTRY]
-        entry: ConfigEntry | None = hass.config_entries.async_get_entry(entry_id)
+        entry: FlumeConfigEntry | None = hass.config_entries.async_get_entry(entry_id)
         if not entry:
             raise ValueError(f"Invalid config entry: {entry_id}")
-        if not (flume_domain_data := hass.data[DOMAIN].get(entry_id)):
+        if not entry.state == ConfigEntryState.LOADED:
             raise ValueError(f"Config entry not loaded: {entry_id}")
         return {
-            "notifications": flume_domain_data[
-                FLUME_NOTIFICATIONS_COORDINATOR
-            ].notifications
+            "notifications": entry.runtime_data.notifications_coordinator.notifications  # type: ignore[dict-item]
         }
 
     hass.services.async_register(
diff --git a/homeassistant/components/flume/binary_sensor.py b/homeassistant/components/flume/binary_sensor.py
index 28f56168d9c..2c2dc285036 100644
--- a/homeassistant/components/flume/binary_sensor.py
+++ b/homeassistant/components/flume/binary_sensor.py
@@ -9,15 +9,11 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
-    DOMAIN,
-    FLUME_DEVICES,
-    FLUME_NOTIFICATIONS_COORDINATOR,
     FLUME_TYPE_BRIDGE,
     FLUME_TYPE_SENSOR,
     KEY_DEVICE_ID,
@@ -29,6 +25,7 @@ from .const import (
     NOTIFICATION_LOW_BATTERY,
 )
 from .coordinator import (
+    FlumeConfigEntry,
     FlumeDeviceConnectionUpdateCoordinator,
     FlumeNotificationDataUpdateCoordinator,
 )
@@ -71,21 +68,21 @@ FLUME_BINARY_NOTIFICATION_SENSORS: tuple[FlumeBinarySensorEntityDescription, ...
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FlumeConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Flume binary sensor.."""
-    flume_domain_data = hass.data[DOMAIN][config_entry.entry_id]
-    flume_devices = flume_domain_data[FLUME_DEVICES]
+    flume_domain_data = config_entry.runtime_data
+    flume_devices = flume_domain_data.devices
 
     flume_entity_list: list[
         FlumeNotificationBinarySensor | FlumeConnectionBinarySensor
     ] = []
 
     connection_coordinator = FlumeDeviceConnectionUpdateCoordinator(
-        hass=hass, flume_devices=flume_devices
+        hass=hass, config_entry=config_entry, flume_devices=flume_devices
     )
-    notification_coordinator = flume_domain_data[FLUME_NOTIFICATIONS_COORDINATOR]
+    notification_coordinator = flume_domain_data.notifications_coordinator
     flume_devices = get_valid_flume_devices(flume_devices)
     for device in flume_devices:
         device_id = device[KEY_DEVICE_ID]
diff --git a/homeassistant/components/flume/const.py b/homeassistant/components/flume/const.py
index 1f9fc10b1b3..a8fe21f4b06 100644
--- a/homeassistant/components/flume/const.py
+++ b/homeassistant/components/flume/const.py
@@ -26,12 +26,6 @@ _LOGGER = logging.getLogger(__package__)
 FLUME_TYPE_BRIDGE = 1
 FLUME_TYPE_SENSOR = 2
 
-
-FLUME_AUTH = "flume_auth"
-FLUME_HTTP_SESSION = "http_session"
-FLUME_DEVICES = "devices"
-FLUME_NOTIFICATIONS_COORDINATOR = "notifications_coordinator"
-
 CONF_TOKEN_FILE = "token_filename"
 BASE_TOKEN_FILENAME = "FLUME_TOKEN_FILE"
 
diff --git a/homeassistant/components/flume/coordinator.py b/homeassistant/components/flume/coordinator.py
index 30e7962304c..1dabf5726b2 100644
--- a/homeassistant/components/flume/coordinator.py
+++ b/homeassistant/components/flume/coordinator.py
@@ -2,11 +2,14 @@
 
 from __future__ import annotations
 
+from dataclasses import dataclass
 from typing import Any
 
 import pyflume
 from pyflume import FlumeAuth, FlumeData, FlumeDeviceList
+from requests import Session
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -19,13 +22,34 @@ from .const import (
 )
 
 
+@dataclass
+class FlumeRuntimeData:
+    """Runtime data for the Flume config entry."""
+
+    devices: FlumeDeviceList
+    auth: FlumeAuth
+    http_session: Session
+    notifications_coordinator: FlumeNotificationDataUpdateCoordinator
+
+
+type FlumeConfigEntry = ConfigEntry[FlumeRuntimeData]
+
+
 class FlumeDeviceDataUpdateCoordinator(DataUpdateCoordinator[None]):
     """Data update coordinator for an individual flume device."""
 
-    def __init__(self, hass: HomeAssistant, flume_device: FlumeData) -> None:
+    config_entry: FlumeConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: FlumeConfigEntry,
+        flume_device: FlumeData,
+    ) -> None:
         """Initialize the Coordinator."""
         super().__init__(
             hass,
+            config_entry=config_entry,
             name=DOMAIN,
             logger=_LOGGER,
             update_interval=DEVICE_SCAN_INTERVAL,
@@ -49,10 +73,18 @@ class FlumeDeviceDataUpdateCoordinator(DataUpdateCoordinator[None]):
 class FlumeDeviceConnectionUpdateCoordinator(DataUpdateCoordinator[None]):
     """Date update coordinator to read connected status from Devices endpoint."""
 
-    def __init__(self, hass: HomeAssistant, flume_devices: FlumeDeviceList) -> None:
+    config_entry: FlumeConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: FlumeConfigEntry,
+        flume_devices: FlumeDeviceList,
+    ) -> None:
         """Initialize the Coordinator."""
         super().__init__(
             hass,
+            config_entry=config_entry,
             name=DOMAIN,
             logger=_LOGGER,
             update_interval=DEVICE_CONNECTION_SCAN_INTERVAL,
@@ -80,10 +112,15 @@ class FlumeDeviceConnectionUpdateCoordinator(DataUpdateCoordinator[None]):
 class FlumeNotificationDataUpdateCoordinator(DataUpdateCoordinator[None]):
     """Data update coordinator for flume notifications."""
 
-    def __init__(self, hass: HomeAssistant, auth: FlumeAuth) -> None:
+    config_entry: FlumeConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: FlumeConfigEntry, auth: FlumeAuth
+    ) -> None:
         """Initialize the Coordinator."""
         super().__init__(
             hass,
+            config_entry=config_entry,
             name=DOMAIN,
             logger=_LOGGER,
             update_interval=NOTIFICATION_SCAN_INTERVAL,
diff --git a/homeassistant/components/flume/sensor.py b/homeassistant/components/flume/sensor.py
index 96395e5403f..0f0213ec984 100644
--- a/homeassistant/components/flume/sensor.py
+++ b/homeassistant/components/flume/sensor.py
@@ -11,18 +11,13 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfVolume
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .const import (
     DEVICE_SCAN_INTERVAL,
-    DOMAIN,
-    FLUME_AUTH,
-    FLUME_DEVICES,
-    FLUME_HTTP_SESSION,
     FLUME_TYPE_SENSOR,
     KEY_DEVICE_ID,
     KEY_DEVICE_LOCATION,
@@ -30,7 +25,7 @@ from .const import (
     KEY_DEVICE_LOCATION_TIMEZONE,
     KEY_DEVICE_TYPE,
 )
-from .coordinator import FlumeDeviceDataUpdateCoordinator
+from .coordinator import FlumeConfigEntry, FlumeDeviceDataUpdateCoordinator
 from .entity import FlumeEntity
 from .util import get_valid_flume_devices
 
@@ -112,15 +107,15 @@ def make_flume_datas(
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FlumeConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Flume sensor."""
 
-    flume_domain_data = hass.data[DOMAIN][config_entry.entry_id]
-    flume_devices = flume_domain_data[FLUME_DEVICES]
-    flume_auth: FlumeAuth = flume_domain_data[FLUME_AUTH]
-    http_session: Session = flume_domain_data[FLUME_HTTP_SESSION]
+    flume_domain_data = config_entry.runtime_data
+    flume_devices = flume_domain_data.devices
+    flume_auth = flume_domain_data.auth
+    http_session = flume_domain_data.http_session
     flume_devices = [
         device
         for device in get_valid_flume_devices(flume_devices)
@@ -137,7 +132,7 @@ async def async_setup_entry(
         flume_device = flume_datas[device_id]
 
         coordinator = FlumeDeviceDataUpdateCoordinator(
-            hass=hass, flume_device=flume_device
+            hass=hass, config_entry=config_entry, flume_device=flume_device
         )
 
         flume_entity_list.extend(
diff --git a/homeassistant/components/flux_led/__init__.py b/homeassistant/components/flux_led/__init__.py
index 7597a7c9c9a..7515b6b8dfc 100644
--- a/homeassistant/components/flux_led/__init__.py
+++ b/homeassistant/components/flux_led/__init__.py
@@ -11,7 +11,6 @@ from flux_led.aio import AIOWifiLedBulb
 from flux_led.const import ATTR_ID, WhiteChannelType
 from flux_led.scanner import FluxLEDDiscovery
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
@@ -39,7 +38,7 @@ from .const import (
     FLUX_LED_EXCEPTIONS,
     SIGNAL_STATE_UPDATED,
 )
-from .coordinator import FluxLedUpdateCoordinator
+from .coordinator import FluxLedConfigEntry, FluxLedUpdateCoordinator
 from .discovery import (
     async_build_cached_discovery,
     async_clear_discovery_cache,
@@ -113,7 +112,9 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     return True
 
 
-async def _async_migrate_unique_ids(hass: HomeAssistant, entry: ConfigEntry) -> None:
+async def _async_migrate_unique_ids(
+    hass: HomeAssistant, entry: FluxLedConfigEntry
+) -> None:
     """Migrate entities when the mac address gets discovered."""
 
     @callback
@@ -146,14 +147,16 @@ async def _async_migrate_unique_ids(hass: HomeAssistant, entry: ConfigEntry) ->
     await er.async_migrate_entries(hass, entry.entry_id, _async_migrator)
 
 
-async def _async_update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+async def _async_update_listener(
+    hass: HomeAssistant, entry: FluxLedConfigEntry
+) -> None:
     """Handle options update."""
-    coordinator: FluxLedUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
     if entry.title != coordinator.title:
         await hass.config_entries.async_reload(entry.entry_id)
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: FluxLedConfigEntry) -> bool:
     """Set up Flux LED/MagicLight from a config entry."""
     host = entry.data[CONF_HOST]
     discovery_cached = True
@@ -206,7 +209,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     await _async_migrate_unique_ids(hass, entry)
 
     coordinator = FluxLedUpdateCoordinator(hass, device, entry)
-    hass.data[DOMAIN][entry.entry_id] = coordinator
+    entry.runtime_data = coordinator
     platforms = PLATFORMS_BY_TYPE[device.device_type]
     await hass.config_entries.async_forward_entry_setups(entry, platforms)
 
@@ -239,13 +242,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: FluxLedConfigEntry) -> bool:
     """Unload a config entry."""
-    device: AIOWifiLedBulb = hass.data[DOMAIN][entry.entry_id].device
+    device = entry.runtime_data.device
     platforms = PLATFORMS_BY_TYPE[device.device_type]
     if unload_ok := await hass.config_entries.async_unload_platforms(entry, platforms):
         # Make sure we probe the device again in case something has changed externally
         async_clear_discovery_cache(hass, entry.data[CONF_HOST])
-        del hass.data[DOMAIN][entry.entry_id]
         await device.async_stop()
     return unload_ok
diff --git a/homeassistant/components/flux_led/button.py b/homeassistant/components/flux_led/button.py
index 90918a55bb2..c4a7ff6569c 100644
--- a/homeassistant/components/flux_led/button.py
+++ b/homeassistant/components/flux_led/button.py
@@ -5,7 +5,6 @@ from __future__ import annotations
 from flux_led.aio import AIOWifiLedBulb
 from flux_led.protocol import RemoteConfig
 
-from homeassistant import config_entries
 from homeassistant.components.button import (
     ButtonDeviceClass,
     ButtonEntity,
@@ -13,10 +12,9 @@ from homeassistant.components.button import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN
-from .coordinator import FluxLedUpdateCoordinator
+from .coordinator import FluxLedConfigEntry
 from .entity import FluxBaseEntity
 
 _RESTART_KEY = "restart"
@@ -34,11 +32,11 @@ UNPAIR_REMOTES_DESCRIPTION = ButtonEntityDescription(
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: FluxLedConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Magic Home button based on a config entry."""
-    coordinator: FluxLedUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
     device = coordinator.device
     entities: list[FluxButton] = [
         FluxButton(coordinator.device, entry, RESTART_BUTTON_DESCRIPTION)
@@ -59,7 +57,7 @@ class FluxButton(FluxBaseEntity, ButtonEntity):
     def __init__(
         self,
         device: AIOWifiLedBulb,
-        entry: config_entries.ConfigEntry,
+        entry: FluxLedConfigEntry,
         description: ButtonEntityDescription,
     ) -> None:
         """Initialize the button."""
diff --git a/homeassistant/components/flux_led/config_flow.py b/homeassistant/components/flux_led/config_flow.py
index 035be5b115c..754ed0525b9 100644
--- a/homeassistant/components/flux_led/config_flow.py
+++ b/homeassistant/components/flux_led/config_flow.py
@@ -18,7 +18,6 @@ import voluptuous as vol
 
 from homeassistant.config_entries import (
     SOURCE_IGNORE,
-    ConfigEntry,
     ConfigEntryState,
     ConfigFlow,
     ConfigFlowResult,
@@ -46,6 +45,7 @@ from .const import (
     TRANSITION_JUMP,
     TRANSITION_STROBE,
 )
+from .coordinator import FluxLedConfigEntry
 from .discovery import (
     async_discover_device,
     async_discover_devices,
@@ -72,7 +72,7 @@ class FluxLedConfigFlow(ConfigFlow, domain=DOMAIN):
     @staticmethod
     @callback
     def async_get_options_flow(
-        config_entry: ConfigEntry,
+        config_entry: FluxLedConfigEntry,
     ) -> FluxLedOptionsFlow:
         """Get the options flow for the Flux LED component."""
         return FluxLedOptionsFlow()
diff --git a/homeassistant/components/flux_led/coordinator.py b/homeassistant/components/flux_led/coordinator.py
index a473387a513..78d8bb947fd 100644
--- a/homeassistant/components/flux_led/coordinator.py
+++ b/homeassistant/components/flux_led/coordinator.py
@@ -20,21 +20,25 @@ _LOGGER = logging.getLogger(__name__)
 
 REQUEST_REFRESH_DELAY: Final = 2.0
 
+type FluxLedConfigEntry = ConfigEntry[FluxLedUpdateCoordinator]
+
 
 class FluxLedUpdateCoordinator(DataUpdateCoordinator[None]):
     """DataUpdateCoordinator to gather data for a specific flux_led device."""
 
+    config_entry: FluxLedConfigEntry
+
     def __init__(
-        self, hass: HomeAssistant, device: AIOWifiLedBulb, entry: ConfigEntry
+        self, hass: HomeAssistant, device: AIOWifiLedBulb, entry: FluxLedConfigEntry
     ) -> None:
         """Initialize DataUpdateCoordinator to gather data for specific device."""
         self.device = device
         self.title = entry.title
-        self.entry = entry
         self.force_next_update = False
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             name=self.device.ipaddr,
             update_interval=timedelta(seconds=10),
             # We don't want an immediate refresh since the device
diff --git a/homeassistant/components/flux_led/diagnostics.py b/homeassistant/components/flux_led/diagnostics.py
index e24c1aff9a4..683aa362377 100644
--- a/homeassistant/components/flux_led/diagnostics.py
+++ b/homeassistant/components/flux_led/diagnostics.py
@@ -4,22 +4,19 @@ from __future__ import annotations
 
 from typing import Any
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
-from .coordinator import FluxLedUpdateCoordinator
+from .coordinator import FluxLedConfigEntry
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: ConfigEntry
+    hass: HomeAssistant, entry: FluxLedConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    coordinator: FluxLedUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
     return {
         "entry": {
             "title": entry.title,
             "data": dict(entry.data),
         },
-        "data": coordinator.device.diagnostics,
+        "data": entry.runtime_data.device.diagnostics,
     }
diff --git a/homeassistant/components/flux_led/discovery.py b/homeassistant/components/flux_led/discovery.py
index d55f560193f..c3a3c5df3a7 100644
--- a/homeassistant/components/flux_led/discovery.py
+++ b/homeassistant/components/flux_led/discovery.py
@@ -23,9 +23,8 @@ from flux_led.const import (
 from flux_led.models_db import get_model_description
 from flux_led.scanner import FluxLEDDiscovery
 
-from homeassistant import config_entries
 from homeassistant.components import network
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import SOURCE_INTEGRATION_DISCOVERY, ConfigEntryState
 from homeassistant.const import CONF_HOST, CONF_MODEL, CONF_NAME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr, discovery_flow
@@ -44,6 +43,7 @@ from .const import (
     DOMAIN,
     FLUX_LED_DISCOVERY,
 )
+from .coordinator import FluxLedConfigEntry
 from .util import format_as_flux_mac, mac_matches_by_one
 
 _LOGGER = logging.getLogger(__name__)
@@ -63,7 +63,7 @@ CONF_TO_DISCOVERY: Final = {
 
 
 @callback
-def async_build_cached_discovery(entry: ConfigEntry) -> FluxLEDDiscovery:
+def async_build_cached_discovery(entry: FluxLedConfigEntry) -> FluxLEDDiscovery:
     """When discovery is unavailable, load it from the config entry."""
     data = entry.data
     return FluxLEDDiscovery(
@@ -116,7 +116,7 @@ def async_populate_data_from_discovery(
 @callback
 def async_update_entry_from_discovery(
     hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
+    entry: FluxLedConfigEntry,
     device: FluxLEDDiscovery,
     model_num: int | None,
     allow_update_mac: bool,
@@ -230,6 +230,6 @@ def async_trigger_discovery(
         discovery_flow.async_create_flow(
             hass,
             DOMAIN,
-            context={"source": config_entries.SOURCE_INTEGRATION_DISCOVERY},
+            context={"source": SOURCE_INTEGRATION_DISCOVERY},
             data={**device},
         )
diff --git a/homeassistant/components/flux_led/entity.py b/homeassistant/components/flux_led/entity.py
index bcf7bfff9ed..f9b87dbb8c1 100644
--- a/homeassistant/components/flux_led/entity.py
+++ b/homeassistant/components/flux_led/entity.py
@@ -89,7 +89,9 @@ class FluxEntity(CoordinatorEntity[FluxLedUpdateCoordinator]):
             self._attr_unique_id = f"{base_unique_id}_{key}"
         else:
             self._attr_unique_id = base_unique_id
-        self._attr_device_info = _async_device_info(self._device, coordinator.entry)
+        self._attr_device_info = _async_device_info(
+            self._device, coordinator.config_entry
+        )
 
     async def _async_ensure_device_on(self) -> None:
         """Turn the device on if it needs to be turned on before a command."""
diff --git a/homeassistant/components/flux_led/light.py b/homeassistant/components/flux_led/light.py
index ca7fb7aeea2..79dae33a2a5 100644
--- a/homeassistant/components/flux_led/light.py
+++ b/homeassistant/components/flux_led/light.py
@@ -11,7 +11,6 @@ from flux_led.protocol import MusicMode
 from flux_led.utils import rgbcw_brightness, rgbcw_to_rgbwc, rgbw_brightness
 import voluptuous as vol
 
-from homeassistant import config_entries
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
     ATTR_COLOR_TEMP_KELVIN,
@@ -25,9 +24,8 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import CONF_EFFECT
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import entity_platform
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv, entity_platform
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import VolDictType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -39,7 +37,6 @@ from .const import (
     CONF_SPEED_PCT,
     CONF_TRANSITION,
     DEFAULT_EFFECT_SPEED,
-    DOMAIN,
     MIN_CCT_BRIGHTNESS,
     MIN_RGB_BRIGHTNESS,
     MULTI_BRIGHTNESS_COLOR_MODES,
@@ -47,7 +44,7 @@ from .const import (
     TRANSITION_JUMP,
     TRANSITION_STROBE,
 )
-from .coordinator import FluxLedUpdateCoordinator
+from .coordinator import FluxLedConfigEntry, FluxLedUpdateCoordinator
 from .entity import FluxOnOffEntity
 from .util import (
     _effect_brightness,
@@ -135,11 +132,11 @@ SET_ZONES_DICT: VolDictType = {
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: FluxLedConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Flux lights."""
-    coordinator: FluxLedUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
 
     platform = entity_platform.async_get_current_platform()
     platform.async_register_entity_service(
diff --git a/homeassistant/components/flux_led/manifest.json b/homeassistant/components/flux_led/manifest.json
index 962098a0bf8..fcb16c9742b 100644
--- a/homeassistant/components/flux_led/manifest.json
+++ b/homeassistant/components/flux_led/manifest.json
@@ -53,5 +53,5 @@
   "documentation": "https://www.home-assistant.io/integrations/flux_led",
   "iot_class": "local_push",
   "loggers": ["flux_led"],
-  "requirements": ["flux-led==1.1.0"]
+  "requirements": ["flux-led==1.1.3"]
 }
diff --git a/homeassistant/components/flux_led/number.py b/homeassistant/components/flux_led/number.py
index 93687c0c579..edf6b8c9654 100644
--- a/homeassistant/components/flux_led/number.py
+++ b/homeassistant/components/flux_led/number.py
@@ -16,18 +16,16 @@ from flux_led.protocol import (
     SEGMENTS_MAX,
 )
 
-from homeassistant import config_entries
 from homeassistant.components.light import EFFECT_RANDOM
 from homeassistant.components.number import NumberEntity, NumberMode
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.debounce import Debouncer
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .const import DOMAIN
-from .coordinator import FluxLedUpdateCoordinator
+from .coordinator import FluxLedConfigEntry, FluxLedUpdateCoordinator
 from .entity import FluxEntity
 from .util import _effect_brightness
 
@@ -38,11 +36,11 @@ DEBOUNCE_TIME = 1
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: FluxLedConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Flux lights."""
-    coordinator: FluxLedUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
     device = coordinator.device
     entities: list[
         FluxSpeedNumber
diff --git a/homeassistant/components/flux_led/select.py b/homeassistant/components/flux_led/select.py
index 3809e73147a..bcb44c995b8 100644
--- a/homeassistant/components/flux_led/select.py
+++ b/homeassistant/components/flux_led/select.py
@@ -13,14 +13,13 @@ from flux_led.const import (
 )
 from flux_led.protocol import PowerRestoreState, RemoteConfig
 
-from homeassistant import config_entries
 from homeassistant.components.select import SelectEntity
 from homeassistant.const import CONF_NAME, EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import CONF_WHITE_CHANNEL_TYPE, DOMAIN, FLUX_COLOR_MODE_RGBW
-from .coordinator import FluxLedUpdateCoordinator
+from .const import CONF_WHITE_CHANNEL_TYPE, FLUX_COLOR_MODE_RGBW
+from .coordinator import FluxLedConfigEntry, FluxLedUpdateCoordinator
 from .entity import FluxBaseEntity, FluxEntity
 from .util import _human_readable_option
 
@@ -29,9 +28,7 @@ NAME_TO_POWER_RESTORE_STATE = {
 }
 
 
-async def _async_delayed_reload(
-    hass: HomeAssistant, entry: config_entries.ConfigEntry
-) -> None:
+async def _async_delayed_reload(hass: HomeAssistant, entry: FluxLedConfigEntry) -> None:
     """Reload after making a change that will effect the operation of the device."""
     await asyncio.sleep(STATE_CHANGE_LATENCY)
     hass.async_create_task(hass.config_entries.async_reload(entry.entry_id))
@@ -39,11 +36,11 @@ async def _async_delayed_reload(
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: FluxLedConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Flux selects."""
-    coordinator: FluxLedUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
     device = coordinator.device
     entities: list[
         FluxPowerStateSelect
@@ -97,7 +94,7 @@ class FluxPowerStateSelect(FluxConfigAtStartSelect, SelectEntity):
     def __init__(
         self,
         device: AIOWifiLedBulb,
-        entry: config_entries.ConfigEntry,
+        entry: FluxLedConfigEntry,
     ) -> None:
         """Initialize the power state select."""
         super().__init__(device, entry)
@@ -141,7 +138,7 @@ class FluxICTypeSelect(FluxConfigSelect):
     async def async_select_option(self, option: str) -> None:
         """Change the ic type."""
         await self._device.async_set_device_config(ic_type=option)
-        await _async_delayed_reload(self.hass, self.coordinator.entry)
+        await _async_delayed_reload(self.hass, self.coordinator.config_entry)
 
 
 class FluxWiringsSelect(FluxConfigSelect):
@@ -184,7 +181,7 @@ class FluxOperatingModesSelect(FluxConfigSelect):
     async def async_select_option(self, option: str) -> None:
         """Change the ic type."""
         await self._device.async_set_device_config(operating_mode=option)
-        await _async_delayed_reload(self.hass, self.coordinator.entry)
+        await _async_delayed_reload(self.hass, self.coordinator.config_entry)
 
 
 class FluxRemoteConfigSelect(FluxConfigSelect):
@@ -228,7 +225,7 @@ class FluxWhiteChannelSelect(FluxConfigAtStartSelect):
     def __init__(
         self,
         device: AIOWifiLedBulb,
-        entry: config_entries.ConfigEntry,
+        entry: FluxLedConfigEntry,
     ) -> None:
         """Initialize the white channel select."""
         super().__init__(device, entry)
diff --git a/homeassistant/components/flux_led/sensor.py b/homeassistant/components/flux_led/sensor.py
index 5a6633669ae..ad4b9bacbbe 100644
--- a/homeassistant/components/flux_led/sensor.py
+++ b/homeassistant/components/flux_led/sensor.py
@@ -2,24 +2,22 @@
 
 from __future__ import annotations
 
-from homeassistant import config_entries
 from homeassistant.components.sensor import SensorEntity
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN
-from .coordinator import FluxLedUpdateCoordinator
+from .coordinator import FluxLedConfigEntry
 from .entity import FluxEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: FluxLedConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Magic Home sensors."""
-    coordinator: FluxLedUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
     if coordinator.device.paired_remotes is not None:
         async_add_entities(
             [
diff --git a/homeassistant/components/flux_led/switch.py b/homeassistant/components/flux_led/switch.py
index 3adcd9a9da9..5dea5408c84 100644
--- a/homeassistant/components/flux_led/switch.py
+++ b/homeassistant/components/flux_led/switch.py
@@ -8,31 +8,29 @@ from flux_led import DeviceType
 from flux_led.aio import AIOWifiLedBulb
 from flux_led.const import MODE_MUSIC
 
-from homeassistant import config_entries
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
     CONF_REMOTE_ACCESS_ENABLED,
     CONF_REMOTE_ACCESS_HOST,
     CONF_REMOTE_ACCESS_PORT,
-    DOMAIN,
 )
-from .coordinator import FluxLedUpdateCoordinator
+from .coordinator import FluxLedConfigEntry, FluxLedUpdateCoordinator
 from .discovery import async_clear_discovery_cache
 from .entity import FluxBaseEntity, FluxEntity, FluxOnOffEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: FluxLedConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Flux lights."""
-    coordinator: FluxLedUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
     entities: list[FluxSwitch | FluxRemoteAccessSwitch | FluxMusicSwitch] = []
     base_unique_id = entry.unique_id or entry.entry_id
 
@@ -70,7 +68,7 @@ class FluxRemoteAccessSwitch(FluxBaseEntity, SwitchEntity):
     def __init__(
         self,
         device: AIOWifiLedBulb,
-        entry: config_entries.ConfigEntry,
+        entry: FluxLedConfigEntry,
     ) -> None:
         """Initialize the light."""
         super().__init__(device, entry)
diff --git a/homeassistant/components/folder/sensor.py b/homeassistant/components/folder/sensor.py
index 3a8a4fdc380..4667a6c348d 100644
--- a/homeassistant/components/folder/sensor.py
+++ b/homeassistant/components/folder/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import UnitOfInformation
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/folder_watcher/event.py b/homeassistant/components/folder_watcher/event.py
index 7158930e116..472599c4ead 100644
--- a/homeassistant/components/folder_watcher/event.py
+++ b/homeassistant/components/folder_watcher/event.py
@@ -17,7 +17,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 
@@ -25,7 +25,7 @@ from .const import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Folder Watcher event."""
 
diff --git a/homeassistant/components/folder_watcher/strings.json b/homeassistant/components/folder_watcher/strings.json
index da1e3c1962a..5b1f72bf254 100644
--- a/homeassistant/components/folder_watcher/strings.json
+++ b/homeassistant/components/folder_watcher/strings.json
@@ -36,11 +36,11 @@
   "issues": {
     "import_failed_not_allowed_path": {
       "title": "The Folder Watcher YAML configuration could not be imported",
-      "description": "Configuring Folder Watcher using YAML is being removed but your configuration could not be imported as the folder {path} is not in the configured allowlist.\n\nPlease add it to `{config_variable}` in config.yaml and restart Home Assistant to import it and fix this issue."
+      "description": "Configuring Folder Watcher using YAML is being removed but your configuration could not be imported as the folder {path} is not in the configured allowlist.\n\nPlease add it to `{config_variable}` in configuration.yaml and restart Home Assistant to import it and fix this issue."
     },
     "setup_not_allowed_path": {
       "title": "The Folder Watcher configuration for {path} could not start",
-      "description": "The path {path} is not accessible or not allowed to be accessed.\n\nPlease check the path is accessible and add it to `{config_variable}` in config.yaml and restart Home Assistant to fix this issue."
+      "description": "The path {path} is not accessible or not allowed to be accessed.\n\nPlease check the path is accessible and add it to `{config_variable}` in configuration.yaml and restart Home Assistant to fix this issue."
     }
   },
   "entity": {
diff --git a/homeassistant/components/forecast_solar/__init__.py b/homeassistant/components/forecast_solar/__init__.py
index 00be13f1235..171341f7226 100644
--- a/homeassistant/components/forecast_solar/__init__.py
+++ b/homeassistant/components/forecast_solar/__init__.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
@@ -12,14 +11,14 @@ from .const import (
     CONF_DAMPING_MORNING,
     CONF_MODULES_POWER,
 )
-from .coordinator import ForecastSolarDataUpdateCoordinator
+from .coordinator import ForecastSolarConfigEntry, ForecastSolarDataUpdateCoordinator
 
 PLATFORMS = [Platform.SENSOR]
 
-type ForecastSolarConfigEntry = ConfigEntry[ForecastSolarDataUpdateCoordinator]
 
-
-async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_migrate_entry(
+    hass: HomeAssistant, entry: ForecastSolarConfigEntry
+) -> bool:
     """Migrate old config entry."""
 
     if entry.version == 1:
@@ -53,11 +52,15 @@ async def async_setup_entry(
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, entry: ForecastSolarConfigEntry
+) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
-async def async_update_options(hass: HomeAssistant, entry: ConfigEntry) -> None:
+async def async_update_options(
+    hass: HomeAssistant, entry: ForecastSolarConfigEntry
+) -> None:
     """Update options."""
     await hass.config_entries.async_reload(entry.entry_id)
diff --git a/homeassistant/components/forecast_solar/coordinator.py b/homeassistant/components/forecast_solar/coordinator.py
index c9c062a0c88..efed954e490 100644
--- a/homeassistant/components/forecast_solar/coordinator.py
+++ b/homeassistant/components/forecast_solar/coordinator.py
@@ -23,15 +23,16 @@ from .const import (
     LOGGER,
 )
 
+type ForecastSolarConfigEntry = ConfigEntry[ForecastSolarDataUpdateCoordinator]
+
 
 class ForecastSolarDataUpdateCoordinator(DataUpdateCoordinator[Estimate]):
     """The Forecast.Solar Data Update Coordinator."""
 
-    config_entry: ConfigEntry
+    config_entry: ForecastSolarConfigEntry
 
-    def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
+    def __init__(self, hass: HomeAssistant, entry: ForecastSolarConfigEntry) -> None:
         """Initialize the Forecast.Solar coordinator."""
-        self.config_entry = entry
 
         # Our option flow may cause it to be an empty string,
         # this if statement is here to catch that.
@@ -61,7 +62,13 @@ class ForecastSolarDataUpdateCoordinator(DataUpdateCoordinator[Estimate]):
         if api_key is not None:
             update_interval = timedelta(minutes=30)
 
-        super().__init__(hass, LOGGER, name=DOMAIN, update_interval=update_interval)
+        super().__init__(
+            hass,
+            LOGGER,
+            config_entry=entry,
+            name=DOMAIN,
+            update_interval=update_interval,
+        )
 
     async def _async_update_data(self) -> Estimate:
         """Fetch Forecast.Solar estimates."""
diff --git a/homeassistant/components/forecast_solar/sensor.py b/homeassistant/components/forecast_solar/sensor.py
index c1fa971a89d..13a4d5c2d23 100644
--- a/homeassistant/components/forecast_solar/sensor.py
+++ b/homeassistant/components/forecast_solar/sensor.py
@@ -19,7 +19,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import UnitOfEnergy, UnitOfPower
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -135,7 +135,7 @@ SENSORS: tuple[ForecastSolarSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ForecastSolarConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Defer sensor setup to the shared sensor module."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/forked_daapd/__init__.py b/homeassistant/components/forked_daapd/__init__.py
index 6ff9a030a02..844a6a3eff9 100644
--- a/homeassistant/components/forked_daapd/__init__.py
+++ b/homeassistant/components/forked_daapd/__init__.py
@@ -1,33 +1,36 @@
 """The forked_daapd component."""
 
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
+from pyforked_daapd import ForkedDaapdAPI
 
-from .const import DOMAIN, HASS_DATA_REMOVE_LISTENERS_KEY, HASS_DATA_UPDATER_KEY
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+
+from .coordinator import ForkedDaapdConfigEntry, ForkedDaapdUpdater
 
 PLATFORMS = [Platform.MEDIA_PLAYER]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ForkedDaapdConfigEntry) -> bool:
     """Set up forked-daapd from a config entry by forwarding to platform."""
+    host: str = entry.data[CONF_HOST]
+    port: int = entry.data[CONF_PORT]
+    password: str = entry.data[CONF_PASSWORD]
+    forked_daapd_api = ForkedDaapdAPI(
+        async_get_clientsession(hass), host, port, password
+    )
+    forked_daapd_updater = ForkedDaapdUpdater(hass, forked_daapd_api, entry.entry_id)
+    entry.runtime_data = forked_daapd_updater
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, entry: ForkedDaapdConfigEntry
+) -> bool:
     """Remove forked-daapd component."""
     status = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if status and hass.data.get(DOMAIN) and hass.data[DOMAIN].get(entry.entry_id):
-        if websocket_handler := hass.data[DOMAIN][entry.entry_id][
-            HASS_DATA_UPDATER_KEY
-        ].websocket_handler:
+    if status:
+        if websocket_handler := entry.runtime_data.websocket_handler:
             websocket_handler.cancel()
-        for remove_listener in hass.data[DOMAIN][entry.entry_id][
-            HASS_DATA_REMOVE_LISTENERS_KEY
-        ]:
-            remove_listener()
-        del hass.data[DOMAIN][entry.entry_id]
-        if not hass.data[DOMAIN]:
-            del hass.data[DOMAIN]
     return status
diff --git a/homeassistant/components/forked_daapd/config_flow.py b/homeassistant/components/forked_daapd/config_flow.py
index b2b2d498f60..890976c7503 100644
--- a/homeassistant/components/forked_daapd/config_flow.py
+++ b/homeassistant/components/forked_daapd/config_flow.py
@@ -7,12 +7,7 @@ from typing import Any
 from pyforked_daapd import ForkedDaapdAPI
 import voluptuous as vol
 
-from homeassistant.config_entries import (
-    ConfigEntry,
-    ConfigFlow,
-    ConfigFlowResult,
-    OptionsFlow,
-)
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult, OptionsFlow
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT
 from homeassistant.core import callback
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -28,6 +23,7 @@ from .const import (
     DEFAULT_TTS_VOLUME,
     DOMAIN,
 )
+from .coordinator import ForkedDaapdConfigEntry
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -115,7 +111,7 @@ class ForkedDaapdFlowHandler(ConfigFlow, domain=DOMAIN):
     @staticmethod
     @callback
     def async_get_options_flow(
-        config_entry: ConfigEntry,
+        config_entry: ForkedDaapdConfigEntry,
     ) -> ForkedDaapdOptionsFlowHandler:
         """Return options flow handler."""
         return ForkedDaapdOptionsFlowHandler()
diff --git a/homeassistant/components/forked_daapd/const.py b/homeassistant/components/forked_daapd/const.py
index 8d671f2fc07..effd4c9454c 100644
--- a/homeassistant/components/forked_daapd/const.py
+++ b/homeassistant/components/forked_daapd/const.py
@@ -30,10 +30,8 @@ DEFAULT_SERVER_NAME = "My Server"
 DEFAULT_TTS_PAUSE_TIME = 1.2
 DEFAULT_TTS_VOLUME = 0.8
 DEFAULT_UNMUTE_VOLUME = 0.6
-DOMAIN = "forked_daapd"  # key for hass.data
+DOMAIN = "forked_daapd"
 FD_NAME = "OwnTone"
-HASS_DATA_REMOVE_LISTENERS_KEY = "REMOVE_LISTENERS"
-HASS_DATA_UPDATER_KEY = "UPDATER"
 KNOWN_PIPES = {"librespot-java"}
 PIPE_FUNCTION_MAP = {
     "librespot-java": {
diff --git a/homeassistant/components/forked_daapd/coordinator.py b/homeassistant/components/forked_daapd/coordinator.py
new file mode 100644
index 00000000000..0ba339be505
--- /dev/null
+++ b/homeassistant/components/forked_daapd/coordinator.py
@@ -0,0 +1,155 @@
+"""Support forked_daapd media player."""
+
+from __future__ import annotations
+
+import asyncio
+from collections.abc import Sequence
+import logging
+from typing import Any
+
+from pyforked_daapd import ForkedDaapdAPI
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import PlatformNotReady
+from homeassistant.helpers.dispatcher import async_dispatcher_send
+
+from .const import (
+    SIGNAL_ADD_ZONES,
+    SIGNAL_UPDATE_DATABASE,
+    SIGNAL_UPDATE_MASTER,
+    SIGNAL_UPDATE_OUTPUTS,
+    SIGNAL_UPDATE_PLAYER,
+    SIGNAL_UPDATE_QUEUE,
+)
+
+type ForkedDaapdConfigEntry = ConfigEntry[ForkedDaapdUpdater]
+
+_LOGGER = logging.getLogger(__name__)
+
+WS_NOTIFY_EVENT_TYPES = ["player", "outputs", "volume", "options", "queue", "database"]
+WEBSOCKET_RECONNECT_TIME = 30  # seconds
+
+
+class ForkedDaapdUpdater:
+    """Manage updates for the forked-daapd device."""
+
+    def __init__(self, hass: HomeAssistant, api: ForkedDaapdAPI, entry_id: str) -> None:
+        """Initialize."""
+        self.hass = hass
+        self._api = api
+        self.websocket_handler: asyncio.Task[None] | None = None
+        self._all_output_ids: set[str] = set()
+        self._entry_id = entry_id
+
+    @property
+    def api(self) -> ForkedDaapdAPI:
+        """Return the API object."""
+        return self._api
+
+    async def async_init(self) -> None:
+        """Perform async portion of class initialization."""
+        if not (server_config := await self._api.get_request("config")):
+            raise PlatformNotReady
+        if websocket_port := server_config.get("websocket_port"):
+            self.websocket_handler = asyncio.create_task(
+                self._api.start_websocket_handler(
+                    websocket_port,
+                    WS_NOTIFY_EVENT_TYPES,
+                    self._update,
+                    WEBSOCKET_RECONNECT_TIME,
+                    self._disconnected_callback,
+                )
+            )
+        else:
+            _LOGGER.error("Invalid websocket port")
+
+    async def _disconnected_callback(self) -> None:
+        """Send update signals when the websocket gets disconnected."""
+        async_dispatcher_send(
+            self.hass, SIGNAL_UPDATE_MASTER.format(self._entry_id), False
+        )
+        async_dispatcher_send(
+            self.hass, SIGNAL_UPDATE_OUTPUTS.format(self._entry_id), []
+        )
+
+    async def _update(self, update_types_sequence: Sequence[str]) -> None:
+        """Private update method."""
+        update_types = set(update_types_sequence)
+        update_events = {}
+        _LOGGER.debug("Updating %s", update_types)
+        if (
+            "queue" in update_types
+        ):  # update queue, queue before player for async_play_media
+            if queue := await self._api.get_request("queue"):
+                update_events["queue"] = asyncio.Event()
+                async_dispatcher_send(
+                    self.hass,
+                    SIGNAL_UPDATE_QUEUE.format(self._entry_id),
+                    queue,
+                    update_events["queue"],
+                )
+        # order of below don't matter
+        if not {"outputs", "volume"}.isdisjoint(update_types):  # update outputs
+            if outputs := await self._api.get_request("outputs"):
+                outputs = outputs["outputs"]
+                update_events["outputs"] = (
+                    asyncio.Event()
+                )  # only for master, zones should ignore
+                async_dispatcher_send(
+                    self.hass,
+                    SIGNAL_UPDATE_OUTPUTS.format(self._entry_id),
+                    outputs,
+                    update_events["outputs"],
+                )
+                self._add_zones(outputs)
+        if not {"database"}.isdisjoint(update_types):
+            pipes, playlists = await asyncio.gather(
+                self._api.get_pipes(), self._api.get_playlists()
+            )
+            update_events["database"] = asyncio.Event()
+            async_dispatcher_send(
+                self.hass,
+                SIGNAL_UPDATE_DATABASE.format(self._entry_id),
+                pipes,
+                playlists,
+                update_events["database"],
+            )
+        if not {"update", "config"}.isdisjoint(update_types):  # not supported
+            _LOGGER.debug("update/config notifications neither requested nor supported")
+        if not {"player", "options", "volume"}.isdisjoint(
+            update_types
+        ):  # update player
+            if player := await self._api.get_request("player"):
+                update_events["player"] = asyncio.Event()
+                if update_events.get("queue"):
+                    await update_events[
+                        "queue"
+                    ].wait()  # make sure queue done before player for async_play_media
+                async_dispatcher_send(
+                    self.hass,
+                    SIGNAL_UPDATE_PLAYER.format(self._entry_id),
+                    player,
+                    update_events["player"],
+                )
+        if update_events:
+            await asyncio.wait(
+                [asyncio.create_task(event.wait()) for event in update_events.values()]
+            )  # make sure callbacks done before update
+            async_dispatcher_send(
+                self.hass, SIGNAL_UPDATE_MASTER.format(self._entry_id), True
+            )
+
+    def _add_zones(self, outputs: list[dict[str, Any]]) -> None:
+        outputs_to_add: list[dict[str, Any]] = []
+        for output in outputs:
+            if output["id"] not in self._all_output_ids:
+                self._all_output_ids.add(output["id"])
+                outputs_to_add.append(output)
+        if outputs_to_add:
+            async_dispatcher_send(
+                self.hass,
+                SIGNAL_ADD_ZONES.format(self._entry_id),
+                self._api,
+                outputs_to_add,
+            )
diff --git a/homeassistant/components/forked_daapd/media_player.py b/homeassistant/components/forked_daapd/media_player.py
index b8b544c1a2c..fd5390195a6 100644
--- a/homeassistant/components/forked_daapd/media_player.py
+++ b/homeassistant/components/forked_daapd/media_player.py
@@ -7,7 +7,6 @@ from collections import defaultdict
 import logging
 from typing import Any
 
-from pyforked_daapd import ForkedDaapdAPI
 from pylibrespot_java import LibrespotJavaAPI
 
 from homeassistant.components import media_source
@@ -28,16 +27,14 @@ from homeassistant.components.spotify import (
     resolve_spotify_media_type,
     spotify_uri_from_media_browser_url,
 )
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT
+from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.exceptions import PlatformNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.dt import utcnow
 
 from .browse_media import (
@@ -56,10 +53,7 @@ from .const import (
     DEFAULT_TTS_PAUSE_TIME,
     DEFAULT_TTS_VOLUME,
     DEFAULT_UNMUTE_VOLUME,
-    DOMAIN,
     FD_NAME,
-    HASS_DATA_REMOVE_LISTENERS_KEY,
-    HASS_DATA_UPDATER_KEY,
     KNOWN_PIPES,
     PIPE_FUNCTION_MAP,
     SIGNAL_ADD_ZONES,
@@ -76,31 +70,25 @@ from .const import (
     SUPPORTED_FEATURES_ZONE,
     TTS_TIMEOUT,
 )
+from .coordinator import ForkedDaapdConfigEntry
 
 _LOGGER = logging.getLogger(__name__)
 
-WS_NOTIFY_EVENT_TYPES = ["player", "outputs", "volume", "options", "queue", "database"]
-WEBSOCKET_RECONNECT_TIME = 30  # seconds
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: ForkedDaapdConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up forked-daapd from a config entry."""
-    host = config_entry.data[CONF_HOST]
-    port = config_entry.data[CONF_PORT]
-    password = config_entry.data[CONF_PASSWORD]
-    forked_daapd_api = ForkedDaapdAPI(
-        async_get_clientsession(hass), host, port, password
-    )
+    forked_daapd_updater = config_entry.runtime_data
+
+    host: str = config_entry.data[CONF_HOST]
+    forked_daapd_api = forked_daapd_updater.api
     forked_daapd_master = ForkedDaapdMaster(
         clientsession=async_get_clientsession(hass),
         api=forked_daapd_api,
         ip_address=host,
-        api_port=port,
-        api_password=password,
         config_entry=config_entry,
     )
 
@@ -110,30 +98,19 @@ async def async_setup_entry(
             ForkedDaapdZone(api, output, config_entry.entry_id) for output in outputs
         )
 
-    remove_add_zones_listener = async_dispatcher_connect(
-        hass, SIGNAL_ADD_ZONES.format(config_entry.entry_id), async_add_zones
+    config_entry.async_on_unload(
+        async_dispatcher_connect(
+            hass, SIGNAL_ADD_ZONES.format(config_entry.entry_id), async_add_zones
+        )
     )
-    remove_entry_listener = config_entry.add_update_listener(update_listener)
+    config_entry.async_on_unload(config_entry.add_update_listener(update_listener))
 
-    if not hass.data.get(DOMAIN):
-        hass.data[DOMAIN] = {config_entry.entry_id: {}}
-    hass.data[DOMAIN][config_entry.entry_id] = {
-        HASS_DATA_REMOVE_LISTENERS_KEY: [
-            remove_add_zones_listener,
-            remove_entry_listener,
-        ]
-    }
     async_add_entities([forked_daapd_master], False)
-    forked_daapd_updater = ForkedDaapdUpdater(
-        hass, forked_daapd_api, config_entry.entry_id
-    )
-    hass.data[DOMAIN][config_entry.entry_id][HASS_DATA_UPDATER_KEY] = (
-        forked_daapd_updater
-    )
+
     await forked_daapd_updater.async_init()
 
 
-async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+async def update_listener(hass: HomeAssistant, entry: ForkedDaapdConfigEntry) -> None:
     """Handle options update."""
     async_dispatcher_send(
         hass, SIGNAL_CONFIG_OPTIONS_UPDATE.format(entry.entry_id), entry.options
@@ -247,9 +224,7 @@ class ForkedDaapdMaster(MediaPlayerEntity):
 
     _attr_should_poll = False
 
-    def __init__(
-        self, clientsession, api, ip_address, api_port, api_password, config_entry
-    ):
+    def __init__(self, clientsession, api, ip_address, config_entry):
         """Initialize the ForkedDaapd Master Device."""
         # Leave the api public so the browse media helpers can use it
         self.api = api
@@ -276,7 +251,7 @@ class ForkedDaapdMaster(MediaPlayerEntity):
         self._on_remove = None
         self._available = False
         self._clientsession = clientsession
-        self._config_entry = config_entry
+        self._entry_id = config_entry.entry_id
         self.update_options(config_entry.options)
         self._paused_event = asyncio.Event()
         self._pause_requested = False
@@ -289,42 +264,42 @@ class ForkedDaapdMaster(MediaPlayerEntity):
         self.async_on_remove(
             async_dispatcher_connect(
                 self.hass,
-                SIGNAL_UPDATE_PLAYER.format(self._config_entry.entry_id),
+                SIGNAL_UPDATE_PLAYER.format(self._entry_id),
                 self._update_player,
             )
         )
         self.async_on_remove(
             async_dispatcher_connect(
                 self.hass,
-                SIGNAL_UPDATE_QUEUE.format(self._config_entry.entry_id),
+                SIGNAL_UPDATE_QUEUE.format(self._entry_id),
                 self._update_queue,
             )
         )
         self.async_on_remove(
             async_dispatcher_connect(
                 self.hass,
-                SIGNAL_UPDATE_OUTPUTS.format(self._config_entry.entry_id),
+                SIGNAL_UPDATE_OUTPUTS.format(self._entry_id),
                 self._update_outputs,
             )
         )
         self.async_on_remove(
             async_dispatcher_connect(
                 self.hass,
-                SIGNAL_UPDATE_MASTER.format(self._config_entry.entry_id),
+                SIGNAL_UPDATE_MASTER.format(self._entry_id),
                 self._update_callback,
             )
         )
         self.async_on_remove(
             async_dispatcher_connect(
                 self.hass,
-                SIGNAL_CONFIG_OPTIONS_UPDATE.format(self._config_entry.entry_id),
+                SIGNAL_CONFIG_OPTIONS_UPDATE.format(self._entry_id),
                 self.update_options,
             )
         )
         self.async_on_remove(
             async_dispatcher_connect(
                 self.hass,
-                SIGNAL_UPDATE_DATABASE.format(self._config_entry.entry_id),
+                SIGNAL_UPDATE_DATABASE.format(self._entry_id),
                 self._update_database,
             )
         )
@@ -418,9 +393,9 @@ class ForkedDaapdMaster(MediaPlayerEntity):
             self._track_info = defaultdict(str)
 
     @property
-    def unique_id(self):
+    def unique_id(self) -> str:
         """Return unique ID."""
-        return self._config_entry.entry_id
+        return self._entry_id
 
     @property
     def available(self) -> bool:
@@ -901,122 +876,3 @@ class ForkedDaapdMaster(MediaPlayerEntity):
         if url := result.get("artwork_url"):
             return await self._async_fetch_image(self.api.full_url(url))
         return None, None
-
-
-class ForkedDaapdUpdater:
-    """Manage updates for the forked-daapd device."""
-
-    def __init__(self, hass, api, entry_id):
-        """Initialize."""
-        self.hass = hass
-        self._api = api
-        self.websocket_handler = None
-        self._all_output_ids = set()
-        self._entry_id = entry_id
-
-    async def async_init(self):
-        """Perform async portion of class initialization."""
-        if not (server_config := await self._api.get_request("config")):
-            raise PlatformNotReady
-        if websocket_port := server_config.get("websocket_port"):
-            self.websocket_handler = asyncio.create_task(
-                self._api.start_websocket_handler(
-                    websocket_port,
-                    WS_NOTIFY_EVENT_TYPES,
-                    self._update,
-                    WEBSOCKET_RECONNECT_TIME,
-                    self._disconnected_callback,
-                )
-            )
-        else:
-            _LOGGER.error("Invalid websocket port")
-
-    async def _disconnected_callback(self):
-        """Send update signals when the websocket gets disconnected."""
-        async_dispatcher_send(
-            self.hass, SIGNAL_UPDATE_MASTER.format(self._entry_id), False
-        )
-        async_dispatcher_send(
-            self.hass, SIGNAL_UPDATE_OUTPUTS.format(self._entry_id), []
-        )
-
-    async def _update(self, update_types):
-        """Private update method."""
-        update_types = set(update_types)
-        update_events = {}
-        _LOGGER.debug("Updating %s", update_types)
-        if (
-            "queue" in update_types
-        ):  # update queue, queue before player for async_play_media
-            if queue := await self._api.get_request("queue"):
-                update_events["queue"] = asyncio.Event()
-                async_dispatcher_send(
-                    self.hass,
-                    SIGNAL_UPDATE_QUEUE.format(self._entry_id),
-                    queue,
-                    update_events["queue"],
-                )
-        # order of below don't matter
-        if not {"outputs", "volume"}.isdisjoint(update_types):  # update outputs
-            if outputs := await self._api.get_request("outputs"):
-                outputs = outputs["outputs"]
-                update_events["outputs"] = (
-                    asyncio.Event()
-                )  # only for master, zones should ignore
-                async_dispatcher_send(
-                    self.hass,
-                    SIGNAL_UPDATE_OUTPUTS.format(self._entry_id),
-                    outputs,
-                    update_events["outputs"],
-                )
-                self._add_zones(outputs)
-        if not {"database"}.isdisjoint(update_types):
-            pipes, playlists = await asyncio.gather(
-                self._api.get_pipes(), self._api.get_playlists()
-            )
-            update_events["database"] = asyncio.Event()
-            async_dispatcher_send(
-                self.hass,
-                SIGNAL_UPDATE_DATABASE.format(self._entry_id),
-                pipes,
-                playlists,
-                update_events["database"],
-            )
-        if not {"update", "config"}.isdisjoint(update_types):  # not supported
-            _LOGGER.debug("update/config notifications neither requested nor supported")
-        if not {"player", "options", "volume"}.isdisjoint(
-            update_types
-        ):  # update player
-            if player := await self._api.get_request("player"):
-                update_events["player"] = asyncio.Event()
-                if update_events.get("queue"):
-                    await update_events[
-                        "queue"
-                    ].wait()  # make sure queue done before player for async_play_media
-                async_dispatcher_send(
-                    self.hass,
-                    SIGNAL_UPDATE_PLAYER.format(self._entry_id),
-                    player,
-                    update_events["player"],
-                )
-        if update_events:
-            await asyncio.wait(
-                [asyncio.create_task(event.wait()) for event in update_events.values()]
-            )  # make sure callbacks done before update
-            async_dispatcher_send(
-                self.hass, SIGNAL_UPDATE_MASTER.format(self._entry_id), True
-            )
-
-    def _add_zones(self, outputs):
-        outputs_to_add = []
-        for output in outputs:
-            if output["id"] not in self._all_output_ids:
-                self._all_output_ids.add(output["id"])
-                outputs_to_add.append(output)
-        if outputs_to_add:
-            async_dispatcher_send(
-                self.hass,
-                SIGNAL_ADD_ZONES.format(self._entry_id),
-                self._api,
-                outputs_to_add,
-            )
diff --git a/homeassistant/components/fortios/device_tracker.py b/homeassistant/components/fortios/device_tracker.py
index af2bc92a065..4360dd031c7 100644
--- a/homeassistant/components/fortios/device_tracker.py
+++ b/homeassistant/components/fortios/device_tracker.py
@@ -19,7 +19,7 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_HOST, CONF_TOKEN, CONF_VERIFY_SSL
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/foscam/__init__.py b/homeassistant/components/foscam/__init__.py
index 09df989447a..9643f333bb5 100644
--- a/homeassistant/components/foscam/__init__.py
+++ b/homeassistant/components/foscam/__init__.py
@@ -2,7 +2,6 @@
 
 from libpyfoscam import FoscamCamera
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_HOST,
     CONF_PASSWORD,
@@ -14,13 +13,13 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_registry import RegistryEntry, async_migrate_entries
 
 from .config_flow import DEFAULT_RTSP_PORT
-from .const import CONF_RTSP_PORT, DOMAIN, LOGGER, SERVICE_PTZ, SERVICE_PTZ_PRESET
-from .coordinator import FoscamCoordinator
+from .const import CONF_RTSP_PORT, LOGGER
+from .coordinator import FoscamConfigEntry, FoscamCoordinator
 
 PLATFORMS = [Platform.CAMERA, Platform.SWITCH]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: FoscamConfigEntry) -> bool:
     """Set up foscam from a config entry."""
 
     session = FoscamCamera(
@@ -30,11 +29,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         entry.data[CONF_PASSWORD],
         verbose=False,
     )
-    coordinator = FoscamCoordinator(hass, session)
+    coordinator = FoscamCoordinator(hass, entry, session)
 
     await coordinator.async_config_entry_first_refresh()
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+    entry.runtime_data = coordinator
 
     # Migrate to correct unique IDs for switches
     await async_migrate_entities(hass, entry)
@@ -44,20 +43,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: FoscamConfigEntry) -> bool:
     """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-        if not hass.data[DOMAIN]:
-            hass.services.async_remove(domain=DOMAIN, service=SERVICE_PTZ)
-            hass.services.async_remove(domain=DOMAIN, service=SERVICE_PTZ_PRESET)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
-async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_migrate_entry(hass: HomeAssistant, entry: FoscamConfigEntry) -> bool:
     """Migrate old entry."""
     LOGGER.debug("Migrating from version %s", entry.version)
 
@@ -97,7 +88,7 @@ async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return True
 
 
-async def async_migrate_entities(hass: HomeAssistant, entry: ConfigEntry) -> None:
+async def async_migrate_entities(hass: HomeAssistant, entry: FoscamConfigEntry) -> None:
     """Migrate old entry."""
 
     @callback
diff --git a/homeassistant/components/foscam/camera.py b/homeassistant/components/foscam/camera.py
index 075848f6ffb..353c7397d81 100644
--- a/homeassistant/components/foscam/camera.py
+++ b/homeassistant/components/foscam/camera.py
@@ -7,21 +7,13 @@ import asyncio
 import voluptuous as vol
 
 from homeassistant.components.camera import Camera, CameraEntityFeature
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import (
-    CONF_RTSP_PORT,
-    CONF_STREAM,
-    DOMAIN,
-    LOGGER,
-    SERVICE_PTZ,
-    SERVICE_PTZ_PRESET,
-)
-from .coordinator import FoscamCoordinator
+from .const import CONF_RTSP_PORT, CONF_STREAM, LOGGER, SERVICE_PTZ, SERVICE_PTZ_PRESET
+from .coordinator import FoscamConfigEntry, FoscamCoordinator
 from .entity import FoscamEntity
 
 DIR_UP = "up"
@@ -56,8 +48,8 @@ PTZ_GOTO_PRESET_COMMAND = "ptz_goto_preset"
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FoscamConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add a Foscam IP camera from a config entry."""
     platform = entity_platform.async_get_current_platform()
@@ -89,7 +81,7 @@ async def async_setup_entry(
         "async_perform_ptz_preset",
     )
 
-    coordinator: FoscamCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
 
     async_add_entities([HassFoscamCamera(coordinator, config_entry)])
 
@@ -103,7 +95,7 @@ class HassFoscamCamera(FoscamEntity, Camera):
     def __init__(
         self,
         coordinator: FoscamCoordinator,
-        config_entry: ConfigEntry,
+        config_entry: FoscamConfigEntry,
     ) -> None:
         """Initialize a Foscam camera."""
         super().__init__(coordinator, config_entry.entry_id)
diff --git a/homeassistant/components/foscam/coordinator.py b/homeassistant/components/foscam/coordinator.py
index e7a8abf7d30..92eb7615e2a 100644
--- a/homeassistant/components/foscam/coordinator.py
+++ b/homeassistant/components/foscam/coordinator.py
@@ -6,11 +6,14 @@ from typing import Any
 
 from libpyfoscam import FoscamCamera
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import DOMAIN, LOGGER
 
+type FoscamConfigEntry = ConfigEntry[FoscamCoordinator]
+
 
 class FoscamCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Foscam coordinator."""
@@ -18,12 +21,14 @@ class FoscamCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     def __init__(
         self,
         hass: HomeAssistant,
+        entry: FoscamConfigEntry,
         session: FoscamCamera,
     ) -> None:
         """Initialize my coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=30),
         )
diff --git a/homeassistant/components/foscam/strings.json b/homeassistant/components/foscam/strings.json
index 2784e541809..03351e3238f 100644
--- a/homeassistant/components/foscam/strings.json
+++ b/homeassistant/components/foscam/strings.json
@@ -35,7 +35,7 @@
   "services": {
     "ptz": {
       "name": "PTZ",
-      "description": "Pan/Tilt action for Foscam camera.",
+      "description": "Moves a Foscam camera to a specified direction.",
       "fields": {
         "movement": {
           "name": "Movement",
@@ -49,7 +49,7 @@
     },
     "ptz_preset": {
       "name": "PTZ preset",
-      "description": "PTZ Preset action for Foscam camera.",
+      "description": "Moves a Foscam camera to a predefined position.",
       "fields": {
         "preset_name": {
           "name": "Preset name",
diff --git a/homeassistant/components/foscam/switch.py b/homeassistant/components/foscam/switch.py
index dfc51aaa064..24b05b5aeaa 100644
--- a/homeassistant/components/foscam/switch.py
+++ b/homeassistant/components/foscam/switch.py
@@ -5,24 +5,23 @@ from __future__ import annotations
 from typing import Any
 
 from homeassistant.components.switch import SwitchEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import FoscamCoordinator
-from .const import DOMAIN, LOGGER
+from .const import LOGGER
+from .coordinator import FoscamConfigEntry, FoscamCoordinator
 from .entity import FoscamEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FoscamConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up foscam switch from a config entry."""
 
-    coordinator: FoscamCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
 
     await coordinator.async_config_entry_first_refresh()
 
@@ -36,7 +35,7 @@ class FoscamSleepSwitch(FoscamEntity, SwitchEntity):
     def __init__(
         self,
         coordinator: FoscamCoordinator,
-        config_entry: ConfigEntry,
+        config_entry: FoscamConfigEntry,
     ) -> None:
         """Initialize a Foscam Sleep Switch."""
         super().__init__(coordinator, config_entry.entry_id)
diff --git a/homeassistant/components/foursquare/__init__.py b/homeassistant/components/foursquare/__init__.py
index 12a29fd632e..25effac073d 100644
--- a/homeassistant/components/foursquare/__init__.py
+++ b/homeassistant/components/foursquare/__init__.py
@@ -10,7 +10,7 @@ import voluptuous as vol
 from homeassistant.components.http import KEY_HASS, HomeAssistantView
 from homeassistant.const import CONF_ACCESS_TOKEN
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/frankever/__init__.py b/homeassistant/components/frankever/__init__.py
new file mode 100644
index 00000000000..66eeecb1e59
--- /dev/null
+++ b/homeassistant/components/frankever/__init__.py
@@ -0,0 +1 @@
+"""FrankEver virtual integration."""
diff --git a/homeassistant/components/frankever/manifest.json b/homeassistant/components/frankever/manifest.json
new file mode 100644
index 00000000000..37d7be765ef
--- /dev/null
+++ b/homeassistant/components/frankever/manifest.json
@@ -0,0 +1,6 @@
+{
+  "domain": "frankever",
+  "name": "FrankEver",
+  "integration_type": "virtual",
+  "supported_by": "shelly"
+}
diff --git a/homeassistant/components/free_mobile/notify.py b/homeassistant/components/free_mobile/notify.py
index 90c8ef3246e..c7e3071c771 100644
--- a/homeassistant/components/free_mobile/notify.py
+++ b/homeassistant/components/free_mobile/notify.py
@@ -14,7 +14,7 @@ from homeassistant.components.notify import (
 )
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/freebox/alarm_control_panel.py b/homeassistant/components/freebox/alarm_control_panel.py
index 9d8e85a14ca..89462b33a2f 100644
--- a/homeassistant/components/freebox/alarm_control_panel.py
+++ b/homeassistant/components/freebox/alarm_control_panel.py
@@ -9,7 +9,7 @@ from homeassistant.components.alarm_control_panel import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, FreeboxHomeCategory
 from .entity import FreeboxHomeEntity
@@ -28,7 +28,9 @@ FREEBOX_TO_STATUS = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up alarm panel."""
     router: FreeboxRouter = hass.data[DOMAIN][entry.unique_id]
diff --git a/homeassistant/components/freebox/binary_sensor.py b/homeassistant/components/freebox/binary_sensor.py
index 20c124efea6..9fc9929b869 100644
--- a/homeassistant/components/freebox/binary_sensor.py
+++ b/homeassistant/components/freebox/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, FreeboxHomeCategory
 from .entity import FreeboxHomeEntity
@@ -34,7 +34,9 @@ RAID_SENSORS: tuple[BinarySensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up binary sensors."""
     router: FreeboxRouter = hass.data[DOMAIN][entry.unique_id]
diff --git a/homeassistant/components/freebox/button.py b/homeassistant/components/freebox/button.py
index 79e3c98b8b7..4f676fd46a1 100644
--- a/homeassistant/components/freebox/button.py
+++ b/homeassistant/components/freebox/button.py
@@ -13,7 +13,7 @@ from homeassistant.components.button import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .router import FreeboxRouter
@@ -44,7 +44,9 @@ BUTTON_DESCRIPTIONS: tuple[FreeboxButtonEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the buttons."""
     router: FreeboxRouter = hass.data[DOMAIN][entry.unique_id]
diff --git a/homeassistant/components/freebox/camera.py b/homeassistant/components/freebox/camera.py
index 33919df74f6..45bb5a34063 100644
--- a/homeassistant/components/freebox/camera.py
+++ b/homeassistant/components/freebox/camera.py
@@ -17,7 +17,7 @@ from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import ATTR_DETECTION, DOMAIN, FreeboxHomeCategory
 from .entity import FreeboxHomeEntity
@@ -27,7 +27,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up cameras."""
     router: FreeboxRouter = hass.data[DOMAIN][entry.unique_id]
@@ -49,7 +51,7 @@ async def async_setup_entry(
 def add_entities(
     hass: HomeAssistant,
     router: FreeboxRouter,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     tracked: set[str],
 ) -> None:
     """Add new cameras from the router."""
diff --git a/homeassistant/components/freebox/device_tracker.py b/homeassistant/components/freebox/device_tracker.py
index 1fa37ebc270..dcb6eb104b2 100644
--- a/homeassistant/components/freebox/device_tracker.py
+++ b/homeassistant/components/freebox/device_tracker.py
@@ -9,14 +9,16 @@ from homeassistant.components.device_tracker import ScannerEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DEFAULT_DEVICE_NAME, DEVICE_ICONS, DOMAIN
 from .router import FreeboxRouter
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up device tracker for Freebox component."""
     router: FreeboxRouter = hass.data[DOMAIN][entry.unique_id]
@@ -36,7 +38,9 @@ async def async_setup_entry(
 
 @callback
 def add_entities(
-    router: FreeboxRouter, async_add_entities: AddEntitiesCallback, tracked: set[str]
+    router: FreeboxRouter,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+    tracked: set[str],
 ) -> None:
     """Add new tracker entities from the router."""
     new_tracked = []
diff --git a/homeassistant/components/freebox/sensor.py b/homeassistant/components/freebox/sensor.py
index 097c8c138ee..cc62de9ae0d 100644
--- a/homeassistant/components/freebox/sensor.py
+++ b/homeassistant/components/freebox/sensor.py
@@ -15,8 +15,8 @@ from homeassistant.const import PERCENTAGE, UnitOfDataRate, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN
 from .entity import FreeboxHomeEntity
@@ -60,7 +60,9 @@ DISK_PARTITION_SENSORS: tuple[SensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensors."""
     router: FreeboxRouter = hass.data[DOMAIN][entry.unique_id]
diff --git a/homeassistant/components/freebox/switch.py b/homeassistant/components/freebox/switch.py
index 96c3bcc2496..c4618b014bf 100644
--- a/homeassistant/components/freebox/switch.py
+++ b/homeassistant/components/freebox/switch.py
@@ -11,7 +11,7 @@ from homeassistant.components.switch import SwitchEntity, SwitchEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .router import FreeboxRouter
@@ -29,7 +29,9 @@ SWITCH_DESCRIPTIONS = [
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the switch."""
     router: FreeboxRouter = hass.data[DOMAIN][entry.unique_id]
diff --git a/homeassistant/components/freedns/__init__.py b/homeassistant/components/freedns/__init__.py
index 5338c0d0700..460ad163f61 100644
--- a/homeassistant/components/freedns/__init__.py
+++ b/homeassistant/components/freedns/__init__.py
@@ -9,8 +9,8 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_SCAN_INTERVAL, CONF_URL
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/freedompro/__init__.py b/homeassistant/components/freedompro/__init__.py
index c14c2f5ae36..9ce7701216c 100644
--- a/homeassistant/components/freedompro/__init__.py
+++ b/homeassistant/components/freedompro/__init__.py
@@ -2,17 +2,12 @@
 
 from __future__ import annotations
 
-import logging
 from typing import Final
 
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_API_KEY, Platform
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
-from .coordinator import FreedomproDataUpdateCoordinator
-
-_LOGGER = logging.getLogger(__name__)
+from .coordinator import FreedomproConfigEntry, FreedomproDataUpdateCoordinator
 
 PLATFORMS: Final[list[Platform]] = [
     Platform.BINARY_SENSOR,
@@ -26,32 +21,27 @@ PLATFORMS: Final[list[Platform]] = [
 ]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: FreedomproConfigEntry) -> bool:
     """Set up Freedompro from a config entry."""
-    hass.data.setdefault(DOMAIN, {})
-    api_key = entry.data[CONF_API_KEY]
-
-    coordinator = FreedomproDataUpdateCoordinator(hass, api_key)
+    coordinator = FreedomproDataUpdateCoordinator(hass, entry)
     await coordinator.async_config_entry_first_refresh()
 
     entry.async_on_unload(entry.add_update_listener(update_listener))
 
-    hass.data[DOMAIN][entry.entry_id] = coordinator
+    entry.runtime_data = coordinator
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: FreedomproConfigEntry) -> bool:
     """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
-async def update_listener(hass: HomeAssistant, config_entry: ConfigEntry) -> None:
+async def update_listener(
+    hass: HomeAssistant, config_entry: FreedomproConfigEntry
+) -> None:
     """Update listener."""
     await hass.config_entries.async_reload(config_entry.entry_id)
diff --git a/homeassistant/components/freedompro/binary_sensor.py b/homeassistant/components/freedompro/binary_sensor.py
index ccea5faf41f..9ff62446176 100644
--- a/homeassistant/components/freedompro/binary_sensor.py
+++ b/homeassistant/components/freedompro/binary_sensor.py
@@ -6,14 +6,13 @@ from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
-from .coordinator import FreedomproDataUpdateCoordinator
+from .coordinator import FreedomproConfigEntry, FreedomproDataUpdateCoordinator
 
 DEVICE_CLASS_MAP = {
     "smokeSensor": BinarySensorDeviceClass.SMOKE,
@@ -33,10 +32,12 @@ SUPPORTED_SENSORS = {"smokeSensor", "occupancySensor", "motionSensor", "contactS
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: FreedomproConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Freedompro binary_sensor."""
-    coordinator: FreedomproDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
     async_add_entities(
         Device(device, coordinator)
         for device in coordinator.data
diff --git a/homeassistant/components/freedompro/climate.py b/homeassistant/components/freedompro/climate.py
index a5b0144ce0c..0145dea27bb 100644
--- a/homeassistant/components/freedompro/climate.py
+++ b/homeassistant/components/freedompro/climate.py
@@ -15,16 +15,15 @@ from homeassistant.components.climate import (
     ClimateEntityFeature,
     HVACMode,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, CONF_API_KEY, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import aiohttp_client
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
-from .coordinator import FreedomproDataUpdateCoordinator
+from .coordinator import FreedomproConfigEntry, FreedomproDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -44,11 +43,13 @@ SUPPORTED_HVAC_MODES = [
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: FreedomproConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Freedompro climate."""
     api_key: str = entry.data[CONF_API_KEY]
-    coordinator: FreedomproDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
     async_add_entities(
         Device(
             aiohttp_client.async_get_clientsession(hass), api_key, device, coordinator
diff --git a/homeassistant/components/freedompro/coordinator.py b/homeassistant/components/freedompro/coordinator.py
index ad76a9aaa65..23b181b2655 100644
--- a/homeassistant/components/freedompro/coordinator.py
+++ b/homeassistant/components/freedompro/coordinator.py
@@ -8,6 +8,9 @@ from typing import Any
 
 from pyfreedompro import get_list, get_states
 
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_API_KEY
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers import aiohttp_client
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -15,18 +18,27 @@ from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
+type FreedomproConfigEntry = ConfigEntry[FreedomproDataUpdateCoordinator]
+
 
 class FreedomproDataUpdateCoordinator(DataUpdateCoordinator[list[dict[str, Any]]]):
     """Class to manage fetching Freedompro data API."""
 
-    def __init__(self, hass, api_key):
+    def __init__(self, hass: HomeAssistant, entry: FreedomproConfigEntry) -> None:
         """Initialize."""
+
         self._hass = hass
-        self._api_key = api_key
+        self._api_key = entry.data[CONF_API_KEY]
         self._devices: list[dict[str, Any]] | None = None
 
         update_interval = timedelta(minutes=1)
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval)
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=entry,
+            name=DOMAIN,
+            update_interval=update_interval,
+        )
 
     async def _async_update_data(self):
         if self._devices is None:
diff --git a/homeassistant/components/freedompro/cover.py b/homeassistant/components/freedompro/cover.py
index 06ad5c80b6a..01e1b39d08f 100644
--- a/homeassistant/components/freedompro/cover.py
+++ b/homeassistant/components/freedompro/cover.py
@@ -11,16 +11,15 @@ from homeassistant.components.cover import (
     CoverEntity,
     CoverEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import aiohttp_client
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
-from .coordinator import FreedomproDataUpdateCoordinator
+from .coordinator import FreedomproConfigEntry, FreedomproDataUpdateCoordinator
 
 DEVICE_CLASS_MAP = {
     "windowCovering": CoverDeviceClass.BLIND,
@@ -34,11 +33,13 @@ SUPPORTED_SENSORS = {"windowCovering", "gate", "garageDoor", "door", "window"}
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: FreedomproConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Freedompro cover."""
     api_key: str = entry.data[CONF_API_KEY]
-    coordinator: FreedomproDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
     async_add_entities(
         Device(hass, api_key, device, coordinator)
         for device in coordinator.data
diff --git a/homeassistant/components/freedompro/fan.py b/homeassistant/components/freedompro/fan.py
index d21ede9bad3..c65afb3a0e2 100644
--- a/homeassistant/components/freedompro/fan.py
+++ b/homeassistant/components/freedompro/fan.py
@@ -8,24 +8,25 @@ from typing import Any
 from pyfreedompro import put_state
 
 from homeassistant.components.fan import FanEntity, FanEntityFeature
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import aiohttp_client
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
-from .coordinator import FreedomproDataUpdateCoordinator
+from .coordinator import FreedomproConfigEntry, FreedomproDataUpdateCoordinator
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: FreedomproConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Freedompro fan."""
     api_key: str = entry.data[CONF_API_KEY]
-    coordinator: FreedomproDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
     async_add_entities(
         FreedomproFan(hass, api_key, device, coordinator)
         for device in coordinator.data
diff --git a/homeassistant/components/freedompro/light.py b/homeassistant/components/freedompro/light.py
index ab8df7ec9db..f9d90420c5d 100644
--- a/homeassistant/components/freedompro/light.py
+++ b/homeassistant/components/freedompro/light.py
@@ -13,24 +13,25 @@ from homeassistant.components.light import (
     ColorMode,
     LightEntity,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import aiohttp_client
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
-from .coordinator import FreedomproDataUpdateCoordinator
+from .coordinator import FreedomproConfigEntry, FreedomproDataUpdateCoordinator
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: FreedomproConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Freedompro light."""
     api_key: str = entry.data[CONF_API_KEY]
-    coordinator: FreedomproDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
     async_add_entities(
         Device(hass, api_key, device, coordinator)
         for device in coordinator.data
diff --git a/homeassistant/components/freedompro/lock.py b/homeassistant/components/freedompro/lock.py
index c429ef6aa99..4aee252abbe 100644
--- a/homeassistant/components/freedompro/lock.py
+++ b/homeassistant/components/freedompro/lock.py
@@ -6,24 +6,25 @@ from typing import Any
 from pyfreedompro import put_state
 
 from homeassistant.components.lock import LockEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import aiohttp_client
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
-from .coordinator import FreedomproDataUpdateCoordinator
+from .coordinator import FreedomproConfigEntry, FreedomproDataUpdateCoordinator
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: FreedomproConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Freedompro lock."""
     api_key: str = entry.data[CONF_API_KEY]
-    coordinator: FreedomproDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
     async_add_entities(
         Device(hass, api_key, device, coordinator)
         for device in coordinator.data
diff --git a/homeassistant/components/freedompro/sensor.py b/homeassistant/components/freedompro/sensor.py
index 3c5101e3634..dbe1449d6e5 100644
--- a/homeassistant/components/freedompro/sensor.py
+++ b/homeassistant/components/freedompro/sensor.py
@@ -7,15 +7,14 @@ from homeassistant.components.sensor import (
     SensorEntity,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import LIGHT_LUX, PERCENTAGE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
-from .coordinator import FreedomproDataUpdateCoordinator
+from .coordinator import FreedomproConfigEntry, FreedomproDataUpdateCoordinator
 
 DEVICE_CLASS_MAP = {
     "temperatureSensor": SensorDeviceClass.TEMPERATURE,
@@ -41,10 +40,12 @@ SUPPORTED_SENSORS = {"temperatureSensor", "humiditySensor", "lightSensor"}
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: FreedomproConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Freedompro sensor."""
-    coordinator: FreedomproDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
     async_add_entities(
         Device(device, coordinator)
         for device in coordinator.data
diff --git a/homeassistant/components/freedompro/switch.py b/homeassistant/components/freedompro/switch.py
index 91e67506173..bda13b147b1 100644
--- a/homeassistant/components/freedompro/switch.py
+++ b/homeassistant/components/freedompro/switch.py
@@ -6,24 +6,25 @@ from typing import Any
 from pyfreedompro import put_state
 
 from homeassistant.components.switch import SwitchEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import aiohttp_client
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
-from .coordinator import FreedomproDataUpdateCoordinator
+from .coordinator import FreedomproConfigEntry, FreedomproDataUpdateCoordinator
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: FreedomproConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Freedompro switch."""
     api_key: str = entry.data[CONF_API_KEY]
-    coordinator: FreedomproDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
     async_add_entities(
         Device(hass, api_key, device, coordinator)
         for device in coordinator.data
diff --git a/homeassistant/components/fritz/__init__.py b/homeassistant/components/fritz/__init__.py
index 1e1830ca1c1..05a2a07707f 100644
--- a/homeassistant/components/fritz/__init__.py
+++ b/homeassistant/components/fritz/__init__.py
@@ -2,7 +2,6 @@
 
 import logging
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_HOST,
     CONF_PASSWORD,
@@ -12,26 +11,36 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.typing import ConfigType
 
 from .const import (
-    DATA_FRITZ,
     DEFAULT_SSL,
     DOMAIN,
     FRITZ_AUTH_EXCEPTIONS,
     FRITZ_EXCEPTIONS,
     PLATFORMS,
 )
-from .coordinator import AvmWrapper, FritzData
-from .services import async_setup_services, async_unload_services
+from .coordinator import FRITZ_DATA_KEY, AvmWrapper, FritzConfigEntry, FritzData
+from .services import async_setup_services
 
 _LOGGER = logging.getLogger(__name__)
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up fritzboxtools integration."""
+    await async_setup_services(hass)
+    return True
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: FritzConfigEntry) -> bool:
     """Set up fritzboxtools from config entry."""
     _LOGGER.debug("Setting up FRITZ!Box Tools component")
     avm_wrapper = AvmWrapper(
         hass=hass,
+        config_entry=entry,
         host=entry.data[CONF_HOST],
         port=entry.data[CONF_PORT],
         username=entry.data[CONF_USERNAME],
@@ -54,42 +63,33 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     await avm_wrapper.async_config_entry_first_refresh()
 
-    hass.data.setdefault(DOMAIN, {})
-    hass.data[DOMAIN][entry.entry_id] = avm_wrapper
+    entry.runtime_data = avm_wrapper
 
-    if DATA_FRITZ not in hass.data:
-        hass.data[DATA_FRITZ] = FritzData()
+    if FRITZ_DATA_KEY not in hass.data:
+        hass.data[FRITZ_DATA_KEY] = FritzData()
 
     entry.async_on_unload(entry.add_update_listener(update_listener))
 
     # Load the other platforms like switch
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
-    await async_setup_services(hass)
-
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: FritzConfigEntry) -> bool:
     """Unload FRITZ!Box Tools config entry."""
-    avm_wrapper: AvmWrapper = hass.data[DOMAIN][entry.entry_id]
+    avm_wrapper = entry.runtime_data
 
-    fritz_data = hass.data[DATA_FRITZ]
+    fritz_data = hass.data[FRITZ_DATA_KEY]
     fritz_data.tracked.pop(avm_wrapper.unique_id)
 
     if not bool(fritz_data.tracked):
-        hass.data.pop(DATA_FRITZ)
+        hass.data.pop(FRITZ_DATA_KEY)
 
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    await async_unload_services(hass)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
-async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+async def update_listener(hass: HomeAssistant, entry: FritzConfigEntry) -> None:
     """Update when config_entry options update."""
     if entry.options:
         await hass.config_entries.async_reload(entry.entry_id)
diff --git a/homeassistant/components/fritz/binary_sensor.py b/homeassistant/components/fritz/binary_sensor.py
index cb1f698bdca..6bc8bb571d4 100644
--- a/homeassistant/components/fritz/binary_sensor.py
+++ b/homeassistant/components/fritz/binary_sensor.py
@@ -11,13 +11,11 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN
-from .coordinator import AvmWrapper, ConnectionInfo
+from .coordinator import ConnectionInfo, FritzConfigEntry
 from .entity import FritzBoxBaseCoordinatorEntity, FritzEntityDescription
 
 _LOGGER = logging.getLogger(__name__)
@@ -51,11 +49,13 @@ SENSOR_TYPES: tuple[FritzBinarySensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: FritzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry."""
     _LOGGER.debug("Setting up FRITZ!Box binary sensors")
-    avm_wrapper: AvmWrapper = hass.data[DOMAIN][entry.entry_id]
+    avm_wrapper = entry.runtime_data
 
     connection_info = await avm_wrapper.async_get_connection_info()
 
diff --git a/homeassistant/components/fritz/button.py b/homeassistant/components/fritz/button.py
index 263521d23f4..74e8ab5e43e 100644
--- a/homeassistant/components/fritz/button.py
+++ b/homeassistant/components/fritz/button.py
@@ -12,15 +12,21 @@ from homeassistant.components.button import (
     ButtonEntity,
     ButtonEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import BUTTON_TYPE_WOL, CONNECTION_TYPE_LAN, DATA_FRITZ, DOMAIN, MeshRoles
-from .coordinator import AvmWrapper, FritzData, FritzDevice, _is_tracked
+from .const import BUTTON_TYPE_WOL, CONNECTION_TYPE_LAN, DOMAIN, MeshRoles
+from .coordinator import (
+    FRITZ_DATA_KEY,
+    AvmWrapper,
+    FritzConfigEntry,
+    FritzData,
+    FritzDevice,
+    _is_tracked,
+)
 from .entity import FritzDeviceBase
 
 _LOGGER = logging.getLogger(__name__)
@@ -65,12 +71,12 @@ BUTTONS: Final = [
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: FritzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set buttons for device."""
     _LOGGER.debug("Setting up buttons")
-    avm_wrapper: AvmWrapper = hass.data[DOMAIN][entry.entry_id]
+    avm_wrapper = entry.runtime_data
 
     entities_list: list[ButtonEntity] = [
         FritzButton(avm_wrapper, entry.title, button) for button in BUTTONS
@@ -80,7 +86,7 @@ async def async_setup_entry(
         async_add_entities(entities_list)
         return
 
-    data_fritz: FritzData = hass.data[DATA_FRITZ]
+    data_fritz = hass.data[FRITZ_DATA_KEY]
     entities_list += _async_wol_buttons_list(avm_wrapper, data_fritz)
 
     async_add_entities(entities_list)
diff --git a/homeassistant/components/fritz/config_flow.py b/homeassistant/components/fritz/config_flow.py
index 7b6057b3ba2..fb17f872cb6 100644
--- a/homeassistant/components/fritz/config_flow.py
+++ b/homeassistant/components/fritz/config_flow.py
@@ -17,12 +17,7 @@ from homeassistant.components.device_tracker import (
     CONF_CONSIDER_HOME,
     DEFAULT_CONSIDER_HOME,
 )
-from homeassistant.config_entries import (
-    ConfigEntry,
-    ConfigFlow,
-    ConfigFlowResult,
-    OptionsFlow,
-)
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult, OptionsFlow
 from homeassistant.const import (
     CONF_HOST,
     CONF_PASSWORD,
@@ -53,6 +48,7 @@ from .const import (
     ERROR_UPNP_NOT_CONFIGURED,
     FRITZ_AUTH_EXCEPTIONS,
 )
+from .coordinator import FritzConfigEntry
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -67,7 +63,7 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
     @staticmethod
     @callback
     def async_get_options_flow(
-        config_entry: ConfigEntry,
+        config_entry: FritzConfigEntry,
     ) -> FritzBoxToolsOptionsFlowHandler:
         """Get the options flow for this handler."""
         return FritzBoxToolsOptionsFlowHandler()
@@ -116,7 +112,7 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
 
         return None
 
-    async def async_check_configured_entry(self) -> ConfigEntry | None:
+    async def async_check_configured_entry(self) -> FritzConfigEntry | None:
         """Check if entry is configured."""
         current_host = await self.hass.async_add_executor_job(
             socket.gethostbyname, self._host
diff --git a/homeassistant/components/fritz/const.py b/homeassistant/components/fritz/const.py
index 9a266507c25..2237823bc3b 100644
--- a/homeassistant/components/fritz/const.py
+++ b/homeassistant/components/fritz/const.py
@@ -40,8 +40,6 @@ PLATFORMS = [
 CONF_OLD_DISCOVERY = "old_discovery"
 DEFAULT_CONF_OLD_DISCOVERY = False
 
-DATA_FRITZ = "fritz_data"
-
 DSL_CONNECTION: Literal["dsl"] = "dsl"
 
 DEFAULT_DEVICE_NAME = "Unknown device"
@@ -56,9 +54,6 @@ ERROR_CANNOT_CONNECT = "cannot_connect"
 ERROR_UPNP_NOT_CONFIGURED = "upnp_not_configured"
 ERROR_UNKNOWN = "unknown_error"
 
-FRITZ_SERVICES = "fritz_services"
-SERVICE_SET_GUEST_WIFI_PW = "set_guest_wifi_password"
-
 SWITCH_TYPE_DEFLECTION = "CallDeflection"
 SWITCH_TYPE_PORTFORWARD = "PortForward"
 SWITCH_TYPE_PROFILE = "Profile"
diff --git a/homeassistant/components/fritz/coordinator.py b/homeassistant/components/fritz/coordinator.py
index 52bff67c229..d60232ec8ad 100644
--- a/homeassistant/components/fritz/coordinator.py
+++ b/homeassistant/components/fritz/coordinator.py
@@ -16,11 +16,10 @@ from fritzconnection.core.exceptions import (
     FritzActionError,
     FritzConnectionException,
     FritzSecurityError,
-    FritzServiceError,
 )
 from fritzconnection.lib.fritzhosts import FritzHosts
 from fritzconnection.lib.fritzstatus import FritzStatus
-from fritzconnection.lib.fritzwlan import DEFAULT_PASSWORD_LENGTH, FritzGuestWLAN
+from fritzconnection.lib.fritzwlan import FritzGuestWLAN
 import xmltodict
 
 from homeassistant.components.device_tracker import (
@@ -29,7 +28,7 @@ from homeassistant.components.device_tracker import (
     DOMAIN as DEVICE_TRACKER_DOMAIN,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
@@ -37,6 +36,7 @@ from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from homeassistant.util import dt as dt_util
+from homeassistant.util.hass_dict import HassKey
 
 from .const import (
     CONF_OLD_DISCOVERY,
@@ -46,14 +46,17 @@ from .const import (
     DEFAULT_USERNAME,
     DOMAIN,
     FRITZ_EXCEPTIONS,
-    SERVICE_SET_GUEST_WIFI_PW,
     MeshRoles,
 )
 
 _LOGGER = logging.getLogger(__name__)
 
+FRITZ_DATA_KEY: HassKey[FritzData] = HassKey(DOMAIN)
 
-def _is_tracked(mac: str, current_devices: ValuesView) -> bool:
+type FritzConfigEntry = ConfigEntry[AvmWrapper]
+
+
+def _is_tracked(mac: str, current_devices: ValuesView[set[str]]) -> bool:
     """Check if device is already tracked."""
     return any(mac in tracked for tracked in current_devices)
 
@@ -61,7 +64,7 @@ def _is_tracked(mac: str, current_devices: ValuesView) -> bool:
 def device_filter_out_from_trackers(
     mac: str,
     device: FritzDevice,
-    current_devices: ValuesView,
+    current_devices: ValuesView[set[str]],
 ) -> bool:
     """Check if device should be filtered out from trackers."""
     reason: str | None = None
@@ -162,11 +165,12 @@ class UpdateCoordinatorDataType(TypedDict):
 class FritzBoxTools(DataUpdateCoordinator[UpdateCoordinatorDataType]):
     """FritzBoxTools class."""
 
-    config_entry: ConfigEntry
+    config_entry: FritzConfigEntry
 
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: FritzConfigEntry,
         password: str,
         port: int,
         username: str = DEFAULT_USERNAME,
@@ -176,6 +180,7 @@ class FritzBoxTools(DataUpdateCoordinator[UpdateCoordinatorDataType]):
         """Initialize FritzboxTools class."""
         super().__init__(
             hass=hass,
+            config_entry=config_entry,
             logger=_LOGGER,
             name=f"{DOMAIN}-{host}-coordinator",
             update_interval=timedelta(seconds=30),
@@ -191,6 +196,7 @@ class FritzBoxTools(DataUpdateCoordinator[UpdateCoordinatorDataType]):
         self.hass = hass
         self.host = host
         self.mesh_role = MeshRoles.NONE
+        self.mesh_wifi_uplink = False
         self.device_conn_type: str | None = None
         self.device_is_router: bool = False
         self.password = password
@@ -605,6 +611,12 @@ class FritzBoxTools(DataUpdateCoordinator[UpdateCoordinatorDataType]):
                     ssid=interf.get("ssid", ""),
                     type=interf["type"],
                 )
+
+                if interf["type"].lower() == "wlan" and interf[
+                    "name"
+                ].lower().startswith("uplink"):
+                    self.mesh_wifi_uplink = True
+
                 if dr.format_mac(int_mac) == self.mac:
                     self.mesh_role = MeshRoles(node["mesh_role"])
 
@@ -693,34 +705,6 @@ class FritzBoxTools(DataUpdateCoordinator[UpdateCoordinatorDataType]):
                     device.id, remove_config_entry_id=config_entry.entry_id
                 )
 
-    async def service_fritzbox(
-        self, service_call: ServiceCall, config_entry: ConfigEntry
-    ) -> None:
-        """Define FRITZ!Box services."""
-        _LOGGER.debug("FRITZ!Box service: %s", service_call.service)
-
-        if not self.connection:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="unable_to_connect"
-            )
-
-        try:
-            if service_call.service == SERVICE_SET_GUEST_WIFI_PW:
-                await self.async_trigger_set_guest_password(
-                    service_call.data.get("password"),
-                    service_call.data.get("length", DEFAULT_PASSWORD_LENGTH),
-                )
-                return
-
-        except (FritzServiceError, FritzActionError) as ex:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="service_parameter_unknown"
-            ) from ex
-        except FritzConnectionException as ex:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="service_not_supported"
-            ) from ex
-
 
 class AvmWrapper(FritzBoxTools):
     """Setup AVM wrapper for API calls."""
@@ -899,9 +883,9 @@ class AvmWrapper(FritzBoxTools):
 class FritzData:
     """Storage class for platform global data."""
 
-    tracked: dict = field(default_factory=dict)
-    profile_switches: dict = field(default_factory=dict)
-    wol_buttons: dict = field(default_factory=dict)
+    tracked: dict[str, set[str]] = field(default_factory=dict)
+    profile_switches: dict[str, set[str]] = field(default_factory=dict)
+    wol_buttons: dict[str, set[str]] = field(default_factory=dict)
 
 
 class FritzDevice:
diff --git a/homeassistant/components/fritz/device_tracker.py b/homeassistant/components/fritz/device_tracker.py
index d1270a0510c..e066219342e 100644
--- a/homeassistant/components/fritz/device_tracker.py
+++ b/homeassistant/components/fritz/device_tracker.py
@@ -6,14 +6,14 @@ import datetime
 import logging
 
 from homeassistant.components.device_tracker import ScannerEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DATA_FRITZ, DOMAIN
 from .coordinator import (
+    FRITZ_DATA_KEY,
     AvmWrapper,
+    FritzConfigEntry,
     FritzData,
     FritzDevice,
     device_filter_out_from_trackers,
@@ -24,12 +24,14 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: FritzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up device tracker for FRITZ!Box component."""
     _LOGGER.debug("Starting FRITZ!Box device tracker")
-    avm_wrapper: AvmWrapper = hass.data[DOMAIN][entry.entry_id]
-    data_fritz: FritzData = hass.data[DATA_FRITZ]
+    avm_wrapper = entry.runtime_data
+    data_fritz = hass.data[FRITZ_DATA_KEY]
 
     @callback
     def update_avm_device() -> None:
@@ -46,7 +48,7 @@ async def async_setup_entry(
 @callback
 def _async_add_entities(
     avm_wrapper: AvmWrapper,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     data_fritz: FritzData,
 ) -> None:
     """Add new tracker entities from the AVM device."""
diff --git a/homeassistant/components/fritz/diagnostics.py b/homeassistant/components/fritz/diagnostics.py
index 8823d55baa9..b9ae9edf04d 100644
--- a/homeassistant/components/fritz/diagnostics.py
+++ b/homeassistant/components/fritz/diagnostics.py
@@ -5,21 +5,19 @@ 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
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
-from .coordinator import AvmWrapper
+from .coordinator import FritzConfigEntry
 
 TO_REDACT = {CONF_USERNAME, CONF_PASSWORD}
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: ConfigEntry
+    hass: HomeAssistant, entry: FritzConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    avm_wrapper: AvmWrapper = hass.data[DOMAIN][entry.entry_id]
+    avm_wrapper = entry.runtime_data
 
     return {
         "entry": async_redact_data(entry.as_dict(), TO_REDACT),
diff --git a/homeassistant/components/fritz/image.py b/homeassistant/components/fritz/image.py
index 19c98446ccd..d329ec318c5 100644
--- a/homeassistant/components/fritz/image.py
+++ b/homeassistant/components/fritz/image.py
@@ -8,14 +8,12 @@ import logging
 from requests.exceptions import RequestException
 
 from homeassistant.components.image import ImageEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util, slugify
 
-from .const import DOMAIN
-from .coordinator import AvmWrapper
+from .coordinator import AvmWrapper, FritzConfigEntry
 from .entity import FritzBoxBaseEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -23,11 +21,11 @@ _LOGGER = logging.getLogger(__name__)
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: FritzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up guest WiFi QR code for device."""
-    avm_wrapper: AvmWrapper = hass.data[DOMAIN][entry.entry_id]
+    avm_wrapper = entry.runtime_data
 
     guest_wifi_info = await hass.async_add_executor_job(
         avm_wrapper.fritz_guest_wifi.get_info
diff --git a/homeassistant/components/fritz/quality_scale.yaml b/homeassistant/components/fritz/quality_scale.yaml
index 06c572f93a6..805705eb4b4 100644
--- a/homeassistant/components/fritz/quality_scale.yaml
+++ b/homeassistant/components/fritz/quality_scale.yaml
@@ -1,8 +1,6 @@
 rules:
   # Bronze
-  action-setup:
-    status: todo
-    comment: still in async_setup_entry, needs to be moved to async_setup
+  action-setup: done
   appropriate-polling: done
   brands: done
   common-modules: done
@@ -24,9 +22,7 @@ rules:
   has-entity-name:
     status: todo
     comment: partially done
-  runtime-data:
-    status: todo
-    comment: still uses hass.data
+  runtime-data: done
   test-before-configure: done
   test-before-setup: done
   unique-config-entry: done
diff --git a/homeassistant/components/fritz/sensor.py b/homeassistant/components/fritz/sensor.py
index 11ee0ad5510..bcee590460f 100644
--- a/homeassistant/components/fritz/sensor.py
+++ b/homeassistant/components/fritz/sensor.py
@@ -15,7 +15,6 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     SIGNAL_STRENGTH_DECIBELS,
     EntityCategory,
@@ -23,12 +22,12 @@ from homeassistant.const import (
     UnitOfInformation,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util.dt import utcnow
 
-from .const import DOMAIN, DSL_CONNECTION, UPTIME_DEVIATION
-from .coordinator import AvmWrapper, ConnectionInfo
+from .const import DSL_CONNECTION, UPTIME_DEVIATION
+from .coordinator import ConnectionInfo, FritzConfigEntry
 from .entity import FritzBoxBaseCoordinatorEntity, FritzEntityDescription
 
 _LOGGER = logging.getLogger(__name__)
@@ -267,11 +266,13 @@ SENSOR_TYPES: tuple[FritzSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: FritzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry."""
     _LOGGER.debug("Setting up FRITZ!Box sensors")
-    avm_wrapper: AvmWrapper = hass.data[DOMAIN][entry.entry_id]
+    avm_wrapper = entry.runtime_data
 
     connection_info = await avm_wrapper.async_get_connection_info()
 
diff --git a/homeassistant/components/fritz/services.py b/homeassistant/components/fritz/services.py
index bace7480ba5..02e6c91f4bf 100644
--- a/homeassistant/components/fritz/services.py
+++ b/homeassistant/components/fritz/services.py
@@ -1,21 +1,25 @@
 """Services for Fritz integration."""
 
-from __future__ import annotations
-
 import logging
 
+from fritzconnection.core.exceptions import (
+    FritzActionError,
+    FritzConnectionException,
+    FritzServiceError,
+)
+from fritzconnection.lib.fritzwlan import DEFAULT_PASSWORD_LENGTH
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant, ServiceCall
-from homeassistant.exceptions import HomeAssistantError
+from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers.service import async_extract_config_entry_ids
 
-from .const import DOMAIN, FRITZ_SERVICES, SERVICE_SET_GUEST_WIFI_PW
-from .coordinator import AvmWrapper
+from .const import DOMAIN
+from .coordinator import FritzConfigEntry
 
 _LOGGER = logging.getLogger(__name__)
 
+SERVICE_SET_GUEST_WIFI_PW = "set_guest_wifi_password"
 SERVICE_SCHEMA_SET_GUEST_WIFI_PW = vol.Schema(
     {
         vol.Required("device_id"): str,
@@ -24,71 +28,48 @@ SERVICE_SCHEMA_SET_GUEST_WIFI_PW = vol.Schema(
     }
 )
 
-SERVICE_LIST: list[tuple[str, vol.Schema | None]] = [
-    (SERVICE_SET_GUEST_WIFI_PW, SERVICE_SCHEMA_SET_GUEST_WIFI_PW),
-]
+
+async def _async_set_guest_wifi_password(service_call: ServiceCall) -> None:
+    """Call Fritz set guest wifi password service."""
+    hass = service_call.hass
+    target_entry_ids = await async_extract_config_entry_ids(hass, service_call)
+    target_entries: list[FritzConfigEntry] = [
+        loaded_entry
+        for loaded_entry in hass.config_entries.async_loaded_entries(DOMAIN)
+        if loaded_entry.entry_id in target_entry_ids
+    ]
+
+    if not target_entries:
+        raise ServiceValidationError(
+            translation_domain=DOMAIN,
+            translation_key="config_entry_not_found",
+            translation_placeholders={"service": service_call.service},
+        )
+
+    for target_entry in target_entries:
+        _LOGGER.debug("Executing service %s", service_call.service)
+        avm_wrapper = target_entry.runtime_data
+        try:
+            await avm_wrapper.async_trigger_set_guest_password(
+                service_call.data.get("password"),
+                service_call.data.get("length", DEFAULT_PASSWORD_LENGTH),
+            )
+        except (FritzServiceError, FritzActionError) as ex:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN, translation_key="service_parameter_unknown"
+            ) from ex
+        except FritzConnectionException as ex:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN, translation_key="service_not_supported"
+            ) from ex
 
 
 async def async_setup_services(hass: HomeAssistant) -> None:
     """Set up services for Fritz integration."""
 
-    for service, _ in SERVICE_LIST:
-        if hass.services.has_service(DOMAIN, service):
-            return
-
-    async def async_call_fritz_service(service_call: ServiceCall) -> None:
-        """Call correct Fritz service."""
-
-        if not (
-            fritzbox_entry_ids := await _async_get_configured_avm_device(
-                hass, service_call
-            )
-        ):
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="config_entry_not_found",
-                translation_placeholders={"service": service_call.service},
-            )
-
-        for entry_id in fritzbox_entry_ids:
-            _LOGGER.debug("Executing service %s", service_call.service)
-            avm_wrapper: AvmWrapper = hass.data[DOMAIN][entry_id]
-            if config_entry := hass.config_entries.async_get_entry(entry_id):
-                await avm_wrapper.service_fritzbox(service_call, config_entry)
-            else:
-                _LOGGER.error(
-                    "Executing service %s failed, no config entry found",
-                    service_call.service,
-                )
-
-    for service, schema in SERVICE_LIST:
-        hass.services.async_register(DOMAIN, service, async_call_fritz_service, schema)
-
-
-async def _async_get_configured_avm_device(
-    hass: HomeAssistant, service_call: ServiceCall
-) -> list:
-    """Get FritzBoxTools class from config entry."""
-
-    list_entry_id: list = []
-    for entry_id in await async_extract_config_entry_ids(hass, service_call):
-        config_entry = hass.config_entries.async_get_entry(entry_id)
-        if (
-            config_entry
-            and config_entry.domain == DOMAIN
-            and config_entry.state == ConfigEntryState.LOADED
-        ):
-            list_entry_id.append(entry_id)
-    return list_entry_id
-
-
-async def async_unload_services(hass: HomeAssistant) -> None:
-    """Unload services for Fritz integration."""
-
-    if not hass.data.get(FRITZ_SERVICES):
-        return
-
-    hass.data[FRITZ_SERVICES] = False
-
-    for service, _ in SERVICE_LIST:
-        hass.services.async_remove(DOMAIN, service)
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_SET_GUEST_WIFI_PW,
+        _async_set_guest_wifi_password,
+        SERVICE_SCHEMA_SET_GUEST_WIFI_PW,
+    )
diff --git a/homeassistant/components/fritz/switch.py b/homeassistant/components/fritz/switch.py
index 372af89cc9e..8b4816f7451 100644
--- a/homeassistant/components/fritz/switch.py
+++ b/homeassistant/components/fritz/switch.py
@@ -7,18 +7,16 @@ from typing import Any
 
 from homeassistant.components.network import async_get_source_ip
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import slugify
 
 from .const import (
-    DATA_FRITZ,
     DOMAIN,
     SWITCH_TYPE_DEFLECTION,
     SWITCH_TYPE_PORTFORWARD,
@@ -28,7 +26,9 @@ from .const import (
     MeshRoles,
 )
 from .coordinator import (
+    FRITZ_DATA_KEY,
     AvmWrapper,
+    FritzConfigEntry,
     FritzData,
     FritzDevice,
     SwitchInfo,
@@ -207,8 +207,9 @@ async def async_all_entities_list(
     local_ip: str,
 ) -> list[Entity]:
     """Get a list of all entities."""
-
     if avm_wrapper.mesh_role == MeshRoles.SLAVE:
+        if not avm_wrapper.mesh_wifi_uplink:
+            return [*await _async_wifi_entities_list(avm_wrapper, device_friendly_name)]
         return []
 
     return [
@@ -220,12 +221,14 @@ async def async_all_entities_list(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: FritzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry."""
     _LOGGER.debug("Setting up switches")
-    avm_wrapper: AvmWrapper = hass.data[DOMAIN][entry.entry_id]
-    data_fritz: FritzData = hass.data[DATA_FRITZ]
+    avm_wrapper = entry.runtime_data
+    data_fritz = hass.data[FRITZ_DATA_KEY]
 
     _LOGGER.debug("Fritzbox services: %s", avm_wrapper.connection.services)
 
@@ -563,6 +566,9 @@ class FritzBoxWifiSwitch(FritzBoxBaseSwitch):
 
         self._attributes = {}
         self._attr_entity_category = EntityCategory.CONFIG
+        self._attr_entity_registry_enabled_default = (
+            avm_wrapper.mesh_role is not MeshRoles.SLAVE
+        )
         self._network_num = network_num
 
         switch_info = SwitchInfo(
diff --git a/homeassistant/components/fritz/update.py b/homeassistant/components/fritz/update.py
index 6969f201f27..5d064dc3035 100644
--- a/homeassistant/components/fritz/update.py
+++ b/homeassistant/components/fritz/update.py
@@ -11,13 +11,11 @@ from homeassistant.components.update import (
     UpdateEntityDescription,
     UpdateEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN
-from .coordinator import AvmWrapper
+from .coordinator import AvmWrapper, FritzConfigEntry
 from .entity import FritzBoxBaseCoordinatorEntity, FritzEntityDescription
 
 _LOGGER = logging.getLogger(__name__)
@@ -29,11 +27,13 @@ class FritzUpdateEntityDescription(UpdateEntityDescription, FritzEntityDescripti
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: FritzConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AVM FRITZ!Box update entities."""
     _LOGGER.debug("Setting up AVM FRITZ!Box update entities")
-    avm_wrapper: AvmWrapper = hass.data[DOMAIN][entry.entry_id]
+    avm_wrapper = entry.runtime_data
 
     entities = [FritzBoxUpdateEntity(avm_wrapper, entry.title)]
 
diff --git a/homeassistant/components/fritzbox/__init__.py b/homeassistant/components/fritzbox/__init__.py
index 07bc8fb15f2..afe6f1abba8 100644
--- a/homeassistant/components/fritzbox/__init__.py
+++ b/homeassistant/components/fritzbox/__init__.py
@@ -37,7 +37,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: FritzboxConfigEntry) ->
 
     await async_migrate_entries(hass, entry.entry_id, _update_unique_id)
 
-    coordinator = FritzboxDataUpdateCoordinator(hass, entry.entry_id)
+    coordinator = FritzboxDataUpdateCoordinator(hass, entry)
     await coordinator.async_setup()
 
     entry.runtime_data = coordinator
diff --git a/homeassistant/components/fritzbox/binary_sensor.py b/homeassistant/components/fritzbox/binary_sensor.py
index 3c9cb6ada5c..75683017cb7 100644
--- a/homeassistant/components/fritzbox/binary_sensor.py
+++ b/homeassistant/components/fritzbox/binary_sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import FritzboxConfigEntry
 from .entity import FritzBoxDeviceEntity
@@ -66,7 +66,7 @@ BINARY_SENSOR_TYPES: Final[tuple[FritzBinarySensorEntityDescription, ...]] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FritzboxConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the FRITZ!SmartHome binary sensor from ConfigEntry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/fritzbox/button.py b/homeassistant/components/fritzbox/button.py
index 44a6697e1c0..54baa97b11a 100644
--- a/homeassistant/components/fritzbox/button.py
+++ b/homeassistant/components/fritzbox/button.py
@@ -5,7 +5,7 @@ from pyfritzhome.devicetypes import FritzhomeTemplate
 from homeassistant.components.button import ButtonEntity
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import FritzboxConfigEntry
@@ -15,7 +15,7 @@ from .entity import FritzBoxEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FritzboxConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the FRITZ!SmartHome template from ConfigEntry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/fritzbox/climate.py b/homeassistant/components/fritzbox/climate.py
index d5a81fdef1a..118e03c391f 100644
--- a/homeassistant/components/fritzbox/climate.py
+++ b/homeassistant/components/fritzbox/climate.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     ATTR_STATE_BATTERY_LOW,
@@ -59,7 +59,7 @@ OFF_REPORT_SET_TEMPERATURE = 0.0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FritzboxConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the FRITZ!SmartHome thermostat from ConfigEntry."""
     coordinator = entry.runtime_data
@@ -85,6 +85,8 @@ async def async_setup_entry(
 class FritzboxThermostat(FritzBoxDeviceEntity, ClimateEntity):
     """The thermostat class for FRITZ!SmartHome thermostats."""
 
+    _attr_max_temp = MAX_TEMPERATURE
+    _attr_min_temp = MIN_TEMPERATURE
     _attr_precision = PRECISION_HALVES
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
     _attr_translation_key = "thermostat"
@@ -135,13 +137,15 @@ class FritzboxThermostat(FritzBoxDeviceEntity, ClimateEntity):
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
-        target_temp = kwargs.get(ATTR_TEMPERATURE)
-        hvac_mode = kwargs.get(ATTR_HVAC_MODE)
-        if hvac_mode == HVACMode.OFF:
+        if (hvac_mode := kwargs.get(ATTR_HVAC_MODE)) is HVACMode.OFF:
             await self.async_set_hvac_mode(hvac_mode)
-        elif target_temp is not None:
+        elif (target_temp := kwargs.get(ATTR_TEMPERATURE)) is not None:
+            if target_temp == OFF_API_TEMPERATURE:
+                target_temp = OFF_REPORT_SET_TEMPERATURE
+            elif target_temp == ON_API_TEMPERATURE:
+                target_temp = ON_REPORT_SET_TEMPERATURE
             await self.hass.async_add_executor_job(
-                self.data.set_target_temperature, target_temp
+                self.data.set_target_temperature, target_temp, True
             )
         else:
             return
@@ -169,12 +173,12 @@ class FritzboxThermostat(FritzBoxDeviceEntity, ClimateEntity):
                 translation_domain=DOMAIN,
                 translation_key="change_hvac_while_active_mode",
             )
-        if self.hvac_mode == hvac_mode:
+        if self.hvac_mode is hvac_mode:
             LOGGER.debug(
                 "%s is already in requested hvac mode %s", self.name, hvac_mode
             )
             return
-        if hvac_mode == HVACMode.OFF:
+        if hvac_mode is HVACMode.OFF:
             await self.async_set_temperature(temperature=OFF_REPORT_SET_TEMPERATURE)
         else:
             if value_scheduled_preset(self.data) == PRESET_ECO:
@@ -208,16 +212,6 @@ class FritzboxThermostat(FritzBoxDeviceEntity, ClimateEntity):
         elif preset_mode == PRESET_ECO:
             await self.async_set_temperature(temperature=self.data.eco_temperature)
 
-    @property
-    def min_temp(self) -> int:
-        """Return the minimum temperature."""
-        return MIN_TEMPERATURE
-
-    @property
-    def max_temp(self) -> int:
-        """Return the maximum temperature."""
-        return MAX_TEMPERATURE
-
     @property
     def extra_state_attributes(self) -> ClimateExtraAttributes:
         """Return the device specific state attributes."""
diff --git a/homeassistant/components/fritzbox/coordinator.py b/homeassistant/components/fritzbox/coordinator.py
index a6a30ffdc6a..34df3885deb 100644
--- a/homeassistant/components/fritzbox/coordinator.py
+++ b/homeassistant/components/fritzbox/coordinator.py
@@ -38,12 +38,13 @@ class FritzboxDataUpdateCoordinator(DataUpdateCoordinator[FritzboxCoordinatorDat
     fritz: Fritzhome
     has_templates: bool
 
-    def __init__(self, hass: HomeAssistant, name: str) -> None:
+    def __init__(self, hass: HomeAssistant, config_entry: FritzboxConfigEntry) -> None:
         """Initialize the Fritzbox Smarthome device coordinator."""
         super().__init__(
             hass,
             LOGGER,
-            name=name,
+            config_entry=config_entry,
+            name=config_entry.entry_id,
             update_interval=timedelta(seconds=30),
         )
 
diff --git a/homeassistant/components/fritzbox/cover.py b/homeassistant/components/fritzbox/cover.py
index de87d6f8852..c7ecfef6a32 100644
--- a/homeassistant/components/fritzbox/cover.py
+++ b/homeassistant/components/fritzbox/cover.py
@@ -11,7 +11,7 @@ from homeassistant.components.cover import (
     CoverEntityFeature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import FritzboxConfigEntry
 from .entity import FritzBoxDeviceEntity
@@ -20,7 +20,7 @@ from .entity import FritzBoxDeviceEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FritzboxConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the FRITZ!SmartHome cover from ConfigEntry."""
     coordinator = entry.runtime_data
@@ -71,21 +71,21 @@ class FritzboxCover(FritzBoxDeviceEntity, CoverEntity):
 
     async def async_open_cover(self, **kwargs: Any) -> None:
         """Open the cover."""
-        await self.hass.async_add_executor_job(self.data.set_blind_open)
+        await self.hass.async_add_executor_job(self.data.set_blind_open, True)
         await self.coordinator.async_refresh()
 
     async def async_close_cover(self, **kwargs: Any) -> None:
         """Close the cover."""
-        await self.hass.async_add_executor_job(self.data.set_blind_close)
+        await self.hass.async_add_executor_job(self.data.set_blind_close, True)
         await self.coordinator.async_refresh()
 
     async def async_set_cover_position(self, **kwargs: Any) -> None:
         """Move the cover to a specific position."""
         await self.hass.async_add_executor_job(
-            self.data.set_level_percentage, 100 - kwargs[ATTR_POSITION]
+            self.data.set_level_percentage, 100 - kwargs[ATTR_POSITION], True
         )
 
     async def async_stop_cover(self, **kwargs: Any) -> None:
         """Stop the cover."""
-        await self.hass.async_add_executor_job(self.data.set_blind_stop)
+        await self.hass.async_add_executor_job(self.data.set_blind_stop, True)
         await self.coordinator.async_refresh()
diff --git a/homeassistant/components/fritzbox/light.py b/homeassistant/components/fritzbox/light.py
index 36cb7dc8cff..8603840630c 100644
--- a/homeassistant/components/fritzbox/light.py
+++ b/homeassistant/components/fritzbox/light.py
@@ -4,8 +4,6 @@ from __future__ import annotations
 
 from typing import Any, cast
 
-from requests.exceptions import HTTPError
-
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
     ATTR_COLOR_TEMP_KELVIN,
@@ -14,7 +12,7 @@ from homeassistant.components.light import (
     LightEntity,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import COLOR_MODE, LOGGER
 from .coordinator import FritzboxConfigEntry, FritzboxDataUpdateCoordinator
@@ -24,7 +22,7 @@ from .entity import FritzBoxDeviceEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FritzboxConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the FRITZ!SmartHome light from ConfigEntry."""
     coordinator = entry.runtime_data
@@ -122,26 +120,24 @@ class FritzboxLight(FritzBoxDeviceEntity, LightEntity):
         """Turn the light on."""
         if kwargs.get(ATTR_BRIGHTNESS) is not None:
             level = kwargs[ATTR_BRIGHTNESS]
-            await self.hass.async_add_executor_job(self.data.set_level, level)
+            await self.hass.async_add_executor_job(self.data.set_level, level, True)
         if kwargs.get(ATTR_HS_COLOR) is not None:
-            # Try setunmappedcolor first. This allows free color selection,
-            # but we don't know if its supported by all devices.
-            try:
-                # HA gives 0..360 for hue, fritz light only supports 0..359
-                unmapped_hue = int(kwargs[ATTR_HS_COLOR][0] % 360)
-                unmapped_saturation = round(
-                    cast(float, kwargs[ATTR_HS_COLOR][1]) * 255.0 / 100.0
-                )
+            # HA gives 0..360 for hue, fritz light only supports 0..359
+            unmapped_hue = int(kwargs[ATTR_HS_COLOR][0] % 360)
+            unmapped_saturation = round(
+                cast(float, kwargs[ATTR_HS_COLOR][1]) * 255.0 / 100.0
+            )
+            if self.data.fullcolorsupport:
+                LOGGER.debug("device has fullcolorsupport, using 'setunmappedcolor'")
                 await self.hass.async_add_executor_job(
-                    self.data.set_unmapped_color, (unmapped_hue, unmapped_saturation)
+                    self.data.set_unmapped_color,
+                    (unmapped_hue, unmapped_saturation),
+                    0,
+                    True,
                 )
-            # This will raise 400 BAD REQUEST if the setunmappedcolor is not available
-            except HTTPError as err:
-                if err.response.status_code != 400:
-                    raise
+            else:
                 LOGGER.debug(
-                    "fritzbox does not support method 'setunmappedcolor', fallback to"
-                    " 'setcolor'"
+                    "device has no fullcolorsupport, using supported colors with 'setcolor'"
                 )
                 # find supported hs values closest to what user selected
                 hue = min(
@@ -152,18 +148,18 @@ class FritzboxLight(FritzBoxDeviceEntity, LightEntity):
                     key=lambda x: abs(x - unmapped_saturation),
                 )
                 await self.hass.async_add_executor_job(
-                    self.data.set_color, (hue, saturation)
+                    self.data.set_color, (hue, saturation), 0, True
                 )
 
         if kwargs.get(ATTR_COLOR_TEMP_KELVIN) is not None:
             await self.hass.async_add_executor_job(
-                self.data.set_color_temp, kwargs[ATTR_COLOR_TEMP_KELVIN]
+                self.data.set_color_temp, kwargs[ATTR_COLOR_TEMP_KELVIN], 0, True
             )
 
-        await self.hass.async_add_executor_job(self.data.set_state_on)
+        await self.hass.async_add_executor_job(self.data.set_state_on, True)
         await self.coordinator.async_refresh()
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the light off."""
-        await self.hass.async_add_executor_job(self.data.set_state_off)
+        await self.hass.async_add_executor_job(self.data.set_state_off, True)
         await self.coordinator.async_refresh()
diff --git a/homeassistant/components/fritzbox/manifest.json b/homeassistant/components/fritzbox/manifest.json
index 1a127597b81..f6155024cbf 100644
--- a/homeassistant/components/fritzbox/manifest.json
+++ b/homeassistant/components/fritzbox/manifest.json
@@ -7,7 +7,7 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["pyfritzhome"],
-  "requirements": ["pyfritzhome==0.6.12"],
+  "requirements": ["pyfritzhome==0.6.17"],
   "ssdp": [
     {
       "st": "urn:schemas-upnp-org:device:fritzbox:1"
diff --git a/homeassistant/components/fritzbox/sensor.py b/homeassistant/components/fritzbox/sensor.py
index e610fd80f3e..bed7004bd6a 100644
--- a/homeassistant/components/fritzbox/sensor.py
+++ b/homeassistant/components/fritzbox/sensor.py
@@ -26,7 +26,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util.dt import utc_from_timestamp
 
@@ -229,7 +229,7 @@ SENSOR_TYPES: Final[tuple[FritzSensorEntityDescription, ...]] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FritzboxConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the FRITZ!SmartHome sensor from ConfigEntry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/fritzbox/strings.json b/homeassistant/components/fritzbox/strings.json
index c7c2439b566..e0df30875bc 100644
--- a/homeassistant/components/fritzbox/strings.json
+++ b/homeassistant/components/fritzbox/strings.json
@@ -89,7 +89,7 @@
       "message": "Can't change preset while holiday or summer mode is active on the device."
     },
     "change_hvac_while_active_mode": {
-      "message": "Can't change hvac mode while holiday or summer mode is active on the device."
+      "message": "Can't change HVAC mode while holiday or summer mode is active on the device."
     }
   }
 }
diff --git a/homeassistant/components/fritzbox/switch.py b/homeassistant/components/fritzbox/switch.py
index 18b676d449e..c2679ef5243 100644
--- a/homeassistant/components/fritzbox/switch.py
+++ b/homeassistant/components/fritzbox/switch.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import FritzboxConfigEntry
@@ -17,7 +17,7 @@ from .entity import FritzBoxDeviceEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FritzboxConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the FRITZ!SmartHome switch from ConfigEntry."""
     coordinator = entry.runtime_data
@@ -51,13 +51,13 @@ class FritzboxSwitch(FritzBoxDeviceEntity, SwitchEntity):
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the switch on."""
         self.check_lock_state()
-        await self.hass.async_add_executor_job(self.data.set_switch_state_on)
+        await self.hass.async_add_executor_job(self.data.set_switch_state_on, True)
         await self.coordinator.async_refresh()
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the switch off."""
         self.check_lock_state()
-        await self.hass.async_add_executor_job(self.data.set_switch_state_off)
+        await self.hass.async_add_executor_job(self.data.set_switch_state_off, True)
         await self.coordinator.async_refresh()
 
     def check_lock_state(self) -> None:
diff --git a/homeassistant/components/fritzbox_callmonitor/sensor.py b/homeassistant/components/fritzbox_callmonitor/sensor.py
index df18ae5702a..574ae9ef7f2 100644
--- a/homeassistant/components/fritzbox_callmonitor/sensor.py
+++ b/homeassistant/components/fritzbox_callmonitor/sensor.py
@@ -17,7 +17,7 @@ from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.const import CONF_HOST, CONF_PORT, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import Event, HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import FritzBoxCallMonitorConfigEntry
 from .base import Contact, FritzBoxPhonebook
@@ -48,7 +48,7 @@ class CallState(StrEnum):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: FritzBoxCallMonitorConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the fritzbox_callmonitor sensor from config_entry."""
     fritzbox_phonebook = config_entry.runtime_data
diff --git a/homeassistant/components/fronius/config_flow.py b/homeassistant/components/fronius/config_flow.py
index f35c9ce5bc1..b8aa2da81c6 100644
--- a/homeassistant/components/fronius/config_flow.py
+++ b/homeassistant/components/fronius/config_flow.py
@@ -149,7 +149,7 @@ class FroniusConfigFlow(ConfigFlow, domain=DOMAIN):
                 unique_id, info = await validate_host(self.hass, user_input[CONF_HOST])
             except CannotConnect:
                 errors["base"] = "cannot_connect"
-            except Exception:  # pylint: disable=broad-except
+            except Exception:
                 _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
diff --git a/homeassistant/components/fronius/manifest.json b/homeassistant/components/fronius/manifest.json
index 94d0f90b0bd..661d808ad23 100644
--- a/homeassistant/components/fronius/manifest.json
+++ b/homeassistant/components/fronius/manifest.json
@@ -11,6 +11,6 @@
   "documentation": "https://www.home-assistant.io/integrations/fronius",
   "iot_class": "local_polling",
   "loggers": ["pyfronius"],
-  "quality_scale": "gold",
-  "requirements": ["PyFronius==0.7.3"]
+  "quality_scale": "platinum",
+  "requirements": ["PyFronius==0.7.7"]
 }
diff --git a/homeassistant/components/fronius/quality_scale.yaml b/homeassistant/components/fronius/quality_scale.yaml
index 2c4b892475b..522b8ab571f 100644
--- a/homeassistant/components/fronius/quality_scale.yaml
+++ b/homeassistant/components/fronius/quality_scale.yaml
@@ -83,7 +83,4 @@ rules:
   # Platinum
   async-dependency: done
   inject-websession: done
-  strict-typing:
-    status: todo
-    comment: |
-      The pyfronius library isn't strictly typed and doesn't export type information.
+  strict-typing: done
diff --git a/homeassistant/components/fronius/sensor.py b/homeassistant/components/fronius/sensor.py
index c6c3ff4b602..c65f6072ba6 100644
--- a/homeassistant/components/fronius/sensor.py
+++ b/homeassistant/components/fronius/sensor.py
@@ -27,7 +27,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -64,7 +64,7 @@ ENERGY_VOLT_AMPERE_REACTIVE_HOUR: Final = "varh"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: FroniusConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Fronius sensor entities based on a config entry."""
     solar_net = config_entry.runtime_data
diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index 050d57fc358..9a0627f9f42 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -26,8 +26,7 @@ from homeassistant.const import (
     EVENT_THEMES_UPDATED,
 )
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.helpers import service
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, service
 from homeassistant.helpers.icon import async_get_icons
 from homeassistant.helpers.json import json_dumps_sorted
 from homeassistant.helpers.storage import Store
@@ -53,10 +52,9 @@ CONF_JS_VERSION = "javascript_version"
 DEFAULT_THEME_COLOR = "#03A9F4"
 
 
-DATA_PANELS = "frontend_panels"
-DATA_JS_VERSION = "frontend_js_version"
-DATA_EXTRA_MODULE_URL = "frontend_extra_module_url"
-DATA_EXTRA_JS_URL_ES5 = "frontend_extra_js_url_es5"
+DATA_PANELS: HassKey[dict[str, Panel]] = HassKey("frontend_panels")
+DATA_EXTRA_MODULE_URL: HassKey[UrlManager] = HassKey("frontend_extra_module_url")
+DATA_EXTRA_JS_URL_ES5: HassKey[UrlManager] = HassKey("frontend_extra_js_url_es5")
 
 DATA_WS_SUBSCRIBERS: HassKey[set[tuple[websocket_api.ActiveConnection, int]]] = HassKey(
     "frontend_ws_subscribers"
@@ -65,8 +63,8 @@ DATA_WS_SUBSCRIBERS: HassKey[set[tuple[websocket_api.ActiveConnection, int]]] =
 THEMES_STORAGE_KEY = f"{DOMAIN}_theme"
 THEMES_STORAGE_VERSION = 1
 THEMES_SAVE_DELAY = 60
-DATA_THEMES_STORE = "frontend_themes_store"
-DATA_THEMES = "frontend_themes"
+DATA_THEMES_STORE: HassKey[Store] = HassKey("frontend_themes_store")
+DATA_THEMES: HassKey[dict[str, Any]] = HassKey("frontend_themes")
 DATA_DEFAULT_THEME = "frontend_default_theme"
 DATA_DEFAULT_DARK_THEME = "frontend_default_dark_theme"
 DEFAULT_THEME = "default"
@@ -243,7 +241,7 @@ class Panel:
     sidebar_title: str | None = None
 
     # Url to show the panel in the frontend
-    frontend_url_path: str | None = None
+    frontend_url_path: str
 
     # Config to pass to the webcomponent
     config: dict[str, Any] | None = None
@@ -274,7 +272,7 @@ class Panel:
         self.config_panel_domain = config_panel_domain
 
     @callback
-    def to_response(self) -> PanelRespons:
+    def to_response(self) -> PanelResponse:
         """Panel as dictionary."""
         return {
             "component_name": self.component_name,
@@ -632,7 +630,8 @@ class IndexView(web_urldispatcher.AbstractResource):
 
     def get_info(self) -> dict[str, list[str]]:  # type: ignore[override]
         """Return a dict with additional info useful for introspection."""
-        return {"panels": list(self.hass.data[DATA_PANELS])}
+        panels = self.hass.data[DATA_PANELS]
+        return {"panels": list(panels)}
 
     def raw_match(self, path: str) -> bool:
         """Perform a raw match against path."""
@@ -842,13 +841,13 @@ def websocket_subscribe_extra_js(
     connection.send_message(websocket_api.result_message(msg["id"]))
 
 
-class PanelRespons(TypedDict):
+class PanelResponse(TypedDict):
     """Represent the panel response type."""
 
     component_name: str
     icon: str | None
     title: str | None
     config: dict[str, Any] | None
-    url_path: str | None
+    url_path: str
     require_admin: bool
     config_panel_domain: str | None
diff --git a/homeassistant/components/frontend/manifest.json b/homeassistant/components/frontend/manifest.json
index 2724569d1ed..ee4db01a6f3 100644
--- a/homeassistant/components/frontend/manifest.json
+++ b/homeassistant/components/frontend/manifest.json
@@ -1,7 +1,6 @@
 {
   "domain": "frontend",
   "name": "Home Assistant Frontend",
-  "after_dependencies": ["backup"],
   "codeowners": ["@home-assistant/frontend"],
   "dependencies": [
     "api",
@@ -21,5 +20,5 @@
   "documentation": "https://www.home-assistant.io/integrations/frontend",
   "integration_type": "system",
   "quality_scale": "internal",
-  "requirements": ["home-assistant-frontend==20250109.2"]
+  "requirements": ["home-assistant-frontend==20250327.0"]
 }
diff --git a/homeassistant/components/frontend/storage.py b/homeassistant/components/frontend/storage.py
index cbcc3024aa7..a33a9de7ac5 100644
--- a/homeassistant/components/frontend/storage.py
+++ b/homeassistant/components/frontend/storage.py
@@ -12,8 +12,11 @@ from homeassistant.components import websocket_api
 from homeassistant.components.websocket_api import ActiveConnection
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.storage import Store
+from homeassistant.util.hass_dict import HassKey
 
-DATA_STORAGE = "frontend_storage"
+DATA_STORAGE: HassKey[tuple[dict[str, Store], dict[str, dict]]] = HassKey(
+    "frontend_storage"
+)
 STORAGE_VERSION_USER_DATA = 1
 
 
diff --git a/homeassistant/components/frontier_silicon/__init__.py b/homeassistant/components/frontier_silicon/__init__.py
index 325af100005..71196c13f68 100644
--- a/homeassistant/components/frontier_silicon/__init__.py
+++ b/homeassistant/components/frontier_silicon/__init__.py
@@ -11,14 +11,18 @@ from homeassistant.const import CONF_PIN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 
-from .const import CONF_WEBFSAPI_URL, DOMAIN
+from .const import CONF_WEBFSAPI_URL
 
 PLATFORMS = [Platform.MEDIA_PLAYER]
 
 _LOGGER = logging.getLogger(__name__)
 
+type FrontierSiliconConfigEntry = ConfigEntry[AFSAPI]
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: FrontierSiliconConfigEntry
+) -> bool:
     """Set up Frontier Silicon from a config entry."""
 
     webfsapi_url = entry.data[CONF_WEBFSAPI_URL]
@@ -31,16 +35,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     except FSConnectionError as exception:
         raise ConfigEntryNotReady from exception
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = afsapi
+    entry.runtime_data = afsapi
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, entry: FrontierSiliconConfigEntry
+) -> bool:
     """Unload a config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/frontier_silicon/config_flow.py b/homeassistant/components/frontier_silicon/config_flow.py
index f6514da28ff..dc4f6bea989 100644
--- a/homeassistant/components/frontier_silicon/config_flow.py
+++ b/homeassistant/components/frontier_silicon/config_flow.py
@@ -108,8 +108,8 @@ class FrontierSiliconConfigFlow(ConfigFlow, domain=DOMAIN):
             self._webfsapi_url = await AFSAPI.get_webfsapi_endpoint(device_url)
         except FSConnectionError:
             return self.async_abort(reason="cannot_connect")
-        except Exception as exception:  # noqa: BLE001
-            _LOGGER.debug(exception)
+        except Exception:
+            _LOGGER.exception("Unexpected exception")
             return self.async_abort(reason="unknown")
 
         # try to login with default pin
diff --git a/homeassistant/components/frontier_silicon/media_player.py b/homeassistant/components/frontier_silicon/media_player.py
index 8407e0a869d..4f5e55d1536 100644
--- a/homeassistant/components/frontier_silicon/media_player.py
+++ b/homeassistant/components/frontier_silicon/media_player.py
@@ -20,11 +20,11 @@ from homeassistant.components.media_player import (
     MediaPlayerState,
     MediaType,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import FrontierSiliconConfigEntry
 from .browse_media import browse_node, browse_top_level
 from .const import DOMAIN, MEDIA_CONTENT_ID_PRESET
 
@@ -33,12 +33,12 @@ _LOGGER = logging.getLogger(__name__)
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: FrontierSiliconConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Frontier Silicon entity."""
 
-    afsapi: AFSAPI = hass.data[DOMAIN][config_entry.entry_id]
+    afsapi = config_entry.runtime_data
 
     async_add_entities(
         [
@@ -244,7 +244,7 @@ class AFSAPIDevice(MediaPlayerEntity):
         """Send volume up command."""
         volume = await self.fs_device.get_volume()
         volume = int(volume or 0) + 1
-        await self.fs_device.set_volume(min(volume, self._max_volume))
+        await self.fs_device.set_volume(min(volume, self._max_volume or 1))
 
     async def async_volume_down(self) -> None:
         """Send volume down command."""
diff --git a/homeassistant/components/fujitsu_fglair/__init__.py b/homeassistant/components/fujitsu_fglair/__init__.py
index 547545e4feb..699356a2e75 100644
--- a/homeassistant/components/fujitsu_fglair/__init__.py
+++ b/homeassistant/components/fujitsu_fglair/__init__.py
@@ -7,18 +7,15 @@ from contextlib import suppress
 from ayla_iot_unofficial import new_ayla_api
 from ayla_iot_unofficial.fujitsu_consts import FGLAIR_APP_CREDENTIALS
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import aiohttp_client
 
 from .const import API_TIMEOUT, CONF_EUROPE, CONF_REGION, REGION_DEFAULT, REGION_EU
-from .coordinator import FGLairCoordinator
+from .coordinator import FGLairConfigEntry, FGLairCoordinator
 
 PLATFORMS: list[Platform] = [Platform.CLIMATE, Platform.SENSOR]
 
-type FGLairConfigEntry = ConfigEntry[FGLairCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: FGLairConfigEntry) -> bool:
     """Set up Fujitsu HVAC (based on Ayla IOT) from a config entry."""
@@ -33,7 +30,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: FGLairConfigEntry) -> bo
         timeout=API_TIMEOUT,
     )
 
-    coordinator = FGLairCoordinator(hass, api)
+    coordinator = FGLairCoordinator(hass, entry, api)
     await coordinator.async_config_entry_first_refresh()
 
     entry.runtime_data = coordinator
diff --git a/homeassistant/components/fujitsu_fglair/climate.py b/homeassistant/components/fujitsu_fglair/climate.py
index c0f5ab7dce4..bf1df07823c 100644
--- a/homeassistant/components/fujitsu_fglair/climate.py
+++ b/homeassistant/components/fujitsu_fglair/climate.py
@@ -25,10 +25,9 @@ from homeassistant.components.climate import (
 )
 from homeassistant.const import ATTR_TEMPERATURE, PRECISION_HALVES, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import FGLairConfigEntry
-from .coordinator import FGLairCoordinator
+from .coordinator import FGLairConfigEntry, FGLairCoordinator
 from .entity import FGLairEntity
 
 HA_TO_FUJI_FAN = {
@@ -61,7 +60,7 @@ FUJI_TO_HA_SWING = {value: key for key, value in HA_TO_FUJI_SWING.items()}
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FGLairConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up one Fujitsu HVAC device."""
     async_add_entities(
diff --git a/homeassistant/components/fujitsu_fglair/config_flow.py b/homeassistant/components/fujitsu_fglair/config_flow.py
index c4b097ff0de..9369fd7b7cd 100644
--- a/homeassistant/components/fujitsu_fglair/config_flow.py
+++ b/homeassistant/components/fujitsu_fglair/config_flow.py
@@ -62,7 +62,7 @@ class FGLairConfigFlow(ConfigFlow, domain=DOMAIN):
             errors["base"] = "cannot_connect"
         except AylaAuthError:
             errors["base"] = "invalid_auth"
-        except Exception:  # pylint: disable=broad-except
+        except Exception:
             _LOGGER.exception("Unexpected exception")
             errors["base"] = "unknown"
 
diff --git a/homeassistant/components/fujitsu_fglair/coordinator.py b/homeassistant/components/fujitsu_fglair/coordinator.py
index d98464e4751..8c66548973b 100644
--- a/homeassistant/components/fujitsu_fglair/coordinator.py
+++ b/homeassistant/components/fujitsu_fglair/coordinator.py
@@ -5,6 +5,7 @@ import logging
 from ayla_iot_unofficial import AylaApi, AylaAuthError
 from ayla_iot_unofficial.fujitsu_hvac import FujitsuHVAC
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
@@ -13,15 +14,22 @@ from .const import API_REFRESH
 
 _LOGGER = logging.getLogger(__name__)
 
+type FGLairConfigEntry = ConfigEntry[FGLairCoordinator]
+
 
 class FGLairCoordinator(DataUpdateCoordinator[dict[str, FujitsuHVAC]]):
     """Coordinator for Fujitsu HVAC integration."""
 
-    def __init__(self, hass: HomeAssistant, api: AylaApi) -> None:
+    config_entry: FGLairConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: FGLairConfigEntry, api: AylaApi
+    ) -> None:
         """Initialize coordinator for Fujitsu HVAC integration."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="Fujitsu HVAC data",
             update_interval=API_REFRESH,
         )
diff --git a/homeassistant/components/fujitsu_fglair/manifest.json b/homeassistant/components/fujitsu_fglair/manifest.json
index 330685f89fc..c8fed9b45c9 100644
--- a/homeassistant/components/fujitsu_fglair/manifest.json
+++ b/homeassistant/components/fujitsu_fglair/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/fujitsu_fglair",
   "iot_class": "cloud_polling",
-  "requirements": ["ayla-iot-unofficial==1.4.5"]
+  "requirements": ["ayla-iot-unofficial==1.4.7"]
 }
diff --git a/homeassistant/components/fujitsu_fglair/sensor.py b/homeassistant/components/fujitsu_fglair/sensor.py
index 1426e2349ea..3bb693e1068 100644
--- a/homeassistant/components/fujitsu_fglair/sensor.py
+++ b/homeassistant/components/fujitsu_fglair/sensor.py
@@ -9,22 +9,22 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .climate import FGLairConfigEntry
-from .coordinator import FGLairCoordinator
+from .coordinator import FGLairConfigEntry, FGLairCoordinator
 from .entity import FGLairEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FGLairConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up one Fujitsu HVAC device."""
     async_add_entities(
         FGLairOutsideTemperature(entry.runtime_data, device)
         for device in entry.runtime_data.data.values()
+        if device.outdoor_temperature is not None
     )
 
 
diff --git a/homeassistant/components/fully_kiosk/__init__.py b/homeassistant/components/fully_kiosk/__init__.py
index 074ec3feaa0..772e7f79242 100644
--- a/homeassistant/components/fully_kiosk/__init__.py
+++ b/homeassistant/components/fully_kiosk/__init__.py
@@ -1,17 +1,14 @@
 """The Fully Kiosk Browser integration."""
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
-from .coordinator import FullyKioskDataUpdateCoordinator
+from .coordinator import FullyKioskConfigEntry, FullyKioskDataUpdateCoordinator
 from .services import async_setup_services
 
-type FullyKioskConfigEntry = ConfigEntry[FullyKioskDataUpdateCoordinator]
-
 PLATFORMS = [
     Platform.BINARY_SENSOR,
     Platform.BUTTON,
diff --git a/homeassistant/components/fully_kiosk/binary_sensor.py b/homeassistant/components/fully_kiosk/binary_sensor.py
index c039baa0397..8a25376f635 100644
--- a/homeassistant/components/fully_kiosk/binary_sensor.py
+++ b/homeassistant/components/fully_kiosk/binary_sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import FullyKioskConfigEntry
 from .coordinator import FullyKioskDataUpdateCoordinator
@@ -38,7 +38,7 @@ SENSORS: tuple[BinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: FullyKioskConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Fully Kiosk Browser sensor."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/fully_kiosk/button.py b/homeassistant/components/fully_kiosk/button.py
index 4b172d45ae2..112ead983b9 100644
--- a/homeassistant/components/fully_kiosk/button.py
+++ b/homeassistant/components/fully_kiosk/button.py
@@ -15,7 +15,7 @@ from homeassistant.components.button import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import FullyKioskConfigEntry
 from .coordinator import FullyKioskDataUpdateCoordinator
@@ -68,7 +68,7 @@ BUTTONS: tuple[FullyButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: FullyKioskConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Fully Kiosk Browser button entities."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/fully_kiosk/camera.py b/homeassistant/components/fully_kiosk/camera.py
index 7dfbe9e9257..6357660f8e8 100644
--- a/homeassistant/components/fully_kiosk/camera.py
+++ b/homeassistant/components/fully_kiosk/camera.py
@@ -7,7 +7,7 @@ from fullykiosk import FullyKioskError
 from homeassistant.components.camera import Camera, CameraEntityFeature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import FullyKioskConfigEntry
 from .coordinator import FullyKioskDataUpdateCoordinator
@@ -17,7 +17,7 @@ from .entity import FullyKioskEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FullyKioskConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the cameras."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/fully_kiosk/coordinator.py b/homeassistant/components/fully_kiosk/coordinator.py
index 405f0746437..dc3640020be 100644
--- a/homeassistant/components/fully_kiosk/coordinator.py
+++ b/homeassistant/components/fully_kiosk/coordinator.py
@@ -14,11 +14,15 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .const import DEFAULT_PORT, LOGGER, UPDATE_INTERVAL
 
+type FullyKioskConfigEntry = ConfigEntry[FullyKioskDataUpdateCoordinator]
+
 
 class FullyKioskDataUpdateCoordinator(DataUpdateCoordinator):
     """Define an object to hold Fully Kiosk Browser data."""
 
-    def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
+    config_entry: FullyKioskConfigEntry
+
+    def __init__(self, hass: HomeAssistant, entry: FullyKioskConfigEntry) -> None:
         """Initialize."""
         self.use_ssl = entry.data.get(CONF_SSL, False)
         self.fully = FullyKiosk(
@@ -32,6 +36,7 @@ class FullyKioskDataUpdateCoordinator(DataUpdateCoordinator):
         super().__init__(
             hass,
             LOGGER,
+            config_entry=entry,
             name=entry.data[CONF_HOST],
             update_interval=UPDATE_INTERVAL,
         )
diff --git a/homeassistant/components/fully_kiosk/image.py b/homeassistant/components/fully_kiosk/image.py
index 00318a77ab5..158eae8671c 100644
--- a/homeassistant/components/fully_kiosk/image.py
+++ b/homeassistant/components/fully_kiosk/image.py
@@ -11,8 +11,8 @@ from fullykiosk import FullyKiosk, FullyKioskError
 from homeassistant.components.image import ImageEntity, ImageEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from . import FullyKioskConfigEntry
 from .coordinator import FullyKioskDataUpdateCoordinator
@@ -38,7 +38,7 @@ IMAGES: tuple[FullyImageEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FullyKioskConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Fully Kiosk Browser image entities."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/fully_kiosk/media_player.py b/homeassistant/components/fully_kiosk/media_player.py
index 24f002a7544..f6333a2941d 100644
--- a/homeassistant/components/fully_kiosk/media_player.py
+++ b/homeassistant/components/fully_kiosk/media_player.py
@@ -14,7 +14,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import FullyKioskConfigEntry
 from .const import AUDIOMANAGER_STREAM_MUSIC, MEDIA_SUPPORT_FULLYKIOSK
@@ -25,7 +25,7 @@ from .entity import FullyKioskEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: FullyKioskConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Fully Kiosk Browser media player entity."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/fully_kiosk/notify.py b/homeassistant/components/fully_kiosk/notify.py
index bddc07439b3..0a0c24c60e2 100644
--- a/homeassistant/components/fully_kiosk/notify.py
+++ b/homeassistant/components/fully_kiosk/notify.py
@@ -9,7 +9,7 @@ from fullykiosk import FullyKioskError
 from homeassistant.components.notify import NotifyEntity, NotifyEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import FullyKioskConfigEntry
 from .coordinator import FullyKioskDataUpdateCoordinator
@@ -40,7 +40,7 @@ NOTIFIERS: tuple[FullyNotifyEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FullyKioskConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Fully Kiosk Browser notify entities."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/fully_kiosk/number.py b/homeassistant/components/fully_kiosk/number.py
index ef25a69f1ee..8c386e85418 100644
--- a/homeassistant/components/fully_kiosk/number.py
+++ b/homeassistant/components/fully_kiosk/number.py
@@ -7,7 +7,7 @@ from contextlib import suppress
 from homeassistant.components.number import NumberEntity, NumberEntityDescription
 from homeassistant.const import EntityCategory, UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import FullyKioskConfigEntry
 from .coordinator import FullyKioskDataUpdateCoordinator
@@ -54,7 +54,7 @@ ENTITY_TYPES: tuple[NumberEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: FullyKioskConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Fully Kiosk Browser number entities."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/fully_kiosk/sensor.py b/homeassistant/components/fully_kiosk/sensor.py
index ed95323547f..6094a6c4c23 100644
--- a/homeassistant/components/fully_kiosk/sensor.py
+++ b/homeassistant/components/fully_kiosk/sensor.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfInformation
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import FullyKioskConfigEntry
@@ -114,7 +114,7 @@ SENSORS: tuple[FullySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: FullyKioskConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Fully Kiosk Browser sensor."""
     coordinator = config_entry.runtime_data
@@ -152,6 +152,8 @@ class FullySensor(FullyKioskEntity, SensorEntity):
                 value, extra_state_attributes = self.entity_description.state_fn(value)
 
             if self.entity_description.round_state_value:
+                if TYPE_CHECKING:
+                    assert isinstance(value, int)
                 value = round_storage(value)
 
         self._attr_native_value = value
diff --git a/homeassistant/components/fully_kiosk/services.py b/homeassistant/components/fully_kiosk/services.py
index 089ae1d4246..ac6faf76a9d 100644
--- a/homeassistant/components/fully_kiosk/services.py
+++ b/homeassistant/components/fully_kiosk/services.py
@@ -8,8 +8,7 @@ from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.const import ATTR_DEVICE_ID
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import config_validation as cv, device_registry as dr
 
 from .const import (
     ATTR_APPLICATION,
diff --git a/homeassistant/components/fully_kiosk/strings.json b/homeassistant/components/fully_kiosk/strings.json
index a4b466926f0..5841456c034 100644
--- a/homeassistant/components/fully_kiosk/strings.json
+++ b/homeassistant/components/fully_kiosk/strings.json
@@ -1,6 +1,6 @@
 {
   "common": {
-    "data_description_password": "The Remote Admin Password from the Fully Kiosk Browser app settings.",
+    "data_description_password": "The Remote Admin password from the Fully Kiosk Browser app settings.",
     "data_description_ssl": "Is the Fully Kiosk app configured to require SSL for the connection?",
     "data_description_verify_ssl": "Should SSL certificartes be verified? This should be off for self-signed certificates."
   },
@@ -151,7 +151,7 @@
       }
     },
     "set_config": {
-      "name": "Set Configuration",
+      "name": "Set configuration",
       "description": "Sets a configuration parameter on Fully Kiosk Browser.",
       "fields": {
         "key": {
@@ -165,7 +165,7 @@
       }
     },
     "start_application": {
-      "name": "Start Application",
+      "name": "Start application",
       "description": "Starts an application on the device running Fully Kiosk Browser.",
       "fields": {
         "application": {
diff --git a/homeassistant/components/fully_kiosk/switch.py b/homeassistant/components/fully_kiosk/switch.py
index 4adf8e8c924..804233dcc9e 100644
--- a/homeassistant/components/fully_kiosk/switch.py
+++ b/homeassistant/components/fully_kiosk/switch.py
@@ -11,7 +11,7 @@ from fullykiosk import FullyKiosk
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import FullyKioskConfigEntry
 from .coordinator import FullyKioskDataUpdateCoordinator
@@ -84,7 +84,7 @@ SWITCHES: tuple[FullySwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: FullyKioskConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Fully Kiosk Browser switch."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/futurenow/light.py b/homeassistant/components/futurenow/light.py
index d1ad6f42083..e9dcfd7a151 100644
--- a/homeassistant/components/futurenow/light.py
+++ b/homeassistant/components/futurenow/light.py
@@ -15,7 +15,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import CONF_DEVICES, CONF_HOST, CONF_NAME, CONF_PORT
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/fyta/__init__.py b/homeassistant/components/fyta/__init__.py
index 77724e3f673..1b00afc9c80 100644
--- a/homeassistant/components/fyta/__init__.py
+++ b/homeassistant/components/fyta/__init__.py
@@ -7,7 +7,6 @@ import logging
 
 from fyta_cli.fyta_connector import FytaConnector
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_ACCESS_TOKEN,
     CONF_PASSWORD,
@@ -19,15 +18,15 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.util.dt import async_get_time_zone
 
 from .const import CONF_EXPIRATION
-from .coordinator import FytaCoordinator
+from .coordinator import FytaConfigEntry, FytaCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
+    Platform.IMAGE,
     Platform.SENSOR,
 ]
-type FytaConfigEntry = ConfigEntry[FytaCoordinator]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: FytaConfigEntry) -> bool:
@@ -45,7 +44,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: FytaConfigEntry) -> bool
         username, password, access_token, expiration, tz, async_get_clientsession(hass)
     )
 
-    coordinator = FytaCoordinator(hass, fyta)
+    coordinator = FytaCoordinator(hass, entry, fyta)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/fyta/binary_sensor.py b/homeassistant/components/fyta/binary_sensor.py
index bcef609d01a..ac092f1d9cb 100644
--- a/homeassistant/components/fyta/binary_sensor.py
+++ b/homeassistant/components/fyta/binary_sensor.py
@@ -15,9 +15,9 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import FytaConfigEntry
+from .coordinator import FytaConfigEntry
 from .entity import FytaPlantEntity
 
 
@@ -83,7 +83,9 @@ BINARY_SENSORS: Final[list[FytaBinarySensorEntityDescription]] = [
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: FytaConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: FytaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the FYTA binary sensors."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/fyta/config_flow.py b/homeassistant/components/fyta/config_flow.py
index 78cb7647785..9c5ab1de405 100644
--- a/homeassistant/components/fyta/config_flow.py
+++ b/homeassistant/components/fyta/config_flow.py
@@ -65,8 +65,8 @@ class FytaConfigFlow(ConfigFlow, domain=DOMAIN):
             return {"base": "invalid_auth"}
         except FytaPasswordError:
             return {"base": "invalid_auth", CONF_PASSWORD: "password_error"}
-        except Exception as e:  # noqa: BLE001
-            _LOGGER.error(e)
+        except Exception:
+            _LOGGER.exception("Unexpected exception")
             return {"base": "unknown"}
         finally:
             await fyta.client.close()
diff --git a/homeassistant/components/fyta/coordinator.py b/homeassistant/components/fyta/coordinator.py
index 553960bdcc6..012ed3b2af0 100644
--- a/homeassistant/components/fyta/coordinator.py
+++ b/homeassistant/components/fyta/coordinator.py
@@ -5,7 +5,6 @@ from __future__ import annotations
 from collections.abc import Callable
 from datetime import datetime, timedelta
 import logging
-from typing import TYPE_CHECKING
 
 from fyta_cli.fyta_connector import FytaConnector
 from fyta_cli.fyta_exceptions import (
@@ -16,30 +15,33 @@ from fyta_cli.fyta_exceptions import (
 )
 from fyta_cli.fyta_models import Plant
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ACCESS_TOKEN
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import CONF_EXPIRATION, DOMAIN
 
-if TYPE_CHECKING:
-    from . import FytaConfigEntry
-
 _LOGGER = logging.getLogger(__name__)
 
+type FytaConfigEntry = ConfigEntry[FytaCoordinator]
+
 
 class FytaCoordinator(DataUpdateCoordinator[dict[int, Plant]]):
     """Fyta custom coordinator."""
 
     config_entry: FytaConfigEntry
 
-    def __init__(self, hass: HomeAssistant, fyta: FytaConnector) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: FytaConfigEntry, fyta: FytaConnector
+    ) -> None:
         """Initialize my coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="FYTA Coordinator",
             update_interval=timedelta(minutes=4),
         )
diff --git a/homeassistant/components/fyta/diagnostics.py b/homeassistant/components/fyta/diagnostics.py
index d02f8cacfa3..d6bda70d754 100644
--- a/homeassistant/components/fyta/diagnostics.py
+++ b/homeassistant/components/fyta/diagnostics.py
@@ -8,7 +8,7 @@ from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 
-from . import FytaConfigEntry
+from .coordinator import FytaConfigEntry
 
 TO_REDACT = [
     CONF_PASSWORD,
diff --git a/homeassistant/components/fyta/entity.py b/homeassistant/components/fyta/entity.py
index 0d0ec533c44..02cd73c54f9 100644
--- a/homeassistant/components/fyta/entity.py
+++ b/homeassistant/components/fyta/entity.py
@@ -6,9 +6,8 @@ from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import FytaConfigEntry
 from .const import DOMAIN
-from .coordinator import FytaCoordinator
+from .coordinator import FytaConfigEntry, FytaCoordinator
 
 
 class FytaPlantEntity(CoordinatorEntity[FytaCoordinator]):
diff --git a/homeassistant/components/fyta/image.py b/homeassistant/components/fyta/image.py
new file mode 100644
index 00000000000..326f2ddf570
--- /dev/null
+++ b/homeassistant/components/fyta/image.py
@@ -0,0 +1,65 @@
+"""Entity for Fyta plant image."""
+
+from __future__ import annotations
+
+from datetime import datetime
+
+from homeassistant.components.image import ImageEntity, ImageEntityDescription
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import FytaConfigEntry, FytaCoordinator
+from .entity import FytaPlantEntity
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: FytaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the FYTA plant images."""
+    coordinator = entry.runtime_data
+
+    description = ImageEntityDescription(key="plant_image")
+
+    async_add_entities(
+        FytaPlantImageEntity(coordinator, entry, description, plant_id)
+        for plant_id in coordinator.fyta.plant_list
+        if plant_id in coordinator.data
+    )
+
+    def _async_add_new_device(plant_id: int) -> None:
+        async_add_entities(
+            [FytaPlantImageEntity(coordinator, entry, description, plant_id)]
+        )
+
+    coordinator.new_device_callbacks.append(_async_add_new_device)
+
+
+class FytaPlantImageEntity(FytaPlantEntity, ImageEntity):
+    """Represents a Fyta image."""
+
+    entity_description: ImageEntityDescription
+
+    def __init__(
+        self,
+        coordinator: FytaCoordinator,
+        entry: ConfigEntry,
+        description: ImageEntityDescription,
+        plant_id: int,
+    ) -> None:
+        """Initiatlize Fyta Image entity."""
+        super().__init__(coordinator, entry, description, plant_id)
+        ImageEntity.__init__(self, coordinator.hass)
+
+        self._attr_name = None
+
+    @property
+    def image_url(self) -> str:
+        """Return the image_url for this sensor."""
+        image = self.plant.plant_origin_path
+        if image != self._attr_image_url:
+            self._attr_image_last_updated = datetime.now()
+
+        return image
diff --git a/homeassistant/components/fyta/manifest.json b/homeassistant/components/fyta/manifest.json
index ea628f55c6c..615197203a8 100644
--- a/homeassistant/components/fyta/manifest.json
+++ b/homeassistant/components/fyta/manifest.json
@@ -9,5 +9,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["fyta_cli"],
   "quality_scale": "platinum",
-  "requirements": ["fyta_cli==0.7.0"]
+  "requirements": ["fyta_cli==0.7.2"]
 }
diff --git a/homeassistant/components/fyta/sensor.py b/homeassistant/components/fyta/sensor.py
index 254e4522819..622945ae102 100644
--- a/homeassistant/components/fyta/sensor.py
+++ b/homeassistant/components/fyta/sensor.py
@@ -22,11 +22,10 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import FytaConfigEntry
-from .coordinator import FytaCoordinator
+from .coordinator import FytaConfigEntry, FytaCoordinator
 from .entity import FytaPlantEntity
 
 
@@ -155,7 +154,9 @@ SENSORS: Final[list[FytaSensorEntityDescription]] = [
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: FytaConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: FytaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the FYTA sensors."""
     coordinator: FytaCoordinator = entry.runtime_data
diff --git a/homeassistant/components/garadget/cover.py b/homeassistant/components/garadget/cover.py
index 82045e91321..ef11038aee4 100644
--- a/homeassistant/components/garadget/cover.py
+++ b/homeassistant/components/garadget/cover.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
     CONF_USERNAME,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import track_utc_time_change
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/garages_amsterdam/__init__.py b/homeassistant/components/garages_amsterdam/__init__.py
index 99d751cfcc8..854e41f2d89 100644
--- a/homeassistant/components/garages_amsterdam/__init__.py
+++ b/homeassistant/components/garages_amsterdam/__init__.py
@@ -4,24 +4,24 @@ from __future__ import annotations
 
 from odp_amsterdam import ODPAmsterdam
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .coordinator import GaragesAmsterdamDataUpdateCoordinator
+from .coordinator import (
+    GaragesAmsterdamConfigEntry,
+    GaragesAmsterdamDataUpdateCoordinator,
+)
 
 PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR]
 
-type GaragesAmsterdamConfigEntry = ConfigEntry[GaragesAmsterdamDataUpdateCoordinator]
-
 
 async def async_setup_entry(
     hass: HomeAssistant, entry: GaragesAmsterdamConfigEntry
 ) -> bool:
     """Set up Garages Amsterdam from a config entry."""
     client = ODPAmsterdam(session=async_get_clientsession(hass))
-    coordinator = GaragesAmsterdamDataUpdateCoordinator(hass, client)
+    coordinator = GaragesAmsterdamDataUpdateCoordinator(hass, entry, client)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/garages_amsterdam/binary_sensor.py b/homeassistant/components/garages_amsterdam/binary_sensor.py
index b93b43e1173..6cfd68c8a00 100644
--- a/homeassistant/components/garages_amsterdam/binary_sensor.py
+++ b/homeassistant/components/garages_amsterdam/binary_sensor.py
@@ -13,10 +13,12 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import GaragesAmsterdamConfigEntry
-from .coordinator import GaragesAmsterdamDataUpdateCoordinator
+from .coordinator import (
+    GaragesAmsterdamConfigEntry,
+    GaragesAmsterdamDataUpdateCoordinator,
+)
 from .entity import GaragesAmsterdamEntity
 
 
@@ -40,7 +42,7 @@ BINARY_SENSORS: tuple[GaragesAmsterdamBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GaragesAmsterdamConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Defer sensor setup to the shared sensor module."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/garages_amsterdam/coordinator.py b/homeassistant/components/garages_amsterdam/coordinator.py
index 3d06aba79e2..74f2361980d 100644
--- a/homeassistant/components/garages_amsterdam/coordinator.py
+++ b/homeassistant/components/garages_amsterdam/coordinator.py
@@ -4,24 +4,31 @@ from __future__ import annotations
 
 from odp_amsterdam import Garage, ODPAmsterdam, VehicleType
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import DOMAIN, LOGGER, SCAN_INTERVAL
 
+type GaragesAmsterdamConfigEntry = ConfigEntry[GaragesAmsterdamDataUpdateCoordinator]
+
 
 class GaragesAmsterdamDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Garage]]):
     """Class to manage fetching Garages Amsterdam data from single endpoint."""
 
+    config_entry: GaragesAmsterdamConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: GaragesAmsterdamConfigEntry,
         client: ODPAmsterdam,
     ) -> None:
         """Initialize global Garages Amsterdam data updater."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/garages_amsterdam/sensor.py b/homeassistant/components/garages_amsterdam/sensor.py
index b562fff841a..5467ae73b1e 100644
--- a/homeassistant/components/garages_amsterdam/sensor.py
+++ b/homeassistant/components/garages_amsterdam/sensor.py
@@ -13,11 +13,13 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import GaragesAmsterdamConfigEntry
-from .coordinator import GaragesAmsterdamDataUpdateCoordinator
+from .coordinator import (
+    GaragesAmsterdamConfigEntry,
+    GaragesAmsterdamDataUpdateCoordinator,
+)
 from .entity import GaragesAmsterdamEntity
 
 
@@ -57,7 +59,7 @@ SENSORS: tuple[GaragesAmsterdamSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GaragesAmsterdamConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Defer sensor setup to the shared sensor module."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/gardena_bluetooth/__init__.py b/homeassistant/components/gardena_bluetooth/__init__.py
index 7aae629974c..34f72bf0a5a 100644
--- a/homeassistant/components/gardena_bluetooth/__init__.py
+++ b/homeassistant/components/gardena_bluetooth/__init__.py
@@ -10,15 +10,18 @@ from gardena_bluetooth.const import DeviceConfiguration, DeviceInformation
 from gardena_bluetooth.exceptions import CommunicationFailure
 
 from homeassistant.components import bluetooth
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ADDRESS, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.device_registry import DeviceInfo
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN
-from .coordinator import DeviceUnavailable, GardenaBluetoothCoordinator
+from .coordinator import (
+    DeviceUnavailable,
+    GardenaBluetoothConfigEntry,
+    GardenaBluetoothCoordinator,
+)
 
 PLATFORMS: list[Platform] = [
     Platform.BINARY_SENSOR,
@@ -32,8 +35,6 @@ LOGGER = logging.getLogger(__name__)
 TIMEOUT = 20.0
 DISCONNECT_DELAY = 5
 
-type GardenaBluetoothConfigEntry = ConfigEntry[GardenaBluetoothCoordinator]
-
 
 def get_connection(hass: HomeAssistant, address: str) -> CachedConnection:
     """Set up a cached client that keeps connection after last use."""
@@ -80,7 +81,7 @@ async def async_setup_entry(
     )
 
     coordinator = GardenaBluetoothCoordinator(
-        hass, LOGGER, client, uuids, device, address
+        hass, entry, LOGGER, client, uuids, device, address
     )
 
     entry.runtime_data = coordinator
diff --git a/homeassistant/components/gardena_bluetooth/binary_sensor.py b/homeassistant/components/gardena_bluetooth/binary_sensor.py
index d3ae096e291..b41988afd8c 100644
--- a/homeassistant/components/gardena_bluetooth/binary_sensor.py
+++ b/homeassistant/components/gardena_bluetooth/binary_sensor.py
@@ -14,9 +14,9 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import GardenaBluetoothConfigEntry
+from .coordinator import GardenaBluetoothConfigEntry
 from .entity import GardenaBluetoothDescriptorEntity
 
 
@@ -53,7 +53,7 @@ DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GardenaBluetoothConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up binary sensor based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/gardena_bluetooth/button.py b/homeassistant/components/gardena_bluetooth/button.py
index 9d87cba2446..6a4f0395fe0 100644
--- a/homeassistant/components/gardena_bluetooth/button.py
+++ b/homeassistant/components/gardena_bluetooth/button.py
@@ -10,9 +10,9 @@ from gardena_bluetooth.parse import CharacteristicBool
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import GardenaBluetoothConfigEntry
+from .coordinator import GardenaBluetoothConfigEntry
 from .entity import GardenaBluetoothDescriptorEntity
 
 
@@ -42,7 +42,7 @@ DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GardenaBluetoothConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up button based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/gardena_bluetooth/config_flow.py b/homeassistant/components/gardena_bluetooth/config_flow.py
index c7631b62f47..613d0cf21db 100644
--- a/homeassistant/components/gardena_bluetooth/config_flow.py
+++ b/homeassistant/components/gardena_bluetooth/config_flow.py
@@ -41,6 +41,8 @@ def _is_supported(discovery_info: BluetoothServiceInfo):
         ProductType.PUMP,
         ProductType.VALVE,
         ProductType.WATER_COMPUTER,
+        ProductType.AUTOMATS,
+        ProductType.PRESSURE_TANKS,
     ):
         _LOGGER.debug("Unsupported device: %s", manufacturer_data)
         return False
diff --git a/homeassistant/components/gardena_bluetooth/coordinator.py b/homeassistant/components/gardena_bluetooth/coordinator.py
index 5caafe0e794..f85fb839657 100644
--- a/homeassistant/components/gardena_bluetooth/coordinator.py
+++ b/homeassistant/components/gardena_bluetooth/coordinator.py
@@ -12,6 +12,7 @@ from gardena_bluetooth.exceptions import (
 )
 from gardena_bluetooth.parse import Characteristic, CharacteristicType
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
@@ -20,6 +21,8 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 SCAN_INTERVAL = timedelta(seconds=60)
 LOGGER = logging.getLogger(__name__)
 
+type GardenaBluetoothConfigEntry = ConfigEntry[GardenaBluetoothCoordinator]
+
 
 class DeviceUnavailable(HomeAssistantError):
     """Raised if device can't be found."""
@@ -28,9 +31,12 @@ class DeviceUnavailable(HomeAssistantError):
 class GardenaBluetoothCoordinator(DataUpdateCoordinator[dict[str, bytes]]):
     """Class to manage fetching data."""
 
+    config_entry: GardenaBluetoothConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: GardenaBluetoothConfigEntry,
         logger: logging.Logger,
         client: Client,
         characteristics: set[str],
@@ -41,6 +47,7 @@ class GardenaBluetoothCoordinator(DataUpdateCoordinator[dict[str, bytes]]):
         super().__init__(
             hass=hass,
             logger=logger,
+            config_entry=config_entry,
             name="Gardena Bluetooth Data Update Coordinator",
             update_interval=SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/gardena_bluetooth/manifest.json b/homeassistant/components/gardena_bluetooth/manifest.json
index 28bba1015f5..8c9cda7d998 100644
--- a/homeassistant/components/gardena_bluetooth/manifest.json
+++ b/homeassistant/components/gardena_bluetooth/manifest.json
@@ -14,5 +14,5 @@
   "documentation": "https://www.home-assistant.io/integrations/gardena_bluetooth",
   "iot_class": "local_polling",
   "loggers": ["bleak", "bleak_esphome", "gardena_bluetooth"],
-  "requirements": ["gardena-bluetooth==1.5.0"]
+  "requirements": ["gardena-bluetooth==1.6.0"]
 }
diff --git a/homeassistant/components/gardena_bluetooth/number.py b/homeassistant/components/gardena_bluetooth/number.py
index b55630fa797..41b4f1e79ba 100644
--- a/homeassistant/components/gardena_bluetooth/number.py
+++ b/homeassistant/components/gardena_bluetooth/number.py
@@ -19,10 +19,9 @@ from homeassistant.components.number import (
 )
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import GardenaBluetoothConfigEntry
-from .coordinator import GardenaBluetoothCoordinator
+from .coordinator import GardenaBluetoothConfigEntry, GardenaBluetoothCoordinator
 from .entity import GardenaBluetoothDescriptorEntity, GardenaBluetoothEntity
 
 
@@ -106,7 +105,7 @@ DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GardenaBluetoothConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entity based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/gardena_bluetooth/sensor.py b/homeassistant/components/gardena_bluetooth/sensor.py
index ee8a2663218..602f5bdfd6e 100644
--- a/homeassistant/components/gardena_bluetooth/sensor.py
+++ b/homeassistant/components/gardena_bluetooth/sensor.py
@@ -16,11 +16,10 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
-from . import GardenaBluetoothConfigEntry
-from .coordinator import GardenaBluetoothCoordinator
+from .coordinator import GardenaBluetoothConfigEntry, GardenaBluetoothCoordinator
 from .entity import GardenaBluetoothDescriptorEntity, GardenaBluetoothEntity
 
 
@@ -96,7 +95,7 @@ DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GardenaBluetoothConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Gardena Bluetooth sensor based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/gardena_bluetooth/switch.py b/homeassistant/components/gardena_bluetooth/switch.py
index f82c39025a5..de1fbe22470 100644
--- a/homeassistant/components/gardena_bluetooth/switch.py
+++ b/homeassistant/components/gardena_bluetooth/switch.py
@@ -9,17 +9,16 @@ from gardena_bluetooth.const import Valve
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import GardenaBluetoothConfigEntry
-from .coordinator import GardenaBluetoothCoordinator
+from .coordinator import GardenaBluetoothConfigEntry, GardenaBluetoothCoordinator
 from .entity import GardenaBluetoothEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GardenaBluetoothConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switch based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/gardena_bluetooth/valve.py b/homeassistant/components/gardena_bluetooth/valve.py
index ae6bf56a7ff..4138c7c4472 100644
--- a/homeassistant/components/gardena_bluetooth/valve.py
+++ b/homeassistant/components/gardena_bluetooth/valve.py
@@ -8,10 +8,9 @@ from gardena_bluetooth.const import Valve
 
 from homeassistant.components.valve import ValveEntity, ValveEntityFeature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import GardenaBluetoothConfigEntry
-from .coordinator import GardenaBluetoothCoordinator
+from .coordinator import GardenaBluetoothConfigEntry, GardenaBluetoothCoordinator
 from .entity import GardenaBluetoothEntity
 
 FALLBACK_WATERING_TIME_IN_SECONDS = 60 * 60
@@ -20,7 +19,7 @@ FALLBACK_WATERING_TIME_IN_SECONDS = 60 * 60
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GardenaBluetoothConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switch based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/gc100/__init__.py b/homeassistant/components/gc100/__init__.py
index 57c8e92499f..a43741b9249 100644
--- a/homeassistant/components/gc100/__init__.py
+++ b/homeassistant/components/gc100/__init__.py
@@ -5,7 +5,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_HOST, CONF_PORT, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 CONF_PORTS = "ports"
diff --git a/homeassistant/components/gc100/binary_sensor.py b/homeassistant/components/gc100/binary_sensor.py
index 55df72cc3b9..cef798935cb 100644
--- a/homeassistant/components/gc100/binary_sensor.py
+++ b/homeassistant/components/gc100/binary_sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import DEVICE_DEFAULT_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/gc100/switch.py b/homeassistant/components/gc100/switch.py
index 1bcdc7365cf..23b178cc647 100644
--- a/homeassistant/components/gc100/switch.py
+++ b/homeassistant/components/gc100/switch.py
@@ -12,7 +12,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import DEVICE_DEFAULT_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/gdacs/geo_location.py b/homeassistant/components/gdacs/geo_location.py
index 3f693241b24..d277ee54f6b 100644
--- a/homeassistant/components/gdacs/geo_location.py
+++ b/homeassistant/components/gdacs/geo_location.py
@@ -15,7 +15,7 @@ from homeassistant.const import UnitOfLength
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.unit_conversion import DistanceConverter
 from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM
 
@@ -52,7 +52,9 @@ SOURCE = "gdacs"
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the GDACS Feed platform."""
     manager: GdacsFeedEntityManager = hass.data[DOMAIN][FEED][entry.entry_id]
diff --git a/homeassistant/components/gdacs/sensor.py b/homeassistant/components/gdacs/sensor.py
index c8205730da4..a204addd414 100644
--- a/homeassistant/components/gdacs/sensor.py
+++ b/homeassistant/components/gdacs/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from . import GdacsFeedEntityManager
@@ -37,7 +37,9 @@ PARALLEL_UPDATES = 0
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the GDACS Feed platform."""
     manager: GdacsFeedEntityManager = hass.data[DOMAIN][FEED][entry.entry_id]
diff --git a/homeassistant/components/generic/camera.py b/homeassistant/components/generic/camera.py
index edefbc55ca6..6821300fadf 100644
--- a/homeassistant/components/generic/camera.py
+++ b/homeassistant/components/generic/camera.py
@@ -29,7 +29,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import TemplateError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.httpx_client import get_async_client
 from homeassistant.helpers.template import Template
 
@@ -47,7 +47,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a generic IP Camera."""
 
diff --git a/homeassistant/components/generic/strings.json b/homeassistant/components/generic/strings.json
index 854ceb93b3e..4a5d672fcde 100644
--- a/homeassistant/components/generic/strings.json
+++ b/homeassistant/components/generic/strings.json
@@ -28,14 +28,14 @@
       "user": {
         "description": "Enter the settings to connect to the camera.",
         "data": {
-          "still_image_url": "Still Image URL (e.g. http://...)",
-          "stream_source": "Stream Source URL (e.g. rtsp://...)",
+          "still_image_url": "Still image URL (e.g. http://...)",
+          "stream_source": "Stream source URL (e.g. rtsp://...)",
           "rtsp_transport": "RTSP transport protocol",
           "authentication": "Authentication",
-          "limit_refetch_to_url_change": "Limit refetch to url change",
+          "limit_refetch_to_url_change": "Limit refetch to URL change",
           "password": "[%key:common::config_flow::data::password%]",
           "username": "[%key:common::config_flow::data::username%]",
-          "framerate": "Frame Rate (Hz)",
+          "framerate": "Frame rate (Hz)",
           "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
         }
       },
diff --git a/homeassistant/components/generic_hygrostat/humidifier.py b/homeassistant/components/generic_hygrostat/humidifier.py
index 69c4fb3cdf4..6e699745279 100644
--- a/homeassistant/components/generic_hygrostat/humidifier.py
+++ b/homeassistant/components/generic_hygrostat/humidifier.py
@@ -43,7 +43,10 @@ from homeassistant.core import (
 )
 from homeassistant.helpers import condition, config_validation as cv
 from homeassistant.helpers.device import async_device_info_to_link_from_entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.event import (
     async_track_state_change_event,
     async_track_state_report_event,
@@ -94,7 +97,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize config entry."""
 
@@ -116,7 +119,7 @@ async def _async_setup_config(
     hass: HomeAssistant,
     config: Mapping[str, Any],
     unique_id: str | None,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddEntitiesCallback | AddConfigEntryEntitiesCallback,
 ) -> None:
     name: str = config[CONF_NAME]
     switch_entity_id: str = config[CONF_HUMIDIFIER]
diff --git a/homeassistant/components/generic_thermostat/climate.py b/homeassistant/components/generic_thermostat/climate.py
index fe6f0253f48..190caa58b3f 100644
--- a/homeassistant/components/generic_thermostat/climate.py
+++ b/homeassistant/components/generic_thermostat/climate.py
@@ -49,7 +49,10 @@ from homeassistant.core import (
 from homeassistant.exceptions import ConditionError
 from homeassistant.helpers import condition, config_validation as cv
 from homeassistant.helpers.device import async_device_info_to_link_from_entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.event import (
     async_track_state_change_event,
     async_track_time_interval,
@@ -123,7 +126,7 @@ PLATFORM_SCHEMA = CLIMATE_PLATFORM_SCHEMA.extend(PLATFORM_SCHEMA_COMMON.schema)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize config entry."""
     await _async_setup_config(
@@ -152,7 +155,7 @@ async def _async_setup_config(
     hass: HomeAssistant,
     config: Mapping[str, Any],
     unique_id: str | None,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddEntitiesCallback | AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the generic thermostat platform."""
 
diff --git a/homeassistant/components/geniushub/binary_sensor.py b/homeassistant/components/geniushub/binary_sensor.py
index 01ccc950fd6..c2f25532453 100644
--- a/homeassistant/components/geniushub/binary_sensor.py
+++ b/homeassistant/components/geniushub/binary_sensor.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import GeniusHubConfigEntry
 from .entity import GeniusDevice
@@ -16,7 +16,7 @@ GH_TYPE = "Receiver"
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GeniusHubConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Genius Hub binary sensor entities."""
 
diff --git a/homeassistant/components/geniushub/climate.py b/homeassistant/components/geniushub/climate.py
index e20d649541e..3c5cc4d4ad9 100644
--- a/homeassistant/components/geniushub/climate.py
+++ b/homeassistant/components/geniushub/climate.py
@@ -11,7 +11,7 @@ from homeassistant.components.climate import (
     HVACMode,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import GeniusHubConfigEntry
 from .entity import GeniusHeatingZone
@@ -29,7 +29,7 @@ GH_ZONES = ["radiator", "wet underfloor"]
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GeniusHubConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Genius Hub climate entities."""
 
diff --git a/homeassistant/components/geniushub/entity.py b/homeassistant/components/geniushub/entity.py
index 7c40c41bda5..24917ab5e95 100644
--- a/homeassistant/components/geniushub/entity.py
+++ b/homeassistant/components/geniushub/entity.py
@@ -6,7 +6,7 @@ from typing import Any
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import ATTR_DURATION, ATTR_ZONE_MODE, DOMAIN, SVC_SET_ZONE_OVERRIDE
 
diff --git a/homeassistant/components/geniushub/sensor.py b/homeassistant/components/geniushub/sensor.py
index cfe4107428c..de7c047e934 100644
--- a/homeassistant/components/geniushub/sensor.py
+++ b/homeassistant/components/geniushub/sensor.py
@@ -8,8 +8,8 @@ from typing import Any
 from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from . import GeniusHubConfigEntry
 from .entity import GeniusDevice, GeniusEntity
@@ -26,7 +26,7 @@ GH_LEVEL_MAPPING = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GeniusHubConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Genius Hub sensor entities."""
 
diff --git a/homeassistant/components/geniushub/strings.json b/homeassistant/components/geniushub/strings.json
index 42d53c7fa00..79eee2c9a1b 100644
--- a/homeassistant/components/geniushub/strings.json
+++ b/homeassistant/components/geniushub/strings.json
@@ -45,7 +45,7 @@
         },
         "mode": {
           "name": "[%key:common::config_flow::data::mode%]",
-          "description": "One of: off, timer or footprint."
+          "description": "The zone's operating mode."
         }
       }
     },
diff --git a/homeassistant/components/geniushub/switch.py b/homeassistant/components/geniushub/switch.py
index 3af82eb4e92..890ca1578be 100644
--- a/homeassistant/components/geniushub/switch.py
+++ b/homeassistant/components/geniushub/switch.py
@@ -10,7 +10,7 @@ import voluptuous as vol
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import VolDictType
 
 from . import ATTR_DURATION, GeniusHubConfigEntry
@@ -31,7 +31,7 @@ SET_SWITCH_OVERRIDE_SCHEMA: VolDictType = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GeniusHubConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Genius Hub switch entities."""
 
diff --git a/homeassistant/components/geniushub/water_heater.py b/homeassistant/components/geniushub/water_heater.py
index 2807bd60611..60acf8f2cca 100644
--- a/homeassistant/components/geniushub/water_heater.py
+++ b/homeassistant/components/geniushub/water_heater.py
@@ -8,7 +8,7 @@ from homeassistant.components.water_heater import (
 )
 from homeassistant.const import STATE_OFF
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import GeniusHubConfigEntry
 from .entity import GeniusHeatingZone
@@ -36,7 +36,7 @@ GH_HEATERS = ["hot water temperature"]
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GeniusHubConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Genius Hub water heater entities."""
 
diff --git a/homeassistant/components/geo_json_events/__init__.py b/homeassistant/components/geo_json_events/__init__.py
index d55fe6e3ee6..e38c17008a5 100644
--- a/homeassistant/components/geo_json_events/__init__.py
+++ b/homeassistant/components/geo_json_events/__init__.py
@@ -4,25 +4,27 @@ from __future__ import annotations
 
 import logging
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
-from .const import DOMAIN, PLATFORMS
-from .manager import GeoJsonFeedEntityManager
+from .const import PLATFORMS
+from .manager import GeoJsonConfigEntry, GeoJsonFeedEntityManager
 
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_setup_entry(
+    hass: HomeAssistant, config_entry: GeoJsonConfigEntry
+) -> bool:
     """Set up the GeoJSON events component as config entry."""
-    feeds = hass.data.setdefault(DOMAIN, {})
     # Create feed entity manager for all platforms.
     manager = GeoJsonFeedEntityManager(hass, config_entry)
-    feeds[config_entry.entry_id] = manager
     _LOGGER.debug("Feed entity manager added for %s", config_entry.entry_id)
     await remove_orphaned_entities(hass, config_entry.entry_id)
+
+    config_entry.runtime_data = manager
+    config_entry.async_on_unload(manager.async_stop)
     await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
     await manager.async_init()
     return True
@@ -46,10 +48,6 @@ async def remove_orphaned_entities(hass: HomeAssistant, entry_id: str) -> None:
                 entity_registry.async_remove(entry.entity_id)
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: GeoJsonConfigEntry) -> bool:
     """Unload the GeoJSON events config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if unload_ok:
-        manager: GeoJsonFeedEntityManager = hass.data[DOMAIN].pop(entry.entry_id)
-        await manager.async_stop()
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/geo_json_events/geo_location.py b/homeassistant/components/geo_json_events/geo_location.py
index e0067bcfdc9..a119571a0ca 100644
--- a/homeassistant/components/geo_json_events/geo_location.py
+++ b/homeassistant/components/geo_json_events/geo_location.py
@@ -9,29 +9,24 @@ from typing import Any
 from aio_geojson_generic_client.feed_entry import GenericFeedEntry
 
 from homeassistant.components.geo_location import GeolocationEvent
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfLength
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import GeoJsonFeedEntityManager
-from .const import (
-    ATTR_EXTERNAL_ID,
-    DOMAIN,
-    SIGNAL_DELETE_ENTITY,
-    SIGNAL_UPDATE_ENTITY,
-    SOURCE,
-)
+from .const import ATTR_EXTERNAL_ID, SIGNAL_DELETE_ENTITY, SIGNAL_UPDATE_ENTITY, SOURCE
+from .manager import GeoJsonConfigEntry, GeoJsonFeedEntityManager
 
 _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: GeoJsonConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the GeoJSON Events platform."""
-    manager: GeoJsonFeedEntityManager = hass.data[DOMAIN][entry.entry_id]
+    manager = entry.runtime_data
 
     @callback
     def async_add_geolocation(
diff --git a/homeassistant/components/geo_json_events/manager.py b/homeassistant/components/geo_json_events/manager.py
index deff15436a6..223d3bf571f 100644
--- a/homeassistant/components/geo_json_events/manager.py
+++ b/homeassistant/components/geo_json_events/manager.py
@@ -25,6 +25,8 @@ from .const import (
 
 _LOGGER = logging.getLogger(__name__)
 
+type GeoJsonConfigEntry = ConfigEntry[GeoJsonFeedEntityManager]
+
 
 class GeoJsonFeedEntityManager:
     """Feed Entity Manager for GeoJSON feeds."""
diff --git a/homeassistant/components/geo_rss_events/sensor.py b/homeassistant/components/geo_rss_events/sensor.py
index 0dc8918b7dd..079a47a6c27 100644
--- a/homeassistant/components/geo_rss_events/sensor.py
+++ b/homeassistant/components/geo_rss_events/sensor.py
@@ -28,7 +28,7 @@ from homeassistant.const import (
     UnitOfLength,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/geocaching/coordinator.py b/homeassistant/components/geocaching/coordinator.py
index 8f56cd9d846..41b59d049af 100644
--- a/homeassistant/components/geocaching/coordinator.py
+++ b/homeassistant/components/geocaching/coordinator.py
@@ -18,12 +18,13 @@ from .const import DOMAIN, ENVIRONMENT, LOGGER, UPDATE_INTERVAL
 class GeocachingDataUpdateCoordinator(DataUpdateCoordinator[GeocachingStatus]):
     """Class to manage fetching Geocaching data from single endpoint."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self, hass: HomeAssistant, *, entry: ConfigEntry, session: OAuth2Session
     ) -> None:
         """Initialize global Geocaching data updater."""
         self.session = session
-        self.entry = entry
 
         async def async_token_refresh() -> str:
             await session.async_ensure_token_valid()
@@ -39,7 +40,13 @@ class GeocachingDataUpdateCoordinator(DataUpdateCoordinator[GeocachingStatus]):
             token_refresh_method=async_token_refresh,
         )
 
-        super().__init__(hass, LOGGER, name=DOMAIN, update_interval=UPDATE_INTERVAL)
+        super().__init__(
+            hass,
+            LOGGER,
+            config_entry=entry,
+            name=DOMAIN,
+            update_interval=UPDATE_INTERVAL,
+        )
 
     async def _async_update_data(self) -> GeocachingStatus:
         try:
diff --git a/homeassistant/components/geocaching/manifest.json b/homeassistant/components/geocaching/manifest.json
index 127519ca5d0..4617bd1c57b 100644
--- a/homeassistant/components/geocaching/manifest.json
+++ b/homeassistant/components/geocaching/manifest.json
@@ -6,5 +6,5 @@
   "dependencies": ["application_credentials"],
   "documentation": "https://www.home-assistant.io/integrations/geocaching",
   "iot_class": "cloud_polling",
-  "requirements": ["geocachingapi==0.2.1"]
+  "requirements": ["geocachingapi==0.3.0"]
 }
diff --git a/homeassistant/components/geocaching/sensor.py b/homeassistant/components/geocaching/sensor.py
index c082e5308a1..c7894afc5ac 100644
--- a/homeassistant/components/geocaching/sensor.py
+++ b/homeassistant/components/geocaching/sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.sensor import SensorEntity, SensorEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
@@ -64,7 +64,9 @@ SENSORS: tuple[GeocachingSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Geocaching sensor entry."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/geofency/__init__.py b/homeassistant/components/geofency/__init__.py
index d38514fc412..46a3482ce1e 100644
--- a/homeassistant/components/geofency/__init__.py
+++ b/homeassistant/components/geofency/__init__.py
@@ -16,8 +16,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_entry_flow
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_entry_flow, config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import slugify
diff --git a/homeassistant/components/geofency/device_tracker.py b/homeassistant/components/geofency/device_tracker.py
index 2ad3c1772de..c74dad1cebb 100644
--- a/homeassistant/components/geofency/device_tracker.py
+++ b/homeassistant/components/geofency/device_tracker.py
@@ -7,7 +7,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from . import DOMAIN as GF_DOMAIN, TRACKER_UPDATE
@@ -16,7 +16,7 @@ from . import DOMAIN as GF_DOMAIN, TRACKER_UPDATE
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Geofency config entry."""
 
diff --git a/homeassistant/components/geonetnz_quakes/geo_location.py b/homeassistant/components/geonetnz_quakes/geo_location.py
index 78313e102e0..96a1c3c09b2 100644
--- a/homeassistant/components/geonetnz_quakes/geo_location.py
+++ b/homeassistant/components/geonetnz_quakes/geo_location.py
@@ -14,7 +14,7 @@ from homeassistant.const import ATTR_TIME, UnitOfLength
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.unit_conversion import DistanceConverter
 from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM
 
@@ -38,7 +38,9 @@ SOURCE = "geonetnz_quakes"
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the GeoNet NZ Quakes Feed platform."""
     manager: GeonetnzQuakesFeedEntityManager = hass.data[DOMAIN][FEED][entry.entry_id]
diff --git a/homeassistant/components/geonetnz_quakes/sensor.py b/homeassistant/components/geonetnz_quakes/sensor.py
index 2fce3e93d12..b8a1e2dd4db 100644
--- a/homeassistant/components/geonetnz_quakes/sensor.py
+++ b/homeassistant/components/geonetnz_quakes/sensor.py
@@ -8,7 +8,7 @@ from homeassistant.components.sensor import SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN, FEED
@@ -31,7 +31,9 @@ PARALLEL_UPDATES = 0
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the GeoNet NZ Quakes Feed platform."""
     manager = hass.data[DOMAIN][FEED][entry.entry_id]
diff --git a/homeassistant/components/geonetnz_volcano/sensor.py b/homeassistant/components/geonetnz_volcano/sensor.py
index 980679cc64f..bde04acb895 100644
--- a/homeassistant/components/geonetnz_volcano/sensor.py
+++ b/homeassistant/components/geonetnz_volcano/sensor.py
@@ -9,7 +9,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_LATITUDE, ATTR_LONGITUDE, UnitOfLength
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 from homeassistant.util.unit_conversion import DistanceConverter
 
@@ -31,7 +31,9 @@ ATTR_LAST_UPDATE_SUCCESSFUL = "feed_last_update_successful"
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the GeoNet NZ Volcano Feed platform."""
     manager = hass.data[DOMAIN][FEED][entry.entry_id]
diff --git a/homeassistant/components/gios/__init__.py b/homeassistant/components/gios/__init__.py
index b5a0e9d5371..31f704fcacc 100644
--- a/homeassistant/components/gios/__init__.py
+++ b/homeassistant/components/gios/__init__.py
@@ -2,32 +2,26 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass
 import logging
 
+from aiohttp.client_exceptions import ClientConnectorError
+from gios import Gios
+from gios.exceptions import GiosError
+
 from homeassistant.components.air_quality import DOMAIN as AIR_QUALITY_PLATFORM
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import CONF_STATION_ID, DOMAIN
-from .coordinator import GiosDataUpdateCoordinator
+from .coordinator import GiosConfigEntry, GiosData, GiosDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS = [Platform.SENSOR]
 
-type GiosConfigEntry = ConfigEntry[GiosData]
-
-
-@dataclass
-class GiosData:
-    """Data for GIOS integration."""
-
-    coordinator: GiosDataUpdateCoordinator
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: GiosConfigEntry) -> bool:
     """Set up GIOS as config entry."""
@@ -47,8 +41,19 @@ async def async_setup_entry(hass: HomeAssistant, entry: GiosConfigEntry) -> bool
         device_registry.async_update_device(device_entry.id, new_identifiers={new_ids})
 
     websession = async_get_clientsession(hass)
+    try:
+        gios = await Gios.create(websession, station_id)
+    except (GiosError, ConnectionError, ClientConnectorError) as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="cannot_connect",
+            translation_placeholders={
+                "entry": entry.title,
+                "error": repr(err),
+            },
+        ) from err
 
-    coordinator = GiosDataUpdateCoordinator(hass, websession, station_id)
+    coordinator = GiosDataUpdateCoordinator(hass, entry, gios)
     await coordinator.async_config_entry_first_refresh()
 
     entry.runtime_data = GiosData(coordinator)
diff --git a/homeassistant/components/gios/config_flow.py b/homeassistant/components/gios/config_flow.py
index a089aeab820..9b242a8cc99 100644
--- a/homeassistant/components/gios/config_flow.py
+++ b/homeassistant/components/gios/config_flow.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import asyncio
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from aiohttp.client_exceptions import ClientConnectorError
 from gios import ApiError, Gios, InvalidSensorsDataError, NoStationError
@@ -12,6 +12,12 @@ import voluptuous as vol
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_NAME
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.selector import (
+    SelectOptionDict,
+    SelectSelector,
+    SelectSelectorConfig,
+    SelectSelectorMode,
+)
 
 from .const import API_TIMEOUT, CONF_STATION_ID, DOMAIN
 
@@ -27,40 +33,59 @@ class GiosFlowHandler(ConfigFlow, domain=DOMAIN):
         """Handle a flow initialized by the user."""
         errors = {}
 
+        websession = async_get_clientsession(self.hass)
+
         if user_input is not None:
+            station_id = user_input[CONF_STATION_ID]
+
             try:
-                await self.async_set_unique_id(
-                    str(user_input[CONF_STATION_ID]), raise_on_progress=False
-                )
+                await self.async_set_unique_id(station_id, raise_on_progress=False)
                 self._abort_if_unique_id_configured()
 
-                websession = async_get_clientsession(self.hass)
-
                 async with asyncio.timeout(API_TIMEOUT):
-                    gios = Gios(user_input[CONF_STATION_ID], websession)
+                    gios = await Gios.create(websession, int(station_id))
                     await gios.async_update()
 
-                assert gios.station_name is not None
+                # GIOS treats station ID as int
+                user_input[CONF_STATION_ID] = int(station_id)
+
+                if TYPE_CHECKING:
+                    assert gios.station_name is not None
+
                 return self.async_create_entry(
                     title=gios.station_name,
                     data=user_input,
                 )
             except (ApiError, ClientConnectorError, TimeoutError):
                 errors["base"] = "cannot_connect"
-            except NoStationError:
-                errors[CONF_STATION_ID] = "wrong_station_id"
             except InvalidSensorsDataError:
                 errors[CONF_STATION_ID] = "invalid_sensors_data"
 
+        try:
+            gios = await Gios.create(websession)
+        except (ApiError, ClientConnectorError, NoStationError):
+            return self.async_abort(reason="cannot_connect")
+
+        options: list[SelectOptionDict] = [
+            SelectOptionDict(value=str(station.id), label=station.name)
+            for station in gios.measurement_stations.values()
+        ]
+
+        schema: vol.Schema = vol.Schema(
+            {
+                vol.Required(CONF_STATION_ID): SelectSelector(
+                    SelectSelectorConfig(
+                        options=options,
+                        sort=True,
+                        mode=SelectSelectorMode.DROPDOWN,
+                    ),
+                ),
+                vol.Optional(CONF_NAME, default=self.hass.config.location_name): str,
+            }
+        )
+
         return self.async_show_form(
             step_id="user",
-            data_schema=vol.Schema(
-                {
-                    vol.Required(CONF_STATION_ID): int,
-                    vol.Optional(
-                        CONF_NAME, default=self.hass.config.location_name
-                    ): str,
-                }
-            ),
+            data_schema=schema,
             errors=errors,
         )
diff --git a/homeassistant/components/gios/const.py b/homeassistant/components/gios/const.py
index a8490511ab8..2294e89c961 100644
--- a/homeassistant/components/gios/const.py
+++ b/homeassistant/components/gios/const.py
@@ -13,7 +13,7 @@ SCAN_INTERVAL: Final = timedelta(minutes=30)
 DOMAIN: Final = "gios"
 MANUFACTURER: Final = "Główny Inspektorat Ochrony Środowiska"
 
-URL = "http://powietrze.gios.gov.pl/pjp/current/station_details/info/{station_id}"
+URL = "https://powietrze.gios.gov.pl/pjp/current/station_details/info/{station_id}"
 
 API_TIMEOUT: Final = 30
 
diff --git a/homeassistant/components/gios/coordinator.py b/homeassistant/components/gios/coordinator.py
index 17b4b89174f..eb0dd82eb67 100644
--- a/homeassistant/components/gios/coordinator.py
+++ b/homeassistant/components/gios/coordinator.py
@@ -3,14 +3,15 @@
 from __future__ import annotations
 
 import asyncio
+from dataclasses import dataclass
 import logging
 
-from aiohttp import ClientSession
 from aiohttp.client_exceptions import ClientConnectorError
 from gios import Gios
 from gios.exceptions import GiosError
 from gios.model import GiosSensors
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -18,17 +19,37 @@ from .const import API_TIMEOUT, DOMAIN, SCAN_INTERVAL
 
 _LOGGER = logging.getLogger(__name__)
 
+type GiosConfigEntry = ConfigEntry[GiosData]
+
+
+@dataclass
+class GiosData:
+    """Data for GIOS integration."""
+
+    coordinator: GiosDataUpdateCoordinator
+
 
 class GiosDataUpdateCoordinator(DataUpdateCoordinator[GiosSensors]):
     """Define an object to hold GIOS data."""
 
+    config_entry: GiosConfigEntry
+
     def __init__(
-        self, hass: HomeAssistant, session: ClientSession, station_id: int
+        self,
+        hass: HomeAssistant,
+        config_entry: GiosConfigEntry,
+        gios: Gios,
     ) -> None:
         """Class to manage fetching GIOS data API."""
-        self.gios = Gios(station_id, session)
+        self.gios = gios
 
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=SCAN_INTERVAL)
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=SCAN_INTERVAL,
+        )
 
     async def _async_update_data(self) -> GiosSensors:
         """Update data via library."""
@@ -36,4 +57,11 @@ class GiosDataUpdateCoordinator(DataUpdateCoordinator[GiosSensors]):
             async with asyncio.timeout(API_TIMEOUT):
                 return await self.gios.async_update()
         except (GiosError, ClientConnectorError) as error:
-            raise UpdateFailed(error) from error
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="update_error",
+                translation_placeholders={
+                    "entry": self.config_entry.title,
+                    "error": repr(error),
+                },
+            ) from error
diff --git a/homeassistant/components/gios/diagnostics.py b/homeassistant/components/gios/diagnostics.py
index a94a95254de..7e938d5ac6b 100644
--- a/homeassistant/components/gios/diagnostics.py
+++ b/homeassistant/components/gios/diagnostics.py
@@ -7,7 +7,7 @@ from typing import Any
 
 from homeassistant.core import HomeAssistant
 
-from . import GiosConfigEntry
+from .coordinator import GiosConfigEntry
 
 
 async def async_get_config_entry_diagnostics(
diff --git a/homeassistant/components/gios/manifest.json b/homeassistant/components/gios/manifest.json
index 3d2e719fab6..8deb2eee414 100644
--- a/homeassistant/components/gios/manifest.json
+++ b/homeassistant/components/gios/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["dacite", "gios"],
-  "requirements": ["gios==5.0.0"]
+  "requirements": ["gios==6.0.0"]
 }
diff --git a/homeassistant/components/gios/sensor.py b/homeassistant/components/gios/sensor.py
index 69e198d34df..67997a01dc6 100644
--- a/homeassistant/components/gios/sensor.py
+++ b/homeassistant/components/gios/sensor.py
@@ -19,11 +19,10 @@ from homeassistant.const import CONCENTRATION_MICROGRAMS_PER_CUBIC_METER, CONF_N
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import GiosConfigEntry
 from .const import (
     ATTR_AQI,
     ATTR_C6H6,
@@ -38,7 +37,7 @@ from .const import (
     MANUFACTURER,
     URL,
 )
-from .coordinator import GiosDataUpdateCoordinator
+from .coordinator import GiosConfigEntry, GiosDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -159,7 +158,9 @@ SENSOR_TYPES: tuple[GiosSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: GiosConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: GiosConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add a GIOS entities from a config_entry."""
     name = entry.data[CONF_NAME]
diff --git a/homeassistant/components/gios/strings.json b/homeassistant/components/gios/strings.json
index fc82f1c843d..eca23159a13 100644
--- a/homeassistant/components/gios/strings.json
+++ b/homeassistant/components/gios/strings.json
@@ -5,17 +5,17 @@
         "title": "GIO\u015a (Polish Chief Inspectorate Of Environmental Protection)",
         "data": {
           "name": "[%key:common::config_flow::data::name%]",
-          "station_id": "ID of the measuring station"
+          "station_id": "Measuring station"
         }
       }
     },
     "error": {
-      "wrong_station_id": "ID of the measuring station is not correct.",
       "invalid_sensors_data": "Invalid sensors' data for this measuring station.",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_location%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_location%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     }
   },
   "system_health": {
@@ -170,5 +170,13 @@
         }
       }
     }
+  },
+  "exceptions": {
+    "cannot_connect": {
+      "message": "An error occurred while connecting to the GIOS API for {entry}: {error}"
+    },
+    "update_error": {
+      "message": "An error occurred while retrieving data from the GIOS API for {entry}: {error}"
+    }
   }
 }
diff --git a/homeassistant/components/github/__init__.py b/homeassistant/components/github/__init__.py
index 74575e38e09..dea2acf4f1b 100644
--- a/homeassistant/components/github/__init__.py
+++ b/homeassistant/components/github/__init__.py
@@ -4,7 +4,6 @@ from __future__ import annotations
 
 from aiogithubapi import GitHubAPI
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ACCESS_TOKEN, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
@@ -14,14 +13,11 @@ from homeassistant.helpers.aiohttp_client import (
 )
 
 from .const import CONF_REPOSITORIES, DOMAIN, LOGGER
-from .coordinator import GitHubDataUpdateCoordinator
+from .coordinator import GithubConfigEntry, GitHubDataUpdateCoordinator
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
 
-type GithubConfigEntry = ConfigEntry[dict[str, GitHubDataUpdateCoordinator]]
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: GithubConfigEntry) -> bool:
     """Set up GitHub from a config entry."""
     client = GitHubAPI(
@@ -36,6 +32,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: GithubConfigEntry) -> bo
     for repository in repositories:
         coordinator = GitHubDataUpdateCoordinator(
             hass=hass,
+            config_entry=entry,
             client=client,
             repository=repository,
         )
@@ -57,7 +54,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: GithubConfigEntry) -> bo
 @callback
 def async_cleanup_device_registry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
+    entry: GithubConfigEntry,
 ) -> None:
     """Remove entries form device registry if we no longer track the repository."""
     device_registry = dr.async_get(hass)
@@ -92,6 +89,6 @@ async def async_unload_entry(hass: HomeAssistant, entry: GithubConfigEntry) -> b
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
-async def async_reload_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
+async def async_reload_entry(hass: HomeAssistant, entry: GithubConfigEntry) -> None:
     """Handle an options update."""
     await hass.config_entries.async_reload(entry.entry_id)
diff --git a/homeassistant/components/github/config_flow.py b/homeassistant/components/github/config_flow.py
index 9977f9d84cc..17338119b9f 100644
--- a/homeassistant/components/github/config_flow.py
+++ b/homeassistant/components/github/config_flow.py
@@ -23,11 +23,11 @@ from homeassistant.config_entries import (
 )
 from homeassistant.const import CONF_ACCESS_TOKEN
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import (
     SERVER_SOFTWARE,
     async_get_clientsession,
 )
-import homeassistant.helpers.config_validation as cv
 
 from .const import CLIENT_ID, CONF_REPOSITORIES, DEFAULT_REPOSITORIES, DOMAIN, LOGGER
 
diff --git a/homeassistant/components/github/coordinator.py b/homeassistant/components/github/coordinator.py
index e73e02932e9..adeda1fd88a 100644
--- a/homeassistant/components/github/coordinator.py
+++ b/homeassistant/components/github/coordinator.py
@@ -13,6 +13,7 @@ from aiogithubapi import (
     GitHubResponseModel,
 )
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -98,13 +99,18 @@ query ($owner: String!, $repository: String!) {
 }
 """
 
+type GithubConfigEntry = ConfigEntry[dict[str, GitHubDataUpdateCoordinator]]
+
 
 class GitHubDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Data update coordinator for the GitHub integration."""
 
+    config_entry: GithubConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: GithubConfigEntry,
         client: GitHubAPI,
         repository: str,
     ) -> None:
@@ -118,6 +124,7 @@ class GitHubDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=repository,
             update_interval=FALLBACK_UPDATE_INTERVAL,
         )
diff --git a/homeassistant/components/github/diagnostics.py b/homeassistant/components/github/diagnostics.py
index 8d2d496a813..41fef9406a4 100644
--- a/homeassistant/components/github/diagnostics.py
+++ b/homeassistant/components/github/diagnostics.py
@@ -6,7 +6,6 @@ from typing import Any
 
 from aiogithubapi import GitHubAPI, GitHubException
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ACCESS_TOKEN
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import (
@@ -14,10 +13,12 @@ from homeassistant.helpers.aiohttp_client import (
     async_get_clientsession,
 )
 
+from .coordinator import GithubConfigEntry
+
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: GithubConfigEntry,
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     data = {"options": {**config_entry.options}}
diff --git a/homeassistant/components/github/sensor.py b/homeassistant/components/github/sensor.py
index 614ebe254c4..35985ed50d5 100644
--- a/homeassistant/components/github/sensor.py
+++ b/homeassistant/components/github/sensor.py
@@ -14,13 +14,12 @@ from homeassistant.components.sensor import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import GithubConfigEntry
 from .const import DOMAIN
-from .coordinator import GitHubDataUpdateCoordinator
+from .coordinator import GithubConfigEntry, GitHubDataUpdateCoordinator
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -140,7 +139,7 @@ SENSOR_DESCRIPTIONS: tuple[GitHubSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GithubConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up GitHub sensor based on a config entry."""
     repositories = entry.runtime_data
diff --git a/homeassistant/components/gitlab_ci/sensor.py b/homeassistant/components/gitlab_ci/sensor.py
index 6ed3112b2af..933ba0e482e 100644
--- a/homeassistant/components/gitlab_ci/sensor.py
+++ b/homeassistant/components/gitlab_ci/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_NAME, CONF_SCAN_INTERVAL, CONF_TOKEN, CONF_URL
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/gitter/sensor.py b/homeassistant/components/gitter/sensor.py
index bc444655908..957ac4e9d8c 100644
--- a/homeassistant/components/gitter/sensor.py
+++ b/homeassistant/components/gitter/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_API_KEY, CONF_NAME, CONF_ROOM
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/glances/__init__.py b/homeassistant/components/glances/__init__.py
index 9d09e63606e..d7b645d9e11 100644
--- a/homeassistant/components/glances/__init__.py
+++ b/homeassistant/components/glances/__init__.py
@@ -10,7 +10,6 @@ from glances_api.exceptions import (
     GlancesApiNoDataAvailable,
 )
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_HOST,
     CONF_PASSWORD,
@@ -29,15 +28,13 @@ from homeassistant.exceptions import (
 )
 from homeassistant.helpers.httpx_client import get_async_client
 
-from .coordinator import GlancesDataUpdateCoordinator
+from .coordinator import GlancesConfigEntry, GlancesDataUpdateCoordinator
 
 PLATFORMS = [Platform.SENSOR]
 
 
 _LOGGER = logging.getLogger(__name__)
 
-type GlancesConfigEntry = ConfigEntry[GlancesDataUpdateCoordinator]
-
 
 async def async_setup_entry(
     hass: HomeAssistant, config_entry: GlancesConfigEntry
diff --git a/homeassistant/components/glances/coordinator.py b/homeassistant/components/glances/coordinator.py
index 8882b097ba9..28cf40aae6e 100644
--- a/homeassistant/components/glances/coordinator.py
+++ b/homeassistant/components/glances/coordinator.py
@@ -17,21 +17,25 @@ from .const import DEFAULT_SCAN_INTERVAL, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
+type GlancesConfigEntry = ConfigEntry[GlancesDataUpdateCoordinator]
+
 
 class GlancesDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Get the latest data from Glances api."""
 
-    config_entry: ConfigEntry
+    config_entry: GlancesConfigEntry
 
-    def __init__(self, hass: HomeAssistant, entry: ConfigEntry, api: Glances) -> None:
+    def __init__(
+        self, hass: HomeAssistant, entry: GlancesConfigEntry, api: Glances
+    ) -> None:
         """Initialize the Glances data."""
         self.hass = hass
-        self.config_entry = entry
         self.host: str = entry.data[CONF_HOST]
         self.api = api
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             name=f"{DOMAIN} - {self.host}",
             update_interval=DEFAULT_SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/glances/sensor.py b/homeassistant/components/glances/sensor.py
index 0741926296e..67f57ee0fbf 100644
--- a/homeassistant/components/glances/sensor.py
+++ b/homeassistant/components/glances/sensor.py
@@ -19,11 +19,11 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import GlancesConfigEntry, GlancesDataUpdateCoordinator
 from .const import CPU_ICON, DOMAIN
+from .coordinator import GlancesConfigEntry, GlancesDataUpdateCoordinator
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -288,7 +288,7 @@ SENSOR_TYPES = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: GlancesConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Glances sensors."""
 
diff --git a/homeassistant/components/go2rtc/const.py b/homeassistant/components/go2rtc/const.py
index 234411936cb..491b2269043 100644
--- a/homeassistant/components/go2rtc/const.py
+++ b/homeassistant/components/go2rtc/const.py
@@ -6,4 +6,4 @@ CONF_DEBUG_UI = "debug_ui"
 DEBUG_UI_URL_MESSAGE = "Url and debug_ui cannot be set at the same time."
 HA_MANAGED_API_PORT = 11984
 HA_MANAGED_URL = f"http://localhost:{HA_MANAGED_API_PORT}/"
-RECOMMENDED_VERSION = "1.9.8"
+RECOMMENDED_VERSION = "1.9.9"
diff --git a/homeassistant/components/goalzero/__init__.py b/homeassistant/components/goalzero/__init__.py
index 6698d1efc99..4a34927a585 100644
--- a/homeassistant/components/goalzero/__init__.py
+++ b/homeassistant/components/goalzero/__init__.py
@@ -36,7 +36,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: GoalZeroConfigEntry) ->
     except exceptions.ConnectError as ex:
         raise ConfigEntryNotReady(f"Failed to connect to device: {ex}") from ex
 
-    entry.runtime_data = GoalZeroDataUpdateCoordinator(hass, api)
+    entry.runtime_data = GoalZeroDataUpdateCoordinator(hass, entry, api)
     await entry.runtime_data.async_config_entry_first_refresh()
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
diff --git a/homeassistant/components/goalzero/binary_sensor.py b/homeassistant/components/goalzero/binary_sensor.py
index 6bd061879eb..86287dc35eb 100644
--- a/homeassistant/components/goalzero/binary_sensor.py
+++ b/homeassistant/components/goalzero/binary_sensor.py
@@ -11,7 +11,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import GoalZeroConfigEntry
 from .entity import GoalZeroEntity
@@ -44,7 +44,7 @@ BINARY_SENSOR_TYPES: tuple[BinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GoalZeroConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Goal Zero Yeti sensor."""
     async_add_entities(
diff --git a/homeassistant/components/goalzero/coordinator.py b/homeassistant/components/goalzero/coordinator.py
index 3c7cd967482..97a7f537759 100644
--- a/homeassistant/components/goalzero/coordinator.py
+++ b/homeassistant/components/goalzero/coordinator.py
@@ -18,11 +18,14 @@ class GoalZeroDataUpdateCoordinator(DataUpdateCoordinator[None]):
 
     config_entry: GoalZeroConfigEntry
 
-    def __init__(self, hass: HomeAssistant, api: Yeti) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: GoalZeroConfigEntry, api: Yeti
+    ) -> None:
         """Initialize the coordinator."""
         super().__init__(
             hass=hass,
             logger=LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=30),
         )
diff --git a/homeassistant/components/goalzero/sensor.py b/homeassistant/components/goalzero/sensor.py
index f565c216745..7b5f8955947 100644
--- a/homeassistant/components/goalzero/sensor.py
+++ b/homeassistant/components/goalzero/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .coordinator import GoalZeroConfigEntry
@@ -131,7 +131,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GoalZeroConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Goal Zero Yeti sensor."""
     async_add_entities(
diff --git a/homeassistant/components/goalzero/switch.py b/homeassistant/components/goalzero/switch.py
index daff4ee5fec..00a1ad936d8 100644
--- a/homeassistant/components/goalzero/switch.py
+++ b/homeassistant/components/goalzero/switch.py
@@ -6,7 +6,7 @@ from typing import Any, cast
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import GoalZeroConfigEntry
 from .entity import GoalZeroEntity
@@ -30,7 +30,7 @@ SWITCH_TYPES: tuple[SwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GoalZeroConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Goal Zero Yeti switch."""
     async_add_entities(
diff --git a/homeassistant/components/gogogate2/common.py b/homeassistant/components/gogogate2/common.py
index 52b1788c23e..8506414ca33 100644
--- a/homeassistant/components/gogogate2/common.py
+++ b/homeassistant/components/gogogate2/common.py
@@ -62,6 +62,7 @@ def get_data_update_coordinator(
 
         config_entry_data[DATA_UPDATE_COORDINATOR] = DeviceDataUpdateCoordinator(
             hass,
+            config_entry,
             _LOGGER,
             api,
             # Name of the data. For logging purposes.
diff --git a/homeassistant/components/gogogate2/config_flow.py b/homeassistant/components/gogogate2/config_flow.py
index 0348d0b428c..cebff656d5d 100644
--- a/homeassistant/components/gogogate2/config_flow.py
+++ b/homeassistant/components/gogogate2/config_flow.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import dataclasses
+import logging
 import re
 from typing import Any, Self
 
@@ -27,6 +28,8 @@ from homeassistant.helpers.service_info.zeroconf import (
 from .common import get_api
 from .const import DEVICE_TYPE_GOGOGATE2, DEVICE_TYPE_ISMARTGATE, DOMAIN
 
+_LOGGER = logging.getLogger(__name__)
+
 DEVICE_NAMES = {
     DEVICE_TYPE_GOGOGATE2: "Gogogate2",
     DEVICE_TYPE_ISMARTGATE: "ismartgate",
@@ -115,7 +118,8 @@ class Gogogate2FlowHandler(ConfigFlow, domain=DOMAIN):
                 else:
                     errors["base"] = "cannot_connect"
 
-            except Exception:  # noqa: BLE001
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
                 errors["base"] = "cannot_connect"
 
         if self._ip_address and self._device_type:
diff --git a/homeassistant/components/gogogate2/coordinator.py b/homeassistant/components/gogogate2/coordinator.py
index 7c15e8b1c32..c2e7cc47b46 100644
--- a/homeassistant/components/gogogate2/coordinator.py
+++ b/homeassistant/components/gogogate2/coordinator.py
@@ -8,6 +8,7 @@ import logging
 
 from ismartgate import AbstractGateApi, GogoGate2InfoResponse, ISmartGateInfoResponse
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
@@ -18,9 +19,12 @@ class DeviceDataUpdateCoordinator(
 ):
     """Manages polling for state changes from the device."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         logger: logging.Logger,
         api: AbstractGateApi,
         *,
@@ -33,10 +37,10 @@ class DeviceDataUpdateCoordinator(
         request_refresh_debouncer: Debouncer | None = None,
     ) -> None:
         """Initialize the data update coordinator."""
-        DataUpdateCoordinator.__init__(
-            self,
+        super().__init__(
             hass,
             logger,
+            config_entry=config_entry,
             name=name,
             update_interval=update_interval,
             update_method=update_method,
diff --git a/homeassistant/components/gogogate2/cover.py b/homeassistant/components/gogogate2/cover.py
index 6bd38a0bc01..9492108d4b2 100644
--- a/homeassistant/components/gogogate2/cover.py
+++ b/homeassistant/components/gogogate2/cover.py
@@ -18,7 +18,7 @@ from homeassistant.components.cover import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .common import cover_unique_id, get_data_update_coordinator
 from .coordinator import DeviceDataUpdateCoordinator
@@ -28,7 +28,7 @@ from .entity import GoGoGate2Entity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the config entry."""
     data_update_coordinator = get_data_update_coordinator(hass, config_entry)
diff --git a/homeassistant/components/gogogate2/manifest.json b/homeassistant/components/gogogate2/manifest.json
index 40633537ddf..238c145302a 100644
--- a/homeassistant/components/gogogate2/manifest.json
+++ b/homeassistant/components/gogogate2/manifest.json
@@ -14,5 +14,5 @@
   },
   "iot_class": "local_polling",
   "loggers": ["ismartgate"],
-  "requirements": ["ismartgate==5.0.1"]
+  "requirements": ["ismartgate==5.0.2"]
 }
diff --git a/homeassistant/components/gogogate2/sensor.py b/homeassistant/components/gogogate2/sensor.py
index c7740e24825..ce86ca9ac43 100644
--- a/homeassistant/components/gogogate2/sensor.py
+++ b/homeassistant/components/gogogate2/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .common import get_data_update_coordinator, sensor_unique_id
 from .coordinator import DeviceDataUpdateCoordinator
@@ -26,7 +26,7 @@ SENSOR_ID_WIRED = "WIRE"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the config entry."""
     data_update_coordinator = get_data_update_coordinator(hass, config_entry)
diff --git a/homeassistant/components/goodwe/button.py b/homeassistant/components/goodwe/button.py
index d3d96a19a76..e93b23570db 100644
--- a/homeassistant/components/goodwe/button.py
+++ b/homeassistant/components/goodwe/button.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, KEY_DEVICE_INFO, KEY_INVERTER
 
@@ -37,7 +37,7 @@ SYNCHRONIZE_CLOCK = GoodweButtonEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the inverter button entities from a config entry."""
     inverter = hass.data[DOMAIN][config_entry.entry_id][KEY_INVERTER]
diff --git a/homeassistant/components/goodwe/coordinator.py b/homeassistant/components/goodwe/coordinator.py
index a8ee7df6337..914ba3155b4 100644
--- a/homeassistant/components/goodwe/coordinator.py
+++ b/homeassistant/components/goodwe/coordinator.py
@@ -19,6 +19,8 @@ _LOGGER = logging.getLogger(__name__)
 class GoodweUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Gather data for the energy device."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
@@ -29,6 +31,7 @@ class GoodweUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             name=entry.title,
             update_interval=SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/goodwe/number.py b/homeassistant/components/goodwe/number.py
index ce36bb35bf9..0a61ac19d64 100644
--- a/homeassistant/components/goodwe/number.py
+++ b/homeassistant/components/goodwe/number.py
@@ -17,7 +17,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfPower
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, KEY_DEVICE_INFO, KEY_INVERTER
 
@@ -87,7 +87,7 @@ NUMBERS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the inverter select entities from a config entry."""
     inverter = hass.data[DOMAIN][config_entry.entry_id][KEY_INVERTER]
diff --git a/homeassistant/components/goodwe/select.py b/homeassistant/components/goodwe/select.py
index 4fa84c8401f..340e10bfa0f 100644
--- a/homeassistant/components/goodwe/select.py
+++ b/homeassistant/components/goodwe/select.py
@@ -9,7 +9,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, KEY_DEVICE_INFO, KEY_INVERTER
 
@@ -40,7 +40,7 @@ OPERATION_MODE = SelectEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the inverter select entities from a config entry."""
     inverter = hass.data[DOMAIN][config_entry.entry_id][KEY_INVERTER]
diff --git a/homeassistant/components/goodwe/sensor.py b/homeassistant/components/goodwe/sensor.py
index 03912c9a1ec..d2dce2770e4 100644
--- a/homeassistant/components/goodwe/sensor.py
+++ b/homeassistant/components/goodwe/sensor.py
@@ -33,11 +33,11 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_track_point_in_time
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN, KEY_COORDINATOR, KEY_DEVICE_INFO, KEY_INVERTER
 from .coordinator import GoodweUpdateCoordinator
@@ -166,7 +166,7 @@ TEXT_SENSOR = GoodweSensorEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the GoodWe inverter from a config entry."""
     entities: list[InverterSensor] = []
diff --git a/homeassistant/components/google/__init__.py b/homeassistant/components/google/__init__.py
index 2ad400aabab..2b7aeadc0ba 100644
--- a/homeassistant/components/google/__init__.py
+++ b/homeassistant/components/google/__init__.py
@@ -28,9 +28,8 @@ from homeassistant.exceptions import (
     ConfigEntryNotReady,
     HomeAssistantError,
 )
-from homeassistant.helpers import config_entry_oauth2_flow
+from homeassistant.helpers import config_entry_oauth2_flow, config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import generate_entity_id
 
 from .api import ApiAuthImpl, get_feature_access
diff --git a/homeassistant/components/google/calendar.py b/homeassistant/components/google/calendar.py
index 5ac5dae616c..a62d2bf1d6b 100644
--- a/homeassistant/components/google/calendar.py
+++ b/homeassistant/components/google/calendar.py
@@ -43,7 +43,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.exceptions import HomeAssistantError, PlatformNotReady
 from homeassistant.helpers import entity_platform, entity_registry as er
 from homeassistant.helpers.entity import generate_entity_id
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import dt as dt_util
 
@@ -89,6 +89,7 @@ OPAQUE = "opaque"
 RRULE_PREFIX = "RRULE:"
 
 SERVICE_CREATE_EVENT = "create_event"
+FILTERED_EVENT_TYPES = [EventTypeEnum.BIRTHDAY, EventTypeEnum.WORKING_LOCATION]
 
 
 @dataclasses.dataclass(frozen=True, kw_only=True)
@@ -103,7 +104,7 @@ class GoogleCalendarEntityDescription(CalendarEntityDescription):
     search: str | None
     local_sync: bool
     device_id: str
-    working_location: bool = False
+    event_type: EventTypeEnum | None = None
 
 
 def _get_entity_descriptions(
@@ -173,14 +174,24 @@ def _get_entity_descriptions(
             local_sync,
         )
         if calendar_item.primary and local_sync:
-            _LOGGER.debug("work location entity")
+            # Create a separate calendar for birthdays
+            entity_descriptions.append(
+                dataclasses.replace(
+                    entity_description,
+                    key=f"{key}-birthdays",
+                    translation_key="birthdays",
+                    event_type=EventTypeEnum.BIRTHDAY,
+                    name=None,
+                    entity_id=None,
+                )
+            )
             # Create an optional disabled by default entity for Work Location
             entity_descriptions.append(
                 dataclasses.replace(
                     entity_description,
                     key=f"{key}-work-location",
                     translation_key="working_location",
-                    working_location=True,
+                    event_type=EventTypeEnum.WORKING_LOCATION,
                     name=None,
                     entity_id=None,
                     entity_registry_enabled_default=False,
@@ -192,7 +203,7 @@ def _get_entity_descriptions(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the google calendar platform."""
     calendar_service = hass.data[DOMAIN][config_entry.entry_id][DATA_SERVICE]
@@ -266,6 +277,7 @@ async def async_setup_entry(
             if not entity_description.local_sync:
                 coordinator = CalendarQueryUpdateCoordinator(
                     hass,
+                    config_entry,
                     calendar_service,
                     entity_description.name or entity_description.key,
                     calendar_id,
@@ -285,6 +297,7 @@ async def async_setup_entry(
                 )
                 coordinator = CalendarSyncUpdateCoordinator(
                     hass,
+                    config_entry,
                     sync,
                     entity_description.name or entity_description.key,
                 )
@@ -381,9 +394,18 @@ class GoogleCalendarEntity(
             for attendee in event.attendees
         ):
             return False
-
-        if event.event_type == EventTypeEnum.WORKING_LOCATION:
-            return self.entity_description.working_location
+        # Calendar enttiy may be limited to a specific event type
+        if (
+            self.entity_description.event_type is not None
+            and self.entity_description.event_type != event.event_type
+        ):
+            return False
+        # Default calendar entity omits the special types but includes all the others
+        if (
+            self.entity_description.event_type is None
+            and event.event_type in FILTERED_EVENT_TYPES
+        ):
+            return False
         if self._ignore_availability:
             return True
         return event.transparency == OPAQUE
diff --git a/homeassistant/components/google/coordinator.py b/homeassistant/components/google/coordinator.py
index 19198041c05..4a8a3d9f167 100644
--- a/homeassistant/components/google/coordinator.py
+++ b/homeassistant/components/google/coordinator.py
@@ -52,6 +52,7 @@ class CalendarSyncUpdateCoordinator(DataUpdateCoordinator[Timeline]):
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         sync: CalendarEventSyncManager,
         name: str,
     ) -> None:
@@ -59,6 +60,7 @@ class CalendarSyncUpdateCoordinator(DataUpdateCoordinator[Timeline]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=name,
             update_interval=MIN_TIME_BETWEEN_UPDATES,
         )
@@ -111,6 +113,7 @@ class CalendarQueryUpdateCoordinator(DataUpdateCoordinator[list[Event]]):
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         calendar_service: GoogleCalendarService,
         name: str,
         calendar_id: str,
@@ -120,6 +123,7 @@ class CalendarQueryUpdateCoordinator(DataUpdateCoordinator[list[Event]]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=name,
             update_interval=MIN_TIME_BETWEEN_UPDATES,
         )
diff --git a/homeassistant/components/google/manifest.json b/homeassistant/components/google/manifest.json
index bd04597e513..81fd2b07de4 100644
--- a/homeassistant/components/google/manifest.json
+++ b/homeassistant/components/google/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/google",
   "iot_class": "cloud_polling",
   "loggers": ["googleapiclient"],
-  "requirements": ["gcal-sync==7.0.0", "oauth2client==4.1.3", "ical==8.3.0"]
+  "requirements": ["gcal-sync==7.0.0", "oauth2client==4.1.3", "ical==9.0.1"]
 }
diff --git a/homeassistant/components/google/strings.json b/homeassistant/components/google/strings.json
index 5ee0cdd9c14..5776fd0480b 100644
--- a/homeassistant/components/google/strings.json
+++ b/homeassistant/components/google/strings.json
@@ -131,6 +131,9 @@
     "calendar": {
       "working_location": {
         "name": "Working location"
+      },
+      "birthdays": {
+        "name": "Birthdays"
       }
     }
   }
diff --git a/homeassistant/components/google_assistant/button.py b/homeassistant/components/google_assistant/button.py
index cf3a42e251b..58560d7b8d1 100644
--- a/homeassistant/components/google_assistant/button.py
+++ b/homeassistant/components/google_assistant/button.py
@@ -8,7 +8,7 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from .const import CONF_PROJECT_ID, CONF_SERVICE_ACCOUNT, DATA_CONFIG, DOMAIN
@@ -18,7 +18,7 @@ from .http import GoogleConfig
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the platform."""
     yaml_config: ConfigType = hass.data[DOMAIN][DATA_CONFIG]
diff --git a/homeassistant/components/google_assistant/const.py b/homeassistant/components/google_assistant/const.py
index 8132ecaae2c..71738c9d13e 100644
--- a/homeassistant/components/google_assistant/const.py
+++ b/homeassistant/components/google_assistant/const.py
@@ -14,6 +14,7 @@ from homeassistant.components import (
     input_boolean,
     input_button,
     input_select,
+    lawn_mower,
     light,
     lock,
     media_player,
@@ -58,6 +59,7 @@ DEFAULT_EXPOSED_DOMAINS = [
     "humidifier",
     "input_boolean",
     "input_select",
+    "lawn_mower",
     "light",
     "lock",
     "media_player",
@@ -88,6 +90,7 @@ TYPE_GATE = f"{PREFIX_TYPES}GATE"
 TYPE_HUMIDIFIER = f"{PREFIX_TYPES}HUMIDIFIER"
 TYPE_LIGHT = f"{PREFIX_TYPES}LIGHT"
 TYPE_LOCK = f"{PREFIX_TYPES}LOCK"
+TYPE_MOWER = f"{PREFIX_TYPES}MOWER"
 TYPE_OUTLET = f"{PREFIX_TYPES}OUTLET"
 TYPE_RECEIVER = f"{PREFIX_TYPES}AUDIO_VIDEO_RECEIVER"
 TYPE_SCENE = f"{PREFIX_TYPES}SCENE"
@@ -149,6 +152,7 @@ DOMAIN_TO_GOOGLE_TYPES = {
     input_boolean.DOMAIN: TYPE_SWITCH,
     input_button.DOMAIN: TYPE_SCENE,
     input_select.DOMAIN: TYPE_SENSOR,
+    lawn_mower.DOMAIN: TYPE_MOWER,
     light.DOMAIN: TYPE_LIGHT,
     lock.DOMAIN: TYPE_LOCK,
     media_player.DOMAIN: TYPE_SETTOP,
diff --git a/homeassistant/components/google_assistant/trait.py b/homeassistant/components/google_assistant/trait.py
index 44251a3be04..9edd340d7d9 100644
--- a/homeassistant/components/google_assistant/trait.py
+++ b/homeassistant/components/google_assistant/trait.py
@@ -21,6 +21,7 @@ from homeassistant.components import (
     input_boolean,
     input_button,
     input_select,
+    lawn_mower,
     light,
     lock,
     media_player,
@@ -42,6 +43,7 @@ from homeassistant.components.climate import ClimateEntityFeature
 from homeassistant.components.cover import CoverEntityFeature
 from homeassistant.components.fan import FanEntityFeature
 from homeassistant.components.humidifier import HumidifierEntityFeature
+from homeassistant.components.lawn_mower import LawnMowerEntityFeature
 from homeassistant.components.light import LightEntityFeature
 from homeassistant.components.lock import LockState
 from homeassistant.components.media_player import MediaPlayerEntityFeature, MediaType
@@ -714,7 +716,7 @@ class DockTrait(_Trait):
     @staticmethod
     def supported(domain, features, device_class, _):
         """Test if state is supported."""
-        return domain == vacuum.DOMAIN
+        return domain in (vacuum.DOMAIN, lawn_mower.DOMAIN)
 
     def sync_attributes(self) -> dict[str, Any]:
         """Return dock attributes for a sync request."""
@@ -722,17 +724,32 @@ class DockTrait(_Trait):
 
     def query_attributes(self) -> dict[str, Any]:
         """Return dock query attributes."""
-        return {"isDocked": self.state.state == vacuum.VacuumActivity.DOCKED}
+        domain = self.state.domain
+        state = self.state.state
+        if domain == vacuum.DOMAIN:
+            return {"isDocked": state == vacuum.VacuumActivity.DOCKED}
+        if domain == lawn_mower.DOMAIN:
+            return {"isDocked": state == lawn_mower.LawnMowerActivity.DOCKED}
+        raise NotImplementedError(f"Unsupported domain {domain}")
 
     async def execute(self, command, data, params, challenge):
         """Execute a dock command."""
-        await self.hass.services.async_call(
-            self.state.domain,
-            vacuum.SERVICE_RETURN_TO_BASE,
-            {ATTR_ENTITY_ID: self.state.entity_id},
-            blocking=not self.config.should_report_state,
-            context=data.context,
-        )
+        domain = self.state.domain
+        service: str | None = None
+
+        if domain == vacuum.DOMAIN:
+            service = vacuum.SERVICE_RETURN_TO_BASE
+        elif domain == lawn_mower.DOMAIN:
+            service = lawn_mower.SERVICE_DOCK
+
+        if service:
+            await self.hass.services.async_call(
+                self.state.domain,
+                service,
+                {ATTR_ENTITY_ID: self.state.entity_id},
+                blocking=not self.config.should_report_state,
+                context=data.context,
+            )
 
 
 @register_trait
@@ -843,7 +860,7 @@ class StartStopTrait(_Trait):
     @staticmethod
     def supported(domain, features, device_class, _):
         """Test if state is supported."""
-        if domain == vacuum.DOMAIN:
+        if domain in (vacuum.DOMAIN, lawn_mower.DOMAIN):
             return True
 
         if (
@@ -863,6 +880,12 @@ class StartStopTrait(_Trait):
                 & VacuumEntityFeature.PAUSE
                 != 0
             }
+        if domain == lawn_mower.DOMAIN:
+            return {
+                "pausable": self.state.attributes.get(ATTR_SUPPORTED_FEATURES, 0)
+                & LawnMowerEntityFeature.PAUSE
+                != 0
+            }
         if domain in COVER_VALVE_DOMAINS:
             return {}
 
@@ -878,6 +901,11 @@ class StartStopTrait(_Trait):
                 "isRunning": state == vacuum.VacuumActivity.CLEANING,
                 "isPaused": state == vacuum.VacuumActivity.PAUSED,
             }
+        if domain == lawn_mower.DOMAIN:
+            return {
+                "isRunning": state == lawn_mower.LawnMowerActivity.MOWING,
+                "isPaused": state == lawn_mower.LawnMowerActivity.PAUSED,
+            }
 
         if domain in COVER_VALVE_DOMAINS:
             return {
@@ -896,46 +924,52 @@ class StartStopTrait(_Trait):
         if domain == vacuum.DOMAIN:
             await self._execute_vacuum(command, data, params, challenge)
             return
+        if domain == lawn_mower.DOMAIN:
+            await self._execute_lawn_mower(command, data, params, challenge)
+            return
         if domain in COVER_VALVE_DOMAINS:
             await self._execute_cover_or_valve(command, data, params, challenge)
             return
 
     async def _execute_vacuum(self, command, data, params, challenge):
         """Execute a StartStop command."""
+        service: str | None = None
         if command == COMMAND_START_STOP:
-            if params["start"]:
-                await self.hass.services.async_call(
-                    self.state.domain,
-                    vacuum.SERVICE_START,
-                    {ATTR_ENTITY_ID: self.state.entity_id},
-                    blocking=not self.config.should_report_state,
-                    context=data.context,
-                )
-            else:
-                await self.hass.services.async_call(
-                    self.state.domain,
-                    vacuum.SERVICE_STOP,
-                    {ATTR_ENTITY_ID: self.state.entity_id},
-                    blocking=not self.config.should_report_state,
-                    context=data.context,
-                )
+            service = vacuum.SERVICE_START if params["start"] else vacuum.SERVICE_STOP
         elif command == COMMAND_PAUSE_UNPAUSE:
-            if params["pause"]:
-                await self.hass.services.async_call(
-                    self.state.domain,
-                    vacuum.SERVICE_PAUSE,
-                    {ATTR_ENTITY_ID: self.state.entity_id},
-                    blocking=not self.config.should_report_state,
-                    context=data.context,
-                )
-            else:
-                await self.hass.services.async_call(
-                    self.state.domain,
-                    vacuum.SERVICE_START,
-                    {ATTR_ENTITY_ID: self.state.entity_id},
-                    blocking=not self.config.should_report_state,
-                    context=data.context,
-                )
+            service = vacuum.SERVICE_PAUSE if params["pause"] else vacuum.SERVICE_START
+        if service:
+            await self.hass.services.async_call(
+                self.state.domain,
+                service,
+                {ATTR_ENTITY_ID: self.state.entity_id},
+                blocking=not self.config.should_report_state,
+                context=data.context,
+            )
+
+    async def _execute_lawn_mower(self, command, data, params, challenge):
+        """Execute a StartStop command."""
+        service: str | None = None
+        if command == COMMAND_START_STOP:
+            service = (
+                lawn_mower.SERVICE_START_MOWING
+                if params["start"]
+                else lawn_mower.SERVICE_DOCK
+            )
+        elif command == COMMAND_PAUSE_UNPAUSE:
+            service = (
+                lawn_mower.SERVICE_PAUSE
+                if params["pause"]
+                else lawn_mower.SERVICE_START_MOWING
+            )
+        if service:
+            await self.hass.services.async_call(
+                self.state.domain,
+                service,
+                {ATTR_ENTITY_ID: self.state.entity_id},
+                blocking=not self.config.should_report_state,
+                context=data.context,
+            )
 
     async def _execute_cover_or_valve(self, command, data, params, challenge):
         """Execute a StartStop command."""
diff --git a/homeassistant/components/google_assistant_sdk/__init__.py b/homeassistant/components/google_assistant_sdk/__init__.py
index 4ea496f2824..a08d7554516 100644
--- a/homeassistant/components/google_assistant_sdk/__init__.py
+++ b/homeassistant/components/google_assistant_sdk/__init__.py
@@ -10,7 +10,7 @@ from google.oauth2.credentials import Credentials
 import voluptuous as vol
 
 from homeassistant.components import conversation
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_NAME, Platform
 from homeassistant.core import (
     HomeAssistant,
@@ -99,12 +99,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
     hass.data[DOMAIN].pop(entry.entry_id)
-    loaded_entries = [
-        entry
-        for entry in hass.config_entries.async_entries(DOMAIN)
-        if entry.state == ConfigEntryState.LOADED
-    ]
-    if len(loaded_entries) == 1:
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
         for service_name in hass.services.async_services_for_domain(DOMAIN):
             hass.services.async_remove(DOMAIN, service_name)
 
diff --git a/homeassistant/components/google_assistant_sdk/manifest.json b/homeassistant/components/google_assistant_sdk/manifest.json
index 85469a464b3..70e93f39f42 100644
--- a/homeassistant/components/google_assistant_sdk/manifest.json
+++ b/homeassistant/components/google_assistant_sdk/manifest.json
@@ -7,6 +7,6 @@
   "documentation": "https://www.home-assistant.io/integrations/google_assistant_sdk",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["gassist-text==0.0.11"],
+  "requirements": ["gassist-text==0.0.12"],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/google_cloud/helpers.py b/homeassistant/components/google_cloud/helpers.py
index f1adc42b4cd..f71ccea00cc 100644
--- a/homeassistant/components/google_cloud/helpers.py
+++ b/homeassistant/components/google_cloud/helpers.py
@@ -12,7 +12,7 @@ from google.oauth2.service_account import Credentials
 import voluptuous as vol
 
 from homeassistant.components.tts import CONF_LANG
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.selector import (
     NumberSelector,
     NumberSelectorConfig,
diff --git a/homeassistant/components/google_cloud/stt.py b/homeassistant/components/google_cloud/stt.py
index ebca586d1a3..cd5055383ea 100644
--- a/homeassistant/components/google_cloud/stt.py
+++ b/homeassistant/components/google_cloud/stt.py
@@ -6,6 +6,7 @@ from collections.abc import AsyncGenerator, AsyncIterable
 import logging
 
 from google.api_core.exceptions import GoogleAPIError, Unauthenticated
+from google.api_core.retry import AsyncRetry
 from google.cloud import speech_v1
 
 from homeassistant.components.stt import (
@@ -22,7 +23,7 @@ from homeassistant.components.stt import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CONF_SERVICE_ACCOUNT_INFO,
@@ -38,7 +39,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Google Cloud speech platform via config entry."""
     service_account_info = config_entry.data[CONF_SERVICE_ACCOUNT_INFO]
@@ -127,6 +128,7 @@ class GoogleCloudSpeechToTextEntity(SpeechToTextEntity):
             responses = await self._client.streaming_recognize(
                 requests=request_generator(),
                 timeout=10,
+                retry=AsyncRetry(initial=0.1, maximum=2.0, multiplier=2.0),
             )
 
             transcript = ""
diff --git a/homeassistant/components/google_cloud/tts.py b/homeassistant/components/google_cloud/tts.py
index 7f22dda4faf..16519645dee 100644
--- a/homeassistant/components/google_cloud/tts.py
+++ b/homeassistant/components/google_cloud/tts.py
@@ -7,6 +7,7 @@ from pathlib import Path
 from typing import Any, cast
 
 from google.api_core.exceptions import GoogleAPIError, Unauthenticated
+from google.api_core.retry import AsyncRetry
 from google.cloud import texttospeech
 import voluptuous as vol
 
@@ -21,7 +22,7 @@ from homeassistant.components.tts import (
 from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import (
@@ -88,7 +89,7 @@ async def async_get_engine(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Google Cloud text-to-speech."""
     service_account_info = config_entry.data[CONF_SERVICE_ACCOUNT_INFO]
@@ -215,7 +216,11 @@ class BaseGoogleCloudProvider:
             ),
         )
 
-        response = await self._client.synthesize_speech(request, timeout=10)
+        response = await self._client.synthesize_speech(
+            request,
+            timeout=10,
+            retry=AsyncRetry(initial=0.1, maximum=2.0, multiplier=2.0),
+        )
 
         if encoding == texttospeech.AudioEncoding.MP3:
             extension = "mp3"
diff --git a/homeassistant/components/google_drive/__init__.py b/homeassistant/components/google_drive/__init__.py
new file mode 100644
index 00000000000..d5252bd01ea
--- /dev/null
+++ b/homeassistant/components/google_drive/__init__.py
@@ -0,0 +1,65 @@
+"""The Google Drive integration."""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+
+from google_drive_api.exceptions import GoogleDriveApiError
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers import instance_id
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.config_entry_oauth2_flow import (
+    OAuth2Session,
+    async_get_config_entry_implementation,
+)
+from homeassistant.util.hass_dict import HassKey
+
+from .api import AsyncConfigEntryAuth, DriveClient
+from .const import DOMAIN
+
+DATA_BACKUP_AGENT_LISTENERS: HassKey[list[Callable[[], None]]] = HassKey(
+    f"{DOMAIN}.backup_agent_listeners"
+)
+
+
+type GoogleDriveConfigEntry = ConfigEntry[DriveClient]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: GoogleDriveConfigEntry) -> bool:
+    """Set up Google Drive from a config entry."""
+    auth = AsyncConfigEntryAuth(
+        async_get_clientsession(hass),
+        OAuth2Session(
+            hass, entry, await async_get_config_entry_implementation(hass, entry)
+        ),
+    )
+
+    # Test we can refresh the token and raise ConfigEntryAuthFailed or ConfigEntryNotReady if not
+    await auth.async_get_access_token()
+
+    client = DriveClient(await instance_id.async_get(hass), auth)
+    entry.runtime_data = client
+
+    # Test we can access Google Drive and raise if not
+    try:
+        await client.async_create_ha_root_folder_if_not_exists()
+    except GoogleDriveApiError as err:
+        raise ConfigEntryNotReady from err
+
+    def async_notify_backup_listeners() -> None:
+        for listener in hass.data.get(DATA_BACKUP_AGENT_LISTENERS, []):
+            listener()
+
+    entry.async_on_unload(entry.async_on_state_change(async_notify_backup_listeners))
+
+    return True
+
+
+async def async_unload_entry(
+    hass: HomeAssistant, entry: GoogleDriveConfigEntry
+) -> bool:
+    """Unload a config entry."""
+    return True
diff --git a/homeassistant/components/google_drive/api.py b/homeassistant/components/google_drive/api.py
new file mode 100644
index 00000000000..c21d42e0f3a
--- /dev/null
+++ b/homeassistant/components/google_drive/api.py
@@ -0,0 +1,202 @@
+"""API for Google Drive bound to Home Assistant OAuth."""
+
+from __future__ import annotations
+
+from collections.abc import AsyncIterator, Callable, Coroutine
+import json
+import logging
+from typing import Any
+
+from aiohttp import ClientSession, ClientTimeout, StreamReader
+from aiohttp.client_exceptions import ClientError, ClientResponseError
+from google_drive_api.api import AbstractAuth, GoogleDriveApi
+
+from homeassistant.components.backup import AgentBackup, suggested_filename
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import CONF_ACCESS_TOKEN
+from homeassistant.exceptions import (
+    ConfigEntryAuthFailed,
+    ConfigEntryNotReady,
+    HomeAssistantError,
+)
+from homeassistant.helpers import config_entry_oauth2_flow
+
+_UPLOAD_AND_DOWNLOAD_TIMEOUT = 12 * 3600
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class AsyncConfigEntryAuth(AbstractAuth):
+    """Provide Google Drive authentication tied to an OAuth2 based config entry."""
+
+    def __init__(
+        self,
+        websession: ClientSession,
+        oauth_session: config_entry_oauth2_flow.OAuth2Session,
+    ) -> None:
+        """Initialize AsyncConfigEntryAuth."""
+        super().__init__(websession)
+        self._oauth_session = oauth_session
+
+    async def async_get_access_token(self) -> str:
+        """Return a valid access token."""
+        try:
+            await self._oauth_session.async_ensure_token_valid()
+        except ClientError as ex:
+            if (
+                self._oauth_session.config_entry.state
+                is ConfigEntryState.SETUP_IN_PROGRESS
+            ):
+                if isinstance(ex, ClientResponseError) and 400 <= ex.status < 500:
+                    raise ConfigEntryAuthFailed(
+                        "OAuth session is not valid, reauth required"
+                    ) from ex
+                raise ConfigEntryNotReady from ex
+            if hasattr(ex, "status") and ex.status == 400:
+                self._oauth_session.config_entry.async_start_reauth(
+                    self._oauth_session.hass
+                )
+            raise HomeAssistantError(ex) from ex
+        return str(self._oauth_session.token[CONF_ACCESS_TOKEN])
+
+
+class AsyncConfigFlowAuth(AbstractAuth):
+    """Provide authentication tied to a fixed token for the config flow."""
+
+    def __init__(
+        self,
+        websession: ClientSession,
+        token: str,
+    ) -> None:
+        """Initialize AsyncConfigFlowAuth."""
+        super().__init__(websession)
+        self._token = token
+
+    async def async_get_access_token(self) -> str:
+        """Return a valid access token."""
+        return self._token
+
+
+class DriveClient:
+    """Google Drive client."""
+
+    def __init__(
+        self,
+        ha_instance_id: str,
+        auth: AbstractAuth,
+    ) -> None:
+        """Initialize Google Drive client."""
+        self._ha_instance_id = ha_instance_id
+        self._api = GoogleDriveApi(auth)
+
+    async def async_get_email_address(self) -> str:
+        """Get email address of the current user."""
+        res = await self._api.get_user(params={"fields": "user(emailAddress)"})
+        return str(res["user"]["emailAddress"])
+
+    async def async_create_ha_root_folder_if_not_exists(self) -> tuple[str, str]:
+        """Create Home Assistant folder if it doesn't exist."""
+        fields = "id,name"
+        query = " and ".join(
+            [
+                "properties has { key='home_assistant' and value='root' }",
+                f"properties has {{ key='instance_id' and value='{self._ha_instance_id}' }}",
+                "trashed=false",
+            ]
+        )
+        res = await self._api.list_files(
+            params={"q": query, "fields": f"files({fields})"}
+        )
+        for file in res["files"]:
+            _LOGGER.debug("Found existing folder: %s", file)
+            return str(file["id"]), str(file["name"])
+
+        file_metadata = {
+            "name": "Home Assistant",
+            "mimeType": "application/vnd.google-apps.folder",
+            "properties": {
+                "home_assistant": "root",
+                "instance_id": self._ha_instance_id,
+            },
+        }
+        _LOGGER.debug("Creating new folder with metadata: %s", file_metadata)
+        res = await self._api.create_file(params={"fields": fields}, json=file_metadata)
+        _LOGGER.debug("Created folder: %s", res)
+        return str(res["id"]), str(res["name"])
+
+    async def async_upload_backup(
+        self,
+        open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
+        backup: AgentBackup,
+    ) -> None:
+        """Upload a backup."""
+        folder_id, _ = await self.async_create_ha_root_folder_if_not_exists()
+        backup_metadata = {
+            "name": suggested_filename(backup),
+            "description": json.dumps(backup.as_dict()),
+            "parents": [folder_id],
+            "properties": {
+                "home_assistant": "backup",
+                "instance_id": self._ha_instance_id,
+                "backup_id": backup.backup_id,
+            },
+        }
+        _LOGGER.debug(
+            "Uploading backup: %s with Google Drive metadata: %s",
+            backup.backup_id,
+            backup_metadata,
+        )
+        await self._api.resumable_upload_file(
+            backup_metadata,
+            open_stream,
+            backup.size,
+            timeout=ClientTimeout(total=_UPLOAD_AND_DOWNLOAD_TIMEOUT),
+        )
+        _LOGGER.debug(
+            "Uploaded backup: %s to: '%s'",
+            backup.backup_id,
+            backup_metadata["name"],
+        )
+
+    async def async_list_backups(self) -> list[AgentBackup]:
+        """List backups."""
+        query = " and ".join(
+            [
+                "properties has { key='home_assistant' and value='backup' }",
+                f"properties has {{ key='instance_id' and value='{self._ha_instance_id}' }}",
+                "trashed=false",
+            ]
+        )
+        res = await self._api.list_files(
+            params={"q": query, "fields": "files(description)"}
+        )
+        backups = []
+        for file in res["files"]:
+            backup = AgentBackup.from_dict(json.loads(file["description"]))
+            backups.append(backup)
+        return backups
+
+    async def async_get_backup_file_id(self, backup_id: str) -> str | None:
+        """Get file_id of backup if it exists."""
+        query = " and ".join(
+            [
+                "properties has { key='home_assistant' and value='backup' }",
+                f"properties has {{ key='instance_id' and value='{self._ha_instance_id}' }}",
+                f"properties has {{ key='backup_id' and value='{backup_id}' }}",
+            ]
+        )
+        res = await self._api.list_files(params={"q": query, "fields": "files(id)"})
+        for file in res["files"]:
+            return str(file["id"])
+        return None
+
+    async def async_delete(self, file_id: str) -> None:
+        """Delete file."""
+        await self._api.delete_file(file_id)
+
+    async def async_download(self, file_id: str) -> StreamReader:
+        """Download a file."""
+        resp = await self._api.get_file_content(
+            file_id, timeout=ClientTimeout(total=_UPLOAD_AND_DOWNLOAD_TIMEOUT)
+        )
+        return resp.content
diff --git a/homeassistant/components/google_drive/application_credentials.py b/homeassistant/components/google_drive/application_credentials.py
new file mode 100644
index 00000000000..8bcab2b039c
--- /dev/null
+++ b/homeassistant/components/google_drive/application_credentials.py
@@ -0,0 +1,31 @@
+"""application_credentials platform for Google Drive."""
+
+from homeassistant.components.application_credentials import AuthorizationServer
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.config_entry_oauth2_flow import (
+    AUTH_CALLBACK_PATH,
+    MY_AUTH_CALLBACK_PATH,
+)
+
+
+async def async_get_authorization_server(hass: HomeAssistant) -> AuthorizationServer:
+    """Return authorization server."""
+    return AuthorizationServer(
+        "https://accounts.google.com/o/oauth2/v2/auth",
+        "https://oauth2.googleapis.com/token",
+    )
+
+
+async def async_get_description_placeholders(hass: HomeAssistant) -> dict[str, str]:
+    """Return description placeholders for the credentials dialog."""
+    if "my" in hass.config.components:
+        redirect_url = MY_AUTH_CALLBACK_PATH
+    else:
+        ha_host = hass.config.external_url or "https://YOUR_DOMAIN:PORT"
+        redirect_url = f"{ha_host}{AUTH_CALLBACK_PATH}"
+    return {
+        "oauth_consent_url": "https://console.cloud.google.com/apis/credentials/consent",
+        "more_info_url": "https://www.home-assistant.io/integrations/google_drive/",
+        "oauth_creds_url": "https://console.cloud.google.com/apis/credentials",
+        "redirect_url": redirect_url,
+    }
diff --git a/homeassistant/components/google_drive/backup.py b/homeassistant/components/google_drive/backup.py
new file mode 100644
index 00000000000..a4b7fc956ce
--- /dev/null
+++ b/homeassistant/components/google_drive/backup.py
@@ -0,0 +1,149 @@
+"""Backup platform for the Google Drive integration."""
+
+from __future__ import annotations
+
+from collections.abc import AsyncIterator, Callable, Coroutine
+import logging
+from typing import Any
+
+from google_drive_api.exceptions import GoogleDriveApiError
+
+from homeassistant.components.backup import (
+    AgentBackup,
+    BackupAgent,
+    BackupAgentError,
+    BackupNotFound,
+)
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.aiohttp_client import ChunkAsyncStreamIterator
+from homeassistant.util import slugify
+
+from . import DATA_BACKUP_AGENT_LISTENERS, GoogleDriveConfigEntry
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_get_backup_agents(
+    hass: HomeAssistant,
+    **kwargs: Any,
+) -> list[BackupAgent]:
+    """Return a list of backup agents."""
+    entries = hass.config_entries.async_loaded_entries(DOMAIN)
+    return [GoogleDriveBackupAgent(entry) for entry in entries]
+
+
+@callback
+def async_register_backup_agents_listener(
+    hass: HomeAssistant,
+    *,
+    listener: Callable[[], None],
+    **kwargs: Any,
+) -> Callable[[], None]:
+    """Register a listener to be called when agents are added or removed.
+
+    :return: A function to unregister the listener.
+    """
+    hass.data.setdefault(DATA_BACKUP_AGENT_LISTENERS, []).append(listener)
+
+    @callback
+    def remove_listener() -> None:
+        """Remove the listener."""
+        hass.data[DATA_BACKUP_AGENT_LISTENERS].remove(listener)
+        if not hass.data[DATA_BACKUP_AGENT_LISTENERS]:
+            del hass.data[DATA_BACKUP_AGENT_LISTENERS]
+
+    return remove_listener
+
+
+class GoogleDriveBackupAgent(BackupAgent):
+    """Google Drive backup agent."""
+
+    domain = DOMAIN
+
+    def __init__(self, config_entry: GoogleDriveConfigEntry) -> None:
+        """Initialize the cloud backup sync agent."""
+        super().__init__()
+        assert config_entry.unique_id
+        self.name = config_entry.title
+        self.unique_id = slugify(config_entry.unique_id)
+        self._client = config_entry.runtime_data
+
+    async def async_upload_backup(
+        self,
+        *,
+        open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
+        backup: AgentBackup,
+        **kwargs: Any,
+    ) -> None:
+        """Upload a backup.
+
+        :param open_stream: A function returning an async iterator that yields bytes.
+        :param backup: Metadata about the backup that should be uploaded.
+        """
+        try:
+            await self._client.async_upload_backup(open_stream, backup)
+        except (GoogleDriveApiError, HomeAssistantError, TimeoutError) as err:
+            raise BackupAgentError(f"Failed to upload backup: {err}") from err
+
+    async def async_list_backups(self, **kwargs: Any) -> list[AgentBackup]:
+        """List backups."""
+        try:
+            return await self._client.async_list_backups()
+        except (GoogleDriveApiError, HomeAssistantError, TimeoutError) as err:
+            raise BackupAgentError(f"Failed to list backups: {err}") from err
+
+    async def async_get_backup(
+        self,
+        backup_id: str,
+        **kwargs: Any,
+    ) -> AgentBackup:
+        """Return a backup."""
+        backups = await self.async_list_backups()
+        for backup in backups:
+            if backup.backup_id == backup_id:
+                return backup
+        raise BackupNotFound(f"Backup {backup_id} not found")
+
+    async def async_download_backup(
+        self,
+        backup_id: str,
+        **kwargs: Any,
+    ) -> AsyncIterator[bytes]:
+        """Download a backup file.
+
+        :param backup_id: The ID of the backup that was returned in async_list_backups.
+        :return: An async iterator that yields bytes.
+        """
+        _LOGGER.debug("Downloading backup_id: %s", backup_id)
+        try:
+            file_id = await self._client.async_get_backup_file_id(backup_id)
+            if file_id:
+                _LOGGER.debug("Downloading file_id: %s", file_id)
+                stream = await self._client.async_download(file_id)
+                return ChunkAsyncStreamIterator(stream)
+        except (GoogleDriveApiError, HomeAssistantError, TimeoutError) as err:
+            raise BackupAgentError(f"Failed to download backup: {err}") from err
+        raise BackupNotFound(f"Backup {backup_id} not found")
+
+    async def async_delete_backup(
+        self,
+        backup_id: str,
+        **kwargs: Any,
+    ) -> None:
+        """Delete a backup file.
+
+        :param backup_id: The ID of the backup that was returned in async_list_backups.
+        """
+        _LOGGER.debug("Deleting backup_id: %s", backup_id)
+        try:
+            file_id = await self._client.async_get_backup_file_id(backup_id)
+            if file_id:
+                _LOGGER.debug("Deleting file_id: %s", file_id)
+                await self._client.async_delete(file_id)
+                _LOGGER.debug("Deleted backup_id: %s", backup_id)
+                return
+        except (GoogleDriveApiError, HomeAssistantError, TimeoutError) as err:
+            raise BackupAgentError(f"Failed to delete backup: {err}") from err
+        raise BackupNotFound(f"Backup {backup_id} not found")
diff --git a/homeassistant/components/google_drive/config_flow.py b/homeassistant/components/google_drive/config_flow.py
new file mode 100644
index 00000000000..fb74af42210
--- /dev/null
+++ b/homeassistant/components/google_drive/config_flow.py
@@ -0,0 +1,114 @@
+"""Config flow for the Google Drive integration."""
+
+from __future__ import annotations
+
+from collections.abc import Mapping
+import logging
+from typing import Any, cast
+
+from google_drive_api.exceptions import GoogleDriveApiError
+
+from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
+from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN
+from homeassistant.helpers import config_entry_oauth2_flow, instance_id
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+
+from .api import AsyncConfigFlowAuth, DriveClient
+from .const import DOMAIN
+
+DEFAULT_NAME = "Google Drive"
+DRIVE_FOLDER_URL_PREFIX = "https://drive.google.com/drive/folders/"
+OAUTH2_SCOPES = [
+    "https://www.googleapis.com/auth/drive.file",
+]
+
+
+class OAuth2FlowHandler(
+    config_entry_oauth2_flow.AbstractOAuth2FlowHandler, domain=DOMAIN
+):
+    """Config flow to handle Google Drive OAuth2 authentication."""
+
+    DOMAIN = DOMAIN
+
+    @property
+    def logger(self) -> logging.Logger:
+        """Return logger."""
+        return logging.getLogger(__name__)
+
+    @property
+    def extra_authorize_data(self) -> dict[str, Any]:
+        """Extra data that needs to be appended to the authorize url."""
+        return {
+            "scope": " ".join(OAUTH2_SCOPES),
+            # Add params to ensure we get back a refresh token
+            "access_type": "offline",
+            "prompt": "consent",
+        }
+
+    async def async_step_reauth(
+        self, entry_data: Mapping[str, Any]
+    ) -> ConfigFlowResult:
+        """Perform reauth upon an API authentication error."""
+        return await self.async_step_reauth_confirm()
+
+    async def async_step_reauth_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Confirm reauth dialog."""
+        if user_input is None:
+            return self.async_show_form(step_id="reauth_confirm")
+        return await self.async_step_user()
+
+    async def async_oauth_create_entry(self, data: dict[str, Any]) -> ConfigFlowResult:
+        """Create an entry for the flow, or update existing entry."""
+        client = DriveClient(
+            await instance_id.async_get(self.hass),
+            AsyncConfigFlowAuth(
+                async_get_clientsession(self.hass), data[CONF_TOKEN][CONF_ACCESS_TOKEN]
+            ),
+        )
+
+        try:
+            email_address = await client.async_get_email_address()
+        except GoogleDriveApiError as err:
+            self.logger.error("Error getting email address: %s", err)
+            return self.async_abort(
+                reason="access_not_configured",
+                description_placeholders={"message": str(err)},
+            )
+        except Exception:
+            self.logger.exception("Unknown error occurred")
+            return self.async_abort(reason="unknown")
+
+        await self.async_set_unique_id(email_address)
+
+        if self.source == SOURCE_REAUTH:
+            reauth_entry = self._get_reauth_entry()
+            self._abort_if_unique_id_mismatch(
+                reason="wrong_account",
+                description_placeholders={"email": cast(str, reauth_entry.unique_id)},
+            )
+            return self.async_update_reload_and_abort(reauth_entry, data=data)
+
+        self._abort_if_unique_id_configured()
+
+        try:
+            (
+                folder_id,
+                folder_name,
+            ) = await client.async_create_ha_root_folder_if_not_exists()
+        except GoogleDriveApiError as err:
+            self.logger.error("Error creating folder: %s", str(err))
+            return self.async_abort(
+                reason="create_folder_failure",
+                description_placeholders={"message": str(err)},
+            )
+
+        return self.async_create_entry(
+            title=DEFAULT_NAME,
+            data=data,
+            description_placeholders={
+                "folder_name": folder_name,
+                "url": f"{DRIVE_FOLDER_URL_PREFIX}{folder_id}",
+            },
+        )
diff --git a/homeassistant/components/google_drive/const.py b/homeassistant/components/google_drive/const.py
new file mode 100644
index 00000000000..3f0b3e9d610
--- /dev/null
+++ b/homeassistant/components/google_drive/const.py
@@ -0,0 +1,5 @@
+"""Constants for the Google Drive integration."""
+
+from __future__ import annotations
+
+DOMAIN = "google_drive"
diff --git a/homeassistant/components/google_drive/manifest.json b/homeassistant/components/google_drive/manifest.json
new file mode 100644
index 00000000000..6b199a5d3eb
--- /dev/null
+++ b/homeassistant/components/google_drive/manifest.json
@@ -0,0 +1,14 @@
+{
+  "domain": "google_drive",
+  "name": "Google Drive",
+  "after_dependencies": ["backup"],
+  "codeowners": ["@tronikos"],
+  "config_flow": true,
+  "dependencies": ["application_credentials"],
+  "documentation": "https://www.home-assistant.io/integrations/google_drive",
+  "integration_type": "service",
+  "iot_class": "cloud_polling",
+  "loggers": ["google_drive_api"],
+  "quality_scale": "platinum",
+  "requirements": ["python-google-drive-api==0.1.0"]
+}
diff --git a/homeassistant/components/google_drive/quality_scale.yaml b/homeassistant/components/google_drive/quality_scale.yaml
new file mode 100644
index 00000000000..70627a6a6d7
--- /dev/null
+++ b/homeassistant/components/google_drive/quality_scale.yaml
@@ -0,0 +1,113 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: No actions.
+  appropriate-polling:
+    status: exempt
+    comment: No polling.
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: No actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup:
+    status: exempt
+    comment: No entities.
+  entity-unique-id:
+    status: exempt
+    comment: No entities.
+  has-entity-name:
+    status: exempt
+    comment: No entities.
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions: done
+  config-entry-unloading: done
+  docs-configuration-parameters:
+    status: exempt
+    comment: No configuration options.
+  docs-installation-parameters: done
+  entity-unavailable:
+    status: exempt
+    comment: No entities.
+  integration-owner: done
+  log-when-unavailable:
+    status: exempt
+    comment: No entities.
+  parallel-updates:
+    status: exempt
+    comment: No actions and no entities.
+  reauthentication-flow: done
+  test-coverage: done
+
+  # Gold
+  devices:
+    status: exempt
+    comment: No devices.
+  diagnostics:
+    status: exempt
+    comment: No data to diagnose.
+  discovery-update-info:
+    status: exempt
+    comment: No discovery.
+  discovery:
+    status: exempt
+    comment: No discovery.
+  docs-data-update:
+    status: exempt
+    comment: No updates.
+  docs-examples:
+    status: exempt
+    comment: |
+      This integration only serves backup.
+  docs-known-limitations: done
+  docs-supported-devices:
+    status: exempt
+    comment: No devices.
+  docs-supported-functions: done
+  docs-troubleshooting: done
+  docs-use-cases: done
+  dynamic-devices:
+    status: exempt
+    comment: No devices.
+  entity-category:
+    status: exempt
+    comment: No entities.
+  entity-device-class:
+    status: exempt
+    comment: No entities.
+  entity-disabled-by-default:
+    status: exempt
+    comment: No entities.
+  entity-translations:
+    status: exempt
+    comment: No entities.
+  exception-translations: done
+  icon-translations:
+    status: exempt
+    comment: No entities.
+  reconfiguration-flow:
+    status: exempt
+    comment: No configuration options.
+  repair-issues:
+    status: exempt
+    comment: No repairs.
+  stale-devices:
+    status: exempt
+    comment: No devices.
+
+  # Platinum
+  async-dependency: done
+  inject-websession: done
+  strict-typing: done
diff --git a/homeassistant/components/google_drive/strings.json b/homeassistant/components/google_drive/strings.json
new file mode 100644
index 00000000000..e6658fb08e9
--- /dev/null
+++ b/homeassistant/components/google_drive/strings.json
@@ -0,0 +1,40 @@
+{
+  "config": {
+    "step": {
+      "pick_implementation": {
+        "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]"
+      },
+      "reauth_confirm": {
+        "title": "[%key:common::config_flow::title::reauth%]",
+        "description": "The Google Drive integration needs to re-authenticate your account"
+      },
+      "auth": {
+        "title": "Link Google Account"
+      }
+    },
+    "abort": {
+      "oauth_error": "[%key:common::config_flow::abort::oauth2_error%]",
+      "oauth_timeout": "[%key:common::config_flow::abort::oauth2_timeout%]",
+      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
+      "missing_credentials": "[%key:common::config_flow::abort::oauth2_missing_credentials%]",
+      "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
+      "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]",
+      "user_rejected_authorize": "[%key:common::config_flow::abort::oauth2_user_rejected_authorize%]",
+      "oauth_unauthorized": "[%key:common::config_flow::abort::oauth2_unauthorized%]",
+      "oauth_failed": "[%key:common::config_flow::abort::oauth2_failed%]",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+      "access_not_configured": "Unable to access the Google Drive API:\n\n{message}",
+      "create_folder_failure": "Error while creating Google Drive folder:\n\n{message}",
+      "unknown": "[%key:common::config_flow::error::unknown%]",
+      "wrong_account": "Wrong account: Please authenticate with {email}."
+    },
+    "create_entry": {
+      "default": "Using [{folder_name}]({url}) folder. Feel free to rename it in Google Drive as you wish."
+    }
+  },
+  "application_credentials": {
+    "description": "Follow the [instructions]({more_info_url}) to configure the Cloud Console:\n\n1. Go to the [OAuth consent screen]({oauth_consent_url}) and configure\n1. Go to [Credentials]({oauth_creds_url}) and select **Create Credentials**.\n1. From the drop-down list select **OAuth client ID**.\n1. Select **Web application** for the Application Type.\n1. Add `{redirect_url}` under *Authorized redirect URI*."
+  }
+}
diff --git a/homeassistant/components/google_generative_ai_conversation/__init__.py b/homeassistant/components/google_generative_ai_conversation/__init__.py
index a5c55c2099d..88a51446cda 100644
--- a/homeassistant/components/google_generative_ai_conversation/__init__.py
+++ b/homeassistant/components/google_generative_ai_conversation/__init__.py
@@ -5,11 +5,9 @@ from __future__ import annotations
 import mimetypes
 from pathlib import Path
 
-from google.ai import generativelanguage_v1beta
-from google.api_core.client_options import ClientOptions
-from google.api_core.exceptions import ClientError, DeadlineExceeded, GoogleAPIError
-import google.generativeai as genai
-import google.generativeai.types as genai_types
+from google.genai import Client
+from google.genai.errors import APIError, ClientError
+from requests.exceptions import Timeout
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntry
@@ -27,59 +25,91 @@ from homeassistant.exceptions import (
     HomeAssistantError,
 )
 from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType
 
-from .const import CONF_CHAT_MODEL, CONF_PROMPT, DOMAIN, RECOMMENDED_CHAT_MODEL
+from .const import (
+    CONF_CHAT_MODEL,
+    CONF_PROMPT,
+    DOMAIN,
+    RECOMMENDED_CHAT_MODEL,
+    TIMEOUT_MILLIS,
+)
 
 SERVICE_GENERATE_CONTENT = "generate_content"
 CONF_IMAGE_FILENAME = "image_filename"
+CONF_FILENAMES = "filenames"
 
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 PLATFORMS = (Platform.CONVERSATION,)
 
+type GoogleGenerativeAIConfigEntry = ConfigEntry[Client]
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up Google Generative AI Conversation."""
 
     async def generate_content(call: ServiceCall) -> ServiceResponse:
         """Generate content from text and optionally images."""
-        prompt_parts = [call.data[CONF_PROMPT]]
-        image_filenames = call.data[CONF_IMAGE_FILENAME]
-        for image_filename in image_filenames:
-            if not hass.config.is_allowed_path(image_filename):
-                raise HomeAssistantError(
-                    f"Cannot read `{image_filename}`, no access to path; "
-                    "`allowlist_external_dirs` may need to be adjusted in "
-                    "`configuration.yaml`"
-                )
-            if not Path(image_filename).exists():
-                raise HomeAssistantError(f"`{image_filename}` does not exist")
-            mime_type, _ = mimetypes.guess_type(image_filename)
-            if mime_type is None or not mime_type.startswith("image"):
-                raise HomeAssistantError(f"`{image_filename}` is not an image")
-            prompt_parts.append(
-                {
-                    "mime_type": mime_type,
-                    "data": await hass.async_add_executor_job(
-                        Path(image_filename).read_bytes
-                    ),
-                }
+
+        if call.data[CONF_IMAGE_FILENAME]:
+            # Deprecated in 2025.3, to remove in 2025.9
+            async_create_issue(
+                hass,
+                DOMAIN,
+                "deprecated_image_filename_parameter",
+                breaks_in_ha_version="2025.9.0",
+                is_fixable=False,
+                severity=IssueSeverity.WARNING,
+                translation_key="deprecated_image_filename_parameter",
             )
 
-        model = genai.GenerativeModel(model_name=RECOMMENDED_CHAT_MODEL)
+        prompt_parts = [call.data[CONF_PROMPT]]
+
+        config_entry: GoogleGenerativeAIConfigEntry = (
+            hass.config_entries.async_loaded_entries(DOMAIN)[0]
+        )
+
+        client = config_entry.runtime_data
+
+        def append_files_to_prompt():
+            image_filenames = call.data[CONF_IMAGE_FILENAME]
+            filenames = call.data[CONF_FILENAMES]
+            for filename in set(image_filenames + filenames):
+                if not hass.config.is_allowed_path(filename):
+                    raise HomeAssistantError(
+                        f"Cannot read `{filename}`, no access to path; "
+                        "`allowlist_external_dirs` may need to be adjusted in "
+                        "`configuration.yaml`"
+                    )
+                if not Path(filename).exists():
+                    raise HomeAssistantError(f"`{filename}` does not exist")
+                mimetype = mimetypes.guess_type(filename)[0]
+                with open(filename, "rb") as file:
+                    uploaded_file = client.files.upload(
+                        file=file, config={"mime_type": mimetype}
+                    )
+                    prompt_parts.append(uploaded_file)
+
+        await hass.async_add_executor_job(append_files_to_prompt)
 
         try:
-            response = await model.generate_content_async(prompt_parts)
+            response = await client.aio.models.generate_content(
+                model=RECOMMENDED_CHAT_MODEL, contents=prompt_parts
+            )
         except (
-            GoogleAPIError,
+            APIError,
             ValueError,
-            genai_types.BlockedPromptException,
-            genai_types.StopCandidateException,
         ) as err:
             raise HomeAssistantError(f"Error generating content: {err}") from err
 
-        if not response.parts:
-            raise HomeAssistantError("Error generating content")
+        if response.prompt_feedback:
+            raise HomeAssistantError(
+                f"Error generating content due to content violations, reason: {response.prompt_feedback.block_reason_message}"
+            )
+
+        if not response.candidates[0].content.parts:
+            raise HomeAssistantError("Unknown error generating content")
 
         return {"text": response.text}
 
@@ -93,6 +123,9 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                 vol.Optional(CONF_IMAGE_FILENAME, default=[]): vol.All(
                     cv.ensure_list, [cv.string]
                 ),
+                vol.Optional(CONF_FILENAMES, default=[]): vol.All(
+                    cv.ensure_list, [cv.string]
+                ),
             }
         ),
         supports_response=SupportsResponse.ONLY,
@@ -100,30 +133,38 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     return True
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(
+    hass: HomeAssistant, entry: GoogleGenerativeAIConfigEntry
+) -> bool:
     """Set up Google Generative AI Conversation from a config entry."""
-    genai.configure(api_key=entry.data[CONF_API_KEY])
 
     try:
-        client = generativelanguage_v1beta.ModelServiceAsyncClient(
-            client_options=ClientOptions(api_key=entry.data[CONF_API_KEY])
+
+        def _init_client() -> Client:
+            return Client(api_key=entry.data[CONF_API_KEY])
+
+        client = await hass.async_add_executor_job(_init_client)
+        await client.aio.models.get(
+            model=entry.options.get(CONF_CHAT_MODEL, RECOMMENDED_CHAT_MODEL),
+            config={"http_options": {"timeout": TIMEOUT_MILLIS}},
         )
-        await client.get_model(
-            name=entry.options.get(CONF_CHAT_MODEL, RECOMMENDED_CHAT_MODEL), timeout=5.0
-        )
-    except (GoogleAPIError, ValueError) as err:
-        if isinstance(err, ClientError) and err.reason == "API_KEY_INVALID":
-            raise ConfigEntryAuthFailed(err) from err
-        if isinstance(err, DeadlineExceeded):
+    except (APIError, Timeout) as err:
+        if isinstance(err, ClientError) and "API_KEY_INVALID" in str(err):
+            raise ConfigEntryAuthFailed(err.message) from err
+        if isinstance(err, Timeout):
             raise ConfigEntryNotReady(err) from err
         raise ConfigEntryError(err) from err
+    else:
+        entry.runtime_data = client
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, entry: GoogleGenerativeAIConfigEntry
+) -> bool:
     """Unload GoogleGenerativeAI."""
     if not await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
         return False
diff --git a/homeassistant/components/google_generative_ai_conversation/config_flow.py b/homeassistant/components/google_generative_ai_conversation/config_flow.py
index 83eec25ed15..b7753c21bf9 100644
--- a/homeassistant/components/google_generative_ai_conversation/config_flow.py
+++ b/homeassistant/components/google_generative_ai_conversation/config_flow.py
@@ -3,15 +3,13 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
-from functools import partial
 import logging
 from types import MappingProxyType
 from typing import Any
 
-from google.ai import generativelanguage_v1beta
-from google.api_core.client_options import ClientOptions
-from google.api_core.exceptions import ClientError, GoogleAPIError
-import google.generativeai as genai
+from google import genai
+from google.genai.errors import APIError, ClientError
+from requests.exceptions import Timeout
 import voluptuous as vol
 
 from homeassistant.config_entries import (
@@ -46,6 +44,7 @@ from .const import (
     CONF_TEMPERATURE,
     CONF_TOP_K,
     CONF_TOP_P,
+    CONF_USE_GOOGLE_SEARCH_TOOL,
     DOMAIN,
     RECOMMENDED_CHAT_MODEL,
     RECOMMENDED_HARM_BLOCK_THRESHOLD,
@@ -53,6 +52,8 @@ from .const import (
     RECOMMENDED_TEMPERATURE,
     RECOMMENDED_TOP_K,
     RECOMMENDED_TOP_P,
+    RECOMMENDED_USE_GOOGLE_SEARCH_TOOL,
+    TIMEOUT_MILLIS,
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -70,15 +71,20 @@ RECOMMENDED_OPTIONS = {
 }
 
 
-async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> None:
+async def validate_input(data: dict[str, Any]) -> None:
     """Validate the user input allows us to connect.
 
     Data has the keys from STEP_USER_DATA_SCHEMA with values provided by the user.
     """
-    client = generativelanguage_v1beta.ModelServiceAsyncClient(
-        client_options=ClientOptions(api_key=data[CONF_API_KEY])
+    client = genai.Client(api_key=data[CONF_API_KEY])
+    await client.aio.models.list(
+        config={
+            "http_options": {
+                "timeout": TIMEOUT_MILLIS,
+            },
+            "query_base": True,
+        }
     )
-    await client.list_models(timeout=5.0)
 
 
 class GoogleGenerativeAIConfigFlow(ConfigFlow, domain=DOMAIN):
@@ -93,9 +99,9 @@ class GoogleGenerativeAIConfigFlow(ConfigFlow, domain=DOMAIN):
         errors: dict[str, str] = {}
         if user_input is not None:
             try:
-                await validate_input(self.hass, user_input)
-            except GoogleAPIError as err:
-                if isinstance(err, ClientError) and err.reason == "API_KEY_INVALID":
+                await validate_input(user_input)
+            except (APIError, Timeout) as err:
+                if isinstance(err, ClientError) and "API_KEY_INVALID" in str(err):
                     errors["base"] = "invalid_auth"
                 else:
                     errors["base"] = "cannot_connect"
@@ -166,6 +172,7 @@ class GoogleGenerativeAIOptionsFlow(OptionsFlow):
         self.last_rendered_recommended = config_entry.options.get(
             CONF_RECOMMENDED, False
         )
+        self._genai_client = config_entry.runtime_data
 
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
@@ -188,7 +195,9 @@ class GoogleGenerativeAIOptionsFlow(OptionsFlow):
                 CONF_LLM_HASS_API: user_input[CONF_LLM_HASS_API],
             }
 
-        schema = await google_generative_ai_config_option_schema(self.hass, options)
+        schema = await google_generative_ai_config_option_schema(
+            self.hass, options, self._genai_client
+        )
         return self.async_show_form(
             step_id="init",
             data_schema=vol.Schema(schema),
@@ -198,6 +207,7 @@ class GoogleGenerativeAIOptionsFlow(OptionsFlow):
 async def google_generative_ai_config_option_schema(
     hass: HomeAssistant,
     options: dict[str, Any] | MappingProxyType[str, Any],
+    genai_client: genai.Client,
 ) -> dict:
     """Return a schema for Google Generative AI completion options."""
     hass_apis: list[SelectOptionDict] = [
@@ -236,18 +246,21 @@ async def google_generative_ai_config_option_schema(
     if options.get(CONF_RECOMMENDED):
         return schema
 
-    api_models = await hass.async_add_executor_job(partial(genai.list_models))
-
+    api_models_pager = await genai_client.aio.models.list(config={"query_base": True})
+    api_models = [api_model async for api_model in api_models_pager]
     models = [
         SelectOptionDict(
             label=api_model.display_name,
             value=api_model.name,
         )
-        for api_model in sorted(api_models, key=lambda x: x.display_name)
+        for api_model in sorted(api_models, key=lambda x: x.display_name or "")
         if (
             api_model.name != "models/gemini-1.0-pro"  # duplicate of gemini-pro
+            and api_model.display_name
+            and api_model.name
+            and api_model.supported_actions
             and "vision" not in api_model.name
-            and "generateContent" in api_model.supported_generation_methods
+            and "generateContent" in api_model.supported_actions
         )
     ]
 
@@ -330,6 +343,13 @@ async def google_generative_ai_config_option_schema(
                 },
                 default=RECOMMENDED_HARM_BLOCK_THRESHOLD,
             ): harm_block_thresholds_selector,
+            vol.Optional(
+                CONF_USE_GOOGLE_SEARCH_TOOL,
+                description={
+                    "suggested_value": options.get(CONF_USE_GOOGLE_SEARCH_TOOL),
+                },
+                default=RECOMMENDED_USE_GOOGLE_SEARCH_TOOL,
+            ): bool,
         }
     )
     return schema
diff --git a/homeassistant/components/google_generative_ai_conversation/const.py b/homeassistant/components/google_generative_ai_conversation/const.py
index bd60e8d94c1..108ffe1891d 100644
--- a/homeassistant/components/google_generative_ai_conversation/const.py
+++ b/homeassistant/components/google_generative_ai_conversation/const.py
@@ -8,7 +8,7 @@ CONF_PROMPT = "prompt"
 
 CONF_RECOMMENDED = "recommended"
 CONF_CHAT_MODEL = "chat_model"
-RECOMMENDED_CHAT_MODEL = "models/gemini-1.5-flash-latest"
+RECOMMENDED_CHAT_MODEL = "models/gemini-2.0-flash"
 CONF_TEMPERATURE = "temperature"
 RECOMMENDED_TEMPERATURE = 1.0
 CONF_TOP_P = "top_p"
@@ -22,3 +22,7 @@ CONF_HATE_BLOCK_THRESHOLD = "hate_block_threshold"
 CONF_SEXUAL_BLOCK_THRESHOLD = "sexual_block_threshold"
 CONF_DANGEROUS_BLOCK_THRESHOLD = "dangerous_block_threshold"
 RECOMMENDED_HARM_BLOCK_THRESHOLD = "BLOCK_MEDIUM_AND_ABOVE"
+CONF_USE_GOOGLE_SEARCH_TOOL = "enable_google_search_tool"
+RECOMMENDED_USE_GOOGLE_SEARCH_TOOL = False
+
+TIMEOUT_MILLIS = 10000
diff --git a/homeassistant/components/google_generative_ai_conversation/conversation.py b/homeassistant/components/google_generative_ai_conversation/conversation.py
index 81cc7ab8a73..5460f48f20e 100644
--- a/homeassistant/components/google_generative_ai_conversation/conversation.py
+++ b/homeassistant/components/google_generative_ai_conversation/conversation.py
@@ -4,25 +4,31 @@ from __future__ import annotations
 
 import codecs
 from collections.abc import Callable
-from typing import Any, Literal
+from dataclasses import replace
+from typing import Any, Literal, cast
 
-from google.api_core.exceptions import GoogleAPIError
-import google.generativeai as genai
-from google.generativeai import protos
-import google.generativeai.types as genai_types
-from google.protobuf.json_format import MessageToDict
-import voluptuous as vol
+from google.genai.errors import APIError
+from google.genai.types import (
+    AutomaticFunctionCallingConfig,
+    Content,
+    FunctionDeclaration,
+    GenerateContentConfig,
+    GoogleSearch,
+    HarmCategory,
+    Part,
+    SafetySetting,
+    Schema,
+    Tool,
+)
 from voluptuous_openapi import convert
 
 from homeassistant.components import assist_pipeline, conversation
-from homeassistant.components.conversation import trace
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_LLM_HASS_API, MATCH_ALL
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError, TemplateError
-from homeassistant.helpers import device_registry as dr, intent, llm, template
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util import ulid as ulid_util
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import device_registry as dr, intent, llm
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CONF_CHAT_MODEL,
@@ -35,6 +41,7 @@ from .const import (
     CONF_TEMPERATURE,
     CONF_TOP_K,
     CONF_TOP_P,
+    CONF_USE_GOOGLE_SEARCH_TOOL,
     DOMAIN,
     LOGGER,
     RECOMMENDED_CHAT_MODEL,
@@ -52,7 +59,7 @@ MAX_TOOL_ITERATIONS = 10
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up conversation entities."""
     agent = GoogleGenerativeAIConversationEntity(config_entry)
@@ -60,21 +67,30 @@ async def async_setup_entry(
 
 
 SUPPORTED_SCHEMA_KEYS = {
+    # Gemini API does not support all of the OpenAPI schema
+    # SoT: https://ai.google.dev/api/caching#Schema
     "type",
     "format",
     "description",
     "nullable",
     "enum",
-    "items",
+    "max_items",
+    "min_items",
     "properties",
     "required",
+    "items",
 }
 
 
-def _format_schema(schema: dict[str, Any]) -> dict[str, Any]:
-    """Format the schema to protobuf."""
-    if (subschemas := schema.get("anyOf")) or (subschemas := schema.get("allOf")):
-        for subschema in subschemas:  # Gemini API does not support anyOf and allOf keys
+def _camel_to_snake(name: str) -> str:
+    """Convert camel case to snake case."""
+    return "".join(["_" + c.lower() if c.isupper() else c for c in name]).lstrip("_")
+
+
+def _format_schema(schema: dict[str, Any]) -> Schema:
+    """Format the schema to be compatible with Gemini API."""
+    if subschemas := schema.get("allOf"):
+        for subschema in subschemas:  # Gemini API does not support allOf keys
             if "type" in subschema:  # Fallback to first subschema with 'type' field
                 return _format_schema(subschema)
         return _format_schema(
@@ -83,42 +99,47 @@ def _format_schema(schema: dict[str, Any]) -> dict[str, Any]:
 
     result = {}
     for key, val in schema.items():
+        key = _camel_to_snake(key)
         if key not in SUPPORTED_SCHEMA_KEYS:
             continue
         if key == "type":
-            key = "type_"
             val = val.upper()
         elif key == "format":
-            if schema.get("type") == "string" and val != "enum":
+            # Gemini API does not support all formats, see: https://ai.google.dev/api/caching#Schema
+            # formats that are not supported are ignored
+            if schema.get("type") == "string" and val not in ("enum", "date-time"):
                 continue
-            if schema.get("type") not in ("number", "integer", "string"):
+            if schema.get("type") == "number" and val not in ("float", "double"):
+                continue
+            if schema.get("type") == "integer" and val not in ("int32", "int64"):
+                continue
+            if schema.get("type") not in ("string", "number", "integer"):
                 continue
-            key = "format_"
         elif key == "items":
             val = _format_schema(val)
         elif key == "properties":
             val = {k: _format_schema(v) for k, v in val.items()}
         result[key] = val
 
-    if result.get("enum") and result.get("type_") != "STRING":
+    if result.get("enum") and result.get("type") != "STRING":
         # enum is only allowed for STRING type. This is safe as long as the schema
         # contains vol.Coerce for the respective type, for example:
         # vol.All(vol.Coerce(int), vol.In([1, 2, 3]))
-        result["type_"] = "STRING"
+        result["type"] = "STRING"
         result["enum"] = [str(item) for item in result["enum"]]
 
-    if result.get("type_") == "OBJECT" and not result.get("properties"):
+    if result.get("type") == "OBJECT" and not result.get("properties"):
         # An object with undefined properties is not supported by Gemini API.
         # Fallback to JSON string. This will probably fail for most tools that want it,
         # but we don't have a better fallback strategy so far.
-        result["properties"] = {"json": {"type_": "STRING"}}
+        result["properties"] = {"json": {"type": "STRING"}}
         result["required"] = []
-    return result
+    return cast(Schema, result)
 
 
 def _format_tool(
     tool: llm.Tool, custom_serializer: Callable[[Any], Any] | None
-) -> dict[str, Any]:
+) -> Tool:
     """Format tool specification."""
 
     if tool.parameters.schema:
@@ -128,16 +149,14 @@ def _format_tool(
     else:
         parameters = None
 
-    return protos.Tool(
-        {
-            "function_declarations": [
-                {
-                    "name": tool.name,
-                    "description": tool.description,
-                    "parameters": parameters,
-                }
-            ]
-        }
+    return Tool(
+        function_declarations=[
+            FunctionDeclaration(
+                name=tool.name,
+                description=tool.description,
+                parameters=parameters,
+            )
+        ]
     )
 
 
@@ -152,6 +171,64 @@ def _escape_decode(value: Any) -> Any:
     return value
 
 
+def _create_google_tool_response_parts(
+    parts: list[conversation.ToolResultContent],
+) -> list[Part]:
+    """Create Google tool response parts."""
+    return [
+        Part.from_function_response(
+            name=tool_result.tool_name, response=tool_result.tool_result
+        )
+        for tool_result in parts
+    ]
+
+
+def _create_google_tool_response_content(
+    content: list[conversation.ToolResultContent],
+) -> Content:
+    """Create a Google tool response content."""
+    return Content(
+        role="user",
+        parts=_create_google_tool_response_parts(content),
+    )
+
+
+def _convert_content(
+    content: conversation.UserContent
+    | conversation.AssistantContent
+    | conversation.SystemContent,
+) -> Content:
+    """Convert HA content to Google content."""
+    if content.role != "assistant" or not content.tool_calls:
+        role = "model" if content.role == "assistant" else content.role
+        return Content(
+            role=role,
+            parts=[
+                Part.from_text(text=content.content if content.content else ""),
+            ],
+        )
+
+    # Handle the Assistant content with tool calls.
+    assert type(content) is conversation.AssistantContent
+    parts: list[Part] = []
+
+    if content.content:
+        parts.append(Part.from_text(text=content.content))
+
+    if content.tool_calls:
+        parts.extend(
+            [
+                Part.from_function_call(
+                    name=tool_call.tool_name,
+                    args=_escape_decode(tool_call.tool_args),
+                )
+                for tool_call in content.tool_calls
+            ]
+        )
+
+    return Content(role="model", parts=parts)
+
+
 class GoogleGenerativeAIConversationEntity(
     conversation.ConversationEntity, conversation.AbstractConversationAgent
 ):
@@ -163,7 +240,7 @@ class GoogleGenerativeAIConversationEntity(
     def __init__(self, entry: ConfigEntry) -> None:
         """Initialize the agent."""
         self.entry = entry
-        self.history: dict[str, list[genai_types.ContentType]] = {}
+        self._genai_client = entry.runtime_data
         self._attr_unique_id = entry.entry_id
         self._attr_device_info = dr.DeviceInfo(
             identifiers={(DOMAIN, entry.entry_id)},
@@ -198,53 +275,44 @@ class GoogleGenerativeAIConversationEntity(
         conversation.async_unset_agent(self.hass, self.entry)
         await super().async_will_remove_from_hass()
 
-    async def async_process(
-        self, user_input: conversation.ConversationInput
-    ) -> conversation.ConversationResult:
-        """Process a sentence."""
-        result = conversation.ConversationResult(
-            response=intent.IntentResponse(language=user_input.language),
-            conversation_id=user_input.conversation_id or ulid_util.ulid_now(),
-        )
-        assert result.conversation_id
+    def _fix_tool_name(self, tool_name: str) -> str:
+        """Fix tool name if needed."""
+        # The Gemini 2.0+ tokenizer seemingly has a issue with the HassListAddItem tool
+        # name. This makes sure when it incorrectly changes the name, that we change it
+        # back for HA to call.
+        return tool_name if tool_name != "HasListAddItem" else "HassListAddItem"
 
-        llm_context = llm.LLMContext(
-            platform=DOMAIN,
-            context=user_input.context,
-            user_prompt=user_input.text,
-            language=user_input.language,
-            assistant=conversation.DOMAIN,
-            device_id=user_input.device_id,
-        )
-        llm_api: llm.APIInstance | None = None
-        tools: list[dict[str, Any]] | None = None
-        if self.entry.options.get(CONF_LLM_HASS_API):
-            try:
-                llm_api = await llm.async_get_api(
-                    self.hass,
-                    self.entry.options[CONF_LLM_HASS_API],
-                    llm_context,
-                )
-            except HomeAssistantError as err:
-                LOGGER.error("Error getting LLM API: %s", err)
-                result.response.async_set_error(
-                    intent.IntentResponseErrorCode.UNKNOWN,
-                    f"Error preparing LLM API: {err}",
-                )
-                return result
-            tools = [
-                _format_tool(tool, llm_api.custom_serializer) for tool in llm_api.tools
-            ]
+    async def _async_handle_message(
+        self,
+        user_input: conversation.ConversationInput,
+        chat_log: conversation.ChatLog,
+    ) -> conversation.ConversationResult:
+        """Call the API."""
+        options = self.entry.options
 
         try:
-            prompt = await self._async_render_prompt(user_input, llm_api, llm_context)
-        except TemplateError as err:
-            LOGGER.error("Error rendering prompt: %s", err)
-            result.response.async_set_error(
-                intent.IntentResponseErrorCode.UNKNOWN,
-                f"Sorry, I had a problem with my template: {err}",
+            await chat_log.async_update_llm_data(
+                DOMAIN,
+                user_input,
+                options.get(CONF_LLM_HASS_API),
+                options.get(CONF_PROMPT),
             )
-            return result
+        except conversation.ConverseError as err:
+            return err.as_conversation_result()
+
+        tools: list[Tool | Callable[..., Any]] | None = None
+        if chat_log.llm_api:
+            tools = [
+                _format_tool(tool, chat_log.llm_api.custom_serializer)
+                for tool in chat_log.llm_api.tools
+            ]
+
+        # Using search grounding allows the model to retrieve information from the web,
+        # however, it may interfere with how the model decides to use some tools, or entities
+        # for example weather entity may be disregarded if the model chooses to Google it.
+        if options.get(CONF_USE_GOOGLE_SEARCH_TOOL) is True:
+            tools = tools or []
+            tools.append(Tool(google_search=GoogleSearch()))
 
         model_name = self.entry.options.get(CONF_CHAT_MODEL, RECOMMENDED_CHAT_MODEL)
         # Gemini 1.0 doesn't support system_instruction while 1.5 does.
@@ -254,162 +322,173 @@ class GoogleGenerativeAIConversationEntity(
             "gemini-1.0" not in model_name and "gemini-pro" not in model_name
         )
 
-        model = genai.GenerativeModel(
-            model_name=model_name,
-            generation_config={
-                "temperature": self.entry.options.get(
-                    CONF_TEMPERATURE, RECOMMENDED_TEMPERATURE
+        prompt_content = cast(
+            conversation.SystemContent,
+            chat_log.content[0],
+        )
+
+        if prompt_content.content:
+            prompt = prompt_content.content
+        else:
+            raise HomeAssistantError("Invalid prompt content")
+
+        messages: list[Content] = []
+
+        # Google groups tool results, we do not. Group them before sending.
+        tool_results: list[conversation.ToolResultContent] = []
+
+        for chat_content in chat_log.content[1:-1]:
+            if chat_content.role == "tool_result":
+                tool_results.append(chat_content)
+                continue
+
+            if (
+                not isinstance(chat_content, conversation.ToolResultContent)
+                and chat_content.content == ""
+            ):
+                # Skipping is not possible since the number of function calls need to match the number of function responses
+                # and skipping one would mean removing the other and hence this would prevent a proper chat log
+                chat_content = replace(chat_content, content=" ")
+
+            if tool_results:
+                messages.append(_create_google_tool_response_content(tool_results))
+                tool_results.clear()
+
+            messages.append(_convert_content(chat_content))
+
+        if tool_results:
+            messages.append(_create_google_tool_response_content(tool_results))
+        generateContentConfig = GenerateContentConfig(
+            temperature=self.entry.options.get(
+                CONF_TEMPERATURE, RECOMMENDED_TEMPERATURE
+            ),
+            top_k=self.entry.options.get(CONF_TOP_K, RECOMMENDED_TOP_K),
+            top_p=self.entry.options.get(CONF_TOP_P, RECOMMENDED_TOP_P),
+            max_output_tokens=self.entry.options.get(
+                CONF_MAX_TOKENS, RECOMMENDED_MAX_TOKENS
+            ),
+            safety_settings=[
+                SafetySetting(
+                    category=HarmCategory.HARM_CATEGORY_HATE_SPEECH,
+                    threshold=self.entry.options.get(
+                        CONF_HATE_BLOCK_THRESHOLD, RECOMMENDED_HARM_BLOCK_THRESHOLD
+                    ),
                 ),
-                "top_p": self.entry.options.get(CONF_TOP_P, RECOMMENDED_TOP_P),
-                "top_k": self.entry.options.get(CONF_TOP_K, RECOMMENDED_TOP_K),
-                "max_output_tokens": self.entry.options.get(
-                    CONF_MAX_TOKENS, RECOMMENDED_MAX_TOKENS
+                SafetySetting(
+                    category=HarmCategory.HARM_CATEGORY_HARASSMENT,
+                    threshold=self.entry.options.get(
+                        CONF_HARASSMENT_BLOCK_THRESHOLD,
+                        RECOMMENDED_HARM_BLOCK_THRESHOLD,
+                    ),
                 ),
-            },
-            safety_settings={
-                "HARASSMENT": self.entry.options.get(
-                    CONF_HARASSMENT_BLOCK_THRESHOLD, RECOMMENDED_HARM_BLOCK_THRESHOLD
+                SafetySetting(
+                    category=HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT,
+                    threshold=self.entry.options.get(
+                        CONF_DANGEROUS_BLOCK_THRESHOLD, RECOMMENDED_HARM_BLOCK_THRESHOLD
+                    ),
                 ),
-                "HATE": self.entry.options.get(
-                    CONF_HATE_BLOCK_THRESHOLD, RECOMMENDED_HARM_BLOCK_THRESHOLD
+                SafetySetting(
+                    category=HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT,
+                    threshold=self.entry.options.get(
+                        CONF_SEXUAL_BLOCK_THRESHOLD, RECOMMENDED_HARM_BLOCK_THRESHOLD
+                    ),
                 ),
-                "SEXUAL": self.entry.options.get(
-                    CONF_SEXUAL_BLOCK_THRESHOLD, RECOMMENDED_HARM_BLOCK_THRESHOLD
-                ),
-                "DANGEROUS": self.entry.options.get(
-                    CONF_DANGEROUS_BLOCK_THRESHOLD, RECOMMENDED_HARM_BLOCK_THRESHOLD
-                ),
-            },
+            ],
             tools=tools or None,
             system_instruction=prompt if supports_system_instruction else None,
+            automatic_function_calling=AutomaticFunctionCallingConfig(
+                disable=True, maximum_remote_calls=None
+            ),
         )
 
-        messages = self.history.get(result.conversation_id, [])
         if not supports_system_instruction:
-            if not messages:
-                messages = [{}, {"role": "model", "parts": "Ok"}]
-            messages[0] = {"role": "user", "parts": prompt}
-
-        LOGGER.debug("Input: '%s' with history: %s", user_input.text, messages)
-        trace.async_conversation_trace_append(
-            trace.ConversationTraceEventType.AGENT_DETAIL,
-            {
-                # Make a copy to attach it to the trace event.
-                "messages": messages[:]
-                if supports_system_instruction
-                else messages[2:],
-                "prompt": prompt,
-                "tools": [*llm_api.tools] if llm_api else None,
-            },
+            messages = [
+                Content(role="user", parts=[Part.from_text(text=prompt)]),
+                Content(role="model", parts=[Part.from_text(text="Ok")]),
+                *messages,
+            ]
+        chat = self._genai_client.aio.chats.create(
+            model=model_name, history=messages, config=generateContentConfig
         )
-
-        chat = model.start_chat(history=messages)
-        chat_request = user_input.text
+        chat_request: str | list[Part] = user_input.text
         # To prevent infinite loops, we limit the number of iterations
         for _iteration in range(MAX_TOOL_ITERATIONS):
             try:
-                chat_response = await chat.send_message_async(chat_request)
+                chat_response = await chat.send_message(message=chat_request)
+
+                if chat_response.prompt_feedback:
+                    raise HomeAssistantError(
+                        f"The message got blocked due to content violations, reason: {chat_response.prompt_feedback.block_reason_message}"
+                    )
+
             except (
-                GoogleAPIError,
+                APIError,
                 ValueError,
-                genai_types.BlockedPromptException,
-                genai_types.StopCandidateException,
             ) as err:
                 LOGGER.error("Error sending message: %s %s", type(err), err)
+                error = f"Sorry, I had a problem talking to Google Generative AI: {err}"
+                raise HomeAssistantError(error) from err
 
-                if isinstance(
-                    err, genai_types.StopCandidateException
-                ) and "finish_reason: SAFETY\n" in str(err):
-                    error = "The message got blocked by your safety settings"
-                else:
-                    error = (
-                        f"Sorry, I had a problem talking to Google Generative AI: {err}"
+            if (usage_metadata := chat_response.usage_metadata) is not None:
+                chat_log.async_trace(
+                    {
+                        "stats": {
+                            "input_tokens": usage_metadata.prompt_token_count,
+                            "cached_input_tokens": usage_metadata.cached_content_token_count
+                            or 0,
+                            "output_tokens": usage_metadata.candidates_token_count,
+                        }
+                    }
+                )
+
+            response_parts = chat_response.candidates[0].content.parts
+            if not response_parts:
+                raise HomeAssistantError(
+                    "Sorry, I had a problem getting a response from Google Generative AI."
+                )
+            content = " ".join(
+                [part.text.strip() for part in response_parts if part.text]
+            )
+
+            tool_calls = []
+            for part in response_parts:
+                if not part.function_call:
+                    continue
+                tool_call = part.function_call
+                tool_name = tool_call.name
+                tool_args = _escape_decode(tool_call.args)
+                tool_calls.append(
+                    llm.ToolInput(
+                        tool_name=self._fix_tool_name(tool_name),
+                        tool_args=tool_args,
                     )
-
-                result.response.async_set_error(
-                    intent.IntentResponseErrorCode.UNKNOWN,
-                    error,
                 )
-                return result
 
-            LOGGER.debug("Response: %s", chat_response.parts)
-            if not chat_response.parts:
-                result.response.async_set_error(
-                    intent.IntentResponseErrorCode.UNKNOWN,
-                    "Sorry, I had a problem getting a response from Google Generative AI.",
-                )
-                return result
-            self.history[result.conversation_id] = chat.history
-            function_calls = [
-                part.function_call for part in chat_response.parts if part.function_call
-            ]
-            if not function_calls or not llm_api:
-                break
-
-            tool_responses = []
-            for function_call in function_calls:
-                tool_call = MessageToDict(function_call._pb)  # noqa: SLF001
-                tool_name = tool_call["name"]
-                tool_args = _escape_decode(tool_call["args"])
-                LOGGER.debug("Tool call: %s(%s)", tool_name, tool_args)
-                tool_input = llm.ToolInput(tool_name=tool_name, tool_args=tool_args)
-                try:
-                    function_response = await llm_api.async_call_tool(tool_input)
-                except (HomeAssistantError, vol.Invalid) as e:
-                    function_response = {"error": type(e).__name__}
-                    if str(e):
-                        function_response["error_text"] = str(e)
-
-                LOGGER.debug("Tool response: %s", function_response)
-                tool_responses.append(
-                    protos.Part(
-                        function_response=protos.FunctionResponse(
-                            name=tool_name, response=function_response
+            chat_request = _create_google_tool_response_parts(
+                [
+                    tool_response
+                    async for tool_response in chat_log.async_add_assistant_content(
+                        conversation.AssistantContent(
+                            agent_id=user_input.agent_id,
+                            content=content,
+                            tool_calls=tool_calls or None,
                         )
                     )
-                )
-            chat_request = protos.Content(parts=tool_responses)
+                ]
+            )
 
-        result.response.async_set_speech(
-            " ".join([part.text.strip() for part in chat_response.parts if part.text])
+            if not tool_calls:
+                break
+
+        response = intent.IntentResponse(language=user_input.language)
+        response.async_set_speech(
+            " ".join([part.text.strip() for part in response_parts if part.text])
+        )
+        return conversation.ConversationResult(
+            response=response,
+            conversation_id=chat_log.conversation_id,
+            continue_conversation=chat_log.continue_conversation,
         )
-        return result
-
-    async def _async_render_prompt(
-        self,
-        user_input: conversation.ConversationInput,
-        llm_api: llm.APIInstance | None,
-        llm_context: llm.LLMContext,
-    ) -> str:
-        user_name: str | None = None
-        if (
-            user_input.context
-            and user_input.context.user_id
-            and (
-                user := await self.hass.auth.async_get_user(user_input.context.user_id)
-            )
-        ):
-            user_name = user.name
-
-        parts = [
-            template.Template(
-                llm.BASE_PROMPT
-                + self.entry.options.get(CONF_PROMPT, llm.DEFAULT_INSTRUCTIONS_PROMPT),
-                self.hass,
-            ).async_render(
-                {
-                    "ha_name": self.hass.config.location_name,
-                    "user_name": user_name,
-                    "llm_context": llm_context,
-                },
-                parse_result=False,
-            )
-        ]
-
-        if llm_api:
-            parts.append(llm_api.api_prompt)
-
-        return "\n".join(parts)
 
     async def _async_entry_update_listener(
         self, hass: HomeAssistant, entry: ConfigEntry
diff --git a/homeassistant/components/google_generative_ai_conversation/manifest.json b/homeassistant/components/google_generative_ai_conversation/manifest.json
index 7b687b7da6f..25e44964a6d 100644
--- a/homeassistant/components/google_generative_ai_conversation/manifest.json
+++ b/homeassistant/components/google_generative_ai_conversation/manifest.json
@@ -2,11 +2,11 @@
   "domain": "google_generative_ai_conversation",
   "name": "Google Generative AI",
   "after_dependencies": ["assist_pipeline", "intent"],
-  "codeowners": ["@tronikos"],
+  "codeowners": ["@tronikos", "@ivanlh"],
   "config_flow": true,
   "dependencies": ["conversation"],
   "documentation": "https://www.home-assistant.io/integrations/google_generative_ai_conversation",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["google-generativeai==0.8.2"]
+  "requirements": ["google-genai==1.7.0"]
 }
diff --git a/homeassistant/components/google_generative_ai_conversation/services.yaml b/homeassistant/components/google_generative_ai_conversation/services.yaml
index f35697b89f8..82190d64540 100644
--- a/homeassistant/components/google_generative_ai_conversation/services.yaml
+++ b/homeassistant/components/google_generative_ai_conversation/services.yaml
@@ -9,3 +9,8 @@ generate_content:
       required: false
       selector:
         object:
+    filenames:
+      required: false
+      selector:
+        text:
+          multiple: true
diff --git a/homeassistant/components/google_generative_ai_conversation/strings.json b/homeassistant/components/google_generative_ai_conversation/strings.json
index 9fea4805d38..b814f89469a 100644
--- a/homeassistant/components/google_generative_ai_conversation/strings.json
+++ b/homeassistant/components/google_generative_ai_conversation/strings.json
@@ -36,7 +36,8 @@
           "harassment_block_threshold": "Negative or harmful comments targeting identity and/or protected attributes",
           "hate_block_threshold": "Content that is rude, disrespectful, or profane",
           "sexual_block_threshold": "Contains references to sexual acts or other lewd content",
-          "dangerous_block_threshold": "Promotes, facilitates, or encourages harmful acts"
+          "dangerous_block_threshold": "Promotes, facilitates, or encourages harmful acts",
+          "enable_google_search_tool": "Enable Google Search tool"
         },
         "data_description": {
           "prompt": "Instruct how the LLM should respond. This can be a template."
@@ -56,10 +57,21 @@
         },
         "image_filename": {
           "name": "Image filename",
-          "description": "Images",
+          "description": "Deprecated. Use filenames instead.",
+          "example": "/config/www/image.jpg"
+        },
+        "filenames": {
+          "name": "Attachment filenames",
+          "description": "Attachments to add to the prompt (images, PDFs, etc)",
           "example": "/config/www/image.jpg"
         }
       }
     }
+  },
+  "issues": {
+    "deprecated_image_filename_parameter": {
+      "title": "Deprecated 'image_filename' parameter",
+      "description": "The 'image_filename' parameter in Google Generative AI actions is deprecated. Please edit scripts and automations to use 'filenames' instead."
+    }
   }
 }
diff --git a/homeassistant/components/google_mail/__init__.py b/homeassistant/components/google_mail/__init__.py
index 7fae5f18da5..8ef978568dc 100644
--- a/homeassistant/components/google_mail/__init__.py
+++ b/homeassistant/components/google_mail/__init__.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, discovery
@@ -59,12 +59,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: GoogleMailConfigEntry) -
 
 async def async_unload_entry(hass: HomeAssistant, entry: GoogleMailConfigEntry) -> bool:
     """Unload a config entry."""
-    loaded_entries = [
-        entry
-        for entry in hass.config_entries.async_entries(DOMAIN)
-        if entry.state == ConfigEntryState.LOADED
-    ]
-    if len(loaded_entries) == 1:
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
         for service_name in hass.services.async_services_for_domain(DOMAIN):
             hass.services.async_remove(DOMAIN, service_name)
 
diff --git a/homeassistant/components/google_mail/sensor.py b/homeassistant/components/google_mail/sensor.py
index c832104d719..781ea9192f0 100644
--- a/homeassistant/components/google_mail/sensor.py
+++ b/homeassistant/components/google_mail/sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import GoogleMailConfigEntry
 from .entity import GoogleMailEntity
@@ -29,7 +29,7 @@ SENSOR_TYPE = SensorEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GoogleMailConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Google Mail sensor."""
     async_add_entities([GoogleMailSensor(entry.runtime_data, SENSOR_TYPE)], True)
diff --git a/homeassistant/components/google_maps/device_tracker.py b/homeassistant/components/google_maps/device_tracker.py
index 31eca8fba01..fd50295a6a1 100644
--- a/homeassistant/components/google_maps/device_tracker.py
+++ b/homeassistant/components/google_maps/device_tracker.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     CONF_USERNAME,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import track_time_interval
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util, slugify
diff --git a/homeassistant/components/google_photos/__init__.py b/homeassistant/components/google_photos/__init__.py
index 2a7109d8189..40de02554ae 100644
--- a/homeassistant/components/google_photos/__init__.py
+++ b/homeassistant/components/google_photos/__init__.py
@@ -12,9 +12,8 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from . import api
 from .const import DOMAIN
-from .coordinator import GooglePhotosUpdateCoordinator
+from .coordinator import GooglePhotosConfigEntry, GooglePhotosUpdateCoordinator
 from .services import async_register_services
-from .types import GooglePhotosConfigEntry
 
 __all__ = [
     "DOMAIN",
@@ -43,7 +42,9 @@ async def async_setup_entry(
         raise ConfigEntryNotReady from err
     except ClientError as err:
         raise ConfigEntryNotReady from err
-    coordinator = GooglePhotosUpdateCoordinator(hass, GooglePhotosLibraryApi(auth))
+    coordinator = GooglePhotosUpdateCoordinator(
+        hass, entry, GooglePhotosLibraryApi(auth)
+    )
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
 
diff --git a/homeassistant/components/google_photos/coordinator.py b/homeassistant/components/google_photos/coordinator.py
index 3ba5a8124d6..215d40d7864 100644
--- a/homeassistant/components/google_photos/coordinator.py
+++ b/homeassistant/components/google_photos/coordinator.py
@@ -15,6 +15,7 @@ from google_photos_library_api.api import GooglePhotosLibraryApi
 from google_photos_library_api.exceptions import GooglePhotosApiError
 from google_photos_library_api.model import Album, NewAlbum
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -23,6 +24,8 @@ _LOGGER = logging.getLogger(__name__)
 UPDATE_INTERVAL: Final = datetime.timedelta(hours=24)
 ALBUM_PAGE_SIZE = 50
 
+type GooglePhotosConfigEntry = ConfigEntry[GooglePhotosUpdateCoordinator]
+
 
 class GooglePhotosUpdateCoordinator(DataUpdateCoordinator[dict[str, str]]):
     """Coordinator for fetching Google Photos albums.
@@ -30,11 +33,19 @@ class GooglePhotosUpdateCoordinator(DataUpdateCoordinator[dict[str, str]]):
     The `data` object is a dict from Album ID to Album title.
     """
 
-    def __init__(self, hass: HomeAssistant, client: GooglePhotosLibraryApi) -> None:
+    config_entry: GooglePhotosConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: GooglePhotosConfigEntry,
+        client: GooglePhotosLibraryApi,
+    ) -> None:
         """Initialize TaskUpdateCoordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="Google Photos",
             update_interval=UPDATE_INTERVAL,
         )
diff --git a/homeassistant/components/google_photos/media_source.py b/homeassistant/components/google_photos/media_source.py
index 7ee81b51bc0..c0a87e46fbc 100644
--- a/homeassistant/components/google_photos/media_source.py
+++ b/homeassistant/components/google_photos/media_source.py
@@ -20,8 +20,8 @@ from homeassistant.components.media_source import (
 )
 from homeassistant.core import HomeAssistant
 
-from . import GooglePhotosConfigEntry
 from .const import DOMAIN, READ_SCOPE
+from .coordinator import GooglePhotosConfigEntry
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/google_photos/services.py b/homeassistant/components/google_photos/services.py
index 22d3cc7deb0..8042df8f811 100644
--- a/homeassistant/components/google_photos/services.py
+++ b/homeassistant/components/google_photos/services.py
@@ -21,7 +21,7 @@ from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import config_validation as cv
 
 from .const import DOMAIN, UPLOAD_SCOPE
-from .types import GooglePhotosConfigEntry
+from .coordinator import GooglePhotosConfigEntry
 
 CONF_CONFIG_ENTRY_ID = "config_entry_id"
 CONF_ALBUM = "album"
diff --git a/homeassistant/components/google_photos/types.py b/homeassistant/components/google_photos/types.py
deleted file mode 100644
index 4f4cc1845e4..00000000000
--- a/homeassistant/components/google_photos/types.py
+++ /dev/null
@@ -1,7 +0,0 @@
-"""Google Photos types."""
-
-from homeassistant.config_entries import ConfigEntry
-
-from .coordinator import GooglePhotosUpdateCoordinator
-
-type GooglePhotosConfigEntry = ConfigEntry[GooglePhotosUpdateCoordinator]
diff --git a/homeassistant/components/google_pubsub/__init__.py b/homeassistant/components/google_pubsub/__init__.py
index f289fae2456..ace56bf9354 100644
--- a/homeassistant/components/google_pubsub/__init__.py
+++ b/homeassistant/components/google_pubsub/__init__.py
@@ -12,7 +12,7 @@ import voluptuous as vol
 
 from homeassistant.const import EVENT_STATE_CHANGED, STATE_UNAVAILABLE, STATE_UNKNOWN
 from homeassistant.core import Event, EventStateChangedData, HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entityfilter import FILTER_SCHEMA
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/google_pubsub/manifest.json b/homeassistant/components/google_pubsub/manifest.json
index 9ea747898b2..b96f4e9ebc0 100644
--- a/homeassistant/components/google_pubsub/manifest.json
+++ b/homeassistant/components/google_pubsub/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/google_pubsub",
   "iot_class": "cloud_push",
   "quality_scale": "legacy",
-  "requirements": ["google-cloud-pubsub==2.23.0"]
+  "requirements": ["google-cloud-pubsub==2.29.0"]
 }
diff --git a/homeassistant/components/google_sheets/__init__.py b/homeassistant/components/google_sheets/__init__.py
index 3f34b23d522..afafce816a9 100644
--- a/homeassistant/components/google_sheets/__init__.py
+++ b/homeassistant/components/google_sheets/__init__.py
@@ -12,7 +12,7 @@ from gspread.exceptions import APIError
 from gspread.utils import ValueInputOption
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.exceptions import (
@@ -20,11 +20,11 @@ from homeassistant.exceptions import (
     ConfigEntryNotReady,
     HomeAssistantError,
 )
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.config_entry_oauth2_flow import (
     OAuth2Session,
     async_get_config_entry_implementation,
 )
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.selector import ConfigEntrySelector
 
 from .const import DEFAULT_ACCESS, DOMAIN
@@ -39,7 +39,7 @@ SERVICE_APPEND_SHEET = "append_sheet"
 
 SHEET_SERVICE_SCHEMA = vol.All(
     {
-        vol.Required(DATA_CONFIG_ENTRY): ConfigEntrySelector(),
+        vol.Required(DATA_CONFIG_ENTRY): ConfigEntrySelector({"integration": DOMAIN}),
         vol.Optional(WORKSHEET): cv.string,
         vol.Required(DATA): vol.Any(cv.ensure_list, [dict]),
     },
@@ -81,12 +81,7 @@ async def async_unload_entry(
     hass: HomeAssistant, entry: GoogleSheetsConfigEntry
 ) -> bool:
     """Unload a config entry."""
-    loaded_entries = [
-        entry
-        for entry in hass.config_entries.async_entries(DOMAIN)
-        if entry.state == ConfigEntryState.LOADED
-    ]
-    if len(loaded_entries) == 1:
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
         for service_name in hass.services.async_services_for_domain(DOMAIN):
             hass.services.async_remove(DOMAIN, service_name)
 
diff --git a/homeassistant/components/google_tasks/__init__.py b/homeassistant/components/google_tasks/__init__.py
index 45ad1777aa0..2d570854ad4 100644
--- a/homeassistant/components/google_tasks/__init__.py
+++ b/homeassistant/components/google_tasks/__init__.py
@@ -13,9 +13,8 @@ from homeassistant.helpers import config_entry_oauth2_flow
 
 from . import api
 from .const import DOMAIN
-from .coordinator import TaskUpdateCoordinator
+from .coordinator import GoogleTasksConfigEntry, TaskUpdateCoordinator
 from .exceptions import GoogleTasksApiError
-from .types import GoogleTasksConfigEntry
 
 __all__ = [
     "DOMAIN",
@@ -52,6 +51,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: GoogleTasksConfigEntry)
     coordinators = [
         TaskUpdateCoordinator(
             hass,
+            entry,
             auth,
             task_list["id"],
             task_list["title"],
diff --git a/homeassistant/components/google_tasks/coordinator.py b/homeassistant/components/google_tasks/coordinator.py
index a06faf00a91..b61fe1c30db 100644
--- a/homeassistant/components/google_tasks/coordinator.py
+++ b/homeassistant/components/google_tasks/coordinator.py
@@ -5,6 +5,7 @@ import datetime
 import logging
 from typing import Any, Final
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -15,13 +16,18 @@ _LOGGER = logging.getLogger(__name__)
 UPDATE_INTERVAL: Final = datetime.timedelta(minutes=30)
 TIMEOUT = 10
 
+type GoogleTasksConfigEntry = ConfigEntry[list[TaskUpdateCoordinator]]
+
 
 class TaskUpdateCoordinator(DataUpdateCoordinator[list[dict[str, Any]]]):
     """Coordinator for fetching Google Tasks for a Task List form the API."""
 
+    config_entry: GoogleTasksConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: GoogleTasksConfigEntry,
         api: AsyncConfigEntryAuth,
         task_list_id: str,
         task_list_title: str,
@@ -30,6 +36,7 @@ class TaskUpdateCoordinator(DataUpdateCoordinator[list[dict[str, Any]]]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=f"Google Tasks {task_list_id}",
             update_interval=UPDATE_INTERVAL,
         )
diff --git a/homeassistant/components/google_tasks/todo.py b/homeassistant/components/google_tasks/todo.py
index 1df5e5fc2e9..d8e3c64bad8 100644
--- a/homeassistant/components/google_tasks/todo.py
+++ b/homeassistant/components/google_tasks/todo.py
@@ -12,12 +12,11 @@ from homeassistant.components.todo import (
     TodoListEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import dt as dt_util
 
-from .coordinator import TaskUpdateCoordinator
-from .types import GoogleTasksConfigEntry
+from .coordinator import GoogleTasksConfigEntry, TaskUpdateCoordinator
 
 PARALLEL_UPDATES = 0
 
@@ -69,7 +68,7 @@ def _convert_api_item(item: dict[str, str]) -> TodoItem:
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GoogleTasksConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Google Tasks todo platform."""
     async_add_entities(
diff --git a/homeassistant/components/google_tasks/types.py b/homeassistant/components/google_tasks/types.py
deleted file mode 100644
index 21500d11eb8..00000000000
--- a/homeassistant/components/google_tasks/types.py
+++ /dev/null
@@ -1,7 +0,0 @@
-"""Types for the Google Tasks integration."""
-
-from homeassistant.config_entries import ConfigEntry
-
-from .coordinator import TaskUpdateCoordinator
-
-type GoogleTasksConfigEntry = ConfigEntry[list[TaskUpdateCoordinator]]
diff --git a/homeassistant/components/google_translate/tts.py b/homeassistant/components/google_translate/tts.py
index 13e0ca4c273..201300d95b4 100644
--- a/homeassistant/components/google_translate/tts.py
+++ b/homeassistant/components/google_translate/tts.py
@@ -19,7 +19,7 @@ from homeassistant.components.tts import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import (
@@ -55,7 +55,7 @@ async def async_get_engine(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Google Translate speech platform via config entry."""
     default_language = config_entry.data[CONF_LANG]
diff --git a/homeassistant/components/google_travel_time/config_flow.py b/homeassistant/components/google_travel_time/config_flow.py
index 08de293bc7d..a29d3d75b3e 100644
--- a/homeassistant/components/google_travel_time/config_flow.py
+++ b/homeassistant/components/google_travel_time/config_flow.py
@@ -14,7 +14,7 @@ from homeassistant.config_entries import (
 )
 from homeassistant.const import CONF_API_KEY, CONF_LANGUAGE, CONF_MODE, CONF_NAME
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.selector import (
     SelectSelector,
     SelectSelectorConfig,
diff --git a/homeassistant/components/google_travel_time/sensor.py b/homeassistant/components/google_travel_time/sensor.py
index a764036321b..cac792dca53 100644
--- a/homeassistant/components/google_travel_time/sensor.py
+++ b/homeassistant/components/google_travel_time/sensor.py
@@ -23,9 +23,9 @@ from homeassistant.const import (
 )
 from homeassistant.core import CoreState, HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.location import find_coordinates
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import (
     ATTRIBUTION,
@@ -55,7 +55,7 @@ def convert_time_to_utc(timestr):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Google travel time sensor entry."""
     api_key = config_entry.data[CONF_API_KEY]
diff --git a/homeassistant/components/google_wifi/sensor.py b/homeassistant/components/google_wifi/sensor.py
index 3dd421d99da..6ce1c49410f 100644
--- a/homeassistant/components/google_wifi/sensor.py
+++ b/homeassistant/components/google_wifi/sensor.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle, dt as dt_util
diff --git a/homeassistant/components/govee_ble/binary_sensor.py b/homeassistant/components/govee_ble/binary_sensor.py
index 7b7a1fb5a50..c3c71714e90 100644
--- a/homeassistant/components/govee_ble/binary_sensor.py
+++ b/homeassistant/components/govee_ble/binary_sensor.py
@@ -20,7 +20,7 @@ from homeassistant.components.bluetooth.passive_update_processor import (
     PassiveBluetoothProcessorEntity,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from .coordinator import GoveeBLEPassiveBluetoothDataProcessor
@@ -76,7 +76,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the govee-ble BLE sensors."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/govee_ble/config_flow.py b/homeassistant/components/govee_ble/config_flow.py
index 2cc47435abf..d48fffdd633 100644
--- a/homeassistant/components/govee_ble/config_flow.py
+++ b/homeassistant/components/govee_ble/config_flow.py
@@ -78,7 +78,7 @@ class GoveeConfigFlow(ConfigFlow, domain=DOMAIN):
                 title=title, data={CONF_DEVICE_TYPE: device.device_type}
             )
 
-        current_addresses = self._async_current_ids()
+        current_addresses = self._async_current_ids(include_ignore=False)
         for discovery_info in async_discovered_service_info(self.hass, False):
             address = discovery_info.address
             if address in current_addresses or address in self._discovered_devices:
diff --git a/homeassistant/components/govee_ble/event.py b/homeassistant/components/govee_ble/event.py
index 5e5aa6354be..03f74f37f6a 100644
--- a/homeassistant/components/govee_ble/event.py
+++ b/homeassistant/components/govee_ble/event.py
@@ -16,7 +16,7 @@ from homeassistant.components.event import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import GoveeBLEConfigEntry, format_event_dispatcher_name
@@ -90,7 +90,7 @@ class GoveeBluetoothEventEntity(EventEntity):
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GoveeBLEConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a govee ble event."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/govee_ble/manifest.json b/homeassistant/components/govee_ble/manifest.json
index 5a123de7066..b06dab243af 100644
--- a/homeassistant/components/govee_ble/manifest.json
+++ b/homeassistant/components/govee_ble/manifest.json
@@ -38,6 +38,10 @@
       "local_name": "GV5126*",
       "connectable": false
     },
+    {
+      "local_name": "GV5179*",
+      "connectable": false
+    },
     {
       "local_name": "GVH5127*",
       "connectable": false
@@ -131,5 +135,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/govee_ble",
   "iot_class": "local_push",
-  "requirements": ["govee-ble==0.42.0"]
+  "requirements": ["govee-ble==0.43.1"]
 }
diff --git a/homeassistant/components/govee_ble/sensor.py b/homeassistant/components/govee_ble/sensor.py
index 383f50e5c46..fa0b828176c 100644
--- a/homeassistant/components/govee_ble/sensor.py
+++ b/homeassistant/components/govee_ble/sensor.py
@@ -26,7 +26,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from .coordinator import GoveeBLEConfigEntry, GoveeBLEPassiveBluetoothDataProcessor
@@ -105,7 +105,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: GoveeBLEConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Govee BLE sensors."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/govee_light_local/__init__.py b/homeassistant/components/govee_light_local/__init__.py
index 44dbc825665..ee04dd81088 100644
--- a/homeassistant/components/govee_light_local/__init__.py
+++ b/homeassistant/components/govee_light_local/__init__.py
@@ -23,7 +23,7 @@ _LOGGER = logging.getLogger(__name__)
 
 async def async_setup_entry(hass: HomeAssistant, entry: GoveeLocalConfigEntry) -> bool:
     """Set up Govee light local from a config entry."""
-    coordinator = GoveeLocalApiCoordinator(hass=hass)
+    coordinator = GoveeLocalApiCoordinator(hass, entry)
 
     async def await_cleanup():
         cleanup_complete: asyncio.Event = coordinator.cleanup()
diff --git a/homeassistant/components/govee_light_local/coordinator.py b/homeassistant/components/govee_light_local/coordinator.py
index 240313a34b8..530ade1f743 100644
--- a/homeassistant/components/govee_light_local/coordinator.py
+++ b/homeassistant/components/govee_light_local/coordinator.py
@@ -26,11 +26,16 @@ type GoveeLocalConfigEntry = ConfigEntry[GoveeLocalApiCoordinator]
 class GoveeLocalApiCoordinator(DataUpdateCoordinator[list[GoveeDevice]]):
     """Govee light local coordinator."""
 
-    def __init__(self, hass: HomeAssistant) -> None:
+    config_entry: GoveeLocalConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: GoveeLocalConfigEntry
+    ) -> None:
         """Initialize my coordinator."""
         super().__init__(
             hass=hass,
             logger=_LOGGER,
+            config_entry=config_entry,
             name="GoveeLightLocalApi",
             update_interval=SCAN_INTERVAL,
         )
@@ -84,6 +89,10 @@ class GoveeLocalApiCoordinator(DataUpdateCoordinator[list[GoveeDevice]]):
         """Set light color in kelvin."""
         await device.set_temperature(temperature)
 
+    async def set_scene(self, device: GoveeController, scene: str) -> None:
+        """Set light scene."""
+        await device.set_scene(scene)
+
     @property
     def devices(self) -> list[GoveeDevice]:
         """Return a list of discovered Govee devices."""
diff --git a/homeassistant/components/govee_light_local/light.py b/homeassistant/components/govee_light_local/light.py
index cb2e24fa8a6..984654477e9 100644
--- a/homeassistant/components/govee_light_local/light.py
+++ b/homeassistant/components/govee_light_local/light.py
@@ -5,19 +5,21 @@ from __future__ import annotations
 import logging
 from typing import Any
 
-from govee_local_api import GoveeDevice, GoveeLightCapability
+from govee_local_api import GoveeDevice, GoveeLightFeatures
 
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
     ATTR_COLOR_TEMP_KELVIN,
+    ATTR_EFFECT,
     ATTR_RGB_COLOR,
     ColorMode,
     LightEntity,
+    LightEntityFeature,
     filter_supported_color_modes,
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, MANUFACTURER
@@ -25,11 +27,13 @@ from .coordinator import GoveeLocalApiCoordinator, GoveeLocalConfigEntry
 
 _LOGGER = logging.getLogger(__name__)
 
+_NONE_SCENE = "none"
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: GoveeLocalConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Govee light setup."""
 
@@ -50,10 +54,22 @@ async def async_setup_entry(
 class GoveeLight(CoordinatorEntity[GoveeLocalApiCoordinator], LightEntity):
     """Govee Light."""
 
+    _attr_translation_key = "govee_light"
     _attr_has_entity_name = True
     _attr_name = None
     _attr_supported_color_modes: set[ColorMode]
     _fixed_color_mode: ColorMode | None = None
+    _attr_effect_list: list[str] | None = None
+    _attr_effect: str | None = None
+    _attr_supported_features: LightEntityFeature = LightEntityFeature(0)
+    _last_color_state: (
+        tuple[
+            ColorMode | str | None,
+            int | None,
+            tuple[int, int, int] | tuple[int | None] | None,
+        ]
+        | None
+    ) = None
 
     def __init__(
         self,
@@ -71,15 +87,22 @@ class GoveeLight(CoordinatorEntity[GoveeLocalApiCoordinator], LightEntity):
         capabilities = device.capabilities
         color_modes = {ColorMode.ONOFF}
         if capabilities:
-            if GoveeLightCapability.COLOR_RGB in capabilities:
+            if GoveeLightFeatures.COLOR_RGB & capabilities.features:
                 color_modes.add(ColorMode.RGB)
-            if GoveeLightCapability.COLOR_KELVIN_TEMPERATURE in capabilities:
+            if GoveeLightFeatures.COLOR_KELVIN_TEMPERATURE & capabilities.features:
                 color_modes.add(ColorMode.COLOR_TEMP)
                 self._attr_max_color_temp_kelvin = 9000
                 self._attr_min_color_temp_kelvin = 2000
-            if GoveeLightCapability.BRIGHTNESS in capabilities:
+            if GoveeLightFeatures.BRIGHTNESS & capabilities.features:
                 color_modes.add(ColorMode.BRIGHTNESS)
 
+            if (
+                GoveeLightFeatures.SCENES & capabilities.features
+                and capabilities.scenes
+            ):
+                self._attr_supported_features = LightEntityFeature.EFFECT
+                self._attr_effect_list = [_NONE_SCENE, *capabilities.scenes.keys()]
+
         self._attr_supported_color_modes = filter_supported_color_modes(color_modes)
         if len(self._attr_supported_color_modes) == 1:
             # If the light supports only a single color mode, set it now
@@ -143,12 +166,27 @@ class GoveeLight(CoordinatorEntity[GoveeLocalApiCoordinator], LightEntity):
 
         if ATTR_RGB_COLOR in kwargs:
             self._attr_color_mode = ColorMode.RGB
+            self._attr_effect = None
+            self._last_color_state = None
             red, green, blue = kwargs[ATTR_RGB_COLOR]
             await self.coordinator.set_rgb_color(self._device, red, green, blue)
         elif ATTR_COLOR_TEMP_KELVIN in kwargs:
             self._attr_color_mode = ColorMode.COLOR_TEMP
+            self._attr_effect = None
+            self._last_color_state = None
             temperature: float = kwargs[ATTR_COLOR_TEMP_KELVIN]
             await self.coordinator.set_temperature(self._device, int(temperature))
+        elif ATTR_EFFECT in kwargs:
+            effect = kwargs[ATTR_EFFECT]
+            if effect and self._attr_effect_list and effect in self._attr_effect_list:
+                if effect == _NONE_SCENE:
+                    self._attr_effect = None
+                    await self._restore_last_color_state()
+                else:
+                    self._attr_effect = effect
+                    self._save_last_color_state()
+                    await self.coordinator.set_scene(self._device, effect)
+
         self.async_write_ha_state()
 
     async def async_turn_off(self, **kwargs: Any) -> None:
@@ -159,3 +197,27 @@ class GoveeLight(CoordinatorEntity[GoveeLocalApiCoordinator], LightEntity):
     @callback
     def _update_callback(self, device: GoveeDevice) -> None:
         self.async_write_ha_state()
+
+    def _save_last_color_state(self) -> None:
+        color_mode = self.color_mode
+        self._last_color_state = (
+            color_mode,
+            self.brightness,
+            (self.color_temp_kelvin,)
+            if color_mode == ColorMode.COLOR_TEMP
+            else self.rgb_color,
+        )
+
+    async def _restore_last_color_state(self) -> None:
+        if self._last_color_state:
+            color_mode, brightness, color = self._last_color_state
+            if color:
+                if color_mode == ColorMode.RGB:
+                    await self.coordinator.set_rgb_color(self._device, *color)
+                elif color_mode == ColorMode.COLOR_TEMP:
+                    await self.coordinator.set_temperature(self._device, *color)
+            if brightness:
+                await self.coordinator.set_brightness(
+                    self._device, int((float(brightness) / 255.0) * 100.0)
+                )
+            self._last_color_state = None
diff --git a/homeassistant/components/govee_light_local/manifest.json b/homeassistant/components/govee_light_local/manifest.json
index a94d4e58e9a..55a6b9e8578 100644
--- a/homeassistant/components/govee_light_local/manifest.json
+++ b/homeassistant/components/govee_light_local/manifest.json
@@ -6,5 +6,5 @@
   "dependencies": ["network"],
   "documentation": "https://www.home-assistant.io/integrations/govee_light_local",
   "iot_class": "local_push",
-  "requirements": ["govee-local-api==1.5.3"]
+  "requirements": ["govee-local-api==2.1.0"]
 }
diff --git a/homeassistant/components/govee_light_local/strings.json b/homeassistant/components/govee_light_local/strings.json
index ad8f0f41ae7..49f3a2cbeb9 100644
--- a/homeassistant/components/govee_light_local/strings.json
+++ b/homeassistant/components/govee_light_local/strings.json
@@ -9,5 +9,29 @@
       "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
       "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
     }
+  },
+  "entity": {
+    "light": {
+      "govee_light": {
+        "state_attributes": {
+          "effect": {
+            "state": {
+              "none": "None",
+              "sunrise": "Sunrise",
+              "sunset": "Sunset",
+              "movie": "Movie",
+              "dating": "Dating",
+              "romantic": "Romantic",
+              "twinkle": "Twinkle",
+              "candlelight": "Candlelight",
+              "snowflake": "Snowflake",
+              "energetic": "Energetic",
+              "breathe": "Breathe",
+              "crossing": "Crossing"
+            }
+          }
+        }
+      }
+    }
   }
 }
diff --git a/homeassistant/components/gpsd/icons.json b/homeassistant/components/gpsd/icons.json
index 59d904f918c..3605bdc6d70 100644
--- a/homeassistant/components/gpsd/icons.json
+++ b/homeassistant/components/gpsd/icons.json
@@ -16,6 +16,12 @@
       },
       "elevation": {
         "default": "mdi:arrow-up-down"
+      },
+      "total_satellites": {
+        "default": "mdi:satellite-variant"
+      },
+      "used_satellites": {
+        "default": "mdi:satellite-variant"
       }
     }
   }
diff --git a/homeassistant/components/gpsd/sensor.py b/homeassistant/components/gpsd/sensor.py
index 1bac41ecaae..cc2257c88f7 100644
--- a/homeassistant/components/gpsd/sensor.py
+++ b/homeassistant/components/gpsd/sensor.py
@@ -6,7 +6,6 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from datetime import datetime
 import logging
-from typing import Any
 
 from gps3.agps3threaded import AGPS3mechanism
 
@@ -14,6 +13,7 @@ from homeassistant.components.sensor import (
     SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
+    SensorStateClass,
 )
 from homeassistant.const import (
     ATTR_LATITUDE,
@@ -26,7 +26,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util import dt as dt_util
 
@@ -37,14 +37,32 @@ _LOGGER = logging.getLogger(__name__)
 
 ATTR_CLIMB = "climb"
 ATTR_ELEVATION = "elevation"
-ATTR_GPS_TIME = "gps_time"
 ATTR_SPEED = "speed"
+ATTR_TOTAL_SATELLITES = "total_satellites"
+ATTR_USED_SATELLITES = "used_satellites"
 
 DEFAULT_NAME = "GPS"
 
 _MODE_VALUES = {2: "2d_fix", 3: "3d_fix"}
 
 
+def count_total_satellites_fn(agps_thread: AGPS3mechanism) -> int | None:
+    """Count the number of total satellites."""
+    satellites = agps_thread.data_stream.satellites
+    return None if satellites == "n/a" else len(satellites)
+
+
+def count_used_satellites_fn(agps_thread: AGPS3mechanism) -> int | None:
+    """Count the number of used satellites."""
+    satellites = agps_thread.data_stream.satellites
+    if satellites == "n/a":
+        return None
+
+    return sum(
+        1 for sat in satellites if isinstance(sat, dict) and sat.get("used", False)
+    )
+
+
 @dataclass(frozen=True, kw_only=True)
 class GpsdSensorDescription(SensorEntityDescription):
     """Class describing GPSD sensor entities."""
@@ -116,13 +134,29 @@ SENSOR_TYPES: tuple[GpsdSensorDescription, ...] = (
         suggested_display_precision=2,
         entity_registry_enabled_default=False,
     ),
+    GpsdSensorDescription(
+        key=ATTR_TOTAL_SATELLITES,
+        translation_key=ATTR_TOTAL_SATELLITES,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        state_class=SensorStateClass.MEASUREMENT,
+        value_fn=count_total_satellites_fn,
+        entity_registry_enabled_default=False,
+    ),
+    GpsdSensorDescription(
+        key=ATTR_USED_SATELLITES,
+        translation_key=ATTR_USED_SATELLITES,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        state_class=SensorStateClass.MEASUREMENT,
+        value_fn=count_used_satellites_fn,
+        entity_registry_enabled_default=False,
+    ),
 )
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: GPSDConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the GPSD component."""
     async_add_entities(
@@ -165,21 +199,3 @@ class GpsdSensor(SensorEntity):
         """Return the state of GPSD."""
         value = self.entity_description.value_fn(self.agps_thread)
         return None if value == "n/a" else value
-
-    # Deprecated since Home Assistant 2024.9.0
-    # Can be removed completely in 2025.3.0
-    @property
-    def extra_state_attributes(self) -> dict[str, Any] | None:
-        """Return the state attributes of the GPS."""
-        if self.entity_description.key != ATTR_MODE:
-            return None
-
-        return {
-            ATTR_LATITUDE: self.agps_thread.data_stream.lat,
-            ATTR_LONGITUDE: self.agps_thread.data_stream.lon,
-            ATTR_ELEVATION: self.agps_thread.data_stream.alt,
-            ATTR_GPS_TIME: self.agps_thread.data_stream.time,
-            ATTR_SPEED: self.agps_thread.data_stream.speed,
-            ATTR_CLIMB: self.agps_thread.data_stream.climb,
-            ATTR_MODE: self.agps_thread.data_stream.mode,
-        }
diff --git a/homeassistant/components/gpsd/strings.json b/homeassistant/components/gpsd/strings.json
index 867edf0b5a8..a5d6c570b54 100644
--- a/homeassistant/components/gpsd/strings.json
+++ b/homeassistant/components/gpsd/strings.json
@@ -50,6 +50,14 @@
           },
           "mode": { "name": "[%key:common::config_flow::data::mode%]" }
         }
+      },
+      "total_satellites": {
+        "name": "Total satellites",
+        "unit_of_measurement": "satellites"
+      },
+      "used_satellites": {
+        "name": "Used satellites",
+        "unit_of_measurement": "satellites"
       }
     }
   }
diff --git a/homeassistant/components/gpslogger/__init__.py b/homeassistant/components/gpslogger/__init__.py
index 50a98e277a6..7c7612ed201 100644
--- a/homeassistant/components/gpslogger/__init__.py
+++ b/homeassistant/components/gpslogger/__init__.py
@@ -10,8 +10,7 @@ from homeassistant.components.device_tracker import ATTR_BATTERY
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_LATITUDE, ATTR_LONGITUDE, CONF_WEBHOOK_ID, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_entry_flow
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_entry_flow, config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 
 from .const import (
diff --git a/homeassistant/components/gpslogger/device_tracker.py b/homeassistant/components/gpslogger/device_tracker.py
index 3ed68ed1b06..be38382098d 100644
--- a/homeassistant/components/gpslogger/device_tracker.py
+++ b/homeassistant/components/gpslogger/device_tracker.py
@@ -12,7 +12,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from . import DOMAIN as GPL_DOMAIN, TRACKER_UPDATE
@@ -26,7 +26,9 @@ from .const import (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Configure a dispatcher connection based on a config entry."""
 
diff --git a/homeassistant/components/graphite/__init__.py b/homeassistant/components/graphite/__init__.py
index 336ca6ba2cb..8d1864f5522 100644
--- a/homeassistant/components/graphite/__init__.py
+++ b/homeassistant/components/graphite/__init__.py
@@ -19,8 +19,7 @@ from homeassistant.const import (
     EVENT_STATE_CHANGED,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import state
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, state
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/gree/__init__.py b/homeassistant/components/gree/__init__.py
index c385ce45262..7cb4f0f0921 100644
--- a/homeassistant/components/gree/__init__.py
+++ b/homeassistant/components/gree/__init__.py
@@ -26,7 +26,7 @@ PLATFORMS = [Platform.CLIMATE, Platform.SWITCH]
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Gree Climate from a config entry."""
     hass.data.setdefault(DOMAIN, {})
-    gree_discovery = DiscoveryService(hass)
+    gree_discovery = DiscoveryService(hass, entry)
     hass.data[DATA_DISCOVERY_SERVICE] = gree_discovery
 
     async def _async_scan_update(_=None):
diff --git a/homeassistant/components/gree/climate.py b/homeassistant/components/gree/climate.py
index f197f21a4e1..f703ded1ea2 100644
--- a/homeassistant/components/gree/climate.py
+++ b/homeassistant/components/gree/climate.py
@@ -40,7 +40,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, PRECISION_WHOLE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     COORDINATORS,
@@ -88,7 +88,7 @@ SWING_MODES = [SWING_OFF, SWING_VERTICAL, SWING_HORIZONTAL, SWING_BOTH]
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Gree HVAC device from a config entry."""
 
diff --git a/homeassistant/components/gree/const.py b/homeassistant/components/gree/const.py
index f926eb1c53e..14236f09fa2 100644
--- a/homeassistant/components/gree/const.py
+++ b/homeassistant/components/gree/const.py
@@ -20,3 +20,4 @@ MAX_ERRORS = 2
 TARGET_TEMPERATURE_STEP = 1
 
 UPDATE_INTERVAL = 60
+MAX_EXPECTED_RESPONSE_TIME_INTERVAL = UPDATE_INTERVAL * 2
diff --git a/homeassistant/components/gree/coordinator.py b/homeassistant/components/gree/coordinator.py
index 42d6734a6b2..c8b4e6cff54 100644
--- a/homeassistant/components/gree/coordinator.py
+++ b/homeassistant/components/gree/coordinator.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import copy
 from datetime import datetime, timedelta
 import logging
 from typing import Any
@@ -11,6 +12,7 @@ from greeclimate.discovery import Discovery, Listener
 from greeclimate.exceptions import DeviceNotBoundError, DeviceTimeoutError
 from greeclimate.network import Response
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.json import json_dumps
@@ -23,6 +25,7 @@ from .const import (
     DISPATCH_DEVICE_DISCOVERED,
     DOMAIN,
     MAX_ERRORS,
+    MAX_EXPECTED_RESPONSE_TIME_INTERVAL,
     UPDATE_INTERVAL,
 )
 
@@ -32,18 +35,21 @@ _LOGGER = logging.getLogger(__name__)
 class DeviceDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Manages polling for state changes from the device."""
 
-    def __init__(self, hass: HomeAssistant, device: Device) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, device: Device
+    ) -> None:
         """Initialize the data update coordinator."""
-        DataUpdateCoordinator.__init__(
-            self,
+        super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=f"{DOMAIN}-{device.device_info.name}",
             update_interval=timedelta(seconds=UPDATE_INTERVAL),
             always_update=False,
         )
         self.device = device
-        self.device.add_handler(Response.DATA, self.device_state_updated)
         self.device.add_handler(Response.RESULT, self.device_state_updated)
 
         self._error_count: int = 0
@@ -83,7 +89,9 @@ class DeviceDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
             # raise update failed if time for more than MAX_ERRORS has passed since last update
             now = utcnow()
             elapsed_success = now - self._last_response_time
-            if self.update_interval and elapsed_success >= self.update_interval:
+            if self.update_interval and elapsed_success >= timedelta(
+                seconds=MAX_EXPECTED_RESPONSE_TIME_INTERVAL
+            ):
                 if not self._last_error_time or (
                     (now - self.update_interval) >= self._last_error_time
                 ):
@@ -91,16 +99,19 @@ class DeviceDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
                     self._error_count += 1
 
                 _LOGGER.warning(
-                    "Device %s is unresponsive for %s seconds",
+                    "Device %s took an unusually long time to respond, %s seconds",
                     self.name,
                     elapsed_success,
                 )
+            else:
+                self._error_count = 0
             if self.last_update_success and self._error_count >= MAX_ERRORS:
                 raise UpdateFailed(
                     f"Device {self.name} is unresponsive for too long and now unavailable"
                 )
 
-        return self.device.raw_properties
+        self._last_response_time = utcnow()
+        return copy.deepcopy(self.device.raw_properties)
 
     async def push_state_update(self):
         """Send state updates to the physical device."""
@@ -117,10 +128,11 @@ class DeviceDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
 class DiscoveryService(Listener):
     """Discovery event handler for gree devices."""
 
-    def __init__(self, hass: HomeAssistant) -> None:
+    def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
         """Initialize discovery service."""
         super().__init__()
         self.hass = hass
+        self.entry = entry
 
         self.discovery = Discovery(DISCOVERY_TIMEOUT)
         self.discovery.add_listener(self)
@@ -144,7 +156,7 @@ class DiscoveryService(Listener):
             device.device_info.ip,
             device.device_info.port,
         )
-        coordo = DeviceDataUpdateCoordinator(self.hass, device)
+        coordo = DeviceDataUpdateCoordinator(self.hass, self.entry, device)
         self.hass.data[DOMAIN][COORDINATORS].append(coordo)
         await coordo.async_refresh()
 
diff --git a/homeassistant/components/gree/switch.py b/homeassistant/components/gree/switch.py
index c1612ce99de..67dc10138d1 100644
--- a/homeassistant/components/gree/switch.py
+++ b/homeassistant/components/gree/switch.py
@@ -16,7 +16,7 @@ from homeassistant.components.switch import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import COORDINATORS, DISPATCH_DEVICE_DISCOVERED, DOMAIN
 from .entity import GreeEntity
@@ -93,7 +93,7 @@ GREE_SWITCHES: tuple[GreeSwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Gree HVAC device from a config entry."""
 
diff --git a/homeassistant/components/greeneye_monitor/__init__.py b/homeassistant/components/greeneye_monitor/__init__.py
index 083d431e338..e3acbcd56e9 100644
--- a/homeassistant/components/greeneye_monitor/__init__.py
+++ b/homeassistant/components/greeneye_monitor/__init__.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import Event, HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/greenwave/light.py b/homeassistant/components/greenwave/light.py
index 89d3ca3a535..9b7a3cf29ea 100644
--- a/homeassistant/components/greenwave/light.py
+++ b/homeassistant/components/greenwave/light.py
@@ -18,7 +18,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/group/binary_sensor.py b/homeassistant/components/group/binary_sensor.py
index 06c810c2643..fa1777d5510 100644
--- a/homeassistant/components/group/binary_sensor.py
+++ b/homeassistant/components/group/binary_sensor.py
@@ -26,7 +26,10 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .entity import GroupEntity
@@ -70,7 +73,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize Binary Sensor Group config entry."""
     registry = er.async_get(hass)
diff --git a/homeassistant/components/group/button.py b/homeassistant/components/group/button.py
index a18e074b775..c96d60067a1 100644
--- a/homeassistant/components/group/button.py
+++ b/homeassistant/components/group/button.py
@@ -22,7 +22,10 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .entity import GroupEntity
@@ -62,7 +65,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize button group config entry."""
     registry = er.async_get(hass)
diff --git a/homeassistant/components/group/cover.py b/homeassistant/components/group/cover.py
index b2e5c6eef37..64baba6d1e8 100644
--- a/homeassistant/components/group/cover.py
+++ b/homeassistant/components/group/cover.py
@@ -37,7 +37,10 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, State, callback
 from homeassistant.helpers import config_validation as cv, entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .entity import GroupEntity
@@ -80,7 +83,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize Cover Group config entry."""
     registry = er.async_get(hass)
diff --git a/homeassistant/components/group/event.py b/homeassistant/components/group/event.py
index e7f7938edf3..4009c788362 100644
--- a/homeassistant/components/group/event.py
+++ b/homeassistant/components/group/event.py
@@ -27,7 +27,10 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, EventStateChangedData, HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
@@ -68,7 +71,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize event group config entry."""
     registry = er.async_get(hass)
diff --git a/homeassistant/components/group/fan.py b/homeassistant/components/group/fan.py
index 87d9cb281f4..78745cb74c6 100644
--- a/homeassistant/components/group/fan.py
+++ b/homeassistant/components/group/fan.py
@@ -37,7 +37,10 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, State, callback
 from homeassistant.helpers import config_validation as cv, entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .entity import GroupEntity
@@ -82,7 +85,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize Fan Group config entry."""
     registry = er.async_get(hass)
diff --git a/homeassistant/components/group/light.py b/homeassistant/components/group/light.py
index 228645df974..259832d6152 100644
--- a/homeassistant/components/group/light.py
+++ b/homeassistant/components/group/light.py
@@ -48,7 +48,10 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .entity import GroupEntity
@@ -98,7 +101,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize Light Group config entry."""
     registry = er.async_get(hass)
diff --git a/homeassistant/components/group/lock.py b/homeassistant/components/group/lock.py
index e22e1ecd85c..7b460aa4632 100644
--- a/homeassistant/components/group/lock.py
+++ b/homeassistant/components/group/lock.py
@@ -28,7 +28,10 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .entity import GroupEntity
@@ -70,7 +73,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize Lock Group config entry."""
     registry = er.async_get(hass)
diff --git a/homeassistant/components/group/media_player.py b/homeassistant/components/group/media_player.py
index ab8ee64b3e1..3371e56b1dc 100644
--- a/homeassistant/components/group/media_player.py
+++ b/homeassistant/components/group/media_player.py
@@ -54,7 +54,10 @@ from homeassistant.core import (
     callback,
 )
 from homeassistant.helpers import config_validation as cv, entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
@@ -99,7 +102,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize MediaPlayer Group config entry."""
     registry = er.async_get(hass)
diff --git a/homeassistant/components/group/notify.py b/homeassistant/components/group/notify.py
index fdef327cb73..e710485c46f 100644
--- a/homeassistant/components/group/notify.py
+++ b/homeassistant/components/group/notify.py
@@ -28,9 +28,8 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import config_validation as cv, entity_registry as er
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .entity import GroupEntity
@@ -130,7 +129,7 @@ class GroupNotifyPlatform(BaseNotificationService):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize Notify Group config entry."""
     registry = er.async_get(hass)
diff --git a/homeassistant/components/group/sensor.py b/homeassistant/components/group/sensor.py
index 4a3e191e511..9f0cc64ecf0 100644
--- a/homeassistant/components/group/sensor.py
+++ b/homeassistant/components/group/sensor.py
@@ -44,7 +44,10 @@ from homeassistant.helpers.entity import (
     get_device_class,
     get_unit_of_measurement,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.issue_registry import (
     IssueSeverity,
     async_create_issue,
@@ -130,7 +133,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize Switch Group config entry."""
     registry = er.async_get(hass)
diff --git a/homeassistant/components/group/switch.py b/homeassistant/components/group/switch.py
index 101c42d354f..29e625ca8e3 100644
--- a/homeassistant/components/group/switch.py
+++ b/homeassistant/components/group/switch.py
@@ -26,7 +26,10 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .entity import GroupEntity
@@ -71,7 +74,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize Switch Group config entry."""
     registry = er.async_get(hass)
diff --git a/homeassistant/components/growatt_server/sensor/__init__.py b/homeassistant/components/growatt_server/sensor/__init__.py
index e77660e6a3a..2794403811d 100644
--- a/homeassistant/components/growatt_server/sensor/__init__.py
+++ b/homeassistant/components/growatt_server/sensor/__init__.py
@@ -14,7 +14,7 @@ from homeassistant.const import CONF_NAME, CONF_PASSWORD, CONF_URL, CONF_USERNAM
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import Throttle, dt as dt_util
 
 from ..const import (
@@ -61,7 +61,7 @@ def get_device_list(api, config):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Growatt sensor."""
     config = {**config_entry.data}
diff --git a/homeassistant/components/growatt_server/sensor/total.py b/homeassistant/components/growatt_server/sensor/total.py
index 8111728d1e9..578745c8610 100644
--- a/homeassistant/components/growatt_server/sensor/total.py
+++ b/homeassistant/components/growatt_server/sensor/total.py
@@ -26,6 +26,7 @@ TOTAL_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         api_key="todayEnergy",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     GrowattSensorEntityDescription(
         key="total_output_power",
@@ -33,6 +34,7 @@ TOTAL_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         api_key="invTodayPpv",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     GrowattSensorEntityDescription(
         key="total_energy_output",
diff --git a/homeassistant/components/growatt_server/strings.json b/homeassistant/components/growatt_server/strings.json
index 9a985d98034..758428d7a55 100644
--- a/homeassistant/components/growatt_server/strings.json
+++ b/homeassistant/components/growatt_server/strings.json
@@ -38,28 +38,28 @@
         "name": "Input 1 voltage"
       },
       "inverter_amperage_input_1": {
-        "name": "Input 1 Amperage"
+        "name": "Input 1 amperage"
       },
       "inverter_wattage_input_1": {
-        "name": "Input 1 Wattage"
+        "name": "Input 1 wattage"
       },
       "inverter_voltage_input_2": {
         "name": "Input 2 voltage"
       },
       "inverter_amperage_input_2": {
-        "name": "Input 2 Amperage"
+        "name": "Input 2 amperage"
       },
       "inverter_wattage_input_2": {
-        "name": "Input 2 Wattage"
+        "name": "Input 2 wattage"
       },
       "inverter_voltage_input_3": {
         "name": "Input 3 voltage"
       },
       "inverter_amperage_input_3": {
-        "name": "Input 3 Amperage"
+        "name": "Input 3 amperage"
       },
       "inverter_wattage_input_3": {
-        "name": "Input 3 Wattage"
+        "name": "Input 3 wattage"
       },
       "inverter_internal_wattage": {
         "name": "Internal wattage"
@@ -137,13 +137,13 @@
         "name": "Load consumption"
       },
       "mix_wattage_pv_1": {
-        "name": "PV1 Wattage"
+        "name": "PV1 wattage"
       },
       "mix_wattage_pv_2": {
-        "name": "PV2 Wattage"
+        "name": "PV2 wattage"
       },
       "mix_wattage_pv_all": {
-        "name": "All PV Wattage"
+        "name": "All PV wattage"
       },
       "mix_export_to_grid": {
         "name": "Export to grid"
@@ -182,7 +182,7 @@
         "name": "Storage production today"
       },
       "storage_storage_production_lifetime": {
-        "name": "Lifetime Storage production"
+        "name": "Lifetime storage production"
       },
       "storage_grid_discharge_today": {
         "name": "Grid discharged today"
@@ -224,7 +224,7 @@
         "name": "Storage charging/ discharging(-ve)"
       },
       "storage_load_consumption_solar_storage": {
-        "name": "Load consumption (Solar + Storage)"
+        "name": "Load consumption (solar + storage)"
       },
       "storage_charge_today": {
         "name": "Charge today"
@@ -257,7 +257,7 @@
         "name": "Output voltage"
       },
       "storage_ac_output_frequency": {
-        "name": "Ac output frequency"
+        "name": "AC output frequency"
       },
       "storage_current_pv": {
         "name": "Solar charge current"
@@ -290,7 +290,7 @@
         "name": "Lifetime total energy input 1"
       },
       "tlx_energy_today_input_1": {
-        "name": "Energy Today Input 1"
+        "name": "Energy today input 1"
       },
       "tlx_voltage_input_1": {
         "name": "[%key:component::growatt_server::entity::sensor::inverter_voltage_input_1::name%]"
@@ -305,7 +305,7 @@
         "name": "Lifetime total energy input 2"
       },
       "tlx_energy_today_input_2": {
-        "name": "Energy Today Input 2"
+        "name": "Energy today input 2"
       },
       "tlx_voltage_input_2": {
         "name": "[%key:component::growatt_server::entity::sensor::inverter_voltage_input_2::name%]"
@@ -320,7 +320,7 @@
         "name": "Lifetime total energy input 3"
       },
       "tlx_energy_today_input_3": {
-        "name": "Energy Today Input 3"
+        "name": "Energy today input 3"
       },
       "tlx_voltage_input_3": {
         "name": "[%key:component::growatt_server::entity::sensor::inverter_voltage_input_3::name%]"
@@ -335,16 +335,16 @@
         "name": "Lifetime total energy input 4"
       },
       "tlx_energy_today_input_4": {
-        "name": "Energy Today Input 4"
+        "name": "Energy today input 4"
       },
       "tlx_voltage_input_4": {
         "name": "Input 4 voltage"
       },
       "tlx_amperage_input_4": {
-        "name": "Input 4 Amperage"
+        "name": "Input 4 amperage"
       },
       "tlx_wattage_input_4": {
-        "name": "Input 4 Wattage"
+        "name": "Input 4 wattage"
       },
       "tlx_solar_generation_total": {
         "name": "Lifetime total solar energy"
@@ -434,10 +434,10 @@
         "name": "Money lifetime"
       },
       "total_energy_today": {
-        "name": "Energy Today"
+        "name": "Energy today"
       },
       "total_output_power": {
-        "name": "Output Power"
+        "name": "Output power"
       },
       "total_energy_output": {
         "name": "[%key:component::growatt_server::entity::sensor::inverter_energy_total::name%]"
diff --git a/homeassistant/components/gstreamer/media_player.py b/homeassistant/components/gstreamer/media_player.py
index fd9de62c016..bb78aff8faf 100644
--- a/homeassistant/components/gstreamer/media_player.py
+++ b/homeassistant/components/gstreamer/media_player.py
@@ -20,7 +20,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.const import CONF_NAME, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/gtfs/sensor.py b/homeassistant/components/gtfs/sensor.py
index f9e9c31ce46..8c624e2cdd6 100644
--- a/homeassistant/components/gtfs/sensor.py
+++ b/homeassistant/components/gtfs/sensor.py
@@ -19,11 +19,10 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_NAME, CONF_OFFSET, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import slugify
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util, slugify
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -342,7 +341,7 @@ def get_next_departure(
                  {tomorrow_order}
                  origin_stop_time.departure_time
         LIMIT :limit
-        """
+        """  # noqa: S608
     result = schedule.engine.connect().execute(
         text(sql_query),
         {
diff --git a/homeassistant/components/guardian/__init__.py b/homeassistant/components/guardian/__init__.py
index c1cbb4c0e5a..075c388c4e4 100644
--- a/homeassistant/components/guardian/__init__.py
+++ b/homeassistant/components/guardian/__init__.py
@@ -11,7 +11,7 @@ from aioguardian import Client
 from aioguardian.errors import GuardianError
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_DEVICE_ID,
     CONF_DEVICE_ID,
@@ -247,12 +247,7 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     if unload_ok:
         hass.data[DOMAIN].pop(entry.entry_id)
 
-    loaded_entries = [
-        entry
-        for entry in hass.config_entries.async_entries(DOMAIN)
-        if entry.state == ConfigEntryState.LOADED
-    ]
-    if len(loaded_entries) == 1:
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
         # If this is the last loaded instance of Guardian, deregister any services
         # defined during integration setup:
         for service_name in SERVICES:
diff --git a/homeassistant/components/guardian/binary_sensor.py b/homeassistant/components/guardian/binary_sensor.py
index 84bb61da0e5..7d5f97bdb65 100644
--- a/homeassistant/components/guardian/binary_sensor.py
+++ b/homeassistant/components/guardian/binary_sensor.py
@@ -16,7 +16,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import GuardianData
 from .const import (
@@ -86,7 +86,9 @@ VALVE_CONTROLLER_DESCRIPTIONS = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Guardian switches based on a config entry."""
     data: GuardianData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/guardian/button.py b/homeassistant/components/guardian/button.py
index f4881a9d94b..01bac63c6e3 100644
--- a/homeassistant/components/guardian/button.py
+++ b/homeassistant/components/guardian/button.py
@@ -16,7 +16,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_send
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import GuardianData
 from .const import API_SYSTEM_DIAGNOSTICS, DOMAIN
@@ -68,7 +68,9 @@ BUTTON_DESCRIPTIONS = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Guardian buttons based on a config entry."""
     data: GuardianData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/guardian/coordinator.py b/homeassistant/components/guardian/coordinator.py
index 849cec8063c..500b7c10784 100644
--- a/homeassistant/components/guardian/coordinator.py
+++ b/homeassistant/components/guardian/coordinator.py
@@ -42,6 +42,7 @@ class GuardianDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         super().__init__(
             hass,
             LOGGER,
+            config_entry=entry,
             name=f"{valve_controller_uid}_{api_name}",
             update_interval=DEFAULT_UPDATE_INTERVAL,
         )
@@ -50,7 +51,6 @@ class GuardianDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         self._api_lock = api_lock
         self._client = client
 
-        self.config_entry = entry
         self.signal_reboot_requested = SIGNAL_REBOOT_REQUESTED.format(
             self.config_entry.entry_id
         )
diff --git a/homeassistant/components/guardian/sensor.py b/homeassistant/components/guardian/sensor.py
index 3f9547e652a..13dd8e01296 100644
--- a/homeassistant/components/guardian/sensor.py
+++ b/homeassistant/components/guardian/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import GuardianData
@@ -137,7 +137,9 @@ VALVE_CONTROLLER_DESCRIPTIONS = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Guardian switches based on a config entry."""
     data: GuardianData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/guardian/switch.py b/homeassistant/components/guardian/switch.py
index fccf4f55a1f..a2c9ca282be 100644
--- a/homeassistant/components/guardian/switch.py
+++ b/homeassistant/components/guardian/switch.py
@@ -12,7 +12,7 @@ from homeassistant.components.switch import SwitchEntity, SwitchEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import GuardianData
 from .const import API_VALVE_STATUS, API_WIFI_STATUS, DOMAIN
@@ -110,7 +110,9 @@ VALVE_CONTROLLER_DESCRIPTIONS = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Guardian switches based on a config entry."""
     data: GuardianData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/guardian/valve.py b/homeassistant/components/guardian/valve.py
index 8c9749958bf..6847b3211c5 100644
--- a/homeassistant/components/guardian/valve.py
+++ b/homeassistant/components/guardian/valve.py
@@ -17,7 +17,7 @@ from homeassistant.components.valve import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import GuardianData
 from .const import API_VALVE_STATUS, DOMAIN
@@ -109,7 +109,9 @@ VALVE_CONTROLLER_DESCRIPTIONS = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Guardian switches based on a config entry."""
     data: GuardianData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/habitica/__init__.py b/homeassistant/components/habitica/__init__.py
index 1972e89c58a..217b5e739d1 100644
--- a/homeassistant/components/habitica/__init__.py
+++ b/homeassistant/components/habitica/__init__.py
@@ -9,9 +9,8 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.typing import ConfigType
 
 from .const import CONF_API_USER, DOMAIN, X_CLIENT
-from .coordinator import HabiticaDataUpdateCoordinator
+from .coordinator import HabiticaConfigEntry, HabiticaDataUpdateCoordinator
 from .services import async_setup_services
-from .types import HabiticaConfigEntry
 
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
@@ -51,7 +50,7 @@ async def async_setup_entry(
         x_client=X_CLIENT,
     )
 
-    coordinator = HabiticaDataUpdateCoordinator(hass, api)
+    coordinator = HabiticaDataUpdateCoordinator(hass, config_entry, api)
     await coordinator.async_config_entry_first_refresh()
 
     config_entry.runtime_data = coordinator
diff --git a/homeassistant/components/habitica/binary_sensor.py b/homeassistant/components/habitica/binary_sensor.py
index 5e3040e0606..c6f7ee0fb83 100644
--- a/homeassistant/components/habitica/binary_sensor.py
+++ b/homeassistant/components/habitica/binary_sensor.py
@@ -13,11 +13,11 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import ASSETS_URL
+from .coordinator import HabiticaConfigEntry
 from .entity import HabiticaBase
-from .types import HabiticaConfigEntry
 
 PARALLEL_UPDATES = 1
 
@@ -56,7 +56,7 @@ BINARY_SENSOR_DESCRIPTIONS: tuple[HabiticaBinarySensorEntityDescription, ...] =
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: HabiticaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the habitica binary sensors."""
 
diff --git a/homeassistant/components/habitica/button.py b/homeassistant/components/habitica/button.py
index 450a5cdcf20..c57ba39fb6a 100644
--- a/homeassistant/components/habitica/button.py
+++ b/homeassistant/components/habitica/button.py
@@ -25,12 +25,15 @@ from homeassistant.components.button import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import ASSETS_URL, DOMAIN
-from .coordinator import HabiticaData, HabiticaDataUpdateCoordinator
+from .coordinator import (
+    HabiticaConfigEntry,
+    HabiticaData,
+    HabiticaDataUpdateCoordinator,
+)
 from .entity import HabiticaBase
-from .types import HabiticaConfigEntry
 
 PARALLEL_UPDATES = 1
 
@@ -277,7 +280,7 @@ CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: HabiticaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up buttons from a config entry."""
 
diff --git a/homeassistant/components/habitica/calendar.py b/homeassistant/components/habitica/calendar.py
index f33f3c3c12f..b87a49670b0 100644
--- a/homeassistant/components/habitica/calendar.py
+++ b/homeassistant/components/habitica/calendar.py
@@ -18,11 +18,10 @@ from homeassistant.components.calendar import (
     CalendarEvent,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
-from . import HabiticaConfigEntry
-from .coordinator import HabiticaDataUpdateCoordinator
+from .coordinator import HabiticaConfigEntry, HabiticaDataUpdateCoordinator
 from .entity import HabiticaBase
 from .util import build_rrule, get_recurrence_rule
 
@@ -41,7 +40,7 @@ class HabiticaCalendar(StrEnum):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: HabiticaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the calendar platform."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/habitica/config_flow.py b/homeassistant/components/habitica/config_flow.py
index 7a7f369cb09..91a13bd7918 100644
--- a/homeassistant/components/habitica/config_flow.py
+++ b/homeassistant/components/habitica/config_flow.py
@@ -33,7 +33,6 @@ from homeassistant.helpers.selector import (
     TextSelectorType,
 )
 
-from . import HabiticaConfigEntry
 from .const import (
     CONF_API_USER,
     DEFAULT_URL,
@@ -47,6 +46,7 @@ from .const import (
     SITE_DATA_URL,
     X_CLIENT,
 )
+from .coordinator import HabiticaConfigEntry
 
 STEP_ADVANCED_DATA_SCHEMA = vol.Schema(
     {
diff --git a/homeassistant/components/habitica/const.py b/homeassistant/components/habitica/const.py
index 5eb616142e5..7a5677cb687 100644
--- a/homeassistant/components/habitica/const.py
+++ b/homeassistant/components/habitica/const.py
@@ -35,6 +35,28 @@ ATTR_TYPE = "type"
 ATTR_PRIORITY = "priority"
 ATTR_TAG = "tag"
 ATTR_KEYWORD = "keyword"
+ATTR_REMOVE_TAG = "remove_tag"
+ATTR_ALIAS = "alias"
+ATTR_PRIORITY = "priority"
+ATTR_COST = "cost"
+ATTR_NOTES = "notes"
+ATTR_UP_DOWN = "up_down"
+ATTR_FREQUENCY = "frequency"
+ATTR_COUNTER_UP = "counter_up"
+ATTR_COUNTER_DOWN = "counter_down"
+ATTR_ADD_CHECKLIST_ITEM = "add_checklist_item"
+ATTR_REMOVE_CHECKLIST_ITEM = "remove_checklist_item"
+ATTR_SCORE_CHECKLIST_ITEM = "score_checklist_item"
+ATTR_UNSCORE_CHECKLIST_ITEM = "unscore_checklist_item"
+ATTR_REMINDER = "reminder"
+ATTR_REMOVE_REMINDER = "remove_reminder"
+ATTR_CLEAR_REMINDER = "clear_reminder"
+ATTR_CLEAR_DATE = "clear_date"
+ATTR_REPEAT = "repeat"
+ATTR_INTERVAL = "every_x"
+ATTR_START_DATE = "start_date"
+ATTR_REPEAT_MONTHLY = "repeat_monthly"
+ATTR_STREAK = "streak"
 
 SERVICE_CAST_SKILL = "cast_skill"
 SERVICE_START_QUEST = "start_quest"
@@ -50,6 +72,14 @@ SERVICE_SCORE_REWARD = "score_reward"
 
 SERVICE_TRANSFORMATION = "transformation"
 
+SERVICE_UPDATE_REWARD = "update_reward"
+SERVICE_CREATE_REWARD = "create_reward"
+SERVICE_UPDATE_HABIT = "update_habit"
+SERVICE_CREATE_HABIT = "create_habit"
+SERVICE_UPDATE_TODO = "update_todo"
+SERVICE_CREATE_TODO = "create_todo"
+SERVICE_UPDATE_DAILY = "update_daily"
+SERVICE_CREATE_DAILY = "create_daily"
 
 DEVELOPER_ID = "4c4ca53f-c059-4ffa-966e-9d29dd405daf"
 X_CLIENT = f"{DEVELOPER_ID} - {APPLICATION_NAME} {__version__}"
@@ -57,3 +87,5 @@ X_CLIENT = f"{DEVELOPER_ID} - {APPLICATION_NAME} {__version__}"
 SECTION_REAUTH_LOGIN = "reauth_login"
 SECTION_REAUTH_API_KEY = "reauth_api_key"
 SECTION_DANGER_ZONE = "danger_zone"
+
+WEEK_DAYS = ["m", "t", "w", "th", "f", "s", "su"]
diff --git a/homeassistant/components/habitica/coordinator.py b/homeassistant/components/habitica/coordinator.py
index f97b98410bb..3c3a16f591a 100644
--- a/homeassistant/components/habitica/coordinator.py
+++ b/homeassistant/components/habitica/coordinator.py
@@ -11,6 +11,7 @@ from typing import Any
 
 from aiohttp import ClientError
 from habiticalib import (
+    Avatar,
     ContentData,
     Habitica,
     HabiticaException,
@@ -19,7 +20,6 @@ from habiticalib import (
     TaskFilter,
     TooManyRequestsError,
     UserData,
-    UserStyles,
 )
 
 from homeassistant.config_entries import ConfigEntry
@@ -46,16 +46,22 @@ class HabiticaData:
     tasks: list[TaskData]
 
 
+type HabiticaConfigEntry = ConfigEntry[HabiticaDataUpdateCoordinator]
+
+
 class HabiticaDataUpdateCoordinator(DataUpdateCoordinator[HabiticaData]):
     """Habitica Data Update Coordinator."""
 
     config_entry: ConfigEntry
 
-    def __init__(self, hass: HomeAssistant, habitica: Habitica) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, habitica: Habitica
+    ) -> None:
         """Initialize the Habitica data coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=60),
             request_refresh_debouncer=Debouncer(
@@ -159,12 +165,10 @@ class HabiticaDataUpdateCoordinator(DataUpdateCoordinator[HabiticaData]):
         else:
             await self.async_request_refresh()
 
-    async def generate_avatar(self, user_styles: UserStyles) -> bytes:
+    async def generate_avatar(self, avatar: Avatar) -> bytes:
         """Generate Avatar."""
 
-        avatar = BytesIO()
-        await self.habitica.generate_avatar(
-            fp=avatar, user_styles=user_styles, fmt="PNG"
-        )
+        png = BytesIO()
+        await self.habitica.generate_avatar(fp=png, avatar=avatar, fmt="PNG")
 
-        return avatar.getvalue()
+        return png.getvalue()
diff --git a/homeassistant/components/habitica/diagnostics.py b/homeassistant/components/habitica/diagnostics.py
index abfa0f35c4b..40a6d75b366 100644
--- a/homeassistant/components/habitica/diagnostics.py
+++ b/homeassistant/components/habitica/diagnostics.py
@@ -8,7 +8,7 @@ from homeassistant.const import CONF_URL
 from homeassistant.core import HomeAssistant
 
 from .const import CONF_API_USER
-from .types import HabiticaConfigEntry
+from .coordinator import HabiticaConfigEntry
 
 
 async def async_get_config_entry_diagnostics(
@@ -23,5 +23,5 @@ async def async_get_config_entry_diagnostics(
             CONF_URL: config_entry.data[CONF_URL],
             CONF_API_USER: config_entry.data[CONF_API_USER],
         },
-        "habitica_data": habitica_data.to_dict()["data"],
+        "habitica_data": habitica_data.to_dict(omit_none=False)["data"],
     }
diff --git a/homeassistant/components/habitica/entity.py b/homeassistant/components/habitica/entity.py
index 932fec69f83..692ea5e5ac1 100644
--- a/homeassistant/components/habitica/entity.py
+++ b/homeassistant/components/habitica/entity.py
@@ -4,6 +4,8 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
+from yarl import URL
+
 from homeassistant.const import CONF_NAME, CONF_URL
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity import EntityDescription
@@ -36,6 +38,10 @@ class HabiticaBase(CoordinatorEntity[HabiticaDataUpdateCoordinator]):
             manufacturer=MANUFACTURER,
             model=NAME,
             name=coordinator.config_entry.data[CONF_NAME],
-            configuration_url=coordinator.config_entry.data[CONF_URL],
+            configuration_url=(
+                URL(coordinator.config_entry.data[CONF_URL])
+                / "profile"
+                / coordinator.config_entry.unique_id
+            ),
             identifiers={(DOMAIN, coordinator.config_entry.unique_id)},
         )
diff --git a/homeassistant/components/habitica/icons.json b/homeassistant/components/habitica/icons.json
index 6ae6ebd728b..aac90814af5 100644
--- a/homeassistant/components/habitica/icons.json
+++ b/homeassistant/components/habitica/icons.json
@@ -217,6 +217,67 @@
       "sections": {
         "filter": "mdi:calendar-filter"
       }
+    },
+    "update_reward": {
+      "service": "mdi:treasure-chest",
+      "sections": {
+        "tag_options": "mdi:tag",
+        "developer_options": "mdi:test-tube"
+      }
+    },
+    "create_reward": {
+      "service": "mdi:treasure-chest-outline",
+      "sections": {
+        "developer_options": "mdi:test-tube"
+      }
+    },
+    "update_habit": {
+      "service": "mdi:contrast-box",
+      "sections": {
+        "tag_options": "mdi:tag",
+        "developer_options": "mdi:test-tube"
+      }
+    },
+    "create_habit": {
+      "service": "mdi:contrast-box",
+      "sections": {
+        "developer_options": "mdi:test-tube"
+      }
+    },
+    "update_todo": {
+      "service": "mdi:pencil-box-outline",
+      "sections": {
+        "checklist_options": "mdi:format-list-checks",
+        "tag_options": "mdi:tag",
+        "developer_options": "mdi:test-tube",
+        "duedate_options": "mdi:calendar-blank",
+        "reminder_options": "mdi:reminder"
+      }
+    },
+    "create_todo": {
+      "service": "mdi:pencil-box-outline",
+      "sections": {
+        "developer_options": "mdi:test-tube"
+      }
+    },
+    "update_daily": {
+      "service": "mdi:calendar-month",
+      "sections": {
+        "checklist_options": "mdi:format-list-checks",
+        "tag_options": "mdi:tag",
+        "developer_options": "mdi:test-tube",
+        "reminder_options": "mdi:reminder",
+        "repeat_weekly_options": "mdi:calendar-refresh",
+        "repeat_monthly_options": "mdi:calendar-refresh"
+      }
+    },
+    "create_daily": {
+      "service": "mdi:calendar-month",
+      "sections": {
+        "developer_options": "mdi:test-tube",
+        "repeat_weekly_options": "mdi:calendar-refresh",
+        "repeat_monthly_options": "mdi:calendar-refresh"
+      }
     }
   }
 }
diff --git a/homeassistant/components/habitica/image.py b/homeassistant/components/habitica/image.py
index f1dbbc64d41..1669f124bc7 100644
--- a/homeassistant/components/habitica/image.py
+++ b/homeassistant/components/habitica/image.py
@@ -2,18 +2,16 @@
 
 from __future__ import annotations
 
-from dataclasses import asdict
 from enum import StrEnum
 
-from habiticalib import UserStyles
+from habiticalib import Avatar, extract_avatar
 
 from homeassistant.components.image import ImageEntity, ImageEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
-from . import HabiticaConfigEntry
-from .coordinator import HabiticaDataUpdateCoordinator
+from .coordinator import HabiticaConfigEntry, HabiticaDataUpdateCoordinator
 from .entity import HabiticaBase
 
 PARALLEL_UPDATES = 1
@@ -28,7 +26,7 @@ class HabiticaImageEntity(StrEnum):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: HabiticaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the habitica image platform."""
 
@@ -45,7 +43,7 @@ class HabiticaImage(HabiticaBase, ImageEntity):
         translation_key=HabiticaImageEntity.AVATAR,
     )
     _attr_content_type = "image/png"
-    _current_appearance: UserStyles | None = None
+    _avatar: Avatar | None = None
     _cache: bytes | None = None
 
     def __init__(
@@ -57,13 +55,13 @@ class HabiticaImage(HabiticaBase, ImageEntity):
         super().__init__(coordinator, self.entity_description)
         ImageEntity.__init__(self, hass)
         self._attr_image_last_updated = dt_util.utcnow()
+        self._avatar = extract_avatar(self.coordinator.data.user)
 
     def _handle_coordinator_update(self) -> None:
         """Check if equipped gear and other things have changed since last avatar image generation."""
-        new_appearance = UserStyles.from_dict(asdict(self.coordinator.data.user))
 
-        if self._current_appearance != new_appearance:
-            self._current_appearance = new_appearance
+        if self._avatar != self.coordinator.data.user:
+            self._avatar = extract_avatar(self.coordinator.data.user)
             self._attr_image_last_updated = dt_util.utcnow()
             self._cache = None
 
@@ -71,8 +69,6 @@ class HabiticaImage(HabiticaBase, ImageEntity):
 
     async def async_image(self) -> bytes | None:
         """Return cached bytes, otherwise generate new avatar."""
-        if not self._cache and self._current_appearance:
-            self._cache = await self.coordinator.generate_avatar(
-                self._current_appearance
-            )
+        if not self._cache and self._avatar:
+            self._cache = await self.coordinator.generate_avatar(self._avatar)
         return self._cache
diff --git a/homeassistant/components/habitica/manifest.json b/homeassistant/components/habitica/manifest.json
index 1c92c314e66..48b6997239e 100644
--- a/homeassistant/components/habitica/manifest.json
+++ b/homeassistant/components/habitica/manifest.json
@@ -6,5 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/habitica",
   "iot_class": "cloud_polling",
   "loggers": ["habiticalib"],
-  "requirements": ["habiticalib==0.3.3"]
+  "quality_scale": "platinum",
+  "requirements": ["habiticalib==0.3.7"]
 }
diff --git a/homeassistant/components/habitica/quality_scale.yaml b/homeassistant/components/habitica/quality_scale.yaml
index 9eadba496f2..1752e67cf46 100644
--- a/homeassistant/components/habitica/quality_scale.yaml
+++ b/homeassistant/components/habitica/quality_scale.yaml
@@ -51,7 +51,7 @@ rules:
     status: exempt
     comment: No supportable devices.
   docs-supported-functions: done
-  docs-troubleshooting: todo
+  docs-troubleshooting: done
   docs-use-cases: done
   dynamic-devices:
     status: exempt
diff --git a/homeassistant/components/habitica/sensor.py b/homeassistant/components/habitica/sensor.py
index 57c391f5c12..e715dd6d07b 100644
--- a/homeassistant/components/habitica/sensor.py
+++ b/homeassistant/components/habitica/sensor.py
@@ -28,18 +28,18 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.issue_registry import (
     IssueSeverity,
     async_create_issue,
     async_delete_issue,
 )
 from homeassistant.helpers.typing import StateType
+from homeassistant.util import dt as dt_util
 
 from .const import ASSETS_URL, DOMAIN
-from .coordinator import HabiticaDataUpdateCoordinator
+from .coordinator import HabiticaConfigEntry, HabiticaDataUpdateCoordinator
 from .entity import HabiticaBase
-from .types import HabiticaConfigEntry
 from .util import get_attribute_points, get_attributes_total, inventory_list
 
 _LOGGER = logging.getLogger(__name__)
@@ -106,6 +106,20 @@ SENSOR_DESCRIPTIONS: tuple[HabiticaSensorEntityDescription, ...] = (
         key=HabiticaSensorEntity.DISPLAY_NAME,
         translation_key=HabiticaSensorEntity.DISPLAY_NAME,
         value_fn=lambda user, _: user.profile.name,
+        attributes_fn=lambda user, _: {
+            "blurb": user.profile.blurb,
+            "joined": (
+                dt_util.as_local(joined).date()
+                if (joined := user.auth.timestamps.created)
+                else None
+            ),
+            "last_login": (
+                dt_util.as_local(last).date()
+                if (last := user.auth.timestamps.loggedin)
+                else None
+            ),
+            "total_logins": user.loginIncentives,
+        },
     ),
     HabiticaSensorEntityDescription(
         key=HabiticaSensorEntity.HEALTH,
@@ -306,7 +320,7 @@ def entity_used_in(hass: HomeAssistant, entity_id: str) -> list[str]:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: HabiticaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the habitica sensors."""
 
@@ -394,6 +408,11 @@ class HabiticaSensor(HabiticaBase, SensorEntity):
         ):
             return SVG_CLASS[_class]
 
+        if self.entity_description.key is HabiticaSensorEntity.DISPLAY_NAME and (
+            img_url := self.coordinator.data.user.profile.imageUrl
+        ):
+            return img_url
+
         if entity_picture := self.entity_description.entity_picture:
             return (
                 entity_picture
diff --git a/homeassistant/components/habitica/services.py b/homeassistant/components/habitica/services.py
index a28aada85fa..bcbd6caa7a7 100644
--- a/homeassistant/components/habitica/services.py
+++ b/homeassistant/components/habitica/services.py
@@ -3,16 +3,23 @@
 from __future__ import annotations
 
 from dataclasses import asdict
+from datetime import UTC, date, datetime, time
 import logging
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, cast
+from uuid import UUID, uuid4
 
 from aiohttp import ClientError
 from habiticalib import (
+    Checklist,
     Direction,
+    Frequency,
     HabiticaException,
     NotAuthorizedError,
     NotFoundError,
+    Reminders,
+    Repeat,
     Skill,
+    Task,
     TaskData,
     TaskPriority,
     TaskType,
@@ -20,8 +27,9 @@ from habiticalib import (
 )
 import voluptuous as vol
 
+from homeassistant.components.todo import ATTR_RENAME
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import ATTR_NAME, CONF_NAME
+from homeassistant.const import ATTR_DATE, ATTR_NAME, CONF_NAME
 from homeassistant.core import (
     HomeAssistant,
     ServiceCall,
@@ -32,21 +40,43 @@ from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.selector import ConfigEntrySelector
+from homeassistant.util import dt as dt_util
 
 from .const import (
+    ATTR_ADD_CHECKLIST_ITEM,
+    ATTR_ALIAS,
     ATTR_ARGS,
+    ATTR_CLEAR_DATE,
+    ATTR_CLEAR_REMINDER,
     ATTR_CONFIG_ENTRY,
+    ATTR_COST,
+    ATTR_COUNTER_DOWN,
+    ATTR_COUNTER_UP,
     ATTR_DATA,
     ATTR_DIRECTION,
+    ATTR_FREQUENCY,
+    ATTR_INTERVAL,
     ATTR_ITEM,
     ATTR_KEYWORD,
+    ATTR_NOTES,
     ATTR_PATH,
     ATTR_PRIORITY,
+    ATTR_REMINDER,
+    ATTR_REMOVE_CHECKLIST_ITEM,
+    ATTR_REMOVE_REMINDER,
+    ATTR_REMOVE_TAG,
+    ATTR_REPEAT,
+    ATTR_REPEAT_MONTHLY,
+    ATTR_SCORE_CHECKLIST_ITEM,
     ATTR_SKILL,
+    ATTR_START_DATE,
+    ATTR_STREAK,
     ATTR_TAG,
     ATTR_TARGET,
     ATTR_TASK,
     ATTR_TYPE,
+    ATTR_UNSCORE_CHECKLIST_ITEM,
+    ATTR_UP_DOWN,
     DOMAIN,
     EVENT_API_CALL_SUCCESS,
     SERVICE_ABORT_QUEST,
@@ -54,6 +84,10 @@ from .const import (
     SERVICE_API_CALL,
     SERVICE_CANCEL_QUEST,
     SERVICE_CAST_SKILL,
+    SERVICE_CREATE_DAILY,
+    SERVICE_CREATE_HABIT,
+    SERVICE_CREATE_REWARD,
+    SERVICE_CREATE_TODO,
     SERVICE_GET_TASKS,
     SERVICE_LEAVE_QUEST,
     SERVICE_REJECT_QUEST,
@@ -61,8 +95,13 @@ from .const import (
     SERVICE_SCORE_REWARD,
     SERVICE_START_QUEST,
     SERVICE_TRANSFORMATION,
+    SERVICE_UPDATE_DAILY,
+    SERVICE_UPDATE_HABIT,
+    SERVICE_UPDATE_REWARD,
+    SERVICE_UPDATE_TODO,
+    WEEK_DAYS,
 )
-from .types import HabiticaConfigEntry
+from .coordinator import HabiticaConfigEntry
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -77,7 +116,7 @@ SERVICE_API_CALL_SCHEMA = vol.Schema(
 
 SERVICE_CAST_SKILL_SCHEMA = vol.Schema(
     {
-        vol.Required(ATTR_CONFIG_ENTRY): ConfigEntrySelector(),
+        vol.Required(ATTR_CONFIG_ENTRY): ConfigEntrySelector({"integration": DOMAIN}),
         vol.Required(ATTR_SKILL): cv.string,
         vol.Optional(ATTR_TASK): cv.string,
     }
@@ -85,12 +124,12 @@ SERVICE_CAST_SKILL_SCHEMA = vol.Schema(
 
 SERVICE_MANAGE_QUEST_SCHEMA = vol.Schema(
     {
-        vol.Required(ATTR_CONFIG_ENTRY): ConfigEntrySelector(),
+        vol.Required(ATTR_CONFIG_ENTRY): ConfigEntrySelector({"integration": DOMAIN}),
     }
 )
 SERVICE_SCORE_TASK_SCHEMA = vol.Schema(
     {
-        vol.Required(ATTR_CONFIG_ENTRY): ConfigEntrySelector(),
+        vol.Required(ATTR_CONFIG_ENTRY): ConfigEntrySelector({"integration": DOMAIN}),
         vol.Required(ATTR_TASK): cv.string,
         vol.Optional(ATTR_DIRECTION): cv.string,
     }
@@ -98,15 +137,74 @@ SERVICE_SCORE_TASK_SCHEMA = vol.Schema(
 
 SERVICE_TRANSFORMATION_SCHEMA = vol.Schema(
     {
-        vol.Required(ATTR_CONFIG_ENTRY): ConfigEntrySelector(),
+        vol.Required(ATTR_CONFIG_ENTRY): ConfigEntrySelector({"integration": DOMAIN}),
         vol.Required(ATTR_ITEM): cv.string,
         vol.Required(ATTR_TARGET): cv.string,
     }
 )
 
-SERVICE_GET_TASKS_SCHEMA = vol.Schema(
+BASE_TASK_SCHEMA = vol.Schema(
     {
         vol.Required(ATTR_CONFIG_ENTRY): ConfigEntrySelector(),
+        vol.Optional(ATTR_RENAME): cv.string,
+        vol.Optional(ATTR_NOTES): cv.string,
+        vol.Optional(ATTR_TAG): vol.All(cv.ensure_list, [str]),
+        vol.Optional(ATTR_ALIAS): vol.All(
+            cv.string, cv.matches_regex("^[a-zA-Z0-9-_]*$")
+        ),
+        vol.Optional(ATTR_COST): vol.All(vol.Coerce(float), vol.Range(0)),
+        vol.Optional(ATTR_PRIORITY): vol.All(
+            vol.Upper, vol.In(TaskPriority._member_names_)
+        ),
+        vol.Optional(ATTR_UP_DOWN): vol.All(cv.ensure_list, [str]),
+        vol.Optional(ATTR_COUNTER_UP): vol.All(int, vol.Range(0)),
+        vol.Optional(ATTR_COUNTER_DOWN): vol.All(int, vol.Range(0)),
+        vol.Optional(ATTR_FREQUENCY): vol.Coerce(Frequency),
+        vol.Optional(ATTR_DATE): cv.date,
+        vol.Optional(ATTR_CLEAR_DATE): cv.boolean,
+        vol.Optional(ATTR_REMINDER): vol.All(
+            cv.ensure_list, [vol.Any(cv.datetime, cv.time)]
+        ),
+        vol.Optional(ATTR_REMOVE_REMINDER): vol.All(
+            cv.ensure_list, [vol.Any(cv.datetime, cv.time)]
+        ),
+        vol.Optional(ATTR_CLEAR_REMINDER): cv.boolean,
+        vol.Optional(ATTR_ADD_CHECKLIST_ITEM): vol.All(cv.ensure_list, [str]),
+        vol.Optional(ATTR_REMOVE_CHECKLIST_ITEM): vol.All(cv.ensure_list, [str]),
+        vol.Optional(ATTR_SCORE_CHECKLIST_ITEM): vol.All(cv.ensure_list, [str]),
+        vol.Optional(ATTR_UNSCORE_CHECKLIST_ITEM): vol.All(cv.ensure_list, [str]),
+        vol.Optional(ATTR_START_DATE): cv.date,
+        vol.Optional(ATTR_INTERVAL): vol.All(int, vol.Range(0)),
+        vol.Optional(ATTR_REPEAT): vol.All(cv.ensure_list, [vol.In(WEEK_DAYS)]),
+        vol.Optional(ATTR_REPEAT_MONTHLY): vol.All(
+            cv.string, vol.In({"day_of_month", "day_of_week"})
+        ),
+        vol.Optional(ATTR_STREAK): vol.All(int, vol.Range(0)),
+    }
+)
+
+SERVICE_UPDATE_TASK_SCHEMA = BASE_TASK_SCHEMA.extend(
+    {
+        vol.Required(ATTR_TASK): cv.string,
+        vol.Optional(ATTR_REMOVE_TAG): vol.All(cv.ensure_list, [str]),
+    }
+)
+
+SERVICE_CREATE_TASK_SCHEMA = BASE_TASK_SCHEMA.extend(
+    {
+        vol.Required(ATTR_NAME): cv.string,
+    }
+)
+
+SERVICE_DAILY_SCHEMA = {
+    vol.Optional(ATTR_REMINDER): vol.All(cv.ensure_list, [cv.time]),
+    vol.Optional(ATTR_REMOVE_REMINDER): vol.All(cv.ensure_list, [cv.time]),
+}
+
+
+SERVICE_GET_TASKS_SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_CONFIG_ENTRY): ConfigEntrySelector({"integration": DOMAIN}),
         vol.Optional(ATTR_TYPE): vol.All(
             cv.ensure_list, [vol.All(vol.Upper, vol.In({x.name for x in TaskType}))]
         ),
@@ -138,6 +236,17 @@ ITEMID_MAP = {
     "shiny_seed": Skill.SHINY_SEED,
 }
 
+SERVICE_TASK_TYPE_MAP = {
+    SERVICE_UPDATE_REWARD: TaskType.REWARD,
+    SERVICE_CREATE_REWARD: TaskType.REWARD,
+    SERVICE_UPDATE_HABIT: TaskType.HABIT,
+    SERVICE_CREATE_HABIT: TaskType.HABIT,
+    SERVICE_UPDATE_TODO: TaskType.TODO,
+    SERVICE_CREATE_TODO: TaskType.TODO,
+    SERVICE_UPDATE_DAILY: TaskType.DAILY,
+    SERVICE_CREATE_DAILY: TaskType.DAILY,
+}
+
 
 def get_config_entry(hass: HomeAssistant, entry_id: str) -> HabiticaConfigEntry:
     """Return config entry or raise if not found or not loaded."""
@@ -510,9 +619,315 @@ def async_setup_services(hass: HomeAssistant) -> None:  # noqa: C901
                 or (task.notes and keyword in task.notes.lower())
                 or any(keyword in item.text.lower() for item in task.checklist)
             ]
-        result: dict[str, Any] = {"tasks": response}
+        result: dict[str, Any] = {
+            "tasks": [task.to_dict(omit_none=False) for task in response]
+        }
+
         return result
 
+    async def create_or_update_task(call: ServiceCall) -> ServiceResponse:  # noqa: C901
+        """Create or update task action."""
+        entry = get_config_entry(hass, call.data[ATTR_CONFIG_ENTRY])
+        coordinator = entry.runtime_data
+        await coordinator.async_refresh()
+        is_update = call.service in (
+            SERVICE_UPDATE_HABIT,
+            SERVICE_UPDATE_REWARD,
+            SERVICE_UPDATE_TODO,
+            SERVICE_UPDATE_DAILY,
+        )
+        task_type = SERVICE_TASK_TYPE_MAP[call.service]
+        current_task = None
+
+        if is_update:
+            try:
+                current_task = next(
+                    task
+                    for task in coordinator.data.tasks
+                    if call.data[ATTR_TASK] in (str(task.id), task.alias, task.text)
+                    and task.Type is task_type
+                )
+            except StopIteration as e:
+                raise ServiceValidationError(
+                    translation_domain=DOMAIN,
+                    translation_key="task_not_found",
+                    translation_placeholders={"task": f"'{call.data[ATTR_TASK]}'"},
+                ) from e
+
+        data = Task()
+
+        if not is_update:
+            data["type"] = task_type
+
+        if (text := call.data.get(ATTR_RENAME)) or (text := call.data.get(ATTR_NAME)):
+            data["text"] = text
+
+        if (notes := call.data.get(ATTR_NOTES)) is not None:
+            data["notes"] = notes
+
+        tags = cast(list[str], call.data.get(ATTR_TAG))
+        remove_tags = cast(list[str], call.data.get(ATTR_REMOVE_TAG))
+
+        if tags or remove_tags:
+            update_tags = set(current_task.tags) if current_task else set()
+            user_tags = {
+                tag.name.lower(): tag.id
+                for tag in coordinator.data.user.tags
+                if tag.id and tag.name
+            }
+
+            if tags:
+                # Creates new tag if it doesn't exist
+                async def create_tag(tag_name: str) -> UUID:
+                    tag_id = (await coordinator.habitica.create_tag(tag_name)).data.id
+                    if TYPE_CHECKING:
+                        assert tag_id
+                    return tag_id
+
+                try:
+                    update_tags.update(
+                        {
+                            user_tags.get(tag_name.lower())
+                            or (await create_tag(tag_name))
+                            for tag_name in tags
+                        }
+                    )
+                except TooManyRequestsError as e:
+                    raise HomeAssistantError(
+                        translation_domain=DOMAIN,
+                        translation_key="setup_rate_limit_exception",
+                        translation_placeholders={"retry_after": str(e.retry_after)},
+                    ) from e
+                except HabiticaException as e:
+                    raise HomeAssistantError(
+                        translation_domain=DOMAIN,
+                        translation_key="service_call_exception",
+                        translation_placeholders={"reason": str(e.error.message)},
+                    ) from e
+                except ClientError as e:
+                    raise HomeAssistantError(
+                        translation_domain=DOMAIN,
+                        translation_key="service_call_exception",
+                        translation_placeholders={"reason": str(e)},
+                    ) from e
+
+            if remove_tags:
+                update_tags.difference_update(
+                    {
+                        user_tags[tag_name.lower()]
+                        for tag_name in remove_tags
+                        if tag_name.lower() in user_tags
+                    }
+                )
+
+            data["tags"] = list(update_tags)
+
+        if (alias := call.data.get(ATTR_ALIAS)) is not None:
+            data["alias"] = alias
+
+        if (cost := call.data.get(ATTR_COST)) is not None:
+            data["value"] = cost
+
+        if priority := call.data.get(ATTR_PRIORITY):
+            data["priority"] = TaskPriority[priority]
+
+        if frequency := call.data.get(ATTR_FREQUENCY):
+            data["frequency"] = frequency
+        else:
+            frequency = current_task.frequency if current_task else Frequency.WEEKLY
+
+        if up_down := call.data.get(ATTR_UP_DOWN):
+            data["up"] = "up" in up_down
+            data["down"] = "down" in up_down
+
+        if counter_up := call.data.get(ATTR_COUNTER_UP):
+            data["counterUp"] = counter_up
+
+        if counter_down := call.data.get(ATTR_COUNTER_DOWN):
+            data["counterDown"] = counter_down
+
+        if due_date := call.data.get(ATTR_DATE):
+            data["date"] = datetime.combine(due_date, time())
+
+        if call.data.get(ATTR_CLEAR_DATE):
+            data["date"] = None
+
+        checklist = current_task.checklist if current_task else []
+
+        if add_checklist_item := call.data.get(ATTR_ADD_CHECKLIST_ITEM):
+            checklist.extend(
+                Checklist(completed=False, id=uuid4(), text=item)
+                for item in add_checklist_item
+                if not any(i.text == item for i in checklist)
+            )
+        if remove_checklist_item := call.data.get(ATTR_REMOVE_CHECKLIST_ITEM):
+            checklist = [
+                item for item in checklist if item.text not in remove_checklist_item
+            ]
+
+        if score_checklist_item := call.data.get(ATTR_SCORE_CHECKLIST_ITEM):
+            for item in checklist:
+                if item.text in score_checklist_item:
+                    item.completed = True
+
+        if unscore_checklist_item := call.data.get(ATTR_UNSCORE_CHECKLIST_ITEM):
+            for item in checklist:
+                if item.text in unscore_checklist_item:
+                    item.completed = False
+        if (
+            add_checklist_item
+            or remove_checklist_item
+            or score_checklist_item
+            or unscore_checklist_item
+        ):
+            data["checklist"] = checklist
+
+        reminders = current_task.reminders if current_task else []
+
+        if add_reminders := call.data.get(ATTR_REMINDER):
+            if task_type is TaskType.TODO:
+                existing_reminder_datetimes = {
+                    r.time.replace(tzinfo=None) for r in reminders
+                }
+
+                reminders.extend(
+                    Reminders(id=uuid4(), time=r)
+                    for r in add_reminders
+                    if r not in existing_reminder_datetimes
+                )
+            if task_type is TaskType.DAILY:
+                existing_reminder_times = {
+                    r.time.time().replace(microsecond=0, second=0) for r in reminders
+                }
+
+                reminders.extend(
+                    Reminders(
+                        id=uuid4(),
+                        time=datetime.combine(date.today(), r, tzinfo=UTC),
+                    )
+                    for r in add_reminders
+                    if r not in existing_reminder_times
+                )
+
+        if remove_reminder := call.data.get(ATTR_REMOVE_REMINDER):
+            if task_type is TaskType.TODO:
+                reminders = list(
+                    filter(
+                        lambda r: r.time.replace(tzinfo=None) not in remove_reminder,
+                        reminders,
+                    )
+                )
+            if task_type is TaskType.DAILY:
+                reminders = list(
+                    filter(
+                        lambda r: r.time.time().replace(second=0, microsecond=0)
+                        not in remove_reminder,
+                        reminders,
+                    )
+                )
+
+        if clear_reminders := call.data.get(ATTR_CLEAR_REMINDER):
+            reminders = []
+
+        if add_reminders or remove_reminder or clear_reminders:
+            data["reminders"] = reminders
+
+        if start_date := call.data.get(ATTR_START_DATE):
+            data["startDate"] = datetime.combine(start_date, time())
+        else:
+            start_date = (
+                current_task.startDate
+                if current_task and current_task.startDate
+                else dt_util.start_of_local_day()
+            )
+        if repeat := call.data.get(ATTR_REPEAT):
+            if frequency is Frequency.WEEKLY:
+                data["repeat"] = Repeat(**{d: d in repeat for d in WEEK_DAYS})
+            else:
+                raise ServiceValidationError(
+                    translation_domain=DOMAIN,
+                    translation_key="frequency_not_weekly",
+                )
+        if repeat_monthly := call.data.get(ATTR_REPEAT_MONTHLY):
+            if frequency is not Frequency.MONTHLY:
+                raise ServiceValidationError(
+                    translation_domain=DOMAIN,
+                    translation_key="frequency_not_monthly",
+                )
+
+            if repeat_monthly == "day_of_week":
+                weekday = start_date.weekday()
+                data["weeksOfMonth"] = [(start_date.day - 1) // 7]
+                data["repeat"] = Repeat(
+                    **{day: i == weekday for i, day in enumerate(WEEK_DAYS)}
+                )
+                data["daysOfMonth"] = []
+
+            else:
+                data["daysOfMonth"] = [start_date.day]
+                data["weeksOfMonth"] = []
+
+        if interval := call.data.get(ATTR_INTERVAL):
+            data["everyX"] = interval
+
+        if streak := call.data.get(ATTR_STREAK):
+            data["streak"] = streak
+
+        try:
+            if is_update:
+                if TYPE_CHECKING:
+                    assert current_task
+                    assert current_task.id
+                response = await coordinator.habitica.update_task(current_task.id, data)
+            else:
+                response = await coordinator.habitica.create_task(data)
+        except TooManyRequestsError as e:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="setup_rate_limit_exception",
+                translation_placeholders={"retry_after": str(e.retry_after)},
+            ) from e
+        except HabiticaException as e:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="service_call_exception",
+                translation_placeholders={"reason": str(e.error.message)},
+            ) from e
+        except ClientError as e:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="service_call_exception",
+                translation_placeholders={"reason": str(e)},
+            ) from e
+        else:
+            return response.data.to_dict(omit_none=True)
+
+    for service in (
+        SERVICE_UPDATE_DAILY,
+        SERVICE_UPDATE_HABIT,
+        SERVICE_UPDATE_REWARD,
+        SERVICE_UPDATE_TODO,
+    ):
+        hass.services.async_register(
+            DOMAIN,
+            service,
+            create_or_update_task,
+            schema=SERVICE_UPDATE_TASK_SCHEMA,
+            supports_response=SupportsResponse.ONLY,
+        )
+    for service in (
+        SERVICE_CREATE_DAILY,
+        SERVICE_CREATE_HABIT,
+        SERVICE_CREATE_REWARD,
+        SERVICE_CREATE_TODO,
+    ):
+        hass.services.async_register(
+            DOMAIN,
+            service,
+            create_or_update_task,
+            schema=SERVICE_CREATE_TASK_SCHEMA,
+            supports_response=SupportsResponse.ONLY,
+        )
     hass.services.async_register(
         DOMAIN,
         SERVICE_API_CALL,
diff --git a/homeassistant/components/habitica/services.yaml b/homeassistant/components/habitica/services.yaml
index f3095518290..3fb25e2b4b7 100644
--- a/homeassistant/components/habitica/services.yaml
+++ b/homeassistant/components/habitica/services.yaml
@@ -140,3 +140,307 @@ get_tasks:
           required: false
           selector:
             text:
+update_reward:
+  fields:
+    config_entry: *config_entry
+    task: *task
+    rename: &rename
+      selector:
+        text:
+    notes: &notes
+      required: false
+      selector:
+        text:
+          multiline: true
+    cost:
+      required: false
+      selector: &cost_selector
+        number:
+          min: 0
+          step: 0.01
+          unit_of_measurement: "🪙"
+          mode: box
+    tag_options: &tag_options
+      collapsed: true
+      fields:
+        tag: &tag
+          required: false
+          selector:
+            text:
+              multiple: true
+        remove_tag:
+          required: false
+          selector:
+            text:
+              multiple: true
+    developer_options: &developer_options
+      collapsed: true
+      fields:
+        alias: &alias
+          required: false
+          selector:
+            text:
+create_reward:
+  fields:
+    config_entry: *config_entry
+    name: &name
+      required: true
+      selector:
+        text:
+    notes: *notes
+    cost:
+      required: true
+      selector: *cost_selector
+    tag: *tag
+    developer_options: *developer_options
+update_habit:
+  fields:
+    config_entry: *config_entry
+    task: *task
+    rename: *rename
+    notes: *notes
+    up_down: &up_down
+      required: false
+      selector:
+        select:
+          options:
+            - value: up
+              label: "➕"
+            - value: down
+              label: "➖"
+          multiple: true
+          mode: list
+    priority: &priority
+      required: false
+      selector:
+        select:
+          options:
+            - "trivial"
+            - "easy"
+            - "medium"
+            - "hard"
+          mode: dropdown
+          translation_key: "priority"
+    frequency: &frequency
+      required: false
+      selector:
+        select:
+          options:
+            - "daily"
+            - "weekly"
+            - "monthly"
+          translation_key: "frequency"
+          mode: dropdown
+    tag_options: *tag_options
+    developer_options:
+      collapsed: true
+      fields:
+        counter_up:
+          required: false
+          selector:
+            number:
+              min: 0
+              step: 1
+              unit_of_measurement: "➕"
+              mode: box
+        counter_down:
+          required: false
+          selector:
+            number:
+              min: 0
+              step: 1
+              unit_of_measurement: "➖"
+              mode: box
+        alias: *alias
+create_habit:
+  fields:
+    config_entry: *config_entry
+    name: *name
+    notes: *notes
+    up_down: *up_down
+    priority: *priority
+    frequency: *frequency
+    tag: *tag
+    developer_options: *developer_options
+update_todo:
+  fields:
+    config_entry: *config_entry
+    task: *task
+    rename: *rename
+    notes: *notes
+    checklist_options: &checklist_options
+      collapsed: true
+      fields:
+        add_checklist_item: &add_checklist_item
+          required: false
+          selector:
+            text:
+              multiple: true
+        remove_checklist_item:
+          required: false
+          selector:
+            text:
+              multiple: true
+        score_checklist_item:
+          required: false
+          selector:
+            text:
+              multiple: true
+        unscore_checklist_item:
+          required: false
+          selector:
+            text:
+              multiple: true
+    priority: *priority
+    duedate_options:
+      collapsed: true
+      fields:
+        date: &due_date
+          required: false
+          selector:
+            date:
+        clear_date:
+          required: false
+          selector:
+            constant:
+              value: true
+              label: "🗑️"
+    reminder_options:
+      collapsed: true
+      fields:
+        reminder: &reminder
+          required: false
+          selector:
+            text:
+              type: datetime-local
+              multiple: true
+        remove_reminder:
+          required: false
+          selector:
+            text:
+              type: datetime-local
+              multiple: true
+        clear_reminder: &clear_reminder
+          required: false
+          selector:
+            constant:
+              value: true
+              label: "🗑️"
+    tag_options: *tag_options
+    developer_options: *developer_options
+create_todo:
+  fields:
+    config_entry: *config_entry
+    name: *name
+    notes: *notes
+    add_checklist_item: *add_checklist_item
+    priority: *priority
+    date: *due_date
+    reminder: *reminder
+    tag: *tag
+    developer_options: *developer_options
+update_daily:
+  fields:
+    config_entry: *config_entry
+    task: *task
+    rename: *rename
+    notes: *notes
+    checklist_options: *checklist_options
+    priority: *priority
+    start_date: &start_date
+      required: false
+      selector:
+        date:
+    frequency: &frequency_daily
+      required: false
+      selector:
+        select:
+          options:
+            - "daily"
+            - "weekly"
+            - "monthly"
+            - "yearly"
+          translation_key: "frequency"
+          mode: dropdown
+    every_x: &every_x
+      required: false
+      selector:
+        number:
+          min: 0
+          step: 1
+          unit_of_measurement: "🔃"
+          mode: box
+    repeat_weekly_options: &repeat_weekly_options
+      collapsed: true
+      fields:
+        repeat:
+          required: false
+          selector:
+            select:
+              options:
+                - "m"
+                - "t"
+                - "w"
+                - "th"
+                - "f"
+                - "s"
+                - "su"
+              mode: list
+              translation_key: repeat
+              multiple: true
+    repeat_monthly_options: &repeat_monthly_options
+      collapsed: true
+      fields:
+        repeat_monthly:
+          required: false
+          selector:
+            select:
+              options:
+                - "day_of_month"
+                - "day_of_week"
+              translation_key: repeat_monthly
+              mode: list
+    reminder_options:
+      collapsed: true
+      fields:
+        reminder: &reminder_daily
+          required: false
+          selector:
+            text:
+              type: time
+              multiple: true
+        remove_reminder:
+          required: false
+          selector:
+            text:
+              type: time
+              multiple: true
+        clear_reminder: *clear_reminder
+    tag_options: *tag_options
+    developer_options:
+      collapsed: true
+      fields:
+        streak: &streak
+          required: false
+          selector:
+            number:
+              min: 0
+              step: 1
+              unit_of_measurement: "▶▶"
+              mode: box
+        alias: *alias
+create_daily:
+  fields:
+    config_entry: *config_entry
+    name: *name
+    notes: *notes
+    add_checklist_item: *add_checklist_item
+    priority: *priority
+    start_date: *start_date
+    frequency: *frequency_daily
+    every_x: *every_x
+    repeat_weekly_options: *repeat_weekly_options
+    repeat_monthly_options: *repeat_monthly_options
+    reminder: *reminder_daily
+    tag: *tag
+    developer_options: *developer_options
diff --git a/homeassistant/components/habitica/strings.json b/homeassistant/components/habitica/strings.json
index 4d353cec40e..695eb1576fe 100644
--- a/homeassistant/components/habitica/strings.json
+++ b/homeassistant/components/habitica/strings.json
@@ -7,7 +7,64 @@
     "unit_tasks": "tasks",
     "unit_health_points": "HP",
     "unit_mana_points": "MP",
-    "unit_experience_points": "XP"
+    "unit_experience_points": "XP",
+    "config_entry_description": "Select the Habitica account to update a task.",
+    "task_description": "The name (or task ID) of the task you want to update.",
+    "rename_name": "Rename",
+    "rename_description": "The title for the Habitica task.",
+    "notes_name": "Notes",
+    "notes_description": "The notes for the Habitica task.",
+    "tag_name": "Add tags",
+    "tag_description": "Add tags to the Habitica task. If a tag does not already exist, a new one will be created.",
+    "remove_tag_name": "Remove tags",
+    "remove_tag_description": "Remove tags from the Habitica task.",
+    "alias_name": "Task alias",
+    "alias_description": "A task alias can be used instead of the name or task ID. Only dashes, underscores, and alphanumeric characters are supported. The task alias must be unique among all your tasks.",
+    "developer_options_name": "Advanced settings",
+    "developer_options_description": "Additional features available in developer mode.",
+    "tag_options_name": "Tags",
+    "tag_options_description": "Add or remove tags from a task.",
+    "name_description": "The title for the Habitica task.",
+    "cost_name": "Cost",
+    "priority_name": "Difficulty",
+    "priority_description": "The difficulty of the task.",
+    "frequency_name": "Counter reset",
+    "frequency_description": "The frequency at which the habit's counter resets: daily at the start of a new day, weekly after Sunday night, or monthly at the beginning of a new month.",
+    "up_down_name": "Rewards or losses",
+    "up_down_description": "Whether the habit is good and rewarding (positive), bad and penalizing (negative), or both.",
+    "add_checklist_item_name": "Add checklist items",
+    "add_checklist_item_description": "The items to add to a task's checklist.",
+    "remove_checklist_item_name": "Delete items",
+    "remove_checklist_item_description": "Remove items from a task's checklist.",
+    "score_checklist_item_name": "Complete items",
+    "score_checklist_item_description": "Mark items from a task's checklist as completed.",
+    "unscore_checklist_item_name": "Uncomplete items",
+    "unscore_checklist_item_description": "Undo completion of items of a task's checklist.",
+    "checklist_options_name": "Checklist",
+    "checklist_options_description": "Add, remove, or update status of an item on a task's checklist.",
+    "reminder_name": "Add reminders",
+    "reminder_description": "Add reminders to a Habitica task.",
+    "remove_reminder_name": "Remove reminders",
+    "remove_reminder_description": "Remove specific reminders from a Habitica task.",
+    "clear_reminder_name": "Clear all reminders",
+    "clear_reminder_description": "Remove all reminders from a Habitica task.",
+    "reminder_options_name": "Reminders",
+    "reminder_options_description": "Add, remove or clear reminders of a Habitica task.",
+    "date_name": "Due date",
+    "date_description": "The to-do's due date.",
+    "repeat_name": "Repeat on",
+    "start_date_name": "Start date",
+    "start_date_description": "Defines when the daily task becomes active and specifies the exact weekday or day of the month it repeats on.",
+    "frequency_daily_name": "Repeat interval",
+    "frequency_daily_description": "The repetition interval of a daily.",
+    "every_x_name": "Repeat every X",
+    "every_x_description": "The number of intervals (days, weeks, months, or years) after which the daily repeats, based on the chosen repetition interval. A value of 0 makes the daily inactive ('Grey Daily').",
+    "repeat_weekly_description": "The days of the week the daily repeats.",
+    "repeat_monthly_description": "Whether a monthly recurring task repeats on the same calendar day each month or on the same weekday and week of the month, based on the start date.",
+    "repeat_weekly_options_name": "Weekly repeat days",
+    "repeat_weekly_options_description": "Options related to weekly repetition, applicable when the repetition interval is set to weekly.",
+    "repeat_monthly_options_name": "Monthly repeat day",
+    "repeat_monthly_options_description": "Options related to monthly repetition, applicable when the repetition interval is set to monthly."
   },
   "config": {
     "abort": {
@@ -199,7 +256,21 @@
     },
     "sensor": {
       "display_name": {
-        "name": "Display name"
+        "name": "Display name",
+        "state_attributes": {
+          "blurb": {
+            "name": "About"
+          },
+          "joined": {
+            "name": "Joined"
+          },
+          "last_login": {
+            "name": "Last login"
+          },
+          "total_logins": {
+            "name": "Total logins"
+          }
+        }
       },
       "health": {
         "name": "Health",
@@ -443,6 +514,12 @@
     },
     "authentication_failed": {
       "message": "Authentication failed. It looks like your API token has been reset. Please re-authenticate using your new token"
+    },
+    "frequency_not_weekly": {
+      "message": "Unable to update task, weekly repeat settings apply only to weekly recurring dailies."
+    },
+    "frequency_not_monthly": {
+      "message": "Unable to update task, monthly repeat settings apply only to monthly recurring dailies."
     }
   },
   "issues": {
@@ -534,7 +611,7 @@
     },
     "cancel_quest": {
       "name": "Cancel a pending quest",
-      "description": "Cancels a quest that has not yet startet. All accepted and pending invitations will be canceled and the quest roll returned to the owner's inventory. Only quest leader or group leader can perform this action.",
+      "description": "Cancels a quest that has not yet started. All accepted and pending invitations will be canceled and the quest roll returned to the owner's inventory. Only quest leader or group leader can perform this action.",
       "fields": {
         "config_entry": {
           "name": "[%key:component::habitica::common::config_entry_name%]",
@@ -615,7 +692,7 @@
           "description": "Filter tasks by type."
         },
         "priority": {
-          "name": "Difficulty",
+          "name": "[%key:component::habitica::common::priority_name%]",
           "description": "Filter tasks by difficulty."
         },
         "task": {
@@ -637,6 +714,530 @@
           "description": "Use the optional filters to narrow the returned tasks."
         }
       }
+    },
+    "update_reward": {
+      "name": "Update a reward",
+      "description": "Updates a specific reward for the selected Habitica character",
+      "fields": {
+        "config_entry": {
+          "name": "[%key:component::habitica::common::config_entry_name%]",
+          "description": "Select the Habitica account to update a reward."
+        },
+        "task": {
+          "name": "[%key:component::habitica::common::task_name%]",
+          "description": "[%key:component::habitica::common::task_description%]"
+        },
+        "rename": {
+          "name": "[%key:component::habitica::common::rename_name%]",
+          "description": "[%key:component::habitica::common::rename_description%]"
+        },
+        "notes": {
+          "name": "[%key:component::habitica::common::notes_name%]",
+          "description": "[%key:component::habitica::common::notes_description%]"
+        },
+        "tag": {
+          "name": "[%key:component::habitica::common::tag_name%]",
+          "description": "[%key:component::habitica::common::tag_description%]"
+        },
+        "remove_tag": {
+          "name": "[%key:component::habitica::common::remove_tag_name%]",
+          "description": "[%key:component::habitica::common::remove_tag_description%]"
+        },
+        "alias": {
+          "name": "[%key:component::habitica::common::alias_name%]",
+          "description": "[%key:component::habitica::common::alias_description%]"
+        },
+        "cost": {
+          "name": "[%key:component::habitica::common::cost_name%]",
+          "description": "Update the cost of a reward."
+        }
+      },
+      "sections": {
+        "tag_options": {
+          "name": "[%key:component::habitica::common::tag_options_name%]",
+          "description": "[%key:component::habitica::common::tag_options_description%]"
+        },
+        "developer_options": {
+          "name": "[%key:component::habitica::common::developer_options_name%]",
+          "description": "[%key:component::habitica::common::developer_options_description%]"
+        }
+      }
+    },
+    "create_reward": {
+      "name": "Create reward",
+      "description": "Adds a new custom reward.",
+      "fields": {
+        "config_entry": {
+          "name": "[%key:component::habitica::common::config_entry_name%]",
+          "description": "Select the Habitica account to create a reward."
+        },
+        "name": {
+          "name": "[%key:component::habitica::common::task_name%]",
+          "description": "[%key:component::habitica::common::name_description%]"
+        },
+        "notes": {
+          "name": "[%key:component::habitica::common::notes_name%]",
+          "description": "[%key:component::habitica::common::notes_description%]"
+        },
+        "tag": {
+          "name": "[%key:component::habitica::common::tag_options_name%]",
+          "description": "[%key:component::habitica::common::tag_description%]"
+        },
+        "alias": {
+          "name": "[%key:component::habitica::common::alias_name%]",
+          "description": "[%key:component::habitica::common::alias_description%]"
+        },
+        "cost": {
+          "name": "[%key:component::habitica::common::cost_name%]",
+          "description": "The cost of the reward."
+        }
+      },
+      "sections": {
+        "developer_options": {
+          "name": "[%key:component::habitica::common::developer_options_name%]",
+          "description": "[%key:component::habitica::common::developer_options_description%]"
+        }
+      }
+    },
+    "update_habit": {
+      "name": "Update a habit",
+      "description": "Updates a specific habit for the selected Habitica character",
+      "fields": {
+        "config_entry": {
+          "name": "[%key:component::habitica::common::config_entry_name%]",
+          "description": "Select the Habitica account to update a habit."
+        },
+        "task": {
+          "name": "[%key:component::habitica::common::task_name%]",
+          "description": "[%key:component::habitica::common::task_description%]"
+        },
+        "rename": {
+          "name": "[%key:component::habitica::common::rename_name%]",
+          "description": "[%key:component::habitica::common::rename_description%]"
+        },
+        "notes": {
+          "name": "[%key:component::habitica::common::notes_name%]",
+          "description": "[%key:component::habitica::common::notes_description%]"
+        },
+        "tag": {
+          "name": "[%key:component::habitica::common::tag_name%]",
+          "description": "[%key:component::habitica::common::tag_description%]"
+        },
+        "remove_tag": {
+          "name": "[%key:component::habitica::common::remove_tag_name%]",
+          "description": "[%key:component::habitica::common::remove_tag_description%]"
+        },
+        "alias": {
+          "name": "[%key:component::habitica::common::alias_name%]",
+          "description": "[%key:component::habitica::common::alias_description%]"
+        },
+        "priority": {
+          "name": "[%key:component::habitica::common::priority_name%]",
+          "description": "[%key:component::habitica::common::priority_description%]"
+        },
+        "frequency": {
+          "name": "[%key:component::habitica::common::frequency_name%]",
+          "description": "[%key:component::habitica::common::frequency_description%]"
+        },
+        "up_down": {
+          "name": "[%key:component::habitica::common::up_down_name%]",
+          "description": "[%key:component::habitica::common::up_down_description%]"
+        },
+        "counter_up": {
+          "name": "Adjust positive counter",
+          "description": "Update the up counter of a positive habit."
+        },
+        "counter_down": {
+          "name": "Adjust negative counter",
+          "description": "Update the down counter of a negative habit."
+        }
+      },
+      "sections": {
+        "tag_options": {
+          "name": "[%key:component::habitica::common::tag_options_name%]",
+          "description": "[%key:component::habitica::common::tag_options_description%]"
+        },
+        "developer_options": {
+          "name": "[%key:component::habitica::common::developer_options_name%]",
+          "description": "[%key:component::habitica::common::developer_options_description%]"
+        }
+      }
+    },
+    "create_habit": {
+      "name": "Create habit",
+      "description": "Adds a new habit.",
+      "fields": {
+        "config_entry": {
+          "name": "[%key:component::habitica::common::config_entry_name%]",
+          "description": "Select the Habitica account to create a habit."
+        },
+        "name": {
+          "name": "[%key:component::habitica::common::task_name%]",
+          "description": "[%key:component::habitica::common::name_description%]"
+        },
+        "notes": {
+          "name": "[%key:component::habitica::common::notes_name%]",
+          "description": "[%key:component::habitica::common::notes_description%]"
+        },
+        "tag": {
+          "name": "[%key:component::habitica::common::tag_options_name%]",
+          "description": "[%key:component::habitica::common::tag_description%]"
+        },
+        "alias": {
+          "name": "[%key:component::habitica::common::alias_name%]",
+          "description": "[%key:component::habitica::common::alias_description%]"
+        },
+        "priority": {
+          "name": "[%key:component::habitica::common::priority_name%]",
+          "description": "[%key:component::habitica::common::priority_description%]"
+        },
+        "frequency": {
+          "name": "[%key:component::habitica::common::frequency_name%]",
+          "description": "[%key:component::habitica::common::frequency_description%]"
+        },
+        "up_down": {
+          "name": "[%key:component::habitica::common::up_down_name%]",
+          "description": "[%key:component::habitica::common::up_down_description%]"
+        }
+      },
+      "sections": {
+        "developer_options": {
+          "name": "[%key:component::habitica::common::developer_options_name%]",
+          "description": "[%key:component::habitica::common::developer_options_description%]"
+        }
+      }
+    },
+    "update_todo": {
+      "name": "Update a to-do",
+      "description": "Updates a specific to-do for a selected Habitica character",
+      "fields": {
+        "config_entry": {
+          "name": "[%key:component::habitica::common::config_entry_name%]",
+          "description": "[%key:component::habitica::common::config_entry_description%]"
+        },
+        "task": {
+          "name": "[%key:component::habitica::common::task_name%]",
+          "description": "The name (or task ID) of the to-do you want to update."
+        },
+        "rename": {
+          "name": "[%key:component::habitica::common::rename_name%]",
+          "description": "[%key:component::habitica::common::rename_description%]"
+        },
+        "notes": {
+          "name": "[%key:component::habitica::common::notes_name%]",
+          "description": "[%key:component::habitica::common::notes_description%]"
+        },
+        "tag": {
+          "name": "[%key:component::habitica::common::tag_name%]",
+          "description": "[%key:component::habitica::common::tag_description%]"
+        },
+        "remove_tag": {
+          "name": "[%key:component::habitica::common::remove_tag_name%]",
+          "description": "[%key:component::habitica::common::remove_tag_description%]"
+        },
+        "alias": {
+          "name": "[%key:component::habitica::common::alias_name%]",
+          "description": "[%key:component::habitica::common::alias_description%]"
+        },
+        "priority": {
+          "name": "[%key:component::habitica::common::priority_name%]",
+          "description": "[%key:component::habitica::common::priority_description%]"
+        },
+        "date": {
+          "name": "[%key:component::habitica::common::date_name%]",
+          "description": "[%key:component::habitica::common::date_description%]"
+        },
+        "clear_date": {
+          "name": "Clear due date",
+          "description": "Remove the due date from the to-do."
+        },
+        "reminder": {
+          "name": "[%key:component::habitica::common::reminder_name%]",
+          "description": "[%key:component::habitica::common::reminder_description%]"
+        },
+        "remove_reminder": {
+          "name": "[%key:component::habitica::common::remove_reminder_name%]",
+          "description": "[%key:component::habitica::common::remove_reminder_description%]"
+        },
+        "clear_reminder": {
+          "name": "[%key:component::habitica::common::clear_reminder_name%]",
+          "description": "[%key:component::habitica::common::clear_reminder_description%]"
+        },
+        "add_checklist_item": {
+          "name": "[%key:component::habitica::common::add_checklist_item_name%]",
+          "description": "[%key:component::habitica::common::add_checklist_item_description%]"
+        },
+        "remove_checklist_item": {
+          "name": "[%key:component::habitica::common::remove_checklist_item_name%]",
+          "description": "[%key:component::habitica::common::remove_checklist_item_description%]"
+        },
+        "score_checklist_item": {
+          "name": "[%key:component::habitica::common::score_checklist_item_name%]",
+          "description": "[%key:component::habitica::common::score_checklist_item_description%]"
+        },
+        "unscore_checklist_item": {
+          "name": "[%key:component::habitica::common::unscore_checklist_item_name%]",
+          "description": "[%key:component::habitica::common::unscore_checklist_item_description%]"
+        }
+      },
+      "sections": {
+        "checklist_options": {
+          "name": "[%key:component::habitica::common::checklist_options_name%]",
+          "description": "[%key:component::habitica::common::checklist_options_description%]"
+        },
+        "duedate_options": {
+          "name": "[%key:component::habitica::common::date_name%]",
+          "description": "Set, update or remove due dates of a to-do."
+        },
+        "reminder_options": {
+          "name": "[%key:component::habitica::common::reminder_options_name%]",
+          "description": "[%key:component::habitica::common::reminder_options_description%]"
+        },
+        "tag_options": {
+          "name": "[%key:component::habitica::common::tag_options_name%]",
+          "description": "[%key:component::habitica::common::tag_options_description%]"
+        },
+        "developer_options": {
+          "name": "[%key:component::habitica::common::developer_options_name%]",
+          "description": "[%key:component::habitica::common::developer_options_description%]"
+        }
+      }
+    },
+    "create_todo": {
+      "name": "Create to-do",
+      "description": "Adds a new to-do.",
+      "fields": {
+        "config_entry": {
+          "name": "[%key:component::habitica::common::config_entry_name%]",
+          "description": "Select the Habitica account to create a to-do."
+        },
+        "name": {
+          "name": "[%key:component::habitica::common::task_name%]",
+          "description": "[%key:component::habitica::common::name_description%]"
+        },
+        "notes": {
+          "name": "[%key:component::habitica::common::notes_name%]",
+          "description": "[%key:component::habitica::common::notes_description%]"
+        },
+        "tag": {
+          "name": "[%key:component::habitica::common::tag_options_name%]",
+          "description": "[%key:component::habitica::common::tag_description%]"
+        },
+        "alias": {
+          "name": "[%key:component::habitica::common::alias_name%]",
+          "description": "[%key:component::habitica::common::alias_description%]"
+        },
+        "priority": {
+          "name": "[%key:component::habitica::common::priority_name%]",
+          "description": "[%key:component::habitica::common::priority_description%]"
+        },
+        "date": {
+          "name": "[%key:component::habitica::common::date_name%]",
+          "description": "[%key:component::habitica::common::date_description%]"
+        },
+        "reminder": {
+          "name": "[%key:component::habitica::common::reminder_options_name%]",
+          "description": "[%key:component::habitica::common::reminder_description%]"
+        },
+        "add_checklist_item": {
+          "name": "[%key:component::habitica::common::checklist_options_name%]",
+          "description": "[%key:component::habitica::common::add_checklist_item_description%]"
+        }
+      },
+      "sections": {
+        "developer_options": {
+          "name": "[%key:component::habitica::common::developer_options_name%]",
+          "description": "[%key:component::habitica::common::developer_options_description%]"
+        }
+      }
+    },
+    "update_daily": {
+      "name": "Update a daily",
+      "description": "Updates a specific daily for a selected Habitica character",
+      "fields": {
+        "config_entry": {
+          "name": "[%key:component::habitica::common::config_entry_name%]",
+          "description": "[%key:component::habitica::common::config_entry_description%]"
+        },
+        "task": {
+          "name": "[%key:component::habitica::common::task_name%]",
+          "description": "The name (or task ID) of the daily you want to update."
+        },
+        "rename": {
+          "name": "[%key:component::habitica::common::rename_name%]",
+          "description": "[%key:component::habitica::common::rename_description%]"
+        },
+        "notes": {
+          "name": "[%key:component::habitica::common::notes_name%]",
+          "description": "[%key:component::habitica::common::notes_description%]"
+        },
+        "tag": {
+          "name": "[%key:component::habitica::common::tag_name%]",
+          "description": "[%key:component::habitica::common::tag_description%]"
+        },
+        "remove_tag": {
+          "name": "[%key:component::habitica::common::remove_tag_name%]",
+          "description": "[%key:component::habitica::common::remove_tag_description%]"
+        },
+        "alias": {
+          "name": "[%key:component::habitica::common::alias_name%]",
+          "description": "[%key:component::habitica::common::alias_description%]"
+        },
+        "priority": {
+          "name": "[%key:component::habitica::common::priority_name%]",
+          "description": "[%key:component::habitica::common::priority_description%]"
+        },
+        "start_date": {
+          "name": "[%key:component::habitica::common::start_date_name%]",
+          "description": "[%key:component::habitica::common::start_date_description%]"
+        },
+        "frequency": {
+          "name": "[%key:component::habitica::common::frequency_daily_name%]",
+          "description": "[%key:component::habitica::common::frequency_daily_description%]"
+        },
+        "every_x": {
+          "name": "[%key:component::habitica::common::every_x_name%]",
+          "description": "[%key:component::habitica::common::every_x_description%]"
+        },
+        "repeat": {
+          "name": "[%key:component::habitica::common::repeat_name%]",
+          "description": "[%key:component::habitica::common::repeat_weekly_description%]"
+        },
+        "repeat_monthly": {
+          "name": "[%key:component::habitica::common::repeat_name%]",
+          "description": "[%key:component::habitica::common::repeat_monthly_description%]"
+        },
+        "add_checklist_item": {
+          "name": "[%key:component::habitica::common::add_checklist_item_name%]",
+          "description": "[%key:component::habitica::common::add_checklist_item_description%]"
+        },
+        "remove_checklist_item": {
+          "name": "[%key:component::habitica::common::remove_checklist_item_name%]",
+          "description": "[%key:component::habitica::common::remove_checklist_item_description%]"
+        },
+        "score_checklist_item": {
+          "name": "[%key:component::habitica::common::score_checklist_item_name%]",
+          "description": "[%key:component::habitica::common::score_checklist_item_description%]"
+        },
+        "unscore_checklist_item": {
+          "name": "[%key:component::habitica::common::unscore_checklist_item_name%]",
+          "description": "[%key:component::habitica::common::unscore_checklist_item_description%]"
+        },
+        "streak": {
+          "name": "Adjust streak",
+          "description": "Adjust or reset the streak counter of the daily."
+        },
+        "reminder": {
+          "name": "[%key:component::habitica::common::reminder_name%]",
+          "description": "[%key:component::habitica::common::reminder_description%]"
+        },
+        "remove_reminder": {
+          "name": "[%key:component::habitica::common::remove_reminder_name%]",
+          "description": "[%key:component::habitica::common::remove_reminder_description%]"
+        },
+        "clear_reminder": {
+          "name": "[%key:component::habitica::common::clear_reminder_name%]",
+          "description": "[%key:component::habitica::common::clear_reminder_description%]"
+        }
+      },
+      "sections": {
+        "checklist_options": {
+          "name": "[%key:component::habitica::common::checklist_options_name%]",
+          "description": "[%key:component::habitica::common::checklist_options_description%]"
+        },
+        "repeat_weekly_options": {
+          "name": "[%key:component::habitica::common::repeat_weekly_options_name%]",
+          "description": "[%key:component::habitica::common::repeat_weekly_options_description%]"
+        },
+        "repeat_monthly_options": {
+          "name": "[%key:component::habitica::common::repeat_monthly_options_name%]",
+          "description": "[%key:component::habitica::common::repeat_monthly_options_description%]"
+        },
+        "tag_options": {
+          "name": "[%key:component::habitica::common::tag_options_name%]",
+          "description": "[%key:component::habitica::common::tag_options_description%]"
+        },
+        "developer_options": {
+          "name": "[%key:component::habitica::common::developer_options_name%]",
+          "description": "[%key:component::habitica::common::developer_options_description%]"
+        },
+        "reminder_options": {
+          "name": "[%key:component::habitica::common::reminder_options_name%]",
+          "description": "[%key:component::habitica::common::reminder_options_description%]"
+        }
+      }
+    },
+    "create_daily": {
+      "name": "Create a daily",
+      "description": "Adds a new daily.",
+      "fields": {
+        "config_entry": {
+          "name": "[%key:component::habitica::common::config_entry_name%]",
+          "description": "[%key:component::habitica::common::config_entry_description%]"
+        },
+        "name": {
+          "name": "[%key:component::habitica::common::task_name%]",
+          "description": "[%key:component::habitica::common::name_description%]"
+        },
+        "notes": {
+          "name": "[%key:component::habitica::common::notes_name%]",
+          "description": "[%key:component::habitica::common::notes_description%]"
+        },
+        "tag": {
+          "name": "[%key:component::habitica::common::tag_options_name%]",
+          "description": "[%key:component::habitica::common::tag_description%]"
+        },
+        "alias": {
+          "name": "[%key:component::habitica::common::alias_name%]",
+          "description": "[%key:component::habitica::common::alias_description%]"
+        },
+        "priority": {
+          "name": "[%key:component::habitica::common::priority_name%]",
+          "description": "[%key:component::habitica::common::priority_description%]"
+        },
+        "start_date": {
+          "name": "[%key:component::habitica::common::start_date_name%]",
+          "description": "[%key:component::habitica::common::start_date_description%]"
+        },
+        "frequency": {
+          "name": "[%key:component::habitica::common::frequency_daily_name%]",
+          "description": "[%key:component::habitica::common::frequency_daily_description%]"
+        },
+        "every_x": {
+          "name": "[%key:component::habitica::common::every_x_name%]",
+          "description": "[%key:component::habitica::common::every_x_description%]"
+        },
+        "repeat": {
+          "name": "[%key:component::habitica::common::repeat_name%]",
+          "description": "[%key:component::habitica::common::repeat_weekly_description%]"
+        },
+        "repeat_monthly": {
+          "name": "[%key:component::habitica::common::repeat_name%]",
+          "description": "[%key:component::habitica::common::repeat_monthly_description%]"
+        },
+        "add_checklist_item": {
+          "name": "[%key:component::habitica::common::checklist_options_name%]",
+          "description": "[%key:component::habitica::common::add_checklist_item_description%]"
+        },
+        "reminder": {
+          "name": "[%key:component::habitica::common::reminder_options_name%]",
+          "description": "[%key:component::habitica::common::reminder_description%]"
+        }
+      },
+      "sections": {
+        "repeat_weekly_options": {
+          "name": "[%key:component::habitica::common::repeat_weekly_options_name%]",
+          "description": "[%key:component::habitica::common::repeat_weekly_options_description%]"
+        },
+        "repeat_monthly_options": {
+          "name": "[%key:component::habitica::common::repeat_monthly_options_name%]",
+          "description": "[%key:component::habitica::common::repeat_monthly_options_description%]"
+        },
+        "developer_options": {
+          "name": "[%key:component::habitica::common::developer_options_name%]",
+          "description": "[%key:component::habitica::common::developer_options_description%]"
+        }
+      }
     }
   },
   "selector": {
@@ -671,6 +1272,31 @@
         "medium": "Medium",
         "hard": "Hard"
       }
+    },
+    "frequency": {
+      "options": {
+        "daily": "Daily",
+        "weekly": "Weekly",
+        "monthly": "Monthly",
+        "yearly": "Yearly"
+      }
+    },
+    "repeat": {
+      "options": {
+        "m": "[%key:common::time::monday%]",
+        "t": "[%key:common::time::tuesday%]",
+        "w": "[%key:common::time::wednesday%]",
+        "th": "[%key:common::time::thursday%]",
+        "f": "[%key:common::time::friday%]",
+        "s": "[%key:common::time::saturday%]",
+        "su": "[%key:common::time::sunday%]"
+      }
+    },
+    "repeat_monthly": {
+      "options": {
+        "day_of_month": "Day of the month",
+        "day_of_week": "Day of the week"
+      }
     }
   }
 }
diff --git a/homeassistant/components/habitica/switch.py b/homeassistant/components/habitica/switch.py
index ddc0db27108..fb98460f7e5 100644
--- a/homeassistant/components/habitica/switch.py
+++ b/homeassistant/components/habitica/switch.py
@@ -13,11 +13,14 @@ from homeassistant.components.switch import (
     SwitchEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import HabiticaData, HabiticaDataUpdateCoordinator
+from .coordinator import (
+    HabiticaConfigEntry,
+    HabiticaData,
+    HabiticaDataUpdateCoordinator,
+)
 from .entity import HabiticaBase
-from .types import HabiticaConfigEntry
 
 PARALLEL_UPDATES = 1
 
@@ -52,7 +55,7 @@ SWTICH_DESCRIPTIONS: tuple[HabiticaSwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: HabiticaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switches from a config entry."""
 
diff --git a/homeassistant/components/habitica/todo.py b/homeassistant/components/habitica/todo.py
index c1786059300..71ba8e60e06 100644
--- a/homeassistant/components/habitica/todo.py
+++ b/homeassistant/components/habitica/todo.py
@@ -26,13 +26,12 @@ from homeassistant.components.todo import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from .const import ASSETS_URL, DOMAIN
-from .coordinator import HabiticaDataUpdateCoordinator
+from .coordinator import HabiticaConfigEntry, HabiticaDataUpdateCoordinator
 from .entity import HabiticaBase
-from .types import HabiticaConfigEntry
 from .util import next_due_date
 
 _LOGGER = logging.getLogger(__name__)
@@ -52,7 +51,7 @@ class HabiticaTodoList(StrEnum):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: HabiticaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor from a config entry created in the integrations UI."""
     coordinator = config_entry.runtime_data
@@ -118,19 +117,24 @@ class BaseHabiticaListEntity(HabiticaBase, TodoListEntity):
         """Move an item in the To-do list."""
         if TYPE_CHECKING:
             assert self.todo_items
+        tasks_order = (
+            self.coordinator.data.user.tasksOrder.todos
+            if self.entity_description.key is HabiticaTodoList.TODOS
+            else self.coordinator.data.user.tasksOrder.dailys
+        )
 
         if previous_uid:
-            pos = (
-                self.todo_items.index(
-                    next(item for item in self.todo_items if item.uid == previous_uid)
-                )
-                + 1
-            )
+            pos = tasks_order.index(UUID(previous_uid))
+            if pos < tasks_order.index(UUID(uid)):
+                pos += 1
+
         else:
             pos = 0
 
         try:
-            await self.coordinator.habitica.reorder_task(UUID(uid), pos)
+            tasks_order[:] = (
+                await self.coordinator.habitica.reorder_task(UUID(uid), pos)
+            ).data
         except TooManyRequestsError as e:
             raise HomeAssistantError(
                 translation_domain=DOMAIN,
@@ -144,20 +148,6 @@ class BaseHabiticaListEntity(HabiticaBase, TodoListEntity):
                 translation_key=f"move_{self.entity_description.key}_item_failed",
                 translation_placeholders={"pos": str(pos)},
             ) from e
-        else:
-            # move tasks in the coordinator until we have fresh data
-            tasks = self.coordinator.data.tasks
-            new_pos = (
-                tasks.index(
-                    next(task for task in tasks if task.id == UUID(previous_uid))
-                )
-                + 1
-                if previous_uid
-                else 0
-            )
-            old_pos = tasks.index(next(task for task in tasks if task.id == UUID(uid)))
-            tasks.insert(new_pos, tasks.pop(old_pos))
-            await self.coordinator.async_request_refresh()
 
     async def async_update_todo_item(self, item: TodoItem) -> None:
         """Update a Habitica todo."""
@@ -271,7 +261,7 @@ class HabiticaTodosListEntity(BaseHabiticaListEntity):
     def todo_items(self) -> list[TodoItem]:
         """Return the todo items."""
 
-        return [
+        tasks = [
             *(
                 TodoItem(
                     uid=str(task.id),
@@ -288,6 +278,15 @@ class HabiticaTodosListEntity(BaseHabiticaListEntity):
                 if task.Type is TaskType.TODO
             ),
         ]
+        return sorted(
+            tasks,
+            key=lambda task: (
+                float("inf")
+                if (uid := UUID(task.uid))
+                not in (tasks_order := self.coordinator.data.user.tasksOrder.todos)
+                else tasks_order.index(uid)
+            ),
+        )
 
     async def async_create_todo_item(self, item: TodoItem) -> None:
         """Create a Habitica todo."""
@@ -348,7 +347,7 @@ class HabiticaDailiesListEntity(BaseHabiticaListEntity):
         if TYPE_CHECKING:
             assert self.coordinator.data.user.lastCron
 
-        return [
+        tasks = [
             *(
                 TodoItem(
                     uid=str(task.id),
@@ -365,3 +364,12 @@ class HabiticaDailiesListEntity(BaseHabiticaListEntity):
                 if task.Type is TaskType.DAILY
             )
         ]
+        return sorted(
+            tasks,
+            key=lambda task: (
+                float("inf")
+                if (uid := UUID(task.uid))
+                not in (tasks_order := self.coordinator.data.user.tasksOrder.dailys)
+                else tasks_order.index(uid)
+            ),
+        )
diff --git a/homeassistant/components/habitica/types.py b/homeassistant/components/habitica/types.py
deleted file mode 100644
index 9789a65dc40..00000000000
--- a/homeassistant/components/habitica/types.py
+++ /dev/null
@@ -1,18 +0,0 @@
-"""Types for Habitica integration."""
-
-from enum import StrEnum
-
-from homeassistant.config_entries import ConfigEntry
-
-from .coordinator import HabiticaDataUpdateCoordinator
-
-type HabiticaConfigEntry = ConfigEntry[HabiticaDataUpdateCoordinator]
-
-
-class HabiticaTaskType(StrEnum):
-    """Habitica Entities."""
-
-    HABIT = "habit"
-    DAILY = "daily"
-    TODO = "todo"
-    REWARD = "reward"
diff --git a/homeassistant/components/hardware/websocket_api.py b/homeassistant/components/hardware/websocket_api.py
index dfbcfd4c4ac..7224c0f8f7e 100644
--- a/homeassistant/components/hardware/websocket_api.py
+++ b/homeassistant/components/hardware/websocket_api.py
@@ -14,7 +14,7 @@ from homeassistant.components import websocket_api
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.event import async_track_time_interval
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN
 from .hardware import async_process_hardware_platforms
diff --git a/homeassistant/components/harman_kardon_avr/media_player.py b/homeassistant/components/harman_kardon_avr/media_player.py
index b8d9f27bcf1..22bc1a6d529 100644
--- a/homeassistant/components/harman_kardon_avr/media_player.py
+++ b/homeassistant/components/harman_kardon_avr/media_player.py
@@ -13,7 +13,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/harmony/manifest.json b/homeassistant/components/harmony/manifest.json
index aab4f51b09a..f67eb4db5aa 100644
--- a/homeassistant/components/harmony/manifest.json
+++ b/homeassistant/components/harmony/manifest.json
@@ -7,7 +7,7 @@
   "documentation": "https://www.home-assistant.io/integrations/harmony",
   "iot_class": "local_push",
   "loggers": ["aioharmony", "slixmpp"],
-  "requirements": ["aioharmony==0.4.1"],
+  "requirements": ["aioharmony==0.5.2"],
   "ssdp": [
     {
       "manufacturer": "Logitech",
diff --git a/homeassistant/components/harmony/remote.py b/homeassistant/components/harmony/remote.py
index efbd4b2ac02..d09dc3ff7e8 100644
--- a/homeassistant/components/harmony/remote.py
+++ b/homeassistant/components/harmony/remote.py
@@ -20,10 +20,9 @@ from homeassistant.components.remote import (
     RemoteEntityFeature,
 )
 from homeassistant.core import HassJob, HomeAssistant, callback
-from homeassistant.helpers import entity_platform
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import VolDictType
 
@@ -57,7 +56,7 @@ HARMONY_CHANGE_CHANNEL_SCHEMA: VolDictType = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: HarmonyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Harmony config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/harmony/select.py b/homeassistant/components/harmony/select.py
index 731b6836386..3f45a23e26e 100644
--- a/homeassistant/components/harmony/select.py
+++ b/homeassistant/components/harmony/select.py
@@ -6,7 +6,7 @@ import logging
 
 from homeassistant.components.select import SelectEntity
 from homeassistant.core import HassJob, HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import ACTIVITY_POWER_OFF, DOMAIN
 from .data import HarmonyConfigEntry, HarmonyData
@@ -21,7 +21,7 @@ TRANSLATABLE_POWER_OFF = "power_off"
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: HarmonyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up harmony activities select."""
     async_add_entities([HarmonyActivitySelect(entry.runtime_data)])
diff --git a/homeassistant/components/harmony/strings.json b/homeassistant/components/harmony/strings.json
index e13573a9ea3..577eb308d78 100644
--- a/homeassistant/components/harmony/strings.json
+++ b/homeassistant/components/harmony/strings.json
@@ -28,7 +28,7 @@
   "options": {
     "step": {
       "init": {
-        "description": "Adjust Harmony Hub Options",
+        "description": "Adjust Harmony Hub options",
         "data": {
           "activity": "The default activity to execute when none is specified.",
           "delay_secs": "The delay between sending commands."
@@ -53,7 +53,7 @@
     },
     "change_channel": {
       "name": "Change channel",
-      "description": "Sends change channel command to the Harmony HUB.",
+      "description": "Sends a change channel command to the Harmony Hub.",
       "fields": {
         "channel": {
           "name": "Channel",
diff --git a/homeassistant/components/hassio/auth.py b/homeassistant/components/hassio/auth.py
index 6ca89ee24be..8589bc0f134 100644
--- a/homeassistant/components/hassio/auth.py
+++ b/homeassistant/components/hassio/auth.py
@@ -14,7 +14,7 @@ from homeassistant.auth.providers import homeassistant as auth_ha
 from homeassistant.components.http import KEY_HASS, KEY_HASS_USER, HomeAssistantView
 from homeassistant.components.http.data_validator import RequestDataValidator
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import ATTR_ADDON, ATTR_PASSWORD, ATTR_USERNAME
 
diff --git a/homeassistant/components/hassio/backup.py b/homeassistant/components/hassio/backup.py
index 2ebd3f6aab4..20f1ec82a7a 100644
--- a/homeassistant/components/hassio/backup.py
+++ b/homeassistant/components/hassio/backup.py
@@ -4,10 +4,14 @@ from __future__ import annotations
 
 import asyncio
 from collections.abc import AsyncIterator, Callable, Coroutine, Mapping
+from contextlib import suppress
 import logging
-from pathlib import Path
+import os
+from pathlib import Path, PurePath
 from typing import Any, cast
+from uuid import UUID
 
+from aiohasupervisor import SupervisorClient
 from aiohasupervisor.exceptions import (
     SupervisorBadRequestError,
     SupervisorError,
@@ -17,30 +21,49 @@ from aiohasupervisor.models import (
     backups as supervisor_backups,
     mounts as supervisor_mounts,
 )
+from aiohasupervisor.models.backups import LOCATION_CLOUD_BACKUP, LOCATION_LOCAL_STORAGE
 
 from homeassistant.components.backup import (
     DATA_MANAGER,
     AddonInfo,
     AgentBackup,
     BackupAgent,
+    BackupConfig,
+    BackupManagerError,
+    BackupNotFound,
     BackupReaderWriter,
     BackupReaderWriterError,
     CreateBackupEvent,
+    CreateBackupParametersDict,
+    CreateBackupStage,
+    CreateBackupState,
     Folder,
+    IdleEvent,
     IncorrectPasswordError,
+    ManagerBackup,
     NewBackup,
     RestoreBackupEvent,
+    RestoreBackupStage,
+    RestoreBackupState,
     WrittenBackup,
+    suggested_filename as suggested_backup_filename,
+    suggested_filename_from_name_date,
 )
+from homeassistant.const import __version__ as HAVERSION
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.backup import async_get_manager as async_get_backup_manager
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.util import dt as dt_util
+from homeassistant.util.enum import try_parse_enum
 
 from .const import DOMAIN, EVENT_SUPERVISOR_EVENT
 from .handler import get_supervisor_client
 
-LOCATION_CLOUD_BACKUP = ".cloud_backup"
 MOUNT_JOBS = ("mount_manager_create_mount", "mount_manager_remove_mount")
+RESTORE_JOB_ID_ENV = "SUPERVISOR_RESTORE_JOB_ID"
+# Set on backups automatically created when updating an addon
+TAG_ADDON_UPDATE = "supervisor.addon_update"
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -51,7 +74,9 @@ async def async_get_backup_agents(
     """Return the hassio backup agents."""
     client = get_supervisor_client(hass)
     mounts = await client.mounts.info()
-    agents: list[BackupAgent] = [SupervisorBackupAgent(hass, "local", None)]
+    agents: list[BackupAgent] = [
+        SupervisorBackupAgent(hass, "local", LOCATION_LOCAL_STORAGE)
+    ]
     for mount in mounts.mounts:
         if mount.usage is not supervisor_mounts.MountUsage.BACKUP:
             continue
@@ -91,7 +116,7 @@ def async_register_backup_agents_listener(
 
 
 def _backup_details_to_agent_backup(
-    details: supervisor_backups.BackupComplete,
+    details: supervisor_backups.BackupComplete, location: str
 ) -> AgentBackup:
     """Convert a supervisor backup details object to an agent backup."""
     homeassistant_included = details.homeassistant is not None
@@ -103,18 +128,21 @@ def _backup_details_to_agent_backup(
         AddonInfo(name=addon.name, slug=addon.slug, version=addon.version)
         for addon in details.addons
     ]
+    extra_metadata = details.extra or {}
     return AgentBackup(
         addons=addons,
         backup_id=details.slug,
         database_included=database_included,
-        date=details.date.isoformat(),
+        date=extra_metadata.get(
+            "supervisor.backup_request_date", details.date.isoformat()
+        ),
         extra_metadata=details.extra or {},
         folders=[Folder(folder) for folder in details.folders],
         homeassistant_included=homeassistant_included,
         homeassistant_version=details.homeassistant,
         name=details.name,
-        protected=details.protected,
-        size=details.size_bytes,
+        protected=details.location_attributes[location].protected,
+        size=details.location_attributes[location].size_bytes,
     )
 
 
@@ -123,13 +151,13 @@ class SupervisorBackupAgent(BackupAgent):
 
     domain = DOMAIN
 
-    def __init__(self, hass: HomeAssistant, name: str, location: str | None) -> None:
+    def __init__(self, hass: HomeAssistant, name: str, location: str) -> None:
         """Initialize the backup agent."""
         super().__init__()
         self._hass = hass
         self._backup_dir = Path("/backups")
         self._client = get_supervisor_client(hass)
-        self.name = name
+        self.name = self.unique_id = name
         self.location = location
 
     async def async_download_backup(
@@ -138,10 +166,15 @@ class SupervisorBackupAgent(BackupAgent):
         **kwargs: Any,
     ) -> AsyncIterator[bytes]:
         """Download a backup file."""
-        return await self._client.backups.download_backup(
-            backup_id,
-            options=supervisor_backups.DownloadBackupOptions(location=self.location),
-        )
+        try:
+            return await self._client.backups.download_backup(
+                backup_id,
+                options=supervisor_backups.DownloadBackupOptions(
+                    location=self.location
+                ),
+            )
+        except SupervisorNotFoundError as err:
+            raise BackupNotFound(f"Backup {backup_id} not found") from err
 
     async def async_upload_backup(
         self,
@@ -152,30 +185,50 @@ class SupervisorBackupAgent(BackupAgent):
     ) -> None:
         """Upload a backup.
 
-        Not required for supervisor, the SupervisorBackupReaderWriter stores files.
+        The upload will be skipped if the backup already exists in the agent's location.
         """
+        with suppress(BackupNotFound):
+            if await self.async_get_backup(backup.backup_id):
+                _LOGGER.debug(
+                    "Backup %s already exists in location %s",
+                    backup.backup_id,
+                    self.location,
+                )
+                return
+        stream = await open_stream()
+        upload_options = supervisor_backups.UploadBackupOptions(
+            location={self.location},
+            filename=PurePath(suggested_backup_filename(backup)),
+        )
+        await self._client.backups.upload_backup(
+            stream,
+            upload_options,
+        )
 
     async def async_list_backups(self, **kwargs: Any) -> list[AgentBackup]:
         """List backups."""
         backup_list = await self._client.backups.list()
         result = []
         for backup in backup_list:
-            if not backup.locations or self.location not in backup.locations:
+            if self.location not in backup.location_attributes:
                 continue
             details = await self._client.backups.backup_info(backup.slug)
-            result.append(_backup_details_to_agent_backup(details))
+            result.append(_backup_details_to_agent_backup(details, self.location))
         return result
 
     async def async_get_backup(
         self,
         backup_id: str,
         **kwargs: Any,
-    ) -> AgentBackup | None:
+    ) -> AgentBackup:
         """Return a backup."""
-        details = await self._client.backups.backup_info(backup_id)
-        if self.location not in details.locations:
-            return None
-        return _backup_details_to_agent_backup(details)
+        try:
+            details = await self._client.backups.backup_info(backup_id)
+        except SupervisorNotFoundError as err:
+            raise BackupNotFound(f"Backup {backup_id} not found") from err
+        if self.location not in details.location_attributes:
+            raise BackupNotFound(f"Backup {backup_id} not found")
+        return _backup_details_to_agent_backup(details, self.location)
 
     async def async_delete_backup(self, backup_id: str, **kwargs: Any) -> None:
         """Remove a backup."""
@@ -186,12 +239,8 @@ class SupervisorBackupAgent(BackupAgent):
                     location={self.location}
                 ),
             )
-        except SupervisorBadRequestError as err:
-            if err.args[0] != "Backup does not exist":
-                raise
-            _LOGGER.debug("Backup %s does not exist", backup_id)
-        except SupervisorNotFoundError:
-            _LOGGER.debug("Backup %s does not exist", backup_id)
+        except SupervisorNotFoundError as err:
+            raise BackupNotFound(f"Backup {backup_id} not found") from err
 
 
 class SupervisorBackupReaderWriter(BackupReaderWriter):
@@ -240,8 +289,45 @@ class SupervisorBackupReaderWriter(BackupReaderWriter):
             for agent_id in agent_ids
             if manager.backup_agents[agent_id].domain == DOMAIN
         ]
-        locations = [agent.location for agent in hassio_agents]
 
+        # Supervisor does not support creating backups spread across multiple
+        # locations, where some locations are encrypted and some are not.
+        # It's inefficient to let core do all the copying so we want to let
+        # supervisor handle as much as possible.
+        # Therefore, we split the locations into two lists: encrypted and decrypted.
+        # The longest list will be sent to supervisor, and the remaining locations
+        # will be handled by async_upload_backup.
+        # If the lists are the same length, it does not matter which one we send,
+        # we send the encrypted list to have a well defined behavior.
+        encrypted_locations: list[str] = []
+        decrypted_locations: list[str] = []
+        agents_settings = manager.config.data.agents
+        for hassio_agent in hassio_agents:
+            if password is not None:
+                if agent_settings := agents_settings.get(hassio_agent.agent_id):
+                    if agent_settings.protected:
+                        encrypted_locations.append(hassio_agent.location)
+                    else:
+                        decrypted_locations.append(hassio_agent.location)
+                else:
+                    encrypted_locations.append(hassio_agent.location)
+            else:
+                decrypted_locations.append(hassio_agent.location)
+        _LOGGER.debug("Encrypted locations: %s", encrypted_locations)
+        _LOGGER.debug("Decrypted locations: %s", decrypted_locations)
+        if hassio_agents:
+            if len(encrypted_locations) >= len(decrypted_locations):
+                locations = encrypted_locations
+            else:
+                locations = decrypted_locations
+                password = None
+        else:
+            locations = []
+        locations = locations or [LOCATION_CLOUD_BACKUP]
+
+        date = dt_util.now().isoformat()
+        extra_metadata = extra_metadata | {"supervisor.backup_request_date": date}
+        filename = suggested_filename_from_name_date(backup_name, date)
         try:
             backup = await self._client.backups.partial_backup(
                 supervisor_backups.PartialBackupOptions(
@@ -251,46 +337,69 @@ class SupervisorBackupReaderWriter(BackupReaderWriter):
                     name=backup_name,
                     password=password,
                     compressed=True,
-                    location=locations or LOCATION_CLOUD_BACKUP,
+                    location=locations,
                     homeassistant_exclude_database=not include_database,
                     background=True,
                     extra=extra_metadata,
+                    filename=PurePath(filename),
                 )
             )
         except SupervisorError as err:
             raise BackupReaderWriterError(f"Error creating backup: {err}") from err
         backup_task = self._hass.async_create_task(
             self._async_wait_for_backup(
-                backup, remove_after_upload=not bool(locations)
+                backup,
+                locations,
+                on_progress=on_progress,
+                remove_after_upload=locations == [LOCATION_CLOUD_BACKUP],
             ),
             name="backup_manager_create_backup",
             eager_start=False,  # To ensure the task is not started before we return
         )
 
-        return (NewBackup(backup_job_id=backup.job_id), backup_task)
+        return (NewBackup(backup_job_id=backup.job_id.hex), backup_task)
 
     async def _async_wait_for_backup(
-        self, backup: supervisor_backups.NewBackup, *, remove_after_upload: bool
+        self,
+        backup: supervisor_backups.NewBackup,
+        locations: list[str],
+        *,
+        on_progress: Callable[[CreateBackupEvent], None],
+        remove_after_upload: bool,
     ) -> WrittenBackup:
         """Wait for a backup to complete."""
         backup_complete = asyncio.Event()
         backup_id: str | None = None
+        create_errors: list[dict[str, str]] = []
 
         @callback
         def on_job_progress(data: Mapping[str, Any]) -> None:
             """Handle backup progress."""
             nonlocal backup_id
+            if not (stage := try_parse_enum(CreateBackupStage, data.get("stage"))):
+                _LOGGER.debug("Unknown create stage: %s", data.get("stage"))
+            else:
+                on_progress(
+                    CreateBackupEvent(
+                        reason=None, stage=stage, state=CreateBackupState.IN_PROGRESS
+                    )
+                )
             if data.get("done") is True:
                 backup_id = data.get("reference")
+                create_errors.extend(data.get("errors", []))
                 backup_complete.set()
 
+        unsub = self._async_listen_job_events(backup.job_id, on_job_progress)
         try:
-            unsub = self._async_listen_job_events(backup.job_id, on_job_progress)
+            await self._get_job_state(backup.job_id, on_job_progress)
             await backup_complete.wait()
         finally:
             unsub()
-        if not backup_id:
-            raise BackupReaderWriterError("Backup failed")
+        if not backup_id or create_errors:
+            # We should add more specific error handling here in the future
+            raise BackupReaderWriterError(
+                f"Backup failed: {create_errors or 'no backup_id'}"
+            )
 
         async def open_backup() -> AsyncIterator[bytes]:
             try:
@@ -321,7 +430,7 @@ class SupervisorBackupReaderWriter(BackupReaderWriter):
             ) from err
 
         return WrittenBackup(
-            backup=_backup_details_to_agent_backup(details),
+            backup=_backup_details_to_agent_backup(details, locations[0]),
             open_stream=open_backup,
             release_stream=remove_backup,
         )
@@ -341,20 +450,19 @@ class SupervisorBackupReaderWriter(BackupReaderWriter):
             for agent_id in agent_ids
             if manager.backup_agents[agent_id].domain == DOMAIN
         ]
-        locations = {agent.location for agent in hassio_agents}
+        locations = [agent.location for agent in hassio_agents]
+        locations = locations or [LOCATION_CLOUD_BACKUP]
 
         backup_id = await self._client.backups.upload_backup(
             stream,
-            supervisor_backups.UploadBackupOptions(
-                location=locations or {LOCATION_CLOUD_BACKUP}
-            ),
+            supervisor_backups.UploadBackupOptions(location=set(locations)),
         )
 
         async def open_backup() -> AsyncIterator[bytes]:
             return await self._client.backups.download_backup(backup_id)
 
         async def remove_backup() -> None:
-            if locations:
+            if locations != [LOCATION_CLOUD_BACKUP]:
                 return
             await self._client.backups.remove_backup(
                 backup_id,
@@ -366,7 +474,7 @@ class SupervisorBackupReaderWriter(BackupReaderWriter):
         details = await self._client.backups.backup_info(backup_id)
 
         return WrittenBackup(
-            backup=_backup_details_to_agent_backup(details),
+            backup=_backup_details_to_agent_backup(details, locations[0]),
             open_stream=open_backup,
             release_stream=remove_backup,
         )
@@ -386,10 +494,12 @@ class SupervisorBackupReaderWriter(BackupReaderWriter):
     ) -> None:
         """Restore a backup."""
         manager = self._hass.data[DATA_MANAGER]
-        # The backup manager has already checked that the backup exists so we don't need to
-        # check that here.
+        # The backup manager has already checked that the backup exists so we don't
+        # need to catch BackupNotFound here.
         backup = await manager.backup_agents[agent_id].async_get_backup(backup_id)
         if (
+            # Check for None to be backwards compatible with the old BackupAgent API,
+            # this can be removed in HA Core 2025.10
             backup
             and restore_homeassistant
             and restore_database != backup.database_included
@@ -404,7 +514,7 @@ class SupervisorBackupReaderWriter(BackupReaderWriter):
             else None
         )
 
-        restore_location: str | None
+        restore_location: str
         if manager.backup_agents[agent_id].domain != DOMAIN:
             # Download the backup to the supervisor. Supervisor will clean up the backup
             # two days after the restore is done.
@@ -430,6 +540,8 @@ class SupervisorBackupReaderWriter(BackupReaderWriter):
                     location=restore_location,
                 ),
             )
+        except SupervisorNotFoundError as err:
+            raise BackupNotFound from err
         except SupervisorBadRequestError as err:
             # Supervisor currently does not transmit machine parsable error types
             message = err.args[0]
@@ -438,22 +550,119 @@ class SupervisorBackupReaderWriter(BackupReaderWriter):
             raise HomeAssistantError(message) from err
 
         restore_complete = asyncio.Event()
+        restore_errors: list[dict[str, str]] = []
 
         @callback
         def on_job_progress(data: Mapping[str, Any]) -> None:
-            """Handle backup progress."""
+            """Handle backup restore progress."""
+            if not (stage := try_parse_enum(RestoreBackupStage, data.get("stage"))):
+                _LOGGER.debug("Unknown restore stage: %s", data.get("stage"))
+            else:
+                on_progress(
+                    RestoreBackupEvent(
+                        reason=None, stage=stage, state=RestoreBackupState.IN_PROGRESS
+                    )
+                )
             if data.get("done") is True:
                 restore_complete.set()
+                restore_errors.extend(data.get("errors", []))
 
+        unsub = self._async_listen_job_events(job.job_id, on_job_progress)
         try:
-            unsub = self._async_listen_job_events(job.job_id, on_job_progress)
+            await self._get_job_state(job.job_id, on_job_progress)
             await restore_complete.wait()
+            if restore_errors:
+                # We should add more specific error handling here in the future
+                raise BackupReaderWriterError(f"Restore failed: {restore_errors}")
         finally:
             unsub()
 
+    async def async_resume_restore_progress_after_restart(
+        self,
+        *,
+        on_progress: Callable[[RestoreBackupEvent | IdleEvent], None],
+    ) -> None:
+        """Check restore status after core restart."""
+        if not (restore_job_str := os.environ.get(RESTORE_JOB_ID_ENV)):
+            _LOGGER.debug("No restore job ID found in environment")
+            return
+
+        restore_job_id = UUID(restore_job_str)
+        _LOGGER.debug("Found restore job ID %s in environment", restore_job_id)
+
+        sent_event = False
+
+        @callback
+        def on_job_progress(data: Mapping[str, Any]) -> None:
+            """Handle backup restore progress."""
+            nonlocal sent_event
+
+            if not (stage := try_parse_enum(RestoreBackupStage, data.get("stage"))):
+                _LOGGER.debug("Unknown restore stage: %s", data.get("stage"))
+
+            if data.get("done") is not True:
+                if stage or not sent_event:
+                    sent_event = True
+                    on_progress(
+                        RestoreBackupEvent(
+                            reason=None,
+                            stage=stage,
+                            state=RestoreBackupState.IN_PROGRESS,
+                        )
+                    )
+                return
+
+            restore_errors = data.get("errors", [])
+            if restore_errors:
+                _LOGGER.warning("Restore backup failed: %s", restore_errors)
+                # We should add more specific error handling here in the future
+                on_progress(
+                    RestoreBackupEvent(
+                        reason="unknown_error",
+                        stage=stage,
+                        state=RestoreBackupState.FAILED,
+                    )
+                )
+            else:
+                on_progress(
+                    RestoreBackupEvent(
+                        reason=None, stage=stage, state=RestoreBackupState.COMPLETED
+                    )
+                )
+            on_progress(IdleEvent())
+            unsub()
+
+        unsub = self._async_listen_job_events(restore_job_id, on_job_progress)
+        try:
+            await self._get_job_state(restore_job_id, on_job_progress)
+        except SupervisorError as err:
+            _LOGGER.debug("Could not get restore job %s: %s", restore_job_id, err)
+            unsub()
+
+    async def async_validate_config(self, *, config: BackupConfig) -> None:
+        """Validate backup config.
+
+        Replace the core backup agent with the hassio default agent.
+        """
+        core_agent_id = "backup.local"
+        create_backup = config.data.create_backup
+        if core_agent_id not in create_backup.agent_ids:
+            _LOGGER.debug("Backup settings don't need to be adjusted")
+            return
+
+        default_agent = await _default_agent(self._client)
+        _LOGGER.info("Adjusting backup settings to not include core backup location")
+        automatic_agents = [
+            agent_id if agent_id != core_agent_id else default_agent
+            for agent_id in create_backup.agent_ids
+        ]
+        config.update(
+            create_backup=CreateBackupParametersDict(agent_ids=automatic_agents)
+        )
+
     @callback
     def _async_listen_job_events(
-        self, job_id: str, on_event: Callable[[Mapping[str, Any]], None]
+        self, job_id: UUID, on_event: Callable[[Mapping[str, Any]], None]
     ) -> Callable[[], None]:
         """Listen for job events."""
 
@@ -468,7 +677,7 @@ class SupervisorBackupReaderWriter(BackupReaderWriter):
             if (
                 data.get("event") != "job"
                 or not (event_data := data.get("data"))
-                or event_data.get("uuid") != job_id
+                or event_data.get("uuid") != job_id.hex
             ):
                 return
             on_event(event_data)
@@ -477,3 +686,93 @@ class SupervisorBackupReaderWriter(BackupReaderWriter):
             self._hass, EVENT_SUPERVISOR_EVENT, handle_signal
         )
         return unsub
+
+    async def _get_job_state(
+        self, job_id: UUID, on_event: Callable[[Mapping[str, Any]], None]
+    ) -> None:
+        """Poll a job for its state."""
+        job = await self._client.jobs.get_job(job_id)
+        _LOGGER.debug("Job state: %s", job)
+        on_event(job.to_dict())
+
+
+async def _default_agent(client: SupervisorClient) -> str:
+    """Return the default agent for creating a backup."""
+    mounts = await client.mounts.info()
+    default_mount = mounts.default_backup_mount
+    return f"hassio.{default_mount if default_mount is not None else 'local'}"
+
+
+async def backup_addon_before_update(
+    hass: HomeAssistant,
+    addon: str,
+    addon_name: str | None,
+    installed_version: str | None,
+) -> None:
+    """Prepare for updating an add-on."""
+    backup_manager = hass.data[DATA_MANAGER]
+    client = get_supervisor_client(hass)
+
+    # Use the password from automatic settings if available
+    if backup_manager.config.data.create_backup.agent_ids:
+        password = backup_manager.config.data.create_backup.password
+    else:
+        password = None
+
+    def addon_update_backup_filter(
+        backups: dict[str, ManagerBackup],
+    ) -> dict[str, ManagerBackup]:
+        """Return addon update backups."""
+        return {
+            backup_id: backup
+            for backup_id, backup in backups.items()
+            if backup.extra_metadata.get(TAG_ADDON_UPDATE) == addon
+        }
+
+    try:
+        await backup_manager.async_create_backup(
+            agent_ids=[await _default_agent(client)],
+            extra_metadata={TAG_ADDON_UPDATE: addon},
+            include_addons=[addon],
+            include_all_addons=False,
+            include_database=False,
+            include_folders=None,
+            include_homeassistant=False,
+            name=f"{addon_name or addon} {installed_version or '<unknown>'}",
+            password=password,
+        )
+    except BackupManagerError as err:
+        raise HomeAssistantError(f"Error creating backup: {err}") from err
+    else:
+        try:
+            await backup_manager.async_delete_filtered_backups(
+                include_filter=addon_update_backup_filter,
+                delete_filter=lambda backups: backups,
+            )
+        except BackupManagerError as err:
+            raise HomeAssistantError(f"Error deleting old backups: {err}") from err
+
+
+async def backup_core_before_update(hass: HomeAssistant) -> None:
+    """Prepare for updating core."""
+    backup_manager = await async_get_backup_manager(hass)
+    client = get_supervisor_client(hass)
+
+    try:
+        if backup_manager.config.data.create_backup.agent_ids:
+            # Create a backup with automatic settings
+            await backup_manager.async_create_automatic_backup()
+        else:
+            # Create a manual backup
+            await backup_manager.async_create_backup(
+                agent_ids=[await _default_agent(client)],
+                include_addons=None,
+                include_all_addons=False,
+                include_database=True,
+                include_folders=None,
+                include_homeassistant=True,
+                name=f"Home Assistant Core {HAVERSION}",
+                password=None,
+            )
+    except BackupManagerError as err:
+        raise HomeAssistantError(f"Error creating backup: {err}") from err
diff --git a/homeassistant/components/hassio/binary_sensor.py b/homeassistant/components/hassio/binary_sensor.py
index 9d6e2ba19da..e7c7427d728 100644
--- a/homeassistant/components/hassio/binary_sensor.py
+++ b/homeassistant/components/hassio/binary_sensor.py
@@ -11,7 +11,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import ADDONS_COORDINATOR, ATTR_STARTED, ATTR_STATE, DATA_KEY_ADDONS
 from .entity import HassioAddonEntity
@@ -38,7 +38,7 @@ ADDON_ENTITY_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Binary sensor set up for Hass.io config entry."""
     coordinator = hass.data[ADDONS_COORDINATOR]
diff --git a/homeassistant/components/hassio/coordinator.py b/homeassistant/components/hassio/coordinator.py
index 2d39e740e63..833068a713c 100644
--- a/homeassistant/components/hassio/coordinator.py
+++ b/homeassistant/components/hassio/coordinator.py
@@ -295,6 +295,8 @@ def async_remove_addons_from_dev_reg(
 class HassioDataUpdateCoordinator(DataUpdateCoordinator):
     """Class to retrieve Hass.io status."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self, hass: HomeAssistant, config_entry: ConfigEntry, dev_reg: dr.DeviceRegistry
     ) -> None:
@@ -302,6 +304,7 @@ class HassioDataUpdateCoordinator(DataUpdateCoordinator):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=HASSIO_UPDATE_INTERVAL,
             # We don't want an immediate refresh since we want to avoid
diff --git a/homeassistant/components/hassio/manifest.json b/homeassistant/components/hassio/manifest.json
index c9ecf6657e8..ad98beb5baa 100644
--- a/homeassistant/components/hassio/manifest.json
+++ b/homeassistant/components/hassio/manifest.json
@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/hassio",
   "iot_class": "local_polling",
   "quality_scale": "internal",
-  "requirements": ["aiohasupervisor==0.2.2b5"],
+  "requirements": ["aiohasupervisor==0.3.0"],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/hassio/sensor.py b/homeassistant/components/hassio/sensor.py
index 039bf483682..9b62faaabcf 100644
--- a/homeassistant/components/hassio/sensor.py
+++ b/homeassistant/components/hassio/sensor.py
@@ -11,7 +11,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfInformation
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     ADDONS_COORDINATOR,
@@ -111,7 +111,7 @@ HOST_ENTITY_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Sensor set up for Hass.io config entry."""
     coordinator = hass.data[ADDONS_COORDINATOR]
diff --git a/homeassistant/components/hassio/strings.json b/homeassistant/components/hassio/strings.json
index 799067b8215..a543dbc7f89 100644
--- a/homeassistant/components/hassio/strings.json
+++ b/homeassistant/components/hassio/strings.json
@@ -152,7 +152,7 @@
     },
     "unsupported_connectivity_check": {
       "title": "Unsupported system - Connectivity check disabled",
-      "description": "System is unsupported because Home Assistant cannot determine when an internet connection is available. Use the link to learn more and how to fix this."
+      "description": "System is unsupported because Home Assistant cannot determine when an Internet connection is available. Use the link to learn more and how to fix this."
     },
     "unsupported_content_trust": {
       "title": "Unsupported system - Content-trust check disabled",
@@ -216,7 +216,7 @@
     },
     "unsupported_systemd_journal": {
       "title": "Unsupported system - Systemd Journal issues",
-      "description": "System is unsupported because Systemd Journal and/or the gateway service is missing, inactive or misconfigured . Use the link to learn more and how to fix this."
+      "description": "System is unsupported because Systemd Journal and/or the gateway service is missing, inactive or misconfigured. Use the link to learn more and how to fix this."
     },
     "unsupported_systemd_resolved": {
       "title": "Unsupported system - Systemd-Resolved issues",
@@ -348,7 +348,7 @@
         },
         "homeassistant_exclude_database": {
           "name": "Home Assistant exclude database",
-          "description": "Exclude the Home Assistant database file from backup"
+          "description": "Exclude the Home Assistant database file from the backup."
         }
       }
     },
@@ -385,8 +385,8 @@
           "description": "[%key:component::hassio::services::backup_full::fields::location::description%]"
         },
         "homeassistant_exclude_database": {
-          "name": "Home Assistant exclude database",
-          "description": "Exclude the Home Assistant database file from backup"
+          "name": "[%key:component::hassio::services::backup_full::fields::homeassistant_exclude_database::name%]",
+          "description": "[%key:component::hassio::services::backup_full::fields::homeassistant_exclude_database::description%]"
         }
       }
     },
diff --git a/homeassistant/components/hassio/update.py b/homeassistant/components/hassio/update.py
index fbb3e191f81..4ea703e87c3 100644
--- a/homeassistant/components/hassio/update.py
+++ b/homeassistant/components/hassio/update.py
@@ -5,11 +5,7 @@ from __future__ import annotations
 from typing import Any
 
 from aiohasupervisor import SupervisorError
-from aiohasupervisor.models import (
-    HomeAssistantUpdateOptions,
-    OSUpdate,
-    StoreAddonUpdate,
-)
+from aiohasupervisor.models import OSUpdate
 from awesomeversion import AwesomeVersion, AwesomeVersionStrategy
 
 from homeassistant.components.update import (
@@ -21,7 +17,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_ICON, ATTR_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     ADDONS_COORDINATOR,
@@ -40,6 +36,7 @@ from .entity import (
     HassioOSEntity,
     HassioSupervisorEntity,
 )
+from .update_helper import update_addon, update_core
 
 ENTITY_DESCRIPTION = UpdateEntityDescription(
     name="Update",
@@ -50,7 +47,7 @@ ENTITY_DESCRIPTION = UpdateEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Supervisor update based on a config entry."""
     coordinator = hass.data[ADDONS_COORDINATOR]
@@ -163,13 +160,9 @@ class SupervisorAddonUpdateEntity(HassioAddonEntity, UpdateEntity):
         **kwargs: Any,
     ) -> None:
         """Install an update."""
-        try:
-            await self.coordinator.supervisor_client.store.update_addon(
-                self._addon_slug, StoreAddonUpdate(backup=backup)
-            )
-        except SupervisorError as err:
-            raise HomeAssistantError(f"Error updating {self.title}: {err}") from err
-
+        await update_addon(
+            self.hass, self._addon_slug, backup, self.title, self.installed_version
+        )
         await self.coordinator.force_info_update_supervisor()
 
 
@@ -303,11 +296,4 @@ class SupervisorCoreUpdateEntity(HassioCoreEntity, UpdateEntity):
         self, version: str | None, backup: bool, **kwargs: Any
     ) -> None:
         """Install an update."""
-        try:
-            await self.coordinator.supervisor_client.homeassistant.update(
-                HomeAssistantUpdateOptions(version=version, backup=backup)
-            )
-        except SupervisorError as err:
-            raise HomeAssistantError(
-                f"Error updating Home Assistant Core: {err}"
-            ) from err
+        await update_core(self.hass, version, backup)
diff --git a/homeassistant/components/hassio/update_helper.py b/homeassistant/components/hassio/update_helper.py
new file mode 100644
index 00000000000..d801f6b5771
--- /dev/null
+++ b/homeassistant/components/hassio/update_helper.py
@@ -0,0 +1,59 @@
+"""Update helpers for Supervisor."""
+
+from __future__ import annotations
+
+from aiohasupervisor import SupervisorError
+from aiohasupervisor.models import HomeAssistantUpdateOptions, StoreAddonUpdate
+
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+
+from .handler import get_supervisor_client
+
+
+async def update_addon(
+    hass: HomeAssistant,
+    addon: str,
+    backup: bool,
+    addon_name: str | None,
+    installed_version: str | None,
+) -> None:
+    """Update an addon.
+
+    Optionally make a backup before updating.
+    """
+    client = get_supervisor_client(hass)
+
+    if backup:
+        # pylint: disable-next=import-outside-toplevel
+        from .backup import backup_addon_before_update
+
+        await backup_addon_before_update(hass, addon, addon_name, installed_version)
+
+    try:
+        await client.store.update_addon(addon, StoreAddonUpdate(backup=False))
+    except SupervisorError as err:
+        raise HomeAssistantError(
+            f"Error updating {addon_name or addon}: {err}"
+        ) from err
+
+
+async def update_core(hass: HomeAssistant, version: str | None, backup: bool) -> None:
+    """Update core.
+
+    Optionally make a backup before updating.
+    """
+    client = get_supervisor_client(hass)
+
+    if backup:
+        # pylint: disable-next=import-outside-toplevel
+        from .backup import backup_core_before_update
+
+        await backup_core_before_update(hass)
+
+    try:
+        await client.homeassistant.update(
+            HomeAssistantUpdateOptions(version=version, backup=False)
+        )
+    except SupervisorError as err:
+        raise HomeAssistantError(f"Error updating Home Assistant Core: {err}") from err
diff --git a/homeassistant/components/hassio/websocket_api.py b/homeassistant/components/hassio/websocket_api.py
index f9d1b40575b..c046e20feab 100644
--- a/homeassistant/components/hassio/websocket_api.py
+++ b/homeassistant/components/hassio/websocket_api.py
@@ -9,9 +9,10 @@ import voluptuous as vol
 
 from homeassistant.components import websocket_api
 from homeassistant.components.websocket_api import ActiveConnection
+from homeassistant.const import ATTR_NAME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import Unauthorized
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
@@ -23,7 +24,9 @@ from .const import (
     ATTR_ENDPOINT,
     ATTR_METHOD,
     ATTR_SESSION_DATA_USER_ID,
+    ATTR_SLUG,
     ATTR_TIMEOUT,
+    ATTR_VERSION,
     ATTR_WS_EVENT,
     DATA_COMPONENT,
     EVENT_SUPERVISOR_EVENT,
@@ -33,6 +36,8 @@ from .const import (
     WS_TYPE_EVENT,
     WS_TYPE_SUBSCRIBE,
 )
+from .coordinator import get_supervisor_info
+from .update_helper import update_addon, update_core
 
 SCHEMA_WEBSOCKET_EVENT = vol.Schema(
     {vol.Required(ATTR_WS_EVENT): cv.string},
@@ -58,6 +63,8 @@ def async_load_websocket_api(hass: HomeAssistant) -> None:
     websocket_api.async_register_command(hass, websocket_supervisor_event)
     websocket_api.async_register_command(hass, websocket_supervisor_api)
     websocket_api.async_register_command(hass, websocket_subscribe)
+    websocket_api.async_register_command(hass, websocket_update_addon)
+    websocket_api.async_register_command(hass, websocket_update_core)
 
 
 @callback
@@ -137,3 +144,44 @@ async def websocket_supervisor_api(
         )
     else:
         connection.send_result(msg[WS_ID], result.get(ATTR_DATA, {}))
+
+
+@websocket_api.require_admin
+@websocket_api.websocket_command(
+    {
+        vol.Required(WS_TYPE): "hassio/update/addon",
+        vol.Required("addon"): str,
+        vol.Required("backup"): bool,
+    }
+)
+@websocket_api.async_response
+async def websocket_update_addon(
+    hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
+) -> None:
+    """Websocket handler to update an addon."""
+    addon_name: str | None = None
+    addon_version: str | None = None
+    addons: list = (get_supervisor_info(hass) or {}).get("addons", [])
+    for addon in addons:
+        if addon[ATTR_SLUG] == msg["addon"]:
+            addon_name = addon[ATTR_NAME]
+            addon_version = addon[ATTR_VERSION]
+            break
+    await update_addon(hass, msg["addon"], msg["backup"], addon_name, addon_version)
+    connection.send_result(msg[WS_ID])
+
+
+@websocket_api.require_admin
+@websocket_api.websocket_command(
+    {
+        vol.Required(WS_TYPE): "hassio/update/core",
+        vol.Required("backup"): bool,
+    }
+)
+@websocket_api.async_response
+async def websocket_update_core(
+    hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
+) -> None:
+    """Websocket handler to update an addon."""
+    await update_core(hass, None, msg["backup"])
+    connection.send_result(msg[WS_ID])
diff --git a/homeassistant/components/haveibeenpwned/sensor.py b/homeassistant/components/haveibeenpwned/sensor.py
index 1aebe696e82..d9d2889848e 100644
--- a/homeassistant/components/haveibeenpwned/sensor.py
+++ b/homeassistant/components/haveibeenpwned/sensor.py
@@ -15,12 +15,11 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_API_KEY, CONF_EMAIL
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import track_point_in_time
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import Throttle
-import homeassistant.util.dt as dt_util
+from homeassistant.util import Throttle, dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/hddtemp/sensor.py b/homeassistant/components/hddtemp/sensor.py
index 7ff00b8e282..4d9bbeb9516 100644
--- a/homeassistant/components/hddtemp/sensor.py
+++ b/homeassistant/components/hddtemp/sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/hdmi_cec/__init__.py b/homeassistant/components/hdmi_cec/__init__.py
index 6b4a949c0fc..3e31dd73b5d 100644
--- a/homeassistant/components/hdmi_cec/__init__.py
+++ b/homeassistant/components/hdmi_cec/__init__.py
@@ -33,8 +33,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.core import HassJob, HomeAssistant, ServiceCall, callback
-from homeassistant.helpers import discovery, event
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery, event
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN, EVENT_HDMI_CEC_UNAVAILABLE
diff --git a/homeassistant/components/heatmiser/climate.py b/homeassistant/components/heatmiser/climate.py
index de66315a467..f44156bdcb0 100644
--- a/homeassistant/components/heatmiser/climate.py
+++ b/homeassistant/components/heatmiser/climate.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/heicko/__init__.py b/homeassistant/components/heicko/__init__.py
new file mode 100644
index 00000000000..65c527f5252
--- /dev/null
+++ b/homeassistant/components/heicko/__init__.py
@@ -0,0 +1 @@
+"""Virtual integration: Heicko."""
diff --git a/homeassistant/components/heicko/manifest.json b/homeassistant/components/heicko/manifest.json
new file mode 100644
index 00000000000..d8f939a5bed
--- /dev/null
+++ b/homeassistant/components/heicko/manifest.json
@@ -0,0 +1,6 @@
+{
+  "domain": "heicko",
+  "name": "Heicko",
+  "integration_type": "virtual",
+  "supported_by": "motion_blinds"
+}
diff --git a/homeassistant/components/heos/__init__.py b/homeassistant/components/heos/__init__.py
index 10fd2bfcff3..4df1a2fa0e1 100644
--- a/homeassistant/components/heos/__init__.py
+++ b/homeassistant/components/heos/__init__.py
@@ -4,16 +4,14 @@ from __future__ import annotations
 
 from datetime import timedelta
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.typing import ConfigType
 
 from . import services
 from .const import DOMAIN
-from .coordinator import HeosCoordinator
+from .coordinator import HeosConfigEntry, HeosCoordinator
 
 PLATFORMS = [Platform.MEDIA_PLAYER]
 
@@ -21,8 +19,6 @@ MIN_UPDATE_SOURCES = timedelta(seconds=1)
 
 CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 
-type HeosConfigEntry = ConfigEntry[HeosCoordinator]
-
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the HEOS component."""
@@ -41,11 +37,24 @@ async def async_setup_entry(hass: HomeAssistant, entry: HeosConfigEntry) -> bool
     for device in device_registry.devices.get_devices_for_config_entry_id(
         entry.entry_id
     ):
-        for domain, player_id in device.identifiers:
-            if domain == DOMAIN and not isinstance(player_id, str):
+        for ident in device.identifiers:
+            if ident[0] != DOMAIN or isinstance(ident[1], str):
+                continue
+
+            player_id = int(ident[1])  # type: ignore[unreachable]
+
+            # Create set of identifiers excluding this integration
+            identifiers = {ident for ident in device.identifiers if ident[0] != DOMAIN}
+            migrated_identifiers = {(DOMAIN, str(player_id))}
+            # Add migrated if not already present in another device, which occurs if the user downgraded and then upgraded
+            if not device_registry.async_get_device(migrated_identifiers):
+                identifiers.update(migrated_identifiers)
+            if len(identifiers) > 0:
                 device_registry.async_update_device(
-                    device.id, new_identifiers={(DOMAIN, str(player_id))}
+                    device.id, new_identifiers=identifiers
                 )
+            else:
+                device_registry.async_remove_device(device.id)
             break
 
     coordinator = HeosCoordinator(hass, entry)
@@ -60,3 +69,14 @@ async def async_setup_entry(hass: HomeAssistant, entry: HeosConfigEntry) -> bool
 async def async_unload_entry(hass: HomeAssistant, entry: HeosConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+
+async def async_remove_config_entry_device(
+    hass: HomeAssistant, entry: HeosConfigEntry, device: dr.DeviceEntry
+) -> bool:
+    """Remove config entry from device if no longer present."""
+    return not any(
+        (domain, key)
+        for domain, key in device.identifiers
+        if domain == DOMAIN and int(key) in entry.runtime_data.heos.players
+    )
diff --git a/homeassistant/components/heos/config_flow.py b/homeassistant/components/heos/config_flow.py
index 18b8f1f7918..e2d3e2522dc 100644
--- a/homeassistant/components/heos/config_flow.py
+++ b/homeassistant/components/heos/config_flow.py
@@ -5,12 +5,17 @@ import logging
 from typing import TYPE_CHECKING, Any
 from urllib.parse import urlparse
 
-from pyheos import CommandAuthenticationError, Heos, HeosError, HeosOptions
+from pyheos import (
+    CommandAuthenticationError,
+    ConnectionState,
+    Heos,
+    HeosError,
+    HeosOptions,
+)
 import voluptuous as vol
 
 from homeassistant.config_entries import (
-    ConfigEntry,
-    ConfigEntryState,
+    SOURCE_IGNORE,
     ConfigFlow,
     ConfigFlowResult,
     OptionsFlow,
@@ -18,13 +23,10 @@ from homeassistant.config_entries import (
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import callback
 from homeassistant.helpers import selector
-from homeassistant.helpers.service_info.ssdp import (
-    ATTR_UPNP_FRIENDLY_NAME,
-    SsdpServiceInfo,
-)
+from homeassistant.helpers.service_info.ssdp import SsdpServiceInfo
 
-from . import HeosConfigEntry
-from .const import DOMAIN
+from .const import DOMAIN, ENTRY_TITLE
+from .coordinator import HeosConfigEntry
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -38,11 +40,6 @@ AUTH_SCHEMA = vol.Schema(
 )
 
 
-def format_title(host: str) -> str:
-    """Format the title for config entries."""
-    return f"HEOS System (via {host})"
-
-
 async def _validate_host(host: str, errors: dict[str, str]) -> bool:
     """Validate host is reachable, return True, otherwise populate errors and return False."""
     heos = Heos(HeosOptions(host, events=False, heart_beat=False))
@@ -57,13 +54,19 @@ async def _validate_host(host: str, errors: dict[str, str]) -> bool:
 
 
 async def _validate_auth(
-    user_input: dict[str, str], heos: Heos, errors: dict[str, str]
+    user_input: dict[str, str], entry: HeosConfigEntry, errors: dict[str, str]
 ) -> bool:
     """Validate authentication by signing in or out, otherwise populate errors if needed."""
+    can_validate = (
+        hasattr(entry, "runtime_data")
+        and entry.runtime_data.heos.connection_state is ConnectionState.CONNECTED
+    )
     if not user_input:
         # Log out (neither username nor password provided)
+        if not can_validate:
+            return True
         try:
-            await heos.sign_out()
+            await entry.runtime_data.heos.sign_out()
         except HeosError:
             errors["base"] = "unknown"
             _LOGGER.exception("Unexpected error occurred during sign-out")
@@ -82,8 +85,12 @@ async def _validate_auth(
         return False
 
     # Attempt to login (both username and password provided)
+    if not can_validate:
+        return True
     try:
-        await heos.sign_in(user_input[CONF_USERNAME], user_input[CONF_PASSWORD])
+        await entry.runtime_data.heos.sign_in(
+            user_input[CONF_USERNAME], user_input[CONF_PASSWORD]
+        )
     except CommandAuthenticationError as err:
         errors["base"] = "invalid_auth"
         _LOGGER.warning("Failed to sign-in to HEOS Account: %s", err)
@@ -95,19 +102,35 @@ async def _validate_auth(
     else:
         _LOGGER.debug(
             "Successfully signed-in to HEOS Account: %s",
-            heos.signed_in_username,
+            entry.runtime_data.heos.signed_in_username,
         )
         return True
 
 
+def _get_current_hosts(entry: HeosConfigEntry) -> set[str]:
+    """Get a set of current hosts from the entry."""
+    hosts = set(entry.data[CONF_HOST])
+    if hasattr(entry, "runtime_data"):
+        hosts.update(
+            player.ip_address
+            for player in entry.runtime_data.heos.players.values()
+            if player.ip_address is not None
+        )
+    return hosts
+
+
 class HeosFlowHandler(ConfigFlow, domain=DOMAIN):
     """Define a flow for HEOS."""
 
     VERSION = 1
 
+    def __init__(self) -> None:
+        """Initialize the HEOS flow."""
+        self._discovered_host: str | None = None
+
     @staticmethod
     @callback
-    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
+    def async_get_options_flow(config_entry: HeosConfigEntry) -> OptionsFlow:
         """Create the options flow."""
         return HeosOptionsFlowHandler()
 
@@ -118,40 +141,86 @@ class HeosFlowHandler(ConfigFlow, domain=DOMAIN):
         # Store discovered host
         if TYPE_CHECKING:
             assert discovery_info.ssdp_location
+
+        entry: HeosConfigEntry | None = await self.async_set_unique_id(DOMAIN)
         hostname = urlparse(discovery_info.ssdp_location).hostname
-        friendly_name = f"{discovery_info.upnp[ATTR_UPNP_FRIENDLY_NAME]} ({hostname})"
-        self.hass.data.setdefault(DOMAIN, {})
-        self.hass.data[DOMAIN][friendly_name] = hostname
-        await self.async_set_unique_id(DOMAIN)
-        # Show selection form
-        return self.async_show_form(step_id="user")
+        assert hostname is not None
+
+        # Abort early when discovery is ignored or host is part of the current system
+        if entry and (
+            entry.source == SOURCE_IGNORE or hostname in _get_current_hosts(entry)
+        ):
+            return self.async_abort(reason="single_instance_allowed")
+
+        # Connect to discovered host and get system information
+        heos = Heos(HeosOptions(hostname, events=False, heart_beat=False))
+        try:
+            await heos.connect()
+            system_info = await heos.get_system_info()
+        except HeosError as error:
+            _LOGGER.debug(
+                "Failed to retrieve system information from discovered HEOS device %s",
+                hostname,
+                exc_info=error,
+            )
+            return self.async_abort(reason="cannot_connect")
+        finally:
+            await heos.disconnect()
+
+        # Select the preferred host, if available
+        if system_info.preferred_hosts:
+            hostname = system_info.preferred_hosts[0].ip_address
+
+        # Move to confirmation when not configured
+        if entry is None:
+            self._discovered_host = hostname
+            return await self.async_step_confirm_discovery()
+
+        # Only update if the configured host isn't part of the discovered hosts to ensure new players that come online don't trigger a reload
+        if entry.data[CONF_HOST] not in [host.ip_address for host in system_info.hosts]:
+            _LOGGER.debug(
+                "Updated host %s to discovered host %s", entry.data[CONF_HOST], hostname
+            )
+            return self.async_update_reload_and_abort(
+                entry,
+                data_updates={CONF_HOST: hostname},
+                reason="reconfigure_successful",
+            )
+        return self.async_abort(reason="single_instance_allowed")
+
+    async def async_step_confirm_discovery(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Confirm discovered HEOS system."""
+        if user_input is not None:
+            assert self._discovered_host is not None
+            return self.async_create_entry(
+                title=ENTRY_TITLE, data={CONF_HOST: self._discovered_host}
+            )
+
+        self._set_confirm_only()
+        return self.async_show_form(step_id="confirm_discovery")
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Obtain host and validate connection."""
-        self.hass.data.setdefault(DOMAIN, {})
-        await self.async_set_unique_id(DOMAIN)
+        await self.async_set_unique_id(DOMAIN, raise_on_progress=False)
+        self._abort_if_unique_id_configured(error="single_instance_allowed")
         # Try connecting to host if provided
         errors: dict[str, str] = {}
         host = None
         if user_input is not None:
             host = user_input[CONF_HOST]
-            # Map host from friendly name if in discovered hosts
-            host = self.hass.data[DOMAIN].get(host, host)
             if await _validate_host(host, errors):
-                self.hass.data.pop(DOMAIN)  # Remove discovery data
                 return self.async_create_entry(
-                    title=format_title(host), data={CONF_HOST: host}
+                    title=ENTRY_TITLE, data={CONF_HOST: host}
                 )
 
         # Return form
-        host_type = (
-            str if not self.hass.data[DOMAIN] else vol.In(list(self.hass.data[DOMAIN]))
-        )
         return self.async_show_form(
             step_id="user",
-            data_schema=vol.Schema({vol.Required(CONF_HOST, default=host): host_type}),
+            data_schema=vol.Schema({vol.Required(CONF_HOST, default=host): str}),
             errors=errors,
         )
 
@@ -187,8 +256,7 @@ class HeosFlowHandler(ConfigFlow, domain=DOMAIN):
         errors: dict[str, str] = {}
         entry: HeosConfigEntry = self._get_reauth_entry()
         if user_input is not None:
-            assert entry.state is ConfigEntryState.LOADED
-            if await _validate_auth(user_input, entry.runtime_data.heos, errors):
+            if await _validate_auth(user_input, entry, errors):
                 return self.async_update_reload_and_abort(entry, options=user_input)
 
         return self.async_show_form(
@@ -209,8 +277,7 @@ class HeosOptionsFlowHandler(OptionsFlow):
         """Manage the options."""
         errors: dict[str, str] = {}
         if user_input is not None:
-            entry: HeosConfigEntry = self.config_entry
-            if await _validate_auth(user_input, entry.runtime_data.heos, errors):
+            if await _validate_auth(user_input, self.config_entry, errors):
                 return self.async_create_entry(data=user_input)
 
         return self.async_show_form(
diff --git a/homeassistant/components/heos/const.py b/homeassistant/components/heos/const.py
index 7f03fa11e79..789fbc12b8e 100644
--- a/homeassistant/components/heos/const.py
+++ b/homeassistant/components/heos/const.py
@@ -3,5 +3,10 @@
 ATTR_PASSWORD = "password"
 ATTR_USERNAME = "username"
 DOMAIN = "heos"
+ENTRY_TITLE = "HEOS System"
+SERVICE_GET_QUEUE = "get_queue"
+SERVICE_GROUP_VOLUME_SET = "group_volume_set"
+SERVICE_GROUP_VOLUME_DOWN = "group_volume_down"
+SERVICE_GROUP_VOLUME_UP = "group_volume_up"
 SERVICE_SIGN_IN = "sign_in"
 SERVICE_SIGN_OUT = "sign_out"
diff --git a/homeassistant/components/heos/coordinator.py b/homeassistant/components/heos/coordinator.py
index 8ed8449685a..5e72eb1427e 100644
--- a/homeassistant/components/heos/coordinator.py
+++ b/homeassistant/components/heos/coordinator.py
@@ -5,9 +5,9 @@ The coordinator is responsible for refreshing data in response to system-wide ev
 entities to update. Entities subscribe to entity-specific updates within the entity class itself.
 """
 
-from collections.abc import Callable
-from datetime import datetime, timedelta
+from collections.abc import Callable, Sequence
 import logging
+from typing import Any
 
 from pyheos import (
     Credentials,
@@ -24,23 +24,24 @@ from pyheos import (
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, Platform
-from homeassistant.core import HassJob, HomeAssistant, callback
-from homeassistant.exceptions import ConfigEntryNotReady, ServiceValidationError
+from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
+from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.helpers.event import async_call_later
+from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
-from . import DOMAIN
+from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
+type HeosConfigEntry = ConfigEntry[HeosCoordinator]
+
 
 class HeosCoordinator(DataUpdateCoordinator[None]):
     """Define the HEOS integration coordinator."""
 
-    def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
+    def __init__(self, hass: HomeAssistant, config_entry: HeosConfigEntry) -> None:
         """Set up the coordinator and set in config_entry."""
-        self.host: str = config_entry.data[CONF_HOST]
         credentials: Credentials | None = None
         if config_entry.options:
             credentials = Credentials(
@@ -50,18 +51,41 @@ class HeosCoordinator(DataUpdateCoordinator[None]):
         # media position update upon start of playback or when media changes
         self.heos = Heos(
             HeosOptions(
-                self.host,
+                config_entry.data[CONF_HOST],
                 all_progress_events=False,
                 auto_reconnect=True,
+                auto_failover=True,
                 credentials=credentials,
             )
         )
-        self._update_sources_pending: bool = False
+        self._platform_callbacks: list[Callable[[Sequence[HeosPlayer]], None]] = []
+        self._update_sources_debouncer = Debouncer(
+            hass,
+            _LOGGER,
+            immediate=True,
+            cooldown=2.0,
+            function=self._async_update_sources,
+        )
         self._source_list: list[str] = []
         self._favorites: dict[int, MediaItem] = {}
-        self._inputs: list[MediaItem] = []
+        self._inputs: Sequence[MediaItem] = []
         super().__init__(hass, _LOGGER, config_entry=config_entry, name=DOMAIN)
 
+    @property
+    def host(self) -> str:
+        """Get the host address of the device."""
+        return self.heos.current_host
+
+    @property
+    def inputs(self) -> Sequence[MediaItem]:
+        """Get input sources across all devices."""
+        return self._inputs
+
+    @property
+    def favorites(self) -> dict[int, MediaItem]:
+        """Get favorite stations."""
+        return self._favorites
+
     async def async_setup(self) -> None:
         """Set up the coordinator; connect to the host; and retrieve initial data."""
         # Add before connect as it may occur during initial connection
@@ -70,12 +94,20 @@ class HeosCoordinator(DataUpdateCoordinator[None]):
         try:
             await self.heos.connect()
         except HeosError as error:
-            raise ConfigEntryNotReady from error
+            _LOGGER.debug("Unable to connect to %s", self.host, exc_info=True)
+            raise ConfigEntryNotReady(
+                translation_domain=DOMAIN,
+                translation_key="unable_to_connect",
+                translation_placeholders={"host": self.host},
+            ) from error
         # Load players
         try:
             await self.heos.get_players()
         except HeosError as error:
-            raise ConfigEntryNotReady from error
+            _LOGGER.debug("Unexpected error retrieving players", exc_info=True)
+            raise ConfigEntryNotReady(
+                translation_domain=DOMAIN, translation_key="unable_to_get_players"
+            ) from error
 
         if not self.heos.is_signed_in:
             _LOGGER.warning(
@@ -95,13 +127,36 @@ class HeosCoordinator(DataUpdateCoordinator[None]):
         await self.heos.disconnect()
         await super().async_shutdown()
 
-    def async_add_listener(self, update_callback, context=None) -> Callable[[], None]:
+    def async_add_listener(
+        self, update_callback: CALLBACK_TYPE, context: Any = None
+    ) -> Callable[[], None]:
         """Add a listener for the coordinator."""
         remove_listener = super().async_add_listener(update_callback, context)
         # Update entities so group_member entity_ids fully populate.
         self.async_update_listeners()
         return remove_listener
 
+    def async_add_platform_callback(
+        self, add_entities_callback: Callable[[Sequence[HeosPlayer]], None]
+    ) -> None:
+        """Add a callback to add entities for a platform."""
+        self._platform_callbacks.append(add_entities_callback)
+
+    def _async_handle_player_update_result(
+        self, update_result: PlayerUpdateResult
+    ) -> None:
+        """Handle a player update result."""
+        if update_result.added_player_ids and self._platform_callbacks:
+            new_players = [
+                self.heos.players[player_id]
+                for player_id in update_result.added_player_ids
+            ]
+            for add_entities_callback in self._platform_callbacks:
+                add_entities_callback(new_players)
+
+        if update_result.updated_player_ids:
+            self._async_update_player_ids(update_result.updated_player_ids)
+
     async def _async_on_auth_failure(self) -> None:
         """Handle when the user credentials are no longer valid."""
         assert self.config_entry is not None
@@ -114,46 +169,27 @@ class HeosCoordinator(DataUpdateCoordinator[None]):
 
     async def _async_on_reconnected(self) -> None:
         """Handle when reconnected so resources are updated and entities marked available."""
-        await self._async_update_players()
+        assert self.config_entry is not None
+        if self.host != self.config_entry.data[CONF_HOST]:
+            self.hass.config_entries.async_update_entry(
+                self.config_entry, data={CONF_HOST: self.host}
+            )
+            _LOGGER.warning("Successfully failed over to HEOS host %s", self.host)
+        else:
+            _LOGGER.warning("Successfully reconnected to HEOS host %s", self.host)
         await self._async_update_sources()
-        _LOGGER.warning("Successfully reconnected to HEOS host %s", self.host)
         self.async_update_listeners()
 
     async def _async_on_controller_event(
-        self, event: str, data: PlayerUpdateResult | None
+        self, event: str, data: PlayerUpdateResult | None = None
     ) -> None:
         """Handle a controller event, such as players or groups changed."""
         if event == const.EVENT_PLAYERS_CHANGED:
             assert data is not None
-            if data.updated_player_ids:
-                self._async_update_player_ids(data.updated_player_ids)
-        elif event == const.EVENT_GROUPS_CHANGED:
-            await self._async_update_players()
-        elif (
-            event in (const.EVENT_SOURCES_CHANGED, const.EVENT_USER_CHANGED)
-            and not self._update_sources_pending
-        ):
-            # Update the sources after a brief delay as we may have received multiple qualifying
-            # events at once and devices cannot handle immediately attempting to refresh sources.
-            self._update_sources_pending = True
-
-            async def update_sources_job(_: datetime | None = None) -> None:
-                await self._async_update_sources()
-                self._update_sources_pending = False
-                self.async_update_listeners()
-
-            assert self.config_entry is not None
-            self.config_entry.async_on_unload(
-                async_call_later(
-                    self.hass,
-                    timedelta(seconds=1),
-                    HassJob(
-                        update_sources_job,
-                        "heos_update_sources",
-                        cancel_on_shutdown=True,
-                    ),
-                )
-            )
+            self._async_handle_player_update_result(data)
+        elif event in (const.EVENT_SOURCES_CHANGED, const.EVENT_USER_CHANGED):
+            # Debounce because we may have received multiple qualifying events in rapid succession.
+            await self._update_sources_debouncer.async_call()
         self.async_update_listeners()
 
     def _async_update_player_ids(self, updated_player_ids: dict[int, int]) -> None:
@@ -215,17 +251,6 @@ class HeosCoordinator(DataUpdateCoordinator[None]):
         else:
             self._source_list.extend([source.name for source in self._inputs])
 
-    async def _async_update_players(self) -> None:
-        """Update players after reconnection."""
-        try:
-            player_updates = await self.heos.load_players()
-        except HeosError as error:
-            _LOGGER.error("Unable to refresh players: %s", error)
-            return
-        # After reconnecting, player_id may have changed
-        if player_updates.updated_player_ids:
-            self._async_update_player_ids(player_updates.updated_player_ids)
-
     @callback
     def async_get_source_list(self) -> list[str]:
         """Return the list of sources for players."""
@@ -265,21 +290,3 @@ class HeosCoordinator(DataUpdateCoordinator[None]):
                 ):
                     return favorite.name
         return None
-
-    async def async_play_source(self, source: str, player: HeosPlayer) -> None:
-        """Determine type of source and play it."""
-        # Favorite
-        if (index := self.async_get_favorite_index(source)) is not None:
-            await player.play_preset_station(index)
-            return
-        # Input source
-        for input_source in self._inputs:
-            if input_source.name == source:
-                await player.play_media(input_source)
-                return
-
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="unknown_source",
-            translation_placeholders={"source": source},
-        )
diff --git a/homeassistant/components/heos/diagnostics.py b/homeassistant/components/heos/diagnostics.py
new file mode 100644
index 00000000000..bf33fc9bc15
--- /dev/null
+++ b/homeassistant/components/heos/diagnostics.py
@@ -0,0 +1,90 @@
+"""Define the HEOS integration diagnostics module."""
+
+from collections.abc import Mapping, Sequence
+import dataclasses
+from typing import Any
+
+from pyheos import HeosError
+
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.device_registry import DeviceEntry
+
+from .const import ATTR_PASSWORD, ATTR_USERNAME, DOMAIN
+from .coordinator import HeosConfigEntry
+
+TO_REDACT = [
+    ATTR_PASSWORD,
+    ATTR_USERNAME,
+    "signed_in_username",
+    "serial",
+    "serial_number",
+]
+
+
+def _as_dict(
+    data: Any, redact: bool = False
+) -> Mapping[str, Any] | Sequence[Any] | Any:
+    """Convert dataclasses to dicts within various data structures."""
+    if dataclasses.is_dataclass(data):
+        data_dict = dataclasses.asdict(data)  # type: ignore[arg-type]
+        return data_dict if not redact else async_redact_data(data_dict, TO_REDACT)
+    if not isinstance(data, (Mapping, Sequence)):
+        return data
+    if isinstance(data, Sequence):
+        return [_as_dict(val) for val in data]
+    return {k: _as_dict(v) for k, v in data.items()}
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, config_entry: HeosConfigEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+    coordinator = config_entry.runtime_data
+    diagnostics = {
+        "config_entry": async_redact_data(config_entry.as_dict(), TO_REDACT),
+        "heos": {
+            "connection_state": coordinator.heos.connection_state,
+            "current_credentials": _as_dict(
+                coordinator.heos.current_credentials, redact=True
+            ),
+        },
+        "groups": _as_dict(coordinator.heos.groups),
+        "source_list": coordinator.async_get_source_list(),
+        "inputs": _as_dict(coordinator.inputs),
+        "favorites": _as_dict(coordinator.favorites),
+    }
+    # Try getting system information
+    try:
+        system_info = await coordinator.heos.get_system_info()
+    except HeosError as err:
+        diagnostics["system"] = {"error": str(err)}
+    else:
+        diagnostics["system"] = _as_dict(system_info, redact=True)
+    return diagnostics
+
+
+async def async_get_device_diagnostics(
+    hass: HomeAssistant, config_entry: HeosConfigEntry, device: DeviceEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a device."""
+    entity_registry = er.async_get(hass)
+    entities = entity_registry.entities.get_entries_for_device_id(device.id, True)
+    player_id = next(
+        int(value) for domain, value in device.identifiers if domain == DOMAIN
+    )
+    player = config_entry.runtime_data.heos.players.get(player_id)
+    return {
+        "device": async_redact_data(device.dict_repr, TO_REDACT),
+        "entities": [
+            {
+                "entity": entity.as_partial_dict,
+                "state": state.as_dict()
+                if (state := hass.states.get(entity.entity_id))
+                else None,
+            }
+            for entity in entities
+        ],
+        "player": _as_dict(player, redact=True),
+    }
diff --git a/homeassistant/components/heos/icons.json b/homeassistant/components/heos/icons.json
index 23c2c8faeaf..c957ac1939c 100644
--- a/homeassistant/components/heos/icons.json
+++ b/homeassistant/components/heos/icons.json
@@ -1,5 +1,17 @@
 {
   "services": {
+    "get_queue": {
+      "service": "mdi:playlist-music"
+    },
+    "group_volume_set": {
+      "service": "mdi:volume-medium"
+    },
+    "group_volume_down": {
+      "service": "mdi:volume-low"
+    },
+    "group_volume_up": {
+      "service": "mdi:volume-high"
+    },
     "sign_in": {
       "service": "mdi:login"
     },
diff --git a/homeassistant/components/heos/manifest.json b/homeassistant/components/heos/manifest.json
index e3d2632e340..cbac9f20574 100644
--- a/homeassistant/components/heos/manifest.json
+++ b/homeassistant/components/heos/manifest.json
@@ -7,8 +7,8 @@
   "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["pyheos"],
-  "requirements": ["pyheos==1.0.0"],
-  "single_config_entry": true,
+  "quality_scale": "platinum",
+  "requirements": ["pyheos==1.0.4"],
   "ssdp": [
     {
       "st": "urn:schemas-denon-com:device:ACT-Denon:1"
diff --git a/homeassistant/components/heos/media_player.py b/homeassistant/components/heos/media_player.py
index d405b235f76..81d997ba44f 100644
--- a/homeassistant/components/heos/media_player.py
+++ b/homeassistant/components/heos/media_player.py
@@ -2,25 +2,37 @@
 
 from __future__ import annotations
 
-from collections.abc import Awaitable, Callable, Coroutine
+from collections.abc import Awaitable, Callable, Coroutine, Sequence
+from contextlib import suppress
+import dataclasses
+from datetime import datetime
 from functools import reduce, wraps
+import logging
 from operator import ior
-from typing import Any
+from typing import Any, Final
 
 from pyheos import (
     AddCriteriaType,
     ControlType,
     HeosError,
     HeosPlayer,
+    MediaItem,
+    MediaMusicSource,
+    MediaType as HeosMediaType,
     PlayState,
     RepeatType,
     const as heos_const,
 )
+from pyheos.util import mediauri as heos_source
+import voluptuous as vol
 
 from homeassistant.components import media_source
 from homeassistant.components.media_player import (
     ATTR_MEDIA_ENQUEUE,
+    ATTR_MEDIA_VOLUME_LEVEL,
+    BrowseError,
     BrowseMedia,
+    MediaClass,
     MediaPlayerEnqueue,
     MediaPlayerEntity,
     MediaPlayerEntityFeature,
@@ -29,21 +41,38 @@ from homeassistant.components.media_player import (
     RepeatMode,
     async_process_play_media_url,
 )
+from homeassistant.components.media_source import BrowseMediaSource
 from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import (
+    HomeAssistant,
+    ServiceResponse,
+    SupportsResponse,
+    callback,
+)
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers import (
+    config_validation as cv,
+    entity_platform,
+    entity_registry as er,
+)
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util.dt import utcnow
 
-from . import HeosConfigEntry
-from .const import DOMAIN as HEOS_DOMAIN
-from .coordinator import HeosCoordinator
+from .const import (
+    DOMAIN as HEOS_DOMAIN,
+    SERVICE_GET_QUEUE,
+    SERVICE_GROUP_VOLUME_DOWN,
+    SERVICE_GROUP_VOLUME_SET,
+    SERVICE_GROUP_VOLUME_UP,
+)
+from .coordinator import HeosConfigEntry, HeosCoordinator
 
 PARALLEL_UPDATES = 0
 
+BROWSE_ROOT: Final = "heos://media"
+
 BASE_SUPPORTED_FEATURES = (
     MediaPlayerEntityFeature.VOLUME_MUTE
     | MediaPlayerEntityFeature.VOLUME_SET
@@ -57,6 +86,7 @@ BASE_SUPPORTED_FEATURES = (
 )
 
 PLAY_STATE_TO_STATE = {
+    None: MediaPlayerState.IDLE,
     PlayState.PLAY: MediaPlayerState.PLAYING,
     PlayState.STOP: MediaPlayerState.IDLE,
     PlayState.PAUSE: MediaPlayerState.PAUSED,
@@ -85,32 +115,73 @@ HEOS_HA_REPEAT_TYPE_MAP = {
 }
 HA_HEOS_REPEAT_TYPE_MAP = {v: k for k, v in HEOS_HA_REPEAT_TYPE_MAP.items()}
 
+HEOS_MEDIA_TYPE_TO_MEDIA_CLASS = {
+    HeosMediaType.ALBUM: MediaClass.ALBUM,
+    HeosMediaType.ARTIST: MediaClass.ARTIST,
+    HeosMediaType.CONTAINER: MediaClass.DIRECTORY,
+    HeosMediaType.GENRE: MediaClass.GENRE,
+    HeosMediaType.HEOS_SERVER: MediaClass.DIRECTORY,
+    HeosMediaType.HEOS_SERVICE: MediaClass.DIRECTORY,
+    HeosMediaType.MUSIC_SERVICE: MediaClass.DIRECTORY,
+    HeosMediaType.PLAYLIST: MediaClass.PLAYLIST,
+    HeosMediaType.SONG: MediaClass.TRACK,
+    HeosMediaType.STATION: MediaClass.TRACK,
+}
+
+_LOGGER = logging.getLogger(__name__)
+
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: HeosConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: HeosConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add media players for a config entry."""
-    devices = [
-        HeosMediaPlayer(entry.runtime_data, player)
-        for player in entry.runtime_data.heos.players.values()
-    ]
-    async_add_entities(devices)
+    # Register custom entity services
+    platform = entity_platform.async_get_current_platform()
+    platform.async_register_entity_service(
+        SERVICE_GET_QUEUE,
+        None,
+        "async_get_queue",
+        supports_response=SupportsResponse.ONLY,
+    )
+    platform.async_register_entity_service(
+        SERVICE_GROUP_VOLUME_SET,
+        {vol.Required(ATTR_MEDIA_VOLUME_LEVEL): cv.small_float},
+        "async_set_group_volume_level",
+    )
+    platform.async_register_entity_service(
+        SERVICE_GROUP_VOLUME_DOWN, None, "async_group_volume_down"
+    )
+    platform.async_register_entity_service(
+        SERVICE_GROUP_VOLUME_UP, None, "async_group_volume_up"
+    )
+
+    def add_entities_callback(players: Sequence[HeosPlayer]) -> None:
+        """Add entities for each player."""
+        async_add_entities(
+            [HeosMediaPlayer(entry.runtime_data, player) for player in players]
+        )
+
+    coordinator = entry.runtime_data
+    coordinator.async_add_platform_callback(add_entities_callback)
+    add_entities_callback(list(coordinator.heos.players.values()))
 
 
-type _FuncType[**_P] = Callable[_P, Awaitable[Any]]
-type _ReturnFuncType[**_P] = Callable[_P, Coroutine[Any, Any, None]]
+type _FuncType[**_P, _R] = Callable[_P, Awaitable[_R]]
+type _ReturnFuncType[**_P, _R] = Callable[_P, Coroutine[Any, Any, _R]]
 
 
-def catch_action_error[**_P](
+def catch_action_error[**_P, _R](
     action: str,
-) -> Callable[[_FuncType[_P]], _ReturnFuncType[_P]]:
+) -> Callable[[_FuncType[_P, _R]], _ReturnFuncType[_P, _R]]:
     """Return decorator that catches errors and raises HomeAssistantError."""
 
-    def decorator(func: _FuncType[_P]) -> _ReturnFuncType[_P]:
+    def decorator(func: _FuncType[_P, _R]) -> _ReturnFuncType[_P, _R]:
         @wraps(func)
-        async def wrapper(*args: _P.args, **kwargs: _P.kwargs) -> None:
+        async def wrapper(*args: _P.args, **kwargs: _P.kwargs) -> _R:
             try:
-                await func(*args, **kwargs)
+                return await func(*args, **kwargs)
             except (HeosError, ValueError) as ex:
                 raise HomeAssistantError(
                     translation_domain=HEOS_DOMAIN,
@@ -134,7 +205,7 @@ class HeosMediaPlayer(CoordinatorEntity[HeosCoordinator], MediaPlayerEntity):
 
     def __init__(self, coordinator: HeosCoordinator, player: HeosPlayer) -> None:
         """Initialize."""
-        self._media_position_updated_at = None
+        self._media_position_updated_at: datetime | None = None
         self._player: HeosPlayer = player
         self._attr_unique_id = str(player.player_id)
         model_parts = player.model.split(maxsplit=1)
@@ -150,7 +221,7 @@ class HeosMediaPlayer(CoordinatorEntity[HeosCoordinator], MediaPlayerEntity):
         )
         super().__init__(coordinator, context=player.player_id)
 
-    async def _player_update(self, event):
+    async def _player_update(self, event: str) -> None:
         """Handle player attribute updated."""
         if event == heos_const.EVENT_PLAYER_NOW_PLAYING_PROGRESS:
             self._media_position_updated_at = utcnow()
@@ -210,6 +281,12 @@ class HeosMediaPlayer(CoordinatorEntity[HeosCoordinator], MediaPlayerEntity):
         self.async_on_remove(self._player.add_on_player_event(self._player_update))
         await super().async_added_to_hass()
 
+    @catch_action_error("get queue")
+    async def async_get_queue(self) -> ServiceResponse:
+        """Get the queue for the current player."""
+        queue = await self._player.get_queue()
+        return {"queue": [dataclasses.asdict(item) for item in queue]}
+
     @catch_action_error("clear playlist")
     async def async_clear_playlist(self) -> None:
         """Clear players playlist."""
@@ -250,6 +327,16 @@ class HeosMediaPlayer(CoordinatorEntity[HeosCoordinator], MediaPlayerEntity):
         self, media_type: MediaType | str, media_id: str, **kwargs: Any
     ) -> None:
         """Play a piece of media."""
+        if heos_source.is_media_uri(media_id):
+            media, data = heos_source.from_media_uri(media_id)
+            if not isinstance(media, MediaItem):
+                raise ValueError(f"Invalid media id '{media_id}'")
+            await self._player.play_media(
+                media,
+                HA_HEOS_ENQUEUE_MAP[kwargs.get(ATTR_MEDIA_ENQUEUE)],
+            )
+            return
+
         if media_source.is_media_source_id(media_id):
             media_type = MediaType.URL
             play_item = await media_source.async_resolve_media(
@@ -280,13 +367,12 @@ class HeosMediaPlayer(CoordinatorEntity[HeosCoordinator], MediaPlayerEntity):
             return
 
         if media_type == MediaType.PLAYLIST:
-            playlists = await self._player.heos.get_playlists()
+            playlists = await self.coordinator.heos.get_playlists()
             playlist = next((p for p in playlists if p.name == media_id), None)
             if not playlist:
                 raise ValueError(f"Invalid playlist '{media_id}'")
-            add_queue_option = HA_HEOS_ENQUEUE_MAP.get(kwargs.get(ATTR_MEDIA_ENQUEUE))
-
-            await self._player.add_to_queue(playlist, add_queue_option)
+            add_queue_option = HA_HEOS_ENQUEUE_MAP[kwargs.get(ATTR_MEDIA_ENQUEUE)]
+            await self._player.play_media(playlist, add_queue_option)
             return
 
         if media_type == "favorite":
@@ -301,12 +387,35 @@ class HeosMediaPlayer(CoordinatorEntity[HeosCoordinator], MediaPlayerEntity):
             await self._player.play_preset_station(index)
             return
 
+        if media_type == "queue":
+            # media_id must be an int
+            try:
+                queue_id = int(media_id)
+            except ValueError:
+                raise ValueError(f"Invalid queue id '{media_id}'") from None
+            await self._player.play_queue(queue_id)
+            return
+
         raise ValueError(f"Unsupported media type '{media_type}'")
 
     @catch_action_error("select source")
     async def async_select_source(self, source: str) -> None:
         """Select input source."""
-        await self.coordinator.async_play_source(source, self._player)
+        # Favorite
+        if (index := self.coordinator.async_get_favorite_index(source)) is not None:
+            await self._player.play_preset_station(index)
+            return
+        # Input source
+        for input_source in self.coordinator.inputs:
+            if input_source.name == source:
+                await self._player.play_media(input_source)
+                return
+
+        raise ServiceValidationError(
+            translation_domain=HEOS_DOMAIN,
+            translation_key="unknown_source",
+            translation_placeholders={"source": source},
+        )
 
     @catch_action_error("set repeat")
     async def async_set_repeat(self, repeat: RepeatMode) -> None:
@@ -325,6 +434,41 @@ class HeosMediaPlayer(CoordinatorEntity[HeosCoordinator], MediaPlayerEntity):
         """Set volume level, range 0..1."""
         await self._player.set_volume(int(volume * 100))
 
+    @catch_action_error("set group volume level")
+    async def async_set_group_volume_level(self, volume_level: float) -> None:
+        """Set group volume level."""
+        if self._player.group_id is None:
+            raise ServiceValidationError(
+                translation_domain=HEOS_DOMAIN,
+                translation_key="entity_not_grouped",
+                translation_placeholders={"entity_id": self.entity_id},
+            )
+        await self.coordinator.heos.set_group_volume(
+            self._player.group_id, int(volume_level * 100)
+        )
+
+    @catch_action_error("group volume down")
+    async def async_group_volume_down(self) -> None:
+        """Turn group volume down for media player."""
+        if self._player.group_id is None:
+            raise ServiceValidationError(
+                translation_domain=HEOS_DOMAIN,
+                translation_key="entity_not_grouped",
+                translation_placeholders={"entity_id": self.entity_id},
+            )
+        await self.coordinator.heos.group_volume_down(self._player.group_id)
+
+    @catch_action_error("group volume up")
+    async def async_group_volume_up(self) -> None:
+        """Turn group volume up for media player."""
+        if self._player.group_id is None:
+            raise ServiceValidationError(
+                translation_domain=HEOS_DOMAIN,
+                translation_key="entity_not_grouped",
+                translation_placeholders={"entity_id": self.entity_id},
+            )
+        await self.coordinator.heos.group_volume_up(self._player.group_id)
+
     @catch_action_error("join players")
     async def async_join_players(self, group_members: list[str]) -> None:
         """Join `group_members` as a player group with the current player."""
@@ -387,38 +531,40 @@ class HeosMediaPlayer(CoordinatorEntity[HeosCoordinator], MediaPlayerEntity):
         return self._player.is_muted
 
     @property
-    def media_album_name(self) -> str:
+    def media_album_name(self) -> str | None:
         """Album name of current playing media, music track only."""
         return self._player.now_playing_media.album
 
     @property
-    def media_artist(self) -> str:
+    def media_artist(self) -> str | None:
         """Artist of current playing media, music track only."""
         return self._player.now_playing_media.artist
 
     @property
-    def media_content_id(self) -> str:
+    def media_content_id(self) -> str | None:
         """Content ID of current playing media."""
         return self._player.now_playing_media.media_id
 
     @property
-    def media_duration(self):
+    def media_duration(self) -> int | None:
         """Duration of current playing media in seconds."""
         duration = self._player.now_playing_media.duration
         if isinstance(duration, int):
-            return duration / 1000
+            return int(duration / 1000)
         return None
 
     @property
-    def media_position(self):
+    def media_position(self) -> int | None:
         """Position of current playing media in seconds."""
         # Some media doesn't have duration but reports position, return None
         if not self._player.now_playing_media.duration:
             return None
-        return self._player.now_playing_media.current_position / 1000
+        if isinstance(self._player.now_playing_media.current_position, int):
+            return int(self._player.now_playing_media.current_position / 1000)
+        return None
 
     @property
-    def media_position_updated_at(self):
+    def media_position_updated_at(self) -> datetime | None:
         """When was the position of the current playing media valid."""
         # Some media doesn't have duration but reports position, return None
         if not self._player.now_playing_media.duration:
@@ -433,7 +579,7 @@ class HeosMediaPlayer(CoordinatorEntity[HeosCoordinator], MediaPlayerEntity):
         return image_url if image_url else None
 
     @property
-    def media_title(self) -> str:
+    def media_title(self) -> str | None:
         """Title of current playing media."""
         return self._player.now_playing_media.song
 
@@ -452,14 +598,103 @@ class HeosMediaPlayer(CoordinatorEntity[HeosCoordinator], MediaPlayerEntity):
         """Volume level of the media player (0..1)."""
         return self._player.volume / 100
 
+    async def _async_browse_media_root(self) -> BrowseMedia:
+        """Return media browsing root."""
+        if not self.coordinator.heos.music_sources:
+            try:
+                await self.coordinator.heos.get_music_sources()
+            except HeosError as error:
+                _LOGGER.debug("Unable to load music sources: %s", error)
+        children: list[BrowseMedia] = [
+            _media_to_browse_media(source)
+            for source in self.coordinator.heos.music_sources.values()
+            if source.available or source.source_id == heos_const.MUSIC_SOURCE_TUNEIN
+        ]
+        root = BrowseMedia(
+            title="Music Sources",
+            media_class=MediaClass.DIRECTORY,
+            children_media_class=MediaClass.DIRECTORY,
+            media_content_type="",
+            media_content_id=BROWSE_ROOT,
+            can_expand=True,
+            can_play=False,
+            children=children,
+        )
+        # Append media source items
+        with suppress(BrowseError):
+            browse = await self._async_browse_media_source()
+            # If domain is None, it's an overview of available sources
+            if browse.domain is None and browse.children:
+                children.extend(browse.children)
+            else:
+                children.append(browse)
+        return root
+
+    async def _async_browse_heos_media(self, media_content_id: str) -> BrowseMedia:
+        """Browse a HEOS media item."""
+        media, data = heos_source.from_media_uri(media_content_id)
+        browse_media = _media_to_browse_media(media)
+        try:
+            browse_result = await self.coordinator.heos.browse_media(media)
+        except HeosError as error:
+            _LOGGER.debug("Unable to browse media %s: %s", media, error)
+        else:
+            browse_media.children = [
+                _media_to_browse_media(item)
+                for item in browse_result.items
+                if item.browsable or item.playable
+            ]
+        return browse_media
+
+    async def _async_browse_media_source(
+        self, media_content_id: str | None = None
+    ) -> BrowseMediaSource:
+        """Browse a media source item."""
+        return await media_source.async_browse_media(
+            self.hass,
+            media_content_id,
+            content_filter=lambda item: item.media_content_type.startswith("audio/"),
+        )
+
     async def async_browse_media(
         self,
         media_content_type: MediaType | str | None = None,
         media_content_id: str | None = None,
     ) -> BrowseMedia:
         """Implement the websocket media browsing helper."""
-        return await media_source.async_browse_media(
-            self.hass,
-            media_content_id,
-            content_filter=lambda item: item.media_content_type.startswith("audio/"),
+        if media_content_id in (None, BROWSE_ROOT):
+            return await self._async_browse_media_root()
+        assert media_content_id is not None
+        if heos_source.is_media_uri(media_content_id):
+            return await self._async_browse_heos_media(media_content_id)
+        if media_source.is_media_source_id(media_content_id):
+            return await self._async_browse_media_source(media_content_id)
+        raise ServiceValidationError(
+            translation_domain=HEOS_DOMAIN,
+            translation_key="unsupported_media_content_id",
+            translation_placeholders={"media_content_id": media_content_id},
         )
+
+
+def _media_to_browse_media(media: MediaItem | MediaMusicSource) -> BrowseMedia:
+    """Convert a HEOS media item to a browse media item."""
+    can_expand = False
+    can_play = False
+
+    if isinstance(media, MediaMusicSource):
+        can_expand = (
+            media.source_id == heos_const.MUSIC_SOURCE_TUNEIN or media.available
+        )
+    else:
+        can_expand = media.browsable
+        can_play = media.playable
+
+    return BrowseMedia(
+        can_expand=can_expand,
+        can_play=can_play,
+        media_content_id=heos_source.to_media_uri(media),
+        media_content_type="",
+        media_class=HEOS_MEDIA_TYPE_TO_MEDIA_CLASS[media.type],
+        title=media.name,
+        thumbnail=media.image_url,
+    )
diff --git a/homeassistant/components/heos/quality_scale.yaml b/homeassistant/components/heos/quality_scale.yaml
index d48bcc492cd..5f5062b6a82 100644
--- a/homeassistant/components/heos/quality_scale.yaml
+++ b/homeassistant/components/heos/quality_scale.yaml
@@ -37,10 +37,8 @@ rules:
     comment: 99% test coverage
   # Gold
   devices: done
-  diagnostics: todo
-  discovery-update-info:
-    status: todo
-    comment: Explore if this is possible.
+  diagnostics: done
+  discovery-update-info: done
   discovery: done
   docs-data-update: done
   docs-examples: done
@@ -49,19 +47,19 @@ rules:
   docs-supported-functions: done
   docs-troubleshooting: done
   docs-use-cases: done
-  dynamic-devices: todo
+  dynamic-devices: done
   entity-category: done
   entity-device-class: done
   entity-disabled-by-default: done
   entity-translations: done
-  exception-translations: todo
+  exception-translations: done
   icon-translations: done
   reconfiguration-flow: done
-  repair-issues: todo
-  stale-devices: todo
+  repair-issues: done
+  stale-devices: done
   # Platinum
   async-dependency: done
   inject-websession:
     status: done
     comment: The integration does not use websession
-  strict-typing: todo
+  strict-typing: done
diff --git a/homeassistant/components/heos/services.py b/homeassistant/components/heos/services.py
index 5a0105f830e..dc11bb7a76d 100644
--- a/homeassistant/components/heos/services.py
+++ b/homeassistant/components/heos/services.py
@@ -7,7 +7,7 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant, ServiceCall
-from homeassistant.exceptions import HomeAssistantError
+from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import config_validation as cv, issue_registry as ir
 
 from .const import (
@@ -17,6 +17,7 @@ from .const import (
     SERVICE_SIGN_IN,
     SERVICE_SIGN_OUT,
 )
+from .coordinator import HeosConfigEntry
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -27,7 +28,7 @@ HEOS_SIGN_IN_SCHEMA = vol.Schema(
 HEOS_SIGN_OUT_SCHEMA = vol.Schema({})
 
 
-def register(hass: HomeAssistant):
+def register(hass: HomeAssistant) -> None:
     """Register HEOS services."""
     hass.services.async_register(
         DOMAIN,
@@ -45,7 +46,6 @@ def register(hass: HomeAssistant):
 
 def _get_controller(hass: HomeAssistant) -> Heos:
     """Get the HEOS controller instance."""
-
     _LOGGER.warning(
         "Actions 'heos.sign_in' and 'heos.sign_out' are deprecated and will be removed in the 2025.8.0 release"
     )
@@ -59,7 +59,10 @@ def _get_controller(hass: HomeAssistant) -> Heos:
         translation_key="sign_in_out_deprecated",
     )
 
-    entry = hass.config_entries.async_entry_for_domain_unique_id(DOMAIN, DOMAIN)
+    entry: HeosConfigEntry | None = (
+        hass.config_entries.async_entry_for_domain_unique_id(DOMAIN, DOMAIN)
+    )
+
     if not entry or not entry.state == ConfigEntryState.LOADED:
         raise HomeAssistantError(
             translation_domain=DOMAIN, translation_key="integration_not_loaded"
@@ -75,16 +78,25 @@ async def _sign_in_handler(service: ServiceCall) -> None:
     try:
         await controller.sign_in(username, password)
     except CommandAuthenticationError as err:
-        _LOGGER.error("Sign in failed: %s", err)
+        raise ServiceValidationError(
+            translation_domain=DOMAIN, translation_key="sign_in_auth_error"
+        ) from err
     except HeosError as err:
-        _LOGGER.error("Unable to sign in: %s", err)
+        raise HomeAssistantError(
+            translation_domain=DOMAIN,
+            translation_key="sign_in_error",
+            translation_placeholders={"error": str(err)},
+        ) from err
 
 
 async def _sign_out_handler(service: ServiceCall) -> None:
     """Sign out of the HEOS account."""
-
     controller = _get_controller(service.hass)
     try:
         await controller.sign_out()
     except HeosError as err:
-        _LOGGER.error("Unable to sign out: %s", err)
+        raise HomeAssistantError(
+            translation_domain=DOMAIN,
+            translation_key="sign_out_error",
+            translation_placeholders={"error": str(err)},
+        ) from err
diff --git a/homeassistant/components/heos/services.yaml b/homeassistant/components/heos/services.yaml
index 8dc222d65ba..fa79bd03096 100644
--- a/homeassistant/components/heos/services.yaml
+++ b/homeassistant/components/heos/services.yaml
@@ -1,3 +1,35 @@
+get_queue:
+  target:
+    entity:
+      integration: heos
+      domain: media_player
+
+group_volume_set:
+  target:
+    entity:
+      integration: heos
+      domain: media_player
+  fields:
+    volume_level:
+      required: true
+      selector:
+        number:
+          min: 0
+          max: 1
+          step: 0.01
+
+group_volume_down:
+  target:
+    entity:
+      integration: heos
+      domain: media_player
+
+group_volume_up:
+  target:
+    entity:
+      integration: heos
+      domain: media_player
+
 sign_in:
   fields:
     username:
diff --git a/homeassistant/components/heos/strings.json b/homeassistant/components/heos/strings.json
index 907804d10e1..38e3349b7c0 100644
--- a/homeassistant/components/heos/strings.json
+++ b/homeassistant/components/heos/strings.json
@@ -8,9 +8,13 @@
           "host": "[%key:common::config_flow::data::host%]"
         },
         "data_description": {
-          "host": "Host name or IP address of a HEOS-capable product (preferrably one connected via wire to the network)."
+          "host": "Host name or IP address of a HEOS-capable product (preferably one connected via wire to the network)."
         }
       },
+      "confirm_discovery": {
+        "title": "Discovered HEOS System",
+        "description": "Do you want to add your HEOS devices to Home Assistant?"
+      },
       "reconfigure": {
         "title": "Reconfigure HEOS",
         "description": "Change the host name or IP address of the HEOS-capable product used to access your HEOS System.",
@@ -43,6 +47,7 @@
     },
     "abort": {
       "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
       "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
       "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
@@ -71,6 +76,28 @@
     }
   },
   "services": {
+    "group_volume_set": {
+      "name": "Set group volume",
+      "description": "Sets the group's volume while preserving member volume ratios.",
+      "fields": {
+        "volume_level": {
+          "name": "Level",
+          "description": "The volume. 0 is inaudible, 1 is the maximum volume."
+        }
+      }
+    },
+    "get_queue": {
+      "name": "Get queue",
+      "description": "Retrieves the queue of the media player."
+    },
+    "group_volume_down": {
+      "name": "Turn down group volume",
+      "description": "Turns down the group volume."
+    },
+    "group_volume_up": {
+      "name": "Turn up group volume",
+      "description": "Turns up the group volume."
+    },
     "sign_in": {
       "name": "Sign in",
       "description": "Signs in to a HEOS account.",
@@ -94,17 +121,38 @@
     "action_error": {
       "message": "Unable to {action}: {error}"
     },
+    "entity_not_grouped": {
+      "message": "Entity {entity_id} is not joined to a group"
+    },
     "entity_not_found": {
       "message": "Entity {entity_id} was not found"
     },
     "integration_not_loaded": {
       "message": "The HEOS integration is not loaded"
     },
+    "sign_in_auth_error": {
+      "message": "Failed to sign in: Invalid username and/or password"
+    },
+    "sign_in_error": {
+      "message": "Unable to sign in: {error}"
+    },
+    "sign_out_error": {
+      "message": "Unable to sign out: {error}"
+    },
     "not_heos_media_player": {
       "message": "Entity {entity_id} is not a HEOS media player entity"
     },
+    "unable_to_connect": {
+      "message": "Unable to connect to {host}"
+    },
+    "unable_to_get_players": {
+      "message": "Unexpected error retrieving players"
+    },
     "unknown_source": {
       "message": "Unknown source: {source}"
+    },
+    "unsupported_media_content_id": {
+      "message": "Unsupported media_content_id: {media_content_id}"
     }
   },
   "issues": {
diff --git a/homeassistant/components/here_travel_time/__init__.py b/homeassistant/components/here_travel_time/__init__.py
index 1b99ba64827..132b12de4ce 100644
--- a/homeassistant/components/here_travel_time/__init__.py
+++ b/homeassistant/components/here_travel_time/__init__.py
@@ -56,7 +56,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     else:
         cls = HERERoutingDataUpdateCoordinator
 
-    data_coordinator = cls(hass, api_key, here_travel_time_config)
+    data_coordinator = cls(hass, config_entry, api_key, here_travel_time_config)
     hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = data_coordinator
 
     async def _async_update_at_start(_: HomeAssistant) -> None:
diff --git a/homeassistant/components/here_travel_time/config_flow.py b/homeassistant/components/here_travel_time/config_flow.py
index c2b70de148c..6425b5ffbed 100644
--- a/homeassistant/components/here_travel_time/config_flow.py
+++ b/homeassistant/components/here_travel_time/config_flow.py
@@ -31,7 +31,7 @@ from homeassistant.const import (
     CONF_NAME,
 )
 from homeassistant.core import callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.selector import (
     EntitySelector,
     LocationSelector,
diff --git a/homeassistant/components/here_travel_time/coordinator.py b/homeassistant/components/here_travel_time/coordinator.py
index 6591f4cb5cc..a3345e78e4e 100644
--- a/homeassistant/components/here_travel_time/coordinator.py
+++ b/homeassistant/components/here_travel_time/coordinator.py
@@ -25,9 +25,10 @@ from here_transit import (
 )
 import voluptuous as vol
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfLength
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.location import find_coordinates
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from homeassistant.util import dt as dt_util
@@ -44,9 +45,12 @@ _LOGGER = logging.getLogger(__name__)
 class HERERoutingDataUpdateCoordinator(DataUpdateCoordinator[HERETravelTimeData]):
     """here_routing DataUpdateCoordinator."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         api_key: str,
         config: HERETravelTimeConfig,
     ) -> None:
@@ -54,6 +58,7 @@ class HERERoutingDataUpdateCoordinator(DataUpdateCoordinator[HERETravelTimeData]
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=DEFAULT_SCAN_INTERVAL),
         )
@@ -168,9 +173,12 @@ class HERETransitDataUpdateCoordinator(
 ):
     """HERETravelTime DataUpdateCoordinator."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         api_key: str,
         config: HERETravelTimeConfig,
     ) -> None:
@@ -178,6 +186,7 @@ class HERETransitDataUpdateCoordinator(
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=DEFAULT_SCAN_INTERVAL),
         )
diff --git a/homeassistant/components/here_travel_time/sensor.py b/homeassistant/components/here_travel_time/sensor.py
index 4d7566ef2e2..0f0cbb7d3cb 100644
--- a/homeassistant/components/here_travel_time/sensor.py
+++ b/homeassistant/components/here_travel_time/sensor.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
@@ -78,7 +78,7 @@ def sensor_descriptions(travel_mode: str) -> tuple[SensorEntityDescription, ...]
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add HERE travel time entities from a config_entry."""
 
diff --git a/homeassistant/components/here_travel_time/strings.json b/homeassistant/components/here_travel_time/strings.json
index cfa14a3e3ca..c0534fa7154 100644
--- a/homeassistant/components/here_travel_time/strings.json
+++ b/homeassistant/components/here_travel_time/strings.json
@@ -5,11 +5,11 @@
         "data": {
           "name": "[%key:common::config_flow::data::name%]",
           "api_key": "[%key:common::config_flow::data::api_key%]",
-          "mode": "Travel Mode"
+          "mode": "Travel mode"
         }
       },
       "origin_menu": {
-        "title": "Choose Origin",
+        "title": "Choose origin",
         "menu_options": {
           "origin_coordinates": "Using a map location",
           "origin_entity": "Using an entity"
@@ -28,7 +28,7 @@
         }
       },
       "destination_menu": {
-        "title": "Choose Destination",
+        "title": "Choose destination",
         "menu_options": {
           "destination_coordinates": "[%key:component::here_travel_time::config::step::origin_menu::menu_options::origin_coordinates%]",
           "destination_entity": "[%key:component::here_travel_time::config::step::origin_menu::menu_options::origin_entity%]"
@@ -60,13 +60,13 @@
     "step": {
       "init": {
         "data": {
-          "traffic_mode": "Traffic Mode",
-          "route_mode": "Route Mode",
+          "traffic_mode": "Traffic mode",
+          "route_mode": "Route mode",
           "unit_system": "Unit system"
         }
       },
       "time_menu": {
-        "title": "Choose Time Type",
+        "title": "Choose time type",
         "menu_options": {
           "departure_time": "Configure a departure time",
           "arrival_time": "Configure an arrival time",
@@ -74,15 +74,15 @@
         }
       },
       "departure_time": {
-        "title": "Choose Departure Time",
+        "title": "Choose departure time",
         "data": {
-          "departure_time": "Departure Time"
+          "departure_time": "Departure time"
         }
       },
       "arrival_time": {
-        "title": "Choose Arrival Time",
+        "title": "Choose arrival time",
         "data": {
-          "arrival_time": "Arrival Time"
+          "arrival_time": "Arrival time"
         }
       }
     }
diff --git a/homeassistant/components/hikvision/binary_sensor.py b/homeassistant/components/hikvision/binary_sensor.py
index 0656733db6b..76cca5079e4 100644
--- a/homeassistant/components/hikvision/binary_sensor.py
+++ b/homeassistant/components/hikvision/binary_sensor.py
@@ -27,7 +27,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import track_point_in_utc_time
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/hikvisioncam/switch.py b/homeassistant/components/hikvisioncam/switch.py
index 653d5a07174..aa16097f402 100644
--- a/homeassistant/components/hikvisioncam/switch.py
+++ b/homeassistant/components/hikvisioncam/switch.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
     STATE_ON,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/hisense_aehw4a1/__init__.py b/homeassistant/components/hisense_aehw4a1/__init__.py
index d20f6d13217..3694853fb5a 100644
--- a/homeassistant/components/hisense_aehw4a1/__init__.py
+++ b/homeassistant/components/hisense_aehw4a1/__init__.py
@@ -12,7 +12,7 @@ from homeassistant.components.climate import DOMAIN as CLIMATE_DOMAIN
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_IP_ADDRESS, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
diff --git a/homeassistant/components/hisense_aehw4a1/climate.py b/homeassistant/components/hisense_aehw4a1/climate.py
index 1dc1eaabcaa..cd9f3666e08 100644
--- a/homeassistant/components/hisense_aehw4a1/climate.py
+++ b/homeassistant/components/hisense_aehw4a1/climate.py
@@ -28,7 +28,7 @@ from homeassistant.components.climate import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, PRECISION_WHOLE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import CONF_IP_ADDRESS, DOMAIN
 
@@ -121,7 +121,7 @@ def _build_entity(device):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the AEH-W4A1 climate platform."""
     # Priority 1: manual config
diff --git a/homeassistant/components/history/__init__.py b/homeassistant/components/history/__init__.py
index ba4614bbc35..fd82b74b048 100644
--- a/homeassistant/components/history/__init__.py
+++ b/homeassistant/components/history/__init__.py
@@ -15,10 +15,10 @@ from homeassistant.components.recorder import get_instance, history
 from homeassistant.components.recorder.util import session_scope
 from homeassistant.const import CONF_EXCLUDE, CONF_INCLUDE
 from homeassistant.core import HomeAssistant, valid_entity_id
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entityfilter import INCLUDE_EXCLUDE_BASE_FILTER_SCHEMA
 from homeassistant.helpers.typing import ConfigType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import websocket_api
 from .const import DOMAIN
diff --git a/homeassistant/components/history/websocket_api.py b/homeassistant/components/history/websocket_api.py
index e6c91453213..c57e766eaed 100644
--- a/homeassistant/components/history/websocket_api.py
+++ b/homeassistant/components/history/websocket_api.py
@@ -35,8 +35,8 @@ from homeassistant.helpers.event import (
     async_track_state_change_event,
 )
 from homeassistant.helpers.json import json_bytes
+from homeassistant.util import dt as dt_util
 from homeassistant.util.async_ import create_eager_task
-import homeassistant.util.dt as dt_util
 
 from .const import EVENT_COALESCE_TIME, MAX_PENDING_HISTORY_STATES
 from .helpers import entities_may_have_state_changes_after, has_states_before
diff --git a/homeassistant/components/history_stats/data.py b/homeassistant/components/history_stats/data.py
index 83528b73f6f..a69abe26f6c 100644
--- a/homeassistant/components/history_stats/data.py
+++ b/homeassistant/components/history_stats/data.py
@@ -10,7 +10,7 @@ import math
 from homeassistant.components.recorder import get_instance, history
 from homeassistant.core import Event, EventStateChangedData, HomeAssistant, State
 from homeassistant.helpers.template import Template
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .helpers import async_calculate_period, floored_timestamp
 
diff --git a/homeassistant/components/history_stats/helpers.py b/homeassistant/components/history_stats/helpers.py
index 33a45d10735..99214a51369 100644
--- a/homeassistant/components/history_stats/helpers.py
+++ b/homeassistant/components/history_stats/helpers.py
@@ -9,7 +9,7 @@ import math
 from homeassistant.core import callback
 from homeassistant.exceptions import TemplateError
 from homeassistant.helpers.template import Template
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/history_stats/sensor.py b/homeassistant/components/history_stats/sensor.py
index e1241034aeb..6935b13bc3d 100644
--- a/homeassistant/components/history_stats/sensor.py
+++ b/homeassistant/components/history_stats/sensor.py
@@ -25,9 +25,12 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import PlatformNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.device import async_device_info_to_link_from_entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.reload import async_setup_reload_service
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
@@ -116,7 +119,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: HistoryStatsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the History stats sensor entry."""
 
diff --git a/homeassistant/components/history_stats/strings.json b/homeassistant/components/history_stats/strings.json
index aff2ac50bef..e10a72f6742 100644
--- a/homeassistant/components/history_stats/strings.json
+++ b/homeassistant/components/history_stats/strings.json
@@ -24,7 +24,7 @@
         }
       },
       "options": {
-        "description": "Read the documention for further details on how to configure the history stats sensor using these options.",
+        "description": "Read the documentation for further details on how to configure the history stats sensor using these options.",
         "data": {
           "start": "Start",
           "end": "End",
diff --git a/homeassistant/components/hitron_coda/device_tracker.py b/homeassistant/components/hitron_coda/device_tracker.py
index 2126f5834ce..25de2d8956e 100644
--- a/homeassistant/components/hitron_coda/device_tracker.py
+++ b/homeassistant/components/hitron_coda/device_tracker.py
@@ -16,7 +16,7 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_TYPE, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/hive/alarm_control_panel.py b/homeassistant/components/hive/alarm_control_panel.py
index 2b196ce820b..c2fe47642a0 100644
--- a/homeassistant/components/hive/alarm_control_panel.py
+++ b/homeassistant/components/hive/alarm_control_panel.py
@@ -11,7 +11,7 @@ from homeassistant.components.alarm_control_panel import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import HiveEntity
@@ -27,7 +27,9 @@ HIVETOHA = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Hive thermostat based on a config entry."""
 
diff --git a/homeassistant/components/hive/binary_sensor.py b/homeassistant/components/hive/binary_sensor.py
index d2938896f92..2076d592a7c 100644
--- a/homeassistant/components/hive/binary_sensor.py
+++ b/homeassistant/components/hive/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import HiveEntity
@@ -68,7 +68,9 @@ SENSOR_TYPES: tuple[BinarySensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Hive thermostat based on a config entry."""
 
diff --git a/homeassistant/components/hive/climate.py b/homeassistant/components/hive/climate.py
index c76379cf940..bd7553faa1a 100644
--- a/homeassistant/components/hive/climate.py
+++ b/homeassistant/components/hive/climate.py
@@ -19,7 +19,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import refresh_system
 from .const import (
@@ -58,7 +58,9 @@ _LOGGER = logging.getLogger()
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Hive thermostat based on a config entry."""
 
diff --git a/homeassistant/components/hive/light.py b/homeassistant/components/hive/light.py
index 8d09c902f36..80a81583429 100644
--- a/homeassistant/components/hive/light.py
+++ b/homeassistant/components/hive/light.py
@@ -14,8 +14,8 @@ from homeassistant.components.light import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.color as color_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import color as color_util
 
 from . import refresh_system
 from .const import ATTR_MODE, DOMAIN
@@ -29,7 +29,9 @@ SCAN_INTERVAL = timedelta(seconds=15)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Hive thermostat based on a config entry."""
 
diff --git a/homeassistant/components/hive/manifest.json b/homeassistant/components/hive/manifest.json
index f68478516ab..712ccf09cae 100644
--- a/homeassistant/components/hive/manifest.json
+++ b/homeassistant/components/hive/manifest.json
@@ -9,5 +9,5 @@
   },
   "iot_class": "cloud_polling",
   "loggers": ["apyhiveapi"],
-  "requirements": ["pyhive-integration==1.0.1"]
+  "requirements": ["pyhive-integration==1.0.2"]
 }
diff --git a/homeassistant/components/hive/sensor.py b/homeassistant/components/hive/sensor.py
index 00a2116e268..0609e43c4a9 100644
--- a/homeassistant/components/hive/sensor.py
+++ b/homeassistant/components/hive/sensor.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .const import DOMAIN
@@ -89,7 +89,9 @@ SENSOR_TYPES: tuple[HiveSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Hive thermostat based on a config entry."""
     hive = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/hive/strings.json b/homeassistant/components/hive/strings.json
index 219776ad7e6..6323a2eecbf 100644
--- a/homeassistant/components/hive/strings.json
+++ b/homeassistant/components/hive/strings.json
@@ -2,27 +2,27 @@
   "config": {
     "step": {
       "user": {
-        "title": "Hive Login",
+        "title": "Hive login",
         "description": "Enter your Hive login information.",
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
-          "scan_interval": "Scan Interval (seconds)"
+          "scan_interval": "Scan interval (seconds)"
         }
       },
       "2fa": {
-        "title": "Hive Two-factor Authentication.",
-        "description": "Enter your Hive authentication code. \n \n Please enter code 0000 to request another code.",
+        "title": "Hive two-factor authentication",
+        "description": "Enter your Hive authentication code.\n\nPlease enter code 0000 to request another code.",
         "data": {
           "2fa": "Two-factor code"
         }
       },
       "configuration": {
+        "title": "Hive configuration",
+        "description": "Enter your Hive configuration.",
         "data": {
-          "device_name": "Device Name"
-        },
-        "description": "Enter your Hive configuration",
-        "title": "Hive Configuration."
+          "device_name": "Device name"
+        }
       },
       "reauth": {
         "title": "[%key:component::hive::config::step::user::title%]",
@@ -37,7 +37,7 @@
       "invalid_username": "Failed to sign into Hive. Your email address is not recognised.",
       "invalid_password": "Failed to sign into Hive. Incorrect password, please try again.",
       "invalid_code": "Failed to sign into Hive. Your two-factor authentication code was incorrect.",
-      "no_internet_available": "An internet connection is required to connect to Hive.",
+      "no_internet_available": "An Internet connection is required to connect to Hive.",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
diff --git a/homeassistant/components/hive/switch.py b/homeassistant/components/hive/switch.py
index 1421616db57..d4fefea5a56 100644
--- a/homeassistant/components/hive/switch.py
+++ b/homeassistant/components/hive/switch.py
@@ -11,7 +11,7 @@ from homeassistant.components.switch import SwitchEntity, SwitchEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import refresh_system
 from .const import ATTR_MODE, DOMAIN
@@ -33,7 +33,9 @@ SWITCH_TYPES: tuple[SwitchEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Hive thermostat based on a config entry."""
 
diff --git a/homeassistant/components/hive/water_heater.py b/homeassistant/components/hive/water_heater.py
index b038739d2ad..5f0a3d0f3fa 100644
--- a/homeassistant/components/hive/water_heater.py
+++ b/homeassistant/components/hive/water_heater.py
@@ -14,7 +14,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_OFF, STATE_ON, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import refresh_system
 from .const import (
@@ -45,7 +45,9 @@ SUPPORT_WATER_HEATER = [STATE_ECO, STATE_ON, STATE_OFF]
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Hive thermostat based on a config entry."""
 
diff --git a/homeassistant/components/hko/__init__.py b/homeassistant/components/hko/__init__.py
index 5b06644580e..b7e21f731d8 100644
--- a/homeassistant/components/hko/__init__.py
+++ b/homeassistant/components/hko/__init__.py
@@ -25,7 +25,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     )[KEY_DISTRICT]
     websession = async_get_clientsession(hass)
 
-    coordinator = HKOUpdateCoordinator(hass, websession, district, location)
+    coordinator = HKOUpdateCoordinator(hass, entry, websession, district, location)
     await coordinator.async_config_entry_first_refresh()
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
 
diff --git a/homeassistant/components/hko/config_flow.py b/homeassistant/components/hko/config_flow.py
index 8548bb4767d..1e2a6230455 100644
--- a/homeassistant/components/hko/config_flow.py
+++ b/homeassistant/components/hko/config_flow.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from asyncio import timeout
+import logging
 from typing import Any
 
 from hko import HKO, LOCATIONS, HKOError
@@ -15,6 +16,8 @@ from homeassistant.helpers.selector import SelectSelector, SelectSelectorConfig
 
 from .const import API_RHRREAD, DEFAULT_LOCATION, DOMAIN, KEY_LOCATION
 
+_LOGGER = logging.getLogger(__name__)
+
 
 def get_loc_name(item):
     """Return an array of supported locations."""
@@ -54,7 +57,8 @@ class HKOConfigFlow(ConfigFlow, domain=DOMAIN):
 
         except HKOError:
             errors["base"] = "cannot_connect"
-        except Exception:  # noqa: BLE001
+        except Exception:
+            _LOGGER.exception("Unexpected exception")
             errors["base"] = "unknown"
         else:
             await self.async_set_unique_id(
diff --git a/homeassistant/components/hko/coordinator.py b/homeassistant/components/hko/coordinator.py
index 566ba5dcf5e..aede960e702 100644
--- a/homeassistant/components/hko/coordinator.py
+++ b/homeassistant/components/hko/coordinator.py
@@ -11,7 +11,6 @@ from hko import HKO, HKOError
 from homeassistant.components.weather import (
     ATTR_CONDITION_CLOUDY,
     ATTR_CONDITION_FOG,
-    ATTR_CONDITION_HAIL,
     ATTR_CONDITION_LIGHTNING_RAINY,
     ATTR_CONDITION_PARTLYCLOUDY,
     ATTR_CONDITION_POURING,
@@ -26,6 +25,7 @@ from homeassistant.components.weather import (
     ATTR_FORECAST_TEMP_LOW,
     ATTR_FORECAST_TIME,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -69,8 +69,15 @@ _LOGGER = logging.getLogger(__name__)
 class HKOUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """HKO Update Coordinator."""
 
+    config_entry: ConfigEntry
+
     def __init__(
-        self, hass: HomeAssistant, session: ClientSession, district: str, location: str
+        self,
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        session: ClientSession,
+        district: str,
+        location: str,
     ) -> None:
         """Update data via library."""
         self.location = location
@@ -80,6 +87,7 @@ class HKOUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(minutes=15),
         )
@@ -136,7 +144,7 @@ class HKOUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         """Return the condition corresponding to the weather info."""
         info = info.lower()
         if WEATHER_INFO_RAIN in info:
-            return ATTR_CONDITION_HAIL
+            return ATTR_CONDITION_RAINY
         if WEATHER_INFO_SNOW in info and WEATHER_INFO_RAIN in info:
             return ATTR_CONDITION_SNOWY_RAINY
         if WEATHER_INFO_SNOW in info:
diff --git a/homeassistant/components/hko/weather.py b/homeassistant/components/hko/weather.py
index 6d3d12d8ab4..e746d4304d3 100644
--- a/homeassistant/components/hko/weather.py
+++ b/homeassistant/components/hko/weather.py
@@ -9,7 +9,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
@@ -28,7 +28,7 @@ from .coordinator import HKOUpdateCoordinator
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add a HKO weather entity from a config_entry."""
     assert config_entry.unique_id is not None
diff --git a/homeassistant/components/hlk_sw16/__init__.py b/homeassistant/components/hlk_sw16/__init__.py
index ce37be96dcd..ebd92908b93 100644
--- a/homeassistant/components/hlk_sw16/__init__.py
+++ b/homeassistant/components/hlk_sw16/__init__.py
@@ -8,7 +8,7 @@ import voluptuous as vol
 from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT, CONF_SWITCHES, Platform
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/hlk_sw16/entity.py b/homeassistant/components/hlk_sw16/entity.py
index fdef5f6764b..91510760968 100644
--- a/homeassistant/components/hlk_sw16/entity.py
+++ b/homeassistant/components/hlk_sw16/entity.py
@@ -35,7 +35,7 @@ class SW16Entity(Entity):
         self.async_write_ha_state()
 
     @property
-    def available(self):
+    def available(self) -> bool:
         """Return True if entity is available."""
         return bool(self._client.is_connected)
 
@@ -44,7 +44,7 @@ class SW16Entity(Entity):
         """Update availability state."""
         self.async_write_ha_state()
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Register update callback."""
         self._client.register_status_callback(
             self.handle_event_callback, self._device_port
diff --git a/homeassistant/components/hlk_sw16/switch.py b/homeassistant/components/hlk_sw16/switch.py
index 3911dd6eab9..c6e6f7f5201 100644
--- a/homeassistant/components/hlk_sw16/switch.py
+++ b/homeassistant/components/hlk_sw16/switch.py
@@ -5,7 +5,7 @@ from typing import Any
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DATA_DEVICE_REGISTER
 from .const import DOMAIN
@@ -26,7 +26,9 @@ def devices_from_entities(hass, entry):
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the HLK-SW16 platform."""
     async_add_entities(devices_from_entities(hass, entry))
diff --git a/homeassistant/components/holiday/calendar.py b/homeassistant/components/holiday/calendar.py
index 6dccd972164..1c01319129b 100644
--- a/homeassistant/components/holiday/calendar.py
+++ b/homeassistant/components/holiday/calendar.py
@@ -11,7 +11,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_COUNTRY
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.util import dt as dt_util
 
@@ -69,7 +69,7 @@ def _get_obj_holidays_and_language(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Holiday Calendar config entry."""
     country: str = config_entry.data[CONF_COUNTRY]
diff --git a/homeassistant/components/holiday/manifest.json b/homeassistant/components/holiday/manifest.json
index edf3ebe7f04..4c73210c36e 100644
--- a/homeassistant/components/holiday/manifest.json
+++ b/homeassistant/components/holiday/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/holiday",
   "iot_class": "local_polling",
-  "requirements": ["holidays==0.65", "babel==2.15.0"]
+  "requirements": ["holidays==0.69", "babel==2.15.0"]
 }
diff --git a/homeassistant/components/home_connect/__init__.py b/homeassistant/components/home_connect/__init__.py
index d7c042c2a91..fe01a3e9564 100644
--- a/homeassistant/components/home_connect/__init__.py
+++ b/homeassistant/components/home_connect/__init__.py
@@ -2,94 +2,32 @@
 
 from __future__ import annotations
 
-from datetime import timedelta
 import logging
-import re
-from typing import Any, cast
+from typing import Any
 
-from requests import HTTPError
-import voluptuous as vol
+from aiohomeconnect.client import Client as HomeConnectClient
+import aiohttp
 
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_DEVICE_ID, Platform
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers import (
-    config_entry_oauth2_flow,
-    config_validation as cv,
-    device_registry as dr,
-)
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+from homeassistant.helpers import config_entry_oauth2_flow, config_validation as cv
 from homeassistant.helpers.entity_registry import RegistryEntry, async_migrate_entries
+from homeassistant.helpers.issue_registry import async_delete_issue
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.util import Throttle
 
-from . import api
-from .const import (
-    ATTR_KEY,
-    ATTR_PROGRAM,
-    ATTR_UNIT,
-    ATTR_VALUE,
-    BSH_PAUSE,
-    BSH_RESUME,
-    DOMAIN,
-    OLD_NEW_UNIQUE_ID_SUFFIX_MAP,
-    SERVICE_OPTION_ACTIVE,
-    SERVICE_OPTION_SELECTED,
-    SERVICE_PAUSE_PROGRAM,
-    SERVICE_RESUME_PROGRAM,
-    SERVICE_SELECT_PROGRAM,
-    SERVICE_SETTING,
-    SERVICE_START_PROGRAM,
-    SVE_TRANSLATION_PLACEHOLDER_KEY,
-    SVE_TRANSLATION_PLACEHOLDER_PROGRAM,
-    SVE_TRANSLATION_PLACEHOLDER_VALUE,
-)
-
-type HomeConnectConfigEntry = ConfigEntry[api.ConfigEntryAuth]
+from .api import AsyncConfigEntryAuth
+from .const import DOMAIN, OLD_NEW_UNIQUE_ID_SUFFIX_MAP
+from .coordinator import HomeConnectConfigEntry, HomeConnectCoordinator
+from .services import register_actions
 
 _LOGGER = logging.getLogger(__name__)
 
-RE_CAMEL_CASE = re.compile(r"(?<!^)(?=[A-Z])|(?=\d)(?<=\D)")
-
-SCAN_INTERVAL = timedelta(minutes=1)
-
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
-SERVICE_SETTING_SCHEMA = vol.Schema(
-    {
-        vol.Required(ATTR_DEVICE_ID): str,
-        vol.Required(ATTR_KEY): str,
-        vol.Required(ATTR_VALUE): vol.Any(str, int, bool),
-    }
-)
-
-SERVICE_OPTION_SCHEMA = vol.Schema(
-    {
-        vol.Required(ATTR_DEVICE_ID): str,
-        vol.Required(ATTR_KEY): str,
-        vol.Required(ATTR_VALUE): vol.Any(str, int, bool),
-        vol.Optional(ATTR_UNIT): str,
-    }
-)
-
-SERVICE_PROGRAM_SCHEMA = vol.Any(
-    {
-        vol.Required(ATTR_DEVICE_ID): str,
-        vol.Required(ATTR_PROGRAM): str,
-        vol.Required(ATTR_KEY): str,
-        vol.Required(ATTR_VALUE): vol.Any(int, str),
-        vol.Optional(ATTR_UNIT): str,
-    },
-    {
-        vol.Required(ATTR_DEVICE_ID): str,
-        vol.Required(ATTR_PROGRAM): str,
-    },
-)
-
-SERVICE_COMMAND_SCHEMA = vol.Schema({vol.Required(ATTR_DEVICE_ID): str})
-
 PLATFORMS = [
     Platform.BINARY_SENSOR,
+    Platform.BUTTON,
     Platform.LIGHT,
     Platform.NUMBER,
     Platform.SELECT,
@@ -99,219 +37,9 @@ PLATFORMS = [
 ]
 
 
-def _get_appliance(
-    hass: HomeAssistant,
-    device_id: str | None = None,
-    device_entry: dr.DeviceEntry | None = None,
-    entry: HomeConnectConfigEntry | None = None,
-) -> api.HomeConnectAppliance:
-    """Return a Home Connect appliance instance given a device id or a device entry."""
-    if device_id is not None and device_entry is None:
-        device_registry = dr.async_get(hass)
-        device_entry = device_registry.async_get(device_id)
-    assert device_entry, "Either a device id or a device entry must be provided"
-
-    ha_id = next(
-        (
-            identifier[1]
-            for identifier in device_entry.identifiers
-            if identifier[0] == DOMAIN
-        ),
-        None,
-    )
-    assert ha_id
-
-    def find_appliance(
-        entry: HomeConnectConfigEntry,
-    ) -> api.HomeConnectAppliance | None:
-        for device in entry.runtime_data.devices:
-            appliance = device.appliance
-            if appliance.haId == ha_id:
-                return appliance
-        return None
-
-    if entry is None:
-        for entry_id in device_entry.config_entries:
-            entry = hass.config_entries.async_get_entry(entry_id)
-            assert entry
-            if entry.domain == DOMAIN:
-                entry = cast(HomeConnectConfigEntry, entry)
-                if (appliance := find_appliance(entry)) is not None:
-                    return appliance
-    elif (appliance := find_appliance(entry)) is not None:
-        return appliance
-    raise ValueError(f"Appliance for device id {device_entry.id} not found")
-
-
-def _get_appliance_or_raise_service_validation_error(
-    hass: HomeAssistant, device_id: str
-) -> api.HomeConnectAppliance:
-    """Return a Home Connect appliance instance or raise a service validation error."""
-    try:
-        return _get_appliance(hass, device_id)
-    except (ValueError, AssertionError) as err:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="appliance_not_found",
-            translation_placeholders={
-                "device_id": device_id,
-            },
-        ) from err
-
-
-async def _run_appliance_service[*_Ts](
-    hass: HomeAssistant,
-    appliance: api.HomeConnectAppliance,
-    method: str,
-    *args: *_Ts,
-    error_translation_key: str,
-    error_translation_placeholders: dict[str, str],
-) -> None:
-    try:
-        await hass.async_add_executor_job(getattr(appliance, method), *args)
-    except api.HomeConnectError as err:
-        raise HomeAssistantError(
-            translation_domain=DOMAIN,
-            translation_key=error_translation_key,
-            translation_placeholders={
-                **get_dict_from_home_connect_error(err),
-                **error_translation_placeholders,
-            },
-        ) from err
-
-
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up Home Connect component."""
-
-    async def _async_service_program(call, method):
-        """Execute calls to services taking a program."""
-        program = call.data[ATTR_PROGRAM]
-        device_id = call.data[ATTR_DEVICE_ID]
-
-        options = []
-
-        option_key = call.data.get(ATTR_KEY)
-        if option_key is not None:
-            option = {ATTR_KEY: option_key, ATTR_VALUE: call.data[ATTR_VALUE]}
-
-            option_unit = call.data.get(ATTR_UNIT)
-            if option_unit is not None:
-                option[ATTR_UNIT] = option_unit
-
-            options.append(option)
-        await _run_appliance_service(
-            hass,
-            _get_appliance_or_raise_service_validation_error(hass, device_id),
-            method,
-            program,
-            options,
-            error_translation_key=method,
-            error_translation_placeholders={
-                SVE_TRANSLATION_PLACEHOLDER_PROGRAM: program,
-            },
-        )
-
-    async def _async_service_command(call, command):
-        """Execute calls to services executing a command."""
-        device_id = call.data[ATTR_DEVICE_ID]
-
-        appliance = _get_appliance_or_raise_service_validation_error(hass, device_id)
-        await _run_appliance_service(
-            hass,
-            appliance,
-            "execute_command",
-            command,
-            error_translation_key="execute_command",
-            error_translation_placeholders={"command": command},
-        )
-
-    async def _async_service_key_value(call, method):
-        """Execute calls to services taking a key and value."""
-        key = call.data[ATTR_KEY]
-        value = call.data[ATTR_VALUE]
-        unit = call.data.get(ATTR_UNIT)
-        device_id = call.data[ATTR_DEVICE_ID]
-
-        await _run_appliance_service(
-            hass,
-            _get_appliance_or_raise_service_validation_error(hass, device_id),
-            method,
-            *((key, value) if unit is None else (key, value, unit)),
-            error_translation_key=method,
-            error_translation_placeholders={
-                SVE_TRANSLATION_PLACEHOLDER_KEY: key,
-                SVE_TRANSLATION_PLACEHOLDER_VALUE: str(value),
-            },
-        )
-
-    async def async_service_option_active(call):
-        """Service for setting an option for an active program."""
-        await _async_service_key_value(call, "set_options_active_program")
-
-    async def async_service_option_selected(call):
-        """Service for setting an option for a selected program."""
-        await _async_service_key_value(call, "set_options_selected_program")
-
-    async def async_service_setting(call):
-        """Service for changing a setting."""
-        await _async_service_key_value(call, "set_setting")
-
-    async def async_service_pause_program(call):
-        """Service for pausing a program."""
-        await _async_service_command(call, BSH_PAUSE)
-
-    async def async_service_resume_program(call):
-        """Service for resuming a paused program."""
-        await _async_service_command(call, BSH_RESUME)
-
-    async def async_service_select_program(call):
-        """Service for selecting a program."""
-        await _async_service_program(call, "select_program")
-
-    async def async_service_start_program(call):
-        """Service for starting a program."""
-        await _async_service_program(call, "start_program")
-
-    hass.services.async_register(
-        DOMAIN,
-        SERVICE_OPTION_ACTIVE,
-        async_service_option_active,
-        schema=SERVICE_OPTION_SCHEMA,
-    )
-    hass.services.async_register(
-        DOMAIN,
-        SERVICE_OPTION_SELECTED,
-        async_service_option_selected,
-        schema=SERVICE_OPTION_SCHEMA,
-    )
-    hass.services.async_register(
-        DOMAIN, SERVICE_SETTING, async_service_setting, schema=SERVICE_SETTING_SCHEMA
-    )
-    hass.services.async_register(
-        DOMAIN,
-        SERVICE_PAUSE_PROGRAM,
-        async_service_pause_program,
-        schema=SERVICE_COMMAND_SCHEMA,
-    )
-    hass.services.async_register(
-        DOMAIN,
-        SERVICE_RESUME_PROGRAM,
-        async_service_resume_program,
-        schema=SERVICE_COMMAND_SCHEMA,
-    )
-    hass.services.async_register(
-        DOMAIN,
-        SERVICE_SELECT_PROGRAM,
-        async_service_select_program,
-        schema=SERVICE_PROGRAM_SCHEMA,
-    )
-    hass.services.async_register(
-        DOMAIN,
-        SERVICE_START_PROGRAM,
-        async_service_start_program,
-        schema=SERVICE_PROGRAM_SCHEMA,
-    )
-
+    register_actions(hass)
     return True
 
 
@@ -323,12 +51,34 @@ async def async_setup_entry(hass: HomeAssistant, entry: HomeConnectConfigEntry)
         )
     )
 
-    entry.runtime_data = api.ConfigEntryAuth(hass, entry, implementation)
+    session = config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation)
 
-    await update_all_devices(hass, entry)
+    config_entry_auth = AsyncConfigEntryAuth(hass, session)
+    try:
+        await config_entry_auth.async_get_access_token()
+    except aiohttp.ClientResponseError as err:
+        if 400 <= err.status < 500:
+            raise ConfigEntryAuthFailed from err
+        raise ConfigEntryNotReady from err
+    except aiohttp.ClientError as err:
+        raise ConfigEntryNotReady from err
+
+    home_connect_client = HomeConnectClient(config_entry_auth)
+
+    coordinator = HomeConnectCoordinator(hass, entry, home_connect_client)
+    await coordinator.async_setup()
+    entry.runtime_data = coordinator
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
+    entry.runtime_data.start_event_listener()
+
+    entry.async_create_background_task(
+        hass,
+        coordinator.async_refresh(),
+        f"home_connect-initial-full-refresh-{entry.entry_id}",
+    )
+
     return True
 
 
@@ -336,24 +86,11 @@ async def async_unload_entry(
     hass: HomeAssistant, entry: HomeConnectConfigEntry
 ) -> bool:
     """Unload a config entry."""
+    async_delete_issue(hass, DOMAIN, "deprecated_set_program_and_option_actions")
+    async_delete_issue(hass, DOMAIN, "deprecated_command_actions")
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
-@Throttle(SCAN_INTERVAL)
-async def update_all_devices(
-    hass: HomeAssistant, entry: HomeConnectConfigEntry
-) -> None:
-    """Update all the devices."""
-    hc_api = entry.runtime_data
-
-    try:
-        await hass.async_add_executor_job(hc_api.get_devices)
-        for device in hc_api.devices:
-            await hass.async_add_executor_job(device.initialize)
-    except HTTPError as err:
-        _LOGGER.warning("Cannot update devices: %s", err.response.status_code)
-
-
 async def async_migrate_entry(
     hass: HomeAssistant, entry: HomeConnectConfigEntry
 ) -> bool:
@@ -382,25 +119,3 @@ async def async_migrate_entry(
 
     _LOGGER.debug("Migration to version %s successful", entry.version)
     return True
-
-
-def get_dict_from_home_connect_error(err: api.HomeConnectError) -> dict[str, Any]:
-    """Return a dict from a Home Connect error."""
-    return {
-        "description": cast(dict[str, Any], err.args[0]).get("description", "?")
-        if len(err.args) > 0 and isinstance(err.args[0], dict)
-        else err.args[0]
-        if len(err.args) > 0 and isinstance(err.args[0], str)
-        else "?",
-    }
-
-
-def bsh_key_to_translation_key(bsh_key: str) -> str:
-    """Convert a BSH key to a translation key format.
-
-    This function takes a BSH key, such as `Dishcare.Dishwasher.Program.Eco50`,
-    and converts it to a translation key format, such as `dishcare_dishwasher_bsh_key_eco50`.
-    """
-    return "_".join(
-        RE_CAMEL_CASE.sub("_", split) for split in bsh_key.split(".")
-    ).lower()
diff --git a/homeassistant/components/home_connect/api.py b/homeassistant/components/home_connect/api.py
index 453f926c402..b66236c367d 100644
--- a/homeassistant/components/home_connect/api.py
+++ b/homeassistant/components/home_connect/api.py
@@ -1,85 +1,30 @@
 """API for Home Connect bound to HASS OAuth."""
 
-from asyncio import run_coroutine_threadsafe
-import logging
+from typing import cast
 
-import homeconnect
-from homeconnect.api import HomeConnectAppliance, HomeConnectError
+from aiohomeconnect.client import AbstractAuth
+from aiohomeconnect.const import API_ENDPOINT
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_entry_oauth2_flow
-from homeassistant.helpers.dispatcher import dispatcher_send
-
-from .const import ATTR_KEY, ATTR_VALUE, BSH_ACTIVE_PROGRAM, SIGNAL_UPDATE_ENTITIES
-
-_LOGGER = logging.getLogger(__name__)
+from homeassistant.helpers.httpx_client import get_async_client
 
 
-class ConfigEntryAuth(homeconnect.HomeConnectAPI):
+class AsyncConfigEntryAuth(AbstractAuth):
     """Provide Home Connect authentication tied to an OAuth2 based config entry."""
 
     def __init__(
         self,
         hass: HomeAssistant,
-        config_entry: ConfigEntry,
-        implementation: config_entry_oauth2_flow.AbstractOAuth2Implementation,
+        oauth_session: config_entry_oauth2_flow.OAuth2Session,
     ) -> None:
         """Initialize Home Connect Auth."""
         self.hass = hass
-        self.config_entry = config_entry
-        self.session = config_entry_oauth2_flow.OAuth2Session(
-            hass, config_entry, implementation
-        )
-        super().__init__(self.session.token)
-        self.devices: list[HomeConnectDevice] = []
+        super().__init__(get_async_client(hass), host=API_ENDPOINT)
+        self.session = oauth_session
 
-    def refresh_tokens(self) -> dict:
-        """Refresh and return new Home Connect tokens using Home Assistant OAuth2 session."""
-        run_coroutine_threadsafe(
-            self.session.async_ensure_token_valid(), self.hass.loop
-        ).result()
+    async def async_get_access_token(self) -> str:
+        """Return a valid access token."""
+        await self.session.async_ensure_token_valid()
 
-        return self.session.token
-
-    def get_devices(self) -> list[HomeConnectAppliance]:
-        """Get a dictionary of devices."""
-        appl: list[HomeConnectAppliance] = self.get_appliances()
-        self.devices = [HomeConnectDevice(self.hass, app) for app in appl]
-        return self.devices
-
-
-class HomeConnectDevice:
-    """Generic Home Connect device."""
-
-    def __init__(self, hass: HomeAssistant, appliance: HomeConnectAppliance) -> None:
-        """Initialize the device class."""
-        self.hass = hass
-        self.appliance = appliance
-
-    def initialize(self) -> None:
-        """Fetch the info needed to initialize the device."""
-        try:
-            self.appliance.get_status()
-        except (HomeConnectError, ValueError):
-            _LOGGER.debug("Unable to fetch appliance status. Probably offline")
-        try:
-            self.appliance.get_settings()
-        except (HomeConnectError, ValueError):
-            _LOGGER.debug("Unable to fetch settings. Probably offline")
-        try:
-            program_active = self.appliance.get_programs_active()
-        except (HomeConnectError, ValueError):
-            _LOGGER.debug("Unable to fetch active programs. Probably offline")
-            program_active = None
-        if program_active and ATTR_KEY in program_active:
-            self.appliance.status[BSH_ACTIVE_PROGRAM] = {
-                ATTR_VALUE: program_active[ATTR_KEY]
-            }
-        self.appliance.listen_events(callback=self.event_callback)
-
-    def event_callback(self, appliance: HomeConnectAppliance) -> None:
-        """Handle event."""
-        _LOGGER.debug("Update triggered on %s", appliance.name)
-        _LOGGER.debug(self.appliance.status)
-        dispatcher_send(self.hass, SIGNAL_UPDATE_ENTITIES, appliance.haId)
+        return cast(str, self.session.token["access_token"])
diff --git a/homeassistant/components/home_connect/application_credentials.py b/homeassistant/components/home_connect/application_credentials.py
index 3d5a407b487..d66255e6810 100644
--- a/homeassistant/components/home_connect/application_credentials.py
+++ b/homeassistant/components/home_connect/application_credentials.py
@@ -1,10 +1,10 @@
 """Application credentials platform for Home Connect."""
 
+from aiohomeconnect.const import OAUTH2_AUTHORIZE, OAUTH2_TOKEN
+
 from homeassistant.components.application_credentials import AuthorizationServer
 from homeassistant.core import HomeAssistant
 
-from .const import OAUTH2_AUTHORIZE, OAUTH2_TOKEN
-
 
 async def async_get_authorization_server(hass: HomeAssistant) -> AuthorizationServer:
     """Return authorization server."""
diff --git a/homeassistant/components/home_connect/binary_sensor.py b/homeassistant/components/home_connect/binary_sensor.py
index f9775918f16..a28b4ff2b49 100644
--- a/homeassistant/components/home_connect/binary_sensor.py
+++ b/homeassistant/components/home_connect/binary_sensor.py
@@ -1,7 +1,9 @@
 """Provides a binary sensor for Home Connect."""
 
 from dataclasses import dataclass
-import logging
+from typing import cast
+
+from aiohomeconnect.model import EventKey, StatusKey
 
 from homeassistant.components.automation import automations_with_entity
 from homeassistant.components.binary_sensor import (
@@ -10,35 +12,34 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.components.script import scripts_with_entity
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.issue_registry import (
     IssueSeverity,
     async_create_issue,
     async_delete_issue,
 )
 
-from . import HomeConnectConfigEntry
-from .api import HomeConnectDevice
+from .common import setup_home_connect_entry
 from .const import (
-    ATTR_VALUE,
-    BSH_DOOR_STATE,
     BSH_DOOR_STATE_CLOSED,
     BSH_DOOR_STATE_LOCKED,
     BSH_DOOR_STATE_OPEN,
-    BSH_REMOTE_CONTROL_ACTIVATION_STATE,
-    BSH_REMOTE_START_ALLOWANCE_STATE,
     DOMAIN,
-    REFRIGERATION_STATUS_DOOR_CHILLER,
     REFRIGERATION_STATUS_DOOR_CLOSED,
-    REFRIGERATION_STATUS_DOOR_FREEZER,
     REFRIGERATION_STATUS_DOOR_OPEN,
-    REFRIGERATION_STATUS_DOOR_REFRIGERATOR,
+)
+from .coordinator import (
+    HomeConnectApplianceData,
+    HomeConnectConfigEntry,
+    HomeConnectCoordinator,
 )
 from .entity import HomeConnectEntity
 
-_LOGGER = logging.getLogger(__name__)
+PARALLEL_UPDATES = 0
+
 REFRIGERATION_DOOR_BOOLEAN_MAP = {
     REFRIGERATION_STATUS_DOOR_CLOSED: False,
     REFRIGERATION_STATUS_DOOR_OPEN: True,
@@ -54,19 +55,19 @@ class HomeConnectBinarySensorEntityDescription(BinarySensorEntityDescription):
 
 BINARY_SENSORS = (
     HomeConnectBinarySensorEntityDescription(
-        key=BSH_REMOTE_CONTROL_ACTIVATION_STATE,
+        key=StatusKey.BSH_COMMON_REMOTE_CONTROL_ACTIVE,
         translation_key="remote_control",
     ),
     HomeConnectBinarySensorEntityDescription(
-        key=BSH_REMOTE_START_ALLOWANCE_STATE,
+        key=StatusKey.BSH_COMMON_REMOTE_CONTROL_START_ALLOWED,
         translation_key="remote_start",
     ),
     HomeConnectBinarySensorEntityDescription(
-        key="BSH.Common.Status.LocalControlActive",
+        key=StatusKey.BSH_COMMON_LOCAL_CONTROL_ACTIVE,
         translation_key="local_control",
     ),
     HomeConnectBinarySensorEntityDescription(
-        key="BSH.Common.Status.BatteryChargingState",
+        key=StatusKey.BSH_COMMON_BATTERY_CHARGING_STATE,
         device_class=BinarySensorDeviceClass.BATTERY_CHARGING,
         boolean_map={
             "BSH.Common.EnumType.BatteryChargingState.Charging": True,
@@ -75,7 +76,7 @@ BINARY_SENSORS = (
         translation_key="battery_charging_state",
     ),
     HomeConnectBinarySensorEntityDescription(
-        key="BSH.Common.Status.ChargingConnection",
+        key=StatusKey.BSH_COMMON_CHARGING_CONNECTION,
         device_class=BinarySensorDeviceClass.PLUG,
         boolean_map={
             "BSH.Common.EnumType.ChargingConnection.Connected": True,
@@ -84,58 +85,110 @@ BINARY_SENSORS = (
         translation_key="charging_connection",
     ),
     HomeConnectBinarySensorEntityDescription(
-        key="ConsumerProducts.CleaningRobot.Status.DustBoxInserted",
+        key=StatusKey.CONSUMER_PRODUCTS_CLEANING_ROBOT_DUST_BOX_INSERTED,
         translation_key="dust_box_inserted",
     ),
     HomeConnectBinarySensorEntityDescription(
-        key="ConsumerProducts.CleaningRobot.Status.Lifted",
+        key=StatusKey.CONSUMER_PRODUCTS_CLEANING_ROBOT_LIFTED,
         translation_key="lifted",
     ),
     HomeConnectBinarySensorEntityDescription(
-        key="ConsumerProducts.CleaningRobot.Status.Lost",
+        key=StatusKey.CONSUMER_PRODUCTS_CLEANING_ROBOT_LOST,
         translation_key="lost",
     ),
     HomeConnectBinarySensorEntityDescription(
-        key=REFRIGERATION_STATUS_DOOR_CHILLER,
+        key=StatusKey.REFRIGERATION_COMMON_DOOR_BOTTLE_COOLER,
+        boolean_map=REFRIGERATION_DOOR_BOOLEAN_MAP,
+        device_class=BinarySensorDeviceClass.DOOR,
+        translation_key="bottle_cooler_door",
+    ),
+    HomeConnectBinarySensorEntityDescription(
+        key=StatusKey.REFRIGERATION_COMMON_DOOR_CHILLER_COMMON,
+        boolean_map=REFRIGERATION_DOOR_BOOLEAN_MAP,
+        device_class=BinarySensorDeviceClass.DOOR,
+        translation_key="common_chiller_door",
+    ),
+    HomeConnectBinarySensorEntityDescription(
+        key=StatusKey.REFRIGERATION_COMMON_DOOR_CHILLER,
         boolean_map=REFRIGERATION_DOOR_BOOLEAN_MAP,
         device_class=BinarySensorDeviceClass.DOOR,
         translation_key="chiller_door",
     ),
     HomeConnectBinarySensorEntityDescription(
-        key=REFRIGERATION_STATUS_DOOR_FREEZER,
+        key=StatusKey.REFRIGERATION_COMMON_DOOR_CHILLER_LEFT,
+        boolean_map=REFRIGERATION_DOOR_BOOLEAN_MAP,
+        device_class=BinarySensorDeviceClass.DOOR,
+        translation_key="left_chiller_door",
+    ),
+    HomeConnectBinarySensorEntityDescription(
+        key=StatusKey.REFRIGERATION_COMMON_DOOR_CHILLER_RIGHT,
+        boolean_map=REFRIGERATION_DOOR_BOOLEAN_MAP,
+        device_class=BinarySensorDeviceClass.DOOR,
+        translation_key="right_chiller_door",
+    ),
+    HomeConnectBinarySensorEntityDescription(
+        key=StatusKey.REFRIGERATION_COMMON_DOOR_FLEX_COMPARTMENT,
+        boolean_map=REFRIGERATION_DOOR_BOOLEAN_MAP,
+        device_class=BinarySensorDeviceClass.DOOR,
+        translation_key="flex_compartment_door",
+    ),
+    HomeConnectBinarySensorEntityDescription(
+        key=StatusKey.REFRIGERATION_COMMON_DOOR_FREEZER,
         boolean_map=REFRIGERATION_DOOR_BOOLEAN_MAP,
         device_class=BinarySensorDeviceClass.DOOR,
         translation_key="freezer_door",
     ),
     HomeConnectBinarySensorEntityDescription(
-        key=REFRIGERATION_STATUS_DOOR_REFRIGERATOR,
+        key=StatusKey.REFRIGERATION_COMMON_DOOR_REFRIGERATOR,
         boolean_map=REFRIGERATION_DOOR_BOOLEAN_MAP,
         device_class=BinarySensorDeviceClass.DOOR,
         translation_key="refrigerator_door",
     ),
+    HomeConnectBinarySensorEntityDescription(
+        key=StatusKey.REFRIGERATION_COMMON_DOOR_WINE_COMPARTMENT,
+        boolean_map=REFRIGERATION_DOOR_BOOLEAN_MAP,
+        device_class=BinarySensorDeviceClass.DOOR,
+        translation_key="wine_compartment_door",
+    ),
 )
 
+CONNECTED_BINARY_ENTITY_DESCRIPTION = BinarySensorEntityDescription(
+    key=EventKey.BSH_COMMON_APPLIANCE_CONNECTED,
+    device_class=BinarySensorDeviceClass.CONNECTIVITY,
+)
+
+
+def _get_entities_for_appliance(
+    entry: HomeConnectConfigEntry,
+    appliance: HomeConnectApplianceData,
+) -> list[HomeConnectEntity]:
+    """Get a list of entities."""
+    entities: list[HomeConnectEntity] = [
+        HomeConnectConnectivityBinarySensor(
+            entry.runtime_data, appliance, CONNECTED_BINARY_ENTITY_DESCRIPTION
+        )
+    ]
+    entities.extend(
+        HomeConnectBinarySensor(entry.runtime_data, appliance, description)
+        for description in BINARY_SENSORS
+        if description.key in appliance.status
+    )
+    if StatusKey.BSH_COMMON_DOOR_STATE in appliance.status:
+        entities.append(HomeConnectDoorBinarySensor(entry.runtime_data, appliance))
+    return entities
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: HomeConnectConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Home Connect binary sensor."""
-
-    def get_entities() -> list[BinarySensorEntity]:
-        entities: list[BinarySensorEntity] = []
-        for device in entry.runtime_data.devices:
-            entities.extend(
-                HomeConnectBinarySensor(device, description)
-                for description in BINARY_SENSORS
-                if description.key in device.appliance.status
-            )
-            if BSH_DOOR_STATE in device.appliance.status:
-                entities.append(HomeConnectDoorBinarySensor(device))
-        return entities
-
-    async_add_entities(await hass.async_add_executor_job(get_entities), True)
+    setup_home_connect_entry(
+        entry,
+        _get_entities_for_appliance,
+        async_add_entities,
+    )
 
 
 class HomeConnectBinarySensor(HomeConnectEntity, BinarySensorEntity):
@@ -143,25 +196,30 @@ class HomeConnectBinarySensor(HomeConnectEntity, BinarySensorEntity):
 
     entity_description: HomeConnectBinarySensorEntityDescription
 
+    def update_native_value(self) -> None:
+        """Set the native value of the binary sensor."""
+        status = self.appliance.status[cast(StatusKey, self.bsh_key)].value
+        if isinstance(status, bool):
+            self._attr_is_on = status
+        elif self.entity_description.boolean_map:
+            self._attr_is_on = self.entity_description.boolean_map.get(status)
+        else:
+            self._attr_is_on = None
+
+
+class HomeConnectConnectivityBinarySensor(HomeConnectEntity, BinarySensorEntity):
+    """Binary sensor for Home Connect appliance's connection status."""
+
+    _attr_entity_category = EntityCategory.DIAGNOSTIC
+
+    def update_native_value(self) -> None:
+        """Set the native value of the binary sensor."""
+        self._attr_is_on = self.appliance.info.connected
+
     @property
     def available(self) -> bool:
-        """Return true if the binary sensor is available."""
-        return self._attr_is_on is not None
-
-    async def async_update(self) -> None:
-        """Update the binary sensor's status."""
-        if not self.device.appliance.status or not (
-            status := self.device.appliance.status.get(self.bsh_key, {}).get(ATTR_VALUE)
-        ):
-            self._attr_is_on = None
-            return
-        if self.entity_description.boolean_map:
-            self._attr_is_on = self.entity_description.boolean_map.get(status)
-        elif status not in [True, False]:
-            self._attr_is_on = None
-        else:
-            self._attr_is_on = status
-        _LOGGER.debug("Updated, new state: %s", self._attr_is_on)
+        """Return the availability."""
+        return self.coordinator.last_update_success
 
 
 class HomeConnectDoorBinarySensor(HomeConnectBinarySensor):
@@ -171,23 +229,26 @@ class HomeConnectDoorBinarySensor(HomeConnectBinarySensor):
 
     def __init__(
         self,
-        device: HomeConnectDevice,
+        coordinator: HomeConnectCoordinator,
+        appliance: HomeConnectApplianceData,
     ) -> None:
         """Initialize the entity."""
         super().__init__(
-            device,
+            coordinator,
+            appliance,
             HomeConnectBinarySensorEntityDescription(
-                key=BSH_DOOR_STATE,
+                key=StatusKey.BSH_COMMON_DOOR_STATE,
                 device_class=BinarySensorDeviceClass.DOOR,
                 boolean_map={
                     BSH_DOOR_STATE_CLOSED: False,
                     BSH_DOOR_STATE_LOCKED: False,
                     BSH_DOOR_STATE_OPEN: True,
                 },
+                entity_registry_enabled_default=False,
             ),
         )
-        self._attr_unique_id = f"{device.appliance.haId}-Door"
-        self._attr_name = f"{device.appliance.name} Door"
+        self._attr_unique_id = f"{appliance.info.ha_id}-Door"
+        self._attr_name = f"{appliance.info.name} Door"
 
     async def async_added_to_hass(self) -> None:
         """Call when entity is added to hass."""
@@ -223,7 +284,8 @@ class HomeConnectDoorBinarySensor(HomeConnectBinarySensor):
             DOMAIN,
             f"deprecated_binary_common_door_sensor_{self.entity_id}",
             breaks_in_ha_version="2025.5.0",
-            is_fixable=False,
+            is_fixable=True,
+            is_persistent=True,
             severity=IssueSeverity.WARNING,
             translation_key="deprecated_binary_common_door_sensor",
             translation_placeholders={
@@ -234,6 +296,7 @@ class HomeConnectDoorBinarySensor(HomeConnectBinarySensor):
 
     async def async_will_remove_from_hass(self) -> None:
         """Call when entity will be removed from hass."""
+        await super().async_will_remove_from_hass()
         async_delete_issue(
             self.hass, DOMAIN, f"deprecated_binary_common_door_sensor_{self.entity_id}"
         )
diff --git a/homeassistant/components/home_connect/button.py b/homeassistant/components/home_connect/button.py
new file mode 100644
index 00000000000..0bd31c6b7c9
--- /dev/null
+++ b/homeassistant/components/home_connect/button.py
@@ -0,0 +1,156 @@
+"""Provides button entities for Home Connect."""
+
+from aiohomeconnect.model import CommandKey
+from aiohomeconnect.model.error import HomeConnectError
+
+from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .common import setup_home_connect_entry
+from .const import APPLIANCES_WITH_PROGRAMS, DOMAIN
+from .coordinator import (
+    HomeConnectApplianceData,
+    HomeConnectConfigEntry,
+    HomeConnectCoordinator,
+)
+from .entity import HomeConnectEntity
+from .utils import get_dict_from_home_connect_error
+
+PARALLEL_UPDATES = 1
+
+
+class HomeConnectCommandButtonEntityDescription(ButtonEntityDescription):
+    """Describes Home Connect button entity."""
+
+    key: CommandKey
+
+
+COMMAND_BUTTONS = (
+    HomeConnectCommandButtonEntityDescription(
+        key=CommandKey.BSH_COMMON_OPEN_DOOR,
+        translation_key="open_door",
+    ),
+    HomeConnectCommandButtonEntityDescription(
+        key=CommandKey.BSH_COMMON_PARTLY_OPEN_DOOR,
+        translation_key="partly_open_door",
+    ),
+    HomeConnectCommandButtonEntityDescription(
+        key=CommandKey.BSH_COMMON_PAUSE_PROGRAM,
+        translation_key="pause_program",
+    ),
+    HomeConnectCommandButtonEntityDescription(
+        key=CommandKey.BSH_COMMON_RESUME_PROGRAM,
+        translation_key="resume_program",
+    ),
+)
+
+
+def _get_entities_for_appliance(
+    entry: HomeConnectConfigEntry,
+    appliance: HomeConnectApplianceData,
+) -> list[HomeConnectEntity]:
+    """Get a list of entities."""
+    entities: list[HomeConnectEntity] = []
+    entities.extend(
+        HomeConnectCommandButtonEntity(entry.runtime_data, appliance, description)
+        for description in COMMAND_BUTTONS
+        if description.key in appliance.commands
+    )
+    if appliance.info.type in APPLIANCES_WITH_PROGRAMS:
+        entities.append(
+            HomeConnectStopProgramButtonEntity(entry.runtime_data, appliance)
+        )
+
+    return entities
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: HomeConnectConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the Home Connect button entities."""
+    setup_home_connect_entry(
+        entry,
+        _get_entities_for_appliance,
+        async_add_entities,
+    )
+
+
+class HomeConnectButtonEntity(HomeConnectEntity, ButtonEntity):
+    """Describes Home Connect button entity."""
+
+    entity_description: ButtonEntityDescription
+
+    def __init__(
+        self,
+        coordinator: HomeConnectCoordinator,
+        appliance: HomeConnectApplianceData,
+        desc: ButtonEntityDescription,
+    ) -> None:
+        """Initialize the entity."""
+        super().__init__(
+            coordinator,
+            appliance,
+            desc,
+            (appliance.info.ha_id,),
+        )
+
+    def update_native_value(self) -> None:
+        """Set the value of the entity."""
+
+
+class HomeConnectCommandButtonEntity(HomeConnectButtonEntity):
+    """Button entity for Home Connect commands."""
+
+    entity_description: HomeConnectCommandButtonEntityDescription
+
+    async def async_press(self) -> None:
+        """Press the button."""
+        try:
+            await self.coordinator.client.put_command(
+                self.appliance.info.ha_id,
+                command_key=self.entity_description.key,
+                value=True,
+            )
+        except HomeConnectError as error:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="execute_command",
+                translation_placeholders={
+                    **get_dict_from_home_connect_error(error),
+                    "command": self.entity_description.key,
+                },
+            ) from error
+
+
+class HomeConnectStopProgramButtonEntity(HomeConnectButtonEntity):
+    """Button entity for stopping a program."""
+
+    def __init__(
+        self,
+        coordinator: HomeConnectCoordinator,
+        appliance: HomeConnectApplianceData,
+    ) -> None:
+        """Initialize the entity."""
+        super().__init__(
+            coordinator,
+            appliance,
+            ButtonEntityDescription(
+                key="StopProgram",
+                translation_key="stop_program",
+            ),
+        )
+
+    async def async_press(self) -> None:
+        """Press the button."""
+        try:
+            await self.coordinator.client.stop_program(self.appliance.info.ha_id)
+        except HomeConnectError as error:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="stop_program",
+                translation_placeholders=get_dict_from_home_connect_error(error),
+            ) from error
diff --git a/homeassistant/components/home_connect/common.py b/homeassistant/components/home_connect/common.py
new file mode 100644
index 00000000000..cd3fefad80c
--- /dev/null
+++ b/homeassistant/components/home_connect/common.py
@@ -0,0 +1,167 @@
+"""Common callbacks for all Home Connect platforms."""
+
+from collections import defaultdict
+from collections.abc import Callable
+from functools import partial
+from typing import cast
+
+from aiohomeconnect.model import EventKey
+
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import HomeConnectApplianceData, HomeConnectConfigEntry
+from .entity import HomeConnectEntity, HomeConnectOptionEntity
+
+
+def _create_option_entities(
+    entry: HomeConnectConfigEntry,
+    appliance: HomeConnectApplianceData,
+    known_entity_unique_ids: dict[str, str],
+    get_option_entities_for_appliance: Callable[
+        [HomeConnectConfigEntry, HomeConnectApplianceData],
+        list[HomeConnectOptionEntity],
+    ],
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Create the required option entities for the appliances."""
+    option_entities_to_add = [
+        entity
+        for entity in get_option_entities_for_appliance(entry, appliance)
+        if entity.unique_id not in known_entity_unique_ids
+    ]
+    known_entity_unique_ids.update(
+        {
+            cast(str, entity.unique_id): appliance.info.ha_id
+            for entity in option_entities_to_add
+        }
+    )
+    async_add_entities(option_entities_to_add)
+
+
+def _handle_paired_or_connected_appliance(
+    entry: HomeConnectConfigEntry,
+    known_entity_unique_ids: dict[str, str],
+    get_entities_for_appliance: Callable[
+        [HomeConnectConfigEntry, HomeConnectApplianceData], list[HomeConnectEntity]
+    ],
+    get_option_entities_for_appliance: Callable[
+        [HomeConnectConfigEntry, HomeConnectApplianceData],
+        list[HomeConnectOptionEntity],
+    ]
+    | None,
+    changed_options_listener_remove_callbacks: dict[str, list[Callable[[], None]]],
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Handle a new paired appliance or an appliance that has been connected.
+
+    This function is used to handle connected events also, because some appliances
+    don't report any data while they are off because they disconnect themselves
+    when they are turned off, so we need to check if the entities have been added
+    already or it is the first time we see them when the appliance is connected.
+    """
+    entities: list[HomeConnectEntity] = []
+    for appliance in entry.runtime_data.data.values():
+        entities_to_add = [
+            entity
+            for entity in get_entities_for_appliance(entry, appliance)
+            if entity.unique_id not in known_entity_unique_ids
+        ]
+        if get_option_entities_for_appliance:
+            entities_to_add.extend(
+                entity
+                for entity in get_option_entities_for_appliance(entry, appliance)
+                if entity.unique_id not in known_entity_unique_ids
+            )
+            for event_key in (
+                EventKey.BSH_COMMON_ROOT_ACTIVE_PROGRAM,
+                EventKey.BSH_COMMON_ROOT_SELECTED_PROGRAM,
+            ):
+                changed_options_listener_remove_callback = (
+                    entry.runtime_data.async_add_listener(
+                        partial(
+                            _create_option_entities,
+                            entry,
+                            appliance,
+                            known_entity_unique_ids,
+                            get_option_entities_for_appliance,
+                            async_add_entities,
+                        ),
+                        (appliance.info.ha_id, event_key),
+                    )
+                )
+                entry.async_on_unload(changed_options_listener_remove_callback)
+                changed_options_listener_remove_callbacks[appliance.info.ha_id].append(
+                    changed_options_listener_remove_callback
+                )
+        known_entity_unique_ids.update(
+            {
+                cast(str, entity.unique_id): appliance.info.ha_id
+                for entity in entities_to_add
+            }
+        )
+        entities.extend(entities_to_add)
+    async_add_entities(entities)
+
+
+def _handle_depaired_appliance(
+    entry: HomeConnectConfigEntry,
+    known_entity_unique_ids: dict[str, str],
+    changed_options_listener_remove_callbacks: dict[str, list[Callable[[], None]]],
+) -> None:
+    """Handle a removed appliance."""
+    for entity_unique_id, appliance_id in known_entity_unique_ids.copy().items():
+        if appliance_id not in entry.runtime_data.data:
+            known_entity_unique_ids.pop(entity_unique_id, None)
+            if appliance_id in changed_options_listener_remove_callbacks:
+                for listener in changed_options_listener_remove_callbacks.pop(
+                    appliance_id
+                ):
+                    listener()
+
+
+def setup_home_connect_entry(
+    entry: HomeConnectConfigEntry,
+    get_entities_for_appliance: Callable[
+        [HomeConnectConfigEntry, HomeConnectApplianceData], list[HomeConnectEntity]
+    ],
+    async_add_entities: AddConfigEntryEntitiesCallback,
+    get_option_entities_for_appliance: Callable[
+        [HomeConnectConfigEntry, HomeConnectApplianceData],
+        list[HomeConnectOptionEntity],
+    ]
+    | None = None,
+) -> None:
+    """Set up the callbacks for paired and depaired appliances."""
+    known_entity_unique_ids: dict[str, str] = {}
+    changed_options_listener_remove_callbacks: dict[str, list[Callable[[], None]]] = (
+        defaultdict(list)
+    )
+
+    entry.async_on_unload(
+        entry.runtime_data.async_add_special_listener(
+            partial(
+                _handle_paired_or_connected_appliance,
+                entry,
+                known_entity_unique_ids,
+                get_entities_for_appliance,
+                get_option_entities_for_appliance,
+                changed_options_listener_remove_callbacks,
+                async_add_entities,
+            ),
+            (
+                EventKey.BSH_COMMON_APPLIANCE_PAIRED,
+                EventKey.BSH_COMMON_APPLIANCE_CONNECTED,
+            ),
+        )
+    )
+    entry.async_on_unload(
+        entry.runtime_data.async_add_special_listener(
+            partial(
+                _handle_depaired_appliance,
+                entry,
+                known_entity_unique_ids,
+                changed_options_listener_remove_callbacks,
+            ),
+            (EventKey.BSH_COMMON_APPLIANCE_DEPAIRED,),
+        )
+    )
diff --git a/homeassistant/components/home_connect/config_flow.py b/homeassistant/components/home_connect/config_flow.py
index 444ea24cb6b..02a3ca29335 100644
--- a/homeassistant/components/home_connect/config_flow.py
+++ b/homeassistant/components/home_connect/config_flow.py
@@ -1,7 +1,12 @@
 """Config flow for Home Connect."""
 
+from collections.abc import Mapping
 import logging
+from typing import Any
 
+import voluptuous as vol
+
+from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
 from homeassistant.helpers import config_entry_oauth2_flow
 
 from .const import DOMAIN
@@ -20,3 +25,29 @@ class OAuth2FlowHandler(
     def logger(self) -> logging.Logger:
         """Return logger."""
         return logging.getLogger(__name__)
+
+    async def async_step_reauth(
+        self, entry_data: Mapping[str, Any]
+    ) -> ConfigFlowResult:
+        """Perform reauth upon an API authentication error."""
+        return await self.async_step_reauth_confirm()
+
+    async def async_step_reauth_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Dialog that informs the user that reauth is required."""
+        if user_input is None:
+            return self.async_show_form(
+                step_id="reauth_confirm",
+                data_schema=vol.Schema({}),
+            )
+        return await self.async_step_user()
+
+    async def async_oauth_create_entry(self, data: dict) -> ConfigFlowResult:
+        """Create an oauth config entry or update existing entry for reauth."""
+        if self.source == SOURCE_REAUTH:
+            return self.async_update_reload_and_abort(
+                self._get_reauth_entry(),
+                data_updates=data,
+            )
+        return await super().async_oauth_create_entry(data)
diff --git a/homeassistant/components/home_connect/const.py b/homeassistant/components/home_connect/const.py
index e20cf3b1fa0..64bf4af29a4 100644
--- a/homeassistant/components/home_connect/const.py
+++ b/homeassistant/components/home_connect/const.py
@@ -1,9 +1,16 @@
 """Constants for the Home Connect integration."""
 
+from typing import cast
+
+from aiohomeconnect.model import EventKey, OptionKey, ProgramKey, SettingKey, StatusKey
+
+from homeassistant.const import UnitOfTemperature, UnitOfTime, UnitOfVolume
+
+from .utils import bsh_key_to_translation_key
+
 DOMAIN = "home_connect"
 
-OAUTH2_AUTHORIZE = "https://api.home-connect.com/security/oauth/authorize"
-OAUTH2_TOKEN = "https://api.home-connect.com/security/oauth/token"
+API_DEFAULT_RETRY_AFTER = 60
 
 APPLIANCES_WITH_PROGRAMS = (
     "CleaningRobot",
@@ -17,147 +24,350 @@ APPLIANCES_WITH_PROGRAMS = (
     "WasherDryer",
 )
 
-BSH_POWER_STATE = "BSH.Common.Setting.PowerState"
+UNIT_MAP = {
+    "seconds": UnitOfTime.SECONDS,
+    "ml": UnitOfVolume.MILLILITERS,
+    "°C": UnitOfTemperature.CELSIUS,
+    "°F": UnitOfTemperature.FAHRENHEIT,
+}
+
+
 BSH_POWER_ON = "BSH.Common.EnumType.PowerState.On"
 BSH_POWER_OFF = "BSH.Common.EnumType.PowerState.Off"
 BSH_POWER_STANDBY = "BSH.Common.EnumType.PowerState.Standby"
-BSH_SELECTED_PROGRAM = "BSH.Common.Root.SelectedProgram"
-BSH_ACTIVE_PROGRAM = "BSH.Common.Root.ActiveProgram"
-BSH_REMOTE_CONTROL_ACTIVATION_STATE = "BSH.Common.Status.RemoteControlActive"
-BSH_REMOTE_START_ALLOWANCE_STATE = "BSH.Common.Status.RemoteControlStartAllowed"
-BSH_CHILD_LOCK_STATE = "BSH.Common.Setting.ChildLock"
 
-BSH_REMAINING_PROGRAM_TIME = "BSH.Common.Option.RemainingProgramTime"
-BSH_COMMON_OPTION_DURATION = "BSH.Common.Option.Duration"
-BSH_COMMON_OPTION_PROGRAM_PROGRESS = "BSH.Common.Option.ProgramProgress"
 
 BSH_EVENT_PRESENT_STATE_PRESENT = "BSH.Common.EnumType.EventPresentState.Present"
 BSH_EVENT_PRESENT_STATE_CONFIRMED = "BSH.Common.EnumType.EventPresentState.Confirmed"
 BSH_EVENT_PRESENT_STATE_OFF = "BSH.Common.EnumType.EventPresentState.Off"
 
-BSH_OPERATION_STATE = "BSH.Common.Status.OperationState"
+
 BSH_OPERATION_STATE_RUN = "BSH.Common.EnumType.OperationState.Run"
 BSH_OPERATION_STATE_PAUSE = "BSH.Common.EnumType.OperationState.Pause"
 BSH_OPERATION_STATE_FINISHED = "BSH.Common.EnumType.OperationState.Finished"
 
-COOKING_LIGHTING = "Cooking.Common.Setting.Lighting"
-COOKING_LIGHTING_BRIGHTNESS = "Cooking.Common.Setting.LightingBrightness"
-
-COFFEE_EVENT_BEAN_CONTAINER_EMPTY = (
-    "ConsumerProducts.CoffeeMaker.Event.BeanContainerEmpty"
-)
-COFFEE_EVENT_WATER_TANK_EMPTY = "ConsumerProducts.CoffeeMaker.Event.WaterTankEmpty"
-COFFEE_EVENT_DRIP_TRAY_FULL = "ConsumerProducts.CoffeeMaker.Event.DripTrayFull"
-
-DISHWASHER_EVENT_SALT_NEARLY_EMPTY = "Dishcare.Dishwasher.Event.SaltNearlyEmpty"
-DISHWASHER_EVENT_RINSE_AID_NEARLY_EMPTY = (
-    "Dishcare.Dishwasher.Event.RinseAidNearlyEmpty"
-)
-
-REFRIGERATION_INTERNAL_LIGHT_POWER = "Refrigeration.Common.Setting.Light.Internal.Power"
-REFRIGERATION_INTERNAL_LIGHT_BRIGHTNESS = (
-    "Refrigeration.Common.Setting.Light.Internal.Brightness"
-)
-REFRIGERATION_EXTERNAL_LIGHT_POWER = "Refrigeration.Common.Setting.Light.External.Power"
-REFRIGERATION_EXTERNAL_LIGHT_BRIGHTNESS = (
-    "Refrigeration.Common.Setting.Light.External.Brightness"
-)
-
-REFRIGERATION_SUPERMODEFREEZER = "Refrigeration.FridgeFreezer.Setting.SuperModeFreezer"
-REFRIGERATION_SUPERMODEREFRIGERATOR = (
-    "Refrigeration.FridgeFreezer.Setting.SuperModeRefrigerator"
-)
-REFRIGERATION_DISPENSER = "Refrigeration.Common.Setting.Dispenser.Enabled"
-
-REFRIGERATION_STATUS_DOOR_CHILLER = "Refrigeration.Common.Status.Door.ChillerCommon"
-REFRIGERATION_STATUS_DOOR_FREEZER = "Refrigeration.Common.Status.Door.Freezer"
-REFRIGERATION_STATUS_DOOR_REFRIGERATOR = "Refrigeration.Common.Status.Door.Refrigerator"
 
 REFRIGERATION_STATUS_DOOR_CLOSED = "Refrigeration.Common.EnumType.Door.States.Closed"
 REFRIGERATION_STATUS_DOOR_OPEN = "Refrigeration.Common.EnumType.Door.States.Open"
 
-REFRIGERATION_EVENT_DOOR_ALARM_REFRIGERATOR = (
-    "Refrigeration.FridgeFreezer.Event.DoorAlarmRefrigerator"
-)
-REFRIGERATION_EVENT_DOOR_ALARM_FREEZER = (
-    "Refrigeration.FridgeFreezer.Event.DoorAlarmFreezer"
-)
-REFRIGERATION_EVENT_TEMP_ALARM_FREEZER = (
-    "Refrigeration.FridgeFreezer.Event.TemperatureAlarmFreezer"
-)
 
-
-BSH_AMBIENT_LIGHT_ENABLED = "BSH.Common.Setting.AmbientLightEnabled"
-BSH_AMBIENT_LIGHT_BRIGHTNESS = "BSH.Common.Setting.AmbientLightBrightness"
-BSH_AMBIENT_LIGHT_COLOR = "BSH.Common.Setting.AmbientLightColor"
 BSH_AMBIENT_LIGHT_COLOR_CUSTOM_COLOR = (
     "BSH.Common.EnumType.AmbientLightColor.CustomColor"
 )
-BSH_AMBIENT_LIGHT_CUSTOM_COLOR = "BSH.Common.Setting.AmbientLightCustomColor"
 
-BSH_DOOR_STATE = "BSH.Common.Status.DoorState"
+
 BSH_DOOR_STATE_CLOSED = "BSH.Common.EnumType.DoorState.Closed"
 BSH_DOOR_STATE_LOCKED = "BSH.Common.EnumType.DoorState.Locked"
 BSH_DOOR_STATE_OPEN = "BSH.Common.EnumType.DoorState.Open"
 
-BSH_PAUSE = "BSH.Common.Command.PauseProgram"
-BSH_RESUME = "BSH.Common.Command.ResumeProgram"
-
-SIGNAL_UPDATE_ENTITIES = "home_connect.update_entities"
 
 SERVICE_OPTION_ACTIVE = "set_option_active"
 SERVICE_OPTION_SELECTED = "set_option_selected"
 SERVICE_PAUSE_PROGRAM = "pause_program"
 SERVICE_RESUME_PROGRAM = "resume_program"
 SERVICE_SELECT_PROGRAM = "select_program"
+SERVICE_SET_PROGRAM_AND_OPTIONS = "set_program_and_options"
 SERVICE_SETTING = "change_setting"
 SERVICE_START_PROGRAM = "start_program"
 
-ATTR_ALLOWED_VALUES = "allowedvalues"
-ATTR_AMBIENT = "ambient"
-ATTR_BSH_KEY = "bsh_key"
-ATTR_CONSTRAINTS = "constraints"
-ATTR_DESC = "desc"
-ATTR_DEVICE = "device"
+ATTR_AFFECTS_TO = "affects_to"
 ATTR_KEY = "key"
 ATTR_PROGRAM = "program"
-ATTR_SENSOR_TYPE = "sensor_type"
-ATTR_SIGN = "sign"
-ATTR_STEPSIZE = "stepsize"
 ATTR_UNIT = "unit"
 ATTR_VALUE = "value"
 
-SVE_TRANSLATION_KEY_SET_SETTING = "set_setting_entity"
+AFFECTS_TO_ACTIVE_PROGRAM = "active_program"
+AFFECTS_TO_SELECTED_PROGRAM = "selected_program"
+
+
+TRANSLATION_KEYS_PROGRAMS_MAP = {
+    bsh_key_to_translation_key(program.value): cast(ProgramKey, program)
+    for program in ProgramKey
+    if program != ProgramKey.UNKNOWN
+}
+
+PROGRAMS_TRANSLATION_KEYS_MAP = {
+    value: key for key, value in TRANSLATION_KEYS_PROGRAMS_MAP.items()
+}
+
+AVAILABLE_MAPS_ENUM = {
+    bsh_key_to_translation_key(option): option
+    for option in (
+        "ConsumerProducts.CleaningRobot.EnumType.AvailableMaps.TempMap",
+        "ConsumerProducts.CleaningRobot.EnumType.AvailableMaps.Map1",
+        "ConsumerProducts.CleaningRobot.EnumType.AvailableMaps.Map2",
+        "ConsumerProducts.CleaningRobot.EnumType.AvailableMaps.Map3",
+    )
+}
+
+CLEANING_MODE_OPTIONS = {
+    bsh_key_to_translation_key(option): option
+    for option in (
+        "ConsumerProducts.CleaningRobot.EnumType.CleaningModes.Silent",
+        "ConsumerProducts.CleaningRobot.EnumType.CleaningModes.Standard",
+        "ConsumerProducts.CleaningRobot.EnumType.CleaningModes.Power",
+    )
+}
+
+BEAN_AMOUNT_OPTIONS = {
+    bsh_key_to_translation_key(option): option
+    for option in (
+        "ConsumerProducts.CoffeeMaker.EnumType.BeanAmount.VeryMild",
+        "ConsumerProducts.CoffeeMaker.EnumType.BeanAmount.Mild",
+        "ConsumerProducts.CoffeeMaker.EnumType.BeanAmount.MildPlus",
+        "ConsumerProducts.CoffeeMaker.EnumType.BeanAmount.Normal",
+        "ConsumerProducts.CoffeeMaker.EnumType.BeanAmount.NormalPlus",
+        "ConsumerProducts.CoffeeMaker.EnumType.BeanAmount.Strong",
+        "ConsumerProducts.CoffeeMaker.EnumType.BeanAmount.StrongPlus",
+        "ConsumerProducts.CoffeeMaker.EnumType.BeanAmount.VeryStrong",
+        "ConsumerProducts.CoffeeMaker.EnumType.BeanAmount.VeryStrongPlus",
+        "ConsumerProducts.CoffeeMaker.EnumType.BeanAmount.ExtraStrong",
+        "ConsumerProducts.CoffeeMaker.EnumType.BeanAmount.DoubleShot",
+        "ConsumerProducts.CoffeeMaker.EnumType.BeanAmount.DoubleShotPlus",
+        "ConsumerProducts.CoffeeMaker.EnumType.BeanAmount.DoubleShotPlusPlus",
+        "ConsumerProducts.CoffeeMaker.EnumType.BeanAmount.TripleShot",
+        "ConsumerProducts.CoffeeMaker.EnumType.BeanAmount.TripleShotPlus",
+        "ConsumerProducts.CoffeeMaker.EnumType.BeanAmount.CoffeeGround",
+    )
+}
+
+COFFEE_TEMPERATURE_OPTIONS = {
+    bsh_key_to_translation_key(option): option
+    for option in (
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeTemperature.88C",
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeTemperature.90C",
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeTemperature.92C",
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeTemperature.94C",
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeTemperature.95C",
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeTemperature.96C",
+    )
+}
+
+BEAN_CONTAINER_OPTIONS = {
+    bsh_key_to_translation_key(option): option
+    for option in (
+        "ConsumerProducts.CoffeeMaker.EnumType.BeanContainerSelection.Right",
+        "ConsumerProducts.CoffeeMaker.EnumType.BeanContainerSelection.Left",
+    )
+}
+
+FLOW_RATE_OPTIONS = {
+    bsh_key_to_translation_key(option): option
+    for option in (
+        "ConsumerProducts.CoffeeMaker.EnumType.FlowRate.Normal",
+        "ConsumerProducts.CoffeeMaker.EnumType.FlowRate.Intense",
+        "ConsumerProducts.CoffeeMaker.EnumType.FlowRate.IntensePlus",
+    )
+}
+
+COFFEE_MILK_RATIO_OPTIONS = {
+    bsh_key_to_translation_key(option): option
+    for option in (
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeMilkRatio.10Percent",
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeMilkRatio.20Percent",
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeMilkRatio.25Percent",
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeMilkRatio.30Percent",
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeMilkRatio.40Percent",
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeMilkRatio.50Percent",
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeMilkRatio.55Percent",
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeMilkRatio.60Percent",
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeMilkRatio.65Percent",
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeMilkRatio.67Percent",
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeMilkRatio.70Percent",
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeMilkRatio.75Percent",
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeMilkRatio.80Percent",
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeMilkRatio.85Percent",
+        "ConsumerProducts.CoffeeMaker.EnumType.CoffeeMilkRatio.90Percent",
+    )
+}
+
+HOT_WATER_TEMPERATURE_OPTIONS = {
+    bsh_key_to_translation_key(option): option
+    for option in (
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.WhiteTea",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.GreenTea",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.BlackTea",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.50C",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.55C",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.60C",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.65C",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.70C",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.75C",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.80C",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.85C",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.90C",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.95C",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.97C",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.122F",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.131F",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.140F",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.149F",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.158F",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.167F",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.176F",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.185F",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.194F",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.203F",
+        "ConsumerProducts.CoffeeMaker.EnumType.HotWaterTemperature.Max",
+    )
+}
+
+DRYING_TARGET_OPTIONS = {
+    bsh_key_to_translation_key(option): option
+    for option in (
+        "LaundryCare.Dryer.EnumType.DryingTarget.IronDry",
+        "LaundryCare.Dryer.EnumType.DryingTarget.GentleDry",
+        "LaundryCare.Dryer.EnumType.DryingTarget.CupboardDry",
+        "LaundryCare.Dryer.EnumType.DryingTarget.CupboardDryPlus",
+        "LaundryCare.Dryer.EnumType.DryingTarget.ExtraDry",
+    )
+}
+
+VENTING_LEVEL_OPTIONS = {
+    bsh_key_to_translation_key(option): option
+    for option in (
+        "Cooking.Hood.EnumType.Stage.FanOff",
+        "Cooking.Hood.EnumType.Stage.FanStage01",
+        "Cooking.Hood.EnumType.Stage.FanStage02",
+        "Cooking.Hood.EnumType.Stage.FanStage03",
+        "Cooking.Hood.EnumType.Stage.FanStage04",
+        "Cooking.Hood.EnumType.Stage.FanStage05",
+    )
+}
+
+INTENSIVE_LEVEL_OPTIONS = {
+    bsh_key_to_translation_key(option): option
+    for option in (
+        "Cooking.Hood.EnumType.IntensiveStage.IntensiveStageOff",
+        "Cooking.Hood.EnumType.IntensiveStage.IntensiveStage1",
+        "Cooking.Hood.EnumType.IntensiveStage.IntensiveStage2",
+    )
+}
+
+WARMING_LEVEL_OPTIONS = {
+    bsh_key_to_translation_key(option): option
+    for option in (
+        "Cooking.Oven.EnumType.WarmingLevel.Low",
+        "Cooking.Oven.EnumType.WarmingLevel.Medium",
+        "Cooking.Oven.EnumType.WarmingLevel.High",
+    )
+}
+
+TEMPERATURE_OPTIONS = {
+    bsh_key_to_translation_key(option): option
+    for option in (
+        "LaundryCare.Washer.EnumType.Temperature.Cold",
+        "LaundryCare.Washer.EnumType.Temperature.GC20",
+        "LaundryCare.Washer.EnumType.Temperature.GC30",
+        "LaundryCare.Washer.EnumType.Temperature.GC40",
+        "LaundryCare.Washer.EnumType.Temperature.GC50",
+        "LaundryCare.Washer.EnumType.Temperature.GC60",
+        "LaundryCare.Washer.EnumType.Temperature.GC70",
+        "LaundryCare.Washer.EnumType.Temperature.GC80",
+        "LaundryCare.Washer.EnumType.Temperature.GC90",
+        "LaundryCare.Washer.EnumType.Temperature.UlCold",
+        "LaundryCare.Washer.EnumType.Temperature.UlWarm",
+        "LaundryCare.Washer.EnumType.Temperature.UlHot",
+        "LaundryCare.Washer.EnumType.Temperature.UlExtraHot",
+    )
+}
+
+SPIN_SPEED_OPTIONS = {
+    bsh_key_to_translation_key(option): option
+    for option in (
+        "LaundryCare.Washer.EnumType.SpinSpeed.Off",
+        "LaundryCare.Washer.EnumType.SpinSpeed.RPM400",
+        "LaundryCare.Washer.EnumType.SpinSpeed.RPM600",
+        "LaundryCare.Washer.EnumType.SpinSpeed.RPM700",
+        "LaundryCare.Washer.EnumType.SpinSpeed.RPM800",
+        "LaundryCare.Washer.EnumType.SpinSpeed.RPM900",
+        "LaundryCare.Washer.EnumType.SpinSpeed.RPM1000",
+        "LaundryCare.Washer.EnumType.SpinSpeed.RPM1200",
+        "LaundryCare.Washer.EnumType.SpinSpeed.RPM1400",
+        "LaundryCare.Washer.EnumType.SpinSpeed.RPM1600",
+        "LaundryCare.Washer.EnumType.SpinSpeed.UlOff",
+        "LaundryCare.Washer.EnumType.SpinSpeed.UlLow",
+        "LaundryCare.Washer.EnumType.SpinSpeed.UlMedium",
+        "LaundryCare.Washer.EnumType.SpinSpeed.UlHigh",
+    )
+}
+
+VARIO_PERFECT_OPTIONS = {
+    bsh_key_to_translation_key(option): option
+    for option in (
+        "LaundryCare.Common.EnumType.VarioPerfect.Off",
+        "LaundryCare.Common.EnumType.VarioPerfect.EcoPerfect",
+        "LaundryCare.Common.EnumType.VarioPerfect.SpeedPerfect",
+    )
+}
+
+
+PROGRAM_ENUM_OPTIONS = {
+    bsh_key_to_translation_key(option_key): (
+        option_key,
+        options,
+    )
+    for option_key, options in (
+        (
+            OptionKey.CONSUMER_PRODUCTS_CLEANING_ROBOT_REFERENCE_MAP_ID,
+            AVAILABLE_MAPS_ENUM,
+        ),
+        (
+            OptionKey.CONSUMER_PRODUCTS_CLEANING_ROBOT_CLEANING_MODE,
+            CLEANING_MODE_OPTIONS,
+        ),
+        (OptionKey.CONSUMER_PRODUCTS_COFFEE_MAKER_BEAN_AMOUNT, BEAN_AMOUNT_OPTIONS),
+        (
+            OptionKey.CONSUMER_PRODUCTS_COFFEE_MAKER_COFFEE_TEMPERATURE,
+            COFFEE_TEMPERATURE_OPTIONS,
+        ),
+        (
+            OptionKey.CONSUMER_PRODUCTS_COFFEE_MAKER_BEAN_CONTAINER_SELECTION,
+            BEAN_CONTAINER_OPTIONS,
+        ),
+        (OptionKey.CONSUMER_PRODUCTS_COFFEE_MAKER_FLOW_RATE, FLOW_RATE_OPTIONS),
+        (
+            OptionKey.CONSUMER_PRODUCTS_COFFEE_MAKER_COFFEE_MILK_RATIO,
+            COFFEE_MILK_RATIO_OPTIONS,
+        ),
+        (
+            OptionKey.CONSUMER_PRODUCTS_COFFEE_MAKER_HOT_WATER_TEMPERATURE,
+            HOT_WATER_TEMPERATURE_OPTIONS,
+        ),
+        (OptionKey.LAUNDRY_CARE_DRYER_DRYING_TARGET, DRYING_TARGET_OPTIONS),
+        (OptionKey.COOKING_COMMON_HOOD_VENTING_LEVEL, VENTING_LEVEL_OPTIONS),
+        (OptionKey.COOKING_COMMON_HOOD_INTENSIVE_LEVEL, INTENSIVE_LEVEL_OPTIONS),
+        (OptionKey.COOKING_OVEN_WARMING_LEVEL, WARMING_LEVEL_OPTIONS),
+        (OptionKey.LAUNDRY_CARE_WASHER_TEMPERATURE, TEMPERATURE_OPTIONS),
+        (OptionKey.LAUNDRY_CARE_WASHER_SPIN_SPEED, SPIN_SPEED_OPTIONS),
+        (OptionKey.LAUNDRY_CARE_COMMON_VARIO_PERFECT, VARIO_PERFECT_OPTIONS),
+    )
+}
 
-SVE_TRANSLATION_PLACEHOLDER_APPLIANCE_NAME = "appliance_name"
-SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID = "entity_id"
-SVE_TRANSLATION_PLACEHOLDER_PROGRAM = "program"
-SVE_TRANSLATION_PLACEHOLDER_KEY = "key"
-SVE_TRANSLATION_PLACEHOLDER_VALUE = "value"
 
 OLD_NEW_UNIQUE_ID_SUFFIX_MAP = {
-    "ChildLock": BSH_CHILD_LOCK_STATE,
-    "Operation State": BSH_OPERATION_STATE,
-    "Light": COOKING_LIGHTING,
-    "AmbientLight": BSH_AMBIENT_LIGHT_ENABLED,
-    "Power": BSH_POWER_STATE,
-    "Remaining Program Time": BSH_REMAINING_PROGRAM_TIME,
-    "Duration": BSH_COMMON_OPTION_DURATION,
-    "Program Progress": BSH_COMMON_OPTION_PROGRAM_PROGRESS,
-    "Remote Control": BSH_REMOTE_CONTROL_ACTIVATION_STATE,
-    "Remote Start": BSH_REMOTE_START_ALLOWANCE_STATE,
-    "Supermode Freezer": REFRIGERATION_SUPERMODEFREEZER,
-    "Supermode Refrigerator": REFRIGERATION_SUPERMODEREFRIGERATOR,
-    "Dispenser Enabled": REFRIGERATION_DISPENSER,
-    "Internal Light": REFRIGERATION_INTERNAL_LIGHT_POWER,
-    "External Light": REFRIGERATION_EXTERNAL_LIGHT_POWER,
-    "Chiller Door": REFRIGERATION_STATUS_DOOR_CHILLER,
-    "Freezer Door": REFRIGERATION_STATUS_DOOR_FREEZER,
-    "Refrigerator Door": REFRIGERATION_STATUS_DOOR_REFRIGERATOR,
-    "Door Alarm Freezer": REFRIGERATION_EVENT_DOOR_ALARM_FREEZER,
-    "Door Alarm Refrigerator": REFRIGERATION_EVENT_DOOR_ALARM_REFRIGERATOR,
-    "Temperature Alarm Freezer": REFRIGERATION_EVENT_TEMP_ALARM_FREEZER,
-    "Bean Container Empty": COFFEE_EVENT_BEAN_CONTAINER_EMPTY,
-    "Water Tank Empty": COFFEE_EVENT_WATER_TANK_EMPTY,
-    "Drip Tray Full": COFFEE_EVENT_DRIP_TRAY_FULL,
+    "ChildLock": SettingKey.BSH_COMMON_CHILD_LOCK,
+    "Operation State": StatusKey.BSH_COMMON_OPERATION_STATE,
+    "Light": SettingKey.COOKING_COMMON_LIGHTING,
+    "AmbientLight": SettingKey.BSH_COMMON_AMBIENT_LIGHT_ENABLED,
+    "Power": SettingKey.BSH_COMMON_POWER_STATE,
+    "Remaining Program Time": EventKey.BSH_COMMON_OPTION_REMAINING_PROGRAM_TIME,
+    "Duration": EventKey.BSH_COMMON_OPTION_DURATION,
+    "Program Progress": EventKey.BSH_COMMON_OPTION_PROGRAM_PROGRESS,
+    "Remote Control": StatusKey.BSH_COMMON_REMOTE_CONTROL_ACTIVE,
+    "Remote Start": StatusKey.BSH_COMMON_REMOTE_CONTROL_START_ALLOWED,
+    "Supermode Freezer": SettingKey.REFRIGERATION_FRIDGE_FREEZER_SUPER_MODE_FREEZER,
+    "Supermode Refrigerator": SettingKey.REFRIGERATION_FRIDGE_FREEZER_SUPER_MODE_REFRIGERATOR,
+    "Dispenser Enabled": SettingKey.REFRIGERATION_COMMON_DISPENSER_ENABLED,
+    "Internal Light": SettingKey.REFRIGERATION_COMMON_LIGHT_INTERNAL_POWER,
+    "External Light": SettingKey.REFRIGERATION_COMMON_LIGHT_EXTERNAL_POWER,
+    "Chiller Door": StatusKey.REFRIGERATION_COMMON_DOOR_CHILLER,
+    "Freezer Door": StatusKey.REFRIGERATION_COMMON_DOOR_FREEZER,
+    "Refrigerator Door": StatusKey.REFRIGERATION_COMMON_DOOR_REFRIGERATOR,
+    "Door Alarm Freezer": EventKey.REFRIGERATION_FRIDGE_FREEZER_EVENT_DOOR_ALARM_FREEZER,
+    "Door Alarm Refrigerator": EventKey.REFRIGERATION_FRIDGE_FREEZER_EVENT_DOOR_ALARM_REFRIGERATOR,
+    "Temperature Alarm Freezer": EventKey.REFRIGERATION_FRIDGE_FREEZER_EVENT_TEMPERATURE_ALARM_FREEZER,
+    "Bean Container Empty": EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_BEAN_CONTAINER_EMPTY,
+    "Water Tank Empty": EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_WATER_TANK_EMPTY,
+    "Drip Tray Full": EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_DRIP_TRAY_FULL,
 }
diff --git a/homeassistant/components/home_connect/coordinator.py b/homeassistant/components/home_connect/coordinator.py
new file mode 100644
index 00000000000..079db6b148e
--- /dev/null
+++ b/homeassistant/components/home_connect/coordinator.py
@@ -0,0 +1,576 @@
+"""Coordinator for Home Connect."""
+
+from __future__ import annotations
+
+from asyncio import sleep as asyncio_sleep
+from collections import defaultdict
+from collections.abc import Callable
+from dataclasses import dataclass
+import logging
+from typing import Any, cast
+
+from aiohomeconnect.client import Client as HomeConnectClient
+from aiohomeconnect.model import (
+    CommandKey,
+    Event,
+    EventKey,
+    EventMessage,
+    EventType,
+    GetSetting,
+    HomeAppliance,
+    OptionKey,
+    ProgramKey,
+    SettingKey,
+    Status,
+    StatusKey,
+)
+from aiohomeconnect.model.error import (
+    EventStreamInterruptedError,
+    HomeConnectApiError,
+    HomeConnectError,
+    HomeConnectRequestError,
+    TooManyRequestsError,
+    UnauthorizedError,
+)
+from aiohomeconnect.model.program import EnumerateProgram, ProgramDefinitionOption
+from propcache.api import cached_property
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import API_DEFAULT_RETRY_AFTER, APPLIANCES_WITH_PROGRAMS, DOMAIN
+from .utils import get_dict_from_home_connect_error
+
+_LOGGER = logging.getLogger(__name__)
+
+type HomeConnectConfigEntry = ConfigEntry[HomeConnectCoordinator]
+
+
+@dataclass(frozen=True, kw_only=True)
+class HomeConnectApplianceData:
+    """Class to hold Home Connect appliance data."""
+
+    commands: set[CommandKey]
+    events: dict[EventKey, Event]
+    info: HomeAppliance
+    options: dict[OptionKey, ProgramDefinitionOption]
+    programs: list[EnumerateProgram]
+    settings: dict[SettingKey, GetSetting]
+    status: dict[StatusKey, Status]
+
+    def update(self, other: HomeConnectApplianceData) -> None:
+        """Update data with data from other instance."""
+        self.commands.update(other.commands)
+        self.events.update(other.events)
+        self.info.connected = other.info.connected
+        self.options.clear()
+        self.options.update(other.options)
+        self.programs.clear()
+        self.programs.extend(other.programs)
+        self.settings.update(other.settings)
+        self.status.update(other.status)
+
+
+class HomeConnectCoordinator(
+    DataUpdateCoordinator[dict[str, HomeConnectApplianceData]]
+):
+    """Class to manage fetching Home Connect data."""
+
+    config_entry: HomeConnectConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: HomeConnectConfigEntry,
+        client: HomeConnectClient,
+    ) -> None:
+        """Initialize."""
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=config_entry.entry_id,
+        )
+        self.client = client
+        self._special_listeners: dict[
+            CALLBACK_TYPE, tuple[CALLBACK_TYPE, tuple[EventKey, ...]]
+        ] = {}
+        self.device_registry = dr.async_get(self.hass)
+        self.data = {}
+
+    @cached_property
+    def context_listeners(self) -> dict[tuple[str, EventKey], list[CALLBACK_TYPE]]:
+        """Return a dict of all listeners registered for a given context."""
+        listeners: dict[tuple[str, EventKey], list[CALLBACK_TYPE]] = defaultdict(list)
+        for listener, context in list(self._listeners.values()):
+            assert isinstance(context, tuple)
+            listeners[context].append(listener)
+        return listeners
+
+    @callback
+    def async_add_listener(
+        self, update_callback: CALLBACK_TYPE, context: Any = None
+    ) -> Callable[[], None]:
+        """Listen for data updates."""
+        remove_listener = super().async_add_listener(update_callback, context)
+        self.__dict__.pop("context_listeners", None)
+
+        def remove_listener_and_invalidate_context_listeners() -> None:
+            remove_listener()
+            self.__dict__.pop("context_listeners", None)
+
+        return remove_listener_and_invalidate_context_listeners
+
+    @callback
+    def async_add_special_listener(
+        self,
+        update_callback: CALLBACK_TYPE,
+        context: tuple[EventKey, ...],
+    ) -> Callable[[], None]:
+        """Listen for special data updates.
+
+        These listeners will not be called on refresh.
+        """
+
+        @callback
+        def remove_listener() -> None:
+            """Remove update listener."""
+            self._special_listeners.pop(remove_listener)
+            if not self._special_listeners:
+                self._unschedule_refresh()
+
+        self._special_listeners[remove_listener] = (update_callback, context)
+
+        return remove_listener
+
+    @callback
+    def start_event_listener(self) -> None:
+        """Start event listener."""
+        self.config_entry.async_create_background_task(
+            self.hass,
+            self._event_listener(),
+            f"home_connect-events_listener_task-{self.config_entry.entry_id}",
+        )
+
+    async def _event_listener(self) -> None:
+        """Match event with listener for event type."""
+        retry_time = 10
+        while True:
+            try:
+                async for event_message in self.client.stream_all_events():
+                    retry_time = 10
+                    event_message_ha_id = event_message.ha_id
+                    if (
+                        event_message_ha_id in self.data
+                        and not self.data[event_message_ha_id].info.connected
+                    ):
+                        self.data[event_message_ha_id].info.connected = True
+                        self._call_all_event_listeners_for_appliance(
+                            event_message_ha_id
+                        )
+                    match event_message.type:
+                        case EventType.STATUS:
+                            statuses = self.data[event_message_ha_id].status
+                            for event in event_message.data.items:
+                                status_key = StatusKey(event.key)
+                                if status_key in statuses:
+                                    statuses[status_key].value = event.value
+                                else:
+                                    statuses[status_key] = Status(
+                                        key=status_key,
+                                        raw_key=status_key.value,
+                                        value=event.value,
+                                    )
+                            self._call_event_listener(event_message)
+
+                        case EventType.NOTIFY:
+                            settings = self.data[event_message_ha_id].settings
+                            events = self.data[event_message_ha_id].events
+                            for event in event_message.data.items:
+                                event_key = event.key
+                                if event_key in SettingKey:
+                                    setting_key = SettingKey(event_key)
+                                    if setting_key in settings:
+                                        settings[setting_key].value = event.value
+                                    else:
+                                        settings[setting_key] = GetSetting(
+                                            key=setting_key,
+                                            raw_key=setting_key.value,
+                                            value=event.value,
+                                        )
+                                else:
+                                    if event_key in (
+                                        EventKey.BSH_COMMON_ROOT_ACTIVE_PROGRAM,
+                                        EventKey.BSH_COMMON_ROOT_SELECTED_PROGRAM,
+                                    ):
+                                        await self.update_options(
+                                            event_message_ha_id,
+                                            event_key,
+                                            ProgramKey(cast(str, event.value)),
+                                        )
+                                    events[event_key] = event
+                            self._call_event_listener(event_message)
+
+                        case EventType.EVENT:
+                            events = self.data[event_message_ha_id].events
+                            for event in event_message.data.items:
+                                events[event.key] = event
+                            self._call_event_listener(event_message)
+
+                        case EventType.CONNECTED | EventType.PAIRED:
+                            appliance_info = await self.client.get_specific_appliance(
+                                event_message_ha_id
+                            )
+
+                            appliance_data = await self._get_appliance_data(
+                                appliance_info, self.data.get(appliance_info.ha_id)
+                            )
+                            if event_message_ha_id in self.data:
+                                self.data[event_message_ha_id].update(appliance_data)
+                            else:
+                                self.data[event_message_ha_id] = appliance_data
+                            for listener, context in self._special_listeners.values():
+                                if (
+                                    EventKey.BSH_COMMON_APPLIANCE_DEPAIRED
+                                    not in context
+                                ):
+                                    listener()
+                            self._call_all_event_listeners_for_appliance(
+                                event_message_ha_id
+                            )
+
+                        case EventType.DISCONNECTED:
+                            self.data[event_message_ha_id].info.connected = False
+                            self._call_all_event_listeners_for_appliance(
+                                event_message_ha_id
+                            )
+
+                        case EventType.DEPAIRED:
+                            device = self.device_registry.async_get_device(
+                                identifiers={(DOMAIN, event_message_ha_id)}
+                            )
+                            if device:
+                                self.device_registry.async_update_device(
+                                    device_id=device.id,
+                                    remove_config_entry_id=self.config_entry.entry_id,
+                                )
+                            self.data.pop(event_message_ha_id, None)
+                            for listener, context in self._special_listeners.values():
+                                assert isinstance(context, tuple)
+                                if EventKey.BSH_COMMON_APPLIANCE_DEPAIRED in context:
+                                    listener()
+
+            except (EventStreamInterruptedError, HomeConnectRequestError) as error:
+                _LOGGER.debug(
+                    "Non-breaking error (%s) while listening for events,"
+                    " continuing in %s seconds",
+                    error,
+                    retry_time,
+                )
+                await asyncio_sleep(retry_time)
+                retry_time = min(retry_time * 2, 3600)
+            except HomeConnectApiError as error:
+                _LOGGER.error("Error while listening for events: %s", error)
+                self.hass.config_entries.async_schedule_reload(
+                    self.config_entry.entry_id
+                )
+                break
+
+    @callback
+    def _call_event_listener(self, event_message: EventMessage) -> None:
+        """Call listener for event."""
+        for event in event_message.data.items:
+            for listener in self.context_listeners.get(
+                (event_message.ha_id, event.key), []
+            ):
+                listener()
+
+    @callback
+    def _call_all_event_listeners_for_appliance(self, ha_id: str) -> None:
+        for listener, context in self._listeners.values():
+            if isinstance(context, tuple) and context[0] == ha_id:
+                listener()
+
+    async def _async_update_data(self) -> dict[str, HomeConnectApplianceData]:
+        """Fetch data from Home Connect."""
+        await self._async_setup()
+
+        for appliance_data in self.data.values():
+            appliance = appliance_data.info
+            ha_id = appliance.ha_id
+            while True:
+                try:
+                    self.data[ha_id] = await self._get_appliance_data(
+                        appliance, self.data.get(ha_id)
+                    )
+                except TooManyRequestsError as err:
+                    _LOGGER.debug(
+                        "Rate limit exceeded on initial fetch: %s",
+                        err,
+                    )
+                    await asyncio_sleep(err.retry_after or API_DEFAULT_RETRY_AFTER)
+                else:
+                    break
+
+        for listener, context in self._special_listeners.values():
+            assert isinstance(context, tuple)
+            if EventKey.BSH_COMMON_APPLIANCE_PAIRED in context:
+                listener()
+
+        return self.data
+
+    async def async_setup(self) -> None:
+        """Set up the devices."""
+        try:
+            await self._async_setup()
+        except UpdateFailed as err:
+            raise ConfigEntryNotReady from err
+
+    async def _async_setup(self) -> None:
+        """Set up the devices."""
+        old_appliances = set(self.data.keys())
+        try:
+            appliances = await self.client.get_home_appliances()
+        except UnauthorizedError as error:
+            raise ConfigEntryAuthFailed(
+                translation_domain=DOMAIN,
+                translation_key="auth_error",
+                translation_placeholders=get_dict_from_home_connect_error(error),
+            ) from error
+        except HomeConnectError as error:
+            for appliance_data in self.data.values():
+                appliance_data.info.connected = False
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="fetch_api_error",
+                translation_placeholders=get_dict_from_home_connect_error(error),
+            ) from error
+
+        for appliance in appliances.homeappliances:
+            self.device_registry.async_get_or_create(
+                config_entry_id=self.config_entry.entry_id,
+                identifiers={(DOMAIN, appliance.ha_id)},
+                manufacturer=appliance.brand,
+                name=appliance.name,
+                model=appliance.vib,
+            )
+            if appliance.ha_id not in self.data:
+                self.data[appliance.ha_id] = HomeConnectApplianceData(
+                    commands=set(),
+                    events={},
+                    info=appliance,
+                    options={},
+                    programs=[],
+                    settings={},
+                    status={},
+                )
+            else:
+                self.data[appliance.ha_id].info.connected = appliance.connected
+                old_appliances.remove(appliance.ha_id)
+
+        for ha_id in old_appliances:
+            self.data.pop(ha_id, None)
+            device = self.device_registry.async_get_device(
+                identifiers={(DOMAIN, ha_id)}
+            )
+            if device:
+                self.device_registry.async_update_device(
+                    device_id=device.id,
+                    remove_config_entry_id=self.config_entry.entry_id,
+                )
+
+        # Trigger to delete the possible depaired device entities
+        # from known_entities variable at common.py
+        for listener, context in self._special_listeners.values():
+            assert isinstance(context, tuple)
+            if EventKey.BSH_COMMON_APPLIANCE_DEPAIRED in context:
+                listener()
+
+    async def _get_appliance_data(
+        self,
+        appliance: HomeAppliance,
+        appliance_data_to_update: HomeConnectApplianceData | None = None,
+    ) -> HomeConnectApplianceData:
+        """Get appliance data."""
+        self.device_registry.async_get_or_create(
+            config_entry_id=self.config_entry.entry_id,
+            identifiers={(DOMAIN, appliance.ha_id)},
+            manufacturer=appliance.brand,
+            name=appliance.name,
+            model=appliance.vib,
+        )
+        try:
+            settings = {
+                setting.key: setting
+                for setting in (
+                    await self.client.get_settings(appliance.ha_id)
+                ).settings
+            }
+        except TooManyRequestsError:
+            raise
+        except HomeConnectError as error:
+            _LOGGER.debug(
+                "Error fetching settings for %s: %s",
+                appliance.ha_id,
+                error,
+            )
+            settings = {}
+        try:
+            status = {
+                status.key: status
+                for status in (await self.client.get_status(appliance.ha_id)).status
+            }
+        except TooManyRequestsError:
+            raise
+        except HomeConnectError as error:
+            _LOGGER.debug(
+                "Error fetching status for %s: %s",
+                appliance.ha_id,
+                error,
+            )
+            status = {}
+
+        programs = []
+        events = {}
+        options = {}
+        if appliance.type in APPLIANCES_WITH_PROGRAMS:
+            try:
+                all_programs = await self.client.get_all_programs(appliance.ha_id)
+            except TooManyRequestsError:
+                raise
+            except HomeConnectError as error:
+                _LOGGER.debug(
+                    "Error fetching programs for %s: %s",
+                    appliance.ha_id,
+                    error,
+                )
+            else:
+                programs.extend(all_programs.programs)
+                current_program_key = None
+                program_options = None
+                for program, event_key in (
+                    (
+                        all_programs.selected,
+                        EventKey.BSH_COMMON_ROOT_SELECTED_PROGRAM,
+                    ),
+                    (
+                        all_programs.active,
+                        EventKey.BSH_COMMON_ROOT_ACTIVE_PROGRAM,
+                    ),
+                ):
+                    if program and program.key:
+                        events[event_key] = Event(
+                            event_key,
+                            event_key.value,
+                            0,
+                            "",
+                            "",
+                            program.key,
+                        )
+                        current_program_key = program.key
+                        program_options = program.options
+                if current_program_key:
+                    options = await self.get_options_definitions(
+                        appliance.ha_id, current_program_key
+                    )
+                    for option in program_options or []:
+                        option_event_key = EventKey(option.key)
+                        events[option_event_key] = Event(
+                            option_event_key,
+                            option.key,
+                            0,
+                            "",
+                            "",
+                            option.value,
+                            option.name,
+                            display_value=option.display_value,
+                            unit=option.unit,
+                        )
+
+        try:
+            commands = {
+                command.key
+                for command in (
+                    await self.client.get_available_commands(appliance.ha_id)
+                ).commands
+            }
+        except TooManyRequestsError:
+            raise
+        except HomeConnectError:
+            commands = set()
+
+        appliance_data = HomeConnectApplianceData(
+            commands=commands,
+            events=events,
+            info=appliance,
+            options=options,
+            programs=programs,
+            settings=settings,
+            status=status,
+        )
+        if appliance_data_to_update:
+            appliance_data_to_update.update(appliance_data)
+            appliance_data = appliance_data_to_update
+
+        return appliance_data
+
+    async def get_options_definitions(
+        self, ha_id: str, program_key: ProgramKey
+    ) -> dict[OptionKey, ProgramDefinitionOption]:
+        """Get options with constraints for appliance."""
+        if program_key is ProgramKey.UNKNOWN:
+            return {}
+        try:
+            return {
+                option.key: option
+                for option in (
+                    await self.client.get_available_program(
+                        ha_id, program_key=program_key
+                    )
+                ).options
+                or []
+            }
+        except TooManyRequestsError:
+            raise
+        except HomeConnectError as error:
+            _LOGGER.debug(
+                "Error fetching options for %s: %s",
+                ha_id,
+                error,
+            )
+            return {}
+
+    async def update_options(
+        self, ha_id: str, event_key: EventKey, program_key: ProgramKey
+    ) -> None:
+        """Update options for appliance."""
+        options = self.data[ha_id].options
+        events = self.data[ha_id].events
+        options_to_notify = options.copy()
+        options.clear()
+        options.update(await self.get_options_definitions(ha_id, program_key))
+
+        for option in options.values():
+            option_value = option.constraints.default if option.constraints else None
+            if option_value is not None:
+                option_event_key = EventKey(option.key)
+                events[option_event_key] = Event(
+                    option_event_key,
+                    option.key.value,
+                    0,
+                    "",
+                    "",
+                    option_value,
+                    option.name,
+                    unit=option.unit,
+                )
+        options_to_notify.update(options)
+        for option_key in options_to_notify:
+            for listener in self.context_listeners.get(
+                (ha_id, EventKey(option_key)),
+                [],
+            ):
+                listener()
diff --git a/homeassistant/components/home_connect/diagnostics.py b/homeassistant/components/home_connect/diagnostics.py
index e095bc503ab..fd74277a815 100644
--- a/homeassistant/components/home_connect/diagnostics.py
+++ b/homeassistant/components/home_connect/diagnostics.py
@@ -4,33 +4,25 @@ from __future__ import annotations
 
 from typing import Any
 
-from homeconnect.api import HomeConnectAppliance, HomeConnectError
+from aiohomeconnect.client import Client as HomeConnectClient
 
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntry
 
-from . import HomeConnectConfigEntry, _get_appliance
-from .api import HomeConnectDevice
+from .const import DOMAIN
+from .coordinator import HomeConnectApplianceData, HomeConnectConfigEntry
 
 
-def _generate_appliance_diagnostics(appliance: HomeConnectAppliance) -> dict[str, Any]:
-    try:
-        programs = appliance.get_programs_available()
-    except HomeConnectError:
-        programs = None
+async def _generate_appliance_diagnostics(
+    client: HomeConnectClient, appliance: HomeConnectApplianceData
+) -> dict[str, Any]:
     return {
-        "connected": appliance.connected,
-        "status": appliance.status,
-        "programs": programs,
-    }
-
-
-def _generate_entry_diagnostics(
-    devices: list[HomeConnectDevice],
-) -> dict[str, dict[str, Any]]:
-    return {
-        device.appliance.haId: _generate_appliance_diagnostics(device.appliance)
-        for device in devices
+        **appliance.info.to_dict(),
+        "status": {key.value: status.value for key, status in appliance.status.items()},
+        "settings": {
+            key.value: setting.value for key, setting in appliance.settings.items()
+        },
+        "programs": [program.raw_key for program in appliance.programs],
     }
 
 
@@ -38,14 +30,21 @@ async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, entry: HomeConnectConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    return await hass.async_add_executor_job(
-        _generate_entry_diagnostics, entry.runtime_data.devices
-    )
+    return {
+        appliance.info.ha_id: await _generate_appliance_diagnostics(
+            entry.runtime_data.client, appliance
+        )
+        for appliance in entry.runtime_data.data.values()
+    }
 
 
 async def async_get_device_diagnostics(
     hass: HomeAssistant, entry: HomeConnectConfigEntry, device: DeviceEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a device."""
-    appliance = _get_appliance(hass, device_entry=device, entry=entry)
-    return await hass.async_add_executor_job(_generate_appliance_diagnostics, appliance)
+    ha_id = next(
+        (identifier[1] for identifier in device.identifiers if identifier[0] == DOMAIN),
+    )
+    return await _generate_appliance_diagnostics(
+        entry.runtime_data.client, entry.runtime_data.data[ha_id]
+    )
diff --git a/homeassistant/components/home_connect/entity.py b/homeassistant/components/home_connect/entity.py
index 0ae4a28b8d4..facb3b14a9b 100644
--- a/homeassistant/components/home_connect/entity.py
+++ b/homeassistant/components/home_connect/entity.py
@@ -1,57 +1,171 @@
 """Home Connect entity base class."""
 
+from abc import abstractmethod
+from collections.abc import Callable, Coroutine
+import contextlib
+from datetime import datetime
 import logging
+from typing import Any, Concatenate, cast
 
+from aiohomeconnect.model import EventKey, OptionKey
+from aiohomeconnect.model.error import (
+    ActiveProgramNotSetError,
+    HomeConnectError,
+    TooManyRequestsError,
+)
+
+from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import callback
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity import Entity, EntityDescription
+from homeassistant.helpers.entity import EntityDescription
+from homeassistant.helpers.event import async_call_later
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .api import HomeConnectDevice
-from .const import DOMAIN, SIGNAL_UPDATE_ENTITIES
+from .const import API_DEFAULT_RETRY_AFTER, DOMAIN
+from .coordinator import HomeConnectApplianceData, HomeConnectCoordinator
+from .utils import get_dict_from_home_connect_error
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class HomeConnectEntity(Entity):
+class HomeConnectEntity(CoordinatorEntity[HomeConnectCoordinator]):
     """Generic Home Connect entity (base class)."""
 
     _attr_should_poll = False
     _attr_has_entity_name = True
 
-    def __init__(self, device: HomeConnectDevice, desc: EntityDescription) -> None:
+    def __init__(
+        self,
+        coordinator: HomeConnectCoordinator,
+        appliance: HomeConnectApplianceData,
+        desc: EntityDescription,
+        context_override: Any | None = None,
+    ) -> None:
         """Initialize the entity."""
-        self.device = device
+        context = (appliance.info.ha_id, EventKey(desc.key))
+        if context_override is not None:
+            context = context_override
+        super().__init__(coordinator, context)
+        self.appliance = appliance
         self.entity_description = desc
-        self._attr_unique_id = f"{device.appliance.haId}-{self.bsh_key}"
+        self._attr_unique_id = f"{appliance.info.ha_id}-{desc.key}"
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, device.appliance.haId)},
-            manufacturer=device.appliance.brand,
-            model=device.appliance.vib,
-            name=device.appliance.name,
+            identifiers={(DOMAIN, appliance.info.ha_id)},
         )
+        self.update_native_value()
 
-    async def async_added_to_hass(self) -> None:
-        """Register callbacks."""
-        self.async_on_remove(
-            async_dispatcher_connect(
-                self.hass, SIGNAL_UPDATE_ENTITIES, self._update_callback
-            )
-        )
+    @abstractmethod
+    def update_native_value(self) -> None:
+        """Set the value of the entity."""
 
     @callback
-    def _update_callback(self, ha_id: str) -> None:
-        """Update data."""
-        if ha_id == self.device.appliance.haId:
-            self.async_entity_update()
-
-    @callback
-    def async_entity_update(self) -> None:
-        """Update the entity."""
-        _LOGGER.debug("Entity update triggered on %s", self)
-        self.async_schedule_update_ha_state(True)
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
+        self.update_native_value()
+        available = self._attr_available = self.appliance.info.connected
+        self.async_write_ha_state()
+        state = STATE_UNAVAILABLE if not available else self.state
+        _LOGGER.debug("Updated %s, new state: %s", self.entity_id, state)
 
     @property
     def bsh_key(self) -> str:
         """Return the BSH key."""
         return self.entity_description.key
+
+    @property
+    def available(self) -> bool:
+        """Return True if entity is available.
+
+        Do not use self.last_update_success for available state
+        as event updates should take precedence over the coordinator
+        refresh.
+        """
+        return self._attr_available
+
+
+class HomeConnectOptionEntity(HomeConnectEntity):
+    """Class for entities that represents program options."""
+
+    @property
+    def available(self) -> bool:
+        """Return True if entity is available."""
+        return super().available and self.bsh_key in self.appliance.options
+
+    @property
+    def option_value(self) -> str | int | float | bool | None:
+        """Return the state of the entity."""
+        if event := self.appliance.events.get(EventKey(self.bsh_key)):
+            return event.value
+        return None
+
+    async def async_set_option(self, value: str | float | bool) -> None:
+        """Set an option for the entity."""
+        try:
+            # We try to set the active program option first,
+            # if it fails we try to set the selected program option
+            with contextlib.suppress(ActiveProgramNotSetError):
+                await self.coordinator.client.set_active_program_option(
+                    self.appliance.info.ha_id,
+                    option_key=self.bsh_key,
+                    value=value,
+                )
+                _LOGGER.debug(
+                    "Updated %s for the active program, new state: %s",
+                    self.entity_id,
+                    self.state,
+                )
+                return
+
+            await self.coordinator.client.set_selected_program_option(
+                self.appliance.info.ha_id,
+                option_key=self.bsh_key,
+                value=value,
+            )
+            _LOGGER.debug(
+                "Updated %s for the selected program, new state: %s",
+                self.entity_id,
+                self.state,
+            )
+        except HomeConnectError as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="set_option",
+                translation_placeholders=get_dict_from_home_connect_error(err),
+            ) from err
+
+    @property
+    def bsh_key(self) -> OptionKey:
+        """Return the BSH key."""
+        return cast(OptionKey, self.entity_description.key)
+
+
+def constraint_fetcher[_EntityT: HomeConnectEntity, **_P](
+    func: Callable[Concatenate[_EntityT, _P], Coroutine[Any, Any, Any]],
+) -> Callable[Concatenate[_EntityT, _P], Coroutine[Any, Any, None]]:
+    """Decorate the function to catch Home Connect too many requests error and retry later.
+
+    If it needs to be called later, it will call async_write_ha_state function
+    """
+
+    async def handler_to_return(
+        self: _EntityT, *args: _P.args, **kwargs: _P.kwargs
+    ) -> None:
+        async def handler(_datetime: datetime | None = None) -> None:
+            try:
+                await func(self, *args, **kwargs)
+            except TooManyRequestsError as err:
+                if (retry_after := err.retry_after) is None:
+                    retry_after = API_DEFAULT_RETRY_AFTER
+                async_call_later(self.hass, retry_after, handler)
+            except HomeConnectError as err:
+                _LOGGER.error(
+                    "Error fetching constraints for %s: %s", self.entity_id, err
+                )
+            else:
+                if _datetime is not None:
+                    self.async_write_ha_state()
+
+        await handler()
+
+    return handler_to_return
diff --git a/homeassistant/components/home_connect/icons.json b/homeassistant/components/home_connect/icons.json
index 166b2fe2c34..9b4c9276998 100644
--- a/homeassistant/components/home_connect/icons.json
+++ b/homeassistant/components/home_connect/icons.json
@@ -18,6 +18,9 @@
     "set_option_selected": {
       "service": "mdi:gesture-tap"
     },
+    "set_program_and_options": {
+      "service": "mdi:form-select"
+    },
     "change_setting": {
       "service": "mdi:cog"
     }
@@ -46,6 +49,23 @@
         "default": "mdi:map-marker-remove-variant"
       }
     },
+    "button": {
+      "open_door": {
+        "default": "mdi:door-open"
+      },
+      "partly_open_door": {
+        "default": "mdi:door-open"
+      },
+      "pause_program": {
+        "default": "mdi:pause"
+      },
+      "resume_program": {
+        "default": "mdi:play"
+      },
+      "stop_program": {
+        "default": "mdi:stop"
+      }
+    },
     "sensor": {
       "operation_state": {
         "default": "mdi:state-machine",
@@ -93,7 +113,7 @@
       "milk_counter": {
         "default": "mdi:cup"
       },
-      "coffee_and_milk": {
+      "coffee_and_milk_counter": {
         "default": "mdi:coffee"
       },
       "ristretto_espresso_counter": {
@@ -205,6 +225,39 @@
       },
       "door-assistant_freezer": {
         "default": "mdi:door"
+      },
+      "silence_on_demand": {
+        "default": "mdi:volume-mute",
+        "state": {
+          "on": "mdi:volume-mute",
+          "off": "mdi:volume-high"
+        }
+      },
+      "half_load": {
+        "default": "mdi:fraction-one-half"
+      },
+      "hygiene_plus": {
+        "default": "mdi:silverware-clean"
+      },
+      "eco_dry": {
+        "default": "mdi:sprout"
+      },
+      "fast_pre_heat": {
+        "default": "mdi:fire"
+      },
+      "i_dos_1_active": {
+        "default": "mdi:numeric-1-circle"
+      },
+      "i_dos_2_active": {
+        "default": "mdi:numeric-2-circle"
+      }
+    },
+    "time": {
+      "start_in_relative": {
+        "default": "mdi:progress-clock"
+      },
+      "finish_in_relative": {
+        "default": "mdi:progress-clock"
       }
     }
   }
diff --git a/homeassistant/components/home_connect/light.py b/homeassistant/components/home_connect/light.py
index e33017cd51f..de55a60bd43 100644
--- a/homeassistant/components/home_connect/light.py
+++ b/homeassistant/components/home_connect/light.py
@@ -2,10 +2,10 @@
 
 from dataclasses import dataclass
 import logging
-from math import ceil
-from typing import Any
+from typing import Any, cast
 
-from homeconnect.api import HomeConnectError
+from aiohomeconnect.model import EventKey, SettingKey
+from aiohomeconnect.model.error import HomeConnectError
 
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
@@ -17,91 +17,89 @@ from homeassistant.components.light import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.color as color_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import color as color_util
 
-from . import HomeConnectConfigEntry, get_dict_from_home_connect_error
-from .api import HomeConnectDevice
-from .const import (
-    ATTR_VALUE,
-    BSH_AMBIENT_LIGHT_BRIGHTNESS,
-    BSH_AMBIENT_LIGHT_COLOR,
-    BSH_AMBIENT_LIGHT_COLOR_CUSTOM_COLOR,
-    BSH_AMBIENT_LIGHT_CUSTOM_COLOR,
-    BSH_AMBIENT_LIGHT_ENABLED,
-    COOKING_LIGHTING,
-    COOKING_LIGHTING_BRIGHTNESS,
-    DOMAIN,
-    REFRIGERATION_EXTERNAL_LIGHT_BRIGHTNESS,
-    REFRIGERATION_EXTERNAL_LIGHT_POWER,
-    REFRIGERATION_INTERNAL_LIGHT_BRIGHTNESS,
-    REFRIGERATION_INTERNAL_LIGHT_POWER,
-    SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID,
+from .common import setup_home_connect_entry
+from .const import BSH_AMBIENT_LIGHT_COLOR_CUSTOM_COLOR, DOMAIN
+from .coordinator import (
+    HomeConnectApplianceData,
+    HomeConnectConfigEntry,
+    HomeConnectCoordinator,
 )
 from .entity import HomeConnectEntity
+from .utils import get_dict_from_home_connect_error
 
 _LOGGER = logging.getLogger(__name__)
 
+PARALLEL_UPDATES = 1
+
 
 @dataclass(frozen=True, kw_only=True)
 class HomeConnectLightEntityDescription(LightEntityDescription):
     """Light entity description."""
 
-    brightness_key: str | None = None
-    color_key: str | None = None
+    brightness_key: SettingKey | None = None
+    color_key: SettingKey | None = None
     enable_custom_color_value_key: str | None = None
-    custom_color_key: str | None = None
+    custom_color_key: SettingKey | None = None
     brightness_scale: tuple[float, float] = (0.0, 100.0)
 
 
 LIGHTS: tuple[HomeConnectLightEntityDescription, ...] = (
     HomeConnectLightEntityDescription(
-        key=REFRIGERATION_INTERNAL_LIGHT_POWER,
-        brightness_key=REFRIGERATION_INTERNAL_LIGHT_BRIGHTNESS,
+        key=SettingKey.REFRIGERATION_COMMON_LIGHT_INTERNAL_POWER,
+        brightness_key=SettingKey.REFRIGERATION_COMMON_LIGHT_INTERNAL_BRIGHTNESS,
         brightness_scale=(1.0, 100.0),
         translation_key="internal_light",
     ),
     HomeConnectLightEntityDescription(
-        key=REFRIGERATION_EXTERNAL_LIGHT_POWER,
-        brightness_key=REFRIGERATION_EXTERNAL_LIGHT_BRIGHTNESS,
+        key=SettingKey.REFRIGERATION_COMMON_LIGHT_EXTERNAL_POWER,
+        brightness_key=SettingKey.REFRIGERATION_COMMON_LIGHT_EXTERNAL_BRIGHTNESS,
         brightness_scale=(1.0, 100.0),
         translation_key="external_light",
     ),
     HomeConnectLightEntityDescription(
-        key=COOKING_LIGHTING,
-        brightness_key=COOKING_LIGHTING_BRIGHTNESS,
+        key=SettingKey.COOKING_COMMON_LIGHTING,
+        brightness_key=SettingKey.COOKING_COMMON_LIGHTING_BRIGHTNESS,
         brightness_scale=(10.0, 100.0),
         translation_key="cooking_lighting",
     ),
     HomeConnectLightEntityDescription(
-        key=BSH_AMBIENT_LIGHT_ENABLED,
-        brightness_key=BSH_AMBIENT_LIGHT_BRIGHTNESS,
-        color_key=BSH_AMBIENT_LIGHT_COLOR,
+        key=SettingKey.BSH_COMMON_AMBIENT_LIGHT_ENABLED,
+        brightness_key=SettingKey.BSH_COMMON_AMBIENT_LIGHT_BRIGHTNESS,
+        color_key=SettingKey.BSH_COMMON_AMBIENT_LIGHT_COLOR,
         enable_custom_color_value_key=BSH_AMBIENT_LIGHT_COLOR_CUSTOM_COLOR,
-        custom_color_key=BSH_AMBIENT_LIGHT_CUSTOM_COLOR,
+        custom_color_key=SettingKey.BSH_COMMON_AMBIENT_LIGHT_CUSTOM_COLOR,
         brightness_scale=(10.0, 100.0),
         translation_key="ambient_light",
     ),
 )
 
 
+def _get_entities_for_appliance(
+    entry: HomeConnectConfigEntry,
+    appliance: HomeConnectApplianceData,
+) -> list[HomeConnectEntity]:
+    """Get a list of entities."""
+    return [
+        HomeConnectLight(entry.runtime_data, appliance, description)
+        for description in LIGHTS
+        if description.key in appliance.settings
+    ]
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: HomeConnectConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Home Connect light."""
-
-    def get_entities() -> list[LightEntity]:
-        """Get a list of entities."""
-        return [
-            HomeConnectLight(device, description)
-            for description in LIGHTS
-            for device in entry.runtime_data.devices
-            if description.key in device.appliance.status
-        ]
-
-    async_add_entities(await hass.async_add_executor_job(get_entities), True)
+    setup_home_connect_entry(
+        entry,
+        _get_entities_for_appliance,
+        async_add_entities,
+    )
 
 
 class HomeConnectLight(HomeConnectEntity, LightEntity):
@@ -110,13 +108,17 @@ class HomeConnectLight(HomeConnectEntity, LightEntity):
     entity_description: LightEntityDescription
 
     def __init__(
-        self, device: HomeConnectDevice, desc: HomeConnectLightEntityDescription
+        self,
+        coordinator: HomeConnectCoordinator,
+        appliance: HomeConnectApplianceData,
+        desc: HomeConnectLightEntityDescription,
     ) -> None:
         """Initialize the entity."""
-        super().__init__(device, desc)
 
-        def get_setting_key_if_setting_exists(setting_key: str | None) -> str | None:
-            if setting_key and setting_key in device.appliance.status:
+        def get_setting_key_if_setting_exists(
+            setting_key: SettingKey | None,
+        ) -> SettingKey | None:
+            if setting_key and setting_key in appliance.settings:
                 return setting_key
             return None
 
@@ -131,6 +133,8 @@ class HomeConnectLight(HomeConnectEntity, LightEntity):
         )
         self._brightness_scale = desc.brightness_scale
 
+        super().__init__(coordinator, appliance, desc)
+
         match (self._brightness_key, self._custom_color_key):
             case (None, None):
                 self._attr_color_mode = ColorMode.ONOFF
@@ -144,10 +148,11 @@ class HomeConnectLight(HomeConnectEntity, LightEntity):
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Switch the light on, change brightness, change color."""
-        _LOGGER.debug("Switching light on for: %s", self.name)
         try:
-            await self.hass.async_add_executor_job(
-                self.device.appliance.set_setting, self.bsh_key, True
+            await self.coordinator.client.set_setting(
+                self.appliance.info.ha_id,
+                setting_key=SettingKey(self.bsh_key),
+                value=True,
             )
         except HomeConnectError as err:
             raise HomeAssistantError(
@@ -155,18 +160,18 @@ class HomeConnectLight(HomeConnectEntity, LightEntity):
                 translation_key="turn_on_light",
                 translation_placeholders={
                     **get_dict_from_home_connect_error(err),
-                    SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
+                    "entity_id": self.entity_id,
                 },
             ) from err
-        if self._custom_color_key:
+        if self._color_key and self._custom_color_key:
             if (
                 ATTR_RGB_COLOR in kwargs or ATTR_HS_COLOR in kwargs
             ) and self._enable_custom_color_value_key:
                 try:
-                    await self.hass.async_add_executor_job(
-                        self.device.appliance.set_setting,
-                        self._color_key,
-                        self._enable_custom_color_value_key,
+                    await self.coordinator.client.set_setting(
+                        self.appliance.info.ha_id,
+                        setting_key=self._color_key,
+                        value=self._enable_custom_color_value_key,
                     )
                 except HomeConnectError as err:
                     raise HomeAssistantError(
@@ -174,17 +179,17 @@ class HomeConnectLight(HomeConnectEntity, LightEntity):
                         translation_key="select_light_custom_color",
                         translation_placeholders={
                             **get_dict_from_home_connect_error(err),
-                            SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
+                            "entity_id": self.entity_id,
                         },
                     ) from err
 
             if ATTR_RGB_COLOR in kwargs:
                 hex_val = color_util.color_rgb_to_hex(*kwargs[ATTR_RGB_COLOR])
                 try:
-                    await self.hass.async_add_executor_job(
-                        self.device.appliance.set_setting,
-                        self._custom_color_key,
-                        f"#{hex_val}",
+                    await self.coordinator.client.set_setting(
+                        self.appliance.info.ha_id,
+                        setting_key=self._custom_color_key,
+                        value=f"#{hex_val}",
                     )
                 except HomeConnectError as err:
                     raise HomeAssistantError(
@@ -192,56 +197,54 @@ class HomeConnectLight(HomeConnectEntity, LightEntity):
                         translation_key="set_light_color",
                         translation_placeholders={
                             **get_dict_from_home_connect_error(err),
-                            SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
+                            "entity_id": self.entity_id,
                         },
                     ) from err
-            elif (ATTR_BRIGHTNESS in kwargs or ATTR_HS_COLOR in kwargs) and (
-                self._attr_brightness is not None or ATTR_BRIGHTNESS in kwargs
+                return
+            if (self._attr_brightness is not None or ATTR_BRIGHTNESS in kwargs) and (
+                self._attr_hs_color is not None or ATTR_HS_COLOR in kwargs
             ):
-                brightness = 10 + ceil(
+                brightness = round(
                     color_util.brightness_to_value(
                         self._brightness_scale,
-                        kwargs.get(ATTR_BRIGHTNESS, self._attr_brightness),
+                        cast(int, kwargs.get(ATTR_BRIGHTNESS, self._attr_brightness)),
                     )
                 )
 
-                hs_color = kwargs.get(ATTR_HS_COLOR, self._attr_hs_color)
+                hs_color = cast(
+                    tuple[float, float], kwargs.get(ATTR_HS_COLOR, self._attr_hs_color)
+                )
 
-                if hs_color is not None:
-                    rgb = color_util.color_hsv_to_RGB(
-                        hs_color[0], hs_color[1], brightness
+                rgb = color_util.color_hsv_to_RGB(hs_color[0], hs_color[1], brightness)
+                hex_val = color_util.color_rgb_to_hex(*rgb)
+                try:
+                    await self.coordinator.client.set_setting(
+                        self.appliance.info.ha_id,
+                        setting_key=self._custom_color_key,
+                        value=f"#{hex_val}",
                     )
-                    hex_val = color_util.color_rgb_to_hex(*rgb)
-                    try:
-                        await self.hass.async_add_executor_job(
-                            self.device.appliance.set_setting,
-                            self._custom_color_key,
-                            f"#{hex_val}",
-                        )
-                    except HomeConnectError as err:
-                        raise HomeAssistantError(
-                            translation_domain=DOMAIN,
-                            translation_key="set_light_color",
-                            translation_placeholders={
-                                **get_dict_from_home_connect_error(err),
-                                SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
-                            },
-                        ) from err
+                except HomeConnectError as err:
+                    raise HomeAssistantError(
+                        translation_domain=DOMAIN,
+                        translation_key="set_light_color",
+                        translation_placeholders={
+                            **get_dict_from_home_connect_error(err),
+                            "entity_id": self.entity_id,
+                        },
+                    ) from err
+                return
 
-        elif self._brightness_key and ATTR_BRIGHTNESS in kwargs:
-            _LOGGER.debug(
-                "Changing brightness for: %s, to: %s",
-                self.name,
-                kwargs[ATTR_BRIGHTNESS],
-            )
-            brightness = ceil(
+        if self._brightness_key and ATTR_BRIGHTNESS in kwargs:
+            brightness = round(
                 color_util.brightness_to_value(
                     self._brightness_scale, kwargs[ATTR_BRIGHTNESS]
                 )
             )
             try:
-                await self.hass.async_add_executor_job(
-                    self.device.appliance.set_setting, self._brightness_key, brightness
+                await self.coordinator.client.set_setting(
+                    self.appliance.info.ha_id,
+                    setting_key=self._brightness_key,
+                    value=brightness,
                 )
             except HomeConnectError as err:
                 raise HomeAssistantError(
@@ -249,18 +252,17 @@ class HomeConnectLight(HomeConnectEntity, LightEntity):
                     translation_key="set_light_brightness",
                     translation_placeholders={
                         **get_dict_from_home_connect_error(err),
-                        SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
+                        "entity_id": self.entity_id,
                     },
                 ) from err
 
-        self.async_entity_update()
-
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Switch the light off."""
-        _LOGGER.debug("Switching light off for: %s", self.name)
         try:
-            await self.hass.async_add_executor_job(
-                self.device.appliance.set_setting, self.bsh_key, False
+            await self.coordinator.client.set_setting(
+                self.appliance.info.ha_id,
+                setting_key=SettingKey(self.bsh_key),
+                value=False,
             )
         except HomeConnectError as err:
             raise HomeAssistantError(
@@ -268,33 +270,53 @@ class HomeConnectLight(HomeConnectEntity, LightEntity):
                 translation_key="turn_off_light",
                 translation_placeholders={
                     **get_dict_from_home_connect_error(err),
-                    SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
+                    "entity_id": self.entity_id,
                 },
             ) from err
-        self.async_entity_update()
 
-    async def async_update(self) -> None:
+    async def async_added_to_hass(self) -> None:
+        """Register listener."""
+        await super().async_added_to_hass()
+        keys_to_listen = []
+        if self._brightness_key:
+            keys_to_listen.append(self._brightness_key)
+        if self._color_key and self._custom_color_key:
+            keys_to_listen.extend([self._color_key, self._custom_color_key])
+        for key in keys_to_listen:
+            self.async_on_remove(
+                self.coordinator.async_add_listener(
+                    self._handle_coordinator_update,
+                    (
+                        self.appliance.info.ha_id,
+                        EventKey(key),
+                    ),
+                )
+            )
+
+    def update_native_value(self) -> None:
         """Update the light's status."""
-        if self.device.appliance.status.get(self.bsh_key, {}).get(ATTR_VALUE) is True:
-            self._attr_is_on = True
-        elif (
-            self.device.appliance.status.get(self.bsh_key, {}).get(ATTR_VALUE) is False
-        ):
-            self._attr_is_on = False
-        else:
-            self._attr_is_on = None
+        self._attr_is_on = self.appliance.settings[SettingKey(self.bsh_key)].value
 
-        _LOGGER.debug("Updated, new light state: %s", self._attr_is_on)
-
-        if self._custom_color_key:
-            color = self.device.appliance.status.get(self._custom_color_key, {})
-
-            if not color:
+        if self._brightness_key:
+            brightness = cast(
+                float, self.appliance.settings[self._brightness_key].value
+            )
+            self._attr_brightness = color_util.value_to_brightness(
+                self._brightness_scale, brightness
+            )
+            _LOGGER.debug(
+                "Updated %s, new brightness: %s", self.entity_id, self._attr_brightness
+            )
+        if self._color_key and self._custom_color_key:
+            color = cast(str, self.appliance.settings[self._color_key].value)
+            if color != self._enable_custom_color_value_key:
                 self._attr_rgb_color = None
                 self._attr_hs_color = None
-                self._attr_brightness = None
             else:
-                color_value = color.get(ATTR_VALUE)[1:]
+                custom_color = cast(
+                    str, self.appliance.settings[self._custom_color_key].value
+                )
+                color_value = custom_color[1:]
                 rgb = color_util.rgb_hex_to_rgb_list(color_value)
                 self._attr_rgb_color = (rgb[0], rgb[1], rgb[2])
                 hsv = color_util.color_RGB_to_hsv(*rgb)
@@ -303,16 +325,8 @@ class HomeConnectLight(HomeConnectEntity, LightEntity):
                     self._brightness_scale, hsv[2]
                 )
                 _LOGGER.debug(
-                    "Updated, new color (%s) and new brightness (%s) ",
+                    "Updated %s, new color (%s) and new brightness (%s) ",
+                    self.entity_id,
                     color_value,
                     self._attr_brightness,
                 )
-        elif self._brightness_key:
-            brightness = self.device.appliance.status.get(self._brightness_key, {})
-            if brightness is None:
-                self._attr_brightness = None
-            else:
-                self._attr_brightness = color_util.value_to_brightness(
-                    self._brightness_scale, brightness[ATTR_VALUE]
-                )
-            _LOGGER.debug("Updated, new brightness: %s", self._attr_brightness)
diff --git a/homeassistant/components/home_connect/manifest.json b/homeassistant/components/home_connect/manifest.json
index e041e13d36b..62892e7c85b 100644
--- a/homeassistant/components/home_connect/manifest.json
+++ b/homeassistant/components/home_connect/manifest.json
@@ -1,11 +1,12 @@
 {
   "domain": "home_connect",
   "name": "Home Connect",
-  "codeowners": ["@DavidMStraub", "@Diegorro98"],
+  "codeowners": ["@DavidMStraub", "@Diegorro98", "@MartinHjelmare"],
   "config_flow": true,
-  "dependencies": ["application_credentials"],
+  "dependencies": ["application_credentials", "repairs"],
   "documentation": "https://www.home-assistant.io/integrations/home_connect",
   "iot_class": "cloud_push",
-  "loggers": ["homeconnect"],
-  "requirements": ["homeconnect==0.8.0"]
+  "loggers": ["aiohomeconnect"],
+  "requirements": ["aiohomeconnect==0.16.3"],
+  "single_config_entry": true
 }
diff --git a/homeassistant/components/home_connect/number.py b/homeassistant/components/home_connect/number.py
index 0703b4772bb..1bb793f4015 100644
--- a/homeassistant/components/home_connect/number.py
+++ b/homeassistant/components/home_connect/number.py
@@ -1,103 +1,161 @@
-"""Provides number enties for Home Connect."""
+"""Provides number entities for Home Connect."""
 
 import logging
+from typing import cast
 
-from homeconnect.api import HomeConnectError
+from aiohomeconnect.model import GetSetting, OptionKey, SettingKey
+from aiohomeconnect.model.error import HomeConnectError
 
 from homeassistant.components.number import (
-    ATTR_MAX,
-    ATTR_MIN,
     NumberDeviceClass,
     NumberEntity,
     NumberEntityDescription,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import HomeConnectConfigEntry, get_dict_from_home_connect_error
-from .const import (
-    ATTR_CONSTRAINTS,
-    ATTR_STEPSIZE,
-    ATTR_UNIT,
-    ATTR_VALUE,
-    DOMAIN,
-    SVE_TRANSLATION_KEY_SET_SETTING,
-    SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID,
-    SVE_TRANSLATION_PLACEHOLDER_KEY,
-    SVE_TRANSLATION_PLACEHOLDER_VALUE,
-)
-from .entity import HomeConnectEntity
+from .common import setup_home_connect_entry
+from .const import DOMAIN, UNIT_MAP
+from .coordinator import HomeConnectApplianceData, HomeConnectConfigEntry
+from .entity import HomeConnectEntity, HomeConnectOptionEntity, constraint_fetcher
+from .utils import get_dict_from_home_connect_error
 
 _LOGGER = logging.getLogger(__name__)
 
+PARALLEL_UPDATES = 1
 
 NUMBERS = (
     NumberEntityDescription(
-        key="Refrigeration.FridgeFreezer.Setting.SetpointTemperatureRefrigerator",
+        key=SettingKey.BSH_COMMON_ALARM_CLOCK,
+        device_class=NumberDeviceClass.DURATION,
+        translation_key="alarm_clock",
+    ),
+    NumberEntityDescription(
+        key=SettingKey.REFRIGERATION_FRIDGE_FREEZER_SETPOINT_TEMPERATURE_REFRIGERATOR,
         device_class=NumberDeviceClass.TEMPERATURE,
         translation_key="refrigerator_setpoint_temperature",
     ),
     NumberEntityDescription(
-        key="Refrigeration.FridgeFreezer.Setting.SetpointTemperatureFreezer",
+        key=SettingKey.REFRIGERATION_FRIDGE_FREEZER_SETPOINT_TEMPERATURE_FREEZER,
         device_class=NumberDeviceClass.TEMPERATURE,
         translation_key="freezer_setpoint_temperature",
     ),
     NumberEntityDescription(
-        key="Refrigeration.Common.Setting.BottleCooler.SetpointTemperature",
+        key=SettingKey.REFRIGERATION_COMMON_BOTTLE_COOLER_SETPOINT_TEMPERATURE,
         device_class=NumberDeviceClass.TEMPERATURE,
         translation_key="bottle_cooler_setpoint_temperature",
     ),
     NumberEntityDescription(
-        key="Refrigeration.Common.Setting.ChillerLeft.SetpointTemperature",
+        key=SettingKey.REFRIGERATION_COMMON_CHILLER_LEFT_SETPOINT_TEMPERATURE,
         device_class=NumberDeviceClass.TEMPERATURE,
         translation_key="chiller_left_setpoint_temperature",
     ),
     NumberEntityDescription(
-        key="Refrigeration.Common.Setting.ChillerCommon.SetpointTemperature",
+        key=SettingKey.REFRIGERATION_COMMON_CHILLER_COMMON_SETPOINT_TEMPERATURE,
         device_class=NumberDeviceClass.TEMPERATURE,
         translation_key="chiller_setpoint_temperature",
     ),
     NumberEntityDescription(
-        key="Refrigeration.Common.Setting.ChillerRight.SetpointTemperature",
+        key=SettingKey.REFRIGERATION_COMMON_CHILLER_RIGHT_SETPOINT_TEMPERATURE,
         device_class=NumberDeviceClass.TEMPERATURE,
         translation_key="chiller_right_setpoint_temperature",
     ),
     NumberEntityDescription(
-        key="Refrigeration.Common.Setting.WineCompartment.SetpointTemperature",
+        key=SettingKey.REFRIGERATION_COMMON_WINE_COMPARTMENT_SETPOINT_TEMPERATURE,
         device_class=NumberDeviceClass.TEMPERATURE,
         translation_key="wine_compartment_setpoint_temperature",
     ),
     NumberEntityDescription(
-        key="Refrigeration.Common.Setting.WineCompartment2.SetpointTemperature",
+        key=SettingKey.REFRIGERATION_COMMON_WINE_COMPARTMENT_2_SETPOINT_TEMPERATURE,
         device_class=NumberDeviceClass.TEMPERATURE,
         translation_key="wine_compartment_2_setpoint_temperature",
     ),
     NumberEntityDescription(
-        key="Refrigeration.Common.Setting.WineCompartment3.SetpointTemperature",
+        key=SettingKey.REFRIGERATION_COMMON_WINE_COMPARTMENT_3_SETPOINT_TEMPERATURE,
         device_class=NumberDeviceClass.TEMPERATURE,
         translation_key="wine_compartment_3_setpoint_temperature",
     ),
+    NumberEntityDescription(
+        key=SettingKey.COOKING_HOOD_COLOR_TEMPERATURE_PERCENT,
+        translation_key="color_temperature_percent",
+        native_unit_of_measurement="%",
+    ),
+    NumberEntityDescription(
+        key=SettingKey.LAUNDRY_CARE_WASHER_I_DOS_1_BASE_LEVEL,
+        device_class=NumberDeviceClass.VOLUME,
+        translation_key="washer_i_dos_1_base_level",
+    ),
+    NumberEntityDescription(
+        key=SettingKey.LAUNDRY_CARE_WASHER_I_DOS_2_BASE_LEVEL,
+        device_class=NumberDeviceClass.VOLUME,
+        translation_key="washer_i_dos_2_base_level",
+    ),
 )
 
+NUMBER_OPTIONS = (
+    NumberEntityDescription(
+        key=OptionKey.BSH_COMMON_DURATION,
+        translation_key="duration",
+    ),
+    NumberEntityDescription(
+        key=OptionKey.BSH_COMMON_FINISH_IN_RELATIVE,
+        translation_key="finish_in_relative",
+    ),
+    NumberEntityDescription(
+        key=OptionKey.BSH_COMMON_START_IN_RELATIVE,
+        translation_key="start_in_relative",
+    ),
+    NumberEntityDescription(
+        key=OptionKey.CONSUMER_PRODUCTS_COFFEE_MAKER_FILL_QUANTITY,
+        translation_key="fill_quantity",
+        device_class=NumberDeviceClass.VOLUME,
+        native_step=1,
+    ),
+    NumberEntityDescription(
+        key=OptionKey.COOKING_OVEN_SETPOINT_TEMPERATURE,
+        translation_key="setpoint_temperature",
+        device_class=NumberDeviceClass.TEMPERATURE,
+    ),
+)
+
+
+def _get_entities_for_appliance(
+    entry: HomeConnectConfigEntry,
+    appliance: HomeConnectApplianceData,
+) -> list[HomeConnectEntity]:
+    """Get a list of entities."""
+    return [
+        HomeConnectNumberEntity(entry.runtime_data, appliance, description)
+        for description in NUMBERS
+        if description.key in appliance.settings
+    ]
+
+
+def _get_option_entities_for_appliance(
+    entry: HomeConnectConfigEntry,
+    appliance: HomeConnectApplianceData,
+) -> list[HomeConnectOptionEntity]:
+    """Get a list of currently available option entities."""
+    return [
+        HomeConnectOptionNumberEntity(entry.runtime_data, appliance, description)
+        for description in NUMBER_OPTIONS
+        if description.key in appliance.options
+    ]
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: HomeConnectConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Home Connect number."""
-
-    def get_entities() -> list[HomeConnectNumberEntity]:
-        """Get a list of entities."""
-        return [
-            HomeConnectNumberEntity(device, description)
-            for description in NUMBERS
-            for device in entry.runtime_data.devices
-            if description.key in device.appliance.status
-        ]
-
-    async_add_entities(await hass.async_add_executor_job(get_entities), True)
+    setup_home_connect_entry(
+        entry,
+        _get_entities_for_appliance,
+        async_add_entities,
+        _get_option_entities_for_appliance,
+    )
 
 
 class HomeConnectNumberEntity(HomeConnectEntity, NumberEntity):
@@ -112,54 +170,107 @@ class HomeConnectNumberEntity(HomeConnectEntity, NumberEntity):
             self.entity_id,
         )
         try:
-            await self.hass.async_add_executor_job(
-                self.device.appliance.set_setting,
-                self.bsh_key,
-                value,
+            await self.coordinator.client.set_setting(
+                self.appliance.info.ha_id,
+                setting_key=SettingKey(self.bsh_key),
+                value=value,
             )
         except HomeConnectError as err:
             raise HomeAssistantError(
                 translation_domain=DOMAIN,
-                translation_key=SVE_TRANSLATION_KEY_SET_SETTING,
+                translation_key="set_setting_entity",
                 translation_placeholders={
                     **get_dict_from_home_connect_error(err),
-                    SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
-                    SVE_TRANSLATION_PLACEHOLDER_KEY: self.bsh_key,
-                    SVE_TRANSLATION_PLACEHOLDER_VALUE: str(value),
+                    "entity_id": self.entity_id,
+                    "key": self.bsh_key,
+                    "value": str(value),
                 },
             ) from err
 
+    @constraint_fetcher
     async def async_fetch_constraints(self) -> None:
         """Fetch the max and min values and step for the number entity."""
-        try:
-            data = await self.hass.async_add_executor_job(
-                self.device.appliance.get, f"/settings/{self.bsh_key}"
+        setting_key = cast(SettingKey, self.bsh_key)
+        data = self.appliance.settings.get(setting_key)
+        if not data or not data.unit or not data.constraints:
+            data = await self.coordinator.client.get_setting(
+                self.appliance.info.ha_id, setting_key=setting_key
             )
-        except HomeConnectError as err:
-            _LOGGER.error("An error occurred: %s", err)
-            return
-        if not data or not (constraints := data.get(ATTR_CONSTRAINTS)):
-            return
-        self._attr_native_max_value = constraints.get(ATTR_MAX)
-        self._attr_native_min_value = constraints.get(ATTR_MIN)
-        self._attr_native_step = constraints.get(ATTR_STEPSIZE)
-        self._attr_native_unit_of_measurement = data.get(ATTR_UNIT)
+            if data.unit:
+                self._attr_native_unit_of_measurement = data.unit
+            self.set_constraints(data)
 
-    async def async_update(self) -> None:
-        """Update the number setting status."""
-        if not (data := self.device.appliance.status.get(self.bsh_key)):
-            _LOGGER.error("No value for %s", self.bsh_key)
-            self._attr_native_value = None
+    def set_constraints(self, setting: GetSetting) -> None:
+        """Set constraints for the number entity."""
+        if setting.unit:
+            self._attr_native_unit_of_measurement = UNIT_MAP.get(
+                setting.unit, setting.unit
+            )
+        if not (constraints := setting.constraints):
             return
-        self._attr_native_value = data.get(ATTR_VALUE, None)
-        _LOGGER.debug("Updated, new value: %s", self._attr_native_value)
+        if constraints.max:
+            self._attr_native_max_value = constraints.max
+        if constraints.min:
+            self._attr_native_min_value = constraints.min
+        if constraints.step_size:
+            self._attr_native_step = constraints.step_size
+        else:
+            self._attr_native_step = 0.1 if setting.type == "Double" else 1
 
+    def update_native_value(self) -> None:
+        """Update status when an event for the entity is received."""
+        data = self.appliance.settings[cast(SettingKey, self.bsh_key)]
+        self._attr_native_value = cast(float, data.value)
+
+    async def async_added_to_hass(self) -> None:
+        """When entity is added to hass."""
+        await super().async_added_to_hass()
+        data = self.appliance.settings[cast(SettingKey, self.bsh_key)]
+        self.set_constraints(data)
         if (
-            not hasattr(self, "_attr_native_min_value")
-            or self._attr_native_min_value is None
+            not hasattr(self, "_attr_native_unit_of_measurement")
+            or not hasattr(self, "_attr_native_min_value")
             or not hasattr(self, "_attr_native_max_value")
-            or self._attr_native_max_value is None
             or not hasattr(self, "_attr_native_step")
-            or self._attr_native_step is None
         ):
             await self.async_fetch_constraints()
+
+
+class HomeConnectOptionNumberEntity(HomeConnectOptionEntity, NumberEntity):
+    """Number option class for Home Connect."""
+
+    async def async_set_native_value(self, value: float) -> None:
+        """Set the native value of the entity."""
+        await self.async_set_option(value)
+
+    def update_native_value(self) -> None:
+        """Set the value of the entity."""
+        self._attr_native_value = cast(float | None, self.option_value)
+        option_definition = self.appliance.options.get(self.bsh_key)
+        if option_definition:
+            if option_definition.unit:
+                candidate_unit = UNIT_MAP.get(
+                    option_definition.unit, option_definition.unit
+                )
+                if (
+                    not hasattr(self, "_attr_native_unit_of_measurement")
+                    or candidate_unit != self._attr_native_unit_of_measurement
+                ):
+                    self._attr_native_unit_of_measurement = candidate_unit
+            option_constraints = option_definition.constraints
+            if option_constraints:
+                if (
+                    not hasattr(self, "_attr_native_min_value")
+                    or self._attr_native_min_value != option_constraints.min
+                ) and option_constraints.min:
+                    self._attr_native_min_value = option_constraints.min
+                if (
+                    not hasattr(self, "_attr_native_max_value")
+                    or self._attr_native_max_value != option_constraints.max
+                ) and option_constraints.max:
+                    self._attr_native_max_value = option_constraints.max
+                if (
+                    not hasattr(self, "_attr_native_step")
+                    or self._attr_native_step != option_constraints.step_size
+                ) and option_constraints.step_size:
+                    self._attr_native_step = option_constraints.step_size
diff --git a/homeassistant/components/home_connect/select.py b/homeassistant/components/home_connect/select.py
index a4a5861afbe..c82e0686cb5 100644
--- a/homeassistant/components/home_connect/select.py
+++ b/homeassistant/components/home_connect/select.py
@@ -1,301 +1,533 @@
 """Provides a select platform for Home Connect."""
 
-import contextlib
+from collections.abc import Callable, Coroutine
+from dataclasses import dataclass
 import logging
+from typing import Any, cast
 
-from homeconnect.api import HomeConnectError
+from aiohomeconnect.client import Client as HomeConnectClient
+from aiohomeconnect.model import EventKey, OptionKey, ProgramKey, SettingKey
+from aiohomeconnect.model.error import HomeConnectError
+from aiohomeconnect.model.program import Execution
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import (
-    HomeConnectConfigEntry,
-    bsh_key_to_translation_key,
-    get_dict_from_home_connect_error,
-)
-from .api import HomeConnectDevice
+from .common import setup_home_connect_entry
 from .const import (
     APPLIANCES_WITH_PROGRAMS,
-    ATTR_VALUE,
-    BSH_ACTIVE_PROGRAM,
-    BSH_SELECTED_PROGRAM,
+    AVAILABLE_MAPS_ENUM,
+    BEAN_AMOUNT_OPTIONS,
+    BEAN_CONTAINER_OPTIONS,
+    CLEANING_MODE_OPTIONS,
+    COFFEE_MILK_RATIO_OPTIONS,
+    COFFEE_TEMPERATURE_OPTIONS,
     DOMAIN,
-    SVE_TRANSLATION_PLACEHOLDER_PROGRAM,
+    DRYING_TARGET_OPTIONS,
+    FLOW_RATE_OPTIONS,
+    HOT_WATER_TEMPERATURE_OPTIONS,
+    INTENSIVE_LEVEL_OPTIONS,
+    PROGRAMS_TRANSLATION_KEYS_MAP,
+    SPIN_SPEED_OPTIONS,
+    TEMPERATURE_OPTIONS,
+    TRANSLATION_KEYS_PROGRAMS_MAP,
+    VARIO_PERFECT_OPTIONS,
+    VENTING_LEVEL_OPTIONS,
+    WARMING_LEVEL_OPTIONS,
 )
-from .entity import HomeConnectEntity
+from .coordinator import (
+    HomeConnectApplianceData,
+    HomeConnectConfigEntry,
+    HomeConnectCoordinator,
+)
+from .entity import HomeConnectEntity, HomeConnectOptionEntity, constraint_fetcher
+from .utils import bsh_key_to_translation_key, get_dict_from_home_connect_error
 
 _LOGGER = logging.getLogger(__name__)
 
-TRANSLATION_KEYS_PROGRAMS_MAP = {
-    bsh_key_to_translation_key(program): program
-    for program in (
-        "ConsumerProducts.CleaningRobot.Program.Cleaning.CleanAll",
-        "ConsumerProducts.CleaningRobot.Program.Cleaning.CleanMap",
-        "ConsumerProducts.CleaningRobot.Program.Basic.GoHome",
-        "ConsumerProducts.CoffeeMaker.Program.Beverage.Ristretto",
-        "ConsumerProducts.CoffeeMaker.Program.Beverage.Espresso",
-        "ConsumerProducts.CoffeeMaker.Program.Beverage.EspressoDoppio",
-        "ConsumerProducts.CoffeeMaker.Program.Beverage.Coffee",
-        "ConsumerProducts.CoffeeMaker.Program.Beverage.XLCoffee",
-        "ConsumerProducts.CoffeeMaker.Program.Beverage.CaffeGrande",
-        "ConsumerProducts.CoffeeMaker.Program.Beverage.EspressoMacchiato",
-        "ConsumerProducts.CoffeeMaker.Program.Beverage.Cappuccino",
-        "ConsumerProducts.CoffeeMaker.Program.Beverage.LatteMacchiato",
-        "ConsumerProducts.CoffeeMaker.Program.Beverage.CaffeLatte",
-        "ConsumerProducts.CoffeeMaker.Program.Beverage.MilkFroth",
-        "ConsumerProducts.CoffeeMaker.Program.Beverage.WarmMilk",
-        "ConsumerProducts.CoffeeMaker.Program.CoffeeWorld.KleinerBrauner",
-        "ConsumerProducts.CoffeeMaker.Program.CoffeeWorld.GrosserBrauner",
-        "ConsumerProducts.CoffeeMaker.Program.CoffeeWorld.Verlaengerter",
-        "ConsumerProducts.CoffeeMaker.Program.CoffeeWorld.VerlaengerterBraun",
-        "ConsumerProducts.CoffeeMaker.Program.CoffeeWorld.WienerMelange",
-        "ConsumerProducts.CoffeeMaker.Program.CoffeeWorld.FlatWhite",
-        "ConsumerProducts.CoffeeMaker.Program.CoffeeWorld.Cortado",
-        "ConsumerProducts.CoffeeMaker.Program.CoffeeWorld.CafeCortado",
-        "ConsumerProducts.CoffeeMaker.Program.CoffeeWorld.CafeConLeche",
-        "ConsumerProducts.CoffeeMaker.Program.CoffeeWorld.CafeAuLait",
-        "ConsumerProducts.CoffeeMaker.Program.CoffeeWorld.Doppio",
-        "ConsumerProducts.CoffeeMaker.Program.CoffeeWorld.Kaapi",
-        "ConsumerProducts.CoffeeMaker.Program.CoffeeWorld.KoffieVerkeerd",
-        "ConsumerProducts.CoffeeMaker.Program.CoffeeWorld.Galao",
-        "ConsumerProducts.CoffeeMaker.Program.CoffeeWorld.Garoto",
-        "ConsumerProducts.CoffeeMaker.Program.CoffeeWorld.Americano",
-        "ConsumerProducts.CoffeeMaker.Program.CoffeeWorld.RedEye",
-        "ConsumerProducts.CoffeeMaker.Program.CoffeeWorld.BlackEye",
-        "ConsumerProducts.CoffeeMaker.Program.CoffeeWorld.DeadEye",
-        "ConsumerProducts.CoffeeMaker.Program.Beverage.HotWater",
-        "Dishcare.Dishwasher.Program.PreRinse",
-        "Dishcare.Dishwasher.Program.Auto1",
-        "Dishcare.Dishwasher.Program.Auto2",
-        "Dishcare.Dishwasher.Program.Auto3",
-        "Dishcare.Dishwasher.Program.Eco50",
-        "Dishcare.Dishwasher.Program.Quick45",
-        "Dishcare.Dishwasher.Program.Intensiv70",
-        "Dishcare.Dishwasher.Program.Normal65",
-        "Dishcare.Dishwasher.Program.Glas40",
-        "Dishcare.Dishwasher.Program.GlassCare",
-        "Dishcare.Dishwasher.Program.NightWash",
-        "Dishcare.Dishwasher.Program.Quick65",
-        "Dishcare.Dishwasher.Program.Normal45",
-        "Dishcare.Dishwasher.Program.Intensiv45",
-        "Dishcare.Dishwasher.Program.AutoHalfLoad",
-        "Dishcare.Dishwasher.Program.IntensivPower",
-        "Dishcare.Dishwasher.Program.MagicDaily",
-        "Dishcare.Dishwasher.Program.Super60",
-        "Dishcare.Dishwasher.Program.Kurz60",
-        "Dishcare.Dishwasher.Program.ExpressSparkle65",
-        "Dishcare.Dishwasher.Program.MachineCare",
-        "Dishcare.Dishwasher.Program.SteamFresh",
-        "Dishcare.Dishwasher.Program.MaximumCleaning",
-        "Dishcare.Dishwasher.Program.MixedLoad",
-        "LaundryCare.Dryer.Program.Cotton",
-        "LaundryCare.Dryer.Program.Synthetic",
-        "LaundryCare.Dryer.Program.Mix",
-        "LaundryCare.Dryer.Program.Blankets",
-        "LaundryCare.Dryer.Program.BusinessShirts",
-        "LaundryCare.Dryer.Program.DownFeathers",
-        "LaundryCare.Dryer.Program.Hygiene",
-        "LaundryCare.Dryer.Program.Jeans",
-        "LaundryCare.Dryer.Program.Outdoor",
-        "LaundryCare.Dryer.Program.SyntheticRefresh",
-        "LaundryCare.Dryer.Program.Towels",
-        "LaundryCare.Dryer.Program.Delicates",
-        "LaundryCare.Dryer.Program.Super40",
-        "LaundryCare.Dryer.Program.Shirts15",
-        "LaundryCare.Dryer.Program.Pillow",
-        "LaundryCare.Dryer.Program.AntiShrink",
-        "LaundryCare.Dryer.Program.MyTime.MyDryingTime",
-        "LaundryCare.Dryer.Program.TimeCold",
-        "LaundryCare.Dryer.Program.TimeWarm",
-        "LaundryCare.Dryer.Program.InBasket",
-        "LaundryCare.Dryer.Program.TimeColdFix.TimeCold20",
-        "LaundryCare.Dryer.Program.TimeColdFix.TimeCold30",
-        "LaundryCare.Dryer.Program.TimeColdFix.TimeCold60",
-        "LaundryCare.Dryer.Program.TimeWarmFix.TimeWarm30",
-        "LaundryCare.Dryer.Program.TimeWarmFix.TimeWarm40",
-        "LaundryCare.Dryer.Program.TimeWarmFix.TimeWarm60",
-        "LaundryCare.Dryer.Program.Dessous",
-        "Cooking.Common.Program.Hood.Automatic",
-        "Cooking.Common.Program.Hood.Venting",
-        "Cooking.Common.Program.Hood.DelayedShutOff",
-        "Cooking.Oven.Program.HeatingMode.PreHeating",
-        "Cooking.Oven.Program.HeatingMode.HotAir",
-        "Cooking.Oven.Program.HeatingMode.HotAirEco",
-        "Cooking.Oven.Program.HeatingMode.HotAirGrilling",
-        "Cooking.Oven.Program.HeatingMode.TopBottomHeating",
-        "Cooking.Oven.Program.HeatingMode.TopBottomHeatingEco",
-        "Cooking.Oven.Program.HeatingMode.BottomHeating",
-        "Cooking.Oven.Program.HeatingMode.PizzaSetting",
-        "Cooking.Oven.Program.HeatingMode.SlowCook",
-        "Cooking.Oven.Program.HeatingMode.IntensiveHeat",
-        "Cooking.Oven.Program.HeatingMode.KeepWarm",
-        "Cooking.Oven.Program.HeatingMode.PreheatOvenware",
-        "Cooking.Oven.Program.HeatingMode.FrozenHeatupSpecial",
-        "Cooking.Oven.Program.HeatingMode.Desiccation",
-        "Cooking.Oven.Program.HeatingMode.Defrost",
-        "Cooking.Oven.Program.HeatingMode.Proof",
-        "Cooking.Oven.Program.HeatingMode.HotAir30Steam",
-        "Cooking.Oven.Program.HeatingMode.HotAir60Steam",
-        "Cooking.Oven.Program.HeatingMode.HotAir80Steam",
-        "Cooking.Oven.Program.HeatingMode.HotAir100Steam",
-        "Cooking.Oven.Program.HeatingMode.SabbathProgramme",
-        "Cooking.Oven.Program.Microwave.90Watt",
-        "Cooking.Oven.Program.Microwave.180Watt",
-        "Cooking.Oven.Program.Microwave.360Watt",
-        "Cooking.Oven.Program.Microwave.600Watt",
-        "Cooking.Oven.Program.Microwave.900Watt",
-        "Cooking.Oven.Program.Microwave.1000Watt",
-        "Cooking.Oven.Program.Microwave.Max",
-        "Cooking.Oven.Program.HeatingMode.WarmingDrawer",
-        "LaundryCare.Washer.Program.Cotton",
-        "LaundryCare.Washer.Program.Cotton.CottonEco",
-        "LaundryCare.Washer.Program.Cotton.Eco4060",
-        "LaundryCare.Washer.Program.Cotton.Colour",
-        "LaundryCare.Washer.Program.EasyCare",
-        "LaundryCare.Washer.Program.Mix",
-        "LaundryCare.Washer.Program.Mix.NightWash",
-        "LaundryCare.Washer.Program.DelicatesSilk",
-        "LaundryCare.Washer.Program.Wool",
-        "LaundryCare.Washer.Program.Sensitive",
-        "LaundryCare.Washer.Program.Auto30",
-        "LaundryCare.Washer.Program.Auto40",
-        "LaundryCare.Washer.Program.Auto60",
-        "LaundryCare.Washer.Program.Chiffon",
-        "LaundryCare.Washer.Program.Curtains",
-        "LaundryCare.Washer.Program.DarkWash",
-        "LaundryCare.Washer.Program.Dessous",
-        "LaundryCare.Washer.Program.Monsoon",
-        "LaundryCare.Washer.Program.Outdoor",
-        "LaundryCare.Washer.Program.PlushToy",
-        "LaundryCare.Washer.Program.ShirtsBlouses",
-        "LaundryCare.Washer.Program.SportFitness",
-        "LaundryCare.Washer.Program.Towels",
-        "LaundryCare.Washer.Program.WaterProof",
-        "LaundryCare.Washer.Program.PowerSpeed59",
-        "LaundryCare.Washer.Program.Super153045.Super15",
-        "LaundryCare.Washer.Program.Super153045.Super1530",
-        "LaundryCare.Washer.Program.DownDuvet.Duvet",
-        "LaundryCare.Washer.Program.Rinse.RinseSpinDrain",
-        "LaundryCare.Washer.Program.DrumClean",
-        "LaundryCare.WasherDryer.Program.Cotton",
-        "LaundryCare.WasherDryer.Program.Cotton.Eco4060",
-        "LaundryCare.WasherDryer.Program.Mix",
-        "LaundryCare.WasherDryer.Program.EasyCare",
-        "LaundryCare.WasherDryer.Program.WashAndDry60",
-        "LaundryCare.WasherDryer.Program.WashAndDry90",
+PARALLEL_UPDATES = 1
+
+FUNCTIONAL_LIGHT_COLOR_TEMPERATURE_ENUM = {
+    bsh_key_to_translation_key(option): option
+    for option in (
+        "Cooking.Hood.EnumType.ColorTemperature.custom",
+        "Cooking.Hood.EnumType.ColorTemperature.warm",
+        "Cooking.Hood.EnumType.ColorTemperature.warmToNeutral",
+        "Cooking.Hood.EnumType.ColorTemperature.neutral",
+        "Cooking.Hood.EnumType.ColorTemperature.neutralToCold",
+        "Cooking.Hood.EnumType.ColorTemperature.cold",
     )
 }
 
-PROGRAMS_TRANSLATION_KEYS_MAP = {
-    value: key for key, value in TRANSLATION_KEYS_PROGRAMS_MAP.items()
+AMBIENT_LIGHT_COLOR_TEMPERATURE_ENUM = {
+    **{
+        bsh_key_to_translation_key(option): option
+        for option in ("BSH.Common.EnumType.AmbientLightColor.CustomColor",)
+    },
+    **{
+        str(option): f"BSH.Common.EnumType.AmbientLightColor.Color{option}"
+        for option in range(1, 100)
+    },
 }
 
+
+@dataclass(frozen=True, kw_only=True)
+class HomeConnectProgramSelectEntityDescription(
+    SelectEntityDescription,
+):
+    """Entity Description class for select entities for programs."""
+
+    allowed_executions: tuple[Execution, ...]
+    set_program_fn: Callable[
+        [HomeConnectClient, str, ProgramKey], Coroutine[Any, Any, None]
+    ]
+    error_translation_key: str
+
+
+@dataclass(frozen=True, kw_only=True)
+class HomeConnectSelectEntityDescription(SelectEntityDescription):
+    """Entity Description class for settings and options that have enumeration values."""
+
+    translation_key_values: dict[str, str]
+    values_translation_key: dict[str, str]
+
+
 PROGRAM_SELECT_ENTITY_DESCRIPTIONS = (
-    SelectEntityDescription(
-        key=BSH_ACTIVE_PROGRAM,
+    HomeConnectProgramSelectEntityDescription(
+        key=EventKey.BSH_COMMON_ROOT_ACTIVE_PROGRAM,
         translation_key="active_program",
+        allowed_executions=(Execution.SELECT_AND_START, Execution.START_ONLY),
+        set_program_fn=lambda client, ha_id, program_key: client.start_program(
+            ha_id, program_key=program_key
+        ),
+        error_translation_key="start_program",
     ),
-    SelectEntityDescription(
-        key=BSH_SELECTED_PROGRAM,
+    HomeConnectProgramSelectEntityDescription(
+        key=EventKey.BSH_COMMON_ROOT_SELECTED_PROGRAM,
         translation_key="selected_program",
+        allowed_executions=(Execution.SELECT_AND_START, Execution.SELECT_ONLY),
+        set_program_fn=lambda client, ha_id, program_key: client.set_selected_program(
+            ha_id, program_key=program_key
+        ),
+        error_translation_key="select_program",
     ),
 )
 
+SELECT_ENTITY_DESCRIPTIONS = (
+    HomeConnectSelectEntityDescription(
+        key=SettingKey.CONSUMER_PRODUCTS_CLEANING_ROBOT_CURRENT_MAP,
+        translation_key="current_map",
+        options=list(AVAILABLE_MAPS_ENUM),
+        translation_key_values=AVAILABLE_MAPS_ENUM,
+        values_translation_key={
+            value: translation_key
+            for translation_key, value in AVAILABLE_MAPS_ENUM.items()
+        },
+    ),
+    HomeConnectSelectEntityDescription(
+        key=SettingKey.COOKING_HOOD_COLOR_TEMPERATURE,
+        translation_key="functional_light_color_temperature",
+        options=list(FUNCTIONAL_LIGHT_COLOR_TEMPERATURE_ENUM),
+        translation_key_values=FUNCTIONAL_LIGHT_COLOR_TEMPERATURE_ENUM,
+        values_translation_key={
+            value: translation_key
+            for translation_key, value in FUNCTIONAL_LIGHT_COLOR_TEMPERATURE_ENUM.items()
+        },
+    ),
+    HomeConnectSelectEntityDescription(
+        key=SettingKey.BSH_COMMON_AMBIENT_LIGHT_COLOR,
+        translation_key="ambient_light_color",
+        options=list(AMBIENT_LIGHT_COLOR_TEMPERATURE_ENUM),
+        translation_key_values=AMBIENT_LIGHT_COLOR_TEMPERATURE_ENUM,
+        values_translation_key={
+            value: translation_key
+            for translation_key, value in AMBIENT_LIGHT_COLOR_TEMPERATURE_ENUM.items()
+        },
+    ),
+)
+
+PROGRAM_SELECT_OPTION_ENTITY_DESCRIPTIONS = (
+    HomeConnectSelectEntityDescription(
+        key=OptionKey.CONSUMER_PRODUCTS_CLEANING_ROBOT_REFERENCE_MAP_ID,
+        translation_key="reference_map_id",
+        options=list(AVAILABLE_MAPS_ENUM),
+        translation_key_values=AVAILABLE_MAPS_ENUM,
+        values_translation_key={
+            value: translation_key
+            for translation_key, value in AVAILABLE_MAPS_ENUM.items()
+        },
+    ),
+    HomeConnectSelectEntityDescription(
+        key=OptionKey.CONSUMER_PRODUCTS_CLEANING_ROBOT_CLEANING_MODE,
+        translation_key="cleaning_mode",
+        options=list(CLEANING_MODE_OPTIONS),
+        translation_key_values=CLEANING_MODE_OPTIONS,
+        values_translation_key={
+            value: translation_key
+            for translation_key, value in CLEANING_MODE_OPTIONS.items()
+        },
+    ),
+    HomeConnectSelectEntityDescription(
+        key=OptionKey.CONSUMER_PRODUCTS_COFFEE_MAKER_BEAN_AMOUNT,
+        translation_key="bean_amount",
+        options=list(BEAN_AMOUNT_OPTIONS),
+        translation_key_values=BEAN_AMOUNT_OPTIONS,
+        values_translation_key={
+            value: translation_key
+            for translation_key, value in BEAN_AMOUNT_OPTIONS.items()
+        },
+    ),
+    HomeConnectSelectEntityDescription(
+        key=OptionKey.CONSUMER_PRODUCTS_COFFEE_MAKER_COFFEE_TEMPERATURE,
+        translation_key="coffee_temperature",
+        options=list(COFFEE_TEMPERATURE_OPTIONS),
+        translation_key_values=COFFEE_TEMPERATURE_OPTIONS,
+        values_translation_key={
+            value: translation_key
+            for translation_key, value in COFFEE_TEMPERATURE_OPTIONS.items()
+        },
+    ),
+    HomeConnectSelectEntityDescription(
+        key=OptionKey.CONSUMER_PRODUCTS_COFFEE_MAKER_BEAN_CONTAINER_SELECTION,
+        translation_key="bean_container",
+        options=list(BEAN_CONTAINER_OPTIONS),
+        translation_key_values=BEAN_CONTAINER_OPTIONS,
+        values_translation_key={
+            value: translation_key
+            for translation_key, value in BEAN_CONTAINER_OPTIONS.items()
+        },
+    ),
+    HomeConnectSelectEntityDescription(
+        key=OptionKey.CONSUMER_PRODUCTS_COFFEE_MAKER_FLOW_RATE,
+        translation_key="flow_rate",
+        options=list(FLOW_RATE_OPTIONS),
+        translation_key_values=FLOW_RATE_OPTIONS,
+        values_translation_key={
+            value: translation_key
+            for translation_key, value in FLOW_RATE_OPTIONS.items()
+        },
+    ),
+    HomeConnectSelectEntityDescription(
+        key=OptionKey.CONSUMER_PRODUCTS_COFFEE_MAKER_COFFEE_MILK_RATIO,
+        translation_key="coffee_milk_ratio",
+        options=list(COFFEE_MILK_RATIO_OPTIONS),
+        translation_key_values=COFFEE_MILK_RATIO_OPTIONS,
+        values_translation_key={
+            value: translation_key
+            for translation_key, value in FLOW_RATE_OPTIONS.items()
+        },
+    ),
+    HomeConnectSelectEntityDescription(
+        key=OptionKey.CONSUMER_PRODUCTS_COFFEE_MAKER_HOT_WATER_TEMPERATURE,
+        translation_key="hot_water_temperature",
+        options=list(HOT_WATER_TEMPERATURE_OPTIONS),
+        translation_key_values=HOT_WATER_TEMPERATURE_OPTIONS,
+        values_translation_key={
+            value: translation_key
+            for translation_key, value in HOT_WATER_TEMPERATURE_OPTIONS.items()
+        },
+    ),
+    HomeConnectSelectEntityDescription(
+        key=OptionKey.LAUNDRY_CARE_DRYER_DRYING_TARGET,
+        translation_key="drying_target",
+        options=list(DRYING_TARGET_OPTIONS),
+        translation_key_values=DRYING_TARGET_OPTIONS,
+        values_translation_key={
+            value: translation_key
+            for translation_key, value in DRYING_TARGET_OPTIONS.items()
+        },
+    ),
+    HomeConnectSelectEntityDescription(
+        key=OptionKey.COOKING_COMMON_HOOD_VENTING_LEVEL,
+        translation_key="venting_level",
+        options=list(VENTING_LEVEL_OPTIONS),
+        translation_key_values=VENTING_LEVEL_OPTIONS,
+        values_translation_key={
+            value: translation_key
+            for translation_key, value in VENTING_LEVEL_OPTIONS.items()
+        },
+    ),
+    HomeConnectSelectEntityDescription(
+        key=OptionKey.COOKING_COMMON_HOOD_INTENSIVE_LEVEL,
+        translation_key="intensive_level",
+        options=list(INTENSIVE_LEVEL_OPTIONS),
+        translation_key_values=INTENSIVE_LEVEL_OPTIONS,
+        values_translation_key={
+            value: translation_key
+            for translation_key, value in INTENSIVE_LEVEL_OPTIONS.items()
+        },
+    ),
+    HomeConnectSelectEntityDescription(
+        key=OptionKey.COOKING_OVEN_WARMING_LEVEL,
+        translation_key="warming_level",
+        options=list(WARMING_LEVEL_OPTIONS),
+        translation_key_values=WARMING_LEVEL_OPTIONS,
+        values_translation_key={
+            value: translation_key
+            for translation_key, value in WARMING_LEVEL_OPTIONS.items()
+        },
+    ),
+    HomeConnectSelectEntityDescription(
+        key=OptionKey.LAUNDRY_CARE_WASHER_TEMPERATURE,
+        translation_key="washer_temperature",
+        options=list(TEMPERATURE_OPTIONS),
+        translation_key_values=TEMPERATURE_OPTIONS,
+        values_translation_key={
+            value: translation_key
+            for translation_key, value in TEMPERATURE_OPTIONS.items()
+        },
+    ),
+    HomeConnectSelectEntityDescription(
+        key=OptionKey.LAUNDRY_CARE_WASHER_SPIN_SPEED,
+        translation_key="spin_speed",
+        options=list(SPIN_SPEED_OPTIONS),
+        translation_key_values=SPIN_SPEED_OPTIONS,
+        values_translation_key={
+            value: translation_key
+            for translation_key, value in SPIN_SPEED_OPTIONS.items()
+        },
+    ),
+    HomeConnectSelectEntityDescription(
+        key=OptionKey.LAUNDRY_CARE_COMMON_VARIO_PERFECT,
+        translation_key="vario_perfect",
+        options=list(VARIO_PERFECT_OPTIONS),
+        translation_key_values=VARIO_PERFECT_OPTIONS,
+        values_translation_key={
+            value: translation_key
+            for translation_key, value in VARIO_PERFECT_OPTIONS.items()
+        },
+    ),
+)
+
+
+def _get_entities_for_appliance(
+    entry: HomeConnectConfigEntry,
+    appliance: HomeConnectApplianceData,
+) -> list[HomeConnectEntity]:
+    """Get a list of entities."""
+    return [
+        *(
+            [
+                HomeConnectProgramSelectEntity(entry.runtime_data, appliance, desc)
+                for desc in PROGRAM_SELECT_ENTITY_DESCRIPTIONS
+            ]
+            if appliance.info.type in APPLIANCES_WITH_PROGRAMS
+            else []
+        ),
+        *[
+            HomeConnectSelectEntity(entry.runtime_data, appliance, desc)
+            for desc in SELECT_ENTITY_DESCRIPTIONS
+            if desc.key in appliance.settings
+        ],
+    ]
+
+
+def _get_option_entities_for_appliance(
+    entry: HomeConnectConfigEntry,
+    appliance: HomeConnectApplianceData,
+) -> list[HomeConnectOptionEntity]:
+    """Get a list of entities."""
+    return [
+        HomeConnectSelectOptionEntity(entry.runtime_data, appliance, desc)
+        for desc in PROGRAM_SELECT_OPTION_ENTITY_DESCRIPTIONS
+        if desc.key in appliance.options
+    ]
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: HomeConnectConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Home Connect select entities."""
-
-    def get_entities() -> list[HomeConnectProgramSelectEntity]:
-        """Get a list of entities."""
-        entities: list[HomeConnectProgramSelectEntity] = []
-        programs_not_found = set()
-        for device in entry.runtime_data.devices:
-            if device.appliance.type in APPLIANCES_WITH_PROGRAMS:
-                with contextlib.suppress(HomeConnectError):
-                    programs = device.appliance.get_programs_available()
-                    if programs:
-                        for program in programs.copy():
-                            if program not in PROGRAMS_TRANSLATION_KEYS_MAP:
-                                programs.remove(program)
-                                if program not in programs_not_found:
-                                    _LOGGER.info(
-                                        'The program "%s" is not part of the official Home Connect API specification',
-                                        program,
-                                    )
-                                    programs_not_found.add(program)
-                        entities.extend(
-                            HomeConnectProgramSelectEntity(device, programs, desc)
-                            for desc in PROGRAM_SELECT_ENTITY_DESCRIPTIONS
-                        )
-        return entities
-
-    async_add_entities(await hass.async_add_executor_job(get_entities), True)
+    setup_home_connect_entry(
+        entry,
+        _get_entities_for_appliance,
+        async_add_entities,
+        _get_option_entities_for_appliance,
+    )
 
 
 class HomeConnectProgramSelectEntity(HomeConnectEntity, SelectEntity):
     """Select class for Home Connect programs."""
 
+    entity_description: HomeConnectProgramSelectEntityDescription
+
     def __init__(
         self,
-        device: HomeConnectDevice,
-        programs: list[str],
-        desc: SelectEntityDescription,
+        coordinator: HomeConnectCoordinator,
+        appliance: HomeConnectApplianceData,
+        desc: HomeConnectProgramSelectEntityDescription,
     ) -> None:
         """Initialize the entity."""
         super().__init__(
-            device,
+            coordinator,
+            appliance,
             desc,
         )
         self._attr_options = [
-            PROGRAMS_TRANSLATION_KEYS_MAP[program] for program in programs
-        ]
-        self.start_on_select = desc.key == BSH_ACTIVE_PROGRAM
-
-    async def async_update(self) -> None:
-        """Update the program selection status."""
-        program = self.device.appliance.status.get(self.bsh_key, {}).get(ATTR_VALUE)
-        if not program:
-            program_translation_key = None
-        elif not (
-            program_translation_key := PROGRAMS_TRANSLATION_KEYS_MAP.get(program)
-        ):
-            _LOGGER.debug(
-                'The program "%s" is not part of the official Home Connect API specification',
-                program,
+            PROGRAMS_TRANSLATION_KEYS_MAP[program.key]
+            for program in appliance.programs
+            if program.key != ProgramKey.UNKNOWN
+            and (
+                program.constraints is None
+                or program.constraints.execution in desc.allowed_executions
             )
-        self._attr_current_option = program_translation_key
-        _LOGGER.debug("Updated, new program: %s", self._attr_current_option)
+        ]
+
+    def update_native_value(self) -> None:
+        """Set the program value."""
+        event = self.appliance.events.get(cast(EventKey, self.bsh_key))
+        self._attr_current_option = (
+            PROGRAMS_TRANSLATION_KEYS_MAP.get(cast(ProgramKey, event.value))
+            if event
+            else None
+        )
 
     async def async_select_option(self, option: str) -> None:
         """Select new program."""
-        bsh_key = TRANSLATION_KEYS_PROGRAMS_MAP[option]
-        _LOGGER.debug(
-            "Starting program: %s" if self.start_on_select else "Selecting program: %s",
-            bsh_key,
-        )
-        if self.start_on_select:
-            target = self.device.appliance.start_program
-        else:
-            target = self.device.appliance.select_program
+        program_key = TRANSLATION_KEYS_PROGRAMS_MAP[option]
         try:
-            await self.hass.async_add_executor_job(target, bsh_key)
+            await self.entity_description.set_program_fn(
+                self.coordinator.client,
+                self.appliance.info.ha_id,
+                program_key,
+            )
         except HomeConnectError as err:
-            if self.start_on_select:
-                translation_key = "start_program"
-            else:
-                translation_key = "select_program"
             raise HomeAssistantError(
                 translation_domain=DOMAIN,
-                translation_key=translation_key,
+                translation_key=self.entity_description.error_translation_key,
                 translation_placeholders={
                     **get_dict_from_home_connect_error(err),
-                    SVE_TRANSLATION_PLACEHOLDER_PROGRAM: bsh_key,
+                    "program": program_key.value,
                 },
             ) from err
-        self.async_entity_update()
+
+
+class HomeConnectSelectEntity(HomeConnectEntity, SelectEntity):
+    """Select setting class for Home Connect."""
+
+    entity_description: HomeConnectSelectEntityDescription
+    _original_option_keys: set[str | None]
+
+    def __init__(
+        self,
+        coordinator: HomeConnectCoordinator,
+        appliance: HomeConnectApplianceData,
+        desc: HomeConnectSelectEntityDescription,
+    ) -> None:
+        """Initialize the entity."""
+        self._original_option_keys = set(desc.values_translation_key)
+        super().__init__(
+            coordinator,
+            appliance,
+            desc,
+        )
+
+    async def async_select_option(self, option: str) -> None:
+        """Select new option."""
+        value = self.entity_description.translation_key_values[option]
+        try:
+            await self.coordinator.client.set_setting(
+                self.appliance.info.ha_id,
+                setting_key=cast(SettingKey, self.bsh_key),
+                value=value,
+            )
+        except HomeConnectError as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="set_setting_entity",
+                translation_placeholders={
+                    **get_dict_from_home_connect_error(err),
+                    "entity_id": self.entity_id,
+                    "key": self.bsh_key,
+                    "value": value,
+                },
+            ) from err
+
+    def update_native_value(self) -> None:
+        """Set the value of the entity."""
+        data = self.appliance.settings[cast(SettingKey, self.bsh_key)]
+        self._attr_current_option = self.entity_description.values_translation_key.get(
+            data.value
+        )
+
+    async def async_added_to_hass(self) -> None:
+        """When entity is added to hass."""
+        await super().async_added_to_hass()
+        await self.async_fetch_options()
+
+    @constraint_fetcher
+    async def async_fetch_options(self) -> None:
+        """Fetch options from the API."""
+        setting = self.appliance.settings.get(cast(SettingKey, self.bsh_key))
+        if (
+            not setting
+            or not setting.constraints
+            or not setting.constraints.allowed_values
+        ):
+            setting = await self.coordinator.client.get_setting(
+                self.appliance.info.ha_id,
+                setting_key=cast(SettingKey, self.bsh_key),
+            )
+
+        if setting and setting.constraints and setting.constraints.allowed_values:
+            self._original_option_keys = set(setting.constraints.allowed_values)
+            self._attr_options = [
+                self.entity_description.values_translation_key[option]
+                for option in self._original_option_keys
+                if option is not None
+                and option in self.entity_description.values_translation_key
+            ]
+
+
+class HomeConnectSelectOptionEntity(HomeConnectOptionEntity, SelectEntity):
+    """Select option class for Home Connect."""
+
+    entity_description: HomeConnectSelectEntityDescription
+    _original_option_keys: set[str | None]
+
+    def __init__(
+        self,
+        coordinator: HomeConnectCoordinator,
+        appliance: HomeConnectApplianceData,
+        desc: HomeConnectSelectEntityDescription,
+    ) -> None:
+        """Initialize the entity."""
+        self._original_option_keys = set(desc.values_translation_key)
+        super().__init__(
+            coordinator,
+            appliance,
+            desc,
+        )
+
+    async def async_select_option(self, option: str) -> None:
+        """Select new option."""
+        await self.async_set_option(
+            self.entity_description.translation_key_values[option]
+        )
+
+    def update_native_value(self) -> None:
+        """Set the value of the entity."""
+        self._attr_current_option = (
+            self.entity_description.values_translation_key.get(
+                cast(str, self.option_value), None
+            )
+            if self.option_value is not None
+            else None
+        )
+        if (
+            (option_definition := self.appliance.options.get(self.bsh_key))
+            and (option_constraints := option_definition.constraints)
+            and option_constraints.allowed_values
+            and self._original_option_keys != set(option_constraints.allowed_values)
+        ):
+            self._original_option_keys = set(option_constraints.allowed_values)
+            self._attr_options = [
+                self.entity_description.values_translation_key[option]
+                for option in self._original_option_keys
+                if option is not None
+                and option in self.entity_description.values_translation_key
+            ]
diff --git a/homeassistant/components/home_connect/sensor.py b/homeassistant/components/home_connect/sensor.py
index 7b82ef8b676..f3c73c8a5ff 100644
--- a/homeassistant/components/home_connect/sensor.py
+++ b/homeassistant/components/home_connect/sensor.py
@@ -1,63 +1,59 @@
 """Provides a sensor for Home Connect."""
 
 from dataclasses import dataclass
-from datetime import datetime, timedelta
+from datetime import timedelta
 import logging
 from typing import cast
 
+from aiohomeconnect.model import EventKey, StatusKey
+
 from homeassistant.components.sensor import (
     SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.const import PERCENTAGE, UnitOfTime, UnitOfVolume
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util import slugify
-import homeassistant.util.dt as dt_util
+from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfVolume
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util, slugify
 
-from . import HomeConnectConfigEntry
+from .common import setup_home_connect_entry
 from .const import (
     APPLIANCES_WITH_PROGRAMS,
-    ATTR_VALUE,
-    BSH_DOOR_STATE,
-    BSH_OPERATION_STATE,
     BSH_OPERATION_STATE_FINISHED,
     BSH_OPERATION_STATE_PAUSE,
     BSH_OPERATION_STATE_RUN,
-    COFFEE_EVENT_BEAN_CONTAINER_EMPTY,
-    COFFEE_EVENT_DRIP_TRAY_FULL,
-    COFFEE_EVENT_WATER_TANK_EMPTY,
-    DISHWASHER_EVENT_RINSE_AID_NEARLY_EMPTY,
-    DISHWASHER_EVENT_SALT_NEARLY_EMPTY,
-    REFRIGERATION_EVENT_DOOR_ALARM_FREEZER,
-    REFRIGERATION_EVENT_DOOR_ALARM_REFRIGERATOR,
-    REFRIGERATION_EVENT_TEMP_ALARM_FREEZER,
+    UNIT_MAP,
 )
-from .entity import HomeConnectEntity
+from .coordinator import HomeConnectApplianceData, HomeConnectConfigEntry
+from .entity import HomeConnectEntity, constraint_fetcher
 
 _LOGGER = logging.getLogger(__name__)
 
+PARALLEL_UPDATES = 0
 
 EVENT_OPTIONS = ["confirmed", "off", "present"]
 
 
 @dataclass(frozen=True, kw_only=True)
-class HomeConnectSensorEntityDescription(SensorEntityDescription):
+class HomeConnectSensorEntityDescription(
+    SensorEntityDescription,
+):
     """Entity Description class for sensors."""
 
     default_value: str | None = None
     appliance_types: tuple[str, ...] | None = None
+    fetch_unit: bool = False
 
 
 BSH_PROGRAM_SENSORS = (
     HomeConnectSensorEntityDescription(
-        key="BSH.Common.Option.RemainingProgramTime",
+        key=EventKey.BSH_COMMON_OPTION_REMAINING_PROGRAM_TIME,
         device_class=SensorDeviceClass.TIMESTAMP,
         translation_key="program_finish_time",
         appliance_types=(
-            "CoffeMaker",
+            "CoffeeMaker",
             "CookProcessor",
             "Dishwasher",
             "Dryer",
@@ -68,13 +64,7 @@ BSH_PROGRAM_SENSORS = (
         ),
     ),
     HomeConnectSensorEntityDescription(
-        key="BSH.Common.Option.Duration",
-        device_class=SensorDeviceClass.DURATION,
-        native_unit_of_measurement=UnitOfTime.SECONDS,
-        appliance_types=("Oven",),
-    ),
-    HomeConnectSensorEntityDescription(
-        key="BSH.Common.Option.ProgramProgress",
+        key=EventKey.BSH_COMMON_OPTION_PROGRAM_PROGRESS,
         native_unit_of_measurement=PERCENTAGE,
         translation_key="program_progress",
         appliance_types=APPLIANCES_WITH_PROGRAMS,
@@ -83,7 +73,7 @@ BSH_PROGRAM_SENSORS = (
 
 SENSORS = (
     HomeConnectSensorEntityDescription(
-        key=BSH_OPERATION_STATE,
+        key=StatusKey.BSH_COMMON_OPERATION_STATE,
         device_class=SensorDeviceClass.ENUM,
         options=[
             "inactive",
@@ -99,7 +89,7 @@ SENSORS = (
         translation_key="operation_state",
     ),
     HomeConnectSensorEntityDescription(
-        key=BSH_DOOR_STATE,
+        key=StatusKey.BSH_COMMON_DOOR_STATE,
         device_class=SensorDeviceClass.ENUM,
         options=[
             "closed",
@@ -109,59 +99,68 @@ SENSORS = (
         translation_key="door",
     ),
     HomeConnectSensorEntityDescription(
-        key="ConsumerProducts.CoffeeMaker.Status.BeverageCounterCoffee",
+        key=StatusKey.CONSUMER_PRODUCTS_COFFEE_MAKER_BEVERAGE_COUNTER_COFFEE,
+        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL_INCREASING,
         translation_key="coffee_counter",
     ),
     HomeConnectSensorEntityDescription(
-        key="ConsumerProducts.CoffeeMaker.Status.BeverageCounterPowderCoffee",
+        key=StatusKey.CONSUMER_PRODUCTS_COFFEE_MAKER_BEVERAGE_COUNTER_POWDER_COFFEE,
+        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL_INCREASING,
         translation_key="powder_coffee_counter",
     ),
     HomeConnectSensorEntityDescription(
-        key="ConsumerProducts.CoffeeMaker.Status.BeverageCounterHotWater",
+        key=StatusKey.CONSUMER_PRODUCTS_COFFEE_MAKER_BEVERAGE_COUNTER_HOT_WATER,
+        entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=UnitOfVolume.MILLILITERS,
         device_class=SensorDeviceClass.VOLUME,
         state_class=SensorStateClass.TOTAL_INCREASING,
         translation_key="hot_water_counter",
     ),
     HomeConnectSensorEntityDescription(
-        key="ConsumerProducts.CoffeeMaker.Status.BeverageCounterHotWaterCups",
+        key=StatusKey.CONSUMER_PRODUCTS_COFFEE_MAKER_BEVERAGE_COUNTER_HOT_WATER_CUPS,
+        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL_INCREASING,
         translation_key="hot_water_cups_counter",
     ),
     HomeConnectSensorEntityDescription(
-        key="ConsumerProducts.CoffeeMaker.Status.BeverageCounterHotMilk",
+        key=StatusKey.CONSUMER_PRODUCTS_COFFEE_MAKER_BEVERAGE_COUNTER_HOT_MILK,
+        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL_INCREASING,
         translation_key="hot_milk_counter",
     ),
     HomeConnectSensorEntityDescription(
-        key="ConsumerProducts.CoffeeMaker.Status.BeverageCounterFrothyMilk",
+        key=StatusKey.CONSUMER_PRODUCTS_COFFEE_MAKER_BEVERAGE_COUNTER_FROTHY_MILK,
+        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL_INCREASING,
         translation_key="frothy_milk_counter",
     ),
     HomeConnectSensorEntityDescription(
-        key="ConsumerProducts.CoffeeMaker.Status.BeverageCounterMilk",
+        key=StatusKey.CONSUMER_PRODUCTS_COFFEE_MAKER_BEVERAGE_COUNTER_MILK,
+        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL_INCREASING,
         translation_key="milk_counter",
     ),
     HomeConnectSensorEntityDescription(
-        key="ConsumerProducts.CoffeeMaker.Status.BeverageCounterCoffeeAndMilk",
+        key=StatusKey.CONSUMER_PRODUCTS_COFFEE_MAKER_BEVERAGE_COUNTER_COFFEE_AND_MILK,
+        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL_INCREASING,
         translation_key="coffee_and_milk_counter",
     ),
     HomeConnectSensorEntityDescription(
-        key="ConsumerProducts.CoffeeMaker.Status.BeverageCounterRistrettoEspresso",
+        key=StatusKey.CONSUMER_PRODUCTS_COFFEE_MAKER_BEVERAGE_COUNTER_RISTRETTO_ESPRESSO,
+        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL_INCREASING,
         translation_key="ristretto_espresso_counter",
     ),
     HomeConnectSensorEntityDescription(
-        key="BSH.Common.Status.BatteryLevel",
+        key=StatusKey.BSH_COMMON_BATTERY_LEVEL,
         device_class=SensorDeviceClass.BATTERY,
         translation_key="battery_level",
     ),
     HomeConnectSensorEntityDescription(
-        key="BSH.Common.Status.Video.CameraState",
+        key=StatusKey.BSH_COMMON_VIDEO_CAMERA_STATE,
         device_class=SensorDeviceClass.ENUM,
         options=[
             "disabled",
@@ -175,7 +174,7 @@ SENSORS = (
         translation_key="camera_state",
     ),
     HomeConnectSensorEntityDescription(
-        key="ConsumerProducts.CleaningRobot.Status.LastSelectedMap",
+        key=StatusKey.CONSUMER_PRODUCTS_CLEANING_ROBOT_LAST_SELECTED_MAP,
         device_class=SensorDeviceClass.ENUM,
         options=[
             "tempmap",
@@ -185,59 +184,74 @@ SENSORS = (
         ],
         translation_key="last_selected_map",
     ),
+    HomeConnectSensorEntityDescription(
+        key=StatusKey.COOKING_OVEN_CURRENT_CAVITY_TEMPERATURE,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        translation_key="oven_current_cavity_temperature",
+        fetch_unit=True,
+    ),
 )
 
 EVENT_SENSORS = (
     HomeConnectSensorEntityDescription(
-        key=REFRIGERATION_EVENT_DOOR_ALARM_FREEZER,
+        key=EventKey.BSH_COMMON_EVENT_PROGRAM_ABORTED,
         device_class=SensorDeviceClass.ENUM,
         options=EVENT_OPTIONS,
         default_value="off",
-        translation_key="freezer_door_alarm",
-        appliance_types=("FridgeFreezer", "Freezer"),
+        translation_key="program_aborted",
+        appliance_types=("Dishwasher", "CleaningRobot", "CookProcessor"),
     ),
     HomeConnectSensorEntityDescription(
-        key=REFRIGERATION_EVENT_DOOR_ALARM_REFRIGERATOR,
+        key=EventKey.BSH_COMMON_EVENT_PROGRAM_FINISHED,
         device_class=SensorDeviceClass.ENUM,
         options=EVENT_OPTIONS,
         default_value="off",
-        translation_key="refrigerator_door_alarm",
-        appliance_types=("FridgeFreezer", "Refrigerator"),
+        translation_key="program_finished",
+        appliance_types=(
+            "Oven",
+            "Dishwasher",
+            "Washer",
+            "Dryer",
+            "WasherDryer",
+            "CleaningRobot",
+            "CookProcessor",
+        ),
     ),
     HomeConnectSensorEntityDescription(
-        key=REFRIGERATION_EVENT_TEMP_ALARM_FREEZER,
+        key=EventKey.BSH_COMMON_EVENT_ALARM_CLOCK_ELAPSED,
         device_class=SensorDeviceClass.ENUM,
         options=EVENT_OPTIONS,
         default_value="off",
-        translation_key="freezer_temperature_alarm",
-        appliance_types=("FridgeFreezer", "Freezer"),
+        translation_key="alarm_clock_elapsed",
+        appliance_types=("Oven", "Cooktop"),
     ),
     HomeConnectSensorEntityDescription(
-        key=COFFEE_EVENT_BEAN_CONTAINER_EMPTY,
+        key=EventKey.COOKING_OVEN_EVENT_PREHEAT_FINISHED,
         device_class=SensorDeviceClass.ENUM,
         options=EVENT_OPTIONS,
         default_value="off",
-        translation_key="bean_container_empty",
-        appliance_types=("CoffeeMaker",),
+        translation_key="preheat_finished",
+        appliance_types=("Oven", "Cooktop"),
     ),
     HomeConnectSensorEntityDescription(
-        key=COFFEE_EVENT_WATER_TANK_EMPTY,
+        key=EventKey.COOKING_OVEN_EVENT_REGULAR_PREHEAT_FINISHED,
         device_class=SensorDeviceClass.ENUM,
         options=EVENT_OPTIONS,
         default_value="off",
-        translation_key="water_tank_empty",
-        appliance_types=("CoffeeMaker",),
+        translation_key="regular_preheat_finished",
+        appliance_types=("Oven",),
     ),
     HomeConnectSensorEntityDescription(
-        key=COFFEE_EVENT_DRIP_TRAY_FULL,
+        key=EventKey.LAUNDRY_CARE_DRYER_EVENT_DRYING_PROCESS_FINISHED,
         device_class=SensorDeviceClass.ENUM,
         options=EVENT_OPTIONS,
         default_value="off",
-        translation_key="drip_tray_full",
-        appliance_types=("CoffeeMaker",),
+        translation_key="drying_process_finished",
+        appliance_types=("Dryer",),
     ),
     HomeConnectSensorEntityDescription(
-        key=DISHWASHER_EVENT_SALT_NEARLY_EMPTY,
+        key=EventKey.DISHCARE_DISHWASHER_EVENT_SALT_NEARLY_EMPTY,
         device_class=SensorDeviceClass.ENUM,
         options=EVENT_OPTIONS,
         default_value="off",
@@ -245,50 +259,292 @@ EVENT_SENSORS = (
         appliance_types=("Dishwasher",),
     ),
     HomeConnectSensorEntityDescription(
-        key=DISHWASHER_EVENT_RINSE_AID_NEARLY_EMPTY,
+        key=EventKey.DISHCARE_DISHWASHER_EVENT_RINSE_AID_NEARLY_EMPTY,
         device_class=SensorDeviceClass.ENUM,
         options=EVENT_OPTIONS,
         default_value="off",
         translation_key="rinse_aid_nearly_empty",
         appliance_types=("Dishwasher",),
     ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_BEAN_CONTAINER_EMPTY,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="bean_container_empty",
+        appliance_types=("CoffeeMaker",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_WATER_TANK_EMPTY,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="water_tank_empty",
+        appliance_types=("CoffeeMaker",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_DRIP_TRAY_FULL,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="drip_tray_full",
+        appliance_types=("CoffeeMaker",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_KEEP_MILK_TANK_COOL,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="keep_milk_tank_cool",
+        appliance_types=("CoffeeMaker",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_DESCALING_IN_20_CUPS,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="descaling_in_20_cups",
+        appliance_types=("CoffeeMaker",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_DESCALING_IN_15_CUPS,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="descaling_in_15_cups",
+        appliance_types=("CoffeeMaker",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_DESCALING_IN_10_CUPS,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="descaling_in_10_cups",
+        appliance_types=("CoffeeMaker",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_DESCALING_IN_5_CUPS,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="descaling_in_5_cups",
+        appliance_types=("CoffeeMaker",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_DEVICE_SHOULD_BE_DESCALED,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="device_should_be_descaled",
+        appliance_types=("CoffeeMaker",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_DEVICE_DESCALING_OVERDUE,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="device_descaling_overdue",
+        appliance_types=("CoffeeMaker",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_DEVICE_DESCALING_BLOCKAGE,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="device_descaling_blockage",
+        appliance_types=("CoffeeMaker",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_DEVICE_SHOULD_BE_CLEANED,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="device_should_be_cleaned",
+        appliance_types=("CoffeeMaker",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_DEVICE_CLEANING_OVERDUE,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="device_cleaning_overdue",
+        appliance_types=("CoffeeMaker",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_CALC_N_CLEAN_IN20CUPS,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="calc_n_clean_in20cups",
+        appliance_types=("CoffeeMaker",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_CALC_N_CLEAN_IN15CUPS,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="calc_n_clean_in15cups",
+        appliance_types=("CoffeeMaker",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_CALC_N_CLEAN_IN10CUPS,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="calc_n_clean_in10cups",
+        appliance_types=("CoffeeMaker",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_CALC_N_CLEAN_IN5CUPS,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="calc_n_clean_in5cups",
+        appliance_types=("CoffeeMaker",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_DEVICE_SHOULD_BE_CALC_N_CLEANED,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="device_should_be_calc_n_cleaned",
+        appliance_types=("CoffeeMaker",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_DEVICE_CALC_N_CLEAN_OVERDUE,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="device_calc_n_clean_overdue",
+        appliance_types=("CoffeeMaker",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_DEVICE_CALC_N_CLEAN_BLOCKAGE,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="device_calc_n_clean_blockage",
+        appliance_types=("CoffeeMaker",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.REFRIGERATION_FRIDGE_FREEZER_EVENT_DOOR_ALARM_FREEZER,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="freezer_door_alarm",
+        appliance_types=("FridgeFreezer", "Freezer"),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.REFRIGERATION_FRIDGE_FREEZER_EVENT_DOOR_ALARM_REFRIGERATOR,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="refrigerator_door_alarm",
+        appliance_types=("FridgeFreezer", "Refrigerator"),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.REFRIGERATION_FRIDGE_FREEZER_EVENT_TEMPERATURE_ALARM_FREEZER,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="freezer_temperature_alarm",
+        appliance_types=("FridgeFreezer", "Freezer"),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_CLEANING_ROBOT_EVENT_EMPTY_DUST_BOX_AND_CLEAN_FILTER,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="empty_dust_box_and_clean_filter",
+        appliance_types=("CleaningRobot",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_CLEANING_ROBOT_EVENT_ROBOT_IS_STUCK,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="robot_is_stuck",
+        appliance_types=("CleaningRobot",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.CONSUMER_PRODUCTS_CLEANING_ROBOT_EVENT_DOCKING_STATION_NOT_FOUND,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="docking_station_not_found",
+        appliance_types=("CleaningRobot",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.LAUNDRY_CARE_WASHER_EVENT_I_DOS_1_FILL_LEVEL_POOR,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="poor_i_dos_1_fill_level",
+        appliance_types=("Washer", "WasherDryer"),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.LAUNDRY_CARE_WASHER_EVENT_I_DOS_2_FILL_LEVEL_POOR,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="poor_i_dos_2_fill_level",
+        appliance_types=("Washer", "WasherDryer"),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.COOKING_COMMON_EVENT_HOOD_GREASE_FILTER_MAX_SATURATION_NEARLY_REACHED,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="grease_filter_max_saturation_nearly_reached",
+        appliance_types=("Hood",),
+    ),
+    HomeConnectSensorEntityDescription(
+        key=EventKey.COOKING_COMMON_EVENT_HOOD_GREASE_FILTER_MAX_SATURATION_REACHED,
+        device_class=SensorDeviceClass.ENUM,
+        options=EVENT_OPTIONS,
+        default_value="off",
+        translation_key="grease_filter_max_saturation_reached",
+        appliance_types=("Hood",),
+    ),
 )
 
 
+def _get_entities_for_appliance(
+    entry: HomeConnectConfigEntry,
+    appliance: HomeConnectApplianceData,
+) -> list[HomeConnectEntity]:
+    """Get a list of entities."""
+    return [
+        *[
+            HomeConnectEventSensor(entry.runtime_data, appliance, description)
+            for description in EVENT_SENSORS
+            if description.appliance_types
+            and appliance.info.type in description.appliance_types
+        ],
+        *[
+            HomeConnectProgramSensor(entry.runtime_data, appliance, desc)
+            for desc in BSH_PROGRAM_SENSORS
+            if desc.appliance_types and appliance.info.type in desc.appliance_types
+        ],
+        *[
+            HomeConnectSensor(entry.runtime_data, appliance, description)
+            for description in SENSORS
+            if description.key in appliance.status
+        ],
+    ]
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: HomeConnectConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Home Connect sensor."""
-
-    def get_entities() -> list[SensorEntity]:
-        """Get a list of entities."""
-        entities: list[SensorEntity] = []
-        for device in entry.runtime_data.devices:
-            entities.extend(
-                HomeConnectSensor(
-                    device,
-                    description,
-                )
-                for description in EVENT_SENSORS
-                if description.appliance_types
-                and device.appliance.type in description.appliance_types
-            )
-            entities.extend(
-                HomeConnectProgramSensor(device, desc)
-                for desc in BSH_PROGRAM_SENSORS
-                if desc.appliance_types
-                and device.appliance.type in desc.appliance_types
-            )
-            entities.extend(
-                HomeConnectSensor(device, description)
-                for description in SENSORS
-                if description.key in device.appliance.status
-            )
-        return entities
-
-    async_add_entities(await hass.async_add_executor_job(get_entities), True)
+    setup_home_connect_entry(
+        entry,
+        _get_entities_for_appliance,
+        async_add_entities,
+    )
 
 
 class HomeConnectSensor(HomeConnectEntity, SensorEntity):
@@ -296,44 +552,46 @@ class HomeConnectSensor(HomeConnectEntity, SensorEntity):
 
     entity_description: HomeConnectSensorEntityDescription
 
-    async def async_update(self) -> None:
-        """Update the sensor's status."""
-        appliance_status = self.device.appliance.status
-        if (
-            self.bsh_key not in appliance_status
-            or ATTR_VALUE not in appliance_status[self.bsh_key]
-        ):
-            self._attr_native_value = self.entity_description.default_value
-            _LOGGER.debug("Updated, new state: %s", self._attr_native_value)
-            return
-        status = appliance_status[self.bsh_key]
+    def update_native_value(self) -> None:
+        """Set the value of the sensor."""
+        status = self.appliance.status[cast(StatusKey, self.bsh_key)].value
+        self._update_native_value(status)
+
+    def _update_native_value(self, status: str | float) -> None:
+        """Set the value of the sensor based on the given value."""
         match self.device_class:
             case SensorDeviceClass.TIMESTAMP:
-                if ATTR_VALUE not in status:
-                    self._attr_native_value = None
-                elif (
-                    self._attr_native_value is not None
-                    and isinstance(self._attr_native_value, datetime)
-                    and self._attr_native_value < dt_util.utcnow()
-                ):
-                    # if the date is supposed to be in the future but we're
-                    # already past it, set state to None.
-                    self._attr_native_value = None
-                else:
-                    seconds = float(status[ATTR_VALUE])
-                    self._attr_native_value = dt_util.utcnow() + timedelta(
-                        seconds=seconds
-                    )
+                self._attr_native_value = dt_util.utcnow() + timedelta(
+                    seconds=cast(float, status)
+                )
             case SensorDeviceClass.ENUM:
                 # Value comes back as an enum, we only really care about the
                 # last part, so split it off
                 # https://developer.home-connect.com/docs/status/operation_state
-                self._attr_native_value = slugify(
-                    cast(str, status.get(ATTR_VALUE)).split(".")[-1]
-                )
+                self._attr_native_value = slugify(cast(str, status).split(".")[-1])
             case _:
-                self._attr_native_value = status.get(ATTR_VALUE)
-        _LOGGER.debug("Updated, new state: %s", self._attr_native_value)
+                self._attr_native_value = status
+
+    async def async_added_to_hass(self) -> None:
+        """When entity is added to hass."""
+        await super().async_added_to_hass()
+        if self.entity_description.fetch_unit:
+            data = self.appliance.status[cast(StatusKey, self.bsh_key)]
+            if data.unit:
+                self._attr_native_unit_of_measurement = UNIT_MAP.get(
+                    data.unit, data.unit
+                )
+            else:
+                await self.fetch_unit()
+
+    @constraint_fetcher
+    async def fetch_unit(self) -> None:
+        """Fetch the unit of measurement."""
+        data = await self.coordinator.client.get_status_value(
+            self.appliance.info.ha_id, status_key=cast(StatusKey, self.bsh_key)
+        )
+        if data.unit:
+            self._attr_native_unit_of_measurement = UNIT_MAP.get(data.unit, data.unit)
 
 
 class HomeConnectProgramSensor(HomeConnectSensor):
@@ -341,6 +599,31 @@ class HomeConnectProgramSensor(HomeConnectSensor):
 
     program_running: bool = False
 
+    async def async_added_to_hass(self) -> None:
+        """Register listener."""
+        await super().async_added_to_hass()
+        self.async_on_remove(
+            self.coordinator.async_add_listener(
+                self._handle_operation_state_event,
+                (self.appliance.info.ha_id, EventKey.BSH_COMMON_STATUS_OPERATION_STATE),
+            )
+        )
+
+    @callback
+    def _handle_operation_state_event(self) -> None:
+        """Update status when an event for the entity is received."""
+        self.program_running = (
+            status := self.appliance.status.get(StatusKey.BSH_COMMON_OPERATION_STATE)
+        ) is not None and status.value in [
+            BSH_OPERATION_STATE_RUN,
+            BSH_OPERATION_STATE_PAUSE,
+            BSH_OPERATION_STATE_FINISHED,
+        ]
+        if not self.program_running:
+            # reset the value when the program is not running, paused or finished
+            self._attr_native_value = None
+        self.async_write_ha_state()
+
     @property
     def available(self) -> bool:
         """Return true if the sensor is available."""
@@ -348,20 +631,27 @@ class HomeConnectProgramSensor(HomeConnectSensor):
         # Otherwise, some sensors report erroneous values.
         return super().available and self.program_running
 
-    async def async_update(self) -> None:
-        """Update the sensor's status."""
+    def update_native_value(self) -> None:
+        """Update the program sensor's status."""
         self.program_running = (
-            BSH_OPERATION_STATE in (appliance_status := self.device.appliance.status)
-            and ATTR_VALUE in appliance_status[BSH_OPERATION_STATE]
-            and appliance_status[BSH_OPERATION_STATE][ATTR_VALUE]
-            in [
-                BSH_OPERATION_STATE_RUN,
-                BSH_OPERATION_STATE_PAUSE,
-                BSH_OPERATION_STATE_FINISHED,
-            ]
-        )
-        if self.program_running:
-            await super().async_update()
-        else:
-            # reset the value when the program is not running, paused or finished
-            self._attr_native_value = None
+            status := self.appliance.status.get(StatusKey.BSH_COMMON_OPERATION_STATE)
+        ) is not None and status.value in [
+            BSH_OPERATION_STATE_RUN,
+            BSH_OPERATION_STATE_PAUSE,
+            BSH_OPERATION_STATE_FINISHED,
+        ]
+        event = self.appliance.events.get(cast(EventKey, self.bsh_key))
+        if event:
+            self._update_native_value(event.value)
+
+
+class HomeConnectEventSensor(HomeConnectSensor):
+    """Sensor class for Home Connect events."""
+
+    def update_native_value(self) -> None:
+        """Update the sensor's status."""
+        event = self.appliance.events.get(cast(EventKey, self.bsh_key))
+        if event:
+            self._update_native_value(event.value)
+        elif not self._attr_native_value:
+            self._attr_native_value = self.entity_description.default_value
diff --git a/homeassistant/components/home_connect/services.py b/homeassistant/components/home_connect/services.py
new file mode 100644
index 00000000000..fac1c5fe1a9
--- /dev/null
+++ b/homeassistant/components/home_connect/services.py
@@ -0,0 +1,572 @@
+"""Custom actions (previously known as services) for the Home Connect integration."""
+
+from __future__ import annotations
+
+from collections.abc import Awaitable
+from typing import Any, cast
+
+from aiohomeconnect.client import Client as HomeConnectClient
+from aiohomeconnect.model import (
+    ArrayOfOptions,
+    CommandKey,
+    Option,
+    OptionKey,
+    ProgramKey,
+    SettingKey,
+)
+from aiohomeconnect.model.error import HomeConnectError
+import voluptuous as vol
+
+from homeassistant.const import ATTR_DEVICE_ID
+from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
+from homeassistant.helpers import config_validation as cv, device_registry as dr
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
+
+from .const import (
+    AFFECTS_TO_ACTIVE_PROGRAM,
+    AFFECTS_TO_SELECTED_PROGRAM,
+    ATTR_AFFECTS_TO,
+    ATTR_KEY,
+    ATTR_PROGRAM,
+    ATTR_UNIT,
+    ATTR_VALUE,
+    DOMAIN,
+    PROGRAM_ENUM_OPTIONS,
+    SERVICE_OPTION_ACTIVE,
+    SERVICE_OPTION_SELECTED,
+    SERVICE_PAUSE_PROGRAM,
+    SERVICE_RESUME_PROGRAM,
+    SERVICE_SELECT_PROGRAM,
+    SERVICE_SET_PROGRAM_AND_OPTIONS,
+    SERVICE_SETTING,
+    SERVICE_START_PROGRAM,
+    TRANSLATION_KEYS_PROGRAMS_MAP,
+)
+from .coordinator import HomeConnectConfigEntry
+from .utils import bsh_key_to_translation_key, get_dict_from_home_connect_error
+
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
+
+PROGRAM_OPTIONS = {
+    bsh_key_to_translation_key(key): (
+        key,
+        value,
+    )
+    for key, value in {
+        OptionKey.BSH_COMMON_DURATION: int,
+        OptionKey.BSH_COMMON_START_IN_RELATIVE: int,
+        OptionKey.BSH_COMMON_FINISH_IN_RELATIVE: int,
+        OptionKey.CONSUMER_PRODUCTS_COFFEE_MAKER_FILL_QUANTITY: int,
+        OptionKey.CONSUMER_PRODUCTS_COFFEE_MAKER_MULTIPLE_BEVERAGES: bool,
+        OptionKey.DISHCARE_DISHWASHER_INTENSIV_ZONE: bool,
+        OptionKey.DISHCARE_DISHWASHER_BRILLIANCE_DRY: bool,
+        OptionKey.DISHCARE_DISHWASHER_VARIO_SPEED_PLUS: bool,
+        OptionKey.DISHCARE_DISHWASHER_SILENCE_ON_DEMAND: bool,
+        OptionKey.DISHCARE_DISHWASHER_HALF_LOAD: bool,
+        OptionKey.DISHCARE_DISHWASHER_EXTRA_DRY: bool,
+        OptionKey.DISHCARE_DISHWASHER_HYGIENE_PLUS: bool,
+        OptionKey.DISHCARE_DISHWASHER_ECO_DRY: bool,
+        OptionKey.DISHCARE_DISHWASHER_ZEOLITE_DRY: bool,
+        OptionKey.COOKING_OVEN_SETPOINT_TEMPERATURE: int,
+        OptionKey.COOKING_OVEN_FAST_PRE_HEAT: bool,
+        OptionKey.LAUNDRY_CARE_WASHER_I_DOS_1_ACTIVE: bool,
+        OptionKey.LAUNDRY_CARE_WASHER_I_DOS_2_ACTIVE: bool,
+    }.items()
+}
+
+
+SERVICE_SETTING_SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_DEVICE_ID): str,
+        vol.Required(ATTR_KEY): vol.All(
+            vol.Coerce(SettingKey),
+            vol.NotIn([SettingKey.UNKNOWN]),
+        ),
+        vol.Required(ATTR_VALUE): vol.Any(str, int, bool),
+    }
+)
+
+# DEPRECATED: Remove in 2025.9.0
+SERVICE_OPTION_SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_DEVICE_ID): str,
+        vol.Required(ATTR_KEY): vol.All(
+            vol.Coerce(OptionKey),
+            vol.NotIn([OptionKey.UNKNOWN]),
+        ),
+        vol.Required(ATTR_VALUE): vol.Any(str, int, bool),
+        vol.Optional(ATTR_UNIT): str,
+    }
+)
+
+# DEPRECATED: Remove in 2025.9.0
+SERVICE_PROGRAM_SCHEMA = vol.Any(
+    {
+        vol.Required(ATTR_DEVICE_ID): str,
+        vol.Required(ATTR_PROGRAM): vol.All(
+            vol.Coerce(ProgramKey),
+            vol.NotIn([ProgramKey.UNKNOWN]),
+        ),
+        vol.Required(ATTR_KEY): vol.All(
+            vol.Coerce(OptionKey),
+            vol.NotIn([OptionKey.UNKNOWN]),
+        ),
+        vol.Required(ATTR_VALUE): vol.Any(int, str),
+        vol.Optional(ATTR_UNIT): str,
+    },
+    {
+        vol.Required(ATTR_DEVICE_ID): str,
+        vol.Required(ATTR_PROGRAM): vol.All(
+            vol.Coerce(ProgramKey),
+            vol.NotIn([ProgramKey.UNKNOWN]),
+        ),
+    },
+)
+
+
+def _require_program_or_at_least_one_option(data: dict) -> dict:
+    if ATTR_PROGRAM not in data and not any(
+        option_key in data for option_key in (PROGRAM_ENUM_OPTIONS | PROGRAM_OPTIONS)
+    ):
+        raise ServiceValidationError(
+            translation_domain=DOMAIN,
+            translation_key="required_program_or_one_option_at_least",
+        )
+    return data
+
+
+SERVICE_PROGRAM_AND_OPTIONS_SCHEMA = vol.All(
+    vol.Schema(
+        {
+            vol.Required(ATTR_DEVICE_ID): str,
+            vol.Required(ATTR_AFFECTS_TO): vol.In(
+                [AFFECTS_TO_ACTIVE_PROGRAM, AFFECTS_TO_SELECTED_PROGRAM]
+            ),
+            vol.Optional(ATTR_PROGRAM): vol.In(TRANSLATION_KEYS_PROGRAMS_MAP.keys()),
+        }
+    )
+    .extend(
+        {
+            vol.Optional(translation_key): vol.In(allowed_values.keys())
+            for translation_key, (
+                key,
+                allowed_values,
+            ) in PROGRAM_ENUM_OPTIONS.items()
+        }
+    )
+    .extend(
+        {
+            vol.Optional(translation_key): schema
+            for translation_key, (key, schema) in PROGRAM_OPTIONS.items()
+        }
+    ),
+    _require_program_or_at_least_one_option,
+)
+
+SERVICE_COMMAND_SCHEMA = vol.Schema({vol.Required(ATTR_DEVICE_ID): str})
+
+
+async def _get_client_and_ha_id(
+    hass: HomeAssistant, device_id: str
+) -> tuple[HomeConnectClient, str]:
+    device_registry = dr.async_get(hass)
+    device_entry = device_registry.async_get(device_id)
+    if device_entry is None:
+        raise ServiceValidationError(
+            translation_domain=DOMAIN,
+            translation_key="device_entry_not_found",
+            translation_placeholders={
+                "device_id": device_id,
+            },
+        )
+    entry: HomeConnectConfigEntry | None = None
+    for entry_id in device_entry.config_entries:
+        _entry = hass.config_entries.async_get_entry(entry_id)
+        assert _entry
+        if _entry.domain == DOMAIN:
+            entry = cast(HomeConnectConfigEntry, _entry)
+            break
+    if entry is None:
+        raise ServiceValidationError(
+            translation_domain=DOMAIN,
+            translation_key="config_entry_not_found",
+            translation_placeholders={
+                "device_id": device_id,
+            },
+        )
+
+    ha_id = next(
+        (
+            identifier[1]
+            for identifier in device_entry.identifiers
+            if identifier[0] == DOMAIN
+        ),
+        None,
+    )
+    if ha_id is None:
+        raise ServiceValidationError(
+            translation_domain=DOMAIN,
+            translation_key="appliance_not_found",
+            translation_placeholders={
+                "device_id": device_id,
+            },
+        )
+    return entry.runtime_data.client, ha_id
+
+
+async def _async_service_program(call: ServiceCall, start: bool) -> None:
+    """Execute calls to services taking a program."""
+    program = call.data[ATTR_PROGRAM]
+    client, ha_id = await _get_client_and_ha_id(call.hass, call.data[ATTR_DEVICE_ID])
+
+    option_key = call.data.get(ATTR_KEY)
+    options = (
+        [
+            Option(
+                option_key,
+                call.data[ATTR_VALUE],
+                unit=call.data.get(ATTR_UNIT),
+            )
+        ]
+        if option_key is not None
+        else None
+    )
+
+    async_create_issue(
+        call.hass,
+        DOMAIN,
+        "deprecated_set_program_and_option_actions",
+        breaks_in_ha_version="2025.9.0",
+        is_fixable=True,
+        is_persistent=True,
+        severity=IssueSeverity.WARNING,
+        translation_key="deprecated_set_program_and_option_actions",
+        translation_placeholders={
+            "new_action_key": SERVICE_SET_PROGRAM_AND_OPTIONS,
+            "remove_release": "2025.9.0",
+            "deprecated_action_yaml": "\n".join(
+                [
+                    "```yaml",
+                    f"action: {DOMAIN}.{SERVICE_START_PROGRAM if start else SERVICE_SELECT_PROGRAM}",
+                    "data:",
+                    f"  {ATTR_DEVICE_ID}: DEVICE_ID",
+                    f"  {ATTR_PROGRAM}: {program}",
+                    *([f"  {ATTR_KEY}: {options[0].key}"] if options else []),
+                    *([f"  {ATTR_VALUE}: {options[0].value}"] if options else []),
+                    *(
+                        [f"  {ATTR_UNIT}: {options[0].unit}"]
+                        if options and options[0].unit
+                        else []
+                    ),
+                    "```",
+                ]
+            ),
+            "new_action_yaml": "\n  ".join(
+                [
+                    "```yaml",
+                    f"action: {DOMAIN}.{SERVICE_SET_PROGRAM_AND_OPTIONS}",
+                    "data:",
+                    f"  {ATTR_DEVICE_ID}: DEVICE_ID",
+                    f"  {ATTR_AFFECTS_TO}: {AFFECTS_TO_ACTIVE_PROGRAM if start else AFFECTS_TO_SELECTED_PROGRAM}",
+                    f"  {ATTR_PROGRAM}: {bsh_key_to_translation_key(program.value)}",
+                    *(
+                        [
+                            f"  {bsh_key_to_translation_key(options[0].key)}: {options[0].value}"
+                        ]
+                        if options
+                        else []
+                    ),
+                    "```",
+                ]
+            ),
+            "repo_link": "[aiohomeconnect](https://github.com/MartinHjelmare/aiohomeconnect)",
+        },
+    )
+
+    try:
+        if start:
+            await client.start_program(ha_id, program_key=program, options=options)
+        else:
+            await client.set_selected_program(
+                ha_id, program_key=program, options=options
+            )
+    except HomeConnectError as err:
+        raise HomeAssistantError(
+            translation_domain=DOMAIN,
+            translation_key="start_program" if start else "select_program",
+            translation_placeholders={
+                **get_dict_from_home_connect_error(err),
+                "program": program,
+            },
+        ) from err
+
+
+async def _async_service_set_program_options(call: ServiceCall, active: bool) -> None:
+    """Execute calls to services taking a program."""
+    option_key = call.data[ATTR_KEY]
+    value = call.data[ATTR_VALUE]
+    unit = call.data.get(ATTR_UNIT)
+    client, ha_id = await _get_client_and_ha_id(call.hass, call.data[ATTR_DEVICE_ID])
+
+    async_create_issue(
+        call.hass,
+        DOMAIN,
+        "deprecated_set_program_and_option_actions",
+        breaks_in_ha_version="2025.9.0",
+        is_fixable=True,
+        is_persistent=True,
+        severity=IssueSeverity.WARNING,
+        translation_key="deprecated_set_program_and_option_actions",
+        translation_placeholders={
+            "new_action_key": SERVICE_SET_PROGRAM_AND_OPTIONS,
+            "remove_release": "2025.9.0",
+            "deprecated_action_yaml": "\n".join(
+                [
+                    "```yaml",
+                    f"action: {DOMAIN}.{SERVICE_OPTION_ACTIVE if active else SERVICE_OPTION_SELECTED}",
+                    "data:",
+                    f"  {ATTR_DEVICE_ID}: DEVICE_ID",
+                    f"  {ATTR_KEY}: {option_key}",
+                    f"  {ATTR_VALUE}: {value}",
+                    *([f"  {ATTR_UNIT}: {unit}"] if unit else []),
+                    "```",
+                ]
+            ),
+            "new_action_yaml": "\n  ".join(
+                [
+                    "```yaml",
+                    f"action: {DOMAIN}.{SERVICE_SET_PROGRAM_AND_OPTIONS}",
+                    "data:",
+                    f"  {ATTR_DEVICE_ID}: DEVICE_ID",
+                    f"  {ATTR_AFFECTS_TO}: {AFFECTS_TO_ACTIVE_PROGRAM if active else AFFECTS_TO_SELECTED_PROGRAM}",
+                    f"  {bsh_key_to_translation_key(option_key)}: {value}",
+                    "```",
+                ]
+            ),
+            "repo_link": "[aiohomeconnect](https://github.com/MartinHjelmare/aiohomeconnect)",
+        },
+    )
+    try:
+        if active:
+            await client.set_active_program_option(
+                ha_id,
+                option_key=option_key,
+                value=value,
+                unit=unit,
+            )
+        else:
+            await client.set_selected_program_option(
+                ha_id,
+                option_key=option_key,
+                value=value,
+                unit=unit,
+            )
+    except HomeConnectError as err:
+        raise HomeAssistantError(
+            translation_domain=DOMAIN,
+            translation_key="set_options_active_program"
+            if active
+            else "set_options_selected_program",
+            translation_placeholders={
+                **get_dict_from_home_connect_error(err),
+                "key": option_key,
+                "value": str(value),
+            },
+        ) from err
+
+
+async def _async_service_command(call: ServiceCall, command_key: CommandKey) -> None:
+    """Execute calls to services executing a command."""
+    client, ha_id = await _get_client_and_ha_id(call.hass, call.data[ATTR_DEVICE_ID])
+
+    async_create_issue(
+        call.hass,
+        DOMAIN,
+        "deprecated_command_actions",
+        breaks_in_ha_version="2025.9.0",
+        is_fixable=True,
+        is_persistent=True,
+        severity=IssueSeverity.WARNING,
+        translation_key="deprecated_command_actions",
+    )
+
+    try:
+        await client.put_command(ha_id, command_key=command_key, value=True)
+    except HomeConnectError as err:
+        raise HomeAssistantError(
+            translation_domain=DOMAIN,
+            translation_key="execute_command",
+            translation_placeholders={
+                **get_dict_from_home_connect_error(err),
+                "command": command_key.value,
+            },
+        ) from err
+
+
+async def async_service_option_active(call: ServiceCall) -> None:
+    """Service for setting an option for an active program."""
+    await _async_service_set_program_options(call, True)
+
+
+async def async_service_option_selected(call: ServiceCall) -> None:
+    """Service for setting an option for a selected program."""
+    await _async_service_set_program_options(call, False)
+
+
+async def async_service_setting(call: ServiceCall) -> None:
+    """Service for changing a setting."""
+    key = call.data[ATTR_KEY]
+    value = call.data[ATTR_VALUE]
+    client, ha_id = await _get_client_and_ha_id(call.hass, call.data[ATTR_DEVICE_ID])
+
+    try:
+        await client.set_setting(ha_id, setting_key=key, value=value)
+    except HomeConnectError as err:
+        raise HomeAssistantError(
+            translation_domain=DOMAIN,
+            translation_key="set_setting",
+            translation_placeholders={
+                **get_dict_from_home_connect_error(err),
+                "key": key,
+                "value": str(value),
+            },
+        ) from err
+
+
+async def async_service_pause_program(call: ServiceCall) -> None:
+    """Service for pausing a program."""
+    await _async_service_command(call, CommandKey.BSH_COMMON_PAUSE_PROGRAM)
+
+
+async def async_service_resume_program(call: ServiceCall) -> None:
+    """Service for resuming a paused program."""
+    await _async_service_command(call, CommandKey.BSH_COMMON_RESUME_PROGRAM)
+
+
+async def async_service_select_program(call: ServiceCall) -> None:
+    """Service for selecting a program."""
+    await _async_service_program(call, False)
+
+
+async def async_service_set_program_and_options(call: ServiceCall) -> None:
+    """Service for setting a program and options."""
+    data = dict(call.data)
+    program = data.pop(ATTR_PROGRAM, None)
+    affects_to = data.pop(ATTR_AFFECTS_TO)
+    client, ha_id = await _get_client_and_ha_id(call.hass, data.pop(ATTR_DEVICE_ID))
+
+    options: list[Option] = []
+
+    for option, value in data.items():
+        if option in PROGRAM_ENUM_OPTIONS:
+            options.append(
+                Option(
+                    PROGRAM_ENUM_OPTIONS[option][0],
+                    PROGRAM_ENUM_OPTIONS[option][1][value],
+                )
+            )
+        elif option in PROGRAM_OPTIONS:
+            option_key = PROGRAM_OPTIONS[option][0]
+            options.append(Option(option_key, value))
+
+    method_call: Awaitable[Any]
+    exception_translation_key: str
+    if program:
+        program = (
+            program
+            if isinstance(program, ProgramKey)
+            else TRANSLATION_KEYS_PROGRAMS_MAP[program]
+        )
+
+        if affects_to == AFFECTS_TO_ACTIVE_PROGRAM:
+            method_call = client.start_program(
+                ha_id, program_key=program, options=options
+            )
+            exception_translation_key = "start_program"
+        elif affects_to == AFFECTS_TO_SELECTED_PROGRAM:
+            method_call = client.set_selected_program(
+                ha_id, program_key=program, options=options
+            )
+            exception_translation_key = "select_program"
+    else:
+        array_of_options = ArrayOfOptions(options)
+        if affects_to == AFFECTS_TO_ACTIVE_PROGRAM:
+            method_call = client.set_active_program_options(
+                ha_id, array_of_options=array_of_options
+            )
+            exception_translation_key = "set_options_active_program"
+        else:
+            # affects_to is AFFECTS_TO_SELECTED_PROGRAM
+            method_call = client.set_selected_program_options(
+                ha_id, array_of_options=array_of_options
+            )
+            exception_translation_key = "set_options_selected_program"
+
+    try:
+        await method_call
+    except HomeConnectError as err:
+        raise HomeAssistantError(
+            translation_domain=DOMAIN,
+            translation_key=exception_translation_key,
+            translation_placeholders={
+                **get_dict_from_home_connect_error(err),
+                **({"program": program} if program else {}),
+            },
+        ) from err
+
+
+async def async_service_start_program(call: ServiceCall) -> None:
+    """Service for starting a program."""
+    await _async_service_program(call, True)
+
+
+def register_actions(hass: HomeAssistant) -> None:
+    """Register custom actions."""
+
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_OPTION_ACTIVE,
+        async_service_option_active,
+        schema=SERVICE_OPTION_SCHEMA,
+    )
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_OPTION_SELECTED,
+        async_service_option_selected,
+        schema=SERVICE_OPTION_SCHEMA,
+    )
+    hass.services.async_register(
+        DOMAIN, SERVICE_SETTING, async_service_setting, schema=SERVICE_SETTING_SCHEMA
+    )
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_PAUSE_PROGRAM,
+        async_service_pause_program,
+        schema=SERVICE_COMMAND_SCHEMA,
+    )
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_RESUME_PROGRAM,
+        async_service_resume_program,
+        schema=SERVICE_COMMAND_SCHEMA,
+    )
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_SELECT_PROGRAM,
+        async_service_select_program,
+        schema=SERVICE_PROGRAM_SCHEMA,
+    )
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_START_PROGRAM,
+        async_service_start_program,
+        schema=SERVICE_PROGRAM_SCHEMA,
+    )
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_SET_PROGRAM_AND_OPTIONS,
+        async_service_set_program_and_options,
+        schema=SERVICE_PROGRAM_AND_OPTIONS_SCHEMA,
+    )
diff --git a/homeassistant/components/home_connect/services.yaml b/homeassistant/components/home_connect/services.yaml
index 0738b58595a..2b53090fd34 100644
--- a/homeassistant/components/home_connect/services.yaml
+++ b/homeassistant/components/home_connect/services.yaml
@@ -46,6 +46,560 @@ select_program:
       example: "seconds"
       selector:
         text:
+set_program_and_options:
+  fields:
+    device_id:
+      required: true
+      selector:
+        device:
+          integration: home_connect
+    affects_to:
+      example: active_program
+      required: true
+      selector:
+        select:
+          translation_key: affects_to
+          options:
+            - active_program
+            - selected_program
+    program:
+      example: dishcare_dishwasher_program_auto2
+      required: true
+      selector:
+        select:
+          mode: dropdown
+          custom_value: false
+          translation_key: programs
+          options:
+            - consumer_products_cleaning_robot_program_cleaning_clean_all
+            - consumer_products_cleaning_robot_program_cleaning_clean_map
+            - consumer_products_cleaning_robot_program_basic_go_home
+            - consumer_products_coffee_maker_program_beverage_ristretto
+            - consumer_products_coffee_maker_program_beverage_espresso
+            - consumer_products_coffee_maker_program_beverage_espresso_doppio
+            - consumer_products_coffee_maker_program_beverage_coffee
+            - consumer_products_coffee_maker_program_beverage_x_l_coffee
+            - consumer_products_coffee_maker_program_beverage_caffe_grande
+            - consumer_products_coffee_maker_program_beverage_espresso_macchiato
+            - consumer_products_coffee_maker_program_beverage_cappuccino
+            - consumer_products_coffee_maker_program_beverage_latte_macchiato
+            - consumer_products_coffee_maker_program_beverage_caffe_latte
+            - consumer_products_coffee_maker_program_beverage_milk_froth
+            - consumer_products_coffee_maker_program_beverage_warm_milk
+            - consumer_products_coffee_maker_program_coffee_world_kleiner_brauner
+            - consumer_products_coffee_maker_program_coffee_world_grosser_brauner
+            - consumer_products_coffee_maker_program_coffee_world_verlaengerter
+            - consumer_products_coffee_maker_program_coffee_world_verlaengerter_braun
+            - consumer_products_coffee_maker_program_coffee_world_wiener_melange
+            - consumer_products_coffee_maker_program_coffee_world_flat_white
+            - consumer_products_coffee_maker_program_coffee_world_cortado
+            - consumer_products_coffee_maker_program_coffee_world_cafe_cortado
+            - consumer_products_coffee_maker_program_coffee_world_cafe_con_leche
+            - consumer_products_coffee_maker_program_coffee_world_cafe_au_lait
+            - consumer_products_coffee_maker_program_coffee_world_doppio
+            - consumer_products_coffee_maker_program_coffee_world_kaapi
+            - consumer_products_coffee_maker_program_coffee_world_koffie_verkeerd
+            - consumer_products_coffee_maker_program_coffee_world_galao
+            - consumer_products_coffee_maker_program_coffee_world_garoto
+            - consumer_products_coffee_maker_program_coffee_world_americano
+            - consumer_products_coffee_maker_program_coffee_world_red_eye
+            - consumer_products_coffee_maker_program_coffee_world_black_eye
+            - consumer_products_coffee_maker_program_coffee_world_dead_eye
+            - consumer_products_coffee_maker_program_beverage_hot_water
+            - dishcare_dishwasher_program_pre_rinse
+            - dishcare_dishwasher_program_auto_1
+            - dishcare_dishwasher_program_auto_2
+            - dishcare_dishwasher_program_auto_3
+            - dishcare_dishwasher_program_eco_50
+            - dishcare_dishwasher_program_quick_45
+            - dishcare_dishwasher_program_intensiv_70
+            - dishcare_dishwasher_program_normal_65
+            - dishcare_dishwasher_program_glas_40
+            - dishcare_dishwasher_program_glass_care
+            - dishcare_dishwasher_program_night_wash
+            - dishcare_dishwasher_program_quick_65
+            - dishcare_dishwasher_program_normal_45
+            - dishcare_dishwasher_program_intensiv_45
+            - dishcare_dishwasher_program_auto_half_load
+            - dishcare_dishwasher_program_intensiv_power
+            - dishcare_dishwasher_program_magic_daily
+            - dishcare_dishwasher_program_super_60
+            - dishcare_dishwasher_program_kurz_60
+            - dishcare_dishwasher_program_express_sparkle_65
+            - dishcare_dishwasher_program_machine_care
+            - dishcare_dishwasher_program_steam_fresh
+            - dishcare_dishwasher_program_maximum_cleaning
+            - dishcare_dishwasher_program_mixed_load
+            - laundry_care_dryer_program_cotton
+            - laundry_care_dryer_program_synthetic
+            - laundry_care_dryer_program_mix
+            - laundry_care_dryer_program_blankets
+            - laundry_care_dryer_program_business_shirts
+            - laundry_care_dryer_program_down_feathers
+            - laundry_care_dryer_program_hygiene
+            - laundry_care_dryer_program_jeans
+            - laundry_care_dryer_program_outdoor
+            - laundry_care_dryer_program_synthetic_refresh
+            - laundry_care_dryer_program_towels
+            - laundry_care_dryer_program_delicates
+            - laundry_care_dryer_program_super_40
+            - laundry_care_dryer_program_shirts_15
+            - laundry_care_dryer_program_pillow
+            - laundry_care_dryer_program_anti_shrink
+            - laundry_care_dryer_program_my_time_my_drying_time
+            - laundry_care_dryer_program_time_cold
+            - laundry_care_dryer_program_time_warm
+            - laundry_care_dryer_program_in_basket
+            - laundry_care_dryer_program_time_cold_fix_time_cold_20
+            - laundry_care_dryer_program_time_cold_fix_time_cold_30
+            - laundry_care_dryer_program_time_cold_fix_time_cold_60
+            - laundry_care_dryer_program_time_warm_fix_time_warm_30
+            - laundry_care_dryer_program_time_warm_fix_time_warm_40
+            - laundry_care_dryer_program_time_warm_fix_time_warm_60
+            - laundry_care_dryer_program_dessous
+            - cooking_common_program_hood_automatic
+            - cooking_common_program_hood_venting
+            - cooking_common_program_hood_delayed_shut_off
+            - cooking_oven_program_heating_mode_pre_heating
+            - cooking_oven_program_heating_mode_hot_air
+            - cooking_oven_program_heating_mode_hot_air_eco
+            - cooking_oven_program_heating_mode_hot_air_grilling
+            - cooking_oven_program_heating_mode_top_bottom_heating
+            - cooking_oven_program_heating_mode_top_bottom_heating_eco
+            - cooking_oven_program_heating_mode_bottom_heating
+            - cooking_oven_program_heating_mode_pizza_setting
+            - cooking_oven_program_heating_mode_slow_cook
+            - cooking_oven_program_heating_mode_intensive_heat
+            - cooking_oven_program_heating_mode_keep_warm
+            - cooking_oven_program_heating_mode_preheat_ovenware
+            - cooking_oven_program_heating_mode_frozen_heatup_special
+            - cooking_oven_program_heating_mode_desiccation
+            - cooking_oven_program_heating_mode_defrost
+            - cooking_oven_program_heating_mode_proof
+            - cooking_oven_program_heating_mode_hot_air_30_steam
+            - cooking_oven_program_heating_mode_hot_air_60_steam
+            - cooking_oven_program_heating_mode_hot_air_80_steam
+            - cooking_oven_program_heating_mode_hot_air_100_steam
+            - cooking_oven_program_heating_mode_sabbath_programme
+            - cooking_oven_program_microwave_90_watt
+            - cooking_oven_program_microwave_180_watt
+            - cooking_oven_program_microwave_360_watt
+            - cooking_oven_program_microwave_600_watt
+            - cooking_oven_program_microwave_900_watt
+            - cooking_oven_program_microwave_1000_watt
+            - cooking_oven_program_microwave_max
+            - cooking_oven_program_heating_mode_warming_drawer
+            - laundry_care_washer_program_cotton
+            - laundry_care_washer_program_cotton_cotton_eco
+            - laundry_care_washer_program_cotton_eco_4060
+            - laundry_care_washer_program_cotton_colour
+            - laundry_care_washer_program_easy_care
+            - laundry_care_washer_program_mix
+            - laundry_care_washer_program_mix_night_wash
+            - laundry_care_washer_program_delicates_silk
+            - laundry_care_washer_program_wool
+            - laundry_care_washer_program_sensitive
+            - laundry_care_washer_program_auto_30
+            - laundry_care_washer_program_auto_40
+            - laundry_care_washer_program_auto_60
+            - laundry_care_washer_program_chiffon
+            - laundry_care_washer_program_curtains
+            - laundry_care_washer_program_dark_wash
+            - laundry_care_washer_program_dessous
+            - laundry_care_washer_program_monsoon
+            - laundry_care_washer_program_outdoor
+            - laundry_care_washer_program_plush_toy
+            - laundry_care_washer_program_shirts_blouses
+            - laundry_care_washer_program_sport_fitness
+            - laundry_care_washer_program_towels
+            - laundry_care_washer_program_water_proof
+            - laundry_care_washer_program_power_speed_59
+            - laundry_care_washer_program_super_153045_super_15
+            - laundry_care_washer_program_super_153045_super_1530
+            - laundry_care_washer_program_down_duvet_duvet
+            - laundry_care_washer_program_rinse_rinse_spin_drain
+            - laundry_care_washer_program_drum_clean
+            - laundry_care_washer_dryer_program_cotton
+            - laundry_care_washer_dryer_program_cotton_eco_4060
+            - laundry_care_washer_dryer_program_mix
+            - laundry_care_washer_dryer_program_easy_care
+            - laundry_care_washer_dryer_program_wash_and_dry_60
+            - laundry_care_washer_dryer_program_wash_and_dry_90
+    cleaning_robot_options:
+      collapsed: true
+      fields:
+        consumer_products_cleaning_robot_option_reference_map_id:
+          example: consumer_products_cleaning_robot_enum_type_available_maps_map1
+          required: false
+          selector:
+            select:
+              mode: dropdown
+              translation_key: available_maps
+              options:
+                - consumer_products_cleaning_robot_enum_type_available_maps_temp_map
+                - consumer_products_cleaning_robot_enum_type_available_maps_map1
+                - consumer_products_cleaning_robot_enum_type_available_maps_map2
+                - consumer_products_cleaning_robot_enum_type_available_maps_map3
+        consumer_products_cleaning_robot_option_cleaning_mode:
+          example: consumer_products_cleaning_robot_enum_type_cleaning_modes_standard
+          required: false
+          selector:
+            select:
+              mode: dropdown
+              translation_key: cleaning_mode
+              options:
+                - consumer_products_cleaning_robot_enum_type_cleaning_modes_silent
+                - consumer_products_cleaning_robot_enum_type_cleaning_modes_standard
+                - consumer_products_cleaning_robot_enum_type_cleaning_modes_power
+    coffee_maker_options:
+      collapsed: true
+      fields:
+        consumer_products_coffee_maker_option_bean_amount:
+          example: consumer_products_coffee_maker_enum_type_bean_amount_normal
+          required: false
+          selector:
+            select:
+              mode: dropdown
+              translation_key: bean_amount
+              options:
+                - consumer_products_coffee_maker_enum_type_bean_amount_very_mild
+                - consumer_products_coffee_maker_enum_type_bean_amount_mild
+                - consumer_products_coffee_maker_enum_type_bean_amount_mild_plus
+                - consumer_products_coffee_maker_enum_type_bean_amount_normal
+                - consumer_products_coffee_maker_enum_type_bean_amount_normal_plus
+                - consumer_products_coffee_maker_enum_type_bean_amount_strong
+                - consumer_products_coffee_maker_enum_type_bean_amount_strong_plus
+                - consumer_products_coffee_maker_enum_type_bean_amount_very_strong
+                - consumer_products_coffee_maker_enum_type_bean_amount_very_strong_plus
+                - consumer_products_coffee_maker_enum_type_bean_amount_extra_strong
+                - consumer_products_coffee_maker_enum_type_bean_amount_double_shot
+                - consumer_products_coffee_maker_enum_type_bean_amount_double_shot_plus
+                - consumer_products_coffee_maker_enum_type_bean_amount_double_shot_plus_plus
+                - consumer_products_coffee_maker_enum_type_bean_amount_triple_shot
+                - consumer_products_coffee_maker_enum_type_bean_amount_triple_shot_plus
+                - consumer_products_coffee_maker_enum_type_bean_amount_coffee_ground
+        consumer_products_coffee_maker_option_fill_quantity:
+          example: 60
+          required: false
+          selector:
+            number:
+              min: 0
+              step: 1
+              mode: box
+              unit_of_measurement: ml
+        consumer_products_coffee_maker_option_coffee_temperature:
+          example: consumer_products_coffee_maker_enum_type_coffee_temperature_88_c
+          required: false
+          selector:
+            select:
+              mode: dropdown
+              translation_key: coffee_temperature
+              options:
+                - consumer_products_coffee_maker_enum_type_coffee_temperature_88_c
+                - consumer_products_coffee_maker_enum_type_coffee_temperature_90_c
+                - consumer_products_coffee_maker_enum_type_coffee_temperature_92_c
+                - consumer_products_coffee_maker_enum_type_coffee_temperature_94_c
+                - consumer_products_coffee_maker_enum_type_coffee_temperature_95_c
+                - consumer_products_coffee_maker_enum_type_coffee_temperature_96_c
+        consumer_products_coffee_maker_option_bean_container:
+          example: consumer_products_coffee_maker_enum_type_bean_container_selection_right
+          required: false
+          selector:
+            select:
+              mode: dropdown
+              translation_key: bean_container
+              options:
+                - consumer_products_coffee_maker_enum_type_bean_container_selection_right
+                - consumer_products_coffee_maker_enum_type_bean_container_selection_left
+        consumer_products_coffee_maker_option_flow_rate:
+          example: consumer_products_coffee_maker_enum_type_flow_rate_normal
+          required: false
+          selector:
+            select:
+              mode: dropdown
+              translation_key: flow_rate
+              options:
+                - consumer_products_coffee_maker_enum_type_flow_rate_normal
+                - consumer_products_coffee_maker_enum_type_flow_rate_intense
+                - consumer_products_coffee_maker_enum_type_flow_rate_intense_plus
+        consumer_products_coffee_maker_option_multiple_beverages:
+          example: false
+          required: false
+          selector:
+            boolean:
+        consumer_products_coffee_maker_option_coffee_milk_ratio:
+          example: consumer_products_coffee_maker_enum_type_coffee_milk_ratio_50_percent
+          required: false
+          selector:
+            select:
+              mode: dropdown
+              translation_key: coffee_milk_ratio
+              options:
+                - consumer_products_coffee_maker_enum_type_coffee_milk_ratio_10_percent
+                - consumer_products_coffee_maker_enum_type_coffee_milk_ratio_20_percent
+                - consumer_products_coffee_maker_enum_type_coffee_milk_ratio_25_percent
+                - consumer_products_coffee_maker_enum_type_coffee_milk_ratio_30_percent
+                - consumer_products_coffee_maker_enum_type_coffee_milk_ratio_40_percent
+                - consumer_products_coffee_maker_enum_type_coffee_milk_ratio_50_percent
+                - consumer_products_coffee_maker_enum_type_coffee_milk_ratio_55_percent
+                - consumer_products_coffee_maker_enum_type_coffee_milk_ratio_60_percent
+                - consumer_products_coffee_maker_enum_type_coffee_milk_ratio_65_percent
+                - consumer_products_coffee_maker_enum_type_coffee_milk_ratio_67_percent
+                - consumer_products_coffee_maker_enum_type_coffee_milk_ratio_70_percent
+                - consumer_products_coffee_maker_enum_type_coffee_milk_ratio_75_percent
+                - consumer_products_coffee_maker_enum_type_coffee_milk_ratio_80_percent
+                - consumer_products_coffee_maker_enum_type_coffee_milk_ratio_85_percent
+                - consumer_products_coffee_maker_enum_type_coffee_milk_ratio_90_percent
+        consumer_products_coffee_maker_option_hot_water_temperature:
+          example: consumer_products_coffee_maker_enum_type_hot_water_temperature_50_c
+          required: false
+          selector:
+            select:
+              mode: dropdown
+              translation_key: hot_water_temperature
+              options:
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_white_tea
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_green_tea
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_black_tea
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_50_c
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_55_c
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_60_c
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_65_c
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_70_c
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_75_c
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_80_c
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_85_c
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_90_c
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_95_c
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_97_c
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_122_f
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_131_f
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_140_f
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_149_f
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_158_f
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_167_f
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_176_f
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_185_f
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_194_f
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_203_f
+                - consumer_products_coffee_maker_enum_type_hot_water_temperature_max
+    dish_washer_options:
+      collapsed: true
+      fields:
+        b_s_h_common_option_start_in_relative:
+          example: 3600
+          required: false
+          selector:
+            number:
+              min: 0
+              step: 1
+              mode: box
+              unit_of_measurement: s
+        dishcare_dishwasher_option_intensiv_zone:
+          example: false
+          required: false
+          selector:
+            boolean:
+        dishcare_dishwasher_option_brilliance_dry:
+          example: false
+          required: false
+          selector:
+            boolean:
+        dishcare_dishwasher_option_vario_speed_plus:
+          example: false
+          required: false
+          selector:
+            boolean:
+        dishcare_dishwasher_option_silence_on_demand:
+          example: false
+          required: false
+          selector:
+            boolean:
+        dishcare_dishwasher_option_half_load:
+          example: false
+          required: false
+          selector:
+            boolean:
+        dishcare_dishwasher_option_extra_dry:
+          example: false
+          required: false
+          selector:
+            boolean:
+        dishcare_dishwasher_option_hygiene_plus:
+          example: false
+          required: false
+          selector:
+            boolean:
+        dishcare_dishwasher_option_eco_dry:
+          example: false
+          required: false
+          selector:
+            boolean:
+        dishcare_dishwasher_option_zeolite_dry:
+          example: false
+          required: false
+          selector:
+            boolean:
+    dryer_options:
+      collapsed: true
+      fields:
+        laundry_care_dryer_option_drying_target:
+          example: laundry_care_dryer_enum_type_drying_target_iron_dry
+          required: false
+          selector:
+            select:
+              mode: dropdown
+              translation_key: drying_target
+              options:
+                - laundry_care_dryer_enum_type_drying_target_iron_dry
+                - laundry_care_dryer_enum_type_drying_target_gentle_dry
+                - laundry_care_dryer_enum_type_drying_target_cupboard_dry
+                - laundry_care_dryer_enum_type_drying_target_cupboard_dry_plus
+                - laundry_care_dryer_enum_type_drying_target_extra_dry
+    hood_options:
+      collapsed: true
+      fields:
+        cooking_hood_option_venting_level:
+          example: cooking_hood_enum_type_stage_fan_stage01
+          required: false
+          selector:
+            select:
+              mode: dropdown
+              translation_key: venting_level
+              options:
+                - cooking_hood_enum_type_stage_fan_off
+                - cooking_hood_enum_type_stage_fan_stage_01
+                - cooking_hood_enum_type_stage_fan_stage_02
+                - cooking_hood_enum_type_stage_fan_stage_03
+                - cooking_hood_enum_type_stage_fan_stage_04
+                - cooking_hood_enum_type_stage_fan_stage_05
+        cooking_hood_option_intensive_level:
+          example: cooking_hood_enum_type_intensive_stage_intensive_stage1
+          required: false
+          selector:
+            select:
+              mode: dropdown
+              translation_key: intensive_level
+              options:
+                - cooking_hood_enum_type_intensive_stage_intensive_stage_off
+                - cooking_hood_enum_type_intensive_stage_intensive_stage1
+                - cooking_hood_enum_type_intensive_stage_intensive_stage2
+    oven_options:
+      collapsed: true
+      fields:
+        cooking_oven_option_setpoint_temperature:
+          example: 180
+          required: false
+          selector:
+            number:
+              min: 0
+              step: 1
+              mode: box
+              unit_of_measurement: °C/°F
+        b_s_h_common_option_duration:
+          example: 900
+          required: false
+          selector:
+            number:
+              min: 0
+              step: 1
+              mode: box
+              unit_of_measurement: s
+        cooking_oven_option_fast_pre_heat:
+          example: false
+          required: false
+          selector:
+            boolean:
+    warming_drawer_options:
+      collapsed: true
+      fields:
+        cooking_oven_option_warming_level:
+          example: cooking_oven_enum_type_warming_level_medium
+          required: false
+          selector:
+            select:
+              mode: dropdown
+              translation_key: warming_level
+              options:
+                - cooking_oven_enum_type_warming_level_low
+                - cooking_oven_enum_type_warming_level_medium
+                - cooking_oven_enum_type_warming_level_high
+    washer_options:
+      collapsed: true
+      fields:
+        laundry_care_washer_option_temperature:
+          example: laundry_care_washer_enum_type_temperature_g_c_40
+          required: false
+          selector:
+            select:
+              mode: dropdown
+              translation_key: washer_temperature
+              options:
+                - laundry_care_washer_enum_type_temperature_cold
+                - laundry_care_washer_enum_type_temperature_g_c_20
+                - laundry_care_washer_enum_type_temperature_g_c_30
+                - laundry_care_washer_enum_type_temperature_g_c_40
+                - laundry_care_washer_enum_type_temperature_g_c_50
+                - laundry_care_washer_enum_type_temperature_g_c_60
+                - laundry_care_washer_enum_type_temperature_g_c_70
+                - laundry_care_washer_enum_type_temperature_g_c_80
+                - laundry_care_washer_enum_type_temperature_g_c_90
+                - laundry_care_washer_enum_type_temperature_ul_cold
+                - laundry_care_washer_enum_type_temperature_ul_warm
+                - laundry_care_washer_enum_type_temperature_ul_hot
+                - laundry_care_washer_enum_type_temperature_ul_extra_hot
+        laundry_care_washer_option_spin_speed:
+          example: laundry_care_washer_enum_type_spin_speed_r_p_m800
+          required: false
+          selector:
+            select:
+              mode: dropdown
+              translation_key: spin_speed
+              options:
+                - laundry_care_washer_enum_type_spin_speed_off
+                - laundry_care_washer_enum_type_spin_speed_r_p_m_400
+                - laundry_care_washer_enum_type_spin_speed_r_p_m_600
+                - laundry_care_washer_enum_type_spin_speed_r_p_m_700
+                - laundry_care_washer_enum_type_spin_speed_r_p_m_800
+                - laundry_care_washer_enum_type_spin_speed_r_p_m_900
+                - laundry_care_washer_enum_type_spin_speed_r_p_m_1000
+                - laundry_care_washer_enum_type_spin_speed_r_p_m_1200
+                - laundry_care_washer_enum_type_spin_speed_r_p_m_1400
+                - laundry_care_washer_enum_type_spin_speed_r_p_m_1600
+                - laundry_care_washer_enum_type_spin_speed_ul_off
+                - laundry_care_washer_enum_type_spin_speed_ul_low
+                - laundry_care_washer_enum_type_spin_speed_ul_medium
+                - laundry_care_washer_enum_type_spin_speed_ul_high
+        b_s_h_common_option_finish_in_relative:
+          example: 3600
+          required: false
+          selector:
+            number:
+              min: 0
+              step: 1
+              mode: box
+              unit_of_measurement: s
+        laundry_care_washer_option_i_dos1_active:
+          example: false
+          required: false
+          selector:
+            boolean:
+        laundry_care_washer_option_i_dos2_active:
+          example: false
+          required: false
+          selector:
+            boolean:
+        laundry_care_washer_option_vario_perfect:
+          example: laundry_care_common_enum_type_vario_perfect_eco_perfect
+          required: false
+          selector:
+            select:
+              mode: dropdown
+              translation_key: vario_perfect
+              options:
+                - laundry_care_common_enum_type_vario_perfect_off
+                - laundry_care_common_enum_type_vario_perfect_eco_perfect
+                - laundry_care_common_enum_type_vario_perfect_speed_perfect
 pause_program:
   fields:
     device_id:
diff --git a/homeassistant/components/home_connect/strings.json b/homeassistant/components/home_connect/strings.json
index 7ededaae5b7..5072a4d49a7 100644
--- a/homeassistant/components/home_connect/strings.json
+++ b/homeassistant/components/home_connect/strings.json
@@ -7,9 +7,14 @@
     "step": {
       "pick_implementation": {
         "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]"
+      },
+      "reauth_confirm": {
+        "title": "[%key:common::config_flow::title::reauth%]",
+        "description": "The Home Connect integration needs to re-authenticate your account"
       }
     },
     "abort": {
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
       "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
       "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]",
       "oauth_error": "[%key:common::config_flow::abort::oauth2_error%]",
@@ -22,78 +27,512 @@
     }
   },
   "exceptions": {
+    "auth_error": {
+      "message": "Authentication error: {error}. Please, re-authenticate your account"
+    },
     "appliance_not_found": {
       "message": "Appliance for device ID {device_id} not found"
     },
+    "device_entry_not_found": {
+      "message": "Device entry for device ID {device_id} not found"
+    },
+    "config_entry_not_found": {
+      "message": "Config entry for device ID {device_id} not found"
+    },
     "turn_on_light": {
-      "message": "Error turning on {entity_id}: {description}"
+      "message": "Error turning on {entity_id}: {error}"
     },
     "turn_off_light": {
-      "message": "Error turning off {entity_id}: {description}"
+      "message": "Error turning off {entity_id}: {error}"
     },
     "set_light_brightness": {
-      "message": "Error setting brightness of {entity_id}: {description}"
+      "message": "Error setting brightness of {entity_id}: {error}"
     },
     "select_light_custom_color": {
-      "message": "Error selecting custom color of {entity_id}: {description}"
+      "message": "Error selecting custom color of {entity_id}: {error}"
     },
     "set_light_color": {
-      "message": "Error setting color of {entity_id}: {description}"
+      "message": "Error setting color of {entity_id}: {error}"
     },
     "set_setting_entity": {
-      "message": "Error assigning the value \"{value}\" to the setting \"{key}\" for {entity_id}: {description}"
+      "message": "Error assigning the value \"{value}\" to the setting \"{key}\" for {entity_id}: {error}"
     },
     "set_setting": {
-      "message": "Error assigning the value \"{value}\" to the setting \"{key}\": {description}"
+      "message": "Error assigning the value \"{value}\" to the setting \"{key}\": {error}"
     },
     "turn_on": {
-      "message": "Error turning on {entity_id} ({key}): {description}"
+      "message": "Error turning on {entity_id} ({key}): {error}"
     },
     "turn_off": {
-      "message": "Error turning off {entity_id} ({key}): {description}"
+      "message": "Error turning off {entity_id} ({key}): {error}"
     },
     "select_program": {
-      "message": "Error selecting program {program}: {description}"
+      "message": "Error selecting program {program}: {error}"
     },
     "start_program": {
-      "message": "Error starting program {program}: {description}"
+      "message": "Error starting program {program}: {error}"
     },
     "pause_program": {
-      "message": "Error pausing program: {description}"
+      "message": "Error pausing program: {error}"
     },
     "stop_program": {
-      "message": "Error stopping program: {description}"
+      "message": "Error stopping program: {error}"
     },
     "set_options_active_program": {
-      "message": "Error setting options for the active program: {description}"
+      "message": "Error setting options for the active program: {error}"
     },
     "set_options_selected_program": {
-      "message": "Error setting options for the selected program: {description}"
+      "message": "Error setting options for the selected program: {error}"
     },
     "execute_command": {
-      "message": "Error executing command {command}: {description}"
+      "message": "Error executing command {command}: {error}"
     },
     "power_on": {
-      "message": "Error turning on {appliance_name}: {description}"
+      "message": "Error turning on {appliance_name}: {error}"
     },
     "power_off": {
-      "message": "Error turning off {appliance_name} with value \"{value}\": {description}"
+      "message": "Error turning off {appliance_name} with value \"{value}\": {error}"
     },
     "turn_off_not_supported": {
       "message": "{appliance_name} does not support turning off or entering standby mode."
     },
     "unable_to_retrieve_turn_off": {
       "message": "Unable to turn off {appliance_name} because its support for turning off or entering standby mode could not be determined."
+    },
+    "fetch_api_error": {
+      "message": "Error obtaining data from the API: {error}"
+    },
+    "required_program_or_one_option_at_least": {
+      "message": "A program or at least one of the possible options for a program should be specified"
+    },
+    "set_option": {
+      "message": "Error setting the option for the program: {error}"
     }
   },
   "issues": {
+    "deprecated_time_alarm_clock_in_automations_scripts": {
+      "title": "Deprecated alarm clock entity detected in some automations or scripts",
+      "fix_flow": {
+        "step": {
+          "confirm": {
+            "title": "[%key:component::home_connect::issues::deprecated_time_alarm_clock_in_automations_scripts::title%]",
+            "description": "The alarm clock entity `{entity_id}`, which is deprecated because it's being moved to the `number` platform, is used in the following automations or scripts:\n{items}\n\nPlease, fix this issue by updating your automations or scripts to use the new `number` entity."
+          }
+        }
+      }
+    },
+    "deprecated_time_alarm_clock": {
+      "title": "Deprecated alarm clock entity",
+      "fix_flow": {
+        "step": {
+          "confirm": {
+            "title": "[%key:component::home_connect::issues::deprecated_time_alarm_clock::title%]",
+            "description": "The alarm clock entity `{entity_id}` is deprecated because it's being moved to the `number` platform.\n\nPlease use the new `number` entity."
+          }
+        }
+      }
+    },
     "deprecated_binary_common_door_sensor": {
       "title": "Deprecated binary door sensor detected in some automations or scripts",
-      "description": "The binary door sensor `{entity}`, which is deprecated, is used in the following automations or scripts:\n{items}\n\nA sensor entity with additional possible states is available and should be used going forward; Please use it on the above automations or scripts to fix this issue."
+      "fix_flow": {
+        "step": {
+          "confirm": {
+            "title": "[%key:component::home_connect::issues::deprecated_binary_common_door_sensor::title%]",
+            "description": "The binary door sensor `{entity}`, which is deprecated, is used in the following automations or scripts:\n{items}\n\nA sensor entity with additional possible states is available and should be used going forward; Please use it on the above automations or scripts to fix this issue."
+          }
+        }
+      }
+    },
+    "deprecated_command_actions": {
+      "title": "The command related actions are deprecated in favor of the new buttons",
+      "fix_flow": {
+        "step": {
+          "confirm": {
+            "title": "[%key:component::home_connect::issues::deprecated_command_actions::title%]",
+            "description": "The `pause_program` and `resume_program` actions have been deprecated in favor of new button entities, if the command is available for your appliance. Please update your automations, scripts and panels that use this action to use the button entities instead, and press on submit to fix the issue."
+          }
+        }
+      }
+    },
+    "deprecated_program_switch_in_automations_scripts": {
+      "title": "Deprecated program switch detected in some automations or scripts",
+      "fix_flow": {
+        "step": {
+          "confirm": {
+            "title": "[%key:component::home_connect::issues::deprecated_program_switch_in_automations_scripts::title%]",
+            "description": "Program switches are deprecated and {entity_id} is used in the following automations or scripts:\n{items}\n\nYou can use the active program select entity to run the program without any additional options and get the current running program on the above automations or scripts to fix this issue."
+          }
+        }
+      }
     },
     "deprecated_program_switch": {
-      "title": "Deprecated program switch detected in some automations or scripts",
-      "description": "Program switch are deprecated and {entity_id} is used in the following automations or scripts:\n{items}\n\nYou can use active program select entity to run the program without any additional option and get the current running program on the above automations or scripts to fix this issue."
+      "title": "Deprecated program switch entities",
+      "fix_flow": {
+        "step": {
+          "confirm": {
+            "title": "[%key:component::home_connect::issues::deprecated_program_switch::title%]",
+            "description": "The switch entity `{entity_id}` and all the other program switches are deprecated.\n\nPlease use the active program select entity instead."
+          }
+        }
+      }
+    },
+    "deprecated_set_program_and_option_actions": {
+      "title": "The executed action is deprecated",
+      "fix_flow": {
+        "step": {
+          "confirm": {
+            "title": "[%key:component::home_connect::issues::deprecated_set_program_and_option_actions::title%]",
+            "description": "`start_program`, `select_program`, `set_option_active`, and `set_option_selected` actions are deprecated and will be removed in the {remove_release} release, please use the `{new_action_key}` action instead. For the executed action:\n{deprecated_action_yaml}\nyou can do the following transformation using the recognized options:\n  {new_action_yaml}\nIf the option is not in the recognized options, please submit an issue or a pull request requesting the addition of the option at {repo_link}."
+          }
+        }
+      }
+    }
+  },
+  "selector": {
+    "affects_to": {
+      "options": {
+        "active_program": "Active program",
+        "selected_program": "Selected program"
+      }
+    },
+    "programs": {
+      "options": {
+        "consumer_products_cleaning_robot_program_cleaning_clean_all": "Clean all",
+        "consumer_products_cleaning_robot_program_cleaning_clean_map": "Clean map",
+        "consumer_products_cleaning_robot_program_basic_go_home": "Go home",
+        "consumer_products_coffee_maker_program_beverage_ristretto": "Ristretto",
+        "consumer_products_coffee_maker_program_beverage_espresso": "Espresso",
+        "consumer_products_coffee_maker_program_beverage_espresso_doppio": "Espresso doppio",
+        "consumer_products_coffee_maker_program_beverage_coffee": "Coffee",
+        "consumer_products_coffee_maker_program_beverage_x_l_coffee": "XL coffee",
+        "consumer_products_coffee_maker_program_beverage_caffe_grande": "Caffe grande",
+        "consumer_products_coffee_maker_program_beverage_espresso_macchiato": "Espresso macchiato",
+        "consumer_products_coffee_maker_program_beverage_cappuccino": "Cappuccino",
+        "consumer_products_coffee_maker_program_beverage_latte_macchiato": "Latte macchiato",
+        "consumer_products_coffee_maker_program_beverage_caffe_latte": "Caffe latte",
+        "consumer_products_coffee_maker_program_beverage_milk_froth": "Milk froth",
+        "consumer_products_coffee_maker_program_beverage_warm_milk": "Warm milk",
+        "consumer_products_coffee_maker_program_coffee_world_kleiner_brauner": "Kleiner brauner",
+        "consumer_products_coffee_maker_program_coffee_world_grosser_brauner": "Grosser brauner",
+        "consumer_products_coffee_maker_program_coffee_world_verlaengerter": "Verlaengerter",
+        "consumer_products_coffee_maker_program_coffee_world_verlaengerter_braun": "Verlaengerter braun",
+        "consumer_products_coffee_maker_program_coffee_world_wiener_melange": "Wiener melange",
+        "consumer_products_coffee_maker_program_coffee_world_flat_white": "Flat white",
+        "consumer_products_coffee_maker_program_coffee_world_cortado": "Cortado",
+        "consumer_products_coffee_maker_program_coffee_world_cafe_cortado": "Cafe cortado",
+        "consumer_products_coffee_maker_program_coffee_world_cafe_con_leche": "Cafe con leche",
+        "consumer_products_coffee_maker_program_coffee_world_cafe_au_lait": "Cafe au lait",
+        "consumer_products_coffee_maker_program_coffee_world_doppio": "Doppio",
+        "consumer_products_coffee_maker_program_coffee_world_kaapi": "Kaapi",
+        "consumer_products_coffee_maker_program_coffee_world_koffie_verkeerd": "Koffie verkeerd",
+        "consumer_products_coffee_maker_program_coffee_world_galao": "Galao",
+        "consumer_products_coffee_maker_program_coffee_world_garoto": "Garoto",
+        "consumer_products_coffee_maker_program_coffee_world_americano": "Americano",
+        "consumer_products_coffee_maker_program_coffee_world_red_eye": "Red eye",
+        "consumer_products_coffee_maker_program_coffee_world_black_eye": "Black eye",
+        "consumer_products_coffee_maker_program_coffee_world_dead_eye": "Dead eye",
+        "consumer_products_coffee_maker_program_beverage_hot_water": "Hot water",
+        "dishcare_dishwasher_program_pre_rinse": "Pre_rinse",
+        "dishcare_dishwasher_program_auto_1": "Auto 1",
+        "dishcare_dishwasher_program_auto_2": "Auto 2",
+        "dishcare_dishwasher_program_auto_3": "Auto 3",
+        "dishcare_dishwasher_program_eco_50": "Eco 50ºC",
+        "dishcare_dishwasher_program_quick_45": "Quick 45ºC",
+        "dishcare_dishwasher_program_intensiv_70": "Intensive 70ºC",
+        "dishcare_dishwasher_program_normal_65": "Normal 65ºC",
+        "dishcare_dishwasher_program_glas_40": "Glass 40ºC",
+        "dishcare_dishwasher_program_glass_care": "Glass care",
+        "dishcare_dishwasher_program_night_wash": "Night wash",
+        "dishcare_dishwasher_program_quick_65": "Quick 65ºC",
+        "dishcare_dishwasher_program_normal_45": "Normal 45ºC",
+        "dishcare_dishwasher_program_intensiv_45": "Intensive 45ºC",
+        "dishcare_dishwasher_program_auto_half_load": "Auto half load",
+        "dishcare_dishwasher_program_intensiv_power": "Intensive power",
+        "dishcare_dishwasher_program_magic_daily": "Magic daily",
+        "dishcare_dishwasher_program_super_60": "Super 60ºC",
+        "dishcare_dishwasher_program_kurz_60": "Kurz 60ºC",
+        "dishcare_dishwasher_program_express_sparkle_65": "Express sparkle 65ºC",
+        "dishcare_dishwasher_program_machine_care": "Machine care",
+        "dishcare_dishwasher_program_steam_fresh": "Steam fresh",
+        "dishcare_dishwasher_program_maximum_cleaning": "Maximum cleaning",
+        "dishcare_dishwasher_program_mixed_load": "Mixed load",
+        "laundry_care_dryer_program_cotton": "Cotton",
+        "laundry_care_dryer_program_synthetic": "Synthetic",
+        "laundry_care_dryer_program_mix": "Mix",
+        "laundry_care_dryer_program_blankets": "Blankets",
+        "laundry_care_dryer_program_business_shirts": "Business shirts",
+        "laundry_care_dryer_program_down_feathers": "Down feathers",
+        "laundry_care_dryer_program_hygiene": "Hygiene",
+        "laundry_care_dryer_program_jeans": "Jeans",
+        "laundry_care_dryer_program_outdoor": "Outdoor",
+        "laundry_care_dryer_program_synthetic_refresh": "Synthetic refresh",
+        "laundry_care_dryer_program_towels": "Towels",
+        "laundry_care_dryer_program_delicates": "Delicates",
+        "laundry_care_dryer_program_super_40": "Super 40ºC",
+        "laundry_care_dryer_program_shirts_15": "Shirts 15ºC",
+        "laundry_care_dryer_program_pillow": "Pillow",
+        "laundry_care_dryer_program_anti_shrink": "Anti shrink",
+        "laundry_care_dryer_program_my_time_my_drying_time": "My drying time",
+        "laundry_care_dryer_program_time_cold": "Cold (variable time)",
+        "laundry_care_dryer_program_time_warm": "Warm (variable time)",
+        "laundry_care_dryer_program_in_basket": "In basket",
+        "laundry_care_dryer_program_time_cold_fix_time_cold_20": "Cold (20 min)",
+        "laundry_care_dryer_program_time_cold_fix_time_cold_30": "Cold (30 min)",
+        "laundry_care_dryer_program_time_cold_fix_time_cold_60": "Cold (60 min)",
+        "laundry_care_dryer_program_time_warm_fix_time_warm_30": "Warm (30 min)",
+        "laundry_care_dryer_program_time_warm_fix_time_warm_40": "Warm (40 min)",
+        "laundry_care_dryer_program_time_warm_fix_time_warm_60": "Warm (60 min)",
+        "laundry_care_dryer_program_dessous": "Dessous",
+        "cooking_common_program_hood_automatic": "Automatic",
+        "cooking_common_program_hood_venting": "Venting",
+        "cooking_common_program_hood_delayed_shut_off": "Delayed shut off",
+        "cooking_oven_program_heating_mode_pre_heating": "Pre-heating",
+        "cooking_oven_program_heating_mode_hot_air": "Hot air",
+        "cooking_oven_program_heating_mode_hot_air_eco": "Hot air eco",
+        "cooking_oven_program_heating_mode_hot_air_grilling": "Hot air grilling",
+        "cooking_oven_program_heating_mode_top_bottom_heating": "Top bottom heating",
+        "cooking_oven_program_heating_mode_top_bottom_heating_eco": "Top bottom heating eco",
+        "cooking_oven_program_heating_mode_bottom_heating": "Bottom heating",
+        "cooking_oven_program_heating_mode_pizza_setting": "Pizza setting",
+        "cooking_oven_program_heating_mode_slow_cook": "Slow cook",
+        "cooking_oven_program_heating_mode_intensive_heat": "Intensive heat",
+        "cooking_oven_program_heating_mode_keep_warm": "Keep warm",
+        "cooking_oven_program_heating_mode_preheat_ovenware": "Preheat ovenware",
+        "cooking_oven_program_heating_mode_frozen_heatup_special": "Special Heat-Up for frozen products",
+        "cooking_oven_program_heating_mode_desiccation": "Desiccation",
+        "cooking_oven_program_heating_mode_defrost": "Defrost",
+        "cooking_oven_program_heating_mode_proof": "Proof",
+        "cooking_oven_program_heating_mode_hot_air_30_steam": "Hot air + 30 RH",
+        "cooking_oven_program_heating_mode_hot_air_60_steam": "Hot air + 60 RH",
+        "cooking_oven_program_heating_mode_hot_air_80_steam": "Hot air + 80 RH",
+        "cooking_oven_program_heating_mode_hot_air_100_steam": "Hot air + 100 RH",
+        "cooking_oven_program_heating_mode_sabbath_programme": "Sabbath programme",
+        "cooking_oven_program_microwave_90_watt": "90 Watt",
+        "cooking_oven_program_microwave_180_watt": "180 Watt",
+        "cooking_oven_program_microwave_360_watt": "360 Watt",
+        "cooking_oven_program_microwave_600_watt": "600 Watt",
+        "cooking_oven_program_microwave_900_watt": "900 Watt",
+        "cooking_oven_program_microwave_1000_watt": "1000 Watt",
+        "cooking_oven_program_microwave_max": "Max",
+        "cooking_oven_program_heating_mode_warming_drawer": "Warming drawer",
+        "laundry_care_washer_program_cotton": "Cotton",
+        "laundry_care_washer_program_cotton_cotton_eco": "Cotton eco",
+        "laundry_care_washer_program_cotton_eco_4060": "Cotton eco 40/60ºC",
+        "laundry_care_washer_program_cotton_colour": "Cotton color",
+        "laundry_care_washer_program_easy_care": "Easy care",
+        "laundry_care_washer_program_mix": "Mix",
+        "laundry_care_washer_program_mix_night_wash": "Mix night wash",
+        "laundry_care_washer_program_delicates_silk": "Delicates silk",
+        "laundry_care_washer_program_wool": "Wool",
+        "laundry_care_washer_program_sensitive": "Sensitive",
+        "laundry_care_washer_program_auto_30": "Auto 30ºC",
+        "laundry_care_washer_program_auto_40": "Auto 40ºC",
+        "laundry_care_washer_program_auto_60": "Auto 60ºC",
+        "laundry_care_washer_program_chiffon": "Chiffon",
+        "laundry_care_washer_program_curtains": "Curtains",
+        "laundry_care_washer_program_dark_wash": "Dark wash",
+        "laundry_care_washer_program_dessous": "Dessous",
+        "laundry_care_washer_program_monsoon": "Monsoon",
+        "laundry_care_washer_program_outdoor": "Outdoor",
+        "laundry_care_washer_program_plush_toy": "Plush toy",
+        "laundry_care_washer_program_shirts_blouses": "Shirts blouses",
+        "laundry_care_washer_program_sport_fitness": "Sport fitness",
+        "laundry_care_washer_program_towels": "Towels",
+        "laundry_care_washer_program_water_proof": "Water proof",
+        "laundry_care_washer_program_power_speed_59": "Power speed <59 min",
+        "laundry_care_washer_program_super_153045_super_15": "Super 15 min",
+        "laundry_care_washer_program_super_153045_super_1530": "Super 15/30 min",
+        "laundry_care_washer_program_down_duvet_duvet": "Down duvet",
+        "laundry_care_washer_program_rinse_rinse_spin_drain": "Rinse spin drain",
+        "laundry_care_washer_program_drum_clean": "Drum clean",
+        "laundry_care_washer_dryer_program_cotton": "Cotton",
+        "laundry_care_washer_dryer_program_cotton_eco_4060": "Cotton eco 40/60ºC",
+        "laundry_care_washer_dryer_program_mix": "Mix",
+        "laundry_care_washer_dryer_program_easy_care": "Easy care",
+        "laundry_care_washer_dryer_program_wash_and_dry_60": "Wash and dry (60 min)",
+        "laundry_care_washer_dryer_program_wash_and_dry_90": "Wash and dry (90 min)"
+      }
+    },
+    "available_maps": {
+      "options": {
+        "consumer_products_cleaning_robot_enum_type_available_maps_temp_map": "Temporary map",
+        "consumer_products_cleaning_robot_enum_type_available_maps_map1": "Map 1",
+        "consumer_products_cleaning_robot_enum_type_available_maps_map2": "Map 2",
+        "consumer_products_cleaning_robot_enum_type_available_maps_map3": "Map 3"
+      }
+    },
+    "cleaning_mode": {
+      "options": {
+        "consumer_products_cleaning_robot_enum_type_cleaning_modes_silent": "Silent",
+        "consumer_products_cleaning_robot_enum_type_cleaning_modes_standard": "Standard",
+        "consumer_products_cleaning_robot_enum_type_cleaning_modes_power": "Power"
+      }
+    },
+    "bean_amount": {
+      "options": {
+        "consumer_products_coffee_maker_enum_type_bean_amount_very_mild": "Very mild",
+        "consumer_products_coffee_maker_enum_type_bean_amount_mild": "Mild",
+        "consumer_products_coffee_maker_enum_type_bean_amount_mild_plus": "Mild +",
+        "consumer_products_coffee_maker_enum_type_bean_amount_normal": "Normal",
+        "consumer_products_coffee_maker_enum_type_bean_amount_normal_plus": "Normal +",
+        "consumer_products_coffee_maker_enum_type_bean_amount_strong": "Strong",
+        "consumer_products_coffee_maker_enum_type_bean_amount_strong_plus": "Strong +",
+        "consumer_products_coffee_maker_enum_type_bean_amount_very_strong": "Very strong",
+        "consumer_products_coffee_maker_enum_type_bean_amount_very_strong_plus": "Very strong +",
+        "consumer_products_coffee_maker_enum_type_bean_amount_extra_strong": "Extra strong",
+        "consumer_products_coffee_maker_enum_type_bean_amount_double_shot": "Double shot",
+        "consumer_products_coffee_maker_enum_type_bean_amount_double_shot_plus": "Double shot +",
+        "consumer_products_coffee_maker_enum_type_bean_amount_double_shot_plus_plus": "Double shot ++",
+        "consumer_products_coffee_maker_enum_type_bean_amount_triple_shot": "Triple shot",
+        "consumer_products_coffee_maker_enum_type_bean_amount_triple_shot_plus": "Triple shot +",
+        "consumer_products_coffee_maker_enum_type_bean_amount_coffee_ground": "Coffee ground"
+      }
+    },
+    "coffee_temperature": {
+      "options": {
+        "consumer_products_coffee_maker_enum_type_coffee_temperature_88_c": "88ºC",
+        "consumer_products_coffee_maker_enum_type_coffee_temperature_90_c": "90ºC",
+        "consumer_products_coffee_maker_enum_type_coffee_temperature_92_c": "92ºC",
+        "consumer_products_coffee_maker_enum_type_coffee_temperature_94_c": "94ºC",
+        "consumer_products_coffee_maker_enum_type_coffee_temperature_95_c": "95ºC",
+        "consumer_products_coffee_maker_enum_type_coffee_temperature_96_c": "96ºC"
+      }
+    },
+    "bean_container": {
+      "options": {
+        "consumer_products_coffee_maker_enum_type_bean_container_selection_right": "Right",
+        "consumer_products_coffee_maker_enum_type_bean_container_selection_left": "Left"
+      }
+    },
+    "flow_rate": {
+      "options": {
+        "consumer_products_coffee_maker_enum_type_flow_rate_normal": "Normal",
+        "consumer_products_coffee_maker_enum_type_flow_rate_intense": "Intense",
+        "consumer_products_coffee_maker_enum_type_flow_rate_intense_plus": "Intense +"
+      }
+    },
+    "coffee_milk_ratio": {
+      "options": {
+        "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_10_percent": "10%",
+        "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_20_percent": "20%",
+        "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_25_percent": "25%",
+        "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_30_percent": "30%",
+        "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_40_percent": "40%",
+        "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_50_percent": "50%",
+        "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_55_percent": "55%",
+        "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_60_percent": "60%",
+        "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_65_percent": "65%",
+        "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_67_percent": "67%",
+        "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_70_percent": "70%",
+        "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_75_percent": "75%",
+        "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_80_percent": "80%",
+        "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_85_percent": "85%",
+        "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_90_percent": "90%"
+      }
+    },
+    "hot_water_temperature": {
+      "options": {
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_white_tea": "White tea",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_green_tea": "Green tea",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_black_tea": "Black tea",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_50_c": "50ºC",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_55_c": "55ºC",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_60_c": "60ºC",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_65_c": "65ºC",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_70_c": "70ºC",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_75_c": "75ºC",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_80_c": "80ºC",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_85_c": "85ºC",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_90_c": "90ºC",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_95_c": "95ºC",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_97_c": "97ºC",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_122_f": "122ºF",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_131_f": "131ºF",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_140_f": "140ºF",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_149_f": "149ºF",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_158_f": "158ºF",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_167_f": "167ºF",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_176_f": "176ºF",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_185_f": "185ºF",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_194_f": "194ºF",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_203_f": "203ºF",
+        "consumer_products_coffee_maker_enum_type_hot_water_temperature_max": "Max"
+      }
+    },
+    "drying_target": {
+      "options": {
+        "laundry_care_dryer_enum_type_drying_target_iron_dry": "Iron dry",
+        "laundry_care_dryer_enum_type_drying_target_gentle_dry": "Gentle dry",
+        "laundry_care_dryer_enum_type_drying_target_cupboard_dry": "Cupboard dry",
+        "laundry_care_dryer_enum_type_drying_target_cupboard_dry_plus": "Cupboard dry +",
+        "laundry_care_dryer_enum_type_drying_target_extra_dry": "Extra dry"
+      }
+    },
+    "venting_level": {
+      "options": {
+        "cooking_hood_enum_type_stage_fan_off": "Fan off",
+        "cooking_hood_enum_type_stage_fan_stage_01": "Fan stage 1",
+        "cooking_hood_enum_type_stage_fan_stage_02": "Fan stage 2",
+        "cooking_hood_enum_type_stage_fan_stage_03": "Fan stage 3",
+        "cooking_hood_enum_type_stage_fan_stage_04": "Fan stage 4",
+        "cooking_hood_enum_type_stage_fan_stage_05": "Fan stage 5"
+      }
+    },
+    "intensive_level": {
+      "options": {
+        "cooking_hood_enum_type_intensive_stage_intensive_stage_off": "Intensive stage off",
+        "cooking_hood_enum_type_intensive_stage_intensive_stage1": "Intensive stage 1",
+        "cooking_hood_enum_type_intensive_stage_intensive_stage2": "Intensive stage 2"
+      }
+    },
+    "warming_level": {
+      "options": {
+        "cooking_oven_enum_type_warming_level_low": "Low",
+        "cooking_oven_enum_type_warming_level_medium": "Medium",
+        "cooking_oven_enum_type_warming_level_high": "High"
+      }
+    },
+    "washer_temperature": {
+      "options": {
+        "laundry_care_washer_enum_type_temperature_cold": "Cold",
+        "laundry_care_washer_enum_type_temperature_g_c_20": "20ºC clothes",
+        "laundry_care_washer_enum_type_temperature_g_c_30": "30ºC clothes",
+        "laundry_care_washer_enum_type_temperature_g_c_40": "40ºC clothes",
+        "laundry_care_washer_enum_type_temperature_g_c_50": "50ºC clothes",
+        "laundry_care_washer_enum_type_temperature_g_c_60": "60ºC clothes",
+        "laundry_care_washer_enum_type_temperature_g_c_70": "70ºC clothes",
+        "laundry_care_washer_enum_type_temperature_g_c_80": "80ºC clothes",
+        "laundry_care_washer_enum_type_temperature_g_c_90": "90ºC clothes",
+        "laundry_care_washer_enum_type_temperature_ul_cold": "Cold",
+        "laundry_care_washer_enum_type_temperature_ul_warm": "Warm",
+        "laundry_care_washer_enum_type_temperature_ul_hot": "Hot",
+        "laundry_care_washer_enum_type_temperature_ul_extra_hot": "Extra hot"
+      }
+    },
+    "spin_speed": {
+      "options": {
+        "laundry_care_washer_enum_type_spin_speed_off": "Off",
+        "laundry_care_washer_enum_type_spin_speed_r_p_m_400": "400 rpm",
+        "laundry_care_washer_enum_type_spin_speed_r_p_m_600": "600 rpm",
+        "laundry_care_washer_enum_type_spin_speed_r_p_m_700": "700 rpm",
+        "laundry_care_washer_enum_type_spin_speed_r_p_m_800": "800 rpm",
+        "laundry_care_washer_enum_type_spin_speed_r_p_m_900": "900 rpm",
+        "laundry_care_washer_enum_type_spin_speed_r_p_m_1000": "1000 rpm",
+        "laundry_care_washer_enum_type_spin_speed_r_p_m_1200": "1200 rpm",
+        "laundry_care_washer_enum_type_spin_speed_r_p_m_1400": "1400 rpm",
+        "laundry_care_washer_enum_type_spin_speed_r_p_m_1600": "1600 rpm",
+        "laundry_care_washer_enum_type_spin_speed_ul_off": "Off",
+        "laundry_care_washer_enum_type_spin_speed_ul_low": "Low",
+        "laundry_care_washer_enum_type_spin_speed_ul_medium": "Medium",
+        "laundry_care_washer_enum_type_spin_speed_ul_high": "High"
+      }
+    },
+    "vario_perfect": {
+      "options": {
+        "laundry_care_common_enum_type_vario_perfect_off": "Off",
+        "laundry_care_common_enum_type_vario_perfect_eco_perfect": "Eco perfect",
+        "laundry_care_common_enum_type_vario_perfect_speed_perfect": "Speed perfect"
+      }
     }
   },
   "services": {
@@ -102,8 +541,8 @@
       "description": "Selects a program and starts it.",
       "fields": {
         "device_id": {
-          "name": "Device ID",
-          "description": "ID of the device."
+          "name": "[%key:component::home_connect::services::set_program_and_options::fields::device_id::name%]",
+          "description": "[%key:component::home_connect::services::set_program_and_options::fields::device_id::description%]"
         },
         "program": { "name": "Program", "description": "Program to select." },
         "key": { "name": "Option key", "description": "Key of the option." },
@@ -119,8 +558,8 @@
       "description": "Selects a program without starting it.",
       "fields": {
         "device_id": {
-          "name": "Device ID",
-          "description": "[%key:component::home_connect::services::start_program::fields::device_id::description%]"
+          "name": "[%key:component::home_connect::services::set_program_and_options::fields::device_id::name%]",
+          "description": "[%key:component::home_connect::services::set_program_and_options::fields::device_id::description%]"
         },
         "program": {
           "name": "[%key:component::home_connect::services::start_program::fields::program::name%]",
@@ -140,13 +579,197 @@
         }
       }
     },
+    "set_program_and_options": {
+      "name": "Set program and options",
+      "description": "Starts or selects a program with options or sets the options for the active or the selected program.",
+      "fields": {
+        "device_id": {
+          "name": "Device ID",
+          "description": "ID of the device."
+        },
+        "affects_to": {
+          "name": "Affects to",
+          "description": "Selects if the program affected by the action should be the active or the selected program."
+        },
+        "program": {
+          "name": "Program",
+          "description": "Program to select"
+        },
+        "consumer_products_cleaning_robot_option_reference_map_id": {
+          "name": "Reference map ID",
+          "description": "Defines which reference map is to be used."
+        },
+        "consumer_products_cleaning_robot_option_cleaning_mode": {
+          "name": "Cleaning mode",
+          "description": "Defines the favoured cleaning mode."
+        },
+        "consumer_products_coffee_maker_option_bean_amount": {
+          "name": "Bean amount",
+          "description": "Describes the amount of coffee beans used in a coffee machine program."
+        },
+        "consumer_products_coffee_maker_option_fill_quantity": {
+          "name": "Fill quantity",
+          "description": "Describes the amount of water (in ml) used in a coffee machine program."
+        },
+        "consumer_products_coffee_maker_option_coffee_temperature": {
+          "name": "Coffee Temperature",
+          "description": "Describes the coffee temperature used in a coffee machine program."
+        },
+        "consumer_products_coffee_maker_option_bean_container": {
+          "name": "Bean container",
+          "description": "Defines the preferred bean container."
+        },
+        "consumer_products_coffee_maker_option_flow_rate": {
+          "name": "Flow rate",
+          "description": "Defines the water-coffee contact time. The duration extends to coffee intensity."
+        },
+        "consumer_products_coffee_maker_option_multiple_beverages": {
+          "name": "Multiple beverages",
+          "description": "Defines if double dispensing is enabled."
+        },
+        "consumer_products_coffee_maker_option_coffee_milk_ratio": {
+          "name": "Coffee milk ratio",
+          "description": "Defines the amount of milk."
+        },
+        "consumer_products_coffee_maker_option_hot_water_temperature": {
+          "name": "Hot water temperature",
+          "description": "Defines the temperature suitable for the type of tea."
+        },
+        "b_s_h_common_option_start_in_relative": {
+          "name": "Start in relative",
+          "description": "Defines in how many time the program should start."
+        },
+        "dishcare_dishwasher_option_intensiv_zone": {
+          "name": "Intensive zone",
+          "description": "Defines if the cleaning is done with higher spray pressure on the lower basket for very dirty pots and pans."
+        },
+        "dishcare_dishwasher_option_brilliance_dry": {
+          "name": "Brilliance dry",
+          "description": "Defines if the program sequence is optimized with a special drying cycle to ensure more shine on glasses and plastic items."
+        },
+        "dishcare_dishwasher_option_vario_speed_plus": {
+          "name": "Vario speed +",
+          "description": "Defines if the program run time is reduced by up to 66% with the usual optimum cleaning and drying."
+        },
+        "dishcare_dishwasher_option_silence_on_demand": {
+          "name": "Silence on demand",
+          "description": "Defines if the extra silent mode is activated for a selected period of time."
+        },
+        "dishcare_dishwasher_option_half_load": {
+          "name": "Half load",
+          "description": "Defines if economical cleaning is enabled for smaller loads. This reduces energy and water consumption and also saves time. The utensils can be placed in the upper and lower baskets."
+        },
+        "dishcare_dishwasher_option_extra_dry": {
+          "name": "Extra dry",
+          "description": "Defines if improved drying for glasses and plasticware is enabled."
+        },
+        "dishcare_dishwasher_option_hygiene_plus": {
+          "name": "Hygiene +",
+          "description": "Defines if the cleaning is done with increased temperature. This ensures maximum hygienic cleanliness for regular use."
+        },
+        "dishcare_dishwasher_option_eco_dry": {
+          "name": "Eco dry",
+          "description": "Defines if the door is opened automatically for extra energy efficient and effective drying."
+        },
+        "dishcare_dishwasher_option_zeolite_dry": {
+          "name": "Zeolite dry",
+          "description": "Defines if the program sequence is optimized with special drying cycle ensures improved drying for glasses, plates and plasticware."
+        },
+        "laundry_care_dryer_option_drying_target": {
+          "name": "Drying target",
+          "description": "Describes the drying target for a dryer program."
+        },
+        "cooking_hood_option_venting_level": {
+          "name": "Venting level",
+          "description": "Defines the required fan setting."
+        },
+        "cooking_hood_option_intensive_level": {
+          "name": "Intensive level",
+          "description": "Defines the intensive setting."
+        },
+        "cooking_oven_option_setpoint_temperature": {
+          "name": "Setpoint temperature",
+          "description": "Defines the target cavity temperature, which will be hold by the oven."
+        },
+        "b_s_h_common_option_duration": {
+          "name": "Duration",
+          "description": "Defines the run-time of the program. Afterwards, the appliance is stopped."
+        },
+        "cooking_oven_option_fast_pre_heat": {
+          "name": "Fast pre-heat",
+          "description": "Defines if the cooking compartment is heated up quickly. Please note that the setpoint temperature has to be equal to or higher than 100 °C or 212 °F. Otherwise, the fast pre-heat option is not activated."
+        },
+        "cooking_oven_option_warming_level": {
+          "name": "Warming level",
+          "description": "Defines the level of the warming drawer."
+        },
+        "laundry_care_washer_option_temperature": {
+          "name": "Temperature",
+          "description": "Defines the temperature of the washing program."
+        },
+        "laundry_care_washer_option_spin_speed": {
+          "name": "Spin speed",
+          "description": "Defines the spin speed of a washer program."
+        },
+        "b_s_h_common_option_finish_in_relative": {
+          "name": "Finish in relative",
+          "description": "Defines when the program should end in seconds."
+        },
+        "laundry_care_washer_option_i_dos1_active": {
+          "name": "i-Dos 1 Active",
+          "description": "Defines if the detergent feed is activated / deactivated. (i-Dos content 1)"
+        },
+        "laundry_care_washer_option_i_dos2_active": {
+          "name": "i-Dos 2 Active",
+          "description": "Defines if the detergent feed is activated / deactivated. (i-Dos content 2)"
+        },
+        "laundry_care_washer_option_vario_perfect": {
+          "name": "Vario perfect",
+          "description": "Defines if a cycle saves energy (Eco Perfect) or time (Speed Perfect)."
+        }
+      },
+      "sections": {
+        "cleaning_robot_options": {
+          "name": "Cleaning robot options",
+          "description": "Options for cleaning robots."
+        },
+        "coffee_maker_options": {
+          "name": "Coffee maker options",
+          "description": "Options for coffee makers."
+        },
+        "dish_washer_options": {
+          "name": "Dishwasher options",
+          "description": "Options for dishwashers."
+        },
+        "dryer_options": {
+          "name": "Dryer options",
+          "description": "Options for dryers (and washer dryers)."
+        },
+        "hood_options": {
+          "name": "Hood options",
+          "description": "Options for hoods."
+        },
+        "oven_options": {
+          "name": "Oven options",
+          "description": "Options for ovens."
+        },
+        "warming_drawer_options": {
+          "name": "Warming drawer options",
+          "description": "Options for warming drawers."
+        },
+        "washer_options": {
+          "name": "Washer options",
+          "description": "Options for washers (and washer dryers)."
+        }
+      }
+    },
     "pause_program": {
       "name": "Pause program",
       "description": "Pauses the current running program.",
       "fields": {
         "device_id": {
-          "name": "Device ID",
-          "description": "[%key:component::home_connect::services::start_program::fields::device_id::description%]"
+          "name": "[%key:component::home_connect::services::set_program_and_options::fields::device_id::name%]",
+          "description": "[%key:component::home_connect::services::set_program_and_options::fields::device_id::description%]"
         }
       }
     },
@@ -155,8 +778,8 @@
       "description": "Resumes a paused program.",
       "fields": {
         "device_id": {
-          "name": "Device ID",
-          "description": "[%key:component::home_connect::services::start_program::fields::device_id::description%]"
+          "name": "[%key:component::home_connect::services::set_program_and_options::fields::device_id::name%]",
+          "description": "[%key:component::home_connect::services::set_program_and_options::fields::device_id::description%]"
         }
       }
     },
@@ -165,8 +788,8 @@
       "description": "Sets an option for the active program.",
       "fields": {
         "device_id": {
-          "name": "Device ID",
-          "description": "[%key:component::home_connect::services::start_program::fields::device_id::description%]"
+          "name": "[%key:component::home_connect::services::set_program_and_options::fields::device_id::name%]",
+          "description": "[%key:component::home_connect::services::set_program_and_options::fields::device_id::description%]"
         },
         "key": {
           "name": "Key",
@@ -180,18 +803,18 @@
     },
     "set_option_selected": {
       "name": "Set selected program option",
-      "description": "Sets an option for the selected program.",
+      "description": "Sets options for the selected program.",
       "fields": {
         "device_id": {
-          "name": "Device ID",
-          "description": "[%key:component::home_connect::services::start_program::fields::device_id::description%]"
+          "name": "[%key:component::home_connect::services::set_program_and_options::fields::device_id::name%]",
+          "description": "[%key:component::home_connect::services::set_program_and_options::fields::device_id::description%]"
         },
         "key": {
-          "name": "Key",
+          "name": "[%key:component::home_connect::services::start_program::fields::key::name%]",
           "description": "[%key:component::home_connect::services::start_program::fields::key::description%]"
         },
         "value": {
-          "name": "Value",
+          "name": "[%key:component::home_connect::services::start_program::fields::value::name%]",
           "description": "[%key:component::home_connect::services::start_program::fields::value::description%]"
         }
       }
@@ -201,8 +824,8 @@
       "description": "Changes a setting.",
       "fields": {
         "device_id": {
-          "name": "Device ID",
-          "description": "[%key:component::home_connect::services::start_program::fields::device_id::description%]"
+          "name": "[%key:component::home_connect::services::set_program_and_options::fields::device_id::name%]",
+          "description": "[%key:component::home_connect::services::set_program_and_options::fields::device_id::description%]"
         },
         "key": { "name": "Key", "description": "Key of the setting." },
         "value": { "name": "Value", "description": "Value of the setting." }
@@ -239,14 +862,49 @@
       "lost": {
         "name": "Lost"
       },
+      "bottle_cooler_door": {
+        "name": "Bottle cooler door"
+      },
+      "common_chiller_door": {
+        "name": "Common chiller door"
+      },
       "chiller_door": {
         "name": "Chiller door"
       },
+      "left_chiller_door": {
+        "name": "Left chiller door"
+      },
+      "right_chiller_door": {
+        "name": "Right chiller door"
+      },
+      "flex_compartment_door": {
+        "name": "Flex compartment door"
+      },
       "freezer_door": {
         "name": "Freezer door"
       },
       "refrigerator_door": {
         "name": "Refrigerator door"
+      },
+      "wine_compartment_door": {
+        "name": "Wine compartment door"
+      }
+    },
+    "button": {
+      "open_door": {
+        "name": "Open door"
+      },
+      "partly_open_door": {
+        "name": "Partly open door"
+      },
+      "pause_program": {
+        "name": "Pause program"
+      },
+      "resume_program": {
+        "name": "Resume program"
+      },
+      "stop_program": {
+        "name": "Stop program"
       }
     },
     "light": {
@@ -264,6 +922,9 @@
       }
     },
     "number": {
+      "alarm_clock": {
+        "name": "Alarm clock"
+      },
       "refrigerator_setpoint_temperature": {
         "name": "Refrigerator temperature"
       },
@@ -290,325 +951,571 @@
       },
       "wine_compartment_3_setpoint_temperature": {
         "name": "Wine compartment 3 temperature"
+      },
+      "color_temperature_percent": {
+        "name": "Functional light color temperature percent"
+      },
+      "washer_i_dos_1_base_level": {
+        "name": "i-Dos 1 base level"
+      },
+      "washer_i_dos_2_base_level": {
+        "name": "i-Dos 2 base level"
+      },
+      "duration": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::b_s_h_common_option_duration::name%]"
+      },
+      "start_in_relative": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::b_s_h_common_option_start_in_relative::name%]"
+      },
+      "finish_in_relative": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::b_s_h_common_option_finish_in_relative::name%]"
+      },
+      "fill_quantity": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::consumer_products_coffee_maker_option_fill_quantity::name%]"
+      },
+      "setpoint_temperature": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::cooking_oven_option_setpoint_temperature::name%]"
       }
     },
     "select": {
       "selected_program": {
         "name": "Selected program",
         "state": {
-          "consumer_products_cleaning_robot_program_cleaning_clean_all": "Clean all",
-          "consumer_products_cleaning_robot_program_cleaning_clean_map": "Clean map",
-          "consumer_products_cleaning_robot_program_basic_go_home": "Go home",
-          "consumer_products_coffee_maker_program_beverage_ristretto": "Ristretto",
-          "consumer_products_coffee_maker_program_beverage_espresso": "Espresso",
-          "consumer_products_coffee_maker_program_beverage_espresso_doppio": "Espresso doppio",
-          "consumer_products_coffee_maker_program_beverage_coffee": "Coffee",
-          "consumer_products_coffee_maker_program_beverage_x_l_coffee": "XL coffee",
-          "consumer_products_coffee_maker_program_beverage_caffe_grande": "Caffe grande",
-          "consumer_products_coffee_maker_program_beverage_espresso_macchiato": "Espresso macchiato",
-          "consumer_products_coffee_maker_program_beverage_cappuccino": "Cappuccino",
-          "consumer_products_coffee_maker_program_beverage_latte_macchiato": "Latte macchiato",
-          "consumer_products_coffee_maker_program_beverage_caffe_latte": "Caffe latte",
-          "consumer_products_coffee_maker_program_beverage_milk_froth": "Milk froth",
-          "consumer_products_coffee_maker_program_beverage_warm_milk": "Warm milk",
-          "consumer_products_coffee_maker_program_coffee_world_kleiner_brauner": "Kleiner brauner",
-          "consumer_products_coffee_maker_program_coffee_world_grosser_brauner": "Grosser brauner",
-          "consumer_products_coffee_maker_program_coffee_world_verlaengerter": "Verlaengerter",
-          "consumer_products_coffee_maker_program_coffee_world_verlaengerter_braun": "Verlaengerter braun",
-          "consumer_products_coffee_maker_program_coffee_world_wiener_melange": "Wiener melange",
-          "consumer_products_coffee_maker_program_coffee_world_flat_white": "Flat white",
-          "consumer_products_coffee_maker_program_coffee_world_cortado": "Cortado",
-          "consumer_products_coffee_maker_program_coffee_world_cafe_cortado": "Cafe cortado",
-          "consumer_products_coffee_maker_program_coffee_world_cafe_con_leche": "Cafe con leche",
-          "consumer_products_coffee_maker_program_coffee_world_cafe_au_lait": "Cafe au lait",
-          "consumer_products_coffee_maker_program_coffee_world_doppio": "Doppio",
-          "consumer_products_coffee_maker_program_coffee_world_kaapi": "Kaapi",
-          "consumer_products_coffee_maker_program_coffee_world_koffie_verkeerd": "Koffie verkeerd",
-          "consumer_products_coffee_maker_program_coffee_world_galao": "Galao",
-          "consumer_products_coffee_maker_program_coffee_world_garoto": "Garoto",
-          "consumer_products_coffee_maker_program_coffee_world_americano": "Americano",
-          "consumer_products_coffee_maker_program_coffee_world_red_eye": "Red eye",
-          "consumer_products_coffee_maker_program_coffee_world_black_eye": "Black eye",
-          "consumer_products_coffee_maker_program_coffee_world_dead_eye": "Dead eye",
-          "consumer_products_coffee_maker_program_beverage_hot_water": "Hot water",
-          "dishcare_dishwasher_program_pre_rinse": "Pre_rinse",
-          "dishcare_dishwasher_program_auto_1": "Auto 1",
-          "dishcare_dishwasher_program_auto_2": "Auto 2",
-          "dishcare_dishwasher_program_auto_3": "Auto 3",
-          "dishcare_dishwasher_program_eco_50": "Eco 50ºC",
-          "dishcare_dishwasher_program_quick_45": "Quick 45ºC",
-          "dishcare_dishwasher_program_intensiv_70": "Intensive 70ºC",
-          "dishcare_dishwasher_program_normal_65": "Normal 65ºC",
-          "dishcare_dishwasher_program_glas_40": "Glass 40ºC",
-          "dishcare_dishwasher_program_glass_care": "Glass care",
-          "dishcare_dishwasher_program_night_wash": "Night wash",
-          "dishcare_dishwasher_program_quick_65": "Quick 65ºC",
-          "dishcare_dishwasher_program_normal_45": "Normal 45ºC",
-          "dishcare_dishwasher_program_intensiv_45": "Intensive 45ºC",
-          "dishcare_dishwasher_program_auto_half_load": "Auto half load",
-          "dishcare_dishwasher_program_intensiv_power": "Intensive power",
-          "dishcare_dishwasher_program_magic_daily": "Magic daily",
-          "dishcare_dishwasher_program_super_60": "Super 60ºC",
-          "dishcare_dishwasher_program_kurz_60": "Kurz 60ºC",
-          "dishcare_dishwasher_program_express_sparkle_65": "Express sparkle 65ºC",
-          "dishcare_dishwasher_program_machine_care": "Machine care",
-          "dishcare_dishwasher_program_steam_fresh": "Steam fresh",
-          "dishcare_dishwasher_program_maximum_cleaning": "Maximum cleaning",
-          "dishcare_dishwasher_program_mixed_load": "Mixed load",
-          "laundry_care_dryer_program_cotton": "Cotton",
-          "laundry_care_dryer_program_synthetic": "Synthetic",
-          "laundry_care_dryer_program_mix": "Mix",
-          "laundry_care_dryer_program_blankets": "Blankets",
-          "laundry_care_dryer_program_business_shirts": "Business shirts",
-          "laundry_care_dryer_program_down_feathers": "Down feathers",
-          "laundry_care_dryer_program_hygiene": "Hygiene",
-          "laundry_care_dryer_program_jeans": "Jeans",
-          "laundry_care_dryer_program_outdoor": "Outdoor",
-          "laundry_care_dryer_program_synthetic_refresh": "Synthetic refresh",
-          "laundry_care_dryer_program_towels": "Towels",
-          "laundry_care_dryer_program_delicates": "Delicates",
-          "laundry_care_dryer_program_super_40": "Super 40ºC",
-          "laundry_care_dryer_program_shirts_15": "Shirts 15ºC",
-          "laundry_care_dryer_program_pillow": "Pillow",
-          "laundry_care_dryer_program_anti_shrink": "Anti shrink",
-          "laundry_care_dryer_program_my_time_my_drying_time": "My drying time",
-          "laundry_care_dryer_program_time_cold": "Cold (variable time)",
-          "laundry_care_dryer_program_time_warm": "Warm (variable time)",
-          "laundry_care_dryer_program_in_basket": "In basket",
-          "laundry_care_dryer_program_time_cold_fix_time_cold_20": "Cold (20 min)",
-          "laundry_care_dryer_program_time_cold_fix_time_cold_30": "Cold (30 min)",
-          "laundry_care_dryer_program_time_cold_fix_time_cold_60": "Cold (60 min)",
-          "laundry_care_dryer_program_time_warm_fix_time_warm_30": "Warm (30 min)",
-          "laundry_care_dryer_program_time_warm_fix_time_warm_40": "Warm (40 min)",
-          "laundry_care_dryer_program_time_warm_fix_time_warm_60": "Warm (60 min)",
-          "laundry_care_dryer_program_dessous": "Dessous",
-          "cooking_common_program_hood_automatic": "Automatic",
-          "cooking_common_program_hood_venting": "Venting",
-          "cooking_common_program_hood_delayed_shut_off": "Delayed shut off",
-          "cooking_oven_program_heating_mode_pre_heating": "Pre-heating",
-          "cooking_oven_program_heating_mode_hot_air": "Hot air",
-          "cooking_oven_program_heating_mode_hot_air_eco": "Hot air eco",
-          "cooking_oven_program_heating_mode_hot_air_grilling": "Hot air grilling",
-          "cooking_oven_program_heating_mode_top_bottom_heating": "Top bottom heating",
-          "cooking_oven_program_heating_mode_top_bottom_heating_eco": "Top bottom heating eco",
-          "cooking_oven_program_heating_mode_bottom_heating": "Bottom heating",
-          "cooking_oven_program_heating_mode_pizza_setting": "Pizza setting",
-          "cooking_oven_program_heating_mode_slow_cook": "Slow cook",
-          "cooking_oven_program_heating_mode_intensive_heat": "Intensive heat",
-          "cooking_oven_program_heating_mode_keep_warm": "Keep warm",
-          "cooking_oven_program_heating_mode_preheat_ovenware": "Preheat ovenware",
-          "cooking_oven_program_heating_mode_frozen_heatup_special": "Special Heat-Up for frozen products",
-          "cooking_oven_program_heating_mode_desiccation": "Desiccation",
-          "cooking_oven_program_heating_mode_defrost": "Defrost",
-          "cooking_oven_program_heating_mode_proof": "Proof",
-          "cooking_oven_program_heating_mode_hot_air_30_steam": "Hot air + 30 RH",
-          "cooking_oven_program_heating_mode_hot_air_60_steam": "Hot air + 60 RH",
-          "cooking_oven_program_heating_mode_hot_air_80_steam": "Hot air + 80 RH",
-          "cooking_oven_program_heating_mode_hot_air_100_steam": "Hot air + 100 RH",
-          "cooking_oven_program_heating_mode_sabbath_programme": "Sabbath programme",
-          "cooking_oven_program_microwave_90_watt": "90 Watt",
-          "cooking_oven_program_microwave_180_watt": "180 Watt",
-          "cooking_oven_program_microwave_360_watt": "360 Watt",
-          "cooking_oven_program_microwave_600_watt": "600 Watt",
-          "cooking_oven_program_microwave_900_watt": "900 Watt",
-          "cooking_oven_program_microwave_1000_watt": "1000 Watt",
-          "cooking_oven_program_microwave_max": "Max",
-          "cooking_oven_program_heating_mode_warming_drawer": "Warming drawer",
-          "laundry_care_washer_program_cotton": "Cotton",
-          "laundry_care_washer_program_cotton_cotton_eco": "Cotton eco",
-          "laundry_care_washer_program_cotton_eco_4060": "Cotton eco 40/60ºC",
-          "laundry_care_washer_program_cotton_colour": "Cotton color",
-          "laundry_care_washer_program_easy_care": "Easy care",
-          "laundry_care_washer_program_mix": "Mix",
-          "laundry_care_washer_program_mix_night_wash": "Mix night wash",
-          "laundry_care_washer_program_delicates_silk": "Delicates silk",
-          "laundry_care_washer_program_wool": "Wool",
-          "laundry_care_washer_program_sensitive": "Sensitive",
-          "laundry_care_washer_program_auto_30": "Auto 30ºC",
-          "laundry_care_washer_program_auto_40": "Auto 40ºC",
-          "laundry_care_washer_program_auto_60": "Auto 60ºC",
-          "laundry_care_washer_program_chiffon": "Chiffon",
-          "laundry_care_washer_program_curtains": "Curtains",
-          "laundry_care_washer_program_dark_wash": "Dark wash",
-          "laundry_care_washer_program_dessous": "Dessous",
-          "laundry_care_washer_program_monsoon": "Monsoon",
-          "laundry_care_washer_program_outdoor": "Outdoor",
-          "laundry_care_washer_program_plush_toy": "Plush toy",
-          "laundry_care_washer_program_shirts_blouses": "Shirts blouses",
-          "laundry_care_washer_program_sport_fitness": "Sport fitness",
-          "laundry_care_washer_program_towels": "Towels",
-          "laundry_care_washer_program_water_proof": "Water proof",
-          "laundry_care_washer_program_power_speed_59": "Power speed <60 min",
-          "laundry_care_washer_program_super_153045_super_15": "Super 15 min",
-          "laundry_care_washer_program_super_153045_super_1530": "Super 15/30 min",
-          "laundry_care_washer_program_down_duvet_duvet": "Down duvet",
-          "laundry_care_washer_program_rinse_rinse_spin_drain": "Rinse spin drain",
-          "laundry_care_washer_program_drum_clean": "Drum clean",
-          "laundry_care_washer_dryer_program_cotton": "Cotton",
-          "laundry_care_washer_dryer_program_cotton_eco_4060": "Cotton eco 40/60 ºC",
-          "laundry_care_washer_dryer_program_mix": "Mix",
-          "laundry_care_washer_dryer_program_easy_care": "Easy care",
-          "laundry_care_washer_dryer_program_wash_and_dry_60": "Wash and dry (60 min)",
-          "laundry_care_washer_dryer_program_wash_and_dry_90": "Wash and dry (90 min)"
+          "consumer_products_cleaning_robot_program_cleaning_clean_all": "[%key:component::home_connect::selector::programs::options::consumer_products_cleaning_robot_program_cleaning_clean_all%]",
+          "consumer_products_cleaning_robot_program_cleaning_clean_map": "[%key:component::home_connect::selector::programs::options::consumer_products_cleaning_robot_program_cleaning_clean_map%]",
+          "consumer_products_cleaning_robot_program_basic_go_home": "[%key:component::home_connect::selector::programs::options::consumer_products_cleaning_robot_program_basic_go_home%]",
+          "consumer_products_coffee_maker_program_beverage_ristretto": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_ristretto%]",
+          "consumer_products_coffee_maker_program_beverage_espresso": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_espresso%]",
+          "consumer_products_coffee_maker_program_beverage_espresso_doppio": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_espresso_doppio%]",
+          "consumer_products_coffee_maker_program_beverage_coffee": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_coffee%]",
+          "consumer_products_coffee_maker_program_beverage_x_l_coffee": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_x_l_coffee%]",
+          "consumer_products_coffee_maker_program_beverage_caffe_grande": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_caffe_grande%]",
+          "consumer_products_coffee_maker_program_beverage_espresso_macchiato": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_espresso_macchiato%]",
+          "consumer_products_coffee_maker_program_beverage_cappuccino": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_cappuccino%]",
+          "consumer_products_coffee_maker_program_beverage_latte_macchiato": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_latte_macchiato%]",
+          "consumer_products_coffee_maker_program_beverage_caffe_latte": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_caffe_latte%]",
+          "consumer_products_coffee_maker_program_beverage_milk_froth": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_milk_froth%]",
+          "consumer_products_coffee_maker_program_beverage_warm_milk": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_warm_milk%]",
+          "consumer_products_coffee_maker_program_coffee_world_kleiner_brauner": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_kleiner_brauner%]",
+          "consumer_products_coffee_maker_program_coffee_world_grosser_brauner": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_grosser_brauner%]",
+          "consumer_products_coffee_maker_program_coffee_world_verlaengerter": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_verlaengerter%]",
+          "consumer_products_coffee_maker_program_coffee_world_verlaengerter_braun": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_verlaengerter_braun%]",
+          "consumer_products_coffee_maker_program_coffee_world_wiener_melange": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_wiener_melange%]",
+          "consumer_products_coffee_maker_program_coffee_world_flat_white": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_flat_white%]",
+          "consumer_products_coffee_maker_program_coffee_world_cortado": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_cortado%]",
+          "consumer_products_coffee_maker_program_coffee_world_cafe_cortado": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_cafe_cortado%]",
+          "consumer_products_coffee_maker_program_coffee_world_cafe_con_leche": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_cafe_con_leche%]",
+          "consumer_products_coffee_maker_program_coffee_world_cafe_au_lait": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_cafe_au_lait%]",
+          "consumer_products_coffee_maker_program_coffee_world_doppio": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_doppio%]",
+          "consumer_products_coffee_maker_program_coffee_world_kaapi": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_kaapi%]",
+          "consumer_products_coffee_maker_program_coffee_world_koffie_verkeerd": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_koffie_verkeerd%]",
+          "consumer_products_coffee_maker_program_coffee_world_galao": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_galao%]",
+          "consumer_products_coffee_maker_program_coffee_world_garoto": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_garoto%]",
+          "consumer_products_coffee_maker_program_coffee_world_americano": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_americano%]",
+          "consumer_products_coffee_maker_program_coffee_world_red_eye": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_red_eye%]",
+          "consumer_products_coffee_maker_program_coffee_world_black_eye": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_black_eye%]",
+          "consumer_products_coffee_maker_program_coffee_world_dead_eye": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_dead_eye%]",
+          "consumer_products_coffee_maker_program_beverage_hot_water": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_hot_water%]",
+          "dishcare_dishwasher_program_pre_rinse": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_pre_rinse%]",
+          "dishcare_dishwasher_program_auto_1": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_auto_1%]",
+          "dishcare_dishwasher_program_auto_2": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_auto_2%]",
+          "dishcare_dishwasher_program_auto_3": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_auto_3%]",
+          "dishcare_dishwasher_program_eco_50": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_eco_50%]",
+          "dishcare_dishwasher_program_quick_45": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_quick_45%]",
+          "dishcare_dishwasher_program_intensiv_70": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_intensiv_70%]",
+          "dishcare_dishwasher_program_normal_65": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_normal_65%]",
+          "dishcare_dishwasher_program_glas_40": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_glas_40%]",
+          "dishcare_dishwasher_program_glass_care": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_glass_care%]",
+          "dishcare_dishwasher_program_night_wash": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_night_wash%]",
+          "dishcare_dishwasher_program_quick_65": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_quick_65%]",
+          "dishcare_dishwasher_program_normal_45": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_normal_45%]",
+          "dishcare_dishwasher_program_intensiv_45": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_intensiv_45%]",
+          "dishcare_dishwasher_program_auto_half_load": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_auto_half_load%]",
+          "dishcare_dishwasher_program_intensiv_power": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_intensiv_power%]",
+          "dishcare_dishwasher_program_magic_daily": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_magic_daily%]",
+          "dishcare_dishwasher_program_super_60": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_super_60%]",
+          "dishcare_dishwasher_program_kurz_60": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_kurz_60%]",
+          "dishcare_dishwasher_program_express_sparkle_65": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_express_sparkle_65%]",
+          "dishcare_dishwasher_program_machine_care": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_machine_care%]",
+          "dishcare_dishwasher_program_steam_fresh": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_steam_fresh%]",
+          "dishcare_dishwasher_program_maximum_cleaning": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_maximum_cleaning%]",
+          "dishcare_dishwasher_program_mixed_load": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_mixed_load%]",
+          "laundry_care_dryer_program_cotton": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_cotton%]",
+          "laundry_care_dryer_program_synthetic": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_synthetic%]",
+          "laundry_care_dryer_program_mix": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_mix%]",
+          "laundry_care_dryer_program_blankets": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_blankets%]",
+          "laundry_care_dryer_program_business_shirts": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_business_shirts%]",
+          "laundry_care_dryer_program_down_feathers": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_down_feathers%]",
+          "laundry_care_dryer_program_hygiene": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_hygiene%]",
+          "laundry_care_dryer_program_jeans": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_jeans%]",
+          "laundry_care_dryer_program_outdoor": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_outdoor%]",
+          "laundry_care_dryer_program_synthetic_refresh": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_synthetic_refresh%]",
+          "laundry_care_dryer_program_towels": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_towels%]",
+          "laundry_care_dryer_program_delicates": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_delicates%]",
+          "laundry_care_dryer_program_super_40": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_super_40%]",
+          "laundry_care_dryer_program_shirts_15": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_shirts_15%]",
+          "laundry_care_dryer_program_pillow": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_pillow%]",
+          "laundry_care_dryer_program_anti_shrink": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_anti_shrink%]",
+          "laundry_care_dryer_program_my_time_my_drying_time": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_my_time_my_drying_time%]",
+          "laundry_care_dryer_program_time_cold": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_time_cold%]",
+          "laundry_care_dryer_program_time_warm": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_time_warm%]",
+          "laundry_care_dryer_program_in_basket": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_in_basket%]",
+          "laundry_care_dryer_program_time_cold_fix_time_cold_20": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_time_cold_fix_time_cold_20%]",
+          "laundry_care_dryer_program_time_cold_fix_time_cold_30": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_time_cold_fix_time_cold_30%]",
+          "laundry_care_dryer_program_time_cold_fix_time_cold_60": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_time_cold_fix_time_cold_60%]",
+          "laundry_care_dryer_program_time_warm_fix_time_warm_30": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_time_warm_fix_time_warm_30%]",
+          "laundry_care_dryer_program_time_warm_fix_time_warm_40": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_time_warm_fix_time_warm_40%]",
+          "laundry_care_dryer_program_time_warm_fix_time_warm_60": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_time_warm_fix_time_warm_60%]",
+          "laundry_care_dryer_program_dessous": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_dessous%]",
+          "cooking_common_program_hood_automatic": "[%key:component::home_connect::selector::programs::options::cooking_common_program_hood_automatic%]",
+          "cooking_common_program_hood_venting": "[%key:component::home_connect::selector::programs::options::cooking_common_program_hood_venting%]",
+          "cooking_common_program_hood_delayed_shut_off": "[%key:component::home_connect::selector::programs::options::cooking_common_program_hood_delayed_shut_off%]",
+          "cooking_oven_program_heating_mode_pre_heating": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_pre_heating%]",
+          "cooking_oven_program_heating_mode_hot_air": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_hot_air%]",
+          "cooking_oven_program_heating_mode_hot_air_eco": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_hot_air_eco%]",
+          "cooking_oven_program_heating_mode_hot_air_grilling": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_hot_air_grilling%]",
+          "cooking_oven_program_heating_mode_top_bottom_heating": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_top_bottom_heating%]",
+          "cooking_oven_program_heating_mode_top_bottom_heating_eco": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_top_bottom_heating_eco%]",
+          "cooking_oven_program_heating_mode_bottom_heating": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_bottom_heating%]",
+          "cooking_oven_program_heating_mode_pizza_setting": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_pizza_setting%]",
+          "cooking_oven_program_heating_mode_slow_cook": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_slow_cook%]",
+          "cooking_oven_program_heating_mode_intensive_heat": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_intensive_heat%]",
+          "cooking_oven_program_heating_mode_keep_warm": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_keep_warm%]",
+          "cooking_oven_program_heating_mode_preheat_ovenware": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_preheat_ovenware%]",
+          "cooking_oven_program_heating_mode_frozen_heatup_special": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_frozen_heatup_special%]",
+          "cooking_oven_program_heating_mode_desiccation": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_desiccation%]",
+          "cooking_oven_program_heating_mode_defrost": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_defrost%]",
+          "cooking_oven_program_heating_mode_proof": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_proof%]",
+          "cooking_oven_program_heating_mode_hot_air_30_steam": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_hot_air_30_steam%]",
+          "cooking_oven_program_heating_mode_hot_air_60_steam": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_hot_air_60_steam%]",
+          "cooking_oven_program_heating_mode_hot_air_80_steam": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_hot_air_80_steam%]",
+          "cooking_oven_program_heating_mode_hot_air_100_steam": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_hot_air_100_steam%]",
+          "cooking_oven_program_heating_mode_sabbath_programme": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_sabbath_programme%]",
+          "cooking_oven_program_microwave_90_watt": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_microwave_90_watt%]",
+          "cooking_oven_program_microwave_180_watt": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_microwave_180_watt%]",
+          "cooking_oven_program_microwave_360_watt": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_microwave_360_watt%]",
+          "cooking_oven_program_microwave_600_watt": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_microwave_600_watt%]",
+          "cooking_oven_program_microwave_900_watt": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_microwave_900_watt%]",
+          "cooking_oven_program_microwave_1000_watt": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_microwave_1000_watt%]",
+          "cooking_oven_program_microwave_max": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_microwave_max%]",
+          "cooking_oven_program_heating_mode_warming_drawer": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_warming_drawer%]",
+          "laundry_care_washer_program_cotton": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_cotton%]",
+          "laundry_care_washer_program_cotton_cotton_eco": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_cotton_cotton_eco%]",
+          "laundry_care_washer_program_cotton_eco_4060": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_cotton_eco_4060%]",
+          "laundry_care_washer_program_cotton_colour": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_cotton_colour%]",
+          "laundry_care_washer_program_easy_care": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_easy_care%]",
+          "laundry_care_washer_program_mix": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_mix%]",
+          "laundry_care_washer_program_mix_night_wash": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_mix_night_wash%]",
+          "laundry_care_washer_program_delicates_silk": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_delicates_silk%]",
+          "laundry_care_washer_program_wool": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_wool%]",
+          "laundry_care_washer_program_sensitive": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_sensitive%]",
+          "laundry_care_washer_program_auto_30": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_auto_30%]",
+          "laundry_care_washer_program_auto_40": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_auto_40%]",
+          "laundry_care_washer_program_auto_60": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_auto_60%]",
+          "laundry_care_washer_program_chiffon": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_chiffon%]",
+          "laundry_care_washer_program_curtains": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_curtains%]",
+          "laundry_care_washer_program_dark_wash": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_dark_wash%]",
+          "laundry_care_washer_program_dessous": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_dessous%]",
+          "laundry_care_washer_program_monsoon": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_monsoon%]",
+          "laundry_care_washer_program_outdoor": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_outdoor%]",
+          "laundry_care_washer_program_plush_toy": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_plush_toy%]",
+          "laundry_care_washer_program_shirts_blouses": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_shirts_blouses%]",
+          "laundry_care_washer_program_sport_fitness": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_sport_fitness%]",
+          "laundry_care_washer_program_towels": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_towels%]",
+          "laundry_care_washer_program_water_proof": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_water_proof%]",
+          "laundry_care_washer_program_power_speed_59": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_power_speed_59%]",
+          "laundry_care_washer_program_super_153045_super_15": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_super_153045_super_15%]",
+          "laundry_care_washer_program_super_153045_super_1530": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_super_153045_super_1530%]",
+          "laundry_care_washer_program_down_duvet_duvet": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_down_duvet_duvet%]",
+          "laundry_care_washer_program_rinse_rinse_spin_drain": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_rinse_rinse_spin_drain%]",
+          "laundry_care_washer_program_drum_clean": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_drum_clean%]",
+          "laundry_care_washer_dryer_program_cotton": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_dryer_program_cotton%]",
+          "laundry_care_washer_dryer_program_cotton_eco_4060": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_dryer_program_cotton_eco_4060%]",
+          "laundry_care_washer_dryer_program_mix": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_dryer_program_mix%]",
+          "laundry_care_washer_dryer_program_easy_care": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_dryer_program_easy_care%]",
+          "laundry_care_washer_dryer_program_wash_and_dry_60": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_dryer_program_wash_and_dry_60%]",
+          "laundry_care_washer_dryer_program_wash_and_dry_90": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_dryer_program_wash_and_dry_90%]"
         }
       },
       "active_program": {
         "name": "Active program",
         "state": {
-          "consumer_products_cleaning_robot_program_cleaning_clean_all": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_cleaning_robot_program_cleaning_clean_all%]",
-          "consumer_products_cleaning_robot_program_cleaning_clean_map": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_cleaning_robot_program_cleaning_clean_map%]",
-          "consumer_products_cleaning_robot_program_basic_go_home": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_cleaning_robot_program_basic_go_home%]",
-          "consumer_products_coffee_maker_program_beverage_ristretto": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_beverage_ristretto%]",
-          "consumer_products_coffee_maker_program_beverage_espresso": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_beverage_espresso%]",
-          "consumer_products_coffee_maker_program_beverage_espresso_doppio": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_beverage_espresso_doppio%]",
-          "consumer_products_coffee_maker_program_beverage_coffee": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_beverage_coffee%]",
-          "consumer_products_coffee_maker_program_beverage_x_l_coffee": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_beverage_x_l_coffee%]",
-          "consumer_products_coffee_maker_program_beverage_caffe_grande": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_beverage_caffe_grande%]",
-          "consumer_products_coffee_maker_program_beverage_espresso_macchiato": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_beverage_espresso_macchiato%]",
-          "consumer_products_coffee_maker_program_beverage_cappuccino": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_beverage_cappuccino%]",
-          "consumer_products_coffee_maker_program_beverage_latte_macchiato": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_beverage_latte_macchiato%]",
-          "consumer_products_coffee_maker_program_beverage_caffe_latte": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_beverage_caffe_latte%]",
-          "consumer_products_coffee_maker_program_beverage_milk_froth": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_beverage_milk_froth%]",
-          "consumer_products_coffee_maker_program_beverage_warm_milk": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_beverage_warm_milk%]",
-          "consumer_products_coffee_maker_program_coffee_world_kleiner_brauner": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_coffee_world_kleiner_brauner%]",
-          "consumer_products_coffee_maker_program_coffee_world_grosser_brauner": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_coffee_world_grosser_brauner%]",
-          "consumer_products_coffee_maker_program_coffee_world_verlaengerter": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_coffee_world_verlaengerter%]",
-          "consumer_products_coffee_maker_program_coffee_world_verlaengerter_braun": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_coffee_world_verlaengerter_braun%]",
-          "consumer_products_coffee_maker_program_coffee_world_wiener_melange": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_coffee_world_wiener_melange%]",
-          "consumer_products_coffee_maker_program_coffee_world_flat_white": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_coffee_world_flat_white%]",
-          "consumer_products_coffee_maker_program_coffee_world_cortado": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_coffee_world_cortado%]",
-          "consumer_products_coffee_maker_program_coffee_world_cafe_cortado": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_coffee_world_cafe_cortado%]",
-          "consumer_products_coffee_maker_program_coffee_world_cafe_con_leche": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_coffee_world_cafe_con_leche%]",
-          "consumer_products_coffee_maker_program_coffee_world_cafe_au_lait": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_coffee_world_cafe_au_lait%]",
-          "consumer_products_coffee_maker_program_coffee_world_doppio": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_coffee_world_doppio%]",
-          "consumer_products_coffee_maker_program_coffee_world_kaapi": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_coffee_world_kaapi%]",
-          "consumer_products_coffee_maker_program_coffee_world_koffie_verkeerd": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_coffee_world_koffie_verkeerd%]",
-          "consumer_products_coffee_maker_program_coffee_world_galao": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_coffee_world_galao%]",
-          "consumer_products_coffee_maker_program_coffee_world_garoto": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_coffee_world_garoto%]",
-          "consumer_products_coffee_maker_program_coffee_world_americano": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_coffee_world_americano%]",
-          "consumer_products_coffee_maker_program_coffee_world_red_eye": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_coffee_world_red_eye%]",
-          "consumer_products_coffee_maker_program_coffee_world_black_eye": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_coffee_world_black_eye%]",
-          "consumer_products_coffee_maker_program_coffee_world_dead_eye": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_coffee_world_dead_eye%]",
-          "consumer_products_coffee_maker_program_beverage_hot_water": "[%key:component::home_connect::entity::select::selected_program::state::consumer_products_coffee_maker_program_beverage_hot_water%]",
-          "dishcare_dishwasher_program_pre_rinse": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_pre_rinse%]",
-          "dishcare_dishwasher_program_auto_1": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_auto_1%]",
-          "dishcare_dishwasher_program_auto_2": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_auto_2%]",
-          "dishcare_dishwasher_program_auto_3": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_auto_3%]",
-          "dishcare_dishwasher_program_eco_50": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_eco_50%]",
-          "dishcare_dishwasher_program_quick_45": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_quick_45%]",
-          "dishcare_dishwasher_program_intensiv_70": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_intensiv_70%]",
-          "dishcare_dishwasher_program_normal_65": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_normal_65%]",
-          "dishcare_dishwasher_program_glas_40": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_glas_40%]",
-          "dishcare_dishwasher_program_glass_care": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_glass_care%]",
-          "dishcare_dishwasher_program_night_wash": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_night_wash%]",
-          "dishcare_dishwasher_program_quick_65": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_quick_65%]",
-          "dishcare_dishwasher_program_normal_45": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_normal_45%]",
-          "dishcare_dishwasher_program_intensiv_45": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_intensiv_45%]",
-          "dishcare_dishwasher_program_auto_half_load": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_auto_half_load%]",
-          "dishcare_dishwasher_program_intensiv_power": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_intensiv_power%]",
-          "dishcare_dishwasher_program_magic_daily": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_magic_daily%]",
-          "dishcare_dishwasher_program_super_60": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_super_60%]",
-          "dishcare_dishwasher_program_kurz_60": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_kurz_60%]",
-          "dishcare_dishwasher_program_express_sparkle_65": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_express_sparkle_65%]",
-          "dishcare_dishwasher_program_machine_care": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_machine_care%]",
-          "dishcare_dishwasher_program_steam_fresh": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_steam_fresh%]",
-          "dishcare_dishwasher_program_maximum_cleaning": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_maximum_cleaning%]",
-          "dishcare_dishwasher_program_mixed_load": "[%key:component::home_connect::entity::select::selected_program::state::dishcare_dishwasher_program_mixed_load%]",
-          "laundry_care_dryer_program_cotton": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_cotton%]",
-          "laundry_care_dryer_program_synthetic": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_synthetic%]",
-          "laundry_care_dryer_program_mix": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_mix%]",
-          "laundry_care_dryer_program_blankets": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_blankets%]",
-          "laundry_care_dryer_program_business_shirts": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_business_shirts%]",
-          "laundry_care_dryer_program_down_feathers": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_down_feathers%]",
-          "laundry_care_dryer_program_hygiene": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_hygiene%]",
-          "laundry_care_dryer_program_jeans": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_jeans%]",
-          "laundry_care_dryer_program_outdoor": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_outdoor%]",
-          "laundry_care_dryer_program_synthetic_refresh": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_synthetic_refresh%]",
-          "laundry_care_dryer_program_towels": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_towels%]",
-          "laundry_care_dryer_program_delicates": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_delicates%]",
-          "laundry_care_dryer_program_super_40": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_super_40%]",
-          "laundry_care_dryer_program_shirts_15": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_shirts_15%]",
-          "laundry_care_dryer_program_pillow": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_pillow%]",
-          "laundry_care_dryer_program_anti_shrink": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_anti_shrink%]",
-          "laundry_care_dryer_program_my_time_my_drying_time": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_my_time_my_drying_time%]",
-          "laundry_care_dryer_program_time_cold": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_time_cold%]",
-          "laundry_care_dryer_program_time_warm": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_time_warm%]",
-          "laundry_care_dryer_program_in_basket": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_in_basket%]",
-          "laundry_care_dryer_program_time_cold_fix_time_cold_20": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_time_cold_fix_time_cold_20%]",
-          "laundry_care_dryer_program_time_cold_fix_time_cold_30": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_time_cold_fix_time_cold_30%]",
-          "laundry_care_dryer_program_time_cold_fix_time_cold_60": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_time_cold_fix_time_cold_60%]",
-          "laundry_care_dryer_program_time_warm_fix_time_warm_30": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_time_warm_fix_time_warm_30%]",
-          "laundry_care_dryer_program_time_warm_fix_time_warm_40": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_time_warm_fix_time_warm_40%]",
-          "laundry_care_dryer_program_time_warm_fix_time_warm_60": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_time_warm_fix_time_warm_60%]",
-          "laundry_care_dryer_program_dessous": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_dryer_program_dessous%]",
-          "cooking_common_program_hood_automatic": "[%key:component::home_connect::entity::select::selected_program::state::cooking_common_program_hood_automatic%]",
-          "cooking_common_program_hood_venting": "[%key:component::home_connect::entity::select::selected_program::state::cooking_common_program_hood_venting%]",
-          "cooking_common_program_hood_delayed_shut_off": "[%key:component::home_connect::entity::select::selected_program::state::cooking_common_program_hood_delayed_shut_off%]",
-          "cooking_oven_program_heating_mode_pre_heating": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_pre_heating%]",
-          "cooking_oven_program_heating_mode_hot_air": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_hot_air%]",
-          "cooking_oven_program_heating_mode_hot_air_eco": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_hot_air_eco%]",
-          "cooking_oven_program_heating_mode_hot_air_grilling": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_hot_air_grilling%]",
-          "cooking_oven_program_heating_mode_top_bottom_heating": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_top_bottom_heating%]",
-          "cooking_oven_program_heating_mode_top_bottom_heating_eco": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_top_bottom_heating_eco%]",
-          "cooking_oven_program_heating_mode_bottom_heating": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_bottom_heating%]",
-          "cooking_oven_program_heating_mode_pizza_setting": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_pizza_setting%]",
-          "cooking_oven_program_heating_mode_slow_cook": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_slow_cook%]",
-          "cooking_oven_program_heating_mode_intensive_heat": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_intensive_heat%]",
-          "cooking_oven_program_heating_mode_keep_warm": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_keep_warm%]",
-          "cooking_oven_program_heating_mode_preheat_ovenware": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_preheat_ovenware%]",
-          "cooking_oven_program_heating_mode_frozen_heatup_special": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_frozen_heatup_special%]",
-          "cooking_oven_program_heating_mode_desiccation": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_desiccation%]",
-          "cooking_oven_program_heating_mode_defrost": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_defrost%]",
-          "cooking_oven_program_heating_mode_proof": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_proof%]",
-          "cooking_oven_program_heating_mode_hot_air_30_steam": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_hot_air_30_steam%]",
-          "cooking_oven_program_heating_mode_hot_air_60_steam": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_hot_air_60_steam%]",
-          "cooking_oven_program_heating_mode_hot_air_80_steam": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_hot_air_80_steam%]",
-          "cooking_oven_program_heating_mode_hot_air_100_steam": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_hot_air_100_steam%]",
-          "cooking_oven_program_heating_mode_sabbath_programme": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_sabbath_programme%]",
-          "cooking_oven_program_microwave_90_watt": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_microwave_90_watt%]",
-          "cooking_oven_program_microwave_180_watt": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_microwave_180_watt%]",
-          "cooking_oven_program_microwave_360_watt": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_microwave_360_watt%]",
-          "cooking_oven_program_microwave_600_watt": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_microwave_600_watt%]",
-          "cooking_oven_program_microwave_900_watt": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_microwave_900_watt%]",
-          "cooking_oven_program_microwave_1000_watt": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_microwave_1000_watt%]",
-          "cooking_oven_program_microwave_max": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_microwave_max%]",
-          "cooking_oven_program_heating_mode_warming_drawer": "[%key:component::home_connect::entity::select::selected_program::state::cooking_oven_program_heating_mode_warming_drawer%]",
-          "laundry_care_washer_program_cotton": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_cotton%]",
-          "laundry_care_washer_program_cotton_cotton_eco": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_cotton_cotton_eco%]",
-          "laundry_care_washer_program_cotton_eco_4060": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_cotton_eco_4060%]",
-          "laundry_care_washer_program_cotton_colour": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_cotton_colour%]",
-          "laundry_care_washer_program_easy_care": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_easy_care%]",
-          "laundry_care_washer_program_mix": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_mix%]",
-          "laundry_care_washer_program_mix_night_wash": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_mix_night_wash%]",
-          "laundry_care_washer_program_delicates_silk": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_delicates_silk%]",
-          "laundry_care_washer_program_wool": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_wool%]",
-          "laundry_care_washer_program_sensitive": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_sensitive%]",
-          "laundry_care_washer_program_auto_30": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_auto_30%]",
-          "laundry_care_washer_program_auto_40": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_auto_40%]",
-          "laundry_care_washer_program_auto_60": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_auto_60%]",
-          "laundry_care_washer_program_chiffon": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_chiffon%]",
-          "laundry_care_washer_program_curtains": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_curtains%]",
-          "laundry_care_washer_program_dark_wash": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_dark_wash%]",
-          "laundry_care_washer_program_dessous": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_dessous%]",
-          "laundry_care_washer_program_monsoon": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_monsoon%]",
-          "laundry_care_washer_program_outdoor": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_outdoor%]",
-          "laundry_care_washer_program_plush_toy": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_plush_toy%]",
-          "laundry_care_washer_program_shirts_blouses": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_shirts_blouses%]",
-          "laundry_care_washer_program_sport_fitness": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_sport_fitness%]",
-          "laundry_care_washer_program_towels": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_towels%]",
-          "laundry_care_washer_program_water_proof": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_water_proof%]",
-          "laundry_care_washer_program_power_speed_59": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_power_speed_59%]",
-          "laundry_care_washer_program_super_153045_super_15": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_super_153045_super_15%]",
-          "laundry_care_washer_program_super_153045_super_1530": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_super_153045_super_1530%]",
-          "laundry_care_washer_program_down_duvet_duvet": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_down_duvet_duvet%]",
-          "laundry_care_washer_program_rinse_rinse_spin_drain": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_rinse_rinse_spin_drain%]",
-          "laundry_care_washer_program_drum_clean": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_program_drum_clean%]",
-          "laundry_care_washer_dryer_program_cotton": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_dryer_program_cotton%]",
-          "laundry_care_washer_dryer_program_cotton_eco_4060": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_dryer_program_cotton_eco_4060%]",
-          "laundry_care_washer_dryer_program_mix": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_dryer_program_mix%]",
-          "laundry_care_washer_dryer_program_easy_care": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_dryer_program_easy_care%]",
-          "laundry_care_washer_dryer_program_wash_and_dry_60": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_dryer_program_wash_and_dry_60%]",
-          "laundry_care_washer_dryer_program_wash_and_dry_90": "[%key:component::home_connect::entity::select::selected_program::state::laundry_care_washer_dryer_program_wash_and_dry_90%]"
+          "consumer_products_cleaning_robot_program_cleaning_clean_all": "[%key:component::home_connect::selector::programs::options::consumer_products_cleaning_robot_program_cleaning_clean_all%]",
+          "consumer_products_cleaning_robot_program_cleaning_clean_map": "[%key:component::home_connect::selector::programs::options::consumer_products_cleaning_robot_program_cleaning_clean_map%]",
+          "consumer_products_cleaning_robot_program_basic_go_home": "[%key:component::home_connect::selector::programs::options::consumer_products_cleaning_robot_program_basic_go_home%]",
+          "consumer_products_coffee_maker_program_beverage_ristretto": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_ristretto%]",
+          "consumer_products_coffee_maker_program_beverage_espresso": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_espresso%]",
+          "consumer_products_coffee_maker_program_beverage_espresso_doppio": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_espresso_doppio%]",
+          "consumer_products_coffee_maker_program_beverage_coffee": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_coffee%]",
+          "consumer_products_coffee_maker_program_beverage_x_l_coffee": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_x_l_coffee%]",
+          "consumer_products_coffee_maker_program_beverage_caffe_grande": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_caffe_grande%]",
+          "consumer_products_coffee_maker_program_beverage_espresso_macchiato": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_espresso_macchiato%]",
+          "consumer_products_coffee_maker_program_beverage_cappuccino": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_cappuccino%]",
+          "consumer_products_coffee_maker_program_beverage_latte_macchiato": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_latte_macchiato%]",
+          "consumer_products_coffee_maker_program_beverage_caffe_latte": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_caffe_latte%]",
+          "consumer_products_coffee_maker_program_beverage_milk_froth": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_milk_froth%]",
+          "consumer_products_coffee_maker_program_beverage_warm_milk": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_warm_milk%]",
+          "consumer_products_coffee_maker_program_coffee_world_kleiner_brauner": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_kleiner_brauner%]",
+          "consumer_products_coffee_maker_program_coffee_world_grosser_brauner": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_grosser_brauner%]",
+          "consumer_products_coffee_maker_program_coffee_world_verlaengerter": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_verlaengerter%]",
+          "consumer_products_coffee_maker_program_coffee_world_verlaengerter_braun": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_verlaengerter_braun%]",
+          "consumer_products_coffee_maker_program_coffee_world_wiener_melange": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_wiener_melange%]",
+          "consumer_products_coffee_maker_program_coffee_world_flat_white": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_flat_white%]",
+          "consumer_products_coffee_maker_program_coffee_world_cortado": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_cortado%]",
+          "consumer_products_coffee_maker_program_coffee_world_cafe_cortado": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_cafe_cortado%]",
+          "consumer_products_coffee_maker_program_coffee_world_cafe_con_leche": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_cafe_con_leche%]",
+          "consumer_products_coffee_maker_program_coffee_world_cafe_au_lait": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_cafe_au_lait%]",
+          "consumer_products_coffee_maker_program_coffee_world_doppio": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_doppio%]",
+          "consumer_products_coffee_maker_program_coffee_world_kaapi": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_kaapi%]",
+          "consumer_products_coffee_maker_program_coffee_world_koffie_verkeerd": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_koffie_verkeerd%]",
+          "consumer_products_coffee_maker_program_coffee_world_galao": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_galao%]",
+          "consumer_products_coffee_maker_program_coffee_world_garoto": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_garoto%]",
+          "consumer_products_coffee_maker_program_coffee_world_americano": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_americano%]",
+          "consumer_products_coffee_maker_program_coffee_world_red_eye": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_red_eye%]",
+          "consumer_products_coffee_maker_program_coffee_world_black_eye": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_black_eye%]",
+          "consumer_products_coffee_maker_program_coffee_world_dead_eye": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_coffee_world_dead_eye%]",
+          "consumer_products_coffee_maker_program_beverage_hot_water": "[%key:component::home_connect::selector::programs::options::consumer_products_coffee_maker_program_beverage_hot_water%]",
+          "dishcare_dishwasher_program_pre_rinse": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_pre_rinse%]",
+          "dishcare_dishwasher_program_auto_1": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_auto_1%]",
+          "dishcare_dishwasher_program_auto_2": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_auto_2%]",
+          "dishcare_dishwasher_program_auto_3": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_auto_3%]",
+          "dishcare_dishwasher_program_eco_50": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_eco_50%]",
+          "dishcare_dishwasher_program_quick_45": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_quick_45%]",
+          "dishcare_dishwasher_program_intensiv_70": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_intensiv_70%]",
+          "dishcare_dishwasher_program_normal_65": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_normal_65%]",
+          "dishcare_dishwasher_program_glas_40": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_glas_40%]",
+          "dishcare_dishwasher_program_glass_care": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_glass_care%]",
+          "dishcare_dishwasher_program_night_wash": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_night_wash%]",
+          "dishcare_dishwasher_program_quick_65": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_quick_65%]",
+          "dishcare_dishwasher_program_normal_45": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_normal_45%]",
+          "dishcare_dishwasher_program_intensiv_45": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_intensiv_45%]",
+          "dishcare_dishwasher_program_auto_half_load": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_auto_half_load%]",
+          "dishcare_dishwasher_program_intensiv_power": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_intensiv_power%]",
+          "dishcare_dishwasher_program_magic_daily": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_magic_daily%]",
+          "dishcare_dishwasher_program_super_60": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_super_60%]",
+          "dishcare_dishwasher_program_kurz_60": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_kurz_60%]",
+          "dishcare_dishwasher_program_express_sparkle_65": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_express_sparkle_65%]",
+          "dishcare_dishwasher_program_machine_care": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_machine_care%]",
+          "dishcare_dishwasher_program_steam_fresh": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_steam_fresh%]",
+          "dishcare_dishwasher_program_maximum_cleaning": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_maximum_cleaning%]",
+          "dishcare_dishwasher_program_mixed_load": "[%key:component::home_connect::selector::programs::options::dishcare_dishwasher_program_mixed_load%]",
+          "laundry_care_dryer_program_cotton": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_cotton%]",
+          "laundry_care_dryer_program_synthetic": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_synthetic%]",
+          "laundry_care_dryer_program_mix": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_mix%]",
+          "laundry_care_dryer_program_blankets": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_blankets%]",
+          "laundry_care_dryer_program_business_shirts": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_business_shirts%]",
+          "laundry_care_dryer_program_down_feathers": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_down_feathers%]",
+          "laundry_care_dryer_program_hygiene": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_hygiene%]",
+          "laundry_care_dryer_program_jeans": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_jeans%]",
+          "laundry_care_dryer_program_outdoor": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_outdoor%]",
+          "laundry_care_dryer_program_synthetic_refresh": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_synthetic_refresh%]",
+          "laundry_care_dryer_program_towels": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_towels%]",
+          "laundry_care_dryer_program_delicates": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_delicates%]",
+          "laundry_care_dryer_program_super_40": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_super_40%]",
+          "laundry_care_dryer_program_shirts_15": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_shirts_15%]",
+          "laundry_care_dryer_program_pillow": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_pillow%]",
+          "laundry_care_dryer_program_anti_shrink": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_anti_shrink%]",
+          "laundry_care_dryer_program_my_time_my_drying_time": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_my_time_my_drying_time%]",
+          "laundry_care_dryer_program_time_cold": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_time_cold%]",
+          "laundry_care_dryer_program_time_warm": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_time_warm%]",
+          "laundry_care_dryer_program_in_basket": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_in_basket%]",
+          "laundry_care_dryer_program_time_cold_fix_time_cold_20": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_time_cold_fix_time_cold_20%]",
+          "laundry_care_dryer_program_time_cold_fix_time_cold_30": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_time_cold_fix_time_cold_30%]",
+          "laundry_care_dryer_program_time_cold_fix_time_cold_60": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_time_cold_fix_time_cold_60%]",
+          "laundry_care_dryer_program_time_warm_fix_time_warm_30": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_time_warm_fix_time_warm_30%]",
+          "laundry_care_dryer_program_time_warm_fix_time_warm_40": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_time_warm_fix_time_warm_40%]",
+          "laundry_care_dryer_program_time_warm_fix_time_warm_60": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_time_warm_fix_time_warm_60%]",
+          "laundry_care_dryer_program_dessous": "[%key:component::home_connect::selector::programs::options::laundry_care_dryer_program_dessous%]",
+          "cooking_common_program_hood_automatic": "[%key:component::home_connect::selector::programs::options::cooking_common_program_hood_automatic%]",
+          "cooking_common_program_hood_venting": "[%key:component::home_connect::selector::programs::options::cooking_common_program_hood_venting%]",
+          "cooking_common_program_hood_delayed_shut_off": "[%key:component::home_connect::selector::programs::options::cooking_common_program_hood_delayed_shut_off%]",
+          "cooking_oven_program_heating_mode_pre_heating": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_pre_heating%]",
+          "cooking_oven_program_heating_mode_hot_air": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_hot_air%]",
+          "cooking_oven_program_heating_mode_hot_air_eco": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_hot_air_eco%]",
+          "cooking_oven_program_heating_mode_hot_air_grilling": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_hot_air_grilling%]",
+          "cooking_oven_program_heating_mode_top_bottom_heating": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_top_bottom_heating%]",
+          "cooking_oven_program_heating_mode_top_bottom_heating_eco": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_top_bottom_heating_eco%]",
+          "cooking_oven_program_heating_mode_bottom_heating": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_bottom_heating%]",
+          "cooking_oven_program_heating_mode_pizza_setting": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_pizza_setting%]",
+          "cooking_oven_program_heating_mode_slow_cook": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_slow_cook%]",
+          "cooking_oven_program_heating_mode_intensive_heat": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_intensive_heat%]",
+          "cooking_oven_program_heating_mode_keep_warm": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_keep_warm%]",
+          "cooking_oven_program_heating_mode_preheat_ovenware": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_preheat_ovenware%]",
+          "cooking_oven_program_heating_mode_frozen_heatup_special": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_frozen_heatup_special%]",
+          "cooking_oven_program_heating_mode_desiccation": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_desiccation%]",
+          "cooking_oven_program_heating_mode_defrost": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_defrost%]",
+          "cooking_oven_program_heating_mode_proof": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_proof%]",
+          "cooking_oven_program_heating_mode_hot_air_30_steam": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_hot_air_30_steam%]",
+          "cooking_oven_program_heating_mode_hot_air_60_steam": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_hot_air_60_steam%]",
+          "cooking_oven_program_heating_mode_hot_air_80_steam": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_hot_air_80_steam%]",
+          "cooking_oven_program_heating_mode_hot_air_100_steam": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_hot_air_100_steam%]",
+          "cooking_oven_program_heating_mode_sabbath_programme": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_sabbath_programme%]",
+          "cooking_oven_program_microwave_90_watt": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_microwave_90_watt%]",
+          "cooking_oven_program_microwave_180_watt": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_microwave_180_watt%]",
+          "cooking_oven_program_microwave_360_watt": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_microwave_360_watt%]",
+          "cooking_oven_program_microwave_600_watt": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_microwave_600_watt%]",
+          "cooking_oven_program_microwave_900_watt": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_microwave_900_watt%]",
+          "cooking_oven_program_microwave_1000_watt": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_microwave_1000_watt%]",
+          "cooking_oven_program_microwave_max": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_microwave_max%]",
+          "cooking_oven_program_heating_mode_warming_drawer": "[%key:component::home_connect::selector::programs::options::cooking_oven_program_heating_mode_warming_drawer%]",
+          "laundry_care_washer_program_cotton": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_cotton%]",
+          "laundry_care_washer_program_cotton_cotton_eco": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_cotton_cotton_eco%]",
+          "laundry_care_washer_program_cotton_eco_4060": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_cotton_eco_4060%]",
+          "laundry_care_washer_program_cotton_colour": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_cotton_colour%]",
+          "laundry_care_washer_program_easy_care": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_easy_care%]",
+          "laundry_care_washer_program_mix": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_mix%]",
+          "laundry_care_washer_program_mix_night_wash": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_mix_night_wash%]",
+          "laundry_care_washer_program_delicates_silk": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_delicates_silk%]",
+          "laundry_care_washer_program_wool": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_wool%]",
+          "laundry_care_washer_program_sensitive": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_sensitive%]",
+          "laundry_care_washer_program_auto_30": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_auto_30%]",
+          "laundry_care_washer_program_auto_40": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_auto_40%]",
+          "laundry_care_washer_program_auto_60": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_auto_60%]",
+          "laundry_care_washer_program_chiffon": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_chiffon%]",
+          "laundry_care_washer_program_curtains": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_curtains%]",
+          "laundry_care_washer_program_dark_wash": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_dark_wash%]",
+          "laundry_care_washer_program_dessous": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_dessous%]",
+          "laundry_care_washer_program_monsoon": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_monsoon%]",
+          "laundry_care_washer_program_outdoor": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_outdoor%]",
+          "laundry_care_washer_program_plush_toy": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_plush_toy%]",
+          "laundry_care_washer_program_shirts_blouses": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_shirts_blouses%]",
+          "laundry_care_washer_program_sport_fitness": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_sport_fitness%]",
+          "laundry_care_washer_program_towels": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_towels%]",
+          "laundry_care_washer_program_water_proof": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_water_proof%]",
+          "laundry_care_washer_program_power_speed_59": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_power_speed_59%]",
+          "laundry_care_washer_program_super_153045_super_15": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_super_153045_super_15%]",
+          "laundry_care_washer_program_super_153045_super_1530": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_super_153045_super_1530%]",
+          "laundry_care_washer_program_down_duvet_duvet": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_down_duvet_duvet%]",
+          "laundry_care_washer_program_rinse_rinse_spin_drain": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_rinse_rinse_spin_drain%]",
+          "laundry_care_washer_program_drum_clean": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_program_drum_clean%]",
+          "laundry_care_washer_dryer_program_cotton": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_dryer_program_cotton%]",
+          "laundry_care_washer_dryer_program_cotton_eco_4060": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_dryer_program_cotton_eco_4060%]",
+          "laundry_care_washer_dryer_program_mix": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_dryer_program_mix%]",
+          "laundry_care_washer_dryer_program_easy_care": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_dryer_program_easy_care%]",
+          "laundry_care_washer_dryer_program_wash_and_dry_60": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_dryer_program_wash_and_dry_60%]",
+          "laundry_care_washer_dryer_program_wash_and_dry_90": "[%key:component::home_connect::selector::programs::options::laundry_care_washer_dryer_program_wash_and_dry_90%]"
+        }
+      },
+      "current_map": {
+        "name": "Current map",
+        "state": {
+          "consumer_products_cleaning_robot_enum_type_available_maps_temp_map": "[%key:component::home_connect::selector::available_maps::options::consumer_products_cleaning_robot_enum_type_available_maps_temp_map%]",
+          "consumer_products_cleaning_robot_enum_type_available_maps_map1": "[%key:component::home_connect::selector::available_maps::options::consumer_products_cleaning_robot_enum_type_available_maps_map1%]",
+          "consumer_products_cleaning_robot_enum_type_available_maps_map2": "[%key:component::home_connect::selector::available_maps::options::consumer_products_cleaning_robot_enum_type_available_maps_map2%]",
+          "consumer_products_cleaning_robot_enum_type_available_maps_map3": "[%key:component::home_connect::selector::available_maps::options::consumer_products_cleaning_robot_enum_type_available_maps_map3%]"
+        }
+      },
+      "functional_light_color_temperature": {
+        "name": "Functional light color temperature",
+        "state": {
+          "cooking_hood_enum_type_color_temperature_custom": "Custom",
+          "cooking_hood_enum_type_color_temperature_warm": "Warm",
+          "cooking_hood_enum_type_color_temperature_warm_to_neutral": "Warm to Neutral",
+          "cooking_hood_enum_type_color_temperature_neutral": "Neutral",
+          "cooking_hood_enum_type_color_temperature_neutral_to_cold": "Neutral to Cold",
+          "cooking_hood_enum_type_color_temperature_cold": "Cold"
+        }
+      },
+      "ambient_light_color": {
+        "name": "Ambient light color",
+        "state": {
+          "b_s_h_common_enum_type_ambient_light_color_custom_color": "Custom"
+        }
+      },
+      "reference_map_id": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::consumer_products_cleaning_robot_option_reference_map_id::name%]",
+        "state": {
+          "consumer_products_cleaning_robot_enum_type_available_maps_temp_map": "[%key:component::home_connect::selector::available_maps::options::consumer_products_cleaning_robot_enum_type_available_maps_temp_map%]",
+          "consumer_products_cleaning_robot_enum_type_available_maps_map1": "[%key:component::home_connect::selector::available_maps::options::consumer_products_cleaning_robot_enum_type_available_maps_map1%]",
+          "consumer_products_cleaning_robot_enum_type_available_maps_map2": "[%key:component::home_connect::selector::available_maps::options::consumer_products_cleaning_robot_enum_type_available_maps_map2%]",
+          "consumer_products_cleaning_robot_enum_type_available_maps_map3": "[%key:component::home_connect::selector::available_maps::options::consumer_products_cleaning_robot_enum_type_available_maps_map3%]"
+        }
+      },
+      "cleaning_mode": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::consumer_products_cleaning_robot_option_cleaning_mode::name%]",
+        "state": {
+          "consumer_products_cleaning_robot_enum_type_cleaning_modes_silent": "[%key:component::home_connect::selector::cleaning_mode::options::consumer_products_cleaning_robot_enum_type_cleaning_modes_silent%]",
+          "consumer_products_cleaning_robot_enum_type_cleaning_modes_standard": "[%key:component::home_connect::selector::cleaning_mode::options::consumer_products_cleaning_robot_enum_type_cleaning_modes_standard%]",
+          "consumer_products_cleaning_robot_enum_type_cleaning_modes_power": "[%key:component::home_connect::selector::cleaning_mode::options::consumer_products_cleaning_robot_enum_type_cleaning_modes_power%]"
+        }
+      },
+      "bean_amount": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::consumer_products_coffee_maker_option_bean_amount::name%]",
+        "state": {
+          "consumer_products_coffee_maker_enum_type_bean_amount_very_mild": "[%key:component::home_connect::selector::bean_amount::options::consumer_products_coffee_maker_enum_type_bean_amount_very_mild%]",
+          "consumer_products_coffee_maker_enum_type_bean_amount_mild": "[%key:component::home_connect::selector::bean_amount::options::consumer_products_coffee_maker_enum_type_bean_amount_mild%]",
+          "consumer_products_coffee_maker_enum_type_bean_amount_mild_plus": "[%key:component::home_connect::selector::bean_amount::options::consumer_products_coffee_maker_enum_type_bean_amount_mild_plus%]",
+          "consumer_products_coffee_maker_enum_type_bean_amount_normal": "[%key:component::home_connect::selector::bean_amount::options::consumer_products_coffee_maker_enum_type_bean_amount_normal%]",
+          "consumer_products_coffee_maker_enum_type_bean_amount_normal_plus": "[%key:component::home_connect::selector::bean_amount::options::consumer_products_coffee_maker_enum_type_bean_amount_normal_plus%]",
+          "consumer_products_coffee_maker_enum_type_bean_amount_strong": "[%key:component::home_connect::selector::bean_amount::options::consumer_products_coffee_maker_enum_type_bean_amount_strong%]",
+          "consumer_products_coffee_maker_enum_type_bean_amount_strong_plus": "[%key:component::home_connect::selector::bean_amount::options::consumer_products_coffee_maker_enum_type_bean_amount_strong_plus%]",
+          "consumer_products_coffee_maker_enum_type_bean_amount_very_strong": "[%key:component::home_connect::selector::bean_amount::options::consumer_products_coffee_maker_enum_type_bean_amount_very_strong%]",
+          "consumer_products_coffee_maker_enum_type_bean_amount_very_strong_plus": "[%key:component::home_connect::selector::bean_amount::options::consumer_products_coffee_maker_enum_type_bean_amount_very_strong_plus%]",
+          "consumer_products_coffee_maker_enum_type_bean_amount_extra_strong": "[%key:component::home_connect::selector::bean_amount::options::consumer_products_coffee_maker_enum_type_bean_amount_extra_strong%]",
+          "consumer_products_coffee_maker_enum_type_bean_amount_double_shot": "[%key:component::home_connect::selector::bean_amount::options::consumer_products_coffee_maker_enum_type_bean_amount_double_shot%]",
+          "consumer_products_coffee_maker_enum_type_bean_amount_double_shot_plus": "[%key:component::home_connect::selector::bean_amount::options::consumer_products_coffee_maker_enum_type_bean_amount_double_shot_plus%]",
+          "consumer_products_coffee_maker_enum_type_bean_amount_double_shot_plus_plus": "[%key:component::home_connect::selector::bean_amount::options::consumer_products_coffee_maker_enum_type_bean_amount_double_shot_plus_plus%]",
+          "consumer_products_coffee_maker_enum_type_bean_amount_triple_shot": "[%key:component::home_connect::selector::bean_amount::options::consumer_products_coffee_maker_enum_type_bean_amount_triple_shot%]",
+          "consumer_products_coffee_maker_enum_type_bean_amount_triple_shot_plus": "[%key:component::home_connect::selector::bean_amount::options::consumer_products_coffee_maker_enum_type_bean_amount_triple_shot_plus%]",
+          "consumer_products_coffee_maker_enum_type_bean_amount_coffee_ground": "[%key:component::home_connect::selector::bean_amount::options::consumer_products_coffee_maker_enum_type_bean_amount_coffee_ground%]"
+        }
+      },
+      "coffee_temperature": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::consumer_products_coffee_maker_option_coffee_temperature::name%]",
+        "state": {
+          "consumer_products_coffee_maker_enum_type_coffee_temperature_88_c": "[%key:component::home_connect::selector::coffee_temperature::options::consumer_products_coffee_maker_enum_type_coffee_temperature_88_c%]",
+          "consumer_products_coffee_maker_enum_type_coffee_temperature_90_c": "[%key:component::home_connect::selector::coffee_temperature::options::consumer_products_coffee_maker_enum_type_coffee_temperature_90_c%]",
+          "consumer_products_coffee_maker_enum_type_coffee_temperature_92_c": "[%key:component::home_connect::selector::coffee_temperature::options::consumer_products_coffee_maker_enum_type_coffee_temperature_92_c%]",
+          "consumer_products_coffee_maker_enum_type_coffee_temperature_94_c": "[%key:component::home_connect::selector::coffee_temperature::options::consumer_products_coffee_maker_enum_type_coffee_temperature_94_c%]",
+          "consumer_products_coffee_maker_enum_type_coffee_temperature_95_c": "[%key:component::home_connect::selector::coffee_temperature::options::consumer_products_coffee_maker_enum_type_coffee_temperature_95_c%]",
+          "consumer_products_coffee_maker_enum_type_coffee_temperature_96_c": "[%key:component::home_connect::selector::coffee_temperature::options::consumer_products_coffee_maker_enum_type_coffee_temperature_96_c%]"
+        }
+      },
+      "bean_container": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::consumer_products_coffee_maker_option_bean_container::name%]",
+        "state": {
+          "consumer_products_coffee_maker_enum_type_bean_container_selection_right": "[%key:component::home_connect::selector::bean_container::options::consumer_products_coffee_maker_enum_type_bean_container_selection_right%]",
+          "consumer_products_coffee_maker_enum_type_bean_container_selection_left": "[%key:component::home_connect::selector::bean_container::options::consumer_products_coffee_maker_enum_type_bean_container_selection_left%]"
+        }
+      },
+      "flow_rate": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::consumer_products_coffee_maker_option_flow_rate::name%]",
+        "state": {
+          "consumer_products_coffee_maker_enum_type_flow_rate_normal": "[%key:component::home_connect::selector::flow_rate::options::consumer_products_coffee_maker_enum_type_flow_rate_normal%]",
+          "consumer_products_coffee_maker_enum_type_flow_rate_intense": "[%key:component::home_connect::selector::flow_rate::options::consumer_products_coffee_maker_enum_type_flow_rate_intense%]",
+          "consumer_products_coffee_maker_enum_type_flow_rate_intense_plus": "[%key:component::home_connect::selector::flow_rate::options::consumer_products_coffee_maker_enum_type_flow_rate_intense_plus%]"
+        }
+      },
+      "coffee_milk_ratio": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::consumer_products_coffee_maker_option_coffee_milk_ratio::name%]",
+        "state": {
+          "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_10_percent": "[%key:component::home_connect::selector::coffee_milk_ratio::options::consumer_products_coffee_maker_enum_type_coffee_milk_ratio_10_percent%]",
+          "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_20_percent": "[%key:component::home_connect::selector::coffee_milk_ratio::options::consumer_products_coffee_maker_enum_type_coffee_milk_ratio_20_percent%]",
+          "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_25_percent": "[%key:component::home_connect::selector::coffee_milk_ratio::options::consumer_products_coffee_maker_enum_type_coffee_milk_ratio_25_percent%]",
+          "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_30_percent": "[%key:component::home_connect::selector::coffee_milk_ratio::options::consumer_products_coffee_maker_enum_type_coffee_milk_ratio_30_percent%]",
+          "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_40_percent": "[%key:component::home_connect::selector::coffee_milk_ratio::options::consumer_products_coffee_maker_enum_type_coffee_milk_ratio_40_percent%]",
+          "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_50_percent": "[%key:component::home_connect::selector::coffee_milk_ratio::options::consumer_products_coffee_maker_enum_type_coffee_milk_ratio_50_percent%]",
+          "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_55_percent": "[%key:component::home_connect::selector::coffee_milk_ratio::options::consumer_products_coffee_maker_enum_type_coffee_milk_ratio_55_percent%]",
+          "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_60_percent": "[%key:component::home_connect::selector::coffee_milk_ratio::options::consumer_products_coffee_maker_enum_type_coffee_milk_ratio_60_percent%]",
+          "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_65_percent": "[%key:component::home_connect::selector::coffee_milk_ratio::options::consumer_products_coffee_maker_enum_type_coffee_milk_ratio_65_percent%]",
+          "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_67_percent": "[%key:component::home_connect::selector::coffee_milk_ratio::options::consumer_products_coffee_maker_enum_type_coffee_milk_ratio_67_percent%]",
+          "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_70_percent": "[%key:component::home_connect::selector::coffee_milk_ratio::options::consumer_products_coffee_maker_enum_type_coffee_milk_ratio_70_percent%]",
+          "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_75_percent": "[%key:component::home_connect::selector::coffee_milk_ratio::options::consumer_products_coffee_maker_enum_type_coffee_milk_ratio_75_percent%]",
+          "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_80_percent": "[%key:component::home_connect::selector::coffee_milk_ratio::options::consumer_products_coffee_maker_enum_type_coffee_milk_ratio_80_percent%]",
+          "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_85_percent": "[%key:component::home_connect::selector::coffee_milk_ratio::options::consumer_products_coffee_maker_enum_type_coffee_milk_ratio_85_percent%]",
+          "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_90_percent": "[%key:component::home_connect::selector::coffee_milk_ratio::options::consumer_products_coffee_maker_enum_type_coffee_milk_ratio_90_percent%]"
+        }
+      },
+      "hot_water_temperature": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::consumer_products_coffee_maker_option_hot_water_temperature::name%]",
+        "state": {
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_white_tea": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_white_tea%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_green_tea": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_green_tea%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_black_tea": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_black_tea%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_50_c": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_50_c%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_55_c": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_55_c%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_60_c": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_60_c%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_65_c": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_65_c%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_70_c": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_70_c%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_75_c": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_75_c%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_80_c": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_80_c%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_85_c": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_85_c%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_90_c": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_90_c%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_95_c": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_95_c%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_97_c": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_97_c%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_122_f": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_122_f%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_131_f": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_131_f%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_140_f": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_140_f%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_149_f": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_149_f%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_158_f": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_158_f%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_167_f": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_167_f%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_176_f": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_176_f%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_185_f": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_185_f%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_194_f": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_194_f%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_203_f": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_203_f%]",
+          "consumer_products_coffee_maker_enum_type_hot_water_temperature_max": "[%key:component::home_connect::selector::hot_water_temperature::options::consumer_products_coffee_maker_enum_type_hot_water_temperature_max%]"
+        }
+      },
+      "drying_target": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::laundry_care_dryer_option_drying_target::name%]",
+        "state": {
+          "laundry_care_dryer_enum_type_drying_target_iron_dry": "[%key:component::home_connect::selector::drying_target::options::laundry_care_dryer_enum_type_drying_target_iron_dry%]",
+          "laundry_care_dryer_enum_type_drying_target_gentle_dry": "[%key:component::home_connect::selector::drying_target::options::laundry_care_dryer_enum_type_drying_target_gentle_dry%]",
+          "laundry_care_dryer_enum_type_drying_target_cupboard_dry": "[%key:component::home_connect::selector::drying_target::options::laundry_care_dryer_enum_type_drying_target_cupboard_dry%]",
+          "laundry_care_dryer_enum_type_drying_target_cupboard_dry_plus": "[%key:component::home_connect::selector::drying_target::options::laundry_care_dryer_enum_type_drying_target_cupboard_dry_plus%]",
+          "laundry_care_dryer_enum_type_drying_target_extra_dry": "[%key:component::home_connect::selector::drying_target::options::laundry_care_dryer_enum_type_drying_target_extra_dry%]"
+        }
+      },
+      "venting_level": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::cooking_hood_option_venting_level::name%]",
+        "state": {
+          "cooking_hood_enum_type_stage_fan_off": "[%key:component::home_connect::selector::venting_level::options::cooking_hood_enum_type_stage_fan_off%]",
+          "cooking_hood_enum_type_stage_fan_stage_01": "[%key:component::home_connect::selector::venting_level::options::cooking_hood_enum_type_stage_fan_stage_01%]",
+          "cooking_hood_enum_type_stage_fan_stage_02": "[%key:component::home_connect::selector::venting_level::options::cooking_hood_enum_type_stage_fan_stage_02%]",
+          "cooking_hood_enum_type_stage_fan_stage_03": "[%key:component::home_connect::selector::venting_level::options::cooking_hood_enum_type_stage_fan_stage_03%]",
+          "cooking_hood_enum_type_stage_fan_stage_04": "[%key:component::home_connect::selector::venting_level::options::cooking_hood_enum_type_stage_fan_stage_04%]",
+          "cooking_hood_enum_type_stage_fan_stage_05": "[%key:component::home_connect::selector::venting_level::options::cooking_hood_enum_type_stage_fan_stage_05%]"
+        }
+      },
+      "intensive_level": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::cooking_hood_option_intensive_level::name%]",
+        "state": {
+          "cooking_hood_enum_type_intensive_stage_intensive_stage_off": "[%key:component::home_connect::selector::intensive_level::options::cooking_hood_enum_type_intensive_stage_intensive_stage_off%]",
+          "cooking_hood_enum_type_intensive_stage_intensive_stage1": "[%key:component::home_connect::selector::intensive_level::options::cooking_hood_enum_type_intensive_stage_intensive_stage1%]",
+          "cooking_hood_enum_type_intensive_stage_intensive_stage2": "[%key:component::home_connect::selector::intensive_level::options::cooking_hood_enum_type_intensive_stage_intensive_stage2%]"
+        }
+      },
+      "warming_level": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::cooking_oven_option_warming_level::name%]",
+        "state": {
+          "cooking_oven_enum_type_warming_level_low": "[%key:component::home_connect::selector::warming_level::options::cooking_oven_enum_type_warming_level_low%]",
+          "cooking_oven_enum_type_warming_level_medium": "[%key:component::home_connect::selector::warming_level::options::cooking_oven_enum_type_warming_level_medium%]",
+          "cooking_oven_enum_type_warming_level_high": "[%key:component::home_connect::selector::warming_level::options::cooking_oven_enum_type_warming_level_high%]"
+        }
+      },
+      "washer_temperature": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::laundry_care_washer_option_temperature::name%]",
+        "state": {
+          "laundry_care_washer_enum_type_temperature_cold": "[%key:component::home_connect::selector::washer_temperature::options::laundry_care_washer_enum_type_temperature_cold%]",
+          "laundry_care_washer_enum_type_temperature_g_c_20": "[%key:component::home_connect::selector::washer_temperature::options::laundry_care_washer_enum_type_temperature_g_c_20%]",
+          "laundry_care_washer_enum_type_temperature_g_c_30": "[%key:component::home_connect::selector::washer_temperature::options::laundry_care_washer_enum_type_temperature_g_c_30%]",
+          "laundry_care_washer_enum_type_temperature_g_c_40": "[%key:component::home_connect::selector::washer_temperature::options::laundry_care_washer_enum_type_temperature_g_c_40%]",
+          "laundry_care_washer_enum_type_temperature_g_c_50": "[%key:component::home_connect::selector::washer_temperature::options::laundry_care_washer_enum_type_temperature_g_c_50%]",
+          "laundry_care_washer_enum_type_temperature_g_c_60": "[%key:component::home_connect::selector::washer_temperature::options::laundry_care_washer_enum_type_temperature_g_c_60%]",
+          "laundry_care_washer_enum_type_temperature_g_c_70": "[%key:component::home_connect::selector::washer_temperature::options::laundry_care_washer_enum_type_temperature_g_c_70%]",
+          "laundry_care_washer_enum_type_temperature_g_c_80": "[%key:component::home_connect::selector::washer_temperature::options::laundry_care_washer_enum_type_temperature_g_c_80%]",
+          "laundry_care_washer_enum_type_temperature_g_c_90": "[%key:component::home_connect::selector::washer_temperature::options::laundry_care_washer_enum_type_temperature_g_c_90%]",
+          "laundry_care_washer_enum_type_temperature_ul_cold": "[%key:component::home_connect::selector::washer_temperature::options::laundry_care_washer_enum_type_temperature_ul_cold%]",
+          "laundry_care_washer_enum_type_temperature_ul_warm": "[%key:component::home_connect::selector::washer_temperature::options::laundry_care_washer_enum_type_temperature_ul_warm%]",
+          "laundry_care_washer_enum_type_temperature_ul_hot": "[%key:component::home_connect::selector::washer_temperature::options::laundry_care_washer_enum_type_temperature_ul_hot%]",
+          "laundry_care_washer_enum_type_temperature_ul_extra_hot": "[%key:component::home_connect::selector::washer_temperature::options::laundry_care_washer_enum_type_temperature_ul_extra_hot%]"
+        }
+      },
+      "spin_speed": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::laundry_care_washer_option_spin_speed::name%]",
+        "state": {
+          "laundry_care_washer_enum_type_spin_speed_off": "[%key:component::home_connect::selector::spin_speed::options::laundry_care_washer_enum_type_spin_speed_off%]",
+          "laundry_care_washer_enum_type_spin_speed_r_p_m_400": "[%key:component::home_connect::selector::spin_speed::options::laundry_care_washer_enum_type_spin_speed_r_p_m_400%]",
+          "laundry_care_washer_enum_type_spin_speed_r_p_m_600": "[%key:component::home_connect::selector::spin_speed::options::laundry_care_washer_enum_type_spin_speed_r_p_m_600%]",
+          "laundry_care_washer_enum_type_spin_speed_r_p_m_700": "[%key:component::home_connect::selector::spin_speed::options::laundry_care_washer_enum_type_spin_speed_r_p_m_700%]",
+          "laundry_care_washer_enum_type_spin_speed_r_p_m_800": "[%key:component::home_connect::selector::spin_speed::options::laundry_care_washer_enum_type_spin_speed_r_p_m_800%]",
+          "laundry_care_washer_enum_type_spin_speed_r_p_m_900": "[%key:component::home_connect::selector::spin_speed::options::laundry_care_washer_enum_type_spin_speed_r_p_m_900%]",
+          "laundry_care_washer_enum_type_spin_speed_r_p_m_1000": "[%key:component::home_connect::selector::spin_speed::options::laundry_care_washer_enum_type_spin_speed_r_p_m_1000%]",
+          "laundry_care_washer_enum_type_spin_speed_r_p_m_1200": "[%key:component::home_connect::selector::spin_speed::options::laundry_care_washer_enum_type_spin_speed_r_p_m_1200%]",
+          "laundry_care_washer_enum_type_spin_speed_r_p_m_1400": "[%key:component::home_connect::selector::spin_speed::options::laundry_care_washer_enum_type_spin_speed_r_p_m_1400%]",
+          "laundry_care_washer_enum_type_spin_speed_r_p_m_1600": "[%key:component::home_connect::selector::spin_speed::options::laundry_care_washer_enum_type_spin_speed_r_p_m_1600%]",
+          "laundry_care_washer_enum_type_spin_speed_ul_off": "[%key:component::home_connect::selector::spin_speed::options::laundry_care_washer_enum_type_spin_speed_ul_off%]",
+          "laundry_care_washer_enum_type_spin_speed_ul_low": "[%key:component::home_connect::selector::spin_speed::options::laundry_care_washer_enum_type_spin_speed_ul_low%]",
+          "laundry_care_washer_enum_type_spin_speed_ul_medium": "[%key:component::home_connect::selector::spin_speed::options::laundry_care_washer_enum_type_spin_speed_ul_medium%]",
+          "laundry_care_washer_enum_type_spin_speed_ul_high": "[%key:component::home_connect::selector::spin_speed::options::laundry_care_washer_enum_type_spin_speed_ul_high%]"
+        }
+      },
+      "vario_perfect": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::laundry_care_washer_option_vario_perfect::name%]",
+        "state": {
+          "laundry_care_common_enum_type_vario_perfect_off": "[%key:component::home_connect::selector::vario_perfect::options::laundry_care_common_enum_type_vario_perfect_off%]",
+          "laundry_care_common_enum_type_vario_perfect_eco_perfect": "[%key:component::home_connect::selector::vario_perfect::options::laundry_care_common_enum_type_vario_perfect_eco_perfect%]",
+          "laundry_care_common_enum_type_vario_perfect_speed_perfect": "[%key:component::home_connect::selector::vario_perfect::options::laundry_care_common_enum_type_vario_perfect_speed_perfect%]"
         }
       }
     },
@@ -625,7 +1532,7 @@
           "inactive": "Inactive",
           "ready": "Ready",
           "delayedstart": "Delayed start",
-          "run": "Run",
+          "run": "Running",
           "pause": "[%key:common::state::paused%]",
           "actionrequired": "Action required",
           "finished": "Finished",
@@ -692,23 +1599,67 @@
           "map3": "Map 3"
         }
       },
-      "freezer_door_alarm": {
-        "name": "Freezer door alarm",
-        "state": {
-          "confirmed": "[%key:component::home_connect::common::confirmed%]",
-          "present": "[%key:component::home_connect::common::present%]"
-        }
+      "oven_current_cavity_temperature": {
+        "name": "Current oven cavity temperature"
       },
-      "refrigerator_door_alarm": {
-        "name": "Refrigerator door alarm",
+      "program_aborted": {
+        "name": "Program aborted",
         "state": {
           "off": "[%key:common::state::off%]",
           "confirmed": "[%key:component::home_connect::common::confirmed%]",
           "present": "[%key:component::home_connect::common::present%]"
         }
       },
-      "freezer_temperature_alarm": {
-        "name": "Freezer temperature alarm",
+      "program_finished": {
+        "name": "Program finished",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "alarm_clock_elapsed": {
+        "name": "Alarm clock elapsed",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "preheat_finished": {
+        "name": "Pre-heat finished",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "regular_preheat_finished": {
+        "name": "Regular pre-heat finished",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "drying_process_finished": {
+        "name": "Drying process finished",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "salt_nearly_empty": {
+        "name": "Salt nearly empty",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "rinse_aid_nearly_empty": {
+        "name": "Rinse aid nearly empty",
         "state": {
           "off": "[%key:common::state::off%]",
           "confirmed": "[%key:component::home_connect::common::confirmed%]",
@@ -739,16 +1690,216 @@
           "present": "[%key:component::home_connect::common::present%]"
         }
       },
-      "salt_nearly_empty": {
-        "name": "Salt nearly empty",
+      "keep_milk_tank_cool": {
+        "name": "Keep milk tank cool",
         "state": {
           "off": "[%key:common::state::off%]",
           "confirmed": "[%key:component::home_connect::common::confirmed%]",
           "present": "[%key:component::home_connect::common::present%]"
         }
       },
-      "rinse_aid_nearly_empty": {
-        "name": "Rinse aid nearly empty",
+      "descaling_in_20_cups": {
+        "name": "Descaling in 20 cups",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "descaling_in_15_cups": {
+        "name": "Descaling in 15 cups",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "descaling_in_10_cups": {
+        "name": "Descaling in 10 cups",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "descaling_in_5_cups": {
+        "name": "Descaling in 5 cups",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "device_should_be_descaled": {
+        "name": "Device should be descaled",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "device_descaling_overdue": {
+        "name": "Device descaling overdue",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "device_descaling_blockage": {
+        "name": "Device descaling blockage",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "device_should_be_cleaned": {
+        "name": "Device should be cleaned",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "device_cleaning_overdue": {
+        "name": "Device cleaning overdue",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "calc_n_clean_in20cups": {
+        "name": "Calc'N'Clean in 20 cups",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "calc_n_clean_in15cups": {
+        "name": "Calc'N'Clean in 15 cups",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "calc_n_clean_in10cups": {
+        "name": "Calc'N'Clean in 10 cups",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "calc_n_clean_in5cups": {
+        "name": "Calc'N'Clean in 5 cups",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "device_should_be_calc_n_cleaned": {
+        "name": "Device should be Calc'N'Cleaned",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "device_calc_n_clean_overdue": {
+        "name": "Device Calc'N'Clean overdue",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "device_calc_n_clean_blockage": {
+        "name": "Device Calc'N'Clean blockage",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "freezer_door_alarm": {
+        "name": "Freezer door alarm",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "refrigerator_door_alarm": {
+        "name": "Refrigerator door alarm",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "freezer_temperature_alarm": {
+        "name": "Freezer temperature alarm",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "empty_dust_box_and_clean_filter": {
+        "name": "Empty dust box and clean filter",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "robot_is_stuck": {
+        "name": "Robot is stuck",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "docking_station_not_found": {
+        "name": "Docking station not found",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "poor_i_dos_1_fill_level": {
+        "name": "Poor i-Dos 1 fill level",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "poor_i_dos_2_fill_level": {
+        "name": "Poor i-Dos 2 fill level",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "grease_filter_max_saturation_nearly_reached": {
+        "name": "Grease filter max saturation nearly reached",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "confirmed": "[%key:component::home_connect::common::confirmed%]",
+          "present": "[%key:component::home_connect::common::present%]"
+        }
+      },
+      "grease_filter_max_saturation_reached": {
+        "name": "Grease filter max saturation reached",
         "state": {
           "off": "[%key:common::state::off%]",
           "confirmed": "[%key:component::home_connect::common::confirmed%]",
@@ -796,6 +1947,45 @@
       },
       "door_assistant_freezer": {
         "name": "Freezer door assistant"
+      },
+      "multiple_beverages": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::consumer_products_coffee_maker_option_multiple_beverages::name%]"
+      },
+      "intensiv_zone": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::dishcare_dishwasher_option_intensiv_zone::name%]"
+      },
+      "brilliance_dry": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::dishcare_dishwasher_option_brilliance_dry::name%]"
+      },
+      "vario_speed_plus": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::dishcare_dishwasher_option_vario_speed_plus::name%]"
+      },
+      "silence_on_demand": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::dishcare_dishwasher_option_silence_on_demand::name%]"
+      },
+      "half_load": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::dishcare_dishwasher_option_half_load::name%]"
+      },
+      "extra_dry": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::dishcare_dishwasher_option_extra_dry::name%]"
+      },
+      "hygiene_plus": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::dishcare_dishwasher_option_hygiene_plus::name%]"
+      },
+      "eco_dry": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::dishcare_dishwasher_option_eco_dry::name%]"
+      },
+      "zeolite_dry": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::dishcare_dishwasher_option_zeolite_dry::name%]"
+      },
+      "fast_pre_heat": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::cooking_oven_option_fast_pre_heat::name%]"
+      },
+      "i_dos1_active": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::laundry_care_washer_option_i_dos1_active::name%]"
+      },
+      "i_dos2_active": {
+        "name": "[%key:component::home_connect::services::set_program_and_options::fields::laundry_care_washer_option_i_dos2_active::name%]"
       }
     },
     "time": {
diff --git a/homeassistant/components/home_connect/switch.py b/homeassistant/components/home_connect/switch.py
index 1bd02e03eb1..05f0ed2ddc3 100644
--- a/homeassistant/components/home_connect/switch.py
+++ b/homeassistant/components/home_connect/switch.py
@@ -1,10 +1,11 @@
 """Provides a switch for Home Connect."""
 
-import contextlib
 import logging
-from typing import Any
+from typing import Any, cast
 
-from homeconnect.api import HomeConnectError
+from aiohomeconnect.model import EventKey, OptionKey, ProgramKey, SettingKey
+from aiohomeconnect.model.error import HomeConnectError
+from aiohomeconnect.model.program import EnumerateProgram
 
 from homeassistant.components.automation import automations_with_entity
 from homeassistant.components.script import scripts_with_entity
@@ -12,127 +13,190 @@ from homeassistant.components.switch import SwitchEntity, SwitchEntityDescriptio
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.issue_registry import (
     IssueSeverity,
     async_create_issue,
     async_delete_issue,
 )
+from homeassistant.helpers.typing import UNDEFINED, UndefinedType
 
-from . import HomeConnectConfigEntry, get_dict_from_home_connect_error
-from .const import (
-    APPLIANCES_WITH_PROGRAMS,
-    ATTR_ALLOWED_VALUES,
-    ATTR_CONSTRAINTS,
-    ATTR_VALUE,
-    BSH_ACTIVE_PROGRAM,
-    BSH_CHILD_LOCK_STATE,
-    BSH_POWER_OFF,
-    BSH_POWER_ON,
-    BSH_POWER_STANDBY,
-    BSH_POWER_STATE,
-    DOMAIN,
-    REFRIGERATION_DISPENSER,
-    REFRIGERATION_SUPERMODEFREEZER,
-    REFRIGERATION_SUPERMODEREFRIGERATOR,
-    SVE_TRANSLATION_PLACEHOLDER_APPLIANCE_NAME,
-    SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID,
-    SVE_TRANSLATION_PLACEHOLDER_KEY,
-    SVE_TRANSLATION_PLACEHOLDER_VALUE,
+from .common import setup_home_connect_entry
+from .const import BSH_POWER_OFF, BSH_POWER_ON, BSH_POWER_STANDBY, DOMAIN
+from .coordinator import (
+    HomeConnectApplianceData,
+    HomeConnectConfigEntry,
+    HomeConnectCoordinator,
 )
-from .entity import HomeConnectDevice, HomeConnectEntity
+from .entity import HomeConnectEntity, HomeConnectOptionEntity
+from .utils import get_dict_from_home_connect_error
 
 _LOGGER = logging.getLogger(__name__)
 
+PARALLEL_UPDATES = 1
 
 SWITCHES = (
     SwitchEntityDescription(
-        key=BSH_CHILD_LOCK_STATE,
+        key=SettingKey.BSH_COMMON_CHILD_LOCK,
         translation_key="child_lock",
     ),
     SwitchEntityDescription(
-        key="ConsumerProducts.CoffeeMaker.Setting.CupWarmer",
+        key=SettingKey.CONSUMER_PRODUCTS_COFFEE_MAKER_CUP_WARMER,
         translation_key="cup_warmer",
     ),
     SwitchEntityDescription(
-        key=REFRIGERATION_SUPERMODEFREEZER,
+        key=SettingKey.REFRIGERATION_FRIDGE_FREEZER_SUPER_MODE_FREEZER,
         translation_key="freezer_super_mode",
     ),
     SwitchEntityDescription(
-        key=REFRIGERATION_SUPERMODEREFRIGERATOR,
+        key=SettingKey.REFRIGERATION_FRIDGE_FREEZER_SUPER_MODE_REFRIGERATOR,
         translation_key="refrigerator_super_mode",
     ),
     SwitchEntityDescription(
-        key="Refrigeration.Common.Setting.EcoMode",
+        key=SettingKey.REFRIGERATION_COMMON_ECO_MODE,
         translation_key="eco_mode",
     ),
     SwitchEntityDescription(
-        key="Cooking.Oven.Setting.SabbathMode",
+        key=SettingKey.COOKING_OVEN_SABBATH_MODE,
         translation_key="sabbath_mode",
     ),
     SwitchEntityDescription(
-        key="Refrigeration.Common.Setting.SabbathMode",
+        key=SettingKey.REFRIGERATION_COMMON_SABBATH_MODE,
         translation_key="sabbath_mode",
     ),
     SwitchEntityDescription(
-        key="Refrigeration.Common.Setting.VacationMode",
+        key=SettingKey.REFRIGERATION_COMMON_VACATION_MODE,
         translation_key="vacation_mode",
     ),
     SwitchEntityDescription(
-        key="Refrigeration.Common.Setting.FreshMode",
+        key=SettingKey.REFRIGERATION_COMMON_FRESH_MODE,
         translation_key="fresh_mode",
     ),
     SwitchEntityDescription(
-        key=REFRIGERATION_DISPENSER,
+        key=SettingKey.REFRIGERATION_COMMON_DISPENSER_ENABLED,
         translation_key="dispenser_enabled",
     ),
     SwitchEntityDescription(
-        key="Refrigeration.Common.Setting.Door.AssistantFridge",
+        key=SettingKey.REFRIGERATION_COMMON_DOOR_ASSISTANT_FRIDGE,
         translation_key="door_assistant_fridge",
     ),
     SwitchEntityDescription(
-        key="Refrigeration.Common.Setting.Door.AssistantFreezer",
+        key=SettingKey.REFRIGERATION_COMMON_DOOR_ASSISTANT_FREEZER,
         translation_key="door_assistant_freezer",
     ),
 )
 
 
 POWER_SWITCH_DESCRIPTION = SwitchEntityDescription(
-    key=BSH_POWER_STATE,
+    key=SettingKey.BSH_COMMON_POWER_STATE,
     translation_key="power",
 )
 
+SWITCH_OPTIONS = (
+    SwitchEntityDescription(
+        key=OptionKey.CONSUMER_PRODUCTS_COFFEE_MAKER_MULTIPLE_BEVERAGES,
+        translation_key="multiple_beverages",
+    ),
+    SwitchEntityDescription(
+        key=OptionKey.DISHCARE_DISHWASHER_INTENSIV_ZONE,
+        translation_key="intensiv_zone",
+    ),
+    SwitchEntityDescription(
+        key=OptionKey.DISHCARE_DISHWASHER_BRILLIANCE_DRY,
+        translation_key="brilliance_dry",
+    ),
+    SwitchEntityDescription(
+        key=OptionKey.DISHCARE_DISHWASHER_VARIO_SPEED_PLUS,
+        translation_key="vario_speed_plus",
+    ),
+    SwitchEntityDescription(
+        key=OptionKey.DISHCARE_DISHWASHER_SILENCE_ON_DEMAND,
+        translation_key="silence_on_demand",
+    ),
+    SwitchEntityDescription(
+        key=OptionKey.DISHCARE_DISHWASHER_HALF_LOAD,
+        translation_key="half_load",
+    ),
+    SwitchEntityDescription(
+        key=OptionKey.DISHCARE_DISHWASHER_EXTRA_DRY,
+        translation_key="extra_dry",
+    ),
+    SwitchEntityDescription(
+        key=OptionKey.DISHCARE_DISHWASHER_HYGIENE_PLUS,
+        translation_key="hygiene_plus",
+    ),
+    SwitchEntityDescription(
+        key=OptionKey.DISHCARE_DISHWASHER_ECO_DRY,
+        translation_key="eco_dry",
+    ),
+    SwitchEntityDescription(
+        key=OptionKey.DISHCARE_DISHWASHER_ZEOLITE_DRY,
+        translation_key="zeolite_dry",
+    ),
+    SwitchEntityDescription(
+        key=OptionKey.COOKING_OVEN_FAST_PRE_HEAT,
+        translation_key="fast_pre_heat",
+    ),
+    SwitchEntityDescription(
+        key=OptionKey.LAUNDRY_CARE_WASHER_I_DOS_1_ACTIVE,
+        translation_key="i_dos1_active",
+    ),
+    SwitchEntityDescription(
+        key=OptionKey.LAUNDRY_CARE_WASHER_I_DOS_2_ACTIVE,
+        translation_key="i_dos2_active",
+    ),
+)
+
+
+def _get_entities_for_appliance(
+    entry: HomeConnectConfigEntry,
+    appliance: HomeConnectApplianceData,
+) -> list[HomeConnectEntity]:
+    """Get a list of entities."""
+    entities: list[HomeConnectEntity] = []
+    entities.extend(
+        HomeConnectProgramSwitch(entry.runtime_data, appliance, program)
+        for program in appliance.programs
+        if program.key != ProgramKey.UNKNOWN
+    )
+    if SettingKey.BSH_COMMON_POWER_STATE in appliance.settings:
+        entities.append(
+            HomeConnectPowerSwitch(
+                entry.runtime_data, appliance, POWER_SWITCH_DESCRIPTION
+            )
+        )
+    entities.extend(
+        HomeConnectSwitch(entry.runtime_data, appliance, description)
+        for description in SWITCHES
+        if description.key in appliance.settings
+    )
+    return entities
+
+
+def _get_option_entities_for_appliance(
+    entry: HomeConnectConfigEntry,
+    appliance: HomeConnectApplianceData,
+) -> list[HomeConnectOptionEntity]:
+    """Get a list of currently available option entities."""
+    return [
+        HomeConnectSwitchOptionEntity(entry.runtime_data, appliance, description)
+        for description in SWITCH_OPTIONS
+        if description.key in appliance.options
+    ]
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: HomeConnectConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Home Connect switch."""
-
-    def get_entities() -> list[SwitchEntity]:
-        """Get a list of entities."""
-        entities: list[SwitchEntity] = []
-        for device in entry.runtime_data.devices:
-            if device.appliance.type in APPLIANCES_WITH_PROGRAMS:
-                with contextlib.suppress(HomeConnectError):
-                    programs = device.appliance.get_programs_available()
-                    if programs:
-                        entities.extend(
-                            HomeConnectProgramSwitch(device, program)
-                            for program in programs
-                        )
-            if BSH_POWER_STATE in device.appliance.status:
-                entities.append(HomeConnectPowerSwitch(device))
-            entities.extend(
-                HomeConnectSwitch(device, description)
-                for description in SWITCHES
-                if description.key in device.appliance.status
-            )
-
-        return entities
-
-    async_add_entities(await hass.async_add_executor_job(get_entities), True)
+    setup_home_connect_entry(
+        entry,
+        _get_entities_for_appliance,
+        async_add_entities,
+        _get_option_entities_for_appliance,
+    )
 
 
 class HomeConnectSwitch(HomeConnectEntity, SwitchEntity):
@@ -140,11 +204,11 @@ class HomeConnectSwitch(HomeConnectEntity, SwitchEntity):
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn on setting."""
-
-        _LOGGER.debug("Turning on %s", self.entity_description.key)
         try:
-            await self.hass.async_add_executor_job(
-                self.device.appliance.set_setting, self.entity_description.key, True
+            await self.coordinator.client.set_setting(
+                self.appliance.info.ha_id,
+                setting_key=SettingKey(self.bsh_key),
+                value=True,
             )
         except HomeConnectError as err:
             self._attr_available = False
@@ -153,67 +217,63 @@ class HomeConnectSwitch(HomeConnectEntity, SwitchEntity):
                 translation_key="turn_on",
                 translation_placeholders={
                     **get_dict_from_home_connect_error(err),
-                    SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
-                    SVE_TRANSLATION_PLACEHOLDER_KEY: self.bsh_key,
+                    "entity_id": self.entity_id,
+                    "key": self.bsh_key,
                 },
             ) from err
 
-        self._attr_available = True
-        self.async_entity_update()
-
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn off setting."""
-
-        _LOGGER.debug("Turning off %s", self.entity_description.key)
         try:
-            await self.hass.async_add_executor_job(
-                self.device.appliance.set_setting, self.entity_description.key, False
+            await self.coordinator.client.set_setting(
+                self.appliance.info.ha_id,
+                setting_key=SettingKey(self.bsh_key),
+                value=False,
             )
         except HomeConnectError as err:
-            _LOGGER.error("Error while trying to turn off: %s", err)
             self._attr_available = False
             raise HomeAssistantError(
                 translation_domain=DOMAIN,
                 translation_key="turn_off",
                 translation_placeholders={
                     **get_dict_from_home_connect_error(err),
-                    SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
-                    SVE_TRANSLATION_PLACEHOLDER_KEY: self.bsh_key,
+                    "entity_id": self.entity_id,
+                    "key": self.bsh_key,
                 },
             ) from err
 
-        self._attr_available = True
-        self.async_entity_update()
-
-    async def async_update(self) -> None:
+    def update_native_value(self) -> None:
         """Update the switch's status."""
-
-        self._attr_is_on = self.device.appliance.status.get(
-            self.entity_description.key, {}
-        ).get(ATTR_VALUE)
-        self._attr_available = True
-        _LOGGER.debug(
-            "Updated %s, new state: %s",
-            self.entity_description.key,
-            self._attr_is_on,
-        )
+        self._attr_is_on = self.appliance.settings[SettingKey(self.bsh_key)].value
 
 
 class HomeConnectProgramSwitch(HomeConnectEntity, SwitchEntity):
     """Switch class for Home Connect."""
 
-    def __init__(self, device: HomeConnectDevice, program_name: str) -> None:
+    def __init__(
+        self,
+        coordinator: HomeConnectCoordinator,
+        appliance: HomeConnectApplianceData,
+        program: EnumerateProgram,
+    ) -> None:
         """Initialize the entity."""
-        desc = " ".join(["Program", program_name.split(".")[-1]])
-        if device.appliance.type == "WasherDryer":
+        desc = " ".join(["Program", program.key.split(".")[-1]])
+        if appliance.info.type == "WasherDryer":
             desc = " ".join(
-                ["Program", program_name.split(".")[-3], program_name.split(".")[-1]]
+                ["Program", program.key.split(".")[-3], program.key.split(".")[-1]]
             )
-        super().__init__(device, SwitchEntityDescription(key=program_name))
-        self._attr_name = f"{device.appliance.name} {desc}"
-        self._attr_unique_id = f"{device.appliance.haId}-{desc}"
+        self.program = program
+        super().__init__(
+            coordinator,
+            appliance,
+            SwitchEntityDescription(
+                key=EventKey.BSH_COMMON_ROOT_ACTIVE_PROGRAM,
+                entity_registry_enabled_default=False,
+            ),
+        )
+        self._attr_name = f"{appliance.info.name} {desc}"
+        self._attr_unique_id = f"{appliance.info.ha_id}-{desc}"
         self._attr_has_entity_name = False
-        self.program_name = program_name
 
     async def async_added_to_hass(self) -> None:
         """Call when entity is added to hass."""
@@ -247,11 +307,12 @@ class HomeConnectProgramSwitch(HomeConnectEntity, SwitchEntity):
         async_create_issue(
             self.hass,
             DOMAIN,
-            f"deprecated_program_switch_{self.entity_id}",
+            f"deprecated_program_switch_in_automations_scripts_{self.entity_id}",
             breaks_in_ha_version="2025.6.0",
-            is_fixable=False,
+            is_fixable=True,
+            is_persistent=True,
             severity=IssueSeverity.WARNING,
-            translation_key="deprecated_program_switch",
+            translation_key="deprecated_program_switch_in_automations_scripts",
             translation_placeholders={
                 "entity_id": self.entity_id,
                 "items": "\n".join(items_list),
@@ -260,16 +321,37 @@ class HomeConnectProgramSwitch(HomeConnectEntity, SwitchEntity):
 
     async def async_will_remove_from_hass(self) -> None:
         """Call when entity will be removed from hass."""
+        async_delete_issue(
+            self.hass,
+            DOMAIN,
+            f"deprecated_program_switch_in_automations_scripts_{self.entity_id}",
+        )
         async_delete_issue(
             self.hass, DOMAIN, f"deprecated_program_switch_{self.entity_id}"
         )
 
+    def create_action_handler_issue(self) -> None:
+        """Create deprecation issue."""
+        async_create_issue(
+            self.hass,
+            DOMAIN,
+            f"deprecated_program_switch_{self.entity_id}",
+            breaks_in_ha_version="2025.6.0",
+            is_fixable=True,
+            is_persistent=True,
+            severity=IssueSeverity.WARNING,
+            translation_key="deprecated_program_switch",
+            translation_placeholders={
+                "entity_id": self.entity_id,
+            },
+        )
+
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Start the program."""
-        _LOGGER.debug("Tried to turn on program %s", self.program_name)
+        self.create_action_handler_issue()
         try:
-            await self.hass.async_add_executor_job(
-                self.device.appliance.start_program, self.program_name
+            await self.coordinator.client.start_program(
+                self.appliance.info.ha_id, program_key=self.program.key
             )
         except HomeConnectError as err:
             raise HomeAssistantError(
@@ -277,16 +359,15 @@ class HomeConnectProgramSwitch(HomeConnectEntity, SwitchEntity):
                 translation_key="start_program",
                 translation_placeholders={
                     **get_dict_from_home_connect_error(err),
-                    "program": self.program_name,
+                    "program": self.program.key,
                 },
             ) from err
-        self.async_entity_update()
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Stop the program."""
-        _LOGGER.debug("Tried to stop program %s", self.program_name)
+        self.create_action_handler_issue()
         try:
-            await self.hass.async_add_executor_job(self.device.appliance.stop_program)
+            await self.coordinator.client.stop_program(self.appliance.info.ha_id)
         except HomeConnectError as err:
             raise HomeAssistantError(
                 translation_domain=DOMAIN,
@@ -295,48 +376,25 @@ class HomeConnectProgramSwitch(HomeConnectEntity, SwitchEntity):
                     **get_dict_from_home_connect_error(err),
                 },
             ) from err
-        self.async_entity_update()
 
-    async def async_update(self) -> None:
-        """Update the switch's status."""
-        state = self.device.appliance.status.get(BSH_ACTIVE_PROGRAM, {})
-        if state.get(ATTR_VALUE) == self.program_name:
-            self._attr_is_on = True
-        else:
-            self._attr_is_on = False
-        _LOGGER.debug("Updated, new state: %s", self._attr_is_on)
+    def update_native_value(self) -> None:
+        """Update the switch's status based on if the program related to this entity is currently active."""
+        event = self.appliance.events.get(EventKey.BSH_COMMON_ROOT_ACTIVE_PROGRAM)
+        self._attr_is_on = bool(event and event.value == self.program.key)
 
 
 class HomeConnectPowerSwitch(HomeConnectEntity, SwitchEntity):
     """Power switch class for Home Connect."""
 
-    power_off_state: str | None
-
-    def __init__(self, device: HomeConnectDevice) -> None:
-        """Initialize the entity."""
-        super().__init__(
-            device,
-            POWER_SWITCH_DESCRIPTION,
-        )
-        if (
-            power_state := device.appliance.status.get(BSH_POWER_STATE, {}).get(
-                ATTR_VALUE
-            )
-        ) and power_state in [BSH_POWER_OFF, BSH_POWER_STANDBY]:
-            self.power_off_state = power_state
-
-    async def async_added_to_hass(self) -> None:
-        """Add the entity to the hass instance."""
-        await super().async_added_to_hass()
-        if not hasattr(self, "power_off_state"):
-            await self.async_fetch_power_off_state()
+    power_off_state: str | None | UndefinedType = UNDEFINED
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Switch the device on."""
-        _LOGGER.debug("Tried to switch on %s", self.name)
         try:
-            await self.hass.async_add_executor_job(
-                self.device.appliance.set_setting, BSH_POWER_STATE, BSH_POWER_ON
+            await self.coordinator.client.set_setting(
+                self.appliance.info.ha_id,
+                setting_key=SettingKey.BSH_COMMON_POWER_STATE,
+                value=BSH_POWER_ON,
             )
         except HomeConnectError as err:
             self._attr_is_on = False
@@ -345,36 +403,34 @@ class HomeConnectPowerSwitch(HomeConnectEntity, SwitchEntity):
                 translation_key="power_on",
                 translation_placeholders={
                     **get_dict_from_home_connect_error(err),
-                    SVE_TRANSLATION_PLACEHOLDER_APPLIANCE_NAME: self.device.appliance.name,
+                    "appliance_name": self.appliance.info.name,
                 },
             ) from err
-        self.async_entity_update()
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Switch the device off."""
-        if not hasattr(self, "power_off_state"):
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="unable_to_retrieve_turn_off",
-                translation_placeholders={
-                    SVE_TRANSLATION_PLACEHOLDER_APPLIANCE_NAME: self.device.appliance.name
-                },
-            )
+        if self.power_off_state is UNDEFINED:
+            await self.async_fetch_power_off_state()
+            if self.power_off_state is UNDEFINED:
+                raise HomeAssistantError(
+                    translation_domain=DOMAIN,
+                    translation_key="unable_to_retrieve_turn_off",
+                    translation_placeholders={
+                        "appliance_name": self.appliance.info.name
+                    },
+                )
 
         if self.power_off_state is None:
             raise HomeAssistantError(
                 translation_domain=DOMAIN,
                 translation_key="turn_off_not_supported",
-                translation_placeholders={
-                    SVE_TRANSLATION_PLACEHOLDER_APPLIANCE_NAME: self.device.appliance.name
-                },
+                translation_placeholders={"appliance_name": self.appliance.info.name},
             )
-        _LOGGER.debug("tried to switch off %s", self.name)
         try:
-            await self.hass.async_add_executor_job(
-                self.device.appliance.set_setting,
-                BSH_POWER_STATE,
-                self.power_off_state,
+            await self.coordinator.client.set_setting(
+                self.appliance.info.ha_id,
+                setting_key=SettingKey.BSH_COMMON_POWER_STATE,
+                value=self.power_off_state,
             )
         except HomeConnectError as err:
             self._attr_is_on = True
@@ -383,46 +439,67 @@ class HomeConnectPowerSwitch(HomeConnectEntity, SwitchEntity):
                 translation_key="power_off",
                 translation_placeholders={
                     **get_dict_from_home_connect_error(err),
-                    SVE_TRANSLATION_PLACEHOLDER_APPLIANCE_NAME: self.device.appliance.name,
-                    SVE_TRANSLATION_PLACEHOLDER_VALUE: self.power_off_state,
+                    "appliance_name": self.appliance.info.name,
+                    "value": self.power_off_state,
                 },
             ) from err
-        self.async_entity_update()
 
-    async def async_update(self) -> None:
-        """Update the switch's status."""
-        if (
-            self.device.appliance.status.get(BSH_POWER_STATE, {}).get(ATTR_VALUE)
-            == BSH_POWER_ON
-        ):
+    def update_native_value(self) -> None:
+        """Set the value of the entity."""
+        power_state = self.appliance.settings[SettingKey.BSH_COMMON_POWER_STATE]
+        value = cast(str, power_state.value)
+        if value == BSH_POWER_ON:
             self._attr_is_on = True
         elif (
-            hasattr(self, "power_off_state")
-            and self.device.appliance.status.get(BSH_POWER_STATE, {}).get(ATTR_VALUE)
-            == self.power_off_state
+            isinstance(self.power_off_state, str)
+            and self.power_off_state
+            and value == self.power_off_state
         ):
             self._attr_is_on = False
+        elif self.power_off_state is UNDEFINED and value in [
+            BSH_POWER_OFF,
+            BSH_POWER_STANDBY,
+        ]:
+            self.power_off_state = value
+            self._attr_is_on = False
         else:
             self._attr_is_on = None
-        _LOGGER.debug("Updated, new state: %s", self._attr_is_on)
 
     async def async_fetch_power_off_state(self) -> None:
         """Fetch the power off state."""
-        try:
-            data = await self.hass.async_add_executor_job(
-                self.device.appliance.get, f"/settings/{self.bsh_key}"
-            )
-        except HomeConnectError as err:
-            _LOGGER.error("An error occurred: %s", err)
-            return
-        if not data or not (
-            allowed_values := data.get(ATTR_CONSTRAINTS, {}).get(ATTR_ALLOWED_VALUES)
-        ):
+        data = self.appliance.settings[SettingKey.BSH_COMMON_POWER_STATE]
+
+        if not data.constraints or not data.constraints.allowed_values:
+            try:
+                data = await self.coordinator.client.get_setting(
+                    self.appliance.info.ha_id,
+                    setting_key=SettingKey.BSH_COMMON_POWER_STATE,
+                )
+            except HomeConnectError as err:
+                _LOGGER.error("An error occurred fetching the power settings: %s", err)
+                return
+        if not data.constraints or not data.constraints.allowed_values:
             return
 
-        if BSH_POWER_OFF in allowed_values:
+        if BSH_POWER_OFF in data.constraints.allowed_values:
             self.power_off_state = BSH_POWER_OFF
-        elif BSH_POWER_STANDBY in allowed_values:
+        elif BSH_POWER_STANDBY in data.constraints.allowed_values:
             self.power_off_state = BSH_POWER_STANDBY
         else:
             self.power_off_state = None
+
+
+class HomeConnectSwitchOptionEntity(HomeConnectOptionEntity, SwitchEntity):
+    """Switch option class for Home Connect."""
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn on the option."""
+        await self.async_set_option(True)
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn off the option."""
+        await self.async_set_option(False)
+
+    def update_native_value(self) -> None:
+        """Set the value of the entity."""
+        self._attr_is_on = cast(bool | None, self.option_value)
diff --git a/homeassistant/components/home_connect/time.py b/homeassistant/components/home_connect/time.py
index c1f125cd2f7..adf26d2d973 100644
--- a/homeassistant/components/home_connect/time.py
+++ b/homeassistant/components/home_connect/time.py
@@ -1,54 +1,64 @@
-"""Provides time enties for Home Connect."""
+"""Provides time entities for Home Connect."""
 
 from datetime import time
-import logging
+from typing import cast
 
-from homeconnect.api import HomeConnectError
+from aiohomeconnect.model import SettingKey
+from aiohomeconnect.model.error import HomeConnectError
 
+from homeassistant.components.automation import automations_with_entity
+from homeassistant.components.script import scripts_with_entity
 from homeassistant.components.time import TimeEntity, TimeEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import HomeConnectConfigEntry, get_dict_from_home_connect_error
-from .const import (
-    ATTR_VALUE,
-    DOMAIN,
-    SVE_TRANSLATION_KEY_SET_SETTING,
-    SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID,
-    SVE_TRANSLATION_PLACEHOLDER_KEY,
-    SVE_TRANSLATION_PLACEHOLDER_VALUE,
+from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.issue_registry import (
+    IssueSeverity,
+    async_create_issue,
+    async_delete_issue,
 )
+
+from .common import setup_home_connect_entry
+from .const import DOMAIN
+from .coordinator import HomeConnectApplianceData, HomeConnectConfigEntry
 from .entity import HomeConnectEntity
+from .utils import get_dict_from_home_connect_error
 
-_LOGGER = logging.getLogger(__name__)
-
+PARALLEL_UPDATES = 1
 
 TIME_ENTITIES = (
     TimeEntityDescription(
-        key="BSH.Common.Setting.AlarmClock",
+        key=SettingKey.BSH_COMMON_ALARM_CLOCK,
         translation_key="alarm_clock",
+        entity_registry_enabled_default=False,
     ),
 )
 
 
+def _get_entities_for_appliance(
+    entry: HomeConnectConfigEntry,
+    appliance: HomeConnectApplianceData,
+) -> list[HomeConnectEntity]:
+    """Get a list of entities."""
+    return [
+        HomeConnectTimeEntity(entry.runtime_data, appliance, description)
+        for description in TIME_ENTITIES
+        if description.key in appliance.settings
+    ]
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: HomeConnectConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Home Connect switch."""
-
-    def get_entities() -> list[HomeConnectTimeEntity]:
-        """Get a list of entities."""
-        return [
-            HomeConnectTimeEntity(device, description)
-            for description in TIME_ENTITIES
-            for device in entry.runtime_data.devices
-            if description.key in device.appliance.status
-        ]
-
-    async_add_entities(await hass.async_add_executor_job(get_entities), True)
+    setup_home_connect_entry(
+        entry,
+        _get_entities_for_appliance,
+        async_add_entities,
+    )
 
 
 def seconds_to_time(seconds: int) -> time:
@@ -66,42 +76,97 @@ def time_to_seconds(t: time) -> int:
 class HomeConnectTimeEntity(HomeConnectEntity, TimeEntity):
     """Time setting class for Home Connect."""
 
+    async def async_added_to_hass(self) -> None:
+        """Call when entity is added to hass."""
+        await super().async_added_to_hass()
+        if self.bsh_key == SettingKey.BSH_COMMON_ALARM_CLOCK:
+            automations = automations_with_entity(self.hass, self.entity_id)
+            scripts = scripts_with_entity(self.hass, self.entity_id)
+            items = automations + scripts
+            if not items:
+                return
+
+            entity_reg: er.EntityRegistry = er.async_get(self.hass)
+            entity_automations = [
+                automation_entity
+                for automation_id in automations
+                if (automation_entity := entity_reg.async_get(automation_id))
+            ]
+            entity_scripts = [
+                script_entity
+                for script_id in scripts
+                if (script_entity := entity_reg.async_get(script_id))
+            ]
+
+            items_list = [
+                f"- [{item.original_name}](/config/automation/edit/{item.unique_id})"
+                for item in entity_automations
+            ] + [
+                f"- [{item.original_name}](/config/script/edit/{item.unique_id})"
+                for item in entity_scripts
+            ]
+
+            async_create_issue(
+                self.hass,
+                DOMAIN,
+                f"deprecated_time_alarm_clock_in_automations_scripts_{self.entity_id}",
+                breaks_in_ha_version="2025.10.0",
+                is_fixable=True,
+                is_persistent=True,
+                severity=IssueSeverity.WARNING,
+                translation_key="deprecated_time_alarm_clock",
+                translation_placeholders={
+                    "entity_id": self.entity_id,
+                    "items": "\n".join(items_list),
+                },
+            )
+
+    async def async_will_remove_from_hass(self) -> None:
+        """Call when entity will be removed from hass."""
+        if self.bsh_key == SettingKey.BSH_COMMON_ALARM_CLOCK:
+            async_delete_issue(
+                self.hass,
+                DOMAIN,
+                f"deprecated_time_alarm_clock_in_automations_scripts_{self.entity_id}",
+            )
+            async_delete_issue(
+                self.hass, DOMAIN, f"deprecated_time_alarm_clock_{self.entity_id}"
+            )
+
     async def async_set_value(self, value: time) -> None:
         """Set the native value of the entity."""
-        _LOGGER.debug(
-            "Tried to set value %s to %s for %s",
-            value,
-            self.bsh_key,
-            self.entity_id,
+        async_create_issue(
+            self.hass,
+            DOMAIN,
+            f"deprecated_time_alarm_clock_{self.entity_id}",
+            breaks_in_ha_version="2025.10.0",
+            is_fixable=True,
+            is_persistent=True,
+            severity=IssueSeverity.WARNING,
+            translation_key="deprecated_time_alarm_clock",
+            translation_placeholders={
+                "entity_id": self.entity_id,
+            },
         )
         try:
-            await self.hass.async_add_executor_job(
-                self.device.appliance.set_setting,
-                self.bsh_key,
-                time_to_seconds(value),
+            await self.coordinator.client.set_setting(
+                self.appliance.info.ha_id,
+                setting_key=SettingKey(self.bsh_key),
+                value=time_to_seconds(value),
             )
         except HomeConnectError as err:
             raise HomeAssistantError(
                 translation_domain=DOMAIN,
-                translation_key=SVE_TRANSLATION_KEY_SET_SETTING,
+                translation_key="set_setting_entity",
                 translation_placeholders={
                     **get_dict_from_home_connect_error(err),
-                    SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
-                    SVE_TRANSLATION_PLACEHOLDER_KEY: self.bsh_key,
-                    SVE_TRANSLATION_PLACEHOLDER_VALUE: str(value),
+                    "entity_id": self.entity_id,
+                    "key": self.bsh_key,
+                    "value": str(value),
                 },
             ) from err
 
-    async def async_update(self) -> None:
-        """Update the Time setting status."""
-        data = self.device.appliance.status.get(self.bsh_key)
-        if data is None:
-            _LOGGER.error("No value for %s", self.bsh_key)
-            self._attr_native_value = None
-            return
-        seconds = data.get(ATTR_VALUE, None)
-        if seconds is not None:
-            self._attr_native_value = seconds_to_time(seconds)
-        else:
-            self._attr_native_value = None
-        _LOGGER.debug("Updated, new value: %s", self._attr_native_value)
+    def update_native_value(self) -> None:
+        """Set the value of the entity."""
+        data = self.appliance.settings[cast(SettingKey, self.bsh_key)]
+        self._attr_native_value = seconds_to_time(data.value)
diff --git a/homeassistant/components/home_connect/utils.py b/homeassistant/components/home_connect/utils.py
new file mode 100644
index 00000000000..ee5febb3cf7
--- /dev/null
+++ b/homeassistant/components/home_connect/utils.py
@@ -0,0 +1,25 @@
+"""Utility functions for Home Connect."""
+
+import re
+
+from aiohomeconnect.model.error import HomeConnectError
+
+RE_CAMEL_CASE = re.compile(r"(?<!^)(?=[A-Z])|(?=\d)(?<=\D)")
+
+
+def get_dict_from_home_connect_error(
+    err: HomeConnectError,
+) -> dict[str, str]:
+    """Return a translation string from a Home Connect error."""
+    return {"error": str(err)}
+
+
+def bsh_key_to_translation_key(bsh_key: str) -> str:
+    """Convert a BSH key to a translation key format.
+
+    This function takes a BSH key, such as `Dishcare.Dishwasher.Program.Eco50`,
+    and converts it to a translation key format, such as `dishcare_dishwasher_bsh_key_eco50`.
+    """
+    return "_".join(
+        RE_CAMEL_CASE.sub("_", split) for split in bsh_key.split(".")
+    ).lower()
diff --git a/homeassistant/components/homeassistant/const.py b/homeassistant/components/homeassistant/const.py
index 7a51e218a16..7fad6728a74 100644
--- a/homeassistant/components/homeassistant/const.py
+++ b/homeassistant/components/homeassistant/const.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Final
 
-import homeassistant.core as ha
+from homeassistant import core as ha
 from homeassistant.util.hass_dict import HassKey
 
 if TYPE_CHECKING:
diff --git a/homeassistant/components/homeassistant/exposed_entities.py b/homeassistant/components/homeassistant/exposed_entities.py
index 7bd9f9ab7bc..b7e420dedde 100644
--- a/homeassistant/components/homeassistant/exposed_entities.py
+++ b/homeassistant/components/homeassistant/exposed_entities.py
@@ -437,18 +437,21 @@ def ws_expose_entity(
 def ws_list_exposed_entities(
     hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict[str, Any]
 ) -> None:
-    """Expose an entity to an assistant."""
+    """List entities which are exposed to assistants."""
     result: dict[str, Any] = {}
 
     exposed_entities = hass.data[DATA_EXPOSED_ENTITIES]
     entity_registry = er.async_get(hass)
     for entity_id in chain(exposed_entities.entities, entity_registry.entities):
-        result[entity_id] = {}
+        exposed_to = {}
         entity_settings = async_get_entity_settings(hass, entity_id)
         for assistant, settings in entity_settings.items():
-            if "should_expose" not in settings:
+            if "should_expose" not in settings or not settings["should_expose"]:
                 continue
-            result[entity_id][assistant] = settings["should_expose"]
+            exposed_to[assistant] = True
+        if not exposed_to:
+            continue
+        result[entity_id] = exposed_to
     connection.send_result(msg["id"], {"exposed_entities": result})
 
 
diff --git a/homeassistant/components/homeassistant/strings.json b/homeassistant/components/homeassistant/strings.json
index 3283d480fdd..b8b5f77cf52 100644
--- a/homeassistant/components/homeassistant/strings.json
+++ b/homeassistant/components/homeassistant/strings.json
@@ -12,7 +12,7 @@
     },
     "imperial_unit_system": {
       "title": "The imperial unit system is deprecated",
-      "description": "The imperial unit system is deprecated and your system is currently using us customary. Please update your configuration to use the us customary unit system and reload the core configuration to fix this issue."
+      "description": "The imperial unit system is deprecated and your system is currently using US customary. Please update your configuration to use the US customary unit system and reload the Core configuration to fix this issue."
     },
     "deprecated_yaml": {
       "title": "The {integration_title} YAML configuration is being removed",
@@ -44,7 +44,7 @@
     },
     "no_platform_setup": {
       "title": "Unused YAML configuration for the {platform} integration",
-      "description": "It's not possible to configure {platform} {domain} by adding `{platform_key}` to the {domain} configuration. Please check the documentation for more information on how to set up this integration.\n\nTo resolve this:\n1. Remove `{platform_key}` occurences from the `{domain}:` configuration in your YAML configuration file.\n2. Restart Home Assistant.\n\nExample that should be removed:\n{yaml_example}"
+      "description": "It's not possible to configure {platform} {domain} by adding `{platform_key}` to the {domain} configuration. Please check the documentation for more information on how to set up this integration.\n\nTo resolve this:\n1. Remove `{platform_key}` occurrences from the `{domain}:` configuration in your YAML configuration file.\n2. Restart Home Assistant.\n\nExample that should be removed:\n{yaml_example}"
     },
     "storage_corruption": {
       "title": "Storage corruption detected for {storage_key}",
@@ -111,8 +111,8 @@
       "description": "Checks the Home Assistant YAML-configuration files for errors. Errors will be shown in the Home Assistant logs."
     },
     "reload_core_config": {
-      "name": "Reload core configuration",
-      "description": "Reloads the core configuration from the YAML-configuration."
+      "name": "Reload Core configuration",
+      "description": "Reloads the Core configuration from the YAML-configuration."
     },
     "restart": {
       "name": "[%key:common::action::restart%]",
@@ -160,7 +160,7 @@
     },
     "update_entity": {
       "name": "Update entity",
-      "description": "Forces one or more entities to update its data.",
+      "description": "Forces one or more entities to update their data.",
       "fields": {
         "entity_id": {
           "name": "Entities to update",
@@ -188,7 +188,7 @@
     },
     "reload_all": {
       "name": "Reload all",
-      "description": "Reload all YAML configuration that can be reloaded without restarting Home Assistant."
+      "description": "Reloads all YAML configuration that can be reloaded without restarting Home Assistant."
     }
   },
   "exceptions": {
diff --git a/homeassistant/components/homeassistant/triggers/time.py b/homeassistant/components/homeassistant/triggers/time.py
index 5cd1921d8a8..e07d806d3dc 100644
--- a/homeassistant/components/homeassistant/triggers/time.py
+++ b/homeassistant/components/homeassistant/triggers/time.py
@@ -35,7 +35,7 @@ from homeassistant.helpers.event import (
 )
 from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
 from homeassistant.helpers.typing import ConfigType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 _TIME_TRIGGER_ENTITY = vol.All(str, cv.entity_domain(["input_datetime", "sensor"]))
 _TIME_AT_SCHEMA = vol.Any(cv.time, _TIME_TRIGGER_ENTITY)
diff --git a/homeassistant/components/homeassistant_alerts/coordinator.py b/homeassistant/components/homeassistant_alerts/coordinator.py
index a81824d2376..542ebf857df 100644
--- a/homeassistant/components/homeassistant_alerts/coordinator.py
+++ b/homeassistant/components/homeassistant_alerts/coordinator.py
@@ -40,6 +40,7 @@ class AlertUpdateCoordinator(DataUpdateCoordinator[dict[str, IntegrationAlert]])
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=None,
             name=DOMAIN,
             update_interval=UPDATE_INTERVAL,
         )
diff --git a/homeassistant/components/homeassistant_hardware/__init__.py b/homeassistant/components/homeassistant_hardware/__init__.py
index c33dabe1ec8..fc2b393805e 100644
--- a/homeassistant/components/homeassistant_hardware/__init__.py
+++ b/homeassistant/components/homeassistant_hardware/__init__.py
@@ -6,10 +6,15 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
-DOMAIN = "homeassistant_hardware"
+from .const import DATA_COMPONENT, DOMAIN
+from .helpers import HardwareInfoDispatcher
+
 CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the component."""
+
+    hass.data[DATA_COMPONENT] = HardwareInfoDispatcher(hass)
+
     return True
diff --git a/homeassistant/components/homeassistant_hardware/const.py b/homeassistant/components/homeassistant_hardware/const.py
index 8fddbe41b7d..a3c091ff7ee 100644
--- a/homeassistant/components/homeassistant_hardware/const.py
+++ b/homeassistant/components/homeassistant_hardware/const.py
@@ -1,10 +1,23 @@
 """Constants for the Homeassistant Hardware integration."""
 
+from __future__ import annotations
+
 import logging
+from typing import TYPE_CHECKING
+
+from homeassistant.util.hass_dict import HassKey
+
+if TYPE_CHECKING:
+    from .helpers import HardwareInfoDispatcher
+
 
 LOGGER = logging.getLogger(__package__)
 
+DOMAIN = "homeassistant_hardware"
+DATA_COMPONENT: HassKey[HardwareInfoDispatcher] = HassKey(DOMAIN)
+
 ZHA_DOMAIN = "zha"
+OTBR_DOMAIN = "otbr"
 
 OTBR_ADDON_NAME = "OpenThread Border Router"
 OTBR_ADDON_MANAGER_DATA = "openthread_border_router"
diff --git a/homeassistant/components/homeassistant_hardware/coordinator.py b/homeassistant/components/homeassistant_hardware/coordinator.py
new file mode 100644
index 00000000000..9eb900b13fd
--- /dev/null
+++ b/homeassistant/components/homeassistant_hardware/coordinator.py
@@ -0,0 +1,47 @@
+"""Home Assistant hardware firmware update coordinator."""
+
+from __future__ import annotations
+
+from datetime import timedelta
+import logging
+
+from aiohttp import ClientSession
+from ha_silabs_firmware_client import (
+    FirmwareManifest,
+    FirmwareUpdateClient,
+    ManifestMissing,
+)
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+_LOGGER = logging.getLogger(__name__)
+
+
+FIRMWARE_REFRESH_INTERVAL = timedelta(hours=8)
+
+
+class FirmwareUpdateCoordinator(DataUpdateCoordinator[FirmwareManifest]):
+    """Coordinator to manage firmware updates."""
+
+    def __init__(self, hass: HomeAssistant, session: ClientSession, url: str) -> None:
+        """Initialize the firmware update coordinator."""
+        super().__init__(
+            hass,
+            _LOGGER,
+            name="firmware update coordinator",
+            update_interval=FIRMWARE_REFRESH_INTERVAL,
+            always_update=False,
+        )
+        self.hass = hass
+        self.session = session
+
+        self.client = FirmwareUpdateClient(url, session)
+
+    async def _async_update_data(self) -> FirmwareManifest:
+        try:
+            return await self.client.async_update_data()
+        except ManifestMissing as err:
+            raise UpdateFailed(
+                "GitHub release assets haven't been uploaded yet"
+            ) from err
diff --git a/homeassistant/components/homeassistant_hardware/firmware_config_flow.py b/homeassistant/components/homeassistant_hardware/firmware_config_flow.py
index fac3d2d9735..83031587712 100644
--- a/homeassistant/components/homeassistant_hardware/firmware_config_flow.py
+++ b/homeassistant/components/homeassistant_hardware/firmware_config_flow.py
@@ -25,13 +25,16 @@ from homeassistant.data_entry_flow import AbortFlow
 from homeassistant.helpers.hassio import is_hassio
 
 from . import silabs_multiprotocol_addon
-from .const import ZHA_DOMAIN
+from .const import OTBR_DOMAIN, ZHA_DOMAIN
 from .util import (
     ApplicationType,
+    FirmwareInfo,
+    OwningAddon,
+    OwningIntegration,
     get_otbr_addon_manager,
-    get_zha_device_path,
     get_zigbee_flasher_addon_manager,
-    probe_silabs_firmware_type,
+    guess_hardware_owners,
+    probe_silabs_firmware_info,
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -50,7 +53,7 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
         """Instantiate base flow."""
         super().__init__(*args, **kwargs)
 
-        self._probed_firmware_type: ApplicationType | None = None
+        self._probed_firmware_info: FirmwareInfo | None = None
         self._device: str | None = None  # To be set in a subclass
         self._hardware_name: str = "unknown"  # To be set in a subclass
 
@@ -62,8 +65,8 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
         """Shared translation placeholders."""
         placeholders = {
             "firmware_type": (
-                self._probed_firmware_type.value
-                if self._probed_firmware_type is not None
+                self._probed_firmware_info.firmware_type.value
+                if self._probed_firmware_info is not None
                 else "unknown"
             ),
             "model": self._hardware_name,
@@ -118,39 +121,49 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
             description_placeholders=self._get_translation_placeholders(),
         )
 
-    async def _probe_firmware_type(self) -> bool:
-        """Probe the firmware currently on the device."""
-        assert self._device is not None
-
-        self._probed_firmware_type = await probe_silabs_firmware_type(
-            self._device,
-            probe_methods=(
-                # We probe in order of frequency: Zigbee, Thread, then multi-PAN
-                ApplicationType.GECKO_BOOTLOADER,
-                ApplicationType.EZSP,
-                ApplicationType.SPINEL,
-                ApplicationType.CPC,
-            ),
-        )
-
-        return self._probed_firmware_type in (
+    async def _probe_firmware_info(
+        self,
+        probe_methods: tuple[ApplicationType, ...] = (
+            # We probe in order of frequency: Zigbee, Thread, then multi-PAN
+            ApplicationType.GECKO_BOOTLOADER,
             ApplicationType.EZSP,
             ApplicationType.SPINEL,
             ApplicationType.CPC,
+        ),
+    ) -> bool:
+        """Probe the firmware currently on the device."""
+        assert self._device is not None
+
+        self._probed_firmware_info = await probe_silabs_firmware_info(
+            self._device,
+            probe_methods=probe_methods,
+        )
+
+        return (
+            self._probed_firmware_info is not None
+            and self._probed_firmware_info.firmware_type
+            in (
+                ApplicationType.EZSP,
+                ApplicationType.SPINEL,
+                ApplicationType.CPC,
+            )
         )
 
     async def async_step_pick_firmware_zigbee(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Pick Zigbee firmware."""
-        if not await self._probe_firmware_type():
+        if not await self._probe_firmware_info():
             return self.async_abort(
                 reason="unsupported_firmware",
                 description_placeholders=self._get_translation_placeholders(),
             )
 
         # Allow the stick to be used with ZHA without flashing
-        if self._probed_firmware_type == ApplicationType.EZSP:
+        if (
+            self._probed_firmware_info is not None
+            and self._probed_firmware_info.firmware_type == ApplicationType.EZSP
+        ):
             return await self.async_step_confirm_zigbee()
 
         if not is_hassio(self.hass):
@@ -336,7 +349,12 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
         """Confirm Zigbee setup."""
         assert self._device is not None
         assert self._hardware_name is not None
-        self._probed_firmware_type = ApplicationType.EZSP
+
+        if not await self._probe_firmware_info(probe_methods=(ApplicationType.EZSP,)):
+            return self.async_abort(
+                reason="unsupported_firmware",
+                description_placeholders=self._get_translation_placeholders(),
+            )
 
         if user_input is not None:
             await self.hass.config_entries.flow.async_init(
@@ -364,7 +382,7 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Pick Thread firmware."""
-        if not await self._probe_firmware_type():
+        if not await self._probe_firmware_info():
             return self.async_abort(
                 reason="unsupported_firmware",
                 description_placeholders=self._get_translation_placeholders(),
@@ -456,7 +474,11 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
         """Confirm OTBR setup."""
         assert self._device is not None
 
-        self._probed_firmware_type = ApplicationType.SPINEL
+        if not await self._probe_firmware_info(probe_methods=(ApplicationType.SPINEL,)):
+            return self.async_abort(
+                reason="unsupported_firmware",
+                description_placeholders=self._get_translation_placeholders(),
+            )
 
         if user_input is not None:
             # OTBR discovery is done automatically via hassio
@@ -495,14 +517,14 @@ class BaseFirmwareConfigFlow(BaseFirmwareInstallFlow, ConfigFlow):
 class BaseFirmwareOptionsFlow(BaseFirmwareInstallFlow, OptionsFlow):
     """Zigbee and Thread options flow handlers."""
 
+    _probed_firmware_info: FirmwareInfo
+
     def __init__(self, config_entry: ConfigEntry, *args: Any, **kwargs: Any) -> None:
         """Instantiate options flow."""
         super().__init__(*args, **kwargs)
 
         self._config_entry = config_entry
 
-        self._probed_firmware_type = ApplicationType(self.config_entry.data["firmware"])
-
         # Make `context` a regular dictionary
         self.context = {}
 
@@ -519,19 +541,15 @@ class BaseFirmwareOptionsFlow(BaseFirmwareInstallFlow, OptionsFlow):
     ) -> ConfigFlowResult:
         """Pick Zigbee firmware."""
         assert self._device is not None
+        owners = await guess_hardware_owners(self.hass, self._device)
 
-        if is_hassio(self.hass):
-            otbr_manager = get_otbr_addon_manager(self.hass)
-            otbr_addon_info = await self._async_get_addon_info(otbr_manager)
-
-            if (
-                otbr_addon_info.state != AddonState.NOT_INSTALLED
-                and otbr_addon_info.options.get("device") == self._device
-            ):
-                raise AbortFlow(
-                    "otbr_still_using_stick",
-                    description_placeholders=self._get_translation_placeholders(),
-                )
+        for info in owners:
+            for owner in info.owners:
+                if info.source == OTBR_DOMAIN and isinstance(owner, OwningAddon):
+                    raise AbortFlow(
+                        "otbr_still_using_stick",
+                        description_placeholders=self._get_translation_placeholders(),
+                    )
 
         return await super().async_step_pick_firmware_zigbee(user_input)
 
@@ -541,15 +559,14 @@ class BaseFirmwareOptionsFlow(BaseFirmwareInstallFlow, OptionsFlow):
         """Pick Thread firmware."""
         assert self._device is not None
 
-        for zha_entry in self.hass.config_entries.async_entries(
-            ZHA_DOMAIN,
-            include_ignore=False,
-            include_disabled=True,
-        ):
-            if get_zha_device_path(zha_entry) == self._device:
-                raise AbortFlow(
-                    "zha_still_using_stick",
-                    description_placeholders=self._get_translation_placeholders(),
-                )
+        owners = await guess_hardware_owners(self.hass, self._device)
+
+        for info in owners:
+            for owner in info.owners:
+                if info.source == ZHA_DOMAIN and isinstance(owner, OwningIntegration):
+                    raise AbortFlow(
+                        "zha_still_using_stick",
+                        description_placeholders=self._get_translation_placeholders(),
+                    )
 
         return await super().async_step_pick_firmware_thread(user_input)
diff --git a/homeassistant/components/homeassistant_hardware/helpers.py b/homeassistant/components/homeassistant_hardware/helpers.py
new file mode 100644
index 00000000000..a9b3703ee4a
--- /dev/null
+++ b/homeassistant/components/homeassistant_hardware/helpers.py
@@ -0,0 +1,143 @@
+"""Home Assistant Hardware integration helpers."""
+
+from collections import defaultdict
+from collections.abc import AsyncIterator, Awaitable, Callable
+import logging
+from typing import Protocol
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback as hass_callback
+
+from . import DATA_COMPONENT
+from .util import FirmwareInfo
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class SyncHardwareFirmwareInfoModule(Protocol):
+    """Protocol type for Home Assistant Hardware firmware info platform modules."""
+
+    def get_firmware_info(
+        self,
+        hass: HomeAssistant,
+        entry: ConfigEntry,
+    ) -> FirmwareInfo | None:
+        """Return radio firmware information for the config entry, synchronously."""
+
+
+class AsyncHardwareFirmwareInfoModule(Protocol):
+    """Protocol type for Home Assistant Hardware firmware info platform modules."""
+
+    async def async_get_firmware_info(
+        self,
+        hass: HomeAssistant,
+        entry: ConfigEntry,
+    ) -> FirmwareInfo | None:
+        """Return radio firmware information for the config entry, asynchronously."""
+
+
+type HardwareFirmwareInfoModule = (
+    SyncHardwareFirmwareInfoModule | AsyncHardwareFirmwareInfoModule
+)
+
+
+class HardwareInfoDispatcher:
+    """Central dispatcher for hardware/firmware information."""
+
+    def __init__(self, hass: HomeAssistant) -> None:
+        """Initialize the dispatcher."""
+        self.hass = hass
+        self._providers: dict[str, HardwareFirmwareInfoModule] = {}
+        self._notification_callbacks: defaultdict[
+            str, set[Callable[[FirmwareInfo], None]]
+        ] = defaultdict(set)
+
+    def register_firmware_info_provider(
+        self, domain: str, platform: HardwareFirmwareInfoModule
+    ) -> None:
+        """Register a firmware info provider."""
+        if domain in self._providers:
+            raise ValueError(
+                f"Domain {domain} is already registered as a firmware info provider"
+            )
+
+        # There is no need to handle "unregistration" because integrations cannot be
+        # wholly removed at runtime
+        self._providers[domain] = platform
+        _LOGGER.debug(
+            "Registered firmware info provider from domain %r: %s", domain, platform
+        )
+
+    def register_firmware_info_callback(
+        self, device: str, callback: Callable[[FirmwareInfo], None]
+    ) -> CALLBACK_TYPE:
+        """Register a firmware info notification callback."""
+        self._notification_callbacks[device].add(callback)
+
+        @hass_callback
+        def async_remove_callback() -> None:
+            self._notification_callbacks[device].discard(callback)
+
+        return async_remove_callback
+
+    async def notify_firmware_info(
+        self, domain: str, firmware_info: FirmwareInfo
+    ) -> None:
+        """Notify the dispatcher of new firmware information."""
+        _LOGGER.debug(
+            "Received firmware info notification from %r: %s", domain, firmware_info
+        )
+
+        for callback in self._notification_callbacks.get(firmware_info.device, []):
+            try:
+                callback(firmware_info)
+            except Exception:
+                _LOGGER.exception(
+                    "Error while notifying firmware info listener %s", callback
+                )
+
+    async def iter_firmware_info(self) -> AsyncIterator[FirmwareInfo]:
+        """Iterate over all firmware information for all hardware."""
+        for domain, fw_info_module in self._providers.items():
+            for config_entry in self.hass.config_entries.async_entries(domain):
+                try:
+                    if hasattr(fw_info_module, "get_firmware_info"):
+                        fw_info = fw_info_module.get_firmware_info(
+                            self.hass, config_entry
+                        )
+                    else:
+                        fw_info = await fw_info_module.async_get_firmware_info(
+                            self.hass, config_entry
+                        )
+                except Exception:
+                    _LOGGER.exception(
+                        "Error while getting firmware info from %r", fw_info_module
+                    )
+                    continue
+
+                if fw_info is not None:
+                    yield fw_info
+
+
+@hass_callback
+def async_register_firmware_info_provider(
+    hass: HomeAssistant, domain: str, platform: HardwareFirmwareInfoModule
+) -> None:
+    """Register a firmware info provider."""
+    return hass.data[DATA_COMPONENT].register_firmware_info_provider(domain, platform)
+
+
+@hass_callback
+def async_register_firmware_info_callback(
+    hass: HomeAssistant, device: str, callback: Callable[[FirmwareInfo], None]
+) -> CALLBACK_TYPE:
+    """Register a firmware info provider."""
+    return hass.data[DATA_COMPONENT].register_firmware_info_callback(device, callback)
+
+
+@hass_callback
+def async_notify_firmware_info(
+    hass: HomeAssistant, domain: str, firmware_info: FirmwareInfo
+) -> Awaitable[None]:
+    """Notify the dispatcher of new firmware information."""
+    return hass.data[DATA_COMPONENT].notify_firmware_info(domain, firmware_info)
diff --git a/homeassistant/components/homeassistant_hardware/manifest.json b/homeassistant/components/homeassistant_hardware/manifest.json
index 2efa12ccfda..f3a02185b83 100644
--- a/homeassistant/components/homeassistant_hardware/manifest.json
+++ b/homeassistant/components/homeassistant_hardware/manifest.json
@@ -5,5 +5,8 @@
   "codeowners": ["@home-assistant/core"],
   "documentation": "https://www.home-assistant.io/integrations/homeassistant_hardware",
   "integration_type": "system",
-  "requirements": ["universal-silabs-flasher==0.0.25"]
+  "requirements": [
+    "universal-silabs-flasher==0.0.30",
+    "ha-silabs-firmware-client==0.2.0"
+  ]
 }
diff --git a/homeassistant/components/homeassistant_hardware/strings.json b/homeassistant/components/homeassistant_hardware/strings.json
index b483df75d75..6dda01561f1 100644
--- a/homeassistant/components/homeassistant_hardware/strings.json
+++ b/homeassistant/components/homeassistant_hardware/strings.json
@@ -39,8 +39,8 @@
           "description": "The OpenThread Border Router (OTBR) add-on is now starting."
         },
         "otbr_failed": {
-          "title": "Failed to setup OpenThread Border Router",
-          "description": "The OpenThread Border Router add-on installation was unsuccessful. Ensure no other software is trying to communicate with the {model}, you have access to the internet and can install other add-ons, and try again. Check the Supervisor logs if the problem persists."
+          "title": "Failed to set up OpenThread Border Router",
+          "description": "The OpenThread Border Router add-on installation was unsuccessful. Ensure no other software is trying to communicate with the {model}, you have access to the Internet and can install other add-ons, and try again. Check the Supervisor logs if the problem persists."
         },
         "confirm_otbr": {
           "title": "OpenThread Border Router setup complete",
@@ -48,16 +48,16 @@
         }
       },
       "abort": {
-        "not_hassio_thread": "The OpenThread Border Router addon can only be installed with Home Assistant OS. If you would like to use the {model} as an Thread border router, please flash the firmware manually using the [web flasher]({docs_web_flasher_url}) and set up OpenThread Border Router to communicate with it.",
+        "not_hassio_thread": "The OpenThread Border Router add-on can only be installed with Home Assistant OS. If you would like to use the {model} as a Thread border router, please flash the firmware manually using the [web flasher]({docs_web_flasher_url}) and set up OpenThread Border Router to communicate with it.",
         "otbr_addon_already_running": "The OpenThread Border Router add-on is already running, it cannot be installed again.",
         "zha_still_using_stick": "This {model} is in use by the Zigbee Home Automation integration. Please migrate your Zigbee network to another adapter or delete the integration and try again.",
         "otbr_still_using_stick": "This {model} is in use by the OpenThread Border Router add-on. If you use the Thread network, make sure you have alternative border routers. Uninstall the add-on and try again.",
-        "unsupported_firmware": "The radio firmware on your {model} could not be determined. Make sure that no other integration or addon is currently trying to communicate with the device. If you are running Home Assistant OS in a virtual machine or in Docker, please make sure that permissions are set correctly for the device."
+        "unsupported_firmware": "The radio firmware on your {model} could not be determined. Make sure that no other integration or add-on is currently trying to communicate with the device. If you are running Home Assistant OS in a virtual machine or in Docker, please make sure that permissions are set correctly for the device."
       },
       "progress": {
-        "install_zigbee_flasher_addon": "The Silicon Labs Flasher addon is installed, this may take a few minutes.",
+        "install_zigbee_flasher_addon": "The Silicon Labs Flasher add-on is installed, this may take a few minutes.",
         "run_zigbee_flasher_addon": "Please wait while Zigbee firmware is installed to your {model}, this will take a few minutes. Do not make any changes to your hardware or software until this finishes.",
-        "uninstall_zigbee_flasher_addon": "The Silicon Labs Flasher addon is being removed."
+        "uninstall_zigbee_flasher_addon": "The Silicon Labs Flasher add-on is being removed."
       }
     }
   },
@@ -96,7 +96,7 @@
         },
         "notify_unknown_multipan_user": {
           "title": "Manual configuration may be needed",
-          "description": "Home Assistant can automatically change the channels for otbr and zha. If you have configured another integration to use the radio, for example Zigbee2MQTT, you will have to reconfigure the channel in that integration after completing this guide."
+          "description": "Home Assistant can automatically change the channels for OTBR and ZHA. If you have configured another integration to use the radio, for example Zigbee2MQTT, you will have to reconfigure the channel in that integration after completing this guide."
         },
         "reconfigure_addon": {
           "title": "Reconfigure IEEE 802.15.4 radio multiprotocol support"
@@ -131,7 +131,7 @@
         "addon_already_running": "Failed to start the {addon_name} add-on because it is already running.",
         "addon_set_config_failed": "Failed to set {addon_name} configuration.",
         "addon_start_failed": "Failed to start the {addon_name} add-on.",
-        "not_hassio": "The hardware options can only be configured on HassOS installations.",
+        "not_hassio": "The hardware options can only be configured on Home Assistant OS installations.",
         "zha_migration_failed": "The ZHA migration did not succeed."
       },
       "progress": {
diff --git a/homeassistant/components/homeassistant_hardware/update.py b/homeassistant/components/homeassistant_hardware/update.py
new file mode 100644
index 00000000000..e835286238f
--- /dev/null
+++ b/homeassistant/components/homeassistant_hardware/update.py
@@ -0,0 +1,331 @@
+"""Home Assistant Hardware base firmware update entity."""
+
+from __future__ import annotations
+
+from collections.abc import AsyncIterator, Callable
+from contextlib import AsyncExitStack, asynccontextmanager
+from dataclasses import dataclass
+import logging
+from typing import Any, cast
+
+from ha_silabs_firmware_client import FirmwareManifest, FirmwareMetadata
+from universal_silabs_flasher.firmware import parse_firmware_image
+from universal_silabs_flasher.flasher import Flasher
+from yarl import URL
+
+from homeassistant.components.update import (
+    UpdateEntity,
+    UpdateEntityDescription,
+    UpdateEntityFeature,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import CALLBACK_TYPE, callback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.restore_state import ExtraStoredData
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .coordinator import FirmwareUpdateCoordinator
+from .helpers import async_register_firmware_info_callback
+from .util import (
+    ApplicationType,
+    FirmwareInfo,
+    guess_firmware_info,
+    probe_silabs_firmware_info,
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+type FirmwareChangeCallbackType = Callable[
+    [ApplicationType | None, ApplicationType | None], None
+]
+
+
+@dataclass(kw_only=True, frozen=True)
+class FirmwareUpdateEntityDescription(UpdateEntityDescription):
+    """Describes Home Assistant Hardware firmware update entity."""
+
+    version_parser: Callable[[str], str]
+    fw_type: str | None
+    version_key: str | None
+    expected_firmware_type: ApplicationType | None
+    firmware_name: str | None
+
+
+@dataclass
+class FirmwareUpdateExtraStoredData(ExtraStoredData):
+    """Extra stored data for Home Assistant Hardware firmware update entity."""
+
+    firmware_manifest: FirmwareManifest | None = None
+
+    def as_dict(self) -> dict[str, Any]:
+        """Return a dict representation of the extra data."""
+        return {
+            "firmware_manifest": (
+                self.firmware_manifest.as_dict()
+                if self.firmware_manifest is not None
+                else None
+            )
+        }
+
+    @classmethod
+    def from_dict(cls, data: dict[str, Any]) -> FirmwareUpdateExtraStoredData:
+        """Initialize the extra data from a dict."""
+        if data["firmware_manifest"] is None:
+            return cls(firmware_manifest=None)
+
+        return cls(
+            FirmwareManifest.from_json(
+                data["firmware_manifest"],
+                # This data is not technically part of the manifest and is loaded externally
+                url=URL(data["firmware_manifest"]["url"]),
+                html_url=URL(data["firmware_manifest"]["html_url"]),
+            )
+        )
+
+
+class BaseFirmwareUpdateEntity(
+    CoordinatorEntity[FirmwareUpdateCoordinator], UpdateEntity
+):
+    """Base Home Assistant Hardware firmware update entity."""
+
+    # Subclasses provide the mapping between firmware types and entity descriptions
+    entity_description: FirmwareUpdateEntityDescription
+    bootloader_reset_type: str | None = None
+
+    _attr_supported_features = (
+        UpdateEntityFeature.INSTALL | UpdateEntityFeature.PROGRESS
+    )
+    # Until this entity can be associated with a device, we must manually name it
+    _attr_has_entity_name = False
+
+    def __init__(
+        self,
+        device: str,
+        config_entry: ConfigEntry,
+        update_coordinator: FirmwareUpdateCoordinator,
+        entity_description: FirmwareUpdateEntityDescription,
+    ) -> None:
+        """Initialize the Hardware firmware update entity."""
+        super().__init__(update_coordinator)
+
+        self.entity_description = entity_description
+        self._current_device = device
+        self._config_entry = config_entry
+        self._current_firmware_info: FirmwareInfo | None = None
+        self._firmware_type_change_callbacks: set[FirmwareChangeCallbackType] = set()
+
+        self._latest_manifest: FirmwareManifest | None = None
+        self._latest_firmware: FirmwareMetadata | None = None
+
+    def add_firmware_type_changed_callback(
+        self,
+        change_callback: FirmwareChangeCallbackType,
+    ) -> CALLBACK_TYPE:
+        """Add a callback for when the firmware type changes."""
+        self._firmware_type_change_callbacks.add(change_callback)
+
+        @callback
+        def remove_callback() -> None:
+            self._firmware_type_change_callbacks.discard(change_callback)
+
+        return remove_callback
+
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+
+        self.async_on_remove(
+            async_register_firmware_info_callback(
+                self.hass,
+                self._current_device,
+                self._firmware_info_callback,
+            )
+        )
+
+        self.async_on_remove(
+            self._config_entry.async_on_state_change(self._on_config_entry_change)
+        )
+
+        if (extra_data := await self.async_get_last_extra_data()) and (
+            hardware_extra_data := FirmwareUpdateExtraStoredData.from_dict(
+                extra_data.as_dict()
+            )
+        ):
+            self._latest_manifest = hardware_extra_data.firmware_manifest
+
+        self._update_attributes()
+
+    @property
+    def extra_restore_state_data(self) -> FirmwareUpdateExtraStoredData:
+        """Return state data to be restored."""
+        return FirmwareUpdateExtraStoredData(firmware_manifest=self._latest_manifest)
+
+    @callback
+    def _on_config_entry_change(self) -> None:
+        """Handle config entry changes."""
+        self._update_attributes()
+        self.async_write_ha_state()
+
+    @callback
+    def _firmware_info_callback(self, firmware_info: FirmwareInfo) -> None:
+        """Handle updated firmware info being pushed by an integration."""
+        self._current_firmware_info = firmware_info
+
+        # If the firmware type does not change, we can just update the attributes
+        if (
+            self._current_firmware_info.firmware_type
+            == self.entity_description.expected_firmware_type
+        ):
+            self._update_attributes()
+            self.async_write_ha_state()
+            return
+
+        # Otherwise, fire the firmware type change callbacks. They are expected to
+        # replace the entity so there is no purpose in firing other callbacks.
+        for change_callback in self._firmware_type_change_callbacks.copy():
+            try:
+                change_callback(
+                    self.entity_description.expected_firmware_type,
+                    self._current_firmware_info.firmware_type,
+                )
+            except Exception:  # noqa: BLE001
+                _LOGGER.warning(
+                    "Failed to call firmware type changed callback", exc_info=True
+                )
+
+    def _update_attributes(self) -> None:
+        """Recompute the attributes of the entity."""
+
+        # This entity is not currently associated with a device so we must manually
+        # give it a name
+        self._attr_name = f"{self._config_entry.title} Update"
+        self._attr_title = self.entity_description.firmware_name or "unknown"
+
+        if (
+            self._current_firmware_info is None
+            or self._current_firmware_info.firmware_version is None
+        ):
+            self._attr_installed_version = None
+        else:
+            self._attr_installed_version = self.entity_description.version_parser(
+                self._current_firmware_info.firmware_version
+            )
+
+        self._latest_firmware = None
+        self._attr_latest_version = None
+        self._attr_release_summary = None
+        self._attr_release_url = None
+
+        if (
+            self._latest_manifest is None
+            or self.entity_description.fw_type is None
+            or self.entity_description.version_key is None
+        ):
+            return
+
+        try:
+            self._latest_firmware = next(
+                f
+                for f in self._latest_manifest.firmwares
+                if f.filename.startswith(self.entity_description.fw_type)
+            )
+        except StopIteration:
+            pass
+        else:
+            version = cast(
+                str, self._latest_firmware.metadata[self.entity_description.version_key]
+            )
+            self._attr_latest_version = self.entity_description.version_parser(version)
+            self._attr_release_summary = self._latest_firmware.release_notes
+            self._attr_release_url = str(self._latest_manifest.html_url)
+
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
+        self._latest_manifest = self.coordinator.data
+        self._update_attributes()
+        self.async_write_ha_state()
+
+    def _update_progress(self, offset: int, total_size: int) -> None:
+        """Handle update progress."""
+
+        # Firmware updates in ~30s so we still get responsive update progress even
+        # without decimal places
+        self._attr_update_percentage = round((offset * 100) / total_size)
+        self.async_write_ha_state()
+
+    @asynccontextmanager
+    async def _temporarily_stop_hardware_owners(
+        self, device: str
+    ) -> AsyncIterator[None]:
+        """Temporarily stop addons and integrations communicating with the device."""
+        firmware_info = await guess_firmware_info(self.hass, device)
+        _LOGGER.debug("Identified firmware info: %s", firmware_info)
+
+        async with AsyncExitStack() as stack:
+            for owner in firmware_info.owners:
+                await stack.enter_async_context(owner.temporarily_stop(self.hass))
+
+            yield
+
+    async def async_install(
+        self, version: str | None, backup: bool, **kwargs: Any
+    ) -> None:
+        """Install an update."""
+        assert self._latest_firmware is not None
+        assert self.entity_description.expected_firmware_type is not None
+
+        # Start off by setting the progress bar to an indeterminate state
+        self._attr_in_progress = True
+        self._attr_update_percentage = None
+        self.async_write_ha_state()
+
+        fw_data = await self.coordinator.client.async_fetch_firmware(
+            self._latest_firmware
+        )
+        fw_image = await self.hass.async_add_executor_job(parse_firmware_image, fw_data)
+
+        device = self._current_device
+
+        flasher = Flasher(
+            device=device,
+            probe_methods=(
+                ApplicationType.GECKO_BOOTLOADER.as_flasher_application_type(),
+                ApplicationType.EZSP.as_flasher_application_type(),
+                ApplicationType.SPINEL.as_flasher_application_type(),
+                ApplicationType.CPC.as_flasher_application_type(),
+            ),
+            bootloader_reset=self.bootloader_reset_type,
+        )
+
+        async with self._temporarily_stop_hardware_owners(device):
+            try:
+                try:
+                    # Enter the bootloader with indeterminate progress
+                    await flasher.enter_bootloader()
+
+                    # Flash the firmware, with progress
+                    await flasher.flash_firmware(
+                        fw_image, progress_callback=self._update_progress
+                    )
+                except Exception as err:
+                    raise HomeAssistantError("Failed to flash firmware") from err
+
+                # Probe the running application type with indeterminate progress
+                self._attr_update_percentage = None
+                self.async_write_ha_state()
+
+                firmware_info = await probe_silabs_firmware_info(
+                    device,
+                    probe_methods=(self.entity_description.expected_firmware_type,),
+                )
+
+                if firmware_info is None:
+                    raise HomeAssistantError(
+                        "Failed to probe the firmware after flashing"
+                    )
+
+                self._firmware_info_callback(firmware_info)
+            finally:
+                self._attr_in_progress = False
+                self.async_write_ha_state()
diff --git a/homeassistant/components/homeassistant_hardware/util.py b/homeassistant/components/homeassistant_hardware/util.py
index 3fd5bc60037..64f363e4f23 100644
--- a/homeassistant/components/homeassistant_hardware/util.py
+++ b/homeassistant/components/homeassistant_hardware/util.py
@@ -2,27 +2,28 @@
 
 from __future__ import annotations
 
+import asyncio
 from collections import defaultdict
-from collections.abc import Iterable
+from collections.abc import AsyncIterator, Iterable
+from contextlib import asynccontextmanager
 from dataclasses import dataclass
 from enum import StrEnum
 import logging
-from typing import cast
 
 from universal_silabs_flasher.const import ApplicationType as FlasherApplicationType
 from universal_silabs_flasher.flasher import Flasher
 
-from homeassistant.components.hassio import AddonError, AddonState
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.components.hassio import AddonError, AddonManager, AddonState
+from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.hassio import is_hassio
 from homeassistant.helpers.singleton import singleton
 
+from . import DATA_COMPONENT
 from .const import (
     OTBR_ADDON_MANAGER_DATA,
     OTBR_ADDON_NAME,
     OTBR_ADDON_SLUG,
-    ZHA_DOMAIN,
     ZIGBEE_FLASHER_ADDON_MANAGER_DATA,
     ZIGBEE_FLASHER_ADDON_NAME,
     ZIGBEE_FLASHER_ADDON_SLUG,
@@ -42,6 +43,7 @@ class ApplicationType(StrEnum):
     CPC = "cpc"
     EZSP = "ezsp"
     SPINEL = "spinel"
+    ROUTER = "router"
 
     @classmethod
     def from_flasher_application_type(
@@ -55,11 +57,6 @@ class ApplicationType(StrEnum):
         return FlasherApplicationType(self.value)
 
 
-def get_zha_device_path(config_entry: ConfigEntry) -> str | None:
-    """Get the device path from a ZHA config entry."""
-    return cast(str | None, config_entry.data.get("device", {}).get("path", None))
-
-
 @singleton(OTBR_ADDON_MANAGER_DATA)
 @callback
 def get_otbr_addon_manager(hass: HomeAssistant) -> WaitingAddonManager:
@@ -84,49 +81,161 @@ def get_zigbee_flasher_addon_manager(hass: HomeAssistant) -> WaitingAddonManager
     )
 
 
-@dataclass(slots=True, kw_only=True)
-class FirmwareGuess:
-    """Firmware guess."""
+@dataclass(kw_only=True)
+class OwningAddon:
+    """Owning add-on."""
 
-    is_running: bool
-    firmware_type: ApplicationType
-    source: str
+    slug: str
 
+    def _get_addon_manager(self, hass: HomeAssistant) -> WaitingAddonManager:
+        return WaitingAddonManager(
+            hass,
+            _LOGGER,
+            f"Add-on {self.slug}",
+            self.slug,
+        )
 
-async def guess_firmware_type(hass: HomeAssistant, device_path: str) -> FirmwareGuess:
-    """Guess the firmware type based on installed addons and other integrations."""
-    device_guesses: defaultdict[str | None, list[FirmwareGuess]] = defaultdict(list)
-
-    for zha_config_entry in hass.config_entries.async_entries(ZHA_DOMAIN):
-        zha_path = get_zha_device_path(zha_config_entry)
-
-        if zha_path is not None:
-            device_guesses[zha_path].append(
-                FirmwareGuess(
-                    is_running=(zha_config_entry.state == ConfigEntryState.LOADED),
-                    firmware_type=ApplicationType.EZSP,
-                    source="zha",
-                )
-            )
-
-    if is_hassio(hass):
-        otbr_addon_manager = get_otbr_addon_manager(hass)
+    async def is_running(self, hass: HomeAssistant) -> bool:
+        """Check if the add-on is running."""
+        addon_manager = self._get_addon_manager(hass)
 
         try:
-            otbr_addon_info = await otbr_addon_manager.async_get_addon_info()
+            addon_info = await addon_manager.async_get_addon_info()
         except AddonError:
-            pass
+            return False
         else:
-            if otbr_addon_info.state != AddonState.NOT_INSTALLED:
-                otbr_path = otbr_addon_info.options.get("device")
-                device_guesses[otbr_path].append(
-                    FirmwareGuess(
-                        is_running=(otbr_addon_info.state == AddonState.RUNNING),
-                        firmware_type=ApplicationType.SPINEL,
-                        source="otbr",
-                    )
-                )
+            return addon_info.state == AddonState.RUNNING
 
+    @asynccontextmanager
+    async def temporarily_stop(self, hass: HomeAssistant) -> AsyncIterator[None]:
+        """Temporarily stop the add-on, restarting it after completion."""
+        addon_manager = self._get_addon_manager(hass)
+
+        try:
+            addon_info = await addon_manager.async_get_addon_info()
+        except AddonError:
+            yield
+            return
+
+        if addon_info.state != AddonState.RUNNING:
+            yield
+            return
+
+        try:
+            await addon_manager.async_stop_addon()
+            await addon_manager.async_wait_until_addon_state(AddonState.NOT_RUNNING)
+            yield
+        finally:
+            await addon_manager.async_start_addon_waiting()
+
+
+@dataclass(kw_only=True)
+class OwningIntegration:
+    """Owning integration."""
+
+    config_entry_id: str
+
+    async def is_running(self, hass: HomeAssistant) -> bool:
+        """Check if the integration is running."""
+        if (entry := hass.config_entries.async_get_entry(self.config_entry_id)) is None:
+            return False
+
+        return entry.state in (
+            ConfigEntryState.LOADED,
+            ConfigEntryState.SETUP_RETRY,
+            ConfigEntryState.SETUP_IN_PROGRESS,
+        )
+
+    @asynccontextmanager
+    async def temporarily_stop(self, hass: HomeAssistant) -> AsyncIterator[None]:
+        """Temporarily stop the integration, restarting it after completion."""
+        if (entry := hass.config_entries.async_get_entry(self.config_entry_id)) is None:
+            yield
+            return
+
+        if entry.state != ConfigEntryState.LOADED:
+            yield
+            return
+
+        try:
+            await hass.config_entries.async_unload(entry.entry_id)
+            yield
+        finally:
+            await hass.config_entries.async_setup(entry.entry_id)
+
+
+@dataclass(kw_only=True)
+class FirmwareInfo:
+    """Firmware guess."""
+
+    device: str
+    firmware_type: ApplicationType
+    firmware_version: str | None
+
+    source: str
+    owners: list[OwningAddon | OwningIntegration]
+
+    async def is_running(self, hass: HomeAssistant) -> bool:
+        """Check if the firmware owner is running."""
+        states = await asyncio.gather(*(o.is_running(hass) for o in self.owners))
+        if not states:
+            return False
+
+        return all(states)
+
+
+async def get_otbr_addon_firmware_info(
+    hass: HomeAssistant, otbr_addon_manager: AddonManager
+) -> FirmwareInfo | None:
+    """Get firmware info from the OTBR add-on."""
+    try:
+        otbr_addon_info = await otbr_addon_manager.async_get_addon_info()
+    except AddonError:
+        return None
+
+    if otbr_addon_info.state == AddonState.NOT_INSTALLED:
+        return None
+
+    if (otbr_path := otbr_addon_info.options.get("device")) is None:
+        return None
+
+    # Only create a new entry if there are no existing OTBR ones
+    return FirmwareInfo(
+        device=otbr_path,
+        firmware_type=ApplicationType.SPINEL,
+        firmware_version=None,
+        source="otbr",
+        owners=[OwningAddon(slug=otbr_addon_manager.addon_slug)],
+    )
+
+
+async def guess_hardware_owners(
+    hass: HomeAssistant, device_path: str
+) -> list[FirmwareInfo]:
+    """Guess the firmware info based on installed addons and other integrations."""
+    device_guesses: defaultdict[str, list[FirmwareInfo]] = defaultdict(list)
+
+    async for firmware_info in hass.data[DATA_COMPONENT].iter_firmware_info():
+        device_guesses[firmware_info.device].append(firmware_info)
+
+    # It may be possible for the OTBR addon to be present without the integration
+    if is_hassio(hass):
+        otbr_addon_manager = get_otbr_addon_manager(hass)
+        otbr_addon_fw_info = await get_otbr_addon_firmware_info(
+            hass, otbr_addon_manager
+        )
+        otbr_path = (
+            otbr_addon_fw_info.device if otbr_addon_fw_info is not None else None
+        )
+
+        # Only create a new entry if there are no existing OTBR ones
+        if otbr_path is not None and not any(
+            info.source == "otbr" for info in device_guesses[otbr_path]
+        ):
+            assert otbr_addon_fw_info is not None
+            device_guesses[otbr_path].append(otbr_addon_fw_info)
+
+    if is_hassio(hass):
         multipan_addon_manager = await get_multiprotocol_addon_manager(hass)
 
         try:
@@ -136,36 +245,54 @@ async def guess_firmware_type(hass: HomeAssistant, device_path: str) -> Firmware
         else:
             if multipan_addon_info.state != AddonState.NOT_INSTALLED:
                 multipan_path = multipan_addon_info.options.get("device")
-                device_guesses[multipan_path].append(
-                    FirmwareGuess(
-                        is_running=(multipan_addon_info.state == AddonState.RUNNING),
-                        firmware_type=ApplicationType.CPC,
-                        source="multiprotocol",
-                    )
-                )
 
-    # Fall back to EZSP if we can't guess the firmware type
-    if device_path not in device_guesses:
-        return FirmwareGuess(
-            is_running=False, firmware_type=ApplicationType.EZSP, source="unknown"
+                if multipan_path is not None:
+                    device_guesses[multipan_path].append(
+                        FirmwareInfo(
+                            device=multipan_path,
+                            firmware_type=ApplicationType.CPC,
+                            firmware_version=None,
+                            source="multiprotocol",
+                            owners=[
+                                OwningAddon(slug=multipan_addon_manager.addon_slug)
+                            ],
+                        )
+                    )
+
+    return device_guesses.get(device_path, [])
+
+
+async def guess_firmware_info(hass: HomeAssistant, device_path: str) -> FirmwareInfo:
+    """Guess the firmware type based on installed addons and other integrations."""
+
+    hardware_owners = await guess_hardware_owners(hass, device_path)
+
+    # Fall back to EZSP if we have no way to guess
+    if not hardware_owners:
+        return FirmwareInfo(
+            device=device_path,
+            firmware_type=ApplicationType.EZSP,
+            firmware_version=None,
+            source="unknown",
+            owners=[],
         )
 
-    # Prioritizes guesses that were pulled from a running addon or integration but keep
-    # the sort order we defined above
-    guesses = sorted(
-        device_guesses[device_path],
-        key=lambda guess: guess.is_running,
-    )
-
+    # Prioritize guesses that are pulled from a real source
+    guesses = [
+        (guess, sum([await owner.is_running(hass) for owner in guess.owners]))
+        for guess in hardware_owners
+    ]
+    guesses.sort(key=lambda p: p[1])
     assert guesses
 
-    return guesses[-1]
+    # Pick the best one. We use a stable sort so ZHA < OTBR < multi-PAN
+    return guesses[-1][0]
 
 
-async def probe_silabs_firmware_type(
+async def probe_silabs_firmware_info(
     device: str, *, probe_methods: Iterable[ApplicationType] | None = None
-) -> ApplicationType | None:
-    """Probe the running firmware on a Silabs device."""
+) -> FirmwareInfo | None:
+    """Probe the running firmware on a SiLabs device."""
     flasher = Flasher(
         device=device,
         **(
@@ -183,4 +310,26 @@ async def probe_silabs_firmware_type(
     if flasher.app_type is None:
         return None
 
-    return ApplicationType.from_flasher_application_type(flasher.app_type)
+    return FirmwareInfo(
+        device=device,
+        firmware_type=ApplicationType.from_flasher_application_type(flasher.app_type),
+        firmware_version=(
+            flasher.app_version.orig_version
+            if flasher.app_version is not None
+            else None
+        ),
+        source="probe",
+        owners=[],
+    )
+
+
+async def probe_silabs_firmware_type(
+    device: str, *, probe_methods: Iterable[ApplicationType] | None = None
+) -> ApplicationType | None:
+    """Probe the running firmware type on a SiLabs device."""
+
+    fw_info = await probe_silabs_firmware_info(device, probe_methods=probe_methods)
+    if fw_info is None:
+        return None
+
+    return fw_info.firmware_type
diff --git a/homeassistant/components/homeassistant_sky_connect/__init__.py b/homeassistant/components/homeassistant_sky_connect/__init__.py
index 43d42e4fa59..b3af47df61d 100644
--- a/homeassistant/components/homeassistant_sky_connect/__init__.py
+++ b/homeassistant/components/homeassistant_sky_connect/__init__.py
@@ -4,15 +4,20 @@ from __future__ import annotations
 
 import logging
 
-from homeassistant.components.homeassistant_hardware.util import guess_firmware_type
+from homeassistant.components.homeassistant_hardware.util import guess_firmware_info
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 
+from .const import DESCRIPTION, DEVICE, FIRMWARE, FIRMWARE_VERSION, PRODUCT
+
 _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up a Home Assistant SkyConnect config entry."""
+
+    await hass.config_entries.async_forward_entry_setups(entry, ["update"])
+
     return True
 
 
@@ -33,15 +38,13 @@ async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
             # Add-on startup with type service get started before Core, always (e.g. the
             # Multi-Protocol add-on). Probing the firmware would interfere with the add-on,
             # so we can't safely probe here. Instead, we must make an educated guess!
-            firmware_guess = await guess_firmware_type(
-                hass, config_entry.data["device"]
-            )
+            firmware_guess = await guess_firmware_info(hass, config_entry.data[DEVICE])
 
             new_data = {**config_entry.data}
-            new_data["firmware"] = firmware_guess.firmware_type.value
+            new_data[FIRMWARE] = firmware_guess.firmware_type.value
 
             # Copy `description` to `product`
-            new_data["product"] = new_data["description"]
+            new_data[PRODUCT] = new_data[DESCRIPTION]
 
             hass.config_entries.async_update_entry(
                 config_entry,
@@ -50,6 +53,18 @@ async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
                 minor_version=2,
             )
 
+        if config_entry.minor_version == 2:
+            # Add a `firmware_version` key
+            hass.config_entries.async_update_entry(
+                config_entry,
+                data={
+                    **config_entry.data,
+                    FIRMWARE_VERSION: None,
+                },
+                version=1,
+                minor_version=3,
+            )
+
         _LOGGER.debug(
             "Migration to version %s.%s successful",
             config_entry.version,
diff --git a/homeassistant/components/homeassistant_sky_connect/config_flow.py b/homeassistant/components/homeassistant_sky_connect/config_flow.py
index b3b4f68ba96..d28d74a681c 100644
--- a/homeassistant/components/homeassistant_sky_connect/config_flow.py
+++ b/homeassistant/components/homeassistant_sky_connect/config_flow.py
@@ -10,7 +10,10 @@ from homeassistant.components.homeassistant_hardware import (
     firmware_config_flow,
     silabs_multiprotocol_addon,
 )
-from homeassistant.components.homeassistant_hardware.util import ApplicationType
+from homeassistant.components.homeassistant_hardware.util import (
+    ApplicationType,
+    FirmwareInfo,
+)
 from homeassistant.config_entries import (
     ConfigEntry,
     ConfigEntryBaseFlow,
@@ -21,7 +24,20 @@ from homeassistant.config_entries import (
 from homeassistant.core import callback
 from homeassistant.helpers.service_info.usb import UsbServiceInfo
 
-from .const import DOCS_WEB_FLASHER_URL, DOMAIN, HardwareVariant
+from .const import (
+    DESCRIPTION,
+    DEVICE,
+    DOCS_WEB_FLASHER_URL,
+    DOMAIN,
+    FIRMWARE,
+    FIRMWARE_VERSION,
+    MANUFACTURER,
+    PID,
+    PRODUCT,
+    SERIAL_NUMBER,
+    VID,
+    HardwareVariant,
+)
 from .util import get_hardware_variant, get_usb_service_info
 
 _LOGGER = logging.getLogger(__name__)
@@ -34,6 +50,7 @@ if TYPE_CHECKING:
 
         def _get_translation_placeholders(self) -> dict[str, str]:
             return {}
+
 else:
     # Multiple inheritance with `Protocol` seems to break
     TranslationPlaceholderProtocol = object
@@ -64,7 +81,7 @@ class HomeAssistantSkyConnectConfigFlow(
     """Handle a config flow for Home Assistant SkyConnect."""
 
     VERSION = 1
-    MINOR_VERSION = 2
+    MINOR_VERSION = 3
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:
         """Initialize the config flow."""
@@ -79,7 +96,7 @@ class HomeAssistantSkyConnectConfigFlow(
         config_entry: ConfigEntry,
     ) -> OptionsFlow:
         """Return the options flow."""
-        firmware_type = ApplicationType(config_entry.data["firmware"])
+        firmware_type = ApplicationType(config_entry.data[FIRMWARE])
 
         if firmware_type is ApplicationType.CPC:
             return HomeAssistantSkyConnectMultiPanOptionsFlowHandler(config_entry)
@@ -97,7 +114,7 @@ class HomeAssistantSkyConnectConfigFlow(
         unique_id = f"{vid}:{pid}_{serial_number}_{manufacturer}_{description}"
 
         if await self.async_set_unique_id(unique_id):
-            self._abort_if_unique_id_configured(updates={"device": device})
+            self._abort_if_unique_id_configured(updates={DEVICE: device})
 
         discovery_info.device = await self.hass.async_add_executor_job(
             usb.get_serial_by_id, discovery_info.device
@@ -118,19 +135,20 @@ class HomeAssistantSkyConnectConfigFlow(
         """Create the config entry."""
         assert self._usb_info is not None
         assert self._hw_variant is not None
-        assert self._probed_firmware_type is not None
+        assert self._probed_firmware_info is not None
 
         return self.async_create_entry(
             title=self._hw_variant.full_name,
             data={
-                "vid": self._usb_info.vid,
-                "pid": self._usb_info.pid,
-                "serial_number": self._usb_info.serial_number,
-                "manufacturer": self._usb_info.manufacturer,
-                "description": self._usb_info.description,  # For backwards compatibility
-                "product": self._usb_info.description,
-                "device": self._usb_info.device,
-                "firmware": self._probed_firmware_type.value,
+                VID: self._usb_info.vid,
+                PID: self._usb_info.pid,
+                SERIAL_NUMBER: self._usb_info.serial_number,
+                MANUFACTURER: self._usb_info.manufacturer,
+                DESCRIPTION: self._usb_info.description,  # For backwards compatibility
+                PRODUCT: self._usb_info.description,
+                DEVICE: self._usb_info.device,
+                FIRMWARE: self._probed_firmware_info.firmware_type.value,
+                FIRMWARE_VERSION: self._probed_firmware_info.firmware_version,
             },
         )
 
@@ -145,7 +163,7 @@ class HomeAssistantSkyConnectMultiPanOptionsFlowHandler(
     ) -> silabs_multiprotocol_addon.SerialPortSettings:
         """Return the radio serial port settings."""
         return silabs_multiprotocol_addon.SerialPortSettings(
-            device=self.config_entry.data["device"],
+            device=self.config_entry.data[DEVICE],
             baudrate="115200",
             flow_control=True,
         )
@@ -179,7 +197,8 @@ class HomeAssistantSkyConnectMultiPanOptionsFlowHandler(
             entry=self.config_entry,
             data={
                 **self.config_entry.data,
-                "firmware": ApplicationType.EZSP.value,
+                FIRMWARE: ApplicationType.EZSP.value,
+                FIRMWARE_VERSION: None,
             },
             options=self.config_entry.options,
         )
@@ -198,23 +217,32 @@ class HomeAssistantSkyConnectOptionsFlowHandler(
 
         self._usb_info = get_usb_service_info(self.config_entry)
         self._hw_variant = HardwareVariant.from_usb_product_name(
-            self.config_entry.data["product"]
+            self.config_entry.data[PRODUCT]
         )
         self._hardware_name = self._hw_variant.full_name
         self._device = self._usb_info.device
 
+        self._probed_firmware_info = FirmwareInfo(
+            device=self._device,
+            firmware_type=ApplicationType(self.config_entry.data[FIRMWARE]),
+            firmware_version=self.config_entry.data[FIRMWARE_VERSION],
+            source="guess",
+            owners=[],
+        )
+
         # Regenerate the translation placeholders
         self._get_translation_placeholders()
 
     def _async_flow_finished(self) -> ConfigFlowResult:
         """Create the config entry."""
-        assert self._probed_firmware_type is not None
+        assert self._probed_firmware_info is not None
 
         self.hass.config_entries.async_update_entry(
             entry=self.config_entry,
             data={
                 **self.config_entry.data,
-                "firmware": self._probed_firmware_type.value,
+                FIRMWARE: self._probed_firmware_info.firmware_type.value,
+                FIRMWARE_VERSION: self._probed_firmware_info.firmware_version,
             },
             options=self.config_entry.options,
         )
diff --git a/homeassistant/components/homeassistant_sky_connect/const.py b/homeassistant/components/homeassistant_sky_connect/const.py
index cae0b98a25b..70ff047366d 100644
--- a/homeassistant/components/homeassistant_sky_connect/const.py
+++ b/homeassistant/components/homeassistant_sky_connect/const.py
@@ -7,6 +7,20 @@ from typing import Self
 DOMAIN = "homeassistant_sky_connect"
 DOCS_WEB_FLASHER_URL = "https://skyconnect.home-assistant.io/firmware-update/"
 
+NABU_CASA_FIRMWARE_RELEASES_URL = (
+    "https://api.github.com/repos/NabuCasa/silabs-firmware-builder/releases/latest"
+)
+
+FIRMWARE = "firmware"
+FIRMWARE_VERSION = "firmware_version"
+SERIAL_NUMBER = "serial_number"
+MANUFACTURER = "manufacturer"
+PRODUCT = "product"
+DESCRIPTION = "description"
+PID = "pid"
+VID = "vid"
+DEVICE = "device"
+
 
 @dataclasses.dataclass(frozen=True)
 class VariantInfo:
diff --git a/homeassistant/components/homeassistant_sky_connect/update.py b/homeassistant/components/homeassistant_sky_connect/update.py
new file mode 100644
index 00000000000..43e3f1ca255
--- /dev/null
+++ b/homeassistant/components/homeassistant_sky_connect/update.py
@@ -0,0 +1,169 @@
+"""Home Assistant SkyConnect firmware update entity."""
+
+from __future__ import annotations
+
+import logging
+
+import aiohttp
+
+from homeassistant.components.homeassistant_hardware.coordinator import (
+    FirmwareUpdateCoordinator,
+)
+from homeassistant.components.homeassistant_hardware.update import (
+    BaseFirmwareUpdateEntity,
+    FirmwareUpdateEntityDescription,
+)
+from homeassistant.components.homeassistant_hardware.util import (
+    ApplicationType,
+    FirmwareInfo,
+)
+from homeassistant.components.update import UpdateDeviceClass
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .const import FIRMWARE, FIRMWARE_VERSION, NABU_CASA_FIRMWARE_RELEASES_URL
+
+_LOGGER = logging.getLogger(__name__)
+
+
+FIRMWARE_ENTITY_DESCRIPTIONS: dict[
+    ApplicationType | None, FirmwareUpdateEntityDescription
+] = {
+    ApplicationType.EZSP: FirmwareUpdateEntityDescription(
+        key="firmware",
+        display_precision=0,
+        device_class=UpdateDeviceClass.FIRMWARE,
+        entity_category=EntityCategory.CONFIG,
+        version_parser=lambda fw: fw.split(" ", 1)[0],
+        fw_type="skyconnect_zigbee_ncp",
+        version_key="ezsp_version",
+        expected_firmware_type=ApplicationType.EZSP,
+        firmware_name="EmberZNet",
+    ),
+    ApplicationType.SPINEL: FirmwareUpdateEntityDescription(
+        key="firmware",
+        display_precision=0,
+        device_class=UpdateDeviceClass.FIRMWARE,
+        entity_category=EntityCategory.CONFIG,
+        version_parser=lambda fw: fw.split("/", 1)[1].split("_", 1)[0],
+        fw_type="skyconnect_openthread_rcp",
+        version_key="ot_rcp_version",
+        expected_firmware_type=ApplicationType.SPINEL,
+        firmware_name="OpenThread RCP",
+    ),
+    None: FirmwareUpdateEntityDescription(
+        key="firmware",
+        display_precision=0,
+        device_class=UpdateDeviceClass.FIRMWARE,
+        entity_category=EntityCategory.CONFIG,
+        version_parser=lambda fw: fw,
+        fw_type=None,
+        version_key=None,
+        expected_firmware_type=None,
+        firmware_name=None,
+    ),
+}
+
+
+def _async_create_update_entity(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    session: aiohttp.ClientSession,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> FirmwareUpdateEntity:
+    """Create an update entity that handles firmware type changes."""
+    firmware_type = config_entry.data[FIRMWARE]
+    entity_description = FIRMWARE_ENTITY_DESCRIPTIONS[
+        ApplicationType(firmware_type) if firmware_type is not None else None
+    ]
+
+    entity = FirmwareUpdateEntity(
+        device=config_entry.data["device"],
+        config_entry=config_entry,
+        update_coordinator=FirmwareUpdateCoordinator(
+            hass,
+            session,
+            NABU_CASA_FIRMWARE_RELEASES_URL,
+        ),
+        entity_description=entity_description,
+    )
+
+    def firmware_type_changed(
+        old_type: ApplicationType | None, new_type: ApplicationType | None
+    ) -> None:
+        """Replace the current entity when the firmware type changes."""
+        er.async_get(hass).async_remove(entity.entity_id)
+        async_add_entities(
+            [
+                _async_create_update_entity(
+                    hass, config_entry, session, async_add_entities
+                )
+            ]
+        )
+
+    entity.async_on_remove(
+        entity.add_firmware_type_changed_callback(firmware_type_changed)
+    )
+
+    return entity
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the firmware update config entry."""
+    session = async_get_clientsession(hass)
+    entity = _async_create_update_entity(
+        hass, config_entry, session, async_add_entities
+    )
+
+    async_add_entities([entity])
+
+
+class FirmwareUpdateEntity(BaseFirmwareUpdateEntity):
+    """SkyConnect firmware update entity."""
+
+    bootloader_reset_type = None
+
+    def __init__(
+        self,
+        device: str,
+        config_entry: ConfigEntry,
+        update_coordinator: FirmwareUpdateCoordinator,
+        entity_description: FirmwareUpdateEntityDescription,
+    ) -> None:
+        """Initialize the SkyConnect firmware update entity."""
+        super().__init__(device, config_entry, update_coordinator, entity_description)
+
+        self._attr_unique_id = (
+            f"{self._config_entry.data['serial_number']}_{self.entity_description.key}"
+        )
+
+        # Use the cached firmware info if it exists
+        if self._config_entry.data[FIRMWARE] is not None:
+            self._current_firmware_info = FirmwareInfo(
+                device=device,
+                firmware_type=ApplicationType(self._config_entry.data[FIRMWARE]),
+                firmware_version=self._config_entry.data[FIRMWARE_VERSION],
+                owners=[],
+                source="homeassistant_sky_connect",
+            )
+
+    @callback
+    def _firmware_info_callback(self, firmware_info: FirmwareInfo) -> None:
+        """Handle updated firmware info being pushed by an integration."""
+        self.hass.config_entries.async_update_entry(
+            self._config_entry,
+            data={
+                **self._config_entry.data,
+                FIRMWARE: firmware_info.firmware_type,
+                FIRMWARE_VERSION: firmware_info.firmware_version,
+            },
+        )
+        super()._firmware_info_callback(firmware_info)
diff --git a/homeassistant/components/homeassistant_yellow/__init__.py b/homeassistant/components/homeassistant_yellow/__init__.py
index dc34cc4cdc9..06f908ab61e 100644
--- a/homeassistant/components/homeassistant_yellow/__init__.py
+++ b/homeassistant/components/homeassistant_yellow/__init__.py
@@ -10,7 +10,7 @@ from homeassistant.components.homeassistant_hardware.silabs_multiprotocol_addon
 )
 from homeassistant.components.homeassistant_hardware.util import (
     ApplicationType,
-    guess_firmware_type,
+    guess_firmware_info,
 )
 from homeassistant.config_entries import SOURCE_HARDWARE, ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -18,7 +18,7 @@ from homeassistant.exceptions import ConfigEntryNotReady, HomeAssistantError
 from homeassistant.helpers import discovery_flow
 from homeassistant.helpers.hassio import is_hassio
 
-from .const import FIRMWARE, RADIO_DEVICE, ZHA_HW_DISCOVERY_DATA
+from .const import FIRMWARE, FIRMWARE_VERSION, RADIO_DEVICE, ZHA_HW_DISCOVERY_DATA
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -55,6 +55,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             data=ZHA_HW_DISCOVERY_DATA,
         )
 
+    await hass.config_entries.async_forward_entry_setups(entry, ["update"])
+
     return True
 
 
@@ -75,7 +77,7 @@ async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
             # Add-on startup with type service get started before Core, always (e.g. the
             # Multi-Protocol add-on). Probing the firmware would interfere with the add-on,
             # so we can't safely probe here. Instead, we must make an educated guess!
-            firmware_guess = await guess_firmware_type(hass, RADIO_DEVICE)
+            firmware_guess = await guess_firmware_info(hass, RADIO_DEVICE)
 
             new_data = {**config_entry.data}
             new_data[FIRMWARE] = firmware_guess.firmware_type.value
@@ -87,6 +89,18 @@ async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
                 minor_version=2,
             )
 
+        if config_entry.minor_version == 2:
+            # Add a `firmware_version` key
+            hass.config_entries.async_update_entry(
+                config_entry,
+                data={
+                    **config_entry.data,
+                    FIRMWARE_VERSION: None,
+                },
+                version=1,
+                minor_version=3,
+            )
+
         _LOGGER.debug(
             "Migration to version %s.%s successful",
             config_entry.version,
diff --git a/homeassistant/components/homeassistant_yellow/config_flow.py b/homeassistant/components/homeassistant_yellow/config_flow.py
index 502a20db07c..5472c346e94 100644
--- a/homeassistant/components/homeassistant_yellow/config_flow.py
+++ b/homeassistant/components/homeassistant_yellow/config_flow.py
@@ -24,7 +24,10 @@ from homeassistant.components.homeassistant_hardware.silabs_multiprotocol_addon
     OptionsFlowHandler as MultiprotocolOptionsFlowHandler,
     SerialPortSettings as MultiprotocolSerialPortSettings,
 )
-from homeassistant.components.homeassistant_hardware.util import ApplicationType
+from homeassistant.components.homeassistant_hardware.util import (
+    ApplicationType,
+    FirmwareInfo,
+)
 from homeassistant.config_entries import (
     SOURCE_HARDWARE,
     ConfigEntry,
@@ -34,7 +37,14 @@ from homeassistant.config_entries import (
 from homeassistant.core import HomeAssistant, async_get_hass, callback
 from homeassistant.helpers import discovery_flow, selector
 
-from .const import DOMAIN, FIRMWARE, RADIO_DEVICE, ZHA_DOMAIN, ZHA_HW_DISCOVERY_DATA
+from .const import (
+    DOMAIN,
+    FIRMWARE,
+    FIRMWARE_VERSION,
+    RADIO_DEVICE,
+    ZHA_DOMAIN,
+    ZHA_HW_DISCOVERY_DATA,
+)
 from .hardware import BOARD_NAME
 
 _LOGGER = logging.getLogger(__name__)
@@ -52,7 +62,7 @@ class HomeAssistantYellowConfigFlow(BaseFirmwareConfigFlow, domain=DOMAIN):
     """Handle a config flow for Home Assistant Yellow."""
 
     VERSION = 1
-    MINOR_VERSION = 2
+    MINOR_VERSION = 3
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:
         """Instantiate config flow."""
@@ -79,10 +89,13 @@ class HomeAssistantYellowConfigFlow(BaseFirmwareConfigFlow, domain=DOMAIN):
     ) -> ConfigFlowResult:
         """Handle the initial step."""
         # We do not actually use any portion of `BaseFirmwareConfigFlow` beyond this
-        await self._probe_firmware_type()
+        await self._probe_firmware_info()
 
         # Kick off ZHA hardware discovery automatically if Zigbee firmware is running
-        if self._probed_firmware_type is ApplicationType.EZSP:
+        if (
+            self._probed_firmware_info is not None
+            and self._probed_firmware_info.firmware_type is ApplicationType.EZSP
+        ):
             discovery_flow.async_create_flow(
                 self.hass,
                 ZHA_DOMAIN,
@@ -98,7 +111,11 @@ class HomeAssistantYellowConfigFlow(BaseFirmwareConfigFlow, domain=DOMAIN):
             title=BOARD_NAME,
             data={
                 # Assume the firmware type is EZSP if we cannot probe it
-                FIRMWARE: (self._probed_firmware_type or ApplicationType.EZSP).value,
+                FIRMWARE: (
+                    self._probed_firmware_info.firmware_type
+                    if self._probed_firmware_info is not None
+                    else ApplicationType.EZSP
+                ).value,
             },
         )
 
@@ -264,6 +281,14 @@ class HomeAssistantYellowOptionsFlowHandler(
         self._hardware_name = BOARD_NAME
         self._device = RADIO_DEVICE
 
+        self._probed_firmware_info = FirmwareInfo(
+            device=self._device,
+            firmware_type=ApplicationType(self.config_entry.data["firmware"]),
+            firmware_version=None,
+            source="guess",
+            owners=[],
+        )
+
         # Regenerate the translation placeholders
         self._get_translation_placeholders()
 
@@ -285,13 +310,14 @@ class HomeAssistantYellowOptionsFlowHandler(
 
     def _async_flow_finished(self) -> ConfigFlowResult:
         """Create the config entry."""
-        assert self._probed_firmware_type is not None
+        assert self._probed_firmware_info is not None
 
         self.hass.config_entries.async_update_entry(
             entry=self.config_entry,
             data={
                 **self.config_entry.data,
-                FIRMWARE: self._probed_firmware_type.value,
+                FIRMWARE: self._probed_firmware_info.firmware_type.value,
+                FIRMWARE_VERSION: self._probed_firmware_info.firmware_version,
             },
         )
 
diff --git a/homeassistant/components/homeassistant_yellow/const.py b/homeassistant/components/homeassistant_yellow/const.py
index 79753ae9b9e..b98b1133d01 100644
--- a/homeassistant/components/homeassistant_yellow/const.py
+++ b/homeassistant/components/homeassistant_yellow/const.py
@@ -2,7 +2,10 @@
 
 DOMAIN = "homeassistant_yellow"
 
+RADIO_MODEL = "Home Assistant Yellow"
+RADIO_MANUFACTURER = "Nabu Casa"
 RADIO_DEVICE = "/dev/ttyAMA1"
+
 ZHA_HW_DISCOVERY_DATA = {
     "name": "Yellow",
     "port": {
@@ -14,4 +17,9 @@ ZHA_HW_DISCOVERY_DATA = {
 }
 
 FIRMWARE = "firmware"
+FIRMWARE_VERSION = "firmware_version"
 ZHA_DOMAIN = "zha"
+
+NABU_CASA_FIRMWARE_RELEASES_URL = (
+    "https://api.github.com/repos/NabuCasa/silabs-firmware-builder/releases/latest"
+)
diff --git a/homeassistant/components/homeassistant_yellow/update.py b/homeassistant/components/homeassistant_yellow/update.py
new file mode 100644
index 00000000000..88d4f2912d3
--- /dev/null
+++ b/homeassistant/components/homeassistant_yellow/update.py
@@ -0,0 +1,172 @@
+"""Home Assistant Yellow firmware update entity."""
+
+from __future__ import annotations
+
+import logging
+
+import aiohttp
+
+from homeassistant.components.homeassistant_hardware.coordinator import (
+    FirmwareUpdateCoordinator,
+)
+from homeassistant.components.homeassistant_hardware.update import (
+    BaseFirmwareUpdateEntity,
+    FirmwareUpdateEntityDescription,
+)
+from homeassistant.components.homeassistant_hardware.util import (
+    ApplicationType,
+    FirmwareInfo,
+)
+from homeassistant.components.update import UpdateDeviceClass
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .const import (
+    FIRMWARE,
+    FIRMWARE_VERSION,
+    NABU_CASA_FIRMWARE_RELEASES_URL,
+    RADIO_DEVICE,
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+FIRMWARE_ENTITY_DESCRIPTIONS: dict[
+    ApplicationType | None, FirmwareUpdateEntityDescription
+] = {
+    ApplicationType.EZSP: FirmwareUpdateEntityDescription(
+        key="firmware",
+        display_precision=0,
+        device_class=UpdateDeviceClass.FIRMWARE,
+        entity_category=EntityCategory.CONFIG,
+        version_parser=lambda fw: fw.split(" ", 1)[0],
+        fw_type="yellow_zigbee_ncp",
+        version_key="ezsp_version",
+        expected_firmware_type=ApplicationType.EZSP,
+        firmware_name="EmberZNet",
+    ),
+    ApplicationType.SPINEL: FirmwareUpdateEntityDescription(
+        key="firmware",
+        display_precision=0,
+        device_class=UpdateDeviceClass.FIRMWARE,
+        entity_category=EntityCategory.CONFIG,
+        version_parser=lambda fw: fw.split("/", 1)[1].split("_", 1)[0],
+        fw_type="yellow_openthread_rcp",
+        version_key="ot_rcp_version",
+        expected_firmware_type=ApplicationType.SPINEL,
+        firmware_name="OpenThread RCP",
+    ),
+    None: FirmwareUpdateEntityDescription(
+        key="firmware",
+        display_precision=0,
+        device_class=UpdateDeviceClass.FIRMWARE,
+        entity_category=EntityCategory.CONFIG,
+        version_parser=lambda fw: fw,
+        fw_type=None,
+        version_key=None,
+        expected_firmware_type=None,
+        firmware_name=None,
+    ),
+}
+
+
+def _async_create_update_entity(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    session: aiohttp.ClientSession,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> FirmwareUpdateEntity:
+    """Create an update entity that handles firmware type changes."""
+    firmware_type = config_entry.data[FIRMWARE]
+    entity_description = FIRMWARE_ENTITY_DESCRIPTIONS[
+        ApplicationType(firmware_type) if firmware_type is not None else None
+    ]
+
+    entity = FirmwareUpdateEntity(
+        device=RADIO_DEVICE,
+        config_entry=config_entry,
+        update_coordinator=FirmwareUpdateCoordinator(
+            hass,
+            session,
+            NABU_CASA_FIRMWARE_RELEASES_URL,
+        ),
+        entity_description=entity_description,
+    )
+
+    def firmware_type_changed(
+        old_type: ApplicationType | None, new_type: ApplicationType | None
+    ) -> None:
+        """Replace the current entity when the firmware type changes."""
+        er.async_get(hass).async_remove(entity.entity_id)
+        async_add_entities(
+            [
+                _async_create_update_entity(
+                    hass, config_entry, session, async_add_entities
+                )
+            ]
+        )
+
+    entity.async_on_remove(
+        entity.add_firmware_type_changed_callback(firmware_type_changed)
+    )
+
+    return entity
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the firmware update config entry."""
+    session = async_get_clientsession(hass)
+    entity = _async_create_update_entity(
+        hass, config_entry, session, async_add_entities
+    )
+
+    async_add_entities([entity])
+
+
+class FirmwareUpdateEntity(BaseFirmwareUpdateEntity):
+    """Yellow firmware update entity."""
+
+    bootloader_reset_type = "yellow"  # Triggers a GPIO reset
+
+    def __init__(
+        self,
+        device: str,
+        config_entry: ConfigEntry,
+        update_coordinator: FirmwareUpdateCoordinator,
+        entity_description: FirmwareUpdateEntityDescription,
+    ) -> None:
+        """Initialize the Yellow firmware update entity."""
+        super().__init__(device, config_entry, update_coordinator, entity_description)
+
+        self._attr_unique_id = self.entity_description.key
+
+        # Use the cached firmware info if it exists
+        if self._config_entry.data[FIRMWARE] is not None:
+            self._current_firmware_info = FirmwareInfo(
+                device=device,
+                firmware_type=ApplicationType(self._config_entry.data[FIRMWARE]),
+                firmware_version=self._config_entry.data[FIRMWARE_VERSION],
+                owners=[],
+                source="homeassistant_yellow",
+            )
+
+    @callback
+    def _firmware_info_callback(self, firmware_info: FirmwareInfo) -> None:
+        """Handle updated firmware info being pushed by an integration."""
+        self.hass.config_entries.async_update_entry(
+            self._config_entry,
+            data={
+                **self._config_entry.data,
+                FIRMWARE: firmware_info.firmware_type,
+                FIRMWARE_VERSION: firmware_info.firmware_version,
+            },
+        )
+        super()._firmware_info_callback(firmware_info)
diff --git a/homeassistant/components/homee/__init__.py b/homeassistant/components/homee/__init__.py
index 1ec09e09694..9fd88ee40aa 100644
--- a/homeassistant/components/homee/__init__.py
+++ b/homeassistant/components/homee/__init__.py
@@ -14,7 +14,18 @@ from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
-PLATFORMS = [Platform.COVER, Platform.SENSOR]
+PLATFORMS = [
+    Platform.BINARY_SENSOR,
+    Platform.BUTTON,
+    Platform.COVER,
+    Platform.LIGHT,
+    Platform.LOCK,
+    Platform.NUMBER,
+    Platform.SELECT,
+    Platform.SENSOR,
+    Platform.SWITCH,
+    Platform.VALVE,
+]
 
 type HomeeConfigEntry = ConfigEntry[Homee]
 
@@ -51,14 +62,14 @@ async def async_setup_entry(hass: HomeAssistant, entry: HomeeConfigEntry) -> boo
     entry.runtime_data = homee
     entry.async_on_unload(homee.disconnect)
 
-    async def _connection_update_callback(connected: bool) -> None:
+    def _connection_update_callback(connected: bool) -> None:
         """Call when the device is notified of changes."""
         if connected:
             _LOGGER.warning("Reconnected to Homee at %s", entry.data[CONF_HOST])
         else:
             _LOGGER.warning("Disconnected from Homee at %s", entry.data[CONF_HOST])
 
-    await homee.add_connection_listener(_connection_update_callback)
+    homee.add_connection_listener(_connection_update_callback)
 
     # create device register entry
     device_registry = dr.async_get(hass)
diff --git a/homeassistant/components/homee/binary_sensor.py b/homeassistant/components/homee/binary_sensor.py
new file mode 100644
index 00000000000..3f5f5c46a29
--- /dev/null
+++ b/homeassistant/components/homee/binary_sensor.py
@@ -0,0 +1,190 @@
+"""The Homee binary sensor platform."""
+
+from pyHomee.const import AttributeType
+from pyHomee.model import HomeeAttribute
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDeviceClass,
+    BinarySensorEntity,
+    BinarySensorEntityDescription,
+)
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import HomeeConfigEntry
+from .entity import HomeeEntity
+
+PARALLEL_UPDATES = 0
+
+BINARY_SENSOR_DESCRIPTIONS: dict[AttributeType, BinarySensorEntityDescription] = {
+    AttributeType.BATTERY_LOW_ALARM: BinarySensorEntityDescription(
+        key="battery",
+        device_class=BinarySensorDeviceClass.BATTERY,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    AttributeType.BLACKOUT_ALARM: BinarySensorEntityDescription(
+        key="blackout_alarm",
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    AttributeType.COALARM: BinarySensorEntityDescription(
+        key="carbon_monoxide", device_class=BinarySensorDeviceClass.CO
+    ),
+    AttributeType.CO2ALARM: BinarySensorEntityDescription(
+        key="carbon_dioxide", device_class=BinarySensorDeviceClass.PROBLEM
+    ),
+    AttributeType.FLOOD_ALARM: BinarySensorEntityDescription(
+        key="flood",
+        device_class=BinarySensorDeviceClass.MOISTURE,
+    ),
+    AttributeType.HIGH_TEMPERATURE_ALARM: BinarySensorEntityDescription(
+        key="high_temperature",
+        device_class=BinarySensorDeviceClass.HEAT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    AttributeType.LEAK_ALARM: BinarySensorEntityDescription(
+        key="leak_alarm",
+        device_class=BinarySensorDeviceClass.PROBLEM,
+    ),
+    AttributeType.LOAD_ALARM: BinarySensorEntityDescription(
+        key="load_alarm",
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    AttributeType.LOCK_STATE: BinarySensorEntityDescription(
+        key="lock",
+        device_class=BinarySensorDeviceClass.LOCK,
+    ),
+    AttributeType.LOW_TEMPERATURE_ALARM: BinarySensorEntityDescription(
+        key="low_temperature",
+        device_class=BinarySensorDeviceClass.COLD,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    AttributeType.MALFUNCTION_ALARM: BinarySensorEntityDescription(
+        key="malfunction",
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    AttributeType.MAXIMUM_ALARM: BinarySensorEntityDescription(
+        key="maximum",
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    AttributeType.MINIMUM_ALARM: BinarySensorEntityDescription(
+        key="minimum",
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    AttributeType.MOTION_ALARM: BinarySensorEntityDescription(
+        key="motion",
+        device_class=BinarySensorDeviceClass.MOTION,
+    ),
+    AttributeType.MOTOR_BLOCKED_ALARM: BinarySensorEntityDescription(
+        key="motor_blocked",
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    AttributeType.ON_OFF: BinarySensorEntityDescription(
+        key="plug",
+        device_class=BinarySensorDeviceClass.PLUG,
+    ),
+    AttributeType.OPEN_CLOSE: BinarySensorEntityDescription(
+        key="opening",
+        device_class=BinarySensorDeviceClass.OPENING,
+    ),
+    AttributeType.OVER_CURRENT_ALARM: BinarySensorEntityDescription(
+        key="overcurrent",
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    AttributeType.OVERLOAD_ALARM: BinarySensorEntityDescription(
+        key="overload",
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    AttributeType.PRESENCE_ALARM: BinarySensorEntityDescription(
+        key="presence",
+        device_class=BinarySensorDeviceClass.PRESENCE,
+    ),
+    AttributeType.POWER_SUPPLY_ALARM: BinarySensorEntityDescription(
+        key="power",
+        device_class=BinarySensorDeviceClass.POWER,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    AttributeType.RAIN_FALL: BinarySensorEntityDescription(
+        key="rain",
+        device_class=BinarySensorDeviceClass.MOISTURE,
+    ),
+    AttributeType.REPLACE_FILTER_ALARM: BinarySensorEntityDescription(
+        key="replace_filter",
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    AttributeType.SMOKE_ALARM: BinarySensorEntityDescription(
+        key="smoke",
+        device_class=BinarySensorDeviceClass.SMOKE,
+    ),
+    AttributeType.STORAGE_ALARM: BinarySensorEntityDescription(
+        key="storage",
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    AttributeType.SURGE_ALARM: BinarySensorEntityDescription(
+        key="surge",
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    AttributeType.TAMPER_ALARM: BinarySensorEntityDescription(
+        key="tamper",
+        device_class=BinarySensorDeviceClass.TAMPER,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    AttributeType.VOLTAGE_DROP_ALARM: BinarySensorEntityDescription(
+        key="voltage_drop",
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    AttributeType.WATER_ALARM: BinarySensorEntityDescription(
+        key="water",
+        device_class=BinarySensorDeviceClass.MOISTURE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+}
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: HomeeConfigEntry,
+    async_add_devices: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Add the Homee platform for the binary sensor component."""
+
+    async_add_devices(
+        HomeeBinarySensor(
+            attribute, config_entry, BINARY_SENSOR_DESCRIPTIONS[attribute.type]
+        )
+        for node in config_entry.runtime_data.nodes
+        for attribute in node.attributes
+        if attribute.type in BINARY_SENSOR_DESCRIPTIONS and not attribute.editable
+    )
+
+
+class HomeeBinarySensor(HomeeEntity, BinarySensorEntity):
+    """Representation of a Homee binary sensor."""
+
+    def __init__(
+        self,
+        attribute: HomeeAttribute,
+        entry: HomeeConfigEntry,
+        description: BinarySensorEntityDescription,
+    ) -> None:
+        """Initialize a Homee binary sensor entity."""
+        super().__init__(attribute, entry)
+
+        self.entity_description = description
+        self._attr_translation_key = description.key
+
+    @property
+    def is_on(self) -> bool:
+        """Return true if the binary sensor is on."""
+        return bool(self._attribute.current_value)
diff --git a/homeassistant/components/homee/button.py b/homeassistant/components/homee/button.py
new file mode 100644
index 00000000000..33a8b5f23c8
--- /dev/null
+++ b/homeassistant/components/homee/button.py
@@ -0,0 +1,80 @@
+"""The homee button platform."""
+
+from pyHomee.const import AttributeType
+from pyHomee.model import HomeeAttribute
+
+from homeassistant.components.button import (
+    ButtonDeviceClass,
+    ButtonEntity,
+    ButtonEntityDescription,
+)
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import HomeeConfigEntry
+from .entity import HomeeEntity
+
+PARALLEL_UPDATES = 0
+
+BUTTON_DESCRIPTIONS: dict[AttributeType, ButtonEntityDescription] = {
+    AttributeType.AUTOMATIC_MODE_IMPULSE: ButtonEntityDescription(key="automatic_mode"),
+    AttributeType.BRIEFLY_OPEN_IMPULSE: ButtonEntityDescription(key="briefly_open"),
+    AttributeType.IDENTIFICATION_MODE: ButtonEntityDescription(
+        key="identification_mode",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        device_class=ButtonDeviceClass.IDENTIFY,
+    ),
+    AttributeType.IMPULSE: ButtonEntityDescription(key="impulse"),
+    AttributeType.LIGHT_IMPULSE: ButtonEntityDescription(key="light"),
+    AttributeType.OPEN_PARTIAL_IMPULSE: ButtonEntityDescription(key="open_partial"),
+    AttributeType.PERMANENTLY_OPEN_IMPULSE: ButtonEntityDescription(
+        key="permanently_open"
+    ),
+    AttributeType.RESET_METER: ButtonEntityDescription(
+        key="reset_meter",
+        entity_category=EntityCategory.CONFIG,
+    ),
+    AttributeType.VENTILATE_IMPULSE: ButtonEntityDescription(key="ventilate"),
+}
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: HomeeConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Add the Homee platform for the button component."""
+
+    async_add_entities(
+        HomeeButton(attribute, config_entry, BUTTON_DESCRIPTIONS[attribute.type])
+        for node in config_entry.runtime_data.nodes
+        for attribute in node.attributes
+        if attribute.type in BUTTON_DESCRIPTIONS and attribute.editable
+    )
+
+
+class HomeeButton(HomeeEntity, ButtonEntity):
+    """Representation of a Homee button."""
+
+    def __init__(
+        self,
+        attribute: HomeeAttribute,
+        entry: HomeeConfigEntry,
+        description: ButtonEntityDescription,
+    ) -> None:
+        """Initialize a Homee button entity."""
+        super().__init__(attribute, entry)
+        self.entity_description = description
+        if attribute.instance == 0:
+            if attribute.type == AttributeType.IMPULSE:
+                self._attr_name = None
+            else:
+                self._attr_translation_key = description.key
+        else:
+            self._attr_translation_key = f"{description.key}_instance"
+            self._attr_translation_placeholders = {"instance": str(attribute.instance)}
+
+    async def async_press(self) -> None:
+        """Handle the button press."""
+        await self.async_set_homee_value(1)
diff --git a/homeassistant/components/homee/config_flow.py b/homeassistant/components/homee/config_flow.py
index 61d2a3f25a5..1a3c5011f82 100644
--- a/homeassistant/components/homee/config_flow.py
+++ b/homeassistant/components/homee/config_flow.py
@@ -52,7 +52,7 @@ class HomeeConfigFlow(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "cannot_connect"
             except HomeeAuthenticationFailedException:
                 errors["base"] = "invalid_auth"
-            except Exception:  # pylint: disable=broad-except
+            except Exception:
                 _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
diff --git a/homeassistant/components/homee/const.py b/homeassistant/components/homee/const.py
index d1d5be97ef7..2c614d3f5eb 100644
--- a/homeassistant/components/homee/const.py
+++ b/homeassistant/components/homee/const.py
@@ -1,6 +1,9 @@
 """Constants for the homee integration."""
 
+from pyHomee.const import NodeProfile
+
 from homeassistant.const import (
+    DEGREE,
     LIGHT_LUX,
     PERCENTAGE,
     REVOLUTIONS_PER_MINUTE,
@@ -32,6 +35,7 @@ HOMEE_UNIT_TO_HA_UNIT = {
     "W": UnitOfPower.WATT,
     "m/s": UnitOfSpeed.METERS_PER_SECOND,
     "km/h": UnitOfSpeed.KILOMETERS_PER_HOUR,
+    "°": DEGREE,
     "°F": UnitOfTemperature.FAHRENHEIT,
     "°C": UnitOfTemperature.CELSIUS,
     "K": UnitOfTemperature.KELVIN,
@@ -51,7 +55,7 @@ OPEN_CLOSE_MAP_REVERSED = {
     0.0: "closed",
     1.0: "open",
     2.0: "partial",
-    3.0: "cosing",
+    3.0: "closing",
     4.0: "opening",
 }
 WINDOW_MAP = {
@@ -60,3 +64,34 @@ WINDOW_MAP = {
     2.0: "tilted",
 }
 WINDOW_MAP_REVERSED = {0.0: "open", 1.0: "closed", 2.0: "tilted"}
+
+# Profile Groups
+CLIMATE_PROFILES = [
+    NodeProfile.COSI_THERM_CHANNEL,
+    NodeProfile.HEATING_SYSTEM,
+    NodeProfile.RADIATOR_THERMOSTAT,
+    NodeProfile.ROOM_THERMOSTAT,
+    NodeProfile.ROOM_THERMOSTAT_WITH_HUMIDITY_SENSOR,
+    NodeProfile.THERMOSTAT_WITH_HEATING_AND_COOLING,
+    NodeProfile.WIFI_RADIATOR_THERMOSTAT,
+    NodeProfile.WIFI_ROOM_THERMOSTAT,
+]
+
+LIGHT_PROFILES = [
+    NodeProfile.DIMMABLE_COLOR_LIGHT,
+    NodeProfile.DIMMABLE_COLOR_METERING_PLUG,
+    NodeProfile.DIMMABLE_COLOR_TEMPERATURE_LIGHT,
+    NodeProfile.DIMMABLE_EXTENDED_COLOR_LIGHT,
+    NodeProfile.DIMMABLE_LIGHT,
+    NodeProfile.DIMMABLE_LIGHT_WITH_BRIGHTNESS_SENSOR,
+    NodeProfile.DIMMABLE_LIGHT_WITH_BRIGHTNESS_AND_PRESENCE_SENSOR,
+    NodeProfile.DIMMABLE_LIGHT_WITH_PRESENCE_SENSOR,
+    NodeProfile.DIMMABLE_METERING_SWITCH,
+    NodeProfile.DIMMABLE_METERING_PLUG,
+    NodeProfile.DIMMABLE_PLUG,
+    NodeProfile.DIMMABLE_RGBWLIGHT,
+    NodeProfile.DIMMABLE_SWITCH,
+    NodeProfile.WIFI_DIMMABLE_RGBWLIGHT,
+    NodeProfile.WIFI_DIMMABLE_LIGHT,
+    NodeProfile.WIFI_ON_OFF_DIMMABLE_METERING_SWITCH,
+]
diff --git a/homeassistant/components/homee/cover.py b/homeassistant/components/homee/cover.py
index b4a853f7c35..79a9b00ffba 100644
--- a/homeassistant/components/homee/cover.py
+++ b/homeassistant/components/homee/cover.py
@@ -14,13 +14,15 @@ from homeassistant.components.cover import (
     CoverEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import HomeeConfigEntry
 from .entity import HomeeNodeEntity
 
 _LOGGER = logging.getLogger(__name__)
 
+PARALLEL_UPDATES = 0
+
 OPEN_CLOSE_ATTRIBUTES = [
     AttributeType.OPEN_CLOSE,
     AttributeType.SLAT_ROTATION_IMPULSE,
@@ -68,6 +70,7 @@ def get_device_class(node: HomeeNode) -> CoverDeviceClass | None:
     """Determine the device class a homee node based on the node profile."""
     COVER_DEVICE_PROFILES = {
         NodeProfile.GARAGE_DOOR_OPERATOR: CoverDeviceClass.GARAGE,
+        NodeProfile.ENTRANCE_GATE_OPERATOR: CoverDeviceClass.GATE,
         NodeProfile.SHUTTER_POSITION_SWITCH: CoverDeviceClass.SHUTTER,
     }
 
@@ -77,7 +80,7 @@ def get_device_class(node: HomeeNode) -> CoverDeviceClass | None:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: HomeeConfigEntry,
-    async_add_devices: AddEntitiesCallback,
+    async_add_devices: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add the homee platform for the cover integration."""
 
@@ -93,6 +96,7 @@ def is_cover_node(node: HomeeNode) -> bool:
     return node.profile in [
         NodeProfile.ELECTRIC_MOTOR_METERING_SWITCH,
         NodeProfile.ELECTRIC_MOTOR_METERING_SWITCH_WITHOUT_SLAT_POSITION,
+        NodeProfile.ENTRANCE_GATE_OPERATOR,
         NodeProfile.GARAGE_DOOR_OPERATOR,
         NodeProfile.SHUTTER_POSITION_SWITCH,
     ]
@@ -203,17 +207,17 @@ class HomeeCover(HomeeNodeEntity, CoverEntity):
         """Open the cover."""
         assert self._open_close_attribute is not None
         if not self._open_close_attribute.is_reversed:
-            await self.async_set_value(self._open_close_attribute, 0)
+            await self.async_set_homee_value(self._open_close_attribute, 0)
         else:
-            await self.async_set_value(self._open_close_attribute, 1)
+            await self.async_set_homee_value(self._open_close_attribute, 1)
 
     async def async_close_cover(self, **kwargs: Any) -> None:
         """Close cover."""
         assert self._open_close_attribute is not None
         if not self._open_close_attribute.is_reversed:
-            await self.async_set_value(self._open_close_attribute, 1)
+            await self.async_set_homee_value(self._open_close_attribute, 1)
         else:
-            await self.async_set_value(self._open_close_attribute, 0)
+            await self.async_set_homee_value(self._open_close_attribute, 0)
 
     async def async_set_cover_position(self, **kwargs: Any) -> None:
         """Move the cover to a specific position."""
@@ -228,12 +232,12 @@ class HomeeCover(HomeeNodeEntity, CoverEntity):
                 homee_max = attribute.maximum
                 homee_position = (position / 100) * (homee_max - homee_min) + homee_min
 
-                await self.async_set_value(attribute, homee_position)
+                await self.async_set_homee_value(attribute, homee_position)
 
     async def async_stop_cover(self, **kwargs: Any) -> None:
         """Stop the cover."""
         if self._open_close_attribute is not None:
-            await self.async_set_value(self._open_close_attribute, 2)
+            await self.async_set_homee_value(self._open_close_attribute, 2)
 
     async def async_open_cover_tilt(self, **kwargs: Any) -> None:
         """Open the cover tilt."""
@@ -243,9 +247,9 @@ class HomeeCover(HomeeNodeEntity, CoverEntity):
             )
         ) is not None:
             if not slat_attribute.is_reversed:
-                await self.async_set_value(slat_attribute, 2)
+                await self.async_set_homee_value(slat_attribute, 2)
             else:
-                await self.async_set_value(slat_attribute, 1)
+                await self.async_set_homee_value(slat_attribute, 1)
 
     async def async_close_cover_tilt(self, **kwargs: Any) -> None:
         """Close the cover tilt."""
@@ -255,9 +259,9 @@ class HomeeCover(HomeeNodeEntity, CoverEntity):
             )
         ) is not None:
             if not slat_attribute.is_reversed:
-                await self.async_set_value(slat_attribute, 1)
+                await self.async_set_homee_value(slat_attribute, 1)
             else:
-                await self.async_set_value(slat_attribute, 2)
+                await self.async_set_homee_value(slat_attribute, 2)
 
     async def async_set_cover_tilt_position(self, **kwargs: Any) -> None:
         """Move the cover tilt to a specific position."""
@@ -274,4 +278,4 @@ class HomeeCover(HomeeNodeEntity, CoverEntity):
                 homee_max = attribute.maximum
                 homee_position = (position / 100) * (homee_max - homee_min) + homee_min
 
-                await self.async_set_value(attribute, homee_position)
+                await self.async_set_homee_value(attribute, homee_position)
diff --git a/homeassistant/components/homee/entity.py b/homeassistant/components/homee/entity.py
index a6cd54354bf..165a655d82b 100644
--- a/homeassistant/components/homee/entity.py
+++ b/homeassistant/components/homee/entity.py
@@ -2,7 +2,9 @@
 
 from pyHomee.const import AttributeState, AttributeType, NodeProfile, NodeState
 from pyHomee.model import HomeeAttribute, HomeeNode
+from websockets.exceptions import ConnectionClosed
 
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import Entity
 
@@ -24,10 +26,14 @@ class HomeeEntity(Entity):
             f"{entry.runtime_data.settings.uid}-{attribute.node_id}-{attribute.id}"
         )
         self._entry = entry
+        node = entry.runtime_data.get_node_by_id(attribute.node_id)
         self._attr_device_info = DeviceInfo(
             identifiers={
                 (DOMAIN, f"{entry.runtime_data.settings.uid}-{attribute.node_id}")
-            }
+            },
+            name=node.name,
+            model=get_name_for_enum(NodeProfile, node.profile),
+            via_device=(DOMAIN, entry.runtime_data.settings.uid),
         )
 
         self._host_connected = entry.runtime_data.connected
@@ -38,7 +44,7 @@ class HomeeEntity(Entity):
             self._attribute.add_on_changed_listener(self._on_node_updated)
         )
         self.async_on_remove(
-            await self._entry.runtime_data.add_connection_listener(
+            self._entry.runtime_data.add_connection_listener(
                 self._on_connection_changed
             )
         )
@@ -48,6 +54,17 @@ class HomeeEntity(Entity):
         """Return the availability of the underlying node."""
         return (self._attribute.state == AttributeState.NORMAL) and self._host_connected
 
+    async def async_set_homee_value(self, value: float) -> None:
+        """Set an attribute value on the homee node."""
+        homee = self._entry.runtime_data
+        try:
+            await homee.set_value(self._attribute.node_id, self._attribute.id, value)
+        except ConnectionClosed as exception:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="connection_closed",
+            ) from exception
+
     async def async_update(self) -> None:
         """Update entity from homee."""
         homee = self._entry.runtime_data
@@ -56,7 +73,7 @@ class HomeeEntity(Entity):
     def _on_node_updated(self, attribute: HomeeAttribute) -> None:
         self.schedule_update_ha_state()
 
-    async def _on_connection_changed(self, connected: bool) -> None:
+    def _on_connection_changed(self, connected: bool) -> None:
         self._host_connected = connected
         self.schedule_update_ha_state()
 
@@ -93,7 +110,7 @@ class HomeeNodeEntity(Entity):
         """Add the homee binary sensor device to home assistant."""
         self.async_on_remove(self._node.add_on_changed_listener(self._on_node_updated))
         self.async_on_remove(
-            await self._entry.runtime_data.add_connection_listener(
+            self._entry.runtime_data.add_connection_listener(
                 self._on_connection_changed
             )
         )
@@ -127,21 +144,22 @@ class HomeeNodeEntity(Entity):
 
         return None
 
-    def has_attribute(self, attribute_type: AttributeType) -> bool:
-        """Check if an attribute of the given type exists."""
-        if self._node.attribute_map is None:
-            return False
-
-        return attribute_type in self._node.attribute_map
-
-    async def async_set_value(self, attribute: HomeeAttribute, value: float) -> None:
+    async def async_set_homee_value(
+        self, attribute: HomeeAttribute, value: float
+    ) -> None:
         """Set an attribute value on the homee node."""
         homee = self._entry.runtime_data
-        await homee.set_value(attribute.node_id, attribute.id, value)
+        try:
+            await homee.set_value(attribute.node_id, attribute.id, value)
+        except ConnectionClosed as exception:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="connection_closed",
+            ) from exception
 
     def _on_node_updated(self, node: HomeeNode) -> None:
         self.schedule_update_ha_state()
 
-    async def _on_connection_changed(self, connected: bool) -> None:
+    def _on_connection_changed(self, connected: bool) -> None:
         self._host_connected = connected
         self.schedule_update_ha_state()
diff --git a/homeassistant/components/homee/icons.json b/homeassistant/components/homee/icons.json
index 3b1ee17b89c..b4ad8871568 100644
--- a/homeassistant/components/homee/icons.json
+++ b/homeassistant/components/homee/icons.json
@@ -1,12 +1,26 @@
 {
   "entity": {
     "sensor": {
+      "brightness": {
+        "default": "mdi:brightness-5"
+      },
+      "brightness_instance": {
+        "default": "mdi:brightness-5"
+      },
       "link_quality": {
         "default": "mdi:signal"
       },
       "window_position": {
         "default": "mdi:window-closed"
       }
+    },
+    "switch": {
+      "watchdog": {
+        "default": "mdi:dog"
+      },
+      "manual_operation": {
+        "default": "mdi:hand-back-left"
+      }
     }
   }
 }
diff --git a/homeassistant/components/homee/light.py b/homeassistant/components/homee/light.py
new file mode 100644
index 00000000000..9c66764760e
--- /dev/null
+++ b/homeassistant/components/homee/light.py
@@ -0,0 +1,217 @@
+"""The Homee light platform."""
+
+from typing import Any
+
+from pyHomee.const import AttributeType
+from pyHomee.model import HomeeAttribute, HomeeNode
+
+from homeassistant.components.light import (
+    ATTR_BRIGHTNESS,
+    ATTR_COLOR_TEMP_KELVIN,
+    ATTR_HS_COLOR,
+    ColorMode,
+    LightEntity,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util.color import (
+    brightness_to_value,
+    color_hs_to_RGB,
+    color_RGB_to_hs,
+    value_to_brightness,
+)
+
+from . import HomeeConfigEntry
+from .const import LIGHT_PROFILES
+from .entity import HomeeNodeEntity
+
+LIGHT_ATTRIBUTES = [
+    AttributeType.COLOR,
+    AttributeType.COLOR_MODE,
+    AttributeType.COLOR_TEMPERATURE,
+    AttributeType.DIMMING_LEVEL,
+]
+
+PARALLEL_UPDATES = 0
+
+
+def is_light_node(node: HomeeNode) -> bool:
+    """Determine if a node is controllable as a homee light based on its profile and attributes."""
+    assert node.attribute_map is not None
+    return node.profile in LIGHT_PROFILES and AttributeType.ON_OFF in node.attribute_map
+
+
+def get_color_mode(supported_modes: set[ColorMode]) -> ColorMode:
+    """Determine the color mode from the supported modes."""
+    if ColorMode.HS in supported_modes:
+        return ColorMode.HS
+    if ColorMode.COLOR_TEMP in supported_modes:
+        return ColorMode.COLOR_TEMP
+    if ColorMode.BRIGHTNESS in supported_modes:
+        return ColorMode.BRIGHTNESS
+
+    return ColorMode.ONOFF
+
+
+def get_light_attribute_sets(
+    node: HomeeNode,
+) -> list[dict[AttributeType, HomeeAttribute]]:
+    """Return the lights with their attributes as found in the node."""
+    lights: list[dict[AttributeType, HomeeAttribute]] = []
+    on_off_attributes = [
+        i for i in node.attributes if i.type == AttributeType.ON_OFF and i.editable
+    ]
+    for a in on_off_attributes:
+        attribute_dict: dict[AttributeType, HomeeAttribute] = {a.type: a}
+        for attribute in node.attributes:
+            if attribute.instance == a.instance and attribute.type in LIGHT_ATTRIBUTES:
+                attribute_dict[attribute.type] = attribute
+        lights.append(attribute_dict)
+
+    return lights
+
+
+def rgb_list_to_decimal(color: tuple[int, int, int]) -> int:
+    """Convert an rgb color from list to decimal representation."""
+    return int(int(color[0]) << 16) + (int(color[1]) << 8) + (int(color[2]))
+
+
+def decimal_to_rgb_list(color: float) -> list[int]:
+    """Convert an rgb color from decimal to list representation."""
+    return [
+        (int(color) & 0xFF0000) >> 16,
+        (int(color) & 0x00FF00) >> 8,
+        (int(color) & 0x0000FF),
+    ]
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: HomeeConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Add the Homee platform for the light entity."""
+
+    async_add_entities(
+        HomeeLight(node, light, config_entry)
+        for node in config_entry.runtime_data.nodes
+        for light in get_light_attribute_sets(node)
+        if is_light_node(node)
+    )
+
+
+class HomeeLight(HomeeNodeEntity, LightEntity):
+    """Representation of a Homee light."""
+
+    def __init__(
+        self,
+        node: HomeeNode,
+        light: dict[AttributeType, HomeeAttribute],
+        entry: HomeeConfigEntry,
+    ) -> None:
+        """Initialize a Homee light."""
+        super().__init__(node, entry)
+
+        self._on_off_attr: HomeeAttribute = light[AttributeType.ON_OFF]
+        self._dimmer_attr: HomeeAttribute | None = light.get(
+            AttributeType.DIMMING_LEVEL
+        )
+        self._col_attr: HomeeAttribute | None = light.get(AttributeType.COLOR)
+        self._temp_attr: HomeeAttribute | None = light.get(
+            AttributeType.COLOR_TEMPERATURE
+        )
+        self._mode_attr: HomeeAttribute | None = light.get(AttributeType.COLOR_MODE)
+
+        self._attr_supported_color_modes = self._get_supported_color_modes()
+        self._attr_color_mode = get_color_mode(self._attr_supported_color_modes)
+
+        if self._temp_attr is not None:
+            self._attr_min_color_temp_kelvin = int(self._temp_attr.minimum)
+            self._attr_max_color_temp_kelvin = int(self._temp_attr.maximum)
+
+        if self._on_off_attr.instance > 0:
+            self._attr_translation_key = "light_instance"
+            self._attr_translation_placeholders = {
+                "instance": str(self._on_off_attr.instance)
+            }
+        else:
+            # If a device has only one light, it will get its name.
+            self._attr_name = None
+        self._attr_unique_id = (
+            f"{entry.runtime_data.settings.uid}-{self._node.id}-{self._on_off_attr.id}"
+        )
+
+    @property
+    def brightness(self) -> int:
+        """Return the brightness of the light."""
+        assert self._dimmer_attr is not None
+        return value_to_brightness(
+            (self._dimmer_attr.minimum + 1, self._dimmer_attr.maximum),
+            self._dimmer_attr.current_value,
+        )
+
+    @property
+    def hs_color(self) -> tuple[float, float] | None:
+        """Return the color of the light."""
+        assert self._col_attr is not None
+        rgb = decimal_to_rgb_list(self._col_attr.current_value)
+        return color_RGB_to_hs(*rgb)
+
+    @property
+    def color_temp_kelvin(self) -> int:
+        """Return the color temperature of the light."""
+        assert self._temp_attr is not None
+        return int(self._temp_attr.current_value)
+
+    @property
+    def is_on(self) -> bool:
+        """Return true if light is on."""
+        return bool(self._on_off_attr.current_value)
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Instruct the light to turn on."""
+        if ATTR_BRIGHTNESS in kwargs and self._dimmer_attr is not None:
+            target_value = round(
+                brightness_to_value(
+                    (self._dimmer_attr.minimum, self._dimmer_attr.maximum),
+                    kwargs[ATTR_BRIGHTNESS],
+                )
+            )
+            await self.async_set_homee_value(self._dimmer_attr, target_value)
+        else:
+            # If no brightness value is given, just turn on.
+            await self.async_set_homee_value(self._on_off_attr, 1)
+
+        if ATTR_COLOR_TEMP_KELVIN in kwargs and self._temp_attr is not None:
+            await self.async_set_homee_value(
+                self._temp_attr, kwargs[ATTR_COLOR_TEMP_KELVIN]
+            )
+        if ATTR_HS_COLOR in kwargs:
+            color = kwargs[ATTR_HS_COLOR]
+            if self._col_attr is not None:
+                await self.async_set_homee_value(
+                    self._col_attr,
+                    rgb_list_to_decimal(color_hs_to_RGB(*color)),
+                )
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Instruct the light to turn off."""
+        await self.async_set_homee_value(self._on_off_attr, 0)
+
+    def _get_supported_color_modes(self) -> set[ColorMode]:
+        """Determine the supported color modes from the available attributes."""
+        color_modes: set[ColorMode] = set()
+
+        if self._temp_attr is not None and self._temp_attr.editable:
+            color_modes.add(ColorMode.COLOR_TEMP)
+        if self._col_attr is not None:
+            color_modes.add(ColorMode.HS)
+
+        # If no other color modes are available, set one of those.
+        if len(color_modes) == 0:
+            if self._dimmer_attr is not None:
+                color_modes.add(ColorMode.BRIGHTNESS)
+            else:
+                color_modes.add(ColorMode.ONOFF)
+
+        return color_modes
diff --git a/homeassistant/components/homee/lock.py b/homeassistant/components/homee/lock.py
new file mode 100644
index 00000000000..4cfc34e11fe
--- /dev/null
+++ b/homeassistant/components/homee/lock.py
@@ -0,0 +1,73 @@
+"""The Homee lock platform."""
+
+from typing import Any
+
+from pyHomee.const import AttributeChangedBy, AttributeType
+
+from homeassistant.components.lock import LockEntity
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import HomeeConfigEntry
+from .entity import HomeeEntity
+from .helpers import get_name_for_enum
+
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: HomeeConfigEntry,
+    async_add_devices: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Add the Homee platform for the lock component."""
+
+    async_add_devices(
+        HomeeLock(attribute, config_entry)
+        for node in config_entry.runtime_data.nodes
+        for attribute in node.attributes
+        if (attribute.type == AttributeType.LOCK_STATE and attribute.editable)
+    )
+
+
+class HomeeLock(HomeeEntity, LockEntity):
+    """Representation of a Homee lock."""
+
+    _attr_name = None
+
+    @property
+    def is_locked(self) -> bool:
+        """Return if lock is locked."""
+        return self._attribute.current_value == 1.0
+
+    @property
+    def is_locking(self) -> bool:
+        """Return if lock is locking."""
+        return self._attribute.target_value > self._attribute.current_value
+
+    @property
+    def is_unlocking(self) -> bool:
+        """Return if lock is unlocking."""
+        return self._attribute.target_value < self._attribute.current_value
+
+    @property
+    def changed_by(self) -> str:
+        """Return by whom or what the lock was last changed."""
+        changed_id = str(self._attribute.changed_by_id)
+        changed_by_name = get_name_for_enum(
+            AttributeChangedBy, self._attribute.changed_by
+        )
+        if self._attribute.changed_by == AttributeChangedBy.USER:
+            changed_id = self._entry.runtime_data.get_user_by_id(
+                self._attribute.changed_by_id
+            ).username
+
+        return f"{changed_by_name}-{changed_id}"
+
+    async def async_lock(self, **kwargs: Any) -> None:
+        """Lock specified lock. A code to lock the lock with may be specified."""
+        await self.async_set_homee_value(1)
+
+    async def async_unlock(self, **kwargs: Any) -> None:
+        """Unlock specified lock. A code to unlock the lock with may be specified."""
+        await self.async_set_homee_value(0)
diff --git a/homeassistant/components/homee/manifest.json b/homeassistant/components/homee/manifest.json
index 6d03547efc9..3c2a99c30dc 100644
--- a/homeassistant/components/homee/manifest.json
+++ b/homeassistant/components/homee/manifest.json
@@ -8,5 +8,5 @@
   "iot_class": "local_push",
   "loggers": ["homee"],
   "quality_scale": "bronze",
-  "requirements": ["pyHomee==1.2.3"]
+  "requirements": ["pyHomee==1.2.8"]
 }
diff --git a/homeassistant/components/homee/number.py b/homeassistant/components/homee/number.py
new file mode 100644
index 00000000000..5f76b826fcf
--- /dev/null
+++ b/homeassistant/components/homee/number.py
@@ -0,0 +1,132 @@
+"""The Homee number platform."""
+
+from pyHomee.const import AttributeType
+from pyHomee.model import HomeeAttribute
+
+from homeassistant.components.number import (
+    NumberDeviceClass,
+    NumberEntity,
+    NumberEntityDescription,
+)
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import HomeeConfigEntry
+from .const import HOMEE_UNIT_TO_HA_UNIT
+from .entity import HomeeEntity
+
+PARALLEL_UPDATES = 0
+
+NUMBER_DESCRIPTIONS = {
+    AttributeType.DOWN_POSITION: NumberEntityDescription(
+        key="down_position",
+        entity_category=EntityCategory.CONFIG,
+    ),
+    AttributeType.DOWN_SLAT_POSITION: NumberEntityDescription(
+        key="down_slat_position",
+        entity_category=EntityCategory.CONFIG,
+    ),
+    AttributeType.DOWN_TIME: NumberEntityDescription(
+        key="down_time",
+        device_class=NumberDeviceClass.DURATION,
+        entity_category=EntityCategory.CONFIG,
+    ),
+    AttributeType.ENDPOSITION_CONFIGURATION: NumberEntityDescription(
+        key="endposition_configuration",
+        entity_category=EntityCategory.CONFIG,
+    ),
+    AttributeType.MOTION_ALARM_CANCELATION_DELAY: NumberEntityDescription(
+        key="motion_alarm_cancelation_delay",
+        device_class=NumberDeviceClass.DURATION,
+        entity_category=EntityCategory.CONFIG,
+    ),
+    AttributeType.OPEN_WINDOW_DETECTION_SENSIBILITY: NumberEntityDescription(
+        key="open_window_detection_sensibility",
+        entity_category=EntityCategory.CONFIG,
+    ),
+    AttributeType.POLLING_INTERVAL: NumberEntityDescription(
+        key="polling_interval",
+        device_class=NumberDeviceClass.DURATION,
+        entity_category=EntityCategory.CONFIG,
+    ),
+    AttributeType.SHUTTER_SLAT_TIME: NumberEntityDescription(
+        key="shutter_slat_time",
+        device_class=NumberDeviceClass.DURATION,
+        entity_category=EntityCategory.CONFIG,
+    ),
+    AttributeType.SLAT_MAX_ANGLE: NumberEntityDescription(
+        key="slat_max_angle",
+        entity_category=EntityCategory.CONFIG,
+    ),
+    AttributeType.SLAT_MIN_ANGLE: NumberEntityDescription(
+        key="slat_min_angle",
+        entity_category=EntityCategory.CONFIG,
+    ),
+    AttributeType.SLAT_STEPS: NumberEntityDescription(
+        key="slat_steps",
+        entity_category=EntityCategory.CONFIG,
+    ),
+    AttributeType.TEMPERATURE_OFFSET: NumberEntityDescription(
+        key="temperature_offset",
+        entity_category=EntityCategory.CONFIG,
+    ),
+    AttributeType.UP_TIME: NumberEntityDescription(
+        key="up_time",
+        device_class=NumberDeviceClass.DURATION,
+        entity_category=EntityCategory.CONFIG,
+    ),
+    AttributeType.WAKE_UP_INTERVAL: NumberEntityDescription(
+        key="wake_up_interval",
+        device_class=NumberDeviceClass.DURATION,
+        entity_category=EntityCategory.CONFIG,
+    ),
+}
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: HomeeConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Add the Homee platform for the number component."""
+
+    async_add_entities(
+        HomeeNumber(attribute, config_entry, NUMBER_DESCRIPTIONS[attribute.type])
+        for node in config_entry.runtime_data.nodes
+        for attribute in node.attributes
+        if attribute.type in NUMBER_DESCRIPTIONS and attribute.data != "fixed_value"
+    )
+
+
+class HomeeNumber(HomeeEntity, NumberEntity):
+    """Representation of a Homee number."""
+
+    def __init__(
+        self,
+        attribute: HomeeAttribute,
+        entry: HomeeConfigEntry,
+        description: NumberEntityDescription,
+    ) -> None:
+        """Initialize a Homee number entity."""
+        super().__init__(attribute, entry)
+        self.entity_description = description
+        self._attr_translation_key = description.key
+        self._attr_native_unit_of_measurement = HOMEE_UNIT_TO_HA_UNIT[attribute.unit]
+        self._attr_native_min_value = attribute.minimum
+        self._attr_native_max_value = attribute.maximum
+        self._attr_native_step = attribute.step_value
+
+    @property
+    def available(self) -> bool:
+        """Return the availability of the entity."""
+        return super().available and self._attribute.editable
+
+    @property
+    def native_value(self) -> int:
+        """Return the native value of the number."""
+        return int(self._attribute.current_value)
+
+    async def async_set_native_value(self, value: float) -> None:
+        """Set the selected value."""
+        await self.async_set_homee_value(value)
diff --git a/homeassistant/components/homee/quality_scale.yaml b/homeassistant/components/homee/quality_scale.yaml
index ff99d177018..906218cf823 100644
--- a/homeassistant/components/homee/quality_scale.yaml
+++ b/homeassistant/components/homee/quality_scale.yaml
@@ -35,7 +35,7 @@ rules:
   entity-unavailable: done
   integration-owner: done
   log-when-unavailable: done
-  parallel-updates: todo
+  parallel-updates: done
   reauthentication-flow: todo
   test-coverage: todo
 
diff --git a/homeassistant/components/homee/select.py b/homeassistant/components/homee/select.py
new file mode 100644
index 00000000000..70c7972bbda
--- /dev/null
+++ b/homeassistant/components/homee/select.py
@@ -0,0 +1,63 @@
+"""The Homee select platform."""
+
+from pyHomee.const import AttributeType
+from pyHomee.model import HomeeAttribute
+
+from homeassistant.components.select import SelectEntity, SelectEntityDescription
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import HomeeConfigEntry
+from .entity import HomeeEntity
+
+PARALLEL_UPDATES = 0
+
+SELECT_DESCRIPTIONS: dict[AttributeType, SelectEntityDescription] = {
+    AttributeType.REPEATER_MODE: SelectEntityDescription(
+        key="repeater_mode",
+        options=["off", "level1", "level2"],
+        entity_category=EntityCategory.CONFIG,
+    ),
+}
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: HomeeConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Add the Homee platform for the select component."""
+
+    async_add_entities(
+        HomeeSelect(attribute, config_entry, SELECT_DESCRIPTIONS[attribute.type])
+        for node in config_entry.runtime_data.nodes
+        for attribute in node.attributes
+        if attribute.type in SELECT_DESCRIPTIONS and attribute.editable
+    )
+
+
+class HomeeSelect(HomeeEntity, SelectEntity):
+    """Representation of a Homee select entity."""
+
+    def __init__(
+        self,
+        attribute: HomeeAttribute,
+        entry: HomeeConfigEntry,
+        description: SelectEntityDescription,
+    ) -> None:
+        """Initialize a Homee select entity."""
+        super().__init__(attribute, entry)
+        self.entity_description = description
+        assert description.options is not None
+        self._attr_options = description.options
+        self._attr_translation_key = description.key
+
+    @property
+    def current_option(self) -> str:
+        """Return the current selected option."""
+        return self.options[int(self._attribute.current_value)]
+
+    async def async_select_option(self, option: str) -> None:
+        """Change the selected option."""
+        await self.async_set_homee_value(self.options.index(option))
diff --git a/homeassistant/components/homee/sensor.py b/homeassistant/components/homee/sensor.py
index 9b8fb0f6fe1..e65b73b4a67 100644
--- a/homeassistant/components/homee/sensor.py
+++ b/homeassistant/components/homee/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import HomeeConfigEntry
 from .const import (
@@ -27,6 +27,8 @@ from .const import (
 from .entity import HomeeEntity, HomeeNodeEntity
 from .helpers import get_name_for_enum
 
+PARALLEL_UPDATES = 0
+
 
 def get_open_close_value(attribute: HomeeAttribute) -> str | None:
     """Return the open/close value."""
@@ -40,10 +42,22 @@ def get_window_value(attribute: HomeeAttribute) -> str | None:
     return vals.get(attribute.current_value)
 
 
+def get_brightness_device_class(
+    attribute: HomeeAttribute, device_class: SensorDeviceClass | None
+) -> SensorDeviceClass | None:
+    """Return the device class for a brightness sensor."""
+    if attribute.unit == "%":
+        return None
+    return device_class
+
+
 @dataclass(frozen=True, kw_only=True)
 class HomeeSensorEntityDescription(SensorEntityDescription):
     """A class that describes Homee sensor entities."""
 
+    device_class_fn: Callable[
+        [HomeeAttribute, SensorDeviceClass | None], SensorDeviceClass | None
+    ] = lambda attribute, device_class: device_class
     value_fn: Callable[[HomeeAttribute], str | float | None] = (
         lambda value: value.current_value
     )
@@ -67,6 +81,7 @@ SENSOR_DESCRIPTIONS: dict[AttributeType, HomeeSensorEntityDescription] = {
     AttributeType.BRIGHTNESS: HomeeSensorEntityDescription(
         key="brightness",
         device_class=SensorDeviceClass.ILLUMINANCE,
+        device_class_fn=get_brightness_device_class,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=(
             lambda attribute: attribute.current_value * 1000
@@ -157,7 +172,7 @@ SENSOR_DESCRIPTIONS: dict[AttributeType, HomeeSensorEntityDescription] = {
     AttributeType.RAIN_FALL_TODAY: HomeeSensorEntityDescription(
         key="rainfall_day",
         device_class=SensorDeviceClass.PRECIPITATION,
-        state_class=SensorStateClass.MEASUREMENT,
+        state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     AttributeType.RELATIVE_HUMIDITY: HomeeSensorEntityDescription(
         key="humidity",
@@ -177,6 +192,7 @@ SENSOR_DESCRIPTIONS: dict[AttributeType, HomeeSensorEntityDescription] = {
     AttributeType.TOTAL_CURRENT: HomeeSensorEntityDescription(
         key="total_current",
         device_class=SensorDeviceClass.CURRENT,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     AttributeType.TOTAL_CURRENT_ENERGY_USE: HomeeSensorEntityDescription(
         key="total_power",
@@ -252,7 +268,7 @@ NODE_SENSOR_DESCRIPTIONS: tuple[HomeeNodeSensorEntityDescription, ...] = (
         ],
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
-        translation_key="node_sensor_state",
+        translation_key="node_state",
         value_fn=lambda node: get_name_for_enum(NodeState, node.state),
     ),
 )
@@ -261,7 +277,7 @@ NODE_SENSOR_DESCRIPTIONS: tuple[HomeeNodeSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: HomeeConfigEntry,
-    async_add_devices: AddEntitiesCallback,
+    async_add_devices: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add the homee platform for the sensor components."""
 
@@ -302,6 +318,9 @@ class HomeeSensor(HomeeEntity, SensorEntity):
         if attribute.instance > 0:
             self._attr_translation_key = f"{self._attr_translation_key}_instance"
             self._attr_translation_placeholders = {"instance": str(attribute.instance)}
+        self._attr_device_class = description.device_class_fn(
+            attribute, description.device_class
+        )
 
     @property
     def native_value(self) -> float | str | None:
diff --git a/homeassistant/components/homee/strings.json b/homeassistant/components/homee/strings.json
index 401996622f2..da8357d16bc 100644
--- a/homeassistant/components/homee/strings.json
+++ b/homeassistant/components/homee/strings.json
@@ -26,7 +26,174 @@
     }
   },
   "entity": {
+    "binary_sensor": {
+      "blackout_alarm": {
+        "name": "Blackout"
+      },
+      "carbon_dioxide": {
+        "name": "Carbon dioxide"
+      },
+      "flood": {
+        "name": "Flood"
+      },
+      "high_temperature": {
+        "name": "High temperature"
+      },
+      "leak_alarm": {
+        "name": "Leak"
+      },
+      "load_alarm": {
+        "name": "Load",
+        "state": {
+          "off": "Normal",
+          "on": "Overload"
+        }
+      },
+      "low_temperature": {
+        "name": "Low temperature"
+      },
+      "malfunction": {
+        "name": "Malfunction"
+      },
+      "maximum": {
+        "name": "Maximum level"
+      },
+      "minimum": {
+        "name": "Minimum level"
+      },
+      "motor_blocked": {
+        "name": "Motor blocked"
+      },
+      "overcurrent": {
+        "name": "Overcurrent"
+      },
+      "overload": {
+        "name": "Overload"
+      },
+      "rain": {
+        "name": "Rain"
+      },
+      "replace_filter": {
+        "name": "Replace filter",
+        "state": {
+          "on": "Replace"
+        }
+      },
+      "storage": {
+        "name": "Storage",
+        "state": {
+          "off": "Space available",
+          "on": "Storage full"
+        }
+      },
+      "surge": {
+        "name": "Surge"
+      },
+      "voltage_drop": {
+        "name": "Voltage drop"
+      },
+      "water": {
+        "name": "Water"
+      }
+    },
+    "button": {
+      "automatic_mode": {
+        "name": "Automatic mode"
+      },
+      "briefly_open": {
+        "name": "Briefly open"
+      },
+      "identification_mode": {
+        "name": "Identification mode"
+      },
+      "impulse_instance": {
+        "name": "Impulse {instance}"
+      },
+      "light": {
+        "name": "Light"
+      },
+      "light_instance": {
+        "name": "Light {instance}"
+      },
+      "open_partial": {
+        "name": "Open partially"
+      },
+      "permanently_open": {
+        "name": "Open permanently"
+      },
+      "reset_meter": {
+        "name": "Reset meter"
+      },
+      "reset_meter_instance": {
+        "name": "Reset meter {instance}"
+      },
+      "ventilate": {
+        "name": "Ventilate"
+      }
+    },
+    "light": {
+      "light_instance": {
+        "name": "Light {instance}"
+      }
+    },
+    "number": {
+      "down_position": {
+        "name": "Down position"
+      },
+      "down_slat_position": {
+        "name": "Down slat position"
+      },
+      "down_time": {
+        "name": "Down-movement duration"
+      },
+      "endposition_configuration": {
+        "name": "End position"
+      },
+      "motion_alarm_cancelation_delay": {
+        "name": "Motion alarm delay"
+      },
+      "open_window_detection_sensibility": {
+        "name": "Window open sensibility"
+      },
+      "polling_interval": {
+        "name": "Polling interval"
+      },
+      "shutter_slat_time": {
+        "name": "Slat turn duration"
+      },
+      "slat_max_angle": {
+        "name": "Maximum slat angle"
+      },
+      "slat_min_angle": {
+        "name": "Minimum slat angle"
+      },
+      "slat_steps": {
+        "name": "Slat steps"
+      },
+      "temperature_offset": {
+        "name": "Temperature offset"
+      },
+      "up_time": {
+        "name": "Up-movement duration"
+      },
+      "wake_up_interval": {
+        "name": "Wake-up interval"
+      }
+    },
+    "select": {
+      "repeater_mode": {
+        "name": "Repeater mode",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "level1": "Level 1",
+          "level2": "Level 2"
+        }
+      }
+    },
     "sensor": {
+      "brightness": {
+        "name": "Illuminance"
+      },
       "brightness_instance": {
         "name": "Illuminance {instance}"
       },
@@ -67,7 +234,23 @@
         "name": "Link quality"
       },
       "node_state": {
-        "name": "Node state"
+        "name": "Node state",
+        "state": {
+          "available": "Available",
+          "unavailable": "Unavailable",
+          "update_in_progress": "Update in progress",
+          "waiting_for_attributes": "Waiting for attributes",
+          "initializing": "Initializing",
+          "user_interaction_required": "User interaction required",
+          "password_required": "Password required",
+          "host_unavailable": "Host unavailable",
+          "delete_in_progress": "Delete in progress",
+          "cosi_connected": "Cosi connected",
+          "blocked": "Blocked",
+          "waiting_for_wakeup": "Waiting for wakeup",
+          "remote_node_deleted": "Remote node deleted",
+          "firmware_update_in_progress": "Firmware update in progress"
+        }
       },
       "operating_hours": {
         "name": "Operating hours"
@@ -135,6 +318,30 @@
           "tilted": "Tilted"
         }
       }
+    },
+    "switch": {
+      "external_binary_input": {
+        "name": "Child lock"
+      },
+      "manual_operation": {
+        "name": "Manual operation"
+      },
+      "on_off_instance": {
+        "name": "Switch {instance}"
+      },
+      "watchdog": {
+        "name": "Watchdog"
+      }
+    },
+    "valve": {
+      "valve_position": {
+        "name": "Valve position"
+      }
+    }
+  },
+  "exceptions": {
+    "connection_closed": {
+      "message": "Could not connect to Homee while setting attribute."
     }
   }
 }
diff --git a/homeassistant/components/homee/switch.py b/homeassistant/components/homee/switch.py
new file mode 100644
index 00000000000..041b96963f1
--- /dev/null
+++ b/homeassistant/components/homee/switch.py
@@ -0,0 +1,129 @@
+"""The homee switch platform."""
+
+from collections.abc import Callable
+from dataclasses import dataclass
+from typing import Any
+
+from pyHomee.const import AttributeType, NodeProfile
+from pyHomee.model import HomeeAttribute
+
+from homeassistant.components.switch import (
+    SwitchDeviceClass,
+    SwitchEntity,
+    SwitchEntityDescription,
+)
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import HomeeConfigEntry
+from .const import CLIMATE_PROFILES, LIGHT_PROFILES
+from .entity import HomeeEntity
+
+PARALLEL_UPDATES = 0
+
+
+def get_device_class(
+    attribute: HomeeAttribute, config_entry: HomeeConfigEntry
+) -> SwitchDeviceClass:
+    """Check device class of Switch according to node profile."""
+    node = config_entry.runtime_data.get_node_by_id(attribute.node_id)
+    if node.profile in [
+        NodeProfile.ON_OFF_PLUG,
+        NodeProfile.METERING_PLUG,
+        NodeProfile.DOUBLE_ON_OFF_PLUG,
+        NodeProfile.IMPULSE_PLUG,
+    ]:
+        return SwitchDeviceClass.OUTLET
+
+    return SwitchDeviceClass.SWITCH
+
+
+@dataclass(frozen=True, kw_only=True)
+class HomeeSwitchEntityDescription(SwitchEntityDescription):
+    """A class that describes Homee switch entity."""
+
+    device_class_fn: Callable[[HomeeAttribute, HomeeConfigEntry], SwitchDeviceClass] = (
+        lambda attribute, entry: SwitchDeviceClass.SWITCH
+    )
+
+
+SWITCH_DESCRIPTIONS: dict[AttributeType, HomeeSwitchEntityDescription] = {
+    AttributeType.EXTERNAL_BINARY_INPUT: HomeeSwitchEntityDescription(
+        key="external_binary_input", entity_category=EntityCategory.CONFIG
+    ),
+    AttributeType.MANUAL_OPERATION: HomeeSwitchEntityDescription(
+        key="manual_operation"
+    ),
+    AttributeType.ON_OFF: HomeeSwitchEntityDescription(
+        key="on_off", device_class_fn=get_device_class, name=None
+    ),
+    AttributeType.WATCHDOG_ON_OFF: HomeeSwitchEntityDescription(
+        key="watchdog", entity_category=EntityCategory.CONFIG
+    ),
+}
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: HomeeConfigEntry,
+    async_add_devices: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the switch platform for the Homee component."""
+
+    for node in config_entry.runtime_data.nodes:
+        async_add_devices(
+            HomeeSwitch(attribute, config_entry, SWITCH_DESCRIPTIONS[attribute.type])
+            for attribute in node.attributes
+            if (attribute.type in SWITCH_DESCRIPTIONS and attribute.editable)
+            and not (
+                attribute.type == AttributeType.ON_OFF
+                and node.profile in LIGHT_PROFILES
+            )
+            and not (
+                attribute.type == AttributeType.MANUAL_OPERATION
+                and node.profile in CLIMATE_PROFILES
+            )
+        )
+
+
+class HomeeSwitch(HomeeEntity, SwitchEntity):
+    """Representation of a Homee switch."""
+
+    entity_description: HomeeSwitchEntityDescription
+
+    def __init__(
+        self,
+        attribute: HomeeAttribute,
+        entry: HomeeConfigEntry,
+        description: HomeeSwitchEntityDescription,
+    ) -> None:
+        """Initialize a Homee switch entity."""
+        super().__init__(attribute, entry)
+        self.entity_description = description
+        if attribute.instance == 0:
+            if attribute.type == AttributeType.ON_OFF:
+                self._attr_name = None
+            else:
+                self._attr_translation_key = description.key
+        else:
+            self._attr_translation_key = f"{description.key}_instance"
+            self._attr_translation_placeholders = {"instance": str(attribute.instance)}
+
+    @property
+    def is_on(self) -> bool:
+        """Return True if entity is on."""
+        return bool(self._attribute.current_value)
+
+    @property
+    def device_class(self) -> SwitchDeviceClass:
+        """Return the device class of the switch."""
+        return self.entity_description.device_class_fn(self._attribute, self._entry)
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the switch on."""
+        await self.async_set_homee_value(1)
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the switch off."""
+        await self.async_set_homee_value(0)
diff --git a/homeassistant/components/homee/valve.py b/homeassistant/components/homee/valve.py
new file mode 100644
index 00000000000..995716d7ef8
--- /dev/null
+++ b/homeassistant/components/homee/valve.py
@@ -0,0 +1,83 @@
+"""The Homee valve platform."""
+
+from pyHomee.const import AttributeType
+from pyHomee.model import HomeeAttribute
+
+from homeassistant.components.valve import (
+    ValveDeviceClass,
+    ValveEntity,
+    ValveEntityDescription,
+    ValveEntityFeature,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import HomeeConfigEntry
+from .entity import HomeeEntity
+
+PARALLEL_UPDATES = 0
+
+VALVE_DESCRIPTIONS = {
+    AttributeType.CURRENT_VALVE_POSITION: ValveEntityDescription(
+        key="valve_position",
+        device_class=ValveDeviceClass.WATER,
+    )
+}
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: HomeeConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Add the Homee platform for the valve component."""
+
+    async_add_entities(
+        HomeeValve(attribute, config_entry, VALVE_DESCRIPTIONS[attribute.type])
+        for node in config_entry.runtime_data.nodes
+        for attribute in node.attributes
+        if attribute.type in VALVE_DESCRIPTIONS
+    )
+
+
+class HomeeValve(HomeeEntity, ValveEntity):
+    """Representation of a Homee valve."""
+
+    _attr_reports_position = True
+
+    def __init__(
+        self,
+        attribute: HomeeAttribute,
+        entry: HomeeConfigEntry,
+        description: ValveEntityDescription,
+    ) -> None:
+        """Initialize a Homee valve entity."""
+        super().__init__(attribute, entry)
+        self.entity_description = description
+        self._attr_translation_key = description.key
+
+    @property
+    def supported_features(self) -> ValveEntityFeature:
+        """Return the supported features."""
+        if self._attribute.editable:
+            return ValveEntityFeature.SET_POSITION
+        return ValveEntityFeature(0)
+
+    @property
+    def current_valve_position(self) -> int | None:
+        """Return the current valve position."""
+        return int(self._attribute.current_value)
+
+    @property
+    def is_closing(self) -> bool:
+        """Return if the valve is closing."""
+        return self._attribute.target_value < self._attribute.current_value
+
+    @property
+    def is_opening(self) -> bool:
+        """Return if the valve is opening."""
+        return self._attribute.target_value > self._attribute.current_value
+
+    async def async_set_valve_position(self, position: int) -> None:
+        """Move the valve to a specific position."""
+        await self.async_set_homee_value(position)
diff --git a/homeassistant/components/homekit/__init__.py b/homeassistant/components/homekit/__init__.py
index 97fb17d7db5..9bd5711832c 100644
--- a/homeassistant/components/homekit/__init__.py
+++ b/homeassistant/components/homekit/__init__.py
@@ -221,6 +221,34 @@ UNPAIR_SERVICE_SCHEMA = vol.All(
 )
 
 
+@callback
+def _async_update_entries_from_yaml(
+    hass: HomeAssistant, config: ConfigType, start_import_flow: bool
+) -> None:
+    current_entries = hass.config_entries.async_entries(DOMAIN)
+    entries_by_name, entries_by_port = _async_get_imported_entries_indices(
+        current_entries
+    )
+    hk_config: list[dict[str, Any]] = config[DOMAIN]
+
+    for index, conf in enumerate(hk_config):
+        if _async_update_config_entry_from_yaml(
+            hass, entries_by_name, entries_by_port, conf
+        ):
+            continue
+
+        if start_import_flow:
+            conf[CONF_ENTRY_INDEX] = index
+            hass.async_create_task(
+                hass.config_entries.flow.async_init(
+                    DOMAIN,
+                    context={"source": SOURCE_IMPORT},
+                    data=conf,
+                ),
+                eager_start=True,
+            )
+
+
 def _async_all_homekit_instances(hass: HomeAssistant) -> list[HomeKit]:
     """All active HomeKit instances."""
     hk_data: HomeKitEntryData | None
@@ -258,31 +286,10 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     await hass.async_add_executor_job(get_loader)
 
     _async_register_events_and_services(hass)
-
     if DOMAIN not in config:
         return True
 
-    current_entries = hass.config_entries.async_entries(DOMAIN)
-    entries_by_name, entries_by_port = _async_get_imported_entries_indices(
-        current_entries
-    )
-
-    for index, conf in enumerate(config[DOMAIN]):
-        if _async_update_config_entry_from_yaml(
-            hass, entries_by_name, entries_by_port, conf
-        ):
-            continue
-
-        conf[CONF_ENTRY_INDEX] = index
-        hass.async_create_task(
-            hass.config_entries.flow.async_init(
-                DOMAIN,
-                context={"source": SOURCE_IMPORT},
-                data=conf,
-            ),
-            eager_start=True,
-        )
-
+    _async_update_entries_from_yaml(hass, config, start_import_flow=True)
     return True
 
 
@@ -326,13 +333,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: HomeKitConfigEntry) -> b
     conf = entry.data
     options = entry.options
 
-    name = conf[CONF_NAME]
-    port = conf[CONF_PORT]
-    _LOGGER.debug("Begin setup HomeKit for %s", name)
-
+    name: str = conf[CONF_NAME]
+    port: int = conf[CONF_PORT]
     # ip_address and advertise_ip are yaml only
-    ip_address = conf.get(CONF_IP_ADDRESS, _DEFAULT_BIND)
-    advertise_ips: list[str] = conf.get(
+    ip_address: str | list[str] | None = conf.get(CONF_IP_ADDRESS, _DEFAULT_BIND)
+    advertise_ips: list[str]
+    advertise_ips = conf.get(
         CONF_ADVERTISE_IP
     ) or await network.async_get_announce_addresses(hass)
 
@@ -344,13 +350,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: HomeKitConfigEntry) -> b
     # with users who have not migrated yet we do not do exclude
     # these entities by default as we cannot migrate automatically
     # since it requires a re-pairing.
-    exclude_accessory_mode = conf.get(
+    exclude_accessory_mode: bool = conf.get(
         CONF_EXCLUDE_ACCESSORY_MODE, DEFAULT_EXCLUDE_ACCESSORY_MODE
     )
-    homekit_mode = options.get(CONF_HOMEKIT_MODE, DEFAULT_HOMEKIT_MODE)
-    entity_config = options.get(CONF_ENTITY_CONFIG, {}).copy()
-    entity_filter = FILTER_SCHEMA(options.get(CONF_FILTER, {}))
-    devices = options.get(CONF_DEVICES, [])
+    homekit_mode: str = options.get(CONF_HOMEKIT_MODE, DEFAULT_HOMEKIT_MODE)
+    entity_config: dict[str, Any] = options.get(CONF_ENTITY_CONFIG, {}).copy()
+    entity_filter: EntityFilter = FILTER_SCHEMA(options.get(CONF_FILTER, {}))
+    devices: list[str] = options.get(CONF_DEVICES, [])
 
     homekit = HomeKit(
         hass,
@@ -500,26 +506,15 @@ def _async_register_events_and_services(hass: HomeAssistant) -> None:
     async def _handle_homekit_reload(service: ServiceCall) -> None:
         """Handle start HomeKit service call."""
         config = await async_integration_yaml_config(hass, DOMAIN)
-
         if not config or DOMAIN not in config:
             return
-
-        current_entries = hass.config_entries.async_entries(DOMAIN)
-        entries_by_name, entries_by_port = _async_get_imported_entries_indices(
-            current_entries
-        )
-
-        for conf in config[DOMAIN]:
-            _async_update_config_entry_from_yaml(
-                hass, entries_by_name, entries_by_port, conf
+        _async_update_entries_from_yaml(hass, config, start_import_flow=False)
+        await asyncio.gather(
+            *(
+                create_eager_task(hass.config_entries.async_reload(entry.entry_id))
+                for entry in hass.config_entries.async_entries(DOMAIN)
             )
-
-        reload_tasks = [
-            create_eager_task(hass.config_entries.async_reload(entry.entry_id))
-            for entry in current_entries
-        ]
-
-        await asyncio.gather(*reload_tasks)
+        )
 
     async_register_admin_service(
         hass,
@@ -537,7 +532,7 @@ class HomeKit:
         hass: HomeAssistant,
         name: str,
         port: int,
-        ip_address: str | None,
+        ip_address: list[str] | str | None,
         entity_filter: EntityFilter,
         exclude_accessory_mode: bool,
         entity_config: dict[str, Any],
diff --git a/homeassistant/components/homekit/accessories.py b/homeassistant/components/homekit/accessories.py
index 8d10387e239..0d810d6986d 100644
--- a/homeassistant/components/homekit/accessories.py
+++ b/homeassistant/components/homekit/accessories.py
@@ -15,6 +15,7 @@ from pyhap.service import Service
 from pyhap.util import callback as pyhap_callback
 
 from homeassistant.components.cover import CoverDeviceClass, CoverEntityFeature
+from homeassistant.components.lawn_mower import LawnMowerEntityFeature
 from homeassistant.components.media_player import MediaPlayerDeviceClass
 from homeassistant.components.remote import RemoteEntityFeature
 from homeassistant.components.sensor import SensorDeviceClass
@@ -250,6 +251,13 @@ def get_accessory(  # noqa: C901
     elif state.domain == "vacuum":
         a_type = "Vacuum"
 
+    elif (
+        state.domain == "lawn_mower"
+        and features & LawnMowerEntityFeature.DOCK
+        and features & LawnMowerEntityFeature.START_MOWING
+    ):
+        a_type = "LawnMower"
+
     elif state.domain == "remote" and features & RemoteEntityFeature.ACTIVITY:
         a_type = "ActivityRemote"
 
diff --git a/homeassistant/components/homekit/config_flow.py b/homeassistant/components/homekit/config_flow.py
index 53db7774821..0ef2e8563bc 100644
--- a/homeassistant/components/homekit/config_flow.py
+++ b/homeassistant/components/homekit/config_flow.py
@@ -106,6 +106,7 @@ SUPPORTED_DOMAINS = [
     "sensor",
     "switch",
     "vacuum",
+    "lawn_mower",
     "water_heater",
     VALVE_DOMAIN,
 ]
@@ -123,6 +124,7 @@ DEFAULT_DOMAINS = [
     REMOTE_DOMAIN,
     "switch",
     "vacuum",
+    "lawn_mower",
     "water_heater",
 ]
 
diff --git a/homeassistant/components/homekit/manifest.json b/homeassistant/components/homekit/manifest.json
index d7ea293b5dc..4ae2e43dfb2 100644
--- a/homeassistant/components/homekit/manifest.json
+++ b/homeassistant/components/homekit/manifest.json
@@ -10,7 +10,7 @@
   "loggers": ["pyhap"],
   "requirements": [
     "HAP-python==4.9.2",
-    "fnv-hash-fast==1.2.2",
+    "fnv-hash-fast==1.4.0",
     "PyQRCode==1.2.1",
     "base36==0.1.1"
   ],
diff --git a/homeassistant/components/homekit/strings.json b/homeassistant/components/homekit/strings.json
index 92b836d5ec6..dcdf6892dc2 100644
--- a/homeassistant/components/homekit/strings.json
+++ b/homeassistant/components/homekit/strings.json
@@ -2,13 +2,13 @@
   "options": {
     "step": {
       "yaml": {
-        "title": "Adjust HomeKit Options",
+        "title": "Adjust HomeKit options",
         "description": "This entry is controlled via YAML"
       },
       "init": {
         "data": {
-          "mode": "HomeKit Mode",
-          "include_exclude_mode": "Inclusion Mode",
+          "mode": "HomeKit mode",
+          "include_exclude_mode": "Inclusion mode",
           "domains": "[%key:component::homekit::config::step::user::data::include_domains%]"
         },
         "description": "HomeKit can be configured expose a bridge or a single accessory. In accessory mode, only a single entity can be used. Accessory mode is required for media players with the TV or RECEIVER device class to function properly. Entities in the \u201cDomains to include\u201d will be included to HomeKit. You will be able to select which entities to include or exclude from this list on the next screen.",
@@ -40,14 +40,14 @@
           "camera_audio": "Cameras that support audio"
         },
         "description": "Check all cameras that support native H.264 streams. If the camera does not output a H.264 stream, the system will transcode the video to H.264 for HomeKit. Transcoding requires a performant CPU and is unlikely to work on single board computers.",
-        "title": "Camera Configuration"
+        "title": "Camera configuration"
       },
       "advanced": {
         "data": {
           "devices": "Devices (Triggers)"
         },
         "description": "Programmable switches are created for each selected device. When a device trigger fires, HomeKit can be configured to run an automation or scene.",
-        "title": "Advanced Configuration"
+        "title": "Advanced configuration"
       }
     }
   },
@@ -72,7 +72,7 @@
   "services": {
     "reload": {
       "name": "[%key:common::action::reload%]",
-      "description": "Reloads homekit and re-process YAML-configuration."
+      "description": "Reloads HomeKit and re-processes the YAML-configuration."
     },
     "reset_accessory": {
       "name": "Reset accessory",
diff --git a/homeassistant/components/homekit/type_switches.py b/homeassistant/components/homekit/type_switches.py
index 0482a5956ac..8c6fc1ed672 100644
--- a/homeassistant/components/homekit/type_switches.py
+++ b/homeassistant/components/homekit/type_switches.py
@@ -16,6 +16,12 @@ from pyhap.const import (
 
 from homeassistant.components import button, input_button
 from homeassistant.components.input_select import ATTR_OPTIONS, SERVICE_SELECT_OPTION
+from homeassistant.components.lawn_mower import (
+    DOMAIN as LAWN_MOWER_DOMAIN,
+    SERVICE_DOCK,
+    SERVICE_START_MOWING,
+    LawnMowerActivity,
+)
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
 from homeassistant.components.vacuum import (
     DOMAIN as VACUUM_DOMAIN,
@@ -218,6 +224,29 @@ class Vacuum(Switch):
         self.char_on.set_value(current_state)
 
 
+@TYPES.register("LawnMower")
+class LawnMower(Switch):
+    """Generate a Switch accessory."""
+
+    def set_state(self, value: bool) -> None:
+        """Move switch state to value if call came from HomeKit."""
+        _LOGGER.debug("%s: Set switch state to %s", self.entity_id, value)
+        state = self.hass.states.get(self.entity_id)
+        assert state
+
+        service = SERVICE_START_MOWING if value else SERVICE_DOCK
+        self.async_call_service(
+            LAWN_MOWER_DOMAIN, service, {ATTR_ENTITY_ID: self.entity_id}
+        )
+
+    @callback
+    def async_update_state(self, new_state: State) -> None:
+        """Update switch state after state changed."""
+        current_state = new_state.state in (LawnMowerActivity.MOWING, STATE_ON)
+        _LOGGER.debug("%s: Set current state to %s", self.entity_id, current_state)
+        self.char_on.set_value(current_state)
+
+
 class ValveBase(HomeAccessory):
     """Valve base class."""
 
diff --git a/homeassistant/components/homekit/util.py b/homeassistant/components/homekit/util.py
index a0dfcea7616..1181ceaa953 100644
--- a/homeassistant/components/homekit/util.py
+++ b/homeassistant/components/homekit/util.py
@@ -47,7 +47,7 @@ from homeassistant.core import (
     callback,
     split_entity_id,
 )
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.storage import STORAGE_DIR
 from homeassistant.util.unit_conversion import TemperatureConverter
 
@@ -78,6 +78,7 @@ from .const import (
     CONF_VIDEO_CODEC,
     CONF_VIDEO_MAP,
     CONF_VIDEO_PACKET_SIZE,
+    CONF_VIDEO_PROFILE_NAMES,
     DEFAULT_AUDIO_CODEC,
     DEFAULT_AUDIO_MAP,
     DEFAULT_AUDIO_PACKET_SIZE,
@@ -90,6 +91,7 @@ from .const import (
     DEFAULT_VIDEO_CODEC,
     DEFAULT_VIDEO_MAP,
     DEFAULT_VIDEO_PACKET_SIZE,
+    DEFAULT_VIDEO_PROFILE_NAMES,
     DOMAIN,
     FEATURE_ON_OFF,
     FEATURE_PLAY_PAUSE,
@@ -163,6 +165,9 @@ CAMERA_SCHEMA = BASIC_INFO_SCHEMA.extend(
         vol.Optional(CONF_VIDEO_CODEC, default=DEFAULT_VIDEO_CODEC): vol.In(
             VALID_VIDEO_CODECS
         ),
+        vol.Optional(CONF_VIDEO_PROFILE_NAMES, default=DEFAULT_VIDEO_PROFILE_NAMES): [
+            cv.string
+        ],
         vol.Optional(
             CONF_AUDIO_PACKET_SIZE, default=DEFAULT_AUDIO_PACKET_SIZE
         ): cv.positive_int,
diff --git a/homeassistant/components/homekit_controller/alarm_control_panel.py b/homeassistant/components/homekit_controller/alarm_control_panel.py
index b17f122dfa5..a0342203e4a 100644
--- a/homeassistant/components/homekit_controller/alarm_control_panel.py
+++ b/homeassistant/components/homekit_controller/alarm_control_panel.py
@@ -15,7 +15,7 @@ from homeassistant.components.alarm_control_panel import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_BATTERY_LEVEL, Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import KNOWN_DEVICES
 from .connection import HKDevice
@@ -40,7 +40,7 @@ TARGET_STATE_MAP = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Homekit alarm control panel."""
     hkid: str = config_entry.data["AccessoryPairingID"]
diff --git a/homeassistant/components/homekit_controller/binary_sensor.py b/homeassistant/components/homekit_controller/binary_sensor.py
index 26e19c8944a..1c80da3cc9c 100644
--- a/homeassistant/components/homekit_controller/binary_sensor.py
+++ b/homeassistant/components/homekit_controller/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import KNOWN_DEVICES
 from .connection import HKDevice
@@ -156,7 +156,7 @@ REJECT_CHAR_BY_TYPE = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Homekit lighting."""
     hkid: str = config_entry.data["AccessoryPairingID"]
diff --git a/homeassistant/components/homekit_controller/button.py b/homeassistant/components/homekit_controller/button.py
index ac2133f61ca..730b3c8425d 100644
--- a/homeassistant/components/homekit_controller/button.py
+++ b/homeassistant/components/homekit_controller/button.py
@@ -20,7 +20,7 @@ from homeassistant.components.button import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from . import KNOWN_DEVICES
@@ -66,7 +66,7 @@ BUTTON_ENTITIES: dict[str, HomeKitButtonEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Homekit buttons."""
     hkid: str = config_entry.data["AccessoryPairingID"]
diff --git a/homeassistant/components/homekit_controller/camera.py b/homeassistant/components/homekit_controller/camera.py
index 4332032867a..36bf30e5bab 100644
--- a/homeassistant/components/homekit_controller/camera.py
+++ b/homeassistant/components/homekit_controller/camera.py
@@ -9,7 +9,7 @@ from homeassistant.components.camera import Camera
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import KNOWN_DEVICES
 from .connection import HKDevice
@@ -39,7 +39,7 @@ class HomeKitCamera(AccessoryEntity, Camera):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Homekit sensors."""
     hkid: str = config_entry.data["AccessoryPairingID"]
diff --git a/homeassistant/components/homekit_controller/climate.py b/homeassistant/components/homekit_controller/climate.py
index cbf4ad61c2f..7341bbd3a4a 100644
--- a/homeassistant/components/homekit_controller/climate.py
+++ b/homeassistant/components/homekit_controller/climate.py
@@ -41,7 +41,7 @@ from homeassistant.components.climate import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, Platform, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
     ranged_value_to_percentage,
@@ -111,7 +111,7 @@ HASS_FAN_MODE_TO_HOMEKIT_ROTATION = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Homekit climate."""
     hkid: str = config_entry.data["AccessoryPairingID"]
diff --git a/homeassistant/components/homekit_controller/connection.py b/homeassistant/components/homekit_controller/connection.py
index 211aec2c2d5..43cbdec67fa 100644
--- a/homeassistant/components/homekit_controller/connection.py
+++ b/homeassistant/components/homekit_controller/connection.py
@@ -154,7 +154,6 @@ class HKDevice:
         self._pending_subscribes: set[tuple[int, int]] = set()
         self._subscribe_timer: CALLBACK_TYPE | None = None
         self._load_platforms_lock = asyncio.Lock()
-        self._full_update_requested: bool = False
 
     @property
     def entity_map(self) -> Accessories:
@@ -841,48 +840,11 @@ class HKDevice:
 
     async def async_request_update(self, now: datetime | None = None) -> None:
         """Request an debounced update from the accessory."""
-        self._full_update_requested = True
         await self._debounced_update.async_call()
 
     async def async_update(self, now: datetime | None = None) -> None:
         """Poll state of all entities attached to this bridge/accessory."""
         to_poll = self.pollable_characteristics
-        accessories = self.entity_map.accessories
-
-        if (
-            not self._full_update_requested
-            and len(accessories) == 1
-            and self.available
-            and not (to_poll - self.watchable_characteristics)
-            and self.pairing.is_available
-            and await self.pairing.controller.async_reachable(
-                self.unique_id, timeout=5.0
-            )
-        ):
-            # If its a single accessory and all chars are watchable,
-            # only poll the firmware version to keep the connection alive
-            # https://github.com/home-assistant/core/issues/123412
-            #
-            # Firmware revision is used here since iOS does this to keep camera
-            # connections alive, and the goal is to not regress
-            # https://github.com/home-assistant/core/issues/116143
-            # by polling characteristics that are not normally polled frequently
-            # and may not be tested by the device vendor.
-            #
-            _LOGGER.debug(
-                "Accessory is reachable, limiting poll to firmware version: %s",
-                self.unique_id,
-            )
-            first_accessory = accessories[0]
-            accessory_info = first_accessory.services.first(
-                service_type=ServicesTypes.ACCESSORY_INFORMATION
-            )
-            assert accessory_info is not None
-            firmware_iid = accessory_info[CharacteristicsTypes.FIRMWARE_REVISION].iid
-            to_poll = {(first_accessory.aid, firmware_iid)}
-
-        self._full_update_requested = False
-
         if not to_poll:
             self.async_update_available_state()
             _LOGGER.debug(
diff --git a/homeassistant/components/homekit_controller/cover.py b/homeassistant/components/homekit_controller/cover.py
index 4fff32002e2..5ea990f55e6 100644
--- a/homeassistant/components/homekit_controller/cover.py
+++ b/homeassistant/components/homekit_controller/cover.py
@@ -19,7 +19,7 @@ from homeassistant.components.cover import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import KNOWN_DEVICES
 from .connection import HKDevice
@@ -51,7 +51,7 @@ CURRENT_WINDOW_STATE_MAP = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Homekit covers."""
     hkid: str = config_entry.data["AccessoryPairingID"]
diff --git a/homeassistant/components/homekit_controller/event.py b/homeassistant/components/homekit_controller/event.py
index 890c12c9bab..b90d561d60d 100644
--- a/homeassistant/components/homekit_controller/event.py
+++ b/homeassistant/components/homekit_controller/event.py
@@ -14,7 +14,7 @@ from homeassistant.components.event import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import KNOWN_DEVICES
 from .connection import HKDevice
@@ -86,7 +86,7 @@ class HomeKitEventEntity(BaseCharacteristicEntity, EventEntity):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Homekit event."""
     hkid: str = config_entry.data["AccessoryPairingID"]
diff --git a/homeassistant/components/homekit_controller/fan.py b/homeassistant/components/homekit_controller/fan.py
index b7f1842392b..9ba476a0ef3 100644
--- a/homeassistant/components/homekit_controller/fan.py
+++ b/homeassistant/components/homekit_controller/fan.py
@@ -17,7 +17,7 @@ from homeassistant.components.fan import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
     ranged_value_to_percentage,
@@ -210,7 +210,7 @@ ENTITY_TYPES = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Homekit fans."""
     hkid: str = config_entry.data["AccessoryPairingID"]
diff --git a/homeassistant/components/homekit_controller/humidifier.py b/homeassistant/components/homekit_controller/humidifier.py
index b2b0e0b1026..7906d5ec52b 100644
--- a/homeassistant/components/homekit_controller/humidifier.py
+++ b/homeassistant/components/homekit_controller/humidifier.py
@@ -20,7 +20,7 @@ from homeassistant.components.humidifier import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from . import KNOWN_DEVICES
@@ -165,7 +165,7 @@ class HomeKitDehumidifier(HomeKitBaseHumidifier):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Homekit humidifer."""
     hkid: str = config_entry.data["AccessoryPairingID"]
diff --git a/homeassistant/components/homekit_controller/light.py b/homeassistant/components/homekit_controller/light.py
index b306c440d7b..5409df7c1a8 100644
--- a/homeassistant/components/homekit_controller/light.py
+++ b/homeassistant/components/homekit_controller/light.py
@@ -20,8 +20,8 @@ from homeassistant.components.light import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.color as color_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import color as color_util
 
 from . import KNOWN_DEVICES
 from .connection import HKDevice
@@ -31,7 +31,7 @@ from .entity import HomeKitEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Homekit lightbulb."""
     hkid: str = config_entry.data["AccessoryPairingID"]
diff --git a/homeassistant/components/homekit_controller/lock.py b/homeassistant/components/homekit_controller/lock.py
index 98974c4a514..06b8382c8af 100644
--- a/homeassistant/components/homekit_controller/lock.py
+++ b/homeassistant/components/homekit_controller/lock.py
@@ -11,7 +11,7 @@ from homeassistant.components.lock import LockEntity, LockState
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_BATTERY_LEVEL, STATE_UNKNOWN, Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import KNOWN_DEVICES
 from .connection import HKDevice
@@ -32,7 +32,7 @@ REVERSED_TARGET_STATE_MAP = {v: k for k, v in TARGET_STATE_MAP.items()}
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Homekit lock."""
     hkid: str = config_entry.data["AccessoryPairingID"]
diff --git a/homeassistant/components/homekit_controller/manifest.json b/homeassistant/components/homekit_controller/manifest.json
index b7c82b9fd51..98db9a397d3 100644
--- a/homeassistant/components/homekit_controller/manifest.json
+++ b/homeassistant/components/homekit_controller/manifest.json
@@ -14,6 +14,6 @@
   "documentation": "https://www.home-assistant.io/integrations/homekit_controller",
   "iot_class": "local_push",
   "loggers": ["aiohomekit", "commentjson"],
-  "requirements": ["aiohomekit==3.2.7"],
+  "requirements": ["aiohomekit==3.2.8"],
   "zeroconf": ["_hap._tcp.local.", "_hap._udp.local."]
 }
diff --git a/homeassistant/components/homekit_controller/media_player.py b/homeassistant/components/homekit_controller/media_player.py
index 4232d1b7649..e3b4a760680 100644
--- a/homeassistant/components/homekit_controller/media_player.py
+++ b/homeassistant/components/homekit_controller/media_player.py
@@ -22,7 +22,7 @@ from homeassistant.components.media_player import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import KNOWN_DEVICES
 from .connection import HKDevice
@@ -41,7 +41,7 @@ HK_TO_HA_STATE = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Homekit television."""
     hkid: str = config_entry.data["AccessoryPairingID"]
@@ -83,7 +83,7 @@ class HomeKitTelevision(HomeKitEntity, MediaPlayerEntity):
     @property
     def supported_features(self) -> MediaPlayerEntityFeature:
         """Flag media player features that are supported."""
-        features = MediaPlayerEntityFeature(0)
+        features = MediaPlayerEntityFeature.TURN_OFF | MediaPlayerEntityFeature.TURN_ON
 
         if self.service.has(CharacteristicsTypes.ACTIVE_IDENTIFIER):
             features |= MediaPlayerEntityFeature.SELECT_SOURCE
@@ -177,6 +177,14 @@ class HomeKitTelevision(HomeKitEntity, MediaPlayerEntity):
 
         return MediaPlayerState.ON
 
+    async def async_turn_on(self) -> None:
+        """Turn the tv on."""
+        await self.async_put_characteristics({CharacteristicsTypes.ACTIVE: 1})
+
+    async def async_turn_off(self) -> None:
+        """Turn the tv off."""
+        await self.async_put_characteristics({CharacteristicsTypes.ACTIVE: 0})
+
     async def async_media_play(self) -> None:
         """Send play command."""
         if self.state == MediaPlayerState.PLAYING:
diff --git a/homeassistant/components/homekit_controller/number.py b/homeassistant/components/homekit_controller/number.py
index 340d31c91ae..96d6707d8eb 100644
--- a/homeassistant/components/homekit_controller/number.py
+++ b/homeassistant/components/homekit_controller/number.py
@@ -18,7 +18,7 @@ from homeassistant.components.number import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from . import KNOWN_DEVICES
@@ -68,7 +68,7 @@ NUMBER_ENTITIES: dict[str, NumberEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Homekit numbers."""
     hkid: str = config_entry.data["AccessoryPairingID"]
diff --git a/homeassistant/components/homekit_controller/select.py b/homeassistant/components/homekit_controller/select.py
index f672f293122..f174743b12f 100644
--- a/homeassistant/components/homekit_controller/select.py
+++ b/homeassistant/components/homekit_controller/select.py
@@ -15,7 +15,7 @@ from homeassistant.components.select import SelectEntity, SelectEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from . import KNOWN_DEVICES
@@ -148,7 +148,7 @@ class EcobeeModeSelect(BaseHomeKitSelect):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Homekit select entities."""
     hkid: str = config_entry.data["AccessoryPairingID"]
diff --git a/homeassistant/components/homekit_controller/sensor.py b/homeassistant/components/homekit_controller/sensor.py
index 059be5bad99..c97b45152e0 100644
--- a/homeassistant/components/homekit_controller/sensor.py
+++ b/homeassistant/components/homekit_controller/sensor.py
@@ -43,7 +43,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from . import KNOWN_DEVICES
@@ -640,7 +640,7 @@ class RSSISensor(HomeKitEntity, SensorEntity):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Homekit sensors."""
     hkid = config_entry.data["AccessoryPairingID"]
diff --git a/homeassistant/components/homekit_controller/switch.py b/homeassistant/components/homekit_controller/switch.py
index 5abed2a5c79..c24a4edf545 100644
--- a/homeassistant/components/homekit_controller/switch.py
+++ b/homeassistant/components/homekit_controller/switch.py
@@ -17,7 +17,7 @@ from homeassistant.components.switch import SwitchEntity, SwitchEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from . import KNOWN_DEVICES
@@ -224,7 +224,7 @@ ENTITY_TYPES: dict[str, type[HomeKitSwitch | HomeKitFaucet | HomeKitValve]] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Homekit switches."""
     hkid: str = config_entry.data["AccessoryPairingID"]
diff --git a/homeassistant/components/homematic/__init__.py b/homeassistant/components/homematic/__init__.py
index f0fc2a40278..710f2ede52b 100644
--- a/homeassistant/components/homematic/__init__.py
+++ b/homeassistant/components/homematic/__init__.py
@@ -24,8 +24,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.core import HomeAssistant, ServiceCall
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
diff --git a/homeassistant/components/homematic/entity.py b/homeassistant/components/homematic/entity.py
index ac0a05d24c1..44e95e98f38 100644
--- a/homeassistant/components/homematic/entity.py
+++ b/homeassistant/components/homematic/entity.py
@@ -10,7 +10,7 @@ from pyhomematic import HMConnection
 from pyhomematic.devicetypes.generic import HMGeneric
 
 from homeassistant.const import ATTR_NAME
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import Entity, EntityDescription
 from homeassistant.helpers.event import track_time_interval
 
@@ -62,7 +62,7 @@ class HMDevice(Entity):
         if self._state:
             self._state = self._state.upper()
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Load data init callbacks."""
         self._subscribe_homematic_events()
 
@@ -77,7 +77,7 @@ class HMDevice(Entity):
         return self._name
 
     @property
-    def available(self):
+    def available(self) -> bool:
         """Return true if device is available."""
         return self._available
 
diff --git a/homeassistant/components/homematic/notify.py b/homeassistant/components/homematic/notify.py
index ced8ea6a951..1f89abea5cc 100644
--- a/homeassistant/components/homematic/notify.py
+++ b/homeassistant/components/homematic/notify.py
@@ -10,8 +10,7 @@ from homeassistant.components.notify import (
     BaseNotificationService,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
-import homeassistant.helpers.template as template_helper
+from homeassistant.helpers import config_validation as cv, template as template_helper
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import (
diff --git a/homeassistant/components/homematic/sensor.py b/homeassistant/components/homematic/sensor.py
index b33a725db0f..bdd446d7091 100644
--- a/homeassistant/components/homematic/sensor.py
+++ b/homeassistant/components/homematic/sensor.py
@@ -177,6 +177,8 @@ SENSOR_DESCRIPTIONS: dict[str, SensorEntityDescription] = {
     "WIND_DIRECTION": SensorEntityDescription(
         key="WIND_DIRECTION",
         native_unit_of_measurement=DEGREE,
+        device_class=SensorDeviceClass.WIND_DIRECTION,
+        state_class=SensorStateClass.MEASUREMENT_ANGLE,
     ),
     "WIND_DIRECTION_RANGE": SensorEntityDescription(
         key="WIND_DIRECTION_RANGE",
diff --git a/homeassistant/components/homematic/strings.json b/homeassistant/components/homematic/strings.json
index d962a218a4f..78159189db8 100644
--- a/homeassistant/components/homematic/strings.json
+++ b/homeassistant/components/homematic/strings.json
@@ -2,7 +2,7 @@
   "services": {
     "virtualkey": {
       "name": "Virtual key",
-      "description": "Presses a virtual key from CCU/Homegear or simulate keypress.",
+      "description": "Simulates a keypress (or other valid action) on CCU/Homegear with virtual or device keys.",
       "fields": {
         "address": {
           "name": "Address",
@@ -24,7 +24,7 @@
     },
     "set_variable_value": {
       "name": "Set variable value",
-      "description": "Sets the name of a node.",
+      "description": "Sets the value of a system variable.",
       "fields": {
         "entity_id": {
           "name": "Entity",
diff --git a/homeassistant/components/homematicip_cloud/alarm_control_panel.py b/homeassistant/components/homematicip_cloud/alarm_control_panel.py
index 4241316c2a4..d5b084644e3 100644
--- a/homeassistant/components/homematicip_cloud/alarm_control_panel.py
+++ b/homeassistant/components/homematicip_cloud/alarm_control_panel.py
@@ -14,7 +14,7 @@ from homeassistant.components.alarm_control_panel import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .hap import AsyncHome, HomematicipHAP
@@ -27,7 +27,7 @@ CONST_ALARM_CONTROL_PANEL_NAME = "HmIP Alarm Control Panel"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the HomematicIP alrm control panel from a config entry."""
     hap = hass.data[DOMAIN][config_entry.unique_id]
diff --git a/homeassistant/components/homematicip_cloud/binary_sensor.py b/homeassistant/components/homematicip_cloud/binary_sensor.py
index 38590e4505b..f0cd3732718 100644
--- a/homeassistant/components/homematicip_cloud/binary_sensor.py
+++ b/homeassistant/components/homematicip_cloud/binary_sensor.py
@@ -37,7 +37,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import HomematicipGenericEntity
@@ -76,7 +76,7 @@ SAM_DEVICE_ATTRIBUTES = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the HomematicIP Cloud binary sensor from a config entry."""
     hap = hass.data[DOMAIN][config_entry.unique_id]
diff --git a/homeassistant/components/homematicip_cloud/button.py b/homeassistant/components/homematicip_cloud/button.py
index 244be47d7f6..fedc271714c 100644
--- a/homeassistant/components/homematicip_cloud/button.py
+++ b/homeassistant/components/homematicip_cloud/button.py
@@ -7,7 +7,7 @@ from homematicip.aio.device import AsyncWallMountedGarageDoorController
 from homeassistant.components.button import ButtonEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import HomematicipGenericEntity
@@ -17,7 +17,7 @@ from .hap import HomematicipHAP
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the HomematicIP button from a config entry."""
     hap = hass.data[DOMAIN][config_entry.unique_id]
diff --git a/homeassistant/components/homematicip_cloud/climate.py b/homeassistant/components/homematicip_cloud/climate.py
index e7132fac83c..35bd18ff438 100644
--- a/homeassistant/components/homematicip_cloud/climate.py
+++ b/homeassistant/components/homematicip_cloud/climate.py
@@ -29,7 +29,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import HomematicipGenericEntity
@@ -57,7 +57,7 @@ HMIP_ECO_CM = "ECO"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the HomematicIP climate from a config entry."""
     hap = hass.data[DOMAIN][config_entry.unique_id]
diff --git a/homeassistant/components/homematicip_cloud/cover.py b/homeassistant/components/homematicip_cloud/cover.py
index 1db536afd4f..27a84abb572 100644
--- a/homeassistant/components/homematicip_cloud/cover.py
+++ b/homeassistant/components/homematicip_cloud/cover.py
@@ -23,7 +23,7 @@ from homeassistant.components.cover import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import HomematicipGenericEntity
@@ -38,7 +38,7 @@ HMIP_SLATS_CLOSED = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the HomematicIP cover from a config entry."""
     hap = hass.data[DOMAIN][config_entry.unique_id]
diff --git a/homeassistant/components/homematicip_cloud/event.py b/homeassistant/components/homematicip_cloud/event.py
index 8fb558b2b34..654f56bb47f 100644
--- a/homeassistant/components/homematicip_cloud/event.py
+++ b/homeassistant/components/homematicip_cloud/event.py
@@ -12,7 +12,7 @@ from homeassistant.components.event import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import HomematicipGenericEntity
@@ -37,7 +37,7 @@ EVENT_DESCRIPTIONS = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the HomematicIP cover from a config entry."""
     hap = hass.data[DOMAIN][config_entry.unique_id]
diff --git a/homeassistant/components/homematicip_cloud/light.py b/homeassistant/components/homematicip_cloud/light.py
index cf051103a10..ad946809fd4 100644
--- a/homeassistant/components/homematicip_cloud/light.py
+++ b/homeassistant/components/homematicip_cloud/light.py
@@ -30,7 +30,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import HomematicipGenericEntity
@@ -40,7 +40,7 @@ from .hap import HomematicipHAP
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the HomematicIP Cloud lights from a config entry."""
     hap = hass.data[DOMAIN][config_entry.unique_id]
diff --git a/homeassistant/components/homematicip_cloud/lock.py b/homeassistant/components/homematicip_cloud/lock.py
index b00f42fc844..a054e95a80d 100644
--- a/homeassistant/components/homematicip_cloud/lock.py
+++ b/homeassistant/components/homematicip_cloud/lock.py
@@ -11,7 +11,7 @@ from homematicip.base.enums import LockState, MotorState
 from homeassistant.components.lock import LockEntity, LockEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import HomematicipGenericEntity
@@ -37,7 +37,7 @@ DEVICE_DLD_ATTRIBUTES = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the HomematicIP locks from a config entry."""
     hap = hass.data[DOMAIN][config_entry.unique_id]
diff --git a/homeassistant/components/homematicip_cloud/manifest.json b/homeassistant/components/homematicip_cloud/manifest.json
index 6fc422498ab..414ba37709e 100644
--- a/homeassistant/components/homematicip_cloud/manifest.json
+++ b/homeassistant/components/homematicip_cloud/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/homematicip_cloud",
   "iot_class": "cloud_push",
   "loggers": ["homematicip"],
-  "requirements": ["homematicip==1.1.6"]
+  "requirements": ["homematicip==1.1.7"]
 }
diff --git a/homeassistant/components/homematicip_cloud/sensor.py b/homeassistant/components/homematicip_cloud/sensor.py
index 9ed9b33d7c7..0280f5bc7d5 100644
--- a/homeassistant/components/homematicip_cloud/sensor.py
+++ b/homeassistant/components/homematicip_cloud/sensor.py
@@ -57,7 +57,7 @@ from homeassistant.const import (
     UnitOfVolumeFlowRate,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .const import DOMAIN
@@ -96,7 +96,7 @@ ILLUMINATION_DEVICE_ATTRIBUTES = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the HomematicIP Cloud sensors from a config entry."""
     hap = hass.data[DOMAIN][config_entry.unique_id]
diff --git a/homeassistant/components/homematicip_cloud/services.py b/homeassistant/components/homematicip_cloud/services.py
index 69765ccc601..7a4dfd4916f 100644
--- a/homeassistant/components/homematicip_cloud/services.py
+++ b/homeassistant/components/homematicip_cloud/services.py
@@ -14,7 +14,7 @@ import voluptuous as vol
 from homeassistant.const import ATTR_ENTITY_ID, ATTR_TEMPERATURE
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.exceptions import ServiceValidationError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.config_validation import comp_entity_ids
 from homeassistant.helpers.service import (
     async_register_admin_service,
diff --git a/homeassistant/components/homematicip_cloud/strings.json b/homeassistant/components/homematicip_cloud/strings.json
index 37deace7ebf..7b1b08ac4e2 100644
--- a/homeassistant/components/homematicip_cloud/strings.json
+++ b/homeassistant/components/homematicip_cloud/strings.json
@@ -3,6 +3,7 @@
     "step": {
       "init": {
         "title": "Pick Homematic IP access point",
+        "description": "If you are about to register a **Homematic IP HCU1**, please press the button on top of the device before you continue.\n\nThe registration process must be completed within 5 minutes.",
         "data": {
           "hapid": "Access point ID (SGTIN)",
           "pin": "[%key:common::config_flow::data::pin%]",
@@ -34,7 +35,7 @@
   "services": {
     "activate_eco_mode_with_duration": {
       "name": "Activate eco mode with duration",
-      "description": "Activates eco mode with period.",
+      "description": "Activates the eco mode for a specified duration.",
       "fields": {
         "duration": {
           "name": "Duration",
@@ -48,7 +49,7 @@
     },
     "activate_eco_mode_with_period": {
       "name": "Activate eco more with period",
-      "description": "[%key:component::homematicip_cloud::services::activate_eco_mode_with_duration::description%]",
+      "description": "Activates the eco mode until a given time.",
       "fields": {
         "endtime": {
           "name": "Endtime",
@@ -62,7 +63,7 @@
     },
     "activate_vacation": {
       "name": "Activate vacation",
-      "description": "Activates the vacation mode until the given time.",
+      "description": "Activates the vacation mode until a given time.",
       "fields": {
         "endtime": {
           "name": "[%key:component::homematicip_cloud::services::activate_eco_mode_with_period::fields::endtime::name%]",
diff --git a/homeassistant/components/homematicip_cloud/switch.py b/homeassistant/components/homematicip_cloud/switch.py
index 70bf14631cb..a9aa1c664d7 100644
--- a/homeassistant/components/homematicip_cloud/switch.py
+++ b/homeassistant/components/homematicip_cloud/switch.py
@@ -25,7 +25,7 @@ from homematicip.aio.group import AsyncExtendedLinkedSwitchingGroup, AsyncSwitch
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import ATTR_GROUP_MEMBER_UNREACHABLE, HomematicipGenericEntity
@@ -35,7 +35,7 @@ from .hap import HomematicipHAP
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the HomematicIP switch from a config entry."""
     hap = hass.data[DOMAIN][config_entry.unique_id]
diff --git a/homeassistant/components/homematicip_cloud/weather.py b/homeassistant/components/homematicip_cloud/weather.py
index cbe7c2845b8..1125c73f8d4 100644
--- a/homeassistant/components/homematicip_cloud/weather.py
+++ b/homeassistant/components/homematicip_cloud/weather.py
@@ -25,7 +25,7 @@ from homeassistant.components.weather import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfSpeed, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import HomematicipGenericEntity
@@ -53,7 +53,7 @@ HOME_WEATHER_CONDITION = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the HomematicIP weather sensor from a config entry."""
     hap = hass.data[DOMAIN][config_entry.unique_id]
diff --git a/homeassistant/components/homewizard/__init__.py b/homeassistant/components/homewizard/__init__.py
index a911f5398da..3831146aed8 100644
--- a/homeassistant/components/homewizard/__init__.py
+++ b/homeassistant/components/homewizard/__init__.py
@@ -1,17 +1,21 @@
 """The Homewizard integration."""
 
-from homewizard_energy import HomeWizardEnergy, HomeWizardEnergyV1, HomeWizardEnergyV2
+from homewizard_energy import (
+    HomeWizardEnergy,
+    HomeWizardEnergyV1,
+    HomeWizardEnergyV2,
+    has_v2_api,
+)
 
-from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntry
+from homeassistant.config_entries import SOURCE_REAUTH
 from homeassistant.const import CONF_IP_ADDRESS, CONF_TOKEN
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 
 from .const import DOMAIN, PLATFORMS
-from .coordinator import HWEnergyDeviceUpdateCoordinator
-
-type HomeWizardConfigEntry = ConfigEntry[HWEnergyDeviceUpdateCoordinator]
+from .coordinator import HomeWizardConfigEntry, HWEnergyDeviceUpdateCoordinator
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: HomeWizardConfigEntry) -> bool:
@@ -19,7 +23,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: HomeWizardConfigEntry) -
 
     api: HomeWizardEnergy
 
-    if token := entry.data.get(CONF_TOKEN):
+    is_battery = entry.unique_id.startswith("HWE-BAT") if entry.unique_id else False
+
+    if (token := entry.data.get(CONF_TOKEN)) and is_battery:
         api = HomeWizardEnergyV2(
             entry.data[CONF_IP_ADDRESS],
             token=token,
@@ -31,7 +37,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: HomeWizardConfigEntry) -
             clientsession=async_get_clientsession(hass),
         )
 
-    coordinator = HWEnergyDeviceUpdateCoordinator(hass, api)
+        if is_battery:
+            await async_check_v2_support_and_create_issue(hass, entry)
+
+    coordinator = HWEnergyDeviceUpdateCoordinator(hass, entry, api)
     try:
         await coordinator.async_config_entry_first_refresh()
 
@@ -63,3 +72,27 @@ async def async_setup_entry(hass: HomeAssistant, entry: HomeWizardConfigEntry) -
 async def async_unload_entry(hass: HomeAssistant, entry: HomeWizardConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+
+async def async_check_v2_support_and_create_issue(
+    hass: HomeAssistant, entry: HomeWizardConfigEntry
+) -> None:
+    """Check if the device supports v2 and create an issue if not."""
+
+    if not await has_v2_api(entry.data[CONF_IP_ADDRESS], async_get_clientsession(hass)):
+        return
+
+    async_create_issue(
+        hass,
+        DOMAIN,
+        f"migrate_to_v2_api_{entry.entry_id}",
+        is_fixable=True,
+        is_persistent=False,
+        learn_more_url="https://home-assistant.io/integrations/homewizard/#which-button-do-i-need-to-press-to-configure-the-device",
+        translation_key="migrate_to_v2_api",
+        translation_placeholders={
+            "title": entry.title,
+        },
+        severity=IssueSeverity.WARNING,
+        data={"entry_id": entry.entry_id},
+    )
diff --git a/homeassistant/components/homewizard/button.py b/homeassistant/components/homewizard/button.py
index b86f797ec2d..5a36cdb71f2 100644
--- a/homeassistant/components/homewizard/button.py
+++ b/homeassistant/components/homewizard/button.py
@@ -3,10 +3,9 @@
 from homeassistant.components.button import ButtonDeviceClass, ButtonEntity
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import HomeWizardConfigEntry
-from .coordinator import HWEnergyDeviceUpdateCoordinator
+from .coordinator import HomeWizardConfigEntry, HWEnergyDeviceUpdateCoordinator
 from .entity import HomeWizardEntity
 from .helpers import homewizard_exception_handler
 
@@ -16,7 +15,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: HomeWizardConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Identify button."""
     if entry.runtime_data.data.device.supports_identify():
diff --git a/homeassistant/components/homewizard/config_flow.py b/homeassistant/components/homewizard/config_flow.py
index fe78385381c..68dc54aef0e 100644
--- a/homeassistant/components/homewizard/config_flow.py
+++ b/homeassistant/components/homewizard/config_flow.py
@@ -5,28 +5,33 @@ from __future__ import annotations
 from collections.abc import Mapping
 from typing import Any
 
-from homewizard_energy import HomeWizardEnergyV1
-from homewizard_energy.errors import DisabledError, RequestError, UnsupportedError
+from homewizard_energy import (
+    HomeWizardEnergy,
+    HomeWizardEnergyV1,
+    HomeWizardEnergyV2,
+    has_v2_api,
+)
+from homewizard_energy.errors import (
+    DisabledError,
+    RequestError,
+    UnauthorizedError,
+    UnsupportedError,
+)
 from homewizard_energy.models import Device
 import voluptuous as vol
 
 from homeassistant.components import onboarding
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_IP_ADDRESS, CONF_PATH
+from homeassistant.const import CONF_IP_ADDRESS, CONF_TOKEN
+from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import AbortFlow
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import instance_id
 from homeassistant.helpers.selector import TextSelector
 from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
-from .const import (
-    CONF_API_ENABLED,
-    CONF_PRODUCT_NAME,
-    CONF_PRODUCT_TYPE,
-    CONF_SERIAL,
-    DOMAIN,
-    LOGGER,
-)
+from .const import CONF_PRODUCT_NAME, CONF_PRODUCT_TYPE, CONF_SERIAL, DOMAIN, LOGGER
 
 
 class HomeWizardConfigFlow(ConfigFlow, domain=DOMAIN):
@@ -46,10 +51,14 @@ class HomeWizardConfigFlow(ConfigFlow, domain=DOMAIN):
         errors: dict[str, str] | None = None
         if user_input is not None:
             try:
-                device_info = await self._async_try_connect(user_input[CONF_IP_ADDRESS])
+                device_info = await async_try_connect(user_input[CONF_IP_ADDRESS])
             except RecoverableError as ex:
                 LOGGER.error(ex)
                 errors = {"base": ex.error_code}
+            except UnauthorizedError:
+                # Device responded, so IP is correct. But we have to authorize
+                self.ip_address = user_input[CONF_IP_ADDRESS]
+                return await self.async_step_authorize()
             else:
                 await self.async_set_unique_id(
                     f"{device_info.product_type}_{device_info.serial}"
@@ -73,22 +82,54 @@ class HomeWizardConfigFlow(ConfigFlow, domain=DOMAIN):
             errors=errors,
         )
 
+    async def async_step_authorize(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Step where we attempt to get a token."""
+        assert self.ip_address
+
+        # Tell device we want a token, user must now press the button within 30 seconds
+        # The first attempt will always fail, but this opens the window to press the button
+        token = await async_request_token(self.hass, self.ip_address)
+        errors: dict[str, str] | None = None
+
+        if token is None:
+            if user_input is not None:
+                errors = {"base": "authorization_failed"}
+
+            return self.async_show_form(step_id="authorize", errors=errors)
+
+        # Now we got a token, we can ask for some more info
+
+        async with HomeWizardEnergyV2(self.ip_address, token=token) as api:
+            device_info = await api.device()
+
+        data = {
+            CONF_IP_ADDRESS: self.ip_address,
+            CONF_TOKEN: token,
+        }
+
+        await self.async_set_unique_id(
+            f"{device_info.product_type}_{device_info.serial}"
+        )
+        self._abort_if_unique_id_configured(updates=data)
+        return self.async_create_entry(
+            title=f"{device_info.product_name}",
+            data=data,
+        )
+
     async def async_step_zeroconf(
         self, discovery_info: ZeroconfServiceInfo
     ) -> ConfigFlowResult:
         """Handle zeroconf discovery."""
+
         if (
-            CONF_API_ENABLED not in discovery_info.properties
-            or CONF_PATH not in discovery_info.properties
-            or CONF_PRODUCT_NAME not in discovery_info.properties
+            CONF_PRODUCT_NAME not in discovery_info.properties
             or CONF_PRODUCT_TYPE not in discovery_info.properties
             or CONF_SERIAL not in discovery_info.properties
         ):
             return self.async_abort(reason="invalid_discovery_parameters")
 
-        if (discovery_info.properties[CONF_PATH]) != "/api/v1":
-            return self.async_abort(reason="unsupported_api_version")
-
         self.ip_address = discovery_info.host
         self.product_type = discovery_info.properties[CONF_PRODUCT_TYPE]
         self.product_name = discovery_info.properties[CONF_PRODUCT_NAME]
@@ -109,10 +150,12 @@ class HomeWizardConfigFlow(ConfigFlow, domain=DOMAIN):
         This flow is triggered only by DHCP discovery of known devices.
         """
         try:
-            device = await self._async_try_connect(discovery_info.ip)
+            device = await async_try_connect(discovery_info.ip)
         except RecoverableError as ex:
             LOGGER.error(ex)
             return self.async_abort(reason="unknown")
+        except UnauthorizedError:
+            return self.async_abort(reason="unsupported_api_version")
 
         await self.async_set_unique_id(
             f"{device.product_type}_{discovery_info.macaddress}"
@@ -139,10 +182,12 @@ class HomeWizardConfigFlow(ConfigFlow, domain=DOMAIN):
         errors: dict[str, str] | None = None
         if user_input is not None or not onboarding.async_is_onboarded(self.hass):
             try:
-                await self._async_try_connect(self.ip_address)
+                await async_try_connect(self.ip_address)
             except RecoverableError as ex:
                 LOGGER.error(ex)
                 errors = {"base": ex.error_code}
+            except UnauthorizedError:
+                return await self.async_step_authorize()
             else:
                 return self.async_create_entry(
                     title=self.product_name,
@@ -172,34 +217,71 @@ class HomeWizardConfigFlow(ConfigFlow, domain=DOMAIN):
         self, entry_data: Mapping[str, Any]
     ) -> ConfigFlowResult:
         """Handle re-auth if API was disabled."""
-        return await self.async_step_reauth_confirm()
+        self.ip_address = entry_data[CONF_IP_ADDRESS]
 
-    async def async_step_reauth_confirm(
+        # If token exists, we assume we use the v2 API and that the token has been invalidated
+        if entry_data.get(CONF_TOKEN):
+            return await self.async_step_reauth_confirm_update_token()
+
+        # Else we assume we use the v1 API and that the API has been disabled
+        return await self.async_step_reauth_enable_api()
+
+    async def async_step_reauth_enable_api(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Confirm reauth dialog."""
+        """Confirm reauth dialog, where user is asked to re-enable the HomeWizard API."""
         errors: dict[str, str] | None = None
         if user_input is not None:
             reauth_entry = self._get_reauth_entry()
             try:
-                await self._async_try_connect(reauth_entry.data[CONF_IP_ADDRESS])
+                await async_try_connect(reauth_entry.data[CONF_IP_ADDRESS])
             except RecoverableError as ex:
                 LOGGER.error(ex)
                 errors = {"base": ex.error_code}
             else:
                 await self.hass.config_entries.async_reload(reauth_entry.entry_id)
-                return self.async_abort(reason="reauth_successful")
+                return self.async_abort(reason="reauth_enable_api_successful")
 
-        return self.async_show_form(step_id="reauth_confirm", errors=errors)
+        return self.async_show_form(step_id="reauth_enable_api", errors=errors)
+
+    async def async_step_reauth_confirm_update_token(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Confirm reauth dialog."""
+        assert self.ip_address
+
+        errors: dict[str, str] | None = None
+
+        token = await async_request_token(self.hass, self.ip_address)
+
+        if user_input is not None:
+            if token is None:
+                errors = {"base": "authorization_failed"}
+            else:
+                return self.async_update_reload_and_abort(
+                    self._get_reauth_entry(),
+                    data_updates={
+                        CONF_TOKEN: token,
+                    },
+                )
+
+        return self.async_show_form(
+            step_id="reauth_confirm_update_token", errors=errors
+        )
 
     async def async_step_reconfigure(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle reconfiguration of the integration."""
         errors: dict[str, str] = {}
+        reconfigure_entry = self._get_reconfigure_entry()
+
         if user_input:
             try:
-                device_info = await self._async_try_connect(user_input[CONF_IP_ADDRESS])
+                device_info = await async_try_connect(
+                    user_input[CONF_IP_ADDRESS],
+                    token=reconfigure_entry.data.get(CONF_TOKEN),
+                )
 
             except RecoverableError as ex:
                 LOGGER.error(ex)
@@ -213,7 +295,6 @@ class HomeWizardConfigFlow(ConfigFlow, domain=DOMAIN):
                     self._get_reconfigure_entry(),
                     data_updates=user_input,
                 )
-        reconfigure_entry = self._get_reconfigure_entry()
         return self.async_show_form(
             step_id="reconfigure",
             data_schema=vol.Schema(
@@ -230,37 +311,69 @@ class HomeWizardConfigFlow(ConfigFlow, domain=DOMAIN):
             errors=errors,
         )
 
-    @staticmethod
-    async def _async_try_connect(ip_address: str) -> Device:
-        """Try to connect.
 
-        Make connection with device to test the connection
-        and to get info for unique_id.
-        """
+async def async_try_connect(ip_address: str, token: str | None = None) -> Device:
+    """Try to connect.
+
+    Make connection with device to test the connection
+    and to get info for unique_id.
+    """
+
+    energy_api: HomeWizardEnergy
+
+    # Determine if device is v1 or v2 capable
+    if await has_v2_api(ip_address):
+        energy_api = HomeWizardEnergyV2(ip_address, token=token)
+    else:
         energy_api = HomeWizardEnergyV1(ip_address)
-        try:
-            return await energy_api.device()
 
-        except DisabledError as ex:
-            raise RecoverableError(
-                "API disabled, API must be enabled in the app", "api_not_enabled"
-            ) from ex
+    try:
+        return await energy_api.device()
 
-        except UnsupportedError as ex:
-            LOGGER.error("API version unsuppored")
-            raise AbortFlow("unsupported_api_version") from ex
+    except DisabledError as ex:
+        raise RecoverableError(
+            "API disabled, API must be enabled in the app", "api_not_enabled"
+        ) from ex
 
-        except RequestError as ex:
-            raise RecoverableError(
-                "Device unreachable or unexpected response", "network_error"
-            ) from ex
+    except UnsupportedError as ex:
+        LOGGER.error("API version unsuppored")
+        raise AbortFlow("unsupported_api_version") from ex
 
-        except Exception as ex:
-            LOGGER.exception("Unexpected exception")
-            raise AbortFlow("unknown_error") from ex
+    except RequestError as ex:
+        raise RecoverableError(
+            "Device unreachable or unexpected response", "network_error"
+        ) from ex
 
-        finally:
-            await energy_api.close()
+    except UnauthorizedError as ex:
+        raise UnauthorizedError("Unauthorized") from ex
+
+    except Exception as ex:
+        LOGGER.exception("Unexpected exception")
+        raise AbortFlow("unknown_error") from ex
+
+    finally:
+        await energy_api.close()
+
+
+async def async_request_token(hass: HomeAssistant, ip_address: str) -> str | None:
+    """Try to request a token from the device.
+
+    This method is used to request a token from the device,
+    it will return None if the token request failed.
+    """
+
+    api = HomeWizardEnergyV2(ip_address)
+
+    # Get a part of the unique id to make the token unique
+    # This is to prevent token conflicts when multiple HA instances are used
+    uuid = await instance_id.async_get(hass)
+
+    try:
+        return await api.get_token(f"home-assistant#{uuid[:6]}")
+    except DisabledError:
+        return None
+    finally:
+        await api.close()
 
 
 class RecoverableError(HomeAssistantError):
diff --git a/homeassistant/components/homewizard/const.py b/homeassistant/components/homewizard/const.py
index 4bed4675833..e0448edaf86 100644
--- a/homeassistant/components/homewizard/const.py
+++ b/homeassistant/components/homewizard/const.py
@@ -13,8 +13,6 @@ PLATFORMS = [Platform.BUTTON, Platform.NUMBER, Platform.SENSOR, Platform.SWITCH]
 LOGGER = logging.getLogger(__package__)
 
 # Platform config.
-CONF_API_ENABLED = "api_enabled"
-CONF_DATA = "data"
 CONF_PRODUCT_NAME = "product_name"
 CONF_PRODUCT_TYPE = "product_type"
 CONF_SERIAL = "serial"
diff --git a/homeassistant/components/homewizard/coordinator.py b/homeassistant/components/homewizard/coordinator.py
index 7024c760b93..e87381c5fa9 100644
--- a/homeassistant/components/homewizard/coordinator.py
+++ b/homeassistant/components/homewizard/coordinator.py
@@ -3,15 +3,18 @@
 from __future__ import annotations
 
 from homewizard_energy import HomeWizardEnergy
-from homewizard_energy.errors import DisabledError, RequestError
+from homewizard_energy.errors import DisabledError, RequestError, UnauthorizedError
 from homewizard_energy.models import CombinedModels as DeviceResponseEntry
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN, LOGGER, UPDATE_INTERVAL
 
+type HomeWizardConfigEntry = ConfigEntry[HWEnergyDeviceUpdateCoordinator]
+
 
 class HWEnergyDeviceUpdateCoordinator(DataUpdateCoordinator[DeviceResponseEntry]):
     """Gather data for the energy device."""
@@ -19,11 +22,22 @@ class HWEnergyDeviceUpdateCoordinator(DataUpdateCoordinator[DeviceResponseEntry]
     api: HomeWizardEnergy
     api_disabled: bool = False
 
-    config_entry: ConfigEntry
+    config_entry: HomeWizardConfigEntry
 
-    def __init__(self, hass: HomeAssistant, api: HomeWizardEnergy) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: HomeWizardConfigEntry,
+        api: HomeWizardEnergy,
+    ) -> None:
         """Initialize update coordinator."""
-        super().__init__(hass, LOGGER, name=DOMAIN, update_interval=UPDATE_INTERVAL)
+        super().__init__(
+            hass,
+            LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=UPDATE_INTERVAL,
+        )
         self.api = api
 
     async def _async_update_data(self) -> DeviceResponseEntry:
@@ -51,6 +65,9 @@ class HWEnergyDeviceUpdateCoordinator(DataUpdateCoordinator[DeviceResponseEntry]
                 ex, translation_domain=DOMAIN, translation_key="api_disabled"
             ) from ex
 
+        except UnauthorizedError as ex:
+            raise ConfigEntryAuthFailed from ex
+
         self.api_disabled = False
 
         self.data = data
diff --git a/homeassistant/components/homewizard/diagnostics.py b/homeassistant/components/homewizard/diagnostics.py
index c776cdb18f2..a3ae2555173 100644
--- a/homeassistant/components/homewizard/diagnostics.py
+++ b/homeassistant/components/homewizard/diagnostics.py
@@ -9,13 +9,14 @@ from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_IP_ADDRESS
 from homeassistant.core import HomeAssistant
 
-from . import HomeWizardConfigEntry
+from .coordinator import HomeWizardConfigEntry
 
 TO_REDACT = {
     CONF_IP_ADDRESS,
     "gas_unique_id",
     "id",
     "serial",
+    "token",
     "unique_id",
     "unique_meter_id",
     "wifi_ssid",
diff --git a/homeassistant/components/homewizard/icons.json b/homeassistant/components/homewizard/icons.json
index e6b1a34841f..68ebd6b84d0 100644
--- a/homeassistant/components/homewizard/icons.json
+++ b/homeassistant/components/homewizard/icons.json
@@ -15,6 +15,9 @@
       "any_power_fail_count": {
         "default": "mdi:transmission-tower-off"
       },
+      "cycles": {
+        "default": "mdi:battery-sync-outline"
+      },
       "dsmr_version": {
         "default": "mdi:counter"
       },
diff --git a/homeassistant/components/homewizard/manifest.json b/homeassistant/components/homewizard/manifest.json
index 4cc94d09d74..51a315b2286 100644
--- a/homeassistant/components/homewizard/manifest.json
+++ b/homeassistant/components/homewizard/manifest.json
@@ -12,6 +12,6 @@
   "iot_class": "local_polling",
   "loggers": ["homewizard_energy"],
   "quality_scale": "platinum",
-  "requirements": ["python-homewizard-energy==v8.1.1"],
-  "zeroconf": ["_hwenergy._tcp.local."]
+  "requirements": ["python-homewizard-energy==v8.3.2"],
+  "zeroconf": ["_hwenergy._tcp.local.", "_homewizard._tcp.local."]
 }
diff --git a/homeassistant/components/homewizard/number.py b/homeassistant/components/homewizard/number.py
index 5806295fc81..a703043a63b 100644
--- a/homeassistant/components/homewizard/number.py
+++ b/homeassistant/components/homewizard/number.py
@@ -5,10 +5,9 @@ from __future__ import annotations
 from homeassistant.components.number import NumberEntity
 from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import HomeWizardConfigEntry
-from .coordinator import HWEnergyDeviceUpdateCoordinator
+from .coordinator import HomeWizardConfigEntry, HWEnergyDeviceUpdateCoordinator
 from .entity import HomeWizardEntity
 from .helpers import homewizard_exception_handler
 
@@ -18,7 +17,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: HomeWizardConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up numbers for device."""
     if entry.runtime_data.data.device.supports_state():
diff --git a/homeassistant/components/homewizard/quality_scale.yaml b/homeassistant/components/homewizard/quality_scale.yaml
index 423bc4dea49..008772a5a29 100644
--- a/homeassistant/components/homewizard/quality_scale.yaml
+++ b/homeassistant/components/homewizard/quality_scale.yaml
@@ -47,7 +47,10 @@ rules:
   devices: done
   diagnostics: done
   discovery-update-info: done
-  discovery: done
+  discovery:
+    status: done
+    comment: |
+      DHCP IP address updates are not supported for the v2 API.
   docs-data-update: done
   docs-examples: done
   docs-known-limitations: done
@@ -66,10 +69,7 @@ rules:
   exception-translations: done
   icon-translations: done
   reconfiguration-flow: done
-  repair-issues:
-    status: exempt
-    comment: |
-      This integration does not raise any repairable issues.
+  repair-issues: done
   stale-devices:
     status: exempt
     comment: |
diff --git a/homeassistant/components/homewizard/repairs.py b/homeassistant/components/homewizard/repairs.py
new file mode 100644
index 00000000000..60790202032
--- /dev/null
+++ b/homeassistant/components/homewizard/repairs.py
@@ -0,0 +1,79 @@
+"""Repairs for HomeWizard integration."""
+
+from __future__ import annotations
+
+from homeassistant import data_entry_flow
+from homeassistant.components.repairs import RepairsFlow
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_IP_ADDRESS, CONF_TOKEN
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResult
+
+from .config_flow import async_request_token
+
+
+class MigrateToV2ApiRepairFlow(RepairsFlow):
+    """Handler for an issue fixing flow."""
+
+    def __init__(self, entry: ConfigEntry) -> None:
+        """Create flow."""
+        self.entry = entry
+
+    async def async_step_init(
+        self, user_input: dict[str, str] | None = None
+    ) -> data_entry_flow.FlowResult:
+        """Handle the first step of a fix flow."""
+
+        return await self.async_step_confirm()
+
+    async def async_step_confirm(
+        self, user_input: dict[str, str] | None = None
+    ) -> FlowResult:
+        """Handle the confirm step of a fix flow."""
+
+        if user_input is not None:
+            return await self.async_step_authorize()
+
+        return self.async_show_form(
+            step_id="confirm", description_placeholders={"title": self.entry.title}
+        )
+
+    async def async_step_authorize(
+        self, user_input: dict[str, str] | None = None
+    ) -> FlowResult:
+        """Handle the authorize step of a fix flow."""
+
+        ip_address = self.entry.data[CONF_IP_ADDRESS]
+
+        # Tell device we want a token, user must now press the button within 30 seconds
+        # The first attempt will always fail, but this opens the window to press the button
+        token = await async_request_token(self.hass, ip_address)
+        errors: dict[str, str] | None = None
+
+        if token is None:
+            if user_input is not None:
+                errors = {"base": "authorization_failed"}
+
+            return self.async_show_form(step_id="authorize", errors=errors)
+
+        data = {**self.entry.data, CONF_TOKEN: token}
+        self.hass.config_entries.async_update_entry(self.entry, data=data)
+        await self.hass.config_entries.async_reload(self.entry.entry_id)
+        return self.async_create_entry(data={})
+
+
+async def async_create_fix_flow(
+    hass: HomeAssistant,
+    issue_id: str,
+    data: dict[str, str | int | float | None] | None,
+) -> RepairsFlow:
+    """Create flow."""
+    assert data is not None
+    assert isinstance(data["entry_id"], str)
+
+    if issue_id.startswith("migrate_to_v2_api_") and (
+        entry := hass.config_entries.async_get_entry(data["entry_id"])
+    ):
+        return MigrateToV2ApiRepairFlow(entry)
+
+    raise ValueError(f"unknown repair {issue_id}")  # pragma: no cover
diff --git a/homeassistant/components/homewizard/sensor.py b/homeassistant/components/homewizard/sensor.py
index 8a9738e7ae7..dd557532240 100644
--- a/homeassistant/components/homewizard/sensor.py
+++ b/homeassistant/components/homewizard/sensor.py
@@ -4,9 +4,10 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from dataclasses import dataclass
+from datetime import datetime, timedelta
 from typing import Final
 
-from homewizard_energy.models import ExternalDevice, Measurement
+from homewizard_energy.models import CombinedModels, ExternalDevice
 
 from homeassistant.components.sensor import (
     DEVICE_CLASS_UNITS,
@@ -18,6 +19,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import (
     ATTR_VIA_DEVICE,
     PERCENTAGE,
+    SIGNAL_STRENGTH_DECIBELS,
     EntityCategory,
     UnitOfApparentPower,
     UnitOfElectricCurrent,
@@ -31,12 +33,12 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
+from homeassistant.util.dt import utcnow
 
-from . import HomeWizardConfigEntry
 from .const import DOMAIN
-from .coordinator import HWEnergyDeviceUpdateCoordinator
+from .coordinator import HomeWizardConfigEntry, HWEnergyDeviceUpdateCoordinator
 from .entity import HomeWizardEntity
 
 PARALLEL_UPDATES = 1
@@ -46,9 +48,9 @@ PARALLEL_UPDATES = 1
 class HomeWizardSensorEntityDescription(SensorEntityDescription):
     """Class describing HomeWizard sensor entities."""
 
-    enabled_fn: Callable[[Measurement], bool] = lambda x: True
-    has_fn: Callable[[Measurement], bool]
-    value_fn: Callable[[Measurement], StateType]
+    enabled_fn: Callable[[CombinedModels], bool] = lambda x: True
+    has_fn: Callable[[CombinedModels], bool]
+    value_fn: Callable[[CombinedModels], StateType | datetime]
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -64,40 +66,57 @@ def to_percentage(value: float | None) -> float | None:
     return value * 100 if value is not None else None
 
 
+def time_to_datetime(value: int | None) -> datetime | None:
+    """Convert seconds to datetime when value is not None."""
+    return (
+        utcnow().replace(microsecond=0) - timedelta(seconds=value)
+        if value is not None
+        else None
+    )
+
+
 SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
     HomeWizardSensorEntityDescription(
         key="smr_version",
         translation_key="dsmr_version",
         entity_category=EntityCategory.DIAGNOSTIC,
-        has_fn=lambda data: data.protocol_version is not None,
-        value_fn=lambda data: data.protocol_version,
+        has_fn=lambda data: data.measurement.protocol_version is not None,
+        value_fn=lambda data: data.measurement.protocol_version,
     ),
     HomeWizardSensorEntityDescription(
         key="meter_model",
         translation_key="meter_model",
         entity_category=EntityCategory.DIAGNOSTIC,
-        has_fn=lambda data: data.meter_model is not None,
-        value_fn=lambda data: data.meter_model,
+        has_fn=lambda data: data.measurement.meter_model is not None,
+        value_fn=lambda data: data.measurement.meter_model,
     ),
     HomeWizardSensorEntityDescription(
         key="unique_meter_id",
         translation_key="unique_meter_id",
         entity_category=EntityCategory.DIAGNOSTIC,
-        has_fn=lambda data: data.unique_id is not None,
-        value_fn=lambda data: data.unique_id,
+        has_fn=lambda data: data.measurement.unique_id is not None,
+        value_fn=lambda data: data.measurement.unique_id,
     ),
     HomeWizardSensorEntityDescription(
         key="wifi_ssid",
         translation_key="wifi_ssid",
         entity_category=EntityCategory.DIAGNOSTIC,
-        has_fn=lambda data: data.wifi_ssid is not None,
-        value_fn=lambda data: data.wifi_ssid,
+        has_fn=(
+            lambda data: data.system is not None and data.system.wifi_ssid is not None
+        ),
+        value_fn=(
+            lambda data: data.system.wifi_ssid if data.system is not None else None
+        ),
     ),
     HomeWizardSensorEntityDescription(
         key="active_tariff",
         translation_key="active_tariff",
-        has_fn=lambda data: data.tariff is not None,
-        value_fn=lambda data: None if data.tariff is None else str(data.tariff),
+        has_fn=lambda data: data.measurement.tariff is not None,
+        value_fn=(
+            lambda data: None
+            if data.measurement.tariff is None
+            else str(data.measurement.tariff)
+        ),
         device_class=SensorDeviceClass.ENUM,
         options=["1", "2", "3", "4"],
     ),
@@ -108,8 +127,30 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.wifi_strength is not None,
-        value_fn=lambda data: data.wifi_strength,
+        has_fn=(
+            lambda data: data.system is not None
+            and data.system.wifi_strength_pct is not None
+        ),
+        value_fn=(
+            lambda data: data.system.wifi_strength_pct
+            if data.system is not None
+            else None
+        ),
+    ),
+    HomeWizardSensorEntityDescription(
+        key="wifi_rssi",
+        translation_key="wifi_rssi",
+        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        has_fn=(
+            lambda data: data.system is not None
+            and data.system.wifi_rssi_db is not None
+        ),
+        value_fn=(
+            lambda data: data.system.wifi_rssi_db if data.system is not None else None
+        ),
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_import_kwh",
@@ -117,8 +158,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        has_fn=lambda data: data.energy_import_kwh is not None,
-        value_fn=lambda data: data.energy_import_kwh,
+        has_fn=lambda data: data.measurement.energy_import_kwh is not None,
+        value_fn=lambda data: data.measurement.energy_import_kwh,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_import_t1_kwh",
@@ -129,10 +170,10 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         state_class=SensorStateClass.TOTAL_INCREASING,
         has_fn=lambda data: (
             # SKT/SDM230/630 provides both total and tariff 1: duplicate.
-            data.energy_import_t1_kwh is not None
-            and data.energy_export_t2_kwh is not None
+            data.measurement.energy_import_t1_kwh is not None
+            and data.measurement.energy_export_t2_kwh is not None
         ),
-        value_fn=lambda data: data.energy_import_t1_kwh,
+        value_fn=lambda data: data.measurement.energy_import_t1_kwh,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_import_t2_kwh",
@@ -141,8 +182,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        has_fn=lambda data: data.energy_import_t2_kwh is not None,
-        value_fn=lambda data: data.energy_import_t2_kwh,
+        has_fn=lambda data: data.measurement.energy_import_t2_kwh is not None,
+        value_fn=lambda data: data.measurement.energy_import_t2_kwh,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_import_t3_kwh",
@@ -151,8 +192,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        has_fn=lambda data: data.energy_import_t3_kwh is not None,
-        value_fn=lambda data: data.energy_import_t3_kwh,
+        has_fn=lambda data: data.measurement.energy_import_t3_kwh is not None,
+        value_fn=lambda data: data.measurement.energy_import_t3_kwh,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_import_t4_kwh",
@@ -161,8 +202,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        has_fn=lambda data: data.energy_import_t4_kwh is not None,
-        value_fn=lambda data: data.energy_import_t4_kwh,
+        has_fn=lambda data: data.measurement.energy_import_t4_kwh is not None,
+        value_fn=lambda data: data.measurement.energy_import_t4_kwh,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_export_kwh",
@@ -170,9 +211,9 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        has_fn=lambda data: data.energy_export_kwh is not None,
-        enabled_fn=lambda data: data.energy_export_kwh != 0,
-        value_fn=lambda data: data.energy_export_kwh,
+        has_fn=lambda data: data.measurement.energy_export_kwh is not None,
+        enabled_fn=lambda data: data.measurement.energy_export_kwh != 0,
+        value_fn=lambda data: data.measurement.energy_export_kwh,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_export_t1_kwh",
@@ -183,11 +224,11 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         state_class=SensorStateClass.TOTAL_INCREASING,
         has_fn=lambda data: (
             # SKT/SDM230/630 provides both total and tariff 1: duplicate.
-            data.energy_export_t1_kwh is not None
-            and data.energy_export_t2_kwh is not None
+            data.measurement.energy_export_t1_kwh is not None
+            and data.measurement.energy_export_t2_kwh is not None
         ),
-        enabled_fn=lambda data: data.energy_export_t1_kwh != 0,
-        value_fn=lambda data: data.energy_export_t1_kwh,
+        enabled_fn=lambda data: data.measurement.energy_export_t1_kwh != 0,
+        value_fn=lambda data: data.measurement.energy_export_t1_kwh,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_export_t2_kwh",
@@ -196,9 +237,9 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        has_fn=lambda data: data.energy_export_t2_kwh is not None,
-        enabled_fn=lambda data: data.energy_export_t2_kwh != 0,
-        value_fn=lambda data: data.energy_export_t2_kwh,
+        has_fn=lambda data: data.measurement.energy_export_t2_kwh is not None,
+        enabled_fn=lambda data: data.measurement.energy_export_t2_kwh != 0,
+        value_fn=lambda data: data.measurement.energy_export_t2_kwh,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_export_t3_kwh",
@@ -207,9 +248,9 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        has_fn=lambda data: data.energy_export_t3_kwh is not None,
-        enabled_fn=lambda data: data.energy_export_t3_kwh != 0,
-        value_fn=lambda data: data.energy_export_t3_kwh,
+        has_fn=lambda data: data.measurement.energy_export_t3_kwh is not None,
+        enabled_fn=lambda data: data.measurement.energy_export_t3_kwh != 0,
+        value_fn=lambda data: data.measurement.energy_export_t3_kwh,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_export_t4_kwh",
@@ -218,9 +259,9 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        has_fn=lambda data: data.energy_export_t4_kwh is not None,
-        enabled_fn=lambda data: data.energy_export_t4_kwh != 0,
-        value_fn=lambda data: data.energy_export_t4_kwh,
+        has_fn=lambda data: data.measurement.energy_export_t4_kwh is not None,
+        enabled_fn=lambda data: data.measurement.energy_export_t4_kwh != 0,
+        value_fn=lambda data: data.measurement.energy_export_t4_kwh,
     ),
     HomeWizardSensorEntityDescription(
         key="active_power_w",
@@ -228,8 +269,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
-        has_fn=lambda data: data.power_w is not None,
-        value_fn=lambda data: data.power_w,
+        has_fn=lambda data: data.measurement.power_w is not None,
+        value_fn=lambda data: data.measurement.power_w,
     ),
     HomeWizardSensorEntityDescription(
         key="active_power_l1_w",
@@ -239,8 +280,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
-        has_fn=lambda data: data.power_l1_w is not None,
-        value_fn=lambda data: data.power_l1_w,
+        has_fn=lambda data: data.measurement.power_l1_w is not None,
+        value_fn=lambda data: data.measurement.power_l1_w,
     ),
     HomeWizardSensorEntityDescription(
         key="active_power_l2_w",
@@ -250,8 +291,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
-        has_fn=lambda data: data.power_l2_w is not None,
-        value_fn=lambda data: data.power_l2_w,
+        has_fn=lambda data: data.measurement.power_l2_w is not None,
+        value_fn=lambda data: data.measurement.power_l2_w,
     ),
     HomeWizardSensorEntityDescription(
         key="active_power_l3_w",
@@ -261,8 +302,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
-        has_fn=lambda data: data.power_l3_w is not None,
-        value_fn=lambda data: data.power_l3_w,
+        has_fn=lambda data: data.measurement.power_l3_w is not None,
+        value_fn=lambda data: data.measurement.power_l3_w,
     ),
     HomeWizardSensorEntityDescription(
         key="active_voltage_v",
@@ -270,8 +311,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.voltage_v is not None,
-        value_fn=lambda data: data.voltage_v,
+        has_fn=lambda data: data.measurement.voltage_v is not None,
+        value_fn=lambda data: data.measurement.voltage_v,
     ),
     HomeWizardSensorEntityDescription(
         key="active_voltage_l1_v",
@@ -281,8 +322,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.voltage_l1_v is not None,
-        value_fn=lambda data: data.voltage_l1_v,
+        has_fn=lambda data: data.measurement.voltage_l1_v is not None,
+        value_fn=lambda data: data.measurement.voltage_l1_v,
     ),
     HomeWizardSensorEntityDescription(
         key="active_voltage_l2_v",
@@ -292,8 +333,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.voltage_l2_v is not None,
-        value_fn=lambda data: data.voltage_l2_v,
+        has_fn=lambda data: data.measurement.voltage_l2_v is not None,
+        value_fn=lambda data: data.measurement.voltage_l2_v,
     ),
     HomeWizardSensorEntityDescription(
         key="active_voltage_l3_v",
@@ -303,8 +344,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.voltage_l3_v is not None,
-        value_fn=lambda data: data.voltage_l3_v,
+        has_fn=lambda data: data.measurement.voltage_l3_v is not None,
+        value_fn=lambda data: data.measurement.voltage_l3_v,
     ),
     HomeWizardSensorEntityDescription(
         key="active_current_a",
@@ -312,8 +353,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.current_a is not None,
-        value_fn=lambda data: data.current_a,
+        has_fn=lambda data: data.measurement.current_a is not None,
+        value_fn=lambda data: data.measurement.current_a,
     ),
     HomeWizardSensorEntityDescription(
         key="active_current_l1_a",
@@ -323,8 +364,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.current_l1_a is not None,
-        value_fn=lambda data: data.current_l1_a,
+        has_fn=lambda data: data.measurement.current_l1_a is not None,
+        value_fn=lambda data: data.measurement.current_l1_a,
     ),
     HomeWizardSensorEntityDescription(
         key="active_current_l2_a",
@@ -334,8 +375,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.current_l2_a is not None,
-        value_fn=lambda data: data.current_l2_a,
+        has_fn=lambda data: data.measurement.current_l2_a is not None,
+        value_fn=lambda data: data.measurement.current_l2_a,
     ),
     HomeWizardSensorEntityDescription(
         key="active_current_l3_a",
@@ -345,8 +386,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.current_l3_a is not None,
-        value_fn=lambda data: data.current_l3_a,
+        has_fn=lambda data: data.measurement.current_l3_a is not None,
+        value_fn=lambda data: data.measurement.current_l3_a,
     ),
     HomeWizardSensorEntityDescription(
         key="active_frequency_hz",
@@ -354,8 +395,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.FREQUENCY,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.frequency_hz is not None,
-        value_fn=lambda data: data.frequency_hz,
+        has_fn=lambda data: data.measurement.frequency_hz is not None,
+        value_fn=lambda data: data.measurement.frequency_hz,
     ),
     HomeWizardSensorEntityDescription(
         key="active_apparent_power_va",
@@ -363,8 +404,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.APPARENT_POWER,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.apparent_power_va is not None,
-        value_fn=lambda data: data.apparent_power_va,
+        has_fn=lambda data: data.measurement.apparent_power_va is not None,
+        value_fn=lambda data: data.measurement.apparent_power_va,
     ),
     HomeWizardSensorEntityDescription(
         key="active_apparent_power_l1_va",
@@ -374,8 +415,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.APPARENT_POWER,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.apparent_power_l1_va is not None,
-        value_fn=lambda data: data.apparent_power_l1_va,
+        has_fn=lambda data: data.measurement.apparent_power_l1_va is not None,
+        value_fn=lambda data: data.measurement.apparent_power_l1_va,
     ),
     HomeWizardSensorEntityDescription(
         key="active_apparent_power_l2_va",
@@ -385,8 +426,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.APPARENT_POWER,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.apparent_power_l2_va is not None,
-        value_fn=lambda data: data.apparent_power_l2_va,
+        has_fn=lambda data: data.measurement.apparent_power_l2_va is not None,
+        value_fn=lambda data: data.measurement.apparent_power_l2_va,
     ),
     HomeWizardSensorEntityDescription(
         key="active_apparent_power_l3_va",
@@ -396,8 +437,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.APPARENT_POWER,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.apparent_power_l3_va is not None,
-        value_fn=lambda data: data.apparent_power_l3_va,
+        has_fn=lambda data: data.measurement.apparent_power_l3_va is not None,
+        value_fn=lambda data: data.measurement.apparent_power_l3_va,
     ),
     HomeWizardSensorEntityDescription(
         key="active_reactive_power_var",
@@ -405,8 +446,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.REACTIVE_POWER,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.reactive_power_var is not None,
-        value_fn=lambda data: data.reactive_power_var,
+        has_fn=lambda data: data.measurement.reactive_power_var is not None,
+        value_fn=lambda data: data.measurement.reactive_power_var,
     ),
     HomeWizardSensorEntityDescription(
         key="active_reactive_power_l1_var",
@@ -416,8 +457,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.REACTIVE_POWER,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.reactive_power_l1_var is not None,
-        value_fn=lambda data: data.reactive_power_l1_var,
+        has_fn=lambda data: data.measurement.reactive_power_l1_var is not None,
+        value_fn=lambda data: data.measurement.reactive_power_l1_var,
     ),
     HomeWizardSensorEntityDescription(
         key="active_reactive_power_l2_var",
@@ -427,8 +468,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.REACTIVE_POWER,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.reactive_power_l2_var is not None,
-        value_fn=lambda data: data.reactive_power_l2_var,
+        has_fn=lambda data: data.measurement.reactive_power_l2_var is not None,
+        value_fn=lambda data: data.measurement.reactive_power_l2_var,
     ),
     HomeWizardSensorEntityDescription(
         key="active_reactive_power_l3_var",
@@ -438,8 +479,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.REACTIVE_POWER,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.reactive_power_l3_var is not None,
-        value_fn=lambda data: data.reactive_power_l3_var,
+        has_fn=lambda data: data.measurement.reactive_power_l3_var is not None,
+        value_fn=lambda data: data.measurement.reactive_power_l3_var,
     ),
     HomeWizardSensorEntityDescription(
         key="active_power_factor",
@@ -447,8 +488,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.POWER_FACTOR,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.power_factor is not None,
-        value_fn=lambda data: to_percentage(data.power_factor),
+        has_fn=lambda data: data.measurement.power_factor is not None,
+        value_fn=lambda data: to_percentage(data.measurement.power_factor),
     ),
     HomeWizardSensorEntityDescription(
         key="active_power_factor_l1",
@@ -458,8 +499,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.POWER_FACTOR,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.power_factor_l1 is not None,
-        value_fn=lambda data: to_percentage(data.power_factor_l1),
+        has_fn=lambda data: data.measurement.power_factor_l1 is not None,
+        value_fn=lambda data: to_percentage(data.measurement.power_factor_l1),
     ),
     HomeWizardSensorEntityDescription(
         key="active_power_factor_l2",
@@ -469,8 +510,8 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.POWER_FACTOR,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.power_factor_l2 is not None,
-        value_fn=lambda data: to_percentage(data.power_factor_l2),
+        has_fn=lambda data: data.measurement.power_factor_l2 is not None,
+        value_fn=lambda data: to_percentage(data.measurement.power_factor_l2),
     ),
     HomeWizardSensorEntityDescription(
         key="active_power_factor_l3",
@@ -480,94 +521,94 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.POWER_FACTOR,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
-        has_fn=lambda data: data.power_factor_l3 is not None,
-        value_fn=lambda data: to_percentage(data.power_factor_l3),
+        has_fn=lambda data: data.measurement.power_factor_l3 is not None,
+        value_fn=lambda data: to_percentage(data.measurement.power_factor_l3),
     ),
     HomeWizardSensorEntityDescription(
         key="voltage_sag_l1_count",
         translation_key="voltage_sag_phase_count",
         translation_placeholders={"phase": "1"},
         entity_category=EntityCategory.DIAGNOSTIC,
-        has_fn=lambda data: data.voltage_sag_l1_count is not None,
-        value_fn=lambda data: data.voltage_sag_l1_count,
+        has_fn=lambda data: data.measurement.voltage_sag_l1_count is not None,
+        value_fn=lambda data: data.measurement.voltage_sag_l1_count,
     ),
     HomeWizardSensorEntityDescription(
         key="voltage_sag_l2_count",
         translation_key="voltage_sag_phase_count",
         translation_placeholders={"phase": "2"},
         entity_category=EntityCategory.DIAGNOSTIC,
-        has_fn=lambda data: data.voltage_sag_l2_count is not None,
-        value_fn=lambda data: data.voltage_sag_l2_count,
+        has_fn=lambda data: data.measurement.voltage_sag_l2_count is not None,
+        value_fn=lambda data: data.measurement.voltage_sag_l2_count,
     ),
     HomeWizardSensorEntityDescription(
         key="voltage_sag_l3_count",
         translation_key="voltage_sag_phase_count",
         translation_placeholders={"phase": "3"},
         entity_category=EntityCategory.DIAGNOSTIC,
-        has_fn=lambda data: data.voltage_sag_l3_count is not None,
-        value_fn=lambda data: data.voltage_sag_l3_count,
+        has_fn=lambda data: data.measurement.voltage_sag_l3_count is not None,
+        value_fn=lambda data: data.measurement.voltage_sag_l3_count,
     ),
     HomeWizardSensorEntityDescription(
         key="voltage_swell_l1_count",
         translation_key="voltage_swell_phase_count",
         translation_placeholders={"phase": "1"},
         entity_category=EntityCategory.DIAGNOSTIC,
-        has_fn=lambda data: data.voltage_swell_l1_count is not None,
-        value_fn=lambda data: data.voltage_swell_l1_count,
+        has_fn=lambda data: data.measurement.voltage_swell_l1_count is not None,
+        value_fn=lambda data: data.measurement.voltage_swell_l1_count,
     ),
     HomeWizardSensorEntityDescription(
         key="voltage_swell_l2_count",
         translation_key="voltage_swell_phase_count",
         translation_placeholders={"phase": "2"},
         entity_category=EntityCategory.DIAGNOSTIC,
-        has_fn=lambda data: data.voltage_swell_l2_count is not None,
-        value_fn=lambda data: data.voltage_swell_l2_count,
+        has_fn=lambda data: data.measurement.voltage_swell_l2_count is not None,
+        value_fn=lambda data: data.measurement.voltage_swell_l2_count,
     ),
     HomeWizardSensorEntityDescription(
         key="voltage_swell_l3_count",
         translation_key="voltage_swell_phase_count",
         translation_placeholders={"phase": "3"},
         entity_category=EntityCategory.DIAGNOSTIC,
-        has_fn=lambda data: data.voltage_swell_l3_count is not None,
-        value_fn=lambda data: data.voltage_swell_l3_count,
+        has_fn=lambda data: data.measurement.voltage_swell_l3_count is not None,
+        value_fn=lambda data: data.measurement.voltage_swell_l3_count,
     ),
     HomeWizardSensorEntityDescription(
         key="any_power_fail_count",
         translation_key="any_power_fail_count",
         entity_category=EntityCategory.DIAGNOSTIC,
-        has_fn=lambda data: data.any_power_fail_count is not None,
-        value_fn=lambda data: data.any_power_fail_count,
+        has_fn=lambda data: data.measurement.any_power_fail_count is not None,
+        value_fn=lambda data: data.measurement.any_power_fail_count,
     ),
     HomeWizardSensorEntityDescription(
         key="long_power_fail_count",
         translation_key="long_power_fail_count",
         entity_category=EntityCategory.DIAGNOSTIC,
-        has_fn=lambda data: data.long_power_fail_count is not None,
-        value_fn=lambda data: data.long_power_fail_count,
+        has_fn=lambda data: data.measurement.long_power_fail_count is not None,
+        value_fn=lambda data: data.measurement.long_power_fail_count,
     ),
     HomeWizardSensorEntityDescription(
         key="active_power_average_w",
         translation_key="active_power_average_w",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
-        has_fn=lambda data: data.average_power_15m_w is not None,
-        value_fn=lambda data: data.average_power_15m_w,
+        has_fn=lambda data: data.measurement.average_power_15m_w is not None,
+        value_fn=lambda data: data.measurement.average_power_15m_w,
     ),
     HomeWizardSensorEntityDescription(
         key="monthly_power_peak_w",
         translation_key="monthly_power_peak_w",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
-        has_fn=lambda data: data.monthly_power_peak_w is not None,
-        value_fn=lambda data: data.monthly_power_peak_w,
+        has_fn=lambda data: data.measurement.monthly_power_peak_w is not None,
+        value_fn=lambda data: data.measurement.monthly_power_peak_w,
     ),
     HomeWizardSensorEntityDescription(
         key="active_liter_lpm",
         translation_key="active_liter_lpm",
         native_unit_of_measurement=UnitOfVolumeFlowRate.LITERS_PER_MINUTE,
         state_class=SensorStateClass.MEASUREMENT,
-        has_fn=lambda data: data.active_liter_lpm is not None,
-        value_fn=lambda data: data.active_liter_lpm,
+        has_fn=lambda data: data.measurement.active_liter_lpm is not None,
+        value_fn=lambda data: data.measurement.active_liter_lpm,
     ),
     HomeWizardSensorEntityDescription(
         key="total_liter_m3",
@@ -575,8 +616,39 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
         device_class=SensorDeviceClass.WATER,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        has_fn=lambda data: data.total_liter_m3 is not None,
-        value_fn=lambda data: data.total_liter_m3,
+        has_fn=lambda data: data.measurement.total_liter_m3 is not None,
+        value_fn=lambda data: data.measurement.total_liter_m3,
+    ),
+    HomeWizardSensorEntityDescription(
+        key="state_of_charge_pct",
+        translation_key="state_of_charge_pct",
+        native_unit_of_measurement=PERCENTAGE,
+        device_class=SensorDeviceClass.BATTERY,
+        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=0,
+        has_fn=lambda data: data.measurement.state_of_charge_pct is not None,
+        value_fn=lambda data: data.measurement.state_of_charge_pct,
+    ),
+    HomeWizardSensorEntityDescription(
+        key="cycles",
+        translation_key="cycles",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        has_fn=lambda data: data.measurement.cycles is not None,
+        value_fn=lambda data: data.measurement.cycles,
+    ),
+    HomeWizardSensorEntityDescription(
+        key="uptime",
+        translation_key="uptime",
+        device_class=SensorDeviceClass.TIMESTAMP,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        has_fn=(
+            lambda data: data.system is not None and data.system.uptime_s is not None
+        ),
+        value_fn=(
+            lambda data: time_to_datetime(data.system.uptime_s) if data.system else None
+        ),
     ),
 )
 
@@ -618,20 +690,19 @@ EXTERNAL_SENSORS = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: HomeWizardConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize sensors."""
 
-    measurement = entry.runtime_data.data.measurement
-
     # Initialize default sensors
     entities: list = [
         HomeWizardSensorEntity(entry.runtime_data, description)
         for description in SENSORS
-        if description.has_fn(measurement)
+        if description.has_fn(entry.runtime_data.data)
     ]
 
     # Initialize external devices
+    measurement = entry.runtime_data.data.measurement
     if measurement.external_devices is not None:
         for unique_id, device in measurement.external_devices.items():
             if device.type is not None and (
@@ -661,13 +732,13 @@ class HomeWizardSensorEntity(HomeWizardEntity, SensorEntity):
         super().__init__(coordinator)
         self.entity_description = description
         self._attr_unique_id = f"{coordinator.config_entry.unique_id}_{description.key}"
-        if not description.enabled_fn(self.coordinator.data.measurement):
+        if not description.enabled_fn(self.coordinator.data):
             self._attr_entity_registry_enabled_default = False
 
     @property
-    def native_value(self) -> StateType:
+    def native_value(self) -> StateType | datetime | None:
         """Return the sensor value."""
-        return self.entity_description.value_fn(self.coordinator.data.measurement)
+        return self.entity_description.value_fn(self.coordinator.data)
 
     @property
     def available(self) -> bool:
diff --git a/homeassistant/components/homewizard/strings.json b/homeassistant/components/homewizard/strings.json
index 4309664c4c8..076e9375d24 100644
--- a/homeassistant/components/homewizard/strings.json
+++ b/homeassistant/components/homewizard/strings.json
@@ -15,9 +15,17 @@
         "title": "Confirm",
         "description": "Do you want to set up {product_type} ({serial}) at {ip_address}?"
       },
-      "reauth_confirm": {
+      "reauth_enable_api": {
         "description": "The local API is disabled. Go to the HomeWizard Energy app and enable the API in the device settings."
       },
+      "reauth_confirm_update_token": {
+        "title": "Re-authenticate",
+        "description": "[%key:component::homewizard::config::step::authorize::description%]"
+      },
+      "authorize": {
+        "title": "Authorize",
+        "description": "Press the button on the HomeWizard Energy device, then select the button below."
+      },
       "reconfigure": {
         "description": "Update configuration for {title}.",
         "data": {
@@ -30,7 +38,8 @@
     },
     "error": {
       "api_not_enabled": "The local API is disabled. Go to the HomeWizard Energy app and enable the API in the device settings.",
-      "network_error": "Device unreachable, make sure that you have entered the correct IP address and that the device is available in your network"
+      "network_error": "Device unreachable, make sure that you have entered the correct IP address and that the device is available in your network",
+      "authorization_failed": "Failed to authorize, make sure to press the button of the device within 30 seconds"
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
@@ -38,7 +47,8 @@
       "device_not_supported": "This device is not supported",
       "unknown_error": "[%key:common::config_flow::error::unknown%]",
       "unsupported_api_version": "Detected unsupported API version",
-      "reauth_successful": "Enabling API was successful",
+      "reauth_enable_api_successful": "Enabling API was successful",
+      "reauth_successful": "Authorization successful",
       "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
       "wrong_device": "The configured device is not the same found on this IP address."
     }
@@ -68,6 +78,9 @@
       "wifi_strength": {
         "name": "Wi-Fi strength"
       },
+      "wifi_rssi": {
+        "name": "Wi-Fi RSSI"
+      },
       "total_energy_import_kwh": {
         "name": "Energy import"
       },
@@ -121,6 +134,15 @@
       },
       "total_liter_m3": {
         "name": "Total water usage"
+      },
+      "cycles": {
+        "name": "Battery cycles"
+      },
+      "state_of_charge_pct": {
+        "name": "State of charge"
+      },
+      "uptime": {
+        "name": "Uptime"
       }
     },
     "switch": {
@@ -139,5 +161,25 @@
     "communication_error": {
       "message": "An error occurred while communicating with HomeWizard device"
     }
+  },
+  "issues": {
+    "migrate_to_v2_api": {
+      "title": "Update authentication method",
+      "fix_flow": {
+        "step": {
+          "confirm": {
+            "title": "[%key:component::homewizard::issues::migrate_to_v2_api::title%]",
+            "description": "Your {title} now supports a more secure and feature-rich communication method. To take advantage of this, you need to reconfigure the integration.\n\nSelect **Submit** to start the reconfiguration."
+          },
+          "authorize": {
+            "title": "[%key:component::homewizard::config::step::authorize::title%]",
+            "description": "[%key:component::homewizard::config::step::authorize::description%]"
+          }
+        },
+        "error": {
+          "authorization_failed": "[%key:component::homewizard::config::error::authorization_failed%]"
+        }
+      }
+    }
   }
 }
diff --git a/homeassistant/components/homewizard/switch.py b/homeassistant/components/homewizard/switch.py
index 0878703e4d5..1930b40583d 100644
--- a/homeassistant/components/homewizard/switch.py
+++ b/homeassistant/components/homewizard/switch.py
@@ -16,10 +16,9 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import HomeWizardConfigEntry
-from .coordinator import HWEnergyDeviceUpdateCoordinator
+from .coordinator import HomeWizardConfigEntry, HWEnergyDeviceUpdateCoordinator
 from .entity import HomeWizardEntity
 from .helpers import homewizard_exception_handler
 
@@ -59,7 +58,7 @@ SWITCHES = [
         key="cloud_connection",
         translation_key="cloud_connection",
         entity_category=EntityCategory.CONFIG,
-        create_fn=lambda _: True,
+        create_fn=lambda x: x.device.supports_cloud_enable(),
         available_fn=lambda x: x.system is not None,
         is_on_fn=lambda x: x.system.cloud_enabled if x.system else None,
         set_fn=lambda api, active: api.system(cloud_enabled=active),
@@ -70,7 +69,7 @@ SWITCHES = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: HomeWizardConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switches."""
     async_add_entities(
diff --git a/homeassistant/components/homeworks/__init__.py b/homeassistant/components/homeworks/__init__.py
index e9e8c969b61..75fdeb4f8cc 100644
--- a/homeassistant/components/homeworks/__init__.py
+++ b/homeassistant/components/homeworks/__init__.py
@@ -30,7 +30,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import ConfigEntryNotReady, ServiceValidationError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.dispatcher import async_dispatcher_connect, dispatcher_send
 from homeassistant.helpers.typing import ConfigType
diff --git a/homeassistant/components/homeworks/binary_sensor.py b/homeassistant/components/homeworks/binary_sensor.py
index f1ba3c02835..9bdea75479d 100644
--- a/homeassistant/components/homeworks/binary_sensor.py
+++ b/homeassistant/components/homeworks/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import HomeworksData, HomeworksKeypad
 from .const import (
@@ -31,7 +31,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Homeworks binary sensors."""
     data: HomeworksData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/homeworks/button.py b/homeassistant/components/homeworks/button.py
index 6a13573ac88..d76c18985e9 100644
--- a/homeassistant/components/homeworks/button.py
+++ b/homeassistant/components/homeworks/button.py
@@ -11,7 +11,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import HomeworksData
 from .const import (
@@ -27,7 +27,9 @@ from .entity import HomeworksEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Homeworks buttons."""
     data: HomeworksData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/homeworks/light.py b/homeassistant/components/homeworks/light.py
index ac52c1f4974..f07758bbace 100644
--- a/homeassistant/components/homeworks/light.py
+++ b/homeassistant/components/homeworks/light.py
@@ -13,7 +13,7 @@ from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import HomeworksData
 from .const import CONF_ADDR, CONF_CONTROLLER_ID, CONF_DIMMERS, CONF_RATE, DOMAIN
@@ -23,7 +23,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Homeworks lights."""
     data: HomeworksData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/homeworks/strings.json b/homeassistant/components/homeworks/strings.json
index 10cc2e61fb9..3ec4945957b 100644
--- a/homeassistant/components/homeworks/strings.json
+++ b/homeassistant/components/homeworks/strings.json
@@ -14,7 +14,7 @@
     },
     "step": {
       "import_finish": {
-        "description": "The existing YAML configuration has succesfully been imported.\n\nYou can now remove the `homeworks` configuration from your configuration.yaml file."
+        "description": "The existing YAML configuration has successfully been imported.\n\nYou can now remove the `homeworks` configuration from your configuration.yaml file."
       },
       "import_controller_name": {
         "description": "Lutron Homeworks is no longer configured through configuration.yaml.\n\nPlease fill in the form to import the existing configuration to the UI.",
@@ -57,7 +57,7 @@
   },
   "exceptions": {
     "invalid_controller_id": {
-      "message": "Invalid controller_id \"{controller_id}\", expected one of \"{controller_ids}\""
+      "message": "Invalid controller ID \"{controller_id}\", expected one of \"{controller_ids}\""
     }
   },
   "options": {
diff --git a/homeassistant/components/honeywell/climate.py b/homeassistant/components/honeywell/climate.py
index 1df5eb9601b..5fe84aadd75 100644
--- a/homeassistant/components/honeywell/climate.py
+++ b/homeassistant/components/honeywell/climate.py
@@ -36,7 +36,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.unit_conversion import TemperatureConverter
 
 from . import HoneywellConfigEntry, HoneywellData
@@ -98,7 +98,7 @@ SCAN_INTERVAL = datetime.timedelta(seconds=30)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: HoneywellConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Honeywell thermostat."""
     cool_away_temp = entry.options.get(CONF_COOL_AWAY_TEMPERATURE)
diff --git a/homeassistant/components/honeywell/humidifier.py b/homeassistant/components/honeywell/humidifier.py
index e94ba465c30..77776f84a2e 100644
--- a/homeassistant/components/honeywell/humidifier.py
+++ b/homeassistant/components/honeywell/humidifier.py
@@ -15,7 +15,7 @@ from homeassistant.components.humidifier import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import HoneywellConfigEntry
 from .const import DOMAIN
@@ -73,7 +73,7 @@ HUMIDIFIERS: dict[str, HoneywellHumidifierEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: HoneywellConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Honeywell (de)humidifier dynamically."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/honeywell/manifest.json b/homeassistant/components/honeywell/manifest.json
index 36a4f497601..7fa102c6599 100644
--- a/homeassistant/components/honeywell/manifest.json
+++ b/homeassistant/components/honeywell/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/honeywell",
   "iot_class": "cloud_polling",
   "loggers": ["somecomfort"],
-  "requirements": ["AIOSomecomfort==0.0.30"]
+  "requirements": ["AIOSomecomfort==0.0.32"]
 }
diff --git a/homeassistant/components/honeywell/sensor.py b/homeassistant/components/honeywell/sensor.py
index a9109d5d557..75ac6b1b6d3 100644
--- a/homeassistant/components/honeywell/sensor.py
+++ b/homeassistant/components/honeywell/sensor.py
@@ -17,7 +17,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import PERCENTAGE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import HoneywellConfigEntry
@@ -81,7 +81,7 @@ SENSOR_TYPES: tuple[HoneywellSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: HoneywellConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Honeywell thermostat."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/honeywell/switch.py b/homeassistant/components/honeywell/switch.py
index 3602dd1ba10..06c79bf4b1d 100644
--- a/homeassistant/components/honeywell/switch.py
+++ b/homeassistant/components/honeywell/switch.py
@@ -15,7 +15,7 @@ from homeassistant.components.switch import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import HoneywellConfigEntry, HoneywellData
 from .const import DOMAIN
@@ -34,7 +34,7 @@ SWITCH_TYPES: tuple[SwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: HoneywellConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Honeywell switches."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/horizon/media_player.py b/homeassistant/components/horizon/media_player.py
index ba3ca5e2e35..d1b733ab84a 100644
--- a/homeassistant/components/horizon/media_player.py
+++ b/homeassistant/components/horizon/media_player.py
@@ -21,7 +21,7 @@ from homeassistant.components.media_player import (
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/hp_ilo/sensor.py b/homeassistant/components/hp_ilo/sensor.py
index 0eeb443cf2d..b4263f53d24 100644
--- a/homeassistant/components/hp_ilo/sensor.py
+++ b/homeassistant/components/hp_ilo/sensor.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
     CONF_VALUE_TEMPLATE,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/http/__init__.py b/homeassistant/components/http/__init__.py
index 95cdee9ab9e..8ee27039441 100644
--- a/homeassistant/components/http/__init__.py
+++ b/homeassistant/components/http/__init__.py
@@ -37,8 +37,12 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import frame, issue_registry as ir, storage
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import (
+    config_validation as cv,
+    frame,
+    issue_registry as ir,
+    storage,
+)
 from homeassistant.helpers.http import (
     KEY_ALLOW_CONFIGURED_CORS,
     KEY_AUTHENTICATED,  # noqa: F401
diff --git a/homeassistant/components/http/ban.py b/homeassistant/components/http/ban.py
index b5093999836..821d44eebaa 100644
--- a/homeassistant/components/http/ban.py
+++ b/homeassistant/components/http/ban.py
@@ -26,7 +26,7 @@ import voluptuous as vol
 from homeassistant.config import load_yaml_config_file
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.hassio import get_supervisor_ip, is_hassio
 from homeassistant.util import dt as dt_util, yaml as yaml_util
 
diff --git a/homeassistant/components/huawei_lte/binary_sensor.py b/homeassistant/components/huawei_lte/binary_sensor.py
index 06b859cea84..c3434dd0b64 100644
--- a/homeassistant/components/huawei_lte/binary_sensor.py
+++ b/homeassistant/components/huawei_lte/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     DOMAIN,
@@ -30,7 +30,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up from config entry."""
     router = hass.data[DOMAIN].routers[config_entry.entry_id]
diff --git a/homeassistant/components/huawei_lte/button.py b/homeassistant/components/huawei_lte/button.py
index 55b009d25bf..44b35d51dd4 100644
--- a/homeassistant/components/huawei_lte/button.py
+++ b/homeassistant/components/huawei_lte/button.py
@@ -25,7 +25,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: entity_platform.AddEntitiesCallback,
+    async_add_entities: entity_platform.AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Huawei LTE buttons."""
     router = hass.data[DOMAIN].routers[config_entry.entry_id]
diff --git a/homeassistant/components/huawei_lte/config_flow.py b/homeassistant/components/huawei_lte/config_flow.py
index 96e160ece7b..4ca9e7531e3 100644
--- a/homeassistant/components/huawei_lte/config_flow.py
+++ b/homeassistant/components/huawei_lte/config_flow.py
@@ -178,8 +178,8 @@ class ConfigFlowHandler(ConfigFlow, domain=DOMAIN):
         except Timeout:
             _LOGGER.warning("Connection timeout", exc_info=True)
             errors[CONF_URL] = "connection_timeout"
-        except Exception:  # noqa: BLE001
-            _LOGGER.warning("Unknown error connecting to device", exc_info=True)
+        except Exception:
+            _LOGGER.exception("Unknown error connecting to device")
             errors[CONF_URL] = "unknown"
         return conn
 
@@ -188,8 +188,8 @@ class ConfigFlowHandler(ConfigFlow, domain=DOMAIN):
         try:
             conn.close()
             conn.requests_session.close()
-        except Exception:  # noqa: BLE001
-            _LOGGER.debug("Disconnect error", exc_info=True)
+        except Exception:
+            _LOGGER.exception("Disconnect error")
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
diff --git a/homeassistant/components/huawei_lte/device_tracker.py b/homeassistant/components/huawei_lte/device_tracker.py
index df849d4f712..83e82bf17ff 100644
--- a/homeassistant/components/huawei_lte/device_tracker.py
+++ b/homeassistant/components/huawei_lte/device_tracker.py
@@ -17,7 +17,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import Router
 from .const import (
@@ -53,7 +53,7 @@ def _get_hosts(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up from config entry."""
 
@@ -128,7 +128,7 @@ def _is_us(host: _HostType) -> bool:
 @callback
 def async_add_new_entities(
     router: Router,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     tracked: set[str],
 ) -> None:
     """Add new entities that are not already being tracked."""
diff --git a/homeassistant/components/huawei_lte/select.py b/homeassistant/components/huawei_lte/select.py
index d8a16ae2f79..3df6fa53320 100644
--- a/homeassistant/components/huawei_lte/select.py
+++ b/homeassistant/components/huawei_lte/select.py
@@ -18,7 +18,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import UNDEFINED
 
 from . import Router
@@ -38,7 +38,7 @@ class HuaweiSelectEntityDescription(SelectEntityDescription):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up from config entry."""
     router = hass.data[DOMAIN].routers[config_entry.entry_id]
diff --git a/homeassistant/components/huawei_lte/sensor.py b/homeassistant/components/huawei_lte/sensor.py
index 86965e89dd0..3543433ca45 100644
--- a/homeassistant/components/huawei_lte/sensor.py
+++ b/homeassistant/components/huawei_lte/sensor.py
@@ -27,7 +27,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import Router
@@ -754,7 +754,7 @@ SENSOR_META: dict[str, HuaweiSensorGroup] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up from config entry."""
     router = hass.data[DOMAIN].routers[config_entry.entry_id]
diff --git a/homeassistant/components/huawei_lte/switch.py b/homeassistant/components/huawei_lte/switch.py
index 07fd89d0b6c..ac8bca4234c 100644
--- a/homeassistant/components/huawei_lte/switch.py
+++ b/homeassistant/components/huawei_lte/switch.py
@@ -13,7 +13,7 @@ from homeassistant.components.switch import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     DOMAIN,
@@ -28,7 +28,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up from config entry."""
     router = hass.data[DOMAIN].routers[config_entry.entry_id]
diff --git a/homeassistant/components/hue/binary_sensor.py b/homeassistant/components/hue/binary_sensor.py
index 2cb8e8b5d90..ecaa6576775 100644
--- a/homeassistant/components/hue/binary_sensor.py
+++ b/homeassistant/components/hue/binary_sensor.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .bridge import HueBridge
 from .const import DOMAIN
@@ -15,7 +15,7 @@ from .v2.binary_sensor import async_setup_entry as setup_entry_v2
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up binary sensor entities."""
     bridge: HueBridge = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/hue/event.py b/homeassistant/components/hue/event.py
index 64f3ccba9f9..249f81687c0 100644
--- a/homeassistant/components/hue/event.py
+++ b/homeassistant/components/hue/event.py
@@ -16,7 +16,7 @@ from homeassistant.components.event import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .bridge import HueBridge
 from .const import DEFAULT_BUTTON_EVENT_TYPES, DEVICE_SPECIFIC_EVENT_TYPES, DOMAIN
@@ -26,7 +26,7 @@ from .v2.entity import HueBaseEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up event platform from Hue button resources."""
     bridge: HueBridge = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/hue/icons.json b/homeassistant/components/hue/icons.json
index 31464308b0a..646c420f1fe 100644
--- a/homeassistant/components/hue/icons.json
+++ b/homeassistant/components/hue/icons.json
@@ -1,4 +1,28 @@
 {
+  "entity": {
+    "light": {
+      "hue_light": {
+        "state_attributes": {
+          "effect": {
+            "state": {
+              "candle": "mdi:candle",
+              "sparkle": "mdi:shimmer",
+              "glisten": "mdi:creation",
+              "sunrise": "mdi:weather-sunset-up",
+              "sunset": "mdi:weather-sunset",
+              "fire": "mdi:fire",
+              "prism": "mdi:triangle-outline",
+              "opal": "mdi:diamond-stone",
+              "underwater": "mdi:waves",
+              "cosmos": "mdi:star-shooting",
+              "sunbeam": "mdi:spotlight-beam",
+              "enchant": "mdi:magic-staff"
+            }
+          }
+        }
+      }
+    }
+  },
   "services": {
     "hue_activate_scene": {
       "service": "mdi:palette"
diff --git a/homeassistant/components/hue/light.py b/homeassistant/components/hue/light.py
index c3168b5c8c1..9906c9bffa4 100644
--- a/homeassistant/components/hue/light.py
+++ b/homeassistant/components/hue/light.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .bridge import HueBridge
 from .const import DOMAIN
@@ -16,7 +16,7 @@ from .v2.light import async_setup_entry as setup_entry_v2
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up light entities."""
     bridge: HueBridge = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/hue/manifest.json b/homeassistant/components/hue/manifest.json
index 22f1d3991e7..8bc3d84bd50 100644
--- a/homeassistant/components/hue/manifest.json
+++ b/homeassistant/components/hue/manifest.json
@@ -10,6 +10,6 @@
   "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["aiohue"],
-  "requirements": ["aiohue==4.7.3"],
+  "requirements": ["aiohue==4.7.4"],
   "zeroconf": ["_hue._tcp.local."]
 }
diff --git a/homeassistant/components/hue/scene.py b/homeassistant/components/hue/scene.py
index 1d83804820d..0b9eb4efbd6 100644
--- a/homeassistant/components/hue/scene.py
+++ b/homeassistant/components/hue/scene.py
@@ -16,7 +16,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import (
-    AddEntitiesCallback,
+    AddConfigEntryEntitiesCallback,
     async_get_current_platform,
 )
 
@@ -34,7 +34,7 @@ ATTR_BRIGHTNESS = "brightness"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up scene platform from Hue group scenes."""
     bridge: HueBridge = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/hue/sensor.py b/homeassistant/components/hue/sensor.py
index 45cff053aef..227742fdbab 100644
--- a/homeassistant/components/hue/sensor.py
+++ b/homeassistant/components/hue/sensor.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .bridge import HueBridge
 from .const import DOMAIN
@@ -15,7 +15,7 @@ from .v2.sensor import async_setup_entry as setup_entry_v2
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensor entities."""
     bridge: HueBridge = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/hue/services.py b/homeassistant/components/hue/services.py
index 30555339f19..de6da161fba 100644
--- a/homeassistant/components/hue/services.py
+++ b/homeassistant/components/hue/services.py
@@ -9,7 +9,7 @@ from aiohue import HueBridgeV1, HueBridgeV2
 import voluptuous as vol
 
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.service import verify_domain_control
 
 from .bridge import HueBridge
diff --git a/homeassistant/components/hue/strings.json b/homeassistant/components/hue/strings.json
index 2f7f2e55561..6d2e9054c6f 100644
--- a/homeassistant/components/hue/strings.json
+++ b/homeassistant/components/hue/strings.json
@@ -11,7 +11,7 @@
         }
       },
       "manual": {
-        "title": "Manual configure a Hue bridge",
+        "title": "Manually configure a Hue bridge",
         "data": {
           "host": "[%key:common::config_flow::data::host%]"
         },
@@ -46,8 +46,8 @@
       "button_2": "Second button",
       "button_3": "Third button",
       "button_4": "Fourth button",
-      "double_buttons_1_3": "First and Third buttons",
-      "double_buttons_2_4": "Second and Fourth buttons",
+      "double_buttons_1_3": "First and third button",
+      "double_buttons_2_4": "Second and fourth button",
       "dim_down": "Dim down",
       "dim_up": "Dim up",
       "turn_off": "[%key:common::action::turn_off%]",
@@ -102,6 +102,28 @@
         }
       }
     },
+    "light": {
+      "hue_light": {
+        "state_attributes": {
+          "effect": {
+            "state": {
+              "candle": "Candle",
+              "sparkle": "Sparkle",
+              "glisten": "Glisten",
+              "sunrise": "Sunrise",
+              "sunset": "Sunset",
+              "fire": "Fire",
+              "prism": "Prism",
+              "opal": "Opal",
+              "underwater": "Underwater",
+              "cosmos": "Cosmos",
+              "sunbeam": "Sunbeam",
+              "enchant": "Enchant"
+            }
+          }
+        }
+      }
+    },
     "sensor": {
       "zigbee_connectivity": {
         "name": "Zigbee connectivity",
diff --git a/homeassistant/components/hue/switch.py b/homeassistant/components/hue/switch.py
index b4bc57acf2d..b6b21686d25 100644
--- a/homeassistant/components/hue/switch.py
+++ b/homeassistant/components/hue/switch.py
@@ -22,7 +22,7 @@ from homeassistant.components.switch import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .bridge import HueBridge
 from .const import DOMAIN
@@ -32,7 +32,7 @@ from .v2.entity import HueBaseEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Hue switch platform from Hue resources."""
     bridge: HueBridge = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/hue/v1/light.py b/homeassistant/components/hue/v1/light.py
index e9669d226f0..33b99a7895b 100644
--- a/homeassistant/components/hue/v1/light.py
+++ b/homeassistant/components/hue/v1/light.py
@@ -408,7 +408,7 @@ class HueLight(CoordinatorEntity, LightEntity):
         if self._fixed_color_mode:
             return self._fixed_color_mode
 
-        # The light supports both hs/xy and white with adjustabe color_temperature
+        # The light supports both hs/xy and white with adjustable color_temperature
         mode = self._color_mode
         if mode in ("xy", "hs"):
             return ColorMode.HS
diff --git a/homeassistant/components/hue/v2/binary_sensor.py b/homeassistant/components/hue/v2/binary_sensor.py
index 5054ab6e817..6e4c7f98973 100644
--- a/homeassistant/components/hue/v2/binary_sensor.py
+++ b/homeassistant/components/hue/v2/binary_sensor.py
@@ -30,7 +30,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from ..bridge import HueBridge
 from ..const import DOMAIN
@@ -49,7 +49,7 @@ type ControllerType = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Hue Sensors from Config Entry."""
     bridge: HueBridge = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/hue/v2/device.py b/homeassistant/components/hue/v2/device.py
index 25a027f9ebe..7bb3d28e962 100644
--- a/homeassistant/components/hue/v2/device.py
+++ b/homeassistant/components/hue/v2/device.py
@@ -94,7 +94,12 @@ async def async_setup_devices(bridge: HueBridge):
             add_device(hue_resource)
 
     # create/update all current devices found in controllers
-    known_devices = [add_device(hue_device) for hue_device in dev_controller]
+    # sort the devices to ensure bridges are added first
+    hue_devices = list(dev_controller)
+    hue_devices.sort(
+        key=lambda dev: dev.metadata.archetype != DeviceArchetypes.BRIDGE_V2
+    )
+    known_devices = [add_device(hue_device) for hue_device in hue_devices]
     known_devices += [add_device(hue_room) for hue_room in api.groups.room]
     known_devices += [add_device(hue_zone) for hue_zone in api.groups.zone]
 
diff --git a/homeassistant/components/hue/v2/group.py b/homeassistant/components/hue/v2/group.py
index c7f966ce9f2..2f9f195df97 100644
--- a/homeassistant/components/hue/v2/group.py
+++ b/homeassistant/components/hue/v2/group.py
@@ -24,9 +24,9 @@ from homeassistant.components.light import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import color as color_util
 
 from ..bridge import HueBridge
@@ -42,7 +42,7 @@ from .helpers import (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Hue groups on light platform."""
     bridge: HueBridge = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/hue/v2/light.py b/homeassistant/components/hue/v2/light.py
index 86d8cc93e54..757b69c7b7b 100644
--- a/homeassistant/components/hue/v2/light.py
+++ b/homeassistant/components/hue/v2/light.py
@@ -18,6 +18,7 @@ from homeassistant.components.light import (
     ATTR_FLASH,
     ATTR_TRANSITION,
     ATTR_XY_COLOR,
+    EFFECT_OFF,
     FLASH_SHORT,
     ColorMode,
     LightEntity,
@@ -27,7 +28,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import color as color_util
 
 from ..bridge import HueBridge
@@ -39,7 +40,6 @@ from .helpers import (
     normalize_hue_transition,
 )
 
-EFFECT_NONE = "None"
 FALLBACK_MIN_KELVIN = 6500
 FALLBACK_MAX_KELVIN = 2000
 FALLBACK_KELVIN = 5800  # halfway
@@ -48,7 +48,7 @@ FALLBACK_KELVIN = 5800  # halfway
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Hue Light from Config Entry."""
     bridge: HueBridge = hass.data[DOMAIN][config_entry.entry_id]
@@ -75,7 +75,7 @@ class HueLight(HueBaseEntity, LightEntity):
 
     _fixed_color_mode: ColorMode | None = None
     entity_description = LightEntityDescription(
-        key="hue_light", has_entity_name=True, name=None
+        key="hue_light", translation_key="hue_light", has_entity_name=True, name=None
     )
 
     def __init__(
@@ -107,7 +107,9 @@ class HueLight(HueBaseEntity, LightEntity):
         self._attr_effect_list = []
         if effects := resource.effects:
             self._attr_effect_list = [
-                x.value for x in effects.status_values if x != EffectStatus.NO_EFFECT
+                x.value
+                for x in effects.status_values
+                if x not in (EffectStatus.NO_EFFECT, EffectStatus.UNKNOWN)
             ]
         if timed_effects := resource.timed_effects:
             self._attr_effect_list += [
@@ -116,7 +118,7 @@ class HueLight(HueBaseEntity, LightEntity):
                 if x != TimedEffectStatus.NO_EFFECT
             ]
         if len(self._attr_effect_list) > 0:
-            self._attr_effect_list.insert(0, EFFECT_NONE)
+            self._attr_effect_list.insert(0, EFFECT_OFF)
             self._attr_supported_features |= LightEntityFeature.EFFECT
 
     @property
@@ -209,7 +211,7 @@ class HueLight(HueBaseEntity, LightEntity):
         if timed_effects := self.resource.timed_effects:
             if timed_effects.status != TimedEffectStatus.NO_EFFECT:
                 return timed_effects.status.value
-        return EFFECT_NONE
+        return EFFECT_OFF
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the device on."""
@@ -231,12 +233,12 @@ class HueLight(HueBaseEntity, LightEntity):
         self._color_temp_active = color_temp is not None
         flash = kwargs.get(ATTR_FLASH)
         effect = effect_str = kwargs.get(ATTR_EFFECT)
-        if effect_str in (EFFECT_NONE, EFFECT_NONE.lower()):
-            # ignore effect if set to "None" and we have no effect active
-            # the special effect "None" is only used to stop an active effect
+        if effect_str == EFFECT_OFF:
+            # ignore effect if set to "off" and we have no effect active
+            # the special effect "off" is only used to stop an active effect
             # but sending it while no effect is active can actually result in issues
             # https://github.com/home-assistant/core/issues/122165
-            effect = None if self.effect == EFFECT_NONE else EffectStatus.NO_EFFECT
+            effect = None if self.effect == EFFECT_OFF else EffectStatus.NO_EFFECT
         elif effect_str is not None:
             # work out if we got a regular effect or timed effect
             effect = EffectStatus(effect_str)
diff --git a/homeassistant/components/hue/v2/sensor.py b/homeassistant/components/hue/v2/sensor.py
index bdf1db6df2e..ae6e456a8b4 100644
--- a/homeassistant/components/hue/v2/sensor.py
+++ b/homeassistant/components/hue/v2/sensor.py
@@ -28,7 +28,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import LIGHT_LUX, PERCENTAGE, EntityCategory, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from ..bridge import HueBridge
 from ..const import DOMAIN
@@ -46,7 +46,7 @@ type ControllerType = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Hue Sensors from Config Entry."""
     bridge: HueBridge = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/huisbaasje/sensor.py b/homeassistant/components/huisbaasje/sensor.py
index c024e3030fa..91c953b2182 100644
--- a/homeassistant/components/huisbaasje/sensor.py
+++ b/homeassistant/components/huisbaasje/sensor.py
@@ -30,7 +30,7 @@ from homeassistant.const import (
     UnitOfVolumeFlowRate,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -219,7 +219,7 @@ SENSORS_INFO = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor platform."""
     coordinator: DataUpdateCoordinator[dict[str, dict[str, Any]]] = hass.data[DOMAIN][
diff --git a/homeassistant/components/humidifier/device_action.py b/homeassistant/components/humidifier/device_action.py
index 06440480277..9ff36412418 100644
--- a/homeassistant/components/humidifier/device_action.py
+++ b/homeassistant/components/humidifier/device_action.py
@@ -19,8 +19,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Context, HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.entity import get_capability, get_supported_features
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType, VolDictType
 
diff --git a/homeassistant/components/humidifier/intent.py b/homeassistant/components/humidifier/intent.py
index 425fdbcc679..490143c728d 100644
--- a/homeassistant/components/humidifier/intent.py
+++ b/homeassistant/components/humidifier/intent.py
@@ -6,8 +6,7 @@ import voluptuous as vol
 
 from homeassistant.const import ATTR_ENTITY_ID, ATTR_MODE, STATE_OFF
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import intent
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, intent
 
 from . import (
     ATTR_AVAILABLE_MODES,
diff --git a/homeassistant/components/humidifier/strings.json b/homeassistant/components/humidifier/strings.json
index 753368dc572..436f7df8312 100644
--- a/homeassistant/components/humidifier/strings.json
+++ b/homeassistant/components/humidifier/strings.json
@@ -89,7 +89,7 @@
       "fields": {
         "mode": {
           "name": "Mode",
-          "description": "Operation mode. For example, _normal_, _eco_, or _away_. For a list of possible values, refer to the integration documentation."
+          "description": "Operation mode. For example, \"normal\", \"eco\", or \"away\". For a list of possible values, refer to the integration documentation."
         }
       }
     },
diff --git a/homeassistant/components/hunterdouglas_powerview/__init__.py b/homeassistant/components/hunterdouglas_powerview/__init__.py
index d9358db2753..3e9ff8727ce 100644
--- a/homeassistant/components/hunterdouglas_powerview/__init__.py
+++ b/homeassistant/components/hunterdouglas_powerview/__init__.py
@@ -11,7 +11,7 @@ from aiopvapi.shades import Shades
 from homeassistant.const import CONF_API_VERSION, CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from .const import DOMAIN, HUB_EXCEPTIONS
 from .coordinator import PowerviewShadeUpdateCoordinator
@@ -91,7 +91,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: PowerviewConfigEntry) ->
             entry, unique_id=device_info.serial_number
         )
 
-    coordinator = PowerviewShadeUpdateCoordinator(hass, shades, hub)
+    coordinator = PowerviewShadeUpdateCoordinator(hass, entry, shades, hub)
     coordinator.async_set_updated_data(PowerviewShadeData())
     # populate raw shade data into the coordinator for diagnostics
     coordinator.data.store_group_data(shade_data)
diff --git a/homeassistant/components/hunterdouglas_powerview/button.py b/homeassistant/components/hunterdouglas_powerview/button.py
index adb3e177a8e..c0bcac3a7df 100644
--- a/homeassistant/components/hunterdouglas_powerview/button.py
+++ b/homeassistant/components/hunterdouglas_powerview/button.py
@@ -22,7 +22,7 @@ from homeassistant.components.button import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import PowerviewShadeUpdateCoordinator
 from .entity import ShadeEntity
@@ -74,7 +74,7 @@ BUTTONS_SHADE: Final = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PowerviewConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the hunter douglas advanced feature buttons."""
     pv_entry = entry.runtime_data
diff --git a/homeassistant/components/hunterdouglas_powerview/coordinator.py b/homeassistant/components/hunterdouglas_powerview/coordinator.py
index f074b06b2bc..2ff1914079a 100644
--- a/homeassistant/components/hunterdouglas_powerview/coordinator.py
+++ b/homeassistant/components/hunterdouglas_powerview/coordinator.py
@@ -10,6 +10,7 @@ from aiopvapi.helpers.aiorequest import PvApiMaintenance
 from aiopvapi.hub import Hub
 from aiopvapi.shades import Shades
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -22,7 +23,11 @@ _LOGGER = logging.getLogger(__name__)
 class PowerviewShadeUpdateCoordinator(DataUpdateCoordinator[PowerviewShadeData]):
     """DataUpdateCoordinator to gather data from a powerview hub."""
 
-    def __init__(self, hass: HomeAssistant, shades: Shades, hub: Hub) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, shades: Shades, hub: Hub
+    ) -> None:
         """Initialize DataUpdateCoordinator to gather data for specific Powerview Hub."""
         self.shades = shades
         self.hub = hub
@@ -33,6 +38,7 @@ class PowerviewShadeUpdateCoordinator(DataUpdateCoordinator[PowerviewShadeData])
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=f"powerview hub {hub.hub_address}",
             update_interval=timedelta(seconds=60),
         )
diff --git a/homeassistant/components/hunterdouglas_powerview/cover.py b/homeassistant/components/hunterdouglas_powerview/cover.py
index 197fb4e6223..3f36a57891c 100644
--- a/homeassistant/components/hunterdouglas_powerview/cover.py
+++ b/homeassistant/components/hunterdouglas_powerview/cover.py
@@ -26,7 +26,7 @@ from homeassistant.components.cover import (
     CoverEntityFeature,
 )
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 
 from .const import STATE_ATTRIBUTE_ROOM_NAME
@@ -50,7 +50,7 @@ SCAN_INTERVAL = timedelta(minutes=10)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PowerviewConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the hunter douglas shades."""
     pv_entry = entry.runtime_data
diff --git a/homeassistant/components/hunterdouglas_powerview/entity.py b/homeassistant/components/hunterdouglas_powerview/entity.py
index ba572ecefce..f2a841a7d0e 100644
--- a/homeassistant/components/hunterdouglas_powerview/entity.py
+++ b/homeassistant/components/hunterdouglas_powerview/entity.py
@@ -4,7 +4,7 @@ import logging
 
 from aiopvapi.resources.shade import BaseShade, ShadePosition
 
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
diff --git a/homeassistant/components/hunterdouglas_powerview/number.py b/homeassistant/components/hunterdouglas_powerview/number.py
index fb8c9f76d79..216cdb2642a 100644
--- a/homeassistant/components/hunterdouglas_powerview/number.py
+++ b/homeassistant/components/hunterdouglas_powerview/number.py
@@ -14,7 +14,7 @@ from homeassistant.components.number import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import PowerviewShadeUpdateCoordinator
 from .entity import ShadeEntity
@@ -54,7 +54,7 @@ NUMBERS: Final = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PowerviewConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the hunter douglas number entities."""
     pv_entry = entry.runtime_data
diff --git a/homeassistant/components/hunterdouglas_powerview/scene.py b/homeassistant/components/hunterdouglas_powerview/scene.py
index 2aaa255c5ab..5016b590f91 100644
--- a/homeassistant/components/hunterdouglas_powerview/scene.py
+++ b/homeassistant/components/hunterdouglas_powerview/scene.py
@@ -10,7 +10,7 @@ from aiopvapi.resources.scene import Scene as PvScene
 
 from homeassistant.components.scene import Scene
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import STATE_ATTRIBUTE_ROOM_NAME
 from .coordinator import PowerviewShadeUpdateCoordinator
@@ -25,7 +25,7 @@ RESYNC_DELAY = 60
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PowerviewConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up powerview scene entries."""
     pv_entry = entry.runtime_data
diff --git a/homeassistant/components/hunterdouglas_powerview/select.py b/homeassistant/components/hunterdouglas_powerview/select.py
index db850a0ddbf..932ff3ce3bd 100644
--- a/homeassistant/components/hunterdouglas_powerview/select.py
+++ b/homeassistant/components/hunterdouglas_powerview/select.py
@@ -12,7 +12,7 @@ from aiopvapi.resources.shade import BaseShade
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import PowerviewShadeUpdateCoordinator
 from .entity import ShadeEntity
@@ -54,7 +54,7 @@ DROPDOWNS: Final = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PowerviewConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the hunter douglas select entities."""
     pv_entry = entry.runtime_data
diff --git a/homeassistant/components/hunterdouglas_powerview/sensor.py b/homeassistant/components/hunterdouglas_powerview/sensor.py
index f5e3ddd5e12..6ebf8e2b278 100644
--- a/homeassistant/components/hunterdouglas_powerview/sensor.py
+++ b/homeassistant/components/hunterdouglas_powerview/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, SIGNAL_STRENGTH_DECIBELS, EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import PowerviewShadeUpdateCoordinator
 from .entity import ShadeEntity
@@ -79,7 +79,7 @@ SENSORS: Final = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PowerviewConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the hunter douglas sensor entities."""
     pv_entry = entry.runtime_data
diff --git a/homeassistant/components/hunterdouglas_powerview/strings.json b/homeassistant/components/hunterdouglas_powerview/strings.json
index a107e2c5be4..231270d6eef 100644
--- a/homeassistant/components/hunterdouglas_powerview/strings.json
+++ b/homeassistant/components/hunterdouglas_powerview/strings.json
@@ -5,7 +5,7 @@
         "title": "Connect to the PowerView Hub",
         "data": {
           "host": "[%key:common::config_flow::data::ip%]",
-          "api_version": "Hub Generation"
+          "api_version": "Hub generation"
         },
         "data_description": {
           "api_version": "API version is detectable, but you can override and force a specific version"
@@ -19,7 +19,7 @@
     "flow_title": "{name} ({host})",
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "unsupported_device": "Only the primary powerview hub can be added",
+      "unsupported_device": "Only the primary PowerView Hub can be added",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
diff --git a/homeassistant/components/husqvarna_automower/__init__.py b/homeassistant/components/husqvarna_automower/__init__.py
index a08256fb0b5..1945647a706 100644
--- a/homeassistant/components/husqvarna_automower/__init__.py
+++ b/homeassistant/components/husqvarna_automower/__init__.py
@@ -5,7 +5,6 @@ import logging
 from aioautomower.session import AutomowerSession
 from aiohttp import ClientResponseError
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
@@ -13,7 +12,7 @@ from homeassistant.helpers import aiohttp_client, config_entry_oauth2_flow
 from homeassistant.util import dt as dt_util
 
 from . import api
-from .coordinator import AutomowerDataUpdateCoordinator
+from .coordinator import AutomowerConfigEntry, AutomowerDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -29,8 +28,6 @@ PLATFORMS: list[Platform] = [
     Platform.SWITCH,
 ]
 
-type AutomowerConfigEntry = ConfigEntry[AutomowerDataUpdateCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: AutomowerConfigEntry) -> bool:
     """Set up this integration using UI."""
@@ -61,7 +58,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AutomowerConfigEntry) ->
         # without the scope. So only polling would be possible.
         raise ConfigEntryAuthFailed
 
-    coordinator = AutomowerDataUpdateCoordinator(hass, automower_api)
+    coordinator = AutomowerDataUpdateCoordinator(hass, entry, automower_api)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
 
diff --git a/homeassistant/components/husqvarna_automower/binary_sensor.py b/homeassistant/components/husqvarna_automower/binary_sensor.py
index 907d34e812a..1e5b9fac990 100644
--- a/homeassistant/components/husqvarna_automower/binary_sensor.py
+++ b/homeassistant/components/husqvarna_automower/binary_sensor.py
@@ -17,7 +17,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.components.script import scripts_with_entity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.issue_registry import (
     IssueSeverity,
     async_create_issue,
@@ -71,7 +71,7 @@ MOWER_BINARY_SENSOR_TYPES: tuple[AutomowerBinarySensorEntityDescription, ...] =
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AutomowerConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up binary sensor platform."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/husqvarna_automower/button.py b/homeassistant/components/husqvarna_automower/button.py
index 7e6e581cdf1..1f7ed7127e0 100644
--- a/homeassistant/components/husqvarna_automower/button.py
+++ b/homeassistant/components/husqvarna_automower/button.py
@@ -10,7 +10,7 @@ from aioautomower.session import AutomowerSession
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AutomowerConfigEntry
 from .coordinator import AutomowerDataUpdateCoordinator
@@ -54,7 +54,7 @@ MOWER_BUTTON_TYPES: tuple[AutomowerButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AutomowerConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up button platform."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/husqvarna_automower/calendar.py b/homeassistant/components/husqvarna_automower/calendar.py
index 9e2ea037afb..26e939ec7d9 100644
--- a/homeassistant/components/husqvarna_automower/calendar.py
+++ b/homeassistant/components/husqvarna_automower/calendar.py
@@ -7,7 +7,7 @@ from aioautomower.model import make_name_string
 
 from homeassistant.components.calendar import CalendarEntity, CalendarEvent
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from . import AutomowerConfigEntry
@@ -22,7 +22,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AutomowerConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up lawn mower platform."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/husqvarna_automower/config_flow.py b/homeassistant/components/husqvarna_automower/config_flow.py
index 7efed529453..31ca5eef0cd 100644
--- a/homeassistant/components/husqvarna_automower/config_flow.py
+++ b/homeassistant/components/husqvarna_automower/config_flow.py
@@ -54,7 +54,8 @@ class HusqvarnaConfigFlowHandler(
         automower_api = AutomowerSession(AsyncConfigFlowAuth(websession, token), tz)
         try:
             status_data = await automower_api.get_status()
-        except Exception:  # noqa: BLE001
+        except Exception:
+            _LOGGER.exception("Unexpected exception")
             return self.async_abort(reason="unknown")
         if status_data == {}:
             return self.async_abort(reason="no_mower_connected")
diff --git a/homeassistant/components/husqvarna_automower/coordinator.py b/homeassistant/components/husqvarna_automower/coordinator.py
index a587b4f3821..9456074596a 100644
--- a/homeassistant/components/husqvarna_automower/coordinator.py
+++ b/homeassistant/components/husqvarna_automower/coordinator.py
@@ -6,7 +6,6 @@ import asyncio
 from collections.abc import Callable
 from datetime import timedelta
 import logging
-from typing import TYPE_CHECKING
 
 from aioautomower.exceptions import (
     ApiError,
@@ -14,9 +13,10 @@ from aioautomower.exceptions import (
     HusqvarnaTimeoutError,
     HusqvarnaWSServerHandshakeError,
 )
-from aioautomower.model import MowerAttributes
+from aioautomower.model import MowerDictionary
 from aioautomower.session import AutomowerSession
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers import device_registry as dr, entity_registry as er
@@ -24,25 +24,30 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .const import DOMAIN
 
-if TYPE_CHECKING:
-    from . import AutomowerConfigEntry
-
 _LOGGER = logging.getLogger(__name__)
 MAX_WS_RECONNECT_TIME = 600
 SCAN_INTERVAL = timedelta(minutes=8)
 DEFAULT_RECONNECT_TIME = 2  # Define a default reconnect time
 
+type AutomowerConfigEntry = ConfigEntry[AutomowerDataUpdateCoordinator]
 
-class AutomowerDataUpdateCoordinator(DataUpdateCoordinator[dict[str, MowerAttributes]]):
+
+class AutomowerDataUpdateCoordinator(DataUpdateCoordinator[MowerDictionary]):
     """Class to manage fetching Husqvarna data."""
 
     config_entry: AutomowerConfigEntry
 
-    def __init__(self, hass: HomeAssistant, api: AutomowerSession) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: AutomowerConfigEntry,
+        api: AutomowerSession,
+    ) -> None:
         """Initialize data updater."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
@@ -56,7 +61,7 @@ class AutomowerDataUpdateCoordinator(DataUpdateCoordinator[dict[str, MowerAttrib
         self._zones_last_update: dict[str, set[str]] = {}
         self._areas_last_update: dict[str, set[int]] = {}
 
-    async def _async_update_data(self) -> dict[str, MowerAttributes]:
+    async def _async_update_data(self) -> MowerDictionary:
         """Subscribe for websocket and poll data from the API."""
         if not self.ws_connected:
             await self.api.connect()
@@ -79,7 +84,7 @@ class AutomowerDataUpdateCoordinator(DataUpdateCoordinator[dict[str, MowerAttrib
         return data
 
     @callback
-    def callback(self, ws_data: dict[str, MowerAttributes]) -> None:
+    def callback(self, ws_data: MowerDictionary) -> None:
         """Process websocket callbacks and write them to the DataUpdateCoordinator."""
         self.async_set_updated_data(ws_data)
 
@@ -114,7 +119,7 @@ class AutomowerDataUpdateCoordinator(DataUpdateCoordinator[dict[str, MowerAttrib
                 "reconnect_task",
             )
 
-    def _async_add_remove_devices(self, data: dict[str, MowerAttributes]) -> None:
+    def _async_add_remove_devices(self, data: MowerDictionary) -> None:
         """Add new device, remove non-existing device."""
         current_devices = set(data)
 
@@ -154,9 +159,7 @@ class AutomowerDataUpdateCoordinator(DataUpdateCoordinator[dict[str, MowerAttrib
         for mower_callback in self.new_devices_callbacks:
             mower_callback(new_devices)
 
-    def _async_add_remove_stay_out_zones(
-        self, data: dict[str, MowerAttributes]
-    ) -> None:
+    def _async_add_remove_stay_out_zones(self, data: MowerDictionary) -> None:
         """Add new stay-out zones, remove non-existing stay-out zones."""
         current_zones = {
             mower_id: set(mower_data.stay_out_zones.zones)
@@ -202,7 +205,7 @@ class AutomowerDataUpdateCoordinator(DataUpdateCoordinator[dict[str, MowerAttrib
 
         return current_zones
 
-    def _async_add_remove_work_areas(self, data: dict[str, MowerAttributes]) -> None:
+    def _async_add_remove_work_areas(self, data: MowerDictionary) -> None:
         """Add new work areas, remove non-existing work areas."""
         current_areas = {
             mower_id: set(mower_data.work_areas)
diff --git a/homeassistant/components/husqvarna_automower/device_tracker.py b/homeassistant/components/husqvarna_automower/device_tracker.py
index 2fd59b63014..78fad7c3610 100644
--- a/homeassistant/components/husqvarna_automower/device_tracker.py
+++ b/homeassistant/components/husqvarna_automower/device_tracker.py
@@ -2,7 +2,7 @@
 
 from homeassistant.components.device_tracker import TrackerEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AutomowerConfigEntry
 from .coordinator import AutomowerDataUpdateCoordinator
@@ -15,7 +15,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AutomowerConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up device tracker platform."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/husqvarna_automower/lawn_mower.py b/homeassistant/components/husqvarna_automower/lawn_mower.py
index dd75a8b9bc4..ee6007f089b 100644
--- a/homeassistant/components/husqvarna_automower/lawn_mower.py
+++ b/homeassistant/components/husqvarna_automower/lawn_mower.py
@@ -15,7 +15,7 @@ from homeassistant.components.lawn_mower import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AutomowerConfigEntry
 from .const import DOMAIN
@@ -49,7 +49,7 @@ OVERRIDE_MODES = [MOW, PARK]
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AutomowerConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up lawn mower platform."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/husqvarna_automower/manifest.json b/homeassistant/components/husqvarna_automower/manifest.json
index 0eabf5ec0d6..7f728148be3 100644
--- a/homeassistant/components/husqvarna_automower/manifest.json
+++ b/homeassistant/components/husqvarna_automower/manifest.json
@@ -8,5 +8,5 @@
   "iot_class": "cloud_push",
   "loggers": ["aioautomower"],
   "quality_scale": "silver",
-  "requirements": ["aioautomower==2025.1.1"]
+  "requirements": ["aioautomower==2025.3.2"]
 }
diff --git a/homeassistant/components/husqvarna_automower/number.py b/homeassistant/components/husqvarna_automower/number.py
index d3666494646..9ed00113d4b 100644
--- a/homeassistant/components/husqvarna_automower/number.py
+++ b/homeassistant/components/husqvarna_automower/number.py
@@ -11,7 +11,7 @@ from aioautomower.session import AutomowerSession
 from homeassistant.components.number import NumberEntity, NumberEntityDescription
 from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AutomowerConfigEntry
 from .coordinator import AutomowerDataUpdateCoordinator
@@ -44,7 +44,7 @@ async def async_set_work_area_cutting_height(
 ) -> None:
     """Set cutting height for work area."""
     await coordinator.api.commands.workarea_settings(
-        mower_id, int(cheight), work_area_id
+        mower_id, work_area_id, cutting_height=int(cheight)
     )
 
 
@@ -107,7 +107,7 @@ WORK_AREA_NUMBER_TYPES: tuple[WorkAreaNumberEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AutomowerConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up number platform."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/husqvarna_automower/select.py b/homeassistant/components/husqvarna_automower/select.py
index 03b1ac02587..9124a0705e1 100644
--- a/homeassistant/components/husqvarna_automower/select.py
+++ b/homeassistant/components/husqvarna_automower/select.py
@@ -8,7 +8,7 @@ from aioautomower.model import HeadlightModes
 from homeassistant.components.select import SelectEntity
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AutomowerConfigEntry
 from .coordinator import AutomowerDataUpdateCoordinator
@@ -29,7 +29,7 @@ HEADLIGHT_MODES: list = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AutomowerConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up select platform."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/husqvarna_automower/sensor.py b/homeassistant/components/husqvarna_automower/sensor.py
index a2f4b5f4bab..d7a83c82185 100644
--- a/homeassistant/components/husqvarna_automower/sensor.py
+++ b/homeassistant/components/husqvarna_automower/sensor.py
@@ -23,7 +23,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfLength, UnitOfTime
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import AutomowerConfigEntry
@@ -227,12 +227,16 @@ def _get_work_area_names(data: MowerAttributes) -> list[str]:
 @callback
 def _get_current_work_area_name(data: MowerAttributes) -> str:
     """Return the name of the current work area."""
-    if data.mower.work_area_id is None:
-        return STATE_NO_WORK_AREA_ACTIVE
     if TYPE_CHECKING:
         # Sensor does not get created if values are None
         assert data.work_areas is not None
-    return data.work_areas[data.mower.work_area_id].name
+    if (
+        data.mower.work_area_id is not None
+        and data.mower.work_area_id in data.work_areas
+    ):
+        return data.work_areas[data.mower.work_area_id].name
+
+    return STATE_NO_WORK_AREA_ACTIVE
 
 
 @callback
@@ -295,6 +299,18 @@ MOWER_SENSOR_TYPES: tuple[AutomowerSensorEntityDescription, ...] = (
         exists_fn=lambda data: data.statistics.cutting_blade_usage_time is not None,
         value_fn=attrgetter("statistics.cutting_blade_usage_time"),
     ),
+    AutomowerSensorEntityDescription(
+        key="downtime",
+        translation_key="downtime",
+        state_class=SensorStateClass.TOTAL,
+        device_class=SensorDeviceClass.DURATION,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_display_precision=0,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
+        exists_fn=lambda data: data.statistics.downtime is not None,
+        value_fn=attrgetter("statistics.downtime"),
+    ),
     AutomowerSensorEntityDescription(
         key="total_charging_time",
         translation_key="total_charging_time",
@@ -367,6 +383,18 @@ MOWER_SENSOR_TYPES: tuple[AutomowerSensorEntityDescription, ...] = (
         exists_fn=lambda data: data.statistics.total_drive_distance is not None,
         value_fn=attrgetter("statistics.total_drive_distance"),
     ),
+    AutomowerSensorEntityDescription(
+        key="uptime",
+        translation_key="uptime",
+        state_class=SensorStateClass.TOTAL,
+        device_class=SensorDeviceClass.DURATION,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_display_precision=0,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
+        exists_fn=lambda data: data.statistics.uptime is not None,
+        value_fn=attrgetter("statistics.uptime"),
+    ),
     AutomowerSensorEntityDescription(
         key="next_start_timestamp",
         translation_key="next_start_timestamp",
@@ -430,7 +458,7 @@ WORK_AREA_SENSOR_TYPES: tuple[WorkAreaSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AutomowerConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensor platform."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/husqvarna_automower/strings.json b/homeassistant/components/husqvarna_automower/strings.json
index 9bd0bb06b3e..35ce342867f 100644
--- a/homeassistant/components/husqvarna_automower/strings.json
+++ b/homeassistant/components/husqvarna_automower/strings.json
@@ -221,6 +221,9 @@
       "cutting_blade_usage_time": {
         "name": "Cutting blade usage time"
       },
+      "downtime": {
+        "name": "Downtime"
+      },
       "restricted_reason": {
         "name": "Restricted reason",
         "state": {
@@ -263,6 +266,9 @@
           "demo": "Demo"
         }
       },
+      "uptime": {
+        "name": "Uptime"
+      },
       "work_area": {
         "name": "Work area",
         "state": {
diff --git a/homeassistant/components/husqvarna_automower/switch.py b/homeassistant/components/husqvarna_automower/switch.py
index d55d51b42fe..69a3e670eda 100644
--- a/homeassistant/components/husqvarna_automower/switch.py
+++ b/homeassistant/components/husqvarna_automower/switch.py
@@ -7,7 +7,7 @@ from aioautomower.model import MowerModes, StayOutZones, Zone
 
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AutomowerConfigEntry
 from .coordinator import AutomowerDataUpdateCoordinator
@@ -26,7 +26,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: AutomowerConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switch platform."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/husqvarna_automower_ble/__init__.py b/homeassistant/components/husqvarna_automower_ble/__init__.py
index 2025ba64cf1..ca07d1ab8d2 100644
--- a/homeassistant/components/husqvarna_automower_ble/__init__.py
+++ b/homeassistant/components/husqvarna_automower_ble/__init__.py
@@ -45,7 +45,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     model = await mower.get_model()
     LOGGER.debug("Connected to Automower: %s", model)
 
-    coordinator = HusqvarnaCoordinator(hass, mower, address, channel_id, model)
+    coordinator = HusqvarnaCoordinator(hass, entry, mower, address, channel_id, model)
 
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
diff --git a/homeassistant/components/husqvarna_automower_ble/coordinator.py b/homeassistant/components/husqvarna_automower_ble/coordinator.py
index c577ccd9196..dde3462c081 100644
--- a/homeassistant/components/husqvarna_automower_ble/coordinator.py
+++ b/homeassistant/components/husqvarna_automower_ble/coordinator.py
@@ -9,6 +9,7 @@ from bleak import BleakError
 from bleak_retry_connector import close_stale_connections_by_address
 
 from homeassistant.components import bluetooth
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -20,9 +21,12 @@ SCAN_INTERVAL = timedelta(seconds=60)
 class HusqvarnaCoordinator(DataUpdateCoordinator[dict[str, bytes]]):
     """Class to manage fetching data."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         mower: Mower,
         address: str,
         channel_id: str,
@@ -32,6 +36,7 @@ class HusqvarnaCoordinator(DataUpdateCoordinator[dict[str, bytes]]):
         super().__init__(
             hass=hass,
             logger=LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/husqvarna_automower_ble/lawn_mower.py b/homeassistant/components/husqvarna_automower_ble/lawn_mower.py
index 980efc6f069..4b239394c2d 100644
--- a/homeassistant/components/husqvarna_automower_ble/lawn_mower.py
+++ b/homeassistant/components/husqvarna_automower_ble/lawn_mower.py
@@ -12,7 +12,7 @@ from homeassistant.components.lawn_mower import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import LOGGER
 from .coordinator import HusqvarnaCoordinator
@@ -22,7 +22,7 @@ from .entity import HusqvarnaAutomowerBleEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AutomowerLawnMower integration from a config entry."""
     coordinator: HusqvarnaCoordinator = config_entry.runtime_data
diff --git a/homeassistant/components/huum/climate.py b/homeassistant/components/huum/climate.py
index 7e0e4ce5ef1..84173260d04 100644
--- a/homeassistant/components/huum/climate.py
+++ b/homeassistant/components/huum/climate.py
@@ -20,7 +20,7 @@ from homeassistant.const import ATTR_TEMPERATURE, PRECISION_WHOLE, UnitOfTempera
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 
@@ -30,7 +30,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Huum sauna with config flow."""
     huum_handler = hass.data.setdefault(DOMAIN, {})[entry.entry_id]
diff --git a/homeassistant/components/hvv_departures/binary_sensor.py b/homeassistant/components/hvv_departures/binary_sensor.py
index 913c61f91b4..622a8436e04 100644
--- a/homeassistant/components/hvv_departures/binary_sensor.py
+++ b/homeassistant/components/hvv_departures/binary_sensor.py
@@ -17,7 +17,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -30,7 +30,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the binary_sensor platform."""
     hub = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/hvv_departures/config_flow.py b/homeassistant/components/hvv_departures/config_flow.py
index 536b8f18259..d76ccef7cab 100644
--- a/homeassistant/components/hvv_departures/config_flow.py
+++ b/homeassistant/components/hvv_departures/config_flow.py
@@ -17,8 +17,7 @@ from homeassistant.config_entries import (
 )
 from homeassistant.const import CONF_HOST, CONF_OFFSET, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import callback
-from homeassistant.helpers import aiohttp_client
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import aiohttp_client, config_validation as cv
 
 from .const import CONF_FILTER, CONF_REAL_TIME, CONF_STATION, DOMAIN
 from .hub import GTIHub
diff --git a/homeassistant/components/hvv_departures/sensor.py b/homeassistant/components/hvv_departures/sensor.py
index 6ad61295d04..667893db8f2 100644
--- a/homeassistant/components/hvv_departures/sensor.py
+++ b/homeassistant/components/hvv_departures/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.const import ATTR_ID, CONF_OFFSET
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import aiohttp_client
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import Throttle
 from homeassistant.util.dt import get_time_zone, utcnow
 
@@ -42,7 +42,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor platform."""
     hub = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/hydrawise/__init__.py b/homeassistant/components/hydrawise/__init__.py
index ea5a5801e69..ce4d7a8f8c2 100644
--- a/homeassistant/components/hydrawise/__init__.py
+++ b/homeassistant/components/hydrawise/__init__.py
@@ -1,9 +1,9 @@
 """Support for Hydrawise cloud."""
 
-from pydrawise import auth, client
+from pydrawise import auth, hybrid
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
+from homeassistant.const import CONF_API_KEY, CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 
@@ -21,23 +21,28 @@ PLATFORMS: list[Platform] = [
     Platform.VALVE,
 ]
 
+_REQUIRED_AUTH_KEYS = (CONF_USERNAME, CONF_PASSWORD, CONF_API_KEY)
+
 
 async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Set up Hydrawise from a config entry."""
-    if CONF_USERNAME not in config_entry.data or CONF_PASSWORD not in config_entry.data:
-        # The GraphQL API requires username and password to authenticate. If either is
-        # missing, reauth is required.
+    if any(k not in config_entry.data for k in _REQUIRED_AUTH_KEYS):
+        # If we are missing any required authentication keys, trigger a reauth flow.
         raise ConfigEntryAuthFailed
 
-    hydrawise = client.Hydrawise(
-        auth.Auth(config_entry.data[CONF_USERNAME], config_entry.data[CONF_PASSWORD]),
+    hydrawise = hybrid.HybridClient(
+        auth.HybridAuth(
+            config_entry.data[CONF_USERNAME],
+            config_entry.data[CONF_PASSWORD],
+            config_entry.data[CONF_API_KEY],
+        ),
         app_id=APP_ID,
     )
 
-    main_coordinator = HydrawiseMainDataUpdateCoordinator(hass, hydrawise)
+    main_coordinator = HydrawiseMainDataUpdateCoordinator(hass, config_entry, hydrawise)
     await main_coordinator.async_config_entry_first_refresh()
     water_use_coordinator = HydrawiseWaterUseDataUpdateCoordinator(
-        hass, hydrawise, main_coordinator
+        hass, config_entry, hydrawise, main_coordinator
     )
     await water_use_coordinator.async_config_entry_first_refresh()
     hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = (
diff --git a/homeassistant/components/hydrawise/binary_sensor.py b/homeassistant/components/hydrawise/binary_sensor.py
index 83e8a8325f9..b2862930933 100644
--- a/homeassistant/components/hydrawise/binary_sensor.py
+++ b/homeassistant/components/hydrawise/binary_sensor.py
@@ -17,7 +17,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import VolDictType
 
 from .const import DOMAIN, SERVICE_RESUME, SERVICE_START_WATERING, SERVICE_SUSPEND
@@ -78,7 +78,7 @@ SCHEMA_SUSPEND: VolDictType = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Hydrawise binary_sensor platform."""
     coordinators: HydrawiseUpdateCoordinators = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/hydrawise/config_flow.py b/homeassistant/components/hydrawise/config_flow.py
index ed21e96cd0b..3a61908ee2d 100644
--- a/homeassistant/components/hydrawise/config_flow.py
+++ b/homeassistant/components/hydrawise/config_flow.py
@@ -6,25 +6,32 @@ from collections.abc import Mapping
 from typing import Any
 
 from aiohttp import ClientError
-from pydrawise import auth as pydrawise_auth, client
+from pydrawise import auth as pydrawise_auth, hybrid
 from pydrawise.exceptions import NotAuthorizedError
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import CONF_API_KEY, CONF_PASSWORD, CONF_USERNAME
 
 from .const import APP_ID, DOMAIN, LOGGER
 
 STEP_USER_DATA_SCHEMA = vol.Schema(
-    {vol.Required(CONF_USERNAME): str, vol.Required(CONF_PASSWORD): str}
+    {
+        vol.Required(CONF_USERNAME): str,
+        vol.Required(CONF_PASSWORD): str,
+        vol.Required(CONF_API_KEY): str,
+    }
+)
+STEP_REAUTH_DATA_SCHEMA = vol.Schema(
+    {vol.Required(CONF_PASSWORD): str, vol.Required(CONF_API_KEY): str}
 )
-STEP_REAUTH_DATA_SCHEMA = vol.Schema({vol.Required(CONF_PASSWORD): str})
 
 
 class HydrawiseConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Hydrawise."""
 
     VERSION = 1
+    MINOR_VERSION = 2
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -34,14 +41,19 @@ class HydrawiseConfigFlow(ConfigFlow, domain=DOMAIN):
             return self._show_user_form({})
         username = user_input[CONF_USERNAME]
         password = user_input[CONF_PASSWORD]
-        unique_id, errors = await _authenticate(username, password)
+        api_key = user_input[CONF_API_KEY]
+        unique_id, errors = await _authenticate(username, password, api_key)
         if errors:
             return self._show_user_form(errors)
         await self.async_set_unique_id(unique_id)
         self._abort_if_unique_id_configured()
         return self.async_create_entry(
             title=username,
-            data={CONF_USERNAME: username, CONF_PASSWORD: password},
+            data={
+                CONF_USERNAME: username,
+                CONF_PASSWORD: password,
+                CONF_API_KEY: api_key,
+            },
         )
 
     def _show_user_form(self, errors: dict[str, str]) -> ConfigFlowResult:
@@ -65,14 +77,20 @@ class HydrawiseConfigFlow(ConfigFlow, domain=DOMAIN):
         reauth_entry = self._get_reauth_entry()
         username = reauth_entry.data[CONF_USERNAME]
         password = user_input[CONF_PASSWORD]
-        user_id, errors = await _authenticate(username, password)
+        api_key = user_input[CONF_API_KEY]
+        user_id, errors = await _authenticate(username, password, api_key)
         if user_id is None:
             return self._show_reauth_form(errors)
 
         await self.async_set_unique_id(user_id)
         self._abort_if_unique_id_mismatch(reason="wrong_account")
         return self.async_update_reload_and_abort(
-            reauth_entry, data={CONF_USERNAME: username, CONF_PASSWORD: password}
+            reauth_entry,
+            data={
+                CONF_USERNAME: username,
+                CONF_PASSWORD: password,
+                CONF_API_KEY: api_key,
+            },
         )
 
     def _show_reauth_form(self, errors: dict[str, str]) -> ConfigFlowResult:
@@ -82,14 +100,14 @@ class HydrawiseConfigFlow(ConfigFlow, domain=DOMAIN):
 
 
 async def _authenticate(
-    username: str, password: str
+    username: str, password: str, api_key: str
 ) -> tuple[str | None, dict[str, str]]:
     """Authenticate with the Hydrawise API."""
     unique_id = None
     errors: dict[str, str] = {}
-    auth = pydrawise_auth.Auth(username, password)
+    auth = pydrawise_auth.HybridAuth(username, password, api_key)
     try:
-        await auth.token()
+        await auth.check()
     except NotAuthorizedError:
         errors["base"] = "invalid_auth"
     except TimeoutError:
@@ -99,7 +117,7 @@ async def _authenticate(
         return unique_id, errors
 
     try:
-        api = client.Hydrawise(auth, app_id=APP_ID)
+        api = hybrid.HybridClient(auth, app_id=APP_ID)
         # Don't fetch zones because we don't need them yet.
         user = await api.get_user(fetch_zones=False)
     except TimeoutError:
diff --git a/homeassistant/components/hydrawise/coordinator.py b/homeassistant/components/hydrawise/coordinator.py
index e82a4ec1588..35d816b341b 100644
--- a/homeassistant/components/hydrawise/coordinator.py
+++ b/homeassistant/components/hydrawise/coordinator.py
@@ -4,9 +4,10 @@ from __future__ import annotations
 
 from dataclasses import dataclass, field
 
-from pydrawise import Hydrawise
+from pydrawise import HydrawiseBase
 from pydrawise.schema import Controller, ControllerWaterUseSummary, Sensor, User, Zone
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 from homeassistant.util.dt import now
@@ -38,7 +39,8 @@ class HydrawiseUpdateCoordinators:
 class HydrawiseDataUpdateCoordinator(DataUpdateCoordinator[HydrawiseData]):
     """Base class for Hydrawise Data Update Coordinators."""
 
-    api: Hydrawise
+    api: HydrawiseBase
+    config_entry: ConfigEntry
 
 
 class HydrawiseMainDataUpdateCoordinator(HydrawiseDataUpdateCoordinator):
@@ -49,9 +51,17 @@ class HydrawiseMainDataUpdateCoordinator(HydrawiseDataUpdateCoordinator):
     integration are updated in a timely manner.
     """
 
-    def __init__(self, hass: HomeAssistant, api: Hydrawise) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, api: HydrawiseBase
+    ) -> None:
         """Initialize HydrawiseDataUpdateCoordinator."""
-        super().__init__(hass, LOGGER, name=DOMAIN, update_interval=MAIN_SCAN_INTERVAL)
+        super().__init__(
+            hass,
+            LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=MAIN_SCAN_INTERVAL,
+        )
         self.api = api
 
     async def _async_update_data(self) -> HydrawiseData:
@@ -82,13 +92,15 @@ class HydrawiseWaterUseDataUpdateCoordinator(HydrawiseDataUpdateCoordinator):
     def __init__(
         self,
         hass: HomeAssistant,
-        api: Hydrawise,
+        config_entry: ConfigEntry,
+        api: HydrawiseBase,
         main_coordinator: HydrawiseMainDataUpdateCoordinator,
     ) -> None:
         """Initialize HydrawiseWaterUseDataUpdateCoordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=f"{DOMAIN} water use",
             update_interval=WATER_USE_SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/hydrawise/manifest.json b/homeassistant/components/hydrawise/manifest.json
index de45eb061d5..0c355c34a71 100644
--- a/homeassistant/components/hydrawise/manifest.json
+++ b/homeassistant/components/hydrawise/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/hydrawise",
   "iot_class": "cloud_polling",
   "loggers": ["pydrawise"],
-  "requirements": ["pydrawise==2025.1.0"]
+  "requirements": ["pydrawise==2025.3.0"]
 }
diff --git a/homeassistant/components/hydrawise/sensor.py b/homeassistant/components/hydrawise/sensor.py
index 96cc16832da..60bc1d7dc63 100644
--- a/homeassistant/components/hydrawise/sensor.py
+++ b/homeassistant/components/hydrawise/sensor.py
@@ -17,7 +17,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfTime, UnitOfVolume
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN
@@ -131,7 +131,7 @@ FLOW_MEASUREMENT_KEYS = [x.key for x in FLOW_CONTROLLER_SENSORS]
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Hydrawise sensor platform."""
     coordinators: HydrawiseUpdateCoordinators = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/hydrawise/strings.json b/homeassistant/components/hydrawise/strings.json
index 74c63cbe758..47543aa2f8f 100644
--- a/homeassistant/components/hydrawise/strings.json
+++ b/homeassistant/components/hydrawise/strings.json
@@ -6,14 +6,22 @@
         "description": "Please provide the username and password for your Hydrawise cloud account:",
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
-          "password": "[%key:common::config_flow::data::password%]"
+          "password": "[%key:common::config_flow::data::password%]",
+          "api_key": "[%key:common::config_flow::data::api_key%]"
+        },
+        "data_description": {
+          "api_key": "You can generate an API Key in the 'Account Details' section of the Hydrawise app"
         }
       },
       "reauth_confirm": {
         "title": "[%key:common::config_flow::title::reauth%]",
         "description": "The Hydrawise integration needs to re-authenticate your account",
         "data": {
-          "password": "[%key:common::config_flow::data::password%]"
+          "password": "[%key:common::config_flow::data::password%]",
+          "api_key": "[%key:common::config_flow::data::api_key%]"
+        },
+        "data_description": {
+          "api_key": "[%key:component::hydrawise::config::step::user::data_description::api_key%]"
         }
       }
     },
diff --git a/homeassistant/components/hydrawise/switch.py b/homeassistant/components/hydrawise/switch.py
index 1addaf1ec92..bc6b31e6d2e 100644
--- a/homeassistant/components/hydrawise/switch.py
+++ b/homeassistant/components/hydrawise/switch.py
@@ -7,7 +7,7 @@ from dataclasses import dataclass
 from datetime import timedelta
 from typing import Any
 
-from pydrawise import Hydrawise, Zone
+from pydrawise import HydrawiseBase, Zone
 
 from homeassistant.components.switch import (
     SwitchDeviceClass,
@@ -16,7 +16,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from .const import DEFAULT_WATERING_TIME, DOMAIN
@@ -28,8 +28,8 @@ from .entity import HydrawiseEntity
 class HydrawiseSwitchEntityDescription(SwitchEntityDescription):
     """Describes Hydrawise binary sensor."""
 
-    turn_on_fn: Callable[[Hydrawise, Zone], Coroutine[Any, Any, None]]
-    turn_off_fn: Callable[[Hydrawise, Zone], Coroutine[Any, Any, None]]
+    turn_on_fn: Callable[[HydrawiseBase, Zone], Coroutine[Any, Any, None]]
+    turn_off_fn: Callable[[HydrawiseBase, Zone], Coroutine[Any, Any, None]]
     value_fn: Callable[[Zone], bool]
 
 
@@ -63,7 +63,7 @@ SWITCH_KEYS: list[str] = [desc.key for desc in SWITCH_TYPES]
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Hydrawise switch platform."""
     coordinators: HydrawiseUpdateCoordinators = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/hydrawise/valve.py b/homeassistant/components/hydrawise/valve.py
index 37f196bc054..13aff22ccbf 100644
--- a/homeassistant/components/hydrawise/valve.py
+++ b/homeassistant/components/hydrawise/valve.py
@@ -14,7 +14,7 @@ from homeassistant.components.valve import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import HydrawiseUpdateCoordinators
@@ -31,7 +31,7 @@ VALVE_TYPES: tuple[ValveEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Hydrawise valve platform."""
     coordinators: HydrawiseUpdateCoordinators = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/hyperion/camera.py b/homeassistant/components/hyperion/camera.py
index 23ce2715140..1260be20eb2 100644
--- a/homeassistant/components/hyperion/camera.py
+++ b/homeassistant/components/hyperion/camera.py
@@ -32,7 +32,7 @@ from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import (
     get_hyperion_device_id,
@@ -54,7 +54,7 @@ IMAGE_STREAM_JPG_SENTINEL = "data:image/jpg;base64,"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Hyperion platform from config entry."""
     entry_data = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/hyperion/config_flow.py b/homeassistant/components/hyperion/config_flow.py
index 045fbd986cc..72e76ef8667 100644
--- a/homeassistant/components/hyperion/config_flow.py
+++ b/homeassistant/components/hyperion/config_flow.py
@@ -28,7 +28,7 @@ from homeassistant.const import (
     CONF_TOKEN,
 )
 from homeassistant.core import callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.service_info.ssdp import ATTR_UPNP_SERIAL, SsdpServiceInfo
 
 from . import create_hyperion_client
diff --git a/homeassistant/components/hyperion/light.py b/homeassistant/components/hyperion/light.py
index 5fa129ce7ad..f8932a682ab 100644
--- a/homeassistant/components/hyperion/light.py
+++ b/homeassistant/components/hyperion/light.py
@@ -25,8 +25,8 @@ from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.color as color_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import color as color_util
 
 from . import (
     get_hyperion_device_id,
@@ -76,7 +76,7 @@ ICON_EFFECT = "mdi:lava-lamp"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Hyperion platform from config entry."""
 
diff --git a/homeassistant/components/hyperion/sensor.py b/homeassistant/components/hyperion/sensor.py
index ad972806ae5..42b41acea96 100644
--- a/homeassistant/components/hyperion/sensor.py
+++ b/homeassistant/components/hyperion/sensor.py
@@ -26,7 +26,7 @@ from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import (
     get_hyperion_device_id,
@@ -63,7 +63,7 @@ def _sensor_unique_id(server_id: str, instance_num: int, suffix: str) -> str:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Hyperion platform from config entry."""
     entry_data = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/hyperion/switch.py b/homeassistant/components/hyperion/switch.py
index 94cbf2aba29..8b66783e889 100644
--- a/homeassistant/components/hyperion/switch.py
+++ b/homeassistant/components/hyperion/switch.py
@@ -34,7 +34,7 @@ from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import slugify
 
 from . import (
@@ -90,7 +90,7 @@ def _component_to_translation_key(component: str) -> str:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Hyperion platform from config entry."""
     entry_data = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/ialarm/__init__.py b/homeassistant/components/ialarm/__init__.py
index 95c62b87a19..2484a46f906 100644
--- a/homeassistant/components/ialarm/__init__.py
+++ b/homeassistant/components/ialarm/__init__.py
@@ -29,7 +29,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     except (TimeoutError, ConnectionError) as ex:
         raise ConfigEntryNotReady from ex
 
-    coordinator = IAlarmDataUpdateCoordinator(hass, ialarm, mac)
+    coordinator = IAlarmDataUpdateCoordinator(hass, entry, ialarm, mac)
     await coordinator.async_config_entry_first_refresh()
 
     hass.data.setdefault(DOMAIN, {})
diff --git a/homeassistant/components/ialarm/alarm_control_panel.py b/homeassistant/components/ialarm/alarm_control_panel.py
index 4ae3787dc1d..e203f892c35 100644
--- a/homeassistant/components/ialarm/alarm_control_panel.py
+++ b/homeassistant/components/ialarm/alarm_control_panel.py
@@ -10,7 +10,7 @@ from homeassistant.components.alarm_control_panel import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DATA_COORDINATOR, DOMAIN
@@ -18,7 +18,9 @@ from .coordinator import IAlarmDataUpdateCoordinator
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a iAlarm alarm control panel based on a config entry."""
     coordinator: IAlarmDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
diff --git a/homeassistant/components/ialarm/coordinator.py b/homeassistant/components/ialarm/coordinator.py
index ad0f2298a3b..61e87c36796 100644
--- a/homeassistant/components/ialarm/coordinator.py
+++ b/homeassistant/components/ialarm/coordinator.py
@@ -11,6 +11,7 @@ from homeassistant.components.alarm_control_panel import (
     SCAN_INTERVAL,
     AlarmControlPanelState,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -22,7 +23,11 @@ _LOGGER = logging.getLogger(__name__)
 class IAlarmDataUpdateCoordinator(DataUpdateCoordinator[None]):
     """Class to manage fetching iAlarm data."""
 
-    def __init__(self, hass: HomeAssistant, ialarm: IAlarm, mac: str) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, ialarm: IAlarm, mac: str
+    ) -> None:
         """Initialize global iAlarm data updater."""
         self.ialarm = ialarm
         self.state: AlarmControlPanelState | None = None
@@ -32,6 +37,7 @@ class IAlarmDataUpdateCoordinator(DataUpdateCoordinator[None]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/iammeter/sensor.py b/homeassistant/components/iammeter/sensor.py
index 1069c6696fc..047281bdb27 100644
--- a/homeassistant/components/iammeter/sensor.py
+++ b/homeassistant/components/iammeter/sensor.py
@@ -32,8 +32,12 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-from homeassistant.helpers import debounce, entity_registry as er, update_coordinator
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import (
+    config_validation as cv,
+    debounce,
+    entity_registry as er,
+    update_coordinator,
+)
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/iaqualink/binary_sensor.py b/homeassistant/components/iaqualink/binary_sensor.py
index 9e173dc36e0..8fe9d77fbe8 100644
--- a/homeassistant/components/iaqualink/binary_sensor.py
+++ b/homeassistant/components/iaqualink/binary_sensor.py
@@ -11,7 +11,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN as AQUALINK_DOMAIN
 from .entity import AqualinkEntity
@@ -22,7 +22,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up discovered binary sensors."""
     async_add_entities(
diff --git a/homeassistant/components/iaqualink/climate.py b/homeassistant/components/iaqualink/climate.py
index 53d1bce80de..d30700898c8 100644
--- a/homeassistant/components/iaqualink/climate.py
+++ b/homeassistant/components/iaqualink/climate.py
@@ -18,7 +18,7 @@ from homeassistant.components.climate import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import refresh_system
 from .const import DOMAIN as AQUALINK_DOMAIN
@@ -33,7 +33,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up discovered switches."""
     async_add_entities(
diff --git a/homeassistant/components/iaqualink/light.py b/homeassistant/components/iaqualink/light.py
index 59172c13576..e515c482158 100644
--- a/homeassistant/components/iaqualink/light.py
+++ b/homeassistant/components/iaqualink/light.py
@@ -16,7 +16,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import refresh_system
 from .const import DOMAIN as AQUALINK_DOMAIN
@@ -29,7 +29,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up discovered lights."""
     async_add_entities(
diff --git a/homeassistant/components/iaqualink/sensor.py b/homeassistant/components/iaqualink/sensor.py
index 881adb420bf..1b453f28d8f 100644
--- a/homeassistant/components/iaqualink/sensor.py
+++ b/homeassistant/components/iaqualink/sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN as AQUALINK_DOMAIN
 from .entity import AqualinkEntity
@@ -23,7 +23,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up discovered sensors."""
     async_add_entities(
diff --git a/homeassistant/components/iaqualink/switch.py b/homeassistant/components/iaqualink/switch.py
index 601c5701a4a..e746cbb4f4b 100644
--- a/homeassistant/components/iaqualink/switch.py
+++ b/homeassistant/components/iaqualink/switch.py
@@ -9,7 +9,7 @@ from iaqualink.device import AqualinkSwitch
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN, SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import refresh_system
 from .const import DOMAIN as AQUALINK_DOMAIN
@@ -22,7 +22,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up discovered switches."""
     async_add_entities(
diff --git a/homeassistant/components/ibeacon/config_flow.py b/homeassistant/components/ibeacon/config_flow.py
index c00398e39b0..5850a623ad8 100644
--- a/homeassistant/components/ibeacon/config_flow.py
+++ b/homeassistant/components/ibeacon/config_flow.py
@@ -15,7 +15,7 @@ from homeassistant.config_entries import (
     OptionsFlow,
 )
 from homeassistant.core import callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import VolDictType
 
 from .const import CONF_ALLOW_NAMELESS_UUIDS, DOMAIN
diff --git a/homeassistant/components/ibeacon/device_tracker.py b/homeassistant/components/ibeacon/device_tracker.py
index d002cb10f44..0d2ee0137cc 100644
--- a/homeassistant/components/ibeacon/device_tracker.py
+++ b/homeassistant/components/ibeacon/device_tracker.py
@@ -9,7 +9,7 @@ from homeassistant.components.device_tracker.config_entry import BaseTrackerEnti
 from homeassistant.const import STATE_HOME, STATE_NOT_HOME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import IBeaconConfigEntry
 from .const import SIGNAL_IBEACON_DEVICE_NEW
@@ -20,7 +20,7 @@ from .entity import IBeaconEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: IBeaconConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up device tracker for iBeacon Tracker component."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/ibeacon/sensor.py b/homeassistant/components/ibeacon/sensor.py
index f73aef4b803..7e1fd371128 100644
--- a/homeassistant/components/ibeacon/sensor.py
+++ b/homeassistant/components/ibeacon/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import SIGNAL_STRENGTH_DECIBELS_MILLIWATT, UnitOfLength
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import IBeaconConfigEntry
 from .const import SIGNAL_IBEACON_DEVICE_NEW
@@ -69,7 +69,7 @@ SENSOR_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: IBeaconConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors for iBeacon Tracker component."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/icloud/__init__.py b/homeassistant/components/icloud/__init__.py
index 5bdfd00dc60..4ed66be6a4b 100644
--- a/homeassistant/components/icloud/__init__.py
+++ b/homeassistant/components/icloud/__init__.py
@@ -9,7 +9,7 @@ import voluptuous as vol
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.storage import Store
 from homeassistant.util import slugify
 
diff --git a/homeassistant/components/icloud/device_tracker.py b/homeassistant/components/icloud/device_tracker.py
index 11a18a10020..ca194143852 100644
--- a/homeassistant/components/icloud/device_tracker.py
+++ b/homeassistant/components/icloud/device_tracker.py
@@ -9,7 +9,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .account import IcloudAccount, IcloudDevice
 from .const import (
@@ -21,7 +21,9 @@ from .const import (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up device tracker for iCloud component."""
     account: IcloudAccount = hass.data[DOMAIN][entry.unique_id]
diff --git a/homeassistant/components/icloud/sensor.py b/homeassistant/components/icloud/sensor.py
index 53c9765f6cc..533605b8c7b 100644
--- a/homeassistant/components/icloud/sensor.py
+++ b/homeassistant/components/icloud/sensor.py
@@ -10,7 +10,7 @@ from homeassistant.const import PERCENTAGE
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.icon import icon_for_battery_level
 
 from .account import IcloudAccount, IcloudDevice
@@ -18,7 +18,9 @@ from .const import DOMAIN
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up device tracker for iCloud component."""
     account: IcloudAccount = hass.data[DOMAIN][entry.unique_id]
diff --git a/homeassistant/components/icloud/strings.json b/homeassistant/components/icloud/strings.json
index adc96043d66..fc78e8c2ba6 100644
--- a/homeassistant/components/icloud/strings.json
+++ b/homeassistant/components/icloud/strings.json
@@ -46,7 +46,7 @@
   "services": {
     "update": {
       "name": "Update",
-      "description": "Updates iCloud devices.",
+      "description": "Asks for a state update of all devices linked to an iCloud account.",
       "fields": {
         "account": {
           "name": "Account",
diff --git a/homeassistant/components/idasen_desk/__init__.py b/homeassistant/components/idasen_desk/__init__.py
index 671319e46eb..1ea0efeef72 100644
--- a/homeassistant/components/idasen_desk/__init__.py
+++ b/homeassistant/components/idasen_desk/__init__.py
@@ -9,25 +9,22 @@ from idasen_ha.errors import AuthFailedError
 
 from homeassistant.components import bluetooth
 from homeassistant.components.bluetooth.match import ADDRESS, BluetoothCallbackMatcher
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ADDRESS, EVENT_HOMEASSISTANT_STOP, Platform
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
 
-from .coordinator import IdasenDeskCoordinator
+from .coordinator import IdasenDeskConfigEntry, IdasenDeskCoordinator
 
 PLATFORMS: list[Platform] = [Platform.BUTTON, Platform.COVER, Platform.SENSOR]
 
 _LOGGER = logging.getLogger(__name__)
 
-type IdasenDeskConfigEntry = ConfigEntry[IdasenDeskCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: IdasenDeskConfigEntry) -> bool:
     """Set up IKEA Idasen from a config entry."""
     address: str = entry.data[CONF_ADDRESS].upper()
 
-    coordinator = IdasenDeskCoordinator(hass, entry.title, address)
+    coordinator = IdasenDeskCoordinator(hass, entry, address)
     entry.runtime_data = coordinator
 
     try:
diff --git a/homeassistant/components/idasen_desk/button.py b/homeassistant/components/idasen_desk/button.py
index cd7553da1ac..2e63e5e7cb8 100644
--- a/homeassistant/components/idasen_desk/button.py
+++ b/homeassistant/components/idasen_desk/button.py
@@ -8,9 +8,9 @@ from typing import Any, Final
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import IdasenDeskConfigEntry, IdasenDeskCoordinator
+from .coordinator import IdasenDeskConfigEntry, IdasenDeskCoordinator
 from .entity import IdasenDeskEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -44,7 +44,7 @@ BUTTONS: Final = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: IdasenDeskConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set buttons for device."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/idasen_desk/config_flow.py b/homeassistant/components/idasen_desk/config_flow.py
index 782d4988a3c..aa832fdfe48 100644
--- a/homeassistant/components/idasen_desk/config_flow.py
+++ b/homeassistant/components/idasen_desk/config_flow.py
@@ -87,7 +87,7 @@ class IdasenDeskConfigFlow(ConfigFlow, domain=DOMAIN):
         if discovery := self._discovery_info:
             self._discovered_devices[discovery.address] = discovery
         else:
-            current_addresses = self._async_current_ids()
+            current_addresses = self._async_current_ids(include_ignore=False)
             for discovery in async_discovered_service_info(self.hass):
                 if (
                     discovery.address in current_addresses
diff --git a/homeassistant/components/idasen_desk/coordinator.py b/homeassistant/components/idasen_desk/coordinator.py
index d9e90cfe5ea..5da3d57cf9a 100644
--- a/homeassistant/components/idasen_desk/coordinator.py
+++ b/homeassistant/components/idasen_desk/coordinator.py
@@ -7,24 +7,31 @@ import logging
 from idasen_ha import Desk
 
 from homeassistant.components import bluetooth
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
+type IdasenDeskConfigEntry = ConfigEntry[IdasenDeskCoordinator]
+
 
 class IdasenDeskCoordinator(DataUpdateCoordinator[int | None]):
     """Class to manage updates for the Idasen Desk."""
 
+    config_entry: IdasenDeskConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
-        name: str,
+        config_entry: IdasenDeskConfigEntry,
         address: str,
     ) -> None:
         """Init IdasenDeskCoordinator."""
 
-        super().__init__(hass, _LOGGER, name=name)
+        super().__init__(
+            hass, _LOGGER, config_entry=config_entry, name=config_entry.title
+        )
         self.address = address
         self._expected_connected = False
 
diff --git a/homeassistant/components/idasen_desk/cover.py b/homeassistant/components/idasen_desk/cover.py
index a8ba0983e99..b451f4d0156 100644
--- a/homeassistant/components/idasen_desk/cover.py
+++ b/homeassistant/components/idasen_desk/cover.py
@@ -14,16 +14,16 @@ from homeassistant.components.cover import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import IdasenDeskConfigEntry, IdasenDeskCoordinator
+from .coordinator import IdasenDeskConfigEntry, IdasenDeskCoordinator
 from .entity import IdasenDeskEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: IdasenDeskConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the cover platform for Idasen Desk."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/idasen_desk/entity.py b/homeassistant/components/idasen_desk/entity.py
index bda7afd528c..46730ee13fe 100644
--- a/homeassistant/components/idasen_desk/entity.py
+++ b/homeassistant/components/idasen_desk/entity.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import IdasenDeskCoordinator
+from .coordinator import IdasenDeskCoordinator
 
 
 class IdasenDeskEntity(CoordinatorEntity[IdasenDeskCoordinator]):
diff --git a/homeassistant/components/idasen_desk/sensor.py b/homeassistant/components/idasen_desk/sensor.py
index 4613d316a52..22680b4fa7f 100644
--- a/homeassistant/components/idasen_desk/sensor.py
+++ b/homeassistant/components/idasen_desk/sensor.py
@@ -13,9 +13,9 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import UnitOfLength
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import IdasenDeskConfigEntry, IdasenDeskCoordinator
+from .coordinator import IdasenDeskConfigEntry, IdasenDeskCoordinator
 from .entity import IdasenDeskEntity
 
 
@@ -43,7 +43,7 @@ SENSORS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: IdasenDeskConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Idasen Desk sensors."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/idasen_desk/strings.json b/homeassistant/components/idasen_desk/strings.json
index 7486973638b..ccac87a75e0 100644
--- a/homeassistant/components/idasen_desk/strings.json
+++ b/homeassistant/components/idasen_desk/strings.json
@@ -7,7 +7,7 @@
           "address": "Device"
         },
         "data_description": {
-          "address": "The bluetooth device for the desk."
+          "address": "The Bluetooth device for the desk."
         }
       }
     },
diff --git a/homeassistant/components/idteck_prox/__init__.py b/homeassistant/components/idteck_prox/__init__.py
index 7b92499a197..68969f1eced 100644
--- a/homeassistant/components/idteck_prox/__init__.py
+++ b/homeassistant/components/idteck_prox/__init__.py
@@ -14,7 +14,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.core import Event, HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/ifttt/__init__.py b/homeassistant/components/ifttt/__init__.py
index e3db68e2302..c5682e5a8d9 100644
--- a/homeassistant/components/ifttt/__init__.py
+++ b/homeassistant/components/ifttt/__init__.py
@@ -15,8 +15,7 @@ from homeassistant.components import webhook
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_WEBHOOK_ID
 from homeassistant.core import HomeAssistant, ServiceCall
-from homeassistant.helpers import config_entry_flow
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_entry_flow, config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
diff --git a/homeassistant/components/ifttt/alarm_control_panel.py b/homeassistant/components/ifttt/alarm_control_panel.py
index 739352485bd..f36fe8e672b 100644
--- a/homeassistant/components/ifttt/alarm_control_panel.py
+++ b/homeassistant/components/ifttt/alarm_control_panel.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     CONF_OPTIMISTIC,
 )
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/iglo/light.py b/homeassistant/components/iglo/light.py
index 0d20761c6e5..d356ad05541 100644
--- a/homeassistant/components/iglo/light.py
+++ b/homeassistant/components/iglo/light.py
@@ -20,10 +20,10 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.color as color_util
+from homeassistant.util import color as color_util
 
 DEFAULT_NAME = "iGlo Light"
 DEFAULT_PORT = 8080
diff --git a/homeassistant/components/igloohome/__init__.py b/homeassistant/components/igloohome/__init__.py
index 5e5e21452cf..a3907fcbcf3 100644
--- a/homeassistant/components/igloohome/__init__.py
+++ b/homeassistant/components/igloohome/__init__.py
@@ -19,7 +19,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryError, ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-PLATFORMS: list[Platform] = [Platform.SENSOR]
+PLATFORMS: list[Platform] = [Platform.LOCK, Platform.SENSOR]
 
 
 @dataclass
@@ -35,7 +35,6 @@ type IgloohomeConfigEntry = ConfigEntry[IgloohomeRuntimeData]
 
 async def async_setup_entry(hass: HomeAssistant, entry: IgloohomeConfigEntry) -> bool:
     """Set up igloohome from a config entry."""
-
     authentication = IgloohomeAuth(
         session=async_get_clientsession(hass),
         client_id=entry.data[CONF_CLIENT_ID],
diff --git a/homeassistant/components/igloohome/lock.py b/homeassistant/components/igloohome/lock.py
new file mode 100644
index 00000000000..b434c055145
--- /dev/null
+++ b/homeassistant/components/igloohome/lock.py
@@ -0,0 +1,91 @@
+"""Implementation of the lock platform."""
+
+from datetime import timedelta
+
+from aiohttp import ClientError
+from igloohome_api import (
+    BRIDGE_JOB_LOCK,
+    BRIDGE_JOB_UNLOCK,
+    DEVICE_TYPE_LOCK,
+    Api as IgloohomeApi,
+    ApiException,
+    GetDeviceInfoResponse,
+)
+
+from homeassistant.components.lock import LockEntity, LockEntityFeature
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import IgloohomeConfigEntry
+from .entity import IgloohomeBaseEntity
+from .utils import get_linked_bridge
+
+# Scan interval set to allow Lock entity update the bridge linked to it.
+SCAN_INTERVAL = timedelta(hours=1)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: IgloohomeConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up lock entities."""
+    async_add_entities(
+        IgloohomeLockEntity(
+            api_device_info=device,
+            api=entry.runtime_data.api,
+            bridge_id=str(bridge),
+        )
+        for device in entry.runtime_data.devices
+        if device.type == DEVICE_TYPE_LOCK
+        and (bridge := get_linked_bridge(device.deviceId, entry.runtime_data.devices))
+        is not None
+    )
+
+
+class IgloohomeLockEntity(IgloohomeBaseEntity, LockEntity):
+    """Implementation of a device that has locking capabilities."""
+
+    # Operating on assumed state because there is no API to query the state.
+    _attr_assumed_state = True
+    _attr_supported_features = LockEntityFeature.OPEN
+    _attr_name = None
+
+    def __init__(
+        self, api_device_info: GetDeviceInfoResponse, api: IgloohomeApi, bridge_id: str
+    ) -> None:
+        """Initialize the class."""
+        super().__init__(
+            api_device_info=api_device_info,
+            api=api,
+            unique_key="lock",
+        )
+        self.bridge_id = bridge_id
+
+    async def async_lock(self, **kwargs):
+        """Lock this lock."""
+        try:
+            await self.api.create_bridge_proxied_job(
+                self.api_device_info.deviceId, self.bridge_id, BRIDGE_JOB_LOCK
+            )
+        except (ApiException, ClientError) as err:
+            raise HomeAssistantError from err
+
+    async def async_unlock(self, **kwargs):
+        """Unlock this lock."""
+        try:
+            await self.api.create_bridge_proxied_job(
+                self.api_device_info.deviceId, self.bridge_id, BRIDGE_JOB_UNLOCK
+            )
+        except (ApiException, ClientError) as err:
+            raise HomeAssistantError from err
+
+    async def async_open(self, **kwargs):
+        """Open (unlatch) this lock."""
+        try:
+            await self.api.create_bridge_proxied_job(
+                self.api_device_info.deviceId, self.bridge_id, BRIDGE_JOB_UNLOCK
+            )
+        except (ApiException, ClientError) as err:
+            raise HomeAssistantError from err
diff --git a/homeassistant/components/igloohome/manifest.json b/homeassistant/components/igloohome/manifest.json
index 28e287db2ab..35c58479d75 100644
--- a/homeassistant/components/igloohome/manifest.json
+++ b/homeassistant/components/igloohome/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/igloohome",
   "iot_class": "cloud_polling",
   "quality_scale": "bronze",
-  "requirements": ["igloohome-api==0.0.6"]
+  "requirements": ["igloohome-api==0.1.0"]
 }
diff --git a/homeassistant/components/igloohome/sensor.py b/homeassistant/components/igloohome/sensor.py
index 7f25798e454..10a9ece6771 100644
--- a/homeassistant/components/igloohome/sensor.py
+++ b/homeassistant/components/igloohome/sensor.py
@@ -8,7 +8,7 @@ from igloohome_api import Api as IgloohomeApi, ApiException, GetDeviceInfoRespon
 
 from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import IgloohomeConfigEntry
 from .entity import IgloohomeBaseEntity
@@ -22,7 +22,7 @@ SCAN_INTERVAL = timedelta(hours=1)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: IgloohomeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensor entities."""
 
diff --git a/homeassistant/components/igloohome/utils.py b/homeassistant/components/igloohome/utils.py
new file mode 100644
index 00000000000..be17912b8b8
--- /dev/null
+++ b/homeassistant/components/igloohome/utils.py
@@ -0,0 +1,16 @@
+"""House utility functions."""
+
+from igloohome_api import DEVICE_TYPE_BRIDGE, GetDeviceInfoResponse
+
+
+def get_linked_bridge(
+    device_id: str, devices: list[GetDeviceInfoResponse]
+) -> str | None:
+    """Return the ID of the bridge that is linked to the device. None if no bridge is linked."""
+    bridges = (bridge for bridge in devices if bridge.type == DEVICE_TYPE_BRIDGE)
+    for bridge in bridges:
+        if device_id in (
+            linked_device.deviceId for linked_device in bridge.linkedDevices
+        ):
+            return bridge.deviceId
+    return None
diff --git a/homeassistant/components/ign_sismologia/geo_location.py b/homeassistant/components/ign_sismologia/geo_location.py
index 7076d6a77a9..e99f2b23ca0 100644
--- a/homeassistant/components/ign_sismologia/geo_location.py
+++ b/homeassistant/components/ign_sismologia/geo_location.py
@@ -26,7 +26,7 @@ from homeassistant.const import (
     UnitOfLength,
 )
 from homeassistant.core import Event, HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_connect, dispatcher_send
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import track_time_interval
diff --git a/homeassistant/components/ihc/__init__.py b/homeassistant/components/ihc/__init__.py
index d443ac335db..0fc62301984 100644
--- a/homeassistant/components/ihc/__init__.py
+++ b/homeassistant/components/ihc/__init__.py
@@ -7,7 +7,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_PASSWORD, CONF_URL, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .auto_setup import autosetup_ihc_products
diff --git a/homeassistant/components/ihc/auto_setup.py b/homeassistant/components/ihc/auto_setup.py
index 2d6e59131cd..9b711875167 100644
--- a/homeassistant/components/ihc/auto_setup.py
+++ b/homeassistant/components/ihc/auto_setup.py
@@ -9,8 +9,7 @@ import voluptuous as vol
 from homeassistant.config import load_yaml_config_file
 from homeassistant.const import CONF_TYPE, CONF_UNIT_OF_MEASUREMENT, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 
 from .const import (
     AUTO_SETUP_YAML,
diff --git a/homeassistant/components/ihc/entity.py b/homeassistant/components/ihc/entity.py
index f90b2ee943c..8847ffc9f49 100644
--- a/homeassistant/components/ihc/entity.py
+++ b/homeassistant/components/ihc/entity.py
@@ -54,7 +54,7 @@ class IHCEntity(Entity):
             self.ihc_note = ""
             self.ihc_position = ""
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Add callback for IHC changes."""
         _LOGGER.debug("Adding IHC entity notify event: %s", self.ihc_id)
         self.ihc_controller.add_notify_event(self.ihc_id, self.on_ihc_change, True)
diff --git a/homeassistant/components/ihc/manual_setup.py b/homeassistant/components/ihc/manual_setup.py
index c453494e263..f17920145e7 100644
--- a/homeassistant/components/ihc/manual_setup.py
+++ b/homeassistant/components/ihc/manual_setup.py
@@ -15,8 +15,7 @@ from homeassistant.const import (
     CONF_USERNAME,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
diff --git a/homeassistant/components/ihc/service_functions.py b/homeassistant/components/ihc/service_functions.py
index 61eba4791ac..d5507328e73 100644
--- a/homeassistant/components/ihc/service_functions.py
+++ b/homeassistant/components/ihc/service_functions.py
@@ -3,7 +3,7 @@
 import voluptuous as vol
 
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import (
     ATTR_CONTROLLER_ID,
diff --git a/homeassistant/components/image/__init__.py b/homeassistant/components/image/__init__.py
index 1cf2de278d1..644d335bbca 100644
--- a/homeassistant/components/image/__init__.py
+++ b/homeassistant/components/image/__init__.py
@@ -28,7 +28,7 @@ from homeassistant.core import (
     callback,
 )
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import Entity, EntityDescription
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.event import (
diff --git a/homeassistant/components/image_processing/__init__.py b/homeassistant/components/image_processing/__init__.py
index 0ac8d39813b..06b6bb7a57f 100644
--- a/homeassistant/components/image_processing/__init__.py
+++ b/homeassistant/components/image_processing/__init__.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.config_validation import make_entity_service_schema
 from homeassistant.helpers.entity import Entity, EntityDescription
 from homeassistant.helpers.entity_component import EntityComponent
diff --git a/homeassistant/components/image_upload/__init__.py b/homeassistant/components/image_upload/__init__.py
index 5e9cf8c4e0e..2bf28d13fd2 100644
--- a/homeassistant/components/image_upload/__init__.py
+++ b/homeassistant/components/image_upload/__init__.py
@@ -22,7 +22,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import collection, config_validation as cv
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.typing import ConfigType, VolDictType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN
 
diff --git a/homeassistant/components/imap/__init__.py b/homeassistant/components/imap/__init__.py
index f62edf1451f..5349f249ab3 100644
--- a/homeassistant/components/imap/__init__.py
+++ b/homeassistant/components/imap/__init__.py
@@ -23,7 +23,7 @@ from homeassistant.exceptions import (
     ConfigEntryNotReady,
     ServiceValidationError,
 )
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import CONF_ENABLE_PUSH, DOMAIN
diff --git a/homeassistant/components/imap/coordinator.py b/homeassistant/components/imap/coordinator.py
index 1df107196ff..34d3f43eb69 100644
--- a/homeassistant/components/imap/coordinator.py
+++ b/homeassistant/components/imap/coordinator.py
@@ -241,6 +241,7 @@ class ImapDataUpdateCoordinator(DataUpdateCoordinator[int | None]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             name=DOMAIN,
             update_interval=update_interval,
         )
@@ -279,7 +280,7 @@ class ImapDataUpdateCoordinator(DataUpdateCoordinator[int | None]):
             if self.custom_event_template is not None:
                 try:
                     data["custom"] = self.custom_event_template.async_render(
-                        data, parse_result=True
+                        data | {"text": message.text}, parse_result=True
                     )
                     _LOGGER.debug(
                         "IMAP custom template (%s) for msguid %s (%s) rendered to: %s, initial: %s",
diff --git a/homeassistant/components/imap/manifest.json b/homeassistant/components/imap/manifest.json
index a3370de94ca..515fee0e721 100644
--- a/homeassistant/components/imap/manifest.json
+++ b/homeassistant/components/imap/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/imap",
   "iot_class": "cloud_push",
   "loggers": ["aioimaplib"],
-  "requirements": ["aioimaplib==2.0.0"]
+  "requirements": ["aioimaplib==2.0.1"]
 }
diff --git a/homeassistant/components/imap/sensor.py b/homeassistant/components/imap/sensor.py
index 60892388252..01009e3d17b 100644
--- a/homeassistant/components/imap/sensor.py
+++ b/homeassistant/components/imap/sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import CONF_USERNAME, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import ImapConfigEntry
@@ -30,7 +30,9 @@ IMAP_MAIL_COUNT_DESCRIPTION = SensorEntityDescription(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ImapConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ImapConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Imap sensor."""
 
diff --git a/homeassistant/components/imgw_pib/__init__.py b/homeassistant/components/imgw_pib/__init__.py
index eb12e1a2bb4..4bceee51f8e 100644
--- a/homeassistant/components/imgw_pib/__init__.py
+++ b/homeassistant/components/imgw_pib/__init__.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass
 import logging
 
 from aiohttp import ClientError
@@ -10,7 +9,6 @@ from imgw_pib import ImgwPib
 from imgw_pib.exceptions import ApiError
 
 from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_PLATFORM
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
@@ -18,21 +16,12 @@ from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import CONF_STATION_ID, DOMAIN
-from .coordinator import ImgwPibDataUpdateCoordinator
+from .coordinator import ImgwPibConfigEntry, ImgwPibData, ImgwPibDataUpdateCoordinator
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
 _LOGGER = logging.getLogger(__name__)
 
-type ImgwPibConfigEntry = ConfigEntry[ImgwPibData]
-
-
-@dataclass
-class ImgwPibData:
-    """Data for the IMGW-PIB integration."""
-
-    coordinator: ImgwPibDataUpdateCoordinator
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: ImgwPibConfigEntry) -> bool:
     """Set up IMGW-PIB from a config entry."""
@@ -49,9 +38,16 @@ async def async_setup_entry(hass: HomeAssistant, entry: ImgwPibConfigEntry) -> b
             hydrological_details=False,
         )
     except (ClientError, TimeoutError, ApiError) as err:
-        raise ConfigEntryNotReady from err
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="cannot_connect",
+            translation_placeholders={
+                "entry": entry.title,
+                "error": repr(err),
+            },
+        ) from err
 
-    coordinator = ImgwPibDataUpdateCoordinator(hass, imgwpib, station_id)
+    coordinator = ImgwPibDataUpdateCoordinator(hass, entry, imgwpib, station_id)
     await coordinator.async_config_entry_first_refresh()
 
     # Remove binary_sensor entities for which the endpoint has been blocked by IMGW-PIB API
diff --git a/homeassistant/components/imgw_pib/config_flow.py b/homeassistant/components/imgw_pib/config_flow.py
index 558528fcbef..805bfa2ccb3 100644
--- a/homeassistant/components/imgw_pib/config_flow.py
+++ b/homeassistant/components/imgw_pib/config_flow.py
@@ -50,7 +50,7 @@ class ImgwPibFlowHandler(ConfigFlow, domain=DOMAIN):
                 hydrological_data = await imgwpib.get_hydrological_data()
             except (ClientError, TimeoutError, ApiError):
                 errors["base"] = "cannot_connect"
-            except Exception:  # pylint: disable=broad-except
+            except Exception:
                 _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
diff --git a/homeassistant/components/imgw_pib/coordinator.py b/homeassistant/components/imgw_pib/coordinator.py
index 77a58001a6f..f74878d672c 100644
--- a/homeassistant/components/imgw_pib/coordinator.py
+++ b/homeassistant/components/imgw_pib/coordinator.py
@@ -1,9 +1,13 @@
 """Data Update Coordinator for IMGW-PIB integration."""
 
+from __future__ import annotations
+
+from dataclasses import dataclass
 import logging
 
 from imgw_pib import ApiError, HydrologicalData, ImgwPib
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -13,12 +17,25 @@ from .const import DOMAIN, UPDATE_INTERVAL
 _LOGGER = logging.getLogger(__name__)
 
 
+@dataclass
+class ImgwPibData:
+    """Data for the IMGW-PIB integration."""
+
+    coordinator: ImgwPibDataUpdateCoordinator
+
+
+type ImgwPibConfigEntry = ConfigEntry[ImgwPibData]
+
+
 class ImgwPibDataUpdateCoordinator(DataUpdateCoordinator[HydrologicalData]):
     """Class to manage fetching IMGW-PIB data API."""
 
+    config_entry: ImgwPibConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ImgwPibConfigEntry,
         imgwpib: ImgwPib,
         station_id: str,
     ) -> None:
@@ -33,11 +50,24 @@ class ImgwPibDataUpdateCoordinator(DataUpdateCoordinator[HydrologicalData]):
             configuration_url=f"https://hydro.imgw.pl/#/station/hydro/{station_id}",
         )
 
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=UPDATE_INTERVAL)
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=UPDATE_INTERVAL,
+        )
 
     async def _async_update_data(self) -> HydrologicalData:
         """Update data via internal method."""
         try:
             return await self.imgwpib.get_hydrological_data()
         except ApiError as err:
-            raise UpdateFailed(err) from err
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="update_error",
+                translation_placeholders={
+                    "entry": self.config_entry.title,
+                    "error": repr(err),
+                },
+            ) from err
diff --git a/homeassistant/components/imgw_pib/diagnostics.py b/homeassistant/components/imgw_pib/diagnostics.py
index d135208115f..ce9cb3f9e95 100644
--- a/homeassistant/components/imgw_pib/diagnostics.py
+++ b/homeassistant/components/imgw_pib/diagnostics.py
@@ -7,7 +7,7 @@ from typing import Any
 
 from homeassistant.core import HomeAssistant
 
-from . import ImgwPibConfigEntry
+from .coordinator import ImgwPibConfigEntry
 
 
 async def async_get_config_entry_diagnostics(
diff --git a/homeassistant/components/imgw_pib/manifest.json b/homeassistant/components/imgw_pib/manifest.json
index 0ecc1b4b7d0..3d8b34055fd 100644
--- a/homeassistant/components/imgw_pib/manifest.json
+++ b/homeassistant/components/imgw_pib/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/imgw_pib",
   "iot_class": "cloud_polling",
-  "requirements": ["imgw_pib==1.0.9"]
+  "requirements": ["imgw_pib==1.0.10"]
 }
diff --git a/homeassistant/components/imgw_pib/sensor.py b/homeassistant/components/imgw_pib/sensor.py
index 15043af2015..7871006b2ae 100644
--- a/homeassistant/components/imgw_pib/sensor.py
+++ b/homeassistant/components/imgw_pib/sensor.py
@@ -17,15 +17,15 @@ from homeassistant.components.sensor import (
 from homeassistant.const import UnitOfLength, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import ImgwPibConfigEntry
 from .const import DOMAIN
-from .coordinator import ImgwPibDataUpdateCoordinator
+from .coordinator import ImgwPibConfigEntry, ImgwPibDataUpdateCoordinator
 from .entity import ImgwPibEntity
 
-PARALLEL_UPDATES = 1
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -60,7 +60,7 @@ SENSOR_TYPES: tuple[ImgwPibSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ImgwPibConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add a IMGW-PIB sensor entity from a config_entry."""
     coordinator = entry.runtime_data.coordinator
diff --git a/homeassistant/components/imgw_pib/strings.json b/homeassistant/components/imgw_pib/strings.json
index 9a17dcf7087..33cd3cb3917 100644
--- a/homeassistant/components/imgw_pib/strings.json
+++ b/homeassistant/components/imgw_pib/strings.json
@@ -4,6 +4,9 @@
       "user": {
         "data": {
           "station_id": "Hydrological station"
+        },
+        "data_description": {
+          "station_id": "Select a hydrological station from the list."
         }
       }
     },
@@ -25,5 +28,13 @@
         "name": "Water temperature"
       }
     }
+  },
+  "exceptions": {
+    "cannot_connect": {
+      "message": "An error occurred while connecting to the IMGW-PIB API for {entry}: {error}"
+    },
+    "update_error": {
+      "message": "An error occurred while retrieving data from the IMGW-PIB API for {entry}: {error}"
+    }
   }
 }
diff --git a/homeassistant/components/improv_ble/__init__.py b/homeassistant/components/improv_ble/__init__.py
index 985684cb5b8..ff40b65a8d0 100644
--- a/homeassistant/components/improv_ble/__init__.py
+++ b/homeassistant/components/improv_ble/__init__.py
@@ -1 +1,11 @@
 """The Improv BLE integration."""
+
+from __future__ import annotations
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up improv_ble from a config entry."""
+    raise NotImplementedError
diff --git a/homeassistant/components/improv_ble/config_flow.py b/homeassistant/components/improv_ble/config_flow.py
index 22f2bf3623c..0dcefba6428 100644
--- a/homeassistant/components/improv_ble/config_flow.py
+++ b/homeassistant/components/improv_ble/config_flow.py
@@ -83,12 +83,9 @@ class ImprovBLEConfigFlow(ConfigFlow, domain=DOMAIN):
             self._discovery_info = self._discovered_devices[address]
             return await self.async_step_start_improv()
 
-        current_addresses = self._async_current_ids()
         for discovery in bluetooth.async_discovered_service_info(self.hass):
-            if (
-                discovery.address in current_addresses
-                or discovery.address in self._discovered_devices
-                or not device_filter(discovery.advertisement)
+            if discovery.address in self._discovered_devices or not device_filter(
+                discovery.advertisement
             ):
                 continue
             self._discovered_devices[discovery.address] = discovery
@@ -364,6 +361,18 @@ class ImprovBLEConfigFlow(ConfigFlow, domain=DOMAIN):
         assert self._provision_result is not None
 
         result = self._provision_result
+        if result["type"] == "abort" and result["reason"] in (
+            "provision_successful",
+            "provision_successful_url",
+        ):
+            # Delete ignored config entry, if it exists
+            address = self.context["unique_id"]
+            current_entries = self._async_current_entries(include_ignore=True)
+            for entry in current_entries:
+                if entry.unique_id == address:
+                    _LOGGER.debug("Removing ignored entry: %s", entry)
+                    await self.hass.config_entries.async_remove(entry.entry_id)
+                    break
         self._provision_result = None
         return result
 
diff --git a/homeassistant/components/incomfort/__init__.py b/homeassistant/components/incomfort/__init__.py
index 249a0ae9085..307ff09206f 100644
--- a/homeassistant/components/incomfort/__init__.py
+++ b/homeassistant/components/incomfort/__init__.py
@@ -5,14 +5,18 @@ from __future__ import annotations
 from aiohttp import ClientResponseError
 from incomfortclient import InvalidGateway, InvalidHeaterList
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers import device_registry as dr
 
 from .const import DOMAIN
-from .coordinator import InComfortDataCoordinator, async_connect_gateway
+from .coordinator import (
+    InComfortConfigEntry,
+    InComfortData,
+    InComfortDataCoordinator,
+    async_connect_gateway,
+)
 from .errors import InComfortTimeout, InComfortUnknownError, NoHeaters, NotFound
 
 PLATFORMS = (
@@ -24,7 +28,42 @@ PLATFORMS = (
 
 INTEGRATION_TITLE = "Intergas InComfort/Intouch Lan2RF gateway"
 
-type InComfortConfigEntry = ConfigEntry[InComfortDataCoordinator]
+
+@callback
+def async_cleanup_stale_devices(
+    hass: HomeAssistant,
+    entry: InComfortConfigEntry,
+    data: InComfortData,
+    gateway_device: dr.DeviceEntry,
+) -> None:
+    """Cleanup stale heater devices and climates."""
+    heater_serial_numbers = {heater.serial_no for heater in data.heaters}
+    device_registry = dr.async_get(hass)
+    device_entries = device_registry.devices.get_devices_for_config_entry_id(
+        entry.entry_id
+    )
+    stale_heater_serial_numbers: list[str] = [
+        device_entry.serial_number
+        for device_entry in device_entries
+        if device_entry.id != gateway_device.id
+        and device_entry.serial_number is not None
+        and device_entry.serial_number not in heater_serial_numbers
+    ]
+    if not stale_heater_serial_numbers:
+        return
+    cleanup_devices: list[str] = []
+    # Find stale heater and climate devices
+    for serial_number in stale_heater_serial_numbers:
+        cleanup_list = [f"{serial_number}_{index}" for index in range(1, 4)]
+        cleanup_list.append(serial_number)
+        cleanup_identifiers = [{(DOMAIN, cleanup_id)} for cleanup_id in cleanup_list]
+        cleanup_devices.extend(
+            device_entry.id
+            for device_entry in device_entries
+            if device_entry.identifiers in cleanup_identifiers
+        )
+    for device_id in cleanup_devices:
+        device_registry.async_remove_device(device_id)
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: InComfortConfigEntry) -> bool:
@@ -46,7 +85,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: InComfortConfigEntry) ->
 
     # Register discovered gateway device
     device_registry = dr.async_get(hass)
-    device_registry.async_get_or_create(
+    gateway_device = device_registry.async_get_or_create(
         config_entry_id=entry.entry_id,
         identifiers={(DOMAIN, entry.entry_id)},
         connections={(dr.CONNECTION_NETWORK_MAC, entry.unique_id)}
@@ -55,7 +94,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: InComfortConfigEntry) ->
         manufacturer="Intergas",
         name="RFGateway",
     )
-    coordinator = InComfortDataCoordinator(hass, data, entry.entry_id)
+    async_cleanup_stale_devices(hass, entry, data, gateway_device)
+    coordinator = InComfortDataCoordinator(hass, entry, data)
     entry.runtime_data = coordinator
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/incomfort/binary_sensor.py b/homeassistant/components/incomfort/binary_sensor.py
index e4353e457a5..356cee82e57 100644
--- a/homeassistant/components/incomfort/binary_sensor.py
+++ b/homeassistant/components/incomfort/binary_sensor.py
@@ -15,10 +15,9 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import InComfortConfigEntry
-from .coordinator import InComfortDataCoordinator
+from .coordinator import InComfortConfigEntry, InComfortDataCoordinator
 from .entity import IncomfortBoilerEntity
 
 PARALLEL_UPDATES = 0
@@ -71,7 +70,7 @@ SENSOR_TYPES: tuple[IncomfortBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: InComfortConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up an InComfort/InTouch binary_sensor entity."""
     incomfort_coordinator = entry.runtime_data
diff --git a/homeassistant/components/incomfort/climate.py b/homeassistant/components/incomfort/climate.py
index f814b1fb1f5..d44ba15507e 100644
--- a/homeassistant/components/incomfort/climate.py
+++ b/homeassistant/components/incomfort/climate.py
@@ -15,11 +15,10 @@ from homeassistant.components.climate import (
 from homeassistant.const import ATTR_TEMPERATURE, EntityCategory, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import InComfortConfigEntry
 from .const import CONF_LEGACY_SETPOINT_STATUS, DOMAIN
-from .coordinator import InComfortDataCoordinator
+from .coordinator import InComfortConfigEntry, InComfortDataCoordinator
 from .entity import IncomfortEntity
 
 PARALLEL_UPDATES = 1
@@ -28,7 +27,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: InComfortConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up InComfort/InTouch climate devices."""
     incomfort_coordinator = entry.runtime_data
@@ -74,7 +73,10 @@ class InComfortClimate(IncomfortEntity, ClimateEntity):
             name=f"Thermostat {room.room_no}",
         )
         if coordinator.unique_id:
-            self._attr_device_info["via_device"] = (DOMAIN, coordinator.unique_id)
+            self._attr_device_info["via_device"] = (
+                DOMAIN,
+                coordinator.config_entry.entry_id,
+            )
 
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
diff --git a/homeassistant/components/incomfort/config_flow.py b/homeassistant/components/incomfort/config_flow.py
index 8e4a5f72619..027c3ad4691 100644
--- a/homeassistant/components/incomfort/config_flow.py
+++ b/homeassistant/components/incomfort/config_flow.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
+import logging
 from typing import Any
 
 from incomfortclient import InvalidGateway, InvalidHeaterList
@@ -28,10 +29,10 @@ from homeassistant.helpers.selector import (
 )
 from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 
-from . import InComfortConfigEntry
 from .const import CONF_LEGACY_SETPOINT_STATUS, DOMAIN
-from .coordinator import async_connect_gateway
+from .coordinator import InComfortConfigEntry, async_connect_gateway
 
+_LOGGER = logging.getLogger(__name__)
 TITLE = "Intergas InComfort/Intouch Lan2RF gateway"
 
 CONFIG_SCHEMA = vol.Schema(
@@ -89,7 +90,8 @@ async def async_try_connect_gateway(
         return {"base": "no_heaters"}
     except TimeoutError:
         return {"base": "timeout_error"}
-    except Exception:  # noqa: BLE001
+    except Exception:
+        _LOGGER.exception("Unexpected exception")
         return {"base": "unknown"}
 
     return None
diff --git a/homeassistant/components/incomfort/coordinator.py b/homeassistant/components/incomfort/coordinator.py
index 3436d40298a..5c72b9daa06 100644
--- a/homeassistant/components/incomfort/coordinator.py
+++ b/homeassistant/components/incomfort/coordinator.py
@@ -12,12 +12,15 @@ from incomfortclient import (
     InvalidHeaterList,
 )
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryError
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
+type InComfortConfigEntry = ConfigEntry[InComfortDataCoordinator]
+
 _LOGGER = logging.getLogger(__name__)
 
 UPDATE_INTERVAL = 30
@@ -50,14 +53,20 @@ async def async_connect_gateway(
 class InComfortDataCoordinator(DataUpdateCoordinator[InComfortData]):
     """Data coordinator for InComfort entities."""
 
+    config_entry: InComfortConfigEntry
+
     def __init__(
-        self, hass: HomeAssistant, incomfort_data: InComfortData, unique_id: str | None
+        self,
+        hass: HomeAssistant,
+        config_entry: InComfortConfigEntry,
+        incomfort_data: InComfortData,
     ) -> None:
         """Initialize coordinator."""
-        self.unique_id = unique_id
+        self.unique_id = config_entry.unique_id
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="InComfort datacoordinator",
             update_interval=timedelta(seconds=UPDATE_INTERVAL),
         )
diff --git a/homeassistant/components/incomfort/diagnostics.py b/homeassistant/components/incomfort/diagnostics.py
index a2f89a94f58..4d7af14eac7 100644
--- a/homeassistant/components/incomfort/diagnostics.py
+++ b/homeassistant/components/incomfort/diagnostics.py
@@ -8,7 +8,7 @@ from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_PASSWORD
 from homeassistant.core import HomeAssistant, callback
 
-from . import InComfortConfigEntry
+from .coordinator import InComfortConfigEntry
 
 REDACT_CONFIG = {CONF_PASSWORD}
 
diff --git a/homeassistant/components/incomfort/entity.py b/homeassistant/components/incomfort/entity.py
index 1924c91376b..1e0d357e8e0 100644
--- a/homeassistant/components/incomfort/entity.py
+++ b/homeassistant/components/incomfort/entity.py
@@ -29,4 +29,7 @@ class IncomfortBoilerEntity(IncomfortEntity):
             serial_number=heater.serial_no,
         )
         if coordinator.unique_id:
-            self._attr_device_info["via_device"] = (DOMAIN, coordinator.unique_id)
+            self._attr_device_info["via_device"] = (
+                DOMAIN,
+                coordinator.config_entry.entry_id,
+            )
diff --git a/homeassistant/components/incomfort/manifest.json b/homeassistant/components/incomfort/manifest.json
index f4d752bfa48..825f198dd30 100644
--- a/homeassistant/components/incomfort/manifest.json
+++ b/homeassistant/components/incomfort/manifest.json
@@ -1,6 +1,6 @@
 {
   "domain": "incomfort",
-  "name": "Intergas InComfort/Intouch Lan2RF gateway",
+  "name": "Intergas gateway",
   "codeowners": ["@jbouwh"],
   "config_flow": true,
   "dhcp": [
@@ -10,5 +10,6 @@
   "documentation": "https://www.home-assistant.io/integrations/incomfort",
   "iot_class": "local_polling",
   "loggers": ["incomfortclient"],
+  "quality_scale": "platinum",
   "requirements": ["incomfort-client==0.6.7"]
 }
diff --git a/homeassistant/components/incomfort/quality_scale.yaml b/homeassistant/components/incomfort/quality_scale.yaml
new file mode 100644
index 00000000000..f5af3c9d061
--- /dev/null
+++ b/homeassistant/components/incomfort/quality_scale.yaml
@@ -0,0 +1,77 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: |
+      No actions implemented.
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: |
+      No actions implemented.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup:
+    status: done
+    comment: |
+      Entities are set up dand updated through the datacoordimator.
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+  # Silver
+  config-entry-unloading: done
+  log-when-unavailable: done
+  entity-unavailable: done
+  action-exceptions: done
+  reauthentication-flow: done
+  parallel-updates: done
+  test-coverage: done
+  integration-owner: done
+  docs-installation-parameters: done
+  docs-configuration-parameters: done
+
+  # Gold
+  entity-translations: done
+  entity-device-class: done
+  devices: done
+  entity-category: done
+  entity-disabled-by-default: done
+  discovery: done
+  stale-devices:
+    status: exempt
+    comment: >
+      There is a maximum of 3 heaters that can be discovered by the gateway.
+      The user must remove manually any heeater devices that have been replaced.
+  diagnostics: done
+  exception-translations: done
+  icon-translations: done
+  reconfiguration-flow: done
+  dynamic-devices: done
+  discovery-update-info: done
+  repair-issues:
+    status: exempt
+    comment: |
+      No current issues to repair.
+  docs-use-cases: done
+  docs-supported-devices: done
+  docs-supported-functions: done
+  docs-data-update: done
+  docs-known-limitations:
+    status: done
+    comment: There are no known limmitations,
+  docs-troubleshooting: done
+  docs-examples: done
+
+  # Platinum
+  async-dependency: done
+  inject-websession: done
+  strict-typing: done
diff --git a/homeassistant/components/incomfort/sensor.py b/homeassistant/components/incomfort/sensor.py
index e3f3fc785b2..e344fb01aae 100644
--- a/homeassistant/components/incomfort/sensor.py
+++ b/homeassistant/components/incomfort/sensor.py
@@ -15,11 +15,10 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import EntityCategory, UnitOfPressure, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import InComfortConfigEntry
-from .coordinator import InComfortDataCoordinator
+from .coordinator import InComfortConfigEntry, InComfortDataCoordinator
 from .entity import IncomfortBoilerEntity
 
 PARALLEL_UPDATES = 0
@@ -68,7 +67,7 @@ SENSOR_TYPES: tuple[IncomfortSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: InComfortConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up InComfort/InTouch sensor entities."""
     incomfort_coordinator = entry.runtime_data
diff --git a/homeassistant/components/incomfort/strings.json b/homeassistant/components/incomfort/strings.json
index 4c47d4c57ad..73ba88078a8 100644
--- a/homeassistant/components/incomfort/strings.json
+++ b/homeassistant/components/incomfort/strings.json
@@ -2,20 +2,20 @@
   "config": {
     "step": {
       "user": {
-        "description": "Set up new Intergas InComfort Lan2RF Gateway, some older systems might not need credentials to be set up. For newer devices authentication is required.",
+        "description": "Set up new Intergas gateway. Note that some older systems might not accept credentials to be set up. For newer devices authentication is required.",
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]"
         },
         "data_description": {
-          "host": "Hostname or IP-address of the Intergas InComfort Lan2RF Gateway.",
+          "host": "Hostname or IP-address of the Intergas gateway.",
           "username": "The username to log into the gateway. This is `admin` in most cases.",
-          "password": "The password to log into the gateway, is printed at the bottom of the Lan2RF Gateway or is `intergas` for some older devices."
+          "password": "The password to log into the gateway, is printed at the bottom of the gateway or is `intergas` for some older devices."
         }
       },
       "dhcp_auth": {
-        "title": "Set up Intergas InComfort Lan2RF Gateway",
+        "title": "Set up Intergas gateway",
         "description": "Please enter authentication details for gateway {host}",
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
@@ -23,12 +23,12 @@
         },
         "data_description": {
           "username": "The username to log into the gateway. This is `admin` in most cases.",
-          "password": "The password to log into the gateway, is printed at the bottom of the Lan2RF Gateway or is `intergas` for some older devices."
+          "password": "The password to log into the gateway, is printed at the bottom of the Gateway or is `intergas` for some older devices."
         }
       },
       "dhcp_confirm": {
-        "title": "Set up Intergas InComfort Lan2RF Gateway",
-        "description": "Do you want to set up the discovered Intergas InComfort Lan2RF Gateway ({host})?"
+        "title": "Set up Intergas gateway",
+        "description": "Do you want to set up the discovered Intergas gateway ({host})?"
       },
       "reauth_confirm": {
         "data": {
@@ -48,9 +48,9 @@
     "error": {
       "auth_error": "Invalid credentials.",
       "no_heaters": "No heaters found.",
-      "not_found": "No Lan2RF gateway found.",
-      "timeout_error": "Time out when connecting to Lan2RF gateway.",
-      "unknown": "Unknown error when connecting to Lan2RF gateway."
+      "not_found": "No gateway found.",
+      "timeout_error": "Time out when connecting to the gateway.",
+      "unknown": "Unknown error when connecting to the gateway."
     }
   },
   "exceptions": {
@@ -70,7 +70,7 @@
   "options": {
     "step": {
       "init": {
-        "title": "Intergas InComfort Lan2RF Gateway options",
+        "title": "Intergas gateway options",
         "data": {
           "legacy_setpoint_status": "Legacy setpoint handling"
         },
diff --git a/homeassistant/components/incomfort/water_heater.py b/homeassistant/components/incomfort/water_heater.py
index 0ab4a6a06b8..2a2c7cc47da 100644
--- a/homeassistant/components/incomfort/water_heater.py
+++ b/homeassistant/components/incomfort/water_heater.py
@@ -10,10 +10,9 @@ from incomfortclient import Heater as InComfortHeater
 from homeassistant.components.water_heater import WaterHeaterEntity
 from homeassistant.const import EntityCategory, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import InComfortConfigEntry
-from .coordinator import InComfortDataCoordinator
+from .coordinator import InComfortConfigEntry, InComfortDataCoordinator
 from .entity import IncomfortBoilerEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -26,7 +25,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: InComfortConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up an InComfort/InTouch water_heater device."""
     incomfort_coordinator = entry.runtime_data
diff --git a/homeassistant/components/influxdb/__init__.py b/homeassistant/components/influxdb/__init__.py
index b1c0cc53d61..95a94cf8fa0 100644
--- a/homeassistant/components/influxdb/__init__.py
+++ b/homeassistant/components/influxdb/__init__.py
@@ -40,8 +40,11 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import Event, HomeAssistant, State, callback
-from homeassistant.helpers import event as event_helper, state as state_helper
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import (
+    config_validation as cv,
+    event as event_helper,
+    state as state_helper,
+)
 from homeassistant.helpers.entity_values import EntityValues
 from homeassistant.helpers.entityfilter import (
     INCLUDE_EXCLUDE_BASE_FILTER_SCHEMA,
diff --git a/homeassistant/components/influxdb/const.py b/homeassistant/components/influxdb/const.py
index cab9d1e4c41..78cb7908eec 100644
--- a/homeassistant/components/influxdb/const.py
+++ b/homeassistant/components/influxdb/const.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
     CONF_USERNAME,
     CONF_VERIFY_SSL,
 )
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 CONF_DB_NAME = "database"
 CONF_BUCKET = "bucket"
diff --git a/homeassistant/components/influxdb/sensor.py b/homeassistant/components/influxdb/sensor.py
index cc601888f56..30319416a61 100644
--- a/homeassistant/components/influxdb/sensor.py
+++ b/homeassistant/components/influxdb/sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady, TemplateError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/inkbird/__init__.py b/homeassistant/components/inkbird/__init__.py
index c715c64599a..9dd058e841a 100644
--- a/homeassistant/components/inkbird/__init__.py
+++ b/homeassistant/components/inkbird/__init__.py
@@ -4,17 +4,20 @@ from __future__ import annotations
 
 import logging
 
-from inkbird_ble import INKBIRDBluetoothDeviceData
+from inkbird_ble import INKBIRDBluetoothDeviceData, SensorUpdate
 
-from homeassistant.components.bluetooth import BluetoothScanningMode
+from homeassistant.components.bluetooth import (
+    BluetoothScanningMode,
+    BluetoothServiceInfo,
+)
 from homeassistant.components.bluetooth.passive_update_processor import (
     PassiveBluetoothProcessorCoordinator,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 
-from .const import DOMAIN
+from .const import CONF_DEVICE_TYPE, DOMAIN
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
@@ -25,20 +28,33 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up INKBIRD BLE device from a config entry."""
     address = entry.unique_id
     assert address is not None
-    data = INKBIRDBluetoothDeviceData()
-    coordinator = hass.data.setdefault(DOMAIN, {})[entry.entry_id] = (
-        PassiveBluetoothProcessorCoordinator(
-            hass,
-            _LOGGER,
-            address=address,
-            mode=BluetoothScanningMode.ACTIVE,
-            update_method=data.update,
-        )
+    device_type: str | None = entry.data.get(CONF_DEVICE_TYPE)
+    data = INKBIRDBluetoothDeviceData(device_type)
+
+    @callback
+    def _async_on_update(service_info: BluetoothServiceInfo) -> SensorUpdate:
+        """Handle update callback from the passive BLE processor."""
+        nonlocal device_type
+        update = data.update(service_info)
+        if device_type is None and data.device_type is not None:
+            device_type_str = str(data.device_type)
+            hass.config_entries.async_update_entry(
+                entry, data={**entry.data, CONF_DEVICE_TYPE: device_type_str}
+            )
+            device_type = device_type_str
+        return update
+
+    coordinator = PassiveBluetoothProcessorCoordinator(
+        hass,
+        _LOGGER,
+        address=address,
+        mode=BluetoothScanningMode.ACTIVE,
+        update_method=_async_on_update,
     )
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-    entry.async_on_unload(
-        coordinator.async_start()
-    )  # only start after all platforms have had a chance to subscribe
+    # only start after all platforms have had a chance to subscribe
+    entry.async_on_unload(coordinator.async_start())
     return True
 
 
diff --git a/homeassistant/components/inkbird/config_flow.py b/homeassistant/components/inkbird/config_flow.py
index 0d4e404c9b5..09dd31a9cf6 100644
--- a/homeassistant/components/inkbird/config_flow.py
+++ b/homeassistant/components/inkbird/config_flow.py
@@ -72,7 +72,7 @@ class INKBIRDConfigFlow(ConfigFlow, domain=DOMAIN):
                 title=self._discovered_devices[address], data={}
             )
 
-        current_addresses = self._async_current_ids()
+        current_addresses = self._async_current_ids(include_ignore=False)
         for discovery_info in async_discovered_service_info(self.hass, False):
             address = discovery_info.address
             if address in current_addresses or address in self._discovered_devices:
diff --git a/homeassistant/components/inkbird/const.py b/homeassistant/components/inkbird/const.py
index 9d0e1638958..93fdcc7519c 100644
--- a/homeassistant/components/inkbird/const.py
+++ b/homeassistant/components/inkbird/const.py
@@ -1,3 +1,5 @@
 """Constants for the INKBIRD Bluetooth integration."""
 
 DOMAIN = "inkbird"
+
+CONF_DEVICE_TYPE = "device_type"
diff --git a/homeassistant/components/inkbird/manifest.json b/homeassistant/components/inkbird/manifest.json
index c1922004317..aaa9c4b3473 100644
--- a/homeassistant/components/inkbird/manifest.json
+++ b/homeassistant/components/inkbird/manifest.json
@@ -21,6 +21,18 @@
     {
       "local_name": "tps",
       "connectable": false
+    },
+    {
+      "local_name": "ITH-11-B",
+      "connectable": false
+    },
+    {
+      "local_name": "ITH-13-B",
+      "connectable": false
+    },
+    {
+      "local_name": "ITH-21-B",
+      "connectable": false
     }
   ],
   "codeowners": ["@bdraco"],
@@ -28,5 +40,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/inkbird",
   "iot_class": "local_push",
-  "requirements": ["inkbird-ble==0.5.8"]
+  "requirements": ["inkbird-ble==0.9.0"]
 }
diff --git a/homeassistant/components/inkbird/sensor.py b/homeassistant/components/inkbird/sensor.py
index 05b2ebbafa0..efda28b110d 100644
--- a/homeassistant/components/inkbird/sensor.py
+++ b/homeassistant/components/inkbird/sensor.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from .const import DOMAIN
@@ -98,7 +98,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the INKBIRD BLE sensors."""
     coordinator: PassiveBluetoothProcessorCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/input_boolean/__init__.py b/homeassistant/components/input_boolean/__init__.py
index 54457ab2fb7..a0a7514eaaf 100644
--- a/homeassistant/components/input_boolean/__init__.py
+++ b/homeassistant/components/input_boolean/__init__.py
@@ -19,8 +19,7 @@ from homeassistant.const import (
     STATE_ON,
 )
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.helpers import collection
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import collection, config_validation as cv
 from homeassistant.helpers.entity import ToggleEntity
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.restore_state import RestoreEntity
diff --git a/homeassistant/components/input_button/__init__.py b/homeassistant/components/input_button/__init__.py
index 69ff235948d..12bc98f7674 100644
--- a/homeassistant/components/input_button/__init__.py
+++ b/homeassistant/components/input_button/__init__.py
@@ -16,8 +16,7 @@ from homeassistant.const import (
     SERVICE_RELOAD,
 )
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.helpers import collection
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import collection, config_validation as cv
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.restore_state import RestoreEntity
 import homeassistant.helpers.service
diff --git a/homeassistant/components/input_datetime/__init__.py b/homeassistant/components/input_datetime/__init__.py
index 428ffccb7c1..60f882c2726 100644
--- a/homeassistant/components/input_datetime/__init__.py
+++ b/homeassistant/components/input_datetime/__init__.py
@@ -18,8 +18,7 @@ from homeassistant.const import (
     SERVICE_RELOAD,
 )
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.helpers import collection
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import collection, config_validation as cv
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.restore_state import RestoreEntity
 import homeassistant.helpers.service
diff --git a/homeassistant/components/input_number/__init__.py b/homeassistant/components/input_number/__init__.py
index d52bfedfe77..3352b55442a 100644
--- a/homeassistant/components/input_number/__init__.py
+++ b/homeassistant/components/input_number/__init__.py
@@ -19,8 +19,7 @@ from homeassistant.const import (
     SERVICE_RELOAD,
 )
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.helpers import collection
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import collection, config_validation as cv
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.restore_state import RestoreEntity
 import homeassistant.helpers.service
diff --git a/homeassistant/components/input_select/__init__.py b/homeassistant/components/input_select/__init__.py
index a117cf0a867..171998c02bc 100644
--- a/homeassistant/components/input_select/__init__.py
+++ b/homeassistant/components/input_select/__init__.py
@@ -27,8 +27,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import collection
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import collection, config_validation as cv
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.restore_state import RestoreEntity
 import homeassistant.helpers.service
diff --git a/homeassistant/components/input_select/strings.json b/homeassistant/components/input_select/strings.json
index faa47c979a1..72fd50f7ec7 100644
--- a/homeassistant/components/input_select/strings.json
+++ b/homeassistant/components/input_select/strings.json
@@ -20,7 +20,7 @@
   "services": {
     "select_next": {
       "name": "Next",
-      "description": "Select the next option.",
+      "description": "Selects the next option.",
       "fields": {
         "cycle": {
           "name": "Cycle",
@@ -44,7 +44,7 @@
       "fields": {
         "cycle": {
           "name": "[%key:component::input_select::services::select_next::fields::cycle::name%]",
-          "description": "[%key:component::input_select::services::select_next::fields::cycle::description%]"
+          "description": "If the option should cycle from the first to the last option on the list."
         }
       }
     },
diff --git a/homeassistant/components/input_text/__init__.py b/homeassistant/components/input_text/__init__.py
index 7d8f6663673..998bf35cd82 100644
--- a/homeassistant/components/input_text/__init__.py
+++ b/homeassistant/components/input_text/__init__.py
@@ -18,8 +18,7 @@ from homeassistant.const import (
     SERVICE_RELOAD,
 )
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.helpers import collection
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import collection, config_validation as cv
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.restore_state import RestoreEntity
 import homeassistant.helpers.service
diff --git a/homeassistant/components/insteon/api/properties.py b/homeassistant/components/insteon/api/properties.py
index 4d36f1d71e5..ac633e2a457 100644
--- a/homeassistant/components/insteon/api/properties.py
+++ b/homeassistant/components/insteon/api/properties.py
@@ -22,7 +22,7 @@ import voluptuous_serialize
 
 from homeassistant.components import websocket_api
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from ..const import (
     DEVICE_ADDRESS,
diff --git a/homeassistant/components/insteon/binary_sensor.py b/homeassistant/components/insteon/binary_sensor.py
index abb26b7f8e8..887c8fb64a3 100644
--- a/homeassistant/components/insteon/binary_sensor.py
+++ b/homeassistant/components/insteon/binary_sensor.py
@@ -22,7 +22,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import SIGNAL_ADD_ENTITIES
 from .entity import InsteonEntity
@@ -46,7 +46,7 @@ SENSOR_TYPES = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Insteon binary sensors from a config entry."""
 
diff --git a/homeassistant/components/insteon/climate.py b/homeassistant/components/insteon/climate.py
index 506841e7efb..eb33e3ab88c 100644
--- a/homeassistant/components/insteon/climate.py
+++ b/homeassistant/components/insteon/climate.py
@@ -20,7 +20,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, Platform, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import SIGNAL_ADD_ENTITIES
 from .entity import InsteonEntity
@@ -55,7 +55,7 @@ FAN_MODES = {4: FAN_AUTO, 8: FAN_ONLY}
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Insteon climate entities from a config entry."""
 
diff --git a/homeassistant/components/insteon/cover.py b/homeassistant/components/insteon/cover.py
index fe4f484798d..679ee67a1de 100644
--- a/homeassistant/components/insteon/cover.py
+++ b/homeassistant/components/insteon/cover.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import SIGNAL_ADD_ENTITIES
 from .entity import InsteonEntity
@@ -22,7 +22,7 @@ from .utils import async_add_insteon_devices, async_add_insteon_entities
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Insteon covers from a config entry."""
 
diff --git a/homeassistant/components/insteon/entity.py b/homeassistant/components/insteon/entity.py
index 79e5c18a934..b7886723fdf 100644
--- a/homeassistant/components/insteon/entity.py
+++ b/homeassistant/components/insteon/entity.py
@@ -109,7 +109,7 @@ class InsteonEntity(Entity):
         )
         self.async_write_ha_state()
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Register INSTEON update events."""
         _LOGGER.debug(
             "Tracking updates for device %s group %d name %s",
@@ -137,7 +137,7 @@ class InsteonEntity(Entity):
             )
         )
 
-    async def async_will_remove_from_hass(self):
+    async def async_will_remove_from_hass(self) -> None:
         """Unsubscribe to INSTEON update events."""
         _LOGGER.debug(
             "Remove tracking updates for device %s group %d name %s",
diff --git a/homeassistant/components/insteon/fan.py b/homeassistant/components/insteon/fan.py
index 0f1c70b9ea8..f4e0abf3d54 100644
--- a/homeassistant/components/insteon/fan.py
+++ b/homeassistant/components/insteon/fan.py
@@ -10,7 +10,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
     ranged_value_to_percentage,
@@ -26,7 +26,7 @@ SPEED_RANGE = (1, 255)  # off is not included
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Insteon fans from a config entry."""
 
diff --git a/homeassistant/components/insteon/light.py b/homeassistant/components/insteon/light.py
index d19f3cca34a..e4f09fe5689 100644
--- a/homeassistant/components/insteon/light.py
+++ b/homeassistant/components/insteon/light.py
@@ -10,7 +10,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import SIGNAL_ADD_ENTITIES
 from .entity import InsteonEntity
@@ -22,7 +22,7 @@ MAX_BRIGHTNESS = 255
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Insteon lights from a config entry."""
 
diff --git a/homeassistant/components/insteon/lock.py b/homeassistant/components/insteon/lock.py
index d5f30eacbac..787b0c583cc 100644
--- a/homeassistant/components/insteon/lock.py
+++ b/homeassistant/components/insteon/lock.py
@@ -7,7 +7,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import SIGNAL_ADD_ENTITIES
 from .entity import InsteonEntity
@@ -17,7 +17,7 @@ from .utils import async_add_insteon_devices, async_add_insteon_entities
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Insteon locks from a config entry."""
 
diff --git a/homeassistant/components/insteon/schemas.py b/homeassistant/components/insteon/schemas.py
index 4cf8d49d170..70458dc5d6f 100644
--- a/homeassistant/components/insteon/schemas.py
+++ b/homeassistant/components/insteon/schemas.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
     CONF_USERNAME,
     ENTITY_MATCH_ALL,
 )
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import (
     CONF_CAT,
diff --git a/homeassistant/components/insteon/strings.json b/homeassistant/components/insteon/strings.json
index 4a8aadb70db..3a15d667ca7 100644
--- a/homeassistant/components/insteon/strings.json
+++ b/homeassistant/components/insteon/strings.json
@@ -111,7 +111,7 @@
   },
   "services": {
     "add_all_link": {
-      "name": "Add all link",
+      "name": "Add All-Link",
       "description": "Tells the Insteon Modem (IM) start All-Linking mode. Once the IM is in All-Linking mode, press the link button on the device to complete All-Linking.",
       "fields": {
         "group": {
@@ -120,13 +120,13 @@
         },
         "mode": {
           "name": "[%key:common::config_flow::data::mode%]",
-          "description": "Linking mode   controller - IM is controller   responder - IM is responder."
+          "description": "Linking mode of the Insteon Modem."
         }
       }
     },
     "delete_all_link": {
-      "name": "Delete all link",
-      "description": "Tells the Insteon Modem (IM) to remove an All-Link record from the All-Link Database of the IM and a device. Once the IM is set to delete the link, press the link button on the corresponding device to complete the process.",
+      "name": "Delete All-Link",
+      "description": "Tells the Insteon Modem (IM) to remove an All-Link record from the All-Link database of the IM and a device. Once the IM is set to delete the link, press the link button on the corresponding device to complete the process.",
       "fields": {
         "group": {
           "name": "Group",
@@ -135,8 +135,8 @@
       }
     },
     "load_all_link_database": {
-      "name": "Load all link database",
-      "description": "Load the All-Link Database for a device. WARNING - Loading a device All-LInk database is very time consuming and inconsistent. This may take a LONG time and may need to be repeated to obtain all records.",
+      "name": "Load All-Link database",
+      "description": "Loads the All-Link database for a device. WARNING - Loading a device All-Link database is very time consuming and inconsistent. This may take a LONG time and may need to be repeated to obtain all records.",
       "fields": {
         "entity_id": {
           "name": "Entity",
@@ -144,13 +144,13 @@
         },
         "reload": {
           "name": "[%key:common::action::reload%]",
-          "description": "Reloads all records. If true the current records are cleared from memory (does not effect the device) and the records are reloaded. If false the existing records are left in place and only missing records are added. Default is false."
+          "description": "If enabled, all current records are cleared from memory (does not effect the device) and reloaded. Otherwise the existing records are left in place and only missing records are added."
         }
       }
     },
     "print_all_link_database": {
-      "name": "Print all link database",
-      "description": "Prints the All-Link Database for a device. Requires that the All-Link Database is loaded into memory.",
+      "name": "Print All-Link database",
+      "description": "Prints the All-Link database for a device. Requires that the All-Link database is loaded into memory.",
       "fields": {
         "entity_id": {
           "name": "Entity",
@@ -159,8 +159,8 @@
       }
     },
     "print_im_all_link_database": {
-      "name": "Print IM all link database",
-      "description": "Prints the All-Link Database for the INSTEON Modem (IM)."
+      "name": "Print IM All-Link database",
+      "description": "Prints the All-Link database for the INSTEON Modem (IM)."
     },
     "x10_all_units_off": {
       "name": "X10 all units off",
diff --git a/homeassistant/components/insteon/switch.py b/homeassistant/components/insteon/switch.py
index 67ce5fa8c0d..e3f7cf3d7a9 100644
--- a/homeassistant/components/insteon/switch.py
+++ b/homeassistant/components/insteon/switch.py
@@ -7,7 +7,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import SIGNAL_ADD_ENTITIES
 from .entity import InsteonEntity
@@ -17,7 +17,7 @@ from .utils import async_add_insteon_devices, async_add_insteon_entities
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Insteon switches from a config entry."""
 
diff --git a/homeassistant/components/insteon/utils.py b/homeassistant/components/insteon/utils.py
index 5b1d6379328..4ee859934d2 100644
--- a/homeassistant/components/insteon/utils.py
+++ b/homeassistant/components/insteon/utils.py
@@ -43,7 +43,7 @@ from homeassistant.helpers.dispatcher import (
     async_dispatcher_send,
     dispatcher_send,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CONF_CAT,
@@ -415,7 +415,7 @@ def async_add_insteon_entities(
     hass: HomeAssistant,
     platform: Platform,
     entity_type: type[InsteonEntity],
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     discovery_info: dict[str, Any],
 ) -> None:
     """Add an Insteon group to a platform."""
@@ -432,7 +432,7 @@ def async_add_insteon_devices(
     hass: HomeAssistant,
     platform: Platform,
     entity_type: type[InsteonEntity],
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add all entities to a platform."""
     for address in devices:
diff --git a/homeassistant/components/integration/sensor.py b/homeassistant/components/integration/sensor.py
index 27aa74d0785..df5342111a7 100644
--- a/homeassistant/components/integration/sensor.py
+++ b/homeassistant/components/integration/sensor.py
@@ -42,7 +42,10 @@ from homeassistant.core import (
 from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.device import async_device_info_to_link_from_entity
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.event import (
     async_call_later,
     async_track_state_change_event,
@@ -234,7 +237,7 @@ class IntegrationSensorExtraStoredData(SensorExtraStoredData):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize Integration - Riemann sum integral config entry."""
     registry = er.async_get(hass)
diff --git a/homeassistant/components/intellifire/__init__.py b/homeassistant/components/intellifire/__init__.py
index ce78f1a6fa3..cda30820a2f 100644
--- a/homeassistant/components/intellifire/__init__.py
+++ b/homeassistant/components/intellifire/__init__.py
@@ -128,9 +128,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         ) from err
 
     # Construct coordinator
-    data_update_coordinator = IntellifireDataUpdateCoordinator(
-        hass=hass, fireplace=fireplace
-    )
+    data_update_coordinator = IntellifireDataUpdateCoordinator(hass, entry, fireplace)
 
     LOGGER.debug("Fireplace to Initialized - Awaiting first refresh")
     await data_update_coordinator.async_config_entry_first_refresh()
diff --git a/homeassistant/components/intellifire/binary_sensor.py b/homeassistant/components/intellifire/binary_sensor.py
index 7d00bdfc26d..3da1d2e3dc0 100644
--- a/homeassistant/components/intellifire/binary_sensor.py
+++ b/homeassistant/components/intellifire/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import IntellifireDataUpdateCoordinator
 from .const import DOMAIN
@@ -152,7 +152,7 @@ INTELLIFIRE_BINARY_SENSORS: tuple[IntellifireBinarySensorEntityDescription, ...]
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a IntelliFire On/Off Sensor."""
     coordinator: IntellifireDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/intellifire/climate.py b/homeassistant/components/intellifire/climate.py
index f72df254424..f067f2a849d 100644
--- a/homeassistant/components/intellifire/climate.py
+++ b/homeassistant/components/intellifire/climate.py
@@ -13,7 +13,7 @@ from homeassistant.components.climate import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import IntellifireDataUpdateCoordinator
 from .const import DEFAULT_THERMOSTAT_TEMP, DOMAIN, LOGGER
@@ -27,7 +27,7 @@ INTELLIFIRE_CLIMATES: tuple[ClimateEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Configure the fan entry.."""
     coordinator: IntellifireDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/intellifire/coordinator.py b/homeassistant/components/intellifire/coordinator.py
index b4f03f4b5c8..6a23e7438db 100644
--- a/homeassistant/components/intellifire/coordinator.py
+++ b/homeassistant/components/intellifire/coordinator.py
@@ -9,6 +9,7 @@ from intellifire4py.control import IntelliFireController
 from intellifire4py.model import IntelliFirePollData
 from intellifire4py.read import IntelliFireDataProvider
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
@@ -19,15 +20,19 @@ from .const import DOMAIN, LOGGER
 class IntellifireDataUpdateCoordinator(DataUpdateCoordinator[IntelliFirePollData]):
     """Class to manage the polling of the fireplace API."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         fireplace: UnifiedFireplace,
     ) -> None:
         """Initialize the Coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=15),
         )
diff --git a/homeassistant/components/intellifire/fan.py b/homeassistant/components/intellifire/fan.py
index c5bec07faaa..174d964d357 100644
--- a/homeassistant/components/intellifire/fan.py
+++ b/homeassistant/components/intellifire/fan.py
@@ -17,7 +17,7 @@ from homeassistant.components.fan import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
     ranged_value_to_percentage,
@@ -58,7 +58,7 @@ INTELLIFIRE_FANS: tuple[IntellifireFanEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the fans."""
     coordinator: IntellifireDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/intellifire/light.py b/homeassistant/components/intellifire/light.py
index 5f25b5de823..0cf5c7774ed 100644
--- a/homeassistant/components/intellifire/light.py
+++ b/homeassistant/components/intellifire/light.py
@@ -17,7 +17,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, LOGGER
 from .coordinator import IntellifireDataUpdateCoordinator
@@ -85,7 +85,7 @@ class IntellifireLight(IntellifireEntity, LightEntity):
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the fans."""
     coordinator: IntellifireDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/intellifire/number.py b/homeassistant/components/intellifire/number.py
index 17ed3b7bd27..0776835833e 100644
--- a/homeassistant/components/intellifire/number.py
+++ b/homeassistant/components/intellifire/number.py
@@ -11,7 +11,7 @@ from homeassistant.components.number import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, LOGGER
 from .coordinator import IntellifireDataUpdateCoordinator
@@ -21,7 +21,7 @@ from .entity import IntellifireEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the fans."""
     coordinator: IntellifireDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/intellifire/sensor.py b/homeassistant/components/intellifire/sensor.py
index eaff89d08e7..7763fb1b9b2 100644
--- a/homeassistant/components/intellifire/sensor.py
+++ b/homeassistant/components/intellifire/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.dt import utcnow
 
 from .const import DOMAIN
@@ -141,7 +141,9 @@ INTELLIFIRE_SENSORS: tuple[IntellifireSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Define setup entry call."""
 
diff --git a/homeassistant/components/intellifire/switch.py b/homeassistant/components/intellifire/switch.py
index ac6096497b6..2185ad47cae 100644
--- a/homeassistant/components/intellifire/switch.py
+++ b/homeassistant/components/intellifire/switch.py
@@ -9,7 +9,7 @@ from typing import Any
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import IntellifireDataUpdateCoordinator
 from .const import DOMAIN
@@ -53,7 +53,7 @@ INTELLIFIRE_SWITCHES: tuple[IntellifireSwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Configure switch entities."""
     coordinator: IntellifireDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/intent/__init__.py b/homeassistant/components/intent/__init__.py
index a1451f8fcca..922fa376903 100644
--- a/homeassistant/components/intent/__init__.py
+++ b/homeassistant/components/intent/__init__.py
@@ -2,13 +2,15 @@
 
 from __future__ import annotations
 
+from collections.abc import Collection
 import logging
 from typing import Any, Protocol
 
 from aiohttp import web
 import voluptuous as vol
 
-from homeassistant.components import http
+from homeassistant.components import http, sensor
+from homeassistant.components.climate import DOMAIN as CLIMATE_DOMAIN
 from homeassistant.components.cover import (
     ATTR_POSITION,
     DOMAIN as COVER_DOMAIN,
@@ -39,7 +41,12 @@ from homeassistant.const import (
     SERVICE_TURN_ON,
 )
 from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, State
-from homeassistant.helpers import config_validation as cv, integration_platform, intent
+from homeassistant.helpers import (
+    area_registry as ar,
+    config_validation as cv,
+    integration_platform,
+    intent,
+)
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import dt as dt_util
 
@@ -140,6 +147,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     intent.async_register(hass, GetCurrentDateIntentHandler())
     intent.async_register(hass, GetCurrentTimeIntentHandler())
     intent.async_register(hass, RespondIntentHandler())
+    intent.async_register(hass, GetTemperatureIntent())
 
     return True
 
@@ -444,6 +452,109 @@ class RespondIntentHandler(intent.IntentHandler):
         return response
 
 
+class GetTemperatureIntent(intent.IntentHandler):
+    """Handle GetTemperature intents."""
+
+    intent_type = intent.INTENT_GET_TEMPERATURE
+    description = "Gets the current temperature of a climate device or entity"
+    slot_schema = {
+        vol.Optional("area"): intent.non_empty_string,
+        vol.Optional("name"): intent.non_empty_string,
+        vol.Optional("floor"): intent.non_empty_string,
+        vol.Optional("preferred_area_id"): cv.string,
+        vol.Optional("preferred_floor_id"): cv.string,
+    }
+    platforms = {CLIMATE_DOMAIN}
+
+    async def async_handle(self, intent_obj: intent.Intent) -> intent.IntentResponse:
+        """Handle the intent."""
+        hass = intent_obj.hass
+        slots = self.async_validate_slots(intent_obj.slots)
+
+        name: str | None = None
+        if "name" in slots:
+            name = slots["name"]["value"]
+
+        area: str | None = None
+        if "area" in slots:
+            area = slots["area"]["value"]
+
+        floor_name: str | None = None
+        if "floor" in slots:
+            floor_name = slots["floor"]["value"]
+
+        match_preferences = intent.MatchTargetsPreferences(
+            area_id=slots.get("preferred_area_id", {}).get("value"),
+            floor_id=slots.get("preferred_floor_id", {}).get("value"),
+        )
+
+        if (not name) and (area or match_preferences.area_id):
+            # Look for temperature sensors assigned to an area
+            area_registry = ar.async_get(hass)
+            area_temperature_ids: dict[str, str] = {}
+
+            # Keep candidates that are registered as area temperature sensors
+            def area_candidate_filter(
+                candidate: intent.MatchTargetsCandidate,
+                possible_area_ids: Collection[str],
+            ) -> bool:
+                for area_id in possible_area_ids:
+                    temperature_id = area_temperature_ids.get(area_id)
+                    if (temperature_id is None) and (
+                        area_entry := area_registry.async_get_area(area_id)
+                    ):
+                        temperature_id = area_entry.temperature_entity_id or ""
+                        area_temperature_ids[area_id] = temperature_id
+
+                    if candidate.state.entity_id == temperature_id:
+                        return True
+
+                return False
+
+            match_constraints = intent.MatchTargetsConstraints(
+                area_name=area,
+                floor_name=floor_name,
+                domains=[sensor.DOMAIN],
+                device_classes=[sensor.SensorDeviceClass.TEMPERATURE],
+                assistant=intent_obj.assistant,
+                single_target=True,
+            )
+            match_result = intent.async_match_targets(
+                hass,
+                match_constraints,
+                match_preferences,
+                area_candidate_filter=area_candidate_filter,
+            )
+            if match_result.is_match:
+                # Found temperature sensor
+                response = intent_obj.create_response()
+                response.response_type = intent.IntentResponseType.QUERY_ANSWER
+                response.async_set_states(matched_states=match_result.states)
+                return response
+
+        # Look for climate devices
+        match_constraints = intent.MatchTargetsConstraints(
+            name=name,
+            area_name=area,
+            floor_name=floor_name,
+            domains=[CLIMATE_DOMAIN],
+            assistant=intent_obj.assistant,
+            single_target=True,
+        )
+        match_result = intent.async_match_targets(
+            hass, match_constraints, match_preferences
+        )
+        if not match_result.is_match:
+            raise intent.MatchFailedError(
+                result=match_result, constraints=match_constraints
+            )
+
+        response = intent_obj.create_response()
+        response.response_type = intent.IntentResponseType.QUERY_ANSWER
+        response.async_set_states(matched_states=match_result.states)
+        return response
+
+
 async def _async_process_intent(
     hass: HomeAssistant, domain: str, platform: IntentPlatformProtocol
 ) -> None:
diff --git a/homeassistant/components/intesishome/climate.py b/homeassistant/components/intesishome/climate.py
index 1a1f58a6b80..a04a6ee6377 100644
--- a/homeassistant/components/intesishome/climate.py
+++ b/homeassistant/components/intesishome/climate.py
@@ -32,8 +32,8 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/iometer/__init__.py b/homeassistant/components/iometer/__init__.py
new file mode 100644
index 00000000000..feb7ce9b8cf
--- /dev/null
+++ b/homeassistant/components/iometer/__init__.py
@@ -0,0 +1,39 @@
+"""The IOmeter integration."""
+
+from __future__ import annotations
+
+from iometer import IOmeterClient, IOmeterConnectionError
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+
+from .coordinator import IOmeterConfigEntry, IOMeterCoordinator
+
+PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: IOmeterConfigEntry) -> bool:
+    """Set up IOmeter from a config entry."""
+
+    host = entry.data[CONF_HOST]
+    session = async_get_clientsession(hass)
+    client = IOmeterClient(host=host, session=session)
+    try:
+        await client.get_current_status()
+    except IOmeterConnectionError as err:
+        raise ConfigEntryNotReady from err
+
+    coordinator = IOMeterCoordinator(hass, entry, client)
+    await coordinator.async_config_entry_first_refresh()
+    entry.runtime_data = coordinator
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/iometer/binary_sensor.py b/homeassistant/components/iometer/binary_sensor.py
new file mode 100644
index 00000000000..f443c4ae94a
--- /dev/null
+++ b/homeassistant/components/iometer/binary_sensor.py
@@ -0,0 +1,87 @@
+"""IOmeter binary sensor."""
+
+from collections.abc import Callable
+from dataclasses import dataclass
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDeviceClass,
+    BinarySensorEntity,
+    BinarySensorEntityDescription,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import IOMeterCoordinator, IOmeterData
+from .entity import IOmeterEntity
+
+
+@dataclass(frozen=True, kw_only=True)
+class IOmeterBinarySensorDescription(BinarySensorEntityDescription):
+    """Describes Iometer binary sensor entity."""
+
+    value_fn: Callable[[IOmeterData], bool | None]
+
+
+SENSOR_TYPES: list[IOmeterBinarySensorDescription] = [
+    IOmeterBinarySensorDescription(
+        key="connection_status",
+        translation_key="connection_status",
+        device_class=BinarySensorDeviceClass.CONNECTIVITY,
+        entity_registry_enabled_default=False,
+        value_fn=lambda data: (
+            data.status.device.core.connection_status == "connected"
+            if data.status.device.core.connection_status is not None
+            else None
+        ),
+    ),
+    IOmeterBinarySensorDescription(
+        key="attachment_status",
+        translation_key="attachment_status",
+        device_class=BinarySensorDeviceClass.CONNECTIVITY,
+        entity_registry_enabled_default=False,
+        value_fn=lambda data: (
+            data.status.device.core.attachment_status == "attached"
+            if data.status.device.core.attachment_status is not None
+            else None
+        ),
+    ),
+]
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the Sensors."""
+    coordinator: IOMeterCoordinator = config_entry.runtime_data
+
+    async_add_entities(
+        IOmeterBinarySensor(
+            coordinator=coordinator,
+            description=description,
+        )
+        for description in SENSOR_TYPES
+    )
+
+
+class IOmeterBinarySensor(IOmeterEntity, BinarySensorEntity):
+    """Defines a IOmeter binary sensor."""
+
+    entity_description: IOmeterBinarySensorDescription
+
+    def __init__(
+        self,
+        coordinator: IOMeterCoordinator,
+        description: IOmeterBinarySensorDescription,
+    ) -> None:
+        """Initialize the sensor."""
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._attr_unique_id = f"{coordinator.identifier}_{description.key}"
+
+    @property
+    def is_on(self) -> bool | None:
+        """Return the binary sensor state."""
+        return self.entity_description.value_fn(self.coordinator.data)
diff --git a/homeassistant/components/iometer/config_flow.py b/homeassistant/components/iometer/config_flow.py
new file mode 100644
index 00000000000..ee03d09abf7
--- /dev/null
+++ b/homeassistant/components/iometer/config_flow.py
@@ -0,0 +1,91 @@
+"""Config flow for the IOmeter integration."""
+
+from typing import Any, Final
+
+from iometer import IOmeterClient, IOmeterConnectionError
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.const import CONF_HOST
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
+
+from .const import DOMAIN
+
+CONFIG_SCHEMA: Final = vol.Schema({vol.Required(CONF_HOST): str})
+
+
+class IOMeterConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handles the config flow for a IOmeter bridge and core."""
+
+    def __init__(self) -> None:
+        """Initialize the config flow."""
+        self._host: str
+        self._meter_number: str
+
+    async def async_step_zeroconf(
+        self, discovery_info: ZeroconfServiceInfo
+    ) -> ConfigFlowResult:
+        """Handle zeroconf discovery."""
+        self._host = host = discovery_info.host
+        self._async_abort_entries_match({CONF_HOST: host})
+
+        session = async_get_clientsession(self.hass)
+        client = IOmeterClient(host=host, session=session)
+        try:
+            status = await client.get_current_status()
+        except IOmeterConnectionError:
+            return self.async_abort(reason="cannot_connect")
+
+        self._meter_number = status.meter.number
+
+        await self.async_set_unique_id(status.device.id)
+        self._abort_if_unique_id_configured()
+
+        self.context["title_placeholders"] = {"name": f"IOmeter {self._meter_number}"}
+        return await self.async_step_zeroconf_confirm()
+
+    async def async_step_zeroconf_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Confirm discovery."""
+        if user_input is not None:
+            return await self._async_create_entry()
+
+        self._set_confirm_only()
+        return self.async_show_form(
+            step_id="zeroconf_confirm",
+            description_placeholders={"meter_number": self._meter_number},
+        )
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the initial configuration."""
+        errors: dict[str, str] = {}
+
+        if user_input is not None:
+            self._host = user_input[CONF_HOST]
+            session = async_get_clientsession(self.hass)
+            client = IOmeterClient(host=self._host, session=session)
+            try:
+                status = await client.get_current_status()
+            except IOmeterConnectionError:
+                errors["base"] = "cannot_connect"
+            else:
+                self._meter_number = status.meter.number
+                await self.async_set_unique_id(status.device.id)
+                self._abort_if_unique_id_configured()
+                return await self._async_create_entry()
+        return self.async_show_form(
+            step_id="user",
+            data_schema=CONFIG_SCHEMA,
+            errors=errors,
+        )
+
+    async def _async_create_entry(self) -> ConfigFlowResult:
+        """Create entry."""
+        return self.async_create_entry(
+            title=f"IOmeter {self._meter_number}",
+            data={CONF_HOST: self._host},
+        )
diff --git a/homeassistant/components/iometer/const.py b/homeassistant/components/iometer/const.py
new file mode 100644
index 00000000000..797aefcd7f0
--- /dev/null
+++ b/homeassistant/components/iometer/const.py
@@ -0,0 +1,5 @@
+"""Constants for the IOmeter integration."""
+
+from typing import Final
+
+DOMAIN: Final = "iometer"
diff --git a/homeassistant/components/iometer/coordinator.py b/homeassistant/components/iometer/coordinator.py
new file mode 100644
index 00000000000..4050341151b
--- /dev/null
+++ b/homeassistant/components/iometer/coordinator.py
@@ -0,0 +1,76 @@
+"""DataUpdateCoordinator for IOmeter."""
+
+from dataclasses import dataclass
+from datetime import timedelta
+import logging
+
+from iometer import IOmeterClient, IOmeterConnectionError, Reading, Status
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+DEFAULT_SCAN_INTERVAL = timedelta(seconds=10)
+
+type IOmeterConfigEntry = ConfigEntry[IOMeterCoordinator]
+
+
+@dataclass
+class IOmeterData:
+    """Class for data update."""
+
+    reading: Reading
+    status: Status
+
+
+class IOMeterCoordinator(DataUpdateCoordinator[IOmeterData]):
+    """Class to manage fetching IOmeter data."""
+
+    config_entry: IOmeterConfigEntry
+    client: IOmeterClient
+    current_fw_version: str = ""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: IOmeterConfigEntry,
+        client: IOmeterClient,
+    ) -> None:
+        """Initialize coordinator."""
+
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=DEFAULT_SCAN_INTERVAL,
+        )
+        self.client = client
+        self.identifier = config_entry.entry_id
+
+    async def _async_update_data(self) -> IOmeterData:
+        """Update data async."""
+        try:
+            reading = await self.client.get_current_reading()
+            status = await self.client.get_current_status()
+        except IOmeterConnectionError as error:
+            raise UpdateFailed(f"Error communicating with IOmeter: {error}") from error
+
+        fw_version = f"{status.device.core.version}/{status.device.bridge.version}"
+        if self.current_fw_version and fw_version != self.current_fw_version:
+            device_registry = dr.async_get(self.hass)
+            device_entry = device_registry.async_get_device(
+                identifiers={(DOMAIN, status.device.id)}
+            )
+            assert device_entry
+            device_registry.async_update_device(
+                device_entry.id,
+                sw_version=fw_version,
+            )
+        self.current_fw_version = fw_version
+
+        return IOmeterData(reading=reading, status=status)
diff --git a/homeassistant/components/iometer/entity.py b/homeassistant/components/iometer/entity.py
new file mode 100644
index 00000000000..a52ef1c66ed
--- /dev/null
+++ b/homeassistant/components/iometer/entity.py
@@ -0,0 +1,24 @@
+"""Base class for IOmeter entities."""
+
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+from .coordinator import IOMeterCoordinator
+
+
+class IOmeterEntity(CoordinatorEntity[IOMeterCoordinator]):
+    """Defines a base IOmeter entity."""
+
+    _attr_has_entity_name = True
+
+    def __init__(self, coordinator: IOMeterCoordinator) -> None:
+        """Initialize IOmeter entity."""
+        super().__init__(coordinator)
+        status = coordinator.data.status
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, status.device.id)},
+            manufacturer="IOmeter GmbH",
+            model="IOmeter",
+            sw_version=coordinator.current_fw_version,
+        )
diff --git a/homeassistant/components/iometer/icons.json b/homeassistant/components/iometer/icons.json
new file mode 100644
index 00000000000..8c71684f859
--- /dev/null
+++ b/homeassistant/components/iometer/icons.json
@@ -0,0 +1,38 @@
+{
+  "entity": {
+    "sensor": {
+      "attachment_status": {
+        "default": "mdi:eye",
+        "state": {
+          "attached": "mdi:check-bold",
+          "detached": "mdi:close",
+          "unknown": "mdi:help"
+        }
+      },
+      "connection_status": {
+        "default": "mdi:eye",
+        "state": {
+          "connected": "mdi:check-bold",
+          "disconnected": "mdi:close",
+          "unknown": "mdi:help"
+        }
+      },
+      "pin_status": {
+        "default": "mdi:eye",
+        "state": {
+          "entered": "mdi:lock-open",
+          "pending": "mdi:lock-clock",
+          "missing": "mdi:lock",
+          "unknown": "mdi:help"
+        }
+      },
+      "power_status": {
+        "default": "mdi:eye",
+        "state": {
+          "battery": "mdi:battery",
+          "wired": "mdi:power-plug"
+        }
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/iometer/manifest.json b/homeassistant/components/iometer/manifest.json
new file mode 100644
index 00000000000..061a2318e04
--- /dev/null
+++ b/homeassistant/components/iometer/manifest.json
@@ -0,0 +1,12 @@
+{
+  "domain": "iometer",
+  "name": "IOmeter",
+  "codeowners": ["@MaestroOnICe"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/iometer",
+  "integration_type": "device",
+  "iot_class": "local_polling",
+  "quality_scale": "bronze",
+  "requirements": ["iometer==0.1.0"],
+  "zeroconf": ["_iometer._tcp.local."]
+}
diff --git a/homeassistant/components/iometer/quality_scale.yaml b/homeassistant/components/iometer/quality_scale.yaml
new file mode 100644
index 00000000000..71496d8043c
--- /dev/null
+++ b/homeassistant/components/iometer/quality_scale.yaml
@@ -0,0 +1,74 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: This integration does not provide additional actions.
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: This integration does not provide additional actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup:
+    status: exempt
+    comment: This integration does not register any events.
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions:
+    status: exempt
+    comment: This integration does not provide additional actions.
+  config-entry-unloading: done
+  docs-configuration-parameters:
+    status: exempt
+    comment: This integration has not option flow.
+  docs-installation-parameters: done
+  entity-unavailable: done
+  integration-owner: done
+  log-when-unavailable: done
+  parallel-updates:
+    status: exempt
+    comment: This integration polls data using a coordinator, there is no need for parallel updates.
+  reauthentication-flow:
+    status: exempt
+    comment: This integration requires no authentication.
+  test-coverage: todo
+
+  # Gold
+  devices: todo
+  diagnostics: todo
+  discovery-update-info: todo
+  discovery: done
+  docs-data-update: todo
+  docs-examples: todo
+  docs-known-limitations: todo
+  docs-supported-devices: todo
+  docs-supported-functions: todo
+  docs-troubleshooting: todo
+  docs-use-cases: todo
+  dynamic-devices: todo
+  entity-category: done
+  entity-device-class: done
+  entity-disabled-by-default: done
+  entity-translations: done
+  exception-translations: todo
+  icon-translations: todo
+  reconfiguration-flow: todo
+  repair-issues: todo
+  stale-devices: todo
+
+  # Platinum
+  async-dependency: done
+  inject-websession: done
+  strict-typing: todo
diff --git a/homeassistant/components/iometer/sensor.py b/homeassistant/components/iometer/sensor.py
new file mode 100644
index 00000000000..3dff3cc6ea9
--- /dev/null
+++ b/homeassistant/components/iometer/sensor.py
@@ -0,0 +1,146 @@
+"""IOmeter sensors."""
+
+from collections.abc import Callable
+from dataclasses import dataclass
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    PERCENTAGE,
+    SIGNAL_STRENGTH_DECIBELS,
+    STATE_UNKNOWN,
+    EntityCategory,
+    UnitOfEnergy,
+    UnitOfPower,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.typing import StateType
+
+from .coordinator import IOMeterCoordinator, IOmeterData
+from .entity import IOmeterEntity
+
+
+@dataclass(frozen=True, kw_only=True)
+class IOmeterEntityDescription(SensorEntityDescription):
+    """Describes IOmeter sensor entity."""
+
+    value_fn: Callable[[IOmeterData], str | int | float]
+
+
+SENSOR_TYPES: list[IOmeterEntityDescription] = [
+    IOmeterEntityDescription(
+        key="meter_number",
+        translation_key="meter_number",
+        icon="mdi:meter-electric",
+        value_fn=lambda data: data.status.meter.number,
+    ),
+    IOmeterEntityDescription(
+        key="wifi_rssi",
+        translation_key="wifi_rssi",
+        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
+        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda data: data.status.device.bridge.rssi,
+    ),
+    IOmeterEntityDescription(
+        key="core_bridge_rssi",
+        translation_key="core_bridge_rssi",
+        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
+        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda data: data.status.device.core.rssi,
+    ),
+    IOmeterEntityDescription(
+        key="power_status",
+        translation_key="power_status",
+        device_class=SensorDeviceClass.ENUM,
+        options=["battery", "wired", "unknown"],
+        value_fn=lambda data: data.status.device.core.power_status or STATE_UNKNOWN,
+    ),
+    IOmeterEntityDescription(
+        key="battery_level",
+        translation_key="battery_level",
+        native_unit_of_measurement=PERCENTAGE,
+        device_class=SensorDeviceClass.BATTERY,
+        state_class=SensorStateClass.MEASUREMENT,
+        value_fn=lambda data: data.status.device.core.battery_level,
+    ),
+    IOmeterEntityDescription(
+        key="pin_status",
+        translation_key="pin_status",
+        device_class=SensorDeviceClass.ENUM,
+        options=["entered", "pending", "missing", "unknown"],
+        value_fn=lambda data: data.status.device.core.pin_status or STATE_UNKNOWN,
+    ),
+    IOmeterEntityDescription(
+        key="total_consumption",
+        translation_key="total_consumption",
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL,
+        value_fn=lambda data: data.reading.get_total_consumption(),
+    ),
+    IOmeterEntityDescription(
+        key="total_production",
+        translation_key="total_production",
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL,
+        value_fn=lambda data: data.reading.get_total_production(),
+    ),
+    IOmeterEntityDescription(
+        key="power",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        value_fn=lambda data: data.reading.get_current_power(),
+    ),
+]
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the Sensors."""
+    coordinator: IOMeterCoordinator = config_entry.runtime_data
+
+    async_add_entities(
+        IOmeterSensor(
+            coordinator=coordinator,
+            description=description,
+        )
+        for description in SENSOR_TYPES
+    )
+
+
+class IOmeterSensor(IOmeterEntity, SensorEntity):
+    """Defines a IOmeter sensor."""
+
+    entity_description: IOmeterEntityDescription
+
+    def __init__(
+        self,
+        coordinator: IOMeterCoordinator,
+        description: IOmeterEntityDescription,
+    ) -> None:
+        """Initialize the sensor."""
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._attr_unique_id = f"{coordinator.identifier}_{description.key}"
+
+    @property
+    def native_value(self) -> StateType:
+        """Return the sensor value."""
+        return self.entity_description.value_fn(self.coordinator.data)
diff --git a/homeassistant/components/iometer/strings.json b/homeassistant/components/iometer/strings.json
new file mode 100644
index 00000000000..b3878dd1b53
--- /dev/null
+++ b/homeassistant/components/iometer/strings.json
@@ -0,0 +1,73 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "description": "Setup your IOmeter device for local data",
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]"
+        },
+        "data_description": {
+          "host": "The hostname or IP address of the IOmeter device to connect to."
+        }
+      },
+      "zeroconf_confirm": {
+        "title": "Discovered IOmeter",
+        "description": "Do you want to set up IOmeter on the meter with meter number: {meter_number}?"
+      }
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "Unexpected error"
+    }
+  },
+  "entity": {
+    "sensor": {
+      "battery_level": {
+        "name": "Battery level"
+      },
+      "meter_number": {
+        "name": "Meter number"
+      },
+      "pin_status": {
+        "name": "PIN status",
+        "state": {
+          "entered": "Entered",
+          "pending": "Pending",
+          "missing": "Missing",
+          "unknown": "Unknown"
+        }
+      },
+      "power_status": {
+        "name": "Power supply",
+        "state": {
+          "battery": "Battery",
+          "wired": "Wired"
+        }
+      },
+      "total_consumption": {
+        "name": "Total consumption"
+      },
+      "total_production": {
+        "name": "Total production"
+      },
+      "core_bridge_rssi": {
+        "name": "Signal strength Core/Bridge"
+      },
+      "wifi_rssi": {
+        "name": "Signal strength Wi-Fi"
+      }
+    },
+    "binary_sensor": {
+      "connection_status": {
+        "name": "Core/Bridge connection status"
+      },
+      "attachment_status": {
+        "name": "Core attachment status"
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/ios/notify.py b/homeassistant/components/ios/notify.py
index b5bd0aea58f..cf70a97f52a 100644
--- a/homeassistant/components/ios/notify.py
+++ b/homeassistant/components/ios/notify.py
@@ -18,7 +18,7 @@ from homeassistant.components.notify import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import device_name_for_push_id, devices_with_push, enabled_push_ids
 
diff --git a/homeassistant/components/ios/sensor.py b/homeassistant/components/ios/sensor.py
index a97c2145919..a3c9876a884 100644
--- a/homeassistant/components/ios/sensor.py
+++ b/homeassistant/components/ios/sensor.py
@@ -14,7 +14,10 @@ from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.icon import icon_for_battery_level
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
@@ -64,7 +67,7 @@ def setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up iOS from a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/iotawatt/coordinator.py b/homeassistant/components/iotawatt/coordinator.py
index 4f9ac1f94b7..13802ebdd76 100644
--- a/homeassistant/components/iotawatt/coordinator.py
+++ b/homeassistant/components/iotawatt/coordinator.py
@@ -26,13 +26,14 @@ class IotawattUpdater(DataUpdateCoordinator):
     """Class to manage fetching update data from the IoTaWatt Energy Device."""
 
     api: Iotawatt | None = None
+    config_entry: ConfigEntry
 
     def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
         """Initialize IotaWattUpdater object."""
-        self.entry = entry
         super().__init__(
             hass=hass,
             logger=_LOGGER,
+            config_entry=entry,
             name=entry.title,
             update_interval=timedelta(seconds=30),
             request_refresh_debouncer=Debouncer(
@@ -57,11 +58,11 @@ class IotawattUpdater(DataUpdateCoordinator):
         """Fetch sensors from IoTaWatt device."""
         if self.api is None:
             api = Iotawatt(
-                self.entry.title,
-                self.entry.data[CONF_HOST],
+                self.config_entry.title,
+                self.config_entry.data[CONF_HOST],
                 httpx_client.get_async_client(self.hass),
-                self.entry.data.get(CONF_USERNAME),
-                self.entry.data.get(CONF_PASSWORD),
+                self.config_entry.data.get(CONF_USERNAME),
+                self.config_entry.data.get(CONF_PASSWORD),
                 integratedInterval="d",
                 includeNonTotalSensors=False,
             )
diff --git a/homeassistant/components/iotawatt/sensor.py b/homeassistant/components/iotawatt/sensor.py
index c9af588c160..f5210f7fbba 100644
--- a/homeassistant/components/iotawatt/sensor.py
+++ b/homeassistant/components/iotawatt/sensor.py
@@ -26,7 +26,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import dt as dt_util
@@ -114,7 +114,7 @@ ENTITY_DESCRIPTION_KEY_MAP: dict[str, IotaWattSensorEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add sensors for passed config_entry in HA."""
     coordinator: IotawattUpdater = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/iotty/__init__.py b/homeassistant/components/iotty/__init__.py
index 804f3f40196..c9eb2639348 100644
--- a/homeassistant/components/iotty/__init__.py
+++ b/homeassistant/components/iotty/__init__.py
@@ -2,12 +2,8 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass
 import logging
 
-from iottycloud.device import Device
-
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.config_entry_oauth2_flow import (
@@ -15,22 +11,16 @@ from homeassistant.helpers.config_entry_oauth2_flow import (
     async_get_config_entry_implementation,
 )
 
-from . import coordinator
+from .coordinator import (
+    IottyConfigEntry,
+    IottyConfigEntryData,
+    IottyDataUpdateCoordinator,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS: list[Platform] = [Platform.COVER, Platform.SWITCH]
 
-type IottyConfigEntry = ConfigEntry[IottyConfigEntryData]
-
-
-@dataclass
-class IottyConfigEntryData:
-    """Contains config entry data for iotty."""
-
-    known_devices: set[Device]
-    coordinator: coordinator.IottyDataUpdateCoordinator
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: IottyConfigEntry) -> bool:
     """Set up iotty from a config entry."""
@@ -39,9 +29,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: IottyConfigEntry) -> boo
     implementation = await async_get_config_entry_implementation(hass, entry)
     session = OAuth2Session(hass, entry, implementation)
 
-    data_update_coordinator = coordinator.IottyDataUpdateCoordinator(
-        hass, entry, session
-    )
+    data_update_coordinator = IottyDataUpdateCoordinator(hass, entry, session)
 
     entry.runtime_data = IottyConfigEntryData(set(), data_update_coordinator)
 
@@ -51,6 +39,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: IottyConfigEntry) -> boo
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: IottyConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/iotty/coordinator.py b/homeassistant/components/iotty/coordinator.py
index 420248f7724..af870c347bd 100644
--- a/homeassistant/components/iotty/coordinator.py
+++ b/homeassistant/components/iotty/coordinator.py
@@ -32,16 +32,27 @@ class IottyData:
     devices: list[Device]
 
 
+@dataclass
+class IottyConfigEntryData:
+    """Contains config entry data for iotty."""
+
+    known_devices: set[Device]
+    coordinator: IottyDataUpdateCoordinator
+
+
+type IottyConfigEntry = ConfigEntry[IottyConfigEntryData]
+
+
 class IottyDataUpdateCoordinator(DataUpdateCoordinator[IottyData]):
     """Class to manage fetching Iotty data."""
 
-    config_entry: ConfigEntry
+    config_entry: IottyConfigEntry
     _entities: dict[str, Entity]
     _devices: list[Device]
     _device_registry: dr.DeviceRegistry
 
     def __init__(
-        self, hass: HomeAssistant, entry: ConfigEntry, session: OAuth2Session
+        self, hass: HomeAssistant, entry: IottyConfigEntry, session: OAuth2Session
     ) -> None:
         """Initialize the coordinator."""
         _LOGGER.debug("Initializing iotty data update coordinator")
@@ -49,11 +60,11 @@ class IottyDataUpdateCoordinator(DataUpdateCoordinator[IottyData]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             name=f"{DOMAIN}_coordinator",
             update_interval=UPDATE_INTERVAL,
         )
 
-        self.config_entry = entry
         self._entities = {}
         self._devices = []
         self.iotty = api.IottyProxy(
diff --git a/homeassistant/components/iotty/cover.py b/homeassistant/components/iotty/cover.py
index 50a4a1deeba..d8b11131f4f 100644
--- a/homeassistant/components/iotty/cover.py
+++ b/homeassistant/components/iotty/cover.py
@@ -16,11 +16,10 @@ from homeassistant.components.cover import (
     CoverEntityFeature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import IottyConfigEntry
 from .api import IottyProxy
-from .coordinator import IottyDataUpdateCoordinator
+from .coordinator import IottyConfigEntry, IottyDataUpdateCoordinator
 from .entity import IottyEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -29,7 +28,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: IottyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Activate the iotty Shutter component."""
     _LOGGER.debug("Setup COVER entry id is %s", config_entry.entry_id)
diff --git a/homeassistant/components/iotty/switch.py b/homeassistant/components/iotty/switch.py
index b06e3ea308d..113a4439e85 100644
--- a/homeassistant/components/iotty/switch.py
+++ b/homeassistant/components/iotty/switch.py
@@ -20,11 +20,10 @@ from homeassistant.components.switch import (
     SwitchEntityDescription,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import IottyConfigEntry
 from .api import IottyProxy
-from .coordinator import IottyDataUpdateCoordinator
+from .coordinator import IottyConfigEntry, IottyDataUpdateCoordinator
 from .entity import IottyEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -46,7 +45,7 @@ ENTITIES: dict[str, SwitchEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: IottyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Activate the iotty Switch component."""
     _LOGGER.debug("Setup SWITCH entry id is %s", config_entry.entry_id)
diff --git a/homeassistant/components/iperf3/__init__.py b/homeassistant/components/iperf3/__init__.py
index a621f1fb27e..3fbe447f9fb 100644
--- a/homeassistant/components/iperf3/__init__.py
+++ b/homeassistant/components/iperf3/__init__.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
     UnitOfDataRate,
 )
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.dispatcher import dispatcher_send
 from homeassistant.helpers.event import async_track_time_interval
diff --git a/homeassistant/components/ipma/config_flow.py b/homeassistant/components/ipma/config_flow.py
index a0ecf1f582e..9b0fbe29736 100644
--- a/homeassistant/components/ipma/config_flow.py
+++ b/homeassistant/components/ipma/config_flow.py
@@ -10,8 +10,8 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 
 from .const import DOMAIN
 
diff --git a/homeassistant/components/ipma/manifest.json b/homeassistant/components/ipma/manifest.json
index 1abd7807213..971525e013f 100644
--- a/homeassistant/components/ipma/manifest.json
+++ b/homeassistant/components/ipma/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/ipma",
   "iot_class": "cloud_polling",
   "loggers": ["geopy", "pyipma"],
-  "requirements": ["pyipma==3.0.8"]
+  "requirements": ["pyipma==3.0.9"]
 }
diff --git a/homeassistant/components/ipma/sensor.py b/homeassistant/components/ipma/sensor.py
index 2a921cdbb04..78fd018cf9a 100644
--- a/homeassistant/components/ipma/sensor.py
+++ b/homeassistant/components/ipma/sensor.py
@@ -16,7 +16,7 @@ from pyipma.uv import UV
 from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import Throttle
 
 from .const import DATA_API, DATA_LOCATION, DOMAIN, MIN_TIME_BETWEEN_UPDATES
@@ -86,7 +86,9 @@ SENSOR_TYPES: tuple[IPMASensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the IPMA sensor platform."""
     api = hass.data[DOMAIN][entry.entry_id][DATA_API]
diff --git a/homeassistant/components/ipma/weather.py b/homeassistant/components/ipma/weather.py
index 855587eee2e..d285f9e1ad3 100644
--- a/homeassistant/components/ipma/weather.py
+++ b/homeassistant/components/ipma/weather.py
@@ -31,7 +31,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sun import is_up
 from homeassistant.util import Throttle
 
@@ -51,7 +51,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add a weather entity from a config_entry."""
     api = hass.data[DOMAIN][config_entry.entry_id][DATA_API]
diff --git a/homeassistant/components/ipp/__init__.py b/homeassistant/components/ipp/__init__.py
index 0a94795613b..99332dca0e2 100644
--- a/homeassistant/components/ipp/__init__.py
+++ b/homeassistant/components/ipp/__init__.py
@@ -2,39 +2,17 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import (
-    CONF_HOST,
-    CONF_PORT,
-    CONF_SSL,
-    CONF_VERIFY_SSL,
-    Platform,
-)
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-from .const import CONF_BASE_PATH
-from .coordinator import IPPDataUpdateCoordinator
+from .coordinator import IPPConfigEntry, IPPDataUpdateCoordinator
 
 PLATFORMS = [Platform.SENSOR]
 
-type IPPConfigEntry = ConfigEntry[IPPDataUpdateCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: IPPConfigEntry) -> bool:
     """Set up IPP from a config entry."""
-    # config flow sets this to either UUID, serial number or None
-    if (device_id := entry.unique_id) is None:
-        device_id = entry.entry_id
-
-    coordinator = IPPDataUpdateCoordinator(
-        hass,
-        host=entry.data[CONF_HOST],
-        port=entry.data[CONF_PORT],
-        base_path=entry.data[CONF_BASE_PATH],
-        tls=entry.data[CONF_SSL],
-        verify_ssl=entry.data[CONF_VERIFY_SSL],
-        device_id=device_id,
-    )
+    coordinator = IPPDataUpdateCoordinator(hass, entry)
     await coordinator.async_config_entry_first_refresh()
 
     entry.runtime_data = coordinator
@@ -44,6 +22,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: IPPConfigEntry) -> bool:
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: IPPConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/ipp/coordinator.py b/homeassistant/components/ipp/coordinator.py
index 535b18bcaf0..1c3dc4d0a03 100644
--- a/homeassistant/components/ipp/coordinator.py
+++ b/homeassistant/components/ipp/coordinator.py
@@ -7,45 +7,42 @@ import logging
 
 from pyipp import IPP, IPPError, Printer as IPPPrinter
 
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, CONF_PORT, CONF_SSL, CONF_VERIFY_SSL
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import DOMAIN
+from .const import CONF_BASE_PATH, DOMAIN
 
 SCAN_INTERVAL = timedelta(seconds=60)
 
 _LOGGER = logging.getLogger(__name__)
 
+type IPPConfigEntry = ConfigEntry[IPPDataUpdateCoordinator]
+
 
 class IPPDataUpdateCoordinator(DataUpdateCoordinator[IPPPrinter]):
     """Class to manage fetching IPP data from single endpoint."""
 
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        *,
-        host: str,
-        port: int,
-        base_path: str,
-        tls: bool,
-        verify_ssl: bool,
-        device_id: str,
-    ) -> None:
+    config_entry: IPPConfigEntry
+
+    def __init__(self, hass: HomeAssistant, config_entry: IPPConfigEntry) -> None:
         """Initialize global IPP data updater."""
-        self.device_id = device_id
+        self.device_id = config_entry.unique_id or config_entry.entry_id
         self.ipp = IPP(
-            host=host,
-            port=port,
-            base_path=base_path,
-            tls=tls,
-            verify_ssl=verify_ssl,
-            session=async_get_clientsession(hass, verify_ssl),
+            host=config_entry.data[CONF_HOST],
+            port=config_entry.data[CONF_PORT],
+            base_path=config_entry.data[CONF_BASE_PATH],
+            tls=config_entry.data[CONF_SSL],
+            verify_ssl=config_entry.data[CONF_VERIFY_SSL],
+            session=async_get_clientsession(hass, config_entry.data[CONF_VERIFY_SSL]),
         )
 
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/ipp/diagnostics.py b/homeassistant/components/ipp/diagnostics.py
index 9b10dc68966..cd136e78373 100644
--- a/homeassistant/components/ipp/diagnostics.py
+++ b/homeassistant/components/ipp/diagnostics.py
@@ -6,7 +6,7 @@ from typing import Any
 
 from homeassistant.core import HomeAssistant
 
-from . import IPPConfigEntry
+from .coordinator import IPPConfigEntry
 
 
 async def async_get_config_entry_diagnostics(
diff --git a/homeassistant/components/ipp/sensor.py b/homeassistant/components/ipp/sensor.py
index a2792c7749b..e16819a54ff 100644
--- a/homeassistant/components/ipp/sensor.py
+++ b/homeassistant/components/ipp/sensor.py
@@ -17,10 +17,9 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import ATTR_LOCATION, PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import IPPConfigEntry
 from .const import (
     ATTR_COMMAND_SET,
     ATTR_INFO,
@@ -32,6 +31,7 @@ from .const import (
     ATTR_STATE_REASON,
     ATTR_URI_SUPPORTED,
 )
+from .coordinator import IPPConfigEntry
 from .entity import IPPEntity
 
 
@@ -87,7 +87,7 @@ PRINTER_SENSORS: tuple[IPPSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: IPPConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up IPP sensor based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/iqvia/sensor.py b/homeassistant/components/iqvia/sensor.py
index d04e0885454..64492c634e9 100644
--- a/homeassistant/components/iqvia/sensor.py
+++ b/homeassistant/components/iqvia/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_STATE
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     DOMAIN,
@@ -127,7 +127,9 @@ INDEX_SENSOR_DESCRIPTIONS = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up IQVIA sensors based on a config entry."""
     sensors: list[ForecastSensor | IndexSensor] = [
diff --git a/homeassistant/components/iqvia/strings.json b/homeassistant/components/iqvia/strings.json
index 5dc0dea53d5..a0697a6c210 100644
--- a/homeassistant/components/iqvia/strings.json
+++ b/homeassistant/components/iqvia/strings.json
@@ -4,7 +4,7 @@
       "user": {
         "description": "Fill out your U.S. or Canadian ZIP code.",
         "data": {
-          "zip_code": "ZIP Code"
+          "zip_code": "ZIP code"
         }
       }
     },
diff --git a/homeassistant/components/irish_rail_transport/sensor.py b/homeassistant/components/irish_rail_transport/sensor.py
index 2765a14b7a3..cd0ccccaece 100644
--- a/homeassistant/components/irish_rail_transport/sensor.py
+++ b/homeassistant/components/irish_rail_transport/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_NAME, UnitOfTime
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/iron_os/__init__.py b/homeassistant/components/iron_os/__init__.py
index 6af6abb1436..77099e48b41 100644
--- a/homeassistant/components/iron_os/__init__.py
+++ b/homeassistant/components/iron_os/__init__.py
@@ -8,7 +8,6 @@ from typing import TYPE_CHECKING
 from pynecil import IronOSUpdate, Pynecil
 
 from homeassistant.components import bluetooth
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
@@ -19,6 +18,7 @@ from homeassistant.util.hass_dict import HassKey
 
 from .const import DOMAIN
 from .coordinator import (
+    IronOSConfigEntry,
     IronOSCoordinators,
     IronOSFirmwareUpdateCoordinator,
     IronOSLiveDataCoordinator,
@@ -39,7 +39,6 @@ PLATFORMS: list[Platform] = [
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
 
-type IronOSConfigEntry = ConfigEntry[IronOSCoordinators]
 IRON_OS_KEY: HassKey[IronOSFirmwareUpdateCoordinator] = HassKey(DOMAIN)
 
 
@@ -73,10 +72,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: IronOSConfigEntry) -> bo
 
     device = Pynecil(ble_device)
 
-    live_data = IronOSLiveDataCoordinator(hass, device)
+    live_data = IronOSLiveDataCoordinator(hass, entry, device)
     await live_data.async_config_entry_first_refresh()
 
-    settings = IronOSSettingsCoordinator(hass, device)
+    settings = IronOSSettingsCoordinator(hass, entry, device)
     await settings.async_config_entry_first_refresh()
 
     entry.runtime_data = IronOSCoordinators(
diff --git a/homeassistant/components/iron_os/binary_sensor.py b/homeassistant/components/iron_os/binary_sensor.py
index 81ba0e08c95..66e642c7aaa 100644
--- a/homeassistant/components/iron_os/binary_sensor.py
+++ b/homeassistant/components/iron_os/binary_sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import IronOSConfigEntry
 from .coordinator import IronOSLiveDataCoordinator
@@ -29,7 +29,7 @@ class PinecilBinarySensor(StrEnum):
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: IronOSConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up binary sensors from a config entry."""
     coordinator = entry.runtime_data.live_data
diff --git a/homeassistant/components/iron_os/button.py b/homeassistant/components/iron_os/button.py
index be16148a656..e069ddb1d9f 100644
--- a/homeassistant/components/iron_os/button.py
+++ b/homeassistant/components/iron_os/button.py
@@ -10,7 +10,7 @@ from pynecil import CharSetting
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import IronOSConfigEntry
 from .coordinator import IronOSCoordinators
@@ -53,7 +53,7 @@ BUTTON_DESCRIPTIONS: tuple[IronOSButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: IronOSConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up button entities from a config entry."""
     coordinators = entry.runtime_data
diff --git a/homeassistant/components/iron_os/config_flow.py b/homeassistant/components/iron_os/config_flow.py
index 444db79c926..8509577114f 100644
--- a/homeassistant/components/iron_os/config_flow.py
+++ b/homeassistant/components/iron_os/config_flow.py
@@ -61,7 +61,7 @@ class IronOSConfigFlow(ConfigFlow, domain=DOMAIN):
             self._abort_if_unique_id_configured()
             return self.async_create_entry(title=title, data={})
 
-        current_addresses = self._async_current_ids()
+        current_addresses = self._async_current_ids(include_ignore=False)
         for discovery_info in async_discovered_service_info(self.hass, True):
             address = discovery_info.address
             if (
diff --git a/homeassistant/components/iron_os/coordinator.py b/homeassistant/components/iron_os/coordinator.py
index 080fee20762..84c9b895766 100644
--- a/homeassistant/components/iron_os/coordinator.py
+++ b/homeassistant/components/iron_os/coordinator.py
@@ -8,6 +8,7 @@ from enum import Enum
 import logging
 from typing import cast
 
+from awesomeversion import AwesomeVersion
 from pynecil import (
     CharSetting,
     CommunicationError,
@@ -34,6 +35,8 @@ SCAN_INTERVAL = timedelta(seconds=5)
 SCAN_INTERVAL_GITHUB = timedelta(hours=3)
 SCAN_INTERVAL_SETTINGS = timedelta(seconds=60)
 
+V223 = AwesomeVersion("v2.23")
+
 
 @dataclass
 class IronOSCoordinators:
@@ -43,15 +46,19 @@ class IronOSCoordinators:
     settings: IronOSSettingsCoordinator
 
 
+type IronOSConfigEntry = ConfigEntry[IronOSCoordinators]
+
+
 class IronOSBaseCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
     """IronOS base coordinator."""
 
     device_info: DeviceInfoResponse
-    config_entry: ConfigEntry
+    config_entry: IronOSConfigEntry
 
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: IronOSConfigEntry,
         device: Pynecil,
         update_interval: timedelta,
     ) -> None:
@@ -60,6 +67,7 @@ class IronOSBaseCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=update_interval,
             request_refresh_debouncer=Debouncer(
@@ -67,6 +75,7 @@ class IronOSBaseCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
             ),
         )
         self.device = device
+        self.v223_features = False
 
     async def _async_setup(self) -> None:
         """Set up the coordinator."""
@@ -76,13 +85,17 @@ class IronOSBaseCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
         except CommunicationError as e:
             raise UpdateFailed("Cannot connect to device") from e
 
+        self.v223_features = AwesomeVersion(self.device_info.build) >= V223
+
 
 class IronOSLiveDataCoordinator(IronOSBaseCoordinator[LiveDataResponse]):
     """IronOS coordinator."""
 
-    def __init__(self, hass: HomeAssistant, device: Pynecil) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: IronOSConfigEntry, device: Pynecil
+    ) -> None:
         """Initialize IronOS coordinator."""
-        super().__init__(hass, device=device, update_interval=SCAN_INTERVAL)
+        super().__init__(hass, config_entry, device, SCAN_INTERVAL)
 
     async def _async_update_data(self) -> LiveDataResponse:
         """Fetch data from Device."""
@@ -109,35 +122,14 @@ class IronOSLiveDataCoordinator(IronOSBaseCoordinator[LiveDataResponse]):
         return False
 
 
-class IronOSFirmwareUpdateCoordinator(DataUpdateCoordinator[LatestRelease]):
-    """IronOS coordinator for retrieving update information from github."""
-
-    def __init__(self, hass: HomeAssistant, github: IronOSUpdate) -> None:
-        """Initialize IronOS coordinator."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            config_entry=None,
-            name=DOMAIN,
-            update_interval=SCAN_INTERVAL_GITHUB,
-        )
-        self.github = github
-
-    async def _async_update_data(self) -> LatestRelease:
-        """Fetch data from Github."""
-
-        try:
-            return await self.github.latest_release()
-        except UpdateException as e:
-            raise UpdateFailed("Failed to check for latest IronOS update") from e
-
-
 class IronOSSettingsCoordinator(IronOSBaseCoordinator[SettingsDataResponse]):
     """IronOS coordinator."""
 
-    def __init__(self, hass: HomeAssistant, device: Pynecil) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: IronOSConfigEntry, device: Pynecil
+    ) -> None:
         """Initialize IronOS coordinator."""
-        super().__init__(hass, device=device, update_interval=SCAN_INTERVAL_SETTINGS)
+        super().__init__(hass, config_entry, device, SCAN_INTERVAL_SETTINGS)
 
     async def _async_update_data(self) -> SettingsDataResponse:
         """Fetch data from Device."""
@@ -173,3 +165,26 @@ class IronOSSettingsCoordinator(IronOSBaseCoordinator[SettingsDataResponse]):
         )
         self.async_update_listeners()
         await self.async_request_refresh()
+
+
+class IronOSFirmwareUpdateCoordinator(DataUpdateCoordinator[LatestRelease]):
+    """IronOS coordinator for retrieving update information from github."""
+
+    def __init__(self, hass: HomeAssistant, github: IronOSUpdate) -> None:
+        """Initialize IronOS coordinator."""
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=None,
+            name=DOMAIN,
+            update_interval=SCAN_INTERVAL_GITHUB,
+        )
+        self.github = github
+
+    async def _async_update_data(self) -> LatestRelease:
+        """Fetch data from Github."""
+
+        try:
+            return await self.github.latest_release()
+        except UpdateException as e:
+            raise UpdateFailed("Failed to check for latest IronOS update") from e
diff --git a/homeassistant/components/iron_os/icons.json b/homeassistant/components/iron_os/icons.json
index 6410c561b9d..695b9d16849 100644
--- a/homeassistant/components/iron_os/icons.json
+++ b/homeassistant/components/iron_os/icons.json
@@ -73,6 +73,9 @@
       },
       "power_limit": {
         "default": "mdi:flash-alert"
+      },
+      "hall_effect_sleep_time": {
+        "default": "mdi:timer-sand"
       }
     },
     "select": {
@@ -105,6 +108,9 @@
       },
       "usb_pd_mode": {
         "default": "mdi:meter-electric-outline"
+      },
+      "tip_type": {
+        "default": "mdi:pencil-outline"
       }
     },
     "sensor": {
@@ -154,7 +160,16 @@
           "soldering": "mdi:soldering-iron",
           "sleeping": "mdi:sleep",
           "settings": "mdi:menu-open",
-          "debug": "mdi:bug-play"
+          "debug": "mdi:bug-play",
+          "soldering_profile": "mdi:chart-box-outline",
+          "temperature_adjust": "mdi:thermostat-box",
+          "usb_pd_debug": "mdi:bug-play",
+          "thermal_runaway": "mdi:fire-alert",
+          "startup_logo": "mdi:dots-circle",
+          "cjc_calibration": "mdi:tune-vertical",
+          "startup_warnings": "mdi:alert",
+          "initialisation_done": "mdi:check-circle",
+          "hibernating": "mdi:sleep"
         }
       },
       "estimated_power": {
diff --git a/homeassistant/components/iron_os/manifest.json b/homeassistant/components/iron_os/manifest.json
index 462e75c5b6e..58cbdaa3bc6 100644
--- a/homeassistant/components/iron_os/manifest.json
+++ b/homeassistant/components/iron_os/manifest.json
@@ -13,5 +13,6 @@
   "documentation": "https://www.home-assistant.io/integrations/iron_os",
   "iot_class": "local_polling",
   "loggers": ["pynecil"],
-  "requirements": ["pynecil==4.0.1"]
+  "quality_scale": "platinum",
+  "requirements": ["pynecil==4.1.0"]
 }
diff --git a/homeassistant/components/iron_os/number.py b/homeassistant/components/iron_os/number.py
index 518c11372c4..6ad5947cb6f 100644
--- a/homeassistant/components/iron_os/number.py
+++ b/homeassistant/components/iron_os/number.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import IronOSConfigEntry
 from .const import MAX_TEMP, MIN_TEMP
@@ -65,6 +65,7 @@ class PinecilNumber(StrEnum):
     VOLTAGE_DIV = "voltage_div"
     TEMP_INCREMENT_SHORT = "temp_increment_short"
     TEMP_INCREMENT_LONG = "temp_increment_long"
+    HALL_EFFECT_SLEEP_TIME = "hall_effect_sleep_time"
 
 
 def multiply(value: float | None, multiplier: float) -> float | None:
@@ -323,18 +324,38 @@ PINECIL_NUMBER_DESCRIPTIONS: tuple[IronOSNumberEntityDescription, ...] = (
     ),
 )
 
+PINECIL_NUMBER_DESCRIPTIONS_V223: tuple[IronOSNumberEntityDescription, ...] = (
+    IronOSNumberEntityDescription(
+        key=PinecilNumber.HALL_EFFECT_SLEEP_TIME,
+        translation_key=PinecilNumber.HALL_EFFECT_SLEEP_TIME,
+        value_fn=(lambda _, settings: settings.get("hall_sleep_time")),
+        characteristic=CharSetting.HALL_SLEEP_TIME,
+        raw_value_fn=lambda value: value,
+        mode=NumberMode.BOX,
+        native_min_value=0,
+        native_max_value=60,
+        native_step=5,
+        entity_category=EntityCategory.CONFIG,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        entity_registry_enabled_default=False,
+    ),
+)
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: IronOSConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up number entities from a config entry."""
     coordinators = entry.runtime_data
+    descriptions = PINECIL_NUMBER_DESCRIPTIONS
+
+    if coordinators.live_data.v223_features:
+        descriptions += PINECIL_NUMBER_DESCRIPTIONS_V223
 
     async_add_entities(
-        IronOSNumberEntity(coordinators, description)
-        for description in PINECIL_NUMBER_DESCRIPTIONS
+        IronOSNumberEntity(coordinators, description) for description in descriptions
     )
 
 
diff --git a/homeassistant/components/iron_os/quality_scale.yaml b/homeassistant/components/iron_os/quality_scale.yaml
index c80b8b5adfe..8f7eb5ff36a 100644
--- a/homeassistant/components/iron_os/quality_scale.yaml
+++ b/homeassistant/components/iron_os/quality_scale.yaml
@@ -21,8 +21,10 @@ rules:
   entity-unique-id: done
   has-entity-name: done
   runtime-data: done
-  test-before-configure: todo
-  test-before-setup: todo
+  test-before-configure:
+    status: exempt
+    comment: Device is set up from a Bluetooth discovery
+  test-before-setup: done
   unique-config-entry: done
 
   # Silver
@@ -70,7 +72,9 @@ rules:
   repair-issues:
     status: exempt
     comment: no repairs/issues
-  stale-devices: todo
+  stale-devices:
+    status: exempt
+    comment: Stale devices are removed with the config entry as there is only one device per entry
 
   # Platinum
   async-dependency: done
diff --git a/homeassistant/components/iron_os/select.py b/homeassistant/components/iron_os/select.py
index e9c7f81c208..32652829531 100644
--- a/homeassistant/components/iron_os/select.py
+++ b/homeassistant/components/iron_os/select.py
@@ -17,13 +17,14 @@ from pynecil import (
     ScrollSpeed,
     SettingsDataResponse,
     TempUnit,
+    TipType,
     USBPDMode,
 )
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import IronOSConfigEntry
 from .coordinator import IronOSCoordinators
@@ -53,6 +54,7 @@ class PinecilSelect(StrEnum):
     LOCKING_MODE = "locking_mode"
     LOGO_DURATION = "logo_duration"
     USB_PD_MODE = "usb_pd_mode"
+    TIP_TYPE = "tip_type"
 
 
 def enum_to_str(enum: Enum | None) -> str | None:
@@ -138,6 +140,8 @@ PINECIL_SELECT_DESCRIPTIONS: tuple[IronOSSelectEntityDescription, ...] = (
         entity_category=EntityCategory.CONFIG,
         entity_registry_enabled_default=False,
     ),
+)
+PINECIL_SELECT_DESCRIPTIONS_V222: tuple[IronOSSelectEntityDescription, ...] = (
     IronOSSelectEntityDescription(
         key=PinecilSelect.USB_PD_MODE,
         translation_key=PinecilSelect.USB_PD_MODE,
@@ -149,19 +153,46 @@ PINECIL_SELECT_DESCRIPTIONS: tuple[IronOSSelectEntityDescription, ...] = (
         entity_registry_enabled_default=False,
     ),
 )
+PINECIL_SELECT_DESCRIPTIONS_V223: tuple[IronOSSelectEntityDescription, ...] = (
+    IronOSSelectEntityDescription(
+        key=PinecilSelect.USB_PD_MODE,
+        translation_key=PinecilSelect.USB_PD_MODE,
+        characteristic=CharSetting.USB_PD_MODE,
+        value_fn=lambda x: enum_to_str(x.get("usb_pd_mode")),
+        raw_value_fn=lambda value: USBPDMode[value.upper()],
+        options=[x.name.lower() for x in USBPDMode],
+        entity_category=EntityCategory.CONFIG,
+        entity_registry_enabled_default=False,
+    ),
+    IronOSSelectEntityDescription(
+        key=PinecilSelect.TIP_TYPE,
+        translation_key=PinecilSelect.TIP_TYPE,
+        characteristic=CharSetting.TIP_TYPE,
+        value_fn=lambda x: enum_to_str(x.get("tip_type")),
+        raw_value_fn=lambda value: TipType[value.upper()],
+        options=[x.name.lower() for x in TipType],
+        entity_category=EntityCategory.CONFIG,
+    ),
+)
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: IronOSConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up select entities from a config entry."""
-    coordinator = entry.runtime_data
+    coordinators = entry.runtime_data
+    descriptions = PINECIL_SELECT_DESCRIPTIONS
+
+    descriptions += (
+        PINECIL_SELECT_DESCRIPTIONS_V223
+        if coordinators.live_data.v223_features
+        else PINECIL_SELECT_DESCRIPTIONS_V222
+    )
 
     async_add_entities(
-        IronOSSelectEntity(coordinator, description)
-        for description in PINECIL_SELECT_DESCRIPTIONS
+        IronOSSelectEntity(coordinators, description) for description in descriptions
     )
 
 
diff --git a/homeassistant/components/iron_os/sensor.py b/homeassistant/components/iron_os/sensor.py
index d178b46723f..79f1e54a6f4 100644
--- a/homeassistant/components/iron_os/sensor.py
+++ b/homeassistant/components/iron_os/sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import IronOSConfigEntry
@@ -184,7 +184,7 @@ PINECIL_SENSOR_DESCRIPTIONS: tuple[IronOSSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: IronOSConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors from a config entry."""
     coordinator = entry.runtime_data.live_data
diff --git a/homeassistant/components/iron_os/strings.json b/homeassistant/components/iron_os/strings.json
index 60168699427..ddae9a3020f 100644
--- a/homeassistant/components/iron_os/strings.json
+++ b/homeassistant/components/iron_os/strings.json
@@ -94,6 +94,9 @@
       },
       "temp_increment_long": {
         "name": "Long-press temperature step"
+      },
+      "hall_effect_sleep_time": {
+        "name": "Hall sensor sleep timeout"
       }
     },
     "select": {
@@ -173,6 +176,15 @@
           "off": "[%key:common::state::off%]",
           "on": "[%key:common::state::on%]"
         }
+      },
+      "tip_type": {
+        "name": "Soldering tip type",
+        "state": {
+          "auto": "Auto sense",
+          "ts100_long": "TS100 long/Hakko T12 tip",
+          "pine_short": "Pinecil short tip",
+          "pts200": "PTS200 short tip"
+        }
       }
     },
     "sensor": {
@@ -223,7 +235,16 @@
           "sleeping": "Sleeping",
           "settings": "Settings",
           "debug": "Debug",
-          "boost": "Boost"
+          "boost": "Boost",
+          "soldering_profile": "Soldering profile",
+          "temperature_adjust": "Temperature adjust",
+          "usb_pd_debug": "USB PD debug",
+          "thermal_runaway": "Thermal runaway",
+          "startup_logo": "Booting",
+          "cjc_calibration": "CJC calibration",
+          "startup_warnings": "Startup warnings",
+          "initialisation_done": "Initialisation done",
+          "hibernating": "Hibernating"
         }
       },
       "estimated_power": {
diff --git a/homeassistant/components/iron_os/switch.py b/homeassistant/components/iron_os/switch.py
index d88e8cfdcb5..124b670048a 100644
--- a/homeassistant/components/iron_os/switch.py
+++ b/homeassistant/components/iron_os/switch.py
@@ -12,7 +12,7 @@ from pynecil import CharSetting, SettingsDataResponse
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import IronOSConfigEntry
 from .coordinator import IronOSCoordinators
@@ -100,7 +100,7 @@ SWITCH_DESCRIPTIONS: tuple[IronOSSwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: IronOSConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switches from a config entry."""
 
diff --git a/homeassistant/components/iron_os/update.py b/homeassistant/components/iron_os/update.py
index b431d321f24..4ec626ffc2a 100644
--- a/homeassistant/components/iron_os/update.py
+++ b/homeassistant/components/iron_os/update.py
@@ -9,7 +9,7 @@ from homeassistant.components.update import (
     UpdateEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import IRON_OS_KEY, IronOSConfigEntry, IronOSLiveDataCoordinator
 from .coordinator import IronOSFirmwareUpdateCoordinator
@@ -26,7 +26,7 @@ UPDATE_DESCRIPTION = UpdateEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: IronOSConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up IronOS update platform."""
 
diff --git a/homeassistant/components/iskra/__init__.py b/homeassistant/components/iskra/__init__.py
index b841da9df26..21c60db20fe 100644
--- a/homeassistant/components/iskra/__init__.py
+++ b/homeassistant/components/iskra/__init__.py
@@ -6,7 +6,6 @@ from pyiskra.adapters import Modbus, RestAPI
 from pyiskra.devices import Device
 from pyiskra.exceptions import DeviceConnectionError, DeviceNotSupported, NotAuthorised
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_ADDRESS,
     CONF_HOST,
@@ -21,14 +20,11 @@ from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import device_registry as dr
 
 from .const import DOMAIN, MANUFACTURER
-from .coordinator import IskraDataUpdateCoordinator
+from .coordinator import IskraConfigEntry, IskraDataUpdateCoordinator
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
 
-type IskraConfigEntry = ConfigEntry[list[IskraDataUpdateCoordinator]]
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: IskraConfigEntry) -> bool:
     """Set up iskra device from a config entry."""
     conf = entry.data
@@ -79,11 +75,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: IskraConfigEntry) -> boo
         )
 
         coordinators = [
-            IskraDataUpdateCoordinator(hass, child_device)
+            IskraDataUpdateCoordinator(hass, entry, child_device)
             for child_device in base_device.get_child_devices()
         ]
     else:
-        coordinators = [IskraDataUpdateCoordinator(hass, base_device)]
+        coordinators = [IskraDataUpdateCoordinator(hass, entry, base_device)]
 
     for coordinator in coordinators:
         await coordinator.async_config_entry_first_refresh()
diff --git a/homeassistant/components/iskra/coordinator.py b/homeassistant/components/iskra/coordinator.py
index 175d8ed4c86..d476556e96d 100644
--- a/homeassistant/components/iskra/coordinator.py
+++ b/homeassistant/components/iskra/coordinator.py
@@ -11,6 +11,7 @@ from pyiskra.exceptions import (
     NotAuthorised,
 )
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -18,21 +19,26 @@ from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
+type IskraConfigEntry = ConfigEntry[list[IskraDataUpdateCoordinator]]
+
 
 class IskraDataUpdateCoordinator(DataUpdateCoordinator[None]):
     """Class to manage fetching Iskra data."""
 
-    def __init__(self, hass: HomeAssistant, device: Device) -> None:
+    config_entry: IskraConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: IskraConfigEntry, device: Device
+    ) -> None:
         """Initialize."""
         self.device = device
 
-        update_interval = timedelta(seconds=60)
-
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
-            update_interval=update_interval,
+            update_interval=timedelta(seconds=60),
         )
 
     async def _async_update_data(self) -> None:
diff --git a/homeassistant/components/iskra/manifest.json b/homeassistant/components/iskra/manifest.json
index 94f20b4d93c..caa176ab6b6 100644
--- a/homeassistant/components/iskra/manifest.json
+++ b/homeassistant/components/iskra/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["pyiskra"],
-  "requirements": ["pyiskra==0.1.14"]
+  "requirements": ["pyiskra==0.1.15"]
 }
diff --git a/homeassistant/components/iskra/sensor.py b/homeassistant/components/iskra/sensor.py
index df9e3ec53f9..10aa5555249 100644
--- a/homeassistant/components/iskra/sensor.py
+++ b/homeassistant/components/iskra/sensor.py
@@ -24,9 +24,8 @@ from homeassistant.const import (
     UnitOfReactivePower,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import IskraConfigEntry
 from .const import (
     ATTR_FREQUENCY,
     ATTR_NON_RESETTABLE_COUNTER,
@@ -44,7 +43,7 @@ from .const import (
     ATTR_TOTAL_APPARENT_POWER,
     ATTR_TOTAL_REACTIVE_POWER,
 )
-from .coordinator import IskraDataUpdateCoordinator
+from .coordinator import IskraConfigEntry, IskraDataUpdateCoordinator
 from .entity import IskraEntity
 
 
@@ -208,7 +207,7 @@ def get_counter_entity_description(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: IskraConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Iskra sensors based on config_entry."""
 
diff --git a/homeassistant/components/islamic_prayer_times/__init__.py b/homeassistant/components/islamic_prayer_times/__init__.py
index d61eba343ac..731d1324c71 100644
--- a/homeassistant/components/islamic_prayer_times/__init__.py
+++ b/homeassistant/components/islamic_prayer_times/__init__.py
@@ -4,20 +4,20 @@ from __future__ import annotations
 
 import logging
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
 
-from .coordinator import IslamicPrayerDataUpdateCoordinator
+from .coordinator import (
+    IslamicPrayerDataUpdateCoordinator,
+    IslamicPrayerTimesConfigEntry,
+)
 
 PLATFORMS = [Platform.SENSOR]
 
 
 _LOGGER = logging.getLogger(__name__)
 
-type IslamicPrayerTimesConfigEntry = ConfigEntry[IslamicPrayerDataUpdateCoordinator]
-
 
 async def async_setup_entry(
     hass: HomeAssistant, config_entry: IslamicPrayerTimesConfigEntry
@@ -36,7 +36,7 @@ async def async_setup_entry(
 
     await er.async_migrate_entries(hass, config_entry.entry_id, update_unique_id)
 
-    coordinator = IslamicPrayerDataUpdateCoordinator(hass)
+    coordinator = IslamicPrayerDataUpdateCoordinator(hass, config_entry)
     await coordinator.async_config_entry_first_refresh()
 
     config_entry.runtime_data = coordinator
@@ -48,7 +48,9 @@ async def async_setup_entry(
     return True
 
 
-async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_migrate_entry(
+    hass: HomeAssistant, config_entry: IslamicPrayerTimesConfigEntry
+) -> bool:
     """Migrate old entry."""
     _LOGGER.debug("Migrating from version %s", config_entry.version)
 
diff --git a/homeassistant/components/islamic_prayer_times/coordinator.py b/homeassistant/components/islamic_prayer_times/coordinator.py
index 7005bee3585..a6cd3fb151e 100644
--- a/homeassistant/components/islamic_prayer_times/coordinator.py
+++ b/homeassistant/components/islamic_prayer_times/coordinator.py
@@ -13,7 +13,7 @@ from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.helpers.event import async_track_point_in_time
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import (
     CONF_CALC_METHOD,
@@ -29,21 +29,26 @@ from .const import (
 
 _LOGGER = logging.getLogger(__name__)
 
+type IslamicPrayerTimesConfigEntry = ConfigEntry[IslamicPrayerDataUpdateCoordinator]
+
 
 class IslamicPrayerDataUpdateCoordinator(DataUpdateCoordinator[dict[str, datetime]]):
     """Islamic Prayer Client Object."""
 
-    config_entry: ConfigEntry
+    config_entry: IslamicPrayerTimesConfigEntry
 
-    def __init__(self, hass: HomeAssistant) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: IslamicPrayerTimesConfigEntry
+    ) -> None:
         """Initialize the Islamic Prayer client."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
         )
-        self.latitude = self.config_entry.data[CONF_LATITUDE]
-        self.longitude = self.config_entry.data[CONF_LONGITUDE]
+        self.latitude = config_entry.data[CONF_LATITUDE]
+        self.longitude = config_entry.data[CONF_LONGITUDE]
         self.event_unsub: CALLBACK_TYPE | None = None
 
     @property
diff --git a/homeassistant/components/islamic_prayer_times/sensor.py b/homeassistant/components/islamic_prayer_times/sensor.py
index c46b629d2d8..3d35786186e 100644
--- a/homeassistant/components/islamic_prayer_times/sensor.py
+++ b/homeassistant/components/islamic_prayer_times/sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import IslamicPrayerTimesConfigEntry
@@ -51,7 +51,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: IslamicPrayerTimesConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Islamic prayer times sensor platform."""
 
diff --git a/homeassistant/components/israel_rail/__init__.py b/homeassistant/components/israel_rail/__init__.py
index 3c33a159a63..ed800f559d4 100644
--- a/homeassistant/components/israel_rail/__init__.py
+++ b/homeassistant/components/israel_rail/__init__.py
@@ -4,13 +4,12 @@ import logging
 
 from israelrailapi import TrainSchedule
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 
 from .const import CONF_DESTINATION, CONF_START, DOMAIN
-from .coordinator import IsraelRailDataUpdateCoordinator
+from .coordinator import IsraelRailConfigEntry, IsraelRailDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -18,9 +17,6 @@ _LOGGER = logging.getLogger(__name__)
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
 
-type IsraelRailConfigEntry = ConfigEntry[IsraelRailDataUpdateCoordinator]
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: IsraelRailConfigEntry) -> bool:
     """Set up Israel rail from a config entry."""
     config = entry.data
@@ -43,7 +39,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: IsraelRailConfigEntry) -
         ) from e
 
     israel_rail_coordinator = IsraelRailDataUpdateCoordinator(
-        hass, train_schedule, start, destination
+        hass, entry, train_schedule, start, destination
     )
     await israel_rail_coordinator.async_config_entry_first_refresh()
     entry.runtime_data = israel_rail_coordinator
diff --git a/homeassistant/components/israel_rail/coordinator.py b/homeassistant/components/israel_rail/coordinator.py
index d707f8c5ea6..190ed938790 100644
--- a/homeassistant/components/israel_rail/coordinator.py
+++ b/homeassistant/components/israel_rail/coordinator.py
@@ -13,7 +13,7 @@ from israelrailapi.train_station import station_name_to_id
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import DEFAULT_SCAN_INTERVAL, DEPARTURES_COUNT, DOMAIN
 
@@ -38,14 +38,18 @@ def departure_time(train_route: TrainRoute) -> datetime | None:
     return start_datetime.astimezone() if start_datetime else None
 
 
+type IsraelRailConfigEntry = ConfigEntry[IsraelRailDataUpdateCoordinator]
+
+
 class IsraelRailDataUpdateCoordinator(DataUpdateCoordinator[list[DataConnection]]):
     """A IsraelRail Data Update Coordinator."""
 
-    config_entry: ConfigEntry
+    config_entry: IsraelRailConfigEntry
 
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: IsraelRailConfigEntry,
         train_schedule: TrainSchedule,
         start: str,
         destination: str,
@@ -54,6 +58,7 @@ class IsraelRailDataUpdateCoordinator(DataUpdateCoordinator[list[DataConnection]
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=DEFAULT_SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/israel_rail/sensor.py b/homeassistant/components/israel_rail/sensor.py
index 132a9a74826..86b2e135cfb 100644
--- a/homeassistant/components/israel_rail/sensor.py
+++ b/homeassistant/components/israel_rail/sensor.py
@@ -15,13 +15,16 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import IsraelRailConfigEntry
 from .const import ATTRIBUTION, DEPARTURES_COUNT, DOMAIN
-from .coordinator import DataConnection, IsraelRailDataUpdateCoordinator
+from .coordinator import (
+    DataConnection,
+    IsraelRailConfigEntry,
+    IsraelRailDataUpdateCoordinator,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -70,7 +73,7 @@ SENSORS: tuple[IsraelRailSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: IsraelRailConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor from a config entry created in the integrations UI."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/iss/sensor.py b/homeassistant/components/iss/sensor.py
index f4f91f0099e..b6e98e07f8a 100644
--- a/homeassistant/components/iss/sensor.py
+++ b/homeassistant/components/iss/sensor.py
@@ -10,7 +10,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_LATITUDE, ATTR_LONGITUDE, CONF_SHOW_ON_MAP
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -25,7 +25,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor platform."""
     coordinator: DataUpdateCoordinator[IssData] = hass.data[DOMAIN]
diff --git a/homeassistant/components/ista_ecotrend/__init__.py b/homeassistant/components/ista_ecotrend/__init__.py
index 76ef8d13fd4..4262b354acb 100644
--- a/homeassistant/components/ista_ecotrend/__init__.py
+++ b/homeassistant/components/ista_ecotrend/__init__.py
@@ -6,20 +6,17 @@ import logging
 
 from pyecotrend_ista import KeycloakError, LoginError, PyEcotrendIsta, ServerError
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 
 from .const import DOMAIN
-from .coordinator import IstaCoordinator
+from .coordinator import IstaConfigEntry, IstaCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
-type IstaConfigEntry = ConfigEntry[IstaCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: IstaConfigEntry) -> bool:
     """Set up ista EcoTrend from a config entry."""
@@ -42,7 +39,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: IstaConfigEntry) -> bool
             translation_placeholders={CONF_EMAIL: entry.data[CONF_EMAIL]},
         ) from e
 
-    coordinator = IstaCoordinator(hass, ista)
+    coordinator = IstaCoordinator(hass, entry, ista)
     await coordinator.async_config_entry_first_refresh()
 
     entry.runtime_data = coordinator
diff --git a/homeassistant/components/ista_ecotrend/coordinator.py b/homeassistant/components/ista_ecotrend/coordinator.py
index 0f14cd06fe3..53ef4a46d20 100644
--- a/homeassistant/components/ista_ecotrend/coordinator.py
+++ b/homeassistant/components/ista_ecotrend/coordinator.py
@@ -18,17 +18,22 @@ from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
+type IstaConfigEntry = ConfigEntry[IstaCoordinator]
+
 
 class IstaCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Ista EcoTrend data update coordinator."""
 
-    config_entry: ConfigEntry
+    config_entry: IstaConfigEntry
 
-    def __init__(self, hass: HomeAssistant, ista: PyEcotrendIsta) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: IstaConfigEntry, ista: PyEcotrendIsta
+    ) -> None:
         """Initialize ista EcoTrend data update coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(days=1),
         )
diff --git a/homeassistant/components/ista_ecotrend/sensor.py b/homeassistant/components/ista_ecotrend/sensor.py
index e96ac103741..0a8ed6e9ddb 100644
--- a/homeassistant/components/ista_ecotrend/sensor.py
+++ b/homeassistant/components/ista_ecotrend/sensor.py
@@ -8,6 +8,7 @@ import datetime
 from enum import StrEnum
 import logging
 
+from homeassistant.components.recorder.models import StatisticMeanType
 from homeassistant.components.recorder.models.statistics import (
     StatisticData,
     StatisticMetaData,
@@ -30,13 +31,12 @@ from homeassistant.helpers.device_registry import (
     DeviceEntryType,
     DeviceInfo,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import IstaConfigEntry
 from .const import DOMAIN
-from .coordinator import IstaCoordinator
+from .coordinator import IstaConfigEntry, IstaCoordinator
 from .util import IstaConsumptionType, IstaValueType, get_native_value, get_statistics
 
 _LOGGER = logging.getLogger(__name__)
@@ -153,7 +153,7 @@ SENSOR_DESCRIPTIONS: tuple[IstaSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: IstaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ista EcoTrend sensors."""
 
@@ -271,7 +271,7 @@ class IstaSensor(CoordinatorEntity[IstaCoordinator], SensorEntity):
             ]
 
             metadata: StatisticMetaData = {
-                "has_mean": False,
+                "mean_type": StatisticMeanType.NONE,
                 "has_sum": True,
                 "name": f"{self.device_entry.name} {self.name}",
                 "source": DOMAIN,
diff --git a/homeassistant/components/isy994/__init__.py b/homeassistant/components/isy994/__init__.py
index d2862054971..738c7e2d5ad 100644
--- a/homeassistant/components/isy994/__init__.py
+++ b/homeassistant/components/isy994/__init__.py
@@ -21,8 +21,11 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import aiohttp_client, config_validation as cv
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import (
+    aiohttp_client,
+    config_validation as cv,
+    device_registry as dr,
+)
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 
 from .const import (
diff --git a/homeassistant/components/isy994/binary_sensor.py b/homeassistant/components/isy994/binary_sensor.py
index 179944ad35f..8c9ce7dcc12 100644
--- a/homeassistant/components/isy994/binary_sensor.py
+++ b/homeassistant/components/isy994/binary_sensor.py
@@ -23,7 +23,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_ON, Platform
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.restore_state import RestoreEntity
 
@@ -54,7 +54,9 @@ DEVICE_PARENT_REQUIRED = [
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ISY binary sensor platform."""
     entities: list[
diff --git a/homeassistant/components/isy994/button.py b/homeassistant/components/isy994/button.py
index b3b6aa40503..a895312c45a 100644
--- a/homeassistant/components/isy994/button.py
+++ b/homeassistant/components/isy994/button.py
@@ -19,7 +19,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_NETWORK, DOMAIN
 from .models import IsyData
@@ -28,7 +28,7 @@ from .models import IsyData
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up ISY/IoX button from config entry."""
     isy_data: IsyData = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/isy994/climate.py b/homeassistant/components/isy994/climate.py
index d5deba56284..57c1b6aa79d 100644
--- a/homeassistant/components/isy994/climate.py
+++ b/homeassistant/components/isy994/climate.py
@@ -37,7 +37,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
 
 from .const import (
@@ -61,7 +61,9 @@ from .models import IsyData
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ISY thermostat platform."""
 
diff --git a/homeassistant/components/isy994/cover.py b/homeassistant/components/isy994/cover.py
index b9d7ec44d27..6a660aaaf6f 100644
--- a/homeassistant/components/isy994/cover.py
+++ b/homeassistant/components/isy994/cover.py
@@ -15,7 +15,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import _LOGGER, DOMAIN, UOM_8_BIT_RANGE
 from .entity import ISYNodeEntity, ISYProgramEntity
@@ -23,7 +23,9 @@ from .models import IsyData
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ISY cover platform."""
     isy_data: IsyData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/isy994/entity.py b/homeassistant/components/isy994/entity.py
index 893b33644fe..1da727fdee8 100644
--- a/homeassistant/components/isy994/entity.py
+++ b/homeassistant/components/isy994/entity.py
@@ -106,7 +106,7 @@ class ISYNodeEntity(ISYEntity):
         return getattr(self._node, TAG_ENABLED, True)
 
     @property
-    def extra_state_attributes(self) -> dict:
+    def extra_state_attributes(self) -> dict[str, Any]:
         """Get the state attributes for the device.
 
         The 'aux_properties' in the pyisy Node class are combined with the
@@ -189,7 +189,7 @@ class ISYProgramEntity(ISYEntity):
         self._actions = actions
 
     @property
-    def extra_state_attributes(self) -> dict:
+    def extra_state_attributes(self) -> dict[str, Any]:
         """Get the state attributes for the device."""
         attr = {}
         if self._actions:
diff --git a/homeassistant/components/isy994/fan.py b/homeassistant/components/isy994/fan.py
index fc0406e2d5f..aa6059abf49 100644
--- a/homeassistant/components/isy994/fan.py
+++ b/homeassistant/components/isy994/fan.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
     ranged_value_to_percentage,
@@ -27,7 +27,9 @@ SPEED_RANGE = (1, 255)  # off is not included
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ISY fan platform."""
     isy_data: IsyData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/isy994/light.py b/homeassistant/components/isy994/light.py
index b9b269d9ca3..29df8398f97 100644
--- a/homeassistant/components/isy994/light.py
+++ b/homeassistant/components/isy994/light.py
@@ -13,7 +13,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from .const import _LOGGER, CONF_RESTORE_LIGHT_STATE, DOMAIN, UOM_PERCENTAGE
@@ -24,7 +24,9 @@ ATTR_LAST_BRIGHTNESS = "last_brightness"
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ISY light platform."""
     isy_data: IsyData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/isy994/lock.py b/homeassistant/components/isy994/lock.py
index dc2da2a6ee2..d6866a8e00c 100644
--- a/homeassistant/components/isy994/lock.py
+++ b/homeassistant/components/isy994/lock.py
@@ -13,7 +13,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import (
-    AddEntitiesCallback,
+    AddConfigEntryEntitiesCallback,
     async_get_current_platform,
 )
 
@@ -48,7 +48,9 @@ def async_setup_lock_services(hass: HomeAssistant) -> None:
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ISY lock platform."""
     isy_data: IsyData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/isy994/number.py b/homeassistant/components/isy994/number.py
index c8feba1bf8d..fc30e6296d4 100644
--- a/homeassistant/components/isy994/number.py
+++ b/homeassistant/components/isy994/number.py
@@ -38,7 +38,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
     ranged_value_to_percentage,
@@ -80,7 +80,7 @@ BACKLIGHT_MEMORY_FILTER = {"memory": DEV_BL_ADDR, "cmd1": DEV_CMD_MEMORY_WRITE}
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up ISY/IoX number entities from config entry."""
     isy_data: IsyData = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/isy994/select.py b/homeassistant/components/isy994/select.py
index 8befcf024d1..868c96375bb 100644
--- a/homeassistant/components/isy994/select.py
+++ b/homeassistant/components/isy994/select.py
@@ -34,7 +34,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from .const import _LOGGER, DOMAIN, UOM_INDEX
@@ -56,7 +56,7 @@ BACKLIGHT_MEMORY_FILTER = {"memory": DEV_BL_ADDR, "cmd1": DEV_CMD_MEMORY_WRITE}
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up ISY/IoX select entities from config entry."""
     isy_data: IsyData = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/isy994/sensor.py b/homeassistant/components/isy994/sensor.py
index 94c333346af..2d27f4602c6 100644
--- a/homeassistant/components/isy994/sensor.py
+++ b/homeassistant/components/isy994/sensor.py
@@ -33,7 +33,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, Platform, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     _LOGGER,
@@ -73,7 +73,7 @@ ISY_CONTROL_TO_DEVICE_CLASS = {
     "CV": SensorDeviceClass.VOLTAGE,
     "DEWPT": SensorDeviceClass.TEMPERATURE,
     "DISTANC": SensorDeviceClass.DISTANCE,
-    "ETO": SensorDeviceClass.PRECIPITATION_INTENSITY,
+    "ETO": SensorDeviceClass.PRECIPITATION_INTENSITY,  # codespell:ignore eto
     "FATM": SensorDeviceClass.WEIGHT,
     "FREQ": SensorDeviceClass.FREQUENCY,
     "MUSCLEM": SensorDeviceClass.WEIGHT,
@@ -97,9 +97,9 @@ ISY_CONTROL_TO_DEVICE_CLASS = {
     "WEIGHT": SensorDeviceClass.WEIGHT,
     "WINDCH": SensorDeviceClass.TEMPERATURE,
 }
-ISY_CONTROL_TO_STATE_CLASS = {
-    control: SensorStateClass.MEASUREMENT for control in ISY_CONTROL_TO_DEVICE_CLASS
-}
+ISY_CONTROL_TO_STATE_CLASS = dict.fromkeys(
+    ISY_CONTROL_TO_DEVICE_CLASS, SensorStateClass.MEASUREMENT
+)
 ISY_CONTROL_TO_ENTITY_CATEGORY = {
     PROP_RAMP_RATE: EntityCategory.DIAGNOSTIC,
     PROP_ON_LEVEL: EntityCategory.DIAGNOSTIC,
@@ -108,7 +108,9 @@ ISY_CONTROL_TO_ENTITY_CATEGORY = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ISY sensor platform."""
     isy_data: IsyData = hass.data[DOMAIN][entry.entry_id]
@@ -198,14 +200,13 @@ class ISYSensorEntity(ISYNodeEntity, SensorEntity):
 
         # Handle ISY precision and rounding
         value = convert_isy_value_to_hass(value, uom, self.target.prec)
+        if value is None:
+            return None
 
         # Convert temperatures to Home Assistant's unit
         if uom in (UnitOfTemperature.CELSIUS, UnitOfTemperature.FAHRENHEIT):
             value = self.hass.config.units.temperature(value, uom)
 
-        if value is None:
-            return None
-
         assert isinstance(value, (int, float))
         return value
 
diff --git a/homeassistant/components/isy994/services.py b/homeassistant/components/isy994/services.py
index 1cd46446ed6..6546aec6efa 100644
--- a/homeassistant/components/isy994/services.py
+++ b/homeassistant/components/isy994/services.py
@@ -14,7 +14,7 @@ from homeassistant.const import (
     CONF_UNIT_OF_MEASUREMENT,
 )
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_platform import async_get_platforms
 from homeassistant.helpers.service import entity_service_call
diff --git a/homeassistant/components/isy994/strings.json b/homeassistant/components/isy994/strings.json
index 86a1f14ff91..8872226daba 100644
--- a/homeassistant/components/isy994/strings.json
+++ b/homeassistant/components/isy994/strings.json
@@ -58,7 +58,7 @@
   "services": {
     "send_raw_node_command": {
       "name": "Send raw node command",
-      "description": "[%key:component::isy994::options::step::init::description%]",
+      "description": "Sends a “raw” (e.g., DON, DOF) ISY REST device command to a node using its Home Assistant entity ID. This is useful for devices that aren’t fully supported in Home Assistant yet, such as controls for many NodeServer nodes.",
       "fields": {
         "command": {
           "name": "Command",
diff --git a/homeassistant/components/isy994/switch.py b/homeassistant/components/isy994/switch.py
index c05bd2ddbbb..946feddcd10 100644
--- a/homeassistant/components/isy994/switch.py
+++ b/homeassistant/components/isy994/switch.py
@@ -25,7 +25,7 @@ from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import ISYAuxControlEntity, ISYNodeEntity, ISYProgramEntity
@@ -42,7 +42,9 @@ class ISYSwitchEntityDescription(SwitchEntityDescription):
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ISY switch platform."""
     isy_data: IsyData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/isy994/util.py b/homeassistant/components/isy994/util.py
index ed1a5abca8b..ca5c5ea46a9 100644
--- a/homeassistant/components/isy994/util.py
+++ b/homeassistant/components/isy994/util.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from .const import _LOGGER, DOMAIN
 
diff --git a/homeassistant/components/itach/remote.py b/homeassistant/components/itach/remote.py
index 986dbfb8b95..235d290cccb 100644
--- a/homeassistant/components/itach/remote.py
+++ b/homeassistant/components/itach/remote.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
     DEVICE_DEFAULT_NAME,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/itunes/media_player.py b/homeassistant/components/itunes/media_player.py
index 0f241041c0d..92e3aefe975 100644
--- a/homeassistant/components/itunes/media_player.py
+++ b/homeassistant/components/itunes/media_player.py
@@ -16,7 +16,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT, CONF_SSL
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/ituran/device_tracker.py b/homeassistant/components/ituran/device_tracker.py
index 37796570c61..5f816709864 100644
--- a/homeassistant/components/ituran/device_tracker.py
+++ b/homeassistant/components/ituran/device_tracker.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from homeassistant.components.device_tracker import TrackerEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import IturanConfigEntry
 from .coordinator import IturanDataUpdateCoordinator
@@ -14,7 +14,7 @@ from .entity import IturanBaseEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: IturanConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Ituran tracker from config entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/ituran/sensor.py b/homeassistant/components/ituran/sensor.py
index e962f5bd561..a115b2be89c 100644
--- a/homeassistant/components/ituran/sensor.py
+++ b/homeassistant/components/ituran/sensor.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     UnitOfSpeed,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import IturanConfigEntry
@@ -87,7 +87,7 @@ SENSOR_TYPES: list[IturanSensorEntityDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: IturanConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Ituran sensors from config entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/izone/__init__.py b/homeassistant/components/izone/__init__.py
index c00f2d1f83f..1fd9a03e05f 100644
--- a/homeassistant/components/izone/__init__.py
+++ b/homeassistant/components/izone/__init__.py
@@ -6,7 +6,7 @@ from homeassistant import config_entries
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_EXCLUDE, EVENT_HOMEASSISTANT_STOP, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DATA_CONFIG, IZONE
diff --git a/homeassistant/components/izone/climate.py b/homeassistant/components/izone/climate.py
index e61917c825b..80c3a0384c1 100644
--- a/homeassistant/components/izone/climate.py
+++ b/homeassistant/components/izone/climate.py
@@ -33,7 +33,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_platform
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.temperature import display_temp as show_temp
 from homeassistant.helpers.typing import ConfigType, VolDictType
 
@@ -73,7 +73,9 @@ IZONE_SERVICE_AIRFLOW_SCHEMA: VolDictType = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, config: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    config: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize an IZone Controller."""
     disco = hass.data[DATA_DISCOVERY_SERVICE]
diff --git a/homeassistant/components/jellyfin/__init__.py b/homeassistant/components/jellyfin/__init__.py
index 4f0886dfa22..1cb6219ada0 100644
--- a/homeassistant/components/jellyfin/__init__.py
+++ b/homeassistant/components/jellyfin/__init__.py
@@ -2,16 +2,13 @@
 
 from typing import Any
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import device_registry as dr
 
 from .client_wrapper import CannotConnect, InvalidAuth, create_client, validate_input
 from .const import CONF_CLIENT_DEVICE_ID, DOMAIN, PLATFORMS
-from .coordinator import JellyfinDataUpdateCoordinator
-
-type JellyfinConfigEntry = ConfigEntry[JellyfinDataUpdateCoordinator]
+from .coordinator import JellyfinConfigEntry, JellyfinDataUpdateCoordinator
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: JellyfinConfigEntry) -> bool:
@@ -35,7 +32,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: JellyfinConfigEntry) ->
 
     server_info: dict[str, Any] = connect_result["Servers"][0]
 
-    coordinator = JellyfinDataUpdateCoordinator(hass, client, server_info, user_id)
+    coordinator = JellyfinDataUpdateCoordinator(
+        hass, entry, client, server_info, user_id
+    )
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/jellyfin/client_wrapper.py b/homeassistant/components/jellyfin/client_wrapper.py
index ab5d5e7d7f8..91fe0885e4c 100644
--- a/homeassistant/components/jellyfin/client_wrapper.py
+++ b/homeassistant/components/jellyfin/client_wrapper.py
@@ -97,16 +97,27 @@ def get_artwork_url(
     client: JellyfinClient, item: dict[str, Any], max_width: int = 600
 ) -> str | None:
     """Find a suitable thumbnail for an item."""
-    artwork_id: str = item["Id"]
-    artwork_type = "Primary"
+    artwork_id: str | None = None
+    artwork_type: str | None = None
     parent_backdrop_id: str | None = item.get("ParentBackdropItemId")
 
-    if "Backdrop" in item[ITEM_KEY_IMAGE_TAGS]:
+    if "AlbumPrimaryImageTag" in item:
+        # jellyfin_apiclient_python doesn't support passing a specific tag to `.artwork`,
+        # so we don't use the actual value of AlbumPrimaryImageTag.
+        # However, its mere presence tells us that the album does have primary artwork,
+        # and the resulting URL will pull the primary album art even if the tag is not specified.
+        artwork_type = "Primary"
+        artwork_id = item["AlbumId"]
+    elif "Backdrop" in item[ITEM_KEY_IMAGE_TAGS]:
         artwork_type = "Backdrop"
+        artwork_id = item["Id"]
     elif parent_backdrop_id:
         artwork_type = "Backdrop"
         artwork_id = parent_backdrop_id
-    elif "Primary" not in item[ITEM_KEY_IMAGE_TAGS]:
+    elif "Primary" in item[ITEM_KEY_IMAGE_TAGS]:
+        artwork_type = "Primary"
+        artwork_id = item["Id"]
+    else:
         return None
 
     return str(client.jellyfin.artwork(artwork_id, artwork_type, max_width))
diff --git a/homeassistant/components/jellyfin/config_flow.py b/homeassistant/components/jellyfin/config_flow.py
index 0c170d2485f..03c637a989f 100644
--- a/homeassistant/components/jellyfin/config_flow.py
+++ b/homeassistant/components/jellyfin/config_flow.py
@@ -13,9 +13,9 @@ from homeassistant.const import CONF_PASSWORD, CONF_URL, CONF_USERNAME
 from homeassistant.core import callback
 from homeassistant.util.uuid import random_uuid_hex
 
-from . import JellyfinConfigEntry
 from .client_wrapper import CannotConnect, InvalidAuth, create_client, validate_input
 from .const import CONF_CLIENT_DEVICE_ID, DOMAIN, SUPPORTED_AUDIO_CODECS
+from .coordinator import JellyfinConfigEntry
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/jellyfin/coordinator.py b/homeassistant/components/jellyfin/coordinator.py
index 20428250254..cd22ad4ab39 100644
--- a/homeassistant/components/jellyfin/coordinator.py
+++ b/homeassistant/components/jellyfin/coordinator.py
@@ -13,15 +13,18 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import CONF_CLIENT_DEVICE_ID, DOMAIN, LOGGER, USER_APP_NAME
 
+type JellyfinConfigEntry = ConfigEntry[JellyfinDataUpdateCoordinator]
+
 
 class JellyfinDataUpdateCoordinator(DataUpdateCoordinator[dict[str, dict[str, Any]]]):
     """Data update coordinator for the Jellyfin integration."""
 
-    config_entry: ConfigEntry
+    config_entry: JellyfinConfigEntry
 
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: JellyfinConfigEntry,
         api_client: JellyfinClient,
         system_info: dict[str, Any],
         user_id: str,
@@ -30,6 +33,7 @@ class JellyfinDataUpdateCoordinator(DataUpdateCoordinator[dict[str, dict[str, An
         super().__init__(
             hass=hass,
             logger=LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=10),
         )
@@ -37,7 +41,7 @@ class JellyfinDataUpdateCoordinator(DataUpdateCoordinator[dict[str, dict[str, An
         self.server_id: str = system_info["Id"]
         self.server_name: str = system_info["Name"]
         self.server_version: str | None = system_info.get("Version")
-        self.client_device_id: str = self.config_entry.data[CONF_CLIENT_DEVICE_ID]
+        self.client_device_id: str = config_entry.data[CONF_CLIENT_DEVICE_ID]
         self.user_id: str = user_id
 
         self.session_ids: set[str] = set()
diff --git a/homeassistant/components/jellyfin/diagnostics.py b/homeassistant/components/jellyfin/diagnostics.py
index 8042d588d1b..721e0ae654e 100644
--- a/homeassistant/components/jellyfin/diagnostics.py
+++ b/homeassistant/components/jellyfin/diagnostics.py
@@ -8,7 +8,7 @@ from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_PASSWORD
 from homeassistant.core import HomeAssistant
 
-from . import JellyfinConfigEntry
+from .coordinator import JellyfinConfigEntry
 
 TO_REDACT = {CONF_PASSWORD}
 
diff --git a/homeassistant/components/jellyfin/manifest.json b/homeassistant/components/jellyfin/manifest.json
index 19358cff17c..d6b2261acaa 100644
--- a/homeassistant/components/jellyfin/manifest.json
+++ b/homeassistant/components/jellyfin/manifest.json
@@ -1,12 +1,12 @@
 {
   "domain": "jellyfin",
   "name": "Jellyfin",
-  "codeowners": ["@j-stienstra", "@ctalkington"],
+  "codeowners": ["@RunC0deRun", "@ctalkington"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/jellyfin",
   "integration_type": "service",
   "iot_class": "local_polling",
   "loggers": ["jellyfin_apiclient_python"],
-  "requirements": ["jellyfin-apiclient-python==1.9.2"],
+  "requirements": ["jellyfin-apiclient-python==1.10.0"],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/jellyfin/media_player.py b/homeassistant/components/jellyfin/media_player.py
index bf6e95c0c96..e0fcc8a559b 100644
--- a/homeassistant/components/jellyfin/media_player.py
+++ b/homeassistant/components/jellyfin/media_player.py
@@ -12,21 +12,20 @@ from homeassistant.components.media_player import (
     MediaType,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.dt import parse_datetime
 
-from . import JellyfinConfigEntry
 from .browse_media import build_item_response, build_root_response
 from .client_wrapper import get_artwork_url
-from .const import CONTENT_TYPE_MAP, LOGGER
-from .coordinator import JellyfinDataUpdateCoordinator
+from .const import CONTENT_TYPE_MAP, LOGGER, MAX_IMAGE_WIDTH
+from .coordinator import JellyfinConfigEntry, JellyfinDataUpdateCoordinator
 from .entity import JellyfinClientEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: JellyfinConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Jellyfin media_player from a config entry."""
     coordinator = entry.runtime_data
@@ -170,7 +169,9 @@ class JellyfinMediaPlayer(JellyfinClientEntity, MediaPlayerEntity):
         if self.now_playing is None:
             return None
 
-        return get_artwork_url(self.coordinator.api_client, self.now_playing, 150)
+        return get_artwork_url(
+            self.coordinator.api_client, self.now_playing, MAX_IMAGE_WIDTH
+        )
 
     @property
     def supported_features(self) -> MediaPlayerEntityFeature:
diff --git a/homeassistant/components/jellyfin/media_source.py b/homeassistant/components/jellyfin/media_source.py
index a061118dd0a..a4d08d8d024 100644
--- a/homeassistant/components/jellyfin/media_source.py
+++ b/homeassistant/components/jellyfin/media_source.py
@@ -19,7 +19,6 @@ from homeassistant.components.media_source import (
 )
 from homeassistant.core import HomeAssistant
 
-from . import JellyfinConfigEntry
 from .const import (
     COLLECTION_TYPE_MOVIES,
     COLLECTION_TYPE_MUSIC,
@@ -48,6 +47,7 @@ from .const import (
     PLAYABLE_ITEM_TYPES,
     SUPPORTED_COLLECTION_TYPES,
 )
+from .coordinator import JellyfinConfigEntry
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/jellyfin/remote.py b/homeassistant/components/jellyfin/remote.py
index ae33d58cc0c..27a0b131ca0 100644
--- a/homeassistant/components/jellyfin/remote.py
+++ b/homeassistant/components/jellyfin/remote.py
@@ -14,18 +14,17 @@ from homeassistant.components.remote import (
     RemoteEntity,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import JellyfinConfigEntry
 from .const import LOGGER
-from .coordinator import JellyfinDataUpdateCoordinator
+from .coordinator import JellyfinConfigEntry, JellyfinDataUpdateCoordinator
 from .entity import JellyfinClientEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: JellyfinConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Jellyfin remote from a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/jellyfin/sensor.py b/homeassistant/components/jellyfin/sensor.py
index 5c519f661ee..e1100a9f43b 100644
--- a/homeassistant/components/jellyfin/sensor.py
+++ b/homeassistant/components/jellyfin/sensor.py
@@ -8,10 +8,10 @@ from typing import Any
 
 from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import JellyfinConfigEntry, JellyfinDataUpdateCoordinator
+from .coordinator import JellyfinConfigEntry, JellyfinDataUpdateCoordinator
 from .entity import JellyfinServerEntity
 
 
@@ -43,7 +43,7 @@ SENSOR_TYPES: tuple[JellyfinSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: JellyfinConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Jellyfin sensor based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/jewish_calendar/__init__.py b/homeassistant/components/jewish_calendar/__init__.py
index 823e9bd59be..47d60d74938 100644
--- a/homeassistant/components/jewish_calendar/__init__.py
+++ b/homeassistant/components/jewish_calendar/__init__.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from functools import partial
+import logging
 
 from hdate import Location
 
@@ -14,7 +15,9 @@ from homeassistant.const import (
     CONF_TIME_ZONE,
     Platform,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import config_validation as cv, entity_registry as er
+from homeassistant.helpers.typing import ConfigType
 
 from .const import (
     CONF_CANDLE_LIGHT_MINUTES,
@@ -24,10 +27,21 @@ from .const import (
     DEFAULT_DIASPORA,
     DEFAULT_HAVDALAH_OFFSET_MINUTES,
     DEFAULT_LANGUAGE,
+    DOMAIN,
 )
 from .entity import JewishCalendarConfigEntry, JewishCalendarData
+from .service import async_setup_services
 
+_LOGGER = logging.getLogger(__name__)
 PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR]
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the Jewish Calendar service."""
+    async_setup_services(hass)
+
+    return True
 
 
 async def async_setup_entry(
@@ -80,3 +94,49 @@ async def async_unload_entry(
 ) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(config_entry, PLATFORMS)
+
+
+async def async_migrate_entry(
+    hass: HomeAssistant, config_entry: JewishCalendarConfigEntry
+) -> bool:
+    """Migrate old entry."""
+
+    _LOGGER.debug("Migrating from version %s", config_entry.version)
+
+    @callback
+    def update_unique_id(
+        entity_entry: er.RegistryEntry,
+    ) -> dict[str, str] | None:
+        """Update unique ID of entity entry."""
+        key_translations = {
+            "first_light": "alot_hashachar",
+            "talit": "talit_and_tefillin",
+            "sunrise": "netz_hachama",
+            "gra_end_shma": "sof_zman_shema_gra",
+            "mga_end_shma": "sof_zman_shema_mga",
+            "gra_end_tfila": "sof_zman_tfilla_gra",
+            "mga_end_tfila": "sof_zman_tfilla_mga",
+            "midday": "chatzot_hayom",
+            "big_mincha": "mincha_gedola",
+            "small_mincha": "mincha_ketana",
+            "plag_mincha": "plag_hamincha",
+            "sunset": "shkia",
+            "first_stars": "tset_hakohavim_tsom",
+            "three_stars": "tset_hakohavim_shabbat",
+        }
+        old_keys = tuple(key_translations.keys())
+        if entity_entry.unique_id.endswith(old_keys):
+            old_key = entity_entry.unique_id.split("-")[1]
+            new_unique_id = f"{config_entry.entry_id}-{key_translations[old_key]}"
+            return {"new_unique_id": new_unique_id}
+        return None
+
+    if config_entry.version > 1:
+        # This means the user has downgraded from a future version
+        return False
+
+    if config_entry.version == 1:
+        await er.async_migrate_entries(hass, config_entry.entry_id, update_unique_id)
+        hass.config_entries.async_update_entry(config_entry, version=2)
+
+    return True
diff --git a/homeassistant/components/jewish_calendar/binary_sensor.py b/homeassistant/components/jewish_calendar/binary_sensor.py
index 9fd1371f8a8..f33d79a01f5 100644
--- a/homeassistant/components/jewish_calendar/binary_sensor.py
+++ b/homeassistant/components/jewish_calendar/binary_sensor.py
@@ -5,9 +5,7 @@ from __future__ import annotations
 from collections.abc import Callable
 from dataclasses import dataclass
 import datetime as dt
-from datetime import datetime
 
-import hdate
 from hdate.zmanim import Zmanim
 
 from homeassistant.components.binary_sensor import (
@@ -17,8 +15,8 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.helpers import event
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from .entity import JewishCalendarConfigEntry, JewishCalendarEntity
 
@@ -27,7 +25,7 @@ from .entity import JewishCalendarConfigEntry, JewishCalendarEntity
 class JewishCalendarBinarySensorMixIns(BinarySensorEntityDescription):
     """Binary Sensor description mixin class for Jewish Calendar."""
 
-    is_on: Callable[[Zmanim], bool] = lambda _: False
+    is_on: Callable[[Zmanim, dt.datetime], bool] = lambda _, __: False
 
 
 @dataclass(frozen=True)
@@ -42,18 +40,18 @@ BINARY_SENSORS: tuple[JewishCalendarBinarySensorEntityDescription, ...] = (
         key="issur_melacha_in_effect",
         name="Issur Melacha in Effect",
         icon="mdi:power-plug-off",
-        is_on=lambda state: bool(state.issur_melacha_in_effect),
+        is_on=lambda state, now: bool(state.issur_melacha_in_effect(now)),
     ),
     JewishCalendarBinarySensorEntityDescription(
         key="erev_shabbat_hag",
         name="Erev Shabbat/Hag",
-        is_on=lambda state: bool(state.erev_shabbat_chag),
+        is_on=lambda state, now: bool(state.erev_shabbat_chag(now)),
         entity_registry_enabled_default=False,
     ),
     JewishCalendarBinarySensorEntityDescription(
         key="motzei_shabbat_hag",
         name="Motzei Shabbat/Hag",
-        is_on=lambda state: bool(state.motzei_shabbat_chag),
+        is_on=lambda state, now: bool(state.motzei_shabbat_chag(now)),
         entity_registry_enabled_default=False,
     ),
 )
@@ -62,7 +60,7 @@ BINARY_SENSORS: tuple[JewishCalendarBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: JewishCalendarConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Jewish Calendar binary sensors."""
     async_add_entities(
@@ -84,16 +82,16 @@ class JewishCalendarBinarySensor(JewishCalendarEntity, BinarySensorEntity):
     def is_on(self) -> bool:
         """Return true if sensor is on."""
         zmanim = self._get_zmanim()
-        return self.entity_description.is_on(zmanim)
+        return self.entity_description.is_on(zmanim, dt_util.now())
 
     def _get_zmanim(self) -> Zmanim:
         """Return the Zmanim object for now()."""
-        return hdate.Zmanim(
-            date=dt_util.now(),
+        return Zmanim(
+            date=dt.date.today(),
             location=self._location,
             candle_lighting_offset=self._candle_lighting_offset,
             havdalah_offset=self._havdalah_offset,
-            hebrew=self._hebrew,
+            language=self._language,
         )
 
     async def async_added_to_hass(self) -> None:
@@ -109,7 +107,7 @@ class JewishCalendarBinarySensor(JewishCalendarEntity, BinarySensorEntity):
         return await super().async_will_remove_from_hass()
 
     @callback
-    def _update(self, now: datetime | None = None) -> None:
+    def _update(self, now: dt.datetime | None = None) -> None:
         """Update the state of the sensor."""
         self._update_unsub = None
         self._schedule_update()
@@ -119,7 +117,7 @@ class JewishCalendarBinarySensor(JewishCalendarEntity, BinarySensorEntity):
         """Schedule the next update of the sensor."""
         now = dt_util.now()
         zmanim = self._get_zmanim()
-        update = zmanim.zmanim["sunrise"] + dt.timedelta(days=1)
+        update = zmanim.netz_hachama.local + dt.timedelta(days=1)
         candle_lighting = zmanim.candle_lighting
         if candle_lighting is not None and now < candle_lighting < update:
             update = candle_lighting
diff --git a/homeassistant/components/jewish_calendar/config_flow.py b/homeassistant/components/jewish_calendar/config_flow.py
index a2eadbf57bd..23bcb23435b 100644
--- a/homeassistant/components/jewish_calendar/config_flow.py
+++ b/homeassistant/components/jewish_calendar/config_flow.py
@@ -86,7 +86,7 @@ def _get_data_schema(hass: HomeAssistant) -> vol.Schema:
 class JewishCalendarConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Jewish calendar."""
 
-    VERSION = 1
+    VERSION = 2
 
     @staticmethod
     @callback
diff --git a/homeassistant/components/jewish_calendar/const.py b/homeassistant/components/jewish_calendar/const.py
index 4af76a8927b..0d5455fcd86 100644
--- a/homeassistant/components/jewish_calendar/const.py
+++ b/homeassistant/components/jewish_calendar/const.py
@@ -2,6 +2,9 @@
 
 DOMAIN = "jewish_calendar"
 
+ATTR_DATE = "date"
+ATTR_NUSACH = "nusach"
+
 CONF_DIASPORA = "diaspora"
 CONF_CANDLE_LIGHT_MINUTES = "candle_lighting_minutes_before_sunset"
 CONF_HAVDALAH_OFFSET_MINUTES = "havdalah_minutes_after_sunset"
@@ -11,3 +14,5 @@ DEFAULT_CANDLE_LIGHT = 18
 DEFAULT_DIASPORA = False
 DEFAULT_HAVDALAH_OFFSET_MINUTES = 0
 DEFAULT_LANGUAGE = "english"
+
+SERVICE_COUNT_OMER = "count_omer"
diff --git a/homeassistant/components/jewish_calendar/entity.py b/homeassistant/components/jewish_calendar/entity.py
index 1d2a6e45c0a..2c031f0d160 100644
--- a/homeassistant/components/jewish_calendar/entity.py
+++ b/homeassistant/components/jewish_calendar/entity.py
@@ -3,6 +3,7 @@
 from dataclasses import dataclass
 
 from hdate import Location
+from hdate.translator import Language
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
@@ -17,7 +18,7 @@ type JewishCalendarConfigEntry = ConfigEntry[JewishCalendarData]
 class JewishCalendarData:
     """Jewish Calendar runtime dataclass."""
 
-    language: str
+    language: Language
     diaspora: bool
     location: Location
     candle_lighting_offset: int
@@ -43,7 +44,6 @@ class JewishCalendarEntity(Entity):
         )
         data = config_entry.runtime_data
         self._location = data.location
-        self._hebrew = data.language == "hebrew"
         self._language = data.language
         self._candle_lighting_offset = data.candle_lighting_offset
         self._havdalah_offset = data.havdalah_offset
diff --git a/homeassistant/components/jewish_calendar/icons.json b/homeassistant/components/jewish_calendar/icons.json
new file mode 100644
index 00000000000..24b922df7a2
--- /dev/null
+++ b/homeassistant/components/jewish_calendar/icons.json
@@ -0,0 +1,7 @@
+{
+  "services": {
+    "count_omer": {
+      "service": "mdi:counter"
+    }
+  }
+}
diff --git a/homeassistant/components/jewish_calendar/manifest.json b/homeassistant/components/jewish_calendar/manifest.json
index aca45320002..877c4cf9a99 100644
--- a/homeassistant/components/jewish_calendar/manifest.json
+++ b/homeassistant/components/jewish_calendar/manifest.json
@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/jewish_calendar",
   "iot_class": "calculated",
   "loggers": ["hdate"],
-  "requirements": ["hdate==0.11.1"],
+  "requirements": ["hdate[astral]==1.0.3"],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/jewish_calendar/sensor.py b/homeassistant/components/jewish_calendar/sensor.py
index d3e70eb411c..7cb281b3af4 100644
--- a/homeassistant/components/jewish_calendar/sensor.py
+++ b/homeassistant/components/jewish_calendar/sensor.py
@@ -2,12 +2,13 @@
 
 from __future__ import annotations
 
-from datetime import date as Date
+import datetime as dt
 import logging
-from typing import Any, cast
+from typing import Any
 
-from hdate import HDate, HebrewDate, htables
-from hdate.zmanim import Zmanim
+from hdate import HDateInfo, Zmanim
+from hdate.holidays import HolidayDatabase
+from hdate.parasha import Parasha
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -16,9 +17,9 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import SUN_EVENT_SUNSET, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sun import get_astral_event_date
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .entity import JewishCalendarConfigEntry, JewishCalendarEntity
 
@@ -59,83 +60,83 @@ INFO_SENSORS: tuple[SensorEntityDescription, ...] = (
 
 TIME_SENSORS: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
-        key="first_light",
+        key="alot_hashachar",
         name="Alot Hashachar",  # codespell:ignore alot
         icon="mdi:weather-sunset-up",
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
-        key="talit",
+        key="talit_and_tefillin",
         name="Talit and Tefillin",
         icon="mdi:calendar-clock",
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
-        key="sunrise",
+        key="netz_hachama",
         name="Hanetz Hachama",
         icon="mdi:calendar-clock",
     ),
     SensorEntityDescription(
-        key="gra_end_shma",
+        key="sof_zman_shema_gra",
         name='Latest time for Shma Gr"a',
         icon="mdi:calendar-clock",
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
-        key="mga_end_shma",
+        key="sof_zman_shema_mga",
         name='Latest time for Shma MG"A',
         icon="mdi:calendar-clock",
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
-        key="gra_end_tfila",
+        key="sof_zman_tfilla_gra",
         name='Latest time for Tefilla Gr"a',
         icon="mdi:calendar-clock",
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
-        key="mga_end_tfila",
+        key="sof_zman_tfilla_mga",
         name='Latest time for Tefilla MG"A',
         icon="mdi:calendar-clock",
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
-        key="midday",
+        key="chatzot_hayom",
         name="Chatzot Hayom",
         icon="mdi:calendar-clock",
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
-        key="big_mincha",
+        key="mincha_gedola",
         name="Mincha Gedola",
         icon="mdi:calendar-clock",
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
-        key="small_mincha",
+        key="mincha_ketana",
         name="Mincha Ketana",
         icon="mdi:calendar-clock",
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
-        key="plag_mincha",
+        key="plag_hamincha",
         name="Plag Hamincha",
         icon="mdi:weather-sunset-down",
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
-        key="sunset",
+        key="shkia",
         name="Shkia",
         icon="mdi:weather-sunset",
     ),
     SensorEntityDescription(
-        key="first_stars",
+        key="tset_hakohavim_tsom",
         name="T'set Hakochavim",
         icon="mdi:weather-night",
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
-        key="three_stars",
+        key="tset_hakohavim_shabbat",
         name="T'set Hakochavim, 3 stars",
         icon="mdi:weather-night",
         entity_registry_enabled_default=False,
@@ -168,7 +169,7 @@ TIME_SENSORS: tuple[SensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: JewishCalendarConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Jewish calendar sensors ."""
     sensors = [
@@ -212,7 +213,9 @@ class JewishCalendarSensor(JewishCalendarEntity, SensorEntity):
 
         _LOGGER.debug("Now: %s Sunset: %s", now, sunset)
 
-        daytime_date = HDate(today, diaspora=self._diaspora, hebrew=self._hebrew)
+        daytime_date = HDateInfo(
+            today, diaspora=self._diaspora, language=self._language
+        )
 
         # The Jewish day starts after darkness (called "tzais") and finishes at
         # sunset ("shkia"). The time in between is a gray area
@@ -238,14 +241,14 @@ class JewishCalendarSensor(JewishCalendarEntity, SensorEntity):
             "New value for %s: %s", self.entity_description.key, self._attr_native_value
         )
 
-    def make_zmanim(self, date: Date) -> Zmanim:
+    def make_zmanim(self, date: dt.date) -> Zmanim:
         """Create a Zmanim object."""
         return Zmanim(
             date=date,
             location=self._location,
             candle_lighting_offset=self._candle_lighting_offset,
             havdalah_offset=self._havdalah_offset,
-            hebrew=self._hebrew,
+            language=self._language,
         )
 
     @property
@@ -254,43 +257,40 @@ class JewishCalendarSensor(JewishCalendarEntity, SensorEntity):
         return self._attrs
 
     def get_state(
-        self, daytime_date: HDate, after_shkia_date: HDate, after_tzais_date: HDate
+        self,
+        daytime_date: HDateInfo,
+        after_shkia_date: HDateInfo,
+        after_tzais_date: HDateInfo,
     ) -> Any | None:
         """For a given type of sensor, return the state."""
         # Terminology note: by convention in py-libhdate library, "upcoming"
         # refers to "current" or "upcoming" dates.
         if self.entity_description.key == "date":
-            hdate = cast(HebrewDate, after_shkia_date.hdate)
-            month = htables.MONTHS[hdate.month.value - 1]
+            hdate = after_shkia_date.hdate
+            hdate.month.set_language(self._language)
             self._attrs = {
-                "hebrew_year": hdate.year,
-                "hebrew_month_name": month.hebrew if self._hebrew else month.english,
-                "hebrew_day": hdate.day,
+                "hebrew_year": str(hdate.year),
+                "hebrew_month_name": str(hdate.month),
+                "hebrew_day": str(hdate.day),
             }
-            return after_shkia_date.hebrew_date
+            return after_shkia_date.hdate
         if self.entity_description.key == "weekly_portion":
-            self._attr_options = [
-                (p.hebrew if self._hebrew else p.english) for p in htables.PARASHAOT
-            ]
+            self._attr_options = list(Parasha)
             # Compute the weekly portion based on the upcoming shabbat.
             return after_tzais_date.upcoming_shabbat.parasha
         if self.entity_description.key == "holiday":
-            _id = _type = _type_id = ""
-            _holiday_type = after_shkia_date.holiday_type
-            if isinstance(_holiday_type, list):
-                _id = ", ".join(after_shkia_date.holiday_name)
-                _type = ", ".join([_htype.name for _htype in _holiday_type])
-                _type_id = ", ".join([str(_htype.value) for _htype in _holiday_type])
-            else:
-                _id = after_shkia_date.holiday_name
-                _type = _holiday_type.name
-                _type_id = _holiday_type.value
-            self._attrs = {"id": _id, "type": _type, "type_id": _type_id}
-            self._attr_options = htables.get_all_holidays(self._language)
-
-            return after_shkia_date.holiday_description
+            _holidays = after_shkia_date.holidays
+            _id = ", ".join(holiday.name for holiday in _holidays)
+            _type = ", ".join(
+                dict.fromkeys(_holiday.type.name for _holiday in _holidays)
+            )
+            self._attrs = {"id": _id, "type": _type}
+            self._attr_options = HolidayDatabase(self._diaspora).get_all_names(
+                self._language
+            )
+            return ", ".join(str(holiday) for holiday in _holidays) if _holidays else ""
         if self.entity_description.key == "omer_count":
-            return after_shkia_date.omer_day
+            return after_shkia_date.omer.total_days if after_shkia_date.omer else 0
         if self.entity_description.key == "daf_yomi":
             return daytime_date.daf_yomi
 
@@ -303,7 +303,10 @@ class JewishCalendarTimeSensor(JewishCalendarSensor):
     _attr_device_class = SensorDeviceClass.TIMESTAMP
 
     def get_state(
-        self, daytime_date: HDate, after_shkia_date: HDate, after_tzais_date: HDate
+        self,
+        daytime_date: HDateInfo,
+        after_shkia_date: HDateInfo,
+        after_tzais_date: HDateInfo,
     ) -> Any | None:
         """For a given type of sensor, return the state."""
         if self.entity_description.key == "upcoming_shabbat_candle_lighting":
@@ -325,5 +328,5 @@ class JewishCalendarTimeSensor(JewishCalendarSensor):
             )
             return times.havdalah
 
-        times = self.make_zmanim(dt_util.now()).zmanim
-        return times[self.entity_description.key]
+        times = self.make_zmanim(dt_util.now().date())
+        return times.zmanim[self.entity_description.key].local
diff --git a/homeassistant/components/jewish_calendar/service.py b/homeassistant/components/jewish_calendar/service.py
new file mode 100644
index 00000000000..7c3c7a21f1c
--- /dev/null
+++ b/homeassistant/components/jewish_calendar/service.py
@@ -0,0 +1,63 @@
+"""Services for Jewish Calendar."""
+
+import datetime
+from typing import cast
+
+from hdate import HebrewDate
+from hdate.omer import Nusach, Omer
+from hdate.translator import Language
+import voluptuous as vol
+
+from homeassistant.const import CONF_LANGUAGE
+from homeassistant.core import (
+    HomeAssistant,
+    ServiceCall,
+    ServiceResponse,
+    SupportsResponse,
+)
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.selector import LanguageSelector, LanguageSelectorConfig
+
+from .const import ATTR_DATE, ATTR_NUSACH, DOMAIN, SERVICE_COUNT_OMER
+
+SUPPORTED_LANGUAGES = {"en": "english", "fr": "french", "he": "hebrew"}
+OMER_SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_DATE, default=datetime.date.today): cv.date,
+        vol.Required(ATTR_NUSACH, default="sfarad"): vol.In(
+            [nusach.name.lower() for nusach in Nusach]
+        ),
+        vol.Required(CONF_LANGUAGE, default="he"): LanguageSelector(
+            LanguageSelectorConfig(languages=list(SUPPORTED_LANGUAGES.keys()))
+        ),
+    }
+)
+
+
+def async_setup_services(hass: HomeAssistant) -> None:
+    """Set up the Jewish Calendar services."""
+
+    async def get_omer_count(call: ServiceCall) -> ServiceResponse:
+        """Return the Omer blessing for a given date."""
+        hebrew_date = HebrewDate.from_gdate(call.data["date"])
+        nusach = Nusach[call.data["nusach"].upper()]
+
+        # Currently Omer only supports Hebrew, English, and French and requires
+        # the full language name
+        language = cast(Language, SUPPORTED_LANGUAGES[call.data[CONF_LANGUAGE]])
+
+        omer = Omer(date=hebrew_date, nusach=nusach, language=language)
+        return {
+            "message": str(omer.count_str()),
+            "weeks": omer.week,
+            "days": omer.day,
+            "total_days": omer.total_days,
+        }
+
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_COUNT_OMER,
+        get_omer_count,
+        schema=OMER_SCHEMA,
+        supports_response=SupportsResponse.ONLY,
+    )
diff --git a/homeassistant/components/jewish_calendar/services.yaml b/homeassistant/components/jewish_calendar/services.yaml
new file mode 100644
index 00000000000..b0fa2cfef6c
--- /dev/null
+++ b/homeassistant/components/jewish_calendar/services.yaml
@@ -0,0 +1,28 @@
+count_omer:
+  fields:
+    date:
+      required: true
+      example: "2025-04-14"
+      selector:
+        date:
+    nusach:
+      example: "sfarad"
+      default: "sfarad"
+      selector:
+        select:
+          translation_key: "nusach"
+          options:
+            - "sfarad"
+            - "ashkenaz"
+            - "adot_mizrah"
+            - "italian"
+    language:
+      required: true
+      default: "he"
+      example: "he"
+      selector:
+        language:
+          languages:
+            - "en"
+            - "he"
+            - "fr"
diff --git a/homeassistant/components/jewish_calendar/strings.json b/homeassistant/components/jewish_calendar/strings.json
index 1b7b86c0056..41e666b1e5d 100644
--- a/homeassistant/components/jewish_calendar/strings.json
+++ b/homeassistant/components/jewish_calendar/strings.json
@@ -45,5 +45,35 @@
         }
       }
     }
+  },
+  "selector": {
+    "nusach": {
+      "options": {
+        "sfarad": "Sfarad",
+        "ashkenaz": "Ashkenaz",
+        "adot_mizrah": "Adot Mizrah",
+        "italian": "Italian"
+      }
+    }
+  },
+  "services": {
+    "count_omer": {
+      "name": "Count the Omer",
+      "description": "Returns the phrase for counting the Omer on a given date.",
+      "fields": {
+        "date": {
+          "name": "Date",
+          "description": "Date to count the Omer for."
+        },
+        "nusach": {
+          "name": "Nusach",
+          "description": "Nusach to count the Omer in."
+        },
+        "language": {
+          "name": "Language",
+          "description": "Language to count the Omer in."
+        }
+      }
+    }
   }
 }
diff --git a/homeassistant/components/joaoapps_join/__init__.py b/homeassistant/components/joaoapps_join/__init__.py
index f537866054f..89b5748a714 100644
--- a/homeassistant/components/joaoapps_join/__init__.py
+++ b/homeassistant/components/joaoapps_join/__init__.py
@@ -15,7 +15,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_API_KEY, CONF_DEVICE_ID, CONF_NAME
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/joaoapps_join/notify.py b/homeassistant/components/joaoapps_join/notify.py
index 7fab894b0e4..a3432b96b13 100644
--- a/homeassistant/components/joaoapps_join/notify.py
+++ b/homeassistant/components/joaoapps_join/notify.py
@@ -16,7 +16,7 @@ from homeassistant.components.notify import (
 )
 from homeassistant.const import CONF_API_KEY, CONF_DEVICE_ID
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/juicenet/number.py b/homeassistant/components/juicenet/number.py
index 383d0d590c4..69323884f61 100644
--- a/homeassistant/components/juicenet/number.py
+++ b/homeassistant/components/juicenet/number.py
@@ -13,7 +13,7 @@ from homeassistant.components.number import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import DOMAIN, JUICENET_API, JUICENET_COORDINATOR
@@ -43,7 +43,7 @@ NUMBER_TYPES: tuple[JuiceNetNumberEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the JuiceNet Numbers."""
     juicenet_data = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/juicenet/sensor.py b/homeassistant/components/juicenet/sensor.py
index 1f0b815cd97..7bf0639f5d0 100644
--- a/homeassistant/components/juicenet/sensor.py
+++ b/homeassistant/components/juicenet/sensor.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, JUICENET_API, JUICENET_COORDINATOR
 from .entity import JuiceNetDevice
@@ -70,7 +70,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the JuiceNet Sensors."""
     juicenet_data = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/juicenet/switch.py b/homeassistant/components/juicenet/switch.py
index d800ac58c2c..9f34b7afdb3 100644
--- a/homeassistant/components/juicenet/switch.py
+++ b/homeassistant/components/juicenet/switch.py
@@ -5,7 +5,7 @@ from typing import Any
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, JUICENET_API, JUICENET_COORDINATOR
 from .entity import JuiceNetDevice
@@ -14,7 +14,7 @@ from .entity import JuiceNetDevice
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the JuiceNet switches."""
     juicenet_data = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/justnimbus/__init__.py b/homeassistant/components/justnimbus/__init__.py
index 101a2086962..123807d887c 100644
--- a/homeassistant/components/justnimbus/__init__.py
+++ b/homeassistant/components/justnimbus/__init__.py
@@ -13,7 +13,7 @@ from .coordinator import JustNimbusCoordinator
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up JustNimbus from a config entry."""
     if "zip_code" in entry.data:
-        coordinator = JustNimbusCoordinator(hass=hass, entry=entry)
+        coordinator = JustNimbusCoordinator(hass, entry)
     else:
         raise ConfigEntryAuthFailed
     await coordinator.async_config_entry_first_refresh()
diff --git a/homeassistant/components/justnimbus/coordinator.py b/homeassistant/components/justnimbus/coordinator.py
index 4031ad86fdf..a6945c45417 100644
--- a/homeassistant/components/justnimbus/coordinator.py
+++ b/homeassistant/components/justnimbus/coordinator.py
@@ -20,16 +20,20 @@ _LOGGER = logging.getLogger(__name__)
 class JustNimbusCoordinator(DataUpdateCoordinator[justnimbus.JustNimbusModel]):
     """Data update coordinator."""
 
-    def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
         """Initialize the coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(minutes=1),
         )
         self._client = justnimbus.JustNimbusClient(
-            client_id=entry.data[CONF_CLIENT_ID], zip_code=entry.data[CONF_ZIP_CODE]
+            client_id=config_entry.data[CONF_CLIENT_ID],
+            zip_code=config_entry.data[CONF_ZIP_CODE],
         )
 
     async def _async_update_data(self) -> justnimbus.JustNimbusModel:
diff --git a/homeassistant/components/justnimbus/sensor.py b/homeassistant/components/justnimbus/sensor.py
index c2c22307371..1e288e272cd 100644
--- a/homeassistant/components/justnimbus/sensor.py
+++ b/homeassistant/components/justnimbus/sensor.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     UnitOfVolume,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import JustNimbusCoordinator
@@ -101,7 +101,9 @@ SENSOR_TYPES = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the JustNimbus sensor."""
     coordinator: JustNimbusCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/jvc_projector/__init__.py b/homeassistant/components/jvc_projector/__init__.py
index 09e93127e40..ad7e333ca13 100644
--- a/homeassistant/components/jvc_projector/__init__.py
+++ b/homeassistant/components/jvc_projector/__init__.py
@@ -4,7 +4,6 @@ from __future__ import annotations
 
 from jvcprojector import JvcProjector, JvcProjectorAuthError, JvcProjectorConnectError
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_HOST,
     CONF_PASSWORD,
@@ -15,9 +14,7 @@ from homeassistant.const import (
 from homeassistant.core import Event, HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 
-from .coordinator import JvcProjectorDataUpdateCoordinator
-
-type JVCConfigEntry = ConfigEntry[JvcProjectorDataUpdateCoordinator]
+from .coordinator import JVCConfigEntry, JvcProjectorDataUpdateCoordinator
 
 PLATFORMS = [Platform.BINARY_SENSOR, Platform.REMOTE, Platform.SELECT, Platform.SENSOR]
 
@@ -41,7 +38,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: JVCConfigEntry) -> bool:
         await device.disconnect()
         raise ConfigEntryAuthFailed("Password authentication failed") from err
 
-    coordinator = JvcProjectorDataUpdateCoordinator(hass, device)
+    coordinator = JvcProjectorDataUpdateCoordinator(hass, entry, device)
     await coordinator.async_config_entry_first_refresh()
 
     entry.runtime_data = coordinator
diff --git a/homeassistant/components/jvc_projector/binary_sensor.py b/homeassistant/components/jvc_projector/binary_sensor.py
index 6dfac63892b..7ae76298839 100644
--- a/homeassistant/components/jvc_projector/binary_sensor.py
+++ b/homeassistant/components/jvc_projector/binary_sensor.py
@@ -6,16 +6,18 @@ from jvcprojector import const
 
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import JVCConfigEntry, JvcProjectorDataUpdateCoordinator
+from .coordinator import JVCConfigEntry, JvcProjectorDataUpdateCoordinator
 from .entity import JvcProjectorEntity
 
 ON_STATUS = (const.ON, const.WARMING)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: JVCConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: JVCConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the JVC Projector platform from a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/jvc_projector/coordinator.py b/homeassistant/components/jvc_projector/coordinator.py
index a2ecfa8eb52..db97b05f980 100644
--- a/homeassistant/components/jvc_projector/coordinator.py
+++ b/homeassistant/components/jvc_projector/coordinator.py
@@ -13,6 +13,7 @@ from jvcprojector import (
     const,
 )
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.device_registry import format_mac
@@ -25,15 +26,22 @@ _LOGGER = logging.getLogger(__name__)
 INTERVAL_SLOW = timedelta(seconds=10)
 INTERVAL_FAST = timedelta(seconds=5)
 
+type JVCConfigEntry = ConfigEntry[JvcProjectorDataUpdateCoordinator]
+
 
 class JvcProjectorDataUpdateCoordinator(DataUpdateCoordinator[dict[str, str]]):
     """Data update coordinator for the JVC Projector integration."""
 
-    def __init__(self, hass: HomeAssistant, device: JvcProjector) -> None:
+    config_entry: JVCConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: JVCConfigEntry, device: JvcProjector
+    ) -> None:
         """Initialize the coordinator."""
         super().__init__(
             hass=hass,
             logger=_LOGGER,
+            config_entry=config_entry,
             name=NAME,
             update_interval=INTERVAL_SLOW,
         )
diff --git a/homeassistant/components/jvc_projector/remote.py b/homeassistant/components/jvc_projector/remote.py
index f90a2816363..e1aff2fbb4c 100644
--- a/homeassistant/components/jvc_projector/remote.py
+++ b/homeassistant/components/jvc_projector/remote.py
@@ -12,9 +12,9 @@ from jvcprojector import const
 from homeassistant.components.remote import RemoteEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import JVCConfigEntry
+from .coordinator import JVCConfigEntry
 from .entity import JvcProjectorEntity
 
 COMMANDS = {
@@ -54,7 +54,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: JVCConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: JVCConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the JVC Projector platform from a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/jvc_projector/select.py b/homeassistant/components/jvc_projector/select.py
index 60c80f98fc0..b83695609cb 100644
--- a/homeassistant/components/jvc_projector/select.py
+++ b/homeassistant/components/jvc_projector/select.py
@@ -10,9 +10,9 @@ from jvcprojector import JvcProjector, const
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import JVCConfigEntry, JvcProjectorDataUpdateCoordinator
+from .coordinator import JVCConfigEntry, JvcProjectorDataUpdateCoordinator
 from .entity import JvcProjectorEntity
 
 
@@ -40,7 +40,7 @@ SELECTS: Final[list[JvcProjectorSelectDescription]] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: JVCConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the JVC Projector platform from a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/jvc_projector/sensor.py b/homeassistant/components/jvc_projector/sensor.py
index 3edf51e4316..7a7799bc4ee 100644
--- a/homeassistant/components/jvc_projector/sensor.py
+++ b/homeassistant/components/jvc_projector/sensor.py
@@ -11,9 +11,9 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import JVCConfigEntry, JvcProjectorDataUpdateCoordinator
+from .coordinator import JVCConfigEntry, JvcProjectorDataUpdateCoordinator
 from .entity import JvcProjectorEntity
 
 JVC_SENSORS = (
@@ -34,7 +34,9 @@ JVC_SENSORS = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: JVCConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: JVCConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the JVC Projector platform from a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/jvc_projector/strings.json b/homeassistant/components/jvc_projector/strings.json
index b517bf064e1..c6e5736bd2d 100644
--- a/homeassistant/components/jvc_projector/strings.json
+++ b/homeassistant/components/jvc_projector/strings.json
@@ -36,7 +36,7 @@
   "entity": {
     "binary_sensor": {
       "jvc_power": {
-        "name": "[%key:component::sensor::entity_component::power::name%]"
+        "name": "[%key:component::binary_sensor::entity_component::power::name%]"
       }
     },
     "select": {
diff --git a/homeassistant/components/kaleidescape/media_player.py b/homeassistant/components/kaleidescape/media_player.py
index 33acb899728..88e2e16bef2 100644
--- a/homeassistant/components/kaleidescape/media_player.py
+++ b/homeassistant/components/kaleidescape/media_player.py
@@ -22,7 +22,7 @@ if TYPE_CHECKING:
 
     from homeassistant.config_entries import ConfigEntry
     from homeassistant.core import HomeAssistant
-    from homeassistant.helpers.entity_platform import AddEntitiesCallback
+    from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 
 KALEIDESCAPE_PLAYING_STATES = [
@@ -38,7 +38,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the platform from a config entry."""
     entities = [KaleidescapeMediaPlayer(hass.data[KALEIDESCAPE_DOMAIN][entry.entry_id])]
diff --git a/homeassistant/components/kaleidescape/remote.py b/homeassistant/components/kaleidescape/remote.py
index 2d35ad2787f..ddafd52f220 100644
--- a/homeassistant/components/kaleidescape/remote.py
+++ b/homeassistant/components/kaleidescape/remote.py
@@ -18,11 +18,13 @@ if TYPE_CHECKING:
 
     from homeassistant.config_entries import ConfigEntry
     from homeassistant.core import HomeAssistant
-    from homeassistant.helpers.entity_platform import AddEntitiesCallback
+    from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the platform from a config entry."""
     entities = [KaleidescapeRemote(hass.data[KALEIDESCAPE_DOMAIN][entry.entry_id])]
diff --git a/homeassistant/components/kaleidescape/sensor.py b/homeassistant/components/kaleidescape/sensor.py
index 5520943e683..8bff5df2e70 100644
--- a/homeassistant/components/kaleidescape/sensor.py
+++ b/homeassistant/components/kaleidescape/sensor.py
@@ -18,7 +18,7 @@ if TYPE_CHECKING:
 
     from homeassistant.config_entries import ConfigEntry
     from homeassistant.core import HomeAssistant
-    from homeassistant.helpers.entity_platform import AddEntitiesCallback
+    from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
     from homeassistant.helpers.typing import StateType
 
 
@@ -131,7 +131,9 @@ SENSOR_TYPES: tuple[KaleidescapeSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the platform from a config entry."""
     device: KaleidescapeDevice = hass.data[KALEIDESCAPE_DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/kankun/switch.py b/homeassistant/components/kankun/switch.py
index cd91b7660c8..51bddebeb77 100644
--- a/homeassistant/components/kankun/switch.py
+++ b/homeassistant/components/kankun/switch.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     CONF_USERNAME,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/keba/__init__.py b/homeassistant/components/keba/__init__.py
index 34eb7c99166..2c372cf1a25 100644
--- a/homeassistant/components/keba/__init__.py
+++ b/homeassistant/components/keba/__init__.py
@@ -8,8 +8,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant, ServiceCall
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/keba/strings.json b/homeassistant/components/keba/strings.json
index ed8594a1068..49ce01f4332 100644
--- a/homeassistant/components/keba/strings.json
+++ b/homeassistant/components/keba/strings.json
@@ -2,7 +2,7 @@
   "services": {
     "request_data": {
       "name": "Request data",
-      "description": "Requesta new data from the charging station."
+      "description": "Requests new data from the charging station."
     },
     "authorize": {
       "name": "Authorize",
@@ -46,7 +46,7 @@
       "fields": {
         "failsafe_timeout": {
           "name": "Failsafe timeout",
-          "description": "Timeout after which the failsafe mode is triggered, if set_current was not executed during this time."
+          "description": "Timeout after which the failsafe mode is triggered if the 'Set current' action was not run during this time."
         },
         "failsafe_fallback": {
           "name": "Failsafe fallback",
@@ -54,7 +54,7 @@
         },
         "failsafe_persist": {
           "name": "Failsafe persist",
-          "description": "If failsafe_persist is 0, the failsafe option is only until charging station reboot. If failsafe_persist is 1, the failsafe option will survive a reboot."
+          "description": "If set to 0, the failsafe option will be disabled after a charging station reboot. If set to 1, the failsafe option will survive a reboot."
         }
       }
     }
diff --git a/homeassistant/components/keenetic_ndms2/binary_sensor.py b/homeassistant/components/keenetic_ndms2/binary_sensor.py
index cb7d83b9238..4d1b5da3552 100644
--- a/homeassistant/components/keenetic_ndms2/binary_sensor.py
+++ b/homeassistant/components/keenetic_ndms2/binary_sensor.py
@@ -7,7 +7,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import KeeneticRouter
 from .const import DOMAIN, ROUTER
@@ -16,7 +16,7 @@ from .const import DOMAIN, ROUTER
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up device tracker for Keenetic NDMS2 component."""
     router: KeeneticRouter = hass.data[DOMAIN][config_entry.entry_id][ROUTER]
diff --git a/homeassistant/components/keenetic_ndms2/device_tracker.py b/homeassistant/components/keenetic_ndms2/device_tracker.py
index efd2a88b1f8..4143611d6af 100644
--- a/homeassistant/components/keenetic_ndms2/device_tracker.py
+++ b/homeassistant/components/keenetic_ndms2/device_tracker.py
@@ -14,8 +14,8 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN, ROUTER
 from .router import KeeneticRouter
@@ -26,7 +26,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up device tracker for Keenetic NDMS2 component."""
     router: KeeneticRouter = hass.data[DOMAIN][config_entry.entry_id][ROUTER]
diff --git a/homeassistant/components/keenetic_ndms2/router.py b/homeassistant/components/keenetic_ndms2/router.py
index 5a4f32a05cd..8c3079b910d 100644
--- a/homeassistant/components/keenetic_ndms2/router.py
+++ b/homeassistant/components/keenetic_ndms2/router.py
@@ -22,7 +22,7 @@ from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.event import async_call_later
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import (
     CONF_CONSIDER_HOME,
diff --git a/homeassistant/components/keenetic_ndms2/strings.json b/homeassistant/components/keenetic_ndms2/strings.json
index 765a3fc4d47..739846de0a8 100644
--- a/homeassistant/components/keenetic_ndms2/strings.json
+++ b/homeassistant/components/keenetic_ndms2/strings.json
@@ -21,7 +21,7 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
       "no_udn": "SSDP discovery info has no UDN",
-      "not_keenetic_ndms2": "Discovered item is not a Keenetic router"
+      "not_keenetic_ndms2": "Discovered device is not a Keenetic router"
     }
   },
   "options": {
@@ -33,7 +33,7 @@
           "interfaces": "Choose interfaces to scan",
           "try_hotspot": "Use 'ip hotspot' data (most accurate)",
           "include_arp": "Use ARP data (ignored if hotspot data used)",
-          "include_associated": "Use WiFi AP associations data (ignored if hotspot data used)"
+          "include_associated": "Use Wi-Fi AP associations data (ignored if hotspot data used)"
         }
       }
     }
diff --git a/homeassistant/components/kegtron/sensor.py b/homeassistant/components/kegtron/sensor.py
index e0638fccea0..602c61f96ff 100644
--- a/homeassistant/components/kegtron/sensor.py
+++ b/homeassistant/components/kegtron/sensor.py
@@ -27,7 +27,7 @@ from homeassistant.const import (
     UnitOfVolume,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from .const import DOMAIN
@@ -110,7 +110,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Kegtron BLE sensors."""
     coordinator: PassiveBluetoothProcessorCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/keyboard_remote/__init__.py b/homeassistant/components/keyboard_remote/__init__.py
index 5831a770466..979aeb73e45 100644
--- a/homeassistant/components/keyboard_remote/__init__.py
+++ b/homeassistant/components/keyboard_remote/__init__.py
@@ -14,7 +14,7 @@ import voluptuous as vol
 
 from homeassistant.const import EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/keyboard_remote/manifest.json b/homeassistant/components/keyboard_remote/manifest.json
index b405f36bb23..f543ae72972 100644
--- a/homeassistant/components/keyboard_remote/manifest.json
+++ b/homeassistant/components/keyboard_remote/manifest.json
@@ -7,5 +7,5 @@
   "iot_class": "local_push",
   "loggers": ["aionotify", "evdev"],
   "quality_scale": "legacy",
-  "requirements": ["evdev==1.6.1", "asyncinotify==4.0.2"]
+  "requirements": ["evdev==1.6.1", "asyncinotify==4.2.0"]
 }
diff --git a/homeassistant/components/keymitt_ble/strings.json b/homeassistant/components/keymitt_ble/strings.json
index 2a1f428603e..5e7e895d222 100644
--- a/homeassistant/components/keymitt_ble/strings.json
+++ b/homeassistant/components/keymitt_ble/strings.json
@@ -34,7 +34,7 @@
   "services": {
     "calibrate": {
       "name": "Calibrate",
-      "description": "Calibration - Set depth, press & hold duration, and operation mode. Warning - this will send a push command to the device.",
+      "description": "Sets the depth, press or release duration, and operation mode. Warning - this will send a push command to the device.",
       "fields": {
         "entity_id": {
           "name": "Entity",
@@ -42,15 +42,15 @@
         },
         "depth": {
           "name": "Depth",
-          "description": "Depth in percent."
+          "description": "How far to extend the push arm."
         },
         "duration": {
           "name": "Duration",
-          "description": "Duration in seconds."
+          "description": "How long to press or release."
         },
         "mode": {
           "name": "[%key:common::config_flow::data::mode%]",
-          "description": "Normal | invert | toggle."
+          "description": "The operation mode of the arm."
         }
       }
     }
diff --git a/homeassistant/components/keymitt_ble/switch.py b/homeassistant/components/keymitt_ble/switch.py
index ca458c5020f..57d3af98062 100644
--- a/homeassistant/components/keymitt_ble/switch.py
+++ b/homeassistant/components/keymitt_ble/switch.py
@@ -11,7 +11,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import (
-    AddEntitiesCallback,
+    AddConfigEntryEntitiesCallback,
     async_get_current_platform,
 )
 from homeassistant.helpers.typing import VolDictType
@@ -29,7 +29,9 @@ CALIBRATE_SCHEMA: VolDictType = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MicroBot based on a config entry."""
     coordinator: MicroBotDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/kira/__init__.py b/homeassistant/components/kira/__init__.py
index 52618a125b6..092fdf8398c 100644
--- a/homeassistant/components/kira/__init__.py
+++ b/homeassistant/components/kira/__init__.py
@@ -21,8 +21,7 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 DOMAIN = "kira"
diff --git a/homeassistant/components/kitchen_sink/__init__.py b/homeassistant/components/kitchen_sink/__init__.py
index 88d0c868636..2f876ca855d 100644
--- a/homeassistant/components/kitchen_sink/__init__.py
+++ b/homeassistant/components/kitchen_sink/__init__.py
@@ -12,19 +12,29 @@ from random import random
 import voluptuous as vol
 
 from homeassistant.components.recorder import DOMAIN as RECORDER_DOMAIN, get_instance
-from homeassistant.components.recorder.models import StatisticData, StatisticMetaData
+from homeassistant.components.recorder.models import (
+    StatisticData,
+    StatisticMeanType,
+    StatisticMetaData,
+)
 from homeassistant.components.recorder.statistics import (
     async_add_external_statistics,
     async_import_statistics,
     get_last_statistics,
 )
 from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
-from homeassistant.const import Platform, UnitOfEnergy, UnitOfTemperature, UnitOfVolume
+from homeassistant.const import (
+    DEGREE,
+    Platform,
+    UnitOfEnergy,
+    UnitOfTemperature,
+    UnitOfVolume,
+)
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import DATA_BACKUP_AGENT_LISTENERS, DOMAIN
 
@@ -70,11 +80,15 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     return True
 
 
-async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set the config entry up."""
+    if "recorder" in hass.config.components:
+        # Insert stats for mean_type_changed issue
+        await _insert_wrong_wind_direction_statistics(hass)
+
     # Set up demo platforms with config entry
     await hass.config_entries.async_forward_entry_setups(
-        config_entry, COMPONENTS_WITH_DEMO_PLATFORM
+        entry, COMPONENTS_WITH_DEMO_PLATFORM
     )
 
     # Create issues
@@ -85,7 +99,9 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
         await _insert_statistics(hass)
 
     # Start a reauth flow
-    config_entry.async_start_reauth(hass)
+    entry.async_start_reauth(hass)
+
+    entry.async_on_unload(entry.add_update_listener(_async_update_listener))
 
     # Notify backup listeners
     hass.async_create_task(_notify_backup_listeners(hass), eager_start=False)
@@ -93,6 +109,11 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     return True
 
 
+async def _async_update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Handle update."""
+    await hass.config_entries.async_reload(entry.entry_id)
+
+
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload config entry."""
     # Notify backup listeners
@@ -226,7 +247,7 @@ async def _insert_statistics(hass: HomeAssistant) -> None:
         "name": "Outdoor temperature",
         "statistic_id": f"{DOMAIN}:temperature_outdoor",
         "unit_of_measurement": UnitOfTemperature.CELSIUS,
-        "has_mean": True,
+        "mean_type": StatisticMeanType.ARITHMETIC,
         "has_sum": False,
     }
     statistics = _generate_mean_statistics(yesterday_midnight, today_midnight, 15, 1)
@@ -239,7 +260,7 @@ async def _insert_statistics(hass: HomeAssistant) -> None:
         "name": "Energy consumption 1",
         "statistic_id": f"{DOMAIN}:energy_consumption_kwh",
         "unit_of_measurement": UnitOfEnergy.KILO_WATT_HOUR,
-        "has_mean": False,
+        "mean_type": StatisticMeanType.NONE,
         "has_sum": True,
     }
     await _insert_sum_statistics(hass, metadata, yesterday_midnight, today_midnight, 1)
@@ -251,7 +272,7 @@ async def _insert_statistics(hass: HomeAssistant) -> None:
         "name": "Energy consumption 2",
         "statistic_id": f"{DOMAIN}:energy_consumption_mwh",
         "unit_of_measurement": UnitOfEnergy.MEGA_WATT_HOUR,
-        "has_mean": False,
+        "mean_type": StatisticMeanType.NONE,
         "has_sum": True,
     }
     await _insert_sum_statistics(
@@ -265,7 +286,7 @@ async def _insert_statistics(hass: HomeAssistant) -> None:
         "name": "Gas consumption 1",
         "statistic_id": f"{DOMAIN}:gas_consumption_m3",
         "unit_of_measurement": UnitOfVolume.CUBIC_METERS,
-        "has_mean": False,
+        "mean_type": StatisticMeanType.NONE,
         "has_sum": True,
     }
     await _insert_sum_statistics(
@@ -279,7 +300,7 @@ async def _insert_statistics(hass: HomeAssistant) -> None:
         "name": "Gas consumption 2",
         "statistic_id": f"{DOMAIN}:gas_consumption_ft3",
         "unit_of_measurement": UnitOfVolume.CUBIC_FEET,
-        "has_mean": False,
+        "mean_type": StatisticMeanType.NONE,
         "has_sum": True,
     }
     await _insert_sum_statistics(hass, metadata, yesterday_midnight, today_midnight, 15)
@@ -289,9 +310,9 @@ async def _insert_statistics(hass: HomeAssistant) -> None:
     metadata = {
         "source": RECORDER_DOMAIN,
         "name": None,
-        "statistic_id": "sensor.statistics_issue_1",
+        "statistic_id": "sensor.statistics_issues_issue_1",
         "unit_of_measurement": UnitOfVolume.CUBIC_METERS,
-        "has_mean": True,
+        "mean_type": StatisticMeanType.ARITHMETIC,
         "has_sum": False,
     }
     statistics = _generate_mean_statistics(yesterday_midnight, today_midnight, 15, 1)
@@ -301,9 +322,9 @@ async def _insert_statistics(hass: HomeAssistant) -> None:
     metadata = {
         "source": RECORDER_DOMAIN,
         "name": None,
-        "statistic_id": "sensor.statistics_issue_2",
+        "statistic_id": "sensor.statistics_issues_issue_2",
         "unit_of_measurement": "cats",
-        "has_mean": True,
+        "mean_type": StatisticMeanType.ARITHMETIC,
         "has_sum": False,
     }
     statistics = _generate_mean_statistics(yesterday_midnight, today_midnight, 15, 1)
@@ -313,9 +334,9 @@ async def _insert_statistics(hass: HomeAssistant) -> None:
     metadata = {
         "source": RECORDER_DOMAIN,
         "name": None,
-        "statistic_id": "sensor.statistics_issue_3",
+        "statistic_id": "sensor.statistics_issues_issue_3",
         "unit_of_measurement": UnitOfVolume.CUBIC_METERS,
-        "has_mean": True,
+        "mean_type": StatisticMeanType.ARITHMETIC,
         "has_sum": False,
     }
     statistics = _generate_mean_statistics(yesterday_midnight, today_midnight, 15, 1)
@@ -325,10 +346,30 @@ async def _insert_statistics(hass: HomeAssistant) -> None:
     metadata = {
         "source": RECORDER_DOMAIN,
         "name": None,
-        "statistic_id": "sensor.statistics_issue_4",
+        "statistic_id": "sensor.statistics_issues_issue_4",
         "unit_of_measurement": UnitOfVolume.CUBIC_METERS,
-        "has_mean": True,
+        "mean_type": StatisticMeanType.ARITHMETIC,
         "has_sum": False,
     }
     statistics = _generate_mean_statistics(yesterday_midnight, today_midnight, 15, 1)
     async_import_statistics(hass, metadata, statistics)
+
+
+async def _insert_wrong_wind_direction_statistics(hass: HomeAssistant) -> None:
+    """Insert some fake wind direction statistics."""
+    now = dt_util.now()
+    yesterday = now - datetime.timedelta(days=1)
+    yesterday_midnight = yesterday.replace(hour=0, minute=0, second=0, microsecond=0)
+    today_midnight = yesterday_midnight + datetime.timedelta(days=1)
+
+    # Add some statistics required to raise the mean_type_changed issue later
+    metadata: StatisticMetaData = {
+        "source": RECORDER_DOMAIN,
+        "name": None,
+        "statistic_id": "sensor.statistics_issues_issue_5",
+        "unit_of_measurement": DEGREE,
+        "mean_type": StatisticMeanType.ARITHMETIC,
+        "has_sum": False,
+    }
+    statistics = _generate_mean_statistics(yesterday_midnight, today_midnight, 0, 360)
+    async_import_statistics(hass, metadata, statistics)
diff --git a/homeassistant/components/kitchen_sink/backup.py b/homeassistant/components/kitchen_sink/backup.py
index c4a045aeefc..46b204845ad 100644
--- a/homeassistant/components/kitchen_sink/backup.py
+++ b/homeassistant/components/kitchen_sink/backup.py
@@ -7,7 +7,13 @@ from collections.abc import AsyncIterator, Callable, Coroutine
 import logging
 from typing import Any
 
-from homeassistant.components.backup import AddonInfo, AgentBackup, BackupAgent, Folder
+from homeassistant.components.backup import (
+    AddonInfo,
+    AgentBackup,
+    BackupAgent,
+    BackupNotFound,
+    Folder,
+)
 from homeassistant.core import HomeAssistant, callback
 
 from . import DATA_BACKUP_AGENT_LISTENERS, DOMAIN
@@ -51,7 +57,7 @@ class KitchenSinkBackupAgent(BackupAgent):
     def __init__(self, name: str) -> None:
         """Initialize the kitchen sink backup sync agent."""
         super().__init__()
-        self.name = name
+        self.name = self.unique_id = name
         self._uploads = [
             AgentBackup(
                 addons=[AddonInfo(name="Test", slug="test", version="1.0.0")],
@@ -110,9 +116,9 @@ class KitchenSinkBackupAgent(BackupAgent):
         self,
         backup_id: str,
         **kwargs: Any,
-    ) -> AgentBackup | None:
+    ) -> AgentBackup:
         """Return a backup."""
         for backup in self._uploads:
             if backup.backup_id == backup_id:
                 return backup
-        return None
+        raise BackupNotFound(f"Backup {backup_id} not found")
diff --git a/homeassistant/components/kitchen_sink/button.py b/homeassistant/components/kitchen_sink/button.py
index 5c62c4b32d1..1ee9bd78095 100644
--- a/homeassistant/components/kitchen_sink/button.py
+++ b/homeassistant/components/kitchen_sink/button.py
@@ -7,7 +7,7 @@ from homeassistant.components.button import ButtonEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 
@@ -15,7 +15,7 @@ from . import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the demo button platform."""
     async_add_entities(
diff --git a/homeassistant/components/kitchen_sink/config_flow.py b/homeassistant/components/kitchen_sink/config_flow.py
index 019d1dddcad..aa722d27944 100644
--- a/homeassistant/components/kitchen_sink/config_flow.py
+++ b/homeassistant/components/kitchen_sink/config_flow.py
@@ -12,9 +12,12 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
+    ConfigSubentryFlow,
     OptionsFlow,
+    SubentryFlowResult,
 )
 from homeassistant.core import callback
+from homeassistant.helpers import config_validation as cv
 
 from . import DOMAIN
 
@@ -35,6 +38,14 @@ class KitchenSinkConfigFlow(ConfigFlow, domain=DOMAIN):
         """Get the options flow for this handler."""
         return OptionsFlowHandler()
 
+    @classmethod
+    @callback
+    def async_get_supported_subentry_types(
+        cls, config_entry: ConfigEntry
+    ) -> dict[str, type[ConfigSubentryFlow]]:
+        """Return subentries supported by this handler."""
+        return {"entity": SubentryFlowHandler}
+
     async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
         """Set the config entry up from yaml."""
         return self.async_create_entry(title="Kitchen Sink", data=import_data)
@@ -70,27 +81,84 @@ class OptionsFlowHandler(OptionsFlow):
         if user_input is not None:
             return self.async_create_entry(data=self.config_entry.options | user_input)
 
+        data_schema = vol.Schema(
+            {
+                vol.Required("section_1"): data_entry_flow.section(
+                    vol.Schema(
+                        {
+                            vol.Optional(
+                                CONF_BOOLEAN,
+                                default=self.config_entry.options.get(
+                                    CONF_BOOLEAN, False
+                                ),
+                            ): bool,
+                            vol.Optional(CONF_INT): cv.positive_int,
+                        }
+                    ),
+                    {"collapsed": False},
+                ),
+            }
+        )
+        self.add_suggested_values_to_schema(
+            data_schema,
+            {"section_1": {"int": self.config_entry.options.get(CONF_INT, 10)}},
+        )
+
+        return self.async_show_form(step_id="options_1", data_schema=data_schema)
+
+
+class SubentryFlowHandler(ConfigSubentryFlow):
+    """Handle subentry flow."""
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> SubentryFlowResult:
+        """User flow to create a sensor subentry."""
+        return await self.async_step_add_sensor()
+
+    async def async_step_add_sensor(
+        self, user_input: dict[str, Any] | None = None
+    ) -> SubentryFlowResult:
+        """Add a new sensor."""
+        if user_input is not None:
+            title = user_input.pop("name")
+            return self.async_create_entry(data=user_input, title=title)
+
         return self.async_show_form(
-            step_id="options_1",
+            step_id="add_sensor",
             data_schema=vol.Schema(
                 {
-                    vol.Required("section_1"): data_entry_flow.section(
-                        vol.Schema(
-                            {
-                                vol.Optional(
-                                    CONF_BOOLEAN,
-                                    default=self.config_entry.options.get(
-                                        CONF_BOOLEAN, False
-                                    ),
-                                ): bool,
-                                vol.Optional(
-                                    CONF_INT,
-                                    default=self.config_entry.options.get(CONF_INT, 10),
-                                ): int,
-                            }
-                        ),
-                        {"collapsed": False},
-                    ),
+                    vol.Required("name"): str,
+                    vol.Required("state"): int,
+                }
+            ),
+        )
+
+    async def async_step_reconfigure(
+        self, user_input: dict[str, Any] | None = None
+    ) -> SubentryFlowResult:
+        """Reconfigure a sensor subentry."""
+        return await self.async_step_reconfigure_sensor()
+
+    async def async_step_reconfigure_sensor(
+        self, user_input: dict[str, Any] | None = None
+    ) -> SubentryFlowResult:
+        """Reconfigure a sensor."""
+        if user_input is not None:
+            title = user_input.pop("name")
+            return self.async_update_and_abort(
+                self._get_entry(),
+                self._get_reconfigure_subentry(),
+                data=user_input,
+                title=title,
+            )
+
+        return self.async_show_form(
+            step_id="reconfigure_sensor",
+            data_schema=vol.Schema(
+                {
+                    vol.Required("name"): str,
+                    vol.Required("state"): int,
                 }
             ),
         )
diff --git a/homeassistant/components/kitchen_sink/image.py b/homeassistant/components/kitchen_sink/image.py
index 504b36464f5..130317f4bc5 100644
--- a/homeassistant/components/kitchen_sink/image.py
+++ b/homeassistant/components/kitchen_sink/image.py
@@ -7,7 +7,10 @@ from pathlib import Path
 from homeassistant.components.image import ImageEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util
 
@@ -35,7 +38,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Everything but the Kitchen Sink config entry."""
     await async_setup_platform(hass, {}, async_add_entities)
diff --git a/homeassistant/components/kitchen_sink/lawn_mower.py b/homeassistant/components/kitchen_sink/lawn_mower.py
index 51814fb262d..18a3f3dee77 100644
--- a/homeassistant/components/kitchen_sink/lawn_mower.py
+++ b/homeassistant/components/kitchen_sink/lawn_mower.py
@@ -9,7 +9,10 @@ from homeassistant.components.lawn_mower import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 
@@ -71,7 +74,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Everything but the Kitchen Sink config entry."""
     await async_setup_platform(hass, {}, async_add_entities)
diff --git a/homeassistant/components/kitchen_sink/lock.py b/homeassistant/components/kitchen_sink/lock.py
index 80ecc57d0d9..63566482cdf 100644
--- a/homeassistant/components/kitchen_sink/lock.py
+++ b/homeassistant/components/kitchen_sink/lock.py
@@ -7,7 +7,10 @@ from typing import Any
 from homeassistant.components.lock import LockEntity, LockEntityFeature, LockState
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 
@@ -49,7 +52,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Everything but the Kitchen Sink config entry."""
     await async_setup_platform(hass, {}, async_add_entities)
diff --git a/homeassistant/components/kitchen_sink/notify.py b/homeassistant/components/kitchen_sink/notify.py
index fb34a36f0b7..be5bad58109 100644
--- a/homeassistant/components/kitchen_sink/notify.py
+++ b/homeassistant/components/kitchen_sink/notify.py
@@ -7,7 +7,7 @@ from homeassistant.components.notify import NotifyEntity, NotifyEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 
@@ -15,7 +15,7 @@ from . import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the demo notify entity platform."""
     async_add_entities(
diff --git a/homeassistant/components/kitchen_sink/sensor.py b/homeassistant/components/kitchen_sink/sensor.py
index 95e56c276e4..04cb833f0df 100644
--- a/homeassistant/components/kitchen_sink/sensor.py
+++ b/homeassistant/components/kitchen_sink/sensor.py
@@ -8,10 +8,10 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import UnitOfPower
+from homeassistant.const import DEGREE, UnitOfPower
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import UNDEFINED, StateType, UndefinedType
 
 from . import DOMAIN
@@ -21,7 +21,7 @@ from .device import async_create_device
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Everything but the Kitchen Sink config entry."""
     async_create_device(
@@ -87,9 +87,36 @@ async def async_setup_entry(
                 state_class=None,
                 unit_of_measurement=UnitOfPower.WATT,
             ),
+            DemoSensor(
+                device_unique_id="statistics_issues",
+                unique_id="statistics_issue_5",
+                device_name="Statistics issues",
+                entity_name="Issue 5",
+                state=100,
+                device_class=SensorDeviceClass.WIND_DIRECTION,
+                state_class=SensorStateClass.MEASUREMENT_ANGLE,
+                unit_of_measurement=DEGREE,
+            ),
         ]
     )
 
+    for subentry_id, subentry in config_entry.subentries.items():
+        async_add_entities(
+            [
+                DemoSensor(
+                    device_unique_id=subentry_id,
+                    unique_id=subentry_id,
+                    device_name=subentry.title,
+                    entity_name=None,
+                    state=subentry.data["state"],
+                    device_class=None,
+                    state_class=None,
+                    unit_of_measurement=None,
+                )
+            ],
+            config_subentry_id=subentry_id,
+        )
+
 
 class DemoSensor(SensorEntity):
     """Representation of a Demo sensor."""
diff --git a/homeassistant/components/kitchen_sink/strings.json b/homeassistant/components/kitchen_sink/strings.json
index c03f909e617..e0cdf75b707 100644
--- a/homeassistant/components/kitchen_sink/strings.json
+++ b/homeassistant/components/kitchen_sink/strings.json
@@ -9,6 +9,31 @@
       }
     }
   },
+  "config_subentries": {
+    "entity": {
+      "step": {
+        "add_sensor": {
+          "description": "Configure the new sensor",
+          "data": {
+            "name": "[%key:common::config_flow::data::name%]",
+            "state": "Initial state"
+          }
+        },
+        "reconfigure_sensor": {
+          "description": "Reconfigure the sensor",
+          "data": {
+            "name": "[%key:component::kitchen_sink::config_subentries::entity::step::reconfigure_sensor::data::state%]",
+            "state": "Initial state"
+          }
+        }
+      },
+      "initiate_flow": {
+        "user": "Add sensor",
+        "reconfigure": "Reconfigure sensor"
+      },
+      "entry_type": "Sensor"
+    }
+  },
   "options": {
     "step": {
       "init": {
diff --git a/homeassistant/components/kitchen_sink/switch.py b/homeassistant/components/kitchen_sink/switch.py
index 68a8312b496..45d3cb14eca 100644
--- a/homeassistant/components/kitchen_sink/switch.py
+++ b/homeassistant/components/kitchen_sink/switch.py
@@ -8,7 +8,7 @@ from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 from .device import async_create_device
@@ -17,7 +17,7 @@ from .device import async_create_device
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the demo switch platform."""
     async_create_device(
diff --git a/homeassistant/components/kitchen_sink/weather.py b/homeassistant/components/kitchen_sink/weather.py
index 8a12cb4bdb9..a6b7cc69d05 100644
--- a/homeassistant/components/kitchen_sink/weather.py
+++ b/homeassistant/components/kitchen_sink/weather.py
@@ -26,9 +26,9 @@ from homeassistant.components.weather import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfPressure, UnitOfSpeed, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_track_time_interval
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 CONDITION_CLASSES: dict[str, list[str]] = {
     ATTR_CONDITION_CLOUDY: [],
@@ -56,7 +56,7 @@ CONDITION_MAP = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Demo config entry."""
     async_add_entities(
diff --git a/homeassistant/components/kiwi/lock.py b/homeassistant/components/kiwi/lock.py
index 887747d4ca4..d378fcbcbed 100644
--- a/homeassistant/components/kiwi/lock.py
+++ b/homeassistant/components/kiwi/lock.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     CONF_USERNAME,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/kmtronic/switch.py b/homeassistant/components/kmtronic/switch.py
index f00ecf8623c..b32f78b0e98 100644
--- a/homeassistant/components/kmtronic/switch.py
+++ b/homeassistant/components/kmtronic/switch.py
@@ -7,14 +7,16 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import CONF_REVERSE, DATA_COORDINATOR, DATA_HUB, DOMAIN, MANUFACTURER
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Config entry example."""
     coordinator = hass.data[DOMAIN][entry.entry_id][DATA_COORDINATOR]
diff --git a/homeassistant/components/knocki/__init__.py b/homeassistant/components/knocki/__init__.py
index dfdf060e3b5..966f1dbf309 100644
--- a/homeassistant/components/knocki/__init__.py
+++ b/homeassistant/components/knocki/__init__.py
@@ -4,17 +4,14 @@ from __future__ import annotations
 
 from knocki import Event, EventType, KnockiClient
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_TOKEN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .coordinator import KnockiCoordinator
+from .coordinator import KnockiConfigEntry, KnockiCoordinator
 
 PLATFORMS: list[Platform] = [Platform.EVENT]
 
-type KnockiConfigEntry = ConfigEntry[KnockiCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: KnockiConfigEntry) -> bool:
     """Set up Knocki from a config entry."""
@@ -22,7 +19,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: KnockiConfigEntry) -> bo
         session=async_get_clientsession(hass), token=entry.data[CONF_TOKEN]
     )
 
-    coordinator = KnockiCoordinator(hass, client)
+    coordinator = KnockiCoordinator(hass, entry, client)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/knocki/coordinator.py b/homeassistant/components/knocki/coordinator.py
index c1e32b817e1..f5cc373f5c1 100644
--- a/homeassistant/components/knocki/coordinator.py
+++ b/homeassistant/components/knocki/coordinator.py
@@ -3,21 +3,29 @@
 from knocki import Event, KnockiClient, KnockiConnectionError, Trigger
 
 from homeassistant.components.event import DOMAIN as EVENT_DOMAIN
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN, LOGGER
 
+type KnockiConfigEntry = ConfigEntry[KnockiCoordinator]
+
 
 class KnockiCoordinator(DataUpdateCoordinator[dict[int, Trigger]]):
     """The Knocki coordinator."""
 
-    def __init__(self, hass: HomeAssistant, client: KnockiClient) -> None:
+    config_entry: KnockiConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: KnockiConfigEntry, client: KnockiClient
+    ) -> None:
         """Initialize the coordinator."""
         super().__init__(
             hass,
             logger=LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
         )
         self.client = client
diff --git a/homeassistant/components/knocki/event.py b/homeassistant/components/knocki/event.py
index 74dc5a0f64c..1b148f03f1c 100644
--- a/homeassistant/components/knocki/event.py
+++ b/homeassistant/components/knocki/event.py
@@ -5,7 +5,7 @@ from knocki import Event, EventType, KnockiClient, Trigger
 from homeassistant.components.event import EventEntity
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import KnockiConfigEntry
 from .const import DOMAIN
@@ -14,7 +14,7 @@ from .const import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: KnockiConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Knocki from a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/knx/__init__.py b/homeassistant/components/knx/__init__.py
index fa3439b02f4..8ad16642e45 100644
--- a/homeassistant/components/knx/__init__.py
+++ b/homeassistant/components/knx/__init__.py
@@ -486,7 +486,7 @@ class KNXModule:
                 transcoder := DPTBase.parse_transcoder(dpt)
             ):
                 self._address_filter_transcoder.update(
-                    {_filter: transcoder for _filter in _filters}
+                    dict.fromkeys(_filters, transcoder)
                 )
 
         return self.xknx.telegram_queue.register_telegram_received_cb(
diff --git a/homeassistant/components/knx/binary_sensor.py b/homeassistant/components/knx/binary_sensor.py
index 96438df96d7..c11612f79bf 100644
--- a/homeassistant/components/knx/binary_sensor.py
+++ b/homeassistant/components/knx/binary_sensor.py
@@ -18,57 +18,69 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    async_get_current_platform,
+)
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType
 
 from . import KNXModule
-from .const import ATTR_COUNTER, ATTR_SOURCE, KNX_MODULE_KEY
-from .entity import KnxYamlEntity
-from .schema import BinarySensorSchema
+from .const import (
+    ATTR_COUNTER,
+    ATTR_SOURCE,
+    CONF_CONTEXT_TIMEOUT,
+    CONF_IGNORE_INTERNAL_STATE,
+    CONF_INVERT,
+    CONF_RESET_AFTER,
+    CONF_STATE_ADDRESS,
+    CONF_SYNC_STATE,
+    DOMAIN,
+    KNX_MODULE_KEY,
+)
+from .entity import KnxUiEntity, KnxUiEntityPlatformController, KnxYamlEntity
+from .storage.const import CONF_ENTITY, CONF_GA_PASSIVE, CONF_GA_SENSOR, CONF_GA_STATE
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the KNX binary sensor platform."""
     knx_module = hass.data[KNX_MODULE_KEY]
-    config: list[ConfigType] = knx_module.config_yaml[Platform.BINARY_SENSOR]
-
-    async_add_entities(
-        KNXBinarySensor(knx_module, entity_config) for entity_config in config
+    platform = async_get_current_platform()
+    knx_module.config_store.add_platform(
+        platform=Platform.BINARY_SENSOR,
+        controller=KnxUiEntityPlatformController(
+            knx_module=knx_module,
+            entity_platform=platform,
+            entity_class=KnxUiBinarySensor,
+        ),
     )
 
+    entities: list[KnxYamlEntity | KnxUiEntity] = []
+    if yaml_platform_config := knx_module.config_yaml.get(Platform.BINARY_SENSOR):
+        entities.extend(
+            KnxYamlBinarySensor(knx_module, entity_config)
+            for entity_config in yaml_platform_config
+        )
+    if ui_config := knx_module.config_store.data["entities"].get(
+        Platform.BINARY_SENSOR
+    ):
+        entities.extend(
+            KnxUiBinarySensor(knx_module, unique_id, config)
+            for unique_id, config in ui_config.items()
+        )
+    if entities:
+        async_add_entities(entities)
 
-class KNXBinarySensor(KnxYamlEntity, BinarySensorEntity, RestoreEntity):
+
+class _KnxBinarySensor(BinarySensorEntity, RestoreEntity):
     """Representation of a KNX binary sensor."""
 
     _device: XknxBinarySensor
 
-    def __init__(self, knx_module: KNXModule, config: ConfigType) -> None:
-        """Initialize of KNX binary sensor."""
-        super().__init__(
-            knx_module=knx_module,
-            device=XknxBinarySensor(
-                xknx=knx_module.xknx,
-                name=config[CONF_NAME],
-                group_address_state=config[BinarySensorSchema.CONF_STATE_ADDRESS],
-                invert=config[BinarySensorSchema.CONF_INVERT],
-                sync_state=config[BinarySensorSchema.CONF_SYNC_STATE],
-                ignore_internal_state=config[
-                    BinarySensorSchema.CONF_IGNORE_INTERNAL_STATE
-                ],
-                context_timeout=config.get(BinarySensorSchema.CONF_CONTEXT_TIMEOUT),
-                reset_after=config.get(BinarySensorSchema.CONF_RESET_AFTER),
-            ),
-        )
-        self._attr_entity_category = config.get(CONF_ENTITY_CATEGORY)
-        self._attr_device_class = config.get(CONF_DEVICE_CLASS)
-        self._attr_force_update = self._device.ignore_internal_state
-        self._attr_unique_id = str(self._device.remote_value.group_address_state)
-
     async def async_added_to_hass(self) -> None:
         """Restore last state."""
         await super().async_added_to_hass()
@@ -92,3 +104,59 @@ class KNXBinarySensor(KnxYamlEntity, BinarySensorEntity, RestoreEntity):
         if self._device.last_telegram is not None:
             attr[ATTR_SOURCE] = str(self._device.last_telegram.source_address)
         return attr
+
+
+class KnxYamlBinarySensor(_KnxBinarySensor, KnxYamlEntity):
+    """Representation of a KNX binary sensor configured from YAML."""
+
+    _device: XknxBinarySensor
+
+    def __init__(self, knx_module: KNXModule, config: ConfigType) -> None:
+        """Initialize of KNX binary sensor."""
+        super().__init__(
+            knx_module=knx_module,
+            device=XknxBinarySensor(
+                xknx=knx_module.xknx,
+                name=config[CONF_NAME],
+                group_address_state=config[CONF_STATE_ADDRESS],
+                invert=config[CONF_INVERT],
+                sync_state=config[CONF_SYNC_STATE],
+                ignore_internal_state=config[CONF_IGNORE_INTERNAL_STATE],
+                context_timeout=config.get(CONF_CONTEXT_TIMEOUT),
+                reset_after=config.get(CONF_RESET_AFTER),
+            ),
+        )
+        self._attr_entity_category = config.get(CONF_ENTITY_CATEGORY)
+        self._attr_device_class = config.get(CONF_DEVICE_CLASS)
+        self._attr_force_update = self._device.ignore_internal_state
+        self._attr_unique_id = str(self._device.remote_value.group_address_state)
+
+
+class KnxUiBinarySensor(_KnxBinarySensor, KnxUiEntity):
+    """Representation of a KNX binary sensor configured from UI."""
+
+    _device: XknxBinarySensor
+
+    def __init__(
+        self, knx_module: KNXModule, unique_id: str, config: dict[str, Any]
+    ) -> None:
+        """Initialize KNX binary sensor."""
+        super().__init__(
+            knx_module=knx_module,
+            unique_id=unique_id,
+            entity_config=config[CONF_ENTITY],
+        )
+        self._device = XknxBinarySensor(
+            xknx=knx_module.xknx,
+            name=config[CONF_ENTITY][CONF_NAME],
+            group_address_state=[
+                config[DOMAIN][CONF_GA_SENSOR][CONF_GA_STATE],
+                *config[DOMAIN][CONF_GA_SENSOR][CONF_GA_PASSIVE],
+            ],
+            sync_state=config[DOMAIN][CONF_SYNC_STATE],
+            invert=config[DOMAIN].get(CONF_INVERT, False),
+            ignore_internal_state=config[DOMAIN].get(CONF_IGNORE_INTERNAL_STATE, False),
+            context_timeout=config[DOMAIN].get(CONF_CONTEXT_TIMEOUT),
+            reset_after=config[DOMAIN].get(CONF_RESET_AFTER),
+        )
+        self._attr_force_update = self._device.ignore_internal_state
diff --git a/homeassistant/components/knx/button.py b/homeassistant/components/knx/button.py
index 5a2add5dcd7..538299a0556 100644
--- a/homeassistant/components/knx/button.py
+++ b/homeassistant/components/knx/button.py
@@ -8,7 +8,7 @@ from homeassistant import config_entries
 from homeassistant.components.button import ButtonEntity
 from homeassistant.const import CONF_ENTITY_CATEGORY, CONF_NAME, CONF_PAYLOAD, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from . import KNXModule
@@ -19,7 +19,7 @@ from .entity import KnxYamlEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the KNX binary sensor platform."""
     knx_module = hass.data[KNX_MODULE_KEY]
diff --git a/homeassistant/components/knx/climate.py b/homeassistant/components/knx/climate.py
index 2c0153c5d2b..fdce5e0c470 100644
--- a/homeassistant/components/knx/climate.py
+++ b/homeassistant/components/knx/climate.py
@@ -19,6 +19,8 @@ from homeassistant.components.climate import (
     FAN_LOW,
     FAN_MEDIUM,
     FAN_ON,
+    SWING_OFF,
+    SWING_ON,
     ClimateEntity,
     ClimateEntityFeature,
     HVACAction,
@@ -32,7 +34,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from . import KNXModule
@@ -47,7 +49,7 @@ CONTROLLER_MODES_INV = {value: key for key, value in CONTROLLER_MODES.items()}
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up climate(s) for KNX platform."""
     knx_module = hass.data[KNX_MODULE_KEY]
@@ -136,6 +138,14 @@ def _create_climate(xknx: XKNX, config: ConfigType) -> XknxClimate:
             ClimateSchema.CONF_FAN_SPEED_STATE_ADDRESS
         ),
         fan_speed_mode=config[ClimateSchema.CONF_FAN_SPEED_MODE],
+        group_address_swing=config.get(ClimateSchema.CONF_SWING_ADDRESS),
+        group_address_swing_state=config.get(ClimateSchema.CONF_SWING_STATE_ADDRESS),
+        group_address_horizontal_swing=config.get(
+            ClimateSchema.CONF_SWING_HORIZONTAL_ADDRESS
+        ),
+        group_address_horizontal_swing_state=config.get(
+            ClimateSchema.CONF_SWING_HORIZONTAL_STATE_ADDRESS
+        ),
         group_address_humidity_state=config.get(
             ClimateSchema.CONF_HUMIDITY_STATE_ADDRESS
         ),
@@ -207,6 +217,13 @@ class KNXClimate(KnxYamlEntity, ClimateEntity):
                 self._attr_fan_modes = [self.fan_zero_mode] + [
                     f"{percentage}%" for percentage in self._fan_modes_percentages[1:]
                 ]
+        if self._device.swing.initialized:
+            self._attr_supported_features |= ClimateEntityFeature.SWING_MODE
+            self._attr_swing_modes = [SWING_ON, SWING_OFF]
+
+        if self._device.horizontal_swing.initialized:
+            self._attr_supported_features |= ClimateEntityFeature.SWING_HORIZONTAL_MODE
+            self._attr_swing_horizontal_modes = [SWING_ON, SWING_OFF]
 
         self._attr_target_temperature_step = self._device.temperature_step
         self._attr_unique_id = (
@@ -399,6 +416,28 @@ class KNXClimate(KnxYamlEntity, ClimateEntity):
 
         await self._device.set_fan_speed(self._fan_modes_percentages[fan_mode_index])
 
+    async def async_set_swing_mode(self, swing_mode: str) -> None:
+        """Set the swing setting."""
+        await self._device.set_swing(swing_mode == SWING_ON)
+
+    async def async_set_swing_horizontal_mode(self, swing_horizontal_mode: str) -> None:
+        """Set the horizontal swing setting."""
+        await self._device.set_horizontal_swing(swing_horizontal_mode == SWING_ON)
+
+    @property
+    def swing_mode(self) -> str | None:
+        """Return the swing setting."""
+        if self._device.swing.value is not None:
+            return SWING_ON if self._device.swing.value else SWING_OFF
+        return None
+
+    @property
+    def swing_horizontal_mode(self) -> str | None:
+        """Return the horizontal swing setting."""
+        if self._device.horizontal_swing.value is not None:
+            return SWING_ON if self._device.horizontal_swing.value else SWING_OFF
+        return None
+
     @property
     def current_humidity(self) -> float | None:
         """Return the current humidity."""
diff --git a/homeassistant/components/knx/const.py b/homeassistant/components/knx/const.py
index 3ef35479c4e..b403018dae3 100644
--- a/homeassistant/components/knx/const.py
+++ b/homeassistant/components/knx/const.py
@@ -67,6 +67,8 @@ CONF_KNX_SECURE_USER_PASSWORD: Final = "user_password"
 CONF_KNX_SECURE_DEVICE_AUTHENTICATION: Final = "device_authentication"
 
 
+CONF_CONTEXT_TIMEOUT: Final = "context_timeout"
+CONF_IGNORE_INTERNAL_STATE: Final = "ignore_internal_state"
 CONF_PAYLOAD_LENGTH: Final = "payload_length"
 CONF_RESET_AFTER: Final = "reset_after"
 CONF_RESPOND_TO_READ: Final = "respond_to_read"
@@ -156,7 +158,11 @@ SUPPORTED_PLATFORMS_YAML: Final = {
     Platform.WEATHER,
 }
 
-SUPPORTED_PLATFORMS_UI: Final = {Platform.SWITCH, Platform.LIGHT}
+SUPPORTED_PLATFORMS_UI: Final = {
+    Platform.BINARY_SENSOR,
+    Platform.LIGHT,
+    Platform.SWITCH,
+}
 
 # Map KNX controller modes to HA modes. This list might not be complete.
 CONTROLLER_MODES: Final = {
diff --git a/homeassistant/components/knx/cover.py b/homeassistant/components/knx/cover.py
index 2d38426a687..3c5752b990c 100644
--- a/homeassistant/components/knx/cover.py
+++ b/homeassistant/components/knx/cover.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from . import KNXModule
@@ -34,7 +34,7 @@ from .schema import CoverSchema
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up cover(s) for KNX platform."""
     knx_module = hass.data[KNX_MODULE_KEY]
diff --git a/homeassistant/components/knx/date.py b/homeassistant/components/knx/date.py
index 8f65ac8a952..7980e6a2bc3 100644
--- a/homeassistant/components/knx/date.py
+++ b/homeassistant/components/knx/date.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType
 
@@ -36,7 +36,7 @@ from .entity import KnxYamlEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entities for KNX platform."""
     knx_module = hass.data[KNX_MODULE_KEY]
diff --git a/homeassistant/components/knx/datetime.py b/homeassistant/components/knx/datetime.py
index caeaed6da93..7701597a8ef 100644
--- a/homeassistant/components/knx/datetime.py
+++ b/homeassistant/components/knx/datetime.py
@@ -18,10 +18,10 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import KNXModule
 from .const import (
@@ -37,7 +37,7 @@ from .entity import KnxYamlEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entities for KNX platform."""
     knx_module = hass.data[KNX_MODULE_KEY]
diff --git a/homeassistant/components/knx/expose.py b/homeassistant/components/knx/expose.py
index 6585b848d8a..461e6f25879 100644
--- a/homeassistant/components/knx/expose.py
+++ b/homeassistant/components/knx/expose.py
@@ -30,6 +30,7 @@ from homeassistant.exceptions import TemplateError
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.typing import ConfigType, StateType
+from homeassistant.util import dt as dt_util
 
 from .const import CONF_RESPOND_TO_READ, KNX_ADDRESS
 from .schema import ExposeSchema
@@ -217,7 +218,7 @@ class KNXExposeTime:
         self.device = xknx_device_cls(
             self.xknx,
             name=expose_type.capitalize(),
-            localtime=True,
+            localtime=dt_util.get_default_time_zone(),
             group_address=config[KNX_ADDRESS],
         )
 
diff --git a/homeassistant/components/knx/fan.py b/homeassistant/components/knx/fan.py
index 75d91e48048..926b6458706 100644
--- a/homeassistant/components/knx/fan.py
+++ b/homeassistant/components/knx/fan.py
@@ -11,7 +11,7 @@ from homeassistant import config_entries
 from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.const import CONF_ENTITY_CATEGORY, CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
@@ -30,7 +30,7 @@ DEFAULT_PERCENTAGE: Final = 50
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up fan(s) for KNX platform."""
     knx_module = hass.data[KNX_MODULE_KEY]
diff --git a/homeassistant/components/knx/light.py b/homeassistant/components/knx/light.py
index 6115f8be128..865cfdc6e25 100644
--- a/homeassistant/components/knx/light.py
+++ b/homeassistant/components/knx/light.py
@@ -22,11 +22,11 @@ from homeassistant.components.light import (
 from homeassistant.const import CONF_ENTITY_CATEGORY, CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import (
-    AddEntitiesCallback,
+    AddConfigEntryEntitiesCallback,
     async_get_current_platform,
 )
 from homeassistant.helpers.typing import ConfigType
-import homeassistant.util.color as color_util
+from homeassistant.util import color as color_util
 
 from . import KNXModule
 from .const import CONF_SYNC_STATE, DOMAIN, KNX_ADDRESS, KNX_MODULE_KEY, ColorTempModes
@@ -61,7 +61,7 @@ from .storage.entity_store_schema import LightColorMode
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up light(s) for KNX platform."""
     knx_module = hass.data[KNX_MODULE_KEY]
diff --git a/homeassistant/components/knx/manifest.json b/homeassistant/components/knx/manifest.json
index 73a61be68ee..bde6dfa226f 100644
--- a/homeassistant/components/knx/manifest.json
+++ b/homeassistant/components/knx/manifest.json
@@ -10,9 +10,9 @@
   "iot_class": "local_push",
   "loggers": ["xknx", "xknxproject"],
   "requirements": [
-    "xknx==3.4.0",
-    "xknxproject==3.8.1",
-    "knx-frontend==2025.1.18.164225"
+    "xknx==3.6.0",
+    "xknxproject==3.8.2",
+    "knx-frontend==2025.3.8.214559"
   ],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/knx/notify.py b/homeassistant/components/knx/notify.py
index 245de2e937e..97980ab3d36 100644
--- a/homeassistant/components/knx/notify.py
+++ b/homeassistant/components/knx/notify.py
@@ -9,7 +9,7 @@ from homeassistant import config_entries
 from homeassistant.components.notify import NotifyEntity
 from homeassistant.const import CONF_ENTITY_CATEGORY, CONF_NAME, CONF_TYPE, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from . import KNXModule
@@ -20,7 +20,7 @@ from .entity import KnxYamlEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up notify(s) for KNX platform."""
     knx_module = hass.data[KNX_MODULE_KEY]
diff --git a/homeassistant/components/knx/number.py b/homeassistant/components/knx/number.py
index 27e4ff743ab..67e8778accc 100644
--- a/homeassistant/components/knx/number.py
+++ b/homeassistant/components/knx/number.py
@@ -19,7 +19,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from . import KNXModule
@@ -31,7 +31,7 @@ from .schema import NumberSchema
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up number(s) for KNX platform."""
     knx_module = hass.data[KNX_MODULE_KEY]
diff --git a/homeassistant/components/knx/scene.py b/homeassistant/components/knx/scene.py
index dfd226d72b1..f5361a6e7da 100644
--- a/homeassistant/components/knx/scene.py
+++ b/homeassistant/components/knx/scene.py
@@ -10,7 +10,7 @@ from homeassistant import config_entries
 from homeassistant.components.scene import Scene
 from homeassistant.const import CONF_ENTITY_CATEGORY, CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from . import KNXModule
@@ -22,7 +22,7 @@ from .schema import SceneSchema
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up scene(s) for KNX platform."""
     knx_module = hass.data[KNX_MODULE_KEY]
diff --git a/homeassistant/components/knx/schema.py b/homeassistant/components/knx/schema.py
index 9311046e410..c9fe0bfc34e 100644
--- a/homeassistant/components/knx/schema.py
+++ b/homeassistant/components/knx/schema.py
@@ -41,10 +41,12 @@ from homeassistant.const import (
     CONF_VALUE_TEMPLATE,
     Platform,
 )
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import ENTITY_CATEGORIES_SCHEMA
 
 from .const import (
+    CONF_CONTEXT_TIMEOUT,
+    CONF_IGNORE_INTERNAL_STATE,
     CONF_INVERT,
     CONF_KNX_EXPOSE,
     CONF_PAYLOAD_LENGTH,
@@ -211,14 +213,6 @@ class BinarySensorSchema(KNXPlatformSchema):
     """Voluptuous schema for KNX binary sensors."""
 
     PLATFORM = Platform.BINARY_SENSOR
-
-    CONF_STATE_ADDRESS = CONF_STATE_ADDRESS
-    CONF_SYNC_STATE = CONF_SYNC_STATE
-    CONF_INVERT = CONF_INVERT
-    CONF_IGNORE_INTERNAL_STATE = "ignore_internal_state"
-    CONF_CONTEXT_TIMEOUT = "context_timeout"
-    CONF_RESET_AFTER = CONF_RESET_AFTER
-
     DEFAULT_NAME = "KNX Binary Sensor"
 
     ENTITY_SCHEMA = vol.All(
@@ -345,6 +339,10 @@ class ClimateSchema(KNXPlatformSchema):
     CONF_FAN_SPEED_MODE = "fan_speed_mode"
     CONF_FAN_ZERO_MODE = "fan_zero_mode"
     CONF_HUMIDITY_STATE_ADDRESS = "humidity_state_address"
+    CONF_SWING_ADDRESS = "swing_address"
+    CONF_SWING_STATE_ADDRESS = "swing_state_address"
+    CONF_SWING_HORIZONTAL_ADDRESS = "swing_horizontal_address"
+    CONF_SWING_HORIZONTAL_STATE_ADDRESS = "swing_horizontal_state_address"
 
     DEFAULT_NAME = "KNX Climate"
     DEFAULT_SETPOINT_SHIFT_MODE = "DPT6010"
@@ -433,6 +431,10 @@ class ClimateSchema(KNXPlatformSchema):
                 vol.Optional(CONF_FAN_ZERO_MODE, default=FAN_OFF): vol.Coerce(
                     FanZeroMode
                 ),
+                vol.Optional(CONF_SWING_ADDRESS): ga_list_validator,
+                vol.Optional(CONF_SWING_STATE_ADDRESS): ga_list_validator,
+                vol.Optional(CONF_SWING_HORIZONTAL_ADDRESS): ga_list_validator,
+                vol.Optional(CONF_SWING_HORIZONTAL_STATE_ADDRESS): ga_list_validator,
                 vol.Optional(CONF_HUMIDITY_STATE_ADDRESS): ga_list_validator,
             }
         ),
diff --git a/homeassistant/components/knx/select.py b/homeassistant/components/knx/select.py
index b499e3c601d..e80fa66f9d4 100644
--- a/homeassistant/components/knx/select.py
+++ b/homeassistant/components/knx/select.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType
 
@@ -36,7 +36,7 @@ from .schema import SelectSchema
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up select(s) for KNX platform."""
     knx_module = hass.data[KNX_MODULE_KEY]
diff --git a/homeassistant/components/knx/sensor.py b/homeassistant/components/knx/sensor.py
index fa4911aa4b7..8e537ea234e 100644
--- a/homeassistant/components/knx/sensor.py
+++ b/homeassistant/components/knx/sensor.py
@@ -29,7 +29,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, StateType
 from homeassistant.util.enum import try_parse_enum
 
@@ -112,7 +112,7 @@ SYSTEM_ENTITY_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensor(s) for KNX platform."""
     knx_module = hass.data[KNX_MODULE_KEY]
diff --git a/homeassistant/components/knx/services.py b/homeassistant/components/knx/services.py
index 6c392902737..fc28e0850ed 100644
--- a/homeassistant/components/knx/services.py
+++ b/homeassistant/components/knx/services.py
@@ -15,7 +15,7 @@ from xknx.telegram.apci import GroupValueRead, GroupValueResponse, GroupValueWri
 from homeassistant.const import CONF_TYPE, SERVICE_RELOAD
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.service import async_register_admin_service
 
 from .const import (
@@ -126,7 +126,7 @@ async def service_event_register_modify(call: ServiceCall) -> None:
         transcoder := DPTBase.parse_transcoder(dpt)
     ):
         knx_module.group_address_transcoder.update(
-            {_address: transcoder for _address in group_addresses}
+            dict.fromkeys(group_addresses, transcoder)
         )
     for group_address in group_addresses:
         if group_address in knx_module.knx_event_callback.group_addresses:
diff --git a/homeassistant/components/knx/storage/const.py b/homeassistant/components/knx/storage/const.py
index 42b76a5a0fd..cf3f2bb9f95 100644
--- a/homeassistant/components/knx/storage/const.py
+++ b/homeassistant/components/knx/storage/const.py
@@ -10,6 +10,7 @@ CONF_GA_STATE: Final = "state"
 CONF_GA_PASSIVE: Final = "passive"
 CONF_DPT: Final = "dpt"
 
+CONF_GA_SENSOR: Final = "ga_sensor"
 CONF_GA_SWITCH: Final = "ga_switch"
 CONF_GA_COLOR_TEMP: Final = "ga_color_temp"
 CONF_COLOR_TEMP_MIN: Final = "color_temp_min"
diff --git a/homeassistant/components/knx/storage/entity_store_schema.py b/homeassistant/components/knx/storage/entity_store_schema.py
index 84854d2ec85..cde18a181ec 100644
--- a/homeassistant/components/knx/storage/entity_store_schema.py
+++ b/homeassistant/components/knx/storage/entity_store_schema.py
@@ -11,12 +11,15 @@ from homeassistant.const import (
     CONF_PLATFORM,
     Platform,
 )
-from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers import config_validation as cv, selector
 from homeassistant.helpers.entity import ENTITY_CATEGORIES_SCHEMA
 from homeassistant.helpers.typing import VolDictType, VolSchemaType
 
 from ..const import (
+    CONF_CONTEXT_TIMEOUT,
+    CONF_IGNORE_INTERNAL_STATE,
     CONF_INVERT,
+    CONF_RESET_AFTER,
     CONF_RESPOND_TO_READ,
     CONF_SYNC_STATE,
     DOMAIN,
@@ -42,6 +45,7 @@ from .const import (
     CONF_GA_RED_BRIGHTNESS,
     CONF_GA_RED_SWITCH,
     CONF_GA_SATURATION,
+    CONF_GA_SENSOR,
     CONF_GA_STATE,
     CONF_GA_SWITCH,
     CONF_GA_WHITE_BRIGHTNESS,
@@ -94,6 +98,29 @@ def optional_ga_schema(key: str, ga_selector: GASelector) -> VolDictType:
     }
 
 
+BINARY_SENSOR_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_ENTITY): BASE_ENTITY_SCHEMA,
+        vol.Required(DOMAIN): {
+            vol.Required(CONF_GA_SENSOR): GASelector(write=False, state_required=True),
+            vol.Required(CONF_RESPOND_TO_READ, default=False): bool,
+            vol.Required(CONF_SYNC_STATE, default=True): sync_state_validator,
+            vol.Optional(CONF_INVERT): selector.BooleanSelector(),
+            vol.Optional(CONF_IGNORE_INTERNAL_STATE): selector.BooleanSelector(),
+            vol.Optional(CONF_CONTEXT_TIMEOUT): selector.NumberSelector(
+                selector.NumberSelectorConfig(
+                    min=0, max=10, step=0.1, unit_of_measurement="s"
+                )
+            ),
+            vol.Optional(CONF_RESET_AFTER): selector.NumberSelector(
+                selector.NumberSelectorConfig(
+                    min=0, max=600, step=0.1, unit_of_measurement="s"
+                )
+            ),
+        },
+    }
+)
+
 SWITCH_SCHEMA = vol.Schema(
     {
         vol.Required(CONF_ENTITY): BASE_ENTITY_SCHEMA,
@@ -213,6 +240,9 @@ ENTITY_STORE_DATA_SCHEMA: VolSchemaType = vol.All(
     cv.key_value_schemas(
         CONF_PLATFORM,
         {
+            Platform.BINARY_SENSOR: vol.Schema(
+                {vol.Required(CONF_DATA): BINARY_SENSOR_SCHEMA}, extra=vol.ALLOW_EXTRA
+            ),
             Platform.SWITCH: vol.Schema(
                 {vol.Required(CONF_DATA): SWITCH_SCHEMA}, extra=vol.ALLOW_EXTRA
             ),
diff --git a/homeassistant/components/knx/strings.json b/homeassistant/components/knx/strings.json
index dadc8e84796..10730d87ed1 100644
--- a/homeassistant/components/knx/strings.json
+++ b/homeassistant/components/knx/strings.json
@@ -397,7 +397,7 @@
         },
         "response": {
           "name": "Send as Response",
-          "description": "If set to `True`, the telegram will be sent as a `GroupValueResponse` instead of a `GroupValueWrite`."
+          "description": "Whether the telegram should be sent as a `GroupValueResponse` instead of a `GroupValueWrite`."
         }
       }
     },
@@ -425,7 +425,7 @@
         },
         "remove": {
           "name": "Remove event registration",
-          "description": "If `True` the group address(es) will be removed."
+          "description": "Whether the group address(es) will be removed."
         }
       }
     },
@@ -455,7 +455,7 @@
         },
         "remove": {
           "name": "Remove exposure",
-          "description": "If `True` the exposure will be removed. Only `address` is required for removal."
+          "description": "Whether the exposure should be removed. Only the 'Address' field is required for removal."
         }
       }
     },
diff --git a/homeassistant/components/knx/switch.py b/homeassistant/components/knx/switch.py
index 725468cd6a9..730c5b788ff 100644
--- a/homeassistant/components/knx/switch.py
+++ b/homeassistant/components/knx/switch.py
@@ -19,7 +19,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import (
-    AddEntitiesCallback,
+    AddConfigEntryEntitiesCallback,
     async_get_current_platform,
 )
 from homeassistant.helpers.restore_state import RestoreEntity
@@ -48,7 +48,7 @@ from .storage.const import (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switch(es) for KNX platform."""
     knx_module = hass.data[KNX_MODULE_KEY]
diff --git a/homeassistant/components/knx/telegrams.py b/homeassistant/components/knx/telegrams.py
index dcd5f477679..df49c84b6d5 100644
--- a/homeassistant/components/knx/telegrams.py
+++ b/homeassistant/components/knx/telegrams.py
@@ -15,7 +15,7 @@ from xknx.telegram.apci import GroupValueResponse, GroupValueWrite
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.storage import Store
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.signal_type import SignalType
 
 from .const import DOMAIN
diff --git a/homeassistant/components/knx/text.py b/homeassistant/components/knx/text.py
index 2256afadbd9..9c2bb88f92b 100644
--- a/homeassistant/components/knx/text.py
+++ b/homeassistant/components/knx/text.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType
 
@@ -30,7 +30,7 @@ from .entity import KnxYamlEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensor(s) for KNX platform."""
     knx_module = hass.data[KNX_MODULE_KEY]
diff --git a/homeassistant/components/knx/time.py b/homeassistant/components/knx/time.py
index 1e82c324502..2c74ab18af3 100644
--- a/homeassistant/components/knx/time.py
+++ b/homeassistant/components/knx/time.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType
 
@@ -36,7 +36,7 @@ from .entity import KnxYamlEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entities for KNX platform."""
     knx_module = hass.data[KNX_MODULE_KEY]
diff --git a/homeassistant/components/knx/validation.py b/homeassistant/components/knx/validation.py
index 0283b65f899..6a2224c5561 100644
--- a/homeassistant/components/knx/validation.py
+++ b/homeassistant/components/knx/validation.py
@@ -10,7 +10,7 @@ from xknx.dpt import DPTBase, DPTNumeric, DPTString
 from xknx.exceptions import CouldNotParseAddress
 from xknx.telegram.address import IndividualAddress, parse_device_group_address
 
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 
 def dpt_subclass_validator(dpt_base_class: type[DPTBase]) -> Callable[[Any], str | int]:
diff --git a/homeassistant/components/knx/weather.py b/homeassistant/components/knx/weather.py
index a1e5c0efe48..342ab445611 100644
--- a/homeassistant/components/knx/weather.py
+++ b/homeassistant/components/knx/weather.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from . import KNXModule
@@ -28,7 +28,7 @@ from .schema import WeatherSchema
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switch(es) for KNX platform."""
     knx_module = hass.data[KNX_MODULE_KEY]
diff --git a/homeassistant/components/kodi/media_player.py b/homeassistant/components/kodi/media_player.py
index cdbe4e334cb..c4a2436548a 100644
--- a/homeassistant/components/kodi/media_player.py
+++ b/homeassistant/components/kodi/media_player.py
@@ -46,11 +46,14 @@ from homeassistant.helpers import (
     entity_platform,
 )
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.network import is_internal_request
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, VolDictType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .browse_media import (
     build_item_response,
@@ -206,7 +209,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Kodi media player platform."""
     platform = entity_platform.async_get_current_platform()
diff --git a/homeassistant/components/kodi/notify.py b/homeassistant/components/kodi/notify.py
index c811a073cbb..8360f74ce24 100644
--- a/homeassistant/components/kodi/notify.py
+++ b/homeassistant/components/kodi/notify.py
@@ -24,8 +24,8 @@ from homeassistant.const import (
     CONF_USERNAME,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/konnected/binary_sensor.py b/homeassistant/components/konnected/binary_sensor.py
index 75c381c53f2..3f1a27302d8 100644
--- a/homeassistant/components/konnected/binary_sensor.py
+++ b/homeassistant/components/konnected/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN as KONNECTED_DOMAIN
 
@@ -21,7 +21,7 @@ from .const import DOMAIN as KONNECTED_DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up binary sensors attached to a Konnected device from a config entry."""
     data = hass.data[KONNECTED_DOMAIN]
diff --git a/homeassistant/components/konnected/sensor.py b/homeassistant/components/konnected/sensor.py
index 6191f98f179..cd36c217627 100644
--- a/homeassistant/components/konnected/sensor.py
+++ b/homeassistant/components/konnected/sensor.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN as KONNECTED_DOMAIN, SIGNAL_DS18B20_NEW
 
@@ -43,7 +43,7 @@ SENSOR_TYPES: dict[str, SensorEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors attached to a Konnected device from a config entry."""
     data = hass.data[KONNECTED_DOMAIN]
diff --git a/homeassistant/components/konnected/strings.json b/homeassistant/components/konnected/strings.json
index e1a6863a199..df92e014f12 100644
--- a/homeassistant/components/konnected/strings.json
+++ b/homeassistant/components/konnected/strings.json
@@ -2,19 +2,19 @@
   "config": {
     "step": {
       "import_confirm": {
-        "title": "Import Konnected Device",
-        "description": "A Konnected Alarm Panel with ID {id} has been discovered in configuration.yaml. This flow will allow you to import it into a config entry."
+        "title": "Import Konnected device",
+        "description": "A Konnected alarm panel with ID {id} has been discovered in configuration.yaml. This flow will allow you to import it into a config entry."
       },
       "user": {
-        "description": "Please enter the host information for your Konnected Panel.",
+        "description": "Please enter the host information for your Konnected panel.",
         "data": {
           "host": "[%key:common::config_flow::data::ip%]",
           "port": "[%key:common::config_flow::data::port%]"
         }
       },
       "confirm": {
-        "title": "Konnected Device Ready",
-        "description": "Model: {model}\nID: {id}\nHost: {host}\nPort: {port}\n\nYou can configure the IO and panel behavior in the Konnected Alarm Panel settings."
+        "title": "Konnected device ready",
+        "description": "Model: {model}\nID: {id}\nHost: {host}\nPort: {port}\n\nYou can configure the IO and panel behavior in the Konnected alarm panel settings."
       }
     },
     "error": {
@@ -45,8 +45,8 @@
         }
       },
       "options_io_ext": {
-        "title": "Configure Extended I/O",
-        "description": "Select the configuration of the remaining I/O below.  You'll be able to configure detailed options in the next steps.",
+        "title": "Configure extended I/O",
+        "description": "Select the configuration of the remaining I/O below. You'll be able to configure detailed options in the next steps.",
         "data": {
           "8": "Zone 8",
           "9": "Zone 9",
@@ -59,25 +59,25 @@
         }
       },
       "options_binary": {
-        "title": "Configure Binary Sensor",
+        "title": "Configure binary sensor",
         "description": "{zone} options",
         "data": {
-          "type": "Binary Sensor Type",
+          "type": "Binary sensor type",
           "name": "[%key:common::config_flow::data::name%]",
           "inverse": "Invert the open/close state"
         }
       },
       "options_digital": {
-        "title": "Configure Digital Sensor",
+        "title": "Configure digital sensor",
         "description": "[%key:component::konnected::options::step::options_binary::description%]",
         "data": {
-          "type": "Sensor Type",
+          "type": "Sensor type",
           "name": "[%key:common::config_flow::data::name%]",
-          "poll_interval": "Poll Interval (minutes)"
+          "poll_interval": "Poll interval (minutes)"
         }
       },
       "options_switch": {
-        "title": "Configure Switchable Output",
+        "title": "Configure switchable output",
         "description": "{zone} options: state {state}",
         "data": {
           "name": "[%key:common::config_flow::data::name%]",
@@ -89,18 +89,18 @@
         }
       },
       "options_misc": {
-        "title": "Configure Misc",
+        "title": "Configure misc",
         "description": "Please select the desired behavior for your panel",
         "data": {
           "discovery": "Respond to discovery requests on your network",
           "blink": "Blink panel LED on when sending state change",
-          "override_api_host": "Override default Home Assistant API host panel URL",
-          "api_host": "Override API host URL"
+          "override_api_host": "Override default Home Assistant API host URL",
+          "api_host": "Custom API host URL"
         }
       }
     },
     "error": {
-      "bad_host": "Invalid Override API host URL"
+      "bad_host": "Invalid custom API host URL"
     },
     "abort": {
       "not_konn_panel": "[%key:component::konnected::config::abort::not_konn_panel%]"
diff --git a/homeassistant/components/konnected/switch.py b/homeassistant/components/konnected/switch.py
index 65b99d623f1..58311502cbe 100644
--- a/homeassistant/components/konnected/switch.py
+++ b/homeassistant/components/konnected/switch.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CONF_ACTIVATION,
@@ -33,7 +33,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switches attached to a Konnected device from a config entry."""
     data = hass.data[KONNECTED_DOMAIN]
diff --git a/homeassistant/components/kostal_plenticore/coordinator.py b/homeassistant/components/kostal_plenticore/coordinator.py
index 5f4393146f0..a404a997663 100644
--- a/homeassistant/components/kostal_plenticore/coordinator.py
+++ b/homeassistant/components/kostal_plenticore/coordinator.py
@@ -16,6 +16,7 @@ from pykoplenti import (
     ExtendedApiClient,
 )
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
@@ -162,9 +163,12 @@ class DataUpdateCoordinatorMixin:
 class PlenticoreUpdateCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
     """Base implementation of DataUpdateCoordinator for Plenticore data."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         logger: logging.Logger,
         name: str,
         update_inverval: timedelta,
@@ -174,6 +178,7 @@ class PlenticoreUpdateCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
         super().__init__(
             hass=hass,
             logger=logger,
+            config_entry=config_entry,
             name=name,
             update_interval=update_inverval,
         )
@@ -240,9 +245,12 @@ class SettingDataUpdateCoordinator(
 class PlenticoreSelectUpdateCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
     """Base implementation of DataUpdateCoordinator for Plenticore data."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         logger: logging.Logger,
         name: str,
         update_inverval: timedelta,
@@ -252,6 +260,7 @@ class PlenticoreSelectUpdateCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
         super().__init__(
             hass=hass,
             logger=logger,
+            config_entry=config_entry,
             name=name,
             update_interval=update_inverval,
         )
diff --git a/homeassistant/components/kostal_plenticore/number.py b/homeassistant/components/kostal_plenticore/number.py
index 8afe69a7749..7efb00cf8f4 100644
--- a/homeassistant/components/kostal_plenticore/number.py
+++ b/homeassistant/components/kostal_plenticore/number.py
@@ -18,7 +18,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfPower
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
@@ -73,7 +73,9 @@ NUMBER_SETTINGS_DATA = [
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Kostal Plenticore Number entities."""
     plenticore = hass.data[DOMAIN][entry.entry_id]
@@ -82,11 +84,7 @@ async def async_setup_entry(
 
     available_settings_data = await plenticore.client.get_settings()
     settings_data_update_coordinator = SettingDataUpdateCoordinator(
-        hass,
-        _LOGGER,
-        "Settings Data",
-        timedelta(seconds=30),
-        plenticore,
+        hass, entry, _LOGGER, "Settings Data", timedelta(seconds=30), plenticore
     )
 
     for description in NUMBER_SETTINGS_DATA:
diff --git a/homeassistant/components/kostal_plenticore/select.py b/homeassistant/components/kostal_plenticore/select.py
index 73f3f94eda8..61929b9fadc 100644
--- a/homeassistant/components/kostal_plenticore/select.py
+++ b/homeassistant/components/kostal_plenticore/select.py
@@ -11,7 +11,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
@@ -42,18 +42,16 @@ SELECT_SETTINGS_DATA = [
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add kostal plenticore Select widget."""
     plenticore: Plenticore = hass.data[DOMAIN][entry.entry_id]
 
     available_settings_data = await plenticore.client.get_settings()
     select_data_update_coordinator = SelectDataUpdateCoordinator(
-        hass,
-        _LOGGER,
-        "Settings Data",
-        timedelta(seconds=30),
-        plenticore,
+        hass, entry, _LOGGER, "Settings Data", timedelta(seconds=30), plenticore
     )
 
     entities = []
diff --git a/homeassistant/components/kostal_plenticore/sensor.py b/homeassistant/components/kostal_plenticore/sensor.py
index 67de34f2fce..1be7fb06e7b 100644
--- a/homeassistant/components/kostal_plenticore/sensor.py
+++ b/homeassistant/components/kostal_plenticore/sensor.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -807,7 +807,9 @@ SENSOR_PROCESS_DATA = [
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add kostal plenticore Sensors."""
     plenticore = hass.data[DOMAIN][entry.entry_id]
@@ -816,11 +818,7 @@ async def async_setup_entry(
 
     available_process_data = await plenticore.client.get_process_data()
     process_data_update_coordinator = ProcessDataUpdateCoordinator(
-        hass,
-        _LOGGER,
-        "Process Data",
-        timedelta(seconds=10),
-        plenticore,
+        hass, entry, _LOGGER, "Process Data", timedelta(seconds=10), plenticore
     )
     for description in SENSOR_PROCESS_DATA:
         module_id = description.module_id
diff --git a/homeassistant/components/kostal_plenticore/switch.py b/homeassistant/components/kostal_plenticore/switch.py
index 7ce2d468c88..e3d5f830c78 100644
--- a/homeassistant/components/kostal_plenticore/switch.py
+++ b/homeassistant/components/kostal_plenticore/switch.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
@@ -48,7 +48,9 @@ SWITCH_SETTINGS_DATA = [
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add kostal plenticore Switch."""
     plenticore = hass.data[DOMAIN][entry.entry_id]
@@ -57,11 +59,7 @@ async def async_setup_entry(
 
     available_settings_data = await plenticore.client.get_settings()
     settings_data_update_coordinator = SettingDataUpdateCoordinator(
-        hass,
-        _LOGGER,
-        "Settings Data",
-        timedelta(seconds=30),
-        plenticore,
+        hass, entry, _LOGGER, "Settings Data", timedelta(seconds=30), plenticore
     )
     for description in SWITCH_SETTINGS_DATA:
         if (
diff --git a/homeassistant/components/kraken/sensor.py b/homeassistant/components/kraken/sensor.py
index 37fee795783..1d3f36d29e4 100644
--- a/homeassistant/components/kraken/sensor.py
+++ b/homeassistant/components/kraken/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -139,7 +139,7 @@ SENSOR_TYPES: tuple[KrakenSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add kraken entities from a config_entry."""
 
diff --git a/homeassistant/components/kulersky/light.py b/homeassistant/components/kulersky/light.py
index 552507ef50b..bcc3f32dceb 100644
--- a/homeassistant/components/kulersky/light.py
+++ b/homeassistant/components/kulersky/light.py
@@ -18,7 +18,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_track_time_interval
 
 from .const import DATA_ADDRESSES, DATA_DISCOVERY_SUBSCRIPTION, DOMAIN
@@ -31,7 +31,7 @@ DISCOVERY_INTERVAL = timedelta(seconds=60)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Kuler sky light devices."""
 
diff --git a/homeassistant/components/kwb/sensor.py b/homeassistant/components/kwb/sensor.py
index dbe57f9a517..0074c3a4344 100644
--- a/homeassistant/components/kwb/sensor.py
+++ b/homeassistant/components/kwb/sensor.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/lacrosse/sensor.py b/homeassistant/components/lacrosse/sensor.py
index d7df7a08e76..2cdf28d5e69 100644
--- a/homeassistant/components/lacrosse/sensor.py
+++ b/homeassistant/components/lacrosse/sensor.py
@@ -28,7 +28,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import async_generate_entity_id
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_point_in_utc_time
diff --git a/homeassistant/components/lacrosse_view/__init__.py b/homeassistant/components/lacrosse_view/__init__.py
index d977af418a2..e98d1d421be 100644
--- a/homeassistant/components/lacrosse_view/__init__.py
+++ b/homeassistant/components/lacrosse_view/__init__.py
@@ -30,7 +30,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     except LoginError as error:
         raise ConfigEntryAuthFailed from error
 
-    coordinator = LaCrosseUpdateCoordinator(hass, api, entry)
+    coordinator = LaCrosseUpdateCoordinator(hass, entry, api)
 
     _LOGGER.debug("First refresh")
     await coordinator.async_config_entry_first_refresh()
diff --git a/homeassistant/components/lacrosse_view/const.py b/homeassistant/components/lacrosse_view/const.py
index 900463cff6e..8750d1867e6 100644
--- a/homeassistant/components/lacrosse_view/const.py
+++ b/homeassistant/components/lacrosse_view/const.py
@@ -1,4 +1,4 @@
 """Constants for the LaCrosse View integration."""
 
 DOMAIN = "lacrosse_view"
-SCAN_INTERVAL = 30
+SCAN_INTERVAL = 60
diff --git a/homeassistant/components/lacrosse_view/coordinator.py b/homeassistant/components/lacrosse_view/coordinator.py
index 5ec02a86709..16d7e8b2bb8 100644
--- a/homeassistant/components/lacrosse_view/coordinator.py
+++ b/homeassistant/components/lacrosse_view/coordinator.py
@@ -10,10 +10,10 @@ from lacrosse_view import HTTPError, LaCrosse, Location, LoginError, Sensor
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+from homeassistant.exceptions import ConfigEntryAuthFailed
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import SCAN_INTERVAL
+from .const import DOMAIN, SCAN_INTERVAL
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -26,12 +26,14 @@ class LaCrosseUpdateCoordinator(DataUpdateCoordinator[list[Sensor]]):
     name: str
     id: str
     hass: HomeAssistant
+    devices: list[Sensor] | None = None
+    config_entry: ConfigEntry
 
     def __init__(
         self,
         hass: HomeAssistant,
-        api: LaCrosse,
         entry: ConfigEntry,
+        api: LaCrosse,
     ) -> None:
         """Initialize DataUpdateCoordinator for LaCrosse View."""
         self.api = api
@@ -44,6 +46,7 @@ class LaCrosseUpdateCoordinator(DataUpdateCoordinator[list[Sensor]]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             name="LaCrosse View",
             update_interval=timedelta(seconds=SCAN_INTERVAL),
         )
@@ -60,24 +63,46 @@ class LaCrosseUpdateCoordinator(DataUpdateCoordinator[list[Sensor]]):
             except LoginError as error:
                 raise ConfigEntryAuthFailed from error
 
+        if self.devices is None:
+            _LOGGER.debug("Getting devices")
+            try:
+                self.devices = await self.api.get_devices(
+                    location=Location(id=self.id, name=self.name),
+                )
+            except HTTPError as error:
+                raise UpdateFailed from error
+
         try:
             # Fetch last hour of data
-            sensors = await self.api.get_sensors(
-                location=Location(id=self.id, name=self.name),
-                tz=self.hass.config.time_zone,
-                start=str(now - 3600),
-                end=str(now),
-            )
-        except HTTPError as error:
-            raise ConfigEntryNotReady from error
+            for sensor in self.devices:
+                data = await self.api.get_sensor_status(
+                    sensor=sensor,
+                    tz=self.hass.config.time_zone,
+                )
+                _LOGGER.debug("Got data: %s", data)
 
-        _LOGGER.debug("Got data: %s", sensors)
+                if data_error := data.get("error"):
+                    if data_error == "no_readings":
+                        sensor.data = None
+                        _LOGGER.debug("No readings for %s", sensor.name)
+                        continue
+                    _LOGGER.debug("Error: %s", data_error)
+                    raise UpdateFailed(
+                        translation_domain=DOMAIN, translation_key="update_error"
+                    )
+
+                sensor.data = data["data"]["current"]
+
+        except HTTPError as error:
+            raise UpdateFailed(
+                translation_domain=DOMAIN, translation_key="update_error"
+            ) from error
 
         # Verify that we have permission to read the sensors
-        for sensor in sensors:
+        for sensor in self.devices:
             if not sensor.permissions.get("read", False):
                 raise ConfigEntryAuthFailed(
                     f"This account does not have permission to read {sensor.name}"
                 )
 
-        return sensors
+        return self.devices
diff --git a/homeassistant/components/lacrosse_view/manifest.json b/homeassistant/components/lacrosse_view/manifest.json
index 453a0855229..38e64274deb 100644
--- a/homeassistant/components/lacrosse_view/manifest.json
+++ b/homeassistant/components/lacrosse_view/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/lacrosse_view",
   "iot_class": "cloud_polling",
   "loggers": ["lacrosse_view"],
-  "requirements": ["lacrosse-view==1.0.3"]
+  "requirements": ["lacrosse-view==1.1.1"]
 }
diff --git a/homeassistant/components/lacrosse_view/sensor.py b/homeassistant/components/lacrosse_view/sensor.py
index b2ad9672504..dde8dfd54a2 100644
--- a/homeassistant/components/lacrosse_view/sensor.py
+++ b/homeassistant/components/lacrosse_view/sensor.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -45,10 +45,10 @@ class LaCrosseSensorEntityDescription(SensorEntityDescription):
 
 def get_value(sensor: Sensor, field: str) -> float | int | str | None:
     """Get the value of a sensor field."""
-    field_data = sensor.data.get(field)
+    field_data = sensor.data.get(field) if sensor.data is not None else None
     if field_data is None:
         return None
-    value = field_data["values"][-1]["s"]
+    value = field_data["spot"]["value"]
     try:
         value = float(value)
     except ValueError:
@@ -64,6 +64,7 @@ SENSOR_DESCRIPTIONS = {
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=get_value,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        suggested_display_precision=2,
     ),
     "Humidity": LaCrosseSensorEntityDescription(
         key="Humidity",
@@ -71,6 +72,7 @@ SENSOR_DESCRIPTIONS = {
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=get_value,
         native_unit_of_measurement=PERCENTAGE,
+        suggested_display_precision=2,
     ),
     "HeatIndex": LaCrosseSensorEntityDescription(
         key="HeatIndex",
@@ -79,6 +81,7 @@ SENSOR_DESCRIPTIONS = {
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=get_value,
         native_unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
+        suggested_display_precision=2,
     ),
     "WindSpeed": LaCrosseSensorEntityDescription(
         key="WindSpeed",
@@ -86,6 +89,7 @@ SENSOR_DESCRIPTIONS = {
         value_fn=get_value,
         native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
         device_class=SensorDeviceClass.WIND_SPEED,
+        suggested_display_precision=2,
     ),
     "Rain": LaCrosseSensorEntityDescription(
         key="Rain",
@@ -93,12 +97,16 @@ SENSOR_DESCRIPTIONS = {
         value_fn=get_value,
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
+        suggested_display_precision=2,
     ),
     "WindHeading": LaCrosseSensorEntityDescription(
         key="WindHeading",
         translation_key="wind_heading",
         value_fn=get_value,
         native_unit_of_measurement=DEGREE,
+        suggested_display_precision=2,
+        device_class=SensorDeviceClass.WIND_DIRECTION,
+        state_class=SensorStateClass.MEASUREMENT_ANGLE,
     ),
     "WetDry": LaCrosseSensorEntityDescription(
         key="WetDry",
@@ -117,6 +125,7 @@ SENSOR_DESCRIPTIONS = {
         value_fn=get_value,
         device_class=SensorDeviceClass.ATMOSPHERIC_PRESSURE,
         native_unit_of_measurement=UnitOfPressure.HPA,
+        suggested_display_precision=2,
     ),
     "FeelsLike": LaCrosseSensorEntityDescription(
         key="FeelsLike",
@@ -125,6 +134,7 @@ SENSOR_DESCRIPTIONS = {
         value_fn=get_value,
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
+        suggested_display_precision=2,
     ),
     "WindChill": LaCrosseSensorEntityDescription(
         key="WindChill",
@@ -133,6 +143,7 @@ SENSOR_DESCRIPTIONS = {
         value_fn=get_value,
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
+        suggested_display_precision=2,
     ),
 }
 # map of API returned unit of measurement strings to their corresponding unit of measurement
@@ -149,7 +160,7 @@ UNIT_OF_MEASUREMENT_MAP = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up LaCrosse View from a config entry."""
     coordinator: DataUpdateCoordinator[list[Sensor]] = hass.data[DOMAIN][
@@ -178,7 +189,7 @@ async def async_setup_entry(
                 continue
 
             # if the API returns a different unit of measurement from the description, update it
-            if sensor.data.get(field) is not None:
+            if sensor.data is not None and sensor.data.get(field) is not None:
                 native_unit_of_measurement = UNIT_OF_MEASUREMENT_MAP.get(
                     sensor.data[field].get("unit")
                 )
@@ -226,7 +237,6 @@ class LaCrosseViewSensor(
             name=sensor.name,
             manufacturer="LaCrosse Technology",
             model=sensor.model,
-            via_device=(DOMAIN, sensor.location.id),
         )
         self.index = index
 
@@ -240,7 +250,9 @@ class LaCrosseViewSensor(
     @property
     def available(self) -> bool:
         """Return True if entity is available."""
+        data = self.coordinator.data[self.index].data
         return (
             super().available
-            and self.entity_description.key in self.coordinator.data[self.index].data
+            and data is not None
+            and self.entity_description.key in data
         )
diff --git a/homeassistant/components/lacrosse_view/strings.json b/homeassistant/components/lacrosse_view/strings.json
index 8dc27ba259e..c5d9a11e49a 100644
--- a/homeassistant/components/lacrosse_view/strings.json
+++ b/homeassistant/components/lacrosse_view/strings.json
@@ -42,5 +42,10 @@
         "name": "Wind chill"
       }
     }
+  },
+  "exceptions": {
+    "update_error": {
+      "message": "Error updating data"
+    }
   }
 }
diff --git a/homeassistant/components/lamarzocco/__init__.py b/homeassistant/components/lamarzocco/__init__.py
index d20616e1940..25c8fd1091e 100644
--- a/homeassistant/components/lamarzocco/__init__.py
+++ b/homeassistant/components/lamarzocco/__init__.py
@@ -61,6 +61,42 @@ async def async_setup_entry(hass: HomeAssistant, entry: LaMarzoccoConfigEntry) -
         client=client,
     )
 
+    # initialize the firmware update coordinator early to check the firmware version
+    firmware_device = LaMarzoccoMachine(
+        model=entry.data[CONF_MODEL],
+        serial_number=entry.unique_id,
+        name=entry.data[CONF_NAME],
+        cloud_client=cloud_client,
+    )
+
+    firmware_coordinator = LaMarzoccoFirmwareUpdateCoordinator(
+        hass, entry, firmware_device
+    )
+    await firmware_coordinator.async_config_entry_first_refresh()
+    gateway_version = version.parse(
+        firmware_device.firmware[FirmwareType.GATEWAY].current_version
+    )
+
+    if gateway_version >= version.parse("v5.0.9"):
+        # remove host from config entry, it is not supported anymore
+        data = {k: v for k, v in entry.data.items() if k != CONF_HOST}
+        hass.config_entries.async_update_entry(
+            entry,
+            data=data,
+        )
+
+    elif gateway_version < version.parse("v3.4-rc5"):
+        # incompatible gateway firmware, create an issue
+        ir.async_create_issue(
+            hass,
+            DOMAIN,
+            "unsupported_gateway_firmware",
+            is_fixable=False,
+            severity=ir.IssueSeverity.ERROR,
+            translation_key="unsupported_gateway_firmware",
+            translation_placeholders={"gateway_version": str(gateway_version)},
+        )
+
     # initialize local API
     local_client: LaMarzoccoLocalClient | None = None
     if (host := entry.data.get(CONF_HOST)) is not None:
@@ -117,30 +153,16 @@ async def async_setup_entry(hass: HomeAssistant, entry: LaMarzoccoConfigEntry) -
 
     coordinators = LaMarzoccoRuntimeData(
         LaMarzoccoConfigUpdateCoordinator(hass, entry, device, local_client),
-        LaMarzoccoFirmwareUpdateCoordinator(hass, entry, device),
+        firmware_coordinator,
         LaMarzoccoStatisticsUpdateCoordinator(hass, entry, device),
     )
 
     # API does not like concurrent requests, so no asyncio.gather here
     await coordinators.config_coordinator.async_config_entry_first_refresh()
-    await coordinators.firmware_coordinator.async_config_entry_first_refresh()
     await coordinators.statistics_coordinator.async_config_entry_first_refresh()
 
     entry.runtime_data = coordinators
 
-    gateway_version = device.firmware[FirmwareType.GATEWAY].current_version
-    if version.parse(gateway_version) < version.parse("v3.4-rc5"):
-        # incompatible gateway firmware, create an issue
-        ir.async_create_issue(
-            hass,
-            DOMAIN,
-            "unsupported_gateway_firmware",
-            is_fixable=False,
-            severity=ir.IssueSeverity.ERROR,
-            translation_key="unsupported_gateway_firmware",
-            translation_placeholders={"gateway_version": gateway_version},
-        )
-
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     async def update_listener(
diff --git a/homeassistant/components/lamarzocco/binary_sensor.py b/homeassistant/components/lamarzocco/binary_sensor.py
index e36b53bc993..a98cddcda9c 100644
--- a/homeassistant/components/lamarzocco/binary_sensor.py
+++ b/homeassistant/components/lamarzocco/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import LaMarzoccoConfigEntry
 from .entity import LaMarzoccoEntity, LaMarzoccoEntityDescription, LaMarzoccScaleEntity
@@ -71,7 +71,7 @@ SCALE_ENTITIES: tuple[LaMarzoccoBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LaMarzoccoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up binary sensor entities."""
     coordinator = entry.runtime_data.config_coordinator
@@ -83,7 +83,7 @@ async def async_setup_entry(
     ]
 
     if (
-        coordinator.device.model == MachineModel.LINEA_MINI
+        coordinator.device.model in (MachineModel.LINEA_MINI, MachineModel.LINEA_MINI_R)
         and coordinator.device.config.scale
     ):
         entities.extend(
diff --git a/homeassistant/components/lamarzocco/button.py b/homeassistant/components/lamarzocco/button.py
index 22e92f656ff..db51d610949 100644
--- a/homeassistant/components/lamarzocco/button.py
+++ b/homeassistant/components/lamarzocco/button.py
@@ -10,7 +10,7 @@ from pylamarzocco.exceptions import RequestNotSuccessful
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import LaMarzoccoConfigEntry, LaMarzoccoUpdateCoordinator
@@ -53,7 +53,7 @@ ENTITIES: tuple[LaMarzoccoButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LaMarzoccoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up button entities."""
 
diff --git a/homeassistant/components/lamarzocco/calendar.py b/homeassistant/components/lamarzocco/calendar.py
index 1dcc7c324ac..4365bf56b2d 100644
--- a/homeassistant/components/lamarzocco/calendar.py
+++ b/homeassistant/components/lamarzocco/calendar.py
@@ -7,7 +7,7 @@ from pylamarzocco.models import LaMarzoccoWakeUpSleepEntry
 
 from homeassistant.components.calendar import CalendarEntity, CalendarEvent
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from .coordinator import LaMarzoccoConfigEntry, LaMarzoccoUpdateCoordinator
@@ -32,7 +32,7 @@ DAY_OF_WEEK = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LaMarzoccoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switch entities and services."""
 
diff --git a/homeassistant/components/lamarzocco/coordinator.py b/homeassistant/components/lamarzocco/coordinator.py
index 2385039f53d..dddca6565e4 100644
--- a/homeassistant/components/lamarzocco/coordinator.py
+++ b/homeassistant/components/lamarzocco/coordinator.py
@@ -17,7 +17,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN
diff --git a/homeassistant/components/lamarzocco/icons.json b/homeassistant/components/lamarzocco/icons.json
index 79267b4abd4..2be882fafea 100644
--- a/homeassistant/components/lamarzocco/icons.json
+++ b/homeassistant/components/lamarzocco/icons.json
@@ -95,6 +95,9 @@
       "drink_stats_flushing": {
         "default": "mdi:chart-line"
       },
+      "drink_stats_coffee_key": {
+        "default": "mdi:chart-scatter-plot"
+      },
       "shot_timer": {
         "default": "mdi:timer"
       },
diff --git a/homeassistant/components/lamarzocco/manifest.json b/homeassistant/components/lamarzocco/manifest.json
index afd367b0f6e..73f00b2bdd0 100644
--- a/homeassistant/components/lamarzocco/manifest.json
+++ b/homeassistant/components/lamarzocco/manifest.json
@@ -37,5 +37,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["pylamarzocco"],
   "quality_scale": "platinum",
-  "requirements": ["pylamarzocco==1.4.6"]
+  "requirements": ["pylamarzocco==1.4.9"]
 }
diff --git a/homeassistant/components/lamarzocco/number.py b/homeassistant/components/lamarzocco/number.py
index 44b582fbf1a..08e9ad7e590 100644
--- a/homeassistant/components/lamarzocco/number.py
+++ b/homeassistant/components/lamarzocco/number.py
@@ -29,7 +29,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import LaMarzoccoConfigEntry, LaMarzoccoUpdateCoordinator
@@ -144,9 +144,12 @@ KEY_ENTITIES: tuple[LaMarzoccoKeyNumberEntityDescription, ...] = (
         set_value_fn=lambda machine, value, key: machine.set_prebrew_time(
             prebrew_off_time=value, key=key
         ),
-        native_value_fn=lambda config, key: config.prebrew_configuration[key].off_time,
+        native_value_fn=lambda config, key: config.prebrew_configuration[key][
+            0
+        ].off_time,
         available_fn=lambda device: len(device.config.prebrew_configuration) > 0
-        and device.config.prebrew_mode == PrebrewMode.PREBREW,
+        and device.config.prebrew_mode
+        in (PrebrewMode.PREBREW, PrebrewMode.PREBREW_ENABLED),
         supported_fn=lambda coordinator: coordinator.device.model
         != MachineModel.GS3_MP,
     ),
@@ -162,9 +165,12 @@ KEY_ENTITIES: tuple[LaMarzoccoKeyNumberEntityDescription, ...] = (
         set_value_fn=lambda machine, value, key: machine.set_prebrew_time(
             prebrew_on_time=value, key=key
         ),
-        native_value_fn=lambda config, key: config.prebrew_configuration[key].off_time,
+        native_value_fn=lambda config, key: config.prebrew_configuration[key][
+            0
+        ].off_time,
         available_fn=lambda device: len(device.config.prebrew_configuration) > 0
-        and device.config.prebrew_mode == PrebrewMode.PREBREW,
+        and device.config.prebrew_mode
+        in (PrebrewMode.PREBREW, PrebrewMode.PREBREW_ENABLED),
         supported_fn=lambda coordinator: coordinator.device.model
         != MachineModel.GS3_MP,
     ),
@@ -180,8 +186,8 @@ KEY_ENTITIES: tuple[LaMarzoccoKeyNumberEntityDescription, ...] = (
         set_value_fn=lambda machine, value, key: machine.set_preinfusion_time(
             preinfusion_time=value, key=key
         ),
-        native_value_fn=lambda config, key: config.prebrew_configuration[
-            key
+        native_value_fn=lambda config, key: config.prebrew_configuration[key][
+            1
         ].preinfusion_time,
         available_fn=lambda device: len(device.config.prebrew_configuration) > 0
         and device.config.prebrew_mode == PrebrewMode.PREINFUSION,
@@ -220,7 +226,8 @@ SCALE_KEY_ENTITIES: tuple[LaMarzoccoKeyNumberEntityDescription, ...] = (
             config.bbw_settings.doses[key] if config.bbw_settings else None
         ),
         supported_fn=(
-            lambda coordinator: coordinator.device.model == MachineModel.LINEA_MINI
+            lambda coordinator: coordinator.device.model
+            in (MachineModel.LINEA_MINI, MachineModel.LINEA_MINI_R)
             and coordinator.device.config.scale is not None
         ),
     ),
@@ -230,7 +237,7 @@ SCALE_KEY_ENTITIES: tuple[LaMarzoccoKeyNumberEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LaMarzoccoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up number entities."""
     coordinator = entry.runtime_data.config_coordinator
diff --git a/homeassistant/components/lamarzocco/select.py b/homeassistant/components/lamarzocco/select.py
index 7acb654f0d2..5ebe2d7b9da 100644
--- a/homeassistant/components/lamarzocco/select.py
+++ b/homeassistant/components/lamarzocco/select.py
@@ -19,7 +19,7 @@ from homeassistant.components.select import SelectEntity, SelectEntityDescriptio
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import LaMarzoccoConfigEntry
@@ -38,6 +38,7 @@ STEAM_LEVEL_LM_TO_HA = {value: key for key, value in STEAM_LEVEL_HA_TO_LM.items(
 PREBREW_MODE_HA_TO_LM = {
     "disabled": PrebrewMode.DISABLED,
     "prebrew": PrebrewMode.PREBREW,
+    "prebrew_enabled": PrebrewMode.PREBREW_ENABLED,
     "preinfusion": PrebrewMode.PREINFUSION,
 }
 
@@ -88,6 +89,7 @@ ENTITIES: tuple[LaMarzoccoSelectEntityDescription, ...] = (
             MachineModel.GS3_AV,
             MachineModel.LINEA_MICRA,
             MachineModel.LINEA_MINI,
+            MachineModel.LINEA_MINI_R,
         ),
     ),
     LaMarzoccoSelectEntityDescription(
@@ -126,7 +128,7 @@ SCALE_ENTITIES: tuple[LaMarzoccoSelectEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LaMarzoccoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up select entities."""
     coordinator = entry.runtime_data.config_coordinator
@@ -138,7 +140,7 @@ async def async_setup_entry(
     ]
 
     if (
-        coordinator.device.model == MachineModel.LINEA_MINI
+        coordinator.device.model in (MachineModel.LINEA_MINI, MachineModel.LINEA_MINI_R)
         and coordinator.device.config.scale
     ):
         entities.extend(
diff --git a/homeassistant/components/lamarzocco/sensor.py b/homeassistant/components/lamarzocco/sensor.py
index 2acca879d52..0d4a5e53ebe 100644
--- a/homeassistant/components/lamarzocco/sensor.py
+++ b/homeassistant/components/lamarzocco/sensor.py
@@ -3,7 +3,7 @@
 from collections.abc import Callable
 from dataclasses import dataclass
 
-from pylamarzocco.const import BoilerType, MachineModel, PhysicalKey
+from pylamarzocco.const import KEYS_PER_MODEL, BoilerType, MachineModel, PhysicalKey
 from pylamarzocco.devices.machine import LaMarzoccoMachine
 
 from homeassistant.components.sensor import (
@@ -19,9 +19,9 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import LaMarzoccoConfigEntry
+from .coordinator import LaMarzoccoConfigEntry, LaMarzoccoUpdateCoordinator
 from .entity import LaMarzoccoEntity, LaMarzoccoEntityDescription, LaMarzoccScaleEntity
 
 # Coordinator is used to centralize the data updates
@@ -37,6 +37,15 @@ class LaMarzoccoSensorEntityDescription(
     value_fn: Callable[[LaMarzoccoMachine], float | int]
 
 
+@dataclass(frozen=True, kw_only=True)
+class LaMarzoccoKeySensorEntityDescription(
+    LaMarzoccoEntityDescription, SensorEntityDescription
+):
+    """Description of a keyed La Marzocco sensor."""
+
+    value_fn: Callable[[LaMarzoccoMachine, PhysicalKey], int | None]
+
+
 ENTITIES: tuple[LaMarzoccoSensorEntityDescription, ...] = (
     LaMarzoccoSensorEntityDescription(
         key="shot_timer",
@@ -71,7 +80,7 @@ ENTITIES: tuple[LaMarzoccoSensorEntityDescription, ...] = (
             BoilerType.STEAM
         ].current_temperature,
         supported_fn=lambda coordinator: coordinator.device.model
-        != MachineModel.LINEA_MINI,
+        not in (MachineModel.LINEA_MINI, MachineModel.LINEA_MINI_R),
     ),
 )
 
@@ -79,16 +88,14 @@ STATISTIC_ENTITIES: tuple[LaMarzoccoSensorEntityDescription, ...] = (
     LaMarzoccoSensorEntityDescription(
         key="drink_stats_coffee",
         translation_key="drink_stats_coffee",
-        native_unit_of_measurement="drinks",
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda device: device.statistics.drink_stats.get(PhysicalKey.A, 0),
+        value_fn=lambda device: device.statistics.total_coffee,
         available_fn=lambda device: len(device.statistics.drink_stats) > 0,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     LaMarzoccoSensorEntityDescription(
         key="drink_stats_flushing",
         translation_key="drink_stats_flushing",
-        native_unit_of_measurement="drinks",
         state_class=SensorStateClass.TOTAL_INCREASING,
         value_fn=lambda device: device.statistics.total_flushes,
         available_fn=lambda device: len(device.statistics.drink_stats) > 0,
@@ -96,6 +103,18 @@ STATISTIC_ENTITIES: tuple[LaMarzoccoSensorEntityDescription, ...] = (
     ),
 )
 
+KEY_STATISTIC_ENTITIES: tuple[LaMarzoccoKeySensorEntityDescription, ...] = (
+    LaMarzoccoKeySensorEntityDescription(
+        key="drink_stats_coffee_key",
+        translation_key="drink_stats_coffee_key",
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        value_fn=lambda device, key: device.statistics.drink_stats.get(key),
+        available_fn=lambda device: len(device.statistics.drink_stats) > 0,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+)
+
 SCALE_ENTITIES: tuple[LaMarzoccoSensorEntityDescription, ...] = (
     LaMarzoccoSensorEntityDescription(
         key="scale_battery",
@@ -106,7 +125,8 @@ SCALE_ENTITIES: tuple[LaMarzoccoSensorEntityDescription, ...] = (
             device.config.scale.battery if device.config.scale else 0
         ),
         supported_fn=(
-            lambda coordinator: coordinator.device.model == MachineModel.LINEA_MINI
+            lambda coordinator: coordinator.device.model
+            in (MachineModel.LINEA_MINI, MachineModel.LINEA_MINI_R)
         ),
     ),
 )
@@ -115,11 +135,13 @@ SCALE_ENTITIES: tuple[LaMarzoccoSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LaMarzoccoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensor entities."""
     config_coordinator = entry.runtime_data.config_coordinator
 
+    entities: list[LaMarzoccoSensorEntity | LaMarzoccoKeySensorEntity] = []
+
     entities = [
         LaMarzoccoSensorEntity(config_coordinator, description)
         for description in ENTITIES
@@ -127,7 +149,8 @@ async def async_setup_entry(
     ]
 
     if (
-        config_coordinator.device.model == MachineModel.LINEA_MINI
+        config_coordinator.device.model
+        in (MachineModel.LINEA_MINI, MachineModel.LINEA_MINI_R)
         and config_coordinator.device.config.scale
     ):
         entities.extend(
@@ -142,6 +165,14 @@ async def async_setup_entry(
         if description.supported_fn(statistics_coordinator)
     )
 
+    num_keys = KEYS_PER_MODEL[MachineModel(config_coordinator.device.model)]
+    if num_keys > 0:
+        entities.extend(
+            LaMarzoccoKeySensorEntity(statistics_coordinator, description, key)
+            for description in KEY_STATISTIC_ENTITIES
+            for key in range(1, num_keys + 1)
+        )
+
     def _async_add_new_scale() -> None:
         async_add_entities(
             LaMarzoccoScaleSensorEntity(config_coordinator, description)
@@ -159,11 +190,36 @@ class LaMarzoccoSensorEntity(LaMarzoccoEntity, SensorEntity):
     entity_description: LaMarzoccoSensorEntityDescription
 
     @property
-    def native_value(self) -> int | float:
+    def native_value(self) -> int | float | None:
         """State of the sensor."""
         return self.entity_description.value_fn(self.coordinator.device)
 
 
+class LaMarzoccoKeySensorEntity(LaMarzoccoEntity, SensorEntity):
+    """Sensor for a La Marzocco key."""
+
+    entity_description: LaMarzoccoKeySensorEntityDescription
+
+    def __init__(
+        self,
+        coordinator: LaMarzoccoUpdateCoordinator,
+        description: LaMarzoccoKeySensorEntityDescription,
+        key: int,
+    ) -> None:
+        """Initialize the sensor."""
+        super().__init__(coordinator, description)
+        self.key = key
+        self._attr_translation_placeholders = {"key": str(key)}
+        self._attr_unique_id = f"{super()._attr_unique_id}_key{key}"
+
+    @property
+    def native_value(self) -> int | None:
+        """State of the sensor."""
+        return self.entity_description.value_fn(
+            self.coordinator.device, PhysicalKey(self.key)
+        )
+
+
 class LaMarzoccoScaleSensorEntity(LaMarzoccoSensorEntity, LaMarzoccScaleEntity):
     """Sensor for a La Marzocco scale."""
 
diff --git a/homeassistant/components/lamarzocco/strings.json b/homeassistant/components/lamarzocco/strings.json
index cc96e4615dc..04853b8d0ca 100644
--- a/homeassistant/components/lamarzocco/strings.json
+++ b/homeassistant/components/lamarzocco/strings.json
@@ -148,6 +148,7 @@
         "state": {
           "disabled": "Disabled",
           "prebrew": "Prebrew",
+          "prebrew_enabled": "Prebrew",
           "preinfusion": "Preinfusion"
         }
       },
@@ -175,10 +176,16 @@
         "name": "Current steam temperature"
       },
       "drink_stats_coffee": {
-        "name": "Total coffees made"
+        "name": "Total coffees made",
+        "unit_of_measurement": "coffees"
+      },
+      "drink_stats_coffee_key": {
+        "name": "Coffees made Key {key}",
+        "unit_of_measurement": "coffees"
       },
       "drink_stats_flushing": {
-        "name": "Total flushes made"
+        "name": "Total flushes made",
+        "unit_of_measurement": "flushes"
       },
       "shot_timer": {
         "name": "Shot timer"
diff --git a/homeassistant/components/lamarzocco/switch.py b/homeassistant/components/lamarzocco/switch.py
index 54bd1ac2aed..ee03ba421d4 100644
--- a/homeassistant/components/lamarzocco/switch.py
+++ b/homeassistant/components/lamarzocco/switch.py
@@ -13,7 +13,7 @@ from homeassistant.components.switch import SwitchEntity, SwitchEntityDescriptio
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import LaMarzoccoConfigEntry, LaMarzoccoUpdateCoordinator
@@ -64,7 +64,7 @@ ENTITIES: tuple[LaMarzoccoSwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LaMarzoccoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switch entities and services."""
 
diff --git a/homeassistant/components/lamarzocco/update.py b/homeassistant/components/lamarzocco/update.py
index 0833ee6e249..37960d26e95 100644
--- a/homeassistant/components/lamarzocco/update.py
+++ b/homeassistant/components/lamarzocco/update.py
@@ -15,7 +15,7 @@ from homeassistant.components.update import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import LaMarzoccoConfigEntry
@@ -55,7 +55,7 @@ ENTITIES: tuple[LaMarzoccoUpdateEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LaMarzoccoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create update entities."""
 
diff --git a/homeassistant/components/lametric/__init__.py b/homeassistant/components/lametric/__init__.py
index 779cfa10445..89659fbd2c0 100644
--- a/homeassistant/components/lametric/__init__.py
+++ b/homeassistant/components/lametric/__init__.py
@@ -4,8 +4,7 @@ from homeassistant.components import notify as hass_notify
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN, PLATFORMS
diff --git a/homeassistant/components/lametric/button.py b/homeassistant/components/lametric/button.py
index f0a452f2d02..3c7d754fa0b 100644
--- a/homeassistant/components/lametric/button.py
+++ b/homeassistant/components/lametric/button.py
@@ -12,7 +12,7 @@ from homeassistant.components.button import ButtonEntity, ButtonEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import LaMetricDataUpdateCoordinator
@@ -58,7 +58,7 @@ BUTTONS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up LaMetric button based on a config entry."""
     coordinator: LaMetricDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/lametric/coordinator.py b/homeassistant/components/lametric/coordinator.py
index 6655b035740..c292b2971b6 100644
--- a/homeassistant/components/lametric/coordinator.py
+++ b/homeassistant/components/lametric/coordinator.py
@@ -21,14 +21,15 @@ class LaMetricDataUpdateCoordinator(DataUpdateCoordinator[Device]):
 
     def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
         """Initialize the LaMatric coordinator."""
-        self.config_entry = entry
         self.lametric = LaMetricDevice(
             host=entry.data[CONF_HOST],
             api_key=entry.data[CONF_API_KEY],
             session=async_get_clientsession(hass),
         )
 
-        super().__init__(hass, LOGGER, name=DOMAIN, update_interval=SCAN_INTERVAL)
+        super().__init__(
+            hass, LOGGER, config_entry=entry, name=DOMAIN, update_interval=SCAN_INTERVAL
+        )
 
     async def _async_update_data(self) -> Device:
         """Fetch device information of the LaMetric device."""
diff --git a/homeassistant/components/lametric/number.py b/homeassistant/components/lametric/number.py
index ccfd48a3abf..7f356741d76 100644
--- a/homeassistant/components/lametric/number.py
+++ b/homeassistant/components/lametric/number.py
@@ -12,7 +12,7 @@ from homeassistant.components.number import NumberEntity, NumberEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import LaMetricDataUpdateCoordinator
@@ -58,7 +58,7 @@ NUMBERS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up LaMetric number based on a config entry."""
     coordinator: LaMetricDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/lametric/select.py b/homeassistant/components/lametric/select.py
index bf9872f2791..eab7cd5997c 100644
--- a/homeassistant/components/lametric/select.py
+++ b/homeassistant/components/lametric/select.py
@@ -12,7 +12,7 @@ from homeassistant.components.select import SelectEntity, SelectEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import LaMetricDataUpdateCoordinator
@@ -43,7 +43,7 @@ SELECTS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up LaMetric select based on a config entry."""
     coordinator: LaMetricDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/lametric/sensor.py b/homeassistant/components/lametric/sensor.py
index f202a77b530..a5d5da3c046 100644
--- a/homeassistant/components/lametric/sensor.py
+++ b/homeassistant/components/lametric/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import LaMetricDataUpdateCoordinator
@@ -45,7 +45,7 @@ SENSORS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up LaMetric sensor based on a config entry."""
     coordinator: LaMetricDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/lametric/switch.py b/homeassistant/components/lametric/switch.py
index 3aabfaf17e1..85e61164639 100644
--- a/homeassistant/components/lametric/switch.py
+++ b/homeassistant/components/lametric/switch.py
@@ -12,7 +12,7 @@ from homeassistant.components.switch import SwitchEntity, SwitchEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import LaMetricDataUpdateCoordinator
@@ -48,7 +48,7 @@ SWITCHES = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up LaMetric switch based on a config entry."""
     coordinator: LaMetricDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/landisgyr_heat_meter/__init__.py b/homeassistant/components/landisgyr_heat_meter/__init__.py
index 5cbdc593100..7e7ebe61eb7 100644
--- a/homeassistant/components/landisgyr_heat_meter/__init__.py
+++ b/homeassistant/components/landisgyr_heat_meter/__init__.py
@@ -27,7 +27,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     reader = ultraheat_api.UltraheatReader(entry.data[CONF_DEVICE])
     api = ultraheat_api.HeatMeterService(reader)
 
-    coordinator = UltraheatCoordinator(hass, api)
+    coordinator = UltraheatCoordinator(hass, entry, api)
     await coordinator.async_config_entry_first_refresh()
 
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
diff --git a/homeassistant/components/landisgyr_heat_meter/coordinator.py b/homeassistant/components/landisgyr_heat_meter/coordinator.py
index db265449f37..4214fa1db3e 100644
--- a/homeassistant/components/landisgyr_heat_meter/coordinator.py
+++ b/homeassistant/components/landisgyr_heat_meter/coordinator.py
@@ -7,6 +7,7 @@ import serial
 from ultraheat_api.response import HeatMeterResponse
 from ultraheat_api.service import HeatMeterService
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -18,11 +19,16 @@ _LOGGER = logging.getLogger(__name__)
 class UltraheatCoordinator(DataUpdateCoordinator[HeatMeterResponse]):
     """Coordinator for getting data from the ultraheat api."""
 
-    def __init__(self, hass: HomeAssistant, api: HeatMeterService) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, api: HeatMeterService
+    ) -> None:
         """Initialize my coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="ultraheat",
             update_interval=POLLING_INTERVAL,
         )
diff --git a/homeassistant/components/landisgyr_heat_meter/sensor.py b/homeassistant/components/landisgyr_heat_meter/sensor.py
index dd76d3e53cc..9bb4af572fd 100644
--- a/homeassistant/components/landisgyr_heat_meter/sensor.py
+++ b/homeassistant/components/landisgyr_heat_meter/sensor.py
@@ -27,7 +27,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
@@ -269,7 +269,9 @@ HEAT_METER_SENSOR_TYPES = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor platform."""
     unique_id = entry.entry_id
diff --git a/homeassistant/components/lannouncer/notify.py b/homeassistant/components/lannouncer/notify.py
index 6c3cd1922cf..fe486660438 100644
--- a/homeassistant/components/lannouncer/notify.py
+++ b/homeassistant/components/lannouncer/notify.py
@@ -15,7 +15,7 @@ from homeassistant.components.notify import (
 )
 from homeassistant.const import CONF_HOST, CONF_PORT
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 ATTR_METHOD = "method"
diff --git a/homeassistant/components/lastfm/__init__.py b/homeassistant/components/lastfm/__init__.py
index ebcc929c39c..8611d06eee1 100644
--- a/homeassistant/components/lastfm/__init__.py
+++ b/homeassistant/components/lastfm/__init__.py
@@ -12,7 +12,7 @@ from .coordinator import LastFMDataUpdateCoordinator
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up lastfm from a config entry."""
 
-    coordinator = LastFMDataUpdateCoordinator(hass)
+    coordinator = LastFMDataUpdateCoordinator(hass, entry)
     await coordinator.async_config_entry_first_refresh()
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
 
diff --git a/homeassistant/components/lastfm/config_flow.py b/homeassistant/components/lastfm/config_flow.py
index 0e1f680dd63..ca40aebd0d4 100644
--- a/homeassistant/components/lastfm/config_flow.py
+++ b/homeassistant/components/lastfm/config_flow.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import logging
 from typing import Any
 
 from pylast import LastFMNetwork, PyLastError, User, WSError
@@ -32,6 +33,8 @@ CONFIG_SCHEMA: vol.Schema = vol.Schema(
     }
 )
 
+_LOGGER = logging.getLogger(__name__)
+
 
 def get_lastfm_user(api_key: str, username: str) -> tuple[User, dict[str, str]]:
     """Get and validate lastFM User."""
@@ -49,7 +52,8 @@ def get_lastfm_user(api_key: str, username: str) -> tuple[User, dict[str, str]]:
             errors["base"] = "invalid_auth"
         else:
             errors["base"] = "unknown"
-    except Exception:  # noqa: BLE001
+    except Exception:
+        _LOGGER.exception("Unexpected exception")
         errors["base"] = "unknown"
     return user, errors
 
diff --git a/homeassistant/components/lastfm/coordinator.py b/homeassistant/components/lastfm/coordinator.py
index 18473745450..ae89e103b80 100644
--- a/homeassistant/components/lastfm/coordinator.py
+++ b/homeassistant/components/lastfm/coordinator.py
@@ -39,15 +39,16 @@ class LastFMDataUpdateCoordinator(DataUpdateCoordinator[dict[str, LastFMUserData
     config_entry: ConfigEntry
     _client: LastFMNetwork
 
-    def __init__(self, hass: HomeAssistant) -> None:
+    def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
         """Initialize the LastFM data coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=30),
         )
-        self._client = LastFMNetwork(api_key=self.config_entry.options[CONF_API_KEY])
+        self._client = LastFMNetwork(api_key=config_entry.options[CONF_API_KEY])
 
     async def _async_update_data(self) -> dict[str, LastFMUserData]:
         res = {}
diff --git a/homeassistant/components/lastfm/sensor.py b/homeassistant/components/lastfm/sensor.py
index 48770113a80..89025583e92 100644
--- a/homeassistant/components/lastfm/sensor.py
+++ b/homeassistant/components/lastfm/sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.sensor import SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
@@ -27,7 +27,7 @@ from .coordinator import LastFMDataUpdateCoordinator, LastFMUserData
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize the entries."""
 
diff --git a/homeassistant/components/launch_library/sensor.py b/homeassistant/components/launch_library/sensor.py
index 7d3b2bd97b6..201b4c8f037 100644
--- a/homeassistant/components/launch_library/sensor.py
+++ b/homeassistant/components/launch_library/sensor.py
@@ -18,7 +18,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, PERCENTAGE
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -122,7 +122,7 @@ SENSOR_DESCRIPTIONS: tuple[LaunchLibrarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor platform."""
     name = entry.data.get(CONF_NAME, DEFAULT_NEXT_LAUNCH_NAME)
diff --git a/homeassistant/components/laundrify/__init__.py b/homeassistant/components/laundrify/__init__.py
index b08624b6d23..7e3dd848348 100644
--- a/homeassistant/components/laundrify/__init__.py
+++ b/homeassistant/components/laundrify/__init__.py
@@ -13,7 +13,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import DEFAULT_POLL_INTERVAL, DOMAIN
+from .const import DOMAIN
 from .coordinator import LaundrifyUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
@@ -34,7 +34,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     except ApiConnectionException as err:
         raise ConfigEntryNotReady("Cannot reach laundrify API") from err
 
-    coordinator = LaundrifyUpdateCoordinator(hass, api_client, DEFAULT_POLL_INTERVAL)
+    coordinator = LaundrifyUpdateCoordinator(hass, entry, api_client)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/laundrify/binary_sensor.py b/homeassistant/components/laundrify/binary_sensor.py
index cee6aa6c754..82f4f7609dc 100644
--- a/homeassistant/components/laundrify/binary_sensor.py
+++ b/homeassistant/components/laundrify/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, MANUFACTURER, MODELS
@@ -23,7 +23,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, config: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    config: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors from a config entry created in the integrations UI."""
 
diff --git a/homeassistant/components/laundrify/coordinator.py b/homeassistant/components/laundrify/coordinator.py
index 22f68a7c5ae..928e30a9ed5 100644
--- a/homeassistant/components/laundrify/coordinator.py
+++ b/homeassistant/components/laundrify/coordinator.py
@@ -7,11 +7,12 @@ import logging
 from laundrify_aio import LaundrifyAPI, LaundrifyDevice
 from laundrify_aio.exceptions import ApiConnectionException, UnauthorizedException
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import DOMAIN, REQUEST_TIMEOUT
+from .const import DEFAULT_POLL_INTERVAL, DOMAIN, REQUEST_TIMEOUT
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -19,15 +20,21 @@ _LOGGER = logging.getLogger(__name__)
 class LaundrifyUpdateCoordinator(DataUpdateCoordinator[dict[str, LaundrifyDevice]]):
     """Class to manage fetching laundrify API data."""
 
+    config_entry: ConfigEntry
+
     def __init__(
-        self, hass: HomeAssistant, laundrify_api: LaundrifyAPI, poll_interval: int
+        self,
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        laundrify_api: LaundrifyAPI,
     ) -> None:
         """Initialize laundrify coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
-            update_interval=timedelta(seconds=poll_interval),
+            update_interval=timedelta(seconds=DEFAULT_POLL_INTERVAL),
         )
         self.laundrify_api = laundrify_api
 
diff --git a/homeassistant/components/laundrify/sensor.py b/homeassistant/components/laundrify/sensor.py
index 98169f95fce..3c343861b0a 100644
--- a/homeassistant/components/laundrify/sensor.py
+++ b/homeassistant/components/laundrify/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfEnergy, UnitOfPower
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
@@ -24,7 +24,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, config: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    config: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add power sensor for passed config_entry in HA."""
 
diff --git a/homeassistant/components/lawn_mower/__init__.py b/homeassistant/components/lawn_mower/__init__.py
index 0680bfc9d71..f8c3e0cd67d 100644
--- a/homeassistant/components/lawn_mower/__init__.py
+++ b/homeassistant/components/lawn_mower/__init__.py
@@ -28,6 +28,7 @@ from .const import (
 _LOGGER = logging.getLogger(__name__)
 
 DATA_COMPONENT: HassKey[EntityComponent[LawnMowerEntity]] = HassKey(DOMAIN)
+ENTITY_ID_FORMAT = DOMAIN + ".{}"
 PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA
 PLATFORM_SCHEMA_BASE = cv.PLATFORM_SCHEMA_BASE
 SCAN_INTERVAL = timedelta(seconds=60)
diff --git a/homeassistant/components/lcn/__init__.py b/homeassistant/components/lcn/__init__.py
index 58924413c56..256e132b30d 100644
--- a/homeassistant/components/lcn/__init__.py
+++ b/homeassistant/components/lcn/__init__.py
@@ -49,6 +49,7 @@ from .helpers import (
     InputType,
     async_update_config_entry,
     generate_unique_id,
+    purge_device_registry,
     register_lcn_address_devices,
     register_lcn_host_device,
 )
@@ -120,6 +121,9 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     register_lcn_host_device(hass, config_entry)
     register_lcn_address_devices(hass, config_entry)
 
+    # clean up orphaned devices
+    purge_device_registry(hass, config_entry.entry_id, {**config_entry.data})
+
     # forward config_entry to components
     await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
 
diff --git a/homeassistant/components/lcn/binary_sensor.py b/homeassistant/components/lcn/binary_sensor.py
index d0ce4815f19..65afae56f22 100644
--- a/homeassistant/components/lcn/binary_sensor.py
+++ b/homeassistant/components/lcn/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.script import scripts_with_entity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DOMAIN, CONF_ENTITIES, CONF_SOURCE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.issue_registry import (
     IssueSeverity,
     async_create_issue,
@@ -35,7 +35,7 @@ from .helpers import InputType
 
 def add_lcn_entities(
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     entity_configs: Iterable[ConfigType],
 ) -> None:
     """Add entities for this domain."""
@@ -54,7 +54,7 @@ def add_lcn_entities(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up LCN switch entities from a config entry."""
     add_entities = partial(
diff --git a/homeassistant/components/lcn/climate.py b/homeassistant/components/lcn/climate.py
index 1dff15c4f22..e91ae723714 100644
--- a/homeassistant/components/lcn/climate.py
+++ b/homeassistant/components/lcn/climate.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
@@ -43,7 +43,7 @@ PARALLEL_UPDATES = 0
 
 def add_lcn_entities(
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     entity_configs: Iterable[ConfigType],
 ) -> None:
     """Add entities for this domain."""
@@ -57,7 +57,7 @@ def add_lcn_entities(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up LCN switch entities from a config entry."""
     add_entities = partial(
diff --git a/homeassistant/components/lcn/config_flow.py b/homeassistant/components/lcn/config_flow.py
index a1be32704f7..63e0d8c8b26 100644
--- a/homeassistant/components/lcn/config_flow.py
+++ b/homeassistant/components/lcn/config_flow.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     CONF_USERNAME,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from . import PchkConnectionManager
diff --git a/homeassistant/components/lcn/cover.py b/homeassistant/components/lcn/cover.py
index 042461b6af2..be713871aae 100644
--- a/homeassistant/components/lcn/cover.py
+++ b/homeassistant/components/lcn/cover.py
@@ -10,7 +10,7 @@ from homeassistant.components.cover import DOMAIN as DOMAIN_COVER, CoverEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DOMAIN, CONF_ENTITIES
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
@@ -28,7 +28,7 @@ PARALLEL_UPDATES = 0
 
 def add_lcn_entities(
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     entity_configs: Iterable[ConfigType],
 ) -> None:
     """Add entities for this domain."""
@@ -45,7 +45,7 @@ def add_lcn_entities(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up LCN cover entities from a config entry."""
     add_entities = partial(
diff --git a/homeassistant/components/lcn/entity.py b/homeassistant/components/lcn/entity.py
index 12d8f966801..ffb680c4237 100644
--- a/homeassistant/components/lcn/entity.py
+++ b/homeassistant/components/lcn/entity.py
@@ -3,19 +3,18 @@
 from collections.abc import Callable
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_ADDRESS, CONF_DOMAIN, CONF_NAME, CONF_RESOURCE
+from homeassistant.const import CONF_ADDRESS, CONF_NAME, CONF_RESOURCE
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.typing import ConfigType
 
-from .const import CONF_DOMAIN_DATA, DOMAIN
+from .const import DOMAIN
 from .helpers import (
     AddressType,
     DeviceConnectionType,
     InputType,
     generate_unique_id,
     get_device_connection,
-    get_device_model,
 )
 
 
@@ -36,6 +35,14 @@ class LcnEntity(Entity):
         self.address: AddressType = config[CONF_ADDRESS]
         self._unregister_for_inputs: Callable | None = None
         self._name: str = config[CONF_NAME]
+        self._attr_device_info = DeviceInfo(
+            identifiers={
+                (
+                    DOMAIN,
+                    generate_unique_id(self.config_entry.entry_id, self.address),
+                )
+            },
+        )
 
     @property
     def unique_id(self) -> str:
@@ -44,28 +51,6 @@ class LcnEntity(Entity):
             self.config_entry.entry_id, self.address, self.config[CONF_RESOURCE]
         )
 
-    @property
-    def device_info(self) -> DeviceInfo | None:
-        """Return device specific attributes."""
-        address = f"{'g' if self.address[2] else 'm'}{self.address[0]:03d}{self.address[1]:03d}"
-        model = (
-            "LCN resource"
-            f" ({get_device_model(self.config[CONF_DOMAIN], self.config[CONF_DOMAIN_DATA])})"
-        )
-
-        return DeviceInfo(
-            identifiers={(DOMAIN, self.unique_id)},
-            name=f"{address}.{self.config[CONF_RESOURCE]}",
-            model=model,
-            manufacturer="Issendorff",
-            via_device=(
-                DOMAIN,
-                generate_unique_id(
-                    self.config_entry.entry_id, self.config[CONF_ADDRESS]
-                ),
-            ),
-        )
-
     async def async_added_to_hass(self) -> None:
         """Run when entity about to be added to hass."""
         self.device_connection = get_device_connection(
diff --git a/homeassistant/components/lcn/helpers.py b/homeassistant/components/lcn/helpers.py
index b999c6f3770..2176c669251 100644
--- a/homeassistant/components/lcn/helpers.py
+++ b/homeassistant/components/lcn/helpers.py
@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import asyncio
 from copy import deepcopy
-from itertools import chain
 import re
 from typing import cast
 
@@ -22,7 +21,6 @@ from homeassistant.const import (
     CONF_NAME,
     CONF_RESOURCE,
     CONF_SENSORS,
-    CONF_SOURCE,
     CONF_SWITCHES,
 )
 from homeassistant.core import HomeAssistant
@@ -30,23 +28,14 @@ from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
-    BINSENSOR_PORTS,
     CONF_CLIMATES,
     CONF_HARDWARE_SERIAL,
     CONF_HARDWARE_TYPE,
-    CONF_OUTPUT,
     CONF_SCENES,
     CONF_SOFTWARE_SERIAL,
     CONNECTION,
     DEVICE_CONNECTIONS,
     DOMAIN,
-    LED_PORTS,
-    LOGICOP_PORTS,
-    OUTPUT_PORTS,
-    S0_INPUTS,
-    SETPOINTS,
-    THRESHOLDS,
-    VARIABLES,
 )
 
 # typing
@@ -96,31 +85,6 @@ def get_resource(domain_name: str, domain_data: ConfigType) -> str:
     raise ValueError("Unknown domain")
 
 
-def get_device_model(domain_name: str, domain_data: ConfigType) -> str:
-    """Return the model for the specified domain_data."""
-    if domain_name in ("switch", "light"):
-        return "Output" if domain_data[CONF_OUTPUT] in OUTPUT_PORTS else "Relay"
-    if domain_name in ("binary_sensor", "sensor"):
-        if domain_data[CONF_SOURCE] in BINSENSOR_PORTS:
-            return "Binary Sensor"
-        if domain_data[CONF_SOURCE] in chain(
-            VARIABLES, SETPOINTS, THRESHOLDS, S0_INPUTS
-        ):
-            return "Variable"
-        if domain_data[CONF_SOURCE] in LED_PORTS:
-            return "Led"
-        if domain_data[CONF_SOURCE] in LOGICOP_PORTS:
-            return "Logical Operation"
-        return "Key"
-    if domain_name == "cover":
-        return "Motor"
-    if domain_name == "climate":
-        return "Regulator"
-    if domain_name == "scene":
-        return "Scene"
-    raise ValueError("Unknown domain")
-
-
 def generate_unique_id(
     entry_id: str,
     address: AddressType,
@@ -169,13 +133,6 @@ def purge_device_registry(
 ) -> None:
     """Remove orphans from device registry which are not in entry data."""
     device_registry = dr.async_get(hass)
-    entity_registry = er.async_get(hass)
-
-    # Find all devices that are referenced in the entity registry.
-    references_entities = {
-        entry.device_id
-        for entry in entity_registry.entities.get_entries_for_config_entry_id(entry_id)
-    }
 
     # Find device that references the host.
     references_host = set()
@@ -198,7 +155,6 @@ def purge_device_registry(
             entry.id
             for entry in dr.async_entries_for_config_entry(device_registry, entry_id)
         }
-        - references_entities
         - references_host
         - references_entry_data
     )
diff --git a/homeassistant/components/lcn/light.py b/homeassistant/components/lcn/light.py
index 9ec660325c8..cba7c0888b7 100644
--- a/homeassistant/components/lcn/light.py
+++ b/homeassistant/components/lcn/light.py
@@ -17,7 +17,7 @@ from homeassistant.components.light import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DOMAIN, CONF_ENTITIES
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
@@ -37,7 +37,7 @@ PARALLEL_UPDATES = 0
 
 def add_lcn_entities(
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     entity_configs: Iterable[ConfigType],
 ) -> None:
     """Add entities for this domain."""
@@ -54,7 +54,7 @@ def add_lcn_entities(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up LCN light entities from a config entry."""
     add_entities = partial(
diff --git a/homeassistant/components/lcn/manifest.json b/homeassistant/components/lcn/manifest.json
index 2ac183dcc97..c1dd7751940 100644
--- a/homeassistant/components/lcn/manifest.json
+++ b/homeassistant/components/lcn/manifest.json
@@ -8,5 +8,5 @@
   "documentation": "https://www.home-assistant.io/integrations/lcn",
   "iot_class": "local_push",
   "loggers": ["pypck"],
-  "requirements": ["pypck==0.8.3", "lcn-frontend==0.2.3"]
+  "requirements": ["pypck==0.8.5", "lcn-frontend==0.2.3"]
 }
diff --git a/homeassistant/components/lcn/scene.py b/homeassistant/components/lcn/scene.py
index 0f40926cf17..072d0a20757 100644
--- a/homeassistant/components/lcn/scene.py
+++ b/homeassistant/components/lcn/scene.py
@@ -10,7 +10,7 @@ from homeassistant.components.scene import DOMAIN as DOMAIN_SCENE, Scene
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DOMAIN, CONF_ENTITIES, CONF_SCENE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
@@ -29,7 +29,7 @@ PARALLEL_UPDATES = 0
 
 def add_lcn_entities(
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     entity_configs: Iterable[ConfigType],
 ) -> None:
     """Add entities for this domain."""
@@ -43,7 +43,7 @@ def add_lcn_entities(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up LCN switch entities from a config entry."""
     add_entities = partial(
diff --git a/homeassistant/components/lcn/schemas.py b/homeassistant/components/lcn/schemas.py
index 809701c680a..d90e264692c 100644
--- a/homeassistant/components/lcn/schemas.py
+++ b/homeassistant/components/lcn/schemas.py
@@ -9,7 +9,7 @@ from homeassistant.const import (
     CONF_UNIT_OF_MEASUREMENT,
     UnitOfTemperature,
 )
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import VolDictType
 
 from .const import (
diff --git a/homeassistant/components/lcn/sensor.py b/homeassistant/components/lcn/sensor.py
index ada0857742c..7783df8679a 100644
--- a/homeassistant/components/lcn/sensor.py
+++ b/homeassistant/components/lcn/sensor.py
@@ -3,7 +3,6 @@
 from collections.abc import Iterable
 from functools import partial
 from itertools import chain
-from typing import cast
 
 import pypck
 
@@ -18,9 +17,14 @@ from homeassistant.const import (
     CONF_ENTITIES,
     CONF_SOURCE,
     CONF_UNIT_OF_MEASUREMENT,
+    LIGHT_LUX,
+    UnitOfElectricCurrent,
+    UnitOfElectricPotential,
+    UnitOfSpeed,
+    UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
@@ -47,10 +51,21 @@ DEVICE_CLASS_MAPPING = {
     pypck.lcn_defs.VarUnit.AMPERE: SensorDeviceClass.CURRENT,
 }
 
+UNIT_OF_MEASUREMENT_MAPPING = {
+    pypck.lcn_defs.VarUnit.CELSIUS: UnitOfTemperature.CELSIUS,
+    pypck.lcn_defs.VarUnit.KELVIN: UnitOfTemperature.KELVIN,
+    pypck.lcn_defs.VarUnit.FAHRENHEIT: UnitOfTemperature.FAHRENHEIT,
+    pypck.lcn_defs.VarUnit.LUX_T: LIGHT_LUX,
+    pypck.lcn_defs.VarUnit.LUX_I: LIGHT_LUX,
+    pypck.lcn_defs.VarUnit.METERPERSECOND: UnitOfSpeed.METERS_PER_SECOND,
+    pypck.lcn_defs.VarUnit.VOLT: UnitOfElectricPotential.VOLT,
+    pypck.lcn_defs.VarUnit.AMPERE: UnitOfElectricCurrent.AMPERE,
+}
+
 
 def add_lcn_entities(
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     entity_configs: Iterable[ConfigType],
 ) -> None:
     """Add entities for this domain."""
@@ -69,7 +84,7 @@ def add_lcn_entities(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up LCN switch entities from a config entry."""
     add_entities = partial(
@@ -103,8 +118,10 @@ class LcnVariableSensor(LcnEntity, SensorEntity):
             config[CONF_DOMAIN_DATA][CONF_UNIT_OF_MEASUREMENT]
         )
 
-        self._attr_native_unit_of_measurement = cast(str, self.unit.value)
-        self._attr_device_class = DEVICE_CLASS_MAPPING.get(self.unit, None)
+        self._attr_native_unit_of_measurement = UNIT_OF_MEASUREMENT_MAPPING.get(
+            self.unit
+        )
+        self._attr_device_class = DEVICE_CLASS_MAPPING.get(self.unit)
 
     async def async_added_to_hass(self) -> None:
         """Run when entity about to be added to hass."""
diff --git a/homeassistant/components/lcn/services.py b/homeassistant/components/lcn/services.py
index a6c42de0487..2694bed31d2 100644
--- a/homeassistant/components/lcn/services.py
+++ b/homeassistant/components/lcn/services.py
@@ -20,8 +20,7 @@ from homeassistant.core import (
     SupportsResponse,
 )
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers import device_registry as dr
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 
 from .const import (
diff --git a/homeassistant/components/lcn/strings.json b/homeassistant/components/lcn/strings.json
index 0bdd85a3678..0a8112d997a 100644
--- a/homeassistant/components/lcn/strings.json
+++ b/homeassistant/components/lcn/strings.json
@@ -396,19 +396,19 @@
     },
     "address_to_device_id": {
       "name": "Address to device ID",
-      "description": "Convert LCN address to device ID.",
+      "description": "Converts an LCN address into a device ID.",
       "fields": {
         "id": {
           "name": "Module or group ID",
-          "description": "Target module or group ID."
+          "description": "Module or group number of the target."
         },
         "segment_id": {
           "name": "Segment ID",
-          "description": "Target segment ID."
+          "description": "Segment number of the target."
         },
         "type": {
           "name": "Type",
-          "description": "Target type."
+          "description": "Module type of the target."
         },
         "host": {
           "name": "Host name",
diff --git a/homeassistant/components/lcn/switch.py b/homeassistant/components/lcn/switch.py
index dd940bd38b3..6267a081bc9 100644
--- a/homeassistant/components/lcn/switch.py
+++ b/homeassistant/components/lcn/switch.py
@@ -10,7 +10,7 @@ from homeassistant.components.switch import DOMAIN as DOMAIN_SWITCH, SwitchEntit
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DOMAIN, CONF_ENTITIES
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
@@ -30,7 +30,7 @@ PARALLEL_UPDATES = 0
 
 def add_lcn_switch_entities(
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     entity_configs: Iterable[ConfigType],
 ) -> None:
     """Add entities for this domain."""
@@ -53,7 +53,7 @@ def add_lcn_switch_entities(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up LCN switch entities from a config entry."""
     add_entities = partial(
diff --git a/homeassistant/components/lcn/websocket.py b/homeassistant/components/lcn/websocket.py
index 46df71d4235..9084ec838d9 100644
--- a/homeassistant/components/lcn/websocket.py
+++ b/homeassistant/components/lcn/websocket.py
@@ -22,8 +22,11 @@ from homeassistant.const import (
     CONF_RESOURCE,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr, entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    entity_registry as er,
+)
 
 from .const import (
     ADD_ENTITIES_CALLBACKS,
diff --git a/homeassistant/components/ld2410_ble/__init__.py b/homeassistant/components/ld2410_ble/__init__.py
index 57e3dfa4617..db67010823d 100644
--- a/homeassistant/components/ld2410_ble/__init__.py
+++ b/homeassistant/components/ld2410_ble/__init__.py
@@ -41,7 +41,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     ld2410_ble = LD2410BLE(ble_device)
 
-    coordinator = LD2410BLECoordinator(hass, ld2410_ble)
+    coordinator = LD2410BLECoordinator(hass, entry, ld2410_ble)
 
     try:
         await ld2410_ble.initialise()
diff --git a/homeassistant/components/ld2410_ble/binary_sensor.py b/homeassistant/components/ld2410_ble/binary_sensor.py
index c52bc34b699..3ba43e0d6dc 100644
--- a/homeassistant/components/ld2410_ble/binary_sensor.py
+++ b/homeassistant/components/ld2410_ble/binary_sensor.py
@@ -9,7 +9,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import LD2410BLE, LD2410BLECoordinator
@@ -31,7 +31,7 @@ ENTITY_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the platform for LD2410BLE."""
     data: LD2410BLEData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/ld2410_ble/coordinator.py b/homeassistant/components/ld2410_ble/coordinator.py
index 2f0fd079773..b318542e798 100644
--- a/homeassistant/components/ld2410_ble/coordinator.py
+++ b/homeassistant/components/ld2410_ble/coordinator.py
@@ -6,6 +6,7 @@ import time
 
 from ld2410_ble import LD2410BLE, LD2410BLEState
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
@@ -21,11 +22,16 @@ DEBOUNCE_SECONDS = 1.0
 class LD2410BLECoordinator(DataUpdateCoordinator[None]):
     """Data coordinator for receiving LD2410B updates."""
 
-    def __init__(self, hass: HomeAssistant, ld2410_ble: LD2410BLE) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, ld2410_ble: LD2410BLE
+    ) -> None:
         """Initialise the coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
         )
         self._ld2410_ble = ld2410_ble
diff --git a/homeassistant/components/ld2410_ble/manifest.json b/homeassistant/components/ld2410_ble/manifest.json
index 2e64a590eaf..1896f2109a7 100644
--- a/homeassistant/components/ld2410_ble/manifest.json
+++ b/homeassistant/components/ld2410_ble/manifest.json
@@ -20,5 +20,5 @@
   "documentation": "https://www.home-assistant.io/integrations/ld2410_ble",
   "integration_type": "device",
   "iot_class": "local_push",
-  "requirements": ["bluetooth-data-tools==1.22.0", "ld2410-ble==0.1.1"]
+  "requirements": ["bluetooth-data-tools==1.26.1", "ld2410-ble==0.1.1"]
 }
diff --git a/homeassistant/components/ld2410_ble/sensor.py b/homeassistant/components/ld2410_ble/sensor.py
index 6daa1397161..db4e42580c4 100644
--- a/homeassistant/components/ld2410_ble/sensor.py
+++ b/homeassistant/components/ld2410_ble/sensor.py
@@ -11,7 +11,7 @@ from homeassistant.const import EntityCategory, UnitOfLength
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import LD2410BLE, LD2410BLECoordinator
@@ -122,7 +122,7 @@ SENSOR_DESCRIPTIONS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the platform for LD2410BLE."""
     data: LD2410BLEData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/leaone/sensor.py b/homeassistant/components/leaone/sensor.py
index 62948868870..c815a0964e0 100644
--- a/homeassistant/components/leaone/sensor.py
+++ b/homeassistant/components/leaone/sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
     UnitOfMass,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from .const import DOMAIN
@@ -107,7 +107,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Leaone BLE sensors."""
     coordinator: PassiveBluetoothProcessorCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/led_ble/light.py b/homeassistant/components/led_ble/light.py
index 3bca7269eba..2facda734d5 100644
--- a/homeassistant/components/led_ble/light.py
+++ b/homeassistant/components/led_ble/light.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any
+from typing import Any, cast
 
 from led_ble import LEDBLE
 
@@ -19,7 +19,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -32,7 +32,7 @@ from .models import LEDBLEData
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the light platform for LEDBLE."""
     data: LEDBLEData = hass.data[DOMAIN][entry.entry_id]
@@ -83,7 +83,7 @@ class LEDBLEEntity(CoordinatorEntity[DataUpdateCoordinator[None]], LightEntity):
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Instruct the light to turn on."""
-        brightness = kwargs.get(ATTR_BRIGHTNESS, self.brightness)
+        brightness = cast(int, kwargs.get(ATTR_BRIGHTNESS, self.brightness))
         if effect := kwargs.get(ATTR_EFFECT):
             await self._async_set_effect(effect, brightness)
             return
diff --git a/homeassistant/components/led_ble/manifest.json b/homeassistant/components/led_ble/manifest.json
index 7b07653e2db..270495c8770 100644
--- a/homeassistant/components/led_ble/manifest.json
+++ b/homeassistant/components/led_ble/manifest.json
@@ -35,5 +35,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/led_ble",
   "iot_class": "local_polling",
-  "requirements": ["bluetooth-data-tools==1.22.0", "led-ble==1.1.4"]
+  "requirements": ["bluetooth-data-tools==1.26.1", "led-ble==1.1.6"]
 }
diff --git a/homeassistant/components/lektrico/__init__.py b/homeassistant/components/lektrico/__init__.py
index 475b6132541..0a6675237dd 100644
--- a/homeassistant/components/lektrico/__init__.py
+++ b/homeassistant/components/lektrico/__init__.py
@@ -4,11 +4,10 @@ from __future__ import annotations
 
 from lektricowifi import Device
 
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_SERIAL_NUMBER, CONF_TYPE, Platform
+from homeassistant.const import CONF_TYPE, Platform
 from homeassistant.core import HomeAssistant
 
-from .coordinator import LektricoDeviceDataUpdateCoordinator
+from .coordinator import LektricoConfigEntry, LektricoDeviceDataUpdateCoordinator
 
 # List the platforms that charger supports.
 CHARGERS_PLATFORMS: list[Platform] = [
@@ -26,15 +25,10 @@ LB_DEVICES_PLATFORMS: list[Platform] = [
     Platform.SENSOR,
 ]
 
-type LektricoConfigEntry = ConfigEntry[LektricoDeviceDataUpdateCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: LektricoConfigEntry) -> bool:
     """Set up Lektrico Charging Station from a config entry."""
-    coordinator = LektricoDeviceDataUpdateCoordinator(
-        hass,
-        f"{entry.data[CONF_TYPE]}_{entry.data[ATTR_SERIAL_NUMBER]}",
-    )
+    coordinator = LektricoDeviceDataUpdateCoordinator(hass, entry)
 
     await coordinator.async_config_entry_first_refresh()
 
@@ -45,7 +39,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: LektricoConfigEntry) ->
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: LektricoConfigEntry) -> bool:
     """Unload a config entry."""
 
     return await hass.config_entries.async_unload_platforms(
@@ -53,7 +47,7 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     )
 
 
-def _get_platforms(entry: ConfigEntry) -> list[Platform]:
+def _get_platforms(entry: LektricoConfigEntry) -> list[Platform]:
     """Return the platforms for this type of device."""
     _device_type: str = entry.data[CONF_TYPE]
     if _device_type in (Device.TYPE_1P7K, Device.TYPE_3P22K):
diff --git a/homeassistant/components/lektrico/binary_sensor.py b/homeassistant/components/lektrico/binary_sensor.py
index d0a3e39690c..37e55ade798 100644
--- a/homeassistant/components/lektrico/binary_sensor.py
+++ b/homeassistant/components/lektrico/binary_sensor.py
@@ -11,7 +11,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import ATTR_SERIAL_NUMBER, CONF_TYPE, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import LektricoConfigEntry, LektricoDeviceDataUpdateCoordinator
 from .entity import LektricoEntity
@@ -101,7 +101,7 @@ BINARY_SENSORS: tuple[LektricoBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LektricoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Lektrico binary sensor entities based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/lektrico/button.py b/homeassistant/components/lektrico/button.py
index 62aef12ff53..e598773321d 100644
--- a/homeassistant/components/lektrico/button.py
+++ b/homeassistant/components/lektrico/button.py
@@ -13,7 +13,7 @@ from homeassistant.components.button import (
 )
 from homeassistant.const import ATTR_SERIAL_NUMBER, CONF_TYPE, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import LektricoConfigEntry, LektricoDeviceDataUpdateCoordinator
 from .entity import LektricoEntity
@@ -60,7 +60,7 @@ BUTTONS_FOR_LB_DEVICES: tuple[LektricoButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LektricoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Lektrico charger based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/lektrico/coordinator.py b/homeassistant/components/lektrico/coordinator.py
index 7c72a00e2d3..aa96cf49e07 100644
--- a/homeassistant/components/lektrico/coordinator.py
+++ b/homeassistant/components/lektrico/coordinator.py
@@ -22,18 +22,21 @@ from .const import LOGGER
 
 SCAN_INTERVAL = timedelta(seconds=10)
 
+type LektricoConfigEntry = ConfigEntry[LektricoDeviceDataUpdateCoordinator]
+
 
 class LektricoDeviceDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Data update coordinator for Lektrico device."""
 
-    config_entry: ConfigEntry
+    config_entry: LektricoConfigEntry
 
-    def __init__(self, hass: HomeAssistant, device_name: str) -> None:
+    def __init__(self, hass: HomeAssistant, config_entry: LektricoConfigEntry) -> None:
         """Initialize a Lektrico Device."""
         super().__init__(
             hass,
             LOGGER,
-            name=device_name,
+            config_entry=config_entry,
+            name=f"{config_entry.data[CONF_TYPE]}_{config_entry.data[ATTR_SERIAL_NUMBER]}",
             update_interval=SCAN_INTERVAL,
         )
         self.device = Device(
diff --git a/homeassistant/components/lektrico/number.py b/homeassistant/components/lektrico/number.py
index 8054ba8afe5..c54ee938607 100644
--- a/homeassistant/components/lektrico/number.py
+++ b/homeassistant/components/lektrico/number.py
@@ -15,7 +15,7 @@ from homeassistant.const import (
     UnitOfElectricCurrent,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import LektricoConfigEntry, LektricoDeviceDataUpdateCoordinator
 from .entity import LektricoEntity
@@ -58,7 +58,7 @@ NUMBERS: tuple[LektricoNumberEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LektricoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Lektrico number entities based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/lektrico/select.py b/homeassistant/components/lektrico/select.py
index ef45d97d697..513a82365af 100644
--- a/homeassistant/components/lektrico/select.py
+++ b/homeassistant/components/lektrico/select.py
@@ -9,7 +9,7 @@ from lektricowifi import Device
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.const import ATTR_SERIAL_NUMBER, CONF_TYPE, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import LektricoConfigEntry, LektricoDeviceDataUpdateCoordinator
 from .entity import LektricoEntity
@@ -46,7 +46,7 @@ SELECTS: tuple[LektricoSelectEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LektricoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Lektrico select entities based on a config entry."""
 
diff --git a/homeassistant/components/lektrico/sensor.py b/homeassistant/components/lektrico/sensor.py
index d55d91c4cd4..927011459b0 100644
--- a/homeassistant/components/lektrico/sensor.py
+++ b/homeassistant/components/lektrico/sensor.py
@@ -27,7 +27,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import IntegrationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import LektricoConfigEntry, LektricoDeviceDataUpdateCoordinator
@@ -283,7 +283,7 @@ SENSORS_FOR_LB_3_PHASE: tuple[LektricoSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LektricoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Lektrico charger based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/lektrico/strings.json b/homeassistant/components/lektrico/strings.json
index e24700c9b09..eb0203e0661 100644
--- a/homeassistant/components/lektrico/strings.json
+++ b/homeassistant/components/lektrico/strings.json
@@ -24,7 +24,7 @@
   "entity": {
     "binary_sensor": {
       "state_e_activated": {
-        "name": "Ev error"
+        "name": "EV error"
       },
       "overtemp": {
         "name": "Thermal throttling"
@@ -45,10 +45,10 @@
         "name": "Overvoltage"
       },
       "rcd_error": {
-        "name": "Rcd error"
+        "name": "RCD error"
       },
       "cp_diode_failure": {
-        "name": "Ev diode short"
+        "name": "EV diode short"
       },
       "contactor_failure": {
         "name": "Relay contacts welded"
@@ -64,7 +64,7 @@
     },
     "number": {
       "led_max_brightness": {
-        "name": "Led brightness"
+        "name": "LED brightness"
       },
       "dynamic_limit": {
         "name": "Dynamic limit"
@@ -86,7 +86,7 @@
         "name": "State",
         "state": {
           "available": "Available",
-          "charging": "Charging",
+          "charging": "[%key:common::state::charging%]",
           "connected": "Connected",
           "error": "Error",
           "locked": "Locked",
diff --git a/homeassistant/components/lektrico/switch.py b/homeassistant/components/lektrico/switch.py
index 0fdfbd2ad41..065e96f84b8 100644
--- a/homeassistant/components/lektrico/switch.py
+++ b/homeassistant/components/lektrico/switch.py
@@ -9,7 +9,7 @@ from lektricowifi import Device
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.const import ATTR_SERIAL_NUMBER, CONF_TYPE, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import LektricoConfigEntry, LektricoDeviceDataUpdateCoordinator
 from .entity import LektricoEntity
@@ -59,7 +59,7 @@ SWITCHS_FOR_3_PHASE_CHARGERS: tuple[LektricoSwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LektricoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Lektrico switch entities based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/letpot/__init__.py b/homeassistant/components/letpot/__init__.py
index 905887463d7..50c73f949a3 100644
--- a/homeassistant/components/letpot/__init__.py
+++ b/homeassistant/components/letpot/__init__.py
@@ -9,7 +9,6 @@ from letpot.converters import CONVERTERS
 from letpot.exceptions import LetPotAuthenticationException, LetPotException
 from letpot.models import AuthenticationInfo
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_EMAIL, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
@@ -21,11 +20,14 @@ from .const import (
     CONF_REFRESH_TOKEN_EXPIRES,
     CONF_USER_ID,
 )
-from .coordinator import LetPotDeviceCoordinator
+from .coordinator import LetPotConfigEntry, LetPotDeviceCoordinator
 
-PLATFORMS: list[Platform] = [Platform.TIME]
-
-type LetPotConfigEntry = ConfigEntry[list[LetPotDeviceCoordinator]]
+PLATFORMS: list[Platform] = [
+    Platform.BINARY_SENSOR,
+    Platform.SENSOR,
+    Platform.SWITCH,
+    Platform.TIME,
+]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: LetPotConfigEntry) -> bool:
@@ -67,7 +69,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: LetPotConfigEntry) -> bo
         raise ConfigEntryNotReady from exc
 
     coordinators: list[LetPotDeviceCoordinator] = [
-        LetPotDeviceCoordinator(hass, auth, device)
+        LetPotDeviceCoordinator(hass, entry, auth, device)
         for device in devices
         if any(converter.supports_type(device.device_type) for converter in CONVERTERS)
     ]
diff --git a/homeassistant/components/letpot/binary_sensor.py b/homeassistant/components/letpot/binary_sensor.py
new file mode 100644
index 00000000000..bfc7a5ab4a7
--- /dev/null
+++ b/homeassistant/components/letpot/binary_sensor.py
@@ -0,0 +1,122 @@
+"""Support for LetPot binary sensor entities."""
+
+from collections.abc import Callable
+from dataclasses import dataclass
+
+from letpot.models import DeviceFeature, LetPotDeviceStatus
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDeviceClass,
+    BinarySensorEntity,
+    BinarySensorEntityDescription,
+)
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import LetPotConfigEntry, LetPotDeviceCoordinator
+from .entity import LetPotEntity, LetPotEntityDescription
+
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
+
+
+@dataclass(frozen=True, kw_only=True)
+class LetPotBinarySensorEntityDescription(
+    LetPotEntityDescription, BinarySensorEntityDescription
+):
+    """Describes a LetPot binary sensor entity."""
+
+    is_on_fn: Callable[[LetPotDeviceStatus], bool]
+
+
+BINARY_SENSORS: tuple[LetPotBinarySensorEntityDescription, ...] = (
+    LetPotBinarySensorEntityDescription(
+        key="low_nutrients",
+        translation_key="low_nutrients",
+        is_on_fn=lambda status: bool(status.errors.low_nutrients),
+        entity_registry_enabled_default=False,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        supported_fn=(
+            lambda coordinator: coordinator.data.errors.low_nutrients is not None
+        ),
+    ),
+    LetPotBinarySensorEntityDescription(
+        key="low_water",
+        translation_key="low_water",
+        is_on_fn=lambda status: bool(status.errors.low_water),
+        entity_registry_enabled_default=False,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        supported_fn=lambda coordinator: coordinator.data.errors.low_water is not None,
+    ),
+    LetPotBinarySensorEntityDescription(
+        key="pump",
+        translation_key="pump",
+        is_on_fn=lambda status: status.pump_status == 1,
+        device_class=BinarySensorDeviceClass.RUNNING,
+        supported_fn=(
+            lambda coordinator: DeviceFeature.PUMP_STATUS
+            in coordinator.device_client.device_features
+        ),
+    ),
+    LetPotBinarySensorEntityDescription(
+        key="pump_error",
+        translation_key="pump_error",
+        is_on_fn=lambda status: bool(status.errors.pump_malfunction),
+        entity_registry_enabled_default=False,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        supported_fn=(
+            lambda coordinator: coordinator.data.errors.pump_malfunction is not None
+        ),
+    ),
+    LetPotBinarySensorEntityDescription(
+        key="refill_error",
+        translation_key="refill_error",
+        is_on_fn=lambda status: bool(status.errors.refill_error),
+        entity_registry_enabled_default=False,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        supported_fn=(
+            lambda coordinator: coordinator.data.errors.refill_error is not None
+        ),
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: LetPotConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up LetPot binary sensor entities based on a config entry and device status/features."""
+    coordinators = entry.runtime_data
+    async_add_entities(
+        LetPotBinarySensorEntity(coordinator, description)
+        for description in BINARY_SENSORS
+        for coordinator in coordinators
+        if description.supported_fn(coordinator)
+    )
+
+
+class LetPotBinarySensorEntity(LetPotEntity, BinarySensorEntity):
+    """Defines a LetPot binary sensor entity."""
+
+    entity_description: LetPotBinarySensorEntityDescription
+
+    def __init__(
+        self,
+        coordinator: LetPotDeviceCoordinator,
+        description: LetPotBinarySensorEntityDescription,
+    ) -> None:
+        """Initialize LetPot binary sensor entity."""
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._attr_unique_id = f"{coordinator.config_entry.unique_id}_{coordinator.device.serial_number}_{description.key}"
+
+    @property
+    def is_on(self) -> bool:
+        """Return if the binary sensor is on."""
+        return self.entity_description.is_on_fn(self.coordinator.data)
diff --git a/homeassistant/components/letpot/coordinator.py b/homeassistant/components/letpot/coordinator.py
index a2a35d566c6..bd787157482 100644
--- a/homeassistant/components/letpot/coordinator.py
+++ b/homeassistant/components/letpot/coordinator.py
@@ -4,23 +4,22 @@ from __future__ import annotations
 
 import asyncio
 import logging
-from typing import TYPE_CHECKING
 
 from letpot.deviceclient import LetPotDeviceClient
 from letpot.exceptions import LetPotAuthenticationException, LetPotException
 from letpot.models import AuthenticationInfo, LetPotDevice, LetPotDeviceStatus
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import REQUEST_UPDATE_TIMEOUT
 
-if TYPE_CHECKING:
-    from . import LetPotConfigEntry
-
 _LOGGER = logging.getLogger(__name__)
 
+type LetPotConfigEntry = ConfigEntry[list[LetPotDeviceCoordinator]]
+
 
 class LetPotDeviceCoordinator(DataUpdateCoordinator[LetPotDeviceStatus]):
     """Class to handle data updates for a specific garden."""
@@ -31,12 +30,17 @@ class LetPotDeviceCoordinator(DataUpdateCoordinator[LetPotDeviceStatus]):
     device_client: LetPotDeviceClient
 
     def __init__(
-        self, hass: HomeAssistant, info: AuthenticationInfo, device: LetPotDevice
+        self,
+        hass: HomeAssistant,
+        config_entry: LetPotConfigEntry,
+        info: AuthenticationInfo,
+        device: LetPotDevice,
     ) -> None:
         """Initialize coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=f"LetPot {device.serial_number}",
         )
         self._info = info
diff --git a/homeassistant/components/letpot/entity.py b/homeassistant/components/letpot/entity.py
index c9a8953b5d5..5e2c46fee84 100644
--- a/homeassistant/components/letpot/entity.py
+++ b/homeassistant/components/letpot/entity.py
@@ -1,12 +1,27 @@
 """Base class for LetPot entities."""
 
+from collections.abc import Callable, Coroutine
+from dataclasses import dataclass
+from typing import Any, Concatenate
+
+from letpot.exceptions import LetPotConnectionException, LetPotException
+
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
 from .coordinator import LetPotDeviceCoordinator
 
 
+@dataclass(frozen=True, kw_only=True)
+class LetPotEntityDescription(EntityDescription):
+    """Description for all LetPot entities."""
+
+    supported_fn: Callable[[LetPotDeviceCoordinator], bool] = lambda _: True
+
+
 class LetPotEntity(CoordinatorEntity[LetPotDeviceCoordinator]):
     """Defines a base LetPot entity."""
 
@@ -23,3 +38,27 @@ class LetPotEntity(CoordinatorEntity[LetPotDeviceCoordinator]):
             model_id=coordinator.device_client.device_model_code,
             serial_number=coordinator.device.serial_number,
         )
+
+
+def exception_handler[_EntityT: LetPotEntity, **_P](
+    func: Callable[Concatenate[_EntityT, _P], Coroutine[Any, Any, Any]],
+) -> Callable[Concatenate[_EntityT, _P], Coroutine[Any, Any, None]]:
+    """Decorate the function to catch LetPot exceptions and raise them correctly."""
+
+    async def handler(self: _EntityT, *args: _P.args, **kwargs: _P.kwargs) -> None:
+        try:
+            await func(self, *args, **kwargs)
+        except LetPotConnectionException as exception:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="communication_error",
+                translation_placeholders={"exception": str(exception)},
+            ) from exception
+        except LetPotException as exception:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="unknown_error",
+                translation_placeholders={"exception": str(exception)},
+            ) from exception
+
+    return handler
diff --git a/homeassistant/components/letpot/icons.json b/homeassistant/components/letpot/icons.json
new file mode 100644
index 00000000000..43541b57150
--- /dev/null
+++ b/homeassistant/components/letpot/icons.json
@@ -0,0 +1,49 @@
+{
+  "entity": {
+    "binary_sensor": {
+      "low_nutrients": {
+        "default": "mdi:beaker-alert",
+        "state": {
+          "off": "mdi:beaker"
+        }
+      },
+      "low_water": {
+        "default": "mdi:water-percent-alert",
+        "state": {
+          "off": "mdi:water-percent"
+        }
+      },
+      "pump": {
+        "default": "mdi:pump",
+        "state": {
+          "off": "mdi:pump-off"
+        }
+      }
+    },
+    "sensor": {
+      "water_level": {
+        "default": "mdi:water-percent"
+      }
+    },
+    "switch": {
+      "alarm_sound": {
+        "default": "mdi:bell-ring",
+        "state": {
+          "off": "mdi:bell-off"
+        }
+      },
+      "auto_mode": {
+        "default": "mdi:water-pump",
+        "state": {
+          "off": "mdi:water-pump-off"
+        }
+      },
+      "pump_cycling": {
+        "default": "mdi:pump",
+        "state": {
+          "off": "mdi:pump-off"
+        }
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/letpot/manifest.json b/homeassistant/components/letpot/manifest.json
index 691584abc13..d08b5f70a51 100644
--- a/homeassistant/components/letpot/manifest.json
+++ b/homeassistant/components/letpot/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_push",
   "quality_scale": "bronze",
-  "requirements": ["letpot==0.3.0"]
+  "requirements": ["letpot==0.4.0"]
 }
diff --git a/homeassistant/components/letpot/quality_scale.yaml b/homeassistant/components/letpot/quality_scale.yaml
index 74b948ffbf7..9804a5ec3a4 100644
--- a/homeassistant/components/letpot/quality_scale.yaml
+++ b/homeassistant/components/letpot/quality_scale.yaml
@@ -29,7 +29,7 @@ rules:
   unique-config-entry: done
 
   # Silver
-  action-exceptions: todo
+  action-exceptions: done
   config-entry-unloading:
     status: done
     comment: |
@@ -44,7 +44,7 @@ rules:
   log-when-unavailable: todo
   parallel-updates: done
   reauthentication-flow: done
-  test-coverage: todo
+  test-coverage: done
 
   # Gold
   devices: done
@@ -59,12 +59,12 @@ rules:
   docs-troubleshooting: todo
   docs-use-cases: todo
   dynamic-devices: todo
-  entity-category: todo
-  entity-device-class: todo
-  entity-disabled-by-default: todo
+  entity-category: done
+  entity-device-class: done
+  entity-disabled-by-default: done
   entity-translations: done
-  exception-translations: todo
-  icon-translations: todo
+  exception-translations: done
+  icon-translations: done
   reconfiguration-flow: todo
   repair-issues: todo
   stale-devices: todo
diff --git a/homeassistant/components/letpot/sensor.py b/homeassistant/components/letpot/sensor.py
new file mode 100644
index 00000000000..b0b113eb063
--- /dev/null
+++ b/homeassistant/components/letpot/sensor.py
@@ -0,0 +1,110 @@
+"""Support for LetPot sensor entities."""
+
+from collections.abc import Callable
+from dataclasses import dataclass
+
+from letpot.models import DeviceFeature, LetPotDeviceStatus, TemperatureUnit
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
+from homeassistant.const import PERCENTAGE, UnitOfTemperature
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.typing import StateType
+
+from .coordinator import LetPotConfigEntry, LetPotDeviceCoordinator
+from .entity import LetPotEntity, LetPotEntityDescription
+
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
+
+
+LETPOT_TEMPERATURE_UNIT_HA_UNIT = {
+    TemperatureUnit.CELSIUS: UnitOfTemperature.CELSIUS,
+    TemperatureUnit.FAHRENHEIT: UnitOfTemperature.FAHRENHEIT,
+}
+
+
+@dataclass(frozen=True, kw_only=True)
+class LetPotSensorEntityDescription(LetPotEntityDescription, SensorEntityDescription):
+    """Describes a LetPot sensor entity."""
+
+    native_unit_of_measurement_fn: Callable[[LetPotDeviceStatus], str | None]
+    value_fn: Callable[[LetPotDeviceStatus], StateType]
+
+
+SENSORS: tuple[LetPotSensorEntityDescription, ...] = (
+    LetPotSensorEntityDescription(
+        key="temperature",
+        value_fn=lambda status: status.temperature_value,
+        native_unit_of_measurement_fn=(
+            lambda status: LETPOT_TEMPERATURE_UNIT_HA_UNIT[
+                status.temperature_unit or TemperatureUnit.CELSIUS
+            ]
+        ),
+        device_class=SensorDeviceClass.TEMPERATURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        supported_fn=(
+            lambda coordinator: DeviceFeature.TEMPERATURE
+            in coordinator.device_client.device_features
+        ),
+    ),
+    LetPotSensorEntityDescription(
+        key="water_level",
+        translation_key="water_level",
+        value_fn=lambda status: status.water_level,
+        native_unit_of_measurement_fn=lambda _: PERCENTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        supported_fn=(
+            lambda coordinator: DeviceFeature.WATER_LEVEL
+            in coordinator.device_client.device_features
+        ),
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: LetPotConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up LetPot sensor entities based on a device features."""
+    coordinators = entry.runtime_data
+    async_add_entities(
+        LetPotSensorEntity(coordinator, description)
+        for description in SENSORS
+        for coordinator in coordinators
+        if description.supported_fn(coordinator)
+    )
+
+
+class LetPotSensorEntity(LetPotEntity, SensorEntity):
+    """Defines a LetPot sensor entity."""
+
+    entity_description: LetPotSensorEntityDescription
+
+    def __init__(
+        self,
+        coordinator: LetPotDeviceCoordinator,
+        description: LetPotSensorEntityDescription,
+    ) -> None:
+        """Initialize LetPot sensor entity."""
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._attr_unique_id = f"{coordinator.config_entry.unique_id}_{coordinator.device.serial_number}_{description.key}"
+
+    @property
+    def native_unit_of_measurement(self) -> str | None:
+        """Return the native unit of measurement."""
+        return self.entity_description.native_unit_of_measurement_fn(
+            self.coordinator.data
+        )
+
+    @property
+    def native_value(self) -> StateType:
+        """Return the state of the sensor."""
+        return self.entity_description.value_fn(self.coordinator.data)
diff --git a/homeassistant/components/letpot/strings.json b/homeassistant/components/letpot/strings.json
index 93913c2bc4d..cdc5a36a15f 100644
--- a/homeassistant/components/letpot/strings.json
+++ b/homeassistant/components/letpot/strings.json
@@ -32,6 +32,42 @@
     }
   },
   "entity": {
+    "binary_sensor": {
+      "low_nutrients": {
+        "name": "Low nutrients"
+      },
+      "low_water": {
+        "name": "Low water"
+      },
+      "pump": {
+        "name": "Pump"
+      },
+      "pump_error": {
+        "name": "Pump error"
+      },
+      "refill_error": {
+        "name": "Refill error"
+      }
+    },
+    "sensor": {
+      "water_level": {
+        "name": "Water level"
+      }
+    },
+    "switch": {
+      "alarm_sound": {
+        "name": "Alarm sound"
+      },
+      "auto_mode": {
+        "name": "Auto mode"
+      },
+      "power": {
+        "name": "Power"
+      },
+      "pump_cycling": {
+        "name": "Pump cycling"
+      }
+    },
     "time": {
       "light_schedule_end": {
         "name": "Light off"
@@ -40,5 +76,13 @@
         "name": "Light on"
       }
     }
+  },
+  "exceptions": {
+    "communication_error": {
+      "message": "An error occurred while communicating with the LetPot device: {exception}"
+    },
+    "unknown_error": {
+      "message": "An unknown error occurred while communicating with the LetPot device: {exception}"
+    }
   }
 }
diff --git a/homeassistant/components/letpot/switch.py b/homeassistant/components/letpot/switch.py
new file mode 100644
index 00000000000..0b00318c53b
--- /dev/null
+++ b/homeassistant/components/letpot/switch.py
@@ -0,0 +1,114 @@
+"""Support for LetPot switch entities."""
+
+from collections.abc import Callable, Coroutine
+from dataclasses import dataclass
+from typing import Any
+
+from letpot.deviceclient import LetPotDeviceClient
+from letpot.models import DeviceFeature, LetPotDeviceStatus
+
+from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import LetPotConfigEntry, LetPotDeviceCoordinator
+from .entity import LetPotEntity, LetPotEntityDescription, exception_handler
+
+# Each change pushes a 'full' device status with the change. The library will cache
+# pending changes to avoid overwriting, but try to avoid a lot of parallelism.
+PARALLEL_UPDATES = 1
+
+
+@dataclass(frozen=True, kw_only=True)
+class LetPotSwitchEntityDescription(LetPotEntityDescription, SwitchEntityDescription):
+    """Describes a LetPot switch entity."""
+
+    value_fn: Callable[[LetPotDeviceStatus], bool | None]
+    set_value_fn: Callable[[LetPotDeviceClient, bool], Coroutine[Any, Any, None]]
+
+
+SWITCHES: tuple[LetPotSwitchEntityDescription, ...] = (
+    LetPotSwitchEntityDescription(
+        key="alarm_sound",
+        translation_key="alarm_sound",
+        value_fn=lambda status: status.system_sound,
+        set_value_fn=lambda device_client, value: device_client.set_sound(value),
+        entity_category=EntityCategory.CONFIG,
+        supported_fn=lambda coordinator: coordinator.data.system_sound is not None,
+    ),
+    LetPotSwitchEntityDescription(
+        key="auto_mode",
+        translation_key="auto_mode",
+        value_fn=lambda status: status.water_mode == 1,
+        set_value_fn=lambda device_client, value: device_client.set_water_mode(value),
+        entity_category=EntityCategory.CONFIG,
+        supported_fn=(
+            lambda coordinator: DeviceFeature.PUMP_AUTO
+            in coordinator.device_client.device_features
+        ),
+    ),
+    LetPotSwitchEntityDescription(
+        key="power",
+        translation_key="power",
+        value_fn=lambda status: status.system_on,
+        set_value_fn=lambda device_client, value: device_client.set_power(value),
+        entity_category=EntityCategory.CONFIG,
+    ),
+    LetPotSwitchEntityDescription(
+        key="pump_cycling",
+        translation_key="pump_cycling",
+        value_fn=lambda status: status.pump_mode == 1,
+        set_value_fn=lambda device_client, value: device_client.set_pump_mode(value),
+        entity_category=EntityCategory.CONFIG,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: LetPotConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up LetPot switch entities based on a config entry and device status/features."""
+    coordinators = entry.runtime_data
+    entities: list[SwitchEntity] = [
+        LetPotSwitchEntity(coordinator, description)
+        for description in SWITCHES
+        for coordinator in coordinators
+        if description.supported_fn(coordinator)
+    ]
+    async_add_entities(entities)
+
+
+class LetPotSwitchEntity(LetPotEntity, SwitchEntity):
+    """Defines a LetPot switch entity."""
+
+    entity_description: LetPotSwitchEntityDescription
+
+    def __init__(
+        self,
+        coordinator: LetPotDeviceCoordinator,
+        description: LetPotSwitchEntityDescription,
+    ) -> None:
+        """Initialize LetPot switch entity."""
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._attr_unique_id = f"{coordinator.config_entry.unique_id}_{coordinator.device.serial_number}_{description.key}"
+
+    @property
+    def is_on(self) -> bool | None:
+        """Return if the entity is on."""
+        return self.entity_description.value_fn(self.coordinator.data)
+
+    @exception_handler
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the entity on."""
+        await self.entity_description.set_value_fn(self.coordinator.device_client, True)
+
+    @exception_handler
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the entity off."""
+        await self.entity_description.set_value_fn(
+            self.coordinator.device_client, False
+        )
diff --git a/homeassistant/components/letpot/time.py b/homeassistant/components/letpot/time.py
index 229f02e0806..bae61df6a28 100644
--- a/homeassistant/components/letpot/time.py
+++ b/homeassistant/components/letpot/time.py
@@ -11,11 +11,10 @@ from letpot.models import LetPotDeviceStatus
 from homeassistant.components.time import TimeEntity, TimeEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import LetPotConfigEntry
-from .coordinator import LetPotDeviceCoordinator
-from .entity import LetPotEntity
+from .coordinator import LetPotConfigEntry, LetPotDeviceCoordinator
+from .entity import LetPotEntity, exception_handler
 
 # Each change pushes a 'full' device status with the change. The library will cache
 # pending changes to avoid overwriting, but try to avoid a lot of parallelism.
@@ -55,7 +54,7 @@ TIME_SENSORS: tuple[LetPotTimeEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LetPotConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up LetPot time entities based on a config entry."""
     coordinators = entry.runtime_data
@@ -86,6 +85,7 @@ class LetPotTimeEntity(LetPotEntity, TimeEntity):
         """Return the time."""
         return self.entity_description.value_fn(self.coordinator.data)
 
+    @exception_handler
     async def async_set_value(self, value: time) -> None:
         """Set the time."""
         await self.entity_description.set_value_fn(
diff --git a/homeassistant/components/lg_netcast/media_player.py b/homeassistant/components/lg_netcast/media_player.py
index b3f8f8e0437..de652eeef08 100644
--- a/homeassistant/components/lg_netcast/media_player.py
+++ b/homeassistant/components/lg_netcast/media_player.py
@@ -19,7 +19,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_HOST, CONF_MODEL, CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.trigger import PluggableAction
 
 from .const import ATTR_MANUFACTURER, DOMAIN
@@ -47,7 +47,7 @@ SUPPORT_LGTV = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a LG Netcast Media Player from a config_entry."""
 
diff --git a/homeassistant/components/lg_soundbar/media_player.py b/homeassistant/components/lg_soundbar/media_player.py
index cebe1d33728..c3ea22ee08f 100644
--- a/homeassistant/components/lg_soundbar/media_player.py
+++ b/homeassistant/components/lg_soundbar/media_player.py
@@ -15,7 +15,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PORT
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 
@@ -23,7 +23,7 @@ from .const import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up media_player from a config entry created in the integrations UI."""
     async_add_entities(
diff --git a/homeassistant/components/lg_thinq/__init__.py b/homeassistant/components/lg_thinq/__init__.py
index 657524f0ef5..f83cbadf925 100644
--- a/homeassistant/components/lg_thinq/__init__.py
+++ b/homeassistant/components/lg_thinq/__init__.py
@@ -47,6 +47,7 @@ PLATFORMS = [
     Platform.SENSOR,
     Platform.SWITCH,
     Platform.VACUUM,
+    Platform.WATER_HEATER,
 ]
 
 _LOGGER = logging.getLogger(__name__)
@@ -100,7 +101,7 @@ async def async_setup_coordinators(
 
     # Setup coordinator per device.
     task_list = [
-        hass.async_create_task(async_setup_device_coordinator(hass, bridge))
+        hass.async_create_task(async_setup_device_coordinator(hass, entry, bridge))
         for bridge in bridge_list
     ]
     task_result = await asyncio.gather(*task_list)
diff --git a/homeassistant/components/lg_thinq/binary_sensor.py b/homeassistant/components/lg_thinq/binary_sensor.py
index 845bf8c3079..61b600037a7 100644
--- a/homeassistant/components/lg_thinq/binary_sensor.py
+++ b/homeassistant/components/lg_thinq/binary_sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import ThinqConfigEntry
 from .entity import ThinQEntity
@@ -76,7 +76,8 @@ BINARY_SENSOR_DESC: dict[ThinQProperty, ThinQBinarySensorEntityDescription] = {
     ),
     ThinQProperty.WATER_HEATER_OPERATION_MODE: ThinQBinarySensorEntityDescription(
         key=ThinQProperty.WATER_HEATER_OPERATION_MODE,
-        translation_key="operation_mode",
+        device_class=BinarySensorDeviceClass.POWER,
+        translation_key=ThinQProperty.WATER_HEATER_OPERATION_MODE,
         on_key="power_on",
     ),
     ThinQProperty.ONE_TOUCH_FILTER: ThinQBinarySensorEntityDescription(
@@ -136,7 +137,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ThinqConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up an entry for binary sensor platform."""
     entities: list[ThinQBinarySensorEntity] = []
diff --git a/homeassistant/components/lg_thinq/climate.py b/homeassistant/components/lg_thinq/climate.py
index 5cf9ccbd442..98a86a8d355 100644
--- a/homeassistant/components/lg_thinq/climate.py
+++ b/homeassistant/components/lg_thinq/climate.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass
 import logging
 from typing import Any
 
@@ -10,8 +9,11 @@ from thinqconnect import DeviceType
 from thinqconnect.integration import ExtendedProperty
 
 from homeassistant.components.climate import (
+    ATTR_HVAC_MODE,
     ATTR_TARGET_TEMP_HIGH,
     ATTR_TARGET_TEMP_LOW,
+    SWING_OFF,
+    SWING_ON,
     ClimateEntity,
     ClimateEntityDescription,
     ClimateEntityFeature,
@@ -19,38 +21,26 @@ from homeassistant.components.climate import (
 )
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.temperature import display_temp
 
 from . import ThinqConfigEntry
 from .coordinator import DeviceDataUpdateCoordinator
 from .entity import ThinQEntity
 
-
-@dataclass(frozen=True, kw_only=True)
-class ThinQClimateEntityDescription(ClimateEntityDescription):
-    """Describes ThinQ climate entity."""
-
-    min_temp: float | None = None
-    max_temp: float | None = None
-    step: float | None = None
-
-
-DEVICE_TYPE_CLIMATE_MAP: dict[DeviceType, tuple[ThinQClimateEntityDescription, ...]] = {
+DEVICE_TYPE_CLIMATE_MAP: dict[DeviceType, tuple[ClimateEntityDescription, ...]] = {
     DeviceType.AIR_CONDITIONER: (
-        ThinQClimateEntityDescription(
+        ClimateEntityDescription(
             key=ExtendedProperty.CLIMATE_AIR_CONDITIONER,
             name=None,
             translation_key=ExtendedProperty.CLIMATE_AIR_CONDITIONER,
         ),
     ),
     DeviceType.SYSTEM_BOILER: (
-        ThinQClimateEntityDescription(
+        ClimateEntityDescription(
             key=ExtendedProperty.CLIMATE_SYSTEM_BOILER,
             name=None,
-            min_temp=16,
-            max_temp=30,
-            step=1,
+            translation_key=ExtendedProperty.CLIMATE_SYSTEM_BOILER,
         ),
     ),
 }
@@ -63,23 +53,24 @@ STR_TO_HVAC: dict[str, HVACMode] = {
     "heat": HVACMode.HEAT,
 }
 
-HVAC_TO_STR: dict[HVACMode, str] = {
-    HVACMode.AUTO: "auto",
-    HVACMode.COOL: "cool",
-    HVACMode.DRY: "air_dry",
-    HVACMode.FAN_ONLY: "fan",
-    HVACMode.HEAT: "heat",
-}
+HVAC_TO_STR = {v: k for k, v in STR_TO_HVAC.items()}
 
 THINQ_PRESET_MODE: list[str] = ["air_clean", "aroma", "energy_saving"]
 
+STR_TO_SWING = {
+    "true": SWING_ON,
+    "false": SWING_OFF,
+}
+
+SWING_TO_STR = {v: k for k, v in STR_TO_SWING.items()}
+
 _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ThinqConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up an entry for climate platform."""
     entities: list[ThinQClimateEntity] = []
@@ -102,12 +93,10 @@ async def async_setup_entry(
 class ThinQClimateEntity(ThinQEntity, ClimateEntity):
     """Represent a thinq climate platform."""
 
-    entity_description: ThinQClimateEntityDescription
-
     def __init__(
         self,
         coordinator: DeviceDataUpdateCoordinator,
-        entity_description: ThinQClimateEntityDescription,
+        entity_description: ClimateEntityDescription,
         property_id: str,
     ) -> None:
         """Initialize a climate entity."""
@@ -121,7 +110,9 @@ class ThinQClimateEntity(ThinQEntity, ClimateEntity):
         self._attr_hvac_modes = [HVACMode.OFF]
         self._attr_hvac_mode = HVACMode.OFF
         self._attr_preset_modes = []
-        self._attr_temperature_unit = UnitOfTemperature.CELSIUS
+        self._attr_temperature_unit = (
+            self._get_unit_of_measurement(self.data.unit) or UnitOfTemperature.CELSIUS
+        )
         self._requested_hvac_mode: str | None = None
 
         # Set up HVAC modes.
@@ -142,6 +133,14 @@ class ThinQClimateEntity(ThinQEntity, ClimateEntity):
             self._attr_supported_features |= (
                 ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
             )
+        # Supports swing mode.
+        if self.data.swing_modes:
+            self._attr_swing_modes = [SWING_ON, SWING_OFF]
+            self._attr_supported_features |= ClimateEntityFeature.SWING_MODE
+
+        if self.data.swing_horizontal_modes:
+            self._attr_swing_horizontal_modes = [SWING_ON, SWING_OFF]
+            self._attr_supported_features |= ClimateEntityFeature.SWING_HORIZONTAL_MODE
 
     def _update_status(self) -> None:
         """Update status itself."""
@@ -150,6 +149,13 @@ class ThinQClimateEntity(ThinQEntity, ClimateEntity):
         # Update fan, hvac and preset mode.
         if self.supported_features & ClimateEntityFeature.FAN_MODE:
             self._attr_fan_mode = self.data.fan_mode
+        if self.supported_features & ClimateEntityFeature.SWING_MODE:
+            self._attr_swing_mode = STR_TO_SWING.get(self.data.swing_mode)
+        if self.supported_features & ClimateEntityFeature.SWING_HORIZONTAL_MODE:
+            self._attr_swing_horizontal_mode = STR_TO_SWING.get(
+                self.data.swing_horizontal_mode
+            )
+
         if self.data.is_on:
             hvac_mode = self._requested_hvac_mode or self.data.hvac_mode
             if hvac_mode in STR_TO_HVAC:
@@ -166,24 +172,23 @@ class ThinQClimateEntity(ThinQEntity, ClimateEntity):
         self._attr_current_temperature = self.data.current_temp
 
         # Update min, max and step.
-        if (max_temp := self.entity_description.max_temp) is not None or (
-            max_temp := self.data.max
-        ) is not None:
-            self._attr_max_temp = max_temp
-        if (min_temp := self.entity_description.min_temp) is not None or (
-            min_temp := self.data.min
-        ) is not None:
-            self._attr_min_temp = min_temp
-        if (step := self.entity_description.step) is not None or (
-            step := self.data.step
-        ) is not None:
-            self._attr_target_temperature_step = step
+        if self.data.max is not None:
+            self._attr_max_temp = self.data.max
+        if self.data.min is not None:
+            self._attr_min_temp = self.data.min
+
+        self._attr_target_temperature_step = self.data.step
 
         # Update target temperatures.
         self._attr_target_temperature = self.data.target_temp
         self._attr_target_temperature_high = self.data.target_temp_high
         self._attr_target_temperature_low = self.data.target_temp_low
 
+        # Update unit.
+        self._attr_temperature_unit = (
+            self._get_unit_of_measurement(self.data.unit) or UnitOfTemperature.CELSIUS
+        )
+
         _LOGGER.debug(
             "[%s:%s] update status: c:%s, t:%s, l:%s, h:%s, hvac:%s, unit:%s, step:%s",
             self.coordinator.device_name,
@@ -268,6 +273,34 @@ class ThinQClimateEntity(ThinQEntity, ClimateEntity):
             self.coordinator.api.async_set_fan_mode(self.property_id, fan_mode)
         )
 
+    async def async_set_swing_mode(self, swing_mode: str) -> None:
+        """Set new swing mode."""
+        _LOGGER.debug(
+            "[%s:%s] async_set_swing_mode: %s",
+            self.coordinator.device_name,
+            self.property_id,
+            swing_mode,
+        )
+        await self.async_call_api(
+            self.coordinator.api.async_set_swing_mode(
+                self.property_id, SWING_TO_STR.get(swing_mode)
+            )
+        )
+
+    async def async_set_swing_horizontal_mode(self, swing_horizontal_mode: str) -> None:
+        """Set new swing horizontal mode."""
+        _LOGGER.debug(
+            "[%s:%s] async_set_swing_horizontal_mode: %s",
+            self.coordinator.device_name,
+            self.property_id,
+            swing_horizontal_mode,
+        )
+        await self.async_call_api(
+            self.coordinator.api.async_set_swing_horizontal_mode(
+                self.property_id, SWING_TO_STR.get(swing_horizontal_mode)
+            )
+        )
+
     def _round_by_step(self, temperature: float) -> float:
         """Round the value by step."""
         if (
@@ -290,6 +323,10 @@ class ThinQClimateEntity(ThinQEntity, ClimateEntity):
             self.property_id,
             kwargs,
         )
+        if hvac_mode := kwargs.get(ATTR_HVAC_MODE):
+            await self.async_set_hvac_mode(HVACMode(hvac_mode))
+            if hvac_mode == HVACMode.OFF:
+                return
 
         if (temperature := kwargs.get(ATTR_TEMPERATURE)) is not None:
             if (
diff --git a/homeassistant/components/lg_thinq/const.py b/homeassistant/components/lg_thinq/const.py
index a65dee715db..20c6455241a 100644
--- a/homeassistant/components/lg_thinq/const.py
+++ b/homeassistant/components/lg_thinq/const.py
@@ -3,6 +3,8 @@
 from datetime import timedelta
 from typing import Final
 
+from homeassistant.const import UnitOfTemperature
+
 # Config flow
 DOMAIN = "lg_thinq"
 COMPANY = "LGE"
@@ -18,3 +20,10 @@ MQTT_SUBSCRIPTION_INTERVAL: Final = timedelta(days=1)
 # MQTT: Message types
 DEVICE_PUSH_MESSAGE: Final = "DEVICE_PUSH"
 DEVICE_STATUS_MESSAGE: Final = "DEVICE_STATUS"
+
+# Unit conversion map
+DEVICE_UNIT_TO_HA: dict[str, str] = {
+    "F": UnitOfTemperature.FAHRENHEIT,
+    "C": UnitOfTemperature.CELSIUS,
+}
+REVERSE_DEVICE_UNIT_TO_HA = {v: k for k, v in DEVICE_UNIT_TO_HA.items()}
diff --git a/homeassistant/components/lg_thinq/coordinator.py b/homeassistant/components/lg_thinq/coordinator.py
index 9f317dc21d9..513cd27a7b2 100644
--- a/homeassistant/components/lg_thinq/coordinator.py
+++ b/homeassistant/components/lg_thinq/coordinator.py
@@ -2,16 +2,21 @@
 
 from __future__ import annotations
 
+from collections.abc import Mapping
 import logging
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from thinqconnect import ThinQAPIException
 from thinqconnect.integration import HABridge
 
-from homeassistant.core import HomeAssistant
+from homeassistant.const import EVENT_CORE_CONFIG_UPDATE
+from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import DOMAIN
+if TYPE_CHECKING:
+    from . import ThinqConfigEntry
+
+from .const import DOMAIN, REVERSE_DEVICE_UNIT_TO_HA
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -19,11 +24,16 @@ _LOGGER = logging.getLogger(__name__)
 class DeviceDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """LG Device's Data Update Coordinator."""
 
-    def __init__(self, hass: HomeAssistant, ha_bridge: HABridge) -> None:
+    config_entry: ThinqConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ThinqConfigEntry, ha_bridge: HABridge
+    ) -> None:
         """Initialize data coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=f"{DOMAIN}_{ha_bridge.device.device_id}",
         )
 
@@ -46,6 +56,40 @@ class DeviceDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
             f"{self.device_id}_{self.sub_id}" if self.sub_id else self.device_id
         )
 
+        # Set your preferred temperature unit. This will allow us to retrieve
+        # temperature values from the API in a converted value corresponding to
+        # preferred unit.
+        self._update_preferred_temperature_unit()
+
+        # Add a callback to handle core config update.
+        self.unit_system: str | None = None
+        self.hass.bus.async_listen(
+            event_type=EVENT_CORE_CONFIG_UPDATE,
+            listener=self._handle_update_config,
+            event_filter=self.async_config_update_filter,
+        )
+
+    async def _handle_update_config(self, _: Event) -> None:
+        """Handle update core config."""
+        self._update_preferred_temperature_unit()
+
+        await self.async_refresh()
+
+    @callback
+    def async_config_update_filter(self, event_data: Mapping[str, Any]) -> bool:
+        """Filter out unwanted events."""
+        if (unit_system := event_data.get("unit_system")) != self.unit_system:
+            self.unit_system = unit_system
+            return True
+
+        return False
+
+    def _update_preferred_temperature_unit(self) -> None:
+        """Update preferred temperature unit."""
+        self.api.set_preferred_temperature_unit(
+            REVERSE_DEVICE_UNIT_TO_HA.get(self.hass.config.units.temperature_unit)
+        )
+
     async def _async_update_data(self) -> dict[str, Any]:
         """Request to the server to update the status from full response data."""
         try:
@@ -71,10 +115,10 @@ class DeviceDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
 
 
 async def async_setup_device_coordinator(
-    hass: HomeAssistant, ha_bridge: HABridge
+    hass: HomeAssistant, config_entry: ThinqConfigEntry, ha_bridge: HABridge
 ) -> DeviceDataUpdateCoordinator:
     """Create DeviceDataUpdateCoordinator and device_api per device."""
-    coordinator = DeviceDataUpdateCoordinator(hass, ha_bridge)
+    coordinator = DeviceDataUpdateCoordinator(hass, config_entry, ha_bridge)
     await coordinator.async_refresh()
 
     _LOGGER.debug(
diff --git a/homeassistant/components/lg_thinq/entity.py b/homeassistant/components/lg_thinq/entity.py
index 7856506559b..61d8199f321 100644
--- a/homeassistant/components/lg_thinq/entity.py
+++ b/homeassistant/components/lg_thinq/entity.py
@@ -10,25 +10,19 @@ from thinqconnect import ThinQAPIException
 from thinqconnect.devices.const import Location
 from thinqconnect.integration import PropertyState
 
-from homeassistant.const import UnitOfTemperature
 from homeassistant.core import callback
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .const import COMPANY, DOMAIN
+from .const import COMPANY, DEVICE_UNIT_TO_HA, DOMAIN
 from .coordinator import DeviceDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
 EMPTY_STATE = PropertyState()
 
-UNIT_CONVERSION_MAP: dict[str, str] = {
-    "F": UnitOfTemperature.FAHRENHEIT,
-    "C": UnitOfTemperature.CELSIUS,
-}
-
 
 class ThinQEntity(CoordinatorEntity[DeviceDataUpdateCoordinator]):
     """The base implementation of all lg thinq entities."""
@@ -75,7 +69,7 @@ class ThinQEntity(CoordinatorEntity[DeviceDataUpdateCoordinator]):
         if unit is None:
             return None
 
-        return UNIT_CONVERSION_MAP.get(unit)
+        return DEVICE_UNIT_TO_HA.get(unit)
 
     def _update_status(self) -> None:
         """Update status itself.
diff --git a/homeassistant/components/lg_thinq/event.py b/homeassistant/components/lg_thinq/event.py
index b963cba37cc..f9baadf7a05 100644
--- a/homeassistant/components/lg_thinq/event.py
+++ b/homeassistant/components/lg_thinq/event.py
@@ -9,7 +9,7 @@ from thinqconnect.integration import ActiveMode, ThinQPropertyEx
 
 from homeassistant.components.event import EventEntity, EventEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import ThinqConfigEntry
 from .coordinator import DeviceDataUpdateCoordinator
@@ -57,7 +57,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ThinqConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up an entry for event platform."""
     entities: list[ThinQEventEntity] = []
diff --git a/homeassistant/components/lg_thinq/fan.py b/homeassistant/components/lg_thinq/fan.py
index edcadf2598a..6d07c98744a 100644
--- a/homeassistant/components/lg_thinq/fan.py
+++ b/homeassistant/components/lg_thinq/fan.py
@@ -14,7 +14,7 @@ from homeassistant.components.fan import (
     FanEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     ordered_list_item_to_percentage,
     percentage_to_ordered_list_item,
@@ -41,7 +41,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ThinqConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up an entry for fan platform."""
     entities: list[ThinQFanEntity] = []
diff --git a/homeassistant/components/lg_thinq/icons.json b/homeassistant/components/lg_thinq/icons.json
index 87cf04e0c1a..787b50167c1 100644
--- a/homeassistant/components/lg_thinq/icons.json
+++ b/homeassistant/components/lg_thinq/icons.json
@@ -7,8 +7,11 @@
       "express_mode": {
         "default": "mdi:snowflake-variant"
       },
+      "express_fridge": {
+        "default": "mdi:snowflake"
+      },
       "hot_water_mode": {
-        "default": "mdi:list-status"
+        "default": "mdi:heat-wave"
       },
       "humidity_warm_mode": {
         "default": "mdi:heat-wave"
@@ -39,6 +42,9 @@
       },
       "warm_mode": {
         "default": "mdi:heat-wave"
+      },
+      "display_light": {
+        "default": "mdi:lightbulb-on-outline"
       }
     },
     "binary_sensor": {
@@ -74,6 +80,9 @@
       },
       "one_touch_filter": {
         "default": "mdi:air-filter"
+      },
+      "water_heater_operation_mode": {
+        "default": "mdi:power"
       }
     },
     "climate": {
@@ -401,6 +410,12 @@
       },
       "power_level_for_location": {
         "default": "mdi:radiator"
+      },
+      "cycle_count": {
+        "default": "mdi:counter"
+      },
+      "cycle_count_for_location": {
+        "default": "mdi:counter"
       }
     }
   }
diff --git a/homeassistant/components/lg_thinq/manifest.json b/homeassistant/components/lg_thinq/manifest.json
index 6dd60909c66..cffc61cb1c4 100644
--- a/homeassistant/components/lg_thinq/manifest.json
+++ b/homeassistant/components/lg_thinq/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/lg_thinq",
   "iot_class": "cloud_push",
   "loggers": ["thinqconnect"],
-  "requirements": ["thinqconnect==1.0.2"]
+  "requirements": ["thinqconnect==1.0.5"]
 }
diff --git a/homeassistant/components/lg_thinq/number.py b/homeassistant/components/lg_thinq/number.py
index 634c1a8fe84..7003519e0ce 100644
--- a/homeassistant/components/lg_thinq/number.py
+++ b/homeassistant/components/lg_thinq/number.py
@@ -16,7 +16,7 @@ from homeassistant.components.number import (
 )
 from homeassistant.const import PERCENTAGE, UnitOfTemperature, UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import ThinqConfigEntry
 from .entity import ThinQEntity
@@ -118,16 +118,7 @@ DEVICE_TYPE_NUMBER_MAP: dict[DeviceType, tuple[NumberEntityDescription, ...]] =
     DeviceType.WASHTOWER_DRYER: WASHER_NUMBERS,
     DeviceType.WASHTOWER: WASHER_NUMBERS,
     DeviceType.WASHTOWER_WASHER: WASHER_NUMBERS,
-    DeviceType.WATER_HEATER: (
-        NumberEntityDescription(
-            key=ThinQProperty.TARGET_TEMPERATURE,
-            native_max_value=60,
-            native_min_value=35,
-            native_step=1,
-            native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-            translation_key=ThinQProperty.TARGET_TEMPERATURE,
-        ),
-    ),
+    DeviceType.WATER_HEATER: (NUMBER_DESC[ThinQProperty.TARGET_TEMPERATURE],),
     DeviceType.WINE_CELLAR: (
         NUMBER_DESC[ThinQProperty.LIGHT_STATUS],
         NUMBER_DESC[ThinQProperty.TARGET_TEMPERATURE],
@@ -140,7 +131,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ThinqConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up an entry for number platform."""
     entities: list[ThinQNumberEntity] = []
@@ -179,7 +170,7 @@ class ThinQNumberEntity(ThinQEntity, NumberEntity):
         ) is not None:
             self._attr_native_unit_of_measurement = unit_of_measurement
 
-        # Undate range.
+        # Update range.
         if (
             self.entity_description.native_min_value is None
             and (min_value := self.data.min) is not None
diff --git a/homeassistant/components/lg_thinq/select.py b/homeassistant/components/lg_thinq/select.py
index e555d616ca3..929fa0b1d28 100644
--- a/homeassistant/components/lg_thinq/select.py
+++ b/homeassistant/components/lg_thinq/select.py
@@ -10,7 +10,7 @@ from thinqconnect.integration import ActiveMode
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import ThinqConfigEntry
 from .coordinator import DeviceDataUpdateCoordinator
@@ -142,7 +142,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ThinqConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up an entry for select platform."""
     entities: list[ThinQSelectEntity] = []
diff --git a/homeassistant/components/lg_thinq/sensor.py b/homeassistant/components/lg_thinq/sensor.py
index 7baaab52403..754b07cb2db 100644
--- a/homeassistant/components/lg_thinq/sensor.py
+++ b/homeassistant/components/lg_thinq/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from . import ThinqConfigEntry
@@ -248,6 +248,24 @@ TEMPERATURE_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
         state_class=SensorStateClass.MEASUREMENT,
         translation_key=ThinQProperty.CURRENT_TEMPERATURE,
     ),
+    ThinQPropertyEx.ROOM_AIR_CURRENT_TEMPERATURE: SensorEntityDescription(
+        key=ThinQPropertyEx.ROOM_AIR_CURRENT_TEMPERATURE,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        translation_key=ThinQPropertyEx.ROOM_AIR_CURRENT_TEMPERATURE,
+    ),
+    ThinQPropertyEx.ROOM_IN_WATER_CURRENT_TEMPERATURE: SensorEntityDescription(
+        key=ThinQPropertyEx.ROOM_IN_WATER_CURRENT_TEMPERATURE,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        translation_key=ThinQPropertyEx.ROOM_IN_WATER_CURRENT_TEMPERATURE,
+    ),
+    ThinQPropertyEx.ROOM_OUT_WATER_CURRENT_TEMPERATURE: SensorEntityDescription(
+        key=ThinQPropertyEx.ROOM_OUT_WATER_CURRENT_TEMPERATURE,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        translation_key=ThinQPropertyEx.ROOM_OUT_WATER_CURRENT_TEMPERATURE,
+    ),
 }
 WATER_FILTER_INFO_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
     ThinQProperty.USED_TIME: SensorEntityDescription(
@@ -341,6 +359,10 @@ TIMER_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
 }
 
 WASHER_SENSORS: tuple[SensorEntityDescription, ...] = (
+    SensorEntityDescription(
+        key=ThinQProperty.CYCLE_COUNT,
+        translation_key=ThinQProperty.CYCLE_COUNT,
+    ),
     RUN_STATE_SENSOR_DESC[ThinQProperty.CURRENT_STATE],
     TIMER_SENSOR_DESC[TimerProperty.TOTAL],
     TIMER_SENSOR_DESC[TimerProperty.RELATIVE_TO_START_WM],
@@ -470,6 +492,11 @@ DEVICE_TYPE_SENSOR_MAP: dict[DeviceType, tuple[SensorEntityDescription, ...]] =
         RUN_STATE_SENSOR_DESC[ThinQProperty.CURRENT_STATE],
     ),
     DeviceType.STYLER: WASHER_SENSORS,
+    DeviceType.SYSTEM_BOILER: (
+        TEMPERATURE_SENSOR_DESC[ThinQPropertyEx.ROOM_AIR_CURRENT_TEMPERATURE],
+        TEMPERATURE_SENSOR_DESC[ThinQPropertyEx.ROOM_IN_WATER_CURRENT_TEMPERATURE],
+        TEMPERATURE_SENSOR_DESC[ThinQPropertyEx.ROOM_OUT_WATER_CURRENT_TEMPERATURE],
+    ),
     DeviceType.WASHCOMBO_MAIN: WASHER_SENSORS,
     DeviceType.WASHCOMBO_MINI: WASHER_SENSORS,
     DeviceType.WASHER: WASHER_SENSORS,
@@ -492,7 +519,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ThinqConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up an entry for sensor platform."""
     entities: list[ThinQSensorEntity] = []
@@ -554,36 +581,44 @@ class ThinQSensorEntity(ThinQEntity, SensorEntity):
             local_now = datetime.now(
                 tz=dt_util.get_time_zone(self.coordinator.hass.config.time_zone)
             )
-            if value in [0, None, time.min]:
-                # Reset to None
+            self._device_state = (
+                self.coordinator.data[self._device_state_id].value
+                if self._device_state_id in self.coordinator.data
+                else None
+            )
+            if value in [0, None, time.min] or (
+                self._device_state == "power_off"
+                and self.entity_description.key
+                in [TimerProperty.REMAIN, TimerProperty.TOTAL]
+            ):
+                # Reset to None when power_off
                 value = None
             elif self.entity_description.device_class == SensorDeviceClass.TIMESTAMP:
                 if self.entity_description.key in TIME_SENSOR_DESC:
-                    # Set timestamp for time
+                    # Set timestamp for absolute time
                     value = local_now.replace(hour=value.hour, minute=value.minute)
                 else:
                     # Set timestamp for delta
-                    new_state = (
-                        self.coordinator.data[self._device_state_id].value
-                        if self._device_state_id in self.coordinator.data
-                        else None
-                    )
-                    if (
-                        self.native_value is not None
-                        and self._device_state == new_state
-                    ):
-                        # Skip update when same state
-                        return
-
-                    self._device_state = new_state
-                    time_delta = timedelta(
+                    event_data = timedelta(
                         hours=value.hour, minutes=value.minute, seconds=value.second
                     )
-                    value = (
-                        (local_now - time_delta)
+                    new_time = (
+                        (local_now - event_data)
                         if self.entity_description.key == TimerProperty.RUNNING
-                        else (local_now + time_delta)
+                        else (local_now + event_data)
                     )
+                    # The remain_time may change during the wash/dry operation depending on various reasons.
+                    # If there is a diff of more than 60sec, the new timestamp is used
+                    if (
+                        parse_native_value := dt_util.parse_datetime(
+                            str(self.native_value)
+                        )
+                    ) is None or abs(new_time - parse_native_value) > timedelta(
+                        seconds=60
+                    ):
+                        value = new_time
+                    else:
+                        value = self.native_value
             elif self.entity_description.device_class == SensorDeviceClass.DURATION:
                 # Set duration
                 value = self._get_duration(
diff --git a/homeassistant/components/lg_thinq/strings.json b/homeassistant/components/lg_thinq/strings.json
index a776dde2054..e1d3779f44b 100644
--- a/homeassistant/components/lg_thinq/strings.json
+++ b/homeassistant/components/lg_thinq/strings.json
@@ -30,10 +30,13 @@
         "name": "Auto mode"
       },
       "express_mode": {
-        "name": "Ice plus"
+        "name": "Express mode"
+      },
+      "express_fridge": {
+        "name": "Express cool"
       },
       "hot_water_mode": {
-        "name": "Hot water"
+        "name": "Heating water"
       },
       "humidity_warm_mode": {
         "name": "Warm mist"
@@ -64,6 +67,9 @@
       },
       "warm_mode": {
         "name": "Heating"
+      },
+      "display_light": {
+        "name": "Lighting"
       }
     },
     "binary_sensor": {
@@ -99,6 +105,12 @@
       },
       "one_touch_filter": {
         "name": "Fresh air filter"
+      },
+      "water_heater_operation_mode": {
+        "name": "[%key:component::binary_sensor::entity_component::power::name%]",
+        "state": {
+          "off": "[%key:common::state::standby%]"
+        }
       }
     },
     "climate": {
@@ -209,9 +221,9 @@
               "error_during_washing": "An error has occurred in the washing machine",
               "error_has_occurred": "An error has occurred",
               "frozen_is_complete": "Ice plus is done",
-              "homeguard_is_stopped": "Home guard has stopped",
+              "homeguard_is_stopped": "Home Guard has stopped",
               "lack_of_water": "There is no water in the water tank",
-              "motion_is_detected": "Photograph is sent as movement is detected during home guard",
+              "motion_is_detected": "Photograph is sent as movement is detected during Home Guard",
               "need_to_check_location": "Location check is required",
               "pollution_is_high": "Air status is rapidly becoming bad",
               "preheating_is_complete": "Preheating is done",
@@ -258,10 +270,10 @@
         "name": "{location} schedule turn-on"
       },
       "relative_hour_to_start_wm": {
-        "name": "Delay starts in"
+        "name": "Delayed start"
       },
       "relative_hour_to_start_wm_for_location": {
-        "name": "{location} delay starts in"
+        "name": "{location} delayed start"
       },
       "relative_hour_to_stop": {
         "name": "Schedule turn-off"
@@ -270,10 +282,10 @@
         "name": "{location} schedule turn-off"
       },
       "relative_hour_to_stop_wm": {
-        "name": "Delay ends in"
+        "name": "Delayed end"
       },
       "relative_hour_to_stop_wm_for_location": {
-        "name": "{location} delay ends in"
+        "name": "{location} delayed end"
       },
       "sleep_timer_relative_hour_to_stop": {
         "name": "Sleep timer"
@@ -299,6 +311,15 @@
       "current_temperature": {
         "name": "Current temperature"
       },
+      "room_air_current_temperature": {
+        "name": "Indoor temperature"
+      },
+      "room_in_water_current_temperature": {
+        "name": "Inlet temperature"
+      },
+      "room_out_water_current_temperature": {
+        "name": "Outlet temperature"
+      },
       "temperature": {
         "name": "Temperature"
       },
@@ -390,7 +411,7 @@
           "cancel": "Cancel",
           "carbonation": "Carbonation",
           "change_condition": "Settings Change",
-          "charging": "Charging",
+          "charging": "[%key:common::state::charging%]",
           "charging_complete": "Charging completed",
           "checking_turbidity": "Detecting soil level",
           "cleaning": "Cleaning",
@@ -426,9 +447,9 @@
           "lock": "Control lock",
           "macrosector": "Remote is in use",
           "melting": "Wort dissolving",
-          "monitoring_detecting": "HomeGuard is active",
+          "monitoring_detecting": "Home Guard is active",
           "monitoring_moving": "Going to the starting point",
-          "monitoring_positioning": "Setting homeguard start point",
+          "monitoring_positioning": "Setting Home Guard start point",
           "night_dry": "Night dry",
           "oven_setting": "Cooktop connected",
           "pause": "[%key:common::state::paused%]",
@@ -477,7 +498,7 @@
           "cancel": "[%key:component::lg_thinq::entity::sensor::current_state::state::cancel%]",
           "carbonation": "[%key:component::lg_thinq::entity::sensor::current_state::state::carbonation%]",
           "change_condition": "[%key:component::lg_thinq::entity::sensor::current_state::state::change_condition%]",
-          "charging": "[%key:component::lg_thinq::entity::sensor::current_state::state::charging%]",
+          "charging": "[%key:common::state::charging%]",
           "charging_complete": "[%key:component::lg_thinq::entity::sensor::current_state::state::charging_complete%]",
           "checking_turbidity": "[%key:component::lg_thinq::entity::sensor::current_state::state::checking_turbidity%]",
           "cleaning": "[%key:component::lg_thinq::entity::sensor::current_state::state::cleaning%]",
@@ -842,6 +863,12 @@
       },
       "power_level_for_location": {
         "name": "{location} power level"
+      },
+      "cycle_count": {
+        "name": "Cycles"
+      },
+      "cycle_count_for_location": {
+        "name": "{location} cycles"
       }
     },
     "select": {
@@ -906,6 +933,7 @@
         "state": {
           "cancel": "[%key:component::lg_thinq::entity::sensor::current_state::state::cancel%]",
           "power_off": "Power off",
+          "power_on": "Power on",
           "preheating": "Preheating",
           "start": "[%key:common::action::start%]",
           "stop": "[%key:common::action::stop%]",
@@ -917,6 +945,7 @@
         "state": {
           "cancel": "[%key:component::lg_thinq::entity::sensor::current_state::state::cancel%]",
           "power_off": "[%key:component::lg_thinq::entity::select::operation_mode::state::power_off%]",
+          "power_on": "[%key:component::lg_thinq::entity::select::operation_mode::state::power_on%]",
           "preheating": "[%key:component::lg_thinq::entity::select::operation_mode::state::preheating%]",
           "start": "[%key:common::action::start%]",
           "stop": "[%key:common::action::stop%]",
diff --git a/homeassistant/components/lg_thinq/switch.py b/homeassistant/components/lg_thinq/switch.py
index 25fd7eb8b64..06363140193 100644
--- a/homeassistant/components/lg_thinq/switch.py
+++ b/homeassistant/components/lg_thinq/switch.py
@@ -17,7 +17,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import ThinqConfigEntry
 from .entity import ThinQEntity
@@ -33,6 +33,18 @@ class ThinQSwitchEntityDescription(SwitchEntityDescription):
 
 DEVICE_TYPE_SWITCH_MAP: dict[DeviceType, tuple[ThinQSwitchEntityDescription, ...]] = {
     DeviceType.AIR_CONDITIONER: (
+        ThinQSwitchEntityDescription(
+            key=ThinQProperty.AIR_CON_OPERATION_MODE,
+            translation_key="operation_power",
+            entity_category=EntityCategory.CONFIG,
+        ),
+        ThinQSwitchEntityDescription(
+            key=ThinQProperty.DISPLAY_LIGHT,
+            translation_key=ThinQProperty.DISPLAY_LIGHT,
+            on_key="on",
+            off_key="off",
+            entity_category=EntityCategory.CONFIG,
+        ),
         ThinQSwitchEntityDescription(
             key=ThinQProperty.POWER_SAVE_ENABLED,
             translation_key=ThinQProperty.POWER_SAVE_ENABLED,
@@ -121,8 +133,20 @@ DEVICE_TYPE_SWITCH_MAP: dict[DeviceType, tuple[ThinQSwitchEntityDescription, ...
             off_key="false",
             entity_category=EntityCategory.CONFIG,
         ),
+        ThinQSwitchEntityDescription(
+            key=ThinQProperty.EXPRESS_FRIDGE,
+            translation_key=ThinQProperty.EXPRESS_FRIDGE,
+            on_key="true",
+            off_key="false",
+            entity_category=EntityCategory.CONFIG,
+        ),
     ),
     DeviceType.SYSTEM_BOILER: (
+        ThinQSwitchEntityDescription(
+            key=ThinQProperty.BOILER_OPERATION_MODE,
+            translation_key="operation_power",
+            entity_category=EntityCategory.CONFIG,
+        ),
         ThinQSwitchEntityDescription(
             key=ThinQProperty.HOT_WATER_MODE,
             translation_key=ThinQProperty.HOT_WATER_MODE,
@@ -148,7 +172,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ThinqConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up an entry for switch platform."""
     entities: list[ThinQSwitchEntity] = []
diff --git a/homeassistant/components/lg_thinq/vacuum.py b/homeassistant/components/lg_thinq/vacuum.py
index 6cbb731869c..6cf2a9086b1 100644
--- a/homeassistant/components/lg_thinq/vacuum.py
+++ b/homeassistant/components/lg_thinq/vacuum.py
@@ -15,7 +15,7 @@ from homeassistant.components.vacuum import (
     VacuumEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import ThinqConfigEntry
 from .entity import ThinQEntity
@@ -73,7 +73,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ThinqConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up an entry for vacuum platform."""
     entities: list[ThinQStateVacuumEntity] = []
diff --git a/homeassistant/components/lg_thinq/water_heater.py b/homeassistant/components/lg_thinq/water_heater.py
new file mode 100644
index 00000000000..5a5c8d024b6
--- /dev/null
+++ b/homeassistant/components/lg_thinq/water_heater.py
@@ -0,0 +1,201 @@
+"""Support for waterheater entities."""
+
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+from thinqconnect import DeviceType
+from thinqconnect.integration import ExtendedProperty
+
+from homeassistant.components.water_heater import (
+    ATTR_OPERATION_MODE,
+    STATE_ECO,
+    STATE_HEAT_PUMP,
+    STATE_OFF,
+    STATE_PERFORMANCE,
+    WaterHeaterEntity,
+    WaterHeaterEntityDescription,
+    WaterHeaterEntityFeature,
+)
+from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import ThinqConfigEntry
+from .coordinator import DeviceDataUpdateCoordinator
+from .entity import ThinQEntity
+
+DEVICE_TYPE_WH_MAP: dict[DeviceType, WaterHeaterEntityDescription] = {
+    DeviceType.WATER_HEATER: WaterHeaterEntityDescription(
+        key=ExtendedProperty.WATER_HEATER,
+        name=None,
+    ),
+    DeviceType.SYSTEM_BOILER: WaterHeaterEntityDescription(
+        key=ExtendedProperty.WATER_BOILER,
+        name=None,
+    ),
+}
+
+# Mapping between device and HA operation modes
+DEVICE_OP_MODE_TO_HA = {
+    "auto": STATE_ECO,
+    "heat_pump": STATE_HEAT_PUMP,
+    "turbo": STATE_PERFORMANCE,
+    "vacation": STATE_OFF,
+}
+HA_STATE_TO_DEVICE_OP_MODE = {v: k for k, v in DEVICE_OP_MODE_TO_HA.items()}
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: ThinqConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up an entry for water_heater platform."""
+    entities: list[ThinQWaterHeaterEntity] = []
+    for coordinator in entry.runtime_data.coordinators.values():
+        if (
+            description := DEVICE_TYPE_WH_MAP.get(coordinator.api.device.device_type)
+        ) is not None:
+            if coordinator.api.device.device_type == DeviceType.WATER_HEATER:
+                entities.append(
+                    ThinQWaterHeaterEntity(
+                        coordinator, description, ExtendedProperty.WATER_HEATER
+                    )
+                )
+            elif coordinator.api.device.device_type == DeviceType.SYSTEM_BOILER:
+                entities.append(
+                    ThinQWaterBoilerEntity(
+                        coordinator, description, ExtendedProperty.WATER_BOILER
+                    )
+                )
+    if entities:
+        async_add_entities(entities)
+
+
+class ThinQWaterHeaterEntity(ThinQEntity, WaterHeaterEntity):
+    """Represent a ThinQ water heater entity."""
+
+    def __init__(
+        self,
+        coordinator: DeviceDataUpdateCoordinator,
+        entity_description: WaterHeaterEntityDescription,
+        property_id: str,
+    ) -> None:
+        """Initialize a water_heater entity."""
+        super().__init__(coordinator, entity_description, property_id)
+        self._attr_supported_features = (
+            WaterHeaterEntityFeature.TARGET_TEMPERATURE
+            | WaterHeaterEntityFeature.OPERATION_MODE
+        )
+        self._attr_temperature_unit = (
+            self._get_unit_of_measurement(self.data.unit) or UnitOfTemperature.CELSIUS
+        )
+        if modes := self.data.job_modes:
+            self._attr_operation_list = [
+                DEVICE_OP_MODE_TO_HA.get(mode, mode) for mode in modes
+            ]
+        else:
+            self._attr_operation_list = [STATE_HEAT_PUMP]
+
+    def _update_status(self) -> None:
+        """Update status itself."""
+        super()._update_status()
+        self._attr_current_temperature = self.data.current_temp
+        self._attr_target_temperature = self.data.target_temp
+
+        if self.data.max is not None:
+            self._attr_max_temp = self.data.max
+        if self.data.min is not None:
+            self._attr_min_temp = self.data.min
+        if self.data.step is not None:
+            self._attr_target_temperature_step = self.data.step
+
+        self._attr_temperature_unit = (
+            self._get_unit_of_measurement(self.data.unit) or UnitOfTemperature.CELSIUS
+        )
+        if self.data.is_on:
+            self._attr_current_operation = (
+                DEVICE_OP_MODE_TO_HA.get(job_mode, job_mode)
+                if (job_mode := self.data.job_mode) is not None
+                else STATE_HEAT_PUMP
+            )
+        else:
+            self._attr_current_operation = STATE_OFF
+
+        _LOGGER.debug(
+            "[%s:%s] update status: c:%s, t:%s, op_mode:%s, op_list:%s, is_on:%s",
+            self.coordinator.device_name,
+            self.property_id,
+            self.current_temperature,
+            self.target_temperature,
+            self.current_operation,
+            self.operation_list,
+            self.data.is_on,
+        )
+
+    async def async_set_temperature(self, **kwargs: Any) -> None:
+        """Set new target temperatures."""
+        _LOGGER.debug(
+            "[%s:%s] async_set_temperature: %s",
+            self.coordinator.device_name,
+            self.property_id,
+            kwargs,
+        )
+        if (operation_mode := kwargs.get(ATTR_OPERATION_MODE)) is not None:
+            await self.async_set_operation_mode(str(operation_mode))
+            if operation_mode == STATE_OFF:
+                return
+
+        if (
+            temperature := kwargs.get(ATTR_TEMPERATURE)
+        ) is not None and temperature != self.target_temperature:
+            await self.async_call_api(
+                self.coordinator.api.async_set_target_temperature(
+                    self.property_id, temperature
+                )
+            )
+
+    async def async_set_operation_mode(self, operation_mode: str) -> None:
+        """Set new operation mode."""
+        mode = HA_STATE_TO_DEVICE_OP_MODE.get(operation_mode, operation_mode)
+        _LOGGER.debug(
+            "[%s:%s] async_set_operation_mode: %s",
+            self.coordinator.device_name,
+            self.property_id,
+            mode,
+        )
+        await self.async_call_api(
+            self.coordinator.api.async_set_job_mode(self.property_id, mode)
+        )
+
+
+class ThinQWaterBoilerEntity(ThinQWaterHeaterEntity):
+    """Represent a ThinQ water boiler entity."""
+
+    def __init__(
+        self,
+        coordinator: DeviceDataUpdateCoordinator,
+        entity_description: WaterHeaterEntityDescription,
+        property_id: str,
+    ) -> None:
+        """Initialize a water_heater entity."""
+        super().__init__(coordinator, entity_description, property_id)
+        self._attr_supported_features |= WaterHeaterEntityFeature.ON_OFF
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the entity on."""
+        _LOGGER.debug(
+            "[%s:%s] async_turn_on", self.coordinator.device_name, self.property_id
+        )
+        await self.async_call_api(self.coordinator.api.async_turn_on(self.property_id))
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the entity off."""
+        _LOGGER.debug(
+            "[%s:%s] async_turn_off", self.coordinator.device_name, self.property_id
+        )
+        await self.async_call_api(self.coordinator.api.async_turn_off(self.property_id))
diff --git a/homeassistant/components/lidarr/__init__.py b/homeassistant/components/lidarr/__init__.py
index a421a881b69..e3a5cf250b2 100644
--- a/homeassistant/components/lidarr/__init__.py
+++ b/homeassistant/components/lidarr/__init__.py
@@ -2,12 +2,11 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass, fields
+from dataclasses import fields
 
 from aiopyarr.lidarr_client import LidarrClient
 from aiopyarr.models.host_configuration import PyArrHostConfiguration
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_URL, CONF_VERIFY_SSL, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
@@ -18,27 +17,16 @@ from .const import DEFAULT_NAME, DOMAIN
 from .coordinator import (
     AlbumsDataUpdateCoordinator,
     DiskSpaceDataUpdateCoordinator,
+    LidarrConfigEntry,
+    LidarrData,
     QueueDataUpdateCoordinator,
     StatusDataUpdateCoordinator,
     WantedDataUpdateCoordinator,
 )
 
-type LidarrConfigEntry = ConfigEntry[LidarrData]
-
 PLATFORMS = [Platform.SENSOR]
 
 
-@dataclass(kw_only=True, slots=True)
-class LidarrData:
-    """Lidarr data type."""
-
-    disk_space: DiskSpaceDataUpdateCoordinator
-    queue: QueueDataUpdateCoordinator
-    status: StatusDataUpdateCoordinator
-    wanted: WantedDataUpdateCoordinator
-    albums: AlbumsDataUpdateCoordinator
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: LidarrConfigEntry) -> bool:
     """Set up Lidarr from a config entry."""
     host_configuration = PyArrHostConfiguration(
@@ -52,11 +40,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: LidarrConfigEntry) -> bo
         request_timeout=60,
     )
     data = LidarrData(
-        disk_space=DiskSpaceDataUpdateCoordinator(hass, host_configuration, lidarr),
-        queue=QueueDataUpdateCoordinator(hass, host_configuration, lidarr),
-        status=StatusDataUpdateCoordinator(hass, host_configuration, lidarr),
-        wanted=WantedDataUpdateCoordinator(hass, host_configuration, lidarr),
-        albums=AlbumsDataUpdateCoordinator(hass, host_configuration, lidarr),
+        disk_space=DiskSpaceDataUpdateCoordinator(
+            hass, entry, host_configuration, lidarr
+        ),
+        queue=QueueDataUpdateCoordinator(hass, entry, host_configuration, lidarr),
+        status=StatusDataUpdateCoordinator(hass, entry, host_configuration, lidarr),
+        wanted=WantedDataUpdateCoordinator(hass, entry, host_configuration, lidarr),
+        albums=AlbumsDataUpdateCoordinator(hass, entry, host_configuration, lidarr),
     )
     for field in fields(data):
         coordinator = getattr(data, field.name)
diff --git a/homeassistant/components/lidarr/coordinator.py b/homeassistant/components/lidarr/coordinator.py
index 1010f708748..3f9d2be4bec 100644
--- a/homeassistant/components/lidarr/coordinator.py
+++ b/homeassistant/components/lidarr/coordinator.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
+from dataclasses import dataclass
 from datetime import timedelta
 from typing import Generic, TypeVar, cast
 
@@ -17,17 +18,32 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .const import DEFAULT_MAX_RECORDS, DOMAIN, LOGGER
 
+
+@dataclass(kw_only=True, slots=True)
+class LidarrData:
+    """Lidarr data type."""
+
+    disk_space: DiskSpaceDataUpdateCoordinator
+    queue: QueueDataUpdateCoordinator
+    status: StatusDataUpdateCoordinator
+    wanted: WantedDataUpdateCoordinator
+    albums: AlbumsDataUpdateCoordinator
+
+
 T = TypeVar("T", bound=list[LidarrRootFolder] | LidarrQueue | str | LidarrAlbum | int)
 
+type LidarrConfigEntry = ConfigEntry[LidarrData]
+
 
 class LidarrDataUpdateCoordinator(DataUpdateCoordinator[T], Generic[T], ABC):
     """Data update coordinator for the Lidarr integration."""
 
-    config_entry: ConfigEntry
+    config_entry: LidarrConfigEntry
 
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: LidarrConfigEntry,
         host_configuration: PyArrHostConfiguration,
         api_client: LidarrClient,
     ) -> None:
@@ -35,6 +51,7 @@ class LidarrDataUpdateCoordinator(DataUpdateCoordinator[T], Generic[T], ABC):
         super().__init__(
             hass=hass,
             logger=LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=30),
         )
diff --git a/homeassistant/components/lidarr/sensor.py b/homeassistant/components/lidarr/sensor.py
index 805fcce53ad..81b2c570eab 100644
--- a/homeassistant/components/lidarr/sensor.py
+++ b/homeassistant/components/lidarr/sensor.py
@@ -16,11 +16,10 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import UnitOfInformation
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import LidarrConfigEntry
 from .const import BYTE_SIZES
-from .coordinator import LidarrDataUpdateCoordinator, T
+from .coordinator import LidarrConfigEntry, LidarrDataUpdateCoordinator, T
 from .entity import LidarrEntity
 
 
@@ -115,7 +114,7 @@ SENSOR_TYPES: dict[str, LidarrSensorEntityDescription[Any]] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LidarrConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Lidarr sensors based on a config entry."""
     entities: list[LidarrSensor[Any]] = []
diff --git a/homeassistant/components/life360/__init__.py b/homeassistant/components/life360/__init__.py
index 5c2d62545d6..60c1ac753e6 100644
--- a/homeassistant/components/life360/__init__.py
+++ b/homeassistant/components/life360/__init__.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import issue_registry as ir
 
@@ -26,11 +26,14 @@ async def async_setup_entry(hass: HomeAssistant, _: ConfigEntry) -> bool:
 
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Unload config entry."""
-    if all(
-        config_entry.state is ConfigEntryState.NOT_LOADED
-        for config_entry in hass.config_entries.async_entries(DOMAIN)
-        if config_entry.entry_id != entry.entry_id
-    ):
-        ir.async_delete_issue(hass, DOMAIN, DOMAIN)
+    """Unload a config entry."""
     return True
+
+
+async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Remove a config entry."""
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
+        ir.async_delete_issue(hass, DOMAIN, DOMAIN)
+        # Remove any remaining disabled or ignored entries
+        for _entry in hass.config_entries.async_entries(DOMAIN):
+            hass.async_create_task(hass.config_entries.async_remove(_entry.entry_id))
diff --git a/homeassistant/components/lifx/__init__.py b/homeassistant/components/lifx/__init__.py
index 974292c6e80..7a6d95549ff 100644
--- a/homeassistant/components/lifx/__init__.py
+++ b/homeassistant/components/lifx/__init__.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import async_call_later, async_track_time_interval
 from homeassistant.helpers.typing import ConfigType
 
@@ -211,7 +211,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     except socket.gaierror as ex:
         connection.async_stop()
         raise ConfigEntryNotReady(f"Could not resolve {host}: {ex}") from ex
-    coordinator = LIFXUpdateCoordinator(hass, connection, entry.title)
+    coordinator = LIFXUpdateCoordinator(hass, entry, connection)
     coordinator.async_setup()
     try:
         await coordinator.async_config_entry_first_refresh()
diff --git a/homeassistant/components/lifx/binary_sensor.py b/homeassistant/components/lifx/binary_sensor.py
index 454561a6f4e..f5a974b4626 100644
--- a/homeassistant/components/lifx/binary_sensor.py
+++ b/homeassistant/components/lifx/binary_sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, HEV_CYCLE_STATE
 from .coordinator import LIFXUpdateCoordinator
@@ -26,7 +26,9 @@ HEV_CYCLE_STATE_SENSOR = BinarySensorEntityDescription(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up LIFX from a config entry."""
     coordinator: LIFXUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/lifx/button.py b/homeassistant/components/lifx/button.py
index 694c91b4c27..25ab61aebae 100644
--- a/homeassistant/components/lifx/button.py
+++ b/homeassistant/components/lifx/button.py
@@ -10,7 +10,7 @@ from homeassistant.components.button import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, IDENTIFY, RESTART
 from .coordinator import LIFXUpdateCoordinator
@@ -32,7 +32,7 @@ IDENTIFY_BUTTON_DESCRIPTION = ButtonEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up LIFX from a config entry."""
     domain_data = hass.data[DOMAIN]
diff --git a/homeassistant/components/lifx/const.py b/homeassistant/components/lifx/const.py
index 667afe1125d..58c3550b812 100644
--- a/homeassistant/components/lifx/const.py
+++ b/homeassistant/components/lifx/const.py
@@ -61,7 +61,7 @@ INFRARED_BRIGHTNESS_VALUES_MAP = {
 }
 DATA_LIFX_MANAGER = "lifx_manager"
 
-LIFX_CEILING_PRODUCT_IDS = {176, 177}
+LIFX_CEILING_PRODUCT_IDS = {176, 177, 201, 202}
 
 _LOGGER = logging.getLogger(__package__)
 
diff --git a/homeassistant/components/lifx/coordinator.py b/homeassistant/components/lifx/coordinator.py
index eaaff7e6540..b77dbdc015a 100644
--- a/homeassistant/components/lifx/coordinator.py
+++ b/homeassistant/components/lifx/coordinator.py
@@ -23,6 +23,7 @@ from aiolifx_themes.themes import ThemeLibrary, ThemePainter
 from awesomeversion import AwesomeVersion
 from propcache.api import cached_property
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     SIGNAL_STRENGTH_DECIBELS,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
@@ -86,11 +87,13 @@ class SkyType(IntEnum):
 class LIFXUpdateCoordinator(DataUpdateCoordinator[None]):
     """DataUpdateCoordinator to gather data for a specific lifx device."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         connection: LIFXConnection,
-        title: str,
     ) -> None:
         """Initialize DataUpdateCoordinator."""
         assert connection.device is not None
@@ -105,7 +108,8 @@ class LIFXUpdateCoordinator(DataUpdateCoordinator[None]):
         super().__init__(
             hass,
             _LOGGER,
-            name=f"{title} ({self.device.ip_addr})",
+            config_entry=config_entry,
+            name=f"{config_entry.title} ({self.device.ip_addr})",
             update_interval=timedelta(seconds=LIGHT_UPDATE_INTERVAL),
             # We don't want an immediate refresh since the device
             # takes a moment to reflect the state change
diff --git a/homeassistant/components/lifx/light.py b/homeassistant/components/lifx/light.py
index 22bcef4915e..5641786eb61 100644
--- a/homeassistant/components/lifx/light.py
+++ b/homeassistant/components/lifx/light.py
@@ -21,9 +21,8 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import entity_platform
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv, entity_platform
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.typing import VolDictType
 
@@ -80,7 +79,7 @@ HSBK_KELVIN = 3
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up LIFX from a config entry."""
     domain_data = hass.data[DOMAIN]
diff --git a/homeassistant/components/lifx/manager.py b/homeassistant/components/lifx/manager.py
index 16c39c25219..887bc3c3527 100644
--- a/homeassistant/components/lifx/manager.py
+++ b/homeassistant/components/lifx/manager.py
@@ -27,7 +27,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import ATTR_MODE
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.service import async_extract_referenced_entity_ids
 
 from .const import _ATTR_COLOR_TEMP, ATTR_THEME, DATA_LIFX_MANAGER, DOMAIN
diff --git a/homeassistant/components/lifx/manifest.json b/homeassistant/components/lifx/manifest.json
index 8d460c25322..18b9457ebf4 100644
--- a/homeassistant/components/lifx/manifest.json
+++ b/homeassistant/components/lifx/manifest.json
@@ -51,7 +51,7 @@
   "iot_class": "local_polling",
   "loggers": ["aiolifx", "aiolifx_effects", "bitstring"],
   "requirements": [
-    "aiolifx==1.1.2",
+    "aiolifx==1.1.4",
     "aiolifx-effects==0.3.2",
     "aiolifx-themes==0.6.4"
   ]
diff --git a/homeassistant/components/lifx/select.py b/homeassistant/components/lifx/select.py
index de3a5b431a9..13b81e2a784 100644
--- a/homeassistant/components/lifx/select.py
+++ b/homeassistant/components/lifx/select.py
@@ -8,7 +8,7 @@ from homeassistant.components.select import SelectEntity, SelectEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     ATTR_THEME,
@@ -38,7 +38,9 @@ THEME_ENTITY = SelectEntityDescription(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up LIFX from a config entry."""
     coordinator: LIFXUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/lifx/sensor.py b/homeassistant/components/lifx/sensor.py
index 68f354024e4..96feba633f4 100644
--- a/homeassistant/components/lifx/sensor.py
+++ b/homeassistant/components/lifx/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import ATTR_RSSI, DOMAIN
 from .coordinator import LIFXUpdateCoordinator
@@ -32,7 +32,9 @@ RSSI_SENSOR = SensorEntityDescription(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up LIFX sensor from config entry."""
     coordinator: LIFXUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/lifx/strings.json b/homeassistant/components/lifx/strings.json
index 39102d904d5..be0485c6dff 100644
--- a/homeassistant/components/lifx/strings.json
+++ b/homeassistant/components/lifx/strings.json
@@ -66,7 +66,7 @@
       }
     },
     "set_state": {
-      "name": "Set State",
+      "name": "Set state",
       "description": "Sets a color/brightness and possibly turn the light on/off.",
       "fields": {
         "infrared": {
@@ -201,7 +201,7 @@
     },
     "effect_morph": {
       "name": "Morph effect",
-      "description": "Starts the firmware-based Morph effect on LIFX Tiles on Candle.",
+      "description": "Starts the firmware-based Morph effect on LIFX Tiles or Candle.",
       "fields": {
         "speed": {
           "name": "Speed",
@@ -209,11 +209,11 @@
         },
         "palette": {
           "name": "Palette",
-          "description": "List of at least 2 and at most 16 colors as hue (0-360), saturation (0-100), brightness (0-100) and kelvin (1500-9000) values to use for this effect. Overrides the theme attribute."
+          "description": "List of at least 2 and at most 16 colors as hue (0-360), saturation (0-100), brightness (0-100) and Kelvin (1500-9000) values to use for this effect. Overrides the 'Theme' attribute."
         },
         "theme": {
           "name": "[%key:component::lifx::entity::select::theme::name%]",
-          "description": "Predefined color theme to use for the effect. Overridden by the palette attribute."
+          "description": "Predefined color theme to use for the effect. Overridden by the 'Palette' attribute."
         },
         "power_on": {
           "name": "Power on",
@@ -223,27 +223,27 @@
     },
     "effect_sky": {
       "name": "Sky effect",
-      "description": "Starts the firmware-based Sky effect on LIFX Ceiling.",
+      "description": "Starts a firmware-based effect on LIFX Ceiling lights that animates a sky scene across the device.",
       "fields": {
         "speed": {
           "name": "Speed",
-          "description": "How long the Sunrise and Sunset sky types will take to complete. For the Cloud sky type, it is the speed of the clouds across the device."
+          "description": "How long the Sunrise and Sunset sky types will take to complete. For the Clouds sky type, it is the speed of the clouds across the device."
         },
         "sky_type": {
           "name": "Sky type",
           "description": "The style of sky that will be animated by the effect."
         },
         "cloud_saturation_min": {
-          "name": "Cloud saturation Minimum",
-          "description": "Minimum cloud saturation."
+          "name": "Cloud saturation minimum",
+          "description": "The minimum cloud saturation for the Clouds sky type."
         },
         "cloud_saturation_max": {
-          "name": "Cloud Saturation maximum",
-          "description": "Maximum cloud saturation."
+          "name": "Cloud saturation maximum",
+          "description": "The maximum cloud saturation for the Clouds sky type."
         },
         "palette": {
           "name": "Palette",
-          "description": "List of 1 to 6 colors as hue (0-360), saturation (0-100), brightness (0-100) and kelvin (1500-9000) values to use for this effect."
+          "description": "List of 1 to 6 colors as hue (0-360), saturation (0-100), brightness (0-100) and Kelvin (1500-9000) values to use for this effect."
         },
         "power_on": {
           "name": "Power on",
@@ -256,16 +256,16 @@
       "description": "Stops a running effect."
     },
     "paint_theme": {
-      "name": "Paint Theme",
-      "description": "Paint either a provided theme or custom palette across one or more LIFX lights.",
+      "name": "Paint theme",
+      "description": "Paints either a provided theme or custom palette across one or more LIFX lights.",
       "fields": {
         "palette": {
           "name": "Palette",
-          "description": "List of at least 2 and at most 16 colors as hue (0-360), saturation (0-100), brightness (0-100) and kelvin (1500-9000) values to paint across the target lights. Overrides the theme attribute."
+          "description": "List of at least 2 and at most 16 colors as hue (0-360), saturation (0-100), brightness (0-100) and Kelvin (1500-9000) values to paint across the target lights. Overrides the 'Theme' attribute."
         },
         "theme": {
           "name": "[%key:component::lifx::entity::select::theme::name%]",
-          "description": "Predefined color theme to paint. Overridden by the palette attribute."
+          "description": "Predefined color theme to paint. Overridden by the 'Palette' attribute."
         },
         "transition": {
           "name": "Transition",
diff --git a/homeassistant/components/lifx/util.py b/homeassistant/components/lifx/util.py
index ffffe7a4856..8286622e6f3 100644
--- a/homeassistant/components/lifx/util.py
+++ b/homeassistant/components/lifx/util.py
@@ -24,7 +24,7 @@ from homeassistant.components.light import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
-import homeassistant.util.color as color_util
+from homeassistant.util import color as color_util
 
 from .const import (
     _ATTR_COLOR_TEMP,
@@ -113,7 +113,7 @@ def find_hsbk(hass: HomeAssistant, **kwargs: Any) -> list[float | int | None] |
         saturation = int(saturation / 100 * 65535)
         kelvin = 3500
 
-    if _ATTR_COLOR_TEMP in kwargs:
+    if ATTR_COLOR_TEMP_KELVIN not in kwargs and _ATTR_COLOR_TEMP in kwargs:
         # added in 2025.1, can be removed in 2026.1
         _LOGGER.warning(
             "The 'color_temp' parameter is deprecated. Please use 'color_temp_kelvin' for"
diff --git a/homeassistant/components/lifx_cloud/scene.py b/homeassistant/components/lifx_cloud/scene.py
index b40cb081ed7..f6ba01dbdae 100644
--- a/homeassistant/components/lifx_cloud/scene.py
+++ b/homeassistant/components/lifx_cloud/scene.py
@@ -14,8 +14,8 @@ import voluptuous as vol
 from homeassistant.components.scene import Scene
 from homeassistant.const import CONF_PLATFORM, CONF_TIMEOUT, CONF_TOKEN
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/light/__init__.py b/homeassistant/components/light/__init__.py
index 65a89b7d688..7b548533058 100644
--- a/homeassistant/components/light/__init__.py
+++ b/homeassistant/components/light/__init__.py
@@ -8,7 +8,7 @@ import dataclasses
 from functools import partial
 import logging
 import os
-from typing import Any, Final, Self, cast, final
+from typing import TYPE_CHECKING, Any, Final, Self, cast, final
 
 from propcache.api import cached_property
 import voluptuous as vol
@@ -35,7 +35,7 @@ from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.frame import ReportBehavior, report_usage
 from homeassistant.helpers.typing import ConfigType, VolDictType
 from homeassistant.loader import bind_hass
-import homeassistant.util.color as color_util
+from homeassistant.util import color as color_util
 
 from .const import (  # noqa: F401
     COLOR_MODES_BRIGHTNESS,
@@ -465,7 +465,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:  # noqa:
             ):
                 params.pop(_DEPRECATED_ATTR_COLOR_TEMP.value)
                 color_temp = params.pop(ATTR_COLOR_TEMP_KELVIN)
-                brightness = params.get(ATTR_BRIGHTNESS, light.brightness)
+                brightness = cast(int, params.get(ATTR_BRIGHTNESS, light.brightness))
                 params[ATTR_RGBWW_COLOR] = color_util.color_temperature_to_rgbww(
                     color_temp,
                     brightness,
@@ -528,6 +528,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:  # noqa:
         elif ATTR_RGB_COLOR in params and ColorMode.RGB not in supported_color_modes:
             rgb_color = params.pop(ATTR_RGB_COLOR)
             assert rgb_color is not None
+            if TYPE_CHECKING:
+                rgb_color = cast(tuple[int, int, int], rgb_color)
             if ColorMode.RGBW in supported_color_modes:
                 params[ATTR_RGBW_COLOR] = color_util.color_rgb_to_rgbw(*rgb_color)
             elif ColorMode.RGBWW in supported_color_modes:
@@ -601,6 +603,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:  # noqa:
         ):
             rgbww_color = params.pop(ATTR_RGBWW_COLOR)
             assert rgbww_color is not None
+            if TYPE_CHECKING:
+                rgbww_color = cast(tuple[int, int, int, int, int], rgbww_color)
             rgb_color = color_util.color_rgbww_to_rgb(
                 *rgbww_color, light.min_color_temp_kelvin, light.max_color_temp_kelvin
             )
diff --git a/homeassistant/components/light/intent.py b/homeassistant/components/light/intent.py
index e496255029a..250e1f5b2c1 100644
--- a/homeassistant/components/light/intent.py
+++ b/homeassistant/components/light/intent.py
@@ -9,7 +9,7 @@ import voluptuous as vol
 from homeassistant.const import SERVICE_TURN_ON
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, intent
-import homeassistant.util.color as color_util
+from homeassistant.util import color as color_util
 
 from . import ATTR_BRIGHTNESS_PCT, ATTR_COLOR_TEMP_KELVIN, ATTR_RGB_COLOR
 from .const import DOMAIN
@@ -28,13 +28,21 @@ async def async_setup_intents(hass: HomeAssistant) -> None:
             DOMAIN,
             SERVICE_TURN_ON,
             optional_slots={
-                ("color", ATTR_RGB_COLOR): color_util.color_name_to_rgb,
-                ("temperature", ATTR_COLOR_TEMP_KELVIN): cv.positive_int,
-                ("brightness", ATTR_BRIGHTNESS_PCT): vol.All(
-                    vol.Coerce(int), vol.Range(0, 100)
+                "color": intent.IntentSlotInfo(
+                    service_data_name=ATTR_RGB_COLOR,
+                    value_schema=color_util.color_name_to_rgb,
+                ),
+                "temperature": intent.IntentSlotInfo(
+                    service_data_name=ATTR_COLOR_TEMP_KELVIN,
+                    value_schema=cv.positive_int,
+                ),
+                "brightness": intent.IntentSlotInfo(
+                    service_data_name=ATTR_BRIGHTNESS_PCT,
+                    description="The brightness percentage of the light between 0 and 100, where 0 is off and 100 is fully lit",
+                    value_schema=vol.All(vol.Coerce(int), vol.Range(0, 100)),
                 ),
             },
-            description="Sets the brightness or color of a light",
+            description="Sets the brightness percentage or color of a light",
             platforms={DOMAIN},
         ),
     )
diff --git a/homeassistant/components/light/strings.json b/homeassistant/components/light/strings.json
index b874e48406e..c0f658c3a44 100644
--- a/homeassistant/components/light/strings.json
+++ b/homeassistant/components/light/strings.json
@@ -285,7 +285,7 @@
   "services": {
     "turn_on": {
       "name": "[%key:common::action::turn_on%]",
-      "description": "Turn on one or more lights and adjust properties of the light, even when they are turned on already.",
+      "description": "Turns on one or more lights and adjusts their properties, even when they are turned on already.",
       "fields": {
         "transition": {
           "name": "[%key:component::light::common::field_transition_name%]",
@@ -364,7 +364,7 @@
     },
     "turn_off": {
       "name": "[%key:common::action::turn_off%]",
-      "description": "Turn off one or more lights.",
+      "description": "Turns off one or more lights.",
       "fields": {
         "transition": {
           "name": "[%key:component::light::common::field_transition_name%]",
@@ -383,7 +383,7 @@
     },
     "toggle": {
       "name": "[%key:common::action::toggle%]",
-      "description": "Toggles one or more lights, from on to off, or, off to on, based on their current state.",
+      "description": "Toggles one or more lights, from on to off, or off to on, based on their current state.",
       "fields": {
         "transition": {
           "name": "[%key:component::light::common::field_transition_name%]",
diff --git a/homeassistant/components/lightwave/__init__.py b/homeassistant/components/lightwave/__init__.py
index 6c462b040d4..ef2a69c9f4f 100644
--- a/homeassistant/components/lightwave/__init__.py
+++ b/homeassistant/components/lightwave/__init__.py
@@ -13,7 +13,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/limitlessled/light.py b/homeassistant/components/limitlessled/light.py
index 4b2b75be9d7..22e2071b6a7 100644
--- a/homeassistant/components/limitlessled/light.py
+++ b/homeassistant/components/limitlessled/light.py
@@ -34,7 +34,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT, CONF_TYPE, STATE_ON
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/linak/__init__.py b/homeassistant/components/linak/__init__.py
new file mode 100644
index 00000000000..4e3c37807ba
--- /dev/null
+++ b/homeassistant/components/linak/__init__.py
@@ -0,0 +1 @@
+"""LINAK virtual integration."""
diff --git a/homeassistant/components/linak/manifest.json b/homeassistant/components/linak/manifest.json
new file mode 100644
index 00000000000..db1ddd67bda
--- /dev/null
+++ b/homeassistant/components/linak/manifest.json
@@ -0,0 +1,6 @@
+{
+  "domain": "linak",
+  "name": "LINAK",
+  "integration_type": "virtual",
+  "supported_by": "idasen_desk"
+}
diff --git a/homeassistant/components/linear_garage_door/__init__.py b/homeassistant/components/linear_garage_door/__init__.py
index 5d987a24b2a..c2a6c6a7ed1 100644
--- a/homeassistant/components/linear_garage_door/__init__.py
+++ b/homeassistant/components/linear_garage_door/__init__.py
@@ -5,6 +5,7 @@ from __future__ import annotations
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import issue_registry as ir
 
 from .const import DOMAIN
 from .coordinator import LinearUpdateCoordinator
@@ -15,7 +16,22 @@ PLATFORMS: list[Platform] = [Platform.COVER, Platform.LIGHT]
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Linear Garage Door from a config entry."""
 
-    coordinator = LinearUpdateCoordinator(hass)
+    ir.async_create_issue(
+        hass,
+        DOMAIN,
+        DOMAIN,
+        breaks_in_ha_version="2025.8.0",
+        is_fixable=False,
+        issue_domain=DOMAIN,
+        severity=ir.IssueSeverity.WARNING,
+        translation_key="deprecated_integration",
+        translation_placeholders={
+            "nice_go": "https://www.home-assistant.io/integrations/linear_garage_door",
+            "entries": "/config/integrations/integration/linear_garage_door",
+        },
+    )
+
+    coordinator = LinearUpdateCoordinator(hass, entry)
 
     await coordinator.async_config_entry_first_refresh()
 
@@ -31,3 +47,12 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         hass.data[DOMAIN].pop(entry.entry_id)
 
     return unload_ok
+
+
+async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Remove a config entry."""
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
+        ir.async_delete_issue(hass, DOMAIN, DOMAIN)
+        # Remove any remaining disabled or ignored entries
+        for _entry in hass.config_entries.async_entries(DOMAIN):
+            hass.async_create_task(hass.config_entries.async_remove(_entry.entry_id))
diff --git a/homeassistant/components/linear_garage_door/coordinator.py b/homeassistant/components/linear_garage_door/coordinator.py
index 35ccced3274..b55affe92e7 100644
--- a/homeassistant/components/linear_garage_door/coordinator.py
+++ b/homeassistant/components/linear_garage_door/coordinator.py
@@ -6,7 +6,7 @@ from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 from datetime import timedelta
 import logging
-from typing import Any
+from typing import Any, cast
 
 from linear_garage_door import Linear
 from linear_garage_door.errors import InvalidLoginError
@@ -34,15 +34,16 @@ class LinearUpdateCoordinator(DataUpdateCoordinator[dict[str, LinearDevice]]):
     _devices: list[dict[str, Any]] | None = None
     config_entry: ConfigEntry
 
-    def __init__(self, hass: HomeAssistant) -> None:
+    def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
         """Initialize DataUpdateCoordinator for Linear."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="Linear Garage Door",
             update_interval=timedelta(seconds=60),
         )
-        self.site_id = self.config_entry.data["site_id"]
+        self.site_id = config_entry.data["site_id"]
 
     async def _async_update_data(self) -> dict[str, LinearDevice]:
         """Get the data for Linear."""
@@ -56,7 +57,7 @@ class LinearUpdateCoordinator(DataUpdateCoordinator[dict[str, LinearDevice]]):
             for device in self._devices:
                 device_id = str(device["id"])
                 state = await linear.get_device_state(device_id)
-                data[device_id] = LinearDevice(device["name"], state)
+                data[device_id] = LinearDevice(cast(str, device["name"]), state)
             return data
 
         return await self.execute(update_data)
diff --git a/homeassistant/components/linear_garage_door/cover.py b/homeassistant/components/linear_garage_door/cover.py
index 1f7ae7ce114..7b0510f00d1 100644
--- a/homeassistant/components/linear_garage_door/cover.py
+++ b/homeassistant/components/linear_garage_door/cover.py
@@ -10,7 +10,7 @@ from homeassistant.components.cover import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import LinearUpdateCoordinator
@@ -24,7 +24,7 @@ SCAN_INTERVAL = timedelta(seconds=10)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Linear Garage Door cover."""
     coordinator: LinearUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/linear_garage_door/light.py b/homeassistant/components/linear_garage_door/light.py
index 3679491712f..ac03894d446 100644
--- a/homeassistant/components/linear_garage_door/light.py
+++ b/homeassistant/components/linear_garage_door/light.py
@@ -7,7 +7,7 @@ from linear_garage_door import Linear
 from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import LinearUpdateCoordinator
@@ -19,7 +19,7 @@ SUPPORTED_SUBDEVICES = ["Light"]
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Linear Garage Door cover."""
     coordinator: LinearUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/linear_garage_door/strings.json b/homeassistant/components/linear_garage_door/strings.json
index 23624b4acfd..40ffcf22e8d 100644
--- a/homeassistant/components/linear_garage_door/strings.json
+++ b/homeassistant/components/linear_garage_door/strings.json
@@ -23,5 +23,11 @@
         "name": "[%key:component::light::title%]"
       }
     }
+  },
+  "issues": {
+    "deprecated_integration": {
+      "title": "The Linear Garage Door integration will be removed",
+      "description": "The Linear Garage Door integration will be removed as it has been replaced by the [Nice G.O.]({nice_go}) integration. Please migrate to the new integration.\n\nTo resolve this issue, please remove all Linear Garage Door entries from your configuration and add the new Nice G.O. integration. [Click here to see your existing Linear Garage Door integration entries]({entries})."
+    }
   }
 }
diff --git a/homeassistant/components/linkedgo/__init__.py b/homeassistant/components/linkedgo/__init__.py
new file mode 100644
index 00000000000..e26fefa6b96
--- /dev/null
+++ b/homeassistant/components/linkedgo/__init__.py
@@ -0,0 +1 @@
+"""LinkedGo virtual integration."""
diff --git a/homeassistant/components/linkedgo/manifest.json b/homeassistant/components/linkedgo/manifest.json
new file mode 100644
index 00000000000..03c650cac08
--- /dev/null
+++ b/homeassistant/components/linkedgo/manifest.json
@@ -0,0 +1,6 @@
+{
+  "domain": "linkedgo",
+  "name": "LinkedGo",
+  "integration_type": "virtual",
+  "supported_by": "shelly"
+}
diff --git a/homeassistant/components/linkplay/button.py b/homeassistant/components/linkplay/button.py
index 1c93ebcdc3e..8865cf00aa5 100644
--- a/homeassistant/components/linkplay/button.py
+++ b/homeassistant/components/linkplay/button.py
@@ -16,7 +16,7 @@ from homeassistant.components.button import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import LinkPlayConfigEntry
 from .entity import LinkPlayBaseEntity, exception_wrap
@@ -50,7 +50,7 @@ BUTTON_TYPES: tuple[LinkPlayButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: LinkPlayConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the LinkPlay buttons from config entry."""
 
diff --git a/homeassistant/components/linkplay/entity.py b/homeassistant/components/linkplay/entity.py
index 74e067f5eb3..0bfb34af42c 100644
--- a/homeassistant/components/linkplay/entity.py
+++ b/homeassistant/components/linkplay/entity.py
@@ -4,13 +4,13 @@ from collections.abc import Callable, Coroutine
 from typing import Any, Concatenate
 
 from linkplay.bridge import LinkPlayBridge
+from linkplay.manufacturers import MANUFACTURER_GENERIC, get_info_from_project
 
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.entity import Entity
 
 from . import DOMAIN, LinkPlayRequestException
-from .utils import MANUFACTURER_GENERIC, get_info_from_project
 
 
 def exception_wrap[_LinkPlayEntityT: LinkPlayBaseEntity, **_P, _R](
diff --git a/homeassistant/components/linkplay/manifest.json b/homeassistant/components/linkplay/manifest.json
index ec9a8759a30..02acd0f04f4 100644
--- a/homeassistant/components/linkplay/manifest.json
+++ b/homeassistant/components/linkplay/manifest.json
@@ -7,6 +7,6 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["linkplay"],
-  "requirements": ["python-linkplay==0.1.3"],
+  "requirements": ["python-linkplay==0.2.2"],
   "zeroconf": ["_linkplay._tcp.local."]
 }
diff --git a/homeassistant/components/linkplay/media_player.py b/homeassistant/components/linkplay/media_player.py
index 456fbf23289..16b0d5f75f1 100644
--- a/homeassistant/components/linkplay/media_player.py
+++ b/homeassistant/components/linkplay/media_player.py
@@ -30,7 +30,7 @@ from homeassistant.helpers import (
     entity_platform,
     entity_registry as er,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.dt import utcnow
 
 from . import LinkPlayConfigEntry, LinkPlayData
@@ -86,16 +86,10 @@ REPEAT_MAP: dict[LoopMode, RepeatMode] = {
 
 REPEAT_MAP_INV: dict[RepeatMode, LoopMode] = {v: k for k, v in REPEAT_MAP.items()}
 
-EQUALIZER_MAP: dict[EqualizerMode, str] = {
-    EqualizerMode.NONE: "None",
-    EqualizerMode.CLASSIC: "Classic",
-    EqualizerMode.POP: "Pop",
-    EqualizerMode.JAZZ: "Jazz",
-    EqualizerMode.VOCAL: "Vocal",
+EQUALIZER_MAP_INV: dict[str, EqualizerMode] = {
+    mode.value: mode for mode in EqualizerMode
 }
 
-EQUALIZER_MAP_INV: dict[str, EqualizerMode] = {v: k for k, v in EQUALIZER_MAP.items()}
-
 DEFAULT_FEATURES: MediaPlayerEntityFeature = (
     MediaPlayerEntityFeature.PLAY
     | MediaPlayerEntityFeature.PLAY_MEDIA
@@ -125,11 +119,13 @@ SERVICE_PLAY_PRESET_SCHEMA = cv.make_entity_service_schema(
     }
 )
 
+RETRY_POLL_MAXIMUM = 3
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LinkPlayConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a media player from a config entry."""
 
@@ -146,7 +142,6 @@ async def async_setup_entry(
 class LinkPlayMediaPlayerEntity(LinkPlayBaseEntity, MediaPlayerEntity):
     """Representation of a LinkPlay media player."""
 
-    _attr_sound_mode_list = list(EQUALIZER_MAP.values())
     _attr_device_class = MediaPlayerDeviceClass.RECEIVER
     _attr_media_content_type = MediaType.MUSIC
     _attr_name = None
@@ -156,19 +151,26 @@ class LinkPlayMediaPlayerEntity(LinkPlayBaseEntity, MediaPlayerEntity):
 
         super().__init__(bridge)
         self._attr_unique_id = bridge.device.uuid
+        self._retry_count = 0
 
         self._attr_source_list = [
             SOURCE_MAP[playing_mode] for playing_mode in bridge.device.playmode_support
         ]
+        self._attr_sound_mode_list = [
+            mode.value for mode in bridge.player.available_equalizer_modes
+        ]
 
     @exception_wrap
     async def async_update(self) -> None:
         """Update the state of the media player."""
         try:
             await self._bridge.player.update_status()
+            self._retry_count = 0
             self._update_properties()
         except LinkPlayRequestException:
-            self._attr_available = False
+            self._retry_count += 1
+            if self._retry_count >= RETRY_POLL_MAXIMUM:
+                self._attr_available = False
 
     @exception_wrap
     async def async_select_source(self, source: str) -> None:
@@ -342,7 +344,7 @@ class LinkPlayMediaPlayerEntity(LinkPlayBaseEntity, MediaPlayerEntity):
         self._attr_is_volume_muted = self._bridge.player.muted
         self._attr_repeat = REPEAT_MAP[self._bridge.player.loop_mode]
         self._attr_shuffle = self._bridge.player.loop_mode == LoopMode.RANDOM_PLAYBACK
-        self._attr_sound_mode = EQUALIZER_MAP[self._bridge.player.equalizer_mode]
+        self._attr_sound_mode = self._bridge.player.equalizer_mode.value
         self._attr_supported_features = DEFAULT_FEATURES
 
         if self._bridge.player.status == PlayingStatus.PLAYING:
diff --git a/homeassistant/components/linkplay/strings.json b/homeassistant/components/linkplay/strings.json
index 31b4649e131..5d68754879c 100644
--- a/homeassistant/components/linkplay/strings.json
+++ b/homeassistant/components/linkplay/strings.json
@@ -11,7 +11,7 @@
         }
       },
       "discovery_confirm": {
-        "description": "Do you want to setup {name}?"
+        "description": "Do you want to set up {name}?"
       }
     },
     "abort": {
@@ -26,11 +26,11 @@
   "services": {
     "play_preset": {
       "name": "Play preset",
-      "description": "Play the preset number on the device.",
+      "description": "Plays a preset on the device.",
       "fields": {
         "preset_number": {
           "name": "Preset number",
-          "description": "The preset number on the device to play."
+          "description": "The number of the preset to play."
         }
       }
     }
@@ -44,7 +44,7 @@
   },
   "exceptions": {
     "invalid_grouping_entity": {
-      "message": "Entity with id {entity_id} can't be added to the LinkPlay multiroom. Is the entity a LinkPlay mediaplayer?"
+      "message": "Entity with ID {entity_id} can't be added to the LinkPlay multiroom. Is the entity a LinkPlay media player?"
     }
   }
 }
diff --git a/homeassistant/components/linkplay/utils.py b/homeassistant/components/linkplay/utils.py
index 00bb691362b..63d04a3afc4 100644
--- a/homeassistant/components/linkplay/utils.py
+++ b/homeassistant/components/linkplay/utils.py
@@ -1,7 +1,5 @@
 """Utilities for the LinkPlay component."""
 
-from typing import Final
-
 from aiohttp import ClientSession
 from linkplay.utils import async_create_unverified_client_session
 
@@ -10,72 +8,6 @@ from homeassistant.core import Event, HomeAssistant, callback
 
 from .const import DATA_SESSION, DOMAIN
 
-MANUFACTURER_ARTSOUND: Final[str] = "ArtSound"
-MANUFACTURER_ARYLIC: Final[str] = "Arylic"
-MANUFACTURER_IEAST: Final[str] = "iEAST"
-MANUFACTURER_WIIM: Final[str] = "WiiM"
-MANUFACTURER_GGMM: Final[str] = "GGMM"
-MANUFACTURER_MEDION: Final[str] = "Medion"
-MANUFACTURER_GENERIC: Final[str] = "Generic"
-MODELS_ARTSOUND_SMART_ZONE4: Final[str] = "Smart Zone 4 AMP"
-MODELS_ARTSOUND_SMART_HYDE: Final[str] = "Smart Hyde"
-MODELS_ARYLIC_S50: Final[str] = "S50+"
-MODELS_ARYLIC_S50_PRO: Final[str] = "S50 Pro"
-MODELS_ARYLIC_A30: Final[str] = "A30"
-MODELS_ARYLIC_A50: Final[str] = "A50"
-MODELS_ARYLIC_A50S: Final[str] = "A50+"
-MODELS_ARYLIC_UP2STREAM_AMP: Final[str] = "Up2Stream Amp 2.0"
-MODELS_ARYLIC_UP2STREAM_AMP_V3: Final[str] = "Up2Stream Amp v3"
-MODELS_ARYLIC_UP2STREAM_AMP_V4: Final[str] = "Up2Stream Amp v4"
-MODELS_ARYLIC_UP2STREAM_PRO: Final[str] = "Up2Stream Pro v1"
-MODELS_ARYLIC_UP2STREAM_PRO_V3: Final[str] = "Up2Stream Pro v3"
-MODELS_ARYLIC_UP2STREAM_PLATE_AMP: Final[str] = "Up2Stream Plate Amp"
-MODELS_IEAST_AUDIOCAST_M5: Final[str] = "AudioCast M5"
-MODELS_WIIM_AMP: Final[str] = "WiiM Amp"
-MODELS_WIIM_MINI: Final[str] = "WiiM Mini"
-MODELS_GGMM_GGMM_E2: Final[str] = "GGMM E2"
-MODELS_MEDION_MD_43970: Final[str] = "Life P66970 (MD 43970)"
-MODELS_GENERIC: Final[str] = "Generic"
-
-PROJECTID_LOOKUP: Final[dict[str, tuple[str, str]]] = {
-    "SMART_ZONE4_AMP": (MANUFACTURER_ARTSOUND, MODELS_ARTSOUND_SMART_ZONE4),
-    "SMART_HYDE": (MANUFACTURER_ARTSOUND, MODELS_ARTSOUND_SMART_HYDE),
-    "ARYLIC_S50": (MANUFACTURER_ARYLIC, MODELS_ARYLIC_S50),
-    "RP0016_S50PRO_S": (MANUFACTURER_ARYLIC, MODELS_ARYLIC_S50_PRO),
-    "RP0011_WB60_S": (MANUFACTURER_ARYLIC, MODELS_ARYLIC_A30),
-    "X-50": (MANUFACTURER_ARYLIC, MODELS_ARYLIC_A50),
-    "ARYLIC_A50S": (MANUFACTURER_ARYLIC, MODELS_ARYLIC_A50S),
-    "RP0011_WB60": (MANUFACTURER_ARYLIC, MODELS_ARYLIC_UP2STREAM_AMP),
-    "UP2STREAM_AMP_V3": (MANUFACTURER_ARYLIC, MODELS_ARYLIC_UP2STREAM_AMP_V3),
-    "UP2STREAM_AMP_V4": (MANUFACTURER_ARYLIC, MODELS_ARYLIC_UP2STREAM_AMP_V4),
-    "UP2STREAM_PRO_V3": (MANUFACTURER_ARYLIC, MODELS_ARYLIC_UP2STREAM_PRO_V3),
-    "ARYLIC_V20": (MANUFACTURER_ARYLIC, MODELS_ARYLIC_UP2STREAM_PLATE_AMP),
-    "UP2STREAM_MINI_V3": (MANUFACTURER_ARYLIC, MODELS_GENERIC),
-    "UP2STREAM_AMP_2P1": (MANUFACTURER_ARYLIC, MODELS_GENERIC),
-    "RP0014_A50C_S": (MANUFACTURER_ARYLIC, MODELS_GENERIC),
-    "ARYLIC_A30": (MANUFACTURER_ARYLIC, MODELS_GENERIC),
-    "ARYLIC_SUBWOOFER": (MANUFACTURER_ARYLIC, MODELS_GENERIC),
-    "ARYLIC_S50A": (MANUFACTURER_ARYLIC, MODELS_GENERIC),
-    "RP0010_D5_S": (MANUFACTURER_ARYLIC, MODELS_GENERIC),
-    "RP0001": (MANUFACTURER_ARYLIC, MODELS_GENERIC),
-    "RP0013_WA31S": (MANUFACTURER_ARYLIC, MODELS_GENERIC),
-    "RP0010_D5": (MANUFACTURER_ARYLIC, MODELS_GENERIC),
-    "RP0013_WA31S_S": (MANUFACTURER_ARYLIC, MODELS_GENERIC),
-    "RP0014_A50D_S": (MANUFACTURER_ARYLIC, MODELS_GENERIC),
-    "ARYLIC_A50TE": (MANUFACTURER_ARYLIC, MODELS_GENERIC),
-    "ARYLIC_A50N": (MANUFACTURER_ARYLIC, MODELS_GENERIC),
-    "iEAST-02": (MANUFACTURER_IEAST, MODELS_IEAST_AUDIOCAST_M5),
-    "WiiM_Amp_4layer": (MANUFACTURER_WIIM, MODELS_WIIM_AMP),
-    "Muzo_Mini": (MANUFACTURER_WIIM, MODELS_WIIM_MINI),
-    "GGMM_E2A": (MANUFACTURER_GGMM, MODELS_GGMM_GGMM_E2),
-    "A16": (MANUFACTURER_MEDION, MODELS_MEDION_MD_43970),
-}
-
-
-def get_info_from_project(project: str) -> tuple[str, str]:
-    """Get manufacturer and model info based on given project."""
-    return PROJECTID_LOOKUP.get(project, (MANUFACTURER_GENERIC, MODELS_GENERIC))
-
 
 async def async_get_client_session(hass: HomeAssistant) -> ClientSession:
     """Get a ClientSession that can be used with LinkPlay devices."""
diff --git a/homeassistant/components/linksys_smart/device_tracker.py b/homeassistant/components/linksys_smart/device_tracker.py
index 596b7012140..c3b0b666d50 100644
--- a/homeassistant/components/linksys_smart/device_tracker.py
+++ b/homeassistant/components/linksys_smart/device_tracker.py
@@ -15,7 +15,7 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 DEFAULT_TIMEOUT = 10
diff --git a/homeassistant/components/linode/__init__.py b/homeassistant/components/linode/__init__.py
index 80c082344e7..d59c849f8f0 100644
--- a/homeassistant/components/linode/__init__.py
+++ b/homeassistant/components/linode/__init__.py
@@ -8,7 +8,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_ACCESS_TOKEN, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import Throttle
 
diff --git a/homeassistant/components/linode/binary_sensor.py b/homeassistant/components/linode/binary_sensor.py
index d0c49c7171b..93bdef4a1f4 100644
--- a/homeassistant/components/linode/binary_sensor.py
+++ b/homeassistant/components/linode/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/linode/switch.py b/homeassistant/components/linode/switch.py
index abaf77648ef..74d2099a844 100644
--- a/homeassistant/components/linode/switch.py
+++ b/homeassistant/components/linode/switch.py
@@ -12,7 +12,7 @@ from homeassistant.components.switch import (
     SwitchEntity,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/linux_battery/sensor.py b/homeassistant/components/linux_battery/sensor.py
index 789195e1169..fffb6357a28 100644
--- a/homeassistant/components/linux_battery/sensor.py
+++ b/homeassistant/components/linux_battery/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import ATTR_NAME, ATTR_SERIAL_NUMBER, CONF_NAME, PERCENTAGE
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/linx/__init__.py b/homeassistant/components/linx/__init__.py
new file mode 100644
index 00000000000..3a0b14ce05f
--- /dev/null
+++ b/homeassistant/components/linx/__init__.py
@@ -0,0 +1 @@
+"""Virtual integration: Linx."""
diff --git a/homeassistant/components/linx/manifest.json b/homeassistant/components/linx/manifest.json
new file mode 100644
index 00000000000..fa96a2bbb55
--- /dev/null
+++ b/homeassistant/components/linx/manifest.json
@@ -0,0 +1,6 @@
+{
+  "domain": "linx",
+  "name": "Linx",
+  "integration_type": "virtual",
+  "supported_by": "motion_blinds"
+}
diff --git a/homeassistant/components/litejet/config_flow.py b/homeassistant/components/litejet/config_flow.py
index 9aa0b19c506..aeae8f52144 100644
--- a/homeassistant/components/litejet/config_flow.py
+++ b/homeassistant/components/litejet/config_flow.py
@@ -16,7 +16,7 @@ from homeassistant.config_entries import (
 )
 from homeassistant.const import CONF_PORT
 from homeassistant.core import callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import CONF_DEFAULT_TRANSITION, DOMAIN
 
diff --git a/homeassistant/components/litejet/light.py b/homeassistant/components/litejet/light.py
index f2b9af9adb4..95870927072 100644
--- a/homeassistant/components/litejet/light.py
+++ b/homeassistant/components/litejet/light.py
@@ -17,7 +17,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_DEFAULT_TRANSITION, DOMAIN
 
@@ -27,7 +27,7 @@ ATTR_NUMBER = "number"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry."""
 
diff --git a/homeassistant/components/litejet/scene.py b/homeassistant/components/litejet/scene.py
index 712e223aa3e..dd96b5accb6 100644
--- a/homeassistant/components/litejet/scene.py
+++ b/homeassistant/components/litejet/scene.py
@@ -10,7 +10,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 
@@ -22,7 +22,7 @@ ATTR_NUMBER = "number"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry."""
 
diff --git a/homeassistant/components/litejet/switch.py b/homeassistant/components/litejet/switch.py
index 28f751f3ec1..1b46ba360c3 100644
--- a/homeassistant/components/litejet/switch.py
+++ b/homeassistant/components/litejet/switch.py
@@ -9,7 +9,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 
@@ -19,7 +19,7 @@ ATTR_NUMBER = "number"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry."""
 
diff --git a/homeassistant/components/litejet/trigger.py b/homeassistant/components/litejet/trigger.py
index 2786cc8b76a..a35bf6fb65e 100644
--- a/homeassistant/components/litejet/trigger.py
+++ b/homeassistant/components/litejet/trigger.py
@@ -11,11 +11,11 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_PLATFORM
 from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import track_point_in_utc_time
 from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
 from homeassistant.helpers.typing import ConfigType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN
 
diff --git a/homeassistant/components/litterrobot/__init__.py b/homeassistant/components/litterrobot/__init__.py
index 76274f987cd..2823450d9ad 100644
--- a/homeassistant/components/litterrobot/__init__.py
+++ b/homeassistant/components/litterrobot/__init__.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from pylitterbot import FeederRobot, LitterRobot, LitterRobot3, LitterRobot4, Robot
+import itertools
 
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
@@ -11,29 +11,16 @@ from homeassistant.helpers.device_registry import DeviceEntry
 from .const import DOMAIN
 from .coordinator import LitterRobotConfigEntry, LitterRobotDataUpdateCoordinator
 
-PLATFORMS_BY_TYPE = {
-    Robot: (
-        Platform.BINARY_SENSOR,
-        Platform.SELECT,
-        Platform.SENSOR,
-        Platform.SWITCH,
-    ),
-    LitterRobot: (Platform.VACUUM,),
-    LitterRobot3: (Platform.BUTTON, Platform.TIME),
-    LitterRobot4: (Platform.UPDATE,),
-    FeederRobot: (Platform.BUTTON,),
-}
-
-
-def get_platforms_for_robots(robots: list[Robot]) -> set[Platform]:
-    """Get platforms for robots."""
-    return {
-        platform
-        for robot in robots
-        for robot_type, platforms in PLATFORMS_BY_TYPE.items()
-        if isinstance(robot, robot_type)
-        for platform in platforms
-    }
+PLATFORMS = [
+    Platform.BINARY_SENSOR,
+    Platform.BUTTON,
+    Platform.SELECT,
+    Platform.SENSOR,
+    Platform.SWITCH,
+    Platform.TIME,
+    Platform.UPDATE,
+    Platform.VACUUM,
+]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: LitterRobotConfigEntry) -> bool:
@@ -41,9 +28,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: LitterRobotConfigEntry)
     coordinator = LitterRobotDataUpdateCoordinator(hass, entry)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
-
-    if platforms := get_platforms_for_robots(coordinator.account.robots):
-        await hass.config_entries.async_forward_entry_setups(entry, platforms)
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
 
 
@@ -52,9 +37,7 @@ async def async_unload_entry(
 ) -> bool:
     """Unload a config entry."""
     await entry.runtime_data.account.disconnect()
-
-    platforms = get_platforms_for_robots(entry.runtime_data.account.robots)
-    return await hass.config_entries.async_unload_platforms(entry, platforms)
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
 async def async_remove_config_entry_device(
@@ -65,6 +48,9 @@ async def async_remove_config_entry_device(
         identifier
         for identifier in device_entry.identifiers
         if identifier[0] == DOMAIN
-        for robot in entry.runtime_data.account.robots
-        if robot.serial == identifier[1]
+        for _id in itertools.chain(
+            (robot.serial for robot in entry.runtime_data.account.robots),
+            (pet.id for pet in entry.runtime_data.account.pets),
+        )
+        if _id == identifier[1]
     )
diff --git a/homeassistant/components/litterrobot/binary_sensor.py b/homeassistant/components/litterrobot/binary_sensor.py
index e6cf23fa27c..ca9af22f1e9 100644
--- a/homeassistant/components/litterrobot/binary_sensor.py
+++ b/homeassistant/components/litterrobot/binary_sensor.py
@@ -15,19 +15,19 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import LitterRobotConfigEntry
-from .entity import LitterRobotEntity, _RobotT
+from .entity import LitterRobotEntity, _WhiskerEntityT
 
 
 @dataclass(frozen=True, kw_only=True)
 class RobotBinarySensorEntityDescription(
-    BinarySensorEntityDescription, Generic[_RobotT]
+    BinarySensorEntityDescription, Generic[_WhiskerEntityT]
 ):
     """A class that describes robot binary sensor entities."""
 
-    is_on_fn: Callable[[_RobotT], bool]
+    is_on_fn: Callable[[_WhiskerEntityT], bool]
 
 
 BINARY_SENSOR_MAP: dict[type[Robot], tuple[RobotBinarySensorEntityDescription, ...]] = {
@@ -63,7 +63,7 @@ BINARY_SENSOR_MAP: dict[type[Robot], tuple[RobotBinarySensorEntityDescription, .
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LitterRobotConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Litter-Robot binary sensors using config entry."""
     coordinator = entry.runtime_data
@@ -78,10 +78,12 @@ async def async_setup_entry(
     )
 
 
-class LitterRobotBinarySensorEntity(LitterRobotEntity[_RobotT], BinarySensorEntity):
+class LitterRobotBinarySensorEntity(
+    LitterRobotEntity[_WhiskerEntityT], BinarySensorEntity
+):
     """Litter-Robot binary sensor entity."""
 
-    entity_description: RobotBinarySensorEntityDescription[_RobotT]
+    entity_description: RobotBinarySensorEntityDescription[_WhiskerEntityT]
 
     @property
     def is_on(self) -> bool:
diff --git a/homeassistant/components/litterrobot/button.py b/homeassistant/components/litterrobot/button.py
index 01888e7fbae..da6ac53ccec 100644
--- a/homeassistant/components/litterrobot/button.py
+++ b/homeassistant/components/litterrobot/button.py
@@ -11,17 +11,17 @@ from pylitterbot import FeederRobot, LitterRobot3, LitterRobot4, Robot
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import LitterRobotConfigEntry
-from .entity import LitterRobotEntity, _RobotT
+from .entity import LitterRobotEntity, _WhiskerEntityT
 
 
 @dataclass(frozen=True, kw_only=True)
-class RobotButtonEntityDescription(ButtonEntityDescription, Generic[_RobotT]):
+class RobotButtonEntityDescription(ButtonEntityDescription, Generic[_WhiskerEntityT]):
     """A class that describes robot button entities."""
 
-    press_fn: Callable[[_RobotT], Coroutine[Any, Any, bool]]
+    press_fn: Callable[[_WhiskerEntityT], Coroutine[Any, Any, bool]]
 
 
 ROBOT_BUTTON_MAP: dict[type[Robot], RobotButtonEntityDescription] = {
@@ -48,7 +48,7 @@ ROBOT_BUTTON_MAP: dict[type[Robot], RobotButtonEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LitterRobotConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Litter-Robot cleaner using config entry."""
     coordinator = entry.runtime_data
@@ -62,10 +62,10 @@ async def async_setup_entry(
     )
 
 
-class LitterRobotButtonEntity(LitterRobotEntity[_RobotT], ButtonEntity):
+class LitterRobotButtonEntity(LitterRobotEntity[_WhiskerEntityT], ButtonEntity):
     """Litter-Robot button entity."""
 
-    entity_description: RobotButtonEntityDescription[_RobotT]
+    entity_description: RobotButtonEntityDescription[_WhiskerEntityT]
 
     async def async_press(self) -> None:
         """Press the button."""
diff --git a/homeassistant/components/litterrobot/coordinator.py b/homeassistant/components/litterrobot/coordinator.py
index a56a6607d32..c99d4794ff6 100644
--- a/homeassistant/components/litterrobot/coordinator.py
+++ b/homeassistant/components/litterrobot/coordinator.py
@@ -47,6 +47,7 @@ class LitterRobotDataUpdateCoordinator(DataUpdateCoordinator[None]):
     async def _async_update_data(self) -> None:
         """Update all device states from the Litter-Robot API."""
         await self.account.refresh_robots()
+        await self.account.load_pets()
 
     async def _async_setup(self) -> None:
         """Set up the coordinator."""
@@ -56,6 +57,7 @@ class LitterRobotDataUpdateCoordinator(DataUpdateCoordinator[None]):
                 password=self.config_entry.data[CONF_PASSWORD],
                 load_robots=True,
                 subscribe_for_updates=True,
+                load_pets=True,
             )
         except LitterRobotLoginException as ex:
             raise ConfigEntryAuthFailed("Invalid credentials") from ex
diff --git a/homeassistant/components/litterrobot/entity.py b/homeassistant/components/litterrobot/entity.py
index 36cbbb730ce..9e9cc8f0740 100644
--- a/homeassistant/components/litterrobot/entity.py
+++ b/homeassistant/components/litterrobot/entity.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import Generic, TypeVar
 
-from pylitterbot import Robot
+from pylitterbot import Pet, Robot
 from pylitterbot.robot import EVENT_UPDATE
 
 from homeassistant.helpers.device_registry import DeviceInfo
@@ -14,11 +14,31 @@ from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from .const import DOMAIN
 from .coordinator import LitterRobotDataUpdateCoordinator
 
-_RobotT = TypeVar("_RobotT", bound=Robot)
+_WhiskerEntityT = TypeVar("_WhiskerEntityT", bound=Robot | Pet)
+
+
+def get_device_info(whisker_entity: _WhiskerEntityT) -> DeviceInfo:
+    """Get device info for a robot or pet."""
+    if isinstance(whisker_entity, Robot):
+        return DeviceInfo(
+            identifiers={(DOMAIN, whisker_entity.serial)},
+            manufacturer="Whisker",
+            model=whisker_entity.model,
+            name=whisker_entity.name,
+            serial_number=whisker_entity.serial,
+            sw_version=getattr(whisker_entity, "firmware", None),
+        )
+    breed = ", ".join(breed for breed in whisker_entity.breeds or [])
+    return DeviceInfo(
+        identifiers={(DOMAIN, whisker_entity.id)},
+        manufacturer="Whisker",
+        model=f"{breed} {whisker_entity.pet_type}".strip().capitalize(),
+        name=whisker_entity.name,
+    )
 
 
 class LitterRobotEntity(
-    CoordinatorEntity[LitterRobotDataUpdateCoordinator], Generic[_RobotT]
+    CoordinatorEntity[LitterRobotDataUpdateCoordinator], Generic[_WhiskerEntityT]
 ):
     """Generic Litter-Robot entity representing common data and methods."""
 
@@ -26,7 +46,7 @@ class LitterRobotEntity(
 
     def __init__(
         self,
-        robot: _RobotT,
+        robot: _WhiskerEntityT,
         coordinator: LitterRobotDataUpdateCoordinator,
         description: EntityDescription,
     ) -> None:
@@ -34,15 +54,9 @@ class LitterRobotEntity(
         super().__init__(coordinator)
         self.robot = robot
         self.entity_description = description
-        self._attr_unique_id = f"{robot.serial}-{description.key}"
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, robot.serial)},
-            manufacturer="Whisker",
-            model=robot.model,
-            name=robot.name,
-            serial_number=robot.serial,
-            sw_version=getattr(robot, "firmware", None),
-        )
+        _id = robot.serial if isinstance(robot, Robot) else robot.id
+        self._attr_unique_id = f"{_id}-{description.key}"
+        self._attr_device_info = get_device_info(robot)
 
     async def async_added_to_hass(self) -> None:
         """Set up a listener for the entity."""
diff --git a/homeassistant/components/litterrobot/manifest.json b/homeassistant/components/litterrobot/manifest.json
index 4f1deb9a567..f7563296711 100644
--- a/homeassistant/components/litterrobot/manifest.json
+++ b/homeassistant/components/litterrobot/manifest.json
@@ -12,5 +12,6 @@
   "integration_type": "hub",
   "iot_class": "cloud_push",
   "loggers": ["pylitterbot"],
+  "quality_scale": "bronze",
   "requirements": ["pylitterbot==2024.0.0"]
 }
diff --git a/homeassistant/components/litterrobot/quality_scale.yaml b/homeassistant/components/litterrobot/quality_scale.yaml
index 3eae5d3e668..82f01f64d18 100644
--- a/homeassistant/components/litterrobot/quality_scale.yaml
+++ b/homeassistant/components/litterrobot/quality_scale.yaml
@@ -1,45 +1,20 @@
 rules:
-  # Adjust platform files for consistent flow:
-  #   [entity description classes]
-  #   [entity descriptions]
-  #   [async_setup_entry]
-  #   [entity classes])
-  # Remove RequiredKeyMixins and add kw_only to classes
-  # Wrap multiline lambdas in parenthesis
-  # Extend entity description in switch.py to use value_fn instead of getattr
-  # Deprecate extra state attributes in vacuum.py
   # Bronze
-  action-setup:
-    status: todo
-    comment: |
-      Action async_set_sleep_mode is currently setup in the vacuum platform
+  action-setup: done
   appropriate-polling:
     status: done
     comment: |
       Primarily relies on push data, but polls every 5 minutes for missed updates
   brands: done
-  common-modules:
-    status: todo
-    comment: |
-      hub.py should be renamed to coordinator.py and updated accordingly
-      Also should not need to return bool (never used)
-  config-flow-test-coverage:
-    status: todo
-    comment: |
-      Fix stale title and docstring
-      Make sure every test ends in either ABORT or CREATE_ENTRY
-      so we also test that the flow is able to recover
+  common-modules: done
+  config-flow-test-coverage: done
   config-flow: done
   dependency-transparency: done
-  docs-actions:
-    status: todo
-    comment: Can be finished after async_set_sleep_mode is moved to async_setup
+  docs-actions: done
   docs-high-level-description: done
-  docs-installation-instructions: todo
-  docs-removal-instructions: todo
-  entity-event-setup:
-    status: todo
-    comment: Do we need to subscribe to both the coordinator and robot itself?
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup: done
   entity-unique-id: done
   has-entity-name: done
   runtime-data: done
@@ -66,9 +41,7 @@ rules:
       Other fields can be moved to const.py. Consider snapshots and testing data updates
 
   # Gold
-  devices:
-    status: done
-    comment: Currently uses the device_info property, could be moved to _attr_device_info
+  devices: done
   diagnostics: todo
   discovery-update-info:
     status: done
@@ -86,16 +59,12 @@ rules:
   dynamic-devices: todo
   entity-category: done
   entity-device-class: done
-  entity-disabled-by-default:
-    status: todo
-    comment: Check if we should disable any entities by default
+  entity-disabled-by-default: done
   entity-translations:
     status: todo
     comment: Make sure all translated states are in sentence case
   exception-translations: todo
-  icon-translations:
-    status: todo
-    comment: BRIGHTNESS_LEVEL_ICON_MAP should be migrated to icons.json
+  icon-translations: done
   reconfiguration-flow: todo
   repair-issues:
     status: done
diff --git a/homeassistant/components/litterrobot/select.py b/homeassistant/components/litterrobot/select.py
index 1a3d2fc2fb4..be3a9915940 100644
--- a/homeassistant/components/litterrobot/select.py
+++ b/homeassistant/components/litterrobot/select.py
@@ -12,24 +12,24 @@ from pylitterbot.robot.litterrobot4 import BrightnessLevel
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.const import EntityCategory, UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import LitterRobotConfigEntry, LitterRobotDataUpdateCoordinator
-from .entity import LitterRobotEntity, _RobotT
+from .entity import LitterRobotEntity, _WhiskerEntityT
 
 _CastTypeT = TypeVar("_CastTypeT", int, float, str)
 
 
 @dataclass(frozen=True, kw_only=True)
 class RobotSelectEntityDescription(
-    SelectEntityDescription, Generic[_RobotT, _CastTypeT]
+    SelectEntityDescription, Generic[_WhiskerEntityT, _CastTypeT]
 ):
     """A class that describes robot select entities."""
 
     entity_category: EntityCategory = EntityCategory.CONFIG
-    current_fn: Callable[[_RobotT], _CastTypeT | None]
-    options_fn: Callable[[_RobotT], list[_CastTypeT]]
-    select_fn: Callable[[_RobotT, str], Coroutine[Any, Any, bool]]
+    current_fn: Callable[[_WhiskerEntityT], _CastTypeT | None]
+    options_fn: Callable[[_WhiskerEntityT], list[_CastTypeT]]
+    select_fn: Callable[[_WhiskerEntityT, str], Coroutine[Any, Any, bool]]
 
 
 ROBOT_SELECT_MAP: dict[type[Robot], RobotSelectEntityDescription] = {
@@ -68,7 +68,7 @@ ROBOT_SELECT_MAP: dict[type[Robot], RobotSelectEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LitterRobotConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Litter-Robot selects using config entry."""
     coordinator = entry.runtime_data
@@ -83,17 +83,19 @@ async def async_setup_entry(
 
 
 class LitterRobotSelectEntity(
-    LitterRobotEntity[_RobotT], SelectEntity, Generic[_RobotT, _CastTypeT]
+    LitterRobotEntity[_WhiskerEntityT],
+    SelectEntity,
+    Generic[_WhiskerEntityT, _CastTypeT],
 ):
     """Litter-Robot Select."""
 
-    entity_description: RobotSelectEntityDescription[_RobotT, _CastTypeT]
+    entity_description: RobotSelectEntityDescription[_WhiskerEntityT, _CastTypeT]
 
     def __init__(
         self,
-        robot: _RobotT,
+        robot: _WhiskerEntityT,
         coordinator: LitterRobotDataUpdateCoordinator,
-        description: RobotSelectEntityDescription[_RobotT, _CastTypeT],
+        description: RobotSelectEntityDescription[_WhiskerEntityT, _CastTypeT],
     ) -> None:
         """Initialize a Litter-Robot select entity."""
         super().__init__(robot, coordinator, description)
diff --git a/homeassistant/components/litterrobot/sensor.py b/homeassistant/components/litterrobot/sensor.py
index 6545d7c7ae7..a638f24cf2a 100644
--- a/homeassistant/components/litterrobot/sensor.py
+++ b/homeassistant/components/litterrobot/sensor.py
@@ -7,7 +7,7 @@ from dataclasses import dataclass
 from datetime import datetime
 from typing import Any, Generic
 
-from pylitterbot import FeederRobot, LitterRobot, LitterRobot4, Robot
+from pylitterbot import FeederRobot, LitterRobot, LitterRobot4, Pet, Robot
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -17,10 +17,10 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfMass
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import LitterRobotConfigEntry
-from .entity import LitterRobotEntity, _RobotT
+from .entity import LitterRobotEntity, _WhiskerEntityT
 
 
 def icon_for_gauge_level(gauge_level: int | None = None, offset: int = 0) -> str:
@@ -35,11 +35,11 @@ def icon_for_gauge_level(gauge_level: int | None = None, offset: int = 0) -> str
 
 
 @dataclass(frozen=True, kw_only=True)
-class RobotSensorEntityDescription(SensorEntityDescription, Generic[_RobotT]):
+class RobotSensorEntityDescription(SensorEntityDescription, Generic[_WhiskerEntityT]):
     """A class that describes robot sensor entities."""
 
     icon_fn: Callable[[Any], str | None] = lambda _: None
-    value_fn: Callable[[_RobotT], float | datetime | str | None]
+    value_fn: Callable[[_WhiskerEntityT], float | datetime | str | None]
 
 
 ROBOT_SENSOR_MAP: dict[type[Robot], list[RobotSensorEntityDescription]] = {
@@ -146,15 +146,25 @@ ROBOT_SENSOR_MAP: dict[type[Robot], list[RobotSensorEntityDescription]] = {
     ],
 }
 
+PET_SENSORS: list[RobotSensorEntityDescription] = [
+    RobotSensorEntityDescription[Pet](
+        key="weight",
+        device_class=SensorDeviceClass.WEIGHT,
+        native_unit_of_measurement=UnitOfMass.POUNDS,
+        state_class=SensorStateClass.MEASUREMENT,
+        value_fn=lambda pet: pet.weight,
+    )
+]
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LitterRobotConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Litter-Robot sensors using config entry."""
     coordinator = entry.runtime_data
-    async_add_entities(
+    entities: list[LitterRobotSensorEntity] = [
         LitterRobotSensorEntity(
             robot=robot, coordinator=coordinator, description=description
         )
@@ -162,13 +172,21 @@ async def async_setup_entry(
         for robot_type, entity_descriptions in ROBOT_SENSOR_MAP.items()
         if isinstance(robot, robot_type)
         for description in entity_descriptions
+    ]
+    entities.extend(
+        LitterRobotSensorEntity(
+            robot=pet, coordinator=coordinator, description=description
+        )
+        for pet in coordinator.account.pets
+        for description in PET_SENSORS
     )
+    async_add_entities(entities)
 
 
-class LitterRobotSensorEntity(LitterRobotEntity[_RobotT], SensorEntity):
+class LitterRobotSensorEntity(LitterRobotEntity[_WhiskerEntityT], SensorEntity):
     """Litter-Robot sensor entity."""
 
-    entity_description: RobotSensorEntityDescription[_RobotT]
+    entity_description: RobotSensorEntityDescription[_WhiskerEntityT]
 
     @property
     def native_value(self) -> float | datetime | str | None:
diff --git a/homeassistant/components/litterrobot/strings.json b/homeassistant/components/litterrobot/strings.json
index 19b007de068..052427f3032 100644
--- a/homeassistant/components/litterrobot/strings.json
+++ b/homeassistant/components/litterrobot/strings.json
@@ -77,31 +77,31 @@
       "status_code": {
         "name": "Status code",
         "state": {
-          "br": "Bonnet Removed",
-          "ccc": "Clean Cycle Complete",
-          "ccp": "Clean Cycle In Progress",
-          "cd": "Cat Detected",
-          "csf": "Cat Sensor Fault",
-          "csi": "Cat Sensor Interrupted",
-          "cst": "Cat Sensor Timing",
-          "df1": "Drawer Almost Full - 2 Cycles Left",
-          "df2": "Drawer Almost Full - 1 Cycle Left",
-          "dfs": "Drawer Full",
-          "dhf": "Dump + Home Position Fault",
-          "dpf": "Dump Position Fault",
-          "ec": "Empty Cycle",
-          "hpf": "Home Position Fault",
+          "br": "Bonnet removed",
+          "ccc": "Clean cycle complete",
+          "ccp": "Clean cycle in progress",
+          "cd": "Cat detected",
+          "csf": "Cat sensor fault",
+          "csi": "Cat sensor interrupted",
+          "cst": "Cat sensor timing",
+          "df1": "Drawer almost full - 2 cycles left",
+          "df2": "Drawer almost full - 1 cycle left",
+          "dfs": "Drawer full",
+          "dhf": "Dump + home position fault",
+          "dpf": "Dump position fault",
+          "ec": "Empty cycle",
+          "hpf": "Home position fault",
           "off": "[%key:common::state::off%]",
           "offline": "Offline",
-          "otf": "Over Torque Fault",
+          "otf": "Over torque fault",
           "p": "[%key:common::state::paused%]",
-          "pd": "Pinch Detect",
-          "pwrd": "Powering Down",
-          "pwru": "Powering Up",
+          "pd": "Pinch detect",
+          "pwrd": "Powering down",
+          "pwru": "Powering up",
           "rdy": "Ready",
-          "scf": "Cat Sensor Fault At Startup",
-          "sdf": "Drawer Full At Startup",
-          "spf": "Pinch Detect At Startup"
+          "scf": "Cat sensor fault at startup",
+          "sdf": "Drawer full at startup",
+          "spf": "Pinch detect at startup"
         }
       },
       "waste_drawer": {
diff --git a/homeassistant/components/litterrobot/switch.py b/homeassistant/components/litterrobot/switch.py
index 7ded89d552b..5924f8f094a 100644
--- a/homeassistant/components/litterrobot/switch.py
+++ b/homeassistant/components/litterrobot/switch.py
@@ -11,19 +11,19 @@ from pylitterbot import FeederRobot, LitterRobot
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import LitterRobotConfigEntry
-from .entity import LitterRobotEntity, _RobotT
+from .entity import LitterRobotEntity, _WhiskerEntityT
 
 
 @dataclass(frozen=True, kw_only=True)
-class RobotSwitchEntityDescription(SwitchEntityDescription, Generic[_RobotT]):
+class RobotSwitchEntityDescription(SwitchEntityDescription, Generic[_WhiskerEntityT]):
     """A class that describes robot switch entities."""
 
     entity_category: EntityCategory = EntityCategory.CONFIG
-    set_fn: Callable[[_RobotT, bool], Coroutine[Any, Any, bool]]
-    value_fn: Callable[[_RobotT], bool]
+    set_fn: Callable[[_WhiskerEntityT, bool], Coroutine[Any, Any, bool]]
+    value_fn: Callable[[_WhiskerEntityT], bool]
 
 
 ROBOT_SWITCHES = [
@@ -45,7 +45,7 @@ ROBOT_SWITCHES = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LitterRobotConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Litter-Robot switches using config entry."""
     coordinator = entry.runtime_data
@@ -57,10 +57,10 @@ async def async_setup_entry(
     )
 
 
-class RobotSwitchEntity(LitterRobotEntity[_RobotT], SwitchEntity):
+class RobotSwitchEntity(LitterRobotEntity[_WhiskerEntityT], SwitchEntity):
     """Litter-Robot switch entity."""
 
-    entity_description: RobotSwitchEntityDescription[_RobotT]
+    entity_description: RobotSwitchEntityDescription[_WhiskerEntityT]
 
     @property
     def is_on(self) -> bool | None:
diff --git a/homeassistant/components/litterrobot/time.py b/homeassistant/components/litterrobot/time.py
index 6e3743059b3..3573418613b 100644
--- a/homeassistant/components/litterrobot/time.py
+++ b/homeassistant/components/litterrobot/time.py
@@ -12,19 +12,19 @@ from pylitterbot import LitterRobot3
 from homeassistant.components.time import TimeEntity, TimeEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from .coordinator import LitterRobotConfigEntry
-from .entity import LitterRobotEntity, _RobotT
+from .entity import LitterRobotEntity, _WhiskerEntityT
 
 
 @dataclass(frozen=True, kw_only=True)
-class RobotTimeEntityDescription(TimeEntityDescription, Generic[_RobotT]):
+class RobotTimeEntityDescription(TimeEntityDescription, Generic[_WhiskerEntityT]):
     """A class that describes robot time entities."""
 
-    value_fn: Callable[[_RobotT], time | None]
-    set_fn: Callable[[_RobotT, time], Coroutine[Any, Any, bool]]
+    value_fn: Callable[[_WhiskerEntityT], time | None]
+    set_fn: Callable[[_WhiskerEntityT, time], Coroutine[Any, Any, bool]]
 
 
 def _as_local_time(start: datetime | None) -> time | None:
@@ -49,7 +49,7 @@ LITTER_ROBOT_3_SLEEP_START = RobotTimeEntityDescription[LitterRobot3](
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LitterRobotConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Litter-Robot cleaner using config entry."""
     coordinator = entry.runtime_data
@@ -64,10 +64,10 @@ async def async_setup_entry(
     )
 
 
-class LitterRobotTimeEntity(LitterRobotEntity[_RobotT], TimeEntity):
+class LitterRobotTimeEntity(LitterRobotEntity[_WhiskerEntityT], TimeEntity):
     """Litter-Robot time entity."""
 
-    entity_description: RobotTimeEntityDescription[_RobotT]
+    entity_description: RobotTimeEntityDescription[_WhiskerEntityT]
 
     @property
     def native_value(self) -> time | None:
diff --git a/homeassistant/components/litterrobot/update.py b/homeassistant/components/litterrobot/update.py
index 53ab23e9db8..4d9dfe5074d 100644
--- a/homeassistant/components/litterrobot/update.py
+++ b/homeassistant/components/litterrobot/update.py
@@ -15,7 +15,7 @@ from homeassistant.components.update import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import LitterRobotConfigEntry
 from .entity import LitterRobotEntity
@@ -31,7 +31,7 @@ FIRMWARE_UPDATE_ENTITY = UpdateEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LitterRobotConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Litter-Robot update platform."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/litterrobot/vacuum.py b/homeassistant/components/litterrobot/vacuum.py
index 2f9e2e9b24d..9989c306b51 100644
--- a/homeassistant/components/litterrobot/vacuum.py
+++ b/homeassistant/components/litterrobot/vacuum.py
@@ -17,8 +17,8 @@ from homeassistant.components.vacuum import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from .coordinator import LitterRobotConfigEntry
 from .entity import LitterRobotEntity
@@ -46,7 +46,7 @@ LITTER_BOX_ENTITY = StateVacuumEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: LitterRobotConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Litter-Robot cleaner using config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/livisi/binary_sensor.py b/homeassistant/components/livisi/binary_sensor.py
index d4edd59f2d7..50eb4cd28b9 100644
--- a/homeassistant/components/livisi/binary_sensor.py
+++ b/homeassistant/components/livisi/binary_sensor.py
@@ -11,7 +11,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, LIVISI_STATE_CHANGE, LOGGER, WDS_DEVICE_TYPE
 from .coordinator import LivisiDataUpdateCoordinator
@@ -21,7 +21,7 @@ from .entity import LivisiEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up binary_sensor device."""
     coordinator: LivisiDataUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/livisi/climate.py b/homeassistant/components/livisi/climate.py
index 3ecdcb486c0..1f5e3360c7d 100644
--- a/homeassistant/components/livisi/climate.py
+++ b/homeassistant/components/livisi/climate.py
@@ -16,7 +16,7 @@ from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     DOMAIN,
@@ -33,7 +33,7 @@ from .entity import LivisiEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up climate device."""
     coordinator: LivisiDataUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/livisi/coordinator.py b/homeassistant/components/livisi/coordinator.py
index b8b282c2829..6557416ed3a 100644
--- a/homeassistant/components/livisi/coordinator.py
+++ b/homeassistant/components/livisi/coordinator.py
@@ -39,10 +39,10 @@ class LivisiDataUpdateCoordinator(DataUpdateCoordinator[list[dict[str, Any]]]):
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name="Livisi devices",
             update_interval=timedelta(seconds=DEVICE_POLLING_DELAY),
         )
-        self.config_entry = config_entry
         self.hass = hass
         self.aiolivisi = aiolivisi
         self.websocket = Websocket(aiolivisi)
diff --git a/homeassistant/components/livisi/switch.py b/homeassistant/components/livisi/switch.py
index fa604c5fc87..5599a4af0d4 100644
--- a/homeassistant/components/livisi/switch.py
+++ b/homeassistant/components/livisi/switch.py
@@ -9,7 +9,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, LIVISI_STATE_CHANGE, LOGGER, SWITCH_DEVICE_TYPES
 from .coordinator import LivisiDataUpdateCoordinator
@@ -19,7 +19,7 @@ from .entity import LivisiEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switch device."""
     coordinator: LivisiDataUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/local_calendar/calendar.py b/homeassistant/components/local_calendar/calendar.py
index eb7b0c20d91..df6f994a46c 100644
--- a/homeassistant/components/local_calendar/calendar.py
+++ b/homeassistant/components/local_calendar/calendar.py
@@ -26,7 +26,7 @@ from homeassistant.components.calendar import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from .const import CONF_CALENDAR_NAME, DOMAIN
@@ -40,7 +40,7 @@ PRODID = "-//homeassistant.io//local_calendar 1.0//EN"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the local calendar platform."""
     store = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/local_calendar/manifest.json b/homeassistant/components/local_calendar/manifest.json
index 21a4134a8b6..fc6d0bc00c7 100644
--- a/homeassistant/components/local_calendar/manifest.json
+++ b/homeassistant/components/local_calendar/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/local_calendar",
   "iot_class": "local_polling",
   "loggers": ["ical"],
-  "requirements": ["ical==8.3.0"]
+  "requirements": ["ical==9.0.1"]
 }
diff --git a/homeassistant/components/local_file/camera.py b/homeassistant/components/local_file/camera.py
index db421bbce1d..8be0389678d 100644
--- a/homeassistant/components/local_file/camera.py
+++ b/homeassistant/components/local_file/camera.py
@@ -20,7 +20,10 @@ from homeassistant.helpers import (
     entity_platform,
     issue_registry as ir,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import slugify
 
@@ -40,7 +43,7 @@ PLATFORM_SCHEMA = CAMERA_PLATFORM_SCHEMA.extend(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Camera for local file from a config entry."""
 
diff --git a/homeassistant/components/local_ip/sensor.py b/homeassistant/components/local_ip/sensor.py
index 7f855220563..a4cb9f2d60e 100644
--- a/homeassistant/components/local_ip/sensor.py
+++ b/homeassistant/components/local_ip/sensor.py
@@ -5,7 +5,7 @@ from homeassistant.components.sensor import SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import SENSOR
 
@@ -13,7 +13,7 @@ from .const import SENSOR
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the platform from config_entry."""
     name = entry.data.get(CONF_NAME) or "Local IP"
diff --git a/homeassistant/components/local_todo/manifest.json b/homeassistant/components/local_todo/manifest.json
index 68154f10885..27d3ccce4a7 100644
--- a/homeassistant/components/local_todo/manifest.json
+++ b/homeassistant/components/local_todo/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/local_todo",
   "iot_class": "local_polling",
-  "requirements": ["ical==8.3.0"]
+  "requirements": ["ical==9.0.1"]
 }
diff --git a/homeassistant/components/local_todo/strings.json b/homeassistant/components/local_todo/strings.json
index 2403fae60a5..ebf7810494c 100644
--- a/homeassistant/components/local_todo/strings.json
+++ b/homeassistant/components/local_todo/strings.json
@@ -6,7 +6,8 @@
         "description": "Please choose a name for your new To-do list",
         "data": {
           "todo_list_name": "To-do list name"
-        }
+        },
+        "submit": "Create"
       }
     },
     "abort": {
diff --git a/homeassistant/components/local_todo/todo.py b/homeassistant/components/local_todo/todo.py
index c496fd6b6ba..30df24ea854 100644
--- a/homeassistant/components/local_todo/todo.py
+++ b/homeassistant/components/local_todo/todo.py
@@ -17,7 +17,7 @@ from homeassistant.components.todo import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.setup import SetupPhases, async_pause_setup
 from homeassistant.util import dt as dt_util
 
@@ -65,7 +65,7 @@ def _migrate_calendar(calendar: Calendar) -> bool:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: LocalTodoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the local_todo todo platform."""
 
diff --git a/homeassistant/components/locative/__init__.py b/homeassistant/components/locative/__init__.py
index ff2c2c4c3a3..4154f343f42 100644
--- a/homeassistant/components/locative/__init__.py
+++ b/homeassistant/components/locative/__init__.py
@@ -19,8 +19,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_entry_flow
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_entry_flow, config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/locative/device_tracker.py b/homeassistant/components/locative/device_tracker.py
index 47a498331eb..f7ae9039729 100644
--- a/homeassistant/components/locative/device_tracker.py
+++ b/homeassistant/components/locative/device_tracker.py
@@ -4,13 +4,15 @@ from homeassistant.components.device_tracker import TrackerEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN as LT_DOMAIN, TRACKER_UPDATE
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Configure a dispatcher connection based on a config entry."""
 
diff --git a/homeassistant/components/lock/__init__.py b/homeassistant/components/lock/__init__.py
index 60eb29240cd..05aed8a827f 100644
--- a/homeassistant/components/lock/__init__.py
+++ b/homeassistant/components/lock/__init__.py
@@ -29,7 +29,7 @@ from homeassistant.const import (  # noqa: F401
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ServiceValidationError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.deprecation import (
     all_with_deprecated_constants,
     check_if_deprecated_constant,
diff --git a/homeassistant/components/lock/device_action.py b/homeassistant/components/lock/device_action.py
index a75966414f8..a396849f049 100644
--- a/homeassistant/components/lock/device_action.py
+++ b/homeassistant/components/lock/device_action.py
@@ -16,8 +16,7 @@ from homeassistant.const import (
     SERVICE_UNLOCK,
 )
 from homeassistant.core import Context, HomeAssistant
-from homeassistant.helpers import entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.entity import get_supported_features
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
 
diff --git a/homeassistant/components/logbook/processor.py b/homeassistant/components/logbook/processor.py
index a53a604daae..1a139bb379e 100644
--- a/homeassistant/components/logbook/processor.py
+++ b/homeassistant/components/logbook/processor.py
@@ -36,7 +36,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, split_entity_id
 from homeassistant.helpers import entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.event_type import EventType
 
 from .const import (
diff --git a/homeassistant/components/logbook/rest_api.py b/homeassistant/components/logbook/rest_api.py
index c7ba196275b..e4a8e64cecf 100644
--- a/homeassistant/components/logbook/rest_api.py
+++ b/homeassistant/components/logbook/rest_api.py
@@ -17,7 +17,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import InvalidEntityFormatError
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .helpers import async_determine_event_types
 from .processor import EventProcessor
diff --git a/homeassistant/components/logbook/strings.json b/homeassistant/components/logbook/strings.json
index 27ad49b0e3a..5a38b57a9b7 100644
--- a/homeassistant/components/logbook/strings.json
+++ b/homeassistant/components/logbook/strings.json
@@ -7,7 +7,7 @@
       "fields": {
         "name": {
           "name": "[%key:common::config_flow::data::name%]",
-          "description": "Custom name for an entity, can be referenced using an `entity_id`."
+          "description": "Custom name for an entity, can be referenced using the 'Entity ID' field."
         },
         "message": {
           "name": "Message",
diff --git a/homeassistant/components/logbook/websocket_api.py b/homeassistant/components/logbook/websocket_api.py
index b295b845532..e3d0d8a29fa 100644
--- a/homeassistant/components/logbook/websocket_api.py
+++ b/homeassistant/components/logbook/websocket_api.py
@@ -17,8 +17,8 @@ from homeassistant.components.websocket_api import ActiveConnection, messages
 from homeassistant.core import CALLBACK_TYPE, Event, HomeAssistant, callback
 from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.helpers.json import json_bytes
+from homeassistant.util import dt as dt_util
 from homeassistant.util.async_ import create_eager_task
-import homeassistant.util.dt as dt_util
 
 from .const import DOMAIN
 from .helpers import (
diff --git a/homeassistant/components/logentries/__init__.py b/homeassistant/components/logentries/__init__.py
index 8ddf4a1a543..68d6af7e7dd 100644
--- a/homeassistant/components/logentries/__init__.py
+++ b/homeassistant/components/logentries/__init__.py
@@ -8,8 +8,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_TOKEN, EVENT_STATE_CHANGED
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import state as state_helper
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, state as state_helper
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/logger/__init__.py b/homeassistant/components/logger/__init__.py
index be6e8c1b24e..15283b246b2 100644
--- a/homeassistant/components/logger/__init__.py
+++ b/homeassistant/components/logger/__init__.py
@@ -9,7 +9,7 @@ import voluptuous as vol
 
 from homeassistant.const import EVENT_LOGGING_CHANGED  # noqa: F401
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from . import websocket_api
diff --git a/homeassistant/components/logger/helpers.py b/homeassistant/components/logger/helpers.py
index 034266428a3..00cea7e8aa5 100644
--- a/homeassistant/components/logger/helpers.py
+++ b/homeassistant/components/logger/helpers.py
@@ -203,7 +203,7 @@ class LoggerSettings:
         else:
             loggers = {domain}
 
-        combined_logs = {logger: LOGSEVERITY[settings.level] for logger in loggers}
+        combined_logs = dict.fromkeys(loggers, LOGSEVERITY[settings.level])
         # Don't override the log levels with the ones from YAML
         # since we want whatever the user is asking for to be honored.
 
diff --git a/homeassistant/components/london_air/sensor.py b/homeassistant/components/london_air/sensor.py
index 16dbfa5b871..a4d34fcb2d6 100644
--- a/homeassistant/components/london_air/sensor.py
+++ b/homeassistant/components/london_air/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
     SensorEntity,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
@@ -37,10 +37,12 @@ AUTHORITIES = [
     "Enfield",
     "Greenwich",
     "Hackney",
+    "Hammersmith and Fulham",
     "Haringey",
     "Harrow",
     "Havering",
     "Hillingdon",
+    "Hounslow",
     "Islington",
     "Kensington and Chelsea",
     "Kingston",
diff --git a/homeassistant/components/london_underground/sensor.py b/homeassistant/components/london_underground/sensor.py
index 015f7e8ecdc..645f8f48ae2 100644
--- a/homeassistant/components/london_underground/sensor.py
+++ b/homeassistant/components/london_underground/sensor.py
@@ -14,8 +14,8 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
diff --git a/homeassistant/components/lookin/__init__.py b/homeassistant/components/lookin/__init__.py
index a0e529bc189..247282309e4 100644
--- a/homeassistant/components/lookin/__init__.py
+++ b/homeassistant/components/lookin/__init__.py
@@ -19,7 +19,7 @@ from aiolookin import (
 )
 from aiolookin.models import UDPCommandType, UDPEvent
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
@@ -122,6 +122,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         coordinator_class = LookinDataUpdateCoordinator[MeteoSensor]
         meteo_coordinator = coordinator_class(
             hass,
+            entry,
             push_coordinator,
             name=entry.title,
             update_method=lookin_protocol.get_meteo_sensor,
@@ -140,6 +141,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             updater = _async_remote_updater(lookin_protocol, uuid)
         coordinator = LookinDataUpdateCoordinator(
             hass,
+            entry,
             push_coordinator,
             name=f"{entry.title} {uuid}",
             update_method=updater,
@@ -190,12 +192,7 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
         hass.data[DOMAIN].pop(entry.entry_id)
 
-    loaded_entries = [
-        entry
-        for entry in hass.config_entries.async_entries(DOMAIN)
-        if entry.state == ConfigEntryState.LOADED
-    ]
-    if len(loaded_entries) == 1:
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
         manager: LookinUDPManager = hass.data[DOMAIN][UDP_MANAGER]
         await manager.async_stop()
     return unload_ok
diff --git a/homeassistant/components/lookin/climate.py b/homeassistant/components/lookin/climate.py
index 051a18c9a32..9cef56bcf9f 100644
--- a/homeassistant/components/lookin/climate.py
+++ b/homeassistant/components/lookin/climate.py
@@ -28,7 +28,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, TYPE_TO_PLATFORM
 from .coordinator import LookinDataUpdateCoordinator
@@ -65,7 +65,7 @@ LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the climate platform for lookin from a config entry."""
     lookin_data: LookinData = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/lookin/coordinator.py b/homeassistant/components/lookin/coordinator.py
index d9834bd1d94..a74cd0e4861 100644
--- a/homeassistant/components/lookin/coordinator.py
+++ b/homeassistant/components/lookin/coordinator.py
@@ -7,6 +7,7 @@ from datetime import timedelta
 import logging
 import time
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -43,9 +44,12 @@ class LookinPushCoordinator:
 class LookinDataUpdateCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
     """DataUpdateCoordinator to gather data for a specific lookin devices."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         push_coordinator: LookinPushCoordinator,
         name: str,
         update_interval: timedelta | None = None,
@@ -56,6 +60,7 @@ class LookinDataUpdateCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=name,
             update_interval=update_interval,
             update_method=update_method,
diff --git a/homeassistant/components/lookin/light.py b/homeassistant/components/lookin/light.py
index 804d0ebef01..d46cb96d6c0 100644
--- a/homeassistant/components/lookin/light.py
+++ b/homeassistant/components/lookin/light.py
@@ -9,7 +9,7 @@ from homeassistant.components.light import ColorMode, LightEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, TYPE_TO_PLATFORM
 from .entity import LookinPowerPushRemoteEntity
@@ -21,7 +21,7 @@ LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the light platform for lookin from a config entry."""
     lookin_data: LookinData = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/lookin/media_player.py b/homeassistant/components/lookin/media_player.py
index b3dda9c9e0c..a3568d9f155 100644
--- a/homeassistant/components/lookin/media_player.py
+++ b/homeassistant/components/lookin/media_player.py
@@ -15,7 +15,7 @@ from homeassistant.components.media_player import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, TYPE_TO_PLATFORM
 from .coordinator import LookinDataUpdateCoordinator
@@ -44,7 +44,7 @@ _FUNCTION_NAME_TO_FEATURE = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the media_player platform for lookin from a config entry."""
     lookin_data: LookinData = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/lookin/sensor.py b/homeassistant/components/lookin/sensor.py
index cae4f7782a8..89e1ed6aa69 100644
--- a/homeassistant/components/lookin/sensor.py
+++ b/homeassistant/components/lookin/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import LookinDeviceCoordinatorEntity
@@ -43,7 +43,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up lookin sensors from the config entry."""
     lookin_data: LookinData = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/loqed/__init__.py b/homeassistant/components/loqed/__init__.py
index b6408880c96..b308e2c0f1d 100644
--- a/homeassistant/components/loqed/__init__.py
+++ b/homeassistant/components/loqed/__init__.py
@@ -44,7 +44,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         aiohttp.ClientError,
     ) as ex:
         raise ConfigEntryNotReady(f"Unable to connect to bridge at {host}") from ex
-    coordinator = LoqedDataCoordinator(hass, api, lock, entry)
+    coordinator = LoqedDataCoordinator(hass, entry, api, lock)
     await coordinator.ensure_webhooks()
 
     await coordinator.async_config_entry_first_refresh()
diff --git a/homeassistant/components/loqed/coordinator.py b/homeassistant/components/loqed/coordinator.py
index 1447934103e..7b60385a759 100644
--- a/homeassistant/components/loqed/coordinator.py
+++ b/homeassistant/components/loqed/coordinator.py
@@ -71,19 +71,20 @@ class StatusMessage(TypedDict):
 class LoqedDataCoordinator(DataUpdateCoordinator[StatusMessage]):
     """Data update coordinator for the loqed platform."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         api: loqed.LoqedAPI,
         lock: loqed.Lock,
-        entry: ConfigEntry,
     ) -> None:
         """Initialize the Loqed Data Update coordinator."""
-        super().__init__(hass, _LOGGER, name="Loqed sensors")
+        super().__init__(hass, _LOGGER, config_entry=config_entry, name="Loqed sensors")
         self._api = api
-        self._entry = entry
         self.lock = lock
-        self.device_name = self._entry.data[CONF_NAME]
+        self.device_name = config_entry.data[CONF_NAME]
 
     async def _async_update_data(self) -> StatusMessage:
         """Fetch data from API endpoint."""
@@ -110,17 +111,19 @@ class LoqedDataCoordinator(DataUpdateCoordinator[StatusMessage]):
 
     async def ensure_webhooks(self) -> None:
         """Register webhook on LOQED bridge."""
-        webhook_id = self._entry.data[CONF_WEBHOOK_ID]
+        webhook_id = self.config_entry.data[CONF_WEBHOOK_ID]
 
         webhook.async_register(
             self.hass, DOMAIN, "Loqed", webhook_id, self._handle_webhook
         )
 
         if cloud.async_active_subscription(self.hass):
-            webhook_url = await async_cloudhook_generate_url(self.hass, self._entry)
+            webhook_url = await async_cloudhook_generate_url(
+                self.hass, self.config_entry
+            )
         else:
             webhook_url = webhook.async_generate_url(
-                self.hass, self._entry.data[CONF_WEBHOOK_ID]
+                self.hass, self.config_entry.data[CONF_WEBHOOK_ID]
             )
 
         _LOGGER.debug("Webhook URL: %s", webhook_url)
@@ -140,10 +143,10 @@ class LoqedDataCoordinator(DataUpdateCoordinator[StatusMessage]):
 
     async def remove_webhooks(self) -> None:
         """Remove webhook from LOQED bridge."""
-        webhook_id = self._entry.data[CONF_WEBHOOK_ID]
+        webhook_id = self.config_entry.data[CONF_WEBHOOK_ID]
 
-        if CONF_CLOUDHOOK_URL in self._entry.data:
-            webhook_url = self._entry.data[CONF_CLOUDHOOK_URL]
+        if CONF_CLOUDHOOK_URL in self.config_entry.data:
+            webhook_url = self.config_entry.data[CONF_CLOUDHOOK_URL]
         else:
             webhook_url = webhook.async_generate_url(self.hass, webhook_id)
 
diff --git a/homeassistant/components/loqed/lock.py b/homeassistant/components/loqed/lock.py
index be6b39176d6..2064537df52 100644
--- a/homeassistant/components/loqed/lock.py
+++ b/homeassistant/components/loqed/lock.py
@@ -8,7 +8,7 @@ from typing import Any
 from homeassistant.components.lock import LockEntity, LockEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import LoqedDataCoordinator
 from .const import DOMAIN
@@ -20,7 +20,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Loqed lock platform."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/loqed/sensor.py b/homeassistant/components/loqed/sensor.py
index 1d4595db8e9..c28b55b4f98 100644
--- a/homeassistant/components/loqed/sensor.py
+++ b/homeassistant/components/loqed/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.const import (
     EntityCategory,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import LoqedDataCoordinator, StatusMessage
@@ -42,7 +42,9 @@ SENSORS: Final[tuple[SensorEntityDescription, ...]] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Loqed lock platform."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/lovelace/__init__.py b/homeassistant/components/lovelace/__init__.py
index 9b1c86edb36..4d8472da9a2 100644
--- a/homeassistant/components/lovelace/__init__.py
+++ b/homeassistant/components/lovelace/__init__.py
@@ -15,6 +15,7 @@ from homeassistant.const import CONF_FILENAME, CONF_MODE, CONF_RESOURCES
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import collection, config_validation as cv
+from homeassistant.helpers.frame import report_usage
 from homeassistant.helpers.service import async_register_admin_service
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import async_get_integration
@@ -99,6 +100,34 @@ class LovelaceData:
     resources: resources.ResourceYAMLCollection | resources.ResourceStorageCollection
     yaml_dashboards: dict[str | None, ConfigType]
 
+    def __getitem__(self, name: str) -> Any:
+        """Enable method for compatibility reason.
+
+        Following migration from an untyped dict to a dataclass in
+        https://github.com/home-assistant/core/pull/136313
+        """
+        report_usage(
+            f"accessed lovelace_data['{name}'] instead of lovelace_data.{name}",
+            breaks_in_ha_version="2026.2",
+            exclude_integrations={DOMAIN},
+        )
+        return getattr(self, name)
+
+    def get(self, name: str, default: Any = None) -> Any:
+        """Enable method for compatibility reason.
+
+        Following migration from an untyped dict to a dataclass in
+        https://github.com/home-assistant/core/pull/136313
+        """
+        report_usage(
+            f"accessed lovelace_data.get('{name}') instead of lovelace_data.{name}",
+            breaks_in_ha_version="2026.2",
+            exclude_integrations={DOMAIN},
+        )
+        if hasattr(self, name):
+            return getattr(self, name)
+        return default
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Lovelace commands."""
diff --git a/homeassistant/components/luci/device_tracker.py b/homeassistant/components/luci/device_tracker.py
index cf04cdb292a..0ce92538472 100644
--- a/homeassistant/components/luci/device_tracker.py
+++ b/homeassistant/components/luci/device_tracker.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     CONF_VERIFY_SSL,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/luftdaten/config_flow.py b/homeassistant/components/luftdaten/config_flow.py
index ba14afeb092..1ee444d5c84 100644
--- a/homeassistant/components/luftdaten/config_flow.py
+++ b/homeassistant/components/luftdaten/config_flow.py
@@ -11,7 +11,7 @@ import voluptuous as vol
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_SHOW_ON_MAP
 from homeassistant.core import callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import CONF_SENSOR_ID, DOMAIN
 
diff --git a/homeassistant/components/luftdaten/sensor.py b/homeassistant/components/luftdaten/sensor.py
index 8b9def63fda..2189386a4bb 100644
--- a/homeassistant/components/luftdaten/sensor.py
+++ b/homeassistant/components/luftdaten/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -72,7 +72,9 @@ SENSORS: tuple[SensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Sensor.Community sensor based on a config entry."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/lupusec/alarm_control_panel.py b/homeassistant/components/lupusec/alarm_control_panel.py
index 4b3d12ad743..03feabae0dc 100644
--- a/homeassistant/components/lupusec/alarm_control_panel.py
+++ b/homeassistant/components/lupusec/alarm_control_panel.py
@@ -14,7 +14,7 @@ from homeassistant.components.alarm_control_panel import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 from .entity import LupusecDevice
@@ -25,7 +25,7 @@ SCAN_INTERVAL = timedelta(seconds=2)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up an alarm control panel for a Lupusec device."""
     data = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/lupusec/binary_sensor.py b/homeassistant/components/lupusec/binary_sensor.py
index b2413e2b462..bcd21adc1aa 100644
--- a/homeassistant/components/lupusec/binary_sensor.py
+++ b/homeassistant/components/lupusec/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 from .entity import LupusecBaseSensor
@@ -27,7 +27,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a binary sensors for a Lupusec device."""
 
diff --git a/homeassistant/components/lupusec/entity.py b/homeassistant/components/lupusec/entity.py
index dc0dac89dc8..8cfb559b84f 100644
--- a/homeassistant/components/lupusec/entity.py
+++ b/homeassistant/components/lupusec/entity.py
@@ -18,7 +18,7 @@ class LupusecDevice(Entity):
         self._device = device
         self._attr_unique_id = device.device_id
 
-    def update(self):
+    def update(self) -> None:
         """Update automation state."""
         self._device.refresh()
 
diff --git a/homeassistant/components/lupusec/switch.py b/homeassistant/components/lupusec/switch.py
index 23f3c927880..a70df90f8e7 100644
--- a/homeassistant/components/lupusec/switch.py
+++ b/homeassistant/components/lupusec/switch.py
@@ -11,7 +11,7 @@ import lupupy.constants as CONST
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 from .entity import LupusecBaseSensor
@@ -22,7 +22,7 @@ SCAN_INTERVAL = timedelta(seconds=2)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Lupusec switch devices."""
 
diff --git a/homeassistant/components/lutron/binary_sensor.py b/homeassistant/components/lutron/binary_sensor.py
index c33b545413d..5bed760e1ac 100644
--- a/homeassistant/components/lutron/binary_sensor.py
+++ b/homeassistant/components/lutron/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN, LutronData
 from .entity import LutronDevice
@@ -25,7 +25,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Lutron binary_sensor platform.
 
diff --git a/homeassistant/components/lutron/config_flow.py b/homeassistant/components/lutron/config_flow.py
index 6a48e0d4b67..3f55a2b131b 100644
--- a/homeassistant/components/lutron/config_flow.py
+++ b/homeassistant/components/lutron/config_flow.py
@@ -9,10 +9,21 @@ from urllib.error import HTTPError
 from pylutron import Lutron
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.config_entries import (
+    ConfigEntry,
+    ConfigFlow,
+    ConfigFlowResult,
+    OptionsFlow,
+)
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
+from homeassistant.core import callback
+from homeassistant.helpers.selector import (
+    NumberSelector,
+    NumberSelectorConfig,
+    NumberSelectorMode,
+)
 
-from .const import DOMAIN
+from .const import CONF_DEFAULT_DIMMER_LEVEL, DEFAULT_DIMMER_LEVEL, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -68,3 +79,36 @@ class LutronConfigFlow(ConfigFlow, domain=DOMAIN):
             ),
             errors=errors,
         )
+
+    @staticmethod
+    @callback
+    def async_get_options_flow(
+        config_entry: ConfigEntry,
+    ) -> OptionsFlowHandler:
+        """Get the options flow for this handler."""
+        return OptionsFlowHandler()
+
+
+class OptionsFlowHandler(OptionsFlow):
+    """Handle option flow for lutron."""
+
+    async def async_step_init(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle options flow."""
+        if user_input is not None:
+            return self.async_create_entry(title="", data=user_input)
+
+        data_schema = vol.Schema(
+            {
+                vol.Required(
+                    CONF_DEFAULT_DIMMER_LEVEL,
+                    default=self.config_entry.options.get(
+                        CONF_DEFAULT_DIMMER_LEVEL, DEFAULT_DIMMER_LEVEL
+                    ),
+                ): NumberSelector(
+                    NumberSelectorConfig(min=1, max=255, mode=NumberSelectorMode.SLIDER)
+                )
+            }
+        )
+        return self.async_show_form(step_id="init", data_schema=data_schema)
diff --git a/homeassistant/components/lutron/const.py b/homeassistant/components/lutron/const.py
index 3862f7eb1d8..b69e35f38ba 100644
--- a/homeassistant/components/lutron/const.py
+++ b/homeassistant/components/lutron/const.py
@@ -1,3 +1,7 @@
 """Lutron constants."""
 
 DOMAIN = "lutron"
+
+CONF_DEFAULT_DIMMER_LEVEL = "default_dimmer_level"
+
+DEFAULT_DIMMER_LEVEL = 255 / 2
diff --git a/homeassistant/components/lutron/cover.py b/homeassistant/components/lutron/cover.py
index 2f80798aee4..e8f3ad09879 100644
--- a/homeassistant/components/lutron/cover.py
+++ b/homeassistant/components/lutron/cover.py
@@ -15,7 +15,7 @@ from homeassistant.components.cover import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN, LutronData
 from .entity import LutronDevice
@@ -26,7 +26,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Lutron cover platform.
 
diff --git a/homeassistant/components/lutron/event.py b/homeassistant/components/lutron/event.py
index 7b1b9e65137..942e165b97f 100644
--- a/homeassistant/components/lutron/event.py
+++ b/homeassistant/components/lutron/event.py
@@ -8,7 +8,7 @@ from homeassistant.components.event import EventEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_ID
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import slugify
 
 from . import ATTR_ACTION, ATTR_FULL_ID, ATTR_UUID, DOMAIN, LutronData
@@ -33,7 +33,7 @@ LEGACY_EVENT_TYPES: dict[LutronEventType, str] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Lutron event platform."""
     entry_data: LutronData = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/lutron/fan.py b/homeassistant/components/lutron/fan.py
index 7db8b12c8d0..5928c3c2da3 100644
--- a/homeassistant/components/lutron/fan.py
+++ b/homeassistant/components/lutron/fan.py
@@ -10,7 +10,7 @@ from pylutron import Output
 from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN, LutronData
 from .entity import LutronDevice
@@ -21,7 +21,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Lutron fan platform.
 
diff --git a/homeassistant/components/lutron/light.py b/homeassistant/components/lutron/light.py
index 7e8829b231c..a7489e13b7b 100644
--- a/homeassistant/components/lutron/light.py
+++ b/homeassistant/components/lutron/light.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from collections.abc import Mapping
 from typing import Any
 
-from pylutron import Output
+from pylutron import Lutron, LutronEntity, Output
 
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
@@ -17,16 +17,17 @@ from homeassistant.components.light import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN, LutronData
+from .const import CONF_DEFAULT_DIMMER_LEVEL, DEFAULT_DIMMER_LEVEL
 from .entity import LutronDevice
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Lutron light platform.
 
@@ -37,7 +38,7 @@ async def async_setup_entry(
 
     async_add_entities(
         (
-            LutronLight(area_name, device, entry_data.client)
+            LutronLight(area_name, device, entry_data.client, config_entry)
             for area_name, device in entry_data.lights
         ),
         True,
@@ -64,6 +65,17 @@ class LutronLight(LutronDevice, LightEntity):
     _prev_brightness: int | None = None
     _attr_name = None
 
+    def __init__(
+        self,
+        area_name: str,
+        lutron_device: LutronEntity,
+        controller: Lutron,
+        config_entry: ConfigEntry,
+    ) -> None:
+        """Initialize the device."""
+        super().__init__(area_name, lutron_device, controller)
+        self._config_entry = config_entry
+
     def turn_on(self, **kwargs: Any) -> None:
         """Turn the light on."""
         if flash := kwargs.get(ATTR_FLASH):
@@ -72,7 +84,9 @@ class LutronLight(LutronDevice, LightEntity):
             if ATTR_BRIGHTNESS in kwargs and self._lutron_device.is_dimmable:
                 brightness = kwargs[ATTR_BRIGHTNESS]
             elif self._prev_brightness == 0:
-                brightness = 255 / 2
+                brightness = self._config_entry.options.get(
+                    CONF_DEFAULT_DIMMER_LEVEL, DEFAULT_DIMMER_LEVEL
+                )
             else:
                 brightness = self._prev_brightness
             self._prev_brightness = brightness
diff --git a/homeassistant/components/lutron/scene.py b/homeassistant/components/lutron/scene.py
index 9e8070713a9..4889f9056ac 100644
--- a/homeassistant/components/lutron/scene.py
+++ b/homeassistant/components/lutron/scene.py
@@ -9,7 +9,7 @@ from pylutron import Button, Keypad, Lutron
 from homeassistant.components.scene import Scene
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN, LutronData
 from .entity import LutronKeypad
@@ -18,7 +18,7 @@ from .entity import LutronKeypad
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Lutron scene platform.
 
diff --git a/homeassistant/components/lutron/strings.json b/homeassistant/components/lutron/strings.json
index b73e0bd15ed..37db509e294 100644
--- a/homeassistant/components/lutron/strings.json
+++ b/homeassistant/components/lutron/strings.json
@@ -19,6 +19,15 @@
       }
     }
   },
+  "options": {
+    "step": {
+      "init": {
+        "data": {
+          "default_dimmer_level": "Default light level when first turning on a light from Home Assistant"
+        }
+      }
+    }
+  },
   "entity": {
     "event": {
       "button": {
diff --git a/homeassistant/components/lutron/switch.py b/homeassistant/components/lutron/switch.py
index c8b93dd7398..e1e97d1774a 100644
--- a/homeassistant/components/lutron/switch.py
+++ b/homeassistant/components/lutron/switch.py
@@ -10,7 +10,7 @@ from pylutron import Button, Keypad, Led, Lutron, Output
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN, LutronData
 from .entity import LutronDevice, LutronKeypad
@@ -19,7 +19,7 @@ from .entity import LutronDevice, LutronKeypad
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Lutron switch platform.
 
diff --git a/homeassistant/components/lutron_caseta/__init__.py b/homeassistant/components/lutron_caseta/__init__.py
index 26fc5ba153e..b489fe9dba7 100644
--- a/homeassistant/components/lutron_caseta/__init__.py
+++ b/homeassistant/components/lutron_caseta/__init__.py
@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import asyncio
-import contextlib
 from itertools import chain
 import logging
 import ssl
@@ -17,8 +16,11 @@ from homeassistant import config_entries
 from homeassistant.const import ATTR_DEVICE_ID, CONF_HOST, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr, entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    entity_registry as er,
+)
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.typing import ConfigType
 
@@ -34,11 +36,12 @@ from .const import (
     ATTR_SERIAL,
     ATTR_TYPE,
     BRIDGE_DEVICE_ID,
-    BRIDGE_TIMEOUT,
     CONF_CA_CERTS,
     CONF_CERTFILE,
     CONF_KEYFILE,
     CONF_SUBTYPE,
+    CONFIGURE_TIMEOUT,
+    CONNECT_TIMEOUT,
     DOMAIN,
     LUTRON_CASETA_BUTTON_EVENT,
     MANUFACTURER,
@@ -158,28 +161,40 @@ async def async_setup_entry(
     keyfile = hass.config.path(entry.data[CONF_KEYFILE])
     certfile = hass.config.path(entry.data[CONF_CERTFILE])
     ca_certs = hass.config.path(entry.data[CONF_CA_CERTS])
-    bridge = None
+    connected_future: asyncio.Future[None] = hass.loop.create_future()
+
+    def _on_connect() -> None:
+        nonlocal connected_future
+        if not connected_future.done():
+            connected_future.set_result(None)
 
     try:
         bridge = Smartbridge.create_tls(
-            hostname=host, keyfile=keyfile, certfile=certfile, ca_certs=ca_certs
+            hostname=host,
+            keyfile=keyfile,
+            certfile=certfile,
+            ca_certs=ca_certs,
+            on_connect_callback=_on_connect,
         )
     except ssl.SSLError:
         _LOGGER.error("Invalid certificate used to connect to bridge at %s", host)
         return False
 
-    timed_out = True
-    with contextlib.suppress(TimeoutError):
-        async with asyncio.timeout(BRIDGE_TIMEOUT):
-            await bridge.connect()
-            timed_out = False
+    connect_task = hass.async_create_task(bridge.connect())
+    for future, name, timeout in (
+        (connected_future, "connect", CONNECT_TIMEOUT),
+        (connect_task, "configure", CONFIGURE_TIMEOUT),
+    ):
+        try:
+            async with asyncio.timeout(timeout):
+                await future
+        except TimeoutError as ex:
+            connect_task.cancel()
+            await bridge.close()
+            raise ConfigEntryNotReady(f"Timed out on {name} for {host}") from ex
 
-    if timed_out or not bridge.is_connected():
-        await bridge.close()
-        if timed_out:
-            raise ConfigEntryNotReady(f"Timed out while trying to connect to {host}")
-        if not bridge.is_connected():
-            raise ConfigEntryNotReady(f"Cannot connect to {host}")
+    if not bridge.is_connected():
+        raise ConfigEntryNotReady(f"Connection failed to {host}")
 
     _LOGGER.debug("Connected to Lutron Caseta bridge via LEAP at %s", host)
     await _async_migrate_unique_ids(hass, entry)
diff --git a/homeassistant/components/lutron_caseta/binary_sensor.py b/homeassistant/components/lutron_caseta/binary_sensor.py
index b51756692c1..cb0f0da5227 100644
--- a/homeassistant/components/lutron_caseta/binary_sensor.py
+++ b/homeassistant/components/lutron_caseta/binary_sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.const import ATTR_SUGGESTED_AREA
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN as CASETA_DOMAIN
 from .const import CONFIG_URL, MANUFACTURER, UNASSIGNED_AREA
@@ -21,7 +21,7 @@ from .util import area_name_from_id
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: LutronCasetaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Lutron Caseta binary_sensor platform.
 
diff --git a/homeassistant/components/lutron_caseta/button.py b/homeassistant/components/lutron_caseta/button.py
index e56758b0af6..f2da502d346 100644
--- a/homeassistant/components/lutron_caseta/button.py
+++ b/homeassistant/components/lutron_caseta/button.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.button import ButtonEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .device_trigger import LEAP_TO_DEVICE_TYPE_SUBTYPE_MAP
 from .entity import LutronCasetaEntity
@@ -17,7 +17,7 @@ from .models import LutronCasetaConfigEntry, LutronCasetaData
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: LutronCasetaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Lutron pico and keypad buttons."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/lutron_caseta/config_flow.py b/homeassistant/components/lutron_caseta/config_flow.py
index 767c3d2f2b7..45e7a04bdc9 100644
--- a/homeassistant/components/lutron_caseta/config_flow.py
+++ b/homeassistant/components/lutron_caseta/config_flow.py
@@ -20,10 +20,11 @@ from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 from .const import (
     ABORT_REASON_CANNOT_CONNECT,
     BRIDGE_DEVICE_ID,
-    BRIDGE_TIMEOUT,
     CONF_CA_CERTS,
     CONF_CERTFILE,
     CONF_KEYFILE,
+    CONFIGURE_TIMEOUT,
+    CONNECT_TIMEOUT,
     DOMAIN,
     ERROR_CANNOT_CONNECT,
     STEP_IMPORT_FAILED,
@@ -232,7 +233,7 @@ class LutronCasetaFlowHandler(ConfigFlow, domain=DOMAIN):
             return None
 
         try:
-            async with asyncio.timeout(BRIDGE_TIMEOUT):
+            async with asyncio.timeout(CONNECT_TIMEOUT + CONFIGURE_TIMEOUT):
                 await bridge.connect()
         except TimeoutError:
             _LOGGER.error(
diff --git a/homeassistant/components/lutron_caseta/const.py b/homeassistant/components/lutron_caseta/const.py
index 809b9e8d007..26a83de6f4b 100644
--- a/homeassistant/components/lutron_caseta/const.py
+++ b/homeassistant/components/lutron_caseta/const.py
@@ -34,7 +34,8 @@ ACTION_RELEASE = "release"
 
 CONF_SUBTYPE = "subtype"
 
-BRIDGE_TIMEOUT = 35
+CONNECT_TIMEOUT = 9
+CONFIGURE_TIMEOUT = 50
 
 UNASSIGNED_AREA = "Unassigned"
 
diff --git a/homeassistant/components/lutron_caseta/cover.py b/homeassistant/components/lutron_caseta/cover.py
index d8fac38ce2b..e05fddb996f 100644
--- a/homeassistant/components/lutron_caseta/cover.py
+++ b/homeassistant/components/lutron_caseta/cover.py
@@ -11,7 +11,7 @@ from homeassistant.components.cover import (
     CoverEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import LutronCasetaUpdatableEntity
 from .models import LutronCasetaConfigEntry
@@ -108,13 +108,14 @@ PYLUTRON_TYPE_TO_CLASSES = {
     "QsWirelessHorizontalSheerBlind": LutronCasetaShade,
     "Shade": LutronCasetaShade,
     "PalladiomWireFreeShade": LutronCasetaShade,
+    "SerenaEssentialsRollerShade": LutronCasetaShade,
 }
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: LutronCasetaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Lutron Caseta cover platform.
 
diff --git a/homeassistant/components/lutron_caseta/device_trigger.py b/homeassistant/components/lutron_caseta/device_trigger.py
index 79b792935a8..31c9a0e171d 100644
--- a/homeassistant/components/lutron_caseta/device_trigger.py
+++ b/homeassistant/components/lutron_caseta/device_trigger.py
@@ -277,13 +277,14 @@ FOUR_GROUP_REMOTE_TRIGGER_SCHEMA = LUTRON_BUTTON_TRIGGER_SCHEMA.extend(
     }
 )
 
+# See mappings at https://github.com/home-assistant/core/issues/137548#issuecomment-2643440119
 PADDLE_SWITCH_PICO_BUTTON_TYPES_TO_LIP = {
-    "button_0": 2,
-    "button_2": 4,
+    "on": 2,  # 'Number': 2 in LIP
+    "off": 4,  # 'Number': 4 in LIP
 }
 PADDLE_SWITCH_PICO_BUTTON_TYPES_TO_LEAP = {
-    "button_0": 0,
-    "button_2": 2,
+    "on": 0,  # 'ButtonNumber': 0 in LEAP
+    "off": 2,  # 'ButtonNumber': 2 in LEAP
 }
 PADDLE_SWITCH_PICO_TRIGGER_SCHEMA = LUTRON_BUTTON_TRIGGER_SCHEMA.extend(
     {
diff --git a/homeassistant/components/lutron_caseta/entity.py b/homeassistant/components/lutron_caseta/entity.py
index f954be74f1d..5ab211ed87b 100644
--- a/homeassistant/components/lutron_caseta/entity.py
+++ b/homeassistant/components/lutron_caseta/entity.py
@@ -63,7 +63,7 @@ class LutronCasetaEntity(Entity):
             info[ATTR_SUGGESTED_AREA] = area
         self._attr_device_info = info
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Register callbacks."""
         self._smartbridge.add_subscriber(self.device_id, self.async_write_ha_state)
 
diff --git a/homeassistant/components/lutron_caseta/fan.py b/homeassistant/components/lutron_caseta/fan.py
index 69167929e14..1e7fe07b8ba 100644
--- a/homeassistant/components/lutron_caseta/fan.py
+++ b/homeassistant/components/lutron_caseta/fan.py
@@ -12,7 +12,7 @@ from homeassistant.components.fan import (
     FanEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     ordered_list_item_to_percentage,
     percentage_to_ordered_list_item,
@@ -28,7 +28,7 @@ ORDERED_NAMED_FAN_SPEEDS = [FAN_LOW, FAN_MEDIUM, FAN_MEDIUM_HIGH, FAN_HIGH]
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: LutronCasetaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Lutron Caseta fan platform.
 
diff --git a/homeassistant/components/lutron_caseta/light.py b/homeassistant/components/lutron_caseta/light.py
index 722c9a15d91..b920a95e435 100644
--- a/homeassistant/components/lutron_caseta/light.py
+++ b/homeassistant/components/lutron_caseta/light.py
@@ -22,7 +22,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     DEVICE_TYPE_COLOR_TUNE,
@@ -66,7 +66,7 @@ def to_hass_level(level):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Lutron Caseta light platform.
 
diff --git a/homeassistant/components/lutron_caseta/manifest.json b/homeassistant/components/lutron_caseta/manifest.json
index bbb6df41a89..96b00a1f392 100644
--- a/homeassistant/components/lutron_caseta/manifest.json
+++ b/homeassistant/components/lutron_caseta/manifest.json
@@ -9,7 +9,7 @@
   },
   "iot_class": "local_push",
   "loggers": ["pylutron_caseta"],
-  "requirements": ["pylutron-caseta==0.23.0"],
+  "requirements": ["pylutron-caseta==0.24.0"],
   "zeroconf": [
     {
       "type": "_lutron._tcp.local.",
diff --git a/homeassistant/components/lutron_caseta/scene.py b/homeassistant/components/lutron_caseta/scene.py
index db4423495a4..671df82d8e0 100644
--- a/homeassistant/components/lutron_caseta/scene.py
+++ b/homeassistant/components/lutron_caseta/scene.py
@@ -8,7 +8,7 @@ from homeassistant.components.scene import Scene
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN as CASETA_DOMAIN
 from .util import serial_to_unique_id
@@ -17,7 +17,7 @@ from .util import serial_to_unique_id
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Lutron Caseta scene platform.
 
diff --git a/homeassistant/components/lutron_caseta/switch.py b/homeassistant/components/lutron_caseta/switch.py
index 66f23926fbf..b71ccf4bfa8 100644
--- a/homeassistant/components/lutron_caseta/switch.py
+++ b/homeassistant/components/lutron_caseta/switch.py
@@ -5,7 +5,7 @@ from typing import Any
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN, SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import LutronCasetaUpdatableEntity
 
@@ -13,7 +13,7 @@ from .entity import LutronCasetaUpdatableEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Lutron Caseta switch platform.
 
diff --git a/homeassistant/components/lw12wifi/light.py b/homeassistant/components/lw12wifi/light.py
index 60741c861dd..7071cc9f416 100644
--- a/homeassistant/components/lw12wifi/light.py
+++ b/homeassistant/components/lw12wifi/light.py
@@ -20,10 +20,10 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.color as color_util
+from homeassistant.util import color as color_util
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/lyric/climate.py b/homeassistant/components/lyric/climate.py
index 87b5d566bb8..ffcf08b927a 100644
--- a/homeassistant/components/lyric/climate.py
+++ b/homeassistant/components/lyric/climate.py
@@ -34,9 +34,8 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import entity_platform
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv, entity_platform
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import VolDictType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -122,7 +121,9 @@ SCHEMA_HOLD_TIME: VolDictType = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Honeywell Lyric climate platform based on a config entry."""
     coordinator: DataUpdateCoordinator[Lyric] = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/lyric/sensor.py b/homeassistant/components/lyric/sensor.py
index 38cb895a110..065ee0fba9d 100644
--- a/homeassistant/components/lyric/sensor.py
+++ b/homeassistant/components/lyric/sensor.py
@@ -20,7 +20,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 from homeassistant.util import dt as dt_util
@@ -159,7 +159,9 @@ def get_datetime_from_future_time(time_str: str) -> datetime:
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Honeywell Lyric sensor platform based on a config entry."""
     coordinator: DataUpdateCoordinator[Lyric] = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/lyric/strings.json b/homeassistant/components/lyric/strings.json
index 83c65359643..bc48a791e70 100644
--- a/homeassistant/components/lyric/strings.json
+++ b/homeassistant/components/lyric/strings.json
@@ -53,12 +53,12 @@
   },
   "services": {
     "set_hold_time": {
-      "name": "Set Hold Time",
-      "description": "Sets the time to hold until.",
+      "name": "Set hold time",
+      "description": "Sets the time period to keep the temperature and override the schedule.",
       "fields": {
         "time_period": {
-          "name": "Time Period",
-          "description": "Time to hold until."
+          "name": "Time period",
+          "description": "Duration for which to override the schedule."
         }
       }
     }
diff --git a/homeassistant/components/madvr/__init__.py b/homeassistant/components/madvr/__init__.py
index bb42adb21fc..cf681bd0b65 100644
--- a/homeassistant/components/madvr/__init__.py
+++ b/homeassistant/components/madvr/__init__.py
@@ -6,17 +6,13 @@ import logging
 
 from madvr.madvr import Madvr
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PORT, EVENT_HOMEASSISTANT_STOP, Platform
 from homeassistant.core import Event, HomeAssistant
 
-from .coordinator import MadVRCoordinator
+from .coordinator import MadVRConfigEntry, MadVRCoordinator
 
 PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.REMOTE, Platform.SENSOR]
 
-
-type MadVRConfigEntry = ConfigEntry[MadVRCoordinator]
-
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -41,7 +37,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: MadVRConfigEntry) -> boo
         connect_timeout=10,
         loop=hass.loop,
     )
-    coordinator = MadVRCoordinator(hass, madVRClient)
+    coordinator = MadVRCoordinator(hass, entry, madVRClient)
 
     entry.runtime_data = coordinator
 
diff --git a/homeassistant/components/madvr/binary_sensor.py b/homeassistant/components/madvr/binary_sensor.py
index 6a31f9cdcda..45c915aba8c 100644
--- a/homeassistant/components/madvr/binary_sensor.py
+++ b/homeassistant/components/madvr/binary_sensor.py
@@ -10,10 +10,9 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import MadVRConfigEntry
-from .coordinator import MadVRCoordinator
+from .coordinator import MadVRConfigEntry, MadVRCoordinator
 from .entity import MadVREntity
 
 _HDR_FLAG = "hdr_flag"
@@ -56,7 +55,7 @@ BINARY_SENSORS: tuple[MadvrBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: MadVRConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the binary sensor entities."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/madvr/coordinator.py b/homeassistant/components/madvr/coordinator.py
index 4031ba127f7..c1ed87fbee7 100644
--- a/homeassistant/components/madvr/coordinator.py
+++ b/homeassistant/components/madvr/coordinator.py
@@ -3,10 +3,11 @@
 from __future__ import annotations
 
 import logging
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 from madvr.madvr import Madvr
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -14,8 +15,7 @@ from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
-if TYPE_CHECKING:
-    from . import MadVRConfigEntry
+type MadVRConfigEntry = ConfigEntry[MadVRCoordinator]
 
 
 class MadVRCoordinator(DataUpdateCoordinator[dict[str, Any]]):
@@ -26,10 +26,11 @@ class MadVRCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: MadVRConfigEntry,
         client: Madvr,
     ) -> None:
         """Initialize madvr coordinator."""
-        super().__init__(hass, _LOGGER, name=DOMAIN)
+        super().__init__(hass, _LOGGER, config_entry=config_entry, name=DOMAIN)
         assert self.config_entry.unique_id
         self.mac = self.config_entry.unique_id
         self.client = client
diff --git a/homeassistant/components/madvr/diagnostics.py b/homeassistant/components/madvr/diagnostics.py
index f6261d27305..39e17a13d6f 100644
--- a/homeassistant/components/madvr/diagnostics.py
+++ b/homeassistant/components/madvr/diagnostics.py
@@ -8,7 +8,7 @@ from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
 
-from . import MadVRConfigEntry
+from .coordinator import MadVRConfigEntry
 
 TO_REDACT = [CONF_HOST]
 
diff --git a/homeassistant/components/madvr/remote.py b/homeassistant/components/madvr/remote.py
index 4fe02b7ae47..23e969e56e3 100644
--- a/homeassistant/components/madvr/remote.py
+++ b/homeassistant/components/madvr/remote.py
@@ -8,10 +8,9 @@ from typing import Any
 
 from homeassistant.components.remote import RemoteEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import MadVRConfigEntry
-from .coordinator import MadVRCoordinator
+from .coordinator import MadVRConfigEntry, MadVRCoordinator
 from .entity import MadVREntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -20,7 +19,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: MadVRConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the madVR remote."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/madvr/sensor.py b/homeassistant/components/madvr/sensor.py
index 047b8bb83e6..783004f3b84 100644
--- a/homeassistant/components/madvr/sensor.py
+++ b/homeassistant/components/madvr/sensor.py
@@ -13,10 +13,9 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import MadVRConfigEntry
 from .const import (
     ASPECT_DEC,
     ASPECT_INT,
@@ -45,7 +44,7 @@ from .const import (
     TEMP_HDMI,
     TEMP_MAINBOARD,
 )
-from .coordinator import MadVRCoordinator
+from .coordinator import MadVRConfigEntry, MadVRCoordinator
 from .entity import MadVREntity
 
 
@@ -254,7 +253,7 @@ SENSORS: tuple[MadvrSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: MadVRConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor entities."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/madvr/strings.json b/homeassistant/components/madvr/strings.json
index 19f23afddaf..38b949ee5d6 100644
--- a/homeassistant/components/madvr/strings.json
+++ b/homeassistant/components/madvr/strings.json
@@ -3,7 +3,7 @@
     "step": {
       "user": {
         "title": "Set up madVR Envy",
-        "description": "Your device needs to be on in order to add the integation.",
+        "description": "Your device needs to be on in order to add the integration.",
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
           "port": "[%key:common::config_flow::data::port%]"
@@ -15,7 +15,7 @@
       },
       "reconfigure": {
         "title": "Reconfigure madVR Envy",
-        "description": "Your device needs to be on in order to reconfigure the integation.",
+        "description": "Your device needs to be on in order to reconfigure the integration.",
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
           "port": "[%key:common::config_flow::data::port%]"
diff --git a/homeassistant/components/mailgun/__init__.py b/homeassistant/components/mailgun/__init__.py
index 72617b2f42d..eb704a2d797 100644
--- a/homeassistant/components/mailgun/__init__.py
+++ b/homeassistant/components/mailgun/__init__.py
@@ -12,8 +12,7 @@ from homeassistant.components import webhook
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_DOMAIN, CONF_WEBHOOK_ID
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_entry_flow
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_entry_flow, config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
diff --git a/homeassistant/components/manual/alarm_control_panel.py b/homeassistant/components/manual/alarm_control_panel.py
index 244f38e0902..2b4d680208e 100644
--- a/homeassistant/components/manual/alarm_control_panel.py
+++ b/homeassistant/components/manual/alarm_control_panel.py
@@ -25,13 +25,13 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ServiceValidationError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_point_in_time
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 DOMAIN = "manual"
 
diff --git a/homeassistant/components/manual_mqtt/alarm_control_panel.py b/homeassistant/components/manual_mqtt/alarm_control_panel.py
index 768690e8ec5..cb03b71ce22 100644
--- a/homeassistant/components/manual_mqtt/alarm_control_panel.py
+++ b/homeassistant/components/manual_mqtt/alarm_control_panel.py
@@ -26,14 +26,14 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, EventStateChangedData, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import (
     async_track_point_in_time,
     async_track_state_change_event,
 )
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/marytts/tts.py b/homeassistant/components/marytts/tts.py
index 89832c01937..08d78ecf5c3 100644
--- a/homeassistant/components/marytts/tts.py
+++ b/homeassistant/components/marytts/tts.py
@@ -11,7 +11,7 @@ from homeassistant.components.tts import (
     Provider,
 )
 from homeassistant.const import CONF_EFFECT, CONF_HOST, CONF_PORT
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 CONF_VOICE = "voice"
 CONF_CODEC = "codec"
diff --git a/homeassistant/components/mastodon/__init__.py b/homeassistant/components/mastodon/__init__.py
index f7f974ffbb0..17b8614a2e9 100644
--- a/homeassistant/components/mastodon/__init__.py
+++ b/homeassistant/components/mastodon/__init__.py
@@ -2,11 +2,8 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass
+from mastodon.Mastodon import Account, Instance, InstanceV2, Mastodon, MastodonError
 
-from mastodon.Mastodon import Mastodon, MastodonError
-
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_ACCESS_TOKEN,
     CONF_CLIENT_ID,
@@ -16,27 +13,24 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import discovery
+from homeassistant.helpers import config_validation as cv, discovery
+from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import slugify
 
 from .const import CONF_BASE_URL, DOMAIN, LOGGER
-from .coordinator import MastodonCoordinator
+from .coordinator import MastodonConfigEntry, MastodonCoordinator, MastodonData
+from .services import setup_services
 from .utils import construct_mastodon_username, create_mastodon_client
 
 PLATFORMS: list[Platform] = [Platform.NOTIFY, Platform.SENSOR]
 
-
-@dataclass
-class MastodonData:
-    """Mastodon data type."""
-
-    client: Mastodon
-    instance: dict
-    account: dict
-    coordinator: MastodonCoordinator
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 
 
-type MastodonConfigEntry = ConfigEntry[MastodonData]
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the Mastodon component."""
+    setup_services(hass)
+    return True
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: MastodonConfigEntry) -> bool:
@@ -53,7 +47,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: MastodonConfigEntry) ->
 
     assert entry.unique_id
 
-    coordinator = MastodonCoordinator(hass, client)
+    coordinator = MastodonCoordinator(hass, entry, client)
 
     await coordinator.async_config_entry_first_refresh()
 
@@ -113,7 +107,9 @@ async def async_migrate_entry(hass: HomeAssistant, entry: MastodonConfigEntry) -
     return True
 
 
-def setup_mastodon(entry: MastodonConfigEntry) -> tuple[Mastodon, dict, dict]:
+def setup_mastodon(
+    entry: MastodonConfigEntry,
+) -> tuple[Mastodon, InstanceV2 | Instance, Account]:
     """Get mastodon details."""
     client = create_mastodon_client(
         entry.data[CONF_BASE_URL],
diff --git a/homeassistant/components/mastodon/config_flow.py b/homeassistant/components/mastodon/config_flow.py
index 1b93cbecd98..1ae1e6b229e 100644
--- a/homeassistant/components/mastodon/config_flow.py
+++ b/homeassistant/components/mastodon/config_flow.py
@@ -4,7 +4,12 @@ from __future__ import annotations
 
 from typing import Any
 
-from mastodon.Mastodon import MastodonNetworkError, MastodonUnauthorizedError
+from mastodon.Mastodon import (
+    Account,
+    Instance,
+    MastodonNetworkError,
+    MastodonUnauthorizedError,
+)
 import voluptuous as vol
 from yarl import URL
 
@@ -56,8 +61,8 @@ class MastodonConfigFlow(ConfigFlow, domain=DOMAIN):
         client_secret: str,
         access_token: str,
     ) -> tuple[
-        dict[str, str] | None,
-        dict[str, str] | None,
+        Instance | None,
+        Account | None,
         dict[str, str],
     ]:
         """Check connection to the Mastodon instance."""
diff --git a/homeassistant/components/mastodon/const.py b/homeassistant/components/mastodon/const.py
index e0593d15d2c..2efda329467 100644
--- a/homeassistant/components/mastodon/const.py
+++ b/homeassistant/components/mastodon/const.py
@@ -12,10 +12,10 @@ DATA_HASS_CONFIG = "mastodon_hass_config"
 DEFAULT_URL: Final = "https://mastodon.social"
 DEFAULT_NAME: Final = "Mastodon"
 
-INSTANCE_VERSION: Final = "version"
-INSTANCE_URI: Final = "uri"
-INSTANCE_DOMAIN: Final = "domain"
-ACCOUNT_USERNAME: Final = "username"
-ACCOUNT_FOLLOWERS_COUNT: Final = "followers_count"
-ACCOUNT_FOLLOWING_COUNT: Final = "following_count"
-ACCOUNT_STATUSES_COUNT: Final = "statuses_count"
+ATTR_CONFIG_ENTRY_ID = "config_entry_id"
+ATTR_STATUS = "status"
+ATTR_VISIBILITY = "visibility"
+ATTR_CONTENT_WARNING = "content_warning"
+ATTR_MEDIA_WARNING = "media_warning"
+ATTR_MEDIA = "media"
+ATTR_MEDIA_DESCRIPTION = "media_description"
diff --git a/homeassistant/components/mastodon/coordinator.py b/homeassistant/components/mastodon/coordinator.py
index f1332a0ea43..99785eca80b 100644
--- a/homeassistant/components/mastodon/coordinator.py
+++ b/homeassistant/components/mastodon/coordinator.py
@@ -2,31 +2,53 @@
 
 from __future__ import annotations
 
+from dataclasses import dataclass
 from datetime import timedelta
-from typing import Any
 
 from mastodon import Mastodon
-from mastodon.Mastodon import MastodonError
+from mastodon.Mastodon import Account, Instance, InstanceV2, MastodonError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import LOGGER
 
 
-class MastodonCoordinator(DataUpdateCoordinator[dict[str, Any]]):
+@dataclass
+class MastodonData:
+    """Mastodon data type."""
+
+    client: Mastodon
+    instance: InstanceV2 | Instance
+    account: Account
+    coordinator: MastodonCoordinator
+
+
+type MastodonConfigEntry = ConfigEntry[MastodonData]
+
+
+class MastodonCoordinator(DataUpdateCoordinator[Account]):
     """Class to manage fetching Mastodon data."""
 
-    def __init__(self, hass: HomeAssistant, client: Mastodon) -> None:
+    config_entry: MastodonConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: MastodonConfigEntry, client: Mastodon
+    ) -> None:
         """Initialize coordinator."""
         super().__init__(
-            hass, logger=LOGGER, name="Mastodon", update_interval=timedelta(hours=1)
+            hass,
+            logger=LOGGER,
+            config_entry=config_entry,
+            name="Mastodon",
+            update_interval=timedelta(hours=1),
         )
         self.client = client
 
-    async def _async_update_data(self) -> dict[str, Any]:
+    async def _async_update_data(self) -> Account:
         try:
-            account: dict = await self.hass.async_add_executor_job(
+            account: Account = await self.hass.async_add_executor_job(
                 self.client.account_verify_credentials
             )
         except MastodonError as ex:
diff --git a/homeassistant/components/mastodon/diagnostics.py b/homeassistant/components/mastodon/diagnostics.py
index 7246ae9cf63..31444413dfd 100644
--- a/homeassistant/components/mastodon/diagnostics.py
+++ b/homeassistant/components/mastodon/diagnostics.py
@@ -4,9 +4,11 @@ from __future__ import annotations
 
 from typing import Any
 
+from mastodon.Mastodon import Account, Instance
+
 from homeassistant.core import HomeAssistant
 
-from . import MastodonConfigEntry
+from .coordinator import MastodonConfigEntry
 
 
 async def async_get_config_entry_diagnostics(
@@ -25,7 +27,7 @@ async def async_get_config_entry_diagnostics(
     }
 
 
-def get_diagnostics(config_entry: MastodonConfigEntry) -> tuple[dict, dict]:
+def get_diagnostics(config_entry: MastodonConfigEntry) -> tuple[Instance, Account]:
     """Get mastodon diagnostics."""
     client = config_entry.runtime_data.client
 
diff --git a/homeassistant/components/mastodon/entity.py b/homeassistant/components/mastodon/entity.py
index 93d630627d7..60224e75e41 100644
--- a/homeassistant/components/mastodon/entity.py
+++ b/homeassistant/components/mastodon/entity.py
@@ -4,9 +4,8 @@ from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import MastodonConfigEntry
-from .const import DEFAULT_NAME, DOMAIN, INSTANCE_VERSION
-from .coordinator import MastodonCoordinator
+from .const import DEFAULT_NAME, DOMAIN
+from .coordinator import MastodonConfigEntry, MastodonCoordinator
 from .utils import construct_mastodon_username
 
 
@@ -41,7 +40,7 @@ class MastodonEntity(CoordinatorEntity[MastodonCoordinator]):
             manufacturer="Mastodon gGmbH",
             model=full_account_name,
             entry_type=DeviceEntryType.SERVICE,
-            sw_version=data.runtime_data.instance[INSTANCE_VERSION],
+            sw_version=data.runtime_data.instance.version,
             name=name,
         )
 
diff --git a/homeassistant/components/mastodon/icons.json b/homeassistant/components/mastodon/icons.json
index 082e27a64c2..e7272c2b6f8 100644
--- a/homeassistant/components/mastodon/icons.json
+++ b/homeassistant/components/mastodon/icons.json
@@ -11,5 +11,10 @@
         "default": "mdi:message-text"
       }
     }
+  },
+  "services": {
+    "post": {
+      "service": "mdi:message-text"
+    }
   }
 }
diff --git a/homeassistant/components/mastodon/manifest.json b/homeassistant/components/mastodon/manifest.json
index 20c506e7766..d7b21ad3a0c 100644
--- a/homeassistant/components/mastodon/manifest.json
+++ b/homeassistant/components/mastodon/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["mastodon"],
-  "requirements": ["Mastodon.py==1.8.1"]
+  "requirements": ["Mastodon.py==2.0.1"]
 }
diff --git a/homeassistant/components/mastodon/notify.py b/homeassistant/components/mastodon/notify.py
index dd76d44a02c..149ef1f6a48 100644
--- a/homeassistant/components/mastodon/notify.py
+++ b/homeassistant/components/mastodon/notify.py
@@ -2,11 +2,10 @@
 
 from __future__ import annotations
 
-import mimetypes
 from typing import Any, cast
 
 from mastodon import Mastodon
-from mastodon.Mastodon import MastodonAPIError
+from mastodon.Mastodon import MastodonAPIError, MediaAttachment
 import voluptuous as vol
 
 from homeassistant.components.notify import (
@@ -16,15 +15,21 @@ from homeassistant.components.notify import (
 )
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_CLIENT_ID, CONF_CLIENT_SECRET
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_validation as cv, issue_registry as ir
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from .const import CONF_BASE_URL, DEFAULT_URL, LOGGER
+from .const import (
+    ATTR_CONTENT_WARNING,
+    ATTR_MEDIA_WARNING,
+    CONF_BASE_URL,
+    DEFAULT_URL,
+    DOMAIN,
+)
+from .utils import get_media_type
 
 ATTR_MEDIA = "media"
 ATTR_TARGET = "target"
-ATTR_MEDIA_WARNING = "media_warning"
-ATTR_CONTENT_WARNING = "content_warning"
 
 PLATFORM_SCHEMA = NOTIFY_PLATFORM_SCHEMA.extend(
     {
@@ -47,7 +52,7 @@ async def async_get_service(
     if discovery_info is None:
         return None
 
-    client: Mastodon = discovery_info.get("client")
+    client = cast(Mastodon, discovery_info.get("client"))
 
     return MastodonNotificationService(hass, client)
 
@@ -67,6 +72,17 @@ class MastodonNotificationService(BaseNotificationService):
     def send_message(self, message: str = "", **kwargs: Any) -> None:
         """Toot a message, with media perhaps."""
 
+        ir.create_issue(
+            self.hass,
+            DOMAIN,
+            "deprecated_notify_action_mastodon",
+            breaks_in_ha_version="2025.9.0",
+            is_fixable=False,
+            issue_domain=DOMAIN,
+            severity=ir.IssueSeverity.WARNING,
+            translation_key="deprecated_notify_action",
+        )
+
         target = None
         if (target_list := kwargs.get(ATTR_TARGET)) is not None:
             target = cast(list[str], target_list)[0]
@@ -82,8 +98,11 @@ class MastodonNotificationService(BaseNotificationService):
             media = data.get(ATTR_MEDIA)
             if media:
                 if not self.hass.config.is_allowed_path(media):
-                    LOGGER.warning("'%s' is not a whitelisted directory", media)
-                    return
+                    raise HomeAssistantError(
+                        translation_domain=DOMAIN,
+                        translation_key="not_whitelisted_directory",
+                        translation_placeholders={"media": media},
+                    )
                 mediadata = self._upload_media(media)
 
             sensitive = data.get(ATTR_MEDIA_WARNING)
@@ -93,34 +112,41 @@ class MastodonNotificationService(BaseNotificationService):
             try:
                 self.client.status_post(
                     message,
-                    media_ids=mediadata["id"],
-                    sensitive=sensitive,
                     visibility=target,
                     spoiler_text=content_warning,
+                    media_ids=mediadata.id,
+                    sensitive=sensitive,
                 )
-            except MastodonAPIError:
-                LOGGER.error("Unable to send message")
+            except MastodonAPIError as err:
+                raise HomeAssistantError(
+                    translation_domain=DOMAIN,
+                    translation_key="unable_to_send_message",
+                ) from err
+
         else:
             try:
                 self.client.status_post(
                     message, visibility=target, spoiler_text=content_warning
                 )
-            except MastodonAPIError:
-                LOGGER.error("Unable to send message")
+            except MastodonAPIError as err:
+                raise HomeAssistantError(
+                    translation_domain=DOMAIN,
+                    translation_key="unable_to_send_message",
+                ) from err
 
-    def _upload_media(self, media_path: Any = None) -> Any:
+    def _upload_media(self, media_path: Any = None) -> MediaAttachment:
         """Upload media."""
         with open(media_path, "rb"):
-            media_type = self._media_type(media_path)
+            media_type = get_media_type(media_path)
         try:
-            mediadata = self.client.media_post(media_path, mime_type=media_type)
-        except MastodonAPIError:
-            LOGGER.error("Unable to upload image %s", media_path)
+            mediadata: MediaAttachment = self.client.media_post(
+                media_path, mime_type=media_type
+            )
+        except MastodonAPIError as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="unable_to_upload_image",
+                translation_placeholders={"media_path": media_path},
+            ) from err
 
         return mediadata
-
-    def _media_type(self, media_path: Any = None) -> Any:
-        """Get media Type."""
-        (media_type, _) = mimetypes.guess_type(media_path)
-
-        return media_type
diff --git a/homeassistant/components/mastodon/quality_scale.yaml b/homeassistant/components/mastodon/quality_scale.yaml
index 86702095e95..f07f7e0a8ad 100644
--- a/homeassistant/components/mastodon/quality_scale.yaml
+++ b/homeassistant/components/mastodon/quality_scale.yaml
@@ -29,7 +29,7 @@ rules:
   action-exceptions:
     status: todo
     comment: |
-      Legacy Notify needs rewriting once Notify architecture stabilizes.
+      Awaiting legacy Notify deprecation.
   config-entry-unloading: done
   docs-configuration-parameters:
     status: exempt
@@ -42,7 +42,7 @@ rules:
   parallel-updates:
     status: todo
     comment: |
-      Does not set parallel-updates on notify platform.
+      Awaiting legacy Notify deprecation.
   reauthentication-flow:
     status: todo
     comment: |
@@ -50,7 +50,7 @@ rules:
   test-coverage:
     status: todo
     comment: |
-      Legacy Notify needs rewriting once Notify architecture stabilizes.
+      Awaiting legacy Notify deprecation.
 
   # Gold
   devices: done
@@ -78,7 +78,7 @@ rules:
   entity-device-class: done
   entity-disabled-by-default: done
   entity-translations: done
-  exception-translations: todo
+  exception-translations: done
   icon-translations: done
   reconfiguration-flow:
     status: todo
@@ -93,7 +93,4 @@ rules:
   # Platinum
   async-dependency: todo
   inject-websession: todo
-  strict-typing:
-    status: todo
-    comment: |
-      Requirement 'Mastodon.py==1.8.1' appears untyped
+  strict-typing: done
diff --git a/homeassistant/components/mastodon/sensor.py b/homeassistant/components/mastodon/sensor.py
index 1bb59ad7c05..bfdc9c90333 100644
--- a/homeassistant/components/mastodon/sensor.py
+++ b/homeassistant/components/mastodon/sensor.py
@@ -4,7 +4,8 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Any
+
+from mastodon.Mastodon import Account
 
 from homeassistant.components.sensor import (
     SensorEntity,
@@ -12,15 +13,10 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import MastodonConfigEntry
-from .const import (
-    ACCOUNT_FOLLOWERS_COUNT,
-    ACCOUNT_FOLLOWING_COUNT,
-    ACCOUNT_STATUSES_COUNT,
-)
+from .coordinator import MastodonConfigEntry
 from .entity import MastodonEntity
 
 # Coordinator is used to centralize the data updates
@@ -31,7 +27,7 @@ PARALLEL_UPDATES = 0
 class MastodonSensorEntityDescription(SensorEntityDescription):
     """Describes Mastodon sensor entity."""
 
-    value_fn: Callable[[dict[str, Any]], StateType]
+    value_fn: Callable[[Account], StateType]
 
 
 ENTITY_DESCRIPTIONS = (
@@ -39,19 +35,19 @@ ENTITY_DESCRIPTIONS = (
         key="followers",
         translation_key="followers",
         state_class=SensorStateClass.TOTAL,
-        value_fn=lambda data: data.get(ACCOUNT_FOLLOWERS_COUNT),
+        value_fn=lambda data: data.followers_count,
     ),
     MastodonSensorEntityDescription(
         key="following",
         translation_key="following",
         state_class=SensorStateClass.TOTAL,
-        value_fn=lambda data: data.get(ACCOUNT_FOLLOWING_COUNT),
+        value_fn=lambda data: data.following_count,
     ),
     MastodonSensorEntityDescription(
         key="posts",
         translation_key="posts",
         state_class=SensorStateClass.TOTAL,
-        value_fn=lambda data: data.get(ACCOUNT_STATUSES_COUNT),
+        value_fn=lambda data: data.statuses_count,
     ),
 )
 
@@ -59,7 +55,7 @@ ENTITY_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: MastodonConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor platform for entity."""
     coordinator = entry.runtime_data.coordinator
diff --git a/homeassistant/components/mastodon/services.py b/homeassistant/components/mastodon/services.py
new file mode 100644
index 00000000000..68e95e726a1
--- /dev/null
+++ b/homeassistant/components/mastodon/services.py
@@ -0,0 +1,150 @@
+"""Define services for the Mastodon integration."""
+
+from enum import StrEnum
+from functools import partial
+from typing import Any, cast
+
+from mastodon import Mastodon
+from mastodon.Mastodon import MastodonAPIError, MediaAttachment
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant, ServiceCall, ServiceResponse
+from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
+
+from .const import (
+    ATTR_CONFIG_ENTRY_ID,
+    ATTR_CONTENT_WARNING,
+    ATTR_MEDIA,
+    ATTR_MEDIA_DESCRIPTION,
+    ATTR_MEDIA_WARNING,
+    ATTR_STATUS,
+    ATTR_VISIBILITY,
+    DOMAIN,
+)
+from .coordinator import MastodonConfigEntry
+from .utils import get_media_type
+
+
+class StatusVisibility(StrEnum):
+    """StatusVisibility model."""
+
+    PUBLIC = "public"
+    UNLISTED = "unlisted"
+    PRIVATE = "private"
+    DIRECT = "direct"
+
+
+SERVICE_POST = "post"
+SERVICE_POST_SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_CONFIG_ENTRY_ID): str,
+        vol.Required(ATTR_STATUS): str,
+        vol.Optional(ATTR_VISIBILITY): vol.In([x.lower() for x in StatusVisibility]),
+        vol.Optional(ATTR_CONTENT_WARNING): str,
+        vol.Optional(ATTR_MEDIA): str,
+        vol.Optional(ATTR_MEDIA_DESCRIPTION): str,
+        vol.Optional(ATTR_MEDIA_WARNING): bool,
+    }
+)
+
+
+def async_get_entry(hass: HomeAssistant, config_entry_id: str) -> MastodonConfigEntry:
+    """Get the Mastodon config entry."""
+    if not (entry := hass.config_entries.async_get_entry(config_entry_id)):
+        raise ServiceValidationError(
+            translation_domain=DOMAIN,
+            translation_key="integration_not_found",
+            translation_placeholders={"target": DOMAIN},
+        )
+    if entry.state is not ConfigEntryState.LOADED:
+        raise ServiceValidationError(
+            translation_domain=DOMAIN,
+            translation_key="not_loaded",
+            translation_placeholders={"target": entry.title},
+        )
+    return cast(MastodonConfigEntry, entry)
+
+
+def setup_services(hass: HomeAssistant) -> None:
+    """Set up the services for the Mastodon integration."""
+
+    async def async_post(call: ServiceCall) -> ServiceResponse:
+        """Post a status."""
+        entry = async_get_entry(hass, call.data[ATTR_CONFIG_ENTRY_ID])
+        client = entry.runtime_data.client
+
+        status = call.data[ATTR_STATUS]
+
+        visibility: str | None = (
+            StatusVisibility(call.data[ATTR_VISIBILITY])
+            if ATTR_VISIBILITY in call.data
+            else None
+        )
+        spoiler_text: str | None = call.data.get(ATTR_CONTENT_WARNING)
+        media_path: str | None = call.data.get(ATTR_MEDIA)
+        media_description: str | None = call.data.get(ATTR_MEDIA_DESCRIPTION)
+        media_warning: str | None = call.data.get(ATTR_MEDIA_WARNING)
+
+        await hass.async_add_executor_job(
+            partial(
+                _post,
+                client=client,
+                status=status,
+                visibility=visibility,
+                spoiler_text=spoiler_text,
+                media_path=media_path,
+                media_description=media_description,
+                sensitive=media_warning,
+            )
+        )
+
+        return None
+
+    def _post(client: Mastodon, **kwargs: Any) -> None:
+        """Post to Mastodon."""
+
+        media_data: MediaAttachment | None = None
+
+        media_path = kwargs.get("media_path")
+        if media_path:
+            if not hass.config.is_allowed_path(media_path):
+                raise HomeAssistantError(
+                    translation_domain=DOMAIN,
+                    translation_key="not_whitelisted_directory",
+                    translation_placeholders={"media": media_path},
+                )
+
+            media_type = get_media_type(media_path)
+            media_description = kwargs.get("media_description")
+            try:
+                media_data = client.media_post(
+                    media_file=media_path,
+                    mime_type=media_type,
+                    description=media_description,
+                )
+
+            except MastodonAPIError as err:
+                raise HomeAssistantError(
+                    translation_domain=DOMAIN,
+                    translation_key="unable_to_upload_image",
+                    translation_placeholders={"media_path": media_path},
+                ) from err
+
+        kwargs.pop("media_path", None)
+        kwargs.pop("media_description", None)
+
+        try:
+            media_ids: str | None = None
+            if media_data:
+                media_ids = media_data.id
+            client.status_post(media_ids=media_ids, **kwargs)
+        except MastodonAPIError as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="unable_to_send_message",
+            ) from err
+
+    hass.services.async_register(
+        DOMAIN, SERVICE_POST, async_post, schema=SERVICE_POST_SCHEMA
+    )
diff --git a/homeassistant/components/mastodon/services.yaml b/homeassistant/components/mastodon/services.yaml
new file mode 100644
index 00000000000..206dc36c1a2
--- /dev/null
+++ b/homeassistant/components/mastodon/services.yaml
@@ -0,0 +1,34 @@
+post:
+  fields:
+    config_entry_id:
+      required: true
+      selector:
+        config_entry:
+          integration: mastodon
+    status:
+      required: true
+      selector:
+        text:
+    visibility:
+      selector:
+        select:
+          options:
+            - public
+            - unlisted
+            - private
+            - direct
+          translation_key: post_visibility
+    content_warning:
+      selector:
+        text:
+    media:
+      selector:
+        text:
+    media_description:
+      required: false
+      selector:
+        text:
+    media_warning:
+      required: true
+      selector:
+        boolean:
diff --git a/homeassistant/components/mastodon/strings.json b/homeassistant/components/mastodon/strings.json
index 9df94ecf204..9e6cf6db6bf 100644
--- a/homeassistant/components/mastodon/strings.json
+++ b/homeassistant/components/mastodon/strings.json
@@ -22,7 +22,30 @@
     "error": {
       "unauthorized_error": "The credentials are incorrect.",
       "network_error": "The Mastodon instance was not found.",
-      "unknown": "Unknown error occured when connecting to the Mastodon instance."
+      "unknown": "Unknown error occurred when connecting to the Mastodon instance."
+    }
+  },
+  "exceptions": {
+    "not_loaded": {
+      "message": "{target} is not loaded."
+    },
+    "integration_not_found": {
+      "message": "Integration \"{target}\" not found in registry."
+    },
+    "unable_to_send_message": {
+      "message": "Unable to send message."
+    },
+    "unable_to_upload_image": {
+      "message": "Unable to upload image {media_path}."
+    },
+    "not_whitelisted_directory": {
+      "message": "{media} is not a whitelisted directory."
+    }
+  },
+  "issues": {
+    "deprecated_notify_action": {
+      "title": "Deprecated Notify action used for Mastodon",
+      "description": "The Notify action for Mastodon is deprecated.\n\nUse the `mastodon.post` action instead."
     }
   },
   "entity": {
@@ -40,5 +63,51 @@
         "unit_of_measurement": "posts"
       }
     }
+  },
+  "services": {
+    "post": {
+      "name": "Post",
+      "description": "Posts a status on your Mastodon account.",
+      "fields": {
+        "config_entry_id": {
+          "name": "Mastodon account",
+          "description": "Select the Mastodon account to post to."
+        },
+        "status": {
+          "name": "Status",
+          "description": "The status to post."
+        },
+        "visibility": {
+          "name": "Visibility",
+          "description": "The visibility of the post (default: account setting)."
+        },
+        "content_warning": {
+          "name": "Content warning",
+          "description": "A content warning will be shown before the status text is shown (default: no content warning)."
+        },
+        "media": {
+          "name": "Media",
+          "description": "Attach an image or video to the post."
+        },
+        "media_description": {
+          "name": "Media description",
+          "description": "If an image or video is attached, will add a description for this media for people with visual impairments."
+        },
+        "media_warning": {
+          "name": "Media warning",
+          "description": "If an image or video is attached, will mark the media as sensitive (default: no media warning)."
+        }
+      }
+    }
+  },
+  "selector": {
+    "post_visibility": {
+      "options": {
+        "public": "Public - Visible to everyone",
+        "unlisted": "Unlisted - Public but not shown in public timelines",
+        "private": "Private - Followers only",
+        "direct": "Direct - Mentioned accounts only"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/mastodon/utils.py b/homeassistant/components/mastodon/utils.py
index 8e1bd697027..898578c931b 100644
--- a/homeassistant/components/mastodon/utils.py
+++ b/homeassistant/components/mastodon/utils.py
@@ -2,9 +2,13 @@
 
 from __future__ import annotations
 
-from mastodon import Mastodon
+import mimetypes
+from typing import Any
 
-from .const import ACCOUNT_USERNAME, DEFAULT_NAME, INSTANCE_DOMAIN, INSTANCE_URI
+from mastodon import Mastodon
+from mastodon.Mastodon import Account, Instance, InstanceV2
+
+from .const import DEFAULT_NAME
 
 
 def create_mastodon_client(
@@ -20,13 +24,20 @@ def create_mastodon_client(
 
 
 def construct_mastodon_username(
-    instance: dict[str, str] | None, account: dict[str, str] | None
+    instance: InstanceV2 | Instance | None, account: Account | None
 ) -> str:
     """Construct a mastodon username from the account and instance."""
     if instance and account:
-        return (
-            f"@{account[ACCOUNT_USERNAME]}@"
-            f"{instance.get(INSTANCE_URI, instance.get(INSTANCE_DOMAIN))}"
-        )
+        if type(instance) is InstanceV2:
+            return f"@{account.username}@{instance.domain}"
+        return f"@{account.username}@{instance.uri}"
 
     return DEFAULT_NAME
+
+
+def get_media_type(media_path: Any = None) -> Any:
+    """Get media type."""
+
+    (media_type, _) = mimetypes.guess_type(media_path)
+
+    return media_type
diff --git a/homeassistant/components/matrix/__init__.py b/homeassistant/components/matrix/__init__.py
index e1b488c0fce..8640aa4d074 100644
--- a/homeassistant/components/matrix/__init__.py
+++ b/homeassistant/components/matrix/__init__.py
@@ -39,7 +39,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event as HassEvent, HomeAssistant, ServiceCall
 from homeassistant.exceptions import ConfigEntryAuthFailed, HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.json import save_json
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.json import JsonObjectType, load_json_object
diff --git a/homeassistant/components/matrix/notify.py b/homeassistant/components/matrix/notify.py
index b05c7952d1f..0fc08e6c5aa 100644
--- a/homeassistant/components/matrix/notify.py
+++ b/homeassistant/components/matrix/notify.py
@@ -14,7 +14,7 @@ from homeassistant.components.notify import (
     BaseNotificationService,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import RoomID
diff --git a/homeassistant/components/matter/binary_sensor.py b/homeassistant/components/matter/binary_sensor.py
index 6882078a712..b5665e5d47a 100644
--- a/homeassistant/components/matter/binary_sensor.py
+++ b/homeassistant/components/matter/binary_sensor.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
+from typing import TYPE_CHECKING, cast
 
 from chip.clusters import Objects as clusters
 from chip.clusters.Objects import uint
@@ -17,7 +18,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import MatterEntity, MatterEntityDescription
 from .helpers import get_matter
@@ -27,7 +28,7 @@ from .models import MatterDiscoverySchema
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Matter binary sensor from Config Entry."""
     matter = get_matter(hass)
@@ -55,6 +56,8 @@ class MatterBinarySensor(MatterEntity, BinarySensorEntity):
             value = None
         elif value_convert := self.entity_description.measurement_to_ha:
             value = value_convert(value)
+        if TYPE_CHECKING:
+            value = cast(bool | None, value)
         self._attr_is_on = value
 
 
diff --git a/homeassistant/components/matter/button.py b/homeassistant/components/matter/button.py
index 153124a4f7e..6a0a5fc5b1d 100644
--- a/homeassistant/components/matter/button.py
+++ b/homeassistant/components/matter/button.py
@@ -16,7 +16,7 @@ from homeassistant.components.button import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import MatterEntity, MatterEntityDescription
 from .helpers import get_matter
@@ -26,7 +26,7 @@ from .models import MatterDiscoverySchema
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Matter Button platform."""
     matter = get_matter(hass)
@@ -49,11 +49,7 @@ class MatterCommandButton(MatterEntity, ButtonEntity):
         """Handle the button press leveraging a Matter command."""
         if TYPE_CHECKING:
             assert self.entity_description.command is not None
-        await self.matter_client.send_device_command(
-            node_id=self._endpoint.node.node_id,
-            endpoint_id=self._endpoint.endpoint_id,
-            command=self.entity_description.command(),
-        )
+        await self.send_device_command(self.entity_description.command())
 
 
 # Discovery schema(s) to map Matter Attributes to HA entities
@@ -67,8 +63,8 @@ DISCOVERY_SCHEMAS = [
             command=lambda: clusters.Identify.Commands.Identify(identifyTime=15),
         ),
         entity_class=MatterCommandButton,
-        required_attributes=(clusters.Identify.Attributes.AcceptedCommandList,),
-        value_contains=clusters.Identify.Commands.Identify.command_id,
+        required_attributes=(clusters.Identify.Attributes.IdentifyType,),
+        value_is_not=clusters.Identify.Enums.IdentifyTypeEnum.kNone,
         allow_multi=True,
     ),
     MatterDiscoverySchema(
diff --git a/homeassistant/components/matter/climate.py b/homeassistant/components/matter/climate.py
index be6f024695d..df57da4ded3 100644
--- a/homeassistant/components/matter/climate.py
+++ b/homeassistant/components/matter/climate.py
@@ -24,7 +24,7 @@ from homeassistant.components.climate import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, Platform, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import MatterEntity
 from .helpers import get_matter
@@ -174,7 +174,7 @@ class ThermostatRunningState(IntEnum):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Matter climate platform from Config Entry."""
     matter = get_matter(hass)
@@ -212,57 +212,45 @@ class MatterClimate(MatterEntity, ClimateEntity):
                     matter_attribute = (
                         clusters.Thermostat.Attributes.OccupiedHeatingSetpoint
                     )
-                await self.matter_client.write_attribute(
-                    node_id=self._endpoint.node.node_id,
-                    attribute_path=create_attribute_path_from_attribute(
-                        self._endpoint.endpoint_id,
-                        matter_attribute,
-                    ),
+                await self.write_attribute(
                     value=int(target_temperature * TEMPERATURE_SCALING_FACTOR),
+                    matter_attribute=matter_attribute,
                 )
             return
 
         if target_temperature_low is not None:
             # multi setpoint control - low setpoint (heat)
             if self.target_temperature_low != target_temperature_low:
-                await self.matter_client.write_attribute(
-                    node_id=self._endpoint.node.node_id,
-                    attribute_path=create_attribute_path_from_attribute(
-                        self._endpoint.endpoint_id,
-                        clusters.Thermostat.Attributes.OccupiedHeatingSetpoint,
-                    ),
+                await self.write_attribute(
                     value=int(target_temperature_low * TEMPERATURE_SCALING_FACTOR),
+                    matter_attribute=clusters.Thermostat.Attributes.OccupiedHeatingSetpoint,
                 )
 
         if target_temperature_high is not None:
             # multi setpoint control - high setpoint (cool)
             if self.target_temperature_high != target_temperature_high:
-                await self.matter_client.write_attribute(
-                    node_id=self._endpoint.node.node_id,
-                    attribute_path=create_attribute_path_from_attribute(
-                        self._endpoint.endpoint_id,
-                        clusters.Thermostat.Attributes.OccupiedCoolingSetpoint,
-                    ),
+                await self.write_attribute(
                     value=int(target_temperature_high * TEMPERATURE_SCALING_FACTOR),
+                    matter_attribute=clusters.Thermostat.Attributes.OccupiedCoolingSetpoint,
                 )
 
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set new target hvac mode."""
-        system_mode_path = create_attribute_path_from_attribute(
-            endpoint_id=self._endpoint.endpoint_id,
-            attribute=clusters.Thermostat.Attributes.SystemMode,
-        )
+
         system_mode_value = HVAC_SYSTEM_MODE_MAP.get(hvac_mode)
         if system_mode_value is None:
             raise ValueError(f"Unsupported hvac mode {hvac_mode} in Matter")
-        await self.matter_client.write_attribute(
-            node_id=self._endpoint.node.node_id,
-            attribute_path=system_mode_path,
+        await self.write_attribute(
             value=system_mode_value,
+            matter_attribute=clusters.Thermostat.Attributes.SystemMode,
         )
         # we need to optimistically update the attribute's value here
         # to prevent a race condition when adjusting the mode and temperature
         # in the same call
+        system_mode_path = create_attribute_path_from_attribute(
+            endpoint_id=self._endpoint.endpoint_id,
+            attribute=clusters.Thermostat.Attributes.SystemMode,
+        )
         self._endpoint.set_attribute_value(system_mode_path, system_mode_value)
         self._update_from_device()
 
@@ -445,5 +433,6 @@ DISCOVERY_SCHEMAS = [
             clusters.OnOff.Attributes.OnOff,
         ),
         device_type=(device_types.Thermostat, device_types.RoomAirConditioner),
+        allow_multi=True,  # also used for sensor entity
     ),
 ]
diff --git a/homeassistant/components/matter/cover.py b/homeassistant/components/matter/cover.py
index ba9c3afbdee..2e2d4390b30 100644
--- a/homeassistant/components/matter/cover.py
+++ b/homeassistant/components/matter/cover.py
@@ -19,7 +19,7 @@ from homeassistant.components.cover import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import LOGGER
 from .entity import MatterEntity
@@ -48,7 +48,7 @@ class OperationalStatus(IntEnum):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Matter Cover from Config Entry."""
     matter = get_matter(hass)
@@ -102,14 +102,6 @@ class MatterCover(MatterEntity, CoverEntity):
             clusters.WindowCovering.Commands.GoToTiltPercentage((100 - position) * 100)
         )
 
-    async def send_device_command(self, command: Any) -> None:
-        """Send device command."""
-        await self.matter_client.send_device_command(
-            node_id=self._endpoint.node.node_id,
-            endpoint_id=self._endpoint.endpoint_id,
-            command=command,
-        )
-
     @callback
     def _update_from_device(self) -> None:
         """Update from device."""
diff --git a/homeassistant/components/matter/discovery.py b/homeassistant/components/matter/discovery.py
index de03d250836..7102b693e45 100644
--- a/homeassistant/components/matter/discovery.py
+++ b/homeassistant/components/matter/discovery.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from collections.abc import Generator
 
-from chip.clusters.Objects import ClusterAttributeDescriptor
+from chip.clusters.ClusterObjects import ClusterAttributeDescriptor, NullValue
 from matter_server.client.models.node import MatterEndpoint
 
 from homeassistant.const import Platform
@@ -19,7 +19,7 @@ from .event import DISCOVERY_SCHEMAS as EVENT_SCHEMAS
 from .fan import DISCOVERY_SCHEMAS as FAN_SCHEMAS
 from .light import DISCOVERY_SCHEMAS as LIGHT_SCHEMAS
 from .lock import DISCOVERY_SCHEMAS as LOCK_SCHEMAS
-from .models import MatterDiscoverySchema, MatterEntityInfo
+from .models import UNSET, MatterDiscoverySchema, MatterEntityInfo
 from .number import DISCOVERY_SCHEMAS as NUMBER_SCHEMAS
 from .select import DISCOVERY_SCHEMAS as SELECT_SCHEMAS
 from .sensor import DISCOVERY_SCHEMAS as SENSOR_SCHEMAS
@@ -67,6 +67,8 @@ def async_discover_entities(
         if any(x in schema.required_attributes for x in discovered_attributes):
             continue
 
+        primary_attribute = schema.required_attributes[0]
+
         # check vendor_id
         if (
             schema.vendor_id is not None
@@ -121,24 +123,6 @@ def async_discover_entities(
         ):
             continue
 
-        # check for required value in (primary) attribute
-        primary_attribute = schema.required_attributes[0]
-        primary_value = endpoint.get_attribute_value(None, primary_attribute)
-        if schema.value_contains is not None and (
-            isinstance(primary_value, list)
-            and schema.value_contains not in primary_value
-        ):
-            continue
-
-        # check for value that may not be present
-        if schema.value_is_not is not None and (
-            schema.value_is_not == primary_value
-            or (
-                isinstance(primary_value, list) and schema.value_is_not in primary_value
-            )
-        ):
-            continue
-
         # check for required value in cluster featuremap
         if schema.featuremap_contains is not None and (
             not bool(
@@ -152,6 +136,61 @@ def async_discover_entities(
         ):
             continue
 
+        # BEGIN checks on actual attribute values
+        # these are the least likely to be used and least efficient, so they are checked last
+
+        # check if PRIMARY value exists but is none/null
+        if not schema.allow_none_value and any(
+            endpoint.get_attribute_value(None, val_schema) in (None, NullValue)
+            for val_schema in schema.required_attributes
+        ):
+            continue
+
+        # check for required value in PRIMARY attribute
+        primary_value = endpoint.get_attribute_value(None, primary_attribute)
+        if schema.value_contains is not UNSET and (
+            isinstance(primary_value, list)
+            and schema.value_contains not in primary_value
+        ):
+            continue
+
+        # check for value that may not be present in PRIMARY attribute
+        if schema.value_is_not is not UNSET and (
+            schema.value_is_not == primary_value
+            or (
+                isinstance(primary_value, list) and schema.value_is_not in primary_value
+            )
+        ):
+            continue
+
+        # check for value that may not be present in SECONDARY attribute
+        secondary_attribute = (
+            schema.required_attributes[1]
+            if len(schema.required_attributes) > 1
+            else None
+        )
+        secondary_value = (
+            endpoint.get_attribute_value(None, secondary_attribute)
+            if secondary_attribute
+            else None
+        )
+        if schema.secondary_value_is_not is not UNSET and (
+            (schema.secondary_value_is_not == secondary_value)
+            or (
+                isinstance(secondary_value, list)
+                and schema.secondary_value_is_not in secondary_value
+            )
+        ):
+            continue
+
+        # check for required value in SECONDARY attribute
+        if schema.secondary_value_contains is not UNSET and (
+            isinstance(secondary_value, list)
+            and schema.secondary_value_contains not in secondary_value
+        ):
+            continue
+
+        # FINISH all validation checks
         # all checks passed, this value belongs to an entity
 
         attributes_to_watch = list(schema.required_attributes)
diff --git a/homeassistant/components/matter/entity.py b/homeassistant/components/matter/entity.py
index 61c62d8b564..96696193466 100644
--- a/homeassistant/components/matter/entity.py
+++ b/homeassistant/components/matter/entity.py
@@ -2,21 +2,27 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable
+from collections.abc import Callable, Coroutine
 from dataclasses import dataclass
+import functools
 import logging
-from typing import TYPE_CHECKING, Any, cast
+from typing import TYPE_CHECKING, Any, Concatenate, cast
 
 from chip.clusters import Objects as clusters
-from chip.clusters.Objects import ClusterAttributeDescriptor, NullValue
-from matter_server.common.helpers.util import create_attribute_path
+from chip.clusters.Objects import ClusterAttributeDescriptor, ClusterCommand, NullValue
+from matter_server.common.errors import MatterError
+from matter_server.common.helpers.util import (
+    create_attribute_path,
+    create_attribute_path_from_attribute,
+)
 from matter_server.common.models import EventType, ServerInfoMessage
 from propcache.api import cached_property
 
 from homeassistant.core import callback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import Entity, EntityDescription
-import homeassistant.helpers.entity_registry as er
 from homeassistant.helpers.typing import UndefinedType
 
 from .const import DOMAIN, FEATUREMAP_ATTRIBUTE_ID, ID_TYPE_DEVICE_ID
@@ -31,6 +37,23 @@ if TYPE_CHECKING:
 LOGGER = logging.getLogger(__name__)
 
 
+def catch_matter_error[_R, **P](
+    func: Callable[Concatenate[MatterEntity, P], Coroutine[Any, Any, _R]],
+) -> Callable[Concatenate[MatterEntity, P], Coroutine[Any, Any, _R]]:
+    """Catch Matter errors and convert to Home Assistant error."""
+
+    @functools.wraps(func)
+    async def wrapper(self: MatterEntity, *args: P.args, **kwargs: P.kwargs) -> _R:
+        """Catch Matter errors and convert to Home Assistant error."""
+        try:
+            return await func(self, *args, **kwargs)
+        except MatterError as err:
+            error_msg = str(err) or err.__class__.__name__
+            raise HomeAssistantError(error_msg) from err
+
+    return wrapper
+
+
 @dataclass(frozen=True)
 class MatterEntityDescription(EntityDescription):
     """Describe the Matter entity."""
@@ -218,3 +241,38 @@ class MatterEntity(Entity):
         return create_attribute_path(
             self._endpoint.endpoint_id, attribute.cluster_id, attribute.attribute_id
         )
+
+    @catch_matter_error
+    async def send_device_command(
+        self,
+        command: ClusterCommand,
+        **kwargs: Any,
+    ) -> None:
+        """Send device command on the primary attribute's endpoint."""
+        await self.matter_client.send_device_command(
+            node_id=self._endpoint.node.node_id,
+            endpoint_id=self._endpoint.endpoint_id,
+            command=command,
+            **kwargs,
+        )
+
+    @catch_matter_error
+    async def write_attribute(
+        self,
+        value: Any,
+        matter_attribute: type[ClusterAttributeDescriptor] | None = None,
+    ) -> Any:
+        """Write an attribute(value) on the primary endpoint.
+
+        If matter_attribute is not provided, the primary attribute of the entity is used.
+        """
+        if matter_attribute is None:
+            matter_attribute = self._entity_info.primary_attribute
+        return await self.matter_client.write_attribute(
+            node_id=self._endpoint.node.node_id,
+            attribute_path=create_attribute_path_from_attribute(
+                self._endpoint.endpoint_id,
+                matter_attribute,
+            ),
+            value=value,
+        )
diff --git a/homeassistant/components/matter/event.py b/homeassistant/components/matter/event.py
index 3cb3fe385d4..6fa775fd1b9 100644
--- a/homeassistant/components/matter/event.py
+++ b/homeassistant/components/matter/event.py
@@ -16,7 +16,7 @@ from homeassistant.components.event import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import MatterEntity
 from .helpers import get_matter
@@ -39,7 +39,7 @@ EVENT_TYPES_MAP = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Matter switches from Config Entry."""
     matter = get_matter(hass)
diff --git a/homeassistant/components/matter/fan.py b/homeassistant/components/matter/fan.py
index 593693dbbf9..2c9e190d58a 100644
--- a/homeassistant/components/matter/fan.py
+++ b/homeassistant/components/matter/fan.py
@@ -5,7 +5,6 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any
 
 from chip.clusters import Objects as clusters
-from matter_server.common.helpers.util import create_attribute_path_from_attribute
 
 from homeassistant.components.fan import (
     DIRECTION_FORWARD,
@@ -17,7 +16,7 @@ from homeassistant.components.fan import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import MatterEntity
 from .helpers import get_matter
@@ -46,7 +45,7 @@ PRESET_SLEEP_WIND = "sleep_wind"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Matter fan from Config Entry."""
     matter = get_matter(hass)
@@ -97,24 +96,16 @@ class MatterFan(MatterEntity, FanEntity):
         # clear the wind setting if its currently set
         if self._attr_preset_mode in [PRESET_NATURAL_WIND, PRESET_SLEEP_WIND]:
             await self._set_wind_mode(None)
-        await self.matter_client.write_attribute(
-            node_id=self._endpoint.node.node_id,
-            attribute_path=create_attribute_path_from_attribute(
-                self._endpoint.endpoint_id,
-                clusters.FanControl.Attributes.FanMode,
-            ),
+        await self.write_attribute(
             value=clusters.FanControl.Enums.FanModeEnum.kOff,
+            matter_attribute=clusters.FanControl.Attributes.FanMode,
         )
 
     async def async_set_percentage(self, percentage: int) -> None:
         """Set the speed of the fan, as a percentage."""
-        await self.matter_client.write_attribute(
-            node_id=self._endpoint.node.node_id,
-            attribute_path=create_attribute_path_from_attribute(
-                self._endpoint.endpoint_id,
-                clusters.FanControl.Attributes.PercentSetting,
-            ),
+        await self.write_attribute(
             value=percentage,
+            matter_attribute=clusters.FanControl.Attributes.PercentSetting,
         )
 
     async def async_set_preset_mode(self, preset_mode: str) -> None:
@@ -128,41 +119,33 @@ class MatterFan(MatterEntity, FanEntity):
         if self._attr_preset_mode in [PRESET_NATURAL_WIND, PRESET_SLEEP_WIND]:
             await self._set_wind_mode(None)
 
-        await self.matter_client.write_attribute(
-            node_id=self._endpoint.node.node_id,
-            attribute_path=create_attribute_path_from_attribute(
-                self._endpoint.endpoint_id,
-                clusters.FanControl.Attributes.FanMode,
-            ),
+        await self.write_attribute(
             value=FAN_MODE_MAP[preset_mode],
+            matter_attribute=clusters.FanControl.Attributes.FanMode,
         )
 
     async def async_oscillate(self, oscillating: bool) -> None:
         """Oscillate the fan."""
-        await self.matter_client.write_attribute(
-            node_id=self._endpoint.node.node_id,
-            attribute_path=create_attribute_path_from_attribute(
-                self._endpoint.endpoint_id,
-                clusters.FanControl.Attributes.RockSetting,
+        await self.write_attribute(
+            value=(
+                self.get_matter_attribute_value(
+                    clusters.FanControl.Attributes.RockSupport
+                )
+                if oscillating
+                else 0
             ),
-            value=self.get_matter_attribute_value(
-                clusters.FanControl.Attributes.RockSupport
-            )
-            if oscillating
-            else 0,
+            matter_attribute=clusters.FanControl.Attributes.RockSetting,
         )
 
     async def async_set_direction(self, direction: str) -> None:
         """Set the direction of the fan."""
-        await self.matter_client.write_attribute(
-            node_id=self._endpoint.node.node_id,
-            attribute_path=create_attribute_path_from_attribute(
-                self._endpoint.endpoint_id,
-                clusters.FanControl.Attributes.AirflowDirection,
+        await self.write_attribute(
+            value=(
+                clusters.FanControl.Enums.AirflowDirectionEnum.kReverse
+                if direction == DIRECTION_REVERSE
+                else clusters.FanControl.Enums.AirflowDirectionEnum.kForward
             ),
-            value=clusters.FanControl.Enums.AirflowDirectionEnum.kReverse
-            if direction == DIRECTION_REVERSE
-            else clusters.FanControl.Enums.AirflowDirectionEnum.kForward,
+            matter_attribute=clusters.FanControl.Attributes.AirflowDirection,
         )
 
     async def _set_wind_mode(self, wind_mode: str | None) -> None:
@@ -173,13 +156,9 @@ class MatterFan(MatterEntity, FanEntity):
             wind_setting = WindBitmap.kSleepWind
         else:
             wind_setting = 0
-        await self.matter_client.write_attribute(
-            node_id=self._endpoint.node.node_id,
-            attribute_path=create_attribute_path_from_attribute(
-                self._endpoint.endpoint_id,
-                clusters.FanControl.Attributes.WindSetting,
-            ),
+        await self.write_attribute(
             value=wind_setting,
+            matter_attribute=clusters.FanControl.Attributes.WindSetting,
         )
 
     @callback
diff --git a/homeassistant/components/matter/icons.json b/homeassistant/components/matter/icons.json
index bd8665eb18b..f9217cabcc4 100644
--- a/homeassistant/components/matter/icons.json
+++ b/homeassistant/components/matter/icons.json
@@ -37,6 +37,9 @@
       }
     },
     "select": {
+      "laundry_washer_spin_speed": {
+        "default": "mdi:reload"
+      },
       "temperature_level": {
         "default": "mdi:thermometer"
       }
@@ -45,6 +48,9 @@
       "contamination_state": {
         "default": "mdi:air-filter"
       },
+      "current_phase": {
+        "default": "mdi:state-machine"
+      },
       "air_quality": {
         "default": "mdi:air-filter"
       },
diff --git a/homeassistant/components/matter/light.py b/homeassistant/components/matter/light.py
index 5a2768d1d50..8ea804a8a7c 100644
--- a/homeassistant/components/matter/light.py
+++ b/homeassistant/components/matter/light.py
@@ -24,7 +24,7 @@ from homeassistant.components.light import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import color as color_util
 
 from .const import LOGGER
@@ -77,7 +77,7 @@ TRANSITION_BLOCKLIST = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Matter Light from Config Entry."""
     matter = get_matter(hass)
@@ -282,14 +282,6 @@ class MatterLight(MatterEntity, LightEntity):
 
         return ha_color_mode
 
-    async def send_device_command(self, command: Any) -> None:
-        """Send device command."""
-        await self.matter_client.send_device_command(
-            node_id=self._endpoint.node.node_id,
-            endpoint_id=self._endpoint.endpoint_id,
-            command=command,
-        )
-
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn light on."""
 
diff --git a/homeassistant/components/matter/lock.py b/homeassistant/components/matter/lock.py
index d69d0fd3dab..81de7482d46 100644
--- a/homeassistant/components/matter/lock.py
+++ b/homeassistant/components/matter/lock.py
@@ -15,7 +15,7 @@ from homeassistant.components.lock import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_CODE, Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import LOGGER
 from .entity import MatterEntity
@@ -28,7 +28,7 @@ DoorLockFeature = clusters.DoorLock.Bitmaps.Feature
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Matter lock from Config Entry."""
     matter = get_matter(hass)
@@ -62,19 +62,6 @@ class MatterLock(MatterEntity, LockEntity):
 
         return None
 
-    async def send_device_command(
-        self,
-        command: clusters.ClusterCommand,
-        timed_request_timeout_ms: int = 1000,
-    ) -> None:
-        """Send a command to the device."""
-        await self.matter_client.send_device_command(
-            node_id=self._endpoint.node.node_id,
-            endpoint_id=self._endpoint.endpoint_id,
-            command=command,
-            timed_request_timeout_ms=timed_request_timeout_ms,
-        )
-
     async def async_lock(self, **kwargs: Any) -> None:
         """Lock the lock with pin if needed."""
         if not self._attr_is_locked:
@@ -89,7 +76,8 @@ class MatterLock(MatterEntity, LockEntity):
         code: str | None = kwargs.get(ATTR_CODE)
         code_bytes = code.encode() if code else None
         await self.send_device_command(
-            command=clusters.DoorLock.Commands.LockDoor(code_bytes)
+            command=clusters.DoorLock.Commands.LockDoor(code_bytes),
+            timed_request_timeout_ms=1000,
         )
 
     async def async_unlock(self, **kwargs: Any) -> None:
@@ -110,11 +98,13 @@ class MatterLock(MatterEntity, LockEntity):
             # the unlock command should unbolt only on the unlock command
             # and unlatch on the HA 'open' command.
             await self.send_device_command(
-                command=clusters.DoorLock.Commands.UnboltDoor(code_bytes)
+                command=clusters.DoorLock.Commands.UnboltDoor(code_bytes),
+                timed_request_timeout_ms=1000,
             )
         else:
             await self.send_device_command(
-                command=clusters.DoorLock.Commands.UnlockDoor(code_bytes)
+                command=clusters.DoorLock.Commands.UnlockDoor(code_bytes),
+                timed_request_timeout_ms=1000,
             )
 
     async def async_open(self, **kwargs: Any) -> None:
@@ -130,7 +120,8 @@ class MatterLock(MatterEntity, LockEntity):
         code: str | None = kwargs.get(ATTR_CODE)
         code_bytes = code.encode() if code else None
         await self.send_device_command(
-            command=clusters.DoorLock.Commands.UnlockDoor(code_bytes)
+            command=clusters.DoorLock.Commands.UnlockDoor(code_bytes),
+            timed_request_timeout_ms=1000,
         )
 
     @callback
diff --git a/homeassistant/components/matter/manifest.json b/homeassistant/components/matter/manifest.json
index 669fa1af8c4..48f0bfa2e67 100644
--- a/homeassistant/components/matter/manifest.json
+++ b/homeassistant/components/matter/manifest.json
@@ -1,6 +1,6 @@
 {
   "domain": "matter",
-  "name": "Matter (BETA)",
+  "name": "Matter",
   "after_dependencies": ["hassio"],
   "codeowners": ["@home-assistant/matter"],
   "config_flow": true,
diff --git a/homeassistant/components/matter/models.py b/homeassistant/components/matter/models.py
index f1fd7ca9fa3..4af7cc3c026 100644
--- a/homeassistant/components/matter/models.py
+++ b/homeassistant/components/matter/models.py
@@ -18,6 +18,14 @@ type SensorValueTypes = type[
 ]
 
 
+# A sentinel object to detect if a parameter is supplied or not.
+class _UNSET_TYPE:
+    pass
+
+
+UNSET = _UNSET_TYPE()
+
+
 class MatterDeviceInfo(TypedDict):
     """Dictionary with Matter Device info.
 
@@ -111,16 +119,6 @@ class MatterDiscoverySchema:
     # are not discovered by other entities
     optional_attributes: tuple[type[ClusterAttributeDescriptor], ...] | None = None
 
-    # [optional] the primary attribute value must contain this value
-    # for example for the AcceptedCommandList
-    # NOTE: only works for list values
-    value_contains: Any | None = None
-
-    # [optional] the primary attribute value must NOT have this value
-    # for example to filter out invalid values (such as empty string instead of null)
-    # in case of a list value, the list may not contain this value
-    value_is_not: Any | None = None
-
     # [optional] the primary attribute's cluster featuremap must contain this value
     # for example for the DoorSensor on a DoorLock Cluster
     featuremap_contains: int | None = None
@@ -128,3 +126,25 @@ class MatterDiscoverySchema:
     # [optional] bool to specify if this primary value may be discovered
     # by multiple platforms
     allow_multi: bool = False
+
+    # [optional] the primary attribute value may not be null/None
+    allow_none_value: bool = False
+
+    # [optional] the primary attribute value must contain this value
+    # for example for the AcceptedCommandList
+    # NOTE: only works for list values
+    value_contains: Any = UNSET
+
+    # [optional] the secondary (required) attribute value must contain this value
+    # for example for the AcceptedCommandList
+    # NOTE: only works for list values
+    secondary_value_contains: Any = UNSET
+
+    # [optional] the primary attribute value must NOT have this value
+    # for example to filter out invalid values (such as empty string instead of null)
+    # in case of a list value, the list may not contain this value
+    value_is_not: Any = UNSET
+
+    # [optional] the secondary (required) attribute value must NOT have this value
+    # for example to filter out empty lists in list sensor values
+    secondary_value_is_not: Any = UNSET
diff --git a/homeassistant/components/matter/number.py b/homeassistant/components/matter/number.py
index 22929c60b89..2c7a9651c60 100644
--- a/homeassistant/components/matter/number.py
+++ b/homeassistant/components/matter/number.py
@@ -6,7 +6,6 @@ from dataclasses import dataclass
 
 from chip.clusters import Objects as clusters
 from matter_server.common import custom_clusters
-from matter_server.common.helpers.util import create_attribute_path_from_attribute
 
 from homeassistant.components.number import (
     NumberDeviceClass,
@@ -23,7 +22,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import MatterEntity, MatterEntityDescription
 from .helpers import get_matter
@@ -33,7 +32,7 @@ from .models import MatterDiscoverySchema
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Matter Number Input from Config Entry."""
     matter = get_matter(hass)
@@ -52,16 +51,10 @@ class MatterNumber(MatterEntity, NumberEntity):
 
     async def async_set_native_value(self, value: float) -> None:
         """Update the current value."""
-        matter_attribute = self._entity_info.primary_attribute
         sendvalue = int(value)
         if value_convert := self.entity_description.ha_to_native_value:
             sendvalue = value_convert(value)
-        await self.matter_client.write_attribute(
-            node_id=self._endpoint.node.node_id,
-            attribute_path=create_attribute_path_from_attribute(
-                self._endpoint.endpoint_id,
-                matter_attribute,
-            ),
+        await self.write_attribute(
             value=sendvalue,
         )
 
@@ -93,6 +86,8 @@ DISCOVERY_SCHEMAS = [
         ),
         entity_class=MatterNumber,
         required_attributes=(clusters.LevelControl.Attributes.OnLevel,),
+        # allow None value to account for 'default' value
+        allow_none_value=True,
     ),
     MatterDiscoverySchema(
         platform=Platform.NUMBER,
@@ -110,6 +105,8 @@ DISCOVERY_SCHEMAS = [
         ),
         entity_class=MatterNumber,
         required_attributes=(clusters.LevelControl.Attributes.OnTransitionTime,),
+        # allow None value to account for 'default' value
+        allow_none_value=True,
     ),
     MatterDiscoverySchema(
         platform=Platform.NUMBER,
@@ -127,6 +124,8 @@ DISCOVERY_SCHEMAS = [
         ),
         entity_class=MatterNumber,
         required_attributes=(clusters.LevelControl.Attributes.OffTransitionTime,),
+        # allow None value to account for 'default' value
+        allow_none_value=True,
     ),
     MatterDiscoverySchema(
         platform=Platform.NUMBER,
@@ -144,6 +143,8 @@ DISCOVERY_SCHEMAS = [
         ),
         entity_class=MatterNumber,
         required_attributes=(clusters.LevelControl.Attributes.OnOffTransitionTime,),
+        # allow None value to account for 'default' value
+        allow_none_value=True,
     ),
     MatterDiscoverySchema(
         platform=Platform.NUMBER,
@@ -168,8 +169,8 @@ DISCOVERY_SCHEMAS = [
             device_class=NumberDeviceClass.TEMPERATURE,
             entity_category=EntityCategory.CONFIG,
             translation_key="temperature_offset",
-            native_max_value=25,
-            native_min_value=-25,
+            native_max_value=50,
+            native_min_value=-50,
             native_step=0.5,
             native_unit_of_measurement=UnitOfTemperature.CELSIUS,
             measurement_to_ha=lambda x: None if x is None else x / 10,
diff --git a/homeassistant/components/matter/select.py b/homeassistant/components/matter/select.py
index 317c8515d4b..e78c34391cd 100644
--- a/homeassistant/components/matter/select.py
+++ b/homeassistant/components/matter/select.py
@@ -9,18 +9,28 @@ from typing import TYPE_CHECKING, cast
 from chip.clusters import Objects as clusters
 from chip.clusters.ClusterObjects import ClusterAttributeDescriptor, ClusterCommand
 from chip.clusters.Types import Nullable
-from matter_server.common.helpers.util import create_attribute_path_from_attribute
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import MatterEntity, MatterEntityDescription
 from .helpers import get_matter
 from .models import MatterDiscoverySchema
 
+NUMBER_OF_RINSES_STATE_MAP = {
+    clusters.LaundryWasherControls.Enums.NumberOfRinsesEnum.kNone: "off",
+    clusters.LaundryWasherControls.Enums.NumberOfRinsesEnum.kNormal: "normal",
+    clusters.LaundryWasherControls.Enums.NumberOfRinsesEnum.kExtra: "extra",
+    clusters.LaundryWasherControls.Enums.NumberOfRinsesEnum.kMax: "max",
+    clusters.LaundryWasherControls.Enums.NumberOfRinsesEnum.kUnknownEnumValue: None,
+}
+NUMBER_OF_RINSES_STATE_MAP_REVERSE = {
+    v: k for k, v in NUMBER_OF_RINSES_STATE_MAP.items()
+}
+
 type SelectCluster = (
     clusters.ModeSelect
     | clusters.OvenMode
@@ -37,7 +47,7 @@ type SelectCluster = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Matter ModeSelect from Config Entry."""
     matter = get_matter(hass)
@@ -49,15 +59,27 @@ class MatterSelectEntityDescription(SelectEntityDescription, MatterEntityDescrip
     """Describe Matter select entities."""
 
 
+@dataclass(frozen=True, kw_only=True)
+class MatterMapSelectEntityDescription(MatterSelectEntityDescription):
+    """Describe Matter select entities for MatterMapSelectEntityDescription."""
+
+    measurement_to_ha: Callable[[int], str | None]
+    ha_to_native_value: Callable[[str], int | None]
+
+    # list attribute: the attribute descriptor to get the list of values (= list of integers)
+    list_attribute: type[ClusterAttributeDescriptor]
+
+
 @dataclass(frozen=True, kw_only=True)
 class MatterListSelectEntityDescription(MatterSelectEntityDescription):
     """Describe Matter select entities for MatterListSelectEntity."""
 
-    # command: a callback to create the command to send to the device
-    # the callback's argument will be the index of the selected list value
-    command: Callable[[int], ClusterCommand]
     # list attribute: the attribute descriptor to get the list of values (= list of strings)
     list_attribute: type[ClusterAttributeDescriptor]
+    # command: a custom callback to create the command to send to the device
+    # the callback's argument will be the index of the selected list value
+    # if omitted the command will just be a write_attribute command to the primary attribute
+    command: Callable[[int], ClusterCommand] | None = None
 
 
 class MatterAttributeSelectEntity(MatterEntity, SelectEntity):
@@ -70,11 +92,7 @@ class MatterAttributeSelectEntity(MatterEntity, SelectEntity):
         value_convert = self.entity_description.ha_to_native_value
         if TYPE_CHECKING:
             assert value_convert is not None
-        await self.matter_client.write_attribute(
-            node_id=self._endpoint.node.node_id,
-            attribute_path=create_attribute_path_from_attribute(
-                self._endpoint.endpoint_id, self._entity_info.primary_attribute
-            ),
+        await self.write_attribute(
             value=value_convert(option),
         )
 
@@ -89,6 +107,29 @@ class MatterAttributeSelectEntity(MatterEntity, SelectEntity):
         self._attr_current_option = value_convert(value)
 
 
+class MatterMapSelectEntity(MatterAttributeSelectEntity):
+    """Representation of a Matter select entity where the options are defined in a State map."""
+
+    entity_description: MatterMapSelectEntityDescription
+
+    @callback
+    def _update_from_device(self) -> None:
+        """Update from device."""
+        # the options can dynamically change based on the state of the device
+        available_values = cast(
+            list[int],
+            self.get_matter_attribute_value(self.entity_description.list_attribute),
+        )
+        # map available (int) values to string representation
+        self._attr_options = [
+            mapped_value
+            for value in available_values
+            if (mapped_value := self.entity_description.measurement_to_ha(value))
+        ]
+        # use base implementation from MatterAttributeSelectEntity to set the current option
+        super()._update_from_device()
+
+
 class MatterModeSelectEntity(MatterAttributeSelectEntity):
     """Representation of a select entity from Matter (Mode) Cluster attribute(s)."""
 
@@ -101,10 +142,8 @@ class MatterModeSelectEntity(MatterAttributeSelectEntity):
         for mode in cluster.supportedModes:
             if mode.label != option:
                 continue
-            await self.matter_client.send_device_command(
-                node_id=self._endpoint.node.node_id,
-                endpoint_id=self._endpoint.endpoint_id,
-                command=cluster.Commands.ChangeToMode(newMode=mode.mode),
+            await self.send_device_command(
+                cluster.Commands.ChangeToMode(newMode=mode.mode),
             )
             break
 
@@ -132,10 +171,19 @@ class MatterListSelectEntity(MatterEntity, SelectEntity):
     async def async_select_option(self, option: str) -> None:
         """Change the selected option."""
         option_id = self._attr_options.index(option)
-        await self.matter_client.send_device_command(
-            node_id=self._endpoint.node.node_id,
-            endpoint_id=self._endpoint.endpoint_id,
-            command=self.entity_description.command(option_id),
+
+        if TYPE_CHECKING:
+            assert option_id is not None
+
+        if self.entity_description.command:
+            # custom command defined to set the new value
+            await self.send_device_command(
+                self.entity_description.command(option_id),
+            )
+            return
+        # regular write attribute to set the new value
+        await self.write_attribute(
+            value=option_id,
         )
 
     @callback
@@ -169,6 +217,8 @@ DISCOVERY_SCHEMAS = [
             clusters.ModeSelect.Attributes.CurrentMode,
             clusters.ModeSelect.Attributes.SupportedModes,
         ),
+        # don't discover this entry if the supported modes list is empty
+        secondary_value_is_not=[],
     ),
     MatterDiscoverySchema(
         platform=Platform.SELECT,
@@ -181,6 +231,8 @@ DISCOVERY_SCHEMAS = [
             clusters.OvenMode.Attributes.CurrentMode,
             clusters.OvenMode.Attributes.SupportedModes,
         ),
+        # don't discover this entry if the supported modes list is empty
+        secondary_value_is_not=[],
     ),
     MatterDiscoverySchema(
         platform=Platform.SELECT,
@@ -193,6 +245,8 @@ DISCOVERY_SCHEMAS = [
             clusters.LaundryWasherMode.Attributes.CurrentMode,
             clusters.LaundryWasherMode.Attributes.SupportedModes,
         ),
+        # don't discover this entry if the supported modes list is empty
+        secondary_value_is_not=[],
     ),
     MatterDiscoverySchema(
         platform=Platform.SELECT,
@@ -205,6 +259,8 @@ DISCOVERY_SCHEMAS = [
             clusters.RefrigeratorAndTemperatureControlledCabinetMode.Attributes.CurrentMode,
             clusters.RefrigeratorAndTemperatureControlledCabinetMode.Attributes.SupportedModes,
         ),
+        # don't discover this entry if the supported modes list is empty
+        secondary_value_is_not=[],
     ),
     MatterDiscoverySchema(
         platform=Platform.SELECT,
@@ -217,6 +273,8 @@ DISCOVERY_SCHEMAS = [
             clusters.RvcCleanMode.Attributes.CurrentMode,
             clusters.RvcCleanMode.Attributes.SupportedModes,
         ),
+        # don't discover this entry if the supported modes list is empty
+        secondary_value_is_not=[],
     ),
     MatterDiscoverySchema(
         platform=Platform.SELECT,
@@ -229,6 +287,8 @@ DISCOVERY_SCHEMAS = [
             clusters.DishwasherMode.Attributes.CurrentMode,
             clusters.DishwasherMode.Attributes.SupportedModes,
         ),
+        # don't discover this entry if the supported modes list is empty
+        secondary_value_is_not=[],
     ),
     MatterDiscoverySchema(
         platform=Platform.SELECT,
@@ -241,18 +301,22 @@ DISCOVERY_SCHEMAS = [
             clusters.EnergyEvseMode.Attributes.CurrentMode,
             clusters.EnergyEvseMode.Attributes.SupportedModes,
         ),
+        # don't discover this entry if the supported modes list is empty
+        secondary_value_is_not=[],
     ),
     MatterDiscoverySchema(
         platform=Platform.SELECT,
         entity_description=MatterSelectEntityDescription(
             key="MatterDeviceEnergyManagementMode",
-            translation_key="mode",
+            translation_key="device_energy_management_mode",
         ),
         entity_class=MatterModeSelectEntity,
         required_attributes=(
             clusters.DeviceEnergyManagementMode.Attributes.CurrentMode,
             clusters.DeviceEnergyManagementMode.Attributes.SupportedModes,
         ),
+        # don't discover this entry if the supported modes list is empty
+        secondary_value_is_not=[],
     ),
     MatterDiscoverySchema(
         platform=Platform.SELECT,
@@ -276,6 +340,8 @@ DISCOVERY_SCHEMAS = [
         ),
         entity_class=MatterAttributeSelectEntity,
         required_attributes=(clusters.OnOff.Attributes.StartUpOnOff,),
+        # allow None value for previous state
+        allow_none_value=True,
     ),
     MatterDiscoverySchema(
         platform=Platform.SELECT,
@@ -334,5 +400,39 @@ DISCOVERY_SCHEMAS = [
             clusters.TemperatureControl.Attributes.SelectedTemperatureLevel,
             clusters.TemperatureControl.Attributes.SupportedTemperatureLevels,
         ),
+        # don't discover this entry if the supported levels list is empty
+        secondary_value_is_not=[],
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.SELECT,
+        entity_description=MatterListSelectEntityDescription(
+            key="LaundryWasherControlsSpinSpeed",
+            translation_key="laundry_washer_spin_speed",
+            list_attribute=clusters.LaundryWasherControls.Attributes.SpinSpeeds,
+        ),
+        entity_class=MatterListSelectEntity,
+        required_attributes=(
+            clusters.LaundryWasherControls.Attributes.SpinSpeedCurrent,
+            clusters.LaundryWasherControls.Attributes.SpinSpeeds,
+        ),
+        # don't discover this entry if the spinspeeds list is empty
+        secondary_value_is_not=[],
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.SELECT,
+        entity_description=MatterMapSelectEntityDescription(
+            key="MatterLaundryWasherNumberOfRinses",
+            translation_key="laundry_washer_number_of_rinses",
+            list_attribute=clusters.LaundryWasherControls.Attributes.SupportedRinses,
+            measurement_to_ha=NUMBER_OF_RINSES_STATE_MAP.get,
+            ha_to_native_value=NUMBER_OF_RINSES_STATE_MAP_REVERSE.get,
+        ),
+        entity_class=MatterMapSelectEntity,
+        required_attributes=(
+            clusters.LaundryWasherControls.Attributes.NumberOfRinses,
+            clusters.LaundryWasherControls.Attributes.SupportedRinses,
+        ),
+        # don't discover this entry if the supported rinses list is empty
+        secondary_value_is_not=[],
     ),
 ]
diff --git a/homeassistant/components/matter/sensor.py b/homeassistant/components/matter/sensor.py
index d8fe56278df..10f8db275f5 100644
--- a/homeassistant/components/matter/sensor.py
+++ b/homeassistant/components/matter/sensor.py
@@ -7,8 +7,11 @@ from datetime import datetime
 from typing import TYPE_CHECKING, cast
 
 from chip.clusters import Objects as clusters
+from chip.clusters.ClusterObjects import ClusterAttributeDescriptor
 from chip.clusters.Types import Nullable, NullValue
+from matter_server.client.models import device_types
 from matter_server.common.custom_clusters import (
+    DraftElectricalMeasurementCluster,
     EveCluster,
     NeoCluster,
     ThirdRealityMeteringCluster,
@@ -37,7 +40,7 @@ from homeassistant.const import (
     UnitOfVolumeFlowRate,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import slugify
 
 from .entity import MatterEntity, MatterEntityDescription
@@ -69,13 +72,16 @@ OPERATIONAL_STATE_MAP = {
     clusters.OperationalState.Enums.OperationalStateEnum.kRunning: "running",
     clusters.OperationalState.Enums.OperationalStateEnum.kPaused: "paused",
     clusters.OperationalState.Enums.OperationalStateEnum.kError: "error",
+    clusters.RvcOperationalState.Enums.OperationalStateEnum.kSeekingCharger: "seeking_charger",
+    clusters.RvcOperationalState.Enums.OperationalStateEnum.kCharging: "charging",
+    clusters.RvcOperationalState.Enums.OperationalStateEnum.kDocked: "docked",
 }
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Matter sensors from Config Entry."""
     matter = get_matter(hass)
@@ -87,6 +93,26 @@ class MatterSensorEntityDescription(SensorEntityDescription, MatterEntityDescrip
     """Describe Matter sensor entities."""
 
 
+@dataclass(frozen=True, kw_only=True)
+class MatterListSensorEntityDescription(MatterSensorEntityDescription):
+    """Describe Matter sensor entities from MatterListSensor."""
+
+    # list attribute: the attribute descriptor to get the list of values (= list of strings)
+    list_attribute: type[ClusterAttributeDescriptor]
+
+
+@dataclass(frozen=True, kw_only=True)
+class MatterOperationalStateSensorEntityDescription(MatterSensorEntityDescription):
+    """Describe Matter sensor entities from Matter OperationalState objects."""
+
+    # list attribute: the attribute descriptor to get the list of values (= list of structs)
+    # needs to be set for handling OperationalState not on the OperationalState cluster, but
+    # on one of its derived clusters (e.g. RvcOperationalState)
+    state_list_attribute: type[ClusterAttributeDescriptor] = (
+        clusters.OperationalState.Attributes.OperationalStateList
+    )
+
+
 class MatterSensor(MatterEntity, SensorEntity):
     """Representation of a Matter sensor."""
 
@@ -104,9 +130,39 @@ class MatterSensor(MatterEntity, SensorEntity):
         self._attr_native_value = value
 
 
+class MatterDraftElectricalMeasurementSensor(MatterEntity, SensorEntity):
+    """Representation of a Matter sensor for Matter 1.0 draft ElectricalMeasurement cluster."""
+
+    entity_description: MatterSensorEntityDescription
+
+    @callback
+    def _update_from_device(self) -> None:
+        """Update from device."""
+        raw_value: Nullable | float | None
+        divisor: Nullable | float | None
+        multiplier: Nullable | float | None
+
+        raw_value, divisor, multiplier = (
+            self.get_matter_attribute_value(self._entity_info.attributes_to_watch[0]),
+            self.get_matter_attribute_value(self._entity_info.attributes_to_watch[1]),
+            self.get_matter_attribute_value(self._entity_info.attributes_to_watch[2]),
+        )
+
+        for value in (divisor, multiplier):
+            if value in (None, NullValue, 0):
+                self._attr_native_value = None
+                return
+
+        if raw_value in (None, NullValue):
+            self._attr_native_value = None
+        else:
+            self._attr_native_value = round(raw_value / divisor * multiplier, 2)
+
+
 class MatterOperationalStateSensor(MatterSensor):
     """Representation of a sensor for Matter Operational State."""
 
+    entity_description: MatterOperationalStateSensorEntityDescription
     states_map: dict[int, str]
 
     @callback
@@ -117,10 +173,11 @@ class MatterOperationalStateSensor(MatterSensor):
         # therefore it is not possible to provide a fixed list of options
         # or to provide a mapping to a translateable string for all options
         operational_state_list = self.get_matter_attribute_value(
-            clusters.OperationalState.Attributes.OperationalStateList
+            self.entity_description.state_list_attribute
         )
         if TYPE_CHECKING:
             operational_state_list = cast(
+                # cast to the generic OperationalStateStruct type just to help typing
                 list[clusters.OperationalState.Structs.OperationalStateStruct],
                 operational_state_list,
             )
@@ -140,6 +197,28 @@ class MatterOperationalStateSensor(MatterSensor):
         )
 
 
+class MatterListSensor(MatterSensor):
+    """Representation of a sensor entity from Matter list from Cluster attribute(s)."""
+
+    entity_description: MatterListSensorEntityDescription
+    _attr_device_class = SensorDeviceClass.ENUM
+
+    @callback
+    def _update_from_device(self) -> None:
+        """Update from device."""
+        self._attr_options = list_values = cast(
+            list[str],
+            self.get_matter_attribute_value(self.entity_description.list_attribute),
+        )
+        current_value: int = self.get_matter_attribute_value(
+            self._entity_info.primary_attribute
+        )
+        try:
+            self._attr_native_value = list_values[current_value]
+        except IndexError:
+            self._attr_native_value = None
+
+
 # Discovery schema(s) to map Matter Attributes to HA entities
 DISCOVERY_SCHEMAS = [
     MatterDiscoverySchema(
@@ -640,6 +719,60 @@ DISCOVERY_SCHEMAS = [
             clusters.ElectricalEnergyMeasurement.Attributes.CumulativeEnergyImported,
         ),
     ),
+    MatterDiscoverySchema(
+        platform=Platform.SENSOR,
+        entity_description=MatterSensorEntityDescription(
+            key="ElectricalMeasurementActivePower",
+            device_class=SensorDeviceClass.POWER,
+            entity_category=EntityCategory.DIAGNOSTIC,
+            native_unit_of_measurement=UnitOfPower.WATT,
+            suggested_display_precision=2,
+            state_class=SensorStateClass.MEASUREMENT,
+        ),
+        entity_class=MatterDraftElectricalMeasurementSensor,
+        required_attributes=(
+            DraftElectricalMeasurementCluster.Attributes.ActivePower,
+            DraftElectricalMeasurementCluster.Attributes.AcPowerDivisor,
+            DraftElectricalMeasurementCluster.Attributes.AcPowerMultiplier,
+        ),
+        absent_clusters=(clusters.ElectricalPowerMeasurement,),
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.SENSOR,
+        entity_description=MatterSensorEntityDescription(
+            key="ElectricalMeasurementRmsVoltage",
+            device_class=SensorDeviceClass.VOLTAGE,
+            entity_category=EntityCategory.DIAGNOSTIC,
+            native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+            suggested_display_precision=0,
+            state_class=SensorStateClass.MEASUREMENT,
+        ),
+        entity_class=MatterDraftElectricalMeasurementSensor,
+        required_attributes=(
+            DraftElectricalMeasurementCluster.Attributes.RmsVoltage,
+            DraftElectricalMeasurementCluster.Attributes.AcVoltageDivisor,
+            DraftElectricalMeasurementCluster.Attributes.AcVoltageMultiplier,
+        ),
+        absent_clusters=(clusters.ElectricalPowerMeasurement,),
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.SENSOR,
+        entity_description=MatterSensorEntityDescription(
+            key="ElectricalMeasurementRmsCurrent",
+            device_class=SensorDeviceClass.CURRENT,
+            entity_category=EntityCategory.DIAGNOSTIC,
+            native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+            suggested_display_precision=2,
+            state_class=SensorStateClass.MEASUREMENT,
+        ),
+        entity_class=MatterDraftElectricalMeasurementSensor,
+        required_attributes=(
+            DraftElectricalMeasurementCluster.Attributes.RmsCurrent,
+            DraftElectricalMeasurementCluster.Attributes.AcCurrentDivisor,
+            DraftElectricalMeasurementCluster.Attributes.AcCurrentMultiplier,
+        ),
+        absent_clusters=(clusters.ElectricalPowerMeasurement,),
+    ),
     MatterDiscoverySchema(
         platform=Platform.SENSOR,
         entity_description=MatterSensorEntityDescription(
@@ -666,7 +799,7 @@ DISCOVERY_SCHEMAS = [
     ),
     MatterDiscoverySchema(
         platform=Platform.SENSOR,
-        entity_description=MatterSensorEntityDescription(
+        entity_description=MatterOperationalStateSensorEntityDescription(
             key="OperationalState",
             device_class=SensorDeviceClass.ENUM,
             translation_key="operational_state",
@@ -676,5 +809,99 @@ DISCOVERY_SCHEMAS = [
             clusters.OperationalState.Attributes.OperationalState,
             clusters.OperationalState.Attributes.OperationalStateList,
         ),
+        # don't discover this entry if the supported state list is empty
+        secondary_value_is_not=[],
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.SENSOR,
+        entity_description=MatterListSensorEntityDescription(
+            key="OperationalStateCurrentPhase",
+            translation_key="current_phase",
+            list_attribute=clusters.OperationalState.Attributes.PhaseList,
+        ),
+        entity_class=MatterListSensor,
+        required_attributes=(
+            clusters.OperationalState.Attributes.CurrentPhase,
+            clusters.OperationalState.Attributes.PhaseList,
+        ),
+        # don't discover this entry if the supported state list is empty
+        secondary_value_is_not=[],
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.SENSOR,
+        entity_description=MatterListSensorEntityDescription(
+            key="RvcOperationalStateCurrentPhase",
+            translation_key="current_phase",
+            list_attribute=clusters.RvcOperationalState.Attributes.PhaseList,
+        ),
+        entity_class=MatterListSensor,
+        required_attributes=(
+            clusters.RvcOperationalState.Attributes.CurrentPhase,
+            clusters.RvcOperationalState.Attributes.PhaseList,
+        ),
+        # don't discover this entry if the supported state list is empty
+        secondary_value_is_not=[],
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.SENSOR,
+        entity_description=MatterListSensorEntityDescription(
+            key="OvenCavityOperationalStateCurrentPhase",
+            translation_key="current_phase",
+            list_attribute=clusters.OvenCavityOperationalState.Attributes.PhaseList,
+        ),
+        entity_class=MatterListSensor,
+        required_attributes=(
+            clusters.OvenCavityOperationalState.Attributes.CurrentPhase,
+            clusters.OvenCavityOperationalState.Attributes.PhaseList,
+        ),
+        # don't discover this entry if the supported state list is empty
+        secondary_value_is_not=[],
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.SENSOR,
+        entity_description=MatterSensorEntityDescription(
+            key="ThermostatLocalTemperature",
+            native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+            device_class=SensorDeviceClass.TEMPERATURE,
+            measurement_to_ha=lambda x: x / 100,
+            state_class=SensorStateClass.MEASUREMENT,
+        ),
+        entity_class=MatterSensor,
+        required_attributes=(clusters.Thermostat.Attributes.LocalTemperature,),
+        device_type=(device_types.Thermostat,),
+        allow_multi=True,  # also used for climate entity
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.SENSOR,
+        entity_description=MatterOperationalStateSensorEntityDescription(
+            key="RvcOperationalState",
+            device_class=SensorDeviceClass.ENUM,
+            translation_key="operational_state",
+            state_list_attribute=clusters.RvcOperationalState.Attributes.OperationalStateList,
+        ),
+        entity_class=MatterOperationalStateSensor,
+        required_attributes=(
+            clusters.RvcOperationalState.Attributes.OperationalState,
+            clusters.RvcOperationalState.Attributes.OperationalStateList,
+        ),
+        allow_multi=True,  # also used for vacuum entity
+        # don't discover this entry if the supported state list is empty
+        secondary_value_is_not=[],
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.SENSOR,
+        entity_description=MatterOperationalStateSensorEntityDescription(
+            key="OvenCavityOperationalState",
+            device_class=SensorDeviceClass.ENUM,
+            translation_key="operational_state",
+            state_list_attribute=clusters.OvenCavityOperationalState.Attributes.OperationalStateList,
+        ),
+        entity_class=MatterOperationalStateSensor,
+        required_attributes=(
+            clusters.OvenCavityOperationalState.Attributes.OperationalState,
+            clusters.OvenCavityOperationalState.Attributes.OperationalStateList,
+        ),
+        # don't discover this entry if the supported state list is empty
+        secondary_value_is_not=[],
     ),
 ]
diff --git a/homeassistant/components/matter/strings.json b/homeassistant/components/matter/strings.json
index 4054adba530..1404d0a9076 100644
--- a/homeassistant/components/matter/strings.json
+++ b/homeassistant/components/matter/strings.json
@@ -183,6 +183,9 @@
       "mode": {
         "name": "Mode"
       },
+      "device_energy_management_mode": {
+        "name": "Energy management mode"
+      },
       "sensitivity_level": {
         "name": "Sensitivity",
         "state": {
@@ -205,6 +208,18 @@
       },
       "temperature_display_mode": {
         "name": "Temperature display mode"
+      },
+      "laundry_washer_number_of_rinses": {
+        "name": "Number of rinses",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "normal": "Normal",
+          "extra": "Extra",
+          "max": "Max"
+        }
+      },
+      "laundry_washer_spin_speed": {
+        "name": "Spin speed"
       }
     },
     "sensor": {
@@ -246,7 +261,10 @@
           "stopped": "Stopped",
           "running": "Running",
           "paused": "[%key:common::state::paused%]",
-          "error": "Error"
+          "error": "Error",
+          "seeking_charger": "Seeking charger",
+          "charging": "[%key:common::state::charging%]",
+          "docked": "Docked"
         }
       },
       "switch_current_position": {
@@ -257,6 +275,9 @@
       },
       "battery_replacement_description": {
         "name": "Battery type"
+      },
+      "current_phase": {
+        "name": "Current phase"
       }
     },
     "switch": {
diff --git a/homeassistant/components/matter/switch.py b/homeassistant/components/matter/switch.py
index 2a1e6d59a06..af4803af9a1 100644
--- a/homeassistant/components/matter/switch.py
+++ b/homeassistant/components/matter/switch.py
@@ -7,7 +7,6 @@ from typing import Any
 
 from chip.clusters import Objects as clusters
 from matter_server.client.models import device_types
-from matter_server.common.helpers.util import create_attribute_path_from_attribute
 
 from homeassistant.components.switch import (
     SwitchDeviceClass,
@@ -17,7 +16,7 @@ from homeassistant.components.switch import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import MatterEntity, MatterEntityDescription
 from .helpers import get_matter
@@ -27,7 +26,7 @@ from .models import MatterDiscoverySchema
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Matter switches from Config Entry."""
     matter = get_matter(hass)
@@ -41,18 +40,14 @@ class MatterSwitch(MatterEntity, SwitchEntity):
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn switch on."""
-        await self.matter_client.send_device_command(
-            node_id=self._endpoint.node.node_id,
-            endpoint_id=self._endpoint.endpoint_id,
-            command=clusters.OnOff.Commands.On(),
+        await self.send_device_command(
+            clusters.OnOff.Commands.On(),
         )
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn switch off."""
-        await self.matter_client.send_device_command(
-            node_id=self._endpoint.node.node_id,
-            endpoint_id=self._endpoint.endpoint_id,
-            command=clusters.OnOff.Commands.Off(),
+        await self.send_device_command(
+            clusters.OnOff.Commands.Off(),
         )
 
     @callback
@@ -77,15 +72,9 @@ class MatterNumericSwitch(MatterSwitch):
 
     async def _async_set_native_value(self, value: bool) -> None:
         """Update the current value."""
-        matter_attribute = self._entity_info.primary_attribute
         if value_convert := self.entity_description.ha_to_native_value:
             send_value = value_convert(value)
-        await self.matter_client.write_attribute(
-            node_id=self._endpoint.node.node_id,
-            attribute_path=create_attribute_path_from_attribute(
-                self._endpoint.endpoint_id,
-                matter_attribute,
-            ),
+        await self.write_attribute(
             value=send_value,
         )
 
diff --git a/homeassistant/components/matter/update.py b/homeassistant/components/matter/update.py
index f31dd7b3aa3..7c9ca991914 100644
--- a/homeassistant/components/matter/update.py
+++ b/homeassistant/components/matter/update.py
@@ -21,7 +21,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_ON, Platform
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.restore_state import ExtraStoredData
 
@@ -60,7 +60,7 @@ class MatterUpdateExtraStoredData(ExtraStoredData):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Matter lock from Config Entry."""
     matter = get_matter(hass)
@@ -261,5 +261,6 @@ DISCOVERY_SCHEMAS = [
             clusters.OtaSoftwareUpdateRequestor.Attributes.UpdateState,
             clusters.OtaSoftwareUpdateRequestor.Attributes.UpdateStateProgress,
         ),
+        allow_none_value=True,
     ),
 ]
diff --git a/homeassistant/components/matter/vacuum.py b/homeassistant/components/matter/vacuum.py
index e98e1ad0bbd..5ea1716a37d 100644
--- a/homeassistant/components/matter/vacuum.py
+++ b/homeassistant/components/matter/vacuum.py
@@ -17,7 +17,7 @@ from homeassistant.components.vacuum import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import MatterEntity
 from .helpers import get_matter
@@ -50,7 +50,7 @@ class ModeTag(IntEnum):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Matter vacuum platform from Config Entry."""
     matter = get_matter(hass)
@@ -69,15 +69,15 @@ class MatterVacuum(MatterEntity, StateVacuumEntity):
 
     async def async_stop(self, **kwargs: Any) -> None:
         """Stop the vacuum cleaner."""
-        await self._send_device_command(clusters.OperationalState.Commands.Stop())
+        await self.send_device_command(clusters.OperationalState.Commands.Stop())
 
     async def async_return_to_base(self, **kwargs: Any) -> None:
         """Set the vacuum cleaner to return to the dock."""
-        await self._send_device_command(clusters.RvcOperationalState.Commands.GoHome())
+        await self.send_device_command(clusters.RvcOperationalState.Commands.GoHome())
 
     async def async_locate(self, **kwargs: Any) -> None:
         """Locate the vacuum cleaner."""
-        await self._send_device_command(clusters.Identify.Commands.Identify())
+        await self.send_device_command(clusters.Identify.Commands.Identify())
 
     async def async_start(self) -> None:
         """Start or resume the cleaning task."""
@@ -87,26 +87,15 @@ class MatterVacuum(MatterEntity, StateVacuumEntity):
             clusters.RvcOperationalState.Commands.Resume.command_id
             in self._last_accepted_commands
         ):
-            await self._send_device_command(
+            await self.send_device_command(
                 clusters.RvcOperationalState.Commands.Resume()
             )
         else:
-            await self._send_device_command(clusters.OperationalState.Commands.Start())
+            await self.send_device_command(clusters.OperationalState.Commands.Start())
 
     async def async_pause(self) -> None:
         """Pause the cleaning task."""
-        await self._send_device_command(clusters.OperationalState.Commands.Pause())
-
-    async def _send_device_command(
-        self,
-        command: clusters.ClusterCommand,
-    ) -> None:
-        """Send a command to the device."""
-        await self.matter_client.send_device_command(
-            node_id=self._endpoint.node.node_id,
-            endpoint_id=self._endpoint.endpoint_id,
-            command=command,
-        )
+        await self.send_device_command(clusters.OperationalState.Commands.Pause())
 
     @callback
     def _update_from_device(self) -> None:
@@ -219,5 +208,6 @@ DISCOVERY_SCHEMAS = [
             clusters.PowerSource.Attributes.BatPercentRemaining,
         ),
         device_type=(device_types.RoboticVacuumCleaner,),
+        allow_none_value=True,
     ),
 ]
diff --git a/homeassistant/components/matter/valve.py b/homeassistant/components/matter/valve.py
index ccb4e89da17..bea11468c6b 100644
--- a/homeassistant/components/matter/valve.py
+++ b/homeassistant/components/matter/valve.py
@@ -14,7 +14,7 @@ from homeassistant.components.valve import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import MatterEntity
 from .helpers import get_matter
@@ -28,7 +28,7 @@ ValveStateEnum = ValveConfigurationAndControl.Enums.ValveStateEnum
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Matter valve platform from Config Entry."""
     matter = get_matter(hass)
@@ -42,17 +42,6 @@ class MatterValve(MatterEntity, ValveEntity):
     entity_description: ValveEntityDescription
     _platform_translation_key = "valve"
 
-    async def send_device_command(
-        self,
-        command: clusters.ClusterCommand,
-    ) -> None:
-        """Send a command to the device."""
-        await self.matter_client.send_device_command(
-            node_id=self._endpoint.node.node_id,
-            endpoint_id=self._endpoint.endpoint_id,
-            command=command,
-        )
-
     async def async_open_valve(self) -> None:
         """Open the valve."""
         await self.send_device_command(ValveConfigurationAndControl.Commands.Open())
diff --git a/homeassistant/components/maxcube/__init__.py b/homeassistant/components/maxcube/__init__.py
index d4a3a45f441..4e79a00fed0 100644
--- a/homeassistant/components/maxcube/__init__.py
+++ b/homeassistant/components/maxcube/__init__.py
@@ -10,7 +10,7 @@ import voluptuous as vol
 from homeassistant.components import persistent_notification
 from homeassistant.const import CONF_HOST, CONF_PORT, CONF_SCAN_INTERVAL, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import load_platform
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.dt import now
diff --git a/homeassistant/components/mazda/__init__.py b/homeassistant/components/mazda/__init__.py
index fd323060ac0..ccbb331573e 100644
--- a/homeassistant/components/mazda/__init__.py
+++ b/homeassistant/components/mazda/__init__.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import issue_registry as ir
 
@@ -29,11 +29,13 @@ async def async_setup_entry(hass: HomeAssistant, _: ConfigEntry) -> bool:
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    if all(
-        config_entry.state is ConfigEntryState.NOT_LOADED
-        for config_entry in hass.config_entries.async_entries(DOMAIN)
-        if config_entry.entry_id != entry.entry_id
-    ):
-        ir.async_delete_issue(hass, DOMAIN, DOMAIN)
-
     return True
+
+
+async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Remove a config entry."""
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
+        ir.async_delete_issue(hass, DOMAIN, DOMAIN)
+        # Remove any remaining disabled or ignored entries
+        for _entry in hass.config_entries.async_entries(DOMAIN):
+            hass.async_create_task(hass.config_entries.async_remove(_entry.entry_id))
diff --git a/homeassistant/components/mcp/__init__.py b/homeassistant/components/mcp/__init__.py
new file mode 100644
index 00000000000..41b6a260d9f
--- /dev/null
+++ b/homeassistant/components/mcp/__init__.py
@@ -0,0 +1,68 @@
+"""The Model Context Protocol integration."""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import llm
+
+from .const import DOMAIN
+from .coordinator import ModelContextProtocolCoordinator
+from .types import ModelContextProtocolConfigEntry
+
+__all__ = [
+    "DOMAIN",
+    "async_setup_entry",
+    "async_unload_entry",
+]
+
+API_PROMPT = "The following tools are available from a remote server named {name}."
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ModelContextProtocolConfigEntry
+) -> bool:
+    """Set up Model Context Protocol from a config entry."""
+    coordinator = ModelContextProtocolCoordinator(hass, entry)
+    await coordinator.async_config_entry_first_refresh()
+
+    unsub = llm.async_register_api(
+        hass,
+        ModelContextProtocolAPI(
+            hass=hass,
+            id=f"{DOMAIN}-{entry.entry_id}",
+            name=entry.title,
+            coordinator=coordinator,
+        ),
+    )
+    entry.async_on_unload(unsub)
+
+    entry.runtime_data = coordinator
+
+    return True
+
+
+async def async_unload_entry(
+    hass: HomeAssistant, entry: ModelContextProtocolConfigEntry
+) -> bool:
+    """Unload a config entry."""
+    return True
+
+
+@dataclass(kw_only=True)
+class ModelContextProtocolAPI(llm.API):
+    """Define an object to hold the Model Context Protocol API."""
+
+    coordinator: ModelContextProtocolCoordinator
+
+    async def async_get_api_instance(
+        self, llm_context: llm.LLMContext
+    ) -> llm.APIInstance:
+        """Return the instance of the API."""
+        return llm.APIInstance(
+            self,
+            API_PROMPT.format(name=self.name),
+            llm_context,
+            tools=self.coordinator.data,
+        )
diff --git a/homeassistant/components/mcp/config_flow.py b/homeassistant/components/mcp/config_flow.py
new file mode 100644
index 00000000000..92e0052c665
--- /dev/null
+++ b/homeassistant/components/mcp/config_flow.py
@@ -0,0 +1,111 @@
+"""Config flow for the Model Context Protocol integration."""
+
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+import httpx
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.const import CONF_URL
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_validation as cv
+
+from .const import DOMAIN
+from .coordinator import mcp_client
+
+_LOGGER = logging.getLogger(__name__)
+
+STEP_USER_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_URL): str,
+    }
+)
+
+
+async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str, Any]:
+    """Validate the user input and connect to the MCP server."""
+    url = data[CONF_URL]
+    try:
+        cv.url(url)  # Cannot be added to schema directly
+    except vol.Invalid as error:
+        raise InvalidUrl from error
+    try:
+        async with mcp_client(url) as session:
+            response = await session.initialize()
+    except httpx.TimeoutException as error:
+        _LOGGER.info("Timeout connecting to MCP server: %s", error)
+        raise TimeoutConnectError from error
+    except httpx.HTTPStatusError as error:
+        _LOGGER.info("Cannot connect to MCP server: %s", error)
+        if error.response.status_code == 401:
+            raise InvalidAuth from error
+        raise CannotConnect from error
+    except httpx.HTTPError as error:
+        _LOGGER.info("Cannot connect to MCP server: %s", error)
+        raise CannotConnect from error
+
+    if not response.capabilities.tools:
+        raise MissingCapabilities(
+            f"MCP Server {url} does not support 'Tools' capability"
+        )
+
+    return {"title": response.serverInfo.name}
+
+
+class ModelContextProtocolConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Model Context Protocol."""
+
+    VERSION = 1
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the initial step."""
+        errors: dict[str, str] = {}
+        if user_input is not None:
+            try:
+                info = await validate_input(self.hass, user_input)
+            except InvalidUrl:
+                errors[CONF_URL] = "invalid_url"
+            except TimeoutConnectError:
+                errors["base"] = "timeout_connect"
+            except CannotConnect:
+                errors["base"] = "cannot_connect"
+            except InvalidAuth:
+                return self.async_abort(reason="invalid_auth")
+            except MissingCapabilities:
+                return self.async_abort(reason="missing_capabilities")
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
+                errors["base"] = "unknown"
+            else:
+                self._async_abort_entries_match({CONF_URL: user_input[CONF_URL]})
+                return self.async_create_entry(title=info["title"], data=user_input)
+
+        return self.async_show_form(
+            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
+        )
+
+
+class InvalidUrl(HomeAssistantError):
+    """Error to indicate the URL format is invalid."""
+
+
+class CannotConnect(HomeAssistantError):
+    """Error to indicate we cannot connect."""
+
+
+class TimeoutConnectError(HomeAssistantError):
+    """Error to indicate we cannot connect."""
+
+
+class InvalidAuth(HomeAssistantError):
+    """Error to indicate there is invalid auth."""
+
+
+class MissingCapabilities(HomeAssistantError):
+    """Error to indicate that the MCP server is missing required capabilities."""
diff --git a/homeassistant/components/mcp/const.py b/homeassistant/components/mcp/const.py
new file mode 100644
index 00000000000..675b2d7031c
--- /dev/null
+++ b/homeassistant/components/mcp/const.py
@@ -0,0 +1,3 @@
+"""Constants for the Model Context Protocol integration."""
+
+DOMAIN = "mcp"
diff --git a/homeassistant/components/mcp/coordinator.py b/homeassistant/components/mcp/coordinator.py
new file mode 100644
index 00000000000..6e66036c548
--- /dev/null
+++ b/homeassistant/components/mcp/coordinator.py
@@ -0,0 +1,134 @@
+"""Types for the Model Context Protocol integration."""
+
+import asyncio
+from collections.abc import AsyncGenerator
+from contextlib import asynccontextmanager
+import datetime
+import logging
+
+import httpx
+from mcp.client.session import ClientSession
+from mcp.client.sse import sse_client
+import voluptuous as vol
+from voluptuous_openapi import convert_to_voluptuous
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_URL
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import llm
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+from homeassistant.util.json import JsonObjectType
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+UPDATE_INTERVAL = datetime.timedelta(minutes=30)
+TIMEOUT = 10
+
+
+@asynccontextmanager
+async def mcp_client(url: str) -> AsyncGenerator[ClientSession]:
+    """Create a server-sent event MCP client.
+
+    This is an asynccontext manager that exists to wrap other async context managers
+    so that the coordinator has a single object to manage.
+    """
+    try:
+        async with sse_client(url=url) as streams, ClientSession(*streams) as session:
+            await session.initialize()
+            yield session
+    except ExceptionGroup as err:
+        _LOGGER.debug("Error creating MCP client: %s", err)
+        raise err.exceptions[0] from err
+
+
+class ModelContextProtocolTool(llm.Tool):
+    """A Tool exposed over the Model Context Protocol."""
+
+    def __init__(
+        self,
+        name: str,
+        description: str | None,
+        parameters: vol.Schema,
+        server_url: str,
+    ) -> None:
+        """Initialize the tool."""
+        self.name = name
+        self.description = description
+        self.parameters = parameters
+        self.server_url = server_url
+
+    async def async_call(
+        self,
+        hass: HomeAssistant,
+        tool_input: llm.ToolInput,
+        llm_context: llm.LLMContext,
+    ) -> JsonObjectType:
+        """Call the tool."""
+        try:
+            async with asyncio.timeout(TIMEOUT):
+                async with mcp_client(self.server_url) as session:
+                    result = await session.call_tool(
+                        tool_input.tool_name, tool_input.tool_args
+                    )
+        except TimeoutError as error:
+            _LOGGER.debug("Timeout when calling tool: %s", error)
+            raise HomeAssistantError(f"Timeout when calling tool: {error}") from error
+        except httpx.HTTPStatusError as error:
+            _LOGGER.debug("Error when calling tool: %s", error)
+            raise HomeAssistantError(f"Error when calling tool: {error}") from error
+        return result.model_dump(exclude_unset=True, exclude_none=True)
+
+
+class ModelContextProtocolCoordinator(DataUpdateCoordinator[list[llm.Tool]]):
+    """Define an object to hold MCP data."""
+
+    config_entry: ConfigEntry
+
+    def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
+        """Initialize ModelContextProtocolCoordinator."""
+        super().__init__(
+            hass,
+            logger=_LOGGER,
+            name=DOMAIN,
+            config_entry=config_entry,
+            update_interval=UPDATE_INTERVAL,
+        )
+
+    async def _async_update_data(self) -> list[llm.Tool]:
+        """Fetch data from API endpoint.
+
+        This is the place to pre-process the data to lookup tables
+        so entities can quickly look up their data.
+        """
+        try:
+            async with asyncio.timeout(TIMEOUT):
+                async with mcp_client(self.config_entry.data[CONF_URL]) as session:
+                    result = await session.list_tools()
+        except TimeoutError as error:
+            _LOGGER.debug("Timeout when listing tools: %s", error)
+            raise UpdateFailed(f"Timeout when listing tools: {error}") from error
+        except httpx.HTTPError as err:
+            _LOGGER.debug("Error communicating with API: %s", err)
+            raise UpdateFailed(f"Error communicating with API: {err}") from err
+
+        _LOGGER.debug("Received tools: %s", result.tools)
+        tools: list[llm.Tool] = []
+        for tool in result.tools:
+            try:
+                parameters = convert_to_voluptuous(tool.inputSchema)
+            except Exception as err:
+                raise UpdateFailed(
+                    f"Error converting schema {err}: {tool.inputSchema}"
+                ) from err
+            tools.append(
+                ModelContextProtocolTool(
+                    tool.name,
+                    tool.description,
+                    parameters,
+                    self.config_entry.data[CONF_URL],
+                )
+            )
+        return tools
diff --git a/homeassistant/components/mcp/manifest.json b/homeassistant/components/mcp/manifest.json
new file mode 100644
index 00000000000..9cd1e2899a6
--- /dev/null
+++ b/homeassistant/components/mcp/manifest.json
@@ -0,0 +1,10 @@
+{
+  "domain": "mcp",
+  "name": "Model Context Protocol",
+  "codeowners": ["@allenporter"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/mcp",
+  "iot_class": "local_polling",
+  "quality_scale": "silver",
+  "requirements": ["mcp==1.5.0"]
+}
diff --git a/homeassistant/components/mcp/quality_scale.yaml b/homeassistant/components/mcp/quality_scale.yaml
new file mode 100644
index 00000000000..76afdf5860d
--- /dev/null
+++ b/homeassistant/components/mcp/quality_scale.yaml
@@ -0,0 +1,88 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: Integration does not have actions.
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: Integration does not have actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup:
+    status: exempt
+    comment: Integration does not have entities.
+  entity-unique-id:
+    status: exempt
+    comment: Integration does not have entities.
+  has-entity-name:
+    status: exempt
+    comment: Integration does not have entities.
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions:
+    status: exempt
+    comment: Integration does not have actions.
+  config-entry-unloading: done
+  docs-configuration-parameters: done
+  docs-installation-parameters: done
+  entity-unavailable:
+    status: exempt
+    comment: Integration does not have entities.
+  integration-owner: done
+  log-when-unavailable: done
+  parallel-updates:
+    status: exempt
+    comment: Integration does not have platforms.
+  reauthentication-flow:
+    status: exempt
+    comment: Integration does not support authentication.
+  test-coverage: done
+
+  # Gold
+  devices:
+    status: exempt
+    comment: Integration does not have devices.
+  diagnostics: todo
+  discovery-update-info: todo
+  discovery: todo
+  docs-data-update: done
+  docs-examples: done
+  docs-known-limitations: done
+  docs-supported-devices: done
+  docs-supported-functions: done
+  docs-troubleshooting: done
+  docs-use-cases: done
+  dynamic-devices: todo
+  entity-category:
+    status: exempt
+    comment: Integration does not have entities.
+  entity-device-class:
+    status: exempt
+    comment: Integration does not have entities.
+  entity-disabled-by-default:
+    status: exempt
+    comment: Integration does not have entities.
+  entity-translations:
+    status: exempt
+    comment: Integration does not have entities.
+  exception-translations: todo
+  icon-translations: todo
+  reconfiguration-flow: todo
+  repair-issues: todo
+  stale-devices: todo
+
+  # Platinum
+  async-dependency: done
+  inject-websession: todo
+  strict-typing: done
diff --git a/homeassistant/components/mcp/strings.json b/homeassistant/components/mcp/strings.json
new file mode 100644
index 00000000000..97a75fc6f85
--- /dev/null
+++ b/homeassistant/components/mcp/strings.json
@@ -0,0 +1,25 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "data": {
+          "url": "[%key:common::config_flow::data::url%]"
+        },
+        "data_description": {
+          "url": "The remote MCP server URL for the SSE endpoint, for example http://example/sse"
+        }
+      }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]",
+      "timeout_connect": "[%key:common::config_flow::error::timeout_connect%]",
+      "invalid_url": "Must be a valid MCP server URL e.g. https://example.com/sse"
+    },
+    "abort": {
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "missing_capabilities": "The MCP server does not support a required capability (Tools)",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    }
+  }
+}
diff --git a/homeassistant/components/mcp/types.py b/homeassistant/components/mcp/types.py
new file mode 100644
index 00000000000..961c9ab3d18
--- /dev/null
+++ b/homeassistant/components/mcp/types.py
@@ -0,0 +1,7 @@
+"""Types for the Model Context Protocol integration."""
+
+from homeassistant.config_entries import ConfigEntry
+
+from .coordinator import ModelContextProtocolCoordinator
+
+type ModelContextProtocolConfigEntry = ConfigEntry[ModelContextProtocolCoordinator]
diff --git a/homeassistant/components/mcp_server/config_flow.py b/homeassistant/components/mcp_server/config_flow.py
index 8d68c6a868a..e8df68de5e2 100644
--- a/homeassistant/components/mcp_server/config_flow.py
+++ b/homeassistant/components/mcp_server/config_flow.py
@@ -33,7 +33,6 @@ class ModelContextServerProtocolConfigFlow(ConfigFlow, domain=DOMAIN):
     ) -> ConfigFlowResult:
         """Handle the initial step."""
         llm_apis = {api.id: api.name for api in llm.async_get_apis(self.hass)}
-
         if user_input is not None:
             return self.async_create_entry(
                 title=llm_apis[user_input[CONF_LLM_HASS_API]], data=user_input
diff --git a/homeassistant/components/mcp_server/const.py b/homeassistant/components/mcp_server/const.py
index 1aa81f445a1..3f2e12cbb6a 100644
--- a/homeassistant/components/mcp_server/const.py
+++ b/homeassistant/components/mcp_server/const.py
@@ -2,3 +2,6 @@
 
 DOMAIN = "mcp_server"
 TITLE = "Model Context Protocol Server"
+# The Stateless API is no longer registered explicitly, but this name may still exist in the
+# users config entry.
+STATELESS_LLM_API = "stateless_assist"
diff --git a/homeassistant/components/mcp_server/http.py b/homeassistant/components/mcp_server/http.py
index 433d978cef7..bc8fdbd56c8 100644
--- a/homeassistant/components/mcp_server/http.py
+++ b/homeassistant/components/mcp_server/http.py
@@ -25,7 +25,6 @@ from mcp import types
 
 from homeassistant.components import conversation
 from homeassistant.components.http import KEY_HASS, HomeAssistantView
-from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import CONF_LLM_HASS_API
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import llm
@@ -56,11 +55,9 @@ def async_get_config_entry(hass: HomeAssistant) -> MCPServerConfigEntry:
 
     Will raise an HTTP error if the expected configuration is not present.
     """
-    config_entries: list[MCPServerConfigEntry] = [
-        config_entry
-        for config_entry in hass.config_entries.async_entries(DOMAIN)
-        if config_entry.state == ConfigEntryState.LOADED
-    ]
+    config_entries: list[MCPServerConfigEntry] = (
+        hass.config_entries.async_loaded_entries(DOMAIN)
+    )
     if not config_entries:
         raise HTTPNotFound(text="Model Context Protocol server is not configured")
     if len(config_entries) > 1:
diff --git a/homeassistant/components/mcp_server/manifest.json b/homeassistant/components/mcp_server/manifest.json
index 18b2e5bc417..b5fb1bdcd87 100644
--- a/homeassistant/components/mcp_server/manifest.json
+++ b/homeassistant/components/mcp_server/manifest.json
@@ -8,6 +8,6 @@
   "integration_type": "service",
   "iot_class": "local_push",
   "quality_scale": "silver",
-  "requirements": ["mcp==1.1.2", "aiohttp_sse==2.2.0", "anyio==4.8.0"],
+  "requirements": ["mcp==1.5.0", "aiohttp_sse==2.2.0", "anyio==4.9.0"],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/mcp_server/server.py b/homeassistant/components/mcp_server/server.py
index ba21abd722c..affa4faecd6 100644
--- a/homeassistant/components/mcp_server/server.py
+++ b/homeassistant/components/mcp_server/server.py
@@ -21,6 +21,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import llm
 
+from .const import STATELESS_LLM_API
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -47,16 +49,23 @@ async def create_server(
     A Model Context Protocol Server object is associated with a single session.
     The MCP SDK handles the details of the protocol.
     """
+    if llm_api_id == STATELESS_LLM_API:
+        llm_api_id = llm.LLM_API_ASSIST
 
-    server = Server("home-assistant")
+    server = Server[Any]("home-assistant")
+
+    async def get_api_instance() -> llm.APIInstance:
+        """Get the LLM API selected."""
+        # Backwards compatibility with old MCP Server config
+        return await llm.async_get_api(hass, llm_api_id, llm_context)
 
     @server.list_prompts()  # type: ignore[no-untyped-call, misc]
     async def handle_list_prompts() -> list[types.Prompt]:
-        llm_api = await llm.async_get_api(hass, llm_api_id, llm_context)
+        llm_api = await get_api_instance()
         return [
             types.Prompt(
                 name=llm_api.api.name,
-                description=f"Default prompt for the Home Assistant LLM API {llm_api.api.name}",
+                description=f"Default prompt for Home Assistant {llm_api.api.name} API",
             )
         ]
 
@@ -64,12 +73,12 @@ async def create_server(
     async def handle_get_prompt(
         name: str, arguments: dict[str, str] | None
     ) -> types.GetPromptResult:
-        llm_api = await llm.async_get_api(hass, llm_api_id, llm_context)
+        llm_api = await get_api_instance()
         if name != llm_api.api.name:
             raise ValueError(f"Unknown prompt: {name}")
 
         return types.GetPromptResult(
-            description=f"Default prompt for the Home Assistant LLM API {llm_api.api.name}",
+            description=f"Default prompt for Home Assistant {llm_api.api.name} API",
             messages=[
                 types.PromptMessage(
                     role="assistant",
@@ -84,13 +93,13 @@ async def create_server(
     @server.list_tools()  # type: ignore[no-untyped-call, misc]
     async def list_tools() -> list[types.Tool]:
         """List available time tools."""
-        llm_api = await llm.async_get_api(hass, llm_api_id, llm_context)
+        llm_api = await get_api_instance()
         return [_format_tool(tool, llm_api.custom_serializer) for tool in llm_api.tools]
 
     @server.call_tool()  # type: ignore[no-untyped-call, misc]
     async def call_tool(name: str, arguments: dict) -> Sequence[types.TextContent]:
         """Handle calling tools."""
-        llm_api = await llm.async_get_api(hass, llm_api_id, llm_context)
+        llm_api = await get_api_instance()
         tool_input = llm.ToolInput(tool_name=name, tool_args=arguments)
         _LOGGER.debug("Tool call: %s(%s)", tool_input.tool_name, tool_input.tool_args)
 
diff --git a/homeassistant/components/mcp_server/strings.json b/homeassistant/components/mcp_server/strings.json
index fbd14038ddc..57f1baf183c 100644
--- a/homeassistant/components/mcp_server/strings.json
+++ b/homeassistant/components/mcp_server/strings.json
@@ -7,7 +7,7 @@
           "llm_hass_api": "[%key:common::config_flow::data::llm_hass_api%]"
         },
         "data_description": {
-          "llm_hass_api": "The method for controling Home Assistant to expose with the Model Context Protocol."
+          "llm_hass_api": "The method for controlling Home Assistant to expose with the Model Context Protocol."
         }
       }
     },
diff --git a/homeassistant/components/mealie/__init__.py b/homeassistant/components/mealie/__init__.py
index 5e1523b939a..e019dae2c33 100644
--- a/homeassistant/components/mealie/__init__.py
+++ b/homeassistant/components/mealie/__init__.py
@@ -86,9 +86,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: MealieConfigEntry) -> bo
         sw_version=about.version,
     )
 
-    mealplan_coordinator = MealieMealplanCoordinator(hass, client)
-    shoppinglist_coordinator = MealieShoppingListCoordinator(hass, client)
-    statistics_coordinator = MealieStatisticsCoordinator(hass, client)
+    mealplan_coordinator = MealieMealplanCoordinator(hass, entry, client)
+    shoppinglist_coordinator = MealieShoppingListCoordinator(hass, entry, client)
+    statistics_coordinator = MealieStatisticsCoordinator(hass, entry, client)
 
     await mealplan_coordinator.async_config_entry_first_refresh()
     await shoppinglist_coordinator.async_config_entry_first_refresh()
diff --git a/homeassistant/components/mealie/calendar.py b/homeassistant/components/mealie/calendar.py
index 729bc16c6fd..556ddede2e2 100644
--- a/homeassistant/components/mealie/calendar.py
+++ b/homeassistant/components/mealie/calendar.py
@@ -8,7 +8,7 @@ from aiomealie import Mealplan, MealplanEntryType
 
 from homeassistant.components.calendar import CalendarEntity, CalendarEvent
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import MealieConfigEntry, MealieMealplanCoordinator
 from .entity import MealieEntity
@@ -19,7 +19,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: MealieConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the calendar platform for entity."""
     coordinator = entry.runtime_data.mealplan_coordinator
diff --git a/homeassistant/components/mealie/coordinator.py b/homeassistant/components/mealie/coordinator.py
index 7d4f23d706e..ae5b9cd8c97 100644
--- a/homeassistant/components/mealie/coordinator.py
+++ b/homeassistant/components/mealie/coordinator.py
@@ -21,7 +21,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN, LOGGER
 
@@ -48,11 +48,14 @@ class MealieDataUpdateCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
     _name: str
     _update_interval: timedelta
 
-    def __init__(self, hass: HomeAssistant, client: MealieClient) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: MealieConfigEntry, client: MealieClient
+    ) -> None:
         """Initialize the Mealie data coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=f"Mealie {self._name}",
             update_interval=self._update_interval,
         )
diff --git a/homeassistant/components/mealie/sensor.py b/homeassistant/components/mealie/sensor.py
index e4b1655a9d1..062a2646cab 100644
--- a/homeassistant/components/mealie/sensor.py
+++ b/homeassistant/components/mealie/sensor.py
@@ -11,7 +11,7 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .coordinator import MealieConfigEntry, MealieStatisticsCoordinator
@@ -59,7 +59,7 @@ SENSOR_TYPES: tuple[MealieStatisticsSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: MealieConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Mealie sensors based on a config entry."""
     coordinator = entry.runtime_data.statistics_coordinator
diff --git a/homeassistant/components/mealie/services.py b/homeassistant/components/mealie/services.py
index ca8c28f9d13..15e3348adbe 100644
--- a/homeassistant/components/mealie/services.py
+++ b/homeassistant/components/mealie/services.py
@@ -128,7 +128,7 @@ def setup_services(hass: HomeAssistant) -> None:
                 translation_domain=DOMAIN,
                 translation_key="end_date_before_start_date",
             )
-        client = cast(MealieConfigEntry, entry).runtime_data.client
+        client = entry.runtime_data.client
         try:
             mealplans = await client.get_mealplans(start_date, end_date)
         except MealieConnectionError as err:
diff --git a/homeassistant/components/mealie/strings.json b/homeassistant/components/mealie/strings.json
index fa63252e837..186fc4c4ac0 100644
--- a/homeassistant/components/mealie/strings.json
+++ b/homeassistant/components/mealie/strings.json
@@ -146,11 +146,11 @@
   "services": {
     "get_mealplan": {
       "name": "Get mealplan",
-      "description": "Get mealplan from Mealie",
+      "description": "Gets a mealplan from Mealie",
       "fields": {
         "config_entry_id": {
           "name": "Mealie instance",
-          "description": "Select the Mealie instance to get mealplan from"
+          "description": "The Mealie instance to use for this action."
         },
         "start_date": {
           "name": "Start date",
@@ -164,7 +164,7 @@
     },
     "get_recipe": {
       "name": "Get recipe",
-      "description": "Get recipe from Mealie",
+      "description": "Gets a recipe from Mealie",
       "fields": {
         "config_entry_id": {
           "name": "[%key:component::mealie::services::get_mealplan::fields::config_entry_id::name%]",
@@ -178,7 +178,7 @@
     },
     "import_recipe": {
       "name": "Import recipe",
-      "description": "Import recipe from an URL",
+      "description": "Imports a recipe from an URL",
       "fields": {
         "config_entry_id": {
           "name": "[%key:component::mealie::services::get_mealplan::fields::config_entry_id::name%]",
@@ -196,7 +196,7 @@
     },
     "set_random_mealplan": {
       "name": "Set random mealplan",
-      "description": "Set a random mealplan for a specific date",
+      "description": "Sets a random mealplan for a specific date",
       "fields": {
         "config_entry_id": {
           "name": "[%key:component::mealie::services::get_mealplan::fields::config_entry_id::name%]",
@@ -214,7 +214,7 @@
     },
     "set_mealplan": {
       "name": "Set a mealplan",
-      "description": "Set a mealplan for a specific date",
+      "description": "Sets a mealplan for a specific date",
       "fields": {
         "config_entry_id": {
           "name": "[%key:component::mealie::services::get_mealplan::fields::config_entry_id::name%]",
diff --git a/homeassistant/components/mealie/todo.py b/homeassistant/components/mealie/todo.py
index be04b00113e..d42c9033922 100644
--- a/homeassistant/components/mealie/todo.py
+++ b/homeassistant/components/mealie/todo.py
@@ -14,7 +14,7 @@ from homeassistant.components.todo import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import MealieConfigEntry, MealieShoppingListCoordinator
@@ -46,7 +46,7 @@ def _convert_api_item(item: ShoppingItem) -> TodoItem:
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: MealieConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the todo platform for entity."""
     coordinator = entry.runtime_data.shoppinglist_coordinator
diff --git a/homeassistant/components/meater/config_flow.py b/homeassistant/components/meater/config_flow.py
index a7ba3ba1498..5c11b10755c 100644
--- a/homeassistant/components/meater/config_flow.py
+++ b/homeassistant/components/meater/config_flow.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
+import logging
 from typing import Any
 
 from meater import AuthenticationError, MeaterApi, ServiceUnavailableError
@@ -14,6 +15,8 @@ from homeassistant.helpers import aiohttp_client
 
 from .const import DOMAIN
 
+_LOGGER = logging.getLogger(__name__)
+
 REAUTH_SCHEMA = vol.Schema({vol.Required(CONF_PASSWORD): str})
 USER_SCHEMA = vol.Schema(
     {vol.Required(CONF_USERNAME): str, vol.Required(CONF_PASSWORD): str}
@@ -84,7 +87,8 @@ class MeaterConfigFlow(ConfigFlow, domain=DOMAIN):
             errors["base"] = "invalid_auth"
         except ServiceUnavailableError:
             errors["base"] = "service_unavailable_error"
-        except Exception:  # noqa: BLE001
+        except Exception:
+            _LOGGER.exception("Unexpected exception")
             errors["base"] = "unknown_auth_error"
         else:
             data = {"username": username, "password": password}
diff --git a/homeassistant/components/meater/sensor.py b/homeassistant/components/meater/sensor.py
index 2a26d848ac2..00fc28b8718 100644
--- a/homeassistant/components/meater/sensor.py
+++ b/homeassistant/components/meater/sensor.py
@@ -18,7 +18,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -136,7 +136,9 @@ SENSOR_TYPES = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the entry."""
     coordinator: DataUpdateCoordinator[dict[str, MeaterProbe]] = hass.data[DOMAIN][
diff --git a/homeassistant/components/medcom_ble/sensor.py b/homeassistant/components/medcom_ble/sensor.py
index b5cb29be845..f837620c829 100644
--- a/homeassistant/components/medcom_ble/sensor.py
+++ b/homeassistant/components/medcom_ble/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import CONNECTION_BLUETOOTH, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -37,7 +37,7 @@ SENSORS_MAPPING_TEMPLATE: dict[str, SensorEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Medcom BLE radiation monitor sensors."""
 
diff --git a/homeassistant/components/media_extractor/manifest.json b/homeassistant/components/media_extractor/manifest.json
index becca8e6da8..e049a827c75 100644
--- a/homeassistant/components/media_extractor/manifest.json
+++ b/homeassistant/components/media_extractor/manifest.json
@@ -8,6 +8,6 @@
   "iot_class": "calculated",
   "loggers": ["yt_dlp"],
   "quality_scale": "internal",
-  "requirements": ["yt-dlp[default]==2025.01.15"],
+  "requirements": ["yt-dlp[default]==2025.03.26"],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/media_extractor/strings.json b/homeassistant/components/media_extractor/strings.json
index 125aa08337a..11b5a884e4d 100644
--- a/homeassistant/components/media_extractor/strings.json
+++ b/homeassistant/components/media_extractor/strings.json
@@ -17,12 +17,12 @@
         },
         "media_content_type": {
           "name": "Media content type",
-          "description": "The type of the content to play. Must be one of MUSIC, TVSHOW, VIDEO, EPISODE, CHANNEL or PLAYLIST MUSIC."
+          "description": "The type of the content to play."
         }
       }
     },
     "extract_media_url": {
-      "name": "Get Media URL",
+      "name": "Get media URL",
       "description": "Extract media URL from a service.",
       "fields": {
         "url": {
diff --git a/homeassistant/components/media_player/__init__.py b/homeassistant/components/media_player/__init__.py
index e109b0418c9..45d08bea7ce 100644
--- a/homeassistant/components/media_player/__init__.py
+++ b/homeassistant/components/media_player/__init__.py
@@ -52,7 +52,7 @@ from homeassistant.const import (  # noqa: F401
     STATE_PLAYING,
     STATE_STANDBY,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, SupportsResponse
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.deprecation import (
@@ -124,6 +124,7 @@ from .const import (  # noqa: F401
     CONTENT_AUTH_EXPIRY_TIME,
     DOMAIN,
     REPEAT_MODES,
+    SERVICE_BROWSE_MEDIA,
     SERVICE_CLEAR_PLAYLIST,
     SERVICE_JOIN,
     SERVICE_PLAY_MEDIA,
@@ -201,6 +202,12 @@ MEDIA_PLAYER_PLAY_MEDIA_SCHEMA = {
     vol.Optional(ATTR_MEDIA_EXTRA, default={}): dict,
 }
 
+MEDIA_PLAYER_BROWSE_MEDIA_SCHEMA = {
+    vol.Optional(ATTR_MEDIA_CONTENT_TYPE): cv.string,
+    vol.Optional(ATTR_MEDIA_CONTENT_ID): cv.string,
+}
+
+
 ATTR_TO_PROPERTY = [
     ATTR_MEDIA_VOLUME_LEVEL,
     ATTR_MEDIA_VOLUME_MUTED,
@@ -431,6 +438,15 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         "async_play_media",
         [MediaPlayerEntityFeature.PLAY_MEDIA],
     )
+    component.async_register_entity_service(
+        SERVICE_BROWSE_MEDIA,
+        {
+            vol.Optional(ATTR_MEDIA_CONTENT_TYPE): cv.string,
+            vol.Optional(ATTR_MEDIA_CONTENT_ID): cv.string,
+        },
+        "async_browse_media",
+        supports_response=SupportsResponse.ONLY,
+    )
     component.async_register_entity_service(
         SERVICE_SHUFFLE_SET,
         {vol.Required(ATTR_MEDIA_SHUFFLE): cv.boolean},
@@ -1015,7 +1031,6 @@ class MediaPlayerEntity(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
 
         if self.state in {
             MediaPlayerState.OFF,
-            MediaPlayerState.IDLE,
             MediaPlayerState.STANDBY,
         }:
             await self.async_turn_on()
diff --git a/homeassistant/components/media_player/browse_media.py b/homeassistant/components/media_player/browse_media.py
index c917164a2ee..d234050c1b2 100644
--- a/homeassistant/components/media_player/browse_media.py
+++ b/homeassistant/components/media_player/browse_media.py
@@ -23,7 +23,11 @@ from homeassistant.helpers.network import (
 from .const import CONTENT_AUTH_EXPIRY_TIME, MediaClass, MediaType
 
 # Paths that we don't need to sign
-PATHS_WITHOUT_AUTH = ("/api/tts_proxy/", "/api/esphome/ffmpeg_proxy/")
+PATHS_WITHOUT_AUTH = (
+    "/api/tts_proxy/",
+    "/api/esphome/ffmpeg_proxy/",
+    "/api/assist_satellite/static/",
+)
 
 
 @callback
diff --git a/homeassistant/components/media_player/const.py b/homeassistant/components/media_player/const.py
index ca2f3307846..387fdb05401 100644
--- a/homeassistant/components/media_player/const.py
+++ b/homeassistant/components/media_player/const.py
@@ -173,6 +173,7 @@ _DEPRECATED_MEDIA_TYPE_VIDEO = DeprecatedConstantEnum(MediaType.VIDEO, "2025.10"
 SERVICE_CLEAR_PLAYLIST = "clear_playlist"
 SERVICE_JOIN = "join"
 SERVICE_PLAY_MEDIA = "play_media"
+SERVICE_BROWSE_MEDIA = "browse_media"
 SERVICE_SELECT_SOUND_MODE = "select_sound_mode"
 SERVICE_SELECT_SOURCE = "select_source"
 SERVICE_UNJOIN = "unjoin"
diff --git a/homeassistant/components/media_player/icons.json b/homeassistant/components/media_player/icons.json
index c11211c38ec..5008ea62d2e 100644
--- a/homeassistant/components/media_player/icons.json
+++ b/homeassistant/components/media_player/icons.json
@@ -32,6 +32,9 @@
     }
   },
   "services": {
+    "browse_media": {
+      "service": "mdi:folder-search"
+    },
     "clear_playlist": {
       "service": "mdi:playlist-remove"
     },
diff --git a/homeassistant/components/media_player/intent.py b/homeassistant/components/media_player/intent.py
index edfab2a668f..af37c0d68bb 100644
--- a/homeassistant/components/media_player/intent.py
+++ b/homeassistant/components/media_player/intent.py
@@ -96,11 +96,16 @@ async def async_setup_intents(hass: HomeAssistant) -> None:
             required_states={MediaPlayerState.PLAYING},
             required_features=MediaPlayerEntityFeature.VOLUME_SET,
             required_slots={
-                ATTR_MEDIA_VOLUME_LEVEL: vol.All(
-                    vol.Coerce(int), vol.Range(min=0, max=100), lambda val: val / 100
-                )
+                ATTR_MEDIA_VOLUME_LEVEL: intent.IntentSlotInfo(
+                    description="The volume percentage of the media player",
+                    value_schema=vol.All(
+                        vol.Coerce(int),
+                        vol.Range(min=0, max=100),
+                        lambda val: val / 100,
+                    ),
+                ),
             },
-            description="Sets the volume of a media player",
+            description="Sets the volume percentage of a media player",
             platforms={DOMAIN},
             device_classes={MediaPlayerDeviceClass},
         ),
diff --git a/homeassistant/components/media_player/services.yaml b/homeassistant/components/media_player/services.yaml
index 7338747b545..6b13a6b9c09 100644
--- a/homeassistant/components/media_player/services.yaml
+++ b/homeassistant/components/media_player/services.yaml
@@ -165,6 +165,22 @@ play_media:
       selector:
         boolean:
 
+browse_media:
+  target:
+    entity:
+      domain: media_player
+  fields:
+    media_content_type:
+      required: false
+      example: "music"
+      selector:
+        text:
+    media_content_id:
+      required: false
+      example: "A:ALBUMARTIST/Beatles"
+      selector:
+        text:
+
 select_source:
   target:
     entity:
diff --git a/homeassistant/components/media_player/strings.json b/homeassistant/components/media_player/strings.json
index be06ae22cdc..87b5ec692af 100644
--- a/homeassistant/components/media_player/strings.json
+++ b/homeassistant/components/media_player/strings.json
@@ -248,7 +248,7 @@
         },
         "media_content_type": {
           "name": "Content type",
-          "description": "The type of the content to play. Such as image, music, tv show, video, episode, channel, or playlist."
+          "description": "The type of the content to play, such as image, music, tv show, video, episode, channel, or playlist."
         },
         "enqueue": {
           "name": "Enqueue",
@@ -260,6 +260,20 @@
         }
       }
     },
+    "browse_media": {
+      "name": "Browse media",
+      "description": "Browses the available media.",
+      "fields": {
+        "media_content_id": {
+          "name": "Content ID",
+          "description": "The ID of the content to browse. Integration dependent."
+        },
+        "media_content_type": {
+          "name": "Content type",
+          "description": "The type of the content to browse, such as image, music, tv show, video, episode, channel, or playlist."
+        }
+      }
+    },
     "select_source": {
       "name": "Select source",
       "description": "Sends the media player the command to change input source.",
@@ -285,22 +299,22 @@
       "description": "Removes all items from the playlist."
     },
     "shuffle_set": {
-      "name": "Shuffle",
-      "description": "Playback mode that selects the media in randomized order.",
+      "name": "Set shuffle",
+      "description": "Enables or disables the shuffle mode.",
       "fields": {
         "shuffle": {
-          "name": "Shuffle",
-          "description": "Whether or not shuffle mode is enabled."
+          "name": "Shuffle mode",
+          "description": "Whether the media should be played in randomized order or not."
         }
       }
     },
     "repeat_set": {
-      "name": "Repeat",
-      "description": "Playback mode that plays the media in a loop.",
+      "name": "Set repeat",
+      "description": "Sets the repeat mode.",
       "fields": {
         "repeat": {
           "name": "Repeat mode",
-          "description": "Repeat mode to set."
+          "description": "Whether the media (one or all) should be played in a loop or not."
         }
       }
     },
diff --git a/homeassistant/components/mediaroom/media_player.py b/homeassistant/components/mediaroom/media_player.py
index 97b61da437a..4561c38ce80 100644
--- a/homeassistant/components/mediaroom/media_player.py
+++ b/homeassistant/components/mediaroom/media_player.py
@@ -29,7 +29,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_connect, dispatcher_send
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/melcloud/climate.py b/homeassistant/components/melcloud/climate.py
index 4defd47bc39..682a28ea080 100644
--- a/homeassistant/components/melcloud/climate.py
+++ b/homeassistant/components/melcloud/climate.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from datetime import timedelta
-from typing import Any
+from typing import Any, cast
 
 from pymelcloud import DEVICE_TYPE_ATA, DEVICE_TYPE_ATW, AtaDevice, AtwDevice
 import pymelcloud.ata_device as ata
@@ -28,7 +28,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import MelCloudDevice
 from .const import (
@@ -76,7 +76,9 @@ ATW_ZONE_HVAC_ACTION_LOOKUP = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MelCloud device climate based on config_entry."""
     mel_devices = hass.data[DOMAIN][entry.entry_id]
@@ -150,6 +152,14 @@ class AtaDeviceClimate(MelCloudClimate):
         self._attr_unique_id = f"{self.api.device.serial}-{self.api.device.mac}"
         self._attr_device_info = self.api.device_info
 
+    async def async_added_to_hass(self) -> None:
+        """When entity is added to hass."""
+        await super().async_added_to_hass()
+
+        # We can only check for vane_horizontal once we fetch the device data from the cloud
+        if self._device.vane_horizontal:
+            self._attr_supported_features |= ClimateEntityFeature.SWING_HORIZONTAL_MODE
+
     @property
     def extra_state_attributes(self) -> dict[str, Any] | None:
         """Return the optional state attributes with device specific additions."""
@@ -226,7 +236,7 @@ class AtaDeviceClimate(MelCloudClimate):
         set_dict: dict[str, Any] = {}
         if ATTR_HVAC_MODE in kwargs:
             self._apply_set_hvac_mode(
-                kwargs.get(ATTR_HVAC_MODE, self.hvac_mode), set_dict
+                cast(HVACMode, kwargs.get(ATTR_HVAC_MODE, self.hvac_mode)), set_dict
             )
 
         if ATTR_TEMPERATURE in kwargs:
@@ -272,15 +282,29 @@ class AtaDeviceClimate(MelCloudClimate):
         """Return vertical vane position or mode."""
         return self._device.vane_vertical
 
+    @property
+    def swing_horizontal_mode(self) -> str | None:
+        """Return horizontal vane position or mode."""
+        return self._device.vane_horizontal
+
     async def async_set_swing_mode(self, swing_mode: str) -> None:
         """Set vertical vane position or mode."""
         await self.async_set_vane_vertical(swing_mode)
 
+    async def async_set_swing_horizontal_mode(self, swing_horizontal_mode: str) -> None:
+        """Set horizontal vane position or mode."""
+        await self.async_set_vane_horizontal(swing_horizontal_mode)
+
     @property
     def swing_modes(self) -> list[str] | None:
         """Return a list of available vertical vane positions and modes."""
         return self._device.vane_vertical_positions
 
+    @property
+    def swing_horizontal_modes(self) -> list[str] | None:
+        """Return a list of available horizontal vane positions and modes."""
+        return self._device.vane_horizontal_positions
+
     async def async_turn_on(self) -> None:
         """Turn the entity on."""
         await self._device.set({"power": True})
diff --git a/homeassistant/components/melcloud/sensor.py b/homeassistant/components/melcloud/sensor.py
index 84585c556ca..51a026e717a 100644
--- a/homeassistant/components/melcloud/sensor.py
+++ b/homeassistant/components/melcloud/sensor.py
@@ -18,7 +18,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfEnergy, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import MelCloudDevice
 from .const import DOMAIN
@@ -104,7 +104,9 @@ ATW_ZONE_SENSORS: tuple[MelcloudSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MELCloud device sensors based on config_entry."""
     mel_devices = hass.data[DOMAIN].get(entry.entry_id)
diff --git a/homeassistant/components/melcloud/strings.json b/homeassistant/components/melcloud/strings.json
index 19ef0b76aad..8c168295e88 100644
--- a/homeassistant/components/melcloud/strings.json
+++ b/homeassistant/components/melcloud/strings.json
@@ -11,20 +11,20 @@
       },
       "reauth_confirm": {
         "title": "[%key:common::config_flow::title::reauth%]",
-        "description": "The Melcloud integration needs to re-authenticate your connection details",
+        "description": "The MELCloud integration needs to re-authenticate your connection details",
         "data": {
           "username": "[%key:common::config_flow::data::email%]",
           "password": "[%key:common::config_flow::data::password%]"
         }
       },
       "reconfigure": {
-        "title": "Reconfigure your MelCloud",
+        "title": "Reconfigure your MELCloud",
         "description": "Reconfigure the entry to obtain a new token, for your account: `{username}`.",
         "data": {
           "password": "[%key:common::config_flow::data::password%]"
         },
         "data_description": {
-          "password": "Enter the (new) password for MelCloud."
+          "password": "Enter the (new) password for MELCloud."
         }
       }
     },
@@ -70,7 +70,7 @@
     },
     "deprecated_yaml_import_issue_cannot_connect": {
       "title": "The MELCloud YAML configuration import failed",
-      "description": "Configuring MELCloud using YAML is being removed but there was an connection error importing your YAML configuration.\n\nEnsure connection to MELCloud works and restart Home Assistant to try again or remove the MELCloud YAML configuration from your configuration.yaml file and continue to [set up the integration](/config/integrations/dashboard/add?domain=melcoud) manually."
+      "description": "Configuring MELCloud using YAML is being removed but there was a connection error importing your YAML configuration.\n\nEnsure connection to MELCloud works and restart Home Assistant to try again or remove the MELCloud YAML configuration from your configuration.yaml file and continue to [set up the integration](/config/integrations/dashboard/add?domain=melcoud) manually."
     }
   },
   "entity": {
diff --git a/homeassistant/components/melcloud/water_heater.py b/homeassistant/components/melcloud/water_heater.py
index 8de1ac53311..76fbad41575 100644
--- a/homeassistant/components/melcloud/water_heater.py
+++ b/homeassistant/components/melcloud/water_heater.py
@@ -20,14 +20,16 @@ from homeassistant.components.water_heater import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN, MelCloudDevice
 from .const import ATTR_STATUS
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MelCloud device climate based on config_entry."""
     mel_devices = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/melnor/__init__.py b/homeassistant/components/melnor/__init__.py
index afaf8eb95f8..6ab725d747c 100644
--- a/homeassistant/components/melnor/__init__.py
+++ b/homeassistant/components/melnor/__init__.py
@@ -57,7 +57,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         bluetooth.BluetoothScanningMode.PASSIVE,
     )
 
-    coordinator = MelnorDataUpdateCoordinator(hass, device)
+    coordinator = MelnorDataUpdateCoordinator(hass, entry, device)
     await coordinator.async_config_entry_first_refresh()
 
     hass.data[DOMAIN][entry.entry_id] = coordinator
diff --git a/homeassistant/components/melnor/coordinator.py b/homeassistant/components/melnor/coordinator.py
index 669fe916082..52662fd0c4c 100644
--- a/homeassistant/components/melnor/coordinator.py
+++ b/homeassistant/components/melnor/coordinator.py
@@ -5,6 +5,7 @@ import logging
 
 from melnor_bluetooth.device import Device
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -14,13 +15,17 @@ _LOGGER = logging.getLogger(__name__)
 class MelnorDataUpdateCoordinator(DataUpdateCoordinator[Device]):
     """Melnor data update coordinator."""
 
+    config_entry: ConfigEntry
     _device: Device
 
-    def __init__(self, hass: HomeAssistant, device: Device) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, device: Device
+    ) -> None:
         """Initialize my coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="Melnor Bluetooth",
             update_interval=timedelta(seconds=5),
         )
diff --git a/homeassistant/components/melnor/number.py b/homeassistant/components/melnor/number.py
index 15c47008346..42c22ae5a43 100644
--- a/homeassistant/components/melnor/number.py
+++ b/homeassistant/components/melnor/number.py
@@ -16,7 +16,7 @@ from homeassistant.components.number import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import MelnorDataUpdateCoordinator
@@ -68,7 +68,7 @@ ZONE_ENTITY_DESCRIPTIONS: list[MelnorZoneNumberEntityDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the number platform."""
 
diff --git a/homeassistant/components/melnor/sensor.py b/homeassistant/components/melnor/sensor.py
index bbb3416dcc9..525a29dc6cf 100644
--- a/homeassistant/components/melnor/sensor.py
+++ b/homeassistant/components/melnor/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     EntityCategory,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util import dt as dt_util
 
@@ -105,7 +105,7 @@ ZONE_ENTITY_DESCRIPTIONS: list[MelnorZoneSensorEntityDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor platform."""
 
diff --git a/homeassistant/components/melnor/switch.py b/homeassistant/components/melnor/switch.py
index d7fb96739b3..cc5abe8f6f3 100644
--- a/homeassistant/components/melnor/switch.py
+++ b/homeassistant/components/melnor/switch.py
@@ -15,7 +15,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import MelnorDataUpdateCoordinator
@@ -52,7 +52,7 @@ ZONE_ENTITY_DESCRIPTIONS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the switch platform."""
 
diff --git a/homeassistant/components/melnor/time.py b/homeassistant/components/melnor/time.py
index 08de7e054de..277eb6e36eb 100644
--- a/homeassistant/components/melnor/time.py
+++ b/homeassistant/components/melnor/time.py
@@ -13,7 +13,7 @@ from homeassistant.components.time import TimeEntity, TimeEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import MelnorDataUpdateCoordinator
@@ -42,7 +42,7 @@ ZONE_ENTITY_DESCRIPTIONS: list[MelnorZoneTimeEntityDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the number platform."""
 
diff --git a/homeassistant/components/meraki/device_tracker.py b/homeassistant/components/meraki/device_tracker.py
index 0eb3742a878..70995fc69b5 100644
--- a/homeassistant/components/meraki/device_tracker.py
+++ b/homeassistant/components/meraki/device_tracker.py
@@ -15,7 +15,7 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.components.http import KEY_HASS, HomeAssistantView
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 CONF_VALIDATOR = "validator"
diff --git a/homeassistant/components/message_bird/notify.py b/homeassistant/components/message_bird/notify.py
index 6da0e8176ef..c5cbe695243 100644
--- a/homeassistant/components/message_bird/notify.py
+++ b/homeassistant/components/message_bird/notify.py
@@ -15,7 +15,7 @@ from homeassistant.components.notify import (
 )
 from homeassistant.const import CONF_API_KEY, CONF_SENDER
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/met/__init__.py b/homeassistant/components/met/__init__.py
index 1cd7a4bde57..17fc411bf20 100644
--- a/homeassistant/components/met/__init__.py
+++ b/homeassistant/components/met/__init__.py
@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import logging
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
@@ -15,14 +14,12 @@ from .const import (
     DEFAULT_HOME_LONGITUDE,
     DOMAIN,
 )
-from .coordinator import MetDataUpdateCoordinator
+from .coordinator import MetDataUpdateCoordinator, MetWeatherConfigEntry
 
 PLATFORMS = [Platform.WEATHER]
 
 _LOGGER = logging.getLogger(__name__)
 
-type MetWeatherConfigEntry = ConfigEntry[MetDataUpdateCoordinator]
-
 
 async def async_setup_entry(
     hass: HomeAssistant, config_entry: MetWeatherConfigEntry
diff --git a/homeassistant/components/met/config_flow.py b/homeassistant/components/met/config_flow.py
index 62964d22bb1..e5db80b2997 100644
--- a/homeassistant/components/met/config_flow.py
+++ b/homeassistant/components/met/config_flow.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     UnitOfLength,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.selector import (
     NumberSelector,
     NumberSelectorConfig,
diff --git a/homeassistant/components/met/coordinator.py b/homeassistant/components/met/coordinator.py
index 3887a29f83c..de27da7a07f 100644
--- a/homeassistant/components/met/coordinator.py
+++ b/homeassistant/components/met/coordinator.py
@@ -31,6 +31,8 @@ URL = "https://aa015h6buqvih86i1.api.met.no/weatherapi/locationforecast/2.0/comp
 
 _LOGGER = logging.getLogger(__name__)
 
+type MetWeatherConfigEntry = ConfigEntry[MetDataUpdateCoordinator]
+
 
 class CannotConnect(HomeAssistantError):
     """Unable to connect to the web site."""
@@ -89,7 +91,11 @@ class MetWeatherData:
 class MetDataUpdateCoordinator(DataUpdateCoordinator[MetWeatherData]):
     """Class to manage fetching Met data."""
 
-    def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
+    config_entry: MetWeatherConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: MetWeatherConfigEntry
+    ) -> None:
         """Initialize global Met data updater."""
         self._unsub_track_home: Callable[[], None] | None = None
         self.weather = MetWeatherData(hass, config_entry.data)
@@ -97,7 +103,13 @@ class MetDataUpdateCoordinator(DataUpdateCoordinator[MetWeatherData]):
 
         update_interval = timedelta(minutes=randrange(55, 65))
 
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval)
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=update_interval,
+        )
 
     async def _async_update_data(self) -> MetWeatherData:
         """Fetch data from Met."""
diff --git a/homeassistant/components/met/weather.py b/homeassistant/components/met/weather.py
index 7b95567366b..c4f9c8e6885 100644
--- a/homeassistant/components/met/weather.py
+++ b/homeassistant/components/met/weather.py
@@ -34,10 +34,9 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er, sun
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.unit_system import METRIC_SYSTEM
 
-from . import MetWeatherConfigEntry
 from .const import (
     ATTR_CONDITION_CLEAR_NIGHT,
     ATTR_CONDITION_SUNNY,
@@ -47,7 +46,7 @@ from .const import (
     DOMAIN,
     FORECAST_MAP,
 )
-from .coordinator import MetDataUpdateCoordinator
+from .coordinator import MetDataUpdateCoordinator, MetWeatherConfigEntry
 
 DEFAULT_NAME = "Met.no"
 
@@ -55,7 +54,7 @@ DEFAULT_NAME = "Met.no"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: MetWeatherConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add a weather entity from a config_entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/met_eireann/__init__.py b/homeassistant/components/met_eireann/__init__.py
index ab2695cbd11..01917707bf7 100644
--- a/homeassistant/components/met_eireann/__init__.py
+++ b/homeassistant/components/met_eireann/__init__.py
@@ -12,7 +12,7 @@ from homeassistant.const import CONF_ELEVATION, CONF_LATITUDE, CONF_LONGITUDE, P
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN
 
diff --git a/homeassistant/components/met_eireann/config_flow.py b/homeassistant/components/met_eireann/config_flow.py
index 422b46827da..761d0655237 100644
--- a/homeassistant/components/met_eireann/config_flow.py
+++ b/homeassistant/components/met_eireann/config_flow.py
@@ -6,7 +6,7 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_ELEVATION, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import DOMAIN, HOME_LOCATION_NAME
 
diff --git a/homeassistant/components/met_eireann/weather.py b/homeassistant/components/met_eireann/weather.py
index 404ef5d8393..72706ccb70f 100644
--- a/homeassistant/components/met_eireann/weather.py
+++ b/homeassistant/components/met_eireann/weather.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 from homeassistant.util import dt as dt_util
 
@@ -47,7 +47,7 @@ def format_condition(condition: str | None) -> str | None:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add a weather entity from a config_entry."""
     coordinator = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/meteo_france/__init__.py b/homeassistant/components/meteo_france/__init__.py
index 4b79b046b75..5f1d5269538 100644
--- a/homeassistant/components/meteo_france/__init__.py
+++ b/homeassistant/components/meteo_france/__init__.py
@@ -13,7 +13,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import (
@@ -57,7 +57,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         """Fetch data from API endpoint."""
         assert isinstance(department, str)
         return await hass.async_add_executor_job(
-            client.get_warning_current_phenomenoms, department, 0, True
+            client.get_warning_current_phenomenons, department, 0, True
         )
 
     coordinator_forecast = DataUpdateCoordinator(
diff --git a/homeassistant/components/meteo_france/manifest.json b/homeassistant/components/meteo_france/manifest.json
index 567788ec479..d82d0c3f91b 100644
--- a/homeassistant/components/meteo_france/manifest.json
+++ b/homeassistant/components/meteo_france/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/meteo_france",
   "iot_class": "cloud_polling",
   "loggers": ["meteofrance_api"],
-  "requirements": ["meteofrance-api==1.3.0"]
+  "requirements": ["meteofrance-api==1.4.0"]
 }
diff --git a/homeassistant/components/meteo_france/sensor.py b/homeassistant/components/meteo_france/sensor.py
index 826716f1679..7333f7b0c19 100644
--- a/homeassistant/components/meteo_france/sensor.py
+++ b/homeassistant/components/meteo_france/sensor.py
@@ -7,7 +7,7 @@ from typing import Any
 
 from meteofrance_api.helpers import (
     get_warning_text_status_from_indice_color,
-    readeable_phenomenoms_dict,
+    readable_phenomenons_dict,
 )
 from meteofrance_api.model.forecast import Forecast
 from meteofrance_api.model.rain import Rain
@@ -30,7 +30,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -182,7 +182,9 @@ SENSOR_TYPES_PROBABILITY: tuple[MeteoFranceSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Meteo-France sensor platform."""
     data = hass.data[DOMAIN][entry.entry_id]
@@ -334,7 +336,7 @@ class MeteoFranceAlertSensor(MeteoFranceSensor[CurrentPhenomenons]):
     def extra_state_attributes(self):
         """Return the state attributes."""
         return {
-            **readeable_phenomenoms_dict(self.coordinator.data.phenomenons_max_colors),
+            **readable_phenomenons_dict(self.coordinator.data.phenomenons_max_colors),
         }
 
 
diff --git a/homeassistant/components/meteo_france/weather.py b/homeassistant/components/meteo_france/weather.py
index 8305547afd3..67a56271c2b 100644
--- a/homeassistant/components/meteo_france/weather.py
+++ b/homeassistant/components/meteo_france/weather.py
@@ -28,7 +28,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -55,7 +55,9 @@ def format_condition(condition: str):
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Meteo-France weather platform."""
     coordinator: DataUpdateCoordinator[MeteoFranceForecast] = hass.data[DOMAIN][
diff --git a/homeassistant/components/meteoalarm/binary_sensor.py b/homeassistant/components/meteoalarm/binary_sensor.py
index 3400ca52f50..95124445363 100644
--- a/homeassistant/components/meteoalarm/binary_sensor.py
+++ b/homeassistant/components/meteoalarm/binary_sensor.py
@@ -15,10 +15,10 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/meteoclimatic/sensor.py b/homeassistant/components/meteoclimatic/sensor.py
index 2194f82e43e..6e508bd63d8 100644
--- a/homeassistant/components/meteoclimatic/sensor.py
+++ b/homeassistant/components/meteoclimatic/sensor.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -101,6 +101,8 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
         name="Wind Bearing",
         native_unit_of_measurement=DEGREE,
         icon="mdi:weather-windy",
+        device_class=SensorDeviceClass.WIND_DIRECTION,
+        state_class=SensorStateClass.MEASUREMENT_ANGLE,
     ),
     SensorEntityDescription(
         key="rain",
@@ -112,7 +114,9 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Meteoclimatic sensor platform."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/meteoclimatic/weather.py b/homeassistant/components/meteoclimatic/weather.py
index 75a93689efa..fa3b3c92288 100644
--- a/homeassistant/components/meteoclimatic/weather.py
+++ b/homeassistant/components/meteoclimatic/weather.py
@@ -7,7 +7,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfPressure, UnitOfSpeed, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -26,7 +26,9 @@ def format_condition(condition):
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Meteoclimatic weather platform."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/metoffice/sensor.py b/homeassistant/components/metoffice/sensor.py
index 61f825abdc3..5a256144d11 100644
--- a/homeassistant/components/metoffice/sensor.py
+++ b/homeassistant/components/metoffice/sensor.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
@@ -142,7 +142,9 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Met Office weather sensor platform."""
     hass_data = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/metoffice/weather.py b/homeassistant/components/metoffice/weather.py
index 5eeddee8dd4..d3f1320c47e 100644
--- a/homeassistant/components/metoffice/weather.py
+++ b/homeassistant/components/metoffice/weather.py
@@ -21,7 +21,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfPressure, UnitOfSpeed, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import TimestampDataUpdateCoordinator
 
 from . import get_device_info
@@ -39,7 +39,9 @@ from .data import MetOfficeData
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Met Office weather sensor platform."""
     entity_registry = er.async_get(hass)
diff --git a/homeassistant/components/mfi/sensor.py b/homeassistant/components/mfi/sensor.py
index b93cc669e62..f666e2d614a 100644
--- a/homeassistant/components/mfi/sensor.py
+++ b/homeassistant/components/mfi/sensor.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/mfi/switch.py b/homeassistant/components/mfi/switch.py
index 833a2c21301..2a05018f301 100644
--- a/homeassistant/components/mfi/switch.py
+++ b/homeassistant/components/mfi/switch.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     CONF_VERIFY_SSL,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/microbees/__init__.py b/homeassistant/components/microbees/__init__.py
index 488988ab593..12c536121da 100644
--- a/homeassistant/components/microbees/__init__.py
+++ b/homeassistant/components/microbees/__init__.py
@@ -45,7 +45,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             raise ConfigEntryAuthFailed("Token not valid, trigger renewal") from ex
         raise ConfigEntryNotReady from ex
     microbees = MicroBees(token=session.token[CONF_ACCESS_TOKEN])
-    coordinator = MicroBeesUpdateCoordinator(hass, microbees)
+    coordinator = MicroBeesUpdateCoordinator(hass, entry, microbees)
     await coordinator.async_config_entry_first_refresh()
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = HomeAssistantMicroBeesData(
         connector=microbees,
diff --git a/homeassistant/components/microbees/binary_sensor.py b/homeassistant/components/microbees/binary_sensor.py
index 551f68ba354..1dc2a8d9702 100644
--- a/homeassistant/components/microbees/binary_sensor.py
+++ b/homeassistant/components/microbees/binary_sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import MicroBeesUpdateCoordinator
@@ -36,7 +36,9 @@ BINARYSENSOR_TYPES = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the microBees binary sensor platform."""
     coordinator: MicroBeesUpdateCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/microbees/button.py b/homeassistant/components/microbees/button.py
index f449fa9afee..ca3a76753a7 100644
--- a/homeassistant/components/microbees/button.py
+++ b/homeassistant/components/microbees/button.py
@@ -5,7 +5,7 @@ from typing import Any
 from homeassistant.components.button import ButtonEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import MicroBeesUpdateCoordinator
@@ -15,7 +15,9 @@ BUTTON_TRANSLATIONS = {51: "button_gate", 91: "button_panic"}
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the microBees button platform."""
     coordinator: MicroBeesUpdateCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/microbees/climate.py b/homeassistant/components/microbees/climate.py
index 077048ee352..554ca3b32cc 100644
--- a/homeassistant/components/microbees/climate.py
+++ b/homeassistant/components/microbees/climate.py
@@ -11,7 +11,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import MicroBeesUpdateCoordinator
@@ -26,7 +26,9 @@ THERMOVALVE_SENSOR_ID = 782
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the microBees climate platform."""
     coordinator: MicroBeesUpdateCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/microbees/coordinator.py b/homeassistant/components/microbees/coordinator.py
index af207507e77..0094dc33e81 100644
--- a/homeassistant/components/microbees/coordinator.py
+++ b/homeassistant/components/microbees/coordinator.py
@@ -9,6 +9,7 @@ import logging
 import aiohttp
 from microBeesPy import Actuator, Bee, MicroBees, MicroBeesException, Sensor
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -28,11 +29,16 @@ class MicroBeesCoordinatorData:
 class MicroBeesUpdateCoordinator(DataUpdateCoordinator[MicroBeesCoordinatorData]):
     """MicroBees coordinator."""
 
-    def __init__(self, hass: HomeAssistant, microbees: MicroBees) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, microbees: MicroBees
+    ) -> None:
         """Initialize microBees coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="microBees Coordinator",
             update_interval=timedelta(seconds=30),
         )
diff --git a/homeassistant/components/microbees/cover.py b/homeassistant/components/microbees/cover.py
index b6d5d366d89..fe87fcddd62 100644
--- a/homeassistant/components/microbees/cover.py
+++ b/homeassistant/components/microbees/cover.py
@@ -12,7 +12,7 @@ from homeassistant.components.cover import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 
 from .const import DOMAIN
@@ -23,7 +23,9 @@ COVER_IDS = {47: "roller_shutter"}
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the microBees cover platform."""
     coordinator: MicroBeesUpdateCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/microbees/light.py b/homeassistant/components/microbees/light.py
index 654cdc37182..a7ff60dc64a 100644
--- a/homeassistant/components/microbees/light.py
+++ b/homeassistant/components/microbees/light.py
@@ -6,7 +6,7 @@ from homeassistant.components.light import ATTR_RGBW_COLOR, ColorMode, LightEnti
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import MicroBeesUpdateCoordinator
@@ -14,7 +14,9 @@ from .entity import MicroBeesActuatorEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Config entry."""
     coordinator: MicroBeesUpdateCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/microbees/sensor.py b/homeassistant/components/microbees/sensor.py
index 360422de735..e4be463ab10 100644
--- a/homeassistant/components/microbees/sensor.py
+++ b/homeassistant/components/microbees/sensor.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import MicroBeesUpdateCoordinator
@@ -63,7 +63,9 @@ SENSOR_TYPES = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Config entry."""
     coordinator = hass.data[DOMAIN][entry.entry_id].coordinator
diff --git a/homeassistant/components/microbees/switch.py b/homeassistant/components/microbees/switch.py
index 1d668d041e1..deda2d78d09 100644
--- a/homeassistant/components/microbees/switch.py
+++ b/homeassistant/components/microbees/switch.py
@@ -6,7 +6,7 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import MicroBeesUpdateCoordinator
@@ -17,7 +17,9 @@ SWITCH_PRODUCT_IDS = {25, 26, 27, 35, 38, 46, 63, 64, 65, 86}
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Config entry."""
     coordinator = hass.data[DOMAIN][entry.entry_id].coordinator
diff --git a/homeassistant/components/microsoft/tts.py b/homeassistant/components/microsoft/tts.py
index aa33072089f..b5e770601b4 100644
--- a/homeassistant/components/microsoft/tts.py
+++ b/homeassistant/components/microsoft/tts.py
@@ -13,7 +13,7 @@ from homeassistant.components.tts import (
 )
 from homeassistant.const import CONF_API_KEY, CONF_REGION, CONF_TYPE, PERCENTAGE
 from homeassistant.generated.microsoft_tts import SUPPORTED_LANGUAGES
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 CONF_GENDER = "gender"
 CONF_OUTPUT = "output"
diff --git a/homeassistant/components/microsoft_face/__init__.py b/homeassistant/components/microsoft_face/__init__.py
index fa4de7f9c99..23c9885e0c5 100644
--- a/homeassistant/components/microsoft_face/__init__.py
+++ b/homeassistant/components/microsoft_face/__init__.py
@@ -16,8 +16,8 @@ from homeassistant.components import camera
 from homeassistant.const import ATTR_NAME, CONF_API_KEY, CONF_TIMEOUT, CONTENT_TYPE_JSON
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.typing import ConfigType
diff --git a/homeassistant/components/microsoft_face_detect/image_processing.py b/homeassistant/components/microsoft_face_detect/image_processing.py
index 80037a29fa8..ce49f0b1f65 100644
--- a/homeassistant/components/microsoft_face_detect/image_processing.py
+++ b/homeassistant/components/microsoft_face_detect/image_processing.py
@@ -17,7 +17,7 @@ from homeassistant.components.microsoft_face import DATA_MICROSOFT_FACE
 from homeassistant.const import CONF_ENTITY_ID, CONF_NAME, CONF_SOURCE
 from homeassistant.core import HomeAssistant, split_entity_id
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/microsoft_face_identify/image_processing.py b/homeassistant/components/microsoft_face_identify/image_processing.py
index 03a6ad22fcd..025a7eccdda 100644
--- a/homeassistant/components/microsoft_face_identify/image_processing.py
+++ b/homeassistant/components/microsoft_face_identify/image_processing.py
@@ -16,7 +16,7 @@ from homeassistant.components.microsoft_face import DATA_MICROSOFT_FACE
 from homeassistant.const import ATTR_NAME, CONF_ENTITY_ID, CONF_NAME, CONF_SOURCE
 from homeassistant.core import HomeAssistant, split_entity_id
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/mikrotik/__init__.py b/homeassistant/components/mikrotik/__init__.py
index cecf96a6c3e..4e17653c05a 100644
--- a/homeassistant/components/mikrotik/__init__.py
+++ b/homeassistant/components/mikrotik/__init__.py
@@ -1,19 +1,16 @@
 """The Mikrotik component."""
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import device_registry as dr
 
 from .const import ATTR_MANUFACTURER, DOMAIN
-from .coordinator import MikrotikDataUpdateCoordinator, get_api
+from .coordinator import MikrotikConfigEntry, MikrotikDataUpdateCoordinator, get_api
 from .errors import CannotConnect, LoginError
 
 PLATFORMS = [Platform.DEVICE_TRACKER]
 
-type MikrotikConfigEntry = ConfigEntry[MikrotikDataUpdateCoordinator]
-
 
 async def async_setup_entry(
     hass: HomeAssistant, config_entry: MikrotikConfigEntry
@@ -47,6 +44,8 @@ async def async_setup_entry(
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, config_entry: MikrotikConfigEntry
+) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(config_entry, PLATFORMS)
diff --git a/homeassistant/components/mikrotik/coordinator.py b/homeassistant/components/mikrotik/coordinator.py
index 6cb36d58fbe..c68b13eeca8 100644
--- a/homeassistant/components/mikrotik/coordinator.py
+++ b/homeassistant/components/mikrotik/coordinator.py
@@ -45,6 +45,8 @@ from .errors import CannotConnect, LoginError
 
 _LOGGER = logging.getLogger(__name__)
 
+type MikrotikConfigEntry = ConfigEntry[MikrotikDataUpdateCoordinator]
+
 
 class MikrotikData:
     """Handle all communication with the Mikrotik API."""
@@ -246,17 +248,21 @@ class MikrotikData:
 class MikrotikDataUpdateCoordinator(DataUpdateCoordinator[None]):
     """Mikrotik Hub Object."""
 
+    config_entry: MikrotikConfigEntry
+
     def __init__(
-        self, hass: HomeAssistant, config_entry: ConfigEntry, api: librouteros.Api
+        self,
+        hass: HomeAssistant,
+        config_entry: MikrotikConfigEntry,
+        api: librouteros.Api,
     ) -> None:
         """Initialize the Mikrotik Client."""
-        self.hass = hass
-        self.config_entry: ConfigEntry = config_entry
-        self._mk_data = MikrotikData(self.hass, self.config_entry, api)
+        self._mk_data = MikrotikData(hass, config_entry, api)
         super().__init__(
-            self.hass,
+            hass,
             _LOGGER,
-            name=f"{DOMAIN} - {self.host}",
+            config_entry=config_entry,
+            name=f"{DOMAIN} - {config_entry.data[CONF_HOST]}",
             update_interval=timedelta(seconds=10),
         )
 
diff --git a/homeassistant/components/mikrotik/device.py b/homeassistant/components/mikrotik/device.py
index bf3cb47adc3..7963c48d936 100644
--- a/homeassistant/components/mikrotik/device.py
+++ b/homeassistant/components/mikrotik/device.py
@@ -5,8 +5,7 @@ from __future__ import annotations
 from datetime import datetime
 from typing import Any
 
-from homeassistant.util import slugify
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util, slugify
 
 from .const import ATTR_DEVICE_TRACKER
 
diff --git a/homeassistant/components/mikrotik/device_tracker.py b/homeassistant/components/mikrotik/device_tracker.py
index c2d9e0d2f33..f7bc10e31d4 100644
--- a/homeassistant/components/mikrotik/device_tracker.py
+++ b/homeassistant/components/mikrotik/device_tracker.py
@@ -10,18 +10,17 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
-from . import MikrotikConfigEntry
-from .coordinator import Device, MikrotikDataUpdateCoordinator
+from .coordinator import Device, MikrotikConfigEntry, MikrotikDataUpdateCoordinator
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: MikrotikConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up device tracker for Mikrotik component."""
     coordinator = config_entry.runtime_data
@@ -55,7 +54,7 @@ async def async_setup_entry(
 @callback
 def update_items(
     coordinator: MikrotikDataUpdateCoordinator,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     tracked: dict[str, MikrotikDataUpdateCoordinatorTracker],
 ) -> None:
     """Update tracked device state from the hub."""
diff --git a/homeassistant/components/mill/__init__.py b/homeassistant/components/mill/__init__.py
index 116b3ef0341..2fcf2033930 100644
--- a/homeassistant/components/mill/__init__.py
+++ b/homeassistant/components/mill/__init__.py
@@ -47,9 +47,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     except TimeoutError as error:
         raise ConfigEntryNotReady from error
     data_coordinator = MillDataUpdateCoordinator(
-        hass,
-        mill_data_connection=mill_data_connection,
-        update_interval=update_interval,
+        hass, entry, mill_data_connection, update_interval
     )
 
     await data_coordinator.async_config_entry_first_refresh()
diff --git a/homeassistant/components/mill/climate.py b/homeassistant/components/mill/climate.py
index 0df2fe9335e..ba496923a30 100644
--- a/homeassistant/components/mill/climate.py
+++ b/homeassistant/components/mill/climate.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
@@ -54,7 +54,9 @@ SET_ROOM_TEMP_SCHEMA = vol.Schema(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Mill climate."""
     if entry.data.get(CONNECTION_TYPE) == LOCAL:
@@ -105,10 +107,8 @@ class MillHeater(MillBaseEntity, ClimateEntity):
         self, coordinator: MillDataUpdateCoordinator, device: mill.Heater
     ) -> None:
         """Initialize the thermostat."""
-
-        super().__init__(coordinator, device)
         self._attr_unique_id = device.device_id
-        self._update_attr(device)
+        super().__init__(coordinator, device)
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
diff --git a/homeassistant/components/mill/coordinator.py b/homeassistant/components/mill/coordinator.py
index 9821519ca84..ae527f8cce5 100644
--- a/homeassistant/components/mill/coordinator.py
+++ b/homeassistant/components/mill/coordinator.py
@@ -8,6 +8,7 @@ import logging
 from mill import Mill
 from mill_local import Mill as MillLocal
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -19,12 +20,14 @@ _LOGGER = logging.getLogger(__name__)
 class MillDataUpdateCoordinator(DataUpdateCoordinator):
     """Class to manage fetching Mill data."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
-        update_interval: timedelta | None = None,
-        *,
+        config_entry: ConfigEntry,
         mill_data_connection: Mill | MillLocal,
+        update_interval: timedelta,
     ) -> None:
         """Initialize global Mill data updater."""
         self.mill_data_connection = mill_data_connection
@@ -32,6 +35,7 @@ class MillDataUpdateCoordinator(DataUpdateCoordinator):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_method=mill_data_connection.fetch_heater_and_sensor_data,
             update_interval=update_interval,
diff --git a/homeassistant/components/mill/entity.py b/homeassistant/components/mill/entity.py
index f24dbeb2c26..06056aba336 100644
--- a/homeassistant/components/mill/entity.py
+++ b/homeassistant/components/mill/entity.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from abc import abstractmethod
 
-from mill import Heater, MillDevice
+from mill import MillDevice
 
 from homeassistant.core import callback
 from homeassistant.helpers.device_registry import DeviceInfo
@@ -45,7 +45,7 @@ class MillBaseEntity(CoordinatorEntity[MillDataUpdateCoordinator]):
 
     @abstractmethod
     @callback
-    def _update_attr(self, device: MillDevice | Heater) -> None:
+    def _update_attr(self, device: MillDevice) -> None:
         """Update the attribute of the entity."""
 
     @property
diff --git a/homeassistant/components/mill/manifest.json b/homeassistant/components/mill/manifest.json
index 6316eb72096..44c1136b7d5 100644
--- a/homeassistant/components/mill/manifest.json
+++ b/homeassistant/components/mill/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/mill",
   "iot_class": "local_polling",
   "loggers": ["mill", "mill_local"],
-  "requirements": ["millheater==0.12.2", "mill-local==0.3.0"]
+  "requirements": ["millheater==0.12.3", "mill-local==0.3.0"]
 }
diff --git a/homeassistant/components/mill/number.py b/homeassistant/components/mill/number.py
index af27159caf0..8433a9853c6 100644
--- a/homeassistant/components/mill/number.py
+++ b/homeassistant/components/mill/number.py
@@ -2,13 +2,13 @@
 
 from __future__ import annotations
 
-from mill import MillDevice
+from mill import Heater, MillDevice
 
 from homeassistant.components.number import NumberDeviceClass, NumberEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_USERNAME, UnitOfPower
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CLOUD, CONNECTION_TYPE, DOMAIN
 from .coordinator import MillDataUpdateCoordinator
@@ -16,7 +16,9 @@ from .entity import MillBaseEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Mill Number."""
     if entry.data.get(CONNECTION_TYPE) == CLOUD:
@@ -27,6 +29,7 @@ async def async_setup_entry(
         async_add_entities(
             MillNumber(mill_data_coordinator, mill_device)
             for mill_device in mill_data_coordinator.data.values()
+            if isinstance(mill_device, Heater)
         )
 
 
@@ -45,9 +48,8 @@ class MillNumber(MillBaseEntity, NumberEntity):
         mill_device: MillDevice,
     ) -> None:
         """Initialize the number."""
-        super().__init__(coordinator, mill_device)
         self._attr_unique_id = f"{mill_device.device_id}_max_heating_power"
-        self._update_attr(mill_device)
+        super().__init__(coordinator, mill_device)
 
     @callback
     def _update_attr(self, device: MillDevice) -> None:
diff --git a/homeassistant/components/mill/sensor.py b/homeassistant/components/mill/sensor.py
index 018b9466deb..3a47cb427d2 100644
--- a/homeassistant/components/mill/sensor.py
+++ b/homeassistant/components/mill/sensor.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -146,7 +146,9 @@ SOCKET_SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Mill sensor."""
     if entry.data.get(CONNECTION_TYPE) == LOCAL:
@@ -192,9 +194,9 @@ class MillSensor(MillBaseEntity, SensorEntity):
         mill_device: mill.Socket | mill.Heater,
     ) -> None:
         """Initialize the sensor."""
-        super().__init__(coordinator, mill_device)
         self.entity_description = entity_description
         self._attr_unique_id = f"{mill_device.device_id}_{entity_description.key}"
+        super().__init__(coordinator, mill_device)
 
     @callback
     def _update_attr(self, device):
diff --git a/homeassistant/components/min_max/sensor.py b/homeassistant/components/min_max/sensor.py
index 89252a58864..9039c3e9e24 100644
--- a/homeassistant/components/min_max/sensor.py
+++ b/homeassistant/components/min_max/sensor.py
@@ -25,7 +25,10 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, EventStateChangedData, HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.helpers.reload import async_setup_reload_service
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, StateType
@@ -75,7 +78,7 @@ PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize min/max/mean config entry."""
     registry = er.async_get(hass)
diff --git a/homeassistant/components/minecraft_server/__init__.py b/homeassistant/components/minecraft_server/__init__.py
index f937c304471..d8f60380a6c 100644
--- a/homeassistant/components/minecraft_server/__init__.py
+++ b/homeassistant/components/minecraft_server/__init__.py
@@ -9,23 +9,13 @@ import dns.rdata
 import dns.rdataclass
 import dns.rdatatype
 
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import (
-    CONF_ADDRESS,
-    CONF_HOST,
-    CONF_NAME,
-    CONF_PORT,
-    CONF_TYPE,
-    Platform,
-)
+from homeassistant.const import CONF_ADDRESS, CONF_HOST, CONF_PORT, Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.exceptions import ConfigEntryNotReady
-import homeassistant.helpers.device_registry as dr
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 
 from .api import MinecraftServer, MinecraftServerAddressError, MinecraftServerType
 from .const import DOMAIN, KEY_LATENCY, KEY_MOTD
-from .coordinator import MinecraftServerCoordinator
+from .coordinator import MinecraftServerConfigEntry, MinecraftServerCoordinator
 
 PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR]
 
@@ -39,32 +29,18 @@ def load_dnspython_rdata_classes() -> None:
             dns.rdata.get_rdata_class(dns.rdataclass.IN, rdtype)  # type: ignore[no-untyped-call]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(
+    hass: HomeAssistant, entry: MinecraftServerConfigEntry
+) -> bool:
     """Set up Minecraft Server from a config entry."""
 
     # Workaround to avoid blocking imports from dnspython (https://github.com/rthalley/dnspython/issues/1083)
     await hass.async_add_executor_job(load_dnspython_rdata_classes)
 
-    # Create API instance.
-    api = MinecraftServer(
-        hass,
-        entry.data.get(CONF_TYPE, MinecraftServerType.JAVA_EDITION),
-        entry.data[CONF_ADDRESS],
-    )
-
-    # Initialize API instance.
-    try:
-        await api.async_initialize()
-    except MinecraftServerAddressError as error:
-        raise ConfigEntryNotReady(f"Initialization failed: {error}") from error
-
-    # Create coordinator instance.
-    coordinator = MinecraftServerCoordinator(hass, entry.data[CONF_NAME], api)
+    # Create coordinator instance and store it.
+    coordinator = MinecraftServerCoordinator(hass, entry)
     await coordinator.async_config_entry_first_refresh()
-
-    # Store coordinator instance.
-    domain_data = hass.data.setdefault(DOMAIN, {})
-    domain_data[entry.entry_id] = coordinator
+    entry.runtime_data = coordinator
 
     # Set up platforms.
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
@@ -72,21 +48,16 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, config_entry: MinecraftServerConfigEntry
+) -> bool:
     """Unload Minecraft Server config entry."""
-
-    # Unload platforms.
-    unload_ok = await hass.config_entries.async_unload_platforms(
-        config_entry, PLATFORMS
-    )
-
-    # Clean up.
-    hass.data[DOMAIN].pop(config_entry.entry_id)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(config_entry, PLATFORMS)
 
 
-async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_migrate_entry(
+    hass: HomeAssistant, config_entry: MinecraftServerConfigEntry
+) -> bool:
     """Migrate old config entry to a new format."""
 
     # 1 --> 2: Use config entry ID as base for unique IDs.
@@ -160,7 +131,9 @@ async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
 
 
 async def _async_migrate_device_identifiers(
-    hass: HomeAssistant, config_entry: ConfigEntry, old_unique_id: str | None
+    hass: HomeAssistant,
+    config_entry: MinecraftServerConfigEntry,
+    old_unique_id: str | None,
 ) -> None:
     """Migrate the device identifiers to the new format."""
     device_registry = dr.async_get(hass)
diff --git a/homeassistant/components/minecraft_server/binary_sensor.py b/homeassistant/components/minecraft_server/binary_sensor.py
index 60f2e00da0e..a7279040a6d 100644
--- a/homeassistant/components/minecraft_server/binary_sensor.py
+++ b/homeassistant/components/minecraft_server/binary_sensor.py
@@ -5,12 +5,10 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN
-from .coordinator import MinecraftServerCoordinator
+from .coordinator import MinecraftServerConfigEntry, MinecraftServerCoordinator
 from .entity import MinecraftServerEntity
 
 KEY_STATUS = "status"
@@ -24,14 +22,17 @@ BINARY_SENSOR_DESCRIPTIONS = [
     ),
 ]
 
+# Coordinator is used to centralize the data updates.
+PARALLEL_UPDATES = 0
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: MinecraftServerConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Minecraft Server binary sensor platform."""
-    coordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
 
     # Add binary sensor entities.
     async_add_entities(
@@ -49,7 +50,7 @@ class MinecraftServerBinarySensorEntity(MinecraftServerEntity, BinarySensorEntit
         self,
         coordinator: MinecraftServerCoordinator,
         description: BinarySensorEntityDescription,
-        config_entry: ConfigEntry,
+        config_entry: MinecraftServerConfigEntry,
     ) -> None:
         """Initialize binary sensor base entity."""
         super().__init__(coordinator, config_entry)
diff --git a/homeassistant/components/minecraft_server/config_flow.py b/homeassistant/components/minecraft_server/config_flow.py
index 3ffdc33f3b2..d0f7cf5a8fb 100644
--- a/homeassistant/components/minecraft_server/config_flow.py
+++ b/homeassistant/components/minecraft_server/config_flow.py
@@ -8,10 +8,10 @@ from typing import Any
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_ADDRESS, CONF_NAME, CONF_TYPE
+from homeassistant.const import CONF_ADDRESS, CONF_TYPE
 
 from .api import MinecraftServer, MinecraftServerAddressError, MinecraftServerType
-from .const import DEFAULT_NAME, DOMAIN
+from .const import DOMAIN
 
 DEFAULT_ADDRESS = "localhost:25565"
 
@@ -37,7 +37,6 @@ class MinecraftServerConfigFlow(ConfigFlow, domain=DOMAIN):
 
             # Prepare config entry data.
             config_data = {
-                CONF_NAME: user_input[CONF_NAME],
                 CONF_ADDRESS: address,
             }
 
@@ -78,9 +77,6 @@ class MinecraftServerConfigFlow(ConfigFlow, domain=DOMAIN):
             step_id="user",
             data_schema=vol.Schema(
                 {
-                    vol.Required(
-                        CONF_NAME, default=user_input.get(CONF_NAME, DEFAULT_NAME)
-                    ): str,
                     vol.Required(
                         CONF_ADDRESS,
                         default=user_input.get(CONF_ADDRESS, DEFAULT_ADDRESS),
diff --git a/homeassistant/components/minecraft_server/const.py b/homeassistant/components/minecraft_server/const.py
index e7a58741696..35a1c0dd5a5 100644
--- a/homeassistant/components/minecraft_server/const.py
+++ b/homeassistant/components/minecraft_server/const.py
@@ -1,7 +1,5 @@
 """Constants for the Minecraft Server integration."""
 
-DEFAULT_NAME = "Minecraft Server"
-
 DOMAIN = "minecraft_server"
 
 KEY_LATENCY = "latency"
diff --git a/homeassistant/components/minecraft_server/coordinator.py b/homeassistant/components/minecraft_server/coordinator.py
index 37eeb9f2ac2..457b0700535 100644
--- a/homeassistant/components/minecraft_server/coordinator.py
+++ b/homeassistant/components/minecraft_server/coordinator.py
@@ -5,16 +5,23 @@ from __future__ import annotations
 from datetime import timedelta
 import logging
 
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_ADDRESS, CONF_TYPE
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .api import (
     MinecraftServer,
+    MinecraftServerAddressError,
     MinecraftServerConnectionError,
     MinecraftServerData,
     MinecraftServerNotInitializedError,
+    MinecraftServerType,
 )
 
+type MinecraftServerConfigEntry = ConfigEntry[MinecraftServerCoordinator]
+
 SCAN_INTERVAL = timedelta(seconds=60)
 
 _LOGGER = logging.getLogger(__name__)
@@ -23,17 +30,40 @@ _LOGGER = logging.getLogger(__name__)
 class MinecraftServerCoordinator(DataUpdateCoordinator[MinecraftServerData]):
     """Minecraft Server data update coordinator."""
 
-    def __init__(self, hass: HomeAssistant, name: str, api: MinecraftServer) -> None:
+    config_entry: MinecraftServerConfigEntry
+    _api: MinecraftServer
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: MinecraftServerConfigEntry,
+    ) -> None:
         """Initialize coordinator instance."""
-        self._api = api
 
         super().__init__(
             hass=hass,
-            name=name,
+            name=config_entry.title,
+            config_entry=config_entry,
             logger=_LOGGER,
             update_interval=SCAN_INTERVAL,
         )
 
+    async def _async_setup(self) -> None:
+        """Set up the Minecraft Server data coordinator."""
+
+        # Create API instance.
+        self._api = MinecraftServer(
+            self.hass,
+            self.config_entry.data.get(CONF_TYPE, MinecraftServerType.JAVA_EDITION),
+            self.config_entry.data[CONF_ADDRESS],
+        )
+
+        # Initialize API instance.
+        try:
+            await self._api.async_initialize()
+        except MinecraftServerAddressError as error:
+            raise ConfigEntryNotReady(f"Initialization failed: {error}") from error
+
     async def _async_update_data(self) -> MinecraftServerData:
         """Get updated data from the server."""
         try:
diff --git a/homeassistant/components/minecraft_server/diagnostics.py b/homeassistant/components/minecraft_server/diagnostics.py
index 0bcffe1434a..dd94411b969 100644
--- a/homeassistant/components/minecraft_server/diagnostics.py
+++ b/homeassistant/components/minecraft_server/diagnostics.py
@@ -5,20 +5,19 @@ from dataclasses import asdict
 from typing import Any
 
 from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_ADDRESS, CONF_NAME
+from homeassistant.const import CONF_ADDRESS
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
+from .coordinator import MinecraftServerConfigEntry
 
-TO_REDACT: Iterable[Any] = {CONF_ADDRESS, CONF_NAME, "players_list"}
+TO_REDACT: Iterable[Any] = {CONF_ADDRESS, "players_list"}
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, config_entry: ConfigEntry
+    hass: HomeAssistant, config_entry: MinecraftServerConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    coordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
 
     return {
         "config_entry": {
diff --git a/homeassistant/components/minecraft_server/manifest.json b/homeassistant/components/minecraft_server/manifest.json
index d6ade4853c9..be399a3c8dc 100644
--- a/homeassistant/components/minecraft_server/manifest.json
+++ b/homeassistant/components/minecraft_server/manifest.json
@@ -6,5 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/minecraft_server",
   "iot_class": "local_polling",
   "loggers": ["dnspython", "mcstatus"],
+  "quality_scale": "silver",
   "requirements": ["mcstatus==11.1.1"]
 }
diff --git a/homeassistant/components/minecraft_server/quality_scale.yaml b/homeassistant/components/minecraft_server/quality_scale.yaml
index fc3db3b3075..288e58fad39 100644
--- a/homeassistant/components/minecraft_server/quality_scale.yaml
+++ b/homeassistant/components/minecraft_server/quality_scale.yaml
@@ -6,22 +6,15 @@ rules:
   appropriate-polling: done
   brands: done
   common-modules: done
-  config-flow:
-    status: todo
-    comment: Check removal and replacement of name in config flow with the title (server address).
-  config-flow-test-coverage:
-    status: todo
-    comment: |
-      Merge test_show_config_form with full flow test.
-      Move full flow test to the top of all tests.
-      All test cases should end in either CREATE_ENTRY or ABORT.
+  config-flow: done
+  config-flow-test-coverage: done
   dependency-transparency: done
   docs-actions:
     status: exempt
     comment: Integration doesn't provide any service actions.
   docs-high-level-description: done
   docs-installation-instructions: done
-  docs-removal-instructions: todo
+  docs-removal-instructions: done
   entity-event-setup:
     status: done
     comment: Handled by coordinator.
@@ -29,7 +22,7 @@ rules:
     status: done
     comment: Using confid entry ID as the dependency mcstatus doesn't provide a unique information.
   has-entity-name: done
-  runtime-data: todo
+  runtime-data: done
   test-before-configure: done
   test-before-setup:
     status: done
@@ -58,11 +51,7 @@ rules:
   log-when-unavailable:
     status: done
     comment: Handled by coordinator.
-  parallel-updates:
-    status: todo
-    comment: |
-      Although this is handled by the coordinator and no service actions are provided,
-      PARALLEL_UPDATES should still be set to 0 in binary_sensor and sensor according to the rule.
+  parallel-updates: done
   reauthentication-flow:
     status: exempt
     comment: No authentication is required for the integration.
diff --git a/homeassistant/components/minecraft_server/sensor.py b/homeassistant/components/minecraft_server/sensor.py
index fae004a015e..cfc16c7724d 100644
--- a/homeassistant/components/minecraft_server/sensor.py
+++ b/homeassistant/components/minecraft_server/sensor.py
@@ -7,15 +7,14 @@ from dataclasses import dataclass
 from typing import Any
 
 from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_TYPE, EntityCategory, UnitOfTime
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .api import MinecraftServerData, MinecraftServerType
-from .const import DOMAIN, KEY_LATENCY, KEY_MOTD
-from .coordinator import MinecraftServerCoordinator
+from .const import KEY_LATENCY, KEY_MOTD
+from .coordinator import MinecraftServerConfigEntry, MinecraftServerCoordinator
 from .entity import MinecraftServerEntity
 
 ATTR_PLAYERS_LIST = "players_list"
@@ -31,6 +30,9 @@ KEY_VERSION = "version"
 UNIT_PLAYERS_MAX = "players"
 UNIT_PLAYERS_ONLINE = "players"
 
+# Coordinator is used to centralize the data updates.
+PARALLEL_UPDATES = 0
+
 
 @dataclass(frozen=True, kw_only=True)
 class MinecraftServerSensorEntityDescription(SensorEntityDescription):
@@ -158,11 +160,11 @@ SENSOR_DESCRIPTIONS = [
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: MinecraftServerConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Minecraft Server sensor platform."""
-    coordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
 
     # Add sensor entities.
     async_add_entities(
@@ -184,7 +186,7 @@ class MinecraftServerSensorEntity(MinecraftServerEntity, SensorEntity):
         self,
         coordinator: MinecraftServerCoordinator,
         description: MinecraftServerSensorEntityDescription,
-        config_entry: ConfigEntry,
+        config_entry: MinecraftServerConfigEntry,
     ) -> None:
         """Initialize sensor base entity."""
         super().__init__(coordinator, config_entry)
diff --git a/homeassistant/components/minecraft_server/strings.json b/homeassistant/components/minecraft_server/strings.json
index c084c9e6df0..cb4670dcac4 100644
--- a/homeassistant/components/minecraft_server/strings.json
+++ b/homeassistant/components/minecraft_server/strings.json
@@ -2,12 +2,14 @@
   "config": {
     "step": {
       "user": {
-        "title": "Link your Minecraft Server",
-        "description": "Set up your Minecraft Server instance to allow monitoring.",
         "data": {
-          "name": "[%key:common::config_flow::data::name%]",
           "address": "Server address"
-        }
+        },
+        "data_description": {
+          "address": "The hostname, IP address or SRV record of your Minecraft server, optionally including the port."
+        },
+        "title": "Link your Minecraft Server",
+        "description": "Set up your Minecraft Server instance to allow monitoring."
       }
     },
     "abort": {
diff --git a/homeassistant/components/minio/__init__.py b/homeassistant/components/minio/__init__.py
index 57a9632a6ff..18a82f3a8ed 100644
--- a/homeassistant/components/minio/__init__.py
+++ b/homeassistant/components/minio/__init__.py
@@ -11,7 +11,7 @@ import voluptuous as vol
 
 from homeassistant.const import EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .minio_helper import MinioEventThread, create_minio_client
diff --git a/homeassistant/components/mjpeg/camera.py b/homeassistant/components/mjpeg/camera.py
index dcb2eff2fd6..c60f1c4d760 100644
--- a/homeassistant/components/mjpeg/camera.py
+++ b/homeassistant/components/mjpeg/camera.py
@@ -27,7 +27,7 @@ from homeassistant.helpers.aiohttp_client import (
     async_get_clientsession,
 )
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.httpx_client import get_async_client
 
 from .const import CONF_MJPEG_URL, CONF_STILL_IMAGE_URL, DOMAIN, LOGGER
@@ -39,7 +39,7 @@ BUFFER_SIZE = 102400
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a MJPEG IP Camera based on a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/moat/sensor.py b/homeassistant/components/moat/sensor.py
index 66edfbe91f2..e968577d789 100644
--- a/homeassistant/components/moat/sensor.py
+++ b/homeassistant/components/moat/sensor.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from .const import DOMAIN
@@ -105,7 +105,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Moat BLE sensors."""
     coordinator: PassiveBluetoothProcessorCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/mobile_app/binary_sensor.py b/homeassistant/components/mobile_app/binary_sensor.py
index e19e00b1277..8f8b8d97295 100644
--- a/homeassistant/components/mobile_app/binary_sensor.py
+++ b/homeassistant/components/mobile_app/binary_sensor.py
@@ -8,7 +8,7 @@ from homeassistant.const import CONF_WEBHOOK_ID, STATE_ON
 from homeassistant.core import HomeAssistant, State, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     ATTR_SENSOR_ATTRIBUTES,
@@ -28,7 +28,7 @@ from .entity import MobileAppEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up mobile app binary sensor from a config entry."""
     entities = []
diff --git a/homeassistant/components/mobile_app/device_tracker.py b/homeassistant/components/mobile_app/device_tracker.py
index 7e84930e2e9..7e5a0a291b6 100644
--- a/homeassistant/components/mobile_app/device_tracker.py
+++ b/homeassistant/components/mobile_app/device_tracker.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from .const import (
@@ -33,7 +33,9 @@ ATTR_KEYS = (ATTR_ALTITUDE, ATTR_COURSE, ATTR_SPEED, ATTR_VERTICAL_ACCURACY)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Mobile app based off an entry."""
     entity = MobileAppEntity(entry)
diff --git a/homeassistant/components/mobile_app/notify.py b/homeassistant/components/mobile_app/notify.py
index c0efd302c47..1980c80ce69 100644
--- a/homeassistant/components/mobile_app/notify.py
+++ b/homeassistant/components/mobile_app/notify.py
@@ -21,7 +21,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import (
     ATTR_APP_DATA,
diff --git a/homeassistant/components/mobile_app/sensor.py b/homeassistant/components/mobile_app/sensor.py
index 06ab924aba2..8200ad1fccd 100644
--- a/homeassistant/components/mobile_app/sensor.py
+++ b/homeassistant/components/mobile_app/sensor.py
@@ -11,7 +11,7 @@ from homeassistant.const import CONF_WEBHOOK_ID, STATE_UNKNOWN, UnitOfTemperatur
 from homeassistant.core import HomeAssistant, State, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util import dt as dt_util
 
@@ -36,7 +36,7 @@ from .webhook import _extract_sensor_unique_id
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up mobile app sensor from a config entry."""
     entities = []
diff --git a/homeassistant/components/mochad/__init__.py b/homeassistant/components/mochad/__init__.py
index c8714c902a3..9e992b5babd 100644
--- a/homeassistant/components/mochad/__init__.py
+++ b/homeassistant/components/mochad/__init__.py
@@ -13,7 +13,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/modbus/__init__.py b/homeassistant/components/modbus/__init__.py
index 1a331e16482..52642cc32e3 100644
--- a/homeassistant/components/modbus/__init__.py
+++ b/homeassistant/components/modbus/__init__.py
@@ -48,7 +48,7 @@ from homeassistant.const import (
     SERVICE_RELOAD,
 )
 from homeassistant.core import Event, HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import async_get_platforms
 from homeassistant.helpers.reload import async_integration_yaml_config
 from homeassistant.helpers.service import async_register_admin_service
@@ -79,6 +79,16 @@ from .const import (
     CONF_FAN_MODE_TOP,
     CONF_FAN_MODE_VALUES,
     CONF_FANS,
+    CONF_HVAC_ACTION_COOLING,
+    CONF_HVAC_ACTION_DEFROSTING,
+    CONF_HVAC_ACTION_DRYING,
+    CONF_HVAC_ACTION_FAN,
+    CONF_HVAC_ACTION_HEATING,
+    CONF_HVAC_ACTION_IDLE,
+    CONF_HVAC_ACTION_OFF,
+    CONF_HVAC_ACTION_PREHEATING,
+    CONF_HVAC_ACTION_REGISTER,
+    CONF_HVAC_ACTION_VALUES,
     CONF_HVAC_MODE_AUTO,
     CONF_HVAC_MODE_COOL,
     CONF_HVAC_MODE_DRY,
@@ -90,6 +100,7 @@ from .const import (
     CONF_HVAC_MODE_VALUES,
     CONF_HVAC_OFF_VALUE,
     CONF_HVAC_ON_VALUE,
+    CONF_HVAC_ONOFF_COIL,
     CONF_HVAC_ONOFF_REGISTER,
     CONF_INPUT_TYPE,
     CONF_MAX_TEMP,
@@ -258,7 +269,8 @@ CLIMATE_SCHEMA = vol.All(
             vol.Optional(CONF_MIN_TEMP, default=5): vol.Coerce(float),
             vol.Optional(CONF_STEP, default=0.5): vol.Coerce(float),
             vol.Optional(CONF_TEMPERATURE_UNIT, default=DEFAULT_TEMP_UNIT): cv.string,
-            vol.Optional(CONF_HVAC_ONOFF_REGISTER): cv.positive_int,
+            vol.Exclusive(CONF_HVAC_ONOFF_COIL, "hvac_onoff_type"): cv.positive_int,
+            vol.Exclusive(CONF_HVAC_ONOFF_REGISTER, "hvac_onoff_type"): cv.positive_int,
             vol.Optional(
                 CONF_HVAC_ON_VALUE, default=DEFAULT_HVAC_ON_VALUE
             ): cv.positive_int,
@@ -295,6 +307,45 @@ CLIMATE_SCHEMA = vol.All(
                     vol.Optional(CONF_WRITE_REGISTERS, default=False): cv.boolean,
                 }
             ),
+            vol.Optional(CONF_HVAC_ACTION_REGISTER): vol.Maybe(
+                {
+                    CONF_ADDRESS: cv.positive_int,
+                    CONF_HVAC_ACTION_VALUES: {
+                        vol.Optional(CONF_HVAC_ACTION_COOLING): vol.Any(
+                            cv.positive_int, [cv.positive_int]
+                        ),
+                        vol.Optional(CONF_HVAC_ACTION_DEFROSTING): vol.Any(
+                            cv.positive_int, [cv.positive_int]
+                        ),
+                        vol.Optional(CONF_HVAC_ACTION_DRYING): vol.Any(
+                            cv.positive_int, [cv.positive_int]
+                        ),
+                        vol.Optional(CONF_HVAC_ACTION_FAN): vol.Any(
+                            cv.positive_int, [cv.positive_int]
+                        ),
+                        vol.Optional(CONF_HVAC_ACTION_HEATING): vol.Any(
+                            cv.positive_int, [cv.positive_int]
+                        ),
+                        vol.Optional(CONF_HVAC_ACTION_IDLE): vol.Any(
+                            cv.positive_int, [cv.positive_int]
+                        ),
+                        vol.Optional(CONF_HVAC_ACTION_OFF): vol.Any(
+                            cv.positive_int, [cv.positive_int]
+                        ),
+                        vol.Optional(CONF_HVAC_ACTION_PREHEATING): vol.Any(
+                            cv.positive_int, [cv.positive_int]
+                        ),
+                    },
+                    vol.Optional(
+                        CONF_INPUT_TYPE, default=CALL_TYPE_REGISTER_HOLDING
+                    ): vol.In(
+                        [
+                            CALL_TYPE_REGISTER_HOLDING,
+                            CALL_TYPE_REGISTER_INPUT,
+                        ]
+                    ),
+                }
+            ),
             vol.Optional(CONF_FAN_MODE_REGISTER): vol.Maybe(
                 vol.All(
                     {
diff --git a/homeassistant/components/modbus/climate.py b/homeassistant/components/modbus/climate.py
index e1a2688048d..be10a9495c6 100644
--- a/homeassistant/components/modbus/climate.py
+++ b/homeassistant/components/modbus/climate.py
@@ -24,6 +24,7 @@ from homeassistant.components.climate import (
     SWING_VERTICAL,
     ClimateEntity,
     ClimateEntityFeature,
+    HVACAction,
     HVACMode,
 )
 from homeassistant.const import (
@@ -43,7 +44,9 @@ from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import get_hub
 from .const import (
+    CALL_TYPE_COIL,
     CALL_TYPE_REGISTER_HOLDING,
+    CALL_TYPE_WRITE_COIL,
     CALL_TYPE_WRITE_REGISTER,
     CALL_TYPE_WRITE_REGISTERS,
     CONF_CLIMATES,
@@ -59,6 +62,16 @@ from .const import (
     CONF_FAN_MODE_REGISTER,
     CONF_FAN_MODE_TOP,
     CONF_FAN_MODE_VALUES,
+    CONF_HVAC_ACTION_COOLING,
+    CONF_HVAC_ACTION_DEFROSTING,
+    CONF_HVAC_ACTION_DRYING,
+    CONF_HVAC_ACTION_FAN,
+    CONF_HVAC_ACTION_HEATING,
+    CONF_HVAC_ACTION_IDLE,
+    CONF_HVAC_ACTION_OFF,
+    CONF_HVAC_ACTION_PREHEATING,
+    CONF_HVAC_ACTION_REGISTER,
+    CONF_HVAC_ACTION_VALUES,
     CONF_HVAC_MODE_AUTO,
     CONF_HVAC_MODE_COOL,
     CONF_HVAC_MODE_DRY,
@@ -70,7 +83,9 @@ from .const import (
     CONF_HVAC_MODE_VALUES,
     CONF_HVAC_OFF_VALUE,
     CONF_HVAC_ON_VALUE,
+    CONF_HVAC_ONOFF_COIL,
     CONF_HVAC_ONOFF_REGISTER,
+    CONF_INPUT_TYPE,
     CONF_MAX_TEMP,
     CONF_MIN_TEMP,
     CONF_STEP,
@@ -185,6 +200,34 @@ class ModbusThermostat(BaseStructPlatform, RestoreEntity, ClimateEntity):
             self._attr_hvac_mode = HVACMode.AUTO
             self._attr_hvac_modes = [HVACMode.AUTO]
 
+        if CONF_HVAC_ACTION_REGISTER in config:
+            action_config = config[CONF_HVAC_ACTION_REGISTER]
+            self._hvac_action_register = action_config[CONF_ADDRESS]
+            self._hvac_action_type = action_config[CONF_INPUT_TYPE]
+
+            self._attr_hvac_action = None
+            self._hvac_action_mapping: list[tuple[int, HVACAction]] = []
+            action_value_config = action_config[CONF_HVAC_ACTION_VALUES]
+
+            for hvac_action_kw, hvac_action in (
+                (CONF_HVAC_ACTION_COOLING, HVACAction.COOLING),
+                (CONF_HVAC_ACTION_DEFROSTING, HVACAction.DEFROSTING),
+                (CONF_HVAC_ACTION_DRYING, HVACAction.DRYING),
+                (CONF_HVAC_ACTION_FAN, HVACAction.FAN),
+                (CONF_HVAC_ACTION_HEATING, HVACAction.HEATING),
+                (CONF_HVAC_ACTION_IDLE, HVACAction.IDLE),
+                (CONF_HVAC_ACTION_OFF, HVACAction.OFF),
+                (CONF_HVAC_ACTION_PREHEATING, HVACAction.PREHEATING),
+            ):
+                if hvac_action_kw in action_value_config:
+                    values = action_value_config[hvac_action_kw]
+                    if not isinstance(values, list):
+                        values = [values]
+                    for value in values:
+                        self._hvac_action_mapping.append((value, hvac_action))
+        else:
+            self._hvac_action_register = None
+
         if CONF_FAN_MODE_REGISTER in config:
             self._attr_supported_features = (
                 self._attr_supported_features | ClimateEntityFeature.FAN_MODE
@@ -213,7 +256,6 @@ class ModbusThermostat(BaseStructPlatform, RestoreEntity, ClimateEntity):
                     self._fan_mode_mapping_from_modbus[value] = fan_mode
                     self._fan_mode_mapping_to_modbus[fan_mode] = value
                     self._attr_fan_modes.append(fan_mode)
-
         else:
             # No FAN modes defined
             self._fan_mode_register = None
@@ -254,6 +296,13 @@ class ModbusThermostat(BaseStructPlatform, RestoreEntity, ClimateEntity):
         else:
             self._hvac_onoff_register = None
 
+        if CONF_HVAC_ONOFF_COIL in config:
+            self._hvac_onoff_coil = config[CONF_HVAC_ONOFF_COIL]
+            if HVACMode.OFF not in self._attr_hvac_modes:
+                self._attr_hvac_modes.append(HVACMode.OFF)
+        else:
+            self._hvac_onoff_coil = None
+
     async def async_added_to_hass(self) -> None:
         """Handle entity which will be added."""
         await self.async_base_added_to_hass()
@@ -287,6 +336,15 @@ class ModbusThermostat(BaseStructPlatform, RestoreEntity, ClimateEntity):
                     CALL_TYPE_WRITE_REGISTER,
                 )
 
+        if self._hvac_onoff_coil is not None:
+            # Turn HVAC Off by writing 0 to the On/Off coil, or 1 otherwise.
+            await self._hub.async_pb_call(
+                self._slave,
+                self._hvac_onoff_coil,
+                0 if hvac_mode == HVACMode.OFF else 1,
+                CALL_TYPE_WRITE_COIL,
+            )
+
         if self._hvac_mode_register is not None:
             # Write a value to the mode register for the desired mode.
             for value, mode in self._hvac_mode_mapping:
@@ -438,6 +496,20 @@ class ModbusThermostat(BaseStructPlatform, RestoreEntity, ClimateEntity):
                         self._attr_hvac_mode = mode
                         break
 
+        # Read the HVAC action register if defined
+        if self._hvac_action_register is not None:
+            hvac_action = await self._async_read_register(
+                self._hvac_action_type, self._hvac_action_register, raw=True
+            )
+
+            # Translate the value received
+            if hvac_action is not None:
+                self._attr_hvac_action = None
+                for value, action in self._hvac_action_mapping:
+                    if hvac_action == value:
+                        self._attr_hvac_action = action
+                        break
+
         # Read the Fan mode register if defined
         if self._fan_mode_register is not None:
             fan_mode = await self._async_read_register(
@@ -484,6 +556,11 @@ class ModbusThermostat(BaseStructPlatform, RestoreEntity, ClimateEntity):
             if onoff == self._hvac_off_value:
                 self._attr_hvac_mode = HVACMode.OFF
 
+        if self._hvac_onoff_coil is not None:
+            onoff = await self._async_read_coil(self._hvac_onoff_coil)
+            if onoff == 0:
+                self._attr_hvac_mode = HVACMode.OFF
+
     async def _async_read_register(
         self, register_type: str, register: int, raw: bool | None = False
     ) -> float | None:
@@ -508,3 +585,11 @@ class ModbusThermostat(BaseStructPlatform, RestoreEntity, ClimateEntity):
             return None
         self._attr_available = True
         return float(self._value)
+
+    async def _async_read_coil(self, address: int) -> int | None:
+        result = await self._hub.async_pb_call(self._slave, address, 1, CALL_TYPE_COIL)
+        if result is not None and result.bits is not None:
+            self._attr_available = True
+            return int(result.bits[0])
+        self._attr_available = False
+        return None
diff --git a/homeassistant/components/modbus/const.py b/homeassistant/components/modbus/const.py
index e11e15fff20..634637a6b08 100644
--- a/homeassistant/components/modbus/const.py
+++ b/homeassistant/components/modbus/const.py
@@ -62,6 +62,17 @@ CONF_HVAC_MODE_REGISTER = "hvac_mode_register"
 CONF_HVAC_ONOFF_REGISTER = "hvac_onoff_register"
 CONF_HVAC_ON_VALUE = "hvac_on_value"
 CONF_HVAC_OFF_VALUE = "hvac_off_value"
+CONF_HVAC_ONOFF_COIL = "hvac_onoff_coil"
+CONF_HVAC_ACTION_REGISTER = "hvac_action_register"
+CONF_HVAC_ACTION_COOLING = "action_cooling"
+CONF_HVAC_ACTION_DEFROSTING = "action_defrosting"
+CONF_HVAC_ACTION_DRYING = "action_drying"
+CONF_HVAC_ACTION_FAN = "action_fan"
+CONF_HVAC_ACTION_HEATING = "action_heating"
+CONF_HVAC_ACTION_IDLE = "action_idle"
+CONF_HVAC_ACTION_OFF = "action_off"
+CONF_HVAC_ACTION_PREHEATING = "action_preheating"
+CONF_HVAC_ACTION_VALUES = "values"
 CONF_HVAC_MODE_OFF = "state_off"
 CONF_HVAC_MODE_HEAT = "state_heat"
 CONF_HVAC_MODE_COOL = "state_cool"
diff --git a/homeassistant/components/modbus/entity.py b/homeassistant/components/modbus/entity.py
index 35b7c02aa05..4684c2f2b8a 100644
--- a/homeassistant/components/modbus/entity.py
+++ b/homeassistant/components/modbus/entity.py
@@ -74,6 +74,11 @@ _LOGGER = logging.getLogger(__name__)
 class BasePlatform(Entity):
     """Base for readonly platforms."""
 
+    _value: str | None = None
+    _attr_should_poll = False
+    _attr_available = True
+    _attr_unit_of_measurement = None
+
     def __init__(
         self, hass: HomeAssistant, hub: ModbusHub, entry: dict[str, Any]
     ) -> None:
@@ -86,17 +91,13 @@ class BasePlatform(Entity):
             self._slave = entry.get(CONF_DEVICE_ADDRESS, 1)
         self._address = int(entry[CONF_ADDRESS])
         self._input_type = entry[CONF_INPUT_TYPE]
-        self._value: str | None = None
         self._scan_interval = int(entry[CONF_SCAN_INTERVAL])
         self._cancel_timer: Callable[[], None] | None = None
         self._cancel_call: Callable[[], None] | None = None
 
         self._attr_unique_id = entry.get(CONF_UNIQUE_ID)
         self._attr_name = entry[CONF_NAME]
-        self._attr_should_poll = False
         self._attr_device_class = entry.get(CONF_DEVICE_CLASS)
-        self._attr_available = True
-        self._attr_unit_of_measurement = None
 
         def get_optional_numeric_config(config_name: str) -> int | float | None:
             if (val := entry.get(config_name)) is None:
diff --git a/homeassistant/components/modbus/modbus.py b/homeassistant/components/modbus/modbus.py
index 319c68f50f0..006ef504590 100644
--- a/homeassistant/components/modbus/modbus.py
+++ b/homeassistant/components/modbus/modbus.py
@@ -30,7 +30,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.core import Event, HomeAssistant, ServiceCall, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.event import async_call_later
@@ -384,6 +384,11 @@ class ModbusHub:
             {ATTR_SLAVE: slave} if slave is not None else {ATTR_SLAVE: 1}
         )
         entry = self._pb_request[use_call]
+
+        if use_call in {"write_registers", "write_coils"}:
+            if not isinstance(value, list):
+                value = [value]
+
         kwargs[entry.value_attr_name] = value
         try:
             result: ModbusPDU = await entry.func(address, **kwargs)
diff --git a/homeassistant/components/modbus/strings.json b/homeassistant/components/modbus/strings.json
index 7b55022645e..347549dc837 100644
--- a/homeassistant/components/modbus/strings.json
+++ b/homeassistant/components/modbus/strings.json
@@ -2,11 +2,11 @@
   "services": {
     "reload": {
       "name": "[%key:common::action::reload%]",
-      "description": "Reloads all modbus entities."
+      "description": "Reloads all Modbus entities."
     },
     "write_coil": {
       "name": "Write coil",
-      "description": "Writes to a modbus coil.",
+      "description": "Writes to a Modbus coil.",
       "fields": {
         "address": {
           "name": "Address",
@@ -17,8 +17,8 @@
           "description": "State to write."
         },
         "slave": {
-          "name": "Slave",
-          "description": "Address of the modbus unit/slave."
+          "name": "Server",
+          "description": "Address of the Modbus unit/server."
         },
         "hub": {
           "name": "Hub",
@@ -28,7 +28,7 @@
     },
     "write_register": {
       "name": "Write register",
-      "description": "Writes to a modbus holding register.",
+      "description": "Writes to a Modbus holding register.",
       "fields": {
         "address": {
           "name": "[%key:component::modbus::services::write_coil::fields::address::name%]",
diff --git a/homeassistant/components/modem_callerid/button.py b/homeassistant/components/modem_callerid/button.py
index 3cad9062be9..954a638818d 100644
--- a/homeassistant/components/modem_callerid/button.py
+++ b/homeassistant/components/modem_callerid/button.py
@@ -9,13 +9,15 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DEVICE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DATA_KEY_API, DOMAIN
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Modem Caller ID sensor."""
     api = hass.data[DOMAIN][entry.entry_id][DATA_KEY_API]
diff --git a/homeassistant/components/modem_callerid/sensor.py b/homeassistant/components/modem_callerid/sensor.py
index 00c821f3511..de8e4b2f73c 100644
--- a/homeassistant/components/modem_callerid/sensor.py
+++ b/homeassistant/components/modem_callerid/sensor.py
@@ -9,13 +9,15 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP, STATE_IDLE
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CID, DATA_KEY_API, DOMAIN
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Modem Caller ID sensor."""
     api = hass.data[DOMAIN][entry.entry_id][DATA_KEY_API]
diff --git a/homeassistant/components/modern_forms/__init__.py b/homeassistant/components/modern_forms/__init__.py
index ef2bbad70ce..901e3f431a1 100644
--- a/homeassistant/components/modern_forms/__init__.py
+++ b/homeassistant/components/modern_forms/__init__.py
@@ -9,7 +9,7 @@ from typing import Any, Concatenate
 from aiomodernforms import ModernFormsConnectionError, ModernFormsError
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_HOST, Platform
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
 from .const import DOMAIN
@@ -30,7 +30,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up a Modern Forms device from a config entry."""
 
     # Create Modern Forms instance for this entry
-    coordinator = ModernFormsDataUpdateCoordinator(hass, host=entry.data[CONF_HOST])
+    coordinator = ModernFormsDataUpdateCoordinator(hass, entry)
     await coordinator.async_config_entry_first_refresh()
 
     hass.data.setdefault(DOMAIN, {})
diff --git a/homeassistant/components/modern_forms/binary_sensor.py b/homeassistant/components/modern_forms/binary_sensor.py
index ea903c580a4..2bba85f54d7 100644
--- a/homeassistant/components/modern_forms/binary_sensor.py
+++ b/homeassistant/components/modern_forms/binary_sensor.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from .const import CLEAR_TIMER, DOMAIN
@@ -16,7 +16,7 @@ from .entity import ModernFormsDeviceEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Modern Forms binary sensors."""
     coordinator: ModernFormsDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/modern_forms/coordinator.py b/homeassistant/components/modern_forms/coordinator.py
index ecd928aa922..203ba54380d 100644
--- a/homeassistant/components/modern_forms/coordinator.py
+++ b/homeassistant/components/modern_forms/coordinator.py
@@ -8,6 +8,8 @@ import logging
 from aiomodernforms import ModernFormsDevice, ModernFormsError
 from aiomodernforms.models import Device as ModernFormsDeviceState
 
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -21,20 +23,22 @@ _LOGGER = logging.getLogger(__name__)
 class ModernFormsDataUpdateCoordinator(DataUpdateCoordinator[ModernFormsDeviceState]):
     """Class to manage fetching Modern Forms data from single endpoint."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
-        *,
-        host: str,
+        config_entry: ConfigEntry,
     ) -> None:
         """Initialize global Modern Forms data updater."""
         self.modern_forms = ModernFormsDevice(
-            host, session=async_get_clientsession(hass)
+            config_entry.data[CONF_HOST], session=async_get_clientsession(hass)
         )
 
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/modern_forms/fan.py b/homeassistant/components/modern_forms/fan.py
index 988edcb60e5..26c69b28a5c 100644
--- a/homeassistant/components/modern_forms/fan.py
+++ b/homeassistant/components/modern_forms/fan.py
@@ -11,7 +11,7 @@ from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
     ranged_value_to_percentage,
@@ -35,7 +35,7 @@ from .entity import ModernFormsDeviceEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Modern Forms platform from config entry."""
 
diff --git a/homeassistant/components/modern_forms/light.py b/homeassistant/components/modern_forms/light.py
index 2b53a414cea..6216efe3ff4 100644
--- a/homeassistant/components/modern_forms/light.py
+++ b/homeassistant/components/modern_forms/light.py
@@ -11,7 +11,7 @@ from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEnti
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
     ranged_value_to_percentage,
@@ -36,7 +36,7 @@ BRIGHTNESS_RANGE = (1, 255)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Modern Forms platform from config entry."""
 
diff --git a/homeassistant/components/modern_forms/sensor.py b/homeassistant/components/modern_forms/sensor.py
index 0f1e90cbe52..aa7d163cfdc 100644
--- a/homeassistant/components/modern_forms/sensor.py
+++ b/homeassistant/components/modern_forms/sensor.py
@@ -7,7 +7,7 @@ from datetime import datetime
 from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util import dt as dt_util
 
@@ -19,7 +19,7 @@ from .entity import ModernFormsDeviceEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Modern Forms sensor based on a config entry."""
     coordinator: ModernFormsDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/modern_forms/switch.py b/homeassistant/components/modern_forms/switch.py
index f2e8b1b705c..89a5b779d74 100644
--- a/homeassistant/components/modern_forms/switch.py
+++ b/homeassistant/components/modern_forms/switch.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import modernforms_exception_handler
 from .const import DOMAIN
@@ -18,7 +18,7 @@ from .entity import ModernFormsDeviceEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Modern Forms switch based on a config entry."""
     coordinator: ModernFormsDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/moehlenhoff_alpha2/__init__.py b/homeassistant/components/moehlenhoff_alpha2/__init__.py
index 244e3bc701b..b015f9a09dd 100644
--- a/homeassistant/components/moehlenhoff_alpha2/__init__.py
+++ b/homeassistant/components/moehlenhoff_alpha2/__init__.py
@@ -17,7 +17,7 @@ PLATFORMS = [Platform.BINARY_SENSOR, Platform.BUTTON, Platform.CLIMATE, Platform
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up a config entry."""
     base = Alpha2Base(entry.data[CONF_HOST])
-    coordinator = Alpha2BaseCoordinator(hass, base)
+    coordinator = Alpha2BaseCoordinator(hass, entry, base)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/moehlenhoff_alpha2/binary_sensor.py b/homeassistant/components/moehlenhoff_alpha2/binary_sensor.py
index 1e7018ff1c7..a7479aef5e8 100644
--- a/homeassistant/components/moehlenhoff_alpha2/binary_sensor.py
+++ b/homeassistant/components/moehlenhoff_alpha2/binary_sensor.py
@@ -7,7 +7,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
@@ -17,7 +17,7 @@ from .coordinator import Alpha2BaseCoordinator
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Alpha2 sensor entities from a config_entry."""
 
diff --git a/homeassistant/components/moehlenhoff_alpha2/button.py b/homeassistant/components/moehlenhoff_alpha2/button.py
index c7ac574724a..57f9d0e31a2 100644
--- a/homeassistant/components/moehlenhoff_alpha2/button.py
+++ b/homeassistant/components/moehlenhoff_alpha2/button.py
@@ -4,7 +4,7 @@ from homeassistant.components.button import ButtonEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import dt as dt_util
 
@@ -15,7 +15,7 @@ from .coordinator import Alpha2BaseCoordinator
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Alpha2 button entities."""
 
diff --git a/homeassistant/components/moehlenhoff_alpha2/climate.py b/homeassistant/components/moehlenhoff_alpha2/climate.py
index 7c24dad4469..85d5939049e 100644
--- a/homeassistant/components/moehlenhoff_alpha2/climate.py
+++ b/homeassistant/components/moehlenhoff_alpha2/climate.py
@@ -12,7 +12,7 @@ from homeassistant.components.climate import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, PRESET_AUTO, PRESET_DAY, PRESET_NIGHT
@@ -24,7 +24,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Alpha2Climate entities from a config_entry."""
 
diff --git a/homeassistant/components/moehlenhoff_alpha2/coordinator.py b/homeassistant/components/moehlenhoff_alpha2/coordinator.py
index 2bac4b49575..50c2f9a5297 100644
--- a/homeassistant/components/moehlenhoff_alpha2/coordinator.py
+++ b/homeassistant/components/moehlenhoff_alpha2/coordinator.py
@@ -8,6 +8,7 @@ import logging
 import aiohttp
 from moehlenhoff_alpha2 import Alpha2Base
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
@@ -20,12 +21,17 @@ UPDATE_INTERVAL = timedelta(seconds=60)
 class Alpha2BaseCoordinator(DataUpdateCoordinator[dict[str, dict]]):
     """Keep the base instance in one place and centralize the update."""
 
-    def __init__(self, hass: HomeAssistant, base: Alpha2Base) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, base: Alpha2Base
+    ) -> None:
         """Initialize Alpha2Base data updater."""
         self.base = base
         super().__init__(
             hass=hass,
             logger=_LOGGER,
+            config_entry=config_entry,
             name="alpha2_base",
             update_interval=UPDATE_INTERVAL,
         )
diff --git a/homeassistant/components/moehlenhoff_alpha2/manifest.json b/homeassistant/components/moehlenhoff_alpha2/manifest.json
index 14f40991a84..45b7f8c9565 100644
--- a/homeassistant/components/moehlenhoff_alpha2/manifest.json
+++ b/homeassistant/components/moehlenhoff_alpha2/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/moehlenhoff_alpha2",
   "iot_class": "local_push",
-  "requirements": ["moehlenhoff-alpha2==1.3.1"]
+  "requirements": ["moehlenhoff-alpha2==1.4.0"]
 }
diff --git a/homeassistant/components/moehlenhoff_alpha2/sensor.py b/homeassistant/components/moehlenhoff_alpha2/sensor.py
index 5286257ff61..306e80e54d3 100644
--- a/homeassistant/components/moehlenhoff_alpha2/sensor.py
+++ b/homeassistant/components/moehlenhoff_alpha2/sensor.py
@@ -4,7 +4,7 @@ from homeassistant.components.sensor import SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
@@ -14,7 +14,7 @@ from .coordinator import Alpha2BaseCoordinator
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Alpha2 sensor entities from a config_entry."""
 
diff --git a/homeassistant/components/mold_indicator/sensor.py b/homeassistant/components/mold_indicator/sensor.py
index 262d13ad3af..451cc65fb55 100644
--- a/homeassistant/components/mold_indicator/sensor.py
+++ b/homeassistant/components/mold_indicator/sensor.py
@@ -34,9 +34,12 @@ from homeassistant.core import (
     State,
     callback,
 )
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.device import async_device_info_to_link_from_entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util.unit_conversion import TemperatureConverter
@@ -105,7 +108,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Mold indicator sensor entry."""
     name: str = entry.options[CONF_NAME]
diff --git a/homeassistant/components/monarch_money/__init__.py b/homeassistant/components/monarch_money/__init__.py
index 5f9aba7dd07..8b7cfa6aa5b 100644
--- a/homeassistant/components/monarch_money/__init__.py
+++ b/homeassistant/components/monarch_money/__init__.py
@@ -4,13 +4,10 @@ from __future__ import annotations
 
 from typedmonarchmoney import TypedMonarchMoney
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_TOKEN, Platform
 from homeassistant.core import HomeAssistant
 
-from .coordinator import MonarchMoneyDataUpdateCoordinator
-
-type MonarchMoneyConfigEntry = ConfigEntry[MonarchMoneyDataUpdateCoordinator]
+from .coordinator import MonarchMoneyConfigEntry, MonarchMoneyDataUpdateCoordinator
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
@@ -21,7 +18,7 @@ async def async_setup_entry(
     """Set up Monarch Money from a config entry."""
     monarch_client = TypedMonarchMoney(token=entry.data.get(CONF_TOKEN))
 
-    mm_coordinator = MonarchMoneyDataUpdateCoordinator(hass, monarch_client)
+    mm_coordinator = MonarchMoneyDataUpdateCoordinator(hass, entry, monarch_client)
     await mm_coordinator.async_config_entry_first_refresh()
     entry.runtime_data = mm_coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
diff --git a/homeassistant/components/monarch_money/coordinator.py b/homeassistant/components/monarch_money/coordinator.py
index 3e689c48e91..7f3dac9419f 100644
--- a/homeassistant/components/monarch_money/coordinator.py
+++ b/homeassistant/components/monarch_money/coordinator.py
@@ -30,21 +30,26 @@ class MonarchData:
     cashflow_summary: MonarchCashflowSummary
 
 
+type MonarchMoneyConfigEntry = ConfigEntry[MonarchMoneyDataUpdateCoordinator]
+
+
 class MonarchMoneyDataUpdateCoordinator(DataUpdateCoordinator[MonarchData]):
     """Data update coordinator for Monarch Money."""
 
-    config_entry: ConfigEntry
+    config_entry: MonarchMoneyConfigEntry
     subscription_id: str
 
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: MonarchMoneyConfigEntry,
         client: TypedMonarchMoney,
     ) -> None:
         """Initialize the coordinator."""
         super().__init__(
             hass=hass,
             logger=LOGGER,
+            config_entry=config_entry,
             name="monarchmoney",
             update_interval=timedelta(hours=4),
         )
diff --git a/homeassistant/components/monarch_money/manifest.json b/homeassistant/components/monarch_money/manifest.json
index ed28f825bcf..d45415bbcd7 100644
--- a/homeassistant/components/monarch_money/manifest.json
+++ b/homeassistant/components/monarch_money/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/monarchmoney",
   "iot_class": "cloud_polling",
-  "requirements": ["typedmonarchmoney==0.3.1"]
+  "requirements": ["typedmonarchmoney==0.4.4"]
 }
diff --git a/homeassistant/components/monarch_money/sensor.py b/homeassistant/components/monarch_money/sensor.py
index fe7c728cf41..1597d9820a1 100644
--- a/homeassistant/components/monarch_money/sensor.py
+++ b/homeassistant/components/monarch_money/sensor.py
@@ -14,10 +14,10 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CURRENCY_DOLLAR, PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import MonarchMoneyConfigEntry
+from .coordinator import MonarchMoneyConfigEntry
 from .entity import MonarchMoneyAccountEntity, MonarchMoneyCashFlowEntity
 
 
@@ -110,7 +110,7 @@ MONARCH_CASHFLOW_SENSORS: tuple[MonarchMoneyCashflowSensorEntityDescription, ...
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: MonarchMoneyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Monarch Money sensors for config entries."""
     mm_coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/monoprice/media_player.py b/homeassistant/components/monoprice/media_player.py
index 2dde0832440..9d678c16874 100644
--- a/homeassistant/components/monoprice/media_player.py
+++ b/homeassistant/components/monoprice/media_player.py
@@ -16,7 +16,7 @@ from homeassistant.const import CONF_PORT
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform, service
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CONF_SOURCES,
@@ -58,7 +58,7 @@ def _get_sources(config_entry):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Monoprice 6-zone amplifier platform."""
     port = config_entry.data[CONF_PORT]
diff --git a/homeassistant/components/monzo/__init__.py b/homeassistant/components/monzo/__init__.py
index a88082b2ce6..662cfecd2e9 100644
--- a/homeassistant/components/monzo/__init__.py
+++ b/homeassistant/components/monzo/__init__.py
@@ -26,7 +26,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     external_api = AuthenticatedMonzoAPI(async_get_clientsession(hass), session)
 
-    coordinator = MonzoCoordinator(hass, external_api)
+    coordinator = MonzoCoordinator(hass, entry, external_api)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/monzo/coordinator.py b/homeassistant/components/monzo/coordinator.py
index caac551f986..06c751a23e0 100644
--- a/homeassistant/components/monzo/coordinator.py
+++ b/homeassistant/components/monzo/coordinator.py
@@ -8,6 +8,7 @@ from typing import Any
 
 from monzopy import AuthorisationExpiredError, InvalidMonzoAPIResponseError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -29,11 +30,16 @@ class MonzoData:
 class MonzoCoordinator(DataUpdateCoordinator[MonzoData]):
     """Class to manage fetching Monzo data from the API."""
 
-    def __init__(self, hass: HomeAssistant, api: AuthenticatedMonzoAPI) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, api: AuthenticatedMonzoAPI
+    ) -> None:
         """Initialize."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(minutes=1),
         )
diff --git a/homeassistant/components/monzo/sensor.py b/homeassistant/components/monzo/sensor.py
index 41b97d90452..0b6ab2b70a5 100644
--- a/homeassistant/components/monzo/sensor.py
+++ b/homeassistant/components/monzo/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import MonzoCoordinator
@@ -65,7 +65,7 @@ MODEL_POT = "Pot"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Defer sensor setup to the shared sensor module."""
     coordinator: MonzoCoordinator = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/moon/sensor.py b/homeassistant/components/moon/sensor.py
index 1e2674a24bf..12d0ff3ed41 100644
--- a/homeassistant/components/moon/sensor.py
+++ b/homeassistant/components/moon/sensor.py
@@ -8,8 +8,8 @@ from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN
 
@@ -26,7 +26,7 @@ STATE_WAXING_GIBBOUS = "waxing_gibbous"
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the platform from config_entry."""
     async_add_entities([MoonSensorEntity(entry)], True)
diff --git a/homeassistant/components/mopeka/config_flow.py b/homeassistant/components/mopeka/config_flow.py
index 2e35ff4283f..e5b7d5d7dd2 100644
--- a/homeassistant/components/mopeka/config_flow.py
+++ b/homeassistant/components/mopeka/config_flow.py
@@ -111,7 +111,7 @@ class MopekaConfigFlow(ConfigFlow, domain=DOMAIN):
                 data={CONF_MEDIUM_TYPE: user_input[CONF_MEDIUM_TYPE]},
             )
 
-        current_addresses = self._async_current_ids()
+        current_addresses = self._async_current_ids(include_ignore=False)
         for discovery_info in async_discovered_service_info(self.hass, False):
             address = discovery_info.address
             if address in current_addresses or address in self._discovered_devices:
diff --git a/homeassistant/components/mopeka/sensor.py b/homeassistant/components/mopeka/sensor.py
index 0f67efaea1e..53c93f771f2 100644
--- a/homeassistant/components/mopeka/sensor.py
+++ b/homeassistant/components/mopeka/sensor.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from . import MopekaConfigEntry
@@ -115,7 +115,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: MopekaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Mopeka BLE sensors."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/motion_blinds/__init__.py b/homeassistant/components/motion_blinds/__init__.py
index 182ea310029..2abcc273e23 100644
--- a/homeassistant/components/motion_blinds/__init__.py
+++ b/homeassistant/components/motion_blinds/__init__.py
@@ -1,18 +1,18 @@
 """The motion_blinds component."""
 
 import asyncio
-from datetime import timedelta
 import logging
 from typing import TYPE_CHECKING
 
 from motionblinds import AsyncMotionMulticast
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_HOST, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 
 from .const import (
+    CONF_BLIND_TYPE_LIST,
     CONF_INTERFACE,
     CONF_WAIT_FOR_PUSH,
     DEFAULT_INTERFACE,
@@ -25,7 +25,6 @@ from .const import (
     KEY_SETUP_LOCK,
     KEY_UNSUB_STOP,
     PLATFORMS,
-    UPDATE_INTERVAL,
 )
 from .coordinator import DataUpdateCoordinatorMotionBlinds
 from .gateway import ConnectMotionGateway
@@ -41,6 +40,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     key = entry.data[CONF_API_KEY]
     multicast_interface = entry.data.get(CONF_INTERFACE, DEFAULT_INTERFACE)
     wait_for_push = entry.options.get(CONF_WAIT_FOR_PUSH, DEFAULT_WAIT_FOR_PUSH)
+    blind_type_list = entry.data.get(CONF_BLIND_TYPE_LIST)
 
     # Create multicast Listener
     async with setup_lock:
@@ -83,7 +83,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     # Connect to motion gateway
     multicast = hass.data[DOMAIN][KEY_MULTICAST_LISTENER]
     connect_gateway_class = ConnectMotionGateway(hass, multicast)
-    if not await connect_gateway_class.async_connect_gateway(host, key):
+    if not await connect_gateway_class.async_connect_gateway(
+        host, key, blind_type_list
+    ):
         raise ConfigEntryNotReady
     motion_gateway = connect_gateway_class.gateway_device
     api_lock = asyncio.Lock()
@@ -94,15 +96,17 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     }
 
     coordinator = DataUpdateCoordinatorMotionBlinds(
-        hass,
-        _LOGGER,
-        coordinator_info,
-        # Name of the data. For logging purposes.
-        name=entry.title,
-        # Polling interval. Will only be polled if there are subscribers.
-        update_interval=timedelta(seconds=UPDATE_INTERVAL),
+        hass, entry, _LOGGER, coordinator_info
     )
 
+    # store blind type list for next time
+    if entry.data.get(CONF_BLIND_TYPE_LIST) != motion_gateway.blind_type_list:
+        data = {
+            **entry.data,
+            CONF_BLIND_TYPE_LIST: motion_gateway.blind_type_list,
+        }
+        hass.config_entries.async_update_entry(entry, data=data)
+
     # Fetch initial data so we have data when entities subscribe
     await coordinator.async_config_entry_first_refresh()
 
@@ -132,12 +136,7 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
         multicast.Unregister_motion_gateway(config_entry.data[CONF_HOST])
         hass.data[DOMAIN].pop(config_entry.entry_id)
 
-    loaded_entries = [
-        entry
-        for entry in hass.config_entries.async_entries(DOMAIN)
-        if entry.state == ConfigEntryState.LOADED
-    ]
-    if len(loaded_entries) == 1:
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
         # No motion gateways left, stop Motion multicast
         unsub_stop = hass.data[DOMAIN].pop(KEY_UNSUB_STOP)
         unsub_stop()
diff --git a/homeassistant/components/motion_blinds/button.py b/homeassistant/components/motion_blinds/button.py
index 89841bf8fd4..09f29e09c70 100644
--- a/homeassistant/components/motion_blinds/button.py
+++ b/homeassistant/components/motion_blinds/button.py
@@ -8,7 +8,7 @@ from homeassistant.components.button import ButtonEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, KEY_COORDINATOR, KEY_GATEWAY
 from .coordinator import DataUpdateCoordinatorMotionBlinds
@@ -18,7 +18,7 @@ from .entity import MotionCoordinatorEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Perform the setup for Motionblinds."""
     entities: list[ButtonEntity] = []
diff --git a/homeassistant/components/motion_blinds/config_flow.py b/homeassistant/components/motion_blinds/config_flow.py
index d8d1e7c21f1..954f9e25c21 100644
--- a/homeassistant/components/motion_blinds/config_flow.py
+++ b/homeassistant/components/motion_blinds/config_flow.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import logging
 from typing import Any
 
 from motionblinds import MotionDiscovery, MotionGateway
@@ -28,6 +29,8 @@ from .const import (
 )
 from .gateway import ConnectMotionGateway
 
+_LOGGER = logging.getLogger(__name__)
+
 CONFIG_SCHEMA = vol.Schema(
     {
         vol.Optional(CONF_HOST): str,
@@ -93,7 +96,8 @@ class MotionBlindsFlowHandler(ConfigFlow, domain=DOMAIN):
         try:
             # key not needed for GetDeviceList request
             await self.hass.async_add_executor_job(gateway.GetDeviceList)
-        except Exception:  # noqa: BLE001
+        except Exception:
+            _LOGGER.exception("Failed to connect to Motion Gateway")
             return self.async_abort(reason="not_motionblinds")
 
         if not gateway.available:
@@ -156,6 +160,7 @@ class MotionBlindsFlowHandler(ConfigFlow, domain=DOMAIN):
         errors: dict[str, str] = {}
         if user_input is not None:
             key = user_input[CONF_API_KEY]
+            assert self._host
 
             connect_gateway_class = ConnectMotionGateway(self.hass)
             if not await connect_gateway_class.async_connect_gateway(self._host, key):
diff --git a/homeassistant/components/motion_blinds/const.py b/homeassistant/components/motion_blinds/const.py
index 96067d7ceb0..950fa3ab4c7 100644
--- a/homeassistant/components/motion_blinds/const.py
+++ b/homeassistant/components/motion_blinds/const.py
@@ -8,6 +8,7 @@ DEFAULT_GATEWAY_NAME = "Motionblinds Gateway"
 
 PLATFORMS = [Platform.BUTTON, Platform.COVER, Platform.SENSOR]
 
+CONF_BLIND_TYPE_LIST = "blind_type_list"
 CONF_WAIT_FOR_PUSH = "wait_for_push"
 CONF_INTERFACE = "interface"
 DEFAULT_WAIT_FOR_PUSH = False
diff --git a/homeassistant/components/motion_blinds/coordinator.py b/homeassistant/components/motion_blinds/coordinator.py
index b2abd205ce5..79e26e5aed4 100644
--- a/homeassistant/components/motion_blinds/coordinator.py
+++ b/homeassistant/components/motion_blinds/coordinator.py
@@ -7,6 +7,7 @@ from typing import Any
 
 from motionblinds import DEVICE_TYPES_WIFI, ParseException
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -25,21 +26,22 @@ _LOGGER = logging.getLogger(__name__)
 class DataUpdateCoordinatorMotionBlinds(DataUpdateCoordinator):
     """Class to manage fetching data from single endpoint."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         logger: logging.Logger,
         coordinator_info: dict[str, Any],
-        *,
-        name: str,
-        update_interval: timedelta,
     ) -> None:
         """Initialize global data updater."""
         super().__init__(
             hass,
             logger,
-            name=name,
-            update_interval=update_interval,
+            config_entry=config_entry,
+            name=config_entry.title,
+            update_interval=timedelta(seconds=UPDATE_INTERVAL),
         )
 
         self.api_lock = coordinator_info[KEY_API_LOCK]
diff --git a/homeassistant/components/motion_blinds/cover.py b/homeassistant/components/motion_blinds/cover.py
index 1ea3a6ed9d6..dbf43e3d30f 100644
--- a/homeassistant/components/motion_blinds/cover.py
+++ b/homeassistant/components/motion_blinds/cover.py
@@ -18,7 +18,7 @@ from homeassistant.components.cover import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import VolDictType
 
 from .const import (
@@ -83,7 +83,7 @@ SET_ABSOLUTE_POSITION_SCHEMA: VolDictType = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Motion Blind from a config entry."""
     entities: list[MotionBaseDevice] = []
diff --git a/homeassistant/components/motion_blinds/gateway.py b/homeassistant/components/motion_blinds/gateway.py
index 44f7caa74b2..9826557919c 100644
--- a/homeassistant/components/motion_blinds/gateway.py
+++ b/homeassistant/components/motion_blinds/gateway.py
@@ -42,11 +42,16 @@ class ConnectMotionGateway:
         for blind in self.gateway_device.device_list.values():
             blind.Update_from_cache()
 
-    async def async_connect_gateway(self, host, key):
+    async def async_connect_gateway(
+        self,
+        host: str,
+        key: str,
+        blind_type_list: dict[str, int] | None = None,
+    ) -> bool:
         """Connect to the Motion Gateway."""
         _LOGGER.debug("Initializing with host %s (key %s)", host, key[:3])
         self._gateway_device = MotionGateway(
-            ip=host, key=key, multicast=self._multicast
+            ip=host, key=key, multicast=self._multicast, blind_type_list=blind_type_list
         )
         try:
             # update device info and get the connected sub devices
diff --git a/homeassistant/components/motion_blinds/manifest.json b/homeassistant/components/motion_blinds/manifest.json
index b327c146300..1654d5b5937 100644
--- a/homeassistant/components/motion_blinds/manifest.json
+++ b/homeassistant/components/motion_blinds/manifest.json
@@ -21,5 +21,5 @@
   "documentation": "https://www.home-assistant.io/integrations/motion_blinds",
   "iot_class": "local_push",
   "loggers": ["motionblinds"],
-  "requirements": ["motionblinds==0.6.25"]
+  "requirements": ["motionblinds==0.6.26"]
 }
diff --git a/homeassistant/components/motion_blinds/sensor.py b/homeassistant/components/motion_blinds/sensor.py
index 6418cebda0c..60d283aa0b6 100644
--- a/homeassistant/components/motion_blinds/sensor.py
+++ b/homeassistant/components/motion_blinds/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.const import (
     EntityCategory,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, KEY_COORDINATOR, KEY_GATEWAY
 from .entity import MotionCoordinatorEntity
@@ -26,7 +26,7 @@ ATTR_BATTERY_VOLTAGE = "battery_voltage"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Perform the setup for Motionblinds."""
     entities: list[SensorEntity] = []
diff --git a/homeassistant/components/motion_blinds/strings.json b/homeassistant/components/motion_blinds/strings.json
index ddbf928462a..12060cd69f0 100644
--- a/homeassistant/components/motion_blinds/strings.json
+++ b/homeassistant/components/motion_blinds/strings.json
@@ -3,20 +3,20 @@
     "flow_title": "{short_mac} ({ip_address})",
     "step": {
       "user": {
-        "description": "Connect to your Motion Gateway, if the IP address is not set, auto-discovery is used",
+        "description": "Connect to your Motionblinds gateway. If the IP address is not set, auto-discovery is used",
         "data": {
           "host": "[%key:common::config_flow::data::ip%]"
         }
       },
       "connect": {
-        "description": "You will need the 16 character API Key, see https://www.home-assistant.io/integrations/motion_blinds/#retrieving-the-key for instructions",
+        "description": "You will need the 16 character API key, see https://www.home-assistant.io/integrations/motion_blinds/#retrieving-the-api-key for instructions",
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]"
         }
       },
       "select": {
-        "title": "Select the Motion Gateway that you wish to connect",
-        "description": "Run the setup again if you want to connect additional Motion Gateways",
+        "title": "Select the Motionblinds gateway that you wish to connect",
+        "description": "Run the setup again if you want to connect additional Motionblinds gateways",
         "data": {
           "select_ip": "[%key:common::config_flow::data::ip%]"
         }
@@ -29,7 +29,7 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
       "connection_error": "[%key:common::config_flow::error::cannot_connect%]",
-      "not_motionblinds": "Discovered device is not a Motion gateway"
+      "not_motionblinds": "Discovered device is not a Motionblinds gateway"
     }
   },
   "options": {
diff --git a/homeassistant/components/motionblinds_ble/button.py b/homeassistant/components/motionblinds_ble/button.py
index a099276cd85..12fb6c7a513 100644
--- a/homeassistant/components/motionblinds_ble/button.py
+++ b/homeassistant/components/motionblinds_ble/button.py
@@ -13,7 +13,7 @@ from homeassistant.components.button import ButtonEntity, ButtonEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import ATTR_CONNECT, ATTR_DISCONNECT, ATTR_FAVORITE, CONF_MAC_CODE, DOMAIN
 from .entity import MotionblindsBLEEntity
@@ -53,7 +53,9 @@ BUTTON_TYPES: list[MotionblindsBLEButtonEntityDescription] = [
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up button entities based on a config entry."""
 
diff --git a/homeassistant/components/motionblinds_ble/cover.py b/homeassistant/components/motionblinds_ble/cover.py
index afeeb5b0d70..beaee8598b5 100644
--- a/homeassistant/components/motionblinds_ble/cover.py
+++ b/homeassistant/components/motionblinds_ble/cover.py
@@ -19,7 +19,7 @@ from homeassistant.components.cover import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_BLIND_TYPE, CONF_MAC_CODE, DOMAIN, ICON_VERTICAL_BLIND
 from .entity import MotionblindsBLEEntity
@@ -61,7 +61,9 @@ BLIND_TYPE_TO_ENTITY_DESCRIPTION: dict[str, MotionblindsBLECoverEntityDescriptio
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up cover entity based on a config entry."""
 
diff --git a/homeassistant/components/motionblinds_ble/select.py b/homeassistant/components/motionblinds_ble/select.py
index c297c887910..976f51a0a0f 100644
--- a/homeassistant/components/motionblinds_ble/select.py
+++ b/homeassistant/components/motionblinds_ble/select.py
@@ -11,7 +11,7 @@ from homeassistant.components.select import SelectEntity, SelectEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import ATTR_SPEED, CONF_MAC_CODE, DOMAIN
 from .entity import MotionblindsBLEEntity
@@ -32,7 +32,9 @@ SELECT_TYPES: dict[str, SelectEntityDescription] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up select entities based on a config entry."""
 
diff --git a/homeassistant/components/motionblinds_ble/sensor.py b/homeassistant/components/motionblinds_ble/sensor.py
index 740a0509a9e..8993a3b1cd5 100644
--- a/homeassistant/components/motionblinds_ble/sensor.py
+++ b/homeassistant/components/motionblinds_ble/sensor.py
@@ -27,7 +27,7 @@ from homeassistant.const import (
     EntityCategory,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .const import (
@@ -92,7 +92,9 @@ SENSORS: tuple[MotionblindsBLESensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensor entities based on a config entry."""
 
diff --git a/homeassistant/components/motionblinds_ble/strings.json b/homeassistant/components/motionblinds_ble/strings.json
index d6532f12386..ec1fb080854 100644
--- a/homeassistant/components/motionblinds_ble/strings.json
+++ b/homeassistant/components/motionblinds_ble/strings.json
@@ -1,8 +1,8 @@
 {
   "config": {
     "abort": {
-      "no_bluetooth_adapter": "No bluetooth adapter found",
-      "no_devices_found": "Could not find any bluetooth devices"
+      "no_bluetooth_adapter": "No Bluetooth adapter found",
+      "no_devices_found": "Could not find any Bluetooth devices"
     },
     "error": {
       "could_not_find_motor": "Could not find a motor with that MAC code",
diff --git a/homeassistant/components/motioneye/camera.py b/homeassistant/components/motioneye/camera.py
index df4c321037e..159956277a8 100644
--- a/homeassistant/components/motioneye/camera.py
+++ b/homeassistant/components/motioneye/camera.py
@@ -42,7 +42,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from . import get_camera_from_cameras, is_acceptable_camera, listen_for_new_cameras
@@ -93,7 +93,9 @@ SCHEMA_SERVICE_SET_TEXT = vol.Schema(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up motionEye from a config entry."""
     entry_data = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/motioneye/sensor.py b/homeassistant/components/motioneye/sensor.py
index e0113544848..c160b77c16a 100644
--- a/homeassistant/components/motioneye/sensor.py
+++ b/homeassistant/components/motioneye/sensor.py
@@ -12,7 +12,7 @@ from motioneye_client.const import KEY_ACTIONS
 from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -24,7 +24,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up motionEye from a config entry."""
     entry_data = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/motioneye/switch.py b/homeassistant/components/motioneye/switch.py
index 9d704f17740..89d3b8a8727 100644
--- a/homeassistant/components/motioneye/switch.py
+++ b/homeassistant/components/motioneye/switch.py
@@ -19,7 +19,7 @@ from homeassistant.components.switch import SwitchEntity, SwitchEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from . import get_camera_from_cameras, listen_for_new_cameras
@@ -67,7 +67,9 @@ MOTIONEYE_SWITCHES = [
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up motionEye from a config entry."""
     entry_data = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/motionmount/__init__.py b/homeassistant/components/motionmount/__init__.py
index 28963d83d89..9c2ac6fa180 100644
--- a/homeassistant/components/motionmount/__init__.py
+++ b/homeassistant/components/motionmount/__init__.py
@@ -7,13 +7,15 @@ import socket
 import motionmount
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_HOST, CONF_PORT, Platform
+from homeassistant.const import CONF_HOST, CONF_PIN, CONF_PORT, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers.device_registry import format_mac
 
 from .const import DOMAIN, EMPTY_MAC
 
+type MotionMountConfigEntry = ConfigEntry[motionmount.MotionMount]
+
 PLATFORMS: list[Platform] = [
     Platform.BINARY_SENSOR,
     Platform.NUMBER,
@@ -22,7 +24,7 @@ PLATFORMS: list[Platform] = [
 ]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: MotionMountConfigEntry) -> bool:
     """Set up Vogel's MotionMount from a config entry."""
 
     host = entry.data[CONF_HOST]
@@ -48,18 +50,36 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             f"Unexpected device found at {host}; expected {entry.unique_id}, found {found_mac}"
         )
 
+    # Check we're properly authenticated or be able to become so
+    if not mm.is_authenticated:
+        if CONF_PIN not in entry.data:
+            raise ConfigEntryAuthFailed(
+                translation_domain=DOMAIN,
+                translation_key="no_pin_provided",
+            )
+
+        pin = entry.data[CONF_PIN]
+        await mm.authenticate(pin)
+        if not mm.is_authenticated:
+            raise ConfigEntryAuthFailed(
+                translation_domain=DOMAIN,
+                translation_key="incorrect_pin",
+            )
+
     # Store an API object for your platforms to access
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = mm
+    entry.runtime_data = mm
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, entry: MotionMountConfigEntry
+) -> bool:
     """Unload a config entry."""
     if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        mm: motionmount.MotionMount = hass.data[DOMAIN].pop(entry.entry_id)
+        mm = entry.runtime_data
         await mm.disconnect()
 
     return unload_ok
diff --git a/homeassistant/components/motionmount/binary_sensor.py b/homeassistant/components/motionmount/binary_sensor.py
index 45b6e821440..4bb880311f9 100644
--- a/homeassistant/components/motionmount/binary_sensor.py
+++ b/homeassistant/components/motionmount/binary_sensor.py
@@ -6,19 +6,23 @@ from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
 )
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN
+from . import MotionMountConfigEntry
 from .entity import MotionMountEntity
 
+PARALLEL_UPDATES = 0
+
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: MotionMountConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Vogel's MotionMount from a config entry."""
-    mm = hass.data[DOMAIN][entry.entry_id]
+    mm = entry.runtime_data
 
     async_add_entities([MotionMountMovingSensor(mm, entry)])
 
@@ -28,8 +32,12 @@ class MotionMountMovingSensor(MotionMountEntity, BinarySensorEntity):
 
     _attr_device_class = BinarySensorDeviceClass.MOVING
     _attr_translation_key = "motionmount_is_moving"
+    _attr_entity_category = EntityCategory.DIAGNOSTIC
+    _attr_entity_registry_enabled_default = False
 
-    def __init__(self, mm: motionmount.MotionMount, config_entry: ConfigEntry) -> None:
+    def __init__(
+        self, mm: motionmount.MotionMount, config_entry: MotionMountConfigEntry
+    ) -> None:
         """Initialize moving binary sensor entity."""
         super().__init__(mm, config_entry)
         self._attr_unique_id = f"{self._base_unique_id}-moving"
diff --git a/homeassistant/components/motionmount/config_flow.py b/homeassistant/components/motionmount/config_flow.py
index 50a1e334f1d..283f1f01d6e 100644
--- a/homeassistant/components/motionmount/config_flow.py
+++ b/homeassistant/components/motionmount/config_flow.py
@@ -1,5 +1,7 @@
 """Config flow for Vogel's MotionMount."""
 
+import asyncio
+from collections.abc import Mapping
 import logging
 import socket
 from typing import Any
@@ -9,10 +11,11 @@ import voluptuous as vol
 
 from homeassistant.config_entries import (
     DEFAULT_DISCOVERY_UNIQUE_ID,
+    SOURCE_REAUTH,
     ConfigFlow,
     ConfigFlowResult,
 )
-from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT, CONF_UUID
+from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PIN, CONF_PORT, CONF_UUID
 from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
@@ -34,7 +37,9 @@ class MotionMountFlowHandler(ConfigFlow, domain=DOMAIN):
 
     def __init__(self) -> None:
         """Set up the instance."""
-        self.discovery_info: dict[str, Any] = {}
+        self.connection_data: dict[str, Any] = {}
+        self.backoff_task: asyncio.Task | None = None
+        self.backoff_time: int = 0
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -43,23 +48,16 @@ class MotionMountFlowHandler(ConfigFlow, domain=DOMAIN):
         if user_input is None:
             return self._show_setup_form()
 
+        self.connection_data.update(user_input)
         info = {}
         try:
-            info = await self._validate_input(user_input)
+            info = await self._validate_input_connect(self.connection_data)
         except (ConnectionError, socket.gaierror):
             return self.async_abort(reason="cannot_connect")
         except TimeoutError:
             return self.async_abort(reason="time_out")
         except motionmount.NotConnectedError:
             return self.async_abort(reason="not_connected")
-        except motionmount.MotionMountResponseError:
-            # This is most likely due to missing support for the mac address property
-            # Abort if the handler has config entries already
-            if self._async_current_entries():
-                return self.async_abort(reason="already_configured")
-
-            # Otherwise we try to continue with the generic uid
-            info[CONF_UUID] = DEFAULT_DISCOVERY_UNIQUE_ID
 
         # If the device mac is valid we use it, otherwise we use the default id
         if info.get(CONF_UUID, EMPTY_MAC) != EMPTY_MAC:
@@ -67,17 +65,22 @@ class MotionMountFlowHandler(ConfigFlow, domain=DOMAIN):
         else:
             unique_id = DEFAULT_DISCOVERY_UNIQUE_ID
 
-        name = info.get(CONF_NAME, user_input[CONF_HOST])
+        name = info.get(CONF_NAME, self.connection_data[CONF_HOST])
+        self.connection_data[CONF_NAME] = name
 
         await self.async_set_unique_id(unique_id)
         self._abort_if_unique_id_configured(
             updates={
-                CONF_HOST: user_input[CONF_HOST],
-                CONF_PORT: user_input[CONF_PORT],
+                CONF_HOST: self.connection_data[CONF_HOST],
+                CONF_PORT: self.connection_data[CONF_PORT],
             }
         )
 
-        return self.async_create_entry(title=name, data=user_input)
+        if not info[CONF_PIN]:
+            # We need a pin to authenticate
+            return await self.async_step_auth()
+        # No pin is needed
+        return self._create_or_update_entry()
 
     async def async_step_zeroconf(
         self, discovery_info: ZeroconfServiceInfo
@@ -91,7 +94,7 @@ class MotionMountFlowHandler(ConfigFlow, domain=DOMAIN):
         name = discovery_info.name.removesuffix(f".{zctype}")
         unique_id = discovery_info.properties.get("mac")
 
-        self.discovery_info.update(
+        self.connection_data.update(
             {
                 CONF_HOST: host,
                 CONF_PORT: port,
@@ -114,16 +117,13 @@ class MotionMountFlowHandler(ConfigFlow, domain=DOMAIN):
         self.context.update({"title_placeholders": {"name": name}})
 
         try:
-            info = await self._validate_input(self.discovery_info)
+            info = await self._validate_input_connect(self.connection_data)
         except (ConnectionError, socket.gaierror):
             return self.async_abort(reason="cannot_connect")
         except TimeoutError:
             return self.async_abort(reason="time_out")
         except motionmount.NotConnectedError:
             return self.async_abort(reason="not_connected")
-        except motionmount.MotionMountResponseError:
-            info = {}
-            # We continue as we want to be able to connect with older FW that does not support MAC address
 
         # If the device supplied as with a valid MAC we use that
         if info.get(CONF_UUID, EMPTY_MAC) != EMPTY_MAC:
@@ -137,6 +137,10 @@ class MotionMountFlowHandler(ConfigFlow, domain=DOMAIN):
         else:
             await self._async_handle_discovery_without_unique_id()
 
+        if not info[CONF_PIN]:
+            # We need a pin to authenticate
+            return await self.async_step_auth()
+        # No pin is needed
         return await self.async_step_zeroconf_confirm()
 
     async def async_step_zeroconf_confirm(
@@ -146,16 +150,82 @@ class MotionMountFlowHandler(ConfigFlow, domain=DOMAIN):
         if user_input is None:
             return self.async_show_form(
                 step_id="zeroconf_confirm",
-                description_placeholders={CONF_NAME: self.discovery_info[CONF_NAME]},
+                description_placeholders={CONF_NAME: self.connection_data[CONF_NAME]},
                 errors={},
             )
 
-        return self.async_create_entry(
-            title=self.discovery_info[CONF_NAME],
-            data=self.discovery_info,
+        return self._create_or_update_entry()
+
+    async def async_step_reauth(
+        self, user_input: Mapping[str, Any]
+    ) -> ConfigFlowResult:
+        """Handle re-authentication."""
+        reauth_entry = self._get_reauth_entry()
+        self.connection_data.update(reauth_entry.data)
+        return await self.async_step_auth()
+
+    async def async_step_auth(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle authentication form."""
+        errors = {}
+
+        if user_input is not None:
+            self.connection_data[CONF_PIN] = user_input[CONF_PIN]
+
+            # Validate pin code
+            valid_or_wait_time = await self._validate_input_pin(self.connection_data)
+            if valid_or_wait_time is True:
+                return self._create_or_update_entry()
+
+            if type(valid_or_wait_time) is int:
+                self.backoff_time = valid_or_wait_time
+                self.backoff_task = self.hass.async_create_task(
+                    self._backoff(valid_or_wait_time)
+                )
+                return await self.async_step_backoff()
+
+            errors[CONF_PIN] = CONF_PIN
+
+        return self.async_show_form(
+            step_id="auth",
+            data_schema=vol.Schema(
+                {
+                    vol.Required(CONF_PIN): vol.All(int, vol.Range(min=1, max=9999)),
+                }
+            ),
+            errors=errors,
         )
 
-    async def _validate_input(self, data: dict) -> dict[str, Any]:
+    async def async_step_backoff(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle backoff progress."""
+        if not self.backoff_task or self.backoff_task.done():
+            self.backoff_task = None
+            return self.async_show_progress_done(next_step_id="auth")
+
+        return self.async_show_progress(
+            step_id="backoff",
+            description_placeholders={
+                "timeout": str(self.backoff_time),
+            },
+            progress_action="progress_action",
+            progress_task=self.backoff_task,
+        )
+
+    def _create_or_update_entry(self) -> ConfigFlowResult:
+        if self.source == SOURCE_REAUTH:
+            reauth_entry = self._get_reauth_entry()
+            return self.async_update_reload_and_abort(
+                reauth_entry, data_updates=self.connection_data
+            )
+        return self.async_create_entry(
+            title=self.connection_data[CONF_NAME],
+            data=self.connection_data,
+        )
+
+    async def _validate_input_connect(self, data: dict) -> dict[str, Any]:
         """Validate the user input allows us to connect."""
 
         mm = motionmount.MotionMount(data[CONF_HOST], data[CONF_PORT])
@@ -164,7 +234,33 @@ class MotionMountFlowHandler(ConfigFlow, domain=DOMAIN):
         finally:
             await mm.disconnect()
 
-        return {CONF_UUID: format_mac(mm.mac.hex()), CONF_NAME: mm.name}
+        return {
+            CONF_UUID: format_mac(mm.mac.hex()),
+            CONF_NAME: mm.name,
+            CONF_PIN: mm.is_authenticated,
+        }
+
+    async def _validate_input_pin(self, data: dict) -> bool | int:
+        """Validate the user input allows us to authenticate."""
+
+        mm = motionmount.MotionMount(data[CONF_HOST], data[CONF_PORT])
+        try:
+            await mm.connect()
+
+            can_authenticate = mm.can_authenticate
+            if can_authenticate is True:
+                await mm.authenticate(data[CONF_PIN])
+            else:
+                # The backoff is running, return the remaining time
+                return can_authenticate
+        finally:
+            await mm.disconnect()
+
+        can_authenticate = mm.can_authenticate
+        if can_authenticate is True:
+            return mm.is_authenticated
+
+        return can_authenticate
 
     def _show_setup_form(
         self, errors: dict[str, str] | None = None
@@ -180,3 +276,9 @@ class MotionMountFlowHandler(ConfigFlow, domain=DOMAIN):
             ),
             errors=errors or {},
         )
+
+    async def _backoff(self, time: int) -> None:
+        while time > 0:
+            time -= 1
+            self.backoff_time = time
+            await asyncio.sleep(1)
diff --git a/homeassistant/components/motionmount/entity.py b/homeassistant/components/motionmount/entity.py
index ba81c9d10bd..bbb79729a9e 100644
--- a/homeassistant/components/motionmount/entity.py
+++ b/homeassistant/components/motionmount/entity.py
@@ -1,17 +1,16 @@
 """Support for MotionMount sensors."""
 
 import logging
-import socket
 from typing import TYPE_CHECKING
 
 import motionmount
 
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_CONNECTIONS, ATTR_IDENTIFIERS
+from homeassistant.const import ATTR_CONNECTIONS, ATTR_IDENTIFIERS, CONF_PIN
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo, format_mac
 from homeassistant.helpers.entity import Entity
 
+from . import MotionMountConfigEntry
 from .const import DOMAIN, EMPTY_MAC
 
 _LOGGER = logging.getLogger(__name__)
@@ -23,9 +22,16 @@ class MotionMountEntity(Entity):
     _attr_should_poll = False
     _attr_has_entity_name = True
 
-    def __init__(self, mm: motionmount.MotionMount, config_entry: ConfigEntry) -> None:
+    def __init__(
+        self, mm: motionmount.MotionMount, config_entry: MotionMountConfigEntry
+    ) -> None:
         """Initialize general MotionMount entity."""
         self.mm = mm
+        self.config_entry = config_entry
+
+        # We store the pin, as we might need it during reconnect
+        self.pin = config_entry.data.get(CONF_PIN)
+
         mac = format_mac(mm.mac.hex())
 
         # Create a base unique id
@@ -74,23 +80,3 @@ class MotionMountEntity(Entity):
         self.mm.remove_listener(self.async_write_ha_state)
         self.mm.remove_listener(self.update_name)
         await super().async_will_remove_from_hass()
-
-    async def _ensure_connected(self) -> bool:
-        """Make sure there is a connection with the MotionMount.
-
-        Returns false if the connection failed to be ensured.
-        """
-
-        if self.mm.is_connected:
-            return True
-        try:
-            await self.mm.connect()
-        except (ConnectionError, TimeoutError, socket.gaierror):
-            # We're not interested in exceptions here. In case of a failed connection
-            # the try/except from the caller will report it.
-            # The purpose of `_ensure_connected()` is only to make sure we try to
-            # reconnect, where failures should not be logged each time
-            return False
-        else:
-            _LOGGER.warning("Successfully reconnected to MotionMount")
-            return True
diff --git a/homeassistant/components/motionmount/icons.json b/homeassistant/components/motionmount/icons.json
new file mode 100644
index 00000000000..8d6d867f4d0
--- /dev/null
+++ b/homeassistant/components/motionmount/icons.json
@@ -0,0 +1,12 @@
+{
+  "entity": {
+    "sensor": {
+      "motionmount_error_status": {
+        "default": "mdi:alert-circle-outline",
+        "state": {
+          "none": "mdi:check-circle-outline"
+        }
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/motionmount/manifest.json b/homeassistant/components/motionmount/manifest.json
index 1fa3d31cfab..337ce776b33 100644
--- a/homeassistant/components/motionmount/manifest.json
+++ b/homeassistant/components/motionmount/manifest.json
@@ -1,11 +1,12 @@
 {
   "domain": "motionmount",
   "name": "Vogel's MotionMount",
-  "codeowners": ["@RJPoelstra"],
+  "codeowners": ["@laiho-vogels"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/motionmount",
   "integration_type": "device",
   "iot_class": "local_push",
-  "requirements": ["python-MotionMount==2.2.0"],
+  "quality_scale": "bronze",
+  "requirements": ["python-MotionMount==2.3.0"],
   "zeroconf": ["_tvm._tcp.local."]
 }
diff --git a/homeassistant/components/motionmount/number.py b/homeassistant/components/motionmount/number.py
index b42c04a6588..3e2c1b067aa 100644
--- a/homeassistant/components/motionmount/number.py
+++ b/homeassistant/components/motionmount/number.py
@@ -5,21 +5,25 @@ import socket
 import motionmount
 
 from homeassistant.components.number import NumberEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import MotionMountConfigEntry
 from .const import DOMAIN
 from .entity import MotionMountEntity
 
+PARALLEL_UPDATES = 0
+
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: MotionMountConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Vogel's MotionMount from a config entry."""
-    mm: motionmount.MotionMount = hass.data[DOMAIN][entry.entry_id]
+    mm = entry.runtime_data
 
     async_add_entities(
         (
@@ -37,7 +41,9 @@ class MotionMountExtension(MotionMountEntity, NumberEntity):
     _attr_native_unit_of_measurement = PERCENTAGE
     _attr_translation_key = "motionmount_extension"
 
-    def __init__(self, mm: motionmount.MotionMount, config_entry: ConfigEntry) -> None:
+    def __init__(
+        self, mm: motionmount.MotionMount, config_entry: MotionMountConfigEntry
+    ) -> None:
         """Initialize Extension number."""
         super().__init__(mm, config_entry)
         self._attr_unique_id = f"{self._base_unique_id}-extension"
@@ -66,7 +72,9 @@ class MotionMountTurn(MotionMountEntity, NumberEntity):
     _attr_native_unit_of_measurement = PERCENTAGE
     _attr_translation_key = "motionmount_turn"
 
-    def __init__(self, mm: motionmount.MotionMount, config_entry: ConfigEntry) -> None:
+    def __init__(
+        self, mm: motionmount.MotionMount, config_entry: MotionMountConfigEntry
+    ) -> None:
         """Initialize Turn number."""
         super().__init__(mm, config_entry)
         self._attr_unique_id = f"{self._base_unique_id}-turn"
diff --git a/homeassistant/components/motionmount/quality_scale.yaml b/homeassistant/components/motionmount/quality_scale.yaml
new file mode 100644
index 00000000000..8b210931eaf
--- /dev/null
+++ b/homeassistant/components/motionmount/quality_scale.yaml
@@ -0,0 +1,78 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: Integration does not have actions
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: done
+    comment: Integration does register actions aside from entity actions
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup:
+    status: exempt
+    comment: Integration does not register events.
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions:
+    status: exempt
+    comment: Integration does not have actions
+  config-entry-unloading: done
+  docs-configuration-parameters:
+    status: exempt
+    comment: Integration has no options flow
+  docs-installation-parameters: done
+  entity-unavailable: done
+  integration-owner: done
+  log-when-unavailable: done
+  parallel-updates: done
+  reauthentication-flow: done
+  test-coverage: todo
+
+  # Gold
+  devices: done
+  diagnostics: todo
+  discovery-update-info: done
+  discovery: done
+  docs-data-update: done
+  docs-examples: todo
+  docs-known-limitations: done
+  docs-supported-devices: done
+  docs-supported-functions: done
+  docs-troubleshooting: done
+  docs-use-cases: done
+  dynamic-devices:
+    status: exempt
+    comment: Single device per config entry
+  entity-category: done
+  entity-device-class: done
+  entity-disabled-by-default: done
+  entity-translations: done
+  exception-translations: done
+  icon-translations: done
+  reconfiguration-flow: todo
+  repair-issues:
+    status: exempt
+    comment: Integration does not need user intervention
+  stale-devices:
+    status: exempt
+    comment: Integration does not support dynamic devices
+
+  # Platinum
+  async-dependency: done
+  inject-websession:
+    status: exempt
+    comment: Device doesn't make http requests.
+  strict-typing: done
diff --git a/homeassistant/components/motionmount/select.py b/homeassistant/components/motionmount/select.py
index 9b43d901a21..a8fcc84f2ec 100644
--- a/homeassistant/components/motionmount/select.py
+++ b/homeassistant/components/motionmount/select.py
@@ -7,23 +7,26 @@ import socket
 import motionmount
 
 from homeassistant.components.select import SelectEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import MotionMountConfigEntry
 from .const import DOMAIN, WALL_PRESET_NAME
 from .entity import MotionMountEntity
 
 _LOGGER = logging.getLogger(__name__)
 SCAN_INTERVAL = timedelta(seconds=60)
+PARALLEL_UPDATES = 0
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: MotionMountConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Vogel's MotionMount from a config entry."""
-    mm = hass.data[DOMAIN][entry.entry_id]
+    mm = entry.runtime_data
 
     async_add_entities([MotionMountPresets(mm, entry)], True)
 
@@ -37,7 +40,7 @@ class MotionMountPresets(MotionMountEntity, SelectEntity):
     def __init__(
         self,
         mm: motionmount.MotionMount,
-        config_entry: ConfigEntry,
+        config_entry: MotionMountConfigEntry,
     ) -> None:
         """Initialize Preset selector."""
         super().__init__(mm, config_entry)
@@ -51,6 +54,38 @@ class MotionMountPresets(MotionMountEntity, SelectEntity):
 
         self._attr_options = options
 
+    async def _ensure_connected(self) -> bool:
+        """Make sure there is a connection with the MotionMount.
+
+        Returns false if the connection failed to be ensured.
+        """
+        if self.mm.is_connected:
+            return True
+        try:
+            await self.mm.connect()
+        except (ConnectionError, TimeoutError, socket.gaierror):
+            # We're not interested in exceptions here. In case of a failed connection
+            # the try/except from the caller will report it.
+            # The purpose of `_ensure_connected()` is only to make sure we try to
+            # reconnect, where failures should not be logged each time
+            return False
+
+        # Check we're properly authenticated or be able to become so
+        if not self.mm.is_authenticated:
+            if self.pin is None:
+                await self.mm.disconnect()
+                self.config_entry.async_start_reauth(self.hass)
+                return False
+            await self.mm.authenticate(self.pin)
+            if not self.mm.is_authenticated:
+                self.pin = None
+                await self.mm.disconnect()
+                self.config_entry.async_start_reauth(self.hass)
+                return False
+
+        _LOGGER.debug("Successfully reconnected to MotionMount")
+        return True
+
     async def async_update(self) -> None:
         """Get latest state from MotionMount."""
         if not await self._ensure_connected():
diff --git a/homeassistant/components/motionmount/sensor.py b/homeassistant/components/motionmount/sensor.py
index 933b637b0c2..28fe921d9ac 100644
--- a/homeassistant/components/motionmount/sensor.py
+++ b/homeassistant/components/motionmount/sensor.py
@@ -1,21 +1,36 @@
 """Support for MotionMount sensors."""
 
+from typing import Final
+
 import motionmount
+from motionmount import MotionMountSystemError
 
 from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN
+from . import MotionMountConfigEntry
 from .entity import MotionMountEntity
 
+PARALLEL_UPDATES = 0
+
+ERROR_MESSAGES: Final = {
+    MotionMountSystemError.MotorError: "motor",
+    MotionMountSystemError.ObstructionDetected: "obstruction",
+    MotionMountSystemError.TVWidthConstraintError: "tv_width_constraint",
+    MotionMountSystemError.HDMICECError: "hdmi_cec",
+    MotionMountSystemError.InternalError: "internal",
+}
+
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: MotionMountConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Vogel's MotionMount from a config entry."""
-    mm = hass.data[DOMAIN][entry.entry_id]
+    mm = entry.runtime_data
 
     async_add_entities((MotionMountErrorStatusSensor(mm, entry),))
 
@@ -24,10 +39,21 @@ class MotionMountErrorStatusSensor(MotionMountEntity, SensorEntity):
     """The error status sensor of a MotionMount."""
 
     _attr_device_class = SensorDeviceClass.ENUM
-    _attr_options = ["none", "motor", "internal"]
+    _attr_options = [
+        "none",
+        "motor",
+        "hdmi_cec",
+        "obstruction",
+        "tv_width_constraint",
+        "internal",
+    ]
     _attr_translation_key = "motionmount_error_status"
+    _attr_entity_category = EntityCategory.DIAGNOSTIC
+    _attr_entity_registry_enabled_default = False
 
-    def __init__(self, mm: motionmount.MotionMount, config_entry: ConfigEntry) -> None:
+    def __init__(
+        self, mm: motionmount.MotionMount, config_entry: MotionMountConfigEntry
+    ) -> None:
         """Initialize sensor entiry."""
         super().__init__(mm, config_entry)
         self._attr_unique_id = f"{self._base_unique_id}-error-status"
@@ -35,13 +61,10 @@ class MotionMountErrorStatusSensor(MotionMountEntity, SensorEntity):
     @property
     def native_value(self) -> str:
         """Return error status."""
-        errors = self.mm.error_status or 0
+        status = self.mm.system_status
 
-        if errors & (1 << 31):
-            # Only when but 31 is set are there any errors active at this moment
-            if errors & (1 << 10):
-                return "motor"
-
-            return "internal"
+        for error, message in ERROR_MESSAGES.items():
+            if error in status:
+                return message
 
         return "none"
diff --git a/homeassistant/components/motionmount/strings.json b/homeassistant/components/motionmount/strings.json
index bd28156607c..75fd0773322 100644
--- a/homeassistant/components/motionmount/strings.json
+++ b/homeassistant/components/motionmount/strings.json
@@ -1,4 +1,7 @@
 {
+  "common": {
+    "incorrect_pin": "PIN is not correct"
+  },
   "config": {
     "flow_title": "{name}",
     "step": {
@@ -8,20 +11,45 @@
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
           "port": "[%key:common::config_flow::data::port%]"
+        },
+        "data_description": {
+          "host": "The hostname or IP address of the MotionMount.",
+          "port": "The port of the MotionMount."
         }
       },
       "zeroconf_confirm": {
         "description": "Do you want to set up {name}?",
         "title": "Discovered MotionMount"
+      },
+      "auth": {
+        "title": "Authenticate to your MotionMount",
+        "description": "Your MotionMount requires a PIN to operate.",
+        "data": {
+          "pin": "[%key:common::config_flow::data::pin%]"
+        },
+        "data_description": {
+          "pin": "The user level PIN configured on the MotionMount."
+        }
+      },
+      "backoff": {
+        "title": "Authenticate to your MotionMount",
+        "description": "Too many incorrect PIN attempts."
       }
     },
+    "error": {
+      "pin": "[%key:component::motionmount::common::incorrect_pin%]"
+    },
+    "progress": {
+      "progress_action": "Too many incorrect PIN attempts. Please wait {timeout} s..."
+    },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "time_out": "Failed to connect due to a time out.",
+      "time_out": "[%key:common::config_flow::error::timeout_connect%]",
       "not_connected": "Failed to connect.",
-      "invalid_response": "Failed to connect due to an invalid response from the MotionMount."
+      "invalid_response": "Failed to connect due to an invalid response from the MotionMount.",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
   },
   "entity": {
@@ -44,6 +72,9 @@
         "state": {
           "none": "None",
           "motor": "Motor",
+          "hdmi_cec": "HDMI CEC",
+          "obstruction": "Obstruction",
+          "tv_width_constraint": "TV width constraint",
           "internal": "Internal"
         }
       }
@@ -60,6 +91,12 @@
   "exceptions": {
     "failed_communication": {
       "message": "Failed to communicate with MotionMount"
+    },
+    "no_pin_provided": {
+      "message": "No PIN provided"
+    },
+    "incorrect_pin": {
+      "message": "[%key:component::motionmount::common::incorrect_pin%]"
     }
   }
 }
diff --git a/homeassistant/components/mpd/media_player.py b/homeassistant/components/mpd/media_player.py
index a79d933a782..14b69e941b7 100644
--- a/homeassistant/components/mpd/media_player.py
+++ b/homeassistant/components/mpd/media_player.py
@@ -29,11 +29,10 @@ from homeassistant.components.media_player import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util import Throttle
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import Throttle, dt as dt_util
 
 from .const import DOMAIN, LOGGER
 
@@ -69,7 +68,9 @@ PLATFORM_SCHEMA = MEDIA_PLAYER_PLATFORM_SCHEMA.extend(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up media player from config_entry."""
 
diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py
index 8b16e9fa53d..ae010bf18c9 100644
--- a/homeassistant/components/mqtt/__init__.py
+++ b/homeassistant/components/mqtt/__init__.py
@@ -13,7 +13,7 @@ import voluptuous as vol
 from homeassistant import config as conf_util
 from homeassistant.components import websocket_api
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_DISCOVERY, SERVICE_RELOAD
+from homeassistant.const import CONF_DISCOVERY, CONF_PLATFORM, SERVICE_RELOAD
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import (
     ConfigValidationError,
@@ -81,6 +81,7 @@ from .const import (
     ENTRY_OPTION_FIELDS,
     MQTT_CONNECTION_STATE,
     TEMPLATE_ERRORS,
+    Platform,
 )
 from .models import (
     DATA_MQTT,
@@ -236,7 +237,7 @@ CONFIG_SCHEMA = vol.Schema(
 MQTT_PUBLISH_SCHEMA = vol.Schema(
     {
         vol.Required(ATTR_TOPIC): valid_publish_topic,
-        vol.Required(ATTR_PAYLOAD): cv.string,
+        vol.Required(ATTR_PAYLOAD, default=None): vol.Any(cv.string, None),
         vol.Optional(ATTR_EVALUATE_PAYLOAD): cv.boolean,
         vol.Optional(ATTR_QOS, default=DEFAULT_QOS): valid_qos_schema,
         vol.Optional(ATTR_RETAIN, default=DEFAULT_RETAIN): cv.boolean,
@@ -293,6 +294,21 @@ async def async_check_config_schema(
                     ) from exc
 
 
+def _platforms_in_use(hass: HomeAssistant, entry: ConfigEntry) -> set[str | Platform]:
+    """Return a set of platforms in use."""
+    domains: set[str | Platform] = {
+        entry.domain
+        for entry in er.async_entries_for_config_entry(
+            er.async_get(hass), entry.entry_id
+        )
+    }
+    # Update with domains from subentries
+    for subentry in entry.subentries.values():
+        components = subentry.data["components"].values()
+        domains.update(component[CONF_PLATFORM] for component in components)
+    return domains
+
+
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the actions and websocket API for the MQTT component."""
 
@@ -434,12 +450,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     mqtt_data, conf = await _setup_client()
     platforms_used = platforms_from_config(mqtt_data.config)
-    platforms_used.update(
-        entry.domain
-        for entry in er.async_entries_for_config_entry(
-            er.async_get(hass), entry.entry_id
-        )
-    )
+    platforms_used.update(_platforms_in_use(hass, entry))
     integration = async_get_loaded_integration(hass, DOMAIN)
     # Preload platforms we know we are going to use so
     # discovery can setup each platform synchronously
diff --git a/homeassistant/components/mqtt/abbreviations.py b/homeassistant/components/mqtt/abbreviations.py
index 584b238b3a8..a9037a5f247 100644
--- a/homeassistant/components/mqtt/abbreviations.py
+++ b/homeassistant/components/mqtt/abbreviations.py
@@ -150,6 +150,7 @@ ABBREVIATIONS = {
     "pl_rst_pct": "payload_reset_percentage",
     "pl_rst_pr_mode": "payload_reset_preset_mode",
     "pl_stop": "payload_stop",
+    "pl_stop_tilt": "payload_stop_tilt",
     "pl_strt": "payload_start",
     "pl_ret": "payload_return_to_base",
     "pl_toff": "payload_turn_off",
@@ -218,10 +219,16 @@ ABBREVIATIONS = {
     "sup_vol": "support_volume_set",
     "sup_feat": "supported_features",
     "sup_clrm": "supported_color_modes",
+    "swing_h_mode_cmd_tpl": "swing_horizontal_mode_command_template",
+    "swing_h_mode_cmd_t": "swing_horizontal_mode_command_topic",
+    "swing_h_mode_stat_tpl": "swing_horizontal_mode_state_template",
+    "swing_h_mode_stat_t": "swing_horizontal_mode_state_topic",
+    "swing_h_modes": "swing_horizontal_modes",
     "swing_mode_cmd_tpl": "swing_mode_command_template",
     "swing_mode_cmd_t": "swing_mode_command_topic",
     "swing_mode_stat_tpl": "swing_mode_state_template",
     "swing_mode_stat_t": "swing_mode_state_topic",
+    "swing_modes": "swing_modes",
     "temp_cmd_tpl": "temperature_command_template",
     "temp_cmd_t": "temperature_command_topic",
     "temp_hi_cmd_tpl": "temperature_high_command_template",
diff --git a/homeassistant/components/mqtt/alarm_control_panel.py b/homeassistant/components/mqtt/alarm_control_panel.py
index 613f665c302..64b1a6b05fa 100644
--- a/homeassistant/components/mqtt/alarm_control_panel.py
+++ b/homeassistant/components/mqtt/alarm_control_panel.py
@@ -6,7 +6,7 @@ import logging
 
 import voluptuous as vol
 
-import homeassistant.components.alarm_control_panel as alarm
+from homeassistant.components import alarm_control_panel as alarm
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntityFeature,
     AlarmControlPanelState,
@@ -14,8 +14,8 @@ from homeassistant.components.alarm_control_panel import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_CODE, CONF_NAME, CONF_VALUE_TEMPLATE
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from . import subscription
@@ -115,7 +115,7 @@ DISCOVERY_SCHEMA = PLATFORM_SCHEMA_MODERN.extend({}, extra=vol.REMOVE_EXTRA)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT alarm control panel through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/async_client.py b/homeassistant/components/mqtt/async_client.py
index 882e910d7e8..0467eb3a289 100644
--- a/homeassistant/components/mqtt/async_client.py
+++ b/homeassistant/components/mqtt/async_client.py
@@ -6,7 +6,14 @@ from functools import lru_cache
 from types import TracebackType
 from typing import Self
 
-from paho.mqtt.client import Client as MQTTClient
+from paho.mqtt.client import (
+    CallbackOnConnect_v2,
+    CallbackOnDisconnect_v2,
+    CallbackOnPublish_v2,
+    CallbackOnSubscribe_v2,
+    CallbackOnUnsubscribe_v2,
+    Client as MQTTClient,
+)
 
 _MQTT_LOCK_COUNT = 7
 
@@ -44,6 +51,12 @@ class AsyncMQTTClient(MQTTClient):
     that is not needed since we are running in an async event loop.
     """
 
+    on_connect: CallbackOnConnect_v2
+    on_disconnect: CallbackOnDisconnect_v2
+    on_publish: CallbackOnPublish_v2
+    on_subscribe: CallbackOnSubscribe_v2
+    on_unsubscribe: CallbackOnUnsubscribe_v2
+
     def setup(self) -> None:
         """Set up the client.
 
@@ -51,10 +64,10 @@ class AsyncMQTTClient(MQTTClient):
         since the client is running in an async event loop
         and will never run in multiple threads.
         """
-        self._in_callback_mutex = NullLock()
-        self._callback_mutex = NullLock()
-        self._msgtime_mutex = NullLock()
-        self._out_message_mutex = NullLock()
-        self._in_message_mutex = NullLock()
-        self._reconnect_delay_mutex = NullLock()
-        self._mid_generate_mutex = NullLock()
+        self._in_callback_mutex = NullLock()  # type: ignore[assignment]
+        self._callback_mutex = NullLock()  # type: ignore[assignment]
+        self._msgtime_mutex = NullLock()  # type: ignore[assignment]
+        self._out_message_mutex = NullLock()  # type: ignore[assignment]
+        self._in_message_mutex = NullLock()  # type: ignore[assignment]
+        self._reconnect_delay_mutex = NullLock()  # type: ignore[assignment]
+        self._mid_generate_mutex = NullLock()  # type: ignore[assignment]
diff --git a/homeassistant/components/mqtt/binary_sensor.py b/homeassistant/components/mqtt/binary_sensor.py
index b49dc7aa24c..a1e146d4e36 100644
--- a/homeassistant/components/mqtt/binary_sensor.py
+++ b/homeassistant/components/mqtt/binary_sensor.py
@@ -26,9 +26,8 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.helpers.event as evt
+from homeassistant.helpers import config_validation as cv, event as evt
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType
@@ -70,7 +69,7 @@ DISCOVERY_SCHEMA = PLATFORM_SCHEMA_MODERN.extend({}, extra=vol.REMOVE_EXTRA)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT binary sensor through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/button.py b/homeassistant/components/mqtt/button.py
index 8e5446b532e..5b2bcc8920f 100644
--- a/homeassistant/components/mqtt/button.py
+++ b/homeassistant/components/mqtt/button.py
@@ -9,8 +9,8 @@ from homeassistant.components.button import DEVICE_CLASSES_SCHEMA, ButtonEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DEVICE_CLASS, CONF_NAME
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from .config import DEFAULT_RETAIN, MQTT_BASE_SCHEMA
@@ -43,7 +43,7 @@ DISCOVERY_SCHEMA = PLATFORM_SCHEMA_MODERN.extend({}, extra=vol.REMOVE_EXTRA)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT button through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/camera.py b/homeassistant/components/mqtt/camera.py
index 88fabad0446..d3615edcbba 100644
--- a/homeassistant/components/mqtt/camera.py
+++ b/homeassistant/components/mqtt/camera.py
@@ -14,7 +14,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import subscription
@@ -60,7 +60,7 @@ DISCOVERY_SCHEMA = PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT camera through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/client.py b/homeassistant/components/mqtt/client.py
index 16a02e4956e..f6f53599363 100644
--- a/homeassistant/components/mqtt/client.py
+++ b/homeassistant/components/mqtt/client.py
@@ -15,7 +15,7 @@ import socket
 import ssl
 import time
 from typing import TYPE_CHECKING, Any
-import uuid
+from uuid import uuid4
 
 import certifi
 
@@ -117,7 +117,7 @@ MAX_UNSUBSCRIBES_PER_CALL = 500
 
 MAX_PACKETS_TO_READ = 500
 
-type SocketType = socket.socket | ssl.SSLSocket | mqtt.WebsocketWrapper | Any
+type SocketType = socket.socket | ssl.SSLSocket | mqtt._WebsocketWrapper | Any  # noqa: SLF001
 
 type SubscribePayloadType = str | bytes | bytearray  # Only bytes if encoding is None
 
@@ -293,28 +293,46 @@ class MqttClientSetup:
         """
         # We don't import on the top because some integrations
         # should be able to optionally rely on MQTT.
-        import paho.mqtt.client as mqtt  # pylint: disable=import-outside-toplevel
+        from paho.mqtt import client as mqtt  # pylint: disable=import-outside-toplevel
 
         # pylint: disable-next=import-outside-toplevel
         from .async_client import AsyncMQTTClient
 
         config = self._config
+        clean_session: bool | None = None
         if (protocol := config.get(CONF_PROTOCOL, DEFAULT_PROTOCOL)) == PROTOCOL_31:
             proto = mqtt.MQTTv31
+            clean_session = True
         elif protocol == PROTOCOL_5:
             proto = mqtt.MQTTv5
         else:
             proto = mqtt.MQTTv311
+            clean_session = True
 
         if (client_id := config.get(CONF_CLIENT_ID)) is None:
-            # PAHO MQTT relies on the MQTT server to generate random client IDs.
-            # However, that feature is not mandatory so we generate our own.
-            client_id = mqtt.base62(uuid.uuid4().int, padding=22)
+            # PAHO MQTT relies on the MQTT server to generate random client ID
+            # for protocol version 3.1, however, that feature is not mandatory
+            # so we generate our own.
+            client_id = mqtt._base62(uuid4().int, padding=22)  # noqa: SLF001
         transport: str = config.get(CONF_TRANSPORT, DEFAULT_TRANSPORT)
         self._client = AsyncMQTTClient(
-            client_id,
+            callback_api_version=mqtt.CallbackAPIVersion.VERSION2,
+            client_id=client_id,
+            # See: https://eclipse.dev/paho/files/paho.mqtt.python/html/client.html
+            # clean_session (bool defaults to None)
+            # a boolean that determines the client type.
+            # If True, the broker will remove all information about this client when it
+            # disconnects. If False, the client is a persistent client and subscription
+            # information and queued messages will be retained when the client
+            # disconnects. Note that a client will never discard its own outgoing
+            # messages on disconnect. Calling connect() or reconnect() will cause the
+            # messages to be resent. Use reinitialise() to reset a client to its
+            # original state. The clean_session argument only applies to MQTT versions
+            # v3.1.1 and v3.1. It is not accepted if the MQTT version is v5.0 - use the
+            # clean_start argument on connect() instead.
+            clean_session=clean_session,
             protocol=proto,
-            transport=transport,
+            transport=transport,  # type: ignore[arg-type]
             reconnect_on_failure=False,
         )
         self._client.setup()
@@ -371,6 +389,7 @@ class MQTT:
         self.loop = hass.loop
         self.config_entry = config_entry
         self.conf = conf
+        self.is_mqttv5 = conf.get(CONF_PROTOCOL, DEFAULT_PROTOCOL) == PROTOCOL_5
 
         self._simple_subscriptions: defaultdict[str, set[Subscription]] = defaultdict(
             set
@@ -476,9 +495,9 @@ class MQTT:
         mqttc.on_connect = self._async_mqtt_on_connect
         mqttc.on_disconnect = self._async_mqtt_on_disconnect
         mqttc.on_message = self._async_mqtt_on_message
-        mqttc.on_publish = self._async_mqtt_on_callback
-        mqttc.on_subscribe = self._async_mqtt_on_callback
-        mqttc.on_unsubscribe = self._async_mqtt_on_callback
+        mqttc.on_publish = self._async_mqtt_on_publish
+        mqttc.on_subscribe = self._async_mqtt_on_subscribe_unsubscribe
+        mqttc.on_unsubscribe = self._async_mqtt_on_subscribe_unsubscribe
 
         # suppress exceptions at callback
         mqttc.suppress_exceptions = True
@@ -498,7 +517,7 @@ class MQTT:
     def _async_reader_callback(self, client: mqtt.Client) -> None:
         """Handle reading data from the socket."""
         if (status := client.loop_read(MAX_PACKETS_TO_READ)) != 0:
-            self._async_on_disconnect(status)
+            self._async_handle_callback_exception(status)
 
     @callback
     def _async_start_misc_periodic(self) -> None:
@@ -533,7 +552,7 @@ class MQTT:
             try:
                 # Some operating systems do not allow us to set the preferred
                 # buffer size. In that case we try some other size options.
-                sock.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, new_buffer_size)
+                sock.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, new_buffer_size)  # type: ignore[union-attr]
             except OSError as err:
                 if new_buffer_size <= MIN_BUFFER_SIZE:
                     _LOGGER.warning(
@@ -593,7 +612,7 @@ class MQTT:
     def _async_writer_callback(self, client: mqtt.Client) -> None:
         """Handle writing data to the socket."""
         if (status := client.loop_write()) != 0:
-            self._async_on_disconnect(status)
+            self._async_handle_callback_exception(status)
 
     def _on_socket_register_write(
         self, client: mqtt.Client, userdata: Any, sock: SocketType
@@ -652,14 +671,25 @@ class MQTT:
         result: int | None = None
         self._available_future = client_available
         self._should_reconnect = True
+        connect_partial = partial(
+            self._mqttc.connect,
+            host=self.conf[CONF_BROKER],
+            port=self.conf.get(CONF_PORT, DEFAULT_PORT),
+            keepalive=self.conf.get(CONF_KEEPALIVE, DEFAULT_KEEPALIVE),
+            # See:
+            # https://eclipse.dev/paho/files/paho.mqtt.python/html/client.html
+            # `clean_start` (bool) – (MQTT v5.0 only) `True`, `False` or
+            # `MQTT_CLEAN_START_FIRST_ONLY`. Sets the MQTT v5.0 clean_start flag
+            #  always, never or on the first successful connect only,
+            # respectively. MQTT session data (such as outstanding messages and
+            # subscriptions) is cleared on successful connect when the
+            # clean_start flag is set. For MQTT v3.1.1, the clean_session
+            # argument of Client should be used for similar result.
+            clean_start=True if self.is_mqttv5 else mqtt.MQTT_CLEAN_START_FIRST_ONLY,
+        )
         try:
             async with self._connection_lock, self._async_connect_in_executor():
-                result = await self.hass.async_add_executor_job(
-                    self._mqttc.connect,
-                    self.conf[CONF_BROKER],
-                    self.conf.get(CONF_PORT, DEFAULT_PORT),
-                    self.conf.get(CONF_KEEPALIVE, DEFAULT_KEEPALIVE),
-                )
+                result = await self.hass.async_add_executor_job(connect_partial)
         except (OSError, mqtt.WebsocketConnectionError) as err:
             _LOGGER.error("Failed to connect to MQTT server due to exception: %s", err)
             self._async_connection_result(False)
@@ -983,29 +1013,28 @@ class MQTT:
         self,
         _mqttc: mqtt.Client,
         _userdata: None,
-        _flags: dict[str, int],
-        result_code: int,
-        properties: mqtt.Properties | None = None,
+        _connect_flags: mqtt.ConnectFlags,
+        reason_code: mqtt.ReasonCode,
+        _properties: mqtt.Properties | None = None,
     ) -> None:
         """On connect callback.
 
         Resubscribe to all topics we were subscribed to and publish birth
         message.
         """
-        # pylint: disable-next=import-outside-toplevel
-        import paho.mqtt.client as mqtt
-
-        if result_code != mqtt.CONNACK_ACCEPTED:
-            if result_code in (
-                mqtt.CONNACK_REFUSED_BAD_USERNAME_PASSWORD,
-                mqtt.CONNACK_REFUSED_NOT_AUTHORIZED,
-            ):
+        if reason_code.is_failure:
+            # 24: Continue authentication
+            # 25: Re-authenticate
+            # 134: Bad user name or password
+            # 135: Not authorized
+            # 140: Bad authentication method
+            if reason_code.value in (24, 25, 134, 135, 140):
                 self._should_reconnect = False
                 self.hass.async_create_task(self.async_disconnect())
                 self.config_entry.async_start_reauth(self.hass)
             _LOGGER.error(
                 "Unable to connect to the MQTT broker: %s",
-                mqtt.connack_string(result_code),
+                reason_code.getName(),  # type: ignore[no-untyped-call]
             )
             self._async_connection_result(False)
             return
@@ -1016,7 +1045,7 @@ class MQTT:
             "Connected to MQTT server %s:%s (%s)",
             self.conf[CONF_BROKER],
             self.conf.get(CONF_PORT, DEFAULT_PORT),
-            result_code,
+            reason_code,
         )
 
         birth: dict[str, Any]
@@ -1153,18 +1182,32 @@ class MQTT:
         self._mqtt_data.state_write_requests.process_write_state_requests(msg)
 
     @callback
-    def _async_mqtt_on_callback(
+    def _async_mqtt_on_publish(
         self,
         _mqttc: mqtt.Client,
         _userdata: None,
         mid: int,
-        _granted_qos_reason: tuple[int, ...] | mqtt.ReasonCodes | None = None,
-        _properties_reason: mqtt.ReasonCodes | None = None,
+        _reason_code: mqtt.ReasonCode,
+        _properties: mqtt.Properties | None,
     ) -> None:
+        """Publish callback."""
+        self._async_mqtt_on_callback(mid)
+
+    @callback
+    def _async_mqtt_on_subscribe_unsubscribe(
+        self,
+        _mqttc: mqtt.Client,
+        _userdata: None,
+        mid: int,
+        _reason_code: list[mqtt.ReasonCode],
+        _properties: mqtt.Properties | None,
+    ) -> None:
+        """Subscribe / Unsubscribe callback."""
+        self._async_mqtt_on_callback(mid)
+
+    @callback
+    def _async_mqtt_on_callback(self, mid: int) -> None:
         """Publish / Subscribe / Unsubscribe callback."""
-        # The callback signature for on_unsubscribe is different from on_subscribe
-        # see https://github.com/eclipse/paho.mqtt.python/issues/687
-        # properties and reason codes are not used in Home Assistant
         future = self._async_get_mid_future(mid)
         if future.done() and (future.cancelled() or future.exception()):
             # Timed out or cancelled
@@ -1180,19 +1223,28 @@ class MQTT:
         self._pending_operations[mid] = future
         return future
 
+    @callback
+    def _async_handle_callback_exception(self, status: mqtt.MQTTErrorCode) -> None:
+        """Handle a callback exception."""
+        # We don't import on the top because some integrations
+        # should be able to optionally rely on MQTT.
+        import paho.mqtt.client as mqtt  # pylint: disable=import-outside-toplevel
+
+        _LOGGER.warning(
+            "Error returned from MQTT server: %s",
+            mqtt.error_string(status),
+        )
+
     @callback
     def _async_mqtt_on_disconnect(
         self,
         _mqttc: mqtt.Client,
         _userdata: None,
-        result_code: int,
+        _disconnect_flags: mqtt.DisconnectFlags,
+        reason_code: mqtt.ReasonCode,
         properties: mqtt.Properties | None = None,
     ) -> None:
         """Disconnected callback."""
-        self._async_on_disconnect(result_code)
-
-    @callback
-    def _async_on_disconnect(self, result_code: int) -> None:
         if not self.connected:
             # This function is re-entrant and may be called multiple times
             # when there is a broken pipe error.
@@ -1203,11 +1255,11 @@ class MQTT:
         self.connected = False
         async_dispatcher_send(self.hass, MQTT_CONNECTION_STATE, False)
         _LOGGER.log(
-            logging.INFO if result_code == 0 else logging.DEBUG,
+            logging.INFO if reason_code == 0 else logging.DEBUG,
             "Disconnected from MQTT server %s:%s (%s)",
             self.conf[CONF_BROKER],
             self.conf.get(CONF_PORT, DEFAULT_PORT),
-            result_code,
+            reason_code,
         )
 
     @callback
@@ -1216,7 +1268,9 @@ class MQTT:
         if not future.done():
             future.set_exception(asyncio.TimeoutError)
 
-    async def _async_wait_for_mid_or_raise(self, mid: int, result_code: int) -> None:
+    async def _async_wait_for_mid_or_raise(
+        self, mid: int | None, result_code: int
+    ) -> None:
         """Wait for ACK from broker or raise on error."""
         if result_code != 0:
             # pylint: disable-next=import-outside-toplevel
@@ -1232,6 +1286,8 @@ class MQTT:
 
         # Create the mid event if not created, either _mqtt_handle_mid or
         # _async_wait_for_mid_or_raise may be executed first.
+        if TYPE_CHECKING:
+            assert mid is not None
         future = self._async_get_mid_future(mid)
         loop = self.hass.loop
         timer_handle = loop.call_later(TIMEOUT_ACK, self._async_timeout_mid, future)
@@ -1269,7 +1325,7 @@ def _matcher_for_topic(subscription: str) -> Callable[[str], bool]:
     # pylint: disable-next=import-outside-toplevel
     from paho.mqtt.matcher import MQTTMatcher
 
-    matcher = MQTTMatcher()
+    matcher = MQTTMatcher()  # type: ignore[no-untyped-call]
     matcher[subscription] = True
 
-    return lambda topic: next(matcher.iter_match(topic), False)
+    return lambda topic: next(matcher.iter_match(topic), False)  # type: ignore[no-untyped-call]
diff --git a/homeassistant/components/mqtt/climate.py b/homeassistant/components/mqtt/climate.py
index e62303472ed..931a57a71cc 100644
--- a/homeassistant/components/mqtt/climate.py
+++ b/homeassistant/components/mqtt/climate.py
@@ -44,8 +44,8 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.typing import ConfigType, VolSchemaType
@@ -113,11 +113,19 @@ CONF_PRESET_MODE_COMMAND_TOPIC = "preset_mode_command_topic"
 CONF_PRESET_MODE_VALUE_TEMPLATE = "preset_mode_value_template"
 CONF_PRESET_MODE_COMMAND_TEMPLATE = "preset_mode_command_template"
 CONF_PRESET_MODES_LIST = "preset_modes"
+
+CONF_SWING_HORIZONTAL_MODE_COMMAND_TEMPLATE = "swing_horizontal_mode_command_template"
+CONF_SWING_HORIZONTAL_MODE_COMMAND_TOPIC = "swing_horizontal_mode_command_topic"
+CONF_SWING_HORIZONTAL_MODE_LIST = "swing_horizontal_modes"
+CONF_SWING_HORIZONTAL_MODE_STATE_TEMPLATE = "swing_horizontal_mode_state_template"
+CONF_SWING_HORIZONTAL_MODE_STATE_TOPIC = "swing_horizontal_mode_state_topic"
+
 CONF_SWING_MODE_COMMAND_TEMPLATE = "swing_mode_command_template"
 CONF_SWING_MODE_COMMAND_TOPIC = "swing_mode_command_topic"
 CONF_SWING_MODE_LIST = "swing_modes"
 CONF_SWING_MODE_STATE_TEMPLATE = "swing_mode_state_template"
 CONF_SWING_MODE_STATE_TOPIC = "swing_mode_state_topic"
+
 CONF_TEMP_HIGH_COMMAND_TEMPLATE = "temperature_high_command_template"
 CONF_TEMP_HIGH_COMMAND_TOPIC = "temperature_high_command_topic"
 CONF_TEMP_HIGH_STATE_TEMPLATE = "temperature_high_state_template"
@@ -145,6 +153,8 @@ MQTT_CLIMATE_ATTRIBUTES_BLOCKED = frozenset(
         climate.ATTR_MIN_TEMP,
         climate.ATTR_PRESET_MODE,
         climate.ATTR_PRESET_MODES,
+        climate.ATTR_SWING_HORIZONTAL_MODE,
+        climate.ATTR_SWING_HORIZONTAL_MODES,
         climate.ATTR_SWING_MODE,
         climate.ATTR_SWING_MODES,
         climate.ATTR_TARGET_TEMP_HIGH,
@@ -162,6 +172,7 @@ VALUE_TEMPLATE_KEYS = (
     CONF_MODE_STATE_TEMPLATE,
     CONF_ACTION_TEMPLATE,
     CONF_PRESET_MODE_VALUE_TEMPLATE,
+    CONF_SWING_HORIZONTAL_MODE_STATE_TEMPLATE,
     CONF_SWING_MODE_STATE_TEMPLATE,
     CONF_TEMP_HIGH_STATE_TEMPLATE,
     CONF_TEMP_LOW_STATE_TEMPLATE,
@@ -174,6 +185,7 @@ COMMAND_TEMPLATE_KEYS = {
     CONF_MODE_COMMAND_TEMPLATE,
     CONF_POWER_COMMAND_TEMPLATE,
     CONF_PRESET_MODE_COMMAND_TEMPLATE,
+    CONF_SWING_HORIZONTAL_MODE_COMMAND_TEMPLATE,
     CONF_SWING_MODE_COMMAND_TEMPLATE,
     CONF_TEMP_COMMAND_TEMPLATE,
     CONF_TEMP_HIGH_COMMAND_TEMPLATE,
@@ -194,6 +206,8 @@ TOPIC_KEYS = (
     CONF_POWER_COMMAND_TOPIC,
     CONF_PRESET_MODE_COMMAND_TOPIC,
     CONF_PRESET_MODE_STATE_TOPIC,
+    CONF_SWING_HORIZONTAL_MODE_COMMAND_TOPIC,
+    CONF_SWING_HORIZONTAL_MODE_STATE_TOPIC,
     CONF_SWING_MODE_COMMAND_TOPIC,
     CONF_SWING_MODE_STATE_TOPIC,
     CONF_TEMP_COMMAND_TOPIC,
@@ -302,6 +316,13 @@ _PLATFORM_SCHEMA_BASE = MQTT_BASE_SCHEMA.extend(
         vol.Optional(CONF_PRESET_MODE_COMMAND_TEMPLATE): cv.template,
         vol.Optional(CONF_PRESET_MODE_STATE_TOPIC): valid_subscribe_topic,
         vol.Optional(CONF_PRESET_MODE_VALUE_TEMPLATE): cv.template,
+        vol.Optional(CONF_SWING_HORIZONTAL_MODE_COMMAND_TEMPLATE): cv.template,
+        vol.Optional(CONF_SWING_HORIZONTAL_MODE_COMMAND_TOPIC): valid_publish_topic,
+        vol.Optional(
+            CONF_SWING_HORIZONTAL_MODE_LIST, default=[SWING_ON, SWING_OFF]
+        ): cv.ensure_list,
+        vol.Optional(CONF_SWING_HORIZONTAL_MODE_STATE_TEMPLATE): cv.template,
+        vol.Optional(CONF_SWING_HORIZONTAL_MODE_STATE_TOPIC): valid_subscribe_topic,
         vol.Optional(CONF_SWING_MODE_COMMAND_TEMPLATE): cv.template,
         vol.Optional(CONF_SWING_MODE_COMMAND_TOPIC): valid_publish_topic,
         vol.Optional(
@@ -350,7 +371,7 @@ DISCOVERY_SCHEMA = vol.All(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT climate through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
@@ -515,6 +536,7 @@ class MqttClimate(MqttTemperatureControlEntity, ClimateEntity):
 
     _attr_fan_mode: str | None = None
     _attr_hvac_mode: HVACMode | None = None
+    _attr_swing_horizontal_mode: str | None = None
     _attr_swing_mode: str | None = None
     _default_name = DEFAULT_NAME
     _entity_id_format = climate.ENTITY_ID_FORMAT
@@ -543,6 +565,7 @@ class MqttClimate(MqttTemperatureControlEntity, ClimateEntity):
         if (precision := config.get(CONF_PRECISION)) is not None:
             self._attr_precision = precision
         self._attr_fan_modes = config[CONF_FAN_MODE_LIST]
+        self._attr_swing_horizontal_modes = config[CONF_SWING_HORIZONTAL_MODE_LIST]
         self._attr_swing_modes = config[CONF_SWING_MODE_LIST]
         self._attr_target_temperature_step = config[CONF_TEMP_STEP]
 
@@ -568,6 +591,11 @@ class MqttClimate(MqttTemperatureControlEntity, ClimateEntity):
 
         if self._topic[CONF_FAN_MODE_STATE_TOPIC] is None or self._optimistic:
             self._attr_fan_mode = FAN_LOW
+        if (
+            self._topic[CONF_SWING_HORIZONTAL_MODE_STATE_TOPIC] is None
+            or self._optimistic
+        ):
+            self._attr_swing_horizontal_mode = SWING_OFF
         if self._topic[CONF_SWING_MODE_STATE_TOPIC] is None or self._optimistic:
             self._attr_swing_mode = SWING_OFF
         if self._topic[CONF_MODE_STATE_TOPIC] is None or self._optimistic:
@@ -629,6 +657,11 @@ class MqttClimate(MqttTemperatureControlEntity, ClimateEntity):
         ):
             support |= ClimateEntityFeature.FAN_MODE
 
+        if (self._topic[CONF_SWING_HORIZONTAL_MODE_STATE_TOPIC] is not None) or (
+            self._topic[CONF_SWING_HORIZONTAL_MODE_COMMAND_TOPIC] is not None
+        ):
+            support |= ClimateEntityFeature.SWING_HORIZONTAL_MODE
+
         if (self._topic[CONF_SWING_MODE_STATE_TOPIC] is not None) or (
             self._topic[CONF_SWING_MODE_COMMAND_TOPIC] is not None
         ):
@@ -744,6 +777,16 @@ class MqttClimate(MqttTemperatureControlEntity, ClimateEntity):
             ),
             {"_attr_fan_mode"},
         )
+        self.add_subscription(
+            CONF_SWING_HORIZONTAL_MODE_STATE_TOPIC,
+            partial(
+                self._handle_mode_received,
+                CONF_SWING_HORIZONTAL_MODE_STATE_TEMPLATE,
+                "_attr_swing_horizontal_mode",
+                CONF_SWING_HORIZONTAL_MODE_LIST,
+            ),
+            {"_attr_swing_horizontal_mode"},
+        )
         self.add_subscription(
             CONF_SWING_MODE_STATE_TOPIC,
             partial(
@@ -782,6 +825,20 @@ class MqttClimate(MqttTemperatureControlEntity, ClimateEntity):
 
         self.async_write_ha_state()
 
+    async def async_set_swing_horizontal_mode(self, swing_horizontal_mode: str) -> None:
+        """Set new swing horizontal mode."""
+        payload = self._command_templates[CONF_SWING_HORIZONTAL_MODE_COMMAND_TEMPLATE](
+            swing_horizontal_mode
+        )
+        await self._publish(CONF_SWING_HORIZONTAL_MODE_COMMAND_TOPIC, payload)
+
+        if (
+            self._optimistic
+            or self._topic[CONF_SWING_HORIZONTAL_MODE_STATE_TOPIC] is None
+        ):
+            self._attr_swing_horizontal_mode = swing_horizontal_mode
+            self.async_write_ha_state()
+
     async def async_set_swing_mode(self, swing_mode: str) -> None:
         """Set new swing mode."""
         payload = self._command_templates[CONF_SWING_MODE_COMMAND_TEMPLATE](swing_mode)
diff --git a/homeassistant/components/mqtt/config_flow.py b/homeassistant/components/mqtt/config_flow.py
index a4d400dfea2..83592c4c23d 100644
--- a/homeassistant/components/mqtt/config_flow.py
+++ b/homeassistant/components/mqtt/config_flow.py
@@ -5,38 +5,70 @@ from __future__ import annotations
 import asyncio
 from collections import OrderedDict
 from collections.abc import Callable, Mapping
+from copy import deepcopy
+from dataclasses import dataclass
+from enum import IntEnum
 import logging
 import queue
 from ssl import PROTOCOL_TLS_CLIENT, SSLContext, SSLError
 from types import MappingProxyType
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, cast
+from uuid import uuid4
 
-from cryptography.hazmat.primitives.serialization import load_pem_private_key
-from cryptography.x509 import load_pem_x509_certificate
+from cryptography.hazmat.primitives.serialization import (
+    Encoding,
+    NoEncryption,
+    PrivateFormat,
+    load_der_private_key,
+    load_pem_private_key,
+)
+from cryptography.x509 import load_der_x509_certificate, load_pem_x509_certificate
 import voluptuous as vol
 
 from homeassistant.components.file_upload import process_uploaded_file
 from homeassistant.components.hassio import AddonError, AddonManager, AddonState
+from homeassistant.components.sensor import (
+    CONF_STATE_CLASS,
+    DEVICE_CLASS_UNITS,
+    SensorDeviceClass,
+    SensorStateClass,
+)
+from homeassistant.components.switch import SwitchDeviceClass
 from homeassistant.config_entries import (
     SOURCE_RECONFIGURE,
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
+    ConfigSubentryFlow,
     OptionsFlow,
+    SubentryFlowResult,
 )
 from homeassistant.const import (
+    ATTR_CONFIGURATION_URL,
+    ATTR_HW_VERSION,
+    ATTR_MODEL,
+    ATTR_MODEL_ID,
+    ATTR_NAME,
+    ATTR_SW_VERSION,
     CONF_CLIENT_ID,
+    CONF_DEVICE,
+    CONF_DEVICE_CLASS,
     CONF_DISCOVERY,
     CONF_HOST,
+    CONF_NAME,
+    CONF_OPTIMISTIC,
     CONF_PASSWORD,
     CONF_PAYLOAD,
+    CONF_PLATFORM,
     CONF_PORT,
     CONF_PROTOCOL,
+    CONF_UNIT_OF_MEASUREMENT,
     CONF_USERNAME,
+    CONF_VALUE_TEMPLATE,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.data_entry_flow import AbortFlow
-from homeassistant.helpers import config_validation as cv
+from homeassistant.data_entry_flow import AbortFlow, SectionConfig, section
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.hassio import is_hassio
 from homeassistant.helpers.json import json_dumps
 from homeassistant.helpers.selector import (
@@ -47,9 +79,12 @@ from homeassistant.helpers.selector import (
     NumberSelectorConfig,
     NumberSelectorMode,
     SelectOptionDict,
+    Selector,
     SelectSelector,
     SelectSelectorConfig,
     SelectSelectorMode,
+    TemplateSelector,
+    TemplateSelectorConfig,
     TextSelector,
     TextSelectorConfig,
     TextSelectorType,
@@ -64,13 +99,27 @@ from .const import (
     ATTR_QOS,
     ATTR_RETAIN,
     ATTR_TOPIC,
+    CONF_AVAILABILITY_TEMPLATE,
+    CONF_AVAILABILITY_TOPIC,
     CONF_BIRTH_MESSAGE,
     CONF_BROKER,
     CONF_CERTIFICATE,
     CONF_CLIENT_CERT,
     CONF_CLIENT_KEY,
+    CONF_COMMAND_TEMPLATE,
+    CONF_COMMAND_TOPIC,
     CONF_DISCOVERY_PREFIX,
+    CONF_ENTITY_PICTURE,
+    CONF_EXPIRE_AFTER,
     CONF_KEEPALIVE,
+    CONF_LAST_RESET_VALUE_TEMPLATE,
+    CONF_OPTIONS,
+    CONF_PAYLOAD_AVAILABLE,
+    CONF_PAYLOAD_NOT_AVAILABLE,
+    CONF_QOS,
+    CONF_RETAIN,
+    CONF_STATE_TOPIC,
+    CONF_SUGGESTED_DISPLAY_PRECISION,
     CONF_TLS_INSECURE,
     CONF_TRANSPORT,
     CONF_WILL_MESSAGE,
@@ -82,9 +131,12 @@ from .const import (
     DEFAULT_DISCOVERY,
     DEFAULT_ENCODING,
     DEFAULT_KEEPALIVE,
+    DEFAULT_PAYLOAD_AVAILABLE,
+    DEFAULT_PAYLOAD_NOT_AVAILABLE,
     DEFAULT_PORT,
     DEFAULT_PREFIX,
     DEFAULT_PROTOCOL,
+    DEFAULT_QOS,
     DEFAULT_TRANSPORT,
     DEFAULT_WILL,
     DEFAULT_WS_PATH,
@@ -92,12 +144,17 @@ from .const import (
     SUPPORTED_PROTOCOLS,
     TRANSPORT_TCP,
     TRANSPORT_WEBSOCKETS,
+    Platform,
 )
+from .models import MqttAvailabilityData, MqttDeviceData, MqttSubentryData
 from .util import (
     async_create_certificate_temp_files,
     get_file_path,
+    learn_more_url,
     valid_birth_will,
     valid_publish_topic,
+    valid_subscribe_topic,
+    valid_subscribe_topic_template,
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -105,6 +162,8 @@ _LOGGER = logging.getLogger(__name__)
 ADDON_SETUP_TIMEOUT = 5
 ADDON_SETUP_TIMEOUT_ROUNDS = 5
 
+CONF_CLIENT_KEY_PASSWORD = "client_key_password"
+
 MQTT_TIMEOUT = 5
 
 ADVANCED_OPTIONS = "advanced_options"
@@ -119,9 +178,8 @@ PORT_SELECTOR = vol.All(
     vol.Coerce(int),
 )
 PASSWORD_SELECTOR = TextSelector(TextSelectorConfig(type=TextSelectorType.PASSWORD))
-QOS_SELECTOR = vol.All(
-    NumberSelector(NumberSelectorConfig(mode=NumberSelectorMode.BOX, min=0, max=2)),
-    vol.Coerce(int),
+QOS_SELECTOR = NumberSelector(
+    NumberSelectorConfig(mode=NumberSelectorMode.BOX, min=0, max=2)
 )
 KEEPALIVE_SELECTOR = vol.All(
     NumberSelector(
@@ -165,12 +223,313 @@ BROKER_VERIFICATION_SELECTOR = SelectSelector(
 
 # mime configuration from https://pki-tutorial.readthedocs.io/en/latest/mime.html
 CA_CERT_UPLOAD_SELECTOR = FileSelector(
-    FileSelectorConfig(accept=".crt,application/x-x509-ca-cert")
+    FileSelectorConfig(accept=".pem,.crt,.cer,.der,application/x-x509-ca-cert")
 )
 CERT_UPLOAD_SELECTOR = FileSelector(
-    FileSelectorConfig(accept=".crt,application/x-x509-user-cert")
+    FileSelectorConfig(accept=".pem,.crt,.cer,.der,application/x-x509-user-cert")
 )
-KEY_UPLOAD_SELECTOR = FileSelector(FileSelectorConfig(accept=".key,application/pkcs8"))
+KEY_UPLOAD_SELECTOR = FileSelector(
+    FileSelectorConfig(accept=".pem,.key,.der,.pk8,application/pkcs8")
+)
+
+# Subentry selectors
+SUBENTRY_PLATFORMS = [Platform.NOTIFY, Platform.SENSOR, Platform.SWITCH]
+SUBENTRY_PLATFORM_SELECTOR = SelectSelector(
+    SelectSelectorConfig(
+        options=[platform.value for platform in SUBENTRY_PLATFORMS],
+        mode=SelectSelectorMode.DROPDOWN,
+        translation_key=CONF_PLATFORM,
+    )
+)
+TEMPLATE_SELECTOR = TemplateSelector(TemplateSelectorConfig())
+
+SUBENTRY_AVAILABILITY_SCHEMA = vol.Schema(
+    {
+        vol.Optional(CONF_AVAILABILITY_TOPIC): TEXT_SELECTOR,
+        vol.Optional(CONF_AVAILABILITY_TEMPLATE): TEMPLATE_SELECTOR,
+        vol.Optional(
+            CONF_PAYLOAD_AVAILABLE, default=DEFAULT_PAYLOAD_AVAILABLE
+        ): TEXT_SELECTOR,
+        vol.Optional(
+            CONF_PAYLOAD_NOT_AVAILABLE, default=DEFAULT_PAYLOAD_NOT_AVAILABLE
+        ): TEXT_SELECTOR,
+    }
+)
+
+# Sensor specific selectors
+SENSOR_DEVICE_CLASS_SELECTOR = SelectSelector(
+    SelectSelectorConfig(
+        options=[device_class.value for device_class in SensorDeviceClass],
+        mode=SelectSelectorMode.DROPDOWN,
+        translation_key="device_class_sensor",
+        sort=True,
+    )
+)
+SENSOR_STATE_CLASS_SELECTOR = SelectSelector(
+    SelectSelectorConfig(
+        options=[device_class.value for device_class in SensorStateClass],
+        mode=SelectSelectorMode.DROPDOWN,
+        translation_key=CONF_STATE_CLASS,
+    )
+)
+OPTIONS_SELECTOR = SelectSelector(
+    SelectSelectorConfig(
+        options=[],
+        custom_value=True,
+        multiple=True,
+    )
+)
+SUGGESTED_DISPLAY_PRECISION_SELECTOR = NumberSelector(
+    NumberSelectorConfig(mode=NumberSelectorMode.BOX, min=0, max=9)
+)
+EXPIRE_AFTER_SELECTOR = NumberSelector(
+    NumberSelectorConfig(mode=NumberSelectorMode.BOX, min=0)
+)
+
+# Switch specific selectors
+SWITCH_DEVICE_CLASS_SELECTOR = SelectSelector(
+    SelectSelectorConfig(
+        options=[device_class.value for device_class in SwitchDeviceClass],
+        mode=SelectSelectorMode.DROPDOWN,
+        translation_key="device_class_switch",
+    )
+)
+
+
+@callback
+def validate_sensor_platform_config(
+    config: dict[str, Any],
+) -> dict[str, str]:
+    """Validate the sensor options, state and device class config."""
+    errors: dict[str, str] = {}
+    # Only allow `options` to be set for `enum` sensors
+    # to limit the possible sensor values
+    if config.get(CONF_OPTIONS) is not None:
+        if config.get(CONF_STATE_CLASS) or config.get(CONF_UNIT_OF_MEASUREMENT):
+            errors[CONF_OPTIONS] = "options_not_allowed_with_state_class_or_uom"
+
+        if (device_class := config.get(CONF_DEVICE_CLASS)) != SensorDeviceClass.ENUM:
+            errors[CONF_DEVICE_CLASS] = "options_device_class_enum"
+
+    if (
+        (device_class := config.get(CONF_DEVICE_CLASS)) == SensorDeviceClass.ENUM
+        and errors is not None
+        and CONF_OPTIONS not in config
+    ):
+        errors[CONF_OPTIONS] = "options_with_enum_device_class"
+
+    if (
+        device_class in DEVICE_CLASS_UNITS
+        and (unit_of_measurement := config.get(CONF_UNIT_OF_MEASUREMENT)) is None
+        and errors is not None
+    ):
+        # Do not allow an empty unit of measurement in a subentry data flow
+        errors[CONF_UNIT_OF_MEASUREMENT] = "uom_required_for_device_class"
+        return errors
+
+    if (
+        device_class is not None
+        and device_class in DEVICE_CLASS_UNITS
+        and unit_of_measurement not in DEVICE_CLASS_UNITS[device_class]
+    ):
+        errors[CONF_UNIT_OF_MEASUREMENT] = "invalid_uom"
+
+    return errors
+
+
+@dataclass(frozen=True, kw_only=True)
+class PlatformField:
+    """Stores a platform config field schema, required flag and validator."""
+
+    selector: Selector[Any] | Callable[..., Selector[Any]]
+    required: bool
+    validator: Callable[..., Any]
+    error: str | None = None
+    default: str | int | vol.Undefined = vol.UNDEFINED
+    exclude_from_reconfig: bool = False
+    conditions: tuple[dict[str, Any], ...] | None = None
+    custom_filtering: bool = False
+    section: str | None = None
+
+
+@callback
+def unit_of_measurement_selector(user_data: dict[str, Any | None]) -> Selector:
+    """Return a context based unit of measurement selector."""
+    if (
+        user_data is None
+        or (device_class := user_data.get(CONF_DEVICE_CLASS)) is None
+        or device_class not in DEVICE_CLASS_UNITS
+    ):
+        return TEXT_SELECTOR
+    return SelectSelector(
+        SelectSelectorConfig(
+            options=[str(uom) for uom in DEVICE_CLASS_UNITS[device_class]],
+            sort=True,
+            custom_value=True,
+        )
+    )
+
+
+COMMON_ENTITY_FIELDS = {
+    CONF_PLATFORM: PlatformField(
+        selector=SUBENTRY_PLATFORM_SELECTOR,
+        required=True,
+        validator=str,
+        exclude_from_reconfig=True,
+    ),
+    CONF_NAME: PlatformField(
+        selector=TEXT_SELECTOR,
+        required=False,
+        validator=str,
+        exclude_from_reconfig=True,
+    ),
+    CONF_ENTITY_PICTURE: PlatformField(
+        selector=TEXT_SELECTOR, required=False, validator=cv.url, error="invalid_url"
+    ),
+}
+
+PLATFORM_ENTITY_FIELDS = {
+    Platform.NOTIFY.value: {},
+    Platform.SENSOR.value: {
+        CONF_DEVICE_CLASS: PlatformField(
+            selector=SENSOR_DEVICE_CLASS_SELECTOR, required=False, validator=str
+        ),
+        CONF_STATE_CLASS: PlatformField(
+            selector=SENSOR_STATE_CLASS_SELECTOR, required=False, validator=str
+        ),
+        CONF_UNIT_OF_MEASUREMENT: PlatformField(
+            selector=unit_of_measurement_selector,
+            required=False,
+            validator=str,
+            custom_filtering=True,
+        ),
+        CONF_SUGGESTED_DISPLAY_PRECISION: PlatformField(
+            selector=SUGGESTED_DISPLAY_PRECISION_SELECTOR,
+            required=False,
+            validator=cv.positive_int,
+            section="advanced_settings",
+        ),
+        CONF_OPTIONS: PlatformField(
+            selector=OPTIONS_SELECTOR,
+            required=False,
+            validator=cv.ensure_list,
+            conditions=({"device_class": "enum"},),
+        ),
+    },
+    Platform.SWITCH.value: {
+        CONF_DEVICE_CLASS: PlatformField(
+            selector=SWITCH_DEVICE_CLASS_SELECTOR, required=False, validator=str
+        ),
+    },
+}
+PLATFORM_MQTT_FIELDS = {
+    Platform.NOTIFY.value: {
+        CONF_COMMAND_TOPIC: PlatformField(
+            selector=TEXT_SELECTOR,
+            required=True,
+            validator=valid_publish_topic,
+            error="invalid_publish_topic",
+        ),
+        CONF_COMMAND_TEMPLATE: PlatformField(
+            selector=TEMPLATE_SELECTOR,
+            required=False,
+            validator=cv.template,
+            error="invalid_template",
+        ),
+        CONF_RETAIN: PlatformField(
+            selector=BOOLEAN_SELECTOR, required=False, validator=bool
+        ),
+    },
+    Platform.SENSOR.value: {
+        CONF_STATE_TOPIC: PlatformField(
+            selector=TEXT_SELECTOR,
+            required=True,
+            validator=valid_subscribe_topic,
+            error="invalid_subscribe_topic",
+        ),
+        CONF_VALUE_TEMPLATE: PlatformField(
+            selector=TEMPLATE_SELECTOR,
+            required=False,
+            validator=cv.template,
+            error="invalid_template",
+        ),
+        CONF_LAST_RESET_VALUE_TEMPLATE: PlatformField(
+            selector=TEMPLATE_SELECTOR,
+            required=False,
+            validator=cv.template,
+            error="invalid_template",
+            conditions=({CONF_STATE_CLASS: "total"},),
+        ),
+        CONF_EXPIRE_AFTER: PlatformField(
+            selector=EXPIRE_AFTER_SELECTOR,
+            required=False,
+            validator=cv.positive_int,
+            section="advanced_settings",
+        ),
+    },
+    Platform.SWITCH.value: {
+        CONF_COMMAND_TOPIC: PlatformField(
+            selector=TEXT_SELECTOR,
+            required=True,
+            validator=valid_publish_topic,
+            error="invalid_publish_topic",
+        ),
+        CONF_COMMAND_TEMPLATE: PlatformField(
+            selector=TEMPLATE_SELECTOR,
+            required=False,
+            validator=cv.template,
+            error="invalid_template",
+        ),
+        CONF_STATE_TOPIC: PlatformField(
+            selector=TEXT_SELECTOR,
+            required=False,
+            validator=valid_subscribe_topic,
+            error="invalid_subscribe_topic",
+        ),
+        CONF_VALUE_TEMPLATE: PlatformField(
+            selector=TEMPLATE_SELECTOR,
+            required=False,
+            validator=cv.template,
+            error="invalid_template",
+        ),
+        CONF_RETAIN: PlatformField(
+            selector=BOOLEAN_SELECTOR, required=False, validator=bool
+        ),
+        CONF_OPTIMISTIC: PlatformField(
+            selector=BOOLEAN_SELECTOR, required=False, validator=bool
+        ),
+    },
+}
+ENTITY_CONFIG_VALIDATOR: dict[
+    str,
+    Callable[[dict[str, Any]], dict[str, str]] | None,
+] = {
+    Platform.NOTIFY.value: None,
+    Platform.SENSOR.value: validate_sensor_platform_config,
+    Platform.SWITCH.value: None,
+}
+
+MQTT_DEVICE_PLATFORM_FIELDS = {
+    ATTR_NAME: PlatformField(selector=TEXT_SELECTOR, required=False, validator=str),
+    ATTR_SW_VERSION: PlatformField(
+        selector=TEXT_SELECTOR, required=False, validator=str
+    ),
+    ATTR_HW_VERSION: PlatformField(
+        selector=TEXT_SELECTOR, required=False, validator=str
+    ),
+    ATTR_MODEL: PlatformField(selector=TEXT_SELECTOR, required=False, validator=str),
+    ATTR_MODEL_ID: PlatformField(selector=TEXT_SELECTOR, required=False, validator=str),
+    ATTR_CONFIGURATION_URL: PlatformField(
+        selector=TEXT_SELECTOR, required=False, validator=cv.url, error="invalid_url"
+    ),
+    CONF_QOS: PlatformField(
+        selector=QOS_SELECTOR,
+        required=False,
+        validator=int,
+        default=DEFAULT_QOS,
+        section="mqtt_settings",
+    ),
+}
 
 REAUTH_SCHEMA = vol.Schema(
     {
@@ -204,6 +563,170 @@ def update_password_from_user_input(
     return substituted_used_data
 
 
+@callback
+def validate_field(
+    field: str,
+    validator: Callable[..., Any],
+    user_input: dict[str, Any] | None,
+    errors: dict[str, str],
+    error: str,
+) -> None:
+    """Validate a single field."""
+    if user_input is None or field not in user_input:
+        return
+    try:
+        validator(user_input[field])
+    except (ValueError, vol.Invalid):
+        errors[field] = error
+
+
+@callback
+def _check_conditions(
+    platform_field: PlatformField, component_data: dict[str, Any] | None = None
+) -> bool:
+    """Only include field if one of conditions match, or no conditions are set."""
+    if platform_field.conditions is None or component_data is None:
+        return True
+    return any(
+        all(component_data.get(key) == value for key, value in condition.items())
+        for condition in platform_field.conditions
+    )
+
+
+@callback
+def calculate_merged_config(
+    merged_user_input: dict[str, Any],
+    data_schema_fields: dict[str, PlatformField],
+    component_data: dict[str, Any],
+) -> dict[str, Any]:
+    """Calculate merged config."""
+    base_schema_fields = {
+        key
+        for key, platform_field in data_schema_fields.items()
+        if _check_conditions(platform_field, component_data)
+    } - set(merged_user_input)
+    return {
+        key: value
+        for key, value in component_data.items()
+        if key not in base_schema_fields
+    } | merged_user_input
+
+
+@callback
+def validate_user_input(
+    user_input: dict[str, Any],
+    data_schema_fields: dict[str, PlatformField],
+    *,
+    component_data: dict[str, Any] | None = None,
+    config_validator: Callable[[dict[str, Any]], dict[str, str]] | None = None,
+) -> tuple[dict[str, Any], dict[str, str]]:
+    """Validate user input."""
+    errors: dict[str, str] = {}
+    # Merge sections
+    merged_user_input: dict[str, Any] = {}
+    for key, value in user_input.items():
+        if isinstance(value, dict):
+            merged_user_input.update(value)
+        else:
+            merged_user_input[key] = value
+
+    for field, value in merged_user_input.items():
+        validator = data_schema_fields[field].validator
+        try:
+            validator(value)
+        except (ValueError, vol.Invalid):
+            errors[field] = data_schema_fields[field].error or "invalid_input"
+
+    if config_validator is not None:
+        if TYPE_CHECKING:
+            assert component_data is not None
+
+        errors |= config_validator(
+            calculate_merged_config(
+                merged_user_input, data_schema_fields, component_data
+            ),
+        )
+
+    return merged_user_input, errors
+
+
+@callback
+def data_schema_from_fields(
+    data_schema_fields: dict[str, PlatformField],
+    reconfig: bool,
+    component_data: dict[str, Any] | None = None,
+    user_input: dict[str, Any] | None = None,
+    device_data: MqttDeviceData | None = None,
+) -> vol.Schema:
+    """Generate custom data schema from platform fields or device data."""
+    if device_data is not None:
+        component_data_with_user_input: dict[str, Any] | None = dict(device_data)
+        if TYPE_CHECKING:
+            assert component_data_with_user_input is not None
+        component_data_with_user_input.update(
+            component_data_with_user_input.pop("mqtt_settings", {})
+        )
+    else:
+        component_data_with_user_input = deepcopy(component_data)
+    if component_data_with_user_input is not None and user_input is not None:
+        component_data_with_user_input |= user_input
+
+    sections: dict[str | None, None] = {
+        field_details.section: None for field_details in data_schema_fields.values()
+    }
+    data_schema: dict[Any, Any] = {}
+    all_data_element_options: set[Any] = set()
+    no_reconfig_options: set[Any] = set()
+    for schema_section in sections:
+        data_schema_element = {
+            vol.Required(field_name, default=field_details.default)
+            if field_details.required
+            else vol.Optional(
+                field_name, default=field_details.default
+            ): field_details.selector(component_data_with_user_input)  # type: ignore[operator]
+            if field_details.custom_filtering
+            else field_details.selector
+            for field_name, field_details in data_schema_fields.items()
+            if field_details.section == schema_section
+            and (not field_details.exclude_from_reconfig or not reconfig)
+            and _check_conditions(field_details, component_data_with_user_input)
+        }
+        data_element_options = set(data_schema_element)
+        all_data_element_options |= data_element_options
+        no_reconfig_options |= {
+            field_name
+            for field_name, field_details in data_schema_fields.items()
+            if field_details.section == schema_section
+            and field_details.exclude_from_reconfig
+        }
+        if schema_section is None:
+            data_schema.update(data_schema_element)
+            continue
+        collapsed = (
+            not any(
+                (default := data_schema_fields[str(option)].default) is vol.UNDEFINED
+                or component_data_with_user_input[str(option)] != default
+                for option in data_element_options
+                if option in component_data_with_user_input
+            )
+            if component_data_with_user_input is not None
+            else True
+        )
+        data_schema[vol.Optional(schema_section)] = section(
+            vol.Schema(data_schema_element), SectionConfig({"collapsed": collapsed})
+        )
+
+    # Reset all fields from the component_data not in the schema
+    if component_data:
+        filtered_fields = (
+            set(data_schema_fields) - all_data_element_options - no_reconfig_options
+        )
+        for field in filtered_fields:
+            if field in component_data:
+                del component_data[field]
+    return vol.Schema(data_schema)
+
+
 class FlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a config flow."""
 
@@ -219,6 +742,14 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
         self.install_task: asyncio.Task | None = None
         self.start_task: asyncio.Task | None = None
 
+    @classmethod
+    @callback
+    def async_get_supported_subentry_types(
+        cls, config_entry: ConfigEntry
+    ) -> dict[str, type[ConfigSubentryFlow]]:
+        """Return subentries supported by this handler."""
+        return {CONF_DEVICE: MQTTSubentryFlowHandler}
+
     @staticmethod
     @callback
     def async_get_options_flow(
@@ -485,7 +1016,7 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
             errors,
         ):
             if is_reconfigure:
-                update_password_from_user_input(
+                validated_user_input = update_password_from_user_input(
                     reconfigure_entry.data.get(CONF_PASSWORD), validated_user_input
                 )
 
@@ -710,17 +1241,514 @@ class MQTTOptionsFlowHandler(OptionsFlow):
         )
 
 
-async def _get_uploaded_file(hass: HomeAssistant, id: str) -> str:
-    """Get file content from uploaded file."""
+class MQTTSubentryFlowHandler(ConfigSubentryFlow):
+    """Handle MQTT subentry flow."""
 
-    def _proces_uploaded_file() -> str:
+    _subentry_data: MqttSubentryData
+    _component_id: str | None = None
+
+    @callback
+    def update_component_fields(
+        self,
+        data_schema_fields: dict[str, PlatformField],
+        merged_user_input: dict[str, Any],
+    ) -> None:
+        """Update the componment fields."""
+        if TYPE_CHECKING:
+            assert self._component_id is not None
+        component_data = self._subentry_data["components"][self._component_id]
+        # Remove the fields from the component data
+        # if they are not in the schema and not in the user input
+        config = calculate_merged_config(
+            merged_user_input, data_schema_fields, component_data
+        )
+        for field in (
+            field
+            for field, platform_field in data_schema_fields.items()
+            if field in (set(component_data) - set(config))
+            and not platform_field.exclude_from_reconfig
+        ):
+            component_data.pop(field)
+        component_data.update(merged_user_input)
+
+    @callback
+    def generate_names(self) -> tuple[str, str]:
+        """Generate the device and full entity name."""
+        if TYPE_CHECKING:
+            assert self._component_id is not None
+        device_name = self._subentry_data[CONF_DEVICE][CONF_NAME]
+        if entity_name := self._subentry_data["components"][self._component_id].get(
+            CONF_NAME
+        ):
+            full_entity_name: str = f"{device_name} {entity_name}"
+        else:
+            full_entity_name = device_name
+        return device_name, full_entity_name
+
+    @callback
+    def get_suggested_values_from_component(
+        self, data_schema: vol.Schema
+    ) -> dict[str, Any]:
+        """Get suggestions from component data based on the data schema."""
+        if TYPE_CHECKING:
+            assert self._component_id is not None
+        component_data = self._subentry_data["components"][self._component_id]
+        return {
+            field_key: self.get_suggested_values_from_component(value.schema)
+            if isinstance(value, section)
+            else component_data.get(field_key)
+            for field_key, value in data_schema.schema.items()
+        }
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> SubentryFlowResult:
+        """Add a subentry."""
+        self._subentry_data = MqttSubentryData(device=MqttDeviceData(), components={})
+        return await self.async_step_device()
+
+    async def async_step_reconfigure(
+        self, user_input: dict[str, Any] | None = None
+    ) -> SubentryFlowResult:
+        """Reconfigure a subentry."""
+        reconfigure_subentry = self._get_reconfigure_subentry()
+        self._subentry_data = cast(
+            MqttSubentryData, deepcopy(dict(reconfigure_subentry.data))
+        )
+        return await self.async_step_summary_menu()
+
+    async def async_step_device(
+        self, user_input: dict[str, Any] | None = None
+    ) -> SubentryFlowResult:
+        """Add a new MQTT device."""
+        errors: dict[str, Any] = {}
+        device_data = self._subentry_data[CONF_DEVICE]
+        data_schema = data_schema_from_fields(
+            MQTT_DEVICE_PLATFORM_FIELDS,
+            device_data=device_data,
+            reconfig=True,
+        )
+        if user_input is not None:
+            _, errors = validate_user_input(user_input, MQTT_DEVICE_PLATFORM_FIELDS)
+            if not errors:
+                self._subentry_data[CONF_DEVICE] = cast(MqttDeviceData, user_input)
+                if self.source == SOURCE_RECONFIGURE:
+                    return await self.async_step_summary_menu()
+                return await self.async_step_entity()
+        data_schema = self.add_suggested_values_to_schema(
+            data_schema, device_data if user_input is None else user_input
+        )
+        return self.async_show_form(
+            step_id=CONF_DEVICE,
+            data_schema=data_schema,
+            errors=errors,
+            last_step=False,
+        )
+
+    async def async_step_entity(
+        self, user_input: dict[str, Any] | None = None
+    ) -> SubentryFlowResult:
+        """Add or edit an mqtt entity."""
+        errors: dict[str, str] = {}
+        data_schema_fields = COMMON_ENTITY_FIELDS
+        entity_name_label: str = ""
+        platform_label: str = ""
+        component_data: dict[str, Any] | None = None
+        if reconfig := (self._component_id is not None):
+            component_data = self._subentry_data["components"][self._component_id]
+            name: str | None = component_data.get(CONF_NAME)
+            platform_label = f"{self._subentry_data['components'][self._component_id][CONF_PLATFORM]} "
+            entity_name_label = f" ({name})" if name is not None else ""
+        data_schema = data_schema_from_fields(data_schema_fields, reconfig=reconfig)
+        if user_input is not None:
+            merged_user_input, errors = validate_user_input(
+                user_input, data_schema_fields, component_data=component_data
+            )
+            if not errors:
+                if self._component_id is None:
+                    self._component_id = uuid4().hex
+                self._subentry_data["components"].setdefault(self._component_id, {})
+                self.update_component_fields(data_schema_fields, merged_user_input)
+                return await self.async_step_entity_platform_config()
+            data_schema = self.add_suggested_values_to_schema(data_schema, user_input)
+        elif self.source == SOURCE_RECONFIGURE and self._component_id is not None:
+            data_schema = self.add_suggested_values_to_schema(
+                data_schema,
+                self.get_suggested_values_from_component(data_schema),
+            )
+        device_name = self._subentry_data[CONF_DEVICE][CONF_NAME]
+        return self.async_show_form(
+            step_id="entity",
+            data_schema=data_schema,
+            description_placeholders={
+                "mqtt_device": device_name,
+                "entity_name_label": entity_name_label,
+                "platform_label": platform_label,
+            },
+            errors=errors,
+            last_step=False,
+        )
+
+    def _show_update_or_delete_form(self, step_id: str) -> SubentryFlowResult:
+        """Help selecting an entity to update or delete."""
+        device_name = self._subentry_data[CONF_DEVICE][CONF_NAME]
+        entities = [
+            SelectOptionDict(
+                value=key,
+                label=f"{device_name} {component_data.get(CONF_NAME, '-')}"
+                f" ({component_data[CONF_PLATFORM]})",
+            )
+            for key, component_data in self._subentry_data["components"].items()
+        ]
+        data_schema = vol.Schema(
+            {
+                vol.Required("component"): SelectSelector(
+                    SelectSelectorConfig(
+                        options=entities,
+                        mode=SelectSelectorMode.LIST,
+                    )
+                )
+            }
+        )
+        return self.async_show_form(
+            step_id=step_id, data_schema=data_schema, last_step=False
+        )
+
+    async def async_step_update_entity(
+        self, user_input: dict[str, Any] | None = None
+    ) -> SubentryFlowResult:
+        """Select the entity to update."""
+        if user_input:
+            self._component_id = user_input["component"]
+            return await self.async_step_entity()
+        if len(self._subentry_data["components"]) == 1:
+            # Return first key
+            self._component_id = next(iter(self._subentry_data["components"]))
+            return await self.async_step_entity()
+        return self._show_update_or_delete_form("update_entity")
+
+    async def async_step_delete_entity(
+        self, user_input: dict[str, Any] | None = None
+    ) -> SubentryFlowResult:
+        """Select the entity to delete."""
+        if user_input:
+            del self._subentry_data["components"][user_input["component"]]
+            return await self.async_step_summary_menu()
+        return self._show_update_or_delete_form("delete_entity")
+
+    async def async_step_entity_platform_config(
+        self, user_input: dict[str, Any] | None = None
+    ) -> SubentryFlowResult:
+        """Configure platform entity details."""
+        if TYPE_CHECKING:
+            assert self._component_id is not None
+        component_data = self._subentry_data["components"][self._component_id]
+        platform = component_data[CONF_PLATFORM]
+        data_schema_fields = PLATFORM_ENTITY_FIELDS[platform]
+        errors: dict[str, str] = {}
+
+        data_schema = data_schema_from_fields(
+            data_schema_fields,
+            reconfig=bool(
+                {field for field in data_schema_fields if field in component_data}
+            ),
+            component_data=component_data,
+            user_input=user_input,
+        )
+        if not data_schema.schema:
+            return await self.async_step_mqtt_platform_config()
+        if user_input is not None:
+            # Test entity fields against the validator
+            merged_user_input, errors = validate_user_input(
+                user_input,
+                data_schema_fields,
+                component_data=component_data,
+                config_validator=ENTITY_CONFIG_VALIDATOR[platform],
+            )
+            if not errors:
+                self.update_component_fields(data_schema_fields, merged_user_input)
+                return await self.async_step_mqtt_platform_config()
+
+            data_schema = self.add_suggested_values_to_schema(data_schema, user_input)
+        else:
+            data_schema = self.add_suggested_values_to_schema(
+                data_schema,
+                self.get_suggested_values_from_component(data_schema),
+            )
+
+        device_name, full_entity_name = self.generate_names()
+        return self.async_show_form(
+            step_id="entity_platform_config",
+            data_schema=data_schema,
+            description_placeholders={
+                "mqtt_device": device_name,
+                CONF_PLATFORM: platform,
+                "entity": full_entity_name,
+                "url": learn_more_url(platform),
+            }
+            | (user_input or {}),
+            errors=errors,
+            last_step=False,
+        )
+
+    async def async_step_mqtt_platform_config(
+        self, user_input: dict[str, Any] | None = None
+    ) -> SubentryFlowResult:
+        """Configure entity platform MQTT details."""
+        errors: dict[str, str] = {}
+        if TYPE_CHECKING:
+            assert self._component_id is not None
+        component_data = self._subentry_data["components"][self._component_id]
+        platform = component_data[CONF_PLATFORM]
+        data_schema_fields = PLATFORM_MQTT_FIELDS[platform]
+        data_schema = data_schema_from_fields(
+            data_schema_fields,
+            reconfig=bool(
+                {field for field in data_schema_fields if field in component_data}
+            ),
+            component_data=component_data,
+        )
+        if user_input is not None:
+            # Test entity fields against the validator
+            merged_user_input, errors = validate_user_input(
+                user_input,
+                data_schema_fields,
+                component_data=component_data,
+                config_validator=ENTITY_CONFIG_VALIDATOR[platform],
+            )
+            if not errors:
+                self.update_component_fields(data_schema_fields, merged_user_input)
+                self._component_id = None
+                if self.source == SOURCE_RECONFIGURE:
+                    return await self.async_step_summary_menu()
+                return self._async_create_subentry()
+
+            data_schema = self.add_suggested_values_to_schema(data_schema, user_input)
+        else:
+            data_schema = self.add_suggested_values_to_schema(
+                data_schema,
+                self.get_suggested_values_from_component(data_schema),
+            )
+        device_name, full_entity_name = self.generate_names()
+        return self.async_show_form(
+            step_id="mqtt_platform_config",
+            data_schema=data_schema,
+            description_placeholders={
+                "mqtt_device": device_name,
+                CONF_PLATFORM: platform,
+                "entity": full_entity_name,
+                "url": learn_more_url(platform),
+            },
+            errors=errors,
+            last_step=False,
+        )
+
+    @callback
+    def _async_create_subentry(
+        self, user_input: dict[str, Any] | None = None
+    ) -> SubentryFlowResult:
+        """Create a subentry for a new MQTT device."""
+        device_name = self._subentry_data[CONF_DEVICE][CONF_NAME]
+        component_data: dict[str, Any] = next(
+            iter(self._subentry_data["components"].values())
+        )
+        platform = component_data[CONF_PLATFORM]
+        entity_name: str | None
+        if entity_name := component_data.get(CONF_NAME):
+            full_entity_name: str = f"{device_name} {entity_name}"
+        else:
+            full_entity_name = device_name
+
+        return self.async_create_entry(
+            data=self._subentry_data,
+            title=self._subentry_data[CONF_DEVICE][CONF_NAME],
+            description_placeholders={
+                "entity": full_entity_name,
+                CONF_PLATFORM: platform,
+            },
+        )
+
+    async def async_step_availability(
+        self, user_input: dict[str, Any] | None = None
+    ) -> SubentryFlowResult:
+        """Configure availability options."""
+        errors: dict[str, str] = {}
+        validate_field(
+            "availability_topic",
+            valid_subscribe_topic,
+            user_input,
+            errors,
+            "invalid_subscribe_topic",
+        )
+        validate_field(
+            "availability_template",
+            valid_subscribe_topic_template,
+            user_input,
+            errors,
+            "invalid_template",
+        )
+        if not errors and user_input is not None:
+            self._subentry_data.setdefault("availability", MqttAvailabilityData())
+            self._subentry_data["availability"] = cast(MqttAvailabilityData, user_input)
+            return await self.async_step_summary_menu()
+
+        data_schema = SUBENTRY_AVAILABILITY_SCHEMA
+        data_schema = self.add_suggested_values_to_schema(
+            data_schema,
+            dict(self._subentry_data.setdefault("availability", {}))
+            if self.source == SOURCE_RECONFIGURE
+            else user_input,
+        )
+        return self.async_show_form(
+            step_id="availability",
+            data_schema=data_schema,
+            errors=errors,
+            last_step=False,
+        )
+
+    async def async_step_summary_menu(
+        self, user_input: dict[str, Any] | None = None
+    ) -> SubentryFlowResult:
+        """Show summary menu and decide to add more entities or to finish the flow."""
+        self._component_id = None
+        mqtt_device = self._subentry_data[CONF_DEVICE][CONF_NAME]
+        mqtt_items = ", ".join(
+            f"{mqtt_device} {component_data.get(CONF_NAME, '-')} ({component_data[CONF_PLATFORM]})"
+            for component_data in self._subentry_data["components"].values()
+        )
+        menu_options = [
+            "entity",
+            "update_entity",
+        ]
+        if len(self._subentry_data["components"]) > 1:
+            menu_options.append("delete_entity")
+        menu_options.extend(["device", "availability"])
+        if self._subentry_data != self._get_reconfigure_subentry().data:
+            menu_options.append("save_changes")
+        return self.async_show_menu(
+            step_id="summary_menu",
+            menu_options=menu_options,
+            description_placeholders={
+                "mqtt_device": mqtt_device,
+                "mqtt_items": mqtt_items,
+            },
+        )
+
+    async def async_step_save_changes(
+        self, user_input: dict[str, Any] | None = None
+    ) -> SubentryFlowResult:
+        """Save the changes made to the subentry."""
+        entry = self._get_entry()
+        subentry = self._get_reconfigure_subentry()
+        entity_registry = er.async_get(self.hass)
+
+        # When a component is removed from the MQTT device,
+        # And we save the changes to the subentry,
+        # we need to clean up stale entity registry entries.
+        # The component id is used as a part of the unique id of the entity.
+        for unique_id, platform in [
+            (
+                f"{subentry.subentry_id}_{component_id}",
+                subentry.data["components"][component_id][CONF_PLATFORM],
+            )
+            for component_id in subentry.data["components"]
+            if component_id not in self._subentry_data["components"]
+        ]:
+            if entity_id := entity_registry.async_get_entity_id(
+                platform, DOMAIN, unique_id
+            ):
+                entity_registry.async_remove(entity_id)
+
+        return self.async_update_and_abort(
+            entry,
+            subentry,
+            data=self._subentry_data,
+            title=self._subentry_data[CONF_DEVICE][CONF_NAME],
+        )
+
+
+@callback
+def async_is_pem_data(data: bytes) -> bool:
+    """Return True if data is in PEM format."""
+    return (
+        b"-----BEGIN CERTIFICATE-----" in data
+        or b"-----BEGIN PRIVATE KEY-----" in data
+        or b"-----BEGIN RSA PRIVATE KEY-----" in data
+        or b"-----BEGIN ENCRYPTED PRIVATE KEY-----" in data
+    )
+
+
+class PEMType(IntEnum):
+    """Type of PEM data."""
+
+    CERTIFICATE = 1
+    PRIVATE_KEY = 2
+
+
+@callback
+def async_convert_to_pem(
+    data: bytes, pem_type: PEMType, password: str | None = None
+) -> str | None:
+    """Convert data to PEM format."""
+    try:
+        if async_is_pem_data(data):
+            if not password:
+                # Assume unencrypted PEM encoded private key
+                return data.decode(DEFAULT_ENCODING)
+            # Return decrypted PEM encoded private key
+            return (
+                load_pem_private_key(data, password=password.encode(DEFAULT_ENCODING))
+                .private_bytes(
+                    encoding=Encoding.PEM,
+                    format=PrivateFormat.TraditionalOpenSSL,
+                    encryption_algorithm=NoEncryption(),
+                )
+                .decode(DEFAULT_ENCODING)
+            )
+        # Convert from DER encoding to PEM
+        if pem_type == PEMType.CERTIFICATE:
+            return (
+                load_der_x509_certificate(data)
+                .public_bytes(
+                    encoding=Encoding.PEM,
+                )
+                .decode(DEFAULT_ENCODING)
+            )
+        # Assume DER encoded private key
+        pem_key_data: bytes = load_der_private_key(
+            data, password.encode(DEFAULT_ENCODING) if password else None
+        ).private_bytes(
+            encoding=Encoding.PEM,
+            format=PrivateFormat.TraditionalOpenSSL,
+            encryption_algorithm=NoEncryption(),
+        )
+        return pem_key_data.decode("utf-8")
+    except (TypeError, ValueError, SSLError):
+        _LOGGER.exception("Error converting %s file data to PEM format", pem_type.name)
+        return None
+
+
+async def _get_uploaded_file(hass: HomeAssistant, id: str) -> bytes:
+    """Get file content from uploaded certificate or key file."""
+
+    def _proces_uploaded_file() -> bytes:
         with process_uploaded_file(hass, id) as file_path:
-            return file_path.read_text(encoding=DEFAULT_ENCODING)
+            return file_path.read_bytes()
 
     return await hass.async_add_executor_job(_proces_uploaded_file)
 
 
-async def async_get_broker_settings(
+def _validate_pki_file(
+    file_id: str | None, pem_data: str | None, errors: dict[str, str], error: str
+) -> bool:
+    """Return False if uploaded file could not be converted to PEM format."""
+    if file_id and not pem_data:
+        errors["base"] = error
+        return False
+    return True
+
+
+async def async_get_broker_settings(  # noqa: C901
     flow: ConfigFlow | OptionsFlow,
     fields: OrderedDict[Any, Any],
     entry_config: MappingProxyType[str, Any] | None,
@@ -768,6 +1796,10 @@ async def async_get_broker_settings(
         validated_user_input.update(user_input)
         client_certificate_id: str | None = user_input.get(CONF_CLIENT_CERT)
         client_key_id: str | None = user_input.get(CONF_CLIENT_KEY)
+        # We do not store the private key password in the entry data
+        client_key_password: str | None = validated_user_input.pop(
+            CONF_CLIENT_KEY_PASSWORD, None
+        )
         if (client_certificate_id and not client_key_id) or (
             not client_certificate_id and client_key_id
         ):
@@ -775,7 +1807,14 @@ async def async_get_broker_settings(
             return False
         certificate_id: str | None = user_input.get(CONF_CERTIFICATE)
         if certificate_id:
-            certificate = await _get_uploaded_file(hass, certificate_id)
+            certificate_data_raw = await _get_uploaded_file(hass, certificate_id)
+            certificate = async_convert_to_pem(
+                certificate_data_raw, PEMType.CERTIFICATE
+            )
+        if not _validate_pki_file(
+            certificate_id, certificate, errors, "bad_certificate"
+        ):
+            return False
 
         # Return to form for file upload CA cert or client cert and key
         if (
@@ -797,9 +1836,26 @@ async def async_get_broker_settings(
             return False
 
         if client_certificate_id:
-            client_certificate = await _get_uploaded_file(hass, client_certificate_id)
+            client_certificate_data = await _get_uploaded_file(
+                hass, client_certificate_id
+            )
+            client_certificate = async_convert_to_pem(
+                client_certificate_data, PEMType.CERTIFICATE
+            )
+        if not _validate_pki_file(
+            client_certificate_id, client_certificate, errors, "bad_client_cert"
+        ):
+            return False
+
         if client_key_id:
-            client_key = await _get_uploaded_file(hass, client_key_id)
+            client_key_data = await _get_uploaded_file(hass, client_key_id)
+            client_key = async_convert_to_pem(
+                client_key_data, PEMType.PRIVATE_KEY, password=client_key_password
+            )
+        if not _validate_pki_file(
+            client_key_id, client_key, errors, "client_key_error"
+        ):
+            return False
 
         certificate_data: dict[str, Any] = {}
         if certificate:
@@ -956,6 +2012,14 @@ async def async_get_broker_settings(
                 description={"suggested_value": user_input_basic.get(CONF_CLIENT_KEY)},
             )
         ] = KEY_UPLOAD_SELECTOR
+        fields[
+            vol.Optional(
+                CONF_CLIENT_KEY_PASSWORD,
+                description={
+                    "suggested_value": user_input_basic.get(CONF_CLIENT_KEY_PASSWORD)
+                },
+            )
+        ] = PASSWORD_SELECTOR
     verification_mode = current_config.get(SET_CA_CERT) or (
         "off"
         if current_ca_certificate is None
@@ -1023,14 +2087,14 @@ def try_connection(
     result: queue.Queue[bool] = queue.Queue(maxsize=1)
 
     def on_connect(
-        client_: mqtt.Client,
-        userdata: None,
-        flags: dict[str, Any],
-        result_code: int,
-        properties: mqtt.Properties | None = None,
+        _mqttc: mqtt.Client,
+        _userdata: None,
+        _connect_flags: mqtt.ConnectFlags,
+        reason_code: mqtt.ReasonCode,
+        _properties: mqtt.Properties | None = None,
     ) -> None:
         """Handle connection result."""
-        result.put(result_code == mqtt.CONNACK_ACCEPTED)
+        result.put(not reason_code.is_failure)
 
     client.on_connect = on_connect
 
@@ -1060,7 +2124,7 @@ def check_certicate_chain() -> str | None:
             with open(private_key, "rb") as client_key_file:
                 load_pem_private_key(client_key_file.read(), password=None)
         except (TypeError, ValueError):
-            return "bad_client_key"
+            return "client_key_error"
     # Check the certificate chain
     context = SSLContext(PROTOCOL_TLS_CLIENT)
     if client_certificate and private_key:
diff --git a/homeassistant/components/mqtt/const.py b/homeassistant/components/mqtt/const.py
index 007b3b7e576..b2fcd492435 100644
--- a/homeassistant/components/mqtt/const.py
+++ b/homeassistant/components/mqtt/const.py
@@ -56,20 +56,55 @@ CONF_SUPPORTED_FEATURES = "supported_features"
 
 CONF_ACTION_TEMPLATE = "action_template"
 CONF_ACTION_TOPIC = "action_topic"
+CONF_BLUE_TEMPLATE = "blue_template"
+CONF_BRIGHTNESS_COMMAND_TEMPLATE = "brightness_command_template"
+CONF_BRIGHTNESS_COMMAND_TOPIC = "brightness_command_topic"
+CONF_BRIGHTNESS_SCALE = "brightness_scale"
+CONF_BRIGHTNESS_STATE_TOPIC = "brightness_state_topic"
+CONF_BRIGHTNESS_TEMPLATE = "brightness_template"
+CONF_BRIGHTNESS_VALUE_TEMPLATE = "brightness_value_template"
+CONF_COLOR_MODE = "color_mode"
+CONF_COLOR_MODE_STATE_TOPIC = "color_mode_state_topic"
+CONF_COLOR_MODE_VALUE_TEMPLATE = "color_mode_value_template"
+CONF_COLOR_TEMP_COMMAND_TEMPLATE = "color_temp_command_template"
+CONF_COLOR_TEMP_COMMAND_TOPIC = "color_temp_command_topic"
 CONF_COLOR_TEMP_KELVIN = "color_temp_kelvin"
+CONF_COLOR_TEMP_TEMPLATE = "color_temp_template"
+CONF_COLOR_TEMP_STATE_TOPIC = "color_temp_state_topic"
+CONF_COLOR_TEMP_VALUE_TEMPLATE = "color_temp_value_template"
+CONF_COMMAND_OFF_TEMPLATE = "command_off_template"
+CONF_COMMAND_ON_TEMPLATE = "command_on_template"
 CONF_CURRENT_HUMIDITY_TEMPLATE = "current_humidity_template"
 CONF_CURRENT_HUMIDITY_TOPIC = "current_humidity_topic"
 CONF_CURRENT_TEMP_TEMPLATE = "current_temperature_template"
 CONF_CURRENT_TEMP_TOPIC = "current_temperature_topic"
 CONF_ENABLED_BY_DEFAULT = "enabled_by_default"
+CONF_EFFECT_COMMAND_TEMPLATE = "effect_command_template"
+CONF_EFFECT_COMMAND_TOPIC = "effect_command_topic"
+CONF_EFFECT_LIST = "effect_list"
+CONF_EFFECT_STATE_TOPIC = "effect_state_topic"
+CONF_EFFECT_TEMPLATE = "effect_template"
+CONF_EFFECT_VALUE_TEMPLATE = "effect_value_template"
 CONF_ENTITY_PICTURE = "entity_picture"
+CONF_EXPIRE_AFTER = "expire_after"
+CONF_FLASH_TIME_LONG = "flash_time_long"
+CONF_FLASH_TIME_SHORT = "flash_time_short"
+CONF_GREEN_TEMPLATE = "green_template"
+CONF_HS_COMMAND_TEMPLATE = "hs_command_template"
+CONF_HS_COMMAND_TOPIC = "hs_command_topic"
+CONF_HS_STATE_TOPIC = "hs_state_topic"
+CONF_HS_VALUE_TEMPLATE = "hs_value_template"
+CONF_LAST_RESET_VALUE_TEMPLATE = "last_reset_value_template"
 CONF_MAX_KELVIN = "max_kelvin"
+CONF_MAX_MIREDS = "max_mireds"
 CONF_MIN_KELVIN = "min_kelvin"
+CONF_MIN_MIREDS = "min_mireds"
 CONF_MODE_COMMAND_TEMPLATE = "mode_command_template"
 CONF_MODE_COMMAND_TOPIC = "mode_command_topic"
 CONF_MODE_LIST = "modes"
 CONF_MODE_STATE_TEMPLATE = "mode_state_template"
 CONF_MODE_STATE_TOPIC = "mode_state_topic"
+CONF_ON_COMMAND_TYPE = "on_command_type"
 CONF_PAYLOAD_CLOSE = "payload_close"
 CONF_PAYLOAD_OPEN = "payload_open"
 CONF_PAYLOAD_STOP = "payload_stop"
@@ -78,10 +113,25 @@ CONF_POSITION_OPEN = "position_open"
 CONF_POWER_COMMAND_TOPIC = "power_command_topic"
 CONF_POWER_COMMAND_TEMPLATE = "power_command_template"
 CONF_PRECISION = "precision"
+CONF_RED_TEMPLATE = "red_template"
+CONF_RGB_COMMAND_TEMPLATE = "rgb_command_template"
+CONF_RGB_COMMAND_TOPIC = "rgb_command_topic"
+CONF_RGB_STATE_TOPIC = "rgb_state_topic"
+CONF_RGB_VALUE_TEMPLATE = "rgb_value_template"
+CONF_RGBW_COMMAND_TEMPLATE = "rgbw_command_template"
+CONF_RGBW_COMMAND_TOPIC = "rgbw_command_topic"
+CONF_RGBW_STATE_TOPIC = "rgbw_state_topic"
+CONF_RGBW_VALUE_TEMPLATE = "rgbw_value_template"
+CONF_RGBWW_COMMAND_TEMPLATE = "rgbww_command_template"
+CONF_RGBWW_COMMAND_TOPIC = "rgbww_command_topic"
+CONF_RGBWW_STATE_TOPIC = "rgbww_state_topic"
+CONF_RGBWW_VALUE_TEMPLATE = "rgbww_value_template"
 CONF_STATE_CLOSED = "state_closed"
 CONF_STATE_CLOSING = "state_closing"
 CONF_STATE_OPEN = "state_open"
 CONF_STATE_OPENING = "state_opening"
+CONF_SUGGESTED_DISPLAY_PRECISION = "suggested_display_precision"
+CONF_SUPPORTED_COLOR_MODES = "supported_color_modes"
 CONF_TEMP_COMMAND_TEMPLATE = "temperature_command_template"
 CONF_TEMP_COMMAND_TOPIC = "temperature_command_topic"
 CONF_TEMP_STATE_TEMPLATE = "temperature_state_template"
@@ -89,7 +139,14 @@ CONF_TEMP_STATE_TOPIC = "temperature_state_topic"
 CONF_TEMP_INITIAL = "initial"
 CONF_TEMP_MAX = "max_temp"
 CONF_TEMP_MIN = "min_temp"
+CONF_XY_COMMAND_TEMPLATE = "xy_command_template"
+CONF_XY_COMMAND_TOPIC = "xy_command_topic"
+CONF_XY_STATE_TOPIC = "xy_state_topic"
+CONF_XY_VALUE_TEMPLATE = "xy_value_template"
+CONF_WHITE_COMMAND_TOPIC = "white_command_topic"
+CONF_WHITE_SCALE = "white_scale"
 
+# Config flow constants
 CONF_CERTIFICATE = "certificate"
 CONF_CLIENT_KEY = "client_key"
 CONF_CLIENT_CERT = "client_cert"
@@ -110,15 +167,23 @@ CONF_CONFIGURATION_URL = "configuration_url"
 CONF_OBJECT_ID = "object_id"
 CONF_SUPPORT_URL = "support_url"
 
+DEFAULT_BRIGHTNESS = False
+DEFAULT_BRIGHTNESS_SCALE = 255
 DEFAULT_PREFIX = "homeassistant"
 DEFAULT_BIRTH_WILL_TOPIC = DEFAULT_PREFIX + "/status"
 DEFAULT_DISCOVERY = True
+DEFAULT_EFFECT = False
 DEFAULT_ENCODING = "utf-8"
+DEFAULT_FLASH_TIME_LONG = 10
+DEFAULT_FLASH_TIME_SHORT = 2
 DEFAULT_OPTIMISTIC = False
+DEFAULT_ON_COMMAND_TYPE = "last"
 DEFAULT_QOS = 0
 DEFAULT_PAYLOAD_AVAILABLE = "online"
 DEFAULT_PAYLOAD_CLOSE = "CLOSE"
 DEFAULT_PAYLOAD_NOT_AVAILABLE = "offline"
+DEFAULT_PAYLOAD_OFF = "OFF"
+DEFAULT_PAYLOAD_ON = "ON"
 DEFAULT_PAYLOAD_OPEN = "OPEN"
 DEFAULT_PORT = 1883
 DEFAULT_RETAIN = False
@@ -127,6 +192,7 @@ DEFAULT_WS_PATH = "/"
 DEFAULT_POSITION_CLOSED = 0
 DEFAULT_POSITION_OPEN = 100
 DEFAULT_RETAIN = False
+DEFAULT_WHITE_SCALE = 255
 
 PROTOCOL_31 = "3.1"
 PROTOCOL_311 = "3.1.1"
diff --git a/homeassistant/components/mqtt/cover.py b/homeassistant/components/mqtt/cover.py
index c7d041848f0..428c4d0e205 100644
--- a/homeassistant/components/mqtt/cover.py
+++ b/homeassistant/components/mqtt/cover.py
@@ -29,8 +29,8 @@ from homeassistant.const import (
     STATE_OPENING,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
 from homeassistant.helpers.typing import ConfigType, VolSchemaType
 from homeassistant.util.json import JSON_DECODE_EXCEPTIONS, json_loads
@@ -81,6 +81,7 @@ CONF_TILT_STATUS_TOPIC = "tilt_status_topic"
 CONF_TILT_STATUS_TEMPLATE = "tilt_status_template"
 
 CONF_STATE_STOPPED = "state_stopped"
+CONF_PAYLOAD_STOP_TILT = "payload_stop_tilt"
 CONF_TILT_CLOSED_POSITION = "tilt_closed_value"
 CONF_TILT_MAX = "tilt_max"
 CONF_TILT_MIN = "tilt_min"
@@ -203,6 +204,9 @@ _PLATFORM_SCHEMA_BASE = MQTT_BASE_SCHEMA.extend(
         vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
         vol.Optional(CONF_GET_POSITION_TEMPLATE): cv.template,
         vol.Optional(CONF_TILT_COMMAND_TEMPLATE): cv.template,
+        vol.Optional(CONF_PAYLOAD_STOP_TILT, default=DEFAULT_PAYLOAD_STOP): vol.Any(
+            cv.string, None
+        ),
     }
 ).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
 
@@ -220,7 +224,7 @@ DISCOVERY_SCHEMA = vol.All(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT cover through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
@@ -592,6 +596,12 @@ class MqttCover(MqttEntity, CoverEntity):
             self._attr_current_cover_tilt_position = tilt_percentage
             self.async_write_ha_state()
 
+    async def async_stop_cover_tilt(self, **kwargs: Any) -> None:
+        """Stop moving the cover tilt."""
+        await self.async_publish_with_config(
+            self._config[CONF_TILT_COMMAND_TOPIC], self._config[CONF_PAYLOAD_STOP_TILT]
+        )
+
     async def async_set_cover_position(self, **kwargs: Any) -> None:
         """Move the cover to a specific position."""
         position_percentage = kwargs[ATTR_POSITION]
diff --git a/homeassistant/components/mqtt/device_tracker.py b/homeassistant/components/mqtt/device_tracker.py
index bdf543e046a..4017245cf51 100644
--- a/homeassistant/components/mqtt/device_tracker.py
+++ b/homeassistant/components/mqtt/device_tracker.py
@@ -21,8 +21,8 @@ from homeassistant.const import (
     STATE_NOT_HOME,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
 from homeassistant.helpers.typing import ConfigType, VolSchemaType
 
@@ -79,7 +79,7 @@ DISCOVERY_SCHEMA = vol.All(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT event through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/discovery.py b/homeassistant/components/mqtt/discovery.py
index 21d250db29a..a14240ce008 100644
--- a/homeassistant/components/mqtt/discovery.py
+++ b/homeassistant/components/mqtt/discovery.py
@@ -21,8 +21,7 @@ from homeassistant.config_entries import (
 )
 from homeassistant.const import CONF_DEVICE, CONF_PLATFORM
 from homeassistant.core import HassJobType, HomeAssistant, callback
-from homeassistant.helpers import discovery_flow
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery_flow
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
diff --git a/homeassistant/components/mqtt/entity.py b/homeassistant/components/mqtt/entity.py
index fb047cc8d5e..8446f9041c9 100644
--- a/homeassistant/components/mqtt/entity.py
+++ b/homeassistant/components/mqtt/entity.py
@@ -43,7 +43,7 @@ from homeassistant.helpers.dispatcher import (
     async_dispatcher_send,
 )
 from homeassistant.helpers.entity import Entity, async_generate_entity_id
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import (
     async_track_device_registry_updated_event,
     async_track_entity_registry_updated_event,
@@ -111,6 +111,7 @@ from .discovery import (
 from .models import (
     DATA_MQTT,
     MessageCallbackType,
+    MqttSubentryData,
     MqttValueTemplate,
     MqttValueTemplateException,
     PublishPayloadType,
@@ -122,7 +123,7 @@ from .subscription import (
     async_subscribe_topics_internal,
     async_unsubscribe_topics,
 )
-from .util import mqtt_config_entry_enabled
+from .util import learn_more_url, mqtt_config_entry_enabled
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -238,7 +239,7 @@ def async_setup_entity_entry_helper(
     entry: ConfigEntry,
     entity_class: type[MqttEntity] | None,
     domain: str,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     discovery_schema: VolSchemaType,
     platform_schema_modern: VolSchemaType,
     schema_class_mapping: dict[str, type[MqttEntity]] | None = None,
@@ -282,11 +283,10 @@ def async_setup_entity_entry_helper(
 
     @callback
     def _async_setup_entities() -> None:
-        """Set up MQTT items from configuration.yaml."""
+        """Set up MQTT items from subentries and configuration.yaml."""
         nonlocal entity_class
         mqtt_data = hass.data[DATA_MQTT]
-        if not (config_yaml := mqtt_data.config):
-            return
+        config_yaml = mqtt_data.config
         yaml_configs: list[ConfigType] = [
             config
             for config_item in config_yaml
@@ -294,6 +294,45 @@ def async_setup_entity_entry_helper(
             for config in configs
             if config_domain == domain
         ]
+        # process subentry entity setup
+        for config_subentry_id, subentry in entry.subentries.items():
+            subentry_data = cast(MqttSubentryData, subentry.data)
+            availability_config = subentry_data.get("availability", {})
+            subentry_entities: list[Entity] = []
+            device_config = subentry_data["device"].copy()
+            device_mqtt_options = device_config.pop("mqtt_settings", {})
+            device_config["identifiers"] = config_subentry_id
+            for component_id, component_data in subentry_data["components"].items():
+                if component_data["platform"] != domain:
+                    continue
+                component_config: dict[str, Any] = component_data.copy()
+                component_config[CONF_UNIQUE_ID] = (
+                    f"{config_subentry_id}_{component_id}"
+                )
+                component_config[CONF_DEVICE] = device_config
+                component_config.pop("platform")
+                component_config.update(availability_config)
+                component_config.update(device_mqtt_options)
+
+                try:
+                    config = platform_schema_modern(component_config)
+                    if schema_class_mapping is not None:
+                        entity_class = schema_class_mapping[config[CONF_SCHEMA]]
+                    if TYPE_CHECKING:
+                        assert entity_class is not None
+                    subentry_entities.append(entity_class(hass, config, entry, None))
+                except vol.Invalid as exc:
+                    _LOGGER.error(
+                        "Schema violation occurred when trying to set up "
+                        "entity from subentry %s %s %s: %s",
+                        config_subentry_id,
+                        subentry.title,
+                        subentry.data,
+                        exc,
+                    )
+
+            async_add_entities(subentry_entities, config_subentry_id=config_subentry_id)
+
         entities: list[Entity] = []
         for yaml_config in yaml_configs:
             try:
@@ -309,9 +348,6 @@ def async_setup_entity_entry_helper(
                 line = getattr(yaml_config, "__line__", "?")
                 issue_id = hex(hash(frozenset(yaml_config)))
                 yaml_config_str = yaml_dump(yaml_config)
-                learn_more_url = (
-                    f"https://www.home-assistant.io/integrations/{domain}.mqtt/"
-                )
                 async_create_issue(
                     hass,
                     DOMAIN,
@@ -319,7 +355,7 @@ def async_setup_entity_entry_helper(
                     issue_domain=domain,
                     is_fixable=False,
                     severity=IssueSeverity.ERROR,
-                    learn_more_url=learn_more_url,
+                    learn_more_url=learn_more_url(domain),
                     translation_placeholders={
                         "domain": domain,
                         "config_file": config_file,
diff --git a/homeassistant/components/mqtt/event.py b/homeassistant/components/mqtt/event.py
index f665f2c4016..aef21838d59 100644
--- a/homeassistant/components/mqtt/event.py
+++ b/homeassistant/components/mqtt/event.py
@@ -17,8 +17,8 @@ from homeassistant.components.event import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DEVICE_CLASS, CONF_NAME, CONF_VALUE_TEMPLATE
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
 from homeassistant.helpers.typing import ConfigType, VolSchemaType
 from homeassistant.util.json import JSON_DECODE_EXCEPTIONS, json_loads_object
@@ -73,7 +73,7 @@ DISCOVERY_SCHEMA = vol.All(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT event through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/fan.py b/homeassistant/components/mqtt/fan.py
index 4d2e764a0d5..3fac4d4ffe0 100644
--- a/homeassistant/components/mqtt/fan.py
+++ b/homeassistant/components/mqtt/fan.py
@@ -27,8 +27,8 @@ from homeassistant.const import (
     CONF_STATE,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.typing import ConfigType, VolSchemaType
@@ -190,7 +190,7 @@ DISCOVERY_SCHEMA = vol.All(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT fan through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/humidifier.py b/homeassistant/components/mqtt/humidifier.py
index 5d1af03ad24..07ddcddb13a 100644
--- a/homeassistant/components/mqtt/humidifier.py
+++ b/homeassistant/components/mqtt/humidifier.py
@@ -30,8 +30,8 @@ from homeassistant.const import (
     CONF_STATE,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.typing import ConfigType, VolSchemaType
@@ -183,7 +183,7 @@ TOPICS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT humidifier through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/image.py b/homeassistant/components/mqtt/image.py
index 4b7b2d783d2..a668608dd55 100644
--- a/homeassistant/components/mqtt/image.py
+++ b/homeassistant/components/mqtt/image.py
@@ -17,7 +17,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.httpx_client import get_async_client
 from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, VolSchemaType
@@ -82,7 +82,7 @@ DISCOVERY_SCHEMA = vol.All(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT image through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/lawn_mower.py b/homeassistant/components/mqtt/lawn_mower.py
index 87577c4b4d9..1917c56f209 100644
--- a/homeassistant/components/mqtt/lawn_mower.py
+++ b/homeassistant/components/mqtt/lawn_mower.py
@@ -10,6 +10,7 @@ import voluptuous as vol
 
 from homeassistant.components import lawn_mower
 from homeassistant.components.lawn_mower import (
+    ENTITY_ID_FORMAT,
     LawnMowerActivity,
     LawnMowerEntity,
     LawnMowerEntityFeature,
@@ -18,7 +19,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, CONF_OPTIMISTIC
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
 from homeassistant.helpers.typing import ConfigType, VolSchemaType
@@ -50,7 +51,6 @@ CONF_START_MOWING_COMMAND_TOPIC = "start_mowing_command_topic"
 CONF_START_MOWING_COMMAND_TEMPLATE = "start_mowing_command_template"
 
 DEFAULT_NAME = "MQTT Lawn Mower"
-ENTITY_ID_FORMAT = lawn_mower.DOMAIN + ".{}"
 
 MQTT_LAWN_MOWER_ATTRIBUTES_BLOCKED: frozenset[str] = frozenset()
 
@@ -80,7 +80,7 @@ DISCOVERY_SCHEMA = vol.All(PLATFORM_SCHEMA_MODERN.extend({}, extra=vol.REMOVE_EX
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT lawn mower through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/light/__init__.py b/homeassistant/components/mqtt/light/__init__.py
index 328f80cb5ea..3ffad9226be 100644
--- a/homeassistant/components/mqtt/light/__init__.py
+++ b/homeassistant/components/mqtt/light/__init__.py
@@ -9,7 +9,7 @@ import voluptuous as vol
 from homeassistant.components import light
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, VolSchemaType
 
 from ..entity import async_setup_entity_entry_helper
@@ -69,7 +69,7 @@ PLATFORM_SCHEMA_MODERN = vol.All(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT lights through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/light/schema_basic.py b/homeassistant/components/mqtt/light/schema_basic.py
index eaaa80af223..a950aced665 100644
--- a/homeassistant/components/mqtt/light/schema_basic.py
+++ b/homeassistant/components/mqtt/light/schema_basic.py
@@ -42,21 +42,67 @@ from homeassistant.const import (
     STATE_ON,
 )
 from homeassistant.core import callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
 from homeassistant.helpers.typing import ConfigType, VolSchemaType
-import homeassistant.util.color as color_util
+from homeassistant.util import color as color_util
 
 from .. import subscription
 from ..config import MQTT_RW_SCHEMA
 from ..const import (
+    CONF_BRIGHTNESS_COMMAND_TEMPLATE,
+    CONF_BRIGHTNESS_COMMAND_TOPIC,
+    CONF_BRIGHTNESS_SCALE,
+    CONF_BRIGHTNESS_STATE_TOPIC,
+    CONF_BRIGHTNESS_VALUE_TEMPLATE,
+    CONF_COLOR_MODE_STATE_TOPIC,
+    CONF_COLOR_MODE_VALUE_TEMPLATE,
+    CONF_COLOR_TEMP_COMMAND_TEMPLATE,
+    CONF_COLOR_TEMP_COMMAND_TOPIC,
     CONF_COLOR_TEMP_KELVIN,
+    CONF_COLOR_TEMP_STATE_TOPIC,
+    CONF_COLOR_TEMP_VALUE_TEMPLATE,
     CONF_COMMAND_TOPIC,
+    CONF_EFFECT_COMMAND_TEMPLATE,
+    CONF_EFFECT_COMMAND_TOPIC,
+    CONF_EFFECT_LIST,
+    CONF_EFFECT_STATE_TOPIC,
+    CONF_EFFECT_VALUE_TEMPLATE,
+    CONF_HS_COMMAND_TEMPLATE,
+    CONF_HS_COMMAND_TOPIC,
+    CONF_HS_STATE_TOPIC,
+    CONF_HS_VALUE_TEMPLATE,
     CONF_MAX_KELVIN,
+    CONF_MAX_MIREDS,
     CONF_MIN_KELVIN,
+    CONF_MIN_MIREDS,
+    CONF_ON_COMMAND_TYPE,
+    CONF_RGB_COMMAND_TEMPLATE,
+    CONF_RGB_COMMAND_TOPIC,
+    CONF_RGB_STATE_TOPIC,
+    CONF_RGB_VALUE_TEMPLATE,
+    CONF_RGBW_COMMAND_TEMPLATE,
+    CONF_RGBW_COMMAND_TOPIC,
+    CONF_RGBW_STATE_TOPIC,
+    CONF_RGBW_VALUE_TEMPLATE,
+    CONF_RGBWW_COMMAND_TEMPLATE,
+    CONF_RGBWW_COMMAND_TOPIC,
+    CONF_RGBWW_STATE_TOPIC,
+    CONF_RGBWW_VALUE_TEMPLATE,
     CONF_STATE_TOPIC,
     CONF_STATE_VALUE_TEMPLATE,
+    CONF_WHITE_COMMAND_TOPIC,
+    CONF_WHITE_SCALE,
+    CONF_XY_COMMAND_TEMPLATE,
+    CONF_XY_COMMAND_TOPIC,
+    CONF_XY_STATE_TOPIC,
+    CONF_XY_VALUE_TEMPLATE,
+    DEFAULT_BRIGHTNESS_SCALE,
+    DEFAULT_ON_COMMAND_TYPE,
+    DEFAULT_PAYLOAD_OFF,
+    DEFAULT_PAYLOAD_ON,
+    DEFAULT_WHITE_SCALE,
     PAYLOAD_NONE,
 )
 from ..entity import MqttEntity
@@ -74,47 +120,7 @@ from .schema import MQTT_LIGHT_SCHEMA_SCHEMA
 
 _LOGGER = logging.getLogger(__name__)
 
-CONF_BRIGHTNESS_COMMAND_TEMPLATE = "brightness_command_template"
-CONF_BRIGHTNESS_COMMAND_TOPIC = "brightness_command_topic"
-CONF_BRIGHTNESS_SCALE = "brightness_scale"
-CONF_BRIGHTNESS_STATE_TOPIC = "brightness_state_topic"
-CONF_BRIGHTNESS_VALUE_TEMPLATE = "brightness_value_template"
-CONF_COLOR_MODE_STATE_TOPIC = "color_mode_state_topic"
-CONF_COLOR_MODE_VALUE_TEMPLATE = "color_mode_value_template"
-CONF_COLOR_TEMP_COMMAND_TEMPLATE = "color_temp_command_template"
-CONF_COLOR_TEMP_COMMAND_TOPIC = "color_temp_command_topic"
-CONF_COLOR_TEMP_STATE_TOPIC = "color_temp_state_topic"
-CONF_COLOR_TEMP_VALUE_TEMPLATE = "color_temp_value_template"
-CONF_EFFECT_COMMAND_TEMPLATE = "effect_command_template"
-CONF_EFFECT_COMMAND_TOPIC = "effect_command_topic"
-CONF_EFFECT_LIST = "effect_list"
-CONF_EFFECT_STATE_TOPIC = "effect_state_topic"
-CONF_EFFECT_VALUE_TEMPLATE = "effect_value_template"
-CONF_HS_COMMAND_TEMPLATE = "hs_command_template"
-CONF_HS_COMMAND_TOPIC = "hs_command_topic"
-CONF_HS_STATE_TOPIC = "hs_state_topic"
-CONF_HS_VALUE_TEMPLATE = "hs_value_template"
-CONF_MAX_MIREDS = "max_mireds"
-CONF_MIN_MIREDS = "min_mireds"
-CONF_RGB_COMMAND_TEMPLATE = "rgb_command_template"
-CONF_RGB_COMMAND_TOPIC = "rgb_command_topic"
-CONF_RGB_STATE_TOPIC = "rgb_state_topic"
-CONF_RGB_VALUE_TEMPLATE = "rgb_value_template"
-CONF_RGBW_COMMAND_TEMPLATE = "rgbw_command_template"
-CONF_RGBW_COMMAND_TOPIC = "rgbw_command_topic"
-CONF_RGBW_STATE_TOPIC = "rgbw_state_topic"
-CONF_RGBW_VALUE_TEMPLATE = "rgbw_value_template"
-CONF_RGBWW_COMMAND_TEMPLATE = "rgbww_command_template"
-CONF_RGBWW_COMMAND_TOPIC = "rgbww_command_topic"
-CONF_RGBWW_STATE_TOPIC = "rgbww_state_topic"
-CONF_RGBWW_VALUE_TEMPLATE = "rgbww_value_template"
-CONF_XY_COMMAND_TEMPLATE = "xy_command_template"
-CONF_XY_COMMAND_TOPIC = "xy_command_topic"
-CONF_XY_STATE_TOPIC = "xy_state_topic"
-CONF_XY_VALUE_TEMPLATE = "xy_value_template"
-CONF_WHITE_COMMAND_TOPIC = "white_command_topic"
-CONF_WHITE_SCALE = "white_scale"
-CONF_ON_COMMAND_TYPE = "on_command_type"
+DEFAULT_NAME = "MQTT LightEntity"
 
 MQTT_LIGHT_ATTRIBUTES_BLOCKED = frozenset(
     {
@@ -137,13 +143,6 @@ MQTT_LIGHT_ATTRIBUTES_BLOCKED = frozenset(
     }
 )
 
-DEFAULT_BRIGHTNESS_SCALE = 255
-DEFAULT_NAME = "MQTT LightEntity"
-DEFAULT_PAYLOAD_OFF = "OFF"
-DEFAULT_PAYLOAD_ON = "ON"
-DEFAULT_WHITE_SCALE = 255
-DEFAULT_ON_COMMAND_TYPE = "last"
-
 VALUES_ON_COMMAND_TYPE = ["first", "last", "brightness"]
 
 COMMAND_TEMPLATE_KEYS = [
diff --git a/homeassistant/components/mqtt/light/schema_json.py b/homeassistant/components/mqtt/light/schema_json.py
index 2d152ca12c8..a1f86278cf0 100644
--- a/homeassistant/components/mqtt/light/schema_json.py
+++ b/homeassistant/components/mqtt/light/schema_json.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable
 from contextlib import suppress
 import logging
 from typing import TYPE_CHECKING, Any, cast
@@ -24,7 +23,6 @@ from homeassistant.components.light import (
     ATTR_XY_COLOR,
     DEFAULT_MAX_KELVIN,
     DEFAULT_MIN_KELVIN,
-    DOMAIN as LIGHT_DOMAIN,
     ENTITY_ID_FORMAT,
     FLASH_LONG,
     FLASH_SHORT,
@@ -33,8 +31,6 @@ from homeassistant.components.light import (
     LightEntity,
     LightEntityFeature,
     brightness_supported,
-    color_supported,
-    filter_supported_color_modes,
     valid_supported_color_modes,
 )
 from homeassistant.const import (
@@ -48,27 +44,37 @@ from homeassistant.const import (
     CONF_XY,
     STATE_ON,
 )
-from homeassistant.core import async_get_hass, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
+from homeassistant.core import callback
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.json import json_dumps
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType, VolSchemaType
-import homeassistant.util.color as color_util
+from homeassistant.util import color as color_util
 from homeassistant.util.json import json_loads_object
-from homeassistant.util.yaml import dump as yaml_dump
 
 from .. import subscription
 from ..config import DEFAULT_QOS, DEFAULT_RETAIN, MQTT_RW_SCHEMA
 from ..const import (
+    CONF_COLOR_MODE,
     CONF_COLOR_TEMP_KELVIN,
     CONF_COMMAND_TOPIC,
+    CONF_EFFECT_LIST,
+    CONF_FLASH_TIME_LONG,
+    CONF_FLASH_TIME_SHORT,
     CONF_MAX_KELVIN,
+    CONF_MAX_MIREDS,
     CONF_MIN_KELVIN,
+    CONF_MIN_MIREDS,
     CONF_QOS,
     CONF_RETAIN,
     CONF_STATE_TOPIC,
-    DOMAIN as MQTT_DOMAIN,
+    CONF_SUPPORTED_COLOR_MODES,
+    DEFAULT_BRIGHTNESS,
+    DEFAULT_BRIGHTNESS_SCALE,
+    DEFAULT_EFFECT,
+    DEFAULT_FLASH_TIME_LONG,
+    DEFAULT_FLASH_TIME_SHORT,
+    DEFAULT_WHITE_SCALE,
 )
 from ..entity import MqttEntity
 from ..models import ReceiveMessage
@@ -85,113 +91,7 @@ _LOGGER = logging.getLogger(__name__)
 
 DOMAIN = "mqtt_json"
 
-DEFAULT_BRIGHTNESS = False
-DEFAULT_COLOR_MODE = False
-DEFAULT_COLOR_TEMP = False
-DEFAULT_EFFECT = False
-DEFAULT_FLASH_TIME_LONG = 10
-DEFAULT_FLASH_TIME_SHORT = 2
 DEFAULT_NAME = "MQTT JSON Light"
-DEFAULT_RGB = False
-DEFAULT_XY = False
-DEFAULT_HS = False
-DEFAULT_BRIGHTNESS_SCALE = 255
-DEFAULT_WHITE_SCALE = 255
-
-CONF_COLOR_MODE = "color_mode"
-CONF_SUPPORTED_COLOR_MODES = "supported_color_modes"
-
-CONF_EFFECT_LIST = "effect_list"
-
-CONF_FLASH_TIME_LONG = "flash_time_long"
-CONF_FLASH_TIME_SHORT = "flash_time_short"
-
-CONF_MAX_MIREDS = "max_mireds"
-CONF_MIN_MIREDS = "min_mireds"
-
-
-def valid_color_configuration(
-    setup_from_yaml: bool,
-) -> Callable[[dict[str, Any]], dict[str, Any]]:
-    """Test color_mode is not combined with deprecated config."""
-
-    def _valid_color_configuration(config: ConfigType) -> ConfigType:
-        deprecated = {CONF_COLOR_TEMP, CONF_HS, CONF_RGB, CONF_XY}
-        deprecated_flags_used = any(config.get(key) for key in deprecated)
-        if config.get(CONF_SUPPORTED_COLOR_MODES):
-            if deprecated_flags_used:
-                raise vol.Invalid(
-                    "supported_color_modes must not "
-                    f"be combined with any of {deprecated}"
-                )
-        elif deprecated_flags_used:
-            deprecated_flags = ", ".join(key for key in deprecated if key in config)
-            _LOGGER.warning(
-                "Deprecated flags [%s] used in MQTT JSON light config "
-                "for handling color mode, please use `supported_color_modes` instead. "
-                "Got: %s. This will stop working in Home Assistant Core 2025.3",
-                deprecated_flags,
-                config,
-            )
-            if not setup_from_yaml:
-                return config
-            issue_id = hex(hash(frozenset(config)))
-            yaml_config_str = yaml_dump(config)
-            learn_more_url = (
-                "https://www.home-assistant.io/integrations/"
-                f"{LIGHT_DOMAIN}.mqtt/#json-schema"
-            )
-            hass = async_get_hass()
-            async_create_issue(
-                hass,
-                MQTT_DOMAIN,
-                issue_id,
-                issue_domain=LIGHT_DOMAIN,
-                is_fixable=False,
-                severity=IssueSeverity.WARNING,
-                learn_more_url=learn_more_url,
-                translation_placeholders={
-                    "deprecated_flags": deprecated_flags,
-                    "config": yaml_config_str,
-                },
-                translation_key="deprecated_color_handling",
-            )
-
-        if CONF_COLOR_MODE in config:
-            _LOGGER.warning(
-                "Deprecated flag `color_mode` used in MQTT JSON light config "
-                ", the `color_mode` flag is not used anymore and should be removed. "
-                "Got: %s. This will stop working in Home Assistant Core 2025.3",
-                config,
-            )
-            if not setup_from_yaml:
-                return config
-            issue_id = hex(hash(frozenset(config)))
-            yaml_config_str = yaml_dump(config)
-            learn_more_url = (
-                "https://www.home-assistant.io/integrations/"
-                f"{LIGHT_DOMAIN}.mqtt/#json-schema"
-            )
-            hass = async_get_hass()
-            async_create_issue(
-                hass,
-                MQTT_DOMAIN,
-                issue_id,
-                breaks_in_ha_version="2025.3.0",
-                issue_domain=LIGHT_DOMAIN,
-                is_fixable=False,
-                severity=IssueSeverity.WARNING,
-                learn_more_url=learn_more_url,
-                translation_placeholders={
-                    "config": yaml_config_str,
-                },
-                translation_key="deprecated_color_mode_flag",
-            )
-
-        return config
-
-    return _valid_color_configuration
-
 
 _PLATFORM_SCHEMA_BASE = (
     MQTT_RW_SCHEMA.extend(
@@ -200,12 +100,6 @@ _PLATFORM_SCHEMA_BASE = (
             vol.Optional(
                 CONF_BRIGHTNESS_SCALE, default=DEFAULT_BRIGHTNESS_SCALE
             ): vol.All(vol.Coerce(int), vol.Range(min=1)),
-            # CONF_COLOR_MODE was deprecated with HA Core 2024.4 and will be
-            # removed with HA Core 2025.3
-            vol.Optional(CONF_COLOR_MODE): cv.boolean,
-            # CONF_COLOR_TEMP was deprecated with HA Core 2024.4 and will be
-            # removed with HA Core 2025.3
-            vol.Optional(CONF_COLOR_TEMP, default=DEFAULT_COLOR_TEMP): cv.boolean,
             vol.Optional(CONF_COLOR_TEMP_KELVIN, default=False): cv.boolean,
             vol.Optional(CONF_EFFECT, default=DEFAULT_EFFECT): cv.boolean,
             vol.Optional(CONF_EFFECT_LIST): vol.All(cv.ensure_list, [cv.string]),
@@ -215,9 +109,6 @@ _PLATFORM_SCHEMA_BASE = (
             vol.Optional(
                 CONF_FLASH_TIME_SHORT, default=DEFAULT_FLASH_TIME_SHORT
             ): cv.positive_int,
-            # CONF_HS was deprecated with HA Core 2024.4 and will be
-            # removed with HA Core 2025.3
-            vol.Optional(CONF_HS, default=DEFAULT_HS): cv.boolean,
             vol.Optional(CONF_MAX_MIREDS): cv.positive_int,
             vol.Optional(CONF_MIN_MIREDS): cv.positive_int,
             vol.Optional(CONF_MAX_KELVIN): cv.positive_int,
@@ -227,9 +118,6 @@ _PLATFORM_SCHEMA_BASE = (
                 vol.Coerce(int), vol.In([0, 1, 2])
             ),
             vol.Optional(CONF_RETAIN, default=DEFAULT_RETAIN): cv.boolean,
-            # CONF_RGB was deprecated with HA Core 2024.4 and will be
-            # removed with HA Core 2025.3
-            vol.Optional(CONF_RGB, default=DEFAULT_RGB): cv.boolean,
             vol.Optional(CONF_STATE_TOPIC): valid_subscribe_topic,
             vol.Optional(CONF_SUPPORTED_COLOR_MODES): vol.All(
                 cv.ensure_list,
@@ -240,22 +128,29 @@ _PLATFORM_SCHEMA_BASE = (
             vol.Optional(CONF_WHITE_SCALE, default=DEFAULT_WHITE_SCALE): vol.All(
                 vol.Coerce(int), vol.Range(min=1)
             ),
-            # CONF_XY was deprecated with HA Core 2024.4 and will be
-            # removed with HA Core 2025.3
-            vol.Optional(CONF_XY, default=DEFAULT_XY): cv.boolean,
         },
     )
     .extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
     .extend(MQTT_LIGHT_SCHEMA_SCHEMA.schema)
 )
 
+# Support for legacy color_mode handling was removed with HA Core 2025.3
+# The removed attributes can be removed from the schema's from HA Core 2026.3
 DISCOVERY_SCHEMA_JSON = vol.All(
-    valid_color_configuration(False),
+    cv.removed(CONF_COLOR_MODE, raise_if_present=False),
+    cv.removed(CONF_COLOR_TEMP, raise_if_present=False),
+    cv.removed(CONF_HS, raise_if_present=False),
+    cv.removed(CONF_RGB, raise_if_present=False),
+    cv.removed(CONF_XY, raise_if_present=False),
     _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA),
 )
 
 PLATFORM_SCHEMA_MODERN_JSON = vol.All(
-    valid_color_configuration(True),
+    cv.removed(CONF_COLOR_MODE),
+    cv.removed(CONF_COLOR_TEMP),
+    cv.removed(CONF_HS),
+    cv.removed(CONF_RGB),
+    cv.removed(CONF_XY),
     _PLATFORM_SCHEMA_BASE,
 )
 
@@ -272,8 +167,6 @@ class MqttLightJson(MqttEntity, LightEntity, RestoreEntity):
     _topic: dict[str, str | None]
     _optimistic: bool
 
-    _deprecated_color_handling: bool = False
-
     @staticmethod
     def config_schema() -> VolSchemaType:
         """Return the config schema."""
@@ -318,122 +211,69 @@ class MqttLightJson(MqttEntity, LightEntity, RestoreEntity):
                 self._attr_color_mode = next(iter(self.supported_color_modes))
             else:
                 self._attr_color_mode = ColorMode.UNKNOWN
-        else:
-            self._deprecated_color_handling = True
-            color_modes = {ColorMode.ONOFF}
-            if config[CONF_BRIGHTNESS]:
-                color_modes.add(ColorMode.BRIGHTNESS)
-            if config[CONF_COLOR_TEMP]:
-                color_modes.add(ColorMode.COLOR_TEMP)
-            if config[CONF_HS] or config[CONF_RGB] or config[CONF_XY]:
-                color_modes.add(ColorMode.HS)
-            self._attr_supported_color_modes = filter_supported_color_modes(color_modes)
-            if self.supported_color_modes and len(self.supported_color_modes) == 1:
-                self._fixed_color_mode = next(iter(self.supported_color_modes))
+        elif config.get(CONF_BRIGHTNESS):
+            # Brightness is supported and no supported_color_modes are set,
+            # so set brightness as the supported color mode.
+            self._attr_supported_color_modes = {ColorMode.BRIGHTNESS}
 
     def _update_color(self, values: dict[str, Any]) -> None:
-        if self._deprecated_color_handling:
-            # Deprecated color handling
-            try:
-                red = int(values["color"]["r"])
-                green = int(values["color"]["g"])
-                blue = int(values["color"]["b"])
-                self._attr_hs_color = color_util.color_RGB_to_hs(red, green, blue)
-            except KeyError:
-                pass
-            except ValueError:
-                _LOGGER.warning(
-                    "Invalid RGB color value '%s' received for entity %s",
-                    values,
-                    self.entity_id,
+        color_mode: str = values["color_mode"]
+        if not self._supports_color_mode(color_mode):
+            _LOGGER.warning(
+                "Invalid color mode '%s' received for entity %s",
+                color_mode,
+                self.entity_id,
+            )
+            return
+        try:
+            if color_mode == ColorMode.COLOR_TEMP:
+                self._attr_color_temp_kelvin = (
+                    values["color_temp"]
+                    if self._color_temp_kelvin
+                    else color_util.color_temperature_mired_to_kelvin(
+                        values["color_temp"]
+                    )
                 )
-                return
-
-            try:
-                x_color = float(values["color"]["x"])
-                y_color = float(values["color"]["y"])
-                self._attr_hs_color = color_util.color_xy_to_hs(x_color, y_color)
-            except KeyError:
-                pass
-            except ValueError:
-                _LOGGER.warning(
-                    "Invalid XY color value '%s' received for entity %s",
-                    values,
-                    self.entity_id,
-                )
-                return
-
-            try:
+                self._attr_color_mode = ColorMode.COLOR_TEMP
+            elif color_mode == ColorMode.HS:
                 hue = float(values["color"]["h"])
                 saturation = float(values["color"]["s"])
+                self._attr_color_mode = ColorMode.HS
                 self._attr_hs_color = (hue, saturation)
-            except KeyError:
-                pass
-            except ValueError:
-                _LOGGER.warning(
-                    "Invalid HS color value '%s' received for entity %s",
-                    values,
-                    self.entity_id,
-                )
-                return
-        else:
-            color_mode: str = values["color_mode"]
-            if not self._supports_color_mode(color_mode):
-                _LOGGER.warning(
-                    "Invalid color mode '%s' received for entity %s",
-                    color_mode,
-                    self.entity_id,
-                )
-                return
-            try:
-                if color_mode == ColorMode.COLOR_TEMP:
-                    self._attr_color_temp_kelvin = (
-                        values["color_temp"]
-                        if self._color_temp_kelvin
-                        else color_util.color_temperature_mired_to_kelvin(
-                            values["color_temp"]
-                        )
-                    )
-                    self._attr_color_mode = ColorMode.COLOR_TEMP
-                elif color_mode == ColorMode.HS:
-                    hue = float(values["color"]["h"])
-                    saturation = float(values["color"]["s"])
-                    self._attr_color_mode = ColorMode.HS
-                    self._attr_hs_color = (hue, saturation)
-                elif color_mode == ColorMode.RGB:
-                    r = int(values["color"]["r"])
-                    g = int(values["color"]["g"])
-                    b = int(values["color"]["b"])
-                    self._attr_color_mode = ColorMode.RGB
-                    self._attr_rgb_color = (r, g, b)
-                elif color_mode == ColorMode.RGBW:
-                    r = int(values["color"]["r"])
-                    g = int(values["color"]["g"])
-                    b = int(values["color"]["b"])
-                    w = int(values["color"]["w"])
-                    self._attr_color_mode = ColorMode.RGBW
-                    self._attr_rgbw_color = (r, g, b, w)
-                elif color_mode == ColorMode.RGBWW:
-                    r = int(values["color"]["r"])
-                    g = int(values["color"]["g"])
-                    b = int(values["color"]["b"])
-                    c = int(values["color"]["c"])
-                    w = int(values["color"]["w"])
-                    self._attr_color_mode = ColorMode.RGBWW
-                    self._attr_rgbww_color = (r, g, b, c, w)
-                elif color_mode == ColorMode.WHITE:
-                    self._attr_color_mode = ColorMode.WHITE
-                elif color_mode == ColorMode.XY:
-                    x = float(values["color"]["x"])
-                    y = float(values["color"]["y"])
-                    self._attr_color_mode = ColorMode.XY
-                    self._attr_xy_color = (x, y)
-            except (KeyError, ValueError):
-                _LOGGER.warning(
-                    "Invalid or incomplete color value '%s' received for entity %s",
-                    values,
-                    self.entity_id,
-                )
+            elif color_mode == ColorMode.RGB:
+                r = int(values["color"]["r"])
+                g = int(values["color"]["g"])
+                b = int(values["color"]["b"])
+                self._attr_color_mode = ColorMode.RGB
+                self._attr_rgb_color = (r, g, b)
+            elif color_mode == ColorMode.RGBW:
+                r = int(values["color"]["r"])
+                g = int(values["color"]["g"])
+                b = int(values["color"]["b"])
+                w = int(values["color"]["w"])
+                self._attr_color_mode = ColorMode.RGBW
+                self._attr_rgbw_color = (r, g, b, w)
+            elif color_mode == ColorMode.RGBWW:
+                r = int(values["color"]["r"])
+                g = int(values["color"]["g"])
+                b = int(values["color"]["b"])
+                c = int(values["color"]["c"])
+                w = int(values["color"]["w"])
+                self._attr_color_mode = ColorMode.RGBWW
+                self._attr_rgbww_color = (r, g, b, c, w)
+            elif color_mode == ColorMode.WHITE:
+                self._attr_color_mode = ColorMode.WHITE
+            elif color_mode == ColorMode.XY:
+                x = float(values["color"]["x"])
+                y = float(values["color"]["y"])
+                self._attr_color_mode = ColorMode.XY
+                self._attr_xy_color = (x, y)
+        except (KeyError, TypeError, ValueError):
+            _LOGGER.warning(
+                "Invalid or incomplete color value '%s' received for entity %s",
+                values,
+                self.entity_id,
+            )
 
     @callback
     def _state_received(self, msg: ReceiveMessage) -> None:
@@ -447,18 +287,7 @@ class MqttLightJson(MqttEntity, LightEntity, RestoreEntity):
         elif values["state"] is None:
             self._attr_is_on = None
 
-        if (
-            self._deprecated_color_handling
-            and color_supported(self.supported_color_modes)
-            and "color" in values
-        ):
-            # Deprecated color handling
-            if values["color"] is None:
-                self._attr_hs_color = None
-            else:
-                self._update_color(values)
-
-        if not self._deprecated_color_handling and "color_mode" in values:
+        if "color_mode" in values:
             self._update_color(values)
 
         if brightness_supported(self.supported_color_modes):
@@ -484,35 +313,6 @@ class MqttLightJson(MqttEntity, LightEntity, RestoreEntity):
                     self.entity_id,
                 )
 
-        if (
-            self._deprecated_color_handling
-            and self.supported_color_modes
-            and ColorMode.COLOR_TEMP in self.supported_color_modes
-        ):
-            # Deprecated color handling
-            try:
-                if values["color_temp"] is None:
-                    self._attr_color_temp_kelvin = None
-                else:
-                    self._attr_color_temp_kelvin = (
-                        values["color_temp"]  # type: ignore[assignment]
-                        if self._color_temp_kelvin
-                        else color_util.color_temperature_mired_to_kelvin(
-                            values["color_temp"]  # type: ignore[arg-type]
-                        )
-                    )
-            except KeyError:
-                pass
-            except (TypeError, ValueError):
-                _LOGGER.warning(
-                    "Invalid color temp value '%s' received for entity %s",
-                    values["color_temp"],
-                    self.entity_id,
-                )
-            # Allow to switch back to color_temp
-            if "color" not in values:
-                self._attr_hs_color = None
-
         if self.supported_features and LightEntityFeature.EFFECT:
             with suppress(KeyError):
                 self._attr_effect = cast(str, values["effect"])
@@ -565,19 +365,6 @@ class MqttLightJson(MqttEntity, LightEntity, RestoreEntity):
             )
             self._attr_xy_color = last_attributes.get(ATTR_XY_COLOR, self.xy_color)
 
-    @property
-    def color_mode(self) -> ColorMode | str | None:
-        """Return current color mode."""
-        if not self._deprecated_color_handling:
-            return self._attr_color_mode
-        if self._fixed_color_mode:
-            # Legacy light with support for a single color mode
-            return self._fixed_color_mode
-        # Legacy light with support for ct + hs, prioritize hs
-        if self.hs_color is not None:
-            return ColorMode.HS
-        return ColorMode.COLOR_TEMP
-
     def _set_flash_and_transition(self, message: dict[str, Any], **kwargs: Any) -> None:
         if ATTR_TRANSITION in kwargs:
             message["transition"] = kwargs[ATTR_TRANSITION]
@@ -604,17 +391,15 @@ class MqttLightJson(MqttEntity, LightEntity, RestoreEntity):
     def _supports_color_mode(self, color_mode: ColorMode | str) -> bool:
         """Return True if the light natively supports a color mode."""
         return (
-            not self._deprecated_color_handling
-            and self.supported_color_modes is not None
+            self.supported_color_modes is not None
             and color_mode in self.supported_color_modes
         )
 
-    async def async_turn_on(self, **kwargs: Any) -> None:  # noqa: C901
+    async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the device on.
 
         This method is a coroutine.
         """
-        brightness: int
         should_update = False
         hs_color: tuple[float, float]
         message: dict[str, Any] = {"state": "ON"}
@@ -623,39 +408,6 @@ class MqttLightJson(MqttEntity, LightEntity, RestoreEntity):
         rgbcw: tuple[int, ...]
         xy_color: tuple[float, float]
 
-        if ATTR_HS_COLOR in kwargs and (
-            self._config[CONF_HS] or self._config[CONF_RGB] or self._config[CONF_XY]
-        ):
-            # Legacy color handling
-            hs_color = kwargs[ATTR_HS_COLOR]
-            message["color"] = {}
-            if self._config[CONF_RGB]:
-                # If brightness is supported, we don't want to scale the
-                # RGB values given using the brightness.
-                if self._config[CONF_BRIGHTNESS]:
-                    brightness = 255
-                else:
-                    # We pop the brightness, to omit it from the payload
-                    brightness = kwargs.pop(ATTR_BRIGHTNESS, 255)
-                rgb = color_util.color_hsv_to_RGB(
-                    hs_color[0], hs_color[1], brightness / 255 * 100
-                )
-                message["color"]["r"] = rgb[0]
-                message["color"]["g"] = rgb[1]
-                message["color"]["b"] = rgb[2]
-            if self._config[CONF_XY]:
-                xy_color = color_util.color_hs_to_xy(*kwargs[ATTR_HS_COLOR])
-                message["color"]["x"] = xy_color[0]
-                message["color"]["y"] = xy_color[1]
-            if self._config[CONF_HS]:
-                message["color"]["h"] = hs_color[0]
-                message["color"]["s"] = hs_color[1]
-
-            if self._optimistic:
-                self._attr_color_temp_kelvin = None
-                self._attr_hs_color = kwargs[ATTR_HS_COLOR]
-                should_update = True
-
         if ATTR_HS_COLOR in kwargs and self._supports_color_mode(ColorMode.HS):
             hs_color = kwargs[ATTR_HS_COLOR]
             message["color"] = {"h": hs_color[0], "s": hs_color[1]}
diff --git a/homeassistant/components/mqtt/light/schema_template.py b/homeassistant/components/mqtt/light/schema_template.py
index 69bc801ff1e..595f072416b 100644
--- a/homeassistant/components/mqtt/light/schema_template.py
+++ b/homeassistant/components/mqtt/light/schema_template.py
@@ -31,19 +31,30 @@ from homeassistant.const import (
     STATE_ON,
 )
 from homeassistant.core import callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType, VolSchemaType
-import homeassistant.util.color as color_util
+from homeassistant.util import color as color_util
 
 from .. import subscription
 from ..config import MQTT_RW_SCHEMA
 from ..const import (
+    CONF_BLUE_TEMPLATE,
+    CONF_BRIGHTNESS_TEMPLATE,
     CONF_COLOR_TEMP_KELVIN,
+    CONF_COLOR_TEMP_TEMPLATE,
+    CONF_COMMAND_OFF_TEMPLATE,
+    CONF_COMMAND_ON_TEMPLATE,
     CONF_COMMAND_TOPIC,
+    CONF_EFFECT_LIST,
+    CONF_EFFECT_TEMPLATE,
+    CONF_GREEN_TEMPLATE,
     CONF_MAX_KELVIN,
+    CONF_MAX_MIREDS,
     CONF_MIN_KELVIN,
+    CONF_MIN_MIREDS,
+    CONF_RED_TEMPLATE,
     CONF_STATE_TOPIC,
     PAYLOAD_NONE,
 )
@@ -64,18 +75,6 @@ DOMAIN = "mqtt_template"
 
 DEFAULT_NAME = "MQTT Template Light"
 
-CONF_BLUE_TEMPLATE = "blue_template"
-CONF_BRIGHTNESS_TEMPLATE = "brightness_template"
-CONF_COLOR_TEMP_TEMPLATE = "color_temp_template"
-CONF_COMMAND_OFF_TEMPLATE = "command_off_template"
-CONF_COMMAND_ON_TEMPLATE = "command_on_template"
-CONF_EFFECT_LIST = "effect_list"
-CONF_EFFECT_TEMPLATE = "effect_template"
-CONF_GREEN_TEMPLATE = "green_template"
-CONF_MAX_MIREDS = "max_mireds"
-CONF_MIN_MIREDS = "min_mireds"
-CONF_RED_TEMPLATE = "red_template"
-
 COMMAND_TEMPLATES = (CONF_COMMAND_ON_TEMPLATE, CONF_COMMAND_OFF_TEMPLATE)
 VALUE_TEMPLATES = (
     CONF_BLUE_TEMPLATE,
diff --git a/homeassistant/components/mqtt/lock.py b/homeassistant/components/mqtt/lock.py
index 2113dbbd5ba..727e689798e 100644
--- a/homeassistant/components/mqtt/lock.py
+++ b/homeassistant/components/mqtt/lock.py
@@ -19,8 +19,8 @@ from homeassistant.const import (
     CONF_VALUE_TEMPLATE,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
 
@@ -116,7 +116,7 @@ STATE_CONFIG_KEYS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT lock through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/manifest.json b/homeassistant/components/mqtt/manifest.json
index 25e98c01aaf..1cd6ae3e47c 100644
--- a/homeassistant/components/mqtt/manifest.json
+++ b/homeassistant/components/mqtt/manifest.json
@@ -8,6 +8,6 @@
   "documentation": "https://www.home-assistant.io/integrations/mqtt",
   "iot_class": "local_push",
   "quality_scale": "platinum",
-  "requirements": ["paho-mqtt==1.6.1"],
+  "requirements": ["paho-mqtt==2.1.0"],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/mqtt/models.py b/homeassistant/components/mqtt/models.py
index 34c1f304944..8a42797b0f2 100644
--- a/homeassistant/components/mqtt/models.py
+++ b/homeassistant/components/mqtt/models.py
@@ -420,5 +420,41 @@ class MqttComponentConfig:
     discovery_payload: MQTTDiscoveryPayload
 
 
+class DeviceMqttOptions(TypedDict, total=False):
+    """Hold the shared MQTT specific options for an MQTT device."""
+
+    qos: int
+
+
+class MqttDeviceData(TypedDict, total=False):
+    """Hold the data for an MQTT device."""
+
+    name: str
+    identifiers: str
+    configuration_url: str
+    sw_version: str
+    hw_version: str
+    model: str
+    model_id: str
+    mqtt_settings: DeviceMqttOptions
+
+
+class MqttAvailabilityData(TypedDict, total=False):
+    """Hold the availability configuration for a device."""
+
+    availability_topic: str
+    availability_template: str
+    payload_available: str
+    payload_not_available: str
+
+
+class MqttSubentryData(TypedDict, total=False):
+    """Hold the data for a MQTT subentry."""
+
+    device: MqttDeviceData
+    components: dict[str, dict[str, Any]]
+    availability: MqttAvailabilityData
+
+
 DATA_MQTT: HassKey[MqttData] = HassKey("mqtt")
 DATA_MQTT_AVAILABLE: HassKey[asyncio.Future[bool]] = HassKey("mqtt_client_available")
diff --git a/homeassistant/components/mqtt/notify.py b/homeassistant/components/mqtt/notify.py
index 84442e75e73..0b6dbce38b4 100644
--- a/homeassistant/components/mqtt/notify.py
+++ b/homeassistant/components/mqtt/notify.py
@@ -9,8 +9,8 @@ from homeassistant.components.notify import NotifyEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from .config import DEFAULT_RETAIN, MQTT_BASE_SCHEMA
@@ -39,7 +39,7 @@ DISCOVERY_SCHEMA = PLATFORM_SCHEMA_MODERN.extend({}, extra=vol.REMOVE_EXTRA)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT notify through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/number.py b/homeassistant/components/mqtt/number.py
index 9b47a3ad23a..5ee93cfba07 100644
--- a/homeassistant/components/mqtt/number.py
+++ b/homeassistant/components/mqtt/number.py
@@ -27,7 +27,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
 from homeassistant.helpers.typing import ConfigType, VolSchemaType
 
@@ -109,7 +109,7 @@ DISCOVERY_SCHEMA = vol.All(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT number through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/scene.py b/homeassistant/components/mqtt/scene.py
index 314bd716ee0..12f680b6e12 100644
--- a/homeassistant/components/mqtt/scene.py
+++ b/homeassistant/components/mqtt/scene.py
@@ -11,8 +11,8 @@ from homeassistant.components.scene import Scene
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, CONF_PAYLOAD_ON
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
 
 from .config import MQTT_BASE_SCHEMA
@@ -43,7 +43,7 @@ DISCOVERY_SCHEMA = PLATFORM_SCHEMA_MODERN.extend({}, extra=vol.REMOVE_EXTRA)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT scene through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/select.py b/homeassistant/components/mqtt/select.py
index 55d56ecd774..1b3ea1a7c44 100644
--- a/homeassistant/components/mqtt/select.py
+++ b/homeassistant/components/mqtt/select.py
@@ -13,7 +13,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, CONF_OPTIMISTIC, CONF_VALUE_TEMPLATE
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
 from homeassistant.helpers.typing import ConfigType, VolSchemaType
@@ -63,7 +63,7 @@ DISCOVERY_SCHEMA = vol.All(PLATFORM_SCHEMA_MODERN.extend({}, extra=vol.REMOVE_EX
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT select through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/sensor.py b/homeassistant/components/mqtt/sensor.py
index bacbf4d323e..b27ef68368a 100644
--- a/homeassistant/components/mqtt/sensor.py
+++ b/homeassistant/components/mqtt/sensor.py
@@ -11,6 +11,7 @@ import voluptuous as vol
 from homeassistant.components import sensor
 from homeassistant.components.sensor import (
     CONF_STATE_CLASS,
+    DEVICE_CLASS_UNITS,
     DEVICE_CLASSES_SCHEMA,
     ENTITY_ID_FORMAT,
     STATE_CLASSES_SCHEMA,
@@ -30,16 +31,25 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, State, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_call_later
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
 from homeassistant.helpers.typing import ConfigType, VolSchemaType
 from homeassistant.util import dt as dt_util
 
 from . import subscription
 from .config import MQTT_RO_SCHEMA
-from .const import CONF_OPTIONS, CONF_STATE_TOPIC, PAYLOAD_NONE
+from .const import (
+    CONF_EXPIRE_AFTER,
+    CONF_LAST_RESET_VALUE_TEMPLATE,
+    CONF_OPTIONS,
+    CONF_STATE_TOPIC,
+    CONF_SUGGESTED_DISPLAY_PRECISION,
+    DOMAIN,
+    PAYLOAD_NONE,
+)
 from .entity import MqttAvailabilityMixin, MqttEntity, async_setup_entity_entry_helper
 from .models import MqttValueTemplate, PayloadSentinel, ReceiveMessage
 from .schemas import MQTT_ENTITY_COMMON_SCHEMA
@@ -49,10 +59,6 @@ _LOGGER = logging.getLogger(__name__)
 
 PARALLEL_UPDATES = 0
 
-CONF_EXPIRE_AFTER = "expire_after"
-CONF_LAST_RESET_VALUE_TEMPLATE = "last_reset_value_template"
-CONF_SUGGESTED_DISPLAY_PRECISION = "suggested_display_precision"
-
 MQTT_SENSOR_ATTRIBUTES_BLOCKED = frozenset(
     {
         sensor.ATTR_LAST_RESET,
@@ -63,6 +69,10 @@ MQTT_SENSOR_ATTRIBUTES_BLOCKED = frozenset(
 DEFAULT_NAME = "MQTT Sensor"
 DEFAULT_FORCE_UPDATE = False
 
+URL_DOCS_SUPPORTED_SENSOR_UOM = (
+    "https://www.home-assistant.io/integrations/sensor/#device-class"
+)
+
 _PLATFORM_SCHEMA_BASE = MQTT_RO_SCHEMA.extend(
     {
         vol.Optional(CONF_DEVICE_CLASS): vol.Any(DEVICE_CLASSES_SCHEMA, None),
@@ -107,6 +117,23 @@ def validate_sensor_state_and_device_class_config(config: ConfigType) -> ConfigT
                 f"got `{CONF_DEVICE_CLASS}` '{device_class}'"
             )
 
+    if (device_class := config.get(CONF_DEVICE_CLASS)) is None or (
+        unit_of_measurement := config.get(CONF_UNIT_OF_MEASUREMENT)
+    ) is None:
+        return config
+
+    if (
+        device_class in DEVICE_CLASS_UNITS
+        and unit_of_measurement not in DEVICE_CLASS_UNITS[device_class]
+    ):
+        _LOGGER.warning(
+            "The unit of measurement `%s` is not valid "
+            "together with device class `%s`. "
+            "this will stop working in HA Core 2025.7.0",
+            unit_of_measurement,
+            device_class,
+        )
+
     return config
 
 
@@ -124,7 +151,7 @@ DISCOVERY_SCHEMA = vol.All(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT sensor through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
@@ -155,8 +182,40 @@ class MqttSensor(MqttEntity, RestoreSensor):
         None
     )
 
+    @callback
+    def async_check_uom(self) -> None:
+        """Check if the unit of measurement is valid with the device class."""
+        if (
+            self._discovery_data is not None
+            or self.device_class is None
+            or self.native_unit_of_measurement is None
+        ):
+            return
+        if (
+            self.device_class in DEVICE_CLASS_UNITS
+            and self.native_unit_of_measurement
+            not in DEVICE_CLASS_UNITS[self.device_class]
+        ):
+            async_create_issue(
+                self.hass,
+                DOMAIN,
+                self.entity_id,
+                issue_domain=sensor.DOMAIN,
+                is_fixable=False,
+                severity=IssueSeverity.WARNING,
+                learn_more_url=URL_DOCS_SUPPORTED_SENSOR_UOM,
+                translation_placeholders={
+                    "uom": self.native_unit_of_measurement,
+                    "device_class": self.device_class.value,
+                    "entity_id": self.entity_id,
+                },
+                translation_key="invalid_unit_of_measurement",
+                breaks_in_ha_version="2025.7.0",
+            )
+
     async def mqtt_async_added_to_hass(self) -> None:
         """Restore state for entities with expire_after set."""
+        self.async_check_uom()
         last_state: State | None
         last_sensor_data: SensorExtraStoredData | None
         if (
diff --git a/homeassistant/components/mqtt/services.yaml b/homeassistant/components/mqtt/services.yaml
index c5e4f372bd6..f6fac1d2c1e 100644
--- a/homeassistant/components/mqtt/services.yaml
+++ b/homeassistant/components/mqtt/services.yaml
@@ -8,7 +8,6 @@ publish:
       selector:
         text:
     payload:
-      required: true
       example: "The temperature is {{ states('sensor.temperature') }}"
       selector:
         template:
diff --git a/homeassistant/components/mqtt/siren.py b/homeassistant/components/mqtt/siren.py
index 1cc5ba2d2e5..48ab4676dea 100644
--- a/homeassistant/components/mqtt/siren.py
+++ b/homeassistant/components/mqtt/siren.py
@@ -28,8 +28,8 @@ from homeassistant.const import (
     CONF_PAYLOAD_ON,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.json import json_dumps
 from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
 from homeassistant.helpers.template import Template
@@ -113,7 +113,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT siren through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/strings.json b/homeassistant/components/mqtt/strings.json
index 3815b6adbd5..60339347f2a 100644
--- a/homeassistant/components/mqtt/strings.json
+++ b/homeassistant/components/mqtt/strings.json
@@ -1,16 +1,12 @@
 {
   "issues": {
-    "deprecated_color_handling": {
-      "title": "Deprecated color handling used for MQTT light",
-      "description": "An MQTT light config (with `json` schema) found in `configuration.yaml` uses deprecated color handling flags.\n\nConfiguration found:\n```yaml\n{config}\n```\nDeprecated flags: **{deprecated_flags}**.\n\nUse the `supported_color_modes` option instead and [reload](/developer-tools/yaml) the manually configured MQTT items or restart Home Assistant to fix this issue."
-    },
-    "deprecated_color_mode_flag": {
-      "title": "Deprecated color_mode option flag used for MQTT light",
-      "description": "An MQTT light config (with `json` schema) found in `configuration.yaml` uses a deprecated `color_mode` flag.\n\nConfiguration found:\n```yaml\n{config}\n```\n\nRemove the option from your config and [reload](/developer-tools/yaml) the manually configured MQTT items or restart Home Assistant to fix this issue."
-    },
     "invalid_platform_config": {
       "title": "Invalid config found for mqtt {domain} item",
       "description": "Home Assistant detected an invalid config for a manually configured item.\n\nPlatform domain: **{domain}**\nConfiguration file: **{config_file}**\nNear line: **{line}**\nConfiguration found:\n```yaml\n{config}\n```\nError: **{error}**.\n\nMake sure the configuration is valid and [reload](/developer-tools/yaml) the manually configured MQTT items or restart Home Assistant to fix this issue."
+    },
+    "invalid_unit_of_measurement": {
+      "title": "Sensor with invalid unit of measurement",
+      "description": "Manual configured Sensor entity **{entity_id}** has a configured unit of measurement **{uom}** which is not valid with configured device class **{device_class}**. Make sure a valid unit of measurement is configured or remove the device class, and [reload](/developer-tools/yaml) the manually configured MQTT items or restart Home Assistant to fix this issue."
     }
   },
   "config": {
@@ -34,6 +30,7 @@
           "client_id": "Client ID (leave empty to randomly generated one)",
           "client_cert": "Upload client certificate file",
           "client_key": "Upload private key file",
+          "client_key_password": "[%key:common::config_flow::data::password%]",
           "keepalive": "The time between sending keep alive messages",
           "tls_insecure": "Ignore broker certificate validation",
           "protocol": "MQTT protocol",
@@ -53,6 +50,7 @@
           "client_id": "The unique ID to identify the Home Assistant MQTT API as MQTT client. It is recommended to leave this option blank.",
           "client_cert": "The client certificate to authenticate against your MQTT broker.",
           "client_key": "The private key file that belongs to your client certificate.",
+          "client_key_password": "The password for the private key file (if set).",
           "keepalive": "A value less than 90 seconds is advised.",
           "tls_insecure": "Option to ignore validation of your MQTT broker's certificate.",
           "protocol": "The MQTT protocol your broker operates at. For example 3.1.1.",
@@ -101,8 +99,8 @@
       "bad_will": "Invalid will topic",
       "bad_discovery_prefix": "Invalid discovery prefix",
       "bad_certificate": "The CA certificate is invalid",
-      "bad_client_cert": "Invalid client certificate, ensure a PEM coded file is supplied",
-      "bad_client_key": "Invalid private key, ensure a PEM coded file is supplied without password",
+      "bad_client_cert": "Invalid client certificate, ensure a valid file is supplied",
+      "client_key_error": "Invalid private key file or invalid password supplied",
       "bad_client_cert_key": "Client certificate and private key are not a valid pair",
       "bad_ws_headers": "Supply valid HTTP headers as a JSON object",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
@@ -110,6 +108,189 @@
       "invalid_inclusion": "The client certificate and private key must be configured together"
     }
   },
+  "config_subentries": {
+    "device": {
+      "initiate_flow": {
+        "user": "Add MQTT Device",
+        "reconfigure": "Reconfigure MQTT Device"
+      },
+      "entry_type": "MQTT Device",
+      "step": {
+        "availability": {
+          "title": "Availability options",
+          "description": "The availability feature allows a device to report it's availability.",
+          "data": {
+            "availability_topic": "Availability topic",
+            "availability_template": "Availability template",
+            "payload_available": "Payload available",
+            "payload_not_available": "Payload not available"
+          },
+          "data_description": {
+            "availability_topic": "Topic to receive the availabillity payload on",
+            "availability_template": "A [template](https://www.home-assistant.io/docs/configuration/templating/#using-templates-with-the-mqtt-integration) to render the availability payload received on the availability topic",
+            "payload_available": "The payload that indicates the device is available (defaults to 'online')",
+            "payload_not_available": "The payload that indicates the device is not available (defaults to 'offline')"
+          }
+        },
+        "device": {
+          "title": "Configure MQTT device details",
+          "description": "Enter the MQTT device details:",
+          "data": {
+            "name": "[%key:common::config_flow::data::name%]",
+            "configuration_url": "Configuration URL",
+            "sw_version": "Software version",
+            "hw_version": "Hardware version",
+            "model": "Model",
+            "model_id": "Model ID"
+          },
+          "data_description": {
+            "name": "The name of the manually added MQTT device.",
+            "configuration_url": "A link to the webpage that can manage the configuration of this device. Can be either a 'http://', 'https://' or an internal 'homeassistant://' URL.",
+            "sw_version": "The software version of the device. E.g. '2025.1.0'.",
+            "hw_version": "The hardware version of the device. E.g. 'v1.0 rev a'.",
+            "model": "E.g. 'Cleanmaster Pro'.",
+            "model_id": "E.g. '123NK2PRO'."
+          },
+          "sections": {
+            "mqtt_settings": {
+              "name": "MQTT Settings",
+              "data": {
+                "qos": "QoS"
+              },
+              "data_description": {
+                "qos": "The Quality of Service value the device's entities should use."
+              }
+            }
+          }
+        },
+        "summary_menu": {
+          "title": "Reconfigure \"{mqtt_device}\"",
+          "description": "Entities set up:\n{mqtt_items}\n\nDecide what to do next:",
+          "menu_options": {
+            "entity": "Add another entity to \"{mqtt_device}\"",
+            "update_entity": "Update entity properties",
+            "delete_entity": "Delete an entity",
+            "availability": "Configure availability",
+            "device": "Update device properties",
+            "save_changes": "Save changes"
+          }
+        },
+        "entity": {
+          "title": "Configure MQTT device \"{mqtt_device}\"",
+          "description": "Configure the basic {platform_label}entity settings{entity_name_label}",
+          "data": {
+            "platform": "Type of entity",
+            "name": "Entity name",
+            "entity_picture": "Entity picture"
+          },
+          "data_description": {
+            "platform": "The type of the entity to configure.",
+            "name": "The name of the entity. Leave empty to set it to `None` to [mark it as main feature of the MQTT device](https://www.home-assistant.io/integrations/mqtt/#naming-of-mqtt-entities).",
+            "entity_picture": "An URL to a picture to be assigned."
+          }
+        },
+        "delete_entity": {
+          "title": "Delete entity",
+          "description": "Delete an entity. The entity will be removed from the device. Removing an entity will break any automations or scripts that depend on it.",
+          "data": {
+            "component": "Entity"
+          },
+          "data_description": {
+            "component": "Select the entity you want to delete. Minimal one entity is required."
+          }
+        },
+        "update_entity": {
+          "title": "Select entity",
+          "description": "Select the entity you want to update",
+          "data": {
+            "component": "Entity"
+          },
+          "data_description": {
+            "component": "Select the entity you want to update."
+          }
+        },
+        "entity_platform_config": {
+          "title": "Configure MQTT device \"{mqtt_device}\"",
+          "description": "Please configure specific details for {platform} entity \"{entity}\":",
+          "data": {
+            "device_class": "Device class",
+            "state_class": "State class",
+            "unit_of_measurement": "Unit of measurement",
+            "options": "Add option"
+          },
+          "data_description": {
+            "device_class": "The device class of the {platform} entity. [Learn more.]({url}#device_class)",
+            "state_class": "The [state_class](https://developers.home-assistant.io/docs/core/entity/sensor/#available-state-classes) of the sensor. [Learn more.]({url}#state_class)",
+            "unit_of_measurement": "Defines the unit of measurement of the sensor, if any.",
+            "options": "Options for allowed sensor state values. The sensor’s device_class must be set to Enumeration. The options option cannot be used together with State Class or Unit of measurement."
+          },
+          "sections": {
+            "advanced_settings": {
+              "name": "Advanced options",
+              "data": {
+                "suggested_display_precision": "Suggested display precision"
+              },
+              "data_description": {
+                "suggested_display_precision": "The number of decimals which should be used in the {platform} entity state after rounding. [Learn more.]({url}#suggested_display_precision)"
+              }
+            }
+          }
+        },
+        "mqtt_platform_config": {
+          "title": "Configure MQTT device \"{mqtt_device}\"",
+          "description": "Please configure MQTT specific details for {platform} entity \"{entity}\":",
+          "data": {
+            "command_topic": "Command topic",
+            "command_template": "Command template",
+            "state_topic": "State topic",
+            "value_template": "Value template",
+            "last_reset_value_template": "Last reset value template",
+            "force_update": "Force update",
+            "optimistic": "Optimistic",
+            "retain": "Retain"
+          },
+          "data_description": {
+            "command_topic": "The publishing topic that will be used to control the {platform} entity. [Learn more.]({url}#command_topic)",
+            "command_template": "A [template](https://www.home-assistant.io/docs/configuration/templating/#using-command-templates-with-mqtt) to render the payload to be published at the command topic.",
+            "state_topic": "The MQTT topic subscribed to receive {platform} state values. [Learn more.]({url}#state_topic)",
+            "value_template": "Defines a [template](https://www.home-assistant.io/docs/configuration/templating/#using-value-templates-with-mqtt) to extract the {platform} entity value.",
+            "last_reset_value_template": "Defines a [template](https://www.home-assistant.io/docs/configuration/templating/#using-value-templates-with-mqtt) to extract the last reset. When Last reset template is set, the State class option must be Total. [Learn more.]({url}#last_reset_value_template)",
+            "force_update": "Sends update events even if the value hasn’t changed. Useful if you want to have meaningful value graphs in history. [Learn more.]({url}#force_update)",
+            "optimistic": "Flag that defines if the {platform} entity works in optimistic mode. [Learn more.]({url}#optimistic)",
+            "retain": "Select if values published by the {platform} entity should be retained at the MQTT broker."
+          },
+          "sections": {
+            "advanced_settings": {
+              "name": "Advanced settings",
+              "data": {
+                "expire_after": "Expire after"
+              },
+              "data_description": {
+                "expire_after": "If set, it defines the number of seconds after the sensor’s state expires, if it’s not updated. After expiry, the sensor’s state becomes unavailable. If not set, the sensor's state never expires. [Learn more.]({url}#expire_after)"
+              }
+            }
+          }
+        }
+      },
+      "abort": {
+        "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
+      },
+      "create_entry": {
+        "default": "MQTT device with {platform} entity \"{entity}\" was set up successfully.\n\nNote that you can reconfigure the MQTT device at any time, e.g. to add more entities."
+      },
+      "error": {
+        "invalid_input": "Invalid value",
+        "invalid_subscribe_topic": "Invalid subscribe topic",
+        "invalid_template": "Invalid template",
+        "invalid_uom": "The unit of measurement \"{unit_of_measurement}\" is not supported by the selected device class, please either remove the device class, select a device class which supports \"{unit_of_measurement}\", or pick a supported unit of measurement from the list",
+        "invalid_url": "Invalid URL",
+        "options_not_allowed_with_state_class_or_uom": "The 'Options' setting is not allowed when state class or unit of measurement are used",
+        "options_device_class_enum": "The 'Options' setting must be used with the Enumeration device class'. If you continue, the existing options will be reset",
+        "options_with_enum_device_class": "Configure options for the enumeration sensor",
+        "uom_required_for_device_class": "The selected device device class requires a unit"
+      }
+    }
+  },
   "device_automation": {
     "trigger_type": {
       "button_short_press": "\"{subtype}\" pressed",
@@ -215,7 +396,7 @@
       "bad_discovery_prefix": "[%key:component::mqtt::config::error::bad_discovery_prefix%]",
       "bad_certificate": "[%key:component::mqtt::config::error::bad_certificate%]",
       "bad_client_cert": "[%key:component::mqtt::config::error::bad_client_cert%]",
-      "bad_client_key": "[%key:component::mqtt::config::error::bad_client_key%]",
+      "client_key_error": "[%key:component::mqtt::config::error::client_key_error%]",
       "bad_client_cert_key": "[%key:component::mqtt::config::error::bad_client_cert_key%]",
       "bad_ws_headers": "[%key:component::mqtt::config::error::bad_ws_headers%]",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
@@ -223,12 +404,92 @@
     }
   },
   "selector": {
+    "device_class_sensor": {
+      "options": {
+        "apparent_power": "[%key:component::sensor::entity_component::apparent_power::name%]",
+        "area": "[%key:component::sensor::entity_component::area::name%]",
+        "aqi": "[%key:component::sensor::entity_component::aqi::name%]",
+        "atmospheric_pressure": "[%key:component::sensor::entity_component::atmospheric_pressure::name%]",
+        "battery": "[%key:component::sensor::entity_component::battery::name%]",
+        "blood_glucose_concentration": "[%key:component::sensor::entity_component::blood_glucose_concentration::name%]",
+        "carbon_dioxide": "[%key:component::sensor::entity_component::carbon_dioxide::name%]",
+        "carbon_monoxide": "[%key:component::sensor::entity_component::carbon_monoxide::name%]",
+        "conductivity": "[%key:component::sensor::entity_component::conductivity::name%]",
+        "current": "[%key:component::sensor::entity_component::current::name%]",
+        "data_rate": "[%key:component::sensor::entity_component::data_rate::name%]",
+        "data_size": "[%key:component::sensor::entity_component::data_size::name%]",
+        "date": "[%key:component::sensor::entity_component::date::name%]",
+        "distance": "[%key:component::sensor::entity_component::distance::name%]",
+        "duration": "[%key:component::sensor::entity_component::duration::name%]",
+        "energy": "[%key:component::sensor::entity_component::energy::name%]",
+        "energy_distance": "[%key:component::sensor::entity_component::energy_distance::name%]",
+        "energy_storage": "[%key:component::sensor::entity_component::energy_storage::name%]",
+        "enum": "Enumeration",
+        "frequency": "[%key:component::sensor::entity_component::frequency::name%]",
+        "gas": "[%key:component::sensor::entity_component::gas::name%]",
+        "humidity": "[%key:component::sensor::entity_component::humidity::name%]",
+        "illuminance": "[%key:component::sensor::entity_component::illuminance::name%]",
+        "irradiance": "[%key:component::sensor::entity_component::irradiance::name%]",
+        "moisture": "[%key:component::sensor::entity_component::moisture::name%]",
+        "monetary": "[%key:component::sensor::entity_component::monetary::name%]",
+        "nitrogen_dioxide": "[%key:component::sensor::entity_component::nitrogen_dioxide::name%]",
+        "nitrogen_monoxide": "[%key:component::sensor::entity_component::nitrogen_monoxide::name%]",
+        "nitrous_oxide": "[%key:component::sensor::entity_component::nitrous_oxide::name%]",
+        "ozone": "[%key:component::sensor::entity_component::ozone::name%]",
+        "ph": "[%key:component::sensor::entity_component::ph::name%]",
+        "pm1": "[%key:component::sensor::entity_component::pm1::name%]",
+        "pm10": "[%key:component::sensor::entity_component::pm10::name%]",
+        "pm25": "[%key:component::sensor::entity_component::pm25::name%]",
+        "power": "[%key:component::sensor::entity_component::power::name%]",
+        "power_factor": "[%key:component::sensor::entity_component::power_factor::name%]",
+        "precipitation": "[%key:component::sensor::entity_component::precipitation::name%]",
+        "precipitation_intensity": "[%key:component::sensor::entity_component::precipitation_intensity::name%]",
+        "pressure": "[%key:component::sensor::entity_component::pressure::name%]",
+        "reactive_power": "[%key:component::sensor::entity_component::reactive_power::name%]",
+        "signal_strength": "[%key:component::sensor::entity_component::signal_strength::name%]",
+        "sound_pressure": "[%key:component::sensor::entity_component::sound_pressure::name%]",
+        "speed": "[%key:component::sensor::entity_component::speed::name%]",
+        "sulphur_dioxide": "[%key:component::sensor::entity_component::sulphur_dioxide::name%]",
+        "temperature": "[%key:component::sensor::entity_component::temperature::name%]",
+        "timestamp": "[%key:component::sensor::entity_component::timestamp::name%]",
+        "volatile_organic_compounds": "[%key:component::sensor::entity_component::volatile_organic_compounds::name%]",
+        "volatile_organic_compounds_parts": "[%key:component::sensor::entity_component::volatile_organic_compounds::name%]",
+        "voltage": "[%key:component::sensor::entity_component::voltage::name%]",
+        "volume": "[%key:component::sensor::entity_component::volume::name%]",
+        "volume_flow_rate": "[%key:component::sensor::entity_component::volume_flow_rate::name%]",
+        "volume_storage": "[%key:component::sensor::entity_component::volume_storage::name%]",
+        "water": "[%key:component::sensor::entity_component::water::name%]",
+        "weight": "[%key:component::sensor::entity_component::weight::name%]",
+        "wind_direction": "[%key:component::sensor::entity_component::wind_direction::name%]",
+        "wind_speed": "[%key:component::sensor::entity_component::wind_speed::name%]"
+      }
+    },
+    "device_class_switch": {
+      "options": {
+        "outlet": "[%key:component::switch::entity_component::outlet::name%]",
+        "switch": "[%key:component::switch::title%]"
+      }
+    },
+    "platform": {
+      "options": {
+        "notify": "Notify",
+        "sensor": "Sensor",
+        "switch": "Switch"
+      }
+    },
     "set_ca_cert": {
       "options": {
         "off": "[%key:common::state::off%]",
         "auto": "Auto",
         "custom": "Custom"
       }
+    },
+    "state_class": {
+      "options": {
+        "measurement": "[%key:component::sensor::entity_component::_::state_attributes::state_class::state::measurement%]",
+        "total": "[%key:component::sensor::entity_component::_::state_attributes::state_class::state::total%]",
+        "total_increasing": "[%key:component::sensor::entity_component::_::state_attributes::state_class::state::total_increasing%]"
+      }
     }
   },
   "services": {
@@ -238,7 +499,7 @@
       "fields": {
         "evaluate_payload": {
           "name": "Evaluate payload",
-          "description": "When `payload` is a Python bytes literal, evaluate the bytes literal and publish the raw data."
+          "description": "If 'Payload' is a Python bytes literal, evaluate the bytes literal and publish the raw data."
         },
         "topic": {
           "name": "Topic",
@@ -246,11 +507,7 @@
         },
         "payload": {
           "name": "Payload",
-          "description": "The payload to publish."
-        },
-        "payload_template": {
-          "name": "Payload template",
-          "description": "Template to render as a payload value. If a payload is provided, the template is ignored."
+          "description": "The payload to publish. Publishes an empty message if not provided."
         },
         "qos": {
           "name": "QoS",
diff --git a/homeassistant/components/mqtt/switch.py b/homeassistant/components/mqtt/switch.py
index 0a54bcdb378..f6996fc77ce 100644
--- a/homeassistant/components/mqtt/switch.py
+++ b/homeassistant/components/mqtt/switch.py
@@ -20,8 +20,8 @@ from homeassistant.const import (
     STATE_ON,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
 from homeassistant.helpers.typing import ConfigType
@@ -70,7 +70,7 @@ DISCOVERY_SCHEMA = PLATFORM_SCHEMA_MODERN.extend({}, extra=vol.REMOVE_EXTRA)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT switch through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/tag.py b/homeassistant/components/mqtt/tag.py
index 680f252fb20..9a05d1896f7 100644
--- a/homeassistant/components/mqtt/tag.py
+++ b/homeassistant/components/mqtt/tag.py
@@ -12,7 +12,7 @@ from homeassistant.components import tag
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DEVICE, CONF_VALUE_TEMPLATE
 from homeassistant.core import HassJobType, HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/mqtt/text.py b/homeassistant/components/mqtt/text.py
index b4ed33a7730..d306fc0819b 100644
--- a/homeassistant/components/mqtt/text.py
+++ b/homeassistant/components/mqtt/text.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
 from homeassistant.helpers.typing import ConfigType, VolSchemaType
 
@@ -95,7 +95,7 @@ PLATFORM_SCHEMA_MODERN = vol.All(_PLATFORM_SCHEMA_BASE, valid_text_size_configur
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT text through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/update.py b/homeassistant/components/mqtt/update.py
index 59742d24b60..c4916b5010c 100644
--- a/homeassistant/components/mqtt/update.py
+++ b/homeassistant/components/mqtt/update.py
@@ -17,7 +17,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DEVICE_CLASS, CONF_NAME, CONF_VALUE_TEMPLATE
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType, VolSchemaType
 from homeassistant.util.json import JSON_DECODE_EXCEPTIONS, json_loads
@@ -82,7 +82,7 @@ MQTT_JSON_UPDATE_SCHEMA = vol.Schema(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT update entity through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/util.py b/homeassistant/components/mqtt/util.py
index 27bdb4f2a35..e3996c80a8a 100644
--- a/homeassistant/components/mqtt/util.py
+++ b/homeassistant/components/mqtt/util.py
@@ -411,3 +411,9 @@ def migrate_certificate_file_to_content(file_name_or_auto: str) -> str | None:
             return certificate_file.read()
     except OSError:
         return None
+
+
+@callback
+def learn_more_url(platform: str) -> str:
+    """Return the URL for the platform specific MQTT documentation."""
+    return f"https://www.home-assistant.io/integrations/{platform}.mqtt/"
diff --git a/homeassistant/components/mqtt/vacuum.py b/homeassistant/components/mqtt/vacuum.py
index 743bfb363f3..f1d2eb34fe1 100644
--- a/homeassistant/components/mqtt/vacuum.py
+++ b/homeassistant/components/mqtt/vacuum.py
@@ -17,8 +17,8 @@ from homeassistant.components.vacuum import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_SUPPORTED_FEATURES, CONF_NAME
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.json import json_dumps
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, VolSchemaType
 from homeassistant.util.json import json_loads_object
@@ -175,7 +175,7 @@ DISCOVERY_SCHEMA = PLATFORM_SCHEMA_MODERN.extend({}, extra=vol.ALLOW_EXTRA)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT vacuum through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/valve.py b/homeassistant/components/mqtt/valve.py
index 50c5960f801..53f7d06429e 100644
--- a/homeassistant/components/mqtt/valve.py
+++ b/homeassistant/components/mqtt/valve.py
@@ -23,8 +23,8 @@ from homeassistant.const import (
     CONF_VALUE_TEMPLATE,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, VolSchemaType
 from homeassistant.util.json import JSON_DECODE_EXCEPTIONS, json_loads
 from homeassistant.util.percentage import (
@@ -136,7 +136,7 @@ DISCOVERY_SCHEMA = vol.All(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT valve through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt/water_heater.py b/homeassistant/components/mqtt/water_heater.py
index 4c1d3fa8a53..31d4f0fe30e 100644
--- a/homeassistant/components/mqtt/water_heater.py
+++ b/homeassistant/components/mqtt/water_heater.py
@@ -35,8 +35,8 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.typing import ConfigType, VolSchemaType
 from homeassistant.util.unit_conversion import TemperatureConverter
@@ -166,7 +166,7 @@ DISCOVERY_SCHEMA = vol.All(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MQTT water heater device through YAML and through MQTT discovery."""
     async_setup_entity_entry_helper(
diff --git a/homeassistant/components/mqtt_eventstream/__init__.py b/homeassistant/components/mqtt_eventstream/__init__.py
index 5e677d13cfe..20602e03f81 100644
--- a/homeassistant/components/mqtt_eventstream/__init__.py
+++ b/homeassistant/components/mqtt_eventstream/__init__.py
@@ -19,7 +19,7 @@ from homeassistant.const import (
     MATCH_ALL,
 )
 from homeassistant.core import EventOrigin, HomeAssistant, State, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.json import JSONEncoder
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/mqtt_json/device_tracker.py b/homeassistant/components/mqtt_json/device_tracker.py
index 3200da56cf6..6f4e83799d1 100644
--- a/homeassistant/components/mqtt_json/device_tracker.py
+++ b/homeassistant/components/mqtt_json/device_tracker.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     CONF_DEVICES,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/mqtt_room/sensor.py b/homeassistant/components/mqtt_room/sensor.py
index 849d4562423..242c39cb983 100644
--- a/homeassistant/components/mqtt_room/sensor.py
+++ b/homeassistant/components/mqtt_room/sensor.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
     STATE_NOT_HOME,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util, slugify
diff --git a/homeassistant/components/mqtt_statestream/__init__.py b/homeassistant/components/mqtt_statestream/__init__.py
index 3a0953a0158..9a08fa2c73a 100644
--- a/homeassistant/components/mqtt_statestream/__init__.py
+++ b/homeassistant/components/mqtt_statestream/__init__.py
@@ -9,7 +9,7 @@ from homeassistant.components import mqtt
 from homeassistant.components.mqtt import valid_publish_topic
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP, EVENT_STATE_CHANGED
 from homeassistant.core import Event, EventStateChangedData, HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entityfilter import (
     INCLUDE_EXCLUDE_BASE_FILTER_SCHEMA,
     convert_include_exclude_filter,
diff --git a/homeassistant/components/msteams/notify.py b/homeassistant/components/msteams/notify.py
index a4de5d126d5..06f9bc42e91 100644
--- a/homeassistant/components/msteams/notify.py
+++ b/homeassistant/components/msteams/notify.py
@@ -16,7 +16,7 @@ from homeassistant.components.notify import (
 )
 from homeassistant.const import CONF_URL
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/mullvad/binary_sensor.py b/homeassistant/components/mullvad/binary_sensor.py
index 2e649d9a586..ad488058025 100644
--- a/homeassistant/components/mullvad/binary_sensor.py
+++ b/homeassistant/components/mullvad/binary_sensor.py
@@ -8,7 +8,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -28,7 +28,7 @@ BINARY_SENSORS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Defer sensor setup to the shared sensor module."""
     coordinator = hass.data[DOMAIN]
diff --git a/homeassistant/components/mullvad/config_flow.py b/homeassistant/components/mullvad/config_flow.py
index c16f8879a7b..b179c5605ef 100644
--- a/homeassistant/components/mullvad/config_flow.py
+++ b/homeassistant/components/mullvad/config_flow.py
@@ -1,5 +1,6 @@
 """Config flow for Mullvad VPN integration."""
 
+import logging
 from typing import Any
 
 from mullvad_api import MullvadAPI, MullvadAPIError
@@ -8,6 +9,8 @@ from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 
 from .const import DOMAIN
 
+_LOGGER = logging.getLogger(__name__)
+
 
 class MullvadConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Mullvad VPN."""
@@ -24,7 +27,8 @@ class MullvadConfigFlow(ConfigFlow, domain=DOMAIN):
                 await self.hass.async_add_executor_job(MullvadAPI)
             except MullvadAPIError:
                 errors["base"] = "cannot_connect"
-            except Exception:  # noqa: BLE001
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
                 return self.async_create_entry(title="Mullvad VPN", data=user_input)
diff --git a/homeassistant/components/music_assistant/__init__.py b/homeassistant/components/music_assistant/__init__.py
index 052f4f556c1..a2d2dae9e3f 100644
--- a/homeassistant/components/music_assistant/__init__.py
+++ b/homeassistant/components/music_assistant/__init__.py
@@ -9,22 +9,21 @@ from typing import TYPE_CHECKING
 from music_assistant_client import MusicAssistantClient
 from music_assistant_client.exceptions import CannotConnect, InvalidServerVersion
 from music_assistant_models.enums import EventType
-from music_assistant_models.errors import MusicAssistantError
+from music_assistant_models.errors import ActionUnavailable, MusicAssistantError
 
 from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.const import CONF_URL, EVENT_HOMEASSISTANT_STOP, Platform
 from homeassistant.core import Event, HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.issue_registry import (
     IssueSeverity,
     async_create_issue,
     async_delete_issue,
 )
 
-from .actions import register_actions
+from .actions import get_music_assistant_client, register_actions
 from .const import DOMAIN, LOGGER
 
 if TYPE_CHECKING:
@@ -138,6 +137,18 @@ async def async_setup_entry(
         mass.subscribe(handle_player_removed, EventType.PLAYER_REMOVED)
     )
 
+    # check if any playerconfigs have been removed while we were disconnected
+    all_player_configs = await mass.config.get_player_configs()
+    player_ids = {player.player_id for player in all_player_configs}
+    dev_reg = dr.async_get(hass)
+    dev_entries = dr.async_entries_for_config_entry(dev_reg, entry.entry_id)
+    for device in dev_entries:
+        for identifier in device.identifiers:
+            if identifier[0] == DOMAIN and identifier[1] not in player_ids:
+                dev_reg.async_update_device(
+                    device.id, remove_config_entry_id=entry.entry_id
+                )
+
     return True
 
 
@@ -175,3 +186,31 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         await mass_entry_data.mass.disconnect()
 
     return unload_ok
+
+
+async def async_remove_config_entry_device(
+    hass: HomeAssistant, config_entry: ConfigEntry, device_entry: dr.DeviceEntry
+) -> bool:
+    """Remove a config entry from a device."""
+    player_id = next(
+        (
+            identifier[1]
+            for identifier in device_entry.identifiers
+            if identifier[0] == DOMAIN
+        ),
+        None,
+    )
+    if player_id is None:
+        # this should not be possible at all, but guard it anyways
+        return False
+    mass = get_music_assistant_client(hass, config_entry.entry_id)
+    if mass.players.get(player_id) is None:
+        # player is already removed on the server, this is an orphaned device
+        return True
+    # try to remove the player from the server
+    try:
+        await mass.config.remove_player_config(player_id)
+    except ActionUnavailable:
+        return False
+    else:
+        return True
diff --git a/homeassistant/components/music_assistant/actions.py b/homeassistant/components/music_assistant/actions.py
index f3297bf0a6f..031229d1544 100644
--- a/homeassistant/components/music_assistant/actions.py
+++ b/homeassistant/components/music_assistant/actions.py
@@ -16,13 +16,14 @@ from homeassistant.core import (
     callback,
 )
 from homeassistant.exceptions import ServiceValidationError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import (
     ATTR_ALBUM_ARTISTS_ONLY,
     ATTR_ALBUM_TYPE,
     ATTR_ALBUMS,
     ATTR_ARTISTS,
+    ATTR_AUDIOBOOKS,
     ATTR_CONFIG_ENTRY_ID,
     ATTR_FAVORITE,
     ATTR_ITEMS,
@@ -32,6 +33,7 @@ from .const import (
     ATTR_OFFSET,
     ATTR_ORDER_BY,
     ATTR_PLAYLISTS,
+    ATTR_PODCASTS,
     ATTR_RADIO,
     ATTR_SEARCH,
     ATTR_SEARCH_ALBUM,
@@ -48,6 +50,15 @@ from .schemas import (
 
 if TYPE_CHECKING:
     from music_assistant_client import MusicAssistantClient
+    from music_assistant_models.media_items import (
+        Album,
+        Artist,
+        Audiobook,
+        Playlist,
+        Podcast,
+        Radio,
+        Track,
+    )
 
     from . import MusicAssistantConfigEntry
 
@@ -154,6 +165,14 @@ async def handle_search(call: ServiceCall) -> ServiceResponse:
                 media_item_dict_from_mass_item(mass, item)
                 for item in search_results.radio
             ],
+            ATTR_AUDIOBOOKS: [
+                media_item_dict_from_mass_item(mass, item)
+                for item in search_results.audiobooks
+            ],
+            ATTR_PODCASTS: [
+                media_item_dict_from_mass_item(mass, item)
+                for item in search_results.podcasts
+            ],
         }
     )
     return response
@@ -173,6 +192,15 @@ async def handle_get_library(call: ServiceCall) -> ServiceResponse:
         "offset": offset,
         "order_by": order_by,
     }
+    library_result: (
+        list[Album]
+        | list[Artist]
+        | list[Track]
+        | list[Radio]
+        | list[Playlist]
+        | list[Audiobook]
+        | list[Podcast]
+    )
     if media_type == MediaType.ALBUM:
         library_result = await mass.music.get_library_albums(
             **base_params,
@@ -181,7 +209,7 @@ async def handle_get_library(call: ServiceCall) -> ServiceResponse:
     elif media_type == MediaType.ARTIST:
         library_result = await mass.music.get_library_artists(
             **base_params,
-            album_artists_only=call.data.get(ATTR_ALBUM_ARTISTS_ONLY),
+            album_artists_only=bool(call.data.get(ATTR_ALBUM_ARTISTS_ONLY)),
         )
     elif media_type == MediaType.TRACK:
         library_result = await mass.music.get_library_tracks(
@@ -195,6 +223,14 @@ async def handle_get_library(call: ServiceCall) -> ServiceResponse:
         library_result = await mass.music.get_library_playlists(
             **base_params,
         )
+    elif media_type == MediaType.AUDIOBOOK:
+        library_result = await mass.music.get_library_audiobooks(
+            **base_params,
+        )
+    elif media_type == MediaType.PODCAST:
+        library_result = await mass.music.get_library_podcasts(
+            **base_params,
+        )
     else:
         raise ServiceValidationError(f"Unsupported media type {media_type}")
 
diff --git a/homeassistant/components/music_assistant/const.py b/homeassistant/components/music_assistant/const.py
index 1980c495278..d2ee1f75028 100644
--- a/homeassistant/components/music_assistant/const.py
+++ b/homeassistant/components/music_assistant/const.py
@@ -34,6 +34,8 @@ ATTR_ARTISTS = "artists"
 ATTR_ALBUMS = "albums"
 ATTR_TRACKS = "tracks"
 ATTR_PLAYLISTS = "playlists"
+ATTR_AUDIOBOOKS = "audiobooks"
+ATTR_PODCASTS = "podcasts"
 ATTR_RADIO = "radio"
 ATTR_ITEMS = "items"
 ATTR_RADIO_MODE = "radio_mode"
diff --git a/homeassistant/components/music_assistant/manifest.json b/homeassistant/components/music_assistant/manifest.json
index f5cdcf50673..fb8bb9c3ac2 100644
--- a/homeassistant/components/music_assistant/manifest.json
+++ b/homeassistant/components/music_assistant/manifest.json
@@ -7,6 +7,6 @@
   "documentation": "https://www.home-assistant.io/integrations/music_assistant",
   "iot_class": "local_push",
   "loggers": ["music_assistant"],
-  "requirements": ["music-assistant-client==1.0.8"],
+  "requirements": ["music-assistant-client==1.1.1"],
   "zeroconf": ["_mass._tcp.local."]
 }
diff --git a/homeassistant/components/music_assistant/media_browser.py b/homeassistant/components/music_assistant/media_browser.py
index e65d6d4a975..a926e2a0595 100644
--- a/homeassistant/components/music_assistant/media_browser.py
+++ b/homeassistant/components/music_assistant/media_browser.py
@@ -166,6 +166,8 @@ async def build_playlist_items_listing(
 ) -> BrowseMedia:
     """Build Playlist items browse listing."""
     playlist = await mass.music.get_item_by_uri(identifier)
+    if TYPE_CHECKING:
+        assert playlist.uri is not None
 
     return BrowseMedia(
         media_class=MediaClass.PLAYLIST,
@@ -219,6 +221,9 @@ async def build_artist_items_listing(
     artist = await mass.music.get_item_by_uri(identifier)
     albums = await mass.music.get_artist_albums(artist.item_id, artist.provider)
 
+    if TYPE_CHECKING:
+        assert artist.uri is not None
+
     return BrowseMedia(
         media_class=MediaType.ARTIST,
         media_content_id=artist.uri,
@@ -267,6 +272,9 @@ async def build_album_items_listing(
     album = await mass.music.get_item_by_uri(identifier)
     tracks = await mass.music.get_album_tracks(album.item_id, album.provider)
 
+    if TYPE_CHECKING:
+        assert album.uri is not None
+
     return BrowseMedia(
         media_class=MediaType.ALBUM,
         media_content_id=album.uri,
@@ -340,6 +348,9 @@ def build_item(
         title = item.name
     img_url = mass.get_media_item_image_url(item)
 
+    if TYPE_CHECKING:
+        assert item.uri is not None
+
     return BrowseMedia(
         media_class=media_class or item.media_type.value,
         media_content_id=item.uri,
diff --git a/homeassistant/components/music_assistant/media_player.py b/homeassistant/components/music_assistant/media_player.py
index 9aa7498a2ee..56bde7bbae7 100644
--- a/homeassistant/components/music_assistant/media_player.py
+++ b/homeassistant/components/music_assistant/media_player.py
@@ -9,6 +9,7 @@ import functools
 import os
 from typing import TYPE_CHECKING, Any, Concatenate
 
+from music_assistant_models.constants import PLAYER_CONTROL_NONE
 from music_assistant_models.enums import (
     EventType,
     MediaType,
@@ -20,6 +21,7 @@ from music_assistant_models.enums import (
 from music_assistant_models.errors import MediaNotFoundError, MusicAssistantError
 from music_assistant_models.event import MassEvent
 from music_assistant_models.media_items import ItemMapping, MediaItemType, Track
+from music_assistant_models.player_queue import PlayerQueue
 import voluptuous as vol
 
 from homeassistant.components import media_source
@@ -39,10 +41,9 @@ from homeassistant.components.media_player import (
 from homeassistant.const import ATTR_NAME, STATE_OFF
 from homeassistant.core import HomeAssistant, ServiceResponse, SupportsResponse
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.entity_platform import (
-    AddEntitiesCallback,
+    AddConfigEntryEntitiesCallback,
     async_get_current_platform,
 )
 from homeassistant.util.dt import utc_from_timestamp
@@ -79,21 +80,15 @@ from .schemas import QUEUE_DETAILS_SCHEMA, queue_item_dict_from_mass_item
 if TYPE_CHECKING:
     from music_assistant_client import MusicAssistantClient
     from music_assistant_models.player import Player
-    from music_assistant_models.player_queue import PlayerQueue
 
-SUPPORTED_FEATURES = (
-    MediaPlayerEntityFeature.PAUSE
-    | MediaPlayerEntityFeature.VOLUME_SET
-    | MediaPlayerEntityFeature.STOP
+SUPPORTED_FEATURES_BASE = (
+    MediaPlayerEntityFeature.STOP
     | MediaPlayerEntityFeature.PREVIOUS_TRACK
     | MediaPlayerEntityFeature.NEXT_TRACK
     | MediaPlayerEntityFeature.SHUFFLE_SET
     | MediaPlayerEntityFeature.REPEAT_SET
-    | MediaPlayerEntityFeature.TURN_ON
-    | MediaPlayerEntityFeature.TURN_OFF
     | MediaPlayerEntityFeature.PLAY
     | MediaPlayerEntityFeature.PLAY_MEDIA
-    | MediaPlayerEntityFeature.VOLUME_STEP
     | MediaPlayerEntityFeature.CLEAR_PLAYLIST
     | MediaPlayerEntityFeature.BROWSE_MEDIA
     | MediaPlayerEntityFeature.MEDIA_ENQUEUE
@@ -138,7 +133,7 @@ def catch_musicassistant_error[_R, **P](
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: MusicAssistantConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Music Assistant MediaPlayer(s) from Config Entry."""
     mass = entry.runtime_data.mass
@@ -213,11 +208,7 @@ class MusicAssistantPlayer(MusicAssistantEntity, MediaPlayerEntity):
         """Initialize MediaPlayer entity."""
         super().__init__(mass, player_id)
         self._attr_icon = self.player.icon.replace("mdi-", "mdi:")
-        self._attr_supported_features = SUPPORTED_FEATURES
-        if PlayerFeature.SET_MEMBERS in self.player.supported_features:
-            self._attr_supported_features |= MediaPlayerEntityFeature.GROUPING
-        if PlayerFeature.VOLUME_MUTE in self.player.supported_features:
-            self._attr_supported_features |= MediaPlayerEntityFeature.VOLUME_MUTE
+        self._set_supported_features()
         self._attr_device_class = MediaPlayerDeviceClass.SPEAKER
         self._prev_time: float = 0
 
@@ -242,6 +233,19 @@ class MusicAssistantPlayer(MusicAssistantEntity, MediaPlayerEntity):
             )
         )
 
+        # we subscribe to the player config changed event to update
+        # the supported features of the player
+        async def player_config_changed(event: MassEvent) -> None:
+            self._set_supported_features()
+            await self.async_on_update()
+            self.async_write_ha_state()
+
+        self.async_on_remove(
+            self.mass.subscribe(
+                player_config_changed, EventType.PLAYER_CONFIG_UPDATED, self.player_id
+            )
+        )
+
     @property
     def active_queue(self) -> PlayerQueue | None:
         """Return the active queue for this player (if any)."""
@@ -272,22 +276,26 @@ class MusicAssistantPlayer(MusicAssistantEntity, MediaPlayerEntity):
             self._attr_state = MediaPlayerState(player.state.value)
         else:
             self._attr_state = MediaPlayerState(STATE_OFF)
-        group_members_entity_ids: list[str] = []
+
+        group_members: list[str] = []
         if player.group_childs:
-            # translate MA group_childs to HA group_members as entity id's
-            entity_registry = er.async_get(self.hass)
-            group_members_entity_ids = [
-                entity_id
-                for child_id in player.group_childs
-                if (
-                    entity_id := entity_registry.async_get_entity_id(
-                        self.platform.domain, DOMAIN, child_id
-                    )
+            group_members = player.group_childs
+        elif player.synced_to and (parent := self.mass.players.get(player.synced_to)):
+            group_members = parent.group_childs
+
+        # translate MA group_childs to HA group_members as entity id's
+        entity_registry = er.async_get(self.hass)
+        group_members_entity_ids: list[str] = [
+            entity_id
+            for child_id in group_members
+            if (
+                entity_id := entity_registry.async_get_entity_id(
+                    self.platform.domain, DOMAIN, child_id
                 )
-            ]
-        # NOTE: we sort the group_members for now,
-        # until the MA API returns them sorted (group_childs is now a set)
-        self._attr_group_members = sorted(group_members_entity_ids)
+            )
+        ]
+
+        self._attr_group_members = group_members_entity_ids
         self._attr_volume_level = (
             player.volume_level / 100 if player.volume_level is not None else None
         )
@@ -474,6 +482,8 @@ class MusicAssistantPlayer(MusicAssistantEntity, MediaPlayerEntity):
                 album=album,
                 media_type=MediaType(media_type) if media_type else None,
             ):
+                if TYPE_CHECKING:
+                    assert item.uri is not None
                 media_uris.append(item.uri)
 
         if not media_uris:
@@ -681,3 +691,20 @@ class MusicAssistantPlayer(MusicAssistantEntity, MediaPlayerEntity):
         if isinstance(queue_option, MediaPlayerEnqueue):
             queue_option = QUEUE_OPTION_MAP.get(queue_option)
         return queue_option
+
+    def _set_supported_features(self) -> None:
+        """Set supported features based on player capabilities."""
+        supported_features = SUPPORTED_FEATURES_BASE
+        if PlayerFeature.SET_MEMBERS in self.player.supported_features:
+            supported_features |= MediaPlayerEntityFeature.GROUPING
+        if PlayerFeature.PAUSE in self.player.supported_features:
+            supported_features |= MediaPlayerEntityFeature.PAUSE
+        if self.player.mute_control != PLAYER_CONTROL_NONE:
+            supported_features |= MediaPlayerEntityFeature.VOLUME_MUTE
+        if self.player.volume_control != PLAYER_CONTROL_NONE:
+            supported_features |= MediaPlayerEntityFeature.VOLUME_STEP
+            supported_features |= MediaPlayerEntityFeature.VOLUME_SET
+        if self.player.power_control != PLAYER_CONTROL_NONE:
+            supported_features |= MediaPlayerEntityFeature.TURN_ON
+            supported_features |= MediaPlayerEntityFeature.TURN_OFF
+        self._attr_supported_features = supported_features
diff --git a/homeassistant/components/music_assistant/schemas.py b/homeassistant/components/music_assistant/schemas.py
index 9caae2ee0b4..7501d3d2038 100644
--- a/homeassistant/components/music_assistant/schemas.py
+++ b/homeassistant/components/music_assistant/schemas.py
@@ -8,13 +8,14 @@ from music_assistant_models.enums import MediaType
 import voluptuous as vol
 
 from homeassistant.const import ATTR_NAME
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import (
     ATTR_ACTIVE,
     ATTR_ALBUM,
     ATTR_ALBUMS,
     ATTR_ARTISTS,
+    ATTR_AUDIOBOOKS,
     ATTR_BIT_DEPTH,
     ATTR_CONTENT_TYPE,
     ATTR_CURRENT_INDEX,
@@ -31,6 +32,7 @@ from .const import (
     ATTR_OFFSET,
     ATTR_ORDER_BY,
     ATTR_PLAYLISTS,
+    ATTR_PODCASTS,
     ATTR_PROVIDER,
     ATTR_QUEUE_ID,
     ATTR_QUEUE_ITEM_ID,
@@ -65,20 +67,20 @@ MEDIA_ITEM_SCHEMA = vol.Schema(
 
 def media_item_dict_from_mass_item(
     mass: MusicAssistantClient,
-    item: MediaItemType | ItemMapping | None,
-) -> dict[str, Any] | None:
+    item: MediaItemType | ItemMapping,
+) -> dict[str, Any]:
     """Parse a Music Assistant MediaItem."""
-    if not item:
-        return None
-    base = {
+    base: dict[str, Any] = {
         ATTR_MEDIA_TYPE: item.media_type,
         ATTR_URI: item.uri,
         ATTR_NAME: item.name,
         ATTR_VERSION: item.version,
         ATTR_IMAGE: mass.get_media_item_image_url(item),
     }
+    artists: list[ItemMapping] | None
     if artists := getattr(item, "artists", None):
         base[ATTR_ARTISTS] = [media_item_dict_from_mass_item(mass, x) for x in artists]
+    album: ItemMapping | None
     if album := getattr(item, "album", None):
         base[ATTR_ALBUM] = media_item_dict_from_mass_item(mass, album)
     return base
@@ -101,6 +103,12 @@ SEARCH_RESULT_SCHEMA = vol.Schema(
         vol.Required(ATTR_RADIO): vol.All(
             cv.ensure_list, [vol.Schema(MEDIA_ITEM_SCHEMA)]
         ),
+        vol.Required(ATTR_AUDIOBOOKS): vol.All(
+            cv.ensure_list, [vol.Schema(MEDIA_ITEM_SCHEMA)]
+        ),
+        vol.Required(ATTR_PODCASTS): vol.All(
+            cv.ensure_list, [vol.Schema(MEDIA_ITEM_SCHEMA)]
+        ),
     },
 )
 
@@ -151,7 +159,11 @@ def queue_item_dict_from_mass_item(
         ATTR_QUEUE_ITEM_ID: item.queue_item_id,
         ATTR_NAME: item.name,
         ATTR_DURATION: item.duration,
-        ATTR_MEDIA_ITEM: media_item_dict_from_mass_item(mass, item.media_item),
+        ATTR_MEDIA_ITEM: (
+            media_item_dict_from_mass_item(mass, item.media_item)
+            if item.media_item
+            else None
+        ),
     }
     if streamdetails := item.streamdetails:
         base[ATTR_STREAM_TITLE] = streamdetails.stream_title
diff --git a/homeassistant/components/music_assistant/services.yaml b/homeassistant/components/music_assistant/services.yaml
index 73e8e2d7521..a3715ea2580 100644
--- a/homeassistant/components/music_assistant/services.yaml
+++ b/homeassistant/components/music_assistant/services.yaml
@@ -21,7 +21,10 @@ play_media:
           options:
             - artist
             - album
+            - audiobook
+            - folder
             - playlist
+            - podcast
             - track
             - radio
     artist:
@@ -118,7 +121,9 @@ search:
           options:
             - artist
             - album
+            - audiobook
             - playlist
+            - podcast
             - track
             - radio
     artist:
@@ -160,7 +165,9 @@ get_library:
           options:
             - artist
             - album
+            - audiobook
             - playlist
+            - podcast
             - track
             - radio
     favorite:
diff --git a/homeassistant/components/music_assistant/strings.json b/homeassistant/components/music_assistant/strings.json
index af366c94310..371ecdc3a86 100644
--- a/homeassistant/components/music_assistant/strings.json
+++ b/homeassistant/components/music_assistant/strings.json
@@ -7,15 +7,15 @@
         }
       },
       "manual": {
-        "title": "Manually add Music Assistant Server",
-        "description": "Enter the URL to your already running Music Assistant Server. If you do not have the Music Assistant Server running, you should install it first.",
+        "title": "Manually add Music Assistant server",
+        "description": "Enter the URL to your already running Music Assistant server. If you do not have the Music Assistant server running, you should install it first.",
         "data": {
           "url": "URL of the Music Assistant server"
         }
       },
       "discovery_confirm": {
-        "description": "Do you want to add the Music Assistant Server `{url}` to Home Assistant?",
-        "title": "Discovered Music Assistant Server"
+        "description": "Do you want to add the Music Assistant server `{url}` to Home Assistant?",
+        "title": "Discovered Music Assistant server"
       }
     },
     "error": {
@@ -34,13 +34,13 @@
   "issues": {
     "invalid_server_version": {
       "title": "The Music Assistant server is not the correct version",
-      "description": "Check if there are updates available for the Music Assistant Server and/or integration."
+      "description": "Check if there are updates available for the Music Assistant server and/or integration."
     }
   },
   "services": {
     "play_media": {
       "name": "Play media",
-      "description": "Play media on a Music Assistant player with more fine-grained control options.",
+      "description": "Plays media on a Music Assistant player with more fine-grained control options.",
       "fields": {
         "media_id": {
           "name": "Media ID(s)",
@@ -70,7 +70,7 @@
     },
     "play_announcement": {
       "name": "Play announcement",
-      "description": "Play announcement on a Music Assistant player with more fine-grained control options.",
+      "description": "Plays an announcement on a Music Assistant player with more fine-grained control options.",
       "fields": {
         "url": {
           "name": "URL",
@@ -88,7 +88,7 @@
     },
     "transfer_queue": {
       "name": "Transfer queue",
-      "description": "Transfer the player's queue to another player.",
+      "description": "Transfers a player's queue to another player.",
       "fields": {
         "source_player": {
           "name": "Source media player",
@@ -102,11 +102,11 @@
     },
     "get_queue": {
       "name": "Get playerQueue details (advanced)",
-      "description": "Get the details of the currently active queue of a Music Assistant player."
+      "description": "Retrieves the details of the currently active queue of a Music Assistant player."
     },
     "search": {
       "name": "Search Music Assistant",
-      "description": "Perform a global search on the Music Assistant library and all providers.",
+      "description": "Performs a global search on the Music Assistant library and all providers.",
       "fields": {
         "config_entry_id": {
           "name": "Music Assistant instance",
@@ -139,8 +139,8 @@
       }
     },
     "get_library": {
-      "name": "Get Library items",
-      "description": "Get items from a Music Assistant library.",
+      "name": "Get library items",
+      "description": "Retrieves items from a Music Assistant library.",
       "fields": {
         "config_entry_id": {
           "name": "[%key:component::music_assistant::services::search::fields::config_entry_id::name%]",
@@ -167,7 +167,7 @@
           "description": "Offset to start the list from."
         },
         "order_by": {
-          "name": "Order By",
+          "name": "Order by",
           "description": "Sort the list by this field."
         },
         "album_type": {
@@ -176,7 +176,7 @@
         },
         "album_artists_only": {
           "name": "Enable album artists filter (only for artist library)",
-          "description": "Only return Album Artists when listing the Artists library items."
+          "description": "Only return album artists when listing the artists library items."
         }
       }
     }
@@ -195,8 +195,11 @@
       "options": {
         "artist": "Artist",
         "album": "Album",
+        "audiobook": "Audiobook",
+        "folder": "Folder",
         "track": "Track",
         "playlist": "Playlist",
+        "podcast": "Podcast",
         "radio": "Radio"
       }
     },
diff --git a/homeassistant/components/mutesync/binary_sensor.py b/homeassistant/components/mutesync/binary_sensor.py
index 87bf246f4e0..7a9025762ef 100644
--- a/homeassistant/components/mutesync/binary_sensor.py
+++ b/homeassistant/components/mutesync/binary_sensor.py
@@ -5,7 +5,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import update_coordinator
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 
@@ -18,7 +18,7 @@ SENSORS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the mütesync button."""
     coordinator = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/mutesync/config_flow.py b/homeassistant/components/mutesync/config_flow.py
index ef03df39968..a2aacfc927e 100644
--- a/homeassistant/components/mutesync/config_flow.py
+++ b/homeassistant/components/mutesync/config_flow.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import asyncio
+import logging
 from typing import Any
 
 import aiohttp
@@ -16,6 +17,8 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DOMAIN
 
+_LOGGER = logging.getLogger(__name__)
+
 STEP_USER_DATA_SCHEMA = vol.Schema({vol.Required("host"): str})
 
 
@@ -60,7 +63,8 @@ class MuteSyncConfigFlow(ConfigFlow, domain=DOMAIN):
             errors["base"] = "cannot_connect"
         except InvalidAuth:
             errors["base"] = "invalid_auth"
-        except Exception:  # noqa: BLE001
+        except Exception:
+            _LOGGER.exception("Unexpected exception")
             errors["base"] = "unknown"
         else:
             return self.async_create_entry(
diff --git a/homeassistant/components/mvglive/sensor.py b/homeassistant/components/mvglive/sensor.py
index b482de8130c..d8b43517711 100644
--- a/homeassistant/components/mvglive/sensor.py
+++ b/homeassistant/components/mvglive/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_NAME, UnitOfTime
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/mycroft/__init__.py b/homeassistant/components/mycroft/__init__.py
index 557eca972e6..e5893e57a8e 100644
--- a/homeassistant/components/mycroft/__init__.py
+++ b/homeassistant/components/mycroft/__init__.py
@@ -4,8 +4,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 DOMAIN = "mycroft"
diff --git a/homeassistant/components/myq/__init__.py b/homeassistant/components/myq/__init__.py
index 41b36a34c20..47629006887 100644
--- a/homeassistant/components/myq/__init__.py
+++ b/homeassistant/components/myq/__init__.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import issue_registry as ir
 
@@ -29,11 +29,13 @@ async def async_setup_entry(hass: HomeAssistant, _: ConfigEntry) -> bool:
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    if all(
-        config_entry.state is ConfigEntryState.NOT_LOADED
-        for config_entry in hass.config_entries.async_entries(DOMAIN)
-        if config_entry.entry_id != entry.entry_id
-    ):
-        ir.async_delete_issue(hass, DOMAIN, DOMAIN)
-
     return True
+
+
+async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Remove a config entry."""
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
+        ir.async_delete_issue(hass, DOMAIN, DOMAIN)
+        # Remove any remaining disabled or ignored entries
+        for _entry in hass.config_entries.async_entries(DOMAIN):
+            hass.async_create_task(hass.config_entries.async_remove(_entry.entry_id))
diff --git a/homeassistant/components/mysensors/__init__.py b/homeassistant/components/mysensors/__init__.py
index 19dcce78446..e2aca8b9f01 100644
--- a/homeassistant/components/mysensors/__init__.py
+++ b/homeassistant/components/mysensors/__init__.py
@@ -17,7 +17,6 @@ from .const import (
     DOMAIN,
     MYSENSORS_DISCOVERED_NODES,
     MYSENSORS_GATEWAYS,
-    MYSENSORS_ON_UNLOAD,
     PLATFORMS,
     DevId,
     DiscoveryInfo,
@@ -62,13 +61,6 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     if not unload_ok:
         return False
 
-    key = MYSENSORS_ON_UNLOAD.format(entry.entry_id)
-    if key in hass.data[DOMAIN]:
-        for fnct in hass.data[DOMAIN][key]:
-            fnct()
-
-        hass.data[DOMAIN].pop(key)
-
     del hass.data[DOMAIN][MYSENSORS_GATEWAYS][entry.entry_id]
     hass.data[DOMAIN].pop(MYSENSORS_DISCOVERED_NODES.format(entry.entry_id), None)
 
diff --git a/homeassistant/components/mysensors/binary_sensor.py b/homeassistant/components/mysensors/binary_sensor.py
index 54f7036b79c..e950f083b5b 100644
--- a/homeassistant/components/mysensors/binary_sensor.py
+++ b/homeassistant/components/mysensors/binary_sensor.py
@@ -15,12 +15,11 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import setup_mysensors_platform
 from .const import MYSENSORS_DISCOVERY, DiscoveryInfo
 from .entity import MySensorsChildEntity
-from .helpers import on_unload
 
 
 @dataclass(frozen=True)
@@ -71,7 +70,7 @@ SENSORS: dict[str, MySensorsBinarySensorDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up this platform for a specific ConfigEntry(==Gateway)."""
 
@@ -86,9 +85,7 @@ async def async_setup_entry(
             async_add_entities=async_add_entities,
         )
 
-    on_unload(
-        hass,
-        config_entry.entry_id,
+    config_entry.async_on_unload(
         async_dispatcher_connect(
             hass,
             MYSENSORS_DISCOVERY.format(config_entry.entry_id, Platform.BINARY_SENSOR),
diff --git a/homeassistant/components/mysensors/climate.py b/homeassistant/components/mysensors/climate.py
index 23b7c47ebf3..eb54a76b8a8 100644
--- a/homeassistant/components/mysensors/climate.py
+++ b/homeassistant/components/mysensors/climate.py
@@ -15,13 +15,12 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, Platform, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.unit_system import METRIC_SYSTEM
 
 from . import setup_mysensors_platform
 from .const import MYSENSORS_DISCOVERY, DiscoveryInfo
 from .entity import MySensorsChildEntity
-from .helpers import on_unload
 
 DICT_HA_TO_MYS = {
     HVACMode.AUTO: "AutoChangeOver",
@@ -43,7 +42,7 @@ OPERATION_LIST = [HVACMode.OFF, HVACMode.AUTO, HVACMode.COOL, HVACMode.HEAT]
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up this platform for a specific ConfigEntry(==Gateway)."""
 
@@ -57,9 +56,7 @@ async def async_setup_entry(
             async_add_entities=async_add_entities,
         )
 
-    on_unload(
-        hass,
-        config_entry.entry_id,
+    config_entry.async_on_unload(
         async_dispatcher_connect(
             hass,
             MYSENSORS_DISCOVERY.format(config_entry.entry_id, Platform.CLIMATE),
@@ -85,7 +82,10 @@ class MySensorsHVAC(MySensorsChildEntity, ClimateEntity):
             and set_req.V_HVAC_SETPOINT_HEAT in self._values
         ):
             features = features | ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
-        else:
+        elif (
+            set_req.V_HVAC_SETPOINT_COOL in self._values
+            or set_req.V_HVAC_SETPOINT_HEAT in self._values
+        ):
             features = features | ClimateEntityFeature.TARGET_TEMPERATURE
         return features
 
@@ -111,13 +111,11 @@ class MySensorsHVAC(MySensorsChildEntity, ClimateEntity):
 
     @property
     def target_temperature(self) -> float | None:
-        """Return the temperature we try to reach."""
+        """Return the temperature we try to reach.
+
+        Either V_HVAC_SETPOINT_COOL or V_HVAC_SETPOINT_HEAT may be used.
+        """
         set_req = self.gateway.const.SetReq
-        if (
-            set_req.V_HVAC_SETPOINT_COOL in self._values
-            and set_req.V_HVAC_SETPOINT_HEAT in self._values
-        ):
-            return None
         temp = self._values.get(set_req.V_HVAC_SETPOINT_COOL)
         if temp is None:
             temp = self._values.get(set_req.V_HVAC_SETPOINT_HEAT)
@@ -127,21 +125,13 @@ class MySensorsHVAC(MySensorsChildEntity, ClimateEntity):
     def target_temperature_high(self) -> float | None:
         """Return the highbound target temperature we try to reach."""
         set_req = self.gateway.const.SetReq
-        if set_req.V_HVAC_SETPOINT_HEAT in self._values:
-            temp = self._values.get(set_req.V_HVAC_SETPOINT_COOL)
-            return float(temp) if temp is not None else None
-
-        return None
+        return float(self._values[set_req.V_HVAC_SETPOINT_COOL])
 
     @property
     def target_temperature_low(self) -> float | None:
         """Return the lowbound target temperature we try to reach."""
         set_req = self.gateway.const.SetReq
-        if set_req.V_HVAC_SETPOINT_COOL in self._values:
-            temp = self._values.get(set_req.V_HVAC_SETPOINT_HEAT)
-            return float(temp) if temp is not None else None
-
-        return None
+        return float(self._values[set_req.V_HVAC_SETPOINT_HEAT])
 
     @property
     def hvac_mode(self) -> HVACMode:
@@ -185,10 +175,6 @@ class MySensorsHVAC(MySensorsChildEntity, ClimateEntity):
             self.gateway.set_child_value(
                 self.node_id, self.child_id, value_type, value, ack=1
             )
-            if self.assumed_state:
-                # Optimistically assume that device has changed state
-                self._values[value_type] = value
-                self.async_write_ha_state()
 
     async def async_set_fan_mode(self, fan_mode: str) -> None:
         """Set new target temperature."""
@@ -196,10 +182,6 @@ class MySensorsHVAC(MySensorsChildEntity, ClimateEntity):
         self.gateway.set_child_value(
             self.node_id, self.child_id, set_req.V_HVAC_SPEED, fan_mode, ack=1
         )
-        if self.assumed_state:
-            # Optimistically assume that device has changed state
-            self._values[set_req.V_HVAC_SPEED] = fan_mode
-            self.async_write_ha_state()
 
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set new target temperature."""
@@ -210,10 +192,6 @@ class MySensorsHVAC(MySensorsChildEntity, ClimateEntity):
             DICT_HA_TO_MYS[hvac_mode],
             ack=1,
         )
-        if self.assumed_state:
-            # Optimistically assume that device has changed state
-            self._values[self.value_type] = hvac_mode
-            self.async_write_ha_state()
 
     @callback
     def _async_update(self) -> None:
diff --git a/homeassistant/components/mysensors/config_flow.py b/homeassistant/components/mysensors/config_flow.py
index f3fb03ffac8..e616e325835 100644
--- a/homeassistant/components/mysensors/config_flow.py
+++ b/homeassistant/components/mysensors/config_flow.py
@@ -20,8 +20,7 @@ from homeassistant.components.mqtt import (
 from homeassistant.config_entries import ConfigEntry, ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_DEVICE
 from homeassistant.core import callback
-from homeassistant.helpers import selector
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, selector
 from homeassistant.helpers.typing import VolDictType
 
 from .const import (
diff --git a/homeassistant/components/mysensors/const.py b/homeassistant/components/mysensors/const.py
index a65b46616d3..a87b78b549e 100644
--- a/homeassistant/components/mysensors/const.py
+++ b/homeassistant/components/mysensors/const.py
@@ -34,7 +34,6 @@ CHILD_CALLBACK: str = "mysensors_child_callback_{}_{}_{}_{}"
 NODE_CALLBACK: str = "mysensors_node_callback_{}_{}"
 MYSENSORS_DISCOVERY: str = "mysensors_discovery_{}_{}"
 MYSENSORS_NODE_DISCOVERY: str = "mysensors_node_discovery"
-MYSENSORS_ON_UNLOAD: str = "mysensors_on_unload_{}"
 TYPE: Final = "type"
 UPDATE_DELAY: float = 0.1
 
diff --git a/homeassistant/components/mysensors/cover.py b/homeassistant/components/mysensors/cover.py
index 808589b9022..84346a5d10a 100644
--- a/homeassistant/components/mysensors/cover.py
+++ b/homeassistant/components/mysensors/cover.py
@@ -7,15 +7,14 @@ from typing import Any
 
 from homeassistant.components.cover import ATTR_POSITION, CoverEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import STATE_OFF, STATE_ON, Platform
+from homeassistant.const import STATE_ON, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import setup_mysensors_platform
 from .const import MYSENSORS_DISCOVERY, DiscoveryInfo
 from .entity import MySensorsChildEntity
-from .helpers import on_unload
 
 
 @unique
@@ -31,7 +30,7 @@ class CoverState(Enum):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up this platform for a specific ConfigEntry(==Gateway)."""
 
@@ -45,9 +44,7 @@ async def async_setup_entry(
             async_add_entities=async_add_entities,
         )
 
-    on_unload(
-        hass,
-        config_entry.entry_id,
+    config_entry.async_on_unload(
         async_dispatcher_connect(
             hass,
             MYSENSORS_DISCOVERY.format(config_entry.entry_id, Platform.COVER),
@@ -113,13 +110,6 @@ class MySensorsCover(MySensorsChildEntity, CoverEntity):
         self.gateway.set_child_value(
             self.node_id, self.child_id, set_req.V_UP, 1, ack=1
         )
-        if self.assumed_state:
-            # Optimistically assume that cover has changed state.
-            if set_req.V_DIMMER in self._values:
-                self._values[set_req.V_DIMMER] = 100
-            else:
-                self._values[set_req.V_LIGHT] = STATE_ON
-            self.async_write_ha_state()
 
     async def async_close_cover(self, **kwargs: Any) -> None:
         """Move the cover down."""
@@ -127,13 +117,6 @@ class MySensorsCover(MySensorsChildEntity, CoverEntity):
         self.gateway.set_child_value(
             self.node_id, self.child_id, set_req.V_DOWN, 1, ack=1
         )
-        if self.assumed_state:
-            # Optimistically assume that cover has changed state.
-            if set_req.V_DIMMER in self._values:
-                self._values[set_req.V_DIMMER] = 0
-            else:
-                self._values[set_req.V_LIGHT] = STATE_OFF
-            self.async_write_ha_state()
 
     async def async_set_cover_position(self, **kwargs: Any) -> None:
         """Move the cover to a specific position."""
@@ -142,10 +125,6 @@ class MySensorsCover(MySensorsChildEntity, CoverEntity):
         self.gateway.set_child_value(
             self.node_id, self.child_id, set_req.V_DIMMER, position, ack=1
         )
-        if self.assumed_state:
-            # Optimistically assume that cover has changed state.
-            self._values[set_req.V_DIMMER] = position
-            self.async_write_ha_state()
 
     async def async_stop_cover(self, **kwargs: Any) -> None:
         """Stop the device."""
diff --git a/homeassistant/components/mysensors/device_tracker.py b/homeassistant/components/mysensors/device_tracker.py
index 5abe6a64e2d..e6368b0b81d 100644
--- a/homeassistant/components/mysensors/device_tracker.py
+++ b/homeassistant/components/mysensors/device_tracker.py
@@ -7,18 +7,17 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import setup_mysensors_platform
 from .const import MYSENSORS_DISCOVERY, DiscoveryInfo
 from .entity import MySensorsChildEntity
-from .helpers import on_unload
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up this platform for a specific ConfigEntry(==Gateway)."""
 
@@ -33,9 +32,7 @@ async def async_setup_entry(
             async_add_entities=async_add_entities,
         )
 
-    on_unload(
-        hass,
-        config_entry.entry_id,
+    config_entry.async_on_unload(
         async_dispatcher_connect(
             hass,
             MYSENSORS_DISCOVERY.format(config_entry.entry_id, Platform.DEVICE_TRACKER),
diff --git a/homeassistant/components/mysensors/gateway.py b/homeassistant/components/mysensors/gateway.py
index fa3464c0088..91453ea3306 100644
--- a/homeassistant/components/mysensors/gateway.py
+++ b/homeassistant/components/mysensors/gateway.py
@@ -22,7 +22,7 @@ from homeassistant.components.mqtt import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DEVICE, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import Event, HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
 from homeassistant.setup import SetupPhases, async_pause_setup
 from homeassistant.util.unit_system import METRIC_SYSTEM
@@ -47,7 +47,6 @@ from .handler import HANDLERS
 from .helpers import (
     discover_mysensors_node,
     discover_mysensors_platform,
-    on_unload,
     validate_child,
     validate_node,
 )
@@ -293,9 +292,7 @@ async def _gw_start(
         """Stop the gateway."""
         await gw_stop(hass, entry, gateway)
 
-    on_unload(
-        hass,
-        entry.entry_id,
+    entry.async_on_unload(
         hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, stop_this_gw),
     )
 
diff --git a/homeassistant/components/mysensors/helpers.py b/homeassistant/components/mysensors/helpers.py
index 74dc99e76d3..9ed41dfe4e9 100644
--- a/homeassistant/components/mysensors/helpers.py
+++ b/homeassistant/components/mysensors/helpers.py
@@ -14,7 +14,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_NAME, Platform
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.util.decorator import Registry
 
@@ -27,7 +27,6 @@ from .const import (
     MYSENSORS_DISCOVERED_NODES,
     MYSENSORS_DISCOVERY,
     MYSENSORS_NODE_DISCOVERY,
-    MYSENSORS_ON_UNLOAD,
     TYPE_TO_PLATFORMS,
     DevId,
     GatewayId,
@@ -41,18 +40,6 @@ SCHEMAS: Registry[
 ] = Registry()
 
 
-@callback
-def on_unload(hass: HomeAssistant, gateway_id: GatewayId, fnct: Callable) -> None:
-    """Register a callback to be called when entry is unloaded.
-
-    This function is used by platforms to cleanup after themselves.
-    """
-    key = MYSENSORS_ON_UNLOAD.format(gateway_id)
-    if key not in hass.data[DOMAIN]:
-        hass.data[DOMAIN][key] = []
-    hass.data[DOMAIN][key].append(fnct)
-
-
 @callback
 def discover_mysensors_platform(
     hass: HomeAssistant, gateway_id: GatewayId, platform: str, new_devices: list[DevId]
diff --git a/homeassistant/components/mysensors/light.py b/homeassistant/components/mysensors/light.py
index 87f60174cab..fa5e625c72b 100644
--- a/homeassistant/components/mysensors/light.py
+++ b/homeassistant/components/mysensors/light.py
@@ -12,22 +12,21 @@ from homeassistant.components.light import (
     LightEntity,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import STATE_OFF, STATE_ON, Platform
+from homeassistant.const import STATE_ON, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.color import rgb_hex_to_rgb_list
 
 from . import setup_mysensors_platform
 from .const import MYSENSORS_DISCOVERY, DiscoveryInfo, SensorType
 from .entity import MySensorsChildEntity
-from .helpers import on_unload
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up this platform for a specific ConfigEntry(==Gateway)."""
     device_class_map: dict[SensorType, type[MySensorsChildEntity]] = {
@@ -46,9 +45,7 @@ async def async_setup_entry(
             async_add_entities=async_add_entities,
         )
 
-    on_unload(
-        hass,
-        config_entry.entry_id,
+    config_entry.async_on_unload(
         async_dispatcher_connect(
             hass,
             MYSENSORS_DISCOVERY.format(config_entry.entry_id, Platform.LIGHT),
@@ -80,11 +77,6 @@ class MySensorsLight(MySensorsChildEntity, LightEntity):
             self.node_id, self.child_id, set_req.V_LIGHT, 1, ack=1
         )
 
-        if self.assumed_state:
-            # optimistically assume that light has changed state
-            self._state = True
-            self._values[set_req.V_LIGHT] = STATE_ON
-
     def _turn_on_dimmer(self, **kwargs: Any) -> None:
         """Turn on dimmer child device."""
         set_req = self.gateway.const.SetReq
@@ -101,20 +93,10 @@ class MySensorsLight(MySensorsChildEntity, LightEntity):
             self.node_id, self.child_id, set_req.V_DIMMER, percent, ack=1
         )
 
-        if self.assumed_state:
-            # optimistically assume that light has changed state
-            self._attr_brightness = brightness
-            self._values[set_req.V_DIMMER] = percent
-
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the device off."""
         value_type = self.gateway.const.SetReq.V_LIGHT
         self.gateway.set_child_value(self.node_id, self.child_id, value_type, 0, ack=1)
-        if self.assumed_state:
-            # optimistically assume that light has changed state
-            self._state = False
-            self._values[value_type] = STATE_OFF
-            self.async_write_ha_state()
 
     @callback
     def _async_update_light(self) -> None:
@@ -142,8 +124,6 @@ class MySensorsLightDimmer(MySensorsLight):
         """Turn the device on."""
         self._turn_on_light()
         self._turn_on_dimmer(**kwargs)
-        if self.assumed_state:
-            self.async_write_ha_state()
 
     @callback
     def _async_update(self) -> None:
@@ -164,8 +144,6 @@ class MySensorsLightRGB(MySensorsLight):
         self._turn_on_light()
         self._turn_on_dimmer(**kwargs)
         self._turn_on_rgb(**kwargs)
-        if self.assumed_state:
-            self.async_write_ha_state()
 
     def _turn_on_rgb(self, **kwargs: Any) -> None:
         """Turn on RGB child device."""
@@ -179,11 +157,6 @@ class MySensorsLightRGB(MySensorsLight):
             self.node_id, self.child_id, self.value_type, hex_color, ack=1
         )
 
-        if self.assumed_state:
-            # optimistically assume that light has changed state
-            self._attr_rgb_color = new_rgb
-            self._values[self.value_type] = hex_color
-
     @callback
     def _async_update(self) -> None:
         """Update the controller with the latest value from a sensor."""
@@ -212,8 +185,6 @@ class MySensorsLightRGBW(MySensorsLightRGB):
         self._turn_on_light()
         self._turn_on_dimmer(**kwargs)
         self._turn_on_rgbw(**kwargs)
-        if self.assumed_state:
-            self.async_write_ha_state()
 
     def _turn_on_rgbw(self, **kwargs: Any) -> None:
         """Turn on RGBW child device."""
@@ -227,11 +198,6 @@ class MySensorsLightRGBW(MySensorsLightRGB):
             self.node_id, self.child_id, self.value_type, hex_color, ack=1
         )
 
-        if self.assumed_state:
-            # optimistically assume that light has changed state
-            self._attr_rgbw_color = new_rgbw
-            self._values[self.value_type] = hex_color
-
     @callback
     def _async_update_rgb_or_w(self) -> None:
         """Update the controller with values from RGBW child."""
diff --git a/homeassistant/components/mysensors/remote.py b/homeassistant/components/mysensors/remote.py
index 1a4f6fdaa90..ccb67f78eba 100644
--- a/homeassistant/components/mysensors/remote.py
+++ b/homeassistant/components/mysensors/remote.py
@@ -14,18 +14,17 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import setup_mysensors_platform
 from .const import MYSENSORS_DISCOVERY, DiscoveryInfo
 from .entity import MySensorsChildEntity
-from .helpers import on_unload
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up this platform for a specific ConfigEntry(==Gateway)."""
 
@@ -40,9 +39,7 @@ async def async_setup_entry(
             async_add_entities=async_add_entities,
         )
 
-    on_unload(
-        hass,
-        config_entry.entry_id,
+    config_entry.async_on_unload(
         async_dispatcher_connect(
             hass,
             MYSENSORS_DISCOVERY.format(config_entry.entry_id, Platform.REMOTE),
diff --git a/homeassistant/components/mysensors/sensor.py b/homeassistant/components/mysensors/sensor.py
index eec3c6bcd79..3793bed8af2 100644
--- a/homeassistant/components/mysensors/sensor.py
+++ b/homeassistant/components/mysensors/sensor.py
@@ -35,7 +35,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.unit_system import METRIC_SYSTEM
 
 from . import setup_mysensors_platform
@@ -50,7 +50,6 @@ from .const import (
     NodeDiscoveryInfo,
 )
 from .entity import MySensorNodeEntity, MySensorsChildEntity
-from .helpers import on_unload
 
 SENSORS: dict[str, SensorEntityDescription] = {
     "V_TEMP": SensorEntityDescription(
@@ -102,6 +101,8 @@ SENSORS: dict[str, SensorEntityDescription] = {
         key="V_DIRECTION",
         native_unit_of_measurement=DEGREE,
         icon="mdi:compass",
+        device_class=SensorDeviceClass.WIND_DIRECTION,
+        state_class=SensorStateClass.MEASUREMENT_ANGLE,
     ),
     "V_WEIGHT": SensorEntityDescription(
         key="V_WEIGHT",
@@ -210,7 +211,7 @@ SENSORS: dict[str, SensorEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up this platform for a specific ConfigEntry(==Gateway)."""
 
@@ -232,9 +233,7 @@ async def async_setup_entry(
         gateway: BaseAsyncGateway = hass.data[DOMAIN][MYSENSORS_GATEWAYS][gateway_id]
         async_add_entities([MyBatterySensor(gateway_id, gateway, node_id)])
 
-    on_unload(
-        hass,
-        config_entry.entry_id,
+    config_entry.async_on_unload(
         async_dispatcher_connect(
             hass,
             MYSENSORS_DISCOVERY.format(config_entry.entry_id, Platform.SENSOR),
@@ -242,9 +241,7 @@ async def async_setup_entry(
         ),
     )
 
-    on_unload(
-        hass,
-        config_entry.entry_id,
+    config_entry.async_on_unload(
         async_dispatcher_connect(
             hass,
             MYSENSORS_NODE_DISCOVERY,
diff --git a/homeassistant/components/mysensors/strings.json b/homeassistant/components/mysensors/strings.json
index 30fe5f46d6b..1636cb076cc 100644
--- a/homeassistant/components/mysensors/strings.json
+++ b/homeassistant/components/mysensors/strings.json
@@ -21,16 +21,16 @@
           "device": "IP address of the gateway",
           "tcp_port": "[%key:common::config_flow::data::port%]",
           "version": "MySensors version",
-          "persistence_file": "persistence file (leave empty to auto-generate)"
+          "persistence_file": "Persistence file (leave empty to auto-generate)"
         }
       },
       "gw_serial": {
         "description": "Serial gateway setup",
         "data": {
           "device": "Serial port",
-          "baud_rate": "baud rate",
+          "baud_rate": "Baud rate",
           "version": "[%key:component::mysensors::config::step::gw_tcp::data::version%]",
-          "persistence_file": "Persistence file (leave empty to auto-generate)"
+          "persistence_file": "[%key:component::mysensors::config::step::gw_tcp::data::persistence_file%]"
         }
       },
       "gw_mqtt": {
@@ -40,7 +40,7 @@
           "topic_in_prefix": "Prefix for input topics (topic_in_prefix)",
           "topic_out_prefix": "Prefix for output topics (topic_out_prefix)",
           "version": "[%key:component::mysensors::config::step::gw_tcp::data::version%]",
-          "persistence_file": "[%key:component::mysensors::config::step::gw_serial::data::persistence_file%]"
+          "persistence_file": "[%key:component::mysensors::config::step::gw_tcp::data::persistence_file%]"
         }
       }
     },
diff --git a/homeassistant/components/mysensors/switch.py b/homeassistant/components/mysensors/switch.py
index 4eabf6374f1..9b57102a94c 100644
--- a/homeassistant/components/mysensors/switch.py
+++ b/homeassistant/components/mysensors/switch.py
@@ -6,21 +6,20 @@ from typing import Any
 
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import STATE_OFF, STATE_ON, Platform
+from homeassistant.const import STATE_ON, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import setup_mysensors_platform
 from .const import MYSENSORS_DISCOVERY, DiscoveryInfo, SensorType
 from .entity import MySensorsChildEntity
-from .helpers import on_unload
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up this platform for a specific ConfigEntry(==Gateway)."""
     device_class_map: dict[SensorType, type[MySensorsSwitch]] = {
@@ -48,9 +47,7 @@ async def async_setup_entry(
             async_add_entities=async_add_entities,
         )
 
-    on_unload(
-        hass,
-        config_entry.entry_id,
+    config_entry.async_on_unload(
         async_dispatcher_connect(
             hass,
             MYSENSORS_DISCOVERY.format(config_entry.entry_id, Platform.SWITCH),
@@ -72,17 +69,9 @@ class MySensorsSwitch(MySensorsChildEntity, SwitchEntity):
         self.gateway.set_child_value(
             self.node_id, self.child_id, self.value_type, 1, ack=1
         )
-        if self.assumed_state:
-            # Optimistically assume that switch has changed state
-            self._values[self.value_type] = STATE_ON
-            self.async_write_ha_state()
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the switch off."""
         self.gateway.set_child_value(
             self.node_id, self.child_id, self.value_type, 0, ack=1
         )
-        if self.assumed_state:
-            # Optimistically assume that switch has changed state
-            self._values[self.value_type] = STATE_OFF
-            self.async_write_ha_state()
diff --git a/homeassistant/components/mysensors/text.py b/homeassistant/components/mysensors/text.py
index 4edb5ccdbd8..9fdd9da5345 100644
--- a/homeassistant/components/mysensors/text.py
+++ b/homeassistant/components/mysensors/text.py
@@ -7,18 +7,17 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import setup_mysensors_platform
 from .const import MYSENSORS_DISCOVERY, DiscoveryInfo
 from .entity import MySensorsChildEntity
-from .helpers import on_unload
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up this platform for a specific ConfigEntry(==Gateway)."""
 
@@ -33,9 +32,7 @@ async def async_setup_entry(
             async_add_entities=async_add_entities,
         )
 
-    on_unload(
-        hass,
-        config_entry.entry_id,
+    config_entry.async_on_unload(
         async_dispatcher_connect(
             hass,
             MYSENSORS_DISCOVERY.format(config_entry.entry_id, Platform.TEXT),
diff --git a/homeassistant/components/mystrom/light.py b/homeassistant/components/mystrom/light.py
index 5dabb609437..3942f601a20 100644
--- a/homeassistant/components/mystrom/light.py
+++ b/homeassistant/components/mystrom/light.py
@@ -18,7 +18,7 @@ from homeassistant.components.light import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, MANUFACTURER
 
@@ -31,7 +31,9 @@ EFFECT_SUNRISE = "sunrise"
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the myStrom entities."""
     info = hass.data[DOMAIN][entry.entry_id].info
diff --git a/homeassistant/components/mystrom/sensor.py b/homeassistant/components/mystrom/sensor.py
index 2c35d35dad6..bd5c9b923a2 100644
--- a/homeassistant/components/mystrom/sensor.py
+++ b/homeassistant/components/mystrom/sensor.py
@@ -17,7 +17,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfPower, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, MANUFACTURER
 
@@ -55,7 +55,9 @@ SENSOR_TYPES: tuple[MyStromSwitchSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the myStrom entities."""
     device: MyStromSwitch = hass.data[DOMAIN][entry.entry_id].device
diff --git a/homeassistant/components/mystrom/switch.py b/homeassistant/components/mystrom/switch.py
index af135027aac..f626656a4e3 100644
--- a/homeassistant/components/mystrom/switch.py
+++ b/homeassistant/components/mystrom/switch.py
@@ -11,7 +11,7 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo, format_mac
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, MANUFACTURER
 
@@ -21,7 +21,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the myStrom entities."""
     device = hass.data[DOMAIN][entry.entry_id].device
diff --git a/homeassistant/components/mythicbeastsdns/__init__.py b/homeassistant/components/mythicbeastsdns/__init__.py
index f4de18aa0ef..58ac6051c8a 100644
--- a/homeassistant/components/mythicbeastsdns/__init__.py
+++ b/homeassistant/components/mythicbeastsdns/__init__.py
@@ -12,8 +12,8 @@ from homeassistant.const import (
     CONF_SCAN_INTERVAL,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/myuplink/__init__.py b/homeassistant/components/myuplink/__init__.py
index 5ad114e973e..407e4da5475 100644
--- a/homeassistant/components/myuplink/__init__.py
+++ b/homeassistant/components/myuplink/__init__.py
@@ -9,7 +9,6 @@ from aiohttp import ClientError, ClientResponseError
 import jwt
 from myuplink import MyUplinkAPI, get_manufacturer, get_model, get_system_name
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
@@ -22,7 +21,7 @@ from homeassistant.helpers.device_registry import DeviceEntry
 
 from .api import AsyncConfigEntryAuth
 from .const import DOMAIN, OAUTH2_SCOPES
-from .coordinator import MyUplinkDataCoordinator
+from .coordinator import MyUplinkConfigEntry, MyUplinkDataCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -35,8 +34,6 @@ PLATFORMS: list[Platform] = [
     Platform.UPDATE,
 ]
 
-type MyUplinkConfigEntry = ConfigEntry[MyUplinkDataCoordinator]
-
 
 async def async_setup_entry(
     hass: HomeAssistant, config_entry: MyUplinkConfigEntry
@@ -77,7 +74,7 @@ async def async_setup_entry(
 
     # Setup MyUplinkAPI and coordinator for data fetch
     api = MyUplinkAPI(auth)
-    coordinator = MyUplinkDataCoordinator(hass, api)
+    coordinator = MyUplinkDataCoordinator(hass, config_entry, api)
     await coordinator.async_config_entry_first_refresh()
     config_entry.runtime_data = coordinator
 
diff --git a/homeassistant/components/myuplink/binary_sensor.py b/homeassistant/components/myuplink/binary_sensor.py
index d903c7cbfae..785a7ff4532 100644
--- a/homeassistant/components/myuplink/binary_sensor.py
+++ b/homeassistant/components/myuplink/binary_sensor.py
@@ -9,10 +9,10 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import MyUplinkConfigEntry, MyUplinkDataCoordinator
 from .const import F_SERIES
+from .coordinator import MyUplinkConfigEntry, MyUplinkDataCoordinator
 from .entity import MyUplinkEntity, MyUplinkSystemEntity
 from .helpers import find_matching_platform, transform_model_series
 
@@ -58,7 +58,7 @@ def get_description(device_point: DevicePoint) -> BinarySensorEntityDescription
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: MyUplinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up myUplink binary_sensor."""
     entities: list[BinarySensorEntity] = []
diff --git a/homeassistant/components/myuplink/coordinator.py b/homeassistant/components/myuplink/coordinator.py
index 211fd894ac5..6bf762ad642 100644
--- a/homeassistant/components/myuplink/coordinator.py
+++ b/homeassistant/components/myuplink/coordinator.py
@@ -7,6 +7,7 @@ import logging
 
 from myuplink import Device, DevicePoint, MyUplinkAPI, System
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -23,14 +24,22 @@ class CoordinatorData:
     time: datetime
 
 
+type MyUplinkConfigEntry = ConfigEntry[MyUplinkDataCoordinator]
+
+
 class MyUplinkDataCoordinator(DataUpdateCoordinator[CoordinatorData]):
     """Coordinator for myUplink data."""
 
-    def __init__(self, hass: HomeAssistant, api: MyUplinkAPI) -> None:
+    config_entry: MyUplinkConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: MyUplinkConfigEntry, api: MyUplinkAPI
+    ) -> None:
         """Initialize myUplink coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="myuplink",
             update_interval=timedelta(seconds=60),
         )
diff --git a/homeassistant/components/myuplink/diagnostics.py b/homeassistant/components/myuplink/diagnostics.py
index 5e26cf273b4..61605a04fc8 100644
--- a/homeassistant/components/myuplink/diagnostics.py
+++ b/homeassistant/components/myuplink/diagnostics.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.core import HomeAssistant
 
-from . import MyUplinkConfigEntry
+from .coordinator import MyUplinkConfigEntry
 
 TO_REDACT = {"access_token", "refresh_token", "serialNumber"}
 
diff --git a/homeassistant/components/myuplink/number.py b/homeassistant/components/myuplink/number.py
index e1cbd393947..33100850837 100644
--- a/homeassistant/components/myuplink/number.py
+++ b/homeassistant/components/myuplink/number.py
@@ -7,10 +7,10 @@ from homeassistant.components.number import NumberEntity, NumberEntityDescriptio
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import MyUplinkConfigEntry, MyUplinkDataCoordinator
 from .const import DOMAIN, F_SERIES
+from .coordinator import MyUplinkConfigEntry, MyUplinkDataCoordinator
 from .entity import MyUplinkEntity
 from .helpers import find_matching_platform, skip_entity, transform_model_series
 
@@ -63,7 +63,7 @@ def get_description(device_point: DevicePoint) -> NumberEntityDescription | None
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: MyUplinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up myUplink number."""
     entities: list[NumberEntity] = []
diff --git a/homeassistant/components/myuplink/select.py b/homeassistant/components/myuplink/select.py
index 0074d1c75ff..36f9be63669 100644
--- a/homeassistant/components/myuplink/select.py
+++ b/homeassistant/components/myuplink/select.py
@@ -9,10 +9,10 @@ from homeassistant.components.select import SelectEntity
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import MyUplinkConfigEntry, MyUplinkDataCoordinator
 from .const import DOMAIN
+from .coordinator import MyUplinkConfigEntry, MyUplinkDataCoordinator
 from .entity import MyUplinkEntity
 from .helpers import find_matching_platform, skip_entity
 
@@ -20,7 +20,7 @@ from .helpers import find_matching_platform, skip_entity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: MyUplinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up myUplink select."""
     entities: list[SelectEntity] = []
diff --git a/homeassistant/components/myuplink/sensor.py b/homeassistant/components/myuplink/sensor.py
index fa50e8a7001..3b14cdd4630 100644
--- a/homeassistant/components/myuplink/sensor.py
+++ b/homeassistant/components/myuplink/sensor.py
@@ -21,11 +21,11 @@ from homeassistant.const import (
     UnitOfVolumeFlowRate,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import MyUplinkConfigEntry, MyUplinkDataCoordinator
 from .const import F_SERIES
+from .coordinator import MyUplinkConfigEntry, MyUplinkDataCoordinator
 from .entity import MyUplinkEntity
 from .helpers import find_matching_platform, skip_entity, transform_model_series
 
@@ -214,7 +214,7 @@ def get_description(device_point: DevicePoint) -> SensorEntityDescription | None
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: MyUplinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up myUplink sensor."""
 
diff --git a/homeassistant/components/myuplink/switch.py b/homeassistant/components/myuplink/switch.py
index 3addc7ce6a9..2d3706f2bdb 100644
--- a/homeassistant/components/myuplink/switch.py
+++ b/homeassistant/components/myuplink/switch.py
@@ -9,10 +9,10 @@ from homeassistant.components.switch import SwitchEntity, SwitchEntityDescriptio
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import MyUplinkConfigEntry, MyUplinkDataCoordinator
 from .const import DOMAIN, F_SERIES
+from .coordinator import MyUplinkConfigEntry, MyUplinkDataCoordinator
 from .entity import MyUplinkEntity
 from .helpers import find_matching_platform, skip_entity, transform_model_series
 
@@ -55,7 +55,7 @@ def get_description(device_point: DevicePoint) -> SwitchEntityDescription | None
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: MyUplinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up myUplink switch."""
     entities: list[SwitchEntity] = []
diff --git a/homeassistant/components/myuplink/update.py b/homeassistant/components/myuplink/update.py
index 9e94de0a503..ee259f5cbe8 100644
--- a/homeassistant/components/myuplink/update.py
+++ b/homeassistant/components/myuplink/update.py
@@ -6,9 +6,9 @@ from homeassistant.components.update import (
     UpdateEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import MyUplinkConfigEntry, MyUplinkDataCoordinator
+from .coordinator import MyUplinkConfigEntry, MyUplinkDataCoordinator
 from .entity import MyUplinkEntity
 
 UPDATE_DESCRIPTION = UpdateEntityDescription(
@@ -20,7 +20,7 @@ UPDATE_DESCRIPTION = UpdateEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: MyUplinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up update entity."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/nad/media_player.py b/homeassistant/components/nad/media_player.py
index e3c22b42d28..c1efa18f72b 100644
--- a/homeassistant/components/nad/media_player.py
+++ b/homeassistant/components/nad/media_player.py
@@ -13,7 +13,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT, CONF_TYPE
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/nam/__init__.py b/homeassistant/components/nam/__init__.py
index 624415adb12..d297443c059 100644
--- a/homeassistant/components/nam/__init__.py
+++ b/homeassistant/components/nam/__init__.py
@@ -3,9 +3,8 @@
 from __future__ import annotations
 
 import logging
-from typing import TYPE_CHECKING
 
-from aiohttp.client_exceptions import ClientConnectorError, ClientError
+from aiohttp.client_exceptions import ClientError
 from nettigo_air_monitor import (
     ApiError,
     AuthFailedError,
@@ -14,7 +13,6 @@ from nettigo_air_monitor import (
 )
 
 from homeassistant.components.air_quality import DOMAIN as AIR_QUALITY_PLATFORM
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
@@ -22,14 +20,12 @@ from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import ATTR_SDS011, ATTR_SPS30, DOMAIN
-from .coordinator import NAMDataUpdateCoordinator
+from .coordinator import NAMConfigEntry, NAMDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS = [Platform.BUTTON, Platform.SENSOR]
 
-type NAMConfigEntry = ConfigEntry[NAMDataUpdateCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: NAMConfigEntry) -> bool:
     """Set up Nettigo as config entry."""
@@ -42,20 +38,29 @@ async def async_setup_entry(hass: HomeAssistant, entry: NAMConfigEntry) -> bool:
     options = ConnectionOptions(host=host, username=username, password=password)
     try:
         nam = await NettigoAirMonitor.create(websession, options)
-    except (ApiError, ClientError, ClientConnectorError, TimeoutError) as err:
-        raise ConfigEntryNotReady from err
+    except (ApiError, ClientError) as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="device_communication_error",
+            translation_placeholders={"device": entry.title},
+        ) from err
 
     try:
         await nam.async_check_credentials()
-    except ApiError as err:
-        raise ConfigEntryNotReady from err
+    except (ApiError, ClientError) as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="device_communication_error",
+            translation_placeholders={"device": entry.title},
+        ) from err
     except AuthFailedError as err:
-        raise ConfigEntryAuthFailed from err
+        raise ConfigEntryAuthFailed(
+            translation_domain=DOMAIN,
+            translation_key="auth_error",
+            translation_placeholders={"device": entry.title},
+        ) from err
 
-    if TYPE_CHECKING:
-        assert entry.unique_id
-
-    coordinator = NAMDataUpdateCoordinator(hass, nam, entry.unique_id)
+    coordinator = NAMDataUpdateCoordinator(hass, entry, nam)
     await coordinator.async_config_entry_first_refresh()
 
     entry.runtime_data = coordinator
diff --git a/homeassistant/components/nam/button.py b/homeassistant/components/nam/button.py
index 8ac56f3d70e..791a5fdc27c 100644
--- a/homeassistant/components/nam/button.py
+++ b/homeassistant/components/nam/button.py
@@ -4,6 +4,9 @@ from __future__ import annotations
 
 import logging
 
+from aiohttp.client_exceptions import ClientError
+from nettigo_air_monitor import ApiError, AuthFailedError
+
 from homeassistant.components.button import (
     ButtonDeviceClass,
     ButtonEntity,
@@ -11,10 +14,12 @@ from homeassistant.components.button import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import NAMConfigEntry, NAMDataUpdateCoordinator
+from .const import DOMAIN
+from .coordinator import NAMConfigEntry, NAMDataUpdateCoordinator
 
 PARALLEL_UPDATES = 1
 
@@ -28,7 +33,9 @@ RESTART_BUTTON: ButtonEntityDescription = ButtonEntityDescription(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: NAMConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: NAMConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add a Nettigo Air Monitor entities from a config_entry."""
     coordinator = entry.runtime_data
@@ -57,4 +64,16 @@ class NAMButton(CoordinatorEntity[NAMDataUpdateCoordinator], ButtonEntity):
 
     async def async_press(self) -> None:
         """Triggers the restart."""
-        await self.coordinator.nam.async_restart()
+        try:
+            await self.coordinator.nam.async_restart()
+        except (ApiError, ClientError) as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="device_communication_action_error",
+                translation_placeholders={
+                    "entity": self.entity_id,
+                    "device": self.coordinator.config_entry.title,
+                },
+            ) from err
+        except AuthFailedError:
+            self.coordinator.config_entry.async_start_reauth(self.hass)
diff --git a/homeassistant/components/nam/const.py b/homeassistant/components/nam/const.py
index 4b7b50b309a..2dedcf3c68a 100644
--- a/homeassistant/components/nam/const.py
+++ b/homeassistant/components/nam/const.py
@@ -11,6 +11,7 @@ SUFFIX_P1: Final = "_p1"
 SUFFIX_P2: Final = "_p2"
 SUFFIX_P4: Final = "_p4"
 
+ATTR_BH1750_ILLUMINANCE: Final = "bh1750_illuminance"
 ATTR_BME280_HUMIDITY: Final = "bme280_humidity"
 ATTR_BME280_PRESSURE: Final = "bme280_pressure"
 ATTR_BME280_TEMPERATURE: Final = "bme280_temperature"
diff --git a/homeassistant/components/nam/coordinator.py b/homeassistant/components/nam/coordinator.py
index 5019f0e3a1d..8a898dee378 100644
--- a/homeassistant/components/nam/coordinator.py
+++ b/homeassistant/components/nam/coordinator.py
@@ -1,6 +1,7 @@
 """The Nettigo Air Monitor coordinator."""
 
 import logging
+from typing import TYPE_CHECKING
 
 from nettigo_air_monitor import (
     ApiError,
@@ -10,6 +11,7 @@ from nettigo_air_monitor import (
 )
 from tenacity import RetryError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -18,20 +20,28 @@ from .const import DEFAULT_UPDATE_INTERVAL, DOMAIN, MANUFACTURER
 
 _LOGGER = logging.getLogger(__name__)
 
+type NAMConfigEntry = ConfigEntry[NAMDataUpdateCoordinator]
+
 
 class NAMDataUpdateCoordinator(DataUpdateCoordinator[NAMSensors]):
     """Class to manage fetching Nettigo Air Monitor data."""
 
+    config_entry: NAMConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: NAMConfigEntry,
         nam: NettigoAirMonitor,
-        unique_id: str,
     ) -> None:
         """Initialize."""
-        self.unique_id = unique_id
+        if TYPE_CHECKING:
+            assert config_entry.unique_id
+
+        self.unique_id = config_entry.unique_id
+
         self.device_info = DeviceInfo(
-            connections={(CONNECTION_NETWORK_MAC, unique_id)},
+            connections={(CONNECTION_NETWORK_MAC, self.unique_id)},
             name="Nettigo Air Monitor",
             sw_version=nam.software_version,
             manufacturer=MANUFACTURER,
@@ -40,7 +50,11 @@ class NAMDataUpdateCoordinator(DataUpdateCoordinator[NAMSensors]):
         self.nam = nam
 
         super().__init__(
-            hass, _LOGGER, name=DOMAIN, update_interval=DEFAULT_UPDATE_INTERVAL
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=DEFAULT_UPDATE_INTERVAL,
         )
 
     async def _async_update_data(self) -> NAMSensors:
@@ -50,6 +64,10 @@ class NAMDataUpdateCoordinator(DataUpdateCoordinator[NAMSensors]):
         # We do not need to catch AuthFailed exception here because sensor data is
         # always available without authorization.
         except (ApiError, InvalidSensorDataError, RetryError) as error:
-            raise UpdateFailed(error) from error
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="update_error",
+                translation_placeholders={"device": self.config_entry.title},
+            ) from error
 
         return data
diff --git a/homeassistant/components/nam/diagnostics.py b/homeassistant/components/nam/diagnostics.py
index d29eb40ced7..905c1669496 100644
--- a/homeassistant/components/nam/diagnostics.py
+++ b/homeassistant/components/nam/diagnostics.py
@@ -9,7 +9,7 @@ from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 
-from . import NAMConfigEntry
+from .coordinator import NAMConfigEntry
 
 TO_REDACT = {CONF_PASSWORD, CONF_USERNAME}
 
diff --git a/homeassistant/components/nam/manifest.json b/homeassistant/components/nam/manifest.json
index c3a559de50b..1c3b9db7a86 100644
--- a/homeassistant/components/nam/manifest.json
+++ b/homeassistant/components/nam/manifest.json
@@ -7,7 +7,7 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["nettigo_air_monitor"],
-  "requirements": ["nettigo-air-monitor==4.0.0"],
+  "requirements": ["nettigo-air-monitor==4.1.0"],
   "zeroconf": [
     {
       "type": "_http._tcp.local.",
diff --git a/homeassistant/components/nam/sensor.py b/homeassistant/components/nam/sensor.py
index 27fae62be8a..45cfd313e8f 100644
--- a/homeassistant/components/nam/sensor.py
+++ b/homeassistant/components/nam/sensor.py
@@ -19,6 +19,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import (
     CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     CONCENTRATION_PARTS_PER_MILLION,
+    LIGHT_LUX,
     PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     EntityCategory,
@@ -27,13 +28,13 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util.dt import utcnow
 
-from . import NAMConfigEntry, NAMDataUpdateCoordinator
 from .const import (
+    ATTR_BH1750_ILLUMINANCE,
     ATTR_BME280_HUMIDITY,
     ATTR_BME280_PRESSURE,
     ATTR_BME280_TEMPERATURE,
@@ -69,6 +70,7 @@ from .const import (
     DOMAIN,
     MIGRATION_SENSORS,
 )
+from .coordinator import NAMConfigEntry, NAMDataUpdateCoordinator
 
 PARALLEL_UPDATES = 1
 
@@ -83,6 +85,15 @@ class NAMSensorEntityDescription(SensorEntityDescription):
 
 
 SENSORS: tuple[NAMSensorEntityDescription, ...] = (
+    NAMSensorEntityDescription(
+        key=ATTR_BH1750_ILLUMINANCE,
+        translation_key="bh1750_illuminance",
+        suggested_display_precision=0,
+        native_unit_of_measurement=LIGHT_LUX,
+        device_class=SensorDeviceClass.ILLUMINANCE,
+        state_class=SensorStateClass.MEASUREMENT,
+        value=lambda sensors: sensors.bh1750_illuminance,
+    ),
     NAMSensorEntityDescription(
         key=ATTR_BME280_HUMIDITY,
         translation_key="bme280_humidity",
@@ -356,7 +367,9 @@ SENSORS: tuple[NAMSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: NAMConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: NAMConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add a Nettigo Air Monitor entities from a config_entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/nam/strings.json b/homeassistant/components/nam/strings.json
index 2caa4d8bd97..000dfe74112 100644
--- a/homeassistant/components/nam/strings.json
+++ b/homeassistant/components/nam/strings.json
@@ -54,6 +54,9 @@
   },
   "entity": {
     "sensor": {
+      "bh1750_illuminance": {
+        "name": "BH1750 illuminance"
+      },
       "bme280_humidity": {
         "name": "BME280 humidity"
       },
@@ -98,6 +101,17 @@
           "medium": "Medium",
           "high": "High",
           "very_high": "Very high"
+        },
+        "state_attributes": {
+          "options": {
+            "state": {
+              "very_low": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::very_low%]",
+              "low": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::low%]",
+              "medium": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::medium%]",
+              "high": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::high%]",
+              "very_high": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::very_high%]"
+            }
+          }
         }
       },
       "pmsx003_pm1": {
@@ -120,6 +134,17 @@
           "medium": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::medium%]",
           "high": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::high%]",
           "very_high": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::very_high%]"
+        },
+        "state_attributes": {
+          "options": {
+            "state": {
+              "very_low": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::very_low%]",
+              "low": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::low%]",
+              "medium": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::medium%]",
+              "high": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::high%]",
+              "very_high": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::very_high%]"
+            }
+          }
         }
       },
       "sds011_pm10": {
@@ -145,6 +170,17 @@
           "medium": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::medium%]",
           "high": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::high%]",
           "very_high": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::very_high%]"
+        },
+        "state_attributes": {
+          "options": {
+            "state": {
+              "very_low": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::very_low%]",
+              "low": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::low%]",
+              "medium": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::medium%]",
+              "high": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::high%]",
+              "very_high": "[%key:component::nam::entity::sensor::pmsx003_caqi_level::state::very_high%]"
+            }
+          }
         }
       },
       "sps30_pm1": {
@@ -169,5 +205,19 @@
         "name": "Last restart"
       }
     }
+  },
+  "exceptions": {
+    "auth_error": {
+      "message": "Authentication failed for {device}, please update your credentials"
+    },
+    "device_communication_error": {
+      "message": "An error occurred while communicating with {device}"
+    },
+    "device_communication_action_error": {
+      "message": "An error occurred while calling action for {entity} for {device}"
+    },
+    "update_error": {
+      "message": "An error occurred while retrieving data from {device}"
+    }
   }
 }
diff --git a/homeassistant/components/namecheapdns/__init__.py b/homeassistant/components/namecheapdns/__init__.py
index 43310c5e922..7fbd49d979b 100644
--- a/homeassistant/components/namecheapdns/__init__.py
+++ b/homeassistant/components/namecheapdns/__init__.py
@@ -8,8 +8,8 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_DOMAIN, CONF_HOST, CONF_PASSWORD
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/nanoleaf/__init__.py b/homeassistant/components/nanoleaf/__init__.py
index 4a34c2843aa..7ee1c14a9b1 100644
--- a/homeassistant/components/nanoleaf/__init__.py
+++ b/homeassistant/components/nanoleaf/__init__.py
@@ -8,7 +8,6 @@ import logging
 
 from aionanoleaf import EffectsEvent, Nanoleaf, StateEvent, TouchEvent
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_DEVICE_ID,
     CONF_HOST,
@@ -22,23 +21,20 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 
 from .const import DOMAIN, NANOLEAF_EVENT, TOUCH_GESTURE_TRIGGER_MAP, TOUCH_MODELS
-from .coordinator import NanoleafCoordinator
+from .coordinator import NanoleafConfigEntry, NanoleafCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS = [Platform.BUTTON, Platform.EVENT, Platform.LIGHT]
 
 
-type NanoleafConfigEntry = ConfigEntry[NanoleafCoordinator]
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: NanoleafConfigEntry) -> bool:
     """Set up Nanoleaf from a config entry."""
     nanoleaf = Nanoleaf(
         async_get_clientsession(hass), entry.data[CONF_HOST], entry.data[CONF_TOKEN]
     )
 
-    coordinator = NanoleafCoordinator(hass, nanoleaf)
+    coordinator = NanoleafCoordinator(hass, entry, nanoleaf)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/nanoleaf/button.py b/homeassistant/components/nanoleaf/button.py
index 34d0f4f5076..813d81ab571 100644
--- a/homeassistant/components/nanoleaf/button.py
+++ b/homeassistant/components/nanoleaf/button.py
@@ -3,17 +3,16 @@
 from homeassistant.components.button import ButtonDeviceClass, ButtonEntity
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import NanoleafConfigEntry
-from .coordinator import NanoleafCoordinator
+from .coordinator import NanoleafConfigEntry, NanoleafCoordinator
 from .entity import NanoleafEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: NanoleafConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Nanoleaf button."""
     async_add_entities([NanoleafIdentifyButton(entry.runtime_data)])
diff --git a/homeassistant/components/nanoleaf/coordinator.py b/homeassistant/components/nanoleaf/coordinator.py
index e080afc492e..495a63b9164 100644
--- a/homeassistant/components/nanoleaf/coordinator.py
+++ b/homeassistant/components/nanoleaf/coordinator.py
@@ -5,20 +5,31 @@ import logging
 
 from aionanoleaf import InvalidToken, Nanoleaf, Unavailable
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 _LOGGER = logging.getLogger(__name__)
 
+type NanoleafConfigEntry = ConfigEntry[NanoleafCoordinator]
+
 
 class NanoleafCoordinator(DataUpdateCoordinator[None]):
     """Class to manage fetching Nanoleaf data."""
 
-    def __init__(self, hass: HomeAssistant, nanoleaf: Nanoleaf) -> None:
+    config_entry: NanoleafConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: NanoleafConfigEntry, nanoleaf: Nanoleaf
+    ) -> None:
         """Initialize the Nanoleaf data coordinator."""
         super().__init__(
-            hass, _LOGGER, name="Nanoleaf", update_interval=timedelta(minutes=1)
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name="Nanoleaf",
+            update_interval=timedelta(minutes=1),
         )
         self.nanoleaf = nanoleaf
 
diff --git a/homeassistant/components/nanoleaf/diagnostics.py b/homeassistant/components/nanoleaf/diagnostics.py
index 6f8691905ef..ce2045acf7b 100644
--- a/homeassistant/components/nanoleaf/diagnostics.py
+++ b/homeassistant/components/nanoleaf/diagnostics.py
@@ -8,7 +8,7 @@ from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_TOKEN
 from homeassistant.core import HomeAssistant
 
-from . import NanoleafConfigEntry
+from .coordinator import NanoleafConfigEntry
 
 
 async def async_get_config_entry_diagnostics(
diff --git a/homeassistant/components/nanoleaf/entity.py b/homeassistant/components/nanoleaf/entity.py
index ffe4a098022..dd0b455fa0f 100644
--- a/homeassistant/components/nanoleaf/entity.py
+++ b/homeassistant/components/nanoleaf/entity.py
@@ -3,8 +3,8 @@
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import NanoleafCoordinator
 from .const import DOMAIN
+from .coordinator import NanoleafCoordinator
 
 
 class NanoleafEntity(CoordinatorEntity[NanoleafCoordinator]):
diff --git a/homeassistant/components/nanoleaf/event.py b/homeassistant/components/nanoleaf/event.py
index 5763c2aa595..78ff889bdc5 100644
--- a/homeassistant/components/nanoleaf/event.py
+++ b/homeassistant/components/nanoleaf/event.py
@@ -3,17 +3,17 @@
 from homeassistant.components.event import EventEntity
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import NanoleafConfigEntry, NanoleafCoordinator
 from .const import TOUCH_MODELS
+from .coordinator import NanoleafConfigEntry, NanoleafCoordinator
 from .entity import NanoleafEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: NanoleafConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Nanoleaf event."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/nanoleaf/light.py b/homeassistant/components/nanoleaf/light.py
index 681053fa573..6d42110d53e 100644
--- a/homeassistant/components/nanoleaf/light.py
+++ b/homeassistant/components/nanoleaf/light.py
@@ -15,10 +15,9 @@ from homeassistant.components.light import (
     LightEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import NanoleafConfigEntry
-from .coordinator import NanoleafCoordinator
+from .coordinator import NanoleafConfigEntry, NanoleafCoordinator
 from .entity import NanoleafEntity
 
 RESERVED_EFFECTS = ("*Solid*", "*Static*", "*Dynamic*")
@@ -28,7 +27,7 @@ DEFAULT_NAME = "Nanoleaf"
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: NanoleafConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Nanoleaf light."""
     async_add_entities([NanoleafLight(entry.runtime_data)])
diff --git a/homeassistant/components/nanoleaf/manifest.json b/homeassistant/components/nanoleaf/manifest.json
index 4b4c026260d..7af7465bbd0 100644
--- a/homeassistant/components/nanoleaf/manifest.json
+++ b/homeassistant/components/nanoleaf/manifest.json
@@ -5,7 +5,7 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/nanoleaf",
   "homekit": {
-    "models": ["NL29", "NL42", "NL47", "NL48", "NL52", "NL59"]
+    "models": ["NL29", "NL42", "NL47", "NL48", "NL52", "NL59", "NL69", "NL81"]
   },
   "iot_class": "local_push",
   "loggers": ["aionanoleaf"],
@@ -22,6 +22,12 @@
     },
     {
       "st": "nanoleaf:nl52"
+    },
+    {
+      "st": "nanoleaf:nl69"
+    },
+    {
+      "st": "inanoleaf:nl81"
     }
   ],
   "zeroconf": ["_nanoleafms._tcp.local.", "_nanoleafapi._tcp.local."]
diff --git a/homeassistant/components/nasweb/config_flow.py b/homeassistant/components/nasweb/config_flow.py
index 3a9ad3f7d49..298210903dc 100644
--- a/homeassistant/components/nasweb/config_flow.py
+++ b/homeassistant/components/nasweb/config_flow.py
@@ -103,7 +103,7 @@ class NASwebConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                 errors["base"] = "missing_status"
             except AbortFlow:
                 raise
-            except Exception:  # pylint: disable=broad-except
+            except Exception:
                 _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
diff --git a/homeassistant/components/nasweb/switch.py b/homeassistant/components/nasweb/switch.py
index 00e5a21da18..740db1ed1a1 100644
--- a/homeassistant/components/nasweb/switch.py
+++ b/homeassistant/components/nasweb/switch.py
@@ -10,9 +10,9 @@ from webio_api import Output as NASwebOutput
 
 from homeassistant.components.switch import DOMAIN as DOMAIN_SWITCH, SwitchEntity
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import DiscoveryInfoType
 from homeassistant.helpers.update_coordinator import (
     BaseCoordinatorEntity,
@@ -38,7 +38,7 @@ def _get_output(coordinator: NASwebCoordinator, index: int) -> NASwebOutput | No
 async def async_setup_entry(
     hass: HomeAssistant,
     config: NASwebConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up switch platform."""
diff --git a/homeassistant/components/neato/button.py b/homeassistant/components/neato/button.py
index 29114ce5188..8658dfd1b1b 100644
--- a/homeassistant/components/neato/button.py
+++ b/homeassistant/components/neato/button.py
@@ -8,14 +8,16 @@ from homeassistant.components.button import ButtonEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import NEATO_ROBOTS
 from .entity import NeatoEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Neato button from config entry."""
     entities = [NeatoDismissAlertButton(robot) for robot in hass.data[NEATO_ROBOTS]]
diff --git a/homeassistant/components/neato/camera.py b/homeassistant/components/neato/camera.py
index e4d5f81f33a..42278a3a48f 100644
--- a/homeassistant/components/neato/camera.py
+++ b/homeassistant/components/neato/camera.py
@@ -13,7 +13,7 @@ from urllib3.response import HTTPResponse
 from homeassistant.components.camera import Camera
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import NEATO_LOGIN, NEATO_MAP_DATA, NEATO_ROBOTS, SCAN_INTERVAL_MINUTES
 from .entity import NeatoEntity
@@ -26,7 +26,9 @@ ATTR_GENERATED_AT = "generated_at"
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Neato camera with config entry."""
     neato: NeatoHub = hass.data[NEATO_LOGIN]
diff --git a/homeassistant/components/neato/manifest.json b/homeassistant/components/neato/manifest.json
index e4b471cb5ac..ef7cda52f19 100644
--- a/homeassistant/components/neato/manifest.json
+++ b/homeassistant/components/neato/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/neato",
   "iot_class": "cloud_polling",
   "loggers": ["pybotvac"],
-  "requirements": ["pybotvac==0.0.25"]
+  "requirements": ["pybotvac==0.0.26"]
 }
diff --git a/homeassistant/components/neato/sensor.py b/homeassistant/components/neato/sensor.py
index c247cc48493..4be02fe1ef7 100644
--- a/homeassistant/components/neato/sensor.py
+++ b/homeassistant/components/neato/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import NEATO_LOGIN, NEATO_ROBOTS, SCAN_INTERVAL_MINUTES
 from .entity import NeatoEntity
@@ -27,7 +27,9 @@ BATTERY = "Battery"
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Neato sensor using config entry."""
     neato: NeatoHub = hass.data[NEATO_LOGIN]
diff --git a/homeassistant/components/neato/switch.py b/homeassistant/components/neato/switch.py
index 25da1c41df1..1ae06fef44c 100644
--- a/homeassistant/components/neato/switch.py
+++ b/homeassistant/components/neato/switch.py
@@ -13,7 +13,7 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_OFF, STATE_ON, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import NEATO_LOGIN, NEATO_ROBOTS, SCAN_INTERVAL_MINUTES
 from .entity import NeatoEntity
@@ -29,7 +29,9 @@ SWITCH_TYPES = {SWITCH_TYPE_SCHEDULE: ["Schedule"]}
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Neato switch with config entry."""
     neato: NeatoHub = hass.data[NEATO_LOGIN]
diff --git a/homeassistant/components/neato/vacuum.py b/homeassistant/components/neato/vacuum.py
index 1a9285964a2..a1e1382eb04 100644
--- a/homeassistant/components/neato/vacuum.py
+++ b/homeassistant/components/neato/vacuum.py
@@ -21,7 +21,7 @@ from homeassistant.const import ATTR_MODE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     ACTION,
@@ -58,7 +58,9 @@ ATTR_ZONE = "zone"
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Neato vacuum with config entry."""
     neato: NeatoHub = hass.data[NEATO_LOGIN]
diff --git a/homeassistant/components/nederlandse_spoorwegen/sensor.py b/homeassistant/components/nederlandse_spoorwegen/sensor.py
index ce3e7d3a002..1e7fc54f4f7 100644
--- a/homeassistant/components/nederlandse_spoorwegen/sensor.py
+++ b/homeassistant/components/nederlandse_spoorwegen/sensor.py
@@ -17,10 +17,10 @@ from homeassistant.components.sensor import (
 from homeassistant.const import CONF_API_KEY, CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import Throttle
+from homeassistant.util import Throttle, dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -119,6 +119,8 @@ class NSDepartureSensor(SensorEntity):
         self._time = time
         self._state = None
         self._trips = None
+        self._first_trip = None
+        self._next_trip = None
 
     @property
     def name(self):
@@ -133,44 +135,44 @@ class NSDepartureSensor(SensorEntity):
     @property
     def extra_state_attributes(self):
         """Return the state attributes."""
-        if not self._trips:
+        if not self._trips or self._first_trip is None:
             return None
 
-        if self._trips[0].trip_parts:
-            route = [self._trips[0].departure]
-            route.extend(k.destination for k in self._trips[0].trip_parts)
+        if self._first_trip.trip_parts:
+            route = [self._first_trip.departure]
+            route.extend(k.destination for k in self._first_trip.trip_parts)
 
         # Static attributes
         attributes = {
-            "going": self._trips[0].going,
+            "going": self._first_trip.going,
             "departure_time_planned": None,
             "departure_time_actual": None,
             "departure_delay": False,
-            "departure_platform_planned": self._trips[0].departure_platform_planned,
-            "departure_platform_actual": self._trips[0].departure_platform_actual,
+            "departure_platform_planned": self._first_trip.departure_platform_planned,
+            "departure_platform_actual": self._first_trip.departure_platform_actual,
             "arrival_time_planned": None,
             "arrival_time_actual": None,
             "arrival_delay": False,
-            "arrival_platform_planned": self._trips[0].arrival_platform_planned,
-            "arrival_platform_actual": self._trips[0].arrival_platform_actual,
+            "arrival_platform_planned": self._first_trip.arrival_platform_planned,
+            "arrival_platform_actual": self._first_trip.arrival_platform_actual,
             "next": None,
-            "status": self._trips[0].status.lower(),
-            "transfers": self._trips[0].nr_transfers,
+            "status": self._first_trip.status.lower(),
+            "transfers": self._first_trip.nr_transfers,
             "route": route,
             "remarks": None,
         }
 
         # Planned departure attributes
-        if self._trips[0].departure_time_planned is not None:
-            attributes["departure_time_planned"] = self._trips[
-                0
-            ].departure_time_planned.strftime("%H:%M")
+        if self._first_trip.departure_time_planned is not None:
+            attributes["departure_time_planned"] = (
+                self._first_trip.departure_time_planned.strftime("%H:%M")
+            )
 
         # Actual departure attributes
-        if self._trips[0].departure_time_actual is not None:
-            attributes["departure_time_actual"] = self._trips[
-                0
-            ].departure_time_actual.strftime("%H:%M")
+        if self._first_trip.departure_time_actual is not None:
+            attributes["departure_time_actual"] = (
+                self._first_trip.departure_time_actual.strftime("%H:%M")
+            )
 
         # Delay departure attributes
         if (
@@ -182,16 +184,16 @@ class NSDepartureSensor(SensorEntity):
             attributes["departure_delay"] = True
 
         # Planned arrival attributes
-        if self._trips[0].arrival_time_planned is not None:
-            attributes["arrival_time_planned"] = self._trips[
-                0
-            ].arrival_time_planned.strftime("%H:%M")
+        if self._first_trip.arrival_time_planned is not None:
+            attributes["arrival_time_planned"] = (
+                self._first_trip.arrival_time_planned.strftime("%H:%M")
+            )
 
         # Actual arrival attributes
-        if self._trips[0].arrival_time_actual is not None:
-            attributes["arrival_time_actual"] = self._trips[
-                0
-            ].arrival_time_actual.strftime("%H:%M")
+        if self._first_trip.arrival_time_actual is not None:
+            attributes["arrival_time_actual"] = (
+                self._first_trip.arrival_time_actual.strftime("%H:%M")
+            )
 
         # Delay arrival attributes
         if (
@@ -202,15 +204,14 @@ class NSDepartureSensor(SensorEntity):
             attributes["arrival_delay"] = True
 
         # Next attributes
-        if len(self._trips) > 1:
-            if self._trips[1].departure_time_actual is not None:
-                attributes["next"] = self._trips[1].departure_time_actual.strftime(
-                    "%H:%M"
-                )
-            elif self._trips[1].departure_time_planned is not None:
-                attributes["next"] = self._trips[1].departure_time_planned.strftime(
-                    "%H:%M"
-                )
+        if self._next_trip.departure_time_actual is not None:
+            attributes["next"] = self._next_trip.departure_time_actual.strftime("%H:%M")
+        elif self._next_trip.departure_time_planned is not None:
+            attributes["next"] = self._next_trip.departure_time_planned.strftime(
+                "%H:%M"
+            )
+        else:
+            attributes["next"] = None
 
         return attributes
 
@@ -225,6 +226,7 @@ class NSDepartureSensor(SensorEntity):
         ):
             self._state = None
             self._trips = None
+            self._first_trip = None
             return
 
         # Set the search parameter to search from a specific trip time
@@ -236,19 +238,51 @@ class NSDepartureSensor(SensorEntity):
                 .strftime("%d-%m-%Y %H:%M")
             )
         else:
-            trip_time = datetime.now().strftime("%d-%m-%Y %H:%M")
+            trip_time = dt_util.now().strftime("%d-%m-%Y %H:%M")
 
         try:
             self._trips = self._nsapi.get_trips(
                 trip_time, self._departure, self._via, self._heading, True, 0, 2
             )
             if self._trips:
-                if self._trips[0].departure_time_actual is None:
-                    planned_time = self._trips[0].departure_time_planned
-                    self._state = planned_time.strftime("%H:%M")
+                all_times = []
+
+                # If a train is delayed we can observe this through departure_time_actual.
+                for trip in self._trips:
+                    if trip.departure_time_actual is None:
+                        all_times.append(trip.departure_time_planned)
+                    else:
+                        all_times.append(trip.departure_time_actual)
+
+                # Remove all trains that already left.
+                filtered_times = [
+                    (i, time)
+                    for i, time in enumerate(all_times)
+                    if time > dt_util.now()
+                ]
+
+                if len(filtered_times) > 0:
+                    sorted_times = sorted(filtered_times, key=lambda x: x[1])
+                    self._first_trip = self._trips[sorted_times[0][0]]
+                    self._state = sorted_times[0][1].strftime("%H:%M")
+
+                    # Filter again to remove trains that leave at the exact same time.
+                    filtered_times = [
+                        (i, time)
+                        for i, time in enumerate(all_times)
+                        if time > sorted_times[0][1]
+                    ]
+
+                    if len(filtered_times) > 0:
+                        sorted_times = sorted(filtered_times, key=lambda x: x[1])
+                        self._next_trip = self._trips[sorted_times[0][0]]
+                    else:
+                        self._next_trip = None
+
                 else:
-                    actual_time = self._trips[0].departure_time_actual
-                    self._state = actual_time.strftime("%H:%M")
+                    self._first_trip = None
+                    self._state = None
+
         except (
             requests.exceptions.ConnectionError,
             requests.exceptions.HTTPError,
diff --git a/homeassistant/components/ness_alarm/services.yaml b/homeassistant/components/ness_alarm/services.yaml
index b02d5e36805..aed1e1836bd 100644
--- a/homeassistant/components/ness_alarm/services.yaml
+++ b/homeassistant/components/ness_alarm/services.yaml
@@ -7,7 +7,7 @@ aux:
       selector:
         number:
           min: 1
-          max: 4
+          max: 8
     state:
       default: true
       selector:
diff --git a/homeassistant/components/ness_alarm/strings.json b/homeassistant/components/ness_alarm/strings.json
index ec4e39a6128..f4490ac98db 100644
--- a/homeassistant/components/ness_alarm/strings.json
+++ b/homeassistant/components/ness_alarm/strings.json
@@ -2,7 +2,7 @@
   "services": {
     "aux": {
       "name": "Aux",
-      "description": "Trigger an aux output.",
+      "description": "Changes the state of an aux output.",
       "fields": {
         "output_id": {
           "name": "Output ID",
@@ -10,17 +10,17 @@
         },
         "state": {
           "name": "State",
-          "description": "The On/Off State. If P14xE 8E is enabled then a value of true will pulse output x for the time specified in P14(x+4)E."
+          "description": "The on/off state of the output. If P14xE 8E is enabled then turning on will pulse the output for the time specified in P14(x+4)E."
         }
       }
     },
     "panic": {
       "name": "Panic",
-      "description": "Triggers a panic.",
+      "description": "Triggers a panic alarm.",
       "fields": {
         "code": {
           "name": "Code",
-          "description": "The user code to use to trigger the panic."
+          "description": "The user code to use to trigger the panic alarm."
         }
       }
     }
diff --git a/homeassistant/components/nest/__init__.py b/homeassistant/components/nest/__init__.py
index 8adc0e4f714..af85f1fc5ae 100644
--- a/homeassistant/components/nest/__init__.py
+++ b/homeassistant/components/nest/__init__.py
@@ -8,7 +8,7 @@ from collections.abc import Awaitable, Callable
 from http import HTTPStatus
 import logging
 
-from aiohttp import web
+from aiohttp import ClientError, ClientResponseError, web
 from google_nest_sdm.camera_traits import CameraClipPreviewTrait
 from google_nest_sdm.device import Device
 from google_nest_sdm.event import EventMessage
@@ -198,7 +198,17 @@ async def async_setup_entry(hass: HomeAssistant, entry: NestConfigEntry) -> bool
             entry, unique_id=entry.data[CONF_PROJECT_ID]
         )
 
-    subscriber = await api.new_subscriber(hass, entry)
+    auth = await api.new_auth(hass, entry)
+    try:
+        await auth.async_get_access_token()
+    except ClientResponseError as err:
+        if 400 <= err.status < 500:
+            raise ConfigEntryAuthFailed from err
+        raise ConfigEntryNotReady from err
+    except ClientError as err:
+        raise ConfigEntryNotReady from err
+
+    subscriber = await api.new_subscriber(hass, entry, auth)
     if not subscriber:
         return False
     # Keep media for last N events in memory
diff --git a/homeassistant/components/nest/api.py b/homeassistant/components/nest/api.py
index e86e326b1c2..d55826f7ed0 100644
--- a/homeassistant/components/nest/api.py
+++ b/homeassistant/components/nest/api.py
@@ -50,13 +50,14 @@ class AsyncConfigEntryAuth(AbstractAuth):
         return cast(str, self._oauth_session.token["access_token"])
 
     async def async_get_creds(self) -> Credentials:
-        """Return an OAuth credential for Pub/Sub Subscriber."""
-        # We don't have a way for Home Assistant to refresh creds on behalf
-        # of the google pub/sub subscriber. Instead, build a full
-        # Credentials object with enough information for the subscriber to
-        # handle this on its own. We purposely don't refresh the token here
-        # even when it is expired to fully hand off this responsibility and
-        # know it is working at startup (then if not, fail loudly).
+        """Return an OAuth credential for Pub/Sub Subscriber.
+
+        The subscriber will call this when connecting to the stream to refresh
+        the token. We construct a credentials object using the underlying
+        OAuth2Session since the subscriber may expect the expiry fields to
+        be present.
+        """
+        await self.async_get_access_token()
         token = self._oauth_session.token
         creds = Credentials(  # type: ignore[no-untyped-call]
             token=token["access_token"],
@@ -101,9 +102,7 @@ class AccessTokenAuthImpl(AbstractAuth):
         )
 
 
-async def new_subscriber(
-    hass: HomeAssistant, entry: NestConfigEntry
-) -> GoogleNestSubscriber | None:
+async def new_auth(hass: HomeAssistant, entry: NestConfigEntry) -> AbstractAuth:
     """Create a GoogleNestSubscriber."""
     implementation = (
         await config_entry_oauth2_flow.async_get_config_entry_implementation(
@@ -114,14 +113,22 @@ async def new_subscriber(
         implementation, config_entry_oauth2_flow.LocalOAuth2Implementation
     ):
         raise TypeError(f"Unexpected auth implementation {implementation}")
-    if (subscription_name := entry.data.get(CONF_SUBSCRIPTION_NAME)) is None:
-        subscription_name = entry.data[CONF_SUBSCRIBER_ID]
-    auth = AsyncConfigEntryAuth(
+    return AsyncConfigEntryAuth(
         aiohttp_client.async_get_clientsession(hass),
         config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation),
         implementation.client_id,
         implementation.client_secret,
     )
+
+
+async def new_subscriber(
+    hass: HomeAssistant,
+    entry: NestConfigEntry,
+    auth: AbstractAuth,
+) -> GoogleNestSubscriber:
+    """Create a GoogleNestSubscriber."""
+    if (subscription_name := entry.data.get(CONF_SUBSCRIPTION_NAME)) is None:
+        subscription_name = entry.data[CONF_SUBSCRIBER_ID]
     return GoogleNestSubscriber(auth, entry.data[CONF_PROJECT_ID], subscription_name)
 
 
diff --git a/homeassistant/components/nest/camera.py b/homeassistant/components/nest/camera.py
index df02f17444f..f5985da9ff8 100644
--- a/homeassistant/components/nest/camera.py
+++ b/homeassistant/components/nest/camera.py
@@ -30,7 +30,7 @@ from homeassistant.components.camera import (
 from homeassistant.components.stream import CONF_EXTRA_PART_WAIT_TIME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.util.dt import utcnow
 
@@ -51,7 +51,9 @@ BACKOFF_MULTIPLIER = 1.5
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: NestConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: NestConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the cameras."""
 
diff --git a/homeassistant/components/nest/climate.py b/homeassistant/components/nest/climate.py
index 3193d592120..f5eff664f83 100644
--- a/homeassistant/components/nest/climate.py
+++ b/homeassistant/components/nest/climate.py
@@ -30,7 +30,7 @@ from homeassistant.components.climate import (
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .device_info import NestDeviceInfo
 from .types import NestConfigEntry
@@ -76,7 +76,9 @@ MIN_TEMP_RANGE = 1.66667
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: NestConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: NestConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the client entities."""
 
diff --git a/homeassistant/components/nest/config_flow.py b/homeassistant/components/nest/config_flow.py
index 274e4c288b4..0b249db7a4b 100644
--- a/homeassistant/components/nest/config_flow.py
+++ b/homeassistant/components/nest/config_flow.py
@@ -15,6 +15,7 @@ import logging
 from typing import TYPE_CHECKING, Any
 
 from google_nest_sdm.admin_client import (
+    DEFAULT_TOPIC_IAM_POLICY,
     AdminClient,
     EligibleSubscriptions,
     EligibleTopics,
@@ -25,6 +26,11 @@ import voluptuous as vol
 
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
 from homeassistant.helpers import config_entry_oauth2_flow
+from homeassistant.helpers.selector import (
+    SelectSelector,
+    SelectSelectorConfig,
+    SelectSelectorMode,
+)
 from homeassistant.util import get_random_string
 
 from . import api
@@ -41,8 +47,9 @@ from .const import (
 )
 
 DATA_FLOW_IMPL = "nest_flow_implementation"
+TOPIC_FORMAT = "projects/{cloud_project_id}/topics/home-assistant-{rnd}"
 SUBSCRIPTION_FORMAT = "projects/{cloud_project_id}/subscriptions/home-assistant-{rnd}"
-SUBSCRIPTION_RAND_LENGTH = 10
+RAND_LENGTH = 10
 
 MORE_INFO_URL = "https://www.home-assistant.io/integrations/nest/#configuration"
 
@@ -59,6 +66,7 @@ DEVICE_ACCESS_CONSOLE_URL = "https://console.nest.google.com/device-access/"
 DEVICE_ACCESS_CONSOLE_EDIT_URL = (
     "https://console.nest.google.com/device-access/project/{project_id}/information"
 )
+CREATE_NEW_TOPIC_KEY = "create_new_topic"
 CREATE_NEW_SUBSCRIPTION_KEY = "create_new_subscription"
 
 _LOGGER = logging.getLogger(__name__)
@@ -66,10 +74,16 @@ _LOGGER = logging.getLogger(__name__)
 
 def _generate_subscription_id(cloud_project_id: str) -> str:
     """Create a new subscription id."""
-    rnd = get_random_string(SUBSCRIPTION_RAND_LENGTH)
+    rnd = get_random_string(RAND_LENGTH)
     return SUBSCRIPTION_FORMAT.format(cloud_project_id=cloud_project_id, rnd=rnd)
 
 
+def _generate_topic_id(cloud_project_id: str) -> str:
+    """Create a new topic id."""
+    rnd = get_random_string(RAND_LENGTH)
+    return TOPIC_FORMAT.format(cloud_project_id=cloud_project_id, rnd=rnd)
+
+
 def generate_config_title(structures: Iterable[Structure]) -> str | None:
     """Pick a user friendly config title based on the Google Home name(s)."""
     names: list[str] = [
@@ -130,7 +144,7 @@ class NestFlowHandler(
         if self.source == SOURCE_REAUTH:
             _LOGGER.debug("Skipping Pub/Sub configuration")
             return await self._async_finish()
-        return await self.async_step_pubsub()
+        return await self.async_step_pubsub_topic()
 
     async def async_step_reauth(
         self, entry_data: Mapping[str, Any]
@@ -192,7 +206,9 @@ class NestFlowHandler(
     ) -> ConfigFlowResult:
         """Handle cloud project in user input."""
         if user_input is not None:
-            self._data.update(user_input)
+            self._data[CONF_CLOUD_PROJECT_ID] = user_input[
+                CONF_CLOUD_PROJECT_ID
+            ].strip()
             return await self.async_step_device_project()
         return self.async_show_form(
             step_id="cloud_project",
@@ -213,7 +229,7 @@ class NestFlowHandler(
         """Collect device access project from user input."""
         errors = {}
         if user_input is not None:
-            project_id = user_input[CONF_PROJECT_ID]
+            project_id = user_input[CONF_PROJECT_ID].strip()
             if project_id == self._data[CONF_CLOUD_PROJECT_ID]:
                 _LOGGER.error(
                     "Device Access Project ID and Cloud Project ID must not be the"
@@ -240,72 +256,83 @@ class NestFlowHandler(
             errors=errors,
         )
 
-    async def async_step_pubsub(
+    async def async_step_pubsub_topic(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Configure and the pre-requisites to configure Pub/Sub topics and subscriptions."""
-        data = {
-            **self._data,
-            **(user_input if user_input is not None else {}),
-        }
-        cloud_project_id = data.get(CONF_CLOUD_PROJECT_ID, "").strip()
-        device_access_project_id = data[CONF_PROJECT_ID]
-
-        errors: dict[str, str] = {}
-        if cloud_project_id:
+        """Configure and create Pub/Sub topic."""
+        cloud_project_id = self._data[CONF_CLOUD_PROJECT_ID]
+        if self._admin_client is None:
             access_token = self._data["token"]["access_token"]
             self._admin_client = api.new_pubsub_admin_client(
-                self.hass, access_token=access_token, cloud_project_id=cloud_project_id
+                self.hass,
+                access_token=access_token,
+                cloud_project_id=cloud_project_id,
             )
-            try:
-                eligible_topics = await self._admin_client.list_eligible_topics(
-                    device_access_project_id=device_access_project_id
-                )
-            except ApiException as err:
-                _LOGGER.error("Error listing eligible Pub/Sub topics: %s", err)
-                errors["base"] = "pubsub_api_error"
-            else:
-                if not eligible_topics.topic_names:
-                    errors["base"] = "no_pubsub_topics"
+        errors = {}
+        if user_input is not None:
+            topic_name = user_input[CONF_TOPIC_NAME]
+            if topic_name == CREATE_NEW_TOPIC_KEY:
+                topic_name = _generate_topic_id(cloud_project_id)
+                _LOGGER.debug("Creating topic %s", topic_name)
+                try:
+                    await self._admin_client.create_topic(topic_name)
+                    await self._admin_client.set_topic_iam_policy(
+                        topic_name, DEFAULT_TOPIC_IAM_POLICY
+                    )
+                except ApiException as err:
+                    _LOGGER.error("Error creating Pub/Sub topic: %s", err)
+                    errors["base"] = "pubsub_api_error"
             if not errors:
-                self._data[CONF_CLOUD_PROJECT_ID] = cloud_project_id
-                self._eligible_topics = eligible_topics
-                return await self.async_step_pubsub_topic()
+                self._data[CONF_TOPIC_NAME] = topic_name
+                return await self.async_step_pubsub_topic_confirm()
 
+        device_access_project_id = self._data[CONF_PROJECT_ID]
+        try:
+            eligible_topics = await self._admin_client.list_eligible_topics(
+                device_access_project_id=device_access_project_id
+            )
+        except ApiException as err:
+            _LOGGER.error("Error listing eligible Pub/Sub topics: %s", err)
+            return self.async_abort(reason="pubsub_api_error")
+        topics = [
+            *eligible_topics.topic_names,  # Untranslated topic paths
+            CREATE_NEW_TOPIC_KEY,
+        ]
         return self.async_show_form(
-            step_id="pubsub",
+            step_id="pubsub_topic",
             data_schema=vol.Schema(
                 {
-                    vol.Required(CONF_CLOUD_PROJECT_ID, default=cloud_project_id): str,
+                    vol.Required(
+                        CONF_TOPIC_NAME, default=next(iter(topics))
+                    ): SelectSelector(
+                        SelectSelectorConfig(
+                            translation_key="topic_name",
+                            mode=SelectSelectorMode.LIST,
+                            options=topics,
+                        )
+                    )
                 }
             ),
             description_placeholders={
-                "url": CLOUD_CONSOLE_URL,
                 "device_access_console_url": DEVICE_ACCESS_CONSOLE_URL,
                 "more_info_url": MORE_INFO_URL,
             },
             errors=errors,
         )
 
-    async def async_step_pubsub_topic(
-        self, user_input: dict[str, Any] | None = None
+    async def async_step_pubsub_topic_confirm(
+        self, user_input: dict | None = None
     ) -> ConfigFlowResult:
-        """Configure and create Pub/Sub topic."""
-        if TYPE_CHECKING:
-            assert self._eligible_topics
+        """Have the user confirm the Pub/Sub topic is set correctly in Device Access Console."""
         if user_input is not None:
-            self._data.update(user_input)
             return await self.async_step_pubsub_subscription()
-        topics = list(self._eligible_topics.topic_names)
         return self.async_show_form(
-            step_id="pubsub_topic",
-            data_schema=vol.Schema(
-                {
-                    vol.Optional(CONF_TOPIC_NAME, default=topics[0]): vol.In(topics),
-                }
-            ),
+            step_id="pubsub_topic_confirm",
             description_placeholders={
-                "device_access_console_url": DEVICE_ACCESS_CONSOLE_URL,
+                "device_access_console_url": DEVICE_ACCESS_CONSOLE_EDIT_URL.format(
+                    project_id=self._data[CONF_PROJECT_ID]
+                ),
+                "topic_name": self._data[CONF_TOPIC_NAME],
                 "more_info_url": MORE_INFO_URL,
             },
         )
@@ -362,7 +389,7 @@ class NestFlowHandler(
                     )
                 return await self._async_finish()
 
-        subscriptions = {}
+        subscriptions = []
         try:
             eligible_subscriptions = (
                 await self._admin_client.list_eligible_subscriptions(
@@ -375,10 +402,8 @@ class NestFlowHandler(
             )
             errors["base"] = "pubsub_api_error"
         else:
-            subscriptions.update(
-                {name: name for name in eligible_subscriptions.subscription_names}
-            )
-        subscriptions[CREATE_NEW_SUBSCRIPTION_KEY] = "Create New"
+            subscriptions.extend(eligible_subscriptions.subscription_names)
+        subscriptions.append(CREATE_NEW_SUBSCRIPTION_KEY)
         return self.async_show_form(
             step_id="pubsub_subscription",
             data_schema=vol.Schema(
@@ -386,7 +411,13 @@ class NestFlowHandler(
                     vol.Optional(
                         CONF_SUBSCRIPTION_NAME,
                         default=next(iter(subscriptions)),
-                    ): vol.In(subscriptions),
+                    ): SelectSelector(
+                        SelectSelectorConfig(
+                            translation_key="subscription_name",
+                            mode=SelectSelectorMode.LIST,
+                            options=subscriptions,
+                        )
+                    )
                 }
             ),
             description_placeholders={
diff --git a/homeassistant/components/nest/device_info.py b/homeassistant/components/nest/device_info.py
index facd429b139..8241b8aa5f8 100644
--- a/homeassistant/components/nest/device_info.py
+++ b/homeassistant/components/nest/device_info.py
@@ -7,7 +7,6 @@ from collections.abc import Mapping
 from google_nest_sdm.device import Device
 from google_nest_sdm.device_traits import ConnectivityTrait, InfoTrait
 
-from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
@@ -84,8 +83,7 @@ def async_nest_devices(hass: HomeAssistant) -> Mapping[str, Device]:
     """Return a mapping of all nest devices for all config entries."""
     return {
         device.name: device
-        for config_entry in hass.config_entries.async_entries(DOMAIN)
-        if config_entry.state == ConfigEntryState.LOADED
+        for config_entry in hass.config_entries.async_loaded_entries(DOMAIN)
         for device in config_entry.runtime_data.device_manager.devices.values()
     }
 
diff --git a/homeassistant/components/nest/event.py b/homeassistant/components/nest/event.py
index 1a2c0317496..9bb041fce6c 100644
--- a/homeassistant/components/nest/event.py
+++ b/homeassistant/components/nest/event.py
@@ -13,7 +13,7 @@ from homeassistant.components.event import (
     EventEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .device_info import NestDeviceInfo
 from .events import (
@@ -66,7 +66,9 @@ ENTITY_DESCRIPTIONS = [
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: NestConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: NestConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensors."""
     async_add_entities(
diff --git a/homeassistant/components/nest/manifest.json b/homeassistant/components/nest/manifest.json
index e14474dc309..d9383533300 100644
--- a/homeassistant/components/nest/manifest.json
+++ b/homeassistant/components/nest/manifest.json
@@ -19,5 +19,5 @@
   "documentation": "https://www.home-assistant.io/integrations/nest",
   "iot_class": "cloud_push",
   "loggers": ["google_nest_sdm"],
-  "requirements": ["google-nest-sdm==7.0.0"]
+  "requirements": ["google-nest-sdm==7.1.4"]
 }
diff --git a/homeassistant/components/nest/media_source.py b/homeassistant/components/nest/media_source.py
index 146b6f2479e..a3d2901e911 100644
--- a/homeassistant/components/nest/media_source.py
+++ b/homeassistant/components/nest/media_source.py
@@ -20,8 +20,10 @@ from __future__ import annotations
 
 from collections.abc import Mapping
 from dataclasses import dataclass
+import datetime
 import logging
 import os
+import pathlib
 from typing import Any
 
 from google_nest_sdm.camera_traits import CameraClipPreviewTrait, CameraEventImageTrait
@@ -46,6 +48,7 @@ from homeassistant.components.media_source import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.template import DATE_STR_FORMAT
 from homeassistant.util import dt as dt_util
@@ -72,6 +75,9 @@ MEDIA_PATH = f"{DOMAIN}/event_media"
 # Size of small in-memory disk cache to avoid excessive disk reads
 DISK_READ_LRU_MAX_SIZE = 32
 
+# Remove orphaned media files that are older than this age
+ORPHANED_MEDIA_AGE_CUTOFF = datetime.timedelta(days=7)
+
 
 async def async_get_media_event_store(
     hass: HomeAssistant, subscriber: GoogleNestSubscriber
@@ -123,6 +129,12 @@ class NestEventMediaStore(EventMediaStore):
         self._media_path = media_path
         self._data: dict[str, Any] | None = None
         self._devices: Mapping[str, str] | None = {}
+        # Invoke garbage collection for orphaned files one per
+        async_track_time_interval(
+            hass,
+            self.async_remove_orphaned_media,
+            datetime.timedelta(days=1),
+        )
 
     async def async_load(self) -> dict | None:
         """Load data."""
@@ -249,6 +261,68 @@ class NestEventMediaStore(EventMediaStore):
                 devices[device.name] = device_entry.id
         return devices
 
+    async def async_remove_orphaned_media(self, now: datetime.datetime) -> None:
+        """Remove any media files that are orphaned and not referenced by the active event data.
+
+        The event media store handles garbage collection, but there may be cases where files are
+        left around or unable to be removed. This is a scheduled event that will also check for
+        old orphaned files and remove them when the events are not referenced in the active list
+        of event data.
+
+        Event media files are stored with the format  <timestamp>-<event_type>.suffix. We extract
+        the list of valid timestamps from the event data and remove any files that are not in that list
+        or are older than the cutoff time.
+        """
+        _LOGGER.debug("Checking for orphaned media at %s", now)
+
+        def _cleanup(event_timestamps: dict[str, set[int]]) -> None:
+            time_cutoff = (now - ORPHANED_MEDIA_AGE_CUTOFF).timestamp()
+            media_path = pathlib.Path(self._media_path)
+            for device_id, valid_timestamps in event_timestamps.items():
+                media_files = list(media_path.glob(f"{device_id}/*"))
+                _LOGGER.debug("Found %d files (device=%s)", len(media_files), device_id)
+                for media_file in media_files:
+                    if "-" not in media_file.name:
+                        continue
+                    try:
+                        timestamp = int(media_file.name.split("-")[0])
+                    except ValueError:
+                        continue
+                    if timestamp in valid_timestamps or timestamp > time_cutoff:
+                        continue
+                    _LOGGER.debug("Removing orphaned media file: %s", media_file)
+                    try:
+                        os.remove(media_file)
+                    except OSError as err:
+                        _LOGGER.error(
+                            "Unable to remove orphaned media file: %s %s",
+                            media_file,
+                            err,
+                        )
+
+        # Nest device id mapped to home assistant device id
+        event_timestamps = await self._get_valid_event_timestamps()
+        await self._hass.async_add_executor_job(_cleanup, event_timestamps)
+
+    async def _get_valid_event_timestamps(self) -> dict[str, set[int]]:
+        """Return a mapping of home assistant device id to valid timestamps."""
+        device_map = await self._get_devices()
+        event_data = await self.async_load() or {}
+        valid_device_timestamps = {}
+        for nest_device_id, device_id in device_map.items():
+            if (device_events := event_data.get(nest_device_id, {})) is None:
+                continue
+            valid_device_timestamps[device_id] = {
+                int(
+                    datetime.datetime.fromisoformat(
+                        camera_event["timestamp"]
+                    ).timestamp()
+                )
+                for events in device_events
+                for camera_event in events["events"].values()
+            }
+        return valid_device_timestamps
+
 
 async def async_get_media_source(hass: HomeAssistant) -> MediaSource:
     """Set up Nest media source."""
diff --git a/homeassistant/components/nest/sensor.py b/homeassistant/components/nest/sensor.py
index 02a0e305813..a6fda48fe87 100644
--- a/homeassistant/components/nest/sensor.py
+++ b/homeassistant/components/nest/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .device_info import NestDeviceInfo
 from .types import NestConfigEntry
@@ -31,7 +31,9 @@ DEVICE_TYPE_MAP = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: NestConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: NestConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensors."""
 
diff --git a/homeassistant/components/nest/strings.json b/homeassistant/components/nest/strings.json
index a31a2856544..54f543aa845 100644
--- a/homeassistant/components/nest/strings.json
+++ b/homeassistant/components/nest/strings.json
@@ -17,7 +17,7 @@
       },
       "device_project": {
         "title": "Nest: Create a Device Access Project",
-        "description": "Create a Nest Device Access project which **requires paying Google a US $5 fee** to set up.\n1. Go to the [Device Access Console]({device_access_console_url}), and through the payment flow.\n1. Select on **Create project**\n1. Give your Device Access project a name and select **Next**.\n1. Enter your OAuth Client ID\n1. Enable events by clicking **Enable** and **Create project**.\n\nEnter your Device Access Project ID below ([more info]({more_info_url})).",
+        "description": "Create a Nest Device Access project which **requires paying Google a US $5 fee** to set up.\n1. Go to the [Device Access Console]({device_access_console_url}), and through the payment flow.\n1. Select on **Create project**\n1. Give your Device Access project a name and select **Next**.\n1. Enter your OAuth Client ID\n1. Skip enabling events for now and select **Create project**.\n\nEnter your Device Access Project ID below ([more info]({more_info_url})).",
         "data": {
           "project_id": "Device Access Project ID"
         }
@@ -25,20 +25,18 @@
       "pick_implementation": {
         "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]"
       },
-      "pubsub": {
-        "title": "Configure Google Cloud Pub/Sub",
-        "description": "Home Assistant uses Cloud Pub/Sub receive realtime Nest device updates. Nest servers publish updates to a Pub/Sub topic and Home Assistant receives the updates through a Pub/Sub subscription.\n\n1. Visit the [Device Access Console]({device_access_console_url}) and ensure a Pub/Sub topic is configured.\n2. Visit the [Cloud Console]({url}) to find your Google Cloud Project ID and confirm it is correct below.\n3. The next step will attempt to auto-discover Pub/Sub topics and subscriptions.\n\nSee the integration documentation for [more info]({more_info_url}).",
-        "data": {
-          "cloud_project_id": "[%key:component::nest::config::step::cloud_project::data::cloud_project_id%]"
-        }
-      },
       "pubsub_topic": {
         "title": "Configure Cloud Pub/Sub topic",
-        "description": "Nest devices publish updates on a Cloud Pub/Sub topic. Select the Pub/Sub topic below that is the same as the [Device Access Console]({device_access_console_url}). See the integration documentation for [more info]({more_info_url}).",
+        "description": "Nest devices publish updates on a Cloud Pub/Sub topic. You can select an existing topic if one exists, or choose to create a new topic and the next step will create it for you with the necessary permissions. See the integration documentation for [more info]({more_info_url}).",
         "data": {
           "topic_name": "Pub/Sub topic Name"
         }
       },
+      "pubsub_topic_confirm": {
+        "title": "Enable events",
+        "description": "The Nest Device Access Console needs to be configured to publish device events to your Pub/Sub topic.\n\n1. Visit the [Device Access Console]({device_access_console_url}).\n2. Open the project.\n3. Enable *Events* and set the Pub/Sub topic name to `{topic_name}`\n4. Click *Add & Validate* to verify the topic is configured correctly.\n\nSee the integration documentation for [more info]({more_info_url}).",
+        "submit": "Confirm"
+      },
       "pubsub_subscription": {
         "title": "Configure Cloud Pub/Sub subscription",
         "description": "Home Assistant receives realtime Nest device updates with a Cloud Pub/Sub subscription for topic `{topic}`.\n\nSelect an existing subscription below if one already exists, or the next step will create a new one for you. See the integration documentation for [more info]({more_info_url}).",
@@ -60,6 +58,7 @@
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
       "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
       "missing_credentials": "[%key:common::config_flow::abort::oauth2_missing_credentials%]",
       "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
@@ -70,7 +69,8 @@
       "oauth_error": "[%key:common::config_flow::abort::oauth2_error%]",
       "oauth_timeout": "[%key:common::config_flow::abort::oauth2_timeout%]",
       "oauth_unauthorized": "[%key:common::config_flow::abort::oauth2_unauthorized%]",
-      "oauth_failed": "[%key:common::config_flow::abort::oauth2_failed%]"
+      "oauth_failed": "[%key:common::config_flow::abort::oauth2_failed%]",
+      "pubsub_api_error": "[%key:component::nest::config::error::pubsub_api_error%]"
     },
     "create_entry": {
       "default": "[%key:common::config_flow::create_entry::authenticated%]"
@@ -109,5 +109,17 @@
         }
       }
     }
+  },
+  "selector": {
+    "topic_name": {
+      "options": {
+        "create_new_topic": "Create new topic"
+      }
+    },
+    "subscription_name": {
+      "options": {
+        "create_new_subscription": "Create new subscription"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/netatmo/binary_sensor.py b/homeassistant/components/netatmo/binary_sensor.py
index c478525753a..d35bfa7e8a6 100644
--- a/homeassistant/components/netatmo/binary_sensor.py
+++ b/homeassistant/components/netatmo/binary_sensor.py
@@ -8,7 +8,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import NETATMO_CREATE_WEATHER_SENSOR
 from .data_handler import NetatmoDevice
@@ -23,7 +23,9 @@ BINARY_SENSOR_TYPES: tuple[BinarySensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Netatmo binary sensors based on a config entry."""
 
diff --git a/homeassistant/components/netatmo/button.py b/homeassistant/components/netatmo/button.py
index 7b2899c84aa..e77b5188067 100644
--- a/homeassistant/components/netatmo/button.py
+++ b/homeassistant/components/netatmo/button.py
@@ -10,7 +10,7 @@ from homeassistant.components.button import ButtonEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_URL_CONTROL, NETATMO_CREATE_BUTTON
 from .data_handler import HOME, SIGNAL_NAME, NetatmoDevice
@@ -22,7 +22,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Netatmo button platform."""
 
diff --git a/homeassistant/components/netatmo/camera.py b/homeassistant/components/netatmo/camera.py
index 3bd7bcd859d..f21998bbac8 100644
--- a/homeassistant/components/netatmo/camera.py
+++ b/homeassistant/components/netatmo/camera.py
@@ -16,7 +16,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     ATTR_CAMERA_LIGHT_MODE,
@@ -48,7 +48,9 @@ DEFAULT_QUALITY = "high"
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Netatmo camera platform."""
 
diff --git a/homeassistant/components/netatmo/climate.py b/homeassistant/components/netatmo/climate.py
index 02c955beac3..2e3d8c6bcb8 100644
--- a/homeassistant/components/netatmo/climate.py
+++ b/homeassistant/components/netatmo/climate.py
@@ -30,7 +30,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from .const import (
@@ -118,7 +118,9 @@ NA_VALVE = DeviceType.NRV
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Netatmo energy platform."""
 
diff --git a/homeassistant/components/netatmo/config_flow.py b/homeassistant/components/netatmo/config_flow.py
index d853694ffea..02d9c2fa3a6 100644
--- a/homeassistant/components/netatmo/config_flow.py
+++ b/homeassistant/components/netatmo/config_flow.py
@@ -135,7 +135,7 @@ class NetatmoOptionsFlowHandler(OptionsFlow):
                 vol.Optional(
                     CONF_WEATHER_AREAS,
                     default=weather_areas,
-                ): cv.multi_select({wa: None for wa in weather_areas}),
+                ): cv.multi_select(dict.fromkeys(weather_areas)),
                 vol.Optional(CONF_NEW_AREA): str,
             }
         )
diff --git a/homeassistant/components/netatmo/cover.py b/homeassistant/components/netatmo/cover.py
index c34b3a1b47b..a599aacd719 100644
--- a/homeassistant/components/netatmo/cover.py
+++ b/homeassistant/components/netatmo/cover.py
@@ -16,7 +16,7 @@ from homeassistant.components.cover import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_URL_CONTROL, NETATMO_CREATE_COVER
 from .data_handler import HOME, SIGNAL_NAME, NetatmoDevice
@@ -28,7 +28,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Netatmo cover platform."""
 
diff --git a/homeassistant/components/netatmo/fan.py b/homeassistant/components/netatmo/fan.py
index 9f3fe7174ff..b0dc74c2b58 100644
--- a/homeassistant/components/netatmo/fan.py
+++ b/homeassistant/components/netatmo/fan.py
@@ -11,7 +11,7 @@ from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_URL_CONTROL, NETATMO_CREATE_FAN
 from .data_handler import HOME, SIGNAL_NAME, NetatmoDevice
@@ -28,7 +28,7 @@ PRESETS = {v: k for k, v in PRESET_MAPPING.items()}
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Netatmo fan platform."""
 
diff --git a/homeassistant/components/netatmo/light.py b/homeassistant/components/netatmo/light.py
index fe30dc0eaa4..ce28c455dea 100644
--- a/homeassistant/components/netatmo/light.py
+++ b/homeassistant/components/netatmo/light.py
@@ -11,7 +11,7 @@ from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEnti
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CONF_URL_CONTROL,
@@ -30,7 +30,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Netatmo camera light platform."""
 
diff --git a/homeassistant/components/netatmo/select.py b/homeassistant/components/netatmo/select.py
index 92568b73e80..e8637c90584 100644
--- a/homeassistant/components/netatmo/select.py
+++ b/homeassistant/components/netatmo/select.py
@@ -9,7 +9,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CONF_URL_ENERGY,
@@ -26,7 +26,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Netatmo energy platform schedule selector."""
 
diff --git a/homeassistant/components/netatmo/sensor.py b/homeassistant/components/netatmo/sensor.py
index cc233dcc0ce..56b8233912f 100644
--- a/homeassistant/components/netatmo/sensor.py
+++ b/homeassistant/components/netatmo/sensor.py
@@ -38,7 +38,7 @@ from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .const import (
@@ -213,7 +213,8 @@ SENSOR_TYPES: tuple[NetatmoSensorEntityDescription, ...] = (
         netatmo_name="wind_angle",
         entity_registry_enabled_default=False,
         native_unit_of_measurement=DEGREE,
-        state_class=SensorStateClass.MEASUREMENT,
+        state_class=SensorStateClass.MEASUREMENT_ANGLE,
+        device_class=SensorDeviceClass.WIND_DIRECTION,
     ),
     NetatmoSensorEntityDescription(
         key="windstrength",
@@ -235,7 +236,8 @@ SENSOR_TYPES: tuple[NetatmoSensorEntityDescription, ...] = (
         netatmo_name="gust_angle",
         entity_registry_enabled_default=False,
         native_unit_of_measurement=DEGREE,
-        state_class=SensorStateClass.MEASUREMENT,
+        state_class=SensorStateClass.MEASUREMENT_ANGLE,
+        device_class=SensorDeviceClass.WIND_DIRECTION,
     ),
     NetatmoSensorEntityDescription(
         key="guststrength",
@@ -345,7 +347,8 @@ PUBLIC_WEATHER_STATION_TYPES: tuple[
         key="windangle_value",
         entity_registry_enabled_default=False,
         native_unit_of_measurement=DEGREE,
-        state_class=SensorStateClass.MEASUREMENT,
+        state_class=SensorStateClass.MEASUREMENT_ANGLE,
+        device_class=SensorDeviceClass.WIND_DIRECTION,
         value_fn=lambda area: area.get_latest_wind_angles(),
     ),
     NetatmoPublicWeatherSensorEntityDescription(
@@ -360,7 +363,8 @@ PUBLIC_WEATHER_STATION_TYPES: tuple[
         translation_key="gust_angle",
         entity_registry_enabled_default=False,
         native_unit_of_measurement=DEGREE,
-        state_class=SensorStateClass.MEASUREMENT,
+        state_class=SensorStateClass.MEASUREMENT_ANGLE,
+        device_class=SensorDeviceClass.WIND_DIRECTION,
         value_fn=lambda area: area.get_latest_gust_angles(),
     ),
     NetatmoPublicWeatherSensorEntityDescription(
@@ -385,7 +389,9 @@ BATTERY_SENSOR_DESCRIPTION = NetatmoSensorEntityDescription(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Netatmo sensor platform."""
 
diff --git a/homeassistant/components/netatmo/services.yaml b/homeassistant/components/netatmo/services.yaml
index cab0528199d..c130d8e96e3 100644
--- a/homeassistant/components/netatmo/services.yaml
+++ b/homeassistant/components/netatmo/services.yaml
@@ -39,7 +39,7 @@ set_preset_mode_with_end_datetime:
         select:
           options:
             - "away"
-            - "Frost Guard"
+            - "frost_guard"
     end_datetime:
       required: true
       example: '"2019-04-20 05:04:20"'
diff --git a/homeassistant/components/netatmo/switch.py b/homeassistant/components/netatmo/switch.py
index 6ba4628a358..9ee37c11528 100644
--- a/homeassistant/components/netatmo/switch.py
+++ b/homeassistant/components/netatmo/switch.py
@@ -11,7 +11,7 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_URL_CONTROL, NETATMO_CREATE_SWITCH
 from .data_handler import HOME, SIGNAL_NAME, NetatmoDevice
@@ -23,7 +23,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Netatmo switch platform."""
 
diff --git a/homeassistant/components/netdata/sensor.py b/homeassistant/components/netdata/sensor.py
index f33349c56ce..4346cbe8689 100644
--- a/homeassistant/components/netdata/sensor.py
+++ b/homeassistant/components/netdata/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.httpx_client import get_async_client
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/netgear/button.py b/homeassistant/components/netgear/button.py
index e5b9ec209c7..726c1b2296d 100644
--- a/homeassistant/components/netgear/button.py
+++ b/homeassistant/components/netgear/button.py
@@ -12,7 +12,7 @@ from homeassistant.components.button import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import DOMAIN, KEY_COORDINATOR, KEY_ROUTER
@@ -38,7 +38,9 @@ BUTTONS = [
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up button for Netgear component."""
     router = hass.data[DOMAIN][entry.entry_id][KEY_ROUTER]
diff --git a/homeassistant/components/netgear/const.py b/homeassistant/components/netgear/const.py
index f7a683326d3..c8ecd8e7e1d 100644
--- a/homeassistant/components/netgear/const.py
+++ b/homeassistant/components/netgear/const.py
@@ -62,6 +62,7 @@ MODELS_V2 = [
     "RBR",
     "RBS",
     "RBW",
+    "RS",
     "LBK",
     "LBR",
     "CBK",
diff --git a/homeassistant/components/netgear/device_tracker.py b/homeassistant/components/netgear/device_tracker.py
index b17430d2abb..56f4ecac14f 100644
--- a/homeassistant/components/netgear/device_tracker.py
+++ b/homeassistant/components/netgear/device_tracker.py
@@ -7,7 +7,7 @@ import logging
 from homeassistant.components.device_tracker import ScannerEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import DEVICE_ICONS, DOMAIN, KEY_COORDINATOR, KEY_ROUTER
@@ -18,7 +18,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up device tracker for Netgear component."""
     router = hass.data[DOMAIN][entry.entry_id][KEY_ROUTER]
diff --git a/homeassistant/components/netgear/sensor.py b/homeassistant/components/netgear/sensor.py
index d807f7aed0a..521e18098eb 100644
--- a/homeassistant/components/netgear/sensor.py
+++ b/homeassistant/components/netgear/sensor.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -274,7 +274,9 @@ SENSOR_LINK_TYPES = [
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up device tracker for Netgear component."""
     router = hass.data[DOMAIN][entry.entry_id][KEY_ROUTER]
diff --git a/homeassistant/components/netgear/switch.py b/homeassistant/components/netgear/switch.py
index 85f214d784a..dd8468df099 100644
--- a/homeassistant/components/netgear/switch.py
+++ b/homeassistant/components/netgear/switch.py
@@ -12,7 +12,7 @@ from homeassistant.components.switch import SwitchEntity, SwitchEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import DOMAIN, KEY_COORDINATOR, KEY_ROUTER
@@ -99,7 +99,9 @@ ROUTER_SWITCH_TYPES = [
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switches for Netgear component."""
     router = hass.data[DOMAIN][entry.entry_id][KEY_ROUTER]
diff --git a/homeassistant/components/netgear/update.py b/homeassistant/components/netgear/update.py
index 1fbfee3d892..388ad8bff4f 100644
--- a/homeassistant/components/netgear/update.py
+++ b/homeassistant/components/netgear/update.py
@@ -12,7 +12,7 @@ from homeassistant.components.update import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import DOMAIN, KEY_COORDINATOR_FIRMWARE, KEY_ROUTER
@@ -23,7 +23,9 @@ LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up update entities for Netgear component."""
     router = hass.data[DOMAIN][entry.entry_id][KEY_ROUTER]
diff --git a/homeassistant/components/netgear_lte/__init__.py b/homeassistant/components/netgear_lte/__init__.py
index 1846d1f7992..47a39a39be0 100644
--- a/homeassistant/components/netgear_lte/__init__.py
+++ b/homeassistant/components/netgear_lte/__init__.py
@@ -6,7 +6,6 @@ from aiohttp.cookiejar import CookieJar
 import eternalegypt
 from eternalegypt.eternalegypt import SMS
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
@@ -23,7 +22,7 @@ from .const import (
     DATA_SESSION,
     DOMAIN,
 )
-from .coordinator import NetgearLTEDataUpdateCoordinator
+from .coordinator import NetgearLTEConfigEntry, NetgearLTEDataUpdateCoordinator
 from .services import async_setup_services
 
 EVENT_SMS = "netgear_lte_sms"
@@ -55,7 +54,6 @@ PLATFORMS = [
     Platform.NOTIFY,
     Platform.SENSOR,
 ]
-type NetgearLTEConfigEntry = ConfigEntry[NetgearLTEDataUpdateCoordinator]
 
 CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 
@@ -94,7 +92,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: NetgearLTEConfigEntry) -
 
     await modem.add_sms_listener(fire_sms_event)
 
-    coordinator = NetgearLTEDataUpdateCoordinator(hass, modem)
+    coordinator = NetgearLTEDataUpdateCoordinator(hass, entry, modem)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
 
@@ -118,12 +116,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: NetgearLTEConfigEntry) -
 async def async_unload_entry(hass: HomeAssistant, entry: NetgearLTEConfigEntry) -> bool:
     """Unload a config entry."""
     unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    loaded_entries = [
-        entry
-        for entry in hass.config_entries.async_entries(DOMAIN)
-        if entry.state == ConfigEntryState.LOADED
-    ]
-    if len(loaded_entries) == 1:
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
         hass.data.pop(DOMAIN, None)
         for service_name in hass.services.async_services()[DOMAIN]:
             hass.services.async_remove(DOMAIN, service_name)
diff --git a/homeassistant/components/netgear_lte/binary_sensor.py b/homeassistant/components/netgear_lte/binary_sensor.py
index 280d240b90f..890bcb37443 100644
--- a/homeassistant/components/netgear_lte/binary_sensor.py
+++ b/homeassistant/components/netgear_lte/binary_sensor.py
@@ -9,9 +9,9 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import NetgearLTEConfigEntry
+from .coordinator import NetgearLTEConfigEntry
 from .entity import LTEEntity
 
 BINARY_SENSORS: tuple[BinarySensorEntityDescription, ...] = (
@@ -39,7 +39,7 @@ BINARY_SENSORS: tuple[BinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: NetgearLTEConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Netgear LTE binary sensor."""
     async_add_entities(
diff --git a/homeassistant/components/netgear_lte/coordinator.py b/homeassistant/components/netgear_lte/coordinator.py
index afd0cb743bf..7bcefca6403 100644
--- a/homeassistant/components/netgear_lte/coordinator.py
+++ b/homeassistant/components/netgear_lte/coordinator.py
@@ -3,17 +3,16 @@
 from __future__ import annotations
 
 from datetime import timedelta
-from typing import TYPE_CHECKING
 
 from eternalegypt.eternalegypt import Error, Information, Modem
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN, LOGGER
 
-if TYPE_CHECKING:
-    from . import NetgearLTEConfigEntry
+type NetgearLTEConfigEntry = ConfigEntry[NetgearLTEDataUpdateCoordinator]
 
 
 class NetgearLTEDataUpdateCoordinator(DataUpdateCoordinator[Information]):
@@ -24,12 +23,14 @@ class NetgearLTEDataUpdateCoordinator(DataUpdateCoordinator[Information]):
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: NetgearLTEConfigEntry,
         modem: Modem,
     ) -> None:
         """Initialize the coordinator."""
         super().__init__(
             hass=hass,
             logger=LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=10),
         )
diff --git a/homeassistant/components/netgear_lte/entity.py b/homeassistant/components/netgear_lte/entity.py
index 3353da6dc77..9d56605b7d2 100644
--- a/homeassistant/components/netgear_lte/entity.py
+++ b/homeassistant/components/netgear_lte/entity.py
@@ -5,9 +5,8 @@ from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import NetgearLTEConfigEntry
 from .const import DOMAIN, MANUFACTURER
-from .coordinator import NetgearLTEDataUpdateCoordinator
+from .coordinator import NetgearLTEConfigEntry, NetgearLTEDataUpdateCoordinator
 
 
 class LTEEntity(CoordinatorEntity[NetgearLTEDataUpdateCoordinator]):
diff --git a/homeassistant/components/netgear_lte/sensor.py b/homeassistant/components/netgear_lte/sensor.py
index 73e5de7eaeb..49301267d9d 100644
--- a/homeassistant/components/netgear_lte/sensor.py
+++ b/homeassistant/components/netgear_lte/sensor.py
@@ -19,10 +19,10 @@ from homeassistant.const import (
     UnitOfInformation,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import NetgearLTEConfigEntry
+from .coordinator import NetgearLTEConfigEntry
 from .entity import LTEEntity
 
 
@@ -127,7 +127,7 @@ SENSORS: tuple[NetgearLTESensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: NetgearLTEConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Netgear LTE sensor."""
     async_add_entities(NetgearLTESensor(entry, description) for description in SENSORS)
diff --git a/homeassistant/components/netio/switch.py b/homeassistant/components/netio/switch.py
index 5c2b93bcae7..4560b7a2ecc 100644
--- a/homeassistant/components/netio/switch.py
+++ b/homeassistant/components/netio/switch.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
     STATE_ON,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/network/__init__.py b/homeassistant/components/network/__init__.py
index 10046f75127..200cce86997 100644
--- a/homeassistant/components/network/__init__.py
+++ b/homeassistant/components/network/__init__.py
@@ -20,7 +20,7 @@ from .const import (
     PUBLIC_TARGET_IP,
 )
 from .models import Adapter
-from .network import Network, async_get_network
+from .network import Network, async_get_loaded_network, async_get_network
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -34,6 +34,12 @@ async def async_get_adapters(hass: HomeAssistant) -> list[Adapter]:
     return network.adapters
 
 
+@callback
+def async_get_loaded_adapters(hass: HomeAssistant) -> list[Adapter]:
+    """Get the network adapter configuration."""
+    return async_get_loaded_network(hass).adapters
+
+
 @bind_hass
 async def async_get_source_ip(
     hass: HomeAssistant, target_ip: str | UndefinedType = UNDEFINED
@@ -74,7 +80,14 @@ async def async_get_enabled_source_ips(
     hass: HomeAssistant,
 ) -> list[IPv4Address | IPv6Address]:
     """Build the list of enabled source ips."""
-    adapters = await async_get_adapters(hass)
+    return async_get_enabled_source_ips_from_adapters(await async_get_adapters(hass))
+
+
+@callback
+def async_get_enabled_source_ips_from_adapters(
+    adapters: list[Adapter],
+) -> list[IPv4Address | IPv6Address]:
+    """Build the list of enabled source ips."""
     sources: list[IPv4Address | IPv6Address] = []
     for adapter in adapters:
         if not adapter["enabled"]:
@@ -151,5 +164,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         async_register_websocket_commands,
     )
 
+    await async_get_network(hass)
+
     async_register_websocket_commands(hass)
     return True
diff --git a/homeassistant/components/network/const.py b/homeassistant/components/network/const.py
index 6c5b6f80eda..d8c8858be72 100644
--- a/homeassistant/components/network/const.py
+++ b/homeassistant/components/network/const.py
@@ -6,14 +6,12 @@ from typing import Final
 
 import voluptuous as vol
 
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 DOMAIN: Final = "network"
 STORAGE_KEY: Final = "core.network"
 STORAGE_VERSION: Final = 1
 
-DATA_NETWORK: Final = "network"
-
 ATTR_ADAPTERS: Final = "adapters"
 ATTR_CONFIGURED_ADAPTERS: Final = "configured_adapters"
 DEFAULT_CONFIGURED_ADAPTERS: list[str] = []
diff --git a/homeassistant/components/network/network.py b/homeassistant/components/network/network.py
index 4158307bb1a..db25bedcaea 100644
--- a/homeassistant/components/network/network.py
+++ b/homeassistant/components/network/network.py
@@ -9,11 +9,12 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.singleton import singleton
 from homeassistant.helpers.storage import Store
 from homeassistant.util.async_ import create_eager_task
+from homeassistant.util.hass_dict import HassKey
 
 from .const import (
     ATTR_CONFIGURED_ADAPTERS,
-    DATA_NETWORK,
     DEFAULT_CONFIGURED_ADAPTERS,
+    DOMAIN,
     STORAGE_KEY,
     STORAGE_VERSION,
 )
@@ -22,8 +23,16 @@ from .util import async_load_adapters, enable_adapters, enable_auto_detected_ada
 
 _LOGGER = logging.getLogger(__name__)
 
+DATA_NETWORK: HassKey[Network] = HassKey(DOMAIN)
 
-@singleton(DATA_NETWORK)
+
+@callback
+def async_get_loaded_network(hass: HomeAssistant) -> Network:
+    """Get network singleton."""
+    return hass.data[DATA_NETWORK]
+
+
+@singleton(DOMAIN)
 async def async_get_network(hass: HomeAssistant) -> Network:
     """Get network singleton."""
     network = Network(hass)
diff --git a/homeassistant/components/neurio_energy/sensor.py b/homeassistant/components/neurio_energy/sensor.py
index 5c6482da59a..7a7ceff338e 100644
--- a/homeassistant/components/neurio_energy/sensor.py
+++ b/homeassistant/components/neurio_energy/sensor.py
@@ -17,11 +17,10 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_API_KEY, UnitOfEnergy, UnitOfPower
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import Throttle
-import homeassistant.util.dt as dt_util
+from homeassistant.util import Throttle, dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/nexia/__init__.py b/homeassistant/components/nexia/__init__.py
index 66a8ec5bdb8..8d0d509f8a2 100644
--- a/homeassistant/components/nexia/__init__.py
+++ b/homeassistant/components/nexia/__init__.py
@@ -58,7 +58,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: NexiaConfigEntry) -> boo
             f"Error connecting to Nexia service: {os_error}"
         ) from os_error
 
-    coordinator = NexiaDataUpdateCoordinator(hass, nexia_home)
+    coordinator = NexiaDataUpdateCoordinator(hass, entry, nexia_home)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
diff --git a/homeassistant/components/nexia/binary_sensor.py b/homeassistant/components/nexia/binary_sensor.py
index 204d84ed975..224836c81e6 100644
--- a/homeassistant/components/nexia/binary_sensor.py
+++ b/homeassistant/components/nexia/binary_sensor.py
@@ -2,7 +2,7 @@
 
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import NexiaThermostatEntity
 from .types import NexiaConfigEntry
@@ -11,7 +11,7 @@ from .types import NexiaConfigEntry
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: NexiaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors for a Nexia device."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/nexia/climate.py b/homeassistant/components/nexia/climate.py
index becd664756b..e9de81cca7c 100644
--- a/homeassistant/components/nexia/climate.py
+++ b/homeassistant/components/nexia/climate.py
@@ -32,9 +32,8 @@ from homeassistant.components.climate import (
 )
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_platform
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv, entity_platform
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import VolDictType
 
@@ -117,7 +116,7 @@ NEXIA_SUPPORTED = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: NexiaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up climate for a Nexia device."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/nexia/coordinator.py b/homeassistant/components/nexia/coordinator.py
index 894c491c45b..85e784218f4 100644
--- a/homeassistant/components/nexia/coordinator.py
+++ b/homeassistant/components/nexia/coordinator.py
@@ -8,6 +8,7 @@ from typing import Any
 
 from nexia.home import NexiaHome
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -19,9 +20,12 @@ DEFAULT_UPDATE_RATE = 120
 class NexiaDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """DataUpdateCoordinator for nexia homes."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         nexia_home: NexiaHome,
     ) -> None:
         """Initialize DataUpdateCoordinator for the nexia home."""
@@ -29,6 +33,7 @@ class NexiaDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="Nexia update",
             update_interval=timedelta(seconds=DEFAULT_UPDATE_RATE),
             always_update=False,
diff --git a/homeassistant/components/nexia/manifest.json b/homeassistant/components/nexia/manifest.json
index 0013cd63de1..e7ab63d4712 100644
--- a/homeassistant/components/nexia/manifest.json
+++ b/homeassistant/components/nexia/manifest.json
@@ -12,5 +12,5 @@
   "documentation": "https://www.home-assistant.io/integrations/nexia",
   "iot_class": "cloud_polling",
   "loggers": ["nexia"],
-  "requirements": ["nexia==2.0.8"]
+  "requirements": ["nexia==2.4.0"]
 }
diff --git a/homeassistant/components/nexia/number.py b/homeassistant/components/nexia/number.py
index 46cc4d094a3..05d9e5b4614 100644
--- a/homeassistant/components/nexia/number.py
+++ b/homeassistant/components/nexia/number.py
@@ -7,7 +7,7 @@ from nexia.thermostat import NexiaThermostat
 from homeassistant.components.number import NumberEntity
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import NexiaDataUpdateCoordinator
 from .entity import NexiaThermostatEntity
@@ -18,7 +18,7 @@ from .util import percent_conv
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: NexiaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors for a Nexia device."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/nexia/scene.py b/homeassistant/components/nexia/scene.py
index 60078fab822..fe75eb07e02 100644
--- a/homeassistant/components/nexia/scene.py
+++ b/homeassistant/components/nexia/scene.py
@@ -6,7 +6,7 @@ from nexia.automation import NexiaAutomation
 
 from homeassistant.components.scene import Scene
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 
 from .const import ATTR_DESCRIPTION
@@ -20,7 +20,7 @@ SCENE_ACTIVATION_TIME = 5
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: NexiaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up automations for a Nexia device."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/nexia/sensor.py b/homeassistant/components/nexia/sensor.py
index e50bd750c2f..293a9308cb4 100644
--- a/homeassistant/components/nexia/sensor.py
+++ b/homeassistant/components/nexia/sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import NexiaThermostatEntity, NexiaThermostatZoneEntity
 from .types import NexiaConfigEntry
@@ -22,7 +22,7 @@ from .util import percent_conv
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: NexiaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors for a Nexia device."""
 
diff --git a/homeassistant/components/nexia/strings.json b/homeassistant/components/nexia/strings.json
index d88ce0b898d..43da2cf05c7 100644
--- a/homeassistant/components/nexia/strings.json
+++ b/homeassistant/components/nexia/strings.json
@@ -58,6 +58,9 @@
     "switch": {
       "hold": {
         "name": "Hold"
+      },
+      "emergency_heat": {
+        "name": "Emergency heat"
       }
     }
   },
@@ -83,8 +86,8 @@
       }
     },
     "set_hvac_run_mode": {
-      "name": "Set hvac run mode",
-      "description": "Sets the HVAC operation mode.",
+      "name": "Set HVAC run mode",
+      "description": "Sets the run and/or operation mode of the HVAC system.",
       "fields": {
         "run_mode": {
           "name": "Run mode",
diff --git a/homeassistant/components/nexia/switch.py b/homeassistant/components/nexia/switch.py
index 9505538e86a..1897ad67414 100644
--- a/homeassistant/components/nexia/switch.py
+++ b/homeassistant/components/nexia/switch.py
@@ -10,7 +10,7 @@ from nexia.zone import NexiaThermostatZone
 
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import NexiaDataUpdateCoordinator
 from .entity import NexiaThermostatEntity, NexiaThermostatZoneEntity
@@ -20,7 +20,7 @@ from .types import NexiaConfigEntry
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: NexiaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switches for a Nexia device."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/nextbus/sensor.py b/homeassistant/components/nextbus/sensor.py
index 554814fe2db..2e184e13fc7 100644
--- a/homeassistant/components/nextbus/sensor.py
+++ b/homeassistant/components/nextbus/sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, CONF_STOP
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util.dt import utc_from_timestamp
 
@@ -23,7 +23,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Load values from configuration and initialize the platform."""
     _LOGGER.debug(config.data)
diff --git a/homeassistant/components/nextcloud/__init__.py b/homeassistant/components/nextcloud/__init__.py
index a487a3f1414..3edff53919d 100644
--- a/homeassistant/components/nextcloud/__init__.py
+++ b/homeassistant/components/nextcloud/__init__.py
@@ -9,7 +9,6 @@ from nextcloudmonitor import (
     NextcloudMonitorRequestError,
 )
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_PASSWORD,
     CONF_URL,
@@ -21,15 +20,13 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import entity_registry as er
 
-from .coordinator import NextcloudDataUpdateCoordinator
+from .coordinator import NextcloudConfigEntry, NextcloudDataUpdateCoordinator
 
 PLATFORMS = (Platform.SENSOR, Platform.BINARY_SENSOR, Platform.UPDATE)
 
 
 _LOGGER = logging.getLogger(__name__)
 
-type NextcloudConfigEntry = ConfigEntry[NextcloudDataUpdateCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: NextcloudConfigEntry) -> bool:
     """Set up the Nextcloud integration."""
diff --git a/homeassistant/components/nextcloud/binary_sensor.py b/homeassistant/components/nextcloud/binary_sensor.py
index c9d19efbd45..f51796e6c7f 100644
--- a/homeassistant/components/nextcloud/binary_sensor.py
+++ b/homeassistant/components/nextcloud/binary_sensor.py
@@ -10,9 +10,9 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import NextcloudConfigEntry
+from .coordinator import NextcloudConfigEntry
 from .entity import NextcloudEntity
 
 BINARY_SENSORS: Final[list[BinarySensorEntityDescription]] = [
@@ -54,7 +54,7 @@ BINARY_SENSORS: Final[list[BinarySensorEntityDescription]] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: NextcloudConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Nextcloud binary sensors."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/nextcloud/coordinator.py b/homeassistant/components/nextcloud/coordinator.py
index b5dc5e29507..d6bccec07bb 100644
--- a/homeassistant/components/nextcloud/coordinator.py
+++ b/homeassistant/components/nextcloud/coordinator.py
@@ -14,12 +14,16 @@ from .const import DEFAULT_SCAN_INTERVAL
 
 _LOGGER = logging.getLogger(__name__)
 
+type NextcloudConfigEntry = ConfigEntry[NextcloudDataUpdateCoordinator]
+
 
 class NextcloudDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Nextcloud data update coordinator."""
 
+    config_entry: NextcloudConfigEntry
+
     def __init__(
-        self, hass: HomeAssistant, ncm: NextcloudMonitor, entry: ConfigEntry
+        self, hass: HomeAssistant, ncm: NextcloudMonitor, entry: NextcloudConfigEntry
     ) -> None:
         """Initialize the Nextcloud coordinator."""
         self.ncm = ncm
@@ -28,6 +32,7 @@ class NextcloudDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             name=self.url,
             update_interval=DEFAULT_SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/nextcloud/entity.py b/homeassistant/components/nextcloud/entity.py
index 6632b2674eb..f2ebba7fdb2 100644
--- a/homeassistant/components/nextcloud/entity.py
+++ b/homeassistant/components/nextcloud/entity.py
@@ -6,9 +6,8 @@ from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import NextcloudConfigEntry
 from .const import DOMAIN
-from .coordinator import NextcloudDataUpdateCoordinator
+from .coordinator import NextcloudConfigEntry, NextcloudDataUpdateCoordinator
 
 
 class NextcloudEntity(CoordinatorEntity[NextcloudDataUpdateCoordinator]):
diff --git a/homeassistant/components/nextcloud/sensor.py b/homeassistant/components/nextcloud/sensor.py
index 19ac7bb0df7..63b31f0edde 100644
--- a/homeassistant/components/nextcloud/sensor.py
+++ b/homeassistant/components/nextcloud/sensor.py
@@ -20,10 +20,10 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.dt import utc_from_timestamp
 
-from . import NextcloudConfigEntry
+from .coordinator import NextcloudConfigEntry
 from .entity import NextcloudEntity
 
 UNIT_OF_LOAD: Final[str] = "load"
@@ -602,7 +602,7 @@ SENSORS: Final[list[NextcloudSensorEntityDescription]] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: NextcloudConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Nextcloud sensors."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/nextcloud/strings.json b/homeassistant/components/nextcloud/strings.json
index f9f7e4c2294..ef4e3de0f62 100644
--- a/homeassistant/components/nextcloud/strings.json
+++ b/homeassistant/components/nextcloud/strings.json
@@ -21,7 +21,7 @@
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "connection_error_during_import": "Connection error occured during yaml configuration import",
+      "connection_error_during_import": "Connection error occurred during yaml configuration import",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     },
     "error": {
@@ -70,7 +70,7 @@
         "name": "Cache memory"
       },
       "nextcloud_cache_num_entries": {
-        "name": "Cache number of entires"
+        "name": "Cache number of entries"
       },
       "nextcloud_cache_num_hits": {
         "name": "Cache number of hits"
@@ -88,7 +88,7 @@
         "name": "Cache start time"
       },
       "nextcloud_cache_ttl": {
-        "name": "Cache ttl"
+        "name": "Cache TTL"
       },
       "nextcloud_database_size": {
         "name": "Database size"
@@ -268,13 +268,13 @@
         "name": "Updates available"
       },
       "nextcloud_system_cpuload_1": {
-        "name": "CPU Load last 1 minute"
+        "name": "CPU load last 1 minute"
       },
       "nextcloud_system_cpuload_15": {
-        "name": "CPU Load last 15 minutes"
+        "name": "CPU load last 15 minutes"
       },
       "nextcloud_system_cpuload_5": {
-        "name": "CPU Load last 5 minutes"
+        "name": "CPU load last 5 minutes"
       },
       "nextcloud_system_freespace": {
         "name": "Free space"
diff --git a/homeassistant/components/nextcloud/update.py b/homeassistant/components/nextcloud/update.py
index 5b9de52ad1d..b991b001117 100644
--- a/homeassistant/components/nextcloud/update.py
+++ b/homeassistant/components/nextcloud/update.py
@@ -4,16 +4,16 @@ from __future__ import annotations
 
 from homeassistant.components.update import UpdateEntity, UpdateEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import NextcloudConfigEntry
+from .coordinator import NextcloudConfigEntry
 from .entity import NextcloudEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: NextcloudConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Nextcloud update entity."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/nextdns/__init__.py b/homeassistant/components/nextdns/__init__.py
index 7f0729bca1e..eb8bd26cb9b 100644
--- a/homeassistant/components/nextdns/__init__.py
+++ b/homeassistant/components/nextdns/__init__.py
@@ -36,6 +36,7 @@ from .const import (
     ATTR_SETTINGS,
     ATTR_STATUS,
     CONF_PROFILE_ID,
+    DOMAIN,
     UPDATE_INTERVAL_ANALYTICS,
     UPDATE_INTERVAL_CONNECTION,
     UPDATE_INTERVAL_SETTINGS,
@@ -88,9 +89,20 @@ async def async_setup_entry(hass: HomeAssistant, entry: NextDnsConfigEntry) -> b
     try:
         nextdns = await NextDns.create(websession, api_key)
     except (ApiError, ClientConnectorError, RetryError, TimeoutError) as err:
-        raise ConfigEntryNotReady from err
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="cannot_connect",
+            translation_placeholders={
+                "entry": entry.title,
+                "error": repr(err),
+            },
+        ) from err
     except InvalidApiKeyError as err:
-        raise ConfigEntryAuthFailed from err
+        raise ConfigEntryAuthFailed(
+            translation_domain=DOMAIN,
+            translation_key="auth_error",
+            translation_placeholders={"entry": entry.title},
+        ) from err
 
     tasks = []
     coordinators = {}
@@ -98,7 +110,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: NextDnsConfigEntry) -> b
     # Independent DataUpdateCoordinator is used for each API endpoint to avoid
     # unnecessary requests when entities using this endpoint are disabled.
     for coordinator_name, coordinator_class, update_interval in COORDINATORS:
-        coordinator = coordinator_class(hass, nextdns, profile_id, update_interval)
+        coordinator = coordinator_class(
+            hass, entry, nextdns, profile_id, update_interval
+        )
         tasks.append(coordinator.async_config_entry_first_refresh())
         coordinators[coordinator_name] = coordinator
 
diff --git a/homeassistant/components/nextdns/binary_sensor.py b/homeassistant/components/nextdns/binary_sensor.py
index 08a1f89418f..ed244146efc 100644
--- a/homeassistant/components/nextdns/binary_sensor.py
+++ b/homeassistant/components/nextdns/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import NextDnsConfigEntry
@@ -51,7 +51,7 @@ SENSORS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: NextDnsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add NextDNS entities from a config_entry."""
     coordinator = entry.runtime_data.connection
diff --git a/homeassistant/components/nextdns/button.py b/homeassistant/components/nextdns/button.py
index 164d725b393..2adccaa304f 100644
--- a/homeassistant/components/nextdns/button.py
+++ b/homeassistant/components/nextdns/button.py
@@ -2,15 +2,19 @@
 
 from __future__ import annotations
 
-from nextdns import AnalyticsStatus
+from aiohttp import ClientError
+from aiohttp.client_exceptions import ClientConnectorError
+from nextdns import AnalyticsStatus, ApiError, InvalidApiKeyError
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import NextDnsConfigEntry
+from .const import DOMAIN
 from .coordinator import NextDnsUpdateCoordinator
 
 PARALLEL_UPDATES = 1
@@ -25,7 +29,7 @@ CLEAR_LOGS_BUTTON = ButtonEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: NextDnsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add aNextDNS entities from a config_entry."""
     coordinator = entry.runtime_data.status
@@ -53,4 +57,21 @@ class NextDnsButton(
 
     async def async_press(self) -> None:
         """Trigger cleaning logs."""
-        await self.coordinator.nextdns.clear_logs(self.coordinator.profile_id)
+        try:
+            await self.coordinator.nextdns.clear_logs(self.coordinator.profile_id)
+        except (
+            ApiError,
+            ClientConnectorError,
+            TimeoutError,
+            ClientError,
+        ) as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="method_error",
+                translation_placeholders={
+                    "entity": self.entity_id,
+                    "error": repr(err),
+                },
+            ) from err
+        except InvalidApiKeyError:
+            self.coordinator.config_entry.async_start_reauth(self.hass)
diff --git a/homeassistant/components/nextdns/config_flow.py b/homeassistant/components/nextdns/config_flow.py
index d3327c4c08b..d36064d8fb0 100644
--- a/homeassistant/components/nextdns/config_flow.py
+++ b/homeassistant/components/nextdns/config_flow.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
+import logging
 from typing import Any
 
 from aiohttp.client_exceptions import ClientConnectorError
@@ -19,6 +20,8 @@ from .const import CONF_PROFILE_ID, DOMAIN
 
 AUTH_SCHEMA = vol.Schema({vol.Required(CONF_API_KEY): str})
 
+_LOGGER = logging.getLogger(__name__)
+
 
 async def async_init_nextdns(hass: HomeAssistant, api_key: str) -> NextDns:
     """Check if credentials are valid."""
@@ -51,7 +54,8 @@ class NextDnsFlowHandler(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "invalid_api_key"
             except (ApiError, ClientConnectorError, RetryError, TimeoutError):
                 errors["base"] = "cannot_connect"
-            except Exception:  # noqa: BLE001
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
                 return await self.async_step_profiles()
@@ -111,7 +115,8 @@ class NextDnsFlowHandler(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "invalid_api_key"
             except (ApiError, ClientConnectorError, RetryError, TimeoutError):
                 errors["base"] = "cannot_connect"
-            except Exception:  # noqa: BLE001
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
                 return self.async_update_reload_and_abort(
diff --git a/homeassistant/components/nextdns/coordinator.py b/homeassistant/components/nextdns/coordinator.py
index 6b35e35a027..41f6ff43a2a 100644
--- a/homeassistant/components/nextdns/coordinator.py
+++ b/homeassistant/components/nextdns/coordinator.py
@@ -1,8 +1,10 @@
 """NextDns coordinator."""
 
+from __future__ import annotations
+
 from datetime import timedelta
 import logging
-from typing import TypeVar
+from typing import TYPE_CHECKING, TypeVar
 
 from aiohttp.client_exceptions import ClientConnectorError
 from nextdns import (
@@ -25,6 +27,9 @@ from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
+if TYPE_CHECKING:
+    from . import NextDnsConfigEntry
+
 from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
@@ -35,9 +40,12 @@ CoordinatorDataT = TypeVar("CoordinatorDataT", bound=NextDnsData)
 class NextDnsUpdateCoordinator(DataUpdateCoordinator[CoordinatorDataT]):
     """Class to manage fetching NextDNS data API."""
 
+    config_entry: NextDnsConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: NextDnsConfigEntry,
         nextdns: NextDns,
         profile_id: str,
         update_interval: timedelta,
@@ -54,7 +62,13 @@ class NextDnsUpdateCoordinator(DataUpdateCoordinator[CoordinatorDataT]):
             name=self.profile_name,
         )
 
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval)
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=update_interval,
+        )
 
     async def _async_update_data(self) -> CoordinatorDataT:
         """Update data via internal method."""
@@ -65,9 +79,20 @@ class NextDnsUpdateCoordinator(DataUpdateCoordinator[CoordinatorDataT]):
             ClientConnectorError,
             RetryError,
         ) as err:
-            raise UpdateFailed(err) from err
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="update_error",
+                translation_placeholders={
+                    "entry": self.config_entry.title,
+                    "error": repr(err),
+                },
+            ) from err
         except InvalidApiKeyError as err:
-            raise ConfigEntryAuthFailed from err
+            raise ConfigEntryAuthFailed(
+                translation_domain=DOMAIN,
+                translation_key="auth_error",
+                translation_placeholders={"entry": self.config_entry.title},
+            ) from err
 
     async def _async_update_data_internal(self) -> CoordinatorDataT:
         """Update data via library."""
diff --git a/homeassistant/components/nextdns/sensor.py b/homeassistant/components/nextdns/sensor.py
index ef2b5140fa1..0a4a8eaad8f 100644
--- a/homeassistant/components/nextdns/sensor.py
+++ b/homeassistant/components/nextdns/sensor.py
@@ -21,7 +21,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -286,7 +286,7 @@ SENSORS: tuple[NextDnsSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: NextDnsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add a NextDNS entities from a config_entry."""
     async_add_entities(
diff --git a/homeassistant/components/nextdns/strings.json b/homeassistant/components/nextdns/strings.json
index f2a5fa2816d..38944a0711e 100644
--- a/homeassistant/components/nextdns/strings.json
+++ b/homeassistant/components/nextdns/strings.json
@@ -359,5 +359,19 @@
         "name": "Force YouTube restricted mode"
       }
     }
+  },
+  "exceptions": {
+    "auth_error": {
+      "message": "Authentication failed for {entry}, please update your API key"
+    },
+    "cannot_connect": {
+      "message": "An error occurred while connecting to the NextDNS API for {entry}: {error}"
+    },
+    "method_error": {
+      "message": "An error occurred while calling the NextDNS API method for {entity}: {error}"
+    },
+    "update_error": {
+      "message": "An error occurred while retrieving data from the NextDNS API for {entry}: {error}"
+    }
   }
 }
diff --git a/homeassistant/components/nextdns/switch.py b/homeassistant/components/nextdns/switch.py
index 37ff22c7521..8bdca76b955 100644
--- a/homeassistant/components/nextdns/switch.py
+++ b/homeassistant/components/nextdns/switch.py
@@ -8,16 +8,17 @@ from typing import Any
 
 from aiohttp import ClientError
 from aiohttp.client_exceptions import ClientConnectorError
-from nextdns import ApiError, Settings
+from nextdns import ApiError, InvalidApiKeyError, Settings
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import NextDnsConfigEntry
+from .const import DOMAIN
 from .coordinator import NextDnsUpdateCoordinator
 
 PARALLEL_UPDATES = 1
@@ -525,7 +526,7 @@ SWITCHES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: NextDnsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add NextDNS entities from a config_entry."""
     coordinator = entry.runtime_data.settings
@@ -582,9 +583,16 @@ class NextDnsSwitch(
             ClientError,
         ) as err:
             raise HomeAssistantError(
-                "NextDNS API returned an error calling set_setting for"
-                f" {self.entity_id}: {err}"
+                translation_domain=DOMAIN,
+                translation_key="method_error",
+                translation_placeholders={
+                    "entity": self.entity_id,
+                    "error": repr(err),
+                },
             ) from err
+        except InvalidApiKeyError:
+            self.coordinator.config_entry.async_start_reauth(self.hass)
+            return
 
         if result:
             self._attr_is_on = new_state
diff --git a/homeassistant/components/nfandroidtv/__init__.py b/homeassistant/components/nfandroidtv/__init__.py
index ae7a4e615d4..50674a7ed46 100644
--- a/homeassistant/components/nfandroidtv/__init__.py
+++ b/homeassistant/components/nfandroidtv/__init__.py
@@ -6,8 +6,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DATA_HASS_CONFIG, DOMAIN
diff --git a/homeassistant/components/nfandroidtv/notify.py b/homeassistant/components/nfandroidtv/notify.py
index dd6b15400d9..f6d9bcde432 100644
--- a/homeassistant/components/nfandroidtv/notify.py
+++ b/homeassistant/components/nfandroidtv/notify.py
@@ -20,7 +20,7 @@ from homeassistant.components.notify import (
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import (
diff --git a/homeassistant/components/nibe_heatpump/__init__.py b/homeassistant/components/nibe_heatpump/__init__.py
index b3ceb00a834..ac201ed2322 100644
--- a/homeassistant/components/nibe_heatpump/__init__.py
+++ b/homeassistant/components/nibe_heatpump/__init__.py
@@ -81,7 +81,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _async_stop)
     )
 
-    coordinator = CoilCoordinator(hass, heatpump, connection)
+    coordinator = CoilCoordinator(hass, entry, heatpump, connection)
 
     data = hass.data.setdefault(DOMAIN, {})
     data[entry.entry_id] = coordinator
diff --git a/homeassistant/components/nibe_heatpump/binary_sensor.py b/homeassistant/components/nibe_heatpump/binary_sensor.py
index 0cb16bf4485..284e4d83569 100644
--- a/homeassistant/components/nibe_heatpump/binary_sensor.py
+++ b/homeassistant/components/nibe_heatpump/binary_sensor.py
@@ -8,7 +8,7 @@ from homeassistant.components.binary_sensor import ENTITY_ID_FORMAT, BinarySenso
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import CoilCoordinator
@@ -18,7 +18,7 @@ from .entity import CoilEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up platform."""
 
diff --git a/homeassistant/components/nibe_heatpump/button.py b/homeassistant/components/nibe_heatpump/button.py
index df8ceef6479..849912af656 100644
--- a/homeassistant/components/nibe_heatpump/button.py
+++ b/homeassistant/components/nibe_heatpump/button.py
@@ -9,7 +9,7 @@ from homeassistant.components.button import ButtonEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, LOGGER
@@ -19,7 +19,7 @@ from .coordinator import CoilCoordinator
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up platform."""
 
diff --git a/homeassistant/components/nibe_heatpump/climate.py b/homeassistant/components/nibe_heatpump/climate.py
index 94db90e7f58..1b8a0ecc0df 100644
--- a/homeassistant/components/nibe_heatpump/climate.py
+++ b/homeassistant/components/nibe_heatpump/climate.py
@@ -27,7 +27,7 @@ from homeassistant.components.climate import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
@@ -44,7 +44,7 @@ from .coordinator import CoilCoordinator
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up platform."""
 
diff --git a/homeassistant/components/nibe_heatpump/coordinator.py b/homeassistant/components/nibe_heatpump/coordinator.py
index faaac5f165a..2451e2fbda9 100644
--- a/homeassistant/components/nibe_heatpump/coordinator.py
+++ b/homeassistant/components/nibe_heatpump/coordinator.py
@@ -71,12 +71,17 @@ class CoilCoordinator(ContextCoordinator[dict[int, CoilData], int]):
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         heatpump: HeatPump,
         connection: Connection,
     ) -> None:
         """Initialize coordinator."""
         super().__init__(
-            hass, LOGGER, name="Nibe Heat Pump", update_interval=timedelta(seconds=60)
+            hass,
+            LOGGER,
+            config_entry=config_entry,
+            name="Nibe Heat Pump",
+            update_interval=timedelta(seconds=60),
         )
 
         self.data = {}
diff --git a/homeassistant/components/nibe_heatpump/manifest.json b/homeassistant/components/nibe_heatpump/manifest.json
index 049ba905f04..a8441fb90d8 100644
--- a/homeassistant/components/nibe_heatpump/manifest.json
+++ b/homeassistant/components/nibe_heatpump/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/nibe_heatpump",
   "iot_class": "local_polling",
-  "requirements": ["nibe==2.14.0"]
+  "requirements": ["nibe==2.17.0"]
 }
diff --git a/homeassistant/components/nibe_heatpump/number.py b/homeassistant/components/nibe_heatpump/number.py
index cb379139eed..d85e5e9b765 100644
--- a/homeassistant/components/nibe_heatpump/number.py
+++ b/homeassistant/components/nibe_heatpump/number.py
@@ -8,7 +8,7 @@ from homeassistant.components.number import ENTITY_ID_FORMAT, NumberEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import CoilCoordinator
@@ -18,7 +18,7 @@ from .entity import CoilEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up platform."""
 
diff --git a/homeassistant/components/nibe_heatpump/select.py b/homeassistant/components/nibe_heatpump/select.py
index 3aecff94649..c92c12a882a 100644
--- a/homeassistant/components/nibe_heatpump/select.py
+++ b/homeassistant/components/nibe_heatpump/select.py
@@ -8,7 +8,7 @@ from homeassistant.components.select import ENTITY_ID_FORMAT, SelectEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import CoilCoordinator
@@ -18,7 +18,7 @@ from .entity import CoilEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up platform."""
 
diff --git a/homeassistant/components/nibe_heatpump/sensor.py b/homeassistant/components/nibe_heatpump/sensor.py
index d34fed50977..54cd0f7ea34 100644
--- a/homeassistant/components/nibe_heatpump/sensor.py
+++ b/homeassistant/components/nibe_heatpump/sensor.py
@@ -13,17 +13,20 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
+    PERCENTAGE,
     EntityCategory,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
     UnitOfFrequency,
     UnitOfPower,
+    UnitOfPressure,
     UnitOfTemperature,
     UnitOfTime,
+    UnitOfVolumeFlowRate,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import CoilCoordinator
@@ -114,6 +117,20 @@ UNIT_DESCRIPTIONS = {
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement=UnitOfTime.HOURS,
     ),
+    "min": SensorEntityDescription(
+        key="min",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        device_class=SensorDeviceClass.DURATION,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        native_unit_of_measurement=UnitOfTime.MINUTES,
+    ),
+    "s": SensorEntityDescription(
+        key="s",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        device_class=SensorDeviceClass.DURATION,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+    ),
     "Hz": SensorEntityDescription(
         key="Hz",
         entity_category=EntityCategory.DIAGNOSTIC,
@@ -121,13 +138,55 @@ UNIT_DESCRIPTIONS = {
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfFrequency.HERTZ,
     ),
+    "Pa": SensorEntityDescription(
+        key="Pa",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        device_class=SensorDeviceClass.PRESSURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfPressure.PA,
+    ),
+    "kPa": SensorEntityDescription(
+        key="kPa",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        device_class=SensorDeviceClass.PRESSURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfPressure.KPA,
+    ),
+    "bar": SensorEntityDescription(
+        key="bar",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        device_class=SensorDeviceClass.PRESSURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfPressure.BAR,
+    ),
+    "l/m": SensorEntityDescription(
+        key="l/m",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        device_class=SensorDeviceClass.VOLUME_FLOW_RATE,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfVolumeFlowRate.LITERS_PER_MINUTE,
+    ),
+    "m³/h": SensorEntityDescription(
+        key="m³/h",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        device_class=SensorDeviceClass.VOLUME_FLOW_RATE,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfVolumeFlowRate.CUBIC_METERS_PER_HOUR,
+    ),
+    "%RH": SensorEntityDescription(
+        key="%RH",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        device_class=SensorDeviceClass.HUMIDITY,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=PERCENTAGE,
+    ),
 }
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up platform."""
 
diff --git a/homeassistant/components/nibe_heatpump/strings.json b/homeassistant/components/nibe_heatpump/strings.json
index 6fa421e0855..c65a76d3364 100644
--- a/homeassistant/components/nibe_heatpump/strings.json
+++ b/homeassistant/components/nibe_heatpump/strings.json
@@ -10,13 +10,13 @@
       },
       "modbus": {
         "data": {
-          "model": "Model of Heat Pump",
+          "model": "Model of heat pump",
           "modbus_url": "Modbus URL",
-          "modbus_unit": "Modbus Unit Identifier"
+          "modbus_unit": "Modbus unit identifier"
         },
         "data_description": {
-          "modbus_url": "Modbus URL that describes the connection to your Heat Pump or MODBUS40 unit. It should be on the form:\n - `tcp://[HOST]:[PORT]` for Modbus TCP connection\n - `serial://[LOCAL DEVICE]` for a local Modbus RTU connection\n - `rfc2217://[HOST]:[PORT]` for a remote telnet based Modbus RTU connection.",
-          "modbus_unit": "Unit identification for your Heat Pump. Can usually be left at 0."
+          "modbus_url": "Modbus URL that describes the connection to your heat pump or MODBUS40 unit. It should be in the form:\n - `tcp://[HOST]:[PORT]` for Modbus TCP connection\n - `serial://[LOCAL DEVICE]` for a local Modbus RTU connection\n - `rfc2217://[HOST]:[PORT]` for a remote Telnet-based Modbus RTU connection.",
+          "modbus_unit": "Unit identification for your heat pump. Can usually be left at 0."
         }
       },
       "nibegw": {
diff --git a/homeassistant/components/nibe_heatpump/switch.py b/homeassistant/components/nibe_heatpump/switch.py
index 72b7c20c7b3..2daf3fc48ff 100644
--- a/homeassistant/components/nibe_heatpump/switch.py
+++ b/homeassistant/components/nibe_heatpump/switch.py
@@ -10,7 +10,7 @@ from homeassistant.components.switch import ENTITY_ID_FORMAT, SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import CoilCoordinator
@@ -20,7 +20,7 @@ from .entity import CoilEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up platform."""
 
diff --git a/homeassistant/components/nibe_heatpump/water_heater.py b/homeassistant/components/nibe_heatpump/water_heater.py
index f53df596d27..a72851e7eab 100644
--- a/homeassistant/components/nibe_heatpump/water_heater.py
+++ b/homeassistant/components/nibe_heatpump/water_heater.py
@@ -17,7 +17,7 @@ from homeassistant.components.water_heater import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
@@ -32,7 +32,7 @@ from .coordinator import CoilCoordinator
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up platform."""
 
diff --git a/homeassistant/components/nice_go/__init__.py b/homeassistant/components/nice_go/__init__.py
index b217112c192..a8d2bd71ac4 100644
--- a/homeassistant/components/nice_go/__init__.py
+++ b/homeassistant/components/nice_go/__init__.py
@@ -4,11 +4,10 @@ from __future__ import annotations
 
 import logging
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP, Platform
 from homeassistant.core import HomeAssistant
 
-from .coordinator import NiceGOUpdateCoordinator
+from .coordinator import NiceGOConfigEntry, NiceGOUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 PLATFORMS: list[Platform] = [
@@ -18,13 +17,11 @@ PLATFORMS: list[Platform] = [
     Platform.SWITCH,
 ]
 
-type NiceGOConfigEntry = ConfigEntry[NiceGOUpdateCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: NiceGOConfigEntry) -> bool:
     """Set up Nice G.O. from a config entry."""
 
-    coordinator = NiceGOUpdateCoordinator(hass)
+    coordinator = NiceGOUpdateCoordinator(hass, entry)
     entry.async_on_unload(
         hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, coordinator.async_ha_stop)
     )
diff --git a/homeassistant/components/nice_go/coordinator.py b/homeassistant/components/nice_go/coordinator.py
index 07b20bbbf10..ffdd9dbd518 100644
--- a/homeassistant/components/nice_go/coordinator.py
+++ b/homeassistant/components/nice_go/coordinator.py
@@ -54,19 +54,18 @@ class NiceGODevice:
     vacation_mode: bool | None
 
 
+type NiceGOConfigEntry = ConfigEntry[NiceGOUpdateCoordinator]
+
+
 class NiceGOUpdateCoordinator(DataUpdateCoordinator[dict[str, NiceGODevice]]):
     """DataUpdateCoordinator for Nice G.O."""
 
-    config_entry: ConfigEntry
+    config_entry: NiceGOConfigEntry
     organization_id: str
 
-    def __init__(self, hass: HomeAssistant) -> None:
+    def __init__(self, hass: HomeAssistant, config_entry: NiceGOConfigEntry) -> None:
         """Initialize DataUpdateCoordinator for Nice G.O."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            name="Nice G.O.",
-        )
+        super().__init__(hass, _LOGGER, config_entry=config_entry, name="Nice G.O.")
 
         self.refresh_token = self.config_entry.data[CONF_REFRESH_TOKEN]
         self.refresh_token_creation_time = self.config_entry.data[
@@ -154,7 +153,7 @@ class NiceGOUpdateCoordinator(DataUpdateCoordinator[dict[str, NiceGODevice]]):
             )
             try:
                 if datetime.now().timestamp() >= expiry_time:
-                    await self._update_refresh_token()
+                    await self.update_refresh_token()
                 else:
                     await self.api.authenticate_refresh(
                         self.refresh_token, async_get_clientsession(self.hass)
@@ -179,7 +178,7 @@ class NiceGOUpdateCoordinator(DataUpdateCoordinator[dict[str, NiceGODevice]]):
             else:
                 self.async_set_updated_data(devices)
 
-    async def _update_refresh_token(self) -> None:
+    async def update_refresh_token(self) -> None:
         """Update the refresh token with Nice G.O. API."""
         _LOGGER.debug("Updating the refresh token with Nice G.O. API")
         try:
diff --git a/homeassistant/components/nice_go/cover.py b/homeassistant/components/nice_go/cover.py
index 6360e398b96..b9b39711a01 100644
--- a/homeassistant/components/nice_go/cover.py
+++ b/homeassistant/components/nice_go/cover.py
@@ -2,21 +2,17 @@
 
 from typing import Any
 
-from aiohttp import ClientError
-from nice_go import ApiError
-
 from homeassistant.components.cover import (
     CoverDeviceClass,
     CoverEntity,
     CoverEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import NiceGOConfigEntry
-from .const import DOMAIN
+from .coordinator import NiceGOConfigEntry
 from .entity import NiceGOEntity
+from .util import retry
 
 DEVICE_CLASSES = {
     "WallStation": CoverDeviceClass.GARAGE,
@@ -29,7 +25,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: NiceGOConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Nice G.O. cover."""
     coordinator = config_entry.runtime_data
@@ -71,30 +67,18 @@ class NiceGOCoverEntity(NiceGOEntity, CoverEntity):
         """Return if cover is closing."""
         return self.data.barrier_status == "closing"
 
+    @retry("close_cover_error")
     async def async_close_cover(self, **kwargs: Any) -> None:
         """Close the garage door."""
         if self.is_closed:
             return
 
-        try:
-            await self.coordinator.api.close_barrier(self._device_id)
-        except (ApiError, ClientError) as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="close_cover_error",
-                translation_placeholders={"exception": str(err)},
-            ) from err
+        await self.coordinator.api.close_barrier(self._device_id)
 
+    @retry("open_cover_error")
     async def async_open_cover(self, **kwargs: Any) -> None:
         """Open the garage door."""
         if self.is_opened:
             return
 
-        try:
-            await self.coordinator.api.open_barrier(self._device_id)
-        except (ApiError, ClientError) as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="open_cover_error",
-                translation_placeholders={"exception": str(err)},
-            ) from err
+        await self.coordinator.api.open_barrier(self._device_id)
diff --git a/homeassistant/components/nice_go/diagnostics.py b/homeassistant/components/nice_go/diagnostics.py
index 2c9a695d4b5..2a663d8925a 100644
--- a/homeassistant/components/nice_go/diagnostics.py
+++ b/homeassistant/components/nice_go/diagnostics.py
@@ -9,8 +9,8 @@ from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
 from homeassistant.core import HomeAssistant
 
-from . import NiceGOConfigEntry
 from .const import CONF_REFRESH_TOKEN
+from .coordinator import NiceGOConfigEntry
 
 TO_REDACT = {CONF_PASSWORD, CONF_EMAIL, CONF_REFRESH_TOKEN, "title", "unique_id"}
 
diff --git a/homeassistant/components/nice_go/event.py b/homeassistant/components/nice_go/event.py
index cd9198bcd26..400cc3d2144 100644
--- a/homeassistant/components/nice_go/event.py
+++ b/homeassistant/components/nice_go/event.py
@@ -5,9 +5,9 @@ from typing import Any
 
 from homeassistant.components.event import EventEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import NiceGOConfigEntry
+from .coordinator import NiceGOConfigEntry
 from .entity import NiceGOEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -16,7 +16,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: NiceGOConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Nice G.O. event."""
 
diff --git a/homeassistant/components/nice_go/light.py b/homeassistant/components/nice_go/light.py
index abb192adde1..bf283ed6eff 100644
--- a/homeassistant/components/nice_go/light.py
+++ b/homeassistant/components/nice_go/light.py
@@ -3,23 +3,19 @@
 import logging
 from typing import TYPE_CHECKING, Any
 
-from aiohttp import ClientError
-from nice_go import ApiError
-
 from homeassistant.components.light import ColorMode, LightEntity
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import NiceGOConfigEntry
 from .const import (
-    DOMAIN,
     KNOWN_UNSUPPORTED_DEVICE_TYPES,
     SUPPORTED_DEVICE_TYPES,
     UNSUPPORTED_DEVICE_WARNING,
 )
+from .coordinator import NiceGOConfigEntry
 from .entity import NiceGOEntity
+from .util import retry
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -27,7 +23,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: NiceGOConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Nice G.O. light."""
 
@@ -63,26 +59,14 @@ class NiceGOLightEntity(NiceGOEntity, LightEntity):
             assert self.data.light_status is not None
         return self.data.light_status
 
+    @retry("light_on_error")
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn on the light."""
 
-        try:
-            await self.coordinator.api.light_on(self._device_id)
-        except (ApiError, ClientError) as error:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="light_on_error",
-                translation_placeholders={"exception": str(error)},
-            ) from error
+        await self.coordinator.api.light_on(self._device_id)
 
+    @retry("light_off_error")
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn off the light."""
 
-        try:
-            await self.coordinator.api.light_off(self._device_id)
-        except (ApiError, ClientError) as error:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="light_off_error",
-                translation_placeholders={"exception": str(error)},
-            ) from error
+        await self.coordinator.api.light_off(self._device_id)
diff --git a/homeassistant/components/nice_go/manifest.json b/homeassistant/components/nice_go/manifest.json
index 1af23ec4d9b..8f43ed8a3e8 100644
--- a/homeassistant/components/nice_go/manifest.json
+++ b/homeassistant/components/nice_go/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_push",
   "loggers": ["nice_go"],
-  "requirements": ["nice-go==1.0.0"]
+  "requirements": ["nice-go==1.0.1"]
 }
diff --git a/homeassistant/components/nice_go/switch.py b/homeassistant/components/nice_go/switch.py
index e3b85528f3b..f043a23eab5 100644
--- a/homeassistant/components/nice_go/switch.py
+++ b/homeassistant/components/nice_go/switch.py
@@ -5,23 +5,19 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING, Any
 
-from aiohttp import ClientError
-from nice_go import ApiError
-
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import NiceGOConfigEntry
 from .const import (
-    DOMAIN,
     KNOWN_UNSUPPORTED_DEVICE_TYPES,
     SUPPORTED_DEVICE_TYPES,
     UNSUPPORTED_DEVICE_WARNING,
 )
+from .coordinator import NiceGOConfigEntry
 from .entity import NiceGOEntity
+from .util import retry
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -29,7 +25,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: NiceGOConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Nice G.O. switch."""
     coordinator = config_entry.runtime_data
@@ -65,26 +61,14 @@ class NiceGOSwitchEntity(NiceGOEntity, SwitchEntity):
             assert self.data.vacation_mode is not None
         return self.data.vacation_mode
 
+    @retry("switch_on_error")
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the switch on."""
 
-        try:
-            await self.coordinator.api.vacation_mode_on(self.data.id)
-        except (ApiError, ClientError) as error:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="switch_on_error",
-                translation_placeholders={"exception": str(error)},
-            ) from error
+        await self.coordinator.api.vacation_mode_on(self.data.id)
 
+    @retry("switch_off_error")
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the switch off."""
 
-        try:
-            await self.coordinator.api.vacation_mode_off(self.data.id)
-        except (ApiError, ClientError) as error:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="switch_off_error",
-                translation_placeholders={"exception": str(error)},
-            ) from error
+        await self.coordinator.api.vacation_mode_off(self.data.id)
diff --git a/homeassistant/components/nice_go/util.py b/homeassistant/components/nice_go/util.py
new file mode 100644
index 00000000000..02dee6b0ac1
--- /dev/null
+++ b/homeassistant/components/nice_go/util.py
@@ -0,0 +1,66 @@
+"""Utilities for Nice G.O."""
+
+from collections.abc import Callable, Coroutine
+from functools import wraps
+from typing import Any, Protocol, runtime_checkable
+
+from aiohttp import ClientError
+from nice_go import ApiError, AuthFailedError
+
+from homeassistant.exceptions import ConfigEntryAuthFailed, HomeAssistantError
+from homeassistant.helpers.update_coordinator import UpdateFailed
+
+from .const import DOMAIN
+
+
+@runtime_checkable
+class _ArgsProtocol(Protocol):
+    coordinator: Any
+    hass: Any
+
+
+def retry[_R, **P](
+    translation_key: str,
+) -> Callable[
+    [Callable[P, Coroutine[Any, Any, _R]]], Callable[P, Coroutine[Any, Any, _R]]
+]:
+    """Retry decorator to handle API errors."""
+
+    def decorator(
+        func: Callable[P, Coroutine[Any, Any, _R]],
+    ) -> Callable[P, Coroutine[Any, Any, _R]]:
+        @wraps(func)
+        async def wrapper(*args: P.args, **kwargs: P.kwargs):
+            instance = args[0]
+            if not isinstance(instance, _ArgsProtocol):
+                raise TypeError("First argument must have correct attributes")
+            try:
+                return await func(*args, **kwargs)
+            except (ApiError, ClientError) as err:
+                raise HomeAssistantError(
+                    translation_domain=DOMAIN,
+                    translation_key=translation_key,
+                    translation_placeholders={"exception": str(err)},
+                ) from err
+            except AuthFailedError:
+                # Try refreshing token and retry
+                try:
+                    await instance.coordinator.update_refresh_token()
+                    return await func(*args, **kwargs)
+                except (ApiError, ClientError, UpdateFailed) as err:
+                    raise HomeAssistantError(
+                        translation_domain=DOMAIN,
+                        translation_key=translation_key,
+                        translation_placeholders={"exception": str(err)},
+                    ) from err
+                except (AuthFailedError, ConfigEntryAuthFailed) as err:
+                    instance.coordinator.config_entry.async_start_reauth(instance.hass)
+                    raise HomeAssistantError(
+                        translation_domain=DOMAIN,
+                        translation_key=translation_key,
+                        translation_placeholders={"exception": str(err)},
+                    ) from err
+
+        return wrapper
+
+    return decorator
diff --git a/homeassistant/components/nightscout/sensor.py b/homeassistant/components/nightscout/sensor.py
index 620349ec3c3..de1dadf1143 100644
--- a/homeassistant/components/nightscout/sensor.py
+++ b/homeassistant/components/nightscout/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_DATE, UnitOfBloodGlucoseConcentration
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import ATTR_DELTA, ATTR_DEVICE, ATTR_DIRECTION, DOMAIN
 
@@ -27,7 +27,7 @@ DEFAULT_NAME = "Blood Glucose"
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Glucose Sensor."""
     api = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/niko_home_control/__init__.py b/homeassistant/components/niko_home_control/__init__.py
index ae4e8986816..37396e69caa 100644
--- a/homeassistant/components/niko_home_control/__init__.py
+++ b/homeassistant/components/niko_home_control/__init__.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from nclib.errors import NetcatError
 from nhc.controller import NHCController
 
 from homeassistant.config_entries import ConfigEntry
@@ -25,12 +24,8 @@ async def async_setup_entry(
     controller = NHCController(entry.data[CONF_HOST])
     try:
         await controller.connect()
-    except NetcatError as err:
+    except (TimeoutError, OSError) as err:
         raise ConfigEntryNotReady("cannot connect to controller.") from err
-    except OSError as err:
-        raise ConfigEntryNotReady(
-            "unknown error while connecting to controller."
-        ) from err
 
     entry.runtime_data = controller
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
diff --git a/homeassistant/components/niko_home_control/config_flow.py b/homeassistant/components/niko_home_control/config_flow.py
index f37e5e9248a..76e71bc1690 100644
--- a/homeassistant/components/niko_home_control/config_flow.py
+++ b/homeassistant/components/niko_home_control/config_flow.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import logging
 from typing import Any
 
 from nhc.controller import NHCController
@@ -12,6 +13,8 @@ from homeassistant.const import CONF_HOST
 
 from .const import DOMAIN
 
+_LOGGER = logging.getLogger(__name__)
+
 DATA_SCHEMA = vol.Schema(
     {
         vol.Required(CONF_HOST): str,
@@ -25,7 +28,8 @@ async def test_connection(host: str) -> str | None:
     controller = NHCController(host, 8000)
     try:
         await controller.connect()
-    except Exception:  # noqa: BLE001
+    except Exception:
+        _LOGGER.exception("Unexpected exception")
         return "cannot_connect"
     return None
 
diff --git a/homeassistant/components/niko_home_control/cover.py b/homeassistant/components/niko_home_control/cover.py
index 51e2a8a702d..2ab3438c4d9 100644
--- a/homeassistant/components/niko_home_control/cover.py
+++ b/homeassistant/components/niko_home_control/cover.py
@@ -8,7 +8,7 @@ from nhc.cover import NHCCover
 
 from homeassistant.components.cover import CoverEntity, CoverEntityFeature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import NikoHomeControlConfigEntry
 from .entity import NikoHomeControlEntity
@@ -17,7 +17,7 @@ from .entity import NikoHomeControlEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: NikoHomeControlConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Niko Home Control cover entry."""
     controller = entry.runtime_data
@@ -37,17 +37,17 @@ class NikoHomeControlCover(NikoHomeControlEntity, CoverEntity):
     )
     _action: NHCCover
 
-    def open_cover(self, **kwargs: Any) -> None:
+    async def async_open_cover(self, **kwargs: Any) -> None:
         """Open the cover."""
-        self._action.open()
+        await self._action.open()
 
-    def close_cover(self, **kwargs: Any) -> None:
+    async def async_close_cover(self, **kwargs: Any) -> None:
         """Close the cover."""
-        self._action.close()
+        await self._action.close()
 
-    def stop_cover(self, **kwargs: Any) -> None:
+    async def async_stop_cover(self, **kwargs: Any) -> None:
         """Stop the cover."""
-        self._action.stop()
+        await self._action.stop()
 
     def update_state(self):
         """Update HA state."""
diff --git a/homeassistant/components/niko_home_control/light.py b/homeassistant/components/niko_home_control/light.py
index 80f47e56438..b0a2d12b004 100644
--- a/homeassistant/components/niko_home_control/light.py
+++ b/homeassistant/components/niko_home_control/light.py
@@ -18,9 +18,11 @@ from homeassistant.config_entries import SOURCE_IMPORT
 from homeassistant.const import CONF_HOST
 from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.helpers import issue_registry as ir
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv, issue_registry as ir
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import NHCController, NikoHomeControlConfigEntry
@@ -81,7 +83,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: NikoHomeControlConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Niko Home Control light entry."""
     controller = entry.runtime_data
@@ -110,13 +112,13 @@ class NikoHomeControlLight(NikoHomeControlEntity, LightEntity):
             self._attr_supported_color_modes = {ColorMode.BRIGHTNESS}
             self._attr_brightness = round(action.state * 2.55)
 
-    def turn_on(self, **kwargs: Any) -> None:
+    async def async_turn_on(self, **kwargs: Any) -> None:
         """Instruct the light to turn on."""
-        self._action.turn_on(round(kwargs.get(ATTR_BRIGHTNESS, 255) / 2.55))
+        await self._action.turn_on(round(kwargs.get(ATTR_BRIGHTNESS, 255) / 2.55))
 
-    def turn_off(self, **kwargs: Any) -> None:
+    async def async_turn_off(self, **kwargs: Any) -> None:
         """Instruct the light to turn off."""
-        self._action.turn_off()
+        await self._action.turn_off()
 
     def update_state(self) -> None:
         """Handle updates from the controller."""
diff --git a/homeassistant/components/niko_home_control/manifest.json b/homeassistant/components/niko_home_control/manifest.json
index 57f83180eb0..83fca0ca2d6 100644
--- a/homeassistant/components/niko_home_control/manifest.json
+++ b/homeassistant/components/niko_home_control/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/niko_home_control",
   "iot_class": "local_push",
   "loggers": ["nikohomecontrol"],
-  "requirements": ["nhc==0.3.9"]
+  "requirements": ["nhc==0.4.10"]
 }
diff --git a/homeassistant/components/nilu/air_quality.py b/homeassistant/components/nilu/air_quality.py
index 7600a878548..31259349dea 100644
--- a/homeassistant/components/nilu/air_quality.py
+++ b/homeassistant/components/nilu/air_quality.py
@@ -34,7 +34,7 @@ from homeassistant.const import (
     CONF_SHOW_ON_MAP,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/nina/__init__.py b/homeassistant/components/nina/__init__.py
index d5b1c5ccb35..b02d6711e74 100644
--- a/homeassistant/components/nina/__init__.py
+++ b/homeassistant/components/nina/__init__.py
@@ -11,7 +11,6 @@ from .const import (
     CONF_AREA_FILTER,
     CONF_FILTER_CORONA,
     CONF_HEADLINE_FILTER,
-    CONF_REGIONS,
     DOMAIN,
     NO_MATCH_REGEX,
 )
@@ -22,9 +21,6 @@ PLATFORMS: list[str] = [Platform.BINARY_SENSOR]
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up platform from a ConfigEntry."""
-
-    regions: dict[str, str] = entry.data[CONF_REGIONS]
-
     if CONF_HEADLINE_FILTER not in entry.data:
         filter_regex = NO_MATCH_REGEX
 
@@ -39,12 +35,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         new_data = {**entry.data, CONF_AREA_FILTER: ALL_MATCH_REGEX}
         hass.config_entries.async_update_entry(entry, data=new_data)
 
-    coordinator = NINADataUpdateCoordinator(
-        hass,
-        regions,
-        entry.data[CONF_HEADLINE_FILTER],
-        entry.data[CONF_AREA_FILTER],
-    )
+    coordinator = NINADataUpdateCoordinator(hass, entry)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/nina/binary_sensor.py b/homeassistant/components/nina/binary_sensor.py
index 10d3008fd82..3f7d496aca9 100644
--- a/homeassistant/components/nina/binary_sensor.py
+++ b/homeassistant/components/nina/binary_sensor.py
@@ -11,7 +11,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
@@ -36,7 +36,7 @@ from .coordinator import NINADataUpdateCoordinator
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entries."""
 
diff --git a/homeassistant/components/nina/config_flow.py b/homeassistant/components/nina/config_flow.py
index a1ba9ae0c61..24c016e5e64 100644
--- a/homeassistant/components/nina/config_flow.py
+++ b/homeassistant/components/nina/config_flow.py
@@ -14,9 +14,8 @@ from homeassistant.config_entries import (
     OptionsFlow,
 )
 from homeassistant.core import callback
-from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.typing import VolDictType
 
 from .const import (
diff --git a/homeassistant/components/nina/coordinator.py b/homeassistant/components/nina/coordinator.py
index 2d9548f3d12..3c27729ef09 100644
--- a/homeassistant/components/nina/coordinator.py
+++ b/homeassistant/components/nina/coordinator.py
@@ -9,11 +9,19 @@ from typing import Any
 
 from pynina import ApiError, Nina
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import _LOGGER, DOMAIN, SCAN_INTERVAL
+from .const import (
+    _LOGGER,
+    CONF_AREA_FILTER,
+    CONF_HEADLINE_FILTER,
+    CONF_REGIONS,
+    DOMAIN,
+    SCAN_INTERVAL,
+)
 
 
 @dataclass
@@ -39,23 +47,29 @@ class NINADataUpdateCoordinator(
 ):
     """Class to manage fetching NINA data API."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
-        regions: dict[str, str],
-        headline_filter: str,
-        area_filter: str,
+        config_entry: ConfigEntry,
     ) -> None:
         """Initialize."""
-        self._regions: dict[str, str] = regions
         self._nina: Nina = Nina(async_get_clientsession(hass))
-        self.headline_filter: str = headline_filter
-        self.area_filter: str = area_filter
+        self.headline_filter: str = config_entry.data[CONF_HEADLINE_FILTER]
+        self.area_filter: str = config_entry.data[CONF_AREA_FILTER]
 
+        regions: dict[str, str] = config_entry.data[CONF_REGIONS]
         for region in regions:
             self._nina.addRegion(region)
 
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=SCAN_INTERVAL)
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=SCAN_INTERVAL,
+        )
 
     async def _async_update_data(self) -> dict[str, list[NinaWarningData]]:
         """Update data."""
diff --git a/homeassistant/components/nissan_leaf/__init__.py b/homeassistant/components/nissan_leaf/__init__.py
index 865ae33b38c..4f24cde0578 100644
--- a/homeassistant/components/nissan_leaf/__init__.py
+++ b/homeassistant/components/nissan_leaf/__init__.py
@@ -18,7 +18,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_PASSWORD, CONF_REGION, CONF_USERNAME, Platform
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import load_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.event import async_track_point_in_utc_time
diff --git a/homeassistant/components/nmap_tracker/__init__.py b/homeassistant/components/nmap_tracker/__init__.py
index dcb4e1361fd..72bf9284573 100644
--- a/homeassistant/components/nmap_tracker/__init__.py
+++ b/homeassistant/components/nmap_tracker/__init__.py
@@ -21,12 +21,11 @@ from homeassistant.components.device_tracker import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_EXCLUDE, CONF_HOSTS, EVENT_HOMEASSISTANT_STARTED
 from homeassistant.core import CoreState, HomeAssistant, callback
-from homeassistant.helpers import entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.event import async_track_time_interval
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import (
     CONF_HOME_INTERVAL,
diff --git a/homeassistant/components/nmap_tracker/config_flow.py b/homeassistant/components/nmap_tracker/config_flow.py
index e05150995aa..1f436edd60c 100644
--- a/homeassistant/components/nmap_tracker/config_flow.py
+++ b/homeassistant/components/nmap_tracker/config_flow.py
@@ -22,7 +22,7 @@ from homeassistant.config_entries import (
 )
 from homeassistant.const import CONF_EXCLUDE, CONF_HOSTS
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import VolDictType
 
 from .const import (
diff --git a/homeassistant/components/nmap_tracker/device_tracker.py b/homeassistant/components/nmap_tracker/device_tracker.py
index c8e7e7c25ea..afac3f06435 100644
--- a/homeassistant/components/nmap_tracker/device_tracker.py
+++ b/homeassistant/components/nmap_tracker/device_tracker.py
@@ -9,7 +9,7 @@ from homeassistant.components.device_tracker import ScannerEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import NmapDevice, NmapDeviceScanner, short_hostname, signal_device_update
 from .const import DOMAIN
@@ -18,7 +18,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up device tracker for Nmap Tracker component."""
     nmap_tracker = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/nmbs/__init__.py b/homeassistant/components/nmbs/__init__.py
index 9972d41ac7b..4a2783143ca 100644
--- a/homeassistant/components/nmbs/__init__.py
+++ b/homeassistant/components/nmbs/__init__.py
@@ -7,7 +7,8 @@ from pyrail import iRail
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
@@ -22,13 +23,13 @@ CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the NMBS component."""
 
-    api_client = iRail()
+    api_client = iRail(session=async_get_clientsession(hass))
 
     hass.data.setdefault(DOMAIN, {})
-    station_response = await hass.async_add_executor_job(api_client.get_stations)
-    if station_response == -1:
+    station_response = await api_client.get_stations()
+    if station_response is None:
         return False
-    hass.data[DOMAIN] = station_response["station"]
+    hass.data[DOMAIN] = station_response.stations
 
     return True
 
diff --git a/homeassistant/components/nmbs/config_flow.py b/homeassistant/components/nmbs/config_flow.py
index 24ef8cd4995..60ab015e22b 100644
--- a/homeassistant/components/nmbs/config_flow.py
+++ b/homeassistant/components/nmbs/config_flow.py
@@ -3,11 +3,13 @@
 from typing import Any
 
 from pyrail import iRail
+from pyrail.models import StationDetails
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import Platform
 from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.selector import (
     BooleanSelector,
     SelectOptionDict,
@@ -31,17 +33,15 @@ class NMBSConfigFlow(ConfigFlow, domain=DOMAIN):
 
     def __init__(self) -> None:
         """Initialize."""
-        self.api_client = iRail()
-        self.stations: list[dict[str, Any]] = []
+        self.stations: list[StationDetails] = []
 
-    async def _fetch_stations(self) -> list[dict[str, Any]]:
+    async def _fetch_stations(self) -> list[StationDetails]:
         """Fetch the stations."""
-        stations_response = await self.hass.async_add_executor_job(
-            self.api_client.get_stations
-        )
-        if stations_response == -1:
+        api_client = iRail(session=async_get_clientsession(self.hass))
+        stations_response = await api_client.get_stations()
+        if stations_response is None:
             raise CannotConnect("The API is currently unavailable.")
-        return stations_response["station"]
+        return stations_response.stations
 
     async def _fetch_stations_choices(self) -> list[SelectOptionDict]:
         """Fetch the stations options."""
@@ -50,7 +50,7 @@ class NMBSConfigFlow(ConfigFlow, domain=DOMAIN):
             self.stations = await self._fetch_stations()
 
         return [
-            SelectOptionDict(value=station["id"], label=station["standardname"])
+            SelectOptionDict(value=station.id, label=station.standard_name)
             for station in self.stations
         ]
 
@@ -72,19 +72,20 @@ class NMBSConfigFlow(ConfigFlow, domain=DOMAIN):
                 [station_from] = [
                     station
                     for station in self.stations
-                    if station["id"] == user_input[CONF_STATION_FROM]
+                    if station.id == user_input[CONF_STATION_FROM]
                 ]
                 [station_to] = [
                     station
                     for station in self.stations
-                    if station["id"] == user_input[CONF_STATION_TO]
+                    if station.id == user_input[CONF_STATION_TO]
                 ]
+                vias = "_excl_vias" if user_input.get(CONF_EXCLUDE_VIAS) else ""
                 await self.async_set_unique_id(
-                    f"{user_input[CONF_STATION_FROM]}_{user_input[CONF_STATION_TO]}"
+                    f"{user_input[CONF_STATION_FROM]}_{user_input[CONF_STATION_TO]}{vias}"
                 )
                 self._abort_if_unique_id_configured()
 
-                config_entry_name = f"Train from {station_from['standardname']} to {station_to['standardname']}"
+                config_entry_name = f"Train from {station_from.standard_name} to {station_to.standard_name}"
                 return self.async_create_entry(
                     title=config_entry_name,
                     data=user_input,
@@ -126,18 +127,18 @@ class NMBSConfigFlow(ConfigFlow, domain=DOMAIN):
         station_live = None
         for station in self.stations:
             if user_input[CONF_STATION_FROM] in (
-                station["standardname"],
-                station["name"],
+                station.standard_name,
+                station.name,
             ):
                 station_from = station
             if user_input[CONF_STATION_TO] in (
-                station["standardname"],
-                station["name"],
+                station.standard_name,
+                station.name,
             ):
                 station_to = station
             if CONF_STATION_LIVE in user_input and user_input[CONF_STATION_LIVE] in (
-                station["standardname"],
-                station["name"],
+                station.standard_name,
+                station.name,
             ):
                 station_live = station
 
@@ -147,28 +148,29 @@ class NMBSConfigFlow(ConfigFlow, domain=DOMAIN):
             return self.async_abort(reason="same_station")
 
         # config flow uses id and not the standard name
-        user_input[CONF_STATION_FROM] = station_from["id"]
-        user_input[CONF_STATION_TO] = station_to["id"]
+        user_input[CONF_STATION_FROM] = station_from.id
+        user_input[CONF_STATION_TO] = station_to.id
 
         if station_live:
-            user_input[CONF_STATION_LIVE] = station_live["id"]
+            user_input[CONF_STATION_LIVE] = station_live.id
             entity_registry = er.async_get(self.hass)
             prefix = "live"
+            vias = "_excl_vias" if user_input.get(CONF_EXCLUDE_VIAS, False) else ""
             if entity_id := entity_registry.async_get_entity_id(
                 Platform.SENSOR,
                 DOMAIN,
-                f"{prefix}_{station_live['standardname']}_{station_from['standardname']}_{station_to['standardname']}",
+                f"{prefix}_{station_live.standard_name}_{station_from.standard_name}_{station_to.standard_name}",
             ):
-                new_unique_id = f"{DOMAIN}_{prefix}_{station_live['id']}_{station_from['id']}_{station_to['id']}"
+                new_unique_id = f"{DOMAIN}_{prefix}_{station_live.id}_{station_from.id}_{station_to.id}{vias}"
                 entity_registry.async_update_entity(
                     entity_id, new_unique_id=new_unique_id
                 )
             if entity_id := entity_registry.async_get_entity_id(
                 Platform.SENSOR,
                 DOMAIN,
-                f"{prefix}_{station_live['name']}_{station_from['name']}_{station_to['name']}",
+                f"{prefix}_{station_live.name}_{station_from.name}_{station_to.name}",
             ):
-                new_unique_id = f"{DOMAIN}_{prefix}_{station_live['id']}_{station_from['id']}_{station_to['id']}"
+                new_unique_id = f"{DOMAIN}_{prefix}_{station_live.id}_{station_from.id}_{station_to.id}{vias}"
                 entity_registry.async_update_entity(
                     entity_id, new_unique_id=new_unique_id
                 )
diff --git a/homeassistant/components/nmbs/const.py b/homeassistant/components/nmbs/const.py
index fddb7365501..04c8beb327d 100644
--- a/homeassistant/components/nmbs/const.py
+++ b/homeassistant/components/nmbs/const.py
@@ -19,11 +19,7 @@ CONF_SHOW_ON_MAP = "show_on_map"
 def find_station_by_name(hass: HomeAssistant, station_name: str):
     """Find given station_name in the station list."""
     return next(
-        (
-            s
-            for s in hass.data[DOMAIN]
-            if station_name in (s["standardname"], s["name"])
-        ),
+        (s for s in hass.data[DOMAIN] if station_name in (s.standard_name, s.name)),
         None,
     )
 
@@ -31,6 +27,6 @@ def find_station_by_name(hass: HomeAssistant, station_name: str):
 def find_station(hass: HomeAssistant, station_name: str):
     """Find given station_id in the station list."""
     return next(
-        (s for s in hass.data[DOMAIN] if station_name in s["id"]),
+        (s for s in hass.data[DOMAIN] if station_name in s.id),
         None,
     )
diff --git a/homeassistant/components/nmbs/manifest.json b/homeassistant/components/nmbs/manifest.json
index 9016eff11f8..37ff9429a54 100644
--- a/homeassistant/components/nmbs/manifest.json
+++ b/homeassistant/components/nmbs/manifest.json
@@ -7,5 +7,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["pyrail"],
   "quality_scale": "legacy",
-  "requirements": ["pyrail==0.0.3"]
+  "requirements": ["pyrail==0.4.1"]
 }
diff --git a/homeassistant/components/nmbs/sensor.py b/homeassistant/components/nmbs/sensor.py
index 85ae56144a0..3552ac3c26d 100644
--- a/homeassistant/components/nmbs/sensor.py
+++ b/homeassistant/components/nmbs/sensor.py
@@ -2,10 +2,12 @@
 
 from __future__ import annotations
 
+from datetime import datetime
 import logging
 from typing import Any
 
 from pyrail import iRail
+from pyrail.models import ConnectionDetails, LiveboardDeparture, StationDetails
 import voluptuous as vol
 
 from homeassistant.components.sensor import (
@@ -22,11 +24,15 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import (  # noqa: F401
     CONF_EXCLUDE_VIAS,
@@ -41,8 +47,6 @@ from .const import (  # noqa: F401
 
 _LOGGER = logging.getLogger(__name__)
 
-API_FAILURE = -1
-
 DEFAULT_NAME = "NMBS"
 
 DEFAULT_ICON = "mdi:train"
@@ -60,12 +64,12 @@ PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
 )
 
 
-def get_time_until(departure_time=None):
+def get_time_until(departure_time: datetime | None = None):
     """Calculate the time between now and a train's departure time."""
     if departure_time is None:
         return 0
 
-    delta = dt_util.utc_from_timestamp(int(departure_time)) - dt_util.now()
+    delta = dt_util.as_utc(departure_time) - dt_util.utcnow()
     return round(delta.total_seconds() / 60)
 
 
@@ -74,11 +78,9 @@ def get_delay_in_minutes(delay=0):
     return round(int(delay) / 60)
 
 
-def get_ride_duration(departure_time, arrival_time, delay=0):
+def get_ride_duration(departure_time: datetime, arrival_time: datetime, delay=0):
     """Calculate the total travel time in minutes."""
-    duration = dt_util.utc_from_timestamp(
-        int(arrival_time)
-    ) - dt_util.utc_from_timestamp(int(departure_time))
+    duration = arrival_time - departure_time
     duration_time = int(round(duration.total_seconds() / 60))
     return duration_time + get_delay_in_minutes(delay)
 
@@ -151,10 +153,10 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up NMBS sensor entities based on a config entry."""
-    api_client = iRail()
+    api_client = iRail(session=async_get_clientsession(hass))
 
     name = config_entry.data.get(CONF_NAME, None)
     show_on_map = config_entry.data.get(CONF_SHOW_ON_MAP, False)
@@ -170,8 +172,10 @@ async def async_setup_entry(
             NMBSSensor(
                 api_client, name, show_on_map, station_from, station_to, excl_vias
             ),
-            NMBSLiveBoard(api_client, station_from, station_from, station_to),
-            NMBSLiveBoard(api_client, station_to, station_from, station_to),
+            NMBSLiveBoard(
+                api_client, station_from, station_from, station_to, excl_vias
+            ),
+            NMBSLiveBoard(api_client, station_to, station_from, station_to, excl_vias),
         ]
     )
 
@@ -184,16 +188,20 @@ class NMBSLiveBoard(SensorEntity):
     def __init__(
         self,
         api_client: iRail,
-        live_station: dict[str, Any],
-        station_from: dict[str, Any],
-        station_to: dict[str, Any],
+        live_station: StationDetails,
+        station_from: StationDetails,
+        station_to: StationDetails,
+        excl_vias: bool,
     ) -> None:
         """Initialize the sensor for getting liveboard data."""
         self._station = live_station
         self._api_client = api_client
         self._station_from = station_from
         self._station_to = station_to
-        self._attrs: dict[str, Any] | None = {}
+
+        self._excl_vias = excl_vias
+        self._attrs: LiveboardDeparture | None = None
+
         self._state: str | None = None
 
         self.entity_registry_enabled_default = False
@@ -201,21 +209,20 @@ class NMBSLiveBoard(SensorEntity):
     @property
     def name(self) -> str:
         """Return the sensor default name."""
-        return f"Trains in {self._station['standardname']}"
+        return f"Trains in {self._station.standard_name}"
 
     @property
     def unique_id(self) -> str:
         """Return the unique ID."""
 
-        unique_id = (
-            f"{self._station['id']}_{self._station_from['id']}_{self._station_to['id']}"
-        )
-        return f"nmbs_live_{unique_id}"
+        unique_id = f"{self._station.id}_{self._station_from.id}_{self._station_to.id}"
+        vias = "_excl_vias" if self._excl_vias else ""
+        return f"nmbs_live_{unique_id}{vias}"
 
     @property
     def icon(self) -> str:
         """Return the default icon or an alert icon if delays."""
-        if self._attrs and int(self._attrs["delay"]) > 0:
+        if self._attrs and int(self._attrs.delay) > 0:
             return DEFAULT_ICON_ALERT
 
         return DEFAULT_ICON
@@ -231,15 +238,15 @@ class NMBSLiveBoard(SensorEntity):
         if self._state is None or not self._attrs:
             return None
 
-        delay = get_delay_in_minutes(self._attrs["delay"])
-        departure = get_time_until(self._attrs["time"])
+        delay = get_delay_in_minutes(self._attrs.delay)
+        departure = get_time_until(self._attrs.time)
 
         attrs = {
             "departure": f"In {departure} minutes",
             "departure_minutes": departure,
-            "extra_train": int(self._attrs["isExtra"]) > 0,
-            "vehicle_id": self._attrs["vehicle"],
-            "monitored_station": self._station["standardname"],
+            "extra_train": self._attrs.is_extra,
+            "vehicle_id": self._attrs.vehicle,
+            "monitored_station": self._station.standard_name,
         }
 
         if delay > 0:
@@ -248,28 +255,26 @@ class NMBSLiveBoard(SensorEntity):
 
         return attrs
 
-    def update(self) -> None:
+    async def async_update(self, **kwargs: Any) -> None:
         """Set the state equal to the next departure."""
-        liveboard = self._api_client.get_liveboard(self._station["id"])
+        liveboard = await self._api_client.get_liveboard(self._station.id)
 
-        if liveboard == API_FAILURE:
+        if liveboard is None:
             _LOGGER.warning("API failed in NMBSLiveBoard")
             return
 
-        if not (departures := liveboard.get("departures")):
+        if not (departures := liveboard.departures):
             _LOGGER.warning("API returned invalid departures: %r", liveboard)
             return
 
         _LOGGER.debug("API returned departures: %r", departures)
-        if departures["number"] == "0":
+        if len(departures) == 0:
             # No trains are scheduled
             return
-        next_departure = departures["departure"][0]
+        next_departure = departures[0]
 
         self._attrs = next_departure
-        self._state = (
-            f"Track {next_departure['platform']} - {next_departure['station']}"
-        )
+        self._state = f"Track {next_departure.platform} - {next_departure.station}"
 
 
 class NMBSSensor(SensorEntity):
@@ -283,8 +288,8 @@ class NMBSSensor(SensorEntity):
         api_client: iRail,
         name: str,
         show_on_map: bool,
-        station_from: dict[str, Any],
-        station_to: dict[str, Any],
+        station_from: StationDetails,
+        station_to: StationDetails,
         excl_vias: bool,
     ) -> None:
         """Initialize the NMBS connection sensor."""
@@ -295,28 +300,29 @@ class NMBSSensor(SensorEntity):
         self._station_to = station_to
         self._excl_vias = excl_vias
 
-        self._attrs: dict[str, Any] | None = {}
+        self._attrs: ConnectionDetails | None = None
         self._state = None
 
     @property
     def unique_id(self) -> str:
         """Return the unique ID."""
-        unique_id = f"{self._station_from['id']}_{self._station_to['id']}"
+        unique_id = f"{self._station_from.id}_{self._station_to.id}"
 
-        return f"nmbs_connection_{unique_id}"
+        vias = "_excl_vias" if self._excl_vias else ""
+        return f"nmbs_connection_{unique_id}{vias}"
 
     @property
     def name(self) -> str:
         """Return the name of the sensor."""
         if self._name is None:
-            return f"Train from {self._station_from['standardname']} to {self._station_to['standardname']}"
+            return f"Train from {self._station_from.standard_name} to {self._station_to.standard_name}"
         return self._name
 
     @property
     def icon(self) -> str:
         """Return the sensor default icon or an alert icon if any delay."""
         if self._attrs:
-            delay = get_delay_in_minutes(self._attrs["departure"]["delay"])
+            delay = get_delay_in_minutes(self._attrs.departure.delay)
             if delay > 0:
                 return "mdi:alert-octagon"
 
@@ -328,19 +334,19 @@ class NMBSSensor(SensorEntity):
         if self._state is None or not self._attrs:
             return None
 
-        delay = get_delay_in_minutes(self._attrs["departure"]["delay"])
-        departure = get_time_until(self._attrs["departure"]["time"])
-        canceled = int(self._attrs["departure"]["canceled"])
+        delay = get_delay_in_minutes(self._attrs.departure.delay)
+        departure = get_time_until(self._attrs.departure.time)
+        canceled = self._attrs.departure.canceled
 
         attrs = {
-            "destination": self._attrs["departure"]["station"],
-            "direction": self._attrs["departure"]["direction"]["name"],
-            "platform_arriving": self._attrs["arrival"]["platform"],
-            "platform_departing": self._attrs["departure"]["platform"],
-            "vehicle_id": self._attrs["departure"]["vehicle"],
+            "destination": self._attrs.departure.station,
+            "direction": self._attrs.departure.direction.name,
+            "platform_arriving": self._attrs.arrival.platform,
+            "platform_departing": self._attrs.departure.platform,
+            "vehicle_id": self._attrs.departure.vehicle,
         }
 
-        if canceled != 1:
+        if not canceled:
             attrs["departure"] = f"In {departure} minutes"
             attrs["departure_minutes"] = departure
             attrs["canceled"] = False
@@ -354,14 +360,14 @@ class NMBSSensor(SensorEntity):
             attrs[ATTR_LONGITUDE] = self.station_coordinates[1]
 
         if self.is_via_connection and not self._excl_vias:
-            via = self._attrs["vias"]["via"][0]
+            via = self._attrs.vias[0]
 
-            attrs["via"] = via["station"]
-            attrs["via_arrival_platform"] = via["arrival"]["platform"]
-            attrs["via_transfer_platform"] = via["departure"]["platform"]
+            attrs["via"] = via.station
+            attrs["via_arrival_platform"] = via.arrival.platform
+            attrs["via_transfer_platform"] = via.departure.platform
             attrs["via_transfer_time"] = get_delay_in_minutes(
-                via["timebetween"]
-            ) + get_delay_in_minutes(via["departure"]["delay"])
+                via.timebetween
+            ) + get_delay_in_minutes(via.departure.delay)
 
         if delay > 0:
             attrs["delay"] = f"{delay} minutes"
@@ -380,8 +386,8 @@ class NMBSSensor(SensorEntity):
         if self._state is None or not self._attrs:
             return []
 
-        latitude = float(self._attrs["departure"]["stationinfo"]["locationY"])
-        longitude = float(self._attrs["departure"]["stationinfo"]["locationX"])
+        latitude = float(self._attrs.departure.station_info.latitude)
+        longitude = float(self._attrs.departure.station_info.longitude)
         return [latitude, longitude]
 
     @property
@@ -390,24 +396,24 @@ class NMBSSensor(SensorEntity):
         if not self._attrs:
             return False
 
-        return "vias" in self._attrs and int(self._attrs["vias"]["number"]) > 0
+        return self._attrs.vias is not None and len(self._attrs.vias) > 0
 
-    def update(self) -> None:
+    async def async_update(self, **kwargs: Any) -> None:
         """Set the state to the duration of a connection."""
-        connections = self._api_client.get_connections(
-            self._station_from["id"], self._station_to["id"]
+        connections = await self._api_client.get_connections(
+            self._station_from.id, self._station_to.id
         )
 
-        if connections == API_FAILURE:
+        if connections is None:
             _LOGGER.warning("API failed in NMBSSensor")
             return
 
-        if not (connection := connections.get("connection")):
+        if not (connection := connections.connections):
             _LOGGER.warning("API returned invalid connection: %r", connections)
             return
 
         _LOGGER.debug("API returned connection: %r", connection)
-        if int(connection[0]["departure"]["left"]) > 0:
+        if connection[0].departure.left:
             next_connection = connection[1]
         else:
             next_connection = connection[0]
@@ -421,9 +427,9 @@ class NMBSSensor(SensorEntity):
             return
 
         duration = get_ride_duration(
-            next_connection["departure"]["time"],
-            next_connection["arrival"]["time"],
-            next_connection["departure"]["delay"],
+            next_connection.departure.time,
+            next_connection.arrival.time,
+            next_connection.departure.delay,
         )
 
         self._state = duration
diff --git a/homeassistant/components/nmbs/strings.json b/homeassistant/components/nmbs/strings.json
index 3e7aa8d05bd..ac11026577a 100644
--- a/homeassistant/components/nmbs/strings.json
+++ b/homeassistant/components/nmbs/strings.json
@@ -29,7 +29,7 @@
   "issues": {
     "deprecated_yaml_import_issue_station_not_found": {
       "title": "The {integration_title} YAML configuration import failed",
-      "description": "Configuring {integration_title} using YAML is being removed but there was an problem importing your YAML configuration.\n\nThe used station \"{station_name}\" could not be found. Fix it or remove the {integration_title} YAML configuration from your configuration.yaml file and continue to [set up the integration]({url}) manually."
+      "description": "Configuring {integration_title} using YAML is being removed but there was a problem importing your YAML configuration.\n\nThe used station \"{station_name}\" could not be found. Fix it or remove the {integration_title} YAML configuration from your configuration.yaml file and continue to [set up the integration]({url}) manually."
     }
   }
 }
diff --git a/homeassistant/components/no_ip/__init__.py b/homeassistant/components/no_ip/__init__.py
index cb02490ac08..c23177ddf94 100644
--- a/homeassistant/components/no_ip/__init__.py
+++ b/homeassistant/components/no_ip/__init__.py
@@ -11,11 +11,11 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_DOMAIN, CONF_PASSWORD, CONF_TIMEOUT, CONF_USERNAME
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import (
     SERVER_SOFTWARE,
     async_get_clientsession,
 )
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/noaa_tides/helpers.py b/homeassistant/components/noaa_tides/helpers.py
new file mode 100644
index 00000000000..734cca68f44
--- /dev/null
+++ b/homeassistant/components/noaa_tides/helpers.py
@@ -0,0 +1,6 @@
+"""Helpers for NOAA Tides integration."""
+
+
+def get_station_unique_id(station_id: str) -> str:
+    """Convert a station ID to a unique ID."""
+    return f"{station_id.lower()}"
diff --git a/homeassistant/components/noaa_tides/manifest.json b/homeassistant/components/noaa_tides/manifest.json
index 8cc81857770..02a189883bc 100644
--- a/homeassistant/components/noaa_tides/manifest.json
+++ b/homeassistant/components/noaa_tides/manifest.json
@@ -6,5 +6,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["noaa_coops"],
   "quality_scale": "legacy",
-  "requirements": ["noaa-coops==0.1.9"]
+  "requirements": ["noaa-coops==0.4.0"]
 }
diff --git a/homeassistant/components/noaa_tides/sensor.py b/homeassistant/components/noaa_tides/sensor.py
index b165478927e..3b5a13b0f15 100644
--- a/homeassistant/components/noaa_tides/sensor.py
+++ b/homeassistant/components/noaa_tides/sensor.py
@@ -17,11 +17,13 @@ from homeassistant.components.sensor import (
 from homeassistant.const import CONF_NAME, CONF_TIME_ZONE, CONF_UNIT_SYSTEM
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util.unit_system import METRIC_SYSTEM
 
+from .helpers import get_station_unique_id
+
 if TYPE_CHECKING:
     from pandas import Timestamp
 
@@ -105,6 +107,7 @@ class NOAATidesAndCurrentsSensor(SensorEntity):
         self._unit_system = unit_system
         self._station = station
         self.data: NOAATidesData | None = None
+        self._attr_unique_id = f"{get_station_unique_id(station_id)}_summary"
 
     @property
     def name(self) -> str:
@@ -169,8 +172,8 @@ class NOAATidesAndCurrentsSensor(SensorEntity):
             api_data = df_predictions.head()
             self.data = NOAATidesData(
                 time_stamp=list(api_data.index),
-                hi_lo=list(api_data["hi_lo"].values),
-                predicted_wl=list(api_data["predicted_wl"].values),
+                hi_lo=list(api_data["type"].values),
+                predicted_wl=list(api_data["v"].values),
             )
             _LOGGER.debug("Data = %s", api_data)
             _LOGGER.debug(
diff --git a/homeassistant/components/nobo_hub/__init__.py b/homeassistant/components/nobo_hub/__init__.py
index 5b777205c8d..3bbf46f0264 100644
--- a/homeassistant/components/nobo_hub/__init__.py
+++ b/homeassistant/components/nobo_hub/__init__.py
@@ -7,7 +7,7 @@ from pynobo import nobo
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_IP_ADDRESS, EVENT_HOMEASSISTANT_STOP, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import CONF_AUTO_DISCOVERED, CONF_SERIAL, DOMAIN
 
diff --git a/homeassistant/components/nobo_hub/climate.py b/homeassistant/components/nobo_hub/climate.py
index a089209cde5..771da420213 100644
--- a/homeassistant/components/nobo_hub/climate.py
+++ b/homeassistant/components/nobo_hub/climate.py
@@ -21,7 +21,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_NAME, PRECISION_TENTHS, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from .const import (
@@ -46,7 +46,7 @@ MAX_TEMPERATURE = 40
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Nobø Ecohub platform from UI configuration."""
 
diff --git a/homeassistant/components/nobo_hub/select.py b/homeassistant/components/nobo_hub/select.py
index 43f177dd7a0..c24dbe3d21d 100644
--- a/homeassistant/components/nobo_hub/select.py
+++ b/homeassistant/components/nobo_hub/select.py
@@ -10,7 +10,7 @@ from homeassistant.const import ATTR_NAME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     ATTR_HARDWARE_VERSION,
@@ -26,7 +26,7 @@ from .const import (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up any temperature sensors connected to the Nobø Ecohub."""
 
diff --git a/homeassistant/components/nobo_hub/sensor.py b/homeassistant/components/nobo_hub/sensor.py
index 1632b6ba5e7..382fd1b0bf4 100644
--- a/homeassistant/components/nobo_hub/sensor.py
+++ b/homeassistant/components/nobo_hub/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_MODEL, ATTR_NAME, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .const import ATTR_SERIAL, ATTR_ZONE_ID, DOMAIN, NOBO_MANUFACTURER
@@ -22,7 +22,7 @@ from .const import ATTR_SERIAL, ATTR_ZONE_ID, DOMAIN, NOBO_MANUFACTURER
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up any temperature sensors connected to the Nobø Ecohub."""
 
diff --git a/homeassistant/components/nobo_hub/strings.json b/homeassistant/components/nobo_hub/strings.json
index 28be01862e9..1059934e896 100644
--- a/homeassistant/components/nobo_hub/strings.json
+++ b/homeassistant/components/nobo_hub/strings.json
@@ -44,7 +44,7 @@
   "entity": {
     "select": {
       "global_override": {
-        "name": "global override",
+        "name": "Global override",
         "state": {
           "away": "[%key:component::climate::entity_component::_::state_attributes::preset_mode::state::away%]",
           "comfort": "[%key:component::climate::entity_component::_::state_attributes::preset_mode::state::comfort%]",
@@ -53,7 +53,7 @@
         }
       },
       "week_profile": {
-        "name": "week profile"
+        "name": "Week profile"
       }
     }
   }
diff --git a/homeassistant/components/nordpool/sensor.py b/homeassistant/components/nordpool/sensor.py
index 30910f8e5f6..c6993826239 100644
--- a/homeassistant/components/nordpool/sensor.py
+++ b/homeassistant/components/nordpool/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util, slugify
 
 from . import NordPoolConfigEntry
@@ -271,7 +271,7 @@ DAILY_AVERAGE_PRICES_SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: NordPoolConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Nord Pool sensor platform."""
 
diff --git a/homeassistant/components/nordpool/services.py b/homeassistant/components/nordpool/services.py
index 872bd5b1e6b..6607edfdbcb 100644
--- a/homeassistant/components/nordpool/services.py
+++ b/homeassistant/components/nordpool/services.py
@@ -41,7 +41,7 @@ ATTR_CURRENCY = "currency"
 SERVICE_GET_PRICES_FOR_DATE = "get_prices_for_date"
 SERVICE_GET_PRICES_SCHEMA = vol.Schema(
     {
-        vol.Required(ATTR_CONFIG_ENTRY): ConfigEntrySelector(),
+        vol.Required(ATTR_CONFIG_ENTRY): ConfigEntrySelector({"integration": DOMAIN}),
         vol.Required(ATTR_DATE): cv.date,
         vol.Optional(ATTR_AREAS): vol.All(vol.In(list(AREAS)), cv.ensure_list, [str]),
         vol.Optional(ATTR_CURRENCY): vol.All(
diff --git a/homeassistant/components/nordpool/strings.json b/homeassistant/components/nordpool/strings.json
index cc10a1a0640..7b33f032de1 100644
--- a/homeassistant/components/nordpool/strings.json
+++ b/homeassistant/components/nordpool/strings.json
@@ -15,7 +15,7 @@
         },
         "data_description": {
           "currency": "Select currency to display prices in, EUR is the base currency.",
-          "areas": "Areas to display prices for according to Nordpool market areas."
+          "areas": "Areas to display prices for according to Nord Pool market areas."
         }
       },
       "reconfigure": {
@@ -95,11 +95,11 @@
   "services": {
     "get_prices_for_date": {
       "name": "Get prices for date",
-      "description": "Retrieve the prices for a specific date.",
+      "description": "Retrieves the prices for a specific date.",
       "fields": {
         "config_entry": {
-          "name": "Select Nord Pool configuration entry",
-          "description": "Choose the configuration entry."
+          "name": "Config entry",
+          "description": "The Nord Pool configuration entry for this action."
         },
         "date": {
           "name": "Date",
diff --git a/homeassistant/components/norway_air/air_quality.py b/homeassistant/components/norway_air/air_quality.py
index bba4737550b..36de8c8b1ad 100644
--- a/homeassistant/components/norway_air/air_quality.py
+++ b/homeassistant/components/norway_air/air_quality.py
@@ -14,8 +14,8 @@ from homeassistant.components.air_quality import (
 )
 from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/notify/__init__.py b/homeassistant/components/notify/__init__.py
index 7f41817a683..97759db4c13 100644
--- a/homeassistant/components/notify/__init__.py
+++ b/homeassistant/components/notify/__init__.py
@@ -11,11 +11,11 @@ from typing import Any, final, override
 from propcache.api import cached_property
 import voluptuous as vol
 
-import homeassistant.components.persistent_notification as pn
+from homeassistant.components import persistent_notification as pn
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, CONF_PLATFORM, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.restore_state import RestoreEntity
diff --git a/homeassistant/components/notify/const.py b/homeassistant/components/notify/const.py
index 29064f24a66..11ce4e801a1 100644
--- a/homeassistant/components/notify/const.py
+++ b/homeassistant/components/notify/const.py
@@ -4,7 +4,7 @@ import logging
 
 import voluptuous as vol
 
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 ATTR_DATA = "data"
 
diff --git a/homeassistant/components/notify/strings.json b/homeassistant/components/notify/strings.json
index e832bfc248a..b33af360448 100644
--- a/homeassistant/components/notify/strings.json
+++ b/homeassistant/components/notify/strings.json
@@ -24,7 +24,7 @@
         },
         "data": {
           "name": "Data",
-          "description": "Some integrations provide extended functionality. For information on how to use _data_, refer to the integration documentation."
+          "description": "Some integrations provide extended functionality via this field. For more information, refer to the integration documentation."
         }
       }
     },
@@ -56,7 +56,7 @@
         },
         "data": {
           "name": "Data",
-          "description": "Some integrations provide extended functionality. For information on how to use _data_, refer to the integration documentation.."
+          "description": "Some integrations provide extended functionality via this field. For more information, refer to the integration documentation."
         }
       }
     }
diff --git a/homeassistant/components/notify_events/__init__.py b/homeassistant/components/notify_events/__init__.py
index 2be97d709a9..76cfd9be4ff 100644
--- a/homeassistant/components/notify_events/__init__.py
+++ b/homeassistant/components/notify_events/__init__.py
@@ -4,8 +4,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_TOKEN, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
diff --git a/homeassistant/components/notion/binary_sensor.py b/homeassistant/components/notion/binary_sensor.py
index 8c57310752a..5552305e867 100644
--- a/homeassistant/components/notion/binary_sensor.py
+++ b/homeassistant/components/notion/binary_sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     DOMAIN,
@@ -107,7 +107,9 @@ BINARY_SENSOR_DESCRIPTIONS = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Notion sensors based on a config entry."""
     coordinator: NotionDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/notion/coordinator.py b/homeassistant/components/notion/coordinator.py
index c3fd23abc84..d77bfa95f47 100644
--- a/homeassistant/components/notion/coordinator.py
+++ b/homeassistant/components/notion/coordinator.py
@@ -117,16 +117,16 @@ class NotionDataUpdateCoordinator(DataUpdateCoordinator[NotionData]):
         super().__init__(
             hass,
             LOGGER,
+            config_entry=entry,
             name=entry.data[CONF_USERNAME],
             update_interval=DEFAULT_SCAN_INTERVAL,
         )
 
         self._client = client
-        self._entry = entry
 
     async def _async_update_data(self) -> NotionData:
         """Fetch data from Notion."""
-        data = NotionData(hass=self.hass, entry=self._entry)
+        data = NotionData(hass=self.hass, entry=self.config_entry)
 
         try:
             async with asyncio.TaskGroup() as tg:
diff --git a/homeassistant/components/notion/sensor.py b/homeassistant/components/notion/sensor.py
index fb853e65d7d..24496c8391a 100644
--- a/homeassistant/components/notion/sensor.py
+++ b/homeassistant/components/notion/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, SENSOR_MOLD, SENSOR_TEMPERATURE
 from .coordinator import NotionDataUpdateCoordinator
@@ -42,7 +42,9 @@ SENSOR_DESCRIPTIONS = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Notion sensors based on a config entry."""
     coordinator: NotionDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/nsw_fuel_station/sensor.py b/homeassistant/components/nsw_fuel_station/sensor.py
index f99790664da..7ae9b3a4d9f 100644
--- a/homeassistant/components/nsw_fuel_station/sensor.py
+++ b/homeassistant/components/nsw_fuel_station/sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CURRENCY_CENT, UnitOfVolume
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.helpers.update_coordinator import (
diff --git a/homeassistant/components/nuheat/climate.py b/homeassistant/components/nuheat/climate.py
index 8248c1b9b82..376a07ddb7b 100644
--- a/homeassistant/components/nuheat/climate.py
+++ b/homeassistant/components/nuheat/climate.py
@@ -23,7 +23,7 @@ from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import event as event_helper
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, MANUFACTURER, NUHEAT_API_STATE_SHIFT_DELAY
@@ -55,7 +55,7 @@ SCHEDULE_MODE_TO_PRESET_MODE_MAP = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the NuHeat thermostat(s)."""
     thermostat, coordinator = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/nuki/__init__.py b/homeassistant/components/nuki/__init__.py
index 4f3f56f7f03..5c02b6e972e 100644
--- a/homeassistant/components/nuki/__init__.py
+++ b/homeassistant/components/nuki/__init__.py
@@ -222,7 +222,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _stop_nuki)
     )
 
-    coordinator = NukiCoordinator(hass, bridge, locks, openers)
+    coordinator = NukiCoordinator(hass, entry, bridge, locks, openers)
     hass.data[DOMAIN][entry.entry_id] = NukiEntryData(
         coordinator=coordinator,
         bridge=bridge,
diff --git a/homeassistant/components/nuki/binary_sensor.py b/homeassistant/components/nuki/binary_sensor.py
index 8269c43813e..2785c46ca17 100644
--- a/homeassistant/components/nuki/binary_sensor.py
+++ b/homeassistant/components/nuki/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import NukiEntryData
 from .const import DOMAIN as NUKI_DOMAIN
@@ -20,7 +20,9 @@ from .entity import NukiEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Nuki binary sensors."""
     entry_data: NukiEntryData = hass.data[NUKI_DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/nuki/coordinator.py b/homeassistant/components/nuki/coordinator.py
index 114b4aee4c9..cccff99e397 100644
--- a/homeassistant/components/nuki/coordinator.py
+++ b/homeassistant/components/nuki/coordinator.py
@@ -12,6 +12,7 @@ from pynuki.bridge import InvalidCredentialsException
 from pynuki.device import NukiDevice
 from requests.exceptions import RequestException
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
@@ -28,9 +29,12 @@ UPDATE_INTERVAL = timedelta(seconds=30)
 class NukiCoordinator(DataUpdateCoordinator[None]):
     """Data Update Coordinator for the Nuki integration."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         bridge: NukiBridge,
         locks: list[NukiLock],
         openers: list[NukiOpener],
@@ -39,9 +43,8 @@ class NukiCoordinator(DataUpdateCoordinator[None]):
         super().__init__(
             hass,
             _LOGGER,
-            # Name of the data. For logging purposes.
+            config_entry=config_entry,
             name="nuki devices",
-            # Polling interval. Will only be polled if there are subscribers.
             update_interval=UPDATE_INTERVAL,
         )
         self.bridge = bridge
diff --git a/homeassistant/components/nuki/lock.py b/homeassistant/components/nuki/lock.py
index a2bf7559fc4..3cc972d3555 100644
--- a/homeassistant/components/nuki/lock.py
+++ b/homeassistant/components/nuki/lock.py
@@ -15,7 +15,7 @@ from homeassistant.components.lock import LockEntity, LockEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import NukiEntryData
 from .const import ATTR_ENABLE, ATTR_UNLATCH, DOMAIN as NUKI_DOMAIN, ERROR_STATES
@@ -24,7 +24,9 @@ from .helpers import CannotConnect
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Nuki lock platform."""
     entry_data: NukiEntryData = hass.data[NUKI_DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/nuki/sensor.py b/homeassistant/components/nuki/sensor.py
index d89202ac7d7..4f3890a10cf 100644
--- a/homeassistant/components/nuki/sensor.py
+++ b/homeassistant/components/nuki/sensor.py
@@ -8,7 +8,7 @@ from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import NukiEntryData
 from .const import DOMAIN as NUKI_DOMAIN
@@ -16,7 +16,9 @@ from .entity import NukiEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Nuki lock sensor."""
     entry_data: NukiEntryData = hass.data[NUKI_DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/nuki/strings.json b/homeassistant/components/nuki/strings.json
index beac3cb7f74..daf47bc7de1 100644
--- a/homeassistant/components/nuki/strings.json
+++ b/homeassistant/components/nuki/strings.json
@@ -58,12 +58,12 @@
   },
   "services": {
     "lock_n_go": {
-      "name": "Lock 'n' go",
-      "description": "Nuki Lock 'n' Go.",
+      "name": "Lock 'n' Go",
+      "description": "Unlocks the door, waits a few seconds then re-locks. The wait period can be customized through the app.",
       "fields": {
         "unlatch": {
           "name": "Unlatch",
-          "description": "Whether to unlatch the lock."
+          "description": "Whether to also unlatch the door when unlocking it."
         }
       }
     },
diff --git a/homeassistant/components/numato/__init__.py b/homeassistant/components/numato/__init__.py
index 00122132d44..d3882bea290 100644
--- a/homeassistant/components/numato/__init__.py
+++ b/homeassistant/components/numato/__init__.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import Event, HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import load_platform
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/number/const.py b/homeassistant/components/number/const.py
index 1a9c6c91ca7..f44a510b1c0 100644
--- a/homeassistant/components/number/const.py
+++ b/homeassistant/components/number/const.py
@@ -11,6 +11,7 @@ from homeassistant.const import (
     CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     CONCENTRATION_PARTS_PER_BILLION,
     CONCENTRATION_PARTS_PER_MILLION,
+    DEGREE,
     LIGHT_LUX,
     PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS,
@@ -23,6 +24,7 @@ from homeassistant.const import (
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
+    UnitOfEnergyDistance,
     UnitOfFrequency,
     UnitOfInformation,
     UnitOfIrradiance,
@@ -157,7 +159,7 @@ class NumberDeviceClass(StrEnum):
     DURATION = "duration"
     """Fixed duration.
 
-    Unit of measurement: `d`, `h`, `min`, `s`, `ms`
+    Unit of measurement: `d`, `h`, `min`, `s`, `ms`, `µs`
     """
 
     ENERGY = "energy"
@@ -166,6 +168,15 @@ class NumberDeviceClass(StrEnum):
     Unit of measurement: `J`, `kJ`, `MJ`, `GJ`, `mWh`, `Wh`, `kWh`, `MWh`, `GWh`, `TWh`, `cal`, `kcal`, `Mcal`, `Gcal`
     """
 
+    ENERGY_DISTANCE = "energy_distance"
+    """Energy distance.
+
+    Use this device class for sensors measuring energy by distance, for example the amount
+    of electric energy consumed by an electric car.
+
+    Unit of measurement: `kWh/100km`, `mi/kWh`, `km/kWh`
+    """
+
     ENERGY_STORAGE = "energy_storage"
     """Stored energy.
 
@@ -414,6 +425,12 @@ class NumberDeviceClass(StrEnum):
     - USCS / imperial: `oz`, `lb`
     """
 
+    WIND_DIRECTION = "wind_direction"
+    """Wind direction.
+
+    Unit of measurement: `°`
+    """
+
     WIND_SPEED = "wind_speed"
     """Wind speed.
 
@@ -445,8 +462,10 @@ DEVICE_CLASS_UNITS: dict[NumberDeviceClass, set[type[StrEnum] | str | None]] = {
         UnitOfTime.MINUTES,
         UnitOfTime.SECONDS,
         UnitOfTime.MILLISECONDS,
+        UnitOfTime.MICROSECONDS,
     },
     NumberDeviceClass.ENERGY: set(UnitOfEnergy),
+    NumberDeviceClass.ENERGY_DISTANCE: set(UnitOfEnergyDistance),
     NumberDeviceClass.ENERGY_STORAGE: set(UnitOfEnergy),
     NumberDeviceClass.FREQUENCY: set(UnitOfFrequency),
     NumberDeviceClass.GAS: {
@@ -468,6 +487,7 @@ DEVICE_CLASS_UNITS: dict[NumberDeviceClass, set[type[StrEnum] | str | None]] = {
     NumberDeviceClass.PM25: {CONCENTRATION_MICROGRAMS_PER_CUBIC_METER},
     NumberDeviceClass.POWER_FACTOR: {PERCENTAGE, None},
     NumberDeviceClass.POWER: {
+        UnitOfPower.MILLIWATT,
         UnitOfPower.WATT,
         UnitOfPower.KILO_WATT,
         UnitOfPower.MEGA_WATT,
@@ -483,7 +503,7 @@ DEVICE_CLASS_UNITS: dict[NumberDeviceClass, set[type[StrEnum] | str | None]] = {
         SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     },
     NumberDeviceClass.SOUND_PRESSURE: set(UnitOfSoundPressure),
-    NumberDeviceClass.SPEED: set(UnitOfSpeed).union(set(UnitOfVolumetricFlux)),
+    NumberDeviceClass.SPEED: {*UnitOfSpeed, *UnitOfVolumetricFlux},
     NumberDeviceClass.SULPHUR_DIOXIDE: {CONCENTRATION_MICROGRAMS_PER_CUBIC_METER},
     NumberDeviceClass.TEMPERATURE: set(UnitOfTemperature),
     NumberDeviceClass.VOLATILE_ORGANIC_COMPOUNDS: {
@@ -505,6 +525,7 @@ DEVICE_CLASS_UNITS: dict[NumberDeviceClass, set[type[StrEnum] | str | None]] = {
         UnitOfVolume.LITERS,
     },
     NumberDeviceClass.WEIGHT: set(UnitOfMass),
+    NumberDeviceClass.WIND_DIRECTION: {DEGREE},
     NumberDeviceClass.WIND_SPEED: set(UnitOfSpeed),
 }
 
diff --git a/homeassistant/components/number/device_action.py b/homeassistant/components/number/device_action.py
index 8882bb22a0d..6dd85e000bd 100644
--- a/homeassistant/components/number/device_action.py
+++ b/homeassistant/components/number/device_action.py
@@ -13,8 +13,7 @@ from homeassistant.const import (
     CONF_TYPE,
 )
 from homeassistant.core import Context, HomeAssistant
-from homeassistant.helpers import entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
 
 from .const import ATTR_VALUE, DOMAIN, SERVICE_SET_VALUE
diff --git a/homeassistant/components/number/icons.json b/homeassistant/components/number/icons.json
index 636fa0a7751..49103f5cd41 100644
--- a/homeassistant/components/number/icons.json
+++ b/homeassistant/components/number/icons.json
@@ -150,6 +150,9 @@
     "weight": {
       "default": "mdi:weight"
     },
+    "wind_direction": {
+      "default": "mdi:compass-rose"
+    },
     "wind_speed": {
       "default": "mdi:weather-windy"
     }
diff --git a/homeassistant/components/number/services.yaml b/homeassistant/components/number/services.yaml
index dcbb955d739..6a7083a7613 100644
--- a/homeassistant/components/number/services.yaml
+++ b/homeassistant/components/number/services.yaml
@@ -7,5 +7,6 @@ set_value:
   fields:
     value:
       example: 42
+      required: true
       selector:
         text:
diff --git a/homeassistant/components/number/strings.json b/homeassistant/components/number/strings.json
index cc77d224d72..993120ef3ad 100644
--- a/homeassistant/components/number/strings.json
+++ b/homeassistant/components/number/strings.json
@@ -169,6 +169,9 @@
     "weight": {
       "name": "[%key:component::sensor::entity_component::weight::name%]"
     },
+    "wind_direction": {
+      "name": "[%key:component::sensor::entity_component::wind_direction::name%]"
+    },
     "wind_speed": {
       "name": "[%key:component::sensor::entity_component::wind_speed::name%]"
     }
diff --git a/homeassistant/components/nut/__init__.py b/homeassistant/components/nut/__init__.py
index 169dbbbff5d..5b188868819 100644
--- a/homeassistant/components/nut/__init__.py
+++ b/homeassistant/components/nut/__init__.py
@@ -103,7 +103,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: NutConfigEntry) -> bool:
     )
     status = coordinator.data
 
-    _LOGGER.debug("NUT Sensors Available: %s", status)
+    _LOGGER.debug("NUT Sensors Available: %s", status if status else None)
 
     entry.async_on_unload(entry.add_update_listener(_async_update_listener))
     unique_id = _unique_id_from_status(status)
@@ -111,14 +111,34 @@ async def async_setup_entry(hass: HomeAssistant, entry: NutConfigEntry) -> bool:
         unique_id = entry.entry_id
 
     if username is not None and password is not None:
+        # Dynamically add outlet integration commands
+        additional_integration_commands = set()
+        if (num_outlets := status.get("outlet.count")) is not None:
+            for outlet_num in range(1, int(num_outlets) + 1):
+                outlet_num_str: str = str(outlet_num)
+                additional_integration_commands |= {
+                    f"outlet.{outlet_num_str}.load.cycle",
+                    f"outlet.{outlet_num_str}.load.on",
+                    f"outlet.{outlet_num_str}.load.off",
+                }
+
+        valid_integration_commands = (
+            INTEGRATION_SUPPORTED_COMMANDS | additional_integration_commands
+        )
+
         user_available_commands = {
-            device_supported_command
-            for device_supported_command in await data.async_list_commands() or {}
-            if device_supported_command in INTEGRATION_SUPPORTED_COMMANDS
+            device_command
+            for device_command in await data.async_list_commands() or {}
+            if device_command in valid_integration_commands
         }
     else:
         user_available_commands = set()
 
+    _LOGGER.debug(
+        "NUT Commands Available: %s",
+        user_available_commands if user_available_commands else None,
+    )
+
     entry.runtime_data = NutRuntimeData(
         coordinator, data, unique_id, user_available_commands
     )
@@ -240,6 +260,7 @@ class PyNUTData:
 
         self._client = AIONUTClient(self._host, port, username, password, 5, persistent)
         self.ups_list: dict[str, str] | None = None
+        self.device_name: str | None = None
         self._status: dict[str, str] | None = None
         self._device_info: NUTDeviceInfo | None = None
 
@@ -250,7 +271,7 @@ class PyNUTData:
 
     @property
     def name(self) -> str:
-        """Return the name of the ups."""
+        """Return the name of the NUT device."""
         return self._alias or f"Nut-{self._host}"
 
     @property
@@ -294,6 +315,8 @@ class PyNUTData:
         self._status = await self._async_get_status()
         if self._device_info is None:
             self._device_info = self._get_device_info()
+        if self.device_name is None:
+            self.device_name = self.name.title()
         return self._status
 
     async def async_run_command(self, command_name: str) -> None:
diff --git a/homeassistant/components/nut/button.py b/homeassistant/components/nut/button.py
new file mode 100644
index 00000000000..0708056b2e3
--- /dev/null
+++ b/homeassistant/components/nut/button.py
@@ -0,0 +1,67 @@
+"""Provides a switch for switchable NUT outlets."""
+
+from __future__ import annotations
+
+import logging
+
+from homeassistant.components.button import (
+    ButtonDeviceClass,
+    ButtonEntity,
+    ButtonEntityDescription,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import NutConfigEntry
+from .entity import NUTBaseEntity
+
+_LOGGER = logging.getLogger(__name__)
+
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: NutConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the NUT buttons."""
+    pynut_data = config_entry.runtime_data
+    coordinator = pynut_data.coordinator
+    status = coordinator.data
+
+    # Dynamically add outlet button types
+    if (num_outlets := status.get("outlet.count")) is None:
+        return
+
+    data = pynut_data.data
+    unique_id = pynut_data.unique_id
+    valid_button_types: dict[str, ButtonEntityDescription] = {}
+    for outlet_num in range(1, int(num_outlets) + 1):
+        outlet_num_str = str(outlet_num)
+        outlet_name: str = status.get(f"outlet.{outlet_num_str}.name") or outlet_num_str
+        valid_button_types |= {
+            f"outlet.{outlet_num_str}.load.cycle": ButtonEntityDescription(
+                key=f"outlet.{outlet_num_str}.load.cycle",
+                translation_key="outlet_number_load_cycle",
+                translation_placeholders={"outlet_name": outlet_name},
+                device_class=ButtonDeviceClass.RESTART,
+                entity_registry_enabled_default=True,
+            ),
+        }
+
+    async_add_entities(
+        NUTButton(coordinator, description, data, unique_id)
+        for button_id, description in valid_button_types.items()
+        if button_id in pynut_data.user_available_commands
+    )
+
+
+class NUTButton(NUTBaseEntity, ButtonEntity):
+    """Representation of a button entity for NUT."""
+
+    async def async_press(self) -> None:
+        """Press the button."""
+        name_list = self.entity_description.key.split(".")
+        command_name = f"{name_list[0]}.{name_list[1]}.load.cycle"
+        await self.pynut_data.async_run_command(command_name)
diff --git a/homeassistant/components/nut/const.py b/homeassistant/components/nut/const.py
index 6db40a910a0..d741d8e95f9 100644
--- a/homeassistant/components/nut/const.py
+++ b/homeassistant/components/nut/const.py
@@ -6,7 +6,11 @@ from homeassistant.const import Platform
 
 DOMAIN = "nut"
 
-PLATFORMS = [Platform.SENSOR]
+PLATFORMS = [
+    Platform.BUTTON,
+    Platform.SENSOR,
+    Platform.SWITCH,
+]
 
 DEFAULT_NAME = "NUT UPS"
 DEFAULT_HOST = "localhost"
diff --git a/homeassistant/components/nut/device_action.py b/homeassistant/components/nut/device_action.py
index a051f843226..ffaa195deaf 100644
--- a/homeassistant/components/nut/device_action.py
+++ b/homeassistant/components/nut/device_action.py
@@ -7,8 +7,7 @@ import voluptuous as vol
 from homeassistant.components.device_automation import InvalidDeviceAutomationConfig
 from homeassistant.const import CONF_DEVICE_ID, CONF_DOMAIN, CONF_TYPE
 from homeassistant.core import Context, HomeAssistant
-from homeassistant.helpers import device_registry as dr
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
 
 from . import NutRuntimeData
diff --git a/homeassistant/components/nut/diagnostics.py b/homeassistant/components/nut/diagnostics.py
index 532e4ece76b..ec59fa65c22 100644
--- a/homeassistant/components/nut/diagnostics.py
+++ b/homeassistant/components/nut/diagnostics.py
@@ -39,8 +39,8 @@ async def async_get_config_entry_diagnostics(
     hass_device = device_registry.async_get_device(
         identifiers={(DOMAIN, hass_data.unique_id)}
     )
-    if not hass_device:
-        return data
+    # Device is always created
+    assert hass_device is not None
 
     data["device"] = {
         **attr.asdict(hass_device),
diff --git a/homeassistant/components/nut/entity.py b/homeassistant/components/nut/entity.py
new file mode 100644
index 00000000000..e6536d8aad6
--- /dev/null
+++ b/homeassistant/components/nut/entity.py
@@ -0,0 +1,67 @@
+"""Base entity for the NUT integration."""
+
+from __future__ import annotations
+
+from dataclasses import asdict
+from typing import cast
+
+from homeassistant.const import (
+    ATTR_MANUFACTURER,
+    ATTR_MODEL,
+    ATTR_SERIAL_NUMBER,
+    ATTR_SW_VERSION,
+)
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.entity import EntityDescription
+from homeassistant.helpers.update_coordinator import (
+    CoordinatorEntity,
+    DataUpdateCoordinator,
+)
+
+from . import PyNUTData
+from .const import DOMAIN
+
+NUT_DEV_INFO_TO_DEV_INFO: dict[str, str] = {
+    "manufacturer": ATTR_MANUFACTURER,
+    "model": ATTR_MODEL,
+    "firmware": ATTR_SW_VERSION,
+    "serial": ATTR_SERIAL_NUMBER,
+}
+
+
+class NUTBaseEntity(CoordinatorEntity[DataUpdateCoordinator]):
+    """NUT base entity."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: DataUpdateCoordinator,
+        entity_description: EntityDescription,
+        data: PyNUTData,
+        unique_id: str,
+    ) -> None:
+        """Initialize the entity."""
+        super().__init__(coordinator)
+
+        self.entity_description = entity_description
+        self._attr_unique_id = f"{unique_id}_{entity_description.key}"
+
+        self.pynut_data = data
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, unique_id)},
+            name=self.pynut_data.device_name,
+        )
+        self._attr_device_info.update(_get_nut_device_info(data))
+
+
+def _get_nut_device_info(data: PyNUTData) -> DeviceInfo:
+    """Return a DeviceInfo object filled with NUT device info."""
+    nut_dev_infos = asdict(data.device_info)
+    nut_infos = {
+        info_key: nut_dev_infos[nut_key]
+        for nut_key, info_key in NUT_DEV_INFO_TO_DEV_INFO.items()
+        if nut_dev_infos[nut_key] is not None
+    }
+
+    return cast(DeviceInfo, nut_infos)
diff --git a/homeassistant/components/nut/icons.json b/homeassistant/components/nut/icons.json
index e0f78d6400b..a795368005c 100644
--- a/homeassistant/components/nut/icons.json
+++ b/homeassistant/components/nut/icons.json
@@ -1,6 +1,17 @@
 {
   "entity": {
+    "button": {
+      "outlet_number_load_cycle": {
+        "default": "mdi:restart"
+      }
+    },
     "sensor": {
+      "ambient_humidity_status": {
+        "default": "mdi:information-outline"
+      },
+      "ambient_temperature_status": {
+        "default": "mdi:information-outline"
+      },
       "battery_alarm_threshold": {
         "default": "mdi:information-outline"
       },
@@ -31,17 +42,38 @@
       "battery_packs_bad": {
         "default": "mdi:information-outline"
       },
+      "battery_runtime": {
+        "default": "mdi:clock-outline"
+      },
+      "battery_runtime_low": {
+        "default": "mdi:clock-alert-outline"
+      },
+      "battery_runtime_restart": {
+        "default": "mdi:clock-start"
+      },
       "battery_type": {
         "default": "mdi:information-outline"
       },
+      "battery_voltage_high": {
+        "default": "mdi:battery-high"
+      },
+      "battery_voltage_low": {
+        "default": "mdi:battery-low"
+      },
       "input_bypass_phases": {
+        "default": "mdi:sine-wave"
+      },
+      "input_current_status": {
         "default": "mdi:information-outline"
       },
       "input_frequency_status": {
         "default": "mdi:information-outline"
       },
+      "input_load": {
+        "default": "mdi:percent-box-outline"
+      },
       "input_phases": {
-        "default": "mdi:information-outline"
+        "default": "mdi:sine-wave"
       },
       "input_sensitivity": {
         "default": "mdi:information-outline"
@@ -49,17 +81,26 @@
       "input_transfer_reason": {
         "default": "mdi:information-outline"
       },
+      "input_voltage_status": {
+        "default": "mdi:information-outline"
+      },
+      "outlet_number_current_status": {
+        "default": "mdi:information-outline"
+      },
+      "outlet_number_desc": {
+        "default": "mdi:information-outline"
+      },
       "output_l1_power_percent": {
-        "default": "mdi:gauge"
+        "default": "mdi:percent-circle-outline"
       },
       "output_l2_power_percent": {
-        "default": "mdi:gauge"
+        "default": "mdi:percent-circle-outline"
       },
       "output_l3_power_percent": {
-        "default": "mdi:gauge"
+        "default": "mdi:percent-circle-outline"
       },
       "output_phases": {
-        "default": "mdi:information-outline"
+        "default": "mdi:sine-wave"
       },
       "ups_alarm": {
         "default": "mdi:alarm"
@@ -70,20 +111,29 @@
       "ups_contacts": {
         "default": "mdi:information-outline"
       },
+      "ups_delay_reboot": {
+        "default": "mdi:timelapse"
+      },
+      "ups_delay_shutdown": {
+        "default": "mdi:timelapse"
+      },
+      "ups_delay_start": {
+        "default": "mdi:timelapse"
+      },
       "ups_display_language": {
         "default": "mdi:information-outline"
       },
       "ups_efficiency": {
-        "default": "mdi:gauge"
+        "default": "mdi:percent-outline"
       },
       "ups_id": {
         "default": "mdi:information-outline"
       },
       "ups_load": {
-        "default": "mdi:gauge"
+        "default": "mdi:percent-box-outline"
       },
       "ups_load_high": {
-        "default": "mdi:gauge"
+        "default": "mdi:percent-box-outline"
       },
       "ups_shutdown": {
         "default": "mdi:information-outline"
@@ -106,15 +156,32 @@
       "ups_test_date": {
         "default": "mdi:calendar"
       },
+      "ups_test_interval": {
+        "default": "mdi:timelapse"
+      },
       "ups_test_result": {
         "default": "mdi:information-outline"
       },
+      "ups_timer_reboot": {
+        "default": "mdi:timer-refresh-outline"
+      },
+      "ups_timer_shutdown": {
+        "default": "mdi:timer-stop-outline"
+      },
+      "ups_timer_start": {
+        "default": "mdi:timer-play-outline"
+      },
       "ups_type": {
         "default": "mdi:information-outline"
       },
       "ups_watchdog_status": {
         "default": "mdi:information-outline"
       }
+    },
+    "switch": {
+      "outlet_number_load_poweronoff": {
+        "default": "mdi:power"
+      }
     }
   }
 }
diff --git a/homeassistant/components/nut/manifest.json b/homeassistant/components/nut/manifest.json
index 9e968b5a349..1ee85a84caf 100644
--- a/homeassistant/components/nut/manifest.json
+++ b/homeassistant/components/nut/manifest.json
@@ -1,12 +1,12 @@
 {
   "domain": "nut",
   "name": "Network UPS Tools (NUT)",
-  "codeowners": ["@bdraco", "@ollo69", "@pestevez"],
+  "codeowners": ["@bdraco", "@ollo69", "@pestevez", "@tdfountain"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/nut",
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["aionut"],
-  "requirements": ["aionut==4.3.3"],
+  "requirements": ["aionut==4.3.4"],
   "zeroconf": ["_nut._tcp.local."]
 }
diff --git a/homeassistant/components/nut/sensor.py b/homeassistant/components/nut/sensor.py
index bb702873052..5bf7958e39e 100644
--- a/homeassistant/components/nut/sensor.py
+++ b/homeassistant/components/nut/sensor.py
@@ -1,10 +1,9 @@
-"""Provides a sensor to track various status aspects of a UPS."""
+"""Provides a sensor to track various status aspects of a NUT device."""
 
 from __future__ import annotations
 
-from dataclasses import asdict
 import logging
-from typing import Final, cast
+from typing import Final
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -13,10 +12,6 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    ATTR_MANUFACTURER,
-    ATTR_MODEL,
-    ATTR_SERIAL_NUMBER,
-    ATTR_SW_VERSION,
     PERCENTAGE,
     STATE_UNKNOWN,
     EntityCategory,
@@ -29,71 +24,780 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.update_coordinator import (
-    CoordinatorEntity,
-    DataUpdateCoordinator,
-)
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import NutConfigEntry, PyNUTData
-from .const import DOMAIN, KEY_STATUS, KEY_STATUS_DISPLAY, STATE_TYPES
+from . import NutConfigEntry
+from .const import KEY_STATUS, KEY_STATUS_DISPLAY, STATE_TYPES
+from .entity import NUTBaseEntity
 
-NUT_DEV_INFO_TO_DEV_INFO: dict[str, str] = {
-    "manufacturer": ATTR_MANUFACTURER,
-    "model": ATTR_MODEL,
-    "firmware": ATTR_SW_VERSION,
-    "serial": ATTR_SERIAL_NUMBER,
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
+
+AMBIENT_PRESENT = "ambient.present"
+AMBIENT_SENSORS = {
+    "ambient.humidity",
+    "ambient.humidity.status",
+    "ambient.temperature",
+    "ambient.temperature.status",
 }
+AMBIENT_THRESHOLD_STATUS_OPTIONS = [
+    "good",
+    "warning-low",
+    "critical-low",
+    "warning-high",
+    "critical-high",
+]
 
 _LOGGER = logging.getLogger(__name__)
 
+
 SENSOR_TYPES: Final[dict[str, SensorEntityDescription]] = {
-    "ups.status.display": SensorEntityDescription(
-        key="ups.status.display",
-        translation_key="ups_status_display",
+    "ambient.humidity": SensorEntityDescription(
+        key="ambient.humidity",
+        translation_key="ambient_humidity",
+        native_unit_of_measurement=PERCENTAGE,
+        device_class=SensorDeviceClass.HUMIDITY,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
     ),
-    "ups.status": SensorEntityDescription(
-        key="ups.status",
-        translation_key="ups_status",
+    "ambient.humidity.status": SensorEntityDescription(
+        key="ambient.humidity.status",
+        translation_key="ambient_humidity_status",
+        device_class=SensorDeviceClass.ENUM,
+        options=AMBIENT_THRESHOLD_STATUS_OPTIONS,
+        entity_category=EntityCategory.DIAGNOSTIC,
     ),
-    "ups.alarm": SensorEntityDescription(
-        key="ups.alarm",
-        translation_key="ups_alarm",
+    "ambient.temperature": SensorEntityDescription(
+        key="ambient.temperature",
+        translation_key="ambient_temperature",
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
     ),
-    "ups.temperature": SensorEntityDescription(
-        key="ups.temperature",
-        translation_key="ups_temperature",
+    "ambient.temperature.status": SensorEntityDescription(
+        key="ambient.temperature.status",
+        translation_key="ambient_temperature_status",
+        device_class=SensorDeviceClass.ENUM,
+        options=AMBIENT_THRESHOLD_STATUS_OPTIONS,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    "battery.alarm.threshold": SensorEntityDescription(
+        key="battery.alarm.threshold",
+        translation_key="battery_alarm_threshold",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "battery.capacity": SensorEntityDescription(
+        key="battery.capacity",
+        translation_key="battery_capacity",
+        native_unit_of_measurement="Ah",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "battery.charge": SensorEntityDescription(
+        key="battery.charge",
+        translation_key="battery_charge",
+        native_unit_of_measurement=PERCENTAGE,
+        device_class=SensorDeviceClass.BATTERY,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    "battery.charge.low": SensorEntityDescription(
+        key="battery.charge.low",
+        translation_key="battery_charge_low",
+        native_unit_of_measurement=PERCENTAGE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "battery.charge.restart": SensorEntityDescription(
+        key="battery.charge.restart",
+        translation_key="battery_charge_restart",
+        native_unit_of_measurement=PERCENTAGE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "battery.charge.warning": SensorEntityDescription(
+        key="battery.charge.warning",
+        translation_key="battery_charge_warning",
+        native_unit_of_measurement=PERCENTAGE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "battery.charger.status": SensorEntityDescription(
+        key="battery.charger.status",
+        translation_key="battery_charger_status",
+    ),
+    "battery.current": SensorEntityDescription(
+        key="battery.current",
+        translation_key="battery_current",
+        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+        device_class=SensorDeviceClass.CURRENT,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "battery.current.total": SensorEntityDescription(
+        key="battery.current.total",
+        translation_key="battery_current_total",
+        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+        device_class=SensorDeviceClass.CURRENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "battery.date": SensorEntityDescription(
+        key="battery.date",
+        translation_key="battery_date",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "battery.mfr.date": SensorEntityDescription(
+        key="battery.mfr.date",
+        translation_key="battery_mfr_date",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "battery.packs": SensorEntityDescription(
+        key="battery.packs",
+        translation_key="battery_packs",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "battery.packs.bad": SensorEntityDescription(
+        key="battery.packs.bad",
+        translation_key="battery_packs_bad",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "battery.runtime": SensorEntityDescription(
+        key="battery.runtime",
+        translation_key="battery_runtime",
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        device_class=SensorDeviceClass.DURATION,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "battery.runtime.low": SensorEntityDescription(
+        key="battery.runtime.low",
+        translation_key="battery_runtime_low",
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        device_class=SensorDeviceClass.DURATION,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "battery.runtime.restart": SensorEntityDescription(
+        key="battery.runtime.restart",
+        translation_key="battery_runtime_restart",
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        device_class=SensorDeviceClass.DURATION,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "battery.temperature": SensorEntityDescription(
+        key="battery.temperature",
+        translation_key="battery_temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
-    "ups.load": SensorEntityDescription(
-        key="ups.load",
-        translation_key="ups_load",
+    "battery.type": SensorEntityDescription(
+        key="battery.type",
+        translation_key="battery_type",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "battery.voltage": SensorEntityDescription(
+        key="battery.voltage",
+        translation_key="battery_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "battery.voltage.high": SensorEntityDescription(
+        key="battery.voltage.high",
+        translation_key="battery_voltage_high",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "battery.voltage.low": SensorEntityDescription(
+        key="battery.voltage.low",
+        translation_key="battery_voltage_low",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "battery.voltage.nominal": SensorEntityDescription(
+        key="battery.voltage.nominal",
+        translation_key="battery_voltage_nominal",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.bypass.current": SensorEntityDescription(
+        key="input.bypass.current",
+        translation_key="input_bypass_current",
+        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+        device_class=SensorDeviceClass.CURRENT,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.bypass.frequency": SensorEntityDescription(
+        key="input.bypass.frequency",
+        translation_key="input_bypass_frequency",
+        native_unit_of_measurement=UnitOfFrequency.HERTZ,
+        device_class=SensorDeviceClass.FREQUENCY,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.bypass.L1.current": SensorEntityDescription(
+        key="input.bypass.L1.current",
+        translation_key="input_bypass_l1_current",
+        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+        device_class=SensorDeviceClass.CURRENT,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.bypass.L1-N.voltage": SensorEntityDescription(
+        key="input.bypass.L1-N.voltage",
+        translation_key="input_bypass_l1_n_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.bypass.L1.realpower": SensorEntityDescription(
+        key="input.bypass.L1.realpower",
+        translation_key="input_bypass_l1_realpower",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.bypass.L2.current": SensorEntityDescription(
+        key="input.bypass.L2.current",
+        translation_key="input_bypass_l2_current",
+        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+        device_class=SensorDeviceClass.CURRENT,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.bypass.L2-N.voltage": SensorEntityDescription(
+        key="input.bypass.L2-N.voltage",
+        translation_key="input_bypass_l2_n_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.bypass.L2.realpower": SensorEntityDescription(
+        key="input.bypass.L2.realpower",
+        translation_key="input_bypass_l2_realpower",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.bypass.L3.current": SensorEntityDescription(
+        key="input.bypass.L3.current",
+        translation_key="input_bypass_l3_current",
+        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+        device_class=SensorDeviceClass.CURRENT,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.bypass.L3-N.voltage": SensorEntityDescription(
+        key="input.bypass.L3-N.voltage",
+        translation_key="input_bypass_l3_n_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.bypass.L3.realpower": SensorEntityDescription(
+        key="input.bypass.L3.realpower",
+        translation_key="input_bypass_l3_realpower",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.bypass.phases": SensorEntityDescription(
+        key="input.bypass.phases",
+        translation_key="input_bypass_phases",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.bypass.realpower": SensorEntityDescription(
+        key="input.bypass.realpower",
+        translation_key="input_bypass_realpower",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.bypass.voltage": SensorEntityDescription(
+        key="input.bypass.voltage",
+        translation_key="input_bypass_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.current": SensorEntityDescription(
+        key="input.current",
+        translation_key="input_current",
+        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+        device_class=SensorDeviceClass.CURRENT,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+    ),
+    "input.current.status": SensorEntityDescription(
+        key="input.current.status",
+        translation_key="input_current_status",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.frequency": SensorEntityDescription(
+        key="input.frequency",
+        translation_key="input_frequency",
+        native_unit_of_measurement=UnitOfFrequency.HERTZ,
+        device_class=SensorDeviceClass.FREQUENCY,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.frequency.nominal": SensorEntityDescription(
+        key="input.frequency.nominal",
+        translation_key="input_frequency_nominal",
+        native_unit_of_measurement=UnitOfFrequency.HERTZ,
+        device_class=SensorDeviceClass.FREQUENCY,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.frequency.status": SensorEntityDescription(
+        key="input.frequency.status",
+        translation_key="input_frequency_status",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.L1.current": SensorEntityDescription(
+        key="input.L1.current",
+        translation_key="input_l1_current",
+        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+        device_class=SensorDeviceClass.CURRENT,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.L1.frequency": SensorEntityDescription(
+        key="input.L1.frequency",
+        translation_key="input_l1_frequency",
+        native_unit_of_measurement=UnitOfFrequency.HERTZ,
+        device_class=SensorDeviceClass.FREQUENCY,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.L1-N.voltage": SensorEntityDescription(
+        key="input.L1-N.voltage",
+        translation_key="input_l1_n_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.L1.realpower": SensorEntityDescription(
+        key="input.L1.realpower",
+        translation_key="input_l1_realpower",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.L2.current": SensorEntityDescription(
+        key="input.L2.current",
+        translation_key="input_l2_current",
+        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+        device_class=SensorDeviceClass.CURRENT,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.L2.frequency": SensorEntityDescription(
+        key="input.L2.frequency",
+        translation_key="input_l2_frequency",
+        native_unit_of_measurement=UnitOfFrequency.HERTZ,
+        device_class=SensorDeviceClass.FREQUENCY,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.L2-N.voltage": SensorEntityDescription(
+        key="input.L2-N.voltage",
+        translation_key="input_l2_n_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.L2.realpower": SensorEntityDescription(
+        key="input.L2.realpower",
+        translation_key="input_l2_realpower",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.L3.current": SensorEntityDescription(
+        key="input.L3.current",
+        translation_key="input_l3_current",
+        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+        device_class=SensorDeviceClass.CURRENT,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.L3.frequency": SensorEntityDescription(
+        key="input.L3.frequency",
+        translation_key="input_l3_frequency",
+        native_unit_of_measurement=UnitOfFrequency.HERTZ,
+        device_class=SensorDeviceClass.FREQUENCY,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.L3-N.voltage": SensorEntityDescription(
+        key="input.L3-N.voltage",
+        translation_key="input_l3_n_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.L3.realpower": SensorEntityDescription(
+        key="input.L3.realpower",
+        translation_key="input_l3_realpower",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.load": SensorEntityDescription(
+        key="input.load",
+        translation_key="input_load",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
-    "ups.load.high": SensorEntityDescription(
-        key="ups.load.high",
-        translation_key="ups_load_high",
+    "input.phases": SensorEntityDescription(
+        key="input.phases",
+        translation_key="input_phases",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.power": SensorEntityDescription(
+        key="input.power",
+        translation_key="input_power",
+        native_unit_of_measurement=UnitOfApparentPower.VOLT_AMPERE,
+        device_class=SensorDeviceClass.APPARENT_POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.realpower": SensorEntityDescription(
+        key="input.realpower",
+        translation_key="input_realpower",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.sensitivity": SensorEntityDescription(
+        key="input.sensitivity",
+        translation_key="input_sensitivity",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.transfer.high": SensorEntityDescription(
+        key="input.transfer.high",
+        translation_key="input_transfer_high",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.transfer.low": SensorEntityDescription(
+        key="input.transfer.low",
+        translation_key="input_transfer_low",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.transfer.reason": SensorEntityDescription(
+        key="input.transfer.reason",
+        translation_key="input_transfer_reason",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.voltage": SensorEntityDescription(
+        key="input.voltage",
+        translation_key="input_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    "input.voltage.nominal": SensorEntityDescription(
+        key="input.voltage.nominal",
+        translation_key="input_voltage_nominal",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "input.voltage.status": SensorEntityDescription(
+        key="input.voltage.status",
+        translation_key="input_voltage_status",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "outlet.voltage": SensorEntityDescription(
+        key="outlet.voltage",
+        translation_key="outlet_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    "output.current": SensorEntityDescription(
+        key="output.current",
+        translation_key="output_current",
+        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+        device_class=SensorDeviceClass.CURRENT,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "output.current.nominal": SensorEntityDescription(
+        key="output.current.nominal",
+        translation_key="output_current_nominal",
+        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+        device_class=SensorDeviceClass.CURRENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "output.frequency": SensorEntityDescription(
+        key="output.frequency",
+        translation_key="output_frequency",
+        native_unit_of_measurement=UnitOfFrequency.HERTZ,
+        device_class=SensorDeviceClass.FREQUENCY,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "output.frequency.nominal": SensorEntityDescription(
+        key="output.frequency.nominal",
+        translation_key="output_frequency_nominal",
+        native_unit_of_measurement=UnitOfFrequency.HERTZ,
+        device_class=SensorDeviceClass.FREQUENCY,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "output.L1.current": SensorEntityDescription(
+        key="output.L1.current",
+        translation_key="output_l1_current",
+        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+        device_class=SensorDeviceClass.CURRENT,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "output.L1-N.voltage": SensorEntityDescription(
+        key="output.L1-N.voltage",
+        translation_key="output_l1_n_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "output.L1.power.percent": SensorEntityDescription(
+        key="output.L1.power.percent",
+        translation_key="output_l1_power_percent",
         native_unit_of_measurement=PERCENTAGE,
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
-    "ups.id": SensorEntityDescription(
-        key="ups.id",
-        translation_key="ups_id",
+    "output.L1.realpower": SensorEntityDescription(
+        key="output.L1.realpower",
+        translation_key="output_l1_realpower",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
-    "ups.delay.start": SensorEntityDescription(
-        key="ups.delay.start",
-        translation_key="ups_delay_start",
-        native_unit_of_measurement=UnitOfTime.SECONDS,
-        device_class=SensorDeviceClass.DURATION,
+    "output.L2.current": SensorEntityDescription(
+        key="output.L2.current",
+        translation_key="output_l2_current",
+        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+        device_class=SensorDeviceClass.CURRENT,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "output.L2-N.voltage": SensorEntityDescription(
+        key="output.L2-N.voltage",
+        translation_key="output_l2_n_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "output.L2.power.percent": SensorEntityDescription(
+        key="output.L2.power.percent",
+        translation_key="output_l2_power_percent",
+        native_unit_of_measurement=PERCENTAGE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "output.L2.realpower": SensorEntityDescription(
+        key="output.L2.realpower",
+        translation_key="output_l2_realpower",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "output.L3.current": SensorEntityDescription(
+        key="output.L3.current",
+        translation_key="output_l3_current",
+        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+        device_class=SensorDeviceClass.CURRENT,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "output.L3-N.voltage": SensorEntityDescription(
+        key="output.L3-N.voltage",
+        translation_key="output_l3_n_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "output.L3.power.percent": SensorEntityDescription(
+        key="output.L3.power.percent",
+        translation_key="output_l3_power_percent",
+        native_unit_of_measurement=PERCENTAGE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "output.L3.realpower": SensorEntityDescription(
+        key="output.L3.realpower",
+        translation_key="output_l3_realpower",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "output.phases": SensorEntityDescription(
+        key="output.phases",
+        translation_key="output_phases",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "output.power": SensorEntityDescription(
+        key="output.power",
+        translation_key="output_power",
+        native_unit_of_measurement=UnitOfApparentPower.VOLT_AMPERE,
+        device_class=SensorDeviceClass.APPARENT_POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "output.power.nominal": SensorEntityDescription(
+        key="output.power.nominal",
+        translation_key="output_power_nominal",
+        native_unit_of_measurement=UnitOfApparentPower.VOLT_AMPERE,
+        device_class=SensorDeviceClass.APPARENT_POWER,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "output.realpower": SensorEntityDescription(
+        key="output.realpower",
+        translation_key="output_realpower",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "output.realpower.nominal": SensorEntityDescription(
+        key="output.realpower.nominal",
+        translation_key="output_realpower_nominal",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "output.voltage": SensorEntityDescription(
+        key="output.voltage",
+        translation_key="output_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    "output.voltage.nominal": SensorEntityDescription(
+        key="output.voltage.nominal",
+        translation_key="output_voltage_nominal",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "ups.alarm": SensorEntityDescription(
+        key="ups.alarm",
+        translation_key="ups_alarm",
+    ),
+    "ups.beeper.status": SensorEntityDescription(
+        key="ups.beeper.status",
+        translation_key="ups_beeper_status",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "ups.contacts": SensorEntityDescription(
+        key="ups.contacts",
+        translation_key="ups_contacts",
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
@@ -113,62 +817,20 @@ SENSOR_TYPES: Final[dict[str, SensorEntityDescription]] = {
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
-    "ups.timer.start": SensorEntityDescription(
-        key="ups.timer.start",
-        translation_key="ups_timer_start",
+    "ups.delay.start": SensorEntityDescription(
+        key="ups.delay.start",
+        translation_key="ups_delay_start",
         native_unit_of_measurement=UnitOfTime.SECONDS,
         device_class=SensorDeviceClass.DURATION,
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
-    "ups.timer.reboot": SensorEntityDescription(
-        key="ups.timer.reboot",
-        translation_key="ups_timer_reboot",
-        native_unit_of_measurement=UnitOfTime.SECONDS,
-        device_class=SensorDeviceClass.DURATION,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "ups.timer.shutdown": SensorEntityDescription(
-        key="ups.timer.shutdown",
-        translation_key="ups_timer_shutdown",
-        native_unit_of_measurement=UnitOfTime.SECONDS,
-        device_class=SensorDeviceClass.DURATION,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "ups.test.interval": SensorEntityDescription(
-        key="ups.test.interval",
-        translation_key="ups_test_interval",
-        native_unit_of_measurement=UnitOfTime.SECONDS,
-        device_class=SensorDeviceClass.DURATION,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "ups.test.result": SensorEntityDescription(
-        key="ups.test.result",
-        translation_key="ups_test_result",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "ups.test.date": SensorEntityDescription(
-        key="ups.test.date",
-        translation_key="ups_test_date",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
     "ups.display.language": SensorEntityDescription(
         key="ups.display.language",
         translation_key="ups_display_language",
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
-    "ups.contacts": SensorEntityDescription(
-        key="ups.contacts",
-        translation_key="ups_contacts",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
     "ups.efficiency": SensorEntityDescription(
         key="ups.efficiency",
         translation_key="ups_efficiency",
@@ -177,6 +839,25 @@ SENSOR_TYPES: Final[dict[str, SensorEntityDescription]] = {
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
+    "ups.id": SensorEntityDescription(
+        key="ups.id",
+        translation_key="ups_id",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "ups.load": SensorEntityDescription(
+        key="ups.load",
+        translation_key="ups_load",
+        native_unit_of_measurement=PERCENTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    "ups.load.high": SensorEntityDescription(
+        key="ups.load.high",
+        translation_key="ups_load_high",
+        native_unit_of_measurement=PERCENTAGE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
     "ups.power": SensorEntityDescription(
         key="ups.power",
         translation_key="ups_power",
@@ -211,21 +892,9 @@ SENSOR_TYPES: Final[dict[str, SensorEntityDescription]] = {
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
-    "ups.beeper.status": SensorEntityDescription(
-        key="ups.beeper.status",
-        translation_key="ups_beeper_status",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "ups.type": SensorEntityDescription(
-        key="ups.type",
-        translation_key="ups_type",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "ups.watchdog.status": SensorEntityDescription(
-        key="ups.watchdog.status",
-        translation_key="ups_watchdog_status",
+    "ups.shutdown": SensorEntityDescription(
+        key="ups.shutdown",
+        translation_key="ups_shutdown",
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
@@ -247,725 +916,89 @@ SENSOR_TYPES: Final[dict[str, SensorEntityDescription]] = {
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
-    "ups.shutdown": SensorEntityDescription(
-        key="ups.shutdown",
-        translation_key="ups_shutdown",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
+    "ups.status": SensorEntityDescription(
+        key="ups.status",
+        translation_key="ups_status",
     ),
-    "battery.charge": SensorEntityDescription(
-        key="battery.charge",
-        translation_key="battery_charge",
-        native_unit_of_measurement=PERCENTAGE,
-        device_class=SensorDeviceClass.BATTERY,
-        state_class=SensorStateClass.MEASUREMENT,
+    "ups.status.display": SensorEntityDescription(
+        key="ups.status.display",
+        translation_key="ups_status_display",
     ),
-    "battery.charge.low": SensorEntityDescription(
-        key="battery.charge.low",
-        translation_key="battery_charge_low",
-        native_unit_of_measurement=PERCENTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "battery.charge.restart": SensorEntityDescription(
-        key="battery.charge.restart",
-        translation_key="battery_charge_restart",
-        native_unit_of_measurement=PERCENTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "battery.charge.warning": SensorEntityDescription(
-        key="battery.charge.warning",
-        translation_key="battery_charge_warning",
-        native_unit_of_measurement=PERCENTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "battery.charger.status": SensorEntityDescription(
-        key="battery.charger.status",
-        translation_key="battery_charger_status",
-    ),
-    "battery.voltage": SensorEntityDescription(
-        key="battery.voltage",
-        translation_key="battery_voltage",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "battery.voltage.nominal": SensorEntityDescription(
-        key="battery.voltage.nominal",
-        translation_key="battery_voltage_nominal",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "battery.voltage.low": SensorEntityDescription(
-        key="battery.voltage.low",
-        translation_key="battery_voltage_low",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "battery.voltage.high": SensorEntityDescription(
-        key="battery.voltage.high",
-        translation_key="battery_voltage_high",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "battery.capacity": SensorEntityDescription(
-        key="battery.capacity",
-        translation_key="battery_capacity",
-        native_unit_of_measurement="Ah",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "battery.current": SensorEntityDescription(
-        key="battery.current",
-        translation_key="battery_current",
-        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
-        device_class=SensorDeviceClass.CURRENT,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "battery.current.total": SensorEntityDescription(
-        key="battery.current.total",
-        translation_key="battery_current_total",
-        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
-        device_class=SensorDeviceClass.CURRENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "battery.temperature": SensorEntityDescription(
-        key="battery.temperature",
-        translation_key="battery_temperature",
+    "ups.temperature": SensorEntityDescription(
+        key="ups.temperature",
+        translation_key="ups_temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
-    "battery.runtime": SensorEntityDescription(
-        key="battery.runtime",
-        translation_key="battery_runtime",
+    "ups.test.date": SensorEntityDescription(
+        key="ups.test.date",
+        translation_key="ups_test_date",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "ups.test.interval": SensorEntityDescription(
+        key="ups.test.interval",
+        translation_key="ups_test_interval",
         native_unit_of_measurement=UnitOfTime.SECONDS,
         device_class=SensorDeviceClass.DURATION,
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
-    "battery.runtime.low": SensorEntityDescription(
-        key="battery.runtime.low",
-        translation_key="battery_runtime_low",
+    "ups.test.result": SensorEntityDescription(
+        key="ups.test.result",
+        translation_key="ups_test_result",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    "ups.timer.reboot": SensorEntityDescription(
+        key="ups.timer.reboot",
+        translation_key="ups_timer_reboot",
         native_unit_of_measurement=UnitOfTime.SECONDS,
         device_class=SensorDeviceClass.DURATION,
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
-    "battery.runtime.restart": SensorEntityDescription(
-        key="battery.runtime.restart",
-        translation_key="battery_runtime_restart",
+    "ups.timer.shutdown": SensorEntityDescription(
+        key="ups.timer.shutdown",
+        translation_key="ups_timer_shutdown",
         native_unit_of_measurement=UnitOfTime.SECONDS,
         device_class=SensorDeviceClass.DURATION,
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
-    "battery.alarm.threshold": SensorEntityDescription(
-        key="battery.alarm.threshold",
-        translation_key="battery_alarm_threshold",
+    "ups.timer.start": SensorEntityDescription(
+        key="ups.timer.start",
+        translation_key="ups_timer_start",
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        device_class=SensorDeviceClass.DURATION,
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
-    "battery.date": SensorEntityDescription(
-        key="battery.date",
-        translation_key="battery_date",
+    "ups.type": SensorEntityDescription(
+        key="ups.type",
+        translation_key="ups_type",
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
-    "battery.mfr.date": SensorEntityDescription(
-        key="battery.mfr.date",
-        translation_key="battery_mfr_date",
+    "ups.watchdog.status": SensorEntityDescription(
+        key="ups.watchdog.status",
+        translation_key="ups_watchdog_status",
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
-    "battery.packs": SensorEntityDescription(
-        key="battery.packs",
-        translation_key="battery_packs",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "battery.packs.bad": SensorEntityDescription(
-        key="battery.packs.bad",
-        translation_key="battery_packs_bad",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "battery.type": SensorEntityDescription(
-        key="battery.type",
-        translation_key="battery_type",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.sensitivity": SensorEntityDescription(
-        key="input.sensitivity",
-        translation_key="input_sensitivity",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.transfer.low": SensorEntityDescription(
-        key="input.transfer.low",
-        translation_key="input_transfer_low",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.transfer.high": SensorEntityDescription(
-        key="input.transfer.high",
-        translation_key="input_transfer_high",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.transfer.reason": SensorEntityDescription(
-        key="input.transfer.reason",
-        translation_key="input_transfer_reason",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.voltage": SensorEntityDescription(
-        key="input.voltage",
-        translation_key="input_voltage",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    "input.voltage.nominal": SensorEntityDescription(
-        key="input.voltage.nominal",
-        translation_key="input_voltage_nominal",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.L1-N.voltage": SensorEntityDescription(
-        key="input.L1-N.voltage",
-        translation_key="input_l1_n_voltage",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.L2-N.voltage": SensorEntityDescription(
-        key="input.L2-N.voltage",
-        translation_key="input_l2_n_voltage",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.L3-N.voltage": SensorEntityDescription(
-        key="input.L3-N.voltage",
-        translation_key="input_l3_n_voltage",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.frequency": SensorEntityDescription(
-        key="input.frequency",
-        translation_key="input_frequency",
-        native_unit_of_measurement=UnitOfFrequency.HERTZ,
-        device_class=SensorDeviceClass.FREQUENCY,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.frequency.nominal": SensorEntityDescription(
-        key="input.frequency.nominal",
-        translation_key="input_frequency_nominal",
-        native_unit_of_measurement=UnitOfFrequency.HERTZ,
-        device_class=SensorDeviceClass.FREQUENCY,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.frequency.status": SensorEntityDescription(
-        key="input.frequency.status",
-        translation_key="input_frequency_status",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.L1.frequency": SensorEntityDescription(
-        key="input.L1.frequency",
-        translation_key="input_l1_frequency",
-        native_unit_of_measurement=UnitOfFrequency.HERTZ,
-        device_class=SensorDeviceClass.FREQUENCY,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.L2.frequency": SensorEntityDescription(
-        key="input.L2.frequency",
-        translation_key="input_l2_frequency",
-        native_unit_of_measurement=UnitOfFrequency.HERTZ,
-        device_class=SensorDeviceClass.FREQUENCY,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.L3.frequency": SensorEntityDescription(
-        key="input.L3.frequency",
-        translation_key="input_l3_frequency",
-        native_unit_of_measurement=UnitOfFrequency.HERTZ,
-        device_class=SensorDeviceClass.FREQUENCY,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.bypass.current": SensorEntityDescription(
-        key="input.bypass.current",
-        translation_key="input_bypass_current",
-        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
-        device_class=SensorDeviceClass.CURRENT,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.bypass.L1.current": SensorEntityDescription(
-        key="input.bypass.L1.current",
-        translation_key="input_bypass_l1_current",
-        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
-        device_class=SensorDeviceClass.CURRENT,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.bypass.L2.current": SensorEntityDescription(
-        key="input.bypass.L2.current",
-        translation_key="input_bypass_l2_current",
-        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
-        device_class=SensorDeviceClass.CURRENT,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.bypass.L3.current": SensorEntityDescription(
-        key="input.bypass.L3.current",
-        translation_key="input_bypass_l3_current",
-        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
-        device_class=SensorDeviceClass.CURRENT,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.bypass.frequency": SensorEntityDescription(
-        key="input.bypass.frequency",
-        translation_key="input_bypass_frequency",
-        native_unit_of_measurement=UnitOfFrequency.HERTZ,
-        device_class=SensorDeviceClass.FREQUENCY,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.bypass.phases": SensorEntityDescription(
-        key="input.bypass.phases",
-        translation_key="input_bypass_phases",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.bypass.realpower": SensorEntityDescription(
-        key="input.bypass.realpower",
-        translation_key="input_bypass_realpower",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.bypass.L1.realpower": SensorEntityDescription(
-        key="input.bypass.L1.realpower",
-        translation_key="input_bypass_l1_realpower",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.bypass.L2.realpower": SensorEntityDescription(
-        key="input.bypass.L2.realpower",
-        translation_key="input_bypass_l2_realpower",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.bypass.L3.realpower": SensorEntityDescription(
-        key="input.bypass.L3.realpower",
-        translation_key="input_bypass_l3_realpower",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.bypass.voltage": SensorEntityDescription(
-        key="input.bypass.voltage",
-        translation_key="input_bypass_voltage",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.bypass.L1-N.voltage": SensorEntityDescription(
-        key="input.bypass.L1-N.voltage",
-        translation_key="input_bypass_l1_n_voltage",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.bypass.L2-N.voltage": SensorEntityDescription(
-        key="input.bypass.L2-N.voltage",
-        translation_key="input_bypass_l2_n_voltage",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.bypass.L3-N.voltage": SensorEntityDescription(
-        key="input.bypass.L3-N.voltage",
-        translation_key="input_bypass_l3_n_voltage",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.current": SensorEntityDescription(
-        key="input.current",
-        translation_key="input_current",
-        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
-        device_class=SensorDeviceClass.CURRENT,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_registry_enabled_default=False,
-    ),
-    "input.L1.current": SensorEntityDescription(
-        key="input.L1.current",
-        translation_key="input_l1_current",
-        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
-        device_class=SensorDeviceClass.CURRENT,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.L2.current": SensorEntityDescription(
-        key="input.L2.current",
-        translation_key="input_l2_current",
-        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
-        device_class=SensorDeviceClass.CURRENT,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.L3.current": SensorEntityDescription(
-        key="input.L3.current",
-        translation_key="input_l3_current",
-        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
-        device_class=SensorDeviceClass.CURRENT,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.phases": SensorEntityDescription(
-        key="input.phases",
-        translation_key="input_phases",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.realpower": SensorEntityDescription(
-        key="input.realpower",
-        translation_key="input_realpower",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.L1.realpower": SensorEntityDescription(
-        key="input.L1.realpower",
-        translation_key="input_l1_realpower",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.L2.realpower": SensorEntityDescription(
-        key="input.L2.realpower",
-        translation_key="input_l2_realpower",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "input.L3.realpower": SensorEntityDescription(
-        key="input.L3.realpower",
-        translation_key="input_l3_realpower",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.power.nominal": SensorEntityDescription(
-        key="output.power.nominal",
-        translation_key="output_power_nominal",
-        native_unit_of_measurement=UnitOfApparentPower.VOLT_AMPERE,
-        device_class=SensorDeviceClass.APPARENT_POWER,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.L1.power.percent": SensorEntityDescription(
-        key="output.L1.power.percent",
-        translation_key="output_l1_power_percent",
-        native_unit_of_measurement=PERCENTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.L2.power.percent": SensorEntityDescription(
-        key="output.L2.power.percent",
-        translation_key="output_l2_power_percent",
-        native_unit_of_measurement=PERCENTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.L3.power.percent": SensorEntityDescription(
-        key="output.L3.power.percent",
-        translation_key="output_l3_power_percent",
-        native_unit_of_measurement=PERCENTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.current": SensorEntityDescription(
-        key="output.current",
-        translation_key="output_current",
-        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
-        device_class=SensorDeviceClass.CURRENT,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.current.nominal": SensorEntityDescription(
-        key="output.current.nominal",
-        translation_key="output_current_nominal",
-        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
-        device_class=SensorDeviceClass.CURRENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.L1.current": SensorEntityDescription(
-        key="output.L1.current",
-        translation_key="output_l1_current",
-        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
-        device_class=SensorDeviceClass.CURRENT,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.L2.current": SensorEntityDescription(
-        key="output.L2.current",
-        translation_key="output_l2_current",
-        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
-        device_class=SensorDeviceClass.CURRENT,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.L3.current": SensorEntityDescription(
-        key="output.L3.current",
-        translation_key="output_l3_current",
-        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
-        device_class=SensorDeviceClass.CURRENT,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.voltage": SensorEntityDescription(
-        key="output.voltage",
-        translation_key="output_voltage",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    "output.voltage.nominal": SensorEntityDescription(
-        key="output.voltage.nominal",
-        translation_key="output_voltage_nominal",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.L1-N.voltage": SensorEntityDescription(
-        key="output.L1-N.voltage",
-        translation_key="output_l1_n_voltage",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.L2-N.voltage": SensorEntityDescription(
-        key="output.L2-N.voltage",
-        translation_key="output_l2_n_voltage",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.L3-N.voltage": SensorEntityDescription(
-        key="output.L3-N.voltage",
-        translation_key="output_l3_n_voltage",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.frequency": SensorEntityDescription(
-        key="output.frequency",
-        translation_key="output_frequency",
-        native_unit_of_measurement=UnitOfFrequency.HERTZ,
-        device_class=SensorDeviceClass.FREQUENCY,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.frequency.nominal": SensorEntityDescription(
-        key="output.frequency.nominal",
-        translation_key="output_frequency_nominal",
-        native_unit_of_measurement=UnitOfFrequency.HERTZ,
-        device_class=SensorDeviceClass.FREQUENCY,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.phases": SensorEntityDescription(
-        key="output.phases",
-        translation_key="output_phases",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.power": SensorEntityDescription(
-        key="output.power",
-        translation_key="output_power",
-        native_unit_of_measurement=UnitOfApparentPower.VOLT_AMPERE,
-        device_class=SensorDeviceClass.APPARENT_POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.realpower": SensorEntityDescription(
-        key="output.realpower",
-        translation_key="output_realpower",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.realpower.nominal": SensorEntityDescription(
-        key="output.realpower.nominal",
-        translation_key="output_realpower_nominal",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.L1.realpower": SensorEntityDescription(
-        key="output.L1.realpower",
-        translation_key="output_l1_realpower",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.L2.realpower": SensorEntityDescription(
-        key="output.L2.realpower",
-        translation_key="output_l2_realpower",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "output.L3.realpower": SensorEntityDescription(
-        key="output.L3.realpower",
-        translation_key="output_l3_realpower",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-    ),
-    "ambient.humidity": SensorEntityDescription(
-        key="ambient.humidity",
-        translation_key="ambient_humidity",
-        native_unit_of_measurement=PERCENTAGE,
-        device_class=SensorDeviceClass.HUMIDITY,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
-    "ambient.temperature": SensorEntityDescription(
-        key="ambient.temperature",
-        translation_key="ambient_temperature",
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        device_class=SensorDeviceClass.TEMPERATURE,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
-    "watts": SensorEntityDescription(
-        key="watts",
-        translation_key="watts",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
 }
 
 
-def _get_nut_device_info(data: PyNUTData) -> DeviceInfo:
-    """Return a DeviceInfo object filled with NUT device info."""
-    nut_dev_infos = asdict(data.device_info)
-    nut_infos = {
-        info_key: nut_dev_infos[nut_key]
-        for nut_key, info_key in NUT_DEV_INFO_TO_DEV_INFO.items()
-        if nut_dev_infos[nut_key] is not None
-    }
-
-    return cast(DeviceInfo, nut_infos)
-
-
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: NutConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the NUT sensors."""
+    valid_sensor_types: dict[str, SensorEntityDescription]
 
     pynut_data = config_entry.runtime_data
     coordinator = pynut_data.coordinator
@@ -973,16 +1006,75 @@ async def async_setup_entry(
     unique_id = pynut_data.unique_id
     status = coordinator.data
 
-    resources = [sensor_id for sensor_id in SENSOR_TYPES if sensor_id in status]
+    # Dynamically add outlet sensors to valid sensors dictionary
+    if (num_outlets := status.get("outlet.count")) is not None:
+        additional_sensor_types: dict[str, SensorEntityDescription] = {}
+        for outlet_num in range(1, int(num_outlets) + 1):
+            outlet_num_str: str = str(outlet_num)
+            outlet_name: str = (
+                status.get(f"outlet.{outlet_num_str}.name") or outlet_num_str
+            )
+            additional_sensor_types |= {
+                f"outlet.{outlet_num_str}.current": SensorEntityDescription(
+                    key=f"outlet.{outlet_num_str}.current",
+                    translation_key="outlet_number_current",
+                    translation_placeholders={"outlet_name": outlet_name},
+                    native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+                    device_class=SensorDeviceClass.CURRENT,
+                    state_class=SensorStateClass.MEASUREMENT,
+                ),
+                f"outlet.{outlet_num_str}.current_status": SensorEntityDescription(
+                    key=f"outlet.{outlet_num_str}.current_status",
+                    translation_key="outlet_number_current_status",
+                    translation_placeholders={"outlet_name": outlet_name},
+                    entity_category=EntityCategory.DIAGNOSTIC,
+                    entity_registry_enabled_default=False,
+                ),
+                f"outlet.{outlet_num_str}.desc": SensorEntityDescription(
+                    key=f"outlet.{outlet_num_str}.desc",
+                    translation_key="outlet_number_desc",
+                    translation_placeholders={"outlet_name": outlet_name},
+                ),
+                f"outlet.{outlet_num_str}.power": SensorEntityDescription(
+                    key=f"outlet.{outlet_num_str}.power",
+                    translation_key="outlet_number_power",
+                    translation_placeholders={"outlet_name": outlet_name},
+                    native_unit_of_measurement=UnitOfApparentPower.VOLT_AMPERE,
+                    device_class=SensorDeviceClass.APPARENT_POWER,
+                    state_class=SensorStateClass.MEASUREMENT,
+                ),
+                f"outlet.{outlet_num_str}.realpower": SensorEntityDescription(
+                    key=f"outlet.{outlet_num_str}.realpower",
+                    translation_key="outlet_number_realpower",
+                    translation_placeholders={"outlet_name": outlet_name},
+                    native_unit_of_measurement=UnitOfPower.WATT,
+                    device_class=SensorDeviceClass.POWER,
+                    state_class=SensorStateClass.MEASUREMENT,
+                ),
+            }
+
+        valid_sensor_types = {**SENSOR_TYPES, **additional_sensor_types}
+    else:
+        valid_sensor_types = SENSOR_TYPES
+
+    # If device reports ambient sensors are not present, then remove
+    has_ambient_sensors: bool = status.get(AMBIENT_PRESENT) != "no"
+    resources = [
+        sensor_id
+        for sensor_id in valid_sensor_types
+        if sensor_id in status
+        and (has_ambient_sensors or sensor_id not in AMBIENT_SENSORS)
+    ]
+
     # Display status is a special case that falls back to the status value
     # of the UPS instead.
-    if KEY_STATUS in resources:
+    if KEY_STATUS in status:
         resources.append(KEY_STATUS_DISPLAY)
 
     async_add_entities(
         NUTSensor(
             coordinator,
-            SENSOR_TYPES[sensor_type],
+            valid_sensor_types[sensor_type],
             data,
             unique_id,
         )
@@ -990,33 +1082,12 @@ async def async_setup_entry(
     )
 
 
-class NUTSensor(CoordinatorEntity[DataUpdateCoordinator[dict[str, str]]], SensorEntity):
+class NUTSensor(NUTBaseEntity, SensorEntity):
     """Representation of a sensor entity for NUT status values."""
 
-    _attr_has_entity_name = True
-
-    def __init__(
-        self,
-        coordinator: DataUpdateCoordinator[dict[str, str]],
-        sensor_description: SensorEntityDescription,
-        data: PyNUTData,
-        unique_id: str,
-    ) -> None:
-        """Initialize the sensor."""
-        super().__init__(coordinator)
-        self.entity_description = sensor_description
-
-        device_name = data.name.title()
-        self._attr_unique_id = f"{unique_id}_{sensor_description.key}"
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, unique_id)},
-            name=device_name,
-        )
-        self._attr_device_info.update(_get_nut_device_info(data))
-
     @property
     def native_value(self) -> str | None:
-        """Return entity state from ups."""
+        """Return entity state from NUT device."""
         status = self.coordinator.data
         if self.entity_description.key == KEY_STATUS_DISPLAY:
             return _format_display_state(status)
diff --git a/homeassistant/components/nut/strings.json b/homeassistant/components/nut/strings.json
index 83b8d340dc1..4d8ffd45475 100644
--- a/homeassistant/components/nut/strings.json
+++ b/homeassistant/components/nut/strings.json
@@ -29,8 +29,8 @@
     },
     "error": {
       "cannot_connect": "Connection error: {error}",
-      "unknown": "[%key:common::config_flow::error::unknown%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
@@ -78,9 +78,14 @@
     }
   },
   "entity": {
+    "button": {
+      "outlet_number_load_cycle": { "name": "Power cycle outlet {outlet_name}" }
+    },
     "sensor": {
       "ambient_humidity": { "name": "Ambient humidity" },
+      "ambient_humidity_status": { "name": "Ambient humidity status" },
       "ambient_temperature": { "name": "Ambient temperature" },
+      "ambient_temperature_status": { "name": "Ambient temperature status" },
       "battery_alarm_threshold": { "name": "Battery alarm threshold" },
       "battery_capacity": { "name": "Battery capacity" },
       "battery_charge": { "name": "Battery charge" },
@@ -104,72 +109,78 @@
       "battery_voltage_low": { "name": "Low battery voltage" },
       "battery_voltage_nominal": { "name": "Nominal battery voltage" },
       "input_bypass_current": { "name": "Input bypass current" },
-      "input_bypass_l1_current": { "name": "Input bypass L1 current" },
-      "input_bypass_l2_current": { "name": "Input bypass L2 current" },
-      "input_bypass_l3_current": { "name": "Input bypass L3 current" },
-      "input_bypass_voltage": { "name": "Input bypass voltage" },
-      "input_bypass_l1_n_voltage": { "name": "Input bypass L1-N voltage" },
-      "input_bypass_l2_n_voltage": { "name": "Input bypass L2-N voltage" },
-      "input_bypass_l3_n_voltage": { "name": "Input bypass L3-N voltage" },
       "input_bypass_frequency": { "name": "Input bypass frequency" },
+      "input_bypass_l1_current": { "name": "Input bypass L1 current" },
+      "input_bypass_l1_n_voltage": { "name": "Input bypass L1-N voltage" },
+      "input_bypass_l1_realpower": { "name": "Input bypass L1 real power" },
+      "input_bypass_l2_current": { "name": "Input bypass L2 current" },
+      "input_bypass_l2_n_voltage": { "name": "Input bypass L2-N voltage" },
+      "input_bypass_l2_realpower": { "name": "Input bypass L2 real power" },
+      "input_bypass_l3_current": { "name": "Input bypass L3 current" },
+      "input_bypass_l3_n_voltage": { "name": "Input bypass L3-N voltage" },
+      "input_bypass_l3_realpower": { "name": "Input bypass L3 real power" },
       "input_bypass_phases": { "name": "Input bypass phases" },
       "input_bypass_realpower": { "name": "Input bypass real power" },
-      "input_bypass_l1_realpower": {
-        "name": "Input bypass L1 real power"
-      },
-      "input_bypass_l2_realpower": {
-        "name": "Input bypass L2 real power"
-      },
-      "input_bypass_l3_realpower": {
-        "name": "Input bypass L3 real power"
-      },
+      "input_bypass_voltage": { "name": "Input bypass voltage" },
       "input_current": { "name": "Input current" },
-      "input_l1_current": { "name": "Input L1 current" },
-      "input_l2_current": { "name": "Input L2 current" },
-      "input_l3_current": { "name": "Input L3 current" },
+      "input_current_status": { "name": "Input current status" },
       "input_frequency": { "name": "Input frequency" },
       "input_frequency_nominal": { "name": "Input nominal frequency" },
       "input_frequency_status": { "name": "Input frequency status" },
+      "input_l1_current": { "name": "Input L1 current" },
       "input_l1_frequency": { "name": "Input L1 line frequency" },
-      "input_l2_frequency": { "name": "Input L2 line frequency" },
-      "input_l3_frequency": { "name": "Input L3 line frequency" },
-      "input_phases": { "name": "Input phases" },
-      "input_realpower": { "name": "Input real power" },
+      "input_l1_n_voltage": { "name": "Input L1 voltage" },
       "input_l1_realpower": { "name": "Input L1 real power" },
+      "input_l2_current": { "name": "Input L2 current" },
+      "input_l2_frequency": { "name": "Input L2 line frequency" },
+      "input_l2_n_voltage": { "name": "Input L2 voltage" },
       "input_l2_realpower": { "name": "Input L2 real power" },
+      "input_l3_current": { "name": "Input L3 current" },
+      "input_l3_frequency": { "name": "Input L3 line frequency" },
+      "input_l3_n_voltage": { "name": "Input L3 voltage" },
       "input_l3_realpower": { "name": "Input L3 real power" },
+      "input_load": { "name": "Input load" },
+      "input_phases": { "name": "Input phases" },
+      "input_power": { "name": "Input power" },
+      "input_realpower": { "name": "Input real power" },
       "input_sensitivity": { "name": "Input power sensitivity" },
       "input_transfer_high": { "name": "High voltage transfer" },
       "input_transfer_low": { "name": "Low voltage transfer" },
       "input_transfer_reason": { "name": "Voltage transfer reason" },
       "input_voltage": { "name": "Input voltage" },
       "input_voltage_nominal": { "name": "Nominal input voltage" },
-      "input_l1_n_voltage": { "name": "Input L1 voltage" },
-      "input_l2_n_voltage": { "name": "Input L2 voltage" },
-      "input_l3_n_voltage": { "name": "Input L3 voltage" },
+      "input_voltage_status": { "name": "Input voltage status" },
+      "outlet_number_current": { "name": "Outlet {outlet_name} current" },
+      "outlet_number_current_status": {
+        "name": "Outlet {outlet_name} current status"
+      },
+      "outlet_number_desc": { "name": "Outlet {outlet_name} description" },
+      "outlet_number_power": { "name": "Outlet {outlet_name} power" },
+      "outlet_number_realpower": { "name": "Outlet {outlet_name} real power" },
+      "outlet_voltage": { "name": "Outlet voltage" },
       "output_current": { "name": "Output current" },
       "output_current_nominal": { "name": "Nominal output current" },
-      "output_l1_current": { "name": "Output L1 current" },
-      "output_l2_current": { "name": "Output L2 current" },
-      "output_l3_current": { "name": "Output L3 current" },
       "output_frequency": { "name": "Output frequency" },
       "output_frequency_nominal": { "name": "Nominal output frequency" },
+      "output_l1_current": { "name": "Output L1 current" },
+      "output_l1_n_voltage": { "name": "Output L1-N voltage" },
+      "output_l1_power_percent": { "name": "Output L1 power usage" },
+      "output_l1_realpower": { "name": "Output L1 real power" },
+      "output_l2_current": { "name": "Output L2 current" },
+      "output_l2_n_voltage": { "name": "Output L2-N voltage" },
+      "output_l2_power_percent": { "name": "Output L2 power usage" },
+      "output_l2_realpower": { "name": "Output L2 real power" },
+      "output_l3_current": { "name": "Output L3 current" },
+      "output_l3_n_voltage": { "name": "Output L3-N voltage" },
+      "output_l3_power_percent": { "name": "Output L3 power usage" },
+      "output_l3_realpower": { "name": "Output L3 real power" },
       "output_phases": { "name": "Output phases" },
       "output_power": { "name": "Output apparent power" },
-      "output_l2_power_percent": { "name": "Output L2 power usage" },
-      "output_l1_power_percent": { "name": "Output L1 power usage" },
-      "output_l3_power_percent": { "name": "Output L3 power usage" },
       "output_power_nominal": { "name": "Nominal output power" },
       "output_realpower": { "name": "Output real power" },
       "output_realpower_nominal": { "name": "Nominal output real power" },
-      "output_l1_realpower": { "name": "Output L1 real power" },
-      "output_l2_realpower": { "name": "Output L2 real power" },
-      "output_l3_realpower": { "name": "Output L3 real power" },
       "output_voltage": { "name": "Output voltage" },
       "output_voltage_nominal": { "name": "Nominal output voltage" },
-      "output_l1_n_voltage": { "name": "Output L1-N voltage" },
-      "output_l2_n_voltage": { "name": "Output L2-N voltage" },
-      "output_l3_n_voltage": { "name": "Output L3-N voltage" },
       "ups_alarm": { "name": "Alarms" },
       "ups_beeper_status": { "name": "Beeper status" },
       "ups_contacts": { "name": "External contacts" },
@@ -201,8 +212,10 @@
       "ups_timer_shutdown": { "name": "Load shutdown timer" },
       "ups_timer_start": { "name": "Load start timer" },
       "ups_type": { "name": "UPS type" },
-      "ups_watchdog_status": { "name": "Watchdog status" },
-      "watts": { "name": "Watts" }
+      "ups_watchdog_status": { "name": "Watchdog status" }
+    },
+    "switch": {
+      "outlet_number_load_poweronoff": { "name": "Power outlet {outlet_name}" }
     }
   }
 }
diff --git a/homeassistant/components/nut/switch.py b/homeassistant/components/nut/switch.py
new file mode 100644
index 00000000000..924a596cc8e
--- /dev/null
+++ b/homeassistant/components/nut/switch.py
@@ -0,0 +1,90 @@
+"""Provides a switch for switchable NUT outlets."""
+
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+from homeassistant.components.switch import (
+    SwitchDeviceClass,
+    SwitchEntity,
+    SwitchEntityDescription,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import NutConfigEntry
+from .entity import NUTBaseEntity
+
+_LOGGER = logging.getLogger(__name__)
+
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: NutConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the NUT switches."""
+    pynut_data = config_entry.runtime_data
+    coordinator = pynut_data.coordinator
+    status = coordinator.data
+
+    # Dynamically add outlet switch types
+    if (num_outlets := status.get("outlet.count")) is None:
+        return
+
+    data = pynut_data.data
+    unique_id = pynut_data.unique_id
+    user_available_commands = pynut_data.user_available_commands
+    switch_descriptions = [
+        SwitchEntityDescription(
+            key=f"outlet.{outlet_num!s}.load.poweronoff",
+            translation_key="outlet_number_load_poweronoff",
+            translation_placeholders={
+                "outlet_name": status.get(f"outlet.{outlet_num!s}.name")
+                or str(outlet_num)
+            },
+            device_class=SwitchDeviceClass.OUTLET,
+            entity_registry_enabled_default=True,
+        )
+        for outlet_num in range(1, int(num_outlets) + 1)
+        if (
+            status.get(f"outlet.{outlet_num!s}.switchable") == "yes"
+            and f"outlet.{outlet_num!s}.load.on" in user_available_commands
+            and f"outlet.{outlet_num!s}.load.off" in user_available_commands
+        )
+    ]
+
+    async_add_entities(
+        NUTSwitch(coordinator, description, data, unique_id)
+        for description in switch_descriptions
+    )
+
+
+class NUTSwitch(NUTBaseEntity, SwitchEntity):
+    """Representation of a switch entity for NUT status values."""
+
+    @property
+    def is_on(self) -> bool | None:
+        """Return the state of the switch."""
+        status = self.coordinator.data
+        outlet, outlet_num_str = self.entity_description.key.split(".", 2)[:2]
+        if (state := status.get(f"{outlet}.{outlet_num_str}.status")) is None:
+            return None
+        return bool(state == "on")
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn on the device."""
+
+        outlet, outlet_num_str = self.entity_description.key.split(".", 2)[:2]
+        command_name = f"{outlet}.{outlet_num_str}.load.on"
+        await self.pynut_data.async_run_command(command_name)
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn off the device."""
+
+        outlet, outlet_num_str = self.entity_description.key.split(".", 2)[:2]
+        command_name = f"{outlet}.{outlet_num_str}.load.off"
+        await self.pynut_data.async_run_command(command_name)
diff --git a/homeassistant/components/nws/__init__.py b/homeassistant/components/nws/__init__.py
index c700476ed3d..633619bcf05 100644
--- a/homeassistant/components/nws/__init__.py
+++ b/homeassistant/components/nws/__init__.py
@@ -101,10 +101,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: NWSConfigEntry) -> bool:
 
         return update_forecast_hourly
 
-    coordinator_observation = NWSObservationDataUpdateCoordinator(
-        hass,
-        nws_data,
-    )
+    coordinator_observation = NWSObservationDataUpdateCoordinator(hass, entry, nws_data)
 
     # Don't use retries in setup
     coordinator_forecast = TimestampDataUpdateCoordinator(
diff --git a/homeassistant/components/nws/coordinator.py b/homeassistant/components/nws/coordinator.py
index 104b1812c67..4e6560947e8 100644
--- a/homeassistant/components/nws/coordinator.py
+++ b/homeassistant/components/nws/coordinator.py
@@ -1,7 +1,10 @@
 """The NWS coordinator."""
 
+from __future__ import annotations
+
 from datetime import datetime
 import logging
+from typing import TYPE_CHECKING
 
 from aiohttp import ClientResponseError
 from pynws import NwsNoDataError, SimpleNWS, call_with_retry
@@ -14,6 +17,9 @@ from homeassistant.helpers.update_coordinator import (
 )
 from homeassistant.util.dt import utcnow
 
+if TYPE_CHECKING:
+    from . import NWSConfigEntry
+
 from .const import (
     DEBOUNCE_TIME,
     DEFAULT_SCAN_INTERVAL,
@@ -29,9 +35,12 @@ _LOGGER = logging.getLogger(__name__)
 class NWSObservationDataUpdateCoordinator(TimestampDataUpdateCoordinator[None]):
     """Class to manage fetching NWS observation data."""
 
+    config_entry: NWSConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: NWSConfigEntry,
         nws: SimpleNWS,
     ) -> None:
         """Initialize."""
@@ -42,6 +51,7 @@ class NWSObservationDataUpdateCoordinator(TimestampDataUpdateCoordinator[None]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=f"NWS observation station {nws.station}",
             update_interval=DEFAULT_SCAN_INTERVAL,
             request_refresh_debouncer=debounce.Debouncer(
diff --git a/homeassistant/components/nws/sensor.py b/homeassistant/components/nws/sensor.py
index d1992056d47..8a7631d8381 100644
--- a/homeassistant/components/nws/sensor.py
+++ b/homeassistant/components/nws/sensor.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     TimestampDataUpdateCoordinator,
@@ -114,6 +114,8 @@ SENSOR_TYPES: tuple[NWSSensorEntityDescription, ...] = (
         icon="mdi:compass-rose",
         native_unit_of_measurement=DEGREE,
         unit_convert=DEGREE,
+        device_class=SensorDeviceClass.WIND_DIRECTION,
+        state_class=SensorStateClass.MEASUREMENT_ANGLE,
     ),
     NWSSensorEntityDescription(
         key="barometricPressure",
@@ -148,7 +150,9 @@ SENSOR_TYPES: tuple[NWSSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: NWSConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: NWSConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the NWS weather platform."""
     nws_data = entry.runtime_data
diff --git a/homeassistant/components/nws/strings.json b/homeassistant/components/nws/strings.json
index c9ee8349631..72b6a2c86b6 100644
--- a/homeassistant/components/nws/strings.json
+++ b/homeassistant/components/nws/strings.json
@@ -2,7 +2,7 @@
   "config": {
     "step": {
       "user": {
-        "description": "If a METAR station code is not specified, the latitude and longitude will be used to find the closest station. For now, an API Key can be anything. It is recommended to use a valid email address.",
+        "description": "If a METAR station code is not specified, the latitude and longitude will be used to find the closest station. For now, the API key can be anything. It is recommended to use a valid email address.",
         "title": "Connect to the National Weather Service",
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]",
@@ -30,12 +30,12 @@
   },
   "services": {
     "get_forecasts_extra": {
-      "name": "Get extra forecasts data.",
-      "description": "Get extra data for weather forecasts.",
+      "name": "Get extra forecasts data",
+      "description": "Retrieves extra data for weather forecasts.",
       "fields": {
         "type": {
           "name": "Forecast type",
-          "description": "Forecast type: hourly or twice_daily."
+          "description": "The scope of the weather forecast."
         }
       }
     }
diff --git a/homeassistant/components/nws/weather.py b/homeassistant/components/nws/weather.py
index 3c7393aa184..c90c67edcb7 100644
--- a/homeassistant/components/nws/weather.py
+++ b/homeassistant/components/nws/weather.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from functools import partial
 from types import MappingProxyType
-from typing import TYPE_CHECKING, Any, Literal, Required, TypedDict, cast
+from typing import Any, Required, TypedDict, cast
 
 import voluptuous as vol
 
@@ -40,7 +40,7 @@ from homeassistant.core import (
     callback,
 )
 from homeassistant.helpers import entity_platform, entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import TimestampDataUpdateCoordinator
 from homeassistant.util.json import JsonValueType
 from homeassistant.util.unit_conversion import SpeedConverter, TemperatureConverter
@@ -87,7 +87,9 @@ def convert_condition(time: str, weather: tuple[tuple[str, int | None], ...]) ->
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: NWSConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: NWSConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the NWS weather platform."""
     entity_registry = er.async_get(hass)
@@ -177,8 +179,6 @@ class NWSWeather(CoordinatorWeatherEntity[TimestampDataUpdateCoordinator[None]])
         for forecast_type in ("twice_daily", "hourly"):
             if (coordinator := self.forecast_coordinators[forecast_type]) is None:
                 continue
-            if TYPE_CHECKING:
-                forecast_type = cast(Literal["twice_daily", "hourly"], forecast_type)
             self.unsub_forecast[forecast_type] = coordinator.async_add_listener(
                 partial(self._handle_forecast_update, forecast_type)
             )
diff --git a/homeassistant/components/nx584/binary_sensor.py b/homeassistant/components/nx584/binary_sensor.py
index 04e79716423..69e2f626049 100644
--- a/homeassistant/components/nx584/binary_sensor.py
+++ b/homeassistant/components/nx584/binary_sensor.py
@@ -18,7 +18,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import CONF_HOST, CONF_PORT
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/nyt_games/__init__.py b/homeassistant/components/nyt_games/__init__.py
index 94dc22fe89e..d1c6ca5c2a4 100644
--- a/homeassistant/components/nyt_games/__init__.py
+++ b/homeassistant/components/nyt_games/__init__.py
@@ -4,21 +4,17 @@ from __future__ import annotations
 
 from nyt_games import NYTGamesClient
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_TOKEN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_create_clientsession
 
-from .coordinator import NYTGamesCoordinator
+from .coordinator import NYTGamesConfigEntry, NYTGamesCoordinator
 
 PLATFORMS: list[Platform] = [
     Platform.SENSOR,
 ]
 
 
-type NYTGamesConfigEntry = ConfigEntry[NYTGamesCoordinator]
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: NYTGamesConfigEntry) -> bool:
     """Set up NYTGames from a config entry."""
 
@@ -26,7 +22,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: NYTGamesConfigEntry) ->
         entry.data[CONF_TOKEN], session=async_create_clientsession(hass)
     )
 
-    coordinator = NYTGamesCoordinator(hass, client)
+    coordinator = NYTGamesCoordinator(hass, entry, client)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/nyt_games/coordinator.py b/homeassistant/components/nyt_games/coordinator.py
index 5e88a5dd92a..ae9ea4f03a0 100644
--- a/homeassistant/components/nyt_games/coordinator.py
+++ b/homeassistant/components/nyt_games/coordinator.py
@@ -4,18 +4,15 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 from datetime import timedelta
-from typing import TYPE_CHECKING
 
 from nyt_games import Connections, NYTGamesClient, NYTGamesError, SpellingBee, Wordle
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import LOGGER
 
-if TYPE_CHECKING:
-    from . import NYTGamesConfigEntry
-
 
 @dataclass
 class NYTGamesData:
@@ -26,16 +23,25 @@ class NYTGamesData:
     connections: Connections | None
 
 
+type NYTGamesConfigEntry = ConfigEntry[NYTGamesCoordinator]
+
+
 class NYTGamesCoordinator(DataUpdateCoordinator[NYTGamesData]):
     """Class to manage fetching NYT Games data."""
 
     config_entry: NYTGamesConfigEntry
 
-    def __init__(self, hass: HomeAssistant, client: NYTGamesClient) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: NYTGamesConfigEntry,
+        client: NYTGamesClient,
+    ) -> None:
         """Initialize coordinator."""
         super().__init__(
             hass,
             logger=LOGGER,
+            config_entry=config_entry,
             name="NYT Games",
             update_interval=timedelta(minutes=15),
         )
diff --git a/homeassistant/components/nyt_games/sensor.py b/homeassistant/components/nyt_games/sensor.py
index 01b2db4620b..5009eafd85a 100644
--- a/homeassistant/components/nyt_games/sensor.py
+++ b/homeassistant/components/nyt_games/sensor.py
@@ -14,11 +14,10 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import NYTGamesConfigEntry
-from .coordinator import NYTGamesCoordinator
+from .coordinator import NYTGamesConfigEntry, NYTGamesCoordinator
 from .entity import ConnectionsEntity, SpellingBeeEntity, WordleEntity
 
 
@@ -147,7 +146,7 @@ CONNECTIONS_SENSORS: tuple[NYTGamesConnectionsSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: NYTGamesConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up NYT Games sensor entities based on a config entry."""
 
diff --git a/homeassistant/components/nzbget/__init__.py b/homeassistant/components/nzbget/__init__.py
index 84456c4c006..e9e5856d524 100644
--- a/homeassistant/components/nzbget/__init__.py
+++ b/homeassistant/components/nzbget/__init__.py
@@ -31,10 +31,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up NZBGet from a config entry."""
     hass.data.setdefault(DOMAIN, {})
 
-    coordinator = NZBGetDataUpdateCoordinator(
-        hass,
-        config=entry.data,
-    )
+    coordinator = NZBGetDataUpdateCoordinator(hass, entry)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/nzbget/coordinator.py b/homeassistant/components/nzbget/coordinator.py
index cf9625ce4ec..9e6b06da760 100644
--- a/homeassistant/components/nzbget/coordinator.py
+++ b/homeassistant/components/nzbget/coordinator.py
@@ -1,13 +1,12 @@
 """Provides the NZBGet DataUpdateCoordinator."""
 
 import asyncio
-from collections.abc import Mapping
 from datetime import timedelta
 import logging
-from typing import Any
 
 from pynzbgetapi import NZBGetAPI, NZBGetAPIException
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_HOST,
     CONF_PASSWORD,
@@ -27,27 +26,32 @@ _LOGGER = logging.getLogger(__name__)
 class NZBGetDataUpdateCoordinator(DataUpdateCoordinator):
     """Class to manage fetching NZBGet data."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
-        *,
-        config: Mapping[str, Any],
+        config_entry: ConfigEntry,
     ) -> None:
         """Initialize global NZBGet data updater."""
         self.nzbget = NZBGetAPI(
-            config[CONF_HOST],
-            config.get(CONF_USERNAME),
-            config.get(CONF_PASSWORD),
-            config[CONF_SSL],
-            config[CONF_VERIFY_SSL],
-            config[CONF_PORT],
+            config_entry.data[CONF_HOST],
+            config_entry.data.get(CONF_USERNAME),
+            config_entry.data.get(CONF_PASSWORD),
+            config_entry.data[CONF_SSL],
+            config_entry.data[CONF_VERIFY_SSL],
+            config_entry.data[CONF_PORT],
         )
 
         self._completed_downloads_init = False
         self._completed_downloads = set[tuple]()
 
         super().__init__(
-            hass, _LOGGER, name=DOMAIN, update_interval=timedelta(seconds=5)
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=timedelta(seconds=5),
         )
 
     def _check_completed_downloads(self, history):
diff --git a/homeassistant/components/nzbget/sensor.py b/homeassistant/components/nzbget/sensor.py
index f6a4e4cc973..2328bf453f0 100644
--- a/homeassistant/components/nzbget/sensor.py
+++ b/homeassistant/components/nzbget/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, UnitOfDataRate, UnitOfInformation
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util.dt import utcnow
 
@@ -93,7 +93,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up NZBGet sensor based on a config entry."""
     coordinator: NZBGetDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
diff --git a/homeassistant/components/nzbget/switch.py b/homeassistant/components/nzbget/switch.py
index 552a1854902..0796f628507 100644
--- a/homeassistant/components/nzbget/switch.py
+++ b/homeassistant/components/nzbget/switch.py
@@ -8,7 +8,7 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DATA_COORDINATOR, DOMAIN
 from .coordinator import NZBGetDataUpdateCoordinator
@@ -18,7 +18,7 @@ from .entity import NZBGetEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up NZBGet sensor based on a config entry."""
     coordinator: NZBGetDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
diff --git a/homeassistant/components/oasa_telematics/sensor.py b/homeassistant/components/oasa_telematics/sensor.py
index fef4cef48af..ddf4942ef25 100644
--- a/homeassistant/components/oasa_telematics/sensor.py
+++ b/homeassistant/components/oasa_telematics/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util
diff --git a/homeassistant/components/obihai/button.py b/homeassistant/components/obihai/button.py
index d1b924b4693..9cef92d3fce 100644
--- a/homeassistant/components/obihai/button.py
+++ b/homeassistant/components/obihai/button.py
@@ -27,7 +27,7 @@ BUTTON_DESCRIPTION = ButtonEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: entity_platform.AddEntitiesCallback,
+    async_add_entities: entity_platform.AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Obihai sensor entries."""
 
diff --git a/homeassistant/components/obihai/sensor.py b/homeassistant/components/obihai/sensor.py
index c162bd6c559..ec29238201a 100644
--- a/homeassistant/components/obihai/sensor.py
+++ b/homeassistant/components/obihai/sensor.py
@@ -9,7 +9,7 @@ from requests.exceptions import RequestException
 from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .connectivity import ObihaiConnection
 from .const import DOMAIN, LOGGER, OBIHAI
@@ -18,7 +18,9 @@ SCAN_INTERVAL = datetime.timedelta(seconds=5)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Obihai sensor entries."""
 
diff --git a/homeassistant/components/octoprint/__init__.py b/homeassistant/components/octoprint/__init__.py
index 7a9f3990435..59fd04357eb 100644
--- a/homeassistant/components/octoprint/__init__.py
+++ b/homeassistant/components/octoprint/__init__.py
@@ -28,8 +28,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import ServiceValidationError
-import homeassistant.helpers.config_validation as cv
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import slugify as util_slugify
 from homeassistant.util.ssl import get_default_context, get_default_no_verify_context
diff --git a/homeassistant/components/octoprint/binary_sensor.py b/homeassistant/components/octoprint/binary_sensor.py
index 10a637e5a3b..a20738de150 100644
--- a/homeassistant/components/octoprint/binary_sensor.py
+++ b/homeassistant/components/octoprint/binary_sensor.py
@@ -9,7 +9,7 @@ from pyoctoprintapi import OctoprintPrinterInfo
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import OctoprintDataUpdateCoordinator
@@ -19,7 +19,7 @@ from .const import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the available OctoPrint binary sensors."""
     coordinator: OctoprintDataUpdateCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/octoprint/button.py b/homeassistant/components/octoprint/button.py
index 2a2e5015303..3a128fcd7aa 100644
--- a/homeassistant/components/octoprint/button.py
+++ b/homeassistant/components/octoprint/button.py
@@ -6,7 +6,7 @@ from homeassistant.components.button import ButtonDeviceClass, ButtonEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import OctoprintDataUpdateCoordinator
@@ -16,7 +16,7 @@ from .const import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Octoprint control buttons."""
     coordinator: OctoprintDataUpdateCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/octoprint/camera.py b/homeassistant/components/octoprint/camera.py
index e6430c55fa2..37347539d5b 100644
--- a/homeassistant/components/octoprint/camera.py
+++ b/homeassistant/components/octoprint/camera.py
@@ -8,7 +8,7 @@ from homeassistant.components.mjpeg import MjpegCamera
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_VERIFY_SSL
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import OctoprintDataUpdateCoordinator
@@ -18,7 +18,7 @@ from .const import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the available OctoPrint camera."""
     coordinator: OctoprintDataUpdateCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/octoprint/config_flow.py b/homeassistant/components/octoprint/config_flow.py
index 627ca999acd..e20eea0a61f 100644
--- a/homeassistant/components/octoprint/config_flow.py
+++ b/homeassistant/components/octoprint/config_flow.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
 )
 from homeassistant.data_entry_flow import AbortFlow
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.service_info.ssdp import SsdpServiceInfo
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 from homeassistant.util.ssl import get_default_context, get_default_no_verify_context
@@ -85,7 +85,8 @@ class OctoPrintConfigFlow(ConfigFlow, domain=DOMAIN):
                 raise err from None
             except CannotConnect:
                 errors["base"] = "cannot_connect"
-            except Exception:  # noqa: BLE001
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
 
             if errors:
diff --git a/homeassistant/components/octoprint/coordinator.py b/homeassistant/components/octoprint/coordinator.py
index c6d7373a002..bb006329ff1 100644
--- a/homeassistant/components/octoprint/coordinator.py
+++ b/homeassistant/components/octoprint/coordinator.py
@@ -16,7 +16,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN
 
@@ -39,10 +39,10 @@ class OctoprintDataUpdateCoordinator(DataUpdateCoordinator):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=f"octoprint-{config_entry.entry_id}",
             update_interval=timedelta(seconds=interval),
         )
-        self.config_entry = config_entry
         self._octoprint = octoprint
         self._printer_offline = False
         self.data = {"printer": None, "job": None, "last_read_time": None}
diff --git a/homeassistant/components/octoprint/sensor.py b/homeassistant/components/octoprint/sensor.py
index fb5f292d669..71db1d804c5 100644
--- a/homeassistant/components/octoprint/sensor.py
+++ b/homeassistant/components/octoprint/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import OctoprintDataUpdateCoordinator
@@ -38,7 +38,7 @@ def _is_printer_printing(printer: OctoprintPrinterInfo) -> bool:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the available OctoPrint binary sensors."""
     coordinator: OctoprintDataUpdateCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/octoprint/strings.json b/homeassistant/components/octoprint/strings.json
index 5687ab36033..7f08d04e3da 100644
--- a/homeassistant/components/octoprint/strings.json
+++ b/homeassistant/components/octoprint/strings.json
@@ -1,11 +1,11 @@
 {
   "config": {
-    "flow_title": "OctoPrint Printer: {host}",
+    "flow_title": "OctoPrint printer: {host}",
     "step": {
       "user": {
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
-          "path": "Application Path",
+          "path": "Application path",
           "port": "[%key:common::config_flow::data::port%]",
           "ssl": "[%key:common::config_flow::data::ssl%]",
           "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]",
@@ -29,7 +29,7 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "unknown": "[%key:common::config_flow::error::unknown%]",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "auth_failed": "Failed to retrieve application api key",
+      "auth_failed": "Failed to retrieve API key",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     },
     "progress": {
@@ -44,7 +44,7 @@
   "services": {
     "printer_connect": {
       "name": "Connect to a printer",
-      "description": "Instructs the octoprint server to connect to a printer.",
+      "description": "Instructs the OctoPrint server to connect to a printer.",
       "fields": {
         "device_id": {
           "name": "Server",
diff --git a/homeassistant/components/oem/climate.py b/homeassistant/components/oem/climate.py
index 4cecb9ff195..e5ccdf6ede8 100644
--- a/homeassistant/components/oem/climate.py
+++ b/homeassistant/components/oem/climate.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/ogemray/__init__.py b/homeassistant/components/ogemray/__init__.py
new file mode 100644
index 00000000000..94e19234a6b
--- /dev/null
+++ b/homeassistant/components/ogemray/__init__.py
@@ -0,0 +1 @@
+"""Ogemray virtual integration."""
diff --git a/homeassistant/components/ogemray/manifest.json b/homeassistant/components/ogemray/manifest.json
new file mode 100644
index 00000000000..6a8eb315c7a
--- /dev/null
+++ b/homeassistant/components/ogemray/manifest.json
@@ -0,0 +1,6 @@
+{
+  "domain": "ogemray",
+  "name": "Ogemray",
+  "integration_type": "virtual",
+  "supported_by": "shelly"
+}
diff --git a/homeassistant/components/ohmconnect/sensor.py b/homeassistant/components/ohmconnect/sensor.py
index b32db33cc2d..287842178d8 100644
--- a/homeassistant/components/ohmconnect/sensor.py
+++ b/homeassistant/components/ohmconnect/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_ID, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/ohme/__init__.py b/homeassistant/components/ohme/__init__.py
index 8518e55c0a3..e3e252cbf8b 100644
--- a/homeassistant/components/ohme/__init__.py
+++ b/homeassistant/components/ohme/__init__.py
@@ -1,10 +1,7 @@
 """Set up ohme integration."""
 
-from dataclasses import dataclass
-
 from ohme import ApiException, AuthException, OhmeApiClient
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
@@ -15,23 +12,14 @@ from .const import DOMAIN, PLATFORMS
 from .coordinator import (
     OhmeAdvancedSettingsCoordinator,
     OhmeChargeSessionCoordinator,
+    OhmeConfigEntry,
     OhmeDeviceInfoCoordinator,
+    OhmeRuntimeData,
 )
 from .services import async_setup_services
 
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
-type OhmeConfigEntry = ConfigEntry[OhmeRuntimeData]
-
-
-@dataclass()
-class OhmeRuntimeData:
-    """Dataclass to hold ohme coordinators."""
-
-    charge_session_coordinator: OhmeChargeSessionCoordinator
-    advanced_settings_coordinator: OhmeAdvancedSettingsCoordinator
-    device_info_coordinator: OhmeDeviceInfoCoordinator
-
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up Ohme integration."""
@@ -62,9 +50,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: OhmeConfigEntry) -> bool
         ) from e
 
     coordinators = (
-        OhmeChargeSessionCoordinator(hass, client),
-        OhmeAdvancedSettingsCoordinator(hass, client),
-        OhmeDeviceInfoCoordinator(hass, client),
+        OhmeChargeSessionCoordinator(hass, entry, client),
+        OhmeAdvancedSettingsCoordinator(hass, entry, client),
+        OhmeDeviceInfoCoordinator(hass, entry, client),
     )
 
     for coordinator in coordinators:
diff --git a/homeassistant/components/ohme/button.py b/homeassistant/components/ohme/button.py
index 0b0590428ce..6e942215c0f 100644
--- a/homeassistant/components/ohme/button.py
+++ b/homeassistant/components/ohme/button.py
@@ -10,10 +10,10 @@ from ohme import ApiException, ChargerStatus, OhmeApiClient
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import OhmeConfigEntry
 from .const import DOMAIN
+from .coordinator import OhmeConfigEntry
 from .entity import OhmeEntity, OhmeEntityDescription
 
 PARALLEL_UPDATES = 1
@@ -40,7 +40,7 @@ BUTTON_DESCRIPTIONS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: OhmeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up buttons."""
     coordinator = config_entry.runtime_data.charge_session_coordinator
diff --git a/homeassistant/components/ohme/config_flow.py b/homeassistant/components/ohme/config_flow.py
index 748ea558983..1037c3a7c8b 100644
--- a/homeassistant/components/ohme/config_flow.py
+++ b/homeassistant/components/ohme/config_flow.py
@@ -99,6 +99,29 @@ class OhmeConfigFlow(ConfigFlow, domain=DOMAIN):
             errors=errors,
         )
 
+    async def async_step_reconfigure(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle re-configuration."""
+        errors: dict[str, str] = {}
+        reconfigure_entry = self._get_reconfigure_entry()
+        if user_input:
+            errors = await self._validate_account(
+                reconfigure_entry.data[CONF_EMAIL],
+                user_input[CONF_PASSWORD],
+            )
+            if not errors:
+                return self.async_update_reload_and_abort(
+                    reconfigure_entry,
+                    data_updates=user_input,
+                )
+        return self.async_show_form(
+            step_id="reconfigure",
+            data_schema=REAUTH_SCHEMA,
+            description_placeholders={"email": reconfigure_entry.data[CONF_EMAIL]},
+            errors=errors,
+        )
+
     async def _validate_account(self, email: str, password: str) -> dict[str, str]:
         """Validate Ohme account and return dict of errors."""
         errors: dict[str, str] = {}
diff --git a/homeassistant/components/ohme/const.py b/homeassistant/components/ohme/const.py
index 308664ba0ad..d97f6e3cfd7 100644
--- a/homeassistant/components/ohme/const.py
+++ b/homeassistant/components/ohme/const.py
@@ -6,6 +6,7 @@ DOMAIN = "ohme"
 PLATFORMS = [
     Platform.BUTTON,
     Platform.NUMBER,
+    Platform.SELECT,
     Platform.SENSOR,
     Platform.SWITCH,
     Platform.TIME,
diff --git a/homeassistant/components/ohme/coordinator.py b/homeassistant/components/ohme/coordinator.py
index 199eb7380a7..864b03e9a7c 100644
--- a/homeassistant/components/ohme/coordinator.py
+++ b/homeassistant/components/ohme/coordinator.py
@@ -1,11 +1,15 @@
 """Ohme coordinators."""
 
+from __future__ import annotations
+
 from abc import abstractmethod
+from dataclasses import dataclass
 from datetime import timedelta
 import logging
 
 from ohme import ApiException, OhmeApiClient
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -14,18 +18,34 @@ from .const import DOMAIN
 _LOGGER = logging.getLogger(__name__)
 
 
+@dataclass()
+class OhmeRuntimeData:
+    """Dataclass to hold ohme coordinators."""
+
+    charge_session_coordinator: OhmeChargeSessionCoordinator
+    advanced_settings_coordinator: OhmeAdvancedSettingsCoordinator
+    device_info_coordinator: OhmeDeviceInfoCoordinator
+
+
+type OhmeConfigEntry = ConfigEntry[OhmeRuntimeData]
+
+
 class OhmeBaseCoordinator(DataUpdateCoordinator[None]):
     """Base for all Ohme coordinators."""
 
+    config_entry: OhmeConfigEntry
     client: OhmeApiClient
     _default_update_interval: timedelta | None = timedelta(minutes=1)
     coordinator_name: str = ""
 
-    def __init__(self, hass: HomeAssistant, client: OhmeApiClient) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: OhmeConfigEntry, client: OhmeApiClient
+    ) -> None:
         """Initialise coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="",
             update_interval=self._default_update_interval,
         )
diff --git a/homeassistant/components/ohme/diagnostics.py b/homeassistant/components/ohme/diagnostics.py
new file mode 100644
index 00000000000..a955b3b76e2
--- /dev/null
+++ b/homeassistant/components/ohme/diagnostics.py
@@ -0,0 +1,24 @@
+"""Provides diagnostics for Ohme."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from homeassistant.core import HomeAssistant
+
+from .coordinator import OhmeConfigEntry
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, config_entry: OhmeConfigEntry
+) -> dict[str, Any]:
+    """Return diagnostics for Ohme."""
+    coordinators = config_entry.runtime_data
+    client = coordinators.charge_session_coordinator.client
+
+    return {
+        "device_info": client.device_info,
+        "vehicles": client.vehicles,
+        "ct_connected": client.ct_connected,
+        "cap_available": client.cap_available,
+    }
diff --git a/homeassistant/components/ohme/icons.json b/homeassistant/components/ohme/icons.json
index a6b04004833..8613f2542c4 100644
--- a/homeassistant/components/ohme/icons.json
+++ b/homeassistant/components/ohme/icons.json
@@ -6,10 +6,21 @@
       }
     },
     "number": {
+      "preconditioning_duration": {
+        "default": "mdi:fan-clock"
+      },
       "target_percentage": {
         "default": "mdi:battery-heart"
       }
     },
+    "select": {
+      "charge_mode": {
+        "default": "mdi:play-box"
+      },
+      "vehicle": {
+        "default": "mdi:car"
+      }
+    },
     "sensor": {
       "status": {
         "default": "mdi:car",
@@ -23,6 +34,9 @@
       },
       "ct_current": {
         "default": "mdi:gauge"
+      },
+      "slot_list": {
+        "default": "mdi:calendar-clock"
       }
     },
     "switch": {
@@ -40,6 +54,9 @@
         "state": {
           "off": "mdi:sleep-off"
         }
+      },
+      "price_cap": {
+        "default": "mdi:car-speed-limiter"
       }
     },
     "time": {
@@ -51,6 +68,9 @@
   "services": {
     "list_charge_slots": {
       "service": "mdi:clock-start"
+    },
+    "set_price_cap": {
+      "service": "mdi:car-speed-limiter"
     }
   }
 }
diff --git a/homeassistant/components/ohme/manifest.json b/homeassistant/components/ohme/manifest.json
index 67c41550491..f0021808d92 100644
--- a/homeassistant/components/ohme/manifest.json
+++ b/homeassistant/components/ohme/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "device",
   "iot_class": "cloud_polling",
   "quality_scale": "silver",
-  "requirements": ["ohme==1.2.5"]
+  "requirements": ["ohme==1.4.1"]
 }
diff --git a/homeassistant/components/ohme/number.py b/homeassistant/components/ohme/number.py
index d618d4a873b..0c71bab009f 100644
--- a/homeassistant/components/ohme/number.py
+++ b/homeassistant/components/ohme/number.py
@@ -6,13 +6,13 @@ from dataclasses import dataclass
 from ohme import ApiException, OhmeApiClient
 
 from homeassistant.components.number import NumberEntity, NumberEntityDescription
-from homeassistant.const import PERCENTAGE
+from homeassistant.const import PERCENTAGE, UnitOfTime
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import OhmeConfigEntry
 from .const import DOMAIN
+from .coordinator import OhmeConfigEntry
 from .entity import OhmeEntity, OhmeEntityDescription
 
 PARALLEL_UPDATES = 1
@@ -37,13 +37,25 @@ NUMBER_DESCRIPTION = [
         native_step=1,
         native_unit_of_measurement=PERCENTAGE,
     ),
+    OhmeNumberDescription(
+        key="preconditioning_duration",
+        translation_key="preconditioning_duration",
+        value_fn=lambda client: client.preconditioning,
+        set_fn=lambda client, value: client.async_set_target(
+            pre_condition_length=value
+        ),
+        native_min_value=0,
+        native_max_value=60,
+        native_step=5,
+        native_unit_of_measurement=UnitOfTime.MINUTES,
+    ),
 ]
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: OhmeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up numbers."""
     coordinators = config_entry.runtime_data
diff --git a/homeassistant/components/ohme/quality_scale.yaml b/homeassistant/components/ohme/quality_scale.yaml
index 497d5ad32e5..f748cf339b4 100644
--- a/homeassistant/components/ohme/quality_scale.yaml
+++ b/homeassistant/components/ohme/quality_scale.yaml
@@ -39,7 +39,7 @@ rules:
 
   # Gold
   devices: done
-  diagnostics: todo
+  diagnostics: done
   discovery:
     status: exempt
     comment: |
@@ -62,7 +62,7 @@ rules:
   entity-translations: done
   exception-translations: done
   icon-translations: done
-  reconfiguration-flow: todo
+  reconfiguration-flow: done
   repair-issues:
     status: exempt
     comment: |
diff --git a/homeassistant/components/ohme/select.py b/homeassistant/components/ohme/select.py
new file mode 100644
index 00000000000..f065afeb176
--- /dev/null
+++ b/homeassistant/components/ohme/select.py
@@ -0,0 +1,94 @@
+"""Platform for Ohme selects."""
+
+from __future__ import annotations
+
+from collections.abc import Awaitable, Callable
+from dataclasses import dataclass
+from typing import Any, Final
+
+from ohme import ApiException, ChargerMode, OhmeApiClient
+
+from homeassistant.components.select import SelectEntity, SelectEntityDescription
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .const import DOMAIN
+from .coordinator import OhmeConfigEntry
+from .entity import OhmeEntity, OhmeEntityDescription
+
+PARALLEL_UPDATES = 1
+
+
+@dataclass(frozen=True, kw_only=True)
+class OhmeSelectDescription(OhmeEntityDescription, SelectEntityDescription):
+    """Class to describe an Ohme select entity."""
+
+    select_fn: Callable[[OhmeApiClient, Any], Awaitable[None]]
+    options: list[str] | None = None
+    options_fn: Callable[[OhmeApiClient], list[str]] | None = None
+    current_option_fn: Callable[[OhmeApiClient], str | None]
+
+
+MODE_SELECT_DESCRIPTION: Final[OhmeSelectDescription] = OhmeSelectDescription(
+    key="charge_mode",
+    translation_key="charge_mode",
+    select_fn=lambda client, mode: client.async_set_mode(mode),
+    options=[e.value for e in ChargerMode],
+    current_option_fn=lambda client: client.mode.value if client.mode else None,
+    available_fn=lambda client: client.mode is not None,
+)
+
+VEHICLE_SELECT_DESCRIPTION: Final[OhmeSelectDescription] = OhmeSelectDescription(
+    key="vehicle",
+    translation_key="vehicle",
+    select_fn=lambda client, selection: client.async_set_vehicle(selection),
+    options_fn=lambda client: client.vehicles,
+    current_option_fn=lambda client: client.current_vehicle or None,
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: OhmeConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up Ohme selects."""
+    charge_sessions_coordinator = config_entry.runtime_data.charge_session_coordinator
+    device_info_coordinator = config_entry.runtime_data.device_info_coordinator
+
+    async_add_entities(
+        [
+            OhmeSelect(charge_sessions_coordinator, MODE_SELECT_DESCRIPTION),
+            OhmeSelect(device_info_coordinator, VEHICLE_SELECT_DESCRIPTION),
+        ]
+    )
+
+
+class OhmeSelect(OhmeEntity, SelectEntity):
+    """Ohme select entity."""
+
+    entity_description: OhmeSelectDescription
+
+    async def async_select_option(self, option: str) -> None:
+        """Handle the selection of an option."""
+        try:
+            await self.entity_description.select_fn(self.coordinator.client, option)
+        except ApiException as e:
+            raise HomeAssistantError(
+                translation_key="api_failed", translation_domain=DOMAIN
+            ) from e
+        await self.coordinator.async_request_refresh()
+
+    @property
+    def options(self) -> list[str]:
+        """Return a set of selectable options."""
+        if self.entity_description.options_fn:
+            return self.entity_description.options_fn(self.coordinator.client)
+        assert self.entity_description.options
+        return self.entity_description.options
+
+    @property
+    def current_option(self) -> str | None:
+        """Return the current selected option."""
+        return self.entity_description.current_option_fn(self.coordinator.client)
diff --git a/homeassistant/components/ohme/sensor.py b/homeassistant/components/ohme/sensor.py
index 230314cba83..d0425040b53 100644
--- a/homeassistant/components/ohme/sensor.py
+++ b/homeassistant/components/ohme/sensor.py
@@ -15,14 +15,16 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import (
     PERCENTAGE,
+    STATE_UNKNOWN,
     UnitOfElectricCurrent,
+    UnitOfElectricPotential,
     UnitOfEnergy,
     UnitOfPower,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import OhmeConfigEntry
+from .coordinator import OhmeConfigEntry
 from .entity import OhmeEntity, OhmeEntityDescription
 
 PARALLEL_UPDATES = 0
@@ -66,6 +68,13 @@ SENSOR_CHARGE_SESSION = [
         state_class=SensorStateClass.TOTAL_INCREASING,
         value_fn=lambda client: client.energy,
     ),
+    OhmeSensorDescription(
+        key="voltage",
+        device_class=SensorDeviceClass.VOLTAGE,
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        state_class=SensorStateClass.MEASUREMENT,
+        value_fn=lambda client: client.power.volts,
+    ),
     OhmeSensorDescription(
         key="battery",
         translation_key="vehicle_battery",
@@ -74,6 +83,12 @@ SENSOR_CHARGE_SESSION = [
         suggested_display_precision=0,
         value_fn=lambda client: client.battery,
     ),
+    OhmeSensorDescription(
+        key="slot_list",
+        translation_key="slot_list",
+        value_fn=lambda client: ", ".join(str(x) for x in client.slots)
+        or STATE_UNKNOWN,
+    ),
 ]
 
 SENSOR_ADVANCED_SETTINGS = [
@@ -91,7 +106,7 @@ SENSOR_ADVANCED_SETTINGS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: OhmeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors."""
     coordinators = config_entry.runtime_data
diff --git a/homeassistant/components/ohme/services.py b/homeassistant/components/ohme/services.py
index 7d06b909d88..be044f01740 100644
--- a/homeassistant/components/ohme/services.py
+++ b/homeassistant/components/ohme/services.py
@@ -17,9 +17,11 @@ from homeassistant.helpers import selector
 
 from .const import DOMAIN
 
-SERVICE_LIST_CHARGE_SLOTS = "list_charge_slots"
 ATTR_CONFIG_ENTRY: Final = "config_entry"
-SERVICE_SCHEMA: Final = vol.Schema(
+ATTR_PRICE_CAP: Final = "price_cap"
+
+SERVICE_LIST_CHARGE_SLOTS = "list_charge_slots"
+SERVICE_LIST_CHARGE_SLOTS_SCHEMA: Final = vol.Schema(
     {
         vol.Required(ATTR_CONFIG_ENTRY): selector.ConfigEntrySelector(
             {
@@ -29,6 +31,18 @@ SERVICE_SCHEMA: Final = vol.Schema(
     }
 )
 
+SERVICE_SET_PRICE_CAP = "set_price_cap"
+SERVICE_SET_PRICE_CAP_SCHEMA: Final = vol.Schema(
+    {
+        vol.Required(ATTR_CONFIG_ENTRY): selector.ConfigEntrySelector(
+            {
+                "integration": DOMAIN,
+            }
+        ),
+        vol.Required(ATTR_PRICE_CAP): vol.Coerce(float),
+    }
+)
+
 
 def __get_client(call: ServiceCall) -> OhmeApiClient:
     """Get the client from the config entry."""
@@ -66,10 +80,26 @@ def async_setup_services(hass: HomeAssistant) -> None:
 
         return {"slots": client.slots}
 
+    async def set_price_cap(
+        service_call: ServiceCall,
+    ) -> None:
+        """List of charge slots."""
+        client = __get_client(service_call)
+        price_cap = service_call.data[ATTR_PRICE_CAP]
+        await client.async_change_price_cap(cap=price_cap)
+
     hass.services.async_register(
         DOMAIN,
         SERVICE_LIST_CHARGE_SLOTS,
         list_charge_slots,
-        schema=SERVICE_SCHEMA,
+        schema=SERVICE_LIST_CHARGE_SLOTS_SCHEMA,
         supports_response=SupportsResponse.ONLY,
     )
+
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_SET_PRICE_CAP,
+        set_price_cap,
+        schema=SERVICE_SET_PRICE_CAP_SCHEMA,
+        supports_response=SupportsResponse.NONE,
+    )
diff --git a/homeassistant/components/ohme/services.yaml b/homeassistant/components/ohme/services.yaml
index c5c8ee18138..a45bc131511 100644
--- a/homeassistant/components/ohme/services.yaml
+++ b/homeassistant/components/ohme/services.yaml
@@ -5,3 +5,16 @@ list_charge_slots:
       selector:
         config_entry:
           integration: ohme
+set_price_cap:
+  fields:
+    config_entry:
+      required: true
+      selector:
+        config_entry:
+          integration: ohme
+    price_cap:
+      required: true
+      selector:
+        number:
+          min: 0
+          mode: box
diff --git a/homeassistant/components/ohme/strings.json b/homeassistant/components/ohme/strings.json
index 84f62ba65ab..4a2170babeb 100644
--- a/homeassistant/components/ohme/strings.json
+++ b/homeassistant/components/ohme/strings.json
@@ -21,6 +21,16 @@
         "data_description": {
           "password": "Enter the password for your Ohme account"
         }
+      },
+      "reconfigure": {
+        "description": "Update your password for {email}",
+        "title": "Reconfigure Ohme Account",
+        "data": {
+          "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "password": "Enter the password for your Ohme account"
+        }
       }
     },
     "error": {
@@ -29,7 +39,8 @@
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
     }
   },
   "services": {
@@ -42,6 +53,20 @@
           "description": "The Ohme config entry for which to return charge slots."
         }
       }
+    },
+    "set_price_cap": {
+      "name": "Set price cap",
+      "description": "Prevents charging when the electricity price exceeds a defined threshold.",
+      "fields": {
+        "config_entry": {
+          "name": "Ohme account",
+          "description": "The Ohme config entry for which to return charge slots."
+        },
+        "price_cap": {
+          "name": "Price cap",
+          "description": "Threshold in 1/100ths of your local currency."
+        }
+      }
     }
   },
   "entity": {
@@ -51,19 +76,36 @@
       }
     },
     "number": {
+      "preconditioning_duration": {
+        "name": "Preconditioning duration"
+      },
       "target_percentage": {
         "name": "Target percentage"
       }
     },
+    "select": {
+      "charge_mode": {
+        "name": "Charge mode",
+        "state": {
+          "smart_charge": "Smart charge",
+          "max_charge": "Max charge",
+          "paused": "Paused"
+        }
+      },
+      "vehicle": {
+        "name": "Vehicle"
+      }
+    },
     "sensor": {
       "status": {
         "name": "Status",
         "state": {
           "unplugged": "Unplugged",
           "plugged_in": "Plugged in",
-          "charging": "Charging",
+          "charging": "[%key:common::state::charging%]",
           "paused": "[%key:common::state::paused%]",
-          "pending_approval": "Pending approval"
+          "pending_approval": "Pending approval",
+          "finished": "Finished charging"
         }
       },
       "ct_current": {
@@ -71,6 +113,9 @@
       },
       "vehicle_battery": {
         "name": "Vehicle battery"
+      },
+      "slot_list": {
+        "name": "Charge slots"
       }
     },
     "switch": {
@@ -82,6 +127,9 @@
       },
       "sleep_when_inactive": {
         "name": "Sleep when inactive"
+      },
+      "price_cap": {
+        "name": "Price cap"
       }
     },
     "time": {
diff --git a/homeassistant/components/ohme/switch.py b/homeassistant/components/ohme/switch.py
index d1eb1a80b56..47e3bf8a99d 100644
--- a/homeassistant/components/ohme/switch.py
+++ b/homeassistant/components/ohme/switch.py
@@ -1,46 +1,56 @@
 """Platform for switch."""
 
+from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 from typing import Any
 
-from ohme import ApiException
+from ohme import ApiException, OhmeApiClient
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import OhmeConfigEntry
 from .const import DOMAIN
+from .coordinator import OhmeConfigEntry
 from .entity import OhmeEntity, OhmeEntityDescription
 
 PARALLEL_UPDATES = 1
 
 
 @dataclass(frozen=True, kw_only=True)
-class OhmeSwitchDescription(OhmeEntityDescription, SwitchEntityDescription):
-    """Class describing Ohme switch entities."""
+class OhmeConfigSwitchDescription(OhmeEntityDescription, SwitchEntityDescription):
+    """Class describing Ohme configuration switch entities."""
 
     configuration_key: str
 
 
-SWITCH_DEVICE_INFO = [
-    OhmeSwitchDescription(
+@dataclass(frozen=True, kw_only=True)
+class OhmeSwitchDescription(OhmeEntityDescription, SwitchEntityDescription):
+    """Class describing basic Ohme switch entities."""
+
+    is_on_fn: Callable[[OhmeApiClient], bool]
+    off_fn: Callable[[OhmeApiClient], Awaitable]
+    on_fn: Callable[[OhmeApiClient], Awaitable]
+
+
+SWITCH_CONFIG = [
+    OhmeConfigSwitchDescription(
         key="lock_buttons",
         translation_key="lock_buttons",
         entity_category=EntityCategory.CONFIG,
         is_supported_fn=lambda client: client.is_capable("buttonsLockable"),
         configuration_key="buttonsLocked",
     ),
-    OhmeSwitchDescription(
+    OhmeConfigSwitchDescription(
         key="require_approval",
         translation_key="require_approval",
         entity_category=EntityCategory.CONFIG,
         is_supported_fn=lambda client: client.is_capable("pluginsRequireApprovalMode"),
         configuration_key="pluginsRequireApproval",
     ),
-    OhmeSwitchDescription(
+    OhmeConfigSwitchDescription(
         key="sleep_when_inactive",
         translation_key="sleep_when_inactive",
         entity_category=EntityCategory.CONFIG,
@@ -49,22 +59,35 @@ SWITCH_DEVICE_INFO = [
     ),
 ]
 
+SWITCH_DESCRIPTION = [
+    OhmeSwitchDescription(
+        key="price_cap",
+        translation_key="price_cap",
+        is_supported_fn=lambda client: client.cap_available,
+        is_on_fn=lambda client: client.cap_enabled,
+        on_fn=lambda client: client.async_change_price_cap(True),
+        off_fn=lambda client: client.async_change_price_cap(False),
+    ),
+]
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: OhmeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switches."""
-    coordinators = config_entry.runtime_data
-    coordinator_map = [
-        (SWITCH_DEVICE_INFO, coordinators.device_info_coordinator),
-    ]
+    coordinator = config_entry.runtime_data.device_info_coordinator
+
+    async_add_entities(
+        OhmeConfigSwitch(coordinator, description)
+        for description in SWITCH_CONFIG
+        if description.is_supported_fn(coordinator.client)
+    )
 
     async_add_entities(
         OhmeSwitch(coordinator, description)
-        for entities, coordinator in coordinator_map
-        for description in entities
+        for description in SWITCH_DESCRIPTION
         if description.is_supported_fn(coordinator.client)
     )
 
@@ -74,6 +97,27 @@ class OhmeSwitch(OhmeEntity, SwitchEntity):
 
     entity_description: OhmeSwitchDescription
 
+    @property
+    def is_on(self) -> bool:
+        """Return True if entity is on."""
+        return self.entity_description.is_on_fn(self.coordinator.client)
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the switch off."""
+        await self.entity_description.off_fn(self.coordinator.client)
+        await self.coordinator.async_request_refresh()
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the switch on."""
+        await self.entity_description.on_fn(self.coordinator.client)
+        await self.coordinator.async_request_refresh()
+
+
+class OhmeConfigSwitch(OhmeEntity, SwitchEntity):
+    """Configuration switch for Ohme."""
+
+    entity_description: OhmeConfigSwitchDescription
+
     @property
     def is_on(self) -> bool:
         """Return the entity value to represent the entity state."""
diff --git a/homeassistant/components/ohme/time.py b/homeassistant/components/ohme/time.py
index a7de913ef8e..264b2afd41a 100644
--- a/homeassistant/components/ohme/time.py
+++ b/homeassistant/components/ohme/time.py
@@ -9,10 +9,10 @@ from ohme import ApiException, OhmeApiClient
 from homeassistant.components.time import TimeEntity, TimeEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import OhmeConfigEntry
 from .const import DOMAIN
+from .coordinator import OhmeConfigEntry
 from .entity import OhmeEntity, OhmeEntityDescription
 
 PARALLEL_UPDATES = 1
@@ -43,7 +43,7 @@ TIME_DESCRIPTION = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: OhmeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up time entities."""
     coordinators = config_entry.runtime_data
diff --git a/homeassistant/components/ollama/conversation.py b/homeassistant/components/ollama/conversation.py
index c0fbfae6444..ab9e05b5fbe 100644
--- a/homeassistant/components/ollama/conversation.py
+++ b/homeassistant/components/ollama/conversation.py
@@ -2,25 +2,21 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable
+from collections.abc import AsyncGenerator, Callable
 import json
 import logging
-import time
 from typing import Any, Literal
 
 import ollama
-import voluptuous as vol
 from voluptuous_openapi import convert
 
 from homeassistant.components import assist_pipeline, conversation
-from homeassistant.components.conversation import trace
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_LLM_HASS_API, MATCH_ALL
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError, TemplateError
-from homeassistant.helpers import intent, llm, template
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util import ulid as ulid_util
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import intent, llm
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CONF_KEEP_ALIVE,
@@ -32,7 +28,6 @@ from .const import (
     DEFAULT_MAX_HISTORY,
     DEFAULT_NUM_CTX,
     DOMAIN,
-    MAX_HISTORY_SECONDS,
 )
 from .models import MessageHistory, MessageRole
 
@@ -45,7 +40,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up conversation entities."""
     agent = OllamaConversationEntity(config_entry)
@@ -93,6 +88,84 @@ def _parse_tool_args(arguments: dict[str, Any]) -> dict[str, Any]:
     return {k: _fix_invalid_arguments(v) for k, v in arguments.items() if v}
 
 
+def _convert_content(
+    chat_content: conversation.Content
+    | conversation.ToolResultContent
+    | conversation.AssistantContent,
+) -> ollama.Message:
+    """Create tool response content."""
+    if isinstance(chat_content, conversation.ToolResultContent):
+        return ollama.Message(
+            role=MessageRole.TOOL.value,
+            content=json.dumps(chat_content.tool_result),
+        )
+    if isinstance(chat_content, conversation.AssistantContent):
+        return ollama.Message(
+            role=MessageRole.ASSISTANT.value,
+            content=chat_content.content,
+            tool_calls=[
+                ollama.Message.ToolCall(
+                    function=ollama.Message.ToolCall.Function(
+                        name=tool_call.tool_name,
+                        arguments=tool_call.tool_args,
+                    )
+                )
+                for tool_call in chat_content.tool_calls or ()
+            ],
+        )
+    if isinstance(chat_content, conversation.UserContent):
+        return ollama.Message(
+            role=MessageRole.USER.value,
+            content=chat_content.content,
+        )
+    if isinstance(chat_content, conversation.SystemContent):
+        return ollama.Message(
+            role=MessageRole.SYSTEM.value,
+            content=chat_content.content,
+        )
+    raise TypeError(f"Unexpected content type: {type(chat_content)}")
+
+
+async def _transform_stream(
+    result: AsyncGenerator[ollama.Message],
+) -> AsyncGenerator[conversation.AssistantContentDeltaDict]:
+    """Transform the response stream into HA format.
+
+    An Ollama streaming response may come in chunks like this:
+
+    response: message=Message(role="assistant", content="Paris")
+    response: message=Message(role="assistant", content=".")
+    response: message=Message(role="assistant", content=""), done: True, done_reason: "stop"
+    response: message=Message(role="assistant", tool_calls=[...])
+    response: message=Message(role="assistant", content=""), done: True, done_reason: "stop"
+
+    This generator conforms to the chatlog delta stream expectations in that it
+    yields deltas, then the role only once the response is done.
+    """
+
+    new_msg = True
+    async for response in result:
+        _LOGGER.debug("Received response: %s", response)
+        response_message = response["message"]
+        chunk: conversation.AssistantContentDeltaDict = {}
+        if new_msg:
+            new_msg = False
+            chunk["role"] = "assistant"
+        if (tool_calls := response_message.get("tool_calls")) is not None:
+            chunk["tool_calls"] = [
+                llm.ToolInput(
+                    tool_name=tool_call["function"]["name"],
+                    tool_args=_parse_tool_args(tool_call["function"]["arguments"]),
+                )
+                for tool_call in tool_calls
+            ]
+        if (content := response_message.get("content")) is not None:
+            chunk["content"] = content
+        if response_message.get("done"):
+            new_msg = True
+        yield chunk
+
+
 class OllamaConversationEntity(
     conversation.ConversationEntity, conversation.AbstractConversationAgent
 ):
@@ -105,7 +178,6 @@ class OllamaConversationEntity(
         self.entry = entry
 
         # conversation id -> message history
-        self._history: dict[str, MessageHistory] = {}
         self._attr_name = entry.title
         self._attr_unique_id = entry.entry_id
         if self.entry.options.get(CONF_LLM_HASS_API):
@@ -134,212 +206,106 @@ class OllamaConversationEntity(
         """Return a list of supported languages."""
         return MATCH_ALL
 
-    async def async_process(
-        self, user_input: conversation.ConversationInput
+    async def _async_handle_message(
+        self,
+        user_input: conversation.ConversationInput,
+        chat_log: conversation.ChatLog,
     ) -> conversation.ConversationResult:
-        """Process a sentence."""
+        """Call the API."""
         settings = {**self.entry.data, **self.entry.options}
 
         client = self.hass.data[DOMAIN][self.entry.entry_id]
-        conversation_id = user_input.conversation_id or ulid_util.ulid_now()
         model = settings[CONF_MODEL]
-        intent_response = intent.IntentResponse(language=user_input.language)
-        llm_api: llm.APIInstance | None = None
-        tools: list[dict[str, Any]] | None = None
-        user_name: str | None = None
-        llm_context = llm.LLMContext(
-            platform=DOMAIN,
-            context=user_input.context,
-            user_prompt=user_input.text,
-            language=user_input.language,
-            assistant=conversation.DOMAIN,
-            device_id=user_input.device_id,
-        )
 
-        if settings.get(CONF_LLM_HASS_API):
-            try:
-                llm_api = await llm.async_get_api(
-                    self.hass,
-                    settings[CONF_LLM_HASS_API],
-                    llm_context,
-                )
-            except HomeAssistantError as err:
-                _LOGGER.error("Error getting LLM API: %s", err)
-                intent_response.async_set_error(
-                    intent.IntentResponseErrorCode.UNKNOWN,
-                    f"Error preparing LLM API: {err}",
-                )
-                return conversation.ConversationResult(
-                    response=intent_response, conversation_id=user_input.conversation_id
-                )
+        try:
+            await chat_log.async_update_llm_data(
+                DOMAIN,
+                user_input,
+                settings.get(CONF_LLM_HASS_API),
+                settings.get(CONF_PROMPT),
+            )
+        except conversation.ConverseError as err:
+            return err.as_conversation_result()
+
+        tools: list[dict[str, Any]] | None = None
+        if chat_log.llm_api:
             tools = [
-                _format_tool(tool, llm_api.custom_serializer) for tool in llm_api.tools
+                _format_tool(tool, chat_log.llm_api.custom_serializer)
+                for tool in chat_log.llm_api.tools
             ]
 
-        if (
-            user_input.context
-            and user_input.context.user_id
-            and (
-                user := await self.hass.auth.async_get_user(user_input.context.user_id)
-            )
-        ):
-            user_name = user.name
-
-        # Look up message history
-        message_history: MessageHistory | None = None
-        message_history = self._history.get(conversation_id)
-        if message_history is None:
-            # New history
-            #
-            # Render prompt and error out early if there's a problem
-            try:
-                prompt_parts = [
-                    template.Template(
-                        llm.BASE_PROMPT
-                        + settings.get(CONF_PROMPT, llm.DEFAULT_INSTRUCTIONS_PROMPT),
-                        self.hass,
-                    ).async_render(
-                        {
-                            "ha_name": self.hass.config.location_name,
-                            "user_name": user_name,
-                            "llm_context": llm_context,
-                        },
-                        parse_result=False,
-                    )
-                ]
-
-            except TemplateError as err:
-                _LOGGER.error("Error rendering prompt: %s", err)
-                intent_response.async_set_error(
-                    intent.IntentResponseErrorCode.UNKNOWN,
-                    f"Sorry, I had a problem generating my prompt: {err}",
-                )
-                return conversation.ConversationResult(
-                    response=intent_response, conversation_id=conversation_id
-                )
-
-            if llm_api:
-                prompt_parts.append(llm_api.api_prompt)
-
-            prompt = "\n".join(prompt_parts)
-            _LOGGER.debug("Prompt: %s", prompt)
-            _LOGGER.debug("Tools: %s", tools)
-
-            message_history = MessageHistory(
-                timestamp=time.monotonic(),
-                messages=[
-                    ollama.Message(role=MessageRole.SYSTEM.value, content=prompt)
-                ],
-            )
-            self._history[conversation_id] = message_history
-        else:
-            # Bump timestamp so this conversation won't get cleaned up
-            message_history.timestamp = time.monotonic()
-
-        # Clean up old histories
-        self._prune_old_histories()
-
-        # Trim this message history to keep a maximum number of *user* messages
+        message_history: MessageHistory = MessageHistory(
+            [_convert_content(content) for content in chat_log.content]
+        )
         max_messages = int(settings.get(CONF_MAX_HISTORY, DEFAULT_MAX_HISTORY))
         self._trim_history(message_history, max_messages)
 
-        # Add new user message
-        message_history.messages.append(
-            ollama.Message(role=MessageRole.USER.value, content=user_input.text)
-        )
-
-        trace.async_conversation_trace_append(
-            trace.ConversationTraceEventType.AGENT_DETAIL,
-            {"messages": message_history.messages},
-        )
-
         # Get response
         # To prevent infinite loops, we limit the number of iterations
         for _iteration in range(MAX_TOOL_ITERATIONS):
             try:
-                response = await client.chat(
+                response_generator = await client.chat(
                     model=model,
                     # Make a copy of the messages because we mutate the list later
                     messages=list(message_history.messages),
                     tools=tools,
-                    stream=False,
+                    stream=True,
                     # keep_alive requires specifying unit. In this case, seconds
                     keep_alive=f"{settings.get(CONF_KEEP_ALIVE, DEFAULT_KEEP_ALIVE)}s",
                     options={CONF_NUM_CTX: settings.get(CONF_NUM_CTX, DEFAULT_NUM_CTX)},
                 )
             except (ollama.RequestError, ollama.ResponseError) as err:
                 _LOGGER.error("Unexpected error talking to Ollama server: %s", err)
-                intent_response.async_set_error(
-                    intent.IntentResponseErrorCode.UNKNOWN,
-                    f"Sorry, I had a problem talking to the Ollama server: {err}",
-                )
-                return conversation.ConversationResult(
-                    response=intent_response, conversation_id=conversation_id
-                )
+                raise HomeAssistantError(
+                    f"Sorry, I had a problem talking to the Ollama server: {err}"
+                ) from err
 
-            response_message = response["message"]
-            message_history.messages.append(
-                ollama.Message(
-                    role=response_message["role"],
-                    content=response_message.get("content"),
-                    tool_calls=response_message.get("tool_calls"),
-                )
+            message_history.messages.extend(
+                [
+                    _convert_content(content)
+                    async for content in chat_log.async_add_delta_content_stream(
+                        user_input.agent_id, _transform_stream(response_generator)
+                    )
+                ]
             )
 
-            tool_calls = response_message.get("tool_calls")
-            if not tool_calls or not llm_api:
+            if not chat_log.unresponded_tool_results:
                 break
 
-            for tool_call in tool_calls:
-                tool_input = llm.ToolInput(
-                    tool_name=tool_call["function"]["name"],
-                    tool_args=_parse_tool_args(tool_call["function"]["arguments"]),
-                )
-                _LOGGER.debug(
-                    "Tool call: %s(%s)", tool_input.tool_name, tool_input.tool_args
-                )
-
-                try:
-                    tool_response = await llm_api.async_call_tool(tool_input)
-                except (HomeAssistantError, vol.Invalid) as e:
-                    tool_response = {"error": type(e).__name__}
-                    if str(e):
-                        tool_response["error_text"] = str(e)
-
-                _LOGGER.debug("Tool response: %s", tool_response)
-                message_history.messages.append(
-                    ollama.Message(
-                        role=MessageRole.TOOL.value,
-                        content=json.dumps(tool_response),
-                    )
-                )
-
         # Create intent response
-        intent_response.async_set_speech(response_message["content"])
+        intent_response = intent.IntentResponse(language=user_input.language)
+        if not isinstance(chat_log.content[-1], conversation.AssistantContent):
+            raise TypeError(
+                f"Unexpected last message type: {type(chat_log.content[-1])}"
+            )
+        intent_response.async_set_speech(chat_log.content[-1].content or "")
         return conversation.ConversationResult(
-            response=intent_response, conversation_id=conversation_id
+            response=intent_response,
+            conversation_id=chat_log.conversation_id,
+            continue_conversation=chat_log.continue_conversation,
         )
 
-    def _prune_old_histories(self) -> None:
-        """Remove old message histories."""
-        now = time.monotonic()
-        self._history = {
-            conversation_id: message_history
-            for conversation_id, message_history in self._history.items()
-            if (now - message_history.timestamp) <= MAX_HISTORY_SECONDS
-        }
-
     def _trim_history(self, message_history: MessageHistory, max_messages: int) -> None:
-        """Trims excess messages from a single history."""
+        """Trims excess messages from a single history.
+
+        This sets the max history to allow a configurable size history may take
+        up in the context window.
+
+        Note that some messages in the history may not be from ollama only, and
+        may come from other anents, so the assumptions here may not strictly hold,
+        but generally should be effective.
+        """
         if max_messages < 1:
             # Keep all messages
             return
 
-        if message_history.num_user_messages >= max_messages:
+        # Ignore the in progress user message
+        num_previous_rounds = message_history.num_user_messages - 1
+        if num_previous_rounds >= max_messages:
             # Trim history but keep system prompt (first message).
             # Every other message should be an assistant message, so keep 2x
-            # message objects.
-            num_keep = 2 * max_messages
+            # message objects. Also keep the last in progress user message
+            num_keep = 2 * max_messages + 1
             drop_index = len(message_history.messages) - num_keep
             message_history.messages = [
                 message_history.messages[0]
diff --git a/homeassistant/components/ollama/models.py b/homeassistant/components/ollama/models.py
index 3b6fc958587..fd268664919 100644
--- a/homeassistant/components/ollama/models.py
+++ b/homeassistant/components/ollama/models.py
@@ -19,9 +19,6 @@ class MessageRole(StrEnum):
 class MessageHistory:
     """Chat message history."""
 
-    timestamp: float
-    """Timestamp of last use in seconds."""
-
     messages: list[ollama.Message]
     """List of message history, including system prompt and assistant responses."""
 
diff --git a/homeassistant/components/ombi/__init__.py b/homeassistant/components/ombi/__init__.py
index d63f72592f8..c3a51bacce2 100644
--- a/homeassistant/components/ombi/__init__.py
+++ b/homeassistant/components/ombi/__init__.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import load_platform
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/omnilogic/coordinator.py b/homeassistant/components/omnilogic/coordinator.py
index 72d16f03328..24c8cdf2554 100644
--- a/homeassistant/components/omnilogic/coordinator.py
+++ b/homeassistant/components/omnilogic/coordinator.py
@@ -18,6 +18,8 @@ _LOGGER = logging.getLogger(__name__)
 class OmniLogicUpdateCoordinator(DataUpdateCoordinator[dict[tuple, dict[str, Any]]]):
     """Class to manage fetching update data from single endpoint."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
@@ -28,11 +30,11 @@ class OmniLogicUpdateCoordinator(DataUpdateCoordinator[dict[tuple, dict[str, Any
     ) -> None:
         """Initialize the global Omnilogic data updater."""
         self.api = api
-        self.config_entry = config_entry
 
         super().__init__(
             hass=hass,
             logger=_LOGGER,
+            config_entry=config_entry,
             name=name,
             update_interval=timedelta(seconds=polling_interval),
         )
diff --git a/homeassistant/components/omnilogic/sensor.py b/homeassistant/components/omnilogic/sensor.py
index c87b589e1f6..d941eb3ae4d 100644
--- a/homeassistant/components/omnilogic/sensor.py
+++ b/homeassistant/components/omnilogic/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.const import (
     UnitOfVolume,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .common import check_guard
 from .const import COORDINATOR, DEFAULT_PH_OFFSET, DOMAIN, PUMP_TYPES
@@ -22,7 +22,9 @@ from .entity import OmniLogicEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor platform."""
 
diff --git a/homeassistant/components/omnilogic/strings.json b/homeassistant/components/omnilogic/strings.json
index 5b193b7f5ba..6f207337789 100644
--- a/homeassistant/components/omnilogic/strings.json
+++ b/homeassistant/components/omnilogic/strings.json
@@ -34,7 +34,7 @@
       "fields": {
         "speed": {
           "name": "Speed",
-          "description": "Speed for the VSP between min and max speed."
+          "description": "Speed for the pump between min and max speed."
         }
       }
     }
diff --git a/homeassistant/components/omnilogic/switch.py b/homeassistant/components/omnilogic/switch.py
index eb57d03bc34..a9f8bc77d8a 100644
--- a/homeassistant/components/omnilogic/switch.py
+++ b/homeassistant/components/omnilogic/switch.py
@@ -10,7 +10,7 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .common import check_guard
 from .const import COORDINATOR, DOMAIN, PUMP_TYPES
@@ -22,7 +22,9 @@ OMNILOGIC_SWITCH_OFF = 7
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the light platform."""
 
diff --git a/homeassistant/components/onboarding/manifest.json b/homeassistant/components/onboarding/manifest.json
index 918d845993a..a4cf814eb2a 100644
--- a/homeassistant/components/onboarding/manifest.json
+++ b/homeassistant/components/onboarding/manifest.json
@@ -1,7 +1,6 @@
 {
   "domain": "onboarding",
   "name": "Home Assistant Onboarding",
-  "after_dependencies": ["hassio"],
   "codeowners": ["@home-assistant/core"],
   "dependencies": ["auth", "http", "person"],
   "documentation": "https://www.home-assistant.io/integrations/onboarding",
diff --git a/homeassistant/components/onboarding/views.py b/homeassistant/components/onboarding/views.py
index b33440a9eb7..f0638e72d94 100644
--- a/homeassistant/components/onboarding/views.py
+++ b/homeassistant/components/onboarding/views.py
@@ -3,9 +3,10 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Coroutine
+from collections.abc import Callable, Coroutine
+from functools import wraps
 from http import HTTPStatus
-from typing import TYPE_CHECKING, Any, cast
+from typing import TYPE_CHECKING, Any, Concatenate, cast
 
 from aiohttp import web
 from aiohttp.web_exceptions import HTTPUnauthorized
@@ -15,16 +16,22 @@ from homeassistant.auth.const import GROUP_ID_ADMIN
 from homeassistant.auth.providers.homeassistant import HassAuthProvider
 from homeassistant.components import person
 from homeassistant.components.auth import indieauth
+from homeassistant.components.backup import (
+    BackupManager,
+    Folder,
+    IncorrectPasswordError,
+    http as backup_http,
+)
 from homeassistant.components.http import KEY_HASS, KEY_HASS_REFRESH_TOKEN_ID
 from homeassistant.components.http.data_validator import RequestDataValidator
 from homeassistant.components.http.view import HomeAssistantView
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import area_registry as ar
-from homeassistant.helpers.hassio import is_hassio
+from homeassistant.helpers.backup import async_get_manager as async_get_backup_manager
 from homeassistant.helpers.system_info import async_get_system_info
 from homeassistant.helpers.translation import async_get_translations
 from homeassistant.setup import async_setup_component
-from homeassistant.util.async_ import create_eager_task
 
 if TYPE_CHECKING:
     from . import OnboardingData, OnboardingStorage, OnboardingStoreData
@@ -50,6 +57,10 @@ async def async_setup(
     hass.http.register_view(CoreConfigOnboardingView(data, store))
     hass.http.register_view(IntegrationOnboardingView(data, store))
     hass.http.register_view(AnalyticsOnboardingView(data, store))
+    hass.http.register_view(BackupInfoView(data))
+    hass.http.register_view(RestoreBackupView(data))
+    hass.http.register_view(UploadBackupView(data))
+    setup_cloud_views(hass, data)
 
 
 class OnboardingView(HomeAssistantView):
@@ -213,32 +224,21 @@ class CoreConfigOnboardingView(_BaseOnboardingView):
                 "shopping_list",
             ]
 
-            # pylint: disable-next=import-outside-toplevel
-            from homeassistant.components import hassio
-
-            if (
-                is_hassio(hass)
-                and (core_info := hassio.get_core_info(hass))
-                and "raspberrypi" in core_info["machine"]
-            ):
-                onboard_integrations.append("rpi_power")
-
-            coros: list[Coroutine[Any, Any, Any]] = [
-                hass.config_entries.flow.async_init(
-                    domain, context={"source": "onboarding"}
+            for domain in onboard_integrations:
+                # Create tasks so onboarding isn't affected
+                # by errors in these integrations.
+                hass.async_create_task(
+                    hass.config_entries.flow.async_init(
+                        domain, context={"source": "onboarding"}
+                    ),
+                    f"onboarding_setup_{domain}",
                 )
-                for domain in onboard_integrations
-            ]
 
             if "analytics" not in hass.config.components:
                 # If by some chance that analytics has not finished
                 # setting up, wait for it here so its ready for the
                 # next step.
-                coros.append(async_setup_component(hass, "analytics", {}))
-
-            # Set up integrations after onboarding and ensure
-            # analytics is ready for the next step.
-            await asyncio.gather(*(create_eager_task(coro) for coro in coros))
+                await async_setup_component(hass, "analytics", {})
 
             return self.json({})
 
@@ -312,6 +312,233 @@ class AnalyticsOnboardingView(_BaseOnboardingView):
             return self.json({})
 
 
+class BackupOnboardingView(HomeAssistantView):
+    """Backup onboarding view."""
+
+    requires_auth = False
+
+    def __init__(self, data: OnboardingStoreData) -> None:
+        """Initialize the view."""
+        self._data = data
+
+
+def with_backup_manager[_ViewT: BackupOnboardingView, **_P](
+    func: Callable[
+        Concatenate[_ViewT, BackupManager, web.Request, _P],
+        Coroutine[Any, Any, web.Response],
+    ],
+) -> Callable[Concatenate[_ViewT, web.Request, _P], Coroutine[Any, Any, web.Response]]:
+    """Home Assistant API decorator to check onboarding and inject manager."""
+
+    @wraps(func)
+    async def with_backup(
+        self: _ViewT,
+        request: web.Request,
+        *args: _P.args,
+        **kwargs: _P.kwargs,
+    ) -> web.Response:
+        """Check admin and call function."""
+        if self._data["done"]:
+            raise HTTPUnauthorized
+
+        try:
+            manager = await async_get_backup_manager(request.app[KEY_HASS])
+        except HomeAssistantError:
+            return self.json(
+                {"code": "backup_disabled"},
+                status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            )
+
+        return await func(self, manager, request, *args, **kwargs)
+
+    return with_backup
+
+
+class BackupInfoView(BackupOnboardingView):
+    """Get backup info view."""
+
+    url = "/api/onboarding/backup/info"
+    name = "api:onboarding:backup:info"
+
+    @with_backup_manager
+    async def get(self, manager: BackupManager, request: web.Request) -> web.Response:
+        """Return backup info."""
+        backups, _ = await manager.async_get_backups()
+        return self.json(
+            {
+                "backups": list(backups.values()),
+                "state": manager.state,
+                "last_action_event": manager.last_action_event,
+            }
+        )
+
+
+class RestoreBackupView(BackupOnboardingView):
+    """Restore backup view."""
+
+    url = "/api/onboarding/backup/restore"
+    name = "api:onboarding:backup:restore"
+
+    @RequestDataValidator(
+        vol.Schema(
+            {
+                vol.Required("backup_id"): str,
+                vol.Required("agent_id"): str,
+                vol.Optional("password"): str,
+                vol.Optional("restore_addons"): [str],
+                vol.Optional("restore_database", default=True): bool,
+                vol.Optional("restore_folders"): [vol.Coerce(Folder)],
+            }
+        )
+    )
+    @with_backup_manager
+    async def post(
+        self, manager: BackupManager, request: web.Request, data: dict[str, Any]
+    ) -> web.Response:
+        """Restore a backup."""
+        try:
+            await manager.async_restore_backup(
+                data["backup_id"],
+                agent_id=data["agent_id"],
+                password=data.get("password"),
+                restore_addons=data.get("restore_addons"),
+                restore_database=data["restore_database"],
+                restore_folders=data.get("restore_folders"),
+                restore_homeassistant=True,
+            )
+        except IncorrectPasswordError:
+            return self.json(
+                {"code": "incorrect_password"}, status_code=HTTPStatus.BAD_REQUEST
+            )
+        except HomeAssistantError as err:
+            return self.json(
+                {"code": "restore_failed", "message": str(err)},
+                status_code=HTTPStatus.BAD_REQUEST,
+            )
+        return web.Response(status=HTTPStatus.OK)
+
+
+class UploadBackupView(BackupOnboardingView, backup_http.UploadBackupView):
+    """Upload backup view."""
+
+    url = "/api/onboarding/backup/upload"
+    name = "api:onboarding:backup:upload"
+
+    @with_backup_manager
+    async def post(self, manager: BackupManager, request: web.Request) -> web.Response:
+        """Upload a backup file."""
+        return await self._post(request)
+
+
+def setup_cloud_views(hass: HomeAssistant, data: OnboardingStoreData) -> None:
+    """Set up the cloud views."""
+
+    # The cloud integration is imported locally to avoid cloud being imported by
+    # bootstrap.py and to avoid circular imports.
+
+    # pylint: disable-next=import-outside-toplevel
+    from homeassistant.components.cloud import http_api as cloud_http
+
+    # pylint: disable-next=import-outside-toplevel,hass-component-root-import
+    from homeassistant.components.cloud.const import DATA_CLOUD
+
+    class CloudOnboardingView(HomeAssistantView):
+        """Cloud onboarding view."""
+
+        requires_auth = False
+
+        def __init__(self, data: OnboardingStoreData) -> None:
+            """Initialize the view."""
+            self._data = data
+
+    def with_cloud[_ViewT: CloudOnboardingView, **_P](
+        func: Callable[
+            Concatenate[_ViewT, web.Request, _P],
+            Coroutine[Any, Any, web.Response],
+        ],
+    ) -> Callable[
+        Concatenate[_ViewT, web.Request, _P], Coroutine[Any, Any, web.Response]
+    ]:
+        """Home Assistant API decorator to check onboarding and cloud."""
+
+        @wraps(func)
+        async def _with_cloud(
+            self: _ViewT,
+            request: web.Request,
+            *args: _P.args,
+            **kwargs: _P.kwargs,
+        ) -> web.Response:
+            """Check onboarding status, cloud and call function."""
+            if self._data["done"]:
+                # If at least one onboarding step is done, we don't allow accessing
+                # the cloud onboarding views.
+                raise HTTPUnauthorized
+
+            hass = request.app[KEY_HASS]
+            if DATA_CLOUD not in hass.data:
+                return self.json(
+                    {"code": "cloud_disabled"},
+                    status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+                )
+
+            return await func(self, request, *args, **kwargs)
+
+        return _with_cloud
+
+    class CloudForgotPasswordView(
+        CloudOnboardingView, cloud_http.CloudForgotPasswordView
+    ):
+        """View to start Forgot Password flow."""
+
+        url = "/api/onboarding/cloud/forgot_password"
+        name = "api:onboarding:cloud:forgot_password"
+
+        @with_cloud
+        async def post(self, request: web.Request) -> web.Response:
+            """Handle forgot password request."""
+            return await super()._post(request)
+
+    class CloudLoginView(CloudOnboardingView, cloud_http.CloudLoginView):
+        """Login to Home Assistant Cloud."""
+
+        url = "/api/onboarding/cloud/login"
+        name = "api:onboarding:cloud:login"
+
+        @with_cloud
+        async def post(self, request: web.Request) -> web.Response:
+            """Handle login request."""
+            return await super()._post(request)
+
+    class CloudLogoutView(CloudOnboardingView, cloud_http.CloudLogoutView):
+        """Log out of the Home Assistant cloud."""
+
+        url = "/api/onboarding/cloud/logout"
+        name = "api:onboarding:cloud:logout"
+
+        @with_cloud
+        async def post(self, request: web.Request) -> web.Response:
+            """Handle logout request."""
+            return await super()._post(request)
+
+    class CloudStatusView(CloudOnboardingView):
+        """Get cloud status view."""
+
+        url = "/api/onboarding/cloud/status"
+        name = "api:onboarding:cloud:status"
+
+        @with_cloud
+        async def get(self, request: web.Request) -> web.Response:
+            """Return cloud status."""
+            hass = request.app[KEY_HASS]
+            cloud = hass.data[DATA_CLOUD]
+            return self.json({"logged_in": cloud.is_logged_in})
+
+    hass.http.register_view(CloudForgotPasswordView(data))
+    hass.http.register_view(CloudLoginView(data))
+    hass.http.register_view(CloudLogoutView(data))
+    hass.http.register_view(CloudStatusView(data))
+
+
 @callback
 def _async_get_hass_provider(hass: HomeAssistant) -> HassAuthProvider:
     """Get the Home Assistant auth provider."""
diff --git a/homeassistant/components/oncue/binary_sensor.py b/homeassistant/components/oncue/binary_sensor.py
index 961b082a5c5..8dc9ba1be6f 100644
--- a/homeassistant/components/oncue/binary_sensor.py
+++ b/homeassistant/components/oncue/binary_sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import OncueEntity
 from .types import OncueConfigEntry
@@ -28,7 +28,7 @@ SENSOR_MAP = {description.key: description for description in SENSOR_TYPES}
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: OncueConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up binary sensors."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/oncue/manifest.json b/homeassistant/components/oncue/manifest.json
index b4c425a1645..33d56f23669 100644
--- a/homeassistant/components/oncue/manifest.json
+++ b/homeassistant/components/oncue/manifest.json
@@ -12,5 +12,5 @@
   "documentation": "https://www.home-assistant.io/integrations/oncue",
   "iot_class": "cloud_polling",
   "loggers": ["aiooncue"],
-  "requirements": ["aiooncue==0.3.7"]
+  "requirements": ["aiooncue==0.3.9"]
 }
diff --git a/homeassistant/components/oncue/sensor.py b/homeassistant/components/oncue/sensor.py
index a0f275ef692..669c34157d4 100644
--- a/homeassistant/components/oncue/sensor.py
+++ b/homeassistant/components/oncue/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .entity import OncueEntity
@@ -180,7 +180,7 @@ UNIT_MAPPINGS = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: OncueConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/ondilo_ico/__init__.py b/homeassistant/components/ondilo_ico/__init__.py
index fb78035c630..93aadb5b6ea 100644
--- a/homeassistant/components/ondilo_ico/__init__.py
+++ b/homeassistant/components/ondilo_ico/__init__.py
@@ -1,34 +1,46 @@
 """The Ondilo ICO integration."""
 
+from homeassistant.components.application_credentials import (
+    ClientCredential,
+    async_import_client_credential,
+)
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_entry_oauth2_flow
+from homeassistant.helpers import config_entry_oauth2_flow, config_validation as cv
+from homeassistant.helpers.typing import ConfigType
 
 from .api import OndiloClient
-from .config_flow import OndiloIcoOAuth2FlowHandler
-from .const import DOMAIN
-from .coordinator import OndiloIcoCoordinator
-from .oauth_impl import OndiloOauth2Implementation
+from .const import DOMAIN, OAUTH2_CLIENT_ID, OAUTH2_CLIENT_SECRET
+from .coordinator import OndiloIcoPoolsCoordinator
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 PLATFORMS = [Platform.SENSOR]
 
 
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the Ondilo ICO integration."""
+    # Import the default client credential.
+    await async_import_client_credential(
+        hass,
+        DOMAIN,
+        ClientCredential(OAUTH2_CLIENT_ID, OAUTH2_CLIENT_SECRET, name="Ondilo ICO"),
+    )
+
+    return True
+
+
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Ondilo ICO from a config entry."""
-
-    OndiloIcoOAuth2FlowHandler.async_register_implementation(
-        hass,
-        OndiloOauth2Implementation(hass),
-    )
-
     implementation = (
         await config_entry_oauth2_flow.async_get_config_entry_implementation(
             hass, entry
         )
     )
 
-    coordinator = OndiloIcoCoordinator(hass, OndiloClient(hass, entry, implementation))
+    coordinator = OndiloIcoPoolsCoordinator(
+        hass, entry, OndiloClient(hass, entry, implementation)
+    )
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/ondilo_ico/api.py b/homeassistant/components/ondilo_ico/api.py
index f6ab0baa576..696acf1b2d6 100644
--- a/homeassistant/components/ondilo_ico/api.py
+++ b/homeassistant/components/ondilo_ico/api.py
@@ -1,15 +1,12 @@
 """API for Ondilo ICO bound to Home Assistant OAuth."""
 
 from asyncio import run_coroutine_threadsafe
-import logging
 
 from ondilo import Ondilo
 
 from homeassistant import config_entries, core
 from homeassistant.helpers import config_entry_oauth2_flow
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class OndiloClient(Ondilo):
     """Provide Ondilo ICO authentication tied to an OAuth2 based config entry."""
diff --git a/homeassistant/components/ondilo_ico/application_credentials.py b/homeassistant/components/ondilo_ico/application_credentials.py
new file mode 100644
index 00000000000..5481a88bc1b
--- /dev/null
+++ b/homeassistant/components/ondilo_ico/application_credentials.py
@@ -0,0 +1,14 @@
+"""Application credentials platform for Ondilo ICO."""
+
+from homeassistant.components.application_credentials import AuthorizationServer
+from homeassistant.core import HomeAssistant
+
+from .const import OAUTH2_AUTHORIZE, OAUTH2_TOKEN
+
+
+async def async_get_authorization_server(hass: HomeAssistant) -> AuthorizationServer:
+    """Return authorization server."""
+    return AuthorizationServer(
+        authorize_url=OAUTH2_AUTHORIZE,
+        token_url=OAUTH2_TOKEN,
+    )
diff --git a/homeassistant/components/ondilo_ico/config_flow.py b/homeassistant/components/ondilo_ico/config_flow.py
index fe0b89e7258..6839d2089bf 100644
--- a/homeassistant/components/ondilo_ico/config_flow.py
+++ b/homeassistant/components/ondilo_ico/config_flow.py
@@ -3,11 +3,14 @@
 import logging
 from typing import Any
 
+from homeassistant.components.application_credentials import (
+    ClientCredential,
+    async_import_client_credential,
+)
 from homeassistant.config_entries import ConfigFlowResult
 from homeassistant.helpers.config_entry_oauth2_flow import AbstractOAuth2FlowHandler
 
-from .const import DOMAIN
-from .oauth_impl import OndiloOauth2Implementation
+from .const import DOMAIN, OAUTH2_CLIENT_ID, OAUTH2_CLIENT_SECRET
 
 
 class OndiloIcoOAuth2FlowHandler(AbstractOAuth2FlowHandler, domain=DOMAIN):
@@ -18,14 +21,13 @@ class OndiloIcoOAuth2FlowHandler(AbstractOAuth2FlowHandler, domain=DOMAIN):
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Handle a flow initialized by the user."""
-        await self.async_set_unique_id(DOMAIN)
-
-        self.async_register_implementation(
+        """Handle a flow start."""
+        # Import the default client credential.
+        await async_import_client_credential(
             self.hass,
-            OndiloOauth2Implementation(self.hass),
+            DOMAIN,
+            ClientCredential(OAUTH2_CLIENT_ID, OAUTH2_CLIENT_SECRET, name="Ondilo ICO"),
         )
-
         return await super().async_step_user(user_input)
 
     @property
diff --git a/homeassistant/components/ondilo_ico/const.py b/homeassistant/components/ondilo_ico/const.py
index 3c947776857..8dec6072556 100644
--- a/homeassistant/components/ondilo_ico/const.py
+++ b/homeassistant/components/ondilo_ico/const.py
@@ -4,5 +4,5 @@ DOMAIN = "ondilo_ico"
 
 OAUTH2_AUTHORIZE = "https://interop.ondilo.com/oauth2/authorize"
 OAUTH2_TOKEN = "https://interop.ondilo.com/oauth2/token"
-OAUTH2_CLIENTID = "customer_api"
-OAUTH2_CLIENTSECRET = ""
+OAUTH2_CLIENT_ID = "customer_api"
+OAUTH2_CLIENT_SECRET = ""
diff --git a/homeassistant/components/ondilo_ico/coordinator.py b/homeassistant/components/ondilo_ico/coordinator.py
index bc092ad0b9a..7545f6d61e0 100644
--- a/homeassistant/components/ondilo_ico/coordinator.py
+++ b/homeassistant/components/ondilo_ico/coordinator.py
@@ -1,77 +1,191 @@
 """Define an object to coordinate fetching Ondilo ICO data."""
 
-from dataclasses import dataclass
-from datetime import timedelta
+from __future__ import annotations
+
+import asyncio
+from dataclasses import dataclass, field
+from datetime import datetime, timedelta
 import logging
 from typing import Any
 
 from ondilo import OndiloError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+from homeassistant.util import dt as dt_util
 
 from . import DOMAIN
 from .api import OndiloClient
 
 _LOGGER = logging.getLogger(__name__)
 
+TIME_TO_NEXT_UPDATE = timedelta(hours=1, minutes=5)
+UPDATE_LOCK = asyncio.Lock()
+
 
 @dataclass
-class OndiloIcoData:
-    """Class for storing the data."""
+class OndiloIcoPoolData:
+    """Store the pools the data."""
 
     ico: dict[str, Any]
     pool: dict[str, Any]
+    measures_coordinator: OndiloIcoMeasuresCoordinator = field(init=False)
+
+
+@dataclass
+class OndiloIcoMeasurementData:
+    """Store the measurement data for one pool."""
+
     sensors: dict[str, Any]
 
 
-class OndiloIcoCoordinator(DataUpdateCoordinator[dict[str, OndiloIcoData]]):
-    """Class to manage fetching Ondilo ICO data from API."""
+class OndiloIcoPoolsCoordinator(DataUpdateCoordinator[dict[str, OndiloIcoPoolData]]):
+    """Fetch Ondilo ICO pools data from API."""
 
-    def __init__(self, hass: HomeAssistant, api: OndiloClient) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, api: OndiloClient
+    ) -> None:
         """Initialize."""
         super().__init__(
             hass,
             logger=_LOGGER,
-            name=DOMAIN,
+            config_entry=config_entry,
+            name=f"{DOMAIN}_pools",
             update_interval=timedelta(minutes=20),
         )
         self.api = api
+        self.config_entry = config_entry
+        self._device_registry = dr.async_get(self.hass)
 
-    async def _async_update_data(self) -> dict[str, OndiloIcoData]:
-        """Fetch data from API endpoint."""
+    async def _async_update_data(self) -> dict[str, OndiloIcoPoolData]:
+        """Fetch pools data from API endpoint and update devices."""
+        known_pools: set[str] = set(self.data) if self.data else set()
         try:
-            return await self.hass.async_add_executor_job(self._update_data)
+            async with UPDATE_LOCK:
+                data = await self.hass.async_add_executor_job(self._update_data)
         except OndiloError as err:
             raise UpdateFailed(f"Error communicating with API: {err}") from err
 
-    def _update_data(self) -> dict[str, OndiloIcoData]:
-        """Fetch data from API endpoint."""
+        current_pools = set(data)
+
+        new_pools = current_pools - known_pools
+        for pool_id in new_pools:
+            pool_data = data[pool_id]
+            pool_data.measures_coordinator = OndiloIcoMeasuresCoordinator(
+                self.hass, self.config_entry, self.api, pool_id
+            )
+            self._device_registry.async_get_or_create(
+                config_entry_id=self.config_entry.entry_id,
+                identifiers={(DOMAIN, pool_data.ico["serial_number"])},
+                manufacturer="Ondilo",
+                model="ICO",
+                name=pool_data.pool["name"],
+                sw_version=pool_data.ico["sw_version"],
+            )
+
+        removed_pools = known_pools - current_pools
+        for pool_id in removed_pools:
+            pool_data = self.data.pop(pool_id)
+            await pool_data.measures_coordinator.async_shutdown()
+            device_entry = self._device_registry.async_get_device(
+                identifiers={(DOMAIN, pool_data.ico["serial_number"])}
+            )
+            if device_entry:
+                self._device_registry.async_update_device(
+                    device_id=device_entry.id,
+                    remove_config_entry_id=self.config_entry.entry_id,
+                )
+
+        for pool_id in current_pools:
+            pool_data = data[pool_id]
+            measures_coordinator = pool_data.measures_coordinator
+            measures_coordinator.set_next_refresh(pool_data)
+            if not measures_coordinator.data:
+                await measures_coordinator.async_refresh()
+
+        return data
+
+    def _update_data(self) -> dict[str, OndiloIcoPoolData]:
+        """Fetch pools data from API endpoint."""
         res = {}
         pools = self.api.get_pools()
         _LOGGER.debug("Pools: %s", pools)
         error: OndiloError | None = None
         for pool in pools:
             pool_id = pool["id"]
+            if (data := self.data) and pool_id in data:
+                pool_data = res[pool_id] = data[pool_id]
+                pool_data.pool = pool
+                # Skip requesting new ICO data for known pools
+                # to avoid unnecessary API calls.
+                continue
             try:
                 ico = self.api.get_ICO_details(pool_id)
-                if not ico:
-                    _LOGGER.debug(
-                        "The pool id %s does not have any ICO attached", pool_id
-                    )
-                    continue
-                sensors = self.api.get_last_pool_measures(pool_id)
             except OndiloError as err:
                 error = err
                 _LOGGER.debug("Error communicating with API for %s: %s", pool_id, err)
                 continue
-            res[pool_id] = OndiloIcoData(
-                ico=ico,
-                pool=pool,
-                sensors={sensor["data_type"]: sensor["value"] for sensor in sensors},
-            )
+
+            if not ico:
+                _LOGGER.debug("The pool id %s does not have any ICO attached", pool_id)
+                continue
+
+            res[pool_id] = OndiloIcoPoolData(ico=ico, pool=pool)
         if not res:
             if error:
                 raise UpdateFailed(f"Error communicating with API: {error}") from error
-            raise UpdateFailed("No data available")
         return res
+
+
+class OndiloIcoMeasuresCoordinator(DataUpdateCoordinator[OndiloIcoMeasurementData]):
+    """Fetch Ondilo ICO measurement data for one pool from API."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        api: OndiloClient,
+        pool_id: str,
+    ) -> None:
+        """Initialize."""
+        super().__init__(
+            hass,
+            config_entry=config_entry,
+            logger=_LOGGER,
+            name=f"{DOMAIN}_measures_{pool_id}",
+        )
+        self.api = api
+        self._next_refresh: datetime | None = None
+        self._pool_id = pool_id
+
+    async def _async_update_data(self) -> OndiloIcoMeasurementData:
+        """Fetch measurement data from API endpoint."""
+        async with UPDATE_LOCK:
+            data = await self.hass.async_add_executor_job(self._update_data)
+        if next_refresh := self._next_refresh:
+            now = dt_util.utcnow()
+            # If we've missed the next refresh, schedule a refresh in one hour.
+            if next_refresh <= now:
+                next_refresh = now + timedelta(hours=1)
+            self.update_interval = next_refresh - now
+
+        return data
+
+    def _update_data(self) -> OndiloIcoMeasurementData:
+        """Fetch measurement data from API endpoint."""
+        try:
+            sensors = self.api.get_last_pool_measures(self._pool_id)
+        except OndiloError as err:
+            raise UpdateFailed(f"Error communicating with API: {err}") from err
+        return OndiloIcoMeasurementData(
+            sensors={sensor["data_type"]: sensor["value"] for sensor in sensors},
+        )
+
+    def set_next_refresh(self, pool_data: OndiloIcoPoolData) -> None:
+        """Set next refresh of this coordinator."""
+        last_update = datetime.fromisoformat(pool_data.pool["updated_at"])
+        self._next_refresh = last_update + TIME_TO_NEXT_UPDATE
diff --git a/homeassistant/components/ondilo_ico/manifest.json b/homeassistant/components/ondilo_ico/manifest.json
index 84862a89fbb..3553797b9cd 100644
--- a/homeassistant/components/ondilo_ico/manifest.json
+++ b/homeassistant/components/ondilo_ico/manifest.json
@@ -3,7 +3,7 @@
   "name": "Ondilo ICO",
   "codeowners": ["@JeromeHXP"],
   "config_flow": true,
-  "dependencies": ["auth"],
+  "dependencies": ["application_credentials"],
   "documentation": "https://www.home-assistant.io/integrations/ondilo_ico",
   "integration_type": "hub",
   "iot_class": "cloud_polling",
diff --git a/homeassistant/components/ondilo_ico/oauth_impl.py b/homeassistant/components/ondilo_ico/oauth_impl.py
deleted file mode 100644
index e1c6e6fdb90..00000000000
--- a/homeassistant/components/ondilo_ico/oauth_impl.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""Local implementation of OAuth2 specific to Ondilo to hard code client id and secret and return a proper name."""
-
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.config_entry_oauth2_flow import LocalOAuth2Implementation
-
-from .const import (
-    DOMAIN,
-    OAUTH2_AUTHORIZE,
-    OAUTH2_CLIENTID,
-    OAUTH2_CLIENTSECRET,
-    OAUTH2_TOKEN,
-)
-
-
-class OndiloOauth2Implementation(LocalOAuth2Implementation):
-    """Local implementation of OAuth2 specific to Ondilo to hard code client id and secret and return a proper name."""
-
-    def __init__(self, hass: HomeAssistant) -> None:
-        """Just init default class with default values."""
-        super().__init__(
-            hass,
-            DOMAIN,
-            OAUTH2_CLIENTID,
-            OAUTH2_CLIENTSECRET,
-            OAUTH2_AUTHORIZE,
-            OAUTH2_TOKEN,
-        )
-
-    @property
-    def name(self) -> str:
-        """Name of the implementation."""
-        return "Ondilo"
diff --git a/homeassistant/components/ondilo_ico/sensor.py b/homeassistant/components/ondilo_ico/sensor.py
index 66b07335663..da5ccae11a5 100644
--- a/homeassistant/components/ondilo_ico/sensor.py
+++ b/homeassistant/components/ondilo_ico/sensor.py
@@ -12,17 +12,22 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONCENTRATION_PARTS_PER_MILLION,
     PERCENTAGE,
+    EntityCategory,
     UnitOfElectricPotential,
     UnitOfTemperature,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
-from .coordinator import OndiloIcoCoordinator, OndiloIcoData
+from .coordinator import (
+    OndiloIcoMeasuresCoordinator,
+    OndiloIcoPoolData,
+    OndiloIcoPoolsCoordinator,
+)
 
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
@@ -52,12 +57,14 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
         key="battery",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
+        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="rssi",
         translation_key="rssi",
         native_unit_of_measurement=PERCENTAGE,
+        entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
@@ -70,53 +77,72 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Ondilo ICO sensors."""
+    pools_coordinator: OndiloIcoPoolsCoordinator = hass.data[DOMAIN][entry.entry_id]
+    known_entities: set[str] = set()
 
-    coordinator: OndiloIcoCoordinator = hass.data[DOMAIN][entry.entry_id]
+    async_add_entities(get_new_entities(pools_coordinator, known_entities))
 
-    async_add_entities(
-        OndiloICO(coordinator, pool_id, description)
-        for pool_id, pool in coordinator.data.items()
-        for description in SENSOR_TYPES
-        if description.key in pool.sensors
-    )
+    @callback
+    def add_new_entities():
+        """Add any new entities after update of the pools coordinator."""
+        async_add_entities(get_new_entities(pools_coordinator, known_entities))
+
+    entry.async_on_unload(pools_coordinator.async_add_listener(add_new_entities))
 
 
-class OndiloICO(CoordinatorEntity[OndiloIcoCoordinator], SensorEntity):
+@callback
+def get_new_entities(
+    pools_coordinator: OndiloIcoPoolsCoordinator,
+    known_entities: set[str],
+) -> list[OndiloICO]:
+    """Return new Ondilo ICO sensor entities."""
+    entities = []
+    for pool_id, pool_data in pools_coordinator.data.items():
+        for description in SENSOR_TYPES:
+            measurement_id = f"{pool_id}-{description.key}"
+            if (
+                measurement_id in known_entities
+                or (data := pool_data.measures_coordinator.data) is None
+                or description.key not in data.sensors
+            ):
+                continue
+            known_entities.add(measurement_id)
+            entities.append(
+                OndiloICO(
+                    pool_data.measures_coordinator, description, pool_id, pool_data
+                )
+            )
+
+    return entities
+
+
+class OndiloICO(CoordinatorEntity[OndiloIcoMeasuresCoordinator], SensorEntity):
     """Representation of a Sensor."""
 
     _attr_has_entity_name = True
 
     def __init__(
         self,
-        coordinator: OndiloIcoCoordinator,
-        pool_id: str,
+        coordinator: OndiloIcoMeasuresCoordinator,
         description: SensorEntityDescription,
+        pool_id: str,
+        pool_data: OndiloIcoPoolData,
     ) -> None:
         """Initialize sensor entity with data from coordinator."""
         super().__init__(coordinator)
         self.entity_description = description
-
         self._pool_id = pool_id
-
-        data = self.pool_data
-        self._attr_unique_id = f"{data.ico['serial_number']}-{description.key}"
+        self._attr_unique_id = f"{pool_data.ico['serial_number']}-{description.key}"
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, data.ico["serial_number"])},
-            manufacturer="Ondilo",
-            model="ICO",
-            name=data.pool["name"],
-            sw_version=data.ico["sw_version"],
+            identifiers={(DOMAIN, pool_data.ico["serial_number"])},
         )
 
-    @property
-    def pool_data(self) -> OndiloIcoData:
-        """Get pool data."""
-        return self.coordinator.data[self._pool_id]
-
     @property
     def native_value(self) -> StateType:
         """Last value of the sensor."""
-        return self.pool_data.sensors[self.entity_description.key]
+        return self.coordinator.data.sensors[self.entity_description.key]
diff --git a/homeassistant/components/onedrive/__init__.py b/homeassistant/components/onedrive/__init__.py
new file mode 100644
index 00000000000..f5d841683d5
--- /dev/null
+++ b/homeassistant/components/onedrive/__init__.py
@@ -0,0 +1,222 @@
+"""The OneDrive integration."""
+
+from __future__ import annotations
+
+from collections.abc import Awaitable, Callable
+from html import unescape
+from json import dumps, loads
+import logging
+from typing import cast
+
+from onedrive_personal_sdk import OneDriveClient
+from onedrive_personal_sdk.exceptions import (
+    AuthenticationError,
+    NotFoundError,
+    OneDriveException,
+)
+from onedrive_personal_sdk.models.items import Item, ItemUpdate
+
+from homeassistant.const import CONF_ACCESS_TOKEN, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.config_entry_oauth2_flow import (
+    OAuth2Session,
+    async_get_config_entry_implementation,
+)
+from homeassistant.helpers.instance_id import async_get as async_get_instance_id
+from homeassistant.helpers.typing import ConfigType
+
+from .const import CONF_FOLDER_ID, CONF_FOLDER_NAME, DATA_BACKUP_AGENT_LISTENERS, DOMAIN
+from .coordinator import (
+    OneDriveConfigEntry,
+    OneDriveRuntimeData,
+    OneDriveUpdateCoordinator,
+)
+from .services import async_register_services
+
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+PLATFORMS = [Platform.SENSOR]
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the OneDrive integration."""
+    async_register_services(hass)
+    return True
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: OneDriveConfigEntry) -> bool:
+    """Set up OneDrive from a config entry."""
+    client, get_access_token = await _get_onedrive_client(hass, entry)
+
+    # get approot, will be created automatically if it does not exist
+    approot = await _handle_item_operation(client.get_approot, "approot")
+    folder_name = entry.data[CONF_FOLDER_NAME]
+
+    try:
+        backup_folder = await _handle_item_operation(
+            lambda: client.get_drive_item(path_or_id=entry.data[CONF_FOLDER_ID]),
+            folder_name,
+        )
+    except NotFoundError:
+        _LOGGER.debug("Creating backup folder %s", folder_name)
+        backup_folder = await _handle_item_operation(
+            lambda: client.create_folder(parent_id=approot.id, name=folder_name),
+            folder_name,
+        )
+        hass.config_entries.async_update_entry(
+            entry, data={**entry.data, CONF_FOLDER_ID: backup_folder.id}
+        )
+
+    # write instance id to description
+    if backup_folder.description != (instance_id := await async_get_instance_id(hass)):
+        await _handle_item_operation(
+            lambda: client.update_drive_item(
+                backup_folder.id, ItemUpdate(description=instance_id)
+            ),
+            folder_name,
+        )
+
+    # update in case folder was renamed manually inside OneDrive
+    if backup_folder.name != entry.data[CONF_FOLDER_NAME]:
+        hass.config_entries.async_update_entry(
+            entry, data={**entry.data, CONF_FOLDER_NAME: backup_folder.name}
+        )
+
+    coordinator = OneDriveUpdateCoordinator(hass, entry, client)
+    await coordinator.async_config_entry_first_refresh()
+
+    entry.runtime_data = OneDriveRuntimeData(
+        client=client,
+        token_function=get_access_token,
+        backup_folder_id=backup_folder.id,
+        coordinator=coordinator,
+    )
+
+    try:
+        await _migrate_backup_files(client, backup_folder.id)
+    except OneDriveException as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="failed_to_migrate_files",
+        ) from err
+
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    def async_notify_backup_listeners() -> None:
+        for listener in hass.data.get(DATA_BACKUP_AGENT_LISTENERS, []):
+            listener()
+
+    entry.async_on_unload(entry.async_on_state_change(async_notify_backup_listeners))
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: OneDriveConfigEntry) -> bool:
+    """Unload a OneDrive config entry."""
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+
+async def _migrate_backup_files(client: OneDriveClient, backup_folder_id: str) -> None:
+    """Migrate backup files to metadata version 2."""
+    files = await client.list_drive_items(backup_folder_id)
+    for file in files:
+        if file.description and '"metadata_version": 1' in (
+            metadata_json := unescape(file.description)
+        ):
+            metadata = loads(metadata_json)
+            del metadata["metadata_version"]
+            metadata_filename = file.name.rsplit(".", 1)[0] + ".metadata.json"
+            metadata_file = await client.upload_file(
+                backup_folder_id,
+                metadata_filename,
+                dumps(metadata),
+            )
+            metadata_description = {
+                "metadata_version": 2,
+                "backup_id": metadata["backup_id"],
+                "backup_file_id": file.id,
+            }
+            await client.update_drive_item(
+                path_or_id=metadata_file.id,
+                data=ItemUpdate(description=dumps(metadata_description)),
+            )
+            await client.update_drive_item(
+                path_or_id=file.id,
+                data=ItemUpdate(description=""),
+            )
+            _LOGGER.debug("Migrated backup file %s", file.name)
+
+
+async def async_migrate_entry(hass: HomeAssistant, entry: OneDriveConfigEntry) -> bool:
+    """Migrate old entry."""
+    if entry.version > 1:
+        # This means the user has downgraded from a future version
+        return False
+
+    if (version := entry.version) == 1 and (minor_version := entry.minor_version) == 1:
+        _LOGGER.debug(
+            "Migrating OneDrive config entry from version %s.%s", version, minor_version
+        )
+        client, _ = await _get_onedrive_client(hass, entry)
+        instance_id = await async_get_instance_id(hass)
+        try:
+            approot = await client.get_approot()
+            folder = await client.get_drive_item(
+                f"{approot.id}:/backups_{instance_id[:8]}:"
+            )
+        except OneDriveException:
+            _LOGGER.exception("Migration to version 1.2 failed")
+            return False
+
+        hass.config_entries.async_update_entry(
+            entry,
+            data={
+                **entry.data,
+                CONF_FOLDER_ID: folder.id,
+                CONF_FOLDER_NAME: f"backups_{instance_id[:8]}",
+            },
+            minor_version=2,
+        )
+        _LOGGER.debug("Migration to version 1.2 successful")
+    return True
+
+
+async def _get_onedrive_client(
+    hass: HomeAssistant, entry: OneDriveConfigEntry
+) -> tuple[OneDriveClient, Callable[[], Awaitable[str]]]:
+    """Get OneDrive client."""
+    implementation = await async_get_config_entry_implementation(hass, entry)
+    session = OAuth2Session(hass, entry, implementation)
+
+    async def get_access_token() -> str:
+        await session.async_ensure_token_valid()
+        return cast(str, session.token[CONF_ACCESS_TOKEN])
+
+    return (
+        OneDriveClient(get_access_token, async_get_clientsession(hass)),
+        get_access_token,
+    )
+
+
+async def _handle_item_operation(
+    func: Callable[[], Awaitable[Item]], folder: str
+) -> Item:
+    try:
+        return await func()
+    except NotFoundError:
+        raise
+    except AuthenticationError as err:
+        raise ConfigEntryAuthFailed(
+            translation_domain=DOMAIN, translation_key="authentication_failed"
+        ) from err
+    except (OneDriveException, TimeoutError) as err:
+        _LOGGER.debug("Failed to get approot", exc_info=True)
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="failed_to_get_folder",
+            translation_placeholders={"folder": folder},
+        ) from err
diff --git a/homeassistant/components/onedrive/application_credentials.py b/homeassistant/components/onedrive/application_credentials.py
new file mode 100644
index 00000000000..b38aa9313d0
--- /dev/null
+++ b/homeassistant/components/onedrive/application_credentials.py
@@ -0,0 +1,14 @@
+"""Application credentials platform for the OneDrive integration."""
+
+from homeassistant.components.application_credentials import AuthorizationServer
+from homeassistant.core import HomeAssistant
+
+from .const import OAUTH2_AUTHORIZE, OAUTH2_TOKEN
+
+
+async def async_get_authorization_server(hass: HomeAssistant) -> AuthorizationServer:
+    """Return authorization server."""
+    return AuthorizationServer(
+        authorize_url=OAUTH2_AUTHORIZE,
+        token_url=OAUTH2_TOKEN,
+    )
diff --git a/homeassistant/components/onedrive/backup.py b/homeassistant/components/onedrive/backup.py
new file mode 100644
index 00000000000..41a244506ea
--- /dev/null
+++ b/homeassistant/components/onedrive/backup.py
@@ -0,0 +1,258 @@
+"""Support for OneDrive backup."""
+
+from __future__ import annotations
+
+from collections.abc import AsyncIterator, Callable, Coroutine
+from dataclasses import dataclass
+from functools import wraps
+from html import unescape
+from json import dumps, loads
+import logging
+from time import time
+from typing import Any, Concatenate
+
+from aiohttp import ClientTimeout
+from onedrive_personal_sdk.clients.large_file_upload import LargeFileUploadClient
+from onedrive_personal_sdk.exceptions import (
+    AuthenticationError,
+    HashMismatchError,
+    OneDriveException,
+)
+from onedrive_personal_sdk.models.items import ItemUpdate
+from onedrive_personal_sdk.models.upload import FileInfo
+
+from homeassistant.components.backup import (
+    AgentBackup,
+    BackupAgent,
+    BackupAgentError,
+    BackupNotFound,
+    suggested_filename,
+)
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+
+from .const import CONF_DELETE_PERMANENTLY, DATA_BACKUP_AGENT_LISTENERS, DOMAIN
+from .coordinator import OneDriveConfigEntry
+
+_LOGGER = logging.getLogger(__name__)
+UPLOAD_CHUNK_SIZE = 16 * 320 * 1024  # 5.2MB
+TIMEOUT = ClientTimeout(connect=10, total=43200)  # 12 hours
+METADATA_VERSION = 2
+CACHE_TTL = 300
+
+
+async def async_get_backup_agents(
+    hass: HomeAssistant,
+) -> list[BackupAgent]:
+    """Return a list of backup agents."""
+    entries: list[OneDriveConfigEntry] = hass.config_entries.async_loaded_entries(
+        DOMAIN
+    )
+    return [OneDriveBackupAgent(hass, entry) for entry in entries]
+
+
+@callback
+def async_register_backup_agents_listener(
+    hass: HomeAssistant,
+    *,
+    listener: Callable[[], None],
+    **kwargs: Any,
+) -> Callable[[], None]:
+    """Register a listener to be called when agents are added or removed."""
+    hass.data.setdefault(DATA_BACKUP_AGENT_LISTENERS, []).append(listener)
+
+    @callback
+    def remove_listener() -> None:
+        """Remove the listener."""
+        hass.data[DATA_BACKUP_AGENT_LISTENERS].remove(listener)
+        if not hass.data[DATA_BACKUP_AGENT_LISTENERS]:
+            del hass.data[DATA_BACKUP_AGENT_LISTENERS]
+
+    return remove_listener
+
+
+def handle_backup_errors[_R, **P](
+    func: Callable[Concatenate[OneDriveBackupAgent, P], Coroutine[Any, Any, _R]],
+) -> Callable[Concatenate[OneDriveBackupAgent, P], Coroutine[Any, Any, _R]]:
+    """Handle backup errors."""
+
+    @wraps(func)
+    async def wrapper(
+        self: OneDriveBackupAgent, *args: P.args, **kwargs: P.kwargs
+    ) -> _R:
+        try:
+            return await func(self, *args, **kwargs)
+        except AuthenticationError as err:
+            self._entry.async_start_reauth(self._hass)
+            raise BackupAgentError("Authentication error") from err
+        except OneDriveException as err:
+            _LOGGER.error(
+                "Error during backup in %s:, message %s",
+                func.__name__,
+                err,
+            )
+            _LOGGER.debug("Full error: %s", err, exc_info=True)
+            raise BackupAgentError("Backup operation failed") from err
+        except TimeoutError as err:
+            _LOGGER.error(
+                "Error during backup in %s: Timeout",
+                func.__name__,
+            )
+            raise BackupAgentError("Backup operation timed out") from err
+
+    return wrapper
+
+
+@dataclass(kw_only=True)
+class OneDriveBackup:
+    """Define a OneDrive backup."""
+
+    backup: AgentBackup
+    backup_file_id: str
+    metadata_file_id: str
+
+
+class OneDriveBackupAgent(BackupAgent):
+    """OneDrive backup agent."""
+
+    domain = DOMAIN
+
+    def __init__(self, hass: HomeAssistant, entry: OneDriveConfigEntry) -> None:
+        """Initialize the OneDrive backup agent."""
+        super().__init__()
+        self._hass = hass
+        self._entry = entry
+        self._client = entry.runtime_data.client
+        self._token_function = entry.runtime_data.token_function
+        self._folder_id = entry.runtime_data.backup_folder_id
+        self.name = entry.title
+        assert entry.unique_id
+        self.unique_id = entry.unique_id
+        self._backup_cache: dict[str, OneDriveBackup] = {}
+        self._cache_expiration = time()
+
+    @handle_backup_errors
+    async def async_download_backup(
+        self, backup_id: str, **kwargs: Any
+    ) -> AsyncIterator[bytes]:
+        """Download a backup file."""
+        backups = await self._list_cached_backups()
+        if backup_id not in backups:
+            raise BackupNotFound(f"Backup {backup_id} not found")
+
+        stream = await self._client.download_drive_item(
+            backups[backup_id].backup_file_id, timeout=TIMEOUT
+        )
+        return stream.iter_chunked(1024)
+
+    @handle_backup_errors
+    async def async_upload_backup(
+        self,
+        *,
+        open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
+        backup: AgentBackup,
+        **kwargs: Any,
+    ) -> None:
+        """Upload a backup."""
+        filename = suggested_filename(backup)
+        file = FileInfo(
+            filename,
+            backup.size,
+            self._folder_id,
+            await open_stream(),
+        )
+        try:
+            backup_file = await LargeFileUploadClient.upload(
+                self._token_function, file, session=async_get_clientsession(self._hass)
+            )
+        except HashMismatchError as err:
+            raise BackupAgentError(
+                "Hash validation failed, backup file might be corrupt"
+            ) from err
+
+        # store metadata in metadata file
+        description = dumps(backup.as_dict())
+        _LOGGER.debug("Creating metadata: %s", description)
+        metadata_filename = filename.rsplit(".", 1)[0] + ".metadata.json"
+        metadata_file = await self._client.upload_file(
+            self._folder_id,
+            metadata_filename,
+            description,
+        )
+
+        # add metadata to the metadata file
+        metadata_description = {
+            "metadata_version": METADATA_VERSION,
+            "backup_id": backup.backup_id,
+            "backup_file_id": backup_file.id,
+        }
+        await self._client.update_drive_item(
+            path_or_id=metadata_file.id,
+            data=ItemUpdate(description=dumps(metadata_description)),
+        )
+        self._cache_expiration = time()
+
+    @handle_backup_errors
+    async def async_delete_backup(
+        self,
+        backup_id: str,
+        **kwargs: Any,
+    ) -> None:
+        """Delete a backup file."""
+        backups = await self._list_cached_backups()
+        if backup_id not in backups:
+            raise BackupNotFound(f"Backup {backup_id} not found")
+
+        backup = backups[backup_id]
+
+        delete_permanently = self._entry.options.get(CONF_DELETE_PERMANENTLY, False)
+
+        await self._client.delete_drive_item(backup.backup_file_id, delete_permanently)
+        await self._client.delete_drive_item(
+            backup.metadata_file_id, delete_permanently
+        )
+        self._cache_expiration = time()
+
+    @handle_backup_errors
+    async def async_list_backups(self, **kwargs: Any) -> list[AgentBackup]:
+        """List backups."""
+        return [
+            backup.backup for backup in (await self._list_cached_backups()).values()
+        ]
+
+    @handle_backup_errors
+    async def async_get_backup(self, backup_id: str, **kwargs: Any) -> AgentBackup:
+        """Return a backup."""
+        backups = await self._list_cached_backups()
+        if backup_id not in backups:
+            raise BackupNotFound(f"Backup {backup_id} not found")
+        return backups[backup_id].backup
+
+    async def _list_cached_backups(self) -> dict[str, OneDriveBackup]:
+        """List backups with a cache."""
+        if time() <= self._cache_expiration:
+            return self._backup_cache
+
+        items = await self._client.list_drive_items(self._folder_id)
+
+        async def download_backup_metadata(item_id: str) -> AgentBackup:
+            metadata_stream = await self._client.download_drive_item(item_id)
+            metadata_json = loads(await metadata_stream.read())
+            return AgentBackup.from_dict(metadata_json)
+
+        backups: dict[str, OneDriveBackup] = {}
+        for item in items:
+            if item.description and f'"metadata_version": {METADATA_VERSION}' in (
+                metadata_description_json := unescape(item.description)
+            ):
+                backup = await download_backup_metadata(item.id)
+                metadata_description = loads(metadata_description_json)
+                backups[backup.backup_id] = OneDriveBackup(
+                    backup=backup,
+                    backup_file_id=metadata_description["backup_file_id"],
+                    metadata_file_id=item.id,
+                )
+
+        self._cache_expiration = time() + CACHE_TTL
+        self._backup_cache = backups
+        return backups
diff --git a/homeassistant/components/onedrive/config_flow.py b/homeassistant/components/onedrive/config_flow.py
new file mode 100644
index 00000000000..3374c0369ee
--- /dev/null
+++ b/homeassistant/components/onedrive/config_flow.py
@@ -0,0 +1,260 @@
+"""Config flow for OneDrive."""
+
+from __future__ import annotations
+
+from collections.abc import Mapping
+import logging
+from typing import Any, cast
+
+from onedrive_personal_sdk.clients.client import OneDriveClient
+from onedrive_personal_sdk.exceptions import OneDriveException
+from onedrive_personal_sdk.models.items import AppRoot, ItemUpdate
+import voluptuous as vol
+
+from homeassistant.config_entries import (
+    SOURCE_REAUTH,
+    SOURCE_RECONFIGURE,
+    SOURCE_USER,
+    ConfigFlowResult,
+    OptionsFlow,
+)
+from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN
+from homeassistant.core import callback
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.config_entry_oauth2_flow import AbstractOAuth2FlowHandler
+from homeassistant.helpers.instance_id import async_get as async_get_instance_id
+
+from .const import (
+    CONF_DELETE_PERMANENTLY,
+    CONF_FOLDER_ID,
+    CONF_FOLDER_NAME,
+    DOMAIN,
+    OAUTH_SCOPES,
+)
+from .coordinator import OneDriveConfigEntry
+
+FOLDER_NAME_SCHEMA = vol.Schema({vol.Required(CONF_FOLDER_NAME): str})
+
+
+class OneDriveConfigFlow(AbstractOAuth2FlowHandler, domain=DOMAIN):
+    """Config flow to handle OneDrive OAuth2 authentication."""
+
+    DOMAIN = DOMAIN
+    MINOR_VERSION = 2
+
+    client: OneDriveClient
+    approot: AppRoot
+
+    def __init__(self) -> None:
+        """Initialize the OneDrive config flow."""
+        super().__init__()
+        self.step_data: dict[str, Any] = {}
+
+    @property
+    def logger(self) -> logging.Logger:
+        """Return logger."""
+        return logging.getLogger(__name__)
+
+    @property
+    def extra_authorize_data(self) -> dict[str, Any]:
+        """Extra data that needs to be appended to the authorize url."""
+        return {"scope": " ".join(OAUTH_SCOPES)}
+
+    @property
+    def apps_folder(self) -> str:
+        """Return the name of the Apps folder (translated)."""
+        return (
+            path.split("/")[-1]
+            if (path := self.approot.parent_reference.path)
+            else "Apps"
+        )
+
+    async def async_oauth_create_entry(
+        self,
+        data: dict[str, Any],
+    ) -> ConfigFlowResult:
+        """Handle the initial step."""
+
+        async def get_access_token() -> str:
+            return cast(str, data[CONF_TOKEN][CONF_ACCESS_TOKEN])
+
+        self.client = OneDriveClient(
+            get_access_token, async_get_clientsession(self.hass)
+        )
+
+        try:
+            self.approot = await self.client.get_approot()
+        except OneDriveException:
+            self.logger.exception("Failed to connect to OneDrive")
+            return self.async_abort(reason="connection_error")
+        except Exception:
+            self.logger.exception("Unknown error")
+            return self.async_abort(reason="unknown")
+
+        await self.async_set_unique_id(self.approot.parent_reference.drive_id)
+
+        if self.source != SOURCE_USER:
+            self._abort_if_unique_id_mismatch(
+                reason="wrong_drive",
+            )
+
+        if self.source == SOURCE_REAUTH:
+            reauth_entry = self._get_reauth_entry()
+            return self.async_update_reload_and_abort(
+                entry=reauth_entry,
+                data=data,
+            )
+
+        if self.source != SOURCE_RECONFIGURE:
+            self._abort_if_unique_id_configured()
+
+        self.step_data = data
+
+        if self.source == SOURCE_RECONFIGURE:
+            return await self.async_step_reconfigure_folder()
+
+        return await self.async_step_folder_name()
+
+    async def async_step_folder_name(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Step to ask for the folder name."""
+        errors: dict[str, str] = {}
+        instance_id = await async_get_instance_id(self.hass)
+        if user_input is not None:
+            try:
+                folder = await self.client.create_folder(
+                    self.approot.id, user_input[CONF_FOLDER_NAME]
+                )
+            except OneDriveException:
+                self.logger.debug("Failed to create folder", exc_info=True)
+                errors["base"] = "folder_creation_error"
+            else:
+                if folder.description and folder.description != instance_id:
+                    errors[CONF_FOLDER_NAME] = "folder_already_in_use"
+            if not errors:
+                title = (
+                    f"{self.approot.created_by.user.display_name}'s OneDrive"
+                    if self.approot.created_by.user
+                    and self.approot.created_by.user.display_name
+                    else "OneDrive"
+                )
+                return self.async_create_entry(
+                    title=title,
+                    data={
+                        **self.step_data,
+                        CONF_FOLDER_ID: folder.id,
+                        CONF_FOLDER_NAME: user_input[CONF_FOLDER_NAME],
+                    },
+                )
+
+        default_folder_name = (
+            f"backups_{instance_id[:8]}"
+            if user_input is None
+            else user_input[CONF_FOLDER_NAME]
+        )
+
+        return self.async_show_form(
+            step_id="folder_name",
+            data_schema=self.add_suggested_values_to_schema(
+                FOLDER_NAME_SCHEMA, {CONF_FOLDER_NAME: default_folder_name}
+            ),
+            description_placeholders={
+                "apps_folder": self.apps_folder,
+                "approot": self.approot.name,
+            },
+            errors=errors,
+        )
+
+    async def async_step_reconfigure_folder(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Reconfigure the folder name."""
+        errors: dict[str, str] = {}
+        reconfigure_entry = self._get_reconfigure_entry()
+
+        if user_input is not None:
+            if (
+                new_folder_name := user_input[CONF_FOLDER_NAME]
+            ) != reconfigure_entry.data[CONF_FOLDER_NAME]:
+                try:
+                    await self.client.update_drive_item(
+                        reconfigure_entry.data[CONF_FOLDER_ID],
+                        ItemUpdate(name=new_folder_name),
+                    )
+                except OneDriveException:
+                    self.logger.debug("Failed to update folder", exc_info=True)
+                    errors["base"] = "folder_rename_error"
+            if not errors:
+                return self.async_update_reload_and_abort(
+                    reconfigure_entry,
+                    data={**reconfigure_entry.data, CONF_FOLDER_NAME: new_folder_name},
+                )
+
+        return self.async_show_form(
+            step_id="reconfigure_folder",
+            data_schema=self.add_suggested_values_to_schema(
+                FOLDER_NAME_SCHEMA,
+                {CONF_FOLDER_NAME: reconfigure_entry.data[CONF_FOLDER_NAME]},
+            ),
+            description_placeholders={
+                "apps_folder": self.apps_folder,
+                "approot": self.approot.name,
+            },
+            errors=errors,
+        )
+
+    async def async_step_reauth(
+        self, entry_data: Mapping[str, Any]
+    ) -> ConfigFlowResult:
+        """Perform reauth upon an API authentication error."""
+        return await self.async_step_reauth_confirm()
+
+    async def async_step_reauth_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Confirm reauth dialog."""
+        if user_input is None:
+            return self.async_show_form(step_id="reauth_confirm")
+        return await self.async_step_user()
+
+    async def async_step_reconfigure(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Reconfigure the entry."""
+        return await self.async_step_user()
+
+    @staticmethod
+    @callback
+    def async_get_options_flow(
+        config_entry: OneDriveConfigEntry,
+    ) -> OneDriveOptionsFlowHandler:
+        """Create the options flow."""
+        return OneDriveOptionsFlowHandler()
+
+
+class OneDriveOptionsFlowHandler(OptionsFlow):
+    """Handles options flow for the component."""
+
+    async def async_step_init(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Manage the options for OneDrive."""
+        if user_input:
+            return self.async_create_entry(title="", data=user_input)
+
+        options_schema = vol.Schema(
+            {
+                vol.Optional(
+                    CONF_DELETE_PERMANENTLY,
+                    default=self.config_entry.options.get(
+                        CONF_DELETE_PERMANENTLY, False
+                    ),
+                ): bool,
+            }
+        )
+
+        return self.async_show_form(
+            step_id="init",
+            data_schema=options_schema,
+        )
diff --git a/homeassistant/components/onedrive/const.py b/homeassistant/components/onedrive/const.py
new file mode 100644
index 00000000000..fd21d84369c
--- /dev/null
+++ b/homeassistant/components/onedrive/const.py
@@ -0,0 +1,28 @@
+"""Constants for the OneDrive integration."""
+
+from collections.abc import Callable
+from typing import Final
+
+from homeassistant.util.hass_dict import HassKey
+
+DOMAIN: Final = "onedrive"
+CONF_FOLDER_NAME: Final = "folder_name"
+CONF_FOLDER_ID: Final = "folder_id"
+
+CONF_DELETE_PERMANENTLY: Final = "delete_permanently"
+
+# replace "consumers" with "common", when adding SharePoint or OneDrive for Business support
+OAUTH2_AUTHORIZE: Final = (
+    "https://login.microsoftonline.com/consumers/oauth2/v2.0/authorize"
+)
+OAUTH2_TOKEN: Final = "https://login.microsoftonline.com/consumers/oauth2/v2.0/token"
+
+OAUTH_SCOPES: Final = [
+    "Files.ReadWrite.AppFolder",
+    "offline_access",
+    "openid",
+]
+
+DATA_BACKUP_AGENT_LISTENERS: HassKey[list[Callable[[], None]]] = HassKey(
+    f"{DOMAIN}.backup_agent_listeners"
+)
diff --git a/homeassistant/components/onedrive/coordinator.py b/homeassistant/components/onedrive/coordinator.py
new file mode 100644
index 00000000000..7b2dbaab87a
--- /dev/null
+++ b/homeassistant/components/onedrive/coordinator.py
@@ -0,0 +1,95 @@
+"""Coordinator for OneDrive."""
+
+from __future__ import annotations
+
+from collections.abc import Awaitable, Callable
+from dataclasses import dataclass
+from datetime import timedelta
+import logging
+
+from onedrive_personal_sdk import OneDriveClient
+from onedrive_personal_sdk.const import DriveState
+from onedrive_personal_sdk.exceptions import AuthenticationError, OneDriveException
+from onedrive_personal_sdk.models.items import Drive
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryAuthFailed
+from homeassistant.helpers import issue_registry as ir
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import DOMAIN
+
+SCAN_INTERVAL = timedelta(minutes=5)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+@dataclass
+class OneDriveRuntimeData:
+    """Runtime data for the OneDrive integration."""
+
+    client: OneDriveClient
+    token_function: Callable[[], Awaitable[str]]
+    backup_folder_id: str
+    coordinator: OneDriveUpdateCoordinator
+
+
+type OneDriveConfigEntry = ConfigEntry[OneDriveRuntimeData]
+
+
+class OneDriveUpdateCoordinator(DataUpdateCoordinator[Drive]):
+    """Class to handle fetching data from the Graph API centrally."""
+
+    config_entry: OneDriveConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, entry: OneDriveConfigEntry, client: OneDriveClient
+    ) -> None:
+        """Initialize coordinator."""
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=entry,
+            name=DOMAIN,
+            update_interval=SCAN_INTERVAL,
+        )
+        self._client = client
+
+    async def _async_update_data(self) -> Drive:
+        """Fetch data from API endpoint."""
+
+        try:
+            drive = await self._client.get_drive()
+        except AuthenticationError as err:
+            raise ConfigEntryAuthFailed(
+                translation_domain=DOMAIN, translation_key="authentication_failed"
+            ) from err
+        except OneDriveException as err:
+            raise UpdateFailed(
+                translation_domain=DOMAIN, translation_key="update_failed"
+            ) from err
+
+        # create an issue if the drive is almost full
+        if drive.quota and (state := drive.quota.state) in (
+            DriveState.CRITICAL,
+            DriveState.EXCEEDED,
+        ):
+            key = "drive_full" if state is DriveState.EXCEEDED else "drive_almost_full"
+            ir.async_create_issue(
+                self.hass,
+                DOMAIN,
+                key,
+                is_fixable=False,
+                severity=(
+                    ir.IssueSeverity.ERROR
+                    if state is DriveState.EXCEEDED
+                    else ir.IssueSeverity.WARNING
+                ),
+                translation_key=key,
+                translation_placeholders={
+                    "total": str(drive.quota.total),
+                    "used": str(drive.quota.used),
+                },
+            )
+        return drive
diff --git a/homeassistant/components/onedrive/diagnostics.py b/homeassistant/components/onedrive/diagnostics.py
new file mode 100644
index 00000000000..0e1ed94e155
--- /dev/null
+++ b/homeassistant/components/onedrive/diagnostics.py
@@ -0,0 +1,33 @@
+"""Diagnostics support for OneDrive."""
+
+from __future__ import annotations
+
+from dataclasses import asdict
+from typing import Any
+
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN
+from homeassistant.core import HomeAssistant
+
+from .coordinator import OneDriveConfigEntry
+
+TO_REDACT = {"display_name", "email", CONF_ACCESS_TOKEN, CONF_TOKEN}
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant,
+    entry: OneDriveConfigEntry,
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+
+    coordinator = entry.runtime_data.coordinator
+
+    data = {
+        "drive": asdict(coordinator.data),
+        "config": {
+            **entry.data,
+            **entry.options,
+        },
+    }
+
+    return async_redact_data(data, TO_REDACT)
diff --git a/homeassistant/components/onedrive/icons.json b/homeassistant/components/onedrive/icons.json
new file mode 100644
index 00000000000..2ac4921439c
--- /dev/null
+++ b/homeassistant/components/onedrive/icons.json
@@ -0,0 +1,29 @@
+{
+  "entity": {
+    "sensor": {
+      "total_size": {
+        "default": "mdi:database"
+      },
+      "used_size": {
+        "default": "mdi:database"
+      },
+      "remaining_size": {
+        "default": "mdi:database"
+      },
+      "drive_state": {
+        "default": "mdi:harddisk",
+        "state": {
+          "normal": "mdi:harddisk",
+          "nearing": "mdi:alert-circle-outline",
+          "critical": "mdi:alert",
+          "exceeded": "mdi:alert-octagon"
+        }
+      }
+    }
+  },
+  "services": {
+    "upload": {
+      "service": "mdi:cloud-upload"
+    }
+  }
+}
diff --git a/homeassistant/components/onedrive/manifest.json b/homeassistant/components/onedrive/manifest.json
new file mode 100644
index 00000000000..c3d98200b03
--- /dev/null
+++ b/homeassistant/components/onedrive/manifest.json
@@ -0,0 +1,13 @@
+{
+  "domain": "onedrive",
+  "name": "OneDrive",
+  "codeowners": ["@zweckj"],
+  "config_flow": true,
+  "dependencies": ["application_credentials"],
+  "documentation": "https://www.home-assistant.io/integrations/onedrive",
+  "integration_type": "service",
+  "iot_class": "cloud_polling",
+  "loggers": ["onedrive_personal_sdk"],
+  "quality_scale": "platinum",
+  "requirements": ["onedrive-personal-sdk==0.0.13"]
+}
diff --git a/homeassistant/components/onedrive/quality_scale.yaml b/homeassistant/components/onedrive/quality_scale.yaml
new file mode 100644
index 00000000000..1632c2670e0
--- /dev/null
+++ b/homeassistant/components/onedrive/quality_scale.yaml
@@ -0,0 +1,77 @@
+rules:
+  # Bronze
+  action-setup: done
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions: done
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup:
+    status: exempt
+    comment: |
+      Entities of this integration does not explicitly subscribe to events.
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions: done
+  config-entry-unloading: done
+  docs-configuration-parameters: done
+  docs-installation-parameters: done
+  entity-unavailable: done
+  integration-owner: done
+  log-when-unavailable: done
+  parallel-updates: done
+  reauthentication-flow: done
+  test-coverage: done
+
+  # Gold
+  devices: done
+  diagnostics: done
+  discovery-update-info:
+    status: exempt
+    comment: |
+      This integration is a cloud service and does not support discovery.
+  discovery:
+    status: exempt
+    comment: |
+      This integration is a cloud service and does not support discovery.
+  docs-data-update: done
+  docs-examples: done
+  docs-known-limitations: done
+  docs-supported-devices:
+    status: exempt
+    comment: |
+      This integration is a cloud service.
+  docs-supported-functions: done
+  docs-troubleshooting: done
+  docs-use-cases: done
+  dynamic-devices:
+    status: exempt
+    comment: |
+      This integration connects to a single service.
+  entity-category: done
+  entity-device-class: done
+  entity-disabled-by-default: done
+  entity-translations: done
+  exception-translations: done
+  icon-translations: done
+  reconfiguration-flow: done
+  repair-issues: done
+  stale-devices:
+    status: exempt
+    comment: |
+      This integration connects to a single service.
+  # Platinum
+  async-dependency: done
+  inject-websession: done
+  strict-typing: done
diff --git a/homeassistant/components/onedrive/sensor.py b/homeassistant/components/onedrive/sensor.py
new file mode 100644
index 00000000000..fa7c0b125fe
--- /dev/null
+++ b/homeassistant/components/onedrive/sensor.py
@@ -0,0 +1,122 @@
+"""Sensors for OneDrive."""
+
+from collections.abc import Callable
+from dataclasses import dataclass
+
+from onedrive_personal_sdk.const import DriveState
+from onedrive_personal_sdk.models.items import DriveQuota
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+)
+from homeassistant.const import EntityCategory, UnitOfInformation
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.typing import StateType
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+from .coordinator import OneDriveConfigEntry, OneDriveUpdateCoordinator
+
+PARALLEL_UPDATES = 0
+
+
+@dataclass(kw_only=True, frozen=True)
+class OneDriveSensorEntityDescription(SensorEntityDescription):
+    """Describes OneDrive sensor entity."""
+
+    value_fn: Callable[[DriveQuota], StateType]
+
+
+DRIVE_STATE_ENTITIES: tuple[OneDriveSensorEntityDescription, ...] = (
+    OneDriveSensorEntityDescription(
+        key="total_size",
+        value_fn=lambda quota: quota.total,
+        native_unit_of_measurement=UnitOfInformation.BYTES,
+        suggested_unit_of_measurement=UnitOfInformation.GIBIBYTES,
+        suggested_display_precision=0,
+        device_class=SensorDeviceClass.DATA_SIZE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    OneDriveSensorEntityDescription(
+        key="used_size",
+        value_fn=lambda quota: quota.used,
+        native_unit_of_measurement=UnitOfInformation.BYTES,
+        suggested_unit_of_measurement=UnitOfInformation.GIBIBYTES,
+        suggested_display_precision=2,
+        device_class=SensorDeviceClass.DATA_SIZE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    OneDriveSensorEntityDescription(
+        key="remaining_size",
+        value_fn=lambda quota: quota.remaining,
+        native_unit_of_measurement=UnitOfInformation.BYTES,
+        suggested_unit_of_measurement=UnitOfInformation.GIBIBYTES,
+        suggested_display_precision=2,
+        device_class=SensorDeviceClass.DATA_SIZE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    OneDriveSensorEntityDescription(
+        key="drive_state",
+        value_fn=lambda quota: quota.state.value,
+        options=[state.value for state in DriveState],
+        device_class=SensorDeviceClass.ENUM,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: OneDriveConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up OneDrive sensors based on a config entry."""
+    coordinator = entry.runtime_data.coordinator
+    async_add_entities(
+        OneDriveDriveStateSensor(coordinator, description)
+        for description in DRIVE_STATE_ENTITIES
+    )
+
+
+class OneDriveDriveStateSensor(
+    CoordinatorEntity[OneDriveUpdateCoordinator], SensorEntity
+):
+    """Define a OneDrive sensor."""
+
+    entity_description: OneDriveSensorEntityDescription
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: OneDriveUpdateCoordinator,
+        description: OneDriveSensorEntityDescription,
+    ) -> None:
+        """Initialize the sensor."""
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._attr_translation_key = description.key
+        self._attr_unique_id = f"{coordinator.data.id}_{description.key}"
+        self._attr_device_info = DeviceInfo(
+            entry_type=DeviceEntryType.SERVICE,
+            name=coordinator.data.name or coordinator.config_entry.title,
+            identifiers={(DOMAIN, coordinator.data.id)},
+            manufacturer="Microsoft",
+            model=f"OneDrive {coordinator.data.drive_type.value.capitalize()}",
+            configuration_url=f"https://onedrive.live.com/?id=root&cid={coordinator.data.id}",
+        )
+
+    @property
+    def native_value(self) -> StateType:
+        """Return the state of the sensor."""
+        assert self.coordinator.data.quota
+        return self.entity_description.value_fn(self.coordinator.data.quota)
+
+    @property
+    def available(self) -> bool:
+        """Availability of the sensor."""
+        return super().available and self.coordinator.data.quota is not None
diff --git a/homeassistant/components/onedrive/services.py b/homeassistant/components/onedrive/services.py
new file mode 100644
index 00000000000..1f1afe1507c
--- /dev/null
+++ b/homeassistant/components/onedrive/services.py
@@ -0,0 +1,131 @@
+"""OneDrive services."""
+
+from __future__ import annotations
+
+import asyncio
+from dataclasses import asdict
+from pathlib import Path
+from typing import cast
+
+from onedrive_personal_sdk.exceptions import OneDriveException
+import voluptuous as vol
+
+from homeassistant.const import CONF_FILENAME
+from homeassistant.core import (
+    HomeAssistant,
+    ServiceCall,
+    ServiceResponse,
+    SupportsResponse,
+)
+from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
+from homeassistant.helpers import config_validation as cv
+
+from .const import DOMAIN
+from .coordinator import OneDriveConfigEntry
+
+CONF_CONFIG_ENTRY_ID = "config_entry_id"
+CONF_DESTINATION_FOLDER = "destination_folder"
+
+UPLOAD_SERVICE = "upload"
+UPLOAD_SERVICE_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_CONFIG_ENTRY_ID): cv.string,
+        vol.Required(CONF_FILENAME): vol.All(cv.ensure_list, [cv.string]),
+        vol.Required(CONF_DESTINATION_FOLDER): cv.string,
+    }
+)
+CONTENT_SIZE_LIMIT = 250 * 1024 * 1024
+
+
+def _read_file_contents(
+    hass: HomeAssistant, filenames: list[str]
+) -> list[tuple[str, bytes]]:
+    """Return the mime types and file contents for each file."""
+    results = []
+    for filename in filenames:
+        if not hass.config.is_allowed_path(filename):
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="no_access_to_path",
+                translation_placeholders={"filename": filename},
+            )
+        filename_path = Path(filename)
+        if not filename_path.exists():
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="filename_does_not_exist",
+                translation_placeholders={"filename": filename},
+            )
+        if filename_path.stat().st_size > CONTENT_SIZE_LIMIT:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="file_too_large",
+                translation_placeholders={
+                    "filename": filename,
+                    "size": str(filename_path.stat().st_size),
+                    "limit": str(CONTENT_SIZE_LIMIT),
+                },
+            )
+        results.append((filename_path.name, filename_path.read_bytes()))
+    return results
+
+
+def async_register_services(hass: HomeAssistant) -> None:
+    """Register OneDrive services."""
+
+    async def async_handle_upload(call: ServiceCall) -> ServiceResponse:
+        """Generate content from text and optionally images."""
+        config_entry: OneDriveConfigEntry | None = hass.config_entries.async_get_entry(
+            call.data[CONF_CONFIG_ENTRY_ID]
+        )
+        if not config_entry:
+            raise ServiceValidationError(
+                translation_domain=DOMAIN,
+                translation_key="integration_not_found",
+                translation_placeholders={"target": DOMAIN},
+            )
+        client = config_entry.runtime_data.client
+        upload_tasks = []
+        file_results = await hass.async_add_executor_job(
+            _read_file_contents, hass, call.data[CONF_FILENAME]
+        )
+
+        # make sure the destination folder exists
+        try:
+            folder_id = (await client.get_approot()).id
+            for folder in (
+                cast(str, call.data[CONF_DESTINATION_FOLDER]).strip("/").split("/")
+            ):
+                folder_id = (await client.create_folder(folder_id, folder)).id
+        except OneDriveException as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="create_folder_error",
+                translation_placeholders={"message": str(err)},
+            ) from err
+
+        upload_tasks = [
+            client.upload_file(folder_id, file_name, content)
+            for file_name, content in file_results
+        ]
+        try:
+            upload_results = await asyncio.gather(*upload_tasks)
+        except OneDriveException as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="upload_error",
+                translation_placeholders={"message": str(err)},
+            ) from err
+
+        if call.return_response:
+            return {"files": [asdict(item_result) for item_result in upload_results]}
+        return None
+
+    if not hass.services.has_service(DOMAIN, UPLOAD_SERVICE):
+        hass.services.async_register(
+            DOMAIN,
+            UPLOAD_SERVICE,
+            async_handle_upload,
+            schema=UPLOAD_SERVICE_SCHEMA,
+            supports_response=SupportsResponse.OPTIONAL,
+        )
diff --git a/homeassistant/components/onedrive/services.yaml b/homeassistant/components/onedrive/services.yaml
new file mode 100644
index 00000000000..0cf0faf6b60
--- /dev/null
+++ b/homeassistant/components/onedrive/services.yaml
@@ -0,0 +1,15 @@
+upload:
+  fields:
+    config_entry_id:
+      required: true
+      selector:
+        config_entry:
+          integration: onedrive
+    filename:
+      required: false
+      selector:
+        object:
+    destination_folder:
+      required: true
+      selector:
+        text:
diff --git a/homeassistant/components/onedrive/strings.json b/homeassistant/components/onedrive/strings.json
new file mode 100644
index 00000000000..90fa4efc3ec
--- /dev/null
+++ b/homeassistant/components/onedrive/strings.json
@@ -0,0 +1,157 @@
+{
+  "config": {
+    "step": {
+      "pick_implementation": {
+        "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]"
+      },
+      "reauth_confirm": {
+        "title": "[%key:common::config_flow::title::reauth%]",
+        "description": "The OneDrive integration needs to re-authenticate your account"
+      },
+      "folder_name": {
+        "title": "Pick a folder name",
+        "description": "This name will be used to create a folder that is specific for this Home Assistant instance. This folder will be created inside `{apps_folder}/{approot}`",
+        "data": {
+          "folder_name": "Folder name"
+        },
+        "data_description": {
+          "folder_name": "Name of the folder"
+        }
+      },
+      "reconfigure_folder": {
+        "title": "Change the folder name",
+        "description": "Rename the instance specific folder inside `{apps_folder}/{approot}`. This will only rename the folder (and does not select another folder), so make sure the new name is not already in use.",
+        "data": {
+          "folder_name": "[%key:component::onedrive::config::step::folder_name::data::folder_name%]"
+        },
+        "data_description": {
+          "folder_name": "[%key:component::onedrive::config::step::folder_name::data_description::folder_name%]"
+        }
+      }
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "oauth_error": "[%key:common::config_flow::abort::oauth2_error%]",
+      "oauth_failed": "[%key:common::config_flow::abort::oauth2_failed%]",
+      "oauth_timeout": "[%key:common::config_flow::abort::oauth2_timeout%]",
+      "oauth_unauthorized": "[%key:common::config_flow::abort::oauth2_unauthorized%]",
+      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
+      "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
+      "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]",
+      "user_rejected_authorize": "[%key:common::config_flow::abort::oauth2_user_rejected_authorize%]",
+      "connection_error": "Failed to connect to OneDrive.",
+      "wrong_drive": "New account does not contain previously configured OneDrive.",
+      "unknown": "[%key:common::config_flow::error::unknown%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
+    },
+    "create_entry": {
+      "default": "[%key:common::config_flow::create_entry::authenticated%]"
+    },
+    "error": {
+      "folder_rename_error": "Failed to rename folder",
+      "folder_creation_error": "Failed to create folder",
+      "folder_already_in_use": "Folder already used for backups from another Home Assistant instance"
+    }
+  },
+  "options": {
+    "step": {
+      "init": {
+        "description": "By default, files are put into the Recycle Bin when deleted, where they remain available for another 30 days. If you enable this option, files will be deleted immediately when they are cleaned up by the backup system.",
+        "data": {
+          "delete_permanently": "Delete files permanently"
+        },
+        "data_description": {
+          "delete_permanently": "Delete files without moving them to the Recycle Bin"
+        }
+      }
+    }
+  },
+  "issues": {
+    "drive_full": {
+      "title": "OneDrive data cap exceeded",
+      "description": "Your OneDrive has exceeded your quota limit. This means your next backup will fail. Please free up some space or upgrade your OneDrive plan. Currently using {used} GiB of {total} GiB."
+    },
+    "drive_almost_full": {
+      "title": "OneDrive near data cap",
+      "description": "Your OneDrive is near your quota limit. If you go over this limit your drive will be temporarily frozen and your backups will start failing. Please free up some space or upgrade your OneDrive plan. Currently using {used} GiB of {total} GiB."
+    }
+  },
+  "exceptions": {
+    "authentication_failed": {
+      "message": "Authentication failed"
+    },
+    "failed_to_get_folder": {
+      "message": "Failed to get {folder} folder"
+    },
+    "failed_to_migrate_files": {
+      "message": "Failed to migrate metadata to separate files"
+    },
+    "update_failed": {
+      "message": "Failed to update drive state"
+    },
+    "integration_not_found": {
+      "message": "Integration \"{target}\" not found in registry."
+    },
+    "no_access_to_path": {
+      "message": "Cannot read {filename}, no access to path; `allowlist_external_dirs` may need to be adjusted in `configuration.yaml`"
+    },
+    "filename_does_not_exist": {
+      "message": "`{filename}` does not exist"
+    },
+    "file_too_large": {
+      "message": "`{filename}` is too large ({size} > {limit})"
+    },
+    "upload_error": {
+      "message": "Failed to upload content: {message}"
+    },
+    "create_folder_error": {
+      "message": "Failed to create folder: {message}"
+    }
+  },
+  "entity": {
+    "sensor": {
+      "total_size": {
+        "name": "Total available storage"
+      },
+      "used_size": {
+        "name": "Used storage"
+      },
+      "remaining_size": {
+        "name": "Remaining storage"
+      },
+      "drive_state": {
+        "name": "Drive state",
+        "state": {
+          "normal": "Normal",
+          "nearing": "Nearing limit",
+          "critical": "Critical",
+          "exceeded": "Exceeded"
+        }
+      }
+    }
+  },
+  "services": {
+    "upload": {
+      "name": "Upload file",
+      "description": "Uploads files to OneDrive.",
+      "fields": {
+        "config_entry_id": {
+          "name": "Config entry ID",
+          "description": "The config entry representing the OneDrive you want to upload to."
+        },
+        "filename": {
+          "name": "Filename",
+          "description": "Path to the file to upload.",
+          "example": "/config/www/image.jpg"
+        },
+        "destination_folder": {
+          "name": "Destination folder",
+          "description": "Folder inside the Home Assistant app folder (Apps/Home Assistant) you want to upload the file to. Will be created if it does not exist.",
+          "example": "photos/snapshots"
+        }
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/onewire/binary_sensor.py b/homeassistant/components/onewire/binary_sensor.py
index 60a1d165b15..2bb393e48a8 100644
--- a/homeassistant/components/onewire/binary_sensor.py
+++ b/homeassistant/components/onewire/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DEVICE_KEYS_0_3, DEVICE_KEYS_0_7, DEVICE_KEYS_A_B, READ_MODE_BOOL
 from .entity import OneWireEntity, OneWireEntityDescription
@@ -101,7 +101,7 @@ def get_sensor_types(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: OneWireConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up 1-Wire platform."""
 
diff --git a/homeassistant/components/onewire/config_flow.py b/homeassistant/components/onewire/config_flow.py
index e40e99d0903..2099d9aabb5 100644
--- a/homeassistant/components/onewire/config_flow.py
+++ b/homeassistant/components/onewire/config_flow.py
@@ -147,6 +147,7 @@ class OneWireFlowHandler(ConfigFlow, domain=DOMAIN):
 
         return self.async_show_form(
             step_id="discovery_confirm",
+            description_placeholders={"host": self._discovery_data[CONF_HOST]},
             errors=errors,
         )
 
@@ -233,12 +234,7 @@ class OnewireOptionsFlowHandler(OptionsFlow):
                         INPUT_ENTRY_DEVICE_SELECTION,
                         default=self._get_current_configured_sensors(),
                         description="Multiselect with list of devices to choose from",
-                    ): cv.multi_select(
-                        {
-                            friendly_name: False
-                            for friendly_name in self.configurable_devices
-                        }
-                    ),
+                    ): cv.multi_select(dict.fromkeys(self.configurable_devices, False)),
                 }
             ),
             errors=errors,
diff --git a/homeassistant/components/onewire/const.py b/homeassistant/components/onewire/const.py
index 2ab44c47892..57cdd8c483c 100644
--- a/homeassistant/components/onewire/const.py
+++ b/homeassistant/components/onewire/const.py
@@ -10,6 +10,7 @@ DOMAIN = "onewire"
 DEVICE_KEYS_0_3 = range(4)
 DEVICE_KEYS_0_7 = range(8)
 DEVICE_KEYS_A_B = ("A", "B")
+DEVICE_KEYS_A_D = ("A", "B", "C", "D")
 
 DEVICE_SUPPORT = {
     "05": (),
@@ -17,6 +18,7 @@ DEVICE_SUPPORT = {
     "12": (),
     "1D": (),
     "1F": (),
+    "20": (),
     "22": (),
     "26": (),
     "28": (),
diff --git a/homeassistant/components/onewire/onewirehub.py b/homeassistant/components/onewire/onewirehub.py
index a8d8dd06034..dc894a4242e 100644
--- a/homeassistant/components/onewire/onewirehub.py
+++ b/homeassistant/components/onewire/onewirehub.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import contextlib
 from datetime import datetime, timedelta
 import logging
 import os
@@ -58,6 +59,7 @@ class OneWireHub:
 
     owproxy: protocol._Proxy
     devices: list[OWDeviceDescription]
+    _version: str | None = None
 
     def __init__(self, hass: HomeAssistant, config_entry: OneWireConfigEntry) -> None:
         """Initialize."""
@@ -73,6 +75,9 @@ class OneWireHub:
         port = self._config_entry.data[CONF_PORT]
         _LOGGER.debug("Initializing connection to %s:%s", host, port)
         self.owproxy = protocol.proxy(host, port)
+        with contextlib.suppress(protocol.OwnetError):
+            # Version is not available on all servers
+            self._version = self.owproxy.read(protocol.PTH_VERSION).decode()
         self.devices = _discover_devices(self.owproxy)
 
     async def initialize(self) -> None:
@@ -85,6 +90,7 @@ class OneWireHub:
         """Populate the device registry."""
         device_registry = dr.async_get(self._hass)
         for device in devices:
+            device.device_info["sw_version"] = self._version
             device_registry.async_get_or_create(
                 config_entry_id=self._config_entry.entry_id,
                 **device.device_info,
diff --git a/homeassistant/components/onewire/select.py b/homeassistant/components/onewire/select.py
index 7a26ecdbb31..7f4111243aa 100644
--- a/homeassistant/components/onewire/select.py
+++ b/homeassistant/components/onewire/select.py
@@ -10,7 +10,7 @@ from homeassistant.components.select import SelectEntity, SelectEntityDescriptio
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import READ_MODE_INT
 from .entity import OneWireEntity, OneWireEntityDescription
@@ -48,7 +48,7 @@ ENTITY_DESCRIPTIONS: dict[str, tuple[OneWireEntityDescription, ...]] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: OneWireConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up 1-Wire platform."""
 
diff --git a/homeassistant/components/onewire/sensor.py b/homeassistant/components/onewire/sensor.py
index 1c4047abf0a..5e1c7d35bd6 100644
--- a/homeassistant/components/onewire/sensor.py
+++ b/homeassistant/components/onewire/sensor.py
@@ -27,12 +27,13 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .const import (
     DEVICE_KEYS_0_3,
     DEVICE_KEYS_A_B,
+    DEVICE_KEYS_A_D,
     OPTION_ENTRY_DEVICE_OPTIONS,
     OPTION_ENTRY_SENSOR_PRECISION,
     PRECISION_MAPPING_FAMILY_28,
@@ -108,6 +109,33 @@ DEVICE_SENSORS: dict[str, tuple[OneWireSensorEntityDescription, ...]] = {
             state_class=SensorStateClass.MEASUREMENT,
         ),
     ),
+    "20": tuple(
+        [
+            OneWireSensorEntityDescription(
+                key=f"latestvolt.{device_key}",
+                device_class=SensorDeviceClass.VOLTAGE,
+                entity_registry_enabled_default=False,
+                native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+                read_mode=READ_MODE_FLOAT,
+                state_class=SensorStateClass.MEASUREMENT,
+                translation_key="latest_voltage_id",
+                translation_placeholders={"id": str(device_key)},
+            )
+            for device_key in DEVICE_KEYS_A_D
+        ]
+        + [
+            OneWireSensorEntityDescription(
+                key=f"volt.{device_key}",
+                device_class=SensorDeviceClass.VOLTAGE,
+                native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+                read_mode=READ_MODE_FLOAT,
+                state_class=SensorStateClass.MEASUREMENT,
+                translation_key="voltage_id",
+                translation_placeholders={"id": str(device_key)},
+            )
+            for device_key in DEVICE_KEYS_A_D
+        ]
+    ),
     "22": (SIMPLE_TEMPERATURE_SENSOR_DESCRIPTION,),
     "26": (
         SIMPLE_TEMPERATURE_SENSOR_DESCRIPTION,
@@ -360,7 +388,7 @@ def get_sensor_types(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: OneWireConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up 1-Wire platform."""
 
diff --git a/homeassistant/components/onewire/strings.json b/homeassistant/components/onewire/strings.json
index 9613a927f8d..5e7719673b1 100644
--- a/homeassistant/components/onewire/strings.json
+++ b/homeassistant/components/onewire/strings.json
@@ -8,6 +8,9 @@
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "step": {
+      "discovery_confirm": {
+        "description": "Do you want to set up OWServer from {host}?"
+      },
       "reconfigure": {
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
@@ -71,12 +74,18 @@
       "humidity_raw": {
         "name": "Raw humidity"
       },
+      "latest_voltage_id": {
+        "name": "Latest voltage {id}"
+      },
       "moisture_id": {
         "name": "Moisture {id}"
       },
       "thermocouple_temperature_k": {
         "name": "Thermocouple K temperature"
       },
+      "voltage_id": {
+        "name": "Voltage {id}"
+      },
       "voltage_vad": {
         "name": "VAD voltage"
       },
@@ -131,14 +140,14 @@
           "device_selection": "[%key:component::onewire::options::error::device_not_selected%]"
         },
         "description": "Select what configuration steps to process",
-        "title": "OneWire Device Options"
+        "title": "1-Wire device options"
       },
       "configure_device": {
         "data": {
-          "precision": "Sensor Precision"
+          "precision": "Sensor precision"
         },
         "description": "Select sensor precision for {sensor_id}",
-        "title": "OneWire Sensor Precision"
+        "title": "1-Wire sensor precision"
       }
     }
   }
diff --git a/homeassistant/components/onewire/switch.py b/homeassistant/components/onewire/switch.py
index 7215b1ec020..d2cc3b80185 100644
--- a/homeassistant/components/onewire/switch.py
+++ b/homeassistant/components/onewire/switch.py
@@ -11,7 +11,7 @@ from homeassistant.components.switch import SwitchEntity, SwitchEntityDescriptio
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DEVICE_KEYS_0_3, DEVICE_KEYS_0_7, DEVICE_KEYS_A_B, READ_MODE_BOOL
 from .entity import OneWireEntity, OneWireEntityDescription
@@ -161,7 +161,7 @@ def get_sensor_types(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: OneWireConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up 1-Wire platform."""
 
diff --git a/homeassistant/components/onkyo/__init__.py b/homeassistant/components/onkyo/__init__.py
index fd5c0ba634a..2ebe86da561 100644
--- a/homeassistant/components/onkyo/__init__.py
+++ b/homeassistant/components/onkyo/__init__.py
@@ -1,6 +1,7 @@
 """The onkyo component."""
 
 from dataclasses import dataclass
+import logging
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, Platform
@@ -9,10 +10,18 @@ from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
-from .const import DOMAIN, OPTION_INPUT_SOURCES, InputSource
+from .const import (
+    DOMAIN,
+    OPTION_INPUT_SOURCES,
+    OPTION_LISTENING_MODES,
+    InputSource,
+    ListeningMode,
+)
 from .receiver import Receiver, async_interview
 from .services import DATA_MP_ENTITIES, async_register_services
 
+_LOGGER = logging.getLogger(__name__)
+
 PLATFORMS = [Platform.MEDIA_PLAYER]
 
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
@@ -24,6 +33,7 @@ class OnkyoData:
 
     receiver: Receiver
     sources: dict[InputSource, str]
+    sound_modes: dict[ListeningMode, str]
 
 
 type OnkyoConfigEntry = ConfigEntry[OnkyoData]
@@ -50,7 +60,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: OnkyoConfigEntry) -> boo
     sources_store: dict[str, str] = entry.options[OPTION_INPUT_SOURCES]
     sources = {InputSource(k): v for k, v in sources_store.items()}
 
-    entry.runtime_data = OnkyoData(receiver, sources)
+    sound_modes_store: dict[str, str] = entry.options.get(OPTION_LISTENING_MODES, {})
+    sound_modes = {ListeningMode(k): v for k, v in sound_modes_store.items()}
+
+    entry.runtime_data = OnkyoData(receiver, sources, sound_modes)
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
diff --git a/homeassistant/components/onkyo/config_flow.py b/homeassistant/components/onkyo/config_flow.py
index 228748d5257..5d941be959a 100644
--- a/homeassistant/components/onkyo/config_flow.py
+++ b/homeassistant/components/onkyo/config_flow.py
@@ -1,5 +1,6 @@
 """Config flow for Onkyo."""
 
+from collections.abc import Mapping
 import logging
 from typing import Any
 
@@ -33,12 +34,14 @@ from .const import (
     CONF_SOURCES,
     DOMAIN,
     OPTION_INPUT_SOURCES,
+    OPTION_LISTENING_MODES,
     OPTION_MAX_VOLUME,
     OPTION_MAX_VOLUME_DEFAULT,
     OPTION_VOLUME_RESOLUTION,
     OPTION_VOLUME_RESOLUTION_DEFAULT,
     VOLUME_RESOLUTION_ALLOWED,
     InputSource,
+    ListeningMode,
 )
 from .receiver import ReceiverInfo, async_discover, async_interview
 
@@ -46,9 +49,14 @@ _LOGGER = logging.getLogger(__name__)
 
 CONF_DEVICE = "device"
 
-INPUT_SOURCES_ALL_MEANINGS = [
-    input_source.value_meaning for input_source in InputSource
-]
+INPUT_SOURCES_DEFAULT: dict[str, str] = {}
+LISTENING_MODES_DEFAULT: dict[str, str] = {}
+INPUT_SOURCES_ALL_MEANINGS = {
+    input_source.value_meaning: input_source for input_source in InputSource
+}
+LISTENING_MODES_ALL_MEANINGS = {
+    listening_mode.value_meaning: listening_mode for listening_mode in ListeningMode
+}
 STEP_MANUAL_SCHEMA = vol.Schema({vol.Required(CONF_HOST): str})
 STEP_RECONFIGURE_SCHEMA = vol.Schema(
     {
@@ -59,7 +67,14 @@ STEP_CONFIGURE_SCHEMA = STEP_RECONFIGURE_SCHEMA.extend(
     {
         vol.Required(OPTION_INPUT_SOURCES): SelectSelector(
             SelectSelectorConfig(
-                options=INPUT_SOURCES_ALL_MEANINGS,
+                options=list(INPUT_SOURCES_ALL_MEANINGS),
+                multiple=True,
+                mode=SelectSelectorMode.DROPDOWN,
+            )
+        ),
+        vol.Required(OPTION_LISTENING_MODES): SelectSelector(
+            SelectSelectorConfig(
+                options=list(LISTENING_MODES_ALL_MEANINGS),
                 multiple=True,
                 mode=SelectSelectorMode.DROPDOWN,
             )
@@ -238,9 +253,8 @@ class OnkyoConfigFlow(ConfigFlow, domain=DOMAIN):
                         CONF_HOST: self._receiver_info.host,
                     },
                     options={
+                        **entry_options,
                         OPTION_VOLUME_RESOLUTION: volume_resolution,
-                        OPTION_MAX_VOLUME: entry_options[OPTION_MAX_VOLUME],
-                        OPTION_INPUT_SOURCES: entry_options[OPTION_INPUT_SOURCES],
                     },
                 )
 
@@ -250,12 +264,24 @@ class OnkyoConfigFlow(ConfigFlow, domain=DOMAIN):
             input_source_meanings: list[str] = user_input[OPTION_INPUT_SOURCES]
             if not input_source_meanings:
                 errors[OPTION_INPUT_SOURCES] = "empty_input_source_list"
-            else:
+
+            listening_modes: list[str] = user_input[OPTION_LISTENING_MODES]
+            if not listening_modes:
+                errors[OPTION_LISTENING_MODES] = "empty_listening_mode_list"
+
+            if not errors:
                 input_sources_store: dict[str, str] = {}
                 for input_source_meaning in input_source_meanings:
-                    input_source = InputSource.from_meaning(input_source_meaning)
+                    input_source = INPUT_SOURCES_ALL_MEANINGS[input_source_meaning]
                     input_sources_store[input_source.value] = input_source_meaning
 
+                listening_modes_store: dict[str, str] = {}
+                for listening_mode_meaning in listening_modes:
+                    listening_mode = LISTENING_MODES_ALL_MEANINGS[
+                        listening_mode_meaning
+                    ]
+                    listening_modes_store[listening_mode.value] = listening_mode_meaning
+
                 result = self.async_create_entry(
                     title=self._receiver_info.model_name,
                     data={
@@ -265,6 +291,7 @@ class OnkyoConfigFlow(ConfigFlow, domain=DOMAIN):
                         OPTION_VOLUME_RESOLUTION: volume_resolution,
                         OPTION_MAX_VOLUME: OPTION_MAX_VOLUME_DEFAULT,
                         OPTION_INPUT_SOURCES: input_sources_store,
+                        OPTION_LISTENING_MODES: listening_modes_store,
                     },
                 )
 
@@ -278,16 +305,13 @@ class OnkyoConfigFlow(ConfigFlow, domain=DOMAIN):
             if reconfigure_entry is None:
                 suggested_values = {
                     OPTION_VOLUME_RESOLUTION: OPTION_VOLUME_RESOLUTION_DEFAULT,
-                    OPTION_INPUT_SOURCES: [],
+                    OPTION_INPUT_SOURCES: INPUT_SOURCES_DEFAULT,
+                    OPTION_LISTENING_MODES: LISTENING_MODES_DEFAULT,
                 }
             else:
                 entry_options = reconfigure_entry.options
                 suggested_values = {
                     OPTION_VOLUME_RESOLUTION: entry_options[OPTION_VOLUME_RESOLUTION],
-                    OPTION_INPUT_SOURCES: [
-                        InputSource(input_source).value_meaning
-                        for input_source in entry_options[OPTION_INPUT_SOURCES]
-                    ],
                 }
 
         return self.async_show_form(
@@ -356,6 +380,7 @@ class OnkyoConfigFlow(ConfigFlow, domain=DOMAIN):
                 OPTION_VOLUME_RESOLUTION: volume_resolution,
                 OPTION_MAX_VOLUME: max_volume,
                 OPTION_INPUT_SOURCES: sources_store,
+                OPTION_LISTENING_MODES: LISTENING_MODES_DEFAULT,
             },
         )
 
@@ -373,7 +398,14 @@ OPTIONS_STEP_INIT_SCHEMA = vol.Schema(
         ),
         vol.Required(OPTION_INPUT_SOURCES): SelectSelector(
             SelectSelectorConfig(
-                options=INPUT_SOURCES_ALL_MEANINGS,
+                options=list(INPUT_SOURCES_ALL_MEANINGS),
+                multiple=True,
+                mode=SelectSelectorMode.DROPDOWN,
+            )
+        ),
+        vol.Required(OPTION_LISTENING_MODES): SelectSelector(
+            SelectSelectorConfig(
+                options=list(LISTENING_MODES_ALL_MEANINGS),
                 multiple=True,
                 mode=SelectSelectorMode.DROPDOWN,
             )
@@ -387,6 +419,7 @@ class OnkyoOptionsFlowHandler(OptionsFlow):
 
     _data: dict[str, Any]
     _input_sources: dict[InputSource, str]
+    _listening_modes: dict[ListeningMode, str]
 
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
@@ -394,20 +427,40 @@ class OnkyoOptionsFlowHandler(OptionsFlow):
         """Manage the options."""
         errors = {}
 
-        entry_options = self.config_entry.options
+        entry_options: Mapping[str, Any] = self.config_entry.options
+        entry_options = {
+            OPTION_LISTENING_MODES: LISTENING_MODES_DEFAULT,
+            **entry_options,
+        }
 
         if user_input is not None:
-            self._input_sources = {}
-            for input_source_meaning in user_input[OPTION_INPUT_SOURCES]:
-                input_source = InputSource.from_meaning(input_source_meaning)
-                input_source_name = entry_options[OPTION_INPUT_SOURCES].get(
-                    input_source.value, input_source_meaning
-                )
-                self._input_sources[input_source] = input_source_name
-
-            if not self._input_sources:
+            input_source_meanings: list[str] = user_input[OPTION_INPUT_SOURCES]
+            if not input_source_meanings:
                 errors[OPTION_INPUT_SOURCES] = "empty_input_source_list"
-            else:
+
+            listening_mode_meanings: list[str] = user_input[OPTION_LISTENING_MODES]
+            if not listening_mode_meanings:
+                errors[OPTION_LISTENING_MODES] = "empty_listening_mode_list"
+
+            if not errors:
+                self._input_sources = {}
+                for input_source_meaning in input_source_meanings:
+                    input_source = INPUT_SOURCES_ALL_MEANINGS[input_source_meaning]
+                    input_source_name = entry_options[OPTION_INPUT_SOURCES].get(
+                        input_source.value, input_source_meaning
+                    )
+                    self._input_sources[input_source] = input_source_name
+
+                self._listening_modes = {}
+                for listening_mode_meaning in listening_mode_meanings:
+                    listening_mode = LISTENING_MODES_ALL_MEANINGS[
+                        listening_mode_meaning
+                    ]
+                    listening_mode_name = entry_options[OPTION_LISTENING_MODES].get(
+                        listening_mode.value, listening_mode_meaning
+                    )
+                    self._listening_modes[listening_mode] = listening_mode_name
+
                 self._data = {
                     OPTION_VOLUME_RESOLUTION: entry_options[OPTION_VOLUME_RESOLUTION],
                     OPTION_MAX_VOLUME: user_input[OPTION_MAX_VOLUME],
@@ -423,6 +476,10 @@ class OnkyoOptionsFlowHandler(OptionsFlow):
                     InputSource(input_source).value_meaning
                     for input_source in entry_options[OPTION_INPUT_SOURCES]
                 ],
+                OPTION_LISTENING_MODES: [
+                    ListeningMode(listening_mode).value_meaning
+                    for listening_mode in entry_options[OPTION_LISTENING_MODES]
+                ],
             }
 
         return self.async_show_form(
@@ -440,28 +497,48 @@ class OnkyoOptionsFlowHandler(OptionsFlow):
         if user_input is not None:
             input_sources_store: dict[str, str] = {}
             for input_source_meaning, input_source_name in user_input[
-                "input_sources"
+                OPTION_INPUT_SOURCES
             ].items():
-                input_source = InputSource.from_meaning(input_source_meaning)
+                input_source = INPUT_SOURCES_ALL_MEANINGS[input_source_meaning]
                 input_sources_store[input_source.value] = input_source_name
 
+            listening_modes_store: dict[str, str] = {}
+            for listening_mode_meaning, listening_mode_name in user_input[
+                OPTION_LISTENING_MODES
+            ].items():
+                listening_mode = LISTENING_MODES_ALL_MEANINGS[listening_mode_meaning]
+                listening_modes_store[listening_mode.value] = listening_mode_name
+
             return self.async_create_entry(
                 data={
                     **self._data,
                     OPTION_INPUT_SOURCES: input_sources_store,
+                    OPTION_LISTENING_MODES: listening_modes_store,
                 }
             )
 
-        schema_dict: dict[Any, Selector] = {}
-
+        input_sources_schema_dict: dict[Any, Selector] = {}
         for input_source, input_source_name in self._input_sources.items():
-            schema_dict[
+            input_sources_schema_dict[
                 vol.Required(input_source.value_meaning, default=input_source_name)
             ] = TextSelector()
 
+        listening_modes_schema_dict: dict[Any, Selector] = {}
+        for listening_mode, listening_mode_name in self._listening_modes.items():
+            listening_modes_schema_dict[
+                vol.Required(listening_mode.value_meaning, default=listening_mode_name)
+            ] = TextSelector()
+
         return self.async_show_form(
             step_id="names",
             data_schema=vol.Schema(
-                {vol.Required("input_sources"): section(vol.Schema(schema_dict))}
+                {
+                    vol.Required(OPTION_INPUT_SOURCES): section(
+                        vol.Schema(input_sources_schema_dict)
+                    ),
+                    vol.Required(OPTION_LISTENING_MODES): section(
+                        vol.Schema(listening_modes_schema_dict)
+                    ),
+                }
             ),
         )
diff --git a/homeassistant/components/onkyo/const.py b/homeassistant/components/onkyo/const.py
index bd4fe98ae7d..fcb1a8a0a9e 100644
--- a/homeassistant/components/onkyo/const.py
+++ b/homeassistant/components/onkyo/const.py
@@ -2,7 +2,7 @@
 
 from enum import Enum
 import typing
-from typing import ClassVar, Literal, Self
+from typing import Literal, Self
 
 import pyeiscp
 
@@ -24,7 +24,27 @@ VOLUME_RESOLUTION_ALLOWED: tuple[VolumeResolution, ...] = typing.get_args(
 OPTION_MAX_VOLUME = "max_volume"
 OPTION_MAX_VOLUME_DEFAULT = 100.0
 
+
+class EnumWithMeaning(Enum):
+    """Enum with meaning."""
+
+    value_meaning: str
+
+    def __new__(cls, value: str) -> Self:
+        """Create enum."""
+        obj = object.__new__(cls)
+        obj._value_ = value
+        obj.value_meaning = cls._get_meanings()[value]
+
+        return obj
+
+    @staticmethod
+    def _get_meanings() -> dict[str, str]:
+        raise NotImplementedError
+
+
 OPTION_INPUT_SOURCES = "input_sources"
+OPTION_LISTENING_MODES = "listening_modes"
 
 _INPUT_SOURCE_MEANINGS = {
     "00": "VIDEO1 ··· VCR/DVR ··· STB/DVR",
@@ -71,7 +91,7 @@ _INPUT_SOURCE_MEANINGS = {
 }
 
 
-class InputSource(Enum):
+class InputSource(EnumWithMeaning):
     """Receiver input source."""
 
     DVR = "00"
@@ -116,24 +136,100 @@ class InputSource(Enum):
     HDMI_7 = "57"
     MAIN_SOURCE = "80"
 
-    __meaning_mapping: ClassVar[dict[str, Self]] = {}  # type: ignore[misc]
+    @staticmethod
+    def _get_meanings() -> dict[str, str]:
+        return _INPUT_SOURCE_MEANINGS
 
-    value_meaning: str
 
-    def __new__(cls, value: str) -> Self:
-        """Create InputSource enum."""
-        obj = object.__new__(cls)
-        obj._value_ = value
-        obj.value_meaning = _INPUT_SOURCE_MEANINGS[value]
+_LISTENING_MODE_MEANINGS = {
+    "00": "STEREO",
+    "01": "DIRECT",
+    "02": "SURROUND",
+    "03": "FILM ··· GAME RPG ··· ADVANCED GAME",
+    "04": "THX",
+    "05": "ACTION ··· GAME ACTION",
+    "06": "MUSICAL ··· GAME ROCK ··· ROCK/POP",
+    "07": "MONO MOVIE",
+    "08": "ORCHESTRA ··· CLASSICAL",
+    "09": "UNPLUGGED",
+    "0A": "STUDIO MIX ··· ENTERTAINMENT SHOW",
+    "0B": "TV LOGIC ··· DRAMA",
+    "0C": "ALL CH STEREO ··· EXTENDED STEREO",
+    "0D": "THEATER DIMENSIONAL ··· FRONT STAGE SURROUND",
+    "0E": "ENHANCED 7/ENHANCE ··· GAME SPORTS ··· SPORTS",
+    "0F": "MONO",
+    "11": "PURE AUDIO ··· PURE DIRECT",
+    "12": "MULTIPLEX",
+    "13": "FULL MONO ··· MONO MUSIC",
+    "14": "DOLBY VIRTUAL/SURROUND ENHANCER",
+    "15": "DTS SURROUND SENSATION",
+    "16": "AUDYSSEY DSX",
+    "17": "DTS VIRTUAL:X",
+    "1F": "WHOLE HOUSE MODE ··· MULTI ZONE MUSIC",
+    "23": "STAGE (JAPAN GENRE CONTROL)",
+    "25": "ACTION (JAPAN GENRE CONTROL)",
+    "26": "MUSIC (JAPAN GENRE CONTROL)",
+    "2E": "SPORTS (JAPAN GENRE CONTROL)",
+    "40": "STRAIGHT DECODE ··· 5.1 CH SURROUND",
+    "41": "DOLBY EX/DTS ES",
+    "42": "THX CINEMA",
+    "43": "THX SURROUND EX",
+    "44": "THX MUSIC",
+    "45": "THX GAMES",
+    "50": "THX U(2)/S(2)/I/S CINEMA",
+    "51": "THX U(2)/S(2)/I/S MUSIC",
+    "52": "THX U(2)/S(2)/I/S GAMES",
+    "80": "DOLBY ATMOS/DOLBY SURROUND ··· PLII/PLIIx MOVIE",
+    "81": "PLII/PLIIx MUSIC",
+    "82": "DTS:X/NEURAL:X ··· NEO:6/NEO:X CINEMA",
+    "83": "NEO:6/NEO:X MUSIC",
+    "84": "DOLBY SURROUND THX CINEMA ··· PLII/PLIIx THX CINEMA",
+    "85": "DTS NEURAL:X THX CINEMA ··· NEO:6/NEO:X THX CINEMA",
+    "86": "PLII/PLIIx GAME",
+    "87": "NEURAL SURR",
+    "88": "NEURAL THX/NEURAL SURROUND",
+    "89": "DOLBY SURROUND THX GAMES ··· PLII/PLIIx THX GAMES",
+    "8A": "DTS NEURAL:X THX GAMES ··· NEO:6/NEO:X THX GAMES",
+    "8B": "DOLBY SURROUND THX MUSIC ··· PLII/PLIIx THX MUSIC",
+    "8C": "DTS NEURAL:X THX MUSIC ··· NEO:6/NEO:X THX MUSIC",
+    "8D": "NEURAL THX CINEMA",
+    "8E": "NEURAL THX MUSIC",
+    "8F": "NEURAL THX GAMES",
+    "90": "PLIIz HEIGHT",
+    "91": "NEO:6 CINEMA DTS SURROUND SENSATION",
+    "92": "NEO:6 MUSIC DTS SURROUND SENSATION",
+    "93": "NEURAL DIGITAL MUSIC",
+    "94": "PLIIz HEIGHT + THX CINEMA",
+    "95": "PLIIz HEIGHT + THX MUSIC",
+    "96": "PLIIz HEIGHT + THX GAMES",
+    "97": "PLIIz HEIGHT + THX U2/S2 CINEMA",
+    "98": "PLIIz HEIGHT + THX U2/S2 MUSIC",
+    "99": "PLIIz HEIGHT + THX U2/S2 GAMES",
+    "9A": "NEO:X GAME",
+    "A0": "PLIIx/PLII Movie + AUDYSSEY DSX",
+    "A1": "PLIIx/PLII MUSIC + AUDYSSEY DSX",
+    "A2": "PLIIx/PLII GAME + AUDYSSEY DSX",
+    "A3": "NEO:6 CINEMA + AUDYSSEY DSX",
+    "A4": "NEO:6 MUSIC + AUDYSSEY DSX",
+    "A5": "NEURAL SURROUND + AUDYSSEY DSX",
+    "A6": "NEURAL DIGITAL MUSIC + AUDYSSEY DSX",
+    "A7": "DOLBY EX + AUDYSSEY DSX",
+    "FF": "AUTO SURROUND",
+}
 
-        cls.__meaning_mapping[obj.value_meaning] = obj
 
-        return obj
+class ListeningMode(EnumWithMeaning):
+    """Receiver listening mode."""
 
-    @classmethod
-    def from_meaning(cls, meaning: str) -> Self:
-        """Get InputSource enum from its meaning."""
-        return cls.__meaning_mapping[meaning]
+    _ignore_ = "ListeningMode _k _v _meaning"
+
+    ListeningMode = vars()
+    for _k in _LISTENING_MODE_MEANINGS:
+        ListeningMode["I" + _k] = _k
+
+    @staticmethod
+    def _get_meanings() -> dict[str, str]:
+        return _LISTENING_MODE_MEANINGS
 
 
 ZONES = {"main": "Main", "zone2": "Zone 2", "zone3": "Zone 3", "zone4": "Zone 4"}
diff --git a/homeassistant/components/onkyo/media_player.py b/homeassistant/components/onkyo/media_player.py
index 97a82fc8a1a..f7fe83c57a3 100644
--- a/homeassistant/components/onkyo/media_player.py
+++ b/homeassistant/components/onkyo/media_player.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import asyncio
+from enum import Enum
 from functools import cache
 import logging
 from typing import Any, Literal
@@ -22,7 +23,10 @@ from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, ca
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import config_validation as cv, entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
@@ -36,6 +40,7 @@ from .const import (
     PYEISCP_COMMANDS,
     ZONES,
     InputSource,
+    ListeningMode,
     VolumeResolution,
 )
 from .receiver import Receiver, async_discover
@@ -60,6 +65,8 @@ CONF_SOURCES_DEFAULT = {
     "fm": "Radio",
 }
 
+ISSUE_URL_PLACEHOLDER = "/config/integrations/dashboard/add?domain=onkyo"
+
 PLATFORM_SCHEMA = MEDIA_PLAYER_PLATFORM_SCHEMA.extend(
     {
         vol.Optional(CONF_HOST): cv.string,
@@ -76,23 +83,23 @@ PLATFORM_SCHEMA = MEDIA_PLAYER_PLATFORM_SCHEMA.extend(
     }
 )
 
-SUPPORT_ONKYO_WO_VOLUME = (
+
+SUPPORTED_FEATURES_BASE = (
     MediaPlayerEntityFeature.TURN_ON
     | MediaPlayerEntityFeature.TURN_OFF
     | MediaPlayerEntityFeature.SELECT_SOURCE
     | MediaPlayerEntityFeature.PLAY_MEDIA
 )
-SUPPORT_ONKYO = (
-    SUPPORT_ONKYO_WO_VOLUME
-    | MediaPlayerEntityFeature.VOLUME_SET
+SUPPORTED_FEATURES_VOLUME = (
+    MediaPlayerEntityFeature.VOLUME_SET
     | MediaPlayerEntityFeature.VOLUME_MUTE
     | MediaPlayerEntityFeature.VOLUME_STEP
 )
 
-DEFAULT_PLAYABLE_SOURCES = (
-    InputSource.from_meaning("FM"),
-    InputSource.from_meaning("AM"),
-    InputSource.from_meaning("TUNER"),
+PLAYABLE_SOURCES = (
+    InputSource.FM,
+    InputSource.AM,
+    InputSource.DAB,
 )
 
 ATTR_PRESET = "preset"
@@ -115,7 +122,6 @@ AUDIO_INFORMATION_MAPPING = [
     "auto_phase_control_phase",
     "upmix_mode",
 ]
-
 VIDEO_INFORMATION_MAPPING = [
     "video_input_port",
     "input_resolution",
@@ -128,7 +134,6 @@ VIDEO_INFORMATION_MAPPING = [
     "picture_mode",
     "input_hdr",
 ]
-ISSUE_URL_PLACEHOLDER = "/config/integrations/dashboard/add?domain=onkyo"
 
 type LibValue = str | tuple[str, ...]
 
@@ -136,7 +141,19 @@ type LibValue = str | tuple[str, ...]
 def _get_single_lib_value(value: LibValue) -> str:
     if isinstance(value, str):
         return value
-    return value[0]
+    return value[-1]
+
+
+def _get_lib_mapping[T: Enum](cmds: Any, cls: type[T]) -> dict[T, LibValue]:
+    result: dict[T, LibValue] = {}
+    for k, v in cmds["values"].items():
+        try:
+            key = cls(k)
+        except ValueError:
+            continue
+        result[key] = v["name"]
+
+    return result
 
 
 @cache
@@ -151,15 +168,7 @@ def _input_source_lib_mappings(zone: str) -> dict[InputSource, LibValue]:
         case "zone4":
             cmds = PYEISCP_COMMANDS["zone4"]["SL4"]
 
-    result: dict[InputSource, LibValue] = {}
-    for k, v in cmds["values"].items():
-        try:
-            source = InputSource(k)
-        except ValueError:
-            continue
-        result[source] = v["name"]
-
-    return result
+    return _get_lib_mapping(cmds, InputSource)
 
 
 @cache
@@ -167,6 +176,24 @@ def _rev_input_source_lib_mappings(zone: str) -> dict[LibValue, InputSource]:
     return {value: key for key, value in _input_source_lib_mappings(zone).items()}
 
 
+@cache
+def _listening_mode_lib_mappings(zone: str) -> dict[ListeningMode, LibValue]:
+    match zone:
+        case "main":
+            cmds = PYEISCP_COMMANDS["main"]["LMD"]
+        case "zone2":
+            cmds = PYEISCP_COMMANDS["zone2"]["LMZ"]
+        case _:
+            return {}
+
+    return _get_lib_mapping(cmds, ListeningMode)
+
+
+@cache
+def _rev_listening_mode_lib_mappings(zone: str) -> dict[LibValue, ListeningMode]:
+    return {value: key for key, value in _listening_mode_lib_mappings(zone).items()}
+
+
 async def async_setup_platform(
     hass: HomeAssistant,
     config: ConfigType,
@@ -286,7 +313,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: OnkyoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MediaPlayer for config entry."""
     data = entry.runtime_data
@@ -300,6 +327,7 @@ async def async_setup_entry(
     volume_resolution: VolumeResolution = entry.options[OPTION_VOLUME_RESOLUTION]
     max_volume: float = entry.options[OPTION_MAX_VOLUME]
     sources = data.sources
+    sound_modes = data.sound_modes
 
     def connect_callback(receiver: Receiver) -> None:
         if not receiver.first_connect:
@@ -328,6 +356,7 @@ async def async_setup_entry(
                 volume_resolution=volume_resolution,
                 max_volume=max_volume,
                 sources=sources,
+                sound_modes=sound_modes,
             )
             entities[zone] = zone_entity
             async_add_entities([zone_entity])
@@ -342,6 +371,7 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
     _attr_should_poll = False
 
     _supports_volume: bool = False
+    _supports_sound_mode: bool = False
     _supports_audio_info: bool = False
     _supports_video_info: bool = False
     _query_timer: asyncio.TimerHandle | None = None
@@ -354,6 +384,7 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
         volume_resolution: VolumeResolution,
         max_volume: float,
         sources: dict[InputSource, str],
+        sound_modes: dict[ListeningMode, str],
     ) -> None:
         """Initialize the Onkyo Receiver."""
         self._receiver = receiver
@@ -367,6 +398,7 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
         self._volume_resolution = volume_resolution
         self._max_volume = max_volume
 
+        self._options_sources = sources
         self._source_lib_mapping = _input_source_lib_mappings(zone)
         self._rev_source_lib_mapping = _rev_input_source_lib_mappings(zone)
         self._source_mapping = {
@@ -378,7 +410,28 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
             value: key for key, value in self._source_mapping.items()
         }
 
+        self._options_sound_modes = sound_modes
+        self._sound_mode_lib_mapping = _listening_mode_lib_mappings(zone)
+        self._rev_sound_mode_lib_mapping = _rev_listening_mode_lib_mappings(zone)
+        self._sound_mode_mapping = {
+            key: value
+            for key, value in sound_modes.items()
+            if key in self._sound_mode_lib_mapping
+        }
+        self._rev_sound_mode_mapping = {
+            value: key for key, value in self._sound_mode_mapping.items()
+        }
+
         self._attr_source_list = list(self._rev_source_mapping)
+        self._attr_sound_mode_list = list(self._rev_sound_mode_mapping)
+
+        self._attr_supported_features = SUPPORTED_FEATURES_BASE
+        if zone == "main":
+            self._attr_supported_features |= SUPPORTED_FEATURES_VOLUME
+            self._supports_volume = True
+            self._attr_supported_features |= MediaPlayerEntityFeature.SELECT_SOUND_MODE
+            self._supports_sound_mode = True
+
         self._attr_extra_state_attributes = {}
 
     async def async_added_to_hass(self) -> None:
@@ -391,13 +444,6 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
             self._query_timer.cancel()
             self._query_timer = None
 
-    @property
-    def supported_features(self) -> MediaPlayerEntityFeature:
-        """Return media player features that are supported."""
-        if self._supports_volume:
-            return SUPPORT_ONKYO
-        return SUPPORT_ONKYO_WO_VOLUME
-
     @callback
     def _update_receiver(self, propname: str, value: Any) -> None:
         """Update a property in the receiver."""
@@ -463,6 +509,24 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
             "input-selector" if self._zone == "main" else "selector", source_lib_single
         )
 
+    async def async_select_sound_mode(self, sound_mode: str) -> None:
+        """Select listening sound mode."""
+        if not self.sound_mode_list or sound_mode not in self.sound_mode_list:
+            raise ServiceValidationError(
+                translation_domain=DOMAIN,
+                translation_key="invalid_sound_mode",
+                translation_placeholders={
+                    "invalid_sound_mode": sound_mode,
+                    "entity_id": self.entity_id,
+                },
+            )
+
+        sound_mode_lib = self._sound_mode_lib_mapping[
+            self._rev_sound_mode_mapping[sound_mode]
+        ]
+        sound_mode_lib_single = _get_single_lib_value(sound_mode_lib)
+        self._update_receiver("listening-mode", sound_mode_lib_single)
+
     async def async_select_output(self, hdmi_output: str) -> None:
         """Set hdmi-out."""
         self._update_receiver("hdmi-output-selector", hdmi_output)
@@ -473,7 +537,7 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
         """Play radio station by preset number."""
         if self.source is not None:
             source = self._rev_source_mapping[self.source]
-            if media_type.lower() == "radio" and source in DEFAULT_PLAYABLE_SOURCES:
+            if media_type.lower() == "radio" and source in PLAYABLE_SOURCES:
                 self._update_receiver("preset", media_id)
 
     @callback
@@ -514,7 +578,9 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
                 self._attr_extra_state_attributes.pop(ATTR_PRESET, None)
                 self._attr_extra_state_attributes.pop(ATTR_VIDEO_OUT, None)
         elif command in ["volume", "master-volume"] and value != "N/A":
-            self._supports_volume = True
+            if not self._supports_volume:
+                self._attr_supported_features |= SUPPORTED_FEATURES_VOLUME
+                self._supports_volume = True
             # AMP_VOL / (VOL_RESOLUTION * (MAX_VOL / 100))
             volume_level: float = value / (
                 self._volume_resolution * self._max_volume / 100
@@ -522,7 +588,7 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
             self._attr_volume_level = min(1, volume_level)
         elif command in ["muting", "audio-muting"]:
             self._attr_is_volume_muted = bool(value == "on")
-        elif command in ["selector", "input-selector"]:
+        elif command in ["selector", "input-selector"] and value != "N/A":
             self._parse_source(value)
             self._query_av_info_delayed()
         elif command == "hdmi-output-selector":
@@ -532,6 +598,14 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
                 self._attr_extra_state_attributes[ATTR_PRESET] = value
             elif ATTR_PRESET in self._attr_extra_state_attributes:
                 del self._attr_extra_state_attributes[ATTR_PRESET]
+        elif command == "listening-mode" and value != "N/A":
+            if not self._supports_sound_mode:
+                self._attr_supported_features |= (
+                    MediaPlayerEntityFeature.SELECT_SOUND_MODE
+                )
+                self._supports_sound_mode = True
+            self._parse_sound_mode(value)
+            self._query_av_info_delayed()
         elif command == "audio-information":
             self._supports_audio_info = True
             self._parse_audio_information(value)
@@ -551,13 +625,46 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
             return
 
         source_meaning = source.value_meaning
-        _LOGGER.error(
-            'Input source "%s" is invalid for entity: %s',
-            source_meaning,
-            self.entity_id,
-        )
+
+        if source not in self._options_sources:
+            _LOGGER.warning(
+                'Input source "%s" for entity: %s is not in the list. Check integration options',
+                source_meaning,
+                self.entity_id,
+            )
+        else:
+            _LOGGER.error(
+                'Input source "%s" is invalid for entity: %s',
+                source_meaning,
+                self.entity_id,
+            )
+
         self._attr_source = source_meaning
 
+    @callback
+    def _parse_sound_mode(self, mode_lib: LibValue) -> None:
+        sound_mode = self._rev_sound_mode_lib_mapping[mode_lib]
+        if sound_mode in self._sound_mode_mapping:
+            self._attr_sound_mode = self._sound_mode_mapping[sound_mode]
+            return
+
+        sound_mode_meaning = sound_mode.value_meaning
+
+        if sound_mode not in self._options_sound_modes:
+            _LOGGER.warning(
+                'Listening mode "%s" for entity: %s is not in the list. Check integration options',
+                sound_mode_meaning,
+                self.entity_id,
+            )
+        else:
+            _LOGGER.error(
+                'Listening mode "%s" is invalid for entity: %s',
+                sound_mode_meaning,
+                self.entity_id,
+            )
+
+        self._attr_sound_mode = sound_mode_meaning
+
     @callback
     def _parse_audio_information(
         self, audio_information: tuple[str] | Literal["N/A"]
diff --git a/homeassistant/components/onkyo/quality_scale.yaml b/homeassistant/components/onkyo/quality_scale.yaml
index cdcf88e72d7..4b9fbe7c019 100644
--- a/homeassistant/components/onkyo/quality_scale.yaml
+++ b/homeassistant/components/onkyo/quality_scale.yaml
@@ -16,7 +16,7 @@ rules:
   docs-actions: done
   docs-high-level-description: done
   docs-installation-instructions: done
-  docs-removal-instructions: todo
+  docs-removal-instructions: done
   entity-event-setup:
     status: done
     comment: |
@@ -45,8 +45,8 @@ rules:
   # Gold
   devices: todo
   diagnostics: todo
-  discovery: todo
-  discovery-update-info: todo
+  discovery: done
+  discovery-update-info: done
   docs-data-update: todo
   docs-examples: todo
   docs-known-limitations: todo
diff --git a/homeassistant/components/onkyo/strings.json b/homeassistant/components/onkyo/strings.json
index b3b14efec44..d8131dd1149 100644
--- a/homeassistant/components/onkyo/strings.json
+++ b/homeassistant/components/onkyo/strings.json
@@ -27,17 +27,20 @@
         "description": "Configure {name}",
         "data": {
           "volume_resolution": "Volume resolution",
-          "input_sources": "[%key:component::onkyo::options::step::init::data::input_sources%]"
+          "input_sources": "[%key:component::onkyo::options::step::init::data::input_sources%]",
+          "listening_modes": "[%key:component::onkyo::options::step::init::data::listening_modes%]"
         },
         "data_description": {
           "volume_resolution": "Number of steps it takes for the receiver to go from the lowest to the highest possible volume.",
-          "input_sources": "[%key:component::onkyo::options::step::init::data_description::input_sources%]"
+          "input_sources": "[%key:component::onkyo::options::step::init::data_description::input_sources%]",
+          "listening_modes": "[%key:component::onkyo::options::step::init::data_description::listening_modes%]"
         }
       }
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "empty_input_source_list": "[%key:component::onkyo::options::error::empty_input_source_list%]",
+      "empty_listening_mode_list": "[%key:component::onkyo::options::error::empty_listening_mode_list%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
@@ -53,11 +56,13 @@
       "init": {
         "data": {
           "max_volume": "Maximum volume limit (%)",
-          "input_sources": "Input sources"
+          "input_sources": "Input sources",
+          "listening_modes": "Listening modes"
         },
         "data_description": {
           "max_volume": "Maximum volume limit as a percentage. This will associate Home Assistant's maximum volume to this value on the receiver, i.e., if you set this to 50%, then setting the volume to 100% in Home Assistant will cause the volume on the receiver to be set to 50% of its maximum value.",
-          "input_sources": "List of input sources supported by the receiver."
+          "input_sources": "List of input sources supported by the receiver.",
+          "listening_modes": "List of listening modes supported by the receiver."
         }
       },
       "names": {
@@ -65,12 +70,17 @@
           "input_sources": {
             "name": "Input source names",
             "description": "Mappings of receiver's input sources to their names."
+          },
+          "listening_modes": {
+            "name": "Listening mode names",
+            "description": "Mappings of receiver's listening modes to their names."
           }
         }
       }
     },
     "error": {
-      "empty_input_source_list": "Input source list cannot be empty"
+      "empty_input_source_list": "Input source list cannot be empty",
+      "empty_listening_mode_list": "Listening mode list cannot be empty"
     }
   },
   "issues": {
@@ -84,6 +94,9 @@
     }
   },
   "exceptions": {
+    "invalid_sound_mode": {
+      "message": "Cannot select sound mode \"{invalid_sound_mode}\" for entity: {entity_id}."
+    },
     "invalid_source": {
       "message": "Cannot select input source \"{invalid_source}\" for entity: {entity_id}."
     }
diff --git a/homeassistant/components/onvif/__init__.py b/homeassistant/components/onvif/__init__.py
index 02e7e28ea18..09a4aba52bf 100644
--- a/homeassistant/components/onvif/__init__.py
+++ b/homeassistant/components/onvif/__init__.py
@@ -19,8 +19,9 @@ from homeassistant.const import (
     HTTP_DIGEST_AUTHENTICATION,
     Platform,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+from homeassistant.helpers import entity_registry as er
 
 from .const import (
     CONF_ENABLE_WEBHOOKS,
@@ -99,6 +100,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     if device.capabilities.imaging:
         device.platforms += [Platform.SWITCH]
 
+    _async_migrate_camera_entities_unique_ids(hass, entry, device)
+
     await hass.config_entries.async_forward_entry_setups(entry, device.platforms)
 
     entry.async_on_unload(
@@ -155,3 +158,58 @@ async def async_populate_options(hass: HomeAssistant, entry: ConfigEntry) -> Non
     }
 
     hass.config_entries.async_update_entry(entry, options=options)
+
+
+@callback
+def _async_migrate_camera_entities_unique_ids(
+    hass: HomeAssistant, config_entry: ConfigEntry, device: ONVIFDevice
+) -> None:
+    """Migrate unique ids of camera entities from profile index to profile token."""
+    entity_reg = er.async_get(hass)
+    entities: list[er.RegistryEntry] = er.async_entries_for_config_entry(
+        entity_reg, config_entry.entry_id
+    )
+
+    mac_or_serial = device.info.mac or device.info.serial_number
+    old_uid_start = f"{mac_or_serial}_"
+    new_uid_start = f"{mac_or_serial}#"
+
+    for entity in entities:
+        if entity.domain != Platform.CAMERA:
+            continue
+
+        if (
+            not entity.unique_id.startswith(old_uid_start)
+            and entity.unique_id != mac_or_serial
+        ):
+            continue
+
+        index = 0
+        if entity.unique_id.startswith(old_uid_start):
+            try:
+                index = int(entity.unique_id[len(old_uid_start) :])
+            except ValueError:
+                LOGGER.error(
+                    "Failed to migrate unique id for '%s' as the ONVIF profile index could not be parsed from unique id '%s'",
+                    entity.entity_id,
+                    entity.unique_id,
+                )
+                continue
+        try:
+            token = device.profiles[index].token
+        except IndexError:
+            LOGGER.error(
+                "Failed to migrate unique id for '%s' as the ONVIF profile index '%d' parsed from unique id '%s' could not be found",
+                entity.entity_id,
+                index,
+                entity.unique_id,
+            )
+            continue
+        new_uid = f"{new_uid_start}{token}"
+        LOGGER.debug(
+            "Migrating unique id for '%s' from '%s' to '%s'",
+            entity.entity_id,
+            entity.unique_id,
+            new_uid,
+        )
+        entity_reg.async_update_entity(entity.entity_id, new_unique_id=new_uid)
diff --git a/homeassistant/components/onvif/binary_sensor.py b/homeassistant/components/onvif/binary_sensor.py
index 92c5ab45129..d29f732ef67 100644
--- a/homeassistant/components/onvif/binary_sensor.py
+++ b/homeassistant/components/onvif/binary_sensor.py
@@ -10,7 +10,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_ON
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.util.enum import try_parse_enum
 
@@ -22,7 +22,7 @@ from .entity import ONVIFBaseEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a ONVIF binary sensor."""
     device: ONVIFDevice = hass.data[DOMAIN][config_entry.unique_id]
diff --git a/homeassistant/components/onvif/button.py b/homeassistant/components/onvif/button.py
index 644a7c942f7..8e92cb07a8c 100644
--- a/homeassistant/components/onvif/button.py
+++ b/homeassistant/components/onvif/button.py
@@ -4,7 +4,7 @@ from homeassistant.components.button import ButtonDeviceClass, ButtonEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .device import ONVIFDevice
@@ -14,7 +14,7 @@ from .entity import ONVIFBaseEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up ONVIF button based on a config entry."""
     device = hass.data[DOMAIN][config_entry.unique_id]
diff --git a/homeassistant/components/onvif/camera.py b/homeassistant/components/onvif/camera.py
index 8c0fd027b95..fc17e912fcc 100644
--- a/homeassistant/components/onvif/camera.py
+++ b/homeassistant/components/onvif/camera.py
@@ -22,7 +22,7 @@ from homeassistant.const import HTTP_BASIC_AUTHENTICATION
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.aiohttp_client import async_aiohttp_proxy_stream
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     ABSOLUTE_MOVE,
@@ -57,7 +57,7 @@ from .models import Profile
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ONVIF camera video stream."""
     platform = entity_platform.async_get_current_platform()
@@ -117,10 +117,7 @@ class ONVIFCameraEntity(ONVIFBaseEntity, Camera):
         self._attr_entity_registry_enabled_default = (
             device.max_resolution == profile.video.resolution.width
         )
-        if profile.index:
-            self._attr_unique_id = f"{self.mac_or_serial}_{profile.index}"
-        else:
-            self._attr_unique_id = self.mac_or_serial
+        self._attr_unique_id = f"{self.mac_or_serial}#{profile.token}"
         self._attr_name = f"{device.name} {profile.name}"
 
     @property
diff --git a/homeassistant/components/onvif/device.py b/homeassistant/components/onvif/device.py
index f15f6637ab9..3f37ba42397 100644
--- a/homeassistant/components/onvif/device.py
+++ b/homeassistant/components/onvif/device.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import (
     ABSOLUTE_MOVE,
@@ -235,7 +235,7 @@ class ONVIFDevice:
         LOGGER.debug("%s: Retrieving current device date/time", self.name)
         try:
             device_time = await device_mgmt.GetSystemDateAndTime()
-        except RequestError as err:
+        except (RequestError, Fault) as err:
             LOGGER.warning(
                 "Couldn't get device '%s' date/time. Error: %s", self.name, err
             )
diff --git a/homeassistant/components/onvif/entity.py b/homeassistant/components/onvif/entity.py
index c9900106256..783df743e86 100644
--- a/homeassistant/components/onvif/entity.py
+++ b/homeassistant/components/onvif/entity.py
@@ -17,7 +17,7 @@ class ONVIFBaseEntity(Entity):
         self.device: ONVIFDevice = device
 
     @property
-    def available(self):
+    def available(self) -> bool:
         """Return True if device is available."""
         return self.device.available
 
diff --git a/homeassistant/components/onvif/event.py b/homeassistant/components/onvif/event.py
index b7b34f7be9f..d1b93304ccc 100644
--- a/homeassistant/components/onvif/event.py
+++ b/homeassistant/components/onvif/event.py
@@ -174,11 +174,20 @@ class EventManager:
                     UNHANDLED_TOPICS.add(topic)
                 continue
 
-            event = await parser(unique_id, msg)
+            try:
+                event = await parser(unique_id, msg)
+                error = None
+            except (AttributeError, KeyError) as e:
+                event = None
+                error = e
 
             if not event:
                 LOGGER.warning(
-                    "%s: Unable to parse event from %s: %s", self.name, unique_id, msg
+                    "%s: Unable to parse event from %s: %s: %s",
+                    self.name,
+                    unique_id,
+                    error,
+                    msg,
                 )
                 return
 
diff --git a/homeassistant/components/onvif/parsers.py b/homeassistant/components/onvif/parsers.py
index 6eb1d001796..e5a731c73f6 100644
--- a/homeassistant/components/onvif/parsers.py
+++ b/homeassistant/components/onvif/parsers.py
@@ -49,24 +49,22 @@ def local_datetime_or_none(value: str) -> datetime.datetime | None:
 
 
 @PARSERS.register("tns1:VideoSource/MotionAlarm")
+@PARSERS.register("tns1:Device/Trigger/tnshik:AlarmIn")
 async def async_parse_motion_alarm(uid: str, msg) -> Event | None:
     """Handle parsing event message.
 
     Topic: tns1:VideoSource/MotionAlarm
     """
-    try:
-        topic, payload = extract_message(msg)
-        source = payload.Source.SimpleItem[0].Value
-        return Event(
-            f"{uid}_{topic}_{source}",
-            "Motion Alarm",
-            "binary_sensor",
-            "motion",
-            None,
-            payload.Data.SimpleItem[0].Value == "true",
-        )
-    except (AttributeError, KeyError):
-        return None
+    topic, payload = extract_message(msg)
+    source = payload.Source.SimpleItem[0].Value
+    return Event(
+        f"{uid}_{topic}_{source}",
+        "Motion Alarm",
+        "binary_sensor",
+        "motion",
+        None,
+        payload.Data.SimpleItem[0].Value == "true",
+    )
 
 
 @PARSERS.register("tns1:VideoSource/ImageTooBlurry/AnalyticsService")
@@ -77,20 +75,17 @@ async def async_parse_image_too_blurry(uid: str, msg) -> Event | None:
 
     Topic: tns1:VideoSource/ImageTooBlurry/*
     """
-    try:
-        topic, payload = extract_message(msg)
-        source = payload.Source.SimpleItem[0].Value
-        return Event(
-            f"{uid}_{topic}_{source}",
-            "Image Too Blurry",
-            "binary_sensor",
-            "problem",
-            None,
-            payload.Data.SimpleItem[0].Value == "true",
-            EntityCategory.DIAGNOSTIC,
-        )
-    except (AttributeError, KeyError):
-        return None
+    topic, payload = extract_message(msg)
+    source = payload.Source.SimpleItem[0].Value
+    return Event(
+        f"{uid}_{topic}_{source}",
+        "Image Too Blurry",
+        "binary_sensor",
+        "problem",
+        None,
+        payload.Data.SimpleItem[0].Value == "true",
+        EntityCategory.DIAGNOSTIC,
+    )
 
 
 @PARSERS.register("tns1:VideoSource/ImageTooDark/AnalyticsService")
@@ -101,20 +96,17 @@ async def async_parse_image_too_dark(uid: str, msg) -> Event | None:
 
     Topic: tns1:VideoSource/ImageTooDark/*
     """
-    try:
-        topic, payload = extract_message(msg)
-        source = payload.Source.SimpleItem[0].Value
-        return Event(
-            f"{uid}_{topic}_{source}",
-            "Image Too Dark",
-            "binary_sensor",
-            "problem",
-            None,
-            payload.Data.SimpleItem[0].Value == "true",
-            EntityCategory.DIAGNOSTIC,
-        )
-    except (AttributeError, KeyError):
-        return None
+    topic, payload = extract_message(msg)
+    source = payload.Source.SimpleItem[0].Value
+    return Event(
+        f"{uid}_{topic}_{source}",
+        "Image Too Dark",
+        "binary_sensor",
+        "problem",
+        None,
+        payload.Data.SimpleItem[0].Value == "true",
+        EntityCategory.DIAGNOSTIC,
+    )
 
 
 @PARSERS.register("tns1:VideoSource/ImageTooBright/AnalyticsService")
@@ -125,20 +117,17 @@ async def async_parse_image_too_bright(uid: str, msg) -> Event | None:
 
     Topic: tns1:VideoSource/ImageTooBright/*
     """
-    try:
-        topic, payload = extract_message(msg)
-        source = payload.Source.SimpleItem[0].Value
-        return Event(
-            f"{uid}_{topic}_{source}",
-            "Image Too Bright",
-            "binary_sensor",
-            "problem",
-            None,
-            payload.Data.SimpleItem[0].Value == "true",
-            EntityCategory.DIAGNOSTIC,
-        )
-    except (AttributeError, KeyError):
-        return None
+    topic, payload = extract_message(msg)
+    source = payload.Source.SimpleItem[0].Value
+    return Event(
+        f"{uid}_{topic}_{source}",
+        "Image Too Bright",
+        "binary_sensor",
+        "problem",
+        None,
+        payload.Data.SimpleItem[0].Value == "true",
+        EntityCategory.DIAGNOSTIC,
+    )
 
 
 @PARSERS.register("tns1:VideoSource/GlobalSceneChange/AnalyticsService")
@@ -149,19 +138,16 @@ async def async_parse_scene_change(uid: str, msg) -> Event | None:
 
     Topic: tns1:VideoSource/GlobalSceneChange/*
     """
-    try:
-        topic, payload = extract_message(msg)
-        source = payload.Source.SimpleItem[0].Value
-        return Event(
-            f"{uid}_{topic}_{source}",
-            "Global Scene Change",
-            "binary_sensor",
-            "problem",
-            None,
-            payload.Data.SimpleItem[0].Value == "true",
-        )
-    except (AttributeError, KeyError):
-        return None
+    topic, payload = extract_message(msg)
+    source = payload.Source.SimpleItem[0].Value
+    return Event(
+        f"{uid}_{topic}_{source}",
+        "Global Scene Change",
+        "binary_sensor",
+        "problem",
+        None,
+        payload.Data.SimpleItem[0].Value == "true",
+    )
 
 
 @PARSERS.register("tns1:AudioAnalytics/Audio/DetectedSound")
@@ -170,29 +156,26 @@ async def async_parse_detected_sound(uid: str, msg) -> Event | None:
 
     Topic: tns1:AudioAnalytics/Audio/DetectedSound
     """
-    try:
-        audio_source = ""
-        audio_analytics = ""
-        rule = ""
-        topic, payload = extract_message(msg)
-        for source in payload.Source.SimpleItem:
-            if source.Name == "AudioSourceConfigurationToken":
-                audio_source = source.Value
-            if source.Name == "AudioAnalyticsConfigurationToken":
-                audio_analytics = source.Value
-            if source.Name == "Rule":
-                rule = source.Value
+    audio_source = ""
+    audio_analytics = ""
+    rule = ""
+    topic, payload = extract_message(msg)
+    for source in payload.Source.SimpleItem:
+        if source.Name == "AudioSourceConfigurationToken":
+            audio_source = source.Value
+        if source.Name == "AudioAnalyticsConfigurationToken":
+            audio_analytics = source.Value
+        if source.Name == "Rule":
+            rule = source.Value
 
-        return Event(
-            f"{uid}_{topic}_{audio_source}_{audio_analytics}_{rule}",
-            "Detected Sound",
-            "binary_sensor",
-            "sound",
-            None,
-            payload.Data.SimpleItem[0].Value == "true",
-        )
-    except (AttributeError, KeyError):
-        return None
+    return Event(
+        f"{uid}_{topic}_{audio_source}_{audio_analytics}_{rule}",
+        "Detected Sound",
+        "binary_sensor",
+        "sound",
+        None,
+        payload.Data.SimpleItem[0].Value == "true",
+    )
 
 
 @PARSERS.register("tns1:RuleEngine/FieldDetector/ObjectsInside")
@@ -201,30 +184,26 @@ async def async_parse_field_detector(uid: str, msg) -> Event | None:
 
     Topic: tns1:RuleEngine/FieldDetector/ObjectsInside
     """
-    try:
-        video_source = ""
-        video_analytics = ""
-        rule = ""
-        topic, payload = extract_message(msg)
-        for source in payload.Source.SimpleItem:
-            if source.Name == "VideoSourceConfigurationToken":
-                video_source = _normalize_video_source(source.Value)
-            if source.Name == "VideoAnalyticsConfigurationToken":
-                video_analytics = source.Value
-            if source.Name == "Rule":
-                rule = source.Value
+    video_source = ""
+    video_analytics = ""
+    rule = ""
+    topic, payload = extract_message(msg)
+    for source in payload.Source.SimpleItem:
+        if source.Name == "VideoSourceConfigurationToken":
+            video_source = _normalize_video_source(source.Value)
+        if source.Name == "VideoAnalyticsConfigurationToken":
+            video_analytics = source.Value
+        if source.Name == "Rule":
+            rule = source.Value
 
-        evt = Event(
-            f"{uid}_{topic}_{video_source}_{video_analytics}_{rule}",
-            "Field Detection",
-            "binary_sensor",
-            "motion",
-            None,
-            payload.Data.SimpleItem[0].Value == "true",
-        )
-    except (AttributeError, KeyError):
-        return None
-    return evt
+    return Event(
+        f"{uid}_{topic}_{video_source}_{video_analytics}_{rule}",
+        "Field Detection",
+        "binary_sensor",
+        "motion",
+        None,
+        payload.Data.SimpleItem[0].Value == "true",
+    )
 
 
 @PARSERS.register("tns1:RuleEngine/CellMotionDetector/Motion")
@@ -233,29 +212,26 @@ async def async_parse_cell_motion_detector(uid: str, msg) -> Event | None:
 
     Topic: tns1:RuleEngine/CellMotionDetector/Motion
     """
-    try:
-        video_source = ""
-        video_analytics = ""
-        rule = ""
-        topic, payload = extract_message(msg)
-        for source in payload.Source.SimpleItem:
-            if source.Name == "VideoSourceConfigurationToken":
-                video_source = _normalize_video_source(source.Value)
-            if source.Name == "VideoAnalyticsConfigurationToken":
-                video_analytics = source.Value
-            if source.Name == "Rule":
-                rule = source.Value
+    video_source = ""
+    video_analytics = ""
+    rule = ""
+    topic, payload = extract_message(msg)
+    for source in payload.Source.SimpleItem:
+        if source.Name == "VideoSourceConfigurationToken":
+            video_source = _normalize_video_source(source.Value)
+        if source.Name == "VideoAnalyticsConfigurationToken":
+            video_analytics = source.Value
+        if source.Name == "Rule":
+            rule = source.Value
 
-        return Event(
-            f"{uid}_{topic}_{video_source}_{video_analytics}_{rule}",
-            "Cell Motion Detection",
-            "binary_sensor",
-            "motion",
-            None,
-            payload.Data.SimpleItem[0].Value == "true",
-        )
-    except (AttributeError, KeyError):
-        return None
+    return Event(
+        f"{uid}_{topic}_{video_source}_{video_analytics}_{rule}",
+        "Cell Motion Detection",
+        "binary_sensor",
+        "motion",
+        None,
+        payload.Data.SimpleItem[0].Value == "true",
+    )
 
 
 @PARSERS.register("tns1:RuleEngine/MotionRegionDetector/Motion")
@@ -264,29 +240,26 @@ async def async_parse_motion_region_detector(uid: str, msg) -> Event | None:
 
     Topic: tns1:RuleEngine/MotionRegionDetector/Motion
     """
-    try:
-        video_source = ""
-        video_analytics = ""
-        rule = ""
-        topic, payload = extract_message(msg)
-        for source in payload.Source.SimpleItem:
-            if source.Name == "VideoSourceConfigurationToken":
-                video_source = _normalize_video_source(source.Value)
-            if source.Name == "VideoAnalyticsConfigurationToken":
-                video_analytics = source.Value
-            if source.Name == "Rule":
-                rule = source.Value
+    video_source = ""
+    video_analytics = ""
+    rule = ""
+    topic, payload = extract_message(msg)
+    for source in payload.Source.SimpleItem:
+        if source.Name == "VideoSourceConfigurationToken":
+            video_source = _normalize_video_source(source.Value)
+        if source.Name == "VideoAnalyticsConfigurationToken":
+            video_analytics = source.Value
+        if source.Name == "Rule":
+            rule = source.Value
 
-        return Event(
-            f"{uid}_{topic}_{video_source}_{video_analytics}_{rule}",
-            "Motion Region Detection",
-            "binary_sensor",
-            "motion",
-            None,
-            payload.Data.SimpleItem[0].Value in ["1", "true"],
-        )
-    except (AttributeError, KeyError):
-        return None
+    return Event(
+        f"{uid}_{topic}_{video_source}_{video_analytics}_{rule}",
+        "Motion Region Detection",
+        "binary_sensor",
+        "motion",
+        None,
+        payload.Data.SimpleItem[0].Value in ["1", "true"],
+    )
 
 
 @PARSERS.register("tns1:RuleEngine/TamperDetector/Tamper")
@@ -295,30 +268,27 @@ async def async_parse_tamper_detector(uid: str, msg) -> Event | None:
 
     Topic: tns1:RuleEngine/TamperDetector/Tamper
     """
-    try:
-        video_source = ""
-        video_analytics = ""
-        rule = ""
-        topic, payload = extract_message(msg)
-        for source in payload.Source.SimpleItem:
-            if source.Name == "VideoSourceConfigurationToken":
-                video_source = _normalize_video_source(source.Value)
-            if source.Name == "VideoAnalyticsConfigurationToken":
-                video_analytics = source.Value
-            if source.Name == "Rule":
-                rule = source.Value
+    video_source = ""
+    video_analytics = ""
+    rule = ""
+    topic, payload = extract_message(msg)
+    for source in payload.Source.SimpleItem:
+        if source.Name == "VideoSourceConfigurationToken":
+            video_source = _normalize_video_source(source.Value)
+        if source.Name == "VideoAnalyticsConfigurationToken":
+            video_analytics = source.Value
+        if source.Name == "Rule":
+            rule = source.Value
 
-        return Event(
-            f"{uid}_{topic}_{video_source}_{video_analytics}_{rule}",
-            "Tamper Detection",
-            "binary_sensor",
-            "problem",
-            None,
-            payload.Data.SimpleItem[0].Value == "true",
-            EntityCategory.DIAGNOSTIC,
-        )
-    except (AttributeError, KeyError):
-        return None
+    return Event(
+        f"{uid}_{topic}_{video_source}_{video_analytics}_{rule}",
+        "Tamper Detection",
+        "binary_sensor",
+        "problem",
+        None,
+        payload.Data.SimpleItem[0].Value == "true",
+        EntityCategory.DIAGNOSTIC,
+    )
 
 
 @PARSERS.register("tns1:RuleEngine/MyRuleDetector/DogCatDetect")
@@ -327,23 +297,20 @@ async def async_parse_dog_cat_detector(uid: str, msg) -> Event | None:
 
     Topic: tns1:RuleEngine/MyRuleDetector/DogCatDetect
     """
-    try:
-        video_source = ""
-        topic, payload = extract_message(msg)
-        for source in payload.Source.SimpleItem:
-            if source.Name == "Source":
-                video_source = _normalize_video_source(source.Value)
+    video_source = ""
+    topic, payload = extract_message(msg)
+    for source in payload.Source.SimpleItem:
+        if source.Name == "Source":
+            video_source = _normalize_video_source(source.Value)
 
-        return Event(
-            f"{uid}_{topic}_{video_source}",
-            "Pet Detection",
-            "binary_sensor",
-            "motion",
-            None,
-            payload.Data.SimpleItem[0].Value == "true",
-        )
-    except (AttributeError, KeyError):
-        return None
+    return Event(
+        f"{uid}_{topic}_{video_source}",
+        "Pet Detection",
+        "binary_sensor",
+        "motion",
+        None,
+        payload.Data.SimpleItem[0].Value == "true",
+    )
 
 
 @PARSERS.register("tns1:RuleEngine/MyRuleDetector/VehicleDetect")
@@ -352,23 +319,20 @@ async def async_parse_vehicle_detector(uid: str, msg) -> Event | None:
 
     Topic: tns1:RuleEngine/MyRuleDetector/VehicleDetect
     """
-    try:
-        video_source = ""
-        topic, payload = extract_message(msg)
-        for source in payload.Source.SimpleItem:
-            if source.Name == "Source":
-                video_source = _normalize_video_source(source.Value)
+    video_source = ""
+    topic, payload = extract_message(msg)
+    for source in payload.Source.SimpleItem:
+        if source.Name == "Source":
+            video_source = _normalize_video_source(source.Value)
 
-        return Event(
-            f"{uid}_{topic}_{video_source}",
-            "Vehicle Detection",
-            "binary_sensor",
-            "motion",
-            None,
-            payload.Data.SimpleItem[0].Value == "true",
-        )
-    except (AttributeError, KeyError):
-        return None
+    return Event(
+        f"{uid}_{topic}_{video_source}",
+        "Vehicle Detection",
+        "binary_sensor",
+        "motion",
+        None,
+        payload.Data.SimpleItem[0].Value == "true",
+    )
 
 
 _TAPO_EVENT_TEMPLATES: dict[str, Event] = {
@@ -420,32 +384,28 @@ async def async_parse_tplink_detector(uid: str, msg) -> Event | None:
     Topic: tns1:RuleEngine/PeopleDetector/People
     Topic: tns1:RuleEngine/TPSmartEventDetector/TPSmartEvent
     """
-    try:
-        video_source = ""
-        video_analytics = ""
-        rule = ""
-        topic, payload = extract_message(msg)
-        for source in payload.Source.SimpleItem:
-            if source.Name == "VideoSourceConfigurationToken":
-                video_source = _normalize_video_source(source.Value)
-            if source.Name == "VideoAnalyticsConfigurationToken":
-                video_analytics = source.Value
-            if source.Name == "Rule":
-                rule = source.Value
+    video_source = ""
+    video_analytics = ""
+    rule = ""
+    topic, payload = extract_message(msg)
+    for source in payload.Source.SimpleItem:
+        if source.Name == "VideoSourceConfigurationToken":
+            video_source = _normalize_video_source(source.Value)
+        if source.Name == "VideoAnalyticsConfigurationToken":
+            video_analytics = source.Value
+        if source.Name == "Rule":
+            rule = source.Value
 
-        for item in payload.Data.SimpleItem:
-            event_template = _TAPO_EVENT_TEMPLATES.get(item.Name, None)
-            if event_template is None:
-                continue
+    for item in payload.Data.SimpleItem:
+        event_template = _TAPO_EVENT_TEMPLATES.get(item.Name, None)
+        if event_template is None:
+            continue
 
-            return dataclasses.replace(
-                event_template,
-                uid=f"{uid}_{topic}_{video_source}_{video_analytics}_{rule}",
-                value=item.Value == "true",
-            )
-
-    except (AttributeError, KeyError):
-        return None
+        return dataclasses.replace(
+            event_template,
+            uid=f"{uid}_{topic}_{video_source}_{video_analytics}_{rule}",
+            value=item.Value == "true",
+        )
 
     return None
 
@@ -456,23 +416,20 @@ async def async_parse_person_detector(uid: str, msg) -> Event | None:
 
     Topic: tns1:RuleEngine/MyRuleDetector/PeopleDetect
     """
-    try:
-        video_source = ""
-        topic, payload = extract_message(msg)
-        for source in payload.Source.SimpleItem:
-            if source.Name == "Source":
-                video_source = _normalize_video_source(source.Value)
+    video_source = ""
+    topic, payload = extract_message(msg)
+    for source in payload.Source.SimpleItem:
+        if source.Name == "Source":
+            video_source = _normalize_video_source(source.Value)
 
-        return Event(
-            f"{uid}_{topic}_{video_source}",
-            "Person Detection",
-            "binary_sensor",
-            "motion",
-            None,
-            payload.Data.SimpleItem[0].Value == "true",
-        )
-    except (AttributeError, KeyError):
-        return None
+    return Event(
+        f"{uid}_{topic}_{video_source}",
+        "Person Detection",
+        "binary_sensor",
+        "motion",
+        None,
+        payload.Data.SimpleItem[0].Value == "true",
+    )
 
 
 @PARSERS.register("tns1:RuleEngine/MyRuleDetector/FaceDetect")
@@ -481,23 +438,20 @@ async def async_parse_face_detector(uid: str, msg) -> Event | None:
 
     Topic: tns1:RuleEngine/MyRuleDetector/FaceDetect
     """
-    try:
-        video_source = ""
-        topic, payload = extract_message(msg)
-        for source in payload.Source.SimpleItem:
-            if source.Name == "Source":
-                video_source = _normalize_video_source(source.Value)
+    video_source = ""
+    topic, payload = extract_message(msg)
+    for source in payload.Source.SimpleItem:
+        if source.Name == "Source":
+            video_source = _normalize_video_source(source.Value)
 
-        return Event(
-            f"{uid}_{topic}_{video_source}",
-            "Face Detection",
-            "binary_sensor",
-            "motion",
-            None,
-            payload.Data.SimpleItem[0].Value == "true",
-        )
-    except (AttributeError, KeyError):
-        return None
+    return Event(
+        f"{uid}_{topic}_{video_source}",
+        "Face Detection",
+        "binary_sensor",
+        "motion",
+        None,
+        payload.Data.SimpleItem[0].Value == "true",
+    )
 
 
 @PARSERS.register("tns1:RuleEngine/MyRuleDetector/Visitor")
@@ -506,23 +460,42 @@ async def async_parse_visitor_detector(uid: str, msg) -> Event | None:
 
     Topic: tns1:RuleEngine/MyRuleDetector/Visitor
     """
-    try:
-        video_source = ""
-        topic, payload = extract_message(msg)
-        for source in payload.Source.SimpleItem:
-            if source.Name == "Source":
-                video_source = _normalize_video_source(source.Value)
+    video_source = ""
+    topic, payload = extract_message(msg)
+    for source in payload.Source.SimpleItem:
+        if source.Name == "Source":
+            video_source = _normalize_video_source(source.Value)
 
-        return Event(
-            f"{uid}_{topic}_{video_source}",
-            "Visitor Detection",
-            "binary_sensor",
-            "occupancy",
-            None,
-            payload.Data.SimpleItem[0].Value == "true",
-        )
-    except (AttributeError, KeyError):
-        return None
+    return Event(
+        f"{uid}_{topic}_{video_source}",
+        "Visitor Detection",
+        "binary_sensor",
+        "occupancy",
+        None,
+        payload.Data.SimpleItem[0].Value == "true",
+    )
+
+
+@PARSERS.register("tns1:RuleEngine/MyRuleDetector/Package")
+async def async_parse_package_detector(uid: str, msg) -> Event | None:
+    """Handle parsing event message.
+
+    Topic: tns1:RuleEngine/MyRuleDetector/Package
+    """
+    video_source = ""
+    topic, payload = extract_message(msg)
+    for source in payload.Source.SimpleItem:
+        if source.Name == "Source":
+            video_source = _normalize_video_source(source.Value)
+
+    return Event(
+        f"{uid}_{topic}_{video_source}",
+        "Package Detection",
+        "binary_sensor",
+        "occupancy",
+        None,
+        payload.Data.SimpleItem[0].Value == "true",
+    )
 
 
 @PARSERS.register("tns1:Device/Trigger/DigitalInput")
@@ -531,19 +504,16 @@ async def async_parse_digital_input(uid: str, msg) -> Event | None:
 
     Topic: tns1:Device/Trigger/DigitalInput
     """
-    try:
-        topic, payload = extract_message(msg)
-        source = payload.Source.SimpleItem[0].Value
-        return Event(
-            f"{uid}_{topic}_{source}",
-            "Digital Input",
-            "binary_sensor",
-            None,
-            None,
-            payload.Data.SimpleItem[0].Value == "true",
-        )
-    except (AttributeError, KeyError):
-        return None
+    topic, payload = extract_message(msg)
+    source = payload.Source.SimpleItem[0].Value
+    return Event(
+        f"{uid}_{topic}_{source}",
+        "Digital Input",
+        "binary_sensor",
+        None,
+        None,
+        payload.Data.SimpleItem[0].Value == "true",
+    )
 
 
 @PARSERS.register("tns1:Device/Trigger/Relay")
@@ -552,19 +522,16 @@ async def async_parse_relay(uid: str, msg) -> Event | None:
 
     Topic: tns1:Device/Trigger/Relay
     """
-    try:
-        topic, payload = extract_message(msg)
-        source = payload.Source.SimpleItem[0].Value
-        return Event(
-            f"{uid}_{topic}_{source}",
-            "Relay Triggered",
-            "binary_sensor",
-            None,
-            None,
-            payload.Data.SimpleItem[0].Value == "active",
-        )
-    except (AttributeError, KeyError):
-        return None
+    topic, payload = extract_message(msg)
+    source = payload.Source.SimpleItem[0].Value
+    return Event(
+        f"{uid}_{topic}_{source}",
+        "Relay Triggered",
+        "binary_sensor",
+        None,
+        None,
+        payload.Data.SimpleItem[0].Value == "active",
+    )
 
 
 @PARSERS.register("tns1:Device/HardwareFailure/StorageFailure")
@@ -573,20 +540,17 @@ async def async_parse_storage_failure(uid: str, msg) -> Event | None:
 
     Topic: tns1:Device/HardwareFailure/StorageFailure
     """
-    try:
-        topic, payload = extract_message(msg)
-        source = payload.Source.SimpleItem[0].Value
-        return Event(
-            f"{uid}_{topic}_{source}",
-            "Storage Failure",
-            "binary_sensor",
-            "problem",
-            None,
-            payload.Data.SimpleItem[0].Value == "true",
-            EntityCategory.DIAGNOSTIC,
-        )
-    except (AttributeError, KeyError):
-        return None
+    topic, payload = extract_message(msg)
+    source = payload.Source.SimpleItem[0].Value
+    return Event(
+        f"{uid}_{topic}_{source}",
+        "Storage Failure",
+        "binary_sensor",
+        "problem",
+        None,
+        payload.Data.SimpleItem[0].Value == "true",
+        EntityCategory.DIAGNOSTIC,
+    )
 
 
 @PARSERS.register("tns1:Monitoring/ProcessorUsage")
@@ -595,23 +559,20 @@ async def async_parse_processor_usage(uid: str, msg) -> Event | None:
 
     Topic: tns1:Monitoring/ProcessorUsage
     """
-    try:
-        topic, payload = extract_message(msg)
-        usage = float(payload.Data.SimpleItem[0].Value)
-        if usage <= 1:
-            usage *= 100
+    topic, payload = extract_message(msg)
+    usage = float(payload.Data.SimpleItem[0].Value)
+    if usage <= 1:
+        usage *= 100
 
-        return Event(
-            f"{uid}_{topic}",
-            "Processor Usage",
-            "sensor",
-            None,
-            "percent",
-            int(usage),
-            EntityCategory.DIAGNOSTIC,
-        )
-    except (AttributeError, KeyError):
-        return None
+    return Event(
+        f"{uid}_{topic}",
+        "Processor Usage",
+        "sensor",
+        None,
+        "percent",
+        int(usage),
+        EntityCategory.DIAGNOSTIC,
+    )
 
 
 @PARSERS.register("tns1:Monitoring/OperatingTime/LastReboot")
@@ -620,20 +581,17 @@ async def async_parse_last_reboot(uid: str, msg) -> Event | None:
 
     Topic: tns1:Monitoring/OperatingTime/LastReboot
     """
-    try:
-        topic, payload = extract_message(msg)
-        date_time = local_datetime_or_none(payload.Data.SimpleItem[0].Value)
-        return Event(
-            f"{uid}_{topic}",
-            "Last Reboot",
-            "sensor",
-            "timestamp",
-            None,
-            date_time,
-            EntityCategory.DIAGNOSTIC,
-        )
-    except (AttributeError, KeyError):
-        return None
+    topic, payload = extract_message(msg)
+    date_time = local_datetime_or_none(payload.Data.SimpleItem[0].Value)
+    return Event(
+        f"{uid}_{topic}",
+        "Last Reboot",
+        "sensor",
+        "timestamp",
+        None,
+        date_time,
+        EntityCategory.DIAGNOSTIC,
+    )
 
 
 @PARSERS.register("tns1:Monitoring/OperatingTime/LastReset")
@@ -642,21 +600,18 @@ async def async_parse_last_reset(uid: str, msg) -> Event | None:
 
     Topic: tns1:Monitoring/OperatingTime/LastReset
     """
-    try:
-        topic, payload = extract_message(msg)
-        date_time = local_datetime_or_none(payload.Data.SimpleItem[0].Value)
-        return Event(
-            f"{uid}_{topic}",
-            "Last Reset",
-            "sensor",
-            "timestamp",
-            None,
-            date_time,
-            EntityCategory.DIAGNOSTIC,
-            entity_enabled=False,
-        )
-    except (AttributeError, KeyError):
-        return None
+    topic, payload = extract_message(msg)
+    date_time = local_datetime_or_none(payload.Data.SimpleItem[0].Value)
+    return Event(
+        f"{uid}_{topic}",
+        "Last Reset",
+        "sensor",
+        "timestamp",
+        None,
+        date_time,
+        EntityCategory.DIAGNOSTIC,
+        entity_enabled=False,
+    )
 
 
 @PARSERS.register("tns1:Monitoring/Backup/Last")
@@ -665,22 +620,18 @@ async def async_parse_backup_last(uid: str, msg) -> Event | None:
 
     Topic: tns1:Monitoring/Backup/Last
     """
-
-    try:
-        topic, payload = extract_message(msg)
-        date_time = local_datetime_or_none(payload.Data.SimpleItem[0].Value)
-        return Event(
-            f"{uid}_{topic}",
-            "Last Backup",
-            "sensor",
-            "timestamp",
-            None,
-            date_time,
-            EntityCategory.DIAGNOSTIC,
-            entity_enabled=False,
-        )
-    except (AttributeError, KeyError):
-        return None
+    topic, payload = extract_message(msg)
+    date_time = local_datetime_or_none(payload.Data.SimpleItem[0].Value)
+    return Event(
+        f"{uid}_{topic}",
+        "Last Backup",
+        "sensor",
+        "timestamp",
+        None,
+        date_time,
+        EntityCategory.DIAGNOSTIC,
+        entity_enabled=False,
+    )
 
 
 @PARSERS.register("tns1:Monitoring/OperatingTime/LastClockSynchronization")
@@ -689,21 +640,18 @@ async def async_parse_last_clock_sync(uid: str, msg) -> Event | None:
 
     Topic: tns1:Monitoring/OperatingTime/LastClockSynchronization
     """
-    try:
-        topic, payload = extract_message(msg)
-        date_time = local_datetime_or_none(payload.Data.SimpleItem[0].Value)
-        return Event(
-            f"{uid}_{topic}",
-            "Last Clock Synchronization",
-            "sensor",
-            "timestamp",
-            None,
-            date_time,
-            EntityCategory.DIAGNOSTIC,
-            entity_enabled=False,
-        )
-    except (AttributeError, KeyError):
-        return None
+    topic, payload = extract_message(msg)
+    date_time = local_datetime_or_none(payload.Data.SimpleItem[0].Value)
+    return Event(
+        f"{uid}_{topic}",
+        "Last Clock Synchronization",
+        "sensor",
+        "timestamp",
+        None,
+        date_time,
+        EntityCategory.DIAGNOSTIC,
+        entity_enabled=False,
+    )
 
 
 @PARSERS.register("tns1:RecordingConfig/JobState")
@@ -713,20 +661,17 @@ async def async_parse_jobstate(uid: str, msg) -> Event | None:
     Topic: tns1:RecordingConfig/JobState
     """
 
-    try:
-        topic, payload = extract_message(msg)
-        source = payload.Source.SimpleItem[0].Value
-        return Event(
-            f"{uid}_{topic}_{source}",
-            "Recording Job State",
-            "binary_sensor",
-            None,
-            None,
-            payload.Data.SimpleItem[0].Value == "Active",
-            EntityCategory.DIAGNOSTIC,
-        )
-    except (AttributeError, KeyError):
-        return None
+    topic, payload = extract_message(msg)
+    source = payload.Source.SimpleItem[0].Value
+    return Event(
+        f"{uid}_{topic}_{source}",
+        "Recording Job State",
+        "binary_sensor",
+        None,
+        None,
+        payload.Data.SimpleItem[0].Value == "Active",
+        EntityCategory.DIAGNOSTIC,
+    )
 
 
 @PARSERS.register("tns1:RuleEngine/LineDetector/Crossed")
@@ -735,30 +680,27 @@ async def async_parse_linedetector_crossed(uid: str, msg) -> Event | None:
 
     Topic: tns1:RuleEngine/LineDetector/Crossed
     """
-    try:
-        video_source = ""
-        video_analytics = ""
-        rule = ""
-        topic, payload = extract_message(msg)
-        for source in payload.Source.SimpleItem:
-            if source.Name == "VideoSourceConfigurationToken":
-                video_source = source.Value
-            if source.Name == "VideoAnalyticsConfigurationToken":
-                video_analytics = source.Value
-            if source.Name == "Rule":
-                rule = source.Value
+    video_source = ""
+    video_analytics = ""
+    rule = ""
+    topic, payload = extract_message(msg)
+    for source in payload.Source.SimpleItem:
+        if source.Name == "VideoSourceConfigurationToken":
+            video_source = source.Value
+        if source.Name == "VideoAnalyticsConfigurationToken":
+            video_analytics = source.Value
+        if source.Name == "Rule":
+            rule = source.Value
 
-        return Event(
-            f"{uid}_{topic}_{video_source}_{video_analytics}_{rule}",
-            "Line Detector Crossed",
-            "sensor",
-            None,
-            None,
-            payload.Data.SimpleItem[0].Value,
-            EntityCategory.DIAGNOSTIC,
-        )
-    except (AttributeError, KeyError):
-        return None
+    return Event(
+        f"{uid}_{topic}_{video_source}_{video_analytics}_{rule}",
+        "Line Detector Crossed",
+        "sensor",
+        None,
+        None,
+        payload.Data.SimpleItem[0].Value,
+        EntityCategory.DIAGNOSTIC,
+    )
 
 
 @PARSERS.register("tns1:RuleEngine/CountAggregation/Counter")
@@ -767,30 +709,27 @@ async def async_parse_count_aggregation_counter(uid: str, msg) -> Event | None:
 
     Topic: tns1:RuleEngine/CountAggregation/Counter
     """
-    try:
-        video_source = ""
-        video_analytics = ""
-        rule = ""
-        topic, payload = extract_message(msg)
-        for source in payload.Source.SimpleItem:
-            if source.Name == "VideoSourceConfigurationToken":
-                video_source = _normalize_video_source(source.Value)
-            if source.Name == "VideoAnalyticsConfigurationToken":
-                video_analytics = source.Value
-            if source.Name == "Rule":
-                rule = source.Value
+    video_source = ""
+    video_analytics = ""
+    rule = ""
+    topic, payload = extract_message(msg)
+    for source in payload.Source.SimpleItem:
+        if source.Name == "VideoSourceConfigurationToken":
+            video_source = _normalize_video_source(source.Value)
+        if source.Name == "VideoAnalyticsConfigurationToken":
+            video_analytics = source.Value
+        if source.Name == "Rule":
+            rule = source.Value
 
-        return Event(
-            f"{uid}_{topic}_{video_source}_{video_analytics}_{rule}",
-            "Count Aggregation Counter",
-            "sensor",
-            None,
-            None,
-            payload.Data.SimpleItem[0].Value,
-            EntityCategory.DIAGNOSTIC,
-        )
-    except (AttributeError, KeyError):
-        return None
+    return Event(
+        f"{uid}_{topic}_{video_source}_{video_analytics}_{rule}",
+        "Count Aggregation Counter",
+        "sensor",
+        None,
+        None,
+        payload.Data.SimpleItem[0].Value,
+        EntityCategory.DIAGNOSTIC,
+    )
 
 
 @PARSERS.register("tns1:UserAlarm/IVA/HumanShapeDetect")
@@ -799,21 +738,18 @@ async def async_parse_human_shape_detect(uid: str, msg) -> Event | None:
 
     Topic: tns1:UserAlarm/IVA/HumanShapeDetect
     """
-    try:
-        topic, payload = extract_message(msg)
-        video_source = ""
-        for source in payload.Source.SimpleItem:
-            if source.Name == "VideoSourceConfigurationToken":
-                video_source = _normalize_video_source(source.Value)
-                break
+    topic, payload = extract_message(msg)
+    video_source = ""
+    for source in payload.Source.SimpleItem:
+        if source.Name == "VideoSourceConfigurationToken":
+            video_source = _normalize_video_source(source.Value)
+            break
 
-        return Event(
-            f"{uid}_{topic}_{video_source}",
-            "Human Shape Detect",
-            "binary_sensor",
-            "motion",
-            None,
-            payload.Data.SimpleItem[0].Value == "true",
-        )
-    except (AttributeError, KeyError):
-        return None
+    return Event(
+        f"{uid}_{topic}_{video_source}",
+        "Human Shape Detect",
+        "binary_sensor",
+        "motion",
+        None,
+        payload.Data.SimpleItem[0].Value == "true",
+    )
diff --git a/homeassistant/components/onvif/sensor.py b/homeassistant/components/onvif/sensor.py
index 46db26361bc..a0162a05f76 100644
--- a/homeassistant/components/onvif/sensor.py
+++ b/homeassistant/components/onvif/sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.sensor import RestoreSensor, SensorDeviceClass
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util.enum import try_parse_enum
 
@@ -21,7 +21,7 @@ from .entity import ONVIFBaseEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a ONVIF binary sensor."""
     device: ONVIFDevice = hass.data[DOMAIN][config_entry.unique_id]
diff --git a/homeassistant/components/onvif/strings.json b/homeassistant/components/onvif/strings.json
index 0afb5e59e8e..7988c50b1ac 100644
--- a/homeassistant/components/onvif/strings.json
+++ b/homeassistant/components/onvif/strings.json
@@ -62,12 +62,12 @@
     "step": {
       "onvif_devices": {
         "data": {
-          "extra_arguments": "Extra FFMPEG arguments",
+          "extra_arguments": "Extra FFmpeg arguments",
           "rtsp_transport": "RTSP transport mechanism",
           "use_wallclock_as_timestamps": "Use wall clock as timestamps",
-          "enable_webhooks": "Enable Webhooks"
+          "enable_webhooks": "Enable webhooks"
         },
-        "title": "ONVIF Device Options"
+        "title": "ONVIF device options"
       }
     }
   },
diff --git a/homeassistant/components/onvif/switch.py b/homeassistant/components/onvif/switch.py
index ff62e469af0..d8e1020c6a3 100644
--- a/homeassistant/components/onvif/switch.py
+++ b/homeassistant/components/onvif/switch.py
@@ -9,7 +9,7 @@ from typing import Any
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .device import ONVIFDevice
@@ -66,7 +66,7 @@ SWITCHES: tuple[ONVIFSwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a ONVIF switch platform."""
     device = hass.data[DOMAIN][config_entry.unique_id]
diff --git a/homeassistant/components/open_meteo/weather.py b/homeassistant/components/open_meteo/weather.py
index 51ee91de083..9782051ab22 100644
--- a/homeassistant/components/open_meteo/weather.py
+++ b/homeassistant/components/open_meteo/weather.py
@@ -20,7 +20,7 @@ from homeassistant.components.weather import (
 from homeassistant.const import UnitOfPrecipitationDepth, UnitOfSpeed, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 from homeassistant.util import dt as dt_util
 
@@ -31,7 +31,7 @@ from .coordinator import OpenMeteoConfigEntry
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: OpenMeteoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Open-Meteo weather entity based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/openai_conversation/__init__.py b/homeassistant/components/openai_conversation/__init__.py
index 0fbda9b7f4a..fcf6ab298dc 100644
--- a/homeassistant/components/openai_conversation/__init__.py
+++ b/homeassistant/components/openai_conversation/__init__.py
@@ -2,7 +2,20 @@
 
 from __future__ import annotations
 
+import base64
+from mimetypes import guess_file_type
+from pathlib import Path
+
 import openai
+from openai.types.images_response import ImagesResponse
+from openai.types.responses import (
+    EasyInputMessageParam,
+    Response,
+    ResponseInputImageParam,
+    ResponseInputMessageContentListParam,
+    ResponseInputParam,
+    ResponseInputTextParam,
+)
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntry
@@ -22,15 +35,41 @@ from homeassistant.helpers import config_validation as cv, selector
 from homeassistant.helpers.httpx_client import get_async_client
 from homeassistant.helpers.typing import ConfigType
 
-from .const import DOMAIN, LOGGER
+from .const import (
+    CONF_CHAT_MODEL,
+    CONF_FILENAMES,
+    CONF_MAX_TOKENS,
+    CONF_PROMPT,
+    CONF_REASONING_EFFORT,
+    CONF_TEMPERATURE,
+    CONF_TOP_P,
+    DOMAIN,
+    LOGGER,
+    RECOMMENDED_CHAT_MODEL,
+    RECOMMENDED_MAX_TOKENS,
+    RECOMMENDED_REASONING_EFFORT,
+    RECOMMENDED_TEMPERATURE,
+    RECOMMENDED_TOP_P,
+)
 
 SERVICE_GENERATE_IMAGE = "generate_image"
+SERVICE_GENERATE_CONTENT = "generate_content"
+
 PLATFORMS = (Platform.CONVERSATION,)
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
 type OpenAIConfigEntry = ConfigEntry[openai.AsyncClient]
 
 
+def encode_file(file_path: str) -> tuple[str, str]:
+    """Return base64 version of file contents."""
+    mime_type, _ = guess_file_type(file_path)
+    if mime_type is None:
+        mime_type = "application/octet-stream"
+    with open(file_path, "rb") as image_file:
+        return (mime_type, base64.b64encode(image_file.read()).decode("utf-8"))
+
+
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up OpenAI Conversation."""
 
@@ -49,9 +88,9 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         client: openai.AsyncClient = entry.runtime_data
 
         try:
-            response = await client.images.generate(
+            response: ImagesResponse = await client.images.generate(
                 model="dall-e-3",
-                prompt=call.data["prompt"],
+                prompt=call.data[CONF_PROMPT],
                 size=call.data["size"],
                 quality=call.data["quality"],
                 style=call.data["style"],
@@ -63,6 +102,108 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
         return response.data[0].model_dump(exclude={"b64_json"})
 
+    async def send_prompt(call: ServiceCall) -> ServiceResponse:
+        """Send a prompt to ChatGPT and return the response."""
+        entry_id = call.data["config_entry"]
+        entry = hass.config_entries.async_get_entry(entry_id)
+
+        if entry is None or entry.domain != DOMAIN:
+            raise ServiceValidationError(
+                translation_domain=DOMAIN,
+                translation_key="invalid_config_entry",
+                translation_placeholders={"config_entry": entry_id},
+            )
+
+        model: str = entry.options.get(CONF_CHAT_MODEL, RECOMMENDED_CHAT_MODEL)
+        client: openai.AsyncClient = entry.runtime_data
+
+        content: ResponseInputMessageContentListParam = [
+            ResponseInputTextParam(type="input_text", text=call.data[CONF_PROMPT])
+        ]
+
+        def append_files_to_content() -> None:
+            for filename in call.data[CONF_FILENAMES]:
+                if not hass.config.is_allowed_path(filename):
+                    raise HomeAssistantError(
+                        f"Cannot read `{filename}`, no access to path; "
+                        "`allowlist_external_dirs` may need to be adjusted in "
+                        "`configuration.yaml`"
+                    )
+                if not Path(filename).exists():
+                    raise HomeAssistantError(f"`{filename}` does not exist")
+                mime_type, base64_file = encode_file(filename)
+                if "image/" not in mime_type:
+                    raise HomeAssistantError(
+                        "Only images are supported by the OpenAI API,"
+                        f"`{filename}` is not an image file"
+                    )
+                content.append(
+                    ResponseInputImageParam(
+                        type="input_image",
+                        file_id=filename,
+                        image_url=f"data:{mime_type};base64,{base64_file}",
+                        detail="auto",
+                    )
+                )
+
+        if CONF_FILENAMES in call.data:
+            await hass.async_add_executor_job(append_files_to_content)
+
+        messages: ResponseInputParam = [
+            EasyInputMessageParam(type="message", role="user", content=content)
+        ]
+
+        try:
+            model_args = {
+                "model": model,
+                "input": messages,
+                "max_output_tokens": entry.options.get(
+                    CONF_MAX_TOKENS, RECOMMENDED_MAX_TOKENS
+                ),
+                "top_p": entry.options.get(CONF_TOP_P, RECOMMENDED_TOP_P),
+                "temperature": entry.options.get(
+                    CONF_TEMPERATURE, RECOMMENDED_TEMPERATURE
+                ),
+                "user": call.context.user_id,
+                "store": False,
+            }
+
+            if model.startswith("o"):
+                model_args["reasoning"] = {
+                    "effort": entry.options.get(
+                        CONF_REASONING_EFFORT, RECOMMENDED_REASONING_EFFORT
+                    )
+                }
+
+            response: Response = await client.responses.create(**model_args)
+
+        except openai.OpenAIError as err:
+            raise HomeAssistantError(f"Error generating content: {err}") from err
+        except FileNotFoundError as err:
+            raise HomeAssistantError(f"Error generating content: {err}") from err
+
+        return {"text": response.output_text}
+
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_GENERATE_CONTENT,
+        send_prompt,
+        schema=vol.Schema(
+            {
+                vol.Required("config_entry"): selector.ConfigEntrySelector(
+                    {
+                        "integration": DOMAIN,
+                    }
+                ),
+                vol.Required(CONF_PROMPT): cv.string,
+                vol.Optional(CONF_FILENAMES, default=[]): vol.All(
+                    cv.ensure_list, [cv.string]
+                ),
+            }
+        ),
+        supports_response=SupportsResponse.ONLY,
+    )
+
     hass.services.async_register(
         DOMAIN,
         SERVICE_GENERATE_IMAGE,
@@ -74,7 +215,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                         "integration": DOMAIN,
                     }
                 ),
-                vol.Required("prompt"): cv.string,
+                vol.Required(CONF_PROMPT): cv.string,
                 vol.Optional("size", default="1024x1024"): vol.In(
                     ("1024x1024", "1024x1792", "1792x1024")
                 ),
@@ -84,6 +225,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         ),
         supports_response=SupportsResponse.ONLY,
     )
+
     return True
 
 
diff --git a/homeassistant/components/openai_conversation/config_flow.py b/homeassistant/components/openai_conversation/config_flow.py
index 2a1764e6b5e..7304eb52da3 100644
--- a/homeassistant/components/openai_conversation/config_flow.py
+++ b/homeassistant/components/openai_conversation/config_flow.py
@@ -2,28 +2,38 @@
 
 from __future__ import annotations
 
+import json
 import logging
 from types import MappingProxyType
 from typing import Any
 
 import openai
 import voluptuous as vol
+from voluptuous_openapi import convert
 
+from homeassistant.components.zone import ENTITY_ID_HOME
 from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
     OptionsFlow,
 )
-from homeassistant.const import CONF_API_KEY, CONF_LLM_HASS_API
+from homeassistant.const import (
+    ATTR_LATITUDE,
+    ATTR_LONGITUDE,
+    CONF_API_KEY,
+    CONF_LLM_HASS_API,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import llm
+from homeassistant.helpers.httpx_client import get_async_client
 from homeassistant.helpers.selector import (
     NumberSelector,
     NumberSelectorConfig,
     SelectOptionDict,
     SelectSelector,
     SelectSelectorConfig,
+    SelectSelectorMode,
     TemplateSelector,
 )
 from homeassistant.helpers.typing import VolDictType
@@ -32,14 +42,27 @@ from .const import (
     CONF_CHAT_MODEL,
     CONF_MAX_TOKENS,
     CONF_PROMPT,
+    CONF_REASONING_EFFORT,
     CONF_RECOMMENDED,
     CONF_TEMPERATURE,
     CONF_TOP_P,
+    CONF_WEB_SEARCH,
+    CONF_WEB_SEARCH_CITY,
+    CONF_WEB_SEARCH_CONTEXT_SIZE,
+    CONF_WEB_SEARCH_COUNTRY,
+    CONF_WEB_SEARCH_REGION,
+    CONF_WEB_SEARCH_TIMEZONE,
+    CONF_WEB_SEARCH_USER_LOCATION,
     DOMAIN,
     RECOMMENDED_CHAT_MODEL,
     RECOMMENDED_MAX_TOKENS,
+    RECOMMENDED_REASONING_EFFORT,
     RECOMMENDED_TEMPERATURE,
     RECOMMENDED_TOP_P,
+    RECOMMENDED_WEB_SEARCH,
+    RECOMMENDED_WEB_SEARCH_CONTEXT_SIZE,
+    RECOMMENDED_WEB_SEARCH_USER_LOCATION,
+    UNSUPPORTED_MODELS,
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -62,7 +85,9 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> None:
 
     Data has the keys from STEP_USER_DATA_SCHEMA with values provided by the user.
     """
-    client = openai.AsyncOpenAI(api_key=data[CONF_API_KEY])
+    client = openai.AsyncOpenAI(
+        api_key=data[CONF_API_KEY], http_client=get_async_client(hass)
+    )
     await hass.async_add_executor_job(client.with_options(timeout=10.0).models.list)
 
 
@@ -124,28 +149,96 @@ class OpenAIOptionsFlow(OptionsFlow):
     ) -> ConfigFlowResult:
         """Manage the options."""
         options: dict[str, Any] | MappingProxyType[str, Any] = self.config_entry.options
+        errors: dict[str, str] = {}
 
         if user_input is not None:
             if user_input[CONF_RECOMMENDED] == self.last_rendered_recommended:
                 if user_input[CONF_LLM_HASS_API] == "none":
                     user_input.pop(CONF_LLM_HASS_API)
-                return self.async_create_entry(title="", data=user_input)
 
-            # Re-render the options again, now with the recommended options shown/hidden
-            self.last_rendered_recommended = user_input[CONF_RECOMMENDED]
+                if user_input.get(CONF_CHAT_MODEL) in UNSUPPORTED_MODELS:
+                    errors[CONF_CHAT_MODEL] = "model_not_supported"
 
-            options = {
-                CONF_RECOMMENDED: user_input[CONF_RECOMMENDED],
-                CONF_PROMPT: user_input[CONF_PROMPT],
-                CONF_LLM_HASS_API: user_input[CONF_LLM_HASS_API],
-            }
+                if user_input.get(CONF_WEB_SEARCH):
+                    if not user_input.get(
+                        CONF_CHAT_MODEL, RECOMMENDED_CHAT_MODEL
+                    ).startswith("gpt-4o"):
+                        errors[CONF_WEB_SEARCH] = "web_search_not_supported"
+                    elif user_input.get(CONF_WEB_SEARCH_USER_LOCATION):
+                        user_input.update(await self.get_location_data())
+
+                if not errors:
+                    return self.async_create_entry(title="", data=user_input)
+            else:
+                # Re-render the options again, now with the recommended options shown/hidden
+                self.last_rendered_recommended = user_input[CONF_RECOMMENDED]
+
+                options = {
+                    CONF_RECOMMENDED: user_input[CONF_RECOMMENDED],
+                    CONF_PROMPT: user_input[CONF_PROMPT],
+                    CONF_LLM_HASS_API: user_input[CONF_LLM_HASS_API],
+                }
 
         schema = openai_config_option_schema(self.hass, options)
         return self.async_show_form(
             step_id="init",
             data_schema=vol.Schema(schema),
+            errors=errors,
         )
 
+    async def get_location_data(self) -> dict[str, str]:
+        """Get approximate location data of the user."""
+        location_data: dict[str, str] = {}
+        zone_home = self.hass.states.get(ENTITY_ID_HOME)
+        if zone_home is not None:
+            client = openai.AsyncOpenAI(
+                api_key=self.config_entry.data[CONF_API_KEY],
+                http_client=get_async_client(self.hass),
+            )
+            location_schema = vol.Schema(
+                {
+                    vol.Optional(
+                        CONF_WEB_SEARCH_CITY,
+                        description="Free text input for the city, e.g. `San Francisco`",
+                    ): str,
+                    vol.Optional(
+                        CONF_WEB_SEARCH_REGION,
+                        description="Free text input for the region, e.g. `California`",
+                    ): str,
+                }
+            )
+            response = await client.responses.create(
+                model=RECOMMENDED_CHAT_MODEL,
+                input=[
+                    {
+                        "role": "system",
+                        "content": "Where are the following coordinates located: "
+                        f"({zone_home.attributes[ATTR_LATITUDE]},"
+                        f" {zone_home.attributes[ATTR_LONGITUDE]})?",
+                    }
+                ],
+                text={
+                    "format": {
+                        "type": "json_schema",
+                        "name": "approximate_location",
+                        "description": "Approximate location data of the user "
+                        "for refined web search results",
+                        "schema": convert(location_schema),
+                        "strict": False,
+                    }
+                },
+                store=False,
+            )
+            location_data = location_schema(json.loads(response.output_text) or {})
+
+        if self.hass.config.country:
+            location_data[CONF_WEB_SEARCH_COUNTRY] = self.hass.config.country
+        location_data[CONF_WEB_SEARCH_TIMEZONE] = self.hass.config.time_zone
+
+        _LOGGER.debug("Location data: %s", location_data)
+
+        return location_data
+
 
 def openai_config_option_schema(
     hass: HomeAssistant,
@@ -210,6 +303,42 @@ def openai_config_option_schema(
                 description={"suggested_value": options.get(CONF_TEMPERATURE)},
                 default=RECOMMENDED_TEMPERATURE,
             ): NumberSelector(NumberSelectorConfig(min=0, max=2, step=0.05)),
+            vol.Optional(
+                CONF_REASONING_EFFORT,
+                description={"suggested_value": options.get(CONF_REASONING_EFFORT)},
+                default=RECOMMENDED_REASONING_EFFORT,
+            ): SelectSelector(
+                SelectSelectorConfig(
+                    options=["low", "medium", "high"],
+                    translation_key=CONF_REASONING_EFFORT,
+                    mode=SelectSelectorMode.DROPDOWN,
+                )
+            ),
+            vol.Optional(
+                CONF_WEB_SEARCH,
+                description={"suggested_value": options.get(CONF_WEB_SEARCH)},
+                default=RECOMMENDED_WEB_SEARCH,
+            ): bool,
+            vol.Optional(
+                CONF_WEB_SEARCH_CONTEXT_SIZE,
+                description={
+                    "suggested_value": options.get(CONF_WEB_SEARCH_CONTEXT_SIZE)
+                },
+                default=RECOMMENDED_WEB_SEARCH_CONTEXT_SIZE,
+            ): SelectSelector(
+                SelectSelectorConfig(
+                    options=["low", "medium", "high"],
+                    translation_key=CONF_WEB_SEARCH_CONTEXT_SIZE,
+                    mode=SelectSelectorMode.DROPDOWN,
+                )
+            ),
+            vol.Optional(
+                CONF_WEB_SEARCH_USER_LOCATION,
+                description={
+                    "suggested_value": options.get(CONF_WEB_SEARCH_USER_LOCATION)
+                },
+                default=RECOMMENDED_WEB_SEARCH_USER_LOCATION,
+            ): bool,
         }
     )
     return schema
diff --git a/homeassistant/components/openai_conversation/const.py b/homeassistant/components/openai_conversation/const.py
index e8ee003fcca..41abc504219 100644
--- a/homeassistant/components/openai_conversation/const.py
+++ b/homeassistant/components/openai_conversation/const.py
@@ -3,15 +3,41 @@
 import logging
 
 DOMAIN = "openai_conversation"
-LOGGER = logging.getLogger(__package__)
+LOGGER: logging.Logger = logging.getLogger(__package__)
 
-CONF_RECOMMENDED = "recommended"
-CONF_PROMPT = "prompt"
 CONF_CHAT_MODEL = "chat_model"
-RECOMMENDED_CHAT_MODEL = "gpt-4o-mini"
+CONF_FILENAMES = "filenames"
 CONF_MAX_TOKENS = "max_tokens"
-RECOMMENDED_MAX_TOKENS = 150
-CONF_TOP_P = "top_p"
-RECOMMENDED_TOP_P = 1.0
+CONF_PROMPT = "prompt"
+CONF_PROMPT = "prompt"
+CONF_REASONING_EFFORT = "reasoning_effort"
+CONF_RECOMMENDED = "recommended"
 CONF_TEMPERATURE = "temperature"
+CONF_TOP_P = "top_p"
+CONF_WEB_SEARCH = "web_search"
+CONF_WEB_SEARCH_USER_LOCATION = "user_location"
+CONF_WEB_SEARCH_CONTEXT_SIZE = "search_context_size"
+CONF_WEB_SEARCH_CITY = "city"
+CONF_WEB_SEARCH_REGION = "region"
+CONF_WEB_SEARCH_COUNTRY = "country"
+CONF_WEB_SEARCH_TIMEZONE = "timezone"
+RECOMMENDED_CHAT_MODEL = "gpt-4o-mini"
+RECOMMENDED_MAX_TOKENS = 150
+RECOMMENDED_REASONING_EFFORT = "low"
 RECOMMENDED_TEMPERATURE = 1.0
+RECOMMENDED_TOP_P = 1.0
+RECOMMENDED_WEB_SEARCH = False
+RECOMMENDED_WEB_SEARCH_CONTEXT_SIZE = "medium"
+RECOMMENDED_WEB_SEARCH_USER_LOCATION = False
+
+UNSUPPORTED_MODELS: list[str] = [
+    "o1-mini",
+    "o1-mini-2024-09-12",
+    "o1-preview",
+    "o1-preview-2024-09-12",
+    "gpt-4o-realtime-preview",
+    "gpt-4o-realtime-preview-2024-12-17",
+    "gpt-4o-realtime-preview-2024-10-01",
+    "gpt-4o-mini-realtime-preview",
+    "gpt-4o-mini-realtime-preview-2024-12-17",
+]
diff --git a/homeassistant/components/openai_conversation/conversation.py b/homeassistant/components/openai_conversation/conversation.py
index c89574bf3bd..026e18f3ce1 100644
--- a/homeassistant/components/openai_conversation/conversation.py
+++ b/homeassistant/components/openai_conversation/conversation.py
@@ -1,46 +1,65 @@
 """Conversation support for OpenAI."""
 
-from collections.abc import Callable
+from collections.abc import AsyncGenerator, Callable
 import json
-from typing import Any, Literal, cast
+from typing import Any, Literal
 
 import openai
-from openai._types import NOT_GIVEN
-from openai.types.chat import (
-    ChatCompletionAssistantMessageParam,
-    ChatCompletionMessage,
-    ChatCompletionMessageParam,
-    ChatCompletionMessageToolCallParam,
-    ChatCompletionToolMessageParam,
-    ChatCompletionToolParam,
+from openai._streaming import AsyncStream
+from openai.types.responses import (
+    EasyInputMessageParam,
+    FunctionToolParam,
+    ResponseCompletedEvent,
+    ResponseErrorEvent,
+    ResponseFailedEvent,
+    ResponseFunctionCallArgumentsDeltaEvent,
+    ResponseFunctionCallArgumentsDoneEvent,
+    ResponseFunctionToolCall,
+    ResponseFunctionToolCallParam,
+    ResponseIncompleteEvent,
+    ResponseInputParam,
+    ResponseOutputItemAddedEvent,
+    ResponseOutputMessage,
+    ResponseStreamEvent,
+    ResponseTextDeltaEvent,
+    ToolParam,
+    WebSearchToolParam,
 )
-from openai.types.chat.chat_completion_message_tool_call_param import Function
-from openai.types.shared_params import FunctionDefinition
-import voluptuous as vol
+from openai.types.responses.response_input_param import FunctionCallOutput
+from openai.types.responses.web_search_tool_param import UserLocation
 from voluptuous_openapi import convert
 
 from homeassistant.components import assist_pipeline, conversation
-from homeassistant.components.conversation import trace
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_LLM_HASS_API, MATCH_ALL
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr, intent, llm
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import OpenAIConfigEntry
 from .const import (
     CONF_CHAT_MODEL,
     CONF_MAX_TOKENS,
     CONF_PROMPT,
+    CONF_REASONING_EFFORT,
     CONF_TEMPERATURE,
     CONF_TOP_P,
+    CONF_WEB_SEARCH,
+    CONF_WEB_SEARCH_CITY,
+    CONF_WEB_SEARCH_CONTEXT_SIZE,
+    CONF_WEB_SEARCH_COUNTRY,
+    CONF_WEB_SEARCH_REGION,
+    CONF_WEB_SEARCH_TIMEZONE,
+    CONF_WEB_SEARCH_USER_LOCATION,
     DOMAIN,
     LOGGER,
     RECOMMENDED_CHAT_MODEL,
     RECOMMENDED_MAX_TOKENS,
+    RECOMMENDED_REASONING_EFFORT,
     RECOMMENDED_TEMPERATURE,
     RECOMMENDED_TOP_P,
+    RECOMMENDED_WEB_SEARCH_CONTEXT_SIZE,
 )
 
 # Max number of back and forth with the LLM to generate a response
@@ -50,7 +69,7 @@ MAX_TOOL_ITERATIONS = 10
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: OpenAIConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up conversation entities."""
     agent = OpenAIConversationEntity(config_entry)
@@ -59,39 +78,131 @@ async def async_setup_entry(
 
 def _format_tool(
     tool: llm.Tool, custom_serializer: Callable[[Any], Any] | None
-) -> ChatCompletionToolParam:
+) -> FunctionToolParam:
     """Format tool specification."""
-    tool_spec = FunctionDefinition(
+    return FunctionToolParam(
+        type="function",
         name=tool.name,
         parameters=convert(tool.parameters, custom_serializer=custom_serializer),
+        description=tool.description,
+        strict=False,
     )
-    if tool.description:
-        tool_spec["description"] = tool.description
-    return ChatCompletionToolParam(type="function", function=tool_spec)
 
 
-def _message_convert(message: ChatCompletionMessage) -> ChatCompletionMessageParam:
-    """Convert from class to TypedDict."""
-    tool_calls: list[ChatCompletionMessageToolCallParam] = []
-    if message.tool_calls:
-        tool_calls = [
-            ChatCompletionMessageToolCallParam(
-                id=tool_call.id,
-                function=Function(
-                    arguments=tool_call.function.arguments,
-                    name=tool_call.function.name,
-                ),
-                type=tool_call.type,
+def _convert_content_to_param(
+    content: conversation.Content,
+) -> ResponseInputParam:
+    """Convert any native chat message for this agent to the native format."""
+    messages: ResponseInputParam = []
+    if isinstance(content, conversation.ToolResultContent):
+        return [
+            FunctionCallOutput(
+                type="function_call_output",
+                call_id=content.tool_call_id,
+                output=json.dumps(content.tool_result),
             )
-            for tool_call in message.tool_calls
         ]
-    param = ChatCompletionAssistantMessageParam(
-        role=message.role,
-        content=message.content,
-    )
-    if tool_calls:
-        param["tool_calls"] = tool_calls
-    return param
+
+    if content.content:
+        role: Literal["user", "assistant", "system", "developer"] = content.role
+        if role == "system":
+            role = "developer"
+        messages.append(
+            EasyInputMessageParam(type="message", role=role, content=content.content)
+        )
+
+    if isinstance(content, conversation.AssistantContent) and content.tool_calls:
+        messages.extend(
+            ResponseFunctionToolCallParam(
+                type="function_call",
+                name=tool_call.tool_name,
+                arguments=json.dumps(tool_call.tool_args),
+                call_id=tool_call.id,
+            )
+            for tool_call in content.tool_calls
+        )
+    return messages
+
+
+async def _transform_stream(
+    chat_log: conversation.ChatLog,
+    result: AsyncStream[ResponseStreamEvent],
+) -> AsyncGenerator[conversation.AssistantContentDeltaDict]:
+    """Transform an OpenAI delta stream into HA format."""
+    async for event in result:
+        LOGGER.debug("Received event: %s", event)
+
+        if isinstance(event, ResponseOutputItemAddedEvent):
+            if isinstance(event.item, ResponseOutputMessage):
+                yield {"role": event.item.role}
+            elif isinstance(event.item, ResponseFunctionToolCall):
+                current_tool_call = event.item
+        elif isinstance(event, ResponseTextDeltaEvent):
+            yield {"content": event.delta}
+        elif isinstance(event, ResponseFunctionCallArgumentsDeltaEvent):
+            current_tool_call.arguments += event.delta
+        elif isinstance(event, ResponseFunctionCallArgumentsDoneEvent):
+            current_tool_call.status = "completed"
+            yield {
+                "tool_calls": [
+                    llm.ToolInput(
+                        id=current_tool_call.call_id,
+                        tool_name=current_tool_call.name,
+                        tool_args=json.loads(current_tool_call.arguments),
+                    )
+                ]
+            }
+        elif isinstance(event, ResponseCompletedEvent):
+            if event.response.usage is not None:
+                chat_log.async_trace(
+                    {
+                        "stats": {
+                            "input_tokens": event.response.usage.input_tokens,
+                            "output_tokens": event.response.usage.output_tokens,
+                        }
+                    }
+                )
+        elif isinstance(event, ResponseIncompleteEvent):
+            if event.response.usage is not None:
+                chat_log.async_trace(
+                    {
+                        "stats": {
+                            "input_tokens": event.response.usage.input_tokens,
+                            "output_tokens": event.response.usage.output_tokens,
+                        }
+                    }
+                )
+
+            if (
+                event.response.incomplete_details
+                and event.response.incomplete_details.reason
+            ):
+                reason: str = event.response.incomplete_details.reason
+            else:
+                reason = "unknown reason"
+
+            if reason == "max_output_tokens":
+                reason = "max output tokens reached"
+            elif reason == "content_filter":
+                reason = "content filter triggered"
+
+            raise HomeAssistantError(f"OpenAI response incomplete: {reason}")
+        elif isinstance(event, ResponseFailedEvent):
+            if event.response.usage is not None:
+                chat_log.async_trace(
+                    {
+                        "stats": {
+                            "input_tokens": event.response.usage.input_tokens,
+                            "output_tokens": event.response.usage.output_tokens,
+                        }
+                    }
+                )
+            reason = "unknown reason"
+            if event.response.error is not None:
+                reason = event.response.error.message
+            raise HomeAssistantError(f"OpenAI response failed: {reason}")
+        elif isinstance(event, ResponseErrorEvent):
+            raise HomeAssistantError(f"OpenAI response error: {event.message}")
 
 
 class OpenAIConversationEntity(
@@ -139,25 +250,16 @@ class OpenAIConversationEntity(
         conversation.async_unset_agent(self.hass, self.entry)
         await super().async_will_remove_from_hass()
 
-    async def async_process(
-        self, user_input: conversation.ConversationInput
-    ) -> conversation.ConversationResult:
-        """Process a sentence."""
-        async with conversation.async_get_chat_session(
-            self.hass, user_input
-        ) as session:
-            return await self._async_call_api(user_input, session)
-
-    async def _async_call_api(
+    async def _async_handle_message(
         self,
         user_input: conversation.ConversationInput,
-        session: conversation.ChatSession[ChatCompletionMessageParam],
+        chat_log: conversation.ChatLog,
     ) -> conversation.ConversationResult:
         """Call the API."""
         options = self.entry.options
 
         try:
-            await session.async_update_llm_data(
+            await chat_log.async_update_llm_data(
                 DOMAIN,
                 user_input,
                 options.get(CONF_LLM_HASS_API),
@@ -166,113 +268,89 @@ class OpenAIConversationEntity(
         except conversation.ConverseError as err:
             return err.as_conversation_result()
 
-        tools: list[ChatCompletionToolParam] | None = None
-        if session.llm_api:
+        tools: list[ToolParam] | None = None
+        if chat_log.llm_api:
             tools = [
-                _format_tool(tool, session.llm_api.custom_serializer)
-                for tool in session.llm_api.tools
+                _format_tool(tool, chat_log.llm_api.custom_serializer)
+                for tool in chat_log.llm_api.tools
             ]
 
-        messages: list[ChatCompletionMessageParam] = []
-        for message in session.async_get_messages(user_input.agent_id):
-            if message.native is not None and message.agent_id == user_input.agent_id:
-                messages.append(message.native)
-            else:
-                messages.append(
-                    cast(
-                        ChatCompletionMessageParam,
-                        {"role": message.role, "content": message.content},
-                    )
+        if options.get(CONF_WEB_SEARCH):
+            web_search = WebSearchToolParam(
+                type="web_search_preview",
+                search_context_size=options.get(
+                    CONF_WEB_SEARCH_CONTEXT_SIZE, RECOMMENDED_WEB_SEARCH_CONTEXT_SIZE
+                ),
+            )
+            if options.get(CONF_WEB_SEARCH_USER_LOCATION):
+                web_search["user_location"] = UserLocation(
+                    type="approximate",
+                    city=options.get(CONF_WEB_SEARCH_CITY, ""),
+                    region=options.get(CONF_WEB_SEARCH_REGION, ""),
+                    country=options.get(CONF_WEB_SEARCH_COUNTRY, ""),
+                    timezone=options.get(CONF_WEB_SEARCH_TIMEZONE, ""),
                 )
+            if tools is None:
+                tools = []
+            tools.append(web_search)
 
-        LOGGER.debug("Prompt: %s", messages)
-        LOGGER.debug("Tools: %s", tools)
-        trace.async_conversation_trace_append(
-            trace.ConversationTraceEventType.AGENT_DETAIL,
-            {
-                "messages": session.messages,
-                "tools": session.llm_api.tools if session.llm_api else None,
-            },
-        )
+        model = options.get(CONF_CHAT_MODEL, RECOMMENDED_CHAT_MODEL)
+        messages = [
+            m
+            for content in chat_log.content
+            for m in _convert_content_to_param(content)
+        ]
 
         client = self.entry.runtime_data
 
         # To prevent infinite loops, we limit the number of iterations
         for _iteration in range(MAX_TOOL_ITERATIONS):
+            model_args = {
+                "model": model,
+                "input": messages,
+                "max_output_tokens": options.get(
+                    CONF_MAX_TOKENS, RECOMMENDED_MAX_TOKENS
+                ),
+                "top_p": options.get(CONF_TOP_P, RECOMMENDED_TOP_P),
+                "temperature": options.get(CONF_TEMPERATURE, RECOMMENDED_TEMPERATURE),
+                "user": chat_log.conversation_id,
+                "store": False,
+                "stream": True,
+            }
+            if tools:
+                model_args["tools"] = tools
+
+            if model.startswith("o"):
+                model_args["reasoning"] = {
+                    "effort": options.get(
+                        CONF_REASONING_EFFORT, RECOMMENDED_REASONING_EFFORT
+                    )
+                }
+
             try:
-                result = await client.chat.completions.create(
-                    model=options.get(CONF_CHAT_MODEL, RECOMMENDED_CHAT_MODEL),
-                    messages=messages,
-                    tools=tools or NOT_GIVEN,
-                    max_tokens=options.get(CONF_MAX_TOKENS, RECOMMENDED_MAX_TOKENS),
-                    top_p=options.get(CONF_TOP_P, RECOMMENDED_TOP_P),
-                    temperature=options.get(CONF_TEMPERATURE, RECOMMENDED_TEMPERATURE),
-                    user=session.conversation_id,
-                )
+                result = await client.responses.create(**model_args)
+            except openai.RateLimitError as err:
+                LOGGER.error("Rate limited by OpenAI: %s", err)
+                raise HomeAssistantError("Rate limited or insufficient funds") from err
             except openai.OpenAIError as err:
                 LOGGER.error("Error talking to OpenAI: %s", err)
-                intent_response = intent.IntentResponse(language=user_input.language)
-                intent_response.async_set_error(
-                    intent.IntentResponseErrorCode.UNKNOWN,
-                    "Sorry, I had a problem talking to OpenAI",
-                )
-                return conversation.ConversationResult(
-                    response=intent_response, conversation_id=session.conversation_id
-                )
+                raise HomeAssistantError("Error talking to OpenAI") from err
 
-            LOGGER.debug("Response %s", result)
-            response = result.choices[0].message
-            messages.append(_message_convert(response))
+            async for content in chat_log.async_add_delta_content_stream(
+                user_input.agent_id, _transform_stream(chat_log, result)
+            ):
+                messages.extend(_convert_content_to_param(content))
 
-            session.async_add_message(
-                conversation.ChatMessage(
-                    role=response.role,
-                    agent_id=user_input.agent_id,
-                    content=response.content or "",
-                    native=messages[-1],
-                ),
-            )
-
-            if not response.tool_calls or not session.llm_api:
+            if not chat_log.unresponded_tool_results:
                 break
 
-            for tool_call in response.tool_calls:
-                tool_input = llm.ToolInput(
-                    tool_name=tool_call.function.name,
-                    tool_args=json.loads(tool_call.function.arguments),
-                )
-                LOGGER.debug(
-                    "Tool call: %s(%s)", tool_input.tool_name, tool_input.tool_args
-                )
-
-                try:
-                    tool_response = await session.llm_api.async_call_tool(tool_input)
-                except (HomeAssistantError, vol.Invalid) as e:
-                    tool_response = {"error": type(e).__name__}
-                    if str(e):
-                        tool_response["error_text"] = str(e)
-
-                LOGGER.debug("Tool response: %s", tool_response)
-                messages.append(
-                    ChatCompletionToolMessageParam(
-                        role="tool",
-                        tool_call_id=tool_call.id,
-                        content=json.dumps(tool_response),
-                    )
-                )
-                session.async_add_message(
-                    conversation.ChatMessage(
-                        role="native",
-                        agent_id=user_input.agent_id,
-                        content="",
-                        native=messages[-1],
-                    )
-                )
-
         intent_response = intent.IntentResponse(language=user_input.language)
-        intent_response.async_set_speech(response.content or "")
+        assert type(chat_log.content[-1]) is conversation.AssistantContent
+        intent_response.async_set_speech(chat_log.content[-1].content or "")
         return conversation.ConversationResult(
-            response=intent_response, conversation_id=session.conversation_id
+            response=intent_response,
+            conversation_id=chat_log.conversation_id,
+            continue_conversation=chat_log.continue_conversation,
         )
 
     async def _async_entry_update_listener(
diff --git a/homeassistant/components/openai_conversation/icons.json b/homeassistant/components/openai_conversation/icons.json
index 3abecd640d1..f0ece31c304 100644
--- a/homeassistant/components/openai_conversation/icons.json
+++ b/homeassistant/components/openai_conversation/icons.json
@@ -2,6 +2,9 @@
   "services": {
     "generate_image": {
       "service": "mdi:image-sync"
+    },
+    "generate_content": {
+      "service": "mdi:receipt-text"
     }
   }
 }
diff --git a/homeassistant/components/openai_conversation/manifest.json b/homeassistant/components/openai_conversation/manifest.json
index 9b70246117c..988dd2321d5 100644
--- a/homeassistant/components/openai_conversation/manifest.json
+++ b/homeassistant/components/openai_conversation/manifest.json
@@ -8,5 +8,5 @@
   "documentation": "https://www.home-assistant.io/integrations/openai_conversation",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["openai==1.59.9"]
+  "requirements": ["openai==1.68.2"]
 }
diff --git a/homeassistant/components/openai_conversation/services.yaml b/homeassistant/components/openai_conversation/services.yaml
index 3db71cae383..75fa097f25d 100644
--- a/homeassistant/components/openai_conversation/services.yaml
+++ b/homeassistant/components/openai_conversation/services.yaml
@@ -38,3 +38,23 @@ generate_image:
           options:
             - "vivid"
             - "natural"
+generate_content:
+  fields:
+    config_entry:
+      required: true
+      selector:
+        config_entry:
+          integration: openai_conversation
+    prompt:
+      required: true
+      selector:
+        text:
+          multiline: true
+      example: "Hello, how can I help you?"
+    filenames:
+      selector:
+        text:
+          multiline: true
+      example: |
+        - /path/to/file1.txt
+        - /path/to/file2.txt
diff --git a/homeassistant/components/openai_conversation/strings.json b/homeassistant/components/openai_conversation/strings.json
index 2477155e3cb..a373ec448d7 100644
--- a/homeassistant/components/openai_conversation/strings.json
+++ b/homeassistant/components/openai_conversation/strings.json
@@ -23,21 +23,49 @@
           "temperature": "Temperature",
           "top_p": "Top P",
           "llm_hass_api": "[%key:common::config_flow::data::llm_hass_api%]",
-          "recommended": "Recommended model settings"
+          "recommended": "Recommended model settings",
+          "reasoning_effort": "Reasoning effort",
+          "web_search": "Enable web search",
+          "search_context_size": "Search context size",
+          "user_location": "Include home location"
         },
         "data_description": {
-          "prompt": "Instruct how the LLM should respond. This can be a template."
+          "prompt": "Instruct how the LLM should respond. This can be a template.",
+          "reasoning_effort": "How many reasoning tokens the model should generate before creating a response to the prompt (for certain reasoning models)",
+          "web_search": "Allow the model to search the web for the latest information before generating a response",
+          "search_context_size": "High level guidance for the amount of context window space to use for the search",
+          "user_location": "Refine search results based on geography"
         }
       }
+    },
+    "error": {
+      "model_not_supported": "This model is not supported, please select a different model",
+      "web_search_not_supported": "Web search is only supported for gpt-4o and gpt-4o-mini models"
+    }
+  },
+  "selector": {
+    "reasoning_effort": {
+      "options": {
+        "low": "Low",
+        "medium": "Medium",
+        "high": "High"
+      }
+    },
+    "search_context_size": {
+      "options": {
+        "low": "Low",
+        "medium": "Medium",
+        "high": "High"
+      }
     }
   },
   "services": {
     "generate_image": {
       "name": "Generate image",
-      "description": "Turn a prompt into an image",
+      "description": "Turns a prompt into an image",
       "fields": {
         "config_entry": {
-          "name": "Config Entry",
+          "name": "Config entry",
           "description": "The config entry to use for this action"
         },
         "prompt": {
@@ -58,6 +86,24 @@
           "description": "The style of the generated image"
         }
       }
+    },
+    "generate_content": {
+      "name": "Generate content",
+      "description": "Sends a conversational query to ChatGPT including any attached image files",
+      "fields": {
+        "config_entry": {
+          "name": "Config entry",
+          "description": "The config entry to use for this action"
+        },
+        "prompt": {
+          "name": "Prompt",
+          "description": "The prompt to send"
+        },
+        "filenames": {
+          "name": "Files",
+          "description": "List of files to upload"
+        }
+      }
     }
   },
   "exceptions": {
diff --git a/homeassistant/components/openalpr_cloud/image_processing.py b/homeassistant/components/openalpr_cloud/image_processing.py
index e8a8d6859c1..2bdf9947fe2 100644
--- a/homeassistant/components/openalpr_cloud/image_processing.py
+++ b/homeassistant/components/openalpr_cloud/image_processing.py
@@ -26,8 +26,8 @@ from homeassistant.const import (
     CONF_SOURCE,
 )
 from homeassistant.core import HomeAssistant, callback, split_entity_id
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util.async_ import run_callback_threadsafe
diff --git a/homeassistant/components/openevse/sensor.py b/homeassistant/components/openevse/sensor.py
index c228b6c1a14..de86e3d581f 100644
--- a/homeassistant/components/openevse/sensor.py
+++ b/homeassistant/components/openevse/sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/openexchangerates/__init__.py b/homeassistant/components/openexchangerates/__init__.py
index 65005235c6b..ed704a61fed 100644
--- a/homeassistant/components/openexchangerates/__init__.py
+++ b/homeassistant/components/openexchangerates/__init__.py
@@ -33,6 +33,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     update_interval = BASE_UPDATE_INTERVAL * (len(existing_coordinator_for_api_key) + 1)
     coordinator = OpenexchangeratesCoordinator(
         hass,
+        entry,
         async_get_clientsession(hass),
         api_key,
         base,
diff --git a/homeassistant/components/openexchangerates/coordinator.py b/homeassistant/components/openexchangerates/coordinator.py
index 627e0d92e32..6245877ddbd 100644
--- a/homeassistant/components/openexchangerates/coordinator.py
+++ b/homeassistant/components/openexchangerates/coordinator.py
@@ -13,6 +13,7 @@ from aioopenexchangerates import (
     OpenExchangeRatesClientError,
 )
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -23,9 +24,12 @@ from .const import CLIENT_TIMEOUT, DOMAIN, LOGGER
 class OpenexchangeratesCoordinator(DataUpdateCoordinator[Latest]):
     """Represent a coordinator for Open Exchange Rates API."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         session: ClientSession,
         api_key: str,
         base: str,
@@ -33,7 +37,11 @@ class OpenexchangeratesCoordinator(DataUpdateCoordinator[Latest]):
     ) -> None:
         """Initialize the coordinator."""
         super().__init__(
-            hass, LOGGER, name=f"{DOMAIN} base {base}", update_interval=update_interval
+            hass,
+            LOGGER,
+            config_entry=config_entry,
+            name=f"{DOMAIN} base {base}",
+            update_interval=update_interval,
         )
         self.base = base
         self.client = Client(api_key, session)
diff --git a/homeassistant/components/openexchangerates/sensor.py b/homeassistant/components/openexchangerates/sensor.py
index 55ca7bd2fb9..756823ff0ec 100644
--- a/homeassistant/components/openexchangerates/sensor.py
+++ b/homeassistant/components/openexchangerates/sensor.py
@@ -7,7 +7,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_QUOTE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
@@ -19,7 +19,7 @@ ATTRIBUTION = "Data provided by openexchangerates.org"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Open Exchange Rates sensor."""
     quote: str = config_entry.data.get(CONF_QUOTE, "EUR")
diff --git a/homeassistant/components/opengarage/__init__.py b/homeassistant/components/opengarage/__init__.py
index 12c2f96d7e4..f1f080b30f8 100644
--- a/homeassistant/components/opengarage/__init__.py
+++ b/homeassistant/components/opengarage/__init__.py
@@ -24,8 +24,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         async_get_clientsession(hass),
     )
     open_garage_data_coordinator = OpenGarageDataUpdateCoordinator(
-        hass,
-        open_garage_connection=open_garage_connection,
+        hass, entry, open_garage_connection
     )
     await open_garage_data_coordinator.async_config_entry_first_refresh()
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = open_garage_data_coordinator
diff --git a/homeassistant/components/opengarage/binary_sensor.py b/homeassistant/components/opengarage/binary_sensor.py
index 55cacfb5f90..33420ab3fd5 100644
--- a/homeassistant/components/opengarage/binary_sensor.py
+++ b/homeassistant/components/opengarage/binary_sensor.py
@@ -11,7 +11,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import OpenGarageDataUpdateCoordinator
@@ -29,7 +29,9 @@ SENSOR_TYPES: tuple[BinarySensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the OpenGarage binary sensors."""
     open_garage_data_coordinator: OpenGarageDataUpdateCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/opengarage/button.py b/homeassistant/components/opengarage/button.py
index 9f93e0fa716..64a4f2f20e7 100644
--- a/homeassistant/components/opengarage/button.py
+++ b/homeassistant/components/opengarage/button.py
@@ -16,7 +16,7 @@ from homeassistant.components.button import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import OpenGarageDataUpdateCoordinator
@@ -43,7 +43,7 @@ BUTTONS: tuple[OpenGarageButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the OpenGarage button entities."""
     coordinator: OpenGarageDataUpdateCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/opengarage/coordinator.py b/homeassistant/components/opengarage/coordinator.py
index d35dc22d288..5d5440d6b1b 100644
--- a/homeassistant/components/opengarage/coordinator.py
+++ b/homeassistant/components/opengarage/coordinator.py
@@ -8,6 +8,7 @@ from typing import Any
 
 import opengarage
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import update_coordinator
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
@@ -20,10 +21,12 @@ _LOGGER = logging.getLogger(__name__)
 class OpenGarageDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Class to manage fetching Opengarage data."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
-        *,
+        config_entry: ConfigEntry,
         open_garage_connection: opengarage.OpenGarage,
     ) -> None:
         """Initialize global Opengarage data updater."""
@@ -32,6 +35,7 @@ class OpenGarageDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=5),
         )
diff --git a/homeassistant/components/opengarage/cover.py b/homeassistant/components/opengarage/cover.py
index 9623050c090..859e3382772 100644
--- a/homeassistant/components/opengarage/cover.py
+++ b/homeassistant/components/opengarage/cover.py
@@ -13,7 +13,7 @@ from homeassistant.components.cover import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import OpenGarageDataUpdateCoordinator
@@ -25,7 +25,9 @@ STATES_MAP = {0: CoverState.CLOSED, 1: CoverState.OPEN}
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the OpenGarage covers."""
     async_add_entities(
diff --git a/homeassistant/components/opengarage/sensor.py b/homeassistant/components/opengarage/sensor.py
index 003e0e0fa5a..14d14dd5d23 100644
--- a/homeassistant/components/opengarage/sensor.py
+++ b/homeassistant/components/opengarage/sensor.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import OpenGarageDataUpdateCoordinator
@@ -59,7 +59,9 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the OpenGarage sensors."""
     open_garage_data_coordinator: OpenGarageDataUpdateCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/openhardwaremonitor/sensor.py b/homeassistant/components/openhardwaremonitor/sensor.py
index 30801a59436..4aa334da3a7 100644
--- a/homeassistant/components/openhardwaremonitor/sensor.py
+++ b/homeassistant/components/openhardwaremonitor/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import CONF_HOST, CONF_PORT
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/openhome/media_player.py b/homeassistant/components/openhome/media_player.py
index 8c903c90bbb..9f8840b8487 100644
--- a/homeassistant/components/openhome/media_player.py
+++ b/homeassistant/components/openhome/media_player.py
@@ -24,7 +24,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import ATTR_PIN_INDEX, DOMAIN, SERVICE_INVOKE_PIN
 
@@ -40,7 +40,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Openhome config entry."""
 
diff --git a/homeassistant/components/openhome/update.py b/homeassistant/components/openhome/update.py
index bbe4fdac3b3..cc210866e64 100644
--- a/homeassistant/components/openhome/update.py
+++ b/homeassistant/components/openhome/update.py
@@ -17,7 +17,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 
@@ -27,7 +27,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up update entities for Reolink component."""
 
diff --git a/homeassistant/components/opensensemap/air_quality.py b/homeassistant/components/opensensemap/air_quality.py
index eb8435751c0..19d19f19a54 100644
--- a/homeassistant/components/opensensemap/air_quality.py
+++ b/homeassistant/components/opensensemap/air_quality.py
@@ -16,8 +16,8 @@ from homeassistant.components.air_quality import (
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/opensky/__init__.py b/homeassistant/components/opensky/__init__.py
index c95dc1283a4..c69cade5842 100644
--- a/homeassistant/components/opensky/__init__.py
+++ b/homeassistant/components/opensky/__init__.py
@@ -32,7 +32,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         except OpenSkyError as exc:
             raise ConfigEntryNotReady from exc
 
-    coordinator = OpenSkyDataUpdateCoordinator(hass, client)
+    coordinator = OpenSkyDataUpdateCoordinator(hass, entry, client)
     await coordinator.async_config_entry_first_refresh()
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
 
diff --git a/homeassistant/components/opensky/config_flow.py b/homeassistant/components/opensky/config_flow.py
index 867a4781265..5e53a805753 100644
--- a/homeassistant/components/opensky/config_flow.py
+++ b/homeassistant/components/opensky/config_flow.py
@@ -23,8 +23,8 @@ from homeassistant.const import (
     CONF_USERNAME,
 )
 from homeassistant.core import callback
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 
 from .const import (
     CONF_ALTITUDE,
diff --git a/homeassistant/components/opensky/coordinator.py b/homeassistant/components/opensky/coordinator.py
index f54e01b0006..f9aab88c904 100644
--- a/homeassistant/components/opensky/coordinator.py
+++ b/homeassistant/components/opensky/coordinator.py
@@ -36,11 +36,14 @@ class OpenSkyDataUpdateCoordinator(DataUpdateCoordinator[int]):
 
     config_entry: ConfigEntry
 
-    def __init__(self, hass: HomeAssistant, opensky: OpenSky) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, opensky: OpenSky
+    ) -> None:
         """Initialize the OpenSky data coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval={
                 True: timedelta(seconds=90),
@@ -50,11 +53,11 @@ class OpenSkyDataUpdateCoordinator(DataUpdateCoordinator[int]):
         self._opensky = opensky
         self._previously_tracked: set[str] | None = None
         self._bounding_box = OpenSky.get_bounding_box(
-            self.config_entry.data[CONF_LATITUDE],
-            self.config_entry.data[CONF_LONGITUDE],
-            self.config_entry.options[CONF_RADIUS],
+            config_entry.data[CONF_LATITUDE],
+            config_entry.data[CONF_LONGITUDE],
+            config_entry.options[CONF_RADIUS],
         )
-        self._altitude = self.config_entry.options.get(CONF_ALTITUDE, DEFAULT_ALTITUDE)
+        self._altitude = config_entry.options.get(CONF_ALTITUDE, DEFAULT_ALTITUDE)
 
     async def _async_update_data(self) -> int:
         try:
diff --git a/homeassistant/components/opensky/sensor.py b/homeassistant/components/opensky/sensor.py
index 9d317ae3e0d..0ab5b49f086 100644
--- a/homeassistant/components/opensky/sensor.py
+++ b/homeassistant/components/opensky/sensor.py
@@ -6,7 +6,7 @@ from homeassistant.components.sensor import SensorEntity, SensorStateClass
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, MANUFACTURER
@@ -16,7 +16,7 @@ from .coordinator import OpenSkyDataUpdateCoordinator
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize the entries."""
 
diff --git a/homeassistant/components/opentherm_gw/__init__.py b/homeassistant/components/opentherm_gw/__init__.py
index 8c92c70ab49..87da159872d 100644
--- a/homeassistant/components/opentherm_gw/__init__.py
+++ b/homeassistant/components/opentherm_gw/__init__.py
@@ -9,8 +9,7 @@ import pyotgw.vars as gw_vars
 from serial import SerialException
 import voluptuous as vol
 
-from homeassistant.components.climate import DOMAIN as CLIMATE_DOMAIN
-from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_DATE,
     ATTR_ID,
@@ -21,21 +20,12 @@ from homeassistant.const import (
     CONF_ID,
     CONF_NAME,
     EVENT_HOMEASSISTANT_STOP,
-    PRECISION_HALVES,
-    PRECISION_TENTHS,
-    PRECISION_WHOLE,
     Platform,
 )
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import (
-    config_validation as cv,
-    device_registry as dr,
-    entity_registry as er,
-    issue_registry as ir,
-)
+from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.dispatcher import async_dispatcher_send
-from homeassistant.helpers.typing import ConfigType
 
 from .const import (
     ATTR_CH_OVRD,
@@ -44,9 +34,6 @@ from .const import (
     ATTR_LEVEL,
     ATTR_TRANSP_ARG,
     ATTR_TRANSP_CMD,
-    CONF_CLIMATE,
-    CONF_FLOOR_TEMP,
-    CONF_PRECISION,
     CONF_TEMPORARY_OVRD_MODE,
     CONNECTION_TIMEOUT,
     DATA_GATEWAYS,
@@ -70,29 +57,6 @@ from .const import (
 
 _LOGGER = logging.getLogger(__name__)
 
-# *_SCHEMA required for deprecated import from configuration.yaml, can be removed in 2025.4.0
-CLIMATE_SCHEMA = vol.Schema(
-    {
-        vol.Optional(CONF_PRECISION): vol.In(
-            [PRECISION_TENTHS, PRECISION_HALVES, PRECISION_WHOLE]
-        ),
-        vol.Optional(CONF_FLOOR_TEMP, default=False): cv.boolean,
-    }
-)
-
-CONFIG_SCHEMA = vol.Schema(
-    {
-        DOMAIN: cv.schema_with_slug_keys(
-            {
-                vol.Required(CONF_DEVICE): cv.string,
-                vol.Optional(CONF_CLIMATE, default={}): CLIMATE_SCHEMA,
-                vol.Optional(CONF_NAME): cv.string,
-            }
-        )
-    },
-    extra=vol.ALLOW_EXTRA,
-)
-
 PLATFORMS = [
     Platform.BINARY_SENSOR,
     Platform.BUTTON,
@@ -118,35 +82,6 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     gateway = OpenThermGatewayHub(hass, config_entry)
     hass.data[DATA_OPENTHERM_GW][DATA_GATEWAYS][config_entry.data[CONF_ID]] = gateway
 
-    # Migration can be removed in 2025.4.0
-    dev_reg = dr.async_get(hass)
-    if (
-        migrate_device := dev_reg.async_get_device(
-            {(DOMAIN, config_entry.data[CONF_ID])}
-        )
-    ) is not None:
-        dev_reg.async_update_device(
-            migrate_device.id,
-            new_identifiers={
-                (
-                    DOMAIN,
-                    f"{config_entry.data[CONF_ID]}-{OpenThermDeviceIdentifier.GATEWAY}",
-                )
-            },
-        )
-
-    # Migration can be removed in 2025.4.0
-    ent_reg = er.async_get(hass)
-    if (
-        entity_id := ent_reg.async_get_entity_id(
-            CLIMATE_DOMAIN, DOMAIN, config_entry.data[CONF_ID]
-        )
-    ) is not None:
-        ent_reg.async_update_entity(
-            entity_id,
-            new_unique_id=f"{config_entry.data[CONF_ID]}-{OpenThermDeviceIdentifier.THERMOSTAT}-thermostat_entity",
-        )
-
     config_entry.add_update_listener(options_updated)
 
     try:
@@ -164,33 +99,6 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     return True
 
 
-# Deprecated import from configuration.yaml, can be removed in 2025.4.0
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the OpenTherm Gateway component."""
-    if DOMAIN in config:
-        ir.async_create_issue(
-            hass,
-            DOMAIN,
-            "deprecated_import_from_configuration_yaml",
-            breaks_in_ha_version="2025.4.0",
-            is_fixable=False,
-            is_persistent=False,
-            severity=ir.IssueSeverity.WARNING,
-            translation_key="deprecated_import_from_configuration_yaml",
-        )
-    if not hass.config_entries.async_entries(DOMAIN) and DOMAIN in config:
-        conf = config[DOMAIN]
-        for device_id, device_config in conf.items():
-            device_config[CONF_ID] = device_id
-
-            hass.async_create_task(
-                hass.config_entries.flow.async_init(
-                    DOMAIN, context={"source": SOURCE_IMPORT}, data=device_config
-                )
-            )
-    return True
-
-
 def register_services(hass: HomeAssistant) -> None:
     """Register services for the component."""
     service_reset_schema = vol.Schema(
diff --git a/homeassistant/components/opentherm_gw/binary_sensor.py b/homeassistant/components/opentherm_gw/binary_sensor.py
index 5d542bedc07..8e73392da05 100644
--- a/homeassistant/components/opentherm_gw/binary_sensor.py
+++ b/homeassistant/components/opentherm_gw/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ID, EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     BOILER_DEVICE_DESCRIPTION,
@@ -393,7 +393,7 @@ BINARY_SENSOR_DESCRIPTIONS: tuple[OpenThermBinarySensorEntityDescription, ...] =
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the OpenTherm Gateway binary sensors."""
     gw_hub = hass.data[DATA_OPENTHERM_GW][DATA_GATEWAYS][config_entry.data[CONF_ID]]
diff --git a/homeassistant/components/opentherm_gw/button.py b/homeassistant/components/opentherm_gw/button.py
index 00b91ad33e0..046b44bfa8c 100644
--- a/homeassistant/components/opentherm_gw/button.py
+++ b/homeassistant/components/opentherm_gw/button.py
@@ -13,7 +13,7 @@ from homeassistant.components.button import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ID, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import OpenThermGatewayHub
 from .const import (
@@ -53,7 +53,7 @@ BUTTON_DESCRIPTIONS: tuple[OpenThermButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the OpenTherm Gateway buttons."""
     gw_hub = hass.data[DATA_OPENTHERM_GW][DATA_GATEWAYS][config_entry.data[CONF_ID]]
diff --git a/homeassistant/components/opentherm_gw/climate.py b/homeassistant/components/opentherm_gw/climate.py
index e8aa99f7325..c69151c293a 100644
--- a/homeassistant/components/opentherm_gw/climate.py
+++ b/homeassistant/components/opentherm_gw/climate.py
@@ -22,7 +22,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, CONF_ID, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import OpenThermGatewayHub
 from .const import (
@@ -50,7 +50,7 @@ class OpenThermClimateEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up an OpenTherm Gateway climate entity."""
     ents = []
diff --git a/homeassistant/components/opentherm_gw/config_flow.py b/homeassistant/components/opentherm_gw/config_flow.py
index 80c16ee88e1..a100dcb730f 100644
--- a/homeassistant/components/opentherm_gw/config_flow.py
+++ b/homeassistant/components/opentherm_gw/config_flow.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
     PRECISION_WHOLE,
 )
 from homeassistant.core import callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from . import DOMAIN
 from .const import (
@@ -95,19 +95,6 @@ class OpenThermGwConfigFlow(ConfigFlow, domain=DOMAIN):
         """Handle manual initiation of the config flow."""
         return await self.async_step_init(user_input)
 
-    # Deprecated import from configuration.yaml, can be removed in 2025.4.0
-    async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
-        """Import an OpenTherm Gateway device as a config entry.
-
-        This flow is triggered by `async_setup` for configured devices.
-        """
-        formatted_config = {
-            CONF_NAME: import_data.get(CONF_NAME, import_data[CONF_ID]),
-            CONF_DEVICE: import_data[CONF_DEVICE],
-            CONF_ID: import_data[CONF_ID],
-        }
-        return await self.async_step_init(info=formatted_config)
-
     def _show_form(self, errors: dict[str, str] | None = None) -> ConfigFlowResult:
         """Show the config flow form with possible errors."""
         return self.async_show_form(
diff --git a/homeassistant/components/opentherm_gw/select.py b/homeassistant/components/opentherm_gw/select.py
index cee1632dc48..da3fa1e80ec 100644
--- a/homeassistant/components/opentherm_gw/select.py
+++ b/homeassistant/components/opentherm_gw/select.py
@@ -20,7 +20,7 @@ from homeassistant.components.select import SelectEntity, SelectEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ID, EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import OpenThermGatewayHub
 from .const import (
@@ -234,7 +234,7 @@ SELECT_DESCRIPTIONS: tuple[OpenThermSelectEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the OpenTherm Gateway select entities."""
     gw_hub = hass.data[DATA_OPENTHERM_GW][DATA_GATEWAYS][config_entry.data[CONF_ID]]
diff --git a/homeassistant/components/opentherm_gw/sensor.py b/homeassistant/components/opentherm_gw/sensor.py
index 5ccb4166665..f9ac1b272be 100644
--- a/homeassistant/components/opentherm_gw/sensor.py
+++ b/homeassistant/components/opentherm_gw/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     UnitOfVolumeFlowRate,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     BOILER_DEVICE_DESCRIPTION,
@@ -875,7 +875,7 @@ SENSOR_DESCRIPTIONS: tuple[OpenThermSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the OpenTherm Gateway sensors."""
     gw_hub = hass.data[DATA_OPENTHERM_GW][DATA_GATEWAYS][config_entry.data[CONF_ID]]
diff --git a/homeassistant/components/opentherm_gw/strings.json b/homeassistant/components/opentherm_gw/strings.json
index 405af126c03..cc57a7d9e0c 100644
--- a/homeassistant/components/opentherm_gw/strings.json
+++ b/homeassistant/components/opentherm_gw/strings.json
@@ -354,12 +354,6 @@
       }
     }
   },
-  "issues": {
-    "deprecated_import_from_configuration_yaml": {
-      "title": "Deprecated configuration",
-      "description": "Configuration of the OpenTherm Gateway integration through configuration.yaml is deprecated. Your configuration has been migrated to config entries. Please remove any OpenTherm Gateway configuration from your configuration.yaml."
-    }
-  },
   "options": {
     "step": {
       "init": {
@@ -385,7 +379,7 @@
     },
     "set_central_heating_ovrd": {
       "name": "Set central heating override",
-      "description": "Sets the central heating override option on the gateway. When overriding the control setpoint (via a set_control_setpoint action with a value other than 0), the gateway automatically enables the central heating override to start heating. This action can then be used to control the central heating override status. To return control of the central heating to the thermostat, use the set_control_setpoint action with temperature value 0. You will only need this if you are writing your own software thermostat.",
+      "description": "Sets the central heating override option on the gateway. When overriding the control setpoint (via a 'Set control set point' action with a value other than 0), the gateway automatically enables the central heating override to start heating. This action can then be used to control the central heating override status. To return control of the central heating to the thermostat, use the 'Set control set point' action with temperature value 0. You will only need this if you are writing your own software thermostat.",
       "fields": {
         "gateway_id": {
           "name": "[%key:component::opentherm_gw::services::reset_gateway::fields::gateway_id::name%]",
@@ -393,7 +387,7 @@
         },
         "ch_override": {
           "name": "Central heating override",
-          "description": "The desired boolean value for the central heating override."
+          "description": "Whether to enable or disable the override."
         }
       }
     },
diff --git a/homeassistant/components/opentherm_gw/switch.py b/homeassistant/components/opentherm_gw/switch.py
index 41ffa03a932..873675f0211 100644
--- a/homeassistant/components/opentherm_gw/switch.py
+++ b/homeassistant/components/opentherm_gw/switch.py
@@ -8,7 +8,7 @@ from homeassistant.components.switch import SwitchEntity, SwitchEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ID, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import OpenThermGatewayHub
 from .const import DATA_GATEWAYS, DATA_OPENTHERM_GW, GATEWAY_DEVICE_DESCRIPTION
@@ -48,7 +48,7 @@ SWITCH_DESCRIPTIONS: tuple[OpenThermSwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the OpenTherm Gateway switches."""
     gw_hub = hass.data[DATA_OPENTHERM_GW][DATA_GATEWAYS][config_entry.data[CONF_ID]]
diff --git a/homeassistant/components/openuv/binary_sensor.py b/homeassistant/components/openuv/binary_sensor.py
index 018d91710df..f45404ce38e 100644
--- a/homeassistant/components/openuv/binary_sensor.py
+++ b/homeassistant/components/openuv/binary_sensor.py
@@ -6,7 +6,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.dt import as_local, parse_datetime, utcnow
 
 from .const import DATA_PROTECTION_WINDOW, DOMAIN, LOGGER, TYPE_PROTECTION_WINDOW
@@ -25,7 +25,9 @@ BINARY_SENSOR_DESCRIPTION_PROTECTION_WINDOW = BinarySensorEntityDescription(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     # Once we've successfully authenticated, we re-enable client request retries:
     """Set up an OpenUV sensor based on a config entry."""
diff --git a/homeassistant/components/openuv/coordinator.py b/homeassistant/components/openuv/coordinator.py
index 32d502cb8ce..cc09161b3e9 100644
--- a/homeassistant/components/openuv/coordinator.py
+++ b/homeassistant/components/openuv/coordinator.py
@@ -38,6 +38,7 @@ class OpenUvCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         super().__init__(
             hass,
             LOGGER,
+            config_entry=entry,
             name=name,
             update_method=update_method,
             request_refresh_debouncer=Debouncer(
@@ -48,7 +49,6 @@ class OpenUvCoordinator(DataUpdateCoordinator[dict[str, Any]]):
             ),
         )
 
-        self._entry = entry
         self.latitude = latitude
         self.longitude = longitude
 
diff --git a/homeassistant/components/openuv/sensor.py b/homeassistant/components/openuv/sensor.py
index 742017be639..5b681655e2b 100644
--- a/homeassistant/components/openuv/sensor.py
+++ b/homeassistant/components/openuv/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UV_INDEX, UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.dt import as_local, parse_datetime
 
 from .const import (
@@ -166,7 +166,9 @@ SENSOR_DESCRIPTIONS = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a OpenUV sensor based on a config entry."""
     coordinators: dict[str, OpenUvCoordinator] = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/openweathermap/__init__.py b/homeassistant/components/openweathermap/__init__.py
index 33cd23c4f6c..40ddf0ff37e 100644
--- a/homeassistant/components/openweathermap/__init__.py
+++ b/homeassistant/components/openweathermap/__init__.py
@@ -8,17 +8,10 @@ import logging
 from pyopenweathermap import create_owm_client
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import (
-    CONF_API_KEY,
-    CONF_LANGUAGE,
-    CONF_LATITUDE,
-    CONF_LONGITUDE,
-    CONF_MODE,
-    CONF_NAME,
-)
+from homeassistant.const import CONF_API_KEY, CONF_LANGUAGE, CONF_MODE, CONF_NAME
 from homeassistant.core import HomeAssistant
 
-from .const import CONFIG_FLOW_VERSION, OWM_MODE_V25, PLATFORMS
+from .const import CONFIG_FLOW_VERSION, DEFAULT_OWM_MODE, OWM_MODES, PLATFORMS
 from .coordinator import WeatherUpdateCoordinator
 from .repairs import async_create_issue, async_delete_issue
 from .utils import build_data_and_options
@@ -43,20 +36,16 @@ async def async_setup_entry(
     """Set up OpenWeatherMap as config entry."""
     name = entry.data[CONF_NAME]
     api_key = entry.data[CONF_API_KEY]
-    latitude = entry.data.get(CONF_LATITUDE, hass.config.latitude)
-    longitude = entry.data.get(CONF_LONGITUDE, hass.config.longitude)
     language = entry.options[CONF_LANGUAGE]
     mode = entry.options[CONF_MODE]
 
-    if mode == OWM_MODE_V25:
+    if mode not in OWM_MODES:
         async_create_issue(hass, entry.entry_id)
     else:
         async_delete_issue(hass, entry.entry_id)
 
     owm_client = create_owm_client(api_key, mode, lang=language)
-    weather_coordinator = WeatherUpdateCoordinator(
-        owm_client, latitude, longitude, hass
-    )
+    weather_coordinator = WeatherUpdateCoordinator(hass, entry, owm_client)
 
     await weather_coordinator.async_config_entry_first_refresh()
 
@@ -69,7 +58,9 @@ async def async_setup_entry(
     return True
 
 
-async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_migrate_entry(
+    hass: HomeAssistant, entry: OpenweathermapConfigEntry
+) -> bool:
     """Migrate old entry."""
     config_entries = hass.config_entries
     data = entry.data
@@ -79,7 +70,7 @@ async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     _LOGGER.debug("Migrating OpenWeatherMap entry from version %s", version)
 
     if version < 5:
-        combined_data = {**data, **options, CONF_MODE: OWM_MODE_V25}
+        combined_data = {**data, **options, CONF_MODE: DEFAULT_OWM_MODE}
         new_data, new_options = build_data_and_options(combined_data)
         config_entries.async_update_entry(
             entry,
@@ -93,7 +84,9 @@ async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return True
 
 
-async def async_update_options(hass: HomeAssistant, entry: ConfigEntry) -> None:
+async def async_update_options(
+    hass: HomeAssistant, entry: OpenweathermapConfigEntry
+) -> None:
     """Update options."""
     await hass.config_entries.async_reload(entry.entry_id)
 
diff --git a/homeassistant/components/openweathermap/config_flow.py b/homeassistant/components/openweathermap/config_flow.py
index 8d33e117287..4c66778119e 100644
--- a/homeassistant/components/openweathermap/config_flow.py
+++ b/homeassistant/components/openweathermap/config_flow.py
@@ -19,7 +19,7 @@ from homeassistant.const import (
     CONF_NAME,
 )
 from homeassistant.core import callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import (
     CONFIG_FLOW_VERSION,
diff --git a/homeassistant/components/openweathermap/const.py b/homeassistant/components/openweathermap/const.py
index 81a6544c7ce..fbd2cb1aee2 100644
--- a/homeassistant/components/openweathermap/const.py
+++ b/homeassistant/components/openweathermap/const.py
@@ -48,6 +48,7 @@ ATTR_API_WEATHER_CODE = "weather_code"
 ATTR_API_CLOUD_COVERAGE = "cloud_coverage"
 ATTR_API_FORECAST = "forecast"
 ATTR_API_CURRENT = "current"
+ATTR_API_MINUTE_FORECAST = "minute_forecast"
 ATTR_API_HOURLY_FORECAST = "hourly_forecast"
 ATTR_API_DAILY_FORECAST = "daily_forecast"
 UPDATE_LISTENER = "update_listener"
@@ -61,10 +62,8 @@ FORECAST_MODE_ONECALL_DAILY = "onecall_daily"
 OWM_MODE_FREE_CURRENT = "current"
 OWM_MODE_FREE_FORECAST = "forecast"
 OWM_MODE_V30 = "v3.0"
-OWM_MODE_V25 = "v2.5"
 OWM_MODES = [
     OWM_MODE_V30,
-    OWM_MODE_V25,
     OWM_MODE_FREE_CURRENT,
     OWM_MODE_FREE_FORECAST,
 ]
diff --git a/homeassistant/components/openweathermap/coordinator.py b/homeassistant/components/openweathermap/coordinator.py
index 3ef0eda0c8f..994949b5e03 100644
--- a/homeassistant/components/openweathermap/coordinator.py
+++ b/homeassistant/components/openweathermap/coordinator.py
@@ -1,12 +1,16 @@
 """Weather data coordinator for the OpenWeatherMap (OWM) service."""
 
+from __future__ import annotations
+
 from datetime import timedelta
 import logging
+from typing import TYPE_CHECKING
 
 from pyopenweathermap import (
     CurrentWeather,
     DailyWeatherForecast,
     HourlyWeatherForecast,
+    MinutelyWeatherForecast,
     OWMClient,
     RequestError,
     WeatherReport,
@@ -17,20 +21,28 @@ from homeassistant.components.weather import (
     ATTR_CONDITION_SUNNY,
     Forecast,
 )
+from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import sun
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from homeassistant.util import dt as dt_util
 
+if TYPE_CHECKING:
+    from . import OpenweathermapConfigEntry
+
 from .const import (
     ATTR_API_CLOUDS,
     ATTR_API_CONDITION,
     ATTR_API_CURRENT,
     ATTR_API_DAILY_FORECAST,
+    ATTR_API_DATETIME,
     ATTR_API_DEW_POINT,
     ATTR_API_FEELS_LIKE_TEMPERATURE,
+    ATTR_API_FORECAST,
     ATTR_API_HOURLY_FORECAST,
     ATTR_API_HUMIDITY,
+    ATTR_API_MINUTE_FORECAST,
+    ATTR_API_PRECIPITATION,
     ATTR_API_PRECIPITATION_KIND,
     ATTR_API_PRESSURE,
     ATTR_API_RAIN,
@@ -56,20 +68,25 @@ WEATHER_UPDATE_INTERVAL = timedelta(minutes=10)
 class WeatherUpdateCoordinator(DataUpdateCoordinator):
     """Weather data update coordinator."""
 
+    config_entry: OpenweathermapConfigEntry
+
     def __init__(
         self,
-        owm_client: OWMClient,
-        latitude,
-        longitude,
         hass: HomeAssistant,
+        config_entry: OpenweathermapConfigEntry,
+        owm_client: OWMClient,
     ) -> None:
         """Initialize coordinator."""
         self._owm_client = owm_client
-        self._latitude = latitude
-        self._longitude = longitude
+        self._latitude = config_entry.data.get(CONF_LATITUDE, hass.config.latitude)
+        self._longitude = config_entry.data.get(CONF_LONGITUDE, hass.config.longitude)
 
         super().__init__(
-            hass, _LOGGER, name=DOMAIN, update_interval=WEATHER_UPDATE_INTERVAL
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=WEATHER_UPDATE_INTERVAL,
         )
 
     async def _async_update_data(self):
@@ -94,6 +111,11 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
 
         return {
             ATTR_API_CURRENT: current_weather,
+            ATTR_API_MINUTE_FORECAST: (
+                self._get_minute_weather_data(weather_report.minutely_forecast)
+                if weather_report.minutely_forecast is not None
+                else {}
+            ),
             ATTR_API_HOURLY_FORECAST: [
                 self._get_hourly_forecast_weather_data(item)
                 for item in weather_report.hourly_forecast
@@ -104,6 +126,20 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
             ],
         }
 
+    def _get_minute_weather_data(
+        self, minute_forecast: list[MinutelyWeatherForecast]
+    ) -> dict:
+        """Get minute weather data from the forecast."""
+        return {
+            ATTR_API_FORECAST: [
+                {
+                    ATTR_API_DATETIME: item.date_time,
+                    ATTR_API_PRECIPITATION: round(item.precipitation, 2),
+                }
+                for item in minute_forecast
+            ]
+        }
+
     def _get_current_weather_data(self, current_weather: CurrentWeather):
         return {
             ATTR_API_CONDITION: self._get_condition(current_weather.condition.id),
diff --git a/homeassistant/components/openweathermap/icons.json b/homeassistant/components/openweathermap/icons.json
new file mode 100644
index 00000000000..d493b1538ba
--- /dev/null
+++ b/homeassistant/components/openweathermap/icons.json
@@ -0,0 +1,7 @@
+{
+  "services": {
+    "get_minute_forecast": {
+      "service": "mdi:weather-snowy-rainy"
+    }
+  }
+}
diff --git a/homeassistant/components/openweathermap/manifest.json b/homeassistant/components/openweathermap/manifest.json
index 14313a5a77e..88510aaae8c 100644
--- a/homeassistant/components/openweathermap/manifest.json
+++ b/homeassistant/components/openweathermap/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/openweathermap",
   "iot_class": "cloud_polling",
   "loggers": ["pyopenweathermap"],
-  "requirements": ["pyopenweathermap==0.2.1"]
+  "requirements": ["pyopenweathermap==0.2.2"]
 }
diff --git a/homeassistant/components/openweathermap/repairs.py b/homeassistant/components/openweathermap/repairs.py
index c54484e1e1e..2bde5750ca4 100644
--- a/homeassistant/components/openweathermap/repairs.py
+++ b/homeassistant/components/openweathermap/repairs.py
@@ -1,14 +1,18 @@
 """Issues for OpenWeatherMap."""
 
-from typing import cast
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, cast
 
 from homeassistant import data_entry_flow
 from homeassistant.components.repairs import RepairsFlow
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_MODE
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import issue_registry as ir
 
+if TYPE_CHECKING:
+    from . import OpenweathermapConfigEntry
+
 from .const import DOMAIN, OWM_MODE_V30
 from .utils import validate_api_key
 
@@ -16,7 +20,7 @@ from .utils import validate_api_key
 class DeprecatedV25RepairFlow(RepairsFlow):
     """Handler for an issue fixing flow."""
 
-    def __init__(self, entry: ConfigEntry) -> None:
+    def __init__(self, entry: OpenweathermapConfigEntry) -> None:
         """Create flow."""
         super().__init__()
         self.entry = entry
diff --git a/homeassistant/components/openweathermap/sensor.py b/homeassistant/components/openweathermap/sensor.py
index 46789f4b3d2..a595652d90b 100644
--- a/homeassistant/components/openweathermap/sensor.py
+++ b/homeassistant/components/openweathermap/sensor.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -89,7 +89,8 @@ WEATHER_SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
         key=ATTR_API_WIND_BEARING,
         name="Wind bearing",
         native_unit_of_measurement=DEGREE,
-        state_class=SensorStateClass.MEASUREMENT,
+        state_class=SensorStateClass.MEASUREMENT_ANGLE,
+        device_class=SensorDeviceClass.WIND_DIRECTION,
     ),
     SensorEntityDescription(
         key=ATTR_API_HUMIDITY,
@@ -156,7 +157,7 @@ WEATHER_SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: OpenweathermapConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up OpenWeatherMap sensor entities based on a config entry."""
     domain_data = config_entry.runtime_data
diff --git a/homeassistant/components/openweathermap/services.yaml b/homeassistant/components/openweathermap/services.yaml
new file mode 100644
index 00000000000..6bbcf1b23e4
--- /dev/null
+++ b/homeassistant/components/openweathermap/services.yaml
@@ -0,0 +1,5 @@
+get_minute_forecast:
+  target:
+    entity:
+      domain: weather
+      integration: openweathermap
diff --git a/homeassistant/components/openweathermap/strings.json b/homeassistant/components/openweathermap/strings.json
index 46b5feab75c..1aa161c87dc 100644
--- a/homeassistant/components/openweathermap/strings.json
+++ b/homeassistant/components/openweathermap/strings.json
@@ -47,5 +47,16 @@
         }
       }
     }
+  },
+  "services": {
+    "get_minute_forecast": {
+      "name": "Get minute forecast",
+      "description": "Retrieves a minute-by-minute weather forecast for one hour."
+    }
+  },
+  "exceptions": {
+    "service_minute_forecast_mode": {
+      "message": "Minute forecast is available only when {name} mode is set to v3.0"
+    }
   }
 }
diff --git a/homeassistant/components/openweathermap/weather.py b/homeassistant/components/openweathermap/weather.py
index 3a134a0ee26..12d883c871a 100644
--- a/homeassistant/components/openweathermap/weather.py
+++ b/homeassistant/components/openweathermap/weather.py
@@ -14,9 +14,11 @@ from homeassistant.const import (
     UnitOfSpeed,
     UnitOfTemperature,
 )
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import HomeAssistant, SupportsResponse, callback
+from homeassistant.exceptions import ServiceValidationError
+from homeassistant.helpers import entity_platform
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import OpenweathermapConfigEntry
 from .const import (
@@ -28,6 +30,7 @@ from .const import (
     ATTR_API_FEELS_LIKE_TEMPERATURE,
     ATTR_API_HOURLY_FORECAST,
     ATTR_API_HUMIDITY,
+    ATTR_API_MINUTE_FORECAST,
     ATTR_API_PRESSURE,
     ATTR_API_TEMPERATURE,
     ATTR_API_VISIBILITY_DISTANCE,
@@ -39,16 +42,17 @@ from .const import (
     DOMAIN,
     MANUFACTURER,
     OWM_MODE_FREE_FORECAST,
-    OWM_MODE_V25,
     OWM_MODE_V30,
 )
 from .coordinator import WeatherUpdateCoordinator
 
+SERVICE_GET_MINUTE_FORECAST = "get_minute_forecast"
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: OpenweathermapConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up OpenWeatherMap weather entity based on a config entry."""
     domain_data = config_entry.runtime_data
@@ -61,6 +65,14 @@ async def async_setup_entry(
 
     async_add_entities([owm_weather], False)
 
+    platform = entity_platform.async_get_current_platform()
+    platform.async_register_entity_service(
+        name=SERVICE_GET_MINUTE_FORECAST,
+        schema=None,
+        func="async_get_minute_forecast",
+        supports_response=SupportsResponse.ONLY,
+    )
+
 
 class OpenWeatherMapWeather(SingleCoordinatorWeatherEntity[WeatherUpdateCoordinator]):
     """Implementation of an OpenWeatherMap sensor."""
@@ -91,8 +103,9 @@ class OpenWeatherMapWeather(SingleCoordinatorWeatherEntity[WeatherUpdateCoordina
             manufacturer=MANUFACTURER,
             name=DEFAULT_NAME,
         )
+        self.mode = mode
 
-        if mode in (OWM_MODE_V30, OWM_MODE_V25):
+        if mode == OWM_MODE_V30:
             self._attr_supported_features = (
                 WeatherEntityFeature.FORECAST_DAILY
                 | WeatherEntityFeature.FORECAST_HOURLY
@@ -100,6 +113,17 @@ class OpenWeatherMapWeather(SingleCoordinatorWeatherEntity[WeatherUpdateCoordina
         elif mode == OWM_MODE_FREE_FORECAST:
             self._attr_supported_features = WeatherEntityFeature.FORECAST_HOURLY
 
+    async def async_get_minute_forecast(self) -> dict[str, list[dict]] | dict:
+        """Return Minute forecast."""
+
+        if self.mode == OWM_MODE_V30:
+            return self.coordinator.data[ATTR_API_MINUTE_FORECAST]
+        raise ServiceValidationError(
+            translation_domain=DOMAIN,
+            translation_key="service_minute_forecast_mode",
+            translation_placeholders={"name": DEFAULT_NAME},
+        )
+
     @property
     def condition(self) -> str | None:
         """Return the current condition."""
diff --git a/homeassistant/components/opnsense/__init__.py b/homeassistant/components/opnsense/__init__.py
index d2ee2e2dfbd..66f35a51b87 100644
--- a/homeassistant/components/opnsense/__init__.py
+++ b/homeassistant/components/opnsense/__init__.py
@@ -8,7 +8,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_API_KEY, CONF_URL, CONF_VERIFY_SSL, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import load_platform
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/opower/__init__.py b/homeassistant/components/opower/__init__.py
index 136a1a4e57a..23c8e7a8136 100644
--- a/homeassistant/components/opower/__init__.py
+++ b/homeassistant/components/opower/__init__.py
@@ -2,22 +2,18 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-from .coordinator import OpowerCoordinator
+from .coordinator import OpowerConfigEntry, OpowerCoordinator
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
 
-type OpowerConfigEntry = ConfigEntry[OpowerCoordinator]
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: OpowerConfigEntry) -> bool:
     """Set up Opower from a config entry."""
 
-    coordinator = OpowerCoordinator(hass, entry.data)
+    coordinator = OpowerCoordinator(hass, entry)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
 
diff --git a/homeassistant/components/opower/coordinator.py b/homeassistant/components/opower/coordinator.py
index f6f3524d630..e8b6dbf9718 100644
--- a/homeassistant/components/opower/coordinator.py
+++ b/homeassistant/components/opower/coordinator.py
@@ -2,29 +2,31 @@
 
 from datetime import datetime, timedelta
 import logging
-from types import MappingProxyType
-from typing import Any, cast
+from typing import cast
 
-import aiohttp
 from opower import (
     Account,
     AggregateType,
-    CannotConnect,
     CostRead,
     Forecast,
-    InvalidAuth,
     MeterType,
     Opower,
     ReadResolution,
 )
+from opower.exceptions import ApiException, CannotConnect, InvalidAuth
 
 from homeassistant.components.recorder import get_instance
-from homeassistant.components.recorder.models import StatisticData, StatisticMetaData
+from homeassistant.components.recorder.models import (
+    StatisticData,
+    StatisticMeanType,
+    StatisticMetaData,
+)
 from homeassistant.components.recorder.statistics import (
     async_add_external_statistics,
     get_last_statistics,
     statistics_during_period,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, UnitOfEnergy, UnitOfVolume
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed
@@ -36,19 +38,24 @@ from .const import CONF_TOTP_SECRET, CONF_UTILITY, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
+type OpowerConfigEntry = ConfigEntry[OpowerCoordinator]
+
 
 class OpowerCoordinator(DataUpdateCoordinator[dict[str, Forecast]]):
     """Handle fetching Opower data, updating sensors and inserting statistics."""
 
+    config_entry: OpowerConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
-        entry_data: MappingProxyType[str, Any],
+        config_entry: OpowerConfigEntry,
     ) -> None:
         """Initialize the data handler."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="Opower",
             # Data is updated daily on Opower.
             # Refresh every 12h to be at most 12h behind.
@@ -56,10 +63,10 @@ class OpowerCoordinator(DataUpdateCoordinator[dict[str, Forecast]]):
         )
         self.api = Opower(
             aiohttp_client.async_get_clientsession(hass),
-            entry_data[CONF_UTILITY],
-            entry_data[CONF_USERNAME],
-            entry_data[CONF_PASSWORD],
-            entry_data.get(CONF_TOTP_SECRET),
+            config_entry.data[CONF_UTILITY],
+            config_entry.data[CONF_USERNAME],
+            config_entry.data[CONF_PASSWORD],
+            config_entry.data.get(CONF_TOTP_SECRET),
         )
 
         @callback
@@ -89,7 +96,7 @@ class OpowerCoordinator(DataUpdateCoordinator[dict[str, Forecast]]):
             raise UpdateFailed(f"Error during login: {err}") from err
         try:
             forecasts: list[Forecast] = await self.api.async_get_forecast()
-        except aiohttp.ClientError as err:
+        except ApiException as err:
             _LOGGER.error("Error getting forecasts: %s", err)
             raise
         _LOGGER.debug("Updating sensor data with: %s", forecasts)
@@ -102,7 +109,7 @@ class OpowerCoordinator(DataUpdateCoordinator[dict[str, Forecast]]):
         """Insert Opower statistics."""
         try:
             accounts = await self.api.async_get_accounts()
-        except aiohttp.ClientError as err:
+        except ApiException as err:
             _LOGGER.error("Error getting accounts: %s", err)
             raise
         for account in accounts:
@@ -198,7 +205,7 @@ class OpowerCoordinator(DataUpdateCoordinator[dict[str, Forecast]]):
                 f"{account.meter_type.name.lower()} {account.utility_account_id}"
             )
             cost_metadata = StatisticMetaData(
-                has_mean=False,
+                mean_type=StatisticMeanType.NONE,
                 has_sum=True,
                 name=f"{name_prefix} cost",
                 source=DOMAIN,
@@ -206,7 +213,7 @@ class OpowerCoordinator(DataUpdateCoordinator[dict[str, Forecast]]):
                 unit_of_measurement=None,
             )
             consumption_metadata = StatisticMetaData(
-                has_mean=False,
+                mean_type=StatisticMeanType.NONE,
                 has_sum=True,
                 name=f"{name_prefix} consumption",
                 source=DOMAIN,
@@ -271,7 +278,7 @@ class OpowerCoordinator(DataUpdateCoordinator[dict[str, Forecast]]):
             cost_reads = await self.api.async_get_cost_reads(
                 account, AggregateType.BILL, start, end
             )
-        except aiohttp.ClientError as err:
+        except ApiException as err:
             _LOGGER.error("Error getting monthly cost reads: %s", err)
             raise
         _LOGGER.debug("Got %s monthly cost reads", len(cost_reads))
@@ -290,7 +297,7 @@ class OpowerCoordinator(DataUpdateCoordinator[dict[str, Forecast]]):
             daily_cost_reads = await self.api.async_get_cost_reads(
                 account, AggregateType.DAY, start, end
             )
-        except aiohttp.ClientError as err:
+        except ApiException as err:
             _LOGGER.error("Error getting daily cost reads: %s", err)
             raise
         _LOGGER.debug("Got %s daily cost reads", len(daily_cost_reads))
@@ -308,7 +315,7 @@ class OpowerCoordinator(DataUpdateCoordinator[dict[str, Forecast]]):
             hourly_cost_reads = await self.api.async_get_cost_reads(
                 account, AggregateType.HOUR, start, end
             )
-        except aiohttp.ClientError as err:
+        except ApiException as err:
             _LOGGER.error("Error getting hourly cost reads: %s", err)
             raise
         _LOGGER.debug("Got %s hourly cost reads", len(hourly_cost_reads))
diff --git a/homeassistant/components/opower/manifest.json b/homeassistant/components/opower/manifest.json
index bd68cc84d13..2da4511c0aa 100644
--- a/homeassistant/components/opower/manifest.json
+++ b/homeassistant/components/opower/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/opower",
   "iot_class": "cloud_polling",
   "loggers": ["opower"],
-  "requirements": ["opower==0.8.7"]
+  "requirements": ["opower==0.9.0"]
 }
diff --git a/homeassistant/components/opower/sensor.py b/homeassistant/components/opower/sensor.py
index 7f8eb22d1e6..46aa9e9b318 100644
--- a/homeassistant/components/opower/sensor.py
+++ b/homeassistant/components/opower/sensor.py
@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from dataclasses import dataclass
+from datetime import date
 
 from opower import Forecast, MeterType, UnitOfMeasure
 
@@ -16,20 +17,19 @@ from homeassistant.components.sensor import (
 from homeassistant.const import EntityCategory, UnitOfEnergy, UnitOfVolume
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import OpowerConfigEntry
 from .const import DOMAIN
-from .coordinator import OpowerCoordinator
+from .coordinator import OpowerConfigEntry, OpowerCoordinator
 
 
 @dataclass(frozen=True, kw_only=True)
 class OpowerEntityDescription(SensorEntityDescription):
     """Class describing Opower sensors entities."""
 
-    value_fn: Callable[[Forecast], str | float]
+    value_fn: Callable[[Forecast], str | float | date]
 
 
 # suggested_display_precision=0 for all sensors since
@@ -185,7 +185,7 @@ GAS_SENSORS: tuple[OpowerEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: OpowerConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Opower sensor."""
 
@@ -247,7 +247,7 @@ class OpowerSensor(CoordinatorEntity[OpowerCoordinator], SensorEntity):
         self.utility_account_id = utility_account_id
 
     @property
-    def native_value(self) -> StateType:
+    def native_value(self) -> StateType | date:
         """Return the state."""
         if self.coordinator.data is not None:
             return self.entity_description.value_fn(
diff --git a/homeassistant/components/opower/strings.json b/homeassistant/components/opower/strings.json
index 362e6cd7596..749545743fe 100644
--- a/homeassistant/components/opower/strings.json
+++ b/homeassistant/components/opower/strings.json
@@ -11,7 +11,7 @@
       "mfa": {
         "description": "The TOTP secret below is not one of the 6 digit time-based numeric codes. It is a string of around 16 characters containing the shared secret that enables your authenticator app to generate the correct time-based code at the appropriate time. See the documentation.",
         "data": {
-          "totp_secret": "TOTP Secret"
+          "totp_secret": "TOTP secret"
         }
       },
       "reauth_confirm": {
@@ -19,7 +19,7 @@
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
-          "totp_secret": "TOTP Secret"
+          "totp_secret": "[%key:component::opower::config::step::mfa::data::totp_secret%]"
         }
       }
     },
diff --git a/homeassistant/components/opple/light.py b/homeassistant/components/opple/light.py
index da2993d1996..e804f06faa3 100644
--- a/homeassistant/components/opple/light.py
+++ b/homeassistant/components/opple/light.py
@@ -17,7 +17,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import CONF_HOST, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/oralb/config_flow.py b/homeassistant/components/oralb/config_flow.py
index ab5d919194e..bac2d32bb2f 100644
--- a/homeassistant/components/oralb/config_flow.py
+++ b/homeassistant/components/oralb/config_flow.py
@@ -72,7 +72,7 @@ class OralBConfigFlow(ConfigFlow, domain=DOMAIN):
                 title=self._discovered_devices[address], data={}
             )
 
-        current_addresses = self._async_current_ids()
+        current_addresses = self._async_current_ids(include_ignore=False)
         for discovery_info in async_discovered_service_info(self.hass, False):
             address = discovery_info.address
             if address in current_addresses or address in self._discovered_devices:
diff --git a/homeassistant/components/oralb/sensor.py b/homeassistant/components/oralb/sensor.py
index 9994bfc6443..3b345f4b36a 100644
--- a/homeassistant/components/oralb/sensor.py
+++ b/homeassistant/components/oralb/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from . import OralBConfigEntry
@@ -108,7 +108,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: OralBConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the OralB BLE sensors."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/oru/sensor.py b/homeassistant/components/oru/sensor.py
index 213350db6a4..450c56ae50e 100644
--- a/homeassistant/components/oru/sensor.py
+++ b/homeassistant/components/oru/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import UnitOfEnergy
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/orvibo/switch.py b/homeassistant/components/orvibo/switch.py
index 2f990333cf6..211abc838e7 100644
--- a/homeassistant/components/orvibo/switch.py
+++ b/homeassistant/components/orvibo/switch.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     CONF_SWITCHES,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/osoenergy/binary_sensor.py b/homeassistant/components/osoenergy/binary_sensor.py
index 0cf0ac74d36..a2ba61ccbe4 100644
--- a/homeassistant/components/osoenergy/binary_sensor.py
+++ b/homeassistant/components/osoenergy/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import OSOEnergyEntity
@@ -45,7 +45,9 @@ SENSOR_TYPES: dict[str, OSOEnergyBinarySensorEntityDescription] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up OSO Energy binary sensor."""
     osoenergy: OSOEnergy = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/osoenergy/sensor.py b/homeassistant/components/osoenergy/sensor.py
index 40ec33e3e02..18859627952 100644
--- a/homeassistant/components/osoenergy/sensor.py
+++ b/homeassistant/components/osoenergy/sensor.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     UnitOfVolume,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .const import DOMAIN
@@ -138,7 +138,9 @@ SENSOR_TYPES: dict[str, OSOEnergySensorEntityDescription] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up OSO Energy sensor."""
     osoenergy = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/osoenergy/strings.json b/homeassistant/components/osoenergy/strings.json
index ca23265048f..7e10168d941 100644
--- a/homeassistant/components/osoenergy/strings.json
+++ b/homeassistant/components/osoenergy/strings.json
@@ -215,7 +215,7 @@
       "fields": {
         "until_temp_limit": {
           "name": "Until temperature limit",
-          "description": "Choose if heating should be off until min temperature (True) is reached or for one hour (False)"
+          "description": "Whether heating should be off until the minimum temperature is reached instead of for one hour."
         }
       }
     },
@@ -225,7 +225,7 @@
       "fields": {
         "until_temp_limit": {
           "name": "Until temperature limit",
-          "description": "Choose if heating should be on until max temperature (True) is reached or for one hour (False)"
+          "description": "Whether heating should be on until the maximum temperature is reached instead of for one hour."
         }
       }
     }
diff --git a/homeassistant/components/osoenergy/water_heater.py b/homeassistant/components/osoenergy/water_heater.py
index ff117d6577d..07820ee97d5 100644
--- a/homeassistant/components/osoenergy/water_heater.py
+++ b/homeassistant/components/osoenergy/water_heater.py
@@ -19,8 +19,8 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant, ServiceResponse, SupportsResponse
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 from homeassistant.util.json import JsonValueType
 
 from .const import DOMAIN
@@ -49,7 +49,9 @@ SERVICE_TURN_ON = "turn_on"
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up OSO Energy heater based on a config entry."""
     osoenergy = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/osramlightify/light.py b/homeassistant/components/osramlightify/light.py
index 6ddd392af7b..25380810862 100644
--- a/homeassistant/components/osramlightify/light.py
+++ b/homeassistant/components/osramlightify/light.py
@@ -24,10 +24,10 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.color as color_util
+from homeassistant.util import color as color_util
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/otbr/__init__.py b/homeassistant/components/otbr/__init__.py
index 4b95be1d40d..0756f32ab18 100644
--- a/homeassistant/components/otbr/__init__.py
+++ b/homeassistant/components/otbr/__init__.py
@@ -7,16 +7,20 @@ import logging
 import aiohttp
 import python_otbr_api
 
+from homeassistant.components.homeassistant_hardware.helpers import (
+    async_notify_firmware_info,
+    async_register_firmware_info_provider,
+)
 from homeassistant.components.thread import async_add_dataset
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady, HomeAssistantError
 from homeassistant.helpers import config_validation as cv, issue_registry as ir
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.typing import ConfigType
 
-from . import websocket_api
+from . import homeassistant_hardware, websocket_api
 from .const import DOMAIN
+from .types import OTBRConfigEntry
 from .util import (
     GetBorderAgentIdNotSupported,
     OTBRData,
@@ -28,12 +32,13 @@ _LOGGER = logging.getLogger(__name__)
 
 CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 
-type OTBRConfigEntry = ConfigEntry[OTBRData]
-
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Open Thread Border Router component."""
     websocket_api.async_setup(hass)
+
+    async_register_firmware_info_provider(hass, DOMAIN, homeassistant_hardware)
+
     return True
 
 
@@ -77,6 +82,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: OTBRConfigEntry) -> bool
     entry.async_on_unload(entry.add_update_listener(async_reload_entry))
     entry.runtime_data = otbrdata
 
+    if fw_info := await homeassistant_hardware.async_get_firmware_info(hass, entry):
+        await async_notify_firmware_info(hass, DOMAIN, fw_info)
+
     return True
 
 
diff --git a/homeassistant/components/otbr/config_flow.py b/homeassistant/components/otbr/config_flow.py
index aff79ca4651..514f6c7617c 100644
--- a/homeassistant/components/otbr/config_flow.py
+++ b/homeassistant/components/otbr/config_flow.py
@@ -16,7 +16,12 @@ import yarl
 from homeassistant.components.hassio import AddonError, AddonManager
 from homeassistant.components.homeassistant_yellow import hardware as yellow_hardware
 from homeassistant.components.thread import async_get_preferred_dataset
-from homeassistant.config_entries import SOURCE_HASSIO, ConfigFlow, ConfigFlowResult
+from homeassistant.config_entries import (
+    SOURCE_HASSIO,
+    ConfigEntryState,
+    ConfigFlow,
+    ConfigFlowResult,
+)
 from homeassistant.const import CONF_URL
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
@@ -201,12 +206,23 @@ class OTBRConfigFlow(ConfigFlow, domain=DOMAIN):
                     # we have to assume it's the first version
                     # This check can be removed in HA Core 2025.9
                     unique_id = discovery_info.uuid
+
+                if unique_id != discovery_info.uuid:
+                    continue
+
                 if (
-                    unique_id != discovery_info.uuid
-                    or current_url.host != config["host"]
+                    current_url.host != config["host"]
                     or current_url.port == config["port"]
                 ):
+                    # Reload the entry since OTBR has restarted
+                    if current_entry.state == ConfigEntryState.LOADED:
+                        assert current_entry.unique_id is not None
+                        await self.hass.config_entries.async_reload(
+                            current_entry.entry_id
+                        )
+
                     continue
+
                 # Update URL with the new port
                 self.hass.config_entries.async_update_entry(
                     current_entry,
diff --git a/homeassistant/components/otbr/homeassistant_hardware.py b/homeassistant/components/otbr/homeassistant_hardware.py
new file mode 100644
index 00000000000..94193be1359
--- /dev/null
+++ b/homeassistant/components/otbr/homeassistant_hardware.py
@@ -0,0 +1,76 @@
+"""Home Assistant Hardware firmware utilities."""
+
+from __future__ import annotations
+
+import logging
+
+from yarl import URL
+
+from homeassistant.components.hassio import AddonManager
+from homeassistant.components.homeassistant_hardware.util import (
+    ApplicationType,
+    FirmwareInfo,
+    OwningAddon,
+    OwningIntegration,
+    get_otbr_addon_firmware_info,
+)
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.hassio import is_hassio
+
+from .const import DOMAIN
+from .types import OTBRConfigEntry
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_get_firmware_info(
+    hass: HomeAssistant, config_entry: OTBRConfigEntry
+) -> FirmwareInfo | None:
+    """Return firmware information for the OpenThread Border Router."""
+    owners: list[OwningIntegration | OwningAddon] = [
+        OwningIntegration(config_entry_id=config_entry.entry_id)
+    ]
+
+    device = None
+
+    if is_hassio(hass) and (host := URL(config_entry.data["url"]).host) is not None:
+        otbr_addon_manager = AddonManager(
+            hass=hass,
+            logger=_LOGGER,
+            addon_name="OpenThread Border Router",
+            addon_slug=host.replace("-", "_"),
+        )
+
+        if (
+            addon_fw_info := await get_otbr_addon_firmware_info(
+                hass, otbr_addon_manager
+            )
+        ) is not None:
+            device = addon_fw_info.device
+            owners.extend(addon_fw_info.owners)
+
+    firmware_version = None
+
+    if config_entry.state in (
+        # This function is called during OTBR config entry setup so we need to account
+        # for both config entry states
+        ConfigEntryState.LOADED,
+        ConfigEntryState.SETUP_IN_PROGRESS,
+    ):
+        try:
+            firmware_version = await config_entry.runtime_data.get_coprocessor_version()
+        except HomeAssistantError:
+            firmware_version = None
+
+    if device is None:
+        return None
+
+    return FirmwareInfo(
+        device=device,
+        firmware_type=ApplicationType.SPINEL,
+        firmware_version=firmware_version,
+        source=DOMAIN,
+        owners=owners,
+    )
diff --git a/homeassistant/components/otbr/strings.json b/homeassistant/components/otbr/strings.json
index e1afa5b8909..3a9661c454d 100644
--- a/homeassistant/components/otbr/strings.json
+++ b/homeassistant/components/otbr/strings.json
@@ -5,7 +5,7 @@
         "data": {
           "url": "[%key:common::config_flow::data::url%]"
         },
-        "description": "Provide URL for the Open Thread Border Router's REST API"
+        "description": "Provide URL for the OpenThread Border Router's REST API"
       }
     },
     "error": {
@@ -20,8 +20,8 @@
   },
   "issues": {
     "get_get_border_agent_id_unsupported": {
-      "title": "The OTBR does not support border agent ID",
-      "description": "Your OTBR does not support border agent ID.\n\nTo fix this issue, update the OTBR to the latest version and restart Home Assistant.\nTo update the OTBR, update the Open Thread Border Router or Silicon Labs Multiprotocol add-on if you use the OTBR from the add-on, otherwise update your self managed OTBR."
+      "title": "The OTBR does not support Border Agent ID",
+      "description": "Your OTBR does not support Border Agent ID.\n\nTo fix this issue, update the OTBR to the latest version and restart Home Assistant.\nIf you are using an OTBR integrated in Home Assistant, update either the OpenThread Border Router add-on or the Silicon Labs Multiprotocol add-on. Otherwise update your self-managed OTBR."
     },
     "insecure_thread_network": {
       "title": "Insecure Thread network settings detected",
diff --git a/homeassistant/components/otbr/types.py b/homeassistant/components/otbr/types.py
new file mode 100644
index 00000000000..eff6aa980d6
--- /dev/null
+++ b/homeassistant/components/otbr/types.py
@@ -0,0 +1,7 @@
+"""The Open Thread Border Router integration types."""
+
+from homeassistant.config_entries import ConfigEntry
+
+from .util import OTBRData
+
+type OTBRConfigEntry = ConfigEntry[OTBRData]
diff --git a/homeassistant/components/otbr/util.py b/homeassistant/components/otbr/util.py
index 351e23c7736..30e456e11a8 100644
--- a/homeassistant/components/otbr/util.py
+++ b/homeassistant/components/otbr/util.py
@@ -163,6 +163,11 @@ class OTBRData:
         """Get extended address (EUI-64)."""
         return await self.api.get_extended_address()
 
+    @_handle_otbr_error
+    async def get_coprocessor_version(self) -> str:
+        """Get coprocessor firmware version."""
+        return await self.api.get_coprocessor_version()
+
 
 async def get_allowed_channel(hass: HomeAssistant, otbr_url: str) -> int | None:
     """Return the allowed channel, or None if there's no restriction."""
diff --git a/homeassistant/components/otp/sensor.py b/homeassistant/components/otp/sensor.py
index 255bc0ded34..af508d2e915 100644
--- a/homeassistant/components/otp/sensor.py
+++ b/homeassistant/components/otp/sensor.py
@@ -11,7 +11,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, CONF_TOKEN
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .const import DOMAIN
@@ -20,7 +20,9 @@ TIME_STEP = 30  # Default time step assumed by Google Authenticator
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the OTP sensor."""
 
diff --git a/homeassistant/components/ourgroceries/__init__.py b/homeassistant/components/ourgroceries/__init__.py
index 5086a5cfc9b..a83430b3531 100644
--- a/homeassistant/components/ourgroceries/__init__.py
+++ b/homeassistant/components/ourgroceries/__init__.py
@@ -30,7 +30,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     except InvalidLoginException:
         return False
 
-    coordinator = OurGroceriesDataUpdateCoordinator(hass, og)
+    coordinator = OurGroceriesDataUpdateCoordinator(hass, entry, og)
     await coordinator.async_config_entry_first_refresh()
     hass.data[DOMAIN][entry.entry_id] = coordinator
 
diff --git a/homeassistant/components/ourgroceries/coordinator.py b/homeassistant/components/ourgroceries/coordinator.py
index bc645b2bdb3..a822931e88c 100644
--- a/homeassistant/components/ourgroceries/coordinator.py
+++ b/homeassistant/components/ourgroceries/coordinator.py
@@ -8,6 +8,7 @@ import logging
 
 from ourgroceries import OurGroceries
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -21,7 +22,11 @@ _LOGGER = logging.getLogger(__name__)
 class OurGroceriesDataUpdateCoordinator(DataUpdateCoordinator[dict[str, dict]]):
     """Class to manage fetching OurGroceries data."""
 
-    def __init__(self, hass: HomeAssistant, og: OurGroceries) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, og: OurGroceries
+    ) -> None:
         """Initialize global OurGroceries data updater."""
         self.og = og
         self.lists: list[dict] = []
@@ -30,6 +35,7 @@ class OurGroceriesDataUpdateCoordinator(DataUpdateCoordinator[dict[str, dict]]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=interval,
         )
diff --git a/homeassistant/components/ourgroceries/todo.py b/homeassistant/components/ourgroceries/todo.py
index 5b8d19e5aa1..f257ef481c7 100644
--- a/homeassistant/components/ourgroceries/todo.py
+++ b/homeassistant/components/ourgroceries/todo.py
@@ -11,7 +11,7 @@ from homeassistant.components.todo import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
@@ -19,7 +19,9 @@ from .coordinator import OurGroceriesDataUpdateCoordinator
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the OurGroceries todo platform config entry."""
     coordinator: OurGroceriesDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/overkiz/__init__.py b/homeassistant/components/overkiz/__init__.py
index 51efb52e55d..8aa1ed0e4fe 100644
--- a/homeassistant/components/overkiz/__init__.py
+++ b/homeassistant/components/overkiz/__init__.py
@@ -39,7 +39,6 @@ from .const import (
     LOGGER,
     OVERKIZ_DEVICE_TO_PLATFORM,
     PLATFORMS,
-    UPDATE_INTERVAL,
     UPDATE_INTERVAL_ALL_ASSUMED_STATE,
     UPDATE_INTERVAL_LOCAL,
 )
@@ -104,13 +103,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: OverkizDataConfigEntry)
 
     coordinator = OverkizDataUpdateCoordinator(
         hass,
+        entry,
         LOGGER,
-        name="device events",
         client=client,
         devices=setup.devices,
         places=setup.root_place,
-        update_interval=UPDATE_INTERVAL,
-        config_entry_id=entry.entry_id,
     )
 
     await coordinator.async_config_entry_first_refresh()
diff --git a/homeassistant/components/overkiz/alarm_control_panel.py b/homeassistant/components/overkiz/alarm_control_panel.py
index 90c135291c3..1a5490dd329 100644
--- a/homeassistant/components/overkiz/alarm_control_panel.py
+++ b/homeassistant/components/overkiz/alarm_control_panel.py
@@ -19,7 +19,7 @@ from homeassistant.components.alarm_control_panel import (
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import OverkizDataConfigEntry
 from .coordinator import OverkizDataUpdateCoordinator
@@ -209,7 +209,7 @@ SUPPORTED_DEVICES = {description.key: description for description in ALARM_DESCR
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: OverkizDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Overkiz alarm control panel from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/overkiz/binary_sensor.py b/homeassistant/components/overkiz/binary_sensor.py
index 3a75cd77c2f..09319d59932 100644
--- a/homeassistant/components/overkiz/binary_sensor.py
+++ b/homeassistant/components/overkiz/binary_sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import OverkizDataConfigEntry
 from .const import IGNORED_OVERKIZ_DEVICES
@@ -143,7 +143,7 @@ SUPPORTED_STATES = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: OverkizDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Overkiz binary sensors from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/overkiz/button.py b/homeassistant/components/overkiz/button.py
index 92711ac8ca8..f4e051ef9ca 100644
--- a/homeassistant/components/overkiz/button.py
+++ b/homeassistant/components/overkiz/button.py
@@ -14,7 +14,7 @@ from homeassistant.components.button import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import OverkizDataConfigEntry
 from .const import IGNORED_OVERKIZ_DEVICES
@@ -100,7 +100,7 @@ SUPPORTED_COMMANDS = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: OverkizDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Overkiz button from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/overkiz/climate/__init__.py b/homeassistant/components/overkiz/climate/__init__.py
index 3276a1979cc..058c3aefdb7 100644
--- a/homeassistant/components/overkiz/climate/__init__.py
+++ b/homeassistant/components/overkiz/climate/__init__.py
@@ -10,7 +10,7 @@ from pyoverkiz.enums.ui import UIWidget
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .. import OverkizDataConfigEntry
 from .atlantic_electrical_heater import AtlanticElectricalHeater
@@ -82,7 +82,7 @@ WIDGET_AND_PROTOCOL_TO_CLIMATE_ENTITY = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: OverkizDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Overkiz climate from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/overkiz/climate/evo_home_controller.py b/homeassistant/components/overkiz/climate/evo_home_controller.py
index 272acbb13b9..e0cb8be7380 100644
--- a/homeassistant/components/overkiz/climate/evo_home_controller.py
+++ b/homeassistant/components/overkiz/climate/evo_home_controller.py
@@ -11,7 +11,7 @@ from homeassistant.components.climate import (
     HVACMode,
 )
 from homeassistant.const import UnitOfTemperature
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from ..entity import OverkizDataUpdateCoordinator, OverkizEntity
 
diff --git a/homeassistant/components/overkiz/coordinator.py b/homeassistant/components/overkiz/coordinator.py
index 484ef138cf7..4b79cfc9c06 100644
--- a/homeassistant/components/overkiz/coordinator.py
+++ b/homeassistant/components/overkiz/coordinator.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from collections.abc import Callable, Coroutine
 from datetime import timedelta
 import logging
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from aiohttp import ClientConnectorError, ServerDisconnectedError
 from pyoverkiz.client import OverkizClient
@@ -26,7 +26,10 @@ from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from homeassistant.util.decorator import Registry
 
-from .const import DOMAIN, IGNORED_OVERKIZ_DEVICES, LOGGER
+if TYPE_CHECKING:
+    from . import OverkizDataConfigEntry
+
+from .const import DOMAIN, IGNORED_OVERKIZ_DEVICES, LOGGER, UPDATE_INTERVAL
 
 EVENT_HANDLERS: Registry[
     str, Callable[[OverkizDataUpdateCoordinator, Event], Coroutine[Any, Any, None]]
@@ -36,26 +39,26 @@ EVENT_HANDLERS: Registry[
 class OverkizDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Device]]):
     """Class to manage fetching data from Overkiz platform."""
 
+    config_entry: OverkizDataConfigEntry
     _default_update_interval: timedelta
 
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: OverkizDataConfigEntry,
         logger: logging.Logger,
         *,
-        name: str,
         client: OverkizClient,
         devices: list[Device],
         places: Place | None,
-        update_interval: timedelta,
-        config_entry_id: str,
     ) -> None:
         """Initialize global data updater."""
         super().__init__(
             hass,
             logger,
-            name=name,
-            update_interval=update_interval,
+            config_entry=config_entry,
+            name="device events",
+            update_interval=UPDATE_INTERVAL,
         )
 
         self.data = {}
@@ -63,8 +66,7 @@ class OverkizDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Device]]):
         self.devices: dict[str, Device] = {d.device_url: d for d in devices}
         self.executions: dict[str, dict[str, str]] = {}
         self.areas = self._places_to_area(places) if places else None
-        self.config_entry_id = config_entry_id
-        self._default_update_interval = update_interval
+        self._default_update_interval = UPDATE_INTERVAL
 
         self.is_stateless = all(
             device.protocol in (Protocol.RTS, Protocol.INTERNAL)
@@ -164,7 +166,7 @@ async def on_device_created_updated(
 ) -> None:
     """Handle device unavailable / disabled event."""
     coordinator.hass.async_create_task(
-        coordinator.hass.config_entries.async_reload(coordinator.config_entry_id)
+        coordinator.hass.config_entries.async_reload(coordinator.config_entry.entry_id)
     )
 
 
diff --git a/homeassistant/components/overkiz/cover/__init__.py b/homeassistant/components/overkiz/cover/__init__.py
index 38c02eba1bb..dd3216f9c10 100644
--- a/homeassistant/components/overkiz/cover/__init__.py
+++ b/homeassistant/components/overkiz/cover/__init__.py
@@ -4,7 +4,7 @@ from pyoverkiz.enums import OverkizCommand, UIClass
 
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .. import OverkizDataConfigEntry
 from .awning import Awning
@@ -15,7 +15,7 @@ from .vertical_cover import LowSpeedCover, VerticalCover
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: OverkizDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Overkiz covers from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/overkiz/light.py b/homeassistant/components/overkiz/light.py
index 933d4cf695b..acd63140196 100644
--- a/homeassistant/components/overkiz/light.py
+++ b/homeassistant/components/overkiz/light.py
@@ -14,7 +14,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import OverkizDataConfigEntry
 from .coordinator import OverkizDataUpdateCoordinator
@@ -24,7 +24,7 @@ from .entity import OverkizEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: OverkizDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Overkiz lights from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/overkiz/lock.py b/homeassistant/components/overkiz/lock.py
index 1c073d2f9aa..16ec32b0667 100644
--- a/homeassistant/components/overkiz/lock.py
+++ b/homeassistant/components/overkiz/lock.py
@@ -9,7 +9,7 @@ from pyoverkiz.enums import OverkizCommand, OverkizCommandParam, OverkizState
 from homeassistant.components.lock import LockEntity
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import OverkizDataConfigEntry
 from .entity import OverkizEntity
@@ -18,7 +18,7 @@ from .entity import OverkizEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: OverkizDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Overkiz locks from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/overkiz/manifest.json b/homeassistant/components/overkiz/manifest.json
index eda39821d5c..937b4ccb937 100644
--- a/homeassistant/components/overkiz/manifest.json
+++ b/homeassistant/components/overkiz/manifest.json
@@ -13,7 +13,7 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["boto3", "botocore", "pyhumps", "pyoverkiz", "s3transfer"],
-  "requirements": ["pyoverkiz==1.15.5"],
+  "requirements": ["pyoverkiz==1.16.5"],
   "zeroconf": [
     {
       "type": "_kizbox._tcp.local.",
diff --git a/homeassistant/components/overkiz/number.py b/homeassistant/components/overkiz/number.py
index 0e03e822424..83c0e7cf7a8 100644
--- a/homeassistant/components/overkiz/number.py
+++ b/homeassistant/components/overkiz/number.py
@@ -16,7 +16,7 @@ from homeassistant.components.number import (
 )
 from homeassistant.const import EntityCategory, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import OverkizDataConfigEntry
 from .const import IGNORED_OVERKIZ_DEVICES
@@ -191,7 +191,7 @@ SUPPORTED_STATES = {description.key: description for description in NUMBER_DESCR
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: OverkizDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Overkiz number from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/overkiz/scene.py b/homeassistant/components/overkiz/scene.py
index 4533ed3245c..bd362b4b372 100644
--- a/homeassistant/components/overkiz/scene.py
+++ b/homeassistant/components/overkiz/scene.py
@@ -9,7 +9,7 @@ from pyoverkiz.models import Scenario
 
 from homeassistant.components.scene import Scene
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import OverkizDataConfigEntry
 
@@ -17,7 +17,7 @@ from . import OverkizDataConfigEntry
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: OverkizDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Overkiz scenes from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/overkiz/select.py b/homeassistant/components/overkiz/select.py
index ac467eaaa7a..e23dafdaab8 100644
--- a/homeassistant/components/overkiz/select.py
+++ b/homeassistant/components/overkiz/select.py
@@ -10,7 +10,7 @@ from pyoverkiz.enums import OverkizCommand, OverkizCommandParam, OverkizState
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import OverkizDataConfigEntry
 from .const import IGNORED_OVERKIZ_DEVICES
@@ -129,7 +129,7 @@ SUPPORTED_STATES = {description.key: description for description in SELECT_DESCR
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: OverkizDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Overkiz select from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/overkiz/sensor.py b/homeassistant/components/overkiz/sensor.py
index 81a9ab41d2d..cec0d0d2571 100644
--- a/homeassistant/components/overkiz/sensor.py
+++ b/homeassistant/components/overkiz/sensor.py
@@ -30,7 +30,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import OverkizDataConfigEntry
@@ -70,6 +70,15 @@ SENSOR_DESCRIPTIONS: list[OverkizSensorDescription] = [
         options=["full", "normal", "medium", "low", "verylow"],
         translation_key="battery",
     ),
+    OverkizSensorDescription(
+        key=OverkizState.CORE_BATTERY_DISCRETE_LEVEL,
+        name="Battery",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        icon="mdi:battery",
+        device_class=SensorDeviceClass.ENUM,
+        options=["good", "medium", "low", "critical"],
+        translation_key="battery",
+    ),
     OverkizSensorDescription(
         key=OverkizState.CORE_RSSI_LEVEL,
         name="RSSI level",
@@ -483,7 +492,7 @@ SUPPORTED_STATES = {description.key: description for description in SENSOR_DESCR
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: OverkizDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Overkiz sensors from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/overkiz/siren.py b/homeassistant/components/overkiz/siren.py
index f7246e50ec0..af761611444 100644
--- a/homeassistant/components/overkiz/siren.py
+++ b/homeassistant/components/overkiz/siren.py
@@ -12,7 +12,7 @@ from homeassistant.components.siren import (
 )
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import OverkizDataConfigEntry
 from .entity import OverkizEntity
@@ -21,7 +21,7 @@ from .entity import OverkizEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: OverkizDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Overkiz sirens from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/overkiz/strings.json b/homeassistant/components/overkiz/strings.json
index 0c564a003d6..05b5eac4b21 100644
--- a/homeassistant/components/overkiz/strings.json
+++ b/homeassistant/components/overkiz/strings.json
@@ -123,7 +123,9 @@
           "low": "Low",
           "normal": "Normal",
           "medium": "Medium",
-          "verylow": "Very low"
+          "verylow": "Very low",
+          "good": "Good",
+          "critical": "Critical"
         }
       },
       "discrete_rssi_level": {
diff --git a/homeassistant/components/overkiz/switch.py b/homeassistant/components/overkiz/switch.py
index c921dbab776..d14b2792947 100644
--- a/homeassistant/components/overkiz/switch.py
+++ b/homeassistant/components/overkiz/switch.py
@@ -17,7 +17,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import OverkizDataConfigEntry
 from .entity import OverkizDescriptiveEntity
@@ -110,7 +110,7 @@ SUPPORTED_DEVICES = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: OverkizDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Overkiz switch from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/overkiz/water_heater/__init__.py b/homeassistant/components/overkiz/water_heater/__init__.py
index 1dd1d596a33..2960cefe10c 100644
--- a/homeassistant/components/overkiz/water_heater/__init__.py
+++ b/homeassistant/components/overkiz/water_heater/__init__.py
@@ -6,13 +6,16 @@ from pyoverkiz.enums.ui import UIWidget
 
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .. import OverkizDataConfigEntry
 from ..entity import OverkizEntity
 from .atlantic_domestic_hot_water_production_mlb_component import (
     AtlanticDomesticHotWaterProductionMBLComponent,
 )
+from .atlantic_domestic_hot_water_production_v2_io_component import (
+    AtlanticDomesticHotWaterProductionV2IOComponent,
+)
 from .atlantic_pass_apc_dhw import AtlanticPassAPCDHW
 from .domestic_hot_water_production import DomesticHotWaterProduction
 from .hitachi_dhw import HitachiDHW
@@ -21,7 +24,7 @@ from .hitachi_dhw import HitachiDHW
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: OverkizDataConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Overkiz DHW from a config entry."""
     data = entry.runtime_data
@@ -52,4 +55,5 @@ WIDGET_TO_WATER_HEATER_ENTITY = {
 
 CONTROLLABLE_NAME_TO_WATER_HEATER_ENTITY = {
     "modbuslink:AtlanticDomesticHotWaterProductionMBLComponent": AtlanticDomesticHotWaterProductionMBLComponent,
+    "io:AtlanticDomesticHotWaterProductionV2_CV4E_IOComponent": AtlanticDomesticHotWaterProductionV2IOComponent,
 }
diff --git a/homeassistant/components/overkiz/water_heater/atlantic_domestic_hot_water_production_v2_io_component.py b/homeassistant/components/overkiz/water_heater/atlantic_domestic_hot_water_production_v2_io_component.py
new file mode 100644
index 00000000000..7e7db07f847
--- /dev/null
+++ b/homeassistant/components/overkiz/water_heater/atlantic_domestic_hot_water_production_v2_io_component.py
@@ -0,0 +1,332 @@
+"""Support for AtlanticDomesticHotWaterProductionV2IOComponent."""
+
+from typing import Any, cast
+
+from pyoverkiz.enums import OverkizCommand, OverkizCommandParam, OverkizState
+
+from homeassistant.components.water_heater import (
+    STATE_ECO,
+    STATE_ELECTRIC,
+    STATE_HEAT_PUMP,
+    STATE_PERFORMANCE,
+    WaterHeaterEntity,
+    WaterHeaterEntityFeature,
+)
+from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
+
+from ..entity import OverkizEntity
+
+DEFAULT_MIN_TEMP: float = 50.0
+DEFAULT_MAX_TEMP: float = 62.0
+MAX_BOOST_MODE_DURATION: int = 7
+
+DHWP_AWAY_MODES = [
+    OverkizCommandParam.ABSENCE,
+    OverkizCommandParam.AWAY,
+    OverkizCommandParam.FROSTPROTECTION,
+]
+
+
+class AtlanticDomesticHotWaterProductionV2IOComponent(OverkizEntity, WaterHeaterEntity):
+    """Representation of AtlanticDomesticHotWaterProductionV2IOComponent (io)."""
+
+    _attr_temperature_unit = UnitOfTemperature.CELSIUS
+    _attr_supported_features = (
+        WaterHeaterEntityFeature.TARGET_TEMPERATURE
+        | WaterHeaterEntityFeature.OPERATION_MODE
+        | WaterHeaterEntityFeature.AWAY_MODE
+        | WaterHeaterEntityFeature.ON_OFF
+    )
+    _attr_operation_list = [
+        STATE_ECO,
+        STATE_PERFORMANCE,
+        STATE_HEAT_PUMP,
+        STATE_ELECTRIC,
+    ]
+
+    @property
+    def min_temp(self) -> float:
+        """Return the minimum temperature."""
+
+        min_temp = self.device.states[OverkizState.CORE_MINIMAL_TEMPERATURE_MANUAL_MODE]
+        if min_temp:
+            return cast(float, min_temp.value_as_float)
+        return DEFAULT_MIN_TEMP
+
+    @property
+    def max_temp(self) -> float:
+        """Return the maximum temperature."""
+
+        max_temp = self.device.states[OverkizState.CORE_MAXIMAL_TEMPERATURE_MANUAL_MODE]
+        if max_temp:
+            return cast(float, max_temp.value_as_float)
+        return DEFAULT_MAX_TEMP
+
+    @property
+    def current_temperature(self) -> float:
+        """Return the current temperature."""
+
+        return cast(
+            float,
+            self.executor.select_state(
+                OverkizState.IO_MIDDLE_WATER_TEMPERATURE,
+            ),
+        )
+
+    @property
+    def target_temperature(self) -> float:
+        """Return the temperature corresponding to the PRESET."""
+
+        return cast(
+            float,
+            self.executor.select_state(OverkizState.CORE_TARGET_TEMPERATURE),
+        )
+
+    async def async_set_temperature(self, **kwargs: Any) -> None:
+        """Set new temperature."""
+
+        temperature = kwargs.get(ATTR_TEMPERATURE)
+        await self.executor.async_execute_command(
+            OverkizCommand.SET_TARGET_TEMPERATURE, temperature, refresh_afterwards=False
+        )
+        await self.executor.async_execute_command(
+            OverkizCommand.REFRESH_TARGET_TEMPERATURE, refresh_afterwards=False
+        )
+        await self.coordinator.async_refresh()
+
+    @property
+    def is_state_eco(self) -> bool:
+        """Return true if eco mode is on."""
+
+        return (
+            self.executor.select_state(OverkizState.IO_DHW_MODE)
+            == OverkizCommandParam.MANUAL_ECO_ACTIVE
+        )
+
+    @property
+    def is_state_performance(self) -> bool:
+        """Return true if performance mode is on."""
+
+        return (
+            self.executor.select_state(OverkizState.IO_DHW_MODE)
+            == OverkizCommandParam.AUTO_MODE
+        )
+
+    @property
+    def is_state_heat_pump(self) -> bool:
+        """Return true if heat pump mode is on."""
+
+        return (
+            self.executor.select_state(OverkizState.IO_DHW_MODE)
+            == OverkizCommandParam.MANUAL_ECO_INACTIVE
+        )
+
+    @property
+    def is_away_mode_on(self) -> bool:
+        """Return true if away mode is on."""
+
+        away_mode_duration = cast(
+            str, self.executor.select_state(OverkizState.IO_AWAY_MODE_DURATION)
+        )
+        # away_mode_duration can be either a Literal["always"]
+        if away_mode_duration == OverkizCommandParam.ALWAYS:
+            return True
+
+        # Or an int of 0 to 7 days. But it still is a string.
+        if away_mode_duration.isdecimal() and int(away_mode_duration) > 0:
+            return True
+
+        return False
+
+    @property
+    def current_operation(self) -> str | None:
+        """Return current operation."""
+
+        # The Away Mode leaves the current operation unchanged
+        if self.is_boost_mode_on:
+            return STATE_ELECTRIC
+
+        if self.is_state_eco:
+            return STATE_ECO
+
+        if self.is_state_performance:
+            return STATE_PERFORMANCE
+
+        if self.is_state_heat_pump:
+            return STATE_HEAT_PUMP
+
+        return None
+
+    @property
+    def is_boost_mode_on(self) -> bool:
+        """Return true if boost mode is on."""
+
+        return (
+            cast(
+                int,
+                self.executor.select_state(OverkizState.CORE_BOOST_MODE_DURATION),
+            )
+            > 0
+        )
+
+    async def async_set_operation_mode(self, operation_mode: str) -> None:
+        """Set new operation mode."""
+
+        if operation_mode == STATE_ECO:
+            if self.is_boost_mode_on:
+                await self.async_turn_boost_mode_off(refresh_afterwards=False)
+
+            if self.is_away_mode_on:
+                await self.async_turn_away_mode_off(refresh_afterwards=False)
+
+            await self.executor.async_execute_command(
+                OverkizCommand.SET_DHW_MODE,
+                OverkizCommandParam.MANUAL_ECO_ACTIVE,
+                refresh_afterwards=False,
+            )
+            # ECO changes the target temperature so we have to refresh it
+            await self.executor.async_execute_command(
+                OverkizCommand.REFRESH_TARGET_TEMPERATURE, refresh_afterwards=False
+            )
+            await self.coordinator.async_refresh()
+
+        elif operation_mode == STATE_PERFORMANCE:
+            if self.is_boost_mode_on:
+                await self.async_turn_boost_mode_off(refresh_afterwards=False)
+            if self.is_away_mode_on:
+                await self.async_turn_away_mode_off(refresh_afterwards=False)
+
+            await self.executor.async_execute_command(
+                OverkizCommand.SET_DHW_MODE,
+                OverkizCommandParam.AUTO_MODE,
+                refresh_afterwards=False,
+            )
+
+            await self.coordinator.async_refresh()
+
+        elif operation_mode == STATE_HEAT_PUMP:
+            refresh_target_temp = False
+            if self.is_state_performance:
+                # Switching from STATE_PERFORMANCE to STATE_HEAT_PUMP
+                #  changes the target temperature and requires a target temperature refresh
+                refresh_target_temp = True
+
+            if self.is_boost_mode_on:
+                await self.async_turn_boost_mode_off(refresh_afterwards=False)
+            if self.is_away_mode_on:
+                await self.async_turn_away_mode_off(refresh_afterwards=False)
+
+            await self.executor.async_execute_command(
+                OverkizCommand.SET_DHW_MODE,
+                OverkizCommandParam.MANUAL_ECO_INACTIVE,
+                refresh_afterwards=False,
+            )
+
+            if refresh_target_temp:
+                await self.executor.async_execute_command(
+                    OverkizCommand.REFRESH_TARGET_TEMPERATURE,
+                    refresh_afterwards=False,
+                )
+
+            await self.coordinator.async_refresh()
+
+        elif operation_mode == STATE_ELECTRIC:
+            if self.is_away_mode_on:
+                await self.async_turn_away_mode_off(refresh_afterwards=False)
+            if not self.is_boost_mode_on:
+                await self.async_turn_boost_mode_on(refresh_afterwards=False)
+            await self.coordinator.async_refresh()
+
+    async def async_turn_away_mode_on(self, refresh_afterwards: bool = True) -> None:
+        """Turn away mode on."""
+
+        await self.executor.async_execute_command(
+            OverkizCommand.SET_CURRENT_OPERATING_MODE,
+            {
+                OverkizCommandParam.RELAUNCH: OverkizCommandParam.OFF,
+                OverkizCommandParam.ABSENCE: OverkizCommandParam.ON,
+            },
+            refresh_afterwards=False,
+        )
+        # Toggling the AWAY mode changes away mode duration so we have to refresh it
+        await self.executor.async_execute_command(
+            OverkizCommand.REFRESH_AWAY_MODE_DURATION,
+            refresh_afterwards=False,
+        )
+        if refresh_afterwards:
+            await self.coordinator.async_refresh()
+
+    async def async_turn_away_mode_off(self, refresh_afterwards: bool = True) -> None:
+        """Turn away mode off."""
+
+        await self.executor.async_execute_command(
+            OverkizCommand.SET_CURRENT_OPERATING_MODE,
+            {
+                OverkizCommandParam.RELAUNCH: OverkizCommandParam.OFF,
+                OverkizCommandParam.ABSENCE: OverkizCommandParam.OFF,
+            },
+            refresh_afterwards=False,
+        )
+        # Toggling the AWAY mode changes away mode duration so we have to refresh it
+        await self.executor.async_execute_command(
+            OverkizCommand.REFRESH_AWAY_MODE_DURATION,
+            refresh_afterwards=False,
+        )
+        if refresh_afterwards:
+            await self.coordinator.async_refresh()
+
+    async def async_turn_boost_mode_on(self, refresh_afterwards: bool = True) -> None:
+        """Turn boost mode on."""
+
+        refresh_target_temp = False
+        if self.is_state_performance:
+            # Switching from STATE_PERFORMANCE to BOOST requires a target temperature refresh
+            refresh_target_temp = True
+
+        await self.executor.async_execute_command(
+            OverkizCommand.SET_BOOST_MODE_DURATION,
+            MAX_BOOST_MODE_DURATION,
+            refresh_afterwards=False,
+        )
+
+        await self.executor.async_execute_command(
+            OverkizCommand.SET_CURRENT_OPERATING_MODE,
+            {
+                OverkizCommandParam.RELAUNCH: OverkizCommandParam.ON,
+                OverkizCommandParam.ABSENCE: OverkizCommandParam.OFF,
+            },
+            refresh_afterwards=False,
+        )
+
+        await self.executor.async_execute_command(
+            OverkizCommand.REFRESH_BOOST_MODE_DURATION,
+            refresh_afterwards=False,
+        )
+
+        if refresh_target_temp:
+            await self.executor.async_execute_command(
+                OverkizCommand.REFRESH_TARGET_TEMPERATURE, refresh_afterwards=False
+            )
+
+        if refresh_afterwards:
+            await self.coordinator.async_refresh()
+
+    async def async_turn_boost_mode_off(self, refresh_afterwards: bool = True) -> None:
+        """Turn boost mode off."""
+
+        await self.executor.async_execute_command(
+            OverkizCommand.SET_CURRENT_OPERATING_MODE,
+            {
+                OverkizCommandParam.RELAUNCH: OverkizCommandParam.OFF,
+                OverkizCommandParam.ABSENCE: OverkizCommandParam.OFF,
+            },
+            refresh_afterwards=False,
+        )
+        # Toggling the BOOST mode changes boost mode duration so we have to refresh it
+        await self.executor.async_execute_command(
+            OverkizCommand.REFRESH_BOOST_MODE_DURATION,
+            refresh_afterwards=False,
+        )
+
+        if refresh_afterwards:
+            await self.coordinator.async_refresh()
diff --git a/homeassistant/components/overseerr/const.py b/homeassistant/components/overseerr/const.py
index 5c33ca3fcec..2aa0879ffed 100644
--- a/homeassistant/components/overseerr/const.py
+++ b/homeassistant/components/overseerr/const.py
@@ -27,7 +27,7 @@ REGISTERED_NOTIFICATIONS = (
 JSON_PAYLOAD = (
     '"{\\"notification_type\\":\\"{{notification_type}}\\",\\"subject\\":\\"{{subject}'
     '}\\",\\"message\\":\\"{{message}}\\",\\"image\\":\\"{{image}}\\",\\"{{media}}\\":'
-    '{\\"media_type\\":\\"{{media_type}}\\",\\"tmdb_idd\\":\\"{{media_tmdbid}}\\",\\"t'
+    '{\\"media_type\\":\\"{{media_type}}\\",\\"tmdb_id\\":\\"{{media_tmdbid}}\\",\\"t'
     'vdb_id\\":\\"{{media_tvdbid}}\\",\\"status\\":\\"{{media_status}}\\",\\"status4k'
     '\\":\\"{{media_status4k}}\\"},\\"{{request}}\\":{\\"request_id\\":\\"{{request_id'
     '}}\\",\\"requested_by_email\\":\\"{{requestedBy_email}}\\",\\"requested_by_userna'
diff --git a/homeassistant/components/overseerr/event.py b/homeassistant/components/overseerr/event.py
index 589a80c5404..1ffb1e71771 100644
--- a/homeassistant/components/overseerr/event.py
+++ b/homeassistant/components/overseerr/event.py
@@ -8,7 +8,7 @@ from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN, EVENT_KEY
 from .coordinator import OverseerrConfigEntry, OverseerrCoordinator
@@ -44,7 +44,7 @@ EVENTS: tuple[OverseerrEventEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: OverseerrConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Overseerr sensor entities based on a config entry."""
 
diff --git a/homeassistant/components/overseerr/manifest.json b/homeassistant/components/overseerr/manifest.json
index 396b9d7000b..3c4321ebb37 100644
--- a/homeassistant/components/overseerr/manifest.json
+++ b/homeassistant/components/overseerr/manifest.json
@@ -9,5 +9,5 @@
   "integration_type": "service",
   "iot_class": "local_push",
   "quality_scale": "platinum",
-  "requirements": ["python-overseerr==0.6.0"]
+  "requirements": ["python-overseerr==0.7.1"]
 }
diff --git a/homeassistant/components/overseerr/sensor.py b/homeassistant/components/overseerr/sensor.py
index 2daaa3de0cb..510e6f52c59 100644
--- a/homeassistant/components/overseerr/sensor.py
+++ b/homeassistant/components/overseerr/sensor.py
@@ -11,7 +11,7 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import REQUESTS
 from .coordinator import OverseerrConfigEntry, OverseerrCoordinator
@@ -76,7 +76,7 @@ SENSORS: tuple[OverseerrSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: OverseerrConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Overseerr sensor entities based on a config entry."""
 
diff --git a/homeassistant/components/overseerr/strings.json b/homeassistant/components/overseerr/strings.json
index 5053bcedc41..ce8b9fe9fec 100644
--- a/homeassistant/components/overseerr/strings.json
+++ b/homeassistant/components/overseerr/strings.json
@@ -27,7 +27,7 @@
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "invalid_auth": "Authentication failed. Your API key is invalid or CSRF protection is turned on, preventing authentication.",
       "invalid_host": "The provided URL is not a valid host."
     }
   },
@@ -90,7 +90,7 @@
   "services": {
     "get_requests": {
       "name": "Get requests",
-      "description": "Get media requests from Overseerr.",
+      "description": "Retrieves a list of media requests from Overseerr.",
       "fields": {
         "config_entry_id": {
           "name": "Overseerr instance",
@@ -106,7 +106,7 @@
         },
         "requested_by": {
           "name": "Requested by",
-          "description": "Filter the requests by the user id that requested them."
+          "description": "Filter the requests by the user ID that requested them."
         }
       }
     }
diff --git a/homeassistant/components/ovo_energy/sensor.py b/homeassistant/components/ovo_energy/sensor.py
index 8cada86da34..1dc12c7f008 100644
--- a/homeassistant/components/ovo_energy/sensor.py
+++ b/homeassistant/components/ovo_energy/sensor.py
@@ -19,7 +19,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfEnergy
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 from homeassistant.util import dt as dt_util
@@ -111,7 +111,9 @@ SENSOR_TYPES_GAS: tuple[OVOEnergySensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up OVO Energy sensor based on a config entry."""
     coordinator: DataUpdateCoordinator[OVODailyUsage] = hass.data[DOMAIN][
diff --git a/homeassistant/components/ovo_energy/strings.json b/homeassistant/components/ovo_energy/strings.json
index 3dc11e3a601..9d8e449e1d1 100644
--- a/homeassistant/components/ovo_energy/strings.json
+++ b/homeassistant/components/ovo_energy/strings.json
@@ -16,10 +16,10 @@
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
-          "account": "OVO account id (only add if you have multiple accounts)"
+          "account": "OVO account ID (only add if you have multiple accounts)"
         },
         "description": "Set up an OVO Energy instance to access your energy usage.",
-        "title": "Add OVO Energy Account"
+        "title": "Add OVO Energy account"
       },
       "reauth_confirm": {
         "data": {
diff --git a/homeassistant/components/owntracks/__init__.py b/homeassistant/components/owntracks/__init__.py
index 720c3718a4f..623e5e17b66 100644
--- a/homeassistant/components/owntracks/__init__.py
+++ b/homeassistant/components/owntracks/__init__.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
diff --git a/homeassistant/components/owntracks/device_tracker.py b/homeassistant/components/owntracks/device_tracker.py
index 6a6f0f078b1..7ccbbb69aa1 100644
--- a/homeassistant/components/owntracks/device_tracker.py
+++ b/homeassistant/components/owntracks/device_tracker.py
@@ -16,14 +16,16 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from . import DOMAIN as OT_DOMAIN
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up OwnTracks based off an entry."""
     # Restore previously loaded devices
diff --git a/homeassistant/components/p1_monitor/__init__.py b/homeassistant/components/p1_monitor/__init__.py
index d2ccc83972a..e12c092453c 100644
--- a/homeassistant/components/p1_monitor/__init__.py
+++ b/homeassistant/components/p1_monitor/__init__.py
@@ -2,23 +2,20 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PORT, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 
 from .const import LOGGER
-from .coordinator import P1MonitorDataUpdateCoordinator
+from .coordinator import P1MonitorConfigEntry, P1MonitorDataUpdateCoordinator
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
-type P1MonitorConfigEntry = ConfigEntry[P1MonitorDataUpdateCoordinator]
 
-
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: P1MonitorConfigEntry) -> bool:
     """Set up P1 Monitor from a config entry."""
 
-    coordinator = P1MonitorDataUpdateCoordinator(hass)
+    coordinator = P1MonitorDataUpdateCoordinator(hass, entry)
     try:
         await coordinator.async_config_entry_first_refresh()
     except ConfigEntryNotReady:
@@ -31,7 +28,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return True
 
 
-async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_migrate_entry(
+    hass: HomeAssistant, config_entry: P1MonitorConfigEntry
+) -> bool:
     """Migrate old entry."""
     LOGGER.debug("Migrating from version %s", config_entry.version)
 
@@ -54,6 +53,6 @@ async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: P1MonitorConfigEntry) -> bool:
     """Unload P1 Monitor config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/p1_monitor/coordinator.py b/homeassistant/components/p1_monitor/coordinator.py
index 5459f88c388..3be78f8efd5 100644
--- a/homeassistant/components/p1_monitor/coordinator.py
+++ b/homeassistant/components/p1_monitor/coordinator.py
@@ -30,6 +30,8 @@ from .const import (
     SERVICE_WATERMETER,
 )
 
+type P1MonitorConfigEntry = ConfigEntry[P1MonitorDataUpdateCoordinator]
+
 
 class P1MonitorData(TypedDict):
     """Class for defining data in dict."""
@@ -43,17 +45,19 @@ class P1MonitorData(TypedDict):
 class P1MonitorDataUpdateCoordinator(DataUpdateCoordinator[P1MonitorData]):
     """Class to manage fetching P1 Monitor data from single endpoint."""
 
-    config_entry: ConfigEntry
+    config_entry: P1MonitorConfigEntry
     has_water_meter: bool | None = None
 
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: P1MonitorConfigEntry,
     ) -> None:
         """Initialize global P1 Monitor data updater."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/p1_monitor/diagnostics.py b/homeassistant/components/p1_monitor/diagnostics.py
index d2e2ec5c24e..ac670486e79 100644
--- a/homeassistant/components/p1_monitor/diagnostics.py
+++ b/homeassistant/components/p1_monitor/diagnostics.py
@@ -6,7 +6,6 @@ from dataclasses import asdict
 from typing import TYPE_CHECKING, Any, cast
 
 from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PORT
 from homeassistant.core import HomeAssistant
 
@@ -16,6 +15,7 @@ from .const import (
     SERVICE_SMARTMETER,
     SERVICE_WATERMETER,
 )
+from .coordinator import P1MonitorConfigEntry
 
 if TYPE_CHECKING:
     from _typeshed import DataclassInstance
@@ -24,7 +24,7 @@ TO_REDACT = {CONF_HOST, CONF_PORT}
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: ConfigEntry
+    hass: HomeAssistant, entry: P1MonitorConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     data = {
diff --git a/homeassistant/components/p1_monitor/sensor.py b/homeassistant/components/p1_monitor/sensor.py
index 771ef0e19af..15a8f510fd7 100644
--- a/homeassistant/components/p1_monitor/sensor.py
+++ b/homeassistant/components/p1_monitor/sensor.py
@@ -10,7 +10,6 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_HOST,
     CURRENCY_EURO,
@@ -22,7 +21,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -33,7 +32,7 @@ from .const import (
     SERVICE_SMARTMETER,
     SERVICE_WATERMETER,
 )
-from .coordinator import P1MonitorDataUpdateCoordinator
+from .coordinator import P1MonitorConfigEntry, P1MonitorDataUpdateCoordinator
 
 SENSORS_SMARTMETER: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
@@ -236,7 +235,9 @@ SENSORS_WATERMETER: tuple[SensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: P1MonitorConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up P1 Monitor Sensors based on a config entry."""
     entities: list[P1MonitorSensorEntity] = []
@@ -290,7 +291,7 @@ class P1MonitorSensorEntity(
     def __init__(
         self,
         *,
-        entry: ConfigEntry,
+        entry: P1MonitorConfigEntry,
         description: SensorEntityDescription,
         name: str,
         service: Literal["smartmeter", "watermeter", "phases", "settings"],
diff --git a/homeassistant/components/palazzetti/__init__.py b/homeassistant/components/palazzetti/__init__.py
index dbf1baa0c28..a698cdcd8b7 100644
--- a/homeassistant/components/palazzetti/__init__.py
+++ b/homeassistant/components/palazzetti/__init__.py
@@ -18,7 +18,7 @@ PLATFORMS: list[Platform] = [
 async def async_setup_entry(hass: HomeAssistant, entry: PalazzettiConfigEntry) -> bool:
     """Set up Palazzetti from a config entry."""
 
-    coordinator = PalazzettiDataUpdateCoordinator(hass)
+    coordinator = PalazzettiDataUpdateCoordinator(hass, entry)
 
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
diff --git a/homeassistant/components/palazzetti/button.py b/homeassistant/components/palazzetti/button.py
index cd4765576ed..319a1174542 100644
--- a/homeassistant/components/palazzetti/button.py
+++ b/homeassistant/components/palazzetti/button.py
@@ -7,18 +7,17 @@ from pypalazzetti.exceptions import CommunicationError
 from homeassistant.components.button import ButtonEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import PalazzettiConfigEntry
 from .const import DOMAIN
-from .coordinator import PalazzettiDataUpdateCoordinator
+from .coordinator import PalazzettiConfigEntry, PalazzettiDataUpdateCoordinator
 from .entity import PalazzettiEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: PalazzettiConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Palazzetti button platform."""
 
diff --git a/homeassistant/components/palazzetti/climate.py b/homeassistant/components/palazzetti/climate.py
index 0722b97e4b7..5a4097e083a 100644
--- a/homeassistant/components/palazzetti/climate.py
+++ b/homeassistant/components/palazzetti/climate.py
@@ -13,18 +13,17 @@ from homeassistant.components.climate import (
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import PalazzettiConfigEntry
 from .const import DOMAIN, FAN_AUTO, FAN_HIGH, FAN_MODES
-from .coordinator import PalazzettiDataUpdateCoordinator
+from .coordinator import PalazzettiConfigEntry, PalazzettiDataUpdateCoordinator
 from .entity import PalazzettiEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PalazzettiConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Palazzetti climates based on a config entry."""
     async_add_entities([PalazzettiClimateEntity(entry.runtime_data)])
diff --git a/homeassistant/components/palazzetti/coordinator.py b/homeassistant/components/palazzetti/coordinator.py
index d992bd3fb62..1e4069e58ea 100644
--- a/homeassistant/components/palazzetti/coordinator.py
+++ b/homeassistant/components/palazzetti/coordinator.py
@@ -22,11 +22,13 @@ class PalazzettiDataUpdateCoordinator(DataUpdateCoordinator[None]):
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: PalazzettiConfigEntry,
     ) -> None:
         """Initialize global Palazzetti data updater."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/palazzetti/diagnostics.py b/homeassistant/components/palazzetti/diagnostics.py
index 3843f0ec111..e386ffc7833 100644
--- a/homeassistant/components/palazzetti/diagnostics.py
+++ b/homeassistant/components/palazzetti/diagnostics.py
@@ -6,7 +6,7 @@ from typing import Any
 
 from homeassistant.core import HomeAssistant
 
-from . import PalazzettiConfigEntry
+from .coordinator import PalazzettiConfigEntry
 
 
 async def async_get_config_entry_diagnostics(
diff --git a/homeassistant/components/palazzetti/number.py b/homeassistant/components/palazzetti/number.py
index 2b303f71fd6..63c1ed16f0c 100644
--- a/homeassistant/components/palazzetti/number.py
+++ b/homeassistant/components/palazzetti/number.py
@@ -8,18 +8,17 @@ from pypalazzetti.fan import FanType
 from homeassistant.components.number import NumberDeviceClass, NumberEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import PalazzettiConfigEntry
 from .const import DOMAIN
-from .coordinator import PalazzettiDataUpdateCoordinator
+from .coordinator import PalazzettiConfigEntry, PalazzettiDataUpdateCoordinator
 from .entity import PalazzettiEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: PalazzettiConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Palazzetti number platform."""
 
diff --git a/homeassistant/components/palazzetti/sensor.py b/homeassistant/components/palazzetti/sensor.py
index 11462201f4e..57d5ca861a2 100644
--- a/homeassistant/components/palazzetti/sensor.py
+++ b/homeassistant/components/palazzetti/sensor.py
@@ -10,12 +10,11 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import UnitOfLength, UnitOfMass, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import PalazzettiConfigEntry
 from .const import STATUS_TO_HA
-from .coordinator import PalazzettiDataUpdateCoordinator
+from .coordinator import PalazzettiConfigEntry, PalazzettiDataUpdateCoordinator
 from .entity import PalazzettiEntity
 
 
@@ -60,7 +59,7 @@ PROPERTY_SENSOR_DESCRIPTIONS: list[PropertySensorEntityDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PalazzettiConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Palazzetti sensor entities based on a config entry."""
 
diff --git a/homeassistant/components/panasonic_bluray/media_player.py b/homeassistant/components/panasonic_bluray/media_player.py
index a7cb0780ca9..b0e23031a24 100644
--- a/homeassistant/components/panasonic_bluray/media_player.py
+++ b/homeassistant/components/panasonic_bluray/media_player.py
@@ -15,7 +15,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.const import CONF_HOST, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util.dt import utcnow
diff --git a/homeassistant/components/panasonic_viera/__init__.py b/homeassistant/components/panasonic_viera/__init__.py
index 69800d2ef1e..6dacc08077d 100644
--- a/homeassistant/components/panasonic_viera/__init__.py
+++ b/homeassistant/components/panasonic_viera/__init__.py
@@ -13,7 +13,7 @@ from homeassistant.components.media_player import MediaPlayerState, MediaType
 from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT, Platform
 from homeassistant.core import Context, HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.script import Script
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/panasonic_viera/media_player.py b/homeassistant/components/panasonic_viera/media_player.py
index 8738b897d29..a78920f33a5 100644
--- a/homeassistant/components/panasonic_viera/media_player.py
+++ b/homeassistant/components/panasonic_viera/media_player.py
@@ -21,7 +21,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     ATTR_DEVICE_INFO,
@@ -40,7 +40,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Panasonic Viera TV from a config entry."""
 
diff --git a/homeassistant/components/panasonic_viera/remote.py b/homeassistant/components/panasonic_viera/remote.py
index ad40a97f700..5fa4be9ca2b 100644
--- a/homeassistant/components/panasonic_viera/remote.py
+++ b/homeassistant/components/panasonic_viera/remote.py
@@ -10,7 +10,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, STATE_ON
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import Remote
 from .const import (
@@ -28,7 +28,7 @@ from .const import (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Panasonic Viera TV Remote from a config entry."""
 
diff --git a/homeassistant/components/panel_custom/__init__.py b/homeassistant/components/panel_custom/__init__.py
index 89ad6066f48..db9c35a7608 100644
--- a/homeassistant/components/panel_custom/__init__.py
+++ b/homeassistant/components/panel_custom/__init__.py
@@ -8,7 +8,7 @@ import voluptuous as vol
 
 from homeassistant.components import frontend
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import bind_hass
 
diff --git a/homeassistant/components/peblar/binary_sensor.py b/homeassistant/components/peblar/binary_sensor.py
index e8e5095f050..8834a2ba2a0 100644
--- a/homeassistant/components/peblar/binary_sensor.py
+++ b/homeassistant/components/peblar/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import PeblarConfigEntry, PeblarData, PeblarDataUpdateCoordinator
 from .entity import PeblarEntity
@@ -50,7 +50,7 @@ DESCRIPTIONS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PeblarConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Peblar binary sensor based on a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/peblar/button.py b/homeassistant/components/peblar/button.py
index 22150c82649..8c60c8d84d3 100644
--- a/homeassistant/components/peblar/button.py
+++ b/homeassistant/components/peblar/button.py
@@ -15,7 +15,7 @@ from homeassistant.components.button import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import PeblarConfigEntry, PeblarUserConfigurationDataUpdateCoordinator
 from .entity import PeblarEntity
@@ -52,7 +52,7 @@ DESCRIPTIONS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PeblarConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Peblar buttons based on a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/peblar/coordinator.py b/homeassistant/components/peblar/coordinator.py
index 058f2aefb3b..36708b207c5 100644
--- a/homeassistant/components/peblar/coordinator.py
+++ b/homeassistant/components/peblar/coordinator.py
@@ -34,6 +34,7 @@ class PeblarRuntimeData:
     """Class to hold runtime data."""
 
     data_coordinator: PeblarDataUpdateCoordinator
+    last_known_charging_limit = 6
     system_information: PeblarSystemInformation
     user_configuration_coordinator: PeblarUserConfigurationDataUpdateCoordinator
     version_coordinator: PeblarVersionDataUpdateCoordinator
@@ -137,6 +138,8 @@ class PeblarVersionDataUpdateCoordinator(
 class PeblarDataUpdateCoordinator(DataUpdateCoordinator[PeblarData]):
     """Class to manage fetching Peblar active data."""
 
+    config_entry: PeblarConfigEntry
+
     def __init__(
         self, hass: HomeAssistant, entry: PeblarConfigEntry, api: PeblarApi
     ) -> None:
diff --git a/homeassistant/components/peblar/icons.json b/homeassistant/components/peblar/icons.json
index 6244945077b..a954d112c4a 100644
--- a/homeassistant/components/peblar/icons.json
+++ b/homeassistant/components/peblar/icons.json
@@ -36,6 +36,9 @@
       }
     },
     "switch": {
+      "charge": {
+        "default": "mdi:ev-plug-type2"
+      },
       "force_single_phase": {
         "default": "mdi:power-cycle"
       }
diff --git a/homeassistant/components/peblar/number.py b/homeassistant/components/peblar/number.py
index 1a7cec43295..bff1bb26db4 100644
--- a/homeassistant/components/peblar/number.py
+++ b/homeassistant/components/peblar/number.py
@@ -2,101 +2,129 @@
 
 from __future__ import annotations
 
-from collections.abc import Awaitable, Callable
-from dataclasses import dataclass
-from typing import Any
-
-from peblar import PeblarApi
-
 from homeassistant.components.number import (
     NumberDeviceClass,
-    NumberEntity,
     NumberEntityDescription,
+    RestoreNumber,
 )
-from homeassistant.const import EntityCategory, UnitOfElectricCurrent
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.const import (
+    STATE_UNAVAILABLE,
+    STATE_UNKNOWN,
+    EntityCategory,
+    UnitOfElectricCurrent,
+)
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import (
-    PeblarConfigEntry,
-    PeblarData,
-    PeblarDataUpdateCoordinator,
-    PeblarRuntimeData,
-)
+from .coordinator import PeblarConfigEntry, PeblarDataUpdateCoordinator
 from .entity import PeblarEntity
 from .helpers import peblar_exception_handler
 
 PARALLEL_UPDATES = 1
 
 
-@dataclass(frozen=True, kw_only=True)
-class PeblarNumberEntityDescription(NumberEntityDescription):
-    """Describe a Peblar number."""
-
-    native_max_value_fn: Callable[[PeblarRuntimeData], int]
-    set_value_fn: Callable[[PeblarApi, float], Awaitable[Any]]
-    value_fn: Callable[[PeblarData], int | None]
-
-
-DESCRIPTIONS = [
-    PeblarNumberEntityDescription(
-        key="charge_current_limit",
-        translation_key="charge_current_limit",
-        device_class=NumberDeviceClass.CURRENT,
-        entity_category=EntityCategory.CONFIG,
-        native_step=1,
-        native_min_value=6,
-        native_max_value_fn=lambda x: x.user_configuration_coordinator.data.user_defined_charge_limit_current,
-        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
-        set_value_fn=lambda x, v: x.ev_interface(charge_current_limit=int(v) * 1000),
-        value_fn=lambda x: round(x.ev.charge_current_limit / 1000),
-    ),
-]
-
-
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PeblarConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Peblar number based on a config entry."""
     async_add_entities(
-        PeblarNumberEntity(
-            entry=entry,
-            coordinator=entry.runtime_data.data_coordinator,
-            description=description,
-        )
-        for description in DESCRIPTIONS
+        [
+            PeblarChargeCurrentLimitNumberEntity(
+                entry=entry,
+                coordinator=entry.runtime_data.data_coordinator,
+            )
+        ]
     )
 
 
-class PeblarNumberEntity(
+class PeblarChargeCurrentLimitNumberEntity(
     PeblarEntity[PeblarDataUpdateCoordinator],
-    NumberEntity,
+    RestoreNumber,
 ):
-    """Defines a Peblar number."""
+    """Defines a Peblar charge current limit number.
 
-    entity_description: PeblarNumberEntityDescription
+    This entity is a little bit different from the other entities, any value
+    below 6 amps is ignored. It means the Peblar is not charging.
+    Peblar has assigned a dual functionality to the charge current limit
+    number, it is used to set the current charging value and to start/stop/pauze
+    the charging process.
+    """
+
+    _attr_device_class = NumberDeviceClass.CURRENT
+    _attr_entity_category = EntityCategory.CONFIG
+    _attr_native_min_value = 6
+    _attr_native_step = 1
+    _attr_native_unit_of_measurement = UnitOfElectricCurrent.AMPERE
+    _attr_translation_key = "charge_current_limit"
 
     def __init__(
         self,
         entry: PeblarConfigEntry,
         coordinator: PeblarDataUpdateCoordinator,
-        description: PeblarNumberEntityDescription,
     ) -> None:
-        """Initialize the Peblar entity."""
-        super().__init__(entry=entry, coordinator=coordinator, description=description)
-        self._attr_native_max_value = description.native_max_value_fn(
-            entry.runtime_data
+        """Initialize the Peblar charge current limit entity."""
+        super().__init__(
+            entry=entry,
+            coordinator=coordinator,
+            description=NumberEntityDescription(key="charge_current_limit"),
         )
+        configuration = entry.runtime_data.user_configuration_coordinator.data
+        self._attr_native_max_value = configuration.user_defined_charge_limit_current
 
-    @property
-    def native_value(self) -> int | None:
-        """Return the number value."""
-        return self.entity_description.value_fn(self.coordinator.data)
+    async def async_added_to_hass(self) -> None:
+        """Load the last known state when adding this entity."""
+        if (
+            (last_state := await self.async_get_last_state())
+            and (last_number_data := await self.async_get_last_number_data())
+            and last_state.state not in (STATE_UNKNOWN, STATE_UNAVAILABLE)
+            and last_number_data.native_value
+        ):
+            self._attr_native_value = last_number_data.native_value
+            # Set the last known charging limit in the runtime data the
+            # start/stop/pauze functionality needs it in order to restore
+            # the last known charging limits when charging is resumed.
+            self.coordinator.config_entry.runtime_data.last_known_charging_limit = int(
+                last_number_data.native_value
+            )
+        await super().async_added_to_hass()
+        self._handle_coordinator_update()
+
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle coordinator update.
+
+        Ignore any update that provides a ampere value that is below the
+        minimum value (6 amps). It means the Peblar is currently not charging.
+        """
+        if (
+            current_charge_limit := round(
+                self.coordinator.data.ev.charge_current_limit / 1000
+            )
+        ) < 6:
+            return
+        self._attr_native_value = current_charge_limit
+        # Update the last known charging limit in the runtime data the
+        # start/stop/pauze functionality needs it in order to restore
+        # the last known charging limits when charging is resumed.
+        self.coordinator.config_entry.runtime_data.last_known_charging_limit = (
+            current_charge_limit
+        )
+        super()._handle_coordinator_update()
 
     @peblar_exception_handler
     async def async_set_native_value(self, value: float) -> None:
-        """Change to new number value."""
-        await self.entity_description.set_value_fn(self.coordinator.api, value)
+        """Change the current charging value."""
+        # If charging is currently disabled (below 6 amps), just set the value
+        # as the native value and the last known charging limit in the runtime
+        # data. So we can pick it up once charging gets enabled again.
+        if self.coordinator.data.ev.charge_current_limit < 6000:
+            self._attr_native_value = int(value)
+            self.coordinator.config_entry.runtime_data.last_known_charging_limit = int(
+                value
+            )
+            self.async_write_ha_state()
+            return
+        await self.coordinator.api.ev_interface(charge_current_limit=int(value) * 1000)
         await self.coordinator.async_request_refresh()
diff --git a/homeassistant/components/peblar/select.py b/homeassistant/components/peblar/select.py
index a2a0997a797..17503951ccd 100644
--- a/homeassistant/components/peblar/select.py
+++ b/homeassistant/components/peblar/select.py
@@ -11,7 +11,7 @@ from peblar import Peblar, PeblarUserConfiguration, SmartChargingMode
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import PeblarConfigEntry, PeblarUserConfigurationDataUpdateCoordinator
 from .entity import PeblarEntity
@@ -49,7 +49,7 @@ DESCRIPTIONS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PeblarConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Peblar select based on a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/peblar/sensor.py b/homeassistant/components/peblar/sensor.py
index e655253d75c..81476eef9aa 100644
--- a/homeassistant/components/peblar/sensor.py
+++ b/homeassistant/components/peblar/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     UnitOfPower,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.dt import utcnow
 
 from .const import (
@@ -231,7 +231,7 @@ DESCRIPTIONS: tuple[PeblarSensorDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PeblarConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Peblar sensors based on a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/peblar/strings.json b/homeassistant/components/peblar/strings.json
index a33667fa533..416f1a2c062 100644
--- a/homeassistant/components/peblar/strings.json
+++ b/homeassistant/components/peblar/strings.json
@@ -107,7 +107,7 @@
       "cp_state": {
         "name": "State",
         "state": {
-          "charging": "Charging",
+          "charging": "[%key:common::state::charging%]",
           "error": "Error",
           "fault": "Fault",
           "invalid": "Invalid",
@@ -153,6 +153,9 @@
       }
     },
     "switch": {
+      "charge": {
+        "name": "Charge"
+      },
       "force_single_phase": {
         "name": "Force single phase"
       }
diff --git a/homeassistant/components/peblar/switch.py b/homeassistant/components/peblar/switch.py
index e56c2fcdaec..f2e1ae13ae2 100644
--- a/homeassistant/components/peblar/switch.py
+++ b/homeassistant/components/peblar/switch.py
@@ -6,12 +6,12 @@ from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 from typing import Any
 
-from peblar import PeblarApi
+from peblar import PeblarEVInterface
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import (
     PeblarConfigEntry,
@@ -31,7 +31,19 @@ class PeblarSwitchEntityDescription(SwitchEntityDescription):
 
     has_fn: Callable[[PeblarRuntimeData], bool] = lambda x: True
     is_on_fn: Callable[[PeblarData], bool]
-    set_fn: Callable[[PeblarApi, bool], Awaitable[Any]]
+    set_fn: Callable[[PeblarDataUpdateCoordinator, bool], Awaitable[Any]]
+
+
+def _async_peblar_charge(
+    coordinator: PeblarDataUpdateCoordinator, on: bool
+) -> Awaitable[PeblarEVInterface]:
+    """Set the charge state."""
+    charge_current_limit = 0
+    if on:
+        charge_current_limit = (
+            coordinator.config_entry.runtime_data.last_known_charging_limit * 1000
+        )
+    return coordinator.api.ev_interface(charge_current_limit=charge_current_limit)
 
 
 DESCRIPTIONS = [
@@ -44,7 +56,14 @@ DESCRIPTIONS = [
             and x.user_configuration_coordinator.data.connected_phases > 1
         ),
         is_on_fn=lambda x: x.ev.force_single_phase,
-        set_fn=lambda x, on: x.ev_interface(force_single_phase=on),
+        set_fn=lambda x, on: x.api.ev_interface(force_single_phase=on),
+    ),
+    PeblarSwitchEntityDescription(
+        key="charge",
+        translation_key="charge",
+        entity_category=EntityCategory.CONFIG,
+        is_on_fn=lambda x: (x.ev.charge_current_limit >= 6000),
+        set_fn=_async_peblar_charge,
     ),
 ]
 
@@ -52,7 +71,7 @@ DESCRIPTIONS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PeblarConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Peblar switch based on a config entry."""
     async_add_entities(
@@ -82,11 +101,11 @@ class PeblarSwitchEntity(
     @peblar_exception_handler
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the entity on."""
-        await self.entity_description.set_fn(self.coordinator.api, True)
+        await self.entity_description.set_fn(self.coordinator, True)
         await self.coordinator.async_request_refresh()
 
     @peblar_exception_handler
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the entity off."""
-        await self.entity_description.set_fn(self.coordinator.api, False)
+        await self.entity_description.set_fn(self.coordinator, False)
         await self.coordinator.async_request_refresh()
diff --git a/homeassistant/components/peblar/update.py b/homeassistant/components/peblar/update.py
index 58c2fbdc899..88966916069 100644
--- a/homeassistant/components/peblar/update.py
+++ b/homeassistant/components/peblar/update.py
@@ -11,7 +11,7 @@ from homeassistant.components.update import (
     UpdateEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import (
     PeblarConfigEntry,
@@ -53,7 +53,7 @@ DESCRIPTIONS: tuple[PeblarUpdateEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PeblarConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Peblar update based on a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/peco/binary_sensor.py b/homeassistant/components/peco/binary_sensor.py
index a55f0fcc731..a4d59a8c9a2 100644
--- a/homeassistant/components/peco/binary_sensor.py
+++ b/homeassistant/components/peco/binary_sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -24,7 +24,7 @@ PARALLEL_UPDATES: Final = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up binary sensor for PECO."""
     if "smart_meter" not in hass.data[DOMAIN][config_entry.entry_id]:
diff --git a/homeassistant/components/peco/manifest.json b/homeassistant/components/peco/manifest.json
index 698981e9361..7dc80c6f837 100644
--- a/homeassistant/components/peco/manifest.json
+++ b/homeassistant/components/peco/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/peco",
   "iot_class": "cloud_polling",
-  "requirements": ["peco==0.0.30"]
+  "requirements": ["peco==0.1.2"]
 }
diff --git a/homeassistant/components/peco/sensor.py b/homeassistant/components/peco/sensor.py
index d08947eb0ec..eafa36c98e9 100644
--- a/homeassistant/components/peco/sensor.py
+++ b/homeassistant/components/peco/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -76,7 +76,7 @@ SENSOR_LIST: tuple[PECOSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor platform."""
     county: str = config_entry.data[CONF_COUNTY]
diff --git a/homeassistant/components/pegel_online/__init__.py b/homeassistant/components/pegel_online/__init__.py
index 30e5f4d2a38..1c71603e41e 100644
--- a/homeassistant/components/pegel_online/__init__.py
+++ b/homeassistant/components/pegel_online/__init__.py
@@ -7,21 +7,18 @@ import logging
 from aiopegelonline import PegelOnline
 from aiopegelonline.const import CONNECT_ERRORS
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import CONF_STATION
-from .coordinator import PegelOnlineDataUpdateCoordinator
+from .coordinator import PegelOnlineConfigEntry, PegelOnlineDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS = [Platform.SENSOR]
 
-type PegelOnlineConfigEntry = ConfigEntry[PegelOnlineDataUpdateCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: PegelOnlineConfigEntry) -> bool:
     """Set up PEGELONLINE entry."""
@@ -35,7 +32,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: PegelOnlineConfigEntry)
     except CONNECT_ERRORS as err:
         raise ConfigEntryNotReady("Failed to connect") from err
 
-    coordinator = PegelOnlineDataUpdateCoordinator(hass, entry.title, api, station)
+    coordinator = PegelOnlineDataUpdateCoordinator(hass, entry, api, station)
 
     await coordinator.async_config_entry_first_refresh()
 
@@ -46,6 +43,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: PegelOnlineConfigEntry)
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, entry: PegelOnlineConfigEntry
+) -> bool:
     """Unload PEGELONLINE entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/pegel_online/coordinator.py b/homeassistant/components/pegel_online/coordinator.py
index c8233673fde..1e2471a59f2 100644
--- a/homeassistant/components/pegel_online/coordinator.py
+++ b/homeassistant/components/pegel_online/coordinator.py
@@ -4,6 +4,7 @@ import logging
 
 from aiopegelonline import CONNECT_ERRORS, PegelOnline, Station, StationMeasurements
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -11,12 +12,20 @@ from .const import DOMAIN, MIN_TIME_BETWEEN_UPDATES
 
 _LOGGER = logging.getLogger(__name__)
 
+type PegelOnlineConfigEntry = ConfigEntry[PegelOnlineDataUpdateCoordinator]
+
 
 class PegelOnlineDataUpdateCoordinator(DataUpdateCoordinator[StationMeasurements]):
     """DataUpdateCoordinator for the pegel_online integration."""
 
+    config_entry: PegelOnlineConfigEntry
+
     def __init__(
-        self, hass: HomeAssistant, name: str, api: PegelOnline, station: Station
+        self,
+        hass: HomeAssistant,
+        config_entry: PegelOnlineConfigEntry,
+        api: PegelOnline,
+        station: Station,
     ) -> None:
         """Initialize the PegelOnlineDataUpdateCoordinator."""
         self.api = api
@@ -24,7 +33,8 @@ class PegelOnlineDataUpdateCoordinator(DataUpdateCoordinator[StationMeasurements
         super().__init__(
             hass,
             _LOGGER,
-            name=name,
+            config_entry=config_entry,
+            name=config_entry.title,
             update_interval=MIN_TIME_BETWEEN_UPDATES,
         )
 
diff --git a/homeassistant/components/pegel_online/diagnostics.py b/homeassistant/components/pegel_online/diagnostics.py
index b68437c5ee7..e3b4a166cb4 100644
--- a/homeassistant/components/pegel_online/diagnostics.py
+++ b/homeassistant/components/pegel_online/diagnostics.py
@@ -6,7 +6,7 @@ from typing import Any
 
 from homeassistant.core import HomeAssistant
 
-from . import PegelOnlineConfigEntry
+from .coordinator import PegelOnlineConfigEntry
 
 
 async def async_get_config_entry_diagnostics(
diff --git a/homeassistant/components/pegel_online/sensor.py b/homeassistant/components/pegel_online/sensor.py
index 50eb80bafa8..fd90683a9b2 100644
--- a/homeassistant/components/pegel_online/sensor.py
+++ b/homeassistant/components/pegel_online/sensor.py
@@ -14,10 +14,9 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import ATTR_LATITUDE, ATTR_LONGITUDE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import PegelOnlineConfigEntry
-from .coordinator import PegelOnlineDataUpdateCoordinator
+from .coordinator import PegelOnlineConfigEntry, PegelOnlineDataUpdateCoordinator
 from .entity import PegelOnlineEntity
 
 
@@ -93,7 +92,7 @@ SENSORS: tuple[PegelOnlineSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PegelOnlineConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the PEGELONLINE sensor."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/pencom/switch.py b/homeassistant/components/pencom/switch.py
index d16c7e1600c..d9d89494bd9 100644
--- a/homeassistant/components/pencom/switch.py
+++ b/homeassistant/components/pencom/switch.py
@@ -15,7 +15,7 @@ from homeassistant.components.switch import (
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/permobil/__init__.py b/homeassistant/components/permobil/__init__.py
index 675a803ce91..441c6a2646e 100644
--- a/homeassistant/components/permobil/__init__.py
+++ b/homeassistant/components/permobil/__init__.py
@@ -48,7 +48,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         raise ConfigEntryAuthFailed(f"Config error for {p_api.email}") from err
 
     # create the coordinator with the API object
-    coordinator = MyPermobilCoordinator(hass, p_api)
+    coordinator = MyPermobilCoordinator(hass, entry, p_api)
     await coordinator.async_config_entry_first_refresh()
 
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
diff --git a/homeassistant/components/permobil/binary_sensor.py b/homeassistant/components/permobil/binary_sensor.py
index 4b768cf5af5..c2d51067e19 100644
--- a/homeassistant/components/permobil/binary_sensor.py
+++ b/homeassistant/components/permobil/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import MyPermobilCoordinator
@@ -42,7 +42,7 @@ BINARY_SENSOR_DESCRIPTIONS: tuple[PermobilBinarySensorEntityDescription, ...] =
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create and setup the binary sensor."""
 
diff --git a/homeassistant/components/permobil/config_flow.py b/homeassistant/components/permobil/config_flow.py
index 07ddefa9dce..e0fb55a0363 100644
--- a/homeassistant/components/permobil/config_flow.py
+++ b/homeassistant/components/permobil/config_flow.py
@@ -17,9 +17,8 @@ import voluptuous as vol
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_CODE, CONF_EMAIL, CONF_REGION, CONF_TOKEN, CONF_TTL
 from homeassistant.core import HomeAssistant, async_get_hass
-from homeassistant.helpers import selector
+from homeassistant.helpers import config_validation as cv, selector
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.selector import (
     TextSelector,
     TextSelectorConfig,
diff --git a/homeassistant/components/permobil/coordinator.py b/homeassistant/components/permobil/coordinator.py
index 6efde26d341..ea7ddadff9f 100644
--- a/homeassistant/components/permobil/coordinator.py
+++ b/homeassistant/components/permobil/coordinator.py
@@ -7,6 +7,7 @@ import logging
 
 from mypermobil import MyPermobil, MyPermobilAPIException
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -25,11 +26,16 @@ class MyPermobilData:
 class MyPermobilCoordinator(DataUpdateCoordinator[MyPermobilData]):
     """MyPermobil coordinator."""
 
-    def __init__(self, hass: HomeAssistant, p_api: MyPermobil) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, p_api: MyPermobil
+    ) -> None:
         """Initialize my coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="permobil",
             update_interval=timedelta(minutes=5),
         )
diff --git a/homeassistant/components/permobil/sensor.py b/homeassistant/components/permobil/sensor.py
index 54d3a61c519..5f8cb88290a 100644
--- a/homeassistant/components/permobil/sensor.py
+++ b/homeassistant/components/permobil/sensor.py
@@ -32,7 +32,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, UnitOfEnergy, UnitOfLength, UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import BATTERY_ASSUMED_VOLTAGE, DOMAIN, KM, MILES
 from .coordinator import MyPermobilCoordinator
@@ -175,7 +175,7 @@ DISTANCE_UNITS: dict[Any, UnitOfLength] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create sensors from a config entry created in the integrations UI."""
 
diff --git a/homeassistant/components/persistent_notification/__init__.py b/homeassistant/components/persistent_notification/__init__.py
index a5eb8bb4f4d..2871f4b575a 100644
--- a/homeassistant/components/persistent_notification/__init__.py
+++ b/homeassistant/components/persistent_notification/__init__.py
@@ -20,7 +20,7 @@ from homeassistant.helpers.dispatcher import (
 )
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import bind_hass
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.signal_type import SignalType
 from homeassistant.util.uuid import random_uuid_hex
 
diff --git a/homeassistant/components/persistent_notification/trigger.py b/homeassistant/components/persistent_notification/trigger.py
index 431443d9139..8e0808f9879 100644
--- a/homeassistant/components/persistent_notification/trigger.py
+++ b/homeassistant/components/persistent_notification/trigger.py
@@ -9,7 +9,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_PLATFORM
 from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.trigger import TriggerActionType, TriggerData, TriggerInfo
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/person/manifest.json b/homeassistant/components/person/manifest.json
index 7f370be6fbe..0c1792e9277 100644
--- a/homeassistant/components/person/manifest.json
+++ b/homeassistant/components/person/manifest.json
@@ -1,7 +1,6 @@
 {
   "domain": "person",
   "name": "Person",
-  "after_dependencies": ["device_tracker"],
   "codeowners": [],
   "dependencies": ["image_upload", "http"],
   "documentation": "https://www.home-assistant.io/integrations/person",
diff --git a/homeassistant/components/pglab/__init__.py b/homeassistant/components/pglab/__init__.py
new file mode 100644
index 00000000000..8bce7be26e8
--- /dev/null
+++ b/homeassistant/components/pglab/__init__.py
@@ -0,0 +1,89 @@
+"""PG LAB Electronics integration."""
+
+from __future__ import annotations
+
+from pypglab.mqtt import (
+    Client as PyPGLabMqttClient,
+    Sub_State as PyPGLabSubState,
+    Subcribe_CallBack as PyPGLabSubscribeCallBack,
+)
+
+from homeassistant.components import mqtt
+from homeassistant.components.mqtt import (
+    ReceiveMessage,
+    async_prepare_subscribe_topics,
+    async_subscribe_topics,
+    async_unsubscribe_topics,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers import config_validation as cv
+
+from .const import DOMAIN, LOGGER
+from .discovery import PGLabDiscovery
+
+type PGLabConfigEntry = ConfigEntry[PGLabDiscovery]
+
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, config_entry: PGLabConfigEntry
+) -> bool:
+    """Set up PG LAB Electronics integration from a config entry."""
+
+    async def mqtt_publish(topic: str, payload: str, qos: int, retain: bool) -> None:
+        """Publish an MQTT message using the Home Assistant MQTT client."""
+        await mqtt.async_publish(hass, topic, payload, qos, retain)
+
+    async def mqtt_subscribe(
+        sub_state: PyPGLabSubState, topic: str, callback_func: PyPGLabSubscribeCallBack
+    ) -> PyPGLabSubState:
+        """Subscribe to MQTT topics using the Home Assistant MQTT client."""
+
+        @callback
+        def mqtt_message_received(msg: ReceiveMessage) -> None:
+            """Handle PGLab mqtt messages."""
+            callback_func(msg.topic, msg.payload)
+
+        topics = {
+            "pglab_subscribe_topic": {
+                "topic": topic,
+                "msg_callback": mqtt_message_received,
+            }
+        }
+
+        sub_state = async_prepare_subscribe_topics(hass, sub_state, topics)
+        await async_subscribe_topics(hass, sub_state)
+        return sub_state
+
+    async def mqtt_unsubscribe(sub_state: PyPGLabSubState) -> None:
+        async_unsubscribe_topics(hass, sub_state)
+
+    if not await mqtt.async_wait_for_mqtt_client(hass):
+        LOGGER.error("MQTT integration not available")
+        raise ConfigEntryNotReady("MQTT integration not available")
+
+    # Create an MQTT client for PGLab used for PGLab python module.
+    pglab_mqtt = PyPGLabMqttClient(mqtt_publish, mqtt_subscribe, mqtt_unsubscribe)
+
+    # Setup PGLab device discovery.
+    config_entry.runtime_data = PGLabDiscovery()
+
+    # Start to discovery PG Lab devices.
+    await config_entry.runtime_data.start(hass, pglab_mqtt, config_entry)
+
+    return True
+
+
+async def async_unload_entry(
+    hass: HomeAssistant, config_entry: PGLabConfigEntry
+) -> bool:
+    """Unload a config entry."""
+
+    # Stop PGLab device discovery.
+    pglab_discovery = config_entry.runtime_data
+    await pglab_discovery.stop(hass, config_entry)
+
+    return True
diff --git a/homeassistant/components/pglab/config_flow.py b/homeassistant/components/pglab/config_flow.py
new file mode 100644
index 00000000000..606de757622
--- /dev/null
+++ b/homeassistant/components/pglab/config_flow.py
@@ -0,0 +1,73 @@
+"""Config flow for PG LAB Electronics integration."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from homeassistant.components import mqtt
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.helpers.service_info.mqtt import MqttServiceInfo
+
+from .const import DISCOVERY_TOPIC, DOMAIN
+
+
+class PGLabFlowHandler(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow."""
+
+    VERSION = 1
+
+    async def async_step_mqtt(
+        self, discovery_info: MqttServiceInfo
+    ) -> ConfigFlowResult:
+        """Handle a flow initialized by MQTT discovery."""
+
+        await self.async_set_unique_id(DOMAIN)
+
+        # Validate the message, abort if it fails.
+        if not discovery_info.topic.endswith("/config"):
+            # Not a PGLab Electronics discovery message.
+            return self.async_abort(reason="invalid_discovery_info")
+        if not discovery_info.payload:
+            # Empty payload, unexpected payload.
+            return self.async_abort(reason="invalid_discovery_info")
+
+        return await self.async_step_confirm_from_mqtt()
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle a flow initialized by the user."""
+        try:
+            if not mqtt.is_connected(self.hass):
+                return self.async_abort(reason="mqtt_not_connected")
+        except KeyError:
+            return self.async_abort(reason="mqtt_not_configured")
+
+        return await self.async_step_confirm_from_user()
+
+    def step_confirm(
+        self, step_id: str, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Confirm the setup."""
+
+        if user_input is not None:
+            return self.async_create_entry(
+                title="PG LAB Electronics",
+                data={
+                    "discovery_prefix": DISCOVERY_TOPIC,
+                },
+            )
+
+        return self.async_show_form(step_id=step_id)
+
+    async def async_step_confirm_from_mqtt(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Confirm the setup from MQTT discovered."""
+        return self.step_confirm(step_id="confirm_from_mqtt", user_input=user_input)
+
+    async def async_step_confirm_from_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Confirm the setup from user add integration."""
+        return self.step_confirm(step_id="confirm_from_user", user_input=user_input)
diff --git a/homeassistant/components/pglab/const.py b/homeassistant/components/pglab/const.py
new file mode 100644
index 00000000000..de076ac37f0
--- /dev/null
+++ b/homeassistant/components/pglab/const.py
@@ -0,0 +1,12 @@
+"""Constants used by PG LAB Electronics integration."""
+
+import logging
+
+# The domain of the integration.
+DOMAIN = "pglab"
+
+# The message logger.
+LOGGER = logging.getLogger(__package__)
+
+# The MQTT message used to subscribe to get a new PG LAB device.
+DISCOVERY_TOPIC = "pglab/discovery"
diff --git a/homeassistant/components/pglab/coordinator.py b/homeassistant/components/pglab/coordinator.py
new file mode 100644
index 00000000000..53c5dbc3b58
--- /dev/null
+++ b/homeassistant/components/pglab/coordinator.py
@@ -0,0 +1,78 @@
+"""Coordinator for PG LAB Electronics."""
+
+from __future__ import annotations
+
+from datetime import datetime, timedelta
+from typing import TYPE_CHECKING, Any
+
+from pypglab.const import SENSOR_REBOOT_TIME, SENSOR_TEMPERATURE, SENSOR_VOLTAGE
+from pypglab.device import Device as PyPGLabDevice
+from pypglab.sensor import Sensor as PyPGLabSensors
+
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+from homeassistant.util.dt import utcnow
+
+from .const import DOMAIN, LOGGER
+
+if TYPE_CHECKING:
+    from . import PGLabConfigEntry
+
+
+class PGLabSensorsCoordinator(DataUpdateCoordinator[dict[str, Any]]):
+    """Class to update Sensor Entities when receiving new data."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: PGLabConfigEntry,
+        pglab_device: PyPGLabDevice,
+    ) -> None:
+        """Initialize."""
+
+        # get a reference of PG Lab device internal sensors state
+        self._sensors: PyPGLabSensors = pglab_device.sensors
+
+        super().__init__(
+            hass,
+            LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+        )
+
+    @callback
+    def _new_sensors_data(self, payload: str) -> None:
+        """Handle new sensor data."""
+
+        # notify all listeners that new sensor values are available
+        self.async_set_updated_data(self._sensors.state)
+
+    async def subscribe_topics(self) -> None:
+        """Subscribe the sensors state to be notifty from MQTT update messages."""
+
+        # subscribe to the pypglab sensors to receive updates from the mqtt broker
+        # when a new sensor values are available
+        await self._sensors.subscribe_topics()
+
+        # set the callback to be called when a new sensor values are available
+        self._sensors.set_on_state_callback(self._new_sensors_data)
+
+    def get_sensor_value(self, sensor_key: str) -> float | datetime | None:
+        """Return the value of a sensor."""
+
+        if self.data:
+            value = self.data[sensor_key]
+
+            if (sensor_key == SENSOR_REBOOT_TIME) and value:
+                # convert the reboot time to a datetime object
+                return utcnow() - timedelta(seconds=value)
+
+            if (sensor_key == SENSOR_TEMPERATURE) and value:
+                # convert the temperature value to a float
+                return float(value)
+
+            if (sensor_key == SENSOR_VOLTAGE) and value:
+                # convert the voltage value to a float
+                return float(value)
+
+        return None
diff --git a/homeassistant/components/pglab/cover.py b/homeassistant/components/pglab/cover.py
new file mode 100644
index 00000000000..8385fd95ffa
--- /dev/null
+++ b/homeassistant/components/pglab/cover.py
@@ -0,0 +1,107 @@
+"""PG LAB Electronics Cover."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from pypglab.device import Device as PyPGLabDevice
+from pypglab.shutter import Shutter as PyPGLabShutter
+
+from homeassistant.components.cover import (
+    CoverDeviceClass,
+    CoverEntity,
+    CoverEntityFeature,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .discovery import PGLabDiscovery
+from .entity import PGLabEntity
+
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up switches for device."""
+
+    @callback
+    def async_discover(
+        pglab_device: PyPGLabDevice, pglab_shutter: PyPGLabShutter
+    ) -> None:
+        """Discover and add a PG LAB Cover."""
+        pglab_discovery = config_entry.runtime_data
+        pglab_cover = PGLabCover(pglab_discovery, pglab_device, pglab_shutter)
+        async_add_entities([pglab_cover])
+
+    # Register the callback to create the cover entity when discovered.
+    pglab_discovery = config_entry.runtime_data
+    await pglab_discovery.register_platform(hass, Platform.COVER, async_discover)
+
+
+class PGLabCover(PGLabEntity, CoverEntity):
+    """A PGLab Cover."""
+
+    _attr_translation_key = "shutter"
+
+    def __init__(
+        self,
+        pglab_discovery: PGLabDiscovery,
+        pglab_device: PyPGLabDevice,
+        pglab_shutter: PyPGLabShutter,
+    ) -> None:
+        """Initialize the Cover class."""
+
+        super().__init__(
+            pglab_discovery,
+            pglab_device,
+            pglab_shutter,
+        )
+
+        self._attr_unique_id = f"{pglab_device.id}_shutter{pglab_shutter.id}"
+        self._attr_translation_placeholders = {"shutter_id": pglab_shutter.id}
+
+        self._shutter = pglab_shutter
+
+        self._attr_device_class = CoverDeviceClass.SHUTTER
+        self._attr_supported_features = (
+            CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE | CoverEntityFeature.STOP
+        )
+
+    async def async_open_cover(self, **kwargs: Any) -> None:
+        """Open the cover."""
+        await self._shutter.open()
+
+    async def async_close_cover(self, **kwargs: Any) -> None:
+        """Close cover."""
+        await self._shutter.close()
+
+    async def async_stop_cover(self, **kwargs: Any) -> None:
+        """Stop the cover."""
+        await self._shutter.stop()
+
+    @property
+    def is_closed(self) -> bool | None:
+        """Return if cover is closed."""
+        if not self._shutter.state:
+            return None
+        return self._shutter.state == PyPGLabShutter.STATE_CLOSED
+
+    @property
+    def is_closing(self) -> bool | None:
+        """Return if the cover is closing."""
+        if not self._shutter.state:
+            return None
+        return self._shutter.state == PyPGLabShutter.STATE_CLOSING
+
+    @property
+    def is_opening(self) -> bool | None:
+        """Return if the cover is opening."""
+        if not self._shutter.state:
+            return None
+        return self._shutter.state == PyPGLabShutter.STATE_OPENING
diff --git a/homeassistant/components/pglab/discovery.py b/homeassistant/components/pglab/discovery.py
new file mode 100644
index 00000000000..c1d8653c17b
--- /dev/null
+++ b/homeassistant/components/pglab/discovery.py
@@ -0,0 +1,320 @@
+"""Discovery PG LAB Electronics devices."""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+import json
+from typing import TYPE_CHECKING, Any
+
+from pypglab.device import Device as PyPGLabDevice
+from pypglab.mqtt import Client as PyPGLabMqttClient
+
+from homeassistant.components.mqtt import (
+    EntitySubscription,
+    ReceiveMessage,
+    async_prepare_subscribe_topics,
+    async_subscribe_topics,
+    async_unsubscribe_topics,
+)
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
+from homeassistant.helpers.dispatcher import (
+    async_dispatcher_connect,
+    async_dispatcher_send,
+)
+
+from .const import DISCOVERY_TOPIC, DOMAIN, LOGGER
+from .coordinator import PGLabSensorsCoordinator
+
+if TYPE_CHECKING:
+    from . import PGLabConfigEntry
+
+# Supported platforms.
+PLATFORMS = [
+    Platform.COVER,
+    Platform.SENSOR,
+    Platform.SWITCH,
+]
+
+# Used to create a new component entity.
+CREATE_NEW_ENTITY = {
+    Platform.COVER: "pglab_create_new_entity_cover",
+    Platform.SENSOR: "pglab_create_new_entity_sensor",
+    Platform.SWITCH: "pglab_create_new_entity_switch",
+}
+
+
+class PGLabDiscoveryError(Exception):
+    """Raised when a discovery has failed."""
+
+
+def get_device_id_from_discovery_topic(topic: str) -> str | None:
+    """From the discovery topic get the PG LAB Electronics device id."""
+
+    # The discovery topic has the following format "pglab/discovery/[Device ID]/config"
+    split_topic = topic.split("/", 5)
+
+    # Do a sanity check on the string.
+    if len(split_topic) != 4:
+        return None
+
+    if split_topic[3] != "config":
+        return None
+
+    return split_topic[2]
+
+
+class DiscoverDeviceInfo:
+    """Keeps information of the PGLab discovered device."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: PGLabConfigEntry,
+        pglab_device: PyPGLabDevice,
+    ) -> None:
+        """Initialize the device discovery info."""
+
+        # Hash string represents the devices actual configuration,
+        # it depends on the number of available relays and shutters.
+        # When the hash string changes the devices entities must be rebuilt.
+        self._hash = pglab_device.hash
+        self._entities: list[tuple[str, str]] = []
+        self.coordinator = PGLabSensorsCoordinator(hass, config_entry, pglab_device)
+
+    def add_entity(self, platform_domain: str, entity_unique_id: str | None) -> None:
+        """Add an entity."""
+
+        # PGLabEntity always have unique IDs
+        if TYPE_CHECKING:
+            assert entity_unique_id is not None
+        self._entities.append((platform_domain, entity_unique_id))
+
+    @property
+    def hash(self) -> int:
+        """Return the hash for this configuration."""
+        return self._hash
+
+    @property
+    def entities(self) -> list[tuple[str, str]]:
+        """Return array of entities available."""
+        return self._entities
+
+
+async def create_discover_device_info(
+    hass: HomeAssistant, config_entry: PGLabConfigEntry, pglab_device: PyPGLabDevice
+) -> DiscoverDeviceInfo:
+    """Create a new DiscoverDeviceInfo instance."""
+    discovery_info = DiscoverDeviceInfo(hass, config_entry, pglab_device)
+
+    # Subscribe to sensor state changes.
+    await discovery_info.coordinator.subscribe_topics()
+    return discovery_info
+
+
+@dataclass
+class PGLabDiscovery:
+    """Discovery a PGLab device with the following MQTT topic format pglab/discovery/[device]/config."""
+
+    def __init__(self) -> None:
+        """Initialize the discovery class."""
+        self._substate: dict[str, EntitySubscription] = {}
+        self._discovery_topic = DISCOVERY_TOPIC
+        self._mqtt_client = None
+        self._discovered: dict[str, DiscoverDeviceInfo] = {}
+        self._disconnect_platform: list = []
+
+    async def __build_device(
+        self, mqtt: PyPGLabMqttClient, msg: ReceiveMessage
+    ) -> PyPGLabDevice:
+        """Build a PGLab device."""
+
+        # Check if the discovery message is in valid json format.
+        try:
+            payload = json.loads(msg.payload)
+        except ValueError as err:
+            raise PGLabDiscoveryError(
+                f"Can't decode discovery payload: {msg.payload!r}"
+            ) from err
+
+        device_id = "id"
+
+        # Check if the key id is present in the payload. It must always be present.
+        if device_id not in payload:
+            raise PGLabDiscoveryError(
+                "Unexpected discovery payload format, id key not present"
+            )
+
+        # Do a sanity check: the id must match the discovery topic /pglab/discovery/[id]/config
+        topic = msg.topic
+        if not topic.endswith(f"{payload[device_id]}/config"):
+            raise PGLabDiscoveryError("Unexpected discovery topic format")
+
+        # Build and configure the PGLab device.
+        pglab_device = PyPGLabDevice()
+        if not await pglab_device.config(mqtt, payload):
+            raise PGLabDiscoveryError("Error during setup of a new discovered device")
+
+        return pglab_device
+
+    def __clean_discovered_device(self, hass: HomeAssistant, device_id: str) -> None:
+        """Destroy the device and any entities connected to the device."""
+
+        if device_id not in self._discovered:
+            return
+
+        discovery_info = self._discovered[device_id]
+
+        # Destroy all entities connected to the device.
+        entity_registry = er.async_get(hass)
+        for platform, unique_id in discovery_info.entities:
+            if entity_id := entity_registry.async_get_entity_id(
+                platform, DOMAIN, unique_id
+            ):
+                entity_registry.async_remove(entity_id)
+
+        # Destroy the device.
+        device_registry = dr.async_get(hass)
+        if device_entry := device_registry.async_get_device(
+            identifiers={(DOMAIN, device_id)}
+        ):
+            device_registry.async_remove_device(device_entry.id)
+
+        # Clean the discovery info.
+        del self._discovered[device_id]
+
+    async def start(
+        self,
+        hass: HomeAssistant,
+        mqtt: PyPGLabMqttClient,
+        config_entry: PGLabConfigEntry,
+    ) -> None:
+        """Start discovering a PGLab devices."""
+
+        async def discovery_message_received(msg: ReceiveMessage) -> None:
+            """Received a new discovery message."""
+
+            # Create a PGLab device and add entities.
+            try:
+                pglab_device = await self.__build_device(mqtt, msg)
+            except PGLabDiscoveryError as err:
+                LOGGER.warning("Can't create PGLabDiscovery instance(%s) ", str(err))
+
+                # For some reason it's not possible to create the device with the discovery message,
+                # be sure that any previous device with the same topic is now destroyed.
+                device_id = get_device_id_from_discovery_topic(msg.topic)
+
+                # If there is a valid topic device_id clean everything relative to the device.
+                if device_id:
+                    self.__clean_discovered_device(hass, device_id)
+
+                return
+
+            # Create a new device.
+            device_registry = dr.async_get(hass)
+            device_registry.async_get_or_create(
+                config_entry_id=config_entry.entry_id,
+                configuration_url=f"http://{pglab_device.ip}/",
+                connections={(CONNECTION_NETWORK_MAC, pglab_device.mac)},
+                identifiers={(DOMAIN, pglab_device.id)},
+                manufacturer=pglab_device.manufactor,
+                model=pglab_device.type,
+                name=pglab_device.name,
+                sw_version=pglab_device.firmware_version,
+                hw_version=pglab_device.hardware_version,
+            )
+
+            # Do some checking if previous entities must be updated.
+            if pglab_device.id in self._discovered:
+                # The device is already been discovered,
+                # get the old discovery info data.
+                discovery_info = self._discovered[pglab_device.id]
+
+                if discovery_info.hash == pglab_device.hash:
+                    # Best case, there is nothing to do.
+                    # The device is still in the same configuration. Same name, same shutters, same relay etc.
+                    return
+
+                LOGGER.warning(
+                    "Changed internal configuration of device(%s). Rebuilding all entities",
+                    pglab_device.id,
+                )
+
+                # Something has changed, all previous entities must be destroyed and re-created.
+                self.__clean_discovered_device(hass, pglab_device.id)
+
+            # Add a new device.
+            discovery_info = await create_discover_device_info(
+                hass, config_entry, pglab_device
+            )
+            self._discovered[pglab_device.id] = discovery_info
+
+            # Create all new cover entities.
+            for s in pglab_device.shutters:
+                # the HA entity is not yet created, send a message to create it
+                async_dispatcher_send(
+                    hass, CREATE_NEW_ENTITY[Platform.COVER], pglab_device, s
+                )
+
+            # Create all new relay entities.
+            for r in pglab_device.relays:
+                # The HA entity is not yet created, send a message to create it.
+                async_dispatcher_send(
+                    hass, CREATE_NEW_ENTITY[Platform.SWITCH], pglab_device, r
+                )
+
+            # Create all new sensor entities.
+            async_dispatcher_send(
+                hass,
+                CREATE_NEW_ENTITY[Platform.SENSOR],
+                pglab_device,
+                discovery_info.coordinator,
+            )
+
+        topics = {
+            "discovery_topic": {
+                "topic": f"{self._discovery_topic}/#",
+                "msg_callback": discovery_message_received,
+            }
+        }
+
+        # Forward setup all HA supported platforms.
+        await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
+
+        self._mqtt_client = mqtt
+        self._substate = async_prepare_subscribe_topics(hass, self._substate, topics)
+        await async_subscribe_topics(hass, self._substate)
+
+    async def register_platform(
+        self, hass: HomeAssistant, platform: Platform, target: Callable[..., Any]
+    ):
+        """Register a callback to create entity of a specific HA platform."""
+        disconnect_callback = async_dispatcher_connect(
+            hass, CREATE_NEW_ENTITY[platform], target
+        )
+        self._disconnect_platform.append(disconnect_callback)
+
+    async def stop(self, hass: HomeAssistant, config_entry: PGLabConfigEntry) -> None:
+        """Stop to discovery PG LAB devices."""
+        await hass.config_entries.async_unload_platforms(config_entry, PLATFORMS)
+
+        # Disconnect all registered platforms.
+        for disconnect_callback in self._disconnect_platform:
+            disconnect_callback()
+
+        async_unsubscribe_topics(hass, self._substate)
+
+    async def add_entity(
+        self, platform_domain: str, entity_unique_id: str | None, device_id: str
+    ):
+        """Save a new PG LAB device entity."""
+
+        # Be sure that the device is been discovered.
+        if device_id not in self._discovered:
+            raise PGLabDiscoveryError("Unknown device, device_id not discovered")
+
+        discovery_info = self._discovered[device_id]
+        discovery_info.add_entity(platform_domain, entity_unique_id)
diff --git a/homeassistant/components/pglab/entity.py b/homeassistant/components/pglab/entity.py
new file mode 100644
index 00000000000..59a4e28de89
--- /dev/null
+++ b/homeassistant/components/pglab/entity.py
@@ -0,0 +1,112 @@
+"""Entity for PG LAB Electronics."""
+
+from __future__ import annotations
+
+from pypglab.device import Device as PyPGLabDevice
+from pypglab.entity import Entity as PyPGLabEntity
+
+from homeassistant.core import callback
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
+from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+from .coordinator import PGLabSensorsCoordinator
+from .discovery import PGLabDiscovery
+
+
+class PGLabBaseEntity(Entity):
+    """Base class of a PGLab entity in Home Assistant."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        pglab_discovery: PGLabDiscovery,
+        pglab_device: PyPGLabDevice,
+    ) -> None:
+        """Initialize the class."""
+
+        self._device_id = pglab_device.id
+        self._discovery = pglab_discovery
+
+        # Information about the device that is partially visible in the UI.
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, pglab_device.id)},
+            name=pglab_device.name,
+            sw_version=pglab_device.firmware_version,
+            hw_version=pglab_device.hardware_version,
+            model=pglab_device.type,
+            manufacturer=pglab_device.manufactor,
+            configuration_url=f"http://{pglab_device.ip}/",
+            connections={(CONNECTION_NETWORK_MAC, pglab_device.mac)},
+        )
+
+    async def async_added_to_hass(self) -> None:
+        """Update the device discovery info."""
+
+        # Inform PGLab discovery instance that a new entity is available.
+        # This is important to know in case the device needs to be reconfigured
+        # and the entity can be potentially destroyed.
+        await self._discovery.add_entity(
+            self.platform.domain,
+            self.unique_id,
+            self._device_id,
+        )
+
+        # propagate the async_added_to_hass to the super class
+        await super().async_added_to_hass()
+
+
+class PGLabEntity(PGLabBaseEntity):
+    """Representation of a PGLab entity in Home Assistant."""
+
+    def __init__(
+        self,
+        pglab_discovery: PGLabDiscovery,
+        pglab_device: PyPGLabDevice,
+        pglab_entity: PyPGLabEntity,
+    ) -> None:
+        """Initialize the class."""
+
+        super().__init__(pglab_discovery, pglab_device)
+
+        self._id = pglab_entity.id
+        self._entity: PyPGLabEntity = pglab_entity
+
+    async def async_added_to_hass(self) -> None:
+        """Subscribe pypglab entity to be updated from mqtt when pypglab entity internal state change."""
+
+        # set the callback to be called when pypglab entity state is changed
+        self._entity.set_on_state_callback(self.state_updated)
+
+        # subscribe to the pypglab entity to receive updates from the mqtt broker
+        await self._entity.subscribe_topics()
+        await super().async_added_to_hass()
+
+    async def async_will_remove_from_hass(self) -> None:
+        """Unsubscribe when removed."""
+
+        await super().async_will_remove_from_hass()
+        await self._entity.unsubscribe_topics()
+        self._entity.set_on_state_callback(None)
+
+    @callback
+    def state_updated(self, payload: str) -> None:
+        """Handle state updates."""
+        self.async_write_ha_state()
+
+
+class PGLabSensorEntity(PGLabBaseEntity, CoordinatorEntity[PGLabSensorsCoordinator]):
+    """Representation of a PGLab sensor entity in Home Assistant."""
+
+    def __init__(
+        self,
+        pglab_discovery: PGLabDiscovery,
+        pglab_device: PyPGLabDevice,
+        pglab_coordinator: PGLabSensorsCoordinator,
+    ) -> None:
+        """Initialize the class."""
+
+        PGLabBaseEntity.__init__(self, pglab_discovery, pglab_device)
+        CoordinatorEntity.__init__(self, pglab_coordinator)
diff --git a/homeassistant/components/pglab/manifest.json b/homeassistant/components/pglab/manifest.json
new file mode 100644
index 00000000000..7f7d596be77
--- /dev/null
+++ b/homeassistant/components/pglab/manifest.json
@@ -0,0 +1,14 @@
+{
+  "domain": "pglab",
+  "name": "PG LAB Electronics",
+  "codeowners": ["@pglab-electronics"],
+  "config_flow": true,
+  "dependencies": ["mqtt"],
+  "documentation": "https://www.home-assistant.io/integrations/pglab",
+  "iot_class": "local_push",
+  "loggers": ["pglab"],
+  "mqtt": ["pglab/discovery/#"],
+  "quality_scale": "bronze",
+  "requirements": ["pypglab==0.0.3"],
+  "single_config_entry": true
+}
diff --git a/homeassistant/components/pglab/quality_scale.yaml b/homeassistant/components/pglab/quality_scale.yaml
new file mode 100644
index 00000000000..dda637e5833
--- /dev/null
+++ b/homeassistant/components/pglab/quality_scale.yaml
@@ -0,0 +1,80 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: The integration does not provide any additional actions.
+  appropriate-polling:
+    status: exempt
+    comment: The integration does not poll.
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: The integration does not provide any additional actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup: done
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure:
+    status: exempt
+    comment: The integration relies solely on auto-discovery.
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions:
+    status: exempt
+    comment: The integration does not provide any additional actions.
+  config-entry-unloading: done
+  docs-configuration-parameters:
+    status: exempt
+    comment: No options flow.
+  docs-installation-parameters:
+    status: exempt
+    comment: There are no parameters.
+  entity-unavailable: todo
+  integration-owner: done
+  log-when-unavailable: todo
+  parallel-updates: done
+  reauthentication-flow:
+    status: exempt
+    comment: The integration does not require authentication.
+  test-coverage: todo
+
+  # Gold
+  devices: done
+  diagnostics: todo
+  discovery-update-info: done
+  discovery: done
+  docs-data-update: todo
+  docs-examples: todo
+  docs-known-limitations: todo
+  docs-supported-devices: todo
+  docs-supported-functions: done
+  docs-troubleshooting: todo
+  docs-use-cases: todo
+  dynamic-devices: done
+  entity-category: done
+  entity-device-class: done
+  entity-disabled-by-default: done
+  entity-translations: todo
+  exception-translations: todo
+  icon-translations: todo
+  reconfiguration-flow:
+    status: exempt
+    comment: The integration has no settings.
+  repair-issues: todo
+  stale-devices: todo
+
+  # Platinum
+  async-dependency: done
+  inject-websession:
+    status: exempt
+    comment: The integration does not make HTTP requests.
+  strict-typing: todo
diff --git a/homeassistant/components/pglab/sensor.py b/homeassistant/components/pglab/sensor.py
new file mode 100644
index 00000000000..ce19ec3a21a
--- /dev/null
+++ b/homeassistant/components/pglab/sensor.py
@@ -0,0 +1,109 @@
+"""Sensor for PG LAB Electronics."""
+
+from __future__ import annotations
+
+from pypglab.const import SENSOR_REBOOT_TIME, SENSOR_TEMPERATURE, SENSOR_VOLTAGE
+from pypglab.device import Device as PyPGLabDevice
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
+from homeassistant.const import Platform, UnitOfElectricPotential, UnitOfTemperature
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import PGLabConfigEntry
+from .coordinator import PGLabSensorsCoordinator
+from .discovery import PGLabDiscovery
+from .entity import PGLabSensorEntity
+
+PARALLEL_UPDATES = 0
+
+SENSOR_INFO: list[SensorEntityDescription] = [
+    SensorEntityDescription(
+        key=SENSOR_TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SensorEntityDescription(
+        key=SENSOR_VOLTAGE,
+        translation_key="mpu_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SensorEntityDescription(
+        key=SENSOR_REBOOT_TIME,
+        translation_key="runtime",
+        device_class=SensorDeviceClass.TIMESTAMP,
+        icon="mdi:progress-clock",
+    ),
+]
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: PGLabConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up sensor for device."""
+
+    @callback
+    def async_discover(
+        pglab_device: PyPGLabDevice,
+        pglab_coordinator: PGLabSensorsCoordinator,
+    ) -> None:
+        """Discover and add a PG LAB Sensor."""
+        pglab_discovery = config_entry.runtime_data
+
+        sensors: list[PGLabSensor] = [
+            PGLabSensor(
+                description,
+                pglab_discovery,
+                pglab_device,
+                pglab_coordinator,
+            )
+            for description in SENSOR_INFO
+        ]
+
+        async_add_entities(sensors)
+
+    # Register the callback to create the sensor entity when discovered.
+    pglab_discovery = config_entry.runtime_data
+    await pglab_discovery.register_platform(hass, Platform.SENSOR, async_discover)
+
+
+class PGLabSensor(PGLabSensorEntity, SensorEntity):
+    """A PGLab sensor."""
+
+    def __init__(
+        self,
+        description: SensorEntityDescription,
+        pglab_discovery: PGLabDiscovery,
+        pglab_device: PyPGLabDevice,
+        pglab_coordinator: PGLabSensorsCoordinator,
+    ) -> None:
+        """Initialize the Sensor class."""
+
+        super().__init__(pglab_discovery, pglab_device, pglab_coordinator)
+
+        self._attr_unique_id = f"{pglab_device.id}_{description.key}"
+        self.entity_description = description
+
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Update attributes when the coordinator updates."""
+
+        self._attr_native_value = self.coordinator.get_sensor_value(
+            self.entity_description.key
+        )
+        super()._handle_coordinator_update()
+
+    @property
+    def available(self) -> bool:
+        """Return PG LAB sensor availability."""
+        return super().available and self.native_value is not None
diff --git a/homeassistant/components/pglab/strings.json b/homeassistant/components/pglab/strings.json
new file mode 100644
index 00000000000..c6f80d12f09
--- /dev/null
+++ b/homeassistant/components/pglab/strings.json
@@ -0,0 +1,40 @@
+{
+  "config": {
+    "step": {
+      "confirm_from_user": {
+        "description": "In order to be found PG LAB Electronics devices need to be connected to the same broker as the Home Assistant MQTT integration client. Do you want to continue?"
+      },
+      "confirm_from_mqtt": {
+        "description": "Do you want to set up PG LAB Electronics?"
+      }
+    },
+    "abort": {
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
+      "mqtt_not_connected": "Home Assistant MQTT integration not connected to MQTT broker.",
+      "mqtt_not_configured": "Home Assistant MQTT integration not configured."
+    }
+  },
+  "entity": {
+    "cover": {
+      "shutter": {
+        "name": "Shutter {shutter_id}"
+      }
+    },
+    "switch": {
+      "relay": {
+        "name": "Relay {relay_id}"
+      }
+    },
+    "sensor": {
+      "temperature": {
+        "name": "Temperature"
+      },
+      "runtime": {
+        "name": "Run time"
+      },
+      "mpu_voltage": {
+        "name": "MPU voltage"
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/pglab/switch.py b/homeassistant/components/pglab/switch.py
new file mode 100644
index 00000000000..76b177e84c4
--- /dev/null
+++ b/homeassistant/components/pglab/switch.py
@@ -0,0 +1,76 @@
+"""Switch for PG LAB Electronics."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from pypglab.device import Device as PyPGLabDevice
+from pypglab.relay import Relay as PyPGLabRelay
+
+from homeassistant.components.switch import SwitchEntity
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import PGLabConfigEntry
+from .discovery import PGLabDiscovery
+from .entity import PGLabEntity
+
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: PGLabConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up switches for device."""
+
+    @callback
+    def async_discover(pglab_device: PyPGLabDevice, pglab_relay: PyPGLabRelay) -> None:
+        """Discover and add a PGLab Relay."""
+        pglab_discovery = config_entry.runtime_data
+        pglab_switch = PGLabSwitch(pglab_discovery, pglab_device, pglab_relay)
+        async_add_entities([pglab_switch])
+
+    # Register the callback to create the switch entity when discovered.
+    pglab_discovery = config_entry.runtime_data
+    await pglab_discovery.register_platform(hass, Platform.SWITCH, async_discover)
+
+
+class PGLabSwitch(PGLabEntity, SwitchEntity):
+    """A PGLab switch."""
+
+    _attr_translation_key = "relay"
+
+    def __init__(
+        self,
+        pglab_discovery: PGLabDiscovery,
+        pglab_device: PyPGLabDevice,
+        pglab_relay: PyPGLabRelay,
+    ) -> None:
+        """Initialize the Switch class."""
+
+        super().__init__(
+            pglab_discovery,
+            pglab_device,
+            pglab_relay,
+        )
+
+        self._attr_unique_id = f"{pglab_device.id}_relay{pglab_relay.id}"
+        self._attr_translation_placeholders = {"relay_id": pglab_relay.id}
+
+        self._relay = pglab_relay
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the device on."""
+        await self._relay.turn_on()
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the device off."""
+        await self._relay.turn_off()
+
+    @property
+    def is_on(self) -> bool:
+        """Return true if device is on."""
+        return self._relay.state
diff --git a/homeassistant/components/philips_js/__init__.py b/homeassistant/components/philips_js/__init__.py
index 93f869e849d..9ff101915b8 100644
--- a/homeassistant/components/philips_js/__init__.py
+++ b/homeassistant/components/philips_js/__init__.py
@@ -7,7 +7,6 @@ import logging
 from haphilipsjs import PhilipsTV
 from haphilipsjs.typing import SystemType
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_API_VERSION,
     CONF_HOST,
@@ -18,7 +17,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 
 from .const import CONF_SYSTEM
-from .coordinator import PhilipsTVDataUpdateCoordinator
+from .coordinator import PhilipsTVConfigEntry, PhilipsTVDataUpdateCoordinator
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
@@ -30,8 +29,6 @@ PLATFORMS = [
 
 LOGGER = logging.getLogger(__name__)
 
-PhilipsTVConfigEntry = ConfigEntry[PhilipsTVDataUpdateCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: PhilipsTVConfigEntry) -> bool:
     """Set up Philips TV from a config entry."""
@@ -44,7 +41,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: PhilipsTVConfigEntry) ->
         password=entry.data.get(CONF_PASSWORD),
         system=system,
     )
-    coordinator = PhilipsTVDataUpdateCoordinator(hass, tvapi, entry.options)
+    coordinator = PhilipsTVDataUpdateCoordinator(hass, entry, tvapi)
 
     await coordinator.async_refresh()
 
diff --git a/homeassistant/components/philips_js/binary_sensor.py b/homeassistant/components/philips_js/binary_sensor.py
index 6de814efd97..3667d37dc48 100644
--- a/homeassistant/components/philips_js/binary_sensor.py
+++ b/homeassistant/components/philips_js/binary_sensor.py
@@ -11,10 +11,9 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import PhilipsTVConfigEntry
-from .coordinator import PhilipsTVDataUpdateCoordinator
+from .coordinator import PhilipsTVConfigEntry, PhilipsTVDataUpdateCoordinator
 from .entity import PhilipsJsEntity
 
 
@@ -42,7 +41,7 @@ DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: PhilipsTVConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the configuration entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/philips_js/coordinator.py b/homeassistant/components/philips_js/coordinator.py
index cae59fa5123..f450e971093 100644
--- a/homeassistant/components/philips_js/coordinator.py
+++ b/homeassistant/components/philips_js/coordinator.py
@@ -3,10 +3,8 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Mapping
 from datetime import timedelta
 import logging
-from typing import Any
 
 from haphilipsjs import (
     AutenticationFailure,
@@ -27,23 +25,28 @@ from .const import CONF_ALLOW_NOTIFY, CONF_SYSTEM, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
+type PhilipsTVConfigEntry = ConfigEntry[PhilipsTVDataUpdateCoordinator]
+
 
 class PhilipsTVDataUpdateCoordinator(DataUpdateCoordinator[None]):
     """Coordinator to update data."""
 
-    config_entry: ConfigEntry
+    config_entry: PhilipsTVConfigEntry
 
     def __init__(
-        self, hass: HomeAssistant, api: PhilipsTV, options: Mapping[str, Any]
+        self,
+        hass: HomeAssistant,
+        config_entry: PhilipsTVConfigEntry,
+        api: PhilipsTV,
     ) -> None:
         """Set up the coordinator."""
         self.api = api
-        self.options = options
         self._notify_future: asyncio.Task | None = None
 
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=30),
             request_refresh_debouncer=Debouncer(
@@ -91,7 +94,7 @@ class PhilipsTVDataUpdateCoordinator(DataUpdateCoordinator[None]):
             self.api.on
             and self.api.powerstate == "On"
             and self.api.notify_change_supported
-            and self.options.get(CONF_ALLOW_NOTIFY, False)
+            and self.config_entry.options.get(CONF_ALLOW_NOTIFY, False)
         )
 
     async def _notify_task(self):
diff --git a/homeassistant/components/philips_js/diagnostics.py b/homeassistant/components/philips_js/diagnostics.py
index 625b77f6c25..99b27b2c85a 100644
--- a/homeassistant/components/philips_js/diagnostics.py
+++ b/homeassistant/components/philips_js/diagnostics.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.core import HomeAssistant
 
-from . import PhilipsTVConfigEntry
+from .coordinator import PhilipsTVConfigEntry
 
 TO_REDACT = {
     "serialnumber_encrypted",
diff --git a/homeassistant/components/philips_js/light.py b/homeassistant/components/philips_js/light.py
index 1d63b2062e6..87e3323a30c 100644
--- a/homeassistant/components/philips_js/light.py
+++ b/homeassistant/components/philips_js/light.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Any
+from typing import Any, cast
 
 from haphilipsjs import PhilipsTV
 from haphilipsjs.typing import AmbilightCurrentConfiguration
@@ -18,11 +18,10 @@ from homeassistant.components.light import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.color import color_hsv_to_RGB, color_RGB_to_hsv
 
-from . import PhilipsTVConfigEntry
-from .coordinator import PhilipsTVDataUpdateCoordinator
+from .coordinator import PhilipsTVConfigEntry, PhilipsTVDataUpdateCoordinator
 from .entity import PhilipsJsEntity
 
 EFFECT_PARTITION = ": "
@@ -35,7 +34,7 @@ EFFECT_EXPERT_STYLES = {"FOLLOW_AUDIO", "FOLLOW_COLOR", "Lounge light"}
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: PhilipsTVConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the configuration entry."""
     coordinator = config_entry.runtime_data
@@ -329,7 +328,7 @@ class PhilipsTVLightEntity(PhilipsJsEntity, LightEntity):
         """Turn the bulb on."""
         brightness = kwargs.get(ATTR_BRIGHTNESS, self.brightness)
         hs_color = kwargs.get(ATTR_HS_COLOR, self.hs_color)
-        attr_effect = kwargs.get(ATTR_EFFECT, self.effect)
+        attr_effect = cast(str, kwargs.get(ATTR_EFFECT, self.effect))
 
         if not self._tv.on:
             raise HomeAssistantError("TV is not available")
diff --git a/homeassistant/components/philips_js/media_player.py b/homeassistant/components/philips_js/media_player.py
index bd8727ae9c1..a433a63f31f 100644
--- a/homeassistant/components/philips_js/media_player.py
+++ b/homeassistant/components/philips_js/media_player.py
@@ -18,11 +18,11 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.trigger import PluggableAction
 
-from . import LOGGER as _LOGGER, PhilipsTVConfigEntry
-from .coordinator import PhilipsTVDataUpdateCoordinator
+from . import LOGGER as _LOGGER
+from .coordinator import PhilipsTVConfigEntry, PhilipsTVDataUpdateCoordinator
 from .entity import PhilipsJsEntity
 from .helpers import async_get_turn_on_trigger
 
@@ -49,7 +49,7 @@ def _inverted(data):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: PhilipsTVConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the configuration entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/philips_js/remote.py b/homeassistant/components/philips_js/remote.py
index f8d9cb0885d..b026b33a857 100644
--- a/homeassistant/components/philips_js/remote.py
+++ b/homeassistant/components/philips_js/remote.py
@@ -13,11 +13,11 @@ from homeassistant.components.remote import (
     RemoteEntity,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.trigger import PluggableAction
 
-from . import LOGGER, PhilipsTVConfigEntry
-from .coordinator import PhilipsTVDataUpdateCoordinator
+from . import LOGGER
+from .coordinator import PhilipsTVConfigEntry, PhilipsTVDataUpdateCoordinator
 from .entity import PhilipsJsEntity
 from .helpers import async_get_turn_on_trigger
 
@@ -25,7 +25,7 @@ from .helpers import async_get_turn_on_trigger
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: PhilipsTVConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the configuration entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/philips_js/switch.py b/homeassistant/components/philips_js/switch.py
index b35b2ad4ff1..45963432665 100644
--- a/homeassistant/components/philips_js/switch.py
+++ b/homeassistant/components/philips_js/switch.py
@@ -6,10 +6,9 @@ from typing import Any
 
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import PhilipsTVConfigEntry
-from .coordinator import PhilipsTVDataUpdateCoordinator
+from .coordinator import PhilipsTVConfigEntry, PhilipsTVDataUpdateCoordinator
 from .entity import PhilipsJsEntity
 
 HUE_POWER_OFF = "Off"
@@ -19,7 +18,7 @@ HUE_POWER_ON = "On"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: PhilipsTVConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the configuration entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/pi_hole/binary_sensor.py b/homeassistant/components/pi_hole/binary_sensor.py
index 5e3ce560ab4..1d12307b6e5 100644
--- a/homeassistant/components/pi_hole/binary_sensor.py
+++ b/homeassistant/components/pi_hole/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from . import PiHoleConfigEntry
@@ -41,7 +41,7 @@ BINARY_SENSOR_TYPES: tuple[PiHoleBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PiHoleConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Pi-hole binary sensor."""
     name = entry.data[CONF_NAME]
diff --git a/homeassistant/components/pi_hole/sensor.py b/homeassistant/components/pi_hole/sensor.py
index 4cf5133e700..54a9cb23d02 100644
--- a/homeassistant/components/pi_hole/sensor.py
+++ b/homeassistant/components/pi_hole/sensor.py
@@ -7,7 +7,7 @@ from hole import Hole
 from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
 from homeassistant.const import CONF_NAME, PERCENTAGE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -47,7 +47,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PiHoleConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Pi-hole sensor."""
     name = entry.data[CONF_NAME]
diff --git a/homeassistant/components/pi_hole/strings.json b/homeassistant/components/pi_hole/strings.json
index 9e1d5948a09..504be7a62dd 100644
--- a/homeassistant/components/pi_hole/strings.json
+++ b/homeassistant/components/pi_hole/strings.json
@@ -17,8 +17,8 @@
         }
       },
       "reauth_confirm": {
-        "title": "Reauthenticate PI-Hole",
-        "description": "Please enter a new api key for PI-Hole at {host}/{location}",
+        "title": "Reauthenticate Pi-hole",
+        "description": "Please enter a new API key for Pi-hole at {host}/{location}",
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]"
         }
diff --git a/homeassistant/components/pi_hole/switch.py b/homeassistant/components/pi_hole/switch.py
index 805ba479a9e..84ffe7e51a4 100644
--- a/homeassistant/components/pi_hole/switch.py
+++ b/homeassistant/components/pi_hole/switch.py
@@ -12,7 +12,7 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import PiHoleConfigEntry
 from .const import SERVICE_DISABLE, SERVICE_DISABLE_ATTR_DURATION
@@ -24,7 +24,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PiHoleConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Pi-hole switch."""
     name = entry.data[CONF_NAME]
diff --git a/homeassistant/components/pi_hole/update.py b/homeassistant/components/pi_hole/update.py
index 510f5d1dc19..56e92b47289 100644
--- a/homeassistant/components/pi_hole/update.py
+++ b/homeassistant/components/pi_hole/update.py
@@ -10,7 +10,7 @@ from hole import Hole
 from homeassistant.components.update import UpdateEntity, UpdateEntityDescription
 from homeassistant.const import CONF_NAME, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from . import PiHoleConfigEntry
@@ -65,7 +65,7 @@ UPDATE_ENTITY_TYPES: tuple[PiHoleUpdateEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PiHoleConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Pi-hole update entities."""
     name = entry.data[CONF_NAME]
diff --git a/homeassistant/components/picnic/__init__.py b/homeassistant/components/picnic/__init__.py
index d2f023af79f..8de407133cd 100644
--- a/homeassistant/components/picnic/__init__.py
+++ b/homeassistant/components/picnic/__init__.py
@@ -1,6 +1,6 @@
 """The Picnic integration."""
 
-from python_picnic_api import PicnicAPI
+from python_picnic_api2 import PicnicAPI
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_COUNTRY_CODE, Platform
diff --git a/homeassistant/components/picnic/config_flow.py b/homeassistant/components/picnic/config_flow.py
index 4c8281f21de..a60086173a8 100644
--- a/homeassistant/components/picnic/config_flow.py
+++ b/homeassistant/components/picnic/config_flow.py
@@ -6,8 +6,8 @@ from collections.abc import Mapping
 import logging
 from typing import Any
 
-from python_picnic_api import PicnicAPI
-from python_picnic_api.session import PicnicAuthError
+from python_picnic_api2 import PicnicAPI
+from python_picnic_api2.session import PicnicAuthError
 import requests
 import voluptuous as vol
 
diff --git a/homeassistant/components/picnic/coordinator.py b/homeassistant/components/picnic/coordinator.py
index b3979580990..9b23157dbf3 100644
--- a/homeassistant/components/picnic/coordinator.py
+++ b/homeassistant/components/picnic/coordinator.py
@@ -6,8 +6,8 @@ import copy
 from datetime import timedelta
 import logging
 
-from python_picnic_api import PicnicAPI
-from python_picnic_api.session import PicnicAuthError
+from python_picnic_api2 import PicnicAPI
+from python_picnic_api2.session import PicnicAuthError
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ACCESS_TOKEN
@@ -21,6 +21,8 @@ from .const import ADDRESS, CART_DATA, LAST_ORDER_DATA, NEXT_DELIVERY_DATA, SLOT
 class PicnicUpdateCoordinator(DataUpdateCoordinator):
     """The coordinator to fetch data from the Picnic API at a set interval."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
@@ -29,13 +31,13 @@ class PicnicUpdateCoordinator(DataUpdateCoordinator):
     ) -> None:
         """Initialize the coordinator with the given Picnic API client."""
         self.picnic_api_client = picnic_api_client
-        self.config_entry = config_entry
         self._user_address = None
 
         logger = logging.getLogger(__name__)
         super().__init__(
             hass,
             logger,
+            config_entry=config_entry,
             name="Picnic coordinator",
             update_interval=timedelta(minutes=30),
         )
diff --git a/homeassistant/components/picnic/manifest.json b/homeassistant/components/picnic/manifest.json
index 947dd0241d2..251964c15d0 100644
--- a/homeassistant/components/picnic/manifest.json
+++ b/homeassistant/components/picnic/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "picnic",
   "name": "Picnic",
-  "codeowners": ["@corneyl"],
+  "codeowners": ["@corneyl", "@codesalatdev"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/picnic",
   "iot_class": "cloud_polling",
-  "loggers": ["python_picnic_api"],
-  "requirements": ["python-picnic-api==1.1.0"]
+  "loggers": ["python_picnic_api2"],
+  "requirements": ["python-picnic-api2==1.2.4"]
 }
diff --git a/homeassistant/components/picnic/sensor.py b/homeassistant/components/picnic/sensor.py
index 866bd6b56c1..dcfd9086491 100644
--- a/homeassistant/components/picnic/sensor.py
+++ b/homeassistant/components/picnic/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CURRENCY_EURO
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import dt as dt_util
@@ -203,7 +203,7 @@ SENSOR_TYPES: tuple[PicnicSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Picnic sensor entries."""
     picnic_coordinator = hass.data[DOMAIN][config_entry.entry_id][CONF_COORDINATOR]
diff --git a/homeassistant/components/picnic/services.py b/homeassistant/components/picnic/services.py
index c01fc00a29e..76d7b8a6c44 100644
--- a/homeassistant/components/picnic/services.py
+++ b/homeassistant/components/picnic/services.py
@@ -4,11 +4,11 @@ from __future__ import annotations
 
 from typing import cast
 
-from python_picnic_api import PicnicAPI
+from python_picnic_api2 import PicnicAPI
 import voluptuous as vol
 
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import (
     ATTR_AMOUNT,
diff --git a/homeassistant/components/picnic/todo.py b/homeassistant/components/picnic/todo.py
index 7fa2bbccd3e..383c236de3c 100644
--- a/homeassistant/components/picnic/todo.py
+++ b/homeassistant/components/picnic/todo.py
@@ -15,7 +15,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import CONF_COORDINATOR, DOMAIN
@@ -28,7 +28,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Picnic shopping cart todo platform config entry."""
     picnic_coordinator = hass.data[DOMAIN][config_entry.entry_id][CONF_COORDINATOR]
diff --git a/homeassistant/components/pilight/__init__.py b/homeassistant/components/pilight/__init__.py
index 21d5603e4c2..5f1238772b0 100644
--- a/homeassistant/components/pilight/__init__.py
+++ b/homeassistant/components/pilight/__init__.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import track_point_in_utc_time
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import dt as dt_util
diff --git a/homeassistant/components/pilight/entity.py b/homeassistant/components/pilight/entity.py
index d2d83813516..fbfa5cfb5e1 100644
--- a/homeassistant/components/pilight/entity.py
+++ b/homeassistant/components/pilight/entity.py
@@ -10,7 +10,7 @@ from homeassistant.const import (
     STATE_OFF,
     STATE_ON,
 )
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from . import DOMAIN, EVENT, SERVICE_NAME
@@ -86,7 +86,7 @@ class PilightBaseDevice(RestoreEntity):
 
         self._brightness = 255
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Call when entity about to be added to hass."""
         await super().async_added_to_hass()
         if state := await self.async_get_last_state():
@@ -99,7 +99,7 @@ class PilightBaseDevice(RestoreEntity):
         return self._name
 
     @property
-    def assumed_state(self):
+    def assumed_state(self) -> bool:
         """Return True if unable to access real state of the entity."""
         return True
 
diff --git a/homeassistant/components/pilight/light.py b/homeassistant/components/pilight/light.py
index c3d1a3c234c..9e1ecbf59d4 100644
--- a/homeassistant/components/pilight/light.py
+++ b/homeassistant/components/pilight/light.py
@@ -14,7 +14,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import CONF_LIGHTS
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/pilight/sensor.py b/homeassistant/components/pilight/sensor.py
index 5ab80f57dc6..532681e2b93 100644
--- a/homeassistant/components/pilight/sensor.py
+++ b/homeassistant/components/pilight/sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_NAME, CONF_PAYLOAD, CONF_UNIT_OF_MEASUREMENT
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/pilight/switch.py b/homeassistant/components/pilight/switch.py
index a1976921269..9b812075e17 100644
--- a/homeassistant/components/pilight/switch.py
+++ b/homeassistant/components/pilight/switch.py
@@ -10,7 +10,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import CONF_SWITCHES
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/ping/__init__.py b/homeassistant/components/ping/__init__.py
index 4b03e5e4407..14203541359 100644
--- a/homeassistant/components/ping/__init__.py
+++ b/homeassistant/components/ping/__init__.py
@@ -6,7 +6,6 @@ import logging
 
 from icmplib import SocketPermissionError, async_ping
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
@@ -14,7 +13,7 @@ from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.hass_dict import HassKey
 
 from .const import CONF_PING_COUNT, DOMAIN
-from .coordinator import PingUpdateCoordinator
+from .coordinator import PingConfigEntry, PingUpdateCoordinator
 from .helpers import PingDataICMPLib, PingDataSubProcess
 
 _LOGGER = logging.getLogger(__name__)
@@ -24,9 +23,6 @@ PLATFORMS = [Platform.BINARY_SENSOR, Platform.DEVICE_TRACKER, Platform.SENSOR]
 DATA_PRIVILEGED_KEY: HassKey[bool | None] = HassKey(DOMAIN)
 
 
-type PingConfigEntry = ConfigEntry[PingUpdateCoordinator]
-
-
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the ping integration."""
     hass.data[DATA_PRIVILEGED_KEY] = await _can_use_icmp_lib_with_privilege()
@@ -47,7 +43,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: PingConfigEntry) -> bool
         ping_cls = PingDataICMPLib
 
     coordinator = PingUpdateCoordinator(
-        hass=hass, ping=ping_cls(hass, host, count, privileged)
+        hass=hass, config_entry=entry, ping=ping_cls(hass, host, count, privileged)
     )
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/ping/binary_sensor.py b/homeassistant/components/ping/binary_sensor.py
index 5c50e4335f9..35bf2707694 100644
--- a/homeassistant/components/ping/binary_sensor.py
+++ b/homeassistant/components/ping/binary_sensor.py
@@ -6,18 +6,18 @@ from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import PingConfigEntry
 from .const import CONF_IMPORTED_BY
-from .coordinator import PingUpdateCoordinator
+from .coordinator import PingConfigEntry, PingUpdateCoordinator
 from .entity import PingEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: PingConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: PingConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Ping config entry."""
     async_add_entities([PingBinarySensor(entry, entry.runtime_data)])
@@ -31,7 +31,7 @@ class PingBinarySensor(PingEntity, BinarySensorEntity):
     _attr_name = None
 
     def __init__(
-        self, config_entry: ConfigEntry, coordinator: PingUpdateCoordinator
+        self, config_entry: PingConfigEntry, coordinator: PingUpdateCoordinator
     ) -> None:
         """Initialize the Ping Binary sensor."""
         super().__init__(config_entry, coordinator, config_entry.entry_id)
diff --git a/homeassistant/components/ping/coordinator.py b/homeassistant/components/ping/coordinator.py
index 38ab2e79ffc..afb7de4dce3 100644
--- a/homeassistant/components/ping/coordinator.py
+++ b/homeassistant/components/ping/coordinator.py
@@ -7,6 +7,7 @@ from datetime import timedelta
 import logging
 from typing import Any
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -14,6 +15,8 @@ from .helpers import PingDataICMPLib, PingDataSubProcess
 
 _LOGGER = logging.getLogger(__name__)
 
+type PingConfigEntry = ConfigEntry[PingUpdateCoordinator]
+
 
 @dataclass(slots=True, frozen=True)
 class PingResult:
@@ -27,11 +30,13 @@ class PingResult:
 class PingUpdateCoordinator(DataUpdateCoordinator[PingResult]):
     """The Ping update coordinator."""
 
+    config_entry: PingConfigEntry
     ping: PingDataSubProcess | PingDataICMPLib
 
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: PingConfigEntry,
         ping: PingDataSubProcess | PingDataICMPLib,
     ) -> None:
         """Initialize the Ping coordinator."""
@@ -40,6 +45,7 @@ class PingUpdateCoordinator(DataUpdateCoordinator[PingResult]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=f"Ping {ping.ip_address}",
             update_interval=timedelta(seconds=30),
         )
diff --git a/homeassistant/components/ping/device_tracker.py b/homeassistant/components/ping/device_tracker.py
index 29a4e922234..9d093da262d 100644
--- a/homeassistant/components/ping/device_tracker.py
+++ b/homeassistant/components/ping/device_tracker.py
@@ -9,19 +9,19 @@ from homeassistant.components.device_tracker import (
     DEFAULT_CONSIDER_HOME,
     ScannerEntity,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import dt as dt_util
 
-from . import PingConfigEntry
 from .const import CONF_IMPORTED_BY
-from .coordinator import PingUpdateCoordinator
+from .coordinator import PingConfigEntry, PingUpdateCoordinator
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: PingConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: PingConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Ping config entry."""
     async_add_entities([PingDeviceTracker(entry, entry.runtime_data)])
@@ -33,7 +33,7 @@ class PingDeviceTracker(CoordinatorEntity[PingUpdateCoordinator], ScannerEntity)
     _last_seen: datetime | None = None
 
     def __init__(
-        self, config_entry: ConfigEntry, coordinator: PingUpdateCoordinator
+        self, config_entry: PingConfigEntry, coordinator: PingUpdateCoordinator
     ) -> None:
         """Initialize the Ping device tracker."""
         super().__init__(coordinator)
diff --git a/homeassistant/components/ping/entity.py b/homeassistant/components/ping/entity.py
index a1f84f6ef32..d592ef6b549 100644
--- a/homeassistant/components/ping/entity.py
+++ b/homeassistant/components/ping/entity.py
@@ -1,11 +1,10 @@
 """Base entity for the Ping component."""
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .coordinator import PingUpdateCoordinator
+from .coordinator import PingConfigEntry, PingUpdateCoordinator
 
 
 class PingEntity(CoordinatorEntity[PingUpdateCoordinator]):
@@ -15,7 +14,7 @@ class PingEntity(CoordinatorEntity[PingUpdateCoordinator]):
 
     def __init__(
         self,
-        config_entry: ConfigEntry,
+        config_entry: PingConfigEntry,
         coordinator: PingUpdateCoordinator,
         unique_id: str,
     ) -> None:
diff --git a/homeassistant/components/ping/sensor.py b/homeassistant/components/ping/sensor.py
index 6e6c4cf2cde..82d88064e02 100644
--- a/homeassistant/components/ping/sensor.py
+++ b/homeassistant/components/ping/sensor.py
@@ -12,10 +12,9 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import PingConfigEntry
-from .coordinator import PingResult, PingUpdateCoordinator
+from .coordinator import PingConfigEntry, PingResult, PingUpdateCoordinator
 from .entity import PingEntity
 
 
@@ -76,7 +75,9 @@ SENSORS: tuple[PingSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: PingConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: PingConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Ping sensors from config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/ping/strings.json b/homeassistant/components/ping/strings.json
index ef9f74b4207..c301a1b277d 100644
--- a/homeassistant/components/ping/strings.json
+++ b/homeassistant/components/ping/strings.json
@@ -2,16 +2,16 @@
   "entity": {
     "sensor": {
       "round_trip_time_avg": {
-        "name": "Round Trip Time Average"
+        "name": "Round-trip time average"
       },
       "round_trip_time_max": {
-        "name": "Round Trip Time Maximum"
+        "name": "Round-trip time maximum"
       },
       "round_trip_time_mdev": {
-        "name": "Round Trip Time Mean Deviation"
+        "name": "Round-trip time mean deviation"
       },
       "round_trip_time_min": {
-        "name": "Round Trip Time Minimum"
+        "name": "Round-trip time minimum"
       }
     }
   },
diff --git a/homeassistant/components/pioneer/media_player.py b/homeassistant/components/pioneer/media_player.py
index 02072b6cb43..385acbe4818 100644
--- a/homeassistant/components/pioneer/media_player.py
+++ b/homeassistant/components/pioneer/media_player.py
@@ -16,7 +16,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT, CONF_TIMEOUT
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/pjlink/media_player.py b/homeassistant/components/pjlink/media_player.py
index 93f8ea5ad9b..1e035205f8f 100644
--- a/homeassistant/components/pjlink/media_player.py
+++ b/homeassistant/components/pjlink/media_player.py
@@ -14,7 +14,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/plaato/__init__.py b/homeassistant/components/plaato/__init__.py
index 585b6ecfd82..14e757d4623 100644
--- a/homeassistant/components/plaato/__init__.py
+++ b/homeassistant/components/plaato/__init__.py
@@ -32,7 +32,7 @@ from homeassistant.const import (
     UnitOfVolume,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 
 from .const import (
@@ -121,7 +121,9 @@ async def async_setup_coordinator(hass: HomeAssistant, entry: ConfigEntry):
     else:
         update_interval = timedelta(minutes=DEFAULT_SCAN_INTERVAL)
 
-    coordinator = PlaatoCoordinator(hass, auth_token, device_type, update_interval)
+    coordinator = PlaatoCoordinator(
+        hass, entry, auth_token, device_type, update_interval
+    )
     await coordinator.async_config_entry_first_refresh()
 
     _set_entry_data(entry, hass, coordinator, auth_token)
diff --git a/homeassistant/components/plaato/binary_sensor.py b/homeassistant/components/plaato/binary_sensor.py
index 42019bbec9b..b71673aa1fd 100644
--- a/homeassistant/components/plaato/binary_sensor.py
+++ b/homeassistant/components/plaato/binary_sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_USE_WEBHOOK, COORDINATOR, DOMAIN
 from .entity import PlaatoEntity
@@ -19,7 +19,7 @@ from .entity import PlaatoEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Plaato from a config entry."""
 
diff --git a/homeassistant/components/plaato/config_flow.py b/homeassistant/components/plaato/config_flow.py
index f398a733cd6..9adfb4a14fe 100644
--- a/homeassistant/components/plaato/config_flow.py
+++ b/homeassistant/components/plaato/config_flow.py
@@ -16,7 +16,7 @@ from homeassistant.config_entries import (
 )
 from homeassistant.const import CONF_SCAN_INTERVAL, CONF_TOKEN, CONF_WEBHOOK_ID
 from homeassistant.core import callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import (
     CONF_CLOUDHOOK,
diff --git a/homeassistant/components/plaato/coordinator.py b/homeassistant/components/plaato/coordinator.py
index 8d21f17880a..df360d50068 100644
--- a/homeassistant/components/plaato/coordinator.py
+++ b/homeassistant/components/plaato/coordinator.py
@@ -5,6 +5,7 @@ import logging
 
 from pyplaato.plaato import Plaato, PlaatoDeviceType
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import aiohttp_client
@@ -18,9 +19,12 @@ _LOGGER = logging.getLogger(__name__)
 class PlaatoCoordinator(DataUpdateCoordinator):
     """Class to manage fetching data from the API."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         auth_token: str,
         device_type: PlaatoDeviceType,
         update_interval: timedelta,
@@ -34,6 +38,7 @@ class PlaatoCoordinator(DataUpdateCoordinator):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=update_interval,
         )
diff --git a/homeassistant/components/plaato/entity.py b/homeassistant/components/plaato/entity.py
index 7ab8367bd1d..9cc63a38a64 100644
--- a/homeassistant/components/plaato/entity.py
+++ b/homeassistant/components/plaato/entity.py
@@ -73,13 +73,13 @@ class PlaatoEntity(entity.Entity):
         return None
 
     @property
-    def available(self):
+    def available(self) -> bool:
         """Return if sensor is available."""
         if self._coordinator is not None:
             return self._coordinator.last_update_success
         return True
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """When entity is added to hass."""
         if self._coordinator is not None:
             self.async_on_remove(
diff --git a/homeassistant/components/plaato/sensor.py b/homeassistant/components/plaato/sensor.py
index b11bac40144..7a98c8a1ced 100644
--- a/homeassistant/components/plaato/sensor.py
+++ b/homeassistant/components/plaato/sensor.py
@@ -12,7 +12,10 @@ from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import ATTR_TEMP, SENSOR_UPDATE
@@ -38,7 +41,9 @@ async def async_setup_platform(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Plaato from a config entry."""
     entry_data = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/plant/__init__.py b/homeassistant/components/plant/__init__.py
index 48c606865df..27993a93779 100644
--- a/homeassistant/components/plant/__init__.py
+++ b/homeassistant/components/plant/__init__.py
@@ -32,7 +32,7 @@ from homeassistant.core import (
     callback,
 )
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.event import async_track_state_change_event
diff --git a/homeassistant/components/plex/button.py b/homeassistant/components/plex/button.py
index 8bb34be38ce..5ed34eac6b2 100644
--- a/homeassistant/components/plex/button.py
+++ b/homeassistant/components/plex/button.py
@@ -8,7 +8,7 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_send
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import PlexServer
 from .const import CONF_SERVER_IDENTIFIER, DOMAIN, PLEX_UPDATE_PLATFORMS_SIGNAL
@@ -18,7 +18,7 @@ from .helpers import get_plex_server
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Plex button from config entry."""
     server_id: str = config_entry.data[CONF_SERVER_IDENTIFIER]
diff --git a/homeassistant/components/plex/config_flow.py b/homeassistant/components/plex/config_flow.py
index ae7cbb12574..3c9f35b20a4 100644
--- a/homeassistant/components/plex/config_flow.py
+++ b/homeassistant/components/plex/config_flow.py
@@ -36,9 +36,8 @@ from homeassistant.const import (
     CONF_VERIFY_SSL,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import discovery_flow
+from homeassistant.helpers import config_validation as cv, discovery_flow
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 
 from .const import (
     AUTH_CALLBACK_NAME,
diff --git a/homeassistant/components/plex/media_player.py b/homeassistant/components/plex/media_player.py
index 1dd79ad27a5..4a1654959f6 100644
--- a/homeassistant/components/plex/media_player.py
+++ b/homeassistant/components/plex/media_player.py
@@ -27,7 +27,7 @@ from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.network import is_internal_request
 
 from .const import (
@@ -68,7 +68,7 @@ def needs_session[_PlexMediaPlayerT: PlexMediaPlayer, **_P, _R](
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Plex media_player from a config entry."""
     server_id = config_entry.data[CONF_SERVER_IDENTIFIER]
diff --git a/homeassistant/components/plex/sensor.py b/homeassistant/components/plex/sensor.py
index eb27f465a7e..66e513dd83a 100644
--- a/homeassistant/components/plex/sensor.py
+++ b/homeassistant/components/plex/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CONF_SERVER_IDENTIFIER,
@@ -52,7 +52,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Plex sensor from a config entry."""
     server_id = config_entry.data[CONF_SERVER_IDENTIFIER]
diff --git a/homeassistant/components/plex/update.py b/homeassistant/components/plex/update.py
index 7acf4551f33..9b7645cd078 100644
--- a/homeassistant/components/plex/update.py
+++ b/homeassistant/components/plex/update.py
@@ -11,7 +11,7 @@ from homeassistant.components.update import UpdateEntity, UpdateEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_SERVER_IDENTIFIER
 from .helpers import get_plex_server
@@ -22,7 +22,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Plex update entities from a config entry."""
     server_id = config_entry.data[CONF_SERVER_IDENTIFIER]
diff --git a/homeassistant/components/plugwise/__init__.py b/homeassistant/components/plugwise/__init__.py
index a100103b029..e97493a78a7 100644
--- a/homeassistant/components/plugwise/__init__.py
+++ b/homeassistant/components/plugwise/__init__.py
@@ -4,22 +4,19 @@ from __future__ import annotations
 
 from typing import Any
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 
 from .const import DOMAIN, LOGGER, PLATFORMS
-from .coordinator import PlugwiseDataUpdateCoordinator
-
-type PlugwiseConfigEntry = ConfigEntry[PlugwiseDataUpdateCoordinator]
+from .coordinator import PlugwiseConfigEntry, PlugwiseDataUpdateCoordinator
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: PlugwiseConfigEntry) -> bool:
     """Set up Plugwise components from a config entry."""
     await er.async_migrate_entries(hass, entry.entry_id, async_migrate_entity_entry)
 
-    coordinator = PlugwiseDataUpdateCoordinator(hass)
+    coordinator = PlugwiseDataUpdateCoordinator(hass, entry)
     await coordinator.async_config_entry_first_refresh()
     migrate_sensor_entities(hass, coordinator)
 
@@ -82,7 +79,7 @@ def migrate_sensor_entities(
 
     # Migrating opentherm_outdoor_temperature
     # to opentherm_outdoor_air_temperature sensor
-    for device_id, device in coordinator.data.devices.items():
+    for device_id, device in coordinator.data.items():
         if device["dev_class"] != "heater_central":
             continue
 
diff --git a/homeassistant/components/plugwise/binary_sensor.py b/homeassistant/components/plugwise/binary_sensor.py
index 539fa243d6c..f2c2fd6ed68 100644
--- a/homeassistant/components/plugwise/binary_sensor.py
+++ b/homeassistant/components/plugwise/binary_sensor.py
@@ -15,10 +15,9 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import PlugwiseConfigEntry
-from .coordinator import PlugwiseDataUpdateCoordinator
+from .coordinator import PlugwiseConfigEntry, PlugwiseDataUpdateCoordinator
 from .entity import PlugwiseEntity
 
 SEVERITIES = ["other", "info", "warning", "error"]
@@ -86,7 +85,7 @@ BINARY_SENSORS: tuple[PlugwiseBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PlugwiseConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Smile binary_sensors from a config entry."""
     coordinator = entry.runtime_data
@@ -100,11 +99,7 @@ async def async_setup_entry(
         async_add_entities(
             PlugwiseBinarySensorEntity(coordinator, device_id, description)
             for device_id in coordinator.new_devices
-            if (
-                binary_sensors := coordinator.data.devices[device_id].get(
-                    "binary_sensors"
-                )
-            )
+            if (binary_sensors := coordinator.data[device_id].get("binary_sensors"))
             for description in BINARY_SENSORS
             if description.key in binary_sensors
         )
@@ -141,7 +136,8 @@ class PlugwiseBinarySensorEntity(PlugwiseEntity, BinarySensorEntity):
             return None
 
         attrs: dict[str, list[str]] = {f"{severity}_msg": [] for severity in SEVERITIES}
-        if notify := self.coordinator.data.gateway["notifications"]:
+        gateway_id = self.coordinator.api.gateway_id
+        if notify := self.coordinator.data[gateway_id]["notifications"]:
             for details in notify.values():
                 for msg_type, msg in details.items():
                     msg_type = msg_type.lower()
diff --git a/homeassistant/components/plugwise/button.py b/homeassistant/components/plugwise/button.py
index 8a05ede3496..c0896b602f0 100644
--- a/homeassistant/components/plugwise/button.py
+++ b/homeassistant/components/plugwise/button.py
@@ -5,11 +5,10 @@ from __future__ import annotations
 from homeassistant.components.button import ButtonDeviceClass, ButtonEntity
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import PlugwiseConfigEntry
-from .const import GATEWAY_ID, REBOOT
-from .coordinator import PlugwiseDataUpdateCoordinator
+from .const import REBOOT
+from .coordinator import PlugwiseConfigEntry, PlugwiseDataUpdateCoordinator
 from .entity import PlugwiseEntity
 from .util import plugwise_command
 
@@ -19,16 +18,15 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PlugwiseConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Plugwise buttons from a ConfigEntry."""
     coordinator = entry.runtime_data
 
-    gateway = coordinator.data.gateway
     async_add_entities(
         PlugwiseButtonEntity(coordinator, device_id)
-        for device_id in coordinator.data.devices
-        if device_id == gateway[GATEWAY_ID] and REBOOT in gateway
+        for device_id in coordinator.data
+        if device_id == coordinator.api.gateway_id and coordinator.api.reboot
     )
 
 
diff --git a/homeassistant/components/plugwise/climate.py b/homeassistant/components/plugwise/climate.py
index 3caed1e7bc2..c7fac07f1cb 100644
--- a/homeassistant/components/plugwise/climate.py
+++ b/homeassistant/components/plugwise/climate.py
@@ -16,11 +16,10 @@ from homeassistant.components.climate import (
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import PlugwiseConfigEntry
 from .const import DOMAIN, MASTER_THERMOSTATS
-from .coordinator import PlugwiseDataUpdateCoordinator
+from .coordinator import PlugwiseConfigEntry, PlugwiseDataUpdateCoordinator
 from .entity import PlugwiseEntity
 from .util import plugwise_command
 
@@ -30,7 +29,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PlugwiseConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Smile Thermostats from a config entry."""
     coordinator = entry.runtime_data
@@ -41,18 +40,17 @@ async def async_setup_entry(
         if not coordinator.new_devices:
             return
 
-        if coordinator.data.gateway["smile_name"] == "Adam":
+        if coordinator.api.smile_name == "Adam":
             async_add_entities(
                 PlugwiseClimateEntity(coordinator, device_id)
                 for device_id in coordinator.new_devices
-                if coordinator.data.devices[device_id]["dev_class"] == "climate"
+                if coordinator.data[device_id]["dev_class"] == "climate"
             )
         else:
             async_add_entities(
                 PlugwiseClimateEntity(coordinator, device_id)
                 for device_id in coordinator.new_devices
-                if coordinator.data.devices[device_id]["dev_class"]
-                in MASTER_THERMOSTATS
+                if coordinator.data[device_id]["dev_class"] in MASTER_THERMOSTATS
             )
 
     _add_entities()
@@ -77,10 +75,8 @@ class PlugwiseClimateEntity(PlugwiseEntity, ClimateEntity):
         super().__init__(coordinator, device_id)
         self._attr_unique_id = f"{device_id}-climate"
 
-        self._devices = coordinator.data.devices
-        self._gateway = coordinator.data.gateway
-        gateway_id: str = self._gateway["gateway_id"]
-        self._gateway_data = self._devices[gateway_id]
+        gateway_id: str = coordinator.api.gateway_id
+        self._gateway_data = coordinator.data[gateway_id]
 
         self._location = device_id
         if (location := self.device.get("location")) is not None:
@@ -88,7 +84,10 @@ class PlugwiseClimateEntity(PlugwiseEntity, ClimateEntity):
 
         # Determine supported features
         self._attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
-        if self._gateway["cooling_present"] and self._gateway["smile_name"] != "Adam":
+        if (
+            self.coordinator.api.cooling_present
+            and coordinator.api.smile_name != "Adam"
+        ):
             self._attr_supported_features = (
                 ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
             )
@@ -170,7 +169,7 @@ class PlugwiseClimateEntity(PlugwiseEntity, ClimateEntity):
         if "available_schedules" in self.device:
             hvac_modes.append(HVACMode.AUTO)
 
-        if self._gateway["cooling_present"]:
+        if self.coordinator.api.cooling_present:
             if "regulation_modes" in self._gateway_data:
                 if self._gateway_data["select_regulation_mode"] == "cooling":
                     hvac_modes.append(HVACMode.COOL)
diff --git a/homeassistant/components/plugwise/config_flow.py b/homeassistant/components/plugwise/config_flow.py
index a94000934eb..bf33d4c4a0f 100644
--- a/homeassistant/components/plugwise/config_flow.py
+++ b/homeassistant/components/plugwise/config_flow.py
@@ -59,8 +59,6 @@ def smile_user_schema(discovery_info: ZeroconfServiceInfo | None) -> vol.Schema:
         schema = schema.extend(
             {
                 vol.Required(CONF_HOST): str,
-                # Port under investigation for removal (hence not added in #132878)
-                vol.Optional(CONF_PORT, default=DEFAULT_PORT): int,
                 vol.Required(CONF_USERNAME, default=SMILE): vol.In(
                     {SMILE: FLOW_SMILE, STRETCH: FLOW_STRETCH}
                 ),
@@ -197,6 +195,7 @@ class PlugwiseConfigFlow(ConfigFlow, domain=DOMAIN):
         errors: dict[str, str] = {}
 
         if user_input is not None:
+            user_input[CONF_PORT] = DEFAULT_PORT
             if self.discovery_info:
                 user_input[CONF_HOST] = self.discovery_info.host
                 user_input[CONF_PORT] = self.discovery_info.port
diff --git a/homeassistant/components/plugwise/const.py b/homeassistant/components/plugwise/const.py
index 5e4dea5586b..176ae39b1ba 100644
--- a/homeassistant/components/plugwise/const.py
+++ b/homeassistant/components/plugwise/const.py
@@ -17,7 +17,6 @@ FLOW_SMILE: Final = "smile (Adam/Anna/P1)"
 FLOW_STRETCH: Final = "stretch (Stretch)"
 FLOW_TYPE: Final = "flow_type"
 GATEWAY: Final = "gateway"
-GATEWAY_ID: Final = "gateway_id"
 LOCATION: Final = "location"
 PW_TYPE: Final = "plugwise_type"
 REBOOT: Final = "reboot"
diff --git a/homeassistant/components/plugwise/coordinator.py b/homeassistant/components/plugwise/coordinator.py
index 7ac0cc21c51..b346f26492c 100644
--- a/homeassistant/components/plugwise/coordinator.py
+++ b/homeassistant/components/plugwise/coordinator.py
@@ -3,7 +3,7 @@
 from datetime import timedelta
 
 from packaging.version import Version
-from plugwise import PlugwiseData, Smile
+from plugwise import GwEntityData, Smile
 from plugwise.exceptions import (
     ConnectionFailedError,
     InvalidAuthentication,
@@ -22,21 +22,24 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import DEFAULT_PORT, DEFAULT_USERNAME, DOMAIN, GATEWAY_ID, LOGGER
+from .const import DEFAULT_PORT, DEFAULT_USERNAME, DOMAIN, LOGGER
+
+type PlugwiseConfigEntry = ConfigEntry[PlugwiseDataUpdateCoordinator]
 
 
-class PlugwiseDataUpdateCoordinator(DataUpdateCoordinator[PlugwiseData]):
+class PlugwiseDataUpdateCoordinator(DataUpdateCoordinator[dict[str, GwEntityData]]):
     """Class to manage fetching Plugwise data from single endpoint."""
 
     _connected: bool = False
 
-    config_entry: ConfigEntry
+    config_entry: PlugwiseConfigEntry
 
-    def __init__(self, hass: HomeAssistant) -> None:
+    def __init__(self, hass: HomeAssistant, config_entry: PlugwiseConfigEntry) -> None:
         """Initialize the coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=60),
             # Don't refresh immediately, give the device time to process
@@ -63,10 +66,8 @@ class PlugwiseDataUpdateCoordinator(DataUpdateCoordinator[PlugwiseData]):
         """Connect to the Plugwise Smile."""
         version = await self.api.connect()
         self._connected = isinstance(version, Version)
-        if self._connected:
-            self.api.get_all_gateway_entities()
 
-    async def _async_update_data(self) -> PlugwiseData:
+    async def _async_update_data(self) -> dict[str, GwEntityData]:
         """Fetch data from Plugwise."""
         try:
             if not self._connected:
@@ -101,26 +102,28 @@ class PlugwiseDataUpdateCoordinator(DataUpdateCoordinator[PlugwiseData]):
         self._async_add_remove_devices(data, self.config_entry)
         return data
 
-    def _async_add_remove_devices(self, data: PlugwiseData, entry: ConfigEntry) -> None:
+    def _async_add_remove_devices(
+        self, data: dict[str, GwEntityData], entry: ConfigEntry
+    ) -> None:
         """Add new Plugwise devices, remove non-existing devices."""
         # Check for new or removed devices
-        self.new_devices = set(data.devices) - self._current_devices
-        removed_devices = self._current_devices - set(data.devices)
-        self._current_devices = set(data.devices)
+        self.new_devices = set(data) - self._current_devices
+        removed_devices = self._current_devices - set(data)
+        self._current_devices = set(data)
 
         if removed_devices:
             self._async_remove_devices(data, entry)
 
-    def _async_remove_devices(self, data: PlugwiseData, entry: ConfigEntry) -> None:
+    def _async_remove_devices(
+        self, data: dict[str, GwEntityData], entry: ConfigEntry
+    ) -> None:
         """Clean registries when removed devices found."""
         device_reg = dr.async_get(self.hass)
         device_list = dr.async_entries_for_config_entry(
             device_reg, self.config_entry.entry_id
         )
         # First find the Plugwise via_device
-        gateway_device = device_reg.async_get_device(
-            {(DOMAIN, data.gateway[GATEWAY_ID])}
-        )
+        gateway_device = device_reg.async_get_device({(DOMAIN, self.api.gateway_id)})
         assert gateway_device is not None
         via_device_id = gateway_device.id
 
@@ -130,7 +133,7 @@ class PlugwiseDataUpdateCoordinator(DataUpdateCoordinator[PlugwiseData]):
                 if identifier[0] == DOMAIN:
                     if (
                         device_entry.via_device_id == via_device_id
-                        and identifier[1] not in data.devices
+                        and identifier[1] not in data
                     ):
                         device_reg.async_update_device(
                             device_entry.id, remove_config_entry_id=entry.entry_id
diff --git a/homeassistant/components/plugwise/diagnostics.py b/homeassistant/components/plugwise/diagnostics.py
index 47ff7d1a9fb..e97405f6279 100644
--- a/homeassistant/components/plugwise/diagnostics.py
+++ b/homeassistant/components/plugwise/diagnostics.py
@@ -6,7 +6,7 @@ from typing import Any
 
 from homeassistant.core import HomeAssistant
 
-from . import PlugwiseConfigEntry
+from .coordinator import PlugwiseConfigEntry
 
 
 async def async_get_config_entry_diagnostics(
@@ -14,7 +14,4 @@ async def async_get_config_entry_diagnostics(
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     coordinator = entry.runtime_data
-    return {
-        "devices": coordinator.data.devices,
-        "gateway": coordinator.data.gateway,
-    }
+    return coordinator.data
diff --git a/homeassistant/components/plugwise/entity.py b/homeassistant/components/plugwise/entity.py
index 3f63abaff43..39838c38fde 100644
--- a/homeassistant/components/plugwise/entity.py
+++ b/homeassistant/components/plugwise/entity.py
@@ -34,7 +34,7 @@ class PlugwiseEntity(CoordinatorEntity[PlugwiseDataUpdateCoordinator]):
         if entry := self.coordinator.config_entry:
             configuration_url = f"http://{entry.data[CONF_HOST]}"
 
-        data = coordinator.data.devices[device_id]
+        data = coordinator.data[device_id]
         connections = set()
         if mac := data.get("mac_address"):
             connections.add((CONNECTION_NETWORK_MAC, mac))
@@ -48,18 +48,18 @@ class PlugwiseEntity(CoordinatorEntity[PlugwiseDataUpdateCoordinator]):
             manufacturer=data.get("vendor"),
             model=data.get("model"),
             model_id=data.get("model_id"),
-            name=coordinator.data.gateway["smile_name"],
+            name=coordinator.api.smile_name,
             sw_version=data.get("firmware"),
             hw_version=data.get("hardware"),
         )
 
-        if device_id != coordinator.data.gateway["gateway_id"]:
+        if device_id != coordinator.api.gateway_id:
             self._attr_device_info.update(
                 {
                     ATTR_NAME: data.get("name"),
                     ATTR_VIA_DEVICE: (
                         DOMAIN,
-                        str(self.coordinator.data.gateway["gateway_id"]),
+                        str(self.coordinator.api.gateway_id),
                     ),
                 }
             )
@@ -68,7 +68,7 @@ class PlugwiseEntity(CoordinatorEntity[PlugwiseDataUpdateCoordinator]):
     def available(self) -> bool:
         """Return if entity is available."""
         return (
-            self._dev_id in self.coordinator.data.devices
+            self._dev_id in self.coordinator.data
             and ("available" not in self.device or self.device["available"] is True)
             and super().available
         )
@@ -76,4 +76,4 @@ class PlugwiseEntity(CoordinatorEntity[PlugwiseDataUpdateCoordinator]):
     @property
     def device(self) -> GwEntityData:
         """Return data for this device."""
-        return self.coordinator.data.devices[self._dev_id]
+        return self.coordinator.data[self._dev_id]
diff --git a/homeassistant/components/plugwise/manifest.json b/homeassistant/components/plugwise/manifest.json
index ae60d4d7452..87878980f2d 100644
--- a/homeassistant/components/plugwise/manifest.json
+++ b/homeassistant/components/plugwise/manifest.json
@@ -7,6 +7,7 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["plugwise"],
-  "requirements": ["plugwise==1.6.4"],
+  "quality_scale": "platinum",
+  "requirements": ["plugwise==1.7.2"],
   "zeroconf": ["_plugwise._tcp.local."]
 }
diff --git a/homeassistant/components/plugwise/number.py b/homeassistant/components/plugwise/number.py
index 1d0b1382c24..1dbb0506748 100644
--- a/homeassistant/components/plugwise/number.py
+++ b/homeassistant/components/plugwise/number.py
@@ -12,11 +12,10 @@ from homeassistant.components.number import (
 )
 from homeassistant.const import EntityCategory, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import PlugwiseConfigEntry
 from .const import NumberType
-from .coordinator import PlugwiseDataUpdateCoordinator
+from .coordinator import PlugwiseConfigEntry, PlugwiseDataUpdateCoordinator
 from .entity import PlugwiseEntity
 from .util import plugwise_command
 
@@ -58,7 +57,7 @@ NUMBER_TYPES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PlugwiseConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Plugwise number platform."""
     coordinator = entry.runtime_data
@@ -73,7 +72,7 @@ async def async_setup_entry(
             PlugwiseNumberEntity(coordinator, device_id, description)
             for device_id in coordinator.new_devices
             for description in NUMBER_TYPES
-            if description.key in coordinator.data.devices[device_id]
+            if description.key in coordinator.data[device_id]
         )
 
     _add_entities()
diff --git a/homeassistant/components/plugwise/quality_scale.yaml b/homeassistant/components/plugwise/quality_scale.yaml
index a7b955b4713..55abf3c330e 100644
--- a/homeassistant/components/plugwise/quality_scale.yaml
+++ b/homeassistant/components/plugwise/quality_scale.yaml
@@ -15,12 +15,8 @@ rules:
     status: exempt
     comment: Plugwise integration has no custom actions
   common-modules: done
-  docs-high-level-description:
-    status: todo
-    comment: Rewrite top section, docs PR prepared waiting for 36087 merge
-  docs-installation-instructions:
-    status: todo
-    comment: Docs PR 36087
+  docs-high-level-description: done
+  docs-installation-instructions: done
   docs-removal-instructions: done
   docs-actions: done
   brands: done
@@ -35,9 +31,7 @@ rules:
   parallel-updates: done
   test-coverage: done
   integration-owner: done
-  docs-installation-parameters:
-    status: todo
-    comment: Docs PR 36087 (partial) + todo rewrite generically (PR prepared)
+  docs-installation-parameters: done
   docs-configuration-parameters:
     status: exempt
     comment: Plugwise has no options flow
@@ -58,25 +52,13 @@ rules:
   repair-issues:
     status: exempt
     comment: This integration does not have repairs
-  docs-use-cases:
-    status: todo
-    comment: Check for completeness, PR prepared waiting for 36087 merge
-  docs-supported-devices:
-    status: todo
-    comment: The list is there but could be improved for readability, PR prepared waiting for 36087 merge
-  docs-supported-functions:
-    status: todo
-    comment: Check for completeness, PR prepared waiting for 36087 merge
+  docs-use-cases: done
+  docs-supported-devices: done
+  docs-supported-functions: done
   docs-data-update: done
-  docs-known-limitations:
-    status: todo
-    comment: Partial in 36087 but could be more elaborate
-  docs-troubleshooting:
-    status: todo
-    comment: Check for completeness, PR prepared waiting for 36087 merge
-  docs-examples:
-    status: todo
-    comment: Check for completeness, PR prepared waiting for 36087 merge
+  docs-known-limitations: done
+  docs-troubleshooting: done
+  docs-examples: done
   ## Platinum
   async-dependency: done
   inject-websession: done
diff --git a/homeassistant/components/plugwise/select.py b/homeassistant/components/plugwise/select.py
index ff268d8eded..6ca1d4ce7a2 100644
--- a/homeassistant/components/plugwise/select.py
+++ b/homeassistant/components/plugwise/select.py
@@ -7,11 +7,10 @@ from dataclasses import dataclass
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.const import STATE_ON, EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import PlugwiseConfigEntry
 from .const import SelectOptionsType, SelectType
-from .coordinator import PlugwiseDataUpdateCoordinator
+from .coordinator import PlugwiseConfigEntry, PlugwiseDataUpdateCoordinator
 from .entity import PlugwiseEntity
 from .util import plugwise_command
 
@@ -56,7 +55,7 @@ SELECT_TYPES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PlugwiseConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Smile selector from a config entry."""
     coordinator = entry.runtime_data
@@ -71,7 +70,7 @@ async def async_setup_entry(
             PlugwiseSelectEntity(coordinator, device_id, description)
             for device_id in coordinator.new_devices
             for description in SELECT_TYPES
-            if description.options_key in coordinator.data.devices[device_id]
+            if description.options_key in coordinator.data[device_id]
         )
 
     _add_entities()
diff --git a/homeassistant/components/plugwise/sensor.py b/homeassistant/components/plugwise/sensor.py
index 14b42682376..7bd93e2ff84 100644
--- a/homeassistant/components/plugwise/sensor.py
+++ b/homeassistant/components/plugwise/sensor.py
@@ -25,10 +25,9 @@ from homeassistant.const import (
     UnitOfVolumeFlowRate,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import PlugwiseConfigEntry
-from .coordinator import PlugwiseDataUpdateCoordinator
+from .coordinator import PlugwiseConfigEntry, PlugwiseDataUpdateCoordinator
 from .entity import PlugwiseEntity
 
 # Coordinator is used to centralize the data updates
@@ -406,7 +405,7 @@ SENSORS: tuple[PlugwiseSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PlugwiseConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Smile sensors from a config entry."""
     coordinator = entry.runtime_data
@@ -420,7 +419,7 @@ async def async_setup_entry(
         async_add_entities(
             PlugwiseSensorEntity(coordinator, device_id, description)
             for device_id in coordinator.new_devices
-            if (sensors := coordinator.data.devices[device_id].get("sensors"))
+            if (sensors := coordinator.data[device_id].get("sensors"))
             for description in SENSORS
             if description.key in sensors
         )
diff --git a/homeassistant/components/plugwise/switch.py b/homeassistant/components/plugwise/switch.py
index ea6d6f18b7f..8179fb546b4 100644
--- a/homeassistant/components/plugwise/switch.py
+++ b/homeassistant/components/plugwise/switch.py
@@ -14,10 +14,9 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import PlugwiseConfigEntry
-from .coordinator import PlugwiseDataUpdateCoordinator
+from .coordinator import PlugwiseConfigEntry, PlugwiseDataUpdateCoordinator
 from .entity import PlugwiseEntity
 from .util import plugwise_command
 
@@ -58,7 +57,7 @@ SWITCHES: tuple[PlugwiseSwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PlugwiseConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Smile switches from a config entry."""
     coordinator = entry.runtime_data
@@ -72,7 +71,7 @@ async def async_setup_entry(
         async_add_entities(
             PlugwiseSwitchEntity(coordinator, device_id, description)
             for device_id in coordinator.new_devices
-            if (switches := coordinator.data.devices[device_id].get("switches"))
+            if (switches := coordinator.data[device_id].get("switches"))
             for description in SWITCHES
             if description.key in switches
         )
diff --git a/homeassistant/components/plum_lightpad/light.py b/homeassistant/components/plum_lightpad/light.py
index a385565b837..78743c12808 100644
--- a/homeassistant/components/plum_lightpad/light.py
+++ b/homeassistant/components/plum_lightpad/light.py
@@ -16,8 +16,8 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.color as color_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import color as color_util
 
 from .const import DOMAIN
 
@@ -25,7 +25,7 @@ from .const import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Plum Lightpad dimmer lights and glow rings."""
 
diff --git a/homeassistant/components/pocketcasts/sensor.py b/homeassistant/components/pocketcasts/sensor.py
index 1f6af298688..bbe75ae544c 100644
--- a/homeassistant/components/pocketcasts/sensor.py
+++ b/homeassistant/components/pocketcasts/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/point/alarm_control_panel.py b/homeassistant/components/point/alarm_control_panel.py
index 4e4e4238176..0f501d2ee09 100644
--- a/homeassistant/components/point/alarm_control_panel.py
+++ b/homeassistant/components/point/alarm_control_panel.py
@@ -15,7 +15,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import MinutPointClient
 from .const import DOMAIN as POINT_DOMAIN, POINT_DISCOVERY_NEW, SIGNAL_WEBHOOK
@@ -33,7 +33,7 @@ EVENT_MAP = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Point's alarm_control_panel based on a config entry."""
 
diff --git a/homeassistant/components/point/binary_sensor.py b/homeassistant/components/point/binary_sensor.py
index 546c7d9cb0f..c9338cb63f2 100644
--- a/homeassistant/components/point/binary_sensor.py
+++ b/homeassistant/components/point/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN as POINT_DOMAIN, POINT_DISCOVERY_NEW, SIGNAL_WEBHOOK
 from .entity import MinutPointEntity
@@ -43,7 +43,7 @@ DEVICES = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Point's binary sensors based on a config entry."""
 
diff --git a/homeassistant/components/point/config_flow.py b/homeassistant/components/point/config_flow.py
index a0a51c7b9e6..b26ade8b725 100644
--- a/homeassistant/components/point/config_flow.py
+++ b/homeassistant/components/point/config_flow.py
@@ -11,6 +11,8 @@ from homeassistant.helpers.config_entry_oauth2_flow import AbstractOAuth2FlowHan
 
 from .const import DOMAIN
 
+_LOGGER = logging.getLogger(__name__)
+
 
 class OAuth2FlowHandler(AbstractOAuth2FlowHandler, domain=DOMAIN):
     """Config flow to handle Minut Point OAuth2 authentication."""
@@ -56,7 +58,7 @@ class OAuth2FlowHandler(AbstractOAuth2FlowHandler, domain=DOMAIN):
         if reauth_entry.unique_id is not None:
             self._abort_if_unique_id_mismatch(reason="wrong_account")
 
-        logging.debug("user_id: %s", user_id)
+        _LOGGER.debug("user_id: %s", user_id)
         return self.async_update_reload_and_abort(
             reauth_entry, data_updates=data, unique_id=user_id
         )
diff --git a/homeassistant/components/point/entity.py b/homeassistant/components/point/entity.py
index 4784dd43180..5c52e81e6f7 100644
--- a/homeassistant/components/point/entity.py
+++ b/homeassistant/components/point/entity.py
@@ -52,7 +52,7 @@ class MinutPointEntity(Entity):
         )
         await self._update_callback()
 
-    async def async_will_remove_from_hass(self):
+    async def async_will_remove_from_hass(self) -> None:
         """Disconnect dispatcher listener when removed."""
         if self._async_unsub_dispatcher_connect:
             self._async_unsub_dispatcher_connect()
@@ -61,7 +61,7 @@ class MinutPointEntity(Entity):
         """Update the value of the sensor."""
 
     @property
-    def available(self):
+    def available(self) -> bool:
         """Return true if device is not offline."""
         return self._client.is_available(self.device_id)
 
diff --git a/homeassistant/components/point/sensor.py b/homeassistant/components/point/sensor.py
index d864c8bb18c..c959d09d606 100644
--- a/homeassistant/components/point/sensor.py
+++ b/homeassistant/components/point/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, UnitOfSoundPressure, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.dt import parse_datetime
 
 from .const import DOMAIN as POINT_DOMAIN, POINT_DISCOVERY_NEW
@@ -48,7 +48,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Point's sensors based on a config entry."""
 
diff --git a/homeassistant/components/poolsense/__init__.py b/homeassistant/components/poolsense/__init__.py
index a4b6f7b60d8..a2e54712566 100644
--- a/homeassistant/components/poolsense/__init__.py
+++ b/homeassistant/components/poolsense/__init__.py
@@ -4,14 +4,11 @@ import logging
 
 from poolsense import PoolSense
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import aiohttp_client
 
-from .coordinator import PoolSenseDataUpdateCoordinator
-
-type PoolSenseConfigEntry = ConfigEntry[PoolSenseDataUpdateCoordinator]
+from .coordinator import PoolSenseConfigEntry, PoolSenseDataUpdateCoordinator
 
 PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR]
 
@@ -33,7 +30,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: PoolSenseConfigEntry) ->
         _LOGGER.error("Invalid authentication")
         return False
 
-    coordinator = PoolSenseDataUpdateCoordinator(hass, poolsense)
+    coordinator = PoolSenseDataUpdateCoordinator(hass, entry, poolsense)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/poolsense/binary_sensor.py b/homeassistant/components/poolsense/binary_sensor.py
index 7668845f318..b93f017501d 100644
--- a/homeassistant/components/poolsense/binary_sensor.py
+++ b/homeassistant/components/poolsense/binary_sensor.py
@@ -8,9 +8,9 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import PoolSenseConfigEntry
+from .coordinator import PoolSenseConfigEntry
 from .entity import PoolSenseEntity
 
 BINARY_SENSOR_TYPES: tuple[BinarySensorEntityDescription, ...] = (
@@ -30,7 +30,7 @@ BINARY_SENSOR_TYPES: tuple[BinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: PoolSenseConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Defer sensor setup to the shared sensor module."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/poolsense/coordinator.py b/homeassistant/components/poolsense/coordinator.py
index d9e7e8468ff..557686f9145 100644
--- a/homeassistant/components/poolsense/coordinator.py
+++ b/homeassistant/components/poolsense/coordinator.py
@@ -5,11 +5,11 @@ from __future__ import annotations
 import asyncio
 from datetime import timedelta
 import logging
-from typing import TYPE_CHECKING
 
 from poolsense import PoolSense
 from poolsense.exceptions import PoolSenseError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_EMAIL
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.typing import StateType
@@ -17,20 +17,30 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .const import DOMAIN
 
-if TYPE_CHECKING:
-    from . import PoolSenseConfigEntry
-
 _LOGGER = logging.getLogger(__name__)
 
+type PoolSenseConfigEntry = ConfigEntry[PoolSenseDataUpdateCoordinator]
+
 
 class PoolSenseDataUpdateCoordinator(DataUpdateCoordinator[dict[str, StateType]]):
     """Define an object to hold PoolSense data."""
 
     config_entry: PoolSenseConfigEntry
 
-    def __init__(self, hass: HomeAssistant, poolsense: PoolSense) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: PoolSenseConfigEntry,
+        poolsense: PoolSense,
+    ) -> None:
         """Initialize."""
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=timedelta(hours=1))
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=timedelta(hours=1),
+        )
         self.poolsense = poolsense
         self.email = self.config_entry.data[CONF_EMAIL]
 
diff --git a/homeassistant/components/poolsense/sensor.py b/homeassistant/components/poolsense/sensor.py
index 8cfb982d33b..b0ac4404237 100644
--- a/homeassistant/components/poolsense/sensor.py
+++ b/homeassistant/components/poolsense/sensor.py
@@ -9,10 +9,10 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, UnitOfElectricPotential, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import PoolSenseConfigEntry
+from .coordinator import PoolSenseConfigEntry
 from .entity import PoolSenseEntity
 
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
@@ -65,7 +65,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: PoolSenseConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Defer sensor setup to the shared sensor module."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/powerfox/__init__.py b/homeassistant/components/powerfox/__init__.py
index 243f3aacc4f..8e51985211d 100644
--- a/homeassistant/components/powerfox/__init__.py
+++ b/homeassistant/components/powerfox/__init__.py
@@ -6,18 +6,15 @@ import asyncio
 
 from powerfox import Powerfox, PowerfoxConnectionError
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .coordinator import PowerfoxDataUpdateCoordinator
+from .coordinator import PowerfoxConfigEntry, PowerfoxDataUpdateCoordinator
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
-type PowerfoxConfigEntry = ConfigEntry[list[PowerfoxDataUpdateCoordinator]]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: PowerfoxConfigEntry) -> bool:
     """Set up Powerfox from a config entry."""
@@ -34,7 +31,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: PowerfoxConfigEntry) ->
         raise ConfigEntryNotReady from err
 
     coordinators: list[PowerfoxDataUpdateCoordinator] = [
-        PowerfoxDataUpdateCoordinator(hass, client, device) for device in devices
+        PowerfoxDataUpdateCoordinator(hass, entry, client, device) for device in devices
     ]
 
     await asyncio.gather(
diff --git a/homeassistant/components/powerfox/coordinator.py b/homeassistant/components/powerfox/coordinator.py
index a4a26759b69..bd76b7cc166 100644
--- a/homeassistant/components/powerfox/coordinator.py
+++ b/homeassistant/components/powerfox/coordinator.py
@@ -18,15 +18,18 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .const import DOMAIN, LOGGER, SCAN_INTERVAL
 
+type PowerfoxConfigEntry = ConfigEntry[list[PowerfoxDataUpdateCoordinator]]
+
 
 class PowerfoxDataUpdateCoordinator(DataUpdateCoordinator[Poweropti]):
     """Class to manage fetching Powerfox data from the API."""
 
-    config_entry: ConfigEntry
+    config_entry: PowerfoxConfigEntry
 
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: PowerfoxConfigEntry,
         client: Powerfox,
         device: Device,
     ) -> None:
@@ -34,6 +37,7 @@ class PowerfoxDataUpdateCoordinator(DataUpdateCoordinator[Poweropti]):
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/powerfox/diagnostics.py b/homeassistant/components/powerfox/diagnostics.py
index 4c6b0f8c6eb..8514e42537e 100644
--- a/homeassistant/components/powerfox/diagnostics.py
+++ b/homeassistant/components/powerfox/diagnostics.py
@@ -9,7 +9,7 @@ from powerfox import HeatMeter, PowerMeter, WaterMeter
 
 from homeassistant.core import HomeAssistant
 
-from . import PowerfoxConfigEntry, PowerfoxDataUpdateCoordinator
+from .coordinator import PowerfoxConfigEntry, PowerfoxDataUpdateCoordinator
 
 
 async def async_get_config_entry_diagnostics(
diff --git a/homeassistant/components/powerfox/sensor.py b/homeassistant/components/powerfox/sensor.py
index 6505139fcd9..ab60c99a58b 100644
--- a/homeassistant/components/powerfox/sensor.py
+++ b/homeassistant/components/powerfox/sensor.py
@@ -15,10 +15,9 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import UnitOfEnergy, UnitOfPower, UnitOfVolume
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import PowerfoxConfigEntry
-from .coordinator import PowerfoxDataUpdateCoordinator
+from .coordinator import PowerfoxConfigEntry, PowerfoxDataUpdateCoordinator
 from .entity import PowerfoxEntity
 
 
@@ -131,7 +130,7 @@ SENSORS_HEAT: tuple[PowerfoxSensorEntityDescription[HeatMeter], ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PowerfoxConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Powerfox sensors based on a config entry."""
     entities: list[SensorEntity] = []
diff --git a/homeassistant/components/powerwall/binary_sensor.py b/homeassistant/components/powerwall/binary_sensor.py
index c50876e22fb..100e31b1c21 100644
--- a/homeassistant/components/powerwall/binary_sensor.py
+++ b/homeassistant/components/powerwall/binary_sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import PowerWallEntity
 from .models import PowerwallConfigEntry
@@ -23,7 +23,7 @@ CONNECTED_GRID_STATUSES = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PowerwallConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the powerwall sensors."""
     powerwall_data = entry.runtime_data
diff --git a/homeassistant/components/powerwall/sensor.py b/homeassistant/components/powerwall/sensor.py
index 28506e2a60c..b4988133727 100644
--- a/homeassistant/components/powerwall/sensor.py
+++ b/homeassistant/components/powerwall/sensor.py
@@ -26,7 +26,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import POWERWALL_COORDINATOR
 from .entity import BatteryEntity, PowerWallEntity
@@ -213,7 +213,7 @@ BATTERY_INSTANT_SENSORS: list[PowerwallSensorEntityDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PowerwallConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the powerwall sensors."""
     powerwall_data = entry.runtime_data
diff --git a/homeassistant/components/powerwall/switch.py b/homeassistant/components/powerwall/switch.py
index 214ca01fb63..a874161de5b 100644
--- a/homeassistant/components/powerwall/switch.py
+++ b/homeassistant/components/powerwall/switch.py
@@ -8,7 +8,7 @@ from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import PowerWallEntity
 from .models import PowerwallConfigEntry, PowerwallRuntimeData
@@ -22,7 +22,7 @@ OFF_GRID_STATUSES = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PowerwallConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Powerwall switch platform from Powerwall resources."""
     async_add_entities([PowerwallOffGridEnabledEntity(entry.runtime_data)])
diff --git a/homeassistant/components/private_ble_device/device_tracker.py b/homeassistant/components/private_ble_device/device_tracker.py
index fbaf0d44751..eaccbd6c785 100644
--- a/homeassistant/components/private_ble_device/device_tracker.py
+++ b/homeassistant/components/private_ble_device/device_tracker.py
@@ -11,7 +11,7 @@ from homeassistant.components.device_tracker.config_entry import BaseTrackerEnti
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_HOME, STATE_NOT_HOME
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import BasePrivateDeviceEntity
 
@@ -21,7 +21,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Load Device Tracker entities for a config entry."""
     async_add_entities([BasePrivateDeviceTracker(config_entry)])
diff --git a/homeassistant/components/private_ble_device/manifest.json b/homeassistant/components/private_ble_device/manifest.json
index 2ab736b02d3..810fce41e05 100644
--- a/homeassistant/components/private_ble_device/manifest.json
+++ b/homeassistant/components/private_ble_device/manifest.json
@@ -6,5 +6,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/private_ble_device",
   "iot_class": "local_push",
-  "requirements": ["bluetooth-data-tools==1.22.0"]
+  "requirements": ["bluetooth-data-tools==1.26.1"]
 }
diff --git a/homeassistant/components/private_ble_device/sensor.py b/homeassistant/components/private_ble_device/sensor.py
index e2c4fb0c7da..d8c09500332 100644
--- a/homeassistant/components/private_ble_device/sensor.py
+++ b/homeassistant/components/private_ble_device/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import BasePrivateDeviceEntity
 
@@ -92,7 +92,9 @@ SENSOR_DESCRIPTIONS = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors for Private BLE component."""
     async_add_entities(
diff --git a/homeassistant/components/private_ble_device/strings.json b/homeassistant/components/private_ble_device/strings.json
index c35775a4843..845a5d92bae 100644
--- a/homeassistant/components/private_ble_device/strings.json
+++ b/homeassistant/components/private_ble_device/strings.json
@@ -14,7 +14,7 @@
       "irk_not_valid": "The key does not look like a valid IRK."
     },
     "abort": {
-      "bluetooth_not_available": "At least one Bluetooth adapter or remote bluetooth proxy must be configured to track Private BLE Devices."
+      "bluetooth_not_available": "At least one Bluetooth adapter or remote Bluetooth proxy must be configured to track Private BLE Devices."
     }
   },
   "entity": {
diff --git a/homeassistant/components/profiler/__init__.py b/homeassistant/components/profiler/__init__.py
index 9b2b9736574..04dc6d76a5e 100644
--- a/homeassistant/components/profiler/__init__.py
+++ b/homeassistant/components/profiler/__init__.py
@@ -22,7 +22,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_SCAN_INTERVAL, CONF_TYPE
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.service import async_register_admin_service
 
diff --git a/homeassistant/components/progettihwsw/binary_sensor.py b/homeassistant/components/progettihwsw/binary_sensor.py
index a89b8b3c3f1..40296dcac90 100644
--- a/homeassistant/components/progettihwsw/binary_sensor.py
+++ b/homeassistant/components/progettihwsw/binary_sensor.py
@@ -9,7 +9,7 @@ from ProgettiHWSW.input import Input
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -24,7 +24,7 @@ _LOGGER = logging.getLogger(DOMAIN)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the binary sensors from a config entry."""
     board_api = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/progettihwsw/config_flow.py b/homeassistant/components/progettihwsw/config_flow.py
index 2e5ea221dca..8818eff2d81 100644
--- a/homeassistant/components/progettihwsw/config_flow.py
+++ b/homeassistant/components/progettihwsw/config_flow.py
@@ -1,5 +1,6 @@
 """Config flow for ProgettiHWSW Automation integration."""
 
+import logging
 from typing import TYPE_CHECKING, Any
 
 from ProgettiHWSW.ProgettiHWSWAPI import ProgettiHWSWAPI
@@ -11,6 +12,8 @@ from homeassistant.exceptions import HomeAssistantError
 
 from .const import DOMAIN
 
+_LOGGER = logging.getLogger(__name__)
+
 DATA_SCHEMA = vol.Schema(
     {vol.Required("host"): str, vol.Required("port", default=80): int}
 )
@@ -86,7 +89,8 @@ class ProgettiHWSWConfigFlow(ConfigFlow, domain=DOMAIN):
                 info = await validate_input(self.hass, user_input)
             except CannotConnect:
                 errors["base"] = "cannot_connect"
-            except Exception:  # noqa: BLE001
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
                 user_input.update(info)
diff --git a/homeassistant/components/progettihwsw/switch.py b/homeassistant/components/progettihwsw/switch.py
index 983a2383e99..256d90ae5b7 100644
--- a/homeassistant/components/progettihwsw/switch.py
+++ b/homeassistant/components/progettihwsw/switch.py
@@ -10,7 +10,7 @@ from ProgettiHWSW.relay import Relay
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -25,7 +25,7 @@ _LOGGER = logging.getLogger(DOMAIN)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the switches from a config entry."""
     board_api = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/proliphix/climate.py b/homeassistant/components/proliphix/climate.py
index be7d394993a..03f53dec390 100644
--- a/homeassistant/components/proliphix/climate.py
+++ b/homeassistant/components/proliphix/climate.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/prometheus/__init__.py b/homeassistant/components/prometheus/__init__.py
index ab012847bba..3adc33e9935 100644
--- a/homeassistant/components/prometheus/__init__.py
+++ b/homeassistant/components/prometheus/__init__.py
@@ -63,8 +63,11 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import Event, EventStateChangedData, HomeAssistant, State
-from homeassistant.helpers import entityfilter, state as state_helper
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import (
+    config_validation as cv,
+    entityfilter,
+    state as state_helper,
+)
 from homeassistant.helpers.entity_registry import (
     EVENT_ENTITY_REGISTRY_UPDATED,
     EventEntityRegistryUpdatedData,
diff --git a/homeassistant/components/prosegur/alarm_control_panel.py b/homeassistant/components/prosegur/alarm_control_panel.py
index 1c58b64cf55..1f0f89c5f04 100644
--- a/homeassistant/components/prosegur/alarm_control_panel.py
+++ b/homeassistant/components/prosegur/alarm_control_panel.py
@@ -15,7 +15,7 @@ from homeassistant.components.alarm_control_panel import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 
@@ -30,7 +30,9 @@ STATE_MAPPING = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Prosegur alarm control panel platform."""
     async_add_entities(
diff --git a/homeassistant/components/prosegur/camera.py b/homeassistant/components/prosegur/camera.py
index 2df6ff62038..3e1c91713e1 100644
--- a/homeassistant/components/prosegur/camera.py
+++ b/homeassistant/components/prosegur/camera.py
@@ -13,7 +13,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import (
-    AddEntitiesCallback,
+    AddConfigEntryEntitiesCallback,
     async_get_current_platform,
 )
 
@@ -24,7 +24,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Prosegur camera platform."""
 
diff --git a/homeassistant/components/prosegur/manifest.json b/homeassistant/components/prosegur/manifest.json
index adf5e985fe9..2e649ebd5bd 100644
--- a/homeassistant/components/prosegur/manifest.json
+++ b/homeassistant/components/prosegur/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/prosegur",
   "iot_class": "cloud_polling",
   "loggers": ["pyprosegur"],
-  "requirements": ["pyprosegur==0.0.9"]
+  "requirements": ["pyprosegur==0.0.14"]
 }
diff --git a/homeassistant/components/prowl/notify.py b/homeassistant/components/prowl/notify.py
index 1118e747275..e9d2bbde4e5 100644
--- a/homeassistant/components/prowl/notify.py
+++ b/homeassistant/components/prowl/notify.py
@@ -17,8 +17,8 @@ from homeassistant.components.notify import (
 )
 from homeassistant.const import CONF_API_KEY
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/proximity/__init__.py b/homeassistant/components/proximity/__init__.py
index 763274243c5..2338464558d 100644
--- a/homeassistant/components/proximity/__init__.py
+++ b/homeassistant/components/proximity/__init__.py
@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import logging
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.event import (
@@ -22,7 +21,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ProximityConfigEntry) ->
     """Set up Proximity from a config entry."""
     _LOGGER.debug("setup %s with config:%s", entry.title, entry.data)
 
-    coordinator = ProximityDataUpdateCoordinator(hass, entry.title, dict(entry.data))
+    coordinator = ProximityDataUpdateCoordinator(hass, entry)
 
     entry.async_on_unload(
         async_track_state_change_event(
@@ -48,11 +47,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: ProximityConfigEntry) ->
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ProximityConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, [Platform.SENSOR])
 
 
-async def _async_update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+async def _async_update_listener(
+    hass: HomeAssistant, entry: ProximityConfigEntry
+) -> None:
     """Handle options update."""
     await hass.config_entries.async_reload(entry.entry_id)
diff --git a/homeassistant/components/proximity/coordinator.py b/homeassistant/components/proximity/coordinator.py
index a8dd85c1523..856138c9051 100644
--- a/homeassistant/components/proximity/coordinator.py
+++ b/homeassistant/components/proximity/coordinator.py
@@ -23,7 +23,6 @@ from homeassistant.core import (
 )
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
-from homeassistant.helpers.typing import ConfigType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 from homeassistant.util.location import distance
 
@@ -75,16 +74,14 @@ class ProximityDataUpdateCoordinator(DataUpdateCoordinator[ProximityData]):
 
     config_entry: ProximityConfigEntry
 
-    def __init__(
-        self, hass: HomeAssistant, friendly_name: str, config: ConfigType
-    ) -> None:
+    def __init__(self, hass: HomeAssistant, config_entry: ProximityConfigEntry) -> None:
         """Initialize the Proximity coordinator."""
-        self.ignored_zone_ids: list[str] = config[CONF_IGNORED_ZONES]
-        self.tracked_entities: list[str] = config[CONF_TRACKED_ENTITIES]
-        self.tolerance: int = config[CONF_TOLERANCE]
-        self.proximity_zone_id: str = config[CONF_ZONE]
+        self.ignored_zone_ids: list[str] = config_entry.data[CONF_IGNORED_ZONES]
+        self.tracked_entities: list[str] = config_entry.data[CONF_TRACKED_ENTITIES]
+        self.tolerance: int = config_entry.data[CONF_TOLERANCE]
+        self.proximity_zone_id: str = config_entry.data[CONF_ZONE]
         self.proximity_zone_name: str = self.proximity_zone_id.split(".")[-1]
-        self.unit_of_measurement: str = config.get(
+        self.unit_of_measurement: str = config_entry.data.get(
             CONF_UNIT_OF_MEASUREMENT, hass.config.units.length_unit
         )
         self.entity_mapping: dict[str, list[str]] = defaultdict(list)
@@ -92,7 +89,8 @@ class ProximityDataUpdateCoordinator(DataUpdateCoordinator[ProximityData]):
         super().__init__(
             hass,
             _LOGGER,
-            name=friendly_name,
+            config_entry=config_entry,
+            name=config_entry.title,
             update_interval=None,
         )
 
@@ -166,7 +164,7 @@ class ProximityDataUpdateCoordinator(DataUpdateCoordinator[ProximityData]):
             )
             return None
 
-        distance_to_zone = distance(
+        distance_to_centre = distance(
             zone.attributes[ATTR_LATITUDE],
             zone.attributes[ATTR_LONGITUDE],
             latitude,
@@ -174,8 +172,13 @@ class ProximityDataUpdateCoordinator(DataUpdateCoordinator[ProximityData]):
         )
 
         # it is ensured, that distance can't be None, since zones must have lat/lon coordinates
-        assert distance_to_zone is not None
-        return round(distance_to_zone)
+        assert distance_to_centre is not None
+
+        zone_radius: float = zone.attributes["radius"]
+        if zone_radius > distance_to_centre:
+            # we've arrived the zone
+            return 0
+        return round(distance_to_centre - zone_radius)
 
     def _calc_direction_of_travel(
         self,
diff --git a/homeassistant/components/proximity/sensor.py b/homeassistant/components/proximity/sensor.py
index 55d4ca02b9b..72203a2dff4 100644
--- a/homeassistant/components/proximity/sensor.py
+++ b/homeassistant/components/proximity/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.const import UnitOfLength
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
@@ -82,7 +82,7 @@ def _device_info(coordinator: ProximityDataUpdateCoordinator) -> DeviceInfo:
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ProximityConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the proximity sensors."""
 
diff --git a/homeassistant/components/proximity/strings.json b/homeassistant/components/proximity/strings.json
index 118004e908e..5f713174f50 100644
--- a/homeassistant/components/proximity/strings.json
+++ b/homeassistant/components/proximity/strings.json
@@ -61,7 +61,7 @@
         "step": {
           "confirm": {
             "title": "[%key:component::proximity::issues::tracked_entity_removed::title%]",
-            "description": "The entity `{entity_id}` has been removed from HA, but is used in proximity {name}. Please remove `{entity_id}` from the list of tracked entities. Related proximity sensor entites were set to unavailable and can be removed."
+            "description": "The entity `{entity_id}` has been removed from HA, but is used in proximity {name}. Please remove `{entity_id}` from the list of tracked entities. Related proximity sensor entities were set to unavailable and can be removed."
           }
         }
       }
diff --git a/homeassistant/components/proxmoxve/__init__.py b/homeassistant/components/proxmoxve/__init__.py
index 6d6771debc4..0db6ea28652 100644
--- a/homeassistant/components/proxmoxve/__init__.py
+++ b/homeassistant/components/proxmoxve/__init__.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
diff --git a/homeassistant/components/proxy/camera.py b/homeassistant/components/proxy/camera.py
index e5e3d01591a..f6e909f13d1 100644
--- a/homeassistant/components/proxy/camera.py
+++ b/homeassistant/components/proxy/camera.py
@@ -23,7 +23,7 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/prusalink/__init__.py b/homeassistant/components/prusalink/__init__.py
index 1415e3dd0a6..4bb7dee411d 100644
--- a/homeassistant/components/prusalink/__init__.py
+++ b/homeassistant/components/prusalink/__init__.py
@@ -24,6 +24,7 @@ from .coordinator import (
     InfoUpdateCoordinator,
     JobUpdateCoordinator,
     LegacyStatusCoordinator,
+    PrusaLinkUpdateCoordinator,
     StatusCoordinator,
 )
 
@@ -47,11 +48,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         entry.data[CONF_PASSWORD],
     )
 
-    coordinators = {
-        "legacy_status": LegacyStatusCoordinator(hass, api),
-        "status": StatusCoordinator(hass, api),
-        "job": JobUpdateCoordinator(hass, api),
-        "info": InfoUpdateCoordinator(hass, api),
+    coordinators: dict[str, PrusaLinkUpdateCoordinator] = {
+        "legacy_status": LegacyStatusCoordinator(hass, entry, api),
+        "status": StatusCoordinator(hass, entry, api),
+        "job": JobUpdateCoordinator(hass, entry, api),
+        "info": InfoUpdateCoordinator(hass, entry, api),
     }
     for coordinator in coordinators.values():
         await coordinator.async_config_entry_first_refresh()
diff --git a/homeassistant/components/prusalink/binary_sensor.py b/homeassistant/components/prusalink/binary_sensor.py
index d40ac8a4cfa..56be36c3e9d 100644
--- a/homeassistant/components/prusalink/binary_sensor.py
+++ b/homeassistant/components/prusalink/binary_sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import PrusaLinkUpdateCoordinator
@@ -57,7 +57,7 @@ BINARY_SENSORS: dict[str, tuple[PrusaLinkBinarySensorEntityDescription, ...]] =
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up PrusaLink sensor based on a config entry."""
     coordinators: dict[str, PrusaLinkUpdateCoordinator] = hass.data[DOMAIN][
diff --git a/homeassistant/components/prusalink/button.py b/homeassistant/components/prusalink/button.py
index 06d356b2ca6..59a63d874ee 100644
--- a/homeassistant/components/prusalink/button.py
+++ b/homeassistant/components/prusalink/button.py
@@ -13,7 +13,7 @@ from homeassistant.components.button import ButtonEntity, ButtonEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import PrusaLinkUpdateCoordinator
@@ -72,7 +72,7 @@ BUTTONS: dict[str, tuple[PrusaLinkButtonEntityDescription, ...]] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up PrusaLink buttons based on a config entry."""
     coordinators: dict[str, PrusaLinkUpdateCoordinator] = hass.data[DOMAIN][
diff --git a/homeassistant/components/prusalink/camera.py b/homeassistant/components/prusalink/camera.py
index eee655447cc..6aac03ca179 100644
--- a/homeassistant/components/prusalink/camera.py
+++ b/homeassistant/components/prusalink/camera.py
@@ -7,7 +7,7 @@ from pyprusalink.types import PrinterState
 from homeassistant.components.camera import Camera
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import JobUpdateCoordinator
@@ -17,7 +17,7 @@ from .entity import PrusaLinkEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up PrusaLink camera."""
     coordinator: JobUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]["job"]
diff --git a/homeassistant/components/prusalink/coordinator.py b/homeassistant/components/prusalink/coordinator.py
index 1d887983931..e6f54bc6fa5 100644
--- a/homeassistant/components/prusalink/coordinator.py
+++ b/homeassistant/components/prusalink/coordinator.py
@@ -37,12 +37,18 @@ class PrusaLinkUpdateCoordinator(DataUpdateCoordinator[T], ABC):
     config_entry: ConfigEntry
     expect_change_until = 0.0
 
-    def __init__(self, hass: HomeAssistant, api: PrusaLink) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, api: PrusaLink
+    ) -> None:
         """Initialize the update coordinator."""
         self.api = api
 
         super().__init__(
-            hass, _LOGGER, name=DOMAIN, update_interval=self._get_update_interval(None)
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=self._get_update_interval(None),
         )
 
     async def _async_update_data(self) -> T:
diff --git a/homeassistant/components/prusalink/sensor.py b/homeassistant/components/prusalink/sensor.py
index 0c746adbe2e..b9588f72a3c 100644
--- a/homeassistant/components/prusalink/sensor.py
+++ b/homeassistant/components/prusalink/sensor.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util.dt import utcnow
 from homeassistant.util.variance import ignore_variance
@@ -205,7 +205,7 @@ SENSORS: dict[str, tuple[PrusaLinkSensorEntityDescription, ...]] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up PrusaLink sensor based on a config entry."""
     coordinators: dict[str, PrusaLinkUpdateCoordinator] = hass.data[DOMAIN][
diff --git a/homeassistant/components/ps4/media_player.py b/homeassistant/components/ps4/media_player.py
index 8db24beae20..4de7cbeb463 100644
--- a/homeassistant/components/ps4/media_player.py
+++ b/homeassistant/components/ps4/media_player.py
@@ -27,7 +27,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.json import JsonObjectType
 
 from . import format_unique_id, load_games, save_games
@@ -48,7 +48,7 @@ DEFAULT_RETRIES = 2
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up PS4 from a config entry."""
     config = config_entry
diff --git a/homeassistant/components/pterodactyl/__init__.py b/homeassistant/components/pterodactyl/__init__.py
new file mode 100644
index 00000000000..33b3cc7576f
--- /dev/null
+++ b/homeassistant/components/pterodactyl/__init__.py
@@ -0,0 +1,27 @@
+"""The Pterodactyl integration."""
+
+from __future__ import annotations
+
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+
+from .coordinator import PterodactylConfigEntry, PterodactylCoordinator
+
+_PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: PterodactylConfigEntry) -> bool:
+    """Set up Pterodactyl from a config entry."""
+    coordinator = PterodactylCoordinator(hass, entry)
+    await coordinator.async_config_entry_first_refresh()
+    entry.runtime_data = coordinator
+    await hass.config_entries.async_forward_entry_setups(entry, _PLATFORMS)
+
+    return True
+
+
+async def async_unload_entry(
+    hass: HomeAssistant, entry: PterodactylConfigEntry
+) -> bool:
+    """Unload a Pterodactyl config entry."""
+    return await hass.config_entries.async_unload_platforms(entry, _PLATFORMS)
diff --git a/homeassistant/components/pterodactyl/api.py b/homeassistant/components/pterodactyl/api.py
new file mode 100644
index 00000000000..38cb9809652
--- /dev/null
+++ b/homeassistant/components/pterodactyl/api.py
@@ -0,0 +1,120 @@
+"""API module of the Pterodactyl integration."""
+
+from dataclasses import dataclass
+import logging
+
+from pydactyl import PterodactylClient
+from pydactyl.exceptions import (
+    BadRequestError,
+    ClientConfigError,
+    PterodactylApiError,
+    PydactylError,
+)
+
+from homeassistant.core import HomeAssistant
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class PterodactylConfigurationError(Exception):
+    """Raised when the configuration is invalid."""
+
+
+class PterodactylConnectionError(Exception):
+    """Raised when no data can be fechted from the server."""
+
+
+@dataclass
+class PterodactylData:
+    """Data for the Pterodactyl server."""
+
+    name: str
+    uuid: str
+    identifier: str
+    state: str
+    memory_utilization: int
+    cpu_utilization: float
+    disk_utilization: int
+    network_rx_utilization: int
+    network_tx_utilization: int
+    uptime: int
+
+
+class PterodactylAPI:
+    """Wrapper for Pterodactyl's API."""
+
+    pterodactyl: PterodactylClient | None
+    identifiers: list[str]
+
+    def __init__(self, hass: HomeAssistant, host: str, api_key: str) -> None:
+        """Initialize the Pterodactyl API."""
+        self.hass = hass
+        self.host = host
+        self.api_key = api_key
+        self.pterodactyl = None
+        self.identifiers = []
+
+    async def async_init(self):
+        """Initialize the Pterodactyl API."""
+        self.pterodactyl = PterodactylClient(self.host, self.api_key)
+
+        try:
+            paginated_response = await self.hass.async_add_executor_job(
+                self.pterodactyl.client.servers.list_servers
+            )
+        except ClientConfigError as error:
+            raise PterodactylConfigurationError(error) from error
+        except (
+            PydactylError,
+            BadRequestError,
+            PterodactylApiError,
+        ) as error:
+            raise PterodactylConnectionError(error) from error
+        else:
+            game_servers = paginated_response.collect()
+            for game_server in game_servers:
+                self.identifiers.append(game_server["attributes"]["identifier"])
+
+            _LOGGER.debug("Identifiers of Pterodactyl servers: %s", self.identifiers)
+
+    def get_server_data(self, identifier: str) -> tuple[dict, dict]:
+        """Get all data from the Pterodactyl server."""
+        server = self.pterodactyl.client.servers.get_server(identifier)  # type: ignore[union-attr]
+        utilization = self.pterodactyl.client.servers.get_server_utilization(  # type: ignore[union-attr]
+            identifier
+        )
+
+        return server, utilization
+
+    async def async_get_data(self) -> dict[str, PterodactylData]:
+        """Update the data from all Pterodactyl servers."""
+        data = {}
+
+        for identifier in self.identifiers:
+            try:
+                server, utilization = await self.hass.async_add_executor_job(
+                    self.get_server_data, identifier
+                )
+            except (
+                PydactylError,
+                BadRequestError,
+                PterodactylApiError,
+            ) as error:
+                raise PterodactylConnectionError(error) from error
+            else:
+                data[identifier] = PterodactylData(
+                    name=server["name"],
+                    uuid=server["uuid"],
+                    identifier=identifier,
+                    state=utilization["current_state"],
+                    cpu_utilization=utilization["resources"]["cpu_absolute"],
+                    memory_utilization=utilization["resources"]["memory_bytes"],
+                    disk_utilization=utilization["resources"]["disk_bytes"],
+                    network_rx_utilization=utilization["resources"]["network_rx_bytes"],
+                    network_tx_utilization=utilization["resources"]["network_tx_bytes"],
+                    uptime=utilization["resources"]["uptime"],
+                )
+
+                _LOGGER.debug("%s", data[identifier])
+
+        return data
diff --git a/homeassistant/components/pterodactyl/binary_sensor.py b/homeassistant/components/pterodactyl/binary_sensor.py
new file mode 100644
index 00000000000..e3615c47499
--- /dev/null
+++ b/homeassistant/components/pterodactyl/binary_sensor.py
@@ -0,0 +1,64 @@
+"""Binary sensor platform of the Pterodactyl integration."""
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDeviceClass,
+    BinarySensorEntity,
+    BinarySensorEntityDescription,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import PterodactylConfigEntry, PterodactylCoordinator
+from .entity import PterodactylEntity
+
+KEY_STATUS = "status"
+
+
+BINARY_SENSOR_DESCRIPTIONS = [
+    BinarySensorEntityDescription(
+        key=KEY_STATUS,
+        translation_key=KEY_STATUS,
+        device_class=BinarySensorDeviceClass.RUNNING,
+    ),
+]
+
+# Coordinator is used to centralize the data updates.
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: PterodactylConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the Pterodactyl binary sensor platform."""
+    coordinator = config_entry.runtime_data
+
+    async_add_entities(
+        PterodactylBinarySensorEntity(
+            coordinator, identifier, description, config_entry
+        )
+        for identifier in coordinator.api.identifiers
+        for description in BINARY_SENSOR_DESCRIPTIONS
+    )
+
+
+class PterodactylBinarySensorEntity(PterodactylEntity, BinarySensorEntity):
+    """Representation of a Pterodactyl binary sensor base entity."""
+
+    def __init__(
+        self,
+        coordinator: PterodactylCoordinator,
+        identifier: str,
+        description: BinarySensorEntityDescription,
+        config_entry: PterodactylConfigEntry,
+    ) -> None:
+        """Initialize binary sensor base entity."""
+        super().__init__(coordinator, identifier, config_entry)
+        self.entity_description = description
+        self._attr_unique_id = f"{self.game_server_data.uuid}_{description.key}"
+
+    @property
+    def is_on(self) -> bool:
+        """Return binary sensor state."""
+        return self.game_server_data.state == "running"
diff --git a/homeassistant/components/pterodactyl/config_flow.py b/homeassistant/components/pterodactyl/config_flow.py
new file mode 100644
index 00000000000..a36069d2bb9
--- /dev/null
+++ b/homeassistant/components/pterodactyl/config_flow.py
@@ -0,0 +1,62 @@
+"""Config flow for the Pterodactyl integration."""
+
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+import voluptuous as vol
+from yarl import URL
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.const import CONF_API_KEY, CONF_URL
+
+from .api import (
+    PterodactylAPI,
+    PterodactylConfigurationError,
+    PterodactylConnectionError,
+)
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_URL = "http://localhost:8080"
+
+STEP_USER_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_URL, default=DEFAULT_URL): str,
+        vol.Required(CONF_API_KEY): str,
+    }
+)
+
+
+class PterodactylConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Pterodactyl."""
+
+    VERSION = 1
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the initial step."""
+        errors: dict[str, str] = {}
+        if user_input is not None:
+            url = URL(user_input[CONF_URL]).human_repr()
+            api_key = user_input[CONF_API_KEY]
+
+            self._async_abort_entries_match({CONF_URL: url})
+            api = PterodactylAPI(self.hass, url, api_key)
+
+            try:
+                await api.async_init()
+            except (PterodactylConfigurationError, PterodactylConnectionError):
+                errors["base"] = "cannot_connect"
+            except Exception:
+                _LOGGER.exception("Unexpected exception occurred during config flow")
+                errors["base"] = "unknown"
+            else:
+                return self.async_create_entry(title=url, data=user_input)
+
+        return self.async_show_form(
+            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
+        )
diff --git a/homeassistant/components/pterodactyl/const.py b/homeassistant/components/pterodactyl/const.py
new file mode 100644
index 00000000000..8cf4d0c3963
--- /dev/null
+++ b/homeassistant/components/pterodactyl/const.py
@@ -0,0 +1,3 @@
+"""Constants for the Pterodactyl integration."""
+
+DOMAIN = "pterodactyl"
diff --git a/homeassistant/components/pterodactyl/coordinator.py b/homeassistant/components/pterodactyl/coordinator.py
new file mode 100644
index 00000000000..36456ade630
--- /dev/null
+++ b/homeassistant/components/pterodactyl/coordinator.py
@@ -0,0 +1,66 @@
+"""Data update coordinator of the Pterodactyl integration."""
+
+from __future__ import annotations
+
+from datetime import timedelta
+import logging
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_API_KEY, CONF_URL
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .api import (
+    PterodactylAPI,
+    PterodactylConfigurationError,
+    PterodactylConnectionError,
+    PterodactylData,
+)
+
+SCAN_INTERVAL = timedelta(seconds=60)
+
+_LOGGER = logging.getLogger(__name__)
+
+type PterodactylConfigEntry = ConfigEntry[PterodactylCoordinator]
+
+
+class PterodactylCoordinator(DataUpdateCoordinator[dict[str, PterodactylData]]):
+    """Pterodactyl data update coordinator."""
+
+    config_entry: PterodactylConfigEntry
+    api: PterodactylAPI
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: PterodactylConfigEntry,
+    ) -> None:
+        """Initialize coordinator instance."""
+
+        super().__init__(
+            hass=hass,
+            name=config_entry.data[CONF_URL],
+            config_entry=config_entry,
+            logger=_LOGGER,
+            update_interval=SCAN_INTERVAL,
+        )
+
+    async def _async_setup(self) -> None:
+        """Set up the Pterodactyl data coordinator."""
+        self.api = PterodactylAPI(
+            hass=self.hass,
+            host=self.config_entry.data[CONF_URL],
+            api_key=self.config_entry.data[CONF_API_KEY],
+        )
+
+        try:
+            await self.api.async_init()
+        except PterodactylConfigurationError as error:
+            raise UpdateFailed(error) from error
+
+    async def _async_update_data(self) -> dict[str, PterodactylData]:
+        """Get updated data from the Pterodactyl server."""
+        try:
+            return await self.api.async_get_data()
+        except PterodactylConnectionError as error:
+            raise UpdateFailed(error) from error
diff --git a/homeassistant/components/pterodactyl/entity.py b/homeassistant/components/pterodactyl/entity.py
new file mode 100644
index 00000000000..49fd65af476
--- /dev/null
+++ b/homeassistant/components/pterodactyl/entity.py
@@ -0,0 +1,47 @@
+"""Base entity for the Pterodactyl integration."""
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_URL
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .api import PterodactylData
+from .const import DOMAIN
+from .coordinator import PterodactylCoordinator
+
+MANUFACTURER = "Pterodactyl"
+
+
+class PterodactylEntity(CoordinatorEntity[PterodactylCoordinator]):
+    """Representation of a Pterodactyl base entity."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: PterodactylCoordinator,
+        identifier: str,
+        config_entry: ConfigEntry,
+    ) -> None:
+        """Initialize base entity."""
+        super().__init__(coordinator)
+
+        self.identifier = identifier
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, identifier)},
+            manufacturer=MANUFACTURER,
+            name=self.game_server_data.name,
+            model=self.game_server_data.name,
+            model_id=self.game_server_data.uuid,
+            configuration_url=f"{config_entry.data[CONF_URL]}/server/{identifier}",
+        )
+
+    @property
+    def available(self) -> bool:
+        """Return binary sensor availability."""
+        return super().available and self.identifier in self.coordinator.data
+
+    @property
+    def game_server_data(self) -> PterodactylData:
+        """Return game server data."""
+        return self.coordinator.data[self.identifier]
diff --git a/homeassistant/components/pterodactyl/manifest.json b/homeassistant/components/pterodactyl/manifest.json
new file mode 100644
index 00000000000..8ffa21dd186
--- /dev/null
+++ b/homeassistant/components/pterodactyl/manifest.json
@@ -0,0 +1,10 @@
+{
+  "domain": "pterodactyl",
+  "name": "Pterodactyl",
+  "codeowners": ["@elmurato"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/pterodactyl",
+  "iot_class": "local_polling",
+  "quality_scale": "bronze",
+  "requirements": ["py-dactyl==2.0.4"]
+}
diff --git a/homeassistant/components/pterodactyl/quality_scale.yaml b/homeassistant/components/pterodactyl/quality_scale.yaml
new file mode 100644
index 00000000000..dae3b9fa11a
--- /dev/null
+++ b/homeassistant/components/pterodactyl/quality_scale.yaml
@@ -0,0 +1,93 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: Integration doesn't provide any service actions.
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow: done
+  config-flow-test-coverage: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: Integration doesn't provide any service actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup:
+    status: done
+    comment: Handled by coordinator.
+  entity-unique-id:
+    status: done
+    comment: Using confid entry ID as the dependency pydactyl doesn't provide a unique information.
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup:
+    status: done
+    comment: |
+      Raising ConfigEntryNotReady, if the initialization isn't successful.
+  unique-config-entry:
+    status: done
+    comment: |
+      As there is no unique information available from the dependency pydactyl,
+      the server host is used to identify that the same service is already configured.
+
+  # Silver
+  action-exceptions:
+    status: exempt
+    comment: Integration doesn't provide any service actions.
+  config-entry-unloading: done
+  docs-configuration-parameters:
+    status: exempt
+    comment: Integration doesn't support any configuration parameters.
+  docs-installation-parameters: todo
+  entity-unavailable:
+    status: done
+    comment: Handled by coordinator.
+  integration-owner: done
+  log-when-unavailable:
+    status: done
+    comment: Handled by coordinator.
+  parallel-updates: done
+  reauthentication-flow: todo
+  test-coverage: todo
+
+  # Gold
+  devices: done
+  diagnostics: todo
+  discovery:
+    status: exempt
+    comment: No discovery possible.
+  discovery-update-info:
+    status: exempt
+    comment: |
+      No discovery possible. Users can use the (local or public) hostname instead of an IP address,
+      if static IP addresses cannot be configured.
+  docs-data-update: todo
+  docs-examples: todo
+  docs-known-limitations: todo
+  docs-supported-devices: todo
+  docs-supported-functions: todo
+  docs-troubleshooting: todo
+  docs-use-cases: todo
+  dynamic-devices: todo
+  entity-category: done
+  entity-device-class: done
+  entity-disabled-by-default: todo
+  entity-translations: done
+  exception-translations: todo
+  icon-translations: todo
+  reconfiguration-flow: todo
+  repair-issues:
+    status: exempt
+    comment: No repair use-cases for this integration.
+  stale-devices: todo
+
+  # Platinum
+  async-dependency: todo
+  inject-websession:
+    status: exempt
+    comment: Integration isn't making any HTTP requests.
+  strict-typing: todo
diff --git a/homeassistant/components/pterodactyl/strings.json b/homeassistant/components/pterodactyl/strings.json
new file mode 100644
index 00000000000..a875c72ccd8
--- /dev/null
+++ b/homeassistant/components/pterodactyl/strings.json
@@ -0,0 +1,30 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "data": {
+          "url": "[%key:common::config_flow::data::url%]",
+          "api_key": "[%key:common::config_flow::data::api_key%]"
+        },
+        "data_description": {
+          "url": "The URL of your Pterodactyl server, including the protocol (http:// or https://) and optionally the port number.",
+          "api_key": "The account API key for accessing your Pterodactyl server."
+        }
+      }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
+    }
+  },
+  "entity": {
+    "binary_sensor": {
+      "status": {
+        "name": "Status"
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/pulseaudio_loopback/switch.py b/homeassistant/components/pulseaudio_loopback/switch.py
index 4ab1f905068..1974363a8e3 100644
--- a/homeassistant/components/pulseaudio_loopback/switch.py
+++ b/homeassistant/components/pulseaudio_loopback/switch.py
@@ -14,7 +14,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/pure_energie/__init__.py b/homeassistant/components/pure_energie/__init__.py
index 4de1ce02810..4ece35a3f1c 100644
--- a/homeassistant/components/pure_energie/__init__.py
+++ b/homeassistant/components/pure_energie/__init__.py
@@ -2,22 +2,19 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 
-from .coordinator import PureEnergieDataUpdateCoordinator
+from .coordinator import PureEnergieConfigEntry, PureEnergieDataUpdateCoordinator
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
-type PureEnergieConfigEntry = ConfigEntry[PureEnergieDataUpdateCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: PureEnergieConfigEntry) -> bool:
     """Set up Pure Energie from a config entry."""
 
-    coordinator = PureEnergieDataUpdateCoordinator(hass)
+    coordinator = PureEnergieDataUpdateCoordinator(hass, entry)
     try:
         await coordinator.async_config_entry_first_refresh()
     except ConfigEntryNotReady:
diff --git a/homeassistant/components/pure_energie/coordinator.py b/homeassistant/components/pure_energie/coordinator.py
index fdd848eb4c6..cd66ab060eb 100644
--- a/homeassistant/components/pure_energie/coordinator.py
+++ b/homeassistant/components/pure_energie/coordinator.py
@@ -14,6 +14,8 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import DOMAIN, LOGGER, SCAN_INTERVAL
 
+type PureEnergieConfigEntry = ConfigEntry[PureEnergieDataUpdateCoordinator]
+
 
 class PureEnergieData(NamedTuple):
     """Class for defining data in dict."""
@@ -25,16 +27,18 @@ class PureEnergieData(NamedTuple):
 class PureEnergieDataUpdateCoordinator(DataUpdateCoordinator[PureEnergieData]):
     """Class to manage fetching Pure Energie data from single eindpoint."""
 
-    config_entry: ConfigEntry
+    config_entry: PureEnergieConfigEntry
 
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: PureEnergieConfigEntry,
     ) -> None:
         """Initialize global Pure Energie data updater."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/pure_energie/diagnostics.py b/homeassistant/components/pure_energie/diagnostics.py
index de9134129ed..5098a298e85 100644
--- a/homeassistant/components/pure_energie/diagnostics.py
+++ b/homeassistant/components/pure_energie/diagnostics.py
@@ -9,7 +9,7 @@ from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
 
-from . import PureEnergieConfigEntry
+from .coordinator import PureEnergieConfigEntry
 
 TO_REDACT = {
     CONF_HOST,
diff --git a/homeassistant/components/pure_energie/sensor.py b/homeassistant/components/pure_energie/sensor.py
index 468858f117f..ad57206adeb 100644
--- a/homeassistant/components/pure_energie/sensor.py
+++ b/homeassistant/components/pure_energie/sensor.py
@@ -15,12 +15,15 @@ from homeassistant.components.sensor import (
 from homeassistant.const import CONF_HOST, UnitOfEnergy, UnitOfPower
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import PureEnergieConfigEntry
 from .const import DOMAIN
-from .coordinator import PureEnergieData, PureEnergieDataUpdateCoordinator
+from .coordinator import (
+    PureEnergieConfigEntry,
+    PureEnergieData,
+    PureEnergieDataUpdateCoordinator,
+)
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -61,7 +64,7 @@ SENSORS: tuple[PureEnergieSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PureEnergieConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Pure Energie Sensors based on a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/purpleair/__init__.py b/homeassistant/components/purpleair/__init__.py
index 2d4022946b2..78986b34351 100644
--- a/homeassistant/components/purpleair/__init__.py
+++ b/homeassistant/components/purpleair/__init__.py
@@ -2,37 +2,34 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
-from .coordinator import PurpleAirDataUpdateCoordinator
-
-PLATFORMS = [Platform.SENSOR]
+from .const import PLATFORMS
+from .coordinator import PurpleAirConfigEntry, PurpleAirDataUpdateCoordinator
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Set up PurpleAir from a config entry."""
-    coordinator = PurpleAirDataUpdateCoordinator(hass, entry)
+async def async_setup_entry(hass: HomeAssistant, entry: PurpleAirConfigEntry) -> bool:
+    """Set up PurpleAir config entry."""
+    coordinator = PurpleAirDataUpdateCoordinator(
+        hass,
+        entry,
+    )
+    entry.runtime_data = coordinator
+
     await coordinator.async_config_entry_first_refresh()
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
-    entry.async_on_unload(entry.add_update_listener(async_handle_entry_update))
+    entry.async_on_unload(entry.add_update_listener(async_reload_entry))
 
     return True
 
 
-async def async_handle_entry_update(hass: HomeAssistant, entry: ConfigEntry) -> None:
-    """Handle an options update."""
+async def async_reload_entry(hass: HomeAssistant, entry: PurpleAirConfigEntry) -> None:
+    """Reload config entry."""
     await hass.config_entries.async_reload(entry.entry_id)
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Unload a config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
+async def async_unload_entry(hass: HomeAssistant, entry: PurpleAirConfigEntry) -> bool:
+    """Unload config entry."""
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/purpleair/const.py b/homeassistant/components/purpleair/const.py
index 5f1ec84d469..fcb928bd4f3 100644
--- a/homeassistant/components/purpleair/const.py
+++ b/homeassistant/components/purpleair/const.py
@@ -1,10 +1,13 @@
 """Constants for the PurpleAir integration."""
 
 import logging
+from typing import Final
 
-DOMAIN = "purpleair"
+from homeassistant.const import Platform
 
-LOGGER = logging.getLogger(__package__)
+LOGGER: Final = logging.getLogger(__package__)
+PLATFORMS: Final = [Platform.SENSOR]
 
-CONF_READ_KEY = "read_key"
-CONF_SENSOR_INDICES = "sensor_indices"
+DOMAIN: Final[str] = "purpleair"
+
+CONF_SENSOR_INDICES: Final[str] = "sensor_indices"
diff --git a/homeassistant/components/purpleair/coordinator.py b/homeassistant/components/purpleair/coordinator.py
index 7bf0770c6fc..4ed0c0340c6 100644
--- a/homeassistant/components/purpleair/coordinator.py
+++ b/homeassistant/components/purpleair/coordinator.py
@@ -46,19 +46,27 @@ SENSOR_FIELDS_TO_RETRIEVE = [
 UPDATE_INTERVAL = timedelta(minutes=2)
 
 
+type PurpleAirConfigEntry = ConfigEntry[PurpleAirDataUpdateCoordinator]
+
+
 class PurpleAirDataUpdateCoordinator(DataUpdateCoordinator[GetSensorsResponse]):
     """Define a PurpleAir-specific coordinator."""
 
-    def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
+    config_entry: PurpleAirConfigEntry
+
+    def __init__(self, hass: HomeAssistant, entry: PurpleAirConfigEntry) -> None:
         """Initialize."""
-        self._entry = entry
         self._api = API(
             entry.data[CONF_API_KEY],
             session=aiohttp_client.async_get_clientsession(hass),
         )
 
         super().__init__(
-            hass, LOGGER, name=entry.title, update_interval=UPDATE_INTERVAL
+            hass,
+            LOGGER,
+            config_entry=entry,
+            name=entry.title,
+            update_interval=UPDATE_INTERVAL,
         )
 
     async def _async_update_data(self) -> GetSensorsResponse:
@@ -66,7 +74,7 @@ class PurpleAirDataUpdateCoordinator(DataUpdateCoordinator[GetSensorsResponse]):
         try:
             return await self._api.sensors.async_get_sensors(
                 SENSOR_FIELDS_TO_RETRIEVE,
-                sensor_indices=self._entry.options[CONF_SENSOR_INDICES],
+                sensor_indices=self.config_entry.options[CONF_SENSOR_INDICES],
             )
         except InvalidApiKeyError as err:
             raise ConfigEntryAuthFailed("Invalid API key") from err
diff --git a/homeassistant/components/purpleair/diagnostics.py b/homeassistant/components/purpleair/diagnostics.py
index f7c44b7e9b2..71b83e277d3 100644
--- a/homeassistant/components/purpleair/diagnostics.py
+++ b/homeassistant/components/purpleair/diagnostics.py
@@ -5,7 +5,6 @@ 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,
@@ -14,8 +13,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
-from .coordinator import PurpleAirDataUpdateCoordinator
+from .coordinator import PurpleAirConfigEntry
 
 CONF_TITLE = "title"
 
@@ -30,14 +28,13 @@ TO_REDACT = {
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: ConfigEntry
+    hass: HomeAssistant, entry: PurpleAirConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    coordinator: PurpleAirDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
     return async_redact_data(
         {
             "entry": entry.as_dict(),
-            "data": coordinator.data.model_dump(),
+            "data": entry.runtime_data.data.model_dump(),
         },
         TO_REDACT,
     )
diff --git a/homeassistant/components/purpleair/entity.py b/homeassistant/components/purpleair/entity.py
index 4f7be1874ed..410fdd9b942 100644
--- a/homeassistant/components/purpleair/entity.py
+++ b/homeassistant/components/purpleair/entity.py
@@ -7,13 +7,12 @@ from typing import Any
 
 from aiopurpleair.models.sensors import SensorModel
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_LATITUDE, ATTR_LONGITUDE, CONF_SHOW_ON_MAP
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
-from .coordinator import PurpleAirDataUpdateCoordinator
+from .coordinator import PurpleAirConfigEntry, PurpleAirDataUpdateCoordinator
 
 
 class PurpleAirEntity(CoordinatorEntity[PurpleAirDataUpdateCoordinator]):
@@ -23,12 +22,11 @@ class PurpleAirEntity(CoordinatorEntity[PurpleAirDataUpdateCoordinator]):
 
     def __init__(
         self,
-        coordinator: PurpleAirDataUpdateCoordinator,
-        entry: ConfigEntry,
+        entry: PurpleAirConfigEntry,
         sensor_index: int,
     ) -> None:
         """Initialize."""
-        super().__init__(coordinator)
+        super().__init__(entry.runtime_data)
 
         self._sensor_index = sensor_index
 
diff --git a/homeassistant/components/purpleair/sensor.py b/homeassistant/components/purpleair/sensor.py
index 9fb0249a360..a85a23b6144 100644
--- a/homeassistant/components/purpleair/sensor.py
+++ b/homeassistant/components/purpleair/sensor.py
@@ -13,7 +13,6 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     PERCENTAGE,
@@ -25,10 +24,10 @@ from homeassistant.const import (
     UnitOfVolume,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import CONF_SENSOR_INDICES, DOMAIN
-from .coordinator import PurpleAirDataUpdateCoordinator
+from .const import CONF_SENSOR_INDICES
+from .coordinator import PurpleAirConfigEntry
 from .entity import PurpleAirEntity
 
 CONCENTRATION_PARTICLES_PER_100_MILLILITERS = f"particles/100{UnitOfVolume.MILLILITERS}"
@@ -165,13 +164,12 @@ SENSOR_DESCRIPTIONS = [
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: PurpleAirConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up PurpleAir sensors based on a config entry."""
-    coordinator: PurpleAirDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
     async_add_entities(
-        PurpleAirSensorEntity(coordinator, entry, sensor_index, description)
+        PurpleAirSensorEntity(entry, sensor_index, description)
         for sensor_index in entry.options[CONF_SENSOR_INDICES]
         for description in SENSOR_DESCRIPTIONS
     )
@@ -184,13 +182,12 @@ class PurpleAirSensorEntity(PurpleAirEntity, SensorEntity):
 
     def __init__(
         self,
-        coordinator: PurpleAirDataUpdateCoordinator,
-        entry: ConfigEntry,
+        entry: PurpleAirConfigEntry,
         sensor_index: int,
         description: PurpleAirSensorEntityDescription,
     ) -> None:
         """Initialize."""
-        super().__init__(coordinator, entry, sensor_index)
+        super().__init__(entry, sensor_index)
 
         self._attr_unique_id = f"{self._sensor_index}-{description.key}"
         self.entity_description = description
diff --git a/homeassistant/components/push/camera.py b/homeassistant/components/push/camera.py
index 37ac6144d0d..603fe89d542 100644
--- a/homeassistant/components/push/camera.py
+++ b/homeassistant/components/push/camera.py
@@ -24,7 +24,7 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/pushbullet/sensor.py b/homeassistant/components/pushbullet/sensor.py
index 4989fc91d5e..2dbaa8fc713 100644
--- a/homeassistant/components/pushbullet/sensor.py
+++ b/homeassistant/components/pushbullet/sensor.py
@@ -8,7 +8,7 @@ from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .api import PushBulletNotificationProvider
 from .const import DATA_UPDATED, DOMAIN
@@ -68,7 +68,9 @@ SENSOR_KEYS: list[str] = [desc.key for desc in SENSOR_TYPES]
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Pushbullet sensors from config entry."""
 
diff --git a/homeassistant/components/pushsafer/notify.py b/homeassistant/components/pushsafer/notify.py
index b5c517c8662..faca654b420 100644
--- a/homeassistant/components/pushsafer/notify.py
+++ b/homeassistant/components/pushsafer/notify.py
@@ -21,7 +21,7 @@ from homeassistant.components.notify import (
 )
 from homeassistant.const import ATTR_ICON
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/pvoutput/coordinator.py b/homeassistant/components/pvoutput/coordinator.py
index 5c38792c553..ce3642421bf 100644
--- a/homeassistant/components/pvoutput/coordinator.py
+++ b/homeassistant/components/pvoutput/coordinator.py
@@ -21,14 +21,15 @@ class PVOutputDataUpdateCoordinator(DataUpdateCoordinator[Status]):
 
     def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
         """Initialize the PVOutput coordinator."""
-        self.config_entry = entry
         self.pvoutput = PVOutput(
             api_key=entry.data[CONF_API_KEY],
             system_id=entry.data[CONF_SYSTEM_ID],
             session=async_get_clientsession(hass),
         )
 
-        super().__init__(hass, LOGGER, name=DOMAIN, update_interval=SCAN_INTERVAL)
+        super().__init__(
+            hass, LOGGER, config_entry=entry, name=DOMAIN, update_interval=SCAN_INTERVAL
+        )
 
     async def _async_update_data(self) -> Status:
         """Fetch system status from PVOutput."""
diff --git a/homeassistant/components/pvoutput/sensor.py b/homeassistant/components/pvoutput/sensor.py
index ef2bb3eb660..b4ed3f93945 100644
--- a/homeassistant/components/pvoutput/sensor.py
+++ b/homeassistant/components/pvoutput/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import CONF_SYSTEM_ID, DOMAIN
@@ -98,7 +98,7 @@ SENSORS: tuple[PVOutputSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a PVOutput sensors based on a config entry."""
     coordinator: PVOutputDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/pvpc_hourly_pricing/__init__.py b/homeassistant/components/pvpc_hourly_pricing/__init__.py
index 6327164e3c8..4d120e9fae7 100644
--- a/homeassistant/components/pvpc_hourly_pricing/__init__.py
+++ b/homeassistant/components/pvpc_hourly_pricing/__init__.py
@@ -3,7 +3,7 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_TOKEN, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from .const import ATTR_POWER, ATTR_POWER_P3, DOMAIN
 from .coordinator import ElecPricesDataUpdateCoordinator
diff --git a/homeassistant/components/pvpc_hourly_pricing/coordinator.py b/homeassistant/components/pvpc_hourly_pricing/coordinator.py
index 171e516abdc..28e676d37ed 100644
--- a/homeassistant/components/pvpc_hourly_pricing/coordinator.py
+++ b/homeassistant/components/pvpc_hourly_pricing/coordinator.py
@@ -21,6 +21,8 @@ _LOGGER = logging.getLogger(__name__)
 class ElecPricesDataUpdateCoordinator(DataUpdateCoordinator[EsiosApiData]):
     """Class to manage fetching Electricity prices data from API."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self, hass: HomeAssistant, entry: ConfigEntry, sensor_keys: set[str]
     ) -> None:
@@ -35,14 +37,17 @@ class ElecPricesDataUpdateCoordinator(DataUpdateCoordinator[EsiosApiData]):
             sensor_keys=tuple(sensor_keys),
         )
         super().__init__(
-            hass, _LOGGER, name=DOMAIN, update_interval=timedelta(minutes=30)
+            hass,
+            _LOGGER,
+            config_entry=entry,
+            name=DOMAIN,
+            update_interval=timedelta(minutes=30),
         )
-        self._entry = entry
 
     @property
     def entry_id(self) -> str:
         """Return entry ID."""
-        return self._entry.entry_id
+        return self.config_entry.entry_id
 
     async def _async_update_data(self) -> EsiosApiData:
         """Update electricity prices from the ESIOS API."""
diff --git a/homeassistant/components/pvpc_hourly_pricing/sensor.py b/homeassistant/components/pvpc_hourly_pricing/sensor.py
index 9d9fe5b9661..1b92cfc533d 100644
--- a/homeassistant/components/pvpc_hourly_pricing/sensor.py
+++ b/homeassistant/components/pvpc_hourly_pricing/sensor.py
@@ -18,7 +18,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CURRENCY_EURO, UnitOfEnergy
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_track_time_change
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -148,7 +148,9 @@ _PRICE_SENSOR_ATTRIBUTES_MAP = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the electricity price sensor from config_entry."""
     coordinator: ElecPricesDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/pyload/__init__.py b/homeassistant/components/pyload/__init__.py
index f07db509630..ca7bbb0c1dc 100644
--- a/homeassistant/components/pyload/__init__.py
+++ b/homeassistant/components/pyload/__init__.py
@@ -2,40 +2,35 @@
 
 from __future__ import annotations
 
-from aiohttp import CookieJar
-from pyloadapi.api import PyLoadAPI
-from pyloadapi.exceptions import CannotConnect, InvalidAuth, ParserError
+import logging
+
+from aiohttp import CookieJar
+from pyloadapi import PyLoadAPI
+from yarl import URL
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_HOST,
     CONF_PASSWORD,
     CONF_PORT,
     CONF_SSL,
+    CONF_URL,
     CONF_USERNAME,
     CONF_VERIFY_SSL,
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_create_clientsession
 
-from .const import DOMAIN
-from .coordinator import PyLoadCoordinator
+from .coordinator import PyLoadConfigEntry, PyLoadCoordinator
+
+_LOGGER = logging.getLogger(__name__)
 
 PLATFORMS: list[Platform] = [Platform.BUTTON, Platform.SENSOR, Platform.SWITCH]
 
-type PyLoadConfigEntry = ConfigEntry[PyLoadCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: PyLoadConfigEntry) -> bool:
     """Set up pyLoad from a config entry."""
 
-    url = (
-        f"{'https' if entry.data[CONF_SSL] else 'http'}://"
-        f"{entry.data[CONF_HOST]}:{entry.data[CONF_PORT]}/"
-    )
-
     session = async_create_clientsession(
         hass,
         verify_ssl=entry.data[CONF_VERIFY_SSL],
@@ -43,30 +38,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: PyLoadConfigEntry) -> bo
     )
     pyloadapi = PyLoadAPI(
         session,
-        api_url=url,
+        api_url=URL(entry.data[CONF_URL]),
         username=entry.data[CONF_USERNAME],
         password=entry.data[CONF_PASSWORD],
     )
 
-    try:
-        await pyloadapi.login()
-    except CannotConnect as e:
-        raise ConfigEntryNotReady(
-            translation_domain=DOMAIN,
-            translation_key="setup_request_exception",
-        ) from e
-    except ParserError as e:
-        raise ConfigEntryNotReady(
-            translation_domain=DOMAIN,
-            translation_key="setup_parse_exception",
-        ) from e
-    except InvalidAuth as e:
-        raise ConfigEntryAuthFailed(
-            translation_domain=DOMAIN,
-            translation_key="setup_authentication_exception",
-            translation_placeholders={CONF_USERNAME: entry.data[CONF_USERNAME]},
-        ) from e
-    coordinator = PyLoadCoordinator(hass, pyloadapi)
+    coordinator = PyLoadCoordinator(hass, entry, pyloadapi)
 
     await coordinator.async_config_entry_first_refresh()
 
@@ -79,3 +56,27 @@ async def async_setup_entry(hass: HomeAssistant, entry: PyLoadConfigEntry) -> bo
 async def async_unload_entry(hass: HomeAssistant, entry: PyLoadConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+
+async def async_migrate_entry(hass: HomeAssistant, entry: PyLoadConfigEntry) -> bool:
+    """Migrate config entry."""
+    _LOGGER.debug(
+        "Migrating configuration from version %s.%s", entry.version, entry.minor_version
+    )
+
+    if entry.version == 1 and entry.minor_version == 0:
+        url = URL.build(
+            scheme="https" if entry.data[CONF_SSL] else "http",
+            host=entry.data[CONF_HOST],
+            port=entry.data[CONF_PORT],
+        ).human_repr()
+        hass.config_entries.async_update_entry(
+            entry, data={**entry.data, CONF_URL: url}, minor_version=1, version=1
+        )
+
+    _LOGGER.debug(
+        "Migration to configuration version %s.%s successful",
+        entry.version,
+        entry.minor_version,
+    )
+    return True
diff --git a/homeassistant/components/pyload/button.py b/homeassistant/components/pyload/button.py
index 386fe6968de..5ee10a327d1 100644
--- a/homeassistant/components/pyload/button.py
+++ b/homeassistant/components/pyload/button.py
@@ -7,17 +7,19 @@ from dataclasses import dataclass
 from enum import StrEnum
 from typing import Any
 
-from pyloadapi.api import CannotConnect, InvalidAuth, PyLoadAPI
+from pyloadapi import CannotConnect, InvalidAuth, PyLoadAPI
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import PyLoadConfigEntry
 from .const import DOMAIN
+from .coordinator import PyLoadConfigEntry
 from .entity import BasePyLoadEntity
 
+PARALLEL_UPDATES = 1
+
 
 @dataclass(kw_only=True, frozen=True)
 class PyLoadButtonEntityDescription(ButtonEntityDescription):
@@ -63,7 +65,7 @@ SENSOR_DESCRIPTIONS: tuple[PyLoadButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PyLoadConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up buttons from a config entry."""
 
diff --git a/homeassistant/components/pyload/config_flow.py b/homeassistant/components/pyload/config_flow.py
index 5df11711d6f..50d354d345d 100644
--- a/homeassistant/components/pyload/config_flow.py
+++ b/homeassistant/components/pyload/config_flow.py
@@ -7,38 +7,38 @@ import logging
 from typing import Any
 
 from aiohttp import CookieJar
-from pyloadapi.api import PyLoadAPI
-from pyloadapi.exceptions import CannotConnect, InvalidAuth, ParserError
+from pyloadapi import CannotConnect, InvalidAuth, ParserError, PyLoadAPI
 import voluptuous as vol
+from yarl import URL
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import (
-    CONF_HOST,
     CONF_NAME,
     CONF_PASSWORD,
-    CONF_PORT,
-    CONF_SSL,
+    CONF_URL,
     CONF_USERNAME,
     CONF_VERIFY_SSL,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_create_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.selector import (
     TextSelector,
     TextSelectorConfig,
     TextSelectorType,
 )
 
-from .const import DEFAULT_NAME, DEFAULT_PORT, DOMAIN
+from .const import DEFAULT_NAME, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
 STEP_USER_DATA_SCHEMA = vol.Schema(
     {
-        vol.Required(CONF_HOST): str,
-        vol.Required(CONF_PORT, default=DEFAULT_PORT): cv.port,
-        vol.Required(CONF_SSL, default=False): cv.boolean,
+        vol.Required(CONF_URL): TextSelector(
+            TextSelectorConfig(
+                type=TextSelectorType.URL,
+                autocomplete="url",
+            ),
+        ),
         vol.Required(CONF_VERIFY_SSL, default=True): bool,
         vol.Required(CONF_USERNAME): TextSelector(
             TextSelectorConfig(
@@ -81,14 +81,9 @@ async def validate_input(hass: HomeAssistant, user_input: dict[str, Any]) -> Non
         user_input[CONF_VERIFY_SSL],
         cookie_jar=CookieJar(unsafe=True),
     )
-
-    url = (
-        f"{'https' if user_input[CONF_SSL] else 'http'}://"
-        f"{user_input[CONF_HOST]}:{user_input[CONF_PORT]}/"
-    )
     pyload = PyLoadAPI(
         session,
-        api_url=url,
+        api_url=URL(user_input[CONF_URL]),
         username=user_input[CONF_USERNAME],
         password=user_input[CONF_PASSWORD],
     )
@@ -100,6 +95,7 @@ class PyLoadConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for pyLoad."""
 
     VERSION = 1
+    MINOR_VERSION = 1
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -107,9 +103,8 @@ class PyLoadConfigFlow(ConfigFlow, domain=DOMAIN):
         """Handle the initial step."""
         errors: dict[str, str] = {}
         if user_input is not None:
-            self._async_abort_entries_match(
-                {CONF_HOST: user_input[CONF_HOST], CONF_PORT: user_input[CONF_PORT]}
-            )
+            url = URL(user_input[CONF_URL]).human_repr()
+            self._async_abort_entries_match({CONF_URL: url})
             try:
                 await validate_input(self.hass, user_input)
             except (CannotConnect, ParserError):
@@ -121,7 +116,14 @@ class PyLoadConfigFlow(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "unknown"
             else:
                 title = DEFAULT_NAME
-                return self.async_create_entry(title=title, data=user_input)
+
+                return self.async_create_entry(
+                    title=title,
+                    data={
+                        **user_input,
+                        CONF_URL: url,
+                    },
+                )
 
         return self.async_show_form(
             step_id="user",
@@ -145,9 +147,8 @@ class PyLoadConfigFlow(ConfigFlow, domain=DOMAIN):
         reauth_entry = self._get_reauth_entry()
 
         if user_input is not None:
-            new_input = reauth_entry.data | user_input
             try:
-                await validate_input(self.hass, new_input)
+                await validate_input(self.hass, {**reauth_entry.data, **user_input})
             except (CannotConnect, ParserError):
                 errors["base"] = "cannot_connect"
             except InvalidAuth:
@@ -156,7 +157,9 @@ class PyLoadConfigFlow(ConfigFlow, domain=DOMAIN):
                 _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
-                return self.async_update_reload_and_abort(reauth_entry, data=new_input)
+                return self.async_update_reload_and_abort(
+                    reauth_entry, data_updates=user_input
+                )
 
         return self.async_show_form(
             step_id="reauth_confirm",
@@ -192,15 +195,18 @@ class PyLoadConfigFlow(ConfigFlow, domain=DOMAIN):
             else:
                 return self.async_update_reload_and_abort(
                     reconfig_entry,
-                    data=user_input,
+                    data={
+                        **user_input,
+                        CONF_URL: URL(user_input[CONF_URL]).human_repr(),
+                    },
                     reload_even_if_entry_is_unchanged=False,
                 )
-
+        suggested_values = user_input if user_input else reconfig_entry.data
         return self.async_show_form(
             step_id="reconfigure",
             data_schema=self.add_suggested_values_to_schema(
                 STEP_USER_DATA_SCHEMA,
-                user_input or reconfig_entry.data,
+                suggested_values,
             ),
             description_placeholders={CONF_NAME: reconfig_entry.data[CONF_USERNAME]},
             errors=errors,
diff --git a/homeassistant/components/pyload/coordinator.py b/homeassistant/components/pyload/coordinator.py
index 7eadefcd260..7bb2b870520 100644
--- a/homeassistant/components/pyload/coordinator.py
+++ b/homeassistant/components/pyload/coordinator.py
@@ -9,7 +9,7 @@ from pyloadapi import CannotConnect, InvalidAuth, ParserError, PyLoadAPI
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_USERNAME
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN
@@ -31,19 +31,26 @@ class PyLoadData:
     download: bool
     reconnect: bool
     captcha: bool | None = None
+    proxy: bool | None = None
     free_space: int
 
 
+type PyLoadConfigEntry = ConfigEntry[PyLoadCoordinator]
+
+
 class PyLoadCoordinator(DataUpdateCoordinator[PyLoadData]):
     """pyLoad coordinator."""
 
-    config_entry: ConfigEntry
+    config_entry: PyLoadConfigEntry
 
-    def __init__(self, hass: HomeAssistant, pyload: PyLoadAPI) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: PyLoadConfigEntry, pyload: PyLoadAPI
+    ) -> None:
         """Initialize pyLoad coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
@@ -53,14 +60,11 @@ class PyLoadCoordinator(DataUpdateCoordinator[PyLoadData]):
     async def _async_update_data(self) -> PyLoadData:
         """Fetch data from API endpoint."""
         try:
-            if not self.version:
-                self.version = await self.pyload.version()
             return PyLoadData(
                 **await self.pyload.get_status(),
                 free_space=await self.pyload.free_space(),
             )
-
-        except InvalidAuth as e:
+        except InvalidAuth:
             try:
                 await self.pyload.login()
             except InvalidAuth as exc:
@@ -69,13 +73,42 @@ class PyLoadCoordinator(DataUpdateCoordinator[PyLoadData]):
                     translation_key="setup_authentication_exception",
                     translation_placeholders={CONF_USERNAME: self.pyload.username},
                 ) from exc
-
-            raise UpdateFailed(
-                "Unable to retrieve data due to cookie expiration"
-            ) from e
+            _LOGGER.debug(
+                "Unable to retrieve data due to cookie expiration, retrying after 20 seconds"
+            )
+            return self.data
         except CannotConnect as e:
             raise UpdateFailed(
-                "Unable to connect and retrieve data from pyLoad API"
+                translation_domain=DOMAIN,
+                translation_key="setup_request_exception",
             ) from e
         except ParserError as e:
-            raise UpdateFailed("Unable to parse data from pyLoad API") from e
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="setup_parse_exception",
+            ) from e
+
+    async def _async_setup(self) -> None:
+        """Set up the coordinator."""
+
+        try:
+            await self.pyload.login()
+            self.version = await self.pyload.version()
+        except CannotConnect as e:
+            raise ConfigEntryNotReady(
+                translation_domain=DOMAIN,
+                translation_key="setup_request_exception",
+            ) from e
+        except ParserError as e:
+            raise ConfigEntryNotReady(
+                translation_domain=DOMAIN,
+                translation_key="setup_parse_exception",
+            ) from e
+        except InvalidAuth as e:
+            raise ConfigEntryAuthFailed(
+                translation_domain=DOMAIN,
+                translation_key="setup_authentication_exception",
+                translation_placeholders={
+                    CONF_USERNAME: self.config_entry.data[CONF_USERNAME]
+                },
+            ) from e
diff --git a/homeassistant/components/pyload/diagnostics.py b/homeassistant/components/pyload/diagnostics.py
index e9688a3369b..98fab38da1d 100644
--- a/homeassistant/components/pyload/diagnostics.py
+++ b/homeassistant/components/pyload/diagnostics.py
@@ -5,14 +5,15 @@ from __future__ import annotations
 from dataclasses import asdict
 from typing import Any
 
-from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
+from yarl import URL
+
+from homeassistant.components.diagnostics import REDACTED, async_redact_data
+from homeassistant.const import CONF_PASSWORD, CONF_URL, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 
-from . import PyLoadConfigEntry
-from .coordinator import PyLoadData
+from .coordinator import PyLoadConfigEntry, PyLoadData
 
-TO_REDACT = {CONF_USERNAME, CONF_PASSWORD, CONF_HOST}
+TO_REDACT = {CONF_USERNAME, CONF_PASSWORD, CONF_URL}
 
 
 async def async_get_config_entry_diagnostics(
@@ -22,6 +23,9 @@ async def async_get_config_entry_diagnostics(
     pyload_data: PyLoadData = config_entry.runtime_data.data
 
     return {
-        "config_entry_data": async_redact_data(dict(config_entry.data), TO_REDACT),
+        "config_entry_data": {
+            **async_redact_data(dict(config_entry.data), TO_REDACT),
+            CONF_URL: URL(config_entry.data[CONF_URL]).with_host(REDACTED).human_repr(),
+        },
         "pyload_data": asdict(pyload_data),
     }
diff --git a/homeassistant/components/pyload/manifest.json b/homeassistant/components/pyload/manifest.json
index e21167cf10b..feaa23af7de 100644
--- a/homeassistant/components/pyload/manifest.json
+++ b/homeassistant/components/pyload/manifest.json
@@ -7,5 +7,6 @@
   "integration_type": "service",
   "iot_class": "local_polling",
   "loggers": ["pyloadapi"],
-  "requirements": ["PyLoadAPI==1.3.2"]
+  "quality_scale": "platinum",
+  "requirements": ["PyLoadAPI==1.4.2"]
 }
diff --git a/homeassistant/components/pyload/quality_scale.yaml b/homeassistant/components/pyload/quality_scale.yaml
new file mode 100644
index 00000000000..a9ce552961b
--- /dev/null
+++ b/homeassistant/components/pyload/quality_scale.yaml
@@ -0,0 +1,82 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: The integration registers no actions.
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: The integration registers no actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup:
+    status: exempt
+    comment: The integration registers no events.
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions:
+    status: exempt
+    comment: The integration registers no actions.
+  config-entry-unloading: done
+  docs-configuration-parameters:
+    status: exempt
+    comment: Integration has no configuration parameters
+  docs-installation-parameters: done
+  entity-unavailable: done
+  integration-owner: done
+  log-when-unavailable: done
+  parallel-updates: done
+  reauthentication-flow: done
+  test-coverage: done
+
+  # Gold
+  devices: done
+  diagnostics: done
+  discovery-update-info:
+    status: exempt
+    comment: The integration is a web service, there are no discoverable devices.
+  discovery:
+    status: exempt
+    comment: The integration is a web service, there are no discoverable devices.
+  docs-data-update: done
+  docs-examples: done
+  docs-known-limitations: done
+  docs-supported-devices:
+    status: exempt
+    comment: The integration is a web service, there are no devices.
+  docs-supported-functions: done
+  docs-troubleshooting: done
+  docs-use-cases: done
+  dynamic-devices:
+    status: exempt
+    comment: The integration is a web service, there are no devices.
+  entity-category: done
+  entity-device-class: done
+  entity-disabled-by-default: done
+  entity-translations: done
+  exception-translations: done
+  icon-translations: done
+  reconfiguration-flow: done
+  repair-issues:
+    status: exempt
+    comment: The integration has no repairs.
+  stale-devices:
+    status: exempt
+    comment: The integration is a web service, there are no devices.
+
+  # Platinum
+  async-dependency: done
+  inject-websession: done
+  strict-typing: done
diff --git a/homeassistant/components/pyload/sensor.py b/homeassistant/components/pyload/sensor.py
index 38f681d30d5..7425c543fe1 100644
--- a/homeassistant/components/pyload/sensor.py
+++ b/homeassistant/components/pyload/sensor.py
@@ -14,14 +14,15 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import UnitOfDataRate, UnitOfInformation
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import PyLoadConfigEntry
 from .const import UNIT_DOWNLOADS
-from .coordinator import PyLoadData
+from .coordinator import PyLoadConfigEntry, PyLoadData
 from .entity import BasePyLoadEntity
 
+PARALLEL_UPDATES = 0
+
 
 class PyLoadSensorEntity(StrEnum):
     """pyLoad Sensor Entities."""
@@ -86,7 +87,7 @@ SENSOR_DESCRIPTIONS: tuple[PyLoadSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PyLoadConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the pyLoad sensors."""
 
diff --git a/homeassistant/components/pyload/strings.json b/homeassistant/components/pyload/strings.json
index 0fd9b4befcf..9414f7f7bb8 100644
--- a/homeassistant/components/pyload/strings.json
+++ b/homeassistant/components/pyload/strings.json
@@ -3,30 +3,30 @@
     "step": {
       "user": {
         "data": {
-          "host": "[%key:common::config_flow::data::host%]",
+          "url": "[%key:common::config_flow::data::url%]",
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
-          "ssl": "[%key:common::config_flow::data::ssl%]",
-          "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]",
-          "port": "[%key:common::config_flow::data::port%]"
+          "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
         },
         "data_description": {
-          "host": "The hostname or IP address of the device running your pyLoad instance.",
-          "port": "pyLoad uses port 8000 by default."
+          "url": "Specify the full URL of your pyLoad web interface, including the protocol (HTTP or HTTPS), hostname or IP address, port (pyLoad uses 8000 by default), and any path prefix if applicable.\nExample: `https://example.com:8000/path`",
+          "username": "The username used to access the pyLoad instance.",
+          "password": "The password associated with the pyLoad account.",
+          "verify_ssl": "If checked, the SSL certificate will be validated to ensure a secure connection."
         }
       },
       "reconfigure": {
         "data": {
-          "host": "[%key:common::config_flow::data::host%]",
+          "url": "[%key:common::config_flow::data::url%]",
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
-          "ssl": "[%key:common::config_flow::data::ssl%]",
-          "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]",
-          "port": "[%key:common::config_flow::data::port%]"
+          "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
         },
         "data_description": {
-          "host": "The hostname or IP address of the device running your pyLoad instance.",
-          "port": "pyLoad uses port 8000 by default."
+          "url": "[%key:component::pyload::config::step::user::data_description::url%]",
+          "username": "[%key:component::pyload::config::step::user::data_description::username%]",
+          "password": "[%key:component::pyload::config::step::user::data_description::password%]",
+          "verify_ssl": "[%key:component::pyload::config::step::user::data_description::verify_ssl%]"
         }
       },
       "reauth_confirm": {
@@ -34,6 +34,10 @@
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "username": "[%key:component::pyload::config::step::user::data_description::username%]",
+          "password": "[%key:component::pyload::config::step::user::data_description::password%]"
         }
       }
     },
@@ -91,10 +95,10 @@
   },
   "exceptions": {
     "setup_request_exception": {
-      "message": "Unable to connect and retrieve data from pyLoad API, try again later"
+      "message": "Unable to connect and retrieve data from pyLoad API"
     },
     "setup_parse_exception": {
-      "message": "Unable to parse data from pyLoad API, try again later"
+      "message": "Unable to parse data from pyLoad API"
     },
     "setup_authentication_exception": {
       "message": "Authentication failed for {username}, verify your login credentials"
diff --git a/homeassistant/components/pyload/switch.py b/homeassistant/components/pyload/switch.py
index ea189ed9a8f..46a54451b9a 100644
--- a/homeassistant/components/pyload/switch.py
+++ b/homeassistant/components/pyload/switch.py
@@ -7,7 +7,7 @@ from dataclasses import dataclass
 from enum import StrEnum
 from typing import Any
 
-from pyloadapi.api import CannotConnect, InvalidAuth, PyLoadAPI
+from pyloadapi import CannotConnect, InvalidAuth, PyLoadAPI
 
 from homeassistant.components.switch import (
     SwitchDeviceClass,
@@ -16,13 +16,14 @@ from homeassistant.components.switch import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import PyLoadConfigEntry
 from .const import DOMAIN
-from .coordinator import PyLoadData
+from .coordinator import PyLoadConfigEntry, PyLoadData
 from .entity import BasePyLoadEntity
 
+PARALLEL_UPDATES = 1
+
 
 class PyLoadSwitch(StrEnum):
     """PyLoad Switch Entities."""
@@ -66,7 +67,7 @@ SENSOR_DESCRIPTIONS: tuple[PyLoadSwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: PyLoadConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the pyLoad sensors."""
 
diff --git a/homeassistant/components/python_script/__init__.py b/homeassistant/components/python_script/__init__.py
index dbd1a5dce4b..0729d73a034 100644
--- a/homeassistant/components/python_script/__init__.py
+++ b/homeassistant/components/python_script/__init__.py
@@ -36,8 +36,7 @@ from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers.service import async_set_service_schema
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import bind_hass
-from homeassistant.util import raise_if_invalid_filename
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util, raise_if_invalid_filename
 from homeassistant.util.yaml.loader import load_yaml_dict
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/python_script/manifest.json b/homeassistant/components/python_script/manifest.json
index 4348fdd9911..c8cb1da40c9 100644
--- a/homeassistant/components/python_script/manifest.json
+++ b/homeassistant/components/python_script/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/python_script",
   "loggers": ["RestrictedPython"],
   "quality_scale": "internal",
-  "requirements": ["RestrictedPython==7.4"]
+  "requirements": ["RestrictedPython==8.0"]
 }
diff --git a/homeassistant/components/qbittorrent/__init__.py b/homeassistant/components/qbittorrent/__init__.py
index d95136965f8..513b49d3561 100644
--- a/homeassistant/components/qbittorrent/__init__.py
+++ b/homeassistant/components/qbittorrent/__init__.py
@@ -124,7 +124,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     except APIConnectionError as exc:
         raise ConfigEntryNotReady("Fail to connect to qBittorrent") from exc
 
-    coordinator = QBittorrentDataCoordinator(hass, client)
+    coordinator = QBittorrentDataCoordinator(hass, config_entry, client)
 
     await coordinator.async_config_entry_first_refresh()
     hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = coordinator
diff --git a/homeassistant/components/qbittorrent/coordinator.py b/homeassistant/components/qbittorrent/coordinator.py
index c590bb9d81a..8fd23fb3b5b 100644
--- a/homeassistant/components/qbittorrent/coordinator.py
+++ b/homeassistant/components/qbittorrent/coordinator.py
@@ -15,6 +15,7 @@ from qbittorrentapi import (
 )
 from qbittorrentapi.torrents import TorrentStatusesT
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
@@ -27,7 +28,11 @@ _LOGGER = logging.getLogger(__name__)
 class QBittorrentDataCoordinator(DataUpdateCoordinator[SyncMainDataDictionary]):
     """Coordinator for updating QBittorrent data."""
 
-    def __init__(self, hass: HomeAssistant, client: Client) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, client: Client
+    ) -> None:
         """Initialize coordinator."""
         self.client = client
         self._is_alternative_mode_enabled = False
@@ -42,6 +47,7 @@ class QBittorrentDataCoordinator(DataUpdateCoordinator[SyncMainDataDictionary]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=30),
         )
diff --git a/homeassistant/components/qbittorrent/sensor.py b/homeassistant/components/qbittorrent/sensor.py
index 67eb856bb83..23ec485fcd4 100644
--- a/homeassistant/components/qbittorrent/sensor.py
+++ b/homeassistant/components/qbittorrent/sensor.py
@@ -14,10 +14,10 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import STATE_IDLE, UnitOfDataRate
+from homeassistant.const import STATE_IDLE, UnitOfDataRate, UnitOfInformation
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -27,8 +27,14 @@ from .coordinator import QBittorrentDataCoordinator
 _LOGGER = logging.getLogger(__name__)
 
 SENSOR_TYPE_CURRENT_STATUS = "current_status"
+SENSOR_TYPE_CONNECTION_STATUS = "connection_status"
 SENSOR_TYPE_DOWNLOAD_SPEED = "download_speed"
 SENSOR_TYPE_UPLOAD_SPEED = "upload_speed"
+SENSOR_TYPE_DOWNLOAD_SPEED_LIMIT = "download_speed_limit"
+SENSOR_TYPE_UPLOAD_SPEED_LIMIT = "upload_speed_limit"
+SENSOR_TYPE_ALLTIME_DOWNLOAD = "alltime_download"
+SENSOR_TYPE_ALLTIME_UPLOAD = "alltime_upload"
+SENSOR_TYPE_GLOBAL_RATIO = "global_ratio"
 SENSOR_TYPE_ALL_TORRENTS = "all_torrents"
 SENSOR_TYPE_PAUSED_TORRENTS = "paused_torrents"
 SENSOR_TYPE_ACTIVE_TORRENTS = "active_torrents"
@@ -50,18 +56,54 @@ def get_state(coordinator: QBittorrentDataCoordinator) -> str:
     return STATE_IDLE
 
 
-def get_dl(coordinator: QBittorrentDataCoordinator) -> int:
+def get_connection_status(coordinator: QBittorrentDataCoordinator) -> str:
+    """Get current download/upload state."""
+    server_state = cast(Mapping, coordinator.data.get("server_state"))
+    return cast(str, server_state.get("connection_status"))
+
+
+def get_download_speed(coordinator: QBittorrentDataCoordinator) -> int:
     """Get current download speed."""
     server_state = cast(Mapping, coordinator.data.get("server_state"))
     return cast(int, server_state.get("dl_info_speed"))
 
 
-def get_up(coordinator: QBittorrentDataCoordinator) -> int:
+def get_upload_speed(coordinator: QBittorrentDataCoordinator) -> int:
     """Get current upload speed."""
     server_state = cast(Mapping[str, Any], coordinator.data.get("server_state"))
     return cast(int, server_state.get("up_info_speed"))
 
 
+def get_download_speed_limit(coordinator: QBittorrentDataCoordinator) -> int:
+    """Get current download speed."""
+    server_state = cast(Mapping, coordinator.data.get("server_state"))
+    return cast(int, server_state.get("dl_rate_limit"))
+
+
+def get_upload_speed_limit(coordinator: QBittorrentDataCoordinator) -> int:
+    """Get current upload speed."""
+    server_state = cast(Mapping[str, Any], coordinator.data.get("server_state"))
+    return cast(int, server_state.get("up_rate_limit"))
+
+
+def get_alltime_download(coordinator: QBittorrentDataCoordinator) -> int:
+    """Get current download speed."""
+    server_state = cast(Mapping, coordinator.data.get("server_state"))
+    return cast(int, server_state.get("alltime_dl"))
+
+
+def get_alltime_upload(coordinator: QBittorrentDataCoordinator) -> int:
+    """Get current download speed."""
+    server_state = cast(Mapping, coordinator.data.get("server_state"))
+    return cast(int, server_state.get("alltime_ul"))
+
+
+def get_global_ratio(coordinator: QBittorrentDataCoordinator) -> float:
+    """Get current download speed."""
+    server_state = cast(Mapping, coordinator.data.get("server_state"))
+    return cast(float, server_state.get("global_ratio"))
+
+
 @dataclass(frozen=True, kw_only=True)
 class QBittorrentSensorEntityDescription(SensorEntityDescription):
     """Entity description class for qBittorent sensors."""
@@ -77,6 +119,13 @@ SENSOR_TYPES: tuple[QBittorrentSensorEntityDescription, ...] = (
         options=[STATE_IDLE, STATE_UP_DOWN, STATE_SEEDING, STATE_DOWNLOADING],
         value_fn=get_state,
     ),
+    QBittorrentSensorEntityDescription(
+        key=SENSOR_TYPE_CONNECTION_STATUS,
+        translation_key="connection_status",
+        device_class=SensorDeviceClass.ENUM,
+        options=["connected", "firewalled", "disconnected"],
+        value_fn=get_connection_status,
+    ),
     QBittorrentSensorEntityDescription(
         key=SENSOR_TYPE_DOWNLOAD_SPEED,
         translation_key="download_speed",
@@ -85,7 +134,7 @@ SENSOR_TYPES: tuple[QBittorrentSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfDataRate.BYTES_PER_SECOND,
         suggested_display_precision=2,
         suggested_unit_of_measurement=UnitOfDataRate.MEGABYTES_PER_SECOND,
-        value_fn=get_dl,
+        value_fn=get_download_speed,
     ),
     QBittorrentSensorEntityDescription(
         key=SENSOR_TYPE_UPLOAD_SPEED,
@@ -95,7 +144,56 @@ SENSOR_TYPES: tuple[QBittorrentSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfDataRate.BYTES_PER_SECOND,
         suggested_display_precision=2,
         suggested_unit_of_measurement=UnitOfDataRate.MEGABYTES_PER_SECOND,
-        value_fn=get_up,
+        value_fn=get_upload_speed,
+    ),
+    QBittorrentSensorEntityDescription(
+        key=SENSOR_TYPE_DOWNLOAD_SPEED_LIMIT,
+        translation_key="download_speed_limit",
+        state_class=SensorStateClass.MEASUREMENT,
+        device_class=SensorDeviceClass.DATA_RATE,
+        native_unit_of_measurement=UnitOfDataRate.BYTES_PER_SECOND,
+        suggested_display_precision=2,
+        suggested_unit_of_measurement=UnitOfDataRate.MEGABYTES_PER_SECOND,
+        value_fn=get_download_speed_limit,
+        entity_registry_enabled_default=False,
+    ),
+    QBittorrentSensorEntityDescription(
+        key=SENSOR_TYPE_UPLOAD_SPEED_LIMIT,
+        translation_key="upload_speed_limit",
+        state_class=SensorStateClass.MEASUREMENT,
+        device_class=SensorDeviceClass.DATA_RATE,
+        native_unit_of_measurement=UnitOfDataRate.BYTES_PER_SECOND,
+        suggested_display_precision=2,
+        suggested_unit_of_measurement=UnitOfDataRate.MEGABYTES_PER_SECOND,
+        value_fn=get_upload_speed_limit,
+        entity_registry_enabled_default=False,
+    ),
+    QBittorrentSensorEntityDescription(
+        key=SENSOR_TYPE_ALLTIME_DOWNLOAD,
+        translation_key="alltime_download",
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        device_class=SensorDeviceClass.DATA_SIZE,
+        native_unit_of_measurement=UnitOfInformation.BYTES,
+        suggested_display_precision=2,
+        suggested_unit_of_measurement=UnitOfInformation.TEBIBYTES,
+        value_fn=get_alltime_download,
+    ),
+    QBittorrentSensorEntityDescription(
+        key=SENSOR_TYPE_ALLTIME_UPLOAD,
+        translation_key="alltime_upload",
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        device_class=SensorDeviceClass.DATA_SIZE,
+        native_unit_of_measurement="B",
+        suggested_display_precision=2,
+        suggested_unit_of_measurement="TiB",
+        value_fn=get_alltime_upload,
+    ),
+    QBittorrentSensorEntityDescription(
+        key=SENSOR_TYPE_GLOBAL_RATIO,
+        translation_key="global_ratio",
+        state_class=SensorStateClass.MEASUREMENT,
+        value_fn=get_global_ratio,
+        entity_registry_enabled_default=False,
     ),
     QBittorrentSensorEntityDescription(
         key=SENSOR_TYPE_ALL_TORRENTS,
@@ -129,7 +227,7 @@ SENSOR_TYPES: tuple[QBittorrentSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up qBittorrent sensor entries."""
 
diff --git a/homeassistant/components/qbittorrent/strings.json b/homeassistant/components/qbittorrent/strings.json
index 9c9ee371737..ee613eb96c2 100644
--- a/homeassistant/components/qbittorrent/strings.json
+++ b/homeassistant/components/qbittorrent/strings.json
@@ -26,6 +26,21 @@
       "upload_speed": {
         "name": "Upload speed"
       },
+      "download_speed_limit": {
+        "name": "Download speed limit"
+      },
+      "upload_speed_limit": {
+        "name": "Upload speed limit"
+      },
+      "alltime_download": {
+        "name": "All-time download"
+      },
+      "alltime_upload": {
+        "name": "All-time upload"
+      },
+      "global_ratio": {
+        "name": "Global ratio"
+      },
       "current_status": {
         "name": "Status",
         "state": {
@@ -35,6 +50,14 @@
           "downloading": "Downloading"
         }
       },
+      "connection_status": {
+        "name": "Connection status",
+        "state": {
+          "connected": "Connected",
+          "firewalled": "Firewalled",
+          "disconnected": "Disconnected"
+        }
+      },
       "active_torrents": {
         "name": "Active torrents",
         "unit_of_measurement": "torrents"
@@ -86,16 +109,16 @@
   },
   "exceptions": {
     "invalid_device": {
-      "message": "No device with id {device_id} was found"
+      "message": "No device with ID {device_id} was found"
     },
     "invalid_entry_id": {
-      "message": "No entry with id {device_id} was found"
+      "message": "No entry with ID {device_id} was found"
     },
     "login_error": {
-      "message": "A login error occured. Please check you username and password."
+      "message": "A login error occurred. Please check your username and password."
     },
     "cannot_connect": {
-      "message": "Can't connect to QBittorrent, please check your configuration."
+      "message": "Can't connect to qBittorrent, please check your configuration."
     }
   }
 }
diff --git a/homeassistant/components/qbittorrent/switch.py b/homeassistant/components/qbittorrent/switch.py
index f12118e5233..dd61f130ca1 100644
--- a/homeassistant/components/qbittorrent/switch.py
+++ b/homeassistant/components/qbittorrent/switch.py
@@ -10,7 +10,7 @@ from homeassistant.components.switch import SwitchEntity, SwitchEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
@@ -43,7 +43,7 @@ SWITCH_TYPES: tuple[QBittorrentSwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up qBittorrent switch entries."""
 
diff --git a/homeassistant/components/qbus/__init__.py b/homeassistant/components/qbus/__init__.py
index da9dcfe69be..f77f439ecc1 100644
--- a/homeassistant/components/qbus/__init__.py
+++ b/homeassistant/components/qbus/__init__.py
@@ -71,17 +71,14 @@ async def async_unload_entry(hass: HomeAssistant, entry: QbusConfigEntry) -> boo
 
     if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
         entry.runtime_data.shutdown()
-        cleanup(hass, entry)
+        _cleanup(hass, entry)
 
     return unload_ok
 
 
-def cleanup(hass: HomeAssistant, entry: QbusConfigEntry) -> None:
+def _cleanup(hass: HomeAssistant, entry: QbusConfigEntry) -> None:
     """Shutdown if no more entries are loaded."""
-    entries = hass.config_entries.async_loaded_entries(DOMAIN)
-    count = len(entries)
-
-    # During unloading of the entry, it is not marked as unloaded yet. So
-    # count can be 1 if it is the last one.
-    if count <= 1 and (config_coordinator := hass.data.get(QBUS_KEY)):
+    if not hass.config_entries.async_loaded_entries(DOMAIN) and (
+        config_coordinator := hass.data.get(QBUS_KEY)
+    ):
         config_coordinator.shutdown()
diff --git a/homeassistant/components/qbus/climate.py b/homeassistant/components/qbus/climate.py
new file mode 100644
index 00000000000..57d97c046b7
--- /dev/null
+++ b/homeassistant/components/qbus/climate.py
@@ -0,0 +1,172 @@
+"""Support for Qbus thermostat."""
+
+import logging
+from typing import Any
+
+from qbusmqttapi.const import KEY_PROPERTIES_REGIME, KEY_PROPERTIES_SET_TEMPERATURE
+from qbusmqttapi.discovery import QbusMqttOutput
+from qbusmqttapi.state import QbusMqttThermoState, StateType
+
+from homeassistant.components.climate import (
+    ClimateEntity,
+    ClimateEntityFeature,
+    HVACAction,
+    HVACMode,
+)
+from homeassistant.components.mqtt import ReceiveMessage, client as mqtt
+from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ServiceValidationError
+from homeassistant.helpers.debounce import Debouncer
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .const import DOMAIN
+from .coordinator import QbusConfigEntry
+from .entity import QbusEntity, add_new_outputs
+
+PARALLEL_UPDATES = 0
+
+STATE_REQUEST_DELAY = 2
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: QbusConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up climate entities."""
+
+    coordinator = entry.runtime_data
+    added_outputs: list[QbusMqttOutput] = []
+
+    def _check_outputs() -> None:
+        add_new_outputs(
+            coordinator,
+            added_outputs,
+            lambda output: output.type == "thermo",
+            QbusClimate,
+            async_add_entities,
+        )
+
+    _check_outputs()
+    entry.async_on_unload(coordinator.async_add_listener(_check_outputs))
+
+
+class QbusClimate(QbusEntity, ClimateEntity):
+    """Representation of a Qbus climate entity."""
+
+    _attr_hvac_modes = [HVACMode.HEAT]
+    _attr_supported_features = (
+        ClimateEntityFeature.PRESET_MODE | ClimateEntityFeature.TARGET_TEMPERATURE
+    )
+    _attr_temperature_unit = UnitOfTemperature.CELSIUS
+
+    def __init__(self, mqtt_output: QbusMqttOutput) -> None:
+        """Initialize climate entity."""
+
+        super().__init__(mqtt_output)
+
+        self._attr_hvac_action = HVACAction.IDLE
+        self._attr_hvac_mode = HVACMode.HEAT
+
+        set_temp: dict[str, Any] = mqtt_output.properties.get(
+            KEY_PROPERTIES_SET_TEMPERATURE, {}
+        )
+        current_regime: dict[str, Any] = mqtt_output.properties.get(
+            KEY_PROPERTIES_REGIME, {}
+        )
+
+        self._attr_min_temp: float = set_temp.get("min", 0)
+        self._attr_max_temp: float = set_temp.get("max", 35)
+        self._attr_target_temperature_step: float = set_temp.get("step", 0.5)
+        self._attr_preset_modes: list[str] = current_regime.get("enumValues", [])
+        self._attr_preset_mode: str = (
+            self._attr_preset_modes[0] if len(self._attr_preset_modes) > 0 else ""
+        )
+
+        self._request_state_debouncer: Debouncer | None = None
+
+    async def async_added_to_hass(self) -> None:
+        """Run when entity about to be added to hass."""
+        self._request_state_debouncer = Debouncer(
+            self.hass,
+            _LOGGER,
+            cooldown=STATE_REQUEST_DELAY,
+            immediate=False,
+            function=self._async_request_state,
+        )
+        await super().async_added_to_hass()
+
+    async def async_set_preset_mode(self, preset_mode: str) -> None:
+        """Set new target preset mode."""
+
+        if preset_mode not in self._attr_preset_modes:
+            raise ServiceValidationError(
+                translation_domain=DOMAIN,
+                translation_key="invalid_preset",
+                translation_placeholders={
+                    "preset": preset_mode,
+                    "options": ", ".join(self._attr_preset_modes),
+                },
+            )
+
+        state = QbusMqttThermoState(id=self._mqtt_output.id, type=StateType.STATE)
+        state.write_regime(preset_mode)
+
+        await self._async_publish_output_state(state)
+
+    async def async_set_temperature(self, **kwargs: Any) -> None:
+        """Set new target temperature."""
+        temperature = kwargs.get(ATTR_TEMPERATURE)
+
+        if temperature is not None and isinstance(temperature, float):
+            state = QbusMqttThermoState(id=self._mqtt_output.id, type=StateType.STATE)
+            state.write_set_temperature(temperature)
+
+            await self._async_publish_output_state(state)
+
+    async def _state_received(self, msg: ReceiveMessage) -> None:
+        state = self._message_factory.parse_output_state(
+            QbusMqttThermoState, msg.payload
+        )
+
+        if state is None:
+            return
+
+        if preset_mode := state.read_regime():
+            self._attr_preset_mode = preset_mode
+
+        if current_temperature := state.read_current_temperature():
+            self._attr_current_temperature = current_temperature
+
+        if target_temperature := state.read_set_temperature():
+            self._attr_target_temperature = target_temperature
+
+        self._set_hvac_action()
+
+        # When the state type is "event", the payload only contains the changed
+        # property. Request the state to get the full payload. However, changing
+        # temperature step by step could cause a flood of state requests, so we're
+        # holding off a few seconds before requesting the full state.
+        if state.type == StateType.EVENT:
+            assert self._request_state_debouncer is not None
+            await self._request_state_debouncer.async_call()
+
+        self.async_schedule_update_ha_state()
+
+    def _set_hvac_action(self) -> None:
+        if self.target_temperature is None or self.current_temperature is None:
+            self._attr_hvac_action = HVACAction.IDLE
+            return
+
+        self._attr_hvac_action = (
+            HVACAction.HEATING
+            if self.target_temperature > self.current_temperature
+            else HVACAction.IDLE
+        )
+
+    async def _async_request_state(self) -> None:
+        request = self._message_factory.create_state_request([self._mqtt_output.id])
+        await mqtt.async_publish(self.hass, request.topic, request.payload)
diff --git a/homeassistant/components/qbus/const.py b/homeassistant/components/qbus/const.py
index ddfb8963cb7..767a41f48cc 100644
--- a/homeassistant/components/qbus/const.py
+++ b/homeassistant/components/qbus/const.py
@@ -5,7 +5,11 @@ from typing import Final
 from homeassistant.const import Platform
 
 DOMAIN: Final = "qbus"
-PLATFORMS: list[Platform] = [Platform.SWITCH]
+PLATFORMS: list[Platform] = [
+    Platform.CLIMATE,
+    Platform.LIGHT,
+    Platform.SWITCH,
+]
 
 CONF_SERIAL_NUMBER: Final = "serial"
 
diff --git a/homeassistant/components/qbus/entity.py b/homeassistant/components/qbus/entity.py
index 39bcddaaf4f..4ab1913c4dc 100644
--- a/homeassistant/components/qbus/entity.py
+++ b/homeassistant/components/qbus/entity.py
@@ -1,6 +1,9 @@
 """Base class for Qbus entities."""
 
+from __future__ import annotations
+
 from abc import ABC, abstractmethod
+from collections.abc import Callable
 import re
 
 from qbusmqttapi.discovery import QbusMqttOutput
@@ -10,12 +13,36 @@ from qbusmqttapi.state import QbusMqttState
 from homeassistant.components.mqtt import ReceiveMessage, client as mqtt
 from homeassistant.helpers.device_registry import DeviceInfo, format_mac
 from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, MANUFACTURER
+from .coordinator import QbusControllerCoordinator
 
 _REFID_REGEX = re.compile(r"^\d+\/(\d+(?:\/\d+)?)$")
 
 
+def add_new_outputs(
+    coordinator: QbusControllerCoordinator,
+    added_outputs: list[QbusMqttOutput],
+    filter_fn: Callable[[QbusMqttOutput], bool],
+    entity_type: type[QbusEntity],
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Call async_add_entities for new outputs."""
+
+    added_ref_ids = {k.ref_id for k in added_outputs}
+
+    new_outputs = [
+        output
+        for output in coordinator.data
+        if filter_fn(output) and output.ref_id not in added_ref_ids
+    ]
+
+    if new_outputs:
+        added_outputs.extend(new_outputs)
+        async_add_entities([entity_type(output) for output in new_outputs])
+
+
 def format_ref_id(ref_id: str) -> str | None:
     """Format the Qbus ref_id."""
     matches: list[str] = re.findall(_REFID_REGEX, ref_id)
diff --git a/homeassistant/components/qbus/light.py b/homeassistant/components/qbus/light.py
new file mode 100644
index 00000000000..3d2c763b8e3
--- /dev/null
+++ b/homeassistant/components/qbus/light.py
@@ -0,0 +1,97 @@
+"""Support for Qbus light."""
+
+from typing import Any
+
+from qbusmqttapi.discovery import QbusMqttOutput
+from qbusmqttapi.state import QbusMqttAnalogState, StateType
+
+from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
+from homeassistant.components.mqtt import ReceiveMessage
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util.color import brightness_to_value, value_to_brightness
+
+from .coordinator import QbusConfigEntry
+from .entity import QbusEntity, add_new_outputs
+
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: QbusConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up light entities."""
+
+    coordinator = entry.runtime_data
+    added_outputs: list[QbusMqttOutput] = []
+
+    def _check_outputs() -> None:
+        add_new_outputs(
+            coordinator,
+            added_outputs,
+            lambda output: output.type == "analog",
+            QbusLight,
+            async_add_entities,
+        )
+
+    _check_outputs()
+    entry.async_on_unload(coordinator.async_add_listener(_check_outputs))
+
+
+class QbusLight(QbusEntity, LightEntity):
+    """Representation of a Qbus light entity."""
+
+    _attr_supported_color_modes = {ColorMode.BRIGHTNESS}
+    _attr_color_mode = ColorMode.BRIGHTNESS
+
+    def __init__(self, mqtt_output: QbusMqttOutput) -> None:
+        """Initialize light entity."""
+
+        super().__init__(mqtt_output)
+
+        self._set_state(0)
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the entity on."""
+        brightness = kwargs.get(ATTR_BRIGHTNESS)
+
+        percentage: int | None = None
+        on: bool | None = None
+
+        state = QbusMqttAnalogState(id=self._mqtt_output.id)
+
+        if brightness is None:
+            on = True
+
+            state.type = StateType.ACTION
+            state.write_on_off(on)
+        else:
+            percentage = round(brightness_to_value((1, 100), brightness))
+
+            state.type = StateType.STATE
+            state.write_percentage(percentage)
+
+        await self._async_publish_output_state(state)
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the entity off."""
+        state = QbusMqttAnalogState(id=self._mqtt_output.id, type=StateType.ACTION)
+        state.write_on_off(on=False)
+
+        await self._async_publish_output_state(state)
+
+    async def _state_received(self, msg: ReceiveMessage) -> None:
+        output = self._message_factory.parse_output_state(
+            QbusMqttAnalogState, msg.payload
+        )
+
+        if output is not None:
+            percentage = round(output.read_percentage())
+            self._set_state(percentage)
+            self.async_schedule_update_ha_state()
+
+    def _set_state(self, percentage: int = 0) -> None:
+        self._attr_is_on = percentage > 0
+        self._attr_brightness = value_to_brightness((1, 100), percentage)
diff --git a/homeassistant/components/qbus/manifest.json b/homeassistant/components/qbus/manifest.json
index ac76110363f..17101da7c33 100644
--- a/homeassistant/components/qbus/manifest.json
+++ b/homeassistant/components/qbus/manifest.json
@@ -13,5 +13,5 @@
     "cloudapp/QBUSMQTTGW/+/state"
   ],
   "quality_scale": "bronze",
-  "requirements": ["qbusmqttapi==1.2.3"]
+  "requirements": ["qbusmqttapi==1.3.0"]
 }
diff --git a/homeassistant/components/qbus/strings.json b/homeassistant/components/qbus/strings.json
index b8918497c41..f308c5b3519 100644
--- a/homeassistant/components/qbus/strings.json
+++ b/homeassistant/components/qbus/strings.json
@@ -10,10 +10,15 @@
     "abort": {
       "already_configured": "Controller already configured",
       "discovery_in_progress": "Discovery in progress",
-      "not_supported": "Configuration for QBUS happens through MQTT discovery. If your controller is not automatically discovered, check the prerequisites and troubleshooting section of the documention."
+      "not_supported": "Configuration for QBUS happens through MQTT discovery. If your controller is not automatically discovered, check the prerequisites and troubleshooting section of the documentation."
     },
     "error": {
       "no_controller": "No controllers were found"
     }
+  },
+  "exceptions": {
+    "invalid_preset": {
+      "message": "Preset mode \"{preset}\" is not valid. Valid preset modes are: {options}."
+    }
   }
 }
diff --git a/homeassistant/components/qbus/switch.py b/homeassistant/components/qbus/switch.py
index 2413b8f152f..e1feccf4450 100644
--- a/homeassistant/components/qbus/switch.py
+++ b/homeassistant/components/qbus/switch.py
@@ -8,35 +8,32 @@ from qbusmqttapi.state import QbusMqttOnOffState, StateType
 from homeassistant.components.mqtt import ReceiveMessage
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import QbusConfigEntry
-from .entity import QbusEntity
+from .entity import QbusEntity, add_new_outputs
 
 PARALLEL_UPDATES = 0
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: QbusConfigEntry, add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: QbusConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switch entities."""
-    coordinator = entry.runtime_data
 
+    coordinator = entry.runtime_data
     added_outputs: list[QbusMqttOutput] = []
 
-    # Local function that calls add_entities for new entities
     def _check_outputs() -> None:
-        added_output_ids = {k.id for k in added_outputs}
-
-        new_outputs = [
-            item
-            for item in coordinator.data
-            if item.type == "onoff" and item.id not in added_output_ids
-        ]
-
-        if new_outputs:
-            added_outputs.extend(new_outputs)
-            add_entities([QbusSwitch(output) for output in new_outputs])
+        add_new_outputs(
+            coordinator,
+            added_outputs,
+            lambda output: output.type == "onoff",
+            QbusSwitch,
+            async_add_entities,
+        )
 
     _check_outputs()
     entry.async_on_unload(coordinator.async_add_listener(_check_outputs))
@@ -47,10 +44,7 @@ class QbusSwitch(QbusEntity, SwitchEntity):
 
     _attr_device_class = SwitchDeviceClass.SWITCH
 
-    def __init__(
-        self,
-        mqtt_output: QbusMqttOutput,
-    ) -> None:
+    def __init__(self, mqtt_output: QbusMqttOutput) -> None:
         """Initialize switch entity."""
 
         super().__init__(mqtt_output)
@@ -63,7 +57,6 @@ class QbusSwitch(QbusEntity, SwitchEntity):
         state.write_value(True)
 
         await self._async_publish_output_state(state)
-        self._attr_is_on = True
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the entity off."""
@@ -71,7 +64,6 @@ class QbusSwitch(QbusEntity, SwitchEntity):
         state.write_value(False)
 
         await self._async_publish_output_state(state)
-        self._attr_is_on = False
 
     async def _state_received(self, msg: ReceiveMessage) -> None:
         output = self._message_factory.parse_output_state(
diff --git a/homeassistant/components/qingping/binary_sensor.py b/homeassistant/components/qingping/binary_sensor.py
index 5f1367fbce8..3431204595a 100644
--- a/homeassistant/components/qingping/binary_sensor.py
+++ b/homeassistant/components/qingping/binary_sensor.py
@@ -18,7 +18,7 @@ from homeassistant.components.bluetooth.passive_update_processor import (
     PassiveBluetoothProcessorEntity,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from . import QingpingConfigEntry
@@ -74,7 +74,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: QingpingConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Qingping BLE sensors."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/qingping/config_flow.py b/homeassistant/components/qingping/config_flow.py
index c5efe03a878..990eb5116eb 100644
--- a/homeassistant/components/qingping/config_flow.py
+++ b/homeassistant/components/qingping/config_flow.py
@@ -98,7 +98,7 @@ class QingpingConfigFlow(ConfigFlow, domain=DOMAIN):
                 title=self._discovered_devices[address], data={}
             )
 
-        current_addresses = self._async_current_ids()
+        current_addresses = self._async_current_ids(include_ignore=False)
         for discovery_info in async_discovered_service_info(self.hass, False):
             address = discovery_info.address
             if address in current_addresses or address in self._discovered_devices:
diff --git a/homeassistant/components/qingping/sensor.py b/homeassistant/components/qingping/sensor.py
index 3d5f30c61fc..ee2a63b169a 100644
--- a/homeassistant/components/qingping/sensor.py
+++ b/homeassistant/components/qingping/sensor.py
@@ -30,7 +30,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from . import QingpingConfigEntry
@@ -142,7 +142,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: QingpingConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Qingping BLE sensors."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/qld_bushfire/geo_location.py b/homeassistant/components/qld_bushfire/geo_location.py
index c1266ab951b..c235d441133 100644
--- a/homeassistant/components/qld_bushfire/geo_location.py
+++ b/homeassistant/components/qld_bushfire/geo_location.py
@@ -26,7 +26,7 @@ from homeassistant.const import (
     UnitOfLength,
 )
 from homeassistant.core import Event, HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_connect, dispatcher_send
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import track_time_interval
diff --git a/homeassistant/components/qnap/config_flow.py b/homeassistant/components/qnap/config_flow.py
index 75f41a27f69..504883b55e9 100644
--- a/homeassistant/components/qnap/config_flow.py
+++ b/homeassistant/components/qnap/config_flow.py
@@ -70,8 +70,8 @@ class QnapConfigFlow(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "cannot_connect"
             except TypeError:
                 errors["base"] = "invalid_auth"
-            except Exception as error:  # noqa: BLE001
-                _LOGGER.error(error)
+            except Exception:
+                _LOGGER.exception("Unexpected error")
                 errors["base"] = "unknown"
             else:
                 unique_id = stats["system"]["serial_number"]
diff --git a/homeassistant/components/qnap/coordinator.py b/homeassistant/components/qnap/coordinator.py
index 8c2bf81a47f..297f6569d2b 100644
--- a/homeassistant/components/qnap/coordinator.py
+++ b/homeassistant/components/qnap/coordinator.py
@@ -33,7 +33,13 @@ class QnapCoordinator(DataUpdateCoordinator[dict[str, dict[str, Any]]]):
 
     def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
         """Initialize the qnap coordinator."""
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=UPDATE_INTERVAL)
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=UPDATE_INTERVAL,
+        )
 
         protocol = "https" if config_entry.data[CONF_SSL] else "http"
         self._api = QNAPStats(
diff --git a/homeassistant/components/qnap/sensor.py b/homeassistant/components/qnap/sensor.py
index 383a4e5f572..381455cb7e1 100644
--- a/homeassistant/components/qnap/sensor.py
+++ b/homeassistant/components/qnap/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import dt as dt_util
 
@@ -248,7 +248,7 @@ SENSOR_KEYS: list[str] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry."""
     coordinator = QnapCoordinator(hass, config_entry)
diff --git a/homeassistant/components/qnap_qsw/__init__.py b/homeassistant/components/qnap_qsw/__init__.py
index d7352435b07..f9faca025a5 100644
--- a/homeassistant/components/qnap_qsw/__init__.py
+++ b/homeassistant/components/qnap_qsw/__init__.py
@@ -35,10 +35,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     qsw = QnapQswApi(aiohttp_client.async_get_clientsession(hass), options)
 
-    coord_data = QswDataCoordinator(hass, qsw)
+    coord_data = QswDataCoordinator(hass, entry, qsw)
     await coord_data.async_config_entry_first_refresh()
 
-    coord_fw = QswFirmwareCoordinator(hass, qsw)
+    coord_fw = QswFirmwareCoordinator(hass, entry, qsw)
     try:
         await coord_fw.async_config_entry_first_refresh()
     except ConfigEntryNotReady as error:
diff --git a/homeassistant/components/qnap_qsw/binary_sensor.py b/homeassistant/components/qnap_qsw/binary_sensor.py
index a9c025b86ce..c1f77d068df 100644
--- a/homeassistant/components/qnap_qsw/binary_sensor.py
+++ b/homeassistant/components/qnap_qsw/binary_sensor.py
@@ -23,7 +23,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import UNDEFINED
 
 from .const import ATTR_MESSAGE, DOMAIN, QSW_COORD_DATA
@@ -78,7 +78,9 @@ PORT_BINARY_SENSOR_TYPES: Final[tuple[QswBinarySensorEntityDescription, ...]] =
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add QNAP QSW binary sensors from a config_entry."""
     coordinator: QswDataCoordinator = hass.data[DOMAIN][entry.entry_id][QSW_COORD_DATA]
diff --git a/homeassistant/components/qnap_qsw/button.py b/homeassistant/components/qnap_qsw/button.py
index 091c6786a92..02cf96766f2 100644
--- a/homeassistant/components/qnap_qsw/button.py
+++ b/homeassistant/components/qnap_qsw/button.py
@@ -16,7 +16,7 @@ from homeassistant.components.button import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, QSW_COORD_DATA, QSW_REBOOT
 from .coordinator import QswDataCoordinator
@@ -41,7 +41,9 @@ BUTTON_TYPES: Final[tuple[QswButtonDescription, ...]] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add QNAP QSW buttons from a config_entry."""
     coordinator: QswDataCoordinator = hass.data[DOMAIN][entry.entry_id][QSW_COORD_DATA]
diff --git a/homeassistant/components/qnap_qsw/coordinator.py b/homeassistant/components/qnap_qsw/coordinator.py
index c873f2a773d..b72bed7105c 100644
--- a/homeassistant/components/qnap_qsw/coordinator.py
+++ b/homeassistant/components/qnap_qsw/coordinator.py
@@ -10,6 +10,7 @@ from typing import Any
 from aioqsw.exceptions import QswError
 from aioqsw.localapi import QnapQswApi
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -24,13 +25,18 @@ _LOGGER = logging.getLogger(__name__)
 class QswDataCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Class to manage fetching data from the QNAP QSW device."""
 
-    def __init__(self, hass: HomeAssistant, qsw: QnapQswApi) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, qsw: QnapQswApi
+    ) -> None:
         """Initialize."""
         self.qsw = qsw
 
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=DATA_SCAN_INTERVAL,
         )
@@ -48,13 +54,18 @@ class QswDataCoordinator(DataUpdateCoordinator[dict[str, Any]]):
 class QswFirmwareCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Class to manage fetching firmware data from the QNAP QSW device."""
 
-    def __init__(self, hass: HomeAssistant, qsw: QnapQswApi) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, qsw: QnapQswApi
+    ) -> None:
         """Initialize."""
         self.qsw = qsw
 
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=FW_SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/qnap_qsw/sensor.py b/homeassistant/components/qnap_qsw/sensor.py
index e7f2c18638f..af02c121656 100644
--- a/homeassistant/components/qnap_qsw/sensor.py
+++ b/homeassistant/components/qnap_qsw/sensor.py
@@ -44,7 +44,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import UNDEFINED, StateType
 from homeassistant.util import dt as dt_util
 
@@ -286,7 +286,9 @@ PORT_SENSOR_TYPES: Final[tuple[QswSensorEntityDescription, ...]] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add QNAP QSW sensors from a config_entry."""
     coordinator: QswDataCoordinator = hass.data[DOMAIN][entry.entry_id][QSW_COORD_DATA]
diff --git a/homeassistant/components/qnap_qsw/update.py b/homeassistant/components/qnap_qsw/update.py
index ac789235271..c5cef729849 100644
--- a/homeassistant/components/qnap_qsw/update.py
+++ b/homeassistant/components/qnap_qsw/update.py
@@ -20,7 +20,7 @@ from homeassistant.components.update import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, QSW_COORD_FW, QSW_UPDATE
 from .coordinator import QswFirmwareCoordinator
@@ -36,7 +36,9 @@ UPDATE_TYPES: Final[tuple[UpdateEntityDescription, ...]] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add QNAP QSW updates from a config_entry."""
     coordinator: QswFirmwareCoordinator = hass.data[DOMAIN][entry.entry_id][
diff --git a/homeassistant/components/quantum_gateway/device_tracker.py b/homeassistant/components/quantum_gateway/device_tracker.py
index dc68472d94e..6491dca2e2c 100644
--- a/homeassistant/components/quantum_gateway/device_tracker.py
+++ b/homeassistant/components/quantum_gateway/device_tracker.py
@@ -15,7 +15,7 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_SSL
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/qvr_pro/__init__.py b/homeassistant/components/qvr_pro/__init__.py
index 9aad94790c6..98f0bcbaf99 100644
--- a/homeassistant/components/qvr_pro/__init__.py
+++ b/homeassistant/components/qvr_pro/__init__.py
@@ -15,7 +15,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import load_platform
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/qwikswitch/__init__.py b/homeassistant/components/qwikswitch/__init__.py
index 776e32dded1..d3cf2ff3d9b 100644
--- a/homeassistant/components/qwikswitch/__init__.py
+++ b/homeassistant/components/qwikswitch/__init__.py
@@ -18,8 +18,8 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.discovery import load_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.typing import ConfigType
diff --git a/homeassistant/components/qwikswitch/entity.py b/homeassistant/components/qwikswitch/entity.py
index 3a2ec5a9206..ff7a1d2e98a 100644
--- a/homeassistant/components/qwikswitch/entity.py
+++ b/homeassistant/components/qwikswitch/entity.py
@@ -35,7 +35,7 @@ class QSEntity(Entity):
         """Receive update packet from QSUSB. Match dispather_send signature."""
         self.async_write_ha_state()
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Listen for updates from QSUSb via dispatcher."""
         self.async_on_remove(
             async_dispatcher_connect(self.hass, self.qsid, self.update_packet)
diff --git a/homeassistant/components/rabbitair/__init__.py b/homeassistant/components/rabbitair/__init__.py
index e4eb67a67f5..d6530b322b0 100644
--- a/homeassistant/components/rabbitair/__init__.py
+++ b/homeassistant/components/rabbitair/__init__.py
@@ -26,7 +26,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     zeroconf_instance = await zeroconf.async_get_async_instance(hass)
     device: Client = UdpClient(host, token, zeroconf=zeroconf_instance)
 
-    coordinator = RabbitAirDataUpdateCoordinator(hass, device)
+    coordinator = RabbitAirDataUpdateCoordinator(hass, entry, device)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/rabbitair/config_flow.py b/homeassistant/components/rabbitair/config_flow.py
index f4487a73b58..43959e1e42c 100644
--- a/homeassistant/components/rabbitair/config_flow.py
+++ b/homeassistant/components/rabbitair/config_flow.py
@@ -74,8 +74,8 @@ class RabbitAirConfigFlow(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "invalid_host"
             except TimeoutConnect:
                 errors["base"] = "timeout_connect"
-            except Exception as err:  # noqa: BLE001
-                _LOGGER.debug("Unexpected exception: %s", err)
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
                 user_input[CONF_MAC] = info["mac"]
diff --git a/homeassistant/components/rabbitair/coordinator.py b/homeassistant/components/rabbitair/coordinator.py
index 3c7db126c7d..75453fe4d24 100644
--- a/homeassistant/components/rabbitair/coordinator.py
+++ b/homeassistant/components/rabbitair/coordinator.py
@@ -7,6 +7,7 @@ from typing import Any, cast
 
 from rabbitair import Client, State
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
@@ -42,12 +43,17 @@ class RabbitAirDebouncer(Debouncer[Coroutine[Any, Any, None]]):
 class RabbitAirDataUpdateCoordinator(DataUpdateCoordinator[State]):
     """Class to manage fetching data from single endpoint."""
 
-    def __init__(self, hass: HomeAssistant, device: Client) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, device: Client
+    ) -> None:
         """Initialize global data updater."""
         self.device = device
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="rabbitair",
             update_interval=timedelta(seconds=10),
             request_refresh_debouncer=RabbitAirDebouncer(hass),
diff --git a/homeassistant/components/rabbitair/fan.py b/homeassistant/components/rabbitair/fan.py
index cfbee0be67c..4c13f3a8b02 100644
--- a/homeassistant/components/rabbitair/fan.py
+++ b/homeassistant/components/rabbitair/fan.py
@@ -9,7 +9,7 @@ from rabbitair import Mode, Model, Speed
 from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     ordered_list_item_to_percentage,
     percentage_to_ordered_list_item,
@@ -39,7 +39,9 @@ PRESET_MODES = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a config entry."""
     coordinator: RabbitAirDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/rachio/binary_sensor.py b/homeassistant/components/rachio/binary_sensor.py
index 189a08e998d..3bf0f716c6d 100644
--- a/homeassistant/components/rachio/binary_sensor.py
+++ b/homeassistant/components/rachio/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     DOMAIN as DOMAIN_RACHIO,
@@ -46,7 +46,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Rachio binary sensors."""
     entities = await hass.async_add_executor_job(_create_entities, hass, config_entry)
diff --git a/homeassistant/components/rachio/calendar.py b/homeassistant/components/rachio/calendar.py
index 5c7e13c748a..91ad29fac9f 100644
--- a/homeassistant/components/rachio/calendar.py
+++ b/homeassistant/components/rachio/calendar.py
@@ -12,7 +12,7 @@ from homeassistant.components.calendar import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import dt as dt_util
 
@@ -41,7 +41,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry for Rachio smart hose timer calendar."""
     person: RachioPerson = hass.data[DOMAIN_RACHIO][config_entry.entry_id]
diff --git a/homeassistant/components/rachio/strings.json b/homeassistant/components/rachio/strings.json
index 308403d805d..d51a1d5f920 100644
--- a/homeassistant/components/rachio/strings.json
+++ b/homeassistant/components/rachio/strings.json
@@ -3,7 +3,7 @@
     "step": {
       "user": {
         "title": "Connect to your Rachio device",
-        "description": "You will need the API Key from https://app.rach.io/. Go to Settings, then select 'GET API KEY'.",
+        "description": "You will need the API key from https://app.rach.io/. Go to Settings, then select 'GET API KEY'.",
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]"
         }
@@ -70,7 +70,7 @@
     },
     "start_watering": {
       "name": "Start watering",
-      "description": "Start a single zone, a schedule or any number of smart hose timers.",
+      "description": "Starts a single zone, a schedule or any number of smart hose timers.",
       "fields": {
         "duration": {
           "name": "Duration",
@@ -80,7 +80,7 @@
     },
     "pause_watering": {
       "name": "Pause watering",
-      "description": "Pause any currently running zones or schedules.",
+      "description": "Pauses any currently running zones or schedules.",
       "fields": {
         "devices": {
           "name": "Devices",
@@ -94,7 +94,7 @@
     },
     "resume_watering": {
       "name": "Resume watering",
-      "description": "Resume any paused zone runs or schedules.",
+      "description": "Resumes any paused zone runs or schedules.",
       "fields": {
         "devices": {
           "name": "[%key:component::rachio::services::pause_watering::fields::devices::name%]",
@@ -104,7 +104,7 @@
     },
     "stop_watering": {
       "name": "Stop watering",
-      "description": "Stop any currently running zones or schedules.",
+      "description": "Stops any currently running zones or schedules.",
       "fields": {
         "devices": {
           "name": "[%key:component::rachio::services::pause_watering::fields::devices::name%]",
diff --git a/homeassistant/components/rachio/switch.py b/homeassistant/components/rachio/switch.py
index 92e7c0ea2ba..25cdeac62f7 100644
--- a/homeassistant/components/rachio/switch.py
+++ b/homeassistant/components/rachio/switch.py
@@ -16,7 +16,7 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.util.dt import as_timestamp, now, parse_datetime, utc_from_timestamp
 
@@ -102,7 +102,7 @@ START_MULTIPLE_ZONES_SCHEMA = vol.Schema(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Rachio switches."""
     zone_entities = []
diff --git a/homeassistant/components/radarr/__init__.py b/homeassistant/components/radarr/__init__.py
index 5c225697f98..11a9b6b4dc0 100644
--- a/homeassistant/components/radarr/__init__.py
+++ b/homeassistant/components/radarr/__init__.py
@@ -2,12 +2,11 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass, fields
+from dataclasses import fields
 
 from aiopyarr.models.host_configuration import PyArrHostConfiguration
 from aiopyarr.radarr_client import RadarrClient
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_URL, CONF_VERIFY_SSL, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -18,24 +17,13 @@ from .coordinator import (
     HealthDataUpdateCoordinator,
     MoviesDataUpdateCoordinator,
     QueueDataUpdateCoordinator,
+    RadarrConfigEntry,
+    RadarrData,
     RadarrDataUpdateCoordinator,
     StatusDataUpdateCoordinator,
 )
 
 PLATFORMS = [Platform.BINARY_SENSOR, Platform.CALENDAR, Platform.SENSOR]
-type RadarrConfigEntry = ConfigEntry[RadarrData]
-
-
-@dataclass(kw_only=True, slots=True)
-class RadarrData:
-    """Radarr data type."""
-
-    calendar: CalendarUpdateCoordinator
-    disk_space: DiskSpaceDataUpdateCoordinator
-    health: HealthDataUpdateCoordinator
-    movie: MoviesDataUpdateCoordinator
-    queue: QueueDataUpdateCoordinator
-    status: StatusDataUpdateCoordinator
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: RadarrConfigEntry) -> bool:
@@ -50,12 +38,14 @@ async def async_setup_entry(hass: HomeAssistant, entry: RadarrConfigEntry) -> bo
         session=async_get_clientsession(hass, entry.data[CONF_VERIFY_SSL]),
     )
     data = RadarrData(
-        calendar=CalendarUpdateCoordinator(hass, host_configuration, radarr),
-        disk_space=DiskSpaceDataUpdateCoordinator(hass, host_configuration, radarr),
-        health=HealthDataUpdateCoordinator(hass, host_configuration, radarr),
-        movie=MoviesDataUpdateCoordinator(hass, host_configuration, radarr),
-        queue=QueueDataUpdateCoordinator(hass, host_configuration, radarr),
-        status=StatusDataUpdateCoordinator(hass, host_configuration, radarr),
+        calendar=CalendarUpdateCoordinator(hass, entry, host_configuration, radarr),
+        disk_space=DiskSpaceDataUpdateCoordinator(
+            hass, entry, host_configuration, radarr
+        ),
+        health=HealthDataUpdateCoordinator(hass, entry, host_configuration, radarr),
+        movie=MoviesDataUpdateCoordinator(hass, entry, host_configuration, radarr),
+        queue=QueueDataUpdateCoordinator(hass, entry, host_configuration, radarr),
+        status=StatusDataUpdateCoordinator(hass, entry, host_configuration, radarr),
     )
     for field in fields(data):
         coordinator: RadarrDataUpdateCoordinator = getattr(data, field.name)
diff --git a/homeassistant/components/radarr/binary_sensor.py b/homeassistant/components/radarr/binary_sensor.py
index 953c7dead18..f09e6015b53 100644
--- a/homeassistant/components/radarr/binary_sensor.py
+++ b/homeassistant/components/radarr/binary_sensor.py
@@ -11,10 +11,10 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import RadarrConfigEntry
 from .const import HEALTH_ISSUES
+from .coordinator import RadarrConfigEntry
 from .entity import RadarrEntity
 
 BINARY_SENSOR_TYPE = BinarySensorEntityDescription(
@@ -28,7 +28,7 @@ BINARY_SENSOR_TYPE = BinarySensorEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RadarrConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Radarr sensors based on a config entry."""
     coordinator = entry.runtime_data.health
diff --git a/homeassistant/components/radarr/calendar.py b/homeassistant/components/radarr/calendar.py
index c741c178862..00df27f21bd 100644
--- a/homeassistant/components/radarr/calendar.py
+++ b/homeassistant/components/radarr/calendar.py
@@ -7,10 +7,9 @@ from datetime import datetime
 from homeassistant.components.calendar import CalendarEntity, CalendarEvent
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import RadarrConfigEntry
-from .coordinator import CalendarUpdateCoordinator, RadarrEvent
+from .coordinator import CalendarUpdateCoordinator, RadarrConfigEntry, RadarrEvent
 from .entity import RadarrEntity
 
 CALENDAR_TYPE = EntityDescription(
@@ -22,7 +21,7 @@ CALENDAR_TYPE = EntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RadarrConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Radarr calendar entity."""
     coordinator = entry.runtime_data.calendar
diff --git a/homeassistant/components/radarr/coordinator.py b/homeassistant/components/radarr/coordinator.py
index 6e8a3d55d3e..d343675d7ea 100644
--- a/homeassistant/components/radarr/coordinator.py
+++ b/homeassistant/components/radarr/coordinator.py
@@ -6,7 +6,7 @@ from abc import ABC, abstractmethod
 import asyncio
 from dataclasses import dataclass
 from datetime import date, datetime, timedelta
-from typing import TYPE_CHECKING, Generic, TypeVar, cast
+from typing import Generic, TypeVar, cast
 
 from aiopyarr import (
     Health,
@@ -20,14 +20,27 @@ from aiopyarr.models.host_configuration import PyArrHostConfiguration
 from aiopyarr.radarr_client import RadarrClient
 
 from homeassistant.components.calendar import CalendarEvent
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DEFAULT_MAX_RECORDS, DOMAIN, LOGGER
 
-if TYPE_CHECKING:
-    from . import RadarrConfigEntry
+
+@dataclass(kw_only=True, slots=True)
+class RadarrData:
+    """Radarr data type."""
+
+    calendar: CalendarUpdateCoordinator
+    disk_space: DiskSpaceDataUpdateCoordinator
+    health: HealthDataUpdateCoordinator
+    movie: MoviesDataUpdateCoordinator
+    queue: QueueDataUpdateCoordinator
+    status: StatusDataUpdateCoordinator
+
+
+type RadarrConfigEntry = ConfigEntry[RadarrData]
 
 T = TypeVar("T", bound=SystemStatus | list[RootFolder] | list[Health] | int | None)
 
@@ -53,6 +66,7 @@ class RadarrDataUpdateCoordinator(DataUpdateCoordinator[T], Generic[T], ABC):
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: RadarrConfigEntry,
         host_configuration: PyArrHostConfiguration,
         api_client: RadarrClient,
     ) -> None:
@@ -60,6 +74,7 @@ class RadarrDataUpdateCoordinator(DataUpdateCoordinator[T], Generic[T], ABC):
         super().__init__(
             hass=hass,
             logger=LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=self._update_interval,
         )
@@ -140,11 +155,12 @@ class CalendarUpdateCoordinator(RadarrDataUpdateCoordinator[None]):
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: RadarrConfigEntry,
         host_configuration: PyArrHostConfiguration,
         api_client: RadarrClient,
     ) -> None:
         """Initialize."""
-        super().__init__(hass, host_configuration, api_client)
+        super().__init__(hass, config_entry, host_configuration, api_client)
         self.event: RadarrEvent | None = None
         self._events: list[RadarrEvent] = []
 
diff --git a/homeassistant/components/radarr/sensor.py b/homeassistant/components/radarr/sensor.py
index df1a0686e00..a6d29ee9d1d 100644
--- a/homeassistant/components/radarr/sensor.py
+++ b/homeassistant/components/radarr/sensor.py
@@ -17,10 +17,9 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import EntityCategory, UnitOfInformation
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import RadarrConfigEntry
-from .coordinator import RadarrDataUpdateCoordinator, T
+from .coordinator import RadarrConfigEntry, RadarrDataUpdateCoordinator, T
 from .entity import RadarrEntity
 
 
@@ -82,14 +81,12 @@ SENSOR_TYPES: dict[str, RadarrSensorEntityDescription[Any]] = {
     "movie": RadarrSensorEntityDescription[int](
         key="movies",
         translation_key="movies",
-        native_unit_of_measurement="Movies",
         entity_registry_enabled_default=False,
         value_fn=lambda data, _: data,
     ),
     "queue": RadarrSensorEntityDescription[int](
         key="queue",
         translation_key="queue",
-        native_unit_of_measurement="Movies",
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.TOTAL,
         value_fn=lambda data, _: data,
@@ -117,7 +114,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RadarrConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Radarr sensors based on a config entry."""
     entities: list[RadarrSensor[Any]] = []
diff --git a/homeassistant/components/radarr/strings.json b/homeassistant/components/radarr/strings.json
index ec1baf6ffd8..268d7955c1b 100644
--- a/homeassistant/components/radarr/strings.json
+++ b/homeassistant/components/radarr/strings.json
@@ -43,10 +43,12 @@
     },
     "sensor": {
       "movies": {
-        "name": "Movies"
+        "name": "Movies",
+        "unit_of_measurement": "movies"
       },
       "queue": {
-        "name": "Queue"
+        "name": "Queue",
+        "unit_of_measurement": "[%key:component::radarr::entity::sensor::movies::unit_of_measurement%]"
       },
       "start_time": {
         "name": "Start time"
diff --git a/homeassistant/components/radiotherm/__init__.py b/homeassistant/components/radiotherm/__init__.py
index 7b2eaba52c4..80dbcf44bc9 100644
--- a/homeassistant/components/radiotherm/__init__.py
+++ b/homeassistant/components/radiotherm/__init__.py
@@ -43,7 +43,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     host = entry.data[CONF_HOST]
     init_coro = async_get_init_data(hass, host)
     init_data = await _async_call_or_raise_not_ready(init_coro, host)
-    coordinator = RadioThermUpdateCoordinator(hass, init_data)
+    coordinator = RadioThermUpdateCoordinator(hass, entry, init_data)
     await coordinator.async_config_entry_first_refresh()
 
     # Only set the time if the thermostat is
diff --git a/homeassistant/components/radiotherm/climate.py b/homeassistant/components/radiotherm/climate.py
index af52c5fcea3..09ac5b42b60 100644
--- a/homeassistant/components/radiotherm/climate.py
+++ b/homeassistant/components/radiotherm/climate.py
@@ -20,7 +20,7 @@ from homeassistant.components.climate import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, PRECISION_HALVES, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 from .coordinator import RadioThermUpdateCoordinator
@@ -93,7 +93,7 @@ def round_temp(temperature):
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up climate for a radiotherm device."""
     coordinator: RadioThermUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/radiotherm/coordinator.py b/homeassistant/components/radiotherm/coordinator.py
index 06e3554c8d7..7d483426c83 100644
--- a/homeassistant/components/radiotherm/coordinator.py
+++ b/homeassistant/components/radiotherm/coordinator.py
@@ -8,6 +8,7 @@ from urllib.error import URLError
 
 from radiotherm.validate import RadiothermTstatError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -21,13 +22,21 @@ UPDATE_INTERVAL = timedelta(seconds=15)
 class RadioThermUpdateCoordinator(DataUpdateCoordinator[RadioThermUpdate]):
     """DataUpdateCoordinator to gather data for radio thermostats."""
 
-    def __init__(self, hass: HomeAssistant, init_data: RadioThermInitData) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        init_data: RadioThermInitData,
+    ) -> None:
         """Initialize DataUpdateCoordinator."""
         self.init_data = init_data
         self._description = f"{init_data.name} ({init_data.host})"
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=f"radiotherm {self.init_data.name}",
             update_interval=UPDATE_INTERVAL,
         )
diff --git a/homeassistant/components/radiotherm/switch.py b/homeassistant/components/radiotherm/switch.py
index e7b463e3def..2952e1e5817 100644
--- a/homeassistant/components/radiotherm/switch.py
+++ b/homeassistant/components/radiotherm/switch.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import RadioThermUpdateCoordinator
@@ -19,7 +19,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switches for a radiotherm device."""
     coordinator: RadioThermUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/rainbird/__init__.py b/homeassistant/components/rainbird/__init__.py
index d8b71e2df0b..f9cd751a81e 100644
--- a/homeassistant/components/rainbird/__init__.py
+++ b/homeassistant/components/rainbird/__init__.py
@@ -101,18 +101,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: RainbirdConfigEntry) ->
     data = RainbirdData(
         controller,
         model_info,
-        coordinator=RainbirdUpdateCoordinator(
-            hass,
-            name=entry.title,
-            controller=controller,
-            unique_id=entry.unique_id,
-            model_info=model_info,
-        ),
-        schedule_coordinator=RainbirdScheduleUpdateCoordinator(
-            hass,
-            name=f"{entry.title} Schedule",
-            controller=controller,
-        ),
+        coordinator=RainbirdUpdateCoordinator(hass, entry, controller, model_info),
+        schedule_coordinator=RainbirdScheduleUpdateCoordinator(hass, entry, controller),
     )
     await data.coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/rainbird/binary_sensor.py b/homeassistant/components/rainbird/binary_sensor.py
index 5722b8852dd..0b27c7e33c4 100644
--- a/homeassistant/components/rainbird/binary_sensor.py
+++ b/homeassistant/components/rainbird/binary_sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .coordinator import RainbirdUpdateCoordinator
@@ -27,7 +27,7 @@ RAIN_SENSOR_ENTITY_DESCRIPTION = BinarySensorEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RainbirdConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry for a Rain Bird binary_sensor."""
     coordinator = config_entry.runtime_data.coordinator
diff --git a/homeassistant/components/rainbird/calendar.py b/homeassistant/components/rainbird/calendar.py
index 160fe70c61e..c48ca438146 100644
--- a/homeassistant/components/rainbird/calendar.py
+++ b/homeassistant/components/rainbird/calendar.py
@@ -9,7 +9,7 @@ from homeassistant.components.calendar import CalendarEntity, CalendarEvent
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import dt as dt_util
 
@@ -22,7 +22,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RainbirdConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry for a Rain Bird irrigation calendar."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/rainbird/coordinator.py b/homeassistant/components/rainbird/coordinator.py
index 2ccfa0af62a..426df625697 100644
--- a/homeassistant/components/rainbird/coordinator.py
+++ b/homeassistant/components/rainbird/coordinator.py
@@ -58,26 +58,28 @@ def async_create_clientsession() -> aiohttp.ClientSession:
 class RainbirdUpdateCoordinator(DataUpdateCoordinator[RainbirdDeviceState]):
     """Coordinator for rainbird API calls."""
 
+    config_entry: RainbirdConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
-        name: str,
+        config_entry: RainbirdConfigEntry,
         controller: AsyncRainbirdController,
-        unique_id: str | None,
         model_info: ModelAndVersion,
     ) -> None:
         """Initialize RainbirdUpdateCoordinator."""
         super().__init__(
             hass,
             _LOGGER,
-            name=name,
+            config_entry=config_entry,
+            name=config_entry.title,
             update_interval=UPDATE_INTERVAL,
             request_refresh_debouncer=Debouncer(
                 hass, _LOGGER, cooldown=DEBOUNCER_COOLDOWN, immediate=False
             ),
         )
         self._controller = controller
-        self._unique_id = unique_id
+        self._unique_id = config_entry.unique_id
         self._zones: set[int] | None = None
         self._model_info = model_info
 
@@ -145,14 +147,15 @@ class RainbirdScheduleUpdateCoordinator(DataUpdateCoordinator[Schedule]):
     def __init__(
         self,
         hass: HomeAssistant,
-        name: str,
+        config_entry: RainbirdConfigEntry,
         controller: AsyncRainbirdController,
     ) -> None:
         """Initialize ZoneStateUpdateCoordinator."""
         super().__init__(
             hass,
             _LOGGER,
-            name=name,
+            config_entry=config_entry,
+            name=f"{config_entry.title} Schedule",
             update_method=self._async_update_data,
             update_interval=CALENDAR_UPDATE_INTERVAL,
         )
diff --git a/homeassistant/components/rainbird/number.py b/homeassistant/components/rainbird/number.py
index d8081a796b9..7f1dfe74752 100644
--- a/homeassistant/components/rainbird/number.py
+++ b/homeassistant/components/rainbird/number.py
@@ -10,7 +10,7 @@ from homeassistant.components.number import NumberEntity
 from homeassistant.const import UnitOfTime
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .coordinator import RainbirdUpdateCoordinator
@@ -22,7 +22,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RainbirdConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry for a Rain Bird number platform."""
     async_add_entities(
diff --git a/homeassistant/components/rainbird/sensor.py b/homeassistant/components/rainbird/sensor.py
index 4725a33bc9a..9fab1af0a23 100644
--- a/homeassistant/components/rainbird/sensor.py
+++ b/homeassistant/components/rainbird/sensor.py
@@ -6,7 +6,7 @@ import logging
 
 from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -25,7 +25,7 @@ RAIN_DELAY_ENTITY_DESCRIPTION = SensorEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RainbirdConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry for a Rain Bird sensor."""
     async_add_entities(
diff --git a/homeassistant/components/rainbird/switch.py b/homeassistant/components/rainbird/switch.py
index f622a1b9b2c..f188350138e 100644
--- a/homeassistant/components/rainbird/switch.py
+++ b/homeassistant/components/rainbird/switch.py
@@ -12,7 +12,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import VolDictType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -32,7 +32,7 @@ SERVICE_SCHEMA_IRRIGATION: VolDictType = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RainbirdConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry for a Rain Bird irrigation switches."""
     coordinator = config_entry.runtime_data.coordinator
diff --git a/homeassistant/components/raincloud/__init__.py b/homeassistant/components/raincloud/__init__.py
index f1eef40f307..0ee12612323 100644
--- a/homeassistant/components/raincloud/__init__.py
+++ b/homeassistant/components/raincloud/__init__.py
@@ -10,7 +10,7 @@ import voluptuous as vol
 from homeassistant.components import persistent_notification
 from homeassistant.const import CONF_PASSWORD, CONF_SCAN_INTERVAL, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import dispatcher_send
 from homeassistant.helpers.event import track_time_interval
 from homeassistant.helpers.typing import ConfigType
diff --git a/homeassistant/components/raincloud/binary_sensor.py b/homeassistant/components/raincloud/binary_sensor.py
index 2696c192ed6..84621aba99d 100644
--- a/homeassistant/components/raincloud/binary_sensor.py
+++ b/homeassistant/components/raincloud/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import CONF_MONITORED_CONDITIONS
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/raincloud/entity.py b/homeassistant/components/raincloud/entity.py
index 337324d96eb..b45684ac72b 100644
--- a/homeassistant/components/raincloud/entity.py
+++ b/homeassistant/components/raincloud/entity.py
@@ -45,7 +45,7 @@ class RainCloudEntity(Entity):
         """Return the name of the sensor."""
         return self._name
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Register callbacks."""
         self.async_on_remove(
             async_dispatcher_connect(
diff --git a/homeassistant/components/raincloud/sensor.py b/homeassistant/components/raincloud/sensor.py
index 1f9d8d7b2c5..8aaec605c04 100644
--- a/homeassistant/components/raincloud/sensor.py
+++ b/homeassistant/components/raincloud/sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_MONITORED_CONDITIONS, PERCENTAGE, UnitOfTime
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.icon import icon_for_battery_level
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/raincloud/switch.py b/homeassistant/components/raincloud/switch.py
index 59a11a6b167..babadcba676 100644
--- a/homeassistant/components/raincloud/switch.py
+++ b/homeassistant/components/raincloud/switch.py
@@ -13,7 +13,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import CONF_MONITORED_CONDITIONS
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/rainforest_eagle/coordinator.py b/homeassistant/components/rainforest_eagle/coordinator.py
index 9c714a291ee..11956681638 100644
--- a/homeassistant/components/rainforest_eagle/coordinator.py
+++ b/homeassistant/components/rainforest_eagle/coordinator.py
@@ -29,13 +29,13 @@ _LOGGER = logging.getLogger(__name__)
 class EagleDataCoordinator(DataUpdateCoordinator):
     """Get the latest data from the Eagle device."""
 
+    config_entry: ConfigEntry
     eagle100_reader: Eagle100Reader | None = None
     eagle200_meter: aioeagle.ElectricMeter | None = None
 
-    def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
+    def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
         """Initialize the data object."""
-        self.entry = entry
-        if self.type == TYPE_EAGLE_100:
+        if config_entry.data[CONF_TYPE] == TYPE_EAGLE_100:
             self.model = "EAGLE-100"
             update_method = self._async_update_data_100
         else:
@@ -45,7 +45,8 @@ class EagleDataCoordinator(DataUpdateCoordinator):
         super().__init__(
             hass,
             _LOGGER,
-            name=entry.data[CONF_CLOUD_ID],
+            config_entry=config_entry,
+            name=config_entry.data[CONF_CLOUD_ID],
             update_interval=timedelta(seconds=30),
             update_method=update_method,
         )
@@ -53,17 +54,12 @@ class EagleDataCoordinator(DataUpdateCoordinator):
     @property
     def cloud_id(self):
         """Return the cloud ID."""
-        return self.entry.data[CONF_CLOUD_ID]
-
-    @property
-    def type(self):
-        """Return entry type."""
-        return self.entry.data[CONF_TYPE]
+        return self.config_entry.data[CONF_CLOUD_ID]
 
     @property
     def hardware_address(self):
         """Return hardware address of meter."""
-        return self.entry.data[CONF_HARDWARE_ADDRESS]
+        return self.config_entry.data[CONF_HARDWARE_ADDRESS]
 
     @property
     def is_connected(self):
@@ -79,8 +75,8 @@ class EagleDataCoordinator(DataUpdateCoordinator):
             hub = aioeagle.EagleHub(
                 aiohttp_client.async_get_clientsession(self.hass),
                 self.cloud_id,
-                self.entry.data[CONF_INSTALL_CODE],
-                host=self.entry.data[CONF_HOST],
+                self.config_entry.data[CONF_INSTALL_CODE],
+                host=self.config_entry.data[CONF_HOST],
             )
             eagle200_meter = aioeagle.ElectricMeter.create_instance(
                 hub, self.hardware_address
@@ -115,8 +111,8 @@ class EagleDataCoordinator(DataUpdateCoordinator):
         if self.eagle100_reader is None:
             self.eagle100_reader = Eagle100Reader(
                 self.cloud_id,
-                self.entry.data[CONF_INSTALL_CODE],
-                self.entry.data[CONF_HOST],
+                self.config_entry.data[CONF_INSTALL_CODE],
+                self.config_entry.data[CONF_HOST],
             )
 
         out = {}
diff --git a/homeassistant/components/rainforest_eagle/sensor.py b/homeassistant/components/rainforest_eagle/sensor.py
index 8c4c5927998..58427b0e5ba 100644
--- a/homeassistant/components/rainforest_eagle/sensor.py
+++ b/homeassistant/components/rainforest_eagle/sensor.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfEnergy, UnitOfPower
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -45,7 +45,9 @@ SENSORS = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a config entry."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/rainforest_raven/sensor.py b/homeassistant/components/rainforest_raven/sensor.py
index 1025e92ef86..3d358322b70 100644
--- a/homeassistant/components/rainforest_raven/sensor.py
+++ b/homeassistant/components/rainforest_raven/sensor.py
@@ -19,7 +19,7 @@ from homeassistant.const import (
     UnitOfPower,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -80,7 +80,7 @@ DIAGNOSTICS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RAVEnConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/rainmachine/__init__.py b/homeassistant/components/rainmachine/__init__.py
index 4d486c9c6aa..65648b8d44f 100644
--- a/homeassistant/components/rainmachine/__init__.py
+++ b/homeassistant/components/rainmachine/__init__.py
@@ -13,7 +13,7 @@ from regenmaschine.controller import Controller
 from regenmaschine.errors import RainMachineError, UnknownAPICallError
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_DEVICE_ID,
     CONF_IP_ADDRESS,
@@ -465,12 +465,7 @@ async def async_unload_entry(
 ) -> bool:
     """Unload an RainMachine config entry."""
     unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    loaded_entries = [
-        entry
-        for entry in hass.config_entries.async_entries(DOMAIN)
-        if entry.state is ConfigEntryState.LOADED
-    ]
-    if len(loaded_entries) == 1:
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
         # If this is the last loaded instance of RainMachine, deregister any services
         # defined during integration setup:
         for service_name in (
diff --git a/homeassistant/components/rainmachine/binary_sensor.py b/homeassistant/components/rainmachine/binary_sensor.py
index 4ba9b58d596..610505e2b7f 100644
--- a/homeassistant/components/rainmachine/binary_sensor.py
+++ b/homeassistant/components/rainmachine/binary_sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import RainMachineConfigEntry
 from .const import DATA_PROVISION_SETTINGS, DATA_RESTRICTIONS_CURRENT
@@ -94,7 +94,7 @@ BINARY_SENSOR_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RainMachineConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up RainMachine binary sensors based on a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/rainmachine/button.py b/homeassistant/components/rainmachine/button.py
index 2f68c6a8a9c..e4ed00930dd 100644
--- a/homeassistant/components/rainmachine/button.py
+++ b/homeassistant/components/rainmachine/button.py
@@ -17,7 +17,7 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.dispatcher import async_dispatcher_send
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import RainMachineConfigEntry
 from .const import DATA_PROVISION_SETTINGS
@@ -53,7 +53,7 @@ BUTTON_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RainMachineConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up RainMachine buttons based on a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/rainmachine/coordinator.py b/homeassistant/components/rainmachine/coordinator.py
index df7972ef31d..de43e5a073f 100644
--- a/homeassistant/components/rainmachine/coordinator.py
+++ b/homeassistant/components/rainmachine/coordinator.py
@@ -41,6 +41,7 @@ class RainMachineDataUpdateCoordinator(DataUpdateCoordinator[dict]):
         super().__init__(
             hass,
             LOGGER,
+            config_entry=entry,
             name=name,
             update_interval=update_interval,
             update_method=update_method,
@@ -49,7 +50,6 @@ class RainMachineDataUpdateCoordinator(DataUpdateCoordinator[dict]):
 
         self._rebooting = False
         self._signal_handler_unsubs: list[Callable[[], None]] = []
-        self.config_entry = entry
         self.signal_reboot_completed = SIGNAL_REBOOT_COMPLETED.format(
             self.config_entry.entry_id
         )
diff --git a/homeassistant/components/rainmachine/select.py b/homeassistant/components/rainmachine/select.py
index 1d9225a5bb2..5b23a5d79ef 100644
--- a/homeassistant/components/rainmachine/select.py
+++ b/homeassistant/components/rainmachine/select.py
@@ -11,7 +11,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM, UnitSystem
 
 from . import RainMachineConfigEntry, RainMachineData
@@ -83,7 +83,7 @@ SELECT_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RainMachineConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up RainMachine selects based on a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/rainmachine/sensor.py b/homeassistant/components/rainmachine/sensor.py
index 64f9ecf3990..4677a6d8bca 100644
--- a/homeassistant/components/rainmachine/sensor.py
+++ b/homeassistant/components/rainmachine/sensor.py
@@ -17,7 +17,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, UnitOfVolume
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.dt import utc_from_timestamp, utcnow
 
 from . import RainMachineConfigEntry, RainMachineData
@@ -153,7 +153,7 @@ SENSOR_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RainMachineConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up RainMachine sensors based on a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/rainmachine/strings.json b/homeassistant/components/rainmachine/strings.json
index a564d33e777..aad61458e88 100644
--- a/homeassistant/components/rainmachine/strings.json
+++ b/homeassistant/components/rainmachine/strings.json
@@ -5,7 +5,7 @@
       "user": {
         "title": "Fill in your information",
         "data": {
-          "ip_address": "Hostname or IP Address",
+          "ip_address": "Hostname or IP address",
           "password": "[%key:common::config_flow::data::password%]",
           "port": "[%key:common::config_flow::data::port%]"
         }
@@ -157,7 +157,7 @@
     },
     "unpause_watering": {
       "name": "Unpause all watering",
-      "description": "Unpauses all paused watering activities.",
+      "description": "Resumes all paused watering activities.",
       "fields": {
         "device_id": {
           "name": "[%key:component::rainmachine::services::pause_watering::fields::device_id::name%]",
@@ -167,7 +167,7 @@
     },
     "push_flow_meter_data": {
       "name": "Push flow meter data",
-      "description": "Push flow meter data to the RainMachine device.",
+      "description": "Sends flow meter data from Home Assistant to the RainMachine device.",
       "fields": {
         "device_id": {
           "name": "[%key:component::rainmachine::services::pause_watering::fields::device_id::name%]",
@@ -185,7 +185,7 @@
     },
     "push_weather_data": {
       "name": "Push weather data",
-      "description": "Push weather data from Home Assistant to the RainMachine device.\nLocal Weather Push service should be enabled from Settings > Weather > Developer tab for RainMachine to consider the values being sent. Units must be sent in metric; no conversions are performed by the integraion.\nSee details of RainMachine API Here: https://rainmachine.docs.apiary.io/#reference/weather-services/parserdata/post.",
+      "description": "Sends weather data from Home Assistant to the RainMachine device.\nLocal Weather Push service should be enabled from Settings > Weather > Developer tab for RainMachine to consider the values being sent. Units must be sent in metric; no conversions are performed by the integraion.\nSee details of RainMachine API here: https://rainmachine.docs.apiary.io/#reference/weather-services/parserdata/post.",
       "fields": {
         "device_id": {
           "name": "[%key:component::rainmachine::services::pause_watering::fields::device_id::name%]",
@@ -193,7 +193,7 @@
         },
         "timestamp": {
           "name": "Timestamp",
-          "description": "UNIX Timestamp for the weather data. If omitted, the RainMachine device's local time at the time of the call is used."
+          "description": "UNIX timestamp for the weather data. If omitted, the RainMachine device's local time at the time of the call is used."
         },
         "mintemp": {
           "name": "Min temp",
@@ -251,7 +251,7 @@
     },
     "unrestrict_watering": {
       "name": "Unrestrict all watering",
-      "description": "Unrestrict all watering activities.",
+      "description": "Removes all watering restrictions.",
       "fields": {
         "device_id": {
           "name": "[%key:component::rainmachine::services::pause_watering::fields::device_id::name%]",
diff --git a/homeassistant/components/rainmachine/switch.py b/homeassistant/components/rainmachine/switch.py
index 2a065f18976..9b62b15d196 100644
--- a/homeassistant/components/rainmachine/switch.py
+++ b/homeassistant/components/rainmachine/switch.py
@@ -17,7 +17,7 @@ from homeassistant.const import ATTR_ID, EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import VolDictType
 
 from . import RainMachineConfigEntry, RainMachineData, async_update_programs_and_zones
@@ -174,7 +174,7 @@ RESTRICTIONS_SWITCH_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RainMachineConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up RainMachine switches based on a config entry."""
     platform = entity_platform.async_get_current_platform()
diff --git a/homeassistant/components/rainmachine/update.py b/homeassistant/components/rainmachine/update.py
index 39156b05cd4..312937184e4 100644
--- a/homeassistant/components/rainmachine/update.py
+++ b/homeassistant/components/rainmachine/update.py
@@ -16,7 +16,7 @@ from homeassistant.components.update import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import RainMachineConfigEntry
 from .const import DATA_MACHINE_FIRMWARE_UPDATE_STATUS
@@ -60,7 +60,7 @@ UPDATE_DESCRIPTION = RainMachineUpdateEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RainMachineConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Rainmachine update based on a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/random/binary_sensor.py b/homeassistant/components/random/binary_sensor.py
index ae9a5886d59..1af85b43486 100644
--- a/homeassistant/components/random/binary_sensor.py
+++ b/homeassistant/components/random/binary_sensor.py
@@ -16,8 +16,11 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DEVICE_CLASS, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 DEFAULT_NAME = "Random binary sensor"
@@ -44,7 +47,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize config entry."""
     async_add_entities(
diff --git a/homeassistant/components/random/config_flow.py b/homeassistant/components/random/config_flow.py
index 35b7757580e..406100388e6 100644
--- a/homeassistant/components/random/config_flow.py
+++ b/homeassistant/components/random/config_flow.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.schema_config_entry_flow import (
     SchemaCommonFlowHandler,
     SchemaConfigFlowHandler,
diff --git a/homeassistant/components/random/sensor.py b/homeassistant/components/random/sensor.py
index aad4fcb851c..6ea296c791e 100644
--- a/homeassistant/components/random/sensor.py
+++ b/homeassistant/components/random/sensor.py
@@ -21,8 +21,11 @@ from homeassistant.const import (
     CONF_UNIT_OF_MEASUREMENT,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import DEFAULT_MAX, DEFAULT_MIN
@@ -57,7 +60,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize config entry."""
 
diff --git a/homeassistant/components/rapt_ble/sensor.py b/homeassistant/components/rapt_ble/sensor.py
index fd88cbcb54c..01aeedbd344 100644
--- a/homeassistant/components/rapt_ble/sensor.py
+++ b/homeassistant/components/rapt_ble/sensor.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from .const import DOMAIN
@@ -99,7 +99,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the RAPT Pill BLE sensors."""
     coordinator: PassiveBluetoothProcessorCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/raspyrfm/switch.py b/homeassistant/components/raspyrfm/switch.py
index 37835ecb40a..b9506c3688c 100644
--- a/homeassistant/components/raspyrfm/switch.py
+++ b/homeassistant/components/raspyrfm/switch.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
     DEVICE_DEFAULT_NAME,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/rdw/binary_sensor.py b/homeassistant/components/rdw/binary_sensor.py
index 5360ce4a7fe..58e1c2e8237 100644
--- a/homeassistant/components/rdw/binary_sensor.py
+++ b/homeassistant/components/rdw/binary_sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -49,7 +49,7 @@ BINARY_SENSORS: tuple[RDWBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up RDW binary sensors based on a config entry."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/rdw/sensor.py b/homeassistant/components/rdw/sensor.py
index 2c9c9addcfb..4133082bcf4 100644
--- a/homeassistant/components/rdw/sensor.py
+++ b/homeassistant/components/rdw/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -51,7 +51,7 @@ SENSORS: tuple[RDWSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up RDW sensors based on a config entry."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/recollect_waste/calendar.py b/homeassistant/components/recollect_waste/calendar.py
index 3a76451358e..8145a93a2b7 100644
--- a/homeassistant/components/recollect_waste/calendar.py
+++ b/homeassistant/components/recollect_waste/calendar.py
@@ -9,7 +9,7 @@ from aiorecollect.client import PickupEvent
 from homeassistant.components.calendar import CalendarEntity, CalendarEvent
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import DOMAIN
@@ -35,7 +35,9 @@ def async_get_calendar_event_from_pickup_event(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up ReCollect Waste sensors based on a config entry."""
     coordinator: DataUpdateCoordinator[list[PickupEvent]] = hass.data[DOMAIN][
diff --git a/homeassistant/components/recollect_waste/sensor.py b/homeassistant/components/recollect_waste/sensor.py
index 36658fb5008..69b1772b9fa 100644
--- a/homeassistant/components/recollect_waste/sensor.py
+++ b/homeassistant/components/recollect_waste/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import DOMAIN, LOGGER
@@ -39,7 +39,9 @@ SENSOR_DESCRIPTIONS = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up ReCollect Waste sensors based on a config entry."""
     coordinator: DataUpdateCoordinator[list[PickupEvent]] = hass.data[DOMAIN][
diff --git a/homeassistant/components/recorder/__init__.py b/homeassistant/components/recorder/__init__.py
index a40760c67f4..7cb71e70f65 100644
--- a/homeassistant/components/recorder/__init__.py
+++ b/homeassistant/components/recorder/__init__.py
@@ -14,7 +14,7 @@ from homeassistant.const import (
     EVENT_STATE_CHANGED,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entityfilter import (
     INCLUDE_EXCLUDE_BASE_FILTER_SCHEMA,
     INCLUDE_EXCLUDE_FILTER_SCHEMA_INNER,
@@ -149,9 +149,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     commit_interval = conf[CONF_COMMIT_INTERVAL]
     db_max_retries = conf[CONF_DB_MAX_RETRIES]
     db_retry_wait = conf[CONF_DB_RETRY_WAIT]
-    db_url = conf.get(CONF_DB_URL) or DEFAULT_URL.format(
-        hass_config_path=hass.config.path(DEFAULT_DB_FILE)
-    )
+    db_url = conf.get(CONF_DB_URL) or get_default_url(hass)
     exclude = conf[CONF_EXCLUDE]
     exclude_event_types: set[EventType[Any] | str] = set(
         exclude.get(CONF_EVENT_TYPES, [])
@@ -200,3 +198,8 @@ async def _async_setup_integration_platform(
             instance.queue_task(AddRecorderPlatformTask(domain, platform))
 
     await async_process_integration_platforms(hass, DOMAIN, _process_recorder_platform)
+
+
+def get_default_url(hass: HomeAssistant) -> str:
+    """Return the default URL."""
+    return DEFAULT_URL.format(hass_config_path=hass.config.path(DEFAULT_DB_FILE))
diff --git a/homeassistant/components/recorder/auto_repairs/schema.py b/homeassistant/components/recorder/auto_repairs/schema.py
index 1373f466bc2..cf3addd4f20 100644
--- a/homeassistant/components/recorder/auto_repairs/schema.py
+++ b/homeassistant/components/recorder/auto_repairs/schema.py
@@ -175,7 +175,7 @@ def _validate_db_schema_precision(
     # Mark the session as read_only to ensure that the test data is not committed
     # to the database and we always rollback when the scope is exited
     with session_scope(session=instance.get_session(), read_only=True) as session:
-        db_object = table_object(**{column: PRECISE_NUMBER for column in columns})
+        db_object = table_object(**dict.fromkeys(columns, PRECISE_NUMBER))
         table = table_object.__tablename__
         try:
             session.add(db_object)
@@ -184,7 +184,7 @@ def _validate_db_schema_precision(
             _check_columns(
                 schema_errors=schema_errors,
                 stored={column: getattr(db_object, column) for column in columns},
-                expected={column: PRECISE_NUMBER for column in columns},
+                expected=dict.fromkeys(columns, PRECISE_NUMBER),
                 columns=columns,
                 table_name=table,
                 supports="double precision",
diff --git a/homeassistant/components/recorder/backup.py b/homeassistant/components/recorder/backup.py
index d47cbe92bd4..eeebe328007 100644
--- a/homeassistant/components/recorder/backup.py
+++ b/homeassistant/components/recorder/backup.py
@@ -2,7 +2,7 @@
 
 from logging import getLogger
 
-from homeassistant.core import HomeAssistant
+from homeassistant.core import CoreState, HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 
 from .util import async_migration_in_progress, get_instance
@@ -14,6 +14,8 @@ async def async_pre_backup(hass: HomeAssistant) -> None:
     """Perform operations before a backup starts."""
     _LOGGER.info("Backup start notification, locking database for writes")
     instance = get_instance(hass)
+    if hass.state is not CoreState.running:
+        raise HomeAssistantError("Home Assistant is not running")
     if async_migration_in_progress(hass):
         raise HomeAssistantError("Database migration in progress")
     await instance.lock_database()
diff --git a/homeassistant/components/recorder/basic_websocket_api.py b/homeassistant/components/recorder/basic_websocket_api.py
index 9cbc77b30c0..ce9aa452fae 100644
--- a/homeassistant/components/recorder/basic_websocket_api.py
+++ b/homeassistant/components/recorder/basic_websocket_api.py
@@ -8,7 +8,9 @@ import voluptuous as vol
 
 from homeassistant.components import websocket_api
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import recorder as recorder_helper
 
+from . import get_default_url
 from .util import get_instance
 
 
@@ -23,30 +25,28 @@ def async_setup(hass: HomeAssistant) -> None:
         vol.Required("type"): "recorder/info",
     }
 )
-@callback
-def ws_info(
+@websocket_api.async_response
+async def ws_info(
     hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict[str, Any]
 ) -> None:
     """Return status of the recorder."""
-    if instance := get_instance(hass):
-        backlog = instance.backlog
-        migration_in_progress = instance.migration_in_progress
-        migration_is_live = instance.migration_is_live
-        recording = instance.recording
-        # We avoid calling is_alive() as it can block waiting
-        # for the thread state lock which will block the event loop.
-        is_running = instance.is_running
-        max_backlog = instance.max_backlog
-    else:
-        backlog = None
-        migration_in_progress = False
-        migration_is_live = False
-        recording = False
-        is_running = False
-        max_backlog = None
+    # Wait for db_connected to ensure the recorder instance is created and the
+    # migration flags are set.
+    await hass.data[recorder_helper.DATA_RECORDER].db_connected
+    instance = get_instance(hass)
+    backlog = instance.backlog
+    db_in_default_location = instance.db_url == get_default_url(hass)
+    migration_in_progress = instance.migration_in_progress
+    migration_is_live = instance.migration_is_live
+    recording = instance.recording
+    # We avoid calling is_alive() as it can block waiting
+    # for the thread state lock which will block the event loop.
+    is_running = instance.is_running
+    max_backlog = instance.max_backlog
 
     recorder_info = {
         "backlog": backlog,
+        "db_in_default_location": db_in_default_location,
         "max_backlog": max_backlog,
         "migration_in_progress": migration_in_progress,
         "migration_is_live": migration_is_live,
diff --git a/homeassistant/components/recorder/const.py b/homeassistant/components/recorder/const.py
index c91845e8436..4797eecda0f 100644
--- a/homeassistant/components/recorder/const.py
+++ b/homeassistant/components/recorder/const.py
@@ -30,6 +30,12 @@ CONF_DB_INTEGRITY_CHECK = "db_integrity_check"
 MAX_QUEUE_BACKLOG_MIN_VALUE = 65000
 MIN_AVAILABLE_MEMORY_FOR_QUEUE_BACKLOG = 256 * 1024**2
 
+# As soon as we have more than 999 ids, split the query as the
+# MySQL optimizer handles it poorly and will no longer
+# do an index only scan with a group-by
+# https://github.com/home-assistant/core/issues/132865#issuecomment-2543160459
+MAX_IDS_FOR_INDEXED_GROUP_BY = 999
+
 # The maximum number of rows (events) we purge in one delete statement
 
 DEFAULT_MAX_BIND_VARS = 4000
@@ -48,8 +54,14 @@ CONTEXT_ID_AS_BINARY_SCHEMA_VERSION = 36
 EVENT_TYPE_IDS_SCHEMA_VERSION = 37
 STATES_META_SCHEMA_VERSION = 38
 LAST_REPORTED_SCHEMA_VERSION = 43
+CIRCULAR_MEAN_SCHEMA_VERSION = 49
 
 LEGACY_STATES_EVENT_ID_INDEX_SCHEMA_VERSION = 28
+LEGACY_STATES_EVENT_FOREIGN_KEYS_FIXED_SCHEMA_VERSION = 43
+# https://github.com/home-assistant/core/pull/120779
+# fixed the foreign keys in the states table but it did
+# not bump the schema version which means only databases
+# created with schema 44 and later do not need the rebuild.
 
 INTEGRATION_PLATFORM_COMPILE_STATISTICS = "compile_statistics"
 INTEGRATION_PLATFORM_LIST_STATISTIC_IDS = "list_statistic_ids"
diff --git a/homeassistant/components/recorder/core.py b/homeassistant/components/recorder/core.py
index fc8b136f38a..7b8043b9201 100644
--- a/homeassistant/components/recorder/core.py
+++ b/homeassistant/components/recorder/core.py
@@ -43,9 +43,10 @@ from homeassistant.helpers.event import (
     async_track_time_interval,
     async_track_utc_time_change,
 )
+from homeassistant.helpers.recorder import DATA_RECORDER
 from homeassistant.helpers.start import async_at_started
 from homeassistant.helpers.typing import UNDEFINED, UndefinedType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.enum import try_parse_enum
 from homeassistant.util.event_type import EventType
 
@@ -78,7 +79,13 @@ from .db_schema import (
     StatisticsShortTerm,
 )
 from .executor import DBInterruptibleThreadPoolExecutor
-from .models import DatabaseEngine, StatisticData, StatisticMetaData, UnsupportedDialect
+from .models import (
+    DatabaseEngine,
+    StatisticData,
+    StatisticMeanType,
+    StatisticMetaData,
+    UnsupportedDialect,
+)
 from .pool import POOL_SIZE, MutexPool, RecorderPool
 from .table_managers.event_data import EventDataManager
 from .table_managers.event_types import EventTypeManager
@@ -122,8 +129,6 @@ from .util import (
 
 _LOGGER = logging.getLogger(__name__)
 
-DEFAULT_URL = "sqlite:///{hass_config_path}"
-
 # Controls how often we clean up
 # States and Events objects
 EXPIRE_AFTER_COMMITS = 120
@@ -183,7 +188,7 @@ class Recorder(threading.Thread):
         self.db_retry_wait = db_retry_wait
         self.database_engine: DatabaseEngine | None = None
         # Database connection is ready, but non-live migration may be in progress
-        db_connected: asyncio.Future[bool] = hass.data[DOMAIN].db_connected
+        db_connected: asyncio.Future[bool] = hass.data[DATA_RECORDER].db_connected
         self.async_db_connected: asyncio.Future[bool] = db_connected
         # Database is ready to use but live migration may be in progress
         self.async_db_ready: asyncio.Future[bool] = hass.loop.create_future()
@@ -612,6 +617,17 @@ class Recorder(threading.Thread):
         table: type[Statistics | StatisticsShortTerm],
     ) -> None:
         """Schedule import of statistics."""
+        if "mean_type" not in metadata:
+            # Backwards compatibility for old metadata format
+            # Can be removed after 2026.4
+            metadata["mean_type"] = (  # type: ignore[unreachable]
+                StatisticMeanType.ARITHMETIC
+                if metadata.get("has_mean")
+                else StatisticMeanType.NONE
+            )
+        # Remove deprecated has_mean as it's not needed anymore in core
+        metadata.pop("has_mean", None)
+
         self.queue_task(ImportStatisticsTask(metadata, stats, table))
 
     @callback
diff --git a/homeassistant/components/recorder/db_schema.py b/homeassistant/components/recorder/db_schema.py
index cefce9c4e72..6566cadf64c 100644
--- a/homeassistant/components/recorder/db_schema.py
+++ b/homeassistant/components/recorder/db_schema.py
@@ -47,7 +47,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Context, Event, EventOrigin, EventStateChangedData, State
 from homeassistant.helpers.json import JSON_DUMP, json_bytes, json_bytes_strip_null
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.json import (
     JSON_DECODE_EXCEPTIONS,
     json_loads,
@@ -58,6 +58,7 @@ from .const import ALL_DOMAIN_EXCLUDE_ATTRS, SupportedDialect
 from .models import (
     StatisticData,
     StatisticDataTimestamp,
+    StatisticMeanType,
     StatisticMetaData,
     bytes_to_ulid_or_none,
     bytes_to_uuid_hex_or_none,
@@ -77,7 +78,7 @@ class LegacyBase(DeclarativeBase):
     """Base class for tables, used for schema migration."""
 
 
-SCHEMA_VERSION = 48
+SCHEMA_VERSION = 50
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -203,11 +204,11 @@ UINT_32_TYPE = BigInteger().with_variant(
     "mariadb",
 )
 JSON_VARIANT_CAST = Text().with_variant(
-    postgresql.JSON(none_as_null=True),  # type: ignore[no-untyped-call]
+    postgresql.JSON(none_as_null=True),
     "postgresql",
 )
 JSONB_VARIANT_CAST = Text().with_variant(
-    postgresql.JSONB(none_as_null=True),  # type: ignore[no-untyped-call]
+    postgresql.JSONB(none_as_null=True),
     "postgresql",
 )
 DATETIME_TYPE = (
@@ -719,6 +720,7 @@ class StatisticsBase:
     start: Mapped[datetime | None] = mapped_column(UNUSED_LEGACY_DATETIME_COLUMN)
     start_ts: Mapped[float | None] = mapped_column(TIMESTAMP_TYPE, index=True)
     mean: Mapped[float | None] = mapped_column(DOUBLE_TYPE)
+    mean_weight: Mapped[float | None] = mapped_column(DOUBLE_TYPE)
     min: Mapped[float | None] = mapped_column(DOUBLE_TYPE)
     max: Mapped[float | None] = mapped_column(DOUBLE_TYPE)
     last_reset: Mapped[datetime | None] = mapped_column(UNUSED_LEGACY_DATETIME_COLUMN)
@@ -740,6 +742,7 @@ class StatisticsBase:
             start=None,
             start_ts=stats["start"].timestamp(),
             mean=stats.get("mean"),
+            mean_weight=stats.get("mean_weight"),
             min=stats.get("min"),
             max=stats.get("max"),
             last_reset=None,
@@ -763,6 +766,7 @@ class StatisticsBase:
             start=None,
             start_ts=stats["start_ts"],
             mean=stats.get("mean"),
+            mean_weight=stats.get("mean_weight"),
             min=stats.get("min"),
             max=stats.get("max"),
             last_reset=None,
@@ -848,6 +852,9 @@ class _StatisticsMeta:
     has_mean: Mapped[bool | None] = mapped_column(Boolean)
     has_sum: Mapped[bool | None] = mapped_column(Boolean)
     name: Mapped[str | None] = mapped_column(String(255))
+    mean_type: Mapped[StatisticMeanType] = mapped_column(
+        SmallInteger, nullable=False, default=StatisticMeanType.NONE.value
+    )  # See StatisticMeanType
 
     @staticmethod
     def from_meta(meta: StatisticMetaData) -> StatisticsMeta:
diff --git a/homeassistant/components/recorder/history/legacy.py b/homeassistant/components/recorder/history/legacy.py
index dc49ebb9768..4323ad9466b 100644
--- a/homeassistant/components/recorder/history/legacy.py
+++ b/homeassistant/components/recorder/history/legacy.py
@@ -20,7 +20,7 @@ from sqlalchemy.sql.lambdas import StatementLambdaElement
 from homeassistant.const import COMPRESSED_STATE_LAST_UPDATED, COMPRESSED_STATE_STATE
 from homeassistant.core import HomeAssistant, State, split_entity_id
 from homeassistant.helpers.recorder import get_instance
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from ..db_schema import StateAttributes, States
 from ..filters import Filters
diff --git a/homeassistant/components/recorder/history/modern.py b/homeassistant/components/recorder/history/modern.py
index 2d8f4da5f38..566e30713f0 100644
--- a/homeassistant/components/recorder/history/modern.py
+++ b/homeassistant/components/recorder/history/modern.py
@@ -6,11 +6,12 @@ from collections.abc import Callable, Iterable, Iterator
 from datetime import datetime
 from itertools import groupby
 from operator import itemgetter
-from typing import Any, cast
+from typing import TYPE_CHECKING, Any, cast
 
 from sqlalchemy import (
     CompoundSelect,
     Select,
+    StatementLambdaElement,
     Subquery,
     and_,
     func,
@@ -25,9 +26,10 @@ from sqlalchemy.orm.session import Session
 from homeassistant.const import COMPRESSED_STATE_LAST_UPDATED, COMPRESSED_STATE_STATE
 from homeassistant.core import HomeAssistant, State, split_entity_id
 from homeassistant.helpers.recorder import get_instance
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
+from homeassistant.util.collection import chunked_or_all
 
-from ..const import LAST_REPORTED_SCHEMA_VERSION
+from ..const import LAST_REPORTED_SCHEMA_VERSION, MAX_IDS_FOR_INDEXED_GROUP_BY
 from ..db_schema import (
     SHARED_ATTR_OR_LEGACY_ATTRIBUTES,
     StateAttributes,
@@ -149,6 +151,7 @@ def _significant_states_stmt(
     no_attributes: bool,
     include_start_time_state: bool,
     run_start_ts: float | None,
+    slow_dependent_subquery: bool,
 ) -> Select | CompoundSelect:
     """Query the database for significant state changes."""
     include_last_changed = not significant_changes_only
@@ -187,6 +190,7 @@ def _significant_states_stmt(
                 metadata_ids,
                 no_attributes,
                 include_last_changed,
+                slow_dependent_subquery,
             ).subquery(),
             no_attributes,
             include_last_changed,
@@ -257,7 +261,68 @@ def get_significant_states_with_session(
     start_time_ts = start_time.timestamp()
     end_time_ts = datetime_to_timestamp_or_none(end_time)
     single_metadata_id = metadata_ids[0] if len(metadata_ids) == 1 else None
-    stmt = lambda_stmt(
+    rows: list[Row] = []
+    if TYPE_CHECKING:
+        assert instance.database_engine is not None
+    slow_dependent_subquery = instance.database_engine.optimizer.slow_dependent_subquery
+    if include_start_time_state and slow_dependent_subquery:
+        # https://github.com/home-assistant/core/issues/137178
+        # If we include the start time state we need to limit the
+        # number of metadata_ids we query for at a time to avoid
+        # hitting limits in the MySQL optimizer that prevent
+        # the start time state query from using an index-only optimization
+        # to find the start time state.
+        iter_metadata_ids = chunked_or_all(metadata_ids, MAX_IDS_FOR_INDEXED_GROUP_BY)
+    else:
+        iter_metadata_ids = (metadata_ids,)
+    for metadata_ids_chunk in iter_metadata_ids:
+        stmt = _generate_significant_states_with_session_stmt(
+            start_time_ts,
+            end_time_ts,
+            single_metadata_id,
+            metadata_ids_chunk,
+            metadata_ids_in_significant_domains,
+            significant_changes_only,
+            no_attributes,
+            include_start_time_state,
+            oldest_ts,
+            slow_dependent_subquery,
+        )
+        row_chunk = cast(
+            list[Row],
+            execute_stmt_lambda_element(session, stmt, None, end_time, orm_rows=False),
+        )
+        if rows:
+            rows += row_chunk
+        else:
+            # If we have no rows yet, we can just assign the chunk
+            # as this is the common case since its rare that
+            # we exceed the MAX_IDS_FOR_INDEXED_GROUP_BY limit
+            rows = row_chunk
+    return _sorted_states_to_dict(
+        rows,
+        start_time_ts if include_start_time_state else None,
+        entity_ids,
+        entity_id_to_metadata_id,
+        minimal_response,
+        compressed_state_format,
+        no_attributes=no_attributes,
+    )
+
+
+def _generate_significant_states_with_session_stmt(
+    start_time_ts: float,
+    end_time_ts: float | None,
+    single_metadata_id: int | None,
+    metadata_ids: list[int],
+    metadata_ids_in_significant_domains: list[int],
+    significant_changes_only: bool,
+    no_attributes: bool,
+    include_start_time_state: bool,
+    oldest_ts: float | None,
+    slow_dependent_subquery: bool,
+) -> StatementLambdaElement:
+    return lambda_stmt(
         lambda: _significant_states_stmt(
             start_time_ts,
             end_time_ts,
@@ -268,6 +333,7 @@ def get_significant_states_with_session(
             no_attributes,
             include_start_time_state,
             oldest_ts,
+            slow_dependent_subquery,
         ),
         track_on=[
             bool(single_metadata_id),
@@ -276,17 +342,9 @@ def get_significant_states_with_session(
             significant_changes_only,
             no_attributes,
             include_start_time_state,
+            slow_dependent_subquery,
         ],
     )
-    return _sorted_states_to_dict(
-        execute_stmt_lambda_element(session, stmt, None, end_time, orm_rows=False),
-        start_time_ts if include_start_time_state else None,
-        entity_ids,
-        entity_id_to_metadata_id,
-        minimal_response,
-        compressed_state_format,
-        no_attributes=no_attributes,
-    )
 
 
 def get_full_significant_states_with_session(
@@ -554,13 +612,14 @@ def get_last_state_changes(
         )
 
 
-def _get_start_time_state_for_entities_stmt(
+def _get_start_time_state_for_entities_stmt_dependent_sub_query(
     epoch_time: float,
     metadata_ids: list[int],
     no_attributes: bool,
     include_last_changed: bool,
 ) -> Select:
     """Baked query to get states for specific entities."""
+    # Engine has a fast dependent subquery optimizer
     # This query is the result of significant research in
     # https://github.com/home-assistant/core/issues/132865
     # A reverse index scan with a limit 1 is the fastest way to get the
@@ -570,7 +629,9 @@ def _get_start_time_state_for_entities_stmt(
     # before a specific point in time for all entities.
     stmt = (
         _stmt_and_join_attributes_for_start_state(
-            no_attributes, include_last_changed, False
+            no_attributes=no_attributes,
+            include_last_changed=include_last_changed,
+            include_last_reported=False,
         )
         .select_from(StatesMeta)
         .join(
@@ -600,6 +661,55 @@ def _get_start_time_state_for_entities_stmt(
     )
 
 
+def _get_start_time_state_for_entities_stmt_group_by(
+    epoch_time: float,
+    metadata_ids: list[int],
+    no_attributes: bool,
+    include_last_changed: bool,
+) -> Select:
+    """Baked query to get states for specific entities."""
+    # Simple group-by for MySQL, must use less
+    # than 1000 metadata_ids in the IN clause for MySQL
+    # or it will optimize poorly. Callers are responsible
+    # for ensuring that the number of metadata_ids is less
+    # than 1000.
+    most_recent_states_for_entities_by_date = (
+        select(
+            States.metadata_id.label("max_metadata_id"),
+            func.max(States.last_updated_ts).label("max_last_updated"),
+        )
+        .filter(
+            (States.last_updated_ts < epoch_time) & States.metadata_id.in_(metadata_ids)
+        )
+        .group_by(States.metadata_id)
+        .subquery()
+    )
+    stmt = (
+        _stmt_and_join_attributes_for_start_state(
+            no_attributes=no_attributes,
+            include_last_changed=include_last_changed,
+            include_last_reported=False,
+        )
+        .join(
+            most_recent_states_for_entities_by_date,
+            and_(
+                States.metadata_id
+                == most_recent_states_for_entities_by_date.c.max_metadata_id,
+                States.last_updated_ts
+                == most_recent_states_for_entities_by_date.c.max_last_updated,
+            ),
+        )
+        .filter(
+            (States.last_updated_ts < epoch_time) & States.metadata_id.in_(metadata_ids)
+        )
+    )
+    if no_attributes:
+        return stmt
+    return stmt.outerjoin(
+        StateAttributes, (States.attributes_id == StateAttributes.attributes_id)
+    )
+
+
 def _get_oldest_possible_ts(
     hass: HomeAssistant, utc_point_in_time: datetime
 ) -> float | None:
@@ -620,6 +730,7 @@ def _get_start_time_state_stmt(
     metadata_ids: list[int],
     no_attributes: bool,
     include_last_changed: bool,
+    slow_dependent_subquery: bool,
 ) -> Select:
     """Return the states at a specific point in time."""
     if single_metadata_id:
@@ -634,7 +745,15 @@ def _get_start_time_state_stmt(
         )
     # We have more than one entity to look at so we need to do a query on states
     # since the last recorder run started.
-    return _get_start_time_state_for_entities_stmt(
+    if slow_dependent_subquery:
+        return _get_start_time_state_for_entities_stmt_group_by(
+            epoch_time,
+            metadata_ids,
+            no_attributes,
+            include_last_changed,
+        )
+
+    return _get_start_time_state_for_entities_stmt_dependent_sub_query(
         epoch_time,
         metadata_ids,
         no_attributes,
@@ -766,7 +885,7 @@ def _sorted_states_to_dict(
                     attr_cache,
                     start_time_ts,
                     entity_id,
-                    prev_state,  # type: ignore[arg-type]
+                    prev_state,
                     first_state[last_updated_ts_idx],
                     no_attributes,
                 )
diff --git a/homeassistant/components/recorder/manifest.json b/homeassistant/components/recorder/manifest.json
index d3b6e52ad11..f5336e2a85b 100644
--- a/homeassistant/components/recorder/manifest.json
+++ b/homeassistant/components/recorder/manifest.json
@@ -7,8 +7,8 @@
   "iot_class": "local_push",
   "quality_scale": "internal",
   "requirements": [
-    "SQLAlchemy==2.0.36",
-    "fnv-hash-fast==1.2.2",
+    "SQLAlchemy==2.0.39",
+    "fnv-hash-fast==1.4.0",
     "psutil-home-assistant==0.0.1"
   ]
 }
diff --git a/homeassistant/components/recorder/migration.py b/homeassistant/components/recorder/migration.py
index c6cdd6d317f..58af15c2aa7 100644
--- a/homeassistant/components/recorder/migration.py
+++ b/homeassistant/components/recorder/migration.py
@@ -9,7 +9,7 @@ from dataclasses import dataclass, replace as dataclass_replace
 from datetime import timedelta
 import logging
 from time import time
-from typing import TYPE_CHECKING, Any, cast, final
+from typing import TYPE_CHECKING, Any, TypedDict, cast, final
 from uuid import UUID
 
 import sqlalchemy
@@ -52,6 +52,7 @@ from .auto_repairs.statistics.schema import (
 from .const import (
     CONTEXT_ID_AS_BINARY_SCHEMA_VERSION,
     EVENT_TYPE_IDS_SCHEMA_VERSION,
+    LEGACY_STATES_EVENT_FOREIGN_KEYS_FIXED_SCHEMA_VERSION,
     LEGACY_STATES_EVENT_ID_INDEX_SCHEMA_VERSION,
     STATES_META_SCHEMA_VERSION,
     SupportedDialect,
@@ -80,7 +81,7 @@ from .db_schema import (
     StatisticsRuns,
     StatisticsShortTerm,
 )
-from .models import process_timestamp
+from .models import StatisticMeanType, process_timestamp
 from .models.time import datetime_to_timestamp_or_none
 from .queries import (
     batch_cleanup_entity_ids,
@@ -143,24 +144,32 @@ class _ColumnTypesForDialect:
     big_int_type: str
     timestamp_type: str
     context_bin_type: str
+    small_int_type: str
+    double_type: str
 
 
 _MYSQL_COLUMN_TYPES = _ColumnTypesForDialect(
     big_int_type="INTEGER(20)",
     timestamp_type=DOUBLE_PRECISION_TYPE_SQL,
     context_bin_type=f"BLOB({CONTEXT_ID_BIN_MAX_LENGTH})",
+    small_int_type="SMALLINT",
+    double_type=DOUBLE_PRECISION_TYPE_SQL,
 )
 
 _POSTGRESQL_COLUMN_TYPES = _ColumnTypesForDialect(
     big_int_type="INTEGER",
     timestamp_type=DOUBLE_PRECISION_TYPE_SQL,
     context_bin_type="BYTEA",
+    small_int_type="SMALLINT",
+    double_type=DOUBLE_PRECISION_TYPE_SQL,
 )
 
 _SQLITE_COLUMN_TYPES = _ColumnTypesForDialect(
     big_int_type="INTEGER",
     timestamp_type="FLOAT",
     context_bin_type="BLOB",
+    small_int_type="INTEGER",
+    double_type="FLOAT",
 )
 
 _COLUMN_TYPES_FOR_DIALECT: dict[SupportedDialect | None, _ColumnTypesForDialect] = {
@@ -711,6 +720,11 @@ def _modify_columns(
                 raise
 
 
+class _FKAlterDict(TypedDict):
+    old_fk: ForeignKeyConstraint
+    columns: list[str]
+
+
 def _update_states_table_with_foreign_key_options(
     session_maker: Callable[[], Session], engine: Engine
 ) -> None:
@@ -728,7 +742,7 @@ def _update_states_table_with_foreign_key_options(
 
     inspector = sqlalchemy.inspect(engine)
     tmp_states_table = Table(TABLE_STATES, MetaData())
-    alters = [
+    alters: list[_FKAlterDict] = [
         {
             "old_fk": ForeignKeyConstraint(
                 (), (), name=foreign_key["name"], table=tmp_states_table
@@ -754,14 +768,14 @@ def _update_states_table_with_foreign_key_options(
         with session_scope(session=session_maker()) as session:
             try:
                 connection = session.connection()
-                connection.execute(DropConstraint(alter["old_fk"]))  # type: ignore[no-untyped-call]
+                connection.execute(DropConstraint(alter["old_fk"]))
                 for fkc in states_key_constraints:
                     if fkc.column_keys == alter["columns"]:
                         # AddConstraint mutates the constraint passed to it, we need to
                         # undo that to avoid changing the behavior of the table schema.
                         # https://github.com/sqlalchemy/sqlalchemy/blob/96f1172812f858fead45cdc7874abac76f45b339/lib/sqlalchemy/sql/ddl.py#L746-L748
                         create_rule = fkc._create_rule  # noqa: SLF001
-                        add_constraint = AddConstraint(fkc)  # type: ignore[no-untyped-call]
+                        add_constraint = AddConstraint(fkc)
                         fkc._create_rule = create_rule  # noqa: SLF001
                         connection.execute(add_constraint)
             except (InternalError, OperationalError):
@@ -799,7 +813,7 @@ def _drop_foreign_key_constraints(
         with session_scope(session=session_maker()) as session:
             try:
                 connection = session.connection()
-                connection.execute(DropConstraint(drop))  # type: ignore[no-untyped-call]
+                connection.execute(DropConstraint(drop))
             except (InternalError, OperationalError):
                 _LOGGER.exception(
                     "Could not drop foreign constraints in %s table on %s",
@@ -844,7 +858,7 @@ def _restore_foreign_key_constraints(
         # undo that to avoid changing the behavior of the table schema.
         # https://github.com/sqlalchemy/sqlalchemy/blob/96f1172812f858fead45cdc7874abac76f45b339/lib/sqlalchemy/sql/ddl.py#L746-L748
         create_rule = constraint._create_rule  # noqa: SLF001
-        add_constraint = AddConstraint(constraint)  # type: ignore[no-untyped-call]
+        add_constraint = AddConstraint(constraint)
         constraint._create_rule = create_rule  # noqa: SLF001
         try:
             _add_constraint(session_maker, add_constraint, table, column)
@@ -1987,6 +2001,42 @@ class _SchemaVersion48Migrator(_SchemaVersionMigrator, target_version=48):
         _migrate_columns_to_timestamp(self.instance, self.session_maker, self.engine)
 
 
+class _SchemaVersion49Migrator(_SchemaVersionMigrator, target_version=49):
+    def _apply_update(self) -> None:
+        """Version specific update method."""
+        _add_columns(
+            self.session_maker,
+            "statistics_meta",
+            [
+                f"mean_type {self.column_types.small_int_type} NOT NULL DEFAULT {StatisticMeanType.NONE.value}"
+            ],
+        )
+
+        for table in ("statistics", "statistics_short_term"):
+            _add_columns(
+                self.session_maker,
+                table,
+                [f"mean_weight {self.column_types.double_type}"],
+            )
+
+        with session_scope(session=self.session_maker()) as session:
+            connection = session.connection()
+            connection.execute(
+                text(
+                    "UPDATE statistics_meta SET mean_type=:mean_type WHERE has_mean=true"
+                ),
+                {"mean_type": StatisticMeanType.ARITHMETIC.value},
+            )
+
+
+class _SchemaVersion50Migrator(_SchemaVersionMigrator, target_version=50):
+    def _apply_update(self) -> None:
+        """Version specific update method."""
+        with session_scope(session=self.session_maker()) as session:
+            connection = session.connection()
+            connection.execute(text("UPDATE statistics_meta SET has_mean=NULL"))
+
+
 def _migrate_statistics_columns_to_timestamp_removing_duplicates(
     hass: HomeAssistant,
     instance: Recorder,
@@ -2490,9 +2540,10 @@ class BaseMigration(ABC):
         if self.initial_schema_version > self.max_initial_schema_version:
             _LOGGER.debug(
                 "Data migration '%s' not needed, database created with version %s "
-                "after migrator was added",
+                "after migrator was added in version %s",
                 self.migration_id,
                 self.initial_schema_version,
+                self.max_initial_schema_version,
             )
             return False
         if self.start_schema_version < self.required_schema_version:
@@ -2868,7 +2919,14 @@ class EventIDPostMigration(BaseRunTimeMigration):
     """Migration to remove old event_id index from states."""
 
     migration_id = "event_id_post_migration"
-    max_initial_schema_version = LEGACY_STATES_EVENT_ID_INDEX_SCHEMA_VERSION - 1
+    # Note we don't subtract 1 from the max_initial_schema_version
+    # in this case because we need to run this migration on databases
+    # version >= 43 because the schema was not bumped when the table
+    # rebuild was added in
+    # https://github.com/home-assistant/core/pull/120779
+    # which means its only safe to assume version 44 and later
+    # do not need the table rebuild
+    max_initial_schema_version = LEGACY_STATES_EVENT_FOREIGN_KEYS_FIXED_SCHEMA_VERSION
     task = MigrationTask
     migration_version = 2
 
diff --git a/homeassistant/components/recorder/models/__init__.py b/homeassistant/components/recorder/models/__init__.py
index ea7a6c86854..8f76982a900 100644
--- a/homeassistant/components/recorder/models/__init__.py
+++ b/homeassistant/components/recorder/models/__init__.py
@@ -17,6 +17,7 @@ from .statistics import (
     RollingWindowStatisticPeriod,
     StatisticData,
     StatisticDataTimestamp,
+    StatisticMeanType,
     StatisticMetaData,
     StatisticPeriod,
     StatisticResult,
@@ -37,6 +38,7 @@ __all__ = [
     "RollingWindowStatisticPeriod",
     "StatisticData",
     "StatisticDataTimestamp",
+    "StatisticMeanType",
     "StatisticMetaData",
     "StatisticPeriod",
     "StatisticResult",
diff --git a/homeassistant/components/recorder/models/database.py b/homeassistant/components/recorder/models/database.py
index b86fd299793..2a4924edab3 100644
--- a/homeassistant/components/recorder/models/database.py
+++ b/homeassistant/components/recorder/models/database.py
@@ -37,3 +37,13 @@ class DatabaseOptimizer:
     # https://wiki.postgresql.org/wiki/Loose_indexscan
     # https://github.com/home-assistant/core/issues/126084
     slow_range_in_select: bool
+
+    # MySQL 8.x+ can end up with a file-sort on a dependent subquery
+    # which makes the query painfully slow.
+    # https://github.com/home-assistant/core/issues/137178
+    # The solution is to use multiple indexed group-by queries instead
+    # of the subquery as long as the group by does not exceed
+    # 999 elements since as soon as we hit 1000 elements MySQL
+    # will no longer use the group_index_range optimization.
+    # https://github.com/home-assistant/core/issues/132865#issuecomment-2543160459
+    slow_dependent_subquery: bool
diff --git a/homeassistant/components/recorder/models/legacy.py b/homeassistant/components/recorder/models/legacy.py
index b5e67ff050b..11ea9141fc0 100644
--- a/homeassistant/components/recorder/models/legacy.py
+++ b/homeassistant/components/recorder/models/legacy.py
@@ -14,7 +14,7 @@ from homeassistant.const import (
     COMPRESSED_STATE_STATE,
 )
 from homeassistant.core import Context, State
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .state_attributes import decode_attributes_from_source
 from .time import process_timestamp
diff --git a/homeassistant/components/recorder/models/state.py b/homeassistant/components/recorder/models/state.py
index 1ceaee633ae..919ee078a99 100644
--- a/homeassistant/components/recorder/models/state.py
+++ b/homeassistant/components/recorder/models/state.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
     COMPRESSED_STATE_STATE,
 )
 from homeassistant.core import Context, State
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .state_attributes import decode_attributes_from_source
 
diff --git a/homeassistant/components/recorder/models/statistics.py b/homeassistant/components/recorder/models/statistics.py
index ad4d82067c4..08da12d6b17 100644
--- a/homeassistant/components/recorder/models/statistics.py
+++ b/homeassistant/components/recorder/models/statistics.py
@@ -3,7 +3,8 @@
 from __future__ import annotations
 
 from datetime import datetime, timedelta
-from typing import Literal, TypedDict
+from enum import IntEnum
+from typing import Literal, NotRequired, TypedDict
 
 
 class StatisticResult(TypedDict):
@@ -36,6 +37,7 @@ class StatisticMixIn(TypedDict, total=False):
     min: float
     max: float
     mean: float
+    mean_weight: float
 
 
 class StatisticData(StatisticDataBase, StatisticMixIn, total=False):
@@ -50,10 +52,20 @@ class StatisticDataTimestamp(StatisticDataTimestampBase, StatisticMixIn, total=F
     last_reset_ts: float | None
 
 
+class StatisticMeanType(IntEnum):
+    """Statistic mean type."""
+
+    NONE = 0
+    ARITHMETIC = 1
+    CIRCULAR = 2
+
+
 class StatisticMetaData(TypedDict):
     """Statistic meta data class."""
 
-    has_mean: bool
+    # has_mean is deprecated, use mean_type instead. has_mean will be removed in 2026.4
+    has_mean: NotRequired[bool]
+    mean_type: StatisticMeanType
     has_sum: bool
     name: str | None
     source: str
diff --git a/homeassistant/components/recorder/models/time.py b/homeassistant/components/recorder/models/time.py
index 33218000faa..91acad1500e 100644
--- a/homeassistant/components/recorder/models/time.py
+++ b/homeassistant/components/recorder/models/time.py
@@ -6,7 +6,7 @@ from datetime import datetime
 import logging
 from typing import overload
 
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/recorder/services.py b/homeassistant/components/recorder/services.py
index 2be02fe8091..cc74d7a2376 100644
--- a/homeassistant/components/recorder/services.py
+++ b/homeassistant/components/recorder/services.py
@@ -9,13 +9,13 @@ import voluptuous as vol
 
 from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entityfilter import generate_filter
 from homeassistant.helpers.service import (
     async_extract_entity_ids,
     async_register_admin_service,
 )
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import ATTR_APPLY_FILTER, ATTR_KEEP_DAYS, ATTR_REPACK, DOMAIN
 from .core import Recorder
diff --git a/homeassistant/components/recorder/statistics.py b/homeassistant/components/recorder/statistics.py
index 8995f57ef30..2507a66899e 100644
--- a/homeassistant/components/recorder/statistics.py
+++ b/homeassistant/components/recorder/statistics.py
@@ -9,12 +9,23 @@ from datetime import datetime, timedelta
 from functools import lru_cache, partial
 from itertools import chain, groupby
 import logging
+import math
 from operator import itemgetter
 import re
 from time import time as time_time
-from typing import TYPE_CHECKING, Any, Literal, TypedDict, cast
+from typing import TYPE_CHECKING, Any, Literal, Required, TypedDict, cast
 
-from sqlalchemy import Select, and_, bindparam, func, lambda_stmt, select, text
+from sqlalchemy import (
+    Label,
+    Select,
+    and_,
+    bindparam,
+    case,
+    func,
+    lambda_stmt,
+    select,
+    text,
+)
 from sqlalchemy.engine.row import Row
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm.session import Session
@@ -24,9 +35,12 @@ import voluptuous as vol
 from homeassistant.const import ATTR_UNIT_OF_MEASUREMENT
 from homeassistant.core import HomeAssistant, callback, valid_entity_id
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.recorder import DATA_RECORDER
 from homeassistant.helpers.singleton import singleton
 from homeassistant.helpers.typing import UNDEFINED, UndefinedType
 from homeassistant.util import dt as dt_util
+from homeassistant.util.collection import chunked_or_all
+from homeassistant.util.enum import try_parse_enum
 from homeassistant.util.unit_conversion import (
     AreaConverter,
     BaseUnitConverter,
@@ -38,6 +52,7 @@ from homeassistant.util.unit_conversion import (
     ElectricCurrentConverter,
     ElectricPotentialConverter,
     EnergyConverter,
+    EnergyDistanceConverter,
     InformationConverter,
     MassConverter,
     PowerConverter,
@@ -57,6 +72,7 @@ from .const import (
     INTEGRATION_PLATFORM_LIST_STATISTIC_IDS,
     INTEGRATION_PLATFORM_UPDATE_STATISTICS_ISSUES,
     INTEGRATION_PLATFORM_VALIDATE_STATISTICS,
+    MAX_IDS_FOR_INDEXED_GROUP_BY,
     SupportedDialect,
 )
 from .db_schema import (
@@ -70,6 +86,7 @@ from .db_schema import (
 from .models import (
     StatisticData,
     StatisticDataTimestamp,
+    StatisticMeanType,
     StatisticMetaData,
     StatisticResult,
     datetime_to_timestamp_or_none,
@@ -109,11 +126,54 @@ QUERY_STATISTICS_SHORT_TERM = (
     StatisticsShortTerm.sum,
 )
 
+
+def query_circular_mean(table: type[StatisticsBase]) -> tuple[Label, Label]:
+    """Return the sqlalchemy function for circular mean and the mean_weight.
+
+    The result must be modulo 360 to normalize the result [0, 360].
+    """
+    # Postgres doesn't support modulo for double precision and
+    # the other dbs return the remainder instead of the modulo
+    # meaning negative values are possible. For these reason
+    # we need to normalize the result to be in the range [0, 360)
+    # in Python.
+    # https://en.wikipedia.org/wiki/Circular_mean
+    radians = func.radians(table.mean)
+    weight = func.sqrt(
+        func.power(func.sum(func.sin(radians) * table.mean_weight), 2)
+        + func.power(func.sum(func.cos(radians) * table.mean_weight), 2)
+    )
+    return (
+        func.degrees(
+            func.atan2(func.sum(func.sin(radians)), func.sum(func.cos(radians)))
+        ).label("mean"),
+        weight.label("mean_weight"),
+    )
+
+
 QUERY_STATISTICS_SUMMARY_MEAN = (
     StatisticsShortTerm.metadata_id,
-    func.avg(StatisticsShortTerm.mean),
     func.min(StatisticsShortTerm.min),
     func.max(StatisticsShortTerm.max),
+    case(
+        (
+            StatisticsMeta.mean_type == StatisticMeanType.ARITHMETIC,
+            func.avg(StatisticsShortTerm.mean),
+        ),
+        (
+            StatisticsMeta.mean_type == StatisticMeanType.CIRCULAR,
+            query_circular_mean(StatisticsShortTerm)[0],
+        ),
+        else_=None,
+    ),
+    case(
+        (
+            StatisticsMeta.mean_type == StatisticMeanType.CIRCULAR,
+            query_circular_mean(StatisticsShortTerm)[1],
+        ),
+        else_=None,
+    ),
+    StatisticsMeta.mean_type,
 )
 
 QUERY_STATISTICS_SUMMARY_SUM = (
@@ -132,30 +192,28 @@ QUERY_STATISTICS_SUMMARY_SUM = (
 
 
 STATISTIC_UNIT_TO_UNIT_CONVERTER: dict[str | None, type[BaseUnitConverter]] = {
-    **{unit: AreaConverter for unit in AreaConverter.VALID_UNITS},
-    **{
-        unit: BloodGlucoseConcentrationConverter
-        for unit in BloodGlucoseConcentrationConverter.VALID_UNITS
-    },
-    **{unit: ConductivityConverter for unit in ConductivityConverter.VALID_UNITS},
-    **{unit: DataRateConverter for unit in DataRateConverter.VALID_UNITS},
-    **{unit: DistanceConverter for unit in DistanceConverter.VALID_UNITS},
-    **{unit: DurationConverter for unit in DurationConverter.VALID_UNITS},
-    **{unit: ElectricCurrentConverter for unit in ElectricCurrentConverter.VALID_UNITS},
-    **{
-        unit: ElectricPotentialConverter
-        for unit in ElectricPotentialConverter.VALID_UNITS
-    },
-    **{unit: EnergyConverter for unit in EnergyConverter.VALID_UNITS},
-    **{unit: InformationConverter for unit in InformationConverter.VALID_UNITS},
-    **{unit: MassConverter for unit in MassConverter.VALID_UNITS},
-    **{unit: PowerConverter for unit in PowerConverter.VALID_UNITS},
-    **{unit: PressureConverter for unit in PressureConverter.VALID_UNITS},
-    **{unit: SpeedConverter for unit in SpeedConverter.VALID_UNITS},
-    **{unit: TemperatureConverter for unit in TemperatureConverter.VALID_UNITS},
-    **{unit: UnitlessRatioConverter for unit in UnitlessRatioConverter.VALID_UNITS},
-    **{unit: VolumeConverter for unit in VolumeConverter.VALID_UNITS},
-    **{unit: VolumeFlowRateConverter for unit in VolumeFlowRateConverter.VALID_UNITS},
+    **dict.fromkeys(AreaConverter.VALID_UNITS, AreaConverter),
+    **dict.fromkeys(
+        BloodGlucoseConcentrationConverter.VALID_UNITS,
+        BloodGlucoseConcentrationConverter,
+    ),
+    **dict.fromkeys(ConductivityConverter.VALID_UNITS, ConductivityConverter),
+    **dict.fromkeys(DataRateConverter.VALID_UNITS, DataRateConverter),
+    **dict.fromkeys(DistanceConverter.VALID_UNITS, DistanceConverter),
+    **dict.fromkeys(DurationConverter.VALID_UNITS, DurationConverter),
+    **dict.fromkeys(ElectricCurrentConverter.VALID_UNITS, ElectricCurrentConverter),
+    **dict.fromkeys(ElectricPotentialConverter.VALID_UNITS, ElectricPotentialConverter),
+    **dict.fromkeys(EnergyConverter.VALID_UNITS, EnergyConverter),
+    **dict.fromkeys(EnergyDistanceConverter.VALID_UNITS, EnergyDistanceConverter),
+    **dict.fromkeys(InformationConverter.VALID_UNITS, InformationConverter),
+    **dict.fromkeys(MassConverter.VALID_UNITS, MassConverter),
+    **dict.fromkeys(PowerConverter.VALID_UNITS, PowerConverter),
+    **dict.fromkeys(PressureConverter.VALID_UNITS, PressureConverter),
+    **dict.fromkeys(SpeedConverter.VALID_UNITS, SpeedConverter),
+    **dict.fromkeys(TemperatureConverter.VALID_UNITS, TemperatureConverter),
+    **dict.fromkeys(UnitlessRatioConverter.VALID_UNITS, UnitlessRatioConverter),
+    **dict.fromkeys(VolumeConverter.VALID_UNITS, VolumeConverter),
+    **dict.fromkeys(VolumeFlowRateConverter.VALID_UNITS, VolumeFlowRateConverter),
 }
 
 
@@ -178,6 +236,24 @@ def mean(values: list[float]) -> float | None:
     return sum(values) / len(values)
 
 
+DEG_TO_RAD = math.pi / 180
+RAD_TO_DEG = 180 / math.pi
+
+
+def weighted_circular_mean(values: Iterable[tuple[float, float]]) -> float:
+    """Return the weighted circular mean of the values."""
+    sin_sum = sum(math.sin(x * DEG_TO_RAD) * weight for x, weight in values)
+    cos_sum = sum(math.cos(x * DEG_TO_RAD) * weight for x, weight in values)
+    return (RAD_TO_DEG * math.atan2(sin_sum, cos_sum)) % 360
+
+
+def circular_mean(values: list[float]) -> float:
+    """Return the circular mean of the values."""
+    sin_sum = sum(math.sin(x * DEG_TO_RAD) for x in values)
+    cos_sum = sum(math.cos(x * DEG_TO_RAD) for x in values)
+    return (RAD_TO_DEG * math.atan2(sin_sum, cos_sum)) % 360
+
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -370,11 +446,19 @@ def _compile_hourly_statistics_summary_mean_stmt(
     start_time_ts: float, end_time_ts: float
 ) -> StatementLambdaElement:
     """Generate the summary mean statement for hourly statistics."""
+    # Due the fact that we support different mean type (See StatisticMeanType)
+    # we need to join here with the StatisticsMeta table to get the mean type
+    # and then use a case statement to compute the mean based on the mean type.
+    # As we use the StatisticsMeta.mean_type in the select case statement we need
+    # to group by it as well.
     return lambda_stmt(
         lambda: select(*QUERY_STATISTICS_SUMMARY_MEAN)
         .filter(StatisticsShortTerm.start_ts >= start_time_ts)
         .filter(StatisticsShortTerm.start_ts < end_time_ts)
-        .group_by(StatisticsShortTerm.metadata_id)
+        .join(
+            StatisticsMeta, and_(StatisticsShortTerm.metadata_id == StatisticsMeta.id)
+        )
+        .group_by(StatisticsShortTerm.metadata_id, StatisticsMeta.mean_type)
         .order_by(StatisticsShortTerm.metadata_id)
     )
 
@@ -416,10 +500,17 @@ def _compile_hourly_statistics(session: Session, start: datetime) -> None:
 
     if stats:
         for stat in stats:
-            metadata_id, _mean, _min, _max = stat
+            metadata_id, _min, _max, _mean, _mean_weight, _mean_type = stat
+            if (
+                try_parse_enum(StatisticMeanType, _mean_type)
+                is StatisticMeanType.CIRCULAR
+            ):
+                # Normalize the circular mean to be in the range [0, 360)
+                _mean = _mean % 360
             summary[metadata_id] = {
                 "start_ts": start_time_ts,
                 "mean": _mean,
+                "mean_weight": _mean_weight,
                 "min": _min,
                 "max": _max,
             }
@@ -559,7 +650,9 @@ def _compile_statistics(
     platform_stats: list[StatisticResult] = []
     current_metadata: dict[str, tuple[int, StatisticMetaData]] = {}
     # Collect statistics from all platforms implementing support
-    for domain, platform in instance.hass.data[DOMAIN].recorder_platforms.items():
+    for domain, platform in instance.hass.data[
+        DATA_RECORDER
+    ].recorder_platforms.items():
         if not (
             platform_compile_statistics := getattr(
                 platform, INTEGRATION_PLATFORM_COMPILE_STATISTICS, None
@@ -597,7 +690,7 @@ def _compile_statistics(
 
     if start.minute == 50:
         # Once every hour, update issues
-        for platform in instance.hass.data[DOMAIN].recorder_platforms.values():
+        for platform in instance.hass.data[DATA_RECORDER].recorder_platforms.values():
             if not (
                 platform_update_issues := getattr(
                     platform, INTEGRATION_PLATFORM_UPDATE_STATISTICS_ISSUES, None
@@ -823,7 +916,7 @@ def _statistic_by_id_from_metadata(
             "display_unit_of_measurement": get_display_unit(
                 hass, meta["statistic_id"], meta["unit_of_measurement"]
             ),
-            "has_mean": meta["has_mean"],
+            "mean_type": meta["mean_type"],
             "has_sum": meta["has_sum"],
             "name": meta["name"],
             "source": meta["source"],
@@ -842,7 +935,9 @@ def _flatten_list_statistic_ids_metadata_result(
         {
             "statistic_id": _id,
             "display_unit_of_measurement": info["display_unit_of_measurement"],
-            "has_mean": info["has_mean"],
+            "has_mean": info["mean_type"]
+            == StatisticMeanType.ARITHMETIC,  # Can be removed with 2026.4
+            "mean_type": info["mean_type"],
             "has_sum": info["has_sum"],
             "name": info.get("name"),
             "source": info["source"],
@@ -880,7 +975,7 @@ def list_statistic_ids(
         # the integrations for the missing ones.
         #
         # Query all integrations with a registered recorder platform
-        for platform in hass.data[DOMAIN].recorder_platforms.values():
+        for platform in hass.data[DATA_RECORDER].recorder_platforms.values():
             if not (
                 platform_list_statistic_ids := getattr(
                     platform, INTEGRATION_PLATFORM_LIST_STATISTIC_IDS, None
@@ -897,7 +992,7 @@ def list_statistic_ids(
                     continue
                 result[key] = {
                     "display_unit_of_measurement": meta["unit_of_measurement"],
-                    "has_mean": meta["has_mean"],
+                    "mean_type": meta["mean_type"],
                     "has_sum": meta["has_sum"],
                     "name": meta["name"],
                     "source": meta["source"],
@@ -915,6 +1010,7 @@ def _reduce_statistics(
     period_start_end: Callable[[float], tuple[float, float]],
     period: timedelta,
     types: set[Literal["last_reset", "max", "mean", "min", "state", "sum"]],
+    metadata: dict[str, tuple[int, StatisticMetaData]],
 ) -> dict[str, list[StatisticsRow]]:
     """Reduce hourly statistics to daily or monthly statistics."""
     result: dict[str, list[StatisticsRow]] = defaultdict(list)
@@ -942,7 +1038,13 @@ def _reduce_statistics(
                     "end": end,
                 }
                 if _want_mean:
-                    row["mean"] = mean(mean_values) if mean_values else None
+                    row["mean"] = None
+                    if mean_values:
+                        match metadata[statistic_id][1]["mean_type"]:
+                            case StatisticMeanType.ARITHMETIC:
+                                row["mean"] = mean(mean_values)
+                            case StatisticMeanType.CIRCULAR:
+                                row["mean"] = circular_mean(mean_values)
                     mean_values.clear()
                 if _want_min:
                     row["min"] = min(min_values) if min_values else None
@@ -959,8 +1061,9 @@ def _reduce_statistics(
                 result[statistic_id].append(row)
             if _want_max and (_max := statistic.get("max")) is not None:
                 max_values.append(_max)
-            if _want_mean and (_mean := statistic.get("mean")) is not None:
-                mean_values.append(_mean)
+            if _want_mean:
+                if (_mean := statistic.get("mean")) is not None:
+                    mean_values.append(_mean)
             if _want_min and (_min := statistic.get("min")) is not None:
                 min_values.append(_min)
             prev_stat = statistic
@@ -1007,11 +1110,12 @@ def reduce_day_ts_factory() -> tuple[
 def _reduce_statistics_per_day(
     stats: dict[str, list[StatisticsRow]],
     types: set[Literal["last_reset", "max", "mean", "min", "state", "sum"]],
+    metadata: dict[str, tuple[int, StatisticMetaData]],
 ) -> dict[str, list[StatisticsRow]]:
     """Reduce hourly statistics to daily statistics."""
     _same_day_ts, _day_start_end_ts = reduce_day_ts_factory()
     return _reduce_statistics(
-        stats, _same_day_ts, _day_start_end_ts, timedelta(days=1), types
+        stats, _same_day_ts, _day_start_end_ts, timedelta(days=1), types, metadata
     )
 
 
@@ -1055,11 +1159,12 @@ def reduce_week_ts_factory() -> tuple[
 def _reduce_statistics_per_week(
     stats: dict[str, list[StatisticsRow]],
     types: set[Literal["last_reset", "max", "mean", "min", "state", "sum"]],
+    metadata: dict[str, tuple[int, StatisticMetaData]],
 ) -> dict[str, list[StatisticsRow]]:
     """Reduce hourly statistics to weekly statistics."""
     _same_week_ts, _week_start_end_ts = reduce_week_ts_factory()
     return _reduce_statistics(
-        stats, _same_week_ts, _week_start_end_ts, timedelta(days=7), types
+        stats, _same_week_ts, _week_start_end_ts, timedelta(days=7), types, metadata
     )
 
 
@@ -1108,11 +1213,12 @@ def reduce_month_ts_factory() -> tuple[
 def _reduce_statistics_per_month(
     stats: dict[str, list[StatisticsRow]],
     types: set[Literal["last_reset", "max", "mean", "min", "state", "sum"]],
+    metadata: dict[str, tuple[int, StatisticMetaData]],
 ) -> dict[str, list[StatisticsRow]]:
     """Reduce hourly statistics to monthly statistics."""
     _same_month_ts, _month_start_end_ts = reduce_month_ts_factory()
     return _reduce_statistics(
-        stats, _same_month_ts, _month_start_end_ts, timedelta(days=31), types
+        stats, _same_month_ts, _month_start_end_ts, timedelta(days=31), types, metadata
     )
 
 
@@ -1156,27 +1262,41 @@ def _generate_max_mean_min_statistic_in_sub_period_stmt(
     return stmt
 
 
+class _MaxMinMeanStatisticSubPeriod(TypedDict, total=False):
+    max: float
+    mean_acc: float
+    min: float
+    duration: float
+    circular_means: Required[list[tuple[float, float]]]
+
+
 def _get_max_mean_min_statistic_in_sub_period(
     session: Session,
-    result: dict[str, float],
+    result: _MaxMinMeanStatisticSubPeriod,
     start_time: datetime | None,
     end_time: datetime | None,
     table: type[StatisticsBase],
     types: set[Literal["max", "mean", "min", "change"]],
-    metadata_id: int,
+    metadata: tuple[int, StatisticMetaData],
 ) -> None:
     """Return max, mean and min during the period."""
     # Calculate max, mean, min
+    mean_type = metadata[1]["mean_type"]
     columns = select()
     if "max" in types:
         columns = columns.add_columns(func.max(table.max))
     if "mean" in types:
-        columns = columns.add_columns(func.avg(table.mean))
-        columns = columns.add_columns(func.count(table.mean))
+        match mean_type:
+            case StatisticMeanType.ARITHMETIC:
+                columns = columns.add_columns(func.avg(table.mean))
+                columns = columns.add_columns(func.count(table.mean))
+            case StatisticMeanType.CIRCULAR:
+                columns = columns.add_columns(*query_circular_mean(table))
     if "min" in types:
         columns = columns.add_columns(func.min(table.min))
+
     stmt = _generate_max_mean_min_statistic_in_sub_period_stmt(
-        columns, start_time, end_time, table, metadata_id
+        columns, start_time, end_time, table, metadata[0]
     )
     stats = cast(Sequence[Row[Any]], execute_stmt_lambda_element(session, stmt))
     if not stats:
@@ -1184,11 +1304,21 @@ def _get_max_mean_min_statistic_in_sub_period(
     if "max" in types and (new_max := stats[0].max) is not None:
         old_max = result.get("max")
         result["max"] = max(new_max, old_max) if old_max is not None else new_max
-    if "mean" in types and stats[0].avg is not None:
+    if "mean" in types:
         # https://github.com/sqlalchemy/sqlalchemy/issues/9127
-        duration = stats[0].count * table.duration.total_seconds()  # type: ignore[operator]
-        result["duration"] = result.get("duration", 0.0) + duration
-        result["mean_acc"] = result.get("mean_acc", 0.0) + stats[0].avg * duration
+        match mean_type:
+            case StatisticMeanType.ARITHMETIC:
+                duration = stats[0].count * table.duration.total_seconds()  # type: ignore[operator]
+                if stats[0].avg is not None:
+                    result["duration"] = result.get("duration", 0.0) + duration
+                    result["mean_acc"] = (
+                        result.get("mean_acc", 0.0) + stats[0].avg * duration
+                    )
+            case StatisticMeanType.CIRCULAR:
+                if (new_circular_mean := stats[0].mean) is not None and (
+                    weight := stats[0].mean_weight
+                ) is not None:
+                    result["circular_means"].append((new_circular_mean, weight))
     if "min" in types and (new_min := stats[0].min) is not None:
         old_min = result.get("min")
         result["min"] = min(new_min, old_min) if old_min is not None else new_min
@@ -1203,15 +1333,15 @@ def _get_max_mean_min_statistic(
     tail_start_time: datetime | None,
     tail_end_time: datetime | None,
     tail_only: bool,
-    metadata_id: int,
+    metadata: tuple[int, StatisticMetaData],
     types: set[Literal["max", "mean", "min", "change"]],
 ) -> dict[str, float | None]:
     """Return max, mean and min during the period.
 
-    The mean is a time weighted average, combining hourly and 5-minute statistics if
+    The mean is time weighted, combining hourly and 5-minute statistics if
     necessary.
     """
-    max_mean_min: dict[str, float] = {}
+    max_mean_min = _MaxMinMeanStatisticSubPeriod(circular_means=[])
     result: dict[str, float | None] = {}
 
     if tail_start_time is not None:
@@ -1223,7 +1353,7 @@ def _get_max_mean_min_statistic(
             tail_end_time,
             StatisticsShortTerm,
             types,
-            metadata_id,
+            metadata,
         )
 
     if not tail_only:
@@ -1234,7 +1364,7 @@ def _get_max_mean_min_statistic(
             main_end_time,
             Statistics,
             types,
-            metadata_id,
+            metadata,
         )
 
     if head_start_time is not None:
@@ -1245,16 +1375,23 @@ def _get_max_mean_min_statistic(
             head_end_time,
             StatisticsShortTerm,
             types,
-            metadata_id,
+            metadata,
         )
 
     if "max" in types:
         result["max"] = max_mean_min.get("max")
     if "mean" in types:
-        if "mean_acc" not in max_mean_min:
-            result["mean"] = None
-        else:
-            result["mean"] = max_mean_min["mean_acc"] / max_mean_min["duration"]
+        mean_value = None
+        match metadata[1]["mean_type"]:
+            case StatisticMeanType.CIRCULAR:
+                if circular_means := max_mean_min["circular_means"]:
+                    mean_value = weighted_circular_mean(circular_means)
+            case StatisticMeanType.ARITHMETIC:
+                if (mean_value := max_mean_min.get("mean_acc")) is not None and (
+                    duration := max_mean_min.get("duration")
+                ) is not None:
+                    mean_value = mean_value / duration
+        result["mean"] = mean_value
     if "min" in types:
         result["min"] = max_mean_min.get("min")
     return result
@@ -1555,7 +1692,7 @@ def statistic_during_period(
                 tail_start_time,
                 tail_end_time,
                 tail_only,
-                metadata_id,
+                metadata,
                 types,
             )
 
@@ -1638,7 +1775,7 @@ def _extract_metadata_and_discard_impossible_columns(
     has_sum = False
     for metadata_id, stats_metadata in metadata.values():
         metadata_ids.append(metadata_id)
-        has_mean |= stats_metadata["has_mean"]
+        has_mean |= stats_metadata["mean_type"] is not StatisticMeanType.NONE
         has_sum |= stats_metadata["has_sum"]
     if not has_mean:
         types.discard("mean")
@@ -1664,6 +1801,7 @@ def _augment_result_with_change(
     drop_sum = "sum" not in _types
     prev_sums = {}
     if tmp := _statistics_at_time(
+        get_instance(hass),
         session,
         {metadata[statistic_id][0] for statistic_id in result},
         table,
@@ -1793,13 +1931,13 @@ def _statistics_during_period_with_session(
     )
 
     if period == "day":
-        result = _reduce_statistics_per_day(result, types)
+        result = _reduce_statistics_per_day(result, types, metadata)
 
     if period == "week":
-        result = _reduce_statistics_per_week(result, types)
+        result = _reduce_statistics_per_week(result, types, metadata)
 
     if period == "month":
-        result = _reduce_statistics_per_month(result, types)
+        result = _reduce_statistics_per_month(result, types, metadata)
 
     if "change" in _types:
         _augment_result_with_change(
@@ -2022,7 +2160,39 @@ def get_latest_short_term_statistics_with_session(
     )
 
 
-def _generate_statistics_at_time_stmt(
+def _generate_statistics_at_time_stmt_group_by(
+    table: type[StatisticsBase],
+    metadata_ids: set[int],
+    start_time_ts: float,
+    types: set[Literal["last_reset", "max", "mean", "min", "state", "sum"]],
+) -> StatementLambdaElement:
+    """Create the statement for finding the statistics for a given time."""
+    # Simple group-by for MySQL, must use less
+    # than 1000 metadata_ids in the IN clause for MySQL
+    # or it will optimize poorly. Callers are responsible
+    # for ensuring that the number of metadata_ids is less
+    # than 1000.
+    return _generate_select_columns_for_types_stmt(table, types) + (
+        lambda q: q.join(
+            most_recent_statistic_ids := (
+                select(
+                    func.max(table.start_ts).label("max_start_ts"),
+                    table.metadata_id.label("max_metadata_id"),
+                )
+                .filter(table.start_ts < start_time_ts)
+                .filter(table.metadata_id.in_(metadata_ids))
+                .group_by(table.metadata_id)
+                .subquery()
+            ),
+            and_(
+                table.start_ts == most_recent_statistic_ids.c.max_start_ts,
+                table.metadata_id == most_recent_statistic_ids.c.max_metadata_id,
+            ),
+        )
+    )
+
+
+def _generate_statistics_at_time_stmt_dependent_sub_query(
     table: type[StatisticsBase],
     metadata_ids: set[int],
     start_time_ts: float,
@@ -2036,8 +2206,7 @@ def _generate_statistics_at_time_stmt(
     # databases. Since all databases support this query as a join
     # condition we can use it as a subquery to get the last start_time_ts
     # before a specific point in time for all entities.
-    stmt = _generate_select_columns_for_types_stmt(table, types)
-    stmt += (
+    return _generate_select_columns_for_types_stmt(table, types) + (
         lambda q: q.select_from(StatisticsMeta)
         .join(
             table,
@@ -2059,10 +2228,10 @@ def _generate_statistics_at_time_stmt(
         )
         .where(table.metadata_id.in_(metadata_ids))
     )
-    return stmt
 
 
 def _statistics_at_time(
+    instance: Recorder,
     session: Session,
     metadata_ids: set[int],
     table: type[StatisticsBase],
@@ -2071,8 +2240,41 @@ def _statistics_at_time(
 ) -> Sequence[Row] | None:
     """Return last known statistics, earlier than start_time, for the metadata_ids."""
     start_time_ts = start_time.timestamp()
-    stmt = _generate_statistics_at_time_stmt(table, metadata_ids, start_time_ts, types)
-    return cast(Sequence[Row], execute_stmt_lambda_element(session, stmt))
+    if TYPE_CHECKING:
+        assert instance.database_engine is not None
+    if not instance.database_engine.optimizer.slow_dependent_subquery:
+        stmt = _generate_statistics_at_time_stmt_dependent_sub_query(
+            table=table,
+            metadata_ids=metadata_ids,
+            start_time_ts=start_time_ts,
+            types=types,
+        )
+        return cast(list[Row], execute_stmt_lambda_element(session, stmt))
+    rows: list[Row] = []
+    # https://github.com/home-assistant/core/issues/132865
+    # If we include the start time state we need to limit the
+    # number of metadata_ids we query for at a time to avoid
+    # hitting limits in the MySQL optimizer that prevent
+    # the start time state query from using an index-only optimization
+    # to find the start time state.
+    for metadata_ids_chunk in chunked_or_all(
+        metadata_ids, MAX_IDS_FOR_INDEXED_GROUP_BY
+    ):
+        stmt = _generate_statistics_at_time_stmt_group_by(
+            table=table,
+            metadata_ids=metadata_ids_chunk,
+            start_time_ts=start_time_ts,
+            types=types,
+        )
+        row_chunk = cast(list[Row], execute_stmt_lambda_element(session, stmt))
+        if rows:
+            rows += row_chunk
+        else:
+            # If we have no rows yet, we can just assign the chunk
+            # as this is the common case since its rare that
+            # we exceed the MAX_IDS_FOR_INDEXED_GROUP_BY limit
+            rows = row_chunk
+    return rows
 
 
 def _build_sum_converted_stats(
@@ -2230,7 +2432,7 @@ def _sorted_statistics_to_dict(
 def validate_statistics(hass: HomeAssistant) -> dict[str, list[ValidationIssue]]:
     """Validate statistics."""
     platform_validation: dict[str, list[ValidationIssue]] = {}
-    for platform in hass.data[DOMAIN].recorder_platforms.values():
+    for platform in hass.data[DATA_RECORDER].recorder_platforms.values():
         if platform_validate_statistics := getattr(
             platform, INTEGRATION_PLATFORM_VALIDATE_STATISTICS, None
         ):
@@ -2241,7 +2443,7 @@ def validate_statistics(hass: HomeAssistant) -> dict[str, list[ValidationIssue]]
 def update_statistics_issues(hass: HomeAssistant) -> None:
     """Update statistics issues."""
     with session_scope(hass=hass, read_only=True) as session:
-        for platform in hass.data[DOMAIN].recorder_platforms.values():
+        for platform in hass.data[DATA_RECORDER].recorder_platforms.values():
             if platform_update_statistics_issues := getattr(
                 platform, INTEGRATION_PLATFORM_UPDATE_STATISTICS_ISSUES, None
             ):
diff --git a/homeassistant/components/recorder/strings.json b/homeassistant/components/recorder/strings.json
index 43c2ecdc14f..0c8d47548bf 100644
--- a/homeassistant/components/recorder/strings.json
+++ b/homeassistant/components/recorder/strings.json
@@ -43,15 +43,15 @@
       "fields": {
         "entity_id": {
           "name": "Entities to remove",
-          "description": "List of entities for which the data is to be removed from the recorder database."
+          "description": "List of entities for which the data is to be removed from the Recorder database."
         },
         "domains": {
           "name": "Domains to remove",
-          "description": "List of domains for which the data needs to be removed from the recorder database."
+          "description": "List of domains for which the data needs to be removed from the Recorder database."
         },
         "entity_globs": {
           "name": "Entity globs to remove",
-          "description": "List of glob patterns used to select the entities for which the data is to be removed from the recorder database."
+          "description": "List of glob patterns used to select the entities for which the data is to be removed from the Recorder database."
         },
         "keep_days": {
           "name": "[%key:component::recorder::services::purge::fields::keep_days::name%]",
diff --git a/homeassistant/components/recorder/table_managers/recorder_runs.py b/homeassistant/components/recorder/table_managers/recorder_runs.py
index 4ca0aa18b88..191fa44c194 100644
--- a/homeassistant/components/recorder/table_managers/recorder_runs.py
+++ b/homeassistant/components/recorder/table_managers/recorder_runs.py
@@ -6,7 +6,7 @@ from datetime import datetime
 
 from sqlalchemy.orm.session import Session
 
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from ..db_schema import RecorderRuns
 
diff --git a/homeassistant/components/recorder/table_managers/statistics_meta.py b/homeassistant/components/recorder/table_managers/statistics_meta.py
index 77fc34518db..634e9565c12 100644
--- a/homeassistant/components/recorder/table_managers/statistics_meta.py
+++ b/homeassistant/components/recorder/table_managers/statistics_meta.py
@@ -4,16 +4,18 @@ from __future__ import annotations
 
 import logging
 import threading
-from typing import TYPE_CHECKING, Final, Literal
+from typing import TYPE_CHECKING, Any, Final, Literal
 
 from lru import LRU
 from sqlalchemy import lambda_stmt, select
+from sqlalchemy.orm import InstrumentedAttribute
 from sqlalchemy.orm.session import Session
 from sqlalchemy.sql.expression import true
 from sqlalchemy.sql.lambdas import StatementLambdaElement
 
+from ..const import CIRCULAR_MEAN_SCHEMA_VERSION
 from ..db_schema import StatisticsMeta
-from ..models import StatisticMetaData
+from ..models import StatisticMeanType, StatisticMetaData
 from ..util import execute_stmt_lambda_element
 
 if TYPE_CHECKING:
@@ -28,7 +30,6 @@ QUERY_STATISTIC_META = (
     StatisticsMeta.statistic_id,
     StatisticsMeta.source,
     StatisticsMeta.unit_of_measurement,
-    StatisticsMeta.has_mean,
     StatisticsMeta.has_sum,
     StatisticsMeta.name,
 )
@@ -37,24 +38,38 @@ INDEX_ID: Final = 0
 INDEX_STATISTIC_ID: Final = 1
 INDEX_SOURCE: Final = 2
 INDEX_UNIT_OF_MEASUREMENT: Final = 3
-INDEX_HAS_MEAN: Final = 4
-INDEX_HAS_SUM: Final = 5
-INDEX_NAME: Final = 6
+INDEX_HAS_SUM: Final = 4
+INDEX_NAME: Final = 5
+INDEX_MEAN_TYPE: Final = 6
 
 
 def _generate_get_metadata_stmt(
     statistic_ids: set[str] | None = None,
     statistic_type: Literal["mean", "sum"] | None = None,
     statistic_source: str | None = None,
+    schema_version: int = 0,
 ) -> StatementLambdaElement:
-    """Generate a statement to fetch metadata."""
-    stmt = lambda_stmt(lambda: select(*QUERY_STATISTIC_META))
+    """Generate a statement to fetch metadata with the passed filters.
+
+    Depending on the schema version, either mean_type (added in version 49) or has_mean column is used.
+    """
+    columns: list[InstrumentedAttribute[Any]] = list(QUERY_STATISTIC_META)
+    if schema_version >= CIRCULAR_MEAN_SCHEMA_VERSION:
+        columns.append(StatisticsMeta.mean_type)
+    else:
+        columns.append(StatisticsMeta.has_mean)
+    stmt = lambda_stmt(lambda: select(*columns))
     if statistic_ids:
         stmt += lambda q: q.where(StatisticsMeta.statistic_id.in_(statistic_ids))
     if statistic_source is not None:
         stmt += lambda q: q.where(StatisticsMeta.source == statistic_source)
     if statistic_type == "mean":
-        stmt += lambda q: q.where(StatisticsMeta.has_mean == true())
+        if schema_version >= CIRCULAR_MEAN_SCHEMA_VERSION:
+            stmt += lambda q: q.where(
+                StatisticsMeta.mean_type != StatisticMeanType.NONE
+            )
+        else:
+            stmt += lambda q: q.where(StatisticsMeta.has_mean == true())
     elif statistic_type == "sum":
         stmt += lambda q: q.where(StatisticsMeta.has_sum == true())
     return stmt
@@ -100,14 +115,34 @@ class StatisticsMetaManager:
             for row in execute_stmt_lambda_element(
                 session,
                 _generate_get_metadata_stmt(
-                    statistic_ids, statistic_type, statistic_source
+                    statistic_ids,
+                    statistic_type,
+                    statistic_source,
+                    self.recorder.schema_version,
                 ),
                 orm_rows=False,
             ):
                 statistic_id = row[INDEX_STATISTIC_ID]
                 row_id = row[INDEX_ID]
+                if self.recorder.schema_version >= CIRCULAR_MEAN_SCHEMA_VERSION:
+                    try:
+                        mean_type = StatisticMeanType(row[INDEX_MEAN_TYPE])
+                    except ValueError:
+                        _LOGGER.warning(
+                            "Invalid mean type found for statistic_id: %s, mean_type: %s. Skipping",
+                            statistic_id,
+                            row[INDEX_MEAN_TYPE],
+                        )
+                        continue
+                else:
+                    mean_type = (
+                        StatisticMeanType.ARITHMETIC
+                        if row[INDEX_MEAN_TYPE]
+                        else StatisticMeanType.NONE
+                    )
                 meta = {
-                    "has_mean": row[INDEX_HAS_MEAN],
+                    "has_mean": mean_type is StatisticMeanType.ARITHMETIC,
+                    "mean_type": mean_type,
                     "has_sum": row[INDEX_HAS_SUM],
                     "name": row[INDEX_NAME],
                     "source": row[INDEX_SOURCE],
@@ -157,9 +192,18 @@ class StatisticsMetaManager:
         This call is not thread-safe and must be called from the
         recorder thread.
         """
+        if "mean_type" not in new_metadata:
+            # To maintain backward compatibility after adding 'mean_type' in schema version 49,
+            # we must still check for its presence. Even though type hints suggest it should always exist,
+            # custom integrations might omit it, so we need to guard against that.
+            new_metadata["mean_type"] = (  # type: ignore[unreachable]
+                StatisticMeanType.ARITHMETIC
+                if new_metadata["has_mean"]
+                else StatisticMeanType.NONE
+            )
         metadata_id, old_metadata = old_metadata_dict[statistic_id]
         if not (
-            old_metadata["has_mean"] != new_metadata["has_mean"]
+            old_metadata["mean_type"] != new_metadata["mean_type"]
             or old_metadata["has_sum"] != new_metadata["has_sum"]
             or old_metadata["name"] != new_metadata["name"]
             or old_metadata["unit_of_measurement"]
@@ -170,7 +214,7 @@ class StatisticsMetaManager:
         self._assert_in_recorder_thread()
         session.query(StatisticsMeta).filter_by(statistic_id=statistic_id).update(
             {
-                StatisticsMeta.has_mean: new_metadata["has_mean"],
+                StatisticsMeta.mean_type: new_metadata["mean_type"],
                 StatisticsMeta.has_sum: new_metadata["has_sum"],
                 StatisticsMeta.name: new_metadata["name"],
                 StatisticsMeta.unit_of_measurement: new_metadata["unit_of_measurement"],
diff --git a/homeassistant/components/recorder/tasks.py b/homeassistant/components/recorder/tasks.py
index fa10c12aa68..4eb9547ee9d 100644
--- a/homeassistant/components/recorder/tasks.py
+++ b/homeassistant/components/recorder/tasks.py
@@ -11,11 +11,11 @@ import logging
 import threading
 from typing import TYPE_CHECKING, Any
 
+from homeassistant.helpers.recorder import DATA_RECORDER
 from homeassistant.helpers.typing import UndefinedType
 from homeassistant.util.event_type import EventType
 
 from . import entity_registry, purge, statistics
-from .const import DOMAIN
 from .db_schema import Statistics, StatisticsShortTerm
 from .models import StatisticData, StatisticMetaData
 from .util import periodic_db_cleanups, session_scope
@@ -308,7 +308,7 @@ class AddRecorderPlatformTask(RecorderTask):
         hass = instance.hass
         domain = self.domain
         platform = self.platform
-        platforms: dict[str, Any] = hass.data[DOMAIN].recorder_platforms
+        platforms: dict[str, Any] = hass.data[DATA_RECORDER].recorder_platforms
         platforms[domain] = platform
 
 
diff --git a/homeassistant/components/recorder/util.py b/homeassistant/components/recorder/util.py
index a1f8d90953c..0acaf0aa68f 100644
--- a/homeassistant/components/recorder/util.py
+++ b/homeassistant/components/recorder/util.py
@@ -34,7 +34,7 @@ from homeassistant.helpers.recorder import (  # noqa: F401
     get_instance,
     session_scope,
 )
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import DEFAULT_MAX_BIND_VARS, DOMAIN, SQLITE_URL_PREFIX, SupportedDialect
 from .db_schema import (
@@ -464,6 +464,7 @@ def setup_connection_for_dialect(
     """Execute statements needed for dialect connection."""
     version: AwesomeVersion | None = None
     slow_range_in_select = False
+    slow_dependent_subquery = False
     if dialect_name == SupportedDialect.SQLITE:
         if first_connection:
             old_isolation = dbapi_connection.isolation_level  # type: ignore[attr-defined]
@@ -505,9 +506,8 @@ def setup_connection_for_dialect(
             result = query_on_connection(dbapi_connection, "SELECT VERSION()")
             version_string = result[0][0]
             version = _extract_version_from_server_response(version_string)
-            is_maria_db = "mariadb" in version_string.lower()
 
-            if is_maria_db:
+            if "mariadb" in version_string.lower():
                 if not version or version < MIN_VERSION_MARIA_DB:
                     _raise_if_version_unsupported(
                         version or version_string, "MariaDB", MIN_VERSION_MARIA_DB
@@ -523,19 +523,21 @@ def setup_connection_for_dialect(
                         instance.hass,
                         version,
                     )
-
+                slow_range_in_select = bool(
+                    not version
+                    or version < MARIADB_WITH_FIXED_IN_QUERIES_105
+                    or MARIA_DB_106 <= version < MARIADB_WITH_FIXED_IN_QUERIES_106
+                    or MARIA_DB_107 <= version < MARIADB_WITH_FIXED_IN_QUERIES_107
+                    or MARIA_DB_108 <= version < MARIADB_WITH_FIXED_IN_QUERIES_108
+                )
             elif not version or version < MIN_VERSION_MYSQL:
                 _raise_if_version_unsupported(
                     version or version_string, "MySQL", MIN_VERSION_MYSQL
                 )
-
-            slow_range_in_select = bool(
-                not version
-                or version < MARIADB_WITH_FIXED_IN_QUERIES_105
-                or MARIA_DB_106 <= version < MARIADB_WITH_FIXED_IN_QUERIES_106
-                or MARIA_DB_107 <= version < MARIADB_WITH_FIXED_IN_QUERIES_107
-                or MARIA_DB_108 <= version < MARIADB_WITH_FIXED_IN_QUERIES_108
-            )
+            else:
+                # MySQL
+                # https://github.com/home-assistant/core/issues/137178
+                slow_dependent_subquery = True
 
         # Ensure all times are using UTC to avoid issues with daylight savings
         execute_on_connection(dbapi_connection, "SET time_zone = '+00:00'")
@@ -565,7 +567,10 @@ def setup_connection_for_dialect(
     return DatabaseEngine(
         dialect=SupportedDialect(dialect_name),
         version=version,
-        optimizer=DatabaseOptimizer(slow_range_in_select=slow_range_in_select),
+        optimizer=DatabaseOptimizer(
+            slow_range_in_select=slow_range_in_select,
+            slow_dependent_subquery=slow_dependent_subquery,
+        ),
         max_bind_vars=DEFAULT_MAX_BIND_VARS,
     )
 
diff --git a/homeassistant/components/recorder/websocket_api.py b/homeassistant/components/recorder/websocket_api.py
index ee5c5dd6d75..f4058943971 100644
--- a/homeassistant/components/recorder/websocket_api.py
+++ b/homeassistant/components/recorder/websocket_api.py
@@ -25,6 +25,7 @@ from homeassistant.util.unit_conversion import (
     ElectricCurrentConverter,
     ElectricPotentialConverter,
     EnergyConverter,
+    EnergyDistanceConverter,
     InformationConverter,
     MassConverter,
     PowerConverter,
@@ -36,7 +37,7 @@ from homeassistant.util.unit_conversion import (
     VolumeFlowRateConverter,
 )
 
-from .models import StatisticPeriod
+from .models import StatisticMeanType, StatisticPeriod
 from .statistics import (
     STATISTIC_UNIT_TO_UNIT_CONVERTER,
     async_add_external_statistics,
@@ -67,6 +68,7 @@ UNIT_SCHEMA = vol.Schema(
         vol.Optional("electric_current"): vol.In(ElectricCurrentConverter.VALID_UNITS),
         vol.Optional("voltage"): vol.In(ElectricPotentialConverter.VALID_UNITS),
         vol.Optional("energy"): vol.In(EnergyConverter.VALID_UNITS),
+        vol.Optional("energy_distance"): vol.In(EnergyDistanceConverter.VALID_UNITS),
         vol.Optional("information"): vol.In(InformationConverter.VALID_UNITS),
         vol.Optional("mass"): vol.In(MassConverter.VALID_UNITS),
         vol.Optional("power"): vol.In(PowerConverter.VALID_UNITS),
@@ -295,13 +297,13 @@ async def ws_list_statistic_ids(
 async def ws_validate_statistics(
     hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict[str, Any]
 ) -> None:
-    """Fetch a list of available statistic_id."""
+    """Validate statistics and return issues found."""
     instance = get_instance(hass)
-    statistic_ids = await instance.async_add_executor_job(
+    validation_issues = await instance.async_add_executor_job(
         validate_statistics,
         hass,
     )
-    connection.send_result(msg["id"], statistic_ids)
+    connection.send_result(msg["id"], validation_issues)
 
 
 @websocket_api.websocket_command(
@@ -530,6 +532,10 @@ def ws_import_statistics(
 ) -> None:
     """Import statistics."""
     metadata = msg["metadata"]
+    # The WS command will be changed in a follow up PR
+    metadata["mean_type"] = (
+        StatisticMeanType.ARITHMETIC if metadata["has_mean"] else StatisticMeanType.NONE
+    )
     stats = msg["stats"]
 
     if valid_entity_id(metadata["statistic_id"]):
diff --git a/homeassistant/components/recswitch/switch.py b/homeassistant/components/recswitch/switch.py
index 78fc0a805f6..f5b566ce59d 100644
--- a/homeassistant/components/recswitch/switch.py
+++ b/homeassistant/components/recswitch/switch.py
@@ -14,7 +14,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/reddit/sensor.py b/homeassistant/components/reddit/sensor.py
index 35962ac091b..564cc6c3c06 100644
--- a/homeassistant/components/reddit/sensor.py
+++ b/homeassistant/components/reddit/sensor.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     CONF_USERNAME,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/refoss/__init__.py b/homeassistant/components/refoss/__init__.py
index 0f0c852b043..eb2085efda4 100644
--- a/homeassistant/components/refoss/__init__.py
+++ b/homeassistant/components/refoss/__init__.py
@@ -24,7 +24,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Refoss from a config entry."""
     hass.data.setdefault(DOMAIN, {})
     discover = await refoss_discovery_server(hass)
-    refoss_discovery = DiscoveryService(hass, discover)
+    refoss_discovery = DiscoveryService(hass, entry, discover)
     hass.data[DOMAIN][DATA_DISCOVERY_SERVICE] = refoss_discovery
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
diff --git a/homeassistant/components/refoss/bridge.py b/homeassistant/components/refoss/bridge.py
index 11e92620fbb..a3ba9ea663d 100644
--- a/homeassistant/components/refoss/bridge.py
+++ b/homeassistant/components/refoss/bridge.py
@@ -6,6 +6,7 @@ from refoss_ha.device import DeviceInfo
 from refoss_ha.device_manager import async_build_base_device
 from refoss_ha.discovery import Discovery, Listener
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 
@@ -16,9 +17,12 @@ from .coordinator import RefossDataUpdateCoordinator
 class DiscoveryService(Listener):
     """Discovery event handler for refoss devices."""
 
-    def __init__(self, hass: HomeAssistant, discovery: Discovery) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, discovery: Discovery
+    ) -> None:
         """Init discovery service."""
         self.hass = hass
+        self.config_entry = config_entry
 
         self.discovery = discovery
         self.discovery.add_listener(self)
@@ -32,7 +36,7 @@ class DiscoveryService(Listener):
         if device is None:
             return
 
-        coordo = RefossDataUpdateCoordinator(self.hass, device)
+        coordo = RefossDataUpdateCoordinator(self.hass, self.config_entry, device)
         self.hass.data[DOMAIN][COORDINATORS].append(coordo)
         await coordo.async_refresh()
 
diff --git a/homeassistant/components/refoss/coordinator.py b/homeassistant/components/refoss/coordinator.py
index 929d1b3962b..381f64614b5 100644
--- a/homeassistant/components/refoss/coordinator.py
+++ b/homeassistant/components/refoss/coordinator.py
@@ -7,6 +7,7 @@ from datetime import timedelta
 from refoss_ha.controller.device import BaseDevice
 from refoss_ha.exceptions import DeviceTimeoutError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -16,11 +17,16 @@ from .const import _LOGGER, DOMAIN, MAX_ERRORS
 class RefossDataUpdateCoordinator(DataUpdateCoordinator[None]):
     """Manages polling for state changes from the device."""
 
-    def __init__(self, hass: HomeAssistant, device: BaseDevice) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, device: BaseDevice
+    ) -> None:
         """Initialize the data update coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=f"{DOMAIN}-{device.device_info.dev_name}",
             update_interval=timedelta(seconds=15),
         )
diff --git a/homeassistant/components/refoss/sensor.py b/homeassistant/components/refoss/sensor.py
index 7065470657f..92090a192e8 100644
--- a/homeassistant/components/refoss/sensor.py
+++ b/homeassistant/components/refoss/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .bridge import RefossDataUpdateCoordinator
@@ -94,7 +94,7 @@ SENSORS: dict[str, tuple[RefossSensorEntityDescription, ...]] = {
             key="energy",
             translation_key="this_month_energy",
             device_class=SensorDeviceClass.ENERGY,
-            state_class=SensorStateClass.TOTAL,
+            state_class=SensorStateClass.TOTAL_INCREASING,
             native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
             suggested_display_precision=2,
             subkey="mConsume",
@@ -104,7 +104,7 @@ SENSORS: dict[str, tuple[RefossSensorEntityDescription, ...]] = {
             key="energy_returned",
             translation_key="this_month_energy_returned",
             device_class=SensorDeviceClass.ENERGY,
-            state_class=SensorStateClass.TOTAL,
+            state_class=SensorStateClass.TOTAL_INCREASING,
             native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
             suggested_display_precision=2,
             subkey="mConsume",
@@ -117,7 +117,7 @@ SENSORS: dict[str, tuple[RefossSensorEntityDescription, ...]] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Refoss device from a config entry."""
 
diff --git a/homeassistant/components/refoss/switch.py b/homeassistant/components/refoss/switch.py
index aed132ecc3a..1d465f7f319 100644
--- a/homeassistant/components/refoss/switch.py
+++ b/homeassistant/components/refoss/switch.py
@@ -10,7 +10,7 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .bridge import RefossDataUpdateCoordinator
 from .const import _LOGGER, COORDINATORS, DISPATCH_DEVICE_DISCOVERED, DOMAIN
@@ -20,7 +20,7 @@ from .entity import RefossEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Refoss device from a config entry."""
 
diff --git a/homeassistant/components/rejseplanen/sensor.py b/homeassistant/components/rejseplanen/sensor.py
index 40b27014211..1d9b281e9b7 100644
--- a/homeassistant/components/rejseplanen/sensor.py
+++ b/homeassistant/components/rejseplanen/sensor.py
@@ -20,10 +20,10 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_NAME, UnitOfTime
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/remember_the_milk/__init__.py b/homeassistant/components/remember_the_milk/__init__.py
index d544c42efe1..df9eec0622f 100644
--- a/homeassistant/components/remember_the_milk/__init__.py
+++ b/homeassistant/components/remember_the_milk/__init__.py
@@ -1,33 +1,25 @@
 """Support to interact with Remember The Milk."""
 
-import json
-import logging
-import os
-
 from rtmapi import Rtm
 import voluptuous as vol
 
 from homeassistant.components import configurator
-from homeassistant.const import CONF_API_KEY, CONF_ID, CONF_NAME, CONF_TOKEN
+from homeassistant.const import CONF_API_KEY, CONF_ID, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.typing import ConfigType
 
+from .const import LOGGER
 from .entity import RememberTheMilkEntity
+from .storage import RememberTheMilkConfiguration
 
 # httplib2 is a transitive dependency from RtmAPI. If this dependency is not
 # set explicitly, the library does not work.
-_LOGGER = logging.getLogger(__name__)
 
 DOMAIN = "remember_the_milk"
-DEFAULT_NAME = DOMAIN
 
 CONF_SHARED_SECRET = "shared_secret"
-CONF_ID_MAP = "id_map"
-CONF_LIST_ID = "list_id"
-CONF_TIMESERIES_ID = "timeseries_id"
-CONF_TASK_ID = "task_id"
 
 RTM_SCHEMA = vol.Schema(
     {
@@ -41,7 +33,6 @@ CONFIG_SCHEMA = vol.Schema(
     {DOMAIN: vol.All(cv.ensure_list, [RTM_SCHEMA])}, extra=vol.ALLOW_EXTRA
 )
 
-CONFIG_FILE_NAME = ".remember_the_milk.conf"
 SERVICE_CREATE_TASK = "create_task"
 SERVICE_COMPLETE_TASK = "complete_task"
 
@@ -54,17 +45,17 @@ SERVICE_SCHEMA_COMPLETE_TASK = vol.Schema({vol.Required(CONF_ID): cv.string})
 
 def setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Remember the milk component."""
-    component = EntityComponent[RememberTheMilkEntity](_LOGGER, DOMAIN, hass)
+    component = EntityComponent[RememberTheMilkEntity](LOGGER, DOMAIN, hass)
 
     stored_rtm_config = RememberTheMilkConfiguration(hass)
     for rtm_config in config[DOMAIN]:
         account_name = rtm_config[CONF_NAME]
-        _LOGGER.debug("Adding Remember the milk account %s", account_name)
+        LOGGER.debug("Adding Remember the milk account %s", account_name)
         api_key = rtm_config[CONF_API_KEY]
         shared_secret = rtm_config[CONF_SHARED_SECRET]
         token = stored_rtm_config.get_token(account_name)
         if token:
-            _LOGGER.debug("found token for account %s", account_name)
+            LOGGER.debug("found token for account %s", account_name)
             _create_instance(
                 hass,
                 account_name,
@@ -79,13 +70,19 @@ def setup(hass: HomeAssistant, config: ConfigType) -> bool:
                 hass, account_name, api_key, shared_secret, stored_rtm_config, component
             )
 
-    _LOGGER.debug("Finished adding all Remember the milk accounts")
+    LOGGER.debug("Finished adding all Remember the milk accounts")
     return True
 
 
 def _create_instance(
-    hass, account_name, api_key, shared_secret, token, stored_rtm_config, component
-):
+    hass: HomeAssistant,
+    account_name: str,
+    api_key: str,
+    shared_secret: str,
+    token: str,
+    stored_rtm_config: RememberTheMilkConfiguration,
+    component: EntityComponent[RememberTheMilkEntity],
+) -> None:
     entity = RememberTheMilkEntity(
         account_name, api_key, shared_secret, token, stored_rtm_config
     )
@@ -105,26 +102,30 @@ def _create_instance(
 
 
 def _register_new_account(
-    hass, account_name, api_key, shared_secret, stored_rtm_config, component
-):
-    request_id = None
+    hass: HomeAssistant,
+    account_name: str,
+    api_key: str,
+    shared_secret: str,
+    stored_rtm_config: RememberTheMilkConfiguration,
+    component: EntityComponent[RememberTheMilkEntity],
+) -> None:
     api = Rtm(api_key, shared_secret, "write", None)
     url, frob = api.authenticate_desktop()
-    _LOGGER.debug("Sent authentication request to server")
+    LOGGER.debug("Sent authentication request to server")
 
     def register_account_callback(fields: list[dict[str, str]]) -> None:
         """Call for register the configurator."""
         api.retrieve_token(frob)
         token = api.token
         if api.token is None:
-            _LOGGER.error("Failed to register, please try again")
+            LOGGER.error("Failed to register, please try again")
             configurator.notify_errors(
                 hass, request_id, "Failed to register, please try again."
             )
             return
 
         stored_rtm_config.set_token(account_name, token)
-        _LOGGER.debug("Retrieved new token from server")
+        LOGGER.debug("Retrieved new token from server")
 
         _create_instance(
             hass,
@@ -152,89 +153,3 @@ def _register_new_account(
         link_url=url,
         submit_caption="login completed",
     )
-
-
-class RememberTheMilkConfiguration:
-    """Internal configuration data for RememberTheMilk class.
-
-    This class stores the authentication token it get from the backend.
-    """
-
-    def __init__(self, hass):
-        """Create new instance of configuration."""
-        self._config_file_path = hass.config.path(CONFIG_FILE_NAME)
-        if not os.path.isfile(self._config_file_path):
-            self._config = {}
-            return
-        try:
-            _LOGGER.debug("Loading configuration from file: %s", self._config_file_path)
-            with open(self._config_file_path, encoding="utf8") as config_file:
-                self._config = json.load(config_file)
-        except ValueError:
-            _LOGGER.error(
-                "Failed to load configuration file, creating a new one: %s",
-                self._config_file_path,
-            )
-            self._config = {}
-
-    def save_config(self):
-        """Write the configuration to a file."""
-        with open(self._config_file_path, "w", encoding="utf8") as config_file:
-            json.dump(self._config, config_file)
-
-    def get_token(self, profile_name):
-        """Get the server token for a profile."""
-        if profile_name in self._config:
-            return self._config[profile_name][CONF_TOKEN]
-        return None
-
-    def set_token(self, profile_name, token):
-        """Store a new server token for a profile."""
-        self._initialize_profile(profile_name)
-        self._config[profile_name][CONF_TOKEN] = token
-        self.save_config()
-
-    def delete_token(self, profile_name):
-        """Delete a token for a profile.
-
-        Usually called when the token has expired.
-        """
-        self._config.pop(profile_name, None)
-        self.save_config()
-
-    def _initialize_profile(self, profile_name):
-        """Initialize the data structures for a profile."""
-        if profile_name not in self._config:
-            self._config[profile_name] = {}
-        if CONF_ID_MAP not in self._config[profile_name]:
-            self._config[profile_name][CONF_ID_MAP] = {}
-
-    def get_rtm_id(self, profile_name, hass_id):
-        """Get the RTM ids for a Home Assistant task ID.
-
-        The id of a RTM tasks consists of the tuple:
-        list id, timeseries id and the task id.
-        """
-        self._initialize_profile(profile_name)
-        ids = self._config[profile_name][CONF_ID_MAP].get(hass_id)
-        if ids is None:
-            return None
-        return ids[CONF_LIST_ID], ids[CONF_TIMESERIES_ID], ids[CONF_TASK_ID]
-
-    def set_rtm_id(self, profile_name, hass_id, list_id, time_series_id, rtm_task_id):
-        """Add/Update the RTM task ID for a Home Assistant task IS."""
-        self._initialize_profile(profile_name)
-        id_tuple = {
-            CONF_LIST_ID: list_id,
-            CONF_TIMESERIES_ID: time_series_id,
-            CONF_TASK_ID: rtm_task_id,
-        }
-        self._config[profile_name][CONF_ID_MAP][hass_id] = id_tuple
-        self.save_config()
-
-    def delete_rtm_id(self, profile_name, hass_id):
-        """Delete a key mapping."""
-        self._initialize_profile(profile_name)
-        if hass_id in self._config[profile_name][CONF_ID_MAP]:
-            del self._config[profile_name][CONF_ID_MAP][hass_id]
-            self.save_config()
diff --git a/homeassistant/components/remember_the_milk/const.py b/homeassistant/components/remember_the_milk/const.py
new file mode 100644
index 00000000000..2fccbf3ee52
--- /dev/null
+++ b/homeassistant/components/remember_the_milk/const.py
@@ -0,0 +1,5 @@
+"""Constants for the Remember The Milk integration."""
+
+import logging
+
+LOGGER = logging.getLogger(__package__)
diff --git a/homeassistant/components/remember_the_milk/entity.py b/homeassistant/components/remember_the_milk/entity.py
index 8fa52b6c06c..be69d16f72f 100644
--- a/homeassistant/components/remember_the_milk/entity.py
+++ b/homeassistant/components/remember_the_milk/entity.py
@@ -1,20 +1,26 @@
 """Support to interact with Remember The Milk."""
 
-import logging
-
 from rtmapi import Rtm, RtmRequestFailedException
 
 from homeassistant.const import CONF_ID, CONF_NAME, STATE_OK
 from homeassistant.core import ServiceCall
 from homeassistant.helpers.entity import Entity
 
-_LOGGER = logging.getLogger(__name__)
+from .const import LOGGER
+from .storage import RememberTheMilkConfiguration
 
 
 class RememberTheMilkEntity(Entity):
     """Representation of an interface to Remember The Milk."""
 
-    def __init__(self, name, api_key, shared_secret, token, rtm_config):
+    def __init__(
+        self,
+        name: str,
+        api_key: str,
+        shared_secret: str,
+        token: str,
+        rtm_config: RememberTheMilkConfiguration,
+    ) -> None:
         """Create new instance of Remember The Milk component."""
         self._name = name
         self._api_key = api_key
@@ -22,11 +28,11 @@ class RememberTheMilkEntity(Entity):
         self._token = token
         self._rtm_config = rtm_config
         self._rtm_api = Rtm(api_key, shared_secret, "delete", token)
-        self._token_valid = None
+        self._token_valid = False
         self._check_token()
-        _LOGGER.debug("Instance created for account %s", self._name)
+        LOGGER.debug("Instance created for account %s", self._name)
 
-    def _check_token(self):
+    def _check_token(self) -> bool:
         """Check if the API token is still valid.
 
         If it is not valid any more, delete it from the configuration. This
@@ -34,7 +40,7 @@ class RememberTheMilkEntity(Entity):
         """
         valid = self._rtm_api.token_valid()
         if not valid:
-            _LOGGER.error(
+            LOGGER.error(
                 "Token for account %s is invalid. You need to register again!",
                 self.name,
             )
@@ -60,20 +66,21 @@ class RememberTheMilkEntity(Entity):
             result = self._rtm_api.rtm.timelines.create()
             timeline = result.timeline.value
 
-            if hass_id is None or rtm_id is None:
+            if rtm_id is None:
                 result = self._rtm_api.rtm.tasks.add(
                     timeline=timeline, name=task_name, parse="1"
                 )
-                _LOGGER.debug(
+                LOGGER.debug(
                     "Created new task '%s' in account %s", task_name, self.name
                 )
-                self._rtm_config.set_rtm_id(
-                    self._name,
-                    hass_id,
-                    result.list.id,
-                    result.list.taskseries.id,
-                    result.list.taskseries.task.id,
-                )
+                if hass_id is not None:
+                    self._rtm_config.set_rtm_id(
+                        self._name,
+                        hass_id,
+                        result.list.id,
+                        result.list.taskseries.id,
+                        result.list.taskseries.task.id,
+                    )
             else:
                 self._rtm_api.rtm.tasks.setName(
                     name=task_name,
@@ -82,14 +89,14 @@ class RememberTheMilkEntity(Entity):
                     task_id=rtm_id[2],
                     timeline=timeline,
                 )
-                _LOGGER.debug(
+                LOGGER.debug(
                     "Updated task with id '%s' in account %s to name %s",
                     hass_id,
                     self.name,
                     task_name,
                 )
         except RtmRequestFailedException as rtm_exception:
-            _LOGGER.error(
+            LOGGER.error(
                 "Error creating new Remember The Milk task for account %s: %s",
                 self._name,
                 rtm_exception,
@@ -100,7 +107,7 @@ class RememberTheMilkEntity(Entity):
         hass_id = call.data[CONF_ID]
         rtm_id = self._rtm_config.get_rtm_id(self._name, hass_id)
         if rtm_id is None:
-            _LOGGER.error(
+            LOGGER.error(
                 (
                     "Could not find task with ID %s in account %s. "
                     "So task could not be closed"
@@ -119,23 +126,21 @@ class RememberTheMilkEntity(Entity):
                 timeline=timeline,
             )
             self._rtm_config.delete_rtm_id(self._name, hass_id)
-            _LOGGER.debug(
-                "Completed task with id %s in account %s", hass_id, self._name
-            )
+            LOGGER.debug("Completed task with id %s in account %s", hass_id, self._name)
         except RtmRequestFailedException as rtm_exception:
-            _LOGGER.error(
+            LOGGER.error(
                 "Error creating new Remember The Milk task for account %s: %s",
                 self._name,
                 rtm_exception,
             )
 
     @property
-    def name(self):
+    def name(self) -> str:
         """Return the name of the device."""
         return self._name
 
     @property
-    def state(self):
+    def state(self) -> str:
         """Return the state of the device."""
         if not self._token_valid:
             return "API token invalid"
diff --git a/homeassistant/components/remember_the_milk/storage.py b/homeassistant/components/remember_the_milk/storage.py
new file mode 100644
index 00000000000..593abb7da2c
--- /dev/null
+++ b/homeassistant/components/remember_the_milk/storage.py
@@ -0,0 +1,116 @@
+"""Store RTM configuration in Home Assistant storage."""
+
+from __future__ import annotations
+
+import json
+from pathlib import Path
+from typing import cast
+
+from homeassistant.const import CONF_TOKEN
+from homeassistant.core import HomeAssistant
+
+from .const import LOGGER
+
+CONFIG_FILE_NAME = ".remember_the_milk.conf"
+CONF_ID_MAP = "id_map"
+CONF_LIST_ID = "list_id"
+CONF_TASK_ID = "task_id"
+CONF_TIMESERIES_ID = "timeseries_id"
+
+
+class RememberTheMilkConfiguration:
+    """Internal configuration data for Remember The Milk."""
+
+    def __init__(self, hass: HomeAssistant) -> None:
+        """Create new instance of configuration."""
+        self._config_file_path = hass.config.path(CONFIG_FILE_NAME)
+        self._config = {}
+        LOGGER.debug("Loading configuration from file: %s", self._config_file_path)
+        try:
+            self._config = json.loads(
+                Path(self._config_file_path).read_text(encoding="utf8")
+            )
+        except FileNotFoundError:
+            LOGGER.debug("Missing configuration file: %s", self._config_file_path)
+        except OSError:
+            LOGGER.debug(
+                "Failed to read from configuration file, %s, using empty configuration",
+                self._config_file_path,
+            )
+        except ValueError:
+            LOGGER.error(
+                "Failed to parse configuration file, %s, using empty configuration",
+                self._config_file_path,
+            )
+
+    def _save_config(self) -> None:
+        """Write the configuration to a file."""
+        Path(self._config_file_path).write_text(
+            json.dumps(self._config), encoding="utf8"
+        )
+
+    def get_token(self, profile_name: str) -> str | None:
+        """Get the server token for a profile."""
+        if profile_name in self._config:
+            return cast(str, self._config[profile_name][CONF_TOKEN])
+        return None
+
+    def set_token(self, profile_name: str, token: str) -> None:
+        """Store a new server token for a profile."""
+        self._initialize_profile(profile_name)
+        self._config[profile_name][CONF_TOKEN] = token
+        self._save_config()
+
+    def delete_token(self, profile_name: str) -> None:
+        """Delete a token for a profile.
+
+        Usually called when the token has expired.
+        """
+        self._config.pop(profile_name, None)
+        self._save_config()
+
+    def _initialize_profile(self, profile_name: str) -> None:
+        """Initialize the data structures for a profile."""
+        if profile_name not in self._config:
+            self._config[profile_name] = {}
+        if CONF_ID_MAP not in self._config[profile_name]:
+            self._config[profile_name][CONF_ID_MAP] = {}
+
+    def get_rtm_id(
+        self, profile_name: str, hass_id: str
+    ) -> tuple[str, str, str] | None:
+        """Get the RTM ids for a Home Assistant task ID.
+
+        The id of a RTM tasks consists of the tuple:
+        list id, timeseries id and the task id.
+        """
+        self._initialize_profile(profile_name)
+        ids = self._config[profile_name][CONF_ID_MAP].get(hass_id)
+        if ids is None:
+            return None
+        return ids[CONF_LIST_ID], ids[CONF_TIMESERIES_ID], ids[CONF_TASK_ID]
+
+    def set_rtm_id(
+        self,
+        profile_name: str,
+        hass_id: str,
+        list_id: str,
+        time_series_id: str,
+        rtm_task_id: str,
+    ) -> None:
+        """Add/Update the RTM task ID for a Home Assistant task IS."""
+        self._initialize_profile(profile_name)
+        id_tuple = {
+            CONF_LIST_ID: list_id,
+            CONF_TIMESERIES_ID: time_series_id,
+            CONF_TASK_ID: rtm_task_id,
+        }
+        self._config[profile_name][CONF_ID_MAP][hass_id] = id_tuple
+        self._save_config()
+
+    def delete_rtm_id(self, profile_name: str, hass_id: str) -> None:
+        """Delete a key mapping."""
+        self._initialize_profile(profile_name)
+        if hass_id in self._config[profile_name][CONF_ID_MAP]:
+            del self._config[profile_name][CONF_ID_MAP][hass_id]
+            self._save_config()
diff --git a/homeassistant/components/remote_calendar/__init__.py b/homeassistant/components/remote_calendar/__init__.py
new file mode 100644
index 00000000000..910eeae8268
--- /dev/null
+++ b/homeassistant/components/remote_calendar/__init__.py
@@ -0,0 +1,33 @@
+"""The Remote Calendar integration."""
+
+import logging
+
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+
+from .const import DOMAIN
+from .coordinator import RemoteCalendarConfigEntry, RemoteCalendarDataUpdateCoordinator
+
+_LOGGER = logging.getLogger(__name__)
+
+
+PLATFORMS: list[Platform] = [Platform.CALENDAR]
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: RemoteCalendarConfigEntry
+) -> bool:
+    """Set up Remote Calendar from a config entry."""
+    hass.data.setdefault(DOMAIN, {})
+    coordinator = RemoteCalendarDataUpdateCoordinator(hass, entry)
+    await coordinator.async_config_entry_first_refresh()
+    entry.runtime_data = coordinator
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    return True
+
+
+async def async_unload_entry(
+    hass: HomeAssistant, entry: RemoteCalendarConfigEntry
+) -> bool:
+    """Handle unload of an entry."""
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/remote_calendar/calendar.py b/homeassistant/components/remote_calendar/calendar.py
new file mode 100644
index 00000000000..bd83a5f18cc
--- /dev/null
+++ b/homeassistant/components/remote_calendar/calendar.py
@@ -0,0 +1,92 @@
+"""Calendar platform for a Remote Calendar."""
+
+from datetime import datetime
+import logging
+
+from ical.event import Event
+
+from homeassistant.components.calendar import CalendarEntity, CalendarEvent
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+from homeassistant.util import dt as dt_util
+
+from . import RemoteCalendarConfigEntry
+from .const import CONF_CALENDAR_NAME
+from .coordinator import RemoteCalendarDataUpdateCoordinator
+
+_LOGGER = logging.getLogger(__name__)
+
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: RemoteCalendarConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the remote calendar platform."""
+    coordinator = entry.runtime_data
+    entity = RemoteCalendarEntity(coordinator, entry)
+    async_add_entities([entity])
+
+
+class RemoteCalendarEntity(
+    CoordinatorEntity[RemoteCalendarDataUpdateCoordinator], CalendarEntity
+):
+    """A calendar entity backed by a remote iCalendar url."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: RemoteCalendarDataUpdateCoordinator,
+        entry: RemoteCalendarConfigEntry,
+    ) -> None:
+        """Initialize RemoteCalendarEntity."""
+        super().__init__(coordinator)
+        self._attr_name = entry.data[CONF_CALENDAR_NAME]
+        self._attr_unique_id = entry.entry_id
+
+    @property
+    def event(self) -> CalendarEvent | None:
+        """Return the next upcoming event."""
+        now = dt_util.now()
+        events = self.coordinator.data.timeline_tz(now.tzinfo).active_after(now)
+        if event := next(events, None):
+            return _get_calendar_event(event)
+        return None
+
+    async def async_get_events(
+        self, hass: HomeAssistant, start_date: datetime, end_date: datetime
+    ) -> list[CalendarEvent]:
+        """Get all events in a specific time frame."""
+        events = self.coordinator.data.timeline_tz(start_date.tzinfo).overlapping(
+            start_date,
+            end_date,
+        )
+        return [_get_calendar_event(event) for event in events]
+
+
+def _get_calendar_event(event: Event) -> CalendarEvent:
+    """Return a CalendarEvent from an API event."""
+
+    return CalendarEvent(
+        summary=event.summary,
+        start=(
+            dt_util.as_local(event.start)
+            if isinstance(event.start, datetime)
+            else event.start
+        ),
+        end=(
+            dt_util.as_local(event.end)
+            if isinstance(event.end, datetime)
+            else event.end
+        ),
+        description=event.description,
+        uid=event.uid,
+        rrule=event.rrule.as_rrule_str() if event.rrule else None,
+        recurrence_id=event.recurrence_id,
+        location=event.location,
+    )
diff --git a/homeassistant/components/remote_calendar/config_flow.py b/homeassistant/components/remote_calendar/config_flow.py
new file mode 100644
index 00000000000..1ceeb7a3937
--- /dev/null
+++ b/homeassistant/components/remote_calendar/config_flow.py
@@ -0,0 +1,74 @@
+"""Config flow for Remote Calendar integration."""
+
+import logging
+from typing import Any
+
+from httpx import HTTPError, InvalidURL
+from ical.calendar_stream import IcsCalendarStream
+from ical.exceptions import CalendarParseError
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.const import CONF_URL
+from homeassistant.helpers.httpx_client import get_async_client
+
+from .const import CONF_CALENDAR_NAME, DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+STEP_USER_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_CALENDAR_NAME): str,
+        vol.Required(CONF_URL): str,
+    }
+)
+
+
+class RemoteCalendarConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Remote Calendar."""
+
+    VERSION = 1
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the initial step."""
+        if user_input is None:
+            return self.async_show_form(
+                step_id="user", data_schema=STEP_USER_DATA_SCHEMA
+            )
+        errors: dict = {}
+        _LOGGER.debug("User input: %s", user_input)
+        self._async_abort_entries_match(
+            {CONF_CALENDAR_NAME: user_input[CONF_CALENDAR_NAME]}
+        )
+        if user_input[CONF_URL].startswith("webcal://"):
+            user_input[CONF_URL] = user_input[CONF_URL].replace(
+                "webcal://", "https://", 1
+            )
+        self._async_abort_entries_match({CONF_URL: user_input[CONF_URL]})
+        client = get_async_client(self.hass)
+        try:
+            res = await client.get(user_input[CONF_URL], follow_redirects=True)
+            res.raise_for_status()
+        except (HTTPError, InvalidURL) as err:
+            errors["base"] = "cannot_connect"
+            _LOGGER.debug("An error occurred: %s", err)
+        else:
+            try:
+                await self.hass.async_add_executor_job(
+                    IcsCalendarStream.calendar_from_ics, res.text
+                )
+            except CalendarParseError as err:
+                errors["base"] = "invalid_ics_file"
+                _LOGGER.debug("Invalid .ics file: %s", err)
+            else:
+                return self.async_create_entry(
+                    title=user_input[CONF_CALENDAR_NAME], data=user_input
+                )
+
+        return self.async_show_form(
+            step_id="user",
+            data_schema=STEP_USER_DATA_SCHEMA,
+            errors=errors,
+        )
diff --git a/homeassistant/components/remote_calendar/const.py b/homeassistant/components/remote_calendar/const.py
new file mode 100644
index 00000000000..060d7633111
--- /dev/null
+++ b/homeassistant/components/remote_calendar/const.py
@@ -0,0 +1,4 @@
+"""Constants for the Remote Calendar integration."""
+
+DOMAIN = "remote_calendar"
+CONF_CALENDAR_NAME = "calendar_name"
diff --git a/homeassistant/components/remote_calendar/coordinator.py b/homeassistant/components/remote_calendar/coordinator.py
new file mode 100644
index 00000000000..6caec297c1a
--- /dev/null
+++ b/homeassistant/components/remote_calendar/coordinator.py
@@ -0,0 +1,71 @@
+"""Data UpdateCoordinator for the Remote Calendar integration."""
+
+from datetime import timedelta
+import logging
+
+from httpx import HTTPError, InvalidURL
+from ical.calendar import Calendar
+from ical.calendar_stream import IcsCalendarStream
+from ical.exceptions import CalendarParseError
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_URL
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.httpx_client import get_async_client
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import DOMAIN
+
+type RemoteCalendarConfigEntry = ConfigEntry[RemoteCalendarDataUpdateCoordinator]
+
+_LOGGER = logging.getLogger(__name__)
+SCAN_INTERVAL = timedelta(days=1)
+
+
+class RemoteCalendarDataUpdateCoordinator(DataUpdateCoordinator[Calendar]):
+    """Class to manage fetching calendar data."""
+
+    config_entry: RemoteCalendarConfigEntry
+    ics: str
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: RemoteCalendarConfigEntry,
+    ) -> None:
+        """Initialize data updater."""
+        super().__init__(
+            hass,
+            _LOGGER,
+            name=DOMAIN,
+            update_interval=SCAN_INTERVAL,
+            always_update=True,
+        )
+        self._client = get_async_client(hass)
+        self._url = config_entry.data[CONF_URL]
+
+    async def _async_update_data(self) -> Calendar:
+        """Update data from the url."""
+        try:
+            res = await self._client.get(self._url, follow_redirects=True)
+            res.raise_for_status()
+        except (HTTPError, InvalidURL) as err:
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="unable_to_fetch",
+                translation_placeholders={"err": str(err)},
+            ) from err
+        try:
+            # calendar_from_ics will dynamically load packages
+            # the first time it is called, so we need to do it
+            # in a separate thread to avoid blocking the event loop
+            self.ics = res.text
+            return await self.hass.async_add_executor_job(
+                IcsCalendarStream.calendar_from_ics, self.ics
+            )
+        except CalendarParseError as err:
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="unable_to_parse",
+                translation_placeholders={"err": str(err)},
+            ) from err
diff --git a/homeassistant/components/remote_calendar/diagnostics.py b/homeassistant/components/remote_calendar/diagnostics.py
new file mode 100644
index 00000000000..5ebfb3d3812
--- /dev/null
+++ b/homeassistant/components/remote_calendar/diagnostics.py
@@ -0,0 +1,25 @@
+"""Provides diagnostics for the remote calendar."""
+
+import datetime
+from typing import Any
+
+from ical.diagnostics import redact_ics
+
+from homeassistant.core import HomeAssistant
+from homeassistant.util import dt as dt_util
+
+from . import RemoteCalendarConfigEntry
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, entry: RemoteCalendarConfigEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+    coordinator = entry.runtime_data
+    payload: dict[str, Any] = {
+        "now": dt_util.now().isoformat(),
+        "timezone": str(dt_util.get_default_time_zone()),
+        "system_timezone": str(datetime.datetime.now().astimezone().tzinfo),
+    }
+    payload["ics"] = "\n".join(redact_ics(coordinator.ics))
+    return payload
diff --git a/homeassistant/components/remote_calendar/manifest.json b/homeassistant/components/remote_calendar/manifest.json
new file mode 100644
index 00000000000..fe17a3d2c34
--- /dev/null
+++ b/homeassistant/components/remote_calendar/manifest.json
@@ -0,0 +1,12 @@
+{
+  "domain": "remote_calendar",
+  "name": "Remote Calendar",
+  "codeowners": ["@Thomas55555"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/remote_calendar",
+  "integration_type": "service",
+  "iot_class": "cloud_polling",
+  "loggers": ["ical"],
+  "quality_scale": "silver",
+  "requirements": ["ical==9.0.1"]
+}
diff --git a/homeassistant/components/remote_calendar/quality_scale.yaml b/homeassistant/components/remote_calendar/quality_scale.yaml
new file mode 100644
index 00000000000..964b63d7116
--- /dev/null
+++ b/homeassistant/components/remote_calendar/quality_scale.yaml
@@ -0,0 +1,98 @@
+rules:
+  # Bronze
+  config-flow: done
+  test-before-configure: done
+  unique-config-entry:
+    status: exempt
+    comment: |
+      No unique identifier.
+  config-flow-test-coverage: done
+  runtime-data: done
+  test-before-setup: done
+  appropriate-polling: done
+  entity-unique-id: done
+  has-entity-name: done
+  entity-event-setup:
+    status: exempt
+    comment: |
+      Entities of this integration does not explicitly subscribe to events.
+  dependency-transparency: done
+  action-setup:
+    status: exempt
+    comment: |
+      There are no actions.
+  common-modules: done
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  docs-actions:
+    status: exempt
+    comment: No actions available.
+  brands: done
+  # Silver
+  config-entry-unloading: done
+  log-when-unavailable: done
+  entity-unavailable: done
+  action-exceptions:
+    status: exempt
+    comment: |
+      There are no actions.
+  reauthentication-flow:
+    status: exempt
+    comment: |
+      There is no authentication required.
+  parallel-updates: done
+  test-coverage: done
+  integration-owner: done
+  docs-installation-parameters: done
+  docs-configuration-parameters:
+    status: exempt
+    comment: no configuration options
+
+  # Gold
+  devices:
+    status: exempt
+    comment: No devices. One URL is always assigned to one calendar.
+  diagnostics: done
+  discovery-update-info:
+    status: todo
+    comment: No discovery protocol available.
+  discovery:
+    status: exempt
+    comment: No discovery protocol available.
+  docs-data-update: todo
+  docs-examples: todo
+  docs-known-limitations: todo
+  docs-supported-devices: todo
+  docs-supported-functions: todo
+  docs-troubleshooting: todo
+  docs-use-cases: todo
+  dynamic-devices:
+    status: exempt
+    comment: No devices. One URL is always assigned to one calendar.
+  entity-category: done
+  entity-device-class:
+    status: exempt
+    comment: No devices classes for calendars.
+  entity-disabled-by-default:
+    status: exempt
+    comment: Only one entity per entry.
+  entity-translations:
+    status: exempt
+    comment: Entity name is defined by the user, so no translation possible.
+  exception-translations: done
+  icon-translations:
+    status: exempt
+    comment: Only the default icon is used.
+  reconfiguration-flow:
+    status: exempt
+    comment: no configuration possible
+  repair-issues: todo
+  stale-devices:
+    status: exempt
+    comment: No devices. One URL is always assigned to one calendar.
+
+  # Platinum
+  async-dependency: todo
+  inject-websession: done
+  strict-typing: done
diff --git a/homeassistant/components/remote_calendar/strings.json b/homeassistant/components/remote_calendar/strings.json
new file mode 100644
index 00000000000..1ad62821818
--- /dev/null
+++ b/homeassistant/components/remote_calendar/strings.json
@@ -0,0 +1,33 @@
+{
+  "title": "Remote Calendar",
+  "config": {
+    "step": {
+      "user": {
+        "description": "Please choose a name for the calendar to be imported",
+        "data": {
+          "calendar_name": "Calendar name",
+          "url": "Calendar URL"
+        },
+        "data_description": {
+          "calendar_name": "The name of the calendar shown in the UI.",
+          "url": "The URL of the remote calendar."
+        }
+      }
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_ics_file": "[%key:component::local_calendar::config::error::invalid_ics_file%]"
+    }
+  },
+  "exceptions": {
+    "unable_to_fetch": {
+      "message": "Unable to fetch calendar data: {err}"
+    },
+    "unable_to_parse": {
+      "message": "Unable to parse calendar data: {err}"
+    }
+  }
+}
diff --git a/homeassistant/components/remote_rpi_gpio/binary_sensor.py b/homeassistant/components/remote_rpi_gpio/binary_sensor.py
index b3a8075c6ba..1d970bb3541 100644
--- a/homeassistant/components/remote_rpi_gpio/binary_sensor.py
+++ b/homeassistant/components/remote_rpi_gpio/binary_sensor.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from gpiozero import DigitalInputDevice
 import requests
 import voluptuous as vol
 
@@ -11,7 +12,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
@@ -48,10 +49,10 @@ def setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the Raspberry PI GPIO devices."""
-    address = config["host"]
+    address = config[CONF_HOST]
     invert_logic = config[CONF_INVERT_LOGIC]
     pull_mode = config[CONF_PULL_MODE]
-    ports = config["ports"]
+    ports = config[CONF_PORTS]
     bouncetime = config[CONF_BOUNCETIME] / 1000
 
     devices = []
@@ -71,9 +72,11 @@ class RemoteRPiGPIOBinarySensor(BinarySensorEntity):
 
     _attr_should_poll = False
 
-    def __init__(self, name, sensor, invert_logic):
+    def __init__(
+        self, name: str | None, sensor: DigitalInputDevice, invert_logic: bool
+    ) -> None:
         """Initialize the RPi binary sensor."""
-        self._name = name
+        self._attr_name = name
         self._invert_logic = invert_logic
         self._state = False
         self._sensor = sensor
@@ -90,20 +93,10 @@ class RemoteRPiGPIOBinarySensor(BinarySensorEntity):
         self._sensor.when_activated = read_gpio
 
     @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._name
-
-    @property
-    def is_on(self):
+    def is_on(self) -> bool:
         """Return the state of the entity."""
         return self._state != self._invert_logic
 
-    @property
-    def device_class(self):
-        """Return the class of this sensor, from DEVICE_CLASSES."""
-        return
-
     def update(self) -> None:
         """Update the GPIO state."""
         try:
diff --git a/homeassistant/components/remote_rpi_gpio/switch.py b/homeassistant/components/remote_rpi_gpio/switch.py
index bf31e4bb55a..25f95045e4b 100644
--- a/homeassistant/components/remote_rpi_gpio/switch.py
+++ b/homeassistant/components/remote_rpi_gpio/switch.py
@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from typing import Any
 
+from gpiozero import LED
 import voluptuous as vol
 
 from homeassistant.components.switch import (
@@ -12,7 +13,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import CONF_HOST, DEVICE_DEFAULT_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
@@ -57,37 +58,23 @@ def setup_platform(
 class RemoteRPiGPIOSwitch(SwitchEntity):
     """Representation of a Remote Raspberry Pi GPIO."""
 
+    _attr_assumed_state = True
     _attr_should_poll = False
 
-    def __init__(self, name, led):
+    def __init__(self, name: str | None, led: LED) -> None:
         """Initialize the pin."""
-        self._name = name or DEVICE_DEFAULT_NAME
-        self._state = False
+        self._attr_name = name or DEVICE_DEFAULT_NAME
+        self._attr_is_on = False
         self._switch = led
 
-    @property
-    def name(self):
-        """Return the name of the switch."""
-        return self._name
-
-    @property
-    def assumed_state(self):
-        """If unable to access real state of the entity."""
-        return True
-
-    @property
-    def is_on(self):
-        """Return true if device is on."""
-        return self._state
-
     def turn_on(self, **kwargs: Any) -> None:
         """Turn the device on."""
         write_output(self._switch, 1)
-        self._state = True
+        self._attr_is_on = True
         self.schedule_update_ha_state()
 
     def turn_off(self, **kwargs: Any) -> None:
         """Turn the device off."""
         write_output(self._switch, 0)
-        self._state = False
+        self._attr_is_on = False
         self.schedule_update_ha_state()
diff --git a/homeassistant/components/renault/binary_sensor.py b/homeassistant/components/renault/binary_sensor.py
index a8fdf324f1c..0aebd3bd835 100644
--- a/homeassistant/components/renault/binary_sensor.py
+++ b/homeassistant/components/renault/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import RenaultConfigEntry
@@ -37,7 +37,7 @@ class RenaultBinarySensorEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RenaultConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Renault entities from config entry."""
     entities: list[RenaultBinarySensor] = [
diff --git a/homeassistant/components/renault/button.py b/homeassistant/components/renault/button.py
index 6a9f5e05a38..82b811821ea 100644
--- a/homeassistant/components/renault/button.py
+++ b/homeassistant/components/renault/button.py
@@ -8,7 +8,7 @@ from typing import Any
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import RenaultConfigEntry
 from .entity import RenaultEntity
@@ -29,7 +29,7 @@ class RenaultButtonEntityDescription(ButtonEntityDescription):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RenaultConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Renault entities from config entry."""
     entities: list[RenaultButtonEntity] = [
diff --git a/homeassistant/components/renault/config_flow.py b/homeassistant/components/renault/config_flow.py
index 70544a5637f..90d2c11613c 100644
--- a/homeassistant/components/renault/config_flow.py
+++ b/homeassistant/components/renault/config_flow.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
+import logging
 from typing import Any
 
 import aiohttp
@@ -16,6 +17,8 @@ from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from .const import CONF_KAMEREON_ACCOUNT_ID, CONF_LOCALE, DOMAIN
 from .renault_hub import RenaultHub
 
+_LOGGER = logging.getLogger(__name__)
+
 USER_SCHEMA = vol.Schema(
     {
         vol.Required(CONF_LOCALE): vol.In(AVAILABLE_LOCALES.keys()),
@@ -54,7 +57,8 @@ class RenaultFlowHandler(ConfigFlow, domain=DOMAIN):
                 )
             except (aiohttp.ClientConnectionError, GigyaException):
                 errors["base"] = "cannot_connect"
-            except Exception:  # noqa: BLE001
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
                 if login_success:
diff --git a/homeassistant/components/renault/coordinator.py b/homeassistant/components/renault/coordinator.py
index 89e62867130..a90331730bc 100644
--- a/homeassistant/components/renault/coordinator.py
+++ b/homeassistant/components/renault/coordinator.py
@@ -6,7 +6,7 @@ import asyncio
 from collections.abc import Awaitable, Callable
 from datetime import timedelta
 import logging
-from typing import TypeVar
+from typing import TYPE_CHECKING, TypeVar
 
 from renault_api.kamereon.exceptions import (
     AccessDeniedException,
@@ -18,6 +18,9 @@ from renault_api.kamereon.models import KamereonVehicleDataAttributes
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
+if TYPE_CHECKING:
+    from . import RenaultConfigEntry
+
 T = TypeVar("T", bound=KamereonVehicleDataAttributes)
 
 # We have potentially 7 coordinators per vehicle
@@ -27,11 +30,13 @@ _PARALLEL_SEMAPHORE = asyncio.Semaphore(1)
 class RenaultDataUpdateCoordinator(DataUpdateCoordinator[T]):
     """Handle vehicle communication with Renault servers."""
 
+    config_entry: RenaultConfigEntry
     update_method: Callable[[], Awaitable[T]]
 
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: RenaultConfigEntry,
         logger: logging.Logger,
         *,
         name: str,
@@ -42,6 +47,7 @@ class RenaultDataUpdateCoordinator(DataUpdateCoordinator[T]):
         super().__init__(
             hass,
             logger,
+            config_entry=config_entry,
             name=name,
             update_interval=update_interval,
             update_method=update_method,
diff --git a/homeassistant/components/renault/device_tracker.py b/homeassistant/components/renault/device_tracker.py
index 08a2a698802..c55ddeb2190 100644
--- a/homeassistant/components/renault/device_tracker.py
+++ b/homeassistant/components/renault/device_tracker.py
@@ -11,7 +11,7 @@ from homeassistant.components.device_tracker import (
     TrackerEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import RenaultConfigEntry
 from .entity import RenaultDataEntity, RenaultDataEntityDescription
@@ -30,7 +30,7 @@ class RenaultTrackerEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RenaultConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Renault entities from config entry."""
     entities: list[RenaultDeviceTracker] = [
diff --git a/homeassistant/components/renault/renault_hub.py b/homeassistant/components/renault/renault_hub.py
index 76b197b2aaf..b37390526cf 100644
--- a/homeassistant/components/renault/renault_hub.py
+++ b/homeassistant/components/renault/renault_hub.py
@@ -5,13 +5,13 @@ from __future__ import annotations
 import asyncio
 from datetime import timedelta
 import logging
+from typing import TYPE_CHECKING
 
 from renault_api.gigya.exceptions import InvalidCredentialsException
 from renault_api.kamereon.models import KamereonVehiclesLink
 from renault_api.renault_account import RenaultAccount
 from renault_api.renault_client import RenaultClient
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_IDENTIFIERS,
     ATTR_MANUFACTURER,
@@ -24,6 +24,9 @@ from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
+if TYPE_CHECKING:
+    from . import RenaultConfigEntry
+
 from .const import CONF_KAMEREON_ACCOUNT_ID, DEFAULT_SCAN_INTERVAL
 from .renault_vehicle import RenaultVehicleProxy
 
@@ -52,7 +55,7 @@ class RenaultHub:
             return True
         return False
 
-    async def async_initialise(self, config_entry: ConfigEntry) -> None:
+    async def async_initialise(self, config_entry: RenaultConfigEntry) -> None:
         """Set up proxy."""
         account_id: str = config_entry.data[CONF_KAMEREON_ACCOUNT_ID]
         scan_interval = timedelta(seconds=DEFAULT_SCAN_INTERVAL)
@@ -86,7 +89,7 @@ class RenaultHub:
         vehicle_link: KamereonVehiclesLink,
         renault_account: RenaultAccount,
         scan_interval: timedelta,
-        config_entry: ConfigEntry,
+        config_entry: RenaultConfigEntry,
         device_registry: dr.DeviceRegistry,
     ) -> None:
         """Set up proxy."""
@@ -95,6 +98,7 @@ class RenaultHub:
         # Generate vehicle proxy
         vehicle = RenaultVehicleProxy(
             hass=self._hass,
+            config_entry=config_entry,
             vehicle=await renault_account.get_api_vehicle(vehicle_link.vin),
             details=vehicle_link.vehicleDetails,
             scan_interval=scan_interval,
diff --git a/homeassistant/components/renault/renault_vehicle.py b/homeassistant/components/renault/renault_vehicle.py
index d8266d75319..1cce0e4459f 100644
--- a/homeassistant/components/renault/renault_vehicle.py
+++ b/homeassistant/components/renault/renault_vehicle.py
@@ -8,7 +8,7 @@ from dataclasses import dataclass
 from datetime import datetime, timedelta
 from functools import wraps
 import logging
-from typing import Any, Concatenate, cast
+from typing import TYPE_CHECKING, Any, Concatenate, cast
 
 from renault_api.exceptions import RenaultException
 from renault_api.kamereon import models
@@ -18,6 +18,9 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
 
+if TYPE_CHECKING:
+    from . import RenaultConfigEntry
+
 from .const import DOMAIN
 from .coordinator import RenaultDataUpdateCoordinator
 
@@ -64,12 +67,14 @@ class RenaultVehicleProxy:
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: RenaultConfigEntry,
         vehicle: RenaultVehicle,
         details: models.KamereonVehicleDetails,
         scan_interval: timedelta,
     ) -> None:
         """Initialise vehicle proxy."""
         self.hass = hass
+        self.config_entry = config_entry
         self._vehicle = vehicle
         self._details = details
         self._device_info = DeviceInfo(
@@ -98,11 +103,10 @@ class RenaultVehicleProxy:
         self.coordinators = {
             coord.key: RenaultDataUpdateCoordinator(
                 self.hass,
+                self.config_entry,
                 LOGGER,
-                # Name of the data. For logging purposes.
                 name=f"{self.details.vin} {coord.key}",
                 update_method=coord.update_method(self._vehicle),
-                # Polling interval. Will only be polled if there are subscribers.
                 update_interval=self._scan_interval,
             )
             for coord in COORDINATORS
diff --git a/homeassistant/components/renault/select.py b/homeassistant/components/renault/select.py
index cab1d1f4d8a..cddf83bb860 100644
--- a/homeassistant/components/renault/select.py
+++ b/homeassistant/components/renault/select.py
@@ -9,7 +9,7 @@ from renault_api.kamereon.models import KamereonVehicleBatteryStatusData
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import RenaultConfigEntry
@@ -32,7 +32,7 @@ class RenaultSelectEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RenaultConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Renault entities from config entry."""
     entities: list[RenaultSelectEntity] = [
diff --git a/homeassistant/components/renault/sensor.py b/homeassistant/components/renault/sensor.py
index 7854d70b1c4..7c513c1b9de 100644
--- a/homeassistant/components/renault/sensor.py
+++ b/homeassistant/components/renault/sensor.py
@@ -31,7 +31,7 @@ from homeassistant.const import (
     UnitOfVolume,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util.dt import as_utc, parse_datetime
 
@@ -60,7 +60,7 @@ class RenaultSensorEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RenaultConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Renault entities from config entry."""
     entities: list[RenaultSensor[Any]] = [
diff --git a/homeassistant/components/renault/services.py b/homeassistant/components/renault/services.py
index 80fb2363b1e..df65d16b0b8 100644
--- a/homeassistant/components/renault/services.py
+++ b/homeassistant/components/renault/services.py
@@ -9,7 +9,6 @@ from typing import TYPE_CHECKING, Any
 
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import config_validation as cv, device_registry as dr
@@ -178,9 +177,8 @@ def setup_services(hass: HomeAssistant) -> None:
 
         loaded_entries: list[RenaultConfigEntry] = [
             entry
-            for entry in hass.config_entries.async_entries(DOMAIN)
-            if entry.state == ConfigEntryState.LOADED
-            and entry.entry_id in device_entry.config_entries
+            for entry in hass.config_entries.async_loaded_entries(DOMAIN)
+            if entry.entry_id in device_entry.config_entries
         ]
         for entry in loaded_entries:
             for vin, vehicle in entry.runtime_data.vehicles.items():
diff --git a/homeassistant/components/renault/strings.json b/homeassistant/components/renault/strings.json
index 7d9cae1bcf1..8649a5c7b47 100644
--- a/homeassistant/components/renault/strings.json
+++ b/homeassistant/components/renault/strings.json
@@ -18,7 +18,7 @@
         "data_description": {
           "kamereon_account_id": "The Kamereon account ID associated with your vehicle"
         },
-        "title": "Kamereon Account ID",
+        "title": "Kamereon account ID",
         "description": "You have multiple Kamereon accounts associated to this email, please select one"
       },
       "reauth_confirm": {
@@ -228,10 +228,10 @@
   },
   "exceptions": {
     "invalid_device_id": {
-      "message": "No device with id {device_id} was found"
+      "message": "No device with ID {device_id} was found"
     },
     "no_config_entry_for_device": {
-      "message": "No loaded config entry was found for device with id {device_id}"
+      "message": "No loaded config entry was found for device with ID {device_id}"
     }
   }
 }
diff --git a/homeassistant/components/renson/__init__.py b/homeassistant/components/renson/__init__.py
index d1eebdf0a5f..b88f9bb036a 100644
--- a/homeassistant/components/renson/__init__.py
+++ b/homeassistant/components/renson/__init__.py
@@ -37,7 +37,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Renson from a config entry."""
 
     api = RensonVentilation(entry.data[CONF_HOST])
-    coordinator = RensonCoordinator("Renson", hass, api)
+    coordinator = RensonCoordinator(hass, entry, api)
 
     if not await hass.async_add_executor_job(api.connect):
         raise ConfigEntryNotReady("Cannot connect to Renson device")
diff --git a/homeassistant/components/renson/binary_sensor.py b/homeassistant/components/renson/binary_sensor.py
index 46f832ed15c..60b4f54b85c 100644
--- a/homeassistant/components/renson/binary_sensor.py
+++ b/homeassistant/components/renson/binary_sensor.py
@@ -24,7 +24,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import RensonCoordinator
@@ -86,7 +86,7 @@ BINARY_SENSORS: tuple[RensonBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Call the Renson integration to setup."""
 
diff --git a/homeassistant/components/renson/button.py b/homeassistant/components/renson/button.py
index 02278a0d6f6..830e5a03a4a 100644
--- a/homeassistant/components/renson/button.py
+++ b/homeassistant/components/renson/button.py
@@ -15,7 +15,7 @@ from homeassistant.components.button import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import RensonCoordinator, RensonData
 from .const import DOMAIN
@@ -54,7 +54,7 @@ ENTITY_DESCRIPTIONS: tuple[RensonButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Renson button platform."""
 
diff --git a/homeassistant/components/renson/coordinator.py b/homeassistant/components/renson/coordinator.py
index 8613220eee1..5d0a20e1c29 100644
--- a/homeassistant/components/renson/coordinator.py
+++ b/homeassistant/components/renson/coordinator.py
@@ -9,30 +9,35 @@ from typing import Any
 
 from renson_endura_delta.renson import RensonVentilation
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
+from .const import DOMAIN
+
 _LOGGER = logging.getLogger(__name__)
 
 
 class RensonCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Data update coordinator for Renson."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
-        name: str,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         api: RensonVentilation,
-        update_interval=timedelta(seconds=30),
     ) -> None:
         """Initialize my coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             # Name of the data. For logging purposes.
-            name=name,
+            name=DOMAIN,
             # Polling interval. Will only be polled if there are subscribers.
-            update_interval=update_interval,
+            update_interval=timedelta(seconds=30),
         )
         self.api = api
 
diff --git a/homeassistant/components/renson/fan.py b/homeassistant/components/renson/fan.py
index 56b3655ef94..474ab640943 100644
--- a/homeassistant/components/renson/fan.py
+++ b/homeassistant/components/renson/fan.py
@@ -18,9 +18,8 @@ import voluptuous as vol
 from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import entity_platform
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv, entity_platform
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import VolDictType
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
@@ -86,7 +85,7 @@ SPEED_RANGE: tuple[float, float] = (1, 4)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Renson fan platform."""
 
diff --git a/homeassistant/components/renson/number.py b/homeassistant/components/renson/number.py
index fb8ab8fc552..67fde1c56dc 100644
--- a/homeassistant/components/renson/number.py
+++ b/homeassistant/components/renson/number.py
@@ -15,7 +15,7 @@ from homeassistant.components.number import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, UnitOfTime
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import RensonCoordinator
@@ -40,7 +40,7 @@ RENSON_NUMBER_DESCRIPTION = NumberEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Renson number platform."""
 
diff --git a/homeassistant/components/renson/sensor.py b/homeassistant/components/renson/sensor.py
index 1df62e12312..ce7e71b1c0b 100644
--- a/homeassistant/components/renson/sensor.py
+++ b/homeassistant/components/renson/sensor.py
@@ -43,7 +43,7 @@ from homeassistant.const import (
     UnitOfVolumeFlowRate,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import RensonData
 from .const import DOMAIN
@@ -272,7 +272,7 @@ class RensonSensor(RensonEntity, SensorEntity):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Renson sensor platform."""
 
diff --git a/homeassistant/components/renson/switch.py b/homeassistant/components/renson/switch.py
index 2cd44d20a6a..3b73bb3dffe 100644
--- a/homeassistant/components/renson/switch.py
+++ b/homeassistant/components/renson/switch.py
@@ -11,7 +11,7 @@ from renson_endura_delta.renson import Level, RensonVentilation
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import RensonCoordinator
 from .const import DOMAIN
@@ -68,7 +68,7 @@ class RensonBreezeSwitch(RensonEntity, SwitchEntity):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Call the Renson integration to setup."""
 
diff --git a/homeassistant/components/renson/time.py b/homeassistant/components/renson/time.py
index feb47fadf99..0a07fd2ec4f 100644
--- a/homeassistant/components/renson/time.py
+++ b/homeassistant/components/renson/time.py
@@ -13,7 +13,7 @@ from homeassistant.components.time import TimeEntity, TimeEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import RensonData
 from .const import DOMAIN
@@ -50,7 +50,7 @@ ENTITY_DESCRIPTIONS: tuple[RensonTimeEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Renson time platform."""
 
diff --git a/homeassistant/components/reolink/__init__.py b/homeassistant/components/reolink/__init__.py
index 747e68e8a00..99ca91c5bdf 100644
--- a/homeassistant/components/reolink/__init__.py
+++ b/homeassistant/components/reolink/__init__.py
@@ -5,9 +5,14 @@ from __future__ import annotations
 import asyncio
 from datetime import timedelta
 import logging
+from typing import Any
 
 from reolink_aio.api import RETRY_ATTEMPTS
-from reolink_aio.exceptions import CredentialsInvalidError, ReolinkError
+from reolink_aio.exceptions import (
+    CredentialsInvalidError,
+    LoginPrivacyModeError,
+    ReolinkError,
+)
 
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import CONF_PORT, EVENT_HOMEASSISTANT_STOP, Platform
@@ -19,14 +24,15 @@ from homeassistant.helpers import (
     entity_registry as er,
 )
 from homeassistant.helpers.device_registry import format_mac
+from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import CONF_USE_HTTPS, DOMAIN
+from .const import CONF_BC_PORT, CONF_SUPPORTS_PRIVACY_MODE, CONF_USE_HTTPS, DOMAIN
 from .exceptions import PasswordIncompatible, ReolinkException, UserNotAdmin
 from .host import ReolinkHost
 from .services import async_setup_services
-from .util import ReolinkConfigEntry, ReolinkData, get_device_uid_and_ch
+from .util import ReolinkConfigEntry, ReolinkData, get_device_uid_and_ch, get_store
 from .views import PlaybackProxyView
 
 _LOGGER = logging.getLogger(__name__)
@@ -61,7 +67,7 @@ async def async_setup_entry(
     hass: HomeAssistant, config_entry: ReolinkConfigEntry
 ) -> bool:
     """Set up Reolink from a config entry."""
-    host = ReolinkHost(hass, config_entry.data, config_entry.options)
+    host = ReolinkHost(hass, config_entry.data, config_entry.options, config_entry)
 
     try:
         await host.async_init()
@@ -86,21 +92,37 @@ async def async_setup_entry(
         hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, host.stop)
     )
 
-    # update the port info if needed for the next time
+    # update the config info if needed for the next time
     if (
         host.api.port != config_entry.data[CONF_PORT]
         or host.api.use_https != config_entry.data[CONF_USE_HTTPS]
+        or host.api.supported(None, "privacy_mode")
+        != config_entry.data.get(CONF_SUPPORTS_PRIVACY_MODE)
+        or host.api.baichuan.port != config_entry.data.get(CONF_BC_PORT)
     ):
-        _LOGGER.warning(
-            "HTTP(s) port of Reolink %s, changed from %s to %s",
-            host.api.nvr_name,
-            config_entry.data[CONF_PORT],
-            host.api.port,
-        )
+        if host.api.port != config_entry.data[CONF_PORT]:
+            _LOGGER.warning(
+                "HTTP(s) port of Reolink %s, changed from %s to %s",
+                host.api.nvr_name,
+                config_entry.data[CONF_PORT],
+                host.api.port,
+            )
+        if (
+            config_entry.data.get(CONF_BC_PORT, host.api.baichuan.port)
+            != host.api.baichuan.port
+        ):
+            _LOGGER.warning(
+                "Baichuan port of Reolink %s, changed from %s to %s",
+                host.api.nvr_name,
+                config_entry.data.get(CONF_BC_PORT),
+                host.api.baichuan.port,
+            )
         data = {
             **config_entry.data,
             CONF_PORT: host.api.port,
             CONF_USE_HTTPS: host.api.use_https,
+            CONF_BC_PORT: host.api.baichuan.port,
+            CONF_SUPPORTS_PRIVACY_MODE: host.api.supported(None, "privacy_mode"),
         }
         hass.config_entries.async_update_entry(config_entry, data=data)
 
@@ -115,6 +137,8 @@ async def async_setup_entry(
                     await host.stop()
                     raise ConfigEntryAuthFailed(err) from err
                 raise UpdateFailed(str(err)) from err
+            except LoginPrivacyModeError:
+                pass  # HTTP API is shutdown when privacy mode is active
             except ReolinkError as err:
                 host.credential_errors = 0
                 raise UpdateFailed(str(err)) from err
@@ -192,6 +216,23 @@ async def async_setup_entry(
 
     hass.http.register_view(PlaybackProxyView(hass))
 
+    async def refresh(*args: Any) -> None:
+        """Request refresh of coordinator."""
+        await device_coordinator.async_request_refresh()
+        host.cancel_refresh_privacy_mode = None
+
+    def async_privacy_mode_change() -> None:
+        """Request update when privacy mode is turned off."""
+        if host.privacy_mode and not host.api.baichuan.privacy_mode():
+            # The privacy mode just turned off, give the API 2 seconds to start
+            if host.cancel_refresh_privacy_mode is None:
+                host.cancel_refresh_privacy_mode = async_call_later(hass, 2, refresh)
+        host.privacy_mode = host.api.baichuan.privacy_mode()
+
+    host.api.baichuan.register_callback(
+        "privacy_mode_change", async_privacy_mode_change, 623
+    )
+
     await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
 
     config_entry.async_on_unload(
@@ -216,9 +257,21 @@ async def async_unload_entry(
 
     await host.stop()
 
+    host.api.baichuan.unregister_callback("privacy_mode_change")
+    if host.cancel_refresh_privacy_mode is not None:
+        host.cancel_refresh_privacy_mode()
+
     return await hass.config_entries.async_unload_platforms(config_entry, PLATFORMS)
 
 
+async def async_remove_entry(
+    hass: HomeAssistant, config_entry: ReolinkConfigEntry
+) -> None:
+    """Handle removal of an entry."""
+    store = get_store(hass, config_entry.entry_id)
+    await store.async_remove()
+
+
 async def async_remove_config_entry_device(
     hass: HomeAssistant, config_entry: ReolinkConfigEntry, device: dr.DeviceEntry
 ) -> bool:
diff --git a/homeassistant/components/reolink/binary_sensor.py b/homeassistant/components/reolink/binary_sensor.py
index 2191dedc9cf..39910bbc52a 100644
--- a/homeassistant/components/reolink/binary_sensor.py
+++ b/homeassistant/components/reolink/binary_sensor.py
@@ -23,9 +23,13 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .entity import ReolinkChannelCoordinatorEntity, ReolinkChannelEntityDescription
+from .entity import (
+    ReolinkChannelCoordinatorEntity,
+    ReolinkChannelEntityDescription,
+    ReolinkEntityDescription,
+)
 from .util import ReolinkConfigEntry, ReolinkData
 
 PARALLEL_UPDATES = 0
@@ -41,6 +45,18 @@ class ReolinkBinarySensorEntityDescription(
     value: Callable[[Host, int], bool]
 
 
+@dataclass(frozen=True, kw_only=True)
+class ReolinkSmartAIBinarySensorEntityDescription(
+    BinarySensorEntityDescription,
+    ReolinkEntityDescription,
+):
+    """A class that describes Smart AI binary sensor entities."""
+
+    smart_type: str
+    value: Callable[[Host, int, int], bool]
+    supported: Callable[[Host, int, int], bool] = lambda api, ch, loc: True
+
+
 BINARY_PUSH_SENSORS = (
     ReolinkBinarySensorEntityDescription(
         key="motion",
@@ -121,26 +137,173 @@ BINARY_SENSORS = (
     ),
 )
 
+BINARY_SMART_AI_SENSORS = (
+    ReolinkSmartAIBinarySensorEntityDescription(
+        key="crossline_person",
+        smart_type="crossline",
+        cmd_id=33,
+        translation_key="crossline_person",
+        value=lambda api, ch, loc: (
+            api.baichuan.smart_ai_state(ch, "crossline", loc, "people")
+        ),
+        supported=lambda api, ch, loc: (
+            api.supported(ch, "ai_crossline")
+            and "people" in api.baichuan.smart_ai_type_list(ch, "crossline", loc)
+        ),
+    ),
+    ReolinkSmartAIBinarySensorEntityDescription(
+        key="crossline_vehicle",
+        smart_type="crossline",
+        cmd_id=33,
+        translation_key="crossline_vehicle",
+        value=lambda api, ch, loc: (
+            api.baichuan.smart_ai_state(ch, "crossline", loc, "vehicle")
+        ),
+        supported=lambda api, ch, loc: (
+            api.supported(ch, "ai_crossline")
+            and "vehicle" in api.baichuan.smart_ai_type_list(ch, "crossline", loc)
+        ),
+    ),
+    ReolinkSmartAIBinarySensorEntityDescription(
+        key="crossline_dog_cat",
+        smart_type="crossline",
+        cmd_id=33,
+        translation_key="crossline_dog_cat",
+        value=lambda api, ch, loc: (
+            api.baichuan.smart_ai_state(ch, "crossline", loc, "dog_cat")
+        ),
+        supported=lambda api, ch, loc: (
+            api.supported(ch, "ai_crossline")
+            and "dog_cat" in api.baichuan.smart_ai_type_list(ch, "crossline", loc)
+        ),
+    ),
+    ReolinkSmartAIBinarySensorEntityDescription(
+        key="intrusion_person",
+        smart_type="intrusion",
+        cmd_id=33,
+        translation_key="intrusion_person",
+        value=lambda api, ch, loc: (
+            api.baichuan.smart_ai_state(ch, "intrusion", loc, "people")
+        ),
+        supported=lambda api, ch, loc: (
+            api.supported(ch, "ai_intrusion")
+            and "people" in api.baichuan.smart_ai_type_list(ch, "intrusion", loc)
+        ),
+    ),
+    ReolinkSmartAIBinarySensorEntityDescription(
+        key="intrusion_vehicle",
+        smart_type="intrusion",
+        cmd_id=33,
+        translation_key="intrusion_vehicle",
+        value=lambda api, ch, loc: (
+            api.baichuan.smart_ai_state(ch, "intrusion", loc, "vehicle")
+        ),
+        supported=lambda api, ch, loc: (
+            api.supported(ch, "ai_intrusion")
+            and "vehicle" in api.baichuan.smart_ai_type_list(ch, "intrusion", loc)
+        ),
+    ),
+    ReolinkSmartAIBinarySensorEntityDescription(
+        key="intrusion_dog_cat",
+        smart_type="intrusion",
+        cmd_id=33,
+        translation_key="intrusion_dog_cat",
+        value=lambda api, ch, loc: (
+            api.baichuan.smart_ai_state(ch, "intrusion", loc, "dog_cat")
+        ),
+        supported=lambda api, ch, loc: (
+            api.supported(ch, "ai_intrusion")
+            and "dog_cat" in api.baichuan.smart_ai_type_list(ch, "intrusion", loc)
+        ),
+    ),
+    ReolinkSmartAIBinarySensorEntityDescription(
+        key="linger_person",
+        smart_type="loitering",
+        cmd_id=33,
+        translation_key="linger_person",
+        value=lambda api, ch, loc: (
+            api.baichuan.smart_ai_state(ch, "loitering", loc, "people")
+        ),
+        supported=lambda api, ch, loc: (
+            api.supported(ch, "ai_linger")
+            and "people" in api.baichuan.smart_ai_type_list(ch, "loitering", loc)
+        ),
+    ),
+    ReolinkSmartAIBinarySensorEntityDescription(
+        key="linger_vehicle",
+        smart_type="loitering",
+        cmd_id=33,
+        translation_key="linger_vehicle",
+        value=lambda api, ch, loc: (
+            api.baichuan.smart_ai_state(ch, "loitering", loc, "vehicle")
+        ),
+        supported=lambda api, ch, loc: (
+            api.supported(ch, "ai_linger")
+            and "vehicle" in api.baichuan.smart_ai_type_list(ch, "loitering", loc)
+        ),
+    ),
+    ReolinkSmartAIBinarySensorEntityDescription(
+        key="linger_dog_cat",
+        smart_type="loitering",
+        cmd_id=33,
+        translation_key="linger_dog_cat",
+        value=lambda api, ch, loc: (
+            api.baichuan.smart_ai_state(ch, "loitering", loc, "dog_cat")
+        ),
+        supported=lambda api, ch, loc: (
+            api.supported(ch, "ai_linger")
+            and "dog_cat" in api.baichuan.smart_ai_type_list(ch, "loitering", loc)
+        ),
+    ),
+    ReolinkSmartAIBinarySensorEntityDescription(
+        key="forgotten_item",
+        smart_type="legacy",
+        cmd_id=33,
+        translation_key="forgotten_item",
+        value=lambda api, ch, loc: (api.baichuan.smart_ai_state(ch, "legacy", loc)),
+        supported=lambda api, ch, loc: api.supported(ch, "ai_forgotten_item"),
+    ),
+    ReolinkSmartAIBinarySensorEntityDescription(
+        key="taken_item",
+        smart_type="loss",
+        cmd_id=33,
+        translation_key="taken_item",
+        value=lambda api, ch, loc: (api.baichuan.smart_ai_state(ch, "loss", loc)),
+        supported=lambda api, ch, loc: api.supported(ch, "ai_taken_item"),
+    ),
+)
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ReolinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Reolink IP Camera."""
     reolink_data: ReolinkData = config_entry.runtime_data
+    api = reolink_data.host.api
 
-    entities: list[ReolinkBinarySensorEntity] = []
-    for channel in reolink_data.host.api.channels:
+    entities: list[ReolinkBinarySensorEntity | ReolinkSmartAIBinarySensorEntity] = []
+    for channel in api.channels:
         entities.extend(
             ReolinkPushBinarySensorEntity(reolink_data, channel, entity_description)
             for entity_description in BINARY_PUSH_SENSORS
-            if entity_description.supported(reolink_data.host.api, channel)
+            if entity_description.supported(api, channel)
         )
         entities.extend(
             ReolinkBinarySensorEntity(reolink_data, channel, entity_description)
             for entity_description in BINARY_SENSORS
-            if entity_description.supported(reolink_data.host.api, channel)
+            if entity_description.supported(api, channel)
+        )
+        entities.extend(
+            ReolinkSmartAIBinarySensorEntity(
+                reolink_data, channel, location, entity_description
+            )
+            for entity_description in BINARY_SMART_AI_SENSORS
+            for location in api.baichuan.smart_location_list(
+                channel, entity_description.key
+            )
+            if entity_description.supported(api, channel, location)
         )
 
     async_add_entities(entities)
@@ -198,3 +361,40 @@ class ReolinkPushBinarySensorEntity(ReolinkBinarySensorEntity):
     async def _async_handle_event(self, event: str) -> None:
         """Handle incoming event for motion detection."""
         self.async_write_ha_state()
+
+
+class ReolinkSmartAIBinarySensorEntity(
+    ReolinkChannelCoordinatorEntity, BinarySensorEntity
+):
+    """Binary-sensor class for Reolink IP camera Smart AI sensors."""
+
+    entity_description: ReolinkSmartAIBinarySensorEntityDescription
+
+    def __init__(
+        self,
+        reolink_data: ReolinkData,
+        channel: int,
+        location: int,
+        entity_description: ReolinkSmartAIBinarySensorEntityDescription,
+    ) -> None:
+        """Initialize Reolink binary sensor."""
+        self.entity_description = entity_description
+        super().__init__(reolink_data, channel)
+        unique_index = self._host.api.baichuan.smart_ai_index(
+            channel, entity_description.smart_type, location
+        )
+        self._attr_unique_id = f"{self._attr_unique_id}_{unique_index}"
+
+        self._location = location
+        self._attr_translation_placeholders = {
+            "zone_name": self._host.api.baichuan.smart_ai_name(
+                channel, entity_description.smart_type, location
+            )
+        }
+
+    @property
+    def is_on(self) -> bool:
+        """State of the sensor."""
+        return self.entity_description.value(
+            self._host.api, self._channel, self._location
+        )
diff --git a/homeassistant/components/reolink/button.py b/homeassistant/components/reolink/button.py
index 6b1fcc65a2f..a67b30a394c 100644
--- a/homeassistant/components/reolink/button.py
+++ b/homeassistant/components/reolink/button.py
@@ -19,7 +19,7 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import (
-    AddEntitiesCallback,
+    AddConfigEntryEntitiesCallback,
     async_get_current_platform,
 )
 
@@ -138,6 +138,7 @@ BUTTON_ENTITIES = (
 HOST_BUTTON_ENTITIES = (
     ReolinkHostButtonEntityDescription(
         key="reboot",
+        always_available=True,
         device_class=ButtonDeviceClass.RESTART,
         entity_category=EntityCategory.CONFIG,
         entity_registry_enabled_default=False,
@@ -150,7 +151,7 @@ HOST_BUTTON_ENTITIES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ReolinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Reolink button entities."""
     reolink_data: ReolinkData = config_entry.runtime_data
@@ -218,7 +219,7 @@ class ReolinkButtonEntity(ReolinkChannelCoordinatorEntity, ButtonEntity):
 
 
 class ReolinkHostButtonEntity(ReolinkHostCoordinatorEntity, ButtonEntity):
-    """Base button entity class for Reolink IP cameras."""
+    """Base button entity class for Reolink hosts."""
 
     entity_description: ReolinkHostButtonEntityDescription
 
diff --git a/homeassistant/components/reolink/camera.py b/homeassistant/components/reolink/camera.py
index a597be3ec7a..329ef9028de 100644
--- a/homeassistant/components/reolink/camera.py
+++ b/homeassistant/components/reolink/camera.py
@@ -13,7 +13,7 @@ from homeassistant.components.camera import (
     CameraEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import ReolinkChannelCoordinatorEntity, ReolinkChannelEntityDescription
 from .util import ReolinkConfigEntry, ReolinkData, raise_translated_error
@@ -89,7 +89,7 @@ CAMERA_ENTITIES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ReolinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Reolink IP Camera."""
     reolink_data: ReolinkData = config_entry.runtime_data
diff --git a/homeassistant/components/reolink/config_flow.py b/homeassistant/components/reolink/config_flow.py
index 48be2fc8ca7..12ccd455be3 100644
--- a/homeassistant/components/reolink/config_flow.py
+++ b/homeassistant/components/reolink/config_flow.py
@@ -2,15 +2,18 @@
 
 from __future__ import annotations
 
+import asyncio
 from collections.abc import Mapping
 import logging
 from typing import Any
 
 from reolink_aio.api import ALLOWED_SPECIAL_CHARS
+from reolink_aio.baichuan import DEFAULT_BC_PORT
 from reolink_aio.exceptions import (
     ApiError,
     CredentialsInvalidError,
     LoginFirmwareError,
+    LoginPrivacyModeError,
     ReolinkError,
 )
 import voluptuous as vol
@@ -35,7 +38,7 @@ from homeassistant.helpers import config_validation as cv, selector
 from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 
-from .const import CONF_USE_HTTPS, DOMAIN
+from .const import CONF_BC_PORT, CONF_SUPPORTS_PRIVACY_MODE, CONF_USE_HTTPS, DOMAIN
 from .exceptions import (
     PasswordIncompatible,
     ReolinkException,
@@ -49,6 +52,7 @@ _LOGGER = logging.getLogger(__name__)
 
 DEFAULT_PROTOCOL = "rtsp"
 DEFAULT_OPTIONS = {CONF_PROTOCOL: DEFAULT_PROTOCOL}
+API_STARTUP_TIME = 5
 
 
 class ReolinkOptionsFlowHandler(OptionsFlow):
@@ -101,6 +105,8 @@ class ReolinkFlowHandler(ConfigFlow, domain=DOMAIN):
         self._host: str | None = None
         self._username: str = "admin"
         self._password: str | None = None
+        self._user_input: dict[str, Any] | None = None
+        self._disable_privacy: bool = False
 
     @staticmethod
     @callback
@@ -198,6 +204,21 @@ class ReolinkFlowHandler(ConfigFlow, domain=DOMAIN):
         self._host = discovery_info.ip
         return await self.async_step_user()
 
+    async def async_step_privacy(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Ask permission to disable privacy mode."""
+        if user_input is not None:
+            self._disable_privacy = True
+            return await self.async_step_user(self._user_input)
+
+        assert self._user_input is not None
+        placeholders = {"host": self._user_input[CONF_HOST]}
+        return self.async_show_form(
+            step_id="privacy",
+            description_placeholders=placeholders,
+        )
+
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -219,6 +240,10 @@ class ReolinkFlowHandler(ConfigFlow, domain=DOMAIN):
 
             host = ReolinkHost(self.hass, user_input, DEFAULT_OPTIONS)
             try:
+                if self._disable_privacy:
+                    await host.api.baichuan.set_privacy_mode(enable=False)
+                    # give the camera some time to startup the HTTP API server
+                    await asyncio.sleep(API_STARTUP_TIME)
                 await host.async_init()
             except UserNotAdmin:
                 errors[CONF_USERNAME] = "not_admin"
@@ -227,6 +252,9 @@ class ReolinkFlowHandler(ConfigFlow, domain=DOMAIN):
             except PasswordIncompatible:
                 errors[CONF_PASSWORD] = "password_incompatible"
                 placeholders["special_chars"] = ALLOWED_SPECIAL_CHARS
+            except LoginPrivacyModeError:
+                self._user_input = user_input
+                return await self.async_step_privacy()
             except CredentialsInvalidError:
                 errors[CONF_PASSWORD] = "invalid_auth"
             except LoginFirmwareError:
@@ -260,6 +288,10 @@ class ReolinkFlowHandler(ConfigFlow, domain=DOMAIN):
             if not errors:
                 user_input[CONF_PORT] = host.api.port
                 user_input[CONF_USE_HTTPS] = host.api.use_https
+                user_input[CONF_BC_PORT] = host.api.baichuan.port
+                user_input[CONF_SUPPORTS_PRIVACY_MODE] = host.api.supported(
+                    None, "privacy_mode"
+                )
 
                 mac_address = format_mac(host.api.mac_address)
                 await self.async_set_unique_id(mac_address, raise_on_progress=False)
@@ -296,8 +328,9 @@ class ReolinkFlowHandler(ConfigFlow, domain=DOMAIN):
         if errors:
             data_schema = data_schema.extend(
                 {
-                    vol.Optional(CONF_PORT): cv.positive_int,
+                    vol.Optional(CONF_PORT): cv.port,
                     vol.Required(CONF_USE_HTTPS, default=False): bool,
+                    vol.Required(CONF_BC_PORT, default=DEFAULT_BC_PORT): cv.port,
                 }
             )
 
diff --git a/homeassistant/components/reolink/const.py b/homeassistant/components/reolink/const.py
index 8aa01bfac41..026d1219881 100644
--- a/homeassistant/components/reolink/const.py
+++ b/homeassistant/components/reolink/const.py
@@ -3,3 +3,5 @@
 DOMAIN = "reolink"
 
 CONF_USE_HTTPS = "use_https"
+CONF_BC_PORT = "baichuan_port"
+CONF_SUPPORTS_PRIVACY_MODE = "privacy_mode_supported"
diff --git a/homeassistant/components/reolink/diagnostics.py b/homeassistant/components/reolink/diagnostics.py
index 693f2ba59a4..1d0e5d919e7 100644
--- a/homeassistant/components/reolink/diagnostics.py
+++ b/homeassistant/components/reolink/diagnostics.py
@@ -25,6 +25,14 @@ async def async_get_config_entry_diagnostics(
         IPC_cam[ch]["firmware version"] = api.camera_sw_version(ch)
         IPC_cam[ch]["encoding main"] = await api.get_encoding(ch)
 
+    chimes: dict[int, dict[str, Any]] = {}
+    for chime in api.chime_list:
+        chimes[chime.dev_id] = {}
+        chimes[chime.dev_id]["channel"] = chime.channel
+        chimes[chime.dev_id]["name"] = chime.name
+        chimes[chime.dev_id]["online"] = chime.online
+        chimes[chime.dev_id]["event_types"] = chime.chime_event_types
+
     return {
         "model": api.model,
         "hardware version": api.hardware_version,
@@ -41,9 +49,11 @@ async def async_get_config_entry_diagnostics(
         "channels": api.channels,
         "stream channels": api.stream_channels,
         "IPC cams": IPC_cam,
+        "Chimes": chimes,
         "capabilities": api.capabilities,
         "cmd list": host.update_cmd,
         "firmware ch list": host.firmware_ch_list,
         "api versions": api.checked_api_versions,
         "abilities": api.abilities,
+        "BC_abilities": api.baichuan.abilities,
     }
diff --git a/homeassistant/components/reolink/entity.py b/homeassistant/components/reolink/entity.py
index dc2366e8f56..ec598de663d 100644
--- a/homeassistant/components/reolink/entity.py
+++ b/homeassistant/components/reolink/entity.py
@@ -25,6 +25,7 @@ class ReolinkEntityDescription(EntityDescription):
 
     cmd_key: str | None = None
     cmd_id: int | None = None
+    always_available: bool = False
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -69,7 +70,9 @@ class ReolinkHostCoordinatorEntity(CoordinatorEntity[DataUpdateCoordinator[None]
         super().__init__(coordinator)
 
         self._host = reolink_data.host
-        self._attr_unique_id = f"{self._host.unique_id}_{self.entity_description.key}"
+        self._attr_unique_id: str = (
+            f"{self._host.unique_id}_{self.entity_description.key}"
+        )
 
         http_s = "https" if self._host.api.use_https else "http"
         self._conf_url = f"{http_s}://{self._host.api.host}:{self._host.api.port}"
@@ -90,17 +93,24 @@ class ReolinkHostCoordinatorEntity(CoordinatorEntity[DataUpdateCoordinator[None]
     @property
     def available(self) -> bool:
         """Return True if entity is available."""
-        return self._host.api.session_active and super().available
+        if self.entity_description.always_available:
+            return True
+
+        return (
+            self._host.api.session_active
+            and not self._host.api.baichuan.privacy_mode()
+            and super().available
+        )
 
     @callback
     def _push_callback(self) -> None:
         """Handle incoming TCP push event."""
         self.async_write_ha_state()
 
-    def register_callback(self, unique_id: str, cmd_id: int) -> None:
+    def register_callback(self, callback_id: str, cmd_id: int) -> None:
         """Register callback for TCP push events."""
         self._host.api.baichuan.register_callback(  # pragma: no cover
-            unique_id, self._push_callback, cmd_id
+            callback_id, self._push_callback, cmd_id
         )
 
     async def async_added_to_hass(self) -> None:
@@ -108,19 +118,25 @@ class ReolinkHostCoordinatorEntity(CoordinatorEntity[DataUpdateCoordinator[None]
         await super().async_added_to_hass()
         cmd_key = self.entity_description.cmd_key
         cmd_id = self.entity_description.cmd_id
+        callback_id = f"{self.platform.domain}_{self._attr_unique_id}"
         if cmd_key is not None:
             self._host.async_register_update_cmd(cmd_key)
-        if cmd_id is not None and self._attr_unique_id is not None:
-            self.register_callback(self._attr_unique_id, cmd_id)
+        if cmd_id is not None:
+            self.register_callback(callback_id, cmd_id)
+        # Privacy mode
+        self.register_callback(f"{callback_id}_623", 623)
 
     async def async_will_remove_from_hass(self) -> None:
         """Entity removed."""
         cmd_key = self.entity_description.cmd_key
         cmd_id = self.entity_description.cmd_id
+        callback_id = f"{self.platform.domain}_{self._attr_unique_id}"
         if cmd_key is not None:
             self._host.async_unregister_update_cmd(cmd_key)
-        if cmd_id is not None and self._attr_unique_id is not None:
-            self._host.api.baichuan.unregister_callback(self._attr_unique_id)
+        if cmd_id is not None:
+            self._host.api.baichuan.unregister_callback(callback_id)
+        # Privacy mode
+        self._host.api.baichuan.unregister_callback(f"{callback_id}_623")
 
         await super().async_will_remove_from_hass()
 
@@ -162,8 +178,13 @@ class ReolinkChannelCoordinatorEntity(ReolinkHostCoordinatorEntity):
             else:
                 self._dev_id = f"{self._host.unique_id}_ch{dev_ch}"
 
+            connections = set()
+            if mac := self._host.api.baichuan.mac_address(dev_ch):
+                connections.add((CONNECTION_NETWORK_MAC, mac))
+
             self._attr_device_info = DeviceInfo(
                 identifiers={(DOMAIN, self._dev_id)},
+                connections=connections,
                 via_device=(DOMAIN, self._host.unique_id),
                 name=self._host.api.camera_name(dev_ch),
                 model=self._host.api.camera_model(dev_ch),
@@ -179,10 +200,10 @@ class ReolinkChannelCoordinatorEntity(ReolinkHostCoordinatorEntity):
         """Return True if entity is available."""
         return super().available and self._host.api.camera_online(self._channel)
 
-    def register_callback(self, unique_id: str, cmd_id: int) -> None:
+    def register_callback(self, callback_id: str, cmd_id: int) -> None:
         """Register callback for TCP push events."""
         self._host.api.baichuan.register_callback(
-            unique_id, self._push_callback, cmd_id, self._channel
+            callback_id, self._push_callback, cmd_id, self._channel
         )
 
     async def async_added_to_hass(self) -> None:
diff --git a/homeassistant/components/reolink/host.py b/homeassistant/components/reolink/host.py
index 97d888c0323..a027177f1fc 100644
--- a/homeassistant/components/reolink/host.py
+++ b/homeassistant/components/reolink/host.py
@@ -12,6 +12,7 @@ from typing import Any, Literal
 import aiohttp
 from aiohttp.web import Request
 from reolink_aio.api import ALLOWED_SPECIAL_CHARS, Host
+from reolink_aio.baichuan import DEFAULT_BC_PORT
 from reolink_aio.enums import SubType
 from reolink_aio.exceptions import NotSupportedError, ReolinkError, SubscriptionError
 
@@ -30,15 +31,17 @@ from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.network import NoURLAvailableError, get_url
+from homeassistant.helpers.storage import Store
 from homeassistant.util.ssl import SSLCipherList
 
-from .const import CONF_USE_HTTPS, DOMAIN
+from .const import CONF_BC_PORT, CONF_SUPPORTS_PRIVACY_MODE, CONF_USE_HTTPS, DOMAIN
 from .exceptions import (
     PasswordIncompatible,
     ReolinkSetupException,
     ReolinkWebhookException,
     UserNotAdmin,
 )
+from .util import ReolinkConfigEntry, get_store
 
 DEFAULT_TIMEOUT = 30
 FIRST_TCP_PUSH_TIMEOUT = 10
@@ -64,9 +67,12 @@ class ReolinkHost:
         hass: HomeAssistant,
         config: Mapping[str, Any],
         options: Mapping[str, Any],
+        config_entry: ReolinkConfigEntry | None = None,
     ) -> None:
         """Initialize Reolink Host. Could be either NVR, or Camera."""
         self._hass: HomeAssistant = hass
+        self._config_entry = config_entry
+        self._config = config
         self._unique_id: str = ""
 
         def get_aiohttp_session() -> aiohttp.ClientSession:
@@ -86,6 +92,7 @@ class ReolinkHost:
             protocol=options[CONF_PROTOCOL],
             timeout=DEFAULT_TIMEOUT,
             aiohttp_get_session_callback=get_aiohttp_session,
+            bc_port=config.get(CONF_BC_PORT, DEFAULT_BC_PORT),
         )
 
         self.last_wake: float = 0
@@ -95,6 +102,7 @@ class ReolinkHost:
         self.firmware_ch_list: list[int | None] = []
 
         self.starting: bool = True
+        self.privacy_mode: bool | None = None
         self.credential_errors: int = 0
 
         self.webhook_id: str | None = None
@@ -112,7 +120,9 @@ class ReolinkHost:
         self._poll_job = HassJob(self._async_poll_all_motion, cancel_on_shutdown=True)
         self._fast_poll_error: bool = False
         self._long_poll_task: asyncio.Task | None = None
+        self._lost_subscription_start: bool = False
         self._lost_subscription: bool = False
+        self.cancel_refresh_privacy_mode: CALLBACK_TYPE | None = None
 
     @callback
     def async_register_update_cmd(self, cmd: str, channel: int | None = None) -> None:
@@ -141,12 +151,38 @@ class ReolinkHost:
     async def async_init(self) -> None:
         """Connect to Reolink host."""
         if not self._api.valid_password():
+            if (
+                len(self._config[CONF_PASSWORD]) >= 32
+                and self._config_entry is not None
+            ):
+                ir.async_create_issue(
+                    self._hass,
+                    DOMAIN,
+                    f"password_too_long_{self._config_entry.entry_id}",
+                    is_fixable=True,
+                    severity=ir.IssueSeverity.ERROR,
+                    translation_key="password_too_long",
+                    translation_placeholders={"name": self._config_entry.title},
+                )
+
             raise PasswordIncompatible(
-                "Reolink password contains incompatible special character, "
-                "please change the password to only contain characters: "
-                f"a-z, A-Z, 0-9 or {ALLOWED_SPECIAL_CHARS}"
+                "Reolink password contains incompatible special character or "
+                "is too long, please change the password to only contain characters: "
+                f"a-z, A-Z, 0-9 or {ALLOWED_SPECIAL_CHARS} "
+                "and not be longer than 31 characters"
             )
 
+        store: Store[str] | None = None
+        if self._config_entry is not None:
+            ir.async_delete_issue(
+                self._hass, DOMAIN, f"password_too_long_{self._config_entry.entry_id}"
+            )
+            store = get_store(self._hass, self._config_entry.entry_id)
+            if self._config.get(CONF_SUPPORTS_PRIVACY_MODE) and (
+                data := await store.async_load()
+            ):
+                self._api.set_raw_host_data(data)
+
         await self._api.get_host_data()
 
         if self._api.mac_address is None:
@@ -158,6 +194,19 @@ class ReolinkHost:
                 f"'{self._api.user_level}', only admin users can change camera settings"
             )
 
+        self.privacy_mode = self._api.baichuan.privacy_mode()
+
+        if (
+            store
+            and self._api.supported(None, "privacy_mode")
+            and not self.privacy_mode
+        ):
+            _LOGGER.debug(
+                "Saving raw host data for next reload in case privacy mode is enabled"
+            )
+            data = self._api.get_raw_host_data()
+            await store.async_save(data)
+
         onvif_supported = self._api.supported(None, "ONVIF")
         self._onvif_push_supported = onvif_supported
         self._onvif_long_poll_supported = onvif_supported
@@ -299,7 +348,7 @@ class ReolinkHost:
                 )
 
         # start long polling if ONVIF push failed immediately
-        if not self._onvif_push_supported:
+        if not self._onvif_push_supported and not self._api.baichuan.privacy_mode():
             _LOGGER.debug(
                 "Camera model %s does not support ONVIF push, using ONVIF long polling instead",
                 self._api.model,
@@ -416,6 +465,11 @@ class ReolinkHost:
             wake = True
             self.last_wake = time()
 
+        if self._api.baichuan.privacy_mode():
+            await self._api.baichuan.get_privacy_mode()
+            if self._api.baichuan.privacy_mode():
+                return  # API is shutdown, no need to check states
+
         await self._api.get_states(cmd_list=self.update_cmd, wake=wake)
 
     async def disconnect(self) -> None:
@@ -459,8 +513,8 @@ class ReolinkHost:
                 if initial:
                     raise
                 # make sure the long_poll_task is always created to try again later
-                if not self._lost_subscription:
-                    self._lost_subscription = True
+                if not self._lost_subscription_start:
+                    self._lost_subscription_start = True
                     _LOGGER.error(
                         "Reolink %s event long polling subscription lost: %s",
                         self._api.nvr_name,
@@ -468,15 +522,15 @@ class ReolinkHost:
                     )
             except ReolinkError as err:
                 # make sure the long_poll_task is always created to try again later
-                if not self._lost_subscription:
-                    self._lost_subscription = True
+                if not self._lost_subscription_start:
+                    self._lost_subscription_start = True
                     _LOGGER.error(
                         "Reolink %s event long polling subscription lost: %s",
                         self._api.nvr_name,
                         err,
                     )
             else:
-                self._lost_subscription = False
+                self._lost_subscription_start = False
             self._long_poll_task = asyncio.create_task(self._async_long_polling())
 
     async def _async_stop_long_polling(self) -> None:
@@ -543,6 +597,9 @@ class ReolinkHost:
             self.unregister_webhook()
             await self._api.unsubscribe()
 
+        if self._api.baichuan.privacy_mode():
+            return  # API is shutdown, no need to subscribe
+
         try:
             if self._onvif_push_supported and not self._api.baichuan.events_active:
                 await self._renew(SubType.push)
@@ -666,7 +723,9 @@ class ReolinkHost:
             try:
                 channels = await self._api.pull_point_request()
             except ReolinkError as ex:
-                if not self._long_poll_error:
+                if not self._long_poll_error and self._api.subscribed(
+                    SubType.long_poll
+                ):
                     _LOGGER.error("Error while requesting ONVIF pull point: %s", ex)
                     await self._api.unsubscribe(sub_type=SubType.long_poll)
                 self._long_poll_error = True
diff --git a/homeassistant/components/reolink/icons.json b/homeassistant/components/reolink/icons.json
index a9c231bf68f..7d1dba099ed 100644
--- a/homeassistant/components/reolink/icons.json
+++ b/homeassistant/components/reolink/icons.json
@@ -54,6 +54,72 @@
         "state": {
           "on": "mdi:sleep"
         }
+      },
+      "crossline_person": {
+        "default": "mdi:fence",
+        "state": {
+          "on": "mdi:fence-electric"
+        }
+      },
+      "crossline_vehicle": {
+        "default": "mdi:fence",
+        "state": {
+          "on": "mdi:fence-electric"
+        }
+      },
+      "crossline_dog_cat": {
+        "default": "mdi:fence",
+        "state": {
+          "on": "mdi:fence-electric"
+        }
+      },
+      "intrusion_person": {
+        "default": "mdi:location-enter",
+        "state": {
+          "on": "mdi:alert-circle-outline"
+        }
+      },
+      "intrusion_vehicle": {
+        "default": "mdi:location-enter",
+        "state": {
+          "on": "mdi:alert-circle-outline"
+        }
+      },
+      "intrusion_dog_cat": {
+        "default": "mdi:location-enter",
+        "state": {
+          "on": "mdi:alert-circle-outline"
+        }
+      },
+      "linger_person": {
+        "default": "mdi:account-switch",
+        "state": {
+          "on": "mdi:account-alert"
+        }
+      },
+      "linger_vehicle": {
+        "default": "mdi:account-switch",
+        "state": {
+          "on": "mdi:account-alert"
+        }
+      },
+      "linger_dog_cat": {
+        "default": "mdi:account-switch",
+        "state": {
+          "on": "mdi:account-alert"
+        }
+      },
+      "forgotten_item": {
+        "default": "mdi:package-variant-closed-plus",
+        "state": {
+          "on": "mdi:package-variant-closed-check"
+        }
+      },
+      "taken_item": {
+        "default": "mdi:package-variant-closed-minus",
+        "state": {
+          "on": "mdi:package-variant-closed-check"
+        }
       }
     },
     "button": {
@@ -151,6 +217,21 @@
       "ai_animal_sensitivity": {
         "default": "mdi:paw"
       },
+      "crossline_sensitivity": {
+        "default": "mdi:fence"
+      },
+      "intrusion_sensitivity": {
+        "default": "mdi:location-enter"
+      },
+      "linger_sensitivity": {
+        "default": "mdi:account-switch"
+      },
+      "forgotten_item_sensitivity": {
+        "default": "mdi:package-variant-closed-plus"
+      },
+      "taken_item_sensitivity": {
+        "default": "mdi:package-variant-closed-minus"
+      },
       "ai_face_delay": {
         "default": "mdi:face-recognition"
       },
@@ -169,6 +250,18 @@
       "ai_animal_delay": {
         "default": "mdi:paw"
       },
+      "intrusion_delay": {
+        "default": "mdi:location-enter"
+      },
+      "linger_delay": {
+        "default": "mdi:account-switch"
+      },
+      "forgotten_item_delay": {
+        "default": "mdi:package-variant-closed-plus"
+      },
+      "taken_item_delay": {
+        "default": "mdi:package-variant-closed-minus"
+      },
       "auto_quick_reply_time": {
         "default": "mdi:message-reply-text-outline"
       },
@@ -284,6 +377,9 @@
       },
       "sub_bit_rate": {
         "default": "mdi:play-speed"
+      },
+      "scene_mode": {
+        "default": "mdi:view-list"
       }
     },
     "sensor": {
@@ -299,6 +395,9 @@
       "battery_state": {
         "default": "mdi:battery-charging"
       },
+      "day_night_state": {
+        "default": "mdi:theme-light-dark"
+      },
       "wifi_signal": {
         "default": "mdi:wifi"
       },
@@ -371,6 +470,12 @@
       },
       "led": {
         "default": "mdi:lightning-bolt-circle"
+      },
+      "privacy_mode": {
+        "default": "mdi:eye",
+        "state": {
+          "on": "mdi:eye-off"
+        }
       }
     }
   },
diff --git a/homeassistant/components/reolink/light.py b/homeassistant/components/reolink/light.py
index bbb9592dd76..d48790264d1 100644
--- a/homeassistant/components/reolink/light.py
+++ b/homeassistant/components/reolink/light.py
@@ -16,7 +16,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import (
     ReolinkChannelCoordinatorEntity,
@@ -92,7 +92,7 @@ HOST_LIGHT_ENTITIES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ReolinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Reolink light entities."""
     reolink_data: ReolinkData = config_entry.runtime_data
diff --git a/homeassistant/components/reolink/manifest.json b/homeassistant/components/reolink/manifest.json
index 83729fef3cd..82b9586cccc 100644
--- a/homeassistant/components/reolink/manifest.json
+++ b/homeassistant/components/reolink/manifest.json
@@ -19,5 +19,5 @@
   "iot_class": "local_push",
   "loggers": ["reolink_aio"],
   "quality_scale": "platinum",
-  "requirements": ["reolink-aio==0.11.8"]
+  "requirements": ["reolink-aio==0.13.0"]
 }
diff --git a/homeassistant/components/reolink/media_source.py b/homeassistant/components/reolink/media_source.py
index e912bfb5100..39514d58cb7 100644
--- a/homeassistant/components/reolink/media_source.py
+++ b/homeassistant/components/reolink/media_source.py
@@ -18,7 +18,6 @@ from homeassistant.components.media_source import (
     Unresolvable,
 )
 from homeassistant.components.stream import create_stream
-from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 
@@ -71,7 +70,7 @@ class ReolinkVODMediaSource(MediaSource):
         host = get_host(self.hass, config_entry_id)
 
         def get_vod_type() -> VodRequestType:
-            if filename.endswith(".mp4"):
+            if filename.endswith((".mp4", ".vref")):
                 if host.api.is_nvr:
                     return VodRequestType.DOWNLOAD
                 return VodRequestType.PLAYBACK
@@ -151,9 +150,7 @@ class ReolinkVODMediaSource(MediaSource):
 
         entity_reg = er.async_get(self.hass)
         device_reg = dr.async_get(self.hass)
-        for config_entry in self.hass.config_entries.async_entries(DOMAIN):
-            if config_entry.state != ConfigEntryState.LOADED:
-                continue
+        for config_entry in self.hass.config_entries.async_loaded_entries(DOMAIN):
             channels: list[str] = []
             host = config_entry.runtime_data.host
             entities = er.async_entries_for_config_entry(
@@ -222,7 +219,7 @@ class ReolinkVODMediaSource(MediaSource):
         if main_enc == "h265":
             _LOGGER.debug(
                 "Reolink camera %s uses h265 encoding for main stream,"
-                "playback only possible using sub stream",
+                "playback at high resolution may not work in all browsers/apps",
                 host.api.camera_name(channel),
             )
 
@@ -236,34 +233,29 @@ class ReolinkVODMediaSource(MediaSource):
                 can_play=False,
                 can_expand=True,
             ),
+            BrowseMediaSource(
+                domain=DOMAIN,
+                identifier=f"RES|{config_entry_id}|{channel}|main",
+                media_class=MediaClass.CHANNEL,
+                media_content_type=MediaType.PLAYLIST,
+                title="High resolution",
+                can_play=False,
+                can_expand=True,
+            ),
         ]
-        if main_enc != "h265":
-            children.append(
-                BrowseMediaSource(
-                    domain=DOMAIN,
-                    identifier=f"RES|{config_entry_id}|{channel}|main",
-                    media_class=MediaClass.CHANNEL,
-                    media_content_type=MediaType.PLAYLIST,
-                    title="High resolution",
-                    can_play=False,
-                    can_expand=True,
-                ),
-            )
 
         if host.api.supported(channel, "autotrack_stream"):
-            children.append(
-                BrowseMediaSource(
-                    domain=DOMAIN,
-                    identifier=f"RES|{config_entry_id}|{channel}|autotrack_sub",
-                    media_class=MediaClass.CHANNEL,
-                    media_content_type=MediaType.PLAYLIST,
-                    title="Autotrack low resolution",
-                    can_play=False,
-                    can_expand=True,
-                ),
-            )
-            if main_enc != "h265":
-                children.append(
+            children.extend(
+                [
+                    BrowseMediaSource(
+                        domain=DOMAIN,
+                        identifier=f"RES|{config_entry_id}|{channel}|autotrack_sub",
+                        media_class=MediaClass.CHANNEL,
+                        media_content_type=MediaType.PLAYLIST,
+                        title="Autotrack low resolution",
+                        can_play=False,
+                        can_expand=True,
+                    ),
                     BrowseMediaSource(
                         domain=DOMAIN,
                         identifier=f"RES|{config_entry_id}|{channel}|autotrack_main",
@@ -273,11 +265,7 @@ class ReolinkVODMediaSource(MediaSource):
                         can_play=False,
                         can_expand=True,
                     ),
-                )
-
-        if len(children) == 1:
-            return await self._async_generate_camera_days(
-                config_entry_id, channel, "sub"
+                ]
             )
 
         title = host.api.camera_name(channel)
diff --git a/homeassistant/components/reolink/number.py b/homeassistant/components/reolink/number.py
index e4b52c85d45..2a6fb740ee0 100644
--- a/homeassistant/components/reolink/number.py
+++ b/homeassistant/components/reolink/number.py
@@ -9,13 +9,14 @@ from typing import Any
 from reolink_aio.api import Chime, Host
 
 from homeassistant.components.number import (
+    NumberDeviceClass,
     NumberEntity,
     NumberEntityDescription,
     NumberMode,
 )
 from homeassistant.const import EntityCategory, UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import (
     ReolinkChannelCoordinatorEntity,
@@ -44,6 +45,19 @@ class ReolinkNumberEntityDescription(
     value: Callable[[Host, int], float | None]
 
 
+@dataclass(frozen=True, kw_only=True)
+class ReolinkSmartAINumberEntityDescription(
+    NumberEntityDescription,
+    ReolinkChannelEntityDescription,
+):
+    """A class that describes smart AI number entities."""
+
+    smart_type: str
+    method: Callable[[Host, int, int, float], Any]
+    mode: NumberMode = NumberMode.AUTO
+    value: Callable[[Host, int, int], float | None]
+
+
 @dataclass(frozen=True, kw_only=True)
 class ReolinkHostNumberEntityDescription(
     NumberEntityDescription,
@@ -125,6 +139,7 @@ NUMBER_ENTITIES = (
         cmd_key="GetPtzGuard",
         translation_key="guard_return_time",
         entity_category=EntityCategory.CONFIG,
+        device_class=NumberDeviceClass.DURATION,
         native_step=1,
         native_unit_of_measurement=UnitOfTime.SECONDS,
         native_min_value=10,
@@ -248,6 +263,7 @@ NUMBER_ENTITIES = (
         cmd_key="GetAiAlarm",
         translation_key="ai_face_delay",
         entity_category=EntityCategory.CONFIG,
+        device_class=NumberDeviceClass.DURATION,
         entity_registry_enabled_default=False,
         native_step=1,
         native_unit_of_measurement=UnitOfTime.SECONDS,
@@ -264,6 +280,7 @@ NUMBER_ENTITIES = (
         cmd_key="GetAiAlarm",
         translation_key="ai_person_delay",
         entity_category=EntityCategory.CONFIG,
+        device_class=NumberDeviceClass.DURATION,
         entity_registry_enabled_default=False,
         native_step=1,
         native_unit_of_measurement=UnitOfTime.SECONDS,
@@ -280,6 +297,7 @@ NUMBER_ENTITIES = (
         cmd_key="GetAiAlarm",
         translation_key="ai_vehicle_delay",
         entity_category=EntityCategory.CONFIG,
+        device_class=NumberDeviceClass.DURATION,
         entity_registry_enabled_default=False,
         native_step=1,
         native_unit_of_measurement=UnitOfTime.SECONDS,
@@ -296,6 +314,7 @@ NUMBER_ENTITIES = (
         cmd_key="GetAiAlarm",
         translation_key="ai_package_delay",
         entity_category=EntityCategory.CONFIG,
+        device_class=NumberDeviceClass.DURATION,
         entity_registry_enabled_default=False,
         native_step=1,
         native_unit_of_measurement=UnitOfTime.SECONDS,
@@ -312,6 +331,7 @@ NUMBER_ENTITIES = (
         cmd_key="GetAiAlarm",
         translation_key="ai_pet_delay",
         entity_category=EntityCategory.CONFIG,
+        device_class=NumberDeviceClass.DURATION,
         entity_registry_enabled_default=False,
         native_step=1,
         native_unit_of_measurement=UnitOfTime.SECONDS,
@@ -330,6 +350,7 @@ NUMBER_ENTITIES = (
         cmd_key="GetAiAlarm",
         translation_key="ai_animal_delay",
         entity_category=EntityCategory.CONFIG,
+        device_class=NumberDeviceClass.DURATION,
         entity_registry_enabled_default=False,
         native_step=1,
         native_unit_of_measurement=UnitOfTime.SECONDS,
@@ -346,6 +367,7 @@ NUMBER_ENTITIES = (
         cmd_key="GetAutoReply",
         translation_key="auto_quick_reply_time",
         entity_category=EntityCategory.CONFIG,
+        device_class=NumberDeviceClass.DURATION,
         native_step=1,
         native_unit_of_measurement=UnitOfTime.SECONDS,
         native_min_value=1,
@@ -385,6 +407,7 @@ NUMBER_ENTITIES = (
         cmd_key="GetAiCfg",
         translation_key="auto_track_disappear_time",
         entity_category=EntityCategory.CONFIG,
+        device_class=NumberDeviceClass.DURATION,
         native_step=1,
         native_unit_of_measurement=UnitOfTime.SECONDS,
         native_min_value=1,
@@ -400,6 +423,7 @@ NUMBER_ENTITIES = (
         cmd_key="GetAiCfg",
         translation_key="auto_track_stop_time",
         entity_category=EntityCategory.CONFIG,
+        device_class=NumberDeviceClass.DURATION,
         native_step=1,
         native_unit_of_measurement=UnitOfTime.SECONDS,
         native_min_value=1,
@@ -424,6 +448,7 @@ NUMBER_ENTITIES = (
     ReolinkNumberEntityDescription(
         key="image_brightness",
         cmd_key="GetImage",
+        cmd_id=26,
         translation_key="image_brightness",
         entity_category=EntityCategory.CONFIG,
         entity_registry_enabled_default=False,
@@ -437,6 +462,7 @@ NUMBER_ENTITIES = (
     ReolinkNumberEntityDescription(
         key="image_contrast",
         cmd_key="GetImage",
+        cmd_id=26,
         translation_key="image_contrast",
         entity_category=EntityCategory.CONFIG,
         entity_registry_enabled_default=False,
@@ -450,6 +476,7 @@ NUMBER_ENTITIES = (
     ReolinkNumberEntityDescription(
         key="image_saturation",
         cmd_key="GetImage",
+        cmd_id=26,
         translation_key="image_saturation",
         entity_category=EntityCategory.CONFIG,
         entity_registry_enabled_default=False,
@@ -463,6 +490,7 @@ NUMBER_ENTITIES = (
     ReolinkNumberEntityDescription(
         key="image_sharpness",
         cmd_key="GetImage",
+        cmd_id=26,
         translation_key="image_sharpness",
         entity_category=EntityCategory.CONFIG,
         entity_registry_enabled_default=False,
@@ -476,6 +504,7 @@ NUMBER_ENTITIES = (
     ReolinkNumberEntityDescription(
         key="image_hue",
         cmd_key="GetImage",
+        cmd_id=26,
         translation_key="image_hue",
         entity_category=EntityCategory.CONFIG,
         entity_registry_enabled_default=False,
@@ -488,6 +517,168 @@ NUMBER_ENTITIES = (
     ),
 )
 
+SMART_AI_NUMBER_ENTITIES = (
+    ReolinkSmartAINumberEntityDescription(
+        key="crossline_sensitivity",
+        smart_type="crossline",
+        cmd_id=527,
+        translation_key="crossline_sensitivity",
+        entity_category=EntityCategory.CONFIG,
+        entity_registry_enabled_default=False,
+        native_step=1,
+        native_min_value=0,
+        native_max_value=100,
+        supported=lambda api, ch: api.supported(ch, "ai_crossline"),
+        value=lambda api, ch, loc: (
+            api.baichuan.smart_ai_sensitivity(ch, "crossline", loc)
+        ),
+        method=lambda api, ch, loc, value: api.baichuan.set_smart_ai(
+            ch, "crossline", loc, sensitivity=int(value)
+        ),
+    ),
+    ReolinkSmartAINumberEntityDescription(
+        key="intrusion_sensitivity",
+        smart_type="intrusion",
+        cmd_id=529,
+        translation_key="intrusion_sensitivity",
+        entity_category=EntityCategory.CONFIG,
+        entity_registry_enabled_default=False,
+        native_step=1,
+        native_min_value=0,
+        native_max_value=100,
+        supported=lambda api, ch: api.supported(ch, "ai_intrusion"),
+        value=lambda api, ch, loc: (
+            api.baichuan.smart_ai_sensitivity(ch, "intrusion", loc)
+        ),
+        method=lambda api, ch, loc, value: api.baichuan.set_smart_ai(
+            ch, "intrusion", loc, sensitivity=int(value)
+        ),
+    ),
+    ReolinkSmartAINumberEntityDescription(
+        key="linger_sensitivity",
+        smart_type="loitering",
+        cmd_id=531,
+        translation_key="linger_sensitivity",
+        entity_category=EntityCategory.CONFIG,
+        entity_registry_enabled_default=False,
+        native_step=1,
+        native_min_value=0,
+        native_max_value=100,
+        supported=lambda api, ch: api.supported(ch, "ai_linger"),
+        value=lambda api, ch, loc: (
+            api.baichuan.smart_ai_sensitivity(ch, "loitering", loc)
+        ),
+        method=lambda api, ch, loc, value: api.baichuan.set_smart_ai(
+            ch, "loitering", loc, sensitivity=int(value)
+        ),
+    ),
+    ReolinkSmartAINumberEntityDescription(
+        key="forgotten_item_sensitivity",
+        smart_type="legacy",
+        cmd_id=549,
+        translation_key="forgotten_item_sensitivity",
+        entity_registry_enabled_default=False,
+        entity_category=EntityCategory.CONFIG,
+        native_step=1,
+        native_min_value=0,
+        native_max_value=100,
+        supported=lambda api, ch: api.supported(ch, "ai_forgotten_item"),
+        value=lambda api, ch, loc: (
+            api.baichuan.smart_ai_sensitivity(ch, "legacy", loc)
+        ),
+        method=lambda api, ch, loc, value: api.baichuan.set_smart_ai(
+            ch, "legacy", loc, sensitivity=int(value)
+        ),
+    ),
+    ReolinkSmartAINumberEntityDescription(
+        key="taken_item_sensitivity",
+        smart_type="loss",
+        cmd_id=551,
+        translation_key="taken_item_sensitivity",
+        entity_registry_enabled_default=False,
+        entity_category=EntityCategory.CONFIG,
+        native_step=1,
+        native_min_value=0,
+        native_max_value=100,
+        supported=lambda api, ch: api.supported(ch, "ai_taken_item"),
+        value=lambda api, ch, loc: api.baichuan.smart_ai_sensitivity(ch, "loss", loc),
+        method=lambda api, ch, loc, value: api.baichuan.set_smart_ai(
+            ch, "loss", loc, sensitivity=int(value)
+        ),
+    ),
+    ReolinkSmartAINumberEntityDescription(
+        key="intrusion_delay",
+        smart_type="intrusion",
+        cmd_id=529,
+        translation_key="intrusion_delay",
+        entity_registry_enabled_default=False,
+        entity_category=EntityCategory.CONFIG,
+        device_class=NumberDeviceClass.DURATION,
+        native_step=1,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        native_min_value=0,
+        native_max_value=10,
+        supported=lambda api, ch: api.supported(ch, "ai_intrusion"),
+        value=lambda api, ch, loc: api.baichuan.smart_ai_delay(ch, "intrusion", loc),
+        method=lambda api, ch, loc, value: api.baichuan.set_smart_ai(
+            ch, "intrusion", loc, delay=int(value)
+        ),
+    ),
+    ReolinkSmartAINumberEntityDescription(
+        key="linger_delay",
+        smart_type="loitering",
+        cmd_id=531,
+        translation_key="linger_delay",
+        entity_registry_enabled_default=False,
+        entity_category=EntityCategory.CONFIG,
+        native_step=1,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        native_min_value=1,
+        native_max_value=10,
+        supported=lambda api, ch: api.supported(ch, "ai_linger"),
+        value=lambda api, ch, loc: api.baichuan.smart_ai_delay(ch, "loitering", loc),
+        method=lambda api, ch, loc, value: api.baichuan.set_smart_ai(
+            ch, "loitering", loc, delay=int(value)
+        ),
+    ),
+    ReolinkSmartAINumberEntityDescription(
+        key="forgotten_item_delay",
+        smart_type="legacy",
+        cmd_id=549,
+        translation_key="forgotten_item_delay",
+        entity_registry_enabled_default=False,
+        entity_category=EntityCategory.CONFIG,
+        device_class=NumberDeviceClass.DURATION,
+        native_step=1,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        native_min_value=1,
+        native_max_value=30,
+        supported=lambda api, ch: api.supported(ch, "ai_forgotten_item"),
+        value=lambda api, ch, loc: api.baichuan.smart_ai_delay(ch, "legacy", loc),
+        method=lambda api, ch, loc, value: api.baichuan.set_smart_ai(
+            ch, "legacy", loc, delay=int(value)
+        ),
+    ),
+    ReolinkSmartAINumberEntityDescription(
+        key="taken_item_delay",
+        smart_type="loss",
+        cmd_id=551,
+        translation_key="taken_item_delay",
+        entity_registry_enabled_default=False,
+        entity_category=EntityCategory.CONFIG,
+        device_class=NumberDeviceClass.DURATION,
+        native_step=1,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        native_min_value=1,
+        native_max_value=30,
+        supported=lambda api, ch: api.supported(ch, "ai_taken_item"),
+        value=lambda api, ch, loc: api.baichuan.smart_ai_delay(ch, "loss", loc),
+        method=lambda api, ch, loc, value: api.baichuan.set_smart_ai(
+            ch, "loss", loc, delay=int(value)
+        ),
+    ),
+)
+
 HOST_NUMBER_ENTITIES = (
     ReolinkHostNumberEntityDescription(
         key="alarm_volume",
@@ -533,26 +724,36 @@ CHIME_NUMBER_ENTITIES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ReolinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Reolink number entities."""
     reolink_data: ReolinkData = config_entry.runtime_data
+    api = reolink_data.host.api
 
     entities: list[NumberEntity] = [
         ReolinkNumberEntity(reolink_data, channel, entity_description)
         for entity_description in NUMBER_ENTITIES
-        for channel in reolink_data.host.api.channels
-        if entity_description.supported(reolink_data.host.api, channel)
+        for channel in api.channels
+        if entity_description.supported(api, channel)
     ]
+    entities.extend(
+        ReolinkSmartAINumberEntity(reolink_data, channel, location, entity_description)
+        for entity_description in SMART_AI_NUMBER_ENTITIES
+        for channel in api.channels
+        for location in api.baichuan.smart_location_list(
+            channel, entity_description.smart_type
+        )
+        if entity_description.supported(api, channel)
+    )
     entities.extend(
         ReolinkHostNumberEntity(reolink_data, entity_description)
         for entity_description in HOST_NUMBER_ENTITIES
-        if entity_description.supported(reolink_data.host.api)
+        if entity_description.supported(api)
     )
     entities.extend(
         ReolinkChimeNumberEntity(reolink_data, chime, entity_description)
         for entity_description in CHIME_NUMBER_ENTITIES
-        for chime in reolink_data.host.api.chime_list
+        for chime in api.chime_list
     )
     async_add_entities(entities)
 
@@ -594,6 +795,51 @@ class ReolinkNumberEntity(ReolinkChannelCoordinatorEntity, NumberEntity):
         self.async_write_ha_state()
 
 
+class ReolinkSmartAINumberEntity(ReolinkChannelCoordinatorEntity, NumberEntity):
+    """Base smart AI number entity class for Reolink IP cameras."""
+
+    entity_description: ReolinkSmartAINumberEntityDescription
+
+    def __init__(
+        self,
+        reolink_data: ReolinkData,
+        channel: int,
+        location: int,
+        entity_description: ReolinkSmartAINumberEntityDescription,
+    ) -> None:
+        """Initialize Reolink number entity."""
+        self.entity_description = entity_description
+        super().__init__(reolink_data, channel)
+
+        unique_index = self._host.api.baichuan.smart_ai_index(
+            channel, entity_description.smart_type, location
+        )
+        self._attr_unique_id = f"{self._attr_unique_id}_{unique_index}"
+
+        self._location = location
+        self._attr_mode = entity_description.mode
+        self._attr_translation_placeholders = {
+            "zone_name": self._host.api.baichuan.smart_ai_name(
+                channel, entity_description.smart_type, location
+            )
+        }
+
+    @property
+    def native_value(self) -> float | None:
+        """State of the number entity."""
+        return self.entity_description.value(
+            self._host.api, self._channel, self._location
+        )
+
+    @raise_translated_error
+    async def async_set_native_value(self, value: float) -> None:
+        """Update the current value."""
+        await self.entity_description.method(
+            self._host.api, self._channel, self._location, value
+        )
+        self.async_write_ha_state()
+
+
 class ReolinkHostNumberEntity(ReolinkHostCoordinatorEntity, NumberEntity):
     """Base number entity class for Reolink Host."""
 
diff --git a/homeassistant/components/reolink/select.py b/homeassistant/components/reolink/select.py
index 7a74be2e28c..e5d66ed3901 100644
--- a/homeassistant/components/reolink/select.py
+++ b/homeassistant/components/reolink/select.py
@@ -23,13 +23,15 @@ from reolink_aio.api import (
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.const import EntityCategory, UnitOfDataRate, UnitOfFrequency
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import (
     ReolinkChannelCoordinatorEntity,
     ReolinkChannelEntityDescription,
     ReolinkChimeCoordinatorEntity,
     ReolinkChimeEntityDescription,
+    ReolinkHostCoordinatorEntity,
+    ReolinkHostEntityDescription,
 )
 from .util import ReolinkConfigEntry, ReolinkData, raise_translated_error
 
@@ -49,6 +51,18 @@ class ReolinkSelectEntityDescription(
     value: Callable[[Host, int], str] | None = None
 
 
+@dataclass(frozen=True, kw_only=True)
+class ReolinkHostSelectEntityDescription(
+    SelectEntityDescription,
+    ReolinkHostEntityDescription,
+):
+    """A class that describes host select entities."""
+
+    get_options: Callable[[Host], list[str]]
+    method: Callable[[Host, str], Any]
+    value: Callable[[Host], str]
+
+
 @dataclass(frozen=True, kw_only=True)
 class ReolinkChimeSelectEntityDescription(
     SelectEntityDescription,
@@ -80,6 +94,7 @@ SELECT_ENTITIES = (
     ReolinkSelectEntityDescription(
         key="day_night_mode",
         cmd_key="GetIsp",
+        cmd_id=26,
         translation_key="day_night_mode",
         entity_category=EntityCategory.CONFIG,
         get_options=[mode.name for mode in DayNightEnum],
@@ -237,6 +252,19 @@ SELECT_ENTITIES = (
     ),
 )
 
+HOST_SELECT_ENTITIES = (
+    ReolinkHostSelectEntityDescription(
+        key="scene_mode",
+        cmd_key="GetScene",
+        translation_key="scene_mode",
+        entity_category=EntityCategory.CONFIG,
+        get_options=lambda api: api.baichuan.scene_names,
+        supported=lambda api: api.supported(None, "scenes"),
+        value=lambda api: api.baichuan.active_scene,
+        method=lambda api, name: api.baichuan.set_scene(scene_name=name),
+    ),
+)
+
 CHIME_SELECT_ENTITIES = (
     ReolinkChimeSelectEntityDescription(
         key="motion_tone",
@@ -294,17 +322,24 @@ CHIME_SELECT_ENTITIES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ReolinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Reolink select entities."""
     reolink_data: ReolinkData = config_entry.runtime_data
 
-    entities: list[ReolinkSelectEntity | ReolinkChimeSelectEntity] = [
+    entities: list[
+        ReolinkSelectEntity | ReolinkHostSelectEntity | ReolinkChimeSelectEntity
+    ] = [
         ReolinkSelectEntity(reolink_data, channel, entity_description)
         for entity_description in SELECT_ENTITIES
         for channel in reolink_data.host.api.channels
         if entity_description.supported(reolink_data.host.api, channel)
     ]
+    entities.extend(
+        ReolinkHostSelectEntity(reolink_data, entity_description)
+        for entity_description in HOST_SELECT_ENTITIES
+        if entity_description.supported(reolink_data.host.api)
+    )
     entities.extend(
         ReolinkChimeSelectEntity(reolink_data, chime, entity_description)
         for entity_description in CHIME_SELECT_ENTITIES
@@ -359,6 +394,33 @@ class ReolinkSelectEntity(ReolinkChannelCoordinatorEntity, SelectEntity):
         self.async_write_ha_state()
 
 
+class ReolinkHostSelectEntity(ReolinkHostCoordinatorEntity, SelectEntity):
+    """Base select entity class for Reolink Host."""
+
+    entity_description: ReolinkHostSelectEntityDescription
+
+    def __init__(
+        self,
+        reolink_data: ReolinkData,
+        entity_description: ReolinkHostSelectEntityDescription,
+    ) -> None:
+        """Initialize Reolink select entity."""
+        self.entity_description = entity_description
+        super().__init__(reolink_data)
+        self._attr_options = entity_description.get_options(self._host.api)
+
+    @property
+    def current_option(self) -> str | None:
+        """Return the current option."""
+        return self.entity_description.value(self._host.api)
+
+    @raise_translated_error
+    async def async_select_option(self, option: str) -> None:
+        """Change the selected option."""
+        await self.entity_description.method(self._host.api, option)
+        self.async_write_ha_state()
+
+
 class ReolinkChimeSelectEntity(ReolinkChimeCoordinatorEntity, SelectEntity):
     """Base select entity class for Reolink IP cameras."""
 
diff --git a/homeassistant/components/reolink/sensor.py b/homeassistant/components/reolink/sensor.py
index 36900da99ca..85de03dd1a3 100644
--- a/homeassistant/components/reolink/sensor.py
+++ b/homeassistant/components/reolink/sensor.py
@@ -18,7 +18,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .entity import (
@@ -107,6 +107,17 @@ SENSORS = (
         value=lambda api, ch: BatteryEnum(api.battery_status(ch)).name,
         supported=lambda api, ch: api.supported(ch, "battery"),
     ),
+    ReolinkSensorEntityDescription(
+        key="day_night_state",
+        cmd_id=33,
+        cmd_key="296",
+        translation_key="day_night_state",
+        device_class=SensorDeviceClass.ENUM,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        options=["day", "night", "led_day"],
+        value=lambda api, ch: api.baichuan.day_night_state(ch),
+        supported=lambda api, ch: api.supported(ch, "day_night_state"),
+    ),
 )
 
 HOST_SENSORS = (
@@ -150,7 +161,7 @@ HDD_SENSORS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ReolinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Reolink IP Camera."""
     reolink_data: ReolinkData = config_entry.runtime_data
diff --git a/homeassistant/components/reolink/services.py b/homeassistant/components/reolink/services.py
index acd31fe0d7d..d170aa32379 100644
--- a/homeassistant/components/reolink/services.py
+++ b/homeassistant/components/reolink/services.py
@@ -40,7 +40,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
             if (
                 config_entry is None
                 or device is None
-                or config_entry.state == ConfigEntryState.NOT_LOADED
+                or config_entry.state != ConfigEntryState.LOADED
             ):
                 raise ServiceValidationError(
                     translation_domain=DOMAIN,
diff --git a/homeassistant/components/reolink/siren.py b/homeassistant/components/reolink/siren.py
index 74bb227d078..f5d2de977ae 100644
--- a/homeassistant/components/reolink/siren.py
+++ b/homeassistant/components/reolink/siren.py
@@ -13,7 +13,7 @@ from homeassistant.components.siren import (
     SirenEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import ReolinkChannelCoordinatorEntity, ReolinkChannelEntityDescription
 from .util import ReolinkConfigEntry, ReolinkData, raise_translated_error
@@ -40,7 +40,7 @@ SIREN_ENTITIES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ReolinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Reolink siren entities."""
     reolink_data: ReolinkData = config_entry.runtime_data
diff --git a/homeassistant/components/reolink/strings.json b/homeassistant/components/reolink/strings.json
index 412362fc447..9a6db7b5d67 100644
--- a/homeassistant/components/reolink/strings.json
+++ b/homeassistant/components/reolink/strings.json
@@ -8,16 +8,22 @@
           "host": "[%key:common::config_flow::data::host%]",
           "port": "[%key:common::config_flow::data::port%]",
           "use_https": "Enable HTTPS",
+          "baichuan_port": "Basic service port",
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]"
         },
         "data_description": {
           "host": "The hostname or IP address of your Reolink device. For example: '192.168.1.25'.",
-          "port": "The port to connect to the Reolink device. For HTTP normally: '80', for HTTPS normally '443'.",
+          "port": "The HTTP(s) port to connect to the Reolink device API. For HTTP normally: '80', for HTTPS normally '443'.",
           "use_https": "Use a HTTPS (SSL) connection to the Reolink device.",
+          "baichuan_port": "The 'Basic Service Port' to connect to the Reolink device over TCP. Normally '9000' unless manually changed in the Reolink desktop client.",
           "username": "Username to login to the Reolink device itself. Not the Reolink cloud account.",
           "password": "Password to login to the Reolink device itself. Not the Reolink cloud account."
         }
+      },
+      "privacy": {
+        "title": "Permission to disable Reolink privacy mode",
+        "description": "Privacy mode is enabled on Reolink device {host}. By pressing SUBMIT, the privacy mode will be disabled to retrieve the necessary information from the Reolink device. You can abort the setup by pressing X and repeat the setup at a time in which privacy mode can be disabled. After this configuration, you are free to enable the privacy mode again using the privacy mode switch entity. During normal startup the privacy mode will not be disabled. Note however that all entities will be marked unavailable as long as the privacy mode is active."
       }
     },
     "error": {
@@ -25,7 +31,7 @@
       "cannot_connect": "Failed to connect, check the IP address of the camera",
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "not_admin": "User needs to be admin, user \"{username}\" has authorisation level \"{userlevel}\"",
-      "password_incompatible": "Password contains incompatible special character, only these characters are allowed: a-z, A-Z, 0-9 or {special_chars}",
+      "password_incompatible": "Password contains incompatible special character or is too long, maximum 31 characters and only these characters are allowed: a-z, A-Z, 0-9 or {special_chars}",
       "unknown": "[%key:common::config_flow::error::unknown%]",
       "update_needed": "Failed to login because of outdated firmware, please update the firmware to version {needed_firmware} using the Reolink Download Center: {download_center_url}, currently version {current_firmware} is installed",
       "webhook_exception": "Home Assistant URL is not available, go to Settings > System > Network > Home Assistant URL and correct the URLs, see {more_info}"
@@ -96,7 +102,13 @@
       "message": "Error trying to update Reolink firmware: {err}"
     },
     "config_entry_not_ready": {
-      "message": "Error while trying to setup {host}: {err}"
+      "message": "Error while trying to set up {host}: {err}"
+    },
+    "update_already_running": {
+      "message": "Reolink firmware update already running, wait on completion before starting another"
+    },
+    "firmware_rate_limit": {
+      "message": "Reolink firmware update server reached hourly rate limit: updating can be tried again in 1 hour"
     }
   },
   "issues": {
@@ -122,7 +134,11 @@
     },
     "hub_switch_deprecated": {
       "title": "Reolink Home Hub switches deprecated",
-      "description": "The redundant 'Record', 'Email on event', 'FTP upload', 'Push notifications', and 'Buzzer on event' switches on the Reolink Home Hub are depricated since the new firmware no longer supports these. Please use the equally named switches under each of the camera devices connected to the Home Hub instead. To remove this issue, please adjust automations accordingly and disable the switch entities mentioned."
+      "description": "The redundant 'Record', 'Email on event', 'FTP upload', 'Push notifications', and 'Buzzer on event' switches on the Reolink Home Hub are deprecated since the new firmware no longer supports these. Please use the equally named switches under each of the camera devices connected to the Home Hub instead. To remove this issue, please adjust automations accordingly and disable the switch entities mentioned."
+    },
+    "password_too_long": {
+      "title": "Reolink password too long",
+      "description": "The password for \"{name}\" is more than 31 characters long, this is no longer compatible with the Reolink API. Please change the password using the Reolink app/client to a password with is shorter than 32 characters. After changing the password, fill in the new password in the Reolink Re-authentication flow to continue using this integration. The latest version of the Reolink app/client also has a password limit of 31 characters."
     }
   },
   "services": {
@@ -331,6 +347,83 @@
           "off": "Awake",
           "on": "Sleeping"
         }
+      },
+      "crossline_person": {
+        "name": "Crossline {zone_name} person",
+        "state": {
+          "off": "[%key:component::binary_sensor::entity_component::gas::state::off%]",
+          "on": "[%key:component::binary_sensor::entity_component::gas::state::on%]"
+        }
+      },
+      "crossline_vehicle": {
+        "name": "Crossline {zone_name} vehicle",
+        "state": {
+          "off": "[%key:component::binary_sensor::entity_component::gas::state::off%]",
+          "on": "[%key:component::binary_sensor::entity_component::gas::state::on%]"
+        }
+      },
+      "crossline_dog_cat": {
+        "name": "Crossline {zone_name} animal",
+        "state": {
+          "off": "[%key:component::binary_sensor::entity_component::gas::state::off%]",
+          "on": "[%key:component::binary_sensor::entity_component::gas::state::on%]"
+        }
+      },
+      "intrusion_person": {
+        "name": "Intrusion {zone_name} person",
+        "state": {
+          "off": "[%key:component::binary_sensor::entity_component::gas::state::off%]",
+          "on": "[%key:component::binary_sensor::entity_component::gas::state::on%]"
+        }
+      },
+      "intrusion_vehicle": {
+        "name": "Intrusion {zone_name} vehicle",
+        "state": {
+          "off": "[%key:component::binary_sensor::entity_component::gas::state::off%]",
+          "on": "[%key:component::binary_sensor::entity_component::gas::state::on%]"
+        }
+      },
+      "intrusion_dog_cat": {
+        "name": "Intrusion {zone_name} animal",
+        "state": {
+          "off": "[%key:component::binary_sensor::entity_component::gas::state::off%]",
+          "on": "[%key:component::binary_sensor::entity_component::gas::state::on%]"
+        }
+      },
+      "linger_person": {
+        "name": "Linger {zone_name} person",
+        "state": {
+          "off": "[%key:component::binary_sensor::entity_component::gas::state::off%]",
+          "on": "[%key:component::binary_sensor::entity_component::gas::state::on%]"
+        }
+      },
+      "linger_vehicle": {
+        "name": "Linger {zone_name} vehicle",
+        "state": {
+          "off": "[%key:component::binary_sensor::entity_component::gas::state::off%]",
+          "on": "[%key:component::binary_sensor::entity_component::gas::state::on%]"
+        }
+      },
+      "linger_dog_cat": {
+        "name": "Linger {zone_name} animal",
+        "state": {
+          "off": "[%key:component::binary_sensor::entity_component::gas::state::off%]",
+          "on": "[%key:component::binary_sensor::entity_component::gas::state::on%]"
+        }
+      },
+      "forgotten_item": {
+        "name": "Item forgotten {zone_name}",
+        "state": {
+          "off": "[%key:component::binary_sensor::entity_component::gas::state::off%]",
+          "on": "[%key:component::binary_sensor::entity_component::gas::state::on%]"
+        }
+      },
+      "taken_item": {
+        "name": "Item taken {zone_name}",
+        "state": {
+          "off": "[%key:component::binary_sensor::entity_component::gas::state::off%]",
+          "on": "[%key:component::binary_sensor::entity_component::gas::state::on%]"
+        }
       }
     },
     "button": {
@@ -475,6 +568,21 @@
       "ai_animal_sensitivity": {
         "name": "AI animal sensitivity"
       },
+      "crossline_sensitivity": {
+        "name": "AI crossline {zone_name} sensitivity"
+      },
+      "intrusion_sensitivity": {
+        "name": "AI intrusion {zone_name} sensitivity"
+      },
+      "linger_sensitivity": {
+        "name": "AI linger {zone_name} sensitivity"
+      },
+      "forgotten_item_sensitivity": {
+        "name": "AI item forgotten {zone_name} sensitivity"
+      },
+      "taken_item_sensitivity": {
+        "name": "AI item taken {zone_name} sensitivity"
+      },
       "ai_face_delay": {
         "name": "AI face delay"
       },
@@ -493,6 +601,18 @@
       "ai_animal_delay": {
         "name": "AI animal delay"
       },
+      "intrusion_delay": {
+        "name": "AI intrusion {zone_name} delay"
+      },
+      "linger_delay": {
+        "name": "AI linger {zone_name} delay"
+      },
+      "forgotten_item_delay": {
+        "name": "AI item forgotten {zone_name} delay"
+      },
+      "taken_item_delay": {
+        "name": "AI item taken {zone_name} delay"
+      },
       "auto_quick_reply_time": {
         "name": "Auto quick reply time"
       },
@@ -716,6 +836,15 @@
       },
       "sub_bit_rate": {
         "name": "Fluent bit rate"
+      },
+      "scene_mode": {
+        "name": "Scene mode",
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "disarm": "Disarmed",
+          "home": "Home",
+          "away": "Away"
+        }
       }
     },
     "sensor": {
@@ -737,11 +866,19 @@
       "battery_state": {
         "name": "Battery state",
         "state": {
-          "discharging": "Discharging",
-          "charging": "Charging",
+          "discharging": "[%key:common::state::discharging%]",
+          "charging": "[%key:common::state::charging%]",
           "chargecomplete": "Charge complete"
         }
       },
+      "day_night_state": {
+        "name": "Day night state",
+        "state": {
+          "day": "Color",
+          "night": "Black & white",
+          "led_day": "Color with floodlight"
+        }
+      },
       "hdd_storage": {
         "name": "HDD {hdd_index} storage"
       },
@@ -808,6 +945,9 @@
       },
       "led": {
         "name": "LED"
+      },
+      "privacy_mode": {
+        "name": "Privacy mode"
       }
     }
   }
diff --git a/homeassistant/components/reolink/switch.py b/homeassistant/components/reolink/switch.py
index 85c35b5c987..af87a75eece 100644
--- a/homeassistant/components/reolink/switch.py
+++ b/homeassistant/components/reolink/switch.py
@@ -12,7 +12,7 @@ from homeassistant.components.switch import SwitchEntity, SwitchEntityDescriptio
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er, issue_registry as ir
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import (
@@ -162,6 +162,7 @@ SWITCH_ENTITIES = (
     ReolinkSwitchEntityDescription(
         key="manual_record",
         cmd_key="GetManualRec",
+        cmd_id=588,
         translation_key="manual_record",
         entity_category=EntityCategory.CONFIG,
         supported=lambda api, ch: api.supported(ch, "manual_record"),
@@ -206,6 +207,15 @@ SWITCH_ENTITIES = (
         value=lambda api, ch: api.pir_reduce_alarm(ch) is True,
         method=lambda api, ch, value: api.set_pir(ch, reduce_alarm=value),
     ),
+    ReolinkSwitchEntityDescription(
+        key="privacy_mode",
+        always_available=True,
+        translation_key="privacy_mode",
+        entity_category=EntityCategory.CONFIG,
+        supported=lambda api, ch: api.supported(ch, "privacy_mode"),
+        value=lambda api, ch: api.baichuan.privacy_mode(ch),
+        method=lambda api, ch, value: api.baichuan.set_privacy_mode(ch, value),
+    ),
 )
 
 NVR_SWITCH_ENTITIES = (
@@ -321,7 +331,7 @@ DEPRECATED_NVR_SWITCHES = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ReolinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Reolink switch entities."""
     reolink_data: ReolinkData = config_entry.runtime_data
diff --git a/homeassistant/components/reolink/update.py b/homeassistant/components/reolink/update.py
index 5a8c7d7dc08..a7c883003b7 100644
--- a/homeassistant/components/reolink/update.py
+++ b/homeassistant/components/reolink/update.py
@@ -16,7 +16,7 @@ from homeassistant.components.update import (
 )
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
@@ -31,7 +31,7 @@ from .entity import (
     ReolinkHostCoordinatorEntity,
     ReolinkHostEntityDescription,
 )
-from .util import ReolinkConfigEntry, ReolinkData
+from .util import ReolinkConfigEntry, ReolinkData, raise_translated_error
 
 PARALLEL_UPDATES = 0
 RESUME_AFTER_INSTALL = 15
@@ -75,7 +75,7 @@ HOST_UPDATE_ENTITIES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ReolinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up update entities for Reolink component."""
     reolink_data: ReolinkData = config_entry.runtime_data
@@ -184,6 +184,7 @@ class ReolinkUpdateBaseEntity(
             f"## Release notes\n\n{new_firmware.release_notes}"
         )
 
+    @raise_translated_error
     async def async_install(
         self, version: str | None, backup: bool, **kwargs: Any
     ) -> None:
@@ -196,6 +197,8 @@ class ReolinkUpdateBaseEntity(
         try:
             await self._host.api.update_firmware(self._channel)
         except ReolinkError as err:
+            if err.translation_key:
+                raise
             raise HomeAssistantError(
                 translation_domain=DOMAIN,
                 translation_key="firmware_install_error",
diff --git a/homeassistant/components/reolink/util.py b/homeassistant/components/reolink/util.py
index e43391f19fb..12b4825caeb 100644
--- a/homeassistant/components/reolink/util.py
+++ b/homeassistant/components/reolink/util.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from collections.abc import Awaitable, Callable, Coroutine
 from dataclasses import dataclass
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from reolink_aio.exceptions import (
     ApiError,
@@ -26,10 +26,16 @@ from homeassistant.components.media_source import Unresolvable
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.storage import Store
+from homeassistant.helpers.translation import async_get_exception_message
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import DOMAIN
-from .host import ReolinkHost
+
+if TYPE_CHECKING:
+    from .host import ReolinkHost
+
+STORAGE_VERSION = 1
 
 type ReolinkConfigEntry = config_entries.ConfigEntry[ReolinkData]
 
@@ -64,6 +70,11 @@ def get_host(hass: HomeAssistant, config_entry_id: str) -> ReolinkHost:
     return config_entry.runtime_data.host
 
 
+def get_store(hass: HomeAssistant, config_entry_id: str) -> Store[str]:
+    """Return the reolink store."""
+    return Store[str](hass, STORAGE_VERSION, f"{DOMAIN}.{config_entry_id}.json")
+
+
 def get_device_uid_and_ch(
     device: dr.DeviceEntry, host: ReolinkHost
 ) -> tuple[list[str], int | None, bool]:
@@ -87,6 +98,30 @@ def get_device_uid_and_ch(
     return (device_uid, ch, is_chime)
 
 
+def check_translation_key(err: ReolinkError) -> str | None:
+    """Check if the translation key from the upstream library is present."""
+    if not err.translation_key:
+        return None
+    if async_get_exception_message(DOMAIN, err.translation_key) == err.translation_key:
+        # translation key not found in strings.json
+        return None
+    return err.translation_key
+
+
+_EXCEPTION_TO_TRANSLATION_KEY = {
+    ApiError: "api_error",
+    InvalidContentTypeError: "invalid_content_type",
+    CredentialsInvalidError: "invalid_credentials",
+    LoginError: "login_error",
+    NoDataError: "no_data",
+    UnexpectedDataError: "unexpected_data",
+    NotSupportedError: "not_supported",
+    SubscriptionError: "subscription_error",
+    ReolinkConnectionError: "connection_error",
+    ReolinkTimeoutError: "timeout",
+}
+
+
 # Decorators
 def raise_translated_error[**P, R](
     func: Callable[P, Awaitable[R]],
@@ -100,73 +135,14 @@ def raise_translated_error[**P, R](
         except InvalidParameterError as err:
             raise ServiceValidationError(
                 translation_domain=DOMAIN,
-                translation_key="invalid_parameter",
-                translation_placeholders={"err": str(err)},
-            ) from err
-        except ApiError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="api_error",
-                translation_placeholders={"err": str(err)},
-            ) from err
-        except InvalidContentTypeError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="invalid_content_type",
-                translation_placeholders={"err": str(err)},
-            ) from err
-        except CredentialsInvalidError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="invalid_credentials",
-                translation_placeholders={"err": str(err)},
-            ) from err
-        except LoginError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="login_error",
-                translation_placeholders={"err": str(err)},
-            ) from err
-        except NoDataError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="no_data",
-                translation_placeholders={"err": str(err)},
-            ) from err
-        except UnexpectedDataError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="unexpected_data",
-                translation_placeholders={"err": str(err)},
-            ) from err
-        except NotSupportedError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="not_supported",
-                translation_placeholders={"err": str(err)},
-            ) from err
-        except SubscriptionError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="subscription_error",
-                translation_placeholders={"err": str(err)},
-            ) from err
-        except ReolinkConnectionError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="connection_error",
-                translation_placeholders={"err": str(err)},
-            ) from err
-        except ReolinkTimeoutError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="timeout",
+                translation_key=check_translation_key(err) or "invalid_parameter",
                 translation_placeholders={"err": str(err)},
             ) from err
         except ReolinkError as err:
             raise HomeAssistantError(
                 translation_domain=DOMAIN,
-                translation_key="unexpected",
+                translation_key=check_translation_key(err)
+                or _EXCEPTION_TO_TRANSLATION_KEY.get(type(err), "unexpected"),
                 translation_placeholders={"err": str(err)},
             ) from err
 
diff --git a/homeassistant/components/reolink/views.py b/homeassistant/components/reolink/views.py
index 1a4585bc997..44265244b18 100644
--- a/homeassistant/components/reolink/views.py
+++ b/homeassistant/components/reolink/views.py
@@ -83,7 +83,16 @@ class PlaybackProxyView(HomeAssistantView):
             _LOGGER.warning("Reolink playback proxy error: %s", str(err))
             return web.Response(body=str(err), status=HTTPStatus.BAD_REQUEST)
 
+        headers = dict(request.headers)
+        headers.pop("Host", None)
+        headers.pop("Referer", None)
+
         if _LOGGER.isEnabledFor(logging.DEBUG):
+            _LOGGER.debug(
+                "Requested Playback Proxy Method %s, Headers: %s",
+                request.method,
+                headers,
+            )
             _LOGGER.debug(
                 "Opening VOD stream from %s: %s",
                 host.api.camera_name(ch),
@@ -93,6 +102,7 @@ class PlaybackProxyView(HomeAssistantView):
         try:
             reolink_response = await self.session.get(
                 reolink_url,
+                headers=headers,
                 timeout=ClientTimeout(
                     connect=15, sock_connect=15, sock_read=5, total=None
                 ),
@@ -118,18 +128,25 @@ class PlaybackProxyView(HomeAssistantView):
         ]:
             err_str = f"Reolink playback expected video/mp4 but got {reolink_response.content_type}"
             _LOGGER.error(err_str)
+            if reolink_response.content_type == "text/html":
+                text = await reolink_response.text()
+                _LOGGER.debug(text)
             return web.Response(body=err_str, status=HTTPStatus.BAD_REQUEST)
 
-        response = web.StreamResponse(
-            status=200,
-            reason="OK",
-            headers={
-                "Content-Type": "video/mp4",
-            },
+        response_headers = dict(reolink_response.headers)
+        _LOGGER.debug(
+            "Response Playback Proxy Status %s:%s, Headers: %s",
+            reolink_response.status,
+            reolink_response.reason,
+            response_headers,
         )
+        response_headers["Content-Type"] = "video/mp4"
 
-        if reolink_response.content_length is not None:
-            response.content_length = reolink_response.content_length
+        response = web.StreamResponse(
+            status=reolink_response.status,
+            reason=reolink_response.reason,
+            headers=response_headers,
+        )
 
         await response.prepare(request)
 
@@ -141,7 +158,8 @@ class PlaybackProxyView(HomeAssistantView):
                 "Timeout while reading Reolink playback from %s, writing EOF",
                 host.api.nvr_name,
             )
+        finally:
+            reolink_response.release()
 
-        reolink_response.release()
         await response.write_eof()
         return response
diff --git a/homeassistant/components/repetier/__init__.py b/homeassistant/components/repetier/__init__.py
index 27ddc62a847..16c92d6cd37 100644
--- a/homeassistant/components/repetier/__init__.py
+++ b/homeassistant/components/repetier/__init__.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import load_platform
 from homeassistant.helpers.dispatcher import dispatcher_send
 from homeassistant.helpers.event import track_time_interval
diff --git a/homeassistant/components/rest/binary_sensor.py b/homeassistant/components/rest/binary_sensor.py
index c976506d1ba..fa5bd388009 100644
--- a/homeassistant/components/rest/binary_sensor.py
+++ b/homeassistant/components/rest/binary_sensor.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.trigger_template_entity import (
diff --git a/homeassistant/components/rest/notify.py b/homeassistant/components/rest/notify.py
index 1ca3c55e2b2..ace216e1918 100644
--- a/homeassistant/components/rest/notify.py
+++ b/homeassistant/components/rest/notify.py
@@ -31,7 +31,7 @@ from homeassistant.const import (
     HTTP_DIGEST_AUTHENTICATION,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.httpx_client import get_async_client
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/rest/schema.py b/homeassistant/components/rest/schema.py
index f7fd8a36113..62ed2d5c5b2 100644
--- a/homeassistant/components/rest/schema.py
+++ b/homeassistant/components/rest/schema.py
@@ -26,7 +26,7 @@ from homeassistant.const import (
     HTTP_BASIC_AUTHENTICATION,
     HTTP_DIGEST_AUTHENTICATION,
 )
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.trigger_template_entity import (
     CONF_AVAILABILITY,
     TEMPLATE_ENTITY_BASE_SCHEMA,
diff --git a/homeassistant/components/rest/sensor.py b/homeassistant/components/rest/sensor.py
index fc6ce8c6749..b95e6dd72b7 100644
--- a/homeassistant/components/rest/sensor.py
+++ b/homeassistant/components/rest/sensor.py
@@ -29,7 +29,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.trigger_template_entity import (
diff --git a/homeassistant/components/rest_command/__init__.py b/homeassistant/components/rest_command/__init__.py
index ee93fde35fa..c6a4206de4a 100644
--- a/homeassistant/components/rest_command/__init__.py
+++ b/homeassistant/components/rest_command/__init__.py
@@ -30,10 +30,11 @@ from homeassistant.core import (
     callback,
 )
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.reload import async_integration_yaml_config
 from homeassistant.helpers.typing import ConfigType
+from homeassistant.util.ssl import SSLCipherList
 
 DOMAIN = "rest_command"
 
@@ -46,6 +47,7 @@ DEFAULT_VERIFY_SSL = True
 SUPPORT_REST_METHODS = ["get", "patch", "post", "put", "delete"]
 
 CONF_CONTENT_TYPE = "content_type"
+CONF_INSECURE_CIPHER = "insecure_cipher"
 
 COMMAND_SCHEMA = vol.Schema(
     {
@@ -60,6 +62,7 @@ COMMAND_SCHEMA = vol.Schema(
         vol.Optional(CONF_TIMEOUT, default=DEFAULT_TIMEOUT): vol.Coerce(int),
         vol.Optional(CONF_CONTENT_TYPE): cv.string,
         vol.Optional(CONF_VERIFY_SSL, default=DEFAULT_VERIFY_SSL): cv.boolean,
+        vol.Optional(CONF_INSECURE_CIPHER, default=False): cv.boolean,
     }
 )
 
@@ -91,7 +94,15 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     @callback
     def async_register_rest_command(name: str, command_config: dict[str, Any]) -> None:
         """Create service for rest command."""
-        websession = async_get_clientsession(hass, command_config[CONF_VERIFY_SSL])
+        websession = async_get_clientsession(
+            hass,
+            command_config[CONF_VERIFY_SSL],
+            ssl_cipher=(
+                SSLCipherList.INSECURE
+                if command_config[CONF_INSECURE_CIPHER]
+                else SSLCipherList.PYTHON_DEFAULT
+            ),
+        )
         timeout = command_config[CONF_TIMEOUT]
         method = command_config[CONF_METHOD]
 
@@ -135,6 +146,14 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
             if content_type:
                 headers[hdrs.CONTENT_TYPE] = content_type
 
+            _LOGGER.debug(
+                "Calling %s %s with headers: %s and payload: %s",
+                method,
+                request_url,
+                headers,
+                payload,
+            )
+
             try:
                 async with getattr(websession, method)(
                     request_url,
diff --git a/homeassistant/components/rflink/__init__.py b/homeassistant/components/rflink/__init__.py
index 7e86854dbce..85195fb1581 100644
--- a/homeassistant/components/rflink/__init__.py
+++ b/homeassistant/components/rflink/__init__.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.core import CoreState, HassJob, HomeAssistant, ServiceCall, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
diff --git a/homeassistant/components/rflink/binary_sensor.py b/homeassistant/components/rflink/binary_sensor.py
index 29046ba7616..43a7c03c67b 100644
--- a/homeassistant/components/rflink/binary_sensor.py
+++ b/homeassistant/components/rflink/binary_sensor.py
@@ -20,9 +20,8 @@ from homeassistant.const import (
     STATE_ON,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, event as evt
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.helpers.event as evt
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/rflink/const.py b/homeassistant/components/rflink/const.py
index cc52ea978bd..83eb2915f70 100644
--- a/homeassistant/components/rflink/const.py
+++ b/homeassistant/components/rflink/const.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import voluptuous as vol
 
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 CONF_ALIASES = "aliases"
 CONF_GROUP_ALIASES = "group_aliases"
diff --git a/homeassistant/components/rflink/cover.py b/homeassistant/components/rflink/cover.py
index 695825cf31b..8b21bc9274d 100644
--- a/homeassistant/components/rflink/cover.py
+++ b/homeassistant/components/rflink/cover.py
@@ -14,7 +14,7 @@ from homeassistant.components.cover import (
 )
 from homeassistant.const import CONF_DEVICES, CONF_NAME, CONF_TYPE
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/rflink/entity.py b/homeassistant/components/rflink/entity.py
index 26153acf7ba..0caec4ea2c3 100644
--- a/homeassistant/components/rflink/entity.py
+++ b/homeassistant/components/rflink/entity.py
@@ -105,12 +105,12 @@ class RflinkDevice(Entity):
         return self._state
 
     @property
-    def assumed_state(self):
+    def assumed_state(self) -> bool:
         """Assume device state until first device event sets state."""
         return self._state is None
 
     @property
-    def available(self):
+    def available(self) -> bool:
         """Return True if entity is available."""
         return self._available
 
@@ -120,7 +120,7 @@ class RflinkDevice(Entity):
         self._available = availability
         self.async_write_ha_state()
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Register update callback."""
         await super().async_added_to_hass()
         # Remove temporary bogus entity_id if added
@@ -300,7 +300,7 @@ class RflinkCommand(RflinkDevice):
 class SwitchableRflinkDevice(RflinkCommand, RestoreEntity):
     """Rflink entity which can switch on/off (eg: light, switch)."""
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Restore RFLink device state (ON/OFF)."""
         await super().async_added_to_hass()
         if (old_state := await self.async_get_last_state()) is not None:
diff --git a/homeassistant/components/rflink/light.py b/homeassistant/components/rflink/light.py
index 00117140abb..af8d2c76844 100644
--- a/homeassistant/components/rflink/light.py
+++ b/homeassistant/components/rflink/light.py
@@ -16,7 +16,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import CONF_DEVICES, CONF_NAME, CONF_TYPE
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
@@ -101,7 +101,7 @@ def entity_class_for_type(entity_type):
     entity_device_mapping = {
         # sends only 'dim' commands not compatible with on/off switches
         TYPE_DIMMABLE: DimmableRflinkLight,
-        # sends only 'on/off' commands not advices with dimmers and signal
+        # sends only 'on/off' commands not advised with dimmers and signal
         # repetition
         TYPE_SWITCHABLE: RflinkLight,
         # sends 'dim' and 'on' command to support both dimmers and on/off
diff --git a/homeassistant/components/rflink/sensor.py b/homeassistant/components/rflink/sensor.py
index 89632ac50b3..97d0b811509 100644
--- a/homeassistant/components/rflink/sensor.py
+++ b/homeassistant/components/rflink/sensor.py
@@ -35,7 +35,7 @@ from homeassistant.const import (
     UnitOfVolumetricFlux,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
@@ -236,7 +236,8 @@ SENSOR_TYPES = (
         key="winddirection",
         name="Wind direction",
         icon="mdi:compass",
-        state_class=SensorStateClass.MEASUREMENT,
+        state_class=SensorStateClass.MEASUREMENT_ANGLE,
+        device_class=SensorDeviceClass.WIND_DIRECTION,
         native_unit_of_measurement=DEGREE,
     ),
     SensorEntityDescription(
diff --git a/homeassistant/components/rflink/switch.py b/homeassistant/components/rflink/switch.py
index 23b93896878..bbbce2b8e9a 100644
--- a/homeassistant/components/rflink/switch.py
+++ b/homeassistant/components/rflink/switch.py
@@ -10,7 +10,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import CONF_DEVICES, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/rfxtrx/binary_sensor.py b/homeassistant/components/rfxtrx/binary_sensor.py
index 316cf44ef0d..a86ad5557b4 100644
--- a/homeassistant/components/rfxtrx/binary_sensor.py
+++ b/homeassistant/components/rfxtrx/binary_sensor.py
@@ -17,7 +17,7 @@ from homeassistant.const import CONF_COMMAND_OFF, CONF_COMMAND_ON, STATE_ON
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.helpers import event as evt
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DeviceTuple, async_setup_platform_entry, get_pt2262_cmd
 from .const import (
@@ -91,7 +91,7 @@ def supported(event: rfxtrxmod.RFXtrxEvent) -> bool:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up config entry."""
 
diff --git a/homeassistant/components/rfxtrx/cover.py b/homeassistant/components/rfxtrx/cover.py
index 473a0d94056..07443afb38b 100644
--- a/homeassistant/components/rfxtrx/cover.py
+++ b/homeassistant/components/rfxtrx/cover.py
@@ -11,7 +11,7 @@ from homeassistant.components.cover import CoverEntity, CoverEntityFeature, Cove
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DeviceTuple, async_setup_platform_entry
 from .const import (
@@ -34,7 +34,7 @@ def supported(event: rfxtrxmod.RFXtrxEvent) -> bool:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up config entry."""
 
diff --git a/homeassistant/components/rfxtrx/device_action.py b/homeassistant/components/rfxtrx/device_action.py
index 405daa37ec5..c3f61dee026 100644
--- a/homeassistant/components/rfxtrx/device_action.py
+++ b/homeassistant/components/rfxtrx/device_action.py
@@ -9,7 +9,7 @@ import voluptuous as vol
 from homeassistant.components.device_automation import InvalidDeviceAutomationConfig
 from homeassistant.const import CONF_DEVICE_ID, CONF_DOMAIN, CONF_TYPE
 from homeassistant.core import Context, HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
 
 from . import DATA_RFXOBJECT, DOMAIN
diff --git a/homeassistant/components/rfxtrx/event.py b/homeassistant/components/rfxtrx/event.py
index 212d93b5019..40d02953aeb 100644
--- a/homeassistant/components/rfxtrx/event.py
+++ b/homeassistant/components/rfxtrx/event.py
@@ -11,7 +11,7 @@ from homeassistant.components.event import EventEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import slugify
 
 from . import DeviceTuple, async_setup_platform_entry
@@ -24,7 +24,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up config entry."""
 
diff --git a/homeassistant/components/rfxtrx/light.py b/homeassistant/components/rfxtrx/light.py
index 0e2f7bef65a..90c0d2eeed7 100644
--- a/homeassistant/components/rfxtrx/light.py
+++ b/homeassistant/components/rfxtrx/light.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_ON
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DeviceTuple, async_setup_platform_entry
 from .const import COMMAND_OFF_LIST, COMMAND_ON_LIST
@@ -32,7 +32,7 @@ def supported(event: rfxtrxmod.RFXtrxEvent) -> bool:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up config entry."""
 
diff --git a/homeassistant/components/rfxtrx/sensor.py b/homeassistant/components/rfxtrx/sensor.py
index 13f3c012af8..6669b1367df 100644
--- a/homeassistant/components/rfxtrx/sensor.py
+++ b/homeassistant/components/rfxtrx/sensor.py
@@ -36,7 +36,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import DeviceTuple, async_setup_platform_entry, get_rfx_object
@@ -161,7 +161,8 @@ SENSOR_TYPES = (
     RfxtrxSensorEntityDescription(
         key="Wind direction",
         translation_key="wind_direction",
-        state_class=SensorStateClass.MEASUREMENT,
+        state_class=SensorStateClass.MEASUREMENT_ANGLE,
+        device_class=SensorDeviceClass.WIND_DIRECTION,
         native_unit_of_measurement=DEGREE,
     ),
     RfxtrxSensorEntityDescription(
@@ -241,7 +242,7 @@ SENSOR_TYPES_DICT = {desc.key: desc for desc in SENSOR_TYPES}
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up config entry."""
 
diff --git a/homeassistant/components/rfxtrx/siren.py b/homeassistant/components/rfxtrx/siren.py
index 1635f1f55a9..1164dafbfce 100644
--- a/homeassistant/components/rfxtrx/siren.py
+++ b/homeassistant/components/rfxtrx/siren.py
@@ -11,7 +11,7 @@ from homeassistant.components.siren import ATTR_TONE, SirenEntity, SirenEntityFe
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 
 from . import DEFAULT_OFF_DELAY, DeviceTuple, async_setup_platform_entry
@@ -47,7 +47,7 @@ def get_first_key(data: dict[int, str], entry: str) -> int:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up config entry."""
 
diff --git a/homeassistant/components/rfxtrx/switch.py b/homeassistant/components/rfxtrx/switch.py
index cd17e71f4f0..b3eb63fb2b4 100644
--- a/homeassistant/components/rfxtrx/switch.py
+++ b/homeassistant/components/rfxtrx/switch.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_COMMAND_OFF, CONF_COMMAND_ON, STATE_ON
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DeviceTuple, async_setup_platform_entry, get_pt2262_cmd
 from .const import (
@@ -41,7 +41,7 @@ def supported(event: rfxtrxmod.RFXtrxEvent) -> bool:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up config entry."""
 
diff --git a/homeassistant/components/ridwell/__init__.py b/homeassistant/components/ridwell/__init__.py
index 71e80086833..9c9104258a8 100644
--- a/homeassistant/components/ridwell/__init__.py
+++ b/homeassistant/components/ridwell/__init__.py
@@ -17,7 +17,7 @@ PLATFORMS: list[Platform] = [Platform.CALENDAR, Platform.SENSOR, Platform.SWITCH
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Ridwell from a config entry."""
-    coordinator = RidwellDataUpdateCoordinator(hass, name=entry.title)
+    coordinator = RidwellDataUpdateCoordinator(hass, entry)
     await coordinator.async_initialize()
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
 
diff --git a/homeassistant/components/ridwell/calendar.py b/homeassistant/components/ridwell/calendar.py
index ecca0366754..bb7982a5391 100644
--- a/homeassistant/components/ridwell/calendar.py
+++ b/homeassistant/components/ridwell/calendar.py
@@ -9,7 +9,7 @@ from aioridwell.model import RidwellAccount, RidwellPickupEvent
 from homeassistant.components.calendar import CalendarEntity, CalendarEvent
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import RidwellDataUpdateCoordinator
@@ -36,7 +36,9 @@ def async_get_calendar_event_from_pickup_event(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Ridwell calendars based on a config entry."""
     coordinator: RidwellDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/ridwell/coordinator.py b/homeassistant/components/ridwell/coordinator.py
index 28190522c76..336a71bc67f 100644
--- a/homeassistant/components/ridwell/coordinator.py
+++ b/homeassistant/components/ridwell/coordinator.py
@@ -29,7 +29,7 @@ class RidwellDataUpdateCoordinator(
 
     config_entry: ConfigEntry
 
-    def __init__(self, hass: HomeAssistant, *, name: str) -> None:
+    def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
         """Initialize."""
         # These will be filled in by async_initialize; we give them these defaults to
         # avoid arduous typing checks down the line:
@@ -37,7 +37,13 @@ class RidwellDataUpdateCoordinator(
         self.dashboard_url = ""
         self.user_id = ""
 
-        super().__init__(hass, LOGGER, name=name, update_interval=UPDATE_INTERVAL)
+        super().__init__(
+            hass,
+            LOGGER,
+            config_entry=config_entry,
+            name=config_entry.title,
+            update_interval=UPDATE_INTERVAL,
+        )
 
     async def _async_update_data(self) -> dict[str, list[RidwellPickupEvent]]:
         """Fetch the latest data from the source."""
diff --git a/homeassistant/components/ridwell/sensor.py b/homeassistant/components/ridwell/sensor.py
index 7fc7fdb5348..30f97ecaea8 100644
--- a/homeassistant/components/ridwell/sensor.py
+++ b/homeassistant/components/ridwell/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, SENSOR_TYPE_NEXT_PICKUP
 from .coordinator import RidwellDataUpdateCoordinator
@@ -34,7 +34,9 @@ SENSOR_DESCRIPTION = SensorEntityDescription(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Ridwell sensors based on a config entry."""
     coordinator: RidwellDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/ridwell/switch.py b/homeassistant/components/ridwell/switch.py
index 04e3e4c5ff9..e3be9ea5368 100644
--- a/homeassistant/components/ridwell/switch.py
+++ b/homeassistant/components/ridwell/switch.py
@@ -11,7 +11,7 @@ from homeassistant.components.switch import SwitchEntity, SwitchEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import RidwellDataUpdateCoordinator
@@ -24,7 +24,9 @@ SWITCH_DESCRIPTION = SwitchEntityDescription(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Ridwell sensors based on a config entry."""
     coordinator: RidwellDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/ring/__init__.py b/homeassistant/components/ring/__init__.py
index edc084fb57b..8e36f3e85e7 100644
--- a/homeassistant/components/ring/__init__.py
+++ b/homeassistant/components/ring/__init__.py
@@ -2,39 +2,29 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass
 import logging
 from typing import Any, cast
 import uuid
 
-from ring_doorbell import Auth, Ring, RingDevices
+from ring_doorbell import Auth, Ring
 
 from homeassistant.components.camera import DOMAIN as CAMERA_DOMAIN
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import APPLICATION_NAME, CONF_DEVICE_ID, CONF_TOKEN
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import CONF_LISTEN_CREDENTIALS, DOMAIN, PLATFORMS
-from .coordinator import RingDataCoordinator, RingListenCoordinator
+from .coordinator import (
+    RingConfigEntry,
+    RingData,
+    RingDataCoordinator,
+    RingListenCoordinator,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
 
-@dataclass
-class RingData:
-    """Class to support type hinting of ring data collection."""
-
-    api: Ring
-    devices: RingDevices
-    devices_coordinator: RingDataCoordinator
-    listen_coordinator: RingListenCoordinator
-
-
-type RingConfigEntry = ConfigEntry[RingData]
-
-
 def get_auth_user_agent() -> str:
     """Return user-agent for Auth instantiation.
 
@@ -71,10 +61,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: RingConfigEntry) -> bool
     )
     ring = Ring(auth)
 
-    devices_coordinator = RingDataCoordinator(hass, ring)
+    devices_coordinator = RingDataCoordinator(hass, entry, ring)
     listen_credentials = entry.data.get(CONF_LISTEN_CREDENTIALS)
     listen_coordinator = RingListenCoordinator(
-        hass, ring, listen_credentials, listen_credentials_updater
+        hass, entry, ring, listen_credentials, listen_credentials_updater
     )
 
     await devices_coordinator.async_config_entry_first_refresh()
@@ -91,19 +81,19 @@ async def async_setup_entry(hass: HomeAssistant, entry: RingConfigEntry) -> bool
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: RingConfigEntry) -> bool:
     """Unload Ring entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
 async def async_remove_config_entry_device(
-    hass: HomeAssistant, config_entry: ConfigEntry, device_entry: dr.DeviceEntry
+    hass: HomeAssistant, entry: RingConfigEntry, device_entry: dr.DeviceEntry
 ) -> bool:
     """Remove a config entry from a device."""
     return True
 
 
-async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_migrate_entry(hass: HomeAssistant, entry: RingConfigEntry) -> bool:
     """Migrate old config entry."""
     entry_version = entry.version
     entry_minor_version = entry.minor_version
diff --git a/homeassistant/components/ring/binary_sensor.py b/homeassistant/components/ring/binary_sensor.py
index 2c458985498..49051ee5e11 100644
--- a/homeassistant/components/ring/binary_sensor.py
+++ b/homeassistant/components/ring/binary_sensor.py
@@ -17,7 +17,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import Platform
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_call_at
 
 from . import RingConfigEntry
@@ -55,7 +55,6 @@ BINARY_SENSOR_TYPES: tuple[RingBinarySensorEntityDescription, ...] = (
     ),
     RingBinarySensorEntityDescription(
         key=KIND_MOTION,
-        translation_key=KIND_MOTION,
         device_class=BinarySensorDeviceClass.MOTION,
         capability=RingCapability.MOTION_DETECTION,
         deprecated_info=DeprecatedInfo(
@@ -68,7 +67,7 @@ BINARY_SENSOR_TYPES: tuple[RingBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RingConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Ring binary sensors from a config entry."""
     ring_data = entry.runtime_data
diff --git a/homeassistant/components/ring/button.py b/homeassistant/components/ring/button.py
index 30600237847..09e6c0e413a 100644
--- a/homeassistant/components/ring/button.py
+++ b/homeassistant/components/ring/button.py
@@ -6,7 +6,7 @@ from ring_doorbell import RingOther
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import RingConfigEntry
 from .coordinator import RingDataCoordinator
@@ -24,7 +24,7 @@ BUTTON_DESCRIPTION = ButtonEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RingConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create the buttons for the Ring devices."""
     ring_data = entry.runtime_data
diff --git a/homeassistant/components/ring/camera.py b/homeassistant/components/ring/camera.py
index c1a4e67ffd4..156d82665d2 100644
--- a/homeassistant/components/ring/camera.py
+++ b/homeassistant/components/ring/camera.py
@@ -27,10 +27,11 @@ from homeassistant.components.camera import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_aiohttp_proxy_stream
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from . import RingConfigEntry
+from .const import DOMAIN
 from .coordinator import RingDataCoordinator
 from .entity import RingDeviceT, RingEntity, exception_wrap
 
@@ -75,7 +76,7 @@ CAMERA_DESCRIPTIONS: tuple[RingCameraEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RingConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Ring Door Bell and StickUp Camera."""
     ring_data = entry.runtime_data
@@ -218,8 +219,13 @@ class RingCam(RingEntity[RingDoorBell], Camera):
     ) -> None:
         """Handle a WebRTC candidate."""
         if candidate.sdp_m_line_index is None:
-            msg = "The sdp_m_line_index is required for ring webrtc streaming"
-            raise HomeAssistantError(msg)
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="sdp_m_line_index_required",
+                translation_placeholders={
+                    "device": self._device.name,
+                },
+            )
         await self._device.on_webrtc_candidate(
             session_id, candidate.candidate, candidate.sdp_m_line_index
         )
diff --git a/homeassistant/components/ring/config_flow.py b/homeassistant/components/ring/config_flow.py
index a23fd8f73de..7d5654947d8 100644
--- a/homeassistant/components/ring/config_flow.py
+++ b/homeassistant/components/ring/config_flow.py
@@ -23,8 +23,8 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.device_registry as dr
 from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 
 from . import get_auth_user_agent
diff --git a/homeassistant/components/ring/coordinator.py b/homeassistant/components/ring/coordinator.py
index b143fd3dda0..413c48c35eb 100644
--- a/homeassistant/components/ring/coordinator.py
+++ b/homeassistant/components/ring/coordinator.py
@@ -1,9 +1,12 @@
 """Data coordinators for the ring integration."""
 
+from __future__ import annotations
+
 from asyncio import TaskGroup
 from collections.abc import Callable, Coroutine
+from dataclasses import dataclass
 import logging
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 from ring_doorbell import (
     AuthenticationError,
@@ -15,7 +18,7 @@ from ring_doorbell import (
 )
 from ring_doorbell.listen import RingEventListener
 
-from homeassistant import config_entries
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import (
@@ -24,37 +27,33 @@ from homeassistant.helpers.update_coordinator import (
     UpdateFailed,
 )
 
-from .const import SCAN_INTERVAL
+from .const import DOMAIN, SCAN_INTERVAL
 
 _LOGGER = logging.getLogger(__name__)
 
 
-async def _call_api[*_Ts, _R](
-    hass: HomeAssistant,
-    target: Callable[[*_Ts], Coroutine[Any, Any, _R]],
-    *args: *_Ts,
-    msg_suffix: str = "",
-) -> _R:
-    try:
-        return await target(*args)
-    except AuthenticationError as err:
-        # Raising ConfigEntryAuthFailed will cancel future updates
-        # and start a config flow with SOURCE_REAUTH (async_step_reauth)
-        raise ConfigEntryAuthFailed from err
-    except RingTimeout as err:
-        raise UpdateFailed(
-            f"Timeout communicating with API{msg_suffix}: {err}"
-        ) from err
-    except RingError as err:
-        raise UpdateFailed(f"Error communicating with API{msg_suffix}: {err}") from err
+@dataclass
+class RingData:
+    """Class to support type hinting of ring data collection."""
+
+    api: Ring
+    devices: RingDevices
+    devices_coordinator: RingDataCoordinator
+    listen_coordinator: RingListenCoordinator
+
+
+type RingConfigEntry = ConfigEntry[RingData]
 
 
 class RingDataCoordinator(DataUpdateCoordinator[RingDevices]):
     """Base class for device coordinators."""
 
+    config_entry: RingConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: RingConfigEntry,
         ring_api: Ring,
     ) -> None:
         """Initialize my coordinator."""
@@ -63,16 +62,42 @@ class RingDataCoordinator(DataUpdateCoordinator[RingDevices]):
             name="devices",
             logger=_LOGGER,
             update_interval=SCAN_INTERVAL,
+            config_entry=config_entry,
         )
         self.ring_api: Ring = ring_api
         self.first_call: bool = True
 
+    async def _call_api[*_Ts, _R](
+        self,
+        target: Callable[[*_Ts], Coroutine[Any, Any, _R]],
+        *args: *_Ts,
+    ) -> _R:
+        try:
+            return await target(*args)
+        except AuthenticationError as err:
+            # Raising ConfigEntryAuthFailed will cancel future updates
+            # and start a config flow with SOURCE_REAUTH (async_step_reauth)
+            raise ConfigEntryAuthFailed(
+                translation_domain=DOMAIN,
+                translation_key="api_authentication",
+            ) from err
+        except RingTimeout as err:
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="api_timeout",
+            ) from err
+        except RingError as err:
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="api_error",
+            ) from err
+
     async def _async_update_data(self) -> RingDevices:
         """Fetch data from API endpoint."""
         update_method: str = (
             "async_update_data" if self.first_call else "async_update_devices"
         )
-        await _call_api(self.hass, getattr(self.ring_api, update_method))
+        await self._call_api(getattr(self.ring_api, update_method))
         self.first_call = False
         devices: RingDevices = self.ring_api.devices()
         subscribed_device_ids = set(self.async_contexts())
@@ -84,18 +109,14 @@ class RingDataCoordinator(DataUpdateCoordinator[RingDevices]):
                     async with TaskGroup() as tg:
                         if device.has_capability("history"):
                             tg.create_task(
-                                _call_api(
-                                    self.hass,
+                                self._call_api(
                                     lambda device: device.async_history(limit=10),
                                     device,
-                                    msg_suffix=f" for device {device.name}",  # device_id is the mac
                                 )
                             )
                         tg.create_task(
-                            _call_api(
-                                self.hass,
+                            self._call_api(
                                 device.async_update_health_data,
-                                msg_suffix=f" for device {device.name}",
                             )
                         )
                 except ExceptionGroup as eg:
@@ -107,11 +128,12 @@ class RingDataCoordinator(DataUpdateCoordinator[RingDevices]):
 class RingListenCoordinator(BaseDataUpdateCoordinatorProtocol):
     """Global notifications coordinator."""
 
-    config_entry: config_entries.ConfigEntry
+    config_entry: RingConfigEntry
 
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: RingConfigEntry,
         ring_api: Ring,
         listen_credentials: dict[str, Any] | None,
         listen_credentials_updater: Callable[[dict[str, Any]], None],
@@ -126,9 +148,6 @@ class RingListenCoordinator(BaseDataUpdateCoordinatorProtocol):
         self._listeners: dict[CALLBACK_TYPE, tuple[CALLBACK_TYPE, object | None]] = {}
         self._listen_callback_id: int | None = None
 
-        config_entry = config_entries.current_entry.get()
-        if TYPE_CHECKING:
-            assert config_entry
         self.config_entry = config_entry
         self.start_timeout = 10
         self.config_entry.async_on_unload(self.async_shutdown)
diff --git a/homeassistant/components/ring/entity.py b/homeassistant/components/ring/entity.py
index d48cc35a4f5..5d77bf3a285 100644
--- a/homeassistant/components/ring/entity.py
+++ b/homeassistant/components/ring/entity.py
@@ -2,6 +2,7 @@
 
 from collections.abc import Awaitable, Callable, Coroutine
 from dataclasses import dataclass
+import logging
 from typing import Any, Concatenate, Generic, TypeVar, cast
 
 from ring_doorbell import (
@@ -36,6 +37,8 @@ _RingCoordinatorT = TypeVar(
     bound=(RingDataCoordinator | RingListenCoordinator),
 )
 
+_LOGGER = logging.getLogger(__name__)
+
 
 @dataclass(slots=True)
 class DeprecatedInfo:
@@ -62,14 +65,22 @@ def exception_wrap[_RingBaseEntityT: RingBaseEntity[Any, Any], **_P, _R](
             return await async_func(self, *args, **kwargs)
         except AuthenticationError as err:
             self.coordinator.config_entry.async_start_reauth(self.hass)
-            raise HomeAssistantError(err) from err
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="api_authentication",
+            ) from err
         except RingTimeout as err:
             raise HomeAssistantError(
-                f"Timeout communicating with API {async_func}: {err}"
+                translation_domain=DOMAIN,
+                translation_key="api_timeout",
             ) from err
         except RingError as err:
+            _LOGGER.debug(
+                "Error calling %s in platform %s: ", async_func.__name__, self.platform
+            )
             raise HomeAssistantError(
-                f"Error communicating with API{async_func}: {err}"
+                translation_domain=DOMAIN,
+                translation_key="api_error",
             ) from err
 
     return _wrap
diff --git a/homeassistant/components/ring/event.py b/homeassistant/components/ring/event.py
index 4d7a6277579..db99a10de74 100644
--- a/homeassistant/components/ring/event.py
+++ b/homeassistant/components/ring/event.py
@@ -12,7 +12,7 @@ from homeassistant.components.event import (
     EventEntityDescription,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import RingConfigEntry
 from .coordinator import RingListenCoordinator
@@ -57,7 +57,7 @@ EVENT_DESCRIPTIONS: tuple[RingEventEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RingConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up events for a Ring device."""
     ring_data = entry.runtime_data
diff --git a/homeassistant/components/ring/light.py b/homeassistant/components/ring/light.py
index 9ae0bac1004..34915dd5133 100644
--- a/homeassistant/components/ring/light.py
+++ b/homeassistant/components/ring/light.py
@@ -9,8 +9,8 @@ from ring_doorbell import RingStickUpCam
 
 from homeassistant.components.light import ColorMode, LightEntity
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from . import RingConfigEntry
 from .coordinator import RingDataCoordinator
@@ -40,7 +40,7 @@ class OnOffState(StrEnum):
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RingConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create the lights for the Ring devices."""
     ring_data = entry.runtime_data
diff --git a/homeassistant/components/ring/number.py b/homeassistant/components/ring/number.py
index b920ff7edc7..68b41451bd0 100644
--- a/homeassistant/components/ring/number.py
+++ b/homeassistant/components/ring/number.py
@@ -13,7 +13,7 @@ from homeassistant.components.number import (
     NumberMode,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import RingConfigEntry
@@ -28,7 +28,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RingConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a numbers for a Ring device."""
     ring_data = entry.runtime_data
diff --git a/homeassistant/components/ring/sensor.py b/homeassistant/components/ring/sensor.py
index cf851a113bc..5744ed9a4d8 100644
--- a/homeassistant/components/ring/sensor.py
+++ b/homeassistant/components/ring/sensor.py
@@ -28,7 +28,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import RingConfigEntry
@@ -48,7 +48,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RingConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a sensor for a Ring device."""
     ring_data = entry.runtime_data
@@ -258,7 +258,6 @@ SENSOR_TYPES: tuple[RingSensorEntityDescription[Any], ...] = (
     ),
     RingSensorEntityDescription[RingGeneric](
         key="wifi_signal_strength",
-        translation_key="wifi_signal_strength",
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         entity_category=EntityCategory.DIAGNOSTIC,
diff --git a/homeassistant/components/ring/siren.py b/homeassistant/components/ring/siren.py
index 05fa07c39eb..7f096c0e643 100644
--- a/homeassistant/components/ring/siren.py
+++ b/homeassistant/components/ring/siren.py
@@ -22,7 +22,7 @@ from homeassistant.components.siren import (
 )
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import RingConfigEntry
 from .coordinator import RingDataCoordinator
@@ -85,7 +85,7 @@ SIRENS: tuple[RingSirenEntityDescription[Any], ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RingConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create the sirens for the Ring devices."""
     ring_data = entry.runtime_data
diff --git a/homeassistant/components/ring/strings.json b/homeassistant/components/ring/strings.json
index 8170ec8e161..2d7e0b17da1 100644
--- a/homeassistant/components/ring/strings.json
+++ b/homeassistant/components/ring/strings.json
@@ -6,12 +6,19 @@
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "username": "Your Ring account username.",
+          "password": "Your Ring account password."
         }
       },
       "2fa": {
         "title": "Two-factor authentication",
         "data": {
           "2fa": "Two-factor code"
+        },
+        "data_description": {
+          "2fa": "Account verification code via the method selected in your Ring account settings."
         }
       },
       "reauth_confirm": {
@@ -19,13 +26,19 @@
         "description": "The Ring integration needs to re-authenticate your account {username}",
         "data": {
           "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "password": "[%key:component::ring::config::step::user::data_description::password%]"
         }
       },
       "reconfigure": {
-        "title": "Reconfigure Ring Integration",
+        "title": "Reconfigure Ring integration",
         "description": "Will create a new Authorized Device for {username} at ring.com",
         "data": {
           "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "password": "[%key:component::ring::config::step::user::data_description::password%]"
         }
       }
     },
@@ -43,9 +56,6 @@
     "binary_sensor": {
       "ding": {
         "name": "Ding"
-      },
-      "motion": {
-        "name": "Motion"
       }
     },
     "event": {
@@ -109,9 +119,6 @@
       },
       "wifi_signal_category": {
         "name": "Wi-Fi signal category"
-      },
-      "wifi_signal_strength": {
-        "name": "Wi-Fi signal strength"
       }
     },
     "switch": {
@@ -134,6 +141,20 @@
       }
     }
   },
+  "exceptions": {
+    "api_authentication": {
+      "message": "Authentication error communicating with Ring API"
+    },
+    "api_timeout": {
+      "message": "Timeout communicating with Ring API"
+    },
+    "api_error": {
+      "message": "Error communicating with Ring API"
+    },
+    "sdp_m_line_index_required": {
+      "message": "Error negotiating stream for {device}"
+    }
+  },
   "issues": {
     "deprecated_entity": {
       "title": "Detected deprecated {platform} entity usage",
diff --git a/homeassistant/components/ring/switch.py b/homeassistant/components/ring/switch.py
index e81d483adf3..02d98388edc 100644
--- a/homeassistant/components/ring/switch.py
+++ b/homeassistant/components/ring/switch.py
@@ -11,8 +11,8 @@ from ring_doorbell.const import DOORBELL_EXISTING_TYPE
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from . import RingConfigEntry
 from .coordinator import RingDataCoordinator
@@ -86,7 +86,7 @@ SWITCHES: Sequence[RingSwitchEntityDescription[Any]] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RingConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create the switches for the Ring devices."""
     ring_data = entry.runtime_data
diff --git a/homeassistant/components/ripple/sensor.py b/homeassistant/components/ripple/sensor.py
index 72510ea251d..30d2d77dcb4 100644
--- a/homeassistant/components/ripple/sensor.py
+++ b/homeassistant/components/ripple/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_ADDRESS, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/risco/__init__.py b/homeassistant/components/risco/__init__.py
index 7255c724e3f..56c7a509cca 100644
--- a/homeassistant/components/risco/__init__.py
+++ b/homeassistant/components/risco/__init__.py
@@ -16,7 +16,6 @@ from homeassistant.const import (
     CONF_PASSWORD,
     CONF_PIN,
     CONF_PORT,
-    CONF_SCAN_INTERVAL,
     CONF_TYPE,
     CONF_USERNAME,
     Platform,
@@ -30,7 +29,6 @@ from .const import (
     CONF_CONCURRENCY,
     DATA_COORDINATOR,
     DEFAULT_CONCURRENCY,
-    DEFAULT_SCAN_INTERVAL,
     DOMAIN,
     EVENTS_COORDINATOR,
     SYSTEM_UPDATE_SIGNAL,
@@ -144,12 +142,9 @@ async def _async_setup_cloud_entry(hass: HomeAssistant, entry: ConfigEntry) -> b
     except UnauthorizedError as error:
         raise ConfigEntryAuthFailed from error
 
-    scan_interval = entry.options.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL)
-    coordinator = RiscoDataUpdateCoordinator(hass, risco, scan_interval)
+    coordinator = RiscoDataUpdateCoordinator(hass, entry, risco)
     await coordinator.async_config_entry_first_refresh()
-    events_coordinator = RiscoEventsDataUpdateCoordinator(
-        hass, risco, entry.entry_id, 60
-    )
+    events_coordinator = RiscoEventsDataUpdateCoordinator(hass, entry, risco)
 
     entry.async_on_unload(entry.add_update_listener(_update_listener))
 
diff --git a/homeassistant/components/risco/alarm_control_panel.py b/homeassistant/components/risco/alarm_control_panel.py
index b1eae8fd917..2472baa932e 100644
--- a/homeassistant/components/risco/alarm_control_panel.py
+++ b/homeassistant/components/risco/alarm_control_panel.py
@@ -19,7 +19,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PIN
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import LocalData, is_local
 from .const import (
@@ -50,7 +50,7 @@ STATES_TO_SUPPORTED_FEATURES = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Risco alarm control panel."""
     options = {**DEFAULT_OPTIONS, **config_entry.options}
diff --git a/homeassistant/components/risco/binary_sensor.py b/homeassistant/components/risco/binary_sensor.py
index a7ca0129b06..ff61985fef3 100644
--- a/homeassistant/components/risco/binary_sensor.py
+++ b/homeassistant/components/risco/binary_sensor.py
@@ -19,7 +19,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import LocalData, is_local
 from .const import DATA_COORDINATOR, DOMAIN, SYSTEM_UPDATE_SIGNAL
@@ -73,7 +73,7 @@ SYSTEM_ENTITY_DESCRIPTIONS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Risco alarm control panel."""
     if is_local(config_entry):
diff --git a/homeassistant/components/risco/const.py b/homeassistant/components/risco/const.py
index 078e26c43b5..ef3280fe232 100644
--- a/homeassistant/components/risco/const.py
+++ b/homeassistant/components/risco/const.py
@@ -30,9 +30,9 @@ RISCO_ARM = "arm"
 RISCO_PARTIAL_ARM = "partial_arm"
 RISCO_STATES = [RISCO_ARM, RISCO_PARTIAL_ARM, *RISCO_GROUPS]
 
-DEFAULT_RISCO_GROUPS_TO_HA = {
-    group: AlarmControlPanelState.ARMED_HOME for group in RISCO_GROUPS
-}
+DEFAULT_RISCO_GROUPS_TO_HA = dict.fromkeys(
+    RISCO_GROUPS, AlarmControlPanelState.ARMED_HOME
+)
 DEFAULT_RISCO_STATES_TO_HA = {
     RISCO_ARM: AlarmControlPanelState.ARMED_AWAY,
     RISCO_PARTIAL_ARM: AlarmControlPanelState.ARMED_HOME,
diff --git a/homeassistant/components/risco/coordinator.py b/homeassistant/components/risco/coordinator.py
index 8430b6a6172..e7140eb9616 100644
--- a/homeassistant/components/risco/coordinator.py
+++ b/homeassistant/components/risco/coordinator.py
@@ -10,11 +10,13 @@ from pyrisco import CannotConnectError, OperationError, RiscoCloud, Unauthorized
 from pyrisco.cloud.alarm import Alarm
 from pyrisco.cloud.event import Event
 
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_SCAN_INTERVAL
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import DOMAIN
+from .const import DEFAULT_SCAN_INTERVAL, DOMAIN
 
 LAST_EVENT_STORAGE_VERSION = 1
 LAST_EVENT_TIMESTAMP_KEY = "last_event_timestamp"
@@ -24,17 +26,26 @@ _LOGGER = logging.getLogger(__name__)
 class RiscoDataUpdateCoordinator(DataUpdateCoordinator[Alarm]):
     """Class to manage fetching risco data."""
 
+    config_entry: ConfigEntry
+
     def __init__(
-        self, hass: HomeAssistant, risco: RiscoCloud, scan_interval: int
+        self,
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        risco: RiscoCloud,
     ) -> None:
         """Initialize global risco data updater."""
         self.risco = risco
-        interval = timedelta(seconds=scan_interval)
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
-            update_interval=interval,
+            update_interval=timedelta(
+                seconds=config_entry.options.get(
+                    CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL
+                )
+            ),
         )
 
     async def _async_update_data(self) -> Alarm:
@@ -48,20 +59,27 @@ class RiscoDataUpdateCoordinator(DataUpdateCoordinator[Alarm]):
 class RiscoEventsDataUpdateCoordinator(DataUpdateCoordinator[list[Event]]):
     """Class to manage fetching risco data."""
 
+    config_entry: ConfigEntry
+
     def __init__(
-        self, hass: HomeAssistant, risco: RiscoCloud, eid: str, scan_interval: int
+        self,
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        risco: RiscoCloud,
     ) -> None:
         """Initialize global risco data updater."""
         self.risco = risco
         self._store = Store[dict[str, Any]](
-            hass, LAST_EVENT_STORAGE_VERSION, f"risco_{eid}_last_event_timestamp"
+            hass,
+            LAST_EVENT_STORAGE_VERSION,
+            f"risco_{config_entry.entry_id}_last_event_timestamp",
         )
-        interval = timedelta(seconds=scan_interval)
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=f"{DOMAIN}_events",
-            update_interval=interval,
+            update_interval=timedelta(seconds=60),
         )
 
     async def _async_update_data(self) -> list[Event]:
diff --git a/homeassistant/components/risco/manifest.json b/homeassistant/components/risco/manifest.json
index 149b8761589..43d471172d6 100644
--- a/homeassistant/components/risco/manifest.json
+++ b/homeassistant/components/risco/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/risco",
   "iot_class": "local_push",
   "loggers": ["pyrisco"],
-  "requirements": ["pyrisco==0.6.5"]
+  "requirements": ["pyrisco==0.6.7"]
 }
diff --git a/homeassistant/components/risco/sensor.py b/homeassistant/components/risco/sensor.py
index c1495512e62..93683f1aa50 100644
--- a/homeassistant/components/risco/sensor.py
+++ b/homeassistant/components/risco/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import dt as dt_util
 
@@ -46,7 +46,7 @@ EVENT_ATTRIBUTES = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors for device."""
     if is_local(config_entry):
diff --git a/homeassistant/components/risco/switch.py b/homeassistant/components/risco/switch.py
index 8bad2c6c15e..547dedd3933 100644
--- a/homeassistant/components/risco/switch.py
+++ b/homeassistant/components/risco/switch.py
@@ -10,7 +10,7 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import LocalData, is_local
 from .const import DATA_COORDINATOR, DOMAIN
@@ -21,7 +21,7 @@ from .entity import RiscoCloudZoneEntity, RiscoLocalZoneEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Risco switch."""
     if is_local(config_entry):
diff --git a/homeassistant/components/rituals_perfume_genie/__init__.py b/homeassistant/components/rituals_perfume_genie/__init__.py
index d0d16ba6324..e920c2426fe 100644
--- a/homeassistant/components/rituals_perfume_genie/__init__.py
+++ b/homeassistant/components/rituals_perfume_genie/__init__.py
@@ -44,7 +44,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     # Create a coordinator for each diffuser
     coordinators = {
-        diffuser.hublot: RitualsDataUpdateCoordinator(hass, diffuser, update_interval)
+        diffuser.hublot: RitualsDataUpdateCoordinator(
+            hass, entry, diffuser, update_interval
+        )
         for diffuser in account_devices
     }
 
diff --git a/homeassistant/components/rituals_perfume_genie/binary_sensor.py b/homeassistant/components/rituals_perfume_genie/binary_sensor.py
index 63666fc1aca..97e9c8418d1 100644
--- a/homeassistant/components/rituals_perfume_genie/binary_sensor.py
+++ b/homeassistant/components/rituals_perfume_genie/binary_sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import RitualsDataUpdateCoordinator
@@ -44,7 +44,7 @@ ENTITY_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the diffuser binary sensors."""
     coordinators: dict[str, RitualsDataUpdateCoordinator] = hass.data[DOMAIN][
diff --git a/homeassistant/components/rituals_perfume_genie/coordinator.py b/homeassistant/components/rituals_perfume_genie/coordinator.py
index a83e823bd4e..bbcb24b3e65 100644
--- a/homeassistant/components/rituals_perfume_genie/coordinator.py
+++ b/homeassistant/components/rituals_perfume_genie/coordinator.py
@@ -5,6 +5,7 @@ import logging
 
 from pyrituals import Diffuser
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -16,9 +17,12 @@ _LOGGER = logging.getLogger(__name__)
 class RitualsDataUpdateCoordinator(DataUpdateCoordinator[None]):
     """Class to manage fetching Rituals Perfume Genie device data from single endpoint."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         diffuser: Diffuser,
         update_interval: timedelta,
     ) -> None:
@@ -27,6 +31,7 @@ class RitualsDataUpdateCoordinator(DataUpdateCoordinator[None]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=f"{DOMAIN}-{diffuser.hublot}",
             update_interval=update_interval,
         )
diff --git a/homeassistant/components/rituals_perfume_genie/number.py b/homeassistant/components/rituals_perfume_genie/number.py
index 0ac9c30f285..98e833ff9bd 100644
--- a/homeassistant/components/rituals_perfume_genie/number.py
+++ b/homeassistant/components/rituals_perfume_genie/number.py
@@ -11,7 +11,7 @@ from pyrituals import Diffuser
 from homeassistant.components.number import NumberEntity, NumberEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import RitualsDataUpdateCoordinator
@@ -41,7 +41,7 @@ ENTITY_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the diffuser numbers."""
     coordinators: dict[str, RitualsDataUpdateCoordinator] = hass.data[DOMAIN][
diff --git a/homeassistant/components/rituals_perfume_genie/select.py b/homeassistant/components/rituals_perfume_genie/select.py
index 27aff70649b..c239627e9c6 100644
--- a/homeassistant/components/rituals_perfume_genie/select.py
+++ b/homeassistant/components/rituals_perfume_genie/select.py
@@ -11,7 +11,7 @@ from homeassistant.components.select import SelectEntity, SelectEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, UnitOfArea
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import RitualsDataUpdateCoordinator
@@ -44,7 +44,7 @@ ENTITY_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the diffuser select entities."""
     coordinators: dict[str, RitualsDataUpdateCoordinator] = hass.data[DOMAIN][
diff --git a/homeassistant/components/rituals_perfume_genie/sensor.py b/homeassistant/components/rituals_perfume_genie/sensor.py
index 46faa8d73e9..3921fd0b6c2 100644
--- a/homeassistant/components/rituals_perfume_genie/sensor.py
+++ b/homeassistant/components/rituals_perfume_genie/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import RitualsDataUpdateCoordinator
@@ -60,7 +60,7 @@ ENTITY_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the diffuser sensors."""
     coordinators: dict[str, RitualsDataUpdateCoordinator] = hass.data[DOMAIN][
diff --git a/homeassistant/components/rituals_perfume_genie/switch.py b/homeassistant/components/rituals_perfume_genie/switch.py
index b5828f5ca07..c5331b49078 100644
--- a/homeassistant/components/rituals_perfume_genie/switch.py
+++ b/homeassistant/components/rituals_perfume_genie/switch.py
@@ -11,7 +11,7 @@ from pyrituals import Diffuser
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import RitualsDataUpdateCoordinator
@@ -42,7 +42,7 @@ ENTITY_DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the diffuser switch."""
     coordinators: dict[str, RitualsDataUpdateCoordinator] = hass.data[DOMAIN][
diff --git a/homeassistant/components/rmvtransport/sensor.py b/homeassistant/components/rmvtransport/sensor.py
index ac6c66bb6d2..c3217d9334e 100644
--- a/homeassistant/components/rmvtransport/sensor.py
+++ b/homeassistant/components/rmvtransport/sensor.py
@@ -20,7 +20,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import CONF_NAME, CONF_TIMEOUT, UnitOfTime
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/roborock/__init__.py b/homeassistant/components/roborock/__init__.py
index 9ab9226c9a5..8140b58b86c 100644
--- a/homeassistant/components/roborock/__init__.py
+++ b/homeassistant/components/roborock/__init__.py
@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import asyncio
 from collections.abc import Coroutine
-from dataclasses import dataclass
 from datetime import timedelta
 import logging
 from typing import Any
@@ -21,34 +20,25 @@ from roborock.version_1_apis.roborock_mqtt_client_v1 import RoborockMqttClientV1
 from roborock.version_a01_apis import RoborockMqttClientA01
 from roborock.web_api import RoborockApiClient
 
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_USERNAME
+from homeassistant.const import CONF_USERNAME, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import CONF_BASE_URL, CONF_USER_DATA, DOMAIN, PLATFORMS
-from .coordinator import RoborockDataUpdateCoordinator, RoborockDataUpdateCoordinatorA01
+from .coordinator import (
+    RoborockConfigEntry,
+    RoborockCoordinators,
+    RoborockDataUpdateCoordinator,
+    RoborockDataUpdateCoordinatorA01,
+)
+from .roborock_storage import async_remove_map_storage
 
 SCAN_INTERVAL = timedelta(seconds=30)
 
 _LOGGER = logging.getLogger(__name__)
 
-type RoborockConfigEntry = ConfigEntry[RoborockCoordinators]
-
-
-@dataclass
-class RoborockCoordinators:
-    """Roborock coordinators type."""
-
-    v1: list[RoborockDataUpdateCoordinator]
-    a01: list[RoborockDataUpdateCoordinatorA01]
-
-    def values(
-        self,
-    ) -> list[RoborockDataUpdateCoordinator | RoborockDataUpdateCoordinatorA01]:
-        """Return all coordinators."""
-        return self.v1 + self.a01
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: RoborockConfigEntry) -> bool:
     """Set up roborock from a config entry."""
@@ -56,7 +46,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: RoborockConfigEntry) ->
     entry.async_on_unload(entry.add_update_listener(update_listener))
 
     user_data = UserData.from_dict(entry.data[CONF_USER_DATA])
-    api_client = RoborockApiClient(entry.data[CONF_USERNAME], entry.data[CONF_BASE_URL])
+    api_client = RoborockApiClient(
+        entry.data[CONF_USERNAME],
+        entry.data[CONF_BASE_URL],
+        session=async_get_clientsession(hass),
+    )
     _LOGGER.debug("Getting home data")
     try:
         home_data = await api_client.get_home_data_v2(user_data)
@@ -77,6 +71,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: RoborockConfigEntry) ->
             translation_key="no_user_agreement",
         ) from err
     except RoborockException as err:
+        _LOGGER.debug("Failed to get Roborock home data: %s", err)
         raise ConfigEntryNotReady(
             "Failed to get Roborock home data",
             translation_domain=DOMAIN,
@@ -94,7 +89,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: RoborockConfigEntry) ->
     # Get a Coordinator if the device is available or if we have connected to the device before
     coordinators = await asyncio.gather(
         *build_setup_functions(
-            hass, device_map, user_data, product_info, home_data.rooms
+            hass,
+            entry,
+            device_map,
+            user_data,
+            product_info,
+            home_data.rooms,
+            api_client,
         ),
         return_exceptions=True,
     )
@@ -116,27 +117,61 @@ async def async_setup_entry(hass: HomeAssistant, entry: RoborockConfigEntry) ->
             translation_key="no_coordinators",
         )
     valid_coordinators = RoborockCoordinators(v1_coords, a01_coords)
+    await asyncio.gather(
+        *(coord.refresh_coordinator_map() for coord in valid_coordinators.v1)
+    )
 
-    async def on_unload() -> None:
-        release_tasks = set()
-        for coordinator in valid_coordinators.values():
-            release_tasks.add(coordinator.release())
-        await asyncio.gather(*release_tasks)
+    async def on_stop(_: Any) -> None:
+        _LOGGER.debug("Shutting down roborock")
+        await asyncio.gather(
+            *(
+                coordinator.async_shutdown()
+                for coordinator in valid_coordinators.values()
+            )
+        )
 
-    entry.async_on_unload(on_unload)
+    entry.async_on_unload(
+        hass.bus.async_listen_once(
+            EVENT_HOMEASSISTANT_STOP,
+            on_stop,
+        )
+    )
     entry.runtime_data = valid_coordinators
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
+    device_registry = dr.async_get(hass)
+    device_entries = dr.async_entries_for_config_entry(
+        device_registry, config_entry_id=entry.entry_id
+    )
+    for device in device_entries:
+        # Remove any devices that are no longer in the account.
+        # The API returns all devices, even if they are offline
+        device_duids = {
+            identifier[1].replace("_dock", "") for identifier in device.identifiers
+        }
+        if any(device_duid in device_map for device_duid in device_duids):
+            continue
+        _LOGGER.info(
+            "Removing device: %s because it is no longer exists in your account",
+            device.name,
+        )
+        device_registry.async_update_device(
+            device_id=device.id,
+            remove_config_entry_id=entry.entry_id,
+        )
+
     return True
 
 
 def build_setup_functions(
     hass: HomeAssistant,
+    entry: RoborockConfigEntry,
     device_map: dict[str, HomeDataDevice],
     user_data: UserData,
     product_info: dict[str, HomeDataProduct],
     home_data_rooms: list[HomeDataRoom],
+    api_client: RoborockApiClient,
 ) -> list[
     Coroutine[
         Any,
@@ -147,7 +182,13 @@ def build_setup_functions(
     """Create a list of setup functions that can later be called asynchronously."""
     return [
         setup_device(
-            hass, user_data, device, product_info[device.product_id], home_data_rooms
+            hass,
+            entry,
+            user_data,
+            device,
+            product_info[device.product_id],
+            home_data_rooms,
+            api_client,
         )
         for device in device_map.values()
     ]
@@ -155,18 +196,20 @@ def build_setup_functions(
 
 async def setup_device(
     hass: HomeAssistant,
+    entry: RoborockConfigEntry,
     user_data: UserData,
     device: HomeDataDevice,
     product_info: HomeDataProduct,
     home_data_rooms: list[HomeDataRoom],
+    api_client: RoborockApiClient,
 ) -> RoborockDataUpdateCoordinator | RoborockDataUpdateCoordinatorA01 | None:
     """Set up a coordinator for a given device."""
     if device.pv == "1.0":
         return await setup_device_v1(
-            hass, user_data, device, product_info, home_data_rooms
+            hass, entry, user_data, device, product_info, home_data_rooms, api_client
         )
     if device.pv == "A01":
-        return await setup_device_a01(hass, user_data, device, product_info)
+        return await setup_device_a01(hass, entry, user_data, device, product_info)
     _LOGGER.warning(
         "Not adding device %s because its protocol version %s or category %s is not supported",
         device.duid,
@@ -178,10 +221,12 @@ async def setup_device(
 
 async def setup_device_v1(
     hass: HomeAssistant,
+    entry: RoborockConfigEntry,
     user_data: UserData,
     device: HomeDataDevice,
     product_info: HomeDataProduct,
     home_data_rooms: list[HomeDataRoom],
+    api_client: RoborockApiClient,
 ) -> RoborockDataUpdateCoordinator | None:
     """Set up a device Coordinator."""
     mqtt_client = await hass.async_add_executor_job(
@@ -203,12 +248,20 @@ async def setup_device_v1(
         await mqtt_client.async_release()
         raise
     coordinator = RoborockDataUpdateCoordinator(
-        hass, device, networking, product_info, mqtt_client, home_data_rooms
+        hass,
+        entry,
+        device,
+        networking,
+        product_info,
+        mqtt_client,
+        home_data_rooms,
+        api_client,
+        user_data,
     )
     try:
         await coordinator.async_config_entry_first_refresh()
     except ConfigEntryNotReady as ex:
-        await coordinator.release()
+        await coordinator.async_shutdown()
         if isinstance(coordinator.api, RoborockMqttClientV1):
             _LOGGER.warning(
                 "Not setting up %s because the we failed to get data for the first time using the online client. "
@@ -237,6 +290,7 @@ async def setup_device_v1(
 
 async def setup_device_a01(
     hass: HomeAssistant,
+    entry: RoborockConfigEntry,
     user_data: UserData,
     device: HomeDataDevice,
     product_info: HomeDataProduct,
@@ -245,7 +299,9 @@ async def setup_device_a01(
     mqtt_client = RoborockMqttClientA01(
         user_data, DeviceData(device, product_info.name), product_info.category
     )
-    coord = RoborockDataUpdateCoordinatorA01(hass, device, product_info, mqtt_client)
+    coord = RoborockDataUpdateCoordinatorA01(
+        hass, entry, device, product_info, mqtt_client
+    )
     await coord.async_config_entry_first_refresh()
     return coord
 
@@ -259,3 +315,8 @@ async def update_listener(hass: HomeAssistant, entry: RoborockConfigEntry) -> No
     """Handle options update."""
     # Reload entry to update data
     await hass.config_entries.async_reload(entry.entry_id)
+
+
+async def async_remove_entry(hass: HomeAssistant, entry: RoborockConfigEntry) -> None:
+    """Handle removal of an entry."""
+    await async_remove_map_storage(hass, entry.entry_id)
diff --git a/homeassistant/components/roborock/binary_sensor.py b/homeassistant/components/roborock/binary_sensor.py
index b88556ea857..a2c34f5c59d 100644
--- a/homeassistant/components/roborock/binary_sensor.py
+++ b/homeassistant/components/roborock/binary_sensor.py
@@ -5,6 +5,7 @@ from __future__ import annotations
 from collections.abc import Callable
 from dataclasses import dataclass
 
+from roborock.containers import RoborockStateCode
 from roborock.roborock_typing import DeviceProp
 
 from homeassistant.components.binary_sensor import (
@@ -12,20 +13,23 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.const import EntityCategory
+from homeassistant.const import ATTR_BATTERY_CHARGING, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import RoborockConfigEntry
-from .coordinator import RoborockDataUpdateCoordinator
+from .coordinator import RoborockConfigEntry, RoborockDataUpdateCoordinator
 from .entity import RoborockCoordinatedEntityV1
 
+PARALLEL_UPDATES = 0
+
 
 @dataclass(frozen=True, kw_only=True)
 class RoborockBinarySensorDescription(BinarySensorEntityDescription):
     """A class that describes Roborock binary sensors."""
 
     value_fn: Callable[[DeviceProp], bool | int | None]
+    # If it is a dock entity
+    is_dock_entity: bool = False
 
 
 BINARY_SENSOR_DESCRIPTIONS = [
@@ -35,6 +39,7 @@ BINARY_SENSOR_DESCRIPTIONS = [
         device_class=BinarySensorDeviceClass.RUNNING,
         entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=lambda data: data.status.dry_status,
+        is_dock_entity=True,
     ),
     RoborockBinarySensorDescription(
         key="water_box_carriage_status",
@@ -64,13 +69,20 @@ BINARY_SENSOR_DESCRIPTIONS = [
         entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=lambda data: data.status.in_cleaning,
     ),
+    RoborockBinarySensorDescription(
+        key=ATTR_BATTERY_CHARGING,
+        device_class=BinarySensorDeviceClass.BATTERY_CHARGING,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=lambda data: data.status.state
+        in (RoborockStateCode.charging, RoborockStateCode.charging_complete),
+    ),
 ]
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RoborockConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Roborock vacuum binary sensors."""
     async_add_entities(
@@ -98,6 +110,7 @@ class RoborockBinarySensorEntity(RoborockCoordinatedEntityV1, BinarySensorEntity
         super().__init__(
             f"{description.key}_{coordinator.duid_slug}",
             coordinator,
+            is_dock_entity=description.is_dock_entity,
         )
         self.entity_description = description
 
diff --git a/homeassistant/components/roborock/button.py b/homeassistant/components/roborock/button.py
index 2f214c7c51c..fea38524fe0 100644
--- a/homeassistant/components/roborock/button.py
+++ b/homeassistant/components/roborock/button.py
@@ -2,18 +2,22 @@
 
 from __future__ import annotations
 
+import asyncio
 from dataclasses import dataclass
+import itertools
+from typing import Any
 
 from roborock.roborock_typing import RoborockCommand
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import RoborockConfigEntry
-from .coordinator import RoborockDataUpdateCoordinator
-from .entity import RoborockEntityV1
+from .coordinator import RoborockConfigEntry, RoborockDataUpdateCoordinator
+from .entity import RoborockEntity, RoborockEntityV1
+
+PARALLEL_UPDATES = 0
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -63,17 +67,37 @@ CONSUMABLE_BUTTON_DESCRIPTIONS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RoborockConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Roborock button platform."""
+    routines_lists = await asyncio.gather(
+        *[coordinator.get_routines() for coordinator in config_entry.runtime_data.v1],
+    )
     async_add_entities(
-        RoborockButtonEntity(
-            coordinator,
-            description,
+        itertools.chain(
+            (
+                RoborockButtonEntity(
+                    coordinator,
+                    description,
+                )
+                for coordinator in config_entry.runtime_data.v1
+                for description in CONSUMABLE_BUTTON_DESCRIPTIONS
+                if isinstance(coordinator, RoborockDataUpdateCoordinator)
+            ),
+            (
+                RoborockRoutineButtonEntity(
+                    coordinator,
+                    ButtonEntityDescription(
+                        key=str(routine.id),
+                        name=routine.name,
+                    ),
+                )
+                for coordinator, routines in zip(
+                    config_entry.runtime_data.v1, routines_lists, strict=True
+                )
+                for routine in routines
+            ),
         )
-        for coordinator in config_entry.runtime_data.v1
-        for description in CONSUMABLE_BUTTON_DESCRIPTIONS
-        if isinstance(coordinator, RoborockDataUpdateCoordinator)
     )
 
 
@@ -98,3 +122,28 @@ class RoborockButtonEntity(RoborockEntityV1, ButtonEntity):
     async def async_press(self) -> None:
         """Press the button."""
         await self.send(self.entity_description.command, self.entity_description.param)
+
+
+class RoborockRoutineButtonEntity(RoborockEntity, ButtonEntity):
+    """A class to define Roborock routines button entities."""
+
+    entity_description: ButtonEntityDescription
+
+    def __init__(
+        self,
+        coordinator: RoborockDataUpdateCoordinator,
+        entity_description: ButtonEntityDescription,
+    ) -> None:
+        """Create a button entity."""
+        super().__init__(
+            f"{entity_description.key}_{coordinator.duid_slug}",
+            coordinator.device_info,
+            coordinator.api,
+        )
+        self._routine_id = int(entity_description.key)
+        self._coordinator = coordinator
+        self.entity_description = entity_description
+
+    async def async_press(self, **kwargs: Any) -> None:
+        """Press the button."""
+        await self._coordinator.execute_routines(self._routine_id)
diff --git a/homeassistant/components/roborock/config_flow.py b/homeassistant/components/roborock/config_flow.py
index 1a6b67286bb..886bebea9b6 100644
--- a/homeassistant/components/roborock/config_flow.py
+++ b/homeassistant/components/roborock/config_flow.py
@@ -21,14 +21,17 @@ import voluptuous as vol
 
 from homeassistant.config_entries import (
     SOURCE_REAUTH,
-    ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
     OptionsFlow,
 )
 from homeassistant.const import CONF_USERNAME
 from homeassistant.core import callback
+from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 
+from . import RoborockConfigEntry
 from .const import (
     CONF_BASE_URL,
     CONF_ENTRY_CODE,
@@ -63,7 +66,9 @@ class RoborockFlowHandler(ConfigFlow, domain=DOMAIN):
             self._abort_if_unique_id_configured(error="already_configured_account")
             self._username = username
             _LOGGER.debug("Requesting code for Roborock account")
-            self._client = RoborockApiClient(username)
+            self._client = RoborockApiClient(
+                username, session=async_get_clientsession(self.hass)
+            )
             errors = await self._request_code()
             if not errors:
                 return await self.async_step_code()
@@ -134,13 +139,32 @@ class RoborockFlowHandler(ConfigFlow, domain=DOMAIN):
             errors=errors,
         )
 
+    async def async_step_dhcp(
+        self, discovery_info: DhcpServiceInfo
+    ) -> ConfigFlowResult:
+        """Handle a flow started by a dhcp discovery."""
+        await self._async_handle_discovery_without_unique_id()
+        device_registry = dr.async_get(self.hass)
+        device = device_registry.async_get_device(
+            connections={
+                (dr.CONNECTION_NETWORK_MAC, dr.format_mac(discovery_info.macaddress))
+            }
+        )
+        if device is not None and any(
+            identifier[0] == DOMAIN for identifier in device.identifiers
+        ):
+            return self.async_abort(reason="already_configured")
+        return await self.async_step_user()
+
     async def async_step_reauth(
         self, entry_data: Mapping[str, Any]
     ) -> ConfigFlowResult:
         """Perform reauth upon an API authentication error."""
         self._username = entry_data[CONF_USERNAME]
         assert self._username
-        self._client = RoborockApiClient(self._username)
+        self._client = RoborockApiClient(
+            self._username, session=async_get_clientsession(self.hass)
+        )
         return await self.async_step_reauth_confirm()
 
     async def async_step_reauth_confirm(
@@ -170,7 +194,7 @@ class RoborockFlowHandler(ConfigFlow, domain=DOMAIN):
     @staticmethod
     @callback
     def async_get_options_flow(
-        config_entry: ConfigEntry,
+        config_entry: RoborockConfigEntry,
     ) -> RoborockOptionsFlowHandler:
         """Create the options flow."""
         return RoborockOptionsFlowHandler(config_entry)
@@ -179,7 +203,7 @@ class RoborockFlowHandler(ConfigFlow, domain=DOMAIN):
 class RoborockOptionsFlowHandler(OptionsFlow):
     """Handle an option flow for Roborock."""
 
-    def __init__(self, config_entry: ConfigEntry) -> None:
+    def __init__(self, config_entry: RoborockConfigEntry) -> None:
         """Initialize options flow."""
         self.options = deepcopy(dict(config_entry.options))
 
diff --git a/homeassistant/components/roborock/const.py b/homeassistant/components/roborock/const.py
index 4a9bd14bfe1..e56fade7078 100644
--- a/homeassistant/components/roborock/const.py
+++ b/homeassistant/components/roborock/const.py
@@ -1,5 +1,7 @@
 """Constants for Roborock."""
 
+from datetime import timedelta
+
 from vacuum_map_parser_base.config.drawable import Drawable
 
 from homeassistant.const import Platform
@@ -43,11 +45,21 @@ PLATFORMS = [
     Platform.VACUUM,
 ]
 
-
-IMAGE_CACHE_INTERVAL = 90
+# This can be lowered in the future if we do not receive rate limiting issues.
+IMAGE_CACHE_INTERVAL = timedelta(seconds=30)
 
 MAP_SLEEP = 3
 
 GET_MAPS_SERVICE_NAME = "get_maps"
+MAP_SCALE = 4
+MAP_FILE_FORMAT = "PNG"
+MAP_FILENAME_SUFFIX = ".png"
 SET_VACUUM_GOTO_POSITION_SERVICE_NAME = "set_vacuum_goto_position"
 GET_VACUUM_CURRENT_POSITION_SERVICE_NAME = "get_vacuum_current_position"
+
+
+A01_UPDATE_INTERVAL = timedelta(minutes=1)
+V1_CLOUD_IN_CLEANING_INTERVAL = timedelta(seconds=30)
+V1_CLOUD_NOT_CLEANING_INTERVAL = timedelta(minutes=1)
+V1_LOCAL_IN_CLEANING_INTERVAL = timedelta(seconds=15)
+V1_LOCAL_NOT_CLEANING_INTERVAL = timedelta(seconds=30)
diff --git a/homeassistant/components/roborock/coordinator.py b/homeassistant/components/roborock/coordinator.py
index d34ba49da52..cc0bee1cd5f 100644
--- a/homeassistant/components/roborock/coordinator.py
+++ b/homeassistant/components/roborock/coordinator.py
@@ -2,50 +2,111 @@
 
 from __future__ import annotations
 
+import asyncio
+from dataclasses import dataclass
 from datetime import timedelta
+import io
 import logging
 
 from propcache.api import cached_property
 from roborock import HomeDataRoom
 from roborock.code_mappings import RoborockCategory
-from roborock.containers import DeviceData, HomeDataDevice, HomeDataProduct, NetworkInfo
+from roborock.containers import (
+    DeviceData,
+    HomeDataDevice,
+    HomeDataProduct,
+    HomeDataScene,
+    NetworkInfo,
+    UserData,
+)
 from roborock.exceptions import RoborockException
 from roborock.roborock_message import RoborockDyadDataProtocol, RoborockZeoProtocol
 from roborock.roborock_typing import DeviceProp
 from roborock.version_1_apis.roborock_local_client_v1 import RoborockLocalClientV1
 from roborock.version_1_apis.roborock_mqtt_client_v1 import RoborockMqttClientV1
 from roborock.version_a01_apis import RoborockClientA01
+from roborock.web_api import RoborockApiClient
+from vacuum_map_parser_base.config.color import ColorsPalette
+from vacuum_map_parser_base.config.image_config import ImageConfig
+from vacuum_map_parser_base.config.size import Sizes
+from vacuum_map_parser_base.map_data import MapData
+from vacuum_map_parser_roborock.map_data_parser import RoborockMapDataParser
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_CONNECTIONS
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-from homeassistant.util import slugify
+from homeassistant.util import dt as dt_util, slugify
 
-from .const import DOMAIN
+from .const import (
+    A01_UPDATE_INTERVAL,
+    DEFAULT_DRAWABLES,
+    DOMAIN,
+    DRAWABLES,
+    IMAGE_CACHE_INTERVAL,
+    MAP_FILE_FORMAT,
+    MAP_SCALE,
+    MAP_SLEEP,
+    V1_CLOUD_IN_CLEANING_INTERVAL,
+    V1_CLOUD_NOT_CLEANING_INTERVAL,
+    V1_LOCAL_IN_CLEANING_INTERVAL,
+    V1_LOCAL_NOT_CLEANING_INTERVAL,
+)
 from .models import RoborockA01HassDeviceInfo, RoborockHassDeviceInfo, RoborockMapInfo
+from .roborock_storage import RoborockMapStorage
 
 SCAN_INTERVAL = timedelta(seconds=30)
 
 _LOGGER = logging.getLogger(__name__)
 
 
+@dataclass
+class RoborockCoordinators:
+    """Roborock coordinators type."""
+
+    v1: list[RoborockDataUpdateCoordinator]
+    a01: list[RoborockDataUpdateCoordinatorA01]
+
+    def values(
+        self,
+    ) -> list[RoborockDataUpdateCoordinator | RoborockDataUpdateCoordinatorA01]:
+        """Return all coordinators."""
+        return self.v1 + self.a01
+
+
+type RoborockConfigEntry = ConfigEntry[RoborockCoordinators]
+
+
 class RoborockDataUpdateCoordinator(DataUpdateCoordinator[DeviceProp]):
     """Class to manage fetching data from the API."""
 
+    config_entry: RoborockConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: RoborockConfigEntry,
         device: HomeDataDevice,
         device_networking: NetworkInfo,
         product_info: HomeDataProduct,
         cloud_api: RoborockMqttClientV1,
         home_data_rooms: list[HomeDataRoom],
+        api_client: RoborockApiClient,
+        user_data: UserData,
     ) -> None:
         """Initialize."""
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=SCAN_INTERVAL)
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            # Assume we can use the local api.
+            update_interval=V1_LOCAL_NOT_CLEANING_INTERVAL,
+        )
         self.roborock_device_info = RoborockHassDeviceInfo(
             device,
             device_networking,
@@ -59,7 +120,7 @@ class RoborockDataUpdateCoordinator(DataUpdateCoordinator[DeviceProp]):
         self.cloud_api = cloud_api
         self.device_info = DeviceInfo(
             name=self.roborock_device_info.device.name,
-            identifiers={(DOMAIN, self.roborock_device_info.device.duid)},
+            identifiers={(DOMAIN, self.duid)},
             manufacturer="Roborock",
             model=self.roborock_device_info.product.model,
             model_id=self.roborock_device_info.product.model,
@@ -68,10 +129,62 @@ class RoborockDataUpdateCoordinator(DataUpdateCoordinator[DeviceProp]):
         self.current_map: int | None = None
 
         if mac := self.roborock_device_info.network_info.mac:
-            self.device_info[ATTR_CONNECTIONS] = {(dr.CONNECTION_NETWORK_MAC, mac)}
+            self.device_info[ATTR_CONNECTIONS] = {
+                (dr.CONNECTION_NETWORK_MAC, dr.format_mac(mac))
+            }
         # Maps from map flag to map name
         self.maps: dict[int, RoborockMapInfo] = {}
         self._home_data_rooms = {str(room.id): room.name for room in home_data_rooms}
+        self.map_storage = RoborockMapStorage(
+            hass, self.config_entry.entry_id, self.duid_slug
+        )
+        self._user_data = user_data
+        self._api_client = api_client
+        self._is_cloud_api = False
+        drawables = [
+            drawable
+            for drawable, default_value in DEFAULT_DRAWABLES.items()
+            if config_entry.options.get(DRAWABLES, {}).get(drawable, default_value)
+        ]
+        self.map_parser = RoborockMapDataParser(
+            ColorsPalette(),
+            Sizes({k: v * MAP_SCALE for k, v in Sizes.SIZES.items()}),
+            drawables,
+            ImageConfig(scale=MAP_SCALE),
+            [],
+        )
+
+    @cached_property
+    def dock_device_info(self) -> DeviceInfo:
+        """Gets the device info for the dock.
+
+        This must happen after the coordinator does the first update.
+        Which will be the case when this is called.
+        """
+        dock_type = self.roborock_device_info.props.status.dock_type
+        return DeviceInfo(
+            name=f"{self.roborock_device_info.device.name} Dock",
+            identifiers={(DOMAIN, f"{self.duid}_dock")},
+            manufacturer="Roborock",
+            model=f"{self.roborock_device_info.product.model} Dock",
+            model_id=str(dock_type.value) if dock_type is not None else "Unknown",
+            sw_version=self.roborock_device_info.device.fv,
+        )
+
+    def parse_map_data_v1(
+        self, map_bytes: bytes
+    ) -> tuple[bytes | None, MapData | None]:
+        """Parse map_bytes and return MapData and the image."""
+        try:
+            parsed_map = self.map_parser.parse(map_bytes)
+        except (IndexError, ValueError) as err:
+            _LOGGER.debug("Exception when parsing map contents: %s", err)
+            return None, None
+        if parsed_map.image is None:
+            return None, None
+        img_byte_arr = io.BytesIO()
+        parsed_map.image.data.save(img_byte_arr, format=MAP_FILE_FORMAT)
+        return img_byte_arr.getvalue(), parsed_map
 
     async def _async_setup(self) -> None:
         """Set up the coordinator."""
@@ -82,17 +195,68 @@ class RoborockDataUpdateCoordinator(DataUpdateCoordinator[DeviceProp]):
         try:
             maps = await self.api.get_multi_maps_list()
         except RoborockException as err:
-            raise UpdateFailed("Failed to get map data: {err}") from err
+            _LOGGER.debug("Failed to get maps: %s", err)
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="map_failure",
+                translation_placeholders={"error": str(err)},
+            ) from err
         # Rooms names populated later with calls to `set_current_map_rooms` for each map
+        roborock_maps = maps.map_info if (maps and maps.map_info) else ()
+        stored_images = await asyncio.gather(
+            *[
+                self.map_storage.async_load_map(roborock_map.mapFlag)
+                for roborock_map in roborock_maps
+            ]
+        )
         self.maps = {
             roborock_map.mapFlag: RoborockMapInfo(
                 flag=roborock_map.mapFlag,
                 name=roborock_map.name or f"Map {roborock_map.mapFlag}",
                 rooms={},
+                image=image,
+                last_updated=dt_util.utcnow() - IMAGE_CACHE_INTERVAL,
+                map_data=None,
             )
-            for roborock_map in (maps.map_info if (maps and maps.map_info) else ())
+            for image, roborock_map in zip(stored_images, roborock_maps, strict=False)
         }
 
+    async def update_map(self) -> None:
+        """Update the currently selected map."""
+        # The current map was set in the props update, so these can be done without
+        # worry of applying them to the wrong map.
+        if self.current_map is None:
+            # This exists as a safeguard/ to keep mypy happy.
+            return
+        try:
+            response = await self.cloud_api.get_map_v1()
+        except RoborockException as ex:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="map_failure",
+            ) from ex
+        if not isinstance(response, bytes):
+            _LOGGER.debug("Failed to parse map contents: %s", response)
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="map_failure",
+            )
+        parsed_image, parsed_map = self.parse_map_data_v1(response)
+        if parsed_image is None or parsed_map is None:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="map_failure",
+            )
+        current_roborock_map_info = self.maps[self.current_map]
+        if parsed_image != self.maps[self.current_map].image:
+            await self.map_storage.async_save_map(
+                self.current_map,
+                parsed_image,
+            )
+            current_roborock_map_info.image = parsed_image
+            current_roborock_map_info.last_updated = dt_util.utcnow()
+        current_roborock_map_info.map_data = parsed_map
+
     async def _verify_api(self) -> None:
         """Verify that the api is reachable. If it is not, switch clients."""
         if isinstance(self.api, RoborockLocalClientV1):
@@ -101,18 +265,24 @@ class RoborockDataUpdateCoordinator(DataUpdateCoordinator[DeviceProp]):
             except RoborockException:
                 _LOGGER.warning(
                     "Using the cloud API for device %s. This is not recommended as it can lead to rate limiting. We recommend making your vacuum accessible by your Home Assistant instance",
-                    self.roborock_device_info.device.duid,
+                    self.duid,
                 )
                 await self.api.async_disconnect()
                 # We use the cloud api if the local api fails to connect.
                 self.api = self.cloud_api
+                self.update_interval = V1_CLOUD_NOT_CLEANING_INTERVAL
+                self._is_cloud_api = True
                 # Right now this should never be called if the cloud api is the primary api,
                 # but in the future if it is, a new else should be added.
 
-    async def release(self) -> None:
-        """Disconnect from API."""
-        await self.api.async_release()
-        await self.cloud_api.async_release()
+    async def async_shutdown(self) -> None:
+        """Shutdown the coordinator."""
+        await super().async_shutdown()
+        await asyncio.gather(
+            self.map_storage.flush(),
+            self.api.async_release(),
+            self.cloud_api.async_release(),
+        )
 
     async def _update_device_prop(self) -> None:
         """Update device properties."""
@@ -121,15 +291,45 @@ class RoborockDataUpdateCoordinator(DataUpdateCoordinator[DeviceProp]):
 
     async def _async_update_data(self) -> DeviceProp:
         """Update data via library."""
+        previous_state = self.roborock_device_info.props.status.state_name
         try:
             # Update device props and standard api information
             await self._update_device_prop()
             # Set the new map id from the updated device props
             self._set_current_map()
             # Get the rooms for that map id.
+
+            # If the vacuum is currently cleaning and it has been IMAGE_CACHE_INTERVAL
+            # since the last map update, you can update the map.
+            new_status = self.roborock_device_info.props.status
+            if self.current_map is not None and (
+                (
+                    new_status.in_cleaning
+                    and (dt_util.utcnow() - self.maps[self.current_map].last_updated)
+                    > IMAGE_CACHE_INTERVAL
+                )
+                or previous_state != new_status.state_name
+            ):
+                try:
+                    await self.update_map()
+                except HomeAssistantError as err:
+                    _LOGGER.debug("Failed to update map: %s", err)
             await self.set_current_map_rooms()
         except RoborockException as ex:
-            raise UpdateFailed(ex) from ex
+            _LOGGER.debug("Failed to update data: %s", ex)
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="update_data_fail",
+            ) from ex
+        if self.roborock_device_info.props.status.in_cleaning:
+            if self._is_cloud_api:
+                self.update_interval = V1_CLOUD_IN_CLEANING_INTERVAL
+            else:
+                self.update_interval = V1_LOCAL_IN_CLEANING_INTERVAL
+        elif self._is_cloud_api:
+            self.update_interval = V1_CLOUD_NOT_CLEANING_INTERVAL
+        else:
+            self.update_interval = V1_LOCAL_NOT_CLEANING_INTERVAL
         return self.roborock_device_info.props
 
     def _set_current_map(self) -> None:
@@ -156,6 +356,34 @@ class RoborockDataUpdateCoordinator(DataUpdateCoordinator[DeviceProp]):
             for room in room_mapping or ()
         }
 
+    async def get_routines(self) -> list[HomeDataScene]:
+        """Get routines."""
+        try:
+            return await self._api_client.get_scenes(self._user_data, self.duid)
+        except RoborockException as err:
+            _LOGGER.error("Failed to get routines %s", err)
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="command_failed",
+                translation_placeholders={
+                    "command": "get_scenes",
+                },
+            ) from err
+
+    async def execute_routines(self, routine_id: int) -> None:
+        """Execute routines."""
+        try:
+            await self._api_client.execute_scene(self._user_data, routine_id)
+        except RoborockException as err:
+            _LOGGER.error("Failed to execute routines %s %s", routine_id, err)
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="command_failed",
+                translation_placeholders={
+                    "command": "execute_scene",
+                },
+            ) from err
+
     @cached_property
     def duid(self) -> str:
         """Get the unique id of the device as specified by Roborock."""
@@ -166,6 +394,43 @@ class RoborockDataUpdateCoordinator(DataUpdateCoordinator[DeviceProp]):
         """Get the slug of the duid."""
         return slugify(self.duid)
 
+    async def refresh_coordinator_map(self) -> None:
+        """Get the starting map information for all maps for this device.
+
+        The following steps must be done synchronously.
+        Only one map can be loaded at a time per device.
+        """
+        cur_map = self.current_map
+        # This won't be None at this point as the coordinator will have run first.
+        if cur_map is None:
+            # If we don't have a cur map(shouldn't happen) just
+            # return as we can't do anything.
+            return
+        map_flags = sorted(self.maps, key=lambda data: data == cur_map, reverse=True)
+        for map_flag in map_flags:
+            if map_flag != cur_map:
+                # Only change the map and sleep if we have multiple maps.
+                await self.api.load_multi_map(map_flag)
+                self.current_map = map_flag
+                # We cannot get the map until the roborock servers fully process the
+                # map change.
+                await asyncio.sleep(MAP_SLEEP)
+            tasks = [self.set_current_map_rooms()]
+            # The image is set within async_setup, so if it exists, we have it here.
+            if self.maps[map_flag].image is None:
+                # If we don't have a cached map, let's update it here so that it can be
+                # cached in the future.
+                tasks.append(self.update_map())
+            # If either of these fail, we don't care, and we want to continue.
+            await asyncio.gather(*tasks, return_exceptions=True)
+
+        if len(self.maps) != 1:
+            # Set the map back to the map the user previously had selected so that it
+            # does not change the end user's app.
+            # Only needs to happen when we changed maps above.
+            await self.api.load_multi_map(cur_map)
+            self.current_map = cur_map
+
 
 class RoborockDataUpdateCoordinatorA01(
     DataUpdateCoordinator[
@@ -174,15 +439,24 @@ class RoborockDataUpdateCoordinatorA01(
 ):
     """Class to manage fetching data from the API for A01 devices."""
 
+    config_entry: RoborockConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: RoborockConfigEntry,
         device: HomeDataDevice,
         product_info: HomeDataProduct,
         api: RoborockClientA01,
     ) -> None:
         """Initialize."""
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=SCAN_INTERVAL)
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=A01_UPDATE_INTERVAL,
+        )
         self.api = api
         self.device_info = DeviceInfo(
             name=device.name,
@@ -219,8 +493,9 @@ class RoborockDataUpdateCoordinatorA01(
     ) -> dict[RoborockDyadDataProtocol | RoborockZeoProtocol, StateType]:
         return await self.api.update_values(self.request_protocols)
 
-    async def release(self) -> None:
-        """Disconnect from API."""
+    async def async_shutdown(self) -> None:
+        """Shutdown the coordinator on config entry unload."""
+        await super().async_shutdown()
         await self.api.async_release()
 
     @cached_property
diff --git a/homeassistant/components/roborock/diagnostics.py b/homeassistant/components/roborock/diagnostics.py
index e784e4ce837..4602b4bd02a 100644
--- a/homeassistant/components/roborock/diagnostics.py
+++ b/homeassistant/components/roborock/diagnostics.py
@@ -8,7 +8,7 @@ from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_UNIQUE_ID
 from homeassistant.core import HomeAssistant
 
-from . import RoborockConfigEntry
+from .coordinator import RoborockConfigEntry
 
 TO_REDACT_CONFIG = ["token", "sn", "rruid", CONF_UNIQUE_ID, "username", "uid"]
 
diff --git a/homeassistant/components/roborock/entity.py b/homeassistant/components/roborock/entity.py
index 4a16ada5967..404f239c93a 100644
--- a/homeassistant/components/roborock/entity.py
+++ b/homeassistant/components/roborock/entity.py
@@ -8,7 +8,11 @@ from roborock.containers import Consumable, Status
 from roborock.exceptions import RoborockException
 from roborock.roborock_message import RoborockDataProtocol
 from roborock.roborock_typing import RoborockCommand
-from roborock.version_1_apis.roborock_client_v1 import AttributeCache, RoborockClientV1
+from roborock.version_1_apis.roborock_client_v1 import (
+    CLOUD_REQUIRED,
+    AttributeCache,
+    RoborockClientV1,
+)
 from roborock.version_1_apis.roborock_mqtt_client_v1 import RoborockMqttClientV1
 from roborock.version_a01_apis import RoborockClientA01
 
@@ -53,14 +57,16 @@ class RoborockEntityV1(RoborockEntity):
         """Get an item from the api cache."""
         return self._api.cache[attribute]
 
-    async def send(
-        self,
+    @classmethod
+    async def _send_command(
+        cls,
         command: RoborockCommand | str,
+        api: RoborockClientV1,
         params: dict[str, Any] | list[Any] | int | None = None,
     ) -> dict:
-        """Send a command to a vacuum cleaner."""
+        """Send a Roborock command with params to a given api."""
         try:
-            response: dict = await self._api.send_command(command, params)
+            response: dict = await api.send_command(command, params)
         except RoborockException as err:
             if isinstance(command, RoborockCommand):
                 command_name = command.name
@@ -75,6 +81,14 @@ class RoborockEntityV1(RoborockEntity):
             ) from err
         return response
 
+    async def send(
+        self,
+        command: RoborockCommand | str,
+        params: dict[str, Any] | list[Any] | int | None = None,
+    ) -> dict:
+        """Send a command to a vacuum cleaner."""
+        return await self._send_command(command, self._api, params)
+
     @property
     def api(self) -> RoborockClientV1:
         """Returns the api."""
@@ -107,12 +121,15 @@ class RoborockCoordinatedEntityV1(
         listener_request: list[RoborockDataProtocol]
         | RoborockDataProtocol
         | None = None,
+        is_dock_entity: bool = False,
     ) -> None:
         """Initialize the coordinated Roborock Device."""
         RoborockEntityV1.__init__(
             self,
             unique_id=unique_id,
-            device_info=coordinator.device_info,
+            device_info=coordinator.device_info
+            if not is_dock_entity
+            else coordinator.dock_device_info,
             api=coordinator.api,
         )
         CoordinatorEntity.__init__(self, coordinator=coordinator)
@@ -152,7 +169,10 @@ class RoborockCoordinatedEntityV1(
         params: dict[str, Any] | list[Any] | int | None = None,
     ) -> dict:
         """Overloads normal send command but refreshes coordinator."""
-        res = await super().send(command, params)
+        if command in CLOUD_REQUIRED:
+            res = await self._send_command(command, self.coordinator.cloud_api, params)
+        else:
+            res = await self._send_command(command, self._api, params)
         await self.coordinator.async_refresh()
         return res
 
diff --git a/homeassistant/components/roborock/image.py b/homeassistant/components/roborock/image.py
index 8717920b907..d1c19331ba4 100644
--- a/homeassistant/components/roborock/image.py
+++ b/homeassistant/components/roborock/image.py
@@ -1,54 +1,42 @@
 """Support for Roborock image."""
 
-import asyncio
 from datetime import datetime
-import io
-from itertools import chain
-
-from roborock import RoborockCommand
-from vacuum_map_parser_base.config.color import ColorsPalette
-from vacuum_map_parser_base.config.drawable import Drawable
-from vacuum_map_parser_base.config.image_config import ImageConfig
-from vacuum_map_parser_base.config.size import Sizes
-from vacuum_map_parser_roborock.map_data_parser import RoborockMapDataParser
+import logging
 
 from homeassistant.components.image import ImageEntity
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util import slugify
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import RoborockConfigEntry
-from .const import DEFAULT_DRAWABLES, DOMAIN, DRAWABLES, IMAGE_CACHE_INTERVAL, MAP_SLEEP
-from .coordinator import RoborockDataUpdateCoordinator
+from .coordinator import RoborockConfigEntry, RoborockDataUpdateCoordinator
 from .entity import RoborockCoordinatedEntityV1
 
+_LOGGER = logging.getLogger(__name__)
+
+PARALLEL_UPDATES = 0
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RoborockConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Roborock image platform."""
 
-    drawables = [
-        drawable
-        for drawable, default_value in DEFAULT_DRAWABLES.items()
-        if config_entry.options.get(DRAWABLES, {}).get(drawable, default_value)
-    ]
-    entities = list(
-        chain.from_iterable(
-            await asyncio.gather(
-                *(
-                    create_coordinator_maps(coord, drawables)
-                    for coord in config_entry.runtime_data.v1
-                )
+    async_add_entities(
+        (
+            RoborockMap(
+                config_entry,
+                f"{coord.duid_slug}_map_{map_info.name}",
+                coord,
+                map_info.flag,
+                map_info.name,
             )
-        )
+            for coord in config_entry.runtime_data.v1
+            for map_info in coord.maps.values()
+        ),
     )
-    async_add_entities(entities)
 
 
 class RoborockMap(RoborockCoordinatedEntityV1, ImageEntity):
@@ -56,147 +44,46 @@ class RoborockMap(RoborockCoordinatedEntityV1, ImageEntity):
 
     _attr_has_entity_name = True
     image_last_updated: datetime
+    _attr_name: str
 
     def __init__(
         self,
+        config_entry: ConfigEntry,
         unique_id: str,
         coordinator: RoborockDataUpdateCoordinator,
         map_flag: int,
-        starting_map: bytes,
         map_name: str,
-        drawables: list[Drawable],
     ) -> None:
         """Initialize a Roborock map."""
         RoborockCoordinatedEntityV1.__init__(self, unique_id, coordinator)
         ImageEntity.__init__(self, coordinator.hass)
+        self.config_entry = config_entry
         self._attr_name = map_name
-        self.parser = RoborockMapDataParser(
-            ColorsPalette(), Sizes(), drawables, ImageConfig(), []
-        )
-        self._attr_image_last_updated = dt_util.utcnow()
         self.map_flag = map_flag
-        try:
-            self.cached_map = self._create_image(starting_map)
-        except HomeAssistantError:
-            # If we failed to update the image on init,
-            # we set cached_map to empty bytes
-            # so that we are unavailable and can try again later.
-            self.cached_map = b""
+        self.cached_map = b""
         self._attr_entity_category = EntityCategory.DIAGNOSTIC
 
-    @property
-    def available(self) -> bool:
-        """Determines if the entity is available."""
-        return self.cached_map != b""
-
     @property
     def is_selected(self) -> bool:
         """Return if this map is the currently selected map."""
         return self.map_flag == self.coordinator.current_map
 
-    def is_map_valid(self) -> bool:
-        """Update the map if it is valid.
-
-        Update this map if it is the currently active map, and the
-        vacuum is cleaning, or if it has never been set at all.
-        """
-        return self.cached_map == b"" or (
-            self.is_selected
-            and self.image_last_updated is not None
-            and self.coordinator.roborock_device_info.props.status is not None
-            and bool(self.coordinator.roborock_device_info.props.status.in_cleaning)
-        )
+    async def async_added_to_hass(self) -> None:
+        """When entity is added to hass load any previously cached maps from disk."""
+        await super().async_added_to_hass()
+        self._attr_image_last_updated = self.coordinator.maps[
+            self.map_flag
+        ].last_updated
+        self.async_write_ha_state()
 
     def _handle_coordinator_update(self) -> None:
-        # Bump last updated every third time the coordinator runs, so that async_image
-        # will be called and we will evaluate on the new coordinator data if we should
-        # update the cache.
-        if (
-            dt_util.utcnow() - self.image_last_updated
-        ).total_seconds() > IMAGE_CACHE_INTERVAL and self.is_map_valid():
-            self._attr_image_last_updated = dt_util.utcnow()
+        # If the coordinator has updated the map, we can update the image.
+        self._attr_image_last_updated = self.coordinator.maps[
+            self.map_flag
+        ].last_updated
+
         super()._handle_coordinator_update()
 
     async def async_image(self) -> bytes | None:
-        """Update the image if it is not cached."""
-        if self.is_map_valid():
-            response = await asyncio.gather(
-                *(
-                    self.cloud_api.get_map_v1(),
-                    self.coordinator.set_current_map_rooms(),
-                ),
-                return_exceptions=True,
-            )
-            if not isinstance(response[0], bytes):
-                raise HomeAssistantError(
-                    translation_domain=DOMAIN,
-                    translation_key="map_failure",
-                )
-            map_data = response[0]
-            self.cached_map = self._create_image(map_data)
-        return self.cached_map
-
-    def _create_image(self, map_bytes: bytes) -> bytes:
-        """Create an image using the map parser."""
-        parsed_map = self.parser.parse(map_bytes)
-        if parsed_map.image is None:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="map_failure",
-            )
-        img_byte_arr = io.BytesIO()
-        parsed_map.image.data.save(img_byte_arr, format="PNG")
-        return img_byte_arr.getvalue()
-
-
-async def create_coordinator_maps(
-    coord: RoborockDataUpdateCoordinator, drawables: list[Drawable]
-) -> list[RoborockMap]:
-    """Get the starting map information for all maps for this device.
-
-    The following steps must be done synchronously.
-    Only one map can be loaded at a time per device.
-    """
-    entities = []
-    cur_map = coord.current_map
-    # This won't be None at this point as the coordinator will have run first.
-    assert cur_map is not None
-    # Sort the maps so that we start with the current map and we can skip the
-    # load_multi_map call.
-    maps_info = sorted(
-        coord.maps.items(), key=lambda data: data[0] == cur_map, reverse=True
-    )
-    for map_flag, map_info in maps_info:
-        # Load the map - so we can access it with get_map_v1
-        if map_flag != cur_map:
-            # Only change the map and sleep if we have multiple maps.
-            await coord.api.send_command(RoborockCommand.LOAD_MULTI_MAP, [map_flag])
-            coord.current_map = map_flag
-            # We cannot get the map until the roborock servers fully process the
-            # map change.
-            await asyncio.sleep(MAP_SLEEP)
-        # Get the map data
-        map_update = await asyncio.gather(
-            *[coord.cloud_api.get_map_v1(), coord.set_current_map_rooms()],
-            return_exceptions=True,
-        )
-        # If we fail to get the map, we should set it to empty byte,
-        # still create it, and set it as unavailable.
-        api_data: bytes = map_update[0] if isinstance(map_update[0], bytes) else b""
-        entities.append(
-            RoborockMap(
-                f"{slugify(coord.duid)}_map_{map_info.name}",
-                coord,
-                map_flag,
-                api_data,
-                map_info.name,
-                drawables,
-            )
-        )
-    if len(coord.maps) != 1:
-        # Set the map back to the map the user previously had selected so that it
-        # does not change the end user's app.
-        # Only needs to happen when we changed maps above.
-        await coord.cloud_api.send_command(RoborockCommand.LOAD_MULTI_MAP, [cur_map])
-        coord.current_map = cur_map
-    return entities
+        """Get the cached image."""
+        return self.coordinator.maps[self.map_flag].image
diff --git a/homeassistant/components/roborock/manifest.json b/homeassistant/components/roborock/manifest.json
index d104ebff12a..531590d5d6e 100644
--- a/homeassistant/components/roborock/manifest.json
+++ b/homeassistant/components/roborock/manifest.json
@@ -3,11 +3,23 @@
   "name": "Roborock",
   "codeowners": ["@Lash-L", "@allenporter"],
   "config_flow": true,
+  "dhcp": [
+    {
+      "macaddress": "249E7D*"
+    },
+    {
+      "macaddress": "B04A39*"
+    },
+    {
+      "hostname": "roborock-*"
+    }
+  ],
   "documentation": "https://www.home-assistant.io/integrations/roborock",
   "iot_class": "local_polling",
   "loggers": ["roborock"],
+  "quality_scale": "silver",
   "requirements": [
-    "python-roborock==2.8.4",
+    "python-roborock==2.16.1",
     "vacuum-map-parser-roborock==0.1.2"
   ]
 }
diff --git a/homeassistant/components/roborock/models.py b/homeassistant/components/roborock/models.py
index 4b8ab43b4a1..ab40f23d574 100644
--- a/homeassistant/components/roborock/models.py
+++ b/homeassistant/components/roborock/models.py
@@ -1,10 +1,12 @@
 """Roborock Models."""
 
 from dataclasses import dataclass
+from datetime import datetime
 from typing import Any
 
 from roborock.containers import HomeDataDevice, HomeDataProduct, NetworkInfo
 from roborock.roborock_typing import DeviceProp
+from vacuum_map_parser_base.map_data import MapData
 
 
 @dataclass
@@ -48,3 +50,13 @@ class RoborockMapInfo:
     flag: int
     name: str
     rooms: dict[int, str]
+    image: bytes | None
+    last_updated: datetime
+    map_data: MapData | None
+
+    @property
+    def current_room(self) -> str | None:
+        """Get the currently active room for this map if any."""
+        if self.map_data is None or self.map_data.vacuum_room is None:
+            return None
+        return self.rooms.get(self.map_data.vacuum_room)
diff --git a/homeassistant/components/roborock/number.py b/homeassistant/components/roborock/number.py
index 7f568ae824b..73ac14fca71 100644
--- a/homeassistant/components/roborock/number.py
+++ b/homeassistant/components/roborock/number.py
@@ -14,14 +14,16 @@ from homeassistant.components.number import NumberEntity, NumberEntityDescriptio
 from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import DOMAIN, RoborockConfigEntry
-from .coordinator import RoborockDataUpdateCoordinator
+from .const import DOMAIN
+from .coordinator import RoborockConfigEntry, RoborockDataUpdateCoordinator
 from .entity import RoborockEntityV1
 
 _LOGGER = logging.getLogger(__name__)
 
+PARALLEL_UPDATES = 0
+
 
 @dataclass(frozen=True, kw_only=True)
 class RoborockNumberDescription(NumberEntityDescription):
@@ -50,7 +52,7 @@ NUMBER_DESCRIPTIONS: list[RoborockNumberDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RoborockConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Roborock number platform."""
     possible_entities: list[
diff --git a/homeassistant/components/roborock/quality_scale.yaml b/homeassistant/components/roborock/quality_scale.yaml
new file mode 100644
index 00000000000..32ddb145f90
--- /dev/null
+++ b/homeassistant/components/roborock/quality_scale.yaml
@@ -0,0 +1,75 @@
+rules:
+  # Bronze
+  action-setup: done
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow: done
+  config-flow-test-coverage: done
+  dependency-transparency: done
+  docs-actions: done
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup: done
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure:
+    status: done
+    comment: The config flow verifies credentials and the cloud APIs.
+  test-before-setup: done
+  unique-config-entry: done
+  # Silver
+  action-exceptions: done
+  config-entry-unloading: done
+  docs-configuration-parameters: done
+  docs-installation-parameters: done
+  entity-unavailable: done
+  integration-owner: done
+  log-when-unavailable: done
+  parallel-updates: done
+  reauthentication-flow: done
+  test-coverage: done
+  # Gold
+  devices: done
+  diagnostics: done
+  discovery: done
+  discovery-update-info:
+    status: exempt
+    comment: Devices do not support discovery.
+  docs-data-update: done
+  docs-examples: done
+  docs-known-limitations:
+    status: todo
+    comment: Documentation does not describe known limitations like rate limiting
+  docs-supported-devices: todo
+  docs-supported-functions: done
+  docs-troubleshooting:
+    status: todo
+    comment: |
+      There are good troubleshooting steps, however we should update the "cloud vs local"
+      and rate limiting documentation with more information.
+  docs-use-cases:
+    status: todo
+    comment: |
+      The docs describe controlling the vacuum, though does not describe more
+      interesting potential integrations with the homoe assistant ecosystem.
+  dynamic-devices: todo
+  entity-category: done
+  entity-device-class: done
+  entity-disabled-by-default:
+    status: exempt
+    comment: There are no noisy entities.
+  entity-translations: done
+  exception-translations: done
+  icon-translations: todo
+  reconfiguration-flow: todo
+  repair-issues:
+    status: todo
+    comment: The Cloud vs Local API warning should probably be a repair issue.
+  stale-devices: done
+  # Platinum
+  async-dependency: todo
+  inject-websession: done
+  strict-typing: done
diff --git a/homeassistant/components/roborock/roborock_storage.py b/homeassistant/components/roborock/roborock_storage.py
new file mode 100644
index 00000000000..8a469b0a38e
--- /dev/null
+++ b/homeassistant/components/roborock/roborock_storage.py
@@ -0,0 +1,95 @@
+"""Roborock storage."""
+
+import logging
+from pathlib import Path
+import shutil
+
+from homeassistant.core import HomeAssistant
+
+from .const import DOMAIN, MAP_FILENAME_SUFFIX
+
+_LOGGER = logging.getLogger(__name__)
+
+STORAGE_PATH = f".storage/{DOMAIN}"
+MAPS_PATH = "maps"
+
+
+def _storage_path_prefix(hass: HomeAssistant, entry_id: str) -> Path:
+    return Path(hass.config.path(STORAGE_PATH)) / entry_id
+
+
+class RoborockMapStorage:
+    """Store and retrieve maps for a Roborock device.
+
+    An instance of RoborockMapStorage is created for each device and manages
+    local storage of maps for that device.
+    """
+
+    def __init__(self, hass: HomeAssistant, entry_id: str, device_id_slug: str) -> None:
+        """Initialize RoborockMapStorage."""
+        self._hass = hass
+        self._path_prefix = (
+            _storage_path_prefix(hass, entry_id) / MAPS_PATH / device_id_slug
+        )
+        self._write_queue: dict[int, bytes] = {}
+
+    async def async_load_map(self, map_flag: int) -> bytes | None:
+        """Load maps from disk."""
+        filename = self._path_prefix / f"{map_flag}{MAP_FILENAME_SUFFIX}"
+        return await self._hass.async_add_executor_job(self._load_map, filename)
+
+    def _load_map(self, filename: Path) -> bytes | None:
+        """Load maps from disk."""
+        if not filename.exists():
+            return None
+        try:
+            return filename.read_bytes()
+        except OSError as err:
+            _LOGGER.debug("Unable to read map file: %s %s", filename, err)
+            return None
+
+    async def async_save_map(self, map_flag: int, content: bytes) -> None:
+        """Save the map to a pending write queue."""
+        self._write_queue[map_flag] = content
+
+    async def flush(self) -> None:
+        """Flush all maps to disk."""
+        _LOGGER.debug("Flushing %s maps to disk", len(self._write_queue))
+
+        queue = self._write_queue.copy()
+
+        def _flush_all() -> None:
+            for map_flag, content in queue.items():
+                filename = self._path_prefix / f"{map_flag}{MAP_FILENAME_SUFFIX}"
+                self._save_map(filename, content)
+
+        await self._hass.async_add_executor_job(_flush_all)
+        self._write_queue.clear()
+
+    def _save_map(self, filename: Path, content: bytes) -> None:
+        """Write the map to disk."""
+        _LOGGER.debug("Saving map to disk: %s", filename)
+        try:
+            filename.parent.mkdir(parents=True, exist_ok=True)
+        except OSError as err:
+            _LOGGER.error("Unable to create map directory: %s %s", filename, err)
+            return
+        try:
+            filename.write_bytes(content)
+        except OSError as err:
+            _LOGGER.error("Unable to write map file: %s %s", filename, err)
+
+
+async def async_remove_map_storage(hass: HomeAssistant, entry_id: str) -> None:
+    """Remove all map storage  associated with a config entry."""
+
+    def remove(path_prefix: Path) -> None:
+        try:
+            if path_prefix.exists():
+                shutil.rmtree(path_prefix, ignore_errors=True)
+        except OSError as err:
+            _LOGGER.error("Unable to remove map files in %s: %s", path_prefix, err)
+
+    path_prefix = _storage_path_prefix(hass, entry_id)
+    _LOGGER.debug("Removing maps from disk store: %s", path_prefix)
+    await hass.async_add_executor_job(remove, path_prefix)
diff --git a/homeassistant/components/roborock/select.py b/homeassistant/components/roborock/select.py
index 73cb95d2d7c..208020dccab 100644
--- a/homeassistant/components/roborock/select.py
+++ b/homeassistant/components/roborock/select.py
@@ -4,20 +4,21 @@ import asyncio
 from collections.abc import Callable
 from dataclasses import dataclass
 
-from roborock.containers import Status
+from roborock.code_mappings import RoborockDockDustCollectionModeCode
 from roborock.roborock_message import RoborockDataProtocol
-from roborock.roborock_typing import RoborockCommand
+from roborock.roborock_typing import DeviceProp, RoborockCommand
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import RoborockConfigEntry
 from .const import MAP_SLEEP
-from .coordinator import RoborockDataUpdateCoordinator
+from .coordinator import RoborockConfigEntry, RoborockDataUpdateCoordinator
 from .entity import RoborockCoordinatedEntityV1
 
+PARALLEL_UPDATES = 0
+
 
 @dataclass(frozen=True, kw_only=True)
 class RoborockSelectDescription(SelectEntityDescription):
@@ -26,13 +27,15 @@ class RoborockSelectDescription(SelectEntityDescription):
     # The command that the select entity will send to the api.
     api_command: RoborockCommand
     # Gets the current value of the select entity.
-    value_fn: Callable[[Status], str | None]
+    value_fn: Callable[[DeviceProp], str | None]
     # Gets all options of the select entity.
-    options_lambda: Callable[[Status], list[str] | None]
+    options_lambda: Callable[[DeviceProp], list[str] | None]
     # Takes the value from the select entity and converts it for the api.
-    parameter_lambda: Callable[[str, Status], list[int]]
+    parameter_lambda: Callable[[str, DeviceProp], list[int]]
 
     protocol_listener: RoborockDataProtocol | None = None
+    # If it is a dock entity
+    is_dock_entity: bool = False
 
 
 SELECT_DESCRIPTIONS: list[RoborockSelectDescription] = [
@@ -40,24 +43,38 @@ SELECT_DESCRIPTIONS: list[RoborockSelectDescription] = [
         key="water_box_mode",
         translation_key="mop_intensity",
         api_command=RoborockCommand.SET_WATER_BOX_CUSTOM_MODE,
-        value_fn=lambda data: data.water_box_mode_name,
+        value_fn=lambda data: data.status.water_box_mode_name,
         entity_category=EntityCategory.CONFIG,
-        options_lambda=lambda data: data.water_box_mode.keys()
-        if data.water_box_mode is not None
+        options_lambda=lambda data: data.status.water_box_mode.keys()
+        if data.status.water_box_mode is not None
         else None,
-        parameter_lambda=lambda key, status: [status.get_mop_intensity_code(key)],
+        parameter_lambda=lambda key, prop: [prop.status.get_mop_intensity_code(key)],
         protocol_listener=RoborockDataProtocol.WATER_BOX_MODE,
     ),
     RoborockSelectDescription(
         key="mop_mode",
         translation_key="mop_mode",
         api_command=RoborockCommand.SET_MOP_MODE,
-        value_fn=lambda data: data.mop_mode_name,
+        value_fn=lambda data: data.status.mop_mode_name,
         entity_category=EntityCategory.CONFIG,
-        options_lambda=lambda data: data.mop_mode.keys()
-        if data.mop_mode is not None
+        options_lambda=lambda data: data.status.mop_mode.keys()
+        if data.status.mop_mode is not None
         else None,
-        parameter_lambda=lambda key, status: [status.get_mop_mode_code(key)],
+        parameter_lambda=lambda key, prop: [prop.status.get_mop_mode_code(key)],
+    ),
+    RoborockSelectDescription(
+        key="dust_collection_mode",
+        translation_key="dust_collection_mode",
+        api_command=RoborockCommand.SET_DUST_COLLECTION_MODE,
+        value_fn=lambda data: data.dust_collection_mode_name,
+        entity_category=EntityCategory.CONFIG,
+        options_lambda=lambda data: RoborockDockDustCollectionModeCode.keys()
+        if data.dust_collection_mode_name is not None
+        else None,
+        parameter_lambda=lambda key, _: [
+            RoborockDockDustCollectionModeCode.as_dict().get(key)
+        ],
+        is_dock_entity=True,
     ),
 ]
 
@@ -65,7 +82,7 @@ SELECT_DESCRIPTIONS: list[RoborockSelectDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RoborockConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Roborock select platform."""
 
@@ -75,7 +92,7 @@ async def async_setup_entry(
         for description in SELECT_DESCRIPTIONS
         if (
             options := description.options_lambda(
-                coordinator.roborock_device_info.props.status
+                coordinator.roborock_device_info.props
             )
         )
         is not None
@@ -105,6 +122,7 @@ class RoborockSelectEntity(RoborockCoordinatedEntityV1, SelectEntity):
             f"{entity_description.key}_{coordinator.duid_slug}",
             coordinator,
             entity_description.protocol_listener,
+            is_dock_entity=entity_description.is_dock_entity,
         )
         self._attr_options = options
 
@@ -112,27 +130,28 @@ class RoborockSelectEntity(RoborockCoordinatedEntityV1, SelectEntity):
         """Set the option."""
         await self.send(
             self.entity_description.api_command,
-            self.entity_description.parameter_lambda(option, self._device_status),
+            self.entity_description.parameter_lambda(option, self.coordinator.data),
         )
 
     @property
     def current_option(self) -> str | None:
-        """Get the current status of the select entity from device_status."""
-        return self.entity_description.value_fn(self._device_status)
+        """Get the current status of the select entity from device props."""
+        return self.entity_description.value_fn(self.coordinator.data)
 
 
 class RoborockCurrentMapSelectEntity(RoborockCoordinatedEntityV1, SelectEntity):
     """A class to let you set the selected map on Roborock vacuum."""
 
-    _attr_entity_category = EntityCategory.DIAGNOSTIC
+    _attr_entity_category = EntityCategory.CONFIG
     _attr_translation_key = "selected_map"
 
     async def async_select_option(self, option: str) -> None:
         """Set the option."""
         for map_id, map_ in self.coordinator.maps.items():
             if map_.name == option:
-                await self.send(
+                await self._send_command(
                     RoborockCommand.LOAD_MULTI_MAP,
+                    self.api,
                     [map_id],
                 )
                 # Update the current map id manually so that nothing gets broken
@@ -141,6 +160,7 @@ class RoborockCurrentMapSelectEntity(RoborockCoordinatedEntityV1, SelectEntity):
                 # We need to wait after updating the map
                 # so that other commands will be executed correctly.
                 await asyncio.sleep(MAP_SLEEP)
+                await self.coordinator.async_refresh()
                 break
 
     @property
diff --git a/homeassistant/components/roborock/sensor.py b/homeassistant/components/roborock/sensor.py
index e01a03d7720..33ecaf74d4f 100644
--- a/homeassistant/components/roborock/sensor.py
+++ b/homeassistant/components/roborock/sensor.py
@@ -28,12 +28,21 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfArea, UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import RoborockConfigEntry
-from .coordinator import RoborockDataUpdateCoordinator, RoborockDataUpdateCoordinatorA01
-from .entity import RoborockCoordinatedEntityA01, RoborockCoordinatedEntityV1
+from .coordinator import (
+    RoborockConfigEntry,
+    RoborockDataUpdateCoordinator,
+    RoborockDataUpdateCoordinatorA01,
+)
+from .entity import (
+    RoborockCoordinatedEntityA01,
+    RoborockCoordinatedEntityV1,
+    RoborockEntity,
+)
+
+PARALLEL_UPDATES = 0
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -44,6 +53,9 @@ class RoborockSensorDescription(SensorEntityDescription):
 
     protocol_listener: RoborockDataProtocol | None = None
 
+    # If it is a dock entity
+    is_dock_entity: bool = False
+
 
 @dataclass(frozen=True, kw_only=True)
 class RoborockSensorDescriptionA01(SensorEntityDescription):
@@ -194,6 +206,7 @@ SENSOR_DESCRIPTIONS = [
         entity_category=EntityCategory.DIAGNOSTIC,
         device_class=SensorDeviceClass.ENUM,
         options=RoborockDockErrorCode.keys(),
+        is_dock_entity=True,
     ),
     RoborockSensorDescription(
         key="mop_clean_remaining",
@@ -202,6 +215,7 @@ SENSOR_DESCRIPTIONS = [
         value_fn=lambda data: data.status.rdt,
         translation_key="mop_drying_remaining_time",
         entity_category=EntityCategory.DIAGNOSTIC,
+        is_dock_entity=True,
     ),
 ]
 
@@ -292,11 +306,11 @@ A01_SENSOR_DESCRIPTIONS: list[RoborockSensorDescriptionA01] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RoborockConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Roborock vacuum sensors."""
     coordinators = config_entry.runtime_data
-    async_add_entities(
+    entities: list[RoborockEntity] = [
         RoborockSensorEntity(
             coordinator,
             description,
@@ -304,8 +318,9 @@ async def async_setup_entry(
         for coordinator in coordinators.v1
         for description in SENSOR_DESCRIPTIONS
         if description.value_fn(coordinator.roborock_device_info.props) is not None
-    )
-    async_add_entities(
+    ]
+    entities.extend(RoborockCurrentRoom(coordinator) for coordinator in coordinators.v1)
+    entities.extend(
         RoborockSensorEntityA01(
             coordinator,
             description,
@@ -314,6 +329,7 @@ async def async_setup_entry(
         for description in A01_SENSOR_DESCRIPTIONS
         if description.data_protocol in coordinator.data
     )
+    async_add_entities(entities)
 
 
 class RoborockSensorEntity(RoborockCoordinatedEntityV1, SensorEntity):
@@ -332,6 +348,7 @@ class RoborockSensorEntity(RoborockCoordinatedEntityV1, SensorEntity):
             f"{description.key}_{coordinator.duid_slug}",
             coordinator,
             description.protocol_listener,
+            is_dock_entity=description.is_dock_entity,
         )
 
     @property
@@ -342,6 +359,42 @@ class RoborockSensorEntity(RoborockCoordinatedEntityV1, SensorEntity):
         )
 
 
+class RoborockCurrentRoom(RoborockCoordinatedEntityV1, SensorEntity):
+    """Representation of a Current Room Sensor."""
+
+    _attr_device_class = SensorDeviceClass.ENUM
+    _attr_translation_key = "current_room"
+    _attr_entity_category = EntityCategory.DIAGNOSTIC
+
+    def __init__(
+        self,
+        coordinator: RoborockDataUpdateCoordinator,
+    ) -> None:
+        """Initialize the entity."""
+        super().__init__(
+            f"current_room_{coordinator.duid_slug}",
+            coordinator,
+            None,
+            is_dock_entity=False,
+        )
+
+    @property
+    def options(self) -> list[str]:
+        """Return the currently valid rooms."""
+        if self.coordinator.current_map is not None:
+            return list(
+                self.coordinator.maps[self.coordinator.current_map].rooms.values()
+            )
+        return []
+
+    @property
+    def native_value(self) -> str | None:
+        """Return the value reported by the sensor."""
+        if self.coordinator.current_map is not None:
+            return self.coordinator.maps[self.coordinator.current_map].current_room
+        return None
+
+
 class RoborockSensorEntityA01(RoborockCoordinatedEntityA01, SensorEntity):
     """Representation of a A01 Roborock sensor."""
 
diff --git a/homeassistant/components/roborock/strings.json b/homeassistant/components/roborock/strings.json
index 7005344614c..caad67e4ce6 100644
--- a/homeassistant/components/roborock/strings.json
+++ b/homeassistant/components/roborock/strings.json
@@ -5,12 +5,18 @@
         "description": "Enter your Roborock email address.",
         "data": {
           "username": "[%key:common::config_flow::data::email%]"
+        },
+        "data_description": {
+          "username": "The email address used to sign in to the Roborock app."
         }
       },
       "code": {
         "description": "Type the verification code sent to your email",
         "data": {
           "code": "Verification code"
+        },
+        "data_description": {
+          "code": "The verification code sent to your email."
         }
       },
       "reauth_confirm": {
@@ -23,8 +29,8 @@
       "invalid_email": "There is no account associated with the email you entered, please try again.",
       "invalid_email_format": "There is an issue with the formatting of your email - please try again.",
       "too_frequent_code_requests": "You have attempted to request too many codes. Try again later.",
-      "unknown_roborock": "There was an unknown roborock exception - please check your logs.",
-      "unknown_url": "There was an issue determining the correct url for your roborock account - please check your logs.",
+      "unknown_roborock": "There was an unknown Roborock exception - please check your logs.",
+      "unknown_url": "There was an issue determining the correct URL for your Roborock account - please check your logs.",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
@@ -54,6 +60,25 @@
           "vacuum_position": "Vacuum position",
           "virtual_walls": "Virtual walls",
           "zones": "Zones"
+        },
+        "data_description": {
+          "charger": "Show the charger on the map.",
+          "cleaned_area": "Show the area cleaned on the map.",
+          "goto_path": "Show the go-to path on the map.",
+          "ignored_obstacles": "Show ignored obstacles on the map.",
+          "ignored_obstacles_with_photo": "Show ignored obstacles with photos on the map.",
+          "mop_path": "Show the mop path on the map.",
+          "no_carpet_zones": "Show the no carpet zones on the map.",
+          "no_go_zones": "Show the no-go zones on the map.",
+          "no_mopping_zones": "Show the no-mop zones on the map.",
+          "obstacles": "Show obstacles on the map.",
+          "obstacles_with_photo": "Show obstacles with photos on the map.",
+          "path": "Show the path on the map.",
+          "predicted_path": "Show the predicted path on the map.",
+          "room_names": "Show room names on the map.",
+          "vacuum_position": "Show the vacuum position on the map.",
+          "virtual_walls": "Show virtual walls on the map.",
+          "zones": "Show zones on the map."
         }
       }
     }
@@ -128,7 +153,7 @@
           "updating": "[%key:component::roborock::entity::sensor::status::state::updating%]",
           "washing": "Washing",
           "ready": "Ready",
-          "charging": "[%key:component::roborock::entity::sensor::status::state::charging%]",
+          "charging": "[%key:common::state::charging%]",
           "mop_washing": "Washing mop",
           "self_clean_cleaning": "Self clean cleaning",
           "self_clean_deep_cleaning": "Self clean deep cleaning",
@@ -156,6 +181,9 @@
       "countdown": {
         "name": "Countdown"
       },
+      "current_room": {
+        "name": "Current room"
+      },
       "dock_error": {
         "name": "Dock error",
         "state": {
@@ -199,7 +227,7 @@
           "cleaning": "Cleaning",
           "returning_home": "Returning home",
           "manual_mode": "Manual mode",
-          "charging": "Charging",
+          "charging": "[%key:common::state::charging%]",
           "charging_problem": "Charging problem",
           "paused": "[%key:common::state::paused%]",
           "spot_cleaning": "Spot cleaning",
@@ -353,6 +381,15 @@
       },
       "selected_map": {
         "name": "Selected map"
+      },
+      "dust_collection_mode": {
+        "name": "Empty mode",
+        "state": {
+          "smart": "Smart",
+          "light": "Light",
+          "balanced": "[%key:component::roborock::entity::vacuum::roborock::state_attributes::fan_speed::state::balanced%]",
+          "max": "[%key:component::roborock::entity::select::mop_intensity::state::max%]"
+        }
       }
     },
     "switch": {
@@ -420,6 +457,12 @@
     "map_failure": {
       "message": "Something went wrong creating the map"
     },
+    "position_not_found": {
+      "message": "Robot position not found"
+    },
+    "update_data_fail": {
+      "message": "Failed to update data"
+    },
     "no_coordinators": {
       "message": "No devices were able to successfully setup"
     },
@@ -436,11 +479,11 @@
   "services": {
     "get_maps": {
       "name": "Get maps",
-      "description": "Get the map and room information of your device."
+      "description": "Retrieves the map and room information of your device."
     },
     "set_vacuum_goto_position": {
       "name": "Go to position",
-      "description": "Send the vacuum to a specific position.",
+      "description": "Sends the vacuum to a specific position.",
       "fields": {
         "x": {
           "name": "X-coordinate",
@@ -454,7 +497,7 @@
     },
     "get_vacuum_current_position": {
       "name": "Get current position",
-      "description": "Get the current position of the vacuum."
+      "description": "Retrieves the current position of the vacuum."
     }
   }
 }
diff --git a/homeassistant/components/roborock/switch.py b/homeassistant/components/roborock/switch.py
index b0c8c880188..44feccdebac 100644
--- a/homeassistant/components/roborock/switch.py
+++ b/homeassistant/components/roborock/switch.py
@@ -16,14 +16,16 @@ from homeassistant.components.switch import SwitchEntity, SwitchEntityDescriptio
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import DOMAIN, RoborockConfigEntry
-from .coordinator import RoborockDataUpdateCoordinator
+from .const import DOMAIN
+from .coordinator import RoborockConfigEntry, RoborockDataUpdateCoordinator
 from .entity import RoborockEntityV1
 
 _LOGGER = logging.getLogger(__name__)
 
+PARALLEL_UPDATES = 0
+
 
 @dataclass(frozen=True, kw_only=True)
 class RoborockSwitchDescription(SwitchEntityDescription):
@@ -35,6 +37,8 @@ class RoborockSwitchDescription(SwitchEntityDescription):
     update_value: Callable[[AttributeCache, bool], Coroutine[Any, Any, None]]
     # Attribute from cache
     attribute: str
+    # If it is a dock entity
+    is_dock_entity: bool = False
 
 
 SWITCH_DESCRIPTIONS: list[RoborockSwitchDescription] = [
@@ -47,6 +51,7 @@ SWITCH_DESCRIPTIONS: list[RoborockSwitchDescription] = [
         key="child_lock",
         translation_key="child_lock",
         entity_category=EntityCategory.CONFIG,
+        is_dock_entity=True,
     ),
     RoborockSwitchDescription(
         cache_key=CacheableAttribute.flow_led_status,
@@ -57,6 +62,7 @@ SWITCH_DESCRIPTIONS: list[RoborockSwitchDescription] = [
         key="status_indicator",
         translation_key="status_indicator",
         entity_category=EntityCategory.CONFIG,
+        is_dock_entity=True,
     ),
     RoborockSwitchDescription(
         cache_key=CacheableAttribute.dnd_timer,
@@ -99,7 +105,7 @@ SWITCH_DESCRIPTIONS: list[RoborockSwitchDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RoborockConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Roborock switch platform."""
     possible_entities: list[
@@ -147,7 +153,13 @@ class RoborockSwitch(RoborockEntityV1, SwitchEntity):
     ) -> None:
         """Initialize the entity."""
         self.entity_description = entity_description
-        super().__init__(unique_id, coordinator.device_info, coordinator.api)
+        super().__init__(
+            unique_id,
+            coordinator.device_info
+            if not entity_description.is_dock_entity
+            else coordinator.dock_device_info,
+            coordinator.api,
+        )
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn off the switch."""
diff --git a/homeassistant/components/roborock/time.py b/homeassistant/components/roborock/time.py
index 1dd681dff1f..83d341fa2dd 100644
--- a/homeassistant/components/roborock/time.py
+++ b/homeassistant/components/roborock/time.py
@@ -16,14 +16,16 @@ from homeassistant.components.time import TimeEntity, TimeEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import DOMAIN, RoborockConfigEntry
-from .coordinator import RoborockDataUpdateCoordinator
+from .const import DOMAIN
+from .coordinator import RoborockConfigEntry, RoborockDataUpdateCoordinator
 from .entity import RoborockEntityV1
 
 _LOGGER = logging.getLogger(__name__)
 
+PARALLEL_UPDATES = 0
+
 
 @dataclass(frozen=True, kw_only=True)
 class RoborockTimeDescription(TimeEntityDescription):
@@ -114,7 +116,7 @@ TIME_DESCRIPTIONS: list[RoborockTimeDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RoborockConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Roborock time platform."""
     possible_entities: list[
diff --git a/homeassistant/components/roborock/vacuum.py b/homeassistant/components/roborock/vacuum.py
index 7582dadad16..058fffbdb1c 100644
--- a/homeassistant/components/roborock/vacuum.py
+++ b/homeassistant/components/roborock/vacuum.py
@@ -1,11 +1,14 @@
 """Support for Roborock vacuum class."""
 
-from dataclasses import asdict
 from typing import Any
 
 from roborock.code_mappings import RoborockStateCode
 from roborock.roborock_message import RoborockDataProtocol
 from roborock.roborock_typing import RoborockCommand
+from vacuum_map_parser_base.config.color import ColorsPalette
+from vacuum_map_parser_base.config.image_config import ImageConfig
+from vacuum_map_parser_base.config.size import Sizes
+from vacuum_map_parser_roborock.map_data_parser import RoborockMapDataParser
 import voluptuous as vol
 
 from homeassistant.components.vacuum import (
@@ -16,18 +19,16 @@ from homeassistant.components.vacuum import (
 from homeassistant.core import HomeAssistant, ServiceResponse, SupportsResponse
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import RoborockConfigEntry
 from .const import (
     DOMAIN,
     GET_MAPS_SERVICE_NAME,
     GET_VACUUM_CURRENT_POSITION_SERVICE_NAME,
     SET_VACUUM_GOTO_POSITION_SERVICE_NAME,
 )
-from .coordinator import RoborockDataUpdateCoordinator
+from .coordinator import RoborockConfigEntry, RoborockDataUpdateCoordinator
 from .entity import RoborockCoordinatedEntityV1
-from .image import ColorsPalette, ImageConfig, RoborockMapDataParser, Sizes
 
 STATE_CODE_TO_STATE = {
     RoborockStateCode.starting: VacuumActivity.IDLE,  # "Starting"
@@ -55,11 +56,13 @@ STATE_CODE_TO_STATE = {
     RoborockStateCode.device_offline: VacuumActivity.ERROR,  # "Device offline"
 }
 
+PARALLEL_UPDATES = 0
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: RoborockConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Roborock sensor."""
     async_add_entities(
@@ -202,7 +205,14 @@ class RoborockVacuum(RoborockCoordinatedEntityV1, StateVacuumEntity):
         """Get map information such as map id and room ids."""
         return {
             "maps": [
-                asdict(vacuum_map) for vacuum_map in self.coordinator.maps.values()
+                {
+                    "flag": vacuum_map.flag,
+                    "name": vacuum_map.name,
+                    # JsonValueType does not accept a int as a key - was not a
+                    # issue with previous asdict() implementation.
+                    "rooms": vacuum_map.rooms,  # type: ignore[dict-item]
+                }
+                for vacuum_map in self.coordinator.maps.values()
             ]
         }
 
@@ -211,13 +221,18 @@ class RoborockVacuum(RoborockCoordinatedEntityV1, StateVacuumEntity):
 
         map_data = await self.coordinator.cloud_api.get_map_v1()
         if not isinstance(map_data, bytes):
-            raise HomeAssistantError("Failed to retrieve map data.")
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="map_failure",
+            )
         parser = RoborockMapDataParser(ColorsPalette(), Sizes(), [], ImageConfig(), [])
         parsed_map = parser.parse(map_data)
         robot_position = parsed_map.vacuum_position
 
         if robot_position is None:
-            raise HomeAssistantError("Robot position not found")
+            raise HomeAssistantError(
+                translation_domain=DOMAIN, translation_key="position_not_found"
+            )
 
         return {
             "x": robot_position.x,
diff --git a/homeassistant/components/rocketchat/notify.py b/homeassistant/components/rocketchat/notify.py
index a06226d22ee..20ae0708c15 100644
--- a/homeassistant/components/rocketchat/notify.py
+++ b/homeassistant/components/rocketchat/notify.py
@@ -19,7 +19,7 @@ from homeassistant.components.notify import (
 )
 from homeassistant.const import CONF_PASSWORD, CONF_ROOM, CONF_URL, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/roku/__init__.py b/homeassistant/components/roku/__init__.py
index e6b92d91335..be0b20c97fb 100644
--- a/homeassistant/components/roku/__init__.py
+++ b/homeassistant/components/roku/__init__.py
@@ -2,12 +2,10 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_HOST, Platform
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-from .const import CONF_PLAY_MEDIA_APP_ID, DEFAULT_PLAY_MEDIA_APP_ID
-from .coordinator import RokuDataUpdateCoordinator
+from .coordinator import RokuConfigEntry, RokuDataUpdateCoordinator
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
@@ -17,22 +15,10 @@ PLATFORMS = [
     Platform.SENSOR,
 ]
 
-type RokuConfigEntry = ConfigEntry[RokuDataUpdateCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: RokuConfigEntry) -> bool:
     """Set up Roku from a config entry."""
-    if (device_id := entry.unique_id) is None:
-        device_id = entry.entry_id
-
-    coordinator = RokuDataUpdateCoordinator(
-        hass,
-        host=entry.data[CONF_HOST],
-        device_id=device_id,
-        play_media_app_id=entry.options.get(
-            CONF_PLAY_MEDIA_APP_ID, DEFAULT_PLAY_MEDIA_APP_ID
-        ),
-    )
+    coordinator = RokuDataUpdateCoordinator(hass, entry)
     await coordinator.async_config_entry_first_refresh()
 
     entry.runtime_data = coordinator
diff --git a/homeassistant/components/roku/binary_sensor.py b/homeassistant/components/roku/binary_sensor.py
index 2e7fd12788c..31250898055 100644
--- a/homeassistant/components/roku/binary_sensor.py
+++ b/homeassistant/components/roku/binary_sensor.py
@@ -13,9 +13,9 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import RokuConfigEntry
+from .coordinator import RokuConfigEntry
 from .entity import RokuEntity
 
 # Coordinator is used to centralize the data updates
@@ -59,7 +59,7 @@ BINARY_SENSORS: tuple[RokuBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RokuConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Roku binary sensors based on a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/roku/config_flow.py b/homeassistant/components/roku/config_flow.py
index 2fb016b5467..47bc86802d2 100644
--- a/homeassistant/components/roku/config_flow.py
+++ b/homeassistant/components/roku/config_flow.py
@@ -25,8 +25,8 @@ from homeassistant.helpers.service_info.ssdp import (
 )
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
-from . import RokuConfigEntry
 from .const import CONF_PLAY_MEDIA_APP_ID, DEFAULT_PLAY_MEDIA_APP_ID, DOMAIN
+from .coordinator import RokuConfigEntry
 
 DATA_SCHEMA = vol.Schema({vol.Required(CONF_HOST): str})
 
diff --git a/homeassistant/components/roku/coordinator.py b/homeassistant/components/roku/coordinator.py
index 7900669d02f..e3c20d8351f 100644
--- a/homeassistant/components/roku/coordinator.py
+++ b/homeassistant/components/roku/coordinator.py
@@ -8,33 +8,44 @@ import logging
 from rokuecp import Roku, RokuError
 from rokuecp.models import Device
 
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from homeassistant.util.dt import utcnow
 
-from .const import DOMAIN
+from .const import CONF_PLAY_MEDIA_APP_ID, DEFAULT_PLAY_MEDIA_APP_ID, DOMAIN
 
 REQUEST_REFRESH_DELAY = 0.35
 
 SCAN_INTERVAL = timedelta(seconds=10)
 _LOGGER = logging.getLogger(__name__)
 
+type RokuConfigEntry = ConfigEntry[RokuDataUpdateCoordinator]
+
 
 class RokuDataUpdateCoordinator(DataUpdateCoordinator[Device]):
     """Class to manage fetching Roku data."""
 
+    config_entry: RokuConfigEntry
     last_full_update: datetime | None
     roku: Roku
 
     def __init__(
-        self, hass: HomeAssistant, *, host: str, device_id: str, play_media_app_id: str
+        self,
+        hass: HomeAssistant,
+        config_entry: RokuConfigEntry,
     ) -> None:
         """Initialize global Roku data updater."""
-        self.device_id = device_id
-        self.roku = Roku(host=host, session=async_get_clientsession(hass))
-        self.play_media_app_id = play_media_app_id
+        self.device_id = config_entry.unique_id or config_entry.entry_id
+        self.roku = Roku(
+            host=config_entry.data[CONF_HOST], session=async_get_clientsession(hass)
+        )
+        self.play_media_app_id = config_entry.options.get(
+            CONF_PLAY_MEDIA_APP_ID, DEFAULT_PLAY_MEDIA_APP_ID
+        )
 
         self.full_update_interval = timedelta(minutes=15)
         self.last_full_update = None
@@ -42,6 +53,7 @@ class RokuDataUpdateCoordinator(DataUpdateCoordinator[Device]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
             # We don't want an immediate refresh since the device
diff --git a/homeassistant/components/roku/diagnostics.py b/homeassistant/components/roku/diagnostics.py
index e98837ca442..86e7a7ac1c9 100644
--- a/homeassistant/components/roku/diagnostics.py
+++ b/homeassistant/components/roku/diagnostics.py
@@ -6,7 +6,7 @@ from typing import Any
 
 from homeassistant.core import HomeAssistant
 
-from . import RokuConfigEntry
+from .coordinator import RokuConfigEntry
 
 
 async def async_get_config_entry_diagnostics(
diff --git a/homeassistant/components/roku/entity.py b/homeassistant/components/roku/entity.py
index 259cb092cb8..1321e3806d1 100644
--- a/homeassistant/components/roku/entity.py
+++ b/homeassistant/components/roku/entity.py
@@ -6,8 +6,8 @@ from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, Device
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import RokuDataUpdateCoordinator
 from .const import DOMAIN
+from .coordinator import RokuDataUpdateCoordinator
 
 
 class RokuEntity(CoordinatorEntity[RokuDataUpdateCoordinator]):
diff --git a/homeassistant/components/roku/media_player.py b/homeassistant/components/roku/media_player.py
index 0c1f92521af..d0e1e3a53c0 100644
--- a/homeassistant/components/roku/media_player.py
+++ b/homeassistant/components/roku/media_player.py
@@ -26,10 +26,9 @@ from homeassistant.components.stream import FORMAT_CONTENT_TYPE, HLS_PROVIDER
 from homeassistant.const import ATTR_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import VolDictType
 
-from . import RokuConfigEntry
 from .browse_media import async_browse_media
 from .const import (
     ATTR_ARTIST_NAME,
@@ -40,7 +39,7 @@ from .const import (
     ATTR_THUMBNAIL,
     SERVICE_SEARCH,
 )
-from .coordinator import RokuDataUpdateCoordinator
+from .coordinator import RokuConfigEntry, RokuDataUpdateCoordinator
 from .entity import RokuEntity
 from .helpers import format_channel_name, roku_exception_handler
 
@@ -83,7 +82,9 @@ PARALLEL_UPDATES = 1
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: RokuConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: RokuConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Roku config entry."""
     async_add_entities(
diff --git a/homeassistant/components/roku/remote.py b/homeassistant/components/roku/remote.py
index f7916fb23a2..cc3689c9df3 100644
--- a/homeassistant/components/roku/remote.py
+++ b/homeassistant/components/roku/remote.py
@@ -7,9 +7,9 @@ from typing import Any
 
 from homeassistant.components.remote import ATTR_NUM_REPEATS, RemoteEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import RokuConfigEntry
+from .coordinator import RokuConfigEntry
 from .entity import RokuEntity
 from .helpers import roku_exception_handler
 
@@ -19,7 +19,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RokuConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Load Roku remote based on a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/roku/select.py b/homeassistant/components/roku/select.py
index 360d4e25415..062e1258ea2 100644
--- a/homeassistant/components/roku/select.py
+++ b/homeassistant/components/roku/select.py
@@ -10,9 +10,9 @@ from rokuecp.models import Device as RokuDevice
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import RokuConfigEntry
+from .coordinator import RokuConfigEntry
 from .entity import RokuEntity
 from .helpers import format_channel_name, roku_exception_handler
 
@@ -109,7 +109,7 @@ CHANNEL_ENTITY = RokuSelectEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RokuConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Roku select based on a config entry."""
     device: RokuDevice = entry.runtime_data.data
diff --git a/homeassistant/components/roku/sensor.py b/homeassistant/components/roku/sensor.py
index 870386945a6..a61a9be6a73 100644
--- a/homeassistant/components/roku/sensor.py
+++ b/homeassistant/components/roku/sensor.py
@@ -10,9 +10,9 @@ from rokuecp.models import Device as RokuDevice
 from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import RokuConfigEntry
+from .coordinator import RokuConfigEntry
 from .entity import RokuEntity
 
 # Coordinator is used to centralize the data updates
@@ -45,7 +45,7 @@ SENSORS: tuple[RokuSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RokuConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Roku sensor based on a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/roku/strings.json b/homeassistant/components/roku/strings.json
index 04348bc3bfb..62f1f8b1736 100644
--- a/homeassistant/components/roku/strings.json
+++ b/homeassistant/components/roku/strings.json
@@ -47,7 +47,7 @@
         "name": "Supports AirPlay"
       },
       "supports_ethernet": {
-        "name": "Supports ethernet"
+        "name": "Supports Ethernet"
       },
       "supports_find_remote": {
         "name": "Supports find remote"
diff --git a/homeassistant/components/romy/__init__.py b/homeassistant/components/romy/__init__.py
index 352f5f3715a..be227645122 100644
--- a/homeassistant/components/romy/__init__.py
+++ b/homeassistant/components/romy/__init__.py
@@ -17,7 +17,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
         config_entry.data[CONF_HOST], config_entry.data.get(CONF_PASSWORD, "")
     )
 
-    coordinator = RomyVacuumCoordinator(hass, new_romy)
+    coordinator = RomyVacuumCoordinator(hass, config_entry, new_romy)
     await coordinator.async_config_entry_first_refresh()
 
     hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = coordinator
diff --git a/homeassistant/components/romy/binary_sensor.py b/homeassistant/components/romy/binary_sensor.py
index d8f6216007f..599c0fe023e 100644
--- a/homeassistant/components/romy/binary_sensor.py
+++ b/homeassistant/components/romy/binary_sensor.py
@@ -7,7 +7,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import RomyVacuumCoordinator
@@ -39,7 +39,7 @@ BINARY_SENSORS: list[BinarySensorEntityDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up ROMY vacuum cleaner."""
 
diff --git a/homeassistant/components/romy/config_flow.py b/homeassistant/components/romy/config_flow.py
index 6bb5c337b29..48558cd98c7 100644
--- a/homeassistant/components/romy/config_flow.py
+++ b/homeassistant/components/romy/config_flow.py
@@ -7,7 +7,7 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PASSWORD
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
 from .const import DOMAIN, LOGGER
diff --git a/homeassistant/components/romy/coordinator.py b/homeassistant/components/romy/coordinator.py
index 5868eae70e2..d666ec44f80 100644
--- a/homeassistant/components/romy/coordinator.py
+++ b/homeassistant/components/romy/coordinator.py
@@ -2,6 +2,7 @@
 
 from romy import RomyRobot
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -11,9 +12,19 @@ from .const import DOMAIN, LOGGER, UPDATE_INTERVAL
 class RomyVacuumCoordinator(DataUpdateCoordinator[None]):
     """ROMY Vacuum Coordinator."""
 
-    def __init__(self, hass: HomeAssistant, romy: RomyRobot) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, romy: RomyRobot
+    ) -> None:
         """Initialize."""
-        super().__init__(hass, LOGGER, name=DOMAIN, update_interval=UPDATE_INTERVAL)
+        super().__init__(
+            hass,
+            LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=UPDATE_INTERVAL,
+        )
         self.hass = hass
         self.romy = romy
 
diff --git a/homeassistant/components/romy/sensor.py b/homeassistant/components/romy/sensor.py
index 341125b86ba..85bf0df8f64 100644
--- a/homeassistant/components/romy/sensor.py
+++ b/homeassistant/components/romy/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import RomyVacuumCoordinator
@@ -77,7 +77,7 @@ SENSORS: list[SensorEntityDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up ROMY vacuum cleaner."""
 
diff --git a/homeassistant/components/romy/vacuum.py b/homeassistant/components/romy/vacuum.py
index 49129daabbd..0e9dd13ffe1 100644
--- a/homeassistant/components/romy/vacuum.py
+++ b/homeassistant/components/romy/vacuum.py
@@ -13,7 +13,7 @@ from homeassistant.components.vacuum import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, LOGGER
 from .coordinator import RomyVacuumCoordinator
@@ -51,7 +51,7 @@ SUPPORT_ROMY_ROBOT = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up ROMY vacuum cleaner."""
 
diff --git a/homeassistant/components/roomba/binary_sensor.py b/homeassistant/components/roomba/binary_sensor.py
index baf66375036..d50535c885a 100644
--- a/homeassistant/components/roomba/binary_sensor.py
+++ b/homeassistant/components/roomba/binary_sensor.py
@@ -3,7 +3,7 @@
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import roomba_reported_state
 from .const import DOMAIN
@@ -14,7 +14,7 @@ from .models import RoombaData
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the iRobot Roomba vacuum cleaner."""
     domain_data: RoombaData = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/roomba/entity.py b/homeassistant/components/roomba/entity.py
index d55a260e53a..14c7ac3af3e 100644
--- a/homeassistant/components/roomba/entity.py
+++ b/homeassistant/components/roomba/entity.py
@@ -3,10 +3,10 @@
 from __future__ import annotations
 
 from homeassistant.const import ATTR_CONNECTIONS
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import Entity
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import roomba_reported_state
 from .const import DOMAIN
@@ -80,7 +80,7 @@ class IRobotEntity(Entity):
             return None
         return dt_util.utc_from_timestamp(ts)
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Register callback function."""
         self.vacuum.register_on_message_callback(self.on_message)
 
diff --git a/homeassistant/components/roomba/manifest.json b/homeassistant/components/roomba/manifest.json
index edb317f9752..dbfd803f89b 100644
--- a/homeassistant/components/roomba/manifest.json
+++ b/homeassistant/components/roomba/manifest.json
@@ -24,7 +24,7 @@
   "documentation": "https://www.home-assistant.io/integrations/roomba",
   "iot_class": "local_push",
   "loggers": ["paho_mqtt", "roombapy"],
-  "requirements": ["roombapy==1.8.1"],
+  "requirements": ["roombapy==1.9.0"],
   "zeroconf": [
     {
       "type": "_amzn-alexa._tcp.local.",
diff --git a/homeassistant/components/roomba/sensor.py b/homeassistant/components/roomba/sensor.py
index d358dcb428c..3a98bedcd94 100644
--- a/homeassistant/components/roomba/sensor.py
+++ b/homeassistant/components/roomba/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfArea, UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .const import DOMAIN
@@ -125,7 +125,7 @@ SENSORS: list[RoombaSensorEntityDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the iRobot Roomba vacuum cleaner."""
     domain_data: RoombaData = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/roomba/vacuum.py b/homeassistant/components/roomba/vacuum.py
index 92063f74afa..10606814a35 100644
--- a/homeassistant/components/roomba/vacuum.py
+++ b/homeassistant/components/roomba/vacuum.py
@@ -14,7 +14,7 @@ from homeassistant.components.vacuum import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 from homeassistant.util.unit_system import METRIC_SYSTEM
 
@@ -89,7 +89,7 @@ SUPPORT_BRAAVA = SUPPORT_IROBOT | VacuumEntityFeature.FAN_SPEED
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the iRobot Roomba vacuum cleaner."""
     domain_data: RoombaData = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/roon/config_flow.py b/homeassistant/components/roon/config_flow.py
index b896f6775ae..3421cbf646c 100644
--- a/homeassistant/components/roon/config_flow.py
+++ b/homeassistant/components/roon/config_flow.py
@@ -11,7 +11,7 @@ from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_API_KEY, CONF_HOST, CONF_PORT
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import (
     AUTHENTICATE_TIMEOUT,
diff --git a/homeassistant/components/roon/event.py b/homeassistant/components/roon/event.py
index 7bc6ea27dd9..2f2967c5789 100644
--- a/homeassistant/components/roon/event.py
+++ b/homeassistant/components/roon/event.py
@@ -8,7 +8,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 
@@ -18,7 +18,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Roon Event from Config Entry."""
     roon_server = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/roon/media_player.py b/homeassistant/components/roon/media_player.py
index 3b1735cd2fc..4a87601a24f 100644
--- a/homeassistant/components/roon/media_player.py
+++ b/homeassistant/components/roon/media_player.py
@@ -25,7 +25,7 @@ from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import convert
 from homeassistant.util.dt import utcnow
 
@@ -52,7 +52,7 @@ REPEAT_MODE_MAPPING_TO_ROON = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Roon MediaPlayer from Config Entry."""
     roon_server = hass.data[DOMAIN][config_entry.entry_id]
@@ -329,6 +329,11 @@ class RoonDevice(MediaPlayerEntity):
         """Album artist of current playing media (Music track only)."""
         return self.media_artist
 
+    @property
+    def media_content_type(self) -> str:
+        """Return the media type."""
+        return MediaType.MUSIC
+
     @property
     def supports_standby(self):
         """Return power state of source controls."""
diff --git a/homeassistant/components/route53/__init__.py b/homeassistant/components/route53/__init__.py
index 92094b0b608..2c9824d0628 100644
--- a/homeassistant/components/route53/__init__.py
+++ b/homeassistant/components/route53/__init__.py
@@ -12,7 +12,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_DOMAIN, CONF_TTL, CONF_ZONE
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import track_time_interval
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/route53/manifest.json b/homeassistant/components/route53/manifest.json
index 978c916e3ee..8c21b856b80 100644
--- a/homeassistant/components/route53/manifest.json
+++ b/homeassistant/components/route53/manifest.json
@@ -6,5 +6,5 @@
   "iot_class": "cloud_push",
   "loggers": ["boto3", "botocore", "s3transfer"],
   "quality_scale": "legacy",
-  "requirements": ["boto3==1.34.131"]
+  "requirements": ["boto3==1.37.1"]
 }
diff --git a/homeassistant/components/rova/__init__.py b/homeassistant/components/rova/__init__.py
index 64f0e787a4b..ecde0578772 100644
--- a/homeassistant/components/rova/__init__.py
+++ b/homeassistant/components/rova/__init__.py
@@ -46,7 +46,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         )
         raise ConfigEntryError("Rova does not collect garbage in this area")
 
-    coordinator = RovaCoordinator(hass, api)
+    coordinator = RovaCoordinator(hass, entry, api)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/rova/coordinator.py b/homeassistant/components/rova/coordinator.py
index ecd91cad823..a48048d32c3 100644
--- a/homeassistant/components/rova/coordinator.py
+++ b/homeassistant/components/rova/coordinator.py
@@ -4,6 +4,7 @@ from datetime import datetime, timedelta
 
 from rova.rova import Rova
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 from homeassistant.util.dt import get_time_zone
@@ -16,11 +17,16 @@ EUROPE_AMSTERDAM_ZONE_INFO = get_time_zone("Europe/Amsterdam")
 class RovaCoordinator(DataUpdateCoordinator[dict[str, datetime]]):
     """Class to manage fetching Rova data."""
 
-    def __init__(self, hass: HomeAssistant, api: Rova) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, api: Rova
+    ) -> None:
         """Initialize."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(hours=12),
         )
diff --git a/homeassistant/components/rova/sensor.py b/homeassistant/components/rova/sensor.py
index 589183eb7a8..59f9f28f8f5 100644
--- a/homeassistant/components/rova/sensor.py
+++ b/homeassistant/components/rova/sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
@@ -43,7 +43,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Rova entry."""
     coordinator: RovaCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/rova/strings.json b/homeassistant/components/rova/strings.json
index 3b89fc789ee..21f4146bf78 100644
--- a/homeassistant/components/rova/strings.json
+++ b/homeassistant/components/rova/strings.json
@@ -4,7 +4,7 @@
       "user": {
         "title": "Provide your address details",
         "data": {
-          "zip_code": "Your zip code",
+          "zip_code": "Your ZIP code",
           "house_number": "Your house number",
           "house_number_suffix": "A suffix for your house number"
         }
diff --git a/homeassistant/components/rpi_power/binary_sensor.py b/homeassistant/components/rpi_power/binary_sensor.py
index 00d7ec0e3f4..1424148f554 100644
--- a/homeassistant/components/rpi_power/binary_sensor.py
+++ b/homeassistant/components/rpi_power/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -28,7 +28,7 @@ DESCRIPTION_UNDER_VOLTAGE = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up rpi_power binary sensor."""
     under_voltage = await hass.async_add_executor_job(new_under_voltage)
diff --git a/homeassistant/components/rss_feed_template/__init__.py b/homeassistant/components/rss_feed_template/__init__.py
index 89624c922e6..98d0e1bf790 100644
--- a/homeassistant/components/rss_feed_template/__init__.py
+++ b/homeassistant/components/rss_feed_template/__init__.py
@@ -9,7 +9,7 @@ import voluptuous as vol
 
 from homeassistant.components.http import HomeAssistantView
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/rtorrent/sensor.py b/homeassistant/components/rtorrent/sensor.py
index 654288927d3..70fe7919edb 100644
--- a/homeassistant/components/rtorrent/sensor.py
+++ b/homeassistant/components/rtorrent/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/ruckus_unleashed/__init__.py b/homeassistant/components/ruckus_unleashed/__init__.py
index 4ee870e8322..8e9219985ce 100644
--- a/homeassistant/components/ruckus_unleashed/__init__.py
+++ b/homeassistant/components/ruckus_unleashed/__init__.py
@@ -46,7 +46,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         await ruckus.close()
         raise ConfigEntryAuthFailed from autherr
 
-    coordinator = RuckusDataUpdateCoordinator(hass, ruckus=ruckus)
+    coordinator = RuckusDataUpdateCoordinator(hass, entry, ruckus)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/ruckus_unleashed/coordinator.py b/homeassistant/components/ruckus_unleashed/coordinator.py
index d9f20883559..7ffaab2e977 100644
--- a/homeassistant/components/ruckus_unleashed/coordinator.py
+++ b/homeassistant/components/ruckus_unleashed/coordinator.py
@@ -6,6 +6,7 @@ import logging
 from aioruckus import AjaxSession
 from aioruckus.exceptions import AuthenticationError, SchemaError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -18,17 +19,20 @@ _LOGGER = logging.getLogger(__package__)
 class RuckusDataUpdateCoordinator(DataUpdateCoordinator):
     """Coordinator to manage data from Ruckus client."""
 
-    def __init__(self, hass: HomeAssistant, *, ruckus: AjaxSession) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, ruckus: AjaxSession
+    ) -> None:
         """Initialize global Ruckus data updater."""
         self.ruckus = ruckus
 
-        update_interval = timedelta(seconds=SCAN_INTERVAL)
-
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
-            update_interval=update_interval,
+            update_interval=timedelta(seconds=SCAN_INTERVAL),
         )
 
     async def _fetch_clients(self) -> dict:
diff --git a/homeassistant/components/ruckus_unleashed/device_tracker.py b/homeassistant/components/ruckus_unleashed/device_tracker.py
index 8a5e8b79294..890148ec25c 100644
--- a/homeassistant/components/ruckus_unleashed/device_tracker.py
+++ b/homeassistant/components/ruckus_unleashed/device_tracker.py
@@ -8,7 +8,7 @@ from homeassistant.components.device_tracker import ScannerEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
@@ -25,7 +25,9 @@ _LOGGER = logging.getLogger(__package__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up device tracker for Ruckus component."""
     coordinator = hass.data[DOMAIN][entry.entry_id][COORDINATOR]
@@ -69,7 +71,7 @@ def restore_entities(
     registry: er.EntityRegistry,
     coordinator: RuckusDataUpdateCoordinator,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     tracked: set[str],
 ) -> None:
     """Restore clients that are not a part of active clients list."""
diff --git a/homeassistant/components/russound_rio/media_player.py b/homeassistant/components/russound_rio/media_player.py
index 346f4903f6a..b40b82862f9 100644
--- a/homeassistant/components/russound_rio/media_player.py
+++ b/homeassistant/components/russound_rio/media_player.py
@@ -20,7 +20,7 @@ from homeassistant.components.media_player import (
     MediaType,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import RussoundConfigEntry
 from .entity import RussoundBaseEntity, command
@@ -33,7 +33,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: RussoundConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Russound RIO platform."""
     client = entry.runtime_data
diff --git a/homeassistant/components/russound_rnet/media_player.py b/homeassistant/components/russound_rnet/media_player.py
index f8369ed64ca..48808930d9f 100644
--- a/homeassistant/components/russound_rnet/media_player.py
+++ b/homeassistant/components/russound_rnet/media_player.py
@@ -16,7 +16,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/ruuvi_gateway/__init__.py b/homeassistant/components/ruuvi_gateway/__init__.py
index 77b3e9b57de..da93a89a9f3 100644
--- a/homeassistant/components/ruuvi_gateway/__init__.py
+++ b/homeassistant/components/ruuvi_gateway/__init__.py
@@ -5,11 +5,10 @@ from __future__ import annotations
 import logging
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_HOST, CONF_TOKEN
 from homeassistant.core import HomeAssistant
 
 from .bluetooth import async_connect_scanner
-from .const import DOMAIN, SCAN_INTERVAL
+from .const import DOMAIN
 from .coordinator import RuuviGatewayUpdateCoordinator
 from .models import RuuviGatewayRuntimeData
 
@@ -18,14 +17,7 @@ _LOGGER = logging.getLogger(DOMAIN)
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Ruuvi Gateway from a config entry."""
-    coordinator = RuuviGatewayUpdateCoordinator(
-        hass,
-        logger=_LOGGER,
-        name=entry.title,
-        update_interval=SCAN_INTERVAL,
-        host=entry.data[CONF_HOST],
-        token=entry.data[CONF_TOKEN],
-    )
+    coordinator = RuuviGatewayUpdateCoordinator(hass, entry, _LOGGER)
     scanner, unload_scanner = async_connect_scanner(hass, entry, coordinator)
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = RuuviGatewayRuntimeData(
         update_coordinator=coordinator,
diff --git a/homeassistant/components/ruuvi_gateway/coordinator.py b/homeassistant/components/ruuvi_gateway/coordinator.py
index ba72dfe4cbc..0c42cd0cb38 100644
--- a/homeassistant/components/ruuvi_gateway/coordinator.py
+++ b/homeassistant/components/ruuvi_gateway/coordinator.py
@@ -2,34 +2,41 @@
 
 from __future__ import annotations
 
-from datetime import timedelta
 import logging
 
 from aioruuvigateway.api import get_gateway_history_data
 from aioruuvigateway.models import TagData
 
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, CONF_TOKEN
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.httpx_client import get_async_client
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
+from .const import SCAN_INTERVAL
+
 
 class RuuviGatewayUpdateCoordinator(DataUpdateCoordinator[list[TagData]]):
     """Polls the gateway for data and returns a list of TagData objects that have changed since the last poll."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         logger: logging.Logger,
-        *,
-        name: str,
-        update_interval: timedelta | None = None,
-        host: str,
-        token: str,
     ) -> None:
         """Initialize the coordinator using the given configuration (host, token)."""
-        super().__init__(hass, logger, name=name, update_interval=update_interval)
-        self.host = host
-        self.token = token
+        super().__init__(
+            hass,
+            logger,
+            config_entry=config_entry,
+            name=config_entry.title,
+            update_interval=SCAN_INTERVAL,
+        )
+        self.host = config_entry.data[CONF_HOST]
+        self.token = config_entry.data[CONF_TOKEN]
         self.last_tag_datas: dict[str, TagData] = {}
 
     async def _async_update_data(self) -> list[TagData]:
diff --git a/homeassistant/components/ruuvitag_ble/sensor.py b/homeassistant/components/ruuvitag_ble/sensor.py
index ef287753ed4..57248d547ba 100644
--- a/homeassistant/components/ruuvitag_ble/sensor.py
+++ b/homeassistant/components/ruuvitag_ble/sensor.py
@@ -32,7 +32,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from .const import DOMAIN
@@ -126,7 +126,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Ruuvitag BLE sensors."""
     coordinator: PassiveBluetoothProcessorCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/rympro/__init__.py b/homeassistant/components/rympro/__init__.py
index f24735f4ed0..20d208cca69 100644
--- a/homeassistant/components/rympro/__init__.py
+++ b/homeassistant/components/rympro/__init__.py
@@ -38,7 +38,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             data={**data, CONF_TOKEN: token},
         )
 
-    coordinator = RymProDataUpdateCoordinator(hass, rympro)
+    coordinator = RymProDataUpdateCoordinator(hass, entry, rympro)
     await coordinator.async_config_entry_first_refresh()
 
     hass.data.setdefault(DOMAIN, {})
diff --git a/homeassistant/components/rympro/coordinator.py b/homeassistant/components/rympro/coordinator.py
index 19f16005578..6b49a065d35 100644
--- a/homeassistant/components/rympro/coordinator.py
+++ b/homeassistant/components/rympro/coordinator.py
@@ -7,6 +7,7 @@ import logging
 
 from pyrympro import CannotConnectError, OperationError, RymPro, UnauthorizedError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -20,13 +21,18 @@ _LOGGER = logging.getLogger(__name__)
 class RymProDataUpdateCoordinator(DataUpdateCoordinator[dict[int, dict]]):
     """Class to manage fetching RYM Pro data."""
 
-    def __init__(self, hass: HomeAssistant, rympro: RymPro) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, rympro: RymPro
+    ) -> None:
         """Initialize global RymPro data updater."""
         self.rympro = rympro
         interval = timedelta(seconds=SCAN_INTERVAL)
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=interval,
         )
@@ -36,11 +42,16 @@ class RymProDataUpdateCoordinator(DataUpdateCoordinator[dict[int, dict]]):
         try:
             meters = await self.rympro.last_read()
             for meter_id, meter in meters.items():
+                meter["monthly_consumption"] = await self.rympro.monthly_consumption(
+                    meter_id
+                )
+                meter["daily_consumption"] = await self.rympro.daily_consumption(
+                    meter_id
+                )
                 meter["consumption_forecast"] = await self.rympro.consumption_forecast(
                     meter_id
                 )
         except UnauthorizedError as error:
-            assert self.config_entry
             await self.hass.config_entries.async_reload(self.config_entry.entry_id)
             raise UpdateFailed(error) from error
         except (CannotConnectError, OperationError) as error:
diff --git a/homeassistant/components/rympro/manifest.json b/homeassistant/components/rympro/manifest.json
index 046e778f05b..51c26b312fb 100644
--- a/homeassistant/components/rympro/manifest.json
+++ b/homeassistant/components/rympro/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/rympro",
   "iot_class": "cloud_polling",
-  "requirements": ["pyrympro==0.0.8"]
+  "requirements": ["pyrympro==0.0.9"]
 }
diff --git a/homeassistant/components/rympro/sensor.py b/homeassistant/components/rympro/sensor.py
index 8bb0af6e9ff..66ed41a4ce9 100644
--- a/homeassistant/components/rympro/sensor.py
+++ b/homeassistant/components/rympro/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfVolume
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
@@ -36,6 +36,20 @@ SENSOR_DESCRIPTIONS: tuple[RymProSensorEntityDescription, ...] = (
         suggested_display_precision=3,
         value_key="read",
     ),
+    RymProSensorEntityDescription(
+        key="monthly_consumption",
+        translation_key="monthly_consumption",
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        suggested_display_precision=3,
+        value_key="monthly_consumption",
+    ),
+    RymProSensorEntityDescription(
+        key="daily_consumption",
+        translation_key="daily_consumption",
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        suggested_display_precision=3,
+        value_key="daily_consumption",
+    ),
     RymProSensorEntityDescription(
         key="monthly_forecast",
         translation_key="monthly_forecast",
@@ -48,7 +62,7 @@ SENSOR_DESCRIPTIONS: tuple[RymProSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors for device."""
     coordinator: RymProDataUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/rympro/strings.json b/homeassistant/components/rympro/strings.json
index 2c1e2ad93c9..589e91a6c6f 100644
--- a/homeassistant/components/rympro/strings.json
+++ b/homeassistant/components/rympro/strings.json
@@ -23,6 +23,12 @@
       "total_consumption": {
         "name": "Total consumption"
       },
+      "monthly_consumption": {
+        "name": "Monthly consumption"
+      },
+      "daily_consumption": {
+        "name": "Daily consumption"
+      },
       "monthly_forecast": {
         "name": "Monthly forecast"
       }
diff --git a/homeassistant/components/sabnzbd/__init__.py b/homeassistant/components/sabnzbd/__init__.py
index fee459340f3..1f68781a3a2 100644
--- a/homeassistant/components/sabnzbd/__init__.py
+++ b/homeassistant/components/sabnzbd/__init__.py
@@ -11,8 +11,7 @@ import voluptuous as vol
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import ConfigEntryNotReady, HomeAssistantError
-from homeassistant.helpers import config_validation as cv
-import homeassistant.helpers.issue_registry as ir
+from homeassistant.helpers import config_validation as cv, issue_registry as ir
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
diff --git a/homeassistant/components/sabnzbd/binary_sensor.py b/homeassistant/components/sabnzbd/binary_sensor.py
index 1d65bf01211..59ef17237e2 100644
--- a/homeassistant/components/sabnzbd/binary_sensor.py
+++ b/homeassistant/components/sabnzbd/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import SabnzbdConfigEntry
 from .entity import SabnzbdEntity
@@ -40,7 +40,7 @@ BINARY_SENSORS: tuple[SabnzbdBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: SabnzbdConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Sabnzbd sensor entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/sabnzbd/button.py b/homeassistant/components/sabnzbd/button.py
index 1ff26b41655..25c11f6b2ec 100644
--- a/homeassistant/components/sabnzbd/button.py
+++ b/homeassistant/components/sabnzbd/button.py
@@ -9,7 +9,7 @@ from pysabnzbd import SabnzbdApiException
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import SabnzbdConfigEntry, SabnzbdUpdateCoordinator
@@ -40,7 +40,7 @@ BUTTON_DESCRIPTIONS: tuple[SabnzbdButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SabnzbdConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up buttons from a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/sabnzbd/number.py b/homeassistant/components/sabnzbd/number.py
index 53c8d462f11..63b2206ac70 100644
--- a/homeassistant/components/sabnzbd/number.py
+++ b/homeassistant/components/sabnzbd/number.py
@@ -15,7 +15,7 @@ from homeassistant.components.number import (
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import SabnzbdConfigEntry, SabnzbdUpdateCoordinator
@@ -48,7 +48,7 @@ NUMBER_DESCRIPTIONS: tuple[SabnzbdNumberEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: SabnzbdConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the SABnzbd number entity."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/sabnzbd/sensor.py b/homeassistant/components/sabnzbd/sensor.py
index 662ae739d15..5e871b4bf40 100644
--- a/homeassistant/components/sabnzbd/sensor.py
+++ b/homeassistant/components/sabnzbd/sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import UnitOfDataRate, UnitOfInformation
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .coordinator import SabnzbdConfigEntry
@@ -115,7 +115,7 @@ SENSOR_TYPES: tuple[SabnzbdSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: SabnzbdConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Sabnzbd sensor entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/saj/sensor.py b/homeassistant/components/saj/sensor.py
index c8b40fd5476..89b6658c418 100644
--- a/homeassistant/components/saj/sensor.py
+++ b/homeassistant/components/saj/sensor.py
@@ -31,7 +31,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.exceptions import PlatformNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.start import async_at_start
diff --git a/homeassistant/components/samsungtv/__init__.py b/homeassistant/components/samsungtv/__init__.py
index 6d4e491b839..e416cd35765 100644
--- a/homeassistant/components/samsungtv/__init__.py
+++ b/homeassistant/components/samsungtv/__init__.py
@@ -44,14 +44,11 @@ from .const import (
     UPNP_SVC_MAIN_TV_AGENT,
     UPNP_SVC_RENDERING_CONTROL,
 )
-from .coordinator import SamsungTVDataUpdateCoordinator
+from .coordinator import SamsungTVConfigEntry, SamsungTVDataUpdateCoordinator
 
 PLATFORMS = [Platform.MEDIA_PLAYER, Platform.REMOTE]
 
 
-SamsungTVConfigEntry = ConfigEntry[SamsungTVDataUpdateCoordinator]
-
-
 @callback
 def _async_get_device_bridge(
     hass: HomeAssistant, data: dict[str, Any]
@@ -165,7 +162,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: SamsungTVConfigEntry) ->
     entry.async_on_unload(debounced_reloader.async_shutdown)
     entry.async_on_unload(entry.add_update_listener(debounced_reloader.async_call))
 
-    coordinator = SamsungTVDataUpdateCoordinator(hass, bridge)
+    coordinator = SamsungTVDataUpdateCoordinator(hass, entry, bridge)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
diff --git a/homeassistant/components/samsungtv/coordinator.py b/homeassistant/components/samsungtv/coordinator.py
index 92d8dc8fa84..443e62b13fb 100644
--- a/homeassistant/components/samsungtv/coordinator.py
+++ b/homeassistant/components/samsungtv/coordinator.py
@@ -15,17 +15,25 @@ from .const import DOMAIN, LOGGER
 
 SCAN_INTERVAL = 10
 
+type SamsungTVConfigEntry = ConfigEntry[SamsungTVDataUpdateCoordinator]
+
 
 class SamsungTVDataUpdateCoordinator(DataUpdateCoordinator[None]):
     """Coordinator for the SamsungTV integration."""
 
-    config_entry: ConfigEntry
+    config_entry: SamsungTVConfigEntry
 
-    def __init__(self, hass: HomeAssistant, bridge: SamsungTVBridge) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: SamsungTVConfigEntry,
+        bridge: SamsungTVBridge,
+    ) -> None:
         """Initialize the coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=SCAN_INTERVAL),
         )
diff --git a/homeassistant/components/samsungtv/diagnostics.py b/homeassistant/components/samsungtv/diagnostics.py
index ebca8d2543b..667d23ba631 100644
--- a/homeassistant/components/samsungtv/diagnostics.py
+++ b/homeassistant/components/samsungtv/diagnostics.py
@@ -8,8 +8,8 @@ from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_TOKEN
 from homeassistant.core import HomeAssistant
 
-from . import SamsungTVConfigEntry
 from .const import CONF_SESSION_ID
+from .coordinator import SamsungTVConfigEntry
 
 TO_REDACT = {CONF_TOKEN, CONF_SESSION_ID}
 
diff --git a/homeassistant/components/samsungtv/helpers.py b/homeassistant/components/samsungtv/helpers.py
index 4e8dd00d486..b4075b8117f 100644
--- a/homeassistant/components/samsungtv/helpers.py
+++ b/homeassistant/components/samsungtv/helpers.py
@@ -7,9 +7,9 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.device_registry import DeviceEntry
 
-from . import SamsungTVConfigEntry
 from .bridge import SamsungTVBridge
 from .const import DOMAIN
+from .coordinator import SamsungTVConfigEntry
 
 
 @callback
diff --git a/homeassistant/components/samsungtv/media_player.py b/homeassistant/components/samsungtv/media_player.py
index 7180e8a0c1a..4e6ecfd3593 100644
--- a/homeassistant/components/samsungtv/media_player.py
+++ b/homeassistant/components/samsungtv/media_player.py
@@ -31,13 +31,12 @@ from homeassistant.components.media_player import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.async_ import create_eager_task
 
-from . import SamsungTVConfigEntry
 from .bridge import SamsungTVWSBridge
 from .const import CONF_SSDP_RENDERING_CONTROL_LOCATION, LOGGER
-from .coordinator import SamsungTVDataUpdateCoordinator
+from .coordinator import SamsungTVConfigEntry, SamsungTVDataUpdateCoordinator
 from .entity import SamsungTVEntity
 
 SOURCES = {"TV": "KEY_TV", "HDMI": "KEY_HDMI"}
@@ -64,7 +63,7 @@ APP_LIST_DELAY = 3
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SamsungTVConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Samsung TV from a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/samsungtv/remote.py b/homeassistant/components/samsungtv/remote.py
index 401a5d383f0..d6fef262d91 100644
--- a/homeassistant/components/samsungtv/remote.py
+++ b/homeassistant/components/samsungtv/remote.py
@@ -7,17 +7,17 @@ from typing import Any
 
 from homeassistant.components.remote import ATTR_NUM_REPEATS, RemoteEntity
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import SamsungTVConfigEntry
 from .const import LOGGER
+from .coordinator import SamsungTVConfigEntry
 from .entity import SamsungTVEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SamsungTVConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Samsung TV from a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/sanix/__init__.py b/homeassistant/components/sanix/__init__.py
index c8c5567eedc..60cc5b56f2e 100644
--- a/homeassistant/components/sanix/__init__.py
+++ b/homeassistant/components/sanix/__init__.py
@@ -19,7 +19,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     token = entry.data[CONF_TOKEN]
 
     sanix_api = Sanix(serial_no, token)
-    coordinator = SanixCoordinator(hass, sanix_api)
+    coordinator = SanixCoordinator(hass, entry, sanix_api)
 
     await coordinator.async_config_entry_first_refresh()
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
diff --git a/homeassistant/components/sanix/coordinator.py b/homeassistant/components/sanix/coordinator.py
index d6362337a38..64d28fa9191 100644
--- a/homeassistant/components/sanix/coordinator.py
+++ b/homeassistant/components/sanix/coordinator.py
@@ -21,10 +21,16 @@ class SanixCoordinator(DataUpdateCoordinator[Measurement]):
 
     config_entry: ConfigEntry
 
-    def __init__(self, hass: HomeAssistant, sanix_api: Sanix) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, sanix_api: Sanix
+    ) -> None:
         """Initialize coordinator."""
         super().__init__(
-            hass, _LOGGER, name=MANUFACTURER, update_interval=timedelta(hours=1)
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=MANUFACTURER,
+            update_interval=timedelta(hours=1),
         )
         self._sanix_api = sanix_api
 
diff --git a/homeassistant/components/sanix/sensor.py b/homeassistant/components/sanix/sensor.py
index 39a1c593433..d2a1aecb099 100644
--- a/homeassistant/components/sanix/sensor.py
+++ b/homeassistant/components/sanix/sensor.py
@@ -24,7 +24,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, UnitOfLength
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, MANUFACTURER
@@ -82,7 +82,9 @@ SENSOR_TYPES: tuple[SanixSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Sanix Sensor entities based on a config entry."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/schedule/__init__.py b/homeassistant/components/schedule/__init__.py
index 30ca44fe3ee..ea569f4e277 100644
--- a/homeassistant/components/schedule/__init__.py
+++ b/homeassistant/components/schedule/__init__.py
@@ -18,7 +18,14 @@ from homeassistant.const import (
     STATE_OFF,
     STATE_ON,
 )
-from homeassistant.core import HomeAssistant, ServiceCall, callback
+from homeassistant.core import (
+    HomeAssistant,
+    ServiceCall,
+    ServiceResponse,
+    SupportsResponse,
+    callback,
+)
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.collection import (
     CollectionEntity,
     DictStorageCollection,
@@ -28,7 +35,6 @@ from homeassistant.helpers.collection import (
     YamlCollection,
     sync_entity_lifecycle,
 )
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.helpers.service import async_register_admin_service
@@ -44,6 +50,7 @@ from .const import (
     CONF_TO,
     DOMAIN,
     LOGGER,
+    SERVICE_GET,
     WEEKDAY_TO_CONF,
 )
 
@@ -205,6 +212,14 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         reload_service_handler,
     )
 
+    component.async_register_entity_service(
+        SERVICE_GET,
+        {},
+        async_get_schedule_service,
+        supports_response=SupportsResponse.ONLY,
+    )
+    await component.async_setup(config)
+
     return True
 
 
@@ -296,6 +311,10 @@ class Schedule(CollectionEntity):
         self.async_on_remove(self._clean_up_listener)
         self._update()
 
+    def get_schedule(self) -> ConfigType:
+        """Return the schedule."""
+        return {d: self._config[d] for d in WEEKDAY_TO_CONF.values()}
+
     @callback
     def _update(self, _: datetime | None = None) -> None:
         """Update the states of the schedule."""
@@ -390,3 +409,10 @@ class Schedule(CollectionEntity):
                 data_keys.update(time_range_custom_data.keys())
 
         return frozenset(data_keys)
+
+
+async def async_get_schedule_service(
+    schedule: Schedule, service_call: ServiceCall
+) -> ServiceResponse:
+    """Return the schedule configuration."""
+    return schedule.get_schedule()
diff --git a/homeassistant/components/schedule/const.py b/homeassistant/components/schedule/const.py
index 6687dafefdb..410cd00c3a0 100644
--- a/homeassistant/components/schedule/const.py
+++ b/homeassistant/components/schedule/const.py
@@ -37,3 +37,5 @@ WEEKDAY_TO_CONF: Final = {
     5: CONF_SATURDAY,
     6: CONF_SUNDAY,
 }
+
+SERVICE_GET: Final = "get_schedule"
diff --git a/homeassistant/components/schedule/icons.json b/homeassistant/components/schedule/icons.json
index a9829425570..7d631cfd42d 100644
--- a/homeassistant/components/schedule/icons.json
+++ b/homeassistant/components/schedule/icons.json
@@ -2,6 +2,9 @@
   "services": {
     "reload": {
       "service": "mdi:reload"
+    },
+    "get_schedule": {
+      "service": "mdi:calendar-export"
     }
   }
 }
diff --git a/homeassistant/components/schedule/services.yaml b/homeassistant/components/schedule/services.yaml
index c983a105c93..1cb3f0280af 100644
--- a/homeassistant/components/schedule/services.yaml
+++ b/homeassistant/components/schedule/services.yaml
@@ -1 +1,5 @@
 reload:
+get_schedule:
+  target:
+    entity:
+      domain: schedule
diff --git a/homeassistant/components/schedule/strings.json b/homeassistant/components/schedule/strings.json
index a40c5814d36..bb81c029dbf 100644
--- a/homeassistant/components/schedule/strings.json
+++ b/homeassistant/components/schedule/strings.json
@@ -25,6 +25,10 @@
     "reload": {
       "name": "[%key:common::action::reload%]",
       "description": "Reloads schedules from the YAML-configuration."
+    },
+    "get_schedule": {
+      "name": "Get schedule",
+      "description": "Retrieves the configured time ranges of one or multiple schedules."
     }
   }
 }
diff --git a/homeassistant/components/schlage/__init__.py b/homeassistant/components/schlage/__init__.py
index 6eae69d9542..509a335aafe 100644
--- a/homeassistant/components/schlage/__init__.py
+++ b/homeassistant/components/schlage/__init__.py
@@ -5,12 +5,11 @@ from __future__ import annotations
 from pycognito.exceptions import WarrantException
 import pyschlage
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 
-from .coordinator import SchlageDataUpdateCoordinator
+from .coordinator import SchlageConfigEntry, SchlageDataUpdateCoordinator
 
 PLATFORMS: list[Platform] = [
     Platform.BINARY_SENSOR,
@@ -20,8 +19,6 @@ PLATFORMS: list[Platform] = [
     Platform.SWITCH,
 ]
 
-type SchlageConfigEntry = ConfigEntry[SchlageDataUpdateCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: SchlageConfigEntry) -> bool:
     """Set up Schlage from a config entry."""
@@ -32,7 +29,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: SchlageConfigEntry) -> b
     except WarrantException as ex:
         raise ConfigEntryAuthFailed from ex
 
-    coordinator = SchlageDataUpdateCoordinator(hass, username, pyschlage.Schlage(auth))
+    coordinator = SchlageDataUpdateCoordinator(
+        hass, entry, username, pyschlage.Schlage(auth)
+    )
     entry.runtime_data = coordinator
     await coordinator.async_config_entry_first_refresh()
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
diff --git a/homeassistant/components/schlage/binary_sensor.py b/homeassistant/components/schlage/binary_sensor.py
index f928d42b3ee..62e69b5cb4a 100644
--- a/homeassistant/components/schlage/binary_sensor.py
+++ b/homeassistant/components/schlage/binary_sensor.py
@@ -12,10 +12,9 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import SchlageConfigEntry
-from .coordinator import LockData, SchlageDataUpdateCoordinator
+from .coordinator import LockData, SchlageConfigEntry, SchlageDataUpdateCoordinator
 from .entity import SchlageEntity
 
 
@@ -40,7 +39,7 @@ _DESCRIPTIONS: tuple[SchlageBinarySensorEntityDescription] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: SchlageConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up binary_sensors based on a config entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/schlage/coordinator.py b/homeassistant/components/schlage/coordinator.py
index b319b21be0c..eec143c574f 100644
--- a/homeassistant/components/schlage/coordinator.py
+++ b/homeassistant/components/schlage/coordinator.py
@@ -13,7 +13,7 @@ from pyschlage.log import LockLog
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN, LOGGER, UPDATE_INTERVAL
@@ -34,15 +34,28 @@ class SchlageData:
     locks: dict[str, LockData]
 
 
+type SchlageConfigEntry = ConfigEntry[SchlageDataUpdateCoordinator]
+
+
 class SchlageDataUpdateCoordinator(DataUpdateCoordinator[SchlageData]):
     """The Schlage data update coordinator."""
 
-    config_entry: ConfigEntry
+    config_entry: SchlageConfigEntry
 
-    def __init__(self, hass: HomeAssistant, username: str, api: Schlage) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: SchlageConfigEntry,
+        username: str,
+        api: Schlage,
+    ) -> None:
         """Initialize the class."""
         super().__init__(
-            hass, LOGGER, name=f"{DOMAIN} ({username})", update_interval=UPDATE_INTERVAL
+            hass,
+            LOGGER,
+            config_entry=config_entry,
+            name=f"{DOMAIN} ({username})",
+            update_interval=UPDATE_INTERVAL,
         )
         self.data = SchlageData(locks={})
         self.api = api
diff --git a/homeassistant/components/schlage/diagnostics.py b/homeassistant/components/schlage/diagnostics.py
index ec4d9c489e3..357f04f00db 100644
--- a/homeassistant/components/schlage/diagnostics.py
+++ b/homeassistant/components/schlage/diagnostics.py
@@ -6,7 +6,7 @@ from typing import Any
 
 from homeassistant.core import HomeAssistant
 
-from . import SchlageConfigEntry
+from .coordinator import SchlageConfigEntry
 
 
 async def async_get_config_entry_diagnostics(
diff --git a/homeassistant/components/schlage/lock.py b/homeassistant/components/schlage/lock.py
index d203913191d..83abf9214e3 100644
--- a/homeassistant/components/schlage/lock.py
+++ b/homeassistant/components/schlage/lock.py
@@ -6,17 +6,16 @@ from typing import Any
 
 from homeassistant.components.lock import LockEntity
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import SchlageConfigEntry
-from .coordinator import LockData, SchlageDataUpdateCoordinator
+from .coordinator import LockData, SchlageConfigEntry, SchlageDataUpdateCoordinator
 from .entity import SchlageEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: SchlageConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Schlage WiFi locks based on a config entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/schlage/select.py b/homeassistant/components/schlage/select.py
index 6cf0853835f..4648686aaac 100644
--- a/homeassistant/components/schlage/select.py
+++ b/homeassistant/components/schlage/select.py
@@ -5,10 +5,9 @@ from __future__ import annotations
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import SchlageConfigEntry
-from .coordinator import LockData, SchlageDataUpdateCoordinator
+from .coordinator import LockData, SchlageConfigEntry, SchlageDataUpdateCoordinator
 from .entity import SchlageEntity
 
 _DESCRIPTIONS = (
@@ -33,7 +32,7 @@ _DESCRIPTIONS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: SchlageConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up selects based on a config entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/schlage/sensor.py b/homeassistant/components/schlage/sensor.py
index a15d1740b91..494efc7585a 100644
--- a/homeassistant/components/schlage/sensor.py
+++ b/homeassistant/components/schlage/sensor.py
@@ -8,12 +8,11 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import LockData, SchlageDataUpdateCoordinator
+from .coordinator import LockData, SchlageConfigEntry, SchlageDataUpdateCoordinator
 from .entity import SchlageEntity
 
 _SENSOR_DESCRIPTIONS: list[SensorEntityDescription] = [
@@ -29,8 +28,8 @@ _SENSOR_DESCRIPTIONS: list[SensorEntityDescription] = [
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: SchlageConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors based on a config entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/schlage/switch.py b/homeassistant/components/schlage/switch.py
index 39fe6dbbc99..c40d0c41e88 100644
--- a/homeassistant/components/schlage/switch.py
+++ b/homeassistant/components/schlage/switch.py
@@ -14,12 +14,11 @@ from homeassistant.components.switch import (
     SwitchEntity,
     SwitchEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import LockData, SchlageDataUpdateCoordinator
+from .coordinator import LockData, SchlageConfigEntry, SchlageDataUpdateCoordinator
 from .entity import SchlageEntity
 
 
@@ -56,8 +55,8 @@ SWITCHES: tuple[SchlageSwitchEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: SchlageConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switches based on a config entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/schluter/__init__.py b/homeassistant/components/schluter/__init__.py
index 907841a2e5e..f7a8b631a05 100644
--- a/homeassistant/components/schluter/__init__.py
+++ b/homeassistant/components/schluter/__init__.py
@@ -9,8 +9,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
diff --git a/homeassistant/components/scrape/__init__.py b/homeassistant/components/scrape/__init__.py
index ff991c5f348..68a8cf62fe4 100644
--- a/homeassistant/components/scrape/__init__.py
+++ b/homeassistant/components/scrape/__init__.py
@@ -19,8 +19,11 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import discovery, entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import (
+    config_validation as cv,
+    discovery,
+    entity_registry as er,
+)
 from homeassistant.helpers.device_registry import DeviceEntry
 from homeassistant.helpers.trigger_template_entity import (
     CONF_AVAILABILITY,
diff --git a/homeassistant/components/scrape/sensor.py b/homeassistant/components/scrape/sensor.py
index 5ee837f32d1..b8ad9cb8a56 100644
--- a/homeassistant/components/scrape/sensor.py
+++ b/homeassistant/components/scrape/sensor.py
@@ -21,7 +21,10 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import PlatformNotReady
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.trigger_template_entity import (
     CONF_AVAILABILITY,
@@ -92,7 +95,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ScrapeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Scrape sensor entry."""
     entities: list = []
diff --git a/homeassistant/components/screenlogic/binary_sensor.py b/homeassistant/components/screenlogic/binary_sensor.py
index 4a178c60d81..a846a9fa4e3 100644
--- a/homeassistant/components/screenlogic/binary_sensor.py
+++ b/homeassistant/components/screenlogic/binary_sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import ScreenlogicDataUpdateCoordinator
 from .entity import (
@@ -195,7 +195,7 @@ SUPPORTED_SCG_SENSORS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ScreenLogicConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/screenlogic/climate.py b/homeassistant/components/screenlogic/climate.py
index e44d9b18ae1..03aebadbba6 100644
--- a/homeassistant/components/screenlogic/climate.py
+++ b/homeassistant/components/screenlogic/climate.py
@@ -21,7 +21,7 @@ from homeassistant.components.climate import (
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from .entity import ScreenLogicPushEntity, ScreenLogicPushEntityDescription
@@ -42,7 +42,7 @@ SUPPORTED_PRESETS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ScreenLogicConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/screenlogic/config_flow.py b/homeassistant/components/screenlogic/config_flow.py
index 54067055a69..b4deb9b36aa 100644
--- a/homeassistant/components/screenlogic/config_flow.py
+++ b/homeassistant/components/screenlogic/config_flow.py
@@ -18,7 +18,7 @@ from homeassistant.config_entries import (
 )
 from homeassistant.const import CONF_IP_ADDRESS, CONF_PORT, CONF_SCAN_INTERVAL
 from homeassistant.core import callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 
@@ -105,7 +105,7 @@ class ScreenlogicConfigFlow(ConfigFlow, domain=DOMAIN):
 
     async def async_step_gateway_select(self, user_input=None) -> ConfigFlowResult:
         """Handle the selection of a discovered ScreenLogic gateway."""
-        existing = self._async_current_ids()
+        existing = self._async_current_ids(include_ignore=False)
         unconfigured_gateways = {
             mac: gateway[SL_GATEWAY_NAME]
             for mac, gateway in self.discovered_gateways.items()
diff --git a/homeassistant/components/screenlogic/coordinator.py b/homeassistant/components/screenlogic/coordinator.py
index a90c9cb2cf4..b3c438dc641 100644
--- a/homeassistant/components/screenlogic/coordinator.py
+++ b/homeassistant/components/screenlogic/coordinator.py
@@ -52,6 +52,8 @@ async def async_get_connect_info(
 class ScreenlogicDataUpdateCoordinator(DataUpdateCoordinator[None]):
     """Class to manage the data update for the Screenlogic component."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
@@ -60,7 +62,6 @@ class ScreenlogicDataUpdateCoordinator(DataUpdateCoordinator[None]):
         gateway: ScreenLogicGateway,
     ) -> None:
         """Initialize the Screenlogic Data Update Coordinator."""
-        self.config_entry = config_entry
         self.gateway = gateway
 
         interval = timedelta(
@@ -69,6 +70,7 @@ class ScreenlogicDataUpdateCoordinator(DataUpdateCoordinator[None]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=interval,
             # Debounced option since the device takes
@@ -91,7 +93,6 @@ class ScreenlogicDataUpdateCoordinator(DataUpdateCoordinator[None]):
 
     async def _async_update_data(self) -> None:
         """Fetch data from the Screenlogic gateway."""
-        assert self.config_entry is not None
         try:
             if not self.gateway.is_connected:
                 connect_info = await async_get_connect_info(
diff --git a/homeassistant/components/screenlogic/light.py b/homeassistant/components/screenlogic/light.py
index 412b2df5f81..b0bd154b66d 100644
--- a/homeassistant/components/screenlogic/light.py
+++ b/homeassistant/components/screenlogic/light.py
@@ -12,7 +12,7 @@ from homeassistant.components.light import (
     LightEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import LIGHT_CIRCUIT_FUNCTIONS
 from .entity import ScreenLogicCircuitEntity, ScreenLogicPushEntityDescription
@@ -22,7 +22,7 @@ from .types import ScreenLogicConfigEntry
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ScreenLogicConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry."""
     entities: list[ScreenLogicLight] = []
diff --git a/homeassistant/components/screenlogic/number.py b/homeassistant/components/screenlogic/number.py
index 3634147e509..ea9bf8ac95d 100644
--- a/homeassistant/components/screenlogic/number.py
+++ b/homeassistant/components/screenlogic/number.py
@@ -17,7 +17,7 @@ from homeassistant.components.number import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import ScreenlogicDataUpdateCoordinator
 from .entity import (
@@ -104,7 +104,7 @@ SUPPORTED_SCG_NUMBERS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ScreenLogicConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry."""
     entities: list[ScreenLogicNumber] = []
diff --git a/homeassistant/components/screenlogic/sensor.py b/homeassistant/components/screenlogic/sensor.py
index 7a5e910923c..95a7e3a5c75 100644
--- a/homeassistant/components/screenlogic/sensor.py
+++ b/homeassistant/components/screenlogic/sensor.py
@@ -20,7 +20,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import ScreenlogicDataUpdateCoordinator
 from .entity import (
@@ -272,7 +272,7 @@ SUPPORTED_SCG_SENSORS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ScreenLogicConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/screenlogic/strings.json b/homeassistant/components/screenlogic/strings.json
index 09e64808dfe..97e12277eb6 100644
--- a/homeassistant/components/screenlogic/strings.json
+++ b/homeassistant/components/screenlogic/strings.json
@@ -3,9 +3,9 @@
     "service_config_entry_name": "Config entry",
     "service_config_entry_description": "The config entry to use for this action.",
     "climate_preset_solar": "Solar",
-    "climate_preset_solar_preferred": "Solar Preferred",
+    "climate_preset_solar_preferred": "Solar preferred",
     "climate_preset_heater": "Heater",
-    "climate_preset_dont_change": "Don't Change"
+    "climate_preset_dont_change": "Don't change"
   },
   "config": {
     "flow_title": "{name}",
@@ -15,7 +15,7 @@
     "step": {
       "gateway_entry": {
         "title": "ScreenLogic",
-        "description": "Enter your ScreenLogic Gateway information.",
+        "description": "Enter your ScreenLogic gateway information.",
         "data": {
           "ip_address": "[%key:common::config_flow::data::ip%]",
           "port": "[%key:common::config_flow::data::port%]"
@@ -46,7 +46,7 @@
   },
   "services": {
     "set_color_mode": {
-      "name": "Set Color Mode",
+      "name": "Set color mode",
       "description": "Sets the color mode for all color-capable lights attached to this ScreenLogic gateway.",
       "fields": {
         "config_entry": {
@@ -54,13 +54,13 @@
           "description": "[%key:component::screenlogic::common::service_config_entry_description%]"
         },
         "color_mode": {
-          "name": "Color Mode",
+          "name": "Color mode",
           "description": "The ScreenLogic color mode to set."
         }
       }
     },
     "start_super_chlorination": {
-      "name": "Start Super Chlorination",
+      "name": "Start super chlorination",
       "description": "Begins super chlorination, running for the specified period or 24 hours if none is specified.",
       "fields": {
         "config_entry": {
@@ -68,13 +68,13 @@
           "description": "[%key:component::screenlogic::common::service_config_entry_description%]"
         },
         "runtime": {
-          "name": "Run Time",
+          "name": "Run time",
           "description": "Number of hours for super chlorination to run."
         }
       }
     },
     "stop_super_chlorination": {
-      "name": "Stop Super Chlorination",
+      "name": "Stop super chlorination",
       "description": "Stops super chlorination.",
       "fields": {
         "config_entry": {
diff --git a/homeassistant/components/screenlogic/switch.py b/homeassistant/components/screenlogic/switch.py
index 1d36ee00b94..dfbb1c1781d 100644
--- a/homeassistant/components/screenlogic/switch.py
+++ b/homeassistant/components/screenlogic/switch.py
@@ -8,7 +8,7 @@ from screenlogicpy.device_const.circuit import GENERIC_CIRCUIT_NAMES, INTERFACE
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import LIGHT_CIRCUIT_FUNCTIONS
 from .entity import (
@@ -29,7 +29,7 @@ class ScreenLogicCircuitSwitchDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ScreenLogicConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry."""
     entities: list[ScreenLogicSwitchingEntity] = []
diff --git a/homeassistant/components/script/__init__.py b/homeassistant/components/script/__init__.py
index 14104ad0219..dd293726484 100644
--- a/homeassistant/components/script/__init__.py
+++ b/homeassistant/components/script/__init__.py
@@ -39,7 +39,7 @@ from homeassistant.core import (
     SupportsResponse,
     callback,
 )
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.config_validation import make_entity_service_schema
 from homeassistant.helpers.entity import ToggleEntity
 from homeassistant.helpers.entity_component import EntityComponent
diff --git a/homeassistant/components/scsgate/__init__.py b/homeassistant/components/scsgate/__init__.py
index 9aabb315942..636c157b076 100644
--- a/homeassistant/components/scsgate/__init__.py
+++ b/homeassistant/components/scsgate/__init__.py
@@ -11,7 +11,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_DEVICE, CONF_NAME, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/scsgate/cover.py b/homeassistant/components/scsgate/cover.py
index b6d3317555c..4c4d2c2949a 100644
--- a/homeassistant/components/scsgate/cover.py
+++ b/homeassistant/components/scsgate/cover.py
@@ -18,7 +18,7 @@ from homeassistant.components.cover import (
 )
 from homeassistant.const import CONF_DEVICES, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/scsgate/light.py b/homeassistant/components/scsgate/light.py
index 23b73a0fd6b..0addbda9e09 100644
--- a/homeassistant/components/scsgate/light.py
+++ b/homeassistant/components/scsgate/light.py
@@ -15,7 +15,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import ATTR_ENTITY_ID, ATTR_STATE, CONF_DEVICES, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/scsgate/switch.py b/homeassistant/components/scsgate/switch.py
index abc906a5533..4607d65ac7a 100644
--- a/homeassistant/components/scsgate/switch.py
+++ b/homeassistant/components/scsgate/switch.py
@@ -15,7 +15,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import ATTR_ENTITY_ID, ATTR_STATE, CONF_DEVICES, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/search/manifest.json b/homeassistant/components/search/manifest.json
index cd372139451..42a54fe8b55 100644
--- a/homeassistant/components/search/manifest.json
+++ b/homeassistant/components/search/manifest.json
@@ -1,7 +1,6 @@
 {
   "domain": "search",
   "name": "Search",
-  "after_dependencies": ["scene", "group", "automation", "script"],
   "codeowners": ["@home-assistant/core"],
   "dependencies": ["websocket_api"],
   "documentation": "https://www.home-assistant.io/integrations/search",
diff --git a/homeassistant/components/season/sensor.py b/homeassistant/components/season/sensor.py
index 96744db1d02..bdc24883c90 100644
--- a/homeassistant/components/season/sensor.py
+++ b/homeassistant/components/season/sensor.py
@@ -11,7 +11,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_TYPE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.dt import utcnow
 
 from .const import DOMAIN, TYPE_ASTRONOMICAL
@@ -37,7 +37,7 @@ HEMISPHERE_SEASON_SWAP = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the platform from config entry."""
     hemisphere = EQUATOR
diff --git a/homeassistant/components/select/device_action.py b/homeassistant/components/select/device_action.py
index a3827a23d41..1801d34d182 100644
--- a/homeassistant/components/select/device_action.py
+++ b/homeassistant/components/select/device_action.py
@@ -19,8 +19,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Context, HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.entity import get_capability
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
 
diff --git a/homeassistant/components/sendgrid/notify.py b/homeassistant/components/sendgrid/notify.py
index 86f01804574..4dbb95085cb 100644
--- a/homeassistant/components/sendgrid/notify.py
+++ b/homeassistant/components/sendgrid/notify.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     CONTENT_TYPE_TEXT_PLAIN,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/sense/__init__.py b/homeassistant/components/sense/__init__.py
index e919d48e96d..a5393181057 100644
--- a/homeassistant/components/sense/__init__.py
+++ b/homeassistant/components/sense/__init__.py
@@ -89,8 +89,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: SenseConfigEntry) -> boo
     except SENSE_WEBSOCKET_EXCEPTIONS as err:
         raise ConfigEntryNotReady(str(err) or "Error during realtime update") from err
 
-    trends_coordinator = SenseTrendCoordinator(hass, gateway)
-    realtime_coordinator = SenseRealtimeCoordinator(hass, gateway)
+    trends_coordinator = SenseTrendCoordinator(hass, entry, gateway)
+    realtime_coordinator = SenseRealtimeCoordinator(hass, entry, gateway)
 
     # This can take longer than 60s and we already know
     # sense is online since get_discovered_device_data was
diff --git a/homeassistant/components/sense/binary_sensor.py b/homeassistant/components/sense/binary_sensor.py
index d06b3a62937..3bb8a32b8e4 100644
--- a/homeassistant/components/sense/binary_sensor.py
+++ b/homeassistant/components/sense/binary_sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SenseConfigEntry
 from .const import DOMAIN
@@ -23,7 +23,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: SenseConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Sense binary sensor."""
     sense_monitor_id = config_entry.runtime_data.data.sense_monitor_id
diff --git a/homeassistant/components/sense/coordinator.py b/homeassistant/components/sense/coordinator.py
index c0029cd79ea..1957352aea6 100644
--- a/homeassistant/components/sense/coordinator.py
+++ b/homeassistant/components/sense/coordinator.py
@@ -1,7 +1,10 @@
 """Sense Coordinators."""
 
+from __future__ import annotations
+
 from datetime import timedelta
 import logging
+from typing import TYPE_CHECKING
 
 from sense_energy import (
     ASyncSenseable,
@@ -13,6 +16,9 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
+if TYPE_CHECKING:
+    from . import SenseConfigEntry
+
 from .const import (
     ACTIVE_UPDATE_RATE,
     SENSE_CONNECT_EXCEPTIONS,
@@ -27,13 +33,21 @@ _LOGGER = logging.getLogger(__name__)
 class SenseCoordinator(DataUpdateCoordinator[None]):
     """Sense Trend Coordinator."""
 
+    config_entry: SenseConfigEntry
+
     def __init__(
-        self, hass: HomeAssistant, gateway: ASyncSenseable, name: str, update: int
+        self,
+        hass: HomeAssistant,
+        config_entry: SenseConfigEntry,
+        gateway: ASyncSenseable,
+        name: str,
+        update: int,
     ) -> None:
         """Initialize."""
         super().__init__(
             hass,
             logger=_LOGGER,
+            config_entry=config_entry,
             name=f"Sense {name} {gateway.sense_monitor_id}",
             update_interval=timedelta(seconds=update),
         )
@@ -44,9 +58,14 @@ class SenseCoordinator(DataUpdateCoordinator[None]):
 class SenseTrendCoordinator(SenseCoordinator):
     """Sense Trend Coordinator."""
 
-    def __init__(self, hass: HomeAssistant, gateway: ASyncSenseable) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: SenseConfigEntry,
+        gateway: ASyncSenseable,
+    ) -> None:
         """Initialize."""
-        super().__init__(hass, gateway, "Trends", TREND_UPDATE_RATE)
+        super().__init__(hass, config_entry, gateway, "Trends", TREND_UPDATE_RATE)
 
     async def _async_update_data(self) -> None:
         """Update the trend data."""
@@ -62,9 +81,14 @@ class SenseTrendCoordinator(SenseCoordinator):
 class SenseRealtimeCoordinator(SenseCoordinator):
     """Sense Realtime Coordinator."""
 
-    def __init__(self, hass: HomeAssistant, gateway: ASyncSenseable) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: SenseConfigEntry,
+        gateway: ASyncSenseable,
+    ) -> None:
         """Initialize."""
-        super().__init__(hass, gateway, "Realtime", ACTIVE_UPDATE_RATE)
+        super().__init__(hass, config_entry, gateway, "Realtime", ACTIVE_UPDATE_RATE)
 
     async def _async_update_data(self) -> None:
         """Retrieve latest state."""
diff --git a/homeassistant/components/sense/manifest.json b/homeassistant/components/sense/manifest.json
index 966488b6a48..0a21dbf4cc3 100644
--- a/homeassistant/components/sense/manifest.json
+++ b/homeassistant/components/sense/manifest.json
@@ -20,5 +20,5 @@
   "documentation": "https://www.home-assistant.io/integrations/sense",
   "iot_class": "cloud_polling",
   "loggers": ["sense_energy"],
-  "requirements": ["sense-energy==0.13.4"]
+  "requirements": ["sense-energy==0.13.7"]
 }
diff --git a/homeassistant/components/sense/sensor.py b/homeassistant/components/sense/sensor.py
index 2f5c82675d5..8cb4bdd3e56 100644
--- a/homeassistant/components/sense/sensor.py
+++ b/homeassistant/components/sense/sensor.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
     UnitOfPower,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SenseConfigEntry
 from .const import (
@@ -66,7 +66,7 @@ TREND_SENSOR_VARIANTS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: SenseConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Sense sensor."""
     data = config_entry.runtime_data.data
diff --git a/homeassistant/components/sensibo/binary_sensor.py b/homeassistant/components/sensibo/binary_sensor.py
index a66ab46c882..c7116db7954 100644
--- a/homeassistant/components/sensibo/binary_sensor.py
+++ b/homeassistant/components/sensibo/binary_sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SensiboConfigEntry
 from .const import LOGGER
@@ -118,7 +118,7 @@ DESCRIPTION_BY_MODELS = {"pure": PURE_SENSOR_TYPES}
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SensiboConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Sensibo binary sensor platform."""
 
@@ -130,9 +130,10 @@ async def async_setup_entry(
         """Handle additions of devices and sensors."""
         entities: list[SensiboMotionSensor | SensiboDeviceSensor] = []
         nonlocal added_devices
-        new_devices, remove_devices, added_devices = coordinator.get_devices(
+        new_devices, remove_devices, new_added_devices = coordinator.get_devices(
             added_devices
         )
+        added_devices = new_added_devices
 
         if LOGGER.isEnabledFor(logging.DEBUG):
             LOGGER.debug(
@@ -168,8 +169,7 @@ async def async_setup_entry(
                     device_data.model, DEVICE_SENSOR_TYPES
                 )
             )
-
-        async_add_entities(entities)
+            async_add_entities(entities)
 
     entry.async_on_unload(coordinator.async_add_listener(_add_remove_devices))
     _add_remove_devices()
diff --git a/homeassistant/components/sensibo/button.py b/homeassistant/components/sensibo/button.py
index df8d4625840..d36967dae06 100644
--- a/homeassistant/components/sensibo/button.py
+++ b/homeassistant/components/sensibo/button.py
@@ -8,7 +8,7 @@ from typing import Any
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SensiboConfigEntry
 from .coordinator import SensiboDataUpdateCoordinator
@@ -35,7 +35,7 @@ DEVICE_BUTTON_TYPES = SensiboButtonEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SensiboConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Sensibo button platform."""
 
@@ -46,7 +46,8 @@ async def async_setup_entry(
     def _add_remove_devices() -> None:
         """Handle additions of devices and sensors."""
         nonlocal added_devices
-        new_devices, _, added_devices = coordinator.get_devices(added_devices)
+        new_devices, _, new_added_devices = coordinator.get_devices(added_devices)
+        added_devices = new_added_devices
 
         if new_devices:
             async_add_entities(
diff --git a/homeassistant/components/sensibo/climate.py b/homeassistant/components/sensibo/climate.py
index 5d1c6ff9e79..906c4259ce5 100644
--- a/homeassistant/components/sensibo/climate.py
+++ b/homeassistant/components/sensibo/climate.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, SupportsResponse
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.unit_conversion import TemperatureConverter
 
 from . import SensiboConfigEntry
@@ -138,7 +138,7 @@ def _find_valid_target_temp(target: float, valid_targets: list[int]) -> int:
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SensiboConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Sensibo climate entry."""
 
@@ -149,7 +149,8 @@ async def async_setup_entry(
     def _add_remove_devices() -> None:
         """Handle additions of devices and sensors."""
         nonlocal added_devices
-        new_devices, _, added_devices = coordinator.get_devices(added_devices)
+        new_devices, _, new_added_devices = coordinator.get_devices(added_devices)
+        added_devices = new_added_devices
 
         if new_devices:
             async_add_entities(
diff --git a/homeassistant/components/sensibo/coordinator.py b/homeassistant/components/sensibo/coordinator.py
index e19f24295b9..3fa8a6e5dae 100644
--- a/homeassistant/components/sensibo/coordinator.py
+++ b/homeassistant/components/sensibo/coordinator.py
@@ -56,18 +56,31 @@ class SensiboDataUpdateCoordinator(DataUpdateCoordinator[SensiboData]):
     ) -> tuple[set[str], set[str], set[str]]:
         """Addition and removal of devices."""
         data = self.data
-        motion_sensors = {
+        current_motion_sensors = {
             sensor_id
             for device_data in data.parsed.values()
             if device_data.motion_sensors
             for sensor_id in device_data.motion_sensors
         }
-        devices: set[str] = set(data.parsed)
-        new_devices: set[str] = motion_sensors | devices - added_devices
-        remove_devices = added_devices - devices - motion_sensors
-        added_devices = (added_devices - remove_devices) | new_devices
+        current_devices: set[str] = set(data.parsed)
+        LOGGER.debug(
+            "Current devices: %s, moption sensors: %s",
+            current_devices,
+            current_motion_sensors,
+        )
+        new_devices: set[str] = (
+            current_motion_sensors | current_devices
+        ) - added_devices
+        remove_devices = added_devices - current_devices - current_motion_sensors
+        new_added_devices = (added_devices - remove_devices) | new_devices
 
-        return (new_devices, remove_devices, added_devices)
+        LOGGER.debug(
+            "New devices: %s, Removed devices: %s, Added devices: %s",
+            new_devices,
+            remove_devices,
+            new_added_devices,
+        )
+        return (new_devices, remove_devices, new_added_devices)
 
     async def _async_update_data(self) -> SensiboData:
         """Fetch data from Sensibo."""
diff --git a/homeassistant/components/sensibo/manifest.json b/homeassistant/components/sensibo/manifest.json
index e6398c5076e..610695aaf7b 100644
--- a/homeassistant/components/sensibo/manifest.json
+++ b/homeassistant/components/sensibo/manifest.json
@@ -14,5 +14,6 @@
   },
   "iot_class": "cloud_polling",
   "loggers": ["pysensibo"],
+  "quality_scale": "platinum",
   "requirements": ["pysensibo==1.1.0"]
 }
diff --git a/homeassistant/components/sensibo/number.py b/homeassistant/components/sensibo/number.py
index aa46c7f8c1e..e71ed6f0235 100644
--- a/homeassistant/components/sensibo/number.py
+++ b/homeassistant/components/sensibo/number.py
@@ -15,7 +15,7 @@ from homeassistant.components.number import (
 )
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SensiboConfigEntry
 from .coordinator import SensiboDataUpdateCoordinator
@@ -65,7 +65,7 @@ DEVICE_NUMBER_TYPES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SensiboConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Sensibo number platform."""
 
@@ -76,7 +76,8 @@ async def async_setup_entry(
     def _add_remove_devices() -> None:
         """Handle additions of devices and sensors."""
         nonlocal added_devices
-        new_devices, _, added_devices = coordinator.get_devices(added_devices)
+        new_devices, _, new_added_devices = coordinator.get_devices(added_devices)
+        added_devices = new_added_devices
 
         if new_devices:
             async_add_entities(
diff --git a/homeassistant/components/sensibo/quality_scale.yaml b/homeassistant/components/sensibo/quality_scale.yaml
index c21cf100e9d..3d71d0ad3ba 100644
--- a/homeassistant/components/sensibo/quality_scale.yaml
+++ b/homeassistant/components/sensibo/quality_scale.yaml
@@ -19,9 +19,9 @@ rules:
     comment: |
       No integrations services.
   common-modules: done
-  docs-high-level-description: todo
+  docs-high-level-description: done
   docs-installation-instructions: done
-  docs-removal-instructions: todo
+  docs-removal-instructions: done
   docs-actions: done
   brands: done
   # Silver
@@ -39,9 +39,7 @@ rules:
     comment: |
       Tests are very complex and needs a rewrite for future additions
   integration-owner: done
-  docs-installation-parameters:
-    status: todo
-    comment: configuration_basic
+  docs-installation-parameters: done
   docs-configuration-parameters:
     status: exempt
     comment: |
@@ -71,13 +69,13 @@ rules:
     status: exempt
     comment: |
       This integration doesn't have any cases where raising an issue is needed.
-  docs-use-cases: todo
-  docs-supported-devices: todo
-  docs-supported-functions: todo
-  docs-data-update: todo
-  docs-known-limitations: todo
-  docs-troubleshooting: todo
-  docs-examples: todo
+  docs-use-cases: done
+  docs-supported-devices: done
+  docs-supported-functions: done
+  docs-data-update: done
+  docs-known-limitations: done
+  docs-troubleshooting: done
+  docs-examples: done
 
   # Platinum
   async-dependency: done
diff --git a/homeassistant/components/sensibo/select.py b/homeassistant/components/sensibo/select.py
index 51521b59f03..5a0546b1aa2 100644
--- a/homeassistant/components/sensibo/select.py
+++ b/homeassistant/components/sensibo/select.py
@@ -17,7 +17,7 @@ from homeassistant.components.select import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.issue_registry import (
     IssueSeverity,
     async_create_issue,
@@ -67,7 +67,7 @@ DEVICE_SELECT_TYPES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SensiboConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Sensibo select platform."""
 
@@ -115,7 +115,8 @@ async def async_setup_entry(
     def _add_remove_devices() -> None:
         """Handle additions of devices and sensors."""
         nonlocal added_devices
-        new_devices, _, added_devices = coordinator.get_devices(added_devices)
+        new_devices, _, new_added_devices = coordinator.get_devices(added_devices)
+        added_devices = new_added_devices
 
         if new_devices:
             async_add_entities(
diff --git a/homeassistant/components/sensibo/sensor.py b/homeassistant/components/sensibo/sensor.py
index b242f38febe..09f095bfaec 100644
--- a/homeassistant/components/sensibo/sensor.py
+++ b/homeassistant/components/sensibo/sensor.py
@@ -26,7 +26,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import SensiboConfigEntry
@@ -240,7 +240,7 @@ DESCRIPTION_BY_MODELS = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SensiboConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Sensibo sensor platform."""
 
@@ -253,9 +253,8 @@ async def async_setup_entry(
 
         entities: list[SensiboMotionSensor | SensiboDeviceSensor] = []
         nonlocal added_devices
-        new_devices, remove_devices, added_devices = coordinator.get_devices(
-            added_devices
-        )
+        new_devices, _, new_added_devices = coordinator.get_devices(added_devices)
+        added_devices = new_added_devices
 
         if new_devices:
             entities.extend(
diff --git a/homeassistant/components/sensibo/strings.json b/homeassistant/components/sensibo/strings.json
index c5ff0f135e6..0fbcda461c8 100644
--- a/homeassistant/components/sensibo/strings.json
+++ b/homeassistant/components/sensibo/strings.json
@@ -18,7 +18,7 @@
           "api_key": "[%key:common::config_flow::data::api_key%]"
         },
         "data_description": {
-          "api_key": "Follow the [documentation]({url}) to get your api key"
+          "api_key": "Follow the [documentation]({url}) to get your API key"
         }
       },
       "reauth_confirm": {
@@ -330,7 +330,7 @@
       "timer_on_switch": {
         "name": "Timer",
         "state_attributes": {
-          "id": { "name": "Id" },
+          "id": { "name": "ID" },
           "turn_on": {
             "name": "Turns on",
             "state": {
@@ -429,16 +429,16 @@
       }
     },
     "enable_pure_boost": {
-      "name": "Enable pure boost",
+      "name": "Enable Pure Boost",
       "description": "Enables and configures Pure Boost settings.",
       "fields": {
         "ac_integration": {
           "name": "AC integration",
-          "description": "Integrate with Air Conditioner."
+          "description": "Integrate with air conditioner."
         },
         "geo_integration": {
           "name": "Geo integration",
-          "description": "Integrate with Presence."
+          "description": "Integrate with presence."
         },
         "indoor_integration": {
           "name": "Indoor air quality",
@@ -468,7 +468,7 @@
         },
         "fan_mode": {
           "name": "Fan mode",
-          "description": "set fan mode."
+          "description": "Set fan mode."
         },
         "swing_mode": {
           "name": "Swing mode",
@@ -594,7 +594,7 @@
   "issues": {
     "deprecated_entity_horizontalswing": {
       "title": "The Sensibo {name} entity is deprecated",
-      "description": "The Sensibo entity `{entity}` is deprecated and will be removed in a future release.\nPlease update your automations and scripts to use the `horizontal_swing` attribute part of the `climate` entity instead.\n, Disable the `{entity}` and reload the config entry or restart Home Assistant to fix this issue."
+      "description": "The Sensibo entity `{entity}` is deprecated and will be removed in a future release.\nPlease update your automations and scripts to use the `horizontal_swing` attribute part of the `climate` entity instead.\nDisable `{entity}` and reload the config entry or restart Home Assistant to fix this issue."
     }
   }
 }
diff --git a/homeassistant/components/sensibo/switch.py b/homeassistant/components/sensibo/switch.py
index 0bc2c55a706..03e7c12ec2b 100644
--- a/homeassistant/components/sensibo/switch.py
+++ b/homeassistant/components/sensibo/switch.py
@@ -15,7 +15,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SensiboConfigEntry
 from .const import DOMAIN
@@ -78,7 +78,7 @@ DESCRIPTION_BY_MODELS = {"pure": PURE_SWITCH_TYPES}
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SensiboConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Sensibo Switch platform."""
 
@@ -89,7 +89,8 @@ async def async_setup_entry(
     def _add_remove_devices() -> None:
         """Handle additions of devices and sensors."""
         nonlocal added_devices
-        new_devices, _, added_devices = coordinator.get_devices(added_devices)
+        new_devices, _, new_added_devices = coordinator.get_devices(added_devices)
+        added_devices = new_added_devices
 
         if new_devices:
             async_add_entities(
diff --git a/homeassistant/components/sensibo/update.py b/homeassistant/components/sensibo/update.py
index 0b02264b3e0..6f868e5f366 100644
--- a/homeassistant/components/sensibo/update.py
+++ b/homeassistant/components/sensibo/update.py
@@ -14,7 +14,7 @@ from homeassistant.components.update import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SensiboConfigEntry
 from .coordinator import SensiboDataUpdateCoordinator
@@ -45,7 +45,7 @@ DEVICE_SENSOR_TYPES: tuple[SensiboDeviceUpdateEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SensiboConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Sensibo Update platform."""
 
@@ -56,7 +56,8 @@ async def async_setup_entry(
     def _add_remove_devices() -> None:
         """Handle additions of devices and sensors."""
         nonlocal added_devices
-        new_devices, _, added_devices = coordinator.get_devices(added_devices)
+        new_devices, _, new_added_devices = coordinator.get_devices(added_devices)
+        added_devices = new_added_devices
 
         if new_devices:
             async_add_entities(
diff --git a/homeassistant/components/sensirion_ble/sensor.py b/homeassistant/components/sensirion_ble/sensor.py
index a7254fd3609..16f7571f392 100644
--- a/homeassistant/components/sensirion_ble/sensor.py
+++ b/homeassistant/components/sensirion_ble/sensor.py
@@ -30,7 +30,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from .const import DOMAIN
@@ -106,7 +106,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Sensirion BLE sensors."""
     coordinator: PassiveBluetoothProcessorCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/sensor/__init__.py b/homeassistant/components/sensor/__init__.py
index 89f39d4fb8c..e06ee85cd03 100644
--- a/homeassistant/components/sensor/__init__.py
+++ b/homeassistant/components/sensor/__init__.py
@@ -44,6 +44,7 @@ from .const import (  # noqa: F401
     DEVICE_CLASSES_SCHEMA,
     DOMAIN,
     NON_NUMERIC_DEVICE_CLASSES,
+    STATE_CLASS_UNITS,
     STATE_CLASSES,
     STATE_CLASSES_SCHEMA,
     UNIT_CONVERTERS,
@@ -675,22 +676,13 @@ class SensorEntity(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
             ):
                 # Deduce the precision by finding the decimal point, if any
                 value_s = str(value)
-                precision = (
-                    len(value_s) - value_s.index(".") - 1 if "." in value_s else 0
-                )
-
                 # Scale the precision when converting to a larger unit
                 # For example 1.1 Wh should be rendered as 0.0011 kWh, not 0.0 kWh
-                ratio_log = max(
-                    0,
-                    log10(
-                        converter.get_unit_ratio(
-                            native_unit_of_measurement, unit_of_measurement
-                        )
-                    ),
+                precision = (
+                    len(value_s) - value_s.index(".") - 1 if "." in value_s else 0
+                ) + converter.get_unit_floored_log_ratio(
+                    native_unit_of_measurement, unit_of_measurement
                 )
-                precision = precision + floor(ratio_log)
-
                 value = f"{converted_numerical_value:z.{precision}f}"
             else:
                 value = converted_numerical_value
@@ -722,6 +714,18 @@ class SensorEntity(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
                 report_issue,
             )
 
+        # Validate unit of measurement used for sensors with a state class
+        if (
+            state_class
+            and (units := STATE_CLASS_UNITS.get(state_class)) is not None
+            and native_unit_of_measurement not in units
+        ):
+            raise ValueError(
+                f"Sensor {self.entity_id} ({type(self)}) is using native unit of "
+                f"measurement '{native_unit_of_measurement}' which is not a valid unit "
+                f"for the state class ('{state_class}') it is using; expected one of {units};"
+            )
+
         return value
 
     def _display_precision_or_none(self) -> int | None:
diff --git a/homeassistant/components/sensor/const.py b/homeassistant/components/sensor/const.py
index aaa14f4637c..63af8e5bf52 100644
--- a/homeassistant/components/sensor/const.py
+++ b/homeassistant/components/sensor/const.py
@@ -11,6 +11,7 @@ from homeassistant.const import (
     CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     CONCENTRATION_PARTS_PER_BILLION,
     CONCENTRATION_PARTS_PER_MILLION,
+    DEGREE,
     LIGHT_LUX,
     PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS,
@@ -23,6 +24,7 @@ from homeassistant.const import (
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
+    UnitOfEnergyDistance,
     UnitOfFrequency,
     UnitOfInformation,
     UnitOfIrradiance,
@@ -51,6 +53,7 @@ from homeassistant.util.unit_conversion import (
     ElectricCurrentConverter,
     ElectricPotentialConverter,
     EnergyConverter,
+    EnergyDistanceConverter,
     InformationConverter,
     MassConverter,
     PowerConverter,
@@ -183,7 +186,7 @@ class SensorDeviceClass(StrEnum):
     DURATION = "duration"
     """Fixed duration.
 
-    Unit of measurement: `d`, `h`, `min`, `s`, `ms`
+    Unit of measurement: `d`, `h`, `min`, `s`, `ms`, `µs`
     """
 
     ENERGY = "energy"
@@ -194,6 +197,15 @@ class SensorDeviceClass(StrEnum):
     Unit of measurement: `J`, `kJ`, `MJ`, `GJ`, `mWh`, `Wh`, `kWh`, `MWh`, `GWh`, `TWh`, `cal`, `kcal`, `Mcal`, `Gcal`
     """
 
+    ENERGY_DISTANCE = "energy_distance"
+    """Energy distance.
+
+    Use this device class for sensors measuring energy by distance, for example the amount
+    of electric energy consumed by an electric car.
+
+    Unit of measurement: `kWh/100km`, `mi/kWh`, `km/kWh`
+    """
+
     ENERGY_STORAGE = "energy_storage"
     """Stored energy.
 
@@ -443,6 +455,12 @@ class SensorDeviceClass(StrEnum):
     - USCS / imperial: `oz`, `lb`
     """
 
+    WIND_DIRECTION = "wind_direction"
+    """Wind direction.
+
+    Unit of measurement: `°`
+    """
+
     WIND_SPEED = "wind_speed"
     """Wind speed.
 
@@ -473,6 +491,9 @@ class SensorStateClass(StrEnum):
     MEASUREMENT = "measurement"
     """The state represents a measurement in present time."""
 
+    MEASUREMENT_ANGLE = "measurement_angle"
+    """The state represents a angle measurement in present time. Currently only degrees are supported."""
+
     TOTAL = "total"
     """The state represents a total amount.
 
@@ -500,6 +521,7 @@ UNIT_CONVERTERS: dict[SensorDeviceClass | str | None, type[BaseUnitConverter]] =
     SensorDeviceClass.DISTANCE: DistanceConverter,
     SensorDeviceClass.DURATION: DurationConverter,
     SensorDeviceClass.ENERGY: EnergyConverter,
+    SensorDeviceClass.ENERGY_DISTANCE: EnergyDistanceConverter,
     SensorDeviceClass.ENERGY_STORAGE: EnergyConverter,
     SensorDeviceClass.GAS: VolumeConverter,
     SensorDeviceClass.POWER: PowerConverter,
@@ -539,8 +561,10 @@ DEVICE_CLASS_UNITS: dict[SensorDeviceClass, set[type[StrEnum] | str | None]] = {
         UnitOfTime.MINUTES,
         UnitOfTime.SECONDS,
         UnitOfTime.MILLISECONDS,
+        UnitOfTime.MICROSECONDS,
     },
     SensorDeviceClass.ENERGY: set(UnitOfEnergy),
+    SensorDeviceClass.ENERGY_DISTANCE: set(UnitOfEnergyDistance),
     SensorDeviceClass.ENERGY_STORAGE: set(UnitOfEnergy),
     SensorDeviceClass.FREQUENCY: set(UnitOfFrequency),
     SensorDeviceClass.GAS: {
@@ -562,6 +586,7 @@ DEVICE_CLASS_UNITS: dict[SensorDeviceClass, set[type[StrEnum] | str | None]] = {
     SensorDeviceClass.PM25: {CONCENTRATION_MICROGRAMS_PER_CUBIC_METER},
     SensorDeviceClass.POWER_FACTOR: {PERCENTAGE, None},
     SensorDeviceClass.POWER: {
+        UnitOfPower.MILLIWATT,
         UnitOfPower.WATT,
         UnitOfPower.KILO_WATT,
         UnitOfPower.MEGA_WATT,
@@ -577,7 +602,7 @@ DEVICE_CLASS_UNITS: dict[SensorDeviceClass, set[type[StrEnum] | str | None]] = {
         SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     },
     SensorDeviceClass.SOUND_PRESSURE: set(UnitOfSoundPressure),
-    SensorDeviceClass.SPEED: set(UnitOfSpeed).union(set(UnitOfVolumetricFlux)),
+    SensorDeviceClass.SPEED: {*UnitOfSpeed, *UnitOfVolumetricFlux},
     SensorDeviceClass.SULPHUR_DIOXIDE: {CONCENTRATION_MICROGRAMS_PER_CUBIC_METER},
     SensorDeviceClass.TEMPERATURE: set(UnitOfTemperature),
     SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS: {
@@ -599,6 +624,7 @@ DEVICE_CLASS_UNITS: dict[SensorDeviceClass, set[type[StrEnum] | str | None]] = {
         UnitOfVolume.LITERS,
     },
     SensorDeviceClass.WEIGHT: set(UnitOfMass),
+    SensorDeviceClass.WIND_DIRECTION: {DEGREE},
     SensorDeviceClass.WIND_SPEED: set(UnitOfSpeed),
 }
 
@@ -622,6 +648,7 @@ DEVICE_CLASS_STATE_CLASSES: dict[SensorDeviceClass, set[SensorStateClass]] = {
         SensorStateClass.TOTAL,
         SensorStateClass.TOTAL_INCREASING,
     },
+    SensorDeviceClass.ENERGY_DISTANCE: {SensorStateClass.MEASUREMENT},
     SensorDeviceClass.ENERGY_STORAGE: {SensorStateClass.MEASUREMENT},
     SensorDeviceClass.ENUM: set(),
     SensorDeviceClass.FREQUENCY: {SensorStateClass.MEASUREMENT},
@@ -669,5 +696,11 @@ DEVICE_CLASS_STATE_CLASSES: dict[SensorDeviceClass, set[SensorStateClass]] = {
         SensorStateClass.TOTAL,
         SensorStateClass.TOTAL_INCREASING,
     },
+    SensorDeviceClass.WIND_DIRECTION: {SensorStateClass.MEASUREMENT_ANGLE},
     SensorDeviceClass.WIND_SPEED: {SensorStateClass.MEASUREMENT},
 }
+
+
+STATE_CLASS_UNITS: dict[SensorStateClass | str, set[type[StrEnum] | str | None]] = {
+    SensorStateClass.MEASUREMENT_ANGLE: {DEGREE},
+}
diff --git a/homeassistant/components/sensor/device_condition.py b/homeassistant/components/sensor/device_condition.py
index fc25dce18fc..f52393f28ff 100644
--- a/homeassistant/components/sensor/device_condition.py
+++ b/homeassistant/components/sensor/device_condition.py
@@ -48,6 +48,7 @@ CONF_IS_DATA_SIZE = "is_data_size"
 CONF_IS_DISTANCE = "is_distance"
 CONF_IS_DURATION = "is_duration"
 CONF_IS_ENERGY = "is_energy"
+CONF_IS_ENERGY_DISTANCE = "is_energy_distance"
 CONF_IS_FREQUENCY = "is_frequency"
 CONF_IS_HUMIDITY = "is_humidity"
 CONF_IS_GAS = "is_gas"
@@ -82,6 +83,7 @@ CONF_IS_VOLUME = "is_volume"
 CONF_IS_VOLUME_FLOW_RATE = "is_volume_flow_rate"
 CONF_IS_WATER = "is_water"
 CONF_IS_WEIGHT = "is_weight"
+CONF_IS_WIND_DIRECTION = "is_wind_direction"
 CONF_IS_WIND_SPEED = "is_wind_speed"
 
 ENTITY_CONDITIONS = {
@@ -102,6 +104,7 @@ ENTITY_CONDITIONS = {
     SensorDeviceClass.DISTANCE: [{CONF_TYPE: CONF_IS_DISTANCE}],
     SensorDeviceClass.DURATION: [{CONF_TYPE: CONF_IS_DURATION}],
     SensorDeviceClass.ENERGY: [{CONF_TYPE: CONF_IS_ENERGY}],
+    SensorDeviceClass.ENERGY_DISTANCE: [{CONF_TYPE: CONF_IS_ENERGY_DISTANCE}],
     SensorDeviceClass.ENERGY_STORAGE: [{CONF_TYPE: CONF_IS_ENERGY}],
     SensorDeviceClass.FREQUENCY: [{CONF_TYPE: CONF_IS_FREQUENCY}],
     SensorDeviceClass.GAS: [{CONF_TYPE: CONF_IS_GAS}],
@@ -143,6 +146,7 @@ ENTITY_CONDITIONS = {
     SensorDeviceClass.VOLUME_FLOW_RATE: [{CONF_TYPE: CONF_IS_VOLUME_FLOW_RATE}],
     SensorDeviceClass.WATER: [{CONF_TYPE: CONF_IS_WATER}],
     SensorDeviceClass.WEIGHT: [{CONF_TYPE: CONF_IS_WEIGHT}],
+    SensorDeviceClass.WIND_DIRECTION: [{CONF_TYPE: CONF_IS_WIND_DIRECTION}],
     SensorDeviceClass.WIND_SPEED: [{CONF_TYPE: CONF_IS_WIND_SPEED}],
     DEVICE_CLASS_NONE: [{CONF_TYPE: CONF_IS_VALUE}],
 }
@@ -168,6 +172,7 @@ CONDITION_SCHEMA = vol.All(
                     CONF_IS_DISTANCE,
                     CONF_IS_DURATION,
                     CONF_IS_ENERGY,
+                    CONF_IS_ENERGY_DISTANCE,
                     CONF_IS_FREQUENCY,
                     CONF_IS_GAS,
                     CONF_IS_HUMIDITY,
@@ -201,6 +206,7 @@ CONDITION_SCHEMA = vol.All(
                     CONF_IS_VOLUME_FLOW_RATE,
                     CONF_IS_WATER,
                     CONF_IS_WEIGHT,
+                    CONF_IS_WIND_DIRECTION,
                     CONF_IS_WIND_SPEED,
                     CONF_IS_VALUE,
                 ]
diff --git a/homeassistant/components/sensor/device_trigger.py b/homeassistant/components/sensor/device_trigger.py
index d75b3aa6e41..dee48434294 100644
--- a/homeassistant/components/sensor/device_trigger.py
+++ b/homeassistant/components/sensor/device_trigger.py
@@ -47,6 +47,7 @@ CONF_DATA_SIZE = "data_size"
 CONF_DISTANCE = "distance"
 CONF_DURATION = "duration"
 CONF_ENERGY = "energy"
+CONF_ENERGY_DISTANCE = "energy_distance"
 CONF_FREQUENCY = "frequency"
 CONF_GAS = "gas"
 CONF_HUMIDITY = "humidity"
@@ -81,6 +82,7 @@ CONF_VOLUME = "volume"
 CONF_VOLUME_FLOW_RATE = "volume_flow_rate"
 CONF_WATER = "water"
 CONF_WEIGHT = "weight"
+CONF_WIND_DIRECTION = "wind_direction"
 CONF_WIND_SPEED = "wind_speed"
 
 ENTITY_TRIGGERS = {
@@ -101,6 +103,7 @@ ENTITY_TRIGGERS = {
     SensorDeviceClass.DISTANCE: [{CONF_TYPE: CONF_DISTANCE}],
     SensorDeviceClass.DURATION: [{CONF_TYPE: CONF_DURATION}],
     SensorDeviceClass.ENERGY: [{CONF_TYPE: CONF_ENERGY}],
+    SensorDeviceClass.ENERGY_DISTANCE: [{CONF_TYPE: CONF_ENERGY_DISTANCE}],
     SensorDeviceClass.ENERGY_STORAGE: [{CONF_TYPE: CONF_ENERGY}],
     SensorDeviceClass.FREQUENCY: [{CONF_TYPE: CONF_FREQUENCY}],
     SensorDeviceClass.GAS: [{CONF_TYPE: CONF_GAS}],
@@ -142,6 +145,7 @@ ENTITY_TRIGGERS = {
     SensorDeviceClass.VOLUME_FLOW_RATE: [{CONF_TYPE: CONF_VOLUME_FLOW_RATE}],
     SensorDeviceClass.WATER: [{CONF_TYPE: CONF_WATER}],
     SensorDeviceClass.WEIGHT: [{CONF_TYPE: CONF_WEIGHT}],
+    SensorDeviceClass.WIND_DIRECTION: [{CONF_TYPE: CONF_WIND_DIRECTION}],
     SensorDeviceClass.WIND_SPEED: [{CONF_TYPE: CONF_WIND_SPEED}],
     DEVICE_CLASS_NONE: [{CONF_TYPE: CONF_VALUE}],
 }
@@ -168,6 +172,7 @@ TRIGGER_SCHEMA = vol.All(
                     CONF_DISTANCE,
                     CONF_DURATION,
                     CONF_ENERGY,
+                    CONF_ENERGY_DISTANCE,
                     CONF_FREQUENCY,
                     CONF_GAS,
                     CONF_HUMIDITY,
@@ -201,6 +206,7 @@ TRIGGER_SCHEMA = vol.All(
                     CONF_VOLUME_FLOW_RATE,
                     CONF_WATER,
                     CONF_WEIGHT,
+                    CONF_WIND_DIRECTION,
                     CONF_WIND_SPEED,
                     CONF_VALUE,
                 ]
diff --git a/homeassistant/components/sensor/icons.json b/homeassistant/components/sensor/icons.json
index 5f770765ee3..497c1544b3b 100644
--- a/homeassistant/components/sensor/icons.json
+++ b/homeassistant/components/sensor/icons.json
@@ -156,6 +156,9 @@
     "weight": {
       "default": "mdi:weight"
     },
+    "wind_direction": {
+      "default": "mdi:compass-rose"
+    },
     "wind_speed": {
       "default": "mdi:weather-windy"
     }
diff --git a/homeassistant/components/sensor/recorder.py b/homeassistant/components/sensor/recorder.py
index 675d24b9240..cb80fa7d2ce 100644
--- a/homeassistant/components/sensor/recorder.py
+++ b/homeassistant/components/sensor/recorder.py
@@ -5,6 +5,7 @@ from __future__ import annotations
 from collections import defaultdict
 from collections.abc import Callable, Iterable
 from contextlib import suppress
+from dataclasses import dataclass
 import datetime
 import itertools
 import logging
@@ -21,6 +22,7 @@ from homeassistant.components.recorder import (
 )
 from homeassistant.components.recorder.models import (
     StatisticData,
+    StatisticMeanType,
     StatisticMetaData,
     StatisticResult,
 )
@@ -52,10 +54,22 @@ from .const import (
 
 _LOGGER = logging.getLogger(__name__)
 
+
+@dataclass
+class _StatisticsConfig:
+    types: set[str]
+    mean_type: StatisticMeanType = StatisticMeanType.NONE
+
+
 DEFAULT_STATISTICS = {
-    SensorStateClass.MEASUREMENT: {"mean", "min", "max"},
-    SensorStateClass.TOTAL: {"sum"},
-    SensorStateClass.TOTAL_INCREASING: {"sum"},
+    SensorStateClass.MEASUREMENT: _StatisticsConfig(
+        {"mean", "min", "max"}, StatisticMeanType.ARITHMETIC
+    ),
+    SensorStateClass.MEASUREMENT_ANGLE: _StatisticsConfig(
+        {"mean"}, StatisticMeanType.CIRCULAR
+    ),
+    SensorStateClass.TOTAL: _StatisticsConfig({"sum"}),
+    SensorStateClass.TOTAL_INCREASING: _StatisticsConfig({"sum"}),
 }
 
 EQUIVALENT_UNITS = {
@@ -76,8 +90,15 @@ WARN_NEGATIVE: HassKey[set[str]] = HassKey(f"{DOMAIN}_warn_total_increasing_nega
 # Keep track of entities for which a warning about unsupported unit has been logged
 WARN_UNSUPPORTED_UNIT: HassKey[set[str]] = HassKey(f"{DOMAIN}_warn_unsupported_unit")
 WARN_UNSTABLE_UNIT: HassKey[set[str]] = HassKey(f"{DOMAIN}_warn_unstable_unit")
+# Keep track of entities for which a warning about statistics mean algorithm change has been logged
+WARN_STATISTICS_MEAN_CHANGED: HassKey[set[str]] = HassKey(
+    f"{DOMAIN}_warn_statistics_mean_change"
+)
 # Link to dev statistics where issues around LTS can be fixed
 LINK_DEV_STATISTICS = "https://my.home-assistant.io/redirect/developer_statistics"
+STATE_CLASS_REMOVED_ISSUE = "state_class_removed"
+UNITS_CHANGED_ISSUE = "units_changed"
+MEAN_TYPE_CHANGED_ISSUE = "mean_type_changed"
 
 
 def _get_sensor_states(hass: HomeAssistant) -> list[State]:
@@ -99,7 +120,7 @@ def _get_sensor_states(hass: HomeAssistant) -> list[State]:
     ]
 
 
-def _time_weighted_average(
+def _time_weighted_arithmetic_mean(
     fstates: list[tuple[float, State]], start: datetime.datetime, end: datetime.datetime
 ) -> float:
     """Calculate a time weighted average.
@@ -134,16 +155,44 @@ def _time_weighted_average(
         duration = end - old_start_time
         accumulated += old_fstate * duration.total_seconds()
 
-    period_seconds = (end - start).total_seconds()
-    if period_seconds == 0:
-        # If the only state changed that happened was at the exact moment
-        # at the end of the period, we can't calculate a meaningful average
-        # so we return 0.0 since it represents a time duration smaller than
-        # we can measure. This probably means the precision of statistics
-        # column schema in the database is incorrect but it is actually possible
-        # to happen if the state change event fired at the exact microsecond
-        return 0.0
-    return accumulated / period_seconds
+    return accumulated / (end - start).total_seconds()
+
+
+def _time_weighted_circular_mean(
+    fstates: list[tuple[float, State]], start: datetime.datetime, end: datetime.datetime
+) -> float:
+    """Calculate a time weighted circular mean.
+
+    The circular mean is calculated by weighting the states by duration in seconds between
+    state changes.
+    Note: there's no interpolation of values between state changes.
+    """
+    old_fstate: float | None = None
+    old_start_time: datetime.datetime | None = None
+    values: list[tuple[float, float]] = []
+
+    for fstate, state in fstates:
+        # The recorder will give us the last known state, which may be well
+        # before the requested start time for the statistics
+        start_time = max(state.last_updated, start)
+        if old_start_time is None:
+            # Adjust start time, if there was no last known state
+            start = start_time
+        else:
+            duration = (start_time - old_start_time).total_seconds()
+            assert old_fstate is not None
+            values.append((old_fstate, duration))
+
+        old_fstate = fstate
+        old_start_time = start_time
+
+    if old_fstate is not None:
+        # Add last value weighted by duration until end of the period
+        assert old_start_time is not None
+        duration = (end - old_start_time).total_seconds()
+        values.append((old_fstate, duration))
+
+    return statistics.weighted_circular_mean(values)
 
 
 def _get_units(fstates: list[tuple[float, State]]) -> set[str | None]:
@@ -371,7 +420,7 @@ def reset_detected(
     return fstate < 0.9 * previous_fstate
 
 
-def _wanted_statistics(sensor_states: list[State]) -> dict[str, set[str]]:
+def _wanted_statistics(sensor_states: list[State]) -> dict[str, _StatisticsConfig]:
     """Prepare a dict with wanted statistics for entities."""
     return {
         state.entity_id: DEFAULT_STATISTICS[state.attributes[ATTR_STATE_CLASS]]
@@ -415,7 +464,9 @@ def compile_statistics(  # noqa: C901
     wanted_statistics = _wanted_statistics(sensor_states)
     # Get history between start and end
     entities_full_history = [
-        i.entity_id for i in sensor_states if "sum" in wanted_statistics[i.entity_id]
+        i.entity_id
+        for i in sensor_states
+        if "sum" in wanted_statistics[i.entity_id].types
     ]
     history_list: dict[str, list[State]] = {}
     if entities_full_history:
@@ -430,7 +481,7 @@ def compile_statistics(  # noqa: C901
     entities_significant_history = [
         i.entity_id
         for i in sensor_states
-        if "sum" not in wanted_statistics[i.entity_id]
+        if "sum" not in wanted_statistics[i.entity_id].types
     ]
     if entities_significant_history:
         _history_list = history.get_full_significant_states_with_session(
@@ -447,7 +498,11 @@ def compile_statistics(  # noqa: C901
         entity_id = _state.entity_id
         # If there are no recent state changes, the sensor's state may already be pruned
         # from the recorder. Get the state from the state machine instead.
-        if not (entity_history := history_list.get(entity_id, [_state])):
+        try:
+            entity_history = history_list[entity_id]
+        except KeyError:
+            entity_history = [_state] if _state.last_changed < end else []
+        if not entity_history:
             continue
         if not (float_states := _entity_history_to_float_and_state(entity_history)):
             continue
@@ -476,7 +531,7 @@ def compile_statistics(  # noqa: C901
             continue
         state_class: str = _state.attributes[ATTR_STATE_CLASS]
         to_process.append((entity_id, statistics_unit, state_class, valid_float_states))
-        if "sum" in wanted_statistics[entity_id]:
+        if "sum" in wanted_statistics[entity_id].types:
             to_query.add(entity_id)
 
     last_stats = statistics.get_latest_short_term_statistics_with_session(
@@ -488,6 +543,10 @@ def compile_statistics(  # noqa: C901
         state_class,
         valid_float_states,
     ) in to_process:
+        mean_type = StatisticMeanType.NONE
+        if "mean" in wanted_statistics[entity_id].types:
+            mean_type = wanted_statistics[entity_id].mean_type
+
         # Check metadata
         if old_metadata := old_metadatas.get(entity_id):
             if not _equivalent_units(
@@ -513,10 +572,34 @@ def compile_statistics(  # noqa: C901
                     )
                 continue
 
+            if (
+                mean_type is not StatisticMeanType.NONE
+                and (old_mean_type := old_metadata[1]["mean_type"])
+                is not StatisticMeanType.NONE
+                and mean_type != old_mean_type
+            ):
+                if WARN_STATISTICS_MEAN_CHANGED not in hass.data:
+                    hass.data[WARN_STATISTICS_MEAN_CHANGED] = set()
+                if entity_id not in hass.data[WARN_STATISTICS_MEAN_CHANGED]:
+                    hass.data[WARN_STATISTICS_MEAN_CHANGED].add(entity_id)
+                    _LOGGER.warning(
+                        (
+                            "The statistics mean algorithm for %s have changed from %s to %s."
+                            " Generation of long term statistics will be suppressed"
+                            " unless it changes back or go to %s to delete the old"
+                            " statistics"
+                        ),
+                        entity_id,
+                        old_mean_type.name,
+                        mean_type.name,
+                        LINK_DEV_STATISTICS,
+                    )
+                continue
+
         # Set meta data
         meta: StatisticMetaData = {
-            "has_mean": "mean" in wanted_statistics[entity_id],
-            "has_sum": "sum" in wanted_statistics[entity_id],
+            "mean_type": mean_type,
+            "has_sum": "sum" in wanted_statistics[entity_id].types,
             "name": None,
             "source": RECORDER_DOMAIN,
             "statistic_id": entity_id,
@@ -525,19 +608,26 @@ def compile_statistics(  # noqa: C901
 
         # Make calculations
         stat: StatisticData = {"start": start}
-        if "max" in wanted_statistics[entity_id]:
+        if "max" in wanted_statistics[entity_id].types:
             stat["max"] = max(
                 *itertools.islice(zip(*valid_float_states, strict=False), 1)
             )
-        if "min" in wanted_statistics[entity_id]:
+        if "min" in wanted_statistics[entity_id].types:
             stat["min"] = min(
                 *itertools.islice(zip(*valid_float_states, strict=False), 1)
             )
 
-        if "mean" in wanted_statistics[entity_id]:
-            stat["mean"] = _time_weighted_average(valid_float_states, start, end)
+        match mean_type:
+            case StatisticMeanType.ARITHMETIC:
+                stat["mean"] = _time_weighted_arithmetic_mean(
+                    valid_float_states, start, end
+                )
+            case StatisticMeanType.CIRCULAR:
+                stat["mean"] = _time_weighted_circular_mean(
+                    valid_float_states, start, end
+                )
 
-        if "sum" in wanted_statistics[entity_id]:
+        if "sum" in wanted_statistics[entity_id].types:
             last_reset = old_last_reset = None
             new_state = old_state = None
             _sum = 0.0
@@ -661,18 +751,25 @@ def list_statistic_ids(
         attributes = state.attributes
         state_class = attributes[ATTR_STATE_CLASS]
         provided_statistics = DEFAULT_STATISTICS[state_class]
-        if statistic_type is not None and statistic_type not in provided_statistics:
+        if (
+            statistic_type is not None
+            and statistic_type not in provided_statistics.types
+        ):
             continue
 
         if (
-            (has_sum := "sum" in provided_statistics)
+            (has_sum := "sum" in provided_statistics.types)
             and ATTR_LAST_RESET not in attributes
             and state_class == SensorStateClass.MEASUREMENT
         ):
             continue
 
+        mean_type = StatisticMeanType.NONE
+        if "mean" in provided_statistics.types:
+            mean_type = provided_statistics.mean_type
+
         result[entity_id] = {
-            "has_mean": "mean" in provided_statistics,
+            "mean_type": mean_type,
             "has_sum": has_sum,
             "name": None,
             "source": RECORDER_DOMAIN,
@@ -702,7 +799,7 @@ def _update_issues(
             if numeric and state_class is None:
                 # Sensor no longer has a valid state class
                 report_issue(
-                    "state_class_removed",
+                    STATE_CLASS_REMOVED_ISSUE,
                     entity_id,
                     {"statistic_id": entity_id},
                 )
@@ -713,7 +810,7 @@ def _update_issues(
                 if numeric and not _equivalent_units({state_unit, metadata_unit}):
                     # The unit has changed, and it's not possible to convert
                     report_issue(
-                        "units_changed",
+                        UNITS_CHANGED_ISSUE,
                         entity_id,
                         {
                             "statistic_id": entity_id,
@@ -727,7 +824,7 @@ def _update_issues(
                 valid_units = (unit or "<None>" for unit in converter.VALID_UNITS)
                 valid_units_str = ", ".join(sorted(valid_units))
                 report_issue(
-                    "units_changed",
+                    UNITS_CHANGED_ISSUE,
                     entity_id,
                     {
                         "statistic_id": entity_id,
@@ -737,6 +834,23 @@ def _update_issues(
                     },
                 )
 
+            if (
+                (metadata_mean_type := metadata[1]["mean_type"]) is not None
+                and state_class
+                and (state_mean_type := DEFAULT_STATISTICS[state_class].mean_type)
+                != metadata_mean_type
+            ):
+                # The mean type has changed and the old statistics are not valid anymore
+                report_issue(
+                    MEAN_TYPE_CHANGED_ISSUE,
+                    entity_id,
+                    {
+                        "statistic_id": entity_id,
+                        "metadata_mean_type": metadata_mean_type,
+                        "state_mean_type": state_mean_type,
+                    },
+                )
+
 
 def update_statistics_issues(
     hass: HomeAssistant,
@@ -759,7 +873,11 @@ def update_statistics_issues(
                 issue.domain != DOMAIN
                 or not (issue_data := issue.data)
                 or issue_data.get("issue_type")
-                not in ("state_class_removed", "units_changed")
+                not in (
+                    STATE_CLASS_REMOVED_ISSUE,
+                    UNITS_CHANGED_ISSUE,
+                    MEAN_TYPE_CHANGED_ISSUE,
+                )
             ):
                 continue
             issues.add(issue.issue_id)
diff --git a/homeassistant/components/sensor/strings.json b/homeassistant/components/sensor/strings.json
index d44d621f82d..fe6684a9ca4 100644
--- a/homeassistant/components/sensor/strings.json
+++ b/homeassistant/components/sensor/strings.json
@@ -17,6 +17,7 @@
       "is_distance": "Current {entity_name} distance",
       "is_duration": "Current {entity_name} duration",
       "is_energy": "Current {entity_name} energy",
+      "is_energy_distance": "Current {entity_name} energy per distance",
       "is_frequency": "Current {entity_name} frequency",
       "is_gas": "Current {entity_name} gas",
       "is_humidity": "Current {entity_name} humidity",
@@ -51,6 +52,7 @@
       "is_volume_flow_rate": "Current {entity_name} volume flow rate",
       "is_water": "Current {entity_name} water",
       "is_weight": "Current {entity_name} weight",
+      "is_wind_direction": "Current {entity_name} wind direction",
       "is_wind_speed": "Current {entity_name} wind speed"
     },
     "trigger_type": {
@@ -69,6 +71,7 @@
       "distance": "{entity_name} distance changes",
       "duration": "{entity_name} duration changes",
       "energy": "{entity_name} energy changes",
+      "energy_distance": "{entity_name} energy per distance changes",
       "frequency": "{entity_name} frequency changes",
       "gas": "{entity_name} gas changes",
       "humidity": "{entity_name} humidity changes",
@@ -103,6 +106,7 @@
       "volume_flow_rate": "{entity_name} volume flow rate changes",
       "water": "{entity_name} water changes",
       "weight": "{entity_name} weight changes",
+      "wind_direction": "{entity_name} wind direction changes",
       "wind_speed": "{entity_name} wind speed changes"
     },
     "extra_fields": {
@@ -183,6 +187,9 @@
     "energy": {
       "name": "Energy"
     },
+    "energy_distance": {
+      "name": "Energy per distance"
+    },
     "energy_storage": {
       "name": "Stored energy"
     },
@@ -294,11 +301,18 @@
     "weight": {
       "name": "Weight"
     },
+    "wind_direction": {
+      "name": "Wind direction"
+    },
     "wind_speed": {
       "name": "Wind speed"
     }
   },
   "issues": {
+    "mean_type_changed": {
+      "title": "The mean type of {statistic_id} has changed",
+      "description": ""
+    },
     "state_class_removed": {
       "title": "{statistic_id} no longer has a state class",
       "description": ""
diff --git a/homeassistant/components/sensorpro/sensor.py b/homeassistant/components/sensorpro/sensor.py
index b972aac04fb..997fa0db995 100644
--- a/homeassistant/components/sensorpro/sensor.py
+++ b/homeassistant/components/sensorpro/sensor.py
@@ -29,7 +29,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from .const import DOMAIN
@@ -111,7 +111,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the SensorPro BLE sensors."""
     coordinator: PassiveBluetoothProcessorCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/sensorpush/config_flow.py b/homeassistant/components/sensorpush/config_flow.py
index d826029276b..d3233ac2d5f 100644
--- a/homeassistant/components/sensorpush/config_flow.py
+++ b/homeassistant/components/sensorpush/config_flow.py
@@ -72,7 +72,7 @@ class SensorPushConfigFlow(ConfigFlow, domain=DOMAIN):
                 title=self._discovered_devices[address], data={}
             )
 
-        current_addresses = self._async_current_ids()
+        current_addresses = self._async_current_ids(include_ignore=False)
         for discovery_info in async_discovered_service_info(self.hass, False):
             address = discovery_info.address
             if address in current_addresses or address in self._discovered_devices:
diff --git a/homeassistant/components/sensorpush/sensor.py b/homeassistant/components/sensorpush/sensor.py
index 6eea5c10f78..730277350b5 100644
--- a/homeassistant/components/sensorpush/sensor.py
+++ b/homeassistant/components/sensorpush/sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from . import SensorPushConfigEntry
@@ -97,7 +97,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SensorPushConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the SensorPush BLE sensors."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/sensorpush_cloud/__init__.py b/homeassistant/components/sensorpush_cloud/__init__.py
new file mode 100644
index 00000000000..2d9d299c132
--- /dev/null
+++ b/homeassistant/components/sensorpush_cloud/__init__.py
@@ -0,0 +1,28 @@
+"""The SensorPush Cloud integration."""
+
+from __future__ import annotations
+
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+
+from .coordinator import SensorPushCloudConfigEntry, SensorPushCloudCoordinator
+
+PLATFORMS: list[Platform] = [Platform.SENSOR]
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: SensorPushCloudConfigEntry
+) -> bool:
+    """Set up SensorPush Cloud from a config entry."""
+    coordinator = SensorPushCloudCoordinator(hass, entry)
+    entry.runtime_data = coordinator
+    await coordinator.async_config_entry_first_refresh()
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    return True
+
+
+async def async_unload_entry(
+    hass: HomeAssistant, entry: SensorPushCloudConfigEntry
+) -> bool:
+    """Unload a config entry."""
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/sensorpush_cloud/config_flow.py b/homeassistant/components/sensorpush_cloud/config_flow.py
new file mode 100644
index 00000000000..d06fde2eba1
--- /dev/null
+++ b/homeassistant/components/sensorpush_cloud/config_flow.py
@@ -0,0 +1,64 @@
+"""Config flow for the SensorPush Cloud integration."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from sensorpush_ha import SensorPushCloudApi, SensorPushCloudAuthError
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.selector import (
+    TextSelector,
+    TextSelectorConfig,
+    TextSelectorType,
+)
+
+from .const import DOMAIN, LOGGER
+
+
+class SensorPushCloudConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for SensorPush Cloud."""
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the initial step."""
+        errors: dict[str, str] = {}
+        if user_input is not None:
+            email, password = user_input[CONF_EMAIL], user_input[CONF_PASSWORD]
+            await self.async_set_unique_id(email)
+            self._abort_if_unique_id_configured()
+            clientsession = async_get_clientsession(self.hass)
+            api = SensorPushCloudApi(email, password, clientsession)
+            try:
+                await api.async_authorize()
+            except SensorPushCloudAuthError:
+                errors["base"] = "invalid_auth"
+            except Exception:  # noqa: BLE001
+                LOGGER.exception("Unexpected error")
+                errors["base"] = "unknown"
+            else:
+                return self.async_create_entry(title=email, data=user_input)
+
+        return self.async_show_form(
+            step_id="user",
+            data_schema=vol.Schema(
+                {
+                    vol.Required(CONF_EMAIL): TextSelector(
+                        TextSelectorConfig(
+                            type=TextSelectorType.EMAIL, autocomplete="username"
+                        )
+                    ),
+                    vol.Required(CONF_PASSWORD): TextSelector(
+                        TextSelectorConfig(
+                            type=TextSelectorType.PASSWORD,
+                            autocomplete="current-password",
+                        )
+                    ),
+                }
+            ),
+            errors=errors,
+        )
diff --git a/homeassistant/components/sensorpush_cloud/const.py b/homeassistant/components/sensorpush_cloud/const.py
new file mode 100644
index 00000000000..9e66dacfaba
--- /dev/null
+++ b/homeassistant/components/sensorpush_cloud/const.py
@@ -0,0 +1,12 @@
+"""Constants for the SensorPush Cloud integration."""
+
+from datetime import timedelta
+import logging
+from typing import Final
+
+LOGGER = logging.getLogger(__package__)
+
+DOMAIN: Final = "sensorpush_cloud"
+
+UPDATE_INTERVAL: Final = timedelta(seconds=60)
+MAX_TIME_BETWEEN_UPDATES: Final = UPDATE_INTERVAL * 60
diff --git a/homeassistant/components/sensorpush_cloud/coordinator.py b/homeassistant/components/sensorpush_cloud/coordinator.py
new file mode 100644
index 00000000000..9885538b55a
--- /dev/null
+++ b/homeassistant/components/sensorpush_cloud/coordinator.py
@@ -0,0 +1,45 @@
+"""Coordinator for the SensorPush Cloud integration."""
+
+from __future__ import annotations
+
+from sensorpush_ha import (
+    SensorPushCloudApi,
+    SensorPushCloudData,
+    SensorPushCloudError,
+    SensorPushCloudHelper,
+)
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import LOGGER, UPDATE_INTERVAL
+
+type SensorPushCloudConfigEntry = ConfigEntry[SensorPushCloudCoordinator]
+
+
+class SensorPushCloudCoordinator(DataUpdateCoordinator[dict[str, SensorPushCloudData]]):
+    """SensorPush Cloud coordinator."""
+
+    def __init__(self, hass: HomeAssistant, entry: SensorPushCloudConfigEntry) -> None:
+        """Initialize the coordinator."""
+        super().__init__(
+            hass,
+            LOGGER,
+            name=entry.title,
+            update_interval=UPDATE_INTERVAL,
+            config_entry=entry,
+        )
+        email, password = entry.data[CONF_EMAIL], entry.data[CONF_PASSWORD]
+        clientsession = async_get_clientsession(hass)
+        api = SensorPushCloudApi(email, password, clientsession)
+        self.helper = SensorPushCloudHelper(api)
+
+    async def _async_update_data(self) -> dict[str, SensorPushCloudData]:
+        """Fetch data from API endpoints."""
+        try:
+            return await self.helper.async_get_data()
+        except SensorPushCloudError as e:
+            raise UpdateFailed(e) from e
diff --git a/homeassistant/components/sensorpush_cloud/manifest.json b/homeassistant/components/sensorpush_cloud/manifest.json
new file mode 100644
index 00000000000..ad817251fa1
--- /dev/null
+++ b/homeassistant/components/sensorpush_cloud/manifest.json
@@ -0,0 +1,11 @@
+{
+  "domain": "sensorpush_cloud",
+  "name": "SensorPush Cloud",
+  "codeowners": ["@sstallion"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/sensorpush_cloud",
+  "iot_class": "cloud_polling",
+  "loggers": ["sensorpush_api", "sensorpush_ha"],
+  "quality_scale": "bronze",
+  "requirements": ["sensorpush-api==2.1.1", "sensorpush-ha==1.3.2"]
+}
diff --git a/homeassistant/components/sensorpush_cloud/quality_scale.yaml b/homeassistant/components/sensorpush_cloud/quality_scale.yaml
new file mode 100644
index 00000000000..96816e1d50d
--- /dev/null
+++ b/homeassistant/components/sensorpush_cloud/quality_scale.yaml
@@ -0,0 +1,68 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: Integration does not register custom actions.
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: Integration does not register custom actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup: done
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions:
+    status: exempt
+    comment: Integration does not register custom actions.
+  config-entry-unloading: done
+  docs-configuration-parameters:
+    status: exempt
+    comment: Integration does not support options flow.
+  docs-installation-parameters: todo
+  entity-unavailable: done
+  integration-owner: done
+  log-when-unavailable: done
+  parallel-updates: done
+  reauthentication-flow: todo
+  test-coverage: todo
+
+  # Gold
+  devices: done
+  diagnostics: todo
+  discovery-update-info: todo
+  discovery: todo
+  docs-data-update: todo
+  docs-examples: todo
+  docs-known-limitations: done
+  docs-supported-devices: done
+  docs-supported-functions: done
+  docs-troubleshooting: todo
+  docs-use-cases: todo
+  dynamic-devices: todo
+  entity-category: todo
+  entity-device-class: done
+  entity-disabled-by-default: done
+  entity-translations: todo
+  exception-translations: todo
+  icon-translations: todo
+  reconfiguration-flow: todo
+  repair-issues: todo
+  stale-devices: todo
+
+  # Platinum
+  async-dependency: done
+  inject-websession: done
+  strict-typing: done
diff --git a/homeassistant/components/sensorpush_cloud/sensor.py b/homeassistant/components/sensorpush_cloud/sensor.py
new file mode 100644
index 00000000000..d2855f63a62
--- /dev/null
+++ b/homeassistant/components/sensorpush_cloud/sensor.py
@@ -0,0 +1,158 @@
+"""Support for SensorPush Cloud sensors."""
+
+from __future__ import annotations
+
+from typing import Final
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
+from homeassistant.const import (
+    ATTR_TEMPERATURE,
+    PERCENTAGE,
+    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+    UnitOfElectricPotential,
+    UnitOfLength,
+    UnitOfPressure,
+    UnitOfTemperature,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.typing import StateType
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+from homeassistant.util import dt as dt_util
+
+from .const import DOMAIN, MAX_TIME_BETWEEN_UPDATES
+from .coordinator import SensorPushCloudConfigEntry, SensorPushCloudCoordinator
+
+ATTR_ALTITUDE: Final = "altitude"
+ATTR_ATMOSPHERIC_PRESSURE: Final = "atmospheric_pressure"
+ATTR_BATTERY_VOLTAGE: Final = "battery_voltage"
+ATTR_DEWPOINT: Final = "dewpoint"
+ATTR_HUMIDITY: Final = "humidity"
+ATTR_SIGNAL_STRENGTH: Final = "signal_strength"
+ATTR_VAPOR_PRESSURE: Final = "vapor_pressure"
+
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
+
+SENSORS: Final[tuple[SensorEntityDescription, ...]] = (
+    SensorEntityDescription(
+        key=ATTR_ALTITUDE,
+        device_class=SensorDeviceClass.DISTANCE,
+        entity_registry_enabled_default=False,
+        translation_key="altitude",
+        native_unit_of_measurement=UnitOfLength.FEET,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SensorEntityDescription(
+        key=ATTR_ATMOSPHERIC_PRESSURE,
+        device_class=SensorDeviceClass.ATMOSPHERIC_PRESSURE,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfPressure.INHG,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SensorEntityDescription(
+        key=ATTR_BATTERY_VOLTAGE,
+        device_class=SensorDeviceClass.VOLTAGE,
+        entity_registry_enabled_default=False,
+        translation_key="battery_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SensorEntityDescription(
+        key=ATTR_DEWPOINT,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        entity_registry_enabled_default=False,
+        translation_key="dewpoint",
+        native_unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SensorEntityDescription(
+        key=ATTR_HUMIDITY,
+        device_class=SensorDeviceClass.HUMIDITY,
+        native_unit_of_measurement=PERCENTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SensorEntityDescription(
+        key=ATTR_SIGNAL_STRENGTH,
+        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SensorEntityDescription(
+        key=ATTR_TEMPERATURE,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SensorEntityDescription(
+        key=ATTR_VAPOR_PRESSURE,
+        device_class=SensorDeviceClass.PRESSURE,
+        entity_registry_enabled_default=False,
+        translation_key="vapor_pressure",
+        native_unit_of_measurement=UnitOfPressure.KPA,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: SensorPushCloudConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up SensorPush Cloud sensors."""
+    coordinator = entry.runtime_data
+    async_add_entities(
+        SensorPushCloudSensor(coordinator, entity_description, device_id)
+        for entity_description in SENSORS
+        for device_id in coordinator.data
+    )
+
+
+class SensorPushCloudSensor(
+    CoordinatorEntity[SensorPushCloudCoordinator], SensorEntity
+):
+    """SensorPush Cloud sensor."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: SensorPushCloudCoordinator,
+        entity_description: SensorEntityDescription,
+        device_id: str,
+    ) -> None:
+        """Initialize the sensor."""
+        super().__init__(coordinator)
+        self.entity_description = entity_description
+        self.device_id = device_id
+
+        device = coordinator.data[device_id]
+        self._attr_unique_id = f"{device.device_id}_{entity_description.key}"
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, device.device_id)},
+            manufacturer=device.manufacturer,
+            model=device.model,
+            name=device.name,
+        )
+
+    @property
+    def available(self) -> bool:
+        """Return true if entity is available."""
+        if self.device_id in self.coordinator.data:
+            last_update = self.coordinator.data[self.device_id].last_update
+            if dt_util.utcnow() >= (last_update + MAX_TIME_BETWEEN_UPDATES):
+                return False
+        return super().available
+
+    @property
+    def native_value(self) -> StateType:
+        """Return the value reported by the sensor."""
+        return self.coordinator.data[self.device_id][self.entity_description.key]
diff --git a/homeassistant/components/sensorpush_cloud/strings.json b/homeassistant/components/sensorpush_cloud/strings.json
new file mode 100644
index 00000000000..8467a123b6f
--- /dev/null
+++ b/homeassistant/components/sensorpush_cloud/strings.json
@@ -0,0 +1,40 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "description": "To activate API access, log in to the [Gateway Cloud Dashboard](https://dashboard.sensorpush.com/) and agree to the terms of service. Devices are not available until activated with the SensorPush app on iOS or Android.",
+        "data": {
+          "email": "[%key:common::config_flow::data::email%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "email": "The email address used to log in to the SensorPush Gateway Cloud Dashboard",
+          "password": "The password used to log in to the SensorPush Gateway Cloud Dashboard"
+        }
+      }
+    },
+    "error": {
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
+    }
+  },
+  "entity": {
+    "sensor": {
+      "altitude": {
+        "name": "Altitude"
+      },
+      "battery_voltage": {
+        "name": "Battery voltage"
+      },
+      "dewpoint": {
+        "name": "Dew point"
+      },
+      "vapor_pressure": {
+        "name": "Vapor pressure"
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/sensoterra/__init__.py b/homeassistant/components/sensoterra/__init__.py
index b1428351f09..1559dc10c43 100644
--- a/homeassistant/components/sensoterra/__init__.py
+++ b/homeassistant/components/sensoterra/__init__.py
@@ -4,16 +4,13 @@ from __future__ import annotations
 
 from sensoterra.customerapi import CustomerApi
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_TOKEN, Platform
 from homeassistant.core import HomeAssistant
 
-from .coordinator import SensoterraCoordinator
+from .coordinator import SensoterraConfigEntry, SensoterraCoordinator
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
-type SensoterraConfigEntry = ConfigEntry[SensoterraCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: SensoterraConfigEntry) -> bool:
     """Set up Sensoterra platform based on a configuration entry."""
@@ -24,7 +21,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: SensoterraConfigEntry) -
     api.set_language(hass.config.language)
     api.set_token(entry.data[CONF_TOKEN])
 
-    coordinator = SensoterraCoordinator(hass, api)
+    coordinator = SensoterraCoordinator(hass, entry, api)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
 
diff --git a/homeassistant/components/sensoterra/coordinator.py b/homeassistant/components/sensoterra/coordinator.py
index 2dffdceb443..9020633a2a3 100644
--- a/homeassistant/components/sensoterra/coordinator.py
+++ b/homeassistant/components/sensoterra/coordinator.py
@@ -10,21 +10,29 @@ from sensoterra.customerapi import (
 )
 from sensoterra.probe import Probe, Sensor
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryError
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import LOGGER, SCAN_INTERVAL_MINUTES
 
+type SensoterraConfigEntry = ConfigEntry[SensoterraCoordinator]
+
 
 class SensoterraCoordinator(DataUpdateCoordinator[list[Probe]]):
     """Sensoterra coordinator."""
 
-    def __init__(self, hass: HomeAssistant, api: CustomerApi) -> None:
+    config_entry: SensoterraConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: SensoterraConfigEntry, api: CustomerApi
+    ) -> None:
         """Initialize Sensoterra coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name="Sensoterra probe",
             update_interval=timedelta(minutes=SCAN_INTERVAL_MINUTES),
         )
diff --git a/homeassistant/components/sensoterra/sensor.py b/homeassistant/components/sensoterra/sensor.py
index 7e9f4d0840e..56f47ade212 100644
--- a/homeassistant/components/sensoterra/sensor.py
+++ b/homeassistant/components/sensoterra/sensor.py
@@ -21,13 +21,12 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import SensoterraConfigEntry
 from .const import CONFIGURATION_URL, DOMAIN, SENSOR_EXPIRATION_DAYS
-from .coordinator import SensoterraCoordinator
+from .coordinator import SensoterraConfigEntry, SensoterraCoordinator
 
 
 class ProbeSensorType(StrEnum):
@@ -85,7 +84,7 @@ SENSORS: dict[ProbeSensorType, SensorEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SensoterraConfigEntry,
-    async_add_devices: AddEntitiesCallback,
+    async_add_devices: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Sensoterra sensor."""
 
diff --git a/homeassistant/components/sentry/manifest.json b/homeassistant/components/sentry/manifest.json
index 425225e07ef..4c3a7518085 100644
--- a/homeassistant/components/sentry/manifest.json
+++ b/homeassistant/components/sentry/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/sentry",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["sentry-sdk==1.40.3"]
+  "requirements": ["sentry-sdk==1.45.1"]
 }
diff --git a/homeassistant/components/sentry/strings.json b/homeassistant/components/sentry/strings.json
index efcdb631f3c..22f7b355e0e 100644
--- a/homeassistant/components/sentry/strings.json
+++ b/homeassistant/components/sentry/strings.json
@@ -24,7 +24,7 @@
           "event_handled": "Send handled events",
           "event_third_party_packages": "Send events from third-party packages",
           "logging_event_level": "The log level Sentry will register an event for",
-          "logging_level": "The log level Sentry will record logs as breadcrums for",
+          "logging_level": "The log level Sentry will record events as breadcrumbs for",
           "tracing": "Enable performance tracing",
           "tracing_sample_rate": "Tracing sample rate; between 0.0 and 1.0 (1.0 = 100%)"
         }
diff --git a/homeassistant/components/senz/climate.py b/homeassistant/components/senz/climate.py
index d5749a3f040..48eeee54974 100644
--- a/homeassistant/components/senz/climate.py
+++ b/homeassistant/components/senz/climate.py
@@ -16,7 +16,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, PRECISION_TENTHS, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import SENZDataUpdateCoordinator
@@ -26,7 +26,7 @@ from .const import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the SENZ climate entities from a config entry."""
     coordinator: SENZDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/serial/manifest.json b/homeassistant/components/serial/manifest.json
index cfe9196f596..2a5d3c78737 100644
--- a/homeassistant/components/serial/manifest.json
+++ b/homeassistant/components/serial/manifest.json
@@ -4,5 +4,5 @@
   "codeowners": ["@fabaff"],
   "documentation": "https://www.home-assistant.io/integrations/serial",
   "iot_class": "local_polling",
-  "requirements": ["pyserial-asyncio-fast==0.14"]
+  "requirements": ["pyserial-asyncio-fast==0.16"]
 }
diff --git a/homeassistant/components/serial/sensor.py b/homeassistant/components/serial/sensor.py
index a09401473b2..4d43408397f 100644
--- a/homeassistant/components/serial/sensor.py
+++ b/homeassistant/components/serial/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_NAME, CONF_VALUE_TEMPLATE, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/serial_pm/sensor.py b/homeassistant/components/serial_pm/sensor.py
index b454424591d..570d1ac0d63 100644
--- a/homeassistant/components/serial_pm/sensor.py
+++ b/homeassistant/components/serial_pm/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONCENTRATION_MICROGRAMS_PER_CUBIC_METER, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/sesame/lock.py b/homeassistant/components/sesame/lock.py
index ad8b26f7034..5165d3d4798 100644
--- a/homeassistant/components/sesame/lock.py
+++ b/homeassistant/components/sesame/lock.py
@@ -13,7 +13,7 @@ from homeassistant.components.lock import (
 )
 from homeassistant.const import ATTR_BATTERY_LEVEL, ATTR_DEVICE_ID, CONF_API_KEY
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/seven_segments/image_processing.py b/homeassistant/components/seven_segments/image_processing.py
index 63fd27e0dd0..bda17b75081 100644
--- a/homeassistant/components/seven_segments/image_processing.py
+++ b/homeassistant/components/seven_segments/image_processing.py
@@ -17,7 +17,7 @@ from homeassistant.components.image_processing import (
 )
 from homeassistant.const import CONF_ENTITY_ID, CONF_NAME, CONF_SOURCE
 from homeassistant.core import HomeAssistant, split_entity_id
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/seventeentrack/__init__.py b/homeassistant/components/seventeentrack/__init__.py
index 695ca179966..235a5338cb6 100644
--- a/homeassistant/components/seventeentrack/__init__.py
+++ b/homeassistant/components/seventeentrack/__init__.py
@@ -39,7 +39,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     except SeventeenTrackError as err:
         raise ConfigEntryNotReady from err
 
-    seventeen_coordinator = SeventeenTrackCoordinator(hass, client)
+    seventeen_coordinator = SeventeenTrackCoordinator(hass, entry, client)
 
     await seventeen_coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/seventeentrack/coordinator.py b/homeassistant/components/seventeentrack/coordinator.py
index 3e27f9f0369..107f1d48a21 100644
--- a/homeassistant/components/seventeentrack/coordinator.py
+++ b/homeassistant/components/seventeentrack/coordinator.py
@@ -34,11 +34,17 @@ class SeventeenTrackCoordinator(DataUpdateCoordinator[SeventeenTrackData]):
 
     config_entry: ConfigEntry
 
-    def __init__(self, hass: HomeAssistant, client: SeventeenTrackClient) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        client: SeventeenTrackClient,
+    ) -> None:
         """Initialize."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=DEFAULT_SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/seventeentrack/icons.json b/homeassistant/components/seventeentrack/icons.json
index a5cac0a9f84..c48e147e973 100644
--- a/homeassistant/components/seventeentrack/icons.json
+++ b/homeassistant/components/seventeentrack/icons.json
@@ -19,7 +19,7 @@
       "delivered": {
         "default": "mdi:package"
       },
-      "returned": {
+      "alert": {
         "default": "mdi:package"
       },
       "package": {
diff --git a/homeassistant/components/seventeentrack/manifest.json b/homeassistant/components/seventeentrack/manifest.json
index a130fbe9aee..34019208a14 100644
--- a/homeassistant/components/seventeentrack/manifest.json
+++ b/homeassistant/components/seventeentrack/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["pyseventeentrack"],
-  "requirements": ["pyseventeentrack==1.0.1"]
+  "requirements": ["pyseventeentrack==1.0.2"]
 }
diff --git a/homeassistant/components/seventeentrack/sensor.py b/homeassistant/components/seventeentrack/sensor.py
index dade9efb67c..b0f9d6cd2bd 100644
--- a/homeassistant/components/seventeentrack/sensor.py
+++ b/homeassistant/components/seventeentrack/sensor.py
@@ -9,7 +9,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_FRIENDLY_NAME, ATTR_LOCATION
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -28,7 +28,7 @@ from .const import (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a 17Track sensor entry."""
 
diff --git a/homeassistant/components/seventeentrack/services.yaml b/homeassistant/components/seventeentrack/services.yaml
index d4592dc8aab..45d7c0a530a 100644
--- a/homeassistant/components/seventeentrack/services.yaml
+++ b/homeassistant/components/seventeentrack/services.yaml
@@ -11,7 +11,7 @@ get_packages:
             - "ready_to_be_picked_up"
             - "undelivered"
             - "delivered"
-            - "returned"
+            - "alert"
           translation_key: package_state
     config_entry_id:
       required: true
diff --git a/homeassistant/components/seventeentrack/strings.json b/homeassistant/components/seventeentrack/strings.json
index 982b15ab629..c95a553ae7b 100644
--- a/homeassistant/components/seventeentrack/strings.json
+++ b/homeassistant/components/seventeentrack/strings.json
@@ -57,8 +57,8 @@
       "delivered": {
         "name": "Delivered"
       },
-      "returned": {
-        "name": "Returned"
+      "alert": {
+        "name": "Alert"
       },
       "package": {
         "name": "Package {name}"
@@ -68,7 +68,7 @@
   "services": {
     "get_packages": {
       "name": "Get packages",
-      "description": "Get packages from 17Track",
+      "description": "Queries the 17track API for the latest package data.",
       "fields": {
         "package_state": {
           "name": "Package states",
@@ -82,7 +82,7 @@
     },
     "archive_package": {
       "name": "Archive package",
-      "description": "Archive a package",
+      "description": "Archives a package using the 17track API.",
       "fields": {
         "package_tracking_number": {
           "name": "Package tracking number",
@@ -104,7 +104,7 @@
         "ready_to_be_picked_up": "[%key:component::seventeentrack::entity::sensor::ready_to_be_picked_up::name%]",
         "undelivered": "[%key:component::seventeentrack::entity::sensor::undelivered::name%]",
         "delivered": "[%key:component::seventeentrack::entity::sensor::delivered::name%]",
-        "returned": "[%key:component::seventeentrack::entity::sensor::returned::name%]"
+        "alert": "[%key:component::seventeentrack::entity::sensor::alert::name%]"
       }
     }
   }
diff --git a/homeassistant/components/sfr_box/__init__.py b/homeassistant/components/sfr_box/__init__.py
index 927e3cb0ef2..a56d208d515 100644
--- a/homeassistant/components/sfr_box/__init__.py
+++ b/homeassistant/components/sfr_box/__init__.py
@@ -37,12 +37,18 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     data = DomainData(
         box=box,
-        dsl=SFRDataUpdateCoordinator(hass, box, "dsl", lambda b: b.dsl_get_info()),
-        ftth=SFRDataUpdateCoordinator(hass, box, "ftth", lambda b: b.ftth_get_info()),
-        system=SFRDataUpdateCoordinator(
-            hass, box, "system", lambda b: b.system_get_info()
+        dsl=SFRDataUpdateCoordinator(
+            hass, entry, box, "dsl", lambda b: b.dsl_get_info()
+        ),
+        ftth=SFRDataUpdateCoordinator(
+            hass, entry, box, "ftth", lambda b: b.ftth_get_info()
+        ),
+        system=SFRDataUpdateCoordinator(
+            hass, entry, box, "system", lambda b: b.system_get_info()
+        ),
+        wan=SFRDataUpdateCoordinator(
+            hass, entry, box, "wan", lambda b: b.wan_get_info()
         ),
-        wan=SFRDataUpdateCoordinator(hass, box, "wan", lambda b: b.wan_get_info()),
     )
     # Preload system information
     await data.system.async_config_entry_first_refresh()
diff --git a/homeassistant/components/sfr_box/binary_sensor.py b/homeassistant/components/sfr_box/binary_sensor.py
index 4ef5e87761d..de40291b0b6 100644
--- a/homeassistant/components/sfr_box/binary_sensor.py
+++ b/homeassistant/components/sfr_box/binary_sensor.py
@@ -17,7 +17,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
@@ -62,7 +62,9 @@ WAN_SENSOR_TYPES: tuple[SFRBoxBinarySensorEntityDescription[WanInfo], ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensors."""
     data: DomainData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/sfr_box/button.py b/homeassistant/components/sfr_box/button.py
index bddb1e8f926..9798602ef6b 100644
--- a/homeassistant/components/sfr_box/button.py
+++ b/homeassistant/components/sfr_box/button.py
@@ -21,7 +21,7 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .models import DomainData
@@ -65,7 +65,9 @@ BUTTON_TYPES: tuple[SFRBoxButtonEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the buttons."""
     data: DomainData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/sfr_box/coordinator.py b/homeassistant/components/sfr_box/coordinator.py
index 5877d5a454a..e9cb3c592e1 100644
--- a/homeassistant/components/sfr_box/coordinator.py
+++ b/homeassistant/components/sfr_box/coordinator.py
@@ -8,6 +8,7 @@ from typing import Any
 from sfrbox_api.bridge import SFRBox
 from sfrbox_api.exceptions import SFRBoxError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -18,9 +19,12 @@ _SCAN_INTERVAL = timedelta(minutes=1)
 class SFRDataUpdateCoordinator[_DataT](DataUpdateCoordinator[_DataT | None]):
     """Coordinator to manage data updates."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         box: SFRBox,
         name: str,
         method: Callable[[SFRBox], Coroutine[Any, Any, _DataT | None]],
@@ -28,7 +32,13 @@ class SFRDataUpdateCoordinator[_DataT](DataUpdateCoordinator[_DataT | None]):
         """Initialize coordinator."""
         self.box = box
         self._method = method
-        super().__init__(hass, _LOGGER, name=name, update_interval=_SCAN_INTERVAL)
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=name,
+            update_interval=_SCAN_INTERVAL,
+        )
 
     async def _async_update_data(self) -> _DataT | None:
         """Update data."""
diff --git a/homeassistant/components/sfr_box/sensor.py b/homeassistant/components/sfr_box/sensor.py
index ee3285a8f38..8b495da56c3 100644
--- a/homeassistant/components/sfr_box/sensor.py
+++ b/homeassistant/components/sfr_box/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -123,7 +123,7 @@ DSL_SENSOR_TYPES: tuple[SFRBoxSensorEntityDescription[DslInfo], ...] = (
         entity_registry_enabled_default=False,
         options=[
             "no_defect",
-            "of_frame",
+            "loss_of_frame",
             "loss_of_signal",
             "loss_of_power",
             "loss_of_signal_quality",
@@ -217,7 +217,9 @@ def _get_temperature(value: float | None) -> float | None:
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensors."""
     data: DomainData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/sfr_box/strings.json b/homeassistant/components/sfr_box/strings.json
index 6f0001e97ce..35e9b1869ff 100644
--- a/homeassistant/components/sfr_box/strings.json
+++ b/homeassistant/components/sfr_box/strings.json
@@ -64,11 +64,11 @@
       "dsl_line_status": {
         "name": "DSL line status",
         "state": {
-          "no_defect": "No Defect",
-          "of_frame": "Of Frame",
-          "loss_of_signal": "Loss Of Signal",
-          "loss_of_power": "Loss Of Power",
-          "loss_of_signal_quality": "Loss Of Signal Quality",
+          "no_defect": "No defect",
+          "loss_of_frame": "Loss of frame",
+          "loss_of_signal": "Loss of signal",
+          "loss_of_power": "Loss of power",
+          "loss_of_signal_quality": "Loss of signal quality",
           "unknown": "Unknown"
         }
       },
diff --git a/homeassistant/components/sharkiq/coordinator.py b/homeassistant/components/sharkiq/coordinator.py
index 381f6ca1a7d..1a4a819cdf6 100644
--- a/homeassistant/components/sharkiq/coordinator.py
+++ b/homeassistant/components/sharkiq/coordinator.py
@@ -24,6 +24,8 @@ from .const import API_TIMEOUT, DOMAIN, LOGGER, UPDATE_INTERVAL
 class SharkIqUpdateCoordinator(DataUpdateCoordinator[bool]):
     """Define a wrapper class to update Shark IQ data."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
@@ -36,10 +38,15 @@ class SharkIqUpdateCoordinator(DataUpdateCoordinator[bool]):
         self.shark_vacs: dict[str, SharkIqVacuum] = {
             sharkiq.serial_number: sharkiq for sharkiq in shark_vacs
         }
-        self._config_entry = config_entry
         self._online_dsns: set[str] = set()
 
-        super().__init__(hass, LOGGER, name=DOMAIN, update_interval=UPDATE_INTERVAL)
+        super().__init__(
+            hass,
+            LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=UPDATE_INTERVAL,
+        )
 
     @property
     def online_dsns(self) -> set[str]:
diff --git a/homeassistant/components/sharkiq/strings.json b/homeassistant/components/sharkiq/strings.json
index 40b569e13b7..3c4c98db38f 100644
--- a/homeassistant/components/sharkiq/strings.json
+++ b/homeassistant/components/sharkiq/strings.json
@@ -1,16 +1,16 @@
 {
   "config": {
-    "flow_title": "Add Shark IQ Account",
+    "flow_title": "Add Shark IQ account",
     "step": {
       "user": {
-        "description": "Sign into your Shark Clean account to control your devices.",
+        "description": "Sign into your SharkClean account to control your devices.",
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
           "region": "Region"
         },
         "data_description": {
-          "region": "Shark IQ uses different services in the EU.  Select your region to connect to the correct service for your account."
+          "region": "Shark IQ uses different services in the EU. Select your region to connect to the correct service for your account."
         }
       },
       "reauth_confirm": {
@@ -37,18 +37,18 @@
     "region": {
       "options": {
         "europe": "Europe",
-        "elsewhere": "Everywhere Else"
+        "elsewhere": "Everywhere else"
       }
     }
   },
   "exceptions": {
     "invalid_room": {
-      "message": "The room {room} is unavailable to your vacuum. Make sure all rooms match the Shark App, including capitalization."
+      "message": "The room {room} is unavailable to your vacuum. Make sure all rooms match the SharkClean app, including capitalization."
     }
   },
   "services": {
     "clean_room": {
-      "name": "Clean Room",
+      "name": "Clean room",
       "description": "Cleans a specific user-defined room or set of rooms.",
       "fields": {
         "rooms": {
diff --git a/homeassistant/components/sharkiq/vacuum.py b/homeassistant/components/sharkiq/vacuum.py
index 873d3fbd290..daea195a770 100644
--- a/homeassistant/components/sharkiq/vacuum.py
+++ b/homeassistant/components/sharkiq/vacuum.py
@@ -16,10 +16,9 @@ from homeassistant.components.vacuum import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers import entity_platform
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, LOGGER, SERVICE_CLEAN_ROOM, SHARK
@@ -51,7 +50,7 @@ ATTR_ROOMS = "rooms"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Shark IQ vacuum cleaner."""
     coordinator: SharkIqUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/shelly/__init__.py b/homeassistant/components/shelly/__init__.py
index 5ca58ec7d01..ee28c41f18b 100644
--- a/homeassistant/components/shelly/__init__.py
+++ b/homeassistant/components/shelly/__init__.py
@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from typing import Final
 
+from aioshelly.ble.const import BLE_SCRIPT_NAME
 from aioshelly.block_device import BlockDevice
 from aioshelly.common import ConnectionOptions
 from aioshelly.const import DEFAULT_COAP_PORT, RPC_GENERATIONS
@@ -11,12 +12,19 @@ from aioshelly.exceptions import (
     DeviceConnectionError,
     InvalidAuthError,
     MacAddressMismatchError,
+    RpcCallError,
 )
-from aioshelly.rpc_device import RpcDevice
+from aioshelly.rpc_device import RpcDevice, bluetooth_mac_from_primary_mac
 import voluptuous as vol
 
 from homeassistant.components.bluetooth import async_remove_scanner
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, Platform
+from homeassistant.const import (
+    CONF_HOST,
+    CONF_MODEL,
+    CONF_PASSWORD,
+    CONF_USERNAME,
+    Platform,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import (
@@ -53,6 +61,7 @@ from .utils import (
     get_coap_context,
     get_device_entry_gen,
     get_http_port,
+    get_rpc_scripts_event_types,
     get_ws_context,
 )
 
@@ -102,6 +111,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
 async def async_setup_entry(hass: HomeAssistant, entry: ShellyConfigEntry) -> bool:
     """Set up Shelly from a config entry."""
+    entry.runtime_data = ShellyEntryData([])
+
     # The custom component for Shelly devices uses shelly domain as well as core
     # integration. If the user removes the custom component but doesn't remove the
     # config entry, core integration will try to configure that config entry with an
@@ -153,13 +164,14 @@ async def _async_setup_block_entry(
         device_entry = None
 
     sleep_period = entry.data.get(CONF_SLEEP_PERIOD)
-    runtime_data = entry.runtime_data = ShellyEntryData(BLOCK_SLEEPING_PLATFORMS)
+    runtime_data = entry.runtime_data
+    runtime_data.platforms = BLOCK_SLEEPING_PLATFORMS
 
     # Some old firmware have a wrong sleep period hardcoded value.
     # Following code block will force the right value for affected devices
     if (
         sleep_period == BLOCK_WRONG_SLEEP_PERIOD
-        and entry.data["model"] in MODELS_WITH_WRONG_SLEEP_PERIOD
+        and entry.data[CONF_MODEL] in MODELS_WITH_WRONG_SLEEP_PERIOD
     ):
         LOGGER.warning(
             "Updating stored sleep period for %s: from %s to %s",
@@ -180,13 +192,25 @@ async def _async_setup_block_entry(
             if not device.firmware_supported:
                 async_create_issue_unsupported_firmware(hass, entry)
                 await device.shutdown()
-                raise ConfigEntryNotReady
+                raise ConfigEntryNotReady(
+                    translation_domain=DOMAIN,
+                    translation_key="firmware_unsupported",
+                    translation_placeholders={"device": entry.title},
+                )
         except (DeviceConnectionError, MacAddressMismatchError) as err:
             await device.shutdown()
-            raise ConfigEntryNotReady(repr(err)) from err
+            raise ConfigEntryNotReady(
+                translation_domain=DOMAIN,
+                translation_key="device_communication_error",
+                translation_placeholders={"device": entry.title},
+            ) from err
         except InvalidAuthError as err:
             await device.shutdown()
-            raise ConfigEntryAuthFailed(repr(err)) from err
+            raise ConfigEntryAuthFailed(
+                translation_domain=DOMAIN,
+                translation_key="auth_error",
+                translation_placeholders={"device": entry.title},
+            ) from err
 
         runtime_data.block = ShellyBlockCoordinator(hass, entry, device)
         runtime_data.block.async_setup()
@@ -252,7 +276,8 @@ async def _async_setup_rpc_entry(hass: HomeAssistant, entry: ShellyConfigEntry)
         device_entry = None
 
     sleep_period = entry.data.get(CONF_SLEEP_PERIOD)
-    runtime_data = entry.runtime_data = ShellyEntryData(RPC_SLEEPING_PLATFORMS)
+    runtime_data = entry.runtime_data
+    runtime_data.platforms = RPC_SLEEPING_PLATFORMS
 
     if sleep_period == 0:
         # Not a sleeping device, finish setup
@@ -263,13 +288,30 @@ async def _async_setup_rpc_entry(hass: HomeAssistant, entry: ShellyConfigEntry)
             if not device.firmware_supported:
                 async_create_issue_unsupported_firmware(hass, entry)
                 await device.shutdown()
-                raise ConfigEntryNotReady
-        except (DeviceConnectionError, MacAddressMismatchError) as err:
+                raise ConfigEntryNotReady(
+                    translation_domain=DOMAIN,
+                    translation_key="firmware_unsupported",
+                    translation_placeholders={"device": entry.title},
+                )
+            runtime_data.rpc_supports_scripts = await device.supports_scripts()
+            if runtime_data.rpc_supports_scripts:
+                runtime_data.rpc_script_events = await get_rpc_scripts_event_types(
+                    device, ignore_scripts=[BLE_SCRIPT_NAME]
+                )
+        except (DeviceConnectionError, MacAddressMismatchError, RpcCallError) as err:
             await device.shutdown()
-            raise ConfigEntryNotReady(repr(err)) from err
+            raise ConfigEntryNotReady(
+                translation_domain=DOMAIN,
+                translation_key="device_communication_error",
+                translation_placeholders={"device": entry.title},
+            ) from err
         except InvalidAuthError as err:
             await device.shutdown()
-            raise ConfigEntryAuthFailed(repr(err)) from err
+            raise ConfigEntryAuthFailed(
+                translation_domain=DOMAIN,
+                translation_key="auth_error",
+                translation_placeholders={"device": entry.title},
+            ) from err
 
         runtime_data.rpc = ShellyRpcCoordinator(hass, entry, device)
         runtime_data.rpc.async_setup()
@@ -339,4 +381,5 @@ async def async_remove_entry(hass: HomeAssistant, entry: ShellyConfigEntry) -> N
     if get_device_entry_gen(entry) in RPC_GENERATIONS and (
         mac_address := entry.unique_id
     ):
-        async_remove_scanner(hass, mac_address)
+        source = dr.format_mac(bluetooth_mac_from_primary_mac(mac_address)).upper()
+        async_remove_scanner(hass, source)
diff --git a/homeassistant/components/shelly/binary_sensor.py b/homeassistant/components/shelly/binary_sensor.py
index 108a8236733..b74578f1fb3 100644
--- a/homeassistant/components/shelly/binary_sensor.py
+++ b/homeassistant/components/shelly/binary_sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.const import STATE_ON, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import CONNECTION_BLUETOOTH, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from .const import CONF_SLEEP_PERIOD
@@ -130,6 +130,7 @@ SENSORS: dict[tuple[str, str], BlockBinarySensorDescription] = {
         device_class=BinarySensorDeviceClass.GAS,
         translation_key="gas",
         value=lambda value: value in ["mild", "heavy"],
+        # Deprecated, remove in 2025.10
         extra_state_attributes=lambda block: {"detected": block.gas},
     ),
     ("sensor", "smoke"): BlockBinarySensorDescription(
@@ -272,13 +273,25 @@ RPC_SENSORS: Final = {
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_class=RpcBluTrvBinarySensor,
     ),
+    "flood": RpcBinarySensorDescription(
+        key="flood",
+        sub_key="alarm",
+        name="Flood",
+        device_class=BinarySensorDeviceClass.MOISTURE,
+    ),
+    "mute": RpcBinarySensorDescription(
+        key="flood",
+        sub_key="mute",
+        name="Mute",
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
 }
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors for device."""
     if get_device_entry_gen(config_entry) in RPC_GENERATIONS:
diff --git a/homeassistant/components/shelly/bluetooth/__init__.py b/homeassistant/components/shelly/bluetooth/__init__.py
index 5200ec9b913..2b772bd1b78 100644
--- a/homeassistant/components/shelly/bluetooth/__init__.py
+++ b/homeassistant/components/shelly/bluetooth/__init__.py
@@ -7,26 +7,39 @@ from typing import TYPE_CHECKING
 from aioshelly.ble import async_start_scanner, create_scanner
 from aioshelly.ble.const import BLE_SCAN_RESULT_EVENT, BLE_SCAN_RESULT_VERSION
 
-from homeassistant.components.bluetooth import async_register_scanner
+from homeassistant.components.bluetooth import (
+    BluetoothScanningMode,
+    async_register_scanner,
+)
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback as hass_callback
-from homeassistant.helpers.device_registry import format_mac
 
 from ..const import BLEScannerMode
 
 if TYPE_CHECKING:
     from ..coordinator import ShellyRpcCoordinator
 
+BLE_SCANNER_MODE_TO_BLUETOOTH_SCANNING_MODE = {
+    BLEScannerMode.PASSIVE: BluetoothScanningMode.PASSIVE,
+    BLEScannerMode.ACTIVE: BluetoothScanningMode.ACTIVE,
+}
+
 
 async def async_connect_scanner(
     hass: HomeAssistant,
     coordinator: ShellyRpcCoordinator,
     scanner_mode: BLEScannerMode,
+    device_id: str,
 ) -> CALLBACK_TYPE:
     """Connect scanner."""
     device = coordinator.device
-    entry = coordinator.entry
-    source = format_mac(coordinator.mac).upper()
-    scanner = create_scanner(source, entry.title)
+    entry = coordinator.config_entry
+    bluetooth_scanning_mode = BLE_SCANNER_MODE_TO_BLUETOOTH_SCANNING_MODE[scanner_mode]
+    scanner = create_scanner(
+        coordinator.bluetooth_source,
+        entry.title,
+        requested_mode=bluetooth_scanning_mode,
+        current_mode=bluetooth_scanning_mode,
+    )
     unload_callbacks = [
         async_register_scanner(
             hass,
@@ -34,6 +47,7 @@ async def async_connect_scanner(
             source_domain=entry.domain,
             source_model=coordinator.model,
             source_config_entry_id=entry.entry_id,
+            source_device_id=device_id,
         ),
         scanner.async_setup(),
         coordinator.async_subscribe_events(scanner.async_on_event),
diff --git a/homeassistant/components/shelly/button.py b/homeassistant/components/shelly/button.py
index f1e2f8ef885..06dffba5ead 100644
--- a/homeassistant/components/shelly/button.py
+++ b/homeassistant/components/shelly/button.py
@@ -2,12 +2,13 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable, Coroutine
+from collections.abc import Callable
 from dataclasses import dataclass
 from functools import partial
 from typing import TYPE_CHECKING, Any, Final
 
-from aioshelly.const import RPC_GENERATIONS
+from aioshelly.const import BLU_TRV_IDENTIFIER, MODEL_BLU_GATEWAY, RPC_GENERATIONS
+from aioshelly.exceptions import DeviceConnectionError, InvalidAuthError, RpcCallError
 
 from homeassistant.components.button import (
     ButtonDeviceClass,
@@ -16,15 +17,20 @@ from homeassistant.components.button import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.device_registry import (
+    CONNECTION_BLUETOOTH,
+    CONNECTION_NETWORK_MAC,
+    DeviceInfo,
+)
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import slugify
 
-from .const import LOGGER, SHELLY_GAS_MODELS
+from .const import DOMAIN, LOGGER, SHELLY_GAS_MODELS
 from .coordinator import ShellyBlockCoordinator, ShellyConfigEntry, ShellyRpcCoordinator
-from .utils import get_device_entry_gen
+from .utils import get_device_entry_gen, get_rpc_key_ids
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -33,7 +39,7 @@ class ShellyButtonDescription[
 ](ButtonEntityDescription):
     """Class to describe a Button entity."""
 
-    press_action: Callable[[_ShellyCoordinatorT], Coroutine[Any, Any, None]]
+    press_action: str
 
     supported: Callable[[_ShellyCoordinatorT], bool] = lambda _: True
 
@@ -44,14 +50,14 @@ BUTTONS: Final[list[ShellyButtonDescription[Any]]] = [
         name="Reboot",
         device_class=ButtonDeviceClass.RESTART,
         entity_category=EntityCategory.CONFIG,
-        press_action=lambda coordinator: coordinator.device.trigger_reboot(),
+        press_action="trigger_reboot",
     ),
     ShellyButtonDescription[ShellyBlockCoordinator](
         key="self_test",
         name="Self test",
         translation_key="self_test",
         entity_category=EntityCategory.DIAGNOSTIC,
-        press_action=lambda coordinator: coordinator.device.trigger_shelly_gas_self_test(),
+        press_action="trigger_shelly_gas_self_test",
         supported=lambda coordinator: coordinator.device.model in SHELLY_GAS_MODELS,
     ),
     ShellyButtonDescription[ShellyBlockCoordinator](
@@ -59,7 +65,7 @@ BUTTONS: Final[list[ShellyButtonDescription[Any]]] = [
         name="Mute",
         translation_key="mute",
         entity_category=EntityCategory.CONFIG,
-        press_action=lambda coordinator: coordinator.device.trigger_shelly_gas_mute(),
+        press_action="trigger_shelly_gas_mute",
         supported=lambda coordinator: coordinator.device.model in SHELLY_GAS_MODELS,
     ),
     ShellyButtonDescription[ShellyBlockCoordinator](
@@ -67,11 +73,22 @@ BUTTONS: Final[list[ShellyButtonDescription[Any]]] = [
         name="Unmute",
         translation_key="unmute",
         entity_category=EntityCategory.CONFIG,
-        press_action=lambda coordinator: coordinator.device.trigger_shelly_gas_unmute(),
+        press_action="trigger_shelly_gas_unmute",
         supported=lambda coordinator: coordinator.device.model in SHELLY_GAS_MODELS,
     ),
 ]
 
+BLU_TRV_BUTTONS: Final[list[ShellyButtonDescription]] = [
+    ShellyButtonDescription[ShellyRpcCoordinator](
+        key="calibrate",
+        name="Calibrate",
+        translation_key="calibrate",
+        entity_category=EntityCategory.CONFIG,
+        press_action="trigger_blu_trv_calibration",
+        supported=lambda coordinator: coordinator.device.model == MODEL_BLU_GATEWAY,
+    ),
+]
+
 
 @callback
 def async_migrate_unique_ids(
@@ -106,7 +123,7 @@ def async_migrate_unique_ids(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set buttons for device."""
     entry_data = config_entry.runtime_data
@@ -123,14 +140,28 @@ async def async_setup_entry(
         hass, config_entry.entry_id, partial(async_migrate_unique_ids, coordinator)
     )
 
-    async_add_entities(
+    entities: list[ShellyButton | ShellyBluTrvButton] = []
+
+    entities.extend(
         ShellyButton(coordinator, button)
         for button in BUTTONS
         if button.supported(coordinator)
     )
 
+    if blutrv_key_ids := get_rpc_key_ids(coordinator.device.status, BLU_TRV_IDENTIFIER):
+        if TYPE_CHECKING:
+            assert isinstance(coordinator, ShellyRpcCoordinator)
 
-class ShellyButton(
+        entities.extend(
+            ShellyBluTrvButton(coordinator, button, id_)
+            for id_ in blutrv_key_ids
+            for button in BLU_TRV_BUTTONS
+        )
+
+    async_add_entities(entities)
+
+
+class ShellyBaseButton(
     CoordinatorEntity[ShellyRpcCoordinator | ShellyBlockCoordinator], ButtonEntity
 ):
     """Defines a Shelly base button."""
@@ -148,14 +179,98 @@ class ShellyButton(
     ) -> None:
         """Initialize Shelly button."""
         super().__init__(coordinator)
+
         self.entity_description = description
 
+    async def async_press(self) -> None:
+        """Triggers the Shelly button press service."""
+        try:
+            await self._press_method()
+        except DeviceConnectionError as err:
+            self.coordinator.last_update_success = False
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="device_communication_action_error",
+                translation_placeholders={
+                    "entity": self.entity_id,
+                    "device": self.coordinator.name,
+                },
+            ) from err
+        except RpcCallError as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="rpc_call_action_error",
+                translation_placeholders={
+                    "entity": self.entity_id,
+                    "device": self.coordinator.name,
+                },
+            ) from err
+        except InvalidAuthError:
+            await self.coordinator.async_shutdown_device_and_start_reauth()
+
+    async def _press_method(self) -> None:
+        """Press method."""
+        raise NotImplementedError
+
+
+class ShellyButton(ShellyBaseButton):
+    """Defines a Shelly button."""
+
+    def __init__(
+        self,
+        coordinator: ShellyRpcCoordinator | ShellyBlockCoordinator,
+        description: ShellyButtonDescription[
+            ShellyRpcCoordinator | ShellyBlockCoordinator
+        ],
+    ) -> None:
+        """Initialize Shelly button."""
+        super().__init__(coordinator, description)
+
         self._attr_name = f"{coordinator.device.name} {description.name}"
         self._attr_unique_id = f"{coordinator.mac}_{description.key}"
         self._attr_device_info = DeviceInfo(
             connections={(CONNECTION_NETWORK_MAC, coordinator.mac)}
         )
 
-    async def async_press(self) -> None:
-        """Triggers the Shelly button press service."""
-        await self.entity_description.press_action(self.coordinator)
+    async def _press_method(self) -> None:
+        """Press method."""
+        method = getattr(self.coordinator.device, self.entity_description.press_action)
+
+        if TYPE_CHECKING:
+            assert method is not None
+
+        await method()
+
+
+class ShellyBluTrvButton(ShellyBaseButton):
+    """Represent a Shelly BLU TRV button."""
+
+    def __init__(
+        self,
+        coordinator: ShellyRpcCoordinator,
+        description: ShellyButtonDescription,
+        id_: int,
+    ) -> None:
+        """Initialize."""
+        super().__init__(coordinator, description)
+
+        ble_addr: str = coordinator.device.config[f"{BLU_TRV_IDENTIFIER}:{id_}"]["addr"]
+        device_name = (
+            coordinator.device.config[f"{BLU_TRV_IDENTIFIER}:{id_}"]["name"]
+            or f"shellyblutrv-{ble_addr.replace(':', '')}"
+        )
+        self._attr_name = f"{device_name} {description.name}"
+        self._attr_unique_id = f"{ble_addr}_{description.key}"
+        self._attr_device_info = DeviceInfo(
+            connections={(CONNECTION_BLUETOOTH, ble_addr)}
+        )
+        self._id = id_
+
+    async def _press_method(self) -> None:
+        """Press method."""
+        method = getattr(self.coordinator.device, self.entity_description.press_action)
+
+        if TYPE_CHECKING:
+            assert method is not None
+
+        await method(self._id)
diff --git a/homeassistant/components/shelly/climate.py b/homeassistant/components/shelly/climate.py
index f8e157a6a5d..498f2d3dba9 100644
--- a/homeassistant/components/shelly/climate.py
+++ b/homeassistant/components/shelly/climate.py
@@ -7,7 +7,12 @@ from dataclasses import asdict, dataclass
 from typing import Any, cast
 
 from aioshelly.block_device import Block
-from aioshelly.const import BLU_TRV_IDENTIFIER, BLU_TRV_MODEL_NAME, RPC_GENERATIONS
+from aioshelly.const import (
+    BLU_TRV_IDENTIFIER,
+    BLU_TRV_MODEL_NAME,
+    BLU_TRV_TIMEOUT,
+    RPC_GENERATIONS,
+)
 from aioshelly.exceptions import DeviceConnectionError, InvalidAuthError
 
 from homeassistant.components.climate import (
@@ -27,7 +32,7 @@ from homeassistant.helpers.device_registry import (
     CONNECTION_NETWORK_MAC,
     DeviceInfo,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.entity_registry import RegistryEntry
 from homeassistant.helpers.restore_state import ExtraStoredData, RestoreEntity
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -55,7 +60,7 @@ from .utils import (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up climate device."""
     if get_device_entry_gen(config_entry) in RPC_GENERATIONS:
@@ -74,7 +79,7 @@ async def async_setup_entry(
 
 @callback
 def async_setup_climate_entities(
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     coordinator: ShellyBlockCoordinator,
 ) -> None:
     """Set up online climate devices."""
@@ -101,7 +106,7 @@ def async_setup_climate_entities(
 def async_restore_climate_entities(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     coordinator: ShellyBlockCoordinator,
 ) -> None:
     """Restore sleeping climate devices."""
@@ -123,7 +128,7 @@ def async_restore_climate_entities(
 def async_setup_rpc_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entities for RPC device."""
     coordinator = config_entry.runtime_data.rpc
@@ -321,8 +326,12 @@ class BlockSleepingClimate(
         except DeviceConnectionError as err:
             self.coordinator.last_update_success = False
             raise HomeAssistantError(
-                f"Setting state for entity {self.name} failed, state: {kwargs}, error:"
-                f" {err!r}"
+                translation_domain=DOMAIN,
+                translation_key="device_communication_action_error",
+                translation_placeholders={
+                    "entity": self.entity_id,
+                    "device": self.coordinator.name,
+                },
             ) from err
         except InvalidAuthError:
             await self.coordinator.async_shutdown_device_and_start_reauth()
@@ -604,4 +613,5 @@ class RpcBluTrvClimate(ShellyRpcEntity, ClimateEntity):
                 "method": "Trv.SetTarget",
                 "params": {"id": 0, "target_C": target_temp},
             },
+            timeout=BLU_TRV_TIMEOUT,
         )
diff --git a/homeassistant/components/shelly/config_flow.py b/homeassistant/components/shelly/config_flow.py
index f53da8bd766..200a88ea24c 100644
--- a/homeassistant/components/shelly/config_flow.py
+++ b/homeassistant/components/shelly/config_flow.py
@@ -17,15 +17,11 @@ from aioshelly.exceptions import (
 from aioshelly.rpc_device import RpcDevice
 import voluptuous as vol
 
-from homeassistant.config_entries import (
-    ConfigEntry,
-    ConfigFlow,
-    ConfigFlowResult,
-    OptionsFlow,
-)
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult, OptionsFlow
 from homeassistant.const import (
     CONF_HOST,
     CONF_MAC,
+    CONF_MODEL,
     CONF_PASSWORD,
     CONF_PORT,
     CONF_USERNAME,
@@ -41,10 +37,9 @@ from .const import (
     CONF_SLEEP_PERIOD,
     DOMAIN,
     LOGGER,
-    MODEL_WALL_DISPLAY,
     BLEScannerMode,
 )
-from .coordinator import async_reconnect_soon
+from .coordinator import ShellyConfigEntry, async_reconnect_soon
 from .utils import (
     get_block_device_sleep_period,
     get_coap_context,
@@ -112,7 +107,9 @@ async def validate_input(
         return {
             "title": rpc_device.name,
             CONF_SLEEP_PERIOD: sleep_period,
-            "model": rpc_device.shelly.get("model"),
+            CONF_MODEL: (
+                rpc_device.xmod_info.get("p") or rpc_device.shelly.get(CONF_MODEL)
+            ),
             CONF_GEN: gen,
         }
 
@@ -132,7 +129,7 @@ async def validate_input(
     return {
         "title": block_device.name,
         CONF_SLEEP_PERIOD: sleep_period,
-        "model": block_device.model,
+        CONF_MODEL: block_device.model,
         CONF_GEN: gen,
     }
 
@@ -164,7 +161,9 @@ class ShellyConfigFlow(ConfigFlow, domain=DOMAIN):
                 LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
-                await self.async_set_unique_id(self.info[CONF_MAC])
+                await self.async_set_unique_id(
+                    self.info[CONF_MAC], raise_on_progress=False
+                )
                 self._abort_if_unique_id_configured({CONF_HOST: host})
                 self.host = host
                 self.port = port
@@ -185,14 +184,14 @@ class ShellyConfigFlow(ConfigFlow, domain=DOMAIN):
                     LOGGER.exception("Unexpected exception")
                     errors["base"] = "unknown"
                 else:
-                    if device_info["model"]:
+                    if device_info[CONF_MODEL]:
                         return self.async_create_entry(
                             title=device_info["title"],
                             data={
                                 CONF_HOST: user_input[CONF_HOST],
                                 CONF_PORT: user_input[CONF_PORT],
                                 CONF_SLEEP_PERIOD: device_info[CONF_SLEEP_PERIOD],
-                                "model": device_info["model"],
+                                CONF_MODEL: device_info[CONF_MODEL],
                                 CONF_GEN: device_info[CONF_GEN],
                             },
                         )
@@ -224,7 +223,7 @@ class ShellyConfigFlow(ConfigFlow, domain=DOMAIN):
                 LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
-                if device_info["model"]:
+                if device_info[CONF_MODEL]:
                     return self.async_create_entry(
                         title=device_info["title"],
                         data={
@@ -232,7 +231,7 @@ class ShellyConfigFlow(ConfigFlow, domain=DOMAIN):
                             CONF_HOST: self.host,
                             CONF_PORT: self.port,
                             CONF_SLEEP_PERIOD: device_info[CONF_SLEEP_PERIOD],
-                            "model": device_info["model"],
+                            CONF_MODEL: device_info[CONF_MODEL],
                             CONF_GEN: device_info[CONF_GEN],
                         },
                     )
@@ -330,7 +329,7 @@ class ShellyConfigFlow(ConfigFlow, domain=DOMAIN):
         """Handle discovery confirm."""
         errors: dict[str, str] = {}
 
-        if not self.device_info["model"]:
+        if not self.device_info[CONF_MODEL]:
             errors["base"] = "firmware_not_fully_provisioned"
             model = "Shelly"
         else:
@@ -339,9 +338,9 @@ class ShellyConfigFlow(ConfigFlow, domain=DOMAIN):
                 return self.async_create_entry(
                     title=self.device_info["title"],
                     data={
-                        "host": self.host,
+                        CONF_HOST: self.host,
                         CONF_SLEEP_PERIOD: self.device_info[CONF_SLEEP_PERIOD],
-                        "model": self.device_info["model"],
+                        CONF_MODEL: self.device_info[CONF_MODEL],
                         CONF_GEN: self.device_info[CONF_GEN],
                     },
                 )
@@ -350,8 +349,8 @@ class ShellyConfigFlow(ConfigFlow, domain=DOMAIN):
         return self.async_show_form(
             step_id="confirm_discovery",
             description_placeholders={
-                "model": model,
-                "host": self.host,
+                CONF_MODEL: model,
+                CONF_HOST: self.host,
             },
             errors=errors,
         )
@@ -449,19 +448,17 @@ class ShellyConfigFlow(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlowHandler:
+    def async_get_options_flow(config_entry: ShellyConfigEntry) -> OptionsFlowHandler:
         """Get the options flow for this handler."""
         return OptionsFlowHandler()
 
     @classmethod
     @callback
-    def async_supports_options_flow(cls, config_entry: ConfigEntry) -> bool:
+    def async_supports_options_flow(cls, config_entry: ShellyConfigEntry) -> bool:
         """Return options flow support for this handler."""
-        return (
-            get_device_entry_gen(config_entry) in RPC_GENERATIONS
-            and not config_entry.data.get(CONF_SLEEP_PERIOD)
-            and config_entry.data.get("model") != MODEL_WALL_DISPLAY
-        )
+        return get_device_entry_gen(
+            config_entry
+        ) in RPC_GENERATIONS and not config_entry.data.get(CONF_SLEEP_PERIOD)
 
 
 class OptionsFlowHandler(OptionsFlow):
@@ -471,6 +468,13 @@ class OptionsFlowHandler(OptionsFlow):
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle options flow."""
+        if (
+            supports_scripts := self.config_entry.runtime_data.rpc_supports_scripts
+        ) is None:
+            return self.async_abort(reason="cannot_connect")
+        if not supports_scripts:
+            return self.async_abort(reason="no_scripts_support")
+
         if user_input is not None:
             return self.async_create_entry(title="", data=user_input)
 
diff --git a/homeassistant/components/shelly/const.py b/homeassistant/components/shelly/const.py
index f81ba5ca7f7..43fb6df18d0 100644
--- a/homeassistant/components/shelly/const.py
+++ b/homeassistant/components/shelly/const.py
@@ -25,9 +25,11 @@ from aioshelly.const import (
     MODEL_VALVE,
     MODEL_VINTAGE_V2,
     MODEL_WALL_DISPLAY,
+    MODEL_WALL_DISPLAY_X2,
 )
 
 from homeassistant.components.number import NumberMode
+from homeassistant.components.sensor import SensorDeviceClass
 
 DOMAIN: Final = "shelly"
 
@@ -116,6 +118,10 @@ BATTERY_DEVICES_WITH_PERMANENT_CONNECTION: Final = [
 # Button/Click events for Block & RPC devices
 EVENT_SHELLY_CLICK: Final = "shelly.click"
 
+SHELLY_EMIT_EVENT_PATTERN: Final = re.compile(
+    r"(?:Shelly\s*\.\s*emitEvent\s*\(\s*[\"'`])(\w*)"
+)
+
 ATTR_CLICK_TYPE: Final = "click_type"
 ATTR_CHANNEL: Final = "channel"
 ATTR_DEVICE: Final = "device"
@@ -240,6 +246,7 @@ GEN2_RELEASE_URL = "https://shelly-api-docs.shelly.cloud/gen2/changelog/"
 GEN2_BETA_RELEASE_URL = f"{GEN2_RELEASE_URL}#unreleased"
 DEVICES_WITHOUT_FIRMWARE_CHANGELOG = (
     MODEL_WALL_DISPLAY,
+    MODEL_WALL_DISPLAY_X2,
     MODEL_MOTION,
     MODEL_MOTION_2,
     MODEL_VALVE,
@@ -265,3 +272,8 @@ VIRTUAL_NUMBER_MODE_MAP = {
 API_WS_URL = "/api/shelly/ws"
 
 COMPONENT_ID_PATTERN = re.compile(r"[a-z\d]+:\d+")
+
+ROLE_TO_DEVICE_CLASS_MAP = {
+    "current_humidity": SensorDeviceClass.HUMIDITY,
+    "current_temperature": SensorDeviceClass.TEMPERATURE,
+}
diff --git a/homeassistant/components/shelly/coordinator.py b/homeassistant/components/shelly/coordinator.py
index d5071c4e849..4a1ea72f38a 100644
--- a/homeassistant/components/shelly/coordinator.py
+++ b/homeassistant/components/shelly/coordinator.py
@@ -10,7 +10,7 @@ from typing import Any, cast
 
 from aioshelly.ble import async_ensure_ble_enabled, async_stop_scanner
 from aioshelly.block_device import BlockDevice, BlockUpdateType
-from aioshelly.const import MODEL_NAMES, MODEL_VALVE
+from aioshelly.const import MODEL_VALVE
 from aioshelly.exceptions import (
     DeviceConnectionError,
     InvalidAuthError,
@@ -18,6 +18,7 @@ from aioshelly.exceptions import (
     RpcCallError,
 )
 from aioshelly.rpc_device import RpcDevice, RpcUpdateType
+from aioshelly.rpc_device.utils import bluetooth_mac_from_primary_mac
 from propcache.api import cached_property
 
 from homeassistant.components.bluetooth import async_remove_scanner
@@ -25,6 +26,7 @@ from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.const import (
     ATTR_DEVICE_ID,
     CONF_HOST,
+    CONF_MODEL,
     EVENT_HOMEASSISTANT_STOP,
     Platform,
 )
@@ -72,6 +74,7 @@ from .utils import (
     get_http_port,
     get_rpc_device_wakeup_period,
     get_rpc_ws_url,
+    get_shelly_model_name,
     update_device_fw_info,
 )
 
@@ -85,6 +88,8 @@ class ShellyEntryData:
     rest: ShellyRestCoordinator | None = None
     rpc: ShellyRpcCoordinator | None = None
     rpc_poll: ShellyRpcPollingCoordinator | None = None
+    rpc_script_events: dict[int, list[str]] | None = None
+    rpc_supports_scripts: bool | None = None
 
 
 type ShellyConfigEntry = ConfigEntry[ShellyEntryData]
@@ -95,6 +100,8 @@ class ShellyCoordinatorBase[_DeviceT: BlockDevice | RpcDevice](
 ):
     """Coordinator for a Shelly device."""
 
+    config_entry: ShellyConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
@@ -103,7 +110,6 @@ class ShellyCoordinatorBase[_DeviceT: BlockDevice | RpcDevice](
         update_interval: float,
     ) -> None:
         """Initialize the Shelly device coordinator."""
-        self.entry = entry
         self.device = device
         self.device_id: str | None = None
         self._pending_platforms: list[Platform] | None = None
@@ -112,7 +118,13 @@ class ShellyCoordinatorBase[_DeviceT: BlockDevice | RpcDevice](
         # The device has come online at least once. In the case of a sleeping RPC
         # device, this means that the device has connected to the WS server at least once.
         self._came_online_once = False
-        super().__init__(hass, LOGGER, name=device_name, update_interval=interval_td)
+        super().__init__(
+            hass,
+            LOGGER,
+            config_entry=entry,
+            name=device_name,
+            update_interval=interval_td,
+        )
 
         self._debounced_reload: Debouncer[Coroutine[Any, Any, None]] = Debouncer(
             hass,
@@ -130,12 +142,12 @@ class ShellyCoordinatorBase[_DeviceT: BlockDevice | RpcDevice](
     @cached_property
     def model(self) -> str:
         """Model of the device."""
-        return cast(str, self.entry.data["model"])
+        return cast(str, self.config_entry.data[CONF_MODEL])
 
     @cached_property
     def mac(self) -> str:
         """Mac address of the device."""
-        return cast(str, self.entry.unique_id)
+        return cast(str, self.config_entry.unique_id)
 
     @property
     def sw_version(self) -> str:
@@ -145,23 +157,23 @@ class ShellyCoordinatorBase[_DeviceT: BlockDevice | RpcDevice](
     @property
     def sleep_period(self) -> int:
         """Sleep period of the device."""
-        return self.entry.data.get(CONF_SLEEP_PERIOD, 0)
+        return self.config_entry.data.get(CONF_SLEEP_PERIOD, 0)
 
     def async_setup(self, pending_platforms: list[Platform] | None = None) -> None:
         """Set up the coordinator."""
         self._pending_platforms = pending_platforms
         dev_reg = dr.async_get(self.hass)
         device_entry = dev_reg.async_get_or_create(
-            config_entry_id=self.entry.entry_id,
+            config_entry_id=self.config_entry.entry_id,
             name=self.name,
             connections={(CONNECTION_NETWORK_MAC, self.mac)},
             identifiers={(DOMAIN, self.mac)},
             manufacturer="Shelly",
-            model=MODEL_NAMES.get(self.model),
+            model=get_shelly_model_name(self.model, self.sleep_period, self.device),
             model_id=self.model,
             sw_version=self.sw_version,
-            hw_version=f"gen{get_device_entry_gen(self.entry)}",
-            configuration_url=f"http://{get_host(self.entry.data[CONF_HOST])}:{get_http_port(self.entry.data)}",
+            hw_version=f"gen{get_device_entry_gen(self.config_entry)}",
+            configuration_url=f"http://{get_host(self.config_entry.data[CONF_HOST])}:{get_http_port(self.config_entry.data)}",
         )
         self.device_id = device_entry.id
 
@@ -179,18 +191,18 @@ class ShellyCoordinatorBase[_DeviceT: BlockDevice | RpcDevice](
         LOGGER.debug("Connecting to Shelly Device - %s", self.name)
         try:
             await self.device.initialize()
-            update_device_fw_info(self.hass, self.device, self.entry)
+            update_device_fw_info(self.hass, self.device, self.config_entry)
         except (DeviceConnectionError, MacAddressMismatchError) as err:
             LOGGER.debug(
                 "Error connecting to Shelly device %s, error: %r", self.name, err
             )
             return False
         except InvalidAuthError:
-            self.entry.async_start_reauth(self.hass)
+            self.config_entry.async_start_reauth(self.hass)
             return False
 
         if not self.device.firmware_supported:
-            async_create_issue_unsupported_firmware(self.hass, self.entry)
+            async_create_issue_unsupported_firmware(self.hass, self.config_entry)
             return False
 
         if not self._pending_platforms:
@@ -200,7 +212,7 @@ class ShellyCoordinatorBase[_DeviceT: BlockDevice | RpcDevice](
         platforms = self._pending_platforms
         self._pending_platforms = None
 
-        data = {**self.entry.data}
+        data = {**self.config_entry.data}
 
         # Update sleep_period
         old_sleep_period = data[CONF_SLEEP_PERIOD]
@@ -211,10 +223,12 @@ class ShellyCoordinatorBase[_DeviceT: BlockDevice | RpcDevice](
 
         if new_sleep_period != old_sleep_period:
             data[CONF_SLEEP_PERIOD] = new_sleep_period
-            self.hass.config_entries.async_update_entry(self.entry, data=data)
+            self.hass.config_entries.async_update_entry(self.config_entry, data=data)
 
         # Resume platform setup
-        await self.hass.config_entries.async_forward_entry_setups(self.entry, platforms)
+        await self.hass.config_entries.async_forward_entry_setups(
+            self.config_entry, platforms
+        )
 
         return True
 
@@ -222,7 +236,7 @@ class ShellyCoordinatorBase[_DeviceT: BlockDevice | RpcDevice](
         """Reload entry."""
         self._debounced_reload.async_cancel()
         LOGGER.debug("Reloading entry %s", self.name)
-        await self.hass.config_entries.async_reload(self.entry.entry_id)
+        await self.hass.config_entries.async_reload(self.config_entry.entry_id)
 
     async def async_shutdown_device_and_start_reauth(self) -> None:
         """Shutdown Shelly device and start reauth flow."""
@@ -230,7 +244,7 @@ class ShellyCoordinatorBase[_DeviceT: BlockDevice | RpcDevice](
         # and won't be able to send commands to the device
         self.last_update_success = False
         await self.shutdown()
-        self.entry.async_start_reauth(self.hass)
+        self.config_entry.async_start_reauth(self.hass)
 
 
 class ShellyBlockCoordinator(ShellyCoordinatorBase[BlockDevice]):
@@ -240,9 +254,8 @@ class ShellyBlockCoordinator(ShellyCoordinatorBase[BlockDevice]):
         self, hass: HomeAssistant, entry: ShellyConfigEntry, device: BlockDevice
     ) -> None:
         """Initialize the Shelly block device coordinator."""
-        self.entry = entry
-        if self.sleep_period:
-            update_interval = UPDATE_PERIOD_MULTIPLIER * self.sleep_period
+        if sleep_period := entry.data.get(CONF_SLEEP_PERIOD, 0):
+            update_interval = UPDATE_PERIOD_MULTIPLIER * sleep_period
         else:
             update_interval = (
                 UPDATE_PERIOD_MULTIPLIER * device.settings["coiot"]["update_period"]
@@ -366,14 +379,23 @@ class ShellyBlockCoordinator(ShellyCoordinatorBase[BlockDevice]):
         if self.sleep_period:
             # Sleeping device, no point polling it, just mark it unavailable
             raise UpdateFailed(
-                f"Sleeping device did not update within {self.sleep_period} seconds interval"
+                translation_domain=DOMAIN,
+                translation_key="update_error_sleeping_device",
+                translation_placeholders={
+                    "device": self.name,
+                    "period": str(self.sleep_period),
+                },
             )
 
         LOGGER.debug("Polling Shelly Block Device - %s", self.name)
         try:
             await self.device.update()
         except DeviceConnectionError as err:
-            raise UpdateFailed(repr(err)) from err
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="update_error",
+                translation_placeholders={"device": self.name},
+            ) from err
         except InvalidAuthError:
             await self.async_shutdown_device_and_start_reauth()
 
@@ -385,7 +407,7 @@ class ShellyBlockCoordinator(ShellyCoordinatorBase[BlockDevice]):
         LOGGER.debug("Shelly %s handle update, type: %s", self.name, update_type)
         if update_type is BlockUpdateType.ONLINE:
             self._came_online_once = True
-            self.entry.async_create_background_task(
+            self.config_entry.async_create_background_task(
                 self.hass,
                 self._async_device_connect_task(),
                 "block device online",
@@ -415,7 +437,7 @@ class ShellyBlockCoordinator(ShellyCoordinatorBase[BlockDevice]):
                     learn_more_url="https://www.home-assistant.io/integrations/shelly/#shelly-device-configuration-generation-1",
                     translation_key="push_update_failure",
                     translation_placeholders={
-                        "device_name": self.entry.title,
+                        "device_name": self.config_entry.title,
                         "ip_address": self.device.ip_address,
                     },
                 )
@@ -458,11 +480,15 @@ class ShellyRestCoordinator(ShellyCoordinatorBase[BlockDevice]):
                 return
             await self.device.update_shelly()
         except (DeviceConnectionError, MacAddressMismatchError) as err:
-            raise UpdateFailed(repr(err)) from err
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="update_error",
+                translation_placeholders={"device": self.name},
+            ) from err
         except InvalidAuthError:
             await self.async_shutdown_device_and_start_reauth()
         else:
-            update_device_fw_info(self.hass, self.device, self.entry)
+            update_device_fw_info(self.hass, self.device, self.config_entry)
 
 
 class ShellyRpcCoordinator(ShellyCoordinatorBase[RpcDevice]):
@@ -472,9 +498,8 @@ class ShellyRpcCoordinator(ShellyCoordinatorBase[RpcDevice]):
         self, hass: HomeAssistant, entry: ShellyConfigEntry, device: RpcDevice
     ) -> None:
         """Initialize the Shelly RPC device coordinator."""
-        self.entry = entry
-        if self.sleep_period:
-            update_interval = UPDATE_PERIOD_MULTIPLIER * self.sleep_period
+        if sleep_period := entry.data.get(CONF_SLEEP_PERIOD, 0):
+            update_interval = UPDATE_PERIOD_MULTIPLIER * sleep_period
         else:
             update_interval = RPC_RECONNECT_INTERVAL
         super().__init__(hass, entry, device, update_interval)
@@ -488,6 +513,15 @@ class ShellyRpcCoordinator(ShellyCoordinatorBase[RpcDevice]):
         self._connect_task: asyncio.Task | None = None
         entry.async_on_unload(entry.add_update_listener(self._async_update_listener))
 
+    @cached_property
+    def bluetooth_source(self) -> str:
+        """Return the Bluetooth source address.
+
+        This is the Bluetooth MAC address of the device that is used
+        for the Bluetooth scanner.
+        """
+        return format_mac(bluetooth_mac_from_primary_mac(self.mac)).upper()
+
     async def async_device_online(self, source: str) -> None:
         """Handle device going online."""
         if not self.sleep_period:
@@ -514,9 +548,9 @@ class ShellyRpcCoordinator(ShellyCoordinatorBase[RpcDevice]):
         ):
             return False
 
-        data = {**self.entry.data}
+        data = {**self.config_entry.data}
         data[CONF_SLEEP_PERIOD] = wakeup_period
-        self.hass.config_entries.async_update_entry(self.entry, data=data)
+        self.hass.config_entries.async_update_entry(self.config_entry, data=data)
 
         update_interval = UPDATE_PERIOD_MULTIPLIER * wakeup_period
         self.update_interval = timedelta(seconds=update_interval)
@@ -616,7 +650,12 @@ class ShellyRpcCoordinator(ShellyCoordinatorBase[RpcDevice]):
         if self.sleep_period:
             # Sleeping device, no point polling it, just mark it unavailable
             raise UpdateFailed(
-                f"Sleeping device did not update within {self.sleep_period} seconds interval"
+                translation_domain=DOMAIN,
+                translation_key="update_error_sleeping_device",
+                translation_placeholders={
+                    "device": self.name,
+                    "period": str(self.sleep_period),
+                },
             )
 
         async with self._connection_lock:
@@ -624,7 +663,11 @@ class ShellyRpcCoordinator(ShellyCoordinatorBase[RpcDevice]):
                 return
 
             if not await self._async_device_connect_task():
-                raise UpdateFailed("Device reconnect error")
+                raise UpdateFailed(
+                    translation_domain=DOMAIN,
+                    translation_key="update_error_reconnect_error",
+                    translation_placeholders={"device": self.name},
+                )
 
     async def _async_disconnected(self, reconnect: bool) -> None:
         """Handle device disconnected."""
@@ -674,7 +717,8 @@ class ShellyRpcCoordinator(ShellyCoordinatorBase[RpcDevice]):
         is updated.
         """
         if not self.sleep_period:
-            await self._async_connect_ble_scanner()
+            if self.config_entry.runtime_data.rpc_supports_scripts:
+                await self._async_connect_ble_scanner()
         else:
             await self._async_setup_outbound_websocket()
 
@@ -693,19 +737,22 @@ class ShellyRpcCoordinator(ShellyCoordinatorBase[RpcDevice]):
 
     async def _async_connect_ble_scanner(self) -> None:
         """Connect BLE scanner."""
-        ble_scanner_mode = self.entry.options.get(
+        ble_scanner_mode = self.config_entry.options.get(
             CONF_BLE_SCANNER_MODE, BLEScannerMode.DISABLED
         )
         if ble_scanner_mode == BLEScannerMode.DISABLED and self.connected:
             await async_stop_scanner(self.device)
-            async_remove_scanner(self.hass, format_mac(self.mac).upper())
+            async_remove_scanner(self.hass, self.bluetooth_source)
             return
         if await async_ensure_ble_enabled(self.device):
             # BLE enable required a reboot, don't bother connecting
             # the scanner since it will be disconnected anyway
             return
+        assert self.device_id is not None
         self._disconnected_callbacks.append(
-            await async_connect_scanner(self.hass, self, ble_scanner_mode)
+            await async_connect_scanner(
+                self.hass, self, ble_scanner_mode, self.device_id
+            )
         )
 
     @callback
@@ -716,7 +763,7 @@ class ShellyRpcCoordinator(ShellyCoordinatorBase[RpcDevice]):
         ):
             LOGGER.debug("Device %s already connected/connecting", self.name)
             return
-        self._connect_task = self.entry.async_create_background_task(
+        self._connect_task = self.config_entry.async_create_background_task(
             self.hass,
             self._async_device_connect_task(),
             "rpc device online",
@@ -733,13 +780,13 @@ class ShellyRpcCoordinator(ShellyCoordinatorBase[RpcDevice]):
             self._came_online_once = True
             self._async_handle_rpc_device_online()
         elif update_type is RpcUpdateType.INITIALIZED:
-            self.entry.async_create_background_task(
+            self.config_entry.async_create_background_task(
                 self.hass, self._async_connected(), "rpc device init", eager_start=True
             )
             # Make sure entities are marked available
             self.async_set_updated_data(None)
         elif update_type is RpcUpdateType.DISCONNECTED:
-            self.entry.async_create_background_task(
+            self.config_entry.async_create_background_task(
                 self.hass,
                 self._async_disconnected(True),
                 "rpc device disconnected",
@@ -750,7 +797,7 @@ class ShellyRpcCoordinator(ShellyCoordinatorBase[RpcDevice]):
         elif update_type is RpcUpdateType.STATUS:
             self.async_set_updated_data(None)
             if self.sleep_period:
-                update_device_fw_info(self.hass, self.device, self.entry)
+                update_device_fw_info(self.hass, self.device, self.config_entry)
         elif update_type is RpcUpdateType.EVENT and (event := self.device.event):
             self._async_device_event_handler(event)
 
@@ -760,7 +807,7 @@ class ShellyRpcCoordinator(ShellyCoordinatorBase[RpcDevice]):
         self.device.subscribe_updates(self._async_handle_update)
         if self.device.initialized:
             # If we are already initialized, we are connected
-            self.entry.async_create_task(
+            self.config_entry.async_create_task(
                 self.hass, self._async_connected(), eager_start=True
             )
 
@@ -772,7 +819,7 @@ class ShellyRpcCoordinator(ShellyCoordinatorBase[RpcDevice]):
                     await async_stop_scanner(self.device)
                 await super().shutdown()
             except InvalidAuthError:
-                self.entry.async_start_reauth(self.hass)
+                self.config_entry.async_start_reauth(self.hass)
                 return
             except DeviceConnectionError as err:
                 # If the device is restarting or has gone offline before
@@ -797,13 +844,21 @@ class ShellyRpcPollingCoordinator(ShellyCoordinatorBase[RpcDevice]):
     async def _async_update_data(self) -> None:
         """Fetch data."""
         if not self.device.connected:
-            raise UpdateFailed("Device disconnected")
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="update_error_device_disconnected",
+                translation_placeholders={"device": self.name},
+            )
 
         LOGGER.debug("Polling Shelly RPC Device - %s", self.name)
         try:
             await self.device.poll()
         except (DeviceConnectionError, RpcCallError) as err:
-            raise UpdateFailed(f"Device disconnected: {err!r}") from err
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="update_error",
+                translation_placeholders={"device": self.name},
+            ) from err
         except InvalidAuthError:
             await self.async_shutdown_device_and_start_reauth()
 
diff --git a/homeassistant/components/shelly/cover.py b/homeassistant/components/shelly/cover.py
index 09e8279bf9b..e9eb5acf161 100644
--- a/homeassistant/components/shelly/cover.py
+++ b/homeassistant/components/shelly/cover.py
@@ -15,7 +15,7 @@ from homeassistant.components.cover import (
     CoverEntityFeature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import ShellyBlockCoordinator, ShellyConfigEntry, ShellyRpcCoordinator
 from .entity import ShellyBlockEntity, ShellyRpcEntity
@@ -25,7 +25,7 @@ from .utils import get_device_entry_gen, get_rpc_key_ids
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up covers for device."""
     if get_device_entry_gen(config_entry) in RPC_GENERATIONS:
@@ -38,7 +38,7 @@ async def async_setup_entry(
 def async_setup_block_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up cover for device."""
     coordinator = config_entry.runtime_data.block
@@ -55,7 +55,7 @@ def async_setup_block_entry(
 def async_setup_rpc_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entities for RPC device."""
     coordinator = config_entry.runtime_data.rpc
diff --git a/homeassistant/components/shelly/device_trigger.py b/homeassistant/components/shelly/device_trigger.py
index 6e96eb5ed21..740e6aae9b2 100644
--- a/homeassistant/components/shelly/device_trigger.py
+++ b/homeassistant/components/shelly/device_trigger.py
@@ -105,7 +105,9 @@ async def async_validate_trigger_config(
                 return config
 
     raise InvalidDeviceAutomationConfig(
-        f"Invalid ({CONF_TYPE},{CONF_SUBTYPE}): {trigger}"
+        translation_domain=DOMAIN,
+        translation_key="invalid_trigger",
+        translation_placeholders={"trigger": str(trigger)},
     )
 
 
@@ -137,7 +139,11 @@ async def async_get_triggers(
 
         return triggers
 
-    raise InvalidDeviceAutomationConfig(f"Device not found: {device_id}")
+    raise InvalidDeviceAutomationConfig(
+        translation_domain=DOMAIN,
+        translation_key="device_not_found",
+        translation_placeholders={"device": device_id},
+    )
 
 
 async def async_attach_trigger(
diff --git a/homeassistant/components/shelly/diagnostics.py b/homeassistant/components/shelly/diagnostics.py
index a5fe1f5b6c0..2a9699e0a08 100644
--- a/homeassistant/components/shelly/diagnostics.py
+++ b/homeassistant/components/shelly/diagnostics.py
@@ -6,9 +6,14 @@ from typing import Any
 
 from homeassistant.components.bluetooth import async_scanner_by_source
 from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import (
+    ATTR_MODEL,
+    ATTR_NAME,
+    ATTR_SW_VERSION,
+    CONF_PASSWORD,
+    CONF_USERNAME,
+)
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import format_mac
 
 from .coordinator import ShellyConfigEntry
 from .utils import get_rpc_ws_url
@@ -31,9 +36,9 @@ async def async_get_config_entry_diagnostics(
         block_coordinator = shelly_entry_data.block
         assert block_coordinator
         device_info = {
-            "name": block_coordinator.name,
-            "model": block_coordinator.model,
-            "sw_version": block_coordinator.sw_version,
+            ATTR_NAME: block_coordinator.name,
+            ATTR_MODEL: block_coordinator.model,
+            ATTR_SW_VERSION: block_coordinator.sw_version,
         }
         if block_coordinator.device.initialized:
             device_settings = {
@@ -66,28 +71,29 @@ async def async_get_config_entry_diagnostics(
         rpc_coordinator = shelly_entry_data.rpc
         assert rpc_coordinator
         device_info = {
-            "name": rpc_coordinator.name,
-            "model": rpc_coordinator.model,
-            "sw_version": rpc_coordinator.sw_version,
+            ATTR_NAME: rpc_coordinator.name,
+            ATTR_MODEL: rpc_coordinator.model,
+            ATTR_SW_VERSION: rpc_coordinator.sw_version,
         }
         if rpc_coordinator.device.initialized:
             device_settings = {
                 k: v for k, v in rpc_coordinator.device.config.items() if k in ["cloud"]
             }
-            ws_config = rpc_coordinator.device.config["ws"]
-            device_settings["ws_outbound_enabled"] = ws_config["enable"]
-            if ws_config["enable"]:
-                device_settings["ws_outbound_server_valid"] = bool(
-                    ws_config["server"] == get_rpc_ws_url(hass)
-                )
+            if not (ws_config := rpc_coordinator.device.config.get("ws", {})):
+                device_settings["ws_outbound"] = "not supported"
+            if (ws_outbound_enabled := ws_config.get("enable")) is not None:
+                device_settings["ws_outbound_enabled"] = ws_outbound_enabled
+                if ws_outbound_enabled:
+                    device_settings["ws_outbound_server_valid"] = bool(
+                        ws_config["server"] == get_rpc_ws_url(hass)
+                    )
             device_status = {
                 k: v
                 for k, v in rpc_coordinator.device.status.items()
                 if k in ["sys", "wifi"]
             }
 
-        source = format_mac(rpc_coordinator.mac).upper()
-        if scanner := async_scanner_by_source(hass, source):
+        if scanner := async_scanner_by_source(hass, rpc_coordinator.bluetooth_source):
             bluetooth = {
                 "scanner": await scanner.async_diagnostics(),
             }
diff --git a/homeassistant/components/shelly/entity.py b/homeassistant/components/shelly/entity.py
index 8c9044aeaff..9ed3f47b41a 100644
--- a/homeassistant/components/shelly/entity.py
+++ b/homeassistant/components/shelly/entity.py
@@ -19,7 +19,7 @@ from homeassistant.helpers.entity_registry import RegistryEntry
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .const import CONF_SLEEP_PERIOD, LOGGER
+from .const import CONF_SLEEP_PERIOD, DOMAIN, LOGGER
 from .coordinator import ShellyBlockCoordinator, ShellyConfigEntry, ShellyRpcCoordinator
 from .utils import (
     async_remove_shelly_entity,
@@ -296,7 +296,6 @@ class RpcEntityDescription(EntityDescription):
     value: Callable[[Any, Any], Any] | None = None
     available: Callable[[dict], bool] | None = None
     removal_condition: Callable[[dict, dict, str], bool] | None = None
-    extra_state_attributes: Callable[[dict, dict], dict | None] | None = None
     use_polling_coordinator: bool = False
     supported: Callable = lambda _: False
     unit: Callable[[dict], str | None] | None = None
@@ -313,7 +312,6 @@ class RestEntityDescription(EntityDescription):
     name: str = ""
 
     value: Callable[[dict, Any], Any] | None = None
-    extra_state_attributes: Callable[[dict], dict | None] | None = None
 
 
 class ShellyBlockEntity(CoordinatorEntity[ShellyBlockCoordinator]):
@@ -347,8 +345,12 @@ class ShellyBlockEntity(CoordinatorEntity[ShellyBlockCoordinator]):
         except DeviceConnectionError as err:
             self.coordinator.last_update_success = False
             raise HomeAssistantError(
-                f"Setting state for entity {self.name} failed, state: {kwargs}, error:"
-                f" {err!r}"
+                translation_domain=DOMAIN,
+                translation_key="device_communication_action_error",
+                translation_placeholders={
+                    "entity": self.entity_id,
+                    "device": self.coordinator.name,
+                },
             ) from err
         except InvalidAuthError:
             await self.coordinator.async_shutdown_device_and_start_reauth()
@@ -390,26 +392,39 @@ class ShellyRpcEntity(CoordinatorEntity[ShellyRpcCoordinator]):
         """Handle device update."""
         self.async_write_ha_state()
 
-    async def call_rpc(self, method: str, params: Any) -> Any:
+    async def call_rpc(
+        self, method: str, params: Any, timeout: float | None = None
+    ) -> Any:
         """Call RPC method."""
         LOGGER.debug(
-            "Call RPC for entity %s, method: %s, params: %s",
+            "Call RPC for entity %s, method: %s, params: %s, timeout: %s",
             self.name,
             method,
             params,
+            timeout,
         )
         try:
+            if timeout:
+                return await self.coordinator.device.call_rpc(method, params, timeout)
             return await self.coordinator.device.call_rpc(method, params)
         except DeviceConnectionError as err:
             self.coordinator.last_update_success = False
             raise HomeAssistantError(
-                f"Call RPC for {self.name} connection error, method: {method}, params:"
-                f" {params}, error: {err!r}"
+                translation_domain=DOMAIN,
+                translation_key="device_communication_action_error",
+                translation_placeholders={
+                    "entity": self.entity_id,
+                    "device": self.coordinator.name,
+                },
             ) from err
         except RpcCallError as err:
             raise HomeAssistantError(
-                f"Call RPC for {self.name} request error, method: {method}, params:"
-                f" {params}, error: {err!r}"
+                translation_domain=DOMAIN,
+                translation_key="rpc_call_action_error",
+                translation_placeholders={
+                    "entity": self.entity_id,
+                    "device": self.coordinator.name,
+                },
             ) from err
         except InvalidAuthError:
             await self.coordinator.async_shutdown_device_and_start_reauth()
diff --git a/homeassistant/components/shelly/event.py b/homeassistant/components/shelly/event.py
index 372d73dea3c..ec5810581b1 100644
--- a/homeassistant/components/shelly/event.py
+++ b/homeassistant/components/shelly/event.py
@@ -6,6 +6,7 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, Final
 
+from aioshelly.ble.const import BLE_SCRIPT_NAME
 from aioshelly.block_device import Block
 from aioshelly.const import MODEL_I3, RPC_GENERATIONS
 
@@ -17,7 +18,7 @@ from homeassistant.components.event import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
@@ -28,6 +29,7 @@ from .const import (
 from .coordinator import ShellyBlockCoordinator, ShellyConfigEntry, ShellyRpcCoordinator
 from .entity import ShellyBlockEntity
 from .utils import (
+    async_remove_orphaned_entities,
     async_remove_shelly_entity,
     get_device_entry_gen,
     get_rpc_entity_name,
@@ -68,12 +70,19 @@ RPC_EVENT: Final = ShellyRpcEventDescription(
         config, status, key
     ),
 )
+SCRIPT_EVENT: Final = ShellyRpcEventDescription(
+    key="script",
+    translation_key="script",
+    device_class=None,
+    entity_registry_enabled_default=False,
+    has_entity_name=True,
+)
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors for device."""
     entities: list[ShellyBlockEvent | ShellyRpcEvent] = []
@@ -95,6 +104,30 @@ async def async_setup_entry(
                 async_remove_shelly_entity(hass, EVENT_DOMAIN, unique_id)
             else:
                 entities.append(ShellyRpcEvent(coordinator, key, RPC_EVENT))
+
+        script_instances = get_rpc_key_instances(
+            coordinator.device.status, SCRIPT_EVENT.key
+        )
+        script_events = config_entry.runtime_data.rpc_script_events
+        for script in script_instances:
+            script_name = get_rpc_entity_name(coordinator.device, script)
+            if script_name == BLE_SCRIPT_NAME:
+                continue
+
+            script_id = int(script.split(":")[-1])
+            if script_events and (event_types := script_events[script_id]):
+                entities.append(ShellyRpcScriptEvent(coordinator, script, event_types))
+
+        # If a script is removed, from the device configuration, we need to remove orphaned entities
+        async_remove_orphaned_entities(
+            hass,
+            config_entry.entry_id,
+            coordinator.mac,
+            EVENT_DOMAIN,
+            coordinator.device.status,
+            "script",
+        )
+
     else:
         coordinator = config_entry.runtime_data.block
         if TYPE_CHECKING:
@@ -170,7 +203,7 @@ class ShellyRpcEvent(CoordinatorEntity[ShellyRpcCoordinator], EventEntity):
     ) -> None:
         """Initialize Shelly entity."""
         super().__init__(coordinator)
-        self.input_index = int(key.split(":")[-1])
+        self.event_id = int(key.split(":")[-1])
         self._attr_device_info = DeviceInfo(
             connections={(CONNECTION_NETWORK_MAC, coordinator.mac)}
         )
@@ -181,6 +214,7 @@ class ShellyRpcEvent(CoordinatorEntity[ShellyRpcCoordinator], EventEntity):
     async def async_added_to_hass(self) -> None:
         """When entity is added to hass."""
         await super().async_added_to_hass()
+
         self.async_on_remove(
             self.coordinator.async_subscribe_input_events(self._async_handle_event)
         )
@@ -188,6 +222,42 @@ class ShellyRpcEvent(CoordinatorEntity[ShellyRpcCoordinator], EventEntity):
     @callback
     def _async_handle_event(self, event: dict[str, Any]) -> None:
         """Handle the demo button event."""
-        if event["id"] == self.input_index:
+        if event["id"] == self.event_id:
             self._trigger_event(event["event"])
             self.async_write_ha_state()
+
+
+class ShellyRpcScriptEvent(ShellyRpcEvent):
+    """Represent RPC script event entity."""
+
+    def __init__(
+        self,
+        coordinator: ShellyRpcCoordinator,
+        key: str,
+        event_types: list[str],
+    ) -> None:
+        """Initialize Shelly script event entity."""
+        super().__init__(coordinator, key, SCRIPT_EVENT)
+
+        self.component = key
+        self._attr_event_types = event_types
+
+    async def async_added_to_hass(self) -> None:
+        """When entity is added to hass."""
+        await super(CoordinatorEntity, self).async_added_to_hass()
+
+        self.async_on_remove(
+            self.coordinator.async_subscribe_events(self._async_handle_event)
+        )
+
+    @callback
+    def _async_handle_event(self, event: dict[str, Any]) -> None:
+        """Handle script event."""
+        if event.get("component") == self.component:
+            event_type = event.get("event")
+            if event_type not in self.event_types:
+                # This can happen if we didn't find this event type in the script
+                return
+
+            self._trigger_event(event_type, event.get("data"))
+            self.async_write_ha_state()
diff --git a/homeassistant/components/shelly/icons.json b/homeassistant/components/shelly/icons.json
index f93abf6b854..08b269a73c5 100644
--- a/homeassistant/components/shelly/icons.json
+++ b/homeassistant/components/shelly/icons.json
@@ -23,12 +23,18 @@
       "gas_concentration": {
         "default": "mdi:gauge"
       },
+      "gas_detected": {
+        "default": "mdi:gas-burner"
+      },
       "lamp_life": {
         "default": "mdi:progress-wrench"
       },
       "operation": {
         "default": "mdi:cog-transfer"
       },
+      "self_test": {
+        "default": "mdi:progress-wrench"
+      },
       "tilt": {
         "default": "mdi:angle-acute"
       },
diff --git a/homeassistant/components/shelly/light.py b/homeassistant/components/shelly/light.py
index 5d7bad810b4..ce31533b557 100644
--- a/homeassistant/components/shelly/light.py
+++ b/homeassistant/components/shelly/light.py
@@ -21,7 +21,7 @@ from homeassistant.components.light import (
     brightness_supported,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     BLOCK_MAX_TRANSITION_TIME_MS,
@@ -53,7 +53,7 @@ from .utils import (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up lights for device."""
     if get_device_entry_gen(config_entry) in RPC_GENERATIONS:
@@ -66,7 +66,7 @@ async def async_setup_entry(
 def async_setup_block_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entities for block device."""
     coordinator = config_entry.runtime_data.block
@@ -96,7 +96,7 @@ def async_setup_block_entry(
 def async_setup_rpc_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entities for RPC device."""
     coordinator = config_entry.runtime_data.rpc
diff --git a/homeassistant/components/shelly/manifest.json b/homeassistant/components/shelly/manifest.json
index cf5c59da5e3..e863720e476 100644
--- a/homeassistant/components/shelly/manifest.json
+++ b/homeassistant/components/shelly/manifest.json
@@ -8,11 +8,14 @@
   "integration_type": "device",
   "iot_class": "local_push",
   "loggers": ["aioshelly"],
-  "requirements": ["aioshelly==12.3.1"],
+  "requirements": ["aioshelly==13.4.0"],
   "zeroconf": [
     {
       "type": "_http._tcp.local.",
       "name": "shelly*"
+    },
+    {
+      "type": "_shelly._tcp.local."
     }
   ]
 }
diff --git a/homeassistant/components/shelly/number.py b/homeassistant/components/shelly/number.py
index fb61c885423..c629eb4a57a 100644
--- a/homeassistant/components/shelly/number.py
+++ b/homeassistant/components/shelly/number.py
@@ -7,7 +7,7 @@ from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, Final, cast
 
 from aioshelly.block_device import Block
-from aioshelly.const import RPC_GENERATIONS
+from aioshelly.const import BLU_TRV_TIMEOUT, RPC_GENERATIONS
 from aioshelly.exceptions import DeviceConnectionError, InvalidAuthError
 
 from homeassistant.components.number import (
@@ -22,10 +22,10 @@ from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import CONNECTION_BLUETOOTH, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.entity_registry import RegistryEntry
 
-from .const import CONF_SLEEP_PERIOD, LOGGER, VIRTUAL_NUMBER_MODE_MAP
+from .const import CONF_SLEEP_PERIOD, DOMAIN, LOGGER, VIRTUAL_NUMBER_MODE_MAP
 from .coordinator import ShellyBlockCoordinator, ShellyConfigEntry, ShellyRpcCoordinator
 from .entity import (
     BlockEntityDescription,
@@ -127,6 +127,35 @@ class RpcBluTrvNumber(RpcNumber):
             connections={(CONNECTION_BLUETOOTH, ble_addr)}
         )
 
+    async def async_set_native_value(self, value: float) -> None:
+        """Change the value."""
+        if TYPE_CHECKING:
+            assert isinstance(self._id, int)
+
+        await self.call_rpc(
+            self.entity_description.method,
+            self.entity_description.method_params_fn(self._id, value),
+            timeout=BLU_TRV_TIMEOUT,
+        )
+
+
+class RpcBluTrvExtTempNumber(RpcBluTrvNumber):
+    """Represent a RPC BluTrv External Temperature number."""
+
+    _reported_value: float | None = None
+
+    @property
+    def native_value(self) -> float | None:
+        """Return value of number."""
+        return self._reported_value
+
+    async def async_set_native_value(self, value: float) -> None:
+        """Change the value."""
+        await super().async_set_native_value(value)
+
+        self._reported_value = value
+        self.async_write_ha_state()
+
 
 NUMBERS: dict[tuple[str, str], BlockNumberDescription] = {
     ("device", "valvePos"): BlockNumberDescription(
@@ -164,7 +193,7 @@ RPC_NUMBERS: Final = {
             "method": "Trv.SetExternalTemperature",
             "params": {"id": 0, "t_C": value},
         },
-        entity_class=RpcBluTrvNumber,
+        entity_class=RpcBluTrvExtTempNumber,
     ),
     "number": RpcNumberDescription(
         key="number",
@@ -175,7 +204,7 @@ RPC_NUMBERS: Final = {
         mode_fn=lambda config: VIRTUAL_NUMBER_MODE_MAP.get(
             config["meta"]["ui"]["view"], NumberMode.BOX
         ),
-        step_fn=lambda config: config["meta"]["ui"]["step"],
+        step_fn=lambda config: config["meta"]["ui"].get("step"),
         # If the unit is not set, the device sends an empty string
         unit=lambda config: config["meta"]["ui"]["unit"]
         if config["meta"]["ui"]["unit"]
@@ -197,7 +226,7 @@ RPC_NUMBERS: Final = {
         method_params_fn=lambda idx, value: {
             "id": idx,
             "method": "Trv.SetPosition",
-            "params": {"id": 0, "pos": value},
+            "params": {"id": 0, "pos": int(value)},
         },
         removal_condition=lambda config, _status, key: config[key].get("enable", True)
         is True,
@@ -209,7 +238,7 @@ RPC_NUMBERS: Final = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up numbers for device."""
     if get_device_entry_gen(config_entry) in RPC_GENERATIONS:
@@ -295,8 +324,12 @@ class BlockSleepingNumber(ShellySleepingBlockAttributeEntity, RestoreNumber):
         except DeviceConnectionError as err:
             self.coordinator.last_update_success = False
             raise HomeAssistantError(
-                f"Setting state for entity {self.name} failed, state: {params}, error:"
-                f" {err!r}"
+                translation_domain=DOMAIN,
+                translation_key="device_communication_action_error",
+                translation_placeholders={
+                    "entity": self.entity_id,
+                    "device": self.coordinator.name,
+                },
             ) from err
         except InvalidAuthError:
             await self.coordinator.async_shutdown_device_and_start_reauth()
diff --git a/homeassistant/components/shelly/select.py b/homeassistant/components/shelly/select.py
index 0caf4661240..1fb3dfb3447 100644
--- a/homeassistant/components/shelly/select.py
+++ b/homeassistant/components/shelly/select.py
@@ -13,7 +13,7 @@ from homeassistant.components.select import (
     SelectEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import ShellyConfigEntry, ShellyRpcCoordinator
 from .entity import (
@@ -45,7 +45,7 @@ RPC_SELECT_ENTITIES: Final = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up selectors for device."""
     if get_device_entry_gen(config_entry) in RPC_GENERATIONS:
diff --git a/homeassistant/components/shelly/sensor.py b/homeassistant/components/shelly/sensor.py
index 6d000556cf3..79e4c97aead 100644
--- a/homeassistant/components/shelly/sensor.py
+++ b/homeassistant/components/shelly/sensor.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable
 from dataclasses import dataclass
 from typing import Final, cast
 
@@ -34,11 +35,11 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import CONNECTION_BLUETOOTH, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.entity_registry import RegistryEntry
 from homeassistant.helpers.typing import StateType
 
-from .const import CONF_SLEEP_PERIOD, SHAIR_MAX_WORK_HOURS
+from .const import CONF_SLEEP_PERIOD, ROLE_TO_DEVICE_CLASS_MAP
 from .coordinator import ShellyBlockCoordinator, ShellyConfigEntry, ShellyRpcCoordinator
 from .entity import (
     BlockEntityDescription,
@@ -57,6 +58,7 @@ from .utils import (
     async_remove_orphaned_entities,
     get_device_entry_gen,
     get_device_uptime,
+    get_shelly_air_lamp_life,
     get_virtual_component_ids,
     is_rpc_wifi_stations_disabled,
 )
@@ -71,6 +73,8 @@ class BlockSensorDescription(BlockEntityDescription, SensorEntityDescription):
 class RpcSensorDescription(RpcEntityDescription, SensorEntityDescription):
     """Class to describe a RPC sensor."""
 
+    device_class_fn: Callable[[dict], SensorDeviceClass | None] | None = None
+
 
 @dataclass(frozen=True, kw_only=True)
 class RestSensorDescription(RestEntityDescription, SensorEntityDescription):
@@ -95,6 +99,12 @@ class RpcSensor(ShellyRpcAttributeEntity, SensorEntity):
         if self.option_map:
             self._attr_options = list(self.option_map.values())
 
+        if description.device_class_fn is not None:
+            if device_class := description.device_class_fn(
+                coordinator.device.config[key]
+            ):
+                self._attr_device_class = device_class
+
     @property
     def native_value(self) -> StateType:
         """Return value of sensor."""
@@ -346,8 +356,9 @@ SENSORS: dict[tuple[str, str], BlockSensorDescription] = {
         name="Lamp life",
         native_unit_of_measurement=PERCENTAGE,
         translation_key="lamp_life",
-        value=lambda value: 100 - (value / 3600 / SHAIR_MAX_WORK_HOURS),
+        value=get_shelly_air_lamp_life,
         suggested_display_precision=1,
+        # Deprecated, remove in 2025.10
         extra_state_attributes=lambda block: {
             "Operational hours": round(cast(int, block.totalWorkTime) / 3600, 1)
         },
@@ -365,9 +376,10 @@ SENSORS: dict[tuple[str, str], BlockSensorDescription] = {
         key="sensor|sensorOp",
         name="Operation",
         device_class=SensorDeviceClass.ENUM,
-        options=["unknown", "warmup", "normal", "fault"],
+        options=["warmup", "normal", "fault"],
         translation_key="operation",
-        value=lambda value: value,
+        value=lambda value: None if value == "unknown" else value,
+        # Deprecated, remove in 2025.10
         extra_state_attributes=lambda block: {"self_test": block.selfTest},
     ),
     ("valve", "valve"): BlockSensorDescription(
@@ -382,11 +394,33 @@ SENSORS: dict[tuple[str, str], BlockSensorDescription] = {
             "failure",
             "opened",
             "opening",
-            "unknown",
         ],
+        value=lambda value: None if value == "unknown" else value,
         entity_category=EntityCategory.DIAGNOSTIC,
         removal_condition=lambda _, block: block.valve == "not_connected",
     ),
+    ("sensor", "gas"): BlockSensorDescription(
+        key="sensor|gas",
+        name="Gas detected",
+        translation_key="gas_detected",
+        device_class=SensorDeviceClass.ENUM,
+        options=[
+            "none",
+            "mild",
+            "heavy",
+            "test",
+        ],
+        value=lambda value: None if value == "unknown" else value,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    ("sensor", "selfTest"): BlockSensorDescription(
+        key="sensor|selfTest",
+        name="Self test",
+        translation_key="self_test",
+        device_class=SensorDeviceClass.ENUM,
+        options=["not_completed", "completed", "running", "pending"],
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
 }
 
 REST_SENSORS: Final = {
@@ -1266,6 +1300,9 @@ RPC_SENSORS: Final = {
         unit=lambda config: config["meta"]["ui"]["unit"]
         if config["meta"]["ui"]["unit"]
         else None,
+        device_class_fn=lambda config: ROLE_TO_DEVICE_CLASS_MAP.get(config["role"])
+        if "role" in config
+        else None,
     ),
     "enum": RpcSensorDescription(
         key="enum",
@@ -1312,7 +1349,7 @@ RPC_SENSORS: Final = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors for device."""
     if get_device_entry_gen(config_entry) in RPC_GENERATIONS:
diff --git a/homeassistant/components/shelly/strings.json b/homeassistant/components/shelly/strings.json
index eb869b54e4c..afc3f92a3ce 100644
--- a/homeassistant/components/shelly/strings.json
+++ b/homeassistant/components/shelly/strings.json
@@ -17,12 +17,20 @@
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "username": "Username for the device's web panel.",
+          "password": "Password for the device's web panel."
         }
       },
       "reauth_confirm": {
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "username": "[%key:component::shelly::config::step::credentials::data_description::username%]",
+          "password": "[%key:component::shelly::config::step::credentials::data_description::password%]"
         }
       },
       "confirm_discovery": {
@@ -87,8 +95,15 @@
         "description": "Bluetooth scanning can be active or passive. With active, the Shelly requests data from nearby devices; with passive, the Shelly receives unsolicited data from nearby devices.",
         "data": {
           "ble_scanner_mode": "Bluetooth scanner mode"
+        },
+        "data_description": {
+          "ble_scanner_mode": "The scanner mode to use for Bluetooth scanning."
         }
       }
+    },
+    "abort": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "no_scripts_support": "Device does not support scripts and cannot be used as a Bluetooth scanner."
     }
   },
   "selector": {
@@ -106,7 +121,6 @@
         "state_attributes": {
           "detected": {
             "state": {
-              "unknown": "Unknown",
               "none": "None",
               "mild": "Mild",
               "heavy": "Heavy",
@@ -139,9 +153,26 @@
       }
     },
     "sensor": {
+      "gas_detected": {
+        "state": {
+          "none": "None",
+          "mild": "Mild",
+          "heavy": "Heavy",
+          "test": "Test"
+        },
+        "state_attributes": {
+          "options": {
+            "state": {
+              "none": "[%key:component::shelly::entity::sensor::gas_detected::state::none%]",
+              "mild": "[%key:component::shelly::entity::sensor::gas_detected::state::mild%]",
+              "heavy": "[%key:component::shelly::entity::sensor::gas_detected::state::heavy%]",
+              "test": "[%key:component::shelly::entity::sensor::gas_detected::state::test%]"
+            }
+          }
+        }
+      },
       "operation": {
         "state": {
-          "unknown": "Unknown",
           "warmup": "Warm-up",
           "normal": "Normal",
           "fault": "Fault"
@@ -157,6 +188,24 @@
           }
         }
       },
+      "self_test": {
+        "state": {
+          "not_completed": "Not completed",
+          "completed": "Completed",
+          "running": "Running",
+          "pending": "Pending"
+        },
+        "state_attributes": {
+          "options": {
+            "state": {
+              "not_completed": "[%key:component::shelly::entity::sensor::self_test::state::not_completed%]",
+              "completed": "[%key:component::shelly::entity::sensor::self_test::state::completed%]",
+              "running": "[%key:component::shelly::entity::sensor::self_test::state::running%]",
+              "pending": "[%key:component::shelly::entity::sensor::self_test::state::pending%]"
+            }
+          }
+        }
+      },
       "valve_status": {
         "state": {
           "checking": "Checking",
@@ -164,12 +213,52 @@
           "closing": "Closing",
           "failure": "Failure",
           "opened": "Opened",
-          "opening": "Opening",
-          "unknown": "[%key:component::shelly::entity::sensor::operation::state::unknown%]"
+          "opening": "Opening"
         }
       }
     }
   },
+  "exceptions": {
+    "auth_error": {
+      "message": "Authentication failed for {device}, please update your credentials"
+    },
+    "device_communication_error": {
+      "message": "Device communication error occurred for {device}"
+    },
+    "device_communication_action_error": {
+      "message": "Device communication error occurred while calling action for {entity} of {device}"
+    },
+    "device_not_found": {
+      "message": "{device} not found while configuring device automation triggers"
+    },
+    "firmware_unsupported": {
+      "message": "{device} is running an unsupported firmware, please update the firmware"
+    },
+    "invalid_trigger": {
+      "message": "Invalid device automation trigger (type, subtype): {trigger}"
+    },
+    "ota_update_connection_error": {
+      "message": "Device communication error occurred while triggering OTA update for {device}"
+    },
+    "ota_update_rpc_error": {
+      "message": "RPC call error occurred while triggering OTA update for {device}"
+    },
+    "rpc_call_action_error": {
+      "message": "RPC call error occurred while calling action for {entity} of {device}"
+    },
+    "update_error": {
+      "message": "An error occurred while retrieving data from {device}"
+    },
+    "update_error_device_disconnected": {
+      "message": "An error occurred while retrieving data from {device} because it is disconnected"
+    },
+    "update_error_reconnect_error": {
+      "message": "An error occurred while reconnecting to {device}"
+    },
+    "update_error_sleeping_device": {
+      "message": "Sleeping device did not update within {period} seconds interval"
+    }
+  },
   "issues": {
     "device_not_calibrated": {
       "title": "Shelly device {device_name} is not calibrated",
diff --git a/homeassistant/components/shelly/switch.py b/homeassistant/components/shelly/switch.py
index 8a33dae0938..ce9e4f065fb 100644
--- a/homeassistant/components/shelly/switch.py
+++ b/homeassistant/components/shelly/switch.py
@@ -2,12 +2,14 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable
 from dataclasses import dataclass
 from typing import Any, cast
 
 from aioshelly.block_device import Block
-from aioshelly.const import MODEL_2, MODEL_25, MODEL_WALL_DISPLAY, RPC_GENERATIONS
+from aioshelly.const import RPC_GENERATIONS
 
+from homeassistant.components.climate import DOMAIN as CLIMATE_PLATFORM
 from homeassistant.components.switch import (
     DOMAIN as SWITCH_PLATFORM,
     SwitchEntity,
@@ -15,32 +17,26 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import STATE_ON, EntityCategory
 from homeassistant.core import HomeAssistant, State, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.entity_registry import RegistryEntry
 from homeassistant.helpers.restore_state import RestoreEntity
 
-from .const import CONF_SLEEP_PERIOD, MOTION_MODELS
 from .coordinator import ShellyBlockCoordinator, ShellyConfigEntry, ShellyRpcCoordinator
 from .entity import (
     BlockEntityDescription,
     RpcEntityDescription,
-    ShellyBlockEntity,
+    ShellyBlockAttributeEntity,
     ShellyRpcAttributeEntity,
-    ShellyRpcEntity,
     ShellySleepingBlockAttributeEntity,
     async_setup_entry_attribute_entities,
-    async_setup_rpc_attribute_entities,
+    async_setup_entry_rpc,
 )
 from .utils import (
     async_remove_orphaned_entities,
-    async_remove_shelly_entity,
     get_device_entry_gen,
-    get_rpc_key_ids,
     get_virtual_component_ids,
-    is_block_channel_type_light,
-    is_rpc_channel_type_light,
-    is_rpc_thermostat_internal_actuator,
-    is_rpc_thermostat_mode,
+    is_block_exclude_from_relay,
+    is_rpc_exclude_from_relay,
 )
 
 
@@ -49,35 +45,70 @@ class BlockSwitchDescription(BlockEntityDescription, SwitchEntityDescription):
     """Class to describe a BLOCK switch."""
 
 
-MOTION_SWITCH = BlockSwitchDescription(
-    key="sensor|motionActive",
-    name="Motion detection",
-    entity_category=EntityCategory.CONFIG,
-)
+BLOCK_RELAY_SWITCHES = {
+    ("relay", "output"): BlockSwitchDescription(
+        key="relay|output",
+        removal_condition=is_block_exclude_from_relay,
+    )
+}
+
+BLOCK_SLEEPING_MOTION_SWITCH = {
+    ("sensor", "motionActive"): BlockSwitchDescription(
+        key="sensor|motionActive",
+        name="Motion detection",
+        entity_category=EntityCategory.CONFIG,
+    )
+}
 
 
 @dataclass(frozen=True, kw_only=True)
 class RpcSwitchDescription(RpcEntityDescription, SwitchEntityDescription):
     """Class to describe a RPC virtual switch."""
 
+    is_on: Callable[[dict[str, Any]], bool]
+    method_on: str
+    method_off: str
+    method_params_fn: Callable[[int | None, bool], dict]
 
-RPC_VIRTUAL_SWITCH = RpcSwitchDescription(
-    key="boolean",
-    sub_key="value",
-)
 
-RPC_SCRIPT_SWITCH = RpcSwitchDescription(
-    key="script",
-    sub_key="running",
-    entity_registry_enabled_default=False,
-    entity_category=EntityCategory.CONFIG,
-)
+RPC_RELAY_SWITCHES = {
+    "switch": RpcSwitchDescription(
+        key="switch",
+        sub_key="output",
+        removal_condition=is_rpc_exclude_from_relay,
+        is_on=lambda status: bool(status["output"]),
+        method_on="Switch.Set",
+        method_off="Switch.Set",
+        method_params_fn=lambda id, value: {"id": id, "on": value},
+    ),
+}
+
+RPC_SWITCHES = {
+    "boolean": RpcSwitchDescription(
+        key="boolean",
+        sub_key="value",
+        is_on=lambda status: bool(status["value"]),
+        method_on="Boolean.Set",
+        method_off="Boolean.Set",
+        method_params_fn=lambda id, value: {"id": id, "value": value},
+    ),
+    "script": RpcSwitchDescription(
+        key="script",
+        sub_key="running",
+        is_on=lambda status: bool(status["running"]),
+        method_on="Script.Start",
+        method_off="Script.Stop",
+        method_params_fn=lambda id, _: {"id": id},
+        entity_registry_enabled_default=False,
+        entity_category=EntityCategory.CONFIG,
+    ),
+}
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switches for device."""
     if get_device_entry_gen(config_entry) in RPC_GENERATIONS:
@@ -90,104 +121,41 @@ async def async_setup_entry(
 def async_setup_block_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entities for block device."""
     coordinator = config_entry.runtime_data.block
     assert coordinator
 
-    # Add Shelly Motion as a switch
-    if coordinator.model in MOTION_MODELS:
-        async_setup_entry_attribute_entities(
-            hass,
-            config_entry,
-            async_add_entities,
-            {("sensor", "motionActive"): MOTION_SWITCH},
-            BlockSleepingMotionSwitch,
-        )
-        return
+    async_setup_entry_attribute_entities(
+        hass, config_entry, async_add_entities, BLOCK_RELAY_SWITCHES, BlockRelaySwitch
+    )
 
-    if config_entry.data[CONF_SLEEP_PERIOD]:
-        return
-
-    # In roller mode the relay blocks exist but do not contain required info
-    if (
-        coordinator.model in [MODEL_2, MODEL_25]
-        and coordinator.device.settings["mode"] != "relay"
-    ):
-        return
-
-    relay_blocks = []
-    assert coordinator.device.blocks
-    for block in coordinator.device.blocks:
-        if block.type != "relay" or (
-            block.channel is not None
-            and is_block_channel_type_light(
-                coordinator.device.settings, int(block.channel)
-            )
-        ):
-            continue
-
-        relay_blocks.append(block)
-        unique_id = f"{coordinator.mac}-{block.type}_{block.channel}"
-        async_remove_shelly_entity(hass, "light", unique_id)
-
-    if not relay_blocks:
-        return
-
-    async_add_entities(BlockRelaySwitch(coordinator, block) for block in relay_blocks)
+    async_setup_entry_attribute_entities(
+        hass,
+        config_entry,
+        async_add_entities,
+        BLOCK_SLEEPING_MOTION_SWITCH,
+        BlockSleepingMotionSwitch,
+    )
 
 
 @callback
 def async_setup_rpc_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entities for RPC device."""
     coordinator = config_entry.runtime_data.rpc
     assert coordinator
-    switch_key_ids = get_rpc_key_ids(coordinator.device.status, "switch")
 
-    switch_ids = []
-    for id_ in switch_key_ids:
-        if is_rpc_channel_type_light(coordinator.device.config, id_):
-            continue
-
-        if coordinator.model == MODEL_WALL_DISPLAY:
-            # There are three configuration scenarios for WallDisplay:
-            # - relay mode (no thermostat)
-            # - thermostat mode using the internal relay as an actuator
-            # - thermostat mode using an external (from another device) relay as
-            #   an actuator
-            if not is_rpc_thermostat_mode(id_, coordinator.device.status):
-                # The device is not in thermostat mode, we need to remove a climate
-                # entity
-                unique_id = f"{coordinator.mac}-thermostat:{id_}"
-                async_remove_shelly_entity(hass, "climate", unique_id)
-            elif is_rpc_thermostat_internal_actuator(coordinator.device.status):
-                # The internal relay is an actuator, skip this ID so as not to create
-                # a switch entity
-                continue
-
-        switch_ids.append(id_)
-        unique_id = f"{coordinator.mac}-switch:{id_}"
-        async_remove_shelly_entity(hass, "light", unique_id)
-
-    async_setup_rpc_attribute_entities(
-        hass,
-        config_entry,
-        async_add_entities,
-        {"boolean": RPC_VIRTUAL_SWITCH},
-        RpcVirtualSwitch,
+    async_setup_entry_rpc(
+        hass, config_entry, async_add_entities, RPC_RELAY_SWITCHES, RpcRelaySwitch
     )
 
-    async_setup_rpc_attribute_entities(
-        hass,
-        config_entry,
-        async_add_entities,
-        {"script": RPC_SCRIPT_SWITCH},
-        RpcScriptSwitch,
+    async_setup_entry_rpc(
+        hass, config_entry, async_add_entities, RPC_SWITCHES, RpcSwitch
     )
 
     # the user can remove virtual components from the device configuration, so we need
@@ -215,10 +183,16 @@ def async_setup_rpc_entry(
         "script",
     )
 
-    if not switch_ids:
-        return
-
-    async_add_entities(RpcRelaySwitch(coordinator, id_) for id_ in switch_ids)
+    # if the climate is removed, from the device configuration, we need
+    # to remove orphaned entities
+    async_remove_orphaned_entities(
+        hass,
+        config_entry.entry_id,
+        coordinator.mac,
+        CLIMATE_PLATFORM,
+        coordinator.device.status,
+        "thermostat",
+    )
 
 
 class BlockSleepingMotionSwitch(
@@ -269,13 +243,22 @@ class BlockSleepingMotionSwitch(
             self.last_state = last_state
 
 
-class BlockRelaySwitch(ShellyBlockEntity, SwitchEntity):
+class BlockRelaySwitch(ShellyBlockAttributeEntity, SwitchEntity):
     """Entity that controls a relay on Block based Shelly devices."""
 
-    def __init__(self, coordinator: ShellyBlockCoordinator, block: Block) -> None:
+    entity_description: BlockSwitchDescription
+
+    def __init__(
+        self,
+        coordinator: ShellyBlockCoordinator,
+        block: Block,
+        attribute: str,
+        description: BlockSwitchDescription,
+    ) -> None:
         """Initialize relay switch."""
-        super().__init__(coordinator, block)
+        super().__init__(coordinator, block, attribute, description)
         self.control_result: dict[str, Any] | None = None
+        self._attr_unique_id: str = f"{coordinator.mac}-{block.description}"
 
     @property
     def is_on(self) -> bool:
@@ -302,30 +285,8 @@ class BlockRelaySwitch(ShellyBlockEntity, SwitchEntity):
         super()._update_callback()
 
 
-class RpcRelaySwitch(ShellyRpcEntity, SwitchEntity):
-    """Entity that controls a relay on RPC based Shelly devices."""
-
-    def __init__(self, coordinator: ShellyRpcCoordinator, id_: int) -> None:
-        """Initialize relay switch."""
-        super().__init__(coordinator, f"switch:{id_}")
-        self._id = id_
-
-    @property
-    def is_on(self) -> bool:
-        """If switch is on."""
-        return bool(self.status["output"])
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn on relay."""
-        await self.call_rpc("Switch.Set", {"id": self._id, "on": True})
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn off relay."""
-        await self.call_rpc("Switch.Set", {"id": self._id, "on": False})
-
-
-class RpcVirtualSwitch(ShellyRpcAttributeEntity, SwitchEntity):
-    """Entity that controls a virtual boolean component on RPC based Shelly devices."""
+class RpcSwitch(ShellyRpcAttributeEntity, SwitchEntity):
+    """Entity that controls a switch on RPC based Shelly devices."""
 
     entity_description: RpcSwitchDescription
     _attr_has_entity_name = True
@@ -333,32 +294,36 @@ class RpcVirtualSwitch(ShellyRpcAttributeEntity, SwitchEntity):
     @property
     def is_on(self) -> bool:
         """If switch is on."""
-        return bool(self.attribute_value)
+        return self.entity_description.is_on(self.status)
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn on relay."""
-        await self.call_rpc("Boolean.Set", {"id": self._id, "value": True})
+        await self.call_rpc(
+            self.entity_description.method_on,
+            self.entity_description.method_params_fn(self._id, True),
+        )
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn off relay."""
-        await self.call_rpc("Boolean.Set", {"id": self._id, "value": False})
+        await self.call_rpc(
+            self.entity_description.method_off,
+            self.entity_description.method_params_fn(self._id, False),
+        )
 
 
-class RpcScriptSwitch(ShellyRpcAttributeEntity, SwitchEntity):
-    """Entity that controls a script component on RPC based Shelly devices."""
+class RpcRelaySwitch(RpcSwitch):
+    """Entity that controls a switch on RPC based Shelly devices."""
 
-    entity_description: RpcSwitchDescription
-    _attr_has_entity_name = True
+    # False to avoid double naming as True is inerithed from base class
+    _attr_has_entity_name = False
 
-    @property
-    def is_on(self) -> bool:
-        """If switch is on."""
-        return bool(self.status["running"])
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn on relay."""
-        await self.call_rpc("Script.Start", {"id": self._id})
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn off relay."""
-        await self.call_rpc("Script.Stop", {"id": self._id})
+    def __init__(
+        self,
+        coordinator: ShellyRpcCoordinator,
+        key: str,
+        attribute: str,
+        description: RpcEntityDescription,
+    ) -> None:
+        """Initialize the switch."""
+        super().__init__(coordinator, key, attribute, description)
+        self._attr_unique_id: str = f"{coordinator.mac}-{key}"
diff --git a/homeassistant/components/shelly/text.py b/homeassistant/components/shelly/text.py
index 66e2ee4c715..f64d1252b7e 100644
--- a/homeassistant/components/shelly/text.py
+++ b/homeassistant/components/shelly/text.py
@@ -13,7 +13,7 @@ from homeassistant.components.text import (
     TextEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import ShellyConfigEntry
 from .entity import (
@@ -45,7 +45,7 @@ RPC_TEXT_ENTITIES: Final = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors for device."""
     if get_device_entry_gen(config_entry) in RPC_GENERATIONS:
diff --git a/homeassistant/components/shelly/update.py b/homeassistant/components/shelly/update.py
index f22547acf50..12ce6dc70cd 100644
--- a/homeassistant/components/shelly/update.py
+++ b/homeassistant/components/shelly/update.py
@@ -22,10 +22,17 @@ from homeassistant.components.update import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
-from .const import CONF_SLEEP_PERIOD, OTA_BEGIN, OTA_ERROR, OTA_PROGRESS, OTA_SUCCESS
+from .const import (
+    CONF_SLEEP_PERIOD,
+    DOMAIN,
+    OTA_BEGIN,
+    OTA_ERROR,
+    OTA_PROGRESS,
+    OTA_SUCCESS,
+)
 from .coordinator import ShellyBlockCoordinator, ShellyConfigEntry, ShellyRpcCoordinator
 from .entity import (
     RestEntityDescription,
@@ -104,7 +111,7 @@ RPC_UPDATES: Final = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up update entities for Shelly component."""
     if get_device_entry_gen(config_entry) in RPC_GENERATIONS:
@@ -198,7 +205,11 @@ class RestUpdateEntity(ShellyRestAttributeEntity, UpdateEntity):
         try:
             result = await self.coordinator.device.trigger_ota_update(beta=beta)
         except DeviceConnectionError as err:
-            raise HomeAssistantError(f"Error starting OTA update: {err!r}") from err
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="ota_update_connection_error",
+                translation_placeholders={"device": self.coordinator.name},
+            ) from err
         except InvalidAuthError:
             await self.coordinator.async_shutdown_device_and_start_reauth()
         else:
@@ -310,9 +321,20 @@ class RpcUpdateEntity(ShellyRpcAttributeEntity, UpdateEntity):
         try:
             await self.coordinator.device.trigger_ota_update(beta=beta)
         except DeviceConnectionError as err:
-            raise HomeAssistantError(f"OTA update connection error: {err!r}") from err
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="ota_update_connection_error",
+                translation_placeholders={"device": self.coordinator.name},
+            ) from err
         except RpcCallError as err:
-            raise HomeAssistantError(f"OTA update request error: {err!r}") from err
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="ota_update_rpc_error",
+                translation_placeholders={
+                    "entity": self.entity_id,
+                    "device": self.coordinator.name,
+                },
+            ) from err
         except InvalidAuthError:
             await self.coordinator.async_shutdown_device_and_start_reauth()
         else:
diff --git a/homeassistant/components/shelly/utils.py b/homeassistant/components/shelly/utils.py
index 81766c65388..474e2bb9410 100644
--- a/homeassistant/components/shelly/utils.py
+++ b/homeassistant/components/shelly/utils.py
@@ -6,7 +6,7 @@ from collections.abc import Iterable
 from datetime import datetime, timedelta
 from ipaddress import IPv4Address, IPv6Address, ip_address
 from types import MappingProxyType
-from typing import Any, cast
+from typing import TYPE_CHECKING, Any, cast
 
 from aiohttp.web import Request, WebSocketResponse
 from aioshelly.block_device import COAP, Block, BlockDevice
@@ -28,7 +28,12 @@ from yarl import URL
 from homeassistant.components import network
 from homeassistant.components.http import HomeAssistantView
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_PORT, EVENT_HOMEASSISTANT_STOP
+from homeassistant.const import (
+    CONF_HOST,
+    CONF_MODEL,
+    CONF_PORT,
+    EVENT_HOMEASSISTANT_STOP,
+)
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.helpers import (
     device_registry as dr,
@@ -54,8 +59,10 @@ from .const import (
     GEN2_RELEASE_URL,
     LOGGER,
     RPC_INPUTS_EVENTS_TYPES,
+    SHAIR_MAX_WORK_HOURS,
     SHBTN_INPUTS_EVENTS_TYPES,
     SHBTN_MODELS,
+    SHELLY_EMIT_EVENT_PATTERN,
     SHIX3_1_INPUTS_EVENTS_TYPES,
     UPTIME_DEVIATION,
     VIRTUAL_COMPONENTS_MAP,
@@ -174,6 +181,18 @@ def is_block_momentary_input(
     return button_type in momentary_types
 
 
+def is_block_exclude_from_relay(settings: dict[str, Any], block: Block) -> bool:
+    """Return true if block should be excluded from switch platform."""
+
+    if settings.get("mode") == "roller":
+        return True
+
+    if TYPE_CHECKING:
+        assert block.channel is not None
+
+    return is_block_channel_type_light(settings, int(block.channel))
+
+
 def get_device_uptime(uptime: float, last_uptime: datetime | None) -> datetime:
     """Return device uptime string, tolerate up to 5 seconds deviation."""
     delta_uptime = utcnow() - timedelta(seconds=uptime)
@@ -309,11 +328,32 @@ def get_info_gen(info: dict[str, Any]) -> int:
 def get_model_name(info: dict[str, Any]) -> str:
     """Return the device model name."""
     if get_info_gen(info) in RPC_GENERATIONS:
-        return cast(str, MODEL_NAMES.get(info["model"], info["model"]))
+        return cast(str, MODEL_NAMES.get(info[CONF_MODEL], info[CONF_MODEL]))
 
     return cast(str, MODEL_NAMES.get(info["type"], info["type"]))
 
 
+def get_shelly_model_name(
+    model: str,
+    sleep_period: int,
+    device: BlockDevice | RpcDevice,
+) -> str | None:
+    """Get Shelly model name.
+
+    Assume that XMOD devices are not sleepy devices.
+    """
+    if (
+        sleep_period == 0
+        and isinstance(device, RpcDevice)
+        and (model_name := device.xmod_info.get("n"))
+    ):
+        # Use the model name from XMOD data
+        return cast(str, model_name)
+
+    # Use the model name from aioshelly
+    return cast(str, MODEL_NAMES.get(model))
+
+
 def get_rpc_channel_name(device: RpcDevice, key: str) -> str:
     """Get name based on device and channel name."""
     key = key.replace("emdata", "em")
@@ -480,7 +520,7 @@ def async_create_issue_unsupported_firmware(
         translation_key="unsupported_firmware",
         translation_placeholders={
             "device_name": entry.title,
-            "ip_address": entry.data["host"],
+            "ip_address": entry.data[CONF_HOST],
         },
     )
 
@@ -598,3 +638,46 @@ def get_rpc_ws_url(hass: HomeAssistant) -> str | None:
     url = URL(raw_url)
     ws_url = url.with_scheme("wss" if url.scheme == "https" else "ws")
     return str(ws_url.joinpath(API_WS_URL.removeprefix("/")))
+
+
+async def get_rpc_script_event_types(device: RpcDevice, id: int) -> list[str]:
+    """Return a list of event types for a specific script."""
+    code_response = await device.script_getcode(id)
+    matches = SHELLY_EMIT_EVENT_PATTERN.finditer(code_response["data"])
+    return sorted([*{str(event_type.group(1)) for event_type in matches}])
+
+
+def is_rpc_exclude_from_relay(
+    settings: dict[str, Any], status: dict[str, Any], channel: str
+) -> bool:
+    """Return true if rpc channel should be excludeed from switch platform."""
+    ch = int(channel.split(":")[1])
+    if is_rpc_thermostat_internal_actuator(status):
+        return True
+
+    return is_rpc_channel_type_light(settings, ch)
+
+
+def get_shelly_air_lamp_life(lamp_seconds: int) -> float:
+    """Return Shelly Air lamp life in percentage."""
+    lamp_hours = lamp_seconds / 3600
+    if lamp_hours >= SHAIR_MAX_WORK_HOURS:
+        return 0.0
+    return 100 * (1 - lamp_hours / SHAIR_MAX_WORK_HOURS)
+
+
+async def get_rpc_scripts_event_types(
+    device: RpcDevice, ignore_scripts: list[str]
+) -> dict[int, list[str]]:
+    """Return a dict of all scripts and their event types."""
+    script_instances = get_rpc_key_instances(device.status, "script")
+    script_events = {}
+    for script in script_instances:
+        script_name = get_rpc_entity_name(device, script)
+        if script_name in ignore_scripts:
+            continue
+
+        script_id = int(script.split(":")[-1])
+        script_events[script_id] = await get_rpc_script_event_types(device, script_id)
+
+    return script_events
diff --git a/homeassistant/components/shelly/valve.py b/homeassistant/components/shelly/valve.py
index ea6feaabe69..1829f663b22 100644
--- a/homeassistant/components/shelly/valve.py
+++ b/homeassistant/components/shelly/valve.py
@@ -15,7 +15,7 @@ from homeassistant.components.valve import (
     ValveEntityFeature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import ShellyBlockCoordinator, ShellyConfigEntry
 from .entity import (
@@ -42,7 +42,7 @@ GAS_VALVE = BlockValveDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up valves for device."""
     if get_device_entry_gen(config_entry) in BLOCK_GENERATIONS:
@@ -53,7 +53,7 @@ async def async_setup_entry(
 def async_setup_block_entry(
     hass: HomeAssistant,
     config_entry: ShellyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up valve for device."""
     coordinator = config_entry.runtime_data.block
diff --git a/homeassistant/components/shodan/sensor.py b/homeassistant/components/shodan/sensor.py
index 867b58ad1ba..ef0f4dafd83 100644
--- a/homeassistant/components/shodan/sensor.py
+++ b/homeassistant/components/shodan/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_API_KEY, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/shopping_list/__init__.py b/homeassistant/components/shopping_list/__init__.py
index 531bbf37980..4ce596e72f0 100644
--- a/homeassistant/components/shopping_list/__init__.py
+++ b/homeassistant/components/shopping_list/__init__.py
@@ -17,7 +17,7 @@ from homeassistant.components.http.data_validator import RequestDataValidator
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_NAME, Platform
 from homeassistant.core import Context, HomeAssistant, ServiceCall, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.json import save_json
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.json import JsonValueType, load_json_array
diff --git a/homeassistant/components/shopping_list/intent.py b/homeassistant/components/shopping_list/intent.py
index 1a6370f4168..118287f70d2 100644
--- a/homeassistant/components/shopping_list/intent.py
+++ b/homeassistant/components/shopping_list/intent.py
@@ -3,8 +3,7 @@
 from __future__ import annotations
 
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import intent
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, intent
 
 from . import DOMAIN, EVENT_SHOPPING_LIST_UPDATED
 
diff --git a/homeassistant/components/shopping_list/todo.py b/homeassistant/components/shopping_list/todo.py
index 82b6cbfc7f5..2952c283082 100644
--- a/homeassistant/components/shopping_list/todo.py
+++ b/homeassistant/components/shopping_list/todo.py
@@ -11,7 +11,7 @@ from homeassistant.components.todo import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import NoMatchingShoppingListItem, ShoppingData
 from .const import DOMAIN
@@ -20,7 +20,7 @@ from .const import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the shopping_list todo platform."""
     shopping_data = hass.data[DOMAIN]
diff --git a/homeassistant/components/sia/alarm_control_panel.py b/homeassistant/components/sia/alarm_control_panel.py
index 7ea878f538d..bb6a0669a99 100644
--- a/homeassistant/components/sia/alarm_control_panel.py
+++ b/homeassistant/components/sia/alarm_control_panel.py
@@ -16,7 +16,7 @@ from homeassistant.components.alarm_control_panel import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant, State
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_ACCOUNT, CONF_ACCOUNTS, CONF_ZONES, KEY_ALARM, PREVIOUS_STATE
 from .entity import SIABaseEntity, SIAEntityDescription
@@ -69,7 +69,7 @@ ENTITY_DESCRIPTION_ALARM = SIAAlarmControlPanelEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SIA alarm_control_panel(s) from a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/sia/binary_sensor.py b/homeassistant/components/sia/binary_sensor.py
index 4c8e4ca6130..e1b40dc2e55 100644
--- a/homeassistant/components/sia/binary_sensor.py
+++ b/homeassistant/components/sia/binary_sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE, EntityCategory
 from homeassistant.core import HomeAssistant, State, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CONF_ACCOUNT,
@@ -105,7 +105,7 @@ def generate_binary_sensors(entry: ConfigEntry) -> Iterable[SIABinarySensor]:
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SIA binary sensors from a config entry."""
     async_add_entities(generate_binary_sensors(entry))
diff --git a/homeassistant/components/sigfox/sensor.py b/homeassistant/components/sigfox/sensor.py
index 8f9190e4436..aece5675cbc 100644
--- a/homeassistant/components/sigfox/sensor.py
+++ b/homeassistant/components/sigfox/sensor.py
@@ -17,7 +17,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/sighthound/image_processing.py b/homeassistant/components/sighthound/image_processing.py
index acc8309af26..222b61456c4 100644
--- a/homeassistant/components/sighthound/image_processing.py
+++ b/homeassistant/components/sighthound/image_processing.py
@@ -22,10 +22,10 @@ from homeassistant.const import (
     CONF_SOURCE,
 )
 from homeassistant.core import HomeAssistant, split_entity_id
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.pil import draw_box
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/signal_messenger/notify.py b/homeassistant/components/signal_messenger/notify.py
index 53a255da5ff..bc007eaa689 100644
--- a/homeassistant/components/signal_messenger/notify.py
+++ b/homeassistant/components/signal_messenger/notify.py
@@ -15,7 +15,7 @@ from homeassistant.components.notify import (
     BaseNotificationService,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/simplefin/__init__.py b/homeassistant/components/simplefin/__init__.py
index c47b3118415..1fe2f2a6189 100644
--- a/homeassistant/components/simplefin/__init__.py
+++ b/homeassistant/components/simplefin/__init__.py
@@ -4,12 +4,11 @@ from __future__ import annotations
 
 from simplefin4py import SimpleFin
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
 from .const import CONF_ACCESS_URL
-from .coordinator import SimpleFinDataUpdateCoordinator
+from .coordinator import SimpleFinConfigEntry, SimpleFinDataUpdateCoordinator
 
 PLATFORMS: list[str] = [
     Platform.BINARY_SENSOR,
@@ -17,20 +16,17 @@ PLATFORMS: list[str] = [
 ]
 
 
-type SimpleFinConfigEntry = ConfigEntry[SimpleFinDataUpdateCoordinator]
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: SimpleFinConfigEntry) -> bool:
     """Set up from a config entry."""
     access_url = entry.data[CONF_ACCESS_URL]
     sf_client = SimpleFin(access_url)
-    sf_coordinator = SimpleFinDataUpdateCoordinator(hass, sf_client)
+    sf_coordinator = SimpleFinDataUpdateCoordinator(hass, entry, sf_client)
     await sf_coordinator.async_config_entry_first_refresh()
     entry.runtime_data = sf_coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: SimpleFinConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/simplefin/binary_sensor.py b/homeassistant/components/simplefin/binary_sensor.py
index 5805fc370b6..af97fe9a394 100644
--- a/homeassistant/components/simplefin/binary_sensor.py
+++ b/homeassistant/components/simplefin/binary_sensor.py
@@ -12,9 +12,9 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import SimpleFinConfigEntry
+from .coordinator import SimpleFinConfigEntry
 from .entity import SimpleFinEntity
 
 
@@ -39,7 +39,7 @@ SIMPLEFIN_BINARY_SENSORS: tuple[SimpleFinBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: SimpleFinConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SimpleFIN sensors for config entries."""
 
diff --git a/homeassistant/components/simplefin/coordinator.py b/homeassistant/components/simplefin/coordinator.py
index 7fa5aedb7a1..08e9732c6b7 100644
--- a/homeassistant/components/simplefin/coordinator.py
+++ b/homeassistant/components/simplefin/coordinator.py
@@ -15,17 +15,22 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .const import LOGGER
 
+type SimpleFinConfigEntry = ConfigEntry[SimpleFinDataUpdateCoordinator]
+
 
 class SimpleFinDataUpdateCoordinator(DataUpdateCoordinator[FinancialData]):
     """Data update coordinator for the SimpleFIN integration."""
 
-    config_entry: ConfigEntry
+    config_entry: SimpleFinConfigEntry
 
-    def __init__(self, hass: HomeAssistant, client: SimpleFin) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: SimpleFinConfigEntry, client: SimpleFin
+    ) -> None:
         """Initialize the coordinator."""
         super().__init__(
             hass=hass,
             logger=LOGGER,
+            config_entry=config_entry,
             name="simplefin",
             update_interval=timedelta(hours=4),
         )
diff --git a/homeassistant/components/simplefin/sensor.py b/homeassistant/components/simplefin/sensor.py
index b2167a2c014..183a198040b 100644
--- a/homeassistant/components/simplefin/sensor.py
+++ b/homeassistant/components/simplefin/sensor.py
@@ -16,10 +16,10 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import SimpleFinConfigEntry
+from .coordinator import SimpleFinConfigEntry
 from .entity import SimpleFinEntity
 
 
@@ -55,7 +55,7 @@ SIMPLEFIN_SENSORS: tuple[SimpleFinSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: SimpleFinConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SimpleFIN sensors for config entries."""
 
diff --git a/homeassistant/components/simplisafe/__init__.py b/homeassistant/components/simplisafe/__init__.py
index 2f19c5117a4..8a75baa69c6 100644
--- a/homeassistant/components/simplisafe/__init__.py
+++ b/homeassistant/components/simplisafe/__init__.py
@@ -39,7 +39,7 @@ from simplipy.websocket import (
 )
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_CODE,
     ATTR_DEVICE_ID,
@@ -402,12 +402,7 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     if unload_ok:
         hass.data[DOMAIN].pop(entry.entry_id)
 
-    loaded_entries = [
-        entry
-        for entry in hass.config_entries.async_entries(DOMAIN)
-        if entry.state == ConfigEntryState.LOADED
-    ]
-    if len(loaded_entries) == 1:
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
         # If this is the last loaded instance of SimpliSafe, deregister any services
         # defined during integration setup:
         for service_name in SERVICES:
diff --git a/homeassistant/components/simplisafe/alarm_control_panel.py b/homeassistant/components/simplisafe/alarm_control_panel.py
index 18f2d8ddcd5..c5a1b2bc708 100644
--- a/homeassistant/components/simplisafe/alarm_control_panel.py
+++ b/homeassistant/components/simplisafe/alarm_control_panel.py
@@ -31,7 +31,7 @@ from homeassistant.components.alarm_control_panel import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SimpliSafe
 from .const import (
@@ -103,7 +103,9 @@ WEBSOCKET_EVENTS_TO_LISTEN_FOR = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a SimpliSafe alarm control panel based on a config entry."""
     simplisafe = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/simplisafe/binary_sensor.py b/homeassistant/components/simplisafe/binary_sensor.py
index 0310e958e6e..38a80ddd354 100644
--- a/homeassistant/components/simplisafe/binary_sensor.py
+++ b/homeassistant/components/simplisafe/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SimpliSafe
 from .const import DOMAIN, LOGGER
@@ -34,6 +34,7 @@ SUPPORTED_BATTERY_SENSOR_TYPES = [
     DeviceTypes.PANIC_BUTTON,
     DeviceTypes.REMOTE,
     DeviceTypes.SIREN,
+    DeviceTypes.OUTDOOR_ALARM_SECURITY_BELL_BOX,
     DeviceTypes.SMOKE,
     DeviceTypes.SMOKE_AND_CARBON_MONOXIDE,
     DeviceTypes.TEMPERATURE,
@@ -47,6 +48,7 @@ TRIGGERED_SENSOR_TYPES = {
     DeviceTypes.MOTION: BinarySensorDeviceClass.MOTION,
     DeviceTypes.MOTION_V2: BinarySensorDeviceClass.MOTION,
     DeviceTypes.SIREN: BinarySensorDeviceClass.SAFETY,
+    DeviceTypes.OUTDOOR_ALARM_SECURITY_BELL_BOX: BinarySensorDeviceClass.SAFETY,
     DeviceTypes.SMOKE: BinarySensorDeviceClass.SMOKE,
     # Although this sensor can technically apply to both smoke and carbon, we use the
     # SMOKE device class for simplicity:
@@ -55,7 +57,9 @@ TRIGGERED_SENSOR_TYPES = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SimpliSafe binary sensors based on a config entry."""
     simplisafe = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/simplisafe/button.py b/homeassistant/components/simplisafe/button.py
index f0272d09f61..129209354c3 100644
--- a/homeassistant/components/simplisafe/button.py
+++ b/homeassistant/components/simplisafe/button.py
@@ -13,7 +13,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SimpliSafe
 from .const import DOMAIN
@@ -46,7 +46,9 @@ BUTTON_DESCRIPTIONS = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SimpliSafe buttons based on a config entry."""
     simplisafe = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/simplisafe/lock.py b/homeassistant/components/simplisafe/lock.py
index c610223bff1..9e29bb2051b 100644
--- a/homeassistant/components/simplisafe/lock.py
+++ b/homeassistant/components/simplisafe/lock.py
@@ -13,7 +13,7 @@ from homeassistant.components.lock import LockEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SimpliSafe
 from .const import DOMAIN, LOGGER
@@ -31,7 +31,9 @@ WEBSOCKET_EVENTS_TO_LISTEN_FOR = (EVENT_LOCK_LOCKED, EVENT_LOCK_UNLOCKED)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SimpliSafe locks based on a config entry."""
     simplisafe = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/simplisafe/sensor.py b/homeassistant/components/simplisafe/sensor.py
index a5f46e87a7c..b82162f0fe7 100644
--- a/homeassistant/components/simplisafe/sensor.py
+++ b/homeassistant/components/simplisafe/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SimpliSafe
 from .const import DOMAIN, LOGGER
@@ -22,7 +22,9 @@ from .entity import SimpliSafeEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SimpliSafe freeze sensors based on a config entry."""
     simplisafe = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/sinch/notify.py b/homeassistant/components/sinch/notify.py
index 16780a05704..8c906d26c23 100644
--- a/homeassistant/components/sinch/notify.py
+++ b/homeassistant/components/sinch/notify.py
@@ -23,7 +23,7 @@ from homeassistant.components.notify import (
 )
 from homeassistant.const import CONF_API_KEY, CONF_SENDER
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 DOMAIN = "sinch"
diff --git a/homeassistant/components/sisyphus/__init__.py b/homeassistant/components/sisyphus/__init__.py
index da8d670d412..1406826e471 100644
--- a/homeassistant/components/sisyphus/__init__.py
+++ b/homeassistant/components/sisyphus/__init__.py
@@ -8,8 +8,8 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_HOST, CONF_NAME, EVENT_HOMEASSISTANT_STOP, Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/sky_hub/device_tracker.py b/homeassistant/components/sky_hub/device_tracker.py
index b0ad48ed985..7507175b321 100644
--- a/homeassistant/components/sky_hub/device_tracker.py
+++ b/homeassistant/components/sky_hub/device_tracker.py
@@ -14,8 +14,8 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/sky_remote/config_flow.py b/homeassistant/components/sky_remote/config_flow.py
index a55dfb2a52b..51cf9c9bf64 100644
--- a/homeassistant/components/sky_remote/config_flow.py
+++ b/homeassistant/components/sky_remote/config_flow.py
@@ -8,10 +8,12 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PORT
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import DEFAULT_PORT, DOMAIN, LEGACY_PORT
 
+_LOGGER = logging.getLogger(__name__)
+
 DATA_SCHEMA = vol.Schema(
     {
         vol.Required(CONF_HOST): cv.string,
@@ -21,7 +23,7 @@ DATA_SCHEMA = vol.Schema(
 
 async def async_find_box_port(host: str) -> int:
     """Find port box uses for communication."""
-    logging.debug("Attempting to find port to connect to %s on", host)
+    _LOGGER.debug("Attempting to find port to connect to %s on", host)
     remote = RemoteControl(host, DEFAULT_PORT)
     try:
         await remote.check_connectable()
@@ -46,12 +48,12 @@ class SkyRemoteConfigFlow(ConfigFlow, domain=DOMAIN):
 
         errors: dict[str, str] = {}
         if user_input is not None:
-            logging.debug("user_input: %s", user_input)
+            _LOGGER.debug("user_input: %s", user_input)
             self._async_abort_entries_match(user_input)
             try:
                 port = await async_find_box_port(user_input[CONF_HOST])
             except SkyBoxConnectionError:
-                logging.exception("while finding port of skybox")
+                _LOGGER.exception("While finding port of skybox")
                 errors["base"] = "cannot_connect"
             else:
                 return self.async_create_entry(
diff --git a/homeassistant/components/sky_remote/remote.py b/homeassistant/components/sky_remote/remote.py
index 05a464f73a6..1ecd6c3716e 100644
--- a/homeassistant/components/sky_remote/remote.py
+++ b/homeassistant/components/sky_remote/remote.py
@@ -10,7 +10,7 @@ from homeassistant.components.remote import RemoteEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SkyRemoteConfigEntry
 from .const import DOMAIN
@@ -21,7 +21,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config: SkyRemoteConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Sky remote platform."""
     async_add_entities(
diff --git a/homeassistant/components/skybeacon/sensor.py b/homeassistant/components/skybeacon/sensor.py
index 6cb5064b40e..650e62bc4a1 100644
--- a/homeassistant/components/skybeacon/sensor.py
+++ b/homeassistant/components/skybeacon/sensor.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/skybell/__init__.py b/homeassistant/components/skybell/__init__.py
index 0282ad40254..5baa4ad83ad 100644
--- a/homeassistant/components/skybell/__init__.py
+++ b/homeassistant/components/skybell/__init__.py
@@ -45,7 +45,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         raise ConfigEntryNotReady(f"Unable to connect to Skybell service: {ex}") from ex
 
     device_coordinators: list[SkybellDataUpdateCoordinator] = [
-        SkybellDataUpdateCoordinator(hass, device) for device in devices
+        SkybellDataUpdateCoordinator(hass, entry, device) for device in devices
     ]
     await asyncio.gather(
         *[
diff --git a/homeassistant/components/skybell/binary_sensor.py b/homeassistant/components/skybell/binary_sensor.py
index 3c2d90b2630..cc42da48b26 100644
--- a/homeassistant/components/skybell/binary_sensor.py
+++ b/homeassistant/components/skybell/binary_sensor.py
@@ -11,7 +11,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 from .coordinator import SkybellDataUpdateCoordinator
@@ -31,7 +31,9 @@ BINARY_SENSOR_TYPES: tuple[BinarySensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Skybell binary sensor."""
     async_add_entities(
diff --git a/homeassistant/components/skybell/camera.py b/homeassistant/components/skybell/camera.py
index 683b840debe..4ee873f8350 100644
--- a/homeassistant/components/skybell/camera.py
+++ b/homeassistant/components/skybell/camera.py
@@ -11,7 +11,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_aiohttp_proxy_stream
 from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import SkybellDataUpdateCoordinator
@@ -30,7 +30,9 @@ CAMERA_TYPES: tuple[CameraEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Skybell camera."""
     entities = []
diff --git a/homeassistant/components/skybell/config_flow.py b/homeassistant/components/skybell/config_flow.py
index a32441f4cf8..9893d0dd93a 100644
--- a/homeassistant/components/skybell/config_flow.py
+++ b/homeassistant/components/skybell/config_flow.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
+import logging
 from typing import Any
 
 from aioskybell import Skybell, exceptions
@@ -14,6 +15,8 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DOMAIN
 
+_LOGGER = logging.getLogger(__name__)
+
 
 class SkybellFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Skybell."""
@@ -95,6 +98,7 @@ class SkybellFlowHandler(ConfigFlow, domain=DOMAIN):
             return None, "invalid_auth"
         except exceptions.SkybellException:
             return None, "cannot_connect"
-        except Exception:  # noqa: BLE001
+        except Exception:
+            _LOGGER.exception("Unexpected exception")
             return None, "unknown"
         return skybell.user_id, None
diff --git a/homeassistant/components/skybell/coordinator.py b/homeassistant/components/skybell/coordinator.py
index 55e34df5c63..48e67c63ac9 100644
--- a/homeassistant/components/skybell/coordinator.py
+++ b/homeassistant/components/skybell/coordinator.py
@@ -16,11 +16,14 @@ class SkybellDataUpdateCoordinator(DataUpdateCoordinator[None]):
 
     config_entry: ConfigEntry
 
-    def __init__(self, hass: HomeAssistant, device: SkybellDevice) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, device: SkybellDevice
+    ) -> None:
         """Initialize the coordinator."""
         super().__init__(
             hass=hass,
             logger=LOGGER,
+            config_entry=config_entry,
             name=device.name,
             update_interval=timedelta(seconds=30),
         )
diff --git a/homeassistant/components/skybell/light.py b/homeassistant/components/skybell/light.py
index cba9e70c848..3f924f68da8 100644
--- a/homeassistant/components/skybell/light.py
+++ b/homeassistant/components/skybell/light.py
@@ -15,14 +15,16 @@ from homeassistant.components.light import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import SkybellEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Skybell switch."""
     async_add_entities(
diff --git a/homeassistant/components/skybell/sensor.py b/homeassistant/components/skybell/sensor.py
index 5f0df77ecfa..a67fdae3b35 100644
--- a/homeassistant/components/skybell/sensor.py
+++ b/homeassistant/components/skybell/sensor.py
@@ -17,7 +17,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .entity import DOMAIN, SkybellEntity
@@ -88,7 +88,9 @@ SENSOR_TYPES: tuple[SkybellSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Skybell sensor."""
     async_add_entities(
diff --git a/homeassistant/components/skybell/switch.py b/homeassistant/components/skybell/switch.py
index fa4f723573f..858363043ca 100644
--- a/homeassistant/components/skybell/switch.py
+++ b/homeassistant/components/skybell/switch.py
@@ -7,7 +7,7 @@ from typing import Any, cast
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import SkybellEntity
@@ -29,7 +29,9 @@ SWITCH_TYPES: tuple[SwitchEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the SkyBell switch."""
     async_add_entities(
diff --git a/homeassistant/components/slack/sensor.py b/homeassistant/components/slack/sensor.py
index d53555ba82a..042ab00916e 100644
--- a/homeassistant/components/slack/sensor.py
+++ b/homeassistant/components/slack/sensor.py
@@ -11,8 +11,8 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from .const import ATTR_SNOOZE, DOMAIN, SLACK_DATA
 from .entity import SlackEntity
@@ -21,7 +21,7 @@ from .entity import SlackEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Slack select."""
     async_add_entities(
diff --git a/homeassistant/components/sleepiq/__init__.py b/homeassistant/components/sleepiq/__init__.py
index 6506be06e72..565611fe169 100644
--- a/homeassistant/components/sleepiq/__init__.py
+++ b/homeassistant/components/sleepiq/__init__.py
@@ -17,9 +17,8 @@ from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, PRESSURE, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN, IS_IN_BED, SLEEP_NUMBER
@@ -95,8 +94,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     await _async_migrate_unique_ids(hass, entry, gateway)
 
-    coordinator = SleepIQDataUpdateCoordinator(hass, gateway, email)
-    pause_coordinator = SleepIQPauseUpdateCoordinator(hass, gateway, email)
+    coordinator = SleepIQDataUpdateCoordinator(hass, entry, gateway)
+    pause_coordinator = SleepIQPauseUpdateCoordinator(hass, entry, gateway)
 
     # Call the SleepIQ API to refresh data
     await coordinator.async_config_entry_first_refresh()
diff --git a/homeassistant/components/sleepiq/binary_sensor.py b/homeassistant/components/sleepiq/binary_sensor.py
index cb56a516b9b..99fff9c49b0 100644
--- a/homeassistant/components/sleepiq/binary_sensor.py
+++ b/homeassistant/components/sleepiq/binary_sensor.py
@@ -8,7 +8,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, ICON_EMPTY, ICON_OCCUPIED, IS_IN_BED
 from .coordinator import SleepIQData, SleepIQDataUpdateCoordinator
@@ -18,7 +18,7 @@ from .entity import SleepIQSleeperEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the SleepIQ bed binary sensors."""
     data: SleepIQData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/sleepiq/button.py b/homeassistant/components/sleepiq/button.py
index 94b010066c9..74b1bc0789f 100644
--- a/homeassistant/components/sleepiq/button.py
+++ b/homeassistant/components/sleepiq/button.py
@@ -11,7 +11,7 @@ from asyncsleepiq import SleepIQBed
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import SleepIQData
@@ -44,7 +44,7 @@ ENTITY_DESCRIPTIONS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sleep number buttons."""
     data: SleepIQData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/sleepiq/coordinator.py b/homeassistant/components/sleepiq/coordinator.py
index 7fe4f964b36..46b754976e5 100644
--- a/homeassistant/components/sleepiq/coordinator.py
+++ b/homeassistant/components/sleepiq/coordinator.py
@@ -7,6 +7,8 @@ import logging
 
 from asyncsleepiq import AsyncSleepIQ
 
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -19,17 +21,20 @@ LONGER_UPDATE_INTERVAL = timedelta(minutes=5)
 class SleepIQDataUpdateCoordinator(DataUpdateCoordinator[None]):
     """SleepIQ data update coordinator."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         client: AsyncSleepIQ,
-        username: str,
     ) -> None:
         """Initialize coordinator."""
         super().__init__(
             hass,
             _LOGGER,
-            name=f"{username}@SleepIQ",
+            config_entry=config_entry,
+            name=f"{config_entry.data[CONF_USERNAME]}@SleepIQ",
             update_interval=UPDATE_INTERVAL,
         )
         self.client = client
@@ -45,17 +50,20 @@ class SleepIQDataUpdateCoordinator(DataUpdateCoordinator[None]):
 class SleepIQPauseUpdateCoordinator(DataUpdateCoordinator[None]):
     """SleepIQ data update coordinator."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         client: AsyncSleepIQ,
-        username: str,
     ) -> None:
         """Initialize coordinator."""
         super().__init__(
             hass,
             _LOGGER,
-            name=f"{username}@SleepIQPause",
+            config_entry=config_entry,
+            name=f"{config_entry.data[CONF_USERNAME]}@SleepIQPause",
             update_interval=LONGER_UPDATE_INTERVAL,
         )
         self.client = client
diff --git a/homeassistant/components/sleepiq/light.py b/homeassistant/components/sleepiq/light.py
index 781bd8e600a..542c212df27 100644
--- a/homeassistant/components/sleepiq/light.py
+++ b/homeassistant/components/sleepiq/light.py
@@ -8,7 +8,7 @@ from asyncsleepiq import SleepIQBed, SleepIQLight
 from homeassistant.components.light import ColorMode, LightEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import SleepIQData, SleepIQDataUpdateCoordinator
@@ -20,7 +20,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the SleepIQ bed lights."""
     data: SleepIQData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/sleepiq/number.py b/homeassistant/components/sleepiq/number.py
index 905ceab18bd..53d6c366e46 100644
--- a/homeassistant/components/sleepiq/number.py
+++ b/homeassistant/components/sleepiq/number.py
@@ -17,7 +17,7 @@ from asyncsleepiq import (
 from homeassistant.components.number import NumberEntity, NumberEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     ACTUATOR,
@@ -138,7 +138,7 @@ NUMBER_DESCRIPTIONS: dict[str, SleepIQNumberEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the SleepIQ bed sensors."""
     data: SleepIQData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/sleepiq/select.py b/homeassistant/components/sleepiq/select.py
index 0a09aa4d657..7d059ba6b59 100644
--- a/homeassistant/components/sleepiq/select.py
+++ b/homeassistant/components/sleepiq/select.py
@@ -13,7 +13,7 @@ from asyncsleepiq import (
 from homeassistant.components.select import SelectEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, FOOT_WARMER
 from .coordinator import SleepIQData, SleepIQDataUpdateCoordinator
@@ -23,7 +23,7 @@ from .entity import SleepIQBedEntity, SleepIQSleeperEntity, sleeper_for_side
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the SleepIQ foundation preset select entities."""
     data: SleepIQData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/sleepiq/sensor.py b/homeassistant/components/sleepiq/sensor.py
index 413e8e4d856..ca4fbc186ed 100644
--- a/homeassistant/components/sleepiq/sensor.py
+++ b/homeassistant/components/sleepiq/sensor.py
@@ -7,7 +7,7 @@ from asyncsleepiq import SleepIQBed, SleepIQSleeper
 from homeassistant.components.sensor import SensorEntity, SensorStateClass
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, PRESSURE, SLEEP_NUMBER
 from .coordinator import SleepIQData, SleepIQDataUpdateCoordinator
@@ -19,7 +19,7 @@ SENSORS = [PRESSURE, SLEEP_NUMBER]
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the SleepIQ bed sensors."""
     data: SleepIQData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/sleepiq/switch.py b/homeassistant/components/sleepiq/switch.py
index 9fc8ca9d20e..8363782c064 100644
--- a/homeassistant/components/sleepiq/switch.py
+++ b/homeassistant/components/sleepiq/switch.py
@@ -9,7 +9,7 @@ from asyncsleepiq import SleepIQBed
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import SleepIQData, SleepIQPauseUpdateCoordinator
@@ -19,7 +19,7 @@ from .entity import SleepIQBedEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sleep number switches."""
     data: SleepIQData = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/slide_local/__init__.py b/homeassistant/components/slide_local/__init__.py
index 5b4867bf337..4690fe8016c 100644
--- a/homeassistant/components/slide_local/__init__.py
+++ b/homeassistant/components/slide_local/__init__.py
@@ -2,14 +2,12 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-from .coordinator import SlideCoordinator
+from .coordinator import SlideConfigEntry, SlideCoordinator
 
 PLATFORMS = [Platform.BUTTON, Platform.COVER, Platform.SWITCH]
-type SlideConfigEntry = ConfigEntry[SlideCoordinator]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: SlideConfigEntry) -> bool:
diff --git a/homeassistant/components/slide_local/button.py b/homeassistant/components/slide_local/button.py
index faca7cb3f2b..3d5de33303d 100644
--- a/homeassistant/components/slide_local/button.py
+++ b/homeassistant/components/slide_local/button.py
@@ -13,11 +13,10 @@ from homeassistant.components.button import ButtonEntity
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import SlideConfigEntry
 from .const import DOMAIN
-from .coordinator import SlideCoordinator
+from .coordinator import SlideConfigEntry, SlideCoordinator
 from .entity import SlideEntity
 
 PARALLEL_UPDATES = 1
@@ -26,7 +25,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SlideConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up button for Slide platform."""
 
diff --git a/homeassistant/components/slide_local/config_flow.py b/homeassistant/components/slide_local/config_flow.py
index 4ceb347568f..96aac1a135c 100644
--- a/homeassistant/components/slide_local/config_flow.py
+++ b/homeassistant/components/slide_local/config_flow.py
@@ -20,8 +20,8 @@ from homeassistant.core import callback
 from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
-from . import SlideConfigEntry
 from .const import CONF_INVERT_POSITION, DOMAIN
+from .coordinator import SlideConfigEntry
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/slide_local/coordinator.py b/homeassistant/components/slide_local/coordinator.py
index e5311967198..cbc3e653739 100644
--- a/homeassistant/components/slide_local/coordinator.py
+++ b/homeassistant/components/slide_local/coordinator.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from datetime import timedelta
 import logging
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 from goslideapi.goslideapi import (
     AuthenticationFailed,
@@ -14,6 +14,7 @@ from goslideapi.goslideapi import (
     GoSlideLocal as SlideLocalApi,
 )
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_API_VERSION,
     CONF_HOST,
@@ -31,23 +32,30 @@ from .const import DEFAULT_OFFSET, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
-if TYPE_CHECKING:
-    from . import SlideConfigEntry
+type SlideConfigEntry = ConfigEntry[SlideCoordinator]
 
 
 class SlideCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Get and update the latest data."""
 
-    def __init__(self, hass: HomeAssistant, entry: SlideConfigEntry) -> None:
+    config_entry: SlideConfigEntry
+
+    def __init__(self, hass: HomeAssistant, config_entry: SlideConfigEntry) -> None:
         """Initialize the data object."""
         super().__init__(
-            hass, _LOGGER, name="Slide", update_interval=timedelta(seconds=15)
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name="Slide",
+            update_interval=timedelta(seconds=15),
         )
         self.slide = SlideLocalApi()
-        self.api_version = entry.data[CONF_API_VERSION]
-        self.mac = entry.data[CONF_MAC]
-        self.host = entry.data[CONF_HOST]
-        self.password = entry.data[CONF_PASSWORD] if self.api_version == 1 else ""
+        self.api_version = config_entry.data[CONF_API_VERSION]
+        self.mac = config_entry.data[CONF_MAC]
+        self.host = config_entry.data[CONF_HOST]
+        self.password = (
+            config_entry.data[CONF_PASSWORD] if self.api_version == 1 else ""
+        )
 
     async def _async_setup(self) -> None:
         """Do initialization logic for Slide coordinator."""
diff --git a/homeassistant/components/slide_local/cover.py b/homeassistant/components/slide_local/cover.py
index cf04f46d139..6bb3f338cb8 100644
--- a/homeassistant/components/slide_local/cover.py
+++ b/homeassistant/components/slide_local/cover.py
@@ -8,11 +8,10 @@ from typing import Any
 from homeassistant.components.cover import ATTR_POSITION, CoverDeviceClass, CoverEntity
 from homeassistant.const import STATE_CLOSED, STATE_CLOSING, STATE_OPENING
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import SlideConfigEntry
 from .const import CONF_INVERT_POSITION, DEFAULT_OFFSET
-from .coordinator import SlideCoordinator
+from .coordinator import SlideConfigEntry, SlideCoordinator
 from .entity import SlideEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -23,7 +22,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SlideConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up cover(s) for Slide platform."""
 
diff --git a/homeassistant/components/slide_local/diagnostics.py b/homeassistant/components/slide_local/diagnostics.py
index 2655cb5fada..6a70720a14a 100644
--- a/homeassistant/components/slide_local/diagnostics.py
+++ b/homeassistant/components/slide_local/diagnostics.py
@@ -8,7 +8,7 @@ from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_PASSWORD
 from homeassistant.core import HomeAssistant
 
-from . import SlideConfigEntry
+from .coordinator import SlideConfigEntry
 
 TO_REDACT = [
     CONF_PASSWORD,
diff --git a/homeassistant/components/slide_local/strings.json b/homeassistant/components/slide_local/strings.json
index 67514ff0d50..10efa4bc4f2 100644
--- a/homeassistant/components/slide_local/strings.json
+++ b/homeassistant/components/slide_local/strings.json
@@ -25,7 +25,7 @@
       },
       "zeroconf_confirm": {
         "title": "Confirm setup for Slide",
-        "description": "Do you want to setup {host}?"
+        "description": "Do you want to set up {host}?"
       }
     },
     "abort": {
diff --git a/homeassistant/components/slide_local/switch.py b/homeassistant/components/slide_local/switch.py
index 0471dfcc4e6..e83924c87ee 100644
--- a/homeassistant/components/slide_local/switch.py
+++ b/homeassistant/components/slide_local/switch.py
@@ -15,11 +15,10 @@ from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import SlideConfigEntry
 from .const import DOMAIN
-from .coordinator import SlideCoordinator
+from .coordinator import SlideConfigEntry, SlideCoordinator
 from .entity import SlideEntity
 
 PARALLEL_UPDATES = 1
@@ -28,7 +27,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SlideConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switch for Slide platform."""
 
diff --git a/homeassistant/components/slimproto/media_player.py b/homeassistant/components/slimproto/media_player.py
index 42c50d21e75..417444961fe 100644
--- a/homeassistant/components/slimproto/media_player.py
+++ b/homeassistant/components/slimproto/media_player.py
@@ -22,7 +22,7 @@ from homeassistant.components.media_player import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.dt import utcnow
 
 from .const import DEFAULT_NAME, DOMAIN, PLAYER_EVENT
@@ -39,7 +39,7 @@ STATE_MAPPING = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SlimProto MediaPlayer(s) from Config Entry."""
     slimserver: SlimServer = hass.data[DOMAIN]
diff --git a/homeassistant/components/sma/config_flow.py b/homeassistant/components/sma/config_flow.py
index 4b3e01a79a8..3f5eb635989 100644
--- a/homeassistant/components/sma/config_flow.py
+++ b/homeassistant/components/sma/config_flow.py
@@ -11,8 +11,8 @@ import voluptuous as vol
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_SSL, CONF_VERIFY_SSL
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 
 from .const import CONF_GROUP, DOMAIN, GROUPS
 
diff --git a/homeassistant/components/sma/sensor.py b/homeassistant/components/sma/sensor.py
index 863f15a9a17..ffef026aaed 100644
--- a/homeassistant/components/sma/sensor.py
+++ b/homeassistant/components/sma/sensor.py
@@ -27,7 +27,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
@@ -838,7 +838,7 @@ SENSOR_ENTITIES: dict[str, SensorEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SMA sensors."""
     sma_data = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/smappee/binary_sensor.py b/homeassistant/components/smappee/binary_sensor.py
index 86bc225dba1..06dcaa62853 100644
--- a/homeassistant/components/smappee/binary_sensor.py
+++ b/homeassistant/components/smappee/binary_sensor.py
@@ -8,7 +8,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SmappeeConfigEntry
 from .const import DOMAIN
@@ -37,7 +37,7 @@ ICON_MAPPING = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: SmappeeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Smappee binary sensor."""
     smappee_base = config_entry.runtime_data
diff --git a/homeassistant/components/smappee/sensor.py b/homeassistant/components/smappee/sensor.py
index 2f9d6443568..759dfb34013 100644
--- a/homeassistant/components/smappee/sensor.py
+++ b/homeassistant/components/smappee/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import UnitOfElectricPotential, UnitOfEnergy, UnitOfPower
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SmappeeConfigEntry
 from .const import DOMAIN
@@ -189,7 +189,7 @@ VOLTAGE_SENSORS: tuple[SmappeeVoltageSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: SmappeeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Smappee sensor."""
     smappee_base = config_entry.runtime_data
diff --git a/homeassistant/components/smappee/strings.json b/homeassistant/components/smappee/strings.json
index 2966b5cd753..3037fbc98f6 100644
--- a/homeassistant/components/smappee/strings.json
+++ b/homeassistant/components/smappee/strings.json
@@ -15,7 +15,7 @@
         }
       },
       "zeroconf_confirm": {
-        "description": "Do you want to add the Smappee device with serialnumber `{serialnumber}` to Home Assistant?",
+        "description": "Do you want to add the Smappee device with serial number `{serialnumber}` to Home Assistant?",
         "title": "Discovered Smappee device"
       },
       "pick_implementation": {
diff --git a/homeassistant/components/smappee/switch.py b/homeassistant/components/smappee/switch.py
index bccf816c823..cf2ddea5938 100644
--- a/homeassistant/components/smappee/switch.py
+++ b/homeassistant/components/smappee/switch.py
@@ -5,7 +5,7 @@ from typing import Any
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SmappeeConfigEntry
 from .const import DOMAIN
@@ -16,7 +16,7 @@ SWITCH_PREFIX = "Switch"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: SmappeeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Smappee Comfort Plugs."""
     smappee_base = config_entry.runtime_data
diff --git a/homeassistant/components/smart_meter_texas/__init__.py b/homeassistant/components/smart_meter_texas/__init__.py
index 1cd7df68e91..ce87b85c322 100644
--- a/homeassistant/components/smart_meter_texas/__init__.py
+++ b/homeassistant/components/smart_meter_texas/__init__.py
@@ -3,7 +3,7 @@
 import logging
 import ssl
 
-from smart_meter_texas import Account, Client, ClientSSLContext
+from smart_meter_texas import Account, Client
 from smart_meter_texas.exceptions import (
     SmartMeterTexasAPIError,
     SmartMeterTexasAuthError,
@@ -16,6 +16,7 @@ from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import aiohttp_client
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+from homeassistant.util.ssl import get_default_context
 
 from .const import (
     DATA_COORDINATOR,
@@ -38,8 +39,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     account = Account(username, password)
 
-    client_ssl_context = ClientSSLContext()
-    ssl_context = await client_ssl_context.get_ssl_context()
+    ssl_context = get_default_context()
 
     smart_meter_texas_data = SmartMeterTexasData(hass, entry, account, ssl_context)
     try:
diff --git a/homeassistant/components/smart_meter_texas/config_flow.py b/homeassistant/components/smart_meter_texas/config_flow.py
index b60855b62c8..18a3716e1b9 100644
--- a/homeassistant/components/smart_meter_texas/config_flow.py
+++ b/homeassistant/components/smart_meter_texas/config_flow.py
@@ -4,7 +4,7 @@ import logging
 from typing import Any
 
 from aiohttp import ClientError
-from smart_meter_texas import Account, Client, ClientSSLContext
+from smart_meter_texas import Account, Client
 from smart_meter_texas.exceptions import (
     SmartMeterTexasAPIError,
     SmartMeterTexasAuthError,
@@ -16,6 +16,7 @@ from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import aiohttp_client
+from homeassistant.util.ssl import get_default_context
 
 from .const import DOMAIN
 
@@ -31,8 +32,7 @@ async def validate_input(hass: HomeAssistant, data):
 
     Data has the keys from DATA_SCHEMA with values provided by the user.
     """
-    client_ssl_context = ClientSSLContext()
-    ssl_context = await client_ssl_context.get_ssl_context()
+    ssl_context = get_default_context()
     client_session = aiohttp_client.async_get_clientsession(hass)
     account = Account(data["username"], data["password"])
     client = Client(client_session, account, ssl_context)
diff --git a/homeassistant/components/smart_meter_texas/sensor.py b/homeassistant/components/smart_meter_texas/sensor.py
index 80fc79671b5..c6e18bf43c1 100644
--- a/homeassistant/components/smart_meter_texas/sensor.py
+++ b/homeassistant/components/smart_meter_texas/sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ADDRESS, UnitOfEnergy
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
@@ -30,7 +30,7 @@ from .const import (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Smart Meter Texas sensors."""
     coordinator = hass.data[DOMAIN][config_entry.entry_id][DATA_COORDINATOR]
diff --git a/homeassistant/components/smart_rollos/__init__.py b/homeassistant/components/smart_rollos/__init__.py
new file mode 100644
index 00000000000..d4bb8c7fb1b
--- /dev/null
+++ b/homeassistant/components/smart_rollos/__init__.py
@@ -0,0 +1 @@
+"""Virtual integration: Smart Rollos."""
diff --git a/homeassistant/components/smart_rollos/manifest.json b/homeassistant/components/smart_rollos/manifest.json
new file mode 100644
index 00000000000..f093f740bd6
--- /dev/null
+++ b/homeassistant/components/smart_rollos/manifest.json
@@ -0,0 +1,6 @@
+{
+  "domain": "smart_rollos",
+  "name": "Smart Rollos",
+  "integration_type": "virtual",
+  "supported_by": "motion_blinds"
+}
diff --git a/homeassistant/components/smartthings/__init__.py b/homeassistant/components/smartthings/__init__.py
index 2914851ccbf..4f7b8c2ddb9 100644
--- a/homeassistant/components/smartthings/__init__.py
+++ b/homeassistant/components/smartthings/__init__.py
@@ -2,416 +2,495 @@
 
 from __future__ import annotations
 
-import asyncio
-from collections.abc import Iterable
+from collections.abc import Callable
+import contextlib
+from dataclasses import dataclass
 from http import HTTPStatus
-import importlib
 import logging
+from typing import TYPE_CHECKING, Any, cast
 
-from aiohttp.client_exceptions import ClientConnectionError, ClientResponseError
-from pysmartapp.event import EVENT_TYPE_DEVICE
-from pysmartthings import APIInvalidGrant, Attribute, Capability, SmartThings
-
-from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_CLIENT_ID, CONF_CLIENT_SECRET
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import (
-    ConfigEntryAuthFailed,
-    ConfigEntryError,
-    ConfigEntryNotReady,
+from aiohttp import ClientResponseError
+from pysmartthings import (
+    Attribute,
+    Capability,
+    ComponentStatus,
+    Device,
+    DeviceEvent,
+    Lifecycle,
+    Scene,
+    SmartThings,
+    SmartThingsAuthenticationFailedError,
+    SmartThingsConnectionError,
+    SmartThingsSinkError,
+    Status,
 )
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.dispatcher import async_dispatcher_send
-from homeassistant.helpers.event import async_track_time_interval
-from homeassistant.helpers.typing import ConfigType
-from homeassistant.loader import async_get_loaded_integration
-from homeassistant.setup import SetupPhases, async_pause_setup
 
-from .config_flow import SmartThingsFlowHandler  # noqa: F401
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    ATTR_CONNECTIONS,
+    ATTR_HW_VERSION,
+    ATTR_MANUFACTURER,
+    ATTR_MODEL,
+    ATTR_SW_VERSION,
+    ATTR_VIA_DEVICE,
+    CONF_ACCESS_TOKEN,
+    CONF_TOKEN,
+    EVENT_HOMEASSISTANT_STOP,
+    Platform,
+)
+from homeassistant.core import Event, HomeAssistant
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.config_entry_oauth2_flow import (
+    OAuth2Session,
+    async_get_config_entry_implementation,
+)
+from homeassistant.helpers.entity_registry import RegistryEntry, async_migrate_entries
+
 from .const import (
-    CONF_APP_ID,
+    BINARY_SENSOR_ATTRIBUTES_TO_CAPABILITIES,
     CONF_INSTALLED_APP_ID,
     CONF_LOCATION_ID,
-    CONF_REFRESH_TOKEN,
-    DATA_BROKERS,
-    DATA_MANAGER,
+    CONF_SUBSCRIPTION_ID,
     DOMAIN,
     EVENT_BUTTON,
-    PLATFORMS,
-    SIGNAL_SMARTTHINGS_UPDATE,
-    TOKEN_REFRESH_INTERVAL,
-)
-from .smartapp import (
-    format_unique_id,
-    setup_smartapp,
-    setup_smartapp_endpoint,
-    smartapp_sync_subscriptions,
-    unload_smartapp_endpoint,
-    validate_installed_app,
-    validate_webhook_requirements,
+    MAIN,
+    OLD_DATA,
+    SENSOR_ATTRIBUTES_TO_CAPABILITIES,
 )
 
 _LOGGER = logging.getLogger(__name__)
 
-CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
+@dataclass
+class SmartThingsData:
+    """Define an object to hold SmartThings data."""
+
+    devices: dict[str, FullDevice]
+    scenes: dict[str, Scene]
+    rooms: dict[str, str]
+    client: SmartThings
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Initialize the SmartThings platform."""
-    await setup_smartapp_endpoint(hass, False)
-    return True
+@dataclass
+class FullDevice:
+    """Define an object to hold device data."""
+
+    device: Device
+    status: dict[str, ComponentStatus]
 
 
-async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Handle migration of a previous version config entry.
+type SmartThingsConfigEntry = ConfigEntry[SmartThingsData]
 
-    A config entry created under a previous version must go through the
-    integration setup again so we can properly retrieve the needed data
-    elements. Force this by removing the entry and triggering a new flow.
-    """
-    # Remove the entry which will invoke the callback to delete the app.
-    hass.async_create_task(hass.config_entries.async_remove(entry.entry_id))
-    # only create new flow if there isn't a pending one for SmartThings.
-    if not hass.config_entries.flow.async_progress_by_handler(DOMAIN):
-        hass.async_create_task(
-            hass.config_entries.flow.async_init(
-                DOMAIN, context={"source": SOURCE_IMPORT}
-            )
-        )
-
-    # Return False because it could not be migrated.
-    return False
+PLATFORMS = [
+    Platform.BINARY_SENSOR,
+    Platform.BUTTON,
+    Platform.CLIMATE,
+    Platform.COVER,
+    Platform.EVENT,
+    Platform.FAN,
+    Platform.LIGHT,
+    Platform.LOCK,
+    Platform.MEDIA_PLAYER,
+    Platform.NUMBER,
+    Platform.SCENE,
+    Platform.SELECT,
+    Platform.SENSOR,
+    Platform.SWITCH,
+    Platform.UPDATE,
+    Platform.VALVE,
+]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: SmartThingsConfigEntry) -> bool:
     """Initialize config entry which represents an installed SmartApp."""
-    # For backwards compat
-    if entry.unique_id is None:
+    # The oauth smartthings entry will have a token, older ones are version 3
+    # after migration but still require reauthentication
+    if CONF_TOKEN not in entry.data:
+        raise ConfigEntryAuthFailed("Config entry missing token")
+    implementation = await async_get_config_entry_implementation(hass, entry)
+    session = OAuth2Session(hass, entry, implementation)
+
+    try:
+        await session.async_ensure_token_valid()
+    except ClientResponseError as err:
+        if err.status == HTTPStatus.BAD_REQUEST:
+            raise ConfigEntryAuthFailed("Token not valid, trigger renewal") from err
+        raise ConfigEntryNotReady from err
+
+    client = SmartThings(session=async_get_clientsession(hass))
+
+    async def _refresh_token() -> str:
+        await session.async_ensure_token_valid()
+        token = session.token[CONF_ACCESS_TOKEN]
+        if TYPE_CHECKING:
+            assert isinstance(token, str)
+        return token
+
+    client.refresh_token_function = _refresh_token
+
+    def _handle_max_connections() -> None:
+        _LOGGER.debug(
+            "We hit the limit of max connections or we could not remove the old one, so retrying"
+        )
+        hass.config_entries.async_schedule_reload(entry.entry_id)
+
+    client.max_connections_reached_callback = _handle_max_connections
+
+    def _handle_new_subscription_identifier(identifier: str | None) -> None:
+        """Handle a new subscription identifier."""
         hass.config_entries.async_update_entry(
             entry,
-            unique_id=format_unique_id(
-                entry.data[CONF_APP_ID], entry.data[CONF_LOCATION_ID]
-            ),
+            data={
+                **entry.data,
+                CONF_SUBSCRIPTION_ID: identifier,
+            },
         )
+        if identifier is not None:
+            _LOGGER.debug("Updating subscription ID to %s", identifier)
+        else:
+            _LOGGER.debug("Removing subscription ID")
 
-    if not validate_webhook_requirements(hass):
-        _LOGGER.warning(
-            "The 'base_url' of the 'http' integration must be configured and start with"
-            " 'https://'"
-        )
-        return False
+    client.new_subscription_id_callback = _handle_new_subscription_identifier
 
-    api = SmartThings(async_get_clientsession(hass), entry.data[CONF_ACCESS_TOKEN])
-
-    # Ensure platform modules are loaded since the DeviceBroker will
-    # import them below and we want them to be cached ahead of time
-    # so the integration does not do blocking I/O in the event loop
-    # to import the modules.
-    await async_get_loaded_integration(hass, DOMAIN).async_get_platforms(PLATFORMS)
+    if (old_identifier := entry.data.get(CONF_SUBSCRIPTION_ID)) is not None:
+        _LOGGER.debug("Trying to delete old subscription %s", old_identifier)
+        try:
+            await client.delete_subscription(old_identifier)
+        except SmartThingsConnectionError as err:
+            raise ConfigEntryNotReady("Could not delete old subscription") from err
 
+    _LOGGER.debug("Trying to create a new subscription")
     try:
-        # See if the app is already setup. This occurs when there are
-        # installs in multiple SmartThings locations (valid use-case)
-        manager = hass.data[DOMAIN][DATA_MANAGER]
-        smart_app = manager.smartapps.get(entry.data[CONF_APP_ID])
-        if not smart_app:
-            # Validate and setup the app.
-            app = await api.app(entry.data[CONF_APP_ID])
-            smart_app = setup_smartapp(hass, app)
-
-        # Validate and retrieve the installed app.
-        installed_app = await validate_installed_app(
-            api, entry.data[CONF_INSTALLED_APP_ID]
+        subscription = await client.create_subscription(
+            entry.data[CONF_LOCATION_ID],
+            entry.data[CONF_TOKEN][CONF_INSTALLED_APP_ID],
         )
+    except SmartThingsSinkError as err:
+        _LOGGER.exception("Couldn't create a new subscription")
+        raise ConfigEntryNotReady from err
+    subscription_id = subscription.subscription_id
+    _handle_new_subscription_identifier(subscription_id)
 
-        # Get scenes
-        scenes = await async_get_entry_scenes(entry, api)
+    entry.async_create_background_task(
+        hass,
+        client.subscribe(
+            entry.data[CONF_LOCATION_ID],
+            entry.data[CONF_TOKEN][CONF_INSTALLED_APP_ID],
+            subscription,
+        ),
+        "smartthings_socket",
+    )
 
-        # Get SmartApp token to sync subscriptions
-        token = await api.generate_tokens(
-            entry.data[CONF_CLIENT_ID],
-            entry.data[CONF_CLIENT_SECRET],
-            entry.data[CONF_REFRESH_TOKEN],
+    device_status: dict[str, FullDevice] = {}
+    try:
+        rooms = {
+            room.room_id: room.name
+            for room in await client.get_rooms(location_id=entry.data[CONF_LOCATION_ID])
+        }
+        devices = await client.get_devices()
+        for device in devices:
+            status = process_status(await client.get_device_status(device.device_id))
+            device_status[device.device_id] = FullDevice(device=device, status=status)
+    except SmartThingsAuthenticationFailedError as err:
+        raise ConfigEntryAuthFailed from err
+
+    device_registry = dr.async_get(hass)
+    create_devices(device_registry, device_status, entry, rooms)
+
+    scenes = {
+        scene.scene_id: scene
+        for scene in await client.get_scenes(location_id=entry.data[CONF_LOCATION_ID])
+    }
+
+    def handle_deleted_device(device_id: str) -> None:
+        """Handle a deleted device."""
+        dev_entry = device_registry.async_get_device(
+            identifiers={(DOMAIN, device_id)},
         )
-        hass.config_entries.async_update_entry(
-            entry, data={**entry.data, CONF_REFRESH_TOKEN: token.refresh_token}
-        )
-
-        # Get devices and their current status
-        devices = await api.devices(location_ids=[installed_app.location_id])
-
-        async def retrieve_device_status(device):
-            try:
-                await device.status.refresh()
-            except ClientResponseError:
-                _LOGGER.debug(
-                    (
-                        "Unable to update status for device: %s (%s), the device will"
-                        " be excluded"
-                    ),
-                    device.label,
-                    device.device_id,
-                    exc_info=True,
-                )
-                devices.remove(device)
-
-        await asyncio.gather(*(retrieve_device_status(d) for d in devices.copy()))
-
-        # Sync device subscriptions
-        await smartapp_sync_subscriptions(
-            hass,
-            token.access_token,
-            installed_app.location_id,
-            installed_app.installed_app_id,
-            devices,
-        )
-
-        # Setup device broker
-        with async_pause_setup(hass, SetupPhases.WAIT_IMPORT_PLATFORMS):
-            # DeviceBroker has a side effect of importing platform
-            # modules when its created. In the future this should be
-            # refactored to not do this.
-            broker = await hass.async_add_import_executor_job(
-                DeviceBroker, hass, entry, token, smart_app, devices, scenes
+        if dev_entry is not None:
+            device_registry.async_update_device(
+                dev_entry.id, remove_config_entry_id=entry.entry_id
             )
-        broker.connect()
-        hass.data[DOMAIN][DATA_BROKERS][entry.entry_id] = broker
 
-    except APIInvalidGrant as ex:
-        raise ConfigEntryAuthFailed from ex
-    except ClientResponseError as ex:
-        if ex.status in (HTTPStatus.UNAUTHORIZED, HTTPStatus.FORBIDDEN):
-            raise ConfigEntryError(
-                "The access token is no longer valid. Please remove the integration and set up again."
-            ) from ex
-        _LOGGER.debug(ex, exc_info=True)
-        raise ConfigEntryNotReady from ex
-    except (ClientConnectionError, RuntimeWarning) as ex:
-        _LOGGER.debug(ex, exc_info=True)
-        raise ConfigEntryNotReady from ex
+    entry.async_on_unload(
+        client.add_device_lifecycle_event_listener(
+            Lifecycle.DELETE, handle_deleted_device
+        )
+    )
+
+    entry.runtime_data = SmartThingsData(
+        devices={
+            device_id: device
+            for device_id, device in device_status.items()
+            if MAIN in device.status
+        },
+        client=client,
+        scenes=scenes,
+        rooms=rooms,
+    )
+
+    # Events are deprecated and will be removed in 2025.10
+    def handle_button_press(event: DeviceEvent) -> None:
+        """Handle a button press."""
+        if (
+            event.capability is Capability.BUTTON
+            and event.attribute is Attribute.BUTTON
+        ):
+            hass.bus.async_fire(
+                EVENT_BUTTON,
+                {
+                    "component_id": event.component_id,
+                    "device_id": event.device_id,
+                    "location_id": event.location_id,
+                    "value": event.value,
+                    "name": entry.runtime_data.devices[event.device_id].device.label,
+                    "data": event.data,
+                },
+            )
+
+    entry.async_on_unload(
+        client.add_unspecified_device_event_listener(handle_button_press)
+    )
+
+    async def _handle_shutdown(_: Event) -> None:
+        """Handle shutdown."""
+        await client.delete_subscription(subscription_id)
+
+    entry.async_on_unload(
+        hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _handle_shutdown)
+    )
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    device_entries = dr.async_entries_for_config_entry(device_registry, entry.entry_id)
+    for device_entry in device_entries:
+        device_id = next(
+            identifier[1]
+            for identifier in device_entry.identifiers
+            if identifier[0] == DOMAIN
+        )
+        if device_id in device_status:
+            continue
+        device_registry.async_update_device(
+            device_entry.id, remove_config_entry_id=entry.entry_id
+        )
+
     return True
 
 
-async def async_get_entry_scenes(entry: ConfigEntry, api):
-    """Get the scenes within an integration."""
-    try:
-        return await api.scenes(location_id=entry.data[CONF_LOCATION_ID])
-    except ClientResponseError as ex:
-        if ex.status == HTTPStatus.FORBIDDEN:
-            _LOGGER.exception(
-                (
-                    "Unable to load scenes for configuration entry '%s' because the"
-                    " access token does not have the required access"
-                ),
-                entry.title,
-            )
-        else:
-            raise
-    return []
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, entry: SmartThingsConfigEntry
+) -> bool:
     """Unload a config entry."""
-    broker = hass.data[DOMAIN][DATA_BROKERS].pop(entry.entry_id, None)
-    if broker:
-        broker.disconnect()
-
+    client = entry.runtime_data.client
+    if (subscription_id := entry.data.get(CONF_SUBSCRIPTION_ID)) is not None:
+        with contextlib.suppress(SmartThingsConnectionError):
+            await client.delete_subscription(subscription_id)
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
-async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
-    """Perform clean-up when entry is being removed."""
-    api = SmartThings(async_get_clientsession(hass), entry.data[CONF_ACCESS_TOKEN])
+async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Handle config entry migration."""
 
-    # Remove the installed_app, which if already removed raises a HTTPStatus.FORBIDDEN error.
-    installed_app_id = entry.data[CONF_INSTALLED_APP_ID]
-    try:
-        await api.delete_installed_app(installed_app_id)
-    except ClientResponseError as ex:
-        if ex.status == HTTPStatus.FORBIDDEN:
-            _LOGGER.debug(
-                "Installed app %s has already been removed",
-                installed_app_id,
-                exc_info=True,
-            )
-        else:
-            raise
-    _LOGGER.debug("Removed installed app %s", installed_app_id)
-
-    # Remove the app if not referenced by other entries, which if already
-    # removed raises a HTTPStatus.FORBIDDEN error.
-    all_entries = hass.config_entries.async_entries(DOMAIN)
-    app_id = entry.data[CONF_APP_ID]
-    app_count = sum(1 for entry in all_entries if entry.data[CONF_APP_ID] == app_id)
-    if app_count > 1:
-        _LOGGER.debug(
-            (
-                "App %s was not removed because it is in use by other configuration"
-                " entries"
-            ),
-            app_id,
+    if entry.version < 3:
+        # We keep the old data around, so we can use that to clean up the webhook in the future
+        hass.config_entries.async_update_entry(
+            entry, version=3, data={OLD_DATA: dict(entry.data)}
         )
-        return
-    # Remove the app
-    try:
-        await api.delete_app(app_id)
-    except ClientResponseError as ex:
-        if ex.status == HTTPStatus.FORBIDDEN:
-            _LOGGER.debug("App %s has already been removed", app_id, exc_info=True)
-        else:
-            raise
-    _LOGGER.debug("Removed app %s", app_id)
 
-    if len(all_entries) == 1:
-        await unload_smartapp_endpoint(hass)
+    if entry.minor_version < 2:
 
-
-class DeviceBroker:
-    """Manages an individual SmartThings config entry."""
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        entry: ConfigEntry,
-        token,
-        smart_app,
-        devices: Iterable,
-        scenes: Iterable,
-    ) -> None:
-        """Create a new instance of the DeviceBroker."""
-        self._hass = hass
-        self._entry = entry
-        self._installed_app_id = entry.data[CONF_INSTALLED_APP_ID]
-        self._smart_app = smart_app
-        self._token = token
-        self._event_disconnect = None
-        self._regenerate_token_remove = None
-        self._assignments = self._assign_capabilities(devices)
-        self.devices = {device.device_id: device for device in devices}
-        self.scenes = {scene.scene_id: scene for scene in scenes}
-
-    def _assign_capabilities(self, devices: Iterable):
-        """Assign platforms to capabilities."""
-        assignments = {}
-        for device in devices:
-            capabilities = device.capabilities.copy()
-            slots = {}
-            for platform in PLATFORMS:
-                platform_module = importlib.import_module(
-                    f".{platform}", self.__module__
+        def migrate_entities(entity_entry: RegistryEntry) -> dict[str, Any] | None:
+            if entity_entry.domain == "binary_sensor":
+                device_id, attribute = entity_entry.unique_id.split(".")
+                if (
+                    capability := BINARY_SENSOR_ATTRIBUTES_TO_CAPABILITIES.get(
+                        attribute
+                    )
+                ) is None:
+                    return None
+                new_unique_id = (
+                    f"{device_id}_{MAIN}_{capability}_{attribute}_{attribute}"
                 )
-                if not hasattr(platform_module, "get_capabilities"):
-                    continue
-                assigned = platform_module.get_capabilities(capabilities)
-                if not assigned:
-                    continue
-                # Draw-down capabilities and set slot assignment
-                for capability in assigned:
-                    if capability not in capabilities:
-                        continue
-                    capabilities.remove(capability)
-                    slots[capability] = platform
-            assignments[device.device_id] = slots
-        return assignments
+                return {
+                    "new_unique_id": new_unique_id,
+                }
+            if entity_entry.domain in {"cover", "climate", "fan", "light", "lock"}:
+                return {"new_unique_id": f"{entity_entry.unique_id}_{MAIN}"}
+            if entity_entry.domain == "sensor":
+                delimiter = "." if " " not in entity_entry.unique_id else " "
+                if delimiter not in entity_entry.unique_id:
+                    return None
+                device_id, attribute = entity_entry.unique_id.split(
+                    delimiter, maxsplit=1
+                )
+                if (
+                    capability := SENSOR_ATTRIBUTES_TO_CAPABILITIES.get(attribute)
+                ) is None:
+                    if attribute in {
+                        "energy_meter",
+                        "power_meter",
+                        "deltaEnergy_meter",
+                        "powerEnergy_meter",
+                        "energySaved_meter",
+                    }:
+                        return {
+                            "new_unique_id": f"{device_id}_{MAIN}_{Capability.POWER_CONSUMPTION_REPORT}_{Attribute.POWER_CONSUMPTION}_{attribute}",
+                        }
+                    if attribute in {
+                        "X Coordinate",
+                        "Y Coordinate",
+                        "Z Coordinate",
+                    }:
+                        new_attribute = {
+                            "X Coordinate": "x_coordinate",
+                            "Y Coordinate": "y_coordinate",
+                            "Z Coordinate": "z_coordinate",
+                        }[attribute]
+                        return {
+                            "new_unique_id": f"{device_id}_{MAIN}_{Capability.THREE_AXIS}_{Attribute.THREE_AXIS}_{new_attribute}",
+                        }
+                    if attribute in {
+                        Attribute.MACHINE_STATE,
+                        Attribute.COMPLETION_TIME,
+                    }:
+                        capability = determine_machine_type(
+                            hass, entry.entry_id, device_id
+                        )
+                        if capability is None:
+                            return None
+                        return {
+                            "new_unique_id": f"{device_id}_{MAIN}_{capability}_{attribute}_{attribute}",
+                        }
+                    return None
+                return {
+                    "new_unique_id": f"{device_id}_{MAIN}_{capability}_{attribute}_{attribute}",
+                }
 
-    def connect(self):
-        """Connect handlers/listeners for device/lifecycle events."""
+            if entity_entry.domain == "switch":
+                return {
+                    "new_unique_id": f"{entity_entry.unique_id}_{MAIN}_{Capability.SWITCH}_{Attribute.SWITCH}_{Attribute.SWITCH}",
+                }
 
-        # Setup interval to regenerate the refresh token on a periodic basis.
-        # Tokens expire in 30 days and once expired, cannot be recovered.
-        async def regenerate_refresh_token(now):
-            """Generate a new refresh token and update the config entry."""
-            await self._token.refresh(
-                self._entry.data[CONF_CLIENT_ID],
-                self._entry.data[CONF_CLIENT_SECRET],
-            )
-            self._hass.config_entries.async_update_entry(
-                self._entry,
-                data={
-                    **self._entry.data,
-                    CONF_REFRESH_TOKEN: self._token.refresh_token,
-                },
-            )
-            _LOGGER.debug(
-                "Regenerated refresh token for installed app: %s",
-                self._installed_app_id,
-            )
+            return None
 
-        self._regenerate_token_remove = async_track_time_interval(
-            self._hass, regenerate_refresh_token, TOKEN_REFRESH_INTERVAL
+        await async_migrate_entries(hass, entry.entry_id, migrate_entities)
+        hass.config_entries.async_update_entry(
+            entry,
+            minor_version=2,
         )
 
-        # Connect handler to incoming device events
-        self._event_disconnect = self._smart_app.connect_event(self._event_handler)
+    return True
 
-    def disconnect(self):
-        """Disconnects handlers/listeners for device/lifecycle events."""
-        if self._regenerate_token_remove:
-            self._regenerate_token_remove()
-        if self._event_disconnect:
-            self._event_disconnect()
 
-    def get_assigned(self, device_id: str, platform: str):
-        """Get the capabilities assigned to the platform."""
-        slots = self._assignments.get(device_id, {})
-        return [key for key, value in slots.items() if value == platform]
+def determine_machine_type(
+    hass: HomeAssistant,
+    entry_id: str,
+    device_id: str,
+) -> Capability | None:
+    """Determine the machine type for a device."""
+    entity_registry = er.async_get(hass)
+    entries = er.async_entries_for_config_entry(entity_registry, entry_id)
+    device_entries = [entry for entry in entries if device_id in entry.unique_id]
+    for entry in device_entries:
+        if Attribute.DISHWASHER_JOB_STATE in entry.unique_id:
+            return Capability.DISHWASHER_OPERATING_STATE
+        if Attribute.WASHER_JOB_STATE in entry.unique_id:
+            return Capability.WASHER_OPERATING_STATE
+        if Attribute.DRYER_JOB_STATE in entry.unique_id:
+            return Capability.DRYER_OPERATING_STATE
+        if Attribute.OVEN_JOB_STATE in entry.unique_id:
+            return Capability.OVEN_OPERATING_STATE
+    return None
 
-    def any_assigned(self, device_id: str, platform: str):
-        """Return True if the platform has any assigned capabilities."""
-        slots = self._assignments.get(device_id, {})
-        return any(value for value in slots.values() if value == platform)
 
-    async def _event_handler(self, req, resp, app):
-        """Broker for incoming events."""
-        # Do not process events received from a different installed app
-        # under the same parent SmartApp (valid use-scenario)
-        if req.installed_app_id != self._installed_app_id:
-            return
-
-        updated_devices = set()
-        for evt in req.events:
-            if evt.event_type != EVENT_TYPE_DEVICE:
-                continue
-            if not (device := self.devices.get(evt.device_id)):
-                continue
-            device.status.apply_attribute_update(
-                evt.component_id,
-                evt.capability,
-                evt.attribute,
-                evt.value,
-                data=evt.data,
+def create_devices(
+    device_registry: dr.DeviceRegistry,
+    devices: dict[str, FullDevice],
+    entry: SmartThingsConfigEntry,
+    rooms: dict[str, str],
+) -> None:
+    """Create devices in the device registry."""
+    for device in sorted(
+        devices.values(), key=lambda d: d.device.parent_device_id or ""
+    ):
+        kwargs: dict[str, Any] = {}
+        if device.device.hub is not None:
+            kwargs = {
+                ATTR_SW_VERSION: device.device.hub.firmware_version,
+                ATTR_MODEL: device.device.hub.hardware_type,
+            }
+            if device.device.hub.mac_address:
+                kwargs[ATTR_CONNECTIONS] = {
+                    (dr.CONNECTION_NETWORK_MAC, device.device.hub.mac_address)
+                }
+        if device.device.parent_device_id:
+            kwargs[ATTR_VIA_DEVICE] = (DOMAIN, device.device.parent_device_id)
+        if (ocf := device.device.ocf) is not None:
+            kwargs.update(
+                {
+                    ATTR_MANUFACTURER: ocf.manufacturer_name,
+                    ATTR_MODEL: (
+                        (ocf.model_number.split("|")[0]) if ocf.model_number else None
+                    ),
+                    ATTR_HW_VERSION: ocf.hardware_version,
+                    ATTR_SW_VERSION: ocf.firmware_version,
+                }
             )
-
-            # Fire events for buttons
-            if (
-                evt.capability == Capability.button
-                and evt.attribute == Attribute.button
-            ):
-                data = {
-                    "component_id": evt.component_id,
-                    "device_id": evt.device_id,
-                    "location_id": evt.location_id,
-                    "value": evt.value,
-                    "name": device.label,
-                    "data": evt.data,
+        if (viper := device.device.viper) is not None:
+            kwargs.update(
+                {
+                    ATTR_MANUFACTURER: viper.manufacturer_name,
+                    ATTR_MODEL: viper.model_name,
+                    ATTR_HW_VERSION: viper.hardware_version,
+                    ATTR_SW_VERSION: viper.software_version,
                 }
-                self._hass.bus.async_fire(EVENT_BUTTON, data)
-                _LOGGER.debug("Fired button event: %s", data)
-            else:
-                data = {
-                    "location_id": evt.location_id,
-                    "device_id": evt.device_id,
-                    "component_id": evt.component_id,
-                    "capability": evt.capability,
-                    "attribute": evt.attribute,
-                    "value": evt.value,
-                    "data": evt.data,
-                }
-                _LOGGER.debug("Push update received: %s", data)
+            )
+        device_registry.async_get_or_create(
+            config_entry_id=entry.entry_id,
+            identifiers={(DOMAIN, device.device.device_id)},
+            configuration_url="https://account.smartthings.com",
+            name=device.device.label,
+            suggested_area=(
+                rooms.get(device.device.room_id) if device.device.room_id else None
+            ),
+            **kwargs,
+        )
 
-            updated_devices.add(device.device_id)
 
-        async_dispatcher_send(self._hass, SIGNAL_SMARTTHINGS_UPDATE, updated_devices)
+KEEP_CAPABILITY_QUIRK: dict[
+    Capability | str, Callable[[dict[Attribute | str, Status]], bool]
+] = {
+    Capability.DRYER_OPERATING_STATE: (
+        lambda status: status[Attribute.SUPPORTED_MACHINE_STATES].value is not None
+    ),
+    Capability.WASHER_OPERATING_STATE: (
+        lambda status: status[Attribute.SUPPORTED_MACHINE_STATES].value is not None
+    ),
+    Capability.DEMAND_RESPONSE_LOAD_CONTROL: lambda _: True,
+}
+
+
+def process_status(status: dict[str, ComponentStatus]) -> dict[str, ComponentStatus]:
+    """Remove disabled capabilities from status."""
+    if (main_component := status.get(MAIN)) is None:
+        return status
+    if (
+        disabled_capabilities_capability := main_component.get(
+            Capability.CUSTOM_DISABLED_CAPABILITIES
+        )
+    ) is not None:
+        disabled_capabilities = cast(
+            list[Capability | str],
+            disabled_capabilities_capability[Attribute.DISABLED_CAPABILITIES].value,
+        )
+        if disabled_capabilities is not None:
+            for capability in disabled_capabilities:
+                if capability in main_component and (
+                    capability not in KEEP_CAPABILITY_QUIRK
+                    or not KEEP_CAPABILITY_QUIRK[capability](main_component[capability])
+                ):
+                    del main_component[capability]
+    return status
diff --git a/homeassistant/components/smartthings/application_credentials.py b/homeassistant/components/smartthings/application_credentials.py
new file mode 100644
index 00000000000..1e637c6bd12
--- /dev/null
+++ b/homeassistant/components/smartthings/application_credentials.py
@@ -0,0 +1,64 @@
+"""Application credentials platform for SmartThings."""
+
+from json import JSONDecodeError
+import logging
+from typing import cast
+
+from aiohttp import BasicAuth, ClientError
+
+from homeassistant.components.application_credentials import (
+    AuthImplementation,
+    AuthorizationServer,
+    ClientCredential,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.config_entry_oauth2_flow import AbstractOAuth2Implementation
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_get_auth_implementation(
+    hass: HomeAssistant, auth_domain: str, credential: ClientCredential
+) -> AbstractOAuth2Implementation:
+    """Return auth implementation."""
+    return SmartThingsOAuth2Implementation(
+        hass,
+        DOMAIN,
+        credential,
+        authorization_server=AuthorizationServer(
+            authorize_url="https://api.smartthings.com/oauth/authorize",
+            token_url="https://auth-global.api.smartthings.com/oauth/token",
+        ),
+    )
+
+
+class SmartThingsOAuth2Implementation(AuthImplementation):
+    """Oauth2 implementation that only uses the external url."""
+
+    async def _token_request(self, data: dict) -> dict:
+        """Make a token request."""
+        session = async_get_clientsession(self.hass)
+
+        resp = await session.post(
+            self.token_url,
+            data=data,
+            auth=BasicAuth(self.client_id, self.client_secret),
+        )
+        if resp.status >= 400:
+            try:
+                error_response = await resp.json()
+            except (ClientError, JSONDecodeError):
+                error_response = {}
+            error_code = error_response.get("error", "unknown")
+            error_description = error_response.get("error_description", "unknown error")
+            _LOGGER.error(
+                "Token request for %s failed (%s): %s",
+                self.domain,
+                error_code,
+                error_description,
+            )
+        resp.raise_for_status()
+        return cast(dict, await resp.json())
diff --git a/homeassistant/components/smartthings/binary_sensor.py b/homeassistant/components/smartthings/binary_sensor.py
index 611473b011d..bd09f1725d3 100644
--- a/homeassistant/components/smartthings/binary_sensor.py
+++ b/homeassistant/components/smartthings/binary_sensor.py
@@ -2,84 +2,312 @@
 
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Callable
+from dataclasses import dataclass
 
-from pysmartthings import Attribute, Capability
+from pysmartthings import Attribute, Capability, Category, SmartThings, Status
 
+from homeassistant.components.automation import automations_with_entity
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
+    BinarySensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.components.script import scripts_with_entity
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.issue_registry import (
+    IssueSeverity,
+    async_create_issue,
+    async_delete_issue,
+)
 
-from .const import DATA_BROKERS, DOMAIN
+from . import FullDevice, SmartThingsConfigEntry
+from .const import DOMAIN, MAIN
 from .entity import SmartThingsEntity
 
-CAPABILITY_TO_ATTRIB = {
-    Capability.acceleration_sensor: Attribute.acceleration,
-    Capability.contact_sensor: Attribute.contact,
-    Capability.filter_status: Attribute.filter_status,
-    Capability.motion_sensor: Attribute.motion,
-    Capability.presence_sensor: Attribute.presence,
-    Capability.sound_sensor: Attribute.sound,
-    Capability.tamper_alert: Attribute.tamper,
-    Capability.valve: Attribute.valve,
-    Capability.water_sensor: Attribute.water,
-}
-ATTRIB_TO_CLASS = {
-    Attribute.acceleration: BinarySensorDeviceClass.MOVING,
-    Attribute.contact: BinarySensorDeviceClass.OPENING,
-    Attribute.filter_status: BinarySensorDeviceClass.PROBLEM,
-    Attribute.motion: BinarySensorDeviceClass.MOTION,
-    Attribute.presence: BinarySensorDeviceClass.PRESENCE,
-    Attribute.sound: BinarySensorDeviceClass.SOUND,
-    Attribute.tamper: BinarySensorDeviceClass.PROBLEM,
-    Attribute.valve: BinarySensorDeviceClass.OPENING,
-    Attribute.water: BinarySensorDeviceClass.MOISTURE,
-}
-ATTRIB_TO_ENTTIY_CATEGORY = {
-    Attribute.tamper: EntityCategory.DIAGNOSTIC,
+
+@dataclass(frozen=True, kw_only=True)
+class SmartThingsBinarySensorEntityDescription(BinarySensorEntityDescription):
+    """Describe a SmartThings binary sensor entity."""
+
+    is_on_key: str
+    category_device_class: dict[Category | str, BinarySensorDeviceClass] | None = None
+    category: set[Category] | None = None
+    exists_fn: Callable[[str], bool] | None = None
+    component_translation_key: dict[str, str] | None = None
+    deprecated_fn: Callable[
+        [dict[str, dict[Capability | str, dict[Attribute | str, Status]]]], str | None
+    ] = lambda _: None
+
+
+CAPABILITY_TO_SENSORS: dict[
+    Capability, dict[Attribute, SmartThingsBinarySensorEntityDescription]
+] = {
+    Capability.ACCELERATION_SENSOR: {
+        Attribute.ACCELERATION: SmartThingsBinarySensorEntityDescription(
+            key=Attribute.ACCELERATION,
+            translation_key="acceleration",
+            device_class=BinarySensorDeviceClass.MOVING,
+            is_on_key="active",
+        )
+    },
+    Capability.CONTACT_SENSOR: {
+        Attribute.CONTACT: SmartThingsBinarySensorEntityDescription(
+            key=Attribute.CONTACT,
+            device_class=BinarySensorDeviceClass.DOOR,
+            is_on_key="open",
+            category_device_class={
+                Category.GARAGE_DOOR: BinarySensorDeviceClass.GARAGE_DOOR,
+                Category.DOOR: BinarySensorDeviceClass.DOOR,
+                Category.WINDOW: BinarySensorDeviceClass.WINDOW,
+            },
+            exists_fn=lambda key: key in {"freezer", "cooler"},
+            component_translation_key={
+                "freezer": "freezer_door",
+                "cooler": "cooler_door",
+            },
+            deprecated_fn=(
+                lambda status: "fridge_door"
+                if "freezer" in status and "cooler" in status
+                else None
+            ),
+        )
+    },
+    Capability.CUSTOM_DRYER_WRINKLE_PREVENT: {
+        Attribute.OPERATING_STATE: SmartThingsBinarySensorEntityDescription(
+            key=Attribute.OPERATING_STATE,
+            translation_key="dryer_wrinkle_prevent_active",
+            is_on_key="running",
+            entity_category=EntityCategory.DIAGNOSTIC,
+        )
+    },
+    Capability.FILTER_STATUS: {
+        Attribute.FILTER_STATUS: SmartThingsBinarySensorEntityDescription(
+            key=Attribute.FILTER_STATUS,
+            translation_key="filter_status",
+            device_class=BinarySensorDeviceClass.PROBLEM,
+            is_on_key="replace",
+        )
+    },
+    Capability.SAMSUNG_CE_KIDS_LOCK: {
+        Attribute.LOCK_STATE: SmartThingsBinarySensorEntityDescription(
+            key=Attribute.LOCK_STATE,
+            translation_key="child_lock",
+            is_on_key="locked",
+        )
+    },
+    Capability.MOTION_SENSOR: {
+        Attribute.MOTION: SmartThingsBinarySensorEntityDescription(
+            key=Attribute.MOTION,
+            device_class=BinarySensorDeviceClass.MOTION,
+            is_on_key="active",
+        )
+    },
+    Capability.PRESENCE_SENSOR: {
+        Attribute.PRESENCE: SmartThingsBinarySensorEntityDescription(
+            key=Attribute.PRESENCE,
+            device_class=BinarySensorDeviceClass.PRESENCE,
+            is_on_key="present",
+        )
+    },
+    Capability.REMOTE_CONTROL_STATUS: {
+        Attribute.REMOTE_CONTROL_ENABLED: SmartThingsBinarySensorEntityDescription(
+            key=Attribute.REMOTE_CONTROL_ENABLED,
+            translation_key="remote_control",
+            is_on_key="true",
+        )
+    },
+    Capability.SOUND_SENSOR: {
+        Attribute.SOUND: SmartThingsBinarySensorEntityDescription(
+            key=Attribute.SOUND,
+            device_class=BinarySensorDeviceClass.SOUND,
+            is_on_key="detected",
+        )
+    },
+    Capability.SWITCH: {
+        Attribute.SWITCH: SmartThingsBinarySensorEntityDescription(
+            key=Attribute.SWITCH,
+            device_class=BinarySensorDeviceClass.POWER,
+            is_on_key="on",
+            category={
+                Category.CLOTHING_CARE_MACHINE,
+                Category.COOKTOP,
+                Category.DISHWASHER,
+                Category.DRYER,
+                Category.MICROWAVE,
+                Category.WASHER,
+            },
+        )
+    },
+    Capability.TAMPER_ALERT: {
+        Attribute.TAMPER: SmartThingsBinarySensorEntityDescription(
+            key=Attribute.TAMPER,
+            device_class=BinarySensorDeviceClass.TAMPER,
+            is_on_key="detected",
+            entity_category=EntityCategory.DIAGNOSTIC,
+        )
+    },
+    Capability.VALVE: {
+        Attribute.VALVE: SmartThingsBinarySensorEntityDescription(
+            key=Attribute.VALVE,
+            translation_key="valve",
+            device_class=BinarySensorDeviceClass.OPENING,
+            is_on_key="open",
+            deprecated_fn=lambda _: "valve",
+        )
+    },
+    Capability.WATER_SENSOR: {
+        Attribute.WATER: SmartThingsBinarySensorEntityDescription(
+            key=Attribute.WATER,
+            device_class=BinarySensorDeviceClass.MOISTURE,
+            is_on_key="wet",
+        )
+    },
+    Capability.SAMSUNG_CE_DOOR_STATE: {
+        Attribute.DOOR_STATE: SmartThingsBinarySensorEntityDescription(
+            key=Attribute.DOOR_STATE,
+            translation_key="door",
+            device_class=BinarySensorDeviceClass.OPENING,
+            is_on_key="open",
+        )
+    },
 }
 
 
+def get_main_component_category(
+    device: FullDevice,
+) -> Category | str:
+    """Get the main component of a device."""
+    main = device.device.components[MAIN]
+    return main.user_category or main.manufacturer_category
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: SmartThingsConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add binary sensors for a config entry."""
-    broker = hass.data[DOMAIN][DATA_BROKERS][config_entry.entry_id]
-    sensors = []
-    for device in broker.devices.values():
-        for capability in broker.get_assigned(device.device_id, "binary_sensor"):
-            attrib = CAPABILITY_TO_ATTRIB[capability]
-            sensors.append(SmartThingsBinarySensor(device, attrib))
-    async_add_entities(sensors)
-
-
-def get_capabilities(capabilities: Sequence[str]) -> Sequence[str] | None:
-    """Return all capabilities supported if minimum required are present."""
-    return [
-        capability for capability in CAPABILITY_TO_ATTRIB if capability in capabilities
-    ]
+    entry_data = entry.runtime_data
+    async_add_entities(
+        SmartThingsBinarySensor(
+            entry_data.client, device, description, capability, attribute, component
+        )
+        for device in entry_data.devices.values()
+        for capability, attribute_map in CAPABILITY_TO_SENSORS.items()
+        for attribute, description in attribute_map.items()
+        for component in device.status
+        if capability in device.status[component]
+        and (
+            component == MAIN
+            or (description.exists_fn is not None and description.exists_fn(component))
+        )
+        and (
+            not description.category
+            or get_main_component_category(device) in description.category
+        )
+    )
 
 
 class SmartThingsBinarySensor(SmartThingsEntity, BinarySensorEntity):
     """Define a SmartThings Binary Sensor."""
 
-    def __init__(self, device, attribute):
+    entity_description: SmartThingsBinarySensorEntityDescription
+
+    def __init__(
+        self,
+        client: SmartThings,
+        device: FullDevice,
+        entity_description: SmartThingsBinarySensorEntityDescription,
+        capability: Capability,
+        attribute: Attribute,
+        component: str,
+    ) -> None:
         """Init the class."""
-        super().__init__(device)
+        super().__init__(client, device, {capability}, component=component)
         self._attribute = attribute
-        self._attr_name = f"{device.label} {attribute}"
-        self._attr_unique_id = f"{device.device_id}.{attribute}"
-        self._attr_device_class = ATTRIB_TO_CLASS[attribute]
-        self._attr_entity_category = ATTRIB_TO_ENTTIY_CATEGORY.get(attribute)
+        self.capability = capability
+        self.entity_description = entity_description
+        self._attr_unique_id = f"{device.device.device_id}_{component}_{capability}_{attribute}_{attribute}"
+        if (
+            entity_description.category_device_class
+            and (category := get_main_component_category(device))
+            in entity_description.category_device_class
+        ):
+            self._attr_device_class = entity_description.category_device_class[category]
+            self._attr_name = None
+        if (
+            entity_description.component_translation_key is not None
+            and (
+                translation_key := entity_description.component_translation_key.get(
+                    component
+                )
+            )
+            is not None
+        ):
+            self._attr_translation_key = translation_key
 
     @property
-    def is_on(self):
+    def is_on(self) -> bool:
         """Return true if the binary sensor is on."""
-        return self._device.status.is_on(self._attribute)
+        return (
+            self.get_attribute_value(self.capability, self._attribute)
+            == self.entity_description.is_on_key
+        )
+
+    async def async_added_to_hass(self) -> None:
+        """Call when entity is added to hass."""
+        await super().async_added_to_hass()
+        if (issue := self.entity_description.deprecated_fn(self.device.status)) is None:
+            return
+        automations = automations_with_entity(self.hass, self.entity_id)
+        scripts = scripts_with_entity(self.hass, self.entity_id)
+        items = automations + scripts
+        if not items:
+            return
+
+        entity_reg: er.EntityRegistry = er.async_get(self.hass)
+        entity_automations = [
+            automation_entity
+            for automation_id in automations
+            if (automation_entity := entity_reg.async_get(automation_id))
+        ]
+        entity_scripts = [
+            script_entity
+            for script_id in scripts
+            if (script_entity := entity_reg.async_get(script_id))
+        ]
+
+        items_list = [
+            f"- [{item.original_name}](/config/automation/edit/{item.unique_id})"
+            for item in entity_automations
+        ] + [
+            f"- [{item.original_name}](/config/script/edit/{item.unique_id})"
+            for item in entity_scripts
+        ]
+
+        async_create_issue(
+            self.hass,
+            DOMAIN,
+            f"deprecated_binary_{issue}_{self.entity_id}",
+            breaks_in_ha_version="2025.10.0",
+            is_fixable=False,
+            severity=IssueSeverity.WARNING,
+            translation_key=f"deprecated_binary_{issue}",
+            translation_placeholders={
+                "entity": self.entity_id,
+                "items": "\n".join(items_list),
+            },
+        )
+
+    async def async_will_remove_from_hass(self) -> None:
+        """Call when entity will be removed from hass."""
+        await super().async_will_remove_from_hass()
+        if (issue := self.entity_description.deprecated_fn(self.device.status)) is None:
+            return
+        async_delete_issue(
+            self.hass, DOMAIN, f"deprecated_binary_{issue}_{self.entity_id}"
+        )
diff --git a/homeassistant/components/smartthings/button.py b/homeassistant/components/smartthings/button.py
new file mode 100644
index 00000000000..00fbaa0e2c4
--- /dev/null
+++ b/homeassistant/components/smartthings/button.py
@@ -0,0 +1,78 @@
+"""Support for button entities through the SmartThings cloud API."""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from pysmartthings import Capability, Command, SmartThings
+
+from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import FullDevice, SmartThingsConfigEntry
+from .const import MAIN
+from .entity import SmartThingsEntity
+
+
+@dataclass(frozen=True, kw_only=True)
+class SmartThingsButtonDescription(ButtonEntityDescription):
+    """Class describing SmartThings button entities."""
+
+    key: Capability
+    command: Command
+
+
+CAPABILITIES_TO_BUTTONS: dict[Capability | str, SmartThingsButtonDescription] = {
+    Capability.OVEN_OPERATING_STATE: SmartThingsButtonDescription(
+        key=Capability.OVEN_OPERATING_STATE,
+        translation_key="stop",
+        command=Command.STOP,
+    ),
+    Capability.CUSTOM_WATER_FILTER: SmartThingsButtonDescription(
+        key=Capability.CUSTOM_WATER_FILTER,
+        translation_key="reset_water_filter",
+        command=Command.RESET_WATER_FILTER,
+    ),
+}
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: SmartThingsConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Add button entities for a config entry."""
+    entry_data = entry.runtime_data
+    async_add_entities(
+        SmartThingsButtonEntity(
+            entry_data.client, device, CAPABILITIES_TO_BUTTONS[capability]
+        )
+        for device in entry_data.devices.values()
+        for capability in device.status[MAIN]
+        if capability in CAPABILITIES_TO_BUTTONS
+    )
+
+
+class SmartThingsButtonEntity(SmartThingsEntity, ButtonEntity):
+    """Define a SmartThings button."""
+
+    entity_description: SmartThingsButtonDescription
+
+    def __init__(
+        self,
+        client: SmartThings,
+        device: FullDevice,
+        entity_description: SmartThingsButtonDescription,
+    ) -> None:
+        """Initialize the instance."""
+        super().__init__(client, device, set())
+        self.entity_description = entity_description
+        self._attr_unique_id = f"{device.device.device_id}_{MAIN}_{entity_description.key}_{entity_description.command}"
+
+    async def async_press(self) -> None:
+        """Press the button."""
+        await self.execute_device_command(
+            self.entity_description.key,
+            self.entity_description.command,
+        )
diff --git a/homeassistant/components/smartthings/climate.py b/homeassistant/components/smartthings/climate.py
index d9535272295..e20f191352f 100644
--- a/homeassistant/components/smartthings/climate.py
+++ b/homeassistant/components/smartthings/climate.py
@@ -3,17 +3,15 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Iterable, Sequence
 import logging
 from typing import Any
 
-from pysmartthings import Attribute, Capability
+from pysmartthings import Attribute, Capability, Command, SmartThings
 
 from homeassistant.components.climate import (
     ATTR_HVAC_MODE,
     ATTR_TARGET_TEMP_HIGH,
     ATTR_TARGET_TEMP_LOW,
-    DOMAIN as CLIMATE_DOMAIN,
     SWING_BOTH,
     SWING_HORIZONTAL,
     SWING_OFF,
@@ -23,12 +21,12 @@ from homeassistant.components.climate import (
     HVACAction,
     HVACMode,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DATA_BROKERS, DOMAIN
+from . import FullDevice, SmartThingsConfigEntry
+from .const import MAIN
 from .entity import SmartThingsEntity
 
 ATTR_OPERATION_STATE = "operation_state"
@@ -97,124 +95,106 @@ UNIT_MAP = {"C": UnitOfTemperature.CELSIUS, "F": UnitOfTemperature.FAHRENHEIT}
 _LOGGER = logging.getLogger(__name__)
 
 
+AC_CAPABILITIES = [
+    Capability.AIR_CONDITIONER_MODE,
+    Capability.AIR_CONDITIONER_FAN_MODE,
+    Capability.SWITCH,
+    Capability.TEMPERATURE_MEASUREMENT,
+    Capability.THERMOSTAT_COOLING_SETPOINT,
+]
+
+THERMOSTAT_CAPABILITIES = [
+    Capability.TEMPERATURE_MEASUREMENT,
+    Capability.THERMOSTAT_HEATING_SETPOINT,
+    Capability.THERMOSTAT_MODE,
+]
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: SmartThingsConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add climate entities for a config entry."""
-    ac_capabilities = [
-        Capability.air_conditioner_mode,
-        Capability.air_conditioner_fan_mode,
-        Capability.switch,
-        Capability.temperature_measurement,
-        Capability.thermostat_cooling_setpoint,
+    entry_data = entry.runtime_data
+    entities: list[ClimateEntity] = [
+        SmartThingsAirConditioner(entry_data.client, device)
+        for device in entry_data.devices.values()
+        if all(capability in device.status[MAIN] for capability in AC_CAPABILITIES)
     ]
-
-    broker = hass.data[DOMAIN][DATA_BROKERS][config_entry.entry_id]
-    entities: list[ClimateEntity] = []
-    for device in broker.devices.values():
-        if not broker.any_assigned(device.device_id, CLIMATE_DOMAIN):
-            continue
-        if all(capability in device.capabilities for capability in ac_capabilities):
-            entities.append(SmartThingsAirConditioner(device))
-        else:
-            entities.append(SmartThingsThermostat(device))
-    async_add_entities(entities, True)
-
-
-def get_capabilities(capabilities: Sequence[str]) -> Sequence[str] | None:
-    """Return all capabilities supported if minimum required are present."""
-    supported = [
-        Capability.air_conditioner_mode,
-        Capability.demand_response_load_control,
-        Capability.air_conditioner_fan_mode,
-        Capability.switch,
-        Capability.thermostat,
-        Capability.thermostat_cooling_setpoint,
-        Capability.thermostat_fan_mode,
-        Capability.thermostat_heating_setpoint,
-        Capability.thermostat_mode,
-        Capability.thermostat_operating_state,
-    ]
-    # Can have this legacy/deprecated capability
-    if Capability.thermostat in capabilities:
-        return supported
-    # Or must have all of these thermostat capabilities
-    thermostat_capabilities = [
-        Capability.temperature_measurement,
-        Capability.thermostat_heating_setpoint,
-        Capability.thermostat_mode,
-    ]
-    if all(capability in capabilities for capability in thermostat_capabilities):
-        return supported
-    # Or must have all of these A/C capabilities
-    ac_capabilities = [
-        Capability.air_conditioner_mode,
-        Capability.air_conditioner_fan_mode,
-        Capability.switch,
-        Capability.temperature_measurement,
-        Capability.thermostat_cooling_setpoint,
-    ]
-    if all(capability in capabilities for capability in ac_capabilities):
-        return supported
-    return None
+    entities.extend(
+        SmartThingsThermostat(entry_data.client, device)
+        for device in entry_data.devices.values()
+        if all(
+            capability in device.status[MAIN] for capability in THERMOSTAT_CAPABILITIES
+        )
+    )
+    async_add_entities(entities)
 
 
 class SmartThingsThermostat(SmartThingsEntity, ClimateEntity):
     """Define a SmartThings climate entities."""
 
-    def __init__(self, device):
-        """Init the class."""
-        super().__init__(device)
-        self._attr_supported_features = self._determine_features()
-        self._hvac_mode = None
-        self._hvac_modes = None
+    _attr_name = None
 
-    def _determine_features(self):
+    def __init__(self, client: SmartThings, device: FullDevice) -> None:
+        """Init the class."""
+        super().__init__(
+            client,
+            device,
+            {
+                Capability.THERMOSTAT_FAN_MODE,
+                Capability.THERMOSTAT_MODE,
+                Capability.TEMPERATURE_MEASUREMENT,
+                Capability.THERMOSTAT_HEATING_SETPOINT,
+                Capability.THERMOSTAT_OPERATING_STATE,
+                Capability.THERMOSTAT_COOLING_SETPOINT,
+                Capability.RELATIVE_HUMIDITY_MEASUREMENT,
+            },
+        )
+        self._attr_supported_features = self._determine_features()
+
+    def _determine_features(self) -> ClimateEntityFeature:
         flags = (
             ClimateEntityFeature.TARGET_TEMPERATURE
             | ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
             | ClimateEntityFeature.TURN_OFF
             | ClimateEntityFeature.TURN_ON
         )
-        if self._device.get_capability(
-            Capability.thermostat_fan_mode, Capability.thermostat
-        ):
+        if self.supports_capability(Capability.THERMOSTAT_FAN_MODE):
             flags |= ClimateEntityFeature.FAN_MODE
         return flags
 
     async def async_set_fan_mode(self, fan_mode: str) -> None:
         """Set new target fan mode."""
-        await self._device.set_thermostat_fan_mode(fan_mode, set_status=True)
-
-        # State is set optimistically in the command above, therefore update
-        # the entity state ahead of receiving the confirming push updates
-        self.async_schedule_update_ha_state(True)
+        await self.execute_device_command(
+            Capability.THERMOSTAT_FAN_MODE,
+            Command.SET_THERMOSTAT_FAN_MODE,
+            argument=fan_mode,
+        )
 
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set new target operation mode."""
-        mode = STATE_TO_MODE[hvac_mode]
-        await self._device.set_thermostat_mode(mode, set_status=True)
-
-        # State is set optimistically in the command above, therefore update
-        # the entity state ahead of receiving the confirming push updates
-        self.async_schedule_update_ha_state(True)
+        await self.execute_device_command(
+            Capability.THERMOSTAT_MODE,
+            Command.SET_THERMOSTAT_MODE,
+            argument=STATE_TO_MODE[hvac_mode],
+        )
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new operation mode and target temperatures."""
+        hvac_mode = self.hvac_mode
         # Operation state
         if operation_state := kwargs.get(ATTR_HVAC_MODE):
-            mode = STATE_TO_MODE[operation_state]
-            await self._device.set_thermostat_mode(mode, set_status=True)
-            await self.async_update()
+            await self.async_set_hvac_mode(operation_state)
+            hvac_mode = operation_state
 
         # Heat/cool setpoint
         heating_setpoint = None
         cooling_setpoint = None
-        if self.hvac_mode == HVACMode.HEAT:
+        if hvac_mode == HVACMode.HEAT:
             heating_setpoint = kwargs.get(ATTR_TEMPERATURE)
-        elif self.hvac_mode == HVACMode.COOL:
+        elif hvac_mode == HVACMode.COOL:
             cooling_setpoint = kwargs.get(ATTR_TEMPERATURE)
         else:
             heating_setpoint = kwargs.get(ATTR_TARGET_TEMP_LOW)
@@ -222,137 +202,159 @@ class SmartThingsThermostat(SmartThingsEntity, ClimateEntity):
         tasks = []
         if heating_setpoint is not None:
             tasks.append(
-                self._device.set_heating_setpoint(
-                    round(heating_setpoint, 3), set_status=True
+                self.execute_device_command(
+                    Capability.THERMOSTAT_HEATING_SETPOINT,
+                    Command.SET_HEATING_SETPOINT,
+                    argument=round(heating_setpoint, 3),
                 )
             )
         if cooling_setpoint is not None:
             tasks.append(
-                self._device.set_cooling_setpoint(
-                    round(cooling_setpoint, 3), set_status=True
+                self.execute_device_command(
+                    Capability.THERMOSTAT_COOLING_SETPOINT,
+                    Command.SET_COOLING_SETPOINT,
+                    argument=round(cooling_setpoint, 3),
                 )
             )
         await asyncio.gather(*tasks)
 
-        # State is set optimistically in the commands above, therefore update
-        # the entity state ahead of receiving the confirming push updates
-        self.async_schedule_update_ha_state(True)
-
-    async def async_update(self) -> None:
-        """Update the attributes of the climate device."""
-        thermostat_mode = self._device.status.thermostat_mode
-        self._hvac_mode = MODE_TO_STATE.get(thermostat_mode)
-        if self._hvac_mode is None:
-            _LOGGER.debug(
-                "Device %s (%s) returned an invalid hvac mode: %s",
-                self._device.label,
-                self._device.device_id,
-                thermostat_mode,
-            )
-
-        modes = set()
-        supported_modes = self._device.status.supported_thermostat_modes
-        if isinstance(supported_modes, Iterable):
-            for mode in supported_modes:
-                if (state := MODE_TO_STATE.get(mode)) is not None:
-                    modes.add(state)
-                else:
-                    _LOGGER.debug(
-                        (
-                            "Device %s (%s) returned an invalid supported thermostat"
-                            " mode: %s"
-                        ),
-                        self._device.label,
-                        self._device.device_id,
-                        mode,
-                    )
-        else:
-            _LOGGER.debug(
-                "Device %s (%s) returned invalid supported thermostat modes: %s",
-                self._device.label,
-                self._device.device_id,
-                supported_modes,
-            )
-        self._hvac_modes = list(modes)
-
     @property
-    def current_humidity(self):
+    def current_humidity(self) -> float | None:
         """Return the current humidity."""
-        return self._device.status.humidity
+        if self.supports_capability(Capability.RELATIVE_HUMIDITY_MEASUREMENT):
+            return self.get_attribute_value(
+                Capability.RELATIVE_HUMIDITY_MEASUREMENT, Attribute.HUMIDITY
+            )
+        return None
 
     @property
-    def current_temperature(self):
+    def current_temperature(self) -> float | None:
         """Return the current temperature."""
-        return self._device.status.temperature
+        return self.get_attribute_value(
+            Capability.TEMPERATURE_MEASUREMENT, Attribute.TEMPERATURE
+        )
 
     @property
-    def fan_mode(self):
+    def fan_mode(self) -> str | None:
         """Return the fan setting."""
-        return self._device.status.thermostat_fan_mode
+        return self.get_attribute_value(
+            Capability.THERMOSTAT_FAN_MODE, Attribute.THERMOSTAT_FAN_MODE
+        )
 
     @property
-    def fan_modes(self):
+    def fan_modes(self) -> list[str]:
         """Return the list of available fan modes."""
-        return self._device.status.supported_thermostat_fan_modes
+        return self.get_attribute_value(
+            Capability.THERMOSTAT_FAN_MODE, Attribute.SUPPORTED_THERMOSTAT_FAN_MODES
+        )
 
     @property
     def hvac_action(self) -> HVACAction | None:
         """Return the current running hvac operation if supported."""
+        if not self.supports_capability(Capability.THERMOSTAT_OPERATING_STATE):
+            return None
         return OPERATING_STATE_TO_ACTION.get(
-            self._device.status.thermostat_operating_state
+            self.get_attribute_value(
+                Capability.THERMOSTAT_OPERATING_STATE,
+                Attribute.THERMOSTAT_OPERATING_STATE,
+            )
         )
 
     @property
-    def hvac_mode(self) -> HVACMode:
+    def hvac_mode(self) -> HVACMode | None:
         """Return current operation ie. heat, cool, idle."""
-        return self._hvac_mode
+        return MODE_TO_STATE.get(
+            self.get_attribute_value(
+                Capability.THERMOSTAT_MODE, Attribute.THERMOSTAT_MODE
+            )
+        )
 
     @property
     def hvac_modes(self) -> list[HVACMode]:
         """Return the list of available operation modes."""
-        return self._hvac_modes
+        if (
+            supported_thermostat_modes := self.get_attribute_value(
+                Capability.THERMOSTAT_MODE, Attribute.SUPPORTED_THERMOSTAT_MODES
+            )
+        ) is None:
+            return []
+        return [
+            state
+            for mode in supported_thermostat_modes
+            if (state := AC_MODE_TO_STATE.get(mode)) is not None
+        ]
 
     @property
-    def target_temperature(self):
+    def target_temperature(self) -> float | None:
         """Return the temperature we try to reach."""
         if self.hvac_mode == HVACMode.COOL:
-            return self._device.status.cooling_setpoint
+            return self.get_attribute_value(
+                Capability.THERMOSTAT_COOLING_SETPOINT, Attribute.COOLING_SETPOINT
+            )
         if self.hvac_mode == HVACMode.HEAT:
-            return self._device.status.heating_setpoint
+            return self.get_attribute_value(
+                Capability.THERMOSTAT_HEATING_SETPOINT, Attribute.HEATING_SETPOINT
+            )
         return None
 
     @property
-    def target_temperature_high(self):
+    def target_temperature_high(self) -> float | None:
         """Return the highbound target temperature we try to reach."""
         if self.hvac_mode == HVACMode.HEAT_COOL:
-            return self._device.status.cooling_setpoint
+            return self.get_attribute_value(
+                Capability.THERMOSTAT_COOLING_SETPOINT, Attribute.COOLING_SETPOINT
+            )
         return None
 
     @property
     def target_temperature_low(self):
         """Return the lowbound target temperature we try to reach."""
         if self.hvac_mode == HVACMode.HEAT_COOL:
-            return self._device.status.heating_setpoint
+            return self.get_attribute_value(
+                Capability.THERMOSTAT_HEATING_SETPOINT, Attribute.HEATING_SETPOINT
+            )
         return None
 
     @property
-    def temperature_unit(self):
+    def temperature_unit(self) -> str:
         """Return the unit of measurement."""
-        return UNIT_MAP.get(self._device.status.attributes[Attribute.temperature].unit)
+        # Offline third party thermostats may not have a unit
+        # Since climate always requires a unit, default to Celsius
+        if (
+            unit := self._internal_state[Capability.TEMPERATURE_MEASUREMENT][
+                Attribute.TEMPERATURE
+            ].unit
+        ) is None:
+            return UnitOfTemperature.CELSIUS
+        return UNIT_MAP[unit]
 
 
 class SmartThingsAirConditioner(SmartThingsEntity, ClimateEntity):
     """Define a SmartThings Air Conditioner."""
 
-    _hvac_modes: list[HVACMode]
+    _attr_name = None
+    _attr_preset_mode = None
 
-    def __init__(self, device) -> None:
+    def __init__(self, client: SmartThings, device: FullDevice) -> None:
         """Init the class."""
-        super().__init__(device)
-        self._hvac_modes = []
-        self._attr_preset_mode = None
+        super().__init__(
+            client,
+            device,
+            {
+                Capability.AIR_CONDITIONER_MODE,
+                Capability.SWITCH,
+                Capability.FAN_OSCILLATION_MODE,
+                Capability.AIR_CONDITIONER_FAN_MODE,
+                Capability.THERMOSTAT_COOLING_SETPOINT,
+                Capability.TEMPERATURE_MEASUREMENT,
+                Capability.CUSTOM_AIR_CONDITIONER_OPTIONAL_MODE,
+                Capability.DEMAND_RESPONSE_LOAD_CONTROL,
+            },
+        )
+        self._attr_hvac_modes = self._determine_hvac_modes()
         self._attr_preset_modes = self._determine_preset_modes()
-        self._attr_swing_modes = self._determine_swing_modes()
+        if self.supports_capability(Capability.FAN_OSCILLATION_MODE):
+            self._attr_swing_modes = self._determine_swing_modes()
         self._attr_supported_features = self._determine_supported_features()
 
     def _determine_supported_features(self) -> ClimateEntityFeature:
@@ -362,7 +364,7 @@ class SmartThingsAirConditioner(SmartThingsEntity, ClimateEntity):
             | ClimateEntityFeature.TURN_OFF
             | ClimateEntityFeature.TURN_ON
         )
-        if self._device.get_capability(Capability.fan_oscillation_mode):
+        if self.supports_capability(Capability.FAN_OSCILLATION_MODE):
             features |= ClimateEntityFeature.SWING_MODE
         if (self._attr_preset_modes is not None) and len(self._attr_preset_modes) > 0:
             features |= ClimateEntityFeature.PRESET_MODE
@@ -370,14 +372,11 @@ class SmartThingsAirConditioner(SmartThingsEntity, ClimateEntity):
 
     async def async_set_fan_mode(self, fan_mode: str) -> None:
         """Set new target fan mode."""
-        await self._device.set_fan_mode(fan_mode, set_status=True)
-
-        # setting the fan must reset the preset mode (it deactivates the windFree function)
-        self._attr_preset_mode = None
-
-        # State is set optimistically in the command above, therefore update
-        # the entity state ahead of receiving the confirming push updates
-        self.async_write_ha_state()
+        await self.execute_device_command(
+            Capability.AIR_CONDITIONER_FAN_MODE,
+            Command.SET_FAN_MODE,
+            argument=fan_mode,
+        )
 
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set new target operation mode."""
@@ -386,23 +385,27 @@ class SmartThingsAirConditioner(SmartThingsEntity, ClimateEntity):
             return
         tasks = []
         # Turn on the device if it's off before setting mode.
-        if not self._device.status.switch:
-            tasks.append(self._device.switch_on(set_status=True))
+        if self.get_attribute_value(Capability.SWITCH, Attribute.SWITCH) == "off":
+            tasks.append(self.async_turn_on())
 
         mode = STATE_TO_AC_MODE[hvac_mode]
         # If new hvac_mode is HVAC_MODE_FAN_ONLY and AirConditioner support "wind" mode the AirConditioner new mode has to be "wind"
         # The conversion make the mode change working
         # The conversion is made only for device that wrongly has capability "wind" instead "fan_only"
         if hvac_mode == HVACMode.FAN_ONLY:
-            supported_modes = self._device.status.supported_ac_modes
-            if WIND in supported_modes:
+            if WIND in self.get_attribute_value(
+                Capability.AIR_CONDITIONER_MODE, Attribute.SUPPORTED_AC_MODES
+            ):
                 mode = WIND
 
-        tasks.append(self._device.set_air_conditioner_mode(mode, set_status=True))
+        tasks.append(
+            self.execute_device_command(
+                Capability.AIR_CONDITIONER_MODE,
+                Command.SET_AIR_CONDITIONER_MODE,
+                argument=mode,
+            )
+        )
         await asyncio.gather(*tasks)
-        # State is set optimistically in the command above, therefore update
-        # the entity state ahead of receiving the confirming push updates
-        self.async_write_ha_state()
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
@@ -410,155 +413,167 @@ class SmartThingsAirConditioner(SmartThingsEntity, ClimateEntity):
         # operation mode
         if operation_mode := kwargs.get(ATTR_HVAC_MODE):
             if operation_mode == HVACMode.OFF:
-                tasks.append(self._device.switch_off(set_status=True))
+                tasks.append(self.async_turn_off())
             else:
-                if not self._device.status.switch:
-                    tasks.append(self._device.switch_on(set_status=True))
+                if (
+                    self.get_attribute_value(Capability.SWITCH, Attribute.SWITCH)
+                    == "off"
+                ):
+                    tasks.append(self.async_turn_on())
                 tasks.append(self.async_set_hvac_mode(operation_mode))
         # temperature
         tasks.append(
-            self._device.set_cooling_setpoint(kwargs[ATTR_TEMPERATURE], set_status=True)
+            self.execute_device_command(
+                Capability.THERMOSTAT_COOLING_SETPOINT,
+                Command.SET_COOLING_SETPOINT,
+                argument=kwargs[ATTR_TEMPERATURE],
+            )
         )
         await asyncio.gather(*tasks)
-        # State is set optimistically in the command above, therefore update
-        # the entity state ahead of receiving the confirming push updates
-        self.async_write_ha_state()
 
     async def async_turn_on(self) -> None:
         """Turn device on."""
-        await self._device.switch_on(set_status=True)
-        # State is set optimistically in the command above, therefore update
-        # the entity state ahead of receiving the confirming push updates
-        self.async_write_ha_state()
+        await self.execute_device_command(
+            Capability.SWITCH,
+            Command.ON,
+        )
 
     async def async_turn_off(self) -> None:
         """Turn device off."""
-        await self._device.switch_off(set_status=True)
-        # State is set optimistically in the command above, therefore update
-        # the entity state ahead of receiving the confirming push updates
-        self.async_write_ha_state()
-
-    async def async_update(self) -> None:
-        """Update the calculated fields of the AC."""
-        modes = {HVACMode.OFF}
-        for mode in self._device.status.supported_ac_modes:
-            if (state := AC_MODE_TO_STATE.get(mode)) is not None:
-                modes.add(state)
-            else:
-                _LOGGER.debug(
-                    "Device %s (%s) returned an invalid supported AC mode: %s",
-                    self._device.label,
-                    self._device.device_id,
-                    mode,
-                )
-        self._hvac_modes = list(modes)
+        await self.execute_device_command(
+            Capability.SWITCH,
+            Command.OFF,
+        )
 
     @property
     def current_temperature(self) -> float | None:
         """Return the current temperature."""
-        return self._device.status.temperature
+        return self.get_attribute_value(
+            Capability.TEMPERATURE_MEASUREMENT, Attribute.TEMPERATURE
+        )
 
     @property
-    def extra_state_attributes(self) -> dict[str, Any]:
+    def extra_state_attributes(self) -> dict[str, Any] | None:
         """Return device specific state attributes.
 
         Include attributes from the Demand Response Load Control (drlc)
         and Power Consumption capabilities.
         """
-        attributes = [
-            "drlc_status_duration",
-            "drlc_status_level",
-            "drlc_status_start",
-            "drlc_status_override",
-        ]
-        state_attributes = {}
-        for attribute in attributes:
-            value = getattr(self._device.status, attribute)
-            if value is not None:
-                state_attributes[attribute] = value
-        return state_attributes
+        if not self.supports_capability(Capability.DEMAND_RESPONSE_LOAD_CONTROL):
+            return None
+
+        drlc_status = self.get_attribute_value(
+            Capability.DEMAND_RESPONSE_LOAD_CONTROL,
+            Attribute.DEMAND_RESPONSE_LOAD_CONTROL_STATUS,
+        )
+        return {
+            "drlc_status_duration": drlc_status["duration"],
+            "drlc_status_level": drlc_status["drlcLevel"],
+            "drlc_status_start": drlc_status["start"],
+            "drlc_status_override": drlc_status["override"],
+        }
 
     @property
     def fan_mode(self) -> str:
         """Return the fan setting."""
-        return self._device.status.fan_mode
+        return self.get_attribute_value(
+            Capability.AIR_CONDITIONER_FAN_MODE, Attribute.FAN_MODE
+        )
 
     @property
     def fan_modes(self) -> list[str]:
         """Return the list of available fan modes."""
-        return self._device.status.supported_ac_fan_modes
+        return self.get_attribute_value(
+            Capability.AIR_CONDITIONER_FAN_MODE, Attribute.SUPPORTED_AC_FAN_MODES
+        )
 
     @property
     def hvac_mode(self) -> HVACMode | None:
         """Return current operation ie. heat, cool, idle."""
-        if not self._device.status.switch:
+        if self.get_attribute_value(Capability.SWITCH, Attribute.SWITCH) == "off":
             return HVACMode.OFF
-        return AC_MODE_TO_STATE.get(self._device.status.air_conditioner_mode)
-
-    @property
-    def hvac_modes(self) -> list[HVACMode]:
-        """Return the list of available operation modes."""
-        return self._hvac_modes
+        return AC_MODE_TO_STATE.get(
+            self.get_attribute_value(
+                Capability.AIR_CONDITIONER_MODE, Attribute.AIR_CONDITIONER_MODE
+            )
+        )
 
     @property
     def target_temperature(self) -> float:
         """Return the temperature we try to reach."""
-        return self._device.status.cooling_setpoint
+        return self.get_attribute_value(
+            Capability.THERMOSTAT_COOLING_SETPOINT, Attribute.COOLING_SETPOINT
+        )
 
     @property
     def temperature_unit(self) -> str:
         """Return the unit of measurement."""
-        return UNIT_MAP[self._device.status.attributes[Attribute.temperature].unit]
+        unit = self._internal_state[Capability.TEMPERATURE_MEASUREMENT][
+            Attribute.TEMPERATURE
+        ].unit
+        assert unit
+        return UNIT_MAP[unit]
 
     def _determine_swing_modes(self) -> list[str] | None:
         """Return the list of available swing modes."""
-        supported_swings = None
-        supported_modes = self._device.status.attributes[
-            Attribute.supported_fan_oscillation_modes
-        ][0]
-        if supported_modes is not None:
-            supported_swings = [
-                FAN_OSCILLATION_TO_SWING.get(m, SWING_OFF) for m in supported_modes
-            ]
-        return supported_swings
+        if (
+            supported_modes := self.get_attribute_value(
+                Capability.FAN_OSCILLATION_MODE,
+                Attribute.SUPPORTED_FAN_OSCILLATION_MODES,
+            )
+        ) is None:
+            return None
+        return [FAN_OSCILLATION_TO_SWING.get(m, SWING_OFF) for m in supported_modes]
 
     async def async_set_swing_mode(self, swing_mode: str) -> None:
         """Set swing mode."""
-        fan_oscillation_mode = SWING_TO_FAN_OSCILLATION[swing_mode]
-        await self._device.set_fan_oscillation_mode(fan_oscillation_mode)
-
-        # setting the fan must reset the preset mode (it deactivates the windFree function)
-        self._attr_preset_mode = None
-
-        self.async_schedule_update_ha_state(True)
+        await self.execute_device_command(
+            Capability.FAN_OSCILLATION_MODE,
+            Command.SET_FAN_OSCILLATION_MODE,
+            argument=SWING_TO_FAN_OSCILLATION[swing_mode],
+        )
 
     @property
     def swing_mode(self) -> str:
         """Return the swing setting."""
         return FAN_OSCILLATION_TO_SWING.get(
-            self._device.status.fan_oscillation_mode, SWING_OFF
+            self.get_attribute_value(
+                Capability.FAN_OSCILLATION_MODE, Attribute.FAN_OSCILLATION_MODE
+            ),
+            SWING_OFF,
         )
 
     def _determine_preset_modes(self) -> list[str] | None:
         """Return a list of available preset modes."""
-        supported_modes: list | None = self._device.status.attributes[
-            "supportedAcOptionalMode"
-        ].value
-        if supported_modes and WINDFREE in supported_modes:
-            return [WINDFREE]
+        if self.supports_capability(Capability.CUSTOM_AIR_CONDITIONER_OPTIONAL_MODE):
+            supported_modes = self.get_attribute_value(
+                Capability.CUSTOM_AIR_CONDITIONER_OPTIONAL_MODE,
+                Attribute.SUPPORTED_AC_OPTIONAL_MODE,
+            )
+            if supported_modes and WINDFREE in supported_modes:
+                return [WINDFREE]
         return None
 
     async def async_set_preset_mode(self, preset_mode: str) -> None:
         """Set special modes (currently only windFree is supported)."""
-        result = await self._device.command(
-            "main",
-            "custom.airConditionerOptionalMode",
-            "setAcOptionalMode",
-            [preset_mode],
+        await self.execute_device_command(
+            Capability.CUSTOM_AIR_CONDITIONER_OPTIONAL_MODE,
+            Command.SET_AC_OPTIONAL_MODE,
+            argument=preset_mode,
         )
-        if result:
-            self._device.status.update_attribute_value("acOptionalMode", preset_mode)
 
-        self._attr_preset_mode = preset_mode
-
-        self.async_write_ha_state()
+    def _determine_hvac_modes(self) -> list[HVACMode]:
+        """Determine the supported HVAC modes."""
+        modes = [HVACMode.OFF]
+        if (
+            ac_modes := self.get_attribute_value(
+                Capability.AIR_CONDITIONER_MODE, Attribute.SUPPORTED_AC_MODES
+            )
+        ) is not None:
+            modes.extend(
+                state
+                for mode in ac_modes
+                if (state := AC_MODE_TO_STATE.get(mode)) is not None
+                if state not in modes
+            )
+        return modes
diff --git a/homeassistant/components/smartthings/config_flow.py b/homeassistant/components/smartthings/config_flow.py
index 7b49854740a..03c8e4bfa66 100644
--- a/homeassistant/components/smartthings/config_flow.py
+++ b/homeassistant/components/smartthings/config_flow.py
@@ -1,298 +1,97 @@
 """Config flow to configure SmartThings."""
 
 from collections.abc import Mapping
-from http import HTTPStatus
 import logging
 from typing import Any
 
-from aiohttp import ClientResponseError
-from pysmartthings import APIResponseError, AppOAuth, SmartThings
-from pysmartthings.installedapp import format_install_url
-import voluptuous as vol
+from pysmartthings import SmartThings
 
-from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_CLIENT_ID, CONF_CLIENT_SECRET
+from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
+from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.config_entry_oauth2_flow import AbstractOAuth2FlowHandler
 
-from .const import (
-    APP_OAUTH_CLIENT_NAME,
-    APP_OAUTH_SCOPES,
-    CONF_APP_ID,
-    CONF_INSTALLED_APP_ID,
-    CONF_LOCATION_ID,
-    CONF_REFRESH_TOKEN,
-    DOMAIN,
-    VAL_UID_MATCHER,
-)
-from .smartapp import (
-    create_app,
-    find_app,
-    format_unique_id,
-    get_webhook_url,
-    setup_smartapp,
-    setup_smartapp_endpoint,
-    update_app,
-    validate_webhook_requirements,
-)
+from .const import CONF_LOCATION_ID, DOMAIN, OLD_DATA, REQUESTED_SCOPES, SCOPES
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class SmartThingsFlowHandler(ConfigFlow, domain=DOMAIN):
+class SmartThingsConfigFlow(AbstractOAuth2FlowHandler, domain=DOMAIN):
     """Handle configuration of SmartThings integrations."""
 
-    VERSION = 2
+    VERSION = 3
+    MINOR_VERSION = 2
+    DOMAIN = DOMAIN
 
-    api: SmartThings
-    app_id: str
-    location_id: str
+    @property
+    def logger(self) -> logging.Logger:
+        """Return logger."""
+        return logging.getLogger(__name__)
 
-    def __init__(self) -> None:
-        """Create a new instance of the flow handler."""
-        self.access_token: str | None = None
-        self.oauth_client_secret = None
-        self.oauth_client_id = None
-        self.installed_app_id = None
-        self.refresh_token = None
-        self.endpoints_initialized = False
-
-    async def async_step_import(self, import_data: None) -> ConfigFlowResult:
-        """Occurs when a previously entry setup fails and is re-initiated."""
-        return await self.async_step_user(import_data)
+    @property
+    def extra_authorize_data(self) -> dict[str, Any]:
+        """Extra data that needs to be appended to the authorize url."""
+        return {"scope": " ".join(REQUESTED_SCOPES)}
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Validate and confirm webhook setup."""
-        if not self.endpoints_initialized:
-            self.endpoints_initialized = True
-            await setup_smartapp_endpoint(
-                self.hass, len(self._async_current_entries()) == 0
-            )
-        webhook_url = get_webhook_url(self.hass)
-
-        # Abort if the webhook is invalid
-        if not validate_webhook_requirements(self.hass):
+        """Check we have the cloud integration set up."""
+        if "cloud" not in self.hass.config.components:
             return self.async_abort(
-                reason="invalid_webhook_url",
-                description_placeholders={
-                    "webhook_url": webhook_url,
-                    "component_url": (
-                        "https://www.home-assistant.io/integrations/smartthings/"
-                    ),
+                reason="cloud_not_enabled",
+                description_placeholders={"default_config": "default_config"},
+            )
+        return await super().async_step_user(user_input)
+
+    async def async_oauth_create_entry(self, data: dict[str, Any]) -> ConfigFlowResult:
+        """Create an entry for SmartThings."""
+        if not set(data[CONF_TOKEN]["scope"].split()) >= set(SCOPES):
+            return self.async_abort(reason="missing_scopes")
+        client = SmartThings(session=async_get_clientsession(self.hass))
+        client.authenticate(data[CONF_TOKEN][CONF_ACCESS_TOKEN])
+        locations = await client.get_locations()
+        location = locations[0]
+        # We pick to use the location id as unique id rather than the installed app id
+        # as the installed app id could change with the right settings in the SmartApp
+        # or the app used to sign in changed for any reason.
+        await self.async_set_unique_id(location.location_id)
+        if self.source != SOURCE_REAUTH:
+            self._abort_if_unique_id_configured()
+
+            return self.async_create_entry(
+                title=location.name,
+                data={**data, CONF_LOCATION_ID: location.location_id},
+            )
+
+        if (entry := self._get_reauth_entry()) and CONF_TOKEN not in entry.data:
+            if entry.data[OLD_DATA][CONF_LOCATION_ID] != location.location_id:
+                return self.async_abort(reason="reauth_location_mismatch")
+            return self.async_update_reload_and_abort(
+                self._get_reauth_entry(),
+                data_updates={
+                    **data,
+                    CONF_LOCATION_ID: location.location_id,
                 },
+                unique_id=location.location_id,
             )
-
-        # Show the confirmation
-        if user_input is None:
-            return self.async_show_form(
-                step_id="user",
-                description_placeholders={"webhook_url": webhook_url},
-            )
-
-        # Show the next screen
-        return await self.async_step_pat()
-
-    async def async_step_pat(
-        self, user_input: dict[str, str] | None = None
-    ) -> ConfigFlowResult:
-        """Get the Personal Access Token and validate it."""
-        errors: dict[str, str] = {}
-        if user_input is None or CONF_ACCESS_TOKEN not in user_input:
-            return self._show_step_pat(errors)
-
-        self.access_token = user_input[CONF_ACCESS_TOKEN]
-
-        # Ensure token is a UUID
-        if not VAL_UID_MATCHER.match(self.access_token):
-            errors[CONF_ACCESS_TOKEN] = "token_invalid_format"
-            return self._show_step_pat(errors)
-
-        # Setup end-point
-        self.api = SmartThings(async_get_clientsession(self.hass), self.access_token)
-        try:
-            app = await find_app(self.hass, self.api)
-            if app:
-                await app.refresh()  # load all attributes
-                await update_app(self.hass, app)
-                # Find an existing entry to copy the oauth client
-                existing = next(
-                    (
-                        entry
-                        for entry in self._async_current_entries()
-                        if entry.data[CONF_APP_ID] == app.app_id
-                    ),
-                    None,
-                )
-                if existing:
-                    self.oauth_client_id = existing.data[CONF_CLIENT_ID]
-                    self.oauth_client_secret = existing.data[CONF_CLIENT_SECRET]
-                else:
-                    # Get oauth client id/secret by regenerating it
-                    app_oauth = AppOAuth(app.app_id)
-                    app_oauth.client_name = APP_OAUTH_CLIENT_NAME
-                    app_oauth.scope.extend(APP_OAUTH_SCOPES)
-                    client = await self.api.generate_app_oauth(app_oauth)
-                    self.oauth_client_secret = client.client_secret
-                    self.oauth_client_id = client.client_id
-            else:
-                app, client = await create_app(self.hass, self.api)
-                self.oauth_client_secret = client.client_secret
-                self.oauth_client_id = client.client_id
-            setup_smartapp(self.hass, app)
-            self.app_id = app.app_id
-
-        except APIResponseError as ex:
-            if ex.is_target_error():
-                errors["base"] = "webhook_error"
-            else:
-                errors["base"] = "app_setup_error"
-            _LOGGER.exception(
-                "API error setting up the SmartApp: %s", ex.raw_error_response
-            )
-            return self._show_step_pat(errors)
-        except ClientResponseError as ex:
-            if ex.status == HTTPStatus.UNAUTHORIZED:
-                errors[CONF_ACCESS_TOKEN] = "token_unauthorized"
-                _LOGGER.debug(
-                    "Unauthorized error received setting up SmartApp", exc_info=True
-                )
-            elif ex.status == HTTPStatus.FORBIDDEN:
-                errors[CONF_ACCESS_TOKEN] = "token_forbidden"
-                _LOGGER.debug(
-                    "Forbidden error received setting up SmartApp", exc_info=True
-                )
-            else:
-                errors["base"] = "app_setup_error"
-                _LOGGER.exception("Unexpected error setting up the SmartApp")
-            return self._show_step_pat(errors)
-        except Exception:
-            errors["base"] = "app_setup_error"
-            _LOGGER.exception("Unexpected error setting up the SmartApp")
-            return self._show_step_pat(errors)
-
-        return await self.async_step_select_location()
-
-    async def async_step_select_location(
-        self, user_input: dict[str, str] | None = None
-    ) -> ConfigFlowResult:
-        """Ask user to select the location to setup."""
-        if user_input is None or CONF_LOCATION_ID not in user_input:
-            # Get available locations
-            existing_locations = [
-                entry.data[CONF_LOCATION_ID] for entry in self._async_current_entries()
-            ]
-            locations = await self.api.locations()
-            locations_options = {
-                location.location_id: location.name
-                for location in locations
-                if location.location_id not in existing_locations
-            }
-            if not locations_options:
-                return self.async_abort(reason="no_available_locations")
-
-            return self.async_show_form(
-                step_id="select_location",
-                data_schema=vol.Schema(
-                    {vol.Required(CONF_LOCATION_ID): vol.In(locations_options)}
-                ),
-            )
-
-        self.location_id = user_input[CONF_LOCATION_ID]
-        await self.async_set_unique_id(format_unique_id(self.app_id, self.location_id))
-        return await self.async_step_authorize()
-
-    async def async_step_authorize(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Wait for the user to authorize the app installation."""
-        user_input = {} if user_input is None else user_input
-        self.installed_app_id = user_input.get(CONF_INSTALLED_APP_ID)
-        self.refresh_token = user_input.get(CONF_REFRESH_TOKEN)
-        if self.installed_app_id is None:
-            # Launch the external setup URL
-            url = format_install_url(self.app_id, self.location_id)
-            return self.async_external_step(step_id="authorize", url=url)
-
-        next_step_id = "install"
-        if self.source == SOURCE_REAUTH:
-            next_step_id = "update"
-        return self.async_external_step_done(next_step_id=next_step_id)
-
-    def _show_step_pat(self, errors):
-        if self.access_token is None:
-            # Get the token from an existing entry to make it easier to setup multiple locations.
-            self.access_token = next(
-                (
-                    entry.data.get(CONF_ACCESS_TOKEN)
-                    for entry in self._async_current_entries()
-                ),
-                None,
-            )
-
-        return self.async_show_form(
-            step_id="pat",
-            data_schema=vol.Schema(
-                {vol.Required(CONF_ACCESS_TOKEN, default=self.access_token): str}
-            ),
-            errors=errors,
-            description_placeholders={
-                "token_url": "https://account.smartthings.com/tokens",
-                "component_url": (
-                    "https://www.home-assistant.io/integrations/smartthings/"
-                ),
-            },
+        self._abort_if_unique_id_mismatch(reason="reauth_account_mismatch")
+        return self.async_update_reload_and_abort(
+            self._get_reauth_entry(), data_updates=data
         )
 
     async def async_step_reauth(
         self, entry_data: Mapping[str, Any]
     ) -> ConfigFlowResult:
-        """Handle re-authentication of an existing config entry."""
+        """Perform reauth upon migration of old entries."""
         return await self.async_step_reauth_confirm()
 
     async def async_step_reauth_confirm(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Handle re-authentication of an existing config entry."""
+        """Confirm reauth dialog."""
         if user_input is None:
-            return self.async_show_form(step_id="reauth_confirm")
-        self.app_id = self._get_reauth_entry().data[CONF_APP_ID]
-        self.location_id = self._get_reauth_entry().data[CONF_LOCATION_ID]
-        self._set_confirm_only()
-        return await self.async_step_authorize()
-
-    async def async_step_update(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle re-authentication of an existing config entry."""
-        return await self.async_step_update_confirm()
-
-    async def async_step_update_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle re-authentication of an existing config entry."""
-        if user_input is None:
-            self._set_confirm_only()
-            return self.async_show_form(step_id="update_confirm")
-        entry = self._get_reauth_entry()
-        return self.async_update_reload_and_abort(
-            entry, data_updates={CONF_REFRESH_TOKEN: self.refresh_token}
-        )
-
-    async def async_step_install(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Create a config entry at completion of a flow and authorization of the app."""
-        data = {
-            CONF_ACCESS_TOKEN: self.access_token,
-            CONF_REFRESH_TOKEN: self.refresh_token,
-            CONF_CLIENT_ID: self.oauth_client_id,
-            CONF_CLIENT_SECRET: self.oauth_client_secret,
-            CONF_LOCATION_ID: self.location_id,
-            CONF_APP_ID: self.app_id,
-            CONF_INSTALLED_APP_ID: self.installed_app_id,
-        }
-
-        location = await self.api.location(data[CONF_LOCATION_ID])
-
-        return self.async_create_entry(title=location.name, data=data)
+            return self.async_show_form(
+                step_id="reauth_confirm",
+            )
+        return await self.async_step_user()
diff --git a/homeassistant/components/smartthings/const.py b/homeassistant/components/smartthings/const.py
index e50837697e7..a3ec9a38200 100644
--- a/homeassistant/components/smartthings/const.py
+++ b/homeassistant/components/smartthings/const.py
@@ -1,15 +1,29 @@
 """Constants used by the SmartThings component and platforms."""
 
-from datetime import timedelta
-import re
-
-from homeassistant.const import Platform
+from pysmartthings import Attribute, Capability
 
 DOMAIN = "smartthings"
 
-APP_OAUTH_CLIENT_NAME = "Home Assistant"
-APP_OAUTH_SCOPES = ["r:devices:*"]
-APP_NAME_PREFIX = "homeassistant."
+SCOPES = [
+    "r:devices:*",
+    "w:devices:*",
+    "x:devices:*",
+    "r:hubs:*",
+    "r:locations:*",
+    "w:locations:*",
+    "x:locations:*",
+    "r:scenes:*",
+    "x:scenes:*",
+    "r:rules:*",
+    "w:rules:*",
+    "sse",
+]
+
+REQUESTED_SCOPES = [
+    *SCOPES,
+    "r:installedapps",
+    "w:installedapps",
+]
 
 CONF_APP_ID = "app_id"
 CONF_CLOUDHOOK_URL = "cloudhook_url"
@@ -18,41 +32,80 @@ CONF_INSTANCE_ID = "instance_id"
 CONF_LOCATION_ID = "location_id"
 CONF_REFRESH_TOKEN = "refresh_token"
 
-DATA_MANAGER = "manager"
-DATA_BROKERS = "brokers"
+MAIN = "main"
+OLD_DATA = "old_data"
+
+CONF_SUBSCRIPTION_ID = "subscription_id"
 EVENT_BUTTON = "smartthings.button"
 
-SIGNAL_SMARTTHINGS_UPDATE = "smartthings_update"
-SIGNAL_SMARTAPP_PREFIX = "smartthings_smartap_"
+BINARY_SENSOR_ATTRIBUTES_TO_CAPABILITIES: dict[str, str] = {
+    Attribute.ACCELERATION: Capability.ACCELERATION_SENSOR,
+    Attribute.CONTACT: Capability.CONTACT_SENSOR,
+    Attribute.FILTER_STATUS: Capability.FILTER_STATUS,
+    Attribute.MOTION: Capability.MOTION_SENSOR,
+    Attribute.PRESENCE: Capability.PRESENCE_SENSOR,
+    Attribute.SOUND: Capability.SOUND_SENSOR,
+    Attribute.TAMPER: Capability.TAMPER_ALERT,
+    Attribute.VALVE: Capability.VALVE,
+    Attribute.WATER: Capability.WATER_SENSOR,
+}
 
-SETTINGS_INSTANCE_ID = "hassInstanceId"
-
-SUBSCRIPTION_WARNING_LIMIT = 40
-
-STORAGE_KEY = DOMAIN
-STORAGE_VERSION = 1
-
-# Ordered 'specific to least-specific platform' in order for capabilities
-# to be drawn-down and represented by the most appropriate platform.
-PLATFORMS = [
-    Platform.BINARY_SENSOR,
-    Platform.CLIMATE,
-    Platform.COVER,
-    Platform.FAN,
-    Platform.LIGHT,
-    Platform.LOCK,
-    Platform.SCENE,
-    Platform.SENSOR,
-    Platform.SWITCH,
-]
-
-IGNORED_CAPABILITIES = [
-    "execute",
-    "healthCheck",
-    "ocf",
-]
-
-TOKEN_REFRESH_INTERVAL = timedelta(days=14)
-
-VAL_UID = "^(?:([0-9a-fA-F]{32})|([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}))$"
-VAL_UID_MATCHER = re.compile(VAL_UID)
+SENSOR_ATTRIBUTES_TO_CAPABILITIES: dict[str, str] = {
+    Attribute.LIGHTING_MODE: Capability.ACTIVITY_LIGHTING_MODE,
+    Attribute.AIR_CONDITIONER_MODE: Capability.AIR_CONDITIONER_MODE,
+    Attribute.AIR_QUALITY: Capability.AIR_QUALITY_SENSOR,
+    Attribute.ALARM: Capability.ALARM,
+    Attribute.BATTERY: Capability.BATTERY,
+    Attribute.BMI_MEASUREMENT: Capability.BODY_MASS_INDEX_MEASUREMENT,
+    Attribute.BODY_WEIGHT_MEASUREMENT: Capability.BODY_WEIGHT_MEASUREMENT,
+    Attribute.CARBON_DIOXIDE: Capability.CARBON_DIOXIDE_MEASUREMENT,
+    Attribute.CARBON_MONOXIDE: Capability.CARBON_MONOXIDE_MEASUREMENT,
+    Attribute.CARBON_MONOXIDE_LEVEL: Capability.CARBON_MONOXIDE_MEASUREMENT,
+    Attribute.DISHWASHER_JOB_STATE: Capability.DISHWASHER_OPERATING_STATE,
+    Attribute.DRYER_MODE: Capability.DRYER_MODE,
+    Attribute.DRYER_JOB_STATE: Capability.DRYER_OPERATING_STATE,
+    Attribute.DUST_LEVEL: Capability.DUST_SENSOR,
+    Attribute.FINE_DUST_LEVEL: Capability.DUST_SENSOR,
+    Attribute.ENERGY: Capability.ENERGY_METER,
+    Attribute.EQUIVALENT_CARBON_DIOXIDE_MEASUREMENT: Capability.EQUIVALENT_CARBON_DIOXIDE_MEASUREMENT,
+    Attribute.FORMALDEHYDE_LEVEL: Capability.FORMALDEHYDE_MEASUREMENT,
+    Attribute.GAS_METER: Capability.GAS_METER,
+    Attribute.GAS_METER_CALORIFIC: Capability.GAS_METER,
+    Attribute.GAS_METER_TIME: Capability.GAS_METER,
+    Attribute.GAS_METER_VOLUME: Capability.GAS_METER,
+    Attribute.ILLUMINANCE: Capability.ILLUMINANCE_MEASUREMENT,
+    Attribute.INFRARED_LEVEL: Capability.INFRARED_LEVEL,
+    Attribute.INPUT_SOURCE: Capability.MEDIA_INPUT_SOURCE,
+    Attribute.PLAYBACK_REPEAT_MODE: Capability.MEDIA_PLAYBACK_REPEAT,
+    Attribute.PLAYBACK_SHUFFLE: Capability.MEDIA_PLAYBACK_SHUFFLE,
+    Attribute.PLAYBACK_STATUS: Capability.MEDIA_PLAYBACK,
+    Attribute.ODOR_LEVEL: Capability.ODOR_SENSOR,
+    Attribute.OVEN_MODE: Capability.OVEN_MODE,
+    Attribute.OVEN_JOB_STATE: Capability.OVEN_OPERATING_STATE,
+    Attribute.OVEN_SETPOINT: Capability.OVEN_SETPOINT,
+    Attribute.POWER: Capability.POWER_METER,
+    Attribute.POWER_SOURCE: Capability.POWER_SOURCE,
+    Attribute.REFRIGERATION_SETPOINT: Capability.REFRIGERATION_SETPOINT,
+    Attribute.HUMIDITY: Capability.RELATIVE_HUMIDITY_MEASUREMENT,
+    Attribute.ROBOT_CLEANER_CLEANING_MODE: Capability.ROBOT_CLEANER_CLEANING_MODE,
+    Attribute.ROBOT_CLEANER_MOVEMENT: Capability.ROBOT_CLEANER_MOVEMENT,
+    Attribute.ROBOT_CLEANER_TURBO_MODE: Capability.ROBOT_CLEANER_TURBO_MODE,
+    Attribute.LQI: Capability.SIGNAL_STRENGTH,
+    Attribute.RSSI: Capability.SIGNAL_STRENGTH,
+    Attribute.SMOKE: Capability.SMOKE_DETECTOR,
+    Attribute.TEMPERATURE: Capability.TEMPERATURE_MEASUREMENT,
+    Attribute.COOLING_SETPOINT: Capability.THERMOSTAT_COOLING_SETPOINT,
+    Attribute.THERMOSTAT_FAN_MODE: Capability.THERMOSTAT_FAN_MODE,
+    Attribute.HEATING_SETPOINT: Capability.THERMOSTAT_HEATING_SETPOINT,
+    Attribute.THERMOSTAT_MODE: Capability.THERMOSTAT_MODE,
+    Attribute.THERMOSTAT_OPERATING_STATE: Capability.THERMOSTAT_OPERATING_STATE,
+    Attribute.THERMOSTAT_SETPOINT: Capability.THERMOSTAT_SETPOINT,
+    Attribute.TV_CHANNEL: Capability.TV_CHANNEL,
+    Attribute.TV_CHANNEL_NAME: Capability.TV_CHANNEL,
+    Attribute.TVOC_LEVEL: Capability.TVOC_MEASUREMENT,
+    Attribute.ULTRAVIOLET_INDEX: Capability.ULTRAVIOLET_INDEX,
+    Attribute.VERY_FINE_DUST_LEVEL: Capability.VERY_FINE_DUST_SENSOR,
+    Attribute.VOLTAGE: Capability.VOLTAGE_MEASUREMENT,
+    Attribute.WASHER_MODE: Capability.WASHER_MODE,
+    Attribute.WASHER_JOB_STATE: Capability.WASHER_OPERATING_STATE,
+}
diff --git a/homeassistant/components/smartthings/cover.py b/homeassistant/components/smartthings/cover.py
index 55e86bd582e..0b68409443d 100644
--- a/homeassistant/components/smartthings/cover.py
+++ b/homeassistant/components/smartthings/cover.py
@@ -2,25 +2,23 @@
 
 from __future__ import annotations
 
-from collections.abc import Sequence
 from typing import Any
 
-from pysmartthings import Attribute, Capability
+from pysmartthings import Attribute, Capability, Command, SmartThings
 
 from homeassistant.components.cover import (
     ATTR_POSITION,
-    DOMAIN as COVER_DOMAIN,
     CoverDeviceClass,
     CoverEntity,
     CoverEntityFeature,
     CoverState,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_BATTERY_LEVEL
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DATA_BROKERS, DOMAIN
+from . import FullDevice, SmartThingsConfigEntry
+from .const import MAIN
 from .entity import SmartThingsEntity
 
 VALUE_TO_STATE = {
@@ -32,114 +30,108 @@ VALUE_TO_STATE = {
     "unknown": None,
 }
 
+CAPABILITIES = (Capability.WINDOW_SHADE, Capability.DOOR_CONTROL)
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: SmartThingsConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add covers for a config entry."""
-    broker = hass.data[DOMAIN][DATA_BROKERS][config_entry.entry_id]
+    entry_data = entry.runtime_data
     async_add_entities(
-        [
-            SmartThingsCover(device)
-            for device in broker.devices.values()
-            if broker.any_assigned(device.device_id, COVER_DOMAIN)
-        ],
-        True,
+        SmartThingsCover(entry_data.client, device, Capability(capability))
+        for device in entry_data.devices.values()
+        for capability in device.status[MAIN]
+        if capability in CAPABILITIES
     )
 
 
-def get_capabilities(capabilities: Sequence[str]) -> Sequence[str] | None:
-    """Return all capabilities supported if minimum required are present."""
-    min_required = [
-        Capability.door_control,
-        Capability.garage_door_control,
-        Capability.window_shade,
-    ]
-    # Must have one of the min_required
-    if any(capability in capabilities for capability in min_required):
-        # Return all capabilities supported/consumed
-        return [
-            *min_required,
-            Capability.battery,
-            Capability.switch_level,
-            Capability.window_shade_level,
-        ]
-
-    return None
-
-
 class SmartThingsCover(SmartThingsEntity, CoverEntity):
     """Define a SmartThings cover."""
 
-    def __init__(self, device):
+    _attr_name = None
+    _state: CoverState | None = None
+
+    def __init__(
+        self,
+        client: SmartThings,
+        device: FullDevice,
+        capability: Capability,
+    ) -> None:
         """Initialize the cover class."""
-        super().__init__(device)
-        self._current_cover_position = None
-        self._state = None
+        super().__init__(
+            client,
+            device,
+            {
+                capability,
+                Capability.BATTERY,
+                Capability.WINDOW_SHADE_LEVEL,
+                Capability.SWITCH_LEVEL,
+            },
+        )
+        self.capability = capability
         self._attr_supported_features = (
             CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE
         )
-        if (
-            Capability.switch_level in device.capabilities
-            or Capability.window_shade_level in device.capabilities
-        ):
+        if self.supports_capability(Capability.WINDOW_SHADE_LEVEL):
+            self.level_capability = Capability.WINDOW_SHADE_LEVEL
+            self.level_command = Command.SET_SHADE_LEVEL
+        else:
+            self.level_capability = Capability.SWITCH_LEVEL
+            self.level_command = Command.SET_LEVEL
+        if self.supports_capability(
+            Capability.SWITCH_LEVEL
+        ) or self.supports_capability(Capability.WINDOW_SHADE_LEVEL):
             self._attr_supported_features |= CoverEntityFeature.SET_POSITION
 
-        if Capability.door_control in device.capabilities:
+        if self.supports_capability(Capability.DOOR_CONTROL):
             self._attr_device_class = CoverDeviceClass.DOOR
-        elif Capability.window_shade in device.capabilities:
+        elif self.supports_capability(Capability.WINDOW_SHADE):
             self._attr_device_class = CoverDeviceClass.SHADE
-        elif Capability.garage_door_control in device.capabilities:
-            self._attr_device_class = CoverDeviceClass.GARAGE
 
     async def async_close_cover(self, **kwargs: Any) -> None:
         """Close cover."""
-        # Same command for all 3 supported capabilities
-        await self._device.close(set_status=True)
-        # State is set optimistically in the commands above, therefore update
-        # the entity state ahead of receiving the confirming push updates
-        self.async_schedule_update_ha_state(True)
+        await self.execute_device_command(self.capability, Command.CLOSE)
 
     async def async_open_cover(self, **kwargs: Any) -> None:
         """Open the cover."""
-        # Same for all capability types
-        await self._device.open(set_status=True)
-        # State is set optimistically in the commands above, therefore update
-        # the entity state ahead of receiving the confirming push updates
-        self.async_schedule_update_ha_state(True)
+        await self.execute_device_command(self.capability, Command.OPEN)
 
     async def async_set_cover_position(self, **kwargs: Any) -> None:
         """Move the cover to a specific position."""
-        if not self.supported_features & CoverEntityFeature.SET_POSITION:
-            return
-        # Do not set_status=True as device will report progress.
-        if Capability.window_shade_level in self._device.capabilities:
-            await self._device.set_window_shade_level(
-                kwargs[ATTR_POSITION], set_status=False
-            )
-        else:
-            await self._device.set_level(kwargs[ATTR_POSITION], set_status=False)
+        await self.execute_device_command(
+            self.level_capability,
+            self.level_command,
+            argument=kwargs[ATTR_POSITION],
+        )
 
-    async def async_update(self) -> None:
+    def _update_attr(self) -> None:
         """Update the attrs of the cover."""
-        if Capability.door_control in self._device.capabilities:
-            self._state = VALUE_TO_STATE.get(self._device.status.door)
-        elif Capability.window_shade in self._device.capabilities:
-            self._state = VALUE_TO_STATE.get(self._device.status.window_shade)
-        elif Capability.garage_door_control in self._device.capabilities:
-            self._state = VALUE_TO_STATE.get(self._device.status.door)
+        attribute = {
+            Capability.WINDOW_SHADE: Attribute.WINDOW_SHADE,
+            Capability.DOOR_CONTROL: Attribute.DOOR,
+        }[self.capability]
+        self._state = VALUE_TO_STATE.get(
+            self.get_attribute_value(self.capability, attribute)
+        )
 
-        if Capability.window_shade_level in self._device.capabilities:
-            self._attr_current_cover_position = self._device.status.shade_level
-        elif Capability.switch_level in self._device.capabilities:
-            self._attr_current_cover_position = self._device.status.level
+        if self.supports_capability(Capability.SWITCH_LEVEL):
+            self._attr_current_cover_position = self.get_attribute_value(
+                Capability.SWITCH_LEVEL, Attribute.LEVEL
+            )
+        elif self.supports_capability(Capability.WINDOW_SHADE_LEVEL):
+            self._attr_current_cover_position = self.get_attribute_value(
+                Capability.WINDOW_SHADE_LEVEL, Attribute.SHADE_LEVEL
+            )
 
+        # Deprecated, remove in 2025.10
         self._attr_extra_state_attributes = {}
-        battery = self._device.status.attributes[Attribute.battery].value
-        if battery is not None:
-            self._attr_extra_state_attributes[ATTR_BATTERY_LEVEL] = battery
+        if self.supports_capability(Capability.BATTERY):
+            self._attr_extra_state_attributes[ATTR_BATTERY_LEVEL] = (
+                self.get_attribute_value(Capability.BATTERY, Attribute.BATTERY)
+            )
 
     @property
     def is_opening(self) -> bool:
diff --git a/homeassistant/components/smartthings/diagnostics.py b/homeassistant/components/smartthings/diagnostics.py
new file mode 100644
index 00000000000..04517112802
--- /dev/null
+++ b/homeassistant/components/smartthings/diagnostics.py
@@ -0,0 +1,56 @@
+"""Diagnostics support for SmartThings."""
+
+from __future__ import annotations
+
+import asyncio
+from dataclasses import asdict
+from typing import Any
+
+from pysmartthings import DeviceEvent
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import DeviceEntry
+
+from . import SmartThingsConfigEntry
+from .const import DOMAIN
+
+EVENT_WAIT_TIME = 5
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant,
+    entry: SmartThingsConfigEntry,
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+    client = entry.runtime_data.client
+    return {"devices": await client.get_raw_devices()}
+
+
+async def async_get_device_diagnostics(
+    hass: HomeAssistant, entry: SmartThingsConfigEntry, device: DeviceEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a device entry."""
+    client = entry.runtime_data.client
+    device_id = next(
+        identifier for identifier in device.identifiers if identifier[0] == DOMAIN
+    )[1]
+
+    device_status = await client.get_raw_device_status(device_id)
+    device_info = await client.get_raw_device(device_id)
+
+    events: list[DeviceEvent] = []
+
+    def register_event(event: DeviceEvent) -> None:
+        events.append(event)
+
+    listener = client.add_device_event_listener(device_id, register_event)
+
+    await asyncio.sleep(EVENT_WAIT_TIME)
+
+    listener()
+
+    return {
+        "events": [asdict(event) for event in events],
+        "status": device_status,
+        "info": device_info,
+    }
diff --git a/homeassistant/components/smartthings/entity.py b/homeassistant/components/smartthings/entity.py
index cc63213d122..5544297a4c6 100644
--- a/homeassistant/components/smartthings/entity.py
+++ b/homeassistant/components/smartthings/entity.py
@@ -2,49 +2,98 @@
 
 from __future__ import annotations
 
-from pysmartthings.device import DeviceEntity
+from typing import Any
+
+from pysmartthings import (
+    Attribute,
+    Capability,
+    Command,
+    ComponentStatus,
+    DeviceEvent,
+    SmartThings,
+)
 
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity
 
-from .const import DOMAIN, SIGNAL_SMARTTHINGS_UPDATE
+from . import FullDevice
+from .const import DOMAIN, MAIN
 
 
 class SmartThingsEntity(Entity):
     """Defines a SmartThings entity."""
 
     _attr_should_poll = False
+    _attr_has_entity_name = True
 
-    def __init__(self, device: DeviceEntity) -> None:
+    def __init__(
+        self,
+        client: SmartThings,
+        device: FullDevice,
+        capabilities: set[Capability],
+        *,
+        component: str = MAIN,
+    ) -> None:
         """Initialize the instance."""
-        self._device = device
-        self._dispatcher_remove = None
-        self._attr_name = device.label
-        self._attr_unique_id = device.device_id
+        self.client = client
+        self.capabilities = capabilities
+        self.component = component
+        self._internal_state: ComponentStatus = {
+            capability: device.status[component][capability]
+            for capability in capabilities
+            if capability in device.status[component]
+        }
+        self.device = device
+        self._attr_unique_id = f"{device.device.device_id}_{component}"
         self._attr_device_info = DeviceInfo(
-            configuration_url="https://account.smartthings.com",
-            identifiers={(DOMAIN, device.device_id)},
-            manufacturer=device.status.ocf_manufacturer_name,
-            model=device.status.ocf_model_number,
-            name=device.label,
-            hw_version=device.status.ocf_hardware_version,
-            sw_version=device.status.ocf_firmware_version,
+            identifiers={(DOMAIN, device.device.device_id)},
         )
 
-    async def async_added_to_hass(self):
-        """Device added to hass."""
+    async def async_added_to_hass(self) -> None:
+        """Subscribe to updates."""
+        await super().async_added_to_hass()
+        for capability in self._internal_state:
+            self.async_on_remove(
+                self.client.add_device_capability_event_listener(
+                    self.device.device.device_id,
+                    self.component,
+                    capability,
+                    self._update_handler,
+                )
+            )
+        self._update_attr()
 
-        async def async_update_state(devices):
-            """Update device state."""
-            if self._device.device_id in devices:
-                await self.async_update_ha_state(True)
+    def _update_handler(self, event: DeviceEvent) -> None:
+        self._internal_state[event.capability][event.attribute].value = event.value
+        self._internal_state[event.capability][event.attribute].data = event.data
+        self._handle_update()
 
-        self._dispatcher_remove = async_dispatcher_connect(
-            self.hass, SIGNAL_SMARTTHINGS_UPDATE, async_update_state
+    def supports_capability(self, capability: Capability) -> bool:
+        """Test if device supports a capability."""
+        return capability in self.device.status[self.component]
+
+    def get_attribute_value(self, capability: Capability, attribute: Attribute) -> Any:
+        """Get the value of a device attribute."""
+        return self._internal_state[capability][attribute].value
+
+    def _update_attr(self) -> None:
+        """Update the attributes."""
+
+    def _handle_update(self) -> None:
+        """Handle updated data from the coordinator."""
+        self._update_attr()
+        self.async_write_ha_state()
+
+    async def execute_device_command(
+        self,
+        capability: Capability,
+        command: Command,
+        argument: int | str | list[Any] | dict[str, Any] | None = None,
+    ) -> None:
+        """Execute a command on the device."""
+        kwargs = {}
+        if argument is not None:
+            kwargs["argument"] = argument
+        await self.client.execute_device_command(
+            self.device.device.device_id, capability, command, self.component, **kwargs
         )
-
-    async def async_will_remove_from_hass(self) -> None:
-        """Disconnect the device when removed."""
-        if self._dispatcher_remove:
-            self._dispatcher_remove()
diff --git a/homeassistant/components/smartthings/event.py b/homeassistant/components/smartthings/event.py
new file mode 100644
index 00000000000..8b413f04713
--- /dev/null
+++ b/homeassistant/components/smartthings/event.py
@@ -0,0 +1,62 @@
+"""Support for events through the SmartThings cloud API."""
+
+from __future__ import annotations
+
+from typing import cast
+
+from pysmartthings import Attribute, Capability, Component, DeviceEvent, SmartThings
+
+from homeassistant.components.event import EventDeviceClass, EventEntity
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import FullDevice, SmartThingsConfigEntry
+from .entity import SmartThingsEntity
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: SmartThingsConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Add events for a config entry."""
+    entry_data = entry.runtime_data
+    async_add_entities(
+        SmartThingsButtonEvent(
+            entry_data.client, device, device.device.components[component]
+        )
+        for device in entry_data.devices.values()
+        for component, capabilities in device.status.items()
+        if Capability.BUTTON in capabilities
+    )
+
+
+class SmartThingsButtonEvent(SmartThingsEntity, EventEntity):
+    """Define a SmartThings event."""
+
+    _attr_device_class = EventDeviceClass.BUTTON
+    _attr_translation_key = "button"
+
+    def __init__(
+        self,
+        client: SmartThings,
+        device: FullDevice,
+        component: Component,
+    ) -> None:
+        """Init the class."""
+        super().__init__(client, device, {Capability.BUTTON}, component=component.id)
+        self._attr_name = component.label
+        self._attr_unique_id = (
+            f"{device.device.device_id}_{component.id}_{Capability.BUTTON}"
+        )
+
+    @property
+    def event_types(self) -> list[str]:
+        """Return the event types."""
+        return self.get_attribute_value(
+            Capability.BUTTON, Attribute.SUPPORTED_BUTTON_VALUES
+        )
+
+    def _update_handler(self, event: DeviceEvent) -> None:
+        self._trigger_event(cast(str, event.value))
+        self.async_write_ha_state()
diff --git a/homeassistant/components/smartthings/fan.py b/homeassistant/components/smartthings/fan.py
index 61e30589273..1c4cb4edc4a 100644
--- a/homeassistant/components/smartthings/fan.py
+++ b/homeassistant/components/smartthings/fan.py
@@ -2,23 +2,22 @@
 
 from __future__ import annotations
 
-from collections.abc import Sequence
 import math
 from typing import Any
 
-from pysmartthings import Capability
+from pysmartthings import Attribute, Capability, Command, SmartThings
 
 from homeassistant.components.fan import FanEntity, FanEntityFeature
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
     ranged_value_to_percentage,
 )
 from homeassistant.util.scaling import int_states_in_range
 
-from .const import DATA_BROKERS, DOMAIN
+from . import FullDevice, SmartThingsConfigEntry
+from .const import MAIN
 from .entity import SmartThingsEntity
 
 SPEED_RANGE = (1, 3)  # off is not included
@@ -26,86 +25,74 @@ SPEED_RANGE = (1, 3)  # off is not included
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: SmartThingsConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add fans for a config entry."""
-    broker = hass.data[DOMAIN][DATA_BROKERS][config_entry.entry_id]
+    entry_data = entry.runtime_data
     async_add_entities(
-        SmartThingsFan(device)
-        for device in broker.devices.values()
-        if broker.any_assigned(device.device_id, "fan")
+        SmartThingsFan(entry_data.client, device)
+        for device in entry_data.devices.values()
+        if Capability.SWITCH in device.status[MAIN]
+        and any(
+            capability in device.status[MAIN]
+            for capability in (
+                Capability.FAN_SPEED,
+                Capability.AIR_CONDITIONER_FAN_MODE,
+            )
+        )
+        and Capability.THERMOSTAT_COOLING_SETPOINT not in device.status[MAIN]
     )
 
 
-def get_capabilities(capabilities: Sequence[str]) -> Sequence[str] | None:
-    """Return all capabilities supported if minimum required are present."""
-
-    # MUST support switch as we need a way to turn it on and off
-    if Capability.switch not in capabilities:
-        return None
-
-    # These are all optional but at least one must be supported
-    optional = [
-        Capability.air_conditioner_fan_mode,
-        Capability.fan_speed,
-    ]
-
-    # At least one of the optional capabilities must be supported
-    # to classify this entity as a fan.
-    # If they are not then return None and don't setup the platform.
-    if not any(capability in capabilities for capability in optional):
-        return None
-
-    supported = [Capability.switch]
-
-    supported.extend(
-        capability for capability in optional if capability in capabilities
-    )
-
-    return supported
-
-
 class SmartThingsFan(SmartThingsEntity, FanEntity):
     """Define a SmartThings Fan."""
 
+    _attr_name = None
     _attr_speed_count = int_states_in_range(SPEED_RANGE)
 
-    def __init__(self, device):
+    def __init__(self, client: SmartThings, device: FullDevice) -> None:
         """Init the class."""
-        super().__init__(device)
+        super().__init__(
+            client,
+            device,
+            {
+                Capability.SWITCH,
+                Capability.FAN_SPEED,
+                Capability.AIR_CONDITIONER_FAN_MODE,
+            },
+        )
         self._attr_supported_features = self._determine_features()
 
     def _determine_features(self):
         flags = FanEntityFeature.TURN_OFF | FanEntityFeature.TURN_ON
 
-        if self._device.get_capability(Capability.fan_speed):
+        if self.supports_capability(Capability.FAN_SPEED):
             flags |= FanEntityFeature.SET_SPEED
-        if self._device.get_capability(Capability.air_conditioner_fan_mode):
+        if self.supports_capability(Capability.AIR_CONDITIONER_FAN_MODE):
             flags |= FanEntityFeature.PRESET_MODE
 
         return flags
 
     async def async_set_percentage(self, percentage: int) -> None:
         """Set the speed percentage of the fan."""
-        await self._async_set_percentage(percentage)
-
-    async def _async_set_percentage(self, percentage: int | None) -> None:
-        if percentage is None:
-            await self._device.switch_on(set_status=True)
-        elif percentage == 0:
-            await self._device.switch_off(set_status=True)
+        if percentage == 0:
+            await self.execute_device_command(Capability.SWITCH, Command.OFF)
         else:
             value = math.ceil(percentage_to_ranged_value(SPEED_RANGE, percentage))
-            await self._device.set_fan_speed(value, set_status=True)
-        # State is set optimistically in the command above, therefore update
-        # the entity state ahead of receiving the confirming push updates
-        self.async_write_ha_state()
+            await self.execute_device_command(
+                Capability.FAN_SPEED,
+                Command.SET_FAN_SPEED,
+                argument=value,
+            )
 
     async def async_set_preset_mode(self, preset_mode: str) -> None:
         """Set the preset_mode of the fan."""
-        await self._device.set_fan_mode(preset_mode, set_status=True)
-        self.async_write_ha_state()
+        await self.execute_device_command(
+            Capability.AIR_CONDITIONER_FAN_MODE,
+            Command.SET_FAN_MODE,
+            argument=preset_mode,
+        )
 
     async def async_turn_on(
         self,
@@ -114,32 +101,30 @@ class SmartThingsFan(SmartThingsEntity, FanEntity):
         **kwargs: Any,
     ) -> None:
         """Turn the fan on."""
-        if FanEntityFeature.SET_SPEED in self._attr_supported_features:
-            # If speed is set in features then turn the fan on with the speed.
-            await self._async_set_percentage(percentage)
+        if (
+            FanEntityFeature.SET_SPEED in self._attr_supported_features
+            and percentage is not None
+        ):
+            await self.async_set_percentage(percentage)
         else:
-            # If speed is not valid then turn on the fan with the
-            await self._device.switch_on(set_status=True)
-        # State is set optimistically in the command above, therefore update
-        # the entity state ahead of receiving the confirming push updates
-        self.async_write_ha_state()
+            await self.execute_device_command(Capability.SWITCH, Command.ON)
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the fan off."""
-        await self._device.switch_off(set_status=True)
-        # State is set optimistically in the command above, therefore update
-        # the entity state ahead of receiving the confirming push updates
-        self.async_write_ha_state()
+        await self.execute_device_command(Capability.SWITCH, Command.OFF)
 
     @property
     def is_on(self) -> bool:
         """Return true if fan is on."""
-        return self._device.status.switch
+        return self.get_attribute_value(Capability.SWITCH, Attribute.SWITCH) == "on"
 
     @property
     def percentage(self) -> int | None:
         """Return the current speed percentage."""
-        return ranged_value_to_percentage(SPEED_RANGE, self._device.status.fan_speed)
+        return ranged_value_to_percentage(
+            SPEED_RANGE,
+            self.get_attribute_value(Capability.FAN_SPEED, Attribute.FAN_SPEED),
+        )
 
     @property
     def preset_mode(self) -> str | None:
@@ -147,7 +132,11 @@ class SmartThingsFan(SmartThingsEntity, FanEntity):
 
         Requires FanEntityFeature.PRESET_MODE.
         """
-        return self._device.status.fan_mode
+        if not self.supports_capability(Capability.AIR_CONDITIONER_FAN_MODE):
+            return None
+        return self.get_attribute_value(
+            Capability.AIR_CONDITIONER_FAN_MODE, Attribute.FAN_MODE
+        )
 
     @property
     def preset_modes(self) -> list[str] | None:
@@ -155,4 +144,8 @@ class SmartThingsFan(SmartThingsEntity, FanEntity):
 
         Requires FanEntityFeature.PRESET_MODE.
         """
-        return self._device.status.supported_ac_fan_modes
+        if not self.supports_capability(Capability.AIR_CONDITIONER_FAN_MODE):
+            return None
+        return self.get_attribute_value(
+            Capability.AIR_CONDITIONER_FAN_MODE, Attribute.SUPPORTED_AC_FAN_MODES
+        )
diff --git a/homeassistant/components/smartthings/icons.json b/homeassistant/components/smartthings/icons.json
new file mode 100644
index 00000000000..214a9953a5a
--- /dev/null
+++ b/homeassistant/components/smartthings/icons.json
@@ -0,0 +1,63 @@
+{
+  "entity": {
+    "binary_sensor": {
+      "dryer_wrinkle_prevent_active": {
+        "default": "mdi:tumble-dryer",
+        "state": {
+          "on": "mdi:tumble-dryer-alert"
+        }
+      },
+      "remote_control": {
+        "default": "mdi:remote-off",
+        "state": {
+          "on": "mdi:remote"
+        }
+      },
+      "child_lock": {
+        "default": "mdi:lock-open",
+        "state": {
+          "on": "mdi:lock"
+        }
+      }
+    },
+    "button": {
+      "reset_water_filter": {
+        "default": "mdi:reload"
+      },
+      "stop": {
+        "default": "mdi:stop"
+      }
+    },
+    "number": {
+      "washer_rinse_cycles": {
+        "default": "mdi:waves-arrow-up"
+      }
+    },
+    "select": {
+      "operating_state": {
+        "state": {
+          "run": "mdi:play",
+          "pause": "mdi:pause",
+          "stop": "mdi:stop"
+        }
+      }
+    },
+    "switch": {
+      "bubble_soak": {
+        "default": "mdi:water-off",
+        "state": {
+          "on": "mdi:water"
+        }
+      },
+      "wrinkle_prevent": {
+        "default": "mdi:tumble-dryer",
+        "state": {
+          "off": "mdi:tumble-dryer-off"
+        }
+      },
+      "ice_maker": {
+        "default": "mdi:delete-variant"
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/smartthings/light.py b/homeassistant/components/smartthings/light.py
index eb7c9af246b..1ad315bcd97 100644
--- a/homeassistant/components/smartthings/light.py
+++ b/homeassistant/components/smartthings/light.py
@@ -3,13 +3,13 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Sequence
-from typing import Any
+from typing import Any, cast
 
-from pysmartthings import Capability
+from pysmartthings import Attribute, Capability, Command, DeviceEvent, SmartThings
 
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
+    ATTR_COLOR_MODE,
     ATTR_COLOR_TEMP_KELVIN,
     ATTR_HS_COLOR,
     ATTR_TRANSITION,
@@ -18,104 +18,95 @@ from homeassistant.components.light import (
     LightEntityFeature,
     brightness_supported,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.restore_state import RestoreEntity
 
-from .const import DATA_BROKERS, DOMAIN
+from . import FullDevice, SmartThingsConfigEntry
+from .const import MAIN
 from .entity import SmartThingsEntity
 
+CAPABILITIES = (
+    Capability.SWITCH_LEVEL,
+    Capability.COLOR_CONTROL,
+    Capability.COLOR_TEMPERATURE,
+)
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: SmartThingsConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add lights for a config entry."""
-    broker = hass.data[DOMAIN][DATA_BROKERS][config_entry.entry_id]
+    entry_data = entry.runtime_data
     async_add_entities(
-        [
-            SmartThingsLight(device)
-            for device in broker.devices.values()
-            if broker.any_assigned(device.device_id, "light")
-        ],
-        True,
+        SmartThingsLight(entry_data.client, device)
+        for device in entry_data.devices.values()
+        if Capability.SWITCH in device.status[MAIN]
+        and any(capability in device.status[MAIN] for capability in CAPABILITIES)
     )
 
 
-def get_capabilities(capabilities: Sequence[str]) -> Sequence[str] | None:
-    """Return all capabilities supported if minimum required are present."""
-    supported = [
-        Capability.switch,
-        Capability.switch_level,
-        Capability.color_control,
-        Capability.color_temperature,
-    ]
-    # Must be able to be turned on/off.
-    if Capability.switch not in capabilities:
-        return None
-    # Must have one of these
-    light_capabilities = [
-        Capability.color_control,
-        Capability.color_temperature,
-        Capability.switch_level,
-    ]
-    if any(capability in capabilities for capability in light_capabilities):
-        return supported
-    return None
-
-
-def convert_scale(value, value_scale, target_scale, round_digits=4):
+def convert_scale(
+    value: float, value_scale: int, target_scale: int, round_digits: int = 4
+) -> float:
     """Convert a value to a different scale."""
     return round(value * target_scale / value_scale, round_digits)
 
 
-class SmartThingsLight(SmartThingsEntity, LightEntity):
+class SmartThingsLight(SmartThingsEntity, LightEntity, RestoreEntity):
     """Define a SmartThings Light."""
 
+    _attr_name = None
     _attr_supported_color_modes: set[ColorMode]
 
     # SmartThings does not expose this attribute, instead it's
-    # implemented within each device-type handler.  This value is the
+    # implemented within each device-type handler. This value is the
     # lowest kelvin found supported across 20+ handlers.
     _attr_min_color_temp_kelvin = 2000  # 500 mireds
 
     # SmartThings does not expose this attribute, instead it's
-    # implemented within each device-type handler.  This value is the
+    # implemented within each device-type handler. This value is the
     # highest kelvin found supported across 20+ handlers.
     _attr_max_color_temp_kelvin = 9000  # 111 mireds
 
-    def __init__(self, device):
+    def __init__(self, client: SmartThings, device: FullDevice) -> None:
         """Initialize a SmartThingsLight."""
-        super().__init__(device)
-        self._attr_supported_color_modes = self._determine_color_modes()
-        self._attr_supported_features = self._determine_features()
-
-    def _determine_color_modes(self):
-        """Get features supported by the device."""
+        super().__init__(
+            client,
+            device,
+            {
+                Capability.COLOR_CONTROL,
+                Capability.COLOR_TEMPERATURE,
+                Capability.SWITCH_LEVEL,
+                Capability.SWITCH,
+            },
+        )
         color_modes = set()
-        # Color Temperature
-        if Capability.color_temperature in self._device.capabilities:
+        if self.supports_capability(Capability.COLOR_TEMPERATURE):
             color_modes.add(ColorMode.COLOR_TEMP)
-        # Color
-        if Capability.color_control in self._device.capabilities:
+            self._attr_color_mode = ColorMode.COLOR_TEMP
+        if self.supports_capability(Capability.COLOR_CONTROL):
             color_modes.add(ColorMode.HS)
-        # Brightness
-        if not color_modes and Capability.switch_level in self._device.capabilities:
+            self._attr_color_mode = ColorMode.HS
+        if not color_modes and self.supports_capability(Capability.SWITCH_LEVEL):
             color_modes.add(ColorMode.BRIGHTNESS)
         if not color_modes:
             color_modes.add(ColorMode.ONOFF)
-
-        return color_modes
-
-    def _determine_features(self) -> LightEntityFeature:
-        """Get features supported by the device."""
+        if len(color_modes) == 1:
+            self._attr_color_mode = list(color_modes)[0]
+        self._attr_supported_color_modes = color_modes
         features = LightEntityFeature(0)
-        # Transition
-        if Capability.switch_level in self._device.capabilities:
+        if self.supports_capability(Capability.SWITCH_LEVEL):
             features |= LightEntityFeature.TRANSITION
+        self._attr_supported_features = features
 
-        return features
+    async def async_added_to_hass(self) -> None:
+        """Run when entity about to be added to hass."""
+        await super().async_added_to_hass()
+        if (last_state := await self.async_get_last_extra_data()) is not None:
+            self._attr_color_mode = last_state.as_dict()[ATTR_COLOR_MODE]
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the light on."""
@@ -136,11 +127,10 @@ class SmartThingsLight(SmartThingsEntity, LightEntity):
                 kwargs[ATTR_BRIGHTNESS], kwargs.get(ATTR_TRANSITION, 0)
             )
         else:
-            await self._device.switch_on(set_status=True)
-
-        # State is set optimistically in the commands above, therefore update
-        # the entity state ahead of receiving the confirming push updates
-        self.async_schedule_update_ha_state(True)
+            await self.execute_device_command(
+                Capability.SWITCH,
+                Command.ON,
+            )
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the light off."""
@@ -148,42 +138,74 @@ class SmartThingsLight(SmartThingsEntity, LightEntity):
         if ATTR_TRANSITION in kwargs:
             await self.async_set_level(0, int(kwargs[ATTR_TRANSITION]))
         else:
-            await self._device.switch_off(set_status=True)
+            await self.execute_device_command(
+                Capability.SWITCH,
+                Command.OFF,
+            )
 
-        # State is set optimistically in the commands above, therefore update
-        # the entity state ahead of receiving the confirming push updates
-        self.async_schedule_update_ha_state(True)
-
-    async def async_update(self) -> None:
+    def _update_attr(self) -> None:
         """Update entity attributes when the device status has changed."""
         # Brightness and transition
         if brightness_supported(self._attr_supported_color_modes):
-            self._attr_brightness = int(
-                convert_scale(self._device.status.level, 100, 255, 0)
-            )
+            if (
+                brightness := self.get_attribute_value(
+                    Capability.SWITCH_LEVEL, Attribute.LEVEL
+                )
+            ) is None:
+                self._attr_brightness = None
+            else:
+                self._attr_brightness = int(
+                    convert_scale(
+                        brightness,
+                        100,
+                        255,
+                        0,
+                    )
+                )
         # Color Temperature
         if ColorMode.COLOR_TEMP in self._attr_supported_color_modes:
-            self._attr_color_temp_kelvin = self._device.status.color_temperature
+            self._attr_color_temp_kelvin = self.get_attribute_value(
+                Capability.COLOR_TEMPERATURE, Attribute.COLOR_TEMPERATURE
+            )
         # Color
         if ColorMode.HS in self._attr_supported_color_modes:
-            self._attr_hs_color = (
-                convert_scale(self._device.status.hue, 100, 360),
-                self._device.status.saturation,
-            )
+            if (
+                hue := self.get_attribute_value(Capability.COLOR_CONTROL, Attribute.HUE)
+            ) is None:
+                self._attr_hs_color = None
+            else:
+                self._attr_hs_color = (
+                    convert_scale(
+                        hue,
+                        100,
+                        360,
+                    ),
+                    self.get_attribute_value(
+                        Capability.COLOR_CONTROL, Attribute.SATURATION
+                    ),
+                )
 
     async def async_set_color(self, hs_color):
         """Set the color of the device."""
         hue = convert_scale(float(hs_color[0]), 360, 100)
         hue = max(min(hue, 100.0), 0.0)
         saturation = max(min(float(hs_color[1]), 100.0), 0.0)
-        await self._device.set_color(hue, saturation, set_status=True)
+        await self.execute_device_command(
+            Capability.COLOR_CONTROL,
+            Command.SET_COLOR,
+            argument={"hue": hue, "saturation": saturation},
+        )
 
     async def async_set_color_temp(self, value: int):
         """Set the color temperature of the device."""
         kelvin = max(min(value, 30000), 1)
-        await self._device.set_color_temperature(kelvin, set_status=True)
+        await self.execute_device_command(
+            Capability.COLOR_TEMPERATURE,
+            Command.SET_COLOR_TEMPERATURE,
+            argument=kelvin,
+        )
 
-    async def async_set_level(self, brightness: int, transition: int):
+    async def async_set_level(self, brightness: int, transition: int) -> None:
         """Set the brightness of the light over transition."""
         level = int(convert_scale(brightness, 255, 100, 0))
         # Due to rounding, set level to 1 (one) so we don't inadvertently
@@ -191,21 +213,26 @@ class SmartThingsLight(SmartThingsEntity, LightEntity):
         level = 1 if level == 0 and brightness > 0 else level
         level = max(min(level, 100), 0)
         duration = int(transition)
-        await self._device.set_level(level, duration, set_status=True)
+        await self.execute_device_command(
+            Capability.SWITCH_LEVEL,
+            Command.SET_LEVEL,
+            argument=[level, duration],
+        )
+
+    def _update_handler(self, event: DeviceEvent) -> None:
+        """Handle device updates."""
+        if event.capability in (Capability.COLOR_CONTROL, Capability.COLOR_TEMPERATURE):
+            self._attr_color_mode = {
+                Capability.COLOR_CONTROL: ColorMode.HS,
+                Capability.COLOR_TEMPERATURE: ColorMode.COLOR_TEMP,
+            }[cast(Capability, event.capability)]
+        super()._update_handler(event)
 
     @property
-    def color_mode(self) -> ColorMode:
-        """Return the color mode of the light."""
-        if len(self._attr_supported_color_modes) == 1:
-            # The light supports only a single color mode
-            return list(self._attr_supported_color_modes)[0]
-
-        # The light supports hs + color temp, determine which one it is
-        if self._attr_hs_color and self._attr_hs_color[1]:
-            return ColorMode.HS
-        return ColorMode.COLOR_TEMP
-
-    @property
-    def is_on(self) -> bool:
+    def is_on(self) -> bool | None:
         """Return true if light is on."""
-        return self._device.status.switch
+        if (
+            state := self.get_attribute_value(Capability.SWITCH, Attribute.SWITCH)
+        ) is None:
+            return None
+        return state == "on"
diff --git a/homeassistant/components/smartthings/lock.py b/homeassistant/components/smartthings/lock.py
index a0ae9e50443..f56ecd5d565 100644
--- a/homeassistant/components/smartthings/lock.py
+++ b/homeassistant/components/smartthings/lock.py
@@ -2,17 +2,16 @@
 
 from __future__ import annotations
 
-from collections.abc import Sequence
 from typing import Any
 
-from pysmartthings import Attribute, Capability
+from pysmartthings import Attribute, Capability, Command
 
 from homeassistant.components.lock import LockEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DATA_BROKERS, DOMAIN
+from . import SmartThingsConfigEntry
+from .const import MAIN
 from .entity import SmartThingsEntity
 
 ST_STATE_LOCKED = "locked"
@@ -28,48 +27,49 @@ ST_LOCK_ATTR_MAP = {
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: SmartThingsConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add locks for a config entry."""
-    broker = hass.data[DOMAIN][DATA_BROKERS][config_entry.entry_id]
+    entry_data = entry.runtime_data
     async_add_entities(
-        SmartThingsLock(device)
-        for device in broker.devices.values()
-        if broker.any_assigned(device.device_id, "lock")
+        SmartThingsLock(entry_data.client, device, {Capability.LOCK})
+        for device in entry_data.devices.values()
+        if Capability.LOCK in device.status[MAIN]
     )
 
 
-def get_capabilities(capabilities: Sequence[str]) -> Sequence[str] | None:
-    """Return all capabilities supported if minimum required are present."""
-    if Capability.lock in capabilities:
-        return [Capability.lock]
-    return None
-
-
 class SmartThingsLock(SmartThingsEntity, LockEntity):
     """Define a SmartThings lock."""
 
+    _attr_name = None
+
     async def async_lock(self, **kwargs: Any) -> None:
         """Lock the device."""
-        await self._device.lock(set_status=True)
-        self.async_write_ha_state()
+        await self.execute_device_command(
+            Capability.LOCK,
+            Command.LOCK,
+        )
 
     async def async_unlock(self, **kwargs: Any) -> None:
         """Unlock the device."""
-        await self._device.unlock(set_status=True)
-        self.async_write_ha_state()
+        await self.execute_device_command(
+            Capability.LOCK,
+            Command.UNLOCK,
+        )
 
     @property
     def is_locked(self) -> bool:
         """Return true if lock is locked."""
-        return self._device.status.lock == ST_STATE_LOCKED
+        return (
+            self.get_attribute_value(Capability.LOCK, Attribute.LOCK) == ST_STATE_LOCKED
+        )
 
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
         """Return device specific state attributes."""
         state_attrs = {}
-        status = self._device.status.attributes[Attribute.lock]
+        status = self._internal_state[Capability.LOCK][Attribute.LOCK]
         if status.value:
             state_attrs["lock_state"] = status.value
         if isinstance(status.data, dict):
diff --git a/homeassistant/components/smartthings/manifest.json b/homeassistant/components/smartthings/manifest.json
index be313248eaf..49de0c79ce7 100644
--- a/homeassistant/components/smartthings/manifest.json
+++ b/homeassistant/components/smartthings/manifest.json
@@ -1,10 +1,9 @@
 {
   "domain": "smartthings",
   "name": "SmartThings",
-  "after_dependencies": ["cloud"],
-  "codeowners": [],
+  "codeowners": ["@joostlek"],
   "config_flow": true,
-  "dependencies": ["webhook"],
+  "dependencies": ["application_credentials"],
   "dhcp": [
     {
       "hostname": "st*",
@@ -29,6 +28,7 @@
   ],
   "documentation": "https://www.home-assistant.io/integrations/smartthings",
   "iot_class": "cloud_push",
-  "loggers": ["httpsig", "pysmartapp", "pysmartthings"],
-  "requirements": ["pysmartapp==0.3.5", "pysmartthings==0.7.8"]
+  "loggers": ["pysmartthings"],
+  "quality_scale": "bronze",
+  "requirements": ["pysmartthings==3.0.0"]
 }
diff --git a/homeassistant/components/smartthings/media_player.py b/homeassistant/components/smartthings/media_player.py
new file mode 100644
index 00000000000..9a676d2efb6
--- /dev/null
+++ b/homeassistant/components/smartthings/media_player.py
@@ -0,0 +1,355 @@
+"""Support for media players through the SmartThings cloud API."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from pysmartthings import Attribute, Capability, Category, Command, SmartThings
+
+from homeassistant.components.media_player import (
+    MediaPlayerDeviceClass,
+    MediaPlayerEntity,
+    MediaPlayerEntityFeature,
+    MediaPlayerState,
+    RepeatMode,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import FullDevice, SmartThingsConfigEntry
+from .const import MAIN
+from .entity import SmartThingsEntity
+
+MEDIA_PLAYER_CAPABILITIES = (
+    Capability.AUDIO_MUTE,
+    Capability.AUDIO_VOLUME,
+    Capability.MEDIA_PLAYBACK,
+)
+
+CONTROLLABLE_SOURCES = ["bluetooth", "wifi"]
+
+DEVICE_CLASS_MAP: dict[Category | str, MediaPlayerDeviceClass] = {
+    Category.NETWORK_AUDIO: MediaPlayerDeviceClass.SPEAKER,
+    Category.SPEAKER: MediaPlayerDeviceClass.SPEAKER,
+    Category.TELEVISION: MediaPlayerDeviceClass.TV,
+    Category.RECEIVER: MediaPlayerDeviceClass.RECEIVER,
+}
+
+VALUE_TO_STATE = {
+    "buffering": MediaPlayerState.BUFFERING,
+    "paused": MediaPlayerState.PAUSED,
+    "playing": MediaPlayerState.PLAYING,
+    "stopped": MediaPlayerState.IDLE,
+    "fast forwarding": MediaPlayerState.BUFFERING,
+    "rewinding": MediaPlayerState.BUFFERING,
+}
+
+REPEAT_MODE_TO_HA = {
+    "all": RepeatMode.ALL,
+    "one": RepeatMode.ONE,
+    "off": RepeatMode.OFF,
+}
+
+HA_REPEAT_MODE_TO_SMARTTHINGS = {v: k for k, v in REPEAT_MODE_TO_HA.items()}
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: SmartThingsConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Add media players for a config entry."""
+    entry_data = entry.runtime_data
+
+    async_add_entities(
+        SmartThingsMediaPlayer(entry_data.client, device)
+        for device in entry_data.devices.values()
+        if all(
+            capability in device.status[MAIN]
+            for capability in MEDIA_PLAYER_CAPABILITIES
+        )
+    )
+
+
+class SmartThingsMediaPlayer(SmartThingsEntity, MediaPlayerEntity):
+    """Define a SmartThings media player."""
+
+    _attr_name = None
+
+    def __init__(self, client: SmartThings, device: FullDevice) -> None:
+        """Initialize the media_player class."""
+        super().__init__(
+            client,
+            device,
+            {
+                Capability.AUDIO_MUTE,
+                Capability.AUDIO_TRACK_DATA,
+                Capability.AUDIO_VOLUME,
+                Capability.MEDIA_INPUT_SOURCE,
+                Capability.MEDIA_PLAYBACK,
+                Capability.MEDIA_PLAYBACK_REPEAT,
+                Capability.MEDIA_PLAYBACK_SHUFFLE,
+                Capability.SAMSUNG_VD_AUDIO_INPUT_SOURCE,
+                Capability.SWITCH,
+            },
+        )
+        self._attr_supported_features = self._determine_features()
+        self._attr_device_class = DEVICE_CLASS_MAP.get(
+            device.device.components[MAIN].user_category
+            or device.device.components[MAIN].manufacturer_category,
+        )
+
+    def _determine_features(self) -> MediaPlayerEntityFeature:
+        flags = MediaPlayerEntityFeature(0)
+        playback_commands = self.get_attribute_value(
+            Capability.MEDIA_PLAYBACK, Attribute.SUPPORTED_PLAYBACK_COMMANDS
+        )
+        if "play" in playback_commands:
+            flags |= MediaPlayerEntityFeature.PLAY
+        if "pause" in playback_commands:
+            flags |= MediaPlayerEntityFeature.PAUSE
+        if "stop" in playback_commands:
+            flags |= MediaPlayerEntityFeature.STOP
+        if "rewind" in playback_commands:
+            flags |= MediaPlayerEntityFeature.PREVIOUS_TRACK
+        if "fastForward" in playback_commands:
+            flags |= MediaPlayerEntityFeature.NEXT_TRACK
+        if self.supports_capability(Capability.AUDIO_VOLUME):
+            flags |= (
+                MediaPlayerEntityFeature.VOLUME_SET
+                | MediaPlayerEntityFeature.VOLUME_STEP
+            )
+        if self.supports_capability(Capability.AUDIO_MUTE):
+            flags |= MediaPlayerEntityFeature.VOLUME_MUTE
+        if self.supports_capability(Capability.SWITCH):
+            flags |= (
+                MediaPlayerEntityFeature.TURN_ON | MediaPlayerEntityFeature.TURN_OFF
+            )
+        if self.supports_capability(Capability.MEDIA_INPUT_SOURCE):
+            flags |= MediaPlayerEntityFeature.SELECT_SOURCE
+        if self.supports_capability(Capability.MEDIA_PLAYBACK_SHUFFLE):
+            flags |= MediaPlayerEntityFeature.SHUFFLE_SET
+        if self.supports_capability(Capability.MEDIA_PLAYBACK_REPEAT):
+            flags |= MediaPlayerEntityFeature.REPEAT_SET
+        return flags
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the media player off."""
+        await self.execute_device_command(
+            Capability.SWITCH,
+            Command.OFF,
+        )
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the media player on."""
+        await self.execute_device_command(
+            Capability.SWITCH,
+            Command.ON,
+        )
+
+    async def async_mute_volume(self, mute: bool) -> None:
+        """Mute volume."""
+        await self.execute_device_command(
+            Capability.AUDIO_MUTE,
+            Command.SET_MUTE,
+            argument="muted" if mute else "unmuted",
+        )
+
+    async def async_set_volume_level(self, volume: float) -> None:
+        """Set volume level."""
+        await self.execute_device_command(
+            Capability.AUDIO_VOLUME,
+            Command.SET_VOLUME,
+            argument=int(volume * 100),
+        )
+
+    async def async_volume_up(self) -> None:
+        """Increase volume."""
+        await self.execute_device_command(
+            Capability.AUDIO_VOLUME,
+            Command.VOLUME_UP,
+        )
+
+    async def async_volume_down(self) -> None:
+        """Decrease volume."""
+        await self.execute_device_command(
+            Capability.AUDIO_VOLUME,
+            Command.VOLUME_DOWN,
+        )
+
+    async def async_media_play(self) -> None:
+        """Play media."""
+        await self.execute_device_command(
+            Capability.MEDIA_PLAYBACK,
+            Command.PLAY,
+        )
+
+    async def async_media_pause(self) -> None:
+        """Pause media."""
+        await self.execute_device_command(
+            Capability.MEDIA_PLAYBACK,
+            Command.PAUSE,
+        )
+
+    async def async_media_stop(self) -> None:
+        """Stop media."""
+        await self.execute_device_command(
+            Capability.MEDIA_PLAYBACK,
+            Command.STOP,
+        )
+
+    async def async_media_previous_track(self) -> None:
+        """Previous track."""
+        await self.execute_device_command(
+            Capability.MEDIA_PLAYBACK,
+            Command.REWIND,
+        )
+
+    async def async_media_next_track(self) -> None:
+        """Next track."""
+        await self.execute_device_command(
+            Capability.MEDIA_PLAYBACK,
+            Command.FAST_FORWARD,
+        )
+
+    async def async_select_source(self, source: str) -> None:
+        """Select source."""
+        await self.execute_device_command(
+            Capability.MEDIA_INPUT_SOURCE,
+            Command.SET_INPUT_SOURCE,
+            argument=source,
+        )
+
+    async def async_set_shuffle(self, shuffle: bool) -> None:
+        """Set shuffle mode."""
+        await self.execute_device_command(
+            Capability.MEDIA_PLAYBACK_SHUFFLE,
+            Command.SET_PLAYBACK_SHUFFLE,
+            argument="enabled" if shuffle else "disabled",
+        )
+
+    async def async_set_repeat(self, repeat: RepeatMode) -> None:
+        """Set repeat mode."""
+        await self.execute_device_command(
+            Capability.MEDIA_PLAYBACK_REPEAT,
+            Command.SET_PLAYBACK_REPEAT_MODE,
+            argument=HA_REPEAT_MODE_TO_SMARTTHINGS[repeat],
+        )
+
+    @property
+    def media_title(self) -> str | None:
+        """Title of current playing media."""
+        if (
+            not self.supports_capability(Capability.AUDIO_TRACK_DATA)
+            or (
+                track_data := self.get_attribute_value(
+                    Capability.AUDIO_TRACK_DATA, Attribute.AUDIO_TRACK_DATA
+                )
+            )
+            is None
+        ):
+            return None
+        return track_data.get("title", None)
+
+    @property
+    def media_artist(self) -> str | None:
+        """Artist of current playing media."""
+        if (
+            not self.supports_capability(Capability.AUDIO_TRACK_DATA)
+            or (
+                track_data := self.get_attribute_value(
+                    Capability.AUDIO_TRACK_DATA, Attribute.AUDIO_TRACK_DATA
+                )
+            )
+            is None
+        ):
+            return None
+        return track_data.get("artist")
+
+    @property
+    def state(self) -> MediaPlayerState | None:
+        """State of the media player."""
+        if self.supports_capability(Capability.SWITCH):
+            if self.get_attribute_value(Capability.SWITCH, Attribute.SWITCH) == "on":
+                if (
+                    self.source is not None
+                    and self.source in CONTROLLABLE_SOURCES
+                    and self.get_attribute_value(
+                        Capability.MEDIA_PLAYBACK, Attribute.PLAYBACK_STATUS
+                    )
+                    in VALUE_TO_STATE
+                ):
+                    return VALUE_TO_STATE[
+                        self.get_attribute_value(
+                            Capability.MEDIA_PLAYBACK, Attribute.PLAYBACK_STATUS
+                        )
+                    ]
+                return MediaPlayerState.ON
+            return MediaPlayerState.OFF
+        return VALUE_TO_STATE[
+            self.get_attribute_value(
+                Capability.MEDIA_PLAYBACK, Attribute.PLAYBACK_STATUS
+            )
+        ]
+
+    @property
+    def is_volume_muted(self) -> bool:
+        """Returns if the volume is muted."""
+        return (
+            self.get_attribute_value(Capability.AUDIO_MUTE, Attribute.MUTE) == "muted"
+        )
+
+    @property
+    def volume_level(self) -> float:
+        """Volume level."""
+        return self.get_attribute_value(Capability.AUDIO_VOLUME, Attribute.VOLUME) / 100
+
+    @property
+    def source(self) -> str | None:
+        """Input source."""
+        if self.supports_capability(Capability.MEDIA_INPUT_SOURCE):
+            return self.get_attribute_value(
+                Capability.MEDIA_INPUT_SOURCE, Attribute.INPUT_SOURCE
+            )
+        if self.supports_capability(Capability.SAMSUNG_VD_AUDIO_INPUT_SOURCE):
+            return self.get_attribute_value(
+                Capability.SAMSUNG_VD_AUDIO_INPUT_SOURCE, Attribute.INPUT_SOURCE
+            )
+        return None
+
+    @property
+    def source_list(self) -> list[str] | None:
+        """List of input sources."""
+        if self.supports_capability(Capability.MEDIA_INPUT_SOURCE):
+            return self.get_attribute_value(
+                Capability.MEDIA_INPUT_SOURCE, Attribute.SUPPORTED_INPUT_SOURCES
+            )
+        if self.supports_capability(Capability.SAMSUNG_VD_AUDIO_INPUT_SOURCE):
+            return self.get_attribute_value(
+                Capability.SAMSUNG_VD_AUDIO_INPUT_SOURCE,
+                Attribute.SUPPORTED_INPUT_SOURCES,
+            )
+        return None
+
+    @property
+    def shuffle(self) -> bool | None:
+        """Returns if shuffle mode is set."""
+        if self.supports_capability(Capability.MEDIA_PLAYBACK_SHUFFLE):
+            return (
+                self.get_attribute_value(
+                    Capability.MEDIA_PLAYBACK_SHUFFLE, Attribute.PLAYBACK_SHUFFLE
+                )
+                == "enabled"
+            )
+        return None
+
+    @property
+    def repeat(self) -> RepeatMode | None:
+        """Returns if repeat mode is set."""
+        if self.supports_capability(Capability.MEDIA_PLAYBACK_REPEAT):
+            return REPEAT_MODE_TO_HA[
+                self.get_attribute_value(
+                    Capability.MEDIA_PLAYBACK_REPEAT, Attribute.PLAYBACK_REPEAT_MODE
+                )
+            ]
+        return None
diff --git a/homeassistant/components/smartthings/number.py b/homeassistant/components/smartthings/number.py
new file mode 100644
index 00000000000..2f2ac7903f2
--- /dev/null
+++ b/homeassistant/components/smartthings/number.py
@@ -0,0 +1,76 @@
+"""Support for number entities through the SmartThings cloud API."""
+
+from __future__ import annotations
+
+from pysmartthings import Attribute, Capability, Command, SmartThings
+
+from homeassistant.components.number import NumberEntity, NumberMode
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import FullDevice, SmartThingsConfigEntry
+from .const import MAIN
+from .entity import SmartThingsEntity
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: SmartThingsConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Add number entities for a config entry."""
+    entry_data = entry.runtime_data
+    async_add_entities(
+        SmartThingsWasherRinseCyclesNumberEntity(entry_data.client, device)
+        for device in entry_data.devices.values()
+        if Capability.CUSTOM_WASHER_RINSE_CYCLES in device.status[MAIN]
+    )
+
+
+class SmartThingsWasherRinseCyclesNumberEntity(SmartThingsEntity, NumberEntity):
+    """Define a SmartThings number."""
+
+    _attr_translation_key = "washer_rinse_cycles"
+    _attr_native_step = 1.0
+    _attr_mode = NumberMode.BOX
+
+    def __init__(self, client: SmartThings, device: FullDevice) -> None:
+        """Initialize the instance."""
+        super().__init__(client, device, {Capability.CUSTOM_WASHER_RINSE_CYCLES})
+        self._attr_unique_id = f"{device.device.device_id}_{MAIN}_{Capability.CUSTOM_WASHER_RINSE_CYCLES}_{Attribute.WASHER_RINSE_CYCLES}_{Attribute.WASHER_RINSE_CYCLES}"
+
+    @property
+    def options(self) -> list[int]:
+        """Return the list of options."""
+        values = self.get_attribute_value(
+            Capability.CUSTOM_WASHER_RINSE_CYCLES,
+            Attribute.SUPPORTED_WASHER_RINSE_CYCLES,
+        )
+        return [int(value) for value in values] if values else []
+
+    @property
+    def native_value(self) -> float | None:
+        """Return the current value."""
+        return int(
+            self.get_attribute_value(
+                Capability.CUSTOM_WASHER_RINSE_CYCLES, Attribute.WASHER_RINSE_CYCLES
+            )
+        )
+
+    @property
+    def native_min_value(self) -> float:
+        """Return the minimum value."""
+        return min(self.options)
+
+    @property
+    def native_max_value(self) -> float:
+        """Return the maximum value."""
+        return max(self.options)
+
+    async def async_set_native_value(self, value: float) -> None:
+        """Set the value."""
+        await self.execute_device_command(
+            Capability.CUSTOM_WASHER_RINSE_CYCLES,
+            Command.SET_WASHER_RINSE_CYCLES,
+            str(int(value)),
+        )
diff --git a/homeassistant/components/smartthings/quality_scale.yaml b/homeassistant/components/smartthings/quality_scale.yaml
new file mode 100644
index 00000000000..be8a9039617
--- /dev/null
+++ b/homeassistant/components/smartthings/quality_scale.yaml
@@ -0,0 +1,80 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: |
+      This integration does not provide additional actions.
+  appropriate-polling:
+    status: exempt
+    comment: |
+      This integration works via push.
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: |
+      This integration does not provide additional actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup: done
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions: todo
+  config-entry-unloading: done
+  docs-configuration-parameters:
+    status: exempt
+    comment: No options to configure
+  docs-installation-parameters:
+    status: exempt
+    comment: No parameters needed during installation
+  entity-unavailable: todo
+  integration-owner: done
+  log-when-unavailable: todo
+  parallel-updates: todo
+  reauthentication-flow: done
+  test-coverage: todo
+  # Gold
+  devices: done
+  diagnostics: done
+  discovery-update-info:
+    status: exempt
+    comment: |
+      This integration connects via the cloud.
+  discovery: done
+  docs-data-update: todo
+  docs-examples: todo
+  docs-known-limitations: todo
+  docs-supported-devices: todo
+  docs-supported-functions: done
+  docs-troubleshooting: todo
+  docs-use-cases: todo
+  dynamic-devices: todo
+  entity-category: done
+  entity-device-class: done
+  entity-disabled-by-default:
+    status: exempt
+    comment: |
+      This integration does not have any entities that are disabled by default.
+  entity-translations: done
+  exception-translations: todo
+  icon-translations: todo
+  reconfiguration-flow: todo
+  repair-issues:
+    status: exempt
+    comment: |
+      This integration doesn't have any cases where raising an issue is needed.
+  stale-devices: done
+  # Platinum
+  async-dependency: done
+  inject-websession: done
+  strict-typing: todo
diff --git a/homeassistant/components/smartthings/scene.py b/homeassistant/components/smartthings/scene.py
index 9756cef9f04..2b387859f22 100644
--- a/homeassistant/components/smartthings/scene.py
+++ b/homeassistant/components/smartthings/scene.py
@@ -2,39 +2,42 @@
 
 from typing import Any
 
-from homeassistant.components.scene import Scene
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from pysmartthings import Scene as STScene, SmartThings
 
-from .const import DATA_BROKERS, DOMAIN
+from homeassistant.components.scene import Scene
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import SmartThingsConfigEntry
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: SmartThingsConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
-    """Add switches for a config entry."""
-    broker = hass.data[DOMAIN][DATA_BROKERS][config_entry.entry_id]
-    async_add_entities(SmartThingsScene(scene) for scene in broker.scenes.values())
+    """Add lights for a config entry."""
+    client = entry.runtime_data.client
+    scenes = entry.runtime_data.scenes
+    async_add_entities(SmartThingsScene(scene, client) for scene in scenes.values())
 
 
 class SmartThingsScene(Scene):
     """Define a SmartThings scene."""
 
-    def __init__(self, scene):
+    def __init__(self, scene: STScene, client: SmartThings) -> None:
         """Init the scene class."""
+        self.client = client
         self._scene = scene
         self._attr_name = scene.name
         self._attr_unique_id = scene.scene_id
 
     async def async_activate(self, **kwargs: Any) -> None:
         """Activate scene."""
-        await self._scene.execute()
+        await self.client.execute_scene(self._scene.scene_id)
 
     @property
-    def extra_state_attributes(self):
+    def extra_state_attributes(self) -> dict[str, Any]:
         """Get attributes about the state."""
         return {
             "icon": self._scene.icon,
diff --git a/homeassistant/components/smartthings/select.py b/homeassistant/components/smartthings/select.py
new file mode 100644
index 00000000000..f0a483b1329
--- /dev/null
+++ b/homeassistant/components/smartthings/select.py
@@ -0,0 +1,127 @@
+"""Support for select entities through the SmartThings cloud API."""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from pysmartthings import Attribute, Capability, Command, SmartThings
+
+from homeassistant.components.select import SelectEntity, SelectEntityDescription
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ServiceValidationError
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import FullDevice, SmartThingsConfigEntry
+from .const import MAIN
+from .entity import SmartThingsEntity
+
+
+@dataclass(frozen=True, kw_only=True)
+class SmartThingsSelectDescription(SelectEntityDescription):
+    """Class describing SmartThings select entities."""
+
+    key: Capability
+    requires_remote_control_status: bool
+    options_attribute: Attribute
+    status_attribute: Attribute
+    command: Command
+
+
+CAPABILITIES_TO_SELECT: dict[Capability | str, SmartThingsSelectDescription] = {
+    Capability.DISHWASHER_OPERATING_STATE: SmartThingsSelectDescription(
+        key=Capability.DISHWASHER_OPERATING_STATE,
+        name=None,
+        translation_key="operating_state",
+        requires_remote_control_status=True,
+        options_attribute=Attribute.SUPPORTED_MACHINE_STATES,
+        status_attribute=Attribute.MACHINE_STATE,
+        command=Command.SET_MACHINE_STATE,
+    ),
+    Capability.DRYER_OPERATING_STATE: SmartThingsSelectDescription(
+        key=Capability.DRYER_OPERATING_STATE,
+        name=None,
+        translation_key="operating_state",
+        requires_remote_control_status=True,
+        options_attribute=Attribute.SUPPORTED_MACHINE_STATES,
+        status_attribute=Attribute.MACHINE_STATE,
+        command=Command.SET_MACHINE_STATE,
+    ),
+    Capability.WASHER_OPERATING_STATE: SmartThingsSelectDescription(
+        key=Capability.WASHER_OPERATING_STATE,
+        name=None,
+        translation_key="operating_state",
+        requires_remote_control_status=True,
+        options_attribute=Attribute.SUPPORTED_MACHINE_STATES,
+        status_attribute=Attribute.MACHINE_STATE,
+        command=Command.SET_MACHINE_STATE,
+    ),
+}
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: SmartThingsConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Add select entities for a config entry."""
+    entry_data = entry.runtime_data
+    async_add_entities(
+        SmartThingsSelectEntity(
+            entry_data.client, device, CAPABILITIES_TO_SELECT[capability]
+        )
+        for device in entry_data.devices.values()
+        for capability in device.status[MAIN]
+        if capability in CAPABILITIES_TO_SELECT
+    )
+
+
+class SmartThingsSelectEntity(SmartThingsEntity, SelectEntity):
+    """Define a SmartThings select."""
+
+    entity_description: SmartThingsSelectDescription
+
+    def __init__(
+        self,
+        client: SmartThings,
+        device: FullDevice,
+        entity_description: SmartThingsSelectDescription,
+    ) -> None:
+        """Initialize the instance."""
+        capabilities = {entity_description.key}
+        if entity_description.requires_remote_control_status:
+            capabilities.add(Capability.REMOTE_CONTROL_STATUS)
+        super().__init__(client, device, capabilities)
+        self.entity_description = entity_description
+        self._attr_unique_id = f"{device.device.device_id}_{MAIN}_{entity_description.key}_{entity_description.status_attribute}_{entity_description.status_attribute}"
+
+    @property
+    def options(self) -> list[str]:
+        """Return the list of options."""
+        return self.get_attribute_value(
+            self.entity_description.key, self.entity_description.options_attribute
+        )
+
+    @property
+    def current_option(self) -> str | None:
+        """Return the current option."""
+        return self.get_attribute_value(
+            self.entity_description.key, self.entity_description.status_attribute
+        )
+
+    async def async_select_option(self, option: str) -> None:
+        """Select an option."""
+        if (
+            self.entity_description.requires_remote_control_status
+            and self.get_attribute_value(
+                Capability.REMOTE_CONTROL_STATUS, Attribute.REMOTE_CONTROL_ENABLED
+            )
+            == "false"
+        ):
+            raise ServiceValidationError(
+                "Can only be updated when remote control is enabled"
+            )
+        await self.execute_device_command(
+            self.entity_description.key,
+            self.entity_description.command,
+            option,
+        )
diff --git a/homeassistant/components/smartthings/sensor.py b/homeassistant/components/smartthings/sensor.py
index 8bd0421d2bc..f93b27337e1 100644
--- a/homeassistant/components/smartthings/sensor.py
+++ b/homeassistant/components/smartthings/sensor.py
@@ -2,25 +2,28 @@
 
 from __future__ import annotations
 
-from collections.abc import Sequence
-from typing import NamedTuple
+from collections.abc import Callable, Mapping
+from dataclasses import dataclass
+from datetime import datetime
+from typing import Any, cast
 
-from pysmartthings import Attribute, Capability
-from pysmartthings.device import DeviceEntity
+from pysmartthings import Attribute, Capability, ComponentStatus, SmartThings, Status
 
+from homeassistant.components.automation import automations_with_entity
+from homeassistant.components.script import scripts_with_entity
 from homeassistant.components.sensor import (
     SensorDeviceClass,
     SensorEntity,
+    SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
+    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     CONCENTRATION_PARTS_PER_MILLION,
     LIGHT_LUX,
     PERCENTAGE,
     EntityCategory,
     UnitOfArea,
-    UnitOfElectricPotential,
     UnitOfEnergy,
     UnitOfMass,
     UnitOfPower,
@@ -28,711 +31,1137 @@ from homeassistant.const import (
     UnitOfVolume,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.issue_registry import (
+    IssueSeverity,
+    async_create_issue,
+    async_delete_issue,
+)
 from homeassistant.util import dt as dt_util
 
-from .const import DATA_BROKERS, DOMAIN
+from . import FullDevice, SmartThingsConfigEntry
+from .const import DOMAIN, MAIN
 from .entity import SmartThingsEntity
 
-
-class Map(NamedTuple):
-    """Tuple for mapping Smartthings capabilities to Home Assistant sensors."""
-
-    attribute: str
-    name: str
-    default_unit: str | None
-    device_class: SensorDeviceClass | None
-    state_class: SensorStateClass | None
-    entity_category: EntityCategory | None
-
-
-CAPABILITY_TO_SENSORS: dict[str, list[Map]] = {
-    Capability.activity_lighting_mode: [
-        Map(
-            Attribute.lighting_mode,
-            "Activity Lighting Mode",
-            None,
-            None,
-            None,
-            EntityCategory.DIAGNOSTIC,
-        )
-    ],
-    Capability.air_conditioner_mode: [
-        Map(
-            Attribute.air_conditioner_mode,
-            "Air Conditioner Mode",
-            None,
-            None,
-            None,
-            EntityCategory.DIAGNOSTIC,
-        )
-    ],
-    Capability.air_quality_sensor: [
-        Map(
-            Attribute.air_quality,
-            "Air Quality",
-            "CAQI",
-            None,
-            SensorStateClass.MEASUREMENT,
-            None,
-        )
-    ],
-    Capability.alarm: [Map(Attribute.alarm, "Alarm", None, None, None, None)],
-    Capability.audio_volume: [
-        Map(Attribute.volume, "Volume", PERCENTAGE, None, None, None)
-    ],
-    Capability.battery: [
-        Map(
-            Attribute.battery,
-            "Battery",
-            PERCENTAGE,
-            SensorDeviceClass.BATTERY,
-            None,
-            EntityCategory.DIAGNOSTIC,
-        )
-    ],
-    Capability.body_mass_index_measurement: [
-        Map(
-            Attribute.bmi_measurement,
-            "Body Mass Index",
-            f"{UnitOfMass.KILOGRAMS}/{UnitOfArea.SQUARE_METERS}",
-            None,
-            SensorStateClass.MEASUREMENT,
-            None,
-        )
-    ],
-    Capability.body_weight_measurement: [
-        Map(
-            Attribute.body_weight_measurement,
-            "Body Weight",
-            UnitOfMass.KILOGRAMS,
-            SensorDeviceClass.WEIGHT,
-            SensorStateClass.MEASUREMENT,
-            None,
-        )
-    ],
-    Capability.carbon_dioxide_measurement: [
-        Map(
-            Attribute.carbon_dioxide,
-            "Carbon Dioxide Measurement",
-            CONCENTRATION_PARTS_PER_MILLION,
-            SensorDeviceClass.CO2,
-            SensorStateClass.MEASUREMENT,
-            None,
-        )
-    ],
-    Capability.carbon_monoxide_detector: [
-        Map(
-            Attribute.carbon_monoxide,
-            "Carbon Monoxide Detector",
-            None,
-            None,
-            None,
-            None,
-        )
-    ],
-    Capability.carbon_monoxide_measurement: [
-        Map(
-            Attribute.carbon_monoxide_level,
-            "Carbon Monoxide Measurement",
-            CONCENTRATION_PARTS_PER_MILLION,
-            SensorDeviceClass.CO,
-            SensorStateClass.MEASUREMENT,
-            None,
-        )
-    ],
-    Capability.dishwasher_operating_state: [
-        Map(
-            Attribute.machine_state, "Dishwasher Machine State", None, None, None, None
-        ),
-        Map(
-            Attribute.dishwasher_job_state,
-            "Dishwasher Job State",
-            None,
-            None,
-            None,
-            None,
-        ),
-        Map(
-            Attribute.completion_time,
-            "Dishwasher Completion Time",
-            None,
-            SensorDeviceClass.TIMESTAMP,
-            None,
-            None,
-        ),
-    ],
-    Capability.dryer_mode: [
-        Map(
-            Attribute.dryer_mode,
-            "Dryer Mode",
-            None,
-            None,
-            None,
-            EntityCategory.DIAGNOSTIC,
-        )
-    ],
-    Capability.dryer_operating_state: [
-        Map(Attribute.machine_state, "Dryer Machine State", None, None, None, None),
-        Map(Attribute.dryer_job_state, "Dryer Job State", None, None, None, None),
-        Map(
-            Attribute.completion_time,
-            "Dryer Completion Time",
-            None,
-            SensorDeviceClass.TIMESTAMP,
-            None,
-            None,
-        ),
-    ],
-    Capability.dust_sensor: [
-        Map(
-            Attribute.fine_dust_level,
-            "Fine Dust Level",
-            None,
-            None,
-            SensorStateClass.MEASUREMENT,
-            None,
-        ),
-        Map(
-            Attribute.dust_level,
-            "Dust Level",
-            None,
-            None,
-            SensorStateClass.MEASUREMENT,
-            None,
-        ),
-    ],
-    Capability.energy_meter: [
-        Map(
-            Attribute.energy,
-            "Energy Meter",
-            UnitOfEnergy.KILO_WATT_HOUR,
-            SensorDeviceClass.ENERGY,
-            SensorStateClass.TOTAL_INCREASING,
-            None,
-        )
-    ],
-    Capability.equivalent_carbon_dioxide_measurement: [
-        Map(
-            Attribute.equivalent_carbon_dioxide_measurement,
-            "Equivalent Carbon Dioxide Measurement",
-            CONCENTRATION_PARTS_PER_MILLION,
-            SensorDeviceClass.CO2,
-            SensorStateClass.MEASUREMENT,
-            None,
-        )
-    ],
-    Capability.formaldehyde_measurement: [
-        Map(
-            Attribute.formaldehyde_level,
-            "Formaldehyde Measurement",
-            CONCENTRATION_PARTS_PER_MILLION,
-            None,
-            SensorStateClass.MEASUREMENT,
-            None,
-        )
-    ],
-    Capability.gas_meter: [
-        Map(
-            Attribute.gas_meter,
-            "Gas Meter",
-            UnitOfEnergy.KILO_WATT_HOUR,
-            SensorDeviceClass.ENERGY,
-            SensorStateClass.MEASUREMENT,
-            None,
-        ),
-        Map(
-            Attribute.gas_meter_calorific, "Gas Meter Calorific", None, None, None, None
-        ),
-        Map(
-            Attribute.gas_meter_time,
-            "Gas Meter Time",
-            None,
-            SensorDeviceClass.TIMESTAMP,
-            None,
-            None,
-        ),
-        Map(
-            Attribute.gas_meter_volume,
-            "Gas Meter Volume",
-            UnitOfVolume.CUBIC_METERS,
-            SensorDeviceClass.GAS,
-            SensorStateClass.MEASUREMENT,
-            None,
-        ),
-    ],
-    Capability.illuminance_measurement: [
-        Map(
-            Attribute.illuminance,
-            "Illuminance",
-            LIGHT_LUX,
-            SensorDeviceClass.ILLUMINANCE,
-            SensorStateClass.MEASUREMENT,
-            None,
-        )
-    ],
-    Capability.infrared_level: [
-        Map(
-            Attribute.infrared_level,
-            "Infrared Level",
-            PERCENTAGE,
-            None,
-            SensorStateClass.MEASUREMENT,
-            None,
-        )
-    ],
-    Capability.media_input_source: [
-        Map(Attribute.input_source, "Media Input Source", None, None, None, None)
-    ],
-    Capability.media_playback_repeat: [
-        Map(
-            Attribute.playback_repeat_mode,
-            "Media Playback Repeat",
-            None,
-            None,
-            None,
-            None,
-        )
-    ],
-    Capability.media_playback_shuffle: [
-        Map(
-            Attribute.playback_shuffle, "Media Playback Shuffle", None, None, None, None
-        )
-    ],
-    Capability.media_playback: [
-        Map(Attribute.playback_status, "Media Playback Status", None, None, None, None)
-    ],
-    Capability.odor_sensor: [
-        Map(Attribute.odor_level, "Odor Sensor", None, None, None, None)
-    ],
-    Capability.oven_mode: [
-        Map(
-            Attribute.oven_mode,
-            "Oven Mode",
-            None,
-            None,
-            None,
-            EntityCategory.DIAGNOSTIC,
-        )
-    ],
-    Capability.oven_operating_state: [
-        Map(Attribute.machine_state, "Oven Machine State", None, None, None, None),
-        Map(Attribute.oven_job_state, "Oven Job State", None, None, None, None),
-        Map(Attribute.completion_time, "Oven Completion Time", None, None, None, None),
-    ],
-    Capability.oven_setpoint: [
-        Map(Attribute.oven_setpoint, "Oven Set Point", None, None, None, None)
-    ],
-    Capability.power_consumption_report: [],
-    Capability.power_meter: [
-        Map(
-            Attribute.power,
-            "Power Meter",
-            UnitOfPower.WATT,
-            SensorDeviceClass.POWER,
-            SensorStateClass.MEASUREMENT,
-            None,
-        )
-    ],
-    Capability.power_source: [
-        Map(
-            Attribute.power_source,
-            "Power Source",
-            None,
-            None,
-            None,
-            EntityCategory.DIAGNOSTIC,
-        )
-    ],
-    Capability.refrigeration_setpoint: [
-        Map(
-            Attribute.refrigeration_setpoint,
-            "Refrigeration Setpoint",
-            None,
-            SensorDeviceClass.TEMPERATURE,
-            None,
-            None,
-        )
-    ],
-    Capability.relative_humidity_measurement: [
-        Map(
-            Attribute.humidity,
-            "Relative Humidity Measurement",
-            PERCENTAGE,
-            SensorDeviceClass.HUMIDITY,
-            SensorStateClass.MEASUREMENT,
-            None,
-        )
-    ],
-    Capability.robot_cleaner_cleaning_mode: [
-        Map(
-            Attribute.robot_cleaner_cleaning_mode,
-            "Robot Cleaner Cleaning Mode",
-            None,
-            None,
-            None,
-            EntityCategory.DIAGNOSTIC,
-        )
-    ],
-    Capability.robot_cleaner_movement: [
-        Map(
-            Attribute.robot_cleaner_movement,
-            "Robot Cleaner Movement",
-            None,
-            None,
-            None,
-            None,
-        )
-    ],
-    Capability.robot_cleaner_turbo_mode: [
-        Map(
-            Attribute.robot_cleaner_turbo_mode,
-            "Robot Cleaner Turbo Mode",
-            None,
-            None,
-            None,
-            EntityCategory.DIAGNOSTIC,
-        )
-    ],
-    Capability.signal_strength: [
-        Map(
-            Attribute.lqi,
-            "LQI Signal Strength",
-            None,
-            None,
-            SensorStateClass.MEASUREMENT,
-            EntityCategory.DIAGNOSTIC,
-        ),
-        Map(
-            Attribute.rssi,
-            "RSSI Signal Strength",
-            None,
-            SensorDeviceClass.SIGNAL_STRENGTH,
-            SensorStateClass.MEASUREMENT,
-            EntityCategory.DIAGNOSTIC,
-        ),
-    ],
-    Capability.smoke_detector: [
-        Map(Attribute.smoke, "Smoke Detector", None, None, None, None)
-    ],
-    Capability.temperature_measurement: [
-        Map(
-            Attribute.temperature,
-            "Temperature Measurement",
-            None,
-            SensorDeviceClass.TEMPERATURE,
-            SensorStateClass.MEASUREMENT,
-            None,
-        )
-    ],
-    Capability.thermostat_cooling_setpoint: [
-        Map(
-            Attribute.cooling_setpoint,
-            "Thermostat Cooling Setpoint",
-            None,
-            SensorDeviceClass.TEMPERATURE,
-            None,
-            None,
-        )
-    ],
-    Capability.thermostat_fan_mode: [
-        Map(
-            Attribute.thermostat_fan_mode,
-            "Thermostat Fan Mode",
-            None,
-            None,
-            None,
-            EntityCategory.DIAGNOSTIC,
-        )
-    ],
-    Capability.thermostat_heating_setpoint: [
-        Map(
-            Attribute.heating_setpoint,
-            "Thermostat Heating Setpoint",
-            None,
-            SensorDeviceClass.TEMPERATURE,
-            None,
-            EntityCategory.DIAGNOSTIC,
-        )
-    ],
-    Capability.thermostat_mode: [
-        Map(
-            Attribute.thermostat_mode,
-            "Thermostat Mode",
-            None,
-            None,
-            None,
-            EntityCategory.DIAGNOSTIC,
-        )
-    ],
-    Capability.thermostat_operating_state: [
-        Map(
-            Attribute.thermostat_operating_state,
-            "Thermostat Operating State",
-            None,
-            None,
-            None,
-            None,
-        )
-    ],
-    Capability.thermostat_setpoint: [
-        Map(
-            Attribute.thermostat_setpoint,
-            "Thermostat Setpoint",
-            None,
-            SensorDeviceClass.TEMPERATURE,
-            None,
-            EntityCategory.DIAGNOSTIC,
-        )
-    ],
-    Capability.three_axis: [],
-    Capability.tv_channel: [
-        Map(Attribute.tv_channel, "Tv Channel", None, None, None, None),
-        Map(Attribute.tv_channel_name, "Tv Channel Name", None, None, None, None),
-    ],
-    Capability.tvoc_measurement: [
-        Map(
-            Attribute.tvoc_level,
-            "Tvoc Measurement",
-            CONCENTRATION_PARTS_PER_MILLION,
-            None,
-            SensorStateClass.MEASUREMENT,
-            None,
-        )
-    ],
-    Capability.ultraviolet_index: [
-        Map(
-            Attribute.ultraviolet_index,
-            "Ultraviolet Index",
-            None,
-            None,
-            SensorStateClass.MEASUREMENT,
-            None,
-        )
-    ],
-    Capability.voltage_measurement: [
-        Map(
-            Attribute.voltage,
-            "Voltage Measurement",
-            UnitOfElectricPotential.VOLT,
-            SensorDeviceClass.VOLTAGE,
-            SensorStateClass.MEASUREMENT,
-            None,
-        )
-    ],
-    Capability.washer_mode: [
-        Map(
-            Attribute.washer_mode,
-            "Washer Mode",
-            None,
-            None,
-            None,
-            EntityCategory.DIAGNOSTIC,
-        )
-    ],
-    Capability.washer_operating_state: [
-        Map(Attribute.machine_state, "Washer Machine State", None, None, None, None),
-        Map(Attribute.washer_job_state, "Washer Job State", None, None, None, None),
-        Map(
-            Attribute.completion_time,
-            "Washer Completion Time",
-            None,
-            SensorDeviceClass.TIMESTAMP,
-            None,
-            None,
-        ),
-    ],
+THERMOSTAT_CAPABILITIES = {
+    Capability.TEMPERATURE_MEASUREMENT,
+    Capability.THERMOSTAT_HEATING_SETPOINT,
+    Capability.THERMOSTAT_MODE,
 }
 
+JOB_STATE_MAP = {
+    "airWash": "air_wash",
+    "airwash": "air_wash",
+    "aIRinse": "ai_rinse",
+    "aISpin": "ai_spin",
+    "aIWash": "ai_wash",
+    "aIDrying": "ai_drying",
+    "internalCare": "internal_care",
+    "continuousDehumidifying": "continuous_dehumidifying",
+    "thawingFrozenInside": "thawing_frozen_inside",
+    "delayWash": "delay_wash",
+    "weightSensing": "weight_sensing",
+    "freezeProtection": "freeze_protection",
+    "preDrain": "pre_drain",
+    "preWash": "pre_wash",
+    "prewash": "pre_wash",
+    "wrinklePrevent": "wrinkle_prevent",
+    "unknown": None,
+}
+
+OVEN_JOB_STATE_MAP = {
+    "scheduledStart": "scheduled_start",
+    "fastPreheat": "fast_preheat",
+    "scheduledEnd": "scheduled_end",
+    "stone_heating": "stone_heating",
+    "timeHoldPreheat": "time_hold_preheat",
+}
+
+MEDIA_PLAYBACK_STATE_MAP = {
+    "fast forwarding": "fast_forwarding",
+}
+
+ROBOT_CLEANER_TURBO_MODE_STATE_MAP = {
+    "extraSilence": "extra_silence",
+}
+
+ROBOT_CLEANER_MOVEMENT_MAP = {
+    "powerOff": "off",
+}
+
+OVEN_MODE = {
+    "Conventional": "conventional",
+    "Bake": "bake",
+    "BottomHeat": "bottom_heat",
+    "ConvectionBake": "convection_bake",
+    "ConvectionRoast": "convection_roast",
+    "Broil": "broil",
+    "ConvectionBroil": "convection_broil",
+    "SteamCook": "steam_cook",
+    "SteamBake": "steam_bake",
+    "SteamRoast": "steam_roast",
+    "SteamBottomHeatplusConvection": "steam_bottom_heat_plus_convection",
+    "Microwave": "microwave",
+    "MWplusGrill": "microwave_plus_grill",
+    "MWplusConvection": "microwave_plus_convection",
+    "MWplusHotBlast": "microwave_plus_hot_blast",
+    "MWplusHotBlast2": "microwave_plus_hot_blast_2",
+    "SlimMiddle": "slim_middle",
+    "SlimStrong": "slim_strong",
+    "SlowCook": "slow_cook",
+    "Proof": "proof",
+    "Dehydrate": "dehydrate",
+    "Others": "others",
+    "StrongSteam": "strong_steam",
+    "Descale": "descale",
+    "Rinse": "rinse",
+}
+
+WASHER_OPTIONS = ["pause", "run", "stop"]
+
+
+def power_attributes(status: dict[str, Any]) -> dict[str, Any]:
+    """Return the power attributes."""
+    state = {}
+    for attribute in ("start", "end"):
+        if (value := status.get(attribute)) is not None:
+            state[f"power_consumption_{attribute}"] = value
+    return state
+
+
+@dataclass(frozen=True, kw_only=True)
+class SmartThingsSensorEntityDescription(SensorEntityDescription):
+    """Describe a SmartThings sensor entity."""
+
+    value_fn: Callable[[Any], str | float | int | datetime | None] = lambda value: value
+    extra_state_attributes_fn: Callable[[Any], dict[str, Any]] | None = None
+    capability_ignore_list: list[set[Capability]] | None = None
+    options_attribute: Attribute | None = None
+    exists_fn: Callable[[Status], bool] | None = None
+    use_temperature_unit: bool = False
+    deprecated: Callable[[ComponentStatus], str | None] | None = None
+
+
+CAPABILITY_TO_SENSORS: dict[
+    Capability, dict[Attribute, list[SmartThingsSensorEntityDescription]]
+] = {
+    # Haven't seen at devices yet
+    Capability.ACTIVITY_LIGHTING_MODE: {
+        Attribute.LIGHTING_MODE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.LIGHTING_MODE,
+                translation_key="lighting_mode",
+                entity_category=EntityCategory.DIAGNOSTIC,
+            )
+        ]
+    },
+    Capability.AIR_CONDITIONER_MODE: {
+        Attribute.AIR_CONDITIONER_MODE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.AIR_CONDITIONER_MODE,
+                translation_key="air_conditioner_mode",
+                entity_category=EntityCategory.DIAGNOSTIC,
+                capability_ignore_list=[
+                    {
+                        Capability.TEMPERATURE_MEASUREMENT,
+                        Capability.THERMOSTAT_COOLING_SETPOINT,
+                    }
+                ],
+            )
+        ]
+    },
+    Capability.AIR_QUALITY_SENSOR: {
+        Attribute.AIR_QUALITY: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.AIR_QUALITY,
+                translation_key="air_quality",
+                native_unit_of_measurement="CAQI",
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ]
+    },
+    Capability.ALARM: {
+        Attribute.ALARM: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.ALARM,
+                translation_key="alarm",
+                options=["both", "strobe", "siren", "off"],
+                device_class=SensorDeviceClass.ENUM,
+            )
+        ]
+    },
+    Capability.AUDIO_VOLUME: {
+        Attribute.VOLUME: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.VOLUME,
+                translation_key="audio_volume",
+                native_unit_of_measurement=PERCENTAGE,
+                deprecated=(
+                    lambda status: "media_player"
+                    if all(
+                        capability in status
+                        for capability in (
+                            Capability.AUDIO_MUTE,
+                            Capability.MEDIA_PLAYBACK,
+                        )
+                    )
+                    else None
+                ),
+            )
+        ]
+    },
+    Capability.BATTERY: {
+        Attribute.BATTERY: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.BATTERY,
+                native_unit_of_measurement=PERCENTAGE,
+                device_class=SensorDeviceClass.BATTERY,
+                entity_category=EntityCategory.DIAGNOSTIC,
+            )
+        ]
+    },
+    # Haven't seen at devices yet
+    Capability.BODY_MASS_INDEX_MEASUREMENT: {
+        Attribute.BMI_MEASUREMENT: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.BMI_MEASUREMENT,
+                translation_key="body_mass_index",
+                native_unit_of_measurement=f"{UnitOfMass.KILOGRAMS}/{UnitOfArea.SQUARE_METERS}",
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ]
+    },
+    # Haven't seen at devices yet
+    Capability.BODY_WEIGHT_MEASUREMENT: {
+        Attribute.BODY_WEIGHT_MEASUREMENT: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.BODY_WEIGHT_MEASUREMENT,
+                translation_key="body_weight",
+                native_unit_of_measurement=UnitOfMass.KILOGRAMS,
+                device_class=SensorDeviceClass.WEIGHT,
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ]
+    },
+    Capability.CARBON_DIOXIDE_MEASUREMENT: {
+        Attribute.CARBON_DIOXIDE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.CARBON_DIOXIDE,
+                native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+                device_class=SensorDeviceClass.CO2,
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ]
+    },
+    # Haven't seen at devices yet
+    Capability.CARBON_MONOXIDE_DETECTOR: {
+        Attribute.CARBON_MONOXIDE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.CARBON_MONOXIDE,
+                translation_key="carbon_monoxide_detector",
+                options=["detected", "clear", "tested"],
+                device_class=SensorDeviceClass.ENUM,
+            )
+        ]
+    },
+    # Haven't seen at devices yet
+    Capability.CARBON_MONOXIDE_MEASUREMENT: {
+        Attribute.CARBON_MONOXIDE_LEVEL: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.CARBON_MONOXIDE_LEVEL,
+                native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+                device_class=SensorDeviceClass.CO,
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ]
+    },
+    Capability.DISHWASHER_OPERATING_STATE: {
+        Attribute.MACHINE_STATE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.MACHINE_STATE,
+                translation_key="dishwasher_machine_state",
+                options=WASHER_OPTIONS,
+                device_class=SensorDeviceClass.ENUM,
+            )
+        ],
+        Attribute.DISHWASHER_JOB_STATE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.DISHWASHER_JOB_STATE,
+                translation_key="dishwasher_job_state",
+                options=[
+                    "air_wash",
+                    "cooling",
+                    "drying",
+                    "finish",
+                    "pre_drain",
+                    "pre_wash",
+                    "rinse",
+                    "spin",
+                    "wash",
+                    "wrinkle_prevent",
+                ],
+                device_class=SensorDeviceClass.ENUM,
+                value_fn=lambda value: JOB_STATE_MAP.get(value, value),
+            )
+        ],
+        Attribute.COMPLETION_TIME: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.COMPLETION_TIME,
+                translation_key="completion_time",
+                device_class=SensorDeviceClass.TIMESTAMP,
+                value_fn=dt_util.parse_datetime,
+            )
+        ],
+    },
+    # part of the proposed spec, Haven't seen at devices yet
+    Capability.DRYER_MODE: {
+        Attribute.DRYER_MODE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.DRYER_MODE,
+                translation_key="dryer_mode",
+                entity_category=EntityCategory.DIAGNOSTIC,
+            )
+        ]
+    },
+    Capability.DRYER_OPERATING_STATE: {
+        Attribute.MACHINE_STATE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.MACHINE_STATE,
+                translation_key="dryer_machine_state",
+                options=WASHER_OPTIONS,
+                device_class=SensorDeviceClass.ENUM,
+                deprecated=lambda _: "machine_state",
+            )
+        ],
+        Attribute.DRYER_JOB_STATE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.DRYER_JOB_STATE,
+                translation_key="dryer_job_state",
+                options=[
+                    "cooling",
+                    "delay_wash",
+                    "drying",
+                    "finished",
+                    "none",
+                    "refreshing",
+                    "weight_sensing",
+                    "wrinkle_prevent",
+                    "dehumidifying",
+                    "ai_drying",
+                    "sanitizing",
+                    "internal_care",
+                    "freeze_protection",
+                    "continuous_dehumidifying",
+                    "thawing_frozen_inside",
+                ],
+                device_class=SensorDeviceClass.ENUM,
+                value_fn=lambda value: JOB_STATE_MAP.get(value, value),
+            )
+        ],
+        Attribute.COMPLETION_TIME: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.COMPLETION_TIME,
+                translation_key="completion_time",
+                device_class=SensorDeviceClass.TIMESTAMP,
+                value_fn=dt_util.parse_datetime,
+            )
+        ],
+    },
+    Capability.DUST_SENSOR: {
+        Attribute.DUST_LEVEL: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.DUST_LEVEL,
+                device_class=SensorDeviceClass.PM10,
+                native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ],
+        Attribute.FINE_DUST_LEVEL: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.FINE_DUST_LEVEL,
+                device_class=SensorDeviceClass.PM25,
+                native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ],
+    },
+    Capability.ENERGY_METER: {
+        Attribute.ENERGY: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.ENERGY,
+                native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+                device_class=SensorDeviceClass.ENERGY,
+                state_class=SensorStateClass.TOTAL_INCREASING,
+            )
+        ]
+    },
+    # Haven't seen at devices yet
+    Capability.EQUIVALENT_CARBON_DIOXIDE_MEASUREMENT: {
+        Attribute.EQUIVALENT_CARBON_DIOXIDE_MEASUREMENT: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.EQUIVALENT_CARBON_DIOXIDE_MEASUREMENT,
+                translation_key="equivalent_carbon_dioxide",
+                native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+                device_class=SensorDeviceClass.CO2,
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ]
+    },
+    # Haven't seen at devices yet
+    Capability.FORMALDEHYDE_MEASUREMENT: {
+        Attribute.FORMALDEHYDE_LEVEL: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.FORMALDEHYDE_LEVEL,
+                translation_key="formaldehyde",
+                native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ]
+    },
+    # Haven't seen at devices yet
+    Capability.GAS_METER: {
+        Attribute.GAS_METER: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.GAS_METER,
+                translation_key="gas_meter",
+                native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+                device_class=SensorDeviceClass.ENERGY,
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ],
+        Attribute.GAS_METER_CALORIFIC: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.GAS_METER_CALORIFIC,
+                translation_key="gas_meter_calorific",
+            )
+        ],
+        Attribute.GAS_METER_TIME: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.GAS_METER_TIME,
+                translation_key="gas_meter_time",
+                device_class=SensorDeviceClass.TIMESTAMP,
+                value_fn=dt_util.parse_datetime,
+            )
+        ],
+        Attribute.GAS_METER_VOLUME: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.GAS_METER_VOLUME,
+                native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
+                device_class=SensorDeviceClass.GAS,
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ],
+    },
+    # Haven't seen at devices yet
+    Capability.ILLUMINANCE_MEASUREMENT: {
+        Attribute.ILLUMINANCE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.ILLUMINANCE,
+                native_unit_of_measurement=LIGHT_LUX,
+                device_class=SensorDeviceClass.ILLUMINANCE,
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ]
+    },
+    # Haven't seen at devices yet
+    Capability.INFRARED_LEVEL: {
+        Attribute.INFRARED_LEVEL: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.INFRARED_LEVEL,
+                translation_key="infrared_level",
+                native_unit_of_measurement=PERCENTAGE,
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ]
+    },
+    Capability.MEDIA_INPUT_SOURCE: {
+        Attribute.INPUT_SOURCE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.INPUT_SOURCE,
+                translation_key="media_input_source",
+                device_class=SensorDeviceClass.ENUM,
+                options_attribute=Attribute.SUPPORTED_INPUT_SOURCES,
+                value_fn=lambda value: value.lower() if value else None,
+                deprecated=lambda _: "media_player",
+            )
+        ]
+    },
+    Capability.MEDIA_PLAYBACK_REPEAT: {
+        Attribute.PLAYBACK_REPEAT_MODE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.PLAYBACK_REPEAT_MODE,
+                translation_key="media_playback_repeat",
+                deprecated=lambda _: "media_player",
+            )
+        ]
+    },
+    Capability.MEDIA_PLAYBACK_SHUFFLE: {
+        Attribute.PLAYBACK_SHUFFLE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.PLAYBACK_SHUFFLE,
+                translation_key="media_playback_shuffle",
+                deprecated=lambda _: "media_player",
+            )
+        ]
+    },
+    Capability.MEDIA_PLAYBACK: {
+        Attribute.PLAYBACK_STATUS: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.PLAYBACK_STATUS,
+                translation_key="media_playback_status",
+                options=[
+                    "paused",
+                    "playing",
+                    "stopped",
+                    "fast_forwarding",
+                    "rewinding",
+                    "buffering",
+                ],
+                device_class=SensorDeviceClass.ENUM,
+                value_fn=lambda value: MEDIA_PLAYBACK_STATE_MAP.get(value, value),
+                deprecated=lambda _: "media_player",
+            )
+        ]
+    },
+    Capability.ODOR_SENSOR: {
+        Attribute.ODOR_LEVEL: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.ODOR_LEVEL,
+                translation_key="odor_sensor",
+            )
+        ]
+    },
+    Capability.OVEN_MODE: {
+        Attribute.OVEN_MODE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.OVEN_MODE,
+                translation_key="oven_mode",
+                entity_category=EntityCategory.DIAGNOSTIC,
+                options=list(OVEN_MODE.values()),
+                device_class=SensorDeviceClass.ENUM,
+                value_fn=lambda value: OVEN_MODE.get(value, value),
+            )
+        ]
+    },
+    Capability.OVEN_OPERATING_STATE: {
+        Attribute.MACHINE_STATE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.MACHINE_STATE,
+                translation_key="oven_machine_state",
+                options=["ready", "running", "paused"],
+                device_class=SensorDeviceClass.ENUM,
+            )
+        ],
+        Attribute.OVEN_JOB_STATE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.OVEN_JOB_STATE,
+                translation_key="oven_job_state",
+                options=[
+                    "cleaning",
+                    "cooking",
+                    "cooling",
+                    "draining",
+                    "preheat",
+                    "ready",
+                    "rinsing",
+                    "finished",
+                    "scheduled_start",
+                    "warming",
+                    "defrosting",
+                    "sensing",
+                    "searing",
+                    "fast_preheat",
+                    "scheduled_end",
+                    "stone_heating",
+                    "time_hold_preheat",
+                ],
+                device_class=SensorDeviceClass.ENUM,
+                value_fn=lambda value: OVEN_JOB_STATE_MAP.get(value, value),
+            )
+        ],
+        Attribute.COMPLETION_TIME: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.COMPLETION_TIME,
+                translation_key="completion_time",
+                device_class=SensorDeviceClass.TIMESTAMP,
+                value_fn=dt_util.parse_datetime,
+            )
+        ],
+    },
+    Capability.OVEN_SETPOINT: {
+        Attribute.OVEN_SETPOINT: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.OVEN_SETPOINT,
+                translation_key="oven_setpoint",
+                device_class=SensorDeviceClass.TEMPERATURE,
+                use_temperature_unit=True,
+                # Set the value to None if it is 0 F (-17 C)
+                value_fn=lambda value: None if value in {0, -17} else value,
+            )
+        ]
+    },
+    Capability.POWER_CONSUMPTION_REPORT: {
+        Attribute.POWER_CONSUMPTION: [
+            SmartThingsSensorEntityDescription(
+                key="energy_meter",
+                state_class=SensorStateClass.TOTAL_INCREASING,
+                device_class=SensorDeviceClass.ENERGY,
+                native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+                value_fn=lambda value: value["energy"] / 1000,
+                suggested_display_precision=2,
+                exists_fn=lambda status: (
+                    (value := cast(dict | None, status.value)) is not None
+                    and "energy" in value
+                ),
+            ),
+            SmartThingsSensorEntityDescription(
+                key="power_meter",
+                state_class=SensorStateClass.MEASUREMENT,
+                device_class=SensorDeviceClass.POWER,
+                native_unit_of_measurement=UnitOfPower.WATT,
+                value_fn=lambda value: value["power"],
+                extra_state_attributes_fn=power_attributes,
+                suggested_display_precision=2,
+                exists_fn=lambda status: (
+                    (value := cast(dict | None, status.value)) is not None
+                    and "power" in value
+                ),
+            ),
+            SmartThingsSensorEntityDescription(
+                key="deltaEnergy_meter",
+                translation_key="energy_difference",
+                state_class=SensorStateClass.TOTAL,
+                device_class=SensorDeviceClass.ENERGY,
+                native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+                value_fn=lambda value: value["deltaEnergy"] / 1000,
+                suggested_display_precision=2,
+                exists_fn=lambda status: (
+                    (value := cast(dict | None, status.value)) is not None
+                    and "deltaEnergy" in value
+                ),
+            ),
+            SmartThingsSensorEntityDescription(
+                key="powerEnergy_meter",
+                translation_key="power_energy",
+                state_class=SensorStateClass.TOTAL_INCREASING,
+                device_class=SensorDeviceClass.ENERGY,
+                native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+                value_fn=lambda value: value["powerEnergy"] / 1000,
+                suggested_display_precision=2,
+                exists_fn=lambda status: (
+                    (value := cast(dict | None, status.value)) is not None
+                    and "powerEnergy" in value
+                ),
+            ),
+            SmartThingsSensorEntityDescription(
+                key="energySaved_meter",
+                translation_key="energy_saved",
+                state_class=SensorStateClass.TOTAL_INCREASING,
+                device_class=SensorDeviceClass.ENERGY,
+                native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+                value_fn=lambda value: value["energySaved"] / 1000,
+                suggested_display_precision=2,
+                exists_fn=lambda status: (
+                    (value := cast(dict | None, status.value)) is not None
+                    and "energySaved" in value
+                ),
+            ),
+        ]
+    },
+    Capability.POWER_METER: {
+        Attribute.POWER: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.POWER,
+                native_unit_of_measurement=UnitOfPower.WATT,
+                device_class=SensorDeviceClass.POWER,
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ]
+    },
+    # Haven't seen at devices yet
+    Capability.POWER_SOURCE: {
+        Attribute.POWER_SOURCE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.POWER_SOURCE,
+                translation_key="power_source",
+                entity_category=EntityCategory.DIAGNOSTIC,
+            )
+        ]
+    },
+    # part of the proposed spec
+    Capability.REFRIGERATION_SETPOINT: {
+        Attribute.REFRIGERATION_SETPOINT: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.REFRIGERATION_SETPOINT,
+                translation_key="refrigeration_setpoint",
+                device_class=SensorDeviceClass.TEMPERATURE,
+            )
+        ]
+    },
+    Capability.RELATIVE_BRIGHTNESS: {
+        Attribute.BRIGHTNESS_INTENSITY: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.BRIGHTNESS_INTENSITY,
+                translation_key="brightness_intensity",
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ]
+    },
+    Capability.RELATIVE_HUMIDITY_MEASUREMENT: {
+        Attribute.HUMIDITY: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.HUMIDITY,
+                native_unit_of_measurement=PERCENTAGE,
+                device_class=SensorDeviceClass.HUMIDITY,
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ]
+    },
+    Capability.ROBOT_CLEANER_CLEANING_MODE: {
+        Attribute.ROBOT_CLEANER_CLEANING_MODE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.ROBOT_CLEANER_CLEANING_MODE,
+                translation_key="robot_cleaner_cleaning_mode",
+                options=["auto", "part", "repeat", "manual", "stop", "map"],
+                device_class=SensorDeviceClass.ENUM,
+                entity_category=EntityCategory.DIAGNOSTIC,
+            )
+        ],
+    },
+    Capability.ROBOT_CLEANER_MOVEMENT: {
+        Attribute.ROBOT_CLEANER_MOVEMENT: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.ROBOT_CLEANER_MOVEMENT,
+                translation_key="robot_cleaner_movement",
+                options=[
+                    "homing",
+                    "idle",
+                    "charging",
+                    "alarm",
+                    "off",
+                    "reserve",
+                    "point",
+                    "after",
+                    "cleaning",
+                    "pause",
+                ],
+                device_class=SensorDeviceClass.ENUM,
+                value_fn=lambda value: ROBOT_CLEANER_MOVEMENT_MAP.get(value, value),
+            )
+        ]
+    },
+    Capability.ROBOT_CLEANER_TURBO_MODE: {
+        Attribute.ROBOT_CLEANER_TURBO_MODE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.ROBOT_CLEANER_TURBO_MODE,
+                translation_key="robot_cleaner_turbo_mode",
+                options=["on", "off", "silence", "extra_silence"],
+                device_class=SensorDeviceClass.ENUM,
+                value_fn=lambda value: ROBOT_CLEANER_TURBO_MODE_STATE_MAP.get(
+                    value, value
+                ),
+                entity_category=EntityCategory.DIAGNOSTIC,
+            )
+        ]
+    },
+    # Haven't seen at devices yet
+    Capability.SIGNAL_STRENGTH: {
+        Attribute.LQI: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.LQI,
+                translation_key="link_quality",
+                state_class=SensorStateClass.MEASUREMENT,
+                entity_category=EntityCategory.DIAGNOSTIC,
+            )
+        ],
+        Attribute.RSSI: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.RSSI,
+                device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+                state_class=SensorStateClass.MEASUREMENT,
+                entity_category=EntityCategory.DIAGNOSTIC,
+            )
+        ],
+    },
+    # Haven't seen at devices yet
+    Capability.SMOKE_DETECTOR: {
+        Attribute.SMOKE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.SMOKE,
+                translation_key="smoke_detector",
+                options=["detected", "clear", "tested"],
+                device_class=SensorDeviceClass.ENUM,
+            )
+        ]
+    },
+    Capability.TEMPERATURE_MEASUREMENT: {
+        Attribute.TEMPERATURE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.TEMPERATURE,
+                device_class=SensorDeviceClass.TEMPERATURE,
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ]
+    },
+    Capability.THERMOSTAT_COOLING_SETPOINT: {
+        Attribute.COOLING_SETPOINT: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.COOLING_SETPOINT,
+                translation_key="thermostat_cooling_setpoint",
+                device_class=SensorDeviceClass.TEMPERATURE,
+                capability_ignore_list=[
+                    {
+                        Capability.AIR_CONDITIONER_FAN_MODE,
+                        Capability.TEMPERATURE_MEASUREMENT,
+                        Capability.AIR_CONDITIONER_MODE,
+                    },
+                    THERMOSTAT_CAPABILITIES,
+                ],
+            )
+        ]
+    },
+    # Haven't seen at devices yet
+    Capability.THERMOSTAT_FAN_MODE: {
+        Attribute.THERMOSTAT_FAN_MODE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.THERMOSTAT_FAN_MODE,
+                translation_key="thermostat_fan_mode",
+                entity_category=EntityCategory.DIAGNOSTIC,
+                capability_ignore_list=[THERMOSTAT_CAPABILITIES],
+            )
+        ]
+    },
+    # Haven't seen at devices yet
+    Capability.THERMOSTAT_HEATING_SETPOINT: {
+        Attribute.HEATING_SETPOINT: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.HEATING_SETPOINT,
+                translation_key="thermostat_heating_setpoint",
+                device_class=SensorDeviceClass.TEMPERATURE,
+                entity_category=EntityCategory.DIAGNOSTIC,
+                capability_ignore_list=[THERMOSTAT_CAPABILITIES],
+            )
+        ]
+    },
+    # Haven't seen at devices yet
+    Capability.THERMOSTAT_MODE: {
+        Attribute.THERMOSTAT_MODE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.THERMOSTAT_MODE,
+                translation_key="thermostat_mode",
+                entity_category=EntityCategory.DIAGNOSTIC,
+                capability_ignore_list=[THERMOSTAT_CAPABILITIES],
+            )
+        ]
+    },
+    # Haven't seen at devices yet
+    Capability.THERMOSTAT_OPERATING_STATE: {
+        Attribute.THERMOSTAT_OPERATING_STATE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.THERMOSTAT_OPERATING_STATE,
+                translation_key="thermostat_operating_state",
+                capability_ignore_list=[THERMOSTAT_CAPABILITIES],
+            )
+        ]
+    },
+    # deprecated capability
+    Capability.THERMOSTAT_SETPOINT: {
+        Attribute.THERMOSTAT_SETPOINT: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.THERMOSTAT_SETPOINT,
+                translation_key="thermostat_setpoint",
+                device_class=SensorDeviceClass.TEMPERATURE,
+                entity_category=EntityCategory.DIAGNOSTIC,
+            )
+        ]
+    },
+    Capability.THREE_AXIS: {
+        Attribute.THREE_AXIS: [
+            SmartThingsSensorEntityDescription(
+                key="x_coordinate",
+                translation_key="x_coordinate",
+                value_fn=lambda value: value[0],
+            ),
+            SmartThingsSensorEntityDescription(
+                key="y_coordinate",
+                translation_key="y_coordinate",
+                value_fn=lambda value: value[1],
+            ),
+            SmartThingsSensorEntityDescription(
+                key="z_coordinate",
+                translation_key="z_coordinate",
+                value_fn=lambda value: value[2],
+            ),
+        ]
+    },
+    Capability.TV_CHANNEL: {
+        Attribute.TV_CHANNEL: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.TV_CHANNEL,
+                translation_key="tv_channel",
+            )
+        ],
+        Attribute.TV_CHANNEL_NAME: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.TV_CHANNEL_NAME,
+                translation_key="tv_channel_name",
+            )
+        ],
+    },
+    # Haven't seen at devices yet
+    Capability.TVOC_MEASUREMENT: {
+        Attribute.TVOC_LEVEL: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.TVOC_LEVEL,
+                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
+                native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ]
+    },
+    # Haven't seen at devices yet
+    Capability.ULTRAVIOLET_INDEX: {
+        Attribute.ULTRAVIOLET_INDEX: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.ULTRAVIOLET_INDEX,
+                translation_key="uv_index",
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ]
+    },
+    Capability.VERY_FINE_DUST_SENSOR: {
+        Attribute.VERY_FINE_DUST_LEVEL: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.VERY_FINE_DUST_LEVEL,
+                native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+                device_class=SensorDeviceClass.PM1,
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ]
+    },
+    Capability.VOLTAGE_MEASUREMENT: {
+        Attribute.VOLTAGE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.VOLTAGE,
+                device_class=SensorDeviceClass.VOLTAGE,
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+        ]
+    },
+    # part of the proposed spec
+    Capability.WASHER_MODE: {
+        Attribute.WASHER_MODE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.WASHER_MODE,
+                translation_key="washer_mode",
+                entity_category=EntityCategory.DIAGNOSTIC,
+            )
+        ]
+    },
+    Capability.WASHER_OPERATING_STATE: {
+        Attribute.MACHINE_STATE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.MACHINE_STATE,
+                translation_key="washer_machine_state",
+                options=WASHER_OPTIONS,
+                device_class=SensorDeviceClass.ENUM,
+                deprecated=lambda _: "machine_state",
+            )
+        ],
+        Attribute.WASHER_JOB_STATE: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.WASHER_JOB_STATE,
+                translation_key="washer_job_state",
+                options=[
+                    "air_wash",
+                    "ai_rinse",
+                    "ai_spin",
+                    "ai_wash",
+                    "cooling",
+                    "delay_wash",
+                    "drying",
+                    "finish",
+                    "none",
+                    "pre_wash",
+                    "rinse",
+                    "spin",
+                    "wash",
+                    "weight_sensing",
+                    "wrinkle_prevent",
+                    "freeze_protection",
+                ],
+                device_class=SensorDeviceClass.ENUM,
+                value_fn=lambda value: JOB_STATE_MAP.get(value, value),
+            )
+        ],
+        Attribute.COMPLETION_TIME: [
+            SmartThingsSensorEntityDescription(
+                key=Attribute.COMPLETION_TIME,
+                translation_key="completion_time",
+                device_class=SensorDeviceClass.TIMESTAMP,
+                value_fn=dt_util.parse_datetime,
+            )
+        ],
+    },
+}
+
+
 UNITS = {
     "C": UnitOfTemperature.CELSIUS,
     "F": UnitOfTemperature.FAHRENHEIT,
     "lux": LIGHT_LUX,
+    "mG": None,
+    "μg/m^3": CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
 }
 
-THREE_AXIS_NAMES = ["X Coordinate", "Y Coordinate", "Z Coordinate"]
-POWER_CONSUMPTION_REPORT_NAMES = [
-    "energy",
-    "power",
-    "deltaEnergy",
-    "powerEnergy",
-    "energySaved",
-]
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: SmartThingsConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add sensors for a config entry."""
-    broker = hass.data[DOMAIN][DATA_BROKERS][config_entry.entry_id]
-    entities: list[SensorEntity] = []
-    for device in broker.devices.values():
-        for capability in broker.get_assigned(device.device_id, "sensor"):
-            if capability == Capability.three_axis:
-                entities.extend(
-                    [
-                        SmartThingsThreeAxisSensor(device, index)
-                        for index in range(len(THREE_AXIS_NAMES))
-                    ]
-                )
-            elif capability == Capability.power_consumption_report:
-                entities.extend(
-                    [
-                        SmartThingsPowerConsumptionSensor(device, report_name)
-                        for report_name in POWER_CONSUMPTION_REPORT_NAMES
-                    ]
-                )
-            else:
-                maps = CAPABILITY_TO_SENSORS[capability]
-                entities.extend(
-                    [
-                        SmartThingsSensor(
-                            device,
-                            m.attribute,
-                            m.name,
-                            m.default_unit,
-                            m.device_class,
-                            m.state_class,
-                            m.entity_category,
-                        )
-                        for m in maps
-                    ]
-                )
-
-        if broker.any_assigned(device.device_id, "switch"):
-            for capability in (Capability.energy_meter, Capability.power_meter):
-                maps = CAPABILITY_TO_SENSORS[capability]
-                entities.extend(
-                    [
-                        SmartThingsSensor(
-                            device,
-                            m.attribute,
-                            m.name,
-                            m.default_unit,
-                            m.device_class,
-                            m.state_class,
-                            m.entity_category,
-                        )
-                        for m in maps
-                    ]
-                )
-
-    async_add_entities(entities)
-
-
-def get_capabilities(capabilities: Sequence[str]) -> Sequence[str] | None:
-    """Return all capabilities supported if minimum required are present."""
-    return [
-        capability for capability in CAPABILITY_TO_SENSORS if capability in capabilities
-    ]
+    entry_data = entry.runtime_data
+    async_add_entities(
+        SmartThingsSensor(
+            entry_data.client,
+            device,
+            description,
+            capability,
+            attribute,
+        )
+        for device in entry_data.devices.values()
+        for capability, attributes in CAPABILITY_TO_SENSORS.items()
+        if capability in device.status[MAIN]
+        for attribute, descriptions in attributes.items()
+        for description in descriptions
+        if (
+            not description.capability_ignore_list
+            or not any(
+                all(capability in device.status[MAIN] for capability in capability_list)
+                for capability_list in description.capability_ignore_list
+            )
+        )
+        and (
+            not description.exists_fn
+            or description.exists_fn(device.status[MAIN][capability][attribute])
+        )
+    )
 
 
 class SmartThingsSensor(SmartThingsEntity, SensorEntity):
     """Define a SmartThings Sensor."""
 
+    entity_description: SmartThingsSensorEntityDescription
+
     def __init__(
         self,
-        device: DeviceEntity,
-        attribute: str,
-        name: str,
-        default_unit: str | None,
-        device_class: SensorDeviceClass | None,
-        state_class: str | None,
-        entity_category: EntityCategory | None,
+        client: SmartThings,
+        device: FullDevice,
+        entity_description: SmartThingsSensorEntityDescription,
+        capability: Capability,
+        attribute: Attribute,
     ) -> None:
         """Init the class."""
-        super().__init__(device)
+        capabilities_to_subscribe = {capability}
+        if entity_description.use_temperature_unit:
+            capabilities_to_subscribe.add(Capability.TEMPERATURE_MEASUREMENT)
+        super().__init__(client, device, capabilities_to_subscribe)
+        self._attr_unique_id = f"{device.device.device_id}_{MAIN}_{capability}_{attribute}_{entity_description.key}"
         self._attribute = attribute
-        self._attr_name = f"{device.label} {name}"
-        self._attr_unique_id = f"{device.device_id}.{attribute}"
-        self._attr_device_class = device_class
-        self._default_unit = default_unit
-        self._attr_state_class = state_class
-        self._attr_entity_category = entity_category
+        self.capability = capability
+        self.entity_description = entity_description
 
     @property
-    def native_value(self):
+    def native_value(self) -> str | float | datetime | int | None:
         """Return the state of the sensor."""
-        value = self._device.status.attributes[self._attribute].value
-
-        if self.device_class != SensorDeviceClass.TIMESTAMP:
-            return value
-
-        return dt_util.parse_datetime(value)
+        res = self.get_attribute_value(self.capability, self._attribute)
+        return self.entity_description.value_fn(res)
 
     @property
-    def native_unit_of_measurement(self):
+    def native_unit_of_measurement(self) -> str | None:
         """Return the unit this state is expressed in."""
-        unit = self._device.status.attributes[self._attribute].unit
-        return UNITS.get(unit, unit) if unit else self._default_unit
-
-
-class SmartThingsThreeAxisSensor(SmartThingsEntity, SensorEntity):
-    """Define a SmartThings Three Axis Sensor."""
-
-    def __init__(self, device, index):
-        """Init the class."""
-        super().__init__(device)
-        self._index = index
-        self._attr_name = f"{device.label} {THREE_AXIS_NAMES[index]}"
-        self._attr_unique_id = f"{device.device_id} {THREE_AXIS_NAMES[index]}"
-
-    @property
-    def native_value(self):
-        """Return the state of the sensor."""
-        three_axis = self._device.status.attributes[Attribute.three_axis].value
-        try:
-            return three_axis[self._index]
-        except (TypeError, IndexError):
-            return None
-
-
-class SmartThingsPowerConsumptionSensor(SmartThingsEntity, SensorEntity):
-    """Define a SmartThings Sensor."""
-
-    def __init__(
-        self,
-        device: DeviceEntity,
-        report_name: str,
-    ) -> None:
-        """Init the class."""
-        super().__init__(device)
-        self.report_name = report_name
-        self._attr_name = f"{device.label} {report_name}"
-        self._attr_unique_id = f"{device.device_id}.{report_name}_meter"
-        if self.report_name == "power":
-            self._attr_state_class = SensorStateClass.MEASUREMENT
-            self._attr_device_class = SensorDeviceClass.POWER
-            self._attr_native_unit_of_measurement = UnitOfPower.WATT
+        if self.entity_description.use_temperature_unit:
+            unit = self._internal_state[Capability.TEMPERATURE_MEASUREMENT][
+                Attribute.TEMPERATURE
+            ].unit
         else:
-            self._attr_state_class = SensorStateClass.TOTAL_INCREASING
-            self._attr_device_class = SensorDeviceClass.ENERGY
-            self._attr_native_unit_of_measurement = UnitOfEnergy.KILO_WATT_HOUR
+            unit = self._internal_state[self.capability][self._attribute].unit
+        return (
+            UNITS.get(unit, unit)
+            if unit
+            else self.entity_description.native_unit_of_measurement
+        )
 
     @property
-    def native_value(self):
-        """Return the state of the sensor."""
-        value = self._device.status.attributes[Attribute.power_consumption].value
-        if value is None or value.get(self.report_name) is None:
-            return None
-        if self.report_name == "power":
-            return value[self.report_name]
-        return value[self.report_name] / 1000
-
-    @property
-    def extra_state_attributes(self):
-        """Return specific state attributes."""
-        if self.report_name == "power":
-            attributes = [
-                "power_consumption_start",
-                "power_consumption_end",
-            ]
-            state_attributes = {}
-            for attribute in attributes:
-                value = getattr(self._device.status, attribute)
-                if value is not None:
-                    state_attributes[attribute] = value
-            return state_attributes
+    def extra_state_attributes(self) -> Mapping[str, Any] | None:
+        """Return the state attributes."""
+        if self.entity_description.extra_state_attributes_fn:
+            return self.entity_description.extra_state_attributes_fn(
+                self.get_attribute_value(self.capability, self._attribute)
+            )
         return None
+
+    @property
+    def options(self) -> list[str] | None:
+        """Return the options for this sensor."""
+        if self.entity_description.options_attribute:
+            if (
+                options := self.get_attribute_value(
+                    self.capability, self.entity_description.options_attribute
+                )
+            ) is None:
+                return []
+            return [option.lower() for option in options]
+        return super().options
+
+    async def async_added_to_hass(self) -> None:
+        """Call when entity is added to hass."""
+        await super().async_added_to_hass()
+        if (
+            not self.entity_description.deprecated
+            or (reason := self.entity_description.deprecated(self.device.status[MAIN]))
+            is None
+        ):
+            return
+        automations = automations_with_entity(self.hass, self.entity_id)
+        scripts = scripts_with_entity(self.hass, self.entity_id)
+        if not automations and not scripts:
+            return
+
+        entity_reg: er.EntityRegistry = er.async_get(self.hass)
+        items_list = [
+            f"- [{item.original_name}](/config/{integration}/edit/{item.unique_id})"
+            for integration, entities in (
+                ("automation", automations),
+                ("script", scripts),
+            )
+            for entity_id in entities
+            if (item := entity_reg.async_get(entity_id))
+        ]
+
+        async_create_issue(
+            self.hass,
+            DOMAIN,
+            f"deprecated_{reason}_{self.entity_id}",
+            breaks_in_ha_version="2025.10.0",
+            is_fixable=False,
+            severity=IssueSeverity.WARNING,
+            translation_key=f"deprecated_{reason}",
+            translation_placeholders={
+                "entity": self.entity_id,
+                "items": "\n".join(items_list),
+            },
+        )
+
+    async def async_will_remove_from_hass(self) -> None:
+        """Call when entity will be removed from hass."""
+        await super().async_will_remove_from_hass()
+        if (
+            not self.entity_description.deprecated
+            or (reason := self.entity_description.deprecated(self.device.status[MAIN]))
+            is None
+        ):
+            return
+        async_delete_issue(self.hass, DOMAIN, f"deprecated_{reason}_{self.entity_id}")
diff --git a/homeassistant/components/smartthings/smartapp.py b/homeassistant/components/smartthings/smartapp.py
deleted file mode 100644
index 76b6804075f..00000000000
--- a/homeassistant/components/smartthings/smartapp.py
+++ /dev/null
@@ -1,545 +0,0 @@
-"""SmartApp functionality to receive cloud-push notifications."""
-
-from __future__ import annotations
-
-import asyncio
-import functools
-import logging
-import secrets
-from typing import Any
-from urllib.parse import urlparse
-from uuid import uuid4
-
-from aiohttp import web
-from pysmartapp import Dispatcher, SmartAppManager
-from pysmartapp.const import SETTINGS_APP_ID
-from pysmartthings import (
-    APP_TYPE_WEBHOOK,
-    CAPABILITIES,
-    CLASSIFICATION_AUTOMATION,
-    App,
-    AppEntity,
-    AppOAuth,
-    AppSettings,
-    InstalledAppStatus,
-    SmartThings,
-    SourceType,
-    Subscription,
-    SubscriptionEntity,
-)
-
-from homeassistant.components import cloud, webhook
-from homeassistant.config_entries import ConfigFlowResult
-from homeassistant.const import CONF_WEBHOOK_ID
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.dispatcher import (
-    async_dispatcher_connect,
-    async_dispatcher_send,
-)
-from homeassistant.helpers.network import NoURLAvailableError, get_url
-from homeassistant.helpers.storage import Store
-
-from .const import (
-    APP_NAME_PREFIX,
-    APP_OAUTH_CLIENT_NAME,
-    APP_OAUTH_SCOPES,
-    CONF_CLOUDHOOK_URL,
-    CONF_INSTALLED_APP_ID,
-    CONF_INSTANCE_ID,
-    CONF_REFRESH_TOKEN,
-    DATA_BROKERS,
-    DATA_MANAGER,
-    DOMAIN,
-    IGNORED_CAPABILITIES,
-    SETTINGS_INSTANCE_ID,
-    SIGNAL_SMARTAPP_PREFIX,
-    STORAGE_KEY,
-    STORAGE_VERSION,
-    SUBSCRIPTION_WARNING_LIMIT,
-)
-
-_LOGGER = logging.getLogger(__name__)
-
-
-def format_unique_id(app_id: str, location_id: str) -> str:
-    """Format the unique id for a config entry."""
-    return f"{app_id}_{location_id}"
-
-
-async def find_app(hass: HomeAssistant, api: SmartThings) -> AppEntity | None:
-    """Find an existing SmartApp for this installation of hass."""
-    apps = await api.apps()
-    for app in [app for app in apps if app.app_name.startswith(APP_NAME_PREFIX)]:
-        # Load settings to compare instance id
-        settings = await app.settings()
-        if (
-            settings.settings.get(SETTINGS_INSTANCE_ID)
-            == hass.data[DOMAIN][CONF_INSTANCE_ID]
-        ):
-            return app
-    return None
-
-
-async def validate_installed_app(api, installed_app_id: str):
-    """Ensure the specified installed SmartApp is valid and functioning.
-
-    Query the API for the installed SmartApp and validate that it is tied to
-    the specified app_id and is in an authorized state.
-    """
-    installed_app = await api.installed_app(installed_app_id)
-    if installed_app.installed_app_status != InstalledAppStatus.AUTHORIZED:
-        raise RuntimeWarning(
-            f"Installed SmartApp instance '{installed_app.display_name}' "
-            f"({installed_app.installed_app_id}) is not AUTHORIZED "
-            f"but instead {installed_app.installed_app_status}"
-        )
-    return installed_app
-
-
-def validate_webhook_requirements(hass: HomeAssistant) -> bool:
-    """Ensure Home Assistant is setup properly to receive webhooks."""
-    if cloud.async_active_subscription(hass):
-        return True
-    if hass.data[DOMAIN][CONF_CLOUDHOOK_URL] is not None:
-        return True
-    return get_webhook_url(hass).lower().startswith("https://")
-
-
-def get_webhook_url(hass: HomeAssistant) -> str:
-    """Get the URL of the webhook.
-
-    Return the cloudhook if available, otherwise local webhook.
-    """
-    cloudhook_url = hass.data[DOMAIN][CONF_CLOUDHOOK_URL]
-    if cloud.async_active_subscription(hass) and cloudhook_url is not None:
-        return cloudhook_url
-    return webhook.async_generate_url(hass, hass.data[DOMAIN][CONF_WEBHOOK_ID])
-
-
-def _get_app_template(hass: HomeAssistant):
-    try:
-        endpoint = f"at {get_url(hass, allow_cloud=False, prefer_external=True)}"
-    except NoURLAvailableError:
-        endpoint = ""
-
-    cloudhook_url = hass.data[DOMAIN][CONF_CLOUDHOOK_URL]
-    if cloudhook_url is not None:
-        endpoint = "via Nabu Casa"
-    description = f"{hass.config.location_name} {endpoint}"
-
-    return {
-        "app_name": APP_NAME_PREFIX + str(uuid4()),
-        "display_name": "Home Assistant",
-        "description": description,
-        "webhook_target_url": get_webhook_url(hass),
-        "app_type": APP_TYPE_WEBHOOK,
-        "single_instance": True,
-        "classifications": [CLASSIFICATION_AUTOMATION],
-    }
-
-
-async def create_app(hass: HomeAssistant, api):
-    """Create a SmartApp for this instance of hass."""
-    # Create app from template attributes
-    template = _get_app_template(hass)
-    app = App()
-    for key, value in template.items():
-        setattr(app, key, value)
-    app, client = await api.create_app(app)
-    _LOGGER.debug("Created SmartApp '%s' (%s)", app.app_name, app.app_id)
-
-    # Set unique hass id in settings
-    settings = AppSettings(app.app_id)
-    settings.settings[SETTINGS_APP_ID] = app.app_id
-    settings.settings[SETTINGS_INSTANCE_ID] = hass.data[DOMAIN][CONF_INSTANCE_ID]
-    await api.update_app_settings(settings)
-    _LOGGER.debug(
-        "Updated App Settings for SmartApp '%s' (%s)", app.app_name, app.app_id
-    )
-
-    # Set oauth scopes
-    oauth = AppOAuth(app.app_id)
-    oauth.client_name = APP_OAUTH_CLIENT_NAME
-    oauth.scope.extend(APP_OAUTH_SCOPES)
-    await api.update_app_oauth(oauth)
-    _LOGGER.debug("Updated App OAuth for SmartApp '%s' (%s)", app.app_name, app.app_id)
-    return app, client
-
-
-async def update_app(hass: HomeAssistant, app):
-    """Ensure the SmartApp is up-to-date and update if necessary."""
-    template = _get_app_template(hass)
-    template.pop("app_name")  # don't update this
-    update_required = False
-    for key, value in template.items():
-        if getattr(app, key) != value:
-            update_required = True
-            setattr(app, key, value)
-    if update_required:
-        await app.save()
-        _LOGGER.debug(
-            "SmartApp '%s' (%s) updated with latest settings", app.app_name, app.app_id
-        )
-
-
-def setup_smartapp(hass, app):
-    """Configure an individual SmartApp in hass.
-
-    Register the SmartApp with the SmartAppManager so that hass will service
-    lifecycle events (install, event, etc...).  A unique SmartApp is created
-    for each SmartThings account that is configured in hass.
-    """
-    manager = hass.data[DOMAIN][DATA_MANAGER]
-    if smartapp := manager.smartapps.get(app.app_id):
-        # already setup
-        return smartapp
-    smartapp = manager.register(app.app_id, app.webhook_public_key)
-    smartapp.name = app.display_name
-    smartapp.description = app.description
-    smartapp.permissions.extend(APP_OAUTH_SCOPES)
-    return smartapp
-
-
-async def setup_smartapp_endpoint(hass: HomeAssistant, fresh_install: bool):
-    """Configure the SmartApp webhook in hass.
-
-    SmartApps are an extension point within the SmartThings ecosystem and
-    is used to receive push updates (i.e. device updates) from the cloud.
-    """
-    if hass.data.get(DOMAIN):
-        # already setup
-        if not fresh_install:
-            return
-
-        # We're doing a fresh install, clean up
-        await unload_smartapp_endpoint(hass)
-
-    # Get/create config to store a unique id for this hass instance.
-    store = Store[dict[str, Any]](hass, STORAGE_VERSION, STORAGE_KEY)
-
-    if fresh_install or not (config := await store.async_load()):
-        # Create config
-        config = {
-            CONF_INSTANCE_ID: str(uuid4()),
-            CONF_WEBHOOK_ID: secrets.token_hex(),
-            CONF_CLOUDHOOK_URL: None,
-        }
-        await store.async_save(config)
-
-    # Register webhook
-    webhook.async_register(
-        hass, DOMAIN, "SmartApp", config[CONF_WEBHOOK_ID], smartapp_webhook
-    )
-
-    # Create webhook if eligible
-    cloudhook_url = config.get(CONF_CLOUDHOOK_URL)
-    if (
-        cloudhook_url is None
-        and cloud.async_active_subscription(hass)
-        and not hass.config_entries.async_entries(DOMAIN)
-    ):
-        cloudhook_url = await cloud.async_create_cloudhook(
-            hass, config[CONF_WEBHOOK_ID]
-        )
-        config[CONF_CLOUDHOOK_URL] = cloudhook_url
-        await store.async_save(config)
-        _LOGGER.debug("Created cloudhook '%s'", cloudhook_url)
-
-    # SmartAppManager uses a dispatcher to invoke callbacks when push events
-    # occur. Use hass' implementation instead of the built-in one.
-    dispatcher = Dispatcher(
-        signal_prefix=SIGNAL_SMARTAPP_PREFIX,
-        connect=functools.partial(async_dispatcher_connect, hass),
-        send=functools.partial(async_dispatcher_send, hass),
-    )
-    # Path is used in digital signature validation
-    path = (
-        urlparse(cloudhook_url).path
-        if cloudhook_url
-        else webhook.async_generate_path(config[CONF_WEBHOOK_ID])
-    )
-    manager = SmartAppManager(path, dispatcher=dispatcher)
-    manager.connect_install(functools.partial(smartapp_install, hass))
-    manager.connect_update(functools.partial(smartapp_update, hass))
-    manager.connect_uninstall(functools.partial(smartapp_uninstall, hass))
-
-    hass.data[DOMAIN] = {
-        DATA_MANAGER: manager,
-        CONF_INSTANCE_ID: config[CONF_INSTANCE_ID],
-        DATA_BROKERS: {},
-        CONF_WEBHOOK_ID: config[CONF_WEBHOOK_ID],
-        # Will not be present if not enabled
-        CONF_CLOUDHOOK_URL: config.get(CONF_CLOUDHOOK_URL),
-    }
-    _LOGGER.debug(
-        "Setup endpoint for %s",
-        cloudhook_url
-        if cloudhook_url
-        else webhook.async_generate_url(hass, config[CONF_WEBHOOK_ID]),
-    )
-
-
-async def unload_smartapp_endpoint(hass: HomeAssistant):
-    """Tear down the component configuration."""
-    if DOMAIN not in hass.data:
-        return
-    # Remove the cloudhook if it was created
-    cloudhook_url = hass.data[DOMAIN][CONF_CLOUDHOOK_URL]
-    if cloudhook_url and cloud.async_is_logged_in(hass):
-        await cloud.async_delete_cloudhook(hass, hass.data[DOMAIN][CONF_WEBHOOK_ID])
-        # Remove cloudhook from storage
-        store = Store[dict[str, Any]](hass, STORAGE_VERSION, STORAGE_KEY)
-        await store.async_save(
-            {
-                CONF_INSTANCE_ID: hass.data[DOMAIN][CONF_INSTANCE_ID],
-                CONF_WEBHOOK_ID: hass.data[DOMAIN][CONF_WEBHOOK_ID],
-                CONF_CLOUDHOOK_URL: None,
-            }
-        )
-        _LOGGER.debug("Cloudhook '%s' was removed", cloudhook_url)
-    # Remove the webhook
-    webhook.async_unregister(hass, hass.data[DOMAIN][CONF_WEBHOOK_ID])
-    # Disconnect all brokers
-    for broker in hass.data[DOMAIN][DATA_BROKERS].values():
-        broker.disconnect()
-    # Remove all handlers from manager
-    hass.data[DOMAIN][DATA_MANAGER].dispatcher.disconnect_all()
-    # Remove the component data
-    hass.data.pop(DOMAIN)
-
-
-async def smartapp_sync_subscriptions(
-    hass: HomeAssistant,
-    auth_token: str,
-    location_id: str,
-    installed_app_id: str,
-    devices,
-):
-    """Synchronize subscriptions of an installed up."""
-    api = SmartThings(async_get_clientsession(hass), auth_token)
-    tasks = []
-
-    async def create_subscription(target: str):
-        sub = Subscription()
-        sub.installed_app_id = installed_app_id
-        sub.location_id = location_id
-        sub.source_type = SourceType.CAPABILITY
-        sub.capability = target
-        try:
-            await api.create_subscription(sub)
-            _LOGGER.debug(
-                "Created subscription for '%s' under app '%s'", target, installed_app_id
-            )
-        except Exception as error:  # noqa: BLE001
-            _LOGGER.error(
-                "Failed to create subscription for '%s' under app '%s': %s",
-                target,
-                installed_app_id,
-                error,
-            )
-
-    async def delete_subscription(sub: SubscriptionEntity):
-        try:
-            await api.delete_subscription(installed_app_id, sub.subscription_id)
-            _LOGGER.debug(
-                (
-                    "Removed subscription for '%s' under app '%s' because it was no"
-                    " longer needed"
-                ),
-                sub.capability,
-                installed_app_id,
-            )
-        except Exception as error:  # noqa: BLE001
-            _LOGGER.error(
-                "Failed to remove subscription for '%s' under app '%s': %s",
-                sub.capability,
-                installed_app_id,
-                error,
-            )
-
-    # Build set of capabilities and prune unsupported ones
-    capabilities = set()
-    for device in devices:
-        capabilities.update(device.capabilities)
-    # Remove items not defined in the library
-    capabilities.intersection_update(CAPABILITIES)
-    # Remove unused capabilities
-    capabilities.difference_update(IGNORED_CAPABILITIES)
-    capability_count = len(capabilities)
-    if capability_count > SUBSCRIPTION_WARNING_LIMIT:
-        _LOGGER.warning(
-            (
-                "Some device attributes may not receive push updates and there may be"
-                " subscription creation failures under app '%s' because %s"
-                " subscriptions are required but there is a limit of %s per app"
-            ),
-            installed_app_id,
-            capability_count,
-            SUBSCRIPTION_WARNING_LIMIT,
-        )
-    _LOGGER.debug(
-        "Synchronizing subscriptions for %s capabilities under app '%s': %s",
-        capability_count,
-        installed_app_id,
-        capabilities,
-    )
-
-    # Get current subscriptions and find differences
-    subscriptions = await api.subscriptions(installed_app_id)
-    for subscription in subscriptions:
-        if subscription.capability in capabilities:
-            capabilities.remove(subscription.capability)
-        else:
-            # Delete the subscription
-            tasks.append(delete_subscription(subscription))
-
-    # Remaining capabilities need subscriptions created
-    tasks.extend([create_subscription(c) for c in capabilities])
-
-    if tasks:
-        await asyncio.gather(*tasks)
-    else:
-        _LOGGER.debug("Subscriptions for app '%s' are up-to-date", installed_app_id)
-
-
-async def _find_and_continue_flow(
-    hass: HomeAssistant,
-    app_id: str,
-    location_id: str,
-    installed_app_id: str,
-    refresh_token: str,
-):
-    """Continue a config flow if one is in progress for the specific installed app."""
-    unique_id = format_unique_id(app_id, location_id)
-    flow = next(
-        (
-            flow
-            for flow in hass.config_entries.flow.async_progress_by_handler(DOMAIN)
-            if flow["context"].get("unique_id") == unique_id
-        ),
-        None,
-    )
-    if flow is not None:
-        await _continue_flow(hass, app_id, installed_app_id, refresh_token, flow)
-
-
-async def _continue_flow(
-    hass: HomeAssistant,
-    app_id: str,
-    installed_app_id: str,
-    refresh_token: str,
-    flow: ConfigFlowResult,
-) -> None:
-    await hass.config_entries.flow.async_configure(
-        flow["flow_id"],
-        {
-            CONF_INSTALLED_APP_ID: installed_app_id,
-            CONF_REFRESH_TOKEN: refresh_token,
-        },
-    )
-    _LOGGER.debug(
-        "Continued config flow '%s' for SmartApp '%s' under parent app '%s'",
-        flow["flow_id"],
-        installed_app_id,
-        app_id,
-    )
-
-
-async def smartapp_install(hass: HomeAssistant, req, resp, app):
-    """Handle a SmartApp installation and continue the config flow."""
-    await _find_and_continue_flow(
-        hass, app.app_id, req.location_id, req.installed_app_id, req.refresh_token
-    )
-    _LOGGER.debug(
-        "Installed SmartApp '%s' under parent app '%s'",
-        req.installed_app_id,
-        app.app_id,
-    )
-
-
-async def smartapp_update(hass: HomeAssistant, req, resp, app):
-    """Handle a SmartApp update and either update the entry or continue the flow."""
-    unique_id = format_unique_id(app.app_id, req.location_id)
-    flow = next(
-        (
-            flow
-            for flow in hass.config_entries.flow.async_progress_by_handler(DOMAIN)
-            if flow["context"].get("unique_id") == unique_id
-            and flow["step_id"] == "authorize"
-        ),
-        None,
-    )
-    if flow is not None:
-        await _continue_flow(
-            hass, app.app_id, req.installed_app_id, req.refresh_token, flow
-        )
-        _LOGGER.debug(
-            "Continued reauth flow '%s' for SmartApp '%s' under parent app '%s'",
-            flow["flow_id"],
-            req.installed_app_id,
-            app.app_id,
-        )
-        return
-    entry = next(
-        (
-            entry
-            for entry in hass.config_entries.async_entries(DOMAIN)
-            if entry.data.get(CONF_INSTALLED_APP_ID) == req.installed_app_id
-        ),
-        None,
-    )
-    if entry:
-        hass.config_entries.async_update_entry(
-            entry, data={**entry.data, CONF_REFRESH_TOKEN: req.refresh_token}
-        )
-        _LOGGER.debug(
-            "Updated config entry '%s' for SmartApp '%s' under parent app '%s'",
-            entry.entry_id,
-            req.installed_app_id,
-            app.app_id,
-        )
-
-    await _find_and_continue_flow(
-        hass, app.app_id, req.location_id, req.installed_app_id, req.refresh_token
-    )
-    _LOGGER.debug(
-        "Updated SmartApp '%s' under parent app '%s'", req.installed_app_id, app.app_id
-    )
-
-
-async def smartapp_uninstall(hass: HomeAssistant, req, resp, app):
-    """Handle when a SmartApp is removed from a location by the user.
-
-    Find and delete the config entry representing the integration.
-    """
-    entry = next(
-        (
-            entry
-            for entry in hass.config_entries.async_entries(DOMAIN)
-            if entry.data.get(CONF_INSTALLED_APP_ID) == req.installed_app_id
-        ),
-        None,
-    )
-    if entry:
-        # Add as job not needed because the current coroutine was invoked
-        # from the dispatcher and is not being awaited.
-        await hass.config_entries.async_remove(entry.entry_id)
-
-    _LOGGER.debug(
-        "Uninstalled SmartApp '%s' under parent app '%s'",
-        req.installed_app_id,
-        app.app_id,
-    )
-
-
-async def smartapp_webhook(hass: HomeAssistant, webhook_id: str, request):
-    """Handle a smartapp lifecycle event callback from SmartThings.
-
-    Requests from SmartThings are digitally signed and the SmartAppManager
-    validates the signature for authenticity.
-    """
-    manager = hass.data[DOMAIN][DATA_MANAGER]
-    data = await request.json()
-    result = await manager.handle_request(data, request.headers)
-    return web.json_response(result)
diff --git a/homeassistant/components/smartthings/strings.json b/homeassistant/components/smartthings/strings.json
index 31a552be149..e4cf03178fd 100644
--- a/homeassistant/components/smartthings/strings.json
+++ b/homeassistant/components/smartthings/strings.json
@@ -1,43 +1,507 @@
 {
   "config": {
     "step": {
-      "user": {
-        "title": "Confirm Callback URL",
-        "description": "SmartThings will be configured to send push updates to Home Assistant at:\n> {webhook_url}\n\nIf this is not correct, please update your configuration, restart Home Assistant, and try again."
+      "pick_implementation": {
+        "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]"
       },
-      "pat": {
-        "title": "Enter Personal Access Token",
-        "description": "Please enter a SmartThings [Personal Access Token]({token_url}) that has been created per the [instructions]({component_url}). This will be used to create the Home Assistant integration within your SmartThings account.\n\n**Please note that all Personal Access Tokens created after 30 December 2024 are only valid for 24 hours, after which the integration will stop working. We are working on a fix.**",
-        "data": {
-          "access_token": "[%key:common::config_flow::data::access_token%]"
-        }
-      },
-      "select_location": {
-        "title": "Select Location",
-        "description": "Please select the SmartThings Location you wish to add to Home Assistant. We will then open a new window and ask you to login and authorize installation of the Home Assistant integration into the selected location.",
-        "data": { "location_id": "[%key:common::config_flow::data::location%]" }
-      },
-      "authorize": { "title": "Authorize Home Assistant" },
       "reauth_confirm": {
-        "title": "Reauthorize Home Assistant",
-        "description": "You are about to reauthorize Home Assistant with SmartThings. This will require you to log in and authorize the integration again."
-      },
-      "update_confirm": {
-        "title": "Finish reauthentication",
-        "description": "You have almost successfully reauthorized Home Assistant with SmartThings. Please press the button down below to finish the process."
+        "title": "[%key:common::config_flow::title::reauth%]",
+        "description": "The SmartThings integration needs to re-authenticate your account"
       }
     },
-    "abort": {
-      "invalid_webhook_url": "Home Assistant is not configured correctly to receive updates from SmartThings. The webhook URL is invalid:\n> {webhook_url}\n\nPlease update your configuration per the [instructions]({component_url}), restart Home Assistant, and try again.",
-      "no_available_locations": "There are no available SmartThings Locations to set up in Home Assistant.",
-      "reauth_successful": "Home Assistant has been successfully reauthorized with SmartThings."
-    },
     "error": {
-      "token_invalid_format": "The token must be in the UID/GUID format",
-      "token_unauthorized": "The token is invalid or no longer authorized.",
-      "token_forbidden": "The token does not have the required OAuth scopes.",
-      "app_setup_error": "Unable to set up the SmartApp. Please try again.",
-      "webhook_error": "SmartThings could not validate the webhook URL. Please ensure the webhook URL is reachable from the internet and try again."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
+    },
+    "abort": {
+      "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
+      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
+      "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]",
+      "oauth_error": "[%key:common::config_flow::abort::oauth2_error%]",
+      "oauth_timeout": "[%key:common::config_flow::abort::oauth2_timeout%]",
+      "oauth_unauthorized": "[%key:common::config_flow::abort::oauth2_unauthorized%]",
+      "oauth_failed": "[%key:common::config_flow::abort::oauth2_failed%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+      "reauth_account_mismatch": "Authenticated account does not match the account to be reauthenticated. Please log in with the correct account and pick the right location.",
+      "reauth_location_mismatch": "Authenticated location does not match the location to be reauthenticated. Please log in with the correct account and pick the right location.",
+      "missing_scopes": "Authentication failed. Please make sure you have granted all required permissions.",
+      "cloud_not_enabled": "Please make sure you run Home Assistant with `{default_config}` enabled in your configuration.yaml."
+    }
+  },
+  "entity": {
+    "binary_sensor": {
+      "acceleration": {
+        "name": "Acceleration"
+      },
+      "door": {
+        "name": "[%key:component::binary_sensor::entity_component::door::name%]"
+      },
+      "dryer_wrinkle_prevent_active": {
+        "name": "Wrinkle prevent active"
+      },
+      "filter_status": {
+        "name": "Filter status"
+      },
+      "freezer_door": {
+        "name": "Freezer door"
+      },
+      "cooler_door": {
+        "name": "Cooler door"
+      },
+      "remote_control": {
+        "name": "Remote control"
+      },
+      "child_lock": {
+        "name": "Child lock"
+      },
+      "valve": {
+        "name": "Valve"
+      }
+    },
+    "button": {
+      "reset_water_filter": {
+        "name": "Reset water filter"
+      },
+      "stop": {
+        "name": "[%key:common::action::stop%]"
+      }
+    },
+    "event": {
+      "button": {
+        "state": {
+          "pushed": "Pushed",
+          "held": "Held",
+          "double": "Double",
+          "pushed_2x": "Pushed 2x",
+          "pushed_3x": "Pushed 3x",
+          "pushed_4x": "Pushed 4x",
+          "pushed_5x": "Pushed 5x",
+          "pushed_6x": "Pushed 6x",
+          "down": "Down",
+          "down_2x": "Down 2x",
+          "down_3x": "Down 3x",
+          "down_4x": "Down 4x",
+          "down_5x": "Down 5x",
+          "down_6x": "Down 6x",
+          "down_hold": "Down hold",
+          "up": "Up",
+          "up_2x": "Up 2x",
+          "up_3x": "Up 3x",
+          "up_4x": "Up 4x",
+          "up_5x": "Up 5x",
+          "up_6x": "Up 6x",
+          "up_hold": "Up hold",
+          "swipe_up": "Swipe up",
+          "swipe_down": "Swipe down",
+          "swipe_left": "Swipe left",
+          "swipe_right": "Swipe right"
+        }
+      }
+    },
+    "number": {
+      "washer_rinse_cycles": {
+        "name": "Rinse cycles",
+        "unit_of_measurement": "cycles"
+      }
+    },
+    "select": {
+      "operating_state": {
+        "state": {
+          "run": "[%key:component::smartthings::entity::sensor::dishwasher_machine_state::state::run%]",
+          "pause": "[%key:common::state::paused%]",
+          "stop": "[%key:component::smartthings::entity::sensor::dishwasher_machine_state::state::stop%]"
+        }
+      }
+    },
+    "sensor": {
+      "lighting_mode": {
+        "name": "Activity lighting mode"
+      },
+      "air_conditioner_mode": {
+        "name": "Air conditioner mode"
+      },
+      "air_quality": {
+        "name": "Air quality"
+      },
+      "alarm": {
+        "name": "Alarm",
+        "state": {
+          "both": "Strobe and siren",
+          "strobe": "Strobe",
+          "siren": "Siren",
+          "off": "[%key:common::state::off%]"
+        }
+      },
+      "audio_volume": {
+        "name": "Volume"
+      },
+      "body_mass_index": {
+        "name": "Body mass index"
+      },
+      "body_weight": {
+        "name": "Body weight"
+      },
+      "carbon_monoxide_detector": {
+        "name": "Carbon monoxide detector",
+        "state": {
+          "detected": "Detected",
+          "clear": "Clear",
+          "tested": "Tested"
+        }
+      },
+      "dishwasher_machine_state": {
+        "name": "Machine state",
+        "state": {
+          "pause": "[%key:common::state::paused%]",
+          "run": "Running",
+          "stop": "Stopped"
+        }
+      },
+      "dishwasher_job_state": {
+        "name": "Job state",
+        "state": {
+          "air_wash": "Air wash",
+          "cooling": "Cooling",
+          "drying": "Drying",
+          "finish": "Finish",
+          "pre_drain": "Pre-drain",
+          "pre_wash": "Pre-wash",
+          "rinse": "Rinse",
+          "spin": "Spin",
+          "wash": "Wash",
+          "wrinkle_prevent": "Wrinkle prevention"
+        }
+      },
+      "completion_time": {
+        "name": "Completion time"
+      },
+      "dryer_mode": {
+        "name": "Dryer mode"
+      },
+      "dryer_machine_state": {
+        "name": "[%key:component::smartthings::entity::sensor::dishwasher_machine_state::name%]",
+        "state": {
+          "pause": "[%key:common::state::paused%]",
+          "run": "[%key:component::smartthings::entity::sensor::dishwasher_machine_state::state::run%]",
+          "stop": "[%key:component::smartthings::entity::sensor::dishwasher_machine_state::state::stop%]"
+        }
+      },
+      "dryer_job_state": {
+        "name": "[%key:component::smartthings::entity::sensor::dishwasher_job_state::name%]",
+        "state": {
+          "cooling": "[%key:component::smartthings::entity::sensor::dishwasher_job_state::state::cooling%]",
+          "delay_wash": "[%key:component::smartthings::entity::sensor::washer_job_state::state::delay_wash%]",
+          "drying": "[%key:component::smartthings::entity::sensor::dishwasher_job_state::state::drying%]",
+          "finished": "[%key:component::smartthings::entity::sensor::oven_job_state::state::finished%]",
+          "none": "[%key:component::smartthings::entity::sensor::washer_job_state::state::none%]",
+          "refreshing": "Refreshing",
+          "weight_sensing": "[%key:component::smartthings::entity::sensor::washer_job_state::state::weight_sensing%]",
+          "wrinkle_prevent": "[%key:component::smartthings::entity::sensor::dishwasher_job_state::state::wrinkle_prevent%]",
+          "dehumidifying": "Dehumidifying",
+          "ai_drying": "AI drying",
+          "sanitizing": "Sanitizing",
+          "internal_care": "Internal care",
+          "freeze_protection": "Freeze protection",
+          "continuous_dehumidifying": "Continuous dehumidifying",
+          "thawing_frozen_inside": "Thawing frozen inside"
+        }
+      },
+      "equivalent_carbon_dioxide": {
+        "name": "Equivalent carbon dioxide"
+      },
+      "formaldehyde": {
+        "name": "Formaldehyde"
+      },
+      "gas_meter": {
+        "name": "Gas meter"
+      },
+      "gas_meter_calorific": {
+        "name": "Gas meter calorific"
+      },
+      "gas_meter_time": {
+        "name": "Gas meter time"
+      },
+      "infrared_level": {
+        "name": "Infrared level"
+      },
+      "media_input_source": {
+        "name": "Media input source",
+        "state": {
+          "am": "AM",
+          "fm": "FM",
+          "cd": "CD",
+          "hdmi": "HDMI",
+          "hdmi1": "HDMI 1",
+          "hdmi2": "HDMI 2",
+          "hdmi3": "HDMI 3",
+          "hdmi4": "HDMI 4",
+          "hdmi5": "HDMI 5",
+          "hdmi6": "HDMI 6",
+          "digitaltv": "Digital TV",
+          "usb": "USB",
+          "youtube": "YouTube",
+          "aux": "AUX",
+          "bluetooth": "Bluetooth",
+          "digital": "Digital",
+          "melon": "Melon",
+          "wifi": "Wi-Fi",
+          "network": "Network",
+          "optical": "Optical",
+          "coaxial": "Coaxial",
+          "analog1": "Analog 1",
+          "analog2": "Analog 2",
+          "analog3": "Analog 3",
+          "phono": "Phono"
+        }
+      },
+      "media_playback_repeat": {
+        "name": "Media playback repeat"
+      },
+      "media_playback_shuffle": {
+        "name": "Media playback shuffle"
+      },
+      "media_playback_status": {
+        "name": "Media playback status"
+      },
+      "odor_sensor": {
+        "name": "Odor sensor"
+      },
+      "oven_mode": {
+        "name": "Oven mode",
+        "state": {
+          "heating": "Heating",
+          "grill": "Grill",
+          "warming": "Warming",
+          "defrosting": "Defrosting",
+          "conventional": "Conventional",
+          "bake": "Bake",
+          "bottom_heat": "Bottom heat",
+          "convection_bake": "Convection bake",
+          "convection_roast": "Convection roast",
+          "broil": "Broil",
+          "convection_broil": "Convection broil",
+          "steam_cook": "Steam cook",
+          "steam_bake": "Steam bake",
+          "steam_roast": "Steam roast",
+          "steam_bottom_heat_plus_convection": "Steam bottom heat plus convection",
+          "microwave": "Microwave",
+          "microwave_plus_grill": "Microwave plus grill",
+          "microwave_plus_convection": "Microwave plus convection",
+          "microwave_plus_hot_blast": "Microwave plus hot blast",
+          "microwave_plus_hot_blast_2": "Microwave plus hot blast 2",
+          "slim_middle": "Slim middle",
+          "slim_strong": "Slim strong",
+          "slow_cook": "Slow cook",
+          "proof": "Proof",
+          "dehydrate": "Dehydrate",
+          "others": "Others",
+          "strong_steam": "Strong steam",
+          "descale": "Descale",
+          "rinse": "Rinse"
+        }
+      },
+      "oven_machine_state": {
+        "name": "[%key:component::smartthings::entity::sensor::dishwasher_machine_state::name%]",
+        "state": {
+          "ready": "Ready",
+          "running": "[%key:component::smartthings::entity::sensor::dishwasher_machine_state::state::run%]",
+          "paused": "[%key:common::state::paused%]"
+        }
+      },
+      "oven_job_state": {
+        "name": "[%key:component::smartthings::entity::sensor::dishwasher_job_state::name%]",
+        "state": {
+          "cleaning": "Cleaning",
+          "cooking": "Cooking",
+          "cooling": "Cooling",
+          "draining": "Draining",
+          "preheat": "Preheat",
+          "ready": "Ready",
+          "rinsing": "Rinsing",
+          "finished": "Finished",
+          "scheduled_start": "Scheduled start",
+          "warming": "Warming",
+          "defrosting": "Defrosting",
+          "sensing": "Sensing",
+          "searing": "Searing",
+          "fast_preheat": "Fast preheat",
+          "scheduled_end": "Scheduled end",
+          "stone_heating": "Stone heating",
+          "time_hold_preheat": "Time hold preheat"
+        }
+      },
+      "oven_setpoint": {
+        "name": "Set point"
+      },
+      "energy_difference": {
+        "name": "Energy difference"
+      },
+      "power_energy": {
+        "name": "Power energy"
+      },
+      "energy_saved": {
+        "name": "Energy saved"
+      },
+      "power_source": {
+        "name": "Power source"
+      },
+      "refrigeration_setpoint": {
+        "name": "[%key:component::smartthings::entity::sensor::oven_setpoint::name%]"
+      },
+      "brightness_intensity": {
+        "name": "Brightness intensity"
+      },
+      "robot_cleaner_cleaning_mode": {
+        "name": "Cleaning mode",
+        "state": {
+          "auto": "Auto",
+          "part": "Partial",
+          "repeat": "Repeat",
+          "manual": "Manual",
+          "stop": "[%key:common::action::stop%]",
+          "map": "Map"
+        }
+      },
+      "robot_cleaner_movement": {
+        "name": "Movement",
+        "state": {
+          "homing": "Homing",
+          "idle": "[%key:common::state::idle%]",
+          "charging": "[%key:common::state::charging%]",
+          "alarm": "Alarm",
+          "off": "[%key:common::state::off%]",
+          "reserve": "Reserve",
+          "point": "Point",
+          "after": "After",
+          "cleaning": "Cleaning",
+          "pause": "[%key:common::state::paused%]"
+        }
+      },
+      "robot_cleaner_turbo_mode": {
+        "name": "Turbo mode",
+        "state": {
+          "on": "[%key:common::state::on%]",
+          "off": "[%key:common::state::off%]",
+          "silence": "Silent",
+          "extra_silence": "Extra silent"
+        }
+      },
+      "link_quality": {
+        "name": "Link quality"
+      },
+      "smoke_detector": {
+        "name": "Smoke detector",
+        "state": {
+          "detected": "[%key:component::smartthings::entity::sensor::carbon_monoxide_detector::state::detected%]",
+          "clear": "[%key:component::smartthings::entity::sensor::carbon_monoxide_detector::state::clear%]",
+          "tested": "[%key:component::smartthings::entity::sensor::carbon_monoxide_detector::state::tested%]"
+        }
+      },
+      "thermostat_cooling_setpoint": {
+        "name": "Cooling set point"
+      },
+      "thermostat_fan_mode": {
+        "name": "Fan mode"
+      },
+      "thermostat_heating_setpoint": {
+        "name": "Heating set point"
+      },
+      "thermostat_mode": {
+        "name": "Mode"
+      },
+      "thermostat_operating_state": {
+        "name": "Operating state"
+      },
+      "thermostat_setpoint": {
+        "name": "[%key:component::smartthings::entity::sensor::oven_setpoint::name%]"
+      },
+      "x_coordinate": {
+        "name": "X coordinate"
+      },
+      "y_coordinate": {
+        "name": "Y coordinate"
+      },
+      "z_coordinate": {
+        "name": "Z coordinate"
+      },
+      "tv_channel": {
+        "name": "TV channel"
+      },
+      "tv_channel_name": {
+        "name": "TV channel name"
+      },
+      "uv_index": {
+        "name": "UV index"
+      },
+      "washer_mode": {
+        "name": "Washer mode"
+      },
+      "washer_machine_state": {
+        "name": "[%key:component::smartthings::entity::sensor::dishwasher_machine_state::name%]",
+        "state": {
+          "pause": "[%key:common::state::paused%]",
+          "run": "[%key:component::smartthings::entity::sensor::dishwasher_machine_state::state::run%]",
+          "stop": "[%key:component::smartthings::entity::sensor::dishwasher_machine_state::state::stop%]"
+        }
+      },
+      "washer_job_state": {
+        "name": "[%key:component::smartthings::entity::sensor::dishwasher_job_state::name%]",
+        "state": {
+          "air_wash": "[%key:component::smartthings::entity::sensor::dishwasher_job_state::state::air_wash%]",
+          "ai_rinse": "AI rinse",
+          "ai_spin": "AI spin",
+          "ai_wash": "AI wash",
+          "cooling": "[%key:component::smartthings::entity::sensor::dishwasher_job_state::state::cooling%]",
+          "delay_wash": "Delay wash",
+          "drying": "[%key:component::smartthings::entity::sensor::dishwasher_job_state::state::drying%]",
+          "finish": "[%key:component::smartthings::entity::sensor::dishwasher_job_state::state::finish%]",
+          "none": "None",
+          "pre_wash": "[%key:component::smartthings::entity::sensor::dishwasher_job_state::state::pre_wash%]",
+          "rinse": "[%key:component::smartthings::entity::sensor::dishwasher_job_state::state::rinse%]",
+          "spin": "[%key:component::smartthings::entity::sensor::dishwasher_job_state::state::spin%]",
+          "wash": "[%key:component::smartthings::entity::sensor::dishwasher_job_state::state::wash%]",
+          "weight_sensing": "Weight sensing",
+          "wrinkle_prevent": "[%key:component::smartthings::entity::sensor::dishwasher_job_state::state::wrinkle_prevent%]",
+          "freeze_protection": "Freeze protection"
+        }
+      }
+    },
+    "switch": {
+      "bubble_soak": {
+        "name": "Bubble Soak"
+      },
+      "wrinkle_prevent": {
+        "name": "Wrinkle prevent"
+      },
+      "ice_maker": {
+        "name": "Ice maker"
+      }
+    }
+  },
+  "issues": {
+    "deprecated_binary_valve": {
+      "title": "Deprecated valve binary sensor detected in some automations or scripts",
+      "description": "The valve binary sensor `{entity}` is deprecated and is used in the following automations or scripts:\n{items}\n\nA valve entity with controls is available and should be used going forward. Please use the new valve entity in the above automations or scripts to fix this issue."
+    },
+    "deprecated_binary_fridge_door": {
+      "title": "Deprecated refrigerator door binary sensor detected in some automations or scripts",
+      "description": "The refrigerator door binary sensor `{entity}` is deprecated and is used in the following automations or scripts:\n{items}\n\nSeparate entities for cooler and freezer door are available and should be used going forward. Please use them in the above automations or scripts to fix this issue."
+    },
+    "deprecated_machine_state": {
+      "title": "Deprecated machine state sensor detected in some automations or scripts",
+      "description": "The machine state sensor `{entity}` is deprecated and is used in the following automations or scripts:\n{items}\n\nA select entity is now available for the machine state and should be used going forward. Please use the new select entity in the above automations or scripts to fix this issue."
+    },
+    "deprecated_switch_appliance": {
+      "title": "Deprecated switch detected in some automations or scripts",
+      "description": "The switch `{entity}` is deprecated because the actions did not work, so it has been replaced with a binary sensor instead.\n\nThe switch was used in the following automations or scripts:\n{items}\n\nPlease use the new binary sensor in the above automations or scripts to fix this issue."
+    },
+    "deprecated_switch_media_player": {
+      "title": "[%key:component::smartthings::issues::deprecated_switch_appliance::title%]",
+      "description": "The switch `{entity}` is deprecated and a media player entity has been added to replace it.\n\nThe switch was used in the following automations or scripts:\n{items}\n\nPlease use the new media player entity in the above automations or scripts to fix this issue."
+    },
+    "deprecated_media_player": {
+      "title": "Deprecated sensor detected in some automations or scripts",
+      "description": "The sensor `{entity}` is deprecated because it has been replaced with a media player entity.\n\nThe sensor was used in the following automations or scripts:\n{items}\n\nPlease use the new media player entity in the above automations or scripts to fix this issue."
     }
   }
 }
diff --git a/homeassistant/components/smartthings/switch.py b/homeassistant/components/smartthings/switch.py
index 5cfe4576d6a..e5b74de3241 100644
--- a/homeassistant/components/smartthings/switch.py
+++ b/homeassistant/components/smartthings/switch.py
@@ -2,60 +2,268 @@
 
 from __future__ import annotations
 
-from collections.abc import Sequence
+from dataclasses import dataclass
 from typing import Any
 
-from pysmartthings import Capability
+from pysmartthings import Attribute, Capability, Category, Command, SmartThings
 
-from homeassistant.components.switch import SwitchEntity
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.components.automation import automations_with_entity
+from homeassistant.components.script import scripts_with_entity
+from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.issue_registry import (
+    IssueSeverity,
+    async_create_issue,
+    async_delete_issue,
+)
 
-from .const import DATA_BROKERS, DOMAIN
+from . import FullDevice, SmartThingsConfigEntry
+from .const import DOMAIN, MAIN
 from .entity import SmartThingsEntity
 
+CAPABILITIES = (
+    Capability.SWITCH_LEVEL,
+    Capability.COLOR_CONTROL,
+    Capability.COLOR_TEMPERATURE,
+    Capability.FAN_SPEED,
+)
+
+AC_CAPABILITIES = (
+    Capability.AIR_CONDITIONER_MODE,
+    Capability.AIR_CONDITIONER_FAN_MODE,
+    Capability.TEMPERATURE_MEASUREMENT,
+    Capability.THERMOSTAT_COOLING_SETPOINT,
+)
+
+
+@dataclass(frozen=True, kw_only=True)
+class SmartThingsSwitchEntityDescription(SwitchEntityDescription):
+    """Describe a SmartThings switch entity."""
+
+    status_attribute: Attribute
+    component_translation_key: dict[str, str] | None = None
+
+
+@dataclass(frozen=True, kw_only=True)
+class SmartThingsCommandSwitchEntityDescription(SmartThingsSwitchEntityDescription):
+    """Describe a SmartThings switch entity."""
+
+    command: Command
+
+
+SWITCH = SmartThingsSwitchEntityDescription(
+    key=Capability.SWITCH,
+    status_attribute=Attribute.SWITCH,
+    name=None,
+)
+CAPABILITY_TO_COMMAND_SWITCHES: dict[
+    Capability | str, SmartThingsCommandSwitchEntityDescription
+] = {
+    Capability.CUSTOM_DRYER_WRINKLE_PREVENT: SmartThingsCommandSwitchEntityDescription(
+        key=Capability.CUSTOM_DRYER_WRINKLE_PREVENT,
+        translation_key="wrinkle_prevent",
+        status_attribute=Attribute.DRYER_WRINKLE_PREVENT,
+        command=Command.SET_DRYER_WRINKLE_PREVENT,
+    )
+}
+CAPABILITY_TO_SWITCHES: dict[Capability | str, SmartThingsSwitchEntityDescription] = {
+    Capability.SAMSUNG_CE_WASHER_BUBBLE_SOAK: SmartThingsSwitchEntityDescription(
+        key=Capability.SAMSUNG_CE_WASHER_BUBBLE_SOAK,
+        translation_key="bubble_soak",
+        status_attribute=Attribute.STATUS,
+    ),
+    Capability.SWITCH: SmartThingsSwitchEntityDescription(
+        key=Capability.SWITCH,
+        status_attribute=Attribute.SWITCH,
+        component_translation_key={
+            "icemaker": "ice_maker",
+        },
+    ),
+}
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: SmartThingsConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add switches for a config entry."""
-    broker = hass.data[DOMAIN][DATA_BROKERS][config_entry.entry_id]
-    async_add_entities(
-        SmartThingsSwitch(device)
-        for device in broker.devices.values()
-        if broker.any_assigned(device.device_id, "switch")
+    entry_data = entry.runtime_data
+    entities: list[SmartThingsEntity] = [
+        SmartThingsSwitch(entry_data.client, device, SWITCH, Capability.SWITCH)
+        for device in entry_data.devices.values()
+        if Capability.SWITCH in device.status[MAIN]
+        and not any(capability in device.status[MAIN] for capability in CAPABILITIES)
+        and not all(capability in device.status[MAIN] for capability in AC_CAPABILITIES)
+    ]
+    entities.extend(
+        SmartThingsCommandSwitch(
+            entry_data.client,
+            device,
+            description,
+            Capability(capability),
+        )
+        for device in entry_data.devices.values()
+        for capability, description in CAPABILITY_TO_COMMAND_SWITCHES.items()
+        if capability in device.status[MAIN]
     )
-
-
-def get_capabilities(capabilities: Sequence[str]) -> Sequence[str] | None:
-    """Return all capabilities supported if minimum required are present."""
-    # Must be able to be turned on/off.
-    if Capability.switch in capabilities:
-        return [Capability.switch, Capability.energy_meter, Capability.power_meter]
-    return None
+    entities.extend(
+        SmartThingsSwitch(
+            entry_data.client,
+            device,
+            description,
+            Capability(capability),
+            component,
+        )
+        for device in entry_data.devices.values()
+        for capability, description in CAPABILITY_TO_SWITCHES.items()
+        for component in device.status
+        if capability in device.status[component]
+        and (
+            (description.component_translation_key is None and component == MAIN)
+            or (
+                description.component_translation_key is not None
+                and component in description.component_translation_key
+            )
+        )
+    )
+    async_add_entities(entities)
 
 
 class SmartThingsSwitch(SmartThingsEntity, SwitchEntity):
     """Define a SmartThings switch."""
 
+    entity_description: SmartThingsSwitchEntityDescription
+    created_issue: bool = False
+
+    def __init__(
+        self,
+        client: SmartThings,
+        device: FullDevice,
+        entity_description: SmartThingsSwitchEntityDescription,
+        capability: Capability,
+        component: str = MAIN,
+    ) -> None:
+        """Initialize the switch."""
+        super().__init__(client, device, {capability}, component=component)
+        self.entity_description = entity_description
+        self.switch_capability = capability
+        self._attr_unique_id = f"{device.device.device_id}_{component}_{capability}_{entity_description.status_attribute}_{entity_description.status_attribute}"
+        if (
+            translation_keys := entity_description.component_translation_key
+        ) is not None and (
+            translation_key := translation_keys.get(component)
+        ) is not None:
+            self._attr_translation_key = translation_key
+
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the switch off."""
-        await self._device.switch_off(set_status=True)
-        # State is set optimistically in the command above, therefore update
-        # the entity state ahead of receiving the confirming push updates
-        self.async_write_ha_state()
+        await self.execute_device_command(
+            self.switch_capability,
+            Command.OFF,
+        )
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the switch on."""
-        await self._device.switch_on(set_status=True)
-        # State is set optimistically in the command above, therefore update
-        # the entity state ahead of receiving the confirming push updates
-        self.async_write_ha_state()
+        await self.execute_device_command(
+            self.switch_capability,
+            Command.ON,
+        )
 
     @property
     def is_on(self) -> bool:
-        """Return true if light is on."""
-        return self._device.status.switch
+        """Return true if switch is on."""
+        return (
+            self.get_attribute_value(
+                self.switch_capability, self.entity_description.status_attribute
+            )
+            == "on"
+        )
+
+    async def async_added_to_hass(self) -> None:
+        """Call when entity is added to hass."""
+        await super().async_added_to_hass()
+        media_player = all(
+            capability in self.device.status[MAIN]
+            for capability in (
+                Capability.AUDIO_MUTE,
+                Capability.AUDIO_VOLUME,
+                Capability.MEDIA_PLAYBACK,
+            )
+        )
+        if (
+            self.entity_description != SWITCH
+            and self.device.device.components[MAIN].manufacturer_category
+            not in {
+                Category.CLOTHING_CARE_MACHINE,
+                Category.COOKTOP,
+                Category.DRYER,
+                Category.WASHER,
+                Category.MICROWAVE,
+                Category.DISHWASHER,
+            }
+        ) or (self.entity_description != SWITCH and not media_player):
+            return
+        automations = automations_with_entity(self.hass, self.entity_id)
+        scripts = scripts_with_entity(self.hass, self.entity_id)
+        if not automations and not scripts:
+            return
+
+        entity_reg: er.EntityRegistry = er.async_get(self.hass)
+        items_list = [
+            f"- [{item.original_name}](/config/{integration}/edit/{item.unique_id})"
+            for integration, entities in (
+                ("automation", automations),
+                ("script", scripts),
+            )
+            for entity_id in entities
+            if (item := entity_reg.async_get(entity_id))
+        ]
+
+        identifier = "media_player" if media_player else "appliance"
+
+        self.created_issue = True
+        async_create_issue(
+            self.hass,
+            DOMAIN,
+            f"deprecated_switch_{self.entity_id}",
+            breaks_in_ha_version="2025.10.0",
+            is_fixable=False,
+            severity=IssueSeverity.WARNING,
+            translation_key=f"deprecated_switch_{identifier}",
+            translation_placeholders={
+                "entity": self.entity_id,
+                "items": "\n".join(items_list),
+            },
+        )
+
+    async def async_will_remove_from_hass(self) -> None:
+        """Call when entity will be removed from hass."""
+        await super().async_will_remove_from_hass()
+        if not self.created_issue:
+            return
+        async_delete_issue(self.hass, DOMAIN, f"deprecated_switch_{self.entity_id}")
+
+
+class SmartThingsCommandSwitch(SmartThingsSwitch):
+    """Define a SmartThings command switch."""
+
+    entity_description: SmartThingsCommandSwitchEntityDescription
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the switch off."""
+        await self.execute_device_command(
+            self.switch_capability,
+            self.entity_description.command,
+            "off",
+        )
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the switch on."""
+        await self.execute_device_command(
+            self.switch_capability,
+            self.entity_description.command,
+            "on",
+        )
diff --git a/homeassistant/components/smartthings/update.py b/homeassistant/components/smartthings/update.py
new file mode 100644
index 00000000000..bb226918596
--- /dev/null
+++ b/homeassistant/components/smartthings/update.py
@@ -0,0 +1,87 @@
+"""Support for update entities through the SmartThings cloud API."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from awesomeversion import AwesomeVersion
+from pysmartthings import Attribute, Capability, Command
+
+from homeassistant.components.update import (
+    UpdateDeviceClass,
+    UpdateEntity,
+    UpdateEntityFeature,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import SmartThingsConfigEntry
+from .const import MAIN
+from .entity import SmartThingsEntity
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: SmartThingsConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Add update entities for a config entry."""
+    entry_data = entry.runtime_data
+    async_add_entities(
+        SmartThingsUpdateEntity(entry_data.client, device, {Capability.FIRMWARE_UPDATE})
+        for device in entry_data.devices.values()
+        if Capability.FIRMWARE_UPDATE in device.status[MAIN]
+    )
+
+
+def is_hex_version(version: str) -> bool:
+    """Check if the version is a hex version."""
+    return len(version) == 8 and all(c in "0123456789abcdefABCDEF" for c in version)
+
+
+class SmartThingsUpdateEntity(SmartThingsEntity, UpdateEntity):
+    """Define a SmartThings update entity."""
+
+    _attr_device_class = UpdateDeviceClass.FIRMWARE
+    _attr_supported_features = (
+        UpdateEntityFeature.INSTALL | UpdateEntityFeature.PROGRESS
+    )
+
+    @property
+    def installed_version(self) -> str | None:
+        """Return the installed version of the entity."""
+        return self.get_attribute_value(
+            Capability.FIRMWARE_UPDATE, Attribute.CURRENT_VERSION
+        )
+
+    @property
+    def latest_version(self) -> str | None:
+        """Return the available version of the entity."""
+        return self.get_attribute_value(
+            Capability.FIRMWARE_UPDATE, Attribute.AVAILABLE_VERSION
+        )
+
+    @property
+    def in_progress(self) -> bool:
+        """Return if the entity is in progress."""
+        return (
+            self.get_attribute_value(Capability.FIRMWARE_UPDATE, Attribute.STATE)
+            == "updateInProgress"
+        )
+
+    async def async_install(
+        self, version: str | None, backup: bool, **kwargs: Any
+    ) -> None:
+        """Install the firmware update."""
+        await self.execute_device_command(
+            Capability.FIRMWARE_UPDATE,
+            Command.UPDATE_FIRMWARE,
+        )
+
+    def version_is_newer(self, latest_version: str, installed_version: str) -> bool:
+        """Return if the latest version is newer."""
+        if is_hex_version(latest_version):
+            latest_version = f"0x{latest_version}"
+        if is_hex_version(installed_version):
+            installed_version = f"0x{installed_version}"
+        return AwesomeVersion(latest_version) > AwesomeVersion(installed_version)
diff --git a/homeassistant/components/smartthings/valve.py b/homeassistant/components/smartthings/valve.py
new file mode 100644
index 00000000000..4279d528f8b
--- /dev/null
+++ b/homeassistant/components/smartthings/valve.py
@@ -0,0 +1,71 @@
+"""Support for valves through the SmartThings cloud API."""
+
+from __future__ import annotations
+
+from pysmartthings import Attribute, Capability, Category, Command, SmartThings
+
+from homeassistant.components.valve import (
+    ValveDeviceClass,
+    ValveEntity,
+    ValveEntityFeature,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import FullDevice, SmartThingsConfigEntry
+from .const import MAIN
+from .entity import SmartThingsEntity
+
+DEVICE_CLASS_MAP: dict[Category | str, ValveDeviceClass] = {
+    Category.WATER_VALVE: ValveDeviceClass.WATER,
+    Category.GAS_VALVE: ValveDeviceClass.GAS,
+}
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: SmartThingsConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Add valves for a config entry."""
+    entry_data = entry.runtime_data
+    async_add_entities(
+        SmartThingsValve(entry_data.client, device)
+        for device in entry_data.devices.values()
+        if Capability.VALVE in device.status[MAIN]
+    )
+
+
+class SmartThingsValve(SmartThingsEntity, ValveEntity):
+    """Define a SmartThings valve."""
+
+    _attr_supported_features = ValveEntityFeature.OPEN | ValveEntityFeature.CLOSE
+    _attr_reports_position = False
+    _attr_name = None
+
+    def __init__(self, client: SmartThings, device: FullDevice) -> None:
+        """Init the class."""
+        super().__init__(client, device, {Capability.VALVE})
+        self._attr_device_class = DEVICE_CLASS_MAP.get(
+            device.device.components[MAIN].user_category
+            or device.device.components[MAIN].manufacturer_category
+        )
+
+    async def async_open_valve(self) -> None:
+        """Open the valve."""
+        await self.execute_device_command(
+            Capability.VALVE,
+            Command.OPEN,
+        )
+
+    async def async_close_valve(self) -> None:
+        """Close the valve."""
+        await self.execute_device_command(
+            Capability.VALVE,
+            Command.CLOSE,
+        )
+
+    @property
+    def is_closed(self) -> bool:
+        """Return if the valve is closed."""
+        return self.get_attribute_value(Capability.VALVE, Attribute.VALVE) == "closed"
diff --git a/homeassistant/components/smarttub/binary_sensor.py b/homeassistant/components/smarttub/binary_sensor.py
index f665f5e61b3..2e8792140b0 100644
--- a/homeassistant/components/smarttub/binary_sensor.py
+++ b/homeassistant/components/smarttub/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import VolDictType
 
 from .const import ATTR_ERRORS, ATTR_REMINDERS, DOMAIN, SMARTTUB_CONTROLLER
@@ -43,7 +43,9 @@ SNOOZE_REMINDER_SCHEMA: VolDictType = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up binary sensor entities for the binary sensors in the tub."""
 
diff --git a/homeassistant/components/smarttub/climate.py b/homeassistant/components/smarttub/climate.py
index 7f3163834e0..f5759f32fa3 100644
--- a/homeassistant/components/smarttub/climate.py
+++ b/homeassistant/components/smarttub/climate.py
@@ -17,7 +17,7 @@ from homeassistant.components.climate import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.unit_conversion import TemperatureConverter
 
 from .const import DEFAULT_MAX_TEMP, DEFAULT_MIN_TEMP, DOMAIN, SMARTTUB_CONTROLLER
@@ -42,7 +42,9 @@ HVAC_ACTIONS = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up climate entity for the thermostat in the tub."""
 
diff --git a/homeassistant/components/smarttub/light.py b/homeassistant/components/smarttub/light.py
index 532234f4059..dda936aa56a 100644
--- a/homeassistant/components/smarttub/light.py
+++ b/homeassistant/components/smarttub/light.py
@@ -14,7 +14,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     ATTR_LIGHTS,
@@ -28,7 +28,9 @@ from .helpers import get_spa_name
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entities for any lights in the tub."""
 
diff --git a/homeassistant/components/smarttub/manifest.json b/homeassistant/components/smarttub/manifest.json
index d5102f14437..b8d81db0ea5 100644
--- a/homeassistant/components/smarttub/manifest.json
+++ b/homeassistant/components/smarttub/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/smarttub",
   "iot_class": "cloud_polling",
   "loggers": ["smarttub"],
-  "requirements": ["python-smarttub==0.0.38"]
+  "requirements": ["python-smarttub==0.0.39"]
 }
diff --git a/homeassistant/components/smarttub/sensor.py b/homeassistant/components/smarttub/sensor.py
index 585e8859432..b2bb1170d09 100644
--- a/homeassistant/components/smarttub/sensor.py
+++ b/homeassistant/components/smarttub/sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.sensor import SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import VolDictType
 
 from .const import DOMAIN, SMARTTUB_CONTROLLER
@@ -43,7 +43,9 @@ SET_SECONDARY_FILTRATION_SCHEMA: VolDictType = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensor entities for the sensors in the tub."""
 
diff --git a/homeassistant/components/smarttub/strings.json b/homeassistant/components/smarttub/strings.json
index 974e5fb7d37..79fa7a4820f 100644
--- a/homeassistant/components/smarttub/strings.json
+++ b/homeassistant/components/smarttub/strings.json
@@ -49,17 +49,17 @@
     },
     "snooze_reminder": {
       "name": "Snooze a reminder",
-      "description": "Delay a reminder, so that it won't trigger again for a period of time.",
+      "description": "Temporarily suppresses the maintenance reminder on a hot tub.",
       "fields": {
         "days": {
           "name": "Days",
-          "description": "The number of days to delay the reminder."
+          "description": "The number of days to snooze the reminder."
         }
       }
     },
     "reset_reminder": {
       "name": "Reset a reminder",
-      "description": "Reset a reminder, and set the next time it will be triggered.",
+      "description": "Resets the maintenance reminder on a hot tub.",
       "fields": {
         "days": {
           "name": "[%key:component::smarttub::services::snooze_reminder::fields::days::name%]",
diff --git a/homeassistant/components/smarttub/switch.py b/homeassistant/components/smarttub/switch.py
index 6e1cf9bef2a..2dedad8e18a 100644
--- a/homeassistant/components/smarttub/switch.py
+++ b/homeassistant/components/smarttub/switch.py
@@ -8,7 +8,7 @@ from smarttub import SpaPump
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import API_TIMEOUT, ATTR_PUMPS, DOMAIN, SMARTTUB_CONTROLLER
 from .entity import SmartTubEntity
@@ -16,7 +16,9 @@ from .helpers import get_spa_name
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switch entities for the pumps on the tub."""
 
diff --git a/homeassistant/components/smarty/__init__.py b/homeassistant/components/smarty/__init__.py
index 0d043804c3d..aab8c6ab3c7 100644
--- a/homeassistant/components/smarty/__init__.py
+++ b/homeassistant/components/smarty/__init__.py
@@ -9,8 +9,7 @@ from homeassistant.config_entries import SOURCE_IMPORT
 from homeassistant.const import CONF_HOST, CONF_NAME, Platform
 from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.helpers import issue_registry as ir
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, issue_registry as ir
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
@@ -90,7 +89,7 @@ async def _async_import(hass: HomeAssistant, config: ConfigType) -> None:
 async def async_setup_entry(hass: HomeAssistant, entry: SmartyConfigEntry) -> bool:
     """Set up the Smarty environment from a config entry."""
 
-    coordinator = SmartyCoordinator(hass)
+    coordinator = SmartyCoordinator(hass, entry)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/smarty/binary_sensor.py b/homeassistant/components/smarty/binary_sensor.py
index 213cb00d47c..82236a154f0 100644
--- a/homeassistant/components/smarty/binary_sensor.py
+++ b/homeassistant/components/smarty/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import SmartyConfigEntry, SmartyCoordinator
 from .entity import SmartyEntity
@@ -53,7 +53,7 @@ ENTITIES: tuple[SmartyBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SmartyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Smarty Binary Sensor Platform."""
 
diff --git a/homeassistant/components/smarty/button.py b/homeassistant/components/smarty/button.py
index b8e31cf6fc8..78638561088 100644
--- a/homeassistant/components/smarty/button.py
+++ b/homeassistant/components/smarty/button.py
@@ -11,7 +11,7 @@ from pysmarty2 import Smarty
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import SmartyConfigEntry, SmartyCoordinator
 from .entity import SmartyEntity
@@ -38,7 +38,7 @@ ENTITIES: tuple[SmartyButtonDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SmartyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Smarty Button Platform."""
 
diff --git a/homeassistant/components/smarty/config_flow.py b/homeassistant/components/smarty/config_flow.py
index 9a55356a990..a7f0bdd4123 100644
--- a/homeassistant/components/smarty/config_flow.py
+++ b/homeassistant/components/smarty/config_flow.py
@@ -1,5 +1,6 @@
 """Config flow for Smarty integration."""
 
+import logging
 from typing import Any
 
 from pysmarty2 import Smarty
@@ -10,6 +11,8 @@ from homeassistant.const import CONF_HOST, CONF_NAME
 
 from .const import DOMAIN
 
+_LOGGER = logging.getLogger(__name__)
+
 
 class SmartyConfigFlow(ConfigFlow, domain=DOMAIN):
     """Smarty config flow."""
@@ -20,7 +23,8 @@ class SmartyConfigFlow(ConfigFlow, domain=DOMAIN):
         try:
             if smarty.update():
                 return None
-        except Exception:  # noqa: BLE001
+        except Exception:
+            _LOGGER.exception("Unexpected exception")
             return "unknown"
         else:
             return "cannot_connect"
diff --git a/homeassistant/components/smarty/coordinator.py b/homeassistant/components/smarty/coordinator.py
index d7f3e2452d1..a55c9f2e78f 100644
--- a/homeassistant/components/smarty/coordinator.py
+++ b/homeassistant/components/smarty/coordinator.py
@@ -22,15 +22,16 @@ class SmartyCoordinator(DataUpdateCoordinator[None]):
     software_version: str
     configuration_version: str
 
-    def __init__(self, hass: HomeAssistant) -> None:
+    def __init__(self, hass: HomeAssistant, config_entry: SmartyConfigEntry) -> None:
         """Initialize."""
         super().__init__(
             hass,
             logger=_LOGGER,
+            config_entry=config_entry,
             name="Smarty",
             update_interval=timedelta(seconds=30),
         )
-        self.client = Smarty(host=self.config_entry.data[CONF_HOST])
+        self.client = Smarty(host=config_entry.data[CONF_HOST])
 
     async def _async_setup(self) -> None:
         if not await self.hass.async_add_executor_job(self.client.update):
diff --git a/homeassistant/components/smarty/fan.py b/homeassistant/components/smarty/fan.py
index 2804f14ee15..07dec85ae47 100644
--- a/homeassistant/components/smarty/fan.py
+++ b/homeassistant/components/smarty/fan.py
@@ -9,7 +9,7 @@ from typing import Any
 from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
     ranged_value_to_percentage,
@@ -29,7 +29,7 @@ SPEED_RANGE = (1, 3)  # off is not included
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SmartyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Smarty Fan Platform."""
 
diff --git a/homeassistant/components/smarty/manifest.json b/homeassistant/components/smarty/manifest.json
index ca3133d8add..c295647b8e5 100644
--- a/homeassistant/components/smarty/manifest.json
+++ b/homeassistant/components/smarty/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["pymodbus", "pysmarty2"],
-  "requirements": ["pysmarty2==0.10.1"]
+  "requirements": ["pysmarty2==0.10.2"]
 }
diff --git a/homeassistant/components/smarty/sensor.py b/homeassistant/components/smarty/sensor.py
index 9d847003a59..fe35f741380 100644
--- a/homeassistant/components/smarty/sensor.py
+++ b/homeassistant/components/smarty/sensor.py
@@ -16,8 +16,8 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import REVOLUTIONS_PER_MINUTE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from .coordinator import SmartyConfigEntry, SmartyCoordinator
 from .entity import SmartyEntity
@@ -85,7 +85,7 @@ ENTITIES: tuple[SmartySensorDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SmartyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Smarty Sensor Platform."""
 
diff --git a/homeassistant/components/smarty/switch.py b/homeassistant/components/smarty/switch.py
index bf5fe80db44..5781bb11680 100644
--- a/homeassistant/components/smarty/switch.py
+++ b/homeassistant/components/smarty/switch.py
@@ -11,7 +11,7 @@ from pysmarty2 import Smarty
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import SmartyConfigEntry, SmartyCoordinator
 from .entity import SmartyEntity
@@ -42,7 +42,7 @@ ENTITIES: tuple[SmartySwitchDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SmartyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Smarty Switch Platform."""
 
diff --git a/homeassistant/components/smhi/__init__.py b/homeassistant/components/smhi/__init__.py
index 59b32948879..1869b333071 100644
--- a/homeassistant/components/smhi/__init__.py
+++ b/homeassistant/components/smhi/__init__.py
@@ -1,6 +1,5 @@
 """Support for the Swedish weather institute weather service."""
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_LATITUDE,
     CONF_LOCATION,
@@ -10,10 +9,12 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 
+from .coordinator import SMHIConfigEntry, SMHIDataUpdateCoordinator
+
 PLATFORMS = [Platform.WEATHER]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: SMHIConfigEntry) -> bool:
     """Set up SMHI forecast as config entry."""
 
     # Setting unique id where missing
@@ -21,16 +22,20 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         unique_id = f"{entry.data[CONF_LOCATION][CONF_LATITUDE]}-{entry.data[CONF_LOCATION][CONF_LONGITUDE]}"
         hass.config_entries.async_update_entry(entry, unique_id=unique_id)
 
+    coordinator = SMHIDataUpdateCoordinator(hass, entry)
+    await coordinator.async_config_entry_first_refresh()
+    entry.runtime_data = coordinator
+
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: SMHIConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
-async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_migrate_entry(hass: HomeAssistant, entry: SMHIConfigEntry) -> bool:
     """Migrate old entry."""
 
     if entry.version > 3:
diff --git a/homeassistant/components/smhi/config_flow.py b/homeassistant/components/smhi/config_flow.py
index 2521df3a333..387edfc6e11 100644
--- a/homeassistant/components/smhi/config_flow.py
+++ b/homeassistant/components/smhi/config_flow.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import Any
 
-from smhi.smhi_lib import Smhi, SmhiForecastException
+from pysmhi import SmhiForecastException, SMHIPointForecast
 import voluptuous as vol
 
 from homeassistant.components.weather import DOMAIN as WEATHER_DOMAIN
@@ -26,9 +26,9 @@ async def async_check_location(
 ) -> bool:
     """Return true if location is ok."""
     session = aiohttp_client.async_get_clientsession(hass)
-    smhi_api = Smhi(longitude, latitude, session=session)
+    smhi_api = SMHIPointForecast(str(longitude), str(latitude), session=session)
     try:
-        await smhi_api.async_get_forecast()
+        await smhi_api.async_get_daily_forecast()
     except SmhiForecastException:
         return False
 
diff --git a/homeassistant/components/smhi/const.py b/homeassistant/components/smhi/const.py
index 11401119227..6cbf928d5e6 100644
--- a/homeassistant/components/smhi/const.py
+++ b/homeassistant/components/smhi/const.py
@@ -1,5 +1,7 @@
 """Constants in smhi component."""
 
+from datetime import timedelta
+import logging
 from typing import Final
 
 from homeassistant.components.weather import DOMAIN as WEATHER_DOMAIN
@@ -12,3 +14,8 @@ HOME_LOCATION_NAME = "Home"
 DEFAULT_NAME = "Weather"
 
 ENTITY_ID_SENSOR_FORMAT = WEATHER_DOMAIN + ".smhi_{}"
+
+LOGGER = logging.getLogger(__package__)
+
+DEFAULT_SCAN_INTERVAL = timedelta(minutes=31)
+TIMEOUT = 10
diff --git a/homeassistant/components/smhi/coordinator.py b/homeassistant/components/smhi/coordinator.py
new file mode 100644
index 00000000000..511ba8b38d9
--- /dev/null
+++ b/homeassistant/components/smhi/coordinator.py
@@ -0,0 +1,63 @@
+"""DataUpdateCoordinator for the SMHI integration."""
+
+from __future__ import annotations
+
+import asyncio
+from dataclasses import dataclass
+
+from pysmhi import SMHIForecast, SmhiForecastException, SMHIPointForecast
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_LATITUDE, CONF_LOCATION, CONF_LONGITUDE
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import aiohttp_client
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import DEFAULT_SCAN_INTERVAL, DOMAIN, LOGGER, TIMEOUT
+
+type SMHIConfigEntry = ConfigEntry[SMHIDataUpdateCoordinator]
+
+
+@dataclass
+class SMHIForecastData:
+    """Dataclass for SMHI data."""
+
+    daily: list[SMHIForecast]
+    hourly: list[SMHIForecast]
+
+
+class SMHIDataUpdateCoordinator(DataUpdateCoordinator[SMHIForecastData]):
+    """A SMHI Data Update Coordinator."""
+
+    config_entry: SMHIConfigEntry
+
+    def __init__(self, hass: HomeAssistant, config_entry: SMHIConfigEntry) -> None:
+        """Initialize the SMHI coordinator."""
+        super().__init__(
+            hass,
+            LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=DEFAULT_SCAN_INTERVAL,
+        )
+        self._smhi_api = SMHIPointForecast(
+            config_entry.data[CONF_LOCATION][CONF_LONGITUDE],
+            config_entry.data[CONF_LOCATION][CONF_LATITUDE],
+            session=aiohttp_client.async_get_clientsession(hass),
+        )
+
+    async def _async_update_data(self) -> SMHIForecastData:
+        """Fetch data from SMHI."""
+        try:
+            async with asyncio.timeout(TIMEOUT):
+                _forecast_daily = await self._smhi_api.async_get_daily_forecast()
+                _forecast_hourly = await self._smhi_api.async_get_hourly_forecast()
+        except SmhiForecastException as ex:
+            raise UpdateFailed(
+                "Failed to retrieve the forecast from the SMHI API"
+            ) from ex
+
+        return SMHIForecastData(
+            daily=_forecast_daily,
+            hourly=_forecast_hourly,
+        )
diff --git a/homeassistant/components/smhi/entity.py b/homeassistant/components/smhi/entity.py
new file mode 100644
index 00000000000..89dca3360ca
--- /dev/null
+++ b/homeassistant/components/smhi/entity.py
@@ -0,0 +1,41 @@
+"""Support for the Swedish weather institute weather  base entities."""
+
+from __future__ import annotations
+
+from abc import abstractmethod
+
+from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+from .coordinator import SMHIDataUpdateCoordinator
+
+
+class SmhiWeatherBaseEntity(CoordinatorEntity[SMHIDataUpdateCoordinator]):
+    """Representation of a base weather entity."""
+
+    _attr_attribution = "Swedish weather institute (SMHI)"
+    _attr_has_entity_name = True
+    _attr_name = None
+
+    def __init__(
+        self,
+        latitude: str,
+        longitude: str,
+        coordinator: SMHIDataUpdateCoordinator,
+    ) -> None:
+        """Initialize the SMHI base weather entity."""
+        super().__init__(coordinator)
+        self._attr_unique_id = f"{latitude}, {longitude}"
+        self._attr_device_info = DeviceInfo(
+            entry_type=DeviceEntryType.SERVICE,
+            identifiers={(DOMAIN, f"{latitude}, {longitude}")},
+            manufacturer="SMHI",
+            model="v2",
+            configuration_url="http://opendata.smhi.se/apidocs/metfcst/parameters.html",
+        )
+        self.update_entity_data()
+
+    @abstractmethod
+    def update_entity_data(self) -> None:
+        """Refresh the entity data."""
diff --git a/homeassistant/components/smhi/manifest.json b/homeassistant/components/smhi/manifest.json
index 645ace41cab..fc3af634764 100644
--- a/homeassistant/components/smhi/manifest.json
+++ b/homeassistant/components/smhi/manifest.json
@@ -5,6 +5,6 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/smhi",
   "iot_class": "cloud_polling",
-  "loggers": ["smhi"],
-  "requirements": ["smhi-pkg==1.0.19"]
+  "loggers": ["pysmhi"],
+  "requirements": ["pysmhi==1.0.0"]
 }
diff --git a/homeassistant/components/smhi/weather.py b/homeassistant/components/smhi/weather.py
index d43ca4465ae..5faef04e03d 100644
--- a/homeassistant/components/smhi/weather.py
+++ b/homeassistant/components/smhi/weather.py
@@ -2,15 +2,10 @@
 
 from __future__ import annotations
 
-import asyncio
 from collections.abc import Mapping
-from datetime import datetime, timedelta
-import logging
 from typing import Any, Final
 
-import aiohttp
-from smhi import Smhi
-from smhi.smhi_lib import SmhiForecast, SmhiForecastException
+from pysmhi import SMHIForecast
 
 from homeassistant.components.weather import (
     ATTR_CONDITION_CLEAR_NIGHT,
@@ -40,10 +35,9 @@ from homeassistant.components.weather import (
     ATTR_FORECAST_TIME,
     ATTR_FORECAST_WIND_BEARING,
     Forecast,
-    WeatherEntity,
+    SingleCoordinatorWeatherEntity,
     WeatherEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_LATITUDE,
     CONF_LOCATION,
@@ -54,16 +48,13 @@ from homeassistant.const import (
     UnitOfSpeed,
     UnitOfTemperature,
 )
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import aiohttp_client, sun
-from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.event import async_call_later
-from homeassistant.util import Throttle, dt as dt_util
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import sun
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import ATTR_SMHI_THUNDER_PROBABILITY, DOMAIN, ENTITY_ID_SENSOR_FORMAT
-
-_LOGGER = logging.getLogger(__name__)
+from .const import ATTR_SMHI_THUNDER_PROBABILITY, ENTITY_ID_SENSOR_FORMAT
+from .coordinator import SMHIConfigEntry
+from .entity import SmhiWeatherBaseEntity
 
 # Used to map condition from API results
 CONDITION_CLASSES: Final[dict[str, list[int]]] = {
@@ -88,115 +79,73 @@ CONDITION_MAP = {
     for cond_code in cond_codes
 }
 
-TIMEOUT = 10
-# 5 minutes between retrying connect to API again
-RETRY_TIMEOUT = 5 * 60
-
-MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=31)
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    config_entry: SMHIConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add a weather entity from map location."""
     location = config_entry.data
 
-    session = aiohttp_client.async_get_clientsession(hass)
+    coordinator = config_entry.runtime_data
 
     entity = SmhiWeather(
         location[CONF_LOCATION][CONF_LATITUDE],
         location[CONF_LOCATION][CONF_LONGITUDE],
-        session=session,
+        coordinator=coordinator,
     )
     entity.entity_id = ENTITY_ID_SENSOR_FORMAT.format(config_entry.title)
 
-    async_add_entities([entity], True)
+    async_add_entities([entity])
 
 
-class SmhiWeather(WeatherEntity):
+class SmhiWeather(SmhiWeatherBaseEntity, SingleCoordinatorWeatherEntity):
     """Representation of a weather entity."""
 
-    _attr_attribution = "Swedish weather institute (SMHI)"
     _attr_native_temperature_unit = UnitOfTemperature.CELSIUS
     _attr_native_visibility_unit = UnitOfLength.KILOMETERS
     _attr_native_precipitation_unit = UnitOfPrecipitationDepth.MILLIMETERS
     _attr_native_wind_speed_unit = UnitOfSpeed.METERS_PER_SECOND
     _attr_native_pressure_unit = UnitOfPressure.HPA
-
-    _attr_has_entity_name = True
-    _attr_name = None
     _attr_supported_features = (
         WeatherEntityFeature.FORECAST_DAILY | WeatherEntityFeature.FORECAST_HOURLY
     )
 
-    def __init__(
-        self,
-        latitude: str,
-        longitude: str,
-        session: aiohttp.ClientSession,
-    ) -> None:
-        """Initialize the SMHI weather entity."""
-        self._attr_unique_id = f"{latitude}, {longitude}"
-        self._forecast_daily: list[SmhiForecast] | None = None
-        self._forecast_hourly: list[SmhiForecast] | None = None
-        self._fail_count = 0
-        self._smhi_api = Smhi(longitude, latitude, session=session)
-        self._attr_device_info = DeviceInfo(
-            entry_type=DeviceEntryType.SERVICE,
-            identifiers={(DOMAIN, f"{latitude}, {longitude}")},
-            manufacturer="SMHI",
-            model="v2",
-            configuration_url="http://opendata.smhi.se/apidocs/metfcst/parameters.html",
-        )
+    def update_entity_data(self) -> None:
+        """Refresh the entity data."""
+        if daily_data := self.coordinator.data.daily:
+            self._attr_native_temperature = daily_data[0]["temperature"]
+            self._attr_humidity = daily_data[0]["humidity"]
+            self._attr_native_wind_speed = daily_data[0]["wind_speed"]
+            self._attr_wind_bearing = daily_data[0]["wind_direction"]
+            self._attr_native_visibility = daily_data[0]["visibility"]
+            self._attr_native_pressure = daily_data[0]["pressure"]
+            self._attr_native_wind_gust_speed = daily_data[0]["wind_gust"]
+            self._attr_cloud_coverage = daily_data[0]["total_cloud"]
+            self._attr_condition = CONDITION_MAP.get(daily_data[0]["symbol"])
+            if self._attr_condition == ATTR_CONDITION_SUNNY and not sun.is_up(
+                self.coordinator.hass
+            ):
+                self._attr_condition = ATTR_CONDITION_CLEAR_NIGHT
 
     @property
     def extra_state_attributes(self) -> Mapping[str, Any] | None:
         """Return additional attributes."""
-        if self._forecast_daily:
+        if daily_data := self.coordinator.data.daily:
             return {
-                ATTR_SMHI_THUNDER_PROBABILITY: self._forecast_daily[0].thunder,
+                ATTR_SMHI_THUNDER_PROBABILITY: daily_data[0]["thunder"],
             }
         return None
 
-    @Throttle(MIN_TIME_BETWEEN_UPDATES)
-    async def async_update(self) -> None:
-        """Refresh the forecast data from SMHI weather API."""
-        try:
-            async with asyncio.timeout(TIMEOUT):
-                self._forecast_daily = await self._smhi_api.async_get_forecast()
-                self._forecast_hourly = await self._smhi_api.async_get_forecast_hour()
-                self._fail_count = 0
-        except (TimeoutError, SmhiForecastException):
-            _LOGGER.error("Failed to connect to SMHI API, retry in 5 minutes")
-            self._fail_count += 1
-            if self._fail_count < 3:
-                async_call_later(self.hass, RETRY_TIMEOUT, self.retry_update)
-                return
-
-        if self._forecast_daily:
-            self._attr_native_temperature = self._forecast_daily[0].temperature
-            self._attr_humidity = self._forecast_daily[0].humidity
-            self._attr_native_wind_speed = self._forecast_daily[0].wind_speed
-            self._attr_wind_bearing = self._forecast_daily[0].wind_direction
-            self._attr_native_visibility = self._forecast_daily[0].horizontal_visibility
-            self._attr_native_pressure = self._forecast_daily[0].pressure
-            self._attr_native_wind_gust_speed = self._forecast_daily[0].wind_gust
-            self._attr_cloud_coverage = self._forecast_daily[0].cloudiness
-            self._attr_condition = CONDITION_MAP.get(self._forecast_daily[0].symbol)
-            if self._attr_condition == ATTR_CONDITION_SUNNY and not sun.is_up(
-                self.hass
-            ):
-                self._attr_condition = ATTR_CONDITION_CLEAR_NIGHT
-        await self.async_update_listeners(("daily", "hourly"))
-
-    async def retry_update(self, _: datetime) -> None:
-        """Retry refresh weather forecast."""
-        await self.async_update(no_throttle=True)
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
+        self.update_entity_data()
+        super()._handle_coordinator_update()
 
     def _get_forecast_data(
-        self, forecast_data: list[SmhiForecast] | None
+        self, forecast_data: list[SMHIForecast] | None
     ) -> list[Forecast] | None:
         """Get forecast data."""
         if forecast_data is None or len(forecast_data) < 3:
@@ -205,34 +154,37 @@ class SmhiWeather(WeatherEntity):
         data: list[Forecast] = []
 
         for forecast in forecast_data[1:]:
-            condition = CONDITION_MAP.get(forecast.symbol)
+            condition = CONDITION_MAP.get(forecast["symbol"])
             if condition == ATTR_CONDITION_SUNNY and not sun.is_up(
-                self.hass, forecast.valid_time.replace(tzinfo=dt_util.UTC)
+                self.hass, forecast["valid_time"]
             ):
                 condition = ATTR_CONDITION_CLEAR_NIGHT
 
             data.append(
                 {
-                    ATTR_FORECAST_TIME: forecast.valid_time.isoformat(),
-                    ATTR_FORECAST_NATIVE_TEMP: forecast.temperature_max,
-                    ATTR_FORECAST_NATIVE_TEMP_LOW: forecast.temperature_min,
-                    ATTR_FORECAST_NATIVE_PRECIPITATION: forecast.total_precipitation,
+                    ATTR_FORECAST_TIME: forecast["valid_time"].isoformat(),
+                    ATTR_FORECAST_NATIVE_TEMP: forecast["temperature_max"],
+                    ATTR_FORECAST_NATIVE_TEMP_LOW: forecast["temperature_min"],
+                    ATTR_FORECAST_NATIVE_PRECIPITATION: forecast.get(
+                        "total_precipitation"
+                    )
+                    or forecast["mean_precipitation"],
                     ATTR_FORECAST_CONDITION: condition,
-                    ATTR_FORECAST_NATIVE_PRESSURE: forecast.pressure,
-                    ATTR_FORECAST_WIND_BEARING: forecast.wind_direction,
-                    ATTR_FORECAST_NATIVE_WIND_SPEED: forecast.wind_speed,
-                    ATTR_FORECAST_HUMIDITY: forecast.humidity,
-                    ATTR_FORECAST_NATIVE_WIND_GUST_SPEED: forecast.wind_gust,
-                    ATTR_FORECAST_CLOUD_COVERAGE: forecast.cloudiness,
+                    ATTR_FORECAST_NATIVE_PRESSURE: forecast["pressure"],
+                    ATTR_FORECAST_WIND_BEARING: forecast["wind_direction"],
+                    ATTR_FORECAST_NATIVE_WIND_SPEED: forecast["wind_speed"],
+                    ATTR_FORECAST_HUMIDITY: forecast["humidity"],
+                    ATTR_FORECAST_NATIVE_WIND_GUST_SPEED: forecast["wind_gust"],
+                    ATTR_FORECAST_CLOUD_COVERAGE: forecast["total_cloud"],
                 }
             )
 
         return data
 
-    async def async_forecast_daily(self) -> list[Forecast] | None:
+    def _async_forecast_daily(self) -> list[Forecast] | None:
         """Service to retrieve the daily forecast."""
-        return self._get_forecast_data(self._forecast_daily)
+        return self._get_forecast_data(self.coordinator.data.daily)
 
-    async def async_forecast_hourly(self) -> list[Forecast] | None:
+    def _async_forecast_hourly(self) -> list[Forecast] | None:
         """Service to retrieve the hourly forecast."""
-        return self._get_forecast_data(self._forecast_hourly)
+        return self._get_forecast_data(self.coordinator.data.hourly)
diff --git a/homeassistant/components/smlight/__init__.py b/homeassistant/components/smlight/__init__.py
index cbfb8162d63..b3a6860e5b7 100644
--- a/homeassistant/components/smlight/__init__.py
+++ b/homeassistant/components/smlight/__init__.py
@@ -2,16 +2,18 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass
-
 from pysmlight import Api2
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .coordinator import SmDataUpdateCoordinator, SmFirmwareUpdateCoordinator
+from .coordinator import (
+    SmConfigEntry,
+    SmDataUpdateCoordinator,
+    SmFirmwareUpdateCoordinator,
+    SmlightData,
+)
 
 PLATFORMS: list[Platform] = [
     Platform.BINARY_SENSOR,
@@ -22,25 +24,12 @@ PLATFORMS: list[Platform] = [
 ]
 
 
-@dataclass(kw_only=True)
-class SmlightData:
-    """Coordinator data class."""
-
-    data: SmDataUpdateCoordinator
-    firmware: SmFirmwareUpdateCoordinator
-
-
-type SmConfigEntry = ConfigEntry[SmlightData]
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: SmConfigEntry) -> bool:
     """Set up SMLIGHT Zigbee from a config entry."""
     client = Api2(host=entry.data[CONF_HOST], session=async_get_clientsession(hass))
 
-    data_coordinator = SmDataUpdateCoordinator(hass, entry.data[CONF_HOST], client)
-    firmware_coordinator = SmFirmwareUpdateCoordinator(
-        hass, entry.data[CONF_HOST], client
-    )
+    data_coordinator = SmDataUpdateCoordinator(hass, entry, client)
+    firmware_coordinator = SmFirmwareUpdateCoordinator(hass, entry, client)
 
     await data_coordinator.async_config_entry_first_refresh()
     await firmware_coordinator.async_config_entry_first_refresh()
diff --git a/homeassistant/components/smlight/binary_sensor.py b/homeassistant/components/smlight/binary_sensor.py
index b1aba3a52fe..ce3457ae81b 100644
--- a/homeassistant/components/smlight/binary_sensor.py
+++ b/homeassistant/components/smlight/binary_sensor.py
@@ -14,13 +14,12 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import SCAN_INTERNET_INTERVAL
-from .coordinator import SmDataUpdateCoordinator
+from .coordinator import SmConfigEntry, SmDataUpdateCoordinator
 from .entity import SmEntity
 
 SCAN_INTERVAL = SCAN_INTERNET_INTERVAL
@@ -56,8 +55,8 @@ SENSORS = [
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: SmConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SMLIGHT sensor based on a config entry."""
     coordinator = entry.runtime_data.data
diff --git a/homeassistant/components/smlight/button.py b/homeassistant/components/smlight/button.py
index d82034b87fb..5caf43b7cba 100644
--- a/homeassistant/components/smlight/button.py
+++ b/homeassistant/components/smlight/button.py
@@ -14,14 +14,13 @@ from homeassistant.components.button import (
     ButtonEntity,
     ButtonEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
-from .coordinator import SmDataUpdateCoordinator
+from .coordinator import SmConfigEntry, SmDataUpdateCoordinator
 from .entity import SmEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -65,8 +64,8 @@ ROUTER = SmButtonDescription(
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: SmConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SMLIGHT buttons based on a config entry."""
     coordinator = entry.runtime_data.data
diff --git a/homeassistant/components/smlight/config_flow.py b/homeassistant/components/smlight/config_flow.py
index dee81264fa4..ce4f8f43233 100644
--- a/homeassistant/components/smlight/config_flow.py
+++ b/homeassistant/components/smlight/config_flow.py
@@ -10,10 +10,11 @@ from pysmlight.const import Devices
 from pysmlight.exceptions import SmlightAuthError, SmlightConnectionError
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.config_entries import SOURCE_USER, ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.device_registry import format_mac
+from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
 from .const import DOMAIN
@@ -35,11 +36,9 @@ STEP_AUTH_DATA_SCHEMA = vol.Schema(
 class SmlightConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for SMLIGHT Zigbee."""
 
-    host: str
-
-    def __init__(self) -> None:
-        """Initialize the config flow."""
-        self.client: Api2
+    _host: str
+    _device_name: str
+    client: Api2
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -48,16 +47,18 @@ class SmlightConfigFlow(ConfigFlow, domain=DOMAIN):
         errors: dict[str, str] = {}
 
         if user_input is not None:
-            self.host = user_input[CONF_HOST]
-            self.client = Api2(self.host, session=async_get_clientsession(self.hass))
+            self._host = user_input[CONF_HOST]
+            self.client = Api2(self._host, session=async_get_clientsession(self.hass))
 
             try:
-                info = await self.client.get_info()
-
-                if info.model not in Devices:
-                    return self.async_abort(reason="unsupported_device")
-
                 if not await self._async_check_auth_required(user_input):
+                    info = await self.client.get_info()
+                    self._host = str(info.device_ip)
+                    self._device_name = str(info.hostname)
+
+                    if info.model not in Devices:
+                        return self.async_abort(reason="unsupported_device")
+
                     return await self._async_complete_entry(user_input)
             except SmlightConnectionError:
                 errors["base"] = "cannot_connect"
@@ -76,12 +77,14 @@ class SmlightConfigFlow(ConfigFlow, domain=DOMAIN):
 
         if user_input is not None:
             try:
-                info = await self.client.get_info()
-
-                if info.model not in Devices:
-                    return self.async_abort(reason="unsupported_device")
-
                 if not await self._async_check_auth_required(user_input):
+                    info = await self.client.get_info()
+                    self._host = str(info.device_ip)
+                    self._device_name = str(info.hostname)
+
+                    if info.model not in Devices:
+                        return self.async_abort(reason="unsupported_device")
+
                     return await self._async_complete_entry(user_input)
             except SmlightConnectionError:
                 return self.async_abort(reason="cannot_connect")
@@ -96,15 +99,14 @@ class SmlightConfigFlow(ConfigFlow, domain=DOMAIN):
         self, discovery_info: ZeroconfServiceInfo
     ) -> ConfigFlowResult:
         """Handle a discovered Lan coordinator."""
-        local_name = discovery_info.hostname[:-1]
-        node_name = local_name.removesuffix(".local")
+        mac: str | None = discovery_info.properties.get("mac")
+        self._device_name = discovery_info.hostname.removesuffix(".local.")
+        self._host = discovery_info.host
 
-        self.host = local_name
-        self.context["title_placeholders"] = {CONF_NAME: node_name}
-        self.client = Api2(self.host, session=async_get_clientsession(self.hass))
+        self.context["title_placeholders"] = {CONF_NAME: self._device_name}
+        self.client = Api2(self._host, session=async_get_clientsession(self.hass))
 
-        mac = discovery_info.properties.get("mac")
-        # fallback for legacy firmware
+        # fallback for legacy firmware older than v2.3.x
         if mac is None:
             try:
                 info = await self.client.get_info()
@@ -114,7 +116,7 @@ class SmlightConfigFlow(ConfigFlow, domain=DOMAIN):
             mac = info.MAC
 
         await self.async_set_unique_id(format_mac(mac))
-        self._abort_if_unique_id_configured()
+        self._abort_if_unique_id_configured(updates={CONF_HOST: self._host})
 
         return await self.async_step_confirm_discovery()
 
@@ -125,15 +127,14 @@ class SmlightConfigFlow(ConfigFlow, domain=DOMAIN):
         errors: dict[str, str] = {}
 
         if user_input is not None:
-            user_input[CONF_HOST] = self.host
             try:
-                info = await self.client.get_info()
-
-                if info.model not in Devices:
-                    return self.async_abort(reason="unsupported_device")
-
                 if not await self._async_check_auth_required(user_input):
-                    return await self._async_complete_entry(user_input)
+                    info = await self.client.get_info()
+
+                    if info.model not in Devices:
+                        return self.async_abort(reason="unsupported_device")
+
+                return await self._async_complete_entry(user_input)
 
             except SmlightConnectionError:
                 return self.async_abort(reason="cannot_connect")
@@ -145,7 +146,7 @@ class SmlightConfigFlow(ConfigFlow, domain=DOMAIN):
 
         return self.async_show_form(
             step_id="confirm_discovery",
-            description_placeholders={"host": self.host},
+            description_placeholders={"host": self._device_name},
             errors=errors,
         )
 
@@ -154,8 +155,8 @@ class SmlightConfigFlow(ConfigFlow, domain=DOMAIN):
     ) -> ConfigFlowResult:
         """Handle reauth when API Authentication failed."""
 
-        self.host = entry_data[CONF_HOST]
-        self.client = Api2(self.host, session=async_get_clientsession(self.hass))
+        self._host = entry_data[CONF_HOST]
+        self.client = Api2(self._host, session=async_get_clientsession(self.hass))
 
         return await self.async_step_reauth_confirm()
 
@@ -185,6 +186,16 @@ class SmlightConfigFlow(ConfigFlow, domain=DOMAIN):
             errors=errors,
         )
 
+    async def async_step_dhcp(
+        self, discovery_info: DhcpServiceInfo
+    ) -> ConfigFlowResult:
+        """Handle DHCP discovery."""
+        await self.async_set_unique_id(format_mac(discovery_info.macaddress))
+        self._abort_if_unique_id_configured(updates={CONF_HOST: discovery_info.ip})
+        # This should never happen since we only listen to DHCP requests
+        # for configured devices.
+        return self.async_abort(reason="already_configured")
+
     async def _async_check_auth_required(self, user_input: dict[str, Any]) -> bool:
         """Check if auth required and attempt to authenticate."""
         if await self.client.check_auth_needed():
@@ -199,12 +210,14 @@ class SmlightConfigFlow(ConfigFlow, domain=DOMAIN):
         self, user_input: dict[str, Any]
     ) -> ConfigFlowResult:
         info = await self.client.get_info()
-        await self.async_set_unique_id(format_mac(info.MAC))
-        self._abort_if_unique_id_configured()
 
-        if user_input.get(CONF_HOST) is None:
-            user_input[CONF_HOST] = self.host
+        await self.async_set_unique_id(
+            format_mac(info.MAC), raise_on_progress=self.source != SOURCE_USER
+        )
+        self._abort_if_unique_id_configured(updates={CONF_HOST: self._host})
+
+        user_input[CONF_HOST] = self._host
 
         assert info.model is not None
-        title = self.context.get("title_placeholders", {}).get(CONF_NAME) or info.model
+        title = self._device_name or info.model
         return self.async_create_entry(title=title, data=user_input)
diff --git a/homeassistant/components/smlight/coordinator.py b/homeassistant/components/smlight/coordinator.py
index 5b38ec4a89e..5a118e7de15 100644
--- a/homeassistant/components/smlight/coordinator.py
+++ b/homeassistant/components/smlight/coordinator.py
@@ -4,14 +4,14 @@ from __future__ import annotations
 
 from abc import abstractmethod
 from dataclasses import dataclass
-from typing import TYPE_CHECKING
 
 from pysmlight import Api2, Info, Sensors
 from pysmlight.const import Settings, SettingsProp
 from pysmlight.exceptions import SmlightAuthError, SmlightConnectionError
-from pysmlight.web import Firmware
+from pysmlight.models import FirmwareList
 
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers import issue_registry as ir
@@ -21,8 +21,13 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .const import DOMAIN, LOGGER, SCAN_FIRMWARE_INTERVAL, SCAN_INTERVAL
 
-if TYPE_CHECKING:
-    from . import SmConfigEntry
+
+@dataclass(kw_only=True)
+class SmlightData:
+    """Coordinator data class."""
+
+    data: SmDataUpdateCoordinator
+    firmware: SmFirmwareUpdateCoordinator
 
 
 @dataclass
@@ -38,8 +43,11 @@ class SmFwData:
     """SMLIGHT firmware data stored in the FirmwareUpdateCoordinator."""
 
     info: Info
-    esp_firmware: list[Firmware] | None
-    zb_firmware: list[Firmware] | None
+    esp_firmware: FirmwareList
+    zb_firmware: list[FirmwareList]
+
+
+type SmConfigEntry = ConfigEntry[SmlightData]
 
 
 class SmBaseDataUpdateCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
@@ -47,12 +55,15 @@ class SmBaseDataUpdateCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
 
     config_entry: SmConfigEntry
 
-    def __init__(self, hass: HomeAssistant, host: str, client: Api2) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: SmConfigEntry, client: Api2
+    ) -> None:
         """Initialize the coordinator."""
         super().__init__(
             hass,
             LOGGER,
-            name=f"{DOMAIN}_{host}",
+            config_entry=config_entry,
+            name=f"{DOMAIN}_{config_entry.data[CONF_HOST]}",
             update_interval=SCAN_INTERVAL,
         )
 
@@ -133,9 +144,11 @@ class SmDataUpdateCoordinator(SmBaseDataUpdateCoordinator[SmData]):
 class SmFirmwareUpdateCoordinator(SmBaseDataUpdateCoordinator[SmFwData]):
     """Class to manage fetching SMLIGHT firmware update data from cloud."""
 
-    def __init__(self, hass: HomeAssistant, host: str, client: Api2) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: SmConfigEntry, client: Api2
+    ) -> None:
         """Initialize the coordinator."""
-        super().__init__(hass, host, client)
+        super().__init__(hass, config_entry, client)
 
         self.update_interval = SCAN_FIRMWARE_INTERVAL
         # only one update can run at a time (core or zibgee)
@@ -144,11 +157,30 @@ class SmFirmwareUpdateCoordinator(SmBaseDataUpdateCoordinator[SmFwData]):
     async def _internal_update_data(self) -> SmFwData:
         """Fetch data from the SMLIGHT device."""
         info = await self.client.get_info()
+        assert info.radios is not None
+        esp_firmware = None
+        zb_firmware: list[FirmwareList] = []
+
+        try:
+            esp_firmware = await self.client.get_firmware_version(info.fw_channel)
+            zb_firmware.extend(
+                [
+                    await self.client.get_firmware_version(
+                        info.fw_channel,
+                        device=info.model,
+                        mode="zigbee",
+                        zb_type=r.zb_type,
+                        idx=idx,
+                    )
+                    for idx, r in enumerate(info.radios)
+                ]
+            )
+
+        except SmlightConnectionError as err:
+            self.async_set_update_error(err)
 
         return SmFwData(
             info=info,
-            esp_firmware=await self.client.get_firmware_version(info.fw_channel),
-            zb_firmware=await self.client.get_firmware_version(
-                info.fw_channel, device=info.model, mode="zigbee"
-            ),
+            esp_firmware=esp_firmware,
+            zb_firmware=zb_firmware,
         )
diff --git a/homeassistant/components/smlight/diagnostics.py b/homeassistant/components/smlight/diagnostics.py
index d303e5803bb..3812175e673 100644
--- a/homeassistant/components/smlight/diagnostics.py
+++ b/homeassistant/components/smlight/diagnostics.py
@@ -8,7 +8,7 @@ from pysmlight.const import Actions
 
 from homeassistant.core import HomeAssistant
 
-from . import SmConfigEntry
+from .coordinator import SmConfigEntry
 
 
 async def async_get_config_entry_diagnostics(
diff --git a/homeassistant/components/smlight/manifest.json b/homeassistant/components/smlight/manifest.json
index 3a8578c8a59..e9025203b8c 100644
--- a/homeassistant/components/smlight/manifest.json
+++ b/homeassistant/components/smlight/manifest.json
@@ -3,10 +3,15 @@
   "name": "SMLIGHT SLZB",
   "codeowners": ["@tl-sl"],
   "config_flow": true,
+  "dhcp": [
+    {
+      "registered_devices": true
+    }
+  ],
   "documentation": "https://www.home-assistant.io/integrations/smlight",
   "integration_type": "device",
   "iot_class": "local_push",
-  "requirements": ["pysmlight==0.1.6"],
+  "requirements": ["pysmlight==0.2.4"],
   "zeroconf": [
     {
       "type": "_slzb-06._tcp.local."
diff --git a/homeassistant/components/smlight/sensor.py b/homeassistant/components/smlight/sensor.py
index 1116b99f8c1..2f57843b5eb 100644
--- a/homeassistant/components/smlight/sensor.py
+++ b/homeassistant/components/smlight/sensor.py
@@ -17,13 +17,12 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import EntityCategory, UnitOfInformation, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util.dt import utcnow
 
-from . import SmConfigEntry
 from .const import UPTIME_DEVIATION
-from .coordinator import SmDataUpdateCoordinator
+from .coordinator import SmConfigEntry, SmDataUpdateCoordinator
 from .entity import SmEntity
 
 
@@ -38,7 +37,7 @@ class SmSensorEntityDescription(SensorEntityDescription):
 class SmInfoEntityDescription(SensorEntityDescription):
     """Class describing SMLIGHT information entities."""
 
-    value_fn: Callable[[Info], StateType]
+    value_fn: Callable[[Info, int], StateType]
 
 
 INFO: list[SmInfoEntityDescription] = [
@@ -47,24 +46,25 @@ INFO: list[SmInfoEntityDescription] = [
         translation_key="device_mode",
         device_class=SensorDeviceClass.ENUM,
         options=["eth", "wifi", "usb"],
-        value_fn=lambda x: x.coord_mode,
+        value_fn=lambda x, idx: x.coord_mode,
     ),
     SmInfoEntityDescription(
         key="firmware_channel",
         translation_key="firmware_channel",
         device_class=SensorDeviceClass.ENUM,
         options=["dev", "release"],
-        value_fn=lambda x: x.fw_channel,
-    ),
-    SmInfoEntityDescription(
-        key="zigbee_type",
-        translation_key="zigbee_type",
-        device_class=SensorDeviceClass.ENUM,
-        options=["coordinator", "router", "thread"],
-        value_fn=lambda x: x.zb_type,
+        value_fn=lambda x, idx: x.fw_channel,
     ),
 ]
 
+RADIO_INFO = SmInfoEntityDescription(
+    key="zigbee_type",
+    translation_key="zigbee_type",
+    device_class=SensorDeviceClass.ENUM,
+    options=["coordinator", "router", "thread"],
+    value_fn=lambda x, idx: x.radios[idx].zb_type,
+)
+
 
 SENSORS: list[SmSensorEntityDescription] = [
     SmSensorEntityDescription(
@@ -103,6 +103,16 @@ SENSORS: list[SmSensorEntityDescription] = [
     ),
 ]
 
+EXTRA_SENSOR = SmSensorEntityDescription(
+    key="zigbee_temperature_2",
+    translation_key="zigbee_temperature",
+    device_class=SensorDeviceClass.TEMPERATURE,
+    native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+    state_class=SensorStateClass.MEASUREMENT,
+    suggested_display_precision=1,
+    value_fn=lambda x: x.zb_temp2,
+)
+
 UPTIME: list[SmSensorEntityDescription] = [
     SmSensorEntityDescription(
         key="core_uptime",
@@ -124,12 +134,11 @@ UPTIME: list[SmSensorEntityDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SmConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SMLIGHT sensor based on a config entry."""
     coordinator = entry.runtime_data.data
-
-    async_add_entities(
+    entities: list[SmEntity] = list(
         chain(
             (SmInfoSensorEntity(coordinator, description) for description in INFO),
             (SmSensorEntity(coordinator, description) for description in SENSORS),
@@ -137,6 +146,16 @@ async def async_setup_entry(
         )
     )
 
+    entities.extend(
+        SmInfoSensorEntity(coordinator, RADIO_INFO, idx)
+        for idx, _ in enumerate(coordinator.data.info.radios)
+    )
+
+    if coordinator.data.sensors.zb_temp2 is not None:
+        entities.append(SmSensorEntity(coordinator, EXTRA_SENSOR))
+
+    async_add_entities(entities)
+
 
 class SmSensorEntity(SmEntity, SensorEntity):
     """Representation of a slzb sensor."""
@@ -173,17 +192,20 @@ class SmInfoSensorEntity(SmEntity, SensorEntity):
         self,
         coordinator: SmDataUpdateCoordinator,
         description: SmInfoEntityDescription,
+        idx: int = 0,
     ) -> None:
         """Initiate slzb sensor."""
         super().__init__(coordinator)
 
         self.entity_description = description
-        self._attr_unique_id = f"{coordinator.unique_id}_{description.key}"
+        self.idx = idx
+        sensor = f"_{idx}" if idx else ""
+        self._attr_unique_id = f"{coordinator.unique_id}_{description.key}{sensor}"
 
     @property
     def native_value(self) -> StateType:
         """Return the sensor value."""
-        value = self.entity_description.value_fn(self.coordinator.data.info)
+        value = self.entity_description.value_fn(self.coordinator.data.info, self.idx)
         options = self.entity_description.options
 
         if isinstance(value, int) and options is not None:
diff --git a/homeassistant/components/smlight/strings.json b/homeassistant/components/smlight/strings.json
index 21ff5098d27..ca52f6fea38 100644
--- a/homeassistant/components/smlight/strings.json
+++ b/homeassistant/components/smlight/strings.json
@@ -2,7 +2,7 @@
   "config": {
     "step": {
       "user": {
-        "description": "Set up SMLIGHT Zigbee Integration",
+        "description": "Set up SMLIGHT Zigbee integration",
         "data": {
           "host": "[%key:common::config_flow::data::host%]"
         },
@@ -111,7 +111,7 @@
         "name": "Zigbee flash mode"
       },
       "reconnect_zigbee_router": {
-        "name": "Reconnect zigbee router"
+        "name": "Reconnect Zigbee router"
       }
     },
     "switch": {
diff --git a/homeassistant/components/smlight/switch.py b/homeassistant/components/smlight/switch.py
index 1c591e3dbe8..09d2714956c 100644
--- a/homeassistant/components/smlight/switch.py
+++ b/homeassistant/components/smlight/switch.py
@@ -17,10 +17,9 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import SmConfigEntry
-from .coordinator import SmDataUpdateCoordinator
+from .coordinator import SmConfigEntry, SmDataUpdateCoordinator
 from .entity import SmEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -68,7 +67,7 @@ SWITCHES: list[SmSwitchEntityDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SmConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize switches for SLZB-06 device."""
     coordinator = entry.runtime_data.data
diff --git a/homeassistant/components/smlight/update.py b/homeassistant/components/smlight/update.py
index 147b1d766ef..3143f2f4290 100644
--- a/homeassistant/components/smlight/update.py
+++ b/homeassistant/components/smlight/update.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 import asyncio
 from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Any, Final
+from typing import Any
 
 from pysmlight.const import Events as SmEvents
 from pysmlight.models import Firmware, Info
@@ -20,48 +20,68 @@ from homeassistant.components.update import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import SmConfigEntry
 from .const import LOGGER
-from .coordinator import SmFirmwareUpdateCoordinator, SmFwData
+from .coordinator import SmConfigEntry, SmFirmwareUpdateCoordinator, SmFwData
 from .entity import SmEntity
 
 
+def zigbee_latest_version(data: SmFwData, idx: int) -> Firmware | None:
+    """Get the latest Zigbee firmware version."""
+
+    if idx < len(data.zb_firmware):
+        firmware_list = data.zb_firmware[idx]
+        if firmware_list:
+            return firmware_list[0]
+    return None
+
+
 @dataclass(frozen=True, kw_only=True)
 class SmUpdateEntityDescription(UpdateEntityDescription):
     """Describes SMLIGHT SLZB-06 update entity."""
 
-    installed_version: Callable[[Info], str | None]
-    fw_list: Callable[[SmFwData], list[Firmware] | None]
+    installed_version: Callable[[Info, int], str | None]
+    latest_version: Callable[[SmFwData, int], Firmware | None]
 
 
-UPDATE_ENTITIES: Final = [
-    SmUpdateEntityDescription(
-        key="core_update",
-        translation_key="core_update",
-        installed_version=lambda x: x.sw_version,
-        fw_list=lambda x: x.esp_firmware,
-    ),
-    SmUpdateEntityDescription(
-        key="zigbee_update",
-        translation_key="zigbee_update",
-        installed_version=lambda x: x.zb_version,
-        fw_list=lambda x: x.zb_firmware,
-    ),
-]
+CORE_UPDATE_ENTITY = SmUpdateEntityDescription(
+    key="core_update",
+    translation_key="core_update",
+    installed_version=lambda x, idx: x.sw_version,
+    latest_version=lambda x, idx: x.esp_firmware[0] if x.esp_firmware else None,
+)
+
+ZB_UPDATE_ENTITY = SmUpdateEntityDescription(
+    key="zigbee_update",
+    translation_key="zigbee_update",
+    installed_version=lambda x, idx: x.radios[idx].zb_version,
+    latest_version=zigbee_latest_version,
+)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: SmConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: SmConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the SMLIGHT update entities."""
     coordinator = entry.runtime_data.firmware
 
-    async_add_entities(
-        SmUpdateEntity(coordinator, description) for description in UPDATE_ENTITIES
+    # updates not available for legacy API, user will get repair to update externally
+    if coordinator.legacy_api == 2:
+        return
+
+    entities = [SmUpdateEntity(coordinator, CORE_UPDATE_ENTITY)]
+    radios = coordinator.data.info.radios
+
+    entities.extend(
+        SmUpdateEntity(coordinator, ZB_UPDATE_ENTITY, idx)
+        for idx, _ in enumerate(radios)
     )
 
+    async_add_entities(entities)
+
 
 class SmUpdateEntity(SmEntity, UpdateEntity):
     """Representation for SLZB-06 update entities."""
@@ -80,42 +100,46 @@ class SmUpdateEntity(SmEntity, UpdateEntity):
         self,
         coordinator: SmFirmwareUpdateCoordinator,
         description: SmUpdateEntityDescription,
+        idx: int = 0,
     ) -> None:
         """Initialize the entity."""
         super().__init__(coordinator)
 
         self.entity_description = description
-        self._attr_unique_id = f"{coordinator.unique_id}-{description.key}"
+        device = description.key + (f"_{idx}" if idx else "")
+        self._attr_unique_id = f"{coordinator.unique_id}-{device}"
 
         self._finished_event = asyncio.Event()
         self._firmware: Firmware | None = None
         self._unload: list[Callable] = []
+        self.idx = idx
+
+    async def async_added_to_hass(self) -> None:
+        """When entity is added to hass."""
+        await super().async_added_to_hass()
+        self._handle_coordinator_update()
+
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle coordinator update callbacks."""
+        self._firmware = self.entity_description.latest_version(
+            self.coordinator.data, self.idx
+        )
+        if self._firmware:
+            self.async_write_ha_state()
 
     @property
     def installed_version(self) -> str | None:
         """Version installed.."""
         data = self.coordinator.data
 
-        version = self.entity_description.installed_version(data.info)
-        return version if version != "-1" else None
+        return self.entity_description.installed_version(data.info, self.idx)
 
     @property
     def latest_version(self) -> str | None:
         """Latest version available for install."""
-        data = self.coordinator.data
-        if self.coordinator.legacy_api == 2:
-            return None
 
-        fw = self.entity_description.fw_list(data)
-
-        if fw and self.entity_description.key == "zigbee_update":
-            fw = [f for f in fw if f.type == data.info.zb_type]
-
-        if fw:
-            self._firmware = fw[0]
-            return self._firmware.ver
-
-        return None
+        return self._firmware.ver if self._firmware else None
 
     def register_callbacks(self) -> None:
         """Register callbacks for SSE update events."""
@@ -143,9 +167,14 @@ class SmUpdateEntity(SmEntity, UpdateEntity):
 
     def release_notes(self) -> str | None:
         """Return release notes for firmware."""
+        if "zigbee" in self.entity_description.key:
+            notes = f"### {'ZNP' if self.idx else 'EZSP'} Firmware\n\n"
+        else:
+            notes = "### Core Firmware\n\n"
 
         if self._firmware and self._firmware.notes:
-            return self._firmware.notes
+            notes += self._firmware.notes
+            return notes
 
         return None
 
@@ -192,7 +221,7 @@ class SmUpdateEntity(SmEntity, UpdateEntity):
             self._attr_update_percentage = None
             self.register_callbacks()
 
-            await self.coordinator.client.fw_update(self._firmware)
+            await self.coordinator.client.fw_update(self._firmware, self.idx)
 
             # block until update finished event received
             await self._finished_event.wait()
diff --git a/homeassistant/components/sms/sensor.py b/homeassistant/components/sms/sensor.py
index 821200f68b1..46ee754a1f1 100644
--- a/homeassistant/components/sms/sensor.py
+++ b/homeassistant/components/sms/sensor.py
@@ -10,7 +10,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, SIGNAL_STRENGTH_DECIBELS, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, GATEWAY, NETWORK_COORDINATOR, SIGNAL_COORDINATOR, SMS_GATEWAY
@@ -77,7 +77,7 @@ NETWORK_SENSORS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up all device sensors."""
     sms_data = hass.data[DOMAIN][SMS_GATEWAY]
diff --git a/homeassistant/components/smtp/notify.py b/homeassistant/components/smtp/notify.py
index 5d19a705d87..e86b22690a4 100644
--- a/homeassistant/components/smtp/notify.py
+++ b/homeassistant/components/smtp/notify.py
@@ -34,10 +34,10 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.reload import setup_reload_service
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.ssl import client_context
 
 from .const import (
diff --git a/homeassistant/components/snapcast/__init__.py b/homeassistant/components/snapcast/__init__.py
index b853535b525..9c1602494e5 100644
--- a/homeassistant/components/snapcast/__init__.py
+++ b/homeassistant/components/snapcast/__init__.py
@@ -11,15 +11,14 @@ from .coordinator import SnapcastUpdateCoordinator
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Snapcast from a config entry."""
-    host = entry.data[CONF_HOST]
-    port = entry.data[CONF_PORT]
-    coordinator = SnapcastUpdateCoordinator(hass, host, port)
+    coordinator = SnapcastUpdateCoordinator(hass, entry)
 
     try:
         await coordinator.async_config_entry_first_refresh()
     except OSError as ex:
         raise ConfigEntryNotReady(
-            f"Could not connect to Snapcast server at {host}:{port}"
+            "Could not connect to Snapcast server at "
+            f"{entry.data[CONF_HOST]}:{entry.data[CONF_PORT]}"
         ) from ex
 
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
diff --git a/homeassistant/components/snapcast/coordinator.py b/homeassistant/components/snapcast/coordinator.py
index 5bb9ae4e51f..4c2f0cb81b7 100644
--- a/homeassistant/components/snapcast/coordinator.py
+++ b/homeassistant/components/snapcast/coordinator.py
@@ -6,6 +6,8 @@ import logging
 
 from snapcast.control.server import Snapserver
 
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, CONF_PORT
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -15,15 +17,20 @@ _LOGGER = logging.getLogger(__name__)
 class SnapcastUpdateCoordinator(DataUpdateCoordinator[None]):
     """Data update coordinator for pushed data from Snapcast server."""
 
-    def __init__(self, hass: HomeAssistant, host: str, port: int) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
         """Initialize coordinator."""
+        host = config_entry.data[CONF_HOST]
+        port = config_entry.data[CONF_PORT]
+
         super().__init__(
             hass,
             logger=_LOGGER,
+            config_entry=config_entry,
             name=f"{host}:{port}",
             update_interval=None,  # Disable update interval as server pushes
         )
-
         self._server = Snapserver(hass.loop, host, port, True)
         self.last_update_success = False
 
diff --git a/homeassistant/components/snapcast/media_player.py b/homeassistant/components/snapcast/media_player.py
index 0ec27c1ad9c..5f011ca41ee 100644
--- a/homeassistant/components/snapcast/media_player.py
+++ b/homeassistant/components/snapcast/media_player.py
@@ -25,7 +25,7 @@ from homeassistant.helpers import (
     entity_platform,
     entity_registry as er,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     ATTR_LATENCY,
@@ -73,7 +73,7 @@ def register_services() -> None:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the snapcast config entry."""
 
diff --git a/homeassistant/components/snips/strings.json b/homeassistant/components/snips/strings.json
index 724e1a86477..23b255b05a9 100644
--- a/homeassistant/components/snips/strings.json
+++ b/homeassistant/components/snips/strings.json
@@ -44,7 +44,7 @@
       "fields": {
         "can_be_enqueued": {
           "name": "Can be enqueued",
-          "description": "If True, session waits for an open session to end, if False session is dropped if one is running."
+          "description": "Whether the session should wait for an open session to end. Otherwise it is dropped if another session is already running."
         },
         "custom_data": {
           "name": "[%key:component::snips::services::say::fields::custom_data::name%]",
diff --git a/homeassistant/components/snmp/device_tracker.py b/homeassistant/components/snmp/device_tracker.py
index 4c2b2b25ad8..f69c844f191 100644
--- a/homeassistant/components/snmp/device_tracker.py
+++ b/homeassistant/components/snmp/device_tracker.py
@@ -24,7 +24,7 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
diff --git a/homeassistant/components/snmp/sensor.py b/homeassistant/components/snmp/sensor.py
index 4586d0600e9..0baecd68ec4 100644
--- a/homeassistant/components/snmp/sensor.py
+++ b/homeassistant/components/snmp/sensor.py
@@ -37,7 +37,7 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.trigger_template_entity import (
diff --git a/homeassistant/components/snmp/switch.py b/homeassistant/components/snmp/switch.py
index 2f9f8b0bfb7..fd405567d60 100644
--- a/homeassistant/components/snmp/switch.py
+++ b/homeassistant/components/snmp/switch.py
@@ -44,7 +44,7 @@ from homeassistant.const import (
     CONF_USERNAME,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/snoo/__init__.py b/homeassistant/components/snoo/__init__.py
new file mode 100644
index 00000000000..54834bf58ce
--- /dev/null
+++ b/homeassistant/components/snoo/__init__.py
@@ -0,0 +1,69 @@
+"""The Happiest Baby Snoo integration."""
+
+from __future__ import annotations
+
+import asyncio
+import logging
+
+from python_snoo.exceptions import InvalidSnooAuth, SnooAuthException, SnooDeviceError
+from python_snoo.snoo import Snoo
+
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+
+from .coordinator import SnooConfigEntry, SnooCoordinator
+
+_LOGGER = logging.getLogger(__name__)
+
+PLATFORMS: list[Platform] = [
+    Platform.BINARY_SENSOR,
+    Platform.EVENT,
+    Platform.SELECT,
+    Platform.SENSOR,
+    Platform.SWITCH,
+]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: SnooConfigEntry) -> bool:
+    """Set up Happiest Baby Snoo from a config entry."""
+
+    snoo = Snoo(
+        email=entry.data[CONF_USERNAME],
+        password=entry.data[CONF_PASSWORD],
+        clientsession=async_get_clientsession(hass),
+    )
+
+    try:
+        await snoo.authorize()
+    except (SnooAuthException, InvalidSnooAuth) as ex:
+        raise ConfigEntryNotReady from ex
+    try:
+        devices = await snoo.get_devices()
+    except SnooDeviceError as ex:
+        raise ConfigEntryNotReady from ex
+    coordinators: dict[str, SnooCoordinator] = {}
+    tasks = []
+    for device in devices:
+        coordinators[device.serialNumber] = SnooCoordinator(hass, device, snoo)
+        tasks.append(coordinators[device.serialNumber].setup())
+    await asyncio.gather(*tasks)
+    entry.runtime_data = coordinators
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: SnooConfigEntry) -> bool:
+    """Unload a config entry."""
+    disconnects = await asyncio.gather(
+        *(coordinator.snoo.disconnect() for coordinator in entry.runtime_data.values()),
+        return_exceptions=True,
+    )
+    for disconnect in disconnects:
+        if isinstance(disconnect, Exception):
+            _LOGGER.warning(
+                "Failed to disconnect a logger with exception: %s", disconnect
+            )
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/snoo/binary_sensor.py b/homeassistant/components/snoo/binary_sensor.py
new file mode 100644
index 00000000000..3c91db5b86d
--- /dev/null
+++ b/homeassistant/components/snoo/binary_sensor.py
@@ -0,0 +1,70 @@
+"""Support for Snoo Binary Sensors."""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+
+from python_snoo.containers import SnooData
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDeviceClass,
+    BinarySensorEntity,
+    BinarySensorEntityDescription,
+    EntityCategory,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import SnooConfigEntry
+from .entity import SnooDescriptionEntity
+
+
+@dataclass(frozen=True, kw_only=True)
+class SnooBinarySensorEntityDescription(BinarySensorEntityDescription):
+    """Describes a Snoo Binary Sensor."""
+
+    value_fn: Callable[[SnooData], bool]
+
+
+BINARY_SENSOR_DESCRIPTIONS: list[SnooBinarySensorEntityDescription] = [
+    SnooBinarySensorEntityDescription(
+        key="left_clip",
+        translation_key="left_clip",
+        value_fn=lambda data: data.left_safety_clip,
+        device_class=BinarySensorDeviceClass.CONNECTIVITY,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    SnooBinarySensorEntityDescription(
+        key="right_clip",
+        translation_key="right_clip",
+        value_fn=lambda data: data.left_safety_clip,
+        device_class=BinarySensorDeviceClass.CONNECTIVITY,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+]
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: SnooConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up Snoo device."""
+    coordinators = entry.runtime_data
+    async_add_entities(
+        SnooBinarySensor(coordinator, description)
+        for coordinator in coordinators.values()
+        for description in BINARY_SENSOR_DESCRIPTIONS
+    )
+
+
+class SnooBinarySensor(SnooDescriptionEntity, BinarySensorEntity):
+    """A Binary sensor using Snoo coordinator."""
+
+    entity_description: SnooBinarySensorEntityDescription
+
+    @property
+    def is_on(self) -> bool:
+        """Return true if the binary sensor is on."""
+        return self.entity_description.value_fn(self.coordinator.data)
diff --git a/homeassistant/components/snoo/config_flow.py b/homeassistant/components/snoo/config_flow.py
new file mode 100644
index 00000000000..986ef6a0071
--- /dev/null
+++ b/homeassistant/components/snoo/config_flow.py
@@ -0,0 +1,68 @@
+"""Config flow for the Happiest Baby Snoo integration."""
+
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+import jwt
+from python_snoo.exceptions import InvalidSnooAuth, SnooAuthException
+from python_snoo.snoo import Snoo
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+STEP_USER_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_USERNAME): str,
+        vol.Required(CONF_PASSWORD): str,
+    }
+)
+
+
+class SnooConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Happiest Baby Snoo."""
+
+    VERSION = 1
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the initial step."""
+        errors: dict[str, str] = {}
+        if user_input is not None:
+            hub = Snoo(
+                email=user_input[CONF_USERNAME],
+                password=user_input[CONF_PASSWORD],
+                clientsession=async_get_clientsession(self.hass),
+            )
+
+            try:
+                tokens = await hub.authorize()
+            except SnooAuthException:
+                errors["base"] = "cannot_connect"
+            except InvalidSnooAuth:
+                errors["base"] = "invalid_auth"
+            except Exception:
+                _LOGGER.exception("Unexpected exception %s")
+                errors["base"] = "unknown"
+            else:
+                user_uuid = jwt.decode(
+                    tokens.aws_access, options={"verify_signature": False}
+                )["username"]
+                await self.async_set_unique_id(user_uuid)
+                self._abort_if_unique_id_configured()
+
+                return self.async_create_entry(
+                    title=user_input[CONF_USERNAME], data=user_input
+                )
+
+        return self.async_show_form(
+            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
+        )
diff --git a/homeassistant/components/snoo/const.py b/homeassistant/components/snoo/const.py
new file mode 100644
index 00000000000..ff8afe25056
--- /dev/null
+++ b/homeassistant/components/snoo/const.py
@@ -0,0 +1,3 @@
+"""Constants for the Happiest Baby Snoo integration."""
+
+DOMAIN = "snoo"
diff --git a/homeassistant/components/snoo/coordinator.py b/homeassistant/components/snoo/coordinator.py
new file mode 100644
index 00000000000..bc06d20955c
--- /dev/null
+++ b/homeassistant/components/snoo/coordinator.py
@@ -0,0 +1,39 @@
+"""Support for Snoo Coordinators."""
+
+import logging
+
+from python_snoo.containers import SnooData, SnooDevice
+from python_snoo.snoo import Snoo
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+
+type SnooConfigEntry = ConfigEntry[dict[str, SnooCoordinator]]
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class SnooCoordinator(DataUpdateCoordinator[SnooData]):
+    """Snoo coordinator."""
+
+    config_entry: SnooConfigEntry
+
+    def __init__(self, hass: HomeAssistant, device: SnooDevice, snoo: Snoo) -> None:
+        """Set up Snoo Coordinator."""
+        super().__init__(
+            hass,
+            name=device.name,
+            logger=_LOGGER,
+        )
+        self.device_unique_id = device.serialNumber
+        self.device = device
+        self.sensor_data_set: bool = False
+        self.snoo = snoo
+
+    async def setup(self) -> None:
+        """Perform setup needed on every coordintaor creation."""
+        await self.snoo.subscribe(self.device, self.async_set_updated_data)
+        # After we subscribe - get the status so that we have something to start with.
+        # We only need to do this once. The device will auto update otherwise.
+        await self.snoo.get_status(self.device)
diff --git a/homeassistant/components/snoo/entity.py b/homeassistant/components/snoo/entity.py
new file mode 100644
index 00000000000..25f54344674
--- /dev/null
+++ b/homeassistant/components/snoo/entity.py
@@ -0,0 +1,37 @@
+"""Base entity for the Snoo integration."""
+
+from __future__ import annotations
+
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.entity import EntityDescription
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+from .coordinator import SnooCoordinator
+
+
+class SnooDescriptionEntity(CoordinatorEntity[SnooCoordinator]):
+    """Defines an Snoo entity that uses a description."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self, coordinator: SnooCoordinator, description: EntityDescription
+    ) -> None:
+        """Initialize the Snoo entity."""
+        super().__init__(coordinator)
+        self.device = coordinator.device
+        self.entity_description = description
+        self._attr_unique_id = f"{coordinator.device_unique_id}_{description.key}"
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, coordinator.device_unique_id)},
+            name=self.device.name,
+            manufacturer="Happiest Baby",
+            model="Snoo",
+            serial_number=self.device.serialNumber,
+        )
+
+    @property
+    def available(self) -> bool:
+        """Return if entity is available."""
+        return self.coordinator.data is not None and super().available
diff --git a/homeassistant/components/snoo/event.py b/homeassistant/components/snoo/event.py
new file mode 100644
index 00000000000..5932bfd9862
--- /dev/null
+++ b/homeassistant/components/snoo/event.py
@@ -0,0 +1,62 @@
+"""Support for Snoo Events."""
+
+from homeassistant.components.event import EventEntity, EventEntityDescription
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import SnooConfigEntry
+from .entity import SnooDescriptionEntity
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: SnooConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up Snoo device."""
+    coordinators = entry.runtime_data
+    async_add_entities(
+        SnooEvent(
+            coordinator,
+            EventEntityDescription(
+                key="event",
+                translation_key="event",
+                event_types=[
+                    "timer",
+                    "cry",
+                    "command",
+                    "safety_clip",
+                    "long_activity_press",
+                    "activity",
+                    "power",
+                    "status_requested",
+                    "sticky_white_noise_updated",
+                ],
+            ),
+        )
+        for coordinator in coordinators.values()
+    )
+
+
+class SnooEvent(SnooDescriptionEntity, EventEntity):
+    """A event using Snoo coordinator."""
+
+    @callback
+    def _async_handle_event(self) -> None:
+        """Handle the demo button event."""
+        self._trigger_event(
+            self.coordinator.data.event.value,
+        )
+        self.async_write_ha_state()
+
+    async def async_added_to_hass(self) -> None:
+        """Add Event."""
+        await super().async_added_to_hass()
+        if self.coordinator.data:
+            # If we were able to get data on startup - set it
+            # Otherwise, it will update when the coordinator gets data.
+            self._async_handle_event()
+
+    def _handle_coordinator_update(self) -> None:
+        self._async_handle_event()
+        return super()._handle_coordinator_update()
diff --git a/homeassistant/components/snoo/manifest.json b/homeassistant/components/snoo/manifest.json
new file mode 100644
index 00000000000..4084a7e3e79
--- /dev/null
+++ b/homeassistant/components/snoo/manifest.json
@@ -0,0 +1,11 @@
+{
+  "domain": "snoo",
+  "name": "Happiest Baby Snoo",
+  "codeowners": ["@Lash-L"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/snoo",
+  "iot_class": "cloud_push",
+  "loggers": ["snoo"],
+  "quality_scale": "bronze",
+  "requirements": ["python-snoo==0.6.4"]
+}
diff --git a/homeassistant/components/snoo/quality_scale.yaml b/homeassistant/components/snoo/quality_scale.yaml
new file mode 100644
index 00000000000..f10bccb131a
--- /dev/null
+++ b/homeassistant/components/snoo/quality_scale.yaml
@@ -0,0 +1,72 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: |
+      This integration does not provide additional actions.
+  appropriate-polling:
+    status: exempt
+    comment: |
+      This integration does not poll.
+  brands: done
+  common-modules:
+    status: done
+    comment: |
+      There are no common patterns currenty.
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: |
+      This integration does not provide additional actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup: done
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions: todo
+  config-entry-unloading: done
+  docs-configuration-parameters: todo
+  docs-installation-parameters: todo
+  entity-unavailable: todo
+  integration-owner: done
+  log-when-unavailable: todo
+  parallel-updates: todo
+  reauthentication-flow: todo
+  test-coverage: todo
+
+  # Gold
+  devices: done
+  diagnostics: todo
+  discovery-update-info: todo
+  discovery: todo
+  docs-data-update: todo
+  docs-examples: todo
+  docs-known-limitations: todo
+  docs-supported-devices: todo
+  docs-supported-functions: todo
+  docs-troubleshooting: todo
+  docs-use-cases: todo
+  dynamic-devices: todo
+  entity-category: done
+  entity-device-class: done
+  entity-disabled-by-default: todo
+  entity-translations: done
+  exception-translations: todo
+  icon-translations: todo
+  reconfiguration-flow: todo
+  repair-issues: todo
+  stale-devices: todo
+
+  # Platinum
+  async-dependency: done
+  inject-websession: done
+  strict-typing: todo
diff --git a/homeassistant/components/snoo/select.py b/homeassistant/components/snoo/select.py
new file mode 100644
index 00000000000..44624ed1a2d
--- /dev/null
+++ b/homeassistant/components/snoo/select.py
@@ -0,0 +1,78 @@
+"""Support for Snoo Select."""
+
+from __future__ import annotations
+
+from collections.abc import Awaitable, Callable
+from dataclasses import dataclass
+
+from python_snoo.containers import SnooData, SnooDevice, SnooLevels
+from python_snoo.exceptions import SnooCommandException
+from python_snoo.snoo import Snoo
+
+from homeassistant.components.select import SelectEntity, SelectEntityDescription
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .const import DOMAIN
+from .coordinator import SnooConfigEntry
+from .entity import SnooDescriptionEntity
+
+
+@dataclass(frozen=True, kw_only=True)
+class SnooSelectEntityDescription(SelectEntityDescription):
+    """Describes a Snoo Select."""
+
+    value_fn: Callable[[SnooData], str]
+    set_value_fn: Callable[[Snoo, SnooDevice, str], Awaitable[None]]
+
+
+SELECT_DESCRIPTIONS: list[SnooSelectEntityDescription] = [
+    SnooSelectEntityDescription(
+        key="intensity",
+        translation_key="intensity",
+        value_fn=lambda data: data.state_machine.level.name,
+        set_value_fn=lambda snoo_api, device, state: snoo_api.set_level(
+            device, SnooLevels[state]
+        ),
+        options=[level.name for level in SnooLevels],
+    ),
+]
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: SnooConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up Snoo device."""
+    coordinators = entry.runtime_data
+    async_add_entities(
+        SnooSelect(coordinator, description)
+        for coordinator in coordinators.values()
+        for description in SELECT_DESCRIPTIONS
+    )
+
+
+class SnooSelect(SnooDescriptionEntity, SelectEntity):
+    """A sensor using Snoo coordinator."""
+
+    entity_description: SnooSelectEntityDescription
+
+    @property
+    def current_option(self) -> str | None:
+        """Return the selected entity option to represent the entity state."""
+        return self.entity_description.value_fn(self.coordinator.data)
+
+    async def async_select_option(self, option: str) -> None:
+        """Change the selected option."""
+        try:
+            await self.entity_description.set_value_fn(
+                self.coordinator.snoo, self.device, option
+            )
+        except SnooCommandException as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="select_failed",
+                translation_placeholders={"name": str(self.name), "option": option},
+            ) from err
diff --git a/homeassistant/components/snoo/sensor.py b/homeassistant/components/snoo/sensor.py
new file mode 100644
index 00000000000..e45b2b88592
--- /dev/null
+++ b/homeassistant/components/snoo/sensor.py
@@ -0,0 +1,71 @@
+"""Support for Snoo Sensors."""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+
+from python_snoo.containers import SnooData, SnooStates
+
+from homeassistant.components.sensor import (
+    EntityCategory,
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    StateType,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import SnooConfigEntry
+from .entity import SnooDescriptionEntity
+
+
+@dataclass(frozen=True, kw_only=True)
+class SnooSensorEntityDescription(SensorEntityDescription):
+    """Describes a Snoo sensor."""
+
+    value_fn: Callable[[SnooData], StateType]
+
+
+SENSOR_DESCRIPTIONS: list[SnooSensorEntityDescription] = [
+    SnooSensorEntityDescription(
+        key="state",
+        translation_key="state",
+        value_fn=lambda data: data.state_machine.state.name,
+        device_class=SensorDeviceClass.ENUM,
+        options=[e.name for e in SnooStates],
+    ),
+    SnooSensorEntityDescription(
+        key="time_left",
+        translation_key="time_left",
+        value_fn=lambda data: data.state_machine.time_left_timestamp,
+        device_class=SensorDeviceClass.TIMESTAMP,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+]
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: SnooConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up Snoo device."""
+    coordinators = entry.runtime_data
+    async_add_entities(
+        SnooSensor(coordinator, description)
+        for coordinator in coordinators.values()
+        for description in SENSOR_DESCRIPTIONS
+    )
+
+
+class SnooSensor(SnooDescriptionEntity, SensorEntity):
+    """A sensor using Snoo coordinator."""
+
+    entity_description: SnooSensorEntityDescription
+
+    @property
+    def native_value(self) -> StateType:
+        """Return the value reported by the sensor."""
+        return self.entity_description.value_fn(self.coordinator.data)
diff --git a/homeassistant/components/snoo/strings.json b/homeassistant/components/snoo/strings.json
new file mode 100644
index 00000000000..f7cf6a4820b
--- /dev/null
+++ b/homeassistant/components/snoo/strings.json
@@ -0,0 +1,104 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "data": {
+          "username": "[%key:common::config_flow::data::username%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "username": "Your Snoo username or email",
+          "password": "Your Snoo password"
+        }
+      }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    }
+  },
+  "exceptions": {
+    "select_failed": {
+      "message": "Error while updating {name} to {option}"
+    },
+    "switch_on_failed": {
+      "message": "Turning {name} on failed"
+    },
+    "switch_off_failed": {
+      "message": "Turning {name} off failed"
+    }
+  },
+  "entity": {
+    "binary_sensor": {
+      "left_clip": {
+        "name": "Left safety clip"
+      },
+      "right_clip": {
+        "name": "Right safety clip"
+      }
+    },
+    "event": {
+      "event": {
+        "name": "Snoo event",
+        "state_attributes": {
+          "event_type": {
+            "state": {
+              "timer": "Timer",
+              "cry": "Cry",
+              "command": "Command sent",
+              "safety_clip": "Safety clip changed",
+              "long_activity_press": "Long activity press",
+              "activity": "Activity press",
+              "power": "Power button pressed",
+              "status_requested": "Status requested",
+              "sticky_white_noise_updated": "Sleepytime sounds updated"
+            }
+          }
+        }
+      }
+    },
+    "sensor": {
+      "state": {
+        "name": "State",
+        "state": {
+          "baseline": "Baseline",
+          "level1": "Level 1",
+          "level2": "Level 2",
+          "level3": "Level 3",
+          "level4": "Level 4",
+          "stop": "Stopped",
+          "pretimeout": "Pre-timeout",
+          "timeout": "Timeout"
+        }
+      },
+      "time_left": {
+        "name": "Time left"
+      }
+    },
+    "select": {
+      "intensity": {
+        "name": "Intensity",
+        "state": {
+          "baseline": "[%key:component::snoo::entity::sensor::state::state::baseline%]",
+          "level1": "[%key:component::snoo::entity::sensor::state::state::level1%]",
+          "level2": "[%key:component::snoo::entity::sensor::state::state::level2%]",
+          "level3": "[%key:component::snoo::entity::sensor::state::state::level3%]",
+          "level4": "[%key:component::snoo::entity::sensor::state::state::level4%]",
+          "stop": "[%key:component::snoo::entity::sensor::state::state::stop%]"
+        }
+      }
+    },
+    "switch": {
+      "sticky_white_noise": {
+        "name": "Sleepytime sounds"
+      },
+      "hold": {
+        "name": "Level lock"
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/snoo/switch.py b/homeassistant/components/snoo/switch.py
new file mode 100644
index 00000000000..2ed322d5f6b
--- /dev/null
+++ b/homeassistant/components/snoo/switch.py
@@ -0,0 +1,105 @@
+"""Support for Snoo Switches."""
+
+from __future__ import annotations
+
+from collections.abc import Awaitable, Callable
+from dataclasses import dataclass
+from typing import Any
+
+from python_snoo.containers import SnooData, SnooDevice
+from python_snoo.exceptions import SnooCommandException
+from python_snoo.snoo import Snoo
+
+from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .const import DOMAIN
+from .coordinator import SnooConfigEntry
+from .entity import SnooDescriptionEntity
+
+
+@dataclass(frozen=True, kw_only=True)
+class SnooSwitchEntityDescription(SwitchEntityDescription):
+    """Describes a Snoo sensor."""
+
+    value_fn: Callable[[SnooData], bool]
+    set_value_fn: Callable[[Snoo, SnooDevice, SnooData, bool], Awaitable[None]]
+
+
+BINARY_SENSOR_DESCRIPTIONS: list[SnooSwitchEntityDescription] = [
+    SnooSwitchEntityDescription(
+        key="sticky_white_noise",
+        translation_key="sticky_white_noise",
+        value_fn=lambda data: data.state_machine.sticky_white_noise == "on",
+        set_value_fn=lambda snoo_api, device, _, state: snoo_api.set_sticky_white_noise(
+            device, state
+        ),
+    ),
+    SnooSwitchEntityDescription(
+        key="hold",
+        translation_key="hold",
+        value_fn=lambda data: data.state_machine.hold == "on",
+        set_value_fn=lambda snoo_api, device, data, state: snoo_api.set_level(
+            device, data.state_machine.level, state
+        ),
+    ),
+]
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: SnooConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up Snoo device."""
+    coordinators = entry.runtime_data
+    async_add_entities(
+        SnooSwitch(coordinator, description)
+        for coordinator in coordinators.values()
+        for description in BINARY_SENSOR_DESCRIPTIONS
+    )
+
+
+class SnooSwitch(SnooDescriptionEntity, SwitchEntity):
+    """A switch using Snoo coordinator."""
+
+    entity_description: SnooSwitchEntityDescription
+
+    @property
+    def is_on(self) -> bool | None:
+        """Return True if entity is on."""
+        return self.entity_description.value_fn(self.coordinator.data)
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the entity on."""
+        try:
+            await self.entity_description.set_value_fn(
+                self.coordinator.snoo,
+                self.coordinator.device,
+                self.coordinator.data,
+                True,
+            )
+        except SnooCommandException as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="switch_on_failed",
+                translation_placeholders={"name": str(self.name), "status": "on"},
+            ) from err
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the entity off."""
+        try:
+            await self.entity_description.set_value_fn(
+                self.coordinator.snoo,
+                self.coordinator.device,
+                self.coordinator.data,
+                False,
+            )
+        except SnooCommandException as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="switch_off_failed",
+                translation_placeholders={"name": str(self.name), "status": "off"},
+            ) from err
diff --git a/homeassistant/components/snooz/fan.py b/homeassistant/components/snooz/fan.py
index bfe773b4780..ce804450cab 100644
--- a/homeassistant/components/snooz/fan.py
+++ b/homeassistant/components/snooz/fan.py
@@ -23,7 +23,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_platform
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from .const import (
@@ -38,7 +38,9 @@ from .models import SnoozConfigurationData
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Snooz device from a config entry."""
 
diff --git a/homeassistant/components/snooz/strings.json b/homeassistant/components/snooz/strings.json
index 94ca434e589..ca252b2117c 100644
--- a/homeassistant/components/snooz/strings.json
+++ b/homeassistant/components/snooz/strings.json
@@ -27,25 +27,25 @@
   "services": {
     "transition_on": {
       "name": "Transition on",
-      "description": "Transitions to a target volume level over time.",
+      "description": "Transitions the volume level over a specified duration. If the device is powered off, the transition will start at the lowest volume level.",
       "fields": {
         "duration": {
           "name": "Transition duration",
-          "description": "Time it takes to reach the target volume level."
+          "description": "Time to transition to the target volume."
         },
         "volume": {
           "name": "Target volume",
-          "description": "If not specified, the volume level is read from the device."
+          "description": "Relative volume level. If not specified, the setting on the device is used."
         }
       }
     },
     "transition_off": {
       "name": "Transition off",
-      "description": "Transitions volume off over time.",
+      "description": "Transitions the volume level to the lowest setting over a specified duration, then powers off the device.",
       "fields": {
         "duration": {
           "name": "[%key:component::snooz::services::transition_on::fields::duration::name%]",
-          "description": "Time it takes to turn off."
+          "description": "Time to complete the transition."
         }
       }
     }
diff --git a/homeassistant/components/solaredge/coordinator.py b/homeassistant/components/solaredge/coordinator.py
index d37cf355fce..44f015eedeb 100644
--- a/homeassistant/components/solaredge/coordinator.py
+++ b/homeassistant/components/solaredge/coordinator.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from abc import ABC, abstractmethod
 from datetime import date, datetime, timedelta
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from aiosolaredge import SolarEdge
 from stringcase import snakecase
@@ -21,13 +21,22 @@ from .const import (
     POWER_FLOW_UPDATE_DELAY,
 )
 
+if TYPE_CHECKING:
+    from .types import SolarEdgeConfigEntry
+
 
 class SolarEdgeDataService(ABC):
     """Get and update the latest data."""
 
     coordinator: DataUpdateCoordinator[None]
 
-    def __init__(self, hass: HomeAssistant, api: SolarEdge, site_id: str) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: SolarEdgeConfigEntry,
+        api: SolarEdge,
+        site_id: str,
+    ) -> None:
         """Initialize the data object."""
         self.api = api
         self.site_id = site_id
@@ -36,6 +45,7 @@ class SolarEdgeDataService(ABC):
         self.attributes: dict[str, Any] = {}
 
         self.hass = hass
+        self.config_entry = config_entry
 
     @callback
     def async_setup(self) -> None:
@@ -43,6 +53,7 @@ class SolarEdgeDataService(ABC):
         self.coordinator = DataUpdateCoordinator(
             self.hass,
             LOGGER,
+            config_entry=self.config_entry,
             name=str(self),
             update_method=self.async_update_data,
             update_interval=self.update_interval,
@@ -174,9 +185,15 @@ class SolarEdgeInventoryDataService(SolarEdgeDataService):
 class SolarEdgeEnergyDetailsService(SolarEdgeDataService):
     """Get and update the latest power flow data."""
 
-    def __init__(self, hass: HomeAssistant, api: SolarEdge, site_id: str) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: SolarEdgeConfigEntry,
+        api: SolarEdge,
+        site_id: str,
+    ) -> None:
         """Initialize the power flow data service."""
-        super().__init__(hass, api, site_id)
+        super().__init__(hass, config_entry, api, site_id)
 
         self.unit = None
 
@@ -234,9 +251,15 @@ class SolarEdgeEnergyDetailsService(SolarEdgeDataService):
 class SolarEdgePowerFlowDataService(SolarEdgeDataService):
     """Get and update the latest power flow data."""
 
-    def __init__(self, hass: HomeAssistant, api: SolarEdge, site_id: str) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: SolarEdgeConfigEntry,
+        api: SolarEdge,
+        site_id: str,
+    ) -> None:
         """Initialize the power flow data service."""
-        super().__init__(hass, api, site_id)
+        super().__init__(hass, config_entry, api, site_id)
 
         self.unit = None
 
diff --git a/homeassistant/components/solaredge/sensor.py b/homeassistant/components/solaredge/sensor.py
index 4b2398d15c2..acb86f875c9 100644
--- a/homeassistant/components/solaredge/sensor.py
+++ b/homeassistant/components/solaredge/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import PERCENTAGE, UnitOfEnergy, UnitOfPower
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -201,12 +201,12 @@ SENSOR_TYPES = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SolarEdgeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add an solarEdge entry."""
     # Add the needed sensors to hass
     api = entry.runtime_data[DATA_API_CLIENT]
-    sensor_factory = SolarEdgeSensorFactory(hass, entry.data[CONF_SITE_ID], api)
+    sensor_factory = SolarEdgeSensorFactory(hass, entry, entry.data[CONF_SITE_ID], api)
     for service in sensor_factory.all_services:
         service.async_setup()
         await service.coordinator.async_refresh()
@@ -222,14 +222,20 @@ async def async_setup_entry(
 class SolarEdgeSensorFactory:
     """Factory which creates sensors based on the sensor_key."""
 
-    def __init__(self, hass: HomeAssistant, site_id: str, api: SolarEdge) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: SolarEdgeConfigEntry,
+        site_id: str,
+        api: SolarEdge,
+    ) -> None:
         """Initialize the factory."""
 
-        details = SolarEdgeDetailsDataService(hass, api, site_id)
-        overview = SolarEdgeOverviewDataService(hass, api, site_id)
-        inventory = SolarEdgeInventoryDataService(hass, api, site_id)
-        flow = SolarEdgePowerFlowDataService(hass, api, site_id)
-        energy = SolarEdgeEnergyDetailsService(hass, api, site_id)
+        details = SolarEdgeDetailsDataService(hass, config_entry, api, site_id)
+        overview = SolarEdgeOverviewDataService(hass, config_entry, api, site_id)
+        inventory = SolarEdgeInventoryDataService(hass, config_entry, api, site_id)
+        flow = SolarEdgePowerFlowDataService(hass, config_entry, api, site_id)
+        energy = SolarEdgeEnergyDetailsService(hass, config_entry, api, site_id)
 
         self.all_services = (details, overview, inventory, flow, energy)
 
diff --git a/homeassistant/components/solaredge/strings.json b/homeassistant/components/solaredge/strings.json
index 2b626987546..105a9282a6d 100644
--- a/homeassistant/components/solaredge/strings.json
+++ b/homeassistant/components/solaredge/strings.json
@@ -5,7 +5,7 @@
         "title": "Define the API parameters for this installation",
         "data": {
           "name": "The name of this installation",
-          "site_id": "The SolarEdge site-id",
+          "site_id": "The SolarEdge site ID",
           "api_key": "[%key:common::config_flow::data::api_key%]"
         }
       }
@@ -14,7 +14,7 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]",
       "site_not_active": "The site is not active",
-      "could_not_connect": "Could not connect to the solaredge API"
+      "could_not_connect": "Could not connect to the SolarEdge API"
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
@@ -65,7 +65,7 @@
         "name": "Grid power"
       },
       "storage_power": {
-        "name": "Stored power"
+        "name": "Storage power"
       },
       "purchased_energy": {
         "name": "Imported energy"
diff --git a/homeassistant/components/solaredge_local/sensor.py b/homeassistant/components/solaredge_local/sensor.py
index a7940aa34b5..80c418ef132 100644
--- a/homeassistant/components/solaredge_local/sensor.py
+++ b/homeassistant/components/solaredge_local/sensor.py
@@ -29,7 +29,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/solarlog/__init__.py b/homeassistant/components/solarlog/__init__.py
index 5937c8a496d..7ad1ec8e547 100644
--- a/homeassistant/components/solarlog/__init__.py
+++ b/homeassistant/components/solarlog/__init__.py
@@ -2,18 +2,16 @@
 
 import logging
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
 from .const import CONF_HAS_PWD
-from .coordinator import SolarLogCoordinator
+from .coordinator import SolarlogConfigEntry, SolarLogCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS = [Platform.SENSOR]
-type SolarlogConfigEntry = ConfigEntry[SolarLogCoordinator]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: SolarlogConfigEntry) -> bool:
diff --git a/homeassistant/components/solarlog/coordinator.py b/homeassistant/components/solarlog/coordinator.py
index 11f268db32a..48ebeece1ba 100644
--- a/homeassistant/components/solarlog/coordinator.py
+++ b/homeassistant/components/solarlog/coordinator.py
@@ -5,7 +5,6 @@ from __future__ import annotations
 from collections.abc import Callable
 from datetime import timedelta
 import logging
-from typing import TYPE_CHECKING
 from urllib.parse import ParseResult, urlparse
 
 from solarlog_cli.solarlog_connector import SolarLogConnector
@@ -16,11 +15,12 @@ from solarlog_cli.solarlog_exceptions import (
 )
 from solarlog_cli.solarlog_models import SolarlogData
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.device_registry as dr
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from homeassistant.util import slugify
 
@@ -28,30 +28,35 @@ from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
-if TYPE_CHECKING:
-    from . import SolarlogConfigEntry
+type SolarlogConfigEntry = ConfigEntry[SolarLogCoordinator]
 
 
 class SolarLogCoordinator(DataUpdateCoordinator[SolarlogData]):
     """Get and update the latest data."""
 
-    def __init__(self, hass: HomeAssistant, entry: SolarlogConfigEntry) -> None:
+    config_entry: SolarlogConfigEntry
+
+    def __init__(self, hass: HomeAssistant, config_entry: SolarlogConfigEntry) -> None:
         """Initialize the data object."""
         super().__init__(
-            hass, _LOGGER, name="SolarLog", update_interval=timedelta(seconds=60)
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name="SolarLog",
+            update_interval=timedelta(seconds=60),
         )
 
         self.new_device_callbacks: list[Callable[[int], None]] = []
         self._devices_last_update: set[tuple[int, str]] = set()
 
-        host_entry = entry.data[CONF_HOST]
-        password = entry.data.get("password", "")
+        host_entry = config_entry.data[CONF_HOST]
+        password = config_entry.data.get("password", "")
 
         url = urlparse(host_entry, "http")
         netloc = url.netloc or url.path
         path = url.path if url.netloc else ""
         url = ParseResult("http", netloc, path, *url[3:])
-        self.unique_id = entry.entry_id
+        self.unique_id = config_entry.entry_id
         self.host = url.geturl()
 
         self.solarlog = SolarLogConnector(
@@ -70,7 +75,7 @@ class SolarLogCoordinator(DataUpdateCoordinator[SolarlogData]):
                 await self.solarlog.test_extended_data_available()
         if logged_in or await self.solarlog.test_extended_data_available():
             device_list = await self.solarlog.update_device_list()
-            self.solarlog.set_enabled_devices({key: True for key in device_list})
+            self.solarlog.set_enabled_devices(dict.fromkeys(device_list, True))
 
     async def _async_update_data(self) -> SolarlogData:
         """Update the data from the SolarLog device."""
diff --git a/homeassistant/components/solarlog/diagnostics.py b/homeassistant/components/solarlog/diagnostics.py
index 02f6c96edc2..c99222542ea 100644
--- a/homeassistant/components/solarlog/diagnostics.py
+++ b/homeassistant/components/solarlog/diagnostics.py
@@ -8,7 +8,7 @@ from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
 
-from . import SolarlogConfigEntry
+from .coordinator import SolarlogConfigEntry
 
 TO_REDACT = [
     CONF_HOST,
diff --git a/homeassistant/components/solarlog/sensor.py b/homeassistant/components/solarlog/sensor.py
index bcff5d57e1b..c4bb119c006 100644
--- a/homeassistant/components/solarlog/sensor.py
+++ b/homeassistant/components/solarlog/sensor.py
@@ -21,10 +21,10 @@ from homeassistant.const import (
     UnitOfPower,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import SolarlogConfigEntry
+from .coordinator import SolarlogConfigEntry
 from .entity import SolarLogCoordinatorEntity, SolarLogInverterEntity
 
 
@@ -276,7 +276,7 @@ INVERTER_SENSOR_TYPES: tuple[SolarLogInverterSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SolarlogConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add solarlog entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/solax/config_flow.py b/homeassistant/components/solax/config_flow.py
index e6c60667869..5baead641fc 100644
--- a/homeassistant/components/solax/config_flow.py
+++ b/homeassistant/components/solax/config_flow.py
@@ -11,7 +11,7 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_IP_ADDRESS, CONF_PASSWORD, CONF_PORT
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import DOMAIN
 
diff --git a/homeassistant/components/solax/manifest.json b/homeassistant/components/solax/manifest.json
index 925f11e4c65..5509901ae02 100644
--- a/homeassistant/components/solax/manifest.json
+++ b/homeassistant/components/solax/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "solax",
   "name": "SolaX Power",
-  "codeowners": ["@squishykid"],
+  "codeowners": ["@squishykid", "@Darsstar"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/solax",
   "iot_class": "local_polling",
diff --git a/homeassistant/components/solax/sensor.py b/homeassistant/components/solax/sensor.py
index 6ca0bac0c38..1cdec0389fe 100644
--- a/homeassistant/components/solax/sensor.py
+++ b/homeassistant/components/solax/sensor.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import SolaxConfigEntry
@@ -89,7 +89,7 @@ SENSOR_DESCRIPTIONS: dict[tuple[Units, bool], SensorEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SolaxConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Entry setup."""
     api = entry.runtime_data.api
diff --git a/homeassistant/components/soma/__init__.py b/homeassistant/components/soma/__init__.py
index 9ffe5539ff3..127b51338ee 100644
--- a/homeassistant/components/soma/__init__.py
+++ b/homeassistant/components/soma/__init__.py
@@ -9,7 +9,7 @@ from homeassistant import config_entries
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PORT, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import API, DEVICES, DOMAIN, HOST, PORT
diff --git a/homeassistant/components/soma/cover.py b/homeassistant/components/soma/cover.py
index e64fee00f16..15aa21b1f48 100644
--- a/homeassistant/components/soma/cover.py
+++ b/homeassistant/components/soma/cover.py
@@ -14,7 +14,7 @@ from homeassistant.components.cover import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import API, DEVICES, DOMAIN
 from .entity import SomaEntity
@@ -24,7 +24,7 @@ from .utils import is_api_response_success
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Soma cover platform."""
 
diff --git a/homeassistant/components/soma/entity.py b/homeassistant/components/soma/entity.py
index f9824d107b1..4b2fcee5405 100644
--- a/homeassistant/components/soma/entity.py
+++ b/homeassistant/components/soma/entity.py
@@ -71,7 +71,7 @@ class SomaEntity(Entity):
         self.api_is_available = True
 
     @property
-    def available(self):
+    def available(self) -> bool:
         """Return true if the last API commands returned successfully."""
         return self.is_available
 
diff --git a/homeassistant/components/soma/sensor.py b/homeassistant/components/soma/sensor.py
index 806886009f3..839f28e9a65 100644
--- a/homeassistant/components/soma/sensor.py
+++ b/homeassistant/components/soma/sensor.py
@@ -6,7 +6,7 @@ from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import Throttle
 
 from .const import API, DEVICES, DOMAIN
@@ -18,7 +18,7 @@ MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=30)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Soma sensor platform."""
 
diff --git a/homeassistant/components/somfy_mylink/cover.py b/homeassistant/components/somfy_mylink/cover.py
index 8c64e58362b..5b888ea4b96 100644
--- a/homeassistant/components/somfy_mylink/cover.py
+++ b/homeassistant/components/somfy_mylink/cover.py
@@ -7,7 +7,7 @@ from homeassistant.components.cover import CoverDeviceClass, CoverEntity, CoverS
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from .const import (
@@ -29,7 +29,7 @@ MYLINK_COVER_TYPE_TO_DEVICE_CLASS = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Discover and configure Somfy covers."""
     reversed_target_ids = config_entry.options.get(CONF_REVERSED_TARGET_IDS, {})
diff --git a/homeassistant/components/sonarr/__init__.py b/homeassistant/components/sonarr/__init__.py
index 7718ff799f5..960227ff0da 100644
--- a/homeassistant/components/sonarr/__init__.py
+++ b/homeassistant/components/sonarr/__init__.py
@@ -67,13 +67,19 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     )
     entry.async_on_unload(entry.add_update_listener(_async_update_listener))
     coordinators: dict[str, SonarrDataUpdateCoordinator[Any]] = {
-        "upcoming": CalendarDataUpdateCoordinator(hass, host_configuration, sonarr),
-        "commands": CommandsDataUpdateCoordinator(hass, host_configuration, sonarr),
-        "diskspace": DiskSpaceDataUpdateCoordinator(hass, host_configuration, sonarr),
-        "queue": QueueDataUpdateCoordinator(hass, host_configuration, sonarr),
-        "series": SeriesDataUpdateCoordinator(hass, host_configuration, sonarr),
-        "status": StatusDataUpdateCoordinator(hass, host_configuration, sonarr),
-        "wanted": WantedDataUpdateCoordinator(hass, host_configuration, sonarr),
+        "upcoming": CalendarDataUpdateCoordinator(
+            hass, entry, host_configuration, sonarr
+        ),
+        "commands": CommandsDataUpdateCoordinator(
+            hass, entry, host_configuration, sonarr
+        ),
+        "diskspace": DiskSpaceDataUpdateCoordinator(
+            hass, entry, host_configuration, sonarr
+        ),
+        "queue": QueueDataUpdateCoordinator(hass, entry, host_configuration, sonarr),
+        "series": SeriesDataUpdateCoordinator(hass, entry, host_configuration, sonarr),
+        "status": StatusDataUpdateCoordinator(hass, entry, host_configuration, sonarr),
+        "wanted": WantedDataUpdateCoordinator(hass, entry, host_configuration, sonarr),
     }
     # Temporary, until we add diagnostic entities
     _version = None
diff --git a/homeassistant/components/sonarr/coordinator.py b/homeassistant/components/sonarr/coordinator.py
index 2d807bcf140..a73ef838590 100644
--- a/homeassistant/components/sonarr/coordinator.py
+++ b/homeassistant/components/sonarr/coordinator.py
@@ -22,7 +22,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import CONF_UPCOMING_DAYS, CONF_WANTED_MAX_ITEMS, DOMAIN, LOGGER
 
@@ -48,6 +48,7 @@ class SonarrDataUpdateCoordinator(DataUpdateCoordinator[SonarrDataT]):
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         host_configuration: PyArrHostConfiguration,
         api_client: SonarrClient,
     ) -> None:
@@ -55,6 +56,7 @@ class SonarrDataUpdateCoordinator(DataUpdateCoordinator[SonarrDataT]):
         super().__init__(
             hass=hass,
             logger=LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=30),
         )
diff --git a/homeassistant/components/sonarr/sensor.py b/homeassistant/components/sonarr/sensor.py
index f25c885ed84..983ac76d93e 100644
--- a/homeassistant/components/sonarr/sensor.py
+++ b/homeassistant/components/sonarr/sensor.py
@@ -23,9 +23,9 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfInformation
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN
 from .coordinator import SonarrDataT, SonarrDataUpdateCoordinator
@@ -90,7 +90,6 @@ SENSOR_TYPES: dict[str, SonarrSensorEntityDescription[Any]] = {
     "commands": SonarrSensorEntityDescription[list[Command]](
         key="commands",
         translation_key="commands",
-        native_unit_of_measurement="Commands",
         entity_registry_enabled_default=False,
         value_fn=len,
         attributes_fn=lambda data: {c.name: c.status for c in data},
@@ -107,7 +106,6 @@ SENSOR_TYPES: dict[str, SonarrSensorEntityDescription[Any]] = {
     "queue": SonarrSensorEntityDescription[SonarrQueue](
         key="queue",
         translation_key="queue",
-        native_unit_of_measurement="Episodes",
         entity_registry_enabled_default=False,
         value_fn=lambda data: data.totalRecords,
         attributes_fn=get_queue_attr,
@@ -115,7 +113,6 @@ SENSOR_TYPES: dict[str, SonarrSensorEntityDescription[Any]] = {
     "series": SonarrSensorEntityDescription[list[SonarrSeries]](
         key="series",
         translation_key="series",
-        native_unit_of_measurement="Series",
         entity_registry_enabled_default=False,
         value_fn=len,
         attributes_fn=lambda data: {
@@ -129,7 +126,6 @@ SENSOR_TYPES: dict[str, SonarrSensorEntityDescription[Any]] = {
     "upcoming": SonarrSensorEntityDescription[list[SonarrCalendar]](
         key="upcoming",
         translation_key="upcoming",
-        native_unit_of_measurement="Episodes",
         value_fn=len,
         attributes_fn=lambda data: {
             e.series.title: f"S{e.seasonNumber:02d}E{e.episodeNumber:02d}" for e in data
@@ -138,7 +134,6 @@ SENSOR_TYPES: dict[str, SonarrSensorEntityDescription[Any]] = {
     "wanted": SonarrSensorEntityDescription[SonarrWantedMissing](
         key="wanted",
         translation_key="wanted",
-        native_unit_of_measurement="Episodes",
         entity_registry_enabled_default=False,
         value_fn=lambda data: data.totalRecords,
         attributes_fn=get_wanted_attr,
@@ -149,7 +144,7 @@ SENSOR_TYPES: dict[str, SonarrSensorEntityDescription[Any]] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Sonarr sensors based on a config entry."""
     coordinators: dict[str, SonarrDataUpdateCoordinator[Any]] = hass.data[DOMAIN][
diff --git a/homeassistant/components/sonarr/strings.json b/homeassistant/components/sonarr/strings.json
index 5b17f3283e8..940ec650270 100644
--- a/homeassistant/components/sonarr/strings.json
+++ b/homeassistant/components/sonarr/strings.json
@@ -37,22 +37,27 @@
   "entity": {
     "sensor": {
       "commands": {
-        "name": "Commands"
+        "name": "Commands",
+        "unit_of_measurement": "commands"
       },
       "diskspace": {
         "name": "Disk space"
       },
       "queue": {
-        "name": "Queue"
+        "name": "Queue",
+        "unit_of_measurement": "episodes"
       },
       "series": {
-        "name": "Shows"
+        "name": "Shows",
+        "unit_of_measurement": "series"
       },
       "upcoming": {
-        "name": "Upcoming"
+        "name": "Upcoming",
+        "unit_of_measurement": "[%key:component::sonarr::entity::sensor::queue::unit_of_measurement%]"
       },
       "wanted": {
-        "name": "Wanted"
+        "name": "Wanted",
+        "unit_of_measurement": "[%key:component::sonarr::entity::sensor::queue::unit_of_measurement%]"
       }
     }
   }
diff --git a/homeassistant/components/songpal/media_player.py b/homeassistant/components/songpal/media_player.py
index b4063b09691..3fc75d712a7 100644
--- a/homeassistant/components/songpal/media_player.py
+++ b/homeassistant/components/songpal/media_player.py
@@ -34,7 +34,10 @@ from homeassistant.helpers import (
     entity_platform,
 )
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import CONF_ENDPOINT, DOMAIN, ERROR_REQUEST_RETRY, SET_SOUND_SETTING
@@ -63,7 +66,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up songpal media player."""
     name = config_entry.data[CONF_NAME]
diff --git a/homeassistant/components/sonos/__init__.py b/homeassistant/components/sonos/__init__.py
index 98bff8d2934..24580971ae2 100644
--- a/homeassistant/components/sonos/__init__.py
+++ b/homeassistant/components/sonos/__init__.py
@@ -7,6 +7,7 @@ from collections import OrderedDict
 from dataclasses import dataclass, field
 import datetime
 from functools import partial
+from ipaddress import AddressValueError, IPv4Address
 import logging
 import socket
 from typing import Any, cast
@@ -34,7 +35,11 @@ from homeassistant.helpers import (
 )
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.event import async_call_later, async_track_time_interval
-from homeassistant.helpers.service_info.ssdp import SsdpServiceInfo
+from homeassistant.helpers.service_info.ssdp import (
+    ATTR_UPNP_MODEL_NAME,
+    ATTR_UPNP_UDN,
+    SsdpServiceInfo,
+)
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.async_ import create_eager_task
 
@@ -204,6 +209,14 @@ class SonosDiscoveryManager:
 
     async def async_subscribe_to_zone_updates(self, ip_address: str) -> None:
         """Test subscriptions and create SonosSpeakers based on results."""
+        try:
+            _ = IPv4Address(ip_address)
+        except AddressValueError:
+            _LOGGER.debug(
+                "Sonos integration only supports IPv4 addresses, invalid ip_address received: %s",
+                ip_address,
+            )
+            return
         soco = SoCo(ip_address)
         # Cache now to avoid household ID lookup during first ZoneGroupState processing
         await self.hass.async_add_executor_job(
@@ -503,7 +516,7 @@ class SonosDiscoveryManager:
     def _async_ssdp_discovered_player(
         self, info: SsdpServiceInfo, change: ssdp.SsdpChange
     ) -> None:
-        uid = info.upnp[ssdp.ATTR_UPNP_UDN]
+        uid = info.upnp[ATTR_UPNP_UDN]
         if not uid.startswith("uuid:RINCON_"):
             return
         uid = uid[5:]
@@ -522,7 +535,7 @@ class SonosDiscoveryManager:
             cast(str, urlparse(info.ssdp_location).hostname),
             uid,
             info.ssdp_headers.get("X-RINCON-BOOTSEQ"),
-            cast(str, info.upnp.get(ssdp.ATTR_UPNP_MODEL_NAME)),
+            cast(str, info.upnp.get(ATTR_UPNP_MODEL_NAME)),
             None,
         )
 
diff --git a/homeassistant/components/sonos/alarms.py b/homeassistant/components/sonos/alarms.py
index a18598fc545..afbff8baa6d 100644
--- a/homeassistant/components/sonos/alarms.py
+++ b/homeassistant/components/sonos/alarms.py
@@ -66,7 +66,10 @@ class SonosAlarms(SonosHouseholdCoordinator):
         event_id = event.variables["alarm_list_version"].split(":")[-1]
         event_id = int(event_id)
         async with self.cache_update_lock:
-            if event_id <= self.last_processed_event_id:
+            if (
+                self.last_processed_event_id
+                and event_id <= self.last_processed_event_id
+            ):
                 # Skip updates if this event_id has already been seen
                 return
             speaker.event_stats.process(event)
diff --git a/homeassistant/components/sonos/binary_sensor.py b/homeassistant/components/sonos/binary_sensor.py
index 2c1e8af9961..322beaed092 100644
--- a/homeassistant/components/sonos/binary_sensor.py
+++ b/homeassistant/components/sonos/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import SONOS_CREATE_BATTERY, SONOS_CREATE_MIC_SENSOR
 from .entity import SonosEntity
@@ -28,7 +28,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Sonos from a config entry."""
 
diff --git a/homeassistant/components/sonos/config_flow.py b/homeassistant/components/sonos/config_flow.py
index 057cdb8ec08..b5e2c684281 100644
--- a/homeassistant/components/sonos/config_flow.py
+++ b/homeassistant/components/sonos/config_flow.py
@@ -31,6 +31,8 @@ class SonosDiscoveryFlowHandler(DiscoveryFlowHandler[Awaitable[bool]], domain=DO
         hostname = discovery_info.hostname
         if hostname is None or not hostname.lower().startswith("sonos"):
             return self.async_abort(reason="not_sonos_device")
+        if discovery_info.ip_address.version != 4:
+            return self.async_abort(reason="not_ipv4_address")
         if discovery_manager := self.hass.data.get(DATA_SONOS_DISCOVERY_MANAGER):
             host = discovery_info.host
             mdns_name = discovery_info.name
diff --git a/homeassistant/components/sonos/const.py b/homeassistant/components/sonos/const.py
index 610a68afedf..cda40729dbc 100644
--- a/homeassistant/components/sonos/const.py
+++ b/homeassistant/components/sonos/const.py
@@ -32,6 +32,7 @@ SONOS_TRACKS = "tracks"
 SONOS_COMPOSER = "composers"
 SONOS_RADIO = "radio"
 SONOS_OTHER_ITEM = "other items"
+SONOS_AUDIO_BOOK = "audio book"
 
 SONOS_STATE_PLAYING = "PLAYING"
 SONOS_STATE_TRANSITIONING = "TRANSITIONING"
@@ -67,6 +68,7 @@ SONOS_TO_MEDIA_CLASSES = {
     "object.item": MediaClass.TRACK,
     "object.item.audioItem.musicTrack": MediaClass.TRACK,
     "object.item.audioItem.audioBroadcast": MediaClass.GENRE,
+    "object.item.audioItem.audioBook": MediaClass.TRACK,
 }
 
 SONOS_TO_MEDIA_TYPES = {
@@ -84,6 +86,7 @@ SONOS_TO_MEDIA_TYPES = {
     "object.container.playlistContainer.sameArtist": MediaType.ARTIST,
     "object.container.playlistContainer": MediaType.PLAYLIST,
     "object.item.audioItem.musicTrack": MediaType.TRACK,
+    "object.item.audioItem.audioBook": MediaType.TRACK,
 }
 
 MEDIA_TYPES_TO_SONOS: dict[MediaType | str, str] = {
@@ -113,6 +116,7 @@ SONOS_TYPES_MAPPING = {
     "object.item": SONOS_OTHER_ITEM,
     "object.item.audioItem.musicTrack": SONOS_TRACKS,
     "object.item.audioItem.audioBroadcast": SONOS_RADIO,
+    "object.item.audioItem.audioBook": SONOS_AUDIO_BOOK,
 }
 
 LIBRARY_TITLES_MAPPING = {
@@ -170,6 +174,7 @@ MODELS_TV_ONLY = (
     "BEAM",
     "PLAYBAR",
     "PLAYBASE",
+    "ULTRA",
 )
 MODELS_LINEIN_AND_TV = ("AMP",)
 
diff --git a/homeassistant/components/sonos/entity.py b/homeassistant/components/sonos/entity.py
index 98dc8b8b752..a9a76b3b4d0 100644
--- a/homeassistant/components/sonos/entity.py
+++ b/homeassistant/components/sonos/entity.py
@@ -8,7 +8,7 @@ import logging
 
 from soco.core import SoCo
 
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity
diff --git a/homeassistant/components/sonos/favorites.py b/homeassistant/components/sonos/favorites.py
index 5050555a7cb..333c4809e62 100644
--- a/homeassistant/components/sonos/favorites.py
+++ b/homeassistant/components/sonos/favorites.py
@@ -105,7 +105,7 @@ class SonosFavorites(SonosHouseholdCoordinator):
     @soco_error()
     def update_cache(self, soco: SoCo, update_id: int | None = None) -> bool:
         """Update cache of known favorites and return if cache has changed."""
-        new_favorites = soco.music_library.get_sonos_favorites()
+        new_favorites = soco.music_library.get_sonos_favorites(full_album_art_uri=True)
 
         # Polled update_id values do not match event_id values
         # Each speaker can return a different polled update_id
diff --git a/homeassistant/components/sonos/manifest.json b/homeassistant/components/sonos/manifest.json
index 76a7d0bfa91..5bbfc33ae5b 100644
--- a/homeassistant/components/sonos/manifest.json
+++ b/homeassistant/components/sonos/manifest.json
@@ -7,8 +7,8 @@
   "dependencies": ["ssdp"],
   "documentation": "https://www.home-assistant.io/integrations/sonos",
   "iot_class": "local_push",
-  "loggers": ["soco"],
-  "requirements": ["soco==0.30.6", "sonos-websocket==0.1.3"],
+  "loggers": ["soco", "sonos_websocket"],
+  "requirements": ["soco==0.30.9", "sonos-websocket==0.1.3"],
   "ssdp": [
     {
       "st": "urn:schemas-upnp-org:device:ZonePlayer:1"
diff --git a/homeassistant/components/sonos/media_browser.py b/homeassistant/components/sonos/media_browser.py
index 995d6cea08c..16b425dae50 100644
--- a/homeassistant/components/sonos/media_browser.py
+++ b/homeassistant/components/sonos/media_browser.py
@@ -165,6 +165,8 @@ async def async_browse_media(
             favorites_folder_payload,
             speaker.favorites,
             media_content_id,
+            media,
+            get_browse_image_url,
         )
 
     payload = {
@@ -443,7 +445,10 @@ def favorites_payload(favorites: SonosFavorites) -> BrowseMedia:
 
 
 def favorites_folder_payload(
-    favorites: SonosFavorites, media_content_id: str
+    favorites: SonosFavorites,
+    media_content_id: str,
+    media: SonosMedia,
+    get_browse_image_url: GetBrowseImageUrlType,
 ) -> BrowseMedia:
     """Create response payload to describe all items of a type of favorite.
 
@@ -463,7 +468,14 @@ def favorites_folder_payload(
                 media_content_type="favorite_item_id",
                 can_play=True,
                 can_expand=False,
-                thumbnail=getattr(favorite, "album_art_uri", None),
+                thumbnail=get_thumbnail_url_full(
+                    media=media,
+                    is_internal=True,
+                    media_content_type="favorite_item_id",
+                    media_content_id=favorite.item_id,
+                    get_browse_image_url=get_browse_image_url,
+                    item=favorite,
+                ),
             )
         )
 
diff --git a/homeassistant/components/sonos/media_player.py b/homeassistant/components/sonos/media_player.py
index 8d0917c5dba..a774de0ae5b 100644
--- a/homeassistant/components/sonos/media_player.py
+++ b/homeassistant/components/sonos/media_player.py
@@ -46,7 +46,7 @@ from homeassistant.core import HomeAssistant, ServiceCall, SupportsResponse, cal
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import config_validation as cv, entity_platform, service
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 
 from . import UnjoinData, media_browser
@@ -108,7 +108,7 @@ ATTR_QUEUE_POSITION = "queue_position"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Sonos from a config entry."""
     platform = entity_platform.async_get_current_platform()
@@ -462,11 +462,20 @@ class SonosMediaPlayerEntity(SonosEntity, MediaPlayerEntity):
         """Play a favorite."""
         uri = favorite.reference.get_uri()
         soco = self.coordinator.soco
-        if soco.music_source_from_uri(uri) in [
-            MUSIC_SRC_RADIO,
-            MUSIC_SRC_LINE_IN,
-        ]:
-            soco.play_uri(uri, title=favorite.title, timeout=LONG_SERVICE_TIMEOUT)
+        if (
+            soco.music_source_from_uri(uri)
+            in [
+                MUSIC_SRC_RADIO,
+                MUSIC_SRC_LINE_IN,
+            ]
+            or favorite.reference.item_class == "object.item.audioItem.audioBook"
+        ):
+            soco.play_uri(
+                uri,
+                title=favorite.title,
+                meta=favorite.resource_meta_data,
+                timeout=LONG_SERVICE_TIMEOUT,
+            )
         else:
             soco.clear_queue()
             soco.add_to_queue(favorite.reference, timeout=LONG_SERVICE_TIMEOUT)
diff --git a/homeassistant/components/sonos/number.py b/homeassistant/components/sonos/number.py
index 272218cc01e..c23ba51a877 100644
--- a/homeassistant/components/sonos/number.py
+++ b/homeassistant/components/sonos/number.py
@@ -10,7 +10,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import SONOS_CREATE_LEVELS
 from .entity import SonosEntity
@@ -70,7 +70,7 @@ LEVEL_FROM_NUMBER = {"balance": _balance_from_number}
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Sonos number platform from a config entry."""
 
diff --git a/homeassistant/components/sonos/sensor.py b/homeassistant/components/sonos/sensor.py
index a089c09b33c..d888ee669bb 100644
--- a/homeassistant/components/sonos/sensor.py
+++ b/homeassistant/components/sonos/sensor.py
@@ -9,7 +9,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     SONOS_CREATE_AUDIO_FORMAT_SENSOR,
@@ -29,7 +29,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Sonos from a config entry."""
 
diff --git a/homeassistant/components/sonos/strings.json b/homeassistant/components/sonos/strings.json
index d3774e85213..433bb3cc36a 100644
--- a/homeassistant/components/sonos/strings.json
+++ b/homeassistant/components/sonos/strings.json
@@ -8,7 +8,8 @@
     "abort": {
       "not_sonos_device": "Discovered device is not a Sonos device",
       "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
-      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
+      "not_ipv4_address": "No IPv4 address in SSDP discovery information"
     }
   },
   "issues": {
@@ -87,7 +88,7 @@
   "services": {
     "snapshot": {
       "name": "Snapshot",
-      "description": "Takes a snapshot of the media player.",
+      "description": "Takes a snapshot of a media player.",
       "fields": {
         "entity_id": {
           "name": "Entity",
@@ -95,13 +96,13 @@
         },
         "with_group": {
           "name": "With group",
-          "description": "True or False. Also snapshot the group layout."
+          "description": "Whether the snapshot should include the group layout and the state of other speakers in the group."
         }
       }
     },
     "restore": {
       "name": "Restore",
-      "description": "Restores a snapshot of the media player.",
+      "description": "Restores a snapshot of a media player.",
       "fields": {
         "entity_id": {
           "name": "Entity",
@@ -109,7 +110,7 @@
         },
         "with_group": {
           "name": "[%key:component::sonos::services::snapshot::fields::with_group::name%]",
-          "description": "True or False. Also restore the group layout."
+          "description": "Whether the group layout and the state of other speakers in the group should also be restored."
         }
       }
     },
@@ -129,7 +130,7 @@
     },
     "play_queue": {
       "name": "Play queue",
-      "description": "Start playing the queue from the first item.",
+      "description": "Starts playing the queue from the first item.",
       "fields": {
         "queue_position": {
           "name": "Queue position",
@@ -153,23 +154,23 @@
       "fields": {
         "alarm_id": {
           "name": "Alarm ID",
-          "description": "ID for the alarm to be updated."
+          "description": "The ID of the alarm to be updated."
         },
         "time": {
           "name": "Time",
-          "description": "Set time for the alarm."
+          "description": "The time for the alarm."
         },
         "volume": {
           "name": "Volume",
-          "description": "Set alarm volume level."
+          "description": "The alarm volume level."
         },
         "enabled": {
           "name": "Alarm enabled",
-          "description": "Enable or disable the alarm."
+          "description": "Whether or not to enable the alarm."
         },
         "include_linked_zones": {
           "name": "Include linked zones",
-          "description": "Enable or disable including grouped rooms."
+          "description": "Whether the alarm also plays on grouped players."
         }
       }
     },
diff --git a/homeassistant/components/sonos/switch.py b/homeassistant/components/sonos/switch.py
index 4bf5487b1a6..ce4774a4138 100644
--- a/homeassistant/components/sonos/switch.py
+++ b/homeassistant/components/sonos/switch.py
@@ -15,7 +15,7 @@ from homeassistant.const import ATTR_TIME, EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_track_time_change
 
 from .const import (
@@ -74,7 +74,7 @@ WEEKEND_DAYS = (0, 6)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Sonos from a config entry."""
 
diff --git a/homeassistant/components/sony_projector/switch.py b/homeassistant/components/sony_projector/switch.py
index e018c06e050..f024c4ef4f7 100644
--- a/homeassistant/components/sony_projector/switch.py
+++ b/homeassistant/components/sony_projector/switch.py
@@ -14,7 +14,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import CONF_HOST, CONF_NAME, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/soundtouch/__init__.py b/homeassistant/components/soundtouch/__init__.py
index c35c1e6f9c3..49750bc9baf 100644
--- a/homeassistant/components/soundtouch/__init__.py
+++ b/homeassistant/components/soundtouch/__init__.py
@@ -9,7 +9,7 @@ import voluptuous as vol
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
diff --git a/homeassistant/components/soundtouch/media_player.py b/homeassistant/components/soundtouch/media_player.py
index 5edd42b931a..c540b8dfd64 100644
--- a/homeassistant/components/soundtouch/media_player.py
+++ b/homeassistant/components/soundtouch/media_player.py
@@ -27,7 +27,7 @@ from homeassistant.helpers.device_registry import (
     DeviceInfo,
     format_mac,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 
@@ -47,7 +47,7 @@ ATTR_SOUNDTOUCH_ZONE = "soundtouch_zone"
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Bose SoundTouch media player based on a config entry."""
     device = hass.data[DOMAIN][entry.entry_id].device
diff --git a/homeassistant/components/spaceapi/__init__.py b/homeassistant/components/spaceapi/__init__.py
index 90281fe311c..6ef643488ad 100644
--- a/homeassistant/components/spaceapi/__init__.py
+++ b/homeassistant/components/spaceapi/__init__.py
@@ -5,6 +5,7 @@ import math
 
 import voluptuous as vol
 
+from homeassistant import core as ha
 from homeassistant.components.http import KEY_HASS, HomeAssistantView
 from homeassistant.const import (
     ATTR_ENTITY_ID,
@@ -21,11 +22,10 @@ from homeassistant.const import (
     CONF_STATE,
     CONF_URL,
 )
-import homeassistant.core as ha
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 ATTR_ADDRESS = "address"
 ATTR_SPACEFED = "spacefed"
diff --git a/homeassistant/components/spc/__init__.py b/homeassistant/components/spc/__init__.py
index 3d9467f2041..2fed542e382 100644
--- a/homeassistant/components/spc/__init__.py
+++ b/homeassistant/components/spc/__init__.py
@@ -9,8 +9,7 @@ import voluptuous as vol
 
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import aiohttp_client, discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import aiohttp_client, config_validation as cv, discovery
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/speedtestdotnet/__init__.py b/homeassistant/components/speedtestdotnet/__init__.py
index e4c51ab7aa0..e4f439013c6 100644
--- a/homeassistant/components/speedtestdotnet/__init__.py
+++ b/homeassistant/components/speedtestdotnet/__init__.py
@@ -6,18 +6,16 @@ from functools import partial
 
 import speedtest
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.start import async_at_started
 
-from .coordinator import SpeedTestDataCoordinator
+from .coordinator import SpeedTestConfigEntry, SpeedTestDataCoordinator
 
 PLATFORMS = [Platform.SENSOR]
 
-type SpeedTestConfigEntry = ConfigEntry[SpeedTestDataCoordinator]
-
 
 async def async_setup_entry(
     hass: HomeAssistant, config_entry: SpeedTestConfigEntry
@@ -49,11 +47,15 @@ async def async_setup_entry(
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, config_entry: SpeedTestConfigEntry
+) -> bool:
     """Unload SpeedTest Entry from config_entry."""
     return await hass.config_entries.async_unload_platforms(config_entry, PLATFORMS)
 
 
-async def update_listener(hass: HomeAssistant, config_entry: ConfigEntry) -> None:
+async def update_listener(
+    hass: HomeAssistant, config_entry: SpeedTestConfigEntry
+) -> None:
     """Handle options update."""
     await hass.config_entries.async_reload(config_entry.entry_id)
diff --git a/homeassistant/components/speedtestdotnet/config_flow.py b/homeassistant/components/speedtestdotnet/config_flow.py
index 3bfd4eb6e4a..4fbca5e0d29 100644
--- a/homeassistant/components/speedtestdotnet/config_flow.py
+++ b/homeassistant/components/speedtestdotnet/config_flow.py
@@ -9,7 +9,6 @@ import voluptuous as vol
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult, OptionsFlow
 from homeassistant.core import callback
 
-from . import SpeedTestConfigEntry
 from .const import (
     CONF_SERVER_ID,
     CONF_SERVER_NAME,
@@ -17,6 +16,7 @@ from .const import (
     DEFAULT_SERVER,
     DOMAIN,
 )
+from .coordinator import SpeedTestConfigEntry
 
 
 class SpeedTestFlowHandler(ConfigFlow, domain=DOMAIN):
diff --git a/homeassistant/components/speedtestdotnet/coordinator.py b/homeassistant/components/speedtestdotnet/coordinator.py
index 299652ba0bd..1308cb1d825 100644
--- a/homeassistant/components/speedtestdotnet/coordinator.py
+++ b/homeassistant/components/speedtestdotnet/coordinator.py
@@ -14,23 +14,28 @@ from .const import CONF_SERVER_ID, DEFAULT_SCAN_INTERVAL, DEFAULT_SERVER, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
+type SpeedTestConfigEntry = ConfigEntry[SpeedTestDataCoordinator]
+
 
 class SpeedTestDataCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Get the latest data from speedtest.net."""
 
-    config_entry: ConfigEntry
+    config_entry: SpeedTestConfigEntry
 
     def __init__(
-        self, hass: HomeAssistant, config_entry: ConfigEntry, api: speedtest.Speedtest
+        self,
+        hass: HomeAssistant,
+        config_entry: SpeedTestConfigEntry,
+        api: speedtest.Speedtest,
     ) -> None:
         """Initialize the data object."""
         self.hass = hass
-        self.config_entry = config_entry
         self.api = api
         self.servers: dict[str, dict] = {DEFAULT_SERVER: {}}
         super().__init__(
             self.hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(minutes=DEFAULT_SCAN_INTERVAL),
         )
diff --git a/homeassistant/components/speedtestdotnet/sensor.py b/homeassistant/components/speedtestdotnet/sensor.py
index 10da1dc93af..c2b7a6de28c 100644
--- a/homeassistant/components/speedtestdotnet/sensor.py
+++ b/homeassistant/components/speedtestdotnet/sensor.py
@@ -15,11 +15,10 @@ from homeassistant.components.sensor import (
 from homeassistant.const import UnitOfDataRate, UnitOfTime
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import SpeedTestConfigEntry
 from .const import (
     ATTR_BYTES_RECEIVED,
     ATTR_BYTES_SENT,
@@ -30,7 +29,7 @@ from .const import (
     DEFAULT_NAME,
     DOMAIN,
 )
-from .coordinator import SpeedTestDataCoordinator
+from .coordinator import SpeedTestConfigEntry, SpeedTestDataCoordinator
 
 
 @dataclass(frozen=True)
@@ -70,7 +69,7 @@ SENSOR_TYPES: tuple[SpeedtestSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: SpeedTestConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Speedtestdotnet sensors."""
     speedtest_coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/spider/__init__.py b/homeassistant/components/spider/__init__.py
index 4b138ec77a8..c0d85c02dd4 100644
--- a/homeassistant/components/spider/__init__.py
+++ b/homeassistant/components/spider/__init__.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import issue_registry as ir
 
@@ -29,11 +29,13 @@ async def async_setup_entry(hass: HomeAssistant, _: ConfigEntry) -> bool:
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    if all(
-        config_entry.state is ConfigEntryState.NOT_LOADED
-        for config_entry in hass.config_entries.async_entries(DOMAIN)
-        if config_entry.entry_id != entry.entry_id
-    ):
-        ir.async_delete_issue(hass, DOMAIN, DOMAIN)
-
     return True
+
+
+async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Remove a config entry."""
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
+        ir.async_delete_issue(hass, DOMAIN, DOMAIN)
+        # Remove any remaining disabled or ignored entries
+        for _entry in hass.config_entries.async_entries(DOMAIN):
+            hass.async_create_task(hass.config_entries.async_remove(_entry.entry_id))
diff --git a/homeassistant/components/splunk/__init__.py b/homeassistant/components/splunk/__init__.py
index 4294020eeee..6ef8fed78d6 100644
--- a/homeassistant/components/splunk/__init__.py
+++ b/homeassistant/components/splunk/__init__.py
@@ -19,9 +19,8 @@ from homeassistant.const import (
     EVENT_STATE_CHANGED,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import state as state_helper
+from homeassistant.helpers import config_validation as cv, state as state_helper
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entityfilter import FILTER_SCHEMA
 from homeassistant.helpers.json import JSONEncoder
 from homeassistant.helpers.typing import ConfigType
diff --git a/homeassistant/components/spotify/__init__.py b/homeassistant/components/spotify/__init__.py
index 663b3f30caa..1c4ea961ce3 100644
--- a/homeassistant/components/spotify/__init__.py
+++ b/homeassistant/components/spotify/__init__.py
@@ -8,7 +8,6 @@ from typing import TYPE_CHECKING
 import aiohttp
 from spotifyaio import Device, SpotifyClient, SpotifyConnectionError
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ACCESS_TOKEN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
@@ -63,7 +62,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: SpotifyConfigEntry) -> b
 
     spotify.refresh_token_function = _refresh_token
 
-    coordinator = SpotifyCoordinator(hass, spotify)
+    coordinator = SpotifyCoordinator(hass, entry, spotify)
 
     await coordinator.async_config_entry_first_refresh()
 
@@ -92,6 +91,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: SpotifyConfigEntry) -> b
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: SpotifyConfigEntry) -> bool:
     """Unload Spotify config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/spotify/browse_media.py b/homeassistant/components/spotify/browse_media.py
index 458525dde28..686431da249 100644
--- a/homeassistant/components/spotify/browse_media.py
+++ b/homeassistant/components/spotify/browse_media.py
@@ -226,17 +226,17 @@ async def async_browse_media(
     if media_content_id is None or not media_content_id.startswith(MEDIA_PLAYER_PREFIX):
         raise BrowseError("Invalid Spotify URL specified")
 
-    # Check for config entry specifier, and extract Spotify URI
+    # The config entry id is the host name of the URL, the Spotify URI is the name
     parsed_url = yarl.URL(media_content_id)
-    host = parsed_url.host
+    config_entry_id = parsed_url.host
 
     if (
-        host is None
+        config_entry_id is None
         # config entry ids can be upper or lower case. Yarl always returns host
         # names in lower case, so we need to look for the config entry in both
         or (
-            entry := hass.config_entries.async_get_entry(host)
-            or hass.config_entries.async_get_entry(host.upper())
+            entry := hass.config_entries.async_get_entry(config_entry_id)
+            or hass.config_entries.async_get_entry(config_entry_id.upper())
         )
         is None
         or entry.state is not ConfigEntryState.LOADED
diff --git a/homeassistant/components/spotify/config_flow.py b/homeassistant/components/spotify/config_flow.py
index d99fa7793df..3478887d64c 100644
--- a/homeassistant/components/spotify/config_flow.py
+++ b/homeassistant/components/spotify/config_flow.py
@@ -41,7 +41,8 @@ class SpotifyFlowHandler(
 
         try:
             current_user = await spotify.get_current_user()
-        except Exception:  # noqa: BLE001
+        except Exception:
+            self.logger.exception("Error while connecting to Spotify")
             return self.async_abort(reason="connection_error")
 
         name = current_user.display_name
diff --git a/homeassistant/components/spotify/coordinator.py b/homeassistant/components/spotify/coordinator.py
index a86544d883e..2d5fffebb7b 100644
--- a/homeassistant/components/spotify/coordinator.py
+++ b/homeassistant/components/spotify/coordinator.py
@@ -18,7 +18,7 @@ from spotifyaio import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN
 
@@ -56,11 +56,17 @@ class SpotifyCoordinator(DataUpdateCoordinator[SpotifyCoordinatorData]):
     current_user: UserProfile
     config_entry: SpotifyConfigEntry
 
-    def __init__(self, hass: HomeAssistant, client: SpotifyClient) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: SpotifyConfigEntry,
+        client: SpotifyClient,
+    ) -> None:
         """Initialize."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=UPDATE_INTERVAL,
         )
diff --git a/homeassistant/components/spotify/media_player.py b/homeassistant/components/spotify/media_player.py
index 20a634efb42..d6265cbc39d 100644
--- a/homeassistant/components/spotify/media_player.py
+++ b/homeassistant/components/spotify/media_player.py
@@ -31,7 +31,7 @@ from homeassistant.components.media_player import (
     RepeatMode,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .browse_media import async_browse_media_internal
@@ -70,7 +70,7 @@ AFTER_REQUEST_SLEEP = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SpotifyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Spotify based on a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/spotify/strings.json b/homeassistant/components/spotify/strings.json
index 90e573a1706..66d837c503f 100644
--- a/homeassistant/components/spotify/strings.json
+++ b/homeassistant/components/spotify/strings.json
@@ -13,7 +13,7 @@
       "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
       "missing_configuration": "The Spotify integration is not configured. Please follow the documentation.",
       "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]",
-      "reauth_account_mismatch": "The Spotify account authenticated with, does not match the account needed re-authentication.",
+      "reauth_account_mismatch": "The Spotify account authenticated with does not match the account that needed re-authentication.",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
       "oauth_error": "[%key:common::config_flow::abort::oauth2_error%]",
       "oauth_timeout": "[%key:common::config_flow::abort::oauth2_timeout%]",
diff --git a/homeassistant/components/sql/__init__.py b/homeassistant/components/sql/__init__.py
index 71e3671ce96..1b9e8502209 100644
--- a/homeassistant/components/sql/__init__.py
+++ b/homeassistant/components/sql/__init__.py
@@ -24,8 +24,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.trigger_template_entity import (
     CONF_AVAILABILITY,
     CONF_PICTURE,
diff --git a/homeassistant/components/sql/manifest.json b/homeassistant/components/sql/manifest.json
index 01c95d6c5e4..37b5dc2b647 100644
--- a/homeassistant/components/sql/manifest.json
+++ b/homeassistant/components/sql/manifest.json
@@ -1,9 +1,10 @@
 {
   "domain": "sql",
   "name": "SQL",
+  "after_dependencies": ["recorder"],
   "codeowners": ["@gjohansson-ST", "@dougiteixeira"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/sql",
   "iot_class": "local_polling",
-  "requirements": ["SQLAlchemy==2.0.36", "sqlparse==0.5.0"]
+  "requirements": ["SQLAlchemy==2.0.39", "sqlparse==0.5.0"]
 }
diff --git a/homeassistant/components/sql/sensor.py b/homeassistant/components/sql/sensor.py
index 312b0cd345e..a7b488dd521 100644
--- a/homeassistant/components/sql/sensor.py
+++ b/homeassistant/components/sql/sensor.py
@@ -36,7 +36,10 @@ from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.exceptions import TemplateError
 from homeassistant.helpers import issue_registry as ir
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.trigger_template_entity import (
     CONF_AVAILABILITY,
@@ -101,7 +104,9 @@ async def async_setup_platform(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the SQL sensor from config entry."""
 
@@ -178,7 +183,7 @@ async def async_setup_sensor(
     unique_id: str | None,
     db_url: str,
     yaml: bool,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddEntitiesCallback | AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the SQL sensor."""
     try:
diff --git a/homeassistant/components/sql/strings.json b/homeassistant/components/sql/strings.json
index cd36ccf7731..ac861e72b72 100644
--- a/homeassistant/components/sql/strings.json
+++ b/homeassistant/components/sql/strings.json
@@ -5,7 +5,7 @@
     },
     "error": {
       "db_url_invalid": "Database URL invalid",
-      "query_invalid": "SQL Query invalid",
+      "query_invalid": "SQL query invalid",
       "query_no_read_only": "SQL query must be read-only",
       "multiple_queries": "Multiple SQL queries are not supported",
       "column_invalid": "The column `{column}` is not returned by the query"
@@ -15,22 +15,22 @@
         "data": {
           "db_url": "Database URL",
           "name": "[%key:common::config_flow::data::name%]",
-          "query": "Select Query",
+          "query": "Select query",
           "column": "Column",
-          "unit_of_measurement": "Unit of Measure",
-          "value_template": "Value Template",
-          "device_class": "Device Class",
-          "state_class": "State Class"
+          "unit_of_measurement": "Unit of measurement",
+          "value_template": "Value template",
+          "device_class": "Device class",
+          "state_class": "State class"
         },
         "data_description": {
-          "db_url": "Database URL, leave empty to use HA recorder database",
-          "name": "Name that will be used for Config Entry and also the Sensor",
+          "db_url": "Leave empty to use Home Assistant Recorder database",
+          "name": "Name that will be used for config entry and also the sensor",
           "query": "Query to run, needs to start with 'SELECT'",
           "column": "Column for returned query to present as state",
-          "unit_of_measurement": "Unit of Measure (optional)",
-          "value_template": "Value Template (optional)",
+          "unit_of_measurement": "The unit of measurement for the sensor (optional)",
+          "value_template": "Template to extract a value from the payload (optional)",
           "device_class": "The type/class of the sensor to set the icon in the frontend",
-          "state_class": "The state_class of the sensor"
+          "state_class": "The state class of the sensor"
         }
       }
     }
diff --git a/homeassistant/components/squeezebox/__init__.py b/homeassistant/components/squeezebox/__init__.py
index f94ea118c6a..78a97e38833 100644
--- a/homeassistant/components/squeezebox/__init__.py
+++ b/homeassistant/components/squeezebox/__init__.py
@@ -53,6 +53,7 @@ _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
+    Platform.BUTTON,
     Platform.MEDIA_PLAYER,
     Platform.SENSOR,
 ]
@@ -127,12 +128,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: SqueezeboxConfigEntry) -
     )
     _LOGGER.debug("LMS Device %s", device)
 
-    server_coordinator = LMSStatusDataUpdateCoordinator(hass, lms)
+    server_coordinator = LMSStatusDataUpdateCoordinator(hass, entry, lms)
 
-    entry.runtime_data = SqueezeboxData(
-        coordinator=server_coordinator,
-        server=lms,
-    )
+    entry.runtime_data = SqueezeboxData(coordinator=server_coordinator, server=lms)
 
     # set up player discovery
     known_servers = hass.data.setdefault(DOMAIN, {}).setdefault(KNOWN_SERVERS, {})
@@ -151,7 +149,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: SqueezeboxConfigEntry) -
             else:
                 _LOGGER.debug("Adding new entity: %s", player)
                 player_coordinator = SqueezeBoxPlayerUpdateCoordinator(
-                    hass, player, lms.uuid
+                    hass, entry, player, lms.uuid
                 )
                 known_players.append(player.player_id)
                 async_dispatcher_send(
diff --git a/homeassistant/components/squeezebox/binary_sensor.py b/homeassistant/components/squeezebox/binary_sensor.py
index ec0bac0fe43..daae8703597 100644
--- a/homeassistant/components/squeezebox/binary_sensor.py
+++ b/homeassistant/components/squeezebox/binary_sensor.py
@@ -11,7 +11,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SqueezeboxConfigEntry
 from .const import STATUS_SENSOR_NEEDSRESTART, STATUS_SENSOR_RESCAN
@@ -35,7 +35,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SqueezeboxConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Platform setup using common elements."""
 
diff --git a/homeassistant/components/squeezebox/browse_media.py b/homeassistant/components/squeezebox/browse_media.py
index 331bf383c70..633f004993f 100644
--- a/homeassistant/components/squeezebox/browse_media.py
+++ b/homeassistant/components/squeezebox/browse_media.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import contextlib
+from dataclasses import dataclass, field
 from typing import Any
 
 from pysqueezebox import Player
@@ -18,6 +19,8 @@ from homeassistant.components.media_player import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.network import is_internal_request
 
+from .const import UNPLAYABLE_TYPES
+
 LIBRARY = [
     "Favorites",
     "Artists",
@@ -26,9 +29,12 @@ LIBRARY = [
     "Playlists",
     "Genres",
     "New Music",
+    "Album Artists",
+    "Apps",
+    "Radios",
 ]
 
-MEDIA_TYPE_TO_SQUEEZEBOX = {
+MEDIA_TYPE_TO_SQUEEZEBOX: dict[str | MediaType, str] = {
     "Favorites": "favorites",
     "Artists": "artists",
     "Albums": "albums",
@@ -36,38 +42,51 @@ MEDIA_TYPE_TO_SQUEEZEBOX = {
     "Playlists": "playlists",
     "Genres": "genres",
     "New Music": "new music",
+    "Album Artists": "album artists",
     MediaType.ALBUM: "album",
     MediaType.ARTIST: "artist",
     MediaType.TRACK: "title",
     MediaType.PLAYLIST: "playlist",
     MediaType.GENRE: "genre",
+    "Apps": "apps",
+    "Radios": "radios",
 }
 
-SQUEEZEBOX_ID_BY_TYPE = {
+SQUEEZEBOX_ID_BY_TYPE: dict[str | MediaType, str] = {
     MediaType.ALBUM: "album_id",
     MediaType.ARTIST: "artist_id",
     MediaType.TRACK: "track_id",
     MediaType.PLAYLIST: "playlist_id",
     MediaType.GENRE: "genre_id",
     "Favorites": "item_id",
+    MediaType.APPS: "item_id",
 }
 
-CONTENT_TYPE_MEDIA_CLASS: dict[str | MediaType, dict[str, MediaClass | None]] = {
+CONTENT_TYPE_MEDIA_CLASS: dict[str | MediaType, dict[str, MediaClass | str]] = {
     "Favorites": {"item": MediaClass.DIRECTORY, "children": MediaClass.TRACK},
+    "Apps": {"item": MediaClass.DIRECTORY, "children": MediaClass.APP},
+    "Radios": {"item": MediaClass.DIRECTORY, "children": MediaClass.APP},
+    "App": {"item": MediaClass.DIRECTORY, "children": MediaClass.TRACK},
     "Artists": {"item": MediaClass.DIRECTORY, "children": MediaClass.ARTIST},
     "Albums": {"item": MediaClass.DIRECTORY, "children": MediaClass.ALBUM},
     "Tracks": {"item": MediaClass.DIRECTORY, "children": MediaClass.TRACK},
     "Playlists": {"item": MediaClass.DIRECTORY, "children": MediaClass.PLAYLIST},
     "Genres": {"item": MediaClass.DIRECTORY, "children": MediaClass.GENRE},
     "New Music": {"item": MediaClass.DIRECTORY, "children": MediaClass.ALBUM},
+    "Album Artists": {"item": MediaClass.DIRECTORY, "children": MediaClass.ARTIST},
     MediaType.ALBUM: {"item": MediaClass.ALBUM, "children": MediaClass.TRACK},
     MediaType.ARTIST: {"item": MediaClass.ARTIST, "children": MediaClass.ALBUM},
-    MediaType.TRACK: {"item": MediaClass.TRACK, "children": None},
+    MediaType.TRACK: {"item": MediaClass.TRACK, "children": ""},
     MediaType.GENRE: {"item": MediaClass.GENRE, "children": MediaClass.ARTIST},
     MediaType.PLAYLIST: {"item": MediaClass.PLAYLIST, "children": MediaClass.TRACK},
+    MediaType.APP: {"item": MediaClass.DIRECTORY, "children": MediaClass.TRACK},
+    MediaType.APPS: {"item": MediaClass.DIRECTORY, "children": MediaClass.APP},
 }
 
-CONTENT_TYPE_TO_CHILD_TYPE = {
+CONTENT_TYPE_TO_CHILD_TYPE: dict[
+    str | MediaType,
+    str | MediaType | None,
+] = {
     MediaType.ALBUM: MediaType.TRACK,
     MediaType.PLAYLIST: MediaType.PLAYLIST,
     MediaType.ARTIST: MediaType.ALBUM,
@@ -78,14 +97,142 @@ CONTENT_TYPE_TO_CHILD_TYPE = {
     "Playlists": MediaType.PLAYLIST,
     "Genres": MediaType.GENRE,
     "Favorites": None,  # can only be determined after inspecting the item
+    "Apps": MediaClass.APP,
+    "Radios": MediaClass.APP,
+    "App": None,  # can only be determined after inspecting the item
     "New Music": MediaType.ALBUM,
+    "Album Artists": MediaType.ARTIST,
+    MediaType.APPS: MediaType.APP,
+    MediaType.APP: MediaType.TRACK,
 }
 
-BROWSE_LIMIT = 1000
+
+@dataclass
+class BrowseData:
+    """Class for browser to squeezebox mappings and other browse data."""
+
+    content_type_to_child_type: dict[
+        str | MediaType,
+        str | MediaType | None,
+    ] = field(default_factory=dict)
+    content_type_media_class: dict[str | MediaType, dict[str, MediaClass | str]] = (
+        field(default_factory=dict)
+    )
+    squeezebox_id_by_type: dict[str | MediaType, str] = field(default_factory=dict)
+    media_type_to_squeezebox: dict[str | MediaType, str] = field(default_factory=dict)
+    known_apps_radios: set[str] = field(default_factory=set)
+
+    def __post_init__(self) -> None:
+        """Initialise the maps."""
+        self.content_type_media_class.update(CONTENT_TYPE_MEDIA_CLASS)
+        self.content_type_to_child_type.update(CONTENT_TYPE_TO_CHILD_TYPE)
+        self.squeezebox_id_by_type.update(SQUEEZEBOX_ID_BY_TYPE)
+        self.media_type_to_squeezebox.update(MEDIA_TYPE_TO_SQUEEZEBOX)
+
+
+def _add_new_command_to_browse_data(
+    browse_data: BrowseData, cmd: str | MediaType, type: str
+) -> None:
+    """Add items to maps for new apps or radios."""
+    browse_data.media_type_to_squeezebox[cmd] = cmd
+    browse_data.squeezebox_id_by_type[cmd] = type
+    browse_data.content_type_media_class[cmd] = {
+        "item": MediaClass.DIRECTORY,
+        "children": MediaClass.TRACK,
+    }
+    browse_data.content_type_to_child_type[cmd] = MediaType.TRACK
+
+
+def _build_response_apps_radios_category(
+    browse_data: BrowseData, cmd: str | MediaType, item: dict[str, Any]
+) -> BrowseMedia:
+    """Build item for App or radio category."""
+    return BrowseMedia(
+        media_content_id=item.get("id", ""),
+        title=item["title"],
+        media_content_type=cmd,
+        media_class=browse_data.content_type_media_class[cmd]["item"],
+        can_expand=True,
+        can_play=False,
+    )
+
+
+def _build_response_known_app(
+    browse_data: BrowseData, search_type: str, item: dict[str, Any]
+) -> BrowseMedia:
+    """Build item for app or radio."""
+
+    return BrowseMedia(
+        media_content_id=item.get("id", ""),
+        title=item["title"],
+        media_content_type=search_type,
+        media_class=browse_data.content_type_media_class[search_type]["item"],
+        can_play=bool(item["isaudio"] and item.get("url")),
+        can_expand=item["hasitems"],
+    )
+
+
+def _build_response_favorites(item: dict[str, Any]) -> BrowseMedia:
+    """Build item for Favorites."""
+    if "album_id" in item:
+        return BrowseMedia(
+            media_content_id=str(item["album_id"]),
+            title=item["title"],
+            media_content_type=MediaType.ALBUM,
+            media_class=CONTENT_TYPE_MEDIA_CLASS[MediaType.ALBUM]["item"],
+            can_expand=True,
+            can_play=True,
+        )
+    if item["hasitems"] and not item["isaudio"]:
+        return BrowseMedia(
+            media_content_id=item.get("id", ""),
+            title=item["title"],
+            media_content_type="Favorites",
+            media_class=CONTENT_TYPE_MEDIA_CLASS["Favorites"]["item"],
+            can_expand=True,
+            can_play=False,
+        )
+    return BrowseMedia(
+        media_content_id=item.get("id", ""),
+        title=item["title"],
+        media_content_type="Favorites",
+        media_class=CONTENT_TYPE_MEDIA_CLASS[MediaType.TRACK]["item"],
+        can_expand=item["hasitems"],
+        can_play=bool(item["isaudio"] and item.get("url")),
+    )
+
+
+def _get_item_thumbnail(
+    item: dict[str, Any],
+    player: Player,
+    entity: MediaPlayerEntity,
+    item_type: str | MediaType | None,
+    search_type: str,
+    internal_request: bool,
+) -> str | None:
+    """Construct path to thumbnail image."""
+    item_thumbnail: str | None = None
+    if artwork_track_id := item.get("artwork_track_id"):
+        if internal_request:
+            item_thumbnail = player.generate_image_url_from_track_id(artwork_track_id)
+        elif item_type is not None:
+            item_thumbnail = entity.get_browse_image_url(
+                item_type, item.get("id", ""), artwork_track_id
+            )
+
+    elif search_type in ["Apps", "Radios"]:
+        item_thumbnail = player.generate_image_url(item["icon"])
+    if item_thumbnail is None:
+        item_thumbnail = item.get("image_url")  # will not be proxied by HA
+    return item_thumbnail
 
 
 async def build_item_response(
-    entity: MediaPlayerEntity, player: Player, payload: dict[str, str | None]
+    entity: MediaPlayerEntity,
+    player: Player,
+    payload: dict[str, str | None],
+    browse_limit: int,
+    browse_data: BrowseData,
 ) -> BrowseMedia:
     """Create response payload for search described by payload."""
 
@@ -96,78 +243,78 @@ async def build_item_response(
     assert (
         search_type is not None
     )  # async_browse_media will not call this function if search_type is None
-    media_class = CONTENT_TYPE_MEDIA_CLASS[search_type]
+    media_class = browse_data.content_type_media_class[search_type]
 
     children = None
 
     if search_id and search_id != search_type:
-        browse_id = (SQUEEZEBOX_ID_BY_TYPE[search_type], search_id)
+        browse_id = (browse_data.squeezebox_id_by_type[search_type], search_id)
     else:
         browse_id = None
 
     result = await player.async_browse(
-        MEDIA_TYPE_TO_SQUEEZEBOX[search_type],
-        limit=BROWSE_LIMIT,
+        browse_data.media_type_to_squeezebox[search_type],
+        limit=browse_limit,
         browse_id=browse_id,
     )
 
     if result is not None and result.get("items"):
-        item_type = CONTENT_TYPE_TO_CHILD_TYPE[search_type]
+        item_type = browse_data.content_type_to_child_type[search_type]
 
         children = []
-        list_playable = []
         for item in result["items"]:
-            item_id = str(item["id"])
-            item_thumbnail: str | None = None
-            if item_type:
-                child_item_type: MediaType | str = item_type
-                child_media_class = CONTENT_TYPE_MEDIA_CLASS[item_type]
-                can_expand = child_media_class["children"] is not None
-                can_play = True
-
             if search_type == "Favorites":
-                if "album_id" in item:
-                    item_id = str(item["album_id"])
-                    child_item_type = MediaType.ALBUM
-                    child_media_class = CONTENT_TYPE_MEDIA_CLASS[MediaType.ALBUM]
-                    can_expand = True
-                    can_play = True
-                elif item["hasitems"] and not item["isaudio"]:
-                    child_item_type = "Favorites"
-                    child_media_class = CONTENT_TYPE_MEDIA_CLASS["Favorites"]
-                    can_expand = True
-                    can_play = False
-                else:
-                    child_item_type = "Favorites"
-                    child_media_class = CONTENT_TYPE_MEDIA_CLASS[MediaType.TRACK]
-                    can_expand = item["hasitems"]
-                    can_play = item["isaudio"] and item.get("url")
+                child_media = _build_response_favorites(item)
 
-            if artwork_track_id := item.get("artwork_track_id"):
-                if internal_request:
-                    item_thumbnail = player.generate_image_url_from_track_id(
-                        artwork_track_id
-                    )
-                elif item_type is not None:
-                    item_thumbnail = entity.get_browse_image_url(
-                        item_type, item_id, artwork_track_id
-                    )
-            else:
-                item_thumbnail = item.get("image_url")  # will not be proxied by HA
+            elif search_type in ["Apps", "Radios"]:
+                # item["cmd"] contains the name of the command to use with the cli for the app
+                # add the command to the dictionaries
+                if item["title"] == "Search" or item.get("type") in UNPLAYABLE_TYPES:
+                    # Skip searches in apps as they'd need UI or if the link isn't to audio
+                    continue
+                app_cmd = "app-" + item["cmd"]
 
-            assert child_media_class["item"] is not None
-            children.append(
-                BrowseMedia(
-                    title=item["title"],
-                    media_class=child_media_class["item"],
-                    media_content_id=item_id,
-                    media_content_type=child_item_type,
-                    can_play=can_play,
-                    can_expand=can_expand,
-                    thumbnail=item_thumbnail,
+                if app_cmd not in browse_data.known_apps_radios:
+                    browse_data.known_apps_radios.add(app_cmd)
+                    _add_new_command_to_browse_data(browse_data, app_cmd, "item_id")
+
+                child_media = _build_response_apps_radios_category(
+                    browse_data=browse_data, cmd=app_cmd, item=item
                 )
+
+            elif search_type in browse_data.known_apps_radios:
+                if (
+                    item.get("title") in ["Search", None]
+                    or item.get("type") in UNPLAYABLE_TYPES
+                ):
+                    # Skip searches in apps as they'd need UI
+                    continue
+
+                child_media = _build_response_known_app(browse_data, search_type, item)
+
+            elif item_type:
+                child_media = BrowseMedia(
+                    media_content_id=str(item.get("id", "")),
+                    title=item["title"],
+                    media_content_type=item_type,
+                    media_class=CONTENT_TYPE_MEDIA_CLASS[item_type]["item"],
+                    can_expand=CONTENT_TYPE_MEDIA_CLASS[item_type]["children"]
+                    is not None,
+                    can_play=True,
+                )
+
+            assert child_media.media_class is not None
+
+            child_media.thumbnail = _get_item_thumbnail(
+                item=item,
+                player=player,
+                entity=entity,
+                item_type=item_type,
+                search_type=search_type,
+                internal_request=internal_request,
             )
-            list_playable.append(can_play)
+
+            children.append(child_media)
 
     if children is None:
         raise BrowseError(f"Media not found: {search_type} / {search_id}")
@@ -175,19 +322,24 @@ async def build_item_response(
     assert media_class["item"] is not None
     if not search_id:
         search_id = search_type
+
     return BrowseMedia(
         title=result.get("title"),
         media_class=media_class["item"],
         children_media_class=media_class["children"],
         media_content_id=search_id,
         media_content_type=search_type,
-        can_play=any(list_playable),
+        can_play=any(child.can_play for child in children),
         children=children,
         can_expand=True,
     )
 
 
-async def library_payload(hass: HomeAssistant, player: Player) -> BrowseMedia:
+async def library_payload(
+    hass: HomeAssistant,
+    player: Player,
+    browse_media: BrowseData,
+) -> BrowseMedia:
     """Create response payload to describe contents of library."""
     library_info: dict[str, Any] = {
         "title": "Music Library",
@@ -200,10 +352,10 @@ async def library_payload(hass: HomeAssistant, player: Player) -> BrowseMedia:
     }
 
     for item in LIBRARY:
-        media_class = CONTENT_TYPE_MEDIA_CLASS[item]
+        media_class = browse_media.content_type_media_class[item]
 
         result = await player.async_browse(
-            MEDIA_TYPE_TO_SQUEEZEBOX[item],
+            browse_media.media_type_to_squeezebox[item],
             limit=1,
         )
         if result is not None and result.get("items") is not None:
@@ -214,7 +366,7 @@ async def library_payload(hass: HomeAssistant, player: Player) -> BrowseMedia:
                     media_class=media_class["children"],
                     media_content_id=item,
                     media_content_type=item,
-                    can_play=item != "Favorites",
+                    can_play=item not in ["Favorites", "Apps", "Radios"],
                     can_expand=True,
                 )
             )
@@ -237,17 +389,27 @@ def media_source_content_filter(item: BrowseMedia) -> bool:
     return item.media_content_type.startswith("audio/")
 
 
-async def generate_playlist(player: Player, payload: dict[str, str]) -> list | None:
+async def generate_playlist(
+    player: Player,
+    payload: dict[str, str],
+    browse_limit: int,
+    browse_media: BrowseData,
+) -> list | None:
     """Generate playlist from browsing payload."""
     media_type = payload["search_type"]
     media_id = payload["search_id"]
 
-    if media_type not in SQUEEZEBOX_ID_BY_TYPE:
+    if media_type not in browse_media.squeezebox_id_by_type:
         raise BrowseError(f"Media type not supported: {media_type}")
 
-    browse_id = (SQUEEZEBOX_ID_BY_TYPE[media_type], media_id)
+    browse_id = (browse_media.squeezebox_id_by_type[media_type], media_id)
+    if media_type.startswith("app-"):
+        category = media_type
+    else:
+        category = "titles"
+
     result = await player.async_browse(
-        "titles", limit=BROWSE_LIMIT, browse_id=browse_id
+        category, limit=browse_limit, browse_id=browse_id
     )
     if result and "items" in result:
         items: list = result["items"]
diff --git a/homeassistant/components/squeezebox/button.py b/homeassistant/components/squeezebox/button.py
new file mode 100644
index 00000000000..098df3a1b5c
--- /dev/null
+++ b/homeassistant/components/squeezebox/button.py
@@ -0,0 +1,155 @@
+"""Platform for button integration for squeezebox."""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+import logging
+
+from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import format_mac
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import SqueezeboxConfigEntry
+from .const import SIGNAL_PLAYER_DISCOVERED
+from .coordinator import SqueezeBoxPlayerUpdateCoordinator
+from .entity import SqueezeboxEntity
+
+_LOGGER = logging.getLogger(__name__)
+
+HARDWARE_MODELS_WITH_SCREEN = [
+    "Squeezebox Boom",
+    "Squeezebox Radio",
+    "Transporter",
+    "Squeezebox Touch",
+    "Squeezebox",
+    "SliMP3",
+    "Squeezebox 1",
+    "Squeezebox 2",
+    "Squeezebox 3",
+]
+
+HARDWARE_MODELS_WITH_TONE = [
+    *HARDWARE_MODELS_WITH_SCREEN,
+    "Squeezebox Receiver",
+]
+
+
+@dataclass(frozen=True, kw_only=True)
+class SqueezeboxButtonEntityDescription(ButtonEntityDescription):
+    """Squeezebox Button description."""
+
+    press_action: str
+
+
+BUTTON_ENTITIES: tuple[SqueezeboxButtonEntityDescription, ...] = tuple(
+    SqueezeboxButtonEntityDescription(
+        key=f"preset_{i}",
+        translation_key="preset",
+        translation_placeholders={"index": str(i)},
+        press_action=f"preset_{i}.single",
+    )
+    for i in range(1, 7)
+)
+
+SCREEN_BUTTON_ENTITIES: tuple[SqueezeboxButtonEntityDescription, ...] = (
+    SqueezeboxButtonEntityDescription(
+        key="brightness_up",
+        translation_key="brightness_up",
+        press_action="brightness_up",
+    ),
+    SqueezeboxButtonEntityDescription(
+        key="brightness_down",
+        translation_key="brightness_down",
+        press_action="brightness_down",
+    ),
+)
+
+TONE_BUTTON_ENTITIES: tuple[SqueezeboxButtonEntityDescription, ...] = (
+    SqueezeboxButtonEntityDescription(
+        key="bass_up",
+        translation_key="bass_up",
+        press_action="bass_up",
+    ),
+    SqueezeboxButtonEntityDescription(
+        key="bass_down",
+        translation_key="bass_down",
+        press_action="bass_down",
+    ),
+    SqueezeboxButtonEntityDescription(
+        key="treble_up",
+        translation_key="treble_up",
+        press_action="treble_up",
+    ),
+    SqueezeboxButtonEntityDescription(
+        key="treble_down",
+        translation_key="treble_down",
+        press_action="treble_down",
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: SqueezeboxConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the Squeezebox button platform from a server config entry."""
+
+    # Add button entities when player discovered
+    async def _player_discovered(
+        player_coordinator: SqueezeBoxPlayerUpdateCoordinator,
+    ) -> None:
+        _LOGGER.debug(
+            "Setting up button entity for player %s, model %s",
+            player_coordinator.player.name,
+            player_coordinator.player.model,
+        )
+
+        entities: list[SqueezeboxButtonEntity] = []
+
+        entities.extend(
+            SqueezeboxButtonEntity(player_coordinator, description)
+            for description in BUTTON_ENTITIES
+        )
+
+        entities.extend(
+            SqueezeboxButtonEntity(player_coordinator, description)
+            for description in TONE_BUTTON_ENTITIES
+            if player_coordinator.player.model in HARDWARE_MODELS_WITH_TONE
+        )
+
+        entities.extend(
+            SqueezeboxButtonEntity(player_coordinator, description)
+            for description in SCREEN_BUTTON_ENTITIES
+            if player_coordinator.player.model in HARDWARE_MODELS_WITH_SCREEN
+        )
+
+        async_add_entities(entities)
+
+    entry.async_on_unload(
+        async_dispatcher_connect(hass, SIGNAL_PLAYER_DISCOVERED, _player_discovered)
+    )
+
+
+class SqueezeboxButtonEntity(SqueezeboxEntity, ButtonEntity):
+    """Representation of Buttons for Squeezebox entities."""
+
+    entity_description: SqueezeboxButtonEntityDescription
+
+    def __init__(
+        self,
+        coordinator: SqueezeBoxPlayerUpdateCoordinator,
+        entity_description: SqueezeboxButtonEntityDescription,
+    ) -> None:
+        """Initialize the SqueezeBox Button."""
+        super().__init__(coordinator)
+        self.entity_description = entity_description
+        self._attr_unique_id = (
+            f"{format_mac(self._player.player_id)}_{entity_description.key}"
+        )
+
+    async def async_press(self) -> None:
+        """Execute the button action."""
+        await self._player.async_query("button", self.entity_description.press_action)
diff --git a/homeassistant/components/squeezebox/config_flow.py b/homeassistant/components/squeezebox/config_flow.py
index 97eb848c21c..31dd5b003b7 100644
--- a/homeassistant/components/squeezebox/config_flow.py
+++ b/homeassistant/components/squeezebox/config_flow.py
@@ -11,15 +11,34 @@ from pysqueezebox import Server, async_discover
 import voluptuous as vol
 
 from homeassistant.components.media_player import DOMAIN as MP_DOMAIN
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.config_entries import (
+    ConfigEntry,
+    ConfigFlow,
+    ConfigFlowResult,
+    OptionsFlow,
+)
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME
+from homeassistant.core import callback
 from homeassistant.data_entry_flow import AbortFlow
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.device_registry import format_mac
+from homeassistant.helpers.selector import (
+    NumberSelector,
+    NumberSelectorConfig,
+    NumberSelectorMode,
+)
 from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 
-from .const import CONF_HTTPS, DEFAULT_PORT, DOMAIN
+from .const import (
+    CONF_BROWSE_LIMIT,
+    CONF_HTTPS,
+    CONF_VOLUME_STEP,
+    DEFAULT_BROWSE_LIMIT,
+    DEFAULT_PORT,
+    DEFAULT_VOLUME_STEP,
+    DOMAIN,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -77,6 +96,12 @@ class SqueezeboxConfigFlow(ConfigFlow, domain=DOMAIN):
         self.data_schema = _base_schema()
         self.discovery_info: dict[str, Any] | None = None
 
+    @staticmethod
+    @callback
+    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlowHandler:
+        """Get the options flow for this handler."""
+        return OptionsFlowHandler()
+
     async def _discover(self, uuid: str | None = None) -> None:
         """Discover an unconfigured LMS server."""
         self.discovery_info = None
@@ -126,7 +151,8 @@ class SqueezeboxConfigFlow(ConfigFlow, domain=DOMAIN):
                 if server.http_status == HTTPStatus.UNAUTHORIZED:
                     return "invalid_auth"
                 return "cannot_connect"
-        except Exception:  # noqa: BLE001
+        except Exception:
+            _LOGGER.exception("Unknown exception while validating connection")
             return "unknown"
 
         if "uuid" in status:
@@ -222,3 +248,48 @@ class SqueezeboxConfigFlow(ConfigFlow, domain=DOMAIN):
 
         # if the player is unknown, then we likely need to configure its server
         return await self.async_step_user()
+
+
+OPTIONS_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_BROWSE_LIMIT): vol.All(
+            NumberSelector(
+                NumberSelectorConfig(min=1, max=65534, mode=NumberSelectorMode.BOX)
+            ),
+            vol.Coerce(int),
+        ),
+        vol.Required(CONF_VOLUME_STEP): vol.All(
+            NumberSelector(
+                NumberSelectorConfig(min=1, max=20, mode=NumberSelectorMode.SLIDER)
+            ),
+            vol.Coerce(int),
+        ),
+    }
+)
+
+
+class OptionsFlowHandler(OptionsFlow):
+    """Options Flow Handler."""
+
+    async def async_step_init(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Options Flow Steps."""
+
+        if user_input is not None:
+            return self.async_create_entry(title="", data=user_input)
+
+        return self.async_show_form(
+            step_id="init",
+            data_schema=self.add_suggested_values_to_schema(
+                OPTIONS_SCHEMA,
+                {
+                    CONF_BROWSE_LIMIT: self.config_entry.options.get(
+                        CONF_BROWSE_LIMIT, DEFAULT_BROWSE_LIMIT
+                    ),
+                    CONF_VOLUME_STEP: self.config_entry.options.get(
+                        CONF_VOLUME_STEP, DEFAULT_VOLUME_STEP
+                    ),
+                },
+            ),
+        )
diff --git a/homeassistant/components/squeezebox/const.py b/homeassistant/components/squeezebox/const.py
index 8bc33214170..5ce95d25632 100644
--- a/homeassistant/components/squeezebox/const.py
+++ b/homeassistant/components/squeezebox/const.py
@@ -27,8 +27,20 @@ STATUS_QUERY_LIBRARYNAME = "libraryname"
 STATUS_QUERY_MAC = "mac"
 STATUS_QUERY_UUID = "uuid"
 STATUS_QUERY_VERSION = "version"
-SQUEEZEBOX_SOURCE_STRINGS = ("source:", "wavin:", "spotify:")
+SQUEEZEBOX_SOURCE_STRINGS = (
+    "source:",
+    "wavin:",
+    "spotify:",
+    "loop:",
+)
 SIGNAL_PLAYER_DISCOVERED = "squeezebox_player_discovered"
 SIGNAL_PLAYER_REDISCOVERED = "squeezebox_player_rediscovered"
 DISCOVERY_INTERVAL = 60
 PLAYER_UPDATE_INTERVAL = 5
+CONF_BROWSE_LIMIT = "browse_limit"
+CONF_VOLUME_STEP = "volume_step"
+DEFAULT_BROWSE_LIMIT = 1000
+DEFAULT_VOLUME_STEP = 5
+ATTR_ANNOUNCE_VOLUME = "announce_volume"
+ATTR_ANNOUNCE_TIMEOUT = "announce_timeout"
+UNPLAYABLE_TYPES = ("text", "actions")
diff --git a/homeassistant/components/squeezebox/coordinator.py b/homeassistant/components/squeezebox/coordinator.py
index f3aacbc9833..955e2896947 100644
--- a/homeassistant/components/squeezebox/coordinator.py
+++ b/homeassistant/components/squeezebox/coordinator.py
@@ -1,11 +1,13 @@
 """DataUpdateCoordinator for the Squeezebox integration."""
 
+from __future__ import annotations
+
 from asyncio import timeout
 from collections.abc import Callable
 from datetime import timedelta
 import logging
 import re
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from pysqueezebox import Player, Server
 
@@ -14,6 +16,9 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from homeassistant.util import dt as dt_util
 
+if TYPE_CHECKING:
+    from . import SqueezeboxConfigEntry
+
 from .const import (
     PLAYER_UPDATE_INTERVAL,
     SENSOR_UPDATE_INTERVAL,
@@ -30,11 +35,16 @@ _LOGGER = logging.getLogger(__name__)
 class LMSStatusDataUpdateCoordinator(DataUpdateCoordinator):
     """LMS Status custom coordinator."""
 
-    def __init__(self, hass: HomeAssistant, lms: Server) -> None:
+    config_entry: SqueezeboxConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: SqueezeboxConfigEntry, lms: Server
+    ) -> None:
         """Initialize my coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=lms.name,
             update_interval=timedelta(seconds=SENSOR_UPDATE_INTERVAL),
             always_update=False,
@@ -80,11 +90,20 @@ class LMSStatusDataUpdateCoordinator(DataUpdateCoordinator):
 class SqueezeBoxPlayerUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Coordinator for Squeezebox players."""
 
-    def __init__(self, hass: HomeAssistant, player: Player, server_uuid: str) -> None:
+    config_entry: SqueezeboxConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: SqueezeboxConfigEntry,
+        player: Player,
+        server_uuid: str,
+    ) -> None:
         """Initialize the coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=player.name,
             update_interval=timedelta(seconds=PLAYER_UPDATE_INTERVAL),
             always_update=True,
diff --git a/homeassistant/components/squeezebox/entity.py b/homeassistant/components/squeezebox/entity.py
index 027ca68edc6..2c443c24ffd 100644
--- a/homeassistant/components/squeezebox/entity.py
+++ b/homeassistant/components/squeezebox/entity.py
@@ -1,11 +1,37 @@
 """Base class for Squeezebox Sensor entities."""
 
-from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.device_registry import (
+    CONNECTION_NETWORK_MAC,
+    DeviceInfo,
+    format_mac,
+)
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, STATUS_QUERY_UUID
-from .coordinator import LMSStatusDataUpdateCoordinator
+from .coordinator import (
+    LMSStatusDataUpdateCoordinator,
+    SqueezeBoxPlayerUpdateCoordinator,
+)
+
+
+class SqueezeboxEntity(CoordinatorEntity[SqueezeBoxPlayerUpdateCoordinator]):
+    """Base entity class for Squeezebox entities."""
+
+    _attr_has_entity_name = True
+
+    def __init__(self, coordinator: SqueezeBoxPlayerUpdateCoordinator) -> None:
+        """Initialize the SqueezeBox entity."""
+        super().__init__(coordinator)
+        self._player = coordinator.player
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, format_mac(self._player.player_id))},
+            name=self._player.name,
+            connections={(CONNECTION_NETWORK_MAC, format_mac(self._player.player_id))},
+            via_device=(DOMAIN, coordinator.server_uuid),
+            model=self._player.model,
+            manufacturer=self._player.creator,
+        )
 
 
 class LMSStatusEntity(CoordinatorEntity[LMSStatusDataUpdateCoordinator]):
diff --git a/homeassistant/components/squeezebox/manifest.json b/homeassistant/components/squeezebox/manifest.json
index 09eaa4026f4..e9b89291749 100644
--- a/homeassistant/components/squeezebox/manifest.json
+++ b/homeassistant/components/squeezebox/manifest.json
@@ -12,5 +12,5 @@
   "documentation": "https://www.home-assistant.io/integrations/squeezebox",
   "iot_class": "local_polling",
   "loggers": ["pysqueezebox"],
-  "requirements": ["pysqueezebox==0.11.1"]
+  "requirements": ["pysqueezebox==0.12.0"]
 }
diff --git a/homeassistant/components/squeezebox/media_player.py b/homeassistant/components/squeezebox/media_player.py
index 19cd1e36910..40662477745 100644
--- a/homeassistant/components/squeezebox/media_player.py
+++ b/homeassistant/components/squeezebox/media_player.py
@@ -14,6 +14,7 @@ import voluptuous as vol
 from homeassistant.components import media_source
 from homeassistant.components.media_player import (
     ATTR_MEDIA_ENQUEUE,
+    ATTR_MEDIA_EXTRA,
     BrowseError,
     BrowseMedia,
     MediaPlayerEnqueue,
@@ -34,24 +35,26 @@ from homeassistant.helpers import (
     entity_platform,
     entity_registry as er,
 )
-from homeassistant.helpers.device_registry import (
-    CONNECTION_NETWORK_MAC,
-    DeviceInfo,
-    format_mac,
-)
+from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.start import async_at_start
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util.dt import utcnow
 
 from .browse_media import (
+    BrowseData,
     build_item_response,
     generate_playlist,
     library_payload,
     media_source_content_filter,
 )
 from .const import (
+    ATTR_ANNOUNCE_TIMEOUT,
+    ATTR_ANNOUNCE_VOLUME,
+    CONF_BROWSE_LIMIT,
+    CONF_VOLUME_STEP,
+    DEFAULT_BROWSE_LIMIT,
+    DEFAULT_VOLUME_STEP,
     DISCOVERY_TASK,
     DOMAIN,
     KNOWN_PLAYERS,
@@ -60,6 +63,7 @@ from .const import (
     SQUEEZEBOX_SOURCE_STRINGS,
 )
 from .coordinator import SqueezeBoxPlayerUpdateCoordinator
+from .entity import SqueezeboxEntity
 
 if TYPE_CHECKING:
     from . import SqueezeboxConfigEntry
@@ -113,7 +117,7 @@ async def start_server_discovery(hass: HomeAssistant) -> None:
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SqueezeboxConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Squeezebox media_player platform from a server config entry."""
 
@@ -153,9 +157,27 @@ async def async_setup_entry(
     entry.async_on_unload(async_at_start(hass, start_server_discovery))
 
 
-class SqueezeBoxMediaPlayerEntity(
-    CoordinatorEntity[SqueezeBoxPlayerUpdateCoordinator], MediaPlayerEntity
-):
+def get_announce_volume(extra: dict) -> float | None:
+    """Get announce volume from extra service data."""
+    if ATTR_ANNOUNCE_VOLUME not in extra:
+        return None
+    announce_volume = float(extra[ATTR_ANNOUNCE_VOLUME])
+    if not (0 < announce_volume <= 1):
+        raise ValueError
+    return announce_volume * 100
+
+
+def get_announce_timeout(extra: dict) -> int | None:
+    """Get announce volume from extra service data."""
+    if ATTR_ANNOUNCE_TIMEOUT not in extra:
+        return None
+    announce_timeout = int(extra[ATTR_ANNOUNCE_TIMEOUT])
+    if announce_timeout < 1:
+        raise ValueError
+    return announce_timeout
+
+
+class SqueezeBoxMediaPlayerEntity(SqueezeboxEntity, MediaPlayerEntity):
     """Representation of the media player features of a SqueezeBox device.
 
     Wraps a pysqueezebox.Player() object.
@@ -166,6 +188,7 @@ class SqueezeBoxMediaPlayerEntity(
         | MediaPlayerEntityFeature.PAUSE
         | MediaPlayerEntityFeature.VOLUME_SET
         | MediaPlayerEntityFeature.VOLUME_MUTE
+        | MediaPlayerEntityFeature.VOLUME_STEP
         | MediaPlayerEntityFeature.PREVIOUS_TRACK
         | MediaPlayerEntityFeature.NEXT_TRACK
         | MediaPlayerEntityFeature.SEEK
@@ -179,41 +202,20 @@ class SqueezeBoxMediaPlayerEntity(
         | MediaPlayerEntityFeature.STOP
         | MediaPlayerEntityFeature.GROUPING
         | MediaPlayerEntityFeature.MEDIA_ENQUEUE
+        | MediaPlayerEntityFeature.MEDIA_ANNOUNCE
     )
     _attr_has_entity_name = True
     _attr_name = None
     _last_update: datetime | None = None
 
-    def __init__(
-        self,
-        coordinator: SqueezeBoxPlayerUpdateCoordinator,
-    ) -> None:
+    def __init__(self, coordinator: SqueezeBoxPlayerUpdateCoordinator) -> None:
         """Initialize the SqueezeBox device."""
         super().__init__(coordinator)
-        player = coordinator.player
-        self._player = player
         self._query_result: bool | dict = {}
         self._remove_dispatcher: Callable | None = None
         self._previous_media_position = 0
-        self._attr_unique_id = format_mac(player.player_id)
-        _manufacturer = None
-        if player.model == "SqueezeLite" or "SqueezePlay" in player.model:
-            _manufacturer = "Ralph Irving"
-        elif (
-            "Squeezebox" in player.model
-            or "Transporter" in player.model
-            or "Slim" in player.model
-        ):
-            _manufacturer = "Logitech"
-
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, self._attr_unique_id)},
-            name=player.name,
-            connections={(CONNECTION_NETWORK_MAC, self._attr_unique_id)},
-            via_device=(DOMAIN, coordinator.server_uuid),
-            model=player.model,
-            manufacturer=_manufacturer,
-        )
+        self._attr_unique_id = format_mac(self._player.player_id)
+        self._browse_data = BrowseData()
 
     @callback
     def _handle_coordinator_update(self) -> None:
@@ -223,6 +225,23 @@ class SqueezeBoxMediaPlayerEntity(
             self._last_update = utcnow()
         self.async_write_ha_state()
 
+    @property
+    def volume_step(self) -> float:
+        """Return the step to be used for volume up down."""
+        return float(
+            self.coordinator.config_entry.options.get(
+                CONF_VOLUME_STEP, DEFAULT_VOLUME_STEP
+            )
+            / 100
+        )
+
+    @property
+    def browse_limit(self) -> int:
+        """Return the step to be used for volume up down."""
+        return self.coordinator.config_entry.options.get(
+            CONF_BROWSE_LIMIT, DEFAULT_BROWSE_LIMIT
+        )
+
     @property
     def available(self) -> bool:
         """Return True if entity is available."""
@@ -366,16 +385,6 @@ class SqueezeBoxMediaPlayerEntity(
         await self._player.async_set_power(False)
         await self.coordinator.async_refresh()
 
-    async def async_volume_up(self) -> None:
-        """Volume up media player."""
-        await self._player.async_set_volume("+5")
-        await self.coordinator.async_refresh()
-
-    async def async_volume_down(self) -> None:
-        """Volume down media player."""
-        await self._player.async_set_volume("-5")
-        await self.coordinator.async_refresh()
-
     async def async_set_volume_level(self, volume: float) -> None:
         """Set volume level, range 0..1."""
         volume_percent = str(int(volume * 100))
@@ -428,7 +437,11 @@ class SqueezeBoxMediaPlayerEntity(
         await self.coordinator.async_refresh()
 
     async def async_play_media(
-        self, media_type: MediaType | str, media_id: str, **kwargs: Any
+        self,
+        media_type: MediaType | str,
+        media_id: str,
+        announce: bool | None = None,
+        **kwargs: Any,
     ) -> None:
         """Send the play_media command to the media player."""
         index = None
@@ -451,6 +464,32 @@ class SqueezeBoxMediaPlayerEntity(
             )
             media_id = play_item.url
 
+        if announce:
+            if media_type not in MediaType.MUSIC:
+                raise ServiceValidationError(
+                    "Announcements must have media type of 'music'.  Playlists are not supported"
+                )
+
+            extra = kwargs.get(ATTR_MEDIA_EXTRA, {})
+            cmd = "announce"
+            try:
+                announce_volume = get_announce_volume(extra)
+            except ValueError:
+                raise ServiceValidationError(
+                    f"{ATTR_ANNOUNCE_VOLUME} must be a number greater than 0 and less than or equal to 1"
+                ) from None
+            else:
+                self._player.set_announce_volume(announce_volume)
+
+            try:
+                announce_timeout = get_announce_timeout(extra)
+            except ValueError:
+                raise ServiceValidationError(
+                    f"{ATTR_ANNOUNCE_TIMEOUT} must be a whole number greater than 0"
+                ) from None
+            else:
+                self._player.set_announce_timeout(announce_timeout)
+
         if media_type in MediaType.MUSIC:
             if not media_id.startswith(SQUEEZEBOX_SOURCE_STRINGS):
                 # do not process special squeezebox "source" media ids
@@ -466,7 +505,9 @@ class SqueezeBoxMediaPlayerEntity(
                     "search_id": media_id,
                     "search_type": MediaType.PLAYLIST,
                 }
-                playlist = await generate_playlist(self._player, payload)
+                playlist = await generate_playlist(
+                    self._player, payload, self.browse_limit, self._browse_data
+                )
             except BrowseError:
                 # a list of urls
                 content = json.loads(media_id)
@@ -477,7 +518,9 @@ class SqueezeBoxMediaPlayerEntity(
                 "search_id": media_id,
                 "search_type": media_type,
             }
-            playlist = await generate_playlist(self._player, payload)
+            playlist = await generate_playlist(
+                self._player, payload, self.browse_limit, self._browse_data
+            )
 
             _LOGGER.debug("Generated playlist: %s", playlist)
 
@@ -575,7 +618,7 @@ class SqueezeBoxMediaPlayerEntity(
         )
 
         if media_content_type in [None, "library"]:
-            return await library_payload(self.hass, self._player)
+            return await library_payload(self.hass, self._player, self._browse_data)
 
         if media_content_id and media_source.is_media_source_id(media_content_id):
             return await media_source.async_browse_media(
@@ -587,7 +630,13 @@ class SqueezeBoxMediaPlayerEntity(
             "search_id": media_content_id,
         }
 
-        return await build_item_response(self, self._player, payload)
+        return await build_item_response(
+            self,
+            self._player,
+            payload,
+            self.browse_limit,
+            self._browse_data,
+        )
 
     async def async_get_browse_image(
         self,
diff --git a/homeassistant/components/squeezebox/sensor.py b/homeassistant/components/squeezebox/sensor.py
index 0ca33179f9f..9d9490208ea 100644
--- a/homeassistant/components/squeezebox/sensor.py
+++ b/homeassistant/components/squeezebox/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import SqueezeboxConfigEntry
@@ -43,6 +43,7 @@ SENSORS: tuple[SensorEntityDescription, ...] = (
         state_class=SensorStateClass.TOTAL,
         device_class=SensorDeviceClass.DURATION,
         native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
     ),
     SensorEntityDescription(
         key=STATUS_SENSOR_INFO_TOTAL_GENRES,
@@ -73,7 +74,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SqueezeboxConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Platform setup using common elements."""
 
diff --git a/homeassistant/components/squeezebox/strings.json b/homeassistant/components/squeezebox/strings.json
index bce71ddb5f2..83c5d7dd5d0 100644
--- a/homeassistant/components/squeezebox/strings.json
+++ b/homeassistant/components/squeezebox/strings.json
@@ -63,6 +63,29 @@
     }
   },
   "entity": {
+    "button": {
+      "preset": {
+        "name": "Preset {index}"
+      },
+      "brightness_up": {
+        "name": "Brightness up"
+      },
+      "brightness_down": {
+        "name": "Brightness down"
+      },
+      "bass_up": {
+        "name": "Bass up"
+      },
+      "bass_down": {
+        "name": "Bass down"
+      },
+      "treble_up": {
+        "name": "Treble up"
+      },
+      "treble_down": {
+        "name": "Treble down"
+      }
+    },
     "binary_sensor": {
       "rescan": {
         "name": "Library rescan"
@@ -103,5 +126,20 @@
         "unit_of_measurement": "[%key:component::squeezebox::entity::sensor::player_count::unit_of_measurement%]"
       }
     }
+  },
+  "options": {
+    "step": {
+      "init": {
+        "title": "LMS Configuration",
+        "data": {
+          "browse_limit": "Browse limit",
+          "volume_step": "Volume step"
+        },
+        "data_description": {
+          "browse_limit": "Maximum number of items when browsing or in a playlist.",
+          "volume_step": "Amount to adjust the volume when turning volume up or down."
+        }
+      }
+    }
   }
 }
diff --git a/homeassistant/components/srp_energy/__init__.py b/homeassistant/components/srp_energy/__init__.py
index 591ba5043e9..13c21709445 100644
--- a/homeassistant/components/srp_energy/__init__.py
+++ b/homeassistant/components/srp_energy/__init__.py
@@ -6,7 +6,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ID, CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
 
-from .const import CONF_IS_TOU, DOMAIN, LOGGER
+from .const import DOMAIN, LOGGER
 from .coordinator import SRPEnergyDataUpdateCoordinator
 
 PLATFORMS = [Platform.SENSOR]
@@ -26,9 +26,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         api_password,
     )
 
-    coordinator = SRPEnergyDataUpdateCoordinator(
-        hass, api_instance, entry.data[CONF_IS_TOU]
-    )
+    coordinator = SRPEnergyDataUpdateCoordinator(hass, entry, api_instance)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/srp_energy/coordinator.py b/homeassistant/components/srp_energy/coordinator.py
index e5a72457433..f3821891afa 100644
--- a/homeassistant/components/srp_energy/coordinator.py
+++ b/homeassistant/components/srp_energy/coordinator.py
@@ -12,7 +12,13 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from homeassistant.util import dt as dt_util
 
-from .const import DOMAIN, LOGGER, MIN_TIME_BETWEEN_UPDATES, PHOENIX_TIME_ZONE
+from .const import (
+    CONF_IS_TOU,
+    DOMAIN,
+    LOGGER,
+    MIN_TIME_BETWEEN_UPDATES,
+    PHOENIX_TIME_ZONE,
+)
 
 TIMEOUT = 10
 PHOENIX_ZONE_INFO = dt_util.get_time_zone(PHOENIX_TIME_ZONE)
@@ -24,14 +30,15 @@ class SRPEnergyDataUpdateCoordinator(DataUpdateCoordinator[float]):
     config_entry: ConfigEntry
 
     def __init__(
-        self, hass: HomeAssistant, client: SrpEnergyClient, is_time_of_use: bool
+        self, hass: HomeAssistant, config_entry: ConfigEntry, client: SrpEnergyClient
     ) -> None:
         """Initialize the srp_energy data coordinator."""
         self._client = client
-        self._is_time_of_use = is_time_of_use
+        self._is_time_of_use = config_entry.data[CONF_IS_TOU]
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=MIN_TIME_BETWEEN_UPDATES,
         )
diff --git a/homeassistant/components/srp_energy/sensor.py b/homeassistant/components/srp_energy/sensor.py
index a9f5c25d6a5..89274390411 100644
--- a/homeassistant/components/srp_energy/sensor.py
+++ b/homeassistant/components/srp_energy/sensor.py
@@ -11,7 +11,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfEnergy
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -20,7 +20,9 @@ from .const import DEVICE_CONFIG_URL, DEVICE_MANUFACTURER, DEVICE_MODEL, DOMAIN
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the SRP Energy Usage sensor."""
     coordinator: SRPEnergyDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/srp_energy/strings.json b/homeassistant/components/srp_energy/strings.json
index eca4f465435..5fa97b00b57 100644
--- a/homeassistant/components/srp_energy/strings.json
+++ b/homeassistant/components/srp_energy/strings.json
@@ -3,10 +3,10 @@
     "step": {
       "user": {
         "data": {
-          "id": "Account Id",
+          "id": "Account ID",
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
-          "is_tou": "Is Time of Use Plan"
+          "is_tou": "Is Time-of-Use Price Plan"
         }
       }
     },
diff --git a/homeassistant/components/starline/binary_sensor.py b/homeassistant/components/starline/binary_sensor.py
index ac1ad4f2b6e..a570b26a0d1 100644
--- a/homeassistant/components/starline/binary_sensor.py
+++ b/homeassistant/components/starline/binary_sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .account import StarlineAccount, StarlineDevice
 from .const import DOMAIN
@@ -70,7 +70,9 @@ BINARY_SENSOR_TYPES: tuple[BinarySensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the StarLine sensors."""
     account: StarlineAccount = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/starline/button.py b/homeassistant/components/starline/button.py
index 6fb307cda74..fa46d2a3773 100644
--- a/homeassistant/components/starline/button.py
+++ b/homeassistant/components/starline/button.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .account import StarlineAccount, StarlineDevice
 from .const import DOMAIN
@@ -34,7 +34,9 @@ BUTTON_TYPES: tuple[ButtonEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the StarLine button."""
     account: StarlineAccount = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/starline/device_tracker.py b/homeassistant/components/starline/device_tracker.py
index 610317b72c3..0c8418d28fc 100644
--- a/homeassistant/components/starline/device_tracker.py
+++ b/homeassistant/components/starline/device_tracker.py
@@ -3,7 +3,7 @@
 from homeassistant.components.device_tracker import TrackerEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from .account import StarlineAccount, StarlineDevice
@@ -12,7 +12,9 @@ from .entity import StarlineEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up StarLine entry."""
     account: StarlineAccount = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/starline/entity.py b/homeassistant/components/starline/entity.py
index 74807996dfb..f8846c2a97f 100644
--- a/homeassistant/components/starline/entity.py
+++ b/homeassistant/components/starline/entity.py
@@ -27,20 +27,20 @@ class StarlineEntity(Entity):
         self._unsubscribe_api: Callable | None = None
 
     @property
-    def available(self):
+    def available(self) -> bool:
         """Return True if entity is available."""
         return self._account.api.available
 
-    def update(self):
+    def update(self) -> None:
         """Read new state data."""
         self.schedule_update_ha_state()
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Call when entity about to be added to Home Assistant."""
         await super().async_added_to_hass()
         self._unsubscribe_api = self._account.api.add_update_listener(self.update)
 
-    async def async_will_remove_from_hass(self):
+    async def async_will_remove_from_hass(self) -> None:
         """Call when entity is being removed from Home Assistant."""
         await super().async_will_remove_from_hass()
         if self._unsubscribe_api is not None:
diff --git a/homeassistant/components/starline/lock.py b/homeassistant/components/starline/lock.py
index 19aad1a19b2..43886d63962 100644
--- a/homeassistant/components/starline/lock.py
+++ b/homeassistant/components/starline/lock.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.lock import LockEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .account import StarlineAccount, StarlineDevice
 from .const import DOMAIN
@@ -15,7 +15,9 @@ from .entity import StarlineEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the StarLine lock."""
     account: StarlineAccount = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/starline/sensor.py b/homeassistant/components/starline/sensor.py
index f9bd304c1e1..16988f1a9dc 100644
--- a/homeassistant/components/starline/sensor.py
+++ b/homeassistant/components/starline/sensor.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     UnitOfVolume,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.icon import icon_for_battery_level, icon_for_signal_level
 
 from .account import StarlineAccount, StarlineDevice
@@ -87,7 +87,9 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the StarLine sensors."""
     account: StarlineAccount = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/starline/switch.py b/homeassistant/components/starline/switch.py
index eb71f0b73b5..79d4fa86ddf 100644
--- a/homeassistant/components/starline/switch.py
+++ b/homeassistant/components/starline/switch.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .account import StarlineAccount, StarlineDevice
 from .const import DOMAIN
@@ -34,7 +34,9 @@ SWITCH_TYPES: tuple[SwitchEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the StarLine switch."""
     account: StarlineAccount = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/starlingbank/sensor.py b/homeassistant/components/starlingbank/sensor.py
index 282323d8b7b..063919179ac 100644
--- a/homeassistant/components/starlingbank/sensor.py
+++ b/homeassistant/components/starlingbank/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/starlink/__init__.py b/homeassistant/components/starlink/__init__.py
index 17081a7491e..0c512bb21c5 100644
--- a/homeassistant/components/starlink/__init__.py
+++ b/homeassistant/components/starlink/__init__.py
@@ -2,12 +2,10 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_IP_ADDRESS, Platform
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
-from .coordinator import StarlinkUpdateCoordinator
+from .coordinator import StarlinkConfigEntry, StarlinkUpdateCoordinator
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
@@ -19,25 +17,19 @@ PLATFORMS = [
 ]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(
+    hass: HomeAssistant, config_entry: StarlinkConfigEntry
+) -> bool:
     """Set up Starlink from a config entry."""
-    coordinator = StarlinkUpdateCoordinator(
-        hass=hass,
-        url=entry.data[CONF_IP_ADDRESS],
-        name=entry.title,
-    )
+    config_entry.runtime_data = StarlinkUpdateCoordinator(hass, config_entry)
+    await config_entry.runtime_data.async_config_entry_first_refresh()
 
-    await coordinator.async_config_entry_first_refresh()
-
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
-
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, config_entry: StarlinkConfigEntry
+) -> bool:
     """Unload a config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(config_entry, PLATFORMS)
diff --git a/homeassistant/components/starlink/binary_sensor.py b/homeassistant/components/starlink/binary_sensor.py
index e48d28dcc44..e06e79009c3 100644
--- a/homeassistant/components/starlink/binary_sensor.py
+++ b/homeassistant/components/starlink/binary_sensor.py
@@ -10,24 +10,22 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN
-from .coordinator import StarlinkData
+from .coordinator import StarlinkConfigEntry, StarlinkData
 from .entity import StarlinkEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    config_entry: StarlinkConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up all binary sensors for this entry."""
-    coordinator = hass.data[DOMAIN][entry.entry_id]
-
     async_add_entities(
-        StarlinkBinarySensorEntity(coordinator, description)
+        StarlinkBinarySensorEntity(config_entry.runtime_data, description)
         for description in BINARY_SENSORS
     )
 
@@ -65,6 +63,7 @@ BINARY_SENSORS = [
         key="currently_obstructed",
         translation_key="currently_obstructed",
         device_class=BinarySensorDeviceClass.PROBLEM,
+        entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=lambda data: data.status["currently_obstructed"],
     ),
     StarlinkBinarySensorEntityDescription(
@@ -114,4 +113,9 @@ BINARY_SENSORS = [
         entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=lambda data: data.alert["alert_unexpected_location"],
     ),
+    StarlinkBinarySensorEntityDescription(
+        key="connection",
+        device_class=BinarySensorDeviceClass.CONNECTIVITY,
+        value_fn=lambda data: data.status["state"] == "CONNECTED",
+    ),
 ]
diff --git a/homeassistant/components/starlink/button.py b/homeassistant/components/starlink/button.py
index f8f18763d30..15f35659b49 100644
--- a/homeassistant/components/starlink/button.py
+++ b/homeassistant/components/starlink/button.py
@@ -10,24 +10,23 @@ from homeassistant.components.button import (
     ButtonEntity,
     ButtonEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN
-from .coordinator import StarlinkUpdateCoordinator
+from .coordinator import StarlinkConfigEntry, StarlinkUpdateCoordinator
 from .entity import StarlinkEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    config_entry: StarlinkConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up all binary sensors for this entry."""
-    coordinator = hass.data[DOMAIN][entry.entry_id]
-
     async_add_entities(
-        StarlinkButtonEntity(coordinator, description) for description in BUTTONS
+        StarlinkButtonEntity(config_entry.runtime_data, description)
+        for description in BUTTONS
     )
 
 
diff --git a/homeassistant/components/starlink/coordinator.py b/homeassistant/components/starlink/coordinator.py
index 89d03a4fadc..02d51cd805e 100644
--- a/homeassistant/components/starlink/coordinator.py
+++ b/homeassistant/components/starlink/coordinator.py
@@ -26,12 +26,16 @@ from starlink_grpc import (
     status_data,
 )
 
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_IP_ADDRESS
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 _LOGGER = logging.getLogger(__name__)
 
+type StarlinkConfigEntry = ConfigEntry[StarlinkUpdateCoordinator]
+
 
 @dataclass
 class StarlinkData:
@@ -49,14 +53,18 @@ class StarlinkData:
 class StarlinkUpdateCoordinator(DataUpdateCoordinator[StarlinkData]):
     """Coordinates updates between all Starlink sensors defined in this file."""
 
-    def __init__(self, hass: HomeAssistant, name: str, url: str) -> None:
+    config_entry: StarlinkConfigEntry
+
+    def __init__(self, hass: HomeAssistant, config_entry: StarlinkConfigEntry) -> None:
         """Initialize an UpdateCoordinator for a group of sensors."""
-        self.channel_context = ChannelContext(target=url)
+        self.channel_context = ChannelContext(target=config_entry.data[CONF_IP_ADDRESS])
+        self.history_stats_start = None
         self.timezone = ZoneInfo(hass.config.time_zone)
         super().__init__(
             hass,
             _LOGGER,
-            name=name,
+            config_entry=config_entry,
+            name=config_entry.title,
             update_interval=timedelta(seconds=5),
         )
 
@@ -67,7 +75,18 @@ class StarlinkUpdateCoordinator(DataUpdateCoordinator[StarlinkData]):
         location = location_data(context)
         sleep = get_sleep_config(context)
         status, obstruction, alert = status_data(context)
-        usage, consumption = history_stats(parse_samples=-1, context=context)[-2:]
+        index, _, _, _, _, usage, consumption, *_ = history_stats(
+            parse_samples=-1, start=self.history_stats_start, context=context
+        )
+        self.history_stats_start = index["end_counter"]
+        if self.data:
+            if index["samples"] > 0:
+                usage["download_usage"] += self.data.usage["download_usage"]
+                usage["upload_usage"] += self.data.usage["upload_usage"]
+                consumption["total_energy"] += self.data.consumption["total_energy"]
+            else:
+                usage = self.data.usage
+                consumption = self.data.consumption
         return StarlinkData(
             location, sleep, status, obstruction, alert, usage, consumption
         )
diff --git a/homeassistant/components/starlink/device_tracker.py b/homeassistant/components/starlink/device_tracker.py
index 5174be19760..dbe31947b55 100644
--- a/homeassistant/components/starlink/device_tracker.py
+++ b/homeassistant/components/starlink/device_tracker.py
@@ -8,23 +8,22 @@ from homeassistant.components.device_tracker import (
     TrackerEntity,
     TrackerEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import ATTR_ALTITUDE, DOMAIN
-from .coordinator import StarlinkData
+from .const import ATTR_ALTITUDE
+from .coordinator import StarlinkConfigEntry, StarlinkData
 from .entity import StarlinkEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    config_entry: StarlinkConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up all binary sensors for this entry."""
-    coordinator = hass.data[DOMAIN][entry.entry_id]
-
     async_add_entities(
-        StarlinkDeviceTrackerEntity(coordinator, description)
+        StarlinkDeviceTrackerEntity(config_entry.runtime_data, description)
         for description in DEVICE_TRACKERS
     )
 
diff --git a/homeassistant/components/starlink/diagnostics.py b/homeassistant/components/starlink/diagnostics.py
index c619458b1dd..543fe9d8dde 100644
--- a/homeassistant/components/starlink/diagnostics.py
+++ b/homeassistant/components/starlink/diagnostics.py
@@ -4,18 +4,15 @@ from dataclasses import asdict
 from typing import Any
 
 from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
-from .coordinator import StarlinkUpdateCoordinator
+from .coordinator import StarlinkConfigEntry
 
 TO_REDACT = {"id", "latitude", "longitude", "altitude"}
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: ConfigEntry
+    hass: HomeAssistant, config_entry: StarlinkConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for Starlink config entries."""
-    coordinator: StarlinkUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
-    return async_redact_data(asdict(coordinator.data), TO_REDACT)
+    return async_redact_data(asdict(config_entry.runtime_data.data), TO_REDACT)
diff --git a/homeassistant/components/starlink/sensor.py b/homeassistant/components/starlink/sensor.py
index 5481e310fbd..d07e8174b27 100644
--- a/homeassistant/components/starlink/sensor.py
+++ b/homeassistant/components/starlink/sensor.py
@@ -12,7 +12,6 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     DEGREE,
     PERCENTAGE,
@@ -24,23 +23,23 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util.dt import now
 
-from .const import DOMAIN
-from .coordinator import StarlinkData
+from .coordinator import StarlinkConfigEntry, StarlinkData
 from .entity import StarlinkEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    config_entry: StarlinkConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up all sensors for this entry."""
-    coordinator = hass.data[DOMAIN][entry.entry_id]
-
     async_add_entities(
-        StarlinkSensorEntity(coordinator, description) for description in SENSORS
+        StarlinkSensorEntity(config_entry.runtime_data, description)
+        for description in SENSORS
     )
 
 
diff --git a/homeassistant/components/starlink/switch.py b/homeassistant/components/starlink/switch.py
index 3534748127e..c6dc237643e 100644
--- a/homeassistant/components/starlink/switch.py
+++ b/homeassistant/components/starlink/switch.py
@@ -11,23 +11,22 @@ from homeassistant.components.switch import (
     SwitchEntity,
     SwitchEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN
-from .coordinator import StarlinkData, StarlinkUpdateCoordinator
+from .coordinator import StarlinkConfigEntry, StarlinkData, StarlinkUpdateCoordinator
 from .entity import StarlinkEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    config_entry: StarlinkConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up all binary sensors for this entry."""
-    coordinator = hass.data[DOMAIN][entry.entry_id]
-
     async_add_entities(
-        StarlinkSwitchEntity(coordinator, description) for description in SWITCHES
+        StarlinkSwitchEntity(config_entry.runtime_data, description)
+        for description in SWITCHES
     )
 
 
diff --git a/homeassistant/components/starlink/time.py b/homeassistant/components/starlink/time.py
index 7395ec101ba..9f564333218 100644
--- a/homeassistant/components/starlink/time.py
+++ b/homeassistant/components/starlink/time.py
@@ -8,24 +8,23 @@ from datetime import UTC, datetime, time, tzinfo
 import math
 
 from homeassistant.components.time import TimeEntity, TimeEntityDescription
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN
-from .coordinator import StarlinkData, StarlinkUpdateCoordinator
+from .coordinator import StarlinkConfigEntry, StarlinkData, StarlinkUpdateCoordinator
 from .entity import StarlinkEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    config_entry: StarlinkConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up all time entities for this entry."""
-    coordinator = hass.data[DOMAIN][entry.entry_id]
-
     async_add_entities(
-        StarlinkTimeEntity(coordinator, description) for description in TIMES
+        StarlinkTimeEntity(config_entry.runtime_data, description)
+        for description in TIMES
     )
 
 
diff --git a/homeassistant/components/startca/sensor.py b/homeassistant/components/startca/sensor.py
index 5fc4872a754..62e02426fcb 100644
--- a/homeassistant/components/startca/sensor.py
+++ b/homeassistant/components/startca/sensor.py
@@ -25,8 +25,8 @@ from homeassistant.const import (
     UnitOfInformation,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/statistics/sensor.py b/homeassistant/components/statistics/sensor.py
index 5252c23fd3d..a5c5f10ecd0 100644
--- a/homeassistant/components/statistics/sensor.py
+++ b/homeassistant/components/statistics/sensor.py
@@ -47,7 +47,10 @@ from homeassistant.core import (
 )
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.device import async_device_info_to_link_from_entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.event import (
     async_track_point_in_utc_time,
     async_track_state_change_event,
@@ -617,7 +620,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Statistics sensor entry."""
     sampling_size = entry.options.get(CONF_SAMPLES_MAX_BUFFER_SIZE)
diff --git a/homeassistant/components/statistics/strings.json b/homeassistant/components/statistics/strings.json
index 91aead261ff..e1085a016ce 100644
--- a/homeassistant/components/statistics/strings.json
+++ b/homeassistant/components/statistics/strings.json
@@ -5,8 +5,8 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     },
     "error": {
-      "missing_max_age_or_sampling_size": "The sensor configuration must provide 'max_age' and/or 'sampling_size'",
-      "missing_keep_last_sample": "The sensor configuration must provide 'max_age' if 'keep_last_sample' is True"
+      "missing_max_age_or_sampling_size": "The sensor configuration must provide 'Max age' and/or 'Sampling size'",
+      "missing_keep_last_sample": "The sensor configuration must provide 'Max age' if 'Keep last sample' is true"
     },
     "step": {
       "user": {
@@ -21,7 +21,7 @@
         }
       },
       "state_characteristic": {
-        "description": "Read the documention for further details on available options and how to use them.",
+        "description": "Read the documentation for further details on available options and how to use them.",
         "data": {
           "state_characteristic": "Statistic characteristic"
         },
@@ -30,7 +30,7 @@
         }
       },
       "options": {
-        "description": "Read the documention for further details on how to configure the statistics sensor using these options.",
+        "description": "Read the documentation for further details on how to configure the statistics sensor using these options.",
         "data": {
           "sampling_size": "Sampling size",
           "max_age": "Max age",
@@ -41,8 +41,8 @@
         "data_description": {
           "sampling_size": "Maximum number of source sensor measurements stored.",
           "max_age": "Maximum age of source sensor measurements stored.",
-          "keep_last_sample": "Defines whether the most recent sampled value should be preserved regardless of the 'max age' setting.",
-          "percentile": "Only relevant in combination with the 'percentile' characteristic. Must be a value between 1 and 99.",
+          "keep_last_sample": "Defines whether the most recent sampled value should be preserved regardless of the 'Max age' setting.",
+          "percentile": "Only relevant in combination with the 'Percentile' characteristic. Must be a value between 1 and 99.",
           "precision": "Defines the number of decimal places of the calculated sensor value."
         }
       }
diff --git a/homeassistant/components/statsd/__init__.py b/homeassistant/components/statsd/__init__.py
index 50b74b20028..4e8e5b7f942 100644
--- a/homeassistant/components/statsd/__init__.py
+++ b/homeassistant/components/statsd/__init__.py
@@ -7,8 +7,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_HOST, CONF_PORT, CONF_PREFIX, EVENT_STATE_CHANGED
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import state as state_helper
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, state as state_helper
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/steam_online/__init__.py b/homeassistant/components/steam_online/__init__.py
index 6e45758fb94..7a2c32cb4d5 100644
--- a/homeassistant/components/steam_online/__init__.py
+++ b/homeassistant/components/steam_online/__init__.py
@@ -2,19 +2,17 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-from .coordinator import SteamDataUpdateCoordinator
+from .coordinator import SteamConfigEntry, SteamDataUpdateCoordinator
 
 PLATFORMS = [Platform.SENSOR]
-type SteamConfigEntry = ConfigEntry[SteamDataUpdateCoordinator]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: SteamConfigEntry) -> bool:
     """Set up Steam from a config entry."""
-    coordinator = SteamDataUpdateCoordinator(hass)
+    coordinator = SteamDataUpdateCoordinator(hass, entry)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
diff --git a/homeassistant/components/steam_online/config_flow.py b/homeassistant/components/steam_online/config_flow.py
index 69009fca8c4..57c75f0a704 100644
--- a/homeassistant/components/steam_online/config_flow.py
+++ b/homeassistant/components/steam_online/config_flow.py
@@ -18,8 +18,8 @@ from homeassistant.const import CONF_API_KEY, Platform
 from homeassistant.core import callback
 from homeassistant.helpers import config_validation as cv, entity_registry as er
 
-from . import SteamConfigEntry
 from .const import CONF_ACCOUNT, CONF_ACCOUNTS, DOMAIN, LOGGER, PLACEHOLDERS
+from .coordinator import SteamConfigEntry
 
 # To avoid too long request URIs, the amount of ids to request is limited
 MAX_IDS_TO_REQUEST = 275
diff --git a/homeassistant/components/steam_online/coordinator.py b/homeassistant/components/steam_online/coordinator.py
index 81a3bb0d898..731154183ed 100644
--- a/homeassistant/components/steam_online/coordinator.py
+++ b/homeassistant/components/steam_online/coordinator.py
@@ -3,11 +3,11 @@
 from __future__ import annotations
 
 from datetime import timedelta
-from typing import TYPE_CHECKING
 
 import steam
 from steam.api import _interface_method as INTMethod
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
@@ -15,8 +15,7 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .const import CONF_ACCOUNTS, DOMAIN, LOGGER
 
-if TYPE_CHECKING:
-    from . import SteamConfigEntry
+type SteamConfigEntry = ConfigEntry[SteamDataUpdateCoordinator]
 
 
 class SteamDataUpdateCoordinator(
@@ -26,11 +25,12 @@ class SteamDataUpdateCoordinator(
 
     config_entry: SteamConfigEntry
 
-    def __init__(self, hass: HomeAssistant) -> None:
+    def __init__(self, hass: HomeAssistant, config_entry: SteamConfigEntry) -> None:
         """Initialize the coordinator."""
         super().__init__(
             hass=hass,
             logger=LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=30),
         )
diff --git a/homeassistant/components/steam_online/sensor.py b/homeassistant/components/steam_online/sensor.py
index 058bb386383..c1e20933185 100644
--- a/homeassistant/components/steam_online/sensor.py
+++ b/homeassistant/components/steam_online/sensor.py
@@ -8,11 +8,10 @@ from typing import cast
 
 from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util.dt import utc_from_timestamp
 
-from . import SteamConfigEntry
 from .const import (
     CONF_ACCOUNTS,
     STEAM_API_URL,
@@ -21,7 +20,7 @@ from .const import (
     STEAM_MAIN_IMAGE_FILE,
     STEAM_STATUSES,
 )
-from .coordinator import SteamDataUpdateCoordinator
+from .coordinator import SteamConfigEntry, SteamDataUpdateCoordinator
 from .entity import SteamEntity
 
 PARALLEL_UPDATES = 1
@@ -30,7 +29,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SteamConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Steam platform."""
     async_add_entities(
diff --git a/homeassistant/components/steamist/__init__.py b/homeassistant/components/steamist/__init__.py
index 8d8401ec6fd..380f25ea8da 100644
--- a/homeassistant/components/steamist/__init__.py
+++ b/homeassistant/components/steamist/__init__.py
@@ -8,7 +8,7 @@ from typing import Any
 from aiosteamist import Steamist
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_HOST, CONF_NAME, Platform
+from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -52,9 +52,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     host = entry.data[CONF_HOST]
     coordinator = SteamistDataUpdateCoordinator(
         hass,
+        entry,
         Steamist(host, async_get_clientsession(hass)),
-        host,
-        entry.data.get(CONF_NAME),  # Only found from discovery
     )
     await coordinator.async_config_entry_first_refresh()
     if not async_get_discovery(hass, host):
diff --git a/homeassistant/components/steamist/coordinator.py b/homeassistant/components/steamist/coordinator.py
index c5aa7be7ddc..3f864364be7 100644
--- a/homeassistant/components/steamist/coordinator.py
+++ b/homeassistant/components/steamist/coordinator.py
@@ -7,6 +7,8 @@ import logging
 
 from aiosteamist import Steamist, SteamistStatus
 
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -16,20 +18,22 @@ _LOGGER = logging.getLogger(__name__)
 class SteamistDataUpdateCoordinator(DataUpdateCoordinator[SteamistStatus]):
     """DataUpdateCoordinator to gather data from a steamist steam shower."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         client: Steamist,
-        host: str,
-        device_name: str | None,
     ) -> None:
         """Initialize DataUpdateCoordinator to gather data for specific steamist."""
         self.client = client
-        self.device_name = device_name
+        self.device_name = config_entry.data.get(CONF_NAME)  # Only found from discovery
         super().__init__(
             hass,
             _LOGGER,
-            name=f"Steamist {host}",
+            config_entry=config_entry,
+            name=f"Steamist {config_entry.data[CONF_HOST]}",
             update_interval=timedelta(seconds=5),
             always_update=False,
         )
diff --git a/homeassistant/components/steamist/manifest.json b/homeassistant/components/steamist/manifest.json
index b15d7f87312..ab81c8b5a53 100644
--- a/homeassistant/components/steamist/manifest.json
+++ b/homeassistant/components/steamist/manifest.json
@@ -16,5 +16,5 @@
   "documentation": "https://www.home-assistant.io/integrations/steamist",
   "iot_class": "local_polling",
   "loggers": ["aiosteamist", "discovery30303"],
-  "requirements": ["aiosteamist==1.0.0", "discovery30303==0.3.2"]
+  "requirements": ["aiosteamist==1.0.1", "discovery30303==0.3.3"]
 }
diff --git a/homeassistant/components/steamist/sensor.py b/homeassistant/components/steamist/sensor.py
index 7c24d015513..94e3ff86ee1 100644
--- a/homeassistant/components/steamist/sensor.py
+++ b/homeassistant/components/steamist/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfTemperature, UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import SteamistDataUpdateCoordinator
@@ -58,7 +58,7 @@ SENSORS: tuple[SteamistSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors."""
     coordinator: SteamistDataUpdateCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/steamist/switch.py b/homeassistant/components/steamist/switch.py
index 91806f4fa0c..17e1d6d47ac 100644
--- a/homeassistant/components/steamist/switch.py
+++ b/homeassistant/components/steamist/switch.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import SteamistDataUpdateCoordinator
@@ -22,7 +22,7 @@ ACTIVE_SWITCH = SwitchEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors."""
     coordinator: SteamistDataUpdateCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/stiebel_eltron/__init__.py b/homeassistant/components/stiebel_eltron/__init__.py
index 80c1dad3ee8..94a3bd1058b 100644
--- a/homeassistant/components/stiebel_eltron/__init__.py
+++ b/homeassistant/components/stiebel_eltron/__init__.py
@@ -9,8 +9,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_NAME, DEVICE_DEFAULT_NAME, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import Throttle
 
diff --git a/homeassistant/components/stookwijzer/__init__.py b/homeassistant/components/stookwijzer/__init__.py
index d8b9561bde9..9adfc09de0e 100644
--- a/homeassistant/components/stookwijzer/__init__.py
+++ b/homeassistant/components/stookwijzer/__init__.py
@@ -9,7 +9,6 @@ from stookwijzer import Stookwijzer
 from homeassistant.const import CONF_LATITUDE, CONF_LOCATION, CONF_LONGITUDE, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er, issue_registry as ir
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DOMAIN, LOGGER
 from .coordinator import StookwijzerConfigEntry, StookwijzerCoordinator
@@ -43,13 +42,12 @@ async def async_migrate_entry(
     LOGGER.debug("Migrating from version %s", entry.version)
 
     if entry.version == 1:
-        latitude, longitude = await Stookwijzer.async_transform_coordinates(
-            async_get_clientsession(hass),
+        xy = await Stookwijzer.async_transform_coordinates(
             entry.data[CONF_LOCATION][CONF_LATITUDE],
             entry.data[CONF_LOCATION][CONF_LONGITUDE],
         )
 
-        if not latitude or not longitude:
+        if not xy:
             ir.async_create_issue(
                 hass,
                 DOMAIN,
@@ -67,8 +65,8 @@ async def async_migrate_entry(
             entry,
             version=2,
             data={
-                CONF_LATITUDE: latitude,
-                CONF_LONGITUDE: longitude,
+                CONF_LATITUDE: xy["x"],
+                CONF_LONGITUDE: xy["y"],
             },
         )
 
diff --git a/homeassistant/components/stookwijzer/config_flow.py b/homeassistant/components/stookwijzer/config_flow.py
index 32b4836763f..ff14bce26e6 100644
--- a/homeassistant/components/stookwijzer/config_flow.py
+++ b/homeassistant/components/stookwijzer/config_flow.py
@@ -9,7 +9,6 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_LATITUDE, CONF_LOCATION, CONF_LONGITUDE
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.selector import LocationSelector
 
 from .const import DOMAIN
@@ -26,15 +25,14 @@ class StookwijzerFlowHandler(ConfigFlow, domain=DOMAIN):
         """Handle a flow initialized by the user."""
         errors = {}
         if user_input is not None:
-            latitude, longitude = await Stookwijzer.async_transform_coordinates(
-                async_get_clientsession(self.hass),
+            xy = await Stookwijzer.async_transform_coordinates(
                 user_input[CONF_LOCATION][CONF_LATITUDE],
                 user_input[CONF_LOCATION][CONF_LONGITUDE],
             )
-            if latitude and longitude:
+            if xy:
                 return self.async_create_entry(
                     title="Stookwijzer",
-                    data={CONF_LATITUDE: latitude, CONF_LONGITUDE: longitude},
+                    data={CONF_LATITUDE: xy["x"], CONF_LONGITUDE: xy["y"]},
                 )
             errors["base"] = "unknown"
 
diff --git a/homeassistant/components/stookwijzer/coordinator.py b/homeassistant/components/stookwijzer/coordinator.py
index 23092bed66e..8f81494b7d5 100644
--- a/homeassistant/components/stookwijzer/coordinator.py
+++ b/homeassistant/components/stookwijzer/coordinator.py
@@ -20,18 +20,23 @@ type StookwijzerConfigEntry = ConfigEntry[StookwijzerCoordinator]
 class StookwijzerCoordinator(DataUpdateCoordinator[None]):
     """Stookwijzer update coordinator."""
 
-    def __init__(self, hass: HomeAssistant, entry: StookwijzerConfigEntry) -> None:
+    config_entry: StookwijzerConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: StookwijzerConfigEntry
+    ) -> None:
         """Initialize the coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
         self.client = Stookwijzer(
             async_get_clientsession(hass),
-            entry.data[CONF_LATITUDE],
-            entry.data[CONF_LONGITUDE],
+            config_entry.data[CONF_LATITUDE],
+            config_entry.data[CONF_LONGITUDE],
         )
 
     async def _async_update_data(self) -> None:
diff --git a/homeassistant/components/stookwijzer/diagnostics.py b/homeassistant/components/stookwijzer/diagnostics.py
index 2849e0e976a..1f3ef4ee4ba 100644
--- a/homeassistant/components/stookwijzer/diagnostics.py
+++ b/homeassistant/components/stookwijzer/diagnostics.py
@@ -18,4 +18,5 @@ async def async_get_config_entry_diagnostics(
         "advice": client.advice,
         "air_quality_index": client.lki,
         "windspeed_ms": client.windspeed_ms,
+        "forecast": await client.async_get_forecast(),
     }
diff --git a/homeassistant/components/stookwijzer/manifest.json b/homeassistant/components/stookwijzer/manifest.json
index 3fe16fb3d33..dd10f57f485 100644
--- a/homeassistant/components/stookwijzer/manifest.json
+++ b/homeassistant/components/stookwijzer/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/stookwijzer",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["stookwijzer==1.5.1"]
+  "requirements": ["stookwijzer==1.6.1"]
 }
diff --git a/homeassistant/components/stookwijzer/sensor.py b/homeassistant/components/stookwijzer/sensor.py
index 2660ff2ddb2..91224b711be 100644
--- a/homeassistant/components/stookwijzer/sensor.py
+++ b/homeassistant/components/stookwijzer/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import UnitOfSpeed
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
@@ -59,7 +59,7 @@ STOOKWIJZER_SENSORS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: StookwijzerConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Stookwijzer sensor from a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/stookwijzer/strings.json b/homeassistant/components/stookwijzer/strings.json
index 189af89b282..a028f1f19c5 100644
--- a/homeassistant/components/stookwijzer/strings.json
+++ b/homeassistant/components/stookwijzer/strings.json
@@ -2,7 +2,7 @@
   "config": {
     "step": {
       "user": {
-        "description": "Select the location you want to recieve the Stookwijzer information for.",
+        "description": "Select the location you want to receive the Stookwijzer information for.",
         "data": {
           "location": "[%key:common::config_flow::data::location%]"
         },
@@ -29,7 +29,7 @@
   },
   "issues": {
     "location_migration_failed": {
-      "description": "The Stookwijzer integration was unable to automatically migrate your location to a new format the updated integrations uses.\n\nMake sure you are connected to the internet and restart Home Assistant to try again.\n\nIf this doesn't resolve the error, remove and re-add the integration.",
+      "description": "The Stookwijzer integration was unable to automatically migrate your location to a new format the updated integration uses.\n\nMake sure you are connected to the Internet and restart Home Assistant to try again.\n\nIf this doesn't resolve the error, remove and re-add the integration.",
       "title": "Migration of your location failed"
     }
   },
diff --git a/homeassistant/components/stream/__init__.py b/homeassistant/components/stream/__init__.py
index 2772fc2d30e..8fa4c69ac5a 100644
--- a/homeassistant/components/stream/__init__.py
+++ b/homeassistant/components/stream/__init__.py
@@ -33,7 +33,7 @@ from yarl import URL
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP, EVENT_LOGGING_CHANGED
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.setup import SetupPhases, async_pause_setup
 from homeassistant.util.async_ import create_eager_task
diff --git a/homeassistant/components/streamlabswater/__init__.py b/homeassistant/components/streamlabswater/__init__.py
index 5eeb40630f8..1c1357a9b2b 100644
--- a/homeassistant/components/streamlabswater/__init__.py
+++ b/homeassistant/components/streamlabswater/__init__.py
@@ -6,7 +6,7 @@ import voluptuous as vol
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, Platform
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import DOMAIN
 from .coordinator import StreamlabsCoordinator
@@ -35,7 +35,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     api_key = entry.data[CONF_API_KEY]
     client = StreamlabsClient(api_key)
-    coordinator = StreamlabsCoordinator(hass, client)
+    coordinator = StreamlabsCoordinator(hass, entry, client)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/streamlabswater/binary_sensor.py b/homeassistant/components/streamlabswater/binary_sensor.py
index 5a0073c25d3..e3e966edde0 100644
--- a/homeassistant/components/streamlabswater/binary_sensor.py
+++ b/homeassistant/components/streamlabswater/binary_sensor.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import StreamlabsCoordinator
 from .const import DOMAIN
@@ -15,7 +15,7 @@ from .entity import StreamlabsWaterEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Streamlabs water binary sensor from a config entry."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/streamlabswater/coordinator.py b/homeassistant/components/streamlabswater/coordinator.py
index 56e67abe222..df4a6056b36 100644
--- a/homeassistant/components/streamlabswater/coordinator.py
+++ b/homeassistant/components/streamlabswater/coordinator.py
@@ -5,6 +5,7 @@ from datetime import timedelta
 
 from streamlabswater.streamlabswater import StreamlabsClient
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -25,15 +26,19 @@ class StreamlabsData:
 class StreamlabsCoordinator(DataUpdateCoordinator[dict[str, StreamlabsData]]):
     """Coordinator for Streamlabs."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         client: StreamlabsClient,
     ) -> None:
         """Coordinator for Streamlabs."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name="Streamlabs",
             update_interval=timedelta(seconds=60),
         )
diff --git a/homeassistant/components/streamlabswater/sensor.py b/homeassistant/components/streamlabswater/sensor.py
index 412b2187495..dea3f081326 100644
--- a/homeassistant/components/streamlabswater/sensor.py
+++ b/homeassistant/components/streamlabswater/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfVolume
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import StreamlabsCoordinator
@@ -60,7 +60,7 @@ SENSORS: tuple[StreamlabsWaterSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Streamlabs water sensor from a config entry."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/subaru/device_tracker.py b/homeassistant/components/subaru/device_tracker.py
index d406234c36e..6bcca848ef2 100644
--- a/homeassistant/components/subaru/device_tracker.py
+++ b/homeassistant/components/subaru/device_tracker.py
@@ -9,7 +9,7 @@ from subarulink.const import LATITUDE, LONGITUDE, TIMESTAMP
 from homeassistant.components.device_tracker.config_entry import TrackerEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -29,7 +29,7 @@ from .const import (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Subaru device tracker by config_entry."""
     entry: dict = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/subaru/lock.py b/homeassistant/components/subaru/lock.py
index e21102f0b0c..07caa0d6367 100644
--- a/homeassistant/components/subaru/lock.py
+++ b/homeassistant/components/subaru/lock.py
@@ -10,7 +10,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import SERVICE_LOCK, SERVICE_UNLOCK
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN, get_device_info
 from .const import (
@@ -32,7 +32,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Subaru locks by config_entry."""
     entry = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/subaru/sensor.py b/homeassistant/components/subaru/sensor.py
index ba9b7d46b06..aa4c4ee16be 100644
--- a/homeassistant/components/subaru/sensor.py
+++ b/homeassistant/components/subaru/sensor.py
@@ -17,7 +17,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, UnitOfLength, UnitOfPressure, UnitOfVolume
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -141,7 +141,7 @@ EV_SENSORS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Subaru sensors by config_entry."""
     entry = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/subaru/strings.json b/homeassistant/components/subaru/strings.json
index 00da729dccd..7525e73f802 100644
--- a/homeassistant/components/subaru/strings.json
+++ b/homeassistant/components/subaru/strings.json
@@ -2,7 +2,7 @@
   "config": {
     "step": {
       "user": {
-        "title": "Subaru Starlink Configuration",
+        "title": "Subaru Starlink configuration",
         "description": "Please enter your MySubaru credentials\nNOTE: Initial setup may take up to 30 seconds",
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
@@ -49,7 +49,7 @@
   "options": {
     "step": {
       "init": {
-        "title": "Subaru Starlink Options",
+        "title": "Subaru Starlink options",
         "description": "When enabled, vehicle polling will send a remote command to your vehicle every 2 hours to obtain new sensor data. Without vehicle polling, new sensor data is only received when the vehicle automatically pushes data (normally after engine shutdown).",
         "data": {
           "update_enabled": "Enable vehicle polling"
@@ -106,7 +106,7 @@
       "fields": {
         "door": {
           "name": "Door",
-          "description": "One of the following: 'all', 'driver', 'tailgate'."
+          "description": "Which door(s) to open."
         }
       }
     }
diff --git a/homeassistant/components/suez_water/coordinator.py b/homeassistant/components/suez_water/coordinator.py
index 38f94b8937e..10d4d3cdbcb 100644
--- a/homeassistant/components/suez_water/coordinator.py
+++ b/homeassistant/components/suez_water/coordinator.py
@@ -20,8 +20,8 @@ class SuezWaterAggregatedAttributes:
 
     this_month_consumption: dict[str, float]
     previous_month_consumption: dict[str, float]
-    last_year_overall: dict[str, float]
-    this_year_overall: dict[str, float]
+    last_year_overall: int
+    this_year_overall: int
     history: dict[str, float]
     highest_monthly_consumption: float
 
diff --git a/homeassistant/components/suez_water/manifest.json b/homeassistant/components/suez_water/manifest.json
index 5d317ea5ba3..f09d2e22633 100644
--- a/homeassistant/components/suez_water/manifest.json
+++ b/homeassistant/components/suez_water/manifest.json
@@ -7,5 +7,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["pysuez", "regex"],
   "quality_scale": "bronze",
-  "requirements": ["pysuezV2==2.0.3"]
+  "requirements": ["pysuezV2==2.0.4"]
 }
diff --git a/homeassistant/components/suez_water/sensor.py b/homeassistant/components/suez_water/sensor.py
index 1152ebd551b..a162cc6168d 100644
--- a/homeassistant/components/suez_water/sensor.py
+++ b/homeassistant/components/suez_water/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import CURRENCY_EURO, UnitOfVolume
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import CONF_COUNTER_ID, DOMAIN
@@ -53,7 +53,7 @@ SENSORS: tuple[SuezWaterSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SuezWaterConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Suez Water sensor from a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/suez_water/strings.json b/homeassistant/components/suez_water/strings.json
index be2d4849e76..a8632fcb24a 100644
--- a/homeassistant/components/suez_water/strings.json
+++ b/homeassistant/components/suez_water/strings.json
@@ -5,21 +5,21 @@
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
-          "counter_id": "Meter id"
+          "counter_id": "Meter ID"
         },
         "data_description": {
           "username": "Enter your login associated with your {tout_sur_mon_eau} account",
           "password": "Enter your password associated with your {tout_sur_mon_eau} account",
-          "counter_id": "Enter your meter id (ex: 12345678). Should be found automatically during setup, if not see integration documentation for more information"
+          "counter_id": "Enter your meter ID (ex: 12345678). Should be found automatically during setup, if not see integration documentation for more information"
         },
-        "description": "Connect your suez water {tout_sur_mon_eau} account to retrieve your water consumption"
+        "description": "Connect your Suez Water {tout_sur_mon_eau} account to retrieve your water consumption"
       }
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "unknown": "[%key:common::config_flow::error::unknown%]",
-      "counter_not_found": "Could not find meter id automatically"
+      "counter_not_found": "Could not find meter ID automatically"
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
diff --git a/homeassistant/components/sun/sensor.py b/homeassistant/components/sun/sensor.py
index e7e621d06cd..a042adb9b83 100644
--- a/homeassistant/components/sun/sensor.py
+++ b/homeassistant/components/sun/sensor.py
@@ -17,7 +17,7 @@ from homeassistant.const import DEGREE, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .const import DOMAIN, SIGNAL_EVENTS_CHANGED, SIGNAL_POSITION_CHANGED
@@ -106,7 +106,9 @@ SENSOR_TYPES: tuple[SunSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: SunConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: SunConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Sun sensor platform."""
 
diff --git a/homeassistant/components/sun/trigger.py b/homeassistant/components/sun/trigger.py
index 7724816d636..71498990b6f 100644
--- a/homeassistant/components/sun/trigger.py
+++ b/homeassistant/components/sun/trigger.py
@@ -11,7 +11,7 @@ from homeassistant.const import (
     SUN_EVENT_SUNRISE,
 )
 from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import async_track_sunrise, async_track_sunset
 from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
 from homeassistant.helpers.typing import ConfigType
diff --git a/homeassistant/components/sunweg/sensor/__init__.py b/homeassistant/components/sunweg/sensor/__init__.py
index e582b5135d3..f71d992bea9 100644
--- a/homeassistant/components/sunweg/sensor/__init__.py
+++ b/homeassistant/components/sunweg/sensor/__init__.py
@@ -15,7 +15,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .. import SunWEGData
 from ..const import CONF_PLANT_ID, DEFAULT_PLANT_ID, DOMAIN, DeviceType
@@ -49,7 +49,7 @@ def get_device_list(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the SunWEG sensor."""
     name = config_entry.data[CONF_NAME]
diff --git a/homeassistant/components/supervisord/sensor.py b/homeassistant/components/supervisord/sensor.py
index 24189fb7de0..c443e1e63df 100644
--- a/homeassistant/components/supervisord/sensor.py
+++ b/homeassistant/components/supervisord/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_URL
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/supla/__init__.py b/homeassistant/components/supla/__init__.py
index 8f04b5b662e..62f9b4b232d 100644
--- a/homeassistant/components/supla/__init__.py
+++ b/homeassistant/components/supla/__init__.py
@@ -11,8 +11,8 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_ACCESS_TOKEN, Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
diff --git a/homeassistant/components/surepetcare/__init__.py b/homeassistant/components/surepetcare/__init__.py
index e1f846d63a7..130242b7742 100644
--- a/homeassistant/components/surepetcare/__init__.py
+++ b/homeassistant/components/surepetcare/__init__.py
@@ -38,8 +38,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     try:
         hass.data[DOMAIN][entry.entry_id] = coordinator = SurePetcareDataCoordinator(
-            entry,
             hass,
+            entry,
         )
     except SurePetcareAuthenticationError as error:
         _LOGGER.error("Unable to connect to surepetcare.io: Wrong credentials!")
diff --git a/homeassistant/components/surepetcare/binary_sensor.py b/homeassistant/components/surepetcare/binary_sensor.py
index 3acd768cb30..416d56d1bdd 100644
--- a/homeassistant/components/surepetcare/binary_sensor.py
+++ b/homeassistant/components/surepetcare/binary_sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import SurePetcareDataCoordinator
@@ -23,7 +23,9 @@ from .entity import SurePetcareEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Sure PetCare Flaps binary sensors based on a config entry."""
 
diff --git a/homeassistant/components/surepetcare/coordinator.py b/homeassistant/components/surepetcare/coordinator.py
index a80e96ad185..d8112cebc90 100644
--- a/homeassistant/components/surepetcare/coordinator.py
+++ b/homeassistant/components/surepetcare/coordinator.py
@@ -33,7 +33,9 @@ SCAN_INTERVAL = timedelta(minutes=3)
 class SurePetcareDataCoordinator(DataUpdateCoordinator[dict[int, SurepyEntity]]):
     """Handle Surepetcare data."""
 
-    def __init__(self, entry: ConfigEntry, hass: HomeAssistant) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
         """Initialize the data handler."""
         self.surepy = Surepy(
             entry.data[CONF_USERNAME],
@@ -51,6 +53,7 @@ class SurePetcareDataCoordinator(DataUpdateCoordinator[dict[int, SurepyEntity]])
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/surepetcare/lock.py b/homeassistant/components/surepetcare/lock.py
index f960400bcbc..09fadf8be60 100644
--- a/homeassistant/components/surepetcare/lock.py
+++ b/homeassistant/components/surepetcare/lock.py
@@ -10,7 +10,7 @@ from surepy.enums import EntityType, LockState as SurepyLockState
 from homeassistant.components.lock import LockEntity, LockState
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import SurePetcareDataCoordinator
@@ -18,7 +18,9 @@ from .entity import SurePetcareEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Sure PetCare locks on a config entry."""
 
diff --git a/homeassistant/components/surepetcare/sensor.py b/homeassistant/components/surepetcare/sensor.py
index b4e7c6203a3..b012878caf7 100644
--- a/homeassistant/components/surepetcare/sensor.py
+++ b/homeassistant/components/surepetcare/sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_VOLTAGE, PERCENTAGE, EntityCategory, UnitOfVolume
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, SURE_BATT_VOLTAGE_DIFF, SURE_BATT_VOLTAGE_LOW
 from .coordinator import SurePetcareDataCoordinator
@@ -20,7 +20,9 @@ from .entity import SurePetcareEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Sure PetCare Flaps sensors."""
 
diff --git a/homeassistant/components/swiss_hydrological_data/sensor.py b/homeassistant/components/swiss_hydrological_data/sensor.py
index 3d88182eaa4..897b440a934 100644
--- a/homeassistant/components/swiss_hydrological_data/sensor.py
+++ b/homeassistant/components/swiss_hydrological_data/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_MONITORED_CONDITIONS
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/swiss_public_transport/__init__.py b/homeassistant/components/swiss_public_transport/__init__.py
index 628f6e95c2a..0d0c4dc6169 100644
--- a/homeassistant/components/swiss_public_transport/__init__.py
+++ b/homeassistant/components/swiss_public_transport/__init__.py
@@ -96,7 +96,9 @@ async def async_setup_entry(
             },
         ) from e
 
-    coordinator = SwissPublicTransportDataUpdateCoordinator(hass, opendata, time_offset)
+    coordinator = SwissPublicTransportDataUpdateCoordinator(
+        hass, entry, opendata, time_offset
+    )
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
 
diff --git a/homeassistant/components/swiss_public_transport/config_flow.py b/homeassistant/components/swiss_public_transport/config_flow.py
index 58d674f0c26..872044097d6 100644
--- a/homeassistant/components/swiss_public_transport/config_flow.py
+++ b/homeassistant/components/swiss_public_transport/config_flow.py
@@ -11,8 +11,8 @@ from opendata_transport.exceptions import (
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.selector import (
     DurationSelector,
     SelectSelector,
@@ -190,7 +190,7 @@ class SwissPublicTransportConfigFlow(ConfigFlow, domain=DOMAIN):
             return "cannot_connect"
         except OpendataTransportError:
             return "bad_config"
-        except Exception:  # pylint: disable=broad-except
+        except Exception:
             _LOGGER.exception("Unknown error")
             return "unknown"
         return None
diff --git a/homeassistant/components/swiss_public_transport/coordinator.py b/homeassistant/components/swiss_public_transport/coordinator.py
index c4cf2390dd0..32b52122c7d 100644
--- a/homeassistant/components/swiss_public_transport/coordinator.py
+++ b/homeassistant/components/swiss_public_transport/coordinator.py
@@ -15,7 +15,7 @@ from opendata_transport.exceptions import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.json import JsonValueType
 
 from .const import CONNECTIONS_COUNT, DEFAULT_UPDATE_TIME, DOMAIN
@@ -61,6 +61,7 @@ class SwissPublicTransportDataUpdateCoordinator(
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: SwissPublicTransportConfigEntry,
         opendata: OpendataTransport,
         time_offset: dict[str, int] | None,
     ) -> None:
@@ -68,6 +69,7 @@ class SwissPublicTransportDataUpdateCoordinator(
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=DEFAULT_UPDATE_TIME),
         )
diff --git a/homeassistant/components/swiss_public_transport/helper.py b/homeassistant/components/swiss_public_transport/helper.py
index 704479b77d6..e41901337f4 100644
--- a/homeassistant/components/swiss_public_transport/helper.py
+++ b/homeassistant/components/swiss_public_transport/helper.py
@@ -6,7 +6,7 @@ from typing import Any
 
 from opendata_transport import OpendataTransport
 
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import (
     CONF_DESTINATION,
diff --git a/homeassistant/components/swiss_public_transport/icons.json b/homeassistant/components/swiss_public_transport/icons.json
index 06a640a06b2..45cf4713705 100644
--- a/homeassistant/components/swiss_public_transport/icons.json
+++ b/homeassistant/components/swiss_public_transport/icons.json
@@ -10,7 +10,7 @@
       "departure2": {
         "default": "mdi:bus-clock"
       },
-      "duration": {
+      "trip_duration": {
         "default": "mdi:timeline-clock"
       },
       "transfers": {
diff --git a/homeassistant/components/swiss_public_transport/sensor.py b/homeassistant/components/swiss_public_transport/sensor.py
index a0131938a37..6475fe802c2 100644
--- a/homeassistant/components/swiss_public_transport/sensor.py
+++ b/homeassistant/components/swiss_public_transport/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import UnitOfTime
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -56,8 +56,10 @@ SENSORS: tuple[SwissPublicTransportSensorEntityDescription, ...] = (
     ],
     SwissPublicTransportSensorEntityDescription(
         key="duration",
+        translation_key="trip_duration",
         device_class=SensorDeviceClass.DURATION,
         native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
         value_fn=lambda data_connection: data_connection["duration"],
     ),
     SwissPublicTransportSensorEntityDescription(
@@ -88,7 +90,7 @@ SENSORS: tuple[SwissPublicTransportSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: SwissPublicTransportConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor from a config entry created in the integrations UI."""
     unique_id = config_entry.unique_id
diff --git a/homeassistant/components/swiss_public_transport/strings.json b/homeassistant/components/swiss_public_transport/strings.json
index ef8cc5595e3..f1b28f5ed14 100644
--- a/homeassistant/components/swiss_public_transport/strings.json
+++ b/homeassistant/components/swiss_public_transport/strings.json
@@ -2,7 +2,7 @@
   "config": {
     "error": {
       "cannot_connect": "Cannot connect to server",
-      "bad_config": "Request failed due to bad config: Check at [stationboard]({stationboard_url}) if your station names are valid",
+      "bad_config": "Request failed due to bad config: Check the stationboard linked above if your station names are valid",
       "too_many_via_stations": "Too many via stations, only up to 5 via stations are allowed per connection.",
       "unknown": "An unknown error was raised by python-opendata-transport"
     },
@@ -28,7 +28,7 @@
           "time_station": "Usually the departure time of a connection when it leaves the start station is tracked. Alternatively, track the time when the connection arrives at its end station.",
           "time_mode": "Time mode lets you change the departure timing and fix it to a specific time (e.g. 7:12:00 AM every morning) or add a moving offset (e.g. +00:05:00 taking into account the time to walk to the station)."
         },
-        "description": "Provide start and end station for your connection,\nand optionally up to 5 via stations.\n\nCheck the [stationboard]({stationboard_url}) for valid stations.",
+        "description": "Provide start and end station for your connection, and optionally up to 5 via stations.\n\nCheck the [stationboard]({stationboard_url}) for valid stations.",
         "title": "Swiss Public Transport"
       },
       "time_fixed": {
@@ -64,8 +64,8 @@
       "departure2": {
         "name": "Departure +2"
       },
-      "duration": {
-        "name": "Duration"
+      "trip_duration": {
+        "name": "Trip duration"
       },
       "transfers": {
         "name": "Transfers"
@@ -83,8 +83,8 @@
   },
   "services": {
     "fetch_connections": {
-      "name": "Fetch Connections",
-      "description": "Fetch a list of connections from the swiss public transport.",
+      "name": "Fetch connections",
+      "description": "Fetches a list of connections from Swiss public transport.",
       "fields": {
         "config_entry_id": {
           "name": "Instance",
@@ -92,7 +92,7 @@
         },
         "limit": {
           "name": "Limit",
-          "description": "Number of connections to fetch from [1-15]"
+          "description": "Number of connections to fetch."
         }
       }
     }
diff --git a/homeassistant/components/swisscom/device_tracker.py b/homeassistant/components/swisscom/device_tracker.py
index 66537a4311e..842dc657817 100644
--- a/homeassistant/components/swisscom/device_tracker.py
+++ b/homeassistant/components/swisscom/device_tracker.py
@@ -15,7 +15,7 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/switch/light.py b/homeassistant/components/switch/light.py
index 48d555e6616..276496ce614 100644
--- a/homeassistant/components/switch/light.py
+++ b/homeassistant/components/switch/light.py
@@ -21,8 +21,7 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
 )
 from homeassistant.core import Event, EventStateChangedData, HomeAssistant, callback
-from homeassistant.helpers import entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/switch/strings.json b/homeassistant/components/switch/strings.json
index 0663384fe2c..b73cf8f849d 100644
--- a/homeassistant/components/switch/strings.json
+++ b/homeassistant/components/switch/strings.json
@@ -25,10 +25,18 @@
       }
     },
     "switch": {
-      "name": "[%key:component::switch::title%]"
+      "name": "[%key:component::switch::title%]",
+      "state": {
+        "off": "[%key:common::state::off%]",
+        "on": "[%key:common::state::on%]"
+      }
     },
     "outlet": {
-      "name": "Outlet"
+      "name": "Outlet",
+      "state": {
+        "off": "[%key:common::state::off%]",
+        "on": "[%key:common::state::on%]"
+      }
     }
   },
   "services": {
diff --git a/homeassistant/components/switch_as_x/cover.py b/homeassistant/components/switch_as_x/cover.py
index 7c6a7ff38ad..8fd9c799bcb 100644
--- a/homeassistant/components/switch_as_x/cover.py
+++ b/homeassistant/components/switch_as_x/cover.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, EventStateChangedData, HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_INVERT
 from .entity import BaseInvertableEntity
@@ -29,7 +29,7 @@ from .entity import BaseInvertableEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize Cover Switch config entry."""
     registry = er.async_get(hass)
diff --git a/homeassistant/components/switch_as_x/fan.py b/homeassistant/components/switch_as_x/fan.py
index 858379e71df..846e9ae7e80 100644
--- a/homeassistant/components/switch_as_x/fan.py
+++ b/homeassistant/components/switch_as_x/fan.py
@@ -13,7 +13,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ENTITY_ID
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import BaseToggleEntity
 
@@ -21,7 +21,7 @@ from .entity import BaseToggleEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize Fan Switch config entry."""
     registry = er.async_get(hass)
diff --git a/homeassistant/components/switch_as_x/light.py b/homeassistant/components/switch_as_x/light.py
index 59b816f7935..c043a354869 100644
--- a/homeassistant/components/switch_as_x/light.py
+++ b/homeassistant/components/switch_as_x/light.py
@@ -11,7 +11,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ENTITY_ID
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import BaseToggleEntity
 
@@ -19,7 +19,7 @@ from .entity import BaseToggleEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize Light Switch config entry."""
     registry = er.async_get(hass)
diff --git a/homeassistant/components/switch_as_x/lock.py b/homeassistant/components/switch_as_x/lock.py
index 2095b06bd84..946429e0395 100644
--- a/homeassistant/components/switch_as_x/lock.py
+++ b/homeassistant/components/switch_as_x/lock.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, EventStateChangedData, HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_INVERT
 from .entity import BaseInvertableEntity
@@ -25,7 +25,7 @@ from .entity import BaseInvertableEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize Lock Switch config entry."""
     registry = er.async_get(hass)
diff --git a/homeassistant/components/switch_as_x/siren.py b/homeassistant/components/switch_as_x/siren.py
index 7d9a41d9cd9..b96c7c6e0ea 100644
--- a/homeassistant/components/switch_as_x/siren.py
+++ b/homeassistant/components/switch_as_x/siren.py
@@ -11,7 +11,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ENTITY_ID
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import BaseToggleEntity
 
@@ -19,7 +19,7 @@ from .entity import BaseToggleEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize Siren Switch config entry."""
     registry = er.async_get(hass)
diff --git a/homeassistant/components/switch_as_x/valve.py b/homeassistant/components/switch_as_x/valve.py
index 8626ca3cfb4..2b5f252ac2d 100644
--- a/homeassistant/components/switch_as_x/valve.py
+++ b/homeassistant/components/switch_as_x/valve.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, EventStateChangedData, HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_INVERT
 from .entity import BaseInvertableEntity
@@ -29,7 +29,7 @@ from .entity import BaseInvertableEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize Valve Switch config entry."""
     registry = er.async_get(hass)
diff --git a/homeassistant/components/switchbee/__init__.py b/homeassistant/components/switchbee/__init__.py
index b1a71665222..6e4bf004a3d 100644
--- a/homeassistant/components/switchbee/__init__.py
+++ b/homeassistant/components/switchbee/__init__.py
@@ -13,9 +13,8 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.device_registry as dr
-import homeassistant.helpers.entity_registry as er
 
 from .const import DOMAIN
 from .coordinator import SwitchBeeCoordinator
@@ -64,10 +63,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     websession = async_get_clientsession(hass, verify_ssl=False)
     api = await get_api_object(central_unit, user, password, websession)
 
-    coordinator = SwitchBeeCoordinator(
-        hass,
-        api,
-    )
+    coordinator = SwitchBeeCoordinator(hass, entry, api)
 
     await coordinator.async_config_entry_first_refresh()
     entry.async_on_unload(entry.add_update_listener(update_listener))
diff --git a/homeassistant/components/switchbee/button.py b/homeassistant/components/switchbee/button.py
index 78b5c0e6888..1ac81ec4e0d 100644
--- a/homeassistant/components/switchbee/button.py
+++ b/homeassistant/components/switchbee/button.py
@@ -7,7 +7,7 @@ from homeassistant.components.button import ButtonEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import SwitchBeeCoordinator
@@ -15,7 +15,9 @@ from .entity import SwitchBeeEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Switchbee button."""
     coordinator: SwitchBeeCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/switchbee/climate.py b/homeassistant/components/switchbee/climate.py
index d946ed1761b..7837798b0cb 100644
--- a/homeassistant/components/switchbee/climate.py
+++ b/homeassistant/components/switchbee/climate.py
@@ -27,7 +27,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import SwitchBeeCoordinator
@@ -74,7 +74,9 @@ SUPPORTED_FAN_MODES = [FAN_AUTO, FAN_HIGH, FAN_MEDIUM, FAN_LOW]
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SwitchBee climate."""
     coordinator: SwitchBeeCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/switchbee/config_flow.py b/homeassistant/components/switchbee/config_flow.py
index c8d3d58ee09..b2cd53398ab 100644
--- a/homeassistant/components/switchbee/config_flow.py
+++ b/homeassistant/components/switchbee/config_flow.py
@@ -13,8 +13,8 @@ from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.device_registry import format_mac
 
 from .const import DOMAIN
diff --git a/homeassistant/components/switchbee/coordinator.py b/homeassistant/components/switchbee/coordinator.py
index 49400e3c28d..b0ea1707be8 100644
--- a/homeassistant/components/switchbee/coordinator.py
+++ b/homeassistant/components/switchbee/coordinator.py
@@ -10,6 +10,7 @@ from switchbee.api import CentralUnitPolling, CentralUnitWsRPC
 from switchbee.api.central_unit import SwitchBeeError
 from switchbee.device import DeviceType, SwitchBeeBaseDevice
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -22,9 +23,12 @@ _LOGGER = logging.getLogger(__name__)
 class SwitchBeeCoordinator(DataUpdateCoordinator[Mapping[int, SwitchBeeBaseDevice]]):
     """Class to manage fetching SwitchBee data API."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         swb_api: CentralUnitPolling | CentralUnitWsRPC,
     ) -> None:
         """Initialize."""
@@ -39,6 +43,7 @@ class SwitchBeeCoordinator(DataUpdateCoordinator[Mapping[int, SwitchBeeBaseDevic
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=SCAN_INTERVAL_SEC[type(self.api)]),
         )
diff --git a/homeassistant/components/switchbee/cover.py b/homeassistant/components/switchbee/cover.py
index 02f3d7167e3..247063ab18a 100644
--- a/homeassistant/components/switchbee/cover.py
+++ b/homeassistant/components/switchbee/cover.py
@@ -17,7 +17,7 @@ from homeassistant.components.cover import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import SwitchBeeCoordinator
@@ -25,7 +25,9 @@ from .entity import SwitchBeeDeviceEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SwitchBee switch."""
     coordinator: SwitchBeeCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/switchbee/light.py b/homeassistant/components/switchbee/light.py
index 0daa6e204aa..228667540df 100644
--- a/homeassistant/components/switchbee/light.py
+++ b/homeassistant/components/switchbee/light.py
@@ -11,7 +11,7 @@ from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEnti
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import SwitchBeeCoordinator
@@ -35,7 +35,9 @@ def _switchbee_brightness_to_hass(value: int) -> int:
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SwitchBee light."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/switchbee/switch.py b/homeassistant/components/switchbee/switch.py
index c502e6f22f5..41538f6fd71 100644
--- a/homeassistant/components/switchbee/switch.py
+++ b/homeassistant/components/switchbee/switch.py
@@ -17,7 +17,7 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import SwitchBeeCoordinator
@@ -25,7 +25,9 @@ from .entity import SwitchBeeDeviceEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Switchbee switch."""
     coordinator: SwitchBeeCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/switchbot/__init__.py b/homeassistant/components/switchbot/__init__.py
index 499a5073872..09bc157d4d2 100644
--- a/homeassistant/components/switchbot/__init__.py
+++ b/homeassistant/components/switchbot/__init__.py
@@ -65,6 +65,7 @@ PLATFORMS_BY_TYPE = {
     SupportedModels.RELAY_SWITCH_1PM.value: [Platform.SWITCH, Platform.SENSOR],
     SupportedModels.RELAY_SWITCH_1.value: [Platform.SWITCH],
     SupportedModels.LEAK.value: [Platform.BINARY_SENSOR, Platform.SENSOR],
+    SupportedModels.REMOTE.value: [Platform.SENSOR],
 }
 CLASS_BY_DEVICE = {
     SupportedModels.CEILING_LIGHT.value: switchbot.SwitchbotCeilingLight,
diff --git a/homeassistant/components/switchbot/binary_sensor.py b/homeassistant/components/switchbot/binary_sensor.py
index 144872ff315..6d1490c895b 100644
--- a/homeassistant/components/switchbot/binary_sensor.py
+++ b/homeassistant/components/switchbot/binary_sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import SwitchbotConfigEntry, SwitchbotDataUpdateCoordinator
 from .entity import SwitchbotEntity
@@ -75,7 +75,7 @@ BINARY_SENSOR_TYPES: dict[str, BinarySensorEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SwitchbotConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Switchbot curtain based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/switchbot/config_flow.py b/homeassistant/components/switchbot/config_flow.py
index 31c0c42168d..04b4e20b7ce 100644
--- a/homeassistant/components/switchbot/config_flow.py
+++ b/homeassistant/components/switchbot/config_flow.py
@@ -272,7 +272,7 @@ class SwitchbotConfigFlow(ConfigFlow, domain=DOMAIN):
 
     @callback
     def _async_discover_devices(self) -> None:
-        current_addresses = self._async_current_ids()
+        current_addresses = self._async_current_ids(include_ignore=False)
         for connectable in (True, False):
             for discovery_info in async_discovered_service_info(self.hass, connectable):
                 address = discovery_info.address
diff --git a/homeassistant/components/switchbot/const.py b/homeassistant/components/switchbot/const.py
index 854ab32b657..16b41d75541 100644
--- a/homeassistant/components/switchbot/const.py
+++ b/homeassistant/components/switchbot/const.py
@@ -34,6 +34,7 @@ class SupportedModels(StrEnum):
     RELAY_SWITCH_1PM = "relay_switch_1pm"
     RELAY_SWITCH_1 = "relay_switch_1"
     LEAK = "leak"
+    REMOTE = "remote"
 
 
 CONNECTABLE_SUPPORTED_MODEL_TYPES = {
@@ -60,6 +61,7 @@ NON_CONNECTABLE_SUPPORTED_MODEL_TYPES = {
     SwitchbotModel.CONTACT_SENSOR: SupportedModels.CONTACT,
     SwitchbotModel.MOTION_SENSOR: SupportedModels.MOTION,
     SwitchbotModel.LEAK: SupportedModels.LEAK,
+    SwitchbotModel.REMOTE: SupportedModels.REMOTE,
 }
 
 SUPPORTED_MODEL_TYPES = (
diff --git a/homeassistant/components/switchbot/cover.py b/homeassistant/components/switchbot/cover.py
index d2fd073cdcb..3ef0f5625c2 100644
--- a/homeassistant/components/switchbot/cover.py
+++ b/homeassistant/components/switchbot/cover.py
@@ -17,7 +17,7 @@ from homeassistant.components.cover import (
     CoverEntityFeature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from .coordinator import SwitchbotConfigEntry, SwitchbotDataUpdateCoordinator
@@ -31,7 +31,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SwitchbotConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Switchbot curtain based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/switchbot/entity.py b/homeassistant/components/switchbot/entity.py
index bde69429bc3..282d23bfd1a 100644
--- a/homeassistant/components/switchbot/entity.py
+++ b/homeassistant/components/switchbot/entity.py
@@ -61,7 +61,7 @@ class SwitchbotEntity(
         return self.coordinator.device.parsed_data
 
     @property
-    def extra_state_attributes(self) -> Mapping[Any, Any]:
+    def extra_state_attributes(self) -> Mapping[str, Any]:
         """Return the state attributes."""
         return {"last_run_success": self._last_run_success}
 
diff --git a/homeassistant/components/switchbot/humidifier.py b/homeassistant/components/switchbot/humidifier.py
index 40f96577842..34a24948df1 100644
--- a/homeassistant/components/switchbot/humidifier.py
+++ b/homeassistant/components/switchbot/humidifier.py
@@ -12,7 +12,7 @@ from homeassistant.components.humidifier import (
     HumidifierEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import SwitchbotConfigEntry
 from .entity import SwitchbotSwitchedEntity
@@ -23,7 +23,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SwitchbotConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Switchbot based on a config entry."""
     async_add_entities([SwitchBotHumidifier(entry.runtime_data)])
diff --git a/homeassistant/components/switchbot/light.py b/homeassistant/components/switchbot/light.py
index 927ad5120c7..4b9a7e1b988 100644
--- a/homeassistant/components/switchbot/light.py
+++ b/homeassistant/components/switchbot/light.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any
+from typing import Any, cast
 
 from switchbot import ColorMode as SwitchBotColorMode, SwitchbotBaseLight
 
@@ -14,7 +14,7 @@ from homeassistant.components.light import (
     LightEntity,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import SwitchbotConfigEntry, SwitchbotDataUpdateCoordinator
 from .entity import SwitchbotEntity
@@ -30,7 +30,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SwitchbotConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the switchbot light."""
     async_add_entities([SwitchbotLightEntity(entry.runtime_data)])
@@ -68,7 +68,9 @@ class SwitchbotLightEntity(SwitchbotEntity, LightEntity):
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Instruct the light to turn on."""
-        brightness = round(kwargs.get(ATTR_BRIGHTNESS, self.brightness) / 255 * 100)
+        brightness = round(
+            cast(int, kwargs.get(ATTR_BRIGHTNESS, self.brightness)) / 255 * 100
+        )
 
         if (
             self.supported_color_modes
diff --git a/homeassistant/components/switchbot/lock.py b/homeassistant/components/switchbot/lock.py
index a3bee5661b2..6bad154813a 100644
--- a/homeassistant/components/switchbot/lock.py
+++ b/homeassistant/components/switchbot/lock.py
@@ -7,7 +7,7 @@ from switchbot.const import LockStatus
 
 from homeassistant.components.lock import LockEntity, LockEntityFeature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_LOCK_NIGHTLATCH, DEFAULT_LOCK_NIGHTLATCH
 from .coordinator import SwitchbotConfigEntry, SwitchbotDataUpdateCoordinator
@@ -17,7 +17,7 @@ from .entity import SwitchbotEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SwitchbotConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Switchbot lock based on a config entry."""
     force_nightlatch = entry.options.get(CONF_LOCK_NIGHTLATCH, DEFAULT_LOCK_NIGHTLATCH)
diff --git a/homeassistant/components/switchbot/manifest.json b/homeassistant/components/switchbot/manifest.json
index 1b80da43e16..d9f6f98d1fd 100644
--- a/homeassistant/components/switchbot/manifest.json
+++ b/homeassistant/components/switchbot/manifest.json
@@ -39,5 +39,5 @@
   "documentation": "https://www.home-assistant.io/integrations/switchbot",
   "iot_class": "local_push",
   "loggers": ["switchbot"],
-  "requirements": ["PySwitchbot==0.55.4"]
+  "requirements": ["PySwitchbot==0.58.0"]
 }
diff --git a/homeassistant/components/switchbot/sensor.py b/homeassistant/components/switchbot/sensor.py
index 9787521a5e9..d68c913db15 100644
--- a/homeassistant/components/switchbot/sensor.py
+++ b/homeassistant/components/switchbot/sensor.py
@@ -11,6 +11,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import (
     CONCENTRATION_PARTS_PER_MILLION,
+    LIGHT_LUX,
     PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     EntityCategory,
@@ -20,7 +21,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import SwitchbotConfigEntry, SwitchbotDataUpdateCoordinator
 from .entity import SwitchbotEntity
@@ -71,9 +72,14 @@ SENSOR_TYPES: dict[str, SensorEntityDescription] = {
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.HUMIDITY,
     ),
+    "illuminance": SensorEntityDescription(
+        key="illuminance",
+        native_unit_of_measurement=LIGHT_LUX,
+        state_class=SensorStateClass.MEASUREMENT,
+        device_class=SensorDeviceClass.ILLUMINANCE,
+    ),
     "temperature": SensorEntityDescription(
         key="temperature",
-        name=None,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.TEMPERATURE,
@@ -102,7 +108,7 @@ SENSOR_TYPES: dict[str, SensorEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SwitchbotConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Switchbot sensor based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/switchbot/strings.json b/homeassistant/components/switchbot/strings.json
index fe44bc39e62..c9f93cce604 100644
--- a/homeassistant/components/switchbot/strings.json
+++ b/homeassistant/components/switchbot/strings.json
@@ -45,7 +45,7 @@
         }
       },
       "encrypted_choose_method": {
-        "description": "An encrypted SwitchBot device can be set up in Home Assistant in two different ways.\n\nYou can enter the key id and encryption key yourself, or Home Assistant can import them from your SwitchBot account.",
+        "description": "An encrypted SwitchBot device can be set up in Home Assistant in two different ways.\n\nYou can enter the key ID and encryption key yourself, or Home Assistant can import them from your SwitchBot account.",
         "menu_options": {
           "encrypted_auth": "SwitchBot account (recommended)",
           "encrypted_key": "Enter encryption key manually"
@@ -53,7 +53,7 @@
       }
     },
     "error": {
-      "encryption_key_invalid": "Key ID or Encryption key is invalid",
+      "encryption_key_invalid": "Key ID or encryption key is invalid",
       "auth_failed": "Authentication failed: {error_detail}"
     },
     "abort": {
@@ -61,7 +61,7 @@
       "no_devices_found": "No supported SwitchBot devices found in range; If the device is in range, ensure the scanner has active scanning enabled, as SwitchBot devices cannot be discovered with passive scans. Active scans can be disabled once the device is configured. If you need clarification on whether the device is in-range, download the diagnostics for the integration that provides your Bluetooth adapter or proxy and check if the MAC address of the SwitchBot device is present.",
       "unknown": "[%key:common::config_flow::error::unknown%]",
       "api_error": "Error while communicating with SwitchBot API: {error_detail}",
-      "switchbot_unsupported_type": "Unsupported Switchbot Type."
+      "switchbot_unsupported_type": "Unsupported SwitchBot type."
     }
   },
   "options": {
@@ -70,6 +70,10 @@
         "data": {
           "retry_count": "Retry count",
           "lock_force_nightlatch": "Force Nightlatch operation mode"
+        },
+        "data_description": {
+          "retry_count": "How many times to retry sending commands to your SwitchBot devices",
+          "lock_force_nightlatch": "Force Nightlatch operation mode even if Nightlatch is not detected"
         }
       }
     }
diff --git a/homeassistant/components/switchbot/switch.py b/homeassistant/components/switchbot/switch.py
index 427496ef20c..fd1e8bb6393 100644
--- a/homeassistant/components/switchbot/switch.py
+++ b/homeassistant/components/switchbot/switch.py
@@ -9,7 +9,7 @@ import switchbot
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.const import STATE_ON
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from .coordinator import SwitchbotConfigEntry, SwitchbotDataUpdateCoordinator
@@ -21,7 +21,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SwitchbotConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Switchbot based on a config entry."""
     async_add_entities([SwitchBotSwitch(entry.runtime_data)])
diff --git a/homeassistant/components/switchbot_cloud/__init__.py b/homeassistant/components/switchbot_cloud/__init__.py
index d7812158260..44e130cc7a4 100644
--- a/homeassistant/components/switchbot_cloud/__init__.py
+++ b/homeassistant/components/switchbot_cloud/__init__.py
@@ -47,13 +47,14 @@ class SwitchbotCloudData:
 
 async def coordinator_for_device(
     hass: HomeAssistant,
+    entry: ConfigEntry,
     api: SwitchBotAPI,
     device: Device | Remote,
     coordinators_by_id: dict[str, SwitchBotCoordinator],
 ) -> SwitchBotCoordinator:
     """Instantiate coordinator and adds to list for gathering."""
     coordinator = coordinators_by_id.setdefault(
-        device.device_id, SwitchBotCoordinator(hass, api, device)
+        device.device_id, SwitchBotCoordinator(hass, entry, api, device)
     )
 
     if coordinator.data is None:
@@ -64,6 +65,7 @@ async def coordinator_for_device(
 
 async def make_switchbot_devices(
     hass: HomeAssistant,
+    entry: ConfigEntry,
     api: SwitchBotAPI,
     devices: list[Device | Remote],
     coordinators_by_id: dict[str, SwitchBotCoordinator],
@@ -72,7 +74,7 @@ async def make_switchbot_devices(
     devices_data = SwitchbotDevices()
     await gather(
         *[
-            make_device_data(hass, api, device, devices_data, coordinators_by_id)
+            make_device_data(hass, entry, api, device, devices_data, coordinators_by_id)
             for device in devices
         ]
     )
@@ -82,6 +84,7 @@ async def make_switchbot_devices(
 
 async def make_device_data(
     hass: HomeAssistant,
+    entry: ConfigEntry,
     api: SwitchBotAPI,
     device: Device | Remote,
     devices_data: SwitchbotDevices,
@@ -90,7 +93,7 @@ async def make_device_data(
     """Make device data."""
     if isinstance(device, Remote) and device.device_type.endswith("Air Conditioner"):
         coordinator = await coordinator_for_device(
-            hass, api, device, coordinators_by_id
+            hass, entry, api, device, coordinators_by_id
         )
         devices_data.climates.append((device, coordinator))
     if (
@@ -101,7 +104,7 @@ async def make_device_data(
         )
     ) or isinstance(device, Remote):
         coordinator = await coordinator_for_device(
-            hass, api, device, coordinators_by_id
+            hass, entry, api, device, coordinators_by_id
         )
         devices_data.switches.append((device, coordinator))
 
@@ -117,7 +120,7 @@ async def make_device_data(
         "Plug Mini (JP)",
     ]:
         coordinator = await coordinator_for_device(
-            hass, api, device, coordinators_by_id
+            hass, entry, api, device, coordinators_by_id
         )
         devices_data.sensors.append((device, coordinator))
 
@@ -128,19 +131,19 @@ async def make_device_data(
         "Robot Vacuum Cleaner S1 Plus",
     ]:
         coordinator = await coordinator_for_device(
-            hass, api, device, coordinators_by_id
+            hass, entry, api, device, coordinators_by_id
         )
         devices_data.vacuums.append((device, coordinator))
 
     if isinstance(device, Device) and device.device_type.startswith("Smart Lock"):
         coordinator = await coordinator_for_device(
-            hass, api, device, coordinators_by_id
+            hass, entry, api, device, coordinators_by_id
         )
         devices_data.locks.append((device, coordinator))
 
     if isinstance(device, Device) and device.device_type in ["Bot"]:
         coordinator = await coordinator_for_device(
-            hass, api, device, coordinators_by_id
+            hass, entry, api, device, coordinators_by_id
         )
         if coordinator.data is not None:
             if coordinator.data.get("deviceMode") == "pressMode":
@@ -149,10 +152,10 @@ async def make_device_data(
                 devices_data.switches.append((device, coordinator))
 
 
-async def async_setup_entry(hass: HomeAssistant, config: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up SwitchBot via API from a config entry."""
-    token = config.data[CONF_API_TOKEN]
-    secret = config.data[CONF_API_KEY]
+    token = entry.data[CONF_API_TOKEN]
+    secret = entry.data[CONF_API_KEY]
 
     api = SwitchBotAPI(token=token, secret=secret)
     try:
@@ -168,13 +171,13 @@ async def async_setup_entry(hass: HomeAssistant, config: ConfigEntry) -> bool:
     coordinators_by_id: dict[str, SwitchBotCoordinator] = {}
 
     switchbot_devices = await make_switchbot_devices(
-        hass, api, devices, coordinators_by_id
+        hass, entry, api, devices, coordinators_by_id
     )
     hass.data.setdefault(DOMAIN, {})
-    hass.data[DOMAIN][config.entry_id] = SwitchbotCloudData(
+    hass.data[DOMAIN][entry.entry_id] = SwitchbotCloudData(
         api=api, devices=switchbot_devices
     )
-    await hass.config_entries.async_forward_entry_setups(config, PLATFORMS)
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
 
 
diff --git a/homeassistant/components/switchbot_cloud/button.py b/homeassistant/components/switchbot_cloud/button.py
index a6eb1a134a5..aae2758f3ca 100644
--- a/homeassistant/components/switchbot_cloud/button.py
+++ b/homeassistant/components/switchbot_cloud/button.py
@@ -7,7 +7,7 @@ from switchbot_api import BotCommands
 from homeassistant.components.button import ButtonEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SwitchbotCloudData
 from .const import DOMAIN
@@ -17,7 +17,7 @@ from .entity import SwitchBotCloudEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SwitchBot Cloud entry."""
     data: SwitchbotCloudData = hass.data[DOMAIN][config.entry_id]
diff --git a/homeassistant/components/switchbot_cloud/climate.py b/homeassistant/components/switchbot_cloud/climate.py
index 4e05e9e9a1e..27698420ae9 100644
--- a/homeassistant/components/switchbot_cloud/climate.py
+++ b/homeassistant/components/switchbot_cloud/climate.py
@@ -4,7 +4,7 @@ from typing import Any
 
 from switchbot_api import AirConditionerCommands
 
-import homeassistant.components.climate as FanState
+from homeassistant.components import climate as FanState
 from homeassistant.components.climate import (
     ClimateEntity,
     ClimateEntityFeature,
@@ -13,7 +13,7 @@ from homeassistant.components.climate import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SwitchbotCloudData
 from .const import DOMAIN
@@ -42,7 +42,7 @@ _DEFAULT_SWITCHBOT_FAN_MODE = _SWITCHBOT_FAN_MODES[FanState.FAN_AUTO]
 async def async_setup_entry(
     hass: HomeAssistant,
     config: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SwitchBot Cloud entry."""
     data: SwitchbotCloudData = hass.data[DOMAIN][config.entry_id]
diff --git a/homeassistant/components/switchbot_cloud/coordinator.py b/homeassistant/components/switchbot_cloud/coordinator.py
index 0ebd04f7e5a..02ead5940e4 100644
--- a/homeassistant/components/switchbot_cloud/coordinator.py
+++ b/homeassistant/components/switchbot_cloud/coordinator.py
@@ -6,6 +6,7 @@ from typing import Any
 
 from switchbot_api import CannotConnect, Device, Remote, SwitchBotAPI
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -19,16 +20,22 @@ type Status = dict[str, Any] | None
 class SwitchBotCoordinator(DataUpdateCoordinator[Status]):
     """SwitchBot Cloud coordinator."""
 
+    config_entry: ConfigEntry
     _api: SwitchBotAPI
     _device_id: str
 
     def __init__(
-        self, hass: HomeAssistant, api: SwitchBotAPI, device: Device | Remote
+        self,
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        api: SwitchBotAPI,
+        device: Device | Remote,
     ) -> None:
         """Initialize SwitchBot Cloud."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=DEFAULT_SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/switchbot_cloud/lock.py b/homeassistant/components/switchbot_cloud/lock.py
index 52f48c66d38..74a9e9d8b1e 100644
--- a/homeassistant/components/switchbot_cloud/lock.py
+++ b/homeassistant/components/switchbot_cloud/lock.py
@@ -7,7 +7,7 @@ from switchbot_api import LockCommands
 from homeassistant.components.lock import LockEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SwitchbotCloudData
 from .const import DOMAIN
@@ -17,7 +17,7 @@ from .entity import SwitchBotCloudEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SwitchBot Cloud entry."""
     data: SwitchbotCloudData = hass.data[DOMAIN][config.entry_id]
diff --git a/homeassistant/components/switchbot_cloud/sensor.py b/homeassistant/components/switchbot_cloud/sensor.py
index 1f755c141a2..28384ffd4d5 100644
--- a/homeassistant/components/switchbot_cloud/sensor.py
+++ b/homeassistant/components/switchbot_cloud/sensor.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SwitchbotCloudData
 from .const import DOMAIN
@@ -139,7 +139,7 @@ SENSOR_DESCRIPTIONS_BY_DEVICE_TYPES = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SwitchBot Cloud entry."""
     data: SwitchbotCloudData = hass.data[DOMAIN][config.entry_id]
diff --git a/homeassistant/components/switchbot_cloud/switch.py b/homeassistant/components/switchbot_cloud/switch.py
index 22d033625f9..ebe20620d3e 100644
--- a/homeassistant/components/switchbot_cloud/switch.py
+++ b/homeassistant/components/switchbot_cloud/switch.py
@@ -7,7 +7,7 @@ from switchbot_api import CommonCommands, Device, PowerState, Remote, SwitchBotA
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SwitchbotCloudData
 from .const import DOMAIN
@@ -18,7 +18,7 @@ from .entity import SwitchBotCloudEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SwitchBot Cloud entry."""
     data: SwitchbotCloudData = hass.data[DOMAIN][config.entry_id]
diff --git a/homeassistant/components/switchbot_cloud/vacuum.py b/homeassistant/components/switchbot_cloud/vacuum.py
index 84db7cfdbb8..9a9ad49626f 100644
--- a/homeassistant/components/switchbot_cloud/vacuum.py
+++ b/homeassistant/components/switchbot_cloud/vacuum.py
@@ -11,7 +11,7 @@ from homeassistant.components.vacuum import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SwitchbotCloudData
 from .const import (
@@ -28,7 +28,7 @@ from .entity import SwitchBotCloudEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up SwitchBot Cloud entry."""
     data: SwitchbotCloudData = hass.data[DOMAIN][config.entry_id]
diff --git a/homeassistant/components/switcher_kis/button.py b/homeassistant/components/switcher_kis/button.py
index d2686e2e550..30597ed0738 100644
--- a/homeassistant/components/switcher_kis/button.py
+++ b/homeassistant/components/switcher_kis/button.py
@@ -20,7 +20,7 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SwitcherConfigEntry
 from .const import SIGNAL_DEVICE_ADD
@@ -81,7 +81,7 @@ THERMOSTAT_BUTTONS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: SwitcherConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Switcher button from config entry."""
 
diff --git a/homeassistant/components/switcher_kis/climate.py b/homeassistant/components/switcher_kis/climate.py
index 2fc4a331676..c8bf33eca09 100644
--- a/homeassistant/components/switcher_kis/climate.py
+++ b/homeassistant/components/switcher_kis/climate.py
@@ -29,7 +29,7 @@ from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SwitcherConfigEntry
 from .const import SIGNAL_DEVICE_ADD
@@ -62,7 +62,7 @@ HA_TO_DEVICE_FAN = {value: key for key, value in DEVICE_FAN_TO_HA.items()}
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: SwitcherConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Switcher climate from config entry."""
 
diff --git a/homeassistant/components/switcher_kis/cover.py b/homeassistant/components/switcher_kis/cover.py
index 513b786a033..5d8e4a4b0ac 100644
--- a/homeassistant/components/switcher_kis/cover.py
+++ b/homeassistant/components/switcher_kis/cover.py
@@ -15,7 +15,7 @@ from homeassistant.components.cover import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import SIGNAL_DEVICE_ADD
 from .coordinator import SwitcherDataUpdateCoordinator
@@ -28,7 +28,7 @@ API_STOP = "stop_shutter"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Switcher cover from config entry."""
 
diff --git a/homeassistant/components/switcher_kis/light.py b/homeassistant/components/switcher_kis/light.py
index 75156044efa..b9dc78f5bdf 100644
--- a/homeassistant/components/switcher_kis/light.py
+++ b/homeassistant/components/switcher_kis/light.py
@@ -10,7 +10,7 @@ from homeassistant.components.light import ColorMode, LightEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import SIGNAL_DEVICE_ADD
 from .coordinator import SwitcherDataUpdateCoordinator
@@ -22,7 +22,7 @@ API_SET_LIGHT = "set_light"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Switcher light from a config entry."""
 
diff --git a/homeassistant/components/switcher_kis/sensor.py b/homeassistant/components/switcher_kis/sensor.py
index 0ed60e5a721..029d517bb09 100644
--- a/homeassistant/components/switcher_kis/sensor.py
+++ b/homeassistant/components/switcher_kis/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfElectricCurrent, UnitOfPower
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .const import SIGNAL_DEVICE_ADD
@@ -61,7 +61,7 @@ THERMOSTAT_SENSORS = TEMPERATURE_SENSORS
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Switcher sensor from config entry."""
 
diff --git a/homeassistant/components/switcher_kis/strings.json b/homeassistant/components/switcher_kis/strings.json
index e380711303d..c3cf111199f 100644
--- a/homeassistant/components/switcher_kis/strings.json
+++ b/homeassistant/components/switcher_kis/strings.json
@@ -9,13 +9,21 @@
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
           "token": "[%key:common::config_flow::data::access_token%]"
+        },
+        "data_description": {
+          "username": "The email address used to sign in to the Switcher app.",
+          "token": "The local control token received from Switcher."
         }
       },
       "reauth_confirm": {
-        "description": "Found a Switcher device that requires a token\nEnter your username and token\nFor more information see https://www.home-assistant.io/integrations/switcher_kis/#prerequisites",
+        "description": "[%key:component::switcher_kis::config::step::credentials::description%]",
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
           "token": "[%key:common::config_flow::data::access_token%]"
+        },
+        "data_description": {
+          "username": "[%key:component::switcher_kis::config::step::credentials::data_description::username%]",
+          "token": "[%key:component::switcher_kis::config::step::credentials::data_description::token%]"
         }
       }
     },
diff --git a/homeassistant/components/switcher_kis/switch.py b/homeassistant/components/switcher_kis/switch.py
index 7d3d71a0615..30b0b4161b1 100644
--- a/homeassistant/components/switcher_kis/switch.py
+++ b/homeassistant/components/switcher_kis/switch.py
@@ -16,7 +16,7 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import VolDictType
 
 from .const import (
@@ -49,7 +49,7 @@ SERVICE_TURN_ON_WITH_TIMER_SCHEMA: VolDictType = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Switcher switch from config entry."""
     platform = entity_platform.async_get_current_platform()
diff --git a/homeassistant/components/switchmate/switch.py b/homeassistant/components/switchmate/switch.py
index 8484eb5a2d1..0b449c65194 100644
--- a/homeassistant/components/switchmate/switch.py
+++ b/homeassistant/components/switchmate/switch.py
@@ -14,7 +14,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import CONF_MAC, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/syncthing/sensor.py b/homeassistant/components/syncthing/sensor.py
index fc1f9ae8aea..697ea8aea6e 100644
--- a/homeassistant/components/syncthing/sensor.py
+++ b/homeassistant/components/syncthing/sensor.py
@@ -8,7 +8,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import PlatformNotReady
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_track_time_interval
 
 from .const import (
@@ -25,7 +25,7 @@ from .const import (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Syncthing sensors."""
     syncthing = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/syncthru/binary_sensor.py b/homeassistant/components/syncthru/binary_sensor.py
index 2b110c2af1d..e6d26d22433 100644
--- a/homeassistant/components/syncthru/binary_sensor.py
+++ b/homeassistant/components/syncthru/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -35,7 +35,7 @@ SYNCTHRU_STATE_PROBLEM = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up from config entry."""
 
diff --git a/homeassistant/components/syncthru/sensor.py b/homeassistant/components/syncthru/sensor.py
index df2ffd99803..c2063bf6c0a 100644
--- a/homeassistant/components/syncthru/sensor.py
+++ b/homeassistant/components/syncthru/sensor.py
@@ -9,7 +9,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, PERCENTAGE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -43,7 +43,7 @@ SYNCTHRU_STATE_HUMAN = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up from config entry."""
 
diff --git a/homeassistant/components/synology_chat/notify.py b/homeassistant/components/synology_chat/notify.py
index 38c302b7968..37ea3238a06 100644
--- a/homeassistant/components/synology_chat/notify.py
+++ b/homeassistant/components/synology_chat/notify.py
@@ -16,7 +16,7 @@ from homeassistant.components.notify import (
 )
 from homeassistant.const import CONF_RESOURCE, CONF_VERIFY_SSL
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 ATTR_FILE_URL = "file_url"
diff --git a/homeassistant/components/synology_dsm/__init__.py b/homeassistant/components/synology_dsm/__init__.py
index 3619619782e..d9319beb595 100644
--- a/homeassistant/components/synology_dsm/__init__.py
+++ b/homeassistant/components/synology_dsm/__init__.py
@@ -9,14 +9,16 @@ from synology_dsm.api.surveillance_station import SynoSurveillanceStation
 from synology_dsm.api.surveillance_station.camera import SynoCamera
 from synology_dsm.exceptions import SynologyDSMNotLoggedInException
 
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_MAC, CONF_VERIFY_SSL
+from homeassistant.const import CONF_MAC, CONF_SCAN_INTERVAL, CONF_VERIFY_SSL
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import device_registry as dr
 
 from .common import SynoApi, raise_config_entry_auth_error
 from .const import (
+    CONF_BACKUP_PATH,
+    CONF_BACKUP_SHARE,
+    DATA_BACKUP_AGENT_LISTENERS,
     DEFAULT_VERIFY_SSL,
     DOMAIN,
     EXCEPTION_DETAILS,
@@ -28,15 +30,16 @@ from .const import (
 from .coordinator import (
     SynologyDSMCameraUpdateCoordinator,
     SynologyDSMCentralUpdateCoordinator,
+    SynologyDSMConfigEntry,
+    SynologyDSMData,
     SynologyDSMSwitchUpdateCoordinator,
 )
-from .models import SynologyDSMData
 from .service import async_setup_services
 
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: SynologyDSMConfigEntry) -> bool:
     """Set up Synology DSM sensors."""
 
     # Migrate device identifiers
@@ -60,6 +63,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         hass.config_entries.async_update_entry(
             entry, data={**entry.data, CONF_VERIFY_SSL: DEFAULT_VERIFY_SSL}
         )
+    if CONF_BACKUP_SHARE not in entry.options:
+        hass.config_entries.async_update_entry(
+            entry,
+            options={**entry.options, CONF_BACKUP_SHARE: None, CONF_BACKUP_PATH: None},
+        )
+    if CONF_SCAN_INTERVAL in entry.options:
+        current_options = {**entry.options}
+        current_options.pop(CONF_SCAN_INTERVAL)
+        hass.config_entries.async_update_entry(entry, options=current_options)
 
     # Continue setup
     api = SynoApi(hass, entry)
@@ -108,38 +120,62 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         except SYNOLOGY_CONNECTION_EXCEPTIONS as ex:
             raise ConfigEntryNotReady from ex
 
-    synology_data = SynologyDSMData(
+    entry.runtime_data = SynologyDSMData(
         api=api,
         coordinator_central=coordinator_central,
+        coordinator_central_old_update_success=True,
         coordinator_cameras=coordinator_cameras,
         coordinator_switches=coordinator_switches,
     )
-    hass.data.setdefault(DOMAIN, {})[entry.unique_id] = synology_data
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     entry.async_on_unload(entry.add_update_listener(_async_update_listener))
 
+    if entry.options[CONF_BACKUP_SHARE]:
+
+        def async_notify_backup_listeners() -> None:
+            for listener in hass.data.get(DATA_BACKUP_AGENT_LISTENERS, []):
+                listener()
+
+        entry.async_on_unload(
+            entry.async_on_state_change(async_notify_backup_listeners)
+        )
+
+        def async_check_last_update_success() -> None:
+            if (
+                last := coordinator_central.last_update_success
+            ) is not entry.runtime_data.coordinator_central_old_update_success:
+                entry.runtime_data.coordinator_central_old_update_success = last
+                async_notify_backup_listeners()
+
+        entry.runtime_data.coordinator_central.async_add_listener(
+            async_check_last_update_success
+        )
+
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, entry: SynologyDSMConfigEntry
+) -> bool:
     """Unload Synology DSM sensors."""
     if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        entry_data: SynologyDSMData = hass.data[DOMAIN][entry.unique_id]
+        entry_data = entry.runtime_data
         await entry_data.api.async_unload()
-        hass.data[DOMAIN].pop(entry.unique_id)
     return unload_ok
 
 
-async def _async_update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+async def _async_update_listener(
+    hass: HomeAssistant, entry: SynologyDSMConfigEntry
+) -> None:
     """Handle options update."""
     await hass.config_entries.async_reload(entry.entry_id)
 
 
 async def async_remove_config_entry_device(
-    hass: HomeAssistant, entry: ConfigEntry, device_entry: dr.DeviceEntry
+    hass: HomeAssistant, entry: SynologyDSMConfigEntry, device_entry: dr.DeviceEntry
 ) -> bool:
     """Remove synology_dsm config entry from a device."""
-    data: SynologyDSMData = hass.data[DOMAIN][entry.unique_id]
+    data = entry.runtime_data
     api = data.api
     assert api.information is not None
     serial = api.information.serial
diff --git a/homeassistant/components/synology_dsm/backup.py b/homeassistant/components/synology_dsm/backup.py
new file mode 100644
index 00000000000..46e47ebde16
--- /dev/null
+++ b/homeassistant/components/synology_dsm/backup.py
@@ -0,0 +1,271 @@
+"""Support for Synology DSM backup agents."""
+
+from __future__ import annotations
+
+from collections.abc import AsyncIterator, Callable, Coroutine
+import logging
+from typing import TYPE_CHECKING, Any
+
+from aiohttp import StreamReader
+from synology_dsm.api.file_station import SynoFileStation
+from synology_dsm.exceptions import SynologyDSMAPIErrorException
+
+from homeassistant.components.backup import (
+    AgentBackup,
+    BackupAgent,
+    BackupAgentError,
+    BackupNotFound,
+    suggested_filename,
+)
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.aiohttp_client import ChunkAsyncStreamIterator
+from homeassistant.helpers.json import json_dumps
+from homeassistant.util.json import JsonObjectType, json_loads_object
+
+from .const import (
+    CONF_BACKUP_PATH,
+    CONF_BACKUP_SHARE,
+    DATA_BACKUP_AGENT_LISTENERS,
+    DOMAIN,
+)
+from .coordinator import SynologyDSMConfigEntry
+
+LOGGER = logging.getLogger(__name__)
+
+
+def suggested_filenames(backup: AgentBackup) -> tuple[str, str]:
+    """Suggest filenames for the backup.
+
+    returns a tuple of tar_filename and meta_filename
+    """
+    base_name = suggested_filename(backup).rsplit(".", 1)[0]
+    return (f"{base_name}.tar", f"{base_name}_meta.json")
+
+
+async def async_get_backup_agents(
+    hass: HomeAssistant,
+) -> list[BackupAgent]:
+    """Return a list of backup agents."""
+    entries: list[SynologyDSMConfigEntry] = hass.config_entries.async_loaded_entries(
+        DOMAIN
+    )
+    if not entries:
+        LOGGER.debug("No proper config entry found")
+        return []
+    return [
+        SynologyDSMBackupAgent(hass, entry, entry.unique_id)
+        for entry in entries
+        if entry.unique_id is not None
+        and entry.runtime_data.api.file_station
+        and entry.options.get(CONF_BACKUP_PATH)
+        and entry.runtime_data.coordinator_central.last_update_success
+    ]
+
+
+@callback
+def async_register_backup_agents_listener(
+    hass: HomeAssistant,
+    *,
+    listener: Callable[[], None],
+    **kwargs: Any,
+) -> Callable[[], None]:
+    """Register a listener to be called when agents are added or removed.
+
+    :return: A function to unregister the listener.
+    """
+    hass.data.setdefault(DATA_BACKUP_AGENT_LISTENERS, []).append(listener)
+
+    @callback
+    def remove_listener() -> None:
+        """Remove the listener."""
+        hass.data[DATA_BACKUP_AGENT_LISTENERS].remove(listener)
+        if not hass.data[DATA_BACKUP_AGENT_LISTENERS]:
+            del hass.data[DATA_BACKUP_AGENT_LISTENERS]
+
+    return remove_listener
+
+
+class SynologyDSMBackupAgent(BackupAgent):
+    """Synology DSM backup agent."""
+
+    domain = DOMAIN
+
+    def __init__(
+        self, hass: HomeAssistant, entry: SynologyDSMConfigEntry, unique_id: str
+    ) -> None:
+        """Initialize the Synology DSM backup agent."""
+        super().__init__()
+        LOGGER.debug("Initializing Synology DSM backup agent for %s", entry.unique_id)
+        self.name = entry.title
+        self.unique_id = unique_id
+        self.path = (
+            f"{entry.options[CONF_BACKUP_SHARE]}/{entry.options[CONF_BACKUP_PATH]}"
+        )
+        syno_data = entry.runtime_data
+        self.api = syno_data.api
+        self.backup_base_names: dict[str, str] = {}
+
+    @property
+    def _file_station(self) -> SynoFileStation:
+        if TYPE_CHECKING:
+            # we ensure that file_station exist already in async_get_backup_agents
+            assert self.api.file_station
+        return self.api.file_station
+
+    async def _async_backup_filenames(
+        self,
+        backup_id: str,
+    ) -> tuple[str, str]:
+        """Return the actual backup filenames.
+
+        :param backup_id: The ID of the backup that was returned in async_list_backups.
+        :return: A tuple of tar_filename and meta_filename
+        """
+        await self.async_get_backup(backup_id)
+        base_name = self.backup_base_names[backup_id]
+        return (f"{base_name}.tar", f"{base_name}_meta.json")
+
+    async def async_download_backup(
+        self,
+        backup_id: str,
+        **kwargs: Any,
+    ) -> AsyncIterator[bytes]:
+        """Download a backup file.
+
+        :param backup_id: The ID of the backup that was returned in async_list_backups.
+        :return: An async iterator that yields bytes.
+        """
+        (filename_tar, _) = await self._async_backup_filenames(backup_id)
+
+        try:
+            resp = await self._file_station.download_file(
+                path=self.path,
+                filename=filename_tar,
+            )
+        except SynologyDSMAPIErrorException as err:
+            raise BackupAgentError("Failed to download backup") from err
+
+        if TYPE_CHECKING:
+            assert isinstance(resp, StreamReader)
+
+        return ChunkAsyncStreamIterator(resp)
+
+    async def async_upload_backup(
+        self,
+        *,
+        open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
+        backup: AgentBackup,
+        **kwargs: Any,
+    ) -> None:
+        """Upload a backup.
+
+        :param open_stream: A function returning an async iterator that yields bytes.
+        :param backup: Metadata about the backup that should be uploaded.
+        """
+
+        (filename_tar, filename_meta) = suggested_filenames(backup)
+
+        # upload backup.tar file first
+        try:
+            await self._file_station.upload_file(
+                path=self.path,
+                filename=filename_tar,
+                source=await open_stream(),
+                create_parents=True,
+            )
+        except SynologyDSMAPIErrorException as err:
+            raise BackupAgentError("Failed to upload backup") from err
+
+        # upload backup_meta.json file when backup.tar was successful uploaded
+        try:
+            await self._file_station.upload_file(
+                path=self.path,
+                filename=filename_meta,
+                source=json_dumps(backup.as_dict()).encode(),
+            )
+        except SynologyDSMAPIErrorException as err:
+            raise BackupAgentError("Failed to upload backup") from err
+
+    async def async_delete_backup(
+        self,
+        backup_id: str,
+        **kwargs: Any,
+    ) -> None:
+        """Delete a backup file.
+
+        :param backup_id: The ID of the backup that was returned in async_list_backups.
+        """
+        (filename_tar, filename_meta) = await self._async_backup_filenames(backup_id)
+
+        for filename in (filename_tar, filename_meta):
+            try:
+                await self._file_station.delete_file(path=self.path, filename=filename)
+            except SynologyDSMAPIErrorException as err:
+                err_args: dict = err.args[0]
+                if int(err_args.get("code", 0)) != 900 or (
+                    (err_details := err_args.get("details")) is not None
+                    and isinstance(err_details, list)
+                    and isinstance(err_details[0], dict)
+                    and int(err_details[0].get("code", 0))
+                    != 408  # No such file or directory
+                ):
+                    LOGGER.error("Failed to delete backup: %s", err)
+                    raise BackupAgentError("Failed to delete backup") from err
+
+    async def async_list_backups(self, **kwargs: Any) -> list[AgentBackup]:
+        """List backups."""
+        return list((await self._async_list_backups(**kwargs)).values())
+
+    async def _async_list_backups(self, **kwargs: Any) -> dict[str, AgentBackup]:
+        """List backups."""
+
+        async def _download_meta_data(filename: str) -> JsonObjectType:
+            try:
+                resp = await self._file_station.download_file(
+                    path=self.path, filename=filename
+                )
+            except SynologyDSMAPIErrorException as err:
+                raise BackupAgentError("Failed to download meta data") from err
+
+            if TYPE_CHECKING:
+                assert isinstance(resp, StreamReader)
+
+            try:
+                return json_loads_object(await resp.read())
+            except Exception as err:
+                raise BackupAgentError("Failed to read meta data") from err
+
+        try:
+            files = await self._file_station.get_files(path=self.path)
+        except SynologyDSMAPIErrorException as err:
+            raise BackupAgentError("Failed to list backups") from err
+
+        if TYPE_CHECKING:
+            assert files
+
+        backups: dict[str, AgentBackup] = {}
+        backup_base_names: dict[str, str] = {}
+        for file in files:
+            if file.name.endswith("_meta.json"):
+                try:
+                    meta_data = await _download_meta_data(file.name)
+                except BackupAgentError as err:
+                    LOGGER.error("Failed to download meta data: %s", err)
+                    continue
+                agent_backup = AgentBackup.from_dict(meta_data)
+                backup_id = agent_backup.backup_id
+                backups[backup_id] = agent_backup
+                backup_base_names[backup_id] = file.name.replace("_meta.json", "")
+        self.backup_base_names = backup_base_names
+        return backups
+
+    async def async_get_backup(
+        self,
+        backup_id: str,
+        **kwargs: Any,
+    ) -> AgentBackup:
+        """Return a backup."""
+        backups = await self._async_list_backups()
+        if backup_id not in backups:
+            raise BackupNotFound(f"Backup {backup_id} not found")
+        return backups[backup_id]
diff --git a/homeassistant/components/synology_dsm/binary_sensor.py b/homeassistant/components/synology_dsm/binary_sensor.py
index b9c7ff483ea..1ae5fa90760 100644
--- a/homeassistant/components/synology_dsm/binary_sensor.py
+++ b/homeassistant/components/synology_dsm/binary_sensor.py
@@ -12,20 +12,17 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DISKS, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SynoApi
-from .const import DOMAIN
-from .coordinator import SynologyDSMCentralUpdateCoordinator
+from .coordinator import SynologyDSMCentralUpdateCoordinator, SynologyDSMConfigEntry
 from .entity import (
     SynologyDSMBaseEntity,
     SynologyDSMDeviceEntity,
     SynologyDSMEntityDescription,
 )
-from .models import SynologyDSMData
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -63,10 +60,12 @@ STORAGE_DISK_BINARY_SENSORS: tuple[SynologyDSMBinarySensorEntityDescription, ...
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: SynologyDSMConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Synology NAS binary sensor."""
-    data: SynologyDSMData = hass.data[DOMAIN][entry.unique_id]
+    data = entry.runtime_data
     api = data.api
     coordinator = data.coordinator_central
     assert api.storage is not None
diff --git a/homeassistant/components/synology_dsm/button.py b/homeassistant/components/synology_dsm/button.py
index fccd0860036..79297b1f1b4 100644
--- a/homeassistant/components/synology_dsm/button.py
+++ b/homeassistant/components/synology_dsm/button.py
@@ -12,15 +12,14 @@ from homeassistant.components.button import (
     ButtonEntity,
     ButtonEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SynoApi
 from .const import DOMAIN
-from .models import SynologyDSMData
+from .coordinator import SynologyDSMConfigEntry
 
 LOGGER = logging.getLogger(__name__)
 
@@ -52,11 +51,11 @@ BUTTONS: Final = [
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: SynologyDSMConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set buttons for device."""
-    data: SynologyDSMData = hass.data[DOMAIN][entry.unique_id]
+    data = entry.runtime_data
     async_add_entities(SynologyDSMButton(data.api, button) for button in BUTTONS)
 
 
diff --git a/homeassistant/components/synology_dsm/camera.py b/homeassistant/components/synology_dsm/camera.py
index cbf17ec05b4..f393b8efb55 100644
--- a/homeassistant/components/synology_dsm/camera.py
+++ b/homeassistant/components/synology_dsm/camera.py
@@ -16,11 +16,10 @@ from homeassistant.components.camera import (
     CameraEntityDescription,
     CameraEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SynoApi
 from .const import (
@@ -29,9 +28,8 @@ from .const import (
     DOMAIN,
     SIGNAL_CAMERA_SOURCE_CHANGED,
 )
-from .coordinator import SynologyDSMCameraUpdateCoordinator
+from .coordinator import SynologyDSMCameraUpdateCoordinator, SynologyDSMConfigEntry
 from .entity import SynologyDSMBaseEntity, SynologyDSMEntityDescription
-from .models import SynologyDSMData
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -46,10 +44,12 @@ class SynologyDSMCameraEntityDescription(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: SynologyDSMConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Synology NAS cameras."""
-    data: SynologyDSMData = hass.data[DOMAIN][entry.unique_id]
+    data = entry.runtime_data
     if coordinator := data.coordinator_cameras:
         async_add_entities(
             SynoDSMCamera(data.api, coordinator, camera_id)
diff --git a/homeassistant/components/synology_dsm/common.py b/homeassistant/components/synology_dsm/common.py
index 9a6284eff2b..2e80624ca5d 100644
--- a/homeassistant/components/synology_dsm/common.py
+++ b/homeassistant/components/synology_dsm/common.py
@@ -7,6 +7,7 @@ from collections.abc import Callable
 from contextlib import suppress
 import logging
 
+from awesomeversion import AwesomeVersion
 from synology_dsm import SynologyDSM
 from synology_dsm.api.core.security import SynoCoreSecurity
 from synology_dsm.api.core.system import SynoCoreSystem
@@ -14,6 +15,7 @@ from synology_dsm.api.core.upgrade import SynoCoreUpgrade
 from synology_dsm.api.core.utilization import SynoCoreUtilization
 from synology_dsm.api.dsm.information import SynoDSMInformation
 from synology_dsm.api.dsm.network import SynoDSMNetwork
+from synology_dsm.api.file_station import SynoFileStation
 from synology_dsm.api.photos import SynoPhotos
 from synology_dsm.api.storage.storage import SynoStorage
 from synology_dsm.api.surveillance_station import SynoSurveillanceStation
@@ -34,13 +36,17 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed
+from homeassistant.helpers import issue_registry as ir
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import (
+    CONF_BACKUP_PATH,
     CONF_DEVICE_TOKEN,
     DEFAULT_TIMEOUT,
+    DOMAIN,
     EXCEPTION_DETAILS,
     EXCEPTION_UNKNOWN,
+    ISSUE_MISSING_BACKUP_SETUP,
     SYNOLOGY_CONNECTION_EXCEPTIONS,
 )
 
@@ -62,11 +68,12 @@ class SynoApi:
             self.config_url = f"http://{entry.data[CONF_HOST]}:{entry.data[CONF_PORT]}"
 
         # DSM APIs
+        self.file_station: SynoFileStation | None = None
         self.information: SynoDSMInformation | None = None
         self.network: SynoDSMNetwork | None = None
+        self.photos: SynoPhotos | None = None
         self.security: SynoCoreSecurity | None = None
         self.storage: SynoStorage | None = None
-        self.photos: SynoPhotos | None = None
         self.surveillance_station: SynoSurveillanceStation | None = None
         self.system: SynoCoreSystem | None = None
         self.upgrade: SynoCoreUpgrade | None = None
@@ -74,10 +81,11 @@ class SynoApi:
 
         # Should we fetch them
         self._fetching_entities: dict[str, set[str]] = {}
+        self._with_file_station = True
         self._with_information = True
+        self._with_photos = True
         self._with_security = True
         self._with_storage = True
-        self._with_photos = True
         self._with_surveillance_station = True
         self._with_system = True
         self._with_upgrade = True
@@ -128,6 +136,9 @@ class SynoApi:
         )
         await self.async_login()
 
+        self.information = self.dsm.information
+        await self.information.update()
+
         # check if surveillance station is used
         self._with_surveillance_station = bool(
             self.dsm.apis.get(SynoSurveillanceStation.CAMERA_API_KEY)
@@ -157,6 +168,42 @@ class SynoApi:
             self.dsm.reset(SynoCoreUpgrade.API_KEY)
             LOGGER.debug("Disabled fetching upgrade data during setup: %s", ex)
 
+        # check if file station is used and permitted
+        self._with_file_station = bool(
+            self.information.awesome_version >= AwesomeVersion("6.0")
+            and self.dsm.apis.get(SynoFileStation.LIST_API_KEY)
+        )
+        if self._with_file_station:
+            shares: list | None = None
+            with suppress(*SYNOLOGY_CONNECTION_EXCEPTIONS):
+                shares = await self.dsm.file.get_shared_folders(only_writable=True)
+            if not shares:
+                self._with_file_station = False
+                self.dsm.reset(SynoFileStation.API_KEY)
+                LOGGER.debug(
+                    "File Station found, but disabled due to missing user"
+                    " permissions or no writable shared folders available"
+                )
+
+            if shares and not self._entry.options.get(CONF_BACKUP_PATH):
+                ir.async_create_issue(
+                    self._hass,
+                    DOMAIN,
+                    f"{ISSUE_MISSING_BACKUP_SETUP}_{self._entry.unique_id}",
+                    data={"entry_id": self._entry.entry_id},
+                    is_fixable=True,
+                    is_persistent=False,
+                    severity=ir.IssueSeverity.WARNING,
+                    translation_key=ISSUE_MISSING_BACKUP_SETUP,
+                    translation_placeholders={"title": self._entry.title},
+                )
+
+        LOGGER.debug(
+            "State of File Station during setup of '%s': %s",
+            self._entry.unique_id,
+            self._with_file_station,
+        )
+
         await self._fetch_device_configuration()
 
         try:
@@ -225,6 +272,15 @@ class SynoApi:
                 self.dsm.reset(self.security)
             self.security = None
 
+        if not self._with_file_station:
+            LOGGER.debug(
+                "Disable file station api from being updated or '%s'",
+                self._entry.unique_id,
+            )
+            if self.file_station:
+                self.dsm.reset(self.file_station)
+            self.file_station = None
+
         if not self._with_photos:
             LOGGER.debug(
                 "Disable photos api from being updated or '%s'", self._entry.unique_id
@@ -268,10 +324,15 @@ class SynoApi:
 
     async def _fetch_device_configuration(self) -> None:
         """Fetch initial device config."""
-        self.information = self.dsm.information
         self.network = self.dsm.network
         await self.network.update()
 
+        if self._with_file_station:
+            LOGGER.debug(
+                "Enable file station api updates for '%s'", self._entry.unique_id
+            )
+            self.file_station = self.dsm.file
+
         if self._with_security:
             LOGGER.debug("Enable security api updates for '%s'", self._entry.unique_id)
             self.security = self.dsm.security
diff --git a/homeassistant/components/synology_dsm/config_flow.py b/homeassistant/components/synology_dsm/config_flow.py
index 03e2eaf8e7b..f0da6f8fe47 100644
--- a/homeassistant/components/synology_dsm/config_flow.py
+++ b/homeassistant/components/synology_dsm/config_flow.py
@@ -3,12 +3,14 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
+from contextlib import suppress
 from ipaddress import ip_address as ip
 import logging
-from typing import Any, cast
+from typing import TYPE_CHECKING, Any, cast
 from urllib.parse import urlparse
 
 from synology_dsm import SynologyDSM
+from synology_dsm.api.file_station.models import SynoFileSharedFolder
 from synology_dsm.exceptions import (
     SynologyDSMException,
     SynologyDSMLogin2SAFailedException,
@@ -31,7 +33,6 @@ from homeassistant.const import (
     CONF_NAME,
     CONF_PASSWORD,
     CONF_PORT,
-    CONF_SCAN_INTERVAL,
     CONF_SSL,
     CONF_USERNAME,
     CONF_VERIFY_SSL,
@@ -39,7 +40,12 @@ from homeassistant.const import (
 from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.selector import (
+    SelectOptionDict,
+    SelectSelector,
+    SelectSelectorConfig,
+    SelectSelectorMode,
+)
 from homeassistant.helpers.service_info.ssdp import (
     ATTR_UPNP_FRIENDLY_NAME,
     ATTR_UPNP_SERIAL,
@@ -47,21 +53,26 @@ from homeassistant.helpers.service_info.ssdp import (
 )
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 from homeassistant.helpers.typing import DiscoveryInfoType, VolDictType
+from homeassistant.util import slugify
 from homeassistant.util.network import is_ip_address as is_ip
 
 from .const import (
+    CONF_BACKUP_PATH,
+    CONF_BACKUP_SHARE,
     CONF_DEVICE_TOKEN,
     CONF_SNAPSHOT_QUALITY,
     CONF_VOLUMES,
+    DEFAULT_BACKUP_PATH,
     DEFAULT_PORT,
     DEFAULT_PORT_SSL,
-    DEFAULT_SCAN_INTERVAL,
     DEFAULT_SNAPSHOT_QUALITY,
     DEFAULT_TIMEOUT,
     DEFAULT_USE_SSL,
     DEFAULT_VERIFY_SSL,
     DOMAIN,
+    SYNOLOGY_CONNECTION_EXCEPTIONS,
 )
+from .coordinator import SynologyDSMConfigEntry
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -120,7 +131,7 @@ class SynologyDSMFlowHandler(ConfigFlow, domain=DOMAIN):
     @staticmethod
     @callback
     def async_get_options_flow(
-        config_entry: ConfigEntry,
+        config_entry: SynologyDSMConfigEntry,
     ) -> SynologyDSMOptionsFlowHandler:
         """Get the options flow for this handler."""
         return SynologyDSMOptionsFlowHandler()
@@ -131,6 +142,7 @@ class SynologyDSMFlowHandler(ConfigFlow, domain=DOMAIN):
         self.discovered_conf: dict[str, Any] = {}
         self.reauth_conf: Mapping[str, Any] = {}
         self.reauth_reason: str | None = None
+        self.shares: list[SynoFileSharedFolder] | None = None
 
     def _show_form(
         self,
@@ -173,6 +185,8 @@ class SynologyDSMFlowHandler(ConfigFlow, domain=DOMAIN):
         verify_ssl = user_input.get(CONF_VERIFY_SSL, DEFAULT_VERIFY_SSL)
         otp_code = user_input.get(CONF_OTP_CODE)
         friendly_name = user_input.get(CONF_NAME)
+        backup_path = user_input.get(CONF_BACKUP_PATH)
+        backup_share = user_input.get(CONF_BACKUP_SHARE)
 
         if not port:
             if use_ssl is True:
@@ -209,6 +223,12 @@ class SynologyDSMFlowHandler(ConfigFlow, domain=DOMAIN):
         if errors:
             return self._show_form(step_id, user_input, errors)
 
+        with suppress(*SYNOLOGY_CONNECTION_EXCEPTIONS):
+            self.shares = await api.file.get_shared_folders(only_writable=True)
+
+        if self.shares and not backup_path:
+            return await self.async_step_backup_share(user_input)
+
         # unique_id should be serial for services purpose
         existing_entry = await self.async_set_unique_id(serial, raise_on_progress=False)
 
@@ -221,6 +241,10 @@ class SynologyDSMFlowHandler(ConfigFlow, domain=DOMAIN):
             CONF_PASSWORD: password,
             CONF_MAC: api.network.macs,
         }
+        config_options = {
+            CONF_BACKUP_PATH: backup_path,
+            CONF_BACKUP_SHARE: backup_share,
+        }
         if otp_code:
             config_data[CONF_DEVICE_TOKEN] = api.device_token
         if user_input.get(CONF_DISKS):
@@ -233,10 +257,12 @@ class SynologyDSMFlowHandler(ConfigFlow, domain=DOMAIN):
                 "reauth_successful" if self.reauth_conf else "reconfigure_successful"
             )
             return self.async_update_reload_and_abort(
-                existing_entry, data=config_data, reason=reason
+                existing_entry, data=config_data, options=config_options, reason=reason
             )
 
-        return self.async_create_entry(title=friendly_name or host, data=config_data)
+        return self.async_create_entry(
+            title=friendly_name or host, data=config_data, options=config_options
+        )
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -368,6 +394,43 @@ class SynologyDSMFlowHandler(ConfigFlow, domain=DOMAIN):
 
         return await self.async_step_user(user_input)
 
+    async def async_step_backup_share(
+        self, user_input: dict[str, Any], errors: dict[str, str] | None = None
+    ) -> ConfigFlowResult:
+        """Select backup location."""
+        if TYPE_CHECKING:
+            assert self.shares is not None
+
+        if not self.saved_user_input:
+            self.saved_user_input = user_input
+
+        if CONF_BACKUP_PATH not in user_input and CONF_BACKUP_SHARE not in user_input:
+            return self.async_show_form(
+                step_id="backup_share",
+                data_schema=vol.Schema(
+                    {
+                        vol.Required(CONF_BACKUP_SHARE): SelectSelector(
+                            SelectSelectorConfig(
+                                options=[
+                                    SelectOptionDict(value=s.path, label=s.name)
+                                    for s in self.shares
+                                ],
+                                mode=SelectSelectorMode.DROPDOWN,
+                            ),
+                        ),
+                        vol.Required(
+                            CONF_BACKUP_PATH,
+                            default=f"{DEFAULT_BACKUP_PATH}_{slugify(self.hass.config.location_name)}",
+                        ): str,
+                    }
+                ),
+            )
+
+        user_input = {**self.saved_user_input, **user_input}
+        self.saved_user_input = {}
+
+        return await self.async_step_user(user_input)
+
     def _async_get_existing_entry(self, discovered_mac: str) -> ConfigEntry | None:
         """See if we already have a configured NAS with this MAC address."""
         for entry in self._async_current_entries():
@@ -381,6 +444,8 @@ class SynologyDSMFlowHandler(ConfigFlow, domain=DOMAIN):
 class SynologyDSMOptionsFlowHandler(OptionsFlow):
     """Handle a option flow."""
 
+    config_entry: SynologyDSMConfigEntry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -388,14 +453,10 @@ class SynologyDSMOptionsFlowHandler(OptionsFlow):
         if user_input is not None:
             return self.async_create_entry(title="", data=user_input)
 
+        syno_data = self.config_entry.runtime_data
+
         data_schema = vol.Schema(
             {
-                vol.Required(
-                    CONF_SCAN_INTERVAL,
-                    default=self.config_entry.options.get(
-                        CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL
-                    ),
-                ): cv.positive_int,
                 vol.Required(
                     CONF_SNAPSHOT_QUALITY,
                     default=self.config_entry.options.get(
@@ -404,6 +465,36 @@ class SynologyDSMOptionsFlowHandler(OptionsFlow):
                 ): vol.All(vol.Coerce(int), vol.Range(min=0, max=2)),
             }
         )
+
+        shares: list[SynoFileSharedFolder] | None = None
+        if syno_data.api.file_station:
+            with suppress(*SYNOLOGY_CONNECTION_EXCEPTIONS):
+                shares = await syno_data.api.file_station.get_shared_folders(
+                    only_writable=True
+                )
+
+        if shares:
+            data_schema = data_schema.extend(
+                {
+                    vol.Required(
+                        CONF_BACKUP_SHARE,
+                        default=self.config_entry.options[CONF_BACKUP_SHARE],
+                    ): SelectSelector(
+                        SelectSelectorConfig(
+                            options=[
+                                SelectOptionDict(value=s.path, label=s.name)
+                                for s in shares
+                            ],
+                            mode=SelectSelectorMode.DROPDOWN,
+                        ),
+                    ),
+                    vol.Required(
+                        CONF_BACKUP_PATH,
+                        default=self.config_entry.options[CONF_BACKUP_PATH],
+                    ): str,
+                }
+            )
+
         return self.async_show_form(step_id="init", data_schema=data_schema)
 
 
diff --git a/homeassistant/components/synology_dsm/const.py b/homeassistant/components/synology_dsm/const.py
index e6367458578..758fad53970 100644
--- a/homeassistant/components/synology_dsm/const.py
+++ b/homeassistant/components/synology_dsm/const.py
@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable
+
 from aiohttp import ClientTimeout
 from synology_dsm.api.surveillance_station.const import SNAPSHOT_PROFILE_BALANCED
 from synology_dsm.exceptions import (
@@ -15,8 +17,12 @@ from synology_dsm.exceptions import (
 )
 
 from homeassistant.const import Platform
+from homeassistant.util.hass_dict import HassKey
 
 DOMAIN = "synology_dsm"
+DATA_BACKUP_AGENT_LISTENERS: HassKey[list[Callable[[], None]]] = HassKey(
+    f"{DOMAIN}_backup_agent_listeners"
+)
 ATTRIBUTION = "Data provided by Synology"
 PLATFORMS = [
     Platform.BINARY_SENSOR,
@@ -29,20 +35,24 @@ PLATFORMS = [
 EXCEPTION_DETAILS = "details"
 EXCEPTION_UNKNOWN = "unknown"
 
+ISSUE_MISSING_BACKUP_SETUP = "missing_backup_setup"
+
 # Configuration
 CONF_SERIAL = "serial"
 CONF_VOLUMES = "volumes"
 CONF_DEVICE_TOKEN = "device_token"
 CONF_SNAPSHOT_QUALITY = "snap_profile_type"
+CONF_BACKUP_SHARE = "backup_share"
+CONF_BACKUP_PATH = "backup_path"
 
 DEFAULT_USE_SSL = True
 DEFAULT_VERIFY_SSL = False
 DEFAULT_PORT = 5000
 DEFAULT_PORT_SSL = 5001
 # Options
-DEFAULT_SCAN_INTERVAL = 15  # min
 DEFAULT_TIMEOUT = ClientTimeout(total=60, connect=15)
 DEFAULT_SNAPSHOT_QUALITY = SNAPSHOT_PROFILE_BALANCED
+DEFAULT_BACKUP_PATH = "ha_backup"
 
 ENTITY_UNIT_LOAD = "load"
 
diff --git a/homeassistant/components/synology_dsm/coordinator.py b/homeassistant/components/synology_dsm/coordinator.py
index 357de10b5b8..dd97dedf65e 100644
--- a/homeassistant/components/synology_dsm/coordinator.py
+++ b/homeassistant/components/synology_dsm/coordinator.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Awaitable, Callable, Coroutine
+from dataclasses import dataclass
 from datetime import timedelta
 import logging
 from typing import Any, Concatenate
@@ -14,14 +15,12 @@ from synology_dsm.exceptions import (
 )
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_SCAN_INTERVAL
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .common import SynoApi, raise_config_entry_auth_error
 from .const import (
-    DEFAULT_SCAN_INTERVAL,
     SIGNAL_CAMERA_SOURCE_CHANGED,
     SYNOLOGY_AUTH_FAILED_EXCEPTIONS,
     SYNOLOGY_CONNECTION_EXCEPTIONS,
@@ -30,6 +29,20 @@ from .const import (
 _LOGGER = logging.getLogger(__name__)
 
 
+@dataclass
+class SynologyDSMData:
+    """Data for the synology_dsm integration."""
+
+    api: SynoApi
+    coordinator_central: SynologyDSMCentralUpdateCoordinator
+    coordinator_central_old_update_success: bool
+    coordinator_cameras: SynologyDSMCameraUpdateCoordinator | None
+    coordinator_switches: SynologyDSMSwitchUpdateCoordinator | None
+
+
+type SynologyDSMConfigEntry = ConfigEntry[SynologyDSMData]
+
+
 def async_re_login_on_expired[_T: SynologyDSMUpdateCoordinator[Any], **_P, _R](
     func: Callable[Concatenate[_T, _P], Awaitable[_R]],
 ) -> Callable[Concatenate[_T, _P], Coroutine[Any, Any, _R]]:
@@ -59,19 +72,21 @@ def async_re_login_on_expired[_T: SynologyDSMUpdateCoordinator[Any], **_P, _R](
 class SynologyDSMUpdateCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
     """DataUpdateCoordinator base class for synology_dsm."""
 
+    config_entry: SynologyDSMConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
-        entry: ConfigEntry,
+        entry: SynologyDSMConfigEntry,
         api: SynoApi,
         update_interval: timedelta,
     ) -> None:
         """Initialize synology_dsm DataUpdateCoordinator."""
         self.api = api
-        self.entry = entry
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             name=f"{entry.title} {self.__class__.__name__}",
             update_interval=update_interval,
         )
@@ -85,7 +100,7 @@ class SynologyDSMSwitchUpdateCoordinator(
     def __init__(
         self,
         hass: HomeAssistant,
-        entry: ConfigEntry,
+        entry: SynologyDSMConfigEntry,
         api: SynoApi,
     ) -> None:
         """Initialize DataUpdateCoordinator for switch devices."""
@@ -116,18 +131,11 @@ class SynologyDSMCentralUpdateCoordinator(SynologyDSMUpdateCoordinator[None]):
     def __init__(
         self,
         hass: HomeAssistant,
-        entry: ConfigEntry,
+        entry: SynologyDSMConfigEntry,
         api: SynoApi,
     ) -> None:
         """Initialize DataUpdateCoordinator for central device."""
-        super().__init__(
-            hass,
-            entry,
-            api,
-            timedelta(
-                minutes=entry.options.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL)
-            ),
-        )
+        super().__init__(hass, entry, api, timedelta(minutes=15))
 
     @async_re_login_on_expired
     async def _async_update_data(self) -> None:
@@ -143,7 +151,7 @@ class SynologyDSMCameraUpdateCoordinator(
     def __init__(
         self,
         hass: HomeAssistant,
-        entry: ConfigEntry,
+        entry: SynologyDSMConfigEntry,
         api: SynoApi,
     ) -> None:
         """Initialize DataUpdateCoordinator for cameras."""
@@ -174,7 +182,7 @@ class SynologyDSMCameraUpdateCoordinator(
             ):
                 async_dispatcher_send(
                     self.hass,
-                    f"{SIGNAL_CAMERA_SOURCE_CHANGED}_{self.entry.entry_id}_{cam_id}",
+                    f"{SIGNAL_CAMERA_SOURCE_CHANGED}_{self.config_entry.entry_id}_{cam_id}",
                     cam_data_new.live_view.rtsp,
                 )
 
diff --git a/homeassistant/components/synology_dsm/diagnostics.py b/homeassistant/components/synology_dsm/diagnostics.py
index b30955ae682..a673be23096 100644
--- a/homeassistant/components/synology_dsm/diagnostics.py
+++ b/homeassistant/components/synology_dsm/diagnostics.py
@@ -6,21 +6,20 @@ from typing import Any
 
 from homeassistant.components.camera import diagnostics as camera_diagnostics
 from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 
-from .const import CONF_DEVICE_TOKEN, DOMAIN
-from .models import SynologyDSMData
+from .const import CONF_DEVICE_TOKEN
+from .coordinator import SynologyDSMConfigEntry
 
 TO_REDACT = {CONF_USERNAME, CONF_PASSWORD, CONF_DEVICE_TOKEN}
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: ConfigEntry
+    hass: HomeAssistant, entry: SynologyDSMConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    data: SynologyDSMData = hass.data[DOMAIN][entry.unique_id]
+    data = entry.runtime_data
     syno_api = data.api
     dsm_info = syno_api.dsm.information
 
diff --git a/homeassistant/components/synology_dsm/manifest.json b/homeassistant/components/synology_dsm/manifest.json
index ab6fc20b5cb..3804de7f3f1 100644
--- a/homeassistant/components/synology_dsm/manifest.json
+++ b/homeassistant/components/synology_dsm/manifest.json
@@ -7,7 +7,7 @@
   "documentation": "https://www.home-assistant.io/integrations/synology_dsm",
   "iot_class": "local_polling",
   "loggers": ["synology_dsm"],
-  "requirements": ["py-synologydsm-api==2.6.0"],
+  "requirements": ["py-synologydsm-api==2.7.1"],
   "ssdp": [
     {
       "manufacturer": "Synology",
diff --git a/homeassistant/components/synology_dsm/media_source.py b/homeassistant/components/synology_dsm/media_source.py
index d35b262809c..6234f5e8dd0 100644
--- a/homeassistant/components/synology_dsm/media_source.py
+++ b/homeassistant/components/synology_dsm/media_source.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from logging import getLogger
 import mimetypes
 
 from aiohttp import web
@@ -22,7 +23,9 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 
 from .const import DOMAIN, SHARED_SUFFIX
-from .models import SynologyDSMData
+from .coordinator import SynologyDSMConfigEntry, SynologyDSMData
+
+LOGGER = getLogger(__name__)
 
 
 async def async_get_media_source(hass: HomeAssistant) -> MediaSource:
@@ -41,15 +44,13 @@ class SynologyPhotosMediaSourceIdentifier:
         """Split identifier into parts."""
         parts = identifier.split("/")
 
-        self.unique_id = None
+        self.unique_id = parts[0]
         self.album_id = None
         self.cache_key = None
         self.file_name = None
         self.is_shared = False
         self.passphrase = ""
 
-        self.unique_id = parts[0]
-
         if len(parts) > 1:
             album_parts = parts[1].split("_")
             self.album_id = album_parts[0]
@@ -82,7 +83,7 @@ class SynologyPhotosMediaSource(MediaSource):
         item: MediaSourceItem,
     ) -> BrowseMediaSource:
         """Return media."""
-        if not self.hass.data.get(DOMAIN):
+        if not self.hass.config_entries.async_loaded_entries(DOMAIN):
             raise BrowseError("Diskstation not initialized")
         return BrowseMediaSource(
             domain=DOMAIN,
@@ -116,7 +117,13 @@ class SynologyPhotosMediaSource(MediaSource):
                 for entry in self.entries
             ]
         identifier = SynologyPhotosMediaSourceIdentifier(item.identifier)
-        diskstation: SynologyDSMData = self.hass.data[DOMAIN][identifier.unique_id]
+        entry: SynologyDSMConfigEntry | None = (
+            self.hass.config_entries.async_entry_for_domain_unique_id(
+                DOMAIN, identifier.unique_id
+            )
+        )
+        assert entry
+        diskstation = entry.runtime_data
         assert diskstation.api.photos is not None
 
         if identifier.album_id is None:
@@ -244,7 +251,7 @@ class SynologyDsmMediaView(http.HomeAssistantView):
         self, request: web.Request, source_dir_id: str, location: str
     ) -> web.Response:
         """Start a GET request."""
-        if not self.hass.data.get(DOMAIN):
+        if not self.hass.config_entries.async_loaded_entries(DOMAIN):
             raise web.HTTPNotFound
         # location: {cache_key}/{filename}
         cache_key, file_name, passphrase = location.split("/")
@@ -257,7 +264,13 @@ class SynologyDsmMediaView(http.HomeAssistantView):
         if not isinstance(mime_type, str):
             raise web.HTTPNotFound
 
-        diskstation: SynologyDSMData = self.hass.data[DOMAIN][source_dir_id]
+        entry: SynologyDSMConfigEntry | None = (
+            self.hass.config_entries.async_entry_for_domain_unique_id(
+                DOMAIN, source_dir_id
+            )
+        )
+        assert entry
+        diskstation = entry.runtime_data
         assert diskstation.api.photos is not None
         item = SynoPhotosItem(image_id, "", "", "", cache_key, "xl", shared, passphrase)
         try:
diff --git a/homeassistant/components/synology_dsm/models.py b/homeassistant/components/synology_dsm/models.py
deleted file mode 100644
index 4f51d329ded..00000000000
--- a/homeassistant/components/synology_dsm/models.py
+++ /dev/null
@@ -1,22 +0,0 @@
-"""The synology_dsm integration models."""
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-from .common import SynoApi
-from .coordinator import (
-    SynologyDSMCameraUpdateCoordinator,
-    SynologyDSMCentralUpdateCoordinator,
-    SynologyDSMSwitchUpdateCoordinator,
-)
-
-
-@dataclass
-class SynologyDSMData:
-    """Data for the synology_dsm integration."""
-
-    api: SynoApi
-    coordinator_central: SynologyDSMCentralUpdateCoordinator
-    coordinator_cameras: SynologyDSMCameraUpdateCoordinator | None
-    coordinator_switches: SynologyDSMSwitchUpdateCoordinator | None
diff --git a/homeassistant/components/synology_dsm/repairs.py b/homeassistant/components/synology_dsm/repairs.py
new file mode 100644
index 00000000000..8a4e47a32b5
--- /dev/null
+++ b/homeassistant/components/synology_dsm/repairs.py
@@ -0,0 +1,124 @@
+"""Repair flows for the Synology DSM integration."""
+
+from __future__ import annotations
+
+from contextlib import suppress
+import logging
+from typing import cast
+
+from synology_dsm.api.file_station.models import SynoFileSharedFolder
+import voluptuous as vol
+
+from homeassistant import data_entry_flow
+from homeassistant.components.repairs import ConfirmRepairFlow, RepairsFlow
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import issue_registry as ir
+from homeassistant.helpers.selector import (
+    SelectOptionDict,
+    SelectSelector,
+    SelectSelectorConfig,
+    SelectSelectorMode,
+)
+
+from .const import (
+    CONF_BACKUP_PATH,
+    CONF_BACKUP_SHARE,
+    DOMAIN,
+    ISSUE_MISSING_BACKUP_SETUP,
+    SYNOLOGY_CONNECTION_EXCEPTIONS,
+)
+from .coordinator import SynologyDSMConfigEntry
+
+LOGGER = logging.getLogger(__name__)
+
+
+class MissingBackupSetupRepairFlow(RepairsFlow):
+    """Handler for an issue fixing flow."""
+
+    def __init__(self, entry: SynologyDSMConfigEntry, issue_id: str) -> None:
+        """Create flow."""
+        self.entry = entry
+        self.issue_id = issue_id
+        super().__init__()
+
+    async def async_step_init(
+        self, user_input: dict[str, str] | None = None
+    ) -> data_entry_flow.FlowResult:
+        """Handle the first step of a fix flow."""
+
+        return self.async_show_menu(
+            menu_options=["confirm", "ignore"],
+            description_placeholders={
+                "docs_url": "https://www.home-assistant.io/integrations/synology_dsm/#backup-location"
+            },
+        )
+
+    async def async_step_confirm(
+        self, user_input: dict[str, str] | None = None
+    ) -> data_entry_flow.FlowResult:
+        """Handle the confirm step of a fix flow."""
+
+        syno_data = self.entry.runtime_data
+
+        if user_input is not None:
+            self.hass.config_entries.async_update_entry(
+                self.entry, options={**dict(self.entry.options), **user_input}
+            )
+            return self.async_create_entry(data={})
+
+        shares: list[SynoFileSharedFolder] | None = None
+        if syno_data.api.file_station:
+            with suppress(*SYNOLOGY_CONNECTION_EXCEPTIONS):
+                shares = await syno_data.api.file_station.get_shared_folders(
+                    only_writable=True
+                )
+
+        if not shares:
+            return self.async_abort(reason="no_shares")
+
+        return self.async_show_form(
+            data_schema=vol.Schema(
+                {
+                    vol.Required(
+                        CONF_BACKUP_SHARE,
+                        default=self.entry.options[CONF_BACKUP_SHARE],
+                    ): SelectSelector(
+                        SelectSelectorConfig(
+                            options=[
+                                SelectOptionDict(value=s.path, label=s.name)
+                                for s in shares
+                            ],
+                            mode=SelectSelectorMode.DROPDOWN,
+                        ),
+                    ),
+                    vol.Required(
+                        CONF_BACKUP_PATH,
+                        default=self.entry.options[CONF_BACKUP_PATH],
+                    ): str,
+                }
+            ),
+        )
+
+    async def async_step_ignore(
+        self, _: dict[str, str] | None = None
+    ) -> data_entry_flow.FlowResult:
+        """Handle the confirm step of a fix flow."""
+        ir.async_ignore_issue(self.hass, DOMAIN, self.issue_id, True)
+        return self.async_abort(reason="ignored")
+
+
+async def async_create_fix_flow(
+    hass: HomeAssistant,
+    issue_id: str,
+    data: dict[str, str | int | float | None] | None,
+) -> RepairsFlow:
+    """Create flow."""
+    entry = None
+    if data and (entry_id := data.get("entry_id")):
+        entry_id = cast(str, entry_id)
+        entry = hass.config_entries.async_get_entry(entry_id)
+
+    if entry and issue_id.startswith(ISSUE_MISSING_BACKUP_SETUP):
+        return MissingBackupSetupRepairFlow(entry, issue_id)
+
+    return ConfirmRepairFlow()
diff --git a/homeassistant/components/synology_dsm/sensor.py b/homeassistant/components/synology_dsm/sensor.py
index b29a33f7253..566885e3989 100644
--- a/homeassistant/components/synology_dsm/sensor.py
+++ b/homeassistant/components/synology_dsm/sensor.py
@@ -16,7 +16,6 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_DISKS,
     PERCENTAGE,
@@ -26,19 +25,18 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util.dt import utcnow
 
 from . import SynoApi
-from .const import CONF_VOLUMES, DOMAIN, ENTITY_UNIT_LOAD
-from .coordinator import SynologyDSMCentralUpdateCoordinator
+from .const import CONF_VOLUMES, ENTITY_UNIT_LOAD
+from .coordinator import SynologyDSMCentralUpdateCoordinator, SynologyDSMConfigEntry
 from .entity import (
     SynologyDSMBaseEntity,
     SynologyDSMDeviceEntity,
     SynologyDSMEntityDescription,
 )
-from .models import SynologyDSMData
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -286,10 +284,12 @@ INFORMATION_SENSORS: tuple[SynologyDSMSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: SynologyDSMConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Synology NAS Sensor."""
-    data: SynologyDSMData = hass.data[DOMAIN][entry.unique_id]
+    data = entry.runtime_data
     api = data.api
     coordinator = data.coordinator_central
     storage = api.storage
diff --git a/homeassistant/components/synology_dsm/service.py b/homeassistant/components/synology_dsm/service.py
index 366f7d4ba3a..40b6fd4bc30 100644
--- a/homeassistant/components/synology_dsm/service.py
+++ b/homeassistant/components/synology_dsm/service.py
@@ -3,13 +3,14 @@
 from __future__ import annotations
 
 import logging
+from typing import cast
 
 from synology_dsm.exceptions import SynologyDSMException
 
 from homeassistant.core import HomeAssistant, ServiceCall
 
 from .const import CONF_SERIAL, DOMAIN, SERVICE_REBOOT, SERVICE_SHUTDOWN, SERVICES
-from .models import SynologyDSMData
+from .coordinator import SynologyDSMConfigEntry
 
 LOGGER = logging.getLogger(__name__)
 
@@ -19,11 +20,20 @@ async def async_setup_services(hass: HomeAssistant) -> None:
 
     async def service_handler(call: ServiceCall) -> None:
         """Handle service call."""
-        serial = call.data.get(CONF_SERIAL)
-        dsm_devices = hass.data[DOMAIN]
+        serial: str | None = call.data.get(CONF_SERIAL)
+        entries: list[SynologyDSMConfigEntry] = (
+            hass.config_entries.async_loaded_entries(DOMAIN)
+        )
+        dsm_devices = {
+            cast(str, entry.unique_id): entry.runtime_data for entry in entries
+        }
 
         if serial:
-            dsm_device: SynologyDSMData = hass.data[DOMAIN][serial]
+            entry: SynologyDSMConfigEntry | None = (
+                hass.config_entries.async_entry_for_domain_unique_id(DOMAIN, serial)
+            )
+            assert entry
+            dsm_device = entry.runtime_data
         elif len(dsm_devices) == 1:
             dsm_device = next(iter(dsm_devices.values()))
             serial = next(iter(dsm_devices))
@@ -39,7 +49,7 @@ async def async_setup_services(hass: HomeAssistant) -> None:
             return
 
         if call.service in [SERVICE_REBOOT, SERVICE_SHUTDOWN]:
-            if serial not in hass.data[DOMAIN]:
+            if serial not in dsm_devices:
                 LOGGER.error("DSM with specified serial %s not found", serial)
                 return
             LOGGER.debug("%s DSM with serial %s", call.service, serial)
@@ -50,7 +60,7 @@ async def async_setup_services(hass: HomeAssistant) -> None:
                 ),
                 call.service,
             )
-            dsm_device = hass.data[DOMAIN][serial]
+            dsm_device = dsm_devices[serial]
             dsm_api = dsm_device.api
             try:
                 await getattr(dsm_api, f"async_{call.service}")()
diff --git a/homeassistant/components/synology_dsm/strings.json b/homeassistant/components/synology_dsm/strings.json
index 0f8ea594732..f51184ef1cb 100644
--- a/homeassistant/components/synology_dsm/strings.json
+++ b/homeassistant/components/synology_dsm/strings.json
@@ -21,6 +21,17 @@
           "otp_code": "Code"
         }
       },
+      "backup_share": {
+        "title": "Synology DSM: Backup location",
+        "data": {
+          "backup_share": "Shared folder",
+          "backup_path": "Path"
+        },
+        "data_description": {
+          "backup_share": "Select the shared folder, where the automatic Home-Assistant backup should be stored.",
+          "backup_path": "Define the path on the selected shared folder (will automatically be created, if not exist)."
+        }
+      },
       "link": {
         "description": "Do you want to set up {name} ({host})?",
         "data": {
@@ -57,9 +68,13 @@
     "step": {
       "init": {
         "data": {
-          "scan_interval": "Minutes between scans",
-          "timeout": "Timeout (seconds)",
-          "snap_profile_type": "Quality level of camera snapshots (0:high 1:medium 2:low)"
+          "snap_profile_type": "Quality level of camera snapshots (0:high 1:medium 2:low)",
+          "backup_share": "[%key:component::synology_dsm::config::step::backup_share::data::backup_share%]",
+          "backup_path": "[%key:component::synology_dsm::config::step::backup_share::data::backup_path%]"
+        },
+        "data_description": {
+          "backup_share": "[%key:component::synology_dsm::config::step::backup_share::data_description::backup_share%]",
+          "backup_path": "[%key:component::synology_dsm::config::step::backup_share::data_description::backup_path%]"
         }
       }
     }
@@ -170,6 +185,37 @@
       }
     }
   },
+  "issues": {
+    "missing_backup_setup": {
+      "title": "Backup location not configured for {title}",
+      "fix_flow": {
+        "step": {
+          "init": {
+            "description": "The backup location for {title} is not configured. Do you want to set it up now? Details can be found in the integration documentation under [Backup Location]({docs_url})",
+            "menu_options": {
+              "confirm": "Set up the backup location now",
+              "ignore": "Don't set it up now"
+            }
+          },
+          "confirm": {
+            "title": "[%key:component::synology_dsm::config::step::backup_share::title%]",
+            "data": {
+              "backup_share": "[%key:component::synology_dsm::config::step::backup_share::data::backup_share%]",
+              "backup_path": "[%key:component::synology_dsm::config::step::backup_share::data::backup_path%]"
+            },
+            "data_description": {
+              "backup_share": "[%key:component::synology_dsm::config::step::backup_share::data_description::backup_share%]",
+              "backup_path": "[%key:component::synology_dsm::config::step::backup_share::data_description::backup_path%]"
+            }
+          }
+        },
+        "abort": {
+          "no_shares": "There are no shared folders available for the user.\nPlease check the documentation.",
+          "ignored": "The backup location has not been configured.\nYou can still set it up later via the integration options."
+        }
+      }
+    }
+  },
   "services": {
     "reboot": {
       "name": "Reboot",
diff --git a/homeassistant/components/synology_dsm/switch.py b/homeassistant/components/synology_dsm/switch.py
index facce824bda..91863ff3a26 100644
--- a/homeassistant/components/synology_dsm/switch.py
+++ b/homeassistant/components/synology_dsm/switch.py
@@ -9,16 +9,14 @@ from typing import Any
 from synology_dsm.api.surveillance_station import SynoSurveillanceStation
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import SynoApi
 from .const import DOMAIN
-from .coordinator import SynologyDSMSwitchUpdateCoordinator
+from .coordinator import SynologyDSMConfigEntry, SynologyDSMSwitchUpdateCoordinator
 from .entity import SynologyDSMBaseEntity, SynologyDSMEntityDescription
-from .models import SynologyDSMData
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -40,10 +38,12 @@ SURVEILLANCE_SWITCH: tuple[SynologyDSMSwitchEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: SynologyDSMConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Synology NAS switch."""
-    data: SynologyDSMData = hass.data[DOMAIN][entry.unique_id]
+    data = entry.runtime_data
     if coordinator := data.coordinator_switches:
         assert coordinator.version is not None
         async_add_entities(
diff --git a/homeassistant/components/synology_dsm/update.py b/homeassistant/components/synology_dsm/update.py
index ed60191f296..3048a38cb9c 100644
--- a/homeassistant/components/synology_dsm/update.py
+++ b/homeassistant/components/synology_dsm/update.py
@@ -9,15 +9,12 @@ from synology_dsm.api.core.upgrade import SynoCoreUpgrade
 from yarl import URL
 
 from homeassistant.components.update import UpdateEntity, UpdateEntityDescription
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN
-from .coordinator import SynologyDSMCentralUpdateCoordinator
+from .coordinator import SynologyDSMCentralUpdateCoordinator, SynologyDSMConfigEntry
 from .entity import SynologyDSMBaseEntity, SynologyDSMEntityDescription
-from .models import SynologyDSMData
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -38,10 +35,12 @@ UPDATE_ENTITIES: Final = [
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: SynologyDSMConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Synology DSM update entities."""
-    data: SynologyDSMData = hass.data[DOMAIN][entry.unique_id]
+    data = entry.runtime_data
     async_add_entities(
         SynoDSMUpdateEntity(data.api, data.coordinator_central, description)
         for description in UPDATE_ENTITIES
diff --git a/homeassistant/components/synology_srm/device_tracker.py b/homeassistant/components/synology_srm/device_tracker.py
index 3e0e7add185..b916be84acf 100644
--- a/homeassistant/components/synology_srm/device_tracker.py
+++ b/homeassistant/components/synology_srm/device_tracker.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     CONF_VERIFY_SSL,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/system_bridge/binary_sensor.py b/homeassistant/components/system_bridge/binary_sensor.py
index 019b1df4639..0140499a75a 100644
--- a/homeassistant/components/system_bridge/binary_sensor.py
+++ b/homeassistant/components/system_bridge/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PORT
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import SystemBridgeDataUpdateCoordinator
@@ -65,7 +65,9 @@ BATTERY_BINARY_SENSOR_TYPES: tuple[SystemBridgeBinarySensorEntityDescription, ..
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up System Bridge binary sensor based on a config entry."""
     coordinator: SystemBridgeDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/system_bridge/coordinator.py b/homeassistant/components/system_bridge/coordinator.py
index 7151805f154..1690bad4a4d 100644
--- a/homeassistant/components/system_bridge/coordinator.py
+++ b/homeassistant/components/system_bridge/coordinator.py
@@ -40,6 +40,8 @@ from .data import SystemBridgeData
 class SystemBridgeDataUpdateCoordinator(DataUpdateCoordinator[SystemBridgeData]):
     """Class to manage fetching System Bridge data from single endpoint."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
@@ -65,6 +67,7 @@ class SystemBridgeDataUpdateCoordinator(DataUpdateCoordinator[SystemBridgeData])
         super().__init__(
             hass,
             LOGGER,
+            config_entry=entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=30),
         )
diff --git a/homeassistant/components/system_bridge/media_player.py b/homeassistant/components/system_bridge/media_player.py
index aeff3b22fb2..6d3bbd21a05 100644
--- a/homeassistant/components/system_bridge/media_player.py
+++ b/homeassistant/components/system_bridge/media_player.py
@@ -18,7 +18,7 @@ from homeassistant.components.media_player import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PORT
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import SystemBridgeDataUpdateCoordinator
@@ -66,7 +66,7 @@ MEDIA_PLAYER_DESCRIPTION: Final[MediaPlayerEntityDescription] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up System Bridge media players based on a config entry."""
     coordinator: SystemBridgeDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/system_bridge/sensor.py b/homeassistant/components/system_bridge/sensor.py
index 94c73a2ac05..c7cae2f347b 100644
--- a/homeassistant/components/system_bridge/sensor.py
+++ b/homeassistant/components/system_bridge/sensor.py
@@ -29,7 +29,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import UNDEFINED, StateType
 from homeassistant.util import dt as dt_util
 
@@ -359,7 +359,7 @@ BATTERY_SENSOR_TYPES: tuple[SystemBridgeSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up System Bridge sensor based on a config entry."""
     coordinator: SystemBridgeDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/system_bridge/strings.json b/homeassistant/components/system_bridge/strings.json
index ef7495ef74f..1c079c1ef0c 100644
--- a/homeassistant/components/system_bridge/strings.json
+++ b/homeassistant/components/system_bridge/strings.json
@@ -109,7 +109,7 @@
       "message": "No data received from {host}"
     },
     "process_not_found": {
-      "message": "Could not find process with id {id}."
+      "message": "Could not find process with ID {id}."
     },
     "timeout": {
       "message": "A timeout occurred for {title} ({host})"
@@ -120,7 +120,7 @@
   },
   "issues": {
     "unsupported_version": {
-      "title": "System Bridge Upgrade Required",
+      "title": "System Bridge upgrade required",
       "description": "Your version of System Bridge for host {host} is not supported.\n\nPlease upgrade to the latest version."
     }
   },
diff --git a/homeassistant/components/system_bridge/update.py b/homeassistant/components/system_bridge/update.py
index b0d341cee3b..12060c28669 100644
--- a/homeassistant/components/system_bridge/update.py
+++ b/homeassistant/components/system_bridge/update.py
@@ -6,7 +6,7 @@ from homeassistant.components.update import UpdateEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PORT
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import SystemBridgeDataUpdateCoordinator
@@ -16,7 +16,7 @@ from .entity import SystemBridgeEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up System Bridge update based on a config entry."""
     coordinator: SystemBridgeDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/system_health/__init__.py b/homeassistant/components/system_health/__init__.py
index ce80f6303d9..37e9ee3d929 100644
--- a/homeassistant/components/system_health/__init__.py
+++ b/homeassistant/components/system_health/__init__.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Awaitable, Callable
+from collections.abc import AsyncGenerator, Awaitable, Callable
 import dataclasses
 from datetime import datetime
 import logging
@@ -101,6 +101,57 @@ async def get_integration_info(
     return result
 
 
+async def _registered_domain_data(
+    hass: HomeAssistant,
+) -> AsyncGenerator[tuple[str, dict[str, Any]]]:
+    registrations: dict[str, SystemHealthRegistration] = hass.data[DOMAIN]
+    for domain, domain_data in zip(
+        registrations,
+        await asyncio.gather(
+            *(
+                get_integration_info(hass, registration)
+                for registration in registrations.values()
+            )
+        ),
+        strict=False,
+    ):
+        yield domain, domain_data
+
+
+async def get_info(hass: HomeAssistant) -> dict[str, dict[str, str]]:
+    """Get the full set of system health information."""
+    domains: dict[str, dict[str, Any]] = {}
+
+    async def _get_info_value(value: Any) -> Any:
+        if not asyncio.iscoroutine(value):
+            return value
+        try:
+            return await value
+        except Exception as exception:
+            _LOGGER.exception("Error fetching system info for %s - %s", domain, key)
+            return f"Exception: {exception}"
+
+    async for domain, domain_data in _registered_domain_data(hass):
+        domain_info: dict[str, Any] = {}
+        for key, value in domain_data["info"].items():
+            info_value = await _get_info_value(value)
+
+            if isinstance(info_value, datetime):
+                domain_info[key] = info_value.isoformat()
+            elif (
+                isinstance(info_value, dict)
+                and "type" in info_value
+                and info_value["type"] == "failed"
+            ):
+                domain_info[key] = f"Failed: {info_value.get('error', 'unknown')}"
+            else:
+                domain_info[key] = info_value
+
+        domains[domain] = domain_info
+
+    return domains
+
+
 @callback
 def _format_value(val: Any) -> Any:
     """Format a system health value."""
@@ -115,20 +166,10 @@ async def handle_info(
     hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict[str, Any]
 ) -> None:
     """Handle an info request via a subscription."""
-    registrations: dict[str, SystemHealthRegistration] = hass.data[DOMAIN]
     data = {}
     pending_info: dict[tuple[str, str], asyncio.Task] = {}
 
-    for domain, domain_data in zip(
-        registrations,
-        await asyncio.gather(
-            *(
-                get_integration_info(hass, registration)
-                for registration in registrations.values()
-            )
-        ),
-        strict=False,
-    ):
+    async for domain, domain_data in _registered_domain_data(hass):
         for key, value in domain_data["info"].items():
             if asyncio.iscoroutine(value):
                 value = asyncio.create_task(value)
@@ -179,7 +220,7 @@ async def handle_info(
         # Update subscription of all finished tasks
         for result in done:
             domain, key = pending_lookup[result]
-            event_msg = {
+            event_msg: dict[str, Any] = {
                 "type": "update",
                 "domain": domain,
                 "key": key,
diff --git a/homeassistant/components/system_log/__init__.py b/homeassistant/components/system_log/__init__.py
index 191a2b5feb8..facfb270627 100644
--- a/homeassistant/components/system_log/__init__.py
+++ b/homeassistant/components/system_log/__init__.py
@@ -16,7 +16,7 @@ from homeassistant import __path__ as HOMEASSISTANT_PATH
 from homeassistant.components import websocket_api
 from homeassistant.const import EVENT_HOMEASSISTANT_CLOSE
 from homeassistant.core import Event, HomeAssistant, ServiceCall, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 type KeyType = tuple[str, tuple[str, int], tuple[str, int, str] | None]
diff --git a/homeassistant/components/systemmonitor/binary_sensor.py b/homeassistant/components/systemmonitor/binary_sensor.py
index aecd30765ff..3968e94ec03 100644
--- a/homeassistant/components/systemmonitor/binary_sensor.py
+++ b/homeassistant/components/systemmonitor/binary_sensor.py
@@ -20,7 +20,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import slugify
 
@@ -91,7 +91,7 @@ SENSOR_TYPES: tuple[SysMonitorBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SystemMonitorConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up System Monitor binary sensors based on a config entry."""
     coordinator = entry.runtime_data.coordinator
diff --git a/homeassistant/components/systemmonitor/manifest.json b/homeassistant/components/systemmonitor/manifest.json
index bd16464b290..9302746aa17 100644
--- a/homeassistant/components/systemmonitor/manifest.json
+++ b/homeassistant/components/systemmonitor/manifest.json
@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/systemmonitor",
   "iot_class": "local_push",
   "loggers": ["psutil"],
-  "requirements": ["psutil-home-assistant==0.0.1", "psutil==6.1.1"],
+  "requirements": ["psutil-home-assistant==0.0.1", "psutil==7.0.0"],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/systemmonitor/sensor.py b/homeassistant/components/systemmonitor/sensor.py
index 048d7cefd6c..e70bccf0833 100644
--- a/homeassistant/components/systemmonitor/sensor.py
+++ b/homeassistant/components/systemmonitor/sensor.py
@@ -31,7 +31,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import slugify
@@ -397,7 +397,7 @@ IF_ADDRS_FAMILY = {"ipv4_address": socket.AF_INET, "ipv6_address": socket.AF_INE
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SystemMonitorConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up System Monitor sensors based on a config entry."""
     entities: list[SystemMonitorSensor] = []
diff --git a/homeassistant/components/systemmonitor/strings.json b/homeassistant/components/systemmonitor/strings.json
index fb8a318ff45..134fe390357 100644
--- a/homeassistant/components/systemmonitor/strings.json
+++ b/homeassistant/components/systemmonitor/strings.json
@@ -48,13 +48,13 @@
         "name": "Last boot"
       },
       "load_15m": {
-        "name": "Load (15m)"
+        "name": "Load (15 min)"
       },
       "load_1m": {
-        "name": "Load (1m)"
+        "name": "Load (1 min)"
       },
       "load_5m": {
-        "name": "Load (5m)"
+        "name": "Load (5 min)"
       },
       "memory_free": {
         "name": "Memory free"
diff --git a/homeassistant/components/tado/__init__.py b/homeassistant/components/tado/__init__.py
index 3e42e33489f..d1994075f12 100644
--- a/homeassistant/components/tado/__init__.py
+++ b/homeassistant/components/tado/__init__.py
@@ -10,12 +10,17 @@ from PyTado.interface import Tado
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.exceptions import ConfigEntryError, ConfigEntryNotReady
+from homeassistant.exceptions import (
+    ConfigEntryAuthFailed,
+    ConfigEntryError,
+    ConfigEntryNotReady,
+)
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
     CONF_FALLBACK,
+    CONF_REFRESH_TOKEN,
     CONST_OVERLAY_MANUAL,
     CONST_OVERLAY_TADO_DEFAULT,
     CONST_OVERLAY_TADO_MODE,
@@ -31,6 +36,7 @@ PLATFORMS = [
     Platform.CLIMATE,
     Platform.DEVICE_TRACKER,
     Platform.SENSOR,
+    Platform.SWITCH,
     Platform.WATER_HEATER,
 ]
 
@@ -55,23 +61,34 @@ type TadoConfigEntry = ConfigEntry[TadoData]
 
 async def async_setup_entry(hass: HomeAssistant, entry: TadoConfigEntry) -> bool:
     """Set up Tado from a config entry."""
+    if CONF_REFRESH_TOKEN not in entry.data:
+        raise ConfigEntryAuthFailed
 
     _async_import_options_from_data_if_missing(hass, entry)
 
     _LOGGER.debug("Setting up Tado connection")
+    _LOGGER.debug(
+        "Creating tado instance with refresh token: %s",
+        entry.data[CONF_REFRESH_TOKEN],
+    )
+
+    def create_tado_instance() -> tuple[Tado, str]:
+        """Create a Tado instance, this time with a previously obtained refresh token."""
+        tado = Tado(saved_refresh_token=entry.data[CONF_REFRESH_TOKEN])
+        return tado, tado.device_activation_status()
+
     try:
-        tado = await hass.async_add_executor_job(
-            Tado,
-            entry.data[CONF_USERNAME],
-            entry.data[CONF_PASSWORD],
-        )
+        tado, device_status = await hass.async_add_executor_job(create_tado_instance)
     except PyTado.exceptions.TadoWrongCredentialsException as err:
         raise ConfigEntryError(f"Invalid Tado credentials. Error: {err}") from err
     except PyTado.exceptions.TadoException as err:
         raise ConfigEntryNotReady(f"Error during Tado setup: {err}") from err
-    _LOGGER.debug(
-        "Tado connection established for username: %s", entry.data[CONF_USERNAME]
-    )
+    if device_status != "COMPLETED":
+        raise ConfigEntryAuthFailed(
+            f"Device login flow status is {device_status}. Starting re-authentication."
+        )
+
+    _LOGGER.debug("Tado connection established")
 
     coordinator = TadoDataUpdateCoordinator(hass, entry, tado)
     await coordinator.async_config_entry_first_refresh()
@@ -81,13 +98,27 @@ async def async_setup_entry(hass: HomeAssistant, entry: TadoConfigEntry) -> bool
 
     entry.runtime_data = TadoData(coordinator, mobile_coordinator)
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-    entry.async_on_unload(entry.add_update_listener(update_listener))
 
     return True
 
 
+async def async_migrate_entry(hass: HomeAssistant, entry: TadoConfigEntry) -> bool:
+    """Migrate old entry."""
+
+    if entry.version < 2:
+        _LOGGER.debug("Migrating Tado entry to version 2. Current data: %s", entry.data)
+        data = dict(entry.data)
+        data.pop(CONF_USERNAME, None)
+        data.pop(CONF_PASSWORD, None)
+        hass.config_entries.async_update_entry(entry=entry, data=data, version=2)
+        _LOGGER.debug("Migration to version 2 successful")
+    return True
+
+
 @callback
-def _async_import_options_from_data_if_missing(hass: HomeAssistant, entry: ConfigEntry):
+def _async_import_options_from_data_if_missing(
+    hass: HomeAssistant, entry: TadoConfigEntry
+):
     options = dict(entry.options)
     if CONF_FALLBACK not in options:
         options[CONF_FALLBACK] = entry.data.get(
@@ -103,11 +134,6 @@ def _async_import_options_from_data_if_missing(hass: HomeAssistant, entry: Confi
         hass.config_entries.async_update_entry(entry, options=options)
 
 
-async def update_listener(hass: HomeAssistant, entry: TadoConfigEntry):
-    """Handle options update."""
-    await hass.config_entries.async_reload(entry.entry_id)
-
-
 async def async_unload_entry(hass: HomeAssistant, entry: TadoConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/tado/binary_sensor.py b/homeassistant/components/tado/binary_sensor.py
index c969ea34f42..8cec32e20f0 100644
--- a/homeassistant/components/tado/binary_sensor.py
+++ b/homeassistant/components/tado/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import TadoConfigEntry
@@ -115,7 +115,9 @@ ZONE_SENSORS = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TadoConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TadoConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tado sensor platform."""
 
diff --git a/homeassistant/components/tado/climate.py b/homeassistant/components/tado/climate.py
index c8eaec76255..6a2067ffff1 100644
--- a/homeassistant/components/tado/climate.py
+++ b/homeassistant/components/tado/climate.py
@@ -26,7 +26,7 @@ from homeassistant.components.climate import (
 from homeassistant.const import ATTR_TEMPERATURE, PRECISION_TENTHS, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import VolDictType
 
 from . import TadoConfigEntry
@@ -100,7 +100,9 @@ CLIMATE_TEMP_OFFSET_SCHEMA: VolDictType = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TadoConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TadoConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tado climate platform."""
 
@@ -155,8 +157,8 @@ async def create_climate_entity(
         TADO_TO_HA_HVAC_MODE_MAP[CONST_MODE_OFF],
         TADO_TO_HA_HVAC_MODE_MAP[CONST_MODE_SMART_SCHEDULE],
     ]
-    supported_fan_modes = None
-    supported_swing_modes = None
+    supported_fan_modes: list[str] | None = None
+    supported_swing_modes: list[str] | None = None
     heat_temperatures = None
     cool_temperatures = None
 
@@ -506,7 +508,7 @@ class TadoClimate(TadoZoneEntity, ClimateEntity):
             offset,
         )
 
-        self._tado.set_temperature_offset(self._device_id, offset)
+        await self._tado.set_temperature_offset(self._device_id, offset)
         await self.coordinator.async_request_refresh()
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
diff --git a/homeassistant/components/tado/config_flow.py b/homeassistant/components/tado/config_flow.py
index f251a292800..48c3d30cb2b 100644
--- a/homeassistant/components/tado/config_flow.py
+++ b/homeassistant/components/tado/config_flow.py
@@ -2,160 +2,176 @@
 
 from __future__ import annotations
 
+import asyncio
+from collections.abc import Mapping
 import logging
 from typing import Any
 
-import PyTado
+from PyTado.exceptions import TadoException
+from PyTado.http import DeviceActivationStatus
 from PyTado.interface import Tado
-import requests.exceptions
 import voluptuous as vol
+from yarl import URL
 
 from homeassistant.config_entries import (
+    SOURCE_REAUTH,
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
     OptionsFlow,
 )
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.service_info.zeroconf import (
-    ATTR_PROPERTIES_ID,
-    ZeroconfServiceInfo,
-)
+from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
 from .const import (
     CONF_FALLBACK,
+    CONF_REFRESH_TOKEN,
     CONST_OVERLAY_TADO_DEFAULT,
     CONST_OVERLAY_TADO_OPTIONS,
     DOMAIN,
-    UNIQUE_ID,
 )
 
 _LOGGER = logging.getLogger(__name__)
 
-DATA_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_USERNAME): str,
-        vol.Required(CONF_PASSWORD): str,
-    }
-)
-
-
-async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str, Any]:
-    """Validate the user input allows us to connect.
-
-    Data has the keys from DATA_SCHEMA with values provided by the user.
-    """
-
-    try:
-        tado = await hass.async_add_executor_job(
-            Tado, data[CONF_USERNAME], data[CONF_PASSWORD]
-        )
-        tado_me = await hass.async_add_executor_job(tado.get_me)
-    except KeyError as ex:
-        raise InvalidAuth from ex
-    except RuntimeError as ex:
-        raise CannotConnect from ex
-    except requests.exceptions.HTTPError as ex:
-        if ex.response.status_code > 400 and ex.response.status_code < 500:
-            raise InvalidAuth from ex
-        raise CannotConnect from ex
-
-    if "homes" not in tado_me or len(tado_me["homes"]) == 0:
-        raise NoHomes
-
-    home = tado_me["homes"][0]
-    unique_id = str(home["id"])
-    name = home["name"]
-
-    return {"title": name, UNIQUE_ID: unique_id}
-
 
 class TadoConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Tado."""
 
-    VERSION = 1
+    VERSION = 2
+    login_task: asyncio.Task | None = None
+    refresh_token: str | None = None
+    tado: Tado | None = None
+
+    async def async_step_reauth(
+        self, entry_data: Mapping[str, Any]
+    ) -> ConfigFlowResult:
+        """Handle reauth on credential failure."""
+        return await self.async_step_reauth_confirm()
+
+    async def async_step_reauth_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Prepare reauth."""
+        if user_input is None:
+            return self.async_show_form(step_id="reauth_confirm")
+
+        return await self.async_step_user()
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Handle the initial step."""
-        errors = {}
-        if user_input is not None:
+        """Handle users reauth credentials."""
+
+        if self.tado is None:
+            _LOGGER.debug("Initiating device activation")
             try:
-                validated = await validate_input(self.hass, user_input)
-            except CannotConnect:
-                errors["base"] = "cannot_connect"
-            except InvalidAuth:
-                errors["base"] = "invalid_auth"
-            except NoHomes:
-                errors["base"] = "no_homes"
-            except Exception:
-                _LOGGER.exception("Unexpected exception")
-                errors["base"] = "unknown"
+                self.tado = await self.hass.async_add_executor_job(Tado)
+            except TadoException:
+                _LOGGER.exception("Error while initiating Tado")
+                return self.async_abort(reason="cannot_connect")
+            assert self.tado is not None
+            tado_device_url = self.tado.device_verification_url()
+            user_code = URL(tado_device_url).query["user_code"]
 
-            if "base" not in errors:
-                await self.async_set_unique_id(validated[UNIQUE_ID])
-                self._abort_if_unique_id_configured()
-                return self.async_create_entry(
-                    title=validated["title"], data=user_input
-                )
+        async def _wait_for_login() -> None:
+            """Wait for the user to login."""
+            assert self.tado is not None
+            _LOGGER.debug("Waiting for device activation")
+            try:
+                await self.hass.async_add_executor_job(self.tado.device_activation)
+            except Exception as ex:
+                _LOGGER.exception("Error while waiting for device activation")
+                raise CannotConnect from ex
 
-        return self.async_show_form(
-            step_id="user", data_schema=DATA_SCHEMA, errors=errors
+            if (
+                self.tado.device_activation_status()
+                is not DeviceActivationStatus.COMPLETED
+            ):
+                raise CannotConnect
+
+        _LOGGER.debug("Checking login task")
+        if self.login_task is None:
+            _LOGGER.debug("Creating task for device activation")
+            self.login_task = self.hass.async_create_task(_wait_for_login())
+
+        if self.login_task.done():
+            _LOGGER.debug("Login task is done, checking results")
+            if self.login_task.exception():
+                return self.async_show_progress_done(next_step_id="timeout")
+            self.refresh_token = await self.hass.async_add_executor_job(
+                self.tado.get_refresh_token
+            )
+            return self.async_show_progress_done(next_step_id="finish_login")
+
+        return self.async_show_progress(
+            step_id="user",
+            progress_action="wait_for_device",
+            description_placeholders={
+                "url": tado_device_url,
+                "code": user_code,
+            },
+            progress_task=self.login_task,
         )
 
+    async def async_step_finish_login(
+        self,
+        user_input: dict[str, Any] | None = None,
+    ) -> ConfigFlowResult:
+        """Handle the finalization of reauth."""
+        _LOGGER.debug("Finalizing reauth")
+        assert self.tado is not None
+        tado_me = await self.hass.async_add_executor_job(self.tado.get_me)
+
+        if "homes" not in tado_me or len(tado_me["homes"]) == 0:
+            return self.async_abort(reason="no_homes")
+
+        home = tado_me["homes"][0]
+        unique_id = str(home["id"])
+        name = home["name"]
+
+        if self.source != SOURCE_REAUTH:
+            await self.async_set_unique_id(unique_id)
+            self._abort_if_unique_id_configured()
+
+            return self.async_create_entry(
+                title=name,
+                data={CONF_REFRESH_TOKEN: self.refresh_token},
+            )
+
+        self._abort_if_unique_id_mismatch(reason="reauth_account_mismatch")
+        return self.async_update_reload_and_abort(
+            self._get_reauth_entry(),
+            data={CONF_REFRESH_TOKEN: self.refresh_token},
+        )
+
+    async def async_step_timeout(
+        self,
+        user_input: dict[str, Any] | None = None,
+    ) -> ConfigFlowResult:
+        """Handle issues that need transition await from progress step."""
+        if user_input is None:
+            return self.async_show_form(
+                step_id="timeout",
+            )
+        del self.login_task
+        return await self.async_step_user()
+
     async def async_step_homekit(
         self, discovery_info: ZeroconfServiceInfo
     ) -> ConfigFlowResult:
         """Handle HomeKit discovery."""
-        self._async_abort_entries_match()
-        properties = {
-            key.lower(): value for (key, value) in discovery_info.properties.items()
-        }
-        await self.async_set_unique_id(properties[ATTR_PROPERTIES_ID])
-        self._abort_if_unique_id_configured()
-        return await self.async_step_user()
+        await self._async_handle_discovery_without_unique_id()
+        return await self.async_step_homekit_confirm()
 
-    async def async_step_reconfigure(
+    async def async_step_homekit_confirm(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Handle a reconfiguration flow initialized by the user."""
-        errors: dict[str, str] = {}
-        reconfigure_entry = self._get_reconfigure_entry()
+        """Prepare for Homekit."""
+        if user_input is None:
+            return self.async_show_form(step_id="homekit_confirm")
 
-        if user_input is not None:
-            user_input[CONF_USERNAME] = reconfigure_entry.data[CONF_USERNAME]
-            try:
-                await validate_input(self.hass, user_input)
-            except CannotConnect:
-                errors["base"] = "cannot_connect"
-            except PyTado.exceptions.TadoWrongCredentialsException:
-                errors["base"] = "invalid_auth"
-            except NoHomes:
-                errors["base"] = "no_homes"
-            except Exception:  # pylint: disable=broad-except
-                _LOGGER.exception("Unexpected exception")
-                errors["base"] = "unknown"
-
-            if not errors:
-                return self.async_update_reload_and_abort(
-                    reconfigure_entry, data_updates=user_input
-                )
-
-        return self.async_show_form(
-            step_id="reconfigure",
-            data_schema=vol.Schema(
-                {
-                    vol.Required(CONF_PASSWORD): str,
-                }
-            ),
-            errors=errors,
-            description_placeholders={
-                CONF_USERNAME: reconfigure_entry.data[CONF_USERNAME]
-            },
-        )
+        return await self.async_step_user()
 
     @staticmethod
     @callback
@@ -173,8 +189,10 @@ class OptionsFlowHandler(OptionsFlow):
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle options flow."""
-        if user_input is not None:
-            return self.async_create_entry(data=user_input)
+        if user_input:
+            result = self.async_create_entry(data=user_input)
+            await self.hass.config_entries.async_reload(self.config_entry.entry_id)
+            return result
 
         data_schema = vol.Schema(
             {
@@ -191,11 +209,3 @@ class OptionsFlowHandler(OptionsFlow):
 
 class CannotConnect(HomeAssistantError):
     """Error to indicate we cannot connect."""
-
-
-class InvalidAuth(HomeAssistantError):
-    """Error to indicate there is invalid auth."""
-
-
-class NoHomes(HomeAssistantError):
-    """Error to indicate the account has no homes."""
diff --git a/homeassistant/components/tado/const.py b/homeassistant/components/tado/const.py
index bdc4bff1943..7720ff09110 100644
--- a/homeassistant/components/tado/const.py
+++ b/homeassistant/components/tado/const.py
@@ -37,6 +37,7 @@ TADO_HVAC_ACTION_TO_HA_HVAC_ACTION = {
 # Configuration
 CONF_FALLBACK = "fallback"
 CONF_HOME_ID = "home_id"
+CONF_REFRESH_TOKEN = "refresh_token"
 DATA = "data"
 
 # Weather
diff --git a/homeassistant/components/tado/coordinator.py b/homeassistant/components/tado/coordinator.py
index ddec9e7f292..5f3aa1de1e4 100644
--- a/homeassistant/components/tado/coordinator.py
+++ b/homeassistant/components/tado/coordinator.py
@@ -4,20 +4,22 @@ from __future__ import annotations
 
 from datetime import datetime, timedelta
 import logging
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from PyTado.interface import Tado
 from requests import RequestException
 
 from homeassistant.components.climate import PRESET_AWAY, PRESET_HOME
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
+if TYPE_CHECKING:
+    from . import TadoConfigEntry
+
 from .const import (
     CONF_FALLBACK,
+    CONF_REFRESH_TOKEN,
     CONST_OVERLAY_TADO_DEFAULT,
     DOMAIN,
     INSIDE_TEMPERATURE_MEASUREMENT,
@@ -31,8 +33,6 @@ MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=4)
 SCAN_INTERVAL = timedelta(minutes=5)
 SCAN_MOBILE_DEVICE_INTERVAL = timedelta(seconds=30)
 
-type TadoConfigEntry = ConfigEntry[TadoDataUpdateCoordinator]
-
 
 class TadoDataUpdateCoordinator(DataUpdateCoordinator[dict[str, dict]]):
     """Class to manage API calls from and to Tado via PyTado."""
@@ -45,7 +45,7 @@ class TadoDataUpdateCoordinator(DataUpdateCoordinator[dict[str, dict]]):
     def __init__(
         self,
         hass: HomeAssistant,
-        entry: ConfigEntry,
+        config_entry: TadoConfigEntry,
         tado: Tado,
         debug: bool = False,
     ) -> None:
@@ -53,13 +53,15 @@ class TadoDataUpdateCoordinator(DataUpdateCoordinator[dict[str, dict]]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
         self._tado = tado
-        self._username = entry.data[CONF_USERNAME]
-        self._password = entry.data[CONF_PASSWORD]
-        self._fallback = entry.options.get(CONF_FALLBACK, CONST_OVERLAY_TADO_DEFAULT)
+        self._refresh_token = config_entry.data[CONF_REFRESH_TOKEN]
+        self._fallback = config_entry.options.get(
+            CONF_FALLBACK, CONST_OVERLAY_TADO_DEFAULT
+        )
         self._debug = debug
 
         self.home_id: int
@@ -105,6 +107,18 @@ class TadoDataUpdateCoordinator(DataUpdateCoordinator[dict[str, dict]]):
         self.data["weather"] = home["weather"]
         self.data["geofence"] = home["geofence"]
 
+        refresh_token = await self.hass.async_add_executor_job(
+            self._tado.get_refresh_token
+        )
+
+        if refresh_token != self._refresh_token:
+            _LOGGER.debug("New refresh token obtained from Tado: %s", refresh_token)
+            self._refresh_token = refresh_token
+            self.hass.config_entries.async_update_entry(
+                self.config_entry,
+                data={**self.config_entry.data, CONF_REFRESH_TOKEN: refresh_token},
+            )
+
         return self.data
 
     async def _async_update_devices(self) -> dict[str, dict]:
@@ -339,20 +353,34 @@ class TadoDataUpdateCoordinator(DataUpdateCoordinator[dict[str, dict]]):
         except RequestException as err:
             raise UpdateFailed(f"Error setting Tado meter reading: {err}") from err
 
+    async def set_child_lock(self, device_id: str, enabled: bool) -> None:
+        """Set child lock of device."""
+        try:
+            await self.hass.async_add_executor_job(
+                self._tado.set_child_lock,
+                device_id,
+                enabled,
+            )
+        except RequestException as exc:
+            raise HomeAssistantError(f"Error setting Tado child lock: {exc}") from exc
+
 
 class TadoMobileDeviceUpdateCoordinator(DataUpdateCoordinator[dict[str, dict]]):
     """Class to manage the mobile devices from Tado via PyTado."""
 
+    config_entry: TadoConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
-        entry: ConfigEntry,
+        config_entry: TadoConfigEntry,
         tado: Tado,
     ) -> None:
         """Initialize the Tado data update coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=SCAN_MOBILE_DEVICE_INTERVAL,
         )
diff --git a/homeassistant/components/tado/device_tracker.py b/homeassistant/components/tado/device_tracker.py
index a9be560f434..34aca2dd833 100644
--- a/homeassistant/components/tado/device_tracker.py
+++ b/homeassistant/components/tado/device_tracker.py
@@ -11,7 +11,7 @@ from homeassistant.components.device_tracker import (
 from homeassistant.const import STATE_HOME, STATE_NOT_HOME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -27,7 +27,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TadoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tado device scannery entity."""
     _LOGGER.debug("Setting up Tado device scanner entity")
@@ -57,7 +57,7 @@ async def async_setup_entry(
 def add_tracked_entities(
     hass: HomeAssistant,
     coordinator: TadoMobileDeviceUpdateCoordinator,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     tracked: set[str],
 ) -> None:
     """Add new tracker entities from Tado."""
diff --git a/homeassistant/components/tado/helper.py b/homeassistant/components/tado/helper.py
index 571a757a3e8..5c515e00cf0 100644
--- a/homeassistant/components/tado/helper.py
+++ b/homeassistant/components/tado/helper.py
@@ -53,13 +53,13 @@ def decide_duration(
     return duration
 
 
-def generate_supported_fanmodes(tado_to_ha_mapping: dict[str, str], options: list[str]):
+def generate_supported_fanmodes(
+    tado_to_ha_mapping: dict[str, str], options: list[str]
+) -> list[str] | None:
     """Return correct list of fan modes or None."""
 
     supported_fanmodes = [
-        tado_to_ha_mapping.get(option)
-        for option in options
-        if tado_to_ha_mapping.get(option) is not None
+        val for option in options if (val := tado_to_ha_mapping.get(option)) is not None
     ]
     if not supported_fanmodes:
         return None
diff --git a/homeassistant/components/tado/icons.json b/homeassistant/components/tado/icons.json
index c799bef0260..65b86359950 100644
--- a/homeassistant/components/tado/icons.json
+++ b/homeassistant/components/tado/icons.json
@@ -1,4 +1,14 @@
 {
+  "entity": {
+    "switch": {
+      "child_lock": {
+        "default": "mdi:lock-open-variant",
+        "state": {
+          "on": "mdi:lock"
+        }
+      }
+    }
+  },
   "services": {
     "set_climate_timer": {
       "service": "mdi:timer"
diff --git a/homeassistant/components/tado/manifest.json b/homeassistant/components/tado/manifest.json
index 856a0c5402b..75ddbacc585 100644
--- a/homeassistant/components/tado/manifest.json
+++ b/homeassistant/components/tado/manifest.json
@@ -14,5 +14,5 @@
   },
   "iot_class": "cloud_polling",
   "loggers": ["PyTado"],
-  "requirements": ["python-tado==0.18.5"]
+  "requirements": ["python-tado==0.18.9"]
 }
diff --git a/homeassistant/components/tado/sensor.py b/homeassistant/components/tado/sensor.py
index 037b33574e7..d0d54e79670 100644
--- a/homeassistant/components/tado/sensor.py
+++ b/homeassistant/components/tado/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import TadoConfigEntry
@@ -191,7 +191,9 @@ ZONE_SENSORS = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TadoConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TadoConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tado sensor platform."""
 
diff --git a/homeassistant/components/tado/strings.json b/homeassistant/components/tado/strings.json
index 8124570f9c9..53de3969998 100644
--- a/homeassistant/components/tado/strings.json
+++ b/homeassistant/components/tado/strings.json
@@ -1,39 +1,34 @@
 {
   "config": {
+    "progress": {
+      "wait_for_device": "To authenticate, open the following URL and login at Tado:\n{url}\nIf the code is not automatically copied, paste the following code to authorize the integration:\n\n```{code}```\n\n\nThe login attempt will time out after five minutes."
+    },
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
+      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
+      "could_not_authenticate": "Could not authenticate with Tado.",
+      "no_homes": "There are no homes linked to this Tado account.",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     },
     "step": {
-      "user": {
-        "data": {
-          "password": "[%key:common::config_flow::data::password%]",
-          "username": "[%key:common::config_flow::data::username%]"
-        },
-        "title": "Connect to your Tado account"
+      "reauth_confirm": {
+        "title": "Authenticate with Tado",
+        "description": "You need to reauthenticate with Tado. Press `Submit` to start the authentication process."
       },
-      "reconfigure": {
-        "title": "Reconfigure your Tado",
-        "description": "Reconfigure the entry, for your account: `{username}`.",
-        "data": {
-          "password": "[%key:common::config_flow::data::password%]"
-        },
-        "data_description": {
-          "password": "Enter the (new) password for Tado."
-        }
+      "homekit": {
+        "title": "Authenticate with Tado",
+        "description": "Your device has been discovered and needs to authenticate with Tado. Press `Submit` to start the authentication process."
+      },
+      "timeout": {
+        "description": "The authentication process timed out. Please try again."
       }
-    },
-    "error": {
-      "unknown": "[%key:common::config_flow::error::unknown%]",
-      "no_homes": "There are no homes linked to this tado account.",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     }
   },
   "options": {
     "step": {
       "init": {
-        "description": "Fallback mode lets you choose when to fallback to Smart Schedule from your manual zone overlay. (NEXT_TIME_BLOCK:= Change at next Smart Schedule change; MANUAL:= Dont change until you cancel; TADO_DEFAULT:= Change based on your setting in Tado App).",
+        "description": "Fallback mode lets you choose when to fallback to Smart Schedule from your manual zone overlay. (NEXT_TIME_BLOCK:= Change at next Smart Schedule change; MANUAL:= Don't change until you cancel; TADO_DEFAULT:= Change based on your setting in the Tado app).",
         "data": {
           "fallback": "Choose fallback mode."
         },
@@ -64,6 +59,11 @@
         }
       }
     },
+    "switch": {
+      "child_lock": {
+        "name": "Child lock"
+      }
+    },
     "sensor": {
       "outdoor_temperature": {
         "name": "Outdoor temperature"
@@ -102,11 +102,11 @@
         },
         "time_period": {
           "name": "Time period",
-          "description": "Choose this or Overlay. Set the time period for the change if you want to be specific. Alternatively use Overlay."
+          "description": "Choose this or 'Overlay'. Set the time period for the change if you want to be specific."
         },
         "requested_overlay": {
           "name": "Overlay",
-          "description": "Choose this or Time Period. Allows you to choose an overlay. MANUAL:=Overlay until user removes; NEXT_TIME_BLOCK:=Overlay until next timeblock; TADO_DEFAULT:=Overlay based on tado app setting."
+          "description": "Choose this or 'Time period'. Allows you to choose an overlay. MANUAL:=Overlay until user removes; NEXT_TIME_BLOCK:=Overlay until next timeblock; TADO_DEFAULT:=Overlay based on Tado app setting."
         }
       }
     },
@@ -135,12 +135,12 @@
       }
     },
     "add_meter_reading": {
-      "name": "Add meter readings",
-      "description": "Add meter readings to Tado Energy IQ.",
+      "name": "Add meter reading",
+      "description": "Adds a meter reading to Tado Energy IQ.",
       "fields": {
         "config_entry": {
           "name": "Config Entry",
-          "description": "Config entry to add meter readings to."
+          "description": "Config entry to add meter reading to."
         },
         "reading": {
           "name": "Reading",
@@ -151,8 +151,8 @@
   },
   "issues": {
     "water_heater_fallback": {
-      "title": "Tado Water Heater entities now support fallback options",
-      "description": "Due to added support for water heaters entities, these entities may use different overlay. Please configure integration entity and tado app water heater zone overlay options. Otherwise, please configure the integration entity and Tado app water heater zone overlay options (under Settings -> Rooms & Devices -> Hot Water)."
+      "title": "Tado water heater entities now support fallback options",
+      "description": "Due to added support for water heaters entities, these entities may use a different overlay. Please configure the integration entity and Tado app water heater zone overlay options (under Settings -> Rooms & Devices -> Hot Water)."
     }
   }
 }
diff --git a/homeassistant/components/tado/switch.py b/homeassistant/components/tado/switch.py
new file mode 100644
index 00000000000..b3f355462b8
--- /dev/null
+++ b/homeassistant/components/tado/switch.py
@@ -0,0 +1,88 @@
+"""Module for Tado child lock switch entity."""
+
+import logging
+from typing import Any
+
+from homeassistant.components.switch import SwitchEntity
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import TadoConfigEntry
+from .entity import TadoDataUpdateCoordinator, TadoZoneEntity
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: TadoConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the Tado switch platform."""
+
+    tado = entry.runtime_data.coordinator
+    entities: list[TadoChildLockSwitchEntity] = []
+    for zone in tado.zones:
+        zoneChildLockSupported = (
+            len(zone["devices"]) > 0 and "childLockEnabled" in zone["devices"][0]
+        )
+
+        if not zoneChildLockSupported:
+            continue
+
+        entities.append(
+            TadoChildLockSwitchEntity(
+                tado, zone["name"], zone["id"], zone["devices"][0]
+            )
+        )
+    async_add_entities(entities, True)
+
+
+class TadoChildLockSwitchEntity(TadoZoneEntity, SwitchEntity):
+    """Representation of a Tado child lock switch entity."""
+
+    _attr_translation_key = "child_lock"
+
+    def __init__(
+        self,
+        coordinator: TadoDataUpdateCoordinator,
+        zone_name: str,
+        zone_id: int,
+        device_info: dict[str, Any],
+    ) -> None:
+        """Initialize the Tado child lock switch entity."""
+        super().__init__(zone_name, coordinator.home_id, zone_id, coordinator)
+
+        self._device_info = device_info
+        self._device_id = self._device_info["shortSerialNo"]
+        self._attr_unique_id = f"{zone_id} {coordinator.home_id} child-lock"
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the entity on."""
+        await self.coordinator.set_child_lock(self._device_id, True)
+        await self.coordinator.async_request_refresh()
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the entity off."""
+        await self.coordinator.set_child_lock(self._device_id, False)
+        await self.coordinator.async_request_refresh()
+
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
+        self._async_update_callback()
+        super()._handle_coordinator_update()
+
+    @callback
+    def _async_update_callback(self) -> None:
+        """Handle update callbacks."""
+        try:
+            self._device_info = self.coordinator.data["device"][self._device_id]
+        except KeyError:
+            _LOGGER.error(
+                "Could not update child lock info for device %s in zone %s",
+                self._device_id,
+                self.zone_name,
+            )
+        else:
+            self._attr_is_on = self._device_info.get("childLockEnabled", False) is True
diff --git a/homeassistant/components/tado/water_heater.py b/homeassistant/components/tado/water_heater.py
index 02fbb3f5e23..3d8825b264f 100644
--- a/homeassistant/components/tado/water_heater.py
+++ b/homeassistant/components/tado/water_heater.py
@@ -12,7 +12,7 @@ from homeassistant.components.water_heater import (
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import VolDictType
 
 from . import TadoConfigEntry
@@ -61,7 +61,9 @@ WATER_HEATER_TIMER_SCHEMA: VolDictType = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TadoConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TadoConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tado water heater platform."""
 
diff --git a/homeassistant/components/tag/__init__.py b/homeassistant/components/tag/__init__.py
index 47c1d14ce60..8d42596d3db 100644
--- a/homeassistant/components/tag/__init__.py
+++ b/homeassistant/components/tag/__init__.py
@@ -13,14 +13,16 @@ from homeassistant.components import websocket_api
 from homeassistant.const import CONF_ID, CONF_NAME
 from homeassistant.core import Context, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import collection, entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import (
+    collection,
+    config_validation as cv,
+    entity_registry as er,
+)
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.typing import ConfigType, VolDictType
-from homeassistant.util import slugify
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util, slugify
 from homeassistant.util.hass_dict import HassKey
 
 from .const import DEFAULT_NAME, DEVICE_ID, DOMAIN, EVENT_TAG_SCANNED, LOGGER, TAG_ID
diff --git a/homeassistant/components/tailscale/binary_sensor.py b/homeassistant/components/tailscale/binary_sensor.py
index 981f871de09..6569b40ada2 100644
--- a/homeassistant/components/tailscale/binary_sensor.py
+++ b/homeassistant/components/tailscale/binary_sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import TailscaleEntity
@@ -84,7 +84,7 @@ BINARY_SENSORS: tuple[TailscaleBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Tailscale binary sensors based on a config entry."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/tailscale/coordinator.py b/homeassistant/components/tailscale/coordinator.py
index 64ce0147664..1b29cfbf4be 100644
--- a/homeassistant/components/tailscale/coordinator.py
+++ b/homeassistant/components/tailscale/coordinator.py
@@ -19,18 +19,22 @@ class TailscaleDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Device]]):
 
     config_entry: ConfigEntry
 
-    def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
+    def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
         """Initialize the Tailscale coordinator."""
-        self.config_entry = entry
-
         session = async_get_clientsession(hass)
         self.tailscale = Tailscale(
             session=session,
-            api_key=entry.data[CONF_API_KEY],
-            tailnet=entry.data[CONF_TAILNET],
+            api_key=config_entry.data[CONF_API_KEY],
+            tailnet=config_entry.data[CONF_TAILNET],
         )
 
-        super().__init__(hass, LOGGER, name=DOMAIN, update_interval=SCAN_INTERVAL)
+        super().__init__(
+            hass,
+            LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=SCAN_INTERVAL,
+        )
 
     async def _async_update_data(self) -> dict[str, Device]:
         """Fetch devices from Tailscale."""
diff --git a/homeassistant/components/tailscale/sensor.py b/homeassistant/components/tailscale/sensor.py
index fa4c966a7d7..cf944aa73ef 100644
--- a/homeassistant/components/tailscale/sensor.py
+++ b/homeassistant/components/tailscale/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import TailscaleEntity
@@ -55,7 +55,7 @@ SENSORS: tuple[TailscaleSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Tailscale sensors based on a config entry."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/tailwind/binary_sensor.py b/homeassistant/components/tailwind/binary_sensor.py
index d2f8e1e2ced..4d927b0769e 100644
--- a/homeassistant/components/tailwind/binary_sensor.py
+++ b/homeassistant/components/tailwind/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import TailwindConfigEntry
 from .entity import TailwindDoorEntity
@@ -41,7 +41,7 @@ DESCRIPTIONS: tuple[TailwindDoorBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TailwindConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tailwind binary sensor based on a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/tailwind/button.py b/homeassistant/components/tailwind/button.py
index edff3434866..380eb7ccd7e 100644
--- a/homeassistant/components/tailwind/button.py
+++ b/homeassistant/components/tailwind/button.py
@@ -16,7 +16,7 @@ from homeassistant.components.button import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import TailwindConfigEntry
@@ -43,7 +43,7 @@ DESCRIPTIONS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TailwindConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tailwind button based on a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/tailwind/cover.py b/homeassistant/components/tailwind/cover.py
index 8ea1c7d4f6d..84f38c7d579 100644
--- a/homeassistant/components/tailwind/cover.py
+++ b/homeassistant/components/tailwind/cover.py
@@ -20,7 +20,7 @@ from homeassistant.components.cover import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, LOGGER
 from .coordinator import TailwindConfigEntry
@@ -30,7 +30,7 @@ from .entity import TailwindDoorEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TailwindConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tailwind cover based on a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/tailwind/number.py b/homeassistant/components/tailwind/number.py
index b67df9a6a25..ca6b610c351 100644
--- a/homeassistant/components/tailwind/number.py
+++ b/homeassistant/components/tailwind/number.py
@@ -12,7 +12,7 @@ from homeassistant.components.number import NumberEntity, NumberEntityDescriptio
 from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import TailwindConfigEntry
@@ -47,7 +47,7 @@ DESCRIPTIONS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TailwindConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tailwind number based on a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/tami4/__init__.py b/homeassistant/components/tami4/__init__.py
index 8c597409c77..8b9a5e1a90f 100644
--- a/homeassistant/components/tami4/__init__.py
+++ b/homeassistant/components/tami4/__init__.py
@@ -26,7 +26,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     except exceptions.TokenRefreshFailedException as ex:
         raise ConfigEntryNotReady("Error connecting to API") from ex
 
-    coordinator = Tami4EdgeCoordinator(hass, api)
+    coordinator = Tami4EdgeCoordinator(hass, entry, api)
     await coordinator.async_config_entry_first_refresh()
 
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {
diff --git a/homeassistant/components/tami4/button.py b/homeassistant/components/tami4/button.py
index 11377a2dcfb..a1b8db79674 100644
--- a/homeassistant/components/tami4/button.py
+++ b/homeassistant/components/tami4/button.py
@@ -11,7 +11,7 @@ from homeassistant.components.button import ButtonEntity, ButtonEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import API, DOMAIN
 from .entity import Tami4EdgeBaseEntity
@@ -41,7 +41,9 @@ BOIL_WATER_BUTTON = Tami4EdgeButtonEntityDescription(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Perform the setup for Tami4Edge."""
 
diff --git a/homeassistant/components/tami4/config_flow.py b/homeassistant/components/tami4/config_flow.py
index 72b19470f45..a58c801c403 100644
--- a/homeassistant/components/tami4/config_flow.py
+++ b/homeassistant/components/tami4/config_flow.py
@@ -11,7 +11,7 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import CONF_PHONE, CONF_REFRESH_TOKEN, DOMAIN
 
diff --git a/homeassistant/components/tami4/coordinator.py b/homeassistant/components/tami4/coordinator.py
index 4764562bc34..f65c819b3d8 100644
--- a/homeassistant/components/tami4/coordinator.py
+++ b/homeassistant/components/tami4/coordinator.py
@@ -7,6 +7,7 @@ import logging
 from Tami4EdgeAPI import Tami4EdgeAPI, exceptions
 from Tami4EdgeAPI.water_quality import WaterQuality
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -36,11 +37,16 @@ class FlattenedWaterQuality:
 class Tami4EdgeCoordinator(DataUpdateCoordinator[FlattenedWaterQuality]):
     """Tami4Edge water quality coordinator."""
 
-    def __init__(self, hass: HomeAssistant, api: Tami4EdgeAPI) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, api: Tami4EdgeAPI
+    ) -> None:
         """Initialize the water quality coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="Tami4Edge water quality coordinator",
             update_interval=timedelta(minutes=60),
         )
diff --git a/homeassistant/components/tami4/sensor.py b/homeassistant/components/tami4/sensor.py
index 888acda9372..2bfd3079c19 100644
--- a/homeassistant/components/tami4/sensor.py
+++ b/homeassistant/components/tami4/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfVolume
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import API, COORDINATOR, DOMAIN
@@ -52,7 +52,9 @@ ENTITY_DESCRIPTIONS = [
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Perform the setup for Tami4Edge."""
     data = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/tank_utility/sensor.py b/homeassistant/components/tank_utility/sensor.py
index 6d4327a1d06..e9377e346d4 100644
--- a/homeassistant/components/tank_utility/sensor.py
+++ b/homeassistant/components/tank_utility/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_DEVICES, CONF_EMAIL, CONF_PASSWORD, PERCENTAGE
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/tankerkoenig/__init__.py b/homeassistant/components/tankerkoenig/__init__.py
index a500549a648..b2b60db9675 100644
--- a/homeassistant/components/tankerkoenig/__init__.py
+++ b/homeassistant/components/tankerkoenig/__init__.py
@@ -17,11 +17,7 @@ async def async_setup_entry(
     """Set a tankerkoenig configuration entry up."""
     hass.data.setdefault(DOMAIN, {})
 
-    coordinator = TankerkoenigDataUpdateCoordinator(
-        hass,
-        name=entry.unique_id or DOMAIN,
-        update_interval=DEFAULT_SCAN_INTERVAL,
-    )
+    coordinator = TankerkoenigDataUpdateCoordinator(hass, entry, DEFAULT_SCAN_INTERVAL)
     await coordinator.async_setup()
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/tankerkoenig/binary_sensor.py b/homeassistant/components/tankerkoenig/binary_sensor.py
index 774262a8854..a38266e57e8 100644
--- a/homeassistant/components/tankerkoenig/binary_sensor.py
+++ b/homeassistant/components/tankerkoenig/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import ATTR_LATITUDE, ATTR_LONGITUDE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import TankerkoenigConfigEntry, TankerkoenigDataUpdateCoordinator
 from .entity import TankerkoenigCoordinatorEntity
@@ -23,7 +23,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TankerkoenigConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the tankerkoenig binary sensors."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/tankerkoenig/config_flow.py b/homeassistant/components/tankerkoenig/config_flow.py
index 509f293665d..b269eaaaf55 100644
--- a/homeassistant/components/tankerkoenig/config_flow.py
+++ b/homeassistant/components/tankerkoenig/config_flow.py
@@ -31,15 +31,15 @@ from homeassistant.const import (
     UnitOfLength,
 )
 from homeassistant.core import callback
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.selector import (
     LocationSelector,
     NumberSelector,
     NumberSelectorConfig,
 )
 
-from .const import CONF_FUEL_TYPES, CONF_STATIONS, DEFAULT_RADIUS, DOMAIN, FUEL_TYPES
+from .const import CONF_STATIONS, DEFAULT_RADIUS, DOMAIN
 
 
 async def async_get_nearby_stations(
@@ -175,10 +175,6 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
                     vol.Required(
                         CONF_API_KEY, default=user_input.get(CONF_API_KEY, "")
                     ): cv.string,
-                    vol.Required(
-                        CONF_FUEL_TYPES,
-                        default=user_input.get(CONF_FUEL_TYPES, list(FUEL_TYPES)),
-                    ): cv.multi_select(FUEL_TYPES),
                     vol.Required(
                         CONF_LOCATION,
                         default=user_input.get(
diff --git a/homeassistant/components/tankerkoenig/const.py b/homeassistant/components/tankerkoenig/const.py
index c2a1dba9b6a..6761d20f4ce 100644
--- a/homeassistant/components/tankerkoenig/const.py
+++ b/homeassistant/components/tankerkoenig/const.py
@@ -3,14 +3,11 @@
 DOMAIN = "tankerkoenig"
 NAME = "tankerkoenig"
 
-CONF_FUEL_TYPES = "fuel_types"
 CONF_STATIONS = "stations"
 
 DEFAULT_RADIUS = 2
 DEFAULT_SCAN_INTERVAL = 30
 
-FUEL_TYPES = {"e5": "Super", "e10": "Super E10", "diesel": "Diesel"}
-
 ATTR_BRAND = "brand"
 ATTR_CITY = "city"
 ATTR_FUEL_TYPE = "fuel_type"
diff --git a/homeassistant/components/tankerkoenig/coordinator.py b/homeassistant/components/tankerkoenig/coordinator.py
index 17e94f62fe9..f1e6bc8c865 100644
--- a/homeassistant/components/tankerkoenig/coordinator.py
+++ b/homeassistant/components/tankerkoenig/coordinator.py
@@ -24,7 +24,7 @@ from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import CONF_FUEL_TYPES, CONF_STATIONS
+from .const import CONF_STATIONS, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -39,7 +39,7 @@ class TankerkoenigDataUpdateCoordinator(DataUpdateCoordinator[dict[str, PriceInf
     def __init__(
         self,
         hass: HomeAssistant,
-        name: str,
+        config_entry: TankerkoenigConfigEntry,
         update_interval: int,
     ) -> None:
         """Initialize the data object."""
@@ -47,13 +47,13 @@ class TankerkoenigDataUpdateCoordinator(DataUpdateCoordinator[dict[str, PriceInf
         super().__init__(
             hass=hass,
             logger=_LOGGER,
-            name=name,
+            config_entry=config_entry,
+            name=config_entry.unique_id or DOMAIN,
             update_interval=timedelta(minutes=update_interval),
         )
 
         self._selected_stations: list[str] = self.config_entry.data[CONF_STATIONS]
         self.stations: dict[str, Station] = {}
-        self.fuel_types: list[str] = self.config_entry.data[CONF_FUEL_TYPES]
         self.show_on_map: bool = self.config_entry.options[CONF_SHOW_ON_MAP]
 
         self._tankerkoenig = Tankerkoenig(
diff --git a/homeassistant/components/tankerkoenig/sensor.py b/homeassistant/components/tankerkoenig/sensor.py
index 5970f3d3b24..b1646489d96 100644
--- a/homeassistant/components/tankerkoenig/sensor.py
+++ b/homeassistant/components/tankerkoenig/sensor.py
@@ -9,7 +9,7 @@ from aiotankerkoenig import GasType, Station
 from homeassistant.components.sensor import SensorEntity, SensorStateClass
 from homeassistant.const import ATTR_LATITUDE, ATTR_LONGITUDE, CURRENCY_EURO
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     ATTR_BRAND,
@@ -30,7 +30,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TankerkoenigConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the tankerkoenig sensors."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/tankerkoenig/strings.json b/homeassistant/components/tankerkoenig/strings.json
index 29f4f439dd5..db620b2b11c 100644
--- a/homeassistant/components/tankerkoenig/strings.json
+++ b/homeassistant/components/tankerkoenig/strings.json
@@ -5,7 +5,6 @@
         "data": {
           "name": "Region name",
           "api_key": "[%key:common::config_flow::data::api_key%]",
-          "fuel_types": "Fuel types",
           "location": "[%key:common::config_flow::data::location%]",
           "stations": "Additional fuel stations",
           "radius": "Search radius"
diff --git a/homeassistant/components/tapsaff/binary_sensor.py b/homeassistant/components/tapsaff/binary_sensor.py
index 0eb612bdc8e..beba9c91538 100644
--- a/homeassistant/components/tapsaff/binary_sensor.py
+++ b/homeassistant/components/tapsaff/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import CONF_LOCATION, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/tasmota/binary_sensor.py b/homeassistant/components/tasmota/binary_sensor.py
index 8a4b501af05..3b2e640b807 100644
--- a/homeassistant/components/tasmota/binary_sensor.py
+++ b/homeassistant/components/tasmota/binary_sensor.py
@@ -14,9 +14,9 @@ from homeassistant.components import binary_sensor
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import event as evt
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.helpers.event as evt
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DATA_REMOVE_DISCOVER_COMPONENT
 from .discovery import TASMOTA_DISCOVERY_ENTITY_NEW
@@ -26,7 +26,7 @@ from .entity import TasmotaAvailability, TasmotaDiscoveryUpdate
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tasmota binary sensor dynamically through discovery."""
 
diff --git a/homeassistant/components/tasmota/cover.py b/homeassistant/components/tasmota/cover.py
index 2cb3cfeea25..1d7aa8316b6 100644
--- a/homeassistant/components/tasmota/cover.py
+++ b/homeassistant/components/tasmota/cover.py
@@ -18,7 +18,7 @@ from homeassistant.components.cover import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DATA_REMOVE_DISCOVER_COMPONENT
 from .discovery import TASMOTA_DISCOVERY_ENTITY_NEW
@@ -28,7 +28,7 @@ from .entity import TasmotaAvailability, TasmotaDiscoveryUpdate
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tasmota cover dynamically through discovery."""
 
diff --git a/homeassistant/components/tasmota/fan.py b/homeassistant/components/tasmota/fan.py
index e927bd6ad72..c89b36577be 100644
--- a/homeassistant/components/tasmota/fan.py
+++ b/homeassistant/components/tasmota/fan.py
@@ -16,7 +16,7 @@ from homeassistant.components.fan import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     ordered_list_item_to_percentage,
     percentage_to_ordered_list_item,
@@ -36,7 +36,7 @@ ORDERED_NAMED_FAN_SPEEDS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tasmota fan dynamically through discovery."""
 
diff --git a/homeassistant/components/tasmota/light.py b/homeassistant/components/tasmota/light.py
index a06e77eceb1..ed66fa128dc 100644
--- a/homeassistant/components/tasmota/light.py
+++ b/homeassistant/components/tasmota/light.py
@@ -31,7 +31,7 @@ from homeassistant.components.light import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import color as color_util
 
 from .const import DATA_REMOVE_DISCOVER_COMPONENT
@@ -45,7 +45,7 @@ TASMOTA_BRIGHTNESS_MAX = 100
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tasmota light dynamically through discovery."""
 
diff --git a/homeassistant/components/tasmota/manifest.json b/homeassistant/components/tasmota/manifest.json
index 783483c6ffd..2e0d8af2338 100644
--- a/homeassistant/components/tasmota/manifest.json
+++ b/homeassistant/components/tasmota/manifest.json
@@ -8,5 +8,5 @@
   "iot_class": "local_push",
   "loggers": ["hatasmota"],
   "mqtt": ["tasmota/discovery/#"],
-  "requirements": ["HATasmota==0.9.2"]
+  "requirements": ["HATasmota==0.10.0"]
 }
diff --git a/homeassistant/components/tasmota/sensor.py b/homeassistant/components/tasmota/sensor.py
index 8cc538e706a..ec20e1c0348 100644
--- a/homeassistant/components/tasmota/sensor.py
+++ b/homeassistant/components/tasmota/sensor.py
@@ -40,7 +40,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DATA_REMOVE_DISCOVER_COMPONENT
 from .discovery import TASMOTA_DISCOVERY_ENTITY_NEW
@@ -243,7 +243,7 @@ SENSOR_UNIT_MAP = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tasmota sensor dynamically through discovery."""
 
diff --git a/homeassistant/components/tasmota/switch.py b/homeassistant/components/tasmota/switch.py
index b5c19fc2431..03e594b125c 100644
--- a/homeassistant/components/tasmota/switch.py
+++ b/homeassistant/components/tasmota/switch.py
@@ -11,7 +11,7 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DATA_REMOVE_DISCOVER_COMPONENT
 from .discovery import TASMOTA_DISCOVERY_ENTITY_NEW
@@ -21,7 +21,7 @@ from .entity import TasmotaAvailability, TasmotaDiscoveryUpdate, TasmotaOnOffEnt
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tasmota switch dynamically through discovery."""
 
diff --git a/homeassistant/components/tautulli/__init__.py b/homeassistant/components/tautulli/__init__.py
index a031354ae7d..41089016fac 100644
--- a/homeassistant/components/tautulli/__init__.py
+++ b/homeassistant/components/tautulli/__init__.py
@@ -4,15 +4,13 @@ from __future__ import annotations
 
 from pytautulli import PyTautulli, PyTautulliHostConfiguration
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_URL, CONF_VERIFY_SSL, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .coordinator import TautulliDataUpdateCoordinator
+from .coordinator import TautulliConfigEntry, TautulliDataUpdateCoordinator
 
 PLATFORMS = [Platform.SENSOR]
-type TautulliConfigEntry = ConfigEntry[TautulliDataUpdateCoordinator]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: TautulliConfigEntry) -> bool:
@@ -27,7 +25,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: TautulliConfigEntry) ->
         session=async_get_clientsession(hass, entry.data[CONF_VERIFY_SSL]),
     )
     entry.runtime_data = TautulliDataUpdateCoordinator(
-        hass, host_configuration, api_client
+        hass, entry, host_configuration, api_client
     )
     await entry.runtime_data.async_config_entry_first_refresh()
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
diff --git a/homeassistant/components/tautulli/coordinator.py b/homeassistant/components/tautulli/coordinator.py
index f392ab8df03..5d0f26b83b6 100644
--- a/homeassistant/components/tautulli/coordinator.py
+++ b/homeassistant/components/tautulli/coordinator.py
@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import asyncio
 from datetime import timedelta
-from typing import TYPE_CHECKING
 
 from pytautulli import (
     PyTautulli,
@@ -18,14 +17,14 @@ from pytautulli.exceptions import (
 )
 from pytautulli.models.host_configuration import PyTautulliHostConfiguration
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN, LOGGER
 
-if TYPE_CHECKING:
-    from . import TautulliConfigEntry
+type TautulliConfigEntry = ConfigEntry[TautulliDataUpdateCoordinator]
 
 
 class TautulliDataUpdateCoordinator(DataUpdateCoordinator[None]):
@@ -36,6 +35,7 @@ class TautulliDataUpdateCoordinator(DataUpdateCoordinator[None]):
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: TautulliConfigEntry,
         host_configuration: PyTautulliHostConfiguration,
         api_client: PyTautulli,
     ) -> None:
@@ -43,6 +43,7 @@ class TautulliDataUpdateCoordinator(DataUpdateCoordinator[None]):
         super().__init__(
             hass=hass,
             logger=LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=10),
         )
diff --git a/homeassistant/components/tautulli/sensor.py b/homeassistant/components/tautulli/sensor.py
index cd21630031a..c8d35623c21 100644
--- a/homeassistant/components/tautulli/sensor.py
+++ b/homeassistant/components/tautulli/sensor.py
@@ -23,12 +23,14 @@ from homeassistant.config_entries import SOURCE_IMPORT
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfInformation
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, StateType
 
-from . import TautulliConfigEntry
 from .const import ATTR_TOP_USER, DOMAIN
-from .coordinator import TautulliDataUpdateCoordinator
+from .coordinator import TautulliConfigEntry, TautulliDataUpdateCoordinator
 from .entity import TautulliEntity
 
 
@@ -213,7 +215,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TautulliConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tautulli sensor."""
     data = entry.runtime_data
diff --git a/homeassistant/components/tcp/common.py b/homeassistant/components/tcp/common.py
index a89cd999ddd..1263effa96b 100644
--- a/homeassistant/components/tcp/common.py
+++ b/homeassistant/components/tcp/common.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
     CONF_VALUE_TEMPLATE,
     CONF_VERIFY_SSL,
 )
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import (
     CONF_BUFFER_SIZE,
diff --git a/homeassistant/components/technove/__init__.py b/homeassistant/components/technove/__init__.py
index b886dabc80c..df4fc7713aa 100644
--- a/homeassistant/components/technove/__init__.py
+++ b/homeassistant/components/technove/__init__.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-from .coordinator import TechnoVEDataUpdateCoordinator
+from .coordinator import TechnoVEConfigEntry, TechnoVEDataUpdateCoordinator
 
 PLATFORMS = [Platform.BINARY_SENSOR, Platform.NUMBER, Platform.SENSOR, Platform.SWITCH]
 
-TechnoVEConfigEntry = ConfigEntry[TechnoVEDataUpdateCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: TechnoVEConfigEntry) -> bool:
     """Set up TechnoVE from a config entry."""
@@ -25,6 +22,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: TechnoVEConfigEntry) ->
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: TechnoVEConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/technove/binary_sensor.py b/homeassistant/components/technove/binary_sensor.py
index f231e206c96..ac52a19884e 100644
--- a/homeassistant/components/technove/binary_sensor.py
+++ b/homeassistant/components/technove/binary_sensor.py
@@ -14,10 +14,9 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import TechnoVEConfigEntry
-from .coordinator import TechnoVEDataUpdateCoordinator
+from .coordinator import TechnoVEConfigEntry, TechnoVEDataUpdateCoordinator
 from .entity import TechnoVEEntity
 
 
@@ -66,7 +65,7 @@ BINARY_SENSORS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TechnoVEConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the binary sensor platform."""
     async_add_entities(
diff --git a/homeassistant/components/technove/coordinator.py b/homeassistant/components/technove/coordinator.py
index 8527c6e543a..53108463301 100644
--- a/homeassistant/components/technove/coordinator.py
+++ b/homeassistant/components/technove/coordinator.py
@@ -2,10 +2,9 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from technove import Station as TechnoVEStation, TechnoVE, TechnoVEError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -13,22 +12,24 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .const import DOMAIN, LOGGER, SCAN_INTERVAL
 
-if TYPE_CHECKING:
-    from . import TechnoVEConfigEntry
+type TechnoVEConfigEntry = ConfigEntry[TechnoVEDataUpdateCoordinator]
 
 
 class TechnoVEDataUpdateCoordinator(DataUpdateCoordinator[TechnoVEStation]):
     """Class to manage fetching TechnoVE data from single endpoint."""
 
-    def __init__(self, hass: HomeAssistant, entry: TechnoVEConfigEntry) -> None:
+    config_entry: TechnoVEConfigEntry
+
+    def __init__(self, hass: HomeAssistant, config_entry: TechnoVEConfigEntry) -> None:
         """Initialize global TechnoVE data updater."""
         self.technove = TechnoVE(
-            entry.data[CONF_HOST],
+            config_entry.data[CONF_HOST],
             session=async_get_clientsession(hass),
         )
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/technove/diagnostics.py b/homeassistant/components/technove/diagnostics.py
index f070d58ab6f..7ac0f6f44fd 100644
--- a/homeassistant/components/technove/diagnostics.py
+++ b/homeassistant/components/technove/diagnostics.py
@@ -8,7 +8,7 @@ from typing import Any
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.core import HomeAssistant
 
-from . import TechnoVEConfigEntry
+from .coordinator import TechnoVEConfigEntry
 
 TO_REDACT = {"unique_id", "mac_address"}
 
diff --git a/homeassistant/components/technove/manifest.json b/homeassistant/components/technove/manifest.json
index 722aa4004e1..746c2280aaa 100644
--- a/homeassistant/components/technove/manifest.json
+++ b/homeassistant/components/technove/manifest.json
@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/technove",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "requirements": ["python-technove==1.3.1"],
+  "requirements": ["python-technove==2.0.0"],
   "zeroconf": ["_technove-stations._tcp.local."]
 }
diff --git a/homeassistant/components/technove/number.py b/homeassistant/components/technove/number.py
index a1cf094c6bf..11d8f281276 100644
--- a/homeassistant/components/technove/number.py
+++ b/homeassistant/components/technove/number.py
@@ -17,11 +17,10 @@ from homeassistant.components.number import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import TechnoVEConfigEntry
 from .const import DOMAIN
-from .coordinator import TechnoVEDataUpdateCoordinator
+from .coordinator import TechnoVEConfigEntry, TechnoVEDataUpdateCoordinator
 from .entity import TechnoVEEntity
 from .helpers import technove_exception_handler
 
@@ -66,7 +65,7 @@ NUMBERS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TechnoVEConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up TechnoVE number entity based on a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/technove/sensor.py b/homeassistant/components/technove/sensor.py
index e16ac23f89c..398c1911cd4 100644
--- a/homeassistant/components/technove/sensor.py
+++ b/homeassistant/components/technove/sensor.py
@@ -21,11 +21,10 @@ from homeassistant.const import (
     UnitOfEnergy,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import TechnoVEConfigEntry
-from .coordinator import TechnoVEDataUpdateCoordinator
+from .coordinator import TechnoVEConfigEntry, TechnoVEDataUpdateCoordinator
 from .entity import TechnoVEEntity
 
 STATUS_TYPE = [s.value for s in Status if s != Status.UNKNOWN]
@@ -122,7 +121,7 @@ SENSORS: tuple[TechnoVESensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TechnoVEConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor platform."""
     async_add_entities(
diff --git a/homeassistant/components/technove/strings.json b/homeassistant/components/technove/strings.json
index 9976f0b3c59..05260845a03 100644
--- a/homeassistant/components/technove/strings.json
+++ b/homeassistant/components/technove/strings.json
@@ -70,7 +70,7 @@
           "plugged_waiting": "Plugged, waiting",
           "plugged_charging": "Plugged, charging",
           "out_of_activation_period": "Out of activation period",
-          "high_charge_period": "High charge period"
+          "high_tariff_period": "High tariff period"
         }
       }
     },
diff --git a/homeassistant/components/technove/switch.py b/homeassistant/components/technove/switch.py
index a8ad7581da5..19688075b35 100644
--- a/homeassistant/components/technove/switch.py
+++ b/homeassistant/components/technove/switch.py
@@ -12,11 +12,10 @@ from homeassistant.components.switch import SwitchEntity, SwitchEntityDescriptio
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import TechnoVEConfigEntry
 from .const import DOMAIN
-from .coordinator import TechnoVEDataUpdateCoordinator
+from .coordinator import TechnoVEConfigEntry, TechnoVEDataUpdateCoordinator
 from .entity import TechnoVEEntity
 from .helpers import technove_exception_handler
 
@@ -80,7 +79,7 @@ SWITCHES = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TechnoVEConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up TechnoVE switch based on a config entry."""
 
diff --git a/homeassistant/components/tedee/binary_sensor.py b/homeassistant/components/tedee/binary_sensor.py
index 4f167619f04..a01b889ef8f 100644
--- a/homeassistant/components/tedee/binary_sensor.py
+++ b/homeassistant/components/tedee/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import TedeeConfigEntry
 from .entity import TedeeDescriptionEntity
@@ -64,7 +64,7 @@ ENTITIES: tuple[TedeeBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TedeeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tedee sensor entity."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/tedee/coordinator.py b/homeassistant/components/tedee/coordinator.py
index f9ebb29dd04..fec59d1c596 100644
--- a/homeassistant/components/tedee/coordinator.py
+++ b/homeassistant/components/tedee/coordinator.py
@@ -22,8 +22,8 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.device_registry as dr
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import CONF_LOCAL_ACCESS_TOKEN, DOMAIN
diff --git a/homeassistant/components/tedee/lock.py b/homeassistant/components/tedee/lock.py
index 482cd039a98..da6db242db3 100644
--- a/homeassistant/components/tedee/lock.py
+++ b/homeassistant/components/tedee/lock.py
@@ -7,7 +7,7 @@ from aiotedee import TedeeClientException, TedeeLock, TedeeLockState
 from homeassistant.components.lock import LockEntity, LockEntityFeature
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import TedeeApiCoordinator, TedeeConfigEntry
@@ -19,7 +19,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TedeeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tedee lock entity."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/tedee/sensor.py b/homeassistant/components/tedee/sensor.py
index 828793b4458..a697d36be50 100644
--- a/homeassistant/components/tedee/sensor.py
+++ b/homeassistant/components/tedee/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import TedeeConfigEntry
 from .entity import TedeeDescriptionEntity
@@ -53,7 +53,7 @@ ENTITIES: tuple[TedeeSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TedeeConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tedee sensor entity."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/telegram_bot/__init__.py b/homeassistant/components/telegram_bot/__init__.py
index f744265e1c2..15e1f7d4f0e 100644
--- a/homeassistant/components/telegram_bot/__init__.py
+++ b/homeassistant/components/telegram_bot/__init__.py
@@ -175,6 +175,7 @@ BASE_SERVICE_SCHEMA = vol.Schema(
         vol.Optional(ATTR_KEYBOARD_INLINE): cv.ensure_list,
         vol.Optional(ATTR_TIMEOUT): cv.positive_int,
         vol.Optional(ATTR_MESSAGE_TAG): cv.string,
+        vol.Optional(ATTR_MESSAGE_THREAD_ID): vol.Coerce(int),
     },
     extra=vol.ALLOW_EXTRA,
 )
@@ -216,6 +217,7 @@ SERVICE_SCHEMA_SEND_POLL = vol.Schema(
         vol.Optional(ATTR_ALLOWS_MULTIPLE_ANSWERS, default=False): cv.boolean,
         vol.Optional(ATTR_DISABLE_NOTIF): cv.boolean,
         vol.Optional(ATTR_TIMEOUT): cv.positive_int,
+        vol.Optional(ATTR_MESSAGE_THREAD_ID): vol.Coerce(int),
     }
 )
 
@@ -546,7 +548,7 @@ class TelegramNotificationService:
         """Initialize the service."""
         self.allowed_chat_ids = allowed_chat_ids
         self._default_user = self.allowed_chat_ids[0]
-        self._last_message_id = {user: None for user in self.allowed_chat_ids}
+        self._last_message_id = dict.fromkeys(self.allowed_chat_ids)
         self._parsers = {
             PARSER_HTML: ParseMode.HTML,
             PARSER_MD: ParseMode.MARKDOWN,
@@ -754,7 +756,8 @@ class TelegramNotificationService:
                 message_thread_id=params[ATTR_MESSAGE_THREAD_ID],
                 context=context,
             )
-            msg_ids[chat_id] = msg.id
+            if msg is not None:
+                msg_ids[chat_id] = msg.id
         return msg_ids
 
     async def delete_message(self, chat_id=None, context=None, **kwargs):
diff --git a/homeassistant/components/telegram_bot/strings.json b/homeassistant/components/telegram_bot/strings.json
index 714e7b74db0..8f4894f42a7 100644
--- a/homeassistant/components/telegram_bot/strings.json
+++ b/homeassistant/components/telegram_bot/strings.json
@@ -96,7 +96,7 @@
         },
         "verify_ssl": {
           "name": "Verify SSL",
-          "description": "Enable or disable SSL certificate verification. Set to false if you're downloading the file from a URL and you don't want to validate the SSL certificate of the server."
+          "description": "Enable or disable SSL certificate verification. Disable if you're downloading the file from a URL and you don't want to validate the SSL certificate of the server."
         },
         "timeout": {
           "name": "Read timeout",
@@ -530,11 +530,11 @@
         },
         "is_anonymous": {
           "name": "Is anonymous",
-          "description": "If the poll needs to be anonymous, defaults to True."
+          "description": "If the poll needs to be anonymous. This is the default."
         },
         "allows_multiple_answers": {
           "name": "Allow multiple answers",
-          "description": "If the poll allows multiple answers, defaults to False."
+          "description": "If the poll allows multiple answers."
         },
         "open_period": {
           "name": "Open period",
diff --git a/homeassistant/components/telegram_bot/webhooks.py b/homeassistant/components/telegram_bot/webhooks.py
index 3eb3c71a0bb..9bd360f5e41 100644
--- a/homeassistant/components/telegram_bot/webhooks.py
+++ b/homeassistant/components/telegram_bot/webhooks.py
@@ -109,13 +109,12 @@ class PushBot(BaseTelegramBotEntity):
         else:
             _LOGGER.debug("telegram webhook status: %s", current_status)
 
-        if current_status and current_status["url"] != self.webhook_url:
-            result = await self._try_to_set_webhook()
-            if result:
-                _LOGGER.debug("Set new telegram webhook %s", self.webhook_url)
-            else:
-                _LOGGER.error("Set telegram webhook failed %s", self.webhook_url)
-                return False
+        result = await self._try_to_set_webhook()
+        if result:
+            _LOGGER.debug("Set new telegram webhook %s", self.webhook_url)
+        else:
+            _LOGGER.error("Set telegram webhook failed %s", self.webhook_url)
+            return False
 
         return True
 
diff --git a/homeassistant/components/tellduslive/binary_sensor.py b/homeassistant/components/tellduslive/binary_sensor.py
index 33f936beb54..65301708646 100644
--- a/homeassistant/components/tellduslive/binary_sensor.py
+++ b/homeassistant/components/tellduslive/binary_sensor.py
@@ -5,7 +5,7 @@ from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, TELLDUS_DISCOVERY_NEW
 from .entity import TelldusLiveEntity
@@ -14,7 +14,7 @@ from .entity import TelldusLiveEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up tellduslive sensors dynamically."""
 
diff --git a/homeassistant/components/tellduslive/cover.py b/homeassistant/components/tellduslive/cover.py
index d55a72cd633..2554acc428c 100644
--- a/homeassistant/components/tellduslive/cover.py
+++ b/homeassistant/components/tellduslive/cover.py
@@ -7,7 +7,7 @@ from homeassistant.components.cover import CoverEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TelldusLiveClient
 from .const import DOMAIN, TELLDUS_DISCOVERY_NEW
@@ -17,7 +17,7 @@ from .entity import TelldusLiveEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up tellduslive sensors dynamically."""
 
diff --git a/homeassistant/components/tellduslive/entity.py b/homeassistant/components/tellduslive/entity.py
index a71fcb685c0..5366e4c27df 100644
--- a/homeassistant/components/tellduslive/entity.py
+++ b/homeassistant/components/tellduslive/entity.py
@@ -33,7 +33,7 @@ class TelldusLiveEntity(Entity):
         self._id = device_id
         self._client = client
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Call when entity is added to hass."""
         _LOGGER.debug("Created device %s", self)
         self.async_on_remove(
@@ -58,12 +58,12 @@ class TelldusLiveEntity(Entity):
         return self.device.state
 
     @property
-    def assumed_state(self):
+    def assumed_state(self) -> bool:
         """Return true if unable to access real state of entity."""
         return True
 
     @property
-    def available(self):
+    def available(self) -> bool:
         """Return true if device is not offline."""
         return self._client.is_available(self.device_id)
 
diff --git a/homeassistant/components/tellduslive/light.py b/homeassistant/components/tellduslive/light.py
index 005bf97d8c0..9f291bb845a 100644
--- a/homeassistant/components/tellduslive/light.py
+++ b/homeassistant/components/tellduslive/light.py
@@ -8,7 +8,7 @@ from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEnti
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, TELLDUS_DISCOVERY_NEW
 from .entity import TelldusLiveEntity
@@ -19,7 +19,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up tellduslive sensors dynamically."""
 
diff --git a/homeassistant/components/tellduslive/sensor.py b/homeassistant/components/tellduslive/sensor.py
index 9bd2b1fe599..782f240cc41 100644
--- a/homeassistant/components/tellduslive/sensor.py
+++ b/homeassistant/components/tellduslive/sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, TELLDUS_DISCOVERY_NEW
 from .entity import TelldusLiveEntity
@@ -121,7 +121,7 @@ SENSOR_TYPES: dict[str, SensorEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up tellduslive sensors dynamically."""
 
diff --git a/homeassistant/components/tellduslive/switch.py b/homeassistant/components/tellduslive/switch.py
index bd770ab08f5..3ca2ba066ab 100644
--- a/homeassistant/components/tellduslive/switch.py
+++ b/homeassistant/components/tellduslive/switch.py
@@ -7,7 +7,7 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, TELLDUS_DISCOVERY_NEW
 from .entity import TelldusLiveEntity
@@ -16,7 +16,7 @@ from .entity import TelldusLiveEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up tellduslive sensors dynamically."""
 
diff --git a/homeassistant/components/tellstick/__init__.py b/homeassistant/components/tellstick/__init__.py
index 9d120b7aaa8..6ccc1f14b5f 100644
--- a/homeassistant/components/tellstick/__init__.py
+++ b/homeassistant/components/tellstick/__init__.py
@@ -9,8 +9,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_HOST, CONF_PORT, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/tellstick/entity.py b/homeassistant/components/tellstick/entity.py
index 746c7f4dd4d..5be3d1f48f4 100644
--- a/homeassistant/components/tellstick/entity.py
+++ b/homeassistant/components/tellstick/entity.py
@@ -40,7 +40,7 @@ class TellstickDevice(Entity):
         self._attr_name = tellcore_device.name
         self._attr_unique_id = tellcore_device.id
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Register callbacks."""
         self.async_on_remove(
             async_dispatcher_connect(
@@ -146,6 +146,6 @@ class TellstickDevice(Entity):
             except TelldusError as err:
                 _LOGGER.error(err)
 
-    def update(self):
+    def update(self) -> None:
         """Poll the current state of the device."""
         self._update_from_tellcore()
diff --git a/homeassistant/components/tellstick/sensor.py b/homeassistant/components/tellstick/sensor.py
index 1e27511bd84..c777aa6f01f 100644
--- a/homeassistant/components/tellstick/sensor.py
+++ b/homeassistant/components/tellstick/sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/telnet/switch.py b/homeassistant/components/telnet/switch.py
index 0178a6521c4..0fa1076c943 100644
--- a/homeassistant/components/telnet/switch.py
+++ b/homeassistant/components/telnet/switch.py
@@ -26,7 +26,7 @@ from homeassistant.const import (
     CONF_VALUE_TEMPLATE,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/template/__init__.py b/homeassistant/components/template/__init__.py
index 7b7b5eb9b29..15a73cf3de5 100644
--- a/homeassistant/components/template/__init__.py
+++ b/homeassistant/components/template/__init__.py
@@ -53,6 +53,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
     async def _reload_config(call: Event | ServiceCall) -> None:
         """Reload top-level + platforms."""
+        await async_get_blueprints(hass).async_reset_cache()
         try:
             unprocessed_conf = await conf_util.async_hass_config_yaml(hass)
         except HomeAssistantError as err:
diff --git a/homeassistant/components/template/alarm_control_panel.py b/homeassistant/components/template/alarm_control_panel.py
index aa1f99f0423..40206a5ccbb 100644
--- a/homeassistant/components/template/alarm_control_panel.py
+++ b/homeassistant/components/template/alarm_control_panel.py
@@ -28,13 +28,14 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import TemplateError
-from homeassistant.helpers import selector
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, selector
 from homeassistant.helpers.device import async_device_info_to_link_from_device_id
 from homeassistant.helpers.entity import async_generate_entity_id
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.restore_state import RestoreEntity
-from homeassistant.helpers.script import Script
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import slugify
 
@@ -147,7 +148,7 @@ async def _async_create_entities(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize config entry."""
     _options = dict(config_entry.options)
@@ -197,70 +198,31 @@ class AlarmControlPanelTemplate(TemplateEntity, AlarmControlPanelEntity, Restore
         name = self._attr_name
         assert name is not None
         self._template = config.get(CONF_VALUE_TEMPLATE)
-        self._disarm_script = None
         self._attr_code_arm_required: bool = config[CONF_CODE_ARM_REQUIRED]
         self._attr_code_format = config[CONF_CODE_FORMAT].value
-        if (disarm_action := config.get(CONF_DISARM_ACTION)) is not None:
-            self._disarm_script = Script(hass, disarm_action, name, DOMAIN)
-        self._arm_away_script = None
-        if (arm_away_action := config.get(CONF_ARM_AWAY_ACTION)) is not None:
-            self._arm_away_script = Script(hass, arm_away_action, name, DOMAIN)
-        self._arm_home_script = None
-        if (arm_home_action := config.get(CONF_ARM_HOME_ACTION)) is not None:
-            self._arm_home_script = Script(hass, arm_home_action, name, DOMAIN)
-        self._arm_night_script = None
-        if (arm_night_action := config.get(CONF_ARM_NIGHT_ACTION)) is not None:
-            self._arm_night_script = Script(hass, arm_night_action, name, DOMAIN)
-        self._arm_vacation_script = None
-        if (arm_vacation_action := config.get(CONF_ARM_VACATION_ACTION)) is not None:
-            self._arm_vacation_script = Script(hass, arm_vacation_action, name, DOMAIN)
-        self._arm_custom_bypass_script = None
-        if (
-            arm_custom_bypass_action := config.get(CONF_ARM_CUSTOM_BYPASS_ACTION)
-        ) is not None:
-            self._arm_custom_bypass_script = Script(
-                hass, arm_custom_bypass_action, name, DOMAIN
-            )
-        self._trigger_script = None
-        if (trigger_action := config.get(CONF_TRIGGER_ACTION)) is not None:
-            self._trigger_script = Script(hass, trigger_action, name, DOMAIN)
+
+        self._attr_supported_features = AlarmControlPanelEntityFeature(0)
+        for action_id, supported_feature in (
+            (CONF_DISARM_ACTION, 0),
+            (CONF_ARM_AWAY_ACTION, AlarmControlPanelEntityFeature.ARM_AWAY),
+            (CONF_ARM_HOME_ACTION, AlarmControlPanelEntityFeature.ARM_HOME),
+            (CONF_ARM_NIGHT_ACTION, AlarmControlPanelEntityFeature.ARM_NIGHT),
+            (CONF_ARM_VACATION_ACTION, AlarmControlPanelEntityFeature.ARM_VACATION),
+            (
+                CONF_ARM_CUSTOM_BYPASS_ACTION,
+                AlarmControlPanelEntityFeature.ARM_CUSTOM_BYPASS,
+            ),
+            (CONF_TRIGGER_ACTION, AlarmControlPanelEntityFeature.TRIGGER),
+        ):
+            if action_config := config.get(action_id):
+                self.add_script(action_id, action_config, name, DOMAIN)
+                self._attr_supported_features |= supported_feature
 
         self._state: AlarmControlPanelState | None = None
         self._attr_device_info = async_device_info_to_link_from_device_id(
             hass,
             config.get(CONF_DEVICE_ID),
         )
-        supported_features = AlarmControlPanelEntityFeature(0)
-        if self._arm_night_script is not None:
-            supported_features = (
-                supported_features | AlarmControlPanelEntityFeature.ARM_NIGHT
-            )
-
-        if self._arm_home_script is not None:
-            supported_features = (
-                supported_features | AlarmControlPanelEntityFeature.ARM_HOME
-            )
-
-        if self._arm_away_script is not None:
-            supported_features = (
-                supported_features | AlarmControlPanelEntityFeature.ARM_AWAY
-            )
-
-        if self._arm_vacation_script is not None:
-            supported_features = (
-                supported_features | AlarmControlPanelEntityFeature.ARM_VACATION
-            )
-
-        if self._arm_custom_bypass_script is not None:
-            supported_features = (
-                supported_features | AlarmControlPanelEntityFeature.ARM_CUSTOM_BYPASS
-            )
-
-        if self._trigger_script is not None:
-            supported_features = (
-                supported_features | AlarmControlPanelEntityFeature.TRIGGER
-            )
-        self._attr_supported_features = supported_features
 
     async def async_added_to_hass(self) -> None:
         """Restore last state."""
@@ -328,7 +290,7 @@ class AlarmControlPanelTemplate(TemplateEntity, AlarmControlPanelEntity, Restore
         """Arm the panel to Away."""
         await self._async_alarm_arm(
             AlarmControlPanelState.ARMED_AWAY,
-            script=self._arm_away_script,
+            script=self._action_scripts.get(CONF_ARM_AWAY_ACTION),
             code=code,
         )
 
@@ -336,7 +298,7 @@ class AlarmControlPanelTemplate(TemplateEntity, AlarmControlPanelEntity, Restore
         """Arm the panel to Home."""
         await self._async_alarm_arm(
             AlarmControlPanelState.ARMED_HOME,
-            script=self._arm_home_script,
+            script=self._action_scripts.get(CONF_ARM_HOME_ACTION),
             code=code,
         )
 
@@ -344,7 +306,7 @@ class AlarmControlPanelTemplate(TemplateEntity, AlarmControlPanelEntity, Restore
         """Arm the panel to Night."""
         await self._async_alarm_arm(
             AlarmControlPanelState.ARMED_NIGHT,
-            script=self._arm_night_script,
+            script=self._action_scripts.get(CONF_ARM_NIGHT_ACTION),
             code=code,
         )
 
@@ -352,7 +314,7 @@ class AlarmControlPanelTemplate(TemplateEntity, AlarmControlPanelEntity, Restore
         """Arm the panel to Vacation."""
         await self._async_alarm_arm(
             AlarmControlPanelState.ARMED_VACATION,
-            script=self._arm_vacation_script,
+            script=self._action_scripts.get(CONF_ARM_VACATION_ACTION),
             code=code,
         )
 
@@ -360,20 +322,22 @@ class AlarmControlPanelTemplate(TemplateEntity, AlarmControlPanelEntity, Restore
         """Arm the panel to Custom Bypass."""
         await self._async_alarm_arm(
             AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-            script=self._arm_custom_bypass_script,
+            script=self._action_scripts.get(CONF_ARM_CUSTOM_BYPASS_ACTION),
             code=code,
         )
 
     async def async_alarm_disarm(self, code: str | None = None) -> None:
         """Disarm the panel."""
         await self._async_alarm_arm(
-            AlarmControlPanelState.DISARMED, script=self._disarm_script, code=code
+            AlarmControlPanelState.DISARMED,
+            script=self._action_scripts.get(CONF_DISARM_ACTION),
+            code=code,
         )
 
     async def async_alarm_trigger(self, code: str | None = None) -> None:
         """Trigger the panel."""
         await self._async_alarm_arm(
             AlarmControlPanelState.TRIGGERED,
-            script=self._trigger_script,
+            script=self._action_scripts.get(CONF_TRIGGER_ACTION),
             code=code,
         )
diff --git a/homeassistant/components/template/binary_sensor.py b/homeassistant/components/template/binary_sensor.py
index 922f1d88ffb..7ef64e8077b 100644
--- a/homeassistant/components/template/binary_sensor.py
+++ b/homeassistant/components/template/binary_sensor.py
@@ -40,11 +40,13 @@ from homeassistant.const import (
 )
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.exceptions import TemplateError
-from homeassistant.helpers import selector, template
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, selector, template
 from homeassistant.helpers.device import async_device_info_to_link_from_device_id
 from homeassistant.helpers.entity import async_generate_entity_id
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.event import async_call_later, async_track_point_in_utc_time
 from homeassistant.helpers.restore_state import ExtraStoredData, RestoreEntity
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
@@ -151,7 +153,7 @@ PLATFORM_SCHEMA = BINARY_SENSOR_PLATFORM_SCHEMA.extend(
 
 @callback
 def _async_create_template_tracking_entities(
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddEntitiesCallback | AddConfigEntryEntitiesCallback,
     hass: HomeAssistant,
     definitions: list[dict],
     unique_id_prefix: str | None,
@@ -210,7 +212,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize config entry."""
     _options = dict(config_entry.options)
diff --git a/homeassistant/components/template/button.py b/homeassistant/components/template/button.py
index 67ce7e7a16b..7a205446585 100644
--- a/homeassistant/components/template/button.py
+++ b/homeassistant/components/template/button.py
@@ -19,8 +19,10 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
 from homeassistant.helpers import config_validation as cv, selector
 from homeassistant.helpers.device import async_device_info_to_link_from_device_id
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.script import Script
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import CONF_PRESS, DOMAIN
@@ -93,7 +95,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize config entry."""
     _options = dict(config_entry.options)
@@ -118,11 +120,8 @@ class TemplateButtonEntity(TemplateEntity, ButtonEntity):
         """Initialize the button."""
         super().__init__(hass, config=config, unique_id=unique_id)
         assert self._attr_name is not None
-        self._command_press = (
-            Script(hass, config.get(CONF_PRESS), self._attr_name, DOMAIN)
-            if config.get(CONF_PRESS, None) is not None
-            else None
-        )
+        if action := config.get(CONF_PRESS):
+            self.add_script(CONF_PRESS, action, self._attr_name, DOMAIN)
         self._attr_device_class = config.get(CONF_DEVICE_CLASS)
         self._attr_state = None
         self._attr_device_info = async_device_info_to_link_from_device_id(
@@ -132,5 +131,5 @@ class TemplateButtonEntity(TemplateEntity, ButtonEntity):
 
     async def async_press(self) -> None:
         """Press the button."""
-        if self._command_press:
-            await self.async_run_script(self._command_press, context=self._context)
+        if script := self._action_scripts.get(CONF_PRESS):
+            await self.async_run_script(script, context=self._context)
diff --git a/homeassistant/components/template/config.py b/homeassistant/components/template/config.py
index e0c5514def9..4e07d67f6e9 100644
--- a/homeassistant/components/template/config.py
+++ b/homeassistant/components/template/config.py
@@ -1,5 +1,6 @@
 """Template config validator."""
 
+from collections.abc import Callable
 from contextlib import suppress
 import logging
 
@@ -12,9 +13,11 @@ from homeassistant.components.blueprint import (
 )
 from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN
 from homeassistant.components.image import DOMAIN as IMAGE_DOMAIN
+from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN
 from homeassistant.components.number import DOMAIN as NUMBER_DOMAIN
 from homeassistant.components.select import DOMAIN as SELECT_DOMAIN
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
+from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
 from homeassistant.components.weather import DOMAIN as WEATHER_DOMAIN
 from homeassistant.config import async_log_schema_error, config_without_domain
 from homeassistant.const import (
@@ -35,9 +38,11 @@ from . import (
     binary_sensor as binary_sensor_platform,
     button as button_platform,
     image as image_platform,
+    light as light_platform,
     number as number_platform,
     select as select_platform,
     sensor as sensor_platform,
+    switch as switch_platform,
     weather as weather_platform,
 )
 from .const import (
@@ -52,41 +57,71 @@ from .helpers import async_get_blueprints
 
 PACKAGE_MERGE_HINT = "list"
 
+
+def ensure_domains_do_not_have_trigger_or_action(*keys: str) -> Callable[[dict], dict]:
+    """Validate that config does not contain trigger and action."""
+    domains = set(keys)
+
+    def validate(obj: dict):
+        options = set(obj.keys())
+        if found_domains := domains.intersection(options):
+            invalid = {CONF_TRIGGER, CONF_ACTION}
+            if found_invalid := invalid.intersection(set(obj.keys())):
+                raise vol.Invalid(
+                    f"Unsupported option(s) found for domain {found_domains.pop()}, please remove ({', '.join(found_invalid)}) from your configuration",
+                )
+
+        return obj
+
+    return validate
+
+
 CONFIG_SECTION_SCHEMA = vol.Schema(
-    {
-        vol.Optional(CONF_UNIQUE_ID): cv.string,
-        vol.Optional(CONF_TRIGGER): cv.TRIGGER_SCHEMA,
-        vol.Optional(CONF_CONDITION): cv.CONDITIONS_SCHEMA,
-        vol.Optional(CONF_ACTION): cv.SCRIPT_SCHEMA,
-        vol.Optional(CONF_VARIABLES): cv.SCRIPT_VARIABLES_SCHEMA,
-        vol.Optional(NUMBER_DOMAIN): vol.All(
-            cv.ensure_list, [number_platform.NUMBER_SCHEMA]
+    vol.All(
+        {
+            vol.Optional(CONF_UNIQUE_ID): cv.string,
+            vol.Optional(CONF_TRIGGER): cv.TRIGGER_SCHEMA,
+            vol.Optional(CONF_CONDITION): cv.CONDITIONS_SCHEMA,
+            vol.Optional(CONF_ACTION): cv.SCRIPT_SCHEMA,
+            vol.Optional(CONF_VARIABLES): cv.SCRIPT_VARIABLES_SCHEMA,
+            vol.Optional(NUMBER_DOMAIN): vol.All(
+                cv.ensure_list, [number_platform.NUMBER_SCHEMA]
+            ),
+            vol.Optional(SENSOR_DOMAIN): vol.All(
+                cv.ensure_list, [sensor_platform.SENSOR_SCHEMA]
+            ),
+            vol.Optional(CONF_SENSORS): cv.schema_with_slug_keys(
+                sensor_platform.LEGACY_SENSOR_SCHEMA
+            ),
+            vol.Optional(BINARY_SENSOR_DOMAIN): vol.All(
+                cv.ensure_list, [binary_sensor_platform.BINARY_SENSOR_SCHEMA]
+            ),
+            vol.Optional(CONF_BINARY_SENSORS): cv.schema_with_slug_keys(
+                binary_sensor_platform.LEGACY_BINARY_SENSOR_SCHEMA
+            ),
+            vol.Optional(SELECT_DOMAIN): vol.All(
+                cv.ensure_list, [select_platform.SELECT_SCHEMA]
+            ),
+            vol.Optional(BUTTON_DOMAIN): vol.All(
+                cv.ensure_list, [button_platform.BUTTON_SCHEMA]
+            ),
+            vol.Optional(IMAGE_DOMAIN): vol.All(
+                cv.ensure_list, [image_platform.IMAGE_SCHEMA]
+            ),
+            vol.Optional(LIGHT_DOMAIN): vol.All(
+                cv.ensure_list, [light_platform.LIGHT_SCHEMA]
+            ),
+            vol.Optional(WEATHER_DOMAIN): vol.All(
+                cv.ensure_list, [weather_platform.WEATHER_SCHEMA]
+            ),
+            vol.Optional(SWITCH_DOMAIN): vol.All(
+                cv.ensure_list, [switch_platform.SWITCH_SCHEMA]
+            ),
+        },
+        ensure_domains_do_not_have_trigger_or_action(
+            BUTTON_DOMAIN, LIGHT_DOMAIN, SWITCH_DOMAIN
         ),
-        vol.Optional(SENSOR_DOMAIN): vol.All(
-            cv.ensure_list, [sensor_platform.SENSOR_SCHEMA]
-        ),
-        vol.Optional(CONF_SENSORS): cv.schema_with_slug_keys(
-            sensor_platform.LEGACY_SENSOR_SCHEMA
-        ),
-        vol.Optional(BINARY_SENSOR_DOMAIN): vol.All(
-            cv.ensure_list, [binary_sensor_platform.BINARY_SENSOR_SCHEMA]
-        ),
-        vol.Optional(CONF_BINARY_SENSORS): cv.schema_with_slug_keys(
-            binary_sensor_platform.LEGACY_BINARY_SENSOR_SCHEMA
-        ),
-        vol.Optional(SELECT_DOMAIN): vol.All(
-            cv.ensure_list, [select_platform.SELECT_SCHEMA]
-        ),
-        vol.Optional(BUTTON_DOMAIN): vol.All(
-            cv.ensure_list, [button_platform.BUTTON_SCHEMA]
-        ),
-        vol.Optional(IMAGE_DOMAIN): vol.All(
-            cv.ensure_list, [image_platform.IMAGE_SCHEMA]
-        ),
-        vol.Optional(WEATHER_DOMAIN): vol.All(
-            cv.ensure_list, [weather_platform.WEATHER_SCHEMA]
-        ),
-    },
+    )
 )
 
 TEMPLATE_BLUEPRINT_INSTANCE_SCHEMA = vol.Schema(
@@ -122,9 +157,15 @@ async def _async_resolve_blueprints(
             raise vol.Invalid("more than one platform defined per blueprint")
         if len(platforms) == 1:
             platform = platforms.pop()
-            for prop in (CONF_NAME, CONF_UNIQUE_ID, CONF_VARIABLES):
+            for prop in (CONF_NAME, CONF_UNIQUE_ID):
                 if prop in config:
                     config[platform][prop] = config.pop(prop)
+            # For regular template entities, CONF_VARIABLES should be removed because they just
+            # house input results for template entities.  For Trigger based template entities
+            # CONF_VARIABLES should not be removed because the variables are always
+            # executed between the trigger and action.
+            if CONF_TRIGGER not in config and CONF_VARIABLES in config:
+                config[platform][CONF_VARIABLES] = config.pop(CONF_VARIABLES)
         raw_config = dict(config)
 
     template_config = TemplateConfig(CONFIG_SECTION_SCHEMA(config))
diff --git a/homeassistant/components/template/coordinator.py b/homeassistant/components/template/coordinator.py
index 4d8fe78f2b5..c11e9b6101b 100644
--- a/homeassistant/components/template/coordinator.py
+++ b/homeassistant/components/template/coordinator.py
@@ -2,12 +2,14 @@
 
 from collections.abc import Callable, Mapping
 import logging
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, cast
 
-from homeassistant.const import EVENT_HOMEASSISTANT_START
+from homeassistant.components.blueprint import CONF_USE_BLUEPRINT
+from homeassistant.const import CONF_PATH, CONF_VARIABLES, EVENT_HOMEASSISTANT_START
 from homeassistant.core import Context, CoreState, Event, HomeAssistant, callback
 from homeassistant.helpers import condition, discovery, trigger as trigger_helper
 from homeassistant.helpers.script import Script
+from homeassistant.helpers.script_variables import ScriptVariables
 from homeassistant.helpers.trace import trace_get
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
@@ -22,7 +24,7 @@ class TriggerUpdateCoordinator(DataUpdateCoordinator):
 
     REMOVE_TRIGGER = object()
 
-    def __init__(self, hass: HomeAssistant, config: dict[str, Any]) -> None:
+    def __init__(self, hass: HomeAssistant, config: ConfigType) -> None:
         """Instantiate trigger data."""
         super().__init__(
             hass, _LOGGER, config_entry=None, name="Trigger Update Coordinator"
@@ -32,6 +34,18 @@ class TriggerUpdateCoordinator(DataUpdateCoordinator):
         self._unsub_start: Callable[[], None] | None = None
         self._unsub_trigger: Callable[[], None] | None = None
         self._script: Script | None = None
+        self._run_variables: ScriptVariables | None = None
+        self._blueprint_inputs: dict | None = None
+        if config is not None:
+            self._run_variables = config.get(CONF_VARIABLES)
+            self._blueprint_inputs = getattr(config, "raw_blueprint_inputs", None)
+
+    @property
+    def referenced_blueprint(self) -> str | None:
+        """Return referenced blueprint or None."""
+        if self._blueprint_inputs is None:
+            return None
+        return cast(str, self._blueprint_inputs[CONF_USE_BLUEPRINT][CONF_PATH])
 
     @property
     def unique_id(self) -> str | None:
@@ -104,6 +118,10 @@ class TriggerUpdateCoordinator(DataUpdateCoordinator):
     async def _handle_triggered_with_script(
         self, run_variables: TemplateVarsType, context: Context | None = None
     ) -> None:
+        # Render run variables after the trigger, before checking conditions.
+        if self._run_variables:
+            run_variables = self._run_variables.async_render(self.hass, run_variables)
+
         if not self._check_condition(run_variables):
             return
         # Create a context referring to the trigger context.
@@ -119,6 +137,9 @@ class TriggerUpdateCoordinator(DataUpdateCoordinator):
     async def _handle_triggered(
         self, run_variables: TemplateVarsType, context: Context | None = None
     ) -> None:
+        if self._run_variables:
+            run_variables = self._run_variables.async_render(self.hass, run_variables)
+
         if not self._check_condition(run_variables):
             return
         self._execute_update(run_variables, context)
diff --git a/homeassistant/components/template/cover.py b/homeassistant/components/template/cover.py
index 2642ede9c3a..7a8e347ee8f 100644
--- a/homeassistant/components/template/cover.py
+++ b/homeassistant/components/template/cover.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import voluptuous as vol
 
@@ -27,10 +27,9 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import TemplateError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import async_generate_entity_id
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.script import Script
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import DOMAIN
@@ -103,7 +102,7 @@ PLATFORM_SCHEMA = COVER_PLATFORM_SCHEMA.extend(
 )
 
 
-async def _async_create_entities(hass, config):
+async def _async_create_entities(hass: HomeAssistant, config):
     """Create the Template cover."""
     covers = []
 
@@ -141,11 +140,11 @@ class CoverTemplate(TemplateEntity, CoverEntity):
 
     def __init__(
         self,
-        hass,
+        hass: HomeAssistant,
         object_id,
-        config,
+        config: dict[str, Any],
         unique_id,
-    ):
+    ) -> None:
         """Initialize the Template cover."""
         super().__init__(
             hass, config=config, fallback_name=object_id, unique_id=unique_id
@@ -153,45 +152,40 @@ class CoverTemplate(TemplateEntity, CoverEntity):
         self.entity_id = async_generate_entity_id(
             ENTITY_ID_FORMAT, object_id, hass=hass
         )
-        friendly_name = self._attr_name
+        name = self._attr_name
+        if TYPE_CHECKING:
+            assert name is not None
         self._template = config.get(CONF_VALUE_TEMPLATE)
         self._position_template = config.get(CONF_POSITION_TEMPLATE)
         self._tilt_template = config.get(CONF_TILT_TEMPLATE)
         self._attr_device_class = config.get(CONF_DEVICE_CLASS)
-        self._open_script = None
-        if (open_action := config.get(OPEN_ACTION)) is not None:
-            self._open_script = Script(hass, open_action, friendly_name, DOMAIN)
-        self._close_script = None
-        if (close_action := config.get(CLOSE_ACTION)) is not None:
-            self._close_script = Script(hass, close_action, friendly_name, DOMAIN)
-        self._stop_script = None
-        if (stop_action := config.get(STOP_ACTION)) is not None:
-            self._stop_script = Script(hass, stop_action, friendly_name, DOMAIN)
-        self._position_script = None
-        if (position_action := config.get(POSITION_ACTION)) is not None:
-            self._position_script = Script(hass, position_action, friendly_name, DOMAIN)
-        self._tilt_script = None
-        if (tilt_action := config.get(TILT_ACTION)) is not None:
-            self._tilt_script = Script(hass, tilt_action, friendly_name, DOMAIN)
+
+        # The config requires (open and close scripts) or a set position script,
+        # therefore the base supported features will always include them.
+        self._attr_supported_features = (
+            CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE
+        )
+        for action_id, supported_feature in (
+            (OPEN_ACTION, 0),
+            (CLOSE_ACTION, 0),
+            (STOP_ACTION, CoverEntityFeature.STOP),
+            (POSITION_ACTION, CoverEntityFeature.SET_POSITION),
+            (TILT_ACTION, TILT_FEATURES),
+        ):
+            if action_config := config.get(action_id):
+                self.add_script(action_id, action_config, name, DOMAIN)
+                self._attr_supported_features |= supported_feature
+
         optimistic = config.get(CONF_OPTIMISTIC)
         self._optimistic = optimistic or (
             optimistic is None and not self._template and not self._position_template
         )
         tilt_optimistic = config.get(CONF_TILT_OPTIMISTIC)
         self._tilt_optimistic = tilt_optimistic or not self._tilt_template
-        self._position = None
+        self._position: int | None = None
         self._is_opening = False
         self._is_closing = False
-        self._tilt_value = None
-
-        supported_features = CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE
-        if self._stop_script is not None:
-            supported_features |= CoverEntityFeature.STOP
-        if self._position_script is not None:
-            supported_features |= CoverEntityFeature.SET_POSITION
-        if self._tilt_script is not None:
-            supported_features |= TILT_FEATURES
-        self._attr_supported_features = supported_features
+        self._tilt_value: int | None = None
 
     @callback
     def _async_setup_templates(self) -> None:
@@ -317,7 +311,7 @@ class CoverTemplate(TemplateEntity, CoverEntity):
 
         None is unknown, 0 is closed, 100 is fully open.
         """
-        if self._position_template or self._position_script:
+        if self._position_template or self._action_scripts.get(POSITION_ACTION):
             return self._position
         return None
 
@@ -331,11 +325,11 @@ class CoverTemplate(TemplateEntity, CoverEntity):
 
     async def async_open_cover(self, **kwargs: Any) -> None:
         """Move the cover up."""
-        if self._open_script:
-            await self.async_run_script(self._open_script, context=self._context)
-        elif self._position_script:
+        if open_script := self._action_scripts.get(OPEN_ACTION):
+            await self.async_run_script(open_script, context=self._context)
+        elif position_script := self._action_scripts.get(POSITION_ACTION):
             await self.async_run_script(
-                self._position_script,
+                position_script,
                 run_variables={"position": 100},
                 context=self._context,
             )
@@ -345,11 +339,11 @@ class CoverTemplate(TemplateEntity, CoverEntity):
 
     async def async_close_cover(self, **kwargs: Any) -> None:
         """Move the cover down."""
-        if self._close_script:
-            await self.async_run_script(self._close_script, context=self._context)
-        elif self._position_script:
+        if close_script := self._action_scripts.get(CLOSE_ACTION):
+            await self.async_run_script(close_script, context=self._context)
+        elif position_script := self._action_scripts.get(POSITION_ACTION):
             await self.async_run_script(
-                self._position_script,
+                position_script,
                 run_variables={"position": 0},
                 context=self._context,
             )
@@ -359,14 +353,14 @@ class CoverTemplate(TemplateEntity, CoverEntity):
 
     async def async_stop_cover(self, **kwargs: Any) -> None:
         """Fire the stop action."""
-        if self._stop_script:
-            await self.async_run_script(self._stop_script, context=self._context)
+        if stop_script := self._action_scripts.get(STOP_ACTION):
+            await self.async_run_script(stop_script, context=self._context)
 
     async def async_set_cover_position(self, **kwargs: Any) -> None:
         """Set cover position."""
         self._position = kwargs[ATTR_POSITION]
         await self.async_run_script(
-            self._position_script,
+            self._action_scripts[POSITION_ACTION],
             run_variables={"position": self._position},
             context=self._context,
         )
@@ -377,7 +371,7 @@ class CoverTemplate(TemplateEntity, CoverEntity):
         """Tilt the cover open."""
         self._tilt_value = 100
         await self.async_run_script(
-            self._tilt_script,
+            self._action_scripts[TILT_ACTION],
             run_variables={"tilt": self._tilt_value},
             context=self._context,
         )
@@ -388,7 +382,7 @@ class CoverTemplate(TemplateEntity, CoverEntity):
         """Tilt the cover closed."""
         self._tilt_value = 0
         await self.async_run_script(
-            self._tilt_script,
+            self._action_scripts[TILT_ACTION],
             run_variables={"tilt": self._tilt_value},
             context=self._context,
         )
@@ -399,7 +393,7 @@ class CoverTemplate(TemplateEntity, CoverEntity):
         """Move the cover tilt to a specific position."""
         self._tilt_value = kwargs[ATTR_TILT_POSITION]
         await self.async_run_script(
-            self._tilt_script,
+            self._action_scripts[TILT_ACTION],
             run_variables={"tilt": self._tilt_value},
             context=self._context,
         )
diff --git a/homeassistant/components/template/entity.py b/homeassistant/components/template/entity.py
new file mode 100644
index 00000000000..3617d9acdee
--- /dev/null
+++ b/homeassistant/components/template/entity.py
@@ -0,0 +1,64 @@
+"""Template entity base class."""
+
+from collections.abc import Sequence
+from typing import Any
+
+from homeassistant.core import Context, HomeAssistant, callback
+from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.script import Script, _VarsType
+from homeassistant.helpers.template import TemplateStateFromEntityId
+
+
+class AbstractTemplateEntity(Entity):
+    """Actions linked to a template entity."""
+
+    def __init__(self, hass: HomeAssistant) -> None:
+        """Initialize the entity."""
+
+        self.hass = hass
+        self._action_scripts: dict[str, Script] = {}
+
+    @property
+    def referenced_blueprint(self) -> str | None:
+        """Return referenced blueprint or None."""
+        raise NotImplementedError
+
+    @callback
+    def _render_script_variables(self) -> dict:
+        """Render configured variables."""
+        raise NotImplementedError
+
+    def add_script(
+        self,
+        script_id: str,
+        config: Sequence[dict[str, Any]],
+        name: str,
+        domain: str,
+    ):
+        """Add an action script."""
+
+        self._action_scripts[script_id] = Script(
+            self.hass,
+            config,
+            f"{name} {script_id}",
+            domain,
+        )
+
+    async def async_run_script(
+        self,
+        script: Script,
+        *,
+        run_variables: _VarsType | None = None,
+        context: Context | None = None,
+    ) -> None:
+        """Run an action script."""
+        if run_variables is None:
+            run_variables = {}
+        await script.async_run(
+            run_variables={
+                "this": TemplateStateFromEntityId(self.hass, self.entity_id),
+                **self._render_script_variables(),
+                **run_variables,
+            },
+            context=context,
+        )
diff --git a/homeassistant/components/template/fan.py b/homeassistant/components/template/fan.py
index 7720ef7e1b3..6e0f9fe5e0c 100644
--- a/homeassistant/components/template/fan.py
+++ b/homeassistant/components/template/fan.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import voluptuous as vol
 
@@ -29,10 +29,9 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import TemplateError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import async_generate_entity_id
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.script import Script
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import DOMAIN
@@ -89,7 +88,7 @@ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend(
 )
 
 
-async def _async_create_entities(hass, config):
+async def _async_create_entities(hass: HomeAssistant, config):
     """Create the Template Fans."""
     fans = []
 
@@ -127,11 +126,11 @@ class TemplateFan(TemplateEntity, FanEntity):
 
     def __init__(
         self,
-        hass,
+        hass: HomeAssistant,
         object_id,
-        config,
+        config: dict[str, Any],
         unique_id,
-    ):
+    ) -> None:
         """Initialize the fan."""
         super().__init__(
             hass, config=config, fallback_name=object_id, unique_id=unique_id
@@ -140,7 +139,9 @@ class TemplateFan(TemplateEntity, FanEntity):
         self.entity_id = async_generate_entity_id(
             ENTITY_ID_FORMAT, object_id, hass=hass
         )
-        friendly_name = self._attr_name
+        name = self._attr_name
+        if TYPE_CHECKING:
+            assert name is not None
 
         self._template = config.get(CONF_VALUE_TEMPLATE)
         self._percentage_template = config.get(CONF_PERCENTAGE_TEMPLATE)
@@ -148,44 +149,28 @@ class TemplateFan(TemplateEntity, FanEntity):
         self._oscillating_template = config.get(CONF_OSCILLATING_TEMPLATE)
         self._direction_template = config.get(CONF_DIRECTION_TEMPLATE)
 
-        self._on_script = Script(hass, config[CONF_ON_ACTION], friendly_name, DOMAIN)
-        self._off_script = Script(hass, config[CONF_OFF_ACTION], friendly_name, DOMAIN)
-
-        self._set_percentage_script = None
-        if set_percentage_action := config.get(CONF_SET_PERCENTAGE_ACTION):
-            self._set_percentage_script = Script(
-                hass, set_percentage_action, friendly_name, DOMAIN
-            )
-
-        self._set_preset_mode_script = None
-        if set_preset_mode_action := config.get(CONF_SET_PRESET_MODE_ACTION):
-            self._set_preset_mode_script = Script(
-                hass, set_preset_mode_action, friendly_name, DOMAIN
-            )
-
-        self._set_oscillating_script = None
-        if set_oscillating_action := config.get(CONF_SET_OSCILLATING_ACTION):
-            self._set_oscillating_script = Script(
-                hass, set_oscillating_action, friendly_name, DOMAIN
-            )
-
-        self._set_direction_script = None
-        if set_direction_action := config.get(CONF_SET_DIRECTION_ACTION):
-            self._set_direction_script = Script(
-                hass, set_direction_action, friendly_name, DOMAIN
-            )
+        for action_id in (
+            CONF_ON_ACTION,
+            CONF_OFF_ACTION,
+            CONF_SET_PERCENTAGE_ACTION,
+            CONF_SET_PRESET_MODE_ACTION,
+            CONF_SET_OSCILLATING_ACTION,
+            CONF_SET_DIRECTION_ACTION,
+        ):
+            if action_config := config.get(action_id):
+                self.add_script(action_id, action_config, name, DOMAIN)
 
         self._state: bool | None = False
-        self._percentage = None
-        self._preset_mode = None
-        self._oscillating = None
-        self._direction = None
+        self._percentage: int | None = None
+        self._preset_mode: str | None = None
+        self._oscillating: bool | None = None
+        self._direction: str | None = None
 
         # Number of valid speeds
         self._speed_count = config.get(CONF_SPEED_COUNT)
 
         # List of valid preset modes
-        self._preset_modes = config.get(CONF_PRESET_MODES)
+        self._preset_modes: list[str] | None = config.get(CONF_PRESET_MODES)
 
         if self._percentage_template:
             self._attr_supported_features |= FanEntityFeature.SET_SPEED
@@ -207,7 +192,7 @@ class TemplateFan(TemplateEntity, FanEntity):
         return self._speed_count or 100
 
     @property
-    def preset_modes(self) -> list[str]:
+    def preset_modes(self) -> list[str] | None:
         """Get the list of available preset modes."""
         return self._preset_modes
 
@@ -244,7 +229,7 @@ class TemplateFan(TemplateEntity, FanEntity):
     ) -> None:
         """Turn on the fan."""
         await self.async_run_script(
-            self._on_script,
+            self._action_scripts[CONF_ON_ACTION],
             run_variables={
                 ATTR_PERCENTAGE: percentage,
                 ATTR_PRESET_MODE: preset_mode,
@@ -263,7 +248,9 @@ class TemplateFan(TemplateEntity, FanEntity):
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn off the fan."""
-        await self.async_run_script(self._off_script, context=self._context)
+        await self.async_run_script(
+            self._action_scripts[CONF_OFF_ACTION], context=self._context
+        )
 
         if self._template is None:
             self._state = False
@@ -273,9 +260,9 @@ class TemplateFan(TemplateEntity, FanEntity):
         """Set the percentage speed of the fan."""
         self._percentage = percentage
 
-        if self._set_percentage_script:
+        if script := self._action_scripts.get(CONF_SET_PERCENTAGE_ACTION):
             await self.async_run_script(
-                self._set_percentage_script,
+                script,
                 run_variables={ATTR_PERCENTAGE: self._percentage},
                 context=self._context,
             )
@@ -288,9 +275,9 @@ class TemplateFan(TemplateEntity, FanEntity):
         """Set the preset_mode of the fan."""
         self._preset_mode = preset_mode
 
-        if self._set_preset_mode_script:
+        if script := self._action_scripts.get(CONF_SET_PRESET_MODE_ACTION):
             await self.async_run_script(
-                self._set_preset_mode_script,
+                script,
                 run_variables={ATTR_PRESET_MODE: self._preset_mode},
                 context=self._context,
             )
@@ -301,25 +288,25 @@ class TemplateFan(TemplateEntity, FanEntity):
 
     async def async_oscillate(self, oscillating: bool) -> None:
         """Set oscillation of the fan."""
-        if self._set_oscillating_script is None:
+        if (script := self._action_scripts.get(CONF_SET_OSCILLATING_ACTION)) is None:
             return
 
         self._oscillating = oscillating
         await self.async_run_script(
-            self._set_oscillating_script,
+            script,
             run_variables={ATTR_OSCILLATING: self.oscillating},
             context=self._context,
         )
 
     async def async_set_direction(self, direction: str) -> None:
         """Set the direction of the fan."""
-        if self._set_direction_script is None:
+        if (script := self._action_scripts.get(CONF_SET_DIRECTION_ACTION)) is None:
             return
 
         if direction in _VALID_DIRECTIONS:
             self._direction = direction
             await self.async_run_script(
-                self._set_direction_script,
+                script,
                 run_variables={ATTR_DIRECTION: direction},
                 context=self._context,
             )
diff --git a/homeassistant/components/template/helpers.py b/homeassistant/components/template/helpers.py
index b320f2128cd..d74a4a4ed00 100644
--- a/homeassistant/components/template/helpers.py
+++ b/homeassistant/components/template/helpers.py
@@ -9,7 +9,7 @@ from homeassistant.helpers.entity_platform import async_get_platforms
 from homeassistant.helpers.singleton import singleton
 
 from .const import DOMAIN, TEMPLATE_BLUEPRINT_SCHEMA
-from .template_entity import TemplateEntity
+from .entity import AbstractTemplateEntity
 
 DATA_BLUEPRINTS = "template_blueprints"
 
@@ -23,7 +23,7 @@ def templates_with_blueprint(hass: HomeAssistant, blueprint_path: str) -> list[s
         entity_id
         for platform in async_get_platforms(hass, DOMAIN)
         for entity_id, template_entity in platform.entities.items()
-        if isinstance(template_entity, TemplateEntity)
+        if isinstance(template_entity, AbstractTemplateEntity)
         and template_entity.referenced_blueprint == blueprint_path
     ]
 
@@ -33,7 +33,8 @@ def blueprint_in_template(hass: HomeAssistant, entity_id: str) -> str | None:
     """Return the blueprint the template entity is based on or None."""
     for platform in async_get_platforms(hass, DOMAIN):
         if isinstance(
-            (template_entity := platform.entities.get(entity_id)), TemplateEntity
+            (template_entity := platform.entities.get(entity_id)),
+            AbstractTemplateEntity,
         ):
             return template_entity.referenced_blueprint
     return None
diff --git a/homeassistant/components/template/image.py b/homeassistant/components/template/image.py
index ba85418c339..5afbca55cbb 100644
--- a/homeassistant/components/template/image.py
+++ b/homeassistant/components/template/image.py
@@ -20,7 +20,10 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import TemplateError
 from homeassistant.helpers import config_validation as cv, selector
 from homeassistant.helpers.device import async_device_info_to_link_from_device_id
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util
 
@@ -96,7 +99,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize config entry."""
     _options = dict(config_entry.options)
diff --git a/homeassistant/components/template/light.py b/homeassistant/components/template/light.py
index 9391e368e2b..1cc47c74aa0 100644
--- a/homeassistant/components/template/light.py
+++ b/homeassistant/components/template/light.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import voluptuous as vol
 
@@ -26,9 +26,13 @@ from homeassistant.components.light import (
     filter_supported_color_modes,
 )
 from homeassistant.const import (
+    CONF_EFFECT,
     CONF_ENTITY_ID,
     CONF_FRIENDLY_NAME,
     CONF_LIGHTS,
+    CONF_NAME,
+    CONF_RGB,
+    CONF_STATE,
     CONF_UNIQUE_ID,
     CONF_VALUE_TEMPLATE,
     STATE_OFF,
@@ -36,16 +40,18 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import TemplateError
-from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers import config_validation as cv, template
 from homeassistant.helpers.entity import async_generate_entity_id
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.script import Script
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import color as color_util
 
-from .const import DOMAIN
+from .const import CONF_OBJECT_ID, CONF_PICTURE, DOMAIN
 from .template_entity import (
+    LEGACY_FIELDS as TEMPLATE_ENTITY_LEGACY_FIELDS,
+    TEMPLATE_ENTITY_AVAILABILITY_SCHEMA,
     TEMPLATE_ENTITY_COMMON_SCHEMA_LEGACY,
+    TEMPLATE_ENTITY_ICON_SCHEMA,
     TemplateEntity,
     rewrite_common_legacy_to_modern_conf,
 )
@@ -57,33 +63,96 @@ _VALID_STATES = [STATE_ON, STATE_OFF, "true", "false"]
 CONF_COLOR_ACTION = "set_color"
 CONF_COLOR_TEMPLATE = "color_template"
 
+CONF_HS = "hs"
 CONF_HS_ACTION = "set_hs"
 CONF_HS_TEMPLATE = "hs_template"
 CONF_RGB_ACTION = "set_rgb"
 CONF_RGB_TEMPLATE = "rgb_template"
+CONF_RGBW = "rgbw"
 CONF_RGBW_ACTION = "set_rgbw"
 CONF_RGBW_TEMPLATE = "rgbw_template"
+CONF_RGBWW = "rgbww"
 CONF_RGBWW_ACTION = "set_rgbww"
 CONF_RGBWW_TEMPLATE = "rgbww_template"
 CONF_EFFECT_ACTION = "set_effect"
+CONF_EFFECT_LIST = "effect_list"
 CONF_EFFECT_LIST_TEMPLATE = "effect_list_template"
 CONF_EFFECT_TEMPLATE = "effect_template"
+CONF_LEVEL = "level"
 CONF_LEVEL_ACTION = "set_level"
 CONF_LEVEL_TEMPLATE = "level_template"
+CONF_MAX_MIREDS = "max_mireds"
 CONF_MAX_MIREDS_TEMPLATE = "max_mireds_template"
+CONF_MIN_MIREDS = "min_mireds"
 CONF_MIN_MIREDS_TEMPLATE = "min_mireds_template"
 CONF_OFF_ACTION = "turn_off"
 CONF_ON_ACTION = "turn_on"
-CONF_SUPPORTS_TRANSITION = "supports_transition_template"
+CONF_SUPPORTS_TRANSITION = "supports_transition"
+CONF_SUPPORTS_TRANSITION_TEMPLATE = "supports_transition_template"
 CONF_TEMPERATURE_ACTION = "set_temperature"
+CONF_TEMPERATURE = "temperature"
 CONF_TEMPERATURE_TEMPLATE = "temperature_template"
 CONF_WHITE_VALUE_ACTION = "set_white_value"
+CONF_WHITE_VALUE = "white_value"
 CONF_WHITE_VALUE_TEMPLATE = "white_value_template"
 
 DEFAULT_MIN_MIREDS = 153
 DEFAULT_MAX_MIREDS = 500
 
-LIGHT_SCHEMA = vol.All(
+LEGACY_FIELDS = TEMPLATE_ENTITY_LEGACY_FIELDS | {
+    CONF_COLOR_ACTION: CONF_HS_ACTION,
+    CONF_COLOR_TEMPLATE: CONF_HS,
+    CONF_EFFECT_LIST_TEMPLATE: CONF_EFFECT_LIST,
+    CONF_EFFECT_TEMPLATE: CONF_EFFECT,
+    CONF_HS_TEMPLATE: CONF_HS,
+    CONF_LEVEL_TEMPLATE: CONF_LEVEL,
+    CONF_MAX_MIREDS_TEMPLATE: CONF_MAX_MIREDS,
+    CONF_MIN_MIREDS_TEMPLATE: CONF_MIN_MIREDS,
+    CONF_RGB_TEMPLATE: CONF_RGB,
+    CONF_RGBW_TEMPLATE: CONF_RGBW,
+    CONF_RGBWW_TEMPLATE: CONF_RGBWW,
+    CONF_SUPPORTS_TRANSITION_TEMPLATE: CONF_SUPPORTS_TRANSITION,
+    CONF_TEMPERATURE_TEMPLATE: CONF_TEMPERATURE,
+    CONF_VALUE_TEMPLATE: CONF_STATE,
+    CONF_WHITE_VALUE_TEMPLATE: CONF_WHITE_VALUE,
+}
+
+DEFAULT_NAME = "Template Light"
+
+LIGHT_SCHEMA = (
+    vol.Schema(
+        {
+            vol.Inclusive(CONF_EFFECT_ACTION, "effect"): cv.SCRIPT_SCHEMA,
+            vol.Inclusive(CONF_EFFECT_LIST, "effect"): cv.template,
+            vol.Inclusive(CONF_EFFECT, "effect"): cv.template,
+            vol.Optional(CONF_HS_ACTION): cv.SCRIPT_SCHEMA,
+            vol.Optional(CONF_HS): cv.template,
+            vol.Optional(CONF_LEVEL_ACTION): cv.SCRIPT_SCHEMA,
+            vol.Optional(CONF_LEVEL): cv.template,
+            vol.Optional(CONF_MAX_MIREDS): cv.template,
+            vol.Optional(CONF_MIN_MIREDS): cv.template,
+            vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.template,
+            vol.Optional(CONF_PICTURE): cv.template,
+            vol.Optional(CONF_RGB_ACTION): cv.SCRIPT_SCHEMA,
+            vol.Optional(CONF_RGB): cv.template,
+            vol.Optional(CONF_RGBW_ACTION): cv.SCRIPT_SCHEMA,
+            vol.Optional(CONF_RGBW): cv.template,
+            vol.Optional(CONF_RGBWW_ACTION): cv.SCRIPT_SCHEMA,
+            vol.Optional(CONF_RGBWW): cv.template,
+            vol.Optional(CONF_STATE): cv.template,
+            vol.Optional(CONF_SUPPORTS_TRANSITION): cv.template,
+            vol.Optional(CONF_TEMPERATURE_ACTION): cv.SCRIPT_SCHEMA,
+            vol.Optional(CONF_TEMPERATURE): cv.template,
+            vol.Optional(CONF_UNIQUE_ID): cv.string,
+            vol.Required(CONF_OFF_ACTION): cv.SCRIPT_SCHEMA,
+            vol.Required(CONF_ON_ACTION): cv.SCRIPT_SCHEMA,
+        }
+    )
+    .extend(TEMPLATE_ENTITY_AVAILABILITY_SCHEMA.schema)
+    .extend(TEMPLATE_ENTITY_ICON_SCHEMA.schema)
+)
+
+LEGACY_LIGHT_SCHEMA = vol.All(
     cv.deprecated(CONF_ENTITY_ID),
     vol.Schema(
         {
@@ -108,7 +177,7 @@ LIGHT_SCHEMA = vol.All(
             vol.Optional(CONF_MIN_MIREDS_TEMPLATE): cv.template,
             vol.Required(CONF_OFF_ACTION): cv.SCRIPT_SCHEMA,
             vol.Required(CONF_ON_ACTION): cv.SCRIPT_SCHEMA,
-            vol.Optional(CONF_SUPPORTS_TRANSITION): cv.template,
+            vol.Optional(CONF_SUPPORTS_TRANSITION_TEMPLATE): cv.template,
             vol.Optional(CONF_TEMPERATURE_ACTION): cv.SCRIPT_SCHEMA,
             vol.Optional(CONF_TEMPERATURE_TEMPLATE): cv.template,
             vol.Optional(CONF_UNIQUE_ID): cv.string,
@@ -122,29 +191,50 @@ PLATFORM_SCHEMA = vol.All(
     cv.removed(CONF_WHITE_VALUE_ACTION),
     cv.removed(CONF_WHITE_VALUE_TEMPLATE),
     LIGHT_PLATFORM_SCHEMA.extend(
-        {vol.Required(CONF_LIGHTS): cv.schema_with_slug_keys(LIGHT_SCHEMA)}
+        {vol.Required(CONF_LIGHTS): cv.schema_with_slug_keys(LEGACY_LIGHT_SCHEMA)}
     ),
 )
 
 
-async def _async_create_entities(hass, config):
+def rewrite_legacy_to_modern_conf(
+    hass: HomeAssistant, config: dict[str, dict]
+) -> list[dict]:
+    """Rewrite legacy switch configuration definitions to modern ones."""
+    lights = []
+    for object_id, entity_conf in config.items():
+        entity_conf = {**entity_conf, CONF_OBJECT_ID: object_id}
+
+        entity_conf = rewrite_common_legacy_to_modern_conf(
+            hass, entity_conf, LEGACY_FIELDS
+        )
+
+        if CONF_NAME not in entity_conf:
+            entity_conf[CONF_NAME] = template.Template(object_id, hass)
+
+        lights.append(entity_conf)
+
+    return lights
+
+
+@callback
+def _async_create_template_tracking_entities(
+    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant,
+    definitions: list[dict],
+    unique_id_prefix: str | None,
+) -> None:
     """Create the Template Lights."""
     lights = []
 
-    for object_id, entity_config in config[CONF_LIGHTS].items():
-        entity_config = rewrite_common_legacy_to_modern_conf(hass, entity_config)
-        unique_id = entity_config.get(CONF_UNIQUE_ID)
+    for entity_conf in definitions:
+        unique_id = entity_conf.get(CONF_UNIQUE_ID)
 
-        lights.append(
-            LightTemplate(
-                hass,
-                object_id,
-                entity_config,
-                unique_id,
-            )
-        )
+        if unique_id and unique_id_prefix:
+            unique_id = f"{unique_id_prefix}-{unique_id}"
 
-    return lights
+        lights.append(LightTemplate(hass, entity_conf, unique_id))
+
+    async_add_entities(lights)
 
 
 async def async_setup_platform(
@@ -154,7 +244,21 @@ async def async_setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the template lights."""
-    async_add_entities(await _async_create_entities(hass, config))
+    if discovery_info is None:
+        _async_create_template_tracking_entities(
+            async_add_entities,
+            hass,
+            rewrite_legacy_to_modern_conf(hass, config[CONF_LIGHTS]),
+            None,
+        )
+        return
+
+    _async_create_template_tracking_entities(
+        async_add_entities,
+        hass,
+        discovery_info["entities"],
+        discovery_info["unique_id"],
+    )
 
 
 class LightTemplate(TemplateEntity, LightEntity):
@@ -164,64 +268,40 @@ class LightTemplate(TemplateEntity, LightEntity):
 
     def __init__(
         self,
-        hass,
-        object_id,
-        config,
-        unique_id,
-    ):
+        hass: HomeAssistant,
+        config: dict[str, Any],
+        unique_id: str | None,
+    ) -> None:
         """Initialize the light."""
-        super().__init__(
-            hass, config=config, fallback_name=object_id, unique_id=unique_id
-        )
-        self.entity_id = async_generate_entity_id(
-            ENTITY_ID_FORMAT, object_id, hass=hass
-        )
-        friendly_name = self._attr_name
-        self._template = config.get(CONF_VALUE_TEMPLATE)
-        self._on_script = Script(hass, config[CONF_ON_ACTION], friendly_name, DOMAIN)
-        self._off_script = Script(hass, config[CONF_OFF_ACTION], friendly_name, DOMAIN)
-        self._level_script = None
-        if (level_action := config.get(CONF_LEVEL_ACTION)) is not None:
-            self._level_script = Script(hass, level_action, friendly_name, DOMAIN)
-        self._level_template = config.get(CONF_LEVEL_TEMPLATE)
-        self._temperature_script = None
-        if (temperature_action := config.get(CONF_TEMPERATURE_ACTION)) is not None:
-            self._temperature_script = Script(
-                hass, temperature_action, friendly_name, DOMAIN
+        super().__init__(hass, config=config, fallback_name=None, unique_id=unique_id)
+        if (object_id := config.get(CONF_OBJECT_ID)) is not None:
+            self.entity_id = async_generate_entity_id(
+                ENTITY_ID_FORMAT, object_id, hass=hass
             )
-        self._temperature_template = config.get(CONF_TEMPERATURE_TEMPLATE)
-        self._color_script = None
-        if (color_action := config.get(CONF_COLOR_ACTION)) is not None:
-            self._color_script = Script(hass, color_action, friendly_name, DOMAIN)
-        self._color_template = config.get(CONF_COLOR_TEMPLATE)
-        self._hs_script = None
-        if (hs_action := config.get(CONF_HS_ACTION)) is not None:
-            self._hs_script = Script(hass, hs_action, friendly_name, DOMAIN)
-        self._hs_template = config.get(CONF_HS_TEMPLATE)
-        self._rgb_script = None
-        if (rgb_action := config.get(CONF_RGB_ACTION)) is not None:
-            self._rgb_script = Script(hass, rgb_action, friendly_name, DOMAIN)
-        self._rgb_template = config.get(CONF_RGB_TEMPLATE)
-        self._rgbw_script = None
-        if (rgbw_action := config.get(CONF_RGBW_ACTION)) is not None:
-            self._rgbw_script = Script(hass, rgbw_action, friendly_name, DOMAIN)
-        self._rgbw_template = config.get(CONF_RGBW_TEMPLATE)
-        self._rgbww_script = None
-        if (rgbww_action := config.get(CONF_RGBWW_ACTION)) is not None:
-            self._rgbww_script = Script(hass, rgbww_action, friendly_name, DOMAIN)
-        self._rgbww_template = config.get(CONF_RGBWW_TEMPLATE)
-        self._effect_script = None
-        if (effect_action := config.get(CONF_EFFECT_ACTION)) is not None:
-            self._effect_script = Script(hass, effect_action, friendly_name, DOMAIN)
-        self._effect_list_template = config.get(CONF_EFFECT_LIST_TEMPLATE)
-        self._effect_template = config.get(CONF_EFFECT_TEMPLATE)
-        self._max_mireds_template = config.get(CONF_MAX_MIREDS_TEMPLATE)
-        self._min_mireds_template = config.get(CONF_MIN_MIREDS_TEMPLATE)
+        name = self._attr_name
+        if TYPE_CHECKING:
+            assert name is not None
+
+        self._template = config.get(CONF_STATE)
+        self._level_template = config.get(CONF_LEVEL)
+        self._temperature_template = config.get(CONF_TEMPERATURE)
+        self._hs_template = config.get(CONF_HS)
+        self._rgb_template = config.get(CONF_RGB)
+        self._rgbw_template = config.get(CONF_RGBW)
+        self._rgbww_template = config.get(CONF_RGBWW)
+        self._effect_list_template = config.get(CONF_EFFECT_LIST)
+        self._effect_template = config.get(CONF_EFFECT)
+        self._max_mireds_template = config.get(CONF_MAX_MIREDS)
+        self._min_mireds_template = config.get(CONF_MIN_MIREDS)
         self._supports_transition_template = config.get(CONF_SUPPORTS_TRANSITION)
 
+        for action_id in (CONF_ON_ACTION, CONF_OFF_ACTION, CONF_EFFECT_ACTION):
+            if action_config := config.get(action_id):
+                self.add_script(action_id, action_config, name, DOMAIN)
+
         self._state = False
         self._brightness = None
-        self._temperature = None
+        self._temperature: int | None = None
         self._hs_color = None
         self._rgb_color = None
         self._rgbw_color = None
@@ -235,21 +315,17 @@ class LightTemplate(TemplateEntity, LightEntity):
         self._supported_color_modes = None
 
         color_modes = {ColorMode.ONOFF}
-        if self._level_script is not None:
-            color_modes.add(ColorMode.BRIGHTNESS)
-        if self._temperature_script is not None:
-            color_modes.add(ColorMode.COLOR_TEMP)
-        if self._hs_script is not None:
-            color_modes.add(ColorMode.HS)
-        if self._color_script is not None:
-            color_modes.add(ColorMode.HS)
-        if self._rgb_script is not None:
-            color_modes.add(ColorMode.RGB)
-        if self._rgbw_script is not None:
-            color_modes.add(ColorMode.RGBW)
-        if self._rgbww_script is not None:
-            color_modes.add(ColorMode.RGBWW)
-
+        for action_id, color_mode in (
+            (CONF_TEMPERATURE_ACTION, ColorMode.COLOR_TEMP),
+            (CONF_LEVEL_ACTION, ColorMode.BRIGHTNESS),
+            (CONF_HS_ACTION, ColorMode.HS),
+            (CONF_RGB_ACTION, ColorMode.RGB),
+            (CONF_RGBW_ACTION, ColorMode.RGBW),
+            (CONF_RGBWW_ACTION, ColorMode.RGBWW),
+        ):
+            if action_config := config.get(action_id):
+                self.add_script(action_id, action_config, name, DOMAIN)
+                color_modes.add(color_mode)
         self._supported_color_modes = filter_supported_color_modes(color_modes)
         if len(self._supported_color_modes) > 1:
             self._color_mode = ColorMode.UNKNOWN
@@ -257,7 +333,7 @@ class LightTemplate(TemplateEntity, LightEntity):
             self._color_mode = next(iter(self._supported_color_modes))
 
         self._attr_supported_features = LightEntityFeature(0)
-        if self._effect_script is not None:
+        if self._action_scripts.get(CONF_EFFECT_ACTION):
             self._attr_supported_features |= LightEntityFeature.EFFECT
         if self._supports_transition is True:
             self._attr_supported_features |= LightEntityFeature.TRANSITION
@@ -321,12 +397,12 @@ class LightTemplate(TemplateEntity, LightEntity):
         return self._effect_list
 
     @property
-    def color_mode(self):
+    def color_mode(self) -> ColorMode | None:
         """Return current color mode."""
         return self._color_mode
 
     @property
-    def supported_color_modes(self):
+    def supported_color_modes(self) -> set[ColorMode] | None:
         """Flag supported color modes."""
         return self._supported_color_modes
 
@@ -374,14 +450,6 @@ class LightTemplate(TemplateEntity, LightEntity):
                 self._update_temperature,
                 none_on_template_error=True,
             )
-        if self._color_template:
-            self.add_template_attribute(
-                "_hs_color",
-                self._color_template,
-                None,
-                self._update_hs,
-                none_on_template_error=True,
-            )
         if self._hs_template:
             self.add_template_attribute(
                 "_hs_color",
@@ -465,7 +533,7 @@ class LightTemplate(TemplateEntity, LightEntity):
             )
             self._color_mode = ColorMode.COLOR_TEMP
             self._temperature = color_temp
-            if self._hs_template is None and self._color_template is None:
+            if self._hs_template is None:
                 self._hs_color = None
             if self._rgb_template is None:
                 self._rgb_color = None
@@ -475,11 +543,7 @@ class LightTemplate(TemplateEntity, LightEntity):
                 self._rgbww_color = None
             optimistic_set = True
 
-        if (
-            self._hs_template is None
-            and self._color_template is None
-            and ATTR_HS_COLOR in kwargs
-        ):
+        if self._hs_template is None and ATTR_HS_COLOR in kwargs:
             _LOGGER.debug(
                 "Optimistically setting hs color to %s",
                 kwargs[ATTR_HS_COLOR],
@@ -505,7 +569,7 @@ class LightTemplate(TemplateEntity, LightEntity):
             self._rgb_color = kwargs[ATTR_RGB_COLOR]
             if self._temperature_template is None:
                 self._temperature = None
-            if self._hs_template is None and self._color_template is None:
+            if self._hs_template is None:
                 self._hs_color = None
             if self._rgbw_template is None:
                 self._rgbw_color = None
@@ -522,7 +586,7 @@ class LightTemplate(TemplateEntity, LightEntity):
             self._rgbw_color = kwargs[ATTR_RGBW_COLOR]
             if self._temperature_template is None:
                 self._temperature = None
-            if self._hs_template is None and self._color_template is None:
+            if self._hs_template is None:
                 self._hs_color = None
             if self._rgb_template is None:
                 self._rgb_color = None
@@ -539,7 +603,7 @@ class LightTemplate(TemplateEntity, LightEntity):
             self._rgbww_color = kwargs[ATTR_RGBWW_COLOR]
             if self._temperature_template is None:
                 self._temperature = None
-            if self._hs_template is None and self._color_template is None:
+            if self._hs_template is None:
                 self._hs_color = None
             if self._rgb_template is None:
                 self._rgb_color = None
@@ -555,17 +619,22 @@ class LightTemplate(TemplateEntity, LightEntity):
         if ATTR_TRANSITION in kwargs and self._supports_transition is True:
             common_params["transition"] = kwargs[ATTR_TRANSITION]
 
-        if ATTR_COLOR_TEMP_KELVIN in kwargs and self._temperature_script:
+        if ATTR_COLOR_TEMP_KELVIN in kwargs and (
+            temperature_script := self._action_scripts.get(CONF_TEMPERATURE_ACTION)
+        ):
             common_params["color_temp"] = color_util.color_temperature_kelvin_to_mired(
                 kwargs[ATTR_COLOR_TEMP_KELVIN]
             )
 
             await self.async_run_script(
-                self._temperature_script,
+                temperature_script,
                 run_variables=common_params,
                 context=self._context,
             )
-        elif ATTR_EFFECT in kwargs and self._effect_script:
+        elif ATTR_EFFECT in kwargs and (
+            effect_script := self._action_scripts.get(CONF_EFFECT_ACTION)
+        ):
+            assert self._effect_list is not None
             effect = kwargs[ATTR_EFFECT]
             if effect not in self._effect_list:
                 _LOGGER.error(
@@ -579,27 +648,22 @@ class LightTemplate(TemplateEntity, LightEntity):
             common_params["effect"] = effect
 
             await self.async_run_script(
-                self._effect_script, run_variables=common_params, context=self._context
+                effect_script, run_variables=common_params, context=self._context
             )
-        elif ATTR_HS_COLOR in kwargs and self._color_script:
+        elif ATTR_HS_COLOR in kwargs and (
+            hs_script := self._action_scripts.get(CONF_HS_ACTION)
+        ):
             hs_value = kwargs[ATTR_HS_COLOR]
             common_params["hs"] = hs_value
             common_params["h"] = int(hs_value[0])
             common_params["s"] = int(hs_value[1])
 
             await self.async_run_script(
-                self._color_script, run_variables=common_params, context=self._context
+                hs_script, run_variables=common_params, context=self._context
             )
-        elif ATTR_HS_COLOR in kwargs and self._hs_script:
-            hs_value = kwargs[ATTR_HS_COLOR]
-            common_params["hs"] = hs_value
-            common_params["h"] = int(hs_value[0])
-            common_params["s"] = int(hs_value[1])
-
-            await self.async_run_script(
-                self._hs_script, run_variables=common_params, context=self._context
-            )
-        elif ATTR_RGBWW_COLOR in kwargs and self._rgbww_script:
+        elif ATTR_RGBWW_COLOR in kwargs and (
+            rgbww_script := self._action_scripts.get(CONF_RGBWW_ACTION)
+        ):
             rgbww_value = kwargs[ATTR_RGBWW_COLOR]
             common_params["rgbww"] = rgbww_value
             common_params["rgb"] = (
@@ -614,9 +678,11 @@ class LightTemplate(TemplateEntity, LightEntity):
             common_params["ww"] = int(rgbww_value[4])
 
             await self.async_run_script(
-                self._rgbww_script, run_variables=common_params, context=self._context
+                rgbww_script, run_variables=common_params, context=self._context
             )
-        elif ATTR_RGBW_COLOR in kwargs and self._rgbw_script:
+        elif ATTR_RGBW_COLOR in kwargs and (
+            rgbw_script := self._action_scripts.get(CONF_RGBW_ACTION)
+        ):
             rgbw_value = kwargs[ATTR_RGBW_COLOR]
             common_params["rgbw"] = rgbw_value
             common_params["rgb"] = (
@@ -630,9 +696,11 @@ class LightTemplate(TemplateEntity, LightEntity):
             common_params["w"] = int(rgbw_value[3])
 
             await self.async_run_script(
-                self._rgbw_script, run_variables=common_params, context=self._context
+                rgbw_script, run_variables=common_params, context=self._context
             )
-        elif ATTR_RGB_COLOR in kwargs and self._rgb_script:
+        elif ATTR_RGB_COLOR in kwargs and (
+            rgb_script := self._action_scripts.get(CONF_RGB_ACTION)
+        ):
             rgb_value = kwargs[ATTR_RGB_COLOR]
             common_params["rgb"] = rgb_value
             common_params["r"] = int(rgb_value[0])
@@ -640,15 +708,19 @@ class LightTemplate(TemplateEntity, LightEntity):
             common_params["b"] = int(rgb_value[2])
 
             await self.async_run_script(
-                self._rgb_script, run_variables=common_params, context=self._context
+                rgb_script, run_variables=common_params, context=self._context
             )
-        elif ATTR_BRIGHTNESS in kwargs and self._level_script:
+        elif ATTR_BRIGHTNESS in kwargs and (
+            level_script := self._action_scripts.get(CONF_LEVEL_ACTION)
+        ):
             await self.async_run_script(
-                self._level_script, run_variables=common_params, context=self._context
+                level_script, run_variables=common_params, context=self._context
             )
         else:
             await self.async_run_script(
-                self._on_script, run_variables=common_params, context=self._context
+                self._action_scripts[CONF_ON_ACTION],
+                run_variables=common_params,
+                context=self._context,
             )
 
         if optimistic_set:
@@ -656,14 +728,15 @@ class LightTemplate(TemplateEntity, LightEntity):
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the light off."""
+        off_script = self._action_scripts[CONF_OFF_ACTION]
         if ATTR_TRANSITION in kwargs and self._supports_transition is True:
             await self.async_run_script(
-                self._off_script,
+                off_script,
                 run_variables={"transition": kwargs[ATTR_TRANSITION]},
                 context=self._context,
             )
         else:
-            await self.async_run_script(self._off_script, context=self._context)
+            await self.async_run_script(off_script, context=self._context)
         if self._template is None:
             self._state = False
             self.async_write_ha_state()
@@ -1013,7 +1086,7 @@ class LightTemplate(TemplateEntity, LightEntity):
         if render in (None, "None", ""):
             self._supports_transition = False
             return
-        self._attr_supported_features &= LightEntityFeature.EFFECT
+        self._attr_supported_features &= ~LightEntityFeature.TRANSITION
         self._supports_transition = bool(render)
         if self._supports_transition:
             self._attr_supported_features |= LightEntityFeature.TRANSITION
diff --git a/homeassistant/components/template/lock.py b/homeassistant/components/template/lock.py
index f194154a50c..b19cadff26c 100644
--- a/homeassistant/components/template/lock.py
+++ b/homeassistant/components/template/lock.py
@@ -21,9 +21,8 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ServiceValidationError, TemplateError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.script import Script
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import DOMAIN
@@ -90,13 +89,18 @@ class TemplateLock(TemplateEntity, LockEntity):
         )
         self._state: LockState | None = None
         name = self._attr_name
-        assert name
+        if TYPE_CHECKING:
+            assert name is not None
+
         self._state_template = config.get(CONF_VALUE_TEMPLATE)
-        self._command_lock = Script(hass, config[CONF_LOCK], name, DOMAIN)
-        self._command_unlock = Script(hass, config[CONF_UNLOCK], name, DOMAIN)
-        if CONF_OPEN in config:
-            self._command_open = Script(hass, config[CONF_OPEN], name, DOMAIN)
-            self._attr_supported_features |= LockEntityFeature.OPEN
+        for action_id, supported_feature in (
+            (CONF_LOCK, 0),
+            (CONF_UNLOCK, 0),
+            (CONF_OPEN, LockEntityFeature.OPEN),
+        ):
+            if action_config := config.get(action_id):
+                self.add_script(action_id, action_config, name, DOMAIN)
+                self._attr_supported_features |= supported_feature
         self._code_format_template = config.get(CONF_CODE_FORMAT_TEMPLATE)
         self._code_format: str | None = None
         self._code_format_template_error: TemplateError | None = None
@@ -210,7 +214,9 @@ class TemplateLock(TemplateEntity, LockEntity):
         tpl_vars = {ATTR_CODE: kwargs.get(ATTR_CODE) if kwargs else None}
 
         await self.async_run_script(
-            self._command_lock, run_variables=tpl_vars, context=self._context
+            self._action_scripts[CONF_LOCK],
+            run_variables=tpl_vars,
+            context=self._context,
         )
 
     async def async_unlock(self, **kwargs: Any) -> None:
@@ -226,7 +232,9 @@ class TemplateLock(TemplateEntity, LockEntity):
         tpl_vars = {ATTR_CODE: kwargs.get(ATTR_CODE) if kwargs else None}
 
         await self.async_run_script(
-            self._command_unlock, run_variables=tpl_vars, context=self._context
+            self._action_scripts[CONF_UNLOCK],
+            run_variables=tpl_vars,
+            context=self._context,
         )
 
     async def async_open(self, **kwargs: Any) -> None:
@@ -242,7 +250,9 @@ class TemplateLock(TemplateEntity, LockEntity):
         tpl_vars = {ATTR_CODE: kwargs.get(ATTR_CODE) if kwargs else None}
 
         await self.async_run_script(
-            self._command_open, run_variables=tpl_vars, context=self._context
+            self._action_scripts[CONF_OPEN],
+            run_variables=tpl_vars,
+            context=self._context,
         )
 
     def _raise_template_error_if_available(self):
diff --git a/homeassistant/components/template/manifest.json b/homeassistant/components/template/manifest.json
index f1225f74f06..32bfd8ce02e 100644
--- a/homeassistant/components/template/manifest.json
+++ b/homeassistant/components/template/manifest.json
@@ -2,7 +2,7 @@
   "domain": "template",
   "name": "Template",
   "after_dependencies": ["group"],
-  "codeowners": ["@PhracturedBlue", "@home-assistant/core"],
+  "codeowners": ["@Petro31", "@PhracturedBlue", "@home-assistant/core"],
   "config_flow": true,
   "dependencies": ["blueprint"],
   "documentation": "https://www.home-assistant.io/integrations/template",
diff --git a/homeassistant/components/template/number.py b/homeassistant/components/template/number.py
index 90dd555ca42..3ecf1db565a 100644
--- a/homeassistant/components/template/number.py
+++ b/homeassistant/components/template/number.py
@@ -27,8 +27,10 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, selector
 from homeassistant.helpers.device import async_device_info_to_link_from_device_id
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.script import Script
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import TriggerUpdateCoordinator
@@ -121,7 +123,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize config entry."""
     _options = dict(config_entry.options)
@@ -154,9 +156,7 @@ class TemplateNumber(TemplateEntity, NumberEntity):
         super().__init__(hass, config=config, unique_id=unique_id)
         assert self._attr_name is not None
         self._value_template = config[CONF_STATE]
-        self._command_set_value = Script(
-            hass, config[CONF_SET_VALUE], self._attr_name, DOMAIN
-        )
+        self.add_script(CONF_SET_VALUE, config[CONF_SET_VALUE], self._attr_name, DOMAIN)
 
         self._step_template = config[CONF_STEP]
         self._min_value_template = config[CONF_MIN]
@@ -207,9 +207,9 @@ class TemplateNumber(TemplateEntity, NumberEntity):
         if self._optimistic:
             self._attr_native_value = value
             self.async_write_ha_state()
-        if self._command_set_value:
+        if set_value := self._action_scripts.get(CONF_SET_VALUE):
             await self.async_run_script(
-                self._command_set_value,
+                set_value,
                 run_variables={ATTR_VALUE: value},
                 context=self._context,
             )
@@ -235,12 +235,8 @@ class TriggerNumberEntity(TriggerEntity, NumberEntity):
         """Initialize the entity."""
         super().__init__(hass, coordinator, config)
 
-        self._command_set_value = Script(
-            hass,
-            config[CONF_SET_VALUE],
-            self._rendered.get(CONF_NAME, DEFAULT_NAME),
-            DOMAIN,
-        )
+        name = self._rendered.get(CONF_NAME, DEFAULT_NAME)
+        self.add_script(CONF_SET_VALUE, config[CONF_SET_VALUE], name, DOMAIN)
 
         self._attr_native_unit_of_measurement = config.get(CONF_UNIT_OF_MEASUREMENT)
 
@@ -275,6 +271,9 @@ class TriggerNumberEntity(TriggerEntity, NumberEntity):
         if self._config[CONF_OPTIMISTIC]:
             self._attr_native_value = value
             self.async_write_ha_state()
-        await self._command_set_value.async_run(
-            {ATTR_VALUE: value}, context=self._context
-        )
+        if set_value := self._action_scripts.get(CONF_SET_VALUE):
+            await self.async_run_script(
+                set_value,
+                run_variables={ATTR_VALUE: value},
+                context=self._context,
+            )
diff --git a/homeassistant/components/template/select.py b/homeassistant/components/template/select.py
index bd37ca1015c..eb60a3dbfe4 100644
--- a/homeassistant/components/template/select.py
+++ b/homeassistant/components/template/select.py
@@ -24,8 +24,10 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, selector
 from homeassistant.helpers.device import async_device_info_to_link_from_device_id
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.script import Script
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import TriggerUpdateCoordinator
@@ -115,7 +117,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize config entry."""
     _options = dict(config_entry.options)
@@ -139,10 +141,8 @@ class TemplateSelect(TemplateEntity, SelectEntity):
         super().__init__(hass, config=config, unique_id=unique_id)
         assert self._attr_name is not None
         self._value_template = config[CONF_STATE]
-        if (selection_option := config.get(CONF_SELECT_OPTION)) is not None:
-            self._command_select_option = Script(
-                hass, selection_option, self._attr_name, DOMAIN
-            )
+        if select_option := config.get(CONF_SELECT_OPTION):
+            self.add_script(CONF_SELECT_OPTION, select_option, self._attr_name, DOMAIN)
         self._options_template = config[ATTR_OPTIONS]
         self._attr_assumed_state = self._optimistic = config.get(CONF_OPTIMISTIC, False)
         self._attr_options = []
@@ -174,9 +174,9 @@ class TemplateSelect(TemplateEntity, SelectEntity):
         if self._optimistic:
             self._attr_current_option = option
             self.async_write_ha_state()
-        if self._command_select_option:
+        if select_option := self._action_scripts.get(CONF_SELECT_OPTION):
             await self.async_run_script(
-                self._command_select_option,
+                select_option,
                 run_variables={ATTR_OPTION: option},
                 context=self._context,
             )
@@ -197,12 +197,13 @@ class TriggerSelectEntity(TriggerEntity, SelectEntity):
     ) -> None:
         """Initialize the entity."""
         super().__init__(hass, coordinator, config)
-        self._command_select_option = Script(
-            hass,
-            config[CONF_SELECT_OPTION],
-            self._rendered.get(CONF_NAME, DEFAULT_NAME),
-            DOMAIN,
-        )
+        if select_option := config.get(CONF_SELECT_OPTION):
+            self.add_script(
+                CONF_SELECT_OPTION,
+                select_option,
+                self._rendered.get(CONF_NAME, DEFAULT_NAME),
+                DOMAIN,
+            )
 
     @property
     def current_option(self) -> str | None:
@@ -219,6 +220,9 @@ class TriggerSelectEntity(TriggerEntity, SelectEntity):
         if self._config[CONF_OPTIMISTIC]:
             self._attr_current_option = option
             self.async_write_ha_state()
-        await self._command_select_option.async_run(
-            {ATTR_OPTION: option}, context=self._context
-        )
+        if select_option := self._action_scripts.get(CONF_SELECT_OPTION):
+            await self.async_run_script(
+                select_option,
+                run_variables={ATTR_OPTION: option},
+                context=self._context,
+            )
diff --git a/homeassistant/components/template/sensor.py b/homeassistant/components/template/sensor.py
index ee24407699d..ca3736ebf76 100644
--- a/homeassistant/components/template/sensor.py
+++ b/homeassistant/components/template/sensor.py
@@ -44,7 +44,10 @@ from homeassistant.exceptions import TemplateError
 from homeassistant.helpers import config_validation as cv, selector, template
 from homeassistant.helpers.device import async_device_info_to_link_from_device_id
 from homeassistant.helpers.entity import async_generate_entity_id
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.trigger_template_entity import TEMPLATE_SENSOR_BASE_SCHEMA
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util
@@ -178,7 +181,7 @@ _LOGGER = logging.getLogger(__name__)
 
 @callback
 def _async_create_template_tracking_entities(
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddEntitiesCallback | AddConfigEntryEntitiesCallback,
     hass: HomeAssistant,
     definitions: list[dict],
     unique_id_prefix: str | None,
@@ -237,7 +240,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize config entry."""
     _options = dict(config_entry.options)
diff --git a/homeassistant/components/template/switch.py b/homeassistant/components/template/switch.py
index bddb51e5e67..b76fc28b83c 100644
--- a/homeassistant/components/template/switch.py
+++ b/homeassistant/components/template/switch.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import voluptuous as vol
 
@@ -17,6 +17,7 @@ from homeassistant.const import (
     ATTR_FRIENDLY_NAME,
     CONF_DEVICE_ID,
     CONF_NAME,
+    CONF_STATE,
     CONF_SWITCHES,
     CONF_UNIQUE_ID,
     CONF_VALUE_TEMPLATE,
@@ -25,24 +26,51 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import TemplateError
-from homeassistant.helpers import config_validation as cv, selector
+from homeassistant.helpers import config_validation as cv, selector, template
 from homeassistant.helpers.device import async_device_info_to_link_from_device_id
 from homeassistant.helpers.entity import async_generate_entity_id
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.restore_state import RestoreEntity
-from homeassistant.helpers.script import Script
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from .const import CONF_TURN_OFF, CONF_TURN_ON, DOMAIN
+from .const import CONF_OBJECT_ID, CONF_PICTURE, CONF_TURN_OFF, CONF_TURN_ON, DOMAIN
 from .template_entity import (
+    LEGACY_FIELDS as TEMPLATE_ENTITY_LEGACY_FIELDS,
+    TEMPLATE_ENTITY_AVAILABILITY_SCHEMA,
     TEMPLATE_ENTITY_COMMON_SCHEMA_LEGACY,
+    TEMPLATE_ENTITY_ICON_SCHEMA,
     TemplateEntity,
     rewrite_common_legacy_to_modern_conf,
 )
 
 _VALID_STATES = [STATE_ON, STATE_OFF, "true", "false"]
 
-SWITCH_SCHEMA = vol.All(
+LEGACY_FIELDS = TEMPLATE_ENTITY_LEGACY_FIELDS | {
+    CONF_VALUE_TEMPLATE: CONF_STATE,
+}
+
+DEFAULT_NAME = "Template Switch"
+
+
+SWITCH_SCHEMA = (
+    vol.Schema(
+        {
+            vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.template,
+            vol.Optional(CONF_STATE): cv.template,
+            vol.Required(CONF_TURN_ON): cv.SCRIPT_SCHEMA,
+            vol.Required(CONF_TURN_OFF): cv.SCRIPT_SCHEMA,
+            vol.Optional(CONF_UNIQUE_ID): cv.string,
+            vol.Optional(CONF_PICTURE): cv.template,
+        }
+    )
+    .extend(TEMPLATE_ENTITY_AVAILABILITY_SCHEMA.schema)
+    .extend(TEMPLATE_ENTITY_ICON_SCHEMA.schema)
+)
+
+LEGACY_SWITCH_SCHEMA = vol.All(
     cv.deprecated(ATTR_ENTITY_ID),
     vol.Schema(
         {
@@ -57,13 +85,13 @@ SWITCH_SCHEMA = vol.All(
 )
 
 PLATFORM_SCHEMA = SWITCH_PLATFORM_SCHEMA.extend(
-    {vol.Required(CONF_SWITCHES): cv.schema_with_slug_keys(SWITCH_SCHEMA)}
+    {vol.Required(CONF_SWITCHES): cv.schema_with_slug_keys(LEGACY_SWITCH_SCHEMA)}
 )
 
 SWITCH_CONFIG_SCHEMA = vol.Schema(
     {
         vol.Required(CONF_NAME): cv.template,
-        vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
+        vol.Optional(CONF_STATE): cv.template,
         vol.Optional(CONF_TURN_ON): cv.SCRIPT_SCHEMA,
         vol.Optional(CONF_TURN_OFF): cv.SCRIPT_SCHEMA,
         vol.Optional(CONF_DEVICE_ID): selector.DeviceSelector(),
@@ -71,24 +99,62 @@ SWITCH_CONFIG_SCHEMA = vol.Schema(
 )
 
 
-async def _async_create_entities(hass, config):
-    """Create the Template switches."""
+def rewrite_legacy_to_modern_conf(
+    hass: HomeAssistant, config: dict[str, dict]
+) -> list[dict]:
+    """Rewrite legacy switch configuration definitions to modern ones."""
     switches = []
 
-    for object_id, entity_config in config[CONF_SWITCHES].items():
-        entity_config = rewrite_common_legacy_to_modern_conf(hass, entity_config)
-        unique_id = entity_config.get(CONF_UNIQUE_ID)
+    for object_id, entity_conf in config.items():
+        entity_conf = {**entity_conf, CONF_OBJECT_ID: object_id}
+
+        entity_conf = rewrite_common_legacy_to_modern_conf(
+            hass, entity_conf, LEGACY_FIELDS
+        )
+
+        if CONF_NAME not in entity_conf:
+            entity_conf[CONF_NAME] = template.Template(object_id, hass)
+
+        switches.append(entity_conf)
+
+    return switches
+
+
+def rewrite_options_to_moder_conf(option_config: dict[str, dict]) -> dict[str, dict]:
+    """Rewrite option configuration to modern configuration."""
+    option_config = {**option_config}
+
+    if CONF_VALUE_TEMPLATE in option_config:
+        option_config[CONF_STATE] = option_config.pop(CONF_VALUE_TEMPLATE)
+
+    return option_config
+
+
+@callback
+def _async_create_template_tracking_entities(
+    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant,
+    definitions: list[dict],
+    unique_id_prefix: str | None,
+) -> None:
+    """Create the template switches."""
+    switches = []
+
+    for entity_conf in definitions:
+        unique_id = entity_conf.get(CONF_UNIQUE_ID)
+
+        if unique_id and unique_id_prefix:
+            unique_id = f"{unique_id_prefix}-{unique_id}"
 
         switches.append(
             SwitchTemplate(
                 hass,
-                object_id,
-                entity_config,
+                entity_conf,
                 unique_id,
             )
         )
 
-    return switches
+    async_add_entities(switches)
 
 
 async def async_setup_platform(
@@ -98,21 +164,34 @@ async def async_setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the template switches."""
-    async_add_entities(await _async_create_entities(hass, config))
+    if discovery_info is None:
+        _async_create_template_tracking_entities(
+            async_add_entities,
+            hass,
+            rewrite_legacy_to_modern_conf(hass, config[CONF_SWITCHES]),
+            None,
+        )
+        return
+
+    _async_create_template_tracking_entities(
+        async_add_entities,
+        hass,
+        discovery_info["entities"],
+        discovery_info["unique_id"],
+    )
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize config entry."""
     _options = dict(config_entry.options)
     _options.pop("template_type")
+    _options = rewrite_options_to_moder_conf(_options)
     validated_config = SWITCH_CONFIG_SCHEMA(_options)
-    async_add_entities(
-        [SwitchTemplate(hass, None, validated_config, config_entry.entry_id)]
-    )
+    async_add_entities([SwitchTemplate(hass, validated_config, config_entry.entry_id)])
 
 
 @callback
@@ -121,7 +200,7 @@ def async_create_preview_switch(
 ) -> SwitchTemplate:
     """Create a preview switch."""
     validated_config = SWITCH_CONFIG_SCHEMA(config | {CONF_NAME: name})
-    return SwitchTemplate(hass, None, validated_config, None)
+    return SwitchTemplate(hass, validated_config, None)
 
 
 class SwitchTemplate(TemplateEntity, SwitchEntity, RestoreEntity):
@@ -131,31 +210,26 @@ class SwitchTemplate(TemplateEntity, SwitchEntity, RestoreEntity):
 
     def __init__(
         self,
-        hass,
-        object_id,
-        config,
-        unique_id,
-    ):
+        hass: HomeAssistant,
+        config: ConfigType,
+        unique_id: str | None,
+    ) -> None:
         """Initialize the Template switch."""
-        super().__init__(
-            hass, config=config, fallback_name=object_id, unique_id=unique_id
-        )
-        if object_id is not None:
+        super().__init__(hass, config=config, fallback_name=None, unique_id=unique_id)
+        if (object_id := config.get(CONF_OBJECT_ID)) is not None:
             self.entity_id = async_generate_entity_id(
                 ENTITY_ID_FORMAT, object_id, hass=hass
             )
-        friendly_name = self._attr_name
-        self._template = config.get(CONF_VALUE_TEMPLATE)
-        self._on_script = (
-            Script(hass, config.get(CONF_TURN_ON), friendly_name, DOMAIN)
-            if config.get(CONF_TURN_ON) is not None
-            else None
-        )
-        self._off_script = (
-            Script(hass, config.get(CONF_TURN_OFF), friendly_name, DOMAIN)
-            if config.get(CONF_TURN_OFF) is not None
-            else None
-        )
+        name = self._attr_name
+        if TYPE_CHECKING:
+            assert name is not None
+        self._template = config.get(CONF_STATE)
+
+        if on_action := config.get(CONF_TURN_ON):
+            self.add_script(CONF_TURN_ON, on_action, name, DOMAIN)
+        if off_action := config.get(CONF_TURN_OFF):
+            self.add_script(CONF_TURN_OFF, off_action, name, DOMAIN)
+
         self._state: bool | None = False
         self._attr_assumed_state = self._template is None
         self._attr_device_info = async_device_info_to_link_from_device_id(
@@ -206,16 +280,16 @@ class SwitchTemplate(TemplateEntity, SwitchEntity, RestoreEntity):
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Fire the on action."""
-        if self._on_script:
-            await self.async_run_script(self._on_script, context=self._context)
+        if on_script := self._action_scripts.get(CONF_TURN_ON):
+            await self.async_run_script(on_script, context=self._context)
         if self._template is None:
             self._state = True
             self.async_write_ha_state()
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Fire the off action."""
-        if self._off_script:
-            await self.async_run_script(self._off_script, context=self._context)
+        if off_script := self._action_scripts.get(CONF_TURN_OFF):
+            await self.async_run_script(off_script, context=self._context)
         if self._template is None:
             self._state = False
             self.async_write_ha_state()
diff --git a/homeassistant/components/template/template_entity.py b/homeassistant/components/template/template_entity.py
index d025f052732..88708278758 100644
--- a/homeassistant/components/template/template_entity.py
+++ b/homeassistant/components/template/template_entity.py
@@ -24,7 +24,6 @@ from homeassistant.const import (
 )
 from homeassistant.core import (
     CALLBACK_TYPE,
-    Context,
     Event,
     EventStateChangedData,
     HomeAssistant,
@@ -33,7 +32,7 @@ from homeassistant.core import (
     validate_state,
 )
 from homeassistant.exceptions import TemplateError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.event import (
     TrackTemplate,
@@ -41,7 +40,7 @@ from homeassistant.helpers.event import (
     TrackTemplateResultInfo,
     async_track_template_result,
 )
-from homeassistant.helpers.script import Script, _VarsType
+from homeassistant.helpers.script_variables import ScriptVariables
 from homeassistant.helpers.start import async_at_start
 from homeassistant.helpers.template import (
     Template,
@@ -61,6 +60,7 @@ from .const import (
     CONF_AVAILABILITY_TEMPLATE,
     CONF_PICTURE,
 )
+from .entity import AbstractTemplateEntity
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -248,7 +248,7 @@ class _TemplateAttribute:
         return
 
 
-class TemplateEntity(Entity):  # pylint: disable=hass-enforce-class-module
+class TemplateEntity(AbstractTemplateEntity):
     """Entity that uses templates to calculate attributes."""
 
     _attr_available = True
@@ -268,6 +268,7 @@ class TemplateEntity(Entity):  # pylint: disable=hass-enforce-class-module
         unique_id: str | None = None,
     ) -> None:
         """Template Entity."""
+        super().__init__(hass)
         self._template_attrs: dict[Template, list[_TemplateAttribute]] = {}
         self._template_result_info: TrackTemplateResultInfo | None = None
         self._attr_extra_state_attributes = {}
@@ -285,6 +286,7 @@ class TemplateEntity(Entity):  # pylint: disable=hass-enforce-class-module
             ]
             | None
         ) = None
+        self._run_variables: ScriptVariables | dict
         if config is None:
             self._attribute_templates = attribute_templates
             self._availability_template = availability_template
@@ -339,18 +341,6 @@ class TemplateEntity(Entity):  # pylint: disable=hass-enforce-class-module
                     variables=variables, parse_result=False
                 )
 
-    @callback
-    def _render_variables(self) -> dict:
-        if isinstance(self._run_variables, dict):
-            return self._run_variables
-
-        return self._run_variables.async_render(
-            self.hass,
-            {
-                "this": TemplateStateFromEntityId(self.hass, self.entity_id),
-            },
-        )
-
     @callback
     def _update_available(self, result: str | TemplateError) -> None:
         if isinstance(result, TemplateError):
@@ -387,6 +377,18 @@ class TemplateEntity(Entity):  # pylint: disable=hass-enforce-class-module
             return None
         return cast(str, self._blueprint_inputs[CONF_USE_BLUEPRINT][CONF_PATH])
 
+    def _render_script_variables(self) -> dict[str, Any]:
+        """Render configured variables."""
+        if isinstance(self._run_variables, dict):
+            return self._run_variables
+
+        return self._run_variables.async_render(
+            self.hass,
+            {
+                "this": TemplateStateFromEntityId(self.hass, self.entity_id),
+            },
+        )
+
     def add_template_attribute(
         self,
         attribute: str,
@@ -488,7 +490,7 @@ class TemplateEntity(Entity):  # pylint: disable=hass-enforce-class-module
 
         variables = {
             "this": TemplateStateFromEntityId(self.hass, self.entity_id),
-            **self._render_variables(),
+            **self._render_script_variables(),
         }
 
         for template, attributes in self._template_attrs.items():
@@ -581,22 +583,3 @@ class TemplateEntity(Entity):  # pylint: disable=hass-enforce-class-module
         """Call for forced update."""
         assert self._template_result_info
         self._template_result_info.async_refresh()
-
-    async def async_run_script(
-        self,
-        script: Script,
-        *,
-        run_variables: _VarsType | None = None,
-        context: Context | None = None,
-    ) -> None:
-        """Run an action script."""
-        if run_variables is None:
-            run_variables = {}
-        await script.async_run(
-            run_variables={
-                "this": TemplateStateFromEntityId(self.hass, self.entity_id),
-                **self._render_variables(),
-                **run_variables,
-            },
-            context=context,
-        )
diff --git a/homeassistant/components/template/trigger_entity.py b/homeassistant/components/template/trigger_entity.py
index 5130f332d5b..87c93b6143b 100644
--- a/homeassistant/components/template/trigger_entity.py
+++ b/homeassistant/components/template/trigger_entity.py
@@ -8,10 +8,13 @@ from homeassistant.helpers.trigger_template_entity import TriggerBaseEntity
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import TriggerUpdateCoordinator
+from .entity import AbstractTemplateEntity
 
 
 class TriggerEntity(  # pylint: disable=hass-enforce-class-module
-    TriggerBaseEntity, CoordinatorEntity[TriggerUpdateCoordinator]
+    TriggerBaseEntity,
+    CoordinatorEntity[TriggerUpdateCoordinator],
+    AbstractTemplateEntity,
 ):
     """Template entity based on trigger data."""
 
@@ -24,6 +27,7 @@ class TriggerEntity(  # pylint: disable=hass-enforce-class-module
         """Initialize the entity."""
         CoordinatorEntity.__init__(self, coordinator)
         TriggerBaseEntity.__init__(self, hass, config)
+        AbstractTemplateEntity.__init__(self, hass)
 
     async def async_added_to_hass(self) -> None:
         """Handle being added to Home Assistant."""
@@ -38,6 +42,16 @@ class TriggerEntity(  # pylint: disable=hass-enforce-class-module
         else:
             self._unique_id = unique_id
 
+    @property
+    def referenced_blueprint(self) -> str | None:
+        """Return referenced blueprint or None."""
+        return self.coordinator.referenced_blueprint
+
+    @callback
+    def _render_script_variables(self) -> dict:
+        """Render configured variables."""
+        return self.coordinator.data["run_variables"]
+
     @callback
     def _process_data(self) -> None:
         """Process new data."""
diff --git a/homeassistant/components/template/vacuum.py b/homeassistant/components/template/vacuum.py
index 19029cc708b..c4d41b52f31 100644
--- a/homeassistant/components/template/vacuum.py
+++ b/homeassistant/components/template/vacuum.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import voluptuous as vol
 
@@ -30,10 +30,9 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import TemplateError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import async_generate_entity_id
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.script import Script
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import DOMAIN
@@ -90,7 +89,7 @@ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend(
 )
 
 
-async def _async_create_entities(hass, config):
+async def _async_create_entities(hass: HomeAssistant, config: ConfigType):
     """Create the Template Vacuums."""
     vacuums = []
 
@@ -127,11 +126,11 @@ class TemplateVacuum(TemplateEntity, StateVacuumEntity):
 
     def __init__(
         self,
-        hass,
+        hass: HomeAssistant,
         object_id,
-        config,
+        config: ConfigType,
         unique_id,
-    ):
+    ) -> None:
         """Initialize the vacuum."""
         super().__init__(
             hass, config=config, fallback_name=object_id, unique_id=unique_id
@@ -139,7 +138,9 @@ class TemplateVacuum(TemplateEntity, StateVacuumEntity):
         self.entity_id = async_generate_entity_id(
             ENTITY_ID_FORMAT, object_id, hass=hass
         )
-        friendly_name = self._attr_name
+        name = self._attr_name
+        if TYPE_CHECKING:
+            assert name is not None
 
         self._template = config.get(CONF_VALUE_TEMPLATE)
         self._battery_level_template = config.get(CONF_BATTERY_LEVEL_TEMPLATE)
@@ -148,43 +149,18 @@ class TemplateVacuum(TemplateEntity, StateVacuumEntity):
             VacuumEntityFeature.START | VacuumEntityFeature.STATE
         )
 
-        self._start_script = Script(hass, config[SERVICE_START], friendly_name, DOMAIN)
-
-        self._pause_script = None
-        if pause_action := config.get(SERVICE_PAUSE):
-            self._pause_script = Script(hass, pause_action, friendly_name, DOMAIN)
-            self._attr_supported_features |= VacuumEntityFeature.PAUSE
-
-        self._stop_script = None
-        if stop_action := config.get(SERVICE_STOP):
-            self._stop_script = Script(hass, stop_action, friendly_name, DOMAIN)
-            self._attr_supported_features |= VacuumEntityFeature.STOP
-
-        self._return_to_base_script = None
-        if return_to_base_action := config.get(SERVICE_RETURN_TO_BASE):
-            self._return_to_base_script = Script(
-                hass, return_to_base_action, friendly_name, DOMAIN
-            )
-            self._attr_supported_features |= VacuumEntityFeature.RETURN_HOME
-
-        self._clean_spot_script = None
-        if clean_spot_action := config.get(SERVICE_CLEAN_SPOT):
-            self._clean_spot_script = Script(
-                hass, clean_spot_action, friendly_name, DOMAIN
-            )
-            self._attr_supported_features |= VacuumEntityFeature.CLEAN_SPOT
-
-        self._locate_script = None
-        if locate_action := config.get(SERVICE_LOCATE):
-            self._locate_script = Script(hass, locate_action, friendly_name, DOMAIN)
-            self._attr_supported_features |= VacuumEntityFeature.LOCATE
-
-        self._set_fan_speed_script = None
-        if set_fan_speed_action := config.get(SERVICE_SET_FAN_SPEED):
-            self._set_fan_speed_script = Script(
-                hass, set_fan_speed_action, friendly_name, DOMAIN
-            )
-            self._attr_supported_features |= VacuumEntityFeature.FAN_SPEED
+        for action_id, supported_feature in (
+            (SERVICE_START, 0),
+            (SERVICE_PAUSE, VacuumEntityFeature.PAUSE),
+            (SERVICE_STOP, VacuumEntityFeature.STOP),
+            (SERVICE_RETURN_TO_BASE, VacuumEntityFeature.RETURN_HOME),
+            (SERVICE_CLEAN_SPOT, VacuumEntityFeature.CLEAN_SPOT),
+            (SERVICE_LOCATE, VacuumEntityFeature.LOCATE),
+            (SERVICE_SET_FAN_SPEED, VacuumEntityFeature.FAN_SPEED),
+        ):
+            if action_config := config.get(action_id):
+                self.add_script(action_id, action_config, name, DOMAIN)
+                self._attr_supported_features |= supported_feature
 
         self._state = None
         self._battery_level = None
@@ -203,62 +179,50 @@ class TemplateVacuum(TemplateEntity, StateVacuumEntity):
 
     async def async_start(self) -> None:
         """Start or resume the cleaning task."""
-        await self.async_run_script(self._start_script, context=self._context)
+        await self.async_run_script(
+            self._action_scripts[SERVICE_START], context=self._context
+        )
 
     async def async_pause(self) -> None:
         """Pause the cleaning task."""
-        if self._pause_script is None:
-            return
-
-        await self.async_run_script(self._pause_script, context=self._context)
+        if script := self._action_scripts.get(SERVICE_PAUSE):
+            await self.async_run_script(script, context=self._context)
 
     async def async_stop(self, **kwargs: Any) -> None:
         """Stop the cleaning task."""
-        if self._stop_script is None:
-            return
-
-        await self.async_run_script(self._stop_script, context=self._context)
+        if script := self._action_scripts.get(SERVICE_STOP):
+            await self.async_run_script(script, context=self._context)
 
     async def async_return_to_base(self, **kwargs: Any) -> None:
         """Set the vacuum cleaner to return to the dock."""
-        if self._return_to_base_script is None:
-            return
-
-        await self.async_run_script(self._return_to_base_script, context=self._context)
+        if script := self._action_scripts.get(SERVICE_RETURN_TO_BASE):
+            await self.async_run_script(script, context=self._context)
 
     async def async_clean_spot(self, **kwargs: Any) -> None:
         """Perform a spot clean-up."""
-        if self._clean_spot_script is None:
-            return
-
-        await self.async_run_script(self._clean_spot_script, context=self._context)
+        if script := self._action_scripts.get(SERVICE_CLEAN_SPOT):
+            await self.async_run_script(script, context=self._context)
 
     async def async_locate(self, **kwargs: Any) -> None:
         """Locate the vacuum cleaner."""
-        if self._locate_script is None:
-            return
-
-        await self.async_run_script(self._locate_script, context=self._context)
+        if script := self._action_scripts.get(SERVICE_LOCATE):
+            await self.async_run_script(script, context=self._context)
 
     async def async_set_fan_speed(self, fan_speed: str, **kwargs: Any) -> None:
         """Set fan speed."""
-        if self._set_fan_speed_script is None:
-            return
-
-        if fan_speed in self._attr_fan_speed_list:
-            self._attr_fan_speed = fan_speed
-            await self.async_run_script(
-                self._set_fan_speed_script,
-                run_variables={ATTR_FAN_SPEED: fan_speed},
-                context=self._context,
-            )
-        else:
+        if fan_speed not in self._attr_fan_speed_list:
             _LOGGER.error(
                 "Received invalid fan speed: %s for entity %s. Expected: %s",
                 fan_speed,
                 self.entity_id,
                 self._attr_fan_speed_list,
             )
+            return
+
+        if script := self._action_scripts.get(SERVICE_SET_FAN_SPEED):
+            await self.async_run_script(
+                script, run_variables={ATTR_FAN_SPEED: fan_speed}, context=self._context
+            )
 
     @callback
     def _async_setup_templates(self) -> None:
diff --git a/homeassistant/components/tensorflow/image_processing.py b/homeassistant/components/tensorflow/image_processing.py
index f4a3a7bfe07..15addd3513d 100644
--- a/homeassistant/components/tensorflow/image_processing.py
+++ b/homeassistant/components/tensorflow/image_processing.py
@@ -26,8 +26,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_START,
 )
 from homeassistant.core import HomeAssistant, split_entity_id
-from homeassistant.helpers import template
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, template
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util.pil import draw_box
diff --git a/homeassistant/components/tesla_fleet/__init__.py b/homeassistant/components/tesla_fleet/__init__.py
index 945c6351cfc..2642bd2f7d5 100644
--- a/homeassistant/components/tesla_fleet/__init__.py
+++ b/homeassistant/components/tesla_fleet/__init__.py
@@ -5,12 +5,7 @@ from typing import Final
 
 from aiohttp.client_exceptions import ClientResponseError
 import jwt
-from tesla_fleet_api import (
-    EnergySpecific,
-    TeslaFleetApi,
-    VehicleSigned,
-    VehicleSpecific,
-)
+from tesla_fleet_api import TeslaFleetApi
 from tesla_fleet_api.const import Scope
 from tesla_fleet_api.exceptions import (
     InvalidRegion,
@@ -25,13 +20,12 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.config_entry_oauth2_flow import (
     OAuth2Session,
     async_get_config_entry_implementation,
 )
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.device_registry import DeviceInfo
 
 from .const import DOMAIN, LOGGER, MODELS
@@ -129,7 +123,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslaFleetConfigEntry) -
     vehicles: list[TeslaFleetVehicleData] = []
     energysites: list[TeslaFleetEnergyData] = []
     for product in products:
-        if "vin" in product and hasattr(tesla, "vehicle"):
+        if "vin" in product and Scope.VEHICLE_DEVICE_DATA in scopes:
             # Remove the protobuff 'cached_data' that we do not use to save memory
             product.pop("cached_data", None)
             vin = product["vin"]
@@ -137,10 +131,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslaFleetConfigEntry) -
             if signing:
                 if not tesla.private_key:
                     await tesla.get_private_key(hass.config.path("tesla_fleet.key"))
-                api = VehicleSigned(tesla.vehicle, vin)
+                api = tesla.vehicles.createSigned(vin)
             else:
-                api = VehicleSpecific(tesla.vehicle, vin)
-            coordinator = TeslaFleetVehicleDataCoordinator(hass, api, product)
+                api = tesla.vehicles.createFleet(vin)
+            coordinator = TeslaFleetVehicleDataCoordinator(hass, entry, api, product)
 
             await coordinator.async_config_entry_first_refresh()
 
@@ -161,7 +155,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslaFleetConfigEntry) -
                     signing=signing,
                 )
             )
-        elif "energy_site_id" in product and hasattr(tesla, "energy"):
+        elif "energy_site_id" in product and Scope.ENERGY_DEVICE_DATA in scopes:
             site_id = product["energy_site_id"]
             if not (
                 product["components"]["battery"]
@@ -174,11 +168,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslaFleetConfigEntry) -
                 )
                 continue
 
-            api = EnergySpecific(tesla.energy, site_id)
+            api = tesla.energySites.create(site_id)
 
-            live_coordinator = TeslaFleetEnergySiteLiveCoordinator(hass, api)
-            history_coordinator = TeslaFleetEnergySiteHistoryCoordinator(hass, api)
-            info_coordinator = TeslaFleetEnergySiteInfoCoordinator(hass, api, product)
+            live_coordinator = TeslaFleetEnergySiteLiveCoordinator(hass, entry, api)
+            history_coordinator = TeslaFleetEnergySiteHistoryCoordinator(
+                hass, entry, api
+            )
+            info_coordinator = TeslaFleetEnergySiteInfoCoordinator(
+                hass, entry, api, product
+            )
 
             await live_coordinator.async_config_entry_first_refresh()
             await history_coordinator.async_config_entry_first_refresh()
@@ -224,7 +222,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslaFleetConfigEntry) -
     # Setup Platforms
     entry.runtime_data = TeslaFleetData(vehicles, energysites, scopes)
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
     return True
 
 
diff --git a/homeassistant/components/tesla_fleet/binary_sensor.py b/homeassistant/components/tesla_fleet/binary_sensor.py
index b92ef9233d1..886fe304c91 100644
--- a/homeassistant/components/tesla_fleet/binary_sensor.py
+++ b/homeassistant/components/tesla_fleet/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import TeslaFleetConfigEntry
@@ -179,7 +179,7 @@ ENERGY_INFO_DESCRIPTIONS: tuple[BinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslaFleetConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tesla Fleet binary sensor platform from a config entry."""
 
diff --git a/homeassistant/components/tesla_fleet/button.py b/homeassistant/components/tesla_fleet/button.py
index aea0f91a97c..2ddce2d517b 100644
--- a/homeassistant/components/tesla_fleet/button.py
+++ b/homeassistant/components/tesla_fleet/button.py
@@ -10,7 +10,7 @@ from tesla_fleet_api.const import Scope
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TeslaFleetConfigEntry
 from .entity import TeslaFleetVehicleEntity
@@ -61,7 +61,7 @@ DESCRIPTIONS: tuple[TeslaFleetButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslaFleetConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the TeslaFleet Button platform from a config entry."""
 
diff --git a/homeassistant/components/tesla_fleet/climate.py b/homeassistant/components/tesla_fleet/climate.py
index 06e9c9d7c64..f752509ee17 100644
--- a/homeassistant/components/tesla_fleet/climate.py
+++ b/homeassistant/components/tesla_fleet/climate.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TeslaFleetConfigEntry
 from .const import DOMAIN, TeslaFleetClimateSide
@@ -38,7 +38,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslaFleetConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tesla Fleet Climate platform from a config entry."""
 
diff --git a/homeassistant/components/tesla_fleet/coordinator.py b/homeassistant/components/tesla_fleet/coordinator.py
index 4d99319d49f..50a69258a31 100644
--- a/homeassistant/components/tesla_fleet/coordinator.py
+++ b/homeassistant/components/tesla_fleet/coordinator.py
@@ -1,11 +1,12 @@
 """Tesla Fleet Data Coordinator."""
 
+from __future__ import annotations
+
 from datetime import datetime, timedelta
 from random import randint
 from time import time
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
-from tesla_fleet_api import EnergySpecific, VehicleSpecific
 from tesla_fleet_api.const import TeslaEnergyPeriod, VehicleDataEndpoint
 from tesla_fleet_api.exceptions import (
     InvalidToken,
@@ -15,12 +16,15 @@ from tesla_fleet_api.exceptions import (
     TeslaFleetError,
     VehicleOffline,
 )
-from tesla_fleet_api.ratecalculator import RateCalculator
+from tesla_fleet_api.tesla import EnergySite, VehicleFleet
 
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
+if TYPE_CHECKING:
+    from . import TeslaFleetConfigEntry
+
 from .const import ENERGY_HISTORY_FIELDS, LOGGER, TeslaFleetState
 
 VEHICLE_INTERVAL_SECONDS = 300
@@ -57,18 +61,23 @@ def flatten(data: dict[str, Any], parent: str | None = None) -> dict[str, Any]:
 class TeslaFleetVehicleDataCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Class to manage fetching data from the TeslaFleet API."""
 
+    config_entry: TeslaFleetConfigEntry
     updated_once: bool
     pre2021: bool
     last_active: datetime
-    rate: RateCalculator
 
     def __init__(
-        self, hass: HomeAssistant, api: VehicleSpecific, product: dict
+        self,
+        hass: HomeAssistant,
+        config_entry: TeslaFleetConfigEntry,
+        api: VehicleFleet,
+        product: dict,
     ) -> None:
         """Initialize TeslaFleet Vehicle Update Coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name="Tesla Fleet Vehicle",
             update_interval=VEHICLE_INTERVAL,
         )
@@ -76,44 +85,36 @@ class TeslaFleetVehicleDataCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         self.data = flatten(product)
         self.updated_once = False
         self.last_active = datetime.now()
-        self.rate = RateCalculator(100, 86400, VEHICLE_INTERVAL_SECONDS, 3600, 5)
 
     async def _async_update_data(self) -> dict[str, Any]:
         """Update vehicle data using TeslaFleet API."""
 
         try:
-            # Check if the vehicle is awake using a non-rate limited API call
-            if self.data["state"] != TeslaFleetState.ONLINE:
-                response = await self.api.vehicle()
-                self.data["state"] = response["response"]["state"]
+            # Check if the vehicle is awake using a free API call
+            response = await self.api.vehicle()
+            self.data["state"] = response["response"]["state"]
 
             if self.data["state"] != TeslaFleetState.ONLINE:
                 return self.data
 
-            # This is a rated limited API call
-            self.rate.consume()
             response = await self.api.vehicle_data(endpoints=ENDPOINTS)
             data = response["response"]
 
         except VehicleOffline:
             self.data["state"] = TeslaFleetState.ASLEEP
             return self.data
-        except RateLimited as e:
+        except RateLimited:
             LOGGER.warning(
-                "%s rate limited, will retry in %s seconds",
+                "%s rate limited, will skip refresh",
                 self.name,
-                e.data.get("after"),
             )
-            if "after" in e.data:
-                self.update_interval = timedelta(seconds=int(e.data["after"]))
             return self.data
         except (InvalidToken, OAuthExpired, LoginRequired) as e:
             raise ConfigEntryAuthFailed from e
         except TeslaFleetError as e:
             raise UpdateFailed(e.message) from e
 
-        # Calculate ideal refresh interval
-        self.update_interval = timedelta(seconds=self.rate.calculate())
+        self.update_interval = VEHICLE_INTERVAL
 
         self.updated_once = True
 
@@ -141,13 +142,20 @@ class TeslaFleetVehicleDataCoordinator(DataUpdateCoordinator[dict[str, Any]]):
 class TeslaFleetEnergySiteLiveCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Class to manage fetching energy site live status from the TeslaFleet API."""
 
+    config_entry: TeslaFleetConfigEntry
     updated_once: bool
 
-    def __init__(self, hass: HomeAssistant, api: EnergySpecific) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: TeslaFleetConfigEntry,
+        api: EnergySite,
+    ) -> None:
         """Initialize TeslaFleet Energy Site Live coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name="Tesla Fleet Energy Site Live",
             update_interval=timedelta(seconds=10),
         )
@@ -188,11 +196,19 @@ class TeslaFleetEnergySiteLiveCoordinator(DataUpdateCoordinator[dict[str, Any]])
 class TeslaFleetEnergySiteHistoryCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Class to manage fetching energy site history import and export from the Tesla Fleet API."""
 
-    def __init__(self, hass: HomeAssistant, api: EnergySpecific) -> None:
+    config_entry: TeslaFleetConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: TeslaFleetConfigEntry,
+        api: EnergySite,
+    ) -> None:
         """Initialize Tesla Fleet Energy Site History coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=f"Tesla Fleet Energy History {api.energy_site_id}",
             update_interval=timedelta(seconds=300),
         )
@@ -232,7 +248,7 @@ class TeslaFleetEnergySiteHistoryCoordinator(DataUpdateCoordinator[dict[str, Any
         self.updated_once = True
 
         # Add all time periods together
-        output = {key: 0 for key in ENERGY_HISTORY_FIELDS}
+        output = dict.fromkeys(ENERGY_HISTORY_FIELDS, 0)
         for period in data.get("time_series", []):
             for key in ENERGY_HISTORY_FIELDS:
                 output[key] += period.get(key, 0)
@@ -243,13 +259,21 @@ class TeslaFleetEnergySiteHistoryCoordinator(DataUpdateCoordinator[dict[str, Any
 class TeslaFleetEnergySiteInfoCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Class to manage fetching energy site info from the TeslaFleet API."""
 
+    config_entry: TeslaFleetConfigEntry
     updated_once: bool
 
-    def __init__(self, hass: HomeAssistant, api: EnergySpecific, product: dict) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: TeslaFleetConfigEntry,
+        api: EnergySite,
+        product: dict,
+    ) -> None:
         """Initialize TeslaFleet Energy Info coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name="Tesla Fleet Energy Site Info",
             update_interval=timedelta(seconds=15),
         )
diff --git a/homeassistant/components/tesla_fleet/cover.py b/homeassistant/components/tesla_fleet/cover.py
index f270734424f..701b107f9f9 100644
--- a/homeassistant/components/tesla_fleet/cover.py
+++ b/homeassistant/components/tesla_fleet/cover.py
@@ -12,7 +12,7 @@ from homeassistant.components.cover import (
     CoverEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TeslaFleetConfigEntry
 from .entity import TeslaFleetVehicleEntity
@@ -28,7 +28,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslaFleetConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the TeslaFleet cover platform from a config entry."""
 
diff --git a/homeassistant/components/tesla_fleet/device_tracker.py b/homeassistant/components/tesla_fleet/device_tracker.py
index d6dcef895a6..19bf353c62d 100644
--- a/homeassistant/components/tesla_fleet/device_tracker.py
+++ b/homeassistant/components/tesla_fleet/device_tracker.py
@@ -6,7 +6,7 @@ from homeassistant.components.device_tracker.config_entry import TrackerEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_HOME
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from .entity import TeslaFleetVehicleEntity
@@ -14,7 +14,9 @@ from .models import TeslaFleetVehicleData
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tesla Fleet device tracker platform from a config entry."""
 
diff --git a/homeassistant/components/tesla_fleet/entity.py b/homeassistant/components/tesla_fleet/entity.py
index 0260acf368e..583e92595d0 100644
--- a/homeassistant/components/tesla_fleet/entity.py
+++ b/homeassistant/components/tesla_fleet/entity.py
@@ -3,8 +3,9 @@
 from abc import abstractmethod
 from typing import Any
 
-from tesla_fleet_api import EnergySpecific, VehicleSpecific
 from tesla_fleet_api.const import Scope
+from tesla_fleet_api.tesla.energysite import EnergySite
+from tesla_fleet_api.tesla.vehicle.fleet import VehicleFleet
 
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers.device_registry import DeviceInfo
@@ -41,7 +42,7 @@ class TeslaFleetEntity(
         | TeslaFleetEnergySiteLiveCoordinator
         | TeslaFleetEnergySiteHistoryCoordinator
         | TeslaFleetEnergySiteInfoCoordinator,
-        api: VehicleSpecific | EnergySpecific,
+        api: VehicleFleet | EnergySite,
         key: str,
     ) -> None:
         """Initialize common aspects of a TeslaFleet entity."""
diff --git a/homeassistant/components/tesla_fleet/icons.json b/homeassistant/components/tesla_fleet/icons.json
index c806138c219..f907107fd40 100644
--- a/homeassistant/components/tesla_fleet/icons.json
+++ b/homeassistant/components/tesla_fleet/icons.json
@@ -298,7 +298,7 @@
       }
     },
     "switch": {
-      "charge_state_user_charge_enable_request": {
+      "charge_state_charging_state": {
         "default": "mdi:ev-station"
       },
       "climate_state_auto_seat_climate_left": {
diff --git a/homeassistant/components/tesla_fleet/lock.py b/homeassistant/components/tesla_fleet/lock.py
index 32998d409be..cdb1d4b066b 100644
--- a/homeassistant/components/tesla_fleet/lock.py
+++ b/homeassistant/components/tesla_fleet/lock.py
@@ -9,7 +9,7 @@ from tesla_fleet_api.const import Scope
 from homeassistant.components.lock import LockEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TeslaFleetConfigEntry
 from .const import DOMAIN
@@ -25,7 +25,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslaFleetConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the TeslaFleet lock platform from a config entry."""
 
diff --git a/homeassistant/components/tesla_fleet/manifest.json b/homeassistant/components/tesla_fleet/manifest.json
index aecc6a04af3..56dc49ad111 100644
--- a/homeassistant/components/tesla_fleet/manifest.json
+++ b/homeassistant/components/tesla_fleet/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/tesla_fleet",
   "iot_class": "cloud_polling",
   "loggers": ["tesla-fleet-api"],
-  "requirements": ["tesla-fleet-api==0.9.2"]
+  "requirements": ["tesla-fleet-api==1.0.16"]
 }
diff --git a/homeassistant/components/tesla_fleet/media_player.py b/homeassistant/components/tesla_fleet/media_player.py
index 455c990077d..89f0768f082 100644
--- a/homeassistant/components/tesla_fleet/media_player.py
+++ b/homeassistant/components/tesla_fleet/media_player.py
@@ -11,7 +11,7 @@ from homeassistant.components.media_player import (
     MediaPlayerState,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TeslaFleetConfigEntry
 from .entity import TeslaFleetVehicleEntity
@@ -33,7 +33,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslaFleetConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tesla Fleet Media platform from a config entry."""
 
diff --git a/homeassistant/components/tesla_fleet/models.py b/homeassistant/components/tesla_fleet/models.py
index 469ebdca914..17a2bf50ed1 100644
--- a/homeassistant/components/tesla_fleet/models.py
+++ b/homeassistant/components/tesla_fleet/models.py
@@ -5,8 +5,8 @@ from __future__ import annotations
 import asyncio
 from dataclasses import dataclass
 
-from tesla_fleet_api import EnergySpecific, VehicleSpecific
 from tesla_fleet_api.const import Scope
+from tesla_fleet_api.tesla import EnergySite, VehicleFleet
 
 from homeassistant.helpers.device_registry import DeviceInfo
 
@@ -31,7 +31,7 @@ class TeslaFleetData:
 class TeslaFleetVehicleData:
     """Data for a vehicle in the TeslaFleet integration."""
 
-    api: VehicleSpecific
+    api: VehicleFleet
     coordinator: TeslaFleetVehicleDataCoordinator
     vin: str
     device: DeviceInfo
@@ -43,7 +43,7 @@ class TeslaFleetVehicleData:
 class TeslaFleetEnergyData:
     """Data for a vehicle in the TeslaFleet integration."""
 
-    api: EnergySpecific
+    api: EnergySite
     live_coordinator: TeslaFleetEnergySiteLiveCoordinator
     history_coordinator: TeslaFleetEnergySiteHistoryCoordinator
     info_coordinator: TeslaFleetEnergySiteInfoCoordinator
diff --git a/homeassistant/components/tesla_fleet/number.py b/homeassistant/components/tesla_fleet/number.py
index b806b4dbc77..b4f7e42cafd 100644
--- a/homeassistant/components/tesla_fleet/number.py
+++ b/homeassistant/components/tesla_fleet/number.py
@@ -7,8 +7,8 @@ from dataclasses import dataclass
 from itertools import chain
 from typing import Any
 
-from tesla_fleet_api import EnergySpecific, VehicleSpecific
 from tesla_fleet_api.const import Scope
+from tesla_fleet_api.tesla import EnergySite, VehicleFleet
 
 from homeassistant.components.number import (
     NumberDeviceClass,
@@ -18,7 +18,7 @@ from homeassistant.components.number import (
 )
 from homeassistant.const import PERCENTAGE, PRECISION_WHOLE, UnitOfElectricCurrent
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.icon import icon_for_battery_level
 
 from . import TeslaFleetConfigEntry
@@ -33,7 +33,7 @@ PARALLEL_UPDATES = 0
 class TeslaFleetNumberVehicleEntityDescription(NumberEntityDescription):
     """Describes TeslaFleet Number entity."""
 
-    func: Callable[[VehicleSpecific, float], Awaitable[Any]]
+    func: Callable[[VehicleFleet, float], Awaitable[Any]]
     native_min_value: float
     native_max_value: float
     min_key: str | None = None
@@ -74,7 +74,7 @@ VEHICLE_DESCRIPTIONS: tuple[TeslaFleetNumberVehicleEntityDescription, ...] = (
 class TeslaFleetNumberBatteryEntityDescription(NumberEntityDescription):
     """Describes TeslaFleet Number entity."""
 
-    func: Callable[[EnergySpecific, float], Awaitable[Any]]
+    func: Callable[[EnergySite, float], Awaitable[Any]]
     requires: str | None = None
 
 
@@ -95,7 +95,7 @@ ENERGY_INFO_DESCRIPTIONS: tuple[TeslaFleetNumberBatteryEntityDescription, ...] =
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslaFleetConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the TeslaFleet number platform from a config entry."""
 
diff --git a/homeassistant/components/tesla_fleet/select.py b/homeassistant/components/tesla_fleet/select.py
index 515a0e7c2e7..1c495657bc1 100644
--- a/homeassistant/components/tesla_fleet/select.py
+++ b/homeassistant/components/tesla_fleet/select.py
@@ -10,7 +10,7 @@ from tesla_fleet_api.const import EnergyExportMode, EnergyOperationMode, Scope,
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TeslaFleetConfigEntry
 from .entity import TeslaFleetEnergyInfoEntity, TeslaFleetVehicleEntity
@@ -78,7 +78,7 @@ SEAT_HEATER_DESCRIPTIONS: tuple[SeatHeaterDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslaFleetConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the TeslaFleet select platform from a config entry."""
 
diff --git a/homeassistant/components/tesla_fleet/sensor.py b/homeassistant/components/tesla_fleet/sensor.py
index 3e05e7e723b..bdd5ce2c001 100644
--- a/homeassistant/components/tesla_fleet/sensor.py
+++ b/homeassistant/components/tesla_fleet/sensor.py
@@ -29,7 +29,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util import dt as dt_util
 from homeassistant.util.variance import ignore_variance
@@ -303,8 +303,8 @@ VEHICLE_TIME_DESCRIPTIONS: tuple[TeslaFleetTimeEntityDescription, ...] = (
     ),
 )
 
-ENERGY_LIVE_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
-    SensorEntityDescription(
+ENERGY_LIVE_DESCRIPTIONS: tuple[TeslaFleetSensorEntityDescription, ...] = (
+    TeslaFleetSensorEntityDescription(
         key="solar_power",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -312,7 +312,7 @@ ENERGY_LIVE_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
         suggested_display_precision=2,
         device_class=SensorDeviceClass.POWER,
     ),
-    SensorEntityDescription(
+    TeslaFleetSensorEntityDescription(
         key="energy_left",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
@@ -321,7 +321,7 @@ ENERGY_LIVE_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
         device_class=SensorDeviceClass.ENERGY_STORAGE,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
-    SensorEntityDescription(
+    TeslaFleetSensorEntityDescription(
         key="total_pack_energy",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
@@ -331,14 +331,15 @@ ENERGY_LIVE_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
-    SensorEntityDescription(
+    TeslaFleetSensorEntityDescription(
         key="percentage_charged",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
         suggested_display_precision=2,
+        value_fn=lambda value: value or 0,
     ),
-    SensorEntityDescription(
+    TeslaFleetSensorEntityDescription(
         key="battery_power",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -346,7 +347,7 @@ ENERGY_LIVE_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
         suggested_display_precision=2,
         device_class=SensorDeviceClass.POWER,
     ),
-    SensorEntityDescription(
+    TeslaFleetSensorEntityDescription(
         key="load_power",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -354,7 +355,7 @@ ENERGY_LIVE_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
         suggested_display_precision=2,
         device_class=SensorDeviceClass.POWER,
     ),
-    SensorEntityDescription(
+    TeslaFleetSensorEntityDescription(
         key="grid_power",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -362,7 +363,7 @@ ENERGY_LIVE_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
         suggested_display_precision=2,
         device_class=SensorDeviceClass.POWER,
     ),
-    SensorEntityDescription(
+    TeslaFleetSensorEntityDescription(
         key="grid_services_power",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -370,7 +371,7 @@ ENERGY_LIVE_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
         suggested_display_precision=2,
         device_class=SensorDeviceClass.POWER,
     ),
-    SensorEntityDescription(
+    TeslaFleetSensorEntityDescription(
         key="generator_power",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -379,7 +380,7 @@ ENERGY_LIVE_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
         device_class=SensorDeviceClass.POWER,
         entity_registry_enabled_default=False,
     ),
-    SensorEntityDescription(
+    TeslaFleetSensorEntityDescription(
         key="island_status",
         options=[
             "island_status_unknown",
@@ -445,7 +446,7 @@ ENERGY_INFO_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslaFleetConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tesla Fleet sensor platform from a config entry."""
     async_add_entities(
@@ -465,6 +466,7 @@ async def async_setup_entry(
                 for energysite in entry.runtime_data.energysites
                 for description in ENERGY_LIVE_DESCRIPTIONS
                 if description.key in energysite.live_coordinator.data
+                or description.key == "percentage_charged"
             ),
             (  # Add energy site history
                 TeslaFleetEnergyHistorySensorEntity(energysite, description)
@@ -550,12 +552,12 @@ class TeslaFleetVehicleTimeSensorEntity(TeslaFleetVehicleEntity, SensorEntity):
 class TeslaFleetEnergyLiveSensorEntity(TeslaFleetEnergyLiveEntity, SensorEntity):
     """Base class for Tesla Fleet energy site metric sensors."""
 
-    entity_description: SensorEntityDescription
+    entity_description: TeslaFleetSensorEntityDescription
 
     def __init__(
         self,
         data: TeslaFleetEnergyData,
-        description: SensorEntityDescription,
+        description: TeslaFleetSensorEntityDescription,
     ) -> None:
         """Initialize the sensor."""
         self.entity_description = description
@@ -563,7 +565,7 @@ class TeslaFleetEnergyLiveSensorEntity(TeslaFleetEnergyLiveEntity, SensorEntity)
 
     def _async_update_attrs(self) -> None:
         """Update the attributes of the sensor."""
-        self._attr_native_value = self._value
+        self._attr_native_value = self.entity_description.value_fn(self._value)
 
 
 class TeslaFleetEnergyHistorySensorEntity(TeslaFleetEnergyHistoryEntity, SensorEntity):
diff --git a/homeassistant/components/tesla_fleet/strings.json b/homeassistant/components/tesla_fleet/strings.json
index c438bfff50f..331885893fe 100644
--- a/homeassistant/components/tesla_fleet/strings.json
+++ b/homeassistant/components/tesla_fleet/strings.json
@@ -329,7 +329,7 @@
         "name": "Charging",
         "state": {
           "starting": "Starting",
-          "charging": "Charging",
+          "charging": "[%key:common::state::charging%]",
           "disconnected": "Disconnected",
           "stopped": "Stopped",
           "complete": "Complete",
@@ -522,7 +522,7 @@
       }
     },
     "switch": {
-      "charge_state_user_charge_enable_request": {
+      "charge_state_charging_state": {
         "name": "Charge"
       },
       "climate_state_auto_seat_climate_left": {
diff --git a/homeassistant/components/tesla_fleet/switch.py b/homeassistant/components/tesla_fleet/switch.py
index d602cff78c0..4c64acfafa6 100644
--- a/homeassistant/components/tesla_fleet/switch.py
+++ b/homeassistant/components/tesla_fleet/switch.py
@@ -7,7 +7,7 @@ from dataclasses import dataclass
 from itertools import chain
 from typing import Any
 
-from tesla_fleet_api.const import Scope, Seat
+from tesla_fleet_api.const import AutoSeat, Scope, Seat
 
 from homeassistant.components.switch import (
     SwitchDeviceClass,
@@ -15,7 +15,8 @@ from homeassistant.components.switch import (
     SwitchEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.typing import StateType
 
 from . import TeslaFleetConfigEntry
 from .entity import TeslaFleetEnergyInfoEntity, TeslaFleetVehicleEntity
@@ -32,6 +33,8 @@ class TeslaFleetSwitchEntityDescription(SwitchEntityDescription):
     on_func: Callable
     off_func: Callable
     scopes: list[Scope]
+    value_func: Callable[[StateType], bool] = bool
+    unique_id: str | None = None
 
 
 VEHICLE_DESCRIPTIONS: tuple[TeslaFleetSwitchEntityDescription, ...] = (
@@ -43,7 +46,9 @@ VEHICLE_DESCRIPTIONS: tuple[TeslaFleetSwitchEntityDescription, ...] = (
     ),
     TeslaFleetSwitchEntityDescription(
         key="climate_state_auto_seat_climate_left",
-        on_func=lambda api: api.remote_auto_seat_climate_request(Seat.FRONT_LEFT, True),
+        on_func=lambda api: api.remote_auto_seat_climate_request(
+            AutoSeat.FRONT_LEFT, True
+        ),
         off_func=lambda api: api.remote_auto_seat_climate_request(
             Seat.FRONT_LEFT, False
         ),
@@ -52,10 +57,10 @@ VEHICLE_DESCRIPTIONS: tuple[TeslaFleetSwitchEntityDescription, ...] = (
     TeslaFleetSwitchEntityDescription(
         key="climate_state_auto_seat_climate_right",
         on_func=lambda api: api.remote_auto_seat_climate_request(
-            Seat.FRONT_RIGHT, True
+            AutoSeat.FRONT_RIGHT, True
         ),
         off_func=lambda api: api.remote_auto_seat_climate_request(
-            Seat.FRONT_RIGHT, False
+            AutoSeat.FRONT_RIGHT, False
         ),
         scopes=[Scope.VEHICLE_CMDS],
     ),
@@ -77,20 +82,21 @@ VEHICLE_DESCRIPTIONS: tuple[TeslaFleetSwitchEntityDescription, ...] = (
         ),
         scopes=[Scope.VEHICLE_CMDS],
     ),
-)
-
-VEHICLE_CHARGE_DESCRIPTION = TeslaFleetSwitchEntityDescription(
-    key="charge_state_user_charge_enable_request",
-    on_func=lambda api: api.charge_start(),
-    off_func=lambda api: api.charge_stop(),
-    scopes=[Scope.VEHICLE_CHARGING_CMDS, Scope.VEHICLE_CMDS],
+    TeslaFleetSwitchEntityDescription(
+        key="charge_state_charging_state",
+        unique_id="charge_state_user_charge_enable_request",
+        on_func=lambda api: api.charge_start(),
+        off_func=lambda api: api.charge_stop(),
+        value_func=lambda state: state in {"Starting", "Charging"},
+        scopes=[Scope.VEHICLE_CHARGING_CMDS, Scope.VEHICLE_CMDS],
+    ),
 )
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslaFleetConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the TeslaFleet Switch platform from a config entry."""
 
@@ -103,12 +109,6 @@ async def async_setup_entry(
                 for vehicle in entry.runtime_data.vehicles
                 for description in VEHICLE_DESCRIPTIONS
             ),
-            (
-                TeslaFleetChargeSwitchEntity(
-                    vehicle, VEHICLE_CHARGE_DESCRIPTION, entry.runtime_data.scopes
-                )
-                for vehicle in entry.runtime_data.vehicles
-            ),
             (
                 TeslaFleetChargeFromGridSwitchEntity(
                     energysite,
@@ -144,16 +144,18 @@ class TeslaFleetVehicleSwitchEntity(TeslaFleetVehicleEntity, TeslaFleetSwitchEnt
         scopes: list[Scope],
     ) -> None:
         """Initialize the Switch."""
-        super().__init__(data, description.key)
         self.entity_description = description
         self.scoped = any(scope in scopes for scope in description.scopes)
+        super().__init__(data, description.key)
+        if description.unique_id:
+            self._attr_unique_id = f"{data.vin}-{description.unique_id}"
 
     def _async_update_attrs(self) -> None:
         """Update the attributes of the sensor."""
         if self._value is None:
             self._attr_is_on = None
         else:
-            self._attr_is_on = bool(self._value)
+            self._attr_is_on = self.entity_description.value_func(self._value)
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn on the Switch."""
@@ -172,17 +174,6 @@ class TeslaFleetVehicleSwitchEntity(TeslaFleetVehicleEntity, TeslaFleetSwitchEnt
         self.async_write_ha_state()
 
 
-class TeslaFleetChargeSwitchEntity(TeslaFleetVehicleSwitchEntity):
-    """Entity class for TeslaFleet charge switch."""
-
-    def _async_update_attrs(self) -> None:
-        """Update the attributes of the entity."""
-        if self._value is None:
-            self._attr_is_on = self.get("charge_state_charge_enable_request")
-        else:
-            self._attr_is_on = self._value
-
-
 class TeslaFleetChargeFromGridSwitchEntity(
     TeslaFleetEnergyInfoEntity, TeslaFleetSwitchEntity
 ):
diff --git a/homeassistant/components/tesla_wall_connector/binary_sensor.py b/homeassistant/components/tesla_wall_connector/binary_sensor.py
index f7ef385b8ed..6d60162412e 100644
--- a/homeassistant/components/tesla_wall_connector/binary_sensor.py
+++ b/homeassistant/components/tesla_wall_connector/binary_sensor.py
@@ -11,7 +11,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import WallConnectorData
 from .const import DOMAIN, WALLCONNECTOR_DATA_VITALS
@@ -48,7 +48,7 @@ WALL_CONNECTOR_SENSORS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create the Wall Connector sensor devices."""
     wall_connector_data = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/tesla_wall_connector/sensor.py b/homeassistant/components/tesla_wall_connector/sensor.py
index a50c81c912e..c6c63a93edb 100644
--- a/homeassistant/components/tesla_wall_connector/sensor.py
+++ b/homeassistant/components/tesla_wall_connector/sensor.py
@@ -19,7 +19,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import WallConnectorData
 from .const import DOMAIN, WALLCONNECTOR_DATA_LIFETIME, WALLCONNECTOR_DATA_VITALS
@@ -187,7 +187,7 @@ WALL_CONNECTOR_SENSORS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create the Wall Connector sensor devices."""
     wall_connector_data = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/tesla_wall_connector/strings.json b/homeassistant/components/tesla_wall_connector/strings.json
index 1a03207a012..b356a9f3ebc 100644
--- a/homeassistant/components/tesla_wall_connector/strings.json
+++ b/homeassistant/components/tesla_wall_connector/strings.json
@@ -42,7 +42,7 @@
           "charging_finished": "Charging finished",
           "waiting_car": "Waiting for car",
           "charging_reduced": "Charging (reduced)",
-          "charging": "Charging"
+          "charging": "[%key:common::state::charging%]"
         }
       },
       "status_code": {
diff --git a/homeassistant/components/teslemetry/__init__.py b/homeassistant/components/teslemetry/__init__.py
index b9cbc64dcd9..b820d2d1b43 100644
--- a/homeassistant/components/teslemetry/__init__.py
+++ b/homeassistant/components/teslemetry/__init__.py
@@ -4,7 +4,6 @@ import asyncio
 from collections.abc import Callable
 from typing import Final
 
-from tesla_fleet_api import EnergySpecific, Teslemetry, VehicleSpecific
 from tesla_fleet_api.const import Scope
 from tesla_fleet_api.exceptions import (
     Forbidden,
@@ -12,15 +11,15 @@ from tesla_fleet_api.exceptions import (
     SubscriptionRequired,
     TeslaFleetError,
 )
+from tesla_fleet_api.teslemetry import Teslemetry
 from teslemetry_stream import TeslemetryStream
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ACCESS_TOKEN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.typing import ConfigType
 
@@ -112,8 +111,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -
             # Remove the protobuff 'cached_data' that we do not use to save memory
             product.pop("cached_data", None)
             vin = product["vin"]
-            api = VehicleSpecific(teslemetry.vehicle, vin)
-            coordinator = TeslemetryVehicleDataCoordinator(hass, api, product)
+            api = teslemetry.vehicles.create(vin)
+            coordinator = TeslemetryVehicleDataCoordinator(hass, entry, api, product)
             device = DeviceInfo(
                 identifiers={(DOMAIN, vin)},
                 manufacturer="Tesla",
@@ -157,7 +156,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -
                 )
                 continue
 
-            api = EnergySpecific(teslemetry.energy, site_id)
+            api = teslemetry.energySites.create(site_id)
             device = DeviceInfo(
                 identifiers={(DOMAIN, str(site_id))},
                 manufacturer="Tesla",
@@ -178,15 +177,17 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -
                 TeslemetryEnergyData(
                     api=api,
                     live_coordinator=(
-                        TeslemetryEnergySiteLiveCoordinator(hass, api, live_status)
+                        TeslemetryEnergySiteLiveCoordinator(
+                            hass, entry, api, live_status
+                        )
                         if isinstance(live_status, dict)
                         else None
                     ),
                     info_coordinator=TeslemetryEnergySiteInfoCoordinator(
-                        hass, api, product
+                        hass, entry, api, product
                     ),
                     history_coordinator=(
-                        TeslemetryEnergyHistoryCoordinator(hass, api)
+                        TeslemetryEnergyHistoryCoordinator(hass, entry, api)
                         if powerwall
                         else None
                     ),
@@ -243,7 +244,9 @@ async def async_unload_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry)
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
-async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_migrate_entry(
+    hass: HomeAssistant, config_entry: TeslemetryConfigEntry
+) -> bool:
     """Migrate config entry."""
     if config_entry.version > 1:
         return False
@@ -283,7 +286,7 @@ def create_handle_vehicle_stream(vin: str, coordinator) -> Callable[[dict], None
 
 
 async def async_setup_stream(
-    hass: HomeAssistant, entry: ConfigEntry, vehicle: TeslemetryVehicleData
+    hass: HomeAssistant, entry: TeslemetryConfigEntry, vehicle: TeslemetryVehicleData
 ):
     """Set up the stream for a vehicle."""
 
diff --git a/homeassistant/components/teslemetry/binary_sensor.py b/homeassistant/components/teslemetry/binary_sensor.py
index 0b6823f8b61..9d14df4501b 100644
--- a/homeassistant/components/teslemetry/binary_sensor.py
+++ b/homeassistant/components/teslemetry/binary_sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import STATE_ON, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import StateType
 
@@ -377,7 +377,7 @@ ENERGY_INFO_DESCRIPTIONS: tuple[BinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslemetryConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Teslemetry binary sensor platform from a config entry."""
 
diff --git a/homeassistant/components/teslemetry/button.py b/homeassistant/components/teslemetry/button.py
index ceeda265795..4ca2fd9b166 100644
--- a/homeassistant/components/teslemetry/button.py
+++ b/homeassistant/components/teslemetry/button.py
@@ -10,7 +10,7 @@ from tesla_fleet_api.const import Scope
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TeslemetryConfigEntry
 from .entity import TeslemetryVehicleEntity
@@ -61,7 +61,7 @@ DESCRIPTIONS: tuple[TeslemetryButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslemetryConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Teslemetry Button platform from a config entry."""
 
diff --git a/homeassistant/components/teslemetry/climate.py b/homeassistant/components/teslemetry/climate.py
index 95b769a1c2d..c1c8fcd2f73 100644
--- a/homeassistant/components/teslemetry/climate.py
+++ b/homeassistant/components/teslemetry/climate.py
@@ -6,9 +6,11 @@ from itertools import chain
 from typing import Any, cast
 
 from tesla_fleet_api.const import CabinOverheatProtectionTemp, Scope
+from tesla_fleet_api.teslemetry import Vehicle
 
 from homeassistant.components.climate import (
     ATTR_HVAC_MODE,
+    HVAC_MODES,
     ClimateEntity,
     ClimateEntityFeature,
     HVACMode,
@@ -21,16 +23,33 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.restore_state import RestoreEntity
 
 from . import TeslemetryConfigEntry
 from .const import DOMAIN, TeslemetryClimateSide
-from .entity import TeslemetryVehicleEntity
+from .entity import (
+    TeslemetryRootEntity,
+    TeslemetryVehicleEntity,
+    TeslemetryVehicleStreamEntity,
+)
 from .helpers import handle_vehicle_command
 from .models import TeslemetryVehicleData
 
 DEFAULT_MIN_TEMP = 15
 DEFAULT_MAX_TEMP = 28
+COP_TEMPERATURES = {
+    30: CabinOverheatProtectionTemp.LOW,
+    35: CabinOverheatProtectionTemp.MEDIUM,
+    40: CabinOverheatProtectionTemp.HIGH,
+}
+PRESET_MODES = {
+    "Off": "off",
+    "On": "keep",
+    "Dog": "dog",
+    "Party": "camp",
+}
+
 
 PARALLEL_UPDATES = 0
 
@@ -38,20 +57,28 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslemetryConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Teslemetry Climate platform from a config entry."""
 
     async_add_entities(
         chain(
             (
-                TeslemetryClimateEntity(
+                TeslemetryPollingClimateEntity(
+                    vehicle, TeslemetryClimateSide.DRIVER, entry.runtime_data.scopes
+                )
+                if vehicle.api.pre2021 or vehicle.firmware < "2024.44.25"
+                else TeslemetryStreamingClimateEntity(
                     vehicle, TeslemetryClimateSide.DRIVER, entry.runtime_data.scopes
                 )
                 for vehicle in entry.runtime_data.vehicles
             ),
             (
-                TeslemetryCabinOverheatProtectionEntity(
+                TeslemetryPollingCabinOverheatProtectionEntity(
+                    vehicle, entry.runtime_data.scopes
+                )
+                if vehicle.api.pre2021 or vehicle.firmware < "2024.44.25"
+                else TeslemetryStreamingCabinOverheatProtectionEntity(
                     vehicle, entry.runtime_data.scopes
                 )
                 for vehicle in entry.runtime_data.vehicles
@@ -60,66 +87,22 @@ async def async_setup_entry(
     )
 
 
-class TeslemetryClimateEntity(TeslemetryVehicleEntity, ClimateEntity):
-    """Telemetry vehicle climate entity."""
+class TeslemetryClimateEntity(TeslemetryRootEntity, ClimateEntity):
+    """Vehicle Climate Control."""
+
+    api: Vehicle
 
     _attr_precision = PRECISION_HALVES
-
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
     _attr_hvac_modes = [HVACMode.HEAT_COOL, HVACMode.OFF]
-    _attr_supported_features = (
-        ClimateEntityFeature.TURN_ON
-        | ClimateEntityFeature.TURN_OFF
-        | ClimateEntityFeature.TARGET_TEMPERATURE
-        | ClimateEntityFeature.PRESET_MODE
-    )
-    _attr_preset_modes = ["off", "keep", "dog", "camp"]
-
-    def __init__(
-        self,
-        data: TeslemetryVehicleData,
-        side: TeslemetryClimateSide,
-        scopes: Scope,
-    ) -> None:
-        """Initialize the climate."""
-        self.scoped = Scope.VEHICLE_CMDS in scopes
-
-        if not self.scoped:
-            self._attr_supported_features = ClimateEntityFeature(0)
-            self._attr_hvac_modes = []
-
-        super().__init__(
-            data,
-            side,
-        )
-
-    def _async_update_attrs(self) -> None:
-        """Update the attributes of the entity."""
-        value = self.get("climate_state_is_climate_on")
-        if value:
-            self._attr_hvac_mode = HVACMode.HEAT_COOL
-        else:
-            self._attr_hvac_mode = HVACMode.OFF
-
-        # If not scoped, prevent the user from changing the HVAC mode by making it the only option
-        if self._attr_hvac_mode and not self.scoped:
-            self._attr_hvac_modes = [self._attr_hvac_mode]
-
-        self._attr_current_temperature = self.get("climate_state_inside_temp")
-        self._attr_target_temperature = self.get(f"climate_state_{self.key}_setting")
-        self._attr_preset_mode = self.get("climate_state_climate_keeper_mode")
-        self._attr_min_temp = cast(
-            float, self.get("climate_state_min_avail_temp", DEFAULT_MIN_TEMP)
-        )
-        self._attr_max_temp = cast(
-            float, self.get("climate_state_max_avail_temp", DEFAULT_MAX_TEMP)
-        )
+    _attr_preset_modes = list(PRESET_MODES.values())
+    _attr_fan_modes = ["off", "bioweapon"]
+    _enable_turn_on_off_backwards_compatibility = False
 
     async def async_turn_on(self) -> None:
         """Set the climate state to on."""
-
         self.raise_for_scope(Scope.VEHICLE_CMDS)
-        await self.wake_up_if_asleep()
+
         await handle_vehicle_command(self.api.auto_conditioning_start())
 
         self._attr_hvac_mode = HVACMode.HEAT_COOL
@@ -127,19 +110,21 @@ class TeslemetryClimateEntity(TeslemetryVehicleEntity, ClimateEntity):
 
     async def async_turn_off(self) -> None:
         """Set the climate state to off."""
-
         self.raise_for_scope(Scope.VEHICLE_CMDS)
-        await self.wake_up_if_asleep()
+
         await handle_vehicle_command(self.api.auto_conditioning_stop())
 
         self._attr_hvac_mode = HVACMode.OFF
         self._attr_preset_mode = self._attr_preset_modes[0]
+        self._attr_fan_mode = self._attr_fan_modes[0]
         self.async_write_ha_state()
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set the climate temperature."""
+
         if temp := kwargs.get(ATTR_TEMPERATURE):
-            await self.wake_up_if_asleep()
+            self.raise_for_scope(Scope.VEHICLE_CMDS)
+
             await handle_vehicle_command(
                 self.api.set_temps(
                     driver_temp=temp,
@@ -163,18 +148,210 @@ class TeslemetryClimateEntity(TeslemetryVehicleEntity, ClimateEntity):
 
     async def async_set_preset_mode(self, preset_mode: str) -> None:
         """Set the climate preset mode."""
-        await self.wake_up_if_asleep()
+        self.raise_for_scope(Scope.VEHICLE_CMDS)
+
         await handle_vehicle_command(
             self.api.set_climate_keeper_mode(
                 climate_keeper_mode=self._attr_preset_modes.index(preset_mode)
             )
         )
         self._attr_preset_mode = preset_mode
-        if preset_mode != self._attr_preset_modes[0]:
-            # Changing preset mode will also turn on climate
+        if preset_mode == self._attr_preset_modes[0]:
+            self._attr_hvac_mode = HVACMode.OFF
+        else:
             self._attr_hvac_mode = HVACMode.HEAT_COOL
         self.async_write_ha_state()
 
+    async def async_set_fan_mode(self, fan_mode: str) -> None:
+        """Set the Bioweapon defense mode."""
+        self.raise_for_scope(Scope.VEHICLE_CMDS)
+
+        await handle_vehicle_command(
+            self.api.set_bioweapon_mode(
+                on=(fan_mode != "off"),
+                manual_override=True,
+            )
+        )
+        self._attr_fan_mode = fan_mode
+        if fan_mode == self._attr_fan_modes[1]:
+            self._attr_hvac_mode = HVACMode.HEAT_COOL
+        self.async_write_ha_state()
+
+
+class TeslemetryPollingClimateEntity(TeslemetryClimateEntity, TeslemetryVehicleEntity):
+    """Polling vehicle climate entity."""
+
+    _attr_supported_features = (
+        ClimateEntityFeature.TURN_ON
+        | ClimateEntityFeature.TURN_OFF
+        | ClimateEntityFeature.TARGET_TEMPERATURE
+        | ClimateEntityFeature.PRESET_MODE
+        | ClimateEntityFeature.FAN_MODE
+    )
+
+    def __init__(
+        self,
+        data: TeslemetryVehicleData,
+        side: TeslemetryClimateSide,
+        scopes: list[Scope],
+    ) -> None:
+        """Initialize the climate."""
+        self.scoped = Scope.VEHICLE_CMDS in scopes
+        if not self.scoped:
+            self._attr_supported_features = ClimateEntityFeature(0)
+
+        super().__init__(data, side)
+
+    def _async_update_attrs(self) -> None:
+        """Update the attributes of the entity."""
+        value = self.get("climate_state_is_climate_on")
+        if value is None:
+            self._attr_hvac_mode = None
+        if value:
+            self._attr_hvac_mode = HVACMode.HEAT_COOL
+        else:
+            self._attr_hvac_mode = HVACMode.OFF
+
+        self._attr_current_temperature = self.get("climate_state_inside_temp")
+        self._attr_target_temperature = self.get(f"climate_state_{self.key}_setting")
+        self._attr_preset_mode = self.get("climate_state_climate_keeper_mode")
+        if self.get("climate_state_bioweapon_mode"):
+            self._attr_fan_mode = "bioweapon"
+        else:
+            self._attr_fan_mode = "off"
+        self._attr_min_temp = cast(
+            float, self.get("climate_state_min_avail_temp", DEFAULT_MIN_TEMP)
+        )
+        self._attr_max_temp = cast(
+            float, self.get("climate_state_max_avail_temp", DEFAULT_MAX_TEMP)
+        )
+
+
+class TeslemetryStreamingClimateEntity(
+    TeslemetryClimateEntity, TeslemetryVehicleStreamEntity, RestoreEntity
+):
+    """Teslemetry steering wheel climate control."""
+
+    _attr_supported_features = (
+        ClimateEntityFeature.TURN_ON
+        | ClimateEntityFeature.TURN_OFF
+        | ClimateEntityFeature.TARGET_TEMPERATURE
+        | ClimateEntityFeature.PRESET_MODE
+    )
+
+    def __init__(
+        self,
+        data: TeslemetryVehicleData,
+        side: TeslemetryClimateSide,
+        scopes: list[Scope],
+    ) -> None:
+        """Initialize the climate."""
+
+        # Initialize defaults
+        self._attr_hvac_mode = None
+        self._attr_current_temperature = None
+        self._attr_target_temperature = None
+        self._attr_fan_mode = None
+        self._attr_preset_mode = None
+
+        self.scoped = Scope.VEHICLE_CMDS in scopes
+        if not self.scoped:
+            self._attr_supported_features = ClimateEntityFeature(0)
+        self.side = side
+        super().__init__(
+            data,
+            side,
+        )
+
+        self._attr_min_temp = cast(
+            float,
+            data.coordinator.data.get("climate_state_min_avail_temp", DEFAULT_MIN_TEMP),
+        )
+        self._attr_max_temp = cast(
+            float,
+            data.coordinator.data.get("climate_state_max_avail_temp", DEFAULT_MAX_TEMP),
+        )
+        self.rhd: bool = data.coordinator.data.get("vehicle_config_rhd", False)
+
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+        if (state := await self.async_get_last_state()) is not None:
+            self._attr_hvac_mode = (
+                HVACMode(state.state) if state.state in HVAC_MODES else None
+            )
+            self._attr_current_temperature = state.attributes.get("current_temperature")
+            self._attr_target_temperature = state.attributes.get("temperature")
+            self._attr_preset_mode = state.attributes.get("preset_mode")
+
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_InsideTemp(
+                self._async_handle_inside_temp
+            )
+        )
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_HvacACEnabled(
+                self._async_handle_hvac_ac_enabled
+            )
+        )
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_ClimateKeeperMode(
+                self._async_handle_climate_keeper_mode
+            )
+        )
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_RightHandDrive(self._async_handle_rhd)
+        )
+
+        if self.side == TeslemetryClimateSide.DRIVER:
+            if self.rhd:
+                self.async_on_remove(
+                    self.vehicle.stream_vehicle.listen_HvacRightTemperatureRequest(
+                        self._async_handle_hvac_temperature_request
+                    )
+                )
+            else:
+                self.async_on_remove(
+                    self.vehicle.stream_vehicle.listen_HvacLeftTemperatureRequest(
+                        self._async_handle_hvac_temperature_request
+                    )
+                )
+        elif self.side == TeslemetryClimateSide.PASSENGER:
+            if self.rhd:
+                self.async_on_remove(
+                    self.vehicle.stream_vehicle.listen_HvacLeftTemperatureRequest(
+                        self._async_handle_hvac_temperature_request
+                    )
+                )
+            else:
+                self.async_on_remove(
+                    self.vehicle.stream_vehicle.listen_HvacRightTemperatureRequest(
+                        self._async_handle_hvac_temperature_request
+                    )
+                )
+
+    def _async_handle_inside_temp(self, data: float | None):
+        self._attr_current_temperature = data
+        self.async_write_ha_state()
+
+    def _async_handle_hvac_ac_enabled(self, data: bool | None):
+        self._attr_hvac_mode = (
+            None if data is None else HVACMode.HEAT_COOL if data else HVACMode.OFF
+        )
+        self.async_write_ha_state()
+
+    def _async_handle_climate_keeper_mode(self, data: str | None):
+        self._attr_preset_mode = PRESET_MODES.get(data) if data else None
+        self.async_write_ha_state()
+
+    def _async_handle_hvac_temperature_request(self, data: float | None):
+        self._attr_target_temperature = data
+        self.async_write_ha_state()
+
+    def _async_handle_rhd(self, data: bool | None):
+        if data is not None:
+            self.rhd = data
+
 
 COP_MODES = {
     "Off": HVACMode.OFF,
@@ -182,73 +359,27 @@ COP_MODES = {
     "FanOnly": HVACMode.FAN_ONLY,
 }
 
-# String to celsius
 COP_LEVELS = {
     "Low": 30,
     "Medium": 35,
     "High": 40,
 }
 
-# Celsius to IntEnum
-TEMP_LEVELS = {
-    30: CabinOverheatProtectionTemp.LOW,
-    35: CabinOverheatProtectionTemp.MEDIUM,
-    40: CabinOverheatProtectionTemp.HIGH,
-}
 
+class TeslemetryCabinOverheatProtectionEntity(TeslemetryRootEntity, ClimateEntity):
+    """Vehicle Cabin Overheat Protection."""
 
-class TeslemetryCabinOverheatProtectionEntity(TeslemetryVehicleEntity, ClimateEntity):
-    """Telemetry vehicle cabin overheat protection entity."""
+    api: Vehicle
 
     _attr_precision = PRECISION_WHOLE
     _attr_target_temperature_step = 5
-    _attr_min_temp = COP_LEVELS["Low"]
-    _attr_max_temp = COP_LEVELS["High"]
+    _attr_min_temp = 30
+    _attr_max_temp = 40
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
     _attr_hvac_modes = list(COP_MODES.values())
-
     _attr_entity_registry_enabled_default = False
 
-    def __init__(
-        self,
-        data: TeslemetryVehicleData,
-        scopes: Scope,
-    ) -> None:
-        """Initialize the climate."""
-
-        self.scoped = Scope.VEHICLE_CMDS in scopes
-        if self.scoped:
-            self._attr_supported_features = (
-                ClimateEntityFeature.TURN_ON | ClimateEntityFeature.TURN_OFF
-            )
-        else:
-            self._attr_supported_features = ClimateEntityFeature(0)
-            self._attr_hvac_modes = []
-
-        super().__init__(data, "climate_state_cabin_overheat_protection")
-
-        # Supported Features from data
-        if self.scoped and self.get("vehicle_config_cop_user_set_temp_supported"):
-            self._attr_supported_features |= ClimateEntityFeature.TARGET_TEMPERATURE
-
-    def _async_update_attrs(self) -> None:
-        """Update the attributes of the entity."""
-
-        if (state := self.get("climate_state_cabin_overheat_protection")) is None:
-            self._attr_hvac_mode = None
-        else:
-            self._attr_hvac_mode = COP_MODES.get(state)
-
-        # If not scoped, prevent the user from changing the HVAC mode by making it the only option
-        if self._attr_hvac_mode and not self.scoped:
-            self._attr_hvac_modes = [self._attr_hvac_mode]
-
-        if (level := self.get("climate_state_cop_activation_temperature")) is None:
-            self._attr_target_temperature = None
-        else:
-            self._attr_target_temperature = COP_LEVELS.get(level)
-
-        self._attr_current_temperature = self.get("climate_state_inside_temp")
+    _enable_turn_on_off_backwards_compatibility = False
 
     async def async_turn_on(self) -> None:
         """Set the climate state to on."""
@@ -260,26 +391,28 @@ class TeslemetryCabinOverheatProtectionEntity(TeslemetryVehicleEntity, ClimateEn
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set the climate temperature."""
-        self.raise_for_scope(Scope.VEHICLE_CMDS)
 
-        if (temp := kwargs.get(ATTR_TEMPERATURE)) is None or (
-            cop_mode := TEMP_LEVELS.get(temp)
-        ) is None:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="invalid_cop_temp",
-            )
+        if temp := kwargs.get(ATTR_TEMPERATURE):
+            if (cop_mode := COP_TEMPERATURES.get(temp)) is None:
+                raise ServiceValidationError(
+                    translation_domain=DOMAIN,
+                    translation_key="invalid_cop_temp",
+                )
+            self.raise_for_scope(Scope.VEHICLE_CMDS)
 
-        await self.wake_up_if_asleep()
-        await handle_vehicle_command(self.api.set_cop_temp(cop_mode))
-        self._attr_target_temperature = temp
+            await handle_vehicle_command(self.api.set_cop_temp(cop_mode))
+            self._attr_target_temperature = temp
 
         if mode := kwargs.get(ATTR_HVAC_MODE):
-            await self._async_set_cop(mode)
+            # Set HVAC mode will call write_ha_state
+            await self.async_set_hvac_mode(mode)
+        else:
+            self.async_write_ha_state()
 
-        self.async_write_ha_state()
+    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
+        """Set the climate mode and state."""
+        self.raise_for_scope(Scope.VEHICLE_CMDS)
 
-    async def _async_set_cop(self, hvac_mode: HVACMode) -> None:
         if hvac_mode == HVACMode.OFF:
             await handle_vehicle_command(
                 self.api.set_cabin_overheat_protection(on=False, fan_only=False)
@@ -294,10 +427,125 @@ class TeslemetryCabinOverheatProtectionEntity(TeslemetryVehicleEntity, ClimateEn
             )
 
         self._attr_hvac_mode = hvac_mode
-
-    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
-        """Set the climate mode and state."""
-        self.raise_for_scope(Scope.VEHICLE_CMDS)
-        await self.wake_up_if_asleep()
-        await self._async_set_cop(hvac_mode)
+        self.async_write_ha_state()
+
+
+class TeslemetryPollingCabinOverheatProtectionEntity(
+    TeslemetryVehicleEntity, TeslemetryCabinOverheatProtectionEntity
+):
+    """Vehicle Cabin Overheat Protection."""
+
+    def __init__(
+        self,
+        data: TeslemetryVehicleData,
+        scopes: list[Scope],
+    ) -> None:
+        """Initialize the climate."""
+
+        super().__init__(
+            data,
+            "climate_state_cabin_overheat_protection",
+        )
+
+        # Supported Features
+        self._attr_supported_features = (
+            ClimateEntityFeature.TURN_ON | ClimateEntityFeature.TURN_OFF
+        )
+        if self.get("vehicle_config_cop_user_set_temp_supported"):
+            self._attr_supported_features |= ClimateEntityFeature.TARGET_TEMPERATURE
+
+        # Scopes
+        self.scoped = Scope.VEHICLE_CMDS in scopes
+        if not self.scoped:
+            self._attr_supported_features = ClimateEntityFeature(0)
+
+    def _async_update_attrs(self) -> None:
+        """Update the attributes of the entity."""
+
+        if (state := self.get("climate_state_cabin_overheat_protection")) is None:
+            self._attr_hvac_mode = None
+        else:
+            self._attr_hvac_mode = COP_MODES.get(state)
+
+        if (level := self.get("climate_state_cop_activation_temperature")) is None:
+            self._attr_target_temperature = None
+        else:
+            self._attr_target_temperature = COP_LEVELS.get(level)
+
+        self._attr_current_temperature = self.get("climate_state_inside_temp")
+
+
+class TeslemetryStreamingCabinOverheatProtectionEntity(
+    TeslemetryVehicleStreamEntity,
+    TeslemetryCabinOverheatProtectionEntity,
+    RestoreEntity,
+):
+    """Vehicle Cabin Overheat Protection."""
+
+    def __init__(
+        self,
+        data: TeslemetryVehicleData,
+        scopes: list[Scope],
+    ) -> None:
+        """Initialize the climate."""
+
+        # Initialize defaults
+        self._attr_hvac_mode = None
+        self._attr_current_temperature = None
+        self._attr_target_temperature = None
+        self._attr_fan_mode = None
+        self._attr_preset_mode = None
+
+        super().__init__(data, "climate_state_cabin_overheat_protection")
+
+        # Supported Features
+        self._attr_supported_features = (
+            ClimateEntityFeature.TURN_ON | ClimateEntityFeature.TURN_OFF
+        )
+        if data.coordinator.data.get("vehicle_config_cop_user_set_temp_supported"):
+            self._attr_supported_features |= ClimateEntityFeature.TARGET_TEMPERATURE
+
+        # Scopes
+        self.scoped = Scope.VEHICLE_CMDS in scopes
+        if not self.scoped:
+            self._attr_supported_features = ClimateEntityFeature(0)
+
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+        if (state := await self.async_get_last_state()) is not None:
+            self._attr_hvac_mode = (
+                HVACMode(state.state) if state.state in HVAC_MODES else None
+            )
+            self._attr_current_temperature = state.attributes.get("temperature")
+            self._attr_target_temperature = state.attributes.get("target_temperature")
+
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_InsideTemp(
+                self._async_handle_inside_temp
+            )
+        )
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_CabinOverheatProtectionMode(
+                self._async_handle_protection_mode
+            )
+        )
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_CabinOverheatProtectionTemperatureLimit(
+                self._async_handle_temperature_limit
+            )
+        )
+
+    def _async_handle_inside_temp(self, value: float | None):
+        self._attr_current_temperature = value
+        self.async_write_ha_state()
+
+    def _async_handle_protection_mode(self, value: str | None):
+        self._attr_hvac_mode = COP_MODES.get(value) if value is not None else None
+        self.async_write_ha_state()
+
+    def _async_handle_temperature_limit(self, value: str | None):
+        self._attr_target_temperature = (
+            COP_LEVELS.get(value) if value is not None else None
+        )
         self.async_write_ha_state()
diff --git a/homeassistant/components/teslemetry/config_flow.py b/homeassistant/components/teslemetry/config_flow.py
index d8cf2bd7945..a25a98d6c68 100644
--- a/homeassistant/components/teslemetry/config_flow.py
+++ b/homeassistant/components/teslemetry/config_flow.py
@@ -6,12 +6,12 @@ from collections.abc import Mapping
 from typing import Any
 
 from aiohttp import ClientConnectionError
-from tesla_fleet_api import Teslemetry
 from tesla_fleet_api.exceptions import (
     InvalidToken,
     SubscriptionRequired,
     TeslaFleetError,
 )
+from tesla_fleet_api.teslemetry import Teslemetry
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
diff --git a/homeassistant/components/teslemetry/coordinator.py b/homeassistant/components/teslemetry/coordinator.py
index d39402c622c..07549008a6c 100644
--- a/homeassistant/components/teslemetry/coordinator.py
+++ b/homeassistant/components/teslemetry/coordinator.py
@@ -1,20 +1,25 @@
 """Teslemetry Data Coordinator."""
 
-from datetime import datetime, timedelta
-from typing import Any
+from __future__ import annotations
+
+from datetime import datetime, timedelta
+from typing import TYPE_CHECKING, Any
 
-from tesla_fleet_api import EnergySpecific, VehicleSpecific
 from tesla_fleet_api.const import TeslaEnergyPeriod, VehicleDataEndpoint
 from tesla_fleet_api.exceptions import (
     InvalidToken,
     SubscriptionRequired,
     TeslaFleetError,
 )
+from tesla_fleet_api.teslemetry import EnergySite, Vehicle
 
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
+if TYPE_CHECKING:
+    from . import TeslemetryConfigEntry
+
 from .const import ENERGY_HISTORY_FIELDS, LOGGER
 from .helpers import flatten
 
@@ -37,15 +42,21 @@ ENDPOINTS = [
 class TeslemetryVehicleDataCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Class to manage fetching data from the Teslemetry API."""
 
+    config_entry: TeslemetryConfigEntry
     last_active: datetime
 
     def __init__(
-        self, hass: HomeAssistant, api: VehicleSpecific, product: dict
+        self,
+        hass: HomeAssistant,
+        config_entry: TeslemetryConfigEntry,
+        api: Vehicle,
+        product: dict,
     ) -> None:
         """Initialize Teslemetry Vehicle Update Coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name="Teslemetry Vehicle",
             update_interval=VEHICLE_INTERVAL,
         )
@@ -69,13 +80,21 @@ class TeslemetryVehicleDataCoordinator(DataUpdateCoordinator[dict[str, Any]]):
 class TeslemetryEnergySiteLiveCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Class to manage fetching energy site live status from the Teslemetry API."""
 
+    config_entry: TeslemetryConfigEntry
     updated_once: bool
 
-    def __init__(self, hass: HomeAssistant, api: EnergySpecific, data: dict) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: TeslemetryConfigEntry,
+        api: EnergySite,
+        data: dict,
+    ) -> None:
         """Initialize Teslemetry Energy Site Live coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name="Teslemetry Energy Site Live",
             update_interval=ENERGY_LIVE_INTERVAL,
         )
@@ -108,11 +127,20 @@ class TeslemetryEnergySiteLiveCoordinator(DataUpdateCoordinator[dict[str, Any]])
 class TeslemetryEnergySiteInfoCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Class to manage fetching energy site info from the Teslemetry API."""
 
-    def __init__(self, hass: HomeAssistant, api: EnergySpecific, product: dict) -> None:
+    config_entry: TeslemetryConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: TeslemetryConfigEntry,
+        api: EnergySite,
+        product: dict,
+    ) -> None:
         """Initialize Teslemetry Energy Info coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name="Teslemetry Energy Site Info",
             update_interval=ENERGY_INFO_INTERVAL,
         )
@@ -135,11 +163,19 @@ class TeslemetryEnergySiteInfoCoordinator(DataUpdateCoordinator[dict[str, Any]])
 class TeslemetryEnergyHistoryCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Class to manage fetching energy site info from the Teslemetry API."""
 
-    def __init__(self, hass: HomeAssistant, api: EnergySpecific) -> None:
+    config_entry: TeslemetryConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: TeslemetryConfigEntry,
+        api: EnergySite,
+    ) -> None:
         """Initialize Teslemetry Energy Info coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=f"Teslemetry Energy History {api.energy_site_id}",
             update_interval=ENERGY_HISTORY_INTERVAL,
         )
@@ -156,7 +192,7 @@ class TeslemetryEnergyHistoryCoordinator(DataUpdateCoordinator[dict[str, Any]]):
             raise UpdateFailed(e.message) from e
 
         # Add all time periods together
-        output = {key: 0 for key in ENERGY_HISTORY_FIELDS}
+        output = dict.fromkeys(ENERGY_HISTORY_FIELDS, 0)
         for period in data.get("time_series", []):
             for key in ENERGY_HISTORY_FIELDS:
                 output[key] += period.get(key, 0)
diff --git a/homeassistant/components/teslemetry/cover.py b/homeassistant/components/teslemetry/cover.py
index 4cc15b6feb8..de91f43f084 100644
--- a/homeassistant/components/teslemetry/cover.py
+++ b/homeassistant/components/teslemetry/cover.py
@@ -15,7 +15,7 @@ from homeassistant.components.cover import (
     CoverEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from . import TeslemetryConfigEntry
@@ -36,7 +36,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslemetryConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Teslemetry cover platform from a config entry."""
 
diff --git a/homeassistant/components/teslemetry/device_tracker.py b/homeassistant/components/teslemetry/device_tracker.py
index 42c8fea8d09..6a758e68497 100644
--- a/homeassistant/components/teslemetry/device_tracker.py
+++ b/homeassistant/components/teslemetry/device_tracker.py
@@ -14,7 +14,7 @@ from homeassistant.components.device_tracker.config_entry import (
 )
 from homeassistant.const import STATE_HOME
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from . import TeslemetryConfigEntry
@@ -68,7 +68,7 @@ DESCRIPTIONS: tuple[TeslemetryDeviceTrackerEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslemetryConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Teslemetry device tracker platform from a config entry."""
 
diff --git a/homeassistant/components/teslemetry/diagnostics.py b/homeassistant/components/teslemetry/diagnostics.py
index fc601a58ae6..755935951fc 100644
--- a/homeassistant/components/teslemetry/diagnostics.py
+++ b/homeassistant/components/teslemetry/diagnostics.py
@@ -35,7 +35,9 @@ async def async_get_config_entry_diagnostics(
     vehicles = [
         {
             "data": async_redact_data(x.coordinator.data, VEHICLE_REDACT),
-            # Stream diag will go here when implemented
+            "stream": {
+                "config": x.stream_vehicle.config,
+            },
         }
         for x in entry.runtime_data.vehicles
     ]
@@ -45,6 +47,7 @@ async def async_get_config_entry_diagnostics(
             if x.live_coordinator
             else None,
             "info": async_redact_data(x.info_coordinator.data, ENERGY_INFO_REDACT),
+            "history": x.history_coordinator.data if x.history_coordinator else None,
         }
         for x in entry.runtime_data.energysites
     ]
diff --git a/homeassistant/components/teslemetry/entity.py b/homeassistant/components/teslemetry/entity.py
index 82d3db123c3..3d145d24b0c 100644
--- a/homeassistant/components/teslemetry/entity.py
+++ b/homeassistant/components/teslemetry/entity.py
@@ -4,8 +4,8 @@ from abc import abstractmethod
 from typing import Any
 
 from propcache.api import cached_property
-from tesla_fleet_api import EnergySpecific, VehicleSpecific
 from tesla_fleet_api.const import Scope
+from tesla_fleet_api.teslemetry import EnergySite, Vehicle
 from teslemetry_stream import Signal
 
 from homeassistant.exceptions import ServiceValidationError
@@ -29,7 +29,7 @@ class TeslemetryRootEntity(Entity):
 
     _attr_has_entity_name = True
     scoped: bool
-    api: VehicleSpecific | EnergySpecific
+    api: Vehicle | EnergySite
 
     def raise_for_scope(self, scope: Scope):
         """Raise an error if a scope is not available."""
@@ -105,7 +105,7 @@ class TeslemetryVehicleEntity(TeslemetryEntity):
     """Parent class for Teslemetry Vehicle entities."""
 
     _last_update: int = 0
-    api: VehicleSpecific
+    api: Vehicle
     vehicle: TeslemetryVehicleData
 
     def __init__(
@@ -134,7 +134,7 @@ class TeslemetryVehicleEntity(TeslemetryEntity):
 class TeslemetryEnergyLiveEntity(TeslemetryEntity):
     """Parent class for Teslemetry Energy Site Live entities."""
 
-    api: EnergySpecific
+    api: EnergySite
 
     def __init__(
         self,
@@ -155,7 +155,7 @@ class TeslemetryEnergyLiveEntity(TeslemetryEntity):
 class TeslemetryEnergyInfoEntity(TeslemetryEntity):
     """Parent class for Teslemetry Energy Site Info Entities."""
 
-    api: EnergySpecific
+    api: EnergySite
 
     def __init__(
         self,
@@ -194,7 +194,7 @@ class TeslemetryWallConnectorEntity(TeslemetryEntity):
     """Parent class for Teslemetry Wall Connector Entities."""
 
     _attr_has_entity_name = True
-    api: EnergySpecific
+    api: EnergySite
 
     def __init__(
         self,
diff --git a/homeassistant/components/teslemetry/icons.json b/homeassistant/components/teslemetry/icons.json
index 6559acf89dc..9996a508177 100644
--- a/homeassistant/components/teslemetry/icons.json
+++ b/homeassistant/components/teslemetry/icons.json
@@ -291,7 +291,7 @@
       }
     },
     "switch": {
-      "charge_state_user_charge_enable_request": {
+      "charge_state_charging_state": {
         "default": "mdi:ev-station"
       },
       "climate_state_auto_seat_climate_left": {
diff --git a/homeassistant/components/teslemetry/lock.py b/homeassistant/components/teslemetry/lock.py
index 4600391145b..68505a12a13 100644
--- a/homeassistant/components/teslemetry/lock.py
+++ b/homeassistant/components/teslemetry/lock.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from itertools import chain
 from typing import Any
 
 from tesla_fleet_api.const import Scope
@@ -9,11 +10,16 @@ from tesla_fleet_api.const import Scope
 from homeassistant.components.lock import LockEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.restore_state import RestoreEntity
 
 from . import TeslemetryConfigEntry
 from .const import DOMAIN
-from .entity import TeslemetryVehicleEntity
+from .entity import (
+    TeslemetryRootEntity,
+    TeslemetryVehicleEntity,
+    TeslemetryVehicleStreamEntity,
+)
 from .helpers import handle_vehicle_command
 from .models import TeslemetryVehicleData
 
@@ -25,36 +31,43 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslemetryConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Teslemetry lock platform from a config entry."""
 
     async_add_entities(
-        klass(vehicle, Scope.VEHICLE_CMDS in entry.runtime_data.scopes)
-        for klass in (
-            TeslemetryVehicleLockEntity,
-            TeslemetryCableLockEntity,
+        chain(
+            (
+                TeslemetryPollingVehicleLockEntity(
+                    vehicle, Scope.VEHICLE_CMDS in entry.runtime_data.scopes
+                )
+                if vehicle.api.pre2021 or vehicle.firmware < "2024.26"
+                else TeslemetryStreamingVehicleLockEntity(
+                    vehicle, Scope.VEHICLE_CMDS in entry.runtime_data.scopes
+                )
+                for vehicle in entry.runtime_data.vehicles
+            ),
+            (
+                TeslemetryPollingCableLockEntity(
+                    vehicle, Scope.VEHICLE_CMDS in entry.runtime_data.scopes
+                )
+                if vehicle.api.pre2021 or vehicle.firmware < "2024.26"
+                else TeslemetryStreamingCableLockEntity(
+                    vehicle, Scope.VEHICLE_CMDS in entry.runtime_data.scopes
+                )
+                for vehicle in entry.runtime_data.vehicles
+            ),
         )
-        for vehicle in entry.runtime_data.vehicles
     )
 
 
-class TeslemetryVehicleLockEntity(TeslemetryVehicleEntity, LockEntity):
-    """Lock entity for Teslemetry."""
-
-    def __init__(self, data: TeslemetryVehicleData, scoped: bool) -> None:
-        """Initialize the lock."""
-        super().__init__(data, "vehicle_state_locked")
-        self.scoped = scoped
-
-    def _async_update_attrs(self) -> None:
-        """Update entity attributes."""
-        self._attr_is_locked = self._value
+class TeslemetryVehicleLockEntity(TeslemetryRootEntity, LockEntity):
+    """Base vehicle lock entity for Teslemetry."""
 
     async def async_lock(self, **kwargs: Any) -> None:
         """Lock the doors."""
         self.raise_for_scope(Scope.VEHICLE_CMDS)
-        await self.wake_up_if_asleep()
+
         await handle_vehicle_command(self.api.door_lock())
         self._attr_is_locked = True
         self.async_write_ha_state()
@@ -62,27 +75,65 @@ class TeslemetryVehicleLockEntity(TeslemetryVehicleEntity, LockEntity):
     async def async_unlock(self, **kwargs: Any) -> None:
         """Unlock the doors."""
         self.raise_for_scope(Scope.VEHICLE_CMDS)
-        await self.wake_up_if_asleep()
+
         await handle_vehicle_command(self.api.door_unlock())
         self._attr_is_locked = False
         self.async_write_ha_state()
 
 
-class TeslemetryCableLockEntity(TeslemetryVehicleEntity, LockEntity):
-    """Cable Lock entity for Teslemetry."""
+class TeslemetryPollingVehicleLockEntity(
+    TeslemetryVehicleEntity, TeslemetryVehicleLockEntity
+):
+    """Polling vehicle lock entity for Teslemetry."""
 
-    def __init__(
-        self,
-        data: TeslemetryVehicleData,
-        scoped: bool,
-    ) -> None:
-        """Initialize the lock."""
-        super().__init__(data, "charge_state_charge_port_latch")
+    def __init__(self, data: TeslemetryVehicleData, scoped: bool) -> None:
+        """Initialize the sensor."""
+        super().__init__(
+            data,
+            "vehicle_state_locked",
+        )
         self.scoped = scoped
 
     def _async_update_attrs(self) -> None:
         """Update entity attributes."""
-        self._attr_is_locked = self._value == ENGAGED
+        self._attr_is_locked = self._value
+
+
+class TeslemetryStreamingVehicleLockEntity(
+    TeslemetryVehicleStreamEntity, TeslemetryVehicleLockEntity, RestoreEntity
+):
+    """Streaming vehicle lock entity for Teslemetry."""
+
+    def __init__(self, data: TeslemetryVehicleData, scoped: bool) -> None:
+        """Initialize the sensor."""
+        super().__init__(
+            data,
+            "vehicle_state_locked",
+        )
+        self.scoped = scoped
+
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+
+        # Restore state
+        if (state := await self.async_get_last_state()) is not None:
+            if state.state == "locked":
+                self._attr_is_locked = True
+            elif state.state == "unlocked":
+                self._attr_is_locked = False
+
+        # Add streaming listener
+        self.async_on_remove(self.vehicle.stream_vehicle.listen_Locked(self._callback))
+
+    def _callback(self, value: bool | None) -> None:
+        """Update entity attributes."""
+        self._attr_is_locked = value
+        self.async_write_ha_state()
+
+
+class TeslemetryCableLockEntity(TeslemetryRootEntity, LockEntity):
+    """Base cable Lock entity for Teslemetry."""
 
     async def async_lock(self, **kwargs: Any) -> None:
         """Charge cable Lock cannot be manually locked."""
@@ -95,7 +146,70 @@ class TeslemetryCableLockEntity(TeslemetryVehicleEntity, LockEntity):
     async def async_unlock(self, **kwargs: Any) -> None:
         """Unlock charge cable lock."""
         self.raise_for_scope(Scope.VEHICLE_CMDS)
-        await self.wake_up_if_asleep()
+
         await handle_vehicle_command(self.api.charge_port_door_open())
         self._attr_is_locked = False
         self.async_write_ha_state()
+
+
+class TeslemetryPollingCableLockEntity(
+    TeslemetryVehicleEntity, TeslemetryCableLockEntity
+):
+    """Polling cable lock entity for Teslemetry."""
+
+    def __init__(
+        self,
+        data: TeslemetryVehicleData,
+        scoped: bool,
+    ) -> None:
+        """Initialize the sensor."""
+        super().__init__(
+            data,
+            "charge_state_charge_port_latch",
+        )
+        self.scoped = scoped
+
+    def _async_update_attrs(self) -> None:
+        """Update entity attributes."""
+        if self._value is None:
+            self._attr_is_locked = None
+        self._attr_is_locked = self._value == ENGAGED
+
+
+class TeslemetryStreamingCableLockEntity(
+    TeslemetryVehicleStreamEntity, TeslemetryCableLockEntity, RestoreEntity
+):
+    """Streaming cable lock entity for Teslemetry."""
+
+    def __init__(
+        self,
+        data: TeslemetryVehicleData,
+        scoped: bool,
+    ) -> None:
+        """Initialize the sensor."""
+        super().__init__(
+            data,
+            "charge_state_charge_port_latch",
+        )
+        self.scoped = scoped
+
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+
+        # Restore state
+        if (state := await self.async_get_last_state()) is not None:
+            if state.state == "locked":
+                self._attr_is_locked = True
+            elif state.state == "unlocked":
+                self._attr_is_locked = False
+
+        # Add streaming listener
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_ChargePortLatch(self._callback)
+        )
+
+    def _callback(self, value: str | None) -> None:
+        """Update entity attributes."""
+        self._attr_is_locked = None if value is None else value == ENGAGED
+        self.async_write_ha_state()
diff --git a/homeassistant/components/teslemetry/manifest.json b/homeassistant/components/teslemetry/manifest.json
index 7a3d0905ea1..cae5a8f3c01 100644
--- a/homeassistant/components/teslemetry/manifest.json
+++ b/homeassistant/components/teslemetry/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/teslemetry",
   "iot_class": "cloud_polling",
   "loggers": ["tesla-fleet-api"],
-  "requirements": ["tesla-fleet-api==0.9.2", "teslemetry-stream==0.6.6"]
+  "requirements": ["tesla-fleet-api==1.0.16", "teslemetry-stream==0.6.12"]
 }
diff --git a/homeassistant/components/teslemetry/media_player.py b/homeassistant/components/teslemetry/media_player.py
index e0e144ffe3a..50f15618e66 100644
--- a/homeassistant/components/teslemetry/media_player.py
+++ b/homeassistant/components/teslemetry/media_player.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from tesla_fleet_api.const import Scope
+from tesla_fleet_api.teslemetry import Vehicle
 
 from homeassistant.components.media_player import (
     MediaPlayerDeviceClass,
@@ -11,10 +12,15 @@ from homeassistant.components.media_player import (
     MediaPlayerState,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.restore_state import RestoreEntity
 
 from . import TeslemetryConfigEntry
-from .entity import TeslemetryVehicleEntity
+from .entity import (
+    TeslemetryRootEntity,
+    TeslemetryVehicleEntity,
+    TeslemetryVehicleStreamEntity,
+)
 from .helpers import handle_vehicle_command
 from .models import TeslemetryVehicleData
 
@@ -24,8 +30,16 @@ STATES = {
     "Stopped": MediaPlayerState.IDLE,
     "Off": MediaPlayerState.OFF,
 }
-VOLUME_MAX = 11.0
-VOLUME_STEP = 1.0 / 3
+DISPLAY_STATES = {
+    "On": MediaPlayerState.IDLE,
+    "Accessory": MediaPlayerState.IDLE,
+    "Charging": MediaPlayerState.OFF,
+    "Sentry": MediaPlayerState.OFF,
+    "Off": MediaPlayerState.OFF,
+}
+# Tesla uses 31 steps, in 0.333 increments up to 10.333
+VOLUME_STEP = 1 / 31
+VOLUME_FACTOR = 31 / 3  # 10.333
 
 PARALLEL_UPDATES = 0
 
@@ -33,73 +47,104 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslemetryConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Teslemetry Media platform from a config entry."""
 
     async_add_entities(
-        TeslemetryMediaEntity(vehicle, Scope.VEHICLE_CMDS in entry.runtime_data.scopes)
+        TeslemetryPollingMediaEntity(vehicle, entry.runtime_data.scopes)
+        if vehicle.api.pre2021 or vehicle.firmware < "2025.2.6"
+        else TeslemetryStreamingMediaEntity(vehicle, entry.runtime_data.scopes)
         for vehicle in entry.runtime_data.vehicles
     )
 
 
-class TeslemetryMediaEntity(TeslemetryVehicleEntity, MediaPlayerEntity):
-    """Vehicle media player class."""
+class TeslemetryMediaEntity(TeslemetryRootEntity, MediaPlayerEntity):
+    """Base vehicle media player class."""
+
+    api: Vehicle
 
     _attr_device_class = MediaPlayerDeviceClass.SPEAKER
-    _attr_supported_features = (
-        MediaPlayerEntityFeature.NEXT_TRACK
-        | MediaPlayerEntityFeature.PAUSE
-        | MediaPlayerEntityFeature.PLAY
-        | MediaPlayerEntityFeature.PREVIOUS_TRACK
-        | MediaPlayerEntityFeature.VOLUME_SET
-    )
-    _volume_max: float = VOLUME_MAX
+    _attr_volume_step = VOLUME_STEP
+
+    async def async_set_volume_level(self, volume: float) -> None:
+        """Set volume level, range 0..1."""
+        self.raise_for_scope(Scope.VEHICLE_CMDS)
+
+        await handle_vehicle_command(self.api.adjust_volume(volume * VOLUME_FACTOR))
+        self._attr_volume_level = volume
+        self.async_write_ha_state()
+
+    async def async_media_play(self) -> None:
+        """Send play command."""
+        if self.state != MediaPlayerState.PLAYING:
+            self.raise_for_scope(Scope.VEHICLE_CMDS)
+
+            await handle_vehicle_command(self.api.media_toggle_playback())
+            self._attr_state = MediaPlayerState.PLAYING
+            self.async_write_ha_state()
+
+    async def async_media_pause(self) -> None:
+        """Send pause command."""
+
+        if self.state == MediaPlayerState.PLAYING:
+            self.raise_for_scope(Scope.VEHICLE_CMDS)
+
+            await handle_vehicle_command(self.api.media_toggle_playback())
+            self._attr_state = MediaPlayerState.PAUSED
+            self.async_write_ha_state()
+
+    async def async_media_next_track(self) -> None:
+        """Send next track command."""
+
+        self.raise_for_scope(Scope.VEHICLE_CMDS)
+        await handle_vehicle_command(self.api.media_next_track())
+
+    async def async_media_previous_track(self) -> None:
+        """Send previous track command."""
+
+        self.raise_for_scope(Scope.VEHICLE_CMDS)
+        await handle_vehicle_command(self.api.media_prev_track())
+
+
+class TeslemetryPollingMediaEntity(TeslemetryVehicleEntity, TeslemetryMediaEntity):
+    """Polling vehicle media player class."""
 
     def __init__(
         self,
         data: TeslemetryVehicleData,
-        scoped: bool,
+        scopes: list[Scope],
     ) -> None:
         """Initialize the media player entity."""
         super().__init__(data, "media")
-        self.scoped = scoped
-        if not scoped:
+
+        self._attr_supported_features = (
+            MediaPlayerEntityFeature.NEXT_TRACK
+            | MediaPlayerEntityFeature.PAUSE
+            | MediaPlayerEntityFeature.PLAY
+            | MediaPlayerEntityFeature.PREVIOUS_TRACK
+            | MediaPlayerEntityFeature.VOLUME_SET
+        )
+        self.scoped = Scope.VEHICLE_CMDS in scopes
+        if not self.scoped:
             self._attr_supported_features = MediaPlayerEntityFeature(0)
 
     def _async_update_attrs(self) -> None:
         """Update entity attributes."""
-        self._volume_max = (
-            self.get("vehicle_state_media_info_audio_volume_max") or VOLUME_MAX
-        )
-        self._attr_state = STATES.get(
-            self.get("vehicle_state_media_info_media_playback_status") or "Off",
-        )
-        self._attr_volume_step = (
-            1.0
-            / self._volume_max
-            / (
-                self.get("vehicle_state_media_info_audio_volume_increment")
-                or VOLUME_STEP
-            )
-        )
+        state = self.get("vehicle_state_media_info_media_playback_status")
+        self._attr_state = STATES.get(state) if state else None
+        self._attr_volume_level = (
+            self.get("vehicle_state_media_info_audio_volume") or 0
+        ) / VOLUME_FACTOR
 
-        if volume := self.get("vehicle_state_media_info_audio_volume"):
-            self._attr_volume_level = volume / self._volume_max
-        else:
-            self._attr_volume_level = None
+        duration = self.get("vehicle_state_media_info_now_playing_duration")
+        self._attr_media_duration = duration / 1000 if duration is not None else None
 
-        if duration := self.get("vehicle_state_media_info_now_playing_duration"):
-            self._attr_media_duration = duration / 1000
-        else:
-            self._attr_media_duration = None
-
-        if duration and (
-            position := self.get("vehicle_state_media_info_now_playing_elapsed")
-        ):
-            self._attr_media_position = position / 1000
-        else:
-            self._attr_media_position = None
+        # Return media position only when a media duration is > 0.
+        elapsed = self.get("vehicle_state_media_info_now_playing_elapsed")
+        self._attr_media_position = (
+            elapsed / 1000 if duration and elapsed is not None else None
+        )
 
         self._attr_media_title = self.get("vehicle_state_media_info_now_playing_title")
         self._attr_media_artist = self.get(
@@ -113,42 +158,151 @@ class TeslemetryMediaEntity(TeslemetryVehicleEntity, MediaPlayerEntity):
         )
         self._attr_source = self.get("vehicle_state_media_info_now_playing_source")
 
-    async def async_set_volume_level(self, volume: float) -> None:
-        """Set volume level, range 0..1."""
-        self.raise_for_scope(Scope.VEHICLE_CMDS)
-        await self.wake_up_if_asleep()
-        await handle_vehicle_command(
-            self.api.adjust_volume(int(volume * self._volume_max))
+
+class TeslemetryStreamingMediaEntity(
+    TeslemetryVehicleStreamEntity, TeslemetryMediaEntity, RestoreEntity
+):
+    """Streaming vehicle media player class."""
+
+    def __init__(
+        self,
+        data: TeslemetryVehicleData,
+        scopes: list[Scope],
+    ) -> None:
+        """Initialize the media player entity."""
+        super().__init__(data, "media")
+
+        self._attr_supported_features = (
+            MediaPlayerEntityFeature.NEXT_TRACK
+            | MediaPlayerEntityFeature.PAUSE
+            | MediaPlayerEntityFeature.PLAY
+            | MediaPlayerEntityFeature.PREVIOUS_TRACK
+            | MediaPlayerEntityFeature.VOLUME_SET
         )
-        self._attr_volume_level = volume
+        self.scoped = Scope.VEHICLE_CMDS in scopes
+        if not self.scoped:
+            self._attr_supported_features = MediaPlayerEntityFeature(0)
+
+    async def async_added_to_hass(self) -> None:
+        """Call when entity is added to hass."""
+
+        await super().async_added_to_hass()
+        if (state := await self.async_get_last_state()) is not None:
+            try:
+                self._attr_state = MediaPlayerState(state.state)
+            except ValueError:
+                self._attr_state = None
+            self._attr_volume_level = state.attributes.get("volume_level")
+            self._attr_media_title = state.attributes.get("media_title")
+            self._attr_media_artist = state.attributes.get("media_artist")
+            self._attr_media_album_name = state.attributes.get("media_album_name")
+            self._attr_media_playlist = state.attributes.get("media_playlist")
+            self._attr_media_duration = state.attributes.get("media_duration")
+            self._attr_media_position = state.attributes.get("media_position")
+            self._attr_source = state.attributes.get("source")
+
+            self.async_write_ha_state()
+
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_CenterDisplay(
+                self._async_handle_center_display
+            )
+        )
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_MediaPlaybackStatus(
+                self._async_handle_media_playback_status
+            )
+        )
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_MediaPlaybackSource(
+                self._async_handle_media_playback_source
+            )
+        )
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_MediaAudioVolume(
+                self._async_handle_media_audio_volume
+            )
+        )
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_MediaNowPlayingDuration(
+                self._async_handle_media_now_playing_duration
+            )
+        )
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_MediaNowPlayingElapsed(
+                self._async_handle_media_now_playing_elapsed
+            )
+        )
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_MediaNowPlayingArtist(
+                self._async_handle_media_now_playing_artist
+            )
+        )
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_MediaNowPlayingAlbum(
+                self._async_handle_media_now_playing_album
+            )
+        )
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_MediaNowPlayingTitle(
+                self._async_handle_media_now_playing_title
+            )
+        )
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_MediaNowPlayingStation(
+                self._async_handle_media_now_playing_station
+            )
+        )
+
+    def _async_handle_center_display(self, value: str | None) -> None:
+        """Update entity attributes."""
+        if value is not None:
+            self._attr_state = DISPLAY_STATES.get(value)
+            self.async_write_ha_state()
+
+    def _async_handle_media_playback_status(self, value: str | None) -> None:
+        """Update entity attributes."""
+        self._attr_state = MediaPlayerState.OFF if value is None else STATES.get(value)
         self.async_write_ha_state()
 
-    async def async_media_play(self) -> None:
-        """Send play command."""
-        if self.state != MediaPlayerState.PLAYING:
-            self.raise_for_scope(Scope.VEHICLE_CMDS)
-            await self.wake_up_if_asleep()
-            await handle_vehicle_command(self.api.media_toggle_playback())
-            self._attr_state = MediaPlayerState.PLAYING
-            self.async_write_ha_state()
+    def _async_handle_media_playback_source(self, value: str | None) -> None:
+        """Update entity attributes."""
+        self._attr_source = value
+        self.async_write_ha_state()
 
-    async def async_media_pause(self) -> None:
-        """Send pause command."""
-        if self.state == MediaPlayerState.PLAYING:
-            self.raise_for_scope(Scope.VEHICLE_CMDS)
-            await self.wake_up_if_asleep()
-            await handle_vehicle_command(self.api.media_toggle_playback())
-            self._attr_state = MediaPlayerState.PAUSED
-            self.async_write_ha_state()
+    def _async_handle_media_audio_volume(self, value: float | None) -> None:
+        """Update entity attributes."""
+        self._attr_volume_level = None if value is None else value / VOLUME_FACTOR
+        self.async_write_ha_state()
 
-    async def async_media_next_track(self) -> None:
-        """Send next track command."""
-        self.raise_for_scope(Scope.VEHICLE_CMDS)
-        await self.wake_up_if_asleep()
-        await handle_vehicle_command(self.api.media_next_track())
+    def _async_handle_media_now_playing_duration(self, value: int | None) -> None:
+        """Update entity attributes."""
+        self._attr_media_duration = None if value is None else int(value / 1000)
+        self.async_write_ha_state()
 
-    async def async_media_previous_track(self) -> None:
-        """Send previous track command."""
-        self.raise_for_scope(Scope.VEHICLE_CMDS)
-        await self.wake_up_if_asleep()
-        await handle_vehicle_command(self.api.media_prev_track())
+    def _async_handle_media_now_playing_elapsed(self, value: int | None) -> None:
+        """Update entity attributes."""
+        self._attr_media_position = None if value is None else int(value / 1000)
+        self.async_write_ha_state()
+
+    def _async_handle_media_now_playing_artist(self, value: str | None) -> None:
+        """Update entity attributes."""
+        self._attr_media_artist = value  # Check if this is album artist or not
+        self.async_write_ha_state()
+
+    def _async_handle_media_now_playing_album(self, value: str | None) -> None:
+        """Update entity attributes."""
+        self._attr_media_album_name = value
+        self.async_write_ha_state()
+
+    def _async_handle_media_now_playing_title(self, value: str | None) -> None:
+        """Update entity attributes."""
+        self._attr_media_title = value
+        self.async_write_ha_state()
+
+    def _async_handle_media_now_playing_station(self, value: str | None) -> None:
+        """Update entity attributes."""
+        self._attr_media_channel = (
+            value  # could also be _attr_media_playlist when Spotify
+        )
+        self.async_write_ha_state()
diff --git a/homeassistant/components/teslemetry/models.py b/homeassistant/components/teslemetry/models.py
index 5b78386c68a..fd6cf12b5b9 100644
--- a/homeassistant/components/teslemetry/models.py
+++ b/homeassistant/components/teslemetry/models.py
@@ -6,8 +6,8 @@ import asyncio
 from collections.abc import Callable
 from dataclasses import dataclass
 
-from tesla_fleet_api import EnergySpecific, VehicleSpecific
 from tesla_fleet_api.const import Scope
+from tesla_fleet_api.teslemetry import EnergySite, Vehicle
 from teslemetry_stream import TeslemetryStream, TeslemetryStreamVehicle
 
 from homeassistant.config_entries import ConfigEntry
@@ -34,7 +34,7 @@ class TeslemetryData:
 class TeslemetryVehicleData:
     """Data for a vehicle in the Teslemetry integration."""
 
-    api: VehicleSpecific
+    api: Vehicle
     config_entry: ConfigEntry
     coordinator: TeslemetryVehicleDataCoordinator
     stream: TeslemetryStream
@@ -50,7 +50,7 @@ class TeslemetryVehicleData:
 class TeslemetryEnergyData:
     """Data for a vehicle in the Teslemetry integration."""
 
-    api: EnergySpecific
+    api: EnergySite
     live_coordinator: TeslemetryEnergySiteLiveCoordinator | None
     info_coordinator: TeslemetryEnergySiteInfoCoordinator
     history_coordinator: TeslemetryEnergyHistoryCoordinator | None
diff --git a/homeassistant/components/teslemetry/number.py b/homeassistant/components/teslemetry/number.py
index 9ba9c28b199..ff25dec59b8 100644
--- a/homeassistant/components/teslemetry/number.py
+++ b/homeassistant/components/teslemetry/number.py
@@ -7,22 +7,35 @@ from dataclasses import dataclass
 from itertools import chain
 from typing import Any
 
-from tesla_fleet_api import EnergySpecific, VehicleSpecific
 from tesla_fleet_api.const import Scope
+from tesla_fleet_api.teslemetry import EnergySite, Vehicle
+from teslemetry_stream import TeslemetryStreamVehicle
 
 from homeassistant.components.number import (
     NumberDeviceClass,
     NumberEntity,
     NumberEntityDescription,
     NumberMode,
+    RestoreNumber,
+)
+from homeassistant.const import (
+    PERCENTAGE,
+    PRECISION_WHOLE,
+    STATE_UNAVAILABLE,
+    STATE_UNKNOWN,
+    UnitOfElectricCurrent,
 )
-from homeassistant.const import PERCENTAGE, PRECISION_WHOLE, UnitOfElectricCurrent
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.icon import icon_for_battery_level
 
 from . import TeslemetryConfigEntry
-from .entity import TeslemetryEnergyInfoEntity, TeslemetryVehicleEntity
+from .entity import (
+    TeslemetryEnergyInfoEntity,
+    TeslemetryRootEntity,
+    TeslemetryVehicleEntity,
+    TeslemetryVehicleStreamEntity,
+)
 from .helpers import handle_command, handle_vehicle_command
 from .models import TeslemetryEnergyData, TeslemetryVehicleData
 
@@ -33,12 +46,22 @@ PARALLEL_UPDATES = 0
 class TeslemetryNumberVehicleEntityDescription(NumberEntityDescription):
     """Describes Teslemetry Number entity."""
 
-    func: Callable[[VehicleSpecific, float], Awaitable[Any]]
-    native_min_value: float
-    native_max_value: float
+    func: Callable[[Vehicle, int], Awaitable[Any]]
     min_key: str | None = None
     max_key: str
+    native_min_value: float
+    native_max_value: float
     scopes: list[Scope]
+    value_listener: Callable[
+        [TeslemetryStreamVehicle, Callable[[int | None], None]],
+        Callable[[], None],
+    ]
+    max_listener: (
+        Callable[
+            [TeslemetryStreamVehicle, Callable[[int | None], None]], Callable[[], None]
+        ]
+        | None
+    ) = None
 
 
 VEHICLE_DESCRIPTIONS: tuple[TeslemetryNumberVehicleEntityDescription, ...] = (
@@ -52,7 +75,9 @@ VEHICLE_DESCRIPTIONS: tuple[TeslemetryNumberVehicleEntityDescription, ...] = (
         mode=NumberMode.AUTO,
         max_key="charge_state_charge_current_request_max",
         func=lambda api, value: api.set_charging_amps(value),
-        scopes=[Scope.VEHICLE_CHARGING_CMDS],
+        scopes=[Scope.VEHICLE_CHARGING_CMDS, Scope.VEHICLE_CMDS],
+        value_listener=lambda x, y: x.listen_ChargeCurrentRequest(y),
+        max_listener=lambda x, y: x.listen_ChargeCurrentRequestMax(y),
     ),
     TeslemetryNumberVehicleEntityDescription(
         key="charge_state_charge_limit_soc",
@@ -62,10 +87,10 @@ VEHICLE_DESCRIPTIONS: tuple[TeslemetryNumberVehicleEntityDescription, ...] = (
         native_unit_of_measurement=PERCENTAGE,
         device_class=NumberDeviceClass.BATTERY,
         mode=NumberMode.AUTO,
-        min_key="charge_state_charge_limit_soc_min",
         max_key="charge_state_charge_limit_soc_max",
         func=lambda api, value: api.set_charge_limit(value),
         scopes=[Scope.VEHICLE_CHARGING_CMDS, Scope.VEHICLE_CMDS],
+        value_listener=lambda x, y: x.listen_ChargeLimitSoc(y),
     ),
 )
 
@@ -74,18 +99,31 @@ VEHICLE_DESCRIPTIONS: tuple[TeslemetryNumberVehicleEntityDescription, ...] = (
 class TeslemetryNumberBatteryEntityDescription(NumberEntityDescription):
     """Describes Teslemetry Number entity."""
 
-    func: Callable[[EnergySpecific, float], Awaitable[Any]]
+    func: Callable[[EnergySite, float], Awaitable[Any]]
     requires: str | None = None
+    scopes: list[Scope]
 
 
 ENERGY_INFO_DESCRIPTIONS: tuple[TeslemetryNumberBatteryEntityDescription, ...] = (
     TeslemetryNumberBatteryEntityDescription(
         key="backup_reserve_percent",
+        native_step=PRECISION_WHOLE,
+        native_min_value=0,
+        native_max_value=100,
+        device_class=NumberDeviceClass.BATTERY,
+        native_unit_of_measurement=PERCENTAGE,
+        scopes=[Scope.ENERGY_CMDS],
         func=lambda api, value: api.backup(int(value)),
         requires="components_battery",
     ),
     TeslemetryNumberBatteryEntityDescription(
         key="off_grid_vehicle_charging_reserve_percent",
+        native_step=PRECISION_WHOLE,
+        native_min_value=0,
+        native_max_value=100,
+        device_class=NumberDeviceClass.BATTERY,
+        native_unit_of_measurement=PERCENTAGE,
+        scopes=[Scope.ENERGY_CMDS],
         func=lambda api, value: api.off_grid_vehicle_charging_reserve(int(value)),
         requires="components_off_grid_vehicle_charging_reserve_supported",
     ),
@@ -95,14 +133,20 @@ ENERGY_INFO_DESCRIPTIONS: tuple[TeslemetryNumberBatteryEntityDescription, ...] =
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslemetryConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Teslemetry number platform from a config entry."""
 
     async_add_entities(
         chain(
-            (  # Add vehicle entities
-                TeslemetryVehicleNumberEntity(
+            (
+                TeslemetryPollingNumberEntity(
+                    vehicle,
+                    description,
+                    entry.runtime_data.scopes,
+                )
+                if vehicle.api.pre2021 or vehicle.firmware < "2024.26"
+                else TeslemetryStreamingNumberEntity(
                     vehicle,
                     description,
                     entry.runtime_data.scopes,
@@ -110,7 +154,7 @@ async def async_setup_entry(
                 for vehicle in entry.runtime_data.vehicles
                 for description in VEHICLE_DESCRIPTIONS
             ),
-            (  # Add energy site entities
+            (
                 TeslemetryEnergyInfoNumberSensorEntity(
                     energysite,
                     description,
@@ -125,11 +169,25 @@ async def async_setup_entry(
     )
 
 
-class TeslemetryVehicleNumberEntity(TeslemetryVehicleEntity, NumberEntity):
+class TeslemetryVehicleNumberEntity(TeslemetryRootEntity, NumberEntity):
     """Vehicle number entity base class."""
 
     entity_description: TeslemetryNumberVehicleEntityDescription
 
+    async def async_set_native_value(self, value: float) -> None:
+        """Set new value."""
+        value = int(value)
+        self.raise_for_scope(self.entity_description.scopes[0])
+        await handle_vehicle_command(self.entity_description.func(self.api, value))
+        self._attr_native_value = value
+        self.async_write_ha_state()
+
+
+class TeslemetryPollingNumberEntity(
+    TeslemetryVehicleEntity, TeslemetryVehicleNumberEntity
+):
+    """Vehicle polling number entity."""
+
     def __init__(
         self,
         data: TeslemetryVehicleData,
@@ -148,26 +206,67 @@ class TeslemetryVehicleNumberEntity(TeslemetryVehicleEntity, NumberEntity):
         """Update the attributes of the entity."""
         self._attr_native_value = self._value
 
-        if (min_key := self.entity_description.min_key) is not None:
-            self._attr_native_min_value = self.get_number(
-                min_key,
-                self.entity_description.native_min_value,
-            )
-        else:
-            self._attr_native_min_value = self.entity_description.native_min_value
-
         self._attr_native_max_value = self.get_number(
             self.entity_description.max_key,
             self.entity_description.native_max_value,
         )
 
-    async def async_set_native_value(self, value: float) -> None:
-        """Set new value."""
-        value = int(value)
-        self.raise_for_scope(self.entity_description.scopes[0])
-        await self.wake_up_if_asleep()
-        await handle_vehicle_command(self.entity_description.func(self.api, value))
-        self._attr_native_value = value
+
+class TeslemetryStreamingNumberEntity(
+    TeslemetryVehicleStreamEntity, TeslemetryVehicleNumberEntity, RestoreNumber
+):
+    """Number entity for current charge."""
+
+    entity_description: TeslemetryNumberVehicleEntityDescription
+
+    def __init__(
+        self,
+        data: TeslemetryVehicleData,
+        description: TeslemetryNumberVehicleEntityDescription,
+        scopes: list[Scope],
+    ) -> None:
+        """Initialize the Number entity."""
+        self.scoped = any(scope in scopes for scope in description.scopes)
+        self.entity_description = description
+        self._attr_native_max_value = self.entity_description.native_max_value
+        super().__init__(data, description.key)
+
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+
+        # Restore state
+        if (last_state := await self.async_get_last_state()) and (
+            last_number_data := await self.async_get_last_number_data()
+        ):
+            if last_state.state not in (STATE_UNKNOWN, STATE_UNAVAILABLE):
+                self._attr_native_value = last_number_data.native_value
+            if last_number_data.native_max_value:
+                self._attr_native_max_value = last_number_data.native_max_value
+
+        # Add listeners
+        self.async_on_remove(
+            self.entity_description.value_listener(
+                self.vehicle.stream_vehicle, self._value_callback
+            )
+        )
+        if self.entity_description.max_listener:
+            self.async_on_remove(
+                self.entity_description.max_listener(
+                    self.vehicle.stream_vehicle, self._max_callback
+                )
+            )
+
+    def _value_callback(self, value: int | None) -> None:
+        """Update the value of the entity."""
+        self._attr_native_value = None if value is None else value
+        self.async_write_ha_state()
+
+    def _max_callback(self, value: int | None) -> None:
+        """Update the value of the entity."""
+        self._attr_native_max_value = (
+            self.entity_description.native_max_value if value is None else value
+        )
         self.async_write_ha_state()
 
 
diff --git a/homeassistant/components/teslemetry/select.py b/homeassistant/components/teslemetry/select.py
index baf1d80ac6c..9e13d15edc4 100644
--- a/homeassistant/components/teslemetry/select.py
+++ b/homeassistant/components/teslemetry/select.py
@@ -2,18 +2,27 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable
+from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 from itertools import chain
+from typing import Any
 
 from tesla_fleet_api.const import EnergyExportMode, EnergyOperationMode, Scope, Seat
+from tesla_fleet_api.teslemetry import Vehicle
+from teslemetry_stream import TeslemetryStreamVehicle
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.restore_state import RestoreEntity
 
 from . import TeslemetryConfigEntry
-from .entity import TeslemetryEnergyInfoEntity, TeslemetryVehicleEntity
+from .entity import (
+    TeslemetryEnergyInfoEntity,
+    TeslemetryRootEntity,
+    TeslemetryVehicleEntity,
+    TeslemetryVehicleStreamEntity,
+)
 from .helpers import handle_command, handle_vehicle_command
 from .models import TeslemetryEnergyData, TeslemetryVehicleData
 
@@ -24,53 +33,136 @@ HIGH = "high"
 
 PARALLEL_UPDATES = 0
 
+LEVEL = {OFF: 0, LOW: 1, MEDIUM: 2, HIGH: 3}
+
 
 @dataclass(frozen=True, kw_only=True)
-class SeatHeaterDescription(SelectEntityDescription):
+class TeslemetrySelectEntityDescription(SelectEntityDescription):
     """Seat Heater entity description."""
 
-    position: Seat
-    available_fn: Callable[[TeslemetrySeatHeaterSelectEntity], bool] = lambda _: True
+    select_fn: Callable[[Vehicle, int], Awaitable[Any]]
+    supported_fn: Callable[[dict], bool] = lambda _: True
+    streaming_listener: (
+        Callable[
+            [TeslemetryStreamVehicle, Callable[[int | None], None]],
+            Callable[[], None],
+        ]
+        | None
+    ) = None
+    options: list[str]
 
 
-SEAT_HEATER_DESCRIPTIONS: tuple[SeatHeaterDescription, ...] = (
-    SeatHeaterDescription(
+VEHICLE_DESCRIPTIONS: tuple[TeslemetrySelectEntityDescription, ...] = (
+    TeslemetrySelectEntityDescription(
         key="climate_state_seat_heater_left",
-        position=Seat.FRONT_LEFT,
+        select_fn=lambda api, level: api.remote_seat_heater_request(
+            Seat.FRONT_LEFT, level
+        ),
+        streaming_listener=lambda x, y: x.listen_SeatHeaterLeft(y),
+        options=[
+            OFF,
+            LOW,
+            MEDIUM,
+            HIGH,
+        ],
     ),
-    SeatHeaterDescription(
+    TeslemetrySelectEntityDescription(
         key="climate_state_seat_heater_right",
-        position=Seat.FRONT_RIGHT,
+        select_fn=lambda api, level: api.remote_seat_heater_request(
+            Seat.FRONT_RIGHT, level
+        ),
+        streaming_listener=lambda x, y: x.listen_SeatHeaterRight(y),
+        options=[
+            OFF,
+            LOW,
+            MEDIUM,
+            HIGH,
+        ],
     ),
-    SeatHeaterDescription(
+    TeslemetrySelectEntityDescription(
         key="climate_state_seat_heater_rear_left",
-        position=Seat.REAR_LEFT,
-        available_fn=lambda self: self.get("vehicle_config_rear_seat_heaters") != 0,
+        select_fn=lambda api, level: api.remote_seat_heater_request(
+            Seat.REAR_LEFT, level
+        ),
+        supported_fn=lambda data: data.get("vehicle_config_rear_seat_heaters") != 0,
+        streaming_listener=lambda x, y: x.listen_SeatHeaterRearLeft(y),
         entity_registry_enabled_default=False,
+        options=[
+            OFF,
+            LOW,
+            MEDIUM,
+            HIGH,
+        ],
     ),
-    SeatHeaterDescription(
+    TeslemetrySelectEntityDescription(
         key="climate_state_seat_heater_rear_center",
-        position=Seat.REAR_CENTER,
-        available_fn=lambda self: self.get("vehicle_config_rear_seat_heaters") != 0,
+        select_fn=lambda api, level: api.remote_seat_heater_request(
+            Seat.REAR_CENTER, level
+        ),
+        supported_fn=lambda data: data.get("vehicle_config_rear_seat_heaters") != 0,
+        streaming_listener=lambda x, y: x.listen_SeatHeaterRearCenter(y),
         entity_registry_enabled_default=False,
+        options=[
+            OFF,
+            LOW,
+            MEDIUM,
+            HIGH,
+        ],
     ),
-    SeatHeaterDescription(
+    TeslemetrySelectEntityDescription(
         key="climate_state_seat_heater_rear_right",
-        position=Seat.REAR_RIGHT,
-        available_fn=lambda self: self.get("vehicle_config_rear_seat_heaters") != 0,
+        select_fn=lambda api, level: api.remote_seat_heater_request(
+            Seat.REAR_RIGHT, level
+        ),
+        supported_fn=lambda data: data.get("vehicle_config_rear_seat_heaters") != 0,
+        streaming_listener=lambda x, y: x.listen_SeatHeaterRearRight(y),
         entity_registry_enabled_default=False,
+        options=[
+            OFF,
+            LOW,
+            MEDIUM,
+            HIGH,
+        ],
     ),
-    SeatHeaterDescription(
+    TeslemetrySelectEntityDescription(
         key="climate_state_seat_heater_third_row_left",
-        position=Seat.THIRD_LEFT,
-        available_fn=lambda self: self.get("vehicle_config_third_row_seats") != "None",
+        select_fn=lambda api, level: api.remote_seat_heater_request(
+            Seat.THIRD_LEFT, level
+        ),
+        supported_fn=lambda self: self.get("vehicle_config_third_row_seats") != "None",
         entity_registry_enabled_default=False,
+        options=[
+            OFF,
+            LOW,
+            MEDIUM,
+            HIGH,
+        ],
     ),
-    SeatHeaterDescription(
+    TeslemetrySelectEntityDescription(
         key="climate_state_seat_heater_third_row_right",
-        position=Seat.THIRD_RIGHT,
-        available_fn=lambda self: self.get("vehicle_config_third_row_seats") != "None",
+        select_fn=lambda api, level: api.remote_seat_heater_request(
+            Seat.THIRD_RIGHT, level
+        ),
+        supported_fn=lambda self: self.get("vehicle_config_third_row_seats") != "None",
         entity_registry_enabled_default=False,
+        options=[
+            OFF,
+            LOW,
+            MEDIUM,
+            HIGH,
+        ],
+    ),
+    TeslemetrySelectEntityDescription(
+        key="climate_state_steering_wheel_heat_level",
+        select_fn=lambda api, level: api.remote_steering_wheel_heat_level_request(
+            level
+        ),
+        streaming_listener=lambda x, y: x.listen_HvacSteeringWheelHeatLevel(y),
+        options=[
+            OFF,
+            LOW,
+            HIGH,
+        ],
     ),
 )
 
@@ -78,24 +170,25 @@ SEAT_HEATER_DESCRIPTIONS: tuple[SeatHeaterDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslemetryConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Teslemetry select platform from a config entry."""
 
     async_add_entities(
         chain(
             (
-                TeslemetrySeatHeaterSelectEntity(
+                TeslemetryPollingSelectEntity(
                     vehicle, description, entry.runtime_data.scopes
                 )
-                for description in SEAT_HEATER_DESCRIPTIONS
+                if vehicle.api.pre2021
+                or vehicle.firmware < "2024.26"
+                or description.streaming_listener is None
+                else TeslemetryStreamingSelectEntity(
+                    vehicle, description, entry.runtime_data.scopes
+                )
+                for description in VEHICLE_DESCRIPTIONS
                 for vehicle in entry.runtime_data.vehicles
-                if description.key in vehicle.coordinator.data
-            ),
-            (
-                TeslemetryWheelHeaterSelectEntity(vehicle, entry.runtime_data.scopes)
-                for vehicle in entry.runtime_data.vehicles
-                if vehicle.coordinator.data.get("climate_state_steering_wheel_heater")
+                if description.supported_fn(vehicle.coordinator.data)
             ),
             (
                 TeslemetryOperationSelectEntity(energysite, entry.runtime_data.scopes)
@@ -112,22 +205,31 @@ async def async_setup_entry(
     )
 
 
-class TeslemetrySeatHeaterSelectEntity(TeslemetryVehicleEntity, SelectEntity):
-    """Select entity for vehicle seat heater."""
+class TeslemetrySelectEntity(TeslemetryRootEntity, SelectEntity):
+    """Parent vehicle select entity class."""
 
-    entity_description: SeatHeaterDescription
+    entity_description: TeslemetrySelectEntityDescription
+    _climate: bool = False
 
-    _attr_options = [
-        OFF,
-        LOW,
-        MEDIUM,
-        HIGH,
-    ]
+    async def async_select_option(self, option: str) -> None:
+        """Change the selected option."""
+        self.raise_for_scope(Scope.VEHICLE_CMDS)
+        level = LEVEL[option]
+        # AC must be on to turn on heaters
+        if level and not self._climate:
+            await handle_vehicle_command(self.api.auto_conditioning_start())
+        await handle_vehicle_command(self.entity_description.select_fn(self.api, level))
+        self._attr_current_option = option
+        self.async_write_ha_state()
+
+
+class TeslemetryPollingSelectEntity(TeslemetryVehicleEntity, TeslemetrySelectEntity):
+    """Base polling vehicle select entity class."""
 
     def __init__(
         self,
         data: TeslemetryVehicleData,
-        description: SeatHeaterDescription,
+        description: TeslemetrySelectEntityDescription,
         scopes: list[Scope],
     ) -> None:
         """Initialize the vehicle seat select entity."""
@@ -137,72 +239,63 @@ class TeslemetrySeatHeaterSelectEntity(TeslemetryVehicleEntity, SelectEntity):
 
     def _async_update_attrs(self) -> None:
         """Handle updated data from the coordinator."""
-        self._attr_available = self.entity_description.available_fn(self)
-        value = self._value
-        if not isinstance(value, int):
+        self._climate = bool(self.get("climate_state_is_climate_on"))
+        if not isinstance(self._value, int):
             self._attr_current_option = None
         else:
-            self._attr_current_option = self._attr_options[value]
-
-    async def async_select_option(self, option: str) -> None:
-        """Change the selected option."""
-        self.raise_for_scope(Scope.VEHICLE_CMDS)
-        await self.wake_up_if_asleep()
-        level = self._attr_options.index(option)
-        # AC must be on to turn on seat heater
-        if level and not self.get("climate_state_is_climate_on"):
-            await handle_vehicle_command(self.api.auto_conditioning_start())
-        await handle_vehicle_command(
-            self.api.remote_seat_heater_request(self.entity_description.position, level)
-        )
-        self._attr_current_option = option
-        self.async_write_ha_state()
+            self._attr_current_option = self.entity_description.options[self._value]
 
 
-class TeslemetryWheelHeaterSelectEntity(TeslemetryVehicleEntity, SelectEntity):
-    """Select entity for vehicle steering wheel heater."""
-
-    _attr_options = [
-        OFF,
-        LOW,
-        HIGH,
-    ]
+class TeslemetryStreamingSelectEntity(
+    TeslemetryVehicleStreamEntity, TeslemetrySelectEntity, RestoreEntity
+):
+    """Base streaming vehicle select entity class."""
 
     def __init__(
         self,
         data: TeslemetryVehicleData,
+        description: TeslemetrySelectEntityDescription,
         scopes: list[Scope],
     ) -> None:
-        """Initialize the vehicle steering wheel select entity."""
+        """Initialize the vehicle seat select entity."""
+        self.entity_description = description
         self.scoped = Scope.VEHICLE_CMDS in scopes
-        super().__init__(
-            data,
-            "climate_state_steering_wheel_heat_level",
+        self._attr_current_option = None
+        super().__init__(data, description.key)
+
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+
+        # Restore state
+        if (state := await self.async_get_last_state()) is not None:
+            if state.state in self.entity_description.options:
+                self._attr_current_option = state.state
+
+        # Listen for streaming data
+        assert self.entity_description.streaming_listener is not None
+        self.async_on_remove(
+            self.entity_description.streaming_listener(
+                self.vehicle.stream_vehicle, self._value_callback
+            )
         )
 
-    def _async_update_attrs(self) -> None:
-        """Handle updated data from the coordinator."""
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_HvacACEnabled(self._climate_callback)
+        )
 
-        value = self._value
-        if not isinstance(value, int):
+    def _value_callback(self, value: int | None) -> None:
+        """Update the value of the entity."""
+        if value is None:
             self._attr_current_option = None
         else:
-            self._attr_current_option = self._attr_options[value]
-
-    async def async_select_option(self, option: str) -> None:
-        """Change the selected option."""
-        self.raise_for_scope(Scope.VEHICLE_CMDS)
-        await self.wake_up_if_asleep()
-        level = self._attr_options.index(option)
-        # AC must be on to turn on steering wheel heater
-        if level and not self.get("climate_state_is_climate_on"):
-            await handle_vehicle_command(self.api.auto_conditioning_start())
-        await handle_vehicle_command(
-            self.api.remote_steering_wheel_heat_level_request(level)
-        )
-        self._attr_current_option = option
+            self._attr_current_option = self.entity_description.options[value]
         self.async_write_ha_state()
 
+    def _climate_callback(self, value: bool | None) -> None:
+        """Update the value of the entity."""
+        self._climate = bool(value)
+
 
 class TeslemetryOperationSelectEntity(TeslemetryEnergyInfoEntity, SelectEntity):
     """Select entity for operation mode select entities."""
diff --git a/homeassistant/components/teslemetry/sensor.py b/homeassistant/components/teslemetry/sensor.py
index 0fb0a6ee0e0..b1c6b487bf9 100644
--- a/homeassistant/components/teslemetry/sensor.py
+++ b/homeassistant/components/teslemetry/sensor.py
@@ -4,10 +4,11 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from dataclasses import dataclass
-from datetime import timedelta
+from datetime import datetime, timedelta
 
 from propcache.api import cached_property
-from teslemetry_stream import Signal
+from teslemetry_stream import Signal, TeslemetryStreamVehicle
+from teslemetry_stream.const import ShiftState
 
 from homeassistant.components.sensor import (
     RestoreSensor,
@@ -30,7 +31,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util import dt as dt_util
 from homeassistant.util.variance import ignore_variance
@@ -49,6 +50,7 @@ from .models import TeslemetryEnergyData, TeslemetryVehicleData
 
 PARALLEL_UPDATES = 0
 
+
 CHARGE_STATES = {
     "Starting": "starting",
     "Charging": "charging",
@@ -67,9 +69,9 @@ class TeslemetryVehicleSensorEntityDescription(SensorEntityDescription):
 
     polling: bool = False
     polling_value_fn: Callable[[StateType], StateType] = lambda x: x
-    polling_available_fn: Callable[[StateType], bool] = lambda x: x is not None
+    nullable: bool = False
     streaming_key: Signal | None = None
-    streaming_value_fn: Callable[[StateType], StateType] = lambda x: x
+    streaming_value_fn: Callable[[str | int | float], StateType] = lambda x: x
     streaming_firmware: str = "2024.26"
 
 
@@ -209,10 +211,10 @@ VEHICLE_DESCRIPTIONS: tuple[TeslemetryVehicleSensorEntityDescription, ...] = (
     TeslemetryVehicleSensorEntityDescription(
         key="drive_state_shift_state",
         polling=True,
-        polling_available_fn=lambda x: True,
+        nullable=True,
         polling_value_fn=lambda x: SHIFT_STATES.get(str(x), "p"),
         streaming_key=Signal.GEAR,
-        streaming_value_fn=lambda x: SHIFT_STATES.get(str(x)),
+        streaming_value_fn=lambda x: str(ShiftState.get(x, "P")).lower(),
         options=list(SHIFT_STATES.values()),
         device_class=SensorDeviceClass.ENUM,
         entity_registry_enabled_default=False,
@@ -349,28 +351,41 @@ class TeslemetryTimeEntityDescription(SensorEntityDescription):
     """Describes Teslemetry Sensor entity."""
 
     variance: int
-    streaming_key: Signal
+    streaming_listener: Callable[
+        [TeslemetryStreamVehicle, Callable[[float | None], None]],
+        Callable[[], None],
+    ]
     streaming_firmware: str = "2024.26"
+    streaming_value_fn: Callable[[float], float] = lambda x: x
 
 
 VEHICLE_TIME_DESCRIPTIONS: tuple[TeslemetryTimeEntityDescription, ...] = (
     TeslemetryTimeEntityDescription(
         key="charge_state_minutes_to_full_charge",
-        streaming_key=Signal.TIME_TO_FULL_CHARGE,
+        streaming_value_fn=lambda x: x * 60,
+        streaming_listener=lambda x, y: x.listen_TimeToFullCharge(y),
         device_class=SensorDeviceClass.TIMESTAMP,
         entity_category=EntityCategory.DIAGNOSTIC,
         variance=4,
     ),
     TeslemetryTimeEntityDescription(
         key="drive_state_active_route_minutes_to_arrival",
-        streaming_key=Signal.MINUTES_TO_ARRIVAL,
+        streaming_listener=lambda x, y: x.listen_MinutesToArrival(y),
         device_class=SensorDeviceClass.TIMESTAMP,
         variance=1,
     ),
 )
 
-ENERGY_LIVE_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
-    SensorEntityDescription(
+
+@dataclass(frozen=True, kw_only=True)
+class TeslemetryEnergySensorEntityDescription(SensorEntityDescription):
+    """Describes Teslemetry Sensor entity."""
+
+    value_fn: Callable[[StateType], StateType | datetime] = lambda x: x
+
+
+ENERGY_LIVE_DESCRIPTIONS: tuple[TeslemetryEnergySensorEntityDescription, ...] = (
+    TeslemetryEnergySensorEntityDescription(
         key="solar_power",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -378,7 +393,7 @@ ENERGY_LIVE_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
         suggested_display_precision=2,
         device_class=SensorDeviceClass.POWER,
     ),
-    SensorEntityDescription(
+    TeslemetryEnergySensorEntityDescription(
         key="energy_left",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
@@ -387,7 +402,7 @@ ENERGY_LIVE_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
         device_class=SensorDeviceClass.ENERGY_STORAGE,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
-    SensorEntityDescription(
+    TeslemetryEnergySensorEntityDescription(
         key="total_pack_energy",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
@@ -397,14 +412,15 @@ ENERGY_LIVE_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
     ),
-    SensorEntityDescription(
+    TeslemetryEnergySensorEntityDescription(
         key="percentage_charged",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
         suggested_display_precision=2,
+        value_fn=lambda value: value or 0,
     ),
-    SensorEntityDescription(
+    TeslemetryEnergySensorEntityDescription(
         key="battery_power",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -412,7 +428,7 @@ ENERGY_LIVE_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
         suggested_display_precision=2,
         device_class=SensorDeviceClass.POWER,
     ),
-    SensorEntityDescription(
+    TeslemetryEnergySensorEntityDescription(
         key="load_power",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -420,7 +436,7 @@ ENERGY_LIVE_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
         suggested_display_precision=2,
         device_class=SensorDeviceClass.POWER,
     ),
-    SensorEntityDescription(
+    TeslemetryEnergySensorEntityDescription(
         key="grid_power",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -428,7 +444,7 @@ ENERGY_LIVE_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
         suggested_display_precision=2,
         device_class=SensorDeviceClass.POWER,
     ),
-    SensorEntityDescription(
+    TeslemetryEnergySensorEntityDescription(
         key="grid_services_power",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -436,7 +452,7 @@ ENERGY_LIVE_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
         suggested_display_precision=2,
         device_class=SensorDeviceClass.POWER,
     ),
-    SensorEntityDescription(
+    TeslemetryEnergySensorEntityDescription(
         key="generator_power",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -445,7 +461,7 @@ ENERGY_LIVE_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
         device_class=SensorDeviceClass.POWER,
         entity_registry_enabled_default=False,
     ),
-    SensorEntityDescription(
+    TeslemetryEnergySensorEntityDescription(
         key="island_status",
         device_class=SensorDeviceClass.ENUM,
         options=[
@@ -520,7 +536,7 @@ ENERGY_HISTORY_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = tuple(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslemetryConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Teslemetry sensor platform from a config entry."""
 
@@ -555,6 +571,7 @@ async def async_setup_entry(
         if energysite.live_coordinator
         for description in ENERGY_LIVE_DESCRIPTIONS
         if description.key in energysite.live_coordinator.data
+        or description.key == "percentage_charged"
     )
 
     entities.extend(
@@ -611,10 +628,10 @@ class TeslemetryStreamSensorEntity(TeslemetryVehicleStreamEntity, RestoreSensor)
 
     def _async_value_from_stream(self, value) -> None:
         """Update the value of the entity."""
-        if value is None:
-            self._attr_native_value = None
-        else:
+        if self.entity_description.nullable or value is not None:
             self._attr_native_value = self.entity_description.streaming_value_fn(value)
+        else:
+            self._attr_native_value = None
 
 
 class TeslemetryVehicleSensorEntity(TeslemetryVehicleEntity, SensorEntity):
@@ -633,7 +650,7 @@ class TeslemetryVehicleSensorEntity(TeslemetryVehicleEntity, SensorEntity):
 
     def _async_update_attrs(self) -> None:
         """Update the attributes of the sensor."""
-        if self.entity_description.polling_available_fn(self._value):
+        if self.entity_description.nullable or self._value is not None:
             self._attr_available = True
             self._attr_native_value = self.entity_description.polling_value_fn(
                 self._value
@@ -656,18 +673,22 @@ class TeslemetryStreamTimeSensorEntity(TeslemetryVehicleStreamEntity, SensorEnti
         """Initialize the sensor."""
         self.entity_description = description
         self._get_timestamp = ignore_variance(
-            func=lambda value: dt_util.now() + timedelta(minutes=value),
+            func=lambda value: dt_util.now()
+            + timedelta(minutes=description.streaming_value_fn(value)),
             ignored_variance=timedelta(minutes=description.variance),
         )
-        assert description.streaming_key
-        super().__init__(data, description.key, description.streaming_key)
+        super().__init__(data, description.key)
 
-    @cached_property
-    def available(self) -> bool:
-        """Return True if entity is available."""
-        return self.stream.connected
+    async def async_added_to_hass(self) -> None:
+        """When entity is added to hass."""
+        await super().async_added_to_hass()
+        self.async_on_remove(
+            self.entity_description.streaming_listener(
+                self.vehicle.stream_vehicle, self._value_callback
+            )
+        )
 
-    def _async_value_from_stream(self, value) -> None:
+    def _value_callback(self, value: float | None) -> None:
         """Update the value of the entity."""
         if value is None:
             self._attr_native_value = None
@@ -704,12 +725,12 @@ class TeslemetryVehicleTimeSensorEntity(TeslemetryVehicleEntity, SensorEntity):
 class TeslemetryEnergyLiveSensorEntity(TeslemetryEnergyLiveEntity, SensorEntity):
     """Base class for Teslemetry energy site metric sensors."""
 
-    entity_description: SensorEntityDescription
+    entity_description: TeslemetryEnergySensorEntityDescription
 
     def __init__(
         self,
         data: TeslemetryEnergyData,
-        description: SensorEntityDescription,
+        description: TeslemetryEnergySensorEntityDescription,
     ) -> None:
         """Initialize the sensor."""
         self.entity_description = description
@@ -718,7 +739,7 @@ class TeslemetryEnergyLiveSensorEntity(TeslemetryEnergyLiveEntity, SensorEntity)
     def _async_update_attrs(self) -> None:
         """Update the attributes of the sensor."""
         self._attr_available = not self.is_none
-        self._attr_native_value = self._value
+        self._attr_native_value = self.entity_description.value_fn(self._value)
 
 
 class TeslemetryWallConnectorSensorEntity(TeslemetryWallConnectorEntity, SensorEntity):
diff --git a/homeassistant/components/teslemetry/strings.json b/homeassistant/components/teslemetry/strings.json
index 8dc8b053712..ceb8b3c1af9 100644
--- a/homeassistant/components/teslemetry/strings.json
+++ b/homeassistant/components/teslemetry/strings.json
@@ -132,7 +132,7 @@
         "name": "Tire pressure warning rear right"
       },
       "pin_to_drive_enabled": {
-        "name": "Pin to drive enabled"
+        "name": "PIN to Drive enabled"
       },
       "drive_rail": {
         "name": "Drive rail"
@@ -226,6 +226,12 @@
               "dog": "Dog mode",
               "camp": "Camp mode"
             }
+          },
+          "fan_mode": {
+            "state": {
+              "off": "[%key:common::state::off%]",
+              "bioweapon": "Bioweapon defense"
+            }
           }
         }
       }
@@ -415,7 +421,7 @@
         "name": "Charging",
         "state": {
           "starting": "Starting",
-          "charging": "Charging",
+          "charging": "[%key:common::state::charging%]",
           "disconnected": "Disconnected",
           "stopped": "Stopped",
           "complete": "Complete",
@@ -608,7 +614,7 @@
       }
     },
     "switch": {
-      "charge_state_user_charge_enable_request": {
+      "charge_state_charging_state": {
         "name": "Charge"
       },
       "climate_state_auto_seat_climate_left": {
@@ -712,7 +718,7 @@
       "name": "Navigate to coordinates"
     },
     "set_scheduled_charging": {
-      "description": "Sets a time at which charging should be completed.",
+      "description": "Sets a time at which charging should be started.",
       "fields": {
         "device_id": {
           "description": "Vehicle to schedule.",
diff --git a/homeassistant/components/teslemetry/switch.py b/homeassistant/components/teslemetry/switch.py
index 6a1cff4c5da..645a8398820 100644
--- a/homeassistant/components/teslemetry/switch.py
+++ b/homeassistant/components/teslemetry/switch.py
@@ -7,7 +7,8 @@ from dataclasses import dataclass
 from itertools import chain
 from typing import Any
 
-from tesla_fleet_api.const import Scope, Seat
+from tesla_fleet_api.const import AutoSeat, Scope
+from teslemetry_stream import TeslemetryStreamVehicle
 
 from homeassistant.components.switch import (
     SwitchDeviceClass,
@@ -15,10 +16,17 @@ from homeassistant.components.switch import (
     SwitchEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.restore_state import RestoreEntity
+from homeassistant.helpers.typing import StateType
 
 from . import TeslemetryConfigEntry
-from .entity import TeslemetryEnergyInfoEntity, TeslemetryVehicleEntity
+from .entity import (
+    TeslemetryEnergyInfoEntity,
+    TeslemetryRootEntity,
+    TeslemetryVehicleEntity,
+    TeslemetryVehicleStreamEntity,
+)
 from .helpers import handle_command, handle_vehicle_command
 from .models import TeslemetryEnergyData, TeslemetryVehicleData
 
@@ -32,35 +40,50 @@ class TeslemetrySwitchEntityDescription(SwitchEntityDescription):
     on_func: Callable
     off_func: Callable
     scopes: list[Scope]
+    value_func: Callable[[StateType], bool] = bool
+    streaming_listener: Callable[
+        [TeslemetryStreamVehicle, Callable[[StateType], None]],
+        Callable[[], None],
+    ]
+    streaming_value_fn: Callable[[StateType], bool] = bool
+    streaming_firmware: str = "2024.26"
+    unique_id: str | None = None
 
 
 VEHICLE_DESCRIPTIONS: tuple[TeslemetrySwitchEntityDescription, ...] = (
     TeslemetrySwitchEntityDescription(
         key="vehicle_state_sentry_mode",
+        streaming_listener=lambda x, y: x.listen_SentryMode(y),
+        streaming_value_fn=lambda x: x != "Off",
         on_func=lambda api: api.set_sentry_mode(on=True),
         off_func=lambda api: api.set_sentry_mode(on=False),
         scopes=[Scope.VEHICLE_CMDS],
     ),
     TeslemetrySwitchEntityDescription(
         key="climate_state_auto_seat_climate_left",
-        on_func=lambda api: api.remote_auto_seat_climate_request(Seat.FRONT_LEFT, True),
+        streaming_listener=lambda x, y: x.listen_AutoSeatClimateLeft(y),
+        on_func=lambda api: api.remote_auto_seat_climate_request(
+            AutoSeat.FRONT_LEFT, True
+        ),
         off_func=lambda api: api.remote_auto_seat_climate_request(
-            Seat.FRONT_LEFT, False
+            AutoSeat.FRONT_LEFT, False
         ),
         scopes=[Scope.VEHICLE_CMDS],
     ),
     TeslemetrySwitchEntityDescription(
         key="climate_state_auto_seat_climate_right",
+        streaming_listener=lambda x, y: x.listen_AutoSeatClimateRight(y),
         on_func=lambda api: api.remote_auto_seat_climate_request(
-            Seat.FRONT_RIGHT, True
+            AutoSeat.FRONT_RIGHT, True
         ),
         off_func=lambda api: api.remote_auto_seat_climate_request(
-            Seat.FRONT_RIGHT, False
+            AutoSeat.FRONT_RIGHT, False
         ),
         scopes=[Scope.VEHICLE_CMDS],
     ),
     TeslemetrySwitchEntityDescription(
         key="climate_state_auto_steering_wheel_heat",
+        streaming_listener=lambda x, y: x.listen_HvacSteeringWheelHeatAuto(y),
         on_func=lambda api: api.remote_auto_steering_wheel_heat_climate_request(
             on=True
         ),
@@ -71,44 +94,47 @@ VEHICLE_DESCRIPTIONS: tuple[TeslemetrySwitchEntityDescription, ...] = (
     ),
     TeslemetrySwitchEntityDescription(
         key="climate_state_defrost_mode",
+        streaming_listener=lambda x, y: x.listen_DefrostMode(y),
+        streaming_value_fn=lambda x: x != "Off",
         on_func=lambda api: api.set_preconditioning_max(on=True, manual_override=False),
         off_func=lambda api: api.set_preconditioning_max(
             on=False, manual_override=False
         ),
         scopes=[Scope.VEHICLE_CMDS],
     ),
-)
-
-VEHICLE_CHARGE_DESCRIPTION = TeslemetrySwitchEntityDescription(
-    key="charge_state_user_charge_enable_request",
-    on_func=lambda api: api.charge_start(),
-    off_func=lambda api: api.charge_stop(),
-    scopes=[Scope.VEHICLE_CMDS, Scope.VEHICLE_CHARGING_CMDS],
+    TeslemetrySwitchEntityDescription(
+        key="charge_state_charging_state",
+        unique_id="charge_state_user_charge_enable_request",
+        value_func=lambda state: state in {"Starting", "Charging"},
+        streaming_listener=lambda x, y: x.listen_DetailedChargeState(y),
+        streaming_value_fn=lambda x: x in {"Starting", "Charging"},
+        on_func=lambda api: api.charge_start(),
+        off_func=lambda api: api.charge_stop(),
+        scopes=[Scope.VEHICLE_CMDS, Scope.VEHICLE_CHARGING_CMDS],
+    ),
 )
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslemetryConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Teslemetry Switch platform from a config entry."""
 
     async_add_entities(
         chain(
             (
-                TeslemetryVehicleSwitchEntity(
+                TeslemetryPollingVehicleSwitchEntity(
+                    vehicle, description, entry.runtime_data.scopes
+                )
+                if vehicle.api.pre2021
+                or vehicle.firmware < description.streaming_firmware
+                else TeslemetryStreamingVehicleSwitchEntity(
                     vehicle, description, entry.runtime_data.scopes
                 )
                 for vehicle in entry.runtime_data.vehicles
                 for description in VEHICLE_DESCRIPTIONS
-                if description.key in vehicle.coordinator.data
-            ),
-            (
-                TeslemetryChargeSwitchEntity(
-                    vehicle, VEHICLE_CHARGE_DESCRIPTION, entry.runtime_data.scopes
-                )
-                for vehicle in entry.runtime_data.vehicles
             ),
             (
                 TeslemetryChargeFromGridSwitchEntity(
@@ -128,15 +154,31 @@ async def async_setup_entry(
     )
 
 
-class TeslemetrySwitchEntity(SwitchEntity):
+class TeslemetryVehicleSwitchEntity(TeslemetryRootEntity, SwitchEntity):
     """Base class for all Teslemetry switch entities."""
 
     _attr_device_class = SwitchDeviceClass.SWITCH
     entity_description: TeslemetrySwitchEntityDescription
 
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn on the Switch."""
+        self.raise_for_scope(self.entity_description.scopes[0])
+        await handle_vehicle_command(self.entity_description.on_func(self.api))
+        self._attr_is_on = True
+        self.async_write_ha_state()
 
-class TeslemetryVehicleSwitchEntity(TeslemetryVehicleEntity, TeslemetrySwitchEntity):
-    """Base class for Teslemetry vehicle switch entities."""
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn off the Switch."""
+        self.raise_for_scope(self.entity_description.scopes[0])
+        await handle_vehicle_command(self.entity_description.off_func(self.api))
+        self._attr_is_on = False
+        self.async_write_ha_state()
+
+
+class TeslemetryPollingVehicleSwitchEntity(
+    TeslemetryVehicleEntity, TeslemetryVehicleSwitchEntity
+):
+    """Base class for Teslemetry polling vehicle switch entities."""
 
     def __init__(
         self,
@@ -145,47 +187,71 @@ class TeslemetryVehicleSwitchEntity(TeslemetryVehicleEntity, TeslemetrySwitchEnt
         scopes: list[Scope],
     ) -> None:
         """Initialize the Switch."""
-        super().__init__(data, description.key)
         self.entity_description = description
         self.scoped = any(scope in scopes for scope in description.scopes)
+        super().__init__(data, description.key)
+        if description.unique_id:
+            self._attr_unique_id = f"{data.vin}-{description.unique_id}"
 
     def _async_update_attrs(self) -> None:
         """Update the attributes of the sensor."""
-        self._attr_is_on = bool(self._value)
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn on the Switch."""
-        self.raise_for_scope(self.entity_description.scopes[0])
-        await self.wake_up_if_asleep()
-        await handle_vehicle_command(self.entity_description.on_func(self.api))
-        self._attr_is_on = True
-        self.async_write_ha_state()
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn off the Switch."""
-        self.raise_for_scope(self.entity_description.scopes[0])
-        await self.wake_up_if_asleep()
-        await handle_vehicle_command(self.entity_description.off_func(self.api))
-        self._attr_is_on = False
-        self.async_write_ha_state()
+        self._attr_is_on = (
+            None
+            if self._value is None
+            else self.entity_description.value_func(self._value)
+        )
 
 
-class TeslemetryChargeSwitchEntity(TeslemetryVehicleSwitchEntity):
-    """Entity class for Teslemetry charge switch."""
-
-    def _async_update_attrs(self) -> None:
-        """Update the attributes of the entity."""
-        if self._value is None:
-            self._attr_is_on = self.get("charge_state_charge_enable_request")
-        else:
-            self._attr_is_on = self._value
-
-
-class TeslemetryChargeFromGridSwitchEntity(
-    TeslemetryEnergyInfoEntity, TeslemetrySwitchEntity
+class TeslemetryStreamingVehicleSwitchEntity(
+    TeslemetryVehicleStreamEntity, TeslemetryVehicleSwitchEntity, RestoreEntity
 ):
+    """Base class for Teslemetry streaming vehicle switch entities."""
+
+    def __init__(
+        self,
+        data: TeslemetryVehicleData,
+        description: TeslemetrySwitchEntityDescription,
+        scopes: list[Scope],
+    ) -> None:
+        """Initialize the Switch."""
+
+        self.entity_description = description
+        self.scoped = any(scope in scopes for scope in description.scopes)
+        super().__init__(data, description.key)
+        if description.unique_id:
+            self._attr_unique_id = f"{data.vin}-{description.unique_id}"
+
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+
+        # Restore previous state
+        if (state := await self.async_get_last_state()) is not None:
+            if state.state == "on":
+                self._attr_is_on = True
+            elif state.state == "off":
+                self._attr_is_on = False
+
+        # Add listener
+        self.async_on_remove(
+            self.entity_description.streaming_listener(
+                self.vehicle.stream_vehicle, self._value_callback
+            )
+        )
+
+    def _value_callback(self, value: StateType) -> None:
+        """Update the value of the entity."""
+        self._attr_is_on = (
+            None if value is None else self.entity_description.streaming_value_fn(value)
+        )
+        self.async_write_ha_state()
+
+
+class TeslemetryChargeFromGridSwitchEntity(TeslemetryEnergyInfoEntity, SwitchEntity):
     """Entity class for Charge From Grid switch."""
 
+    _attr_device_class = SwitchDeviceClass.SWITCH
+
     def __init__(
         self,
         data: TeslemetryEnergyData,
@@ -226,11 +292,11 @@ class TeslemetryChargeFromGridSwitchEntity(
         self.async_write_ha_state()
 
 
-class TeslemetryStormModeSwitchEntity(
-    TeslemetryEnergyInfoEntity, TeslemetrySwitchEntity
-):
+class TeslemetryStormModeSwitchEntity(TeslemetryEnergyInfoEntity, SwitchEntity):
     """Entity class for Storm Mode switch."""
 
+    _attr_device_class = SwitchDeviceClass.SWITCH
+
     def __init__(
         self,
         data: TeslemetryEnergyData,
diff --git a/homeassistant/components/teslemetry/update.py b/homeassistant/components/teslemetry/update.py
index 670cd0e0eda..b8d40877de4 100644
--- a/homeassistant/components/teslemetry/update.py
+++ b/homeassistant/components/teslemetry/update.py
@@ -2,16 +2,22 @@
 
 from __future__ import annotations
 
-from typing import Any, cast
+from typing import Any
 
 from tesla_fleet_api.const import Scope
+from tesla_fleet_api.teslemetry import Vehicle
 
 from homeassistant.components.update import UpdateEntity, UpdateEntityFeature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.restore_state import RestoreEntity
 
 from . import TeslemetryConfigEntry
-from .entity import TeslemetryVehicleEntity
+from .entity import (
+    TeslemetryRootEntity,
+    TeslemetryVehicleEntity,
+    TeslemetryVehicleStreamEntity,
+)
 from .helpers import handle_vehicle_command
 from .models import TeslemetryVehicleData
 
@@ -27,17 +33,36 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TeslemetryConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Teslemetry update platform from a config entry."""
 
     async_add_entities(
-        TeslemetryUpdateEntity(vehicle, entry.runtime_data.scopes)
+        TeslemetryPollingUpdateEntity(vehicle, entry.runtime_data.scopes)
+        if vehicle.api.pre2021 or vehicle.firmware < "2024.44.25"
+        else TeslemetryStreamingUpdateEntity(vehicle, entry.runtime_data.scopes)
         for vehicle in entry.runtime_data.vehicles
     )
 
 
-class TeslemetryUpdateEntity(TeslemetryVehicleEntity, UpdateEntity):
+class TeslemetryUpdateEntity(TeslemetryRootEntity, UpdateEntity):
+    """Teslemetry Updates entity."""
+
+    api: Vehicle
+    _attr_supported_features = UpdateEntityFeature.PROGRESS
+
+    async def async_install(
+        self, version: str | None, backup: bool, **kwargs: Any
+    ) -> None:
+        """Install an update."""
+        self.raise_for_scope(Scope.VEHICLE_CMDS)
+
+        await handle_vehicle_command(self.api.schedule_software_update(offset_sec=0))
+        self._attr_in_progress = True
+        self.async_write_ha_state()
+
+
+class TeslemetryPollingUpdateEntity(TeslemetryVehicleEntity, TeslemetryUpdateEntity):
     """Teslemetry Updates entity."""
 
     def __init__(
@@ -94,18 +119,125 @@ class TeslemetryUpdateEntity(TeslemetryVehicleEntity, UpdateEntity):
         ):
             self._attr_in_progress = True
             if install_perc := self.get("vehicle_state_software_update_install_perc"):
-                self._attr_update_percentage = cast(int, install_perc)
+                self._attr_update_percentage = install_perc
         else:
             self._attr_in_progress = False
             self._attr_update_percentage = None
 
-    async def async_install(
-        self, version: str | None, backup: bool, **kwargs: Any
+
+class TeslemetryStreamingUpdateEntity(
+    TeslemetryVehicleStreamEntity, TeslemetryUpdateEntity, RestoreEntity
+):
+    """Teslemetry Updates entity."""
+
+    _download_percentage: int = 0
+    _install_percentage: int = 0
+
+    def __init__(
+        self,
+        data: TeslemetryVehicleData,
+        scopes: list[Scope],
     ) -> None:
-        """Install an update."""
-        self.raise_for_scope(Scope.ENERGY_CMDS)
-        await self.wake_up_if_asleep()
-        await handle_vehicle_command(self.api.schedule_software_update(offset_sec=60))
-        self._attr_in_progress = True
-        self._attr_update_percentage = None
+        """Initialize the Update."""
+        self.scoped = Scope.VEHICLE_CMDS in scopes
+        super().__init__(
+            data,
+            "vehicle_state_software_update_status",
+        )
+
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+        if (state := await self.async_get_last_state()) is not None:
+            self._attr_in_progress = state.attributes.get("in_progress", False)
+            self._install_percentage = state.attributes.get("install_percentage", False)
+            self._attr_installed_version = state.attributes.get("installed_version")
+            self._attr_latest_version = state.attributes.get("latest_version")
+            self._attr_supported_features = UpdateEntityFeature(
+                state.attributes.get(
+                    "supported_features", self._attr_supported_features
+                )
+            )
+            self.async_write_ha_state()
+
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_SoftwareUpdateDownloadPercentComplete(
+                self._async_handle_software_update_download_percent_complete
+            )
+        )
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_SoftwareUpdateInstallationPercentComplete(
+                self._async_handle_software_update_installation_percent_complete
+            )
+        )
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_SoftwareUpdateScheduledStartTime(
+                self._async_handle_software_update_scheduled_start_time
+            )
+        )
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_SoftwareUpdateVersion(
+                self._async_handle_software_update_version
+            )
+        )
+        self.async_on_remove(
+            self.vehicle.stream_vehicle.listen_Version(self._async_handle_version)
+        )
+
+    def _async_handle_software_update_download_percent_complete(
+        self, value: float | None
+    ):
+        """Handle software update download percent complete."""
+
+        self._download_percentage = round(value) if value is not None else 0
+        if self.scoped and self._download_percentage == 100:
+            self._attr_supported_features = (
+                UpdateEntityFeature.PROGRESS | UpdateEntityFeature.INSTALL
+            )
+        else:
+            self._attr_supported_features = UpdateEntityFeature.PROGRESS
+        self._async_update_progress()
         self.async_write_ha_state()
+
+    def _async_handle_software_update_installation_percent_complete(
+        self, value: float | None
+    ):
+        """Handle software update installation percent complete."""
+
+        self._install_percentage = round(value) if value is not None else 0
+        self._async_update_progress()
+        self.async_write_ha_state()
+
+    def _async_handle_software_update_scheduled_start_time(self, value: str | None):
+        """Handle software update scheduled start time."""
+
+        self._attr_in_progress = value is not None
+        self.async_write_ha_state()
+
+    def _async_handle_software_update_version(self, value: str | None):
+        """Handle software update version."""
+
+        self._attr_latest_version = (
+            value if value and value != " " else self._attr_installed_version
+        )
+        self.async_write_ha_state()
+
+    def _async_handle_version(self, value: str | None):
+        """Handle version."""
+
+        if value is not None:
+            self._attr_installed_version = value.split(" ")[0]
+            self.async_write_ha_state()
+
+    def _async_update_progress(self) -> None:
+        """Update the progress of the update."""
+
+        if self._download_percentage > 1 and self._download_percentage < 100:
+            self._attr_in_progress = True
+            self._attr_update_percentage = self._download_percentage
+        elif self._install_percentage > 1:
+            self._attr_in_progress = True
+            self._attr_update_percentage = self._install_percentage
+        else:
+            self._attr_in_progress = False
+            self._attr_update_percentage = None
diff --git a/homeassistant/components/tessie/__init__.py b/homeassistant/components/tessie/__init__.py
index a0bc58896e4..e247931e3ba 100644
--- a/homeassistant/components/tessie/__init__.py
+++ b/homeassistant/components/tessie/__init__.py
@@ -5,9 +5,9 @@ from http import HTTPStatus
 import logging
 
 from aiohttp import ClientError, ClientResponseError
-from tesla_fleet_api import EnergySpecific, Tessie
 from tesla_fleet_api.const import Scope
 from tesla_fleet_api.exceptions import TeslaFleetError
+from tesla_fleet_api.tessie import Tessie
 from tessie_api import get_state_of_all_vehicles
 
 from homeassistant.config_entries import ConfigEntry
@@ -69,6 +69,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: TessieConfigEntry) -> bo
             vin=vehicle["vin"],
             data_coordinator=TessieStateUpdateCoordinator(
                 hass,
+                entry,
                 api_key=api_key,
                 vin=vehicle["vin"],
                 data=vehicle["last_state"],
@@ -122,13 +123,17 @@ async def async_setup_entry(hass: HomeAssistant, entry: TessieConfigEntry) -> bo
                     )
                     continue
 
-                api = EnergySpecific(tessie.energy, site_id)
+                api = tessie.energySites.create(site_id)
                 energysites.append(
                     TessieEnergyData(
                         api=api,
                         id=site_id,
-                        live_coordinator=TessieEnergySiteLiveCoordinator(hass, api),
-                        info_coordinator=TessieEnergySiteInfoCoordinator(hass, api),
+                        live_coordinator=TessieEnergySiteLiveCoordinator(
+                            hass, entry, api
+                        ),
+                        info_coordinator=TessieEnergySiteInfoCoordinator(
+                            hass, entry, api
+                        ),
                         device=DeviceInfo(
                             identifiers={(DOMAIN, str(site_id))},
                             manufacturer="Tesla",
diff --git a/homeassistant/components/tessie/binary_sensor.py b/homeassistant/components/tessie/binary_sensor.py
index fd6565b62b7..515339c3da8 100644
--- a/homeassistant/components/tessie/binary_sensor.py
+++ b/homeassistant/components/tessie/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TessieConfigEntry
 from .const import TessieState
@@ -177,7 +177,7 @@ ENERGY_INFO_DESCRIPTIONS: tuple[BinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TessieConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tessie binary sensor platform from a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/tessie/button.py b/homeassistant/components/tessie/button.py
index bef9c2585f6..a370f504323 100644
--- a/homeassistant/components/tessie/button.py
+++ b/homeassistant/components/tessie/button.py
@@ -16,7 +16,7 @@ from tessie_api import (
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TessieConfigEntry
 from .entity import TessieEntity
@@ -50,7 +50,7 @@ DESCRIPTIONS: tuple[TessieButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TessieConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tessie Button platform from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/tessie/climate.py b/homeassistant/components/tessie/climate.py
index 1d26926aeaa..a8aa18132ee 100644
--- a/homeassistant/components/tessie/climate.py
+++ b/homeassistant/components/tessie/climate.py
@@ -19,7 +19,7 @@ from homeassistant.components.climate import (
 )
 from homeassistant.const import ATTR_TEMPERATURE, PRECISION_HALVES, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TessieConfigEntry
 from .const import TessieClimateKeeper
@@ -32,7 +32,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TessieConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tessie Climate platform from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/tessie/coordinator.py b/homeassistant/components/tessie/coordinator.py
index 4582260bfb2..2382595b058 100644
--- a/homeassistant/components/tessie/coordinator.py
+++ b/homeassistant/components/tessie/coordinator.py
@@ -1,13 +1,15 @@
 """Tessie Data Coordinator."""
 
+from __future__ import annotations
+
 from datetime import timedelta
 from http import HTTPStatus
 import logging
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from aiohttp import ClientResponseError
-from tesla_fleet_api import EnergySpecific
 from tesla_fleet_api.exceptions import InvalidToken, MissingToken, TeslaFleetError
+from tesla_fleet_api.tessie import EnergySite
 from tessie_api import get_state, get_status
 
 from homeassistant.core import HomeAssistant
@@ -15,6 +17,9 @@ from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
+if TYPE_CHECKING:
+    from . import TessieConfigEntry
+
 from .const import TessieStatus
 
 # This matches the update interval Tessie performs server side
@@ -40,9 +45,12 @@ def flatten(data: dict[str, Any], parent: str | None = None) -> dict[str, Any]:
 class TessieStateUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Class to manage fetching data from the Tessie API."""
 
+    config_entry: TessieConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: TessieConfigEntry,
         api_key: str,
         vin: str,
         data: dict[str, Any],
@@ -51,6 +59,7 @@ class TessieStateUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="Tessie",
             update_interval=timedelta(seconds=TESSIE_SYNC_INTERVAL),
         )
@@ -90,11 +99,16 @@ class TessieStateUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
 class TessieEnergySiteLiveCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Class to manage fetching energy site live status from the Tessie API."""
 
-    def __init__(self, hass: HomeAssistant, api: EnergySpecific) -> None:
+    config_entry: TessieConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: TessieConfigEntry, api: EnergySite
+    ) -> None:
         """Initialize Tessie Energy Site Live coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="Tessie Energy Site Live",
             update_interval=TESSIE_FLEET_API_SYNC_INTERVAL,
         )
@@ -121,11 +135,16 @@ class TessieEnergySiteLiveCoordinator(DataUpdateCoordinator[dict[str, Any]]):
 class TessieEnergySiteInfoCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Class to manage fetching energy site info from the Tessie API."""
 
-    def __init__(self, hass: HomeAssistant, api: EnergySpecific) -> None:
+    config_entry: TessieConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: TessieConfigEntry, api: EnergySite
+    ) -> None:
         """Initialize Tessie Energy Info coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="Tessie Energy Site Info",
             update_interval=TESSIE_FLEET_API_SYNC_INTERVAL,
         )
diff --git a/homeassistant/components/tessie/cover.py b/homeassistant/components/tessie/cover.py
index e739f8c074d..bfd7b1b816c 100644
--- a/homeassistant/components/tessie/cover.py
+++ b/homeassistant/components/tessie/cover.py
@@ -22,7 +22,7 @@ from homeassistant.components.cover import (
     CoverEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TessieConfigEntry
 from .const import TessieCoverStates
@@ -35,7 +35,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TessieConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tessie sensor platform from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/tessie/device_tracker.py b/homeassistant/components/tessie/device_tracker.py
index df74cd2a7a7..fe81ed67337 100644
--- a/homeassistant/components/tessie/device_tracker.py
+++ b/homeassistant/components/tessie/device_tracker.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from homeassistant.components.device_tracker.config_entry import TrackerEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import TessieConfigEntry
@@ -17,7 +17,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TessieConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tessie device tracker platform from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/tessie/lock.py b/homeassistant/components/tessie/lock.py
index 76d58a9070c..66cb813b995 100644
--- a/homeassistant/components/tessie/lock.py
+++ b/homeassistant/components/tessie/lock.py
@@ -9,7 +9,7 @@ from tessie_api import lock, open_unlock_charge_port, unlock
 from homeassistant.components.lock import LockEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TessieConfigEntry
 from .const import DOMAIN, TessieChargeCableLockStates
@@ -22,7 +22,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TessieConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tessie sensor platform from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/tessie/manifest.json b/homeassistant/components/tessie/manifest.json
index 8f7c9890664..3f96bb226ab 100644
--- a/homeassistant/components/tessie/manifest.json
+++ b/homeassistant/components/tessie/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/tessie",
   "iot_class": "cloud_polling",
   "loggers": ["tessie", "tesla-fleet-api"],
-  "requirements": ["tessie-api==0.1.1", "tesla-fleet-api==0.9.2"]
+  "requirements": ["tessie-api==0.1.1", "tesla-fleet-api==1.0.16"]
 }
diff --git a/homeassistant/components/tessie/media_player.py b/homeassistant/components/tessie/media_player.py
index 7dfe568926b..139ee07ca5b 100644
--- a/homeassistant/components/tessie/media_player.py
+++ b/homeassistant/components/tessie/media_player.py
@@ -8,7 +8,7 @@ from homeassistant.components.media_player import (
     MediaPlayerState,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TessieConfigEntry
 from .entity import TessieEntity
@@ -26,7 +26,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TessieConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tessie Media platform from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/tessie/models.py b/homeassistant/components/tessie/models.py
index ca670b9650b..03652782cfe 100644
--- a/homeassistant/components/tessie/models.py
+++ b/homeassistant/components/tessie/models.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 
-from tesla_fleet_api import EnergySpecific
+from tesla_fleet_api.tessie import EnergySite
 
 from homeassistant.helpers.device_registry import DeviceInfo
 
@@ -27,7 +27,7 @@ class TessieData:
 class TessieEnergyData:
     """Data for a Energy Site in the Tessie integration."""
 
-    api: EnergySpecific
+    api: EnergySite
     live_coordinator: TessieEnergySiteLiveCoordinator
     info_coordinator: TessieEnergySiteInfoCoordinator
     id: int
diff --git a/homeassistant/components/tessie/number.py b/homeassistant/components/tessie/number.py
index 74249d392a7..77d8037fb14 100644
--- a/homeassistant/components/tessie/number.py
+++ b/homeassistant/components/tessie/number.py
@@ -7,7 +7,7 @@ from dataclasses import dataclass
 from itertools import chain
 from typing import Any
 
-from tesla_fleet_api import EnergySpecific
+from tesla_fleet_api.tessie import EnergySite
 from tessie_api import set_charge_limit, set_charging_amps, set_speed_limit
 
 from homeassistant.components.number import (
@@ -23,7 +23,7 @@ from homeassistant.const import (
     UnitOfSpeed,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.icon import icon_for_battery_level
 
 from . import TessieConfigEntry
@@ -90,7 +90,7 @@ VEHICLE_DESCRIPTIONS: tuple[TessieNumberEntityDescription, ...] = (
 class TessieNumberBatteryEntityDescription(NumberEntityDescription):
     """Describes Tessie Number entity."""
 
-    func: Callable[[EnergySpecific, float], Awaitable[Any]]
+    func: Callable[[EnergySite, float], Awaitable[Any]]
     requires: str
 
 
@@ -111,7 +111,7 @@ ENERGY_INFO_DESCRIPTIONS: tuple[TessieNumberBatteryEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TessieConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tessie sensor platform from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/tessie/select.py b/homeassistant/components/tessie/select.py
index 4dfe7088439..471372a68bd 100644
--- a/homeassistant/components/tessie/select.py
+++ b/homeassistant/components/tessie/select.py
@@ -9,7 +9,7 @@ from tessie_api import set_seat_cool, set_seat_heat
 
 from homeassistant.components.select import SelectEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TessieConfigEntry
 from .const import TessieSeatCoolerOptions, TessieSeatHeaterOptions
@@ -38,7 +38,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TessieConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tessie select platform from a config entry."""
 
diff --git a/homeassistant/components/tessie/sensor.py b/homeassistant/components/tessie/sensor.py
index 7f09cef2acd..e5b476057fa 100644
--- a/homeassistant/components/tessie/sensor.py
+++ b/homeassistant/components/tessie/sensor.py
@@ -28,7 +28,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util import dt as dt_util
 from homeassistant.util.variance import ignore_variance
@@ -148,7 +148,7 @@ DESCRIPTIONS: tuple[TessieSensorEntityDescription, ...] = (
         key="drive_state_shift_state",
         options=["p", "d", "r", "n"],
         device_class=SensorDeviceClass.ENUM,
-        value_fn=lambda x: x.lower() if isinstance(x, str) else x,
+        value_fn=lambda x: x.lower() if isinstance(x, str) else "p",
     ),
     TessieSensorEntityDescription(
         key="vehicle_state_odometer",
@@ -258,6 +258,7 @@ DESCRIPTIONS: tuple[TessieSensorEntityDescription, ...] = (
     ),
 )
 
+
 ENERGY_LIVE_DESCRIPTIONS: tuple[TessieSensorEntityDescription, ...] = (
     TessieSensorEntityDescription(
         key="solar_power",
@@ -292,6 +293,7 @@ ENERGY_LIVE_DESCRIPTIONS: tuple[TessieSensorEntityDescription, ...] = (
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
         suggested_display_precision=2,
+        value_fn=lambda value: value or 0,
     ),
     TessieSensorEntityDescription(
         key="battery_power",
@@ -373,7 +375,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TessieConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tessie sensor platform from a config entry."""
 
@@ -395,6 +397,7 @@ async def async_setup_entry(
                 for energysite in entry.runtime_data.energysites
                 for description in ENERGY_LIVE_DESCRIPTIONS
                 if description.key in energysite.live_coordinator.data
+                or description.key == "percentage_charged"
             ),
             (  # Add wall connectors
                 TessieWallConnectorSensorEntity(energysite, din, description)
@@ -447,7 +450,6 @@ class TessieEnergyLiveSensorEntity(TessieEnergyEntity, SensorEntity):
 
     def _async_update_attrs(self) -> None:
         """Update the attributes of the sensor."""
-        self._attr_available = self._value is not None
         self._attr_native_value = self.entity_description.value_fn(self._value)
 
 
diff --git a/homeassistant/components/tessie/strings.json b/homeassistant/components/tessie/strings.json
index 4ac645a0270..4f0f5f67ebd 100644
--- a/homeassistant/components/tessie/strings.json
+++ b/homeassistant/components/tessie/strings.json
@@ -75,7 +75,7 @@
         "name": "Charging",
         "state": {
           "starting": "Starting",
-          "charging": "Charging",
+          "charging": "[%key:common::state::charging%]",
           "disconnected": "Disconnected",
           "stopped": "Stopped",
           "complete": "Complete",
@@ -212,7 +212,7 @@
         "name": "State",
         "state": {
           "booting": "Booting",
-          "charging": "[%key:component::tessie::entity::sensor::charge_state_charging_state::state::charging%]",
+          "charging": "[%key:common::state::charging%]",
           "disconnected": "[%key:common::state::disconnected%]",
           "connected": "[%key:common::state::connected%]",
           "scheduled": "Scheduled",
@@ -459,7 +459,7 @@
       }
     },
     "switch": {
-      "charge_state_charge_enable_request": {
+      "charge_state_charging_state": {
         "name": "Charge"
       },
       "climate_state_defrost_mode": {
@@ -506,7 +506,7 @@
   },
   "exceptions": {
     "unknown": {
-      "message": "An unknown issue occured changing {name}."
+      "message": "An unknown issue occurred changing {name}."
     },
     "not_supported": {
       "message": "{name} is not supported."
diff --git a/homeassistant/components/tessie/switch.py b/homeassistant/components/tessie/switch.py
index f0088a4444f..41134b38fda 100644
--- a/homeassistant/components/tessie/switch.py
+++ b/homeassistant/components/tessie/switch.py
@@ -26,7 +26,8 @@ from homeassistant.components.switch import (
     SwitchEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.typing import StateType
 
 from . import TessieConfigEntry
 from .entity import TessieEnergyEntity, TessieEntity
@@ -40,6 +41,8 @@ class TessieSwitchEntityDescription(SwitchEntityDescription):
 
     on_func: Callable
     off_func: Callable
+    value_func: Callable[[StateType], bool] = bool
+    unique_id: str | None = None
 
 
 DESCRIPTIONS: tuple[TessieSwitchEntityDescription, ...] = (
@@ -63,12 +66,13 @@ DESCRIPTIONS: tuple[TessieSwitchEntityDescription, ...] = (
         on_func=lambda: start_steering_wheel_heater,
         off_func=lambda: stop_steering_wheel_heater,
     ),
-)
-
-CHARGE_DESCRIPTION: TessieSwitchEntityDescription = TessieSwitchEntityDescription(
-    key="charge_state_charge_enable_request",
-    on_func=lambda: start_charging,
-    off_func=lambda: stop_charging,
+    TessieSwitchEntityDescription(
+        key="charge_state_charging_state",
+        unique_id="charge_state_charge_enable_request",
+        on_func=lambda: start_charging,
+        off_func=lambda: stop_charging,
+        value_func=lambda state: state in {"Starting", "Charging"},
+    ),
 )
 
 PARALLEL_UPDATES = 0
@@ -77,7 +81,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TessieConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tessie Switch platform from a config entry."""
 
@@ -89,10 +93,6 @@ async def async_setup_entry(
                 for description in DESCRIPTIONS
                 if description.key in vehicle.data_coordinator.data
             ),
-            (
-                TessieChargeSwitchEntity(vehicle, CHARGE_DESCRIPTION)
-                for vehicle in entry.runtime_data.vehicles
-            ),
             (
                 TessieChargeFromGridSwitchEntity(energysite)
                 for energysite in entry.runtime_data.energysites
@@ -120,13 +120,15 @@ class TessieSwitchEntity(TessieEntity, SwitchEntity):
         description: TessieSwitchEntityDescription,
     ) -> None:
         """Initialize the Switch."""
-        super().__init__(vehicle, description.key)
         self.entity_description = description
+        super().__init__(vehicle, description.key)
+        if description.unique_id:
+            self._attr_unique_id = f"{vehicle.vin}-{description.unique_id}"
 
     @property
     def is_on(self) -> bool:
         """Return the state of the Switch."""
-        return self._value
+        return self.entity_description.value_func(self._value)
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn on the Switch."""
@@ -139,18 +141,6 @@ class TessieSwitchEntity(TessieEntity, SwitchEntity):
         self.set((self.entity_description.key, False))
 
 
-class TessieChargeSwitchEntity(TessieSwitchEntity):
-    """Entity class for Tessie charge switch."""
-
-    @property
-    def is_on(self) -> bool:
-        """Return the state of the Switch."""
-
-        if (charge := self.get("charge_state_user_charge_enable_request")) is not None:
-            return charge
-        return self._value
-
-
 class TessieChargeFromGridSwitchEntity(TessieEnergyEntity, SwitchEntity):
     """Entity class for Charge From Grid switch."""
 
diff --git a/homeassistant/components/tessie/update.py b/homeassistant/components/tessie/update.py
index f6198fa6c03..e9af673b1f4 100644
--- a/homeassistant/components/tessie/update.py
+++ b/homeassistant/components/tessie/update.py
@@ -8,7 +8,7 @@ from tessie_api import schedule_software_update
 
 from homeassistant.components.update import UpdateEntity, UpdateEntityFeature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TessieConfigEntry
 from .const import TessieUpdateStatus
@@ -21,7 +21,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TessieConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tessie Update platform from a config entry."""
     data = entry.runtime_data
diff --git a/homeassistant/components/text/device_action.py b/homeassistant/components/text/device_action.py
index 94269ac12fb..b1eca1e36b6 100644
--- a/homeassistant/components/text/device_action.py
+++ b/homeassistant/components/text/device_action.py
@@ -13,8 +13,7 @@ from homeassistant.const import (
     CONF_TYPE,
 )
 from homeassistant.core import Context, HomeAssistant
-from homeassistant.helpers import entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
 
 from .const import ATTR_VALUE, DOMAIN, SERVICE_SET_VALUE
diff --git a/homeassistant/components/tfiac/climate.py b/homeassistant/components/tfiac/climate.py
index e3aa9060787..9571597abe6 100644
--- a/homeassistant/components/tfiac/climate.py
+++ b/homeassistant/components/tfiac/climate.py
@@ -26,7 +26,7 @@ from homeassistant.components.climate import (
 )
 from homeassistant.const import ATTR_TEMPERATURE, CONF_HOST, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/thermobeacon/config_flow.py b/homeassistant/components/thermobeacon/config_flow.py
index 08994a41008..6fa502716ca 100644
--- a/homeassistant/components/thermobeacon/config_flow.py
+++ b/homeassistant/components/thermobeacon/config_flow.py
@@ -72,7 +72,7 @@ class ThermoBeaconConfigFlow(ConfigFlow, domain=DOMAIN):
                 title=self._discovered_devices[address], data={}
             )
 
-        current_addresses = self._async_current_ids()
+        current_addresses = self._async_current_ids(include_ignore=False)
         for discovery_info in async_discovered_service_info(self.hass, False):
             address = discovery_info.address
             if address in current_addresses or address in self._discovered_devices:
diff --git a/homeassistant/components/thermobeacon/manifest.json b/homeassistant/components/thermobeacon/manifest.json
index ce6a3f71ef3..b231137d335 100644
--- a/homeassistant/components/thermobeacon/manifest.json
+++ b/homeassistant/components/thermobeacon/manifest.json
@@ -14,6 +14,12 @@
       "manufacturer_data_start": [0],
       "connectable": false
     },
+    {
+      "service_uuid": "0000fff0-0000-1000-8000-00805f9b34fb",
+      "manufacturer_id": 20,
+      "manufacturer_data_start": [0],
+      "connectable": false
+    },
     {
       "service_uuid": "0000fff0-0000-1000-8000-00805f9b34fb",
       "manufacturer_id": 21,
@@ -48,5 +54,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/thermobeacon",
   "iot_class": "local_push",
-  "requirements": ["thermobeacon-ble==0.7.0"]
+  "requirements": ["thermobeacon-ble==0.8.1"]
 }
diff --git a/homeassistant/components/thermobeacon/sensor.py b/homeassistant/components/thermobeacon/sensor.py
index 53e86f37f11..916ec91359a 100644
--- a/homeassistant/components/thermobeacon/sensor.py
+++ b/homeassistant/components/thermobeacon/sensor.py
@@ -29,7 +29,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from .const import DOMAIN
@@ -113,7 +113,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ThermoBeacon BLE sensors."""
     coordinator: PassiveBluetoothProcessorCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/thermopro/__init__.py b/homeassistant/components/thermopro/__init__.py
index 2cd207818c5..742449cffbe 100644
--- a/homeassistant/components/thermopro/__init__.py
+++ b/homeassistant/components/thermopro/__init__.py
@@ -2,25 +2,47 @@
 
 from __future__ import annotations
 
+from functools import partial
 import logging
 
-from thermopro_ble import ThermoProBluetoothDeviceData
+from thermopro_ble import SensorUpdate, ThermoProBluetoothDeviceData
 
-from homeassistant.components.bluetooth import BluetoothScanningMode
+from homeassistant.components.bluetooth import (
+    BluetoothScanningMode,
+    BluetoothServiceInfoBleak,
+)
 from homeassistant.components.bluetooth.passive_update_processor import (
     PassiveBluetoothProcessorCoordinator,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.dispatcher import async_dispatcher_send
 
-from .const import DOMAIN
+from .const import DOMAIN, SIGNAL_DATA_UPDATED
 
-PLATFORMS: list[Platform] = [Platform.SENSOR]
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
+PLATFORMS: list[Platform] = [Platform.BUTTON, Platform.SENSOR]
 
 _LOGGER = logging.getLogger(__name__)
 
 
+def process_service_info(
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    data: ThermoProBluetoothDeviceData,
+    service_info: BluetoothServiceInfoBleak,
+) -> SensorUpdate:
+    """Process a BluetoothServiceInfoBleak, running side effects and returning sensor data."""
+    update = data.update(service_info)
+    async_dispatcher_send(
+        hass, f"{SIGNAL_DATA_UPDATED}_{entry.entry_id}", data, service_info, update
+    )
+    return update
+
+
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up ThermoPro BLE device from a config entry."""
     address = entry.unique_id
@@ -32,13 +54,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             _LOGGER,
             address=address,
             mode=BluetoothScanningMode.ACTIVE,
-            update_method=data.update,
+            update_method=partial(process_service_info, hass, entry, data),
         )
     )
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-    entry.async_on_unload(
-        coordinator.async_start()
-    )  # only start after all platforms have had a chance to subscribe
+    # only start after all platforms have had a chance to subscribe
+    entry.async_on_unload(coordinator.async_start())
     return True
 
 
diff --git a/homeassistant/components/thermopro/button.py b/homeassistant/components/thermopro/button.py
new file mode 100644
index 00000000000..9faa9f22c4c
--- /dev/null
+++ b/homeassistant/components/thermopro/button.py
@@ -0,0 +1,157 @@
+"""Thermopro button platform."""
+
+from __future__ import annotations
+
+from collections.abc import Callable, Coroutine
+from dataclasses import dataclass
+from typing import Any
+
+from thermopro_ble import SensorUpdate, ThermoProBluetoothDeviceData, ThermoProDevice
+
+from homeassistant.components.bluetooth import (
+    BluetoothServiceInfoBleak,
+    async_ble_device_from_address,
+    async_track_unavailable,
+)
+from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.dispatcher import (
+    async_dispatcher_connect,
+    async_dispatcher_send,
+)
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util.dt import now
+
+from .const import DOMAIN, SIGNAL_AVAILABILITY_UPDATED, SIGNAL_DATA_UPDATED
+
+PARALLEL_UPDATES = 1  # one connection at a time
+
+
+@dataclass(kw_only=True, frozen=True)
+class ThermoProButtonEntityDescription(ButtonEntityDescription):
+    """Describe a ThermoPro button entity."""
+
+    press_action_fn: Callable[[HomeAssistant, str], Coroutine[None, Any, Any]]
+
+
+async def _async_set_datetime(hass: HomeAssistant, address: str) -> None:
+    """Set Date&Time for a given device."""
+    ble_device = async_ble_device_from_address(hass, address, connectable=True)
+    assert ble_device is not None
+    await ThermoProDevice(ble_device).set_datetime(now(), am_pm=False)
+
+
+BUTTON_ENTITIES: tuple[ThermoProButtonEntityDescription, ...] = (
+    ThermoProButtonEntityDescription(
+        key="datetime",
+        translation_key="set_datetime",
+        icon="mdi:calendar-clock",
+        entity_category=EntityCategory.CONFIG,
+        press_action_fn=_async_set_datetime,
+    ),
+)
+
+MODELS_THAT_SUPPORT_BUTTONS = {"TP358", "TP393"}
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the thermopro button platform."""
+    address = entry.unique_id
+    assert address is not None
+    availability_signal = f"{SIGNAL_AVAILABILITY_UPDATED}_{entry.entry_id}"
+    entity_added = False
+
+    @callback
+    def _async_on_data_updated(
+        data: ThermoProBluetoothDeviceData,
+        service_info: BluetoothServiceInfoBleak,
+        update: SensorUpdate,
+    ) -> None:
+        nonlocal entity_added
+        sensor_device_info = update.devices[data.primary_device_id]
+        if sensor_device_info.model not in MODELS_THAT_SUPPORT_BUTTONS:
+            return
+
+        if not entity_added:
+            name = sensor_device_info.name
+            assert name is not None
+            entity_added = True
+            async_add_entities(
+                ThermoProButtonEntity(
+                    description=description,
+                    data=data,
+                    availability_signal=availability_signal,
+                    address=address,
+                )
+                for description in BUTTON_ENTITIES
+            )
+
+        if service_info.connectable:
+            async_dispatcher_send(hass, availability_signal, True)
+
+    entry.async_on_unload(
+        async_dispatcher_connect(
+            hass, f"{SIGNAL_DATA_UPDATED}_{entry.entry_id}", _async_on_data_updated
+        )
+    )
+
+
+class ThermoProButtonEntity(ButtonEntity):
+    """Representation of a ThermoPro button entity."""
+
+    _attr_has_entity_name = True
+    entity_description: ThermoProButtonEntityDescription
+
+    def __init__(
+        self,
+        description: ThermoProButtonEntityDescription,
+        data: ThermoProBluetoothDeviceData,
+        availability_signal: str,
+        address: str,
+    ) -> None:
+        """Initialize the thermopro button entity."""
+        self.entity_description = description
+        self._address = address
+        self._availability_signal = availability_signal
+        self._attr_unique_id = f"{address}-{description.key}"
+        self._attr_device_info = dr.DeviceInfo(
+            name=data.get_device_name(),
+            identifiers={(DOMAIN, address)},
+            connections={(dr.CONNECTION_BLUETOOTH, address)},
+        )
+
+    async def async_added_to_hass(self) -> None:
+        """Connect availability dispatcher."""
+        await super().async_added_to_hass()
+        self.async_on_remove(
+            async_dispatcher_connect(
+                self.hass,
+                self._availability_signal,
+                self._async_on_availability_changed,
+            )
+        )
+        self.async_on_remove(
+            async_track_unavailable(
+                self.hass, self._async_on_unavailable, self._address, connectable=True
+            )
+        )
+
+    @callback
+    def _async_on_unavailable(self, _: BluetoothServiceInfoBleak) -> None:
+        self._async_on_availability_changed(False)
+
+    @callback
+    def _async_on_availability_changed(self, available: bool) -> None:
+        self._attr_available = available
+        self.async_write_ha_state()
+
+    async def async_press(self) -> None:
+        """Execute the press action for the entity."""
+        await self.entity_description.press_action_fn(self.hass, self._address)
diff --git a/homeassistant/components/thermopro/config_flow.py b/homeassistant/components/thermopro/config_flow.py
index 4d080c6e074..4c6d59473c2 100644
--- a/homeassistant/components/thermopro/config_flow.py
+++ b/homeassistant/components/thermopro/config_flow.py
@@ -72,7 +72,7 @@ class ThermoProConfigFlow(ConfigFlow, domain=DOMAIN):
                 title=self._discovered_devices[address], data={}
             )
 
-        current_addresses = self._async_current_ids()
+        current_addresses = self._async_current_ids(include_ignore=False)
         for discovery_info in async_discovered_service_info(self.hass, False):
             address = discovery_info.address
             if address in current_addresses or address in self._discovered_devices:
diff --git a/homeassistant/components/thermopro/const.py b/homeassistant/components/thermopro/const.py
index 343729442cf..7d2170f8cf9 100644
--- a/homeassistant/components/thermopro/const.py
+++ b/homeassistant/components/thermopro/const.py
@@ -1,3 +1,6 @@
 """Constants for the ThermoPro Bluetooth integration."""
 
 DOMAIN = "thermopro"
+
+SIGNAL_DATA_UPDATED = f"{DOMAIN}_service_info_updated"
+SIGNAL_AVAILABILITY_UPDATED = f"{DOMAIN}_availability_updated"
diff --git a/homeassistant/components/thermopro/manifest.json b/homeassistant/components/thermopro/manifest.json
index 2c066d785ca..6027e4bc99c 100644
--- a/homeassistant/components/thermopro/manifest.json
+++ b/homeassistant/components/thermopro/manifest.json
@@ -24,5 +24,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/thermopro",
   "iot_class": "local_push",
-  "requirements": ["thermopro-ble==0.10.1"]
+  "requirements": ["thermopro-ble==0.11.0"]
 }
diff --git a/homeassistant/components/thermopro/sensor.py b/homeassistant/components/thermopro/sensor.py
index 4aca6101685..853f00f2dd5 100644
--- a/homeassistant/components/thermopro/sensor.py
+++ b/homeassistant/components/thermopro/sensor.py
@@ -9,7 +9,6 @@ from thermopro_ble import (
     Units,
 )
 
-from homeassistant import config_entries
 from homeassistant.components.bluetooth.passive_update_processor import (
     PassiveBluetoothDataProcessor,
     PassiveBluetoothDataUpdate,
@@ -23,6 +22,7 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
@@ -30,7 +30,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from .const import DOMAIN
@@ -110,8 +110,8 @@ def sensor_update_to_bluetooth_data_update(
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ThermoPro BLE sensors."""
     coordinator: PassiveBluetoothProcessorCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/thermopro/strings.json b/homeassistant/components/thermopro/strings.json
index 4e12a84b653..5789de410b2 100644
--- a/homeassistant/components/thermopro/strings.json
+++ b/homeassistant/components/thermopro/strings.json
@@ -17,5 +17,12 @@
       "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "button": {
+      "set_datetime": {
+        "name": "Set Date&Time"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/thermoworks_smoke/sensor.py b/homeassistant/components/thermoworks_smoke/sensor.py
index 7dc845ecf60..7ce0dfb9993 100644
--- a/homeassistant/components/thermoworks_smoke/sensor.py
+++ b/homeassistant/components/thermoworks_smoke/sensor.py
@@ -27,7 +27,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/thethingsnetwork/coordinator.py b/homeassistant/components/thethingsnetwork/coordinator.py
index 64608c2f064..78ffceecf84 100644
--- a/homeassistant/components/thethingsnetwork/coordinator.py
+++ b/homeassistant/components/thethingsnetwork/coordinator.py
@@ -19,11 +19,14 @@ _LOGGER = logging.getLogger(__name__)
 class TTNCoordinator(DataUpdateCoordinator[TTNClient.DATA_TYPE]):
     """TTN coordinator."""
 
+    config_entry: ConfigEntry
+
     def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
         """Initialize my coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             # Name of the data. For logging purposes.
             name=f"TheThingsNetwork_{entry.data[CONF_APP_ID]}",
             # Polling interval. Will only be polled if there are subscribers.
diff --git a/homeassistant/components/thethingsnetwork/sensor.py b/homeassistant/components/thethingsnetwork/sensor.py
index 25dd2f1e1eb..5aa851d99ae 100644
--- a/homeassistant/components/thethingsnetwork/sensor.py
+++ b/homeassistant/components/thethingsnetwork/sensor.py
@@ -7,7 +7,7 @@ from ttn_client import TTNSensorValue
 from homeassistant.components.sensor import SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .const import CONF_APP_ID, DOMAIN
@@ -17,7 +17,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add entities for TTN."""
 
@@ -38,7 +40,7 @@ async def async_setup_entry(
             if (device_id, field_id) not in sensors
             and isinstance(ttn_value, TTNSensorValue)
         }
-        if len(new_sensors):
+        if new_sensors:
             async_add_entities(new_sensors.values())
         sensors.update(new_sensors.keys())
 
diff --git a/homeassistant/components/thingspeak/__init__.py b/homeassistant/components/thingspeak/__init__.py
index fdf06a9709a..1798e4f1de0 100644
--- a/homeassistant/components/thingspeak/__init__.py
+++ b/homeassistant/components/thingspeak/__init__.py
@@ -14,8 +14,7 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import event, state as state_helper
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, event, state as state_helper
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/thinkingcleaner/sensor.py b/homeassistant/components/thinkingcleaner/sensor.py
index 4d28912e20d..ccdc1ada48e 100644
--- a/homeassistant/components/thinkingcleaner/sensor.py
+++ b/homeassistant/components/thinkingcleaner/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_HOST, PERCENTAGE
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/thinkingcleaner/switch.py b/homeassistant/components/thinkingcleaner/switch.py
index 76c7cdb0db2..8397eeedc23 100644
--- a/homeassistant/components/thinkingcleaner/switch.py
+++ b/homeassistant/components/thinkingcleaner/switch.py
@@ -17,7 +17,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import CONF_HOST, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/thomson/device_tracker.py b/homeassistant/components/thomson/device_tracker.py
index 4e44b2b1ffd..f003264b6d7 100644
--- a/homeassistant/components/thomson/device_tracker.py
+++ b/homeassistant/components/thomson/device_tracker.py
@@ -15,7 +15,7 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/threshold/binary_sensor.py b/homeassistant/components/threshold/binary_sensor.py
index 3d52d2225be..3227f030812 100644
--- a/homeassistant/components/threshold/binary_sensor.py
+++ b/homeassistant/components/threshold/binary_sensor.py
@@ -33,7 +33,10 @@ from homeassistant.core import (
 from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.device import async_device_info_to_link_from_entity
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
@@ -90,7 +93,7 @@ PLATFORM_SCHEMA = vol.All(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize threshold config entry."""
     registry = er.async_get(hass)
diff --git a/homeassistant/components/tibber/__init__.py b/homeassistant/components/tibber/__init__.py
index 9b5c7ee1168..424b35b963b 100644
--- a/homeassistant/components/tibber/__init__.py
+++ b/homeassistant/components/tibber/__init__.py
@@ -9,8 +9,8 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ACCESS_TOKEN, EVENT_HOMEASSISTANT_STOP, Platform
 from homeassistant.core import Event, HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import dt as dt_util, ssl as ssl_util
 
diff --git a/homeassistant/components/tibber/coordinator.py b/homeassistant/components/tibber/coordinator.py
index 78841f9db91..e565fdc7dd8 100644
--- a/homeassistant/components/tibber/coordinator.py
+++ b/homeassistant/components/tibber/coordinator.py
@@ -9,7 +9,11 @@ from typing import cast
 import tibber
 
 from homeassistant.components.recorder import get_instance
-from homeassistant.components.recorder.models import StatisticData, StatisticMetaData
+from homeassistant.components.recorder.models import (
+    StatisticData,
+    StatisticMeanType,
+    StatisticMetaData,
+)
 from homeassistant.components.recorder.statistics import (
     async_add_external_statistics,
     get_last_statistics,
@@ -33,11 +37,17 @@ class TibberDataCoordinator(DataUpdateCoordinator[None]):
 
     config_entry: ConfigEntry
 
-    def __init__(self, hass: HomeAssistant, tibber_connection: tibber.Tibber) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        tibber_connection: tibber.Tibber,
+    ) -> None:
         """Initialize the data handler."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=f"Tibber {tibber_connection.name}",
             update_interval=timedelta(minutes=20),
         )
@@ -153,7 +163,7 @@ class TibberDataCoordinator(DataUpdateCoordinator[None]):
                     )
 
                 metadata = StatisticMetaData(
-                    has_mean=False,
+                    mean_type=StatisticMeanType.NONE,
                     has_sum=True,
                     name=f"{home.name} {sensor_type}",
                     source=TIBBER_DOMAIN,
diff --git a/homeassistant/components/tibber/notify.py b/homeassistant/components/tibber/notify.py
index fdeeeba68ef..df6541591e0 100644
--- a/homeassistant/components/tibber/notify.py
+++ b/homeassistant/components/tibber/notify.py
@@ -12,13 +12,15 @@ from homeassistant.components.notify import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN as TIBBER_DOMAIN
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tibber notification entity."""
     async_add_entities([TibberNotificationEntity(entry.entry_id)])
diff --git a/homeassistant/components/tibber/sensor.py b/homeassistant/components/tibber/sensor.py
index c1ec7bf2a9e..9f87b8a8490 100644
--- a/homeassistant/components/tibber/sensor.py
+++ b/homeassistant/components/tibber/sensor.py
@@ -33,7 +33,7 @@ from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.exceptions import PlatformNotReady
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
@@ -261,7 +261,9 @@ SENSORS: tuple[SensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tibber sensor."""
 
@@ -285,7 +287,7 @@ async def async_setup_entry(
         if home.has_active_subscription:
             entities.append(TibberSensorElPrice(home))
             if coordinator is None:
-                coordinator = TibberDataCoordinator(hass, tibber_connection)
+                coordinator = TibberDataCoordinator(hass, entry, tibber_connection)
             entities.extend(
                 TibberDataSensor(home, coordinator, entity_description)
                 for entity_description in SENSORS
@@ -531,7 +533,7 @@ class TibberRtEntityCreator:
 
     def __init__(
         self,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
         tibber_home: tibber.TibberHome,
         entity_registry: er.EntityRegistry,
     ) -> None:
diff --git a/homeassistant/components/tibber/strings.json b/homeassistant/components/tibber/strings.json
index 05b98b97995..ec2c005d4e3 100644
--- a/homeassistant/components/tibber/strings.json
+++ b/homeassistant/components/tibber/strings.json
@@ -87,7 +87,7 @@
   "services": {
     "get_prices": {
       "name": "Get energy prices",
-      "description": "Get hourly energy prices from Tibber",
+      "description": "Fetches hourly energy prices including price level.",
       "fields": {
         "start": {
           "name": "Start",
diff --git a/homeassistant/components/tikteck/light.py b/homeassistant/components/tikteck/light.py
index 26ffc0e7b6d..a3961cbb569 100644
--- a/homeassistant/components/tikteck/light.py
+++ b/homeassistant/components/tikteck/light.py
@@ -17,10 +17,10 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import CONF_DEVICES, CONF_NAME, CONF_PASSWORD
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.color as color_util
+from homeassistant.util import color as color_util
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/tile/binary_sensor.py b/homeassistant/components/tile/binary_sensor.py
index 1719c793c0e..6abc80732a6 100644
--- a/homeassistant/components/tile/binary_sensor.py
+++ b/homeassistant/components/tile/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import TileConfigEntry, TileCoordinator
 from .entity import TileEntity
@@ -35,7 +35,9 @@ ENTITIES: tuple[TileBinarySensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TileConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TileConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tile binary sensors."""
 
diff --git a/homeassistant/components/tile/device_tracker.py b/homeassistant/components/tile/device_tracker.py
index 6a0aae1bdf9..66a3b8b0e27 100644
--- a/homeassistant/components/tile/device_tracker.py
+++ b/homeassistant/components/tile/device_tracker.py
@@ -6,7 +6,7 @@ import logging
 
 from homeassistant.components.device_tracker import TrackerEntity
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.dt import as_utc
 
 from .coordinator import TileConfigEntry, TileCoordinator
@@ -26,7 +26,9 @@ ATTR_VOIP_STATE = "voip_state"
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TileConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TileConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tile device trackers."""
 
diff --git a/homeassistant/components/tilt_ble/config_flow.py b/homeassistant/components/tilt_ble/config_flow.py
index 5c1f9721aae..b4a3235c60f 100644
--- a/homeassistant/components/tilt_ble/config_flow.py
+++ b/homeassistant/components/tilt_ble/config_flow.py
@@ -72,7 +72,7 @@ class TiltConfigFlow(ConfigFlow, domain=DOMAIN):
                 title=self._discovered_devices[address], data={}
             )
 
-        current_addresses = self._async_current_ids()
+        current_addresses = self._async_current_ids(include_ignore=False)
         for discovery_info in async_discovered_service_info(self.hass, False):
             address = discovery_info.address
             if address in current_addresses or address in self._discovered_devices:
diff --git a/homeassistant/components/tilt_ble/sensor.py b/homeassistant/components/tilt_ble/sensor.py
index e8e1f902cd9..411484cf2fe 100644
--- a/homeassistant/components/tilt_ble/sensor.py
+++ b/homeassistant/components/tilt_ble/sensor.py
@@ -20,7 +20,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import SIGNAL_STRENGTH_DECIBELS_MILLIWATT, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from .const import DOMAIN
@@ -86,7 +86,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Tilt Hydrometer BLE sensors."""
     coordinator: PassiveBluetoothProcessorCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/time_date/sensor.py b/homeassistant/components/time_date/sensor.py
index 245d10bebba..f05244e7680 100644
--- a/homeassistant/components/time_date/sensor.py
+++ b/homeassistant/components/time_date/sensor.py
@@ -17,11 +17,14 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DISPLAY_OPTIONS, EVENT_CORE_CONFIG_UPDATE
 from homeassistant.core import CALLBACK_TYPE, Event, HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import OPTION_TYPES
 
@@ -56,7 +59,9 @@ async def async_setup_platform(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Time & Date sensor."""
 
diff --git a/homeassistant/components/timer/__init__.py b/homeassistant/components/timer/__init__.py
index 19b1de427ef..3cf8307e9b3 100644
--- a/homeassistant/components/timer/__init__.py
+++ b/homeassistant/components/timer/__init__.py
@@ -19,15 +19,14 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import collection
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import collection, config_validation as cv
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.helpers.restore_state import RestoreEntity
 import homeassistant.helpers.service
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.typing import ConfigType, VolDictType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -375,6 +374,9 @@ class Timer(collection.CollectionEntity, RestoreEntity):
     @callback
     def async_cancel(self) -> None:
         """Cancel a timer."""
+        if self._state == STATUS_IDLE:
+            return
+
         if self._listener:
             self._listener()
             self._listener = None
@@ -390,13 +392,15 @@ class Timer(collection.CollectionEntity, RestoreEntity):
     @callback
     def async_finish(self) -> None:
         """Reset and updates the states, fire finished event."""
-        if self._state != STATUS_ACTIVE or self._end is None:
+        if self._state == STATUS_IDLE:
             return
 
         if self._listener:
             self._listener()
             self._listener = None
         end = self._end
+        if end is None:
+            end = dt_util.utcnow().replace(microsecond=0)
         self._state = STATUS_IDLE
         self._end = None
         self._remaining = None
diff --git a/homeassistant/components/tmb/sensor.py b/homeassistant/components/tmb/sensor.py
index 126c3128f91..cbf3b073578 100644
--- a/homeassistant/components/tmb/sensor.py
+++ b/homeassistant/components/tmb/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_NAME, UnitOfTime
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/tod/binary_sensor.py b/homeassistant/components/tod/binary_sensor.py
index 3ac90b5578c..1ab34861a6e 100644
--- a/homeassistant/components/tod/binary_sensor.py
+++ b/homeassistant/components/tod/binary_sensor.py
@@ -24,7 +24,10 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, event
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.sun import get_astral_event_date, get_astral_event_next
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util
@@ -59,7 +62,7 @@ PLATFORM_SCHEMA = BINARY_SENSOR_PLATFORM_SCHEMA.extend(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize Times of the Day config entry."""
     if hass.config.time_zone is None:
diff --git a/homeassistant/components/todo/intent.py b/homeassistant/components/todo/intent.py
index c678408a576..d679a57bf96 100644
--- a/homeassistant/components/todo/intent.py
+++ b/homeassistant/components/todo/intent.py
@@ -11,11 +11,13 @@ from . import TodoItem, TodoItemStatus, TodoListEntity
 from .const import DATA_COMPONENT, DOMAIN
 
 INTENT_LIST_ADD_ITEM = "HassListAddItem"
+INTENT_LIST_COMPLETE_ITEM = "HassListCompleteItem"
 
 
 async def async_setup_intents(hass: HomeAssistant) -> None:
     """Set up the todo intents."""
     intent.async_register(hass, ListAddItemIntent())
+    intent.async_register(hass, ListCompleteItemIntent())
 
 
 class ListAddItemIntent(intent.IntentHandler):
@@ -53,14 +55,92 @@ class ListAddItemIntent(intent.IntentHandler):
             match_result.states[0].entity_id
         )
         if target_list is None:
-            raise intent.IntentHandleError(f"No to-do list: {list_name}")
+            raise intent.IntentHandleError(
+                f"No to-do list: {list_name}", "list_not_found"
+            )
 
         # Add to list
         await target_list.async_create_todo_item(
             TodoItem(summary=item, status=TodoItemStatus.NEEDS_ACTION)
         )
 
-        response = intent_obj.create_response()
+        response: intent.IntentResponse = intent_obj.create_response()
+        response.response_type = intent.IntentResponseType.ACTION_DONE
+        response.async_set_results(
+            [
+                intent.IntentResponseTarget(
+                    type=intent.IntentResponseTargetType.ENTITY,
+                    name=list_name,
+                    id=match_result.states[0].entity_id,
+                )
+            ]
+        )
+        return response
+
+
+class ListCompleteItemIntent(intent.IntentHandler):
+    """Handle ListCompleteItem intents."""
+
+    intent_type = INTENT_LIST_COMPLETE_ITEM
+    description = "Complete item on a todo list"
+    slot_schema = {
+        vol.Required("item"): intent.non_empty_string,
+        vol.Required("name"): intent.non_empty_string,
+    }
+    platforms = {DOMAIN}
+
+    async def async_handle(self, intent_obj: intent.Intent) -> intent.IntentResponse:
+        """Handle the intent."""
+        hass = intent_obj.hass
+
+        slots = self.async_validate_slots(intent_obj.slots)
+        item = slots["item"]["value"]
+        list_name = slots["name"]["value"]
+
+        target_list: TodoListEntity | None = None
+
+        # Find matching list
+        match_constraints = intent.MatchTargetsConstraints(
+            name=list_name, domains=[DOMAIN], assistant=intent_obj.assistant
+        )
+        match_result = intent.async_match_targets(hass, match_constraints)
+        if not match_result.is_match:
+            raise intent.MatchFailedError(
+                result=match_result, constraints=match_constraints
+            )
+
+        target_list = hass.data[DATA_COMPONENT].get_entity(
+            match_result.states[0].entity_id
+        )
+        if target_list is None:
+            raise intent.IntentHandleError(
+                f"No to-do list: {list_name}", "list_not_found"
+            )
+
+        # Find item in list
+        matching_item = None
+        for todo_item in target_list.todo_items or ():
+            if (
+                item in (todo_item.uid, todo_item.summary)
+                and todo_item.status == TodoItemStatus.NEEDS_ACTION
+            ):
+                matching_item = todo_item
+                break
+        if not matching_item or not matching_item.uid:
+            raise intent.IntentHandleError(
+                f"Item '{item}' not found on list", "item_not_found"
+            )
+
+        # Mark as completed
+        await target_list.async_update_todo_item(
+            TodoItem(
+                uid=matching_item.uid,
+                summary=matching_item.summary,
+                status=TodoItemStatus.COMPLETED,
+            )
+        )
+
+        response: intent.IntentResponse = intent_obj.create_response()
         response.response_type = intent.IntentResponseType.ACTION_DONE
         response.async_set_results(
             [
diff --git a/homeassistant/components/todoist/calendar.py b/homeassistant/components/todoist/calendar.py
index 62f9fafc02a..2e2873353c6 100644
--- a/homeassistant/components/todoist/calendar.py
+++ b/homeassistant/components/todoist/calendar.py
@@ -22,9 +22,12 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ID, CONF_NAME, CONF_TOKEN, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import Event, HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import ServiceValidationError
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import dt as dt_util
@@ -113,7 +116,9 @@ SCAN_INTERVAL = timedelta(minutes=1)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Todoist calendar platform config entry."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
@@ -541,9 +546,8 @@ class TodoistProjectData:
             return None
 
         # All task Labels (optional parameter).
-        task[LABELS] = [
-            label.name for label in self._labels if label.name in data.labels
-        ]
+        labels = data.labels or []
+        task[LABELS] = [label.name for label in self._labels if label.name in labels]
         if self._label_whitelist and (
             not any(label in task[LABELS] for label in self._label_whitelist)
         ):
diff --git a/homeassistant/components/todoist/manifest.json b/homeassistant/components/todoist/manifest.json
index 72d76108353..791f5642aad 100644
--- a/homeassistant/components/todoist/manifest.json
+++ b/homeassistant/components/todoist/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/todoist",
   "iot_class": "cloud_polling",
   "loggers": ["todoist"],
-  "requirements": ["todoist-api-python==2.1.2"]
+  "requirements": ["todoist-api-python==2.1.7"]
 }
diff --git a/homeassistant/components/todoist/strings.json b/homeassistant/components/todoist/strings.json
index 721b491bbf5..68f22b51c47 100644
--- a/homeassistant/components/todoist/strings.json
+++ b/homeassistant/components/todoist/strings.json
@@ -55,7 +55,7 @@
         },
         "assignee": {
           "name": "Assignee",
-          "description": "A members username of a shared project to assign this task to."
+          "description": "The username of a shared project's member to assign this task to."
         },
         "priority": {
           "name": "Priority",
@@ -63,11 +63,11 @@
         },
         "due_date_string": {
           "name": "Due date string",
-          "description": "The day this task is due, in natural language."
+          "description": "The time this task is due, in natural language."
         },
         "due_date_lang": {
           "name": "Due date language",
-          "description": "The language of due_date_string."
+          "description": "The language of 'Due date string'."
         },
         "due_date": {
           "name": "Due date",
@@ -75,15 +75,15 @@
         },
         "reminder_date_string": {
           "name": "Reminder date string",
-          "description": "When should user be reminded of this task, in natural language."
+          "description": "When the user should be reminded of this task, in natural language."
         },
         "reminder_date_lang": {
           "name": "Reminder date language",
-          "description": "The language of reminder_date_string."
+          "description": "The language of 'Reminder date string'."
         },
         "reminder_date": {
           "name": "Reminder date",
-          "description": "When should user be reminded of this task, in format YYYY-MM-DDTHH:MM:SS, in UTC timezone."
+          "description": "When the user should be reminded of this task, in format YYYY-MM-DDTHH:MM:SS, in UTC timezone."
         }
       }
     }
diff --git a/homeassistant/components/todoist/todo.py b/homeassistant/components/todoist/todo.py
index 490e4ad9f1a..202c51fb4c0 100644
--- a/homeassistant/components/todoist/todo.py
+++ b/homeassistant/components/todoist/todo.py
@@ -14,7 +14,7 @@ from homeassistant.components.todo import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import dt as dt_util
 
@@ -23,7 +23,9 @@ from .coordinator import TodoistCoordinator
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Todoist todo platform config entry."""
     coordinator: TodoistCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/tolo/binary_sensor.py b/homeassistant/components/tolo/binary_sensor.py
index 845f8ed22e3..cb3ba46b604 100644
--- a/homeassistant/components/tolo/binary_sensor.py
+++ b/homeassistant/components/tolo/binary_sensor.py
@@ -7,7 +7,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import ToloSaunaUpdateCoordinator
@@ -17,7 +17,7 @@ from .entity import ToloSaunaCoordinatorEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up binary sensors for TOLO Sauna."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/tolo/button.py b/homeassistant/components/tolo/button.py
index b7c4362ca7b..9e4c8c84be9 100644
--- a/homeassistant/components/tolo/button.py
+++ b/homeassistant/components/tolo/button.py
@@ -6,7 +6,7 @@ from homeassistant.components.button import ButtonEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import ToloSaunaUpdateCoordinator
@@ -16,7 +16,7 @@ from .entity import ToloSaunaCoordinatorEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up buttons for TOLO Sauna."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/tolo/climate.py b/homeassistant/components/tolo/climate.py
index 5e6428525c1..0df8635fca9 100644
--- a/homeassistant/components/tolo/climate.py
+++ b/homeassistant/components/tolo/climate.py
@@ -23,7 +23,7 @@ from homeassistant.components.climate import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, PRECISION_WHOLE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import ToloSaunaUpdateCoordinator
@@ -33,7 +33,7 @@ from .entity import ToloSaunaCoordinatorEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up climate controls for TOLO Sauna."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/tolo/coordinator.py b/homeassistant/components/tolo/coordinator.py
index 632cc819f5a..729073b16c4 100644
--- a/homeassistant/components/tolo/coordinator.py
+++ b/homeassistant/components/tolo/coordinator.py
@@ -28,6 +28,8 @@ class ToloSaunaData(NamedTuple):
 class ToloSaunaUpdateCoordinator(DataUpdateCoordinator[ToloSaunaData]):
     """DataUpdateCoordinator for TOLO Sauna."""
 
+    config_entry: ConfigEntry
+
     def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
         """Initialize ToloSaunaUpdateCoordinator."""
         self.client = ToloClient(
@@ -38,6 +40,7 @@ class ToloSaunaUpdateCoordinator(DataUpdateCoordinator[ToloSaunaData]):
         super().__init__(
             hass=hass,
             logger=_LOGGER,
+            config_entry=entry,
             name=f"{entry.title} ({entry.data[CONF_HOST]}) Data Update Coordinator",
             update_interval=timedelta(seconds=5),
         )
diff --git a/homeassistant/components/tolo/fan.py b/homeassistant/components/tolo/fan.py
index 9e48778b507..7bddf775143 100644
--- a/homeassistant/components/tolo/fan.py
+++ b/homeassistant/components/tolo/fan.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import ToloSaunaUpdateCoordinator
@@ -17,7 +17,7 @@ from .entity import ToloSaunaCoordinatorEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up fan controls for TOLO Sauna."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/tolo/light.py b/homeassistant/components/tolo/light.py
index eeb37305fe8..9ccd4a8e407 100644
--- a/homeassistant/components/tolo/light.py
+++ b/homeassistant/components/tolo/light.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.light import ColorMode, LightEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import ToloSaunaUpdateCoordinator
@@ -17,7 +17,7 @@ from .entity import ToloSaunaCoordinatorEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up light controls for TOLO Sauna."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/tolo/manifest.json b/homeassistant/components/tolo/manifest.json
index 14125a857f6..613fc810683 100644
--- a/homeassistant/components/tolo/manifest.json
+++ b/homeassistant/components/tolo/manifest.json
@@ -11,5 +11,5 @@
   "documentation": "https://www.home-assistant.io/integrations/tolo",
   "iot_class": "local_polling",
   "loggers": ["tololib"],
-  "requirements": ["tololib==1.1.0"]
+  "requirements": ["tololib==1.2.2"]
 }
diff --git a/homeassistant/components/tolo/number.py b/homeassistant/components/tolo/number.py
index 73505c5b251..902fb749d23 100644
--- a/homeassistant/components/tolo/number.py
+++ b/homeassistant/components/tolo/number.py
@@ -18,7 +18,7 @@ from homeassistant.components.number import NumberEntity, NumberEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import ToloSaunaUpdateCoordinator
@@ -68,7 +68,7 @@ NUMBERS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up number controls for TOLO Sauna."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/tolo/select.py b/homeassistant/components/tolo/select.py
index fee1ac1774e..b08f37e40ae 100644
--- a/homeassistant/components/tolo/select.py
+++ b/homeassistant/components/tolo/select.py
@@ -11,7 +11,7 @@ from homeassistant.components.select import SelectEntity, SelectEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, AromaTherapySlot, LampMode
 from .coordinator import ToloSaunaUpdateCoordinator
@@ -54,7 +54,7 @@ SELECTS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up select entities for TOLO Sauna."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/tolo/sensor.py b/homeassistant/components/tolo/sensor.py
index 0e94ec0ae1e..e97211c8e40 100644
--- a/homeassistant/components/tolo/sensor.py
+++ b/homeassistant/components/tolo/sensor.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import ToloSaunaUpdateCoordinator
@@ -89,7 +89,7 @@ SENSORS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up (non-binary, general) sensors for TOLO Sauna."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/tolo/switch.py b/homeassistant/components/tolo/switch.py
index d39dd17f0f3..ce863053e26 100644
--- a/homeassistant/components/tolo/switch.py
+++ b/homeassistant/components/tolo/switch.py
@@ -11,7 +11,7 @@ from tololib import ToloClient, ToloStatus
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import ToloSaunaUpdateCoordinator
@@ -45,7 +45,7 @@ SWITCHES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switch controls for TOLO Sauna."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/tomato/device_tracker.py b/homeassistant/components/tomato/device_tracker.py
index dfa8d2bd4e1..2cef5eea0cf 100644
--- a/homeassistant/components/tomato/device_tracker.py
+++ b/homeassistant/components/tomato/device_tracker.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
     CONF_VERIFY_SSL,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 CONF_HTTP_ID = "http_id"
diff --git a/homeassistant/components/tomorrowio/__init__.py b/homeassistant/components/tomorrowio/__init__.py
index 73f62735e06..7d6b9ed3f73 100644
--- a/homeassistant/components/tomorrowio/__init__.py
+++ b/homeassistant/components/tomorrowio/__init__.py
@@ -29,7 +29,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         # we will not use the class's lat and long so we can pass in garbage
         # lats and longs
         api = TomorrowioV4(api_key, 361.0, 361.0, unit_system="metric", session=session)
-        coordinator = TomorrowioDataUpdateCoordinator(hass, api)
+        coordinator = TomorrowioDataUpdateCoordinator(hass, entry, api)
         hass.data[DOMAIN][api_key] = coordinator
 
     await coordinator.async_setup_entry(entry)
diff --git a/homeassistant/components/tomorrowio/coordinator.py b/homeassistant/components/tomorrowio/coordinator.py
index 60b997e4c0d..2a6b3675792 100644
--- a/homeassistant/components/tomorrowio/coordinator.py
+++ b/homeassistant/components/tomorrowio/coordinator.py
@@ -116,14 +116,23 @@ def async_set_update_interval(
 class TomorrowioDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Define an object to hold Tomorrow.io data."""
 
-    def __init__(self, hass: HomeAssistant, api: TomorrowioV4) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, api: TomorrowioV4
+    ) -> None:
         """Initialize."""
         self._api = api
         self.data = {CURRENT: {}, FORECASTS: {}}
         self.entry_id_to_location_dict: dict[str, str] = {}
         self._coordinator_ready: asyncio.Event | None = None
 
-        super().__init__(hass, LOGGER, name=f"{DOMAIN}_{self._api.api_key_masked}")
+        super().__init__(
+            hass,
+            LOGGER,
+            config_entry=config_entry,
+            name=f"{DOMAIN}_{self._api.api_key_masked}",
+        )
 
     def add_entry_to_location_dict(self, entry: ConfigEntry) -> None:
         """Add an entry to the location dict."""
diff --git a/homeassistant/components/tomorrowio/sensor.py b/homeassistant/components/tomorrowio/sensor.py
index 7ff17961b58..08e1991d831 100644
--- a/homeassistant/components/tomorrowio/sensor.py
+++ b/homeassistant/components/tomorrowio/sensor.py
@@ -34,7 +34,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.unit_conversion import DistanceConverter, SpeedConverter
 from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM
 
@@ -328,7 +328,7 @@ SENSOR_TYPES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a config entry."""
     coordinator = hass.data[DOMAIN][config_entry.data[CONF_API_KEY]]
diff --git a/homeassistant/components/tomorrowio/weather.py b/homeassistant/components/tomorrowio/weather.py
index 92b09500e7b..0a070a1b33b 100644
--- a/homeassistant/components/tomorrowio/weather.py
+++ b/homeassistant/components/tomorrowio/weather.py
@@ -33,7 +33,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sun import is_up
 from homeassistant.util import dt as dt_util
 
@@ -66,7 +66,7 @@ from .entity import TomorrowioEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a config entry."""
     coordinator = hass.data[DOMAIN][config_entry.data[CONF_API_KEY]]
diff --git a/homeassistant/components/toon/__init__.py b/homeassistant/components/toon/__init__.py
index 43c787b2301..1c56b780c0f 100644
--- a/homeassistant/components/toon/__init__.py
+++ b/homeassistant/components/toon/__init__.py
@@ -89,7 +89,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     implementation = await async_get_config_entry_implementation(hass, entry)
     session = OAuth2Session(hass, entry, implementation)
 
-    coordinator = ToonDataUpdateCoordinator(hass, entry=entry, session=session)
+    coordinator = ToonDataUpdateCoordinator(hass, entry, session)
     await coordinator.toon.activate_agreement(
         agreement_id=entry.data[CONF_AGREEMENT_ID]
     )
diff --git a/homeassistant/components/toon/binary_sensor.py b/homeassistant/components/toon/binary_sensor.py
index 11b13a32ee5..eff8aed0a20 100644
--- a/homeassistant/components/toon/binary_sensor.py
+++ b/homeassistant/components/toon/binary_sensor.py
@@ -11,7 +11,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import ToonDataUpdateCoordinator
@@ -25,7 +25,9 @@ from .entity import (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Toon binary sensor based on a config entry."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/toon/climate.py b/homeassistant/components/toon/climate.py
index 0c2e5b9b232..5538a0abd91 100644
--- a/homeassistant/components/toon/climate.py
+++ b/homeassistant/components/toon/climate.py
@@ -24,7 +24,7 @@ from homeassistant.components.climate import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import ToonDataUpdateCoordinator
 from .const import DEFAULT_MAX_TEMP, DEFAULT_MIN_TEMP, DOMAIN
@@ -33,7 +33,9 @@ from .helpers import toon_exception_handler
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Toon binary sensors based on a config entry."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/toon/coordinator.py b/homeassistant/components/toon/coordinator.py
index 586eca34959..894b4c91334 100644
--- a/homeassistant/components/toon/coordinator.py
+++ b/homeassistant/components/toon/coordinator.py
@@ -28,12 +28,13 @@ _LOGGER = logging.getLogger(__name__)
 class ToonDataUpdateCoordinator(DataUpdateCoordinator[Status]):
     """Class to manage fetching Toon data from single endpoint."""
 
+    config_entry: ConfigEntry
+
     def __init__(
-        self, hass: HomeAssistant, *, entry: ConfigEntry, session: OAuth2Session
+        self, hass: HomeAssistant, entry: ConfigEntry, session: OAuth2Session
     ) -> None:
         """Initialize global Toon data updater."""
         self.session = session
-        self.entry = entry
 
         async def async_token_refresh() -> str:
             await session.async_ensure_token_valid()
@@ -46,49 +47,55 @@ class ToonDataUpdateCoordinator(DataUpdateCoordinator[Status]):
         )
 
         super().__init__(
-            hass, _LOGGER, name=DOMAIN, update_interval=DEFAULT_SCAN_INTERVAL
+            hass,
+            _LOGGER,
+            config_entry=entry,
+            name=DOMAIN,
+            update_interval=DEFAULT_SCAN_INTERVAL,
         )
 
     async def register_webhook(self, event: Event | None = None) -> None:
         """Register a webhook with Toon to get live updates."""
-        if CONF_WEBHOOK_ID not in self.entry.data:
-            data = {**self.entry.data, CONF_WEBHOOK_ID: secrets.token_hex()}
-            self.hass.config_entries.async_update_entry(self.entry, data=data)
+        if CONF_WEBHOOK_ID not in self.config_entry.data:
+            data = {**self.config_entry.data, CONF_WEBHOOK_ID: secrets.token_hex()}
+            self.hass.config_entries.async_update_entry(self.config_entry, data=data)
 
         if cloud.async_active_subscription(self.hass):
-            if CONF_CLOUDHOOK_URL not in self.entry.data:
+            if CONF_CLOUDHOOK_URL not in self.config_entry.data:
                 try:
                     webhook_url = await cloud.async_create_cloudhook(
-                        self.hass, self.entry.data[CONF_WEBHOOK_ID]
+                        self.hass, self.config_entry.data[CONF_WEBHOOK_ID]
                     )
                 except cloud.CloudNotConnected:
                     webhook_url = webhook.async_generate_url(
-                        self.hass, self.entry.data[CONF_WEBHOOK_ID]
+                        self.hass, self.config_entry.data[CONF_WEBHOOK_ID]
                     )
                 else:
-                    data = {**self.entry.data, CONF_CLOUDHOOK_URL: webhook_url}
-                    self.hass.config_entries.async_update_entry(self.entry, data=data)
+                    data = {**self.config_entry.data, CONF_CLOUDHOOK_URL: webhook_url}
+                    self.hass.config_entries.async_update_entry(
+                        self.config_entry, data=data
+                    )
             else:
-                webhook_url = self.entry.data[CONF_CLOUDHOOK_URL]
+                webhook_url = self.config_entry.data[CONF_CLOUDHOOK_URL]
         else:
             webhook_url = webhook.async_generate_url(
-                self.hass, self.entry.data[CONF_WEBHOOK_ID]
+                self.hass, self.config_entry.data[CONF_WEBHOOK_ID]
             )
 
         # Ensure the webhook is not registered already
-        webhook_unregister(self.hass, self.entry.data[CONF_WEBHOOK_ID])
+        webhook_unregister(self.hass, self.config_entry.data[CONF_WEBHOOK_ID])
 
         webhook_register(
             self.hass,
             DOMAIN,
             "Toon",
-            self.entry.data[CONF_WEBHOOK_ID],
+            self.config_entry.data[CONF_WEBHOOK_ID],
             self.handle_webhook,
         )
 
         try:
             await self.toon.subscribe_webhook(
-                application_id=self.entry.entry_id, url=webhook_url
+                application_id=self.config_entry.entry_id, url=webhook_url
             )
             _LOGGER.debug("Registered Toon webhook: %s", webhook_url)
         except ToonError as err:
@@ -131,14 +138,14 @@ class ToonDataUpdateCoordinator(DataUpdateCoordinator[Status]):
     async def unregister_webhook(self, event: Event | None = None) -> None:
         """Remove / Unregister webhook for toon."""
         _LOGGER.debug(
-            "Unregistering Toon webhook (%s)", self.entry.data[CONF_WEBHOOK_ID]
+            "Unregistering Toon webhook (%s)", self.config_entry.data[CONF_WEBHOOK_ID]
         )
         try:
-            await self.toon.unsubscribe_webhook(self.entry.entry_id)
+            await self.toon.unsubscribe_webhook(self.config_entry.entry_id)
         except ToonError as err:
             _LOGGER.error("Failed unregistering Toon webhook - %s", err)
 
-        webhook_unregister(self.hass, self.entry.data[CONF_WEBHOOK_ID])
+        webhook_unregister(self.hass, self.config_entry.data[CONF_WEBHOOK_ID])
 
     async def _async_update_data(self) -> Status:
         """Fetch data from Toon."""
diff --git a/homeassistant/components/toon/sensor.py b/homeassistant/components/toon/sensor.py
index 09f36c88079..e5b155b409b 100644
--- a/homeassistant/components/toon/sensor.py
+++ b/homeassistant/components/toon/sensor.py
@@ -19,7 +19,7 @@ from homeassistant.const import (
     UnitOfVolume,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CURRENCY_EUR, DOMAIN, VOLUME_CM3, VOLUME_LMIN
 from .coordinator import ToonDataUpdateCoordinator
@@ -36,7 +36,9 @@ from .entity import (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Toon sensors based on a config entry."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/toon/switch.py b/homeassistant/components/toon/switch.py
index deb2a12f2d0..d59a542d4d8 100644
--- a/homeassistant/components/toon/switch.py
+++ b/homeassistant/components/toon/switch.py
@@ -15,7 +15,7 @@ from toonapi import (
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import ToonDataUpdateCoordinator
@@ -24,7 +24,9 @@ from .helpers import toon_exception_handler
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Toon switches based on a config entry."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/torque/sensor.py b/homeassistant/components/torque/sensor.py
index 543046fac1c..8d4183e2961 100644
--- a/homeassistant/components/torque/sensor.py
+++ b/homeassistant/components/torque/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_EMAIL, CONF_NAME, DEGREE
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/totalconnect/__init__.py b/homeassistant/components/totalconnect/__init__.py
index 9f291ea15a6..a481fd41c84 100644
--- a/homeassistant/components/totalconnect/__init__.py
+++ b/homeassistant/components/totalconnect/__init__.py
@@ -3,18 +3,15 @@
 from total_connect_client.client import TotalConnectClient
 from total_connect_client.exceptions import AuthenticationError
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 
 from .const import AUTO_BYPASS, CONF_USERCODES
-from .coordinator import TotalConnectDataUpdateCoordinator
+from .coordinator import TotalConnectConfigEntry, TotalConnectDataUpdateCoordinator
 
 PLATFORMS = [Platform.ALARM_CONTROL_PANEL, Platform.BINARY_SENSOR, Platform.BUTTON]
 
-type TotalConnectConfigEntry = ConfigEntry[TotalConnectDataUpdateCoordinator]
-
 
 async def async_setup_entry(
     hass: HomeAssistant, entry: TotalConnectConfigEntry
@@ -41,7 +38,7 @@ async def async_setup_entry(
             "TotalConnect authentication failed during setup"
         ) from exception
 
-    coordinator = TotalConnectDataUpdateCoordinator(hass, client)
+    coordinator = TotalConnectDataUpdateCoordinator(hass, entry, client)
     await coordinator.async_config_entry_first_refresh()
 
     entry.runtime_data = coordinator
diff --git a/homeassistant/components/totalconnect/alarm_control_panel.py b/homeassistant/components/totalconnect/alarm_control_panel.py
index 48ba78acc92..9ed29ea01c8 100644
--- a/homeassistant/components/totalconnect/alarm_control_panel.py
+++ b/homeassistant/components/totalconnect/alarm_control_panel.py
@@ -12,14 +12,13 @@ from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelState,
     CodeFormat,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CODE_REQUIRED, DOMAIN
-from .coordinator import TotalConnectDataUpdateCoordinator
+from .coordinator import TotalConnectConfigEntry, TotalConnectDataUpdateCoordinator
 from .entity import TotalConnectLocationEntity
 
 SERVICE_ALARM_ARM_AWAY_INSTANT = "arm_away_instant"
@@ -27,7 +26,9 @@ SERVICE_ALARM_ARM_HOME_INSTANT = "arm_home_instant"
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TotalConnectConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up TotalConnect alarm panels based on a config entry."""
     coordinator = entry.runtime_data
@@ -73,7 +74,7 @@ class TotalConnectAlarm(TotalConnectLocationEntity, AlarmControlPanelEntity):
     ) -> None:
         """Initialize the TotalConnect status."""
         super().__init__(coordinator, location)
-        self._partition_id = partition_id
+        self._partition_id = int(partition_id)
         self._partition = self._location.partitions[partition_id]
 
         """
@@ -81,7 +82,7 @@ class TotalConnectAlarm(TotalConnectLocationEntity, AlarmControlPanelEntity):
         for most users with new support for partitions.
         Add _# for partition 2 and beyond.
         """
-        if partition_id == 1:
+        if int(partition_id) == 1:
             self._attr_name = None
             self._attr_unique_id = str(location.location_id)
         else:
diff --git a/homeassistant/components/totalconnect/binary_sensor.py b/homeassistant/components/totalconnect/binary_sensor.py
index 9a3c2558999..2f3802dc9a6 100644
--- a/homeassistant/components/totalconnect/binary_sensor.py
+++ b/homeassistant/components/totalconnect/binary_sensor.py
@@ -12,12 +12,11 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import TotalConnectDataUpdateCoordinator
+from .coordinator import TotalConnectConfigEntry, TotalConnectDataUpdateCoordinator
 from .entity import TotalConnectLocationEntity, TotalConnectZoneEntity
 
 LOW_BATTERY = "low_battery"
@@ -119,7 +118,9 @@ LOCATION_BINARY_SENSORS: tuple[TotalConnectAlarmBinarySensorEntityDescription, .
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TotalConnectConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up TotalConnect device sensors based on a config entry."""
     sensors: list = []
diff --git a/homeassistant/components/totalconnect/button.py b/homeassistant/components/totalconnect/button.py
index e228f03ec6b..eb85dcce1bf 100644
--- a/homeassistant/components/totalconnect/button.py
+++ b/homeassistant/components/totalconnect/button.py
@@ -7,12 +7,11 @@ from total_connect_client.location import TotalConnectLocation
 from total_connect_client.zone import TotalConnectZone
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import TotalConnectDataUpdateCoordinator
+from .coordinator import TotalConnectConfigEntry, TotalConnectDataUpdateCoordinator
 from .entity import TotalConnectLocationEntity, TotalConnectZoneEntity
 
 
@@ -38,7 +37,9 @@ PANEL_BUTTONS: tuple[TotalConnectButtonEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TotalConnectConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up TotalConnect buttons based on a config entry."""
     buttons: list = []
diff --git a/homeassistant/components/totalconnect/coordinator.py b/homeassistant/components/totalconnect/coordinator.py
index 9b500db1951..673c168d204 100644
--- a/homeassistant/components/totalconnect/coordinator.py
+++ b/homeassistant/components/totalconnect/coordinator.py
@@ -20,17 +20,28 @@ from .const import DOMAIN
 SCAN_INTERVAL = timedelta(seconds=30)
 _LOGGER = logging.getLogger(__name__)
 
+type TotalConnectConfigEntry = ConfigEntry[TotalConnectDataUpdateCoordinator]
+
 
 class TotalConnectDataUpdateCoordinator(DataUpdateCoordinator[None]):
     """Class to fetch data from TotalConnect."""
 
-    config_entry: ConfigEntry
+    config_entry: TotalConnectConfigEntry
 
-    def __init__(self, hass: HomeAssistant, client: TotalConnectClient) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: TotalConnectConfigEntry,
+        client: TotalConnectClient,
+    ) -> None:
         """Initialize."""
         self.client = client
         super().__init__(
-            hass, logger=_LOGGER, name=DOMAIN, update_interval=SCAN_INTERVAL
+            hass,
+            logger=_LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=SCAN_INTERVAL,
         )
 
     async def _async_update_data(self) -> None:
diff --git a/homeassistant/components/totalconnect/diagnostics.py b/homeassistant/components/totalconnect/diagnostics.py
index 85f52ccc670..fc310bf850c 100644
--- a/homeassistant/components/totalconnect/diagnostics.py
+++ b/homeassistant/components/totalconnect/diagnostics.py
@@ -5,9 +5,10 @@ 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
 
+from .coordinator import TotalConnectConfigEntry
+
 TO_REDACT = [
     "username",
     "Password",
@@ -22,7 +23,7 @@ TO_REDACT = [
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, config_entry: ConfigEntry
+    hass: HomeAssistant, config_entry: TotalConnectConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
     client = config_entry.runtime_data.client
@@ -82,6 +83,7 @@ async def async_get_config_entry_diagnostics(
                 "is_new_partition": partition.is_new_partition,
                 "is_night_stay_enabled": partition.is_night_stay_enabled,
                 "exit_delay_timer": partition.exit_delay_timer,
+                "arming_state": partition.arming_state,
             }
             new_location["partitions"].append(new_partition)
 
diff --git a/homeassistant/components/totalconnect/manifest.json b/homeassistant/components/totalconnect/manifest.json
index 33306a7adba..6aff1ea392b 100644
--- a/homeassistant/components/totalconnect/manifest.json
+++ b/homeassistant/components/totalconnect/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/totalconnect",
   "iot_class": "cloud_polling",
   "loggers": ["total_connect_client"],
-  "requirements": ["total-connect-client==2024.12"]
+  "requirements": ["total-connect-client==2025.1.4"]
 }
diff --git a/homeassistant/components/touchline/climate.py b/homeassistant/components/touchline/climate.py
index e9d27341cb7..86526f4718b 100644
--- a/homeassistant/components/touchline/climate.py
+++ b/homeassistant/components/touchline/climate.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import Any, NamedTuple
 
-from pytouchline import PyTouchline
+from pytouchline_extended import PyTouchline
 import voluptuous as vol
 
 from homeassistant.components.climate import (
@@ -15,7 +15,7 @@ from homeassistant.components.climate import (
 )
 from homeassistant.const import ATTR_TEMPERATURE, CONF_HOST, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
@@ -53,12 +53,13 @@ def setup_platform(
     """Set up the Touchline devices."""
 
     host = config[CONF_HOST]
-    py_touchline = PyTouchline()
-    number_of_devices = int(py_touchline.get_number_of_devices(host))
-    add_entities(
-        (Touchline(PyTouchline(device_id)) for device_id in range(number_of_devices)),
-        True,
-    )
+    py_touchline = PyTouchline(url=host)
+    number_of_devices = int(py_touchline.get_number_of_devices())
+    devices = [
+        Touchline(PyTouchline(id=device_id, url=host))
+        for device_id in range(number_of_devices)
+    ]
+    add_entities(devices, True)
 
 
 class Touchline(ClimateEntity):
diff --git a/homeassistant/components/touchline/manifest.json b/homeassistant/components/touchline/manifest.json
index c003cca97a4..6d25462408b 100644
--- a/homeassistant/components/touchline/manifest.json
+++ b/homeassistant/components/touchline/manifest.json
@@ -6,5 +6,5 @@
   "iot_class": "local_polling",
   "loggers": ["pytouchline"],
   "quality_scale": "legacy",
-  "requirements": ["pytouchline==0.7"]
+  "requirements": ["pytouchline_extended==0.4.5"]
 }
diff --git a/homeassistant/components/touchline_sl/__init__.py b/homeassistant/components/touchline_sl/__init__.py
index 45a85185673..ba1da06ed5a 100644
--- a/homeassistant/components/touchline_sl/__init__.py
+++ b/homeassistant/components/touchline_sl/__init__.py
@@ -6,18 +6,15 @@ import asyncio
 
 from pytouchlinesl import TouchlineSL
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 
 from .const import DOMAIN
-from .coordinator import TouchlineSLModuleCoordinator
+from .coordinator import TouchlineSLConfigEntry, TouchlineSLModuleCoordinator
 
 PLATFORMS: list[Platform] = [Platform.CLIMATE]
 
-type TouchlineSLConfigEntry = ConfigEntry[list[TouchlineSLModuleCoordinator]]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: TouchlineSLConfigEntry) -> bool:
     """Set up Roth Touchline SL from a config entry."""
@@ -26,7 +23,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: TouchlineSLConfigEntry)
     )
 
     coordinators: list[TouchlineSLModuleCoordinator] = [
-        TouchlineSLModuleCoordinator(hass, module) for module in await account.modules()
+        TouchlineSLModuleCoordinator(hass, entry, module)
+        for module in await account.modules()
     ]
 
     await asyncio.gather(
diff --git a/homeassistant/components/touchline_sl/climate.py b/homeassistant/components/touchline_sl/climate.py
index 8a0ffc4cd86..7c5ea4ea9ca 100644
--- a/homeassistant/components/touchline_sl/climate.py
+++ b/homeassistant/components/touchline_sl/climate.py
@@ -10,17 +10,16 @@ from homeassistant.components.climate import (
 )
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import TouchlineSLConfigEntry
-from .coordinator import TouchlineSLModuleCoordinator
+from .coordinator import TouchlineSLConfigEntry, TouchlineSLModuleCoordinator
 from .entity import TouchlineSLZoneEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TouchlineSLConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Touchline devices."""
     coordinators = entry.runtime_data
diff --git a/homeassistant/components/touchline_sl/coordinator.py b/homeassistant/components/touchline_sl/coordinator.py
index cd74ba6130f..dce616a81b3 100644
--- a/homeassistant/components/touchline_sl/coordinator.py
+++ b/homeassistant/components/touchline_sl/coordinator.py
@@ -10,6 +10,7 @@ from pytouchlinesl import Module, Zone
 from pytouchlinesl.client import RothAPIError
 from pytouchlinesl.client.models import GlobalScheduleModel
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -26,14 +27,22 @@ class TouchlineSLModuleData:
     schedules: dict[str, GlobalScheduleModel]
 
 
+type TouchlineSLConfigEntry = ConfigEntry[list[TouchlineSLModuleCoordinator]]
+
+
 class TouchlineSLModuleCoordinator(DataUpdateCoordinator[TouchlineSLModuleData]):
     """A coordinator to manage the fetching of Touchline SL data."""
 
-    def __init__(self, hass: HomeAssistant, module: Module) -> None:
+    config_entry: TouchlineSLConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: TouchlineSLConfigEntry, module: Module
+    ) -> None:
         """Initialize coordinator."""
         super().__init__(
             hass,
             logger=_LOGGER,
+            config_entry=config_entry,
             name=f"Touchline SL ({module.name})",
             update_interval=timedelta(seconds=30),
         )
diff --git a/homeassistant/components/tplink/binary_sensor.py b/homeassistant/components/tplink/binary_sensor.py
index e08495f5c88..38935595fe2 100644
--- a/homeassistant/components/tplink/binary_sensor.py
+++ b/homeassistant/components/tplink/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TPLinkConfigEntry
 from .entity import CoordinatedTPLinkFeatureEntity, TPLinkFeatureEntityDescription
@@ -35,6 +35,10 @@ BINARY_SENSOR_DESCRIPTIONS: Final = (
         key="overheated",
         device_class=BinarySensorDeviceClass.PROBLEM,
     ),
+    TPLinkBinarySensorEntityDescription(
+        key="overloaded",
+        device_class=BinarySensorDeviceClass.PROBLEM,
+    ),
     TPLinkBinarySensorEntityDescription(
         key="battery_low",
         device_class=BinarySensorDeviceClass.BATTERY,
@@ -69,7 +73,7 @@ BINARYSENSOR_DESCRIPTIONS_MAP = {desc.key: desc for desc in BINARY_SENSOR_DESCRI
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: TPLinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/tplink/button.py b/homeassistant/components/tplink/button.py
index 0a4517b967d..145adb79185 100644
--- a/homeassistant/components/tplink/button.py
+++ b/homeassistant/components/tplink/button.py
@@ -15,7 +15,7 @@ from homeassistant.components.button import (
 )
 from homeassistant.components.siren import DOMAIN as SIREN_DOMAIN
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TPLinkConfigEntry
 from .deprecate import DeprecatedInfo
@@ -70,6 +70,23 @@ BUTTON_DESCRIPTIONS: Final = [
         key="tilt_down",
         available_fn=lambda dev: dev.is_on,
     ),
+    TPLinkButtonEntityDescription(key="pair"),
+    TPLinkButtonEntityDescription(key="unpair"),
+    TPLinkButtonEntityDescription(
+        key="main_brush_reset",
+    ),
+    TPLinkButtonEntityDescription(
+        key="side_brush_reset",
+    ),
+    TPLinkButtonEntityDescription(
+        key="sensor_reset",
+    ),
+    TPLinkButtonEntityDescription(
+        key="filter_reset",
+    ),
+    TPLinkButtonEntityDescription(
+        key="charging_contacts_reset",
+    ),
 ]
 
 BUTTON_DESCRIPTIONS_MAP = {desc.key: desc for desc in BUTTON_DESCRIPTIONS}
@@ -78,7 +95,7 @@ BUTTON_DESCRIPTIONS_MAP = {desc.key: desc for desc in BUTTON_DESCRIPTIONS}
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: TPLinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up buttons."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/tplink/camera.py b/homeassistant/components/tplink/camera.py
index b0f1f1a62c1..7b59678da8e 100644
--- a/homeassistant/components/tplink/camera.py
+++ b/homeassistant/components/tplink/camera.py
@@ -19,7 +19,7 @@ from homeassistant.components.camera import (
 from homeassistant.config_entries import ConfigFlowContext
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.aiohttp_client import async_aiohttp_proxy_stream
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TPLinkConfigEntry
 from .const import CONF_CAMERA_CREDENTIALS
@@ -59,7 +59,7 @@ CAMERA_DESCRIPTIONS: tuple[TPLinkCameraEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: TPLinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up camera entities."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/tplink/climate.py b/homeassistant/components/tplink/climate.py
index 7204c2a7665..66037d7476e 100644
--- a/homeassistant/components/tplink/climate.py
+++ b/homeassistant/components/tplink/climate.py
@@ -22,7 +22,7 @@ from homeassistant.components.climate import (
 from homeassistant.const import PRECISION_TENTHS, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TPLinkConfigEntry, legacy_device_id
 from .const import DOMAIN, UNIT_MAPPING
@@ -71,7 +71,7 @@ CLIMATE_DESCRIPTIONS: tuple[TPLinkClimateEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: TPLinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up climate entities."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/tplink/config_flow.py b/homeassistant/components/tplink/config_flow.py
index 9ca2fe80cf9..291a7e78c62 100644
--- a/homeassistant/components/tplink/config_flow.py
+++ b/homeassistant/components/tplink/config_flow.py
@@ -328,7 +328,7 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
 
             host, port = self._async_get_host_port(host)
 
-            match_dict = {CONF_HOST: host}
+            match_dict: dict[str, Any] = {CONF_HOST: host}
             if port:
                 self.port = port
                 match_dict[CONF_PORT] = port
diff --git a/homeassistant/components/tplink/const.py b/homeassistant/components/tplink/const.py
index 61c1bf1cb9b..2df7101791a 100644
--- a/homeassistant/components/tplink/const.py
+++ b/homeassistant/components/tplink/const.py
@@ -4,7 +4,9 @@ from __future__ import annotations
 
 from typing import Final
 
-from homeassistant.const import Platform, UnitOfTemperature
+from kasa.smart.modules.clean import AreaUnit
+
+from homeassistant.const import Platform, UnitOfArea, UnitOfTemperature
 
 DOMAIN = "tplink"
 
@@ -41,9 +43,12 @@ PLATFORMS: Final = [
     Platform.SENSOR,
     Platform.SIREN,
     Platform.SWITCH,
+    Platform.VACUUM,
 ]
 
 UNIT_MAPPING = {
     "celsius": UnitOfTemperature.CELSIUS,
     "fahrenheit": UnitOfTemperature.FAHRENHEIT,
+    AreaUnit.Sqm: UnitOfArea.SQUARE_METERS,
+    AreaUnit.Sqft: UnitOfArea.SQUARE_FEET,
 }
diff --git a/homeassistant/components/tplink/coordinator.py b/homeassistant/components/tplink/coordinator.py
index 186840e8faf..1a7b40457f0 100644
--- a/homeassistant/components/tplink/coordinator.py
+++ b/homeassistant/components/tplink/coordinator.py
@@ -9,6 +9,7 @@ import logging
 from kasa import AuthenticationError, Credentials, Device, KasaException
 from kasa.iot import IotStrip
 
+from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
@@ -49,6 +50,12 @@ class TPLinkDataUpdateCoordinator(DataUpdateCoordinator[None]):
     ) -> None:
         """Initialize DataUpdateCoordinator to gather data for specific SmartPlug."""
         self.device = device
+
+        # The iot HS300 allows a limited number of concurrent requests and
+        # fetching the emeter information requires separate ones, so child
+        # coordinators are created below in get_child_coordinator.
+        self._update_children = not isinstance(device, IotStrip)
+
         super().__init__(
             hass,
             _LOGGER,
@@ -68,7 +75,7 @@ class TPLinkDataUpdateCoordinator(DataUpdateCoordinator[None]):
     async def _async_update_data(self) -> None:
         """Fetch all device and sensor data from api."""
         try:
-            await self.device.update(update_children=False)
+            await self.device.update(update_children=self._update_children)
         except AuthenticationError as ex:
             raise ConfigEntryAuthFailed(
                 translation_domain=DOMAIN,
@@ -117,11 +124,14 @@ class TPLinkDataUpdateCoordinator(DataUpdateCoordinator[None]):
     def get_child_coordinator(
         self,
         child: Device,
+        platform_domain: str,
     ) -> TPLinkDataUpdateCoordinator:
         """Get separate child coordinator for a device or self if not needed."""
         # The iot HS300 allows a limited number of concurrent requests and fetching the
         # emeter information requires separate ones so create child coordinators here.
-        if isinstance(self.device, IotStrip):
+        # This does not happen for switches as the state is available on the
+        # parent device info.
+        if isinstance(self.device, IotStrip) and platform_domain != SWITCH_DOMAIN:
             if not (child_coordinator := self._child_coordinators.get(child.device_id)):
                 # The child coordinators only update energy data so we can
                 # set a longer update interval to avoid flooding the device
diff --git a/homeassistant/components/tplink/entity.py b/homeassistant/components/tplink/entity.py
index edef8bd83a0..7c1e9e72b85 100644
--- a/homeassistant/components/tplink/entity.py
+++ b/homeassistant/components/tplink/entity.py
@@ -59,6 +59,7 @@ DEVICETYPES_WITH_SPECIALIZED_PLATFORMS = {
     DeviceType.Dimmer,
     DeviceType.Fan,
     DeviceType.Thermostat,
+    DeviceType.Vacuum,
 }
 
 # Primary features to always include even when the device type has its own platform
@@ -109,6 +110,9 @@ class TPLinkModuleEntityDescription(TPLinkEntityDescription):
     unique_id_fn: Callable[[Device, TPLinkModuleEntityDescription], str] = (
         lambda device, desc: f"{legacy_device_id(device)}-{desc.key}"
     )
+    entity_name_fn: (
+        Callable[[Device, TPLinkModuleEntityDescription], str | None] | None
+    ) = None
 
 
 def async_refresh_after[_T: CoordinatedTPLinkEntity, **_P](
@@ -504,7 +508,9 @@ class CoordinatedTPLinkFeatureEntity(CoordinatedTPLinkEntity, ABC):
             )
 
         for child in children:
-            child_coordinator = coordinator.get_child_coordinator(child)
+            child_coordinator = coordinator.get_child_coordinator(
+                child, platform_domain
+            )
 
             child_entities = cls._entities_for_device(
                 hass,
@@ -549,7 +555,9 @@ class CoordinatedTPLinkModuleEntity(CoordinatedTPLinkEntity, ABC):
         # the description should have a translation key.
         # HA logic is to name entities based on the following logic:
         # _attr_name > translation.name > description.name
-        if not description.translation_key:
+        if entity_name_fn := description.entity_name_fn:
+            self._attr_name = entity_name_fn(device, description)
+        elif not description.translation_key:
             if parent is None or parent.device_type is Device.Type.Hub:
                 self._attr_name = None
             else:
@@ -645,7 +653,9 @@ class CoordinatedTPLinkModuleEntity(CoordinatedTPLinkEntity, ABC):
                 device.host,
             )
         for child in children:
-            child_coordinator = coordinator.get_child_coordinator(child)
+            child_coordinator = coordinator.get_child_coordinator(
+                child, platform_domain
+            )
 
             child_entities: list[_E] = cls._entities_for_device(
                 hass,
diff --git a/homeassistant/components/tplink/fan.py b/homeassistant/components/tplink/fan.py
index 1c31d84b778..88396742b36 100644
--- a/homeassistant/components/tplink/fan.py
+++ b/homeassistant/components/tplink/fan.py
@@ -15,7 +15,7 @@ from homeassistant.components.fan import (
     FanEntityFeature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
     ranged_value_to_percentage,
@@ -59,7 +59,7 @@ FAN_DESCRIPTIONS: tuple[TPLinkFanEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: TPLinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up fans."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/tplink/icons.json b/homeassistant/components/tplink/icons.json
index e00e8f69467..73bb40a8386 100644
--- a/homeassistant/components/tplink/icons.json
+++ b/homeassistant/components/tplink/icons.json
@@ -32,7 +32,20 @@
       },
       "tilt_down": {
         "default": "mdi:chevron-down"
-      }
+      },
+      "main_brush_reset": {
+        "default": "mdi:brush"
+      },
+      "side_brush_reset": {
+        "default": "mdi:brush"
+      },
+      "sensor_reset": {
+        "default": "mdi:eye-outline"
+      },
+      "filter_reset": {
+        "default": "mdi:air-filter"
+      },
+      "charging_contacts_reset": {}
     },
     "select": {
       "light_preset": {
@@ -113,6 +126,9 @@
         "state": {
           "on": "mdi:baby-face"
         }
+      },
+      "carpet_boost": {
+        "default": "mdi:rug"
       }
     },
     "sensor": {
@@ -130,6 +146,35 @@
       },
       "water_alert_timestamp": {
         "default": "mdi:clock-alert-outline"
+      },
+      "main_brush_remaining": {
+        "default": "mdi:brush"
+      },
+      "main_brush_used": {
+        "default": "mdi:brush"
+      },
+      "side_brush_remaining": {
+        "default": "mdi:brush"
+      },
+      "side_brush_used": {
+        "default": "mdi:brush"
+      },
+      "filter_remaining": {
+        "default": "mdi:air-filter"
+      },
+      "filter_used": {
+        "default": "mdi:air-filter"
+      },
+      "sensor_remaining": {
+        "default": "mdi:eye-outline"
+      },
+      "sensor_used": {
+        "default": "mdi:eye-outline"
+      },
+      "charging_contacts_remaining": {},
+      "charging_contacts_used": {},
+      "vacuum_error": {
+        "default": "mdi:alert-circle"
       }
     },
     "number": {
@@ -150,6 +195,9 @@
       },
       "tilt_step": {
         "default": "mdi:unfold-more-horizontal"
+      },
+      "clean_count": {
+        "default": "mdi:counter"
       }
     }
   },
diff --git a/homeassistant/components/tplink/light.py b/homeassistant/components/tplink/light.py
index c1311c256df..b3cee1d3baf 100644
--- a/homeassistant/components/tplink/light.py
+++ b/homeassistant/components/tplink/light.py
@@ -28,8 +28,8 @@ from homeassistant.components.light import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import VolDictType
 
 from . import TPLinkConfigEntry, legacy_device_id
@@ -196,7 +196,7 @@ LIGHT_EFFECT_DESCRIPTIONS: tuple[TPLinkLightEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: TPLinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up lights."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/tplink/manifest.json b/homeassistant/components/tplink/manifest.json
index a975e675ceb..cdd6ab57c6a 100644
--- a/homeassistant/components/tplink/manifest.json
+++ b/homeassistant/components/tplink/manifest.json
@@ -300,5 +300,6 @@
   "documentation": "https://www.home-assistant.io/integrations/tplink",
   "iot_class": "local_polling",
   "loggers": ["kasa"],
-  "requirements": ["python-kasa[speedups]==0.9.1"]
+  "quality_scale": "platinum",
+  "requirements": ["python-kasa[speedups]==0.10.2"]
 }
diff --git a/homeassistant/components/tplink/number.py b/homeassistant/components/tplink/number.py
index 0af2b7403e8..252c4888d26 100644
--- a/homeassistant/components/tplink/number.py
+++ b/homeassistant/components/tplink/number.py
@@ -15,7 +15,7 @@ from homeassistant.components.number import (
     NumberMode,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TPLinkConfigEntry
 from .entity import (
@@ -65,6 +65,14 @@ NUMBER_DESCRIPTIONS: Final = (
         key="tilt_step",
         mode=NumberMode.BOX,
     ),
+    TPLinkNumberEntityDescription(
+        key="power_protection_threshold",
+        mode=NumberMode.SLIDER,
+    ),
+    TPLinkNumberEntityDescription(
+        key="clean_count",
+        mode=NumberMode.SLIDER,
+    ),
 )
 
 NUMBER_DESCRIPTIONS_MAP = {desc.key: desc for desc in NUMBER_DESCRIPTIONS}
@@ -73,7 +81,7 @@ NUMBER_DESCRIPTIONS_MAP = {desc.key: desc for desc in NUMBER_DESCRIPTIONS}
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: TPLinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up number entities."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/tplink/quality_scale.yaml b/homeassistant/components/tplink/quality_scale.yaml
index ced9cbcc831..f120945771c 100644
--- a/homeassistant/components/tplink/quality_scale.yaml
+++ b/homeassistant/components/tplink/quality_scale.yaml
@@ -44,12 +44,12 @@ rules:
   entity-category: done
   entity-disabled-by-default: done
   discovery: done
-  stale-devices: todo
+  stale-devices: done
   diagnostics: done
   exception-translations: done
   icon-translations: done
   reconfiguration-flow: done
-  dynamic-devices: todo
+  dynamic-devices: done
   discovery-update-info: done
   repair-issues: done
   docs-use-cases: done
diff --git a/homeassistant/components/tplink/select.py b/homeassistant/components/tplink/select.py
index 8e9dee7b964..72042f571e6 100644
--- a/homeassistant/components/tplink/select.py
+++ b/homeassistant/components/tplink/select.py
@@ -13,7 +13,7 @@ from homeassistant.components.select import (
     SelectEntityDescription,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TPLinkConfigEntry
 from .entity import (
@@ -53,7 +53,7 @@ SELECT_DESCRIPTIONS_MAP = {desc.key: desc for desc in SELECT_DESCRIPTIONS}
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: TPLinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up select entities."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/tplink/sensor.py b/homeassistant/components/tplink/sensor.py
index aaba6b2674d..cc35b1fd142 100644
--- a/homeassistant/components/tplink/sensor.py
+++ b/homeassistant/components/tplink/sensor.py
@@ -2,10 +2,13 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, cast
+from operator import methodcaller
+from typing import TYPE_CHECKING, Any, cast
 
 from kasa import Feature
+from kasa.smart.modules.clean import ErrorCode as VacuumError
 
 from homeassistant.components.sensor import (
     DOMAIN as SENSOR_DOMAIN,
@@ -14,8 +17,9 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
+from homeassistant.const import UnitOfTime
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TPLinkConfigEntry
 from .const import UNIT_MAPPING
@@ -28,10 +32,15 @@ class TPLinkSensorEntityDescription(
 ):
     """Base class for a TPLink feature based sensor entity description."""
 
+    #: Optional callable to convert the value
+    convert_fn: Callable[[Any], Any] | None = None
+
 
 # Coordinator is used to centralize the data updates
 PARALLEL_UPDATES = 0
 
+_TOTAL_SECONDS_METHOD_CALLER = methodcaller("total_seconds")
+
 SENSOR_DESCRIPTIONS: tuple[TPLinkSensorEntityDescription, ...] = (
     TPLinkSensorEntityDescription(
         key="current_consumption",
@@ -115,6 +124,145 @@ SENSOR_DESCRIPTIONS: tuple[TPLinkSensorEntityDescription, ...] = (
     TPLinkSensorEntityDescription(
         key="alarm_source",
     ),
+    # Vacuum cleaning records
+    TPLinkSensorEntityDescription(
+        key="clean_time",
+        device_class=SensorDeviceClass.DURATION,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.MINUTES,
+        convert_fn=_TOTAL_SECONDS_METHOD_CALLER,
+    ),
+    TPLinkSensorEntityDescription(
+        key="clean_area",
+        device_class=SensorDeviceClass.AREA,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    TPLinkSensorEntityDescription(
+        entity_registry_enabled_default=False,
+        key="clean_progress",
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    TPLinkSensorEntityDescription(
+        key="last_clean_time",
+        device_class=SensorDeviceClass.DURATION,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.MINUTES,
+        convert_fn=_TOTAL_SECONDS_METHOD_CALLER,
+    ),
+    TPLinkSensorEntityDescription(
+        key="last_clean_area",
+        device_class=SensorDeviceClass.AREA,
+    ),
+    TPLinkSensorEntityDescription(
+        key="last_clean_timestamp",
+        device_class=SensorDeviceClass.TIMESTAMP,
+    ),
+    TPLinkSensorEntityDescription(
+        entity_registry_enabled_default=False,
+        key="total_clean_time",
+        device_class=SensorDeviceClass.DURATION,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.MINUTES,
+        convert_fn=_TOTAL_SECONDS_METHOD_CALLER,
+    ),
+    TPLinkSensorEntityDescription(
+        entity_registry_enabled_default=False,
+        key="total_clean_area",
+        device_class=SensorDeviceClass.AREA,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+    ),
+    TPLinkSensorEntityDescription(
+        key="total_clean_count",
+        state_class=SensorStateClass.TOTAL_INCREASING,
+    ),
+    TPLinkSensorEntityDescription(
+        entity_registry_enabled_default=False,
+        key="main_brush_remaining",
+        device_class=SensorDeviceClass.DURATION,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
+        convert_fn=_TOTAL_SECONDS_METHOD_CALLER,
+    ),
+    TPLinkSensorEntityDescription(
+        entity_registry_enabled_default=False,
+        key="main_brush_used",
+        device_class=SensorDeviceClass.DURATION,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
+        convert_fn=_TOTAL_SECONDS_METHOD_CALLER,
+    ),
+    TPLinkSensorEntityDescription(
+        entity_registry_enabled_default=False,
+        key="side_brush_remaining",
+        device_class=SensorDeviceClass.DURATION,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
+        convert_fn=_TOTAL_SECONDS_METHOD_CALLER,
+    ),
+    TPLinkSensorEntityDescription(
+        entity_registry_enabled_default=False,
+        key="side_brush_used",
+        device_class=SensorDeviceClass.DURATION,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
+        convert_fn=_TOTAL_SECONDS_METHOD_CALLER,
+    ),
+    TPLinkSensorEntityDescription(
+        entity_registry_enabled_default=False,
+        key="filter_remaining",
+        device_class=SensorDeviceClass.DURATION,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
+        convert_fn=_TOTAL_SECONDS_METHOD_CALLER,
+    ),
+    TPLinkSensorEntityDescription(
+        entity_registry_enabled_default=False,
+        key="filter_used",
+        device_class=SensorDeviceClass.DURATION,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
+        convert_fn=_TOTAL_SECONDS_METHOD_CALLER,
+    ),
+    TPLinkSensorEntityDescription(
+        entity_registry_enabled_default=False,
+        key="sensor_remaining",
+        device_class=SensorDeviceClass.DURATION,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
+        convert_fn=_TOTAL_SECONDS_METHOD_CALLER,
+    ),
+    TPLinkSensorEntityDescription(
+        entity_registry_enabled_default=False,
+        key="sensor_used",
+        device_class=SensorDeviceClass.DURATION,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
+        convert_fn=_TOTAL_SECONDS_METHOD_CALLER,
+    ),
+    TPLinkSensorEntityDescription(
+        entity_registry_enabled_default=False,
+        key="charging_contacts_remaining",
+        device_class=SensorDeviceClass.DURATION,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
+        convert_fn=_TOTAL_SECONDS_METHOD_CALLER,
+    ),
+    TPLinkSensorEntityDescription(
+        entity_registry_enabled_default=False,
+        key="charging_contacts_used",
+        device_class=SensorDeviceClass.DURATION,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
+        convert_fn=_TOTAL_SECONDS_METHOD_CALLER,
+    ),
+    TPLinkSensorEntityDescription(
+        key="vacuum_error",
+        device_class=SensorDeviceClass.ENUM,
+        options=[name.lower() for name in VacuumError._member_names_],
+        convert_fn=lambda x: x.name.lower(),
+    ),
 )
 
 SENSOR_DESCRIPTIONS_MAP = {desc.key: desc for desc in SENSOR_DESCRIPTIONS}
@@ -123,7 +271,7 @@ SENSOR_DESCRIPTIONS_MAP = {desc.key: desc for desc in SENSOR_DESCRIPTIONS}
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: TPLinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors."""
     data = config_entry.runtime_data
@@ -165,6 +313,9 @@ class TPLinkSensorEntity(CoordinatedTPLinkFeatureEntity, SensorEntity):
             # We probably do not need this, when we are rounding already?
             self._attr_suggested_display_precision = self._feature.precision_hint
 
+        if self.entity_description.convert_fn:
+            value = self.entity_description.convert_fn(value)
+
         if TYPE_CHECKING:
             # pylint: disable-next=import-outside-toplevel
             from datetime import date, datetime
diff --git a/homeassistant/components/tplink/siren.py b/homeassistant/components/tplink/siren.py
index 5931a508d6c..65cb722052f 100644
--- a/homeassistant/components/tplink/siren.py
+++ b/homeassistant/components/tplink/siren.py
@@ -4,21 +4,27 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Any
+import math
+from typing import TYPE_CHECKING, Any, cast
 
 from kasa import Device, Module
-from kasa.smart.modules.alarm import Alarm
 
 from homeassistant.components.siren import (
+    ATTR_DURATION,
+    ATTR_TONE,
+    ATTR_VOLUME_LEVEL,
     DOMAIN as SIREN_DOMAIN,
     SirenEntity,
     SirenEntityDescription,
     SirenEntityFeature,
+    SirenTurnOnServiceParameters,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.exceptions import ServiceValidationError
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TPLinkConfigEntry, legacy_device_id
+from .const import DOMAIN
 from .coordinator import TPLinkDataUpdateCoordinator
 from .entity import (
     CoordinatedTPLinkModuleEntity,
@@ -55,7 +61,7 @@ SIREN_DESCRIPTIONS: tuple[TPLinkSirenEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: TPLinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up siren entities."""
     data = config_entry.runtime_data
@@ -87,7 +93,13 @@ class TPLinkSirenEntity(CoordinatedTPLinkModuleEntity, SirenEntity):
     """Representation of a tplink siren entity."""
 
     _attr_name = None
-    _attr_supported_features = SirenEntityFeature.TURN_OFF | SirenEntityFeature.TURN_ON
+    _attr_supported_features = (
+        SirenEntityFeature.TURN_OFF
+        | SirenEntityFeature.TURN_ON
+        | SirenEntityFeature.TONES
+        | SirenEntityFeature.DURATION
+        | SirenEntityFeature.VOLUME_SET
+    )
 
     entity_description: TPLinkSirenEntityDescription
 
@@ -101,12 +113,40 @@ class TPLinkSirenEntity(CoordinatedTPLinkModuleEntity, SirenEntity):
     ) -> None:
         """Initialize the siren entity."""
         super().__init__(device, coordinator, description, parent=parent)
-        self._alarm_module: Alarm = device.modules[Module.Alarm]
+        self._alarm_module = device.modules[Module.Alarm]
+
+        alarm_vol_feat = self._alarm_module.get_feature("alarm_volume")
+        alarm_duration_feat = self._alarm_module.get_feature("alarm_duration")
+        if TYPE_CHECKING:
+            assert alarm_vol_feat
+            assert alarm_duration_feat
+        self._alarm_volume_max = alarm_vol_feat.maximum_value
+        self._alarm_duration_max = alarm_duration_feat.maximum_value
 
     @async_refresh_after
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the siren on."""
-        await self._alarm_module.play()
+        turn_on_params = cast(SirenTurnOnServiceParameters, kwargs)
+        if (volume := kwargs.get(ATTR_VOLUME_LEVEL)) is not None:
+            # service parameter is a % so we round up to the nearest int
+            volume = math.ceil(volume * self._alarm_volume_max)
+
+        if (duration := kwargs.get(ATTR_DURATION)) is not None:
+            if duration < 1 or duration > self._alarm_duration_max:
+                raise ServiceValidationError(
+                    translation_domain=DOMAIN,
+                    translation_key="invalid_alarm_duration",
+                    translation_placeholders={
+                        "duration": str(duration),
+                        "duration_max": str(self._alarm_duration_max),
+                    },
+                )
+
+        await self._alarm_module.play(
+            duration=turn_on_params.get(ATTR_DURATION),
+            volume=volume,
+            sound=kwargs.get(ATTR_TONE),
+        )
 
     @async_refresh_after
     async def async_turn_off(self, **kwargs: Any) -> None:
@@ -117,4 +157,8 @@ class TPLinkSirenEntity(CoordinatedTPLinkModuleEntity, SirenEntity):
     def _async_update_attrs(self) -> bool:
         """Update the entity's attributes."""
         self._attr_is_on = self._alarm_module.active
+        # alarm_sounds returns list[str], so we need to widen the type
+        self._attr_available_tones = cast(
+            list[str | int], self._alarm_module.alarm_sounds
+        )
         return True
diff --git a/homeassistant/components/tplink/strings.json b/homeassistant/components/tplink/strings.json
index 9c32dd5bbf4..ded4806a726 100644
--- a/homeassistant/components/tplink/strings.json
+++ b/homeassistant/components/tplink/strings.json
@@ -109,6 +109,9 @@
       "overheated": {
         "name": "Overheated"
       },
+      "overloaded": {
+        "name": "Overloaded"
+      },
       "cloud_connection": {
         "name": "Cloud connection"
       },
@@ -138,6 +141,27 @@
       },
       "tilt_down": {
         "name": "Tilt down"
+      },
+      "pair": {
+        "name": "Pair new device"
+      },
+      "unpair": {
+        "name": "Unpair device"
+      },
+      "main_brush_reset": {
+        "name": "Reset main brush consumable"
+      },
+      "side_brush_reset": {
+        "name": "Reset side brush consumable"
+      },
+      "sensor_reset": {
+        "name": "Reset sensor consumable"
+      },
+      "filter_reset": {
+        "name": "Reset filter consumable"
+      },
+      "charging_contacts_reset": {
+        "name": "Reset charging contacts consumable"
       }
     },
     "camera": {
@@ -192,6 +216,80 @@
       },
       "alarm_source": {
         "name": "Alarm source"
+      },
+      "clean_area": {
+        "name": "Cleaning area"
+      },
+      "clean_time": {
+        "name": "Cleaning time"
+      },
+      "clean_progress": {
+        "name": "Cleaning progress"
+      },
+      "total_clean_area": {
+        "name": "Total cleaning area"
+      },
+      "total_clean_time": {
+        "name": "Total cleaning time"
+      },
+      "total_clean_count": {
+        "name": "Total cleaning count"
+      },
+      "last_clean_area": {
+        "name": "Last cleaned area"
+      },
+      "last_clean_time": {
+        "name": "Last cleaned time"
+      },
+      "last_clean_timestamp": {
+        "name": "Last clean start"
+      },
+      "main_brush_remaining": {
+        "name": "Main brush remaining"
+      },
+      "main_brush_used": {
+        "name": "Main brush used"
+      },
+      "side_brush_remaining": {
+        "name": "Side brush remaining"
+      },
+      "side_brush_used": {
+        "name": "Side brush used"
+      },
+      "filter_remaining": {
+        "name": "Filter remaining"
+      },
+      "filter_used": {
+        "name": "Filter used"
+      },
+      "sensor_remaining": {
+        "name": "Sensor remaining"
+      },
+      "sensor_used": {
+        "name": "Sensor used"
+      },
+      "charging_contacts_remaining": {
+        "name": "Charging contacts remaining"
+      },
+      "charging_contacts_used": {
+        "name": "Charging contacts used"
+      },
+      "vacuum_error": {
+        "name": "Error",
+        "state": {
+          "ok": "No error",
+          "sidebrushstuck": "Side brush stuck",
+          "mainbrushstuck": "Main brush stuck",
+          "wheelblocked": "Wheel blocked",
+          "trapped": "Unable to move",
+          "trappedcliff": "Unable to move (cliff sensor)",
+          "dustbinremoved": "Missing dust bin",
+          "unabletomove": "Unable to move",
+          "lidarblocked": "Lidar blocked",
+          "unabletofinddock": "Unable to find dock",
+          "batterylow": "Low on battery",
+          "unknowninternal": "Unknown error, report to upstream"
+        }
       }
     },
     "switch": {
@@ -227,6 +325,9 @@
       },
       "baby_cry_detection": {
         "name": "Baby cry detection"
+      },
+      "carpet_boost": {
+        "name": "Carpet boost"
       }
     },
     "number": {
@@ -242,11 +343,32 @@
       "temperature_offset": {
         "name": "Temperature offset"
       },
+      "power_protection_threshold": {
+        "name": "Power protection"
+      },
       "pan_step": {
         "name": "Pan degrees"
       },
       "tilt_step": {
         "name": "Tilt degrees"
+      },
+      "clean_count": {
+        "name": "Clean count"
+      }
+    },
+    "vacuum": {
+      "vacuum": {
+        "state_attributes": {
+          "fan_speed": {
+            "state": {
+              "quiet": "Quiet",
+              "standard": "Standard",
+              "turbo": "Turbo",
+              "max": "Max",
+              "ultra": "Ultra"
+            }
+          }
+        }
       }
     }
   },
@@ -367,6 +489,9 @@
     },
     "unsupported_mode": {
       "message": "Tried to set unsupported mode: {mode}"
+    },
+    "invalid_alarm_duration": {
+      "message": "Invalid duration {duration} available: 1-{duration_max}s"
     }
   },
   "issues": {
diff --git a/homeassistant/components/tplink/switch.py b/homeassistant/components/tplink/switch.py
index 04ca95273af..3cb20d63cd7 100644
--- a/homeassistant/components/tplink/switch.py
+++ b/homeassistant/components/tplink/switch.py
@@ -14,7 +14,7 @@ from homeassistant.components.switch import (
     SwitchEntityDescription,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TPLinkConfigEntry
 from .entity import (
@@ -74,6 +74,9 @@ SWITCH_DESCRIPTIONS: tuple[TPLinkSwitchEntityDescription, ...] = (
     TPLinkSwitchEntityDescription(
         key="baby_cry_detection",
     ),
+    TPLinkSwitchEntityDescription(
+        key="carpet_boost",
+    ),
 )
 
 SWITCH_DESCRIPTIONS_MAP = {desc.key: desc for desc in SWITCH_DESCRIPTIONS}
@@ -82,7 +85,7 @@ SWITCH_DESCRIPTIONS_MAP = {desc.key: desc for desc in SWITCH_DESCRIPTIONS}
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: TPLinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switches."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/tplink/vacuum.py b/homeassistant/components/tplink/vacuum.py
new file mode 100644
index 00000000000..e948e778be4
--- /dev/null
+++ b/homeassistant/components/tplink/vacuum.py
@@ -0,0 +1,162 @@
+"""Support for TPLink vacuum."""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any
+
+from kasa import Device, Module
+from kasa.smart.modules.clean import Clean, Status
+
+from homeassistant.components.vacuum import (
+    DOMAIN as VACUUM_DOMAIN,
+    StateVacuumEntity,
+    StateVacuumEntityDescription,
+    VacuumActivity,
+    VacuumEntityFeature,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import TPLinkConfigEntry
+from .coordinator import TPLinkDataUpdateCoordinator
+from .entity import (
+    CoordinatedTPLinkModuleEntity,
+    TPLinkModuleEntityDescription,
+    async_refresh_after,
+)
+
+# Coordinator is used to centralize the data updates
+# For actions the integration handles locking of concurrent device request
+PARALLEL_UPDATES = 0
+
+# Upstream state to VacuumActivity
+STATUS_TO_ACTIVITY = {
+    Status.Idle: VacuumActivity.IDLE,
+    Status.Cleaning: VacuumActivity.CLEANING,
+    Status.GoingHome: VacuumActivity.RETURNING,
+    Status.Charging: VacuumActivity.DOCKED,
+    Status.Charged: VacuumActivity.DOCKED,
+    Status.Undocked: VacuumActivity.IDLE,
+    Status.Paused: VacuumActivity.PAUSED,
+    Status.Error: VacuumActivity.ERROR,
+}
+
+
+@dataclass(frozen=True, kw_only=True)
+class TPLinkVacuumEntityDescription(
+    StateVacuumEntityDescription, TPLinkModuleEntityDescription
+):
+    """Base class for vacuum entity description."""
+
+
+VACUUM_DESCRIPTIONS: tuple[TPLinkVacuumEntityDescription, ...] = (
+    TPLinkVacuumEntityDescription(
+        key="vacuum",
+        translation_key="vacuum",
+        exists_fn=lambda dev, _: Module.Clean in dev.modules,
+        entity_name_fn=lambda _, __: None,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: TPLinkConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up vacuum entities."""
+    data = config_entry.runtime_data
+    parent_coordinator = data.parent_coordinator
+    device = parent_coordinator.device
+
+    known_child_device_ids: set[str] = set()
+    first_check = True
+
+    def _check_device() -> None:
+        entities = CoordinatedTPLinkModuleEntity.entities_for_device_and_its_children(
+            hass=hass,
+            device=device,
+            coordinator=parent_coordinator,
+            entity_class=TPLinkVacuumEntity,
+            descriptions=VACUUM_DESCRIPTIONS,
+            platform_domain=VACUUM_DOMAIN,
+            known_child_device_ids=known_child_device_ids,
+            first_check=first_check,
+        )
+        async_add_entities(entities)
+
+    _check_device()
+    first_check = False
+    config_entry.async_on_unload(parent_coordinator.async_add_listener(_check_device))
+
+
+class TPLinkVacuumEntity(CoordinatedTPLinkModuleEntity, StateVacuumEntity):
+    """Representation of a tplink vacuum."""
+
+    _attr_supported_features = (
+        VacuumEntityFeature.STATE
+        | VacuumEntityFeature.BATTERY
+        | VacuumEntityFeature.START
+        | VacuumEntityFeature.PAUSE
+        | VacuumEntityFeature.RETURN_HOME
+    )
+
+    entity_description: TPLinkVacuumEntityDescription
+
+    def __init__(
+        self,
+        device: Device,
+        coordinator: TPLinkDataUpdateCoordinator,
+        description: TPLinkVacuumEntityDescription,
+        *,
+        parent: Device,
+    ) -> None:
+        """Initialize the vacuum entity."""
+        super().__init__(device, coordinator, description, parent=parent)
+        self._vacuum_module: Clean = device.modules[Module.Clean]
+        if speaker := device.modules.get(Module.Speaker):
+            self._speaker_module = speaker
+            self._attr_supported_features |= VacuumEntityFeature.LOCATE
+
+        if (
+            fanspeed_feat := self._vacuum_module.get_feature("fan_speed_preset")
+        ) and fanspeed_feat.choices:
+            self._attr_supported_features |= VacuumEntityFeature.FAN_SPEED
+            self._attr_fan_speed_list = [c.lower() for c in fanspeed_feat.choices]
+
+    @async_refresh_after
+    async def async_start(self) -> None:
+        """Start cleaning."""
+        await self._vacuum_module.start()
+
+    @async_refresh_after
+    async def async_pause(self) -> None:
+        """Pause cleaning."""
+        await self._vacuum_module.pause()
+
+    @async_refresh_after
+    async def async_return_to_base(self, **kwargs: Any) -> None:
+        """Return home."""
+        await self._vacuum_module.return_home()
+
+    @async_refresh_after
+    async def async_set_fan_speed(self, fan_speed: str, **kwargs: Any) -> None:
+        """Set fan speed."""
+        await self._vacuum_module.set_fan_speed_preset(fan_speed.capitalize())
+
+    async def async_locate(self, **kwargs: Any) -> None:
+        """Locate the device."""
+        await self._speaker_module.locate()
+
+    @property
+    def battery_level(self) -> int | None:
+        """Return battery level."""
+        return self._vacuum_module.battery
+
+    def _async_update_attrs(self) -> bool:
+        """Update the entity's attributes."""
+        self._attr_activity = STATUS_TO_ACTIVITY.get(self._vacuum_module.status)
+        if self._vacuum_module.has_feature("fan_speed_preset"):
+            self._attr_fan_speed = self._vacuum_module.fan_speed_preset.lower()
+        return True
diff --git a/homeassistant/components/tplink_omada/__init__.py b/homeassistant/components/tplink_omada/__init__.py
index 2d33a890510..7ea7fd95fef 100644
--- a/homeassistant/components/tplink_omada/__init__.py
+++ b/homeassistant/components/tplink_omada/__init__.py
@@ -11,7 +11,7 @@ from tplink_omada_client.exceptions import (
     UnsupportedControllerVersion,
 )
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
@@ -55,7 +55,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: OmadaConfigEntry) -> boo
         ) from ex
 
     site_client = await client.get_site_client(OmadaSite("", entry.data[CONF_SITE]))
-    controller = OmadaSiteController(hass, site_client)
+    controller = OmadaSiteController(hass, entry, site_client)
     await controller.initialize_first_refresh()
 
     entry.runtime_data = controller
@@ -80,12 +80,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: OmadaConfigEntry) -> boo
 async def async_unload_entry(hass: HomeAssistant, entry: OmadaConfigEntry) -> bool:
     """Unload a config entry."""
     unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    loaded_entries = [
-        entry
-        for entry in hass.config_entries.async_entries(DOMAIN)
-        if entry.state == ConfigEntryState.LOADED
-    ]
-    if len(loaded_entries) == 1:
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
         # This is the last loaded instance of Omada, deregister any services
         hass.services.async_remove(DOMAIN, "reconnect_client")
 
diff --git a/homeassistant/components/tplink_omada/binary_sensor.py b/homeassistant/components/tplink_omada/binary_sensor.py
index 73d5f54b8b3..fb179634fd1 100644
--- a/homeassistant/components/tplink_omada/binary_sensor.py
+++ b/homeassistant/components/tplink_omada/binary_sensor.py
@@ -18,7 +18,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import OmadaConfigEntry
 from .controller import OmadaGatewayCoordinator
@@ -28,7 +28,7 @@ from .entity import OmadaDeviceEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: OmadaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up binary sensors."""
     controller = config_entry.runtime_data
diff --git a/homeassistant/components/tplink_omada/controller.py b/homeassistant/components/tplink_omada/controller.py
index 658286981f9..60a07f76b23 100644
--- a/homeassistant/components/tplink_omada/controller.py
+++ b/homeassistant/components/tplink_omada/controller.py
@@ -1,10 +1,17 @@
 """Controller for sharing Omada API coordinators between platforms."""
 
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 from tplink_omada_client import OmadaSiteClient
 from tplink_omada_client.devices import OmadaSwitch
 
 from homeassistant.core import HomeAssistant
 
+if TYPE_CHECKING:
+    from . import OmadaConfigEntry
+
 from .coordinator import (
     OmadaClientsCoordinator,
     OmadaDevicesCoordinator,
@@ -21,15 +28,21 @@ class OmadaSiteController:
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: OmadaConfigEntry,
         omada_client: OmadaSiteClient,
     ) -> None:
         """Create the controller."""
         self._hass = hass
+        self._config_entry = config_entry
         self._omada_client = omada_client
 
         self._switch_port_coordinators: dict[str, OmadaSwitchPortCoordinator] = {}
-        self._devices_coordinator = OmadaDevicesCoordinator(hass, omada_client)
-        self._clients_coordinator = OmadaClientsCoordinator(hass, omada_client)
+        self._devices_coordinator = OmadaDevicesCoordinator(
+            hass, config_entry, omada_client
+        )
+        self._clients_coordinator = OmadaClientsCoordinator(
+            hass, config_entry, omada_client
+        )
 
     async def initialize_first_refresh(self) -> None:
         """Initialize the all coordinators, and perform first refresh."""
@@ -39,7 +52,7 @@ class OmadaSiteController:
         gateway = next((d for d in devices if d.type == "gateway"), None)
         if gateway:
             self._gateway_coordinator = OmadaGatewayCoordinator(
-                self._hass, self._omada_client, gateway.mac
+                self._hass, self._config_entry, self._omada_client, gateway.mac
             )
             await self._gateway_coordinator.async_config_entry_first_refresh()
 
@@ -56,7 +69,7 @@ class OmadaSiteController:
         """Get coordinator for network port information of a given switch."""
         if switch.mac not in self._switch_port_coordinators:
             self._switch_port_coordinators[switch.mac] = OmadaSwitchPortCoordinator(
-                self._hass, self._omada_client, switch
+                self._hass, self._config_entry, self._omada_client, switch
             )
 
         return self._switch_port_coordinators[switch.mac]
diff --git a/homeassistant/components/tplink_omada/coordinator.py b/homeassistant/components/tplink_omada/coordinator.py
index a80bedeb65e..1552b568297 100644
--- a/homeassistant/components/tplink_omada/coordinator.py
+++ b/homeassistant/components/tplink_omada/coordinator.py
@@ -1,8 +1,11 @@
 """Generic Omada API coordinator."""
 
+from __future__ import annotations
+
 import asyncio
 from datetime import timedelta
 import logging
+from typing import TYPE_CHECKING
 
 from tplink_omada_client import OmadaSiteClient, OmadaSwitchPortDetails
 from tplink_omada_client.clients import OmadaWirelessClient
@@ -12,6 +15,9 @@ from tplink_omada_client.exceptions import OmadaClientException
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
+if TYPE_CHECKING:
+    from . import OmadaConfigEntry
+
 _LOGGER = logging.getLogger(__name__)
 
 POLL_SWITCH_PORT = 300
@@ -23,9 +29,12 @@ POLL_DEVICES = 300
 class OmadaCoordinator[_T](DataUpdateCoordinator[dict[str, _T]]):
     """Coordinator for synchronizing bulk Omada data."""
 
+    config_entry: OmadaConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: OmadaConfigEntry,
         omada_client: OmadaSiteClient,
         name: str,
         poll_delay: int | None = 300,
@@ -34,6 +43,7 @@ class OmadaCoordinator[_T](DataUpdateCoordinator[dict[str, _T]]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=f"Omada API Data - {name}",
             update_interval=timedelta(seconds=poll_delay) if poll_delay else None,
         )
@@ -58,12 +68,17 @@ class OmadaSwitchPortCoordinator(OmadaCoordinator[OmadaSwitchPortDetails]):
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: OmadaConfigEntry,
         omada_client: OmadaSiteClient,
         network_switch: OmadaSwitch,
     ) -> None:
         """Initialize my coordinator."""
         super().__init__(
-            hass, omada_client, f"{network_switch.name} Ports", POLL_SWITCH_PORT
+            hass,
+            config_entry,
+            omada_client,
+            f"{network_switch.name} Ports",
+            POLL_SWITCH_PORT,
         )
         self._network_switch = network_switch
 
@@ -79,11 +94,12 @@ class OmadaGatewayCoordinator(OmadaCoordinator[OmadaGateway]):
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: OmadaConfigEntry,
         omada_client: OmadaSiteClient,
         mac: str,
     ) -> None:
         """Initialize my coordinator."""
-        super().__init__(hass, omada_client, "Gateway", POLL_GATEWAY)
+        super().__init__(hass, config_entry, omada_client, "Gateway", POLL_GATEWAY)
         self.mac = mac
 
     async def poll_update(self) -> dict[str, OmadaGateway]:
@@ -98,10 +114,11 @@ class OmadaDevicesCoordinator(OmadaCoordinator[OmadaListDevice]):
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: OmadaConfigEntry,
         omada_client: OmadaSiteClient,
     ) -> None:
         """Initialize my coordinator."""
-        super().__init__(hass, omada_client, "DeviceList", POLL_CLIENTS)
+        super().__init__(hass, config_entry, omada_client, "DeviceList", POLL_CLIENTS)
 
     async def poll_update(self) -> dict[str, OmadaListDevice]:
         """Poll the site's current registered Omada devices."""
@@ -111,9 +128,14 @@ class OmadaDevicesCoordinator(OmadaCoordinator[OmadaListDevice]):
 class OmadaClientsCoordinator(OmadaCoordinator[OmadaWirelessClient]):
     """Coordinator for getting details about the site's connected clients."""
 
-    def __init__(self, hass: HomeAssistant, omada_client: OmadaSiteClient) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: OmadaConfigEntry,
+        omada_client: OmadaSiteClient,
+    ) -> None:
         """Initialize my coordinator."""
-        super().__init__(hass, omada_client, "ClientsList", POLL_CLIENTS)
+        super().__init__(hass, config_entry, omada_client, "ClientsList", POLL_CLIENTS)
 
     async def poll_update(self) -> dict[str, OmadaWirelessClient]:
         """Poll the site's current active wi-fi clients."""
diff --git a/homeassistant/components/tplink_omada/device_tracker.py b/homeassistant/components/tplink_omada/device_tracker.py
index fe78adf8847..ce1c8ba40e1 100644
--- a/homeassistant/components/tplink_omada/device_tracker.py
+++ b/homeassistant/components/tplink_omada/device_tracker.py
@@ -6,7 +6,7 @@ from tplink_omada_client.clients import OmadaWirelessClient
 
 from homeassistant.components.device_tracker import ScannerEntity
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import OmadaConfigEntry
@@ -19,7 +19,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: OmadaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up device trackers and scanners."""
 
diff --git a/homeassistant/components/tplink_omada/manifest.json b/homeassistant/components/tplink_omada/manifest.json
index af20b54675b..274f2815330 100644
--- a/homeassistant/components/tplink_omada/manifest.json
+++ b/homeassistant/components/tplink_omada/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/tplink_omada",
   "integration_type": "hub",
   "iot_class": "local_polling",
-  "requirements": ["tplink-omada-client==1.4.3"]
+  "requirements": ["tplink-omada-client==1.4.4"]
 }
diff --git a/homeassistant/components/tplink_omada/sensor.py b/homeassistant/components/tplink_omada/sensor.py
index 272334d1b52..b41f3da2f33 100644
--- a/homeassistant/components/tplink_omada/sensor.py
+++ b/homeassistant/components/tplink_omada/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import OmadaConfigEntry
@@ -57,7 +57,7 @@ def _map_device_status(device: OmadaListDevice) -> str | None:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: OmadaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors."""
     controller = config_entry.runtime_data
diff --git a/homeassistant/components/tplink_omada/switch.py b/homeassistant/components/tplink_omada/switch.py
index f99d8aaedde..37c73a9e11f 100644
--- a/homeassistant/components/tplink_omada/switch.py
+++ b/homeassistant/components/tplink_omada/switch.py
@@ -22,7 +22,7 @@ from tplink_omada_client.omadasiteclient import GatewayPortSettings
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import OmadaConfigEntry
 from .controller import OmadaGatewayCoordinator, OmadaSwitchPortCoordinator
@@ -37,7 +37,7 @@ TCoordinator = TypeVar("TCoordinator", bound="OmadaCoordinator[Any]")
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: OmadaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switches."""
     controller = config_entry.runtime_data
diff --git a/homeassistant/components/tplink_omada/update.py b/homeassistant/components/tplink_omada/update.py
index 54b586794be..8a8531c10b6 100644
--- a/homeassistant/components/tplink_omada/update.py
+++ b/homeassistant/components/tplink_omada/update.py
@@ -16,7 +16,7 @@ from homeassistant.components.update import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import OmadaConfigEntry
 from .coordinator import POLL_DEVICES, OmadaCoordinator, OmadaDevicesCoordinator
@@ -43,7 +43,9 @@ class OmadaFirmwareUpdateCoordinator(OmadaCoordinator[FirmwareUpdateStatus]):  #
         devices_coordinator: OmadaDevicesCoordinator,
     ) -> None:
         """Initialize my coordinator."""
-        super().__init__(hass, omada_client, "Firmware Updates", poll_delay=None)
+        super().__init__(
+            hass, config_entry, omada_client, "Firmware Updates", poll_delay=None
+        )
 
         self._devices_coordinator = devices_coordinator
         self._config_entry = config_entry
@@ -91,7 +93,7 @@ class OmadaFirmwareUpdateCoordinator(OmadaCoordinator[FirmwareUpdateStatus]):  #
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: OmadaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switches."""
     controller = config_entry.runtime_data
diff --git a/homeassistant/components/traccar/__init__.py b/homeassistant/components/traccar/__init__.py
index fe08c3db234..5b9bc2551b7 100644
--- a/homeassistant/components/traccar/__init__.py
+++ b/homeassistant/components/traccar/__init__.py
@@ -9,8 +9,7 @@ from homeassistant.components import webhook
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_ID, CONF_WEBHOOK_ID, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_entry_flow
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_entry_flow, config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 
 from .const import (
diff --git a/homeassistant/components/traccar/device_tracker.py b/homeassistant/components/traccar/device_tracker.py
index 0fa7fc344ea..43210ee92ea 100644
--- a/homeassistant/components/traccar/device_tracker.py
+++ b/homeassistant/components/traccar/device_tracker.py
@@ -11,7 +11,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from . import DOMAIN, TRACKER_UPDATE
@@ -69,7 +69,9 @@ EVENTS = [
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Configure a dispatcher connection based on a config entry."""
 
diff --git a/homeassistant/components/traccar_server/__init__.py b/homeassistant/components/traccar_server/__init__.py
index c7a65d2d4a8..44aeedc3376 100644
--- a/homeassistant/components/traccar_server/__init__.py
+++ b/homeassistant/components/traccar_server/__init__.py
@@ -21,13 +21,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_create_clientsession
 from homeassistant.helpers.event import async_track_time_interval
 
-from .const import (
-    CONF_CUSTOM_ATTRIBUTES,
-    CONF_EVENTS,
-    CONF_MAX_ACCURACY,
-    CONF_SKIP_ACCURACY_FILTER_FOR,
-    DOMAIN,
-)
+from .const import CONF_EVENTS, DOMAIN
 from .coordinator import TraccarServerCoordinator
 
 PLATFORMS: list[Platform] = [
@@ -47,6 +41,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     )
     coordinator = TraccarServerCoordinator(
         hass=hass,
+        config_entry=entry,
         client=ApiClient(
             client_session=client_session,
             host=entry.data[CONF_HOST],
@@ -56,10 +51,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             ssl=entry.data[CONF_SSL],
             verify_ssl=entry.data[CONF_VERIFY_SSL],
         ),
-        events=entry.options.get(CONF_EVENTS, []),
-        max_accuracy=entry.options.get(CONF_MAX_ACCURACY, 0.0),
-        skip_accuracy_filter_for=entry.options.get(CONF_SKIP_ACCURACY_FILTER_FOR, []),
-        custom_attributes=entry.options.get(CONF_CUSTOM_ATTRIBUTES, []),
     )
 
     await coordinator.async_config_entry_first_refresh()
diff --git a/homeassistant/components/traccar_server/binary_sensor.py b/homeassistant/components/traccar_server/binary_sensor.py
index 58c46502b53..6d81ba84ed4 100644
--- a/homeassistant/components/traccar_server/binary_sensor.py
+++ b/homeassistant/components/traccar_server/binary_sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import TraccarServerCoordinator
@@ -55,7 +55,7 @@ TRACCAR_SERVER_BINARY_SENSOR_ENTITY_DESCRIPTIONS: tuple[
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up binary sensor entities."""
     coordinator: TraccarServerCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/traccar_server/coordinator.py b/homeassistant/components/traccar_server/coordinator.py
index 95ce42469f1..2c878856cc2 100644
--- a/homeassistant/components/traccar_server/coordinator.py
+++ b/homeassistant/components/traccar_server/coordinator.py
@@ -22,7 +22,15 @@ from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from homeassistant.util import dt as dt_util
 
-from .const import DOMAIN, EVENTS, LOGGER
+from .const import (
+    CONF_CUSTOM_ATTRIBUTES,
+    CONF_EVENTS,
+    CONF_MAX_ACCURACY,
+    CONF_SKIP_ACCURACY_FILTER_FOR,
+    DOMAIN,
+    EVENTS,
+    LOGGER,
+)
 from .helpers import get_device, get_first_geofence
 
 
@@ -46,25 +54,24 @@ class TraccarServerCoordinator(DataUpdateCoordinator[TraccarServerCoordinatorDat
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         client: ApiClient,
-        *,
-        events: list[str],
-        max_accuracy: float,
-        skip_accuracy_filter_for: list[str],
-        custom_attributes: list[str],
     ) -> None:
         """Initialize global Traccar Server data updater."""
         super().__init__(
             hass=hass,
             logger=LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=None,
         )
         self.client = client
-        self.custom_attributes = custom_attributes
-        self.events = events
-        self.max_accuracy = max_accuracy
-        self.skip_accuracy_filter_for = skip_accuracy_filter_for
+        self.custom_attributes = config_entry.options.get(CONF_CUSTOM_ATTRIBUTES, [])
+        self.events = config_entry.options.get(CONF_EVENTS, [])
+        self.max_accuracy = config_entry.options.get(CONF_MAX_ACCURACY, 0.0)
+        self.skip_accuracy_filter_for = config_entry.options.get(
+            CONF_SKIP_ACCURACY_FILTER_FOR, []
+        )
         self._geofences: list[GeofenceModel] = []
         self._last_event_import: datetime | None = None
         self._should_log_subscription_error: bool = True
diff --git a/homeassistant/components/traccar_server/device_tracker.py b/homeassistant/components/traccar_server/device_tracker.py
index 9e5a3c0ee9f..7f2a6dd7c40 100644
--- a/homeassistant/components/traccar_server/device_tracker.py
+++ b/homeassistant/components/traccar_server/device_tracker.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.device_tracker import TrackerEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import ATTR_CATEGORY, ATTR_TRACCAR_ID, ATTR_TRACKER, DOMAIN
 from .coordinator import TraccarServerCoordinator
@@ -17,7 +17,7 @@ from .entity import TraccarServerEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up device tracker entities."""
     coordinator: TraccarServerCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/traccar_server/sensor.py b/homeassistant/components/traccar_server/sensor.py
index bb3c4ed4401..9aee6f28489 100644
--- a/homeassistant/components/traccar_server/sensor.py
+++ b/homeassistant/components/traccar_server/sensor.py
@@ -17,7 +17,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfLength, UnitOfSpeed
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .const import DOMAIN
@@ -83,7 +83,7 @@ TRACCAR_SERVER_SENSOR_ENTITY_DESCRIPTIONS: tuple[
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensor entities."""
     coordinator: TraccarServerCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/trace/__init__.py b/homeassistant/components/trace/__init__.py
index 9ff645ce4d6..bb0f3e5251a 100644
--- a/homeassistant/components/trace/__init__.py
+++ b/homeassistant/components/trace/__init__.py
@@ -9,7 +9,7 @@ import voluptuous as vol
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import Event, HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.json import ExtendedJSONEncoder
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.typing import ConfigType
diff --git a/homeassistant/components/trace/models.py b/homeassistant/components/trace/models.py
index e8ef417ca5f..3c503efdd28 100644
--- a/homeassistant/components/trace/models.py
+++ b/homeassistant/components/trace/models.py
@@ -15,9 +15,8 @@ from homeassistant.helpers.trace import (
     trace_id_set,
     trace_set_child_id,
 )
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util, uuid as uuid_util
 from homeassistant.util.limited_size_dict import LimitedSizeDict
-import homeassistant.util.uuid as uuid_util
 
 type TraceData = dict[str, LimitedSizeDict[str, BaseTrace]]
 
diff --git a/homeassistant/components/tractive/binary_sensor.py b/homeassistant/components/tractive/binary_sensor.py
index 80219154d81..2978d369344 100644
--- a/homeassistant/components/tractive/binary_sensor.py
+++ b/homeassistant/components/tractive/binary_sensor.py
@@ -11,7 +11,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import ATTR_BATTERY_CHARGING, EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import Trackables, TractiveClient, TractiveConfigEntry
 from .const import TRACKER_HARDWARE_STATUS_UPDATED
@@ -58,7 +58,7 @@ SENSOR_TYPE = BinarySensorEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TractiveConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tractive device trackers."""
     client = entry.runtime_data.client
diff --git a/homeassistant/components/tractive/device_tracker.py b/homeassistant/components/tractive/device_tracker.py
index f31afaf92f6..bd1380ade4c 100644
--- a/homeassistant/components/tractive/device_tracker.py
+++ b/homeassistant/components/tractive/device_tracker.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.device_tracker import SourceType, TrackerEntity
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import Trackables, TractiveClient, TractiveConfigEntry
 from .const import (
@@ -21,7 +21,7 @@ from .entity import TractiveEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TractiveConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tractive device trackers."""
     client = entry.runtime_data.client
@@ -55,11 +55,9 @@ class TractiveDeviceTracker(TractiveEntity, TrackerEntity):
 
     @property
     def source_type(self) -> SourceType:
-        """Return the source type, eg gps or router, of the device."""
+        """Return the source type of the device."""
         if self._source_type == "PHONE":
             return SourceType.BLUETOOTH
-        if self._source_type == "KNOWN_WIFI":
-            return SourceType.ROUTER
         return SourceType.GPS
 
     @property
diff --git a/homeassistant/components/tractive/sensor.py b/homeassistant/components/tractive/sensor.py
index a3c1893267c..18d7e4c23ab 100644
--- a/homeassistant/components/tractive/sensor.py
+++ b/homeassistant/components/tractive/sensor.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import Trackables, TractiveClient, TractiveConfigEntry
@@ -182,7 +182,7 @@ SENSOR_TYPES: tuple[TractiveSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TractiveConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tractive device trackers."""
     client = entry.runtime_data.client
diff --git a/homeassistant/components/tractive/switch.py b/homeassistant/components/tractive/switch.py
index 3bf6887e99c..da2c8e35ff7 100644
--- a/homeassistant/components/tractive/switch.py
+++ b/homeassistant/components/tractive/switch.py
@@ -11,7 +11,7 @@ from aiotractive.exceptions import TractiveError
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import Trackables, TractiveClient, TractiveConfigEntry
 from .const import (
@@ -57,7 +57,7 @@ SWITCH_TYPES: tuple[TractiveSwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TractiveConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tractive switches."""
     client = entry.runtime_data.client
diff --git a/homeassistant/components/tradfri/__init__.py b/homeassistant/components/tradfri/__init__.py
index 0060310e6c2..c3e8938b244 100644
--- a/homeassistant/components/tradfri/__init__.py
+++ b/homeassistant/components/tradfri/__init__.py
@@ -14,7 +14,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, EVENT_HOMEASSISTANT_STOP, Platform
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
@@ -106,7 +106,7 @@ async def async_setup_entry(
 
     for device in devices:
         coordinator = TradfriDeviceDataUpdateCoordinator(
-            hass=hass, api=api, device=device
+            hass=hass, config_entry=entry, api=api, device=device
         )
         await coordinator.async_config_entry_first_refresh()
 
@@ -159,7 +159,7 @@ def remove_stale_devices(
     device_entries = dr.async_entries_for_config_entry(
         device_registry, config_entry.entry_id
     )
-    all_device_ids = {device.id for device in devices}
+    all_device_ids = {str(device.id) for device in devices}
 
     for device_entry in device_entries:
         device_id: str | None = None
@@ -176,7 +176,7 @@ def remove_stale_devices(
                 gateway_id = _id
                 break
 
-            device_id = _id
+            device_id = _id.replace(f"{config_entry.data[CONF_GATEWAY_ID]}-", "")
             break
 
         if gateway_id is not None:
@@ -190,3 +190,93 @@ def remove_stale_devices(
             device_registry.async_update_device(
                 device_entry.id, remove_config_entry_id=config_entry.entry_id
             )
+
+
+async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+    """Migrate old entry."""
+    LOGGER.debug(
+        "Migrating Tradfri configuration from version %s.%s",
+        config_entry.version,
+        config_entry.minor_version,
+    )
+
+    if config_entry.version > 1:
+        # This means the user has downgraded from a future version
+        return False
+
+    if config_entry.version == 1:
+        # Migrate to version 2
+        migrate_config_entry_and_identifiers(hass, config_entry)
+
+        hass.config_entries.async_update_entry(config_entry, version=2)
+
+    LOGGER.debug(
+        "Migration to Tradfri configuration version %s.%s successful",
+        config_entry.version,
+        config_entry.minor_version,
+    )
+
+    return True
+
+
+def migrate_config_entry_and_identifiers(
+    hass: HomeAssistant, config_entry: ConfigEntry
+) -> None:
+    """Migrate old non-unique identifiers to new unique identifiers."""
+
+    related_device_flag: bool
+    device_id: str
+
+    device_reg = dr.async_get(hass)
+    # Get all devices associated to contextual gateway config_entry
+    # and loop through list of devices.
+    for device in dr.async_entries_for_config_entry(device_reg, config_entry.entry_id):
+        related_device_flag = False
+        for identifier in device.identifiers:
+            if identifier[0] != DOMAIN:
+                continue
+
+            related_device_flag = True
+
+            _id = identifier[1]
+
+            # Identify gateway device.
+            if _id == config_entry.data[CONF_GATEWAY_ID]:
+                # Using this to avoid updating gateway's own device registry entry
+                related_device_flag = False
+                break
+
+            device_id = str(_id)
+            break
+
+        # Check that device is related to tradfri domain (and is not the gateway itself)
+        if not related_device_flag:
+            continue
+
+        # Loop through list of config_entry_ids for device
+        config_entry_ids = device.config_entries
+        for config_entry_id in config_entry_ids:
+            # Check that the config entry in list is not the device's primary config entry
+            if config_entry_id == device.primary_config_entry:
+                continue
+
+            # Check that the 'other' config entry is also a tradfri config entry
+            other_entry = hass.config_entries.async_get_entry(config_entry_id)
+
+            if other_entry is None or other_entry.domain != DOMAIN:
+                continue
+
+            # Remove non-primary 'tradfri' config entry from device's config_entry_ids
+            device_reg.async_update_device(
+                device.id, remove_config_entry_id=config_entry_id
+            )
+
+        if config_entry.data[CONF_GATEWAY_ID] in device_id:
+            continue
+
+        device_reg.async_update_device(
+            device.id,
+            new_identifiers={
+                (DOMAIN, f"{config_entry.data[CONF_GATEWAY_ID]}-{device_id}")
+            },
+        )
diff --git a/homeassistant/components/tradfri/config_flow.py b/homeassistant/components/tradfri/config_flow.py
index 29d876346a7..f4adb1cc09e 100644
--- a/homeassistant/components/tradfri/config_flow.py
+++ b/homeassistant/components/tradfri/config_flow.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import asyncio
-from typing import Any
+from typing import Any, cast
 from uuid import uuid4
 
 from pytradfri import Gateway, RequestError
@@ -35,7 +35,7 @@ class AuthError(Exception):
 class FlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a config flow."""
 
-    VERSION = 1
+    VERSION = 2
 
     def __init__(self) -> None:
         """Initialize flow."""
@@ -54,7 +54,7 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
         errors: dict[str, str] = {}
 
         if user_input is not None:
-            host = user_input.get(CONF_HOST, self._host)
+            host = cast(str, user_input.get(CONF_HOST, self._host))
             try:
                 auth = await authenticate(
                     self.hass, host, user_input[KEY_SECURITY_CODE]
diff --git a/homeassistant/components/tradfri/coordinator.py b/homeassistant/components/tradfri/coordinator.py
index 5246545ae65..4c5c186626e 100644
--- a/homeassistant/components/tradfri/coordinator.py
+++ b/homeassistant/components/tradfri/coordinator.py
@@ -10,6 +10,7 @@ from pytradfri.command import Command
 from pytradfri.device import Device
 from pytradfri.error import RequestError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -21,10 +22,12 @@ SCAN_INTERVAL = 60  # Interval for updating the coordinator
 class TradfriDeviceDataUpdateCoordinator(DataUpdateCoordinator[Device]):
     """Coordinator to manage data for a specific Tradfri device."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
-        *,
+        config_entry: ConfigEntry,
         api: Callable[[Command | list[Command]], Any],
         device: Device,
     ) -> None:
@@ -36,6 +39,7 @@ class TradfriDeviceDataUpdateCoordinator(DataUpdateCoordinator[Device]):
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=f"Update coordinator for {device}",
             update_interval=timedelta(seconds=SCAN_INTERVAL),
         )
diff --git a/homeassistant/components/tradfri/cover.py b/homeassistant/components/tradfri/cover.py
index 92d10320327..b1fb9b153ad 100644
--- a/homeassistant/components/tradfri/cover.py
+++ b/homeassistant/components/tradfri/cover.py
@@ -10,7 +10,7 @@ from pytradfri.command import Command
 from homeassistant.components.cover import ATTR_POSITION, CoverEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_GATEWAY_ID, COORDINATOR, COORDINATOR_LIST, DOMAIN, KEY_API
 from .coordinator import TradfriDeviceDataUpdateCoordinator
@@ -20,7 +20,7 @@ from .entity import TradfriBaseEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Load Tradfri covers based on a config entry."""
     gateway_id = config_entry.data[CONF_GATEWAY_ID]
diff --git a/homeassistant/components/tradfri/entity.py b/homeassistant/components/tradfri/entity.py
index b06d0081477..41c20b19de5 100644
--- a/homeassistant/components/tradfri/entity.py
+++ b/homeassistant/components/tradfri/entity.py
@@ -58,7 +58,7 @@ class TradfriBaseEntity(CoordinatorEntity[TradfriDeviceDataUpdateCoordinator]):
 
         info = self._device.device_info
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, self._device_id)},
+            identifiers={(DOMAIN, f"{gateway_id}-{self._device_id}")},
             manufacturer=info.manufacturer,
             model=info.model_number,
             name=self._device.name,
diff --git a/homeassistant/components/tradfri/fan.py b/homeassistant/components/tradfri/fan.py
index 3f45ee3e1eb..e8fb7c050ed 100644
--- a/homeassistant/components/tradfri/fan.py
+++ b/homeassistant/components/tradfri/fan.py
@@ -10,7 +10,7 @@ from pytradfri.command import Command
 from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_GATEWAY_ID, COORDINATOR, COORDINATOR_LIST, DOMAIN, KEY_API
 from .coordinator import TradfriDeviceDataUpdateCoordinator
@@ -33,7 +33,7 @@ def _from_fan_speed(fan_speed: int) -> int:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Load Tradfri switches based on a config entry."""
     gateway_id = config_entry.data[CONF_GATEWAY_ID]
diff --git a/homeassistant/components/tradfri/light.py b/homeassistant/components/tradfri/light.py
index a71691e6e90..b945c7f2bec 100644
--- a/homeassistant/components/tradfri/light.py
+++ b/homeassistant/components/tradfri/light.py
@@ -19,8 +19,8 @@ from homeassistant.components.light import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.color as color_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import color as color_util
 
 from .const import CONF_GATEWAY_ID, COORDINATOR, COORDINATOR_LIST, DOMAIN, KEY_API
 from .coordinator import TradfriDeviceDataUpdateCoordinator
@@ -30,7 +30,7 @@ from .entity import TradfriBaseEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Load Tradfri lights based on a config entry."""
     gateway_id = config_entry.data[CONF_GATEWAY_ID]
diff --git a/homeassistant/components/tradfri/sensor.py b/homeassistant/components/tradfri/sensor.py
index 4e560f0e7b5..b4a7c335481 100644
--- a/homeassistant/components/tradfri/sensor.py
+++ b/homeassistant/components/tradfri/sensor.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CONF_GATEWAY_ID,
@@ -128,7 +128,7 @@ def _migrate_old_unique_ids(hass: HomeAssistant, old_unique_id: str, key: str) -
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Tradfri config entry."""
     gateway_id = config_entry.data[CONF_GATEWAY_ID]
diff --git a/homeassistant/components/tradfri/strings.json b/homeassistant/components/tradfri/strings.json
index 9ed7e167e71..66c46dd482e 100644
--- a/homeassistant/components/tradfri/strings.json
+++ b/homeassistant/components/tradfri/strings.json
@@ -6,7 +6,7 @@
         "description": "You can find the security code on the back of your gateway.",
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
-          "security_code": "Security Code"
+          "security_code": "Security code"
         },
         "data_description": {
           "host": "Hostname or IP address of your Trådfri gateway."
@@ -14,7 +14,7 @@
       }
     },
     "error": {
-      "invalid_security_code": "Failed to register with provided key. If this keeps happening, try restarting the gateway.",
+      "invalid_security_code": "Failed to register with provided code. If this keeps happening, try restarting the gateway.",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "timeout": "Timeout validating the code.",
       "cannot_authenticate": "Cannot authenticate, is Gateway paired with another server like e.g. Homekit?"
diff --git a/homeassistant/components/tradfri/switch.py b/homeassistant/components/tradfri/switch.py
index 088b775b9fd..a2a1a5b4623 100644
--- a/homeassistant/components/tradfri/switch.py
+++ b/homeassistant/components/tradfri/switch.py
@@ -10,7 +10,7 @@ from pytradfri.command import Command
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_GATEWAY_ID, COORDINATOR, COORDINATOR_LIST, DOMAIN, KEY_API
 from .coordinator import TradfriDeviceDataUpdateCoordinator
@@ -20,7 +20,7 @@ from .entity import TradfriBaseEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Load Tradfri switches based on a config entry."""
     gateway_id = config_entry.data[CONF_GATEWAY_ID]
diff --git a/homeassistant/components/trafikverket_camera/binary_sensor.py b/homeassistant/components/trafikverket_camera/binary_sensor.py
index b367fa0fb45..92112b41466 100644
--- a/homeassistant/components/trafikverket_camera/binary_sensor.py
+++ b/homeassistant/components/trafikverket_camera/binary_sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TVCameraConfigEntry
 from .coordinator import CameraData
@@ -36,7 +36,7 @@ BINARY_SENSOR_TYPE = TVCameraSensorEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TVCameraConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Trafikverket Camera binary sensor platform."""
 
diff --git a/homeassistant/components/trafikverket_camera/camera.py b/homeassistant/components/trafikverket_camera/camera.py
index ece02cacf70..b4eddb0890f 100644
--- a/homeassistant/components/trafikverket_camera/camera.py
+++ b/homeassistant/components/trafikverket_camera/camera.py
@@ -8,7 +8,7 @@ from typing import Any
 from homeassistant.components.camera import Camera
 from homeassistant.const import ATTR_LOCATION
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TVCameraConfigEntry
 from .const import ATTR_DESCRIPTION, ATTR_TYPE
@@ -21,7 +21,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TVCameraConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Trafikverket Camera."""
 
diff --git a/homeassistant/components/trafikverket_camera/sensor.py b/homeassistant/components/trafikverket_camera/sensor.py
index cb5c458f742..726fcb6f901 100644
--- a/homeassistant/components/trafikverket_camera/sensor.py
+++ b/homeassistant/components/trafikverket_camera/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import DEGREE
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import TVCameraConfigEntry
@@ -74,7 +74,7 @@ SENSOR_TYPES: tuple[TVCameraSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TVCameraConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Trafikverket Camera sensor platform."""
 
diff --git a/homeassistant/components/trafikverket_camera/strings.json b/homeassistant/components/trafikverket_camera/strings.json
index b6e2209fc57..8fdc6357156 100644
--- a/homeassistant/components/trafikverket_camera/strings.json
+++ b/homeassistant/components/trafikverket_camera/strings.json
@@ -18,7 +18,7 @@
           "location": "[%key:common::config_flow::data::location%]"
         },
         "data_description": {
-          "location": "Equal or part of name, description or camera id. Be as specific as possible to avoid getting multiple cameras as result"
+          "location": "Equal or part of name, description or camera ID. Be as specific as possible to avoid getting multiple cameras as result"
         }
       },
       "multiple_cameras": {
@@ -60,7 +60,7 @@
             "name": "[%key:common::config_flow::data::location%]"
           },
           "photo_url": {
-            "name": "Photo url"
+            "name": "Photo URL"
           },
           "status": {
             "name": "Status"
@@ -87,7 +87,7 @@
         "name": "Photo time"
       },
       "photo_url": {
-        "name": "Photo url"
+        "name": "Photo URL"
       },
       "status": {
         "name": "Status"
diff --git a/homeassistant/components/trafikverket_ferry/config_flow.py b/homeassistant/components/trafikverket_ferry/config_flow.py
index 002dc421273..dfa64ed2953 100644
--- a/homeassistant/components/trafikverket_ferry/config_flow.py
+++ b/homeassistant/components/trafikverket_ferry/config_flow.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
+import logging
 from typing import Any
 
 from pytrafikverket import TrafikverketFerry
@@ -17,6 +18,8 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from .const import CONF_FROM, CONF_TIME, CONF_TO, DOMAIN
 from .util import create_unique_id
 
+_LOGGER = logging.getLogger(__name__)
+
 DATA_SCHEMA = vol.Schema(
     {
         vol.Required(CONF_API_KEY): selector.TextSelector(
@@ -81,7 +84,8 @@ class TVFerryConfigFlow(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "invalid_auth"
             except NoFerryFound:
                 errors["base"] = "invalid_route"
-            except Exception:  # noqa: BLE001
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
                 errors["base"] = "cannot_connect"
             else:
                 return self.async_update_reload_and_abort(
@@ -120,7 +124,8 @@ class TVFerryConfigFlow(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "invalid_auth"
             except NoFerryFound:
                 errors["base"] = "invalid_route"
-            except Exception:  # noqa: BLE001
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
                 errors["base"] = "cannot_connect"
             else:
                 if not errors:
diff --git a/homeassistant/components/trafikverket_ferry/sensor.py b/homeassistant/components/trafikverket_ferry/sensor.py
index 44176ab82b7..b908bc5f550 100644
--- a/homeassistant/components/trafikverket_ferry/sensor.py
+++ b/homeassistant/components/trafikverket_ferry/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util.dt import as_utc
@@ -92,7 +92,7 @@ SENSOR_TYPES: tuple[TrafikverketSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TVFerryConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Trafikverket sensor entry."""
 
diff --git a/homeassistant/components/trafikverket_train/config_flow.py b/homeassistant/components/trafikverket_train/config_flow.py
index da1fb0f7622..eb0a4a45791 100644
--- a/homeassistant/components/trafikverket_train/config_flow.py
+++ b/homeassistant/components/trafikverket_train/config_flow.py
@@ -24,8 +24,8 @@ from homeassistant.config_entries import (
 )
 from homeassistant.const import CONF_API_KEY, CONF_NAME, CONF_WEEKDAY, WEEKDAYS
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.selector import (
     SelectOptionDict,
     SelectSelector,
@@ -86,8 +86,8 @@ async def validate_station(
     except UnknownError as error:
         _LOGGER.error("Unknown error occurred during validation %s", str(error))
         errors["base"] = "cannot_connect"
-    except Exception as error:  # noqa: BLE001
-        _LOGGER.error("Unknown exception occurred during validation %s", str(error))
+    except Exception:
+        _LOGGER.exception("Unknown exception occurred during validation")
         errors["base"] = "cannot_connect"
 
     return (stations, errors)
@@ -101,6 +101,9 @@ class TVTrainConfigFlow(ConfigFlow, domain=DOMAIN):
 
     _from_stations: list[StationInfoModel]
     _to_stations: list[StationInfoModel]
+    _time: str | None
+    _days: list
+    _product: str | None
     _data: dict[str, Any]
 
     @staticmethod
@@ -243,8 +246,10 @@ class TVTrainConfigFlow(ConfigFlow, domain=DOMAIN):
         """Handle the select station step."""
         if user_input is not None:
             api_key: str = self._data[CONF_API_KEY]
-            train_from: str = user_input[CONF_FROM]
-            train_to: str = user_input[CONF_TO]
+            train_from: str = (
+                user_input.get(CONF_FROM) or self._from_stations[0].signature
+            )
+            train_to: str = user_input.get(CONF_TO) or self._to_stations[0].signature
             train_time: str | None = self._data.get(CONF_TIME)
             train_days: list = self._data[CONF_WEEKDAY]
             filter_product: str | None = self._data[CONF_FILTER_PRODUCT]
diff --git a/homeassistant/components/trafikverket_train/sensor.py b/homeassistant/components/trafikverket_train/sensor.py
index a4de8c1ef26..150b5ee7abb 100644
--- a/homeassistant/components/trafikverket_train/sensor.py
+++ b/homeassistant/components/trafikverket_train/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import CONF_NAME, UnitOfTime
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -110,7 +110,7 @@ SENSOR_TYPES: tuple[TrafikverketSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TVTrainConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Trafikverket sensor entry."""
 
diff --git a/homeassistant/components/trafikverket_weatherstation/config_flow.py b/homeassistant/components/trafikverket_weatherstation/config_flow.py
index 28b9a124fc6..ee9fe264692 100644
--- a/homeassistant/components/trafikverket_weatherstation/config_flow.py
+++ b/homeassistant/components/trafikverket_weatherstation/config_flow.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
+import logging
 from typing import Any
 
 from pytrafikverket.exceptions import (
@@ -15,8 +16,8 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_API_KEY
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.selector import (
     TextSelector,
     TextSelectorConfig,
@@ -25,6 +26,8 @@ from homeassistant.helpers.selector import (
 
 from .const import CONF_STATION, DOMAIN
 
+_LOGGER = logging.getLogger(__name__)
+
 
 class TVWeatherConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Trafikverket Weatherstation integration."""
@@ -56,7 +59,8 @@ class TVWeatherConfigFlow(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "invalid_station"
             except MultipleWeatherStationsFound:
                 errors["base"] = "more_stations"
-            except Exception:  # noqa: BLE001
+            except Exception:
+                _LOGGER.exception("Unexpected error")
                 errors["base"] = "cannot_connect"
             else:
                 return self.async_create_entry(
@@ -102,7 +106,8 @@ class TVWeatherConfigFlow(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "invalid_station"
             except MultipleWeatherStationsFound:
                 errors["base"] = "more_stations"
-            except Exception:  # noqa: BLE001
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
                 errors["base"] = "cannot_connect"
             else:
                 return self.async_update_reload_and_abort(
@@ -132,7 +137,8 @@ class TVWeatherConfigFlow(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "invalid_station"
             except MultipleWeatherStationsFound:
                 errors["base"] = "more_stations"
-            except Exception:  # noqa: BLE001
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
                 errors["base"] = "cannot_connect"
             else:
                 return self.async_update_reload_and_abort(
diff --git a/homeassistant/components/trafikverket_weatherstation/sensor.py b/homeassistant/components/trafikverket_weatherstation/sensor.py
index bc17c82748a..bbc6764e3ef 100644
--- a/homeassistant/components/trafikverket_weatherstation/sensor.py
+++ b/homeassistant/components/trafikverket_weatherstation/sensor.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import dt as dt_util
@@ -89,7 +89,8 @@ SENSOR_TYPES: tuple[TrafikverketSensorEntityDescription, ...] = (
         translation_key="wind_direction",
         value_fn=lambda data: data.winddirection,
         native_unit_of_measurement=DEGREE,
-        state_class=SensorStateClass.MEASUREMENT,
+        state_class=SensorStateClass.MEASUREMENT_ANGLE,
+        device_class=SensorDeviceClass.WIND_DIRECTION,
     ),
     TrafikverketSensorEntityDescription(
         key="wind_speed",
@@ -204,7 +205,7 @@ SENSOR_TYPES: tuple[TrafikverketSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TVWeatherConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Trafikverket sensor entry."""
 
diff --git a/homeassistant/components/transmission/__init__.py b/homeassistant/components/transmission/__init__.py
index 1a8ffdea0c2..6d23017ab75 100644
--- a/homeassistant/components/transmission/__init__.py
+++ b/homeassistant/components/transmission/__init__.py
@@ -15,7 +15,7 @@ from transmission_rpc.error import (
 )
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import (
     CONF_HOST,
     CONF_ID,
@@ -54,7 +54,7 @@ from .const import (
     SERVICE_START_TORRENT,
     SERVICE_STOP_TORRENT,
 )
-from .coordinator import TransmissionDataUpdateCoordinator
+from .coordinator import TransmissionConfigEntry, TransmissionDataUpdateCoordinator
 from .errors import AuthenticationError, CannotConnect, UnknownError
 
 _LOGGER = logging.getLogger(__name__)
@@ -78,7 +78,9 @@ MIGRATION_NAME_TO_KEY = {
 
 SERVICE_BASE_SCHEMA = vol.Schema(
     {
-        vol.Required(CONF_ENTRY_ID): selector.ConfigEntrySelector(),
+        vol.Required(CONF_ENTRY_ID): selector.ConfigEntrySelector(
+            {"integration": DOMAIN}
+        ),
     }
 )
 
@@ -115,8 +117,6 @@ SERVICE_STOP_TORRENT_SCHEMA = vol.All(
 
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
-type TransmissionConfigEntry = ConfigEntry[TransmissionDataUpdateCoordinator]
-
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Transmission component."""
@@ -165,12 +165,16 @@ async def async_setup_entry(
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, config_entry: TransmissionConfigEntry
+) -> bool:
     """Unload Transmission Entry from config_entry."""
     return await hass.config_entries.async_unload_platforms(config_entry, PLATFORMS)
 
 
-async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_migrate_entry(
+    hass: HomeAssistant, config_entry: TransmissionConfigEntry
+) -> bool:
     """Migrate an old config entry."""
     _LOGGER.debug(
         "Migrating from version %s.%s",
diff --git a/homeassistant/components/transmission/coordinator.py b/homeassistant/components/transmission/coordinator.py
index b998ab6fbdd..afe2660e711 100644
--- a/homeassistant/components/transmission/coordinator.py
+++ b/homeassistant/components/transmission/coordinator.py
@@ -27,17 +27,21 @@ from .const import (
 
 _LOGGER = logging.getLogger(__name__)
 
+type TransmissionConfigEntry = ConfigEntry[TransmissionDataUpdateCoordinator]
+
 
 class TransmissionDataUpdateCoordinator(DataUpdateCoordinator[SessionStats]):
     """Transmission dataupdate coordinator class."""
 
-    config_entry: ConfigEntry
+    config_entry: TransmissionConfigEntry
 
     def __init__(
-        self, hass: HomeAssistant, entry: ConfigEntry, api: transmission_rpc.Client
+        self,
+        hass: HomeAssistant,
+        entry: TransmissionConfigEntry,
+        api: transmission_rpc.Client,
     ) -> None:
         """Initialize the Transmission RPC API."""
-        self.config_entry = entry
         self.api = api
         self.host = entry.data[CONF_HOST]
         self._session: transmission_rpc.Session | None = None
@@ -47,6 +51,7 @@ class TransmissionDataUpdateCoordinator(DataUpdateCoordinator[SessionStats]):
         self.torrents: list[transmission_rpc.Torrent] = []
         super().__init__(
             hass,
+            config_entry=entry,
             name=f"{DOMAIN} - {self.host}",
             logger=_LOGGER,
             update_interval=timedelta(seconds=DEFAULT_SCAN_INTERVAL),
diff --git a/homeassistant/components/transmission/sensor.py b/homeassistant/components/transmission/sensor.py
index 652f5d51fbb..a0babe7464a 100644
--- a/homeassistant/components/transmission/sensor.py
+++ b/homeassistant/components/transmission/sensor.py
@@ -17,11 +17,10 @@ from homeassistant.components.sensor import (
 from homeassistant.const import STATE_IDLE, UnitOfDataRate
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import TransmissionConfigEntry
 from .const import (
     DOMAIN,
     STATE_ATTR_TORRENT_INFO,
@@ -30,7 +29,7 @@ from .const import (
     STATE_UP_DOWN,
     SUPPORTED_ORDER_MODES,
 )
-from .coordinator import TransmissionDataUpdateCoordinator
+from .coordinator import TransmissionConfigEntry, TransmissionDataUpdateCoordinator
 
 MODES: dict[str, list[str] | None] = {
     "started_torrents": ["downloading"],
@@ -130,7 +129,7 @@ SENSOR_TYPES: tuple[TransmissionSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: TransmissionConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Transmission sensors."""
 
diff --git a/homeassistant/components/transmission/switch.py b/homeassistant/components/transmission/switch.py
index d88f794cb10..9ca8a197344 100644
--- a/homeassistant/components/transmission/switch.py
+++ b/homeassistant/components/transmission/switch.py
@@ -7,12 +7,11 @@ from typing import Any
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import TransmissionConfigEntry
 from .const import DOMAIN
-from .coordinator import TransmissionDataUpdateCoordinator
+from .coordinator import TransmissionConfigEntry, TransmissionDataUpdateCoordinator
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -45,7 +44,7 @@ SWITCH_TYPES: tuple[TransmissionSwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: TransmissionConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Transmission switch."""
 
diff --git a/homeassistant/components/transport_nsw/sensor.py b/homeassistant/components/transport_nsw/sensor.py
index 5628274b967..49a11a57f65 100644
--- a/homeassistant/components/transport_nsw/sensor.py
+++ b/homeassistant/components/transport_nsw/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import ATTR_MODE, CONF_API_KEY, CONF_NAME, UnitOfTime
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/travisci/sensor.py b/homeassistant/components/travisci/sensor.py
index fe4a6541d9e..8193c5a67dc 100644
--- a/homeassistant/components/travisci/sensor.py
+++ b/homeassistant/components/travisci/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/trend/binary_sensor.py b/homeassistant/components/trend/binary_sensor.py
index 9691ecf0744..4261f96bbe6 100644
--- a/homeassistant/components/trend/binary_sensor.py
+++ b/homeassistant/components/trend/binary_sensor.py
@@ -32,11 +32,13 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import Event, EventStateChangedData, HomeAssistant, callback
-from homeassistant.helpers import device_registry as dr
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.device import async_device_info_to_link_from_entity
 from homeassistant.helpers.entity import generate_entity_id
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.helpers.reload import async_setup_reload_service
 from homeassistant.helpers.restore_state import RestoreEntity
@@ -131,7 +133,7 @@ async def async_setup_platform(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up trend sensor from config entry."""
 
diff --git a/homeassistant/components/triggercmd/config_flow.py b/homeassistant/components/triggercmd/config_flow.py
index fc02dd0b2fc..48c4eacfd5a 100644
--- a/homeassistant/components/triggercmd/config_flow.py
+++ b/homeassistant/components/triggercmd/config_flow.py
@@ -57,7 +57,7 @@ class TriggerCMDConfigFlow(ConfigFlow, domain=DOMAIN):
                 errors[CONF_TOKEN] = "invalid_token"
             except TRIGGERcmdConnectionError:
                 errors["base"] = "cannot_connect"
-            except Exception:  # pylint: disable=broad-except
+            except Exception:
                 _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
diff --git a/homeassistant/components/triggercmd/switch.py b/homeassistant/components/triggercmd/switch.py
index 94566fe301d..e04cf5ee7e8 100644
--- a/homeassistant/components/triggercmd/switch.py
+++ b/homeassistant/components/triggercmd/switch.py
@@ -9,7 +9,7 @@ from triggercmd import client, ha
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TriggercmdConfigEntry
 from .const import DOMAIN
@@ -20,7 +20,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: TriggercmdConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add switch for passed config_entry in HA."""
     hub = config_entry.runtime_data
diff --git a/homeassistant/components/tts/__init__.py b/homeassistant/components/tts/__init__.py
index bbe4d334def..cb207643471 100644
--- a/homeassistant/components/tts/__init__.py
+++ b/homeassistant/components/tts/__init__.py
@@ -3,9 +3,9 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Mapping
+from collections.abc import AsyncGenerator
+from dataclasses import dataclass
 from datetime import datetime
-from functools import partial
 import hashlib
 from http import HTTPStatus
 import io
@@ -16,7 +16,8 @@ import re
 import secrets
 import subprocess
 import tempfile
-from typing import Any, Final, TypedDict, final
+from time import monotonic
+from typing import Any, Final
 
 from aiohttp import web
 import mutagen
@@ -26,30 +27,24 @@ import voluptuous as vol
 
 from homeassistant.components import ffmpeg, websocket_api
 from homeassistant.components.http import HomeAssistantView
-from homeassistant.components.media_player import (
-    ATTR_MEDIA_ANNOUNCE,
-    ATTR_MEDIA_CONTENT_ID,
-    ATTR_MEDIA_CONTENT_TYPE,
-    DOMAIN as DOMAIN_MP,
-    SERVICE_PLAY_MEDIA,
-    MediaType,
-)
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import (
-    ATTR_ENTITY_ID,
-    PLATFORM_FORMAT,
-    STATE_UNAVAILABLE,
-    STATE_UNKNOWN,
+from homeassistant.const import EVENT_HOMEASSISTANT_STOP, PLATFORM_FORMAT
+from homeassistant.core import (
+    CALLBACK_TYPE,
+    Event,
+    HassJob,
+    HassJobType,
+    HomeAssistant,
+    ServiceCall,
+    callback,
 )
-from homeassistant.core import HassJob, HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.network import get_url
-from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import UNDEFINED, ConfigType
-from homeassistant.util import dt as dt_util, language as language_util
+from homeassistant.util import language as language_util
 
 from .const import (
     ATTR_CACHE,
@@ -67,6 +62,7 @@ from .const import (
     DOMAIN,
     TtsAudioType,
 )
+from .entity import TextToSpeechEntity, TTSAudioRequest
 from .helper import get_engine_instance
 from .legacy import PLATFORM_SCHEMA, PLATFORM_SCHEMA_BASE, Provider, async_setup_legacy
 from .media_source import generate_media_source_id, media_source_id_to_kwargs
@@ -83,12 +79,13 @@ __all__ = [
     "PLATFORM_SCHEMA",
     "PLATFORM_SCHEMA_BASE",
     "Provider",
+    "ResultStream",
     "SampleFormat",
+    "TextToSpeechEntity",
     "TtsAudioType",
     "Voice",
     "async_default_engine",
     "async_get_media_source_audio",
-    "async_support_options",
     "generate_media_source_id",
 ]
 
@@ -126,12 +123,94 @@ KEY_PATTERN = "{0}_{1}_{2}_{3}"
 SCHEMA_SERVICE_CLEAR_CACHE = vol.Schema({})
 
 
-class TTSCache(TypedDict):
-    """Cached TTS file."""
+class TTSCache:
+    """Cached bytes of a TTS result."""
 
-    filename: str
-    voice: bytes
-    pending: asyncio.Task | None
+    _result_data: bytes | None = None
+    """When fully loaded, contains the result data."""
+
+    _partial_data: list[bytes] | None = None
+    """While loading, contains the data already received from the generator."""
+
+    _loading_error: Exception | None = None
+    """If an error occurred while loading, contains the error."""
+
+    _consumers: list[asyncio.Queue[bytes | None]] | None = None
+    """A queue for each current consumer to notify of new data while the generator is loading."""
+
+    def __init__(
+        self,
+        cache_key: str,
+        extension: str,
+        data_gen: AsyncGenerator[bytes],
+    ) -> None:
+        """Initialize the TTS cache."""
+        self.cache_key = cache_key
+        self.extension = extension
+        self.last_used = monotonic()
+        self._data_gen = data_gen
+
+    async def async_load_data(self) -> bytes:
+        """Load the data from the generator."""
+        if self._result_data is not None or self._partial_data is not None:
+            raise RuntimeError("Data already being loaded")
+
+        self._partial_data = []
+        self._consumers = []
+
+        try:
+            async for chunk in self._data_gen:
+                self._partial_data.append(chunk)
+                for queue in self._consumers:
+                    queue.put_nowait(chunk)
+        except Exception as err:
+            self._loading_error = err
+            raise
+        finally:
+            for queue in self._consumers:
+                queue.put_nowait(None)
+            self._consumers = None
+
+        self._result_data = b"".join(self._partial_data)
+        self._partial_data = None
+        return self._result_data
+
+    async def async_stream_data(self) -> AsyncGenerator[bytes]:
+        """Stream the data.
+
+        Will return all data already returned from the generator.
+        Will listen for future data returned from the generator.
+        Raises error if one occurred.
+        """
+        if self._result_data is not None:
+            yield self._result_data
+            return
+        if self._loading_error:
+            raise self._loading_error
+
+        if self._partial_data is None:
+            raise RuntimeError("Data not being loaded")
+
+        queue: asyncio.Queue[bytes | None] | None = None
+        # Check if generator is still feeding data
+        if self._consumers is not None:
+            queue = asyncio.Queue()
+            self._consumers.append(queue)
+
+        for chunk in list(self._partial_data):
+            yield chunk
+
+        if self._loading_error:
+            raise self._loading_error
+
+        if queue is not None:
+            while (chunk2 := await queue.get()) is not None:
+                yield chunk2
+
+        if self._loading_error:
+            raise self._loading_error
+
+        self.last_used = monotonic()
 
 
 @callback
@@ -169,22 +248,25 @@ def async_resolve_engine(hass: HomeAssistant, engine: str | None) -> str | None:
     return async_default_engine(hass)
 
 
-async def async_support_options(
+@callback
+def async_create_stream(
     hass: HomeAssistant,
     engine: str,
     language: str | None = None,
     options: dict | None = None,
-) -> bool:
-    """Return if an engine supports options."""
-    if (engine_instance := get_engine_instance(hass, engine)) is None:
-        raise HomeAssistantError(f"Provider {engine} not found")
+) -> ResultStream:
+    """Create a streaming URL where the rendered TTS can be retrieved."""
+    return hass.data[DATA_TTS_MANAGER].async_create_result_stream(
+        engine=engine,
+        language=language,
+        options=options,
+    )
 
-    try:
-        hass.data[DATA_TTS_MANAGER].process_options(engine_instance, language, options)
-    except HomeAssistantError:
-        return False
 
-    return True
+@callback
+def async_get_stream(hass: HomeAssistant, token: str) -> ResultStream | None:
+    """Return a result stream given a token."""
+    return hass.data[DATA_TTS_MANAGER].token_to_stream.get(token)
 
 
 async def async_get_media_source_audio(
@@ -192,9 +274,12 @@ async def async_get_media_source_audio(
     media_source_id: str,
 ) -> tuple[str, bytes]:
     """Get TTS audio as extension, data."""
-    return await hass.data[DATA_TTS_MANAGER].async_get_tts_audio(
-        **media_source_id_to_kwargs(media_source_id),
+    manager = hass.data[DATA_TTS_MANAGER]
+    cache = manager.async_cache_message_in_memory(
+        **media_source_id_to_kwargs(media_source_id)
     )
+    data = b"".join([chunk async for chunk in cache.async_stream_data()])
+    return cache.extension, data
 
 
 @callback
@@ -213,18 +298,19 @@ def async_get_text_to_speech_languages(hass: HomeAssistant) -> set[str]:
     return languages
 
 
-async def async_convert_audio(
+async def _async_convert_audio(
     hass: HomeAssistant,
     from_extension: str,
-    audio_bytes: bytes,
+    audio_bytes_gen: AsyncGenerator[bytes],
     to_extension: str,
     to_sample_rate: int | None = None,
     to_sample_channels: int | None = None,
     to_sample_bytes: int | None = None,
-) -> bytes:
+) -> AsyncGenerator[bytes]:
     """Convert audio to a preferred format using ffmpeg."""
     ffmpeg_manager = ffmpeg.get_ffmpeg_manager(hass)
-    return await hass.async_add_executor_job(
+    audio_bytes = b"".join([chunk async for chunk in audio_bytes_gen])
+    data = await hass.async_add_executor_job(
         lambda: _convert_audio(
             ffmpeg_manager.binary,
             from_extension,
@@ -235,6 +321,7 @@ async def async_convert_audio(
             to_sample_bytes=to_sample_bytes,
         )
     )
+    yield data
 
 
 def _convert_audio(
@@ -306,11 +393,11 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
     # Legacy config options
     conf = config[DOMAIN][0] if config.get(DOMAIN) else {}
-    use_cache: bool = conf.get(CONF_CACHE, DEFAULT_CACHE)
+    use_file_cache: bool = conf.get(CONF_CACHE, DEFAULT_CACHE)
     cache_dir: str = conf.get(CONF_CACHE_DIR, DEFAULT_CACHE_DIR)
-    time_memory: int = conf.get(CONF_TIME_MEMORY, DEFAULT_TIME_MEMORY)
+    memory_cache_maxage: int = conf.get(CONF_TIME_MEMORY, DEFAULT_TIME_MEMORY)
 
-    tts = SpeechManager(hass, use_cache, cache_dir, time_memory)
+    tts = SpeechManager(hass, use_file_cache, cache_dir, memory_cache_maxage)
 
     try:
         await tts.async_init_cache()
@@ -375,140 +462,56 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return await hass.data[DATA_COMPONENT].async_unload_entry(entry)
 
 
-CACHED_PROPERTIES_WITH_ATTR_ = {
-    "default_language",
-    "default_options",
-    "supported_languages",
-    "supported_options",
-}
+@dataclass
+class ResultStream:
+    """Class that will stream the result when available."""
 
+    # Streaming/conversion properties
+    token: str
+    extension: str
+    content_type: str
 
-class TextToSpeechEntity(RestoreEntity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
-    """Represent a single TTS engine."""
+    # TTS properties
+    engine: str
+    use_file_cache: bool
+    language: str
+    options: dict
 
-    _attr_should_poll = False
-    __last_tts_loaded: str | None = None
-
-    _attr_default_language: str
-    _attr_default_options: Mapping[str, Any] | None = None
-    _attr_supported_languages: list[str]
-    _attr_supported_options: list[str] | None = None
-
-    @property
-    @final
-    def state(self) -> str | None:
-        """Return the state of the entity."""
-        if self.__last_tts_loaded is None:
-            return None
-        return self.__last_tts_loaded
+    _manager: SpeechManager
 
     @cached_property
-    def supported_languages(self) -> list[str]:
-        """Return a list of supported languages."""
-        return self._attr_supported_languages
+    def url(self) -> str:
+        """Get the URL to stream the result."""
+        return f"/api/tts_proxy/{self.token}"
 
     @cached_property
-    def default_language(self) -> str:
-        """Return the default language."""
-        return self._attr_default_language
-
-    @cached_property
-    def supported_options(self) -> list[str] | None:
-        """Return a list of supported options like voice, emotions."""
-        return self._attr_supported_options
-
-    @cached_property
-    def default_options(self) -> Mapping[str, Any] | None:
-        """Return a mapping with the default options."""
-        return self._attr_default_options
+    def _result_cache(self) -> asyncio.Future[TTSCache]:
+        """Get the future that returns the cache."""
+        return asyncio.Future()
 
     @callback
-    def async_get_supported_voices(self, language: str) -> list[Voice] | None:
-        """Return a list of supported voices for a language."""
-        return None
+    def async_set_message_cache(self, cache: TTSCache) -> None:
+        """Set cache containing message audio to be streamed."""
+        self._result_cache.set_result(cache)
 
-    async def async_internal_added_to_hass(self) -> None:
-        """Call when the entity is added to hass."""
-        await super().async_internal_added_to_hass()
-        try:
-            _ = self.default_language
-        except AttributeError as err:
-            raise AttributeError(
-                "TTS entities must either set the '_attr_default_language' attribute or override the 'default_language' property"
-            ) from err
-        try:
-            _ = self.supported_languages
-        except AttributeError as err:
-            raise AttributeError(
-                "TTS entities must either set the '_attr_supported_languages' attribute or override the 'supported_languages' property"
-            ) from err
-        state = await self.async_get_last_state()
-        if (
-            state is not None
-            and state.state is not None
-            and state.state not in (STATE_UNAVAILABLE, STATE_UNKNOWN)
-        ):
-            self.__last_tts_loaded = state.state
-
-    async def async_speak(
-        self,
-        media_player_entity_id: list[str],
-        message: str,
-        cache: bool,
-        language: str | None = None,
-        options: dict | None = None,
-    ) -> None:
-        """Speak via a Media Player."""
-        await self.hass.services.async_call(
-            DOMAIN_MP,
-            SERVICE_PLAY_MEDIA,
-            {
-                ATTR_ENTITY_ID: media_player_entity_id,
-                ATTR_MEDIA_CONTENT_ID: generate_media_source_id(
-                    self.hass,
-                    message=message,
-                    engine=self.entity_id,
-                    language=language,
-                    options=options,
-                    cache=cache,
-                ),
-                ATTR_MEDIA_CONTENT_TYPE: MediaType.MUSIC,
-                ATTR_MEDIA_ANNOUNCE: True,
-            },
-            blocking=True,
-            context=self._context,
+    @callback
+    def async_set_message(self, message: str) -> None:
+        """Set message to be generated."""
+        self._result_cache.set_result(
+            self._manager.async_cache_message_in_memory(
+                engine=self.engine,
+                message=message,
+                use_file_cache=self.use_file_cache,
+                language=self.language,
+                options=self.options,
+            )
         )
 
-    @final
-    async def internal_async_get_tts_audio(
-        self, message: str, language: str, options: dict[str, Any]
-    ) -> TtsAudioType:
-        """Process an audio stream to TTS service.
-
-        Only streaming content is allowed!
-        """
-        self.__last_tts_loaded = dt_util.utcnow().isoformat()
-        self.async_write_ha_state()
-        return await self.async_get_tts_audio(
-            message=message, language=language, options=options
-        )
-
-    def get_tts_audio(
-        self, message: str, language: str, options: dict[str, Any]
-    ) -> TtsAudioType:
-        """Load tts audio file from the engine."""
-        raise NotImplementedError
-
-    async def async_get_tts_audio(
-        self, message: str, language: str, options: dict[str, Any]
-    ) -> TtsAudioType:
-        """Load tts audio file from the engine.
-
-        Return a tuple of file extension and data as bytes.
-        """
-        return await self.hass.async_add_executor_job(
-            partial(self.get_tts_audio, message, language, options=options)
-        )
+    async def async_stream_result(self) -> AsyncGenerator[bytes]:
+        """Get the stream of this result."""
+        cache = await self._result_cache
+        async for chunk in cache.async_stream_data():
+            yield chunk
 
 
 def _hash_options(options: dict) -> str:
@@ -521,29 +524,82 @@ def _hash_options(options: dict) -> str:
     return opts_hash.hexdigest()
 
 
+class MemcacheCleanup:
+    """Helper to clean up the stale sessions."""
+
+    unsub: CALLBACK_TYPE | None = None
+
+    def __init__(
+        self, hass: HomeAssistant, maxage: float, memcache: dict[str, TTSCache]
+    ) -> None:
+        """Initialize the cleanup."""
+        self.hass = hass
+        self.maxage = maxage
+        self.memcache = memcache
+        hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, self._on_hass_stop)
+        self.cleanup_job = HassJob(
+            self._cleanup, "chat_session_cleanup", job_type=HassJobType.Callback
+        )
+
+    @callback
+    def schedule(self) -> None:
+        """Schedule the cleanup."""
+        if self.unsub:
+            return
+        self.unsub = async_call_later(
+            self.hass,
+            self.maxage + 1,
+            self.cleanup_job,
+        )
+
+    @callback
+    def _on_hass_stop(self, event: Event) -> None:
+        """Cancel the cleanup on shutdown."""
+        if self.unsub:
+            self.unsub()
+        self.unsub = None
+
+    @callback
+    def _cleanup(self, _now: datetime) -> None:
+        """Clean up and schedule follow-up if necessary."""
+        self.unsub = None
+        memcache = self.memcache
+        maxage = self.maxage
+        now = monotonic()
+
+        for cache_key, info in list(memcache.items()):
+            if info.last_used + maxage < now:
+                _LOGGER.debug("Cleaning up %s", cache_key)
+                del memcache[cache_key]
+
+        # Still items left, check again in timeout time.
+        if memcache:
+            self.schedule()
+
+
 class SpeechManager:
     """Representation of a speech store."""
 
     def __init__(
         self,
         hass: HomeAssistant,
-        use_cache: bool,
+        use_file_cache: bool,
         cache_dir: str,
-        time_memory: int,
+        memory_cache_maxage: int,
     ) -> None:
         """Initialize a speech store."""
         self.hass = hass
         self.providers: dict[str, Provider] = {}
 
-        self.use_cache = use_cache
+        self.use_file_cache = use_file_cache
         self.cache_dir = cache_dir
-        self.time_memory = time_memory
+        self.memory_cache_maxage = memory_cache_maxage
         self.file_cache: dict[str, str] = {}
         self.mem_cache: dict[str, TTSCache] = {}
-
-        # filename <-> token
-        self.filename_to_token: dict[str, str] = {}
-        self.token_to_filename: dict[str, str] = {}
+        self.token_to_stream: dict[str, ResultStream] = {}
+        self.memcache_cleanup = MemcacheCleanup(
+            hass, memory_cache_maxage, self.mem_cache
+        )
 
     def _init_cache(self) -> dict[str, str]:
         """Init cache folder and fetch files."""
@@ -563,18 +619,21 @@ class SpeechManager:
 
     async def async_clear_cache(self) -> None:
         """Read file cache and delete files."""
-        self.mem_cache = {}
+        self.mem_cache.clear()
 
-        def remove_files() -> None:
+        def remove_files(files: list[str]) -> None:
             """Remove files from filesystem."""
-            for filename in self.file_cache.values():
+            for filename in files:
                 try:
                     os.remove(os.path.join(self.cache_dir, filename))
                 except OSError as err:
                     _LOGGER.warning("Can't remove cache file '%s': %s", filename, err)
 
-        await self.hass.async_add_executor_job(remove_files)
-        self.file_cache = {}
+        task = self.hass.async_add_executor_job(
+            remove_files, list(self.file_cache.values())
+        )
+        self.file_cache.clear()
+        await task
 
     @callback
     def async_register_legacy_engine(
@@ -629,110 +688,198 @@ class SpeechManager:
 
         return language, merged_options
 
-    async def async_get_url_path(
+    @callback
+    def async_create_result_stream(
         self,
         engine: str,
-        message: str,
-        cache: bool | None = None,
+        message: str | None = None,
+        use_file_cache: bool | None = None,
         language: str | None = None,
         options: dict | None = None,
-    ) -> str:
-        """Get URL for play message.
-
-        This method is a coroutine.
-        """
+    ) -> ResultStream:
+        """Create a streaming URL where the rendered TTS can be retrieved."""
         if (engine_instance := get_engine_instance(self.hass, engine)) is None:
             raise HomeAssistantError(f"Provider {engine} not found")
 
         language, options = self.process_options(engine_instance, language, options)
-        cache_key = self._generate_cache_key(message, language, options, engine)
-        use_cache = cache if cache is not None else self.use_cache
+        if use_file_cache is None:
+            use_file_cache = self.use_file_cache
 
-        # Is speech already in memory
-        if cache_key in self.mem_cache:
-            filename = self.mem_cache[cache_key]["filename"]
-        # Is file store in file cache
-        elif use_cache and cache_key in self.file_cache:
-            filename = self.file_cache[cache_key]
-            self.hass.async_create_task(self._async_file_to_mem(cache_key))
-        # Load speech from engine into memory
-        else:
-            filename = await self._async_get_tts_audio(
-                engine_instance, cache_key, message, use_cache, language, options
+        extension = options.get(ATTR_PREFERRED_FORMAT, _DEFAULT_FORMAT)
+        token = f"{secrets.token_urlsafe(16)}.{extension}"
+        content, _ = mimetypes.guess_type(token)
+        result_stream = ResultStream(
+            token=token,
+            extension=extension,
+            content_type=content or "audio/mpeg",
+            use_file_cache=use_file_cache,
+            engine=engine,
+            language=language,
+            options=options,
+            _manager=self,
+        )
+        self.token_to_stream[token] = result_stream
+
+        if message is None:
+            return result_stream
+
+        # We added this method as an alternative to stream.async_set_message
+        # to avoid the options being processed twice
+        result_stream.async_set_message_cache(
+            self._async_ensure_cached_in_memory(
+                engine=engine,
+                engine_instance=engine_instance,
+                message=message,
+                use_file_cache=use_file_cache,
+                language=language,
+                options=options,
             )
+        )
 
-        # Use a randomly generated token instead of exposing the filename
-        token = self.filename_to_token.get(filename)
-        if not token:
-            # Keep extension (.mp3, etc.)
-            token = secrets.token_urlsafe(16) + os.path.splitext(filename)[1]
-
-            # Map token <-> filename
-            self.filename_to_token[filename] = token
-            self.token_to_filename[token] = filename
-
-        return f"/api/tts_proxy/{token}"
-
-    async def async_get_tts_audio(
-        self,
-        engine: str,
-        message: str,
-        cache: bool | None = None,
-        language: str | None = None,
-        options: dict | None = None,
-    ) -> tuple[str, bytes]:
-        """Fetch TTS audio."""
-        if (engine_instance := get_engine_instance(self.hass, engine)) is None:
-            raise HomeAssistantError(f"Provider {engine} not found")
-
-        language, options = self.process_options(engine_instance, language, options)
-        cache_key = self._generate_cache_key(message, language, options, engine)
-        use_cache = cache if cache is not None else self.use_cache
-
-        # If we have the file, load it into memory if necessary
-        if cache_key not in self.mem_cache:
-            if use_cache and cache_key in self.file_cache:
-                await self._async_file_to_mem(cache_key)
-            else:
-                await self._async_get_tts_audio(
-                    engine_instance, cache_key, message, use_cache, language, options
-                )
-
-        extension = os.path.splitext(self.mem_cache[cache_key]["filename"])[1][1:]
-        cached = self.mem_cache[cache_key]
-        if pending := cached.get("pending"):
-            await pending
-            cached = self.mem_cache[cache_key]
-        return extension, cached["voice"]
+        return result_stream
 
     @callback
-    def _generate_cache_key(
+    def async_cache_message_in_memory(
         self,
-        message: str,
-        language: str,
-        options: dict | None,
         engine: str,
-    ) -> str:
-        """Generate a cache key for a message."""
+        message: str,
+        use_file_cache: bool | None = None,
+        language: str | None = None,
+        options: dict | None = None,
+    ) -> TTSCache:
+        """Make sure a message is cached in memory and returns cache key."""
+        if (engine_instance := get_engine_instance(self.hass, engine)) is None:
+            raise HomeAssistantError(f"Provider {engine} not found")
+
+        language, options = self.process_options(engine_instance, language, options)
+        if use_file_cache is None:
+            use_file_cache = self.use_file_cache
+
+        return self._async_ensure_cached_in_memory(
+            engine=engine,
+            engine_instance=engine_instance,
+            message=message,
+            use_file_cache=use_file_cache,
+            language=language,
+            options=options,
+        )
+
+    @callback
+    def _async_ensure_cached_in_memory(
+        self,
+        engine: str,
+        engine_instance: TextToSpeechEntity | Provider,
+        message: str,
+        use_file_cache: bool,
+        language: str,
+        options: dict,
+    ) -> TTSCache:
+        """Ensure a message is cached.
+
+        Requires options, language to be processed.
+        """
         options_key = _hash_options(options) if options else "-"
         msg_hash = hashlib.sha1(bytes(message, "utf-8")).hexdigest()
-        return KEY_PATTERN.format(
+        cache_key = KEY_PATTERN.format(
             msg_hash, language.replace("_", "-"), options_key, engine
         ).lower()
 
-    async def _async_get_tts_audio(
+        # Is speech already in memory
+        if cache := self.mem_cache.get(cache_key):
+            _LOGGER.debug("Found audio in cache for %s", message[0:32])
+            return cache
+
+        store_to_disk = use_file_cache
+
+        if use_file_cache and (filename := self.file_cache.get(cache_key)):
+            _LOGGER.debug("Loading audio from disk for %s", message[0:32])
+            extension = os.path.splitext(filename)[1][1:]
+            data_gen = self._async_load_file(cache_key)
+            store_to_disk = False
+        else:
+            _LOGGER.debug("Generating audio for %s", message[0:32])
+            extension = options.get(ATTR_PREFERRED_FORMAT, _DEFAULT_FORMAT)
+            data_gen = self._async_generate_tts_audio(
+                engine_instance, message, language, options
+            )
+
+        cache = TTSCache(
+            cache_key=cache_key,
+            extension=extension,
+            data_gen=data_gen,
+        )
+
+        self.mem_cache[cache_key] = cache
+        self.hass.async_create_background_task(
+            self._load_data_into_cache(
+                cache, engine_instance, message, store_to_disk, language, options
+            ),
+            f"tts_load_data_into_cache_{engine_instance.name}",
+        )
+        self.memcache_cleanup.schedule()
+        return cache
+
+    async def _load_data_into_cache(
+        self,
+        cache: TTSCache,
+        engine_instance: TextToSpeechEntity | Provider,
+        message: str,
+        store_to_disk: bool,
+        language: str,
+        options: dict,
+    ) -> None:
+        """Load and process a finished loading TTS Cache."""
+        try:
+            data = await cache.async_load_data()
+        except Exception as err:  # pylint: disable=broad-except  # noqa: BLE001
+            # Truncate message so we don't flood the logs. Cutting off at 32 chars
+            # but since we add 3 dots to truncated message, we cut off at 35.
+            trunc_msg = message if len(message) < 35 else f"{message[0:32]}…"
+            _LOGGER.error("Error getting audio for %s: %s", trunc_msg, err)
+            self.mem_cache.pop(cache.cache_key, None)
+            return
+
+        if not store_to_disk:
+            return
+
+        filename = f"{cache.cache_key}.{cache.extension}".lower()
+
+        # Validate filename
+        if not _RE_VOICE_FILE.match(filename) and not _RE_LEGACY_VOICE_FILE.match(
+            filename
+        ):
+            raise HomeAssistantError(
+                f"TTS filename '{filename}' from {engine_instance.name} is invalid!"
+            )
+
+        if cache.extension == "mp3":
+            name = (
+                engine_instance.name if isinstance(engine_instance.name, str) else "-"
+            )
+            data = self.write_tags(filename, data, name, message, language, options)
+
+        voice_file = os.path.join(self.cache_dir, filename)
+
+        def save_speech() -> None:
+            """Store speech to filesystem."""
+            with open(voice_file, "wb") as speech:
+                speech.write(data)
+
+        try:
+            await self.hass.async_add_executor_job(save_speech)
+        except OSError as err:
+            _LOGGER.error("Can't write %s: %s", filename, err)
+        else:
+            self.file_cache[cache.cache_key] = filename
+
+    async def _async_generate_tts_audio(
         self,
         engine_instance: TextToSpeechEntity | Provider,
-        cache_key: str,
         message: str,
-        cache: bool,
         language: str,
         options: dict[str, Any],
-    ) -> str:
-        """Receive TTS, store for view in cache and return filename.
-
-        This method is a coroutine.
-        """
+    ) -> AsyncGenerator[bytes]:
+        """Generate TTS audio from an engine."""
         options = dict(options or {})
         supported_options = engine_instance.supported_options or []
 
@@ -773,114 +920,61 @@ class SpeechManager:
         if sample_bytes is not None:
             sample_bytes = int(sample_bytes)
 
-        async def get_tts_data() -> str:
-            """Handle data available."""
-            if engine_instance.name is None or engine_instance.name is UNDEFINED:
-                raise HomeAssistantError("TTS engine name is not set.")
+        if engine_instance.name is None or engine_instance.name is UNDEFINED:
+            raise HomeAssistantError("TTS engine name is not set.")
 
-            if isinstance(engine_instance, Provider):
-                extension, data = await engine_instance.async_get_tts_audio(
-                    message, language, options
-                )
-            else:
-                extension, data = await engine_instance.internal_async_get_tts_audio(
-                    message, language, options
-                )
+        if isinstance(engine_instance, Provider):
+            extension, data = await engine_instance.async_get_tts_audio(
+                message, language, options
+            )
 
             if data is None or extension is None:
                 raise HomeAssistantError(
                     f"No TTS from {engine_instance.name} for '{message}'"
                 )
 
-            # Only convert if we have a preferred format different than the
-            # expected format from the TTS system, or if a specific sample
-            # rate/format/channel count is requested.
-            needs_conversion = (
-                (final_extension != extension)
-                or (sample_rate is not None)
-                or (sample_channels is not None)
-                or (sample_bytes is not None)
+            async def make_data_generator(data: bytes) -> AsyncGenerator[bytes]:
+                yield data
+
+            data_gen = make_data_generator(data)
+
+        else:
+
+            async def message_gen() -> AsyncGenerator[str]:
+                yield message
+
+            tts_result = await engine_instance.internal_async_stream_tts_audio(
+                TTSAudioRequest(language, options, message_gen())
+            )
+            extension = tts_result.extension
+            data_gen = tts_result.data_gen
+
+        # Only convert if we have a preferred format different than the
+        # expected format from the TTS system, or if a specific sample
+        # rate/format/channel count is requested.
+        needs_conversion = (
+            (final_extension != extension)
+            or (sample_rate is not None)
+            or (sample_channels is not None)
+            or (sample_bytes is not None)
+        )
+
+        if needs_conversion:
+            data_gen = _async_convert_audio(
+                self.hass,
+                extension,
+                data_gen,
+                to_extension=final_extension,
+                to_sample_rate=sample_rate,
+                to_sample_channels=sample_channels,
+                to_sample_bytes=sample_bytes,
             )
 
-            if needs_conversion:
-                data = await async_convert_audio(
-                    self.hass,
-                    extension,
-                    data,
-                    to_extension=final_extension,
-                    to_sample_rate=sample_rate,
-                    to_sample_channels=sample_channels,
-                    to_sample_bytes=sample_bytes,
-                )
+        async for chunk in data_gen:
+            yield chunk
 
-            # Create file infos
-            filename = f"{cache_key}.{final_extension}".lower()
-
-            # Validate filename
-            if not _RE_VOICE_FILE.match(filename) and not _RE_LEGACY_VOICE_FILE.match(
-                filename
-            ):
-                raise HomeAssistantError(
-                    f"TTS filename '{filename}' from {engine_instance.name} is invalid!"
-                )
-
-            # Save to memory
-            if final_extension == "mp3":
-                data = self.write_tags(
-                    filename, data, engine_instance.name, message, language, options
-                )
-
-            self._async_store_to_memcache(cache_key, filename, data)
-
-            if cache:
-                self.hass.async_create_task(
-                    self._async_save_tts_audio(cache_key, filename, data)
-                )
-
-            return filename
-
-        audio_task = self.hass.async_create_task(get_tts_data(), eager_start=False)
-
-        def handle_error(_future: asyncio.Future) -> None:
-            """Handle error."""
-            if audio_task.exception():
-                self.mem_cache.pop(cache_key, None)
-
-        audio_task.add_done_callback(handle_error)
-
-        filename = f"{cache_key}.{final_extension}".lower()
-        self.mem_cache[cache_key] = {
-            "filename": filename,
-            "voice": b"",
-            "pending": audio_task,
-        }
-        return filename
-
-    async def _async_save_tts_audio(
-        self, cache_key: str, filename: str, data: bytes
-    ) -> None:
-        """Store voice data to file and file_cache.
-
-        This method is a coroutine.
-        """
-        voice_file = os.path.join(self.cache_dir, filename)
-
-        def save_speech() -> None:
-            """Store speech to filesystem."""
-            with open(voice_file, "wb") as speech:
-                speech.write(data)
-
-        try:
-            await self.hass.async_add_executor_job(save_speech)
-            self.file_cache[cache_key] = filename
-        except OSError as err:
-            _LOGGER.error("Can't write %s: %s", filename, err)
-
-    async def _async_file_to_mem(self, cache_key: str) -> None:
-        """Load voice from file cache into memory.
-
-        This method is a coroutine.
-        """
+    async def _async_load_file(self, cache_key: str) -> AsyncGenerator[bytes]:
+        """Load TTS audio from disk."""
         if not (filename := self.file_cache.get(cache_key)):
             raise HomeAssistantError(f"Key {cache_key} not in file cache!")
 
@@ -897,64 +991,7 @@ class SpeechManager:
             del self.file_cache[cache_key]
             raise HomeAssistantError(f"Can't read {voice_file}") from err
 
-        self._async_store_to_memcache(cache_key, filename, data)
-
-    @callback
-    def _async_store_to_memcache(
-        self, cache_key: str, filename: str, data: bytes
-    ) -> None:
-        """Store data to memcache and set timer to remove it."""
-        self.mem_cache[cache_key] = {
-            "filename": filename,
-            "voice": data,
-            "pending": None,
-        }
-
-        @callback
-        def async_remove_from_mem(_: datetime) -> None:
-            """Cleanup memcache."""
-            self.mem_cache.pop(cache_key, None)
-
-        async_call_later(
-            self.hass,
-            self.time_memory,
-            HassJob(
-                async_remove_from_mem,
-                name="tts remove_from_mem",
-                cancel_on_shutdown=True,
-            ),
-        )
-
-    async def async_read_tts(self, token: str) -> tuple[str | None, bytes]:
-        """Read a voice file and return binary.
-
-        This method is a coroutine.
-        """
-        filename = self.token_to_filename.get(token)
-        if not filename:
-            raise HomeAssistantError(f"{token} was not recognized!")
-
-        if not (record := _RE_VOICE_FILE.match(filename.lower())) and not (
-            record := _RE_LEGACY_VOICE_FILE.match(filename.lower())
-        ):
-            raise HomeAssistantError("Wrong tts file format!")
-
-        cache_key = KEY_PATTERN.format(
-            record.group(1), record.group(2), record.group(3), record.group(4)
-        )
-
-        if cache_key not in self.mem_cache:
-            if cache_key not in self.file_cache:
-                raise HomeAssistantError(f"{cache_key} not in cache!")
-            await self._async_file_to_mem(cache_key)
-
-        cached = self.mem_cache[cache_key]
-        if pending := cached.get("pending"):
-            await pending
-            cached = self.mem_cache[cache_key]
-
-        content, _ = mimetypes.guess_type(filename)
-        return content, cached["voice"]
+        yield data
 
     @staticmethod
     def write_tags(
@@ -1042,9 +1079,9 @@ class TextToSpeechUrlView(HomeAssistantView):
     url = "/api/tts_get_url"
     name = "api:tts:geturl"
 
-    def __init__(self, tts: SpeechManager) -> None:
+    def __init__(self, manager: SpeechManager) -> None:
         """Initialize a tts view."""
-        self.tts = tts
+        self.manager = manager
 
     async def post(self, request: web.Request) -> web.Response:
         """Generate speech and provide url."""
@@ -1061,45 +1098,65 @@ class TextToSpeechUrlView(HomeAssistantView):
 
         engine = data.get("engine_id") or data[ATTR_PLATFORM]
         message = data[ATTR_MESSAGE]
-        cache = data.get(ATTR_CACHE)
+        use_file_cache = data.get(ATTR_CACHE)
         language = data.get(ATTR_LANGUAGE)
         options = data.get(ATTR_OPTIONS)
 
         try:
-            path = await self.tts.async_get_url_path(
-                engine, message, cache=cache, language=language, options=options
+            stream = self.manager.async_create_result_stream(
+                engine,
+                message,
+                use_file_cache=use_file_cache,
+                language=language,
+                options=options,
             )
         except HomeAssistantError as err:
             _LOGGER.error("Error on init tts: %s", err)
             return self.json({"error": err}, HTTPStatus.BAD_REQUEST)
 
-        base = get_url(self.tts.hass)
-        url = base + path
+        base = get_url(self.manager.hass)
+        url = base + stream.url
 
-        return self.json({"url": url, "path": path})
+        return self.json({"url": url, "path": stream.url})
 
 
 class TextToSpeechView(HomeAssistantView):
     """TTS view to serve a speech audio."""
 
     requires_auth = False
-    url = "/api/tts_proxy/{filename}"
+    url = "/api/tts_proxy/{token}"
     name = "api:tts_speech"
 
-    def __init__(self, tts: SpeechManager) -> None:
+    def __init__(self, manager: SpeechManager) -> None:
         """Initialize a tts view."""
-        self.tts = tts
+        self.manager = manager
 
-    async def get(self, request: web.Request, filename: str) -> web.Response:
+    async def get(self, request: web.Request, token: str) -> web.StreamResponse:
         """Start a get request."""
-        try:
-            # filename is actually token, but we keep its name for compatibility
-            content, data = await self.tts.async_read_tts(filename)
-        except HomeAssistantError as err:
-            _LOGGER.error("Error on load tts: %s", err)
+        stream = self.manager.token_to_stream.get(token)
+
+        if stream is None:
             return web.Response(status=HTTPStatus.NOT_FOUND)
 
-        return web.Response(body=data, content_type=content)
+        response: web.StreamResponse | None = None
+        try:
+            async for data in stream.async_stream_result():
+                if response is None:
+                    response = web.StreamResponse()
+                    response.content_type = stream.content_type
+                    await response.prepare(request)
+
+                await response.write(data)
+        # pylint: disable=broad-except
+        except Exception as err:  # noqa: BLE001
+            _LOGGER.error("Error streaming tts: %s", err)
+
+        # Empty result or exception happened
+        if response is None:
+            return web.Response(status=HTTPStatus.INTERNAL_SERVER_ERROR)
+
+        await response.write_eof()
+        return response
 
 
 @websocket_api.websocket_command(
diff --git a/homeassistant/components/tts/entity.py b/homeassistant/components/tts/entity.py
new file mode 100644
index 00000000000..199d673398e
--- /dev/null
+++ b/homeassistant/components/tts/entity.py
@@ -0,0 +1,196 @@
+"""Entity for Text-to-Speech."""
+
+from collections.abc import AsyncGenerator, Mapping
+from dataclasses import dataclass
+from functools import partial
+from typing import Any, final
+
+from propcache.api import cached_property
+
+from homeassistant.components.media_player import (
+    ATTR_MEDIA_ANNOUNCE,
+    ATTR_MEDIA_CONTENT_ID,
+    ATTR_MEDIA_CONTENT_TYPE,
+    DOMAIN as DOMAIN_MP,
+    SERVICE_PLAY_MEDIA,
+    MediaType,
+)
+from homeassistant.const import ATTR_ENTITY_ID, STATE_UNAVAILABLE, STATE_UNKNOWN
+from homeassistant.core import callback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.restore_state import RestoreEntity
+from homeassistant.util import dt as dt_util
+
+from .const import TtsAudioType
+from .media_source import generate_media_source_id
+from .models import Voice
+
+CACHED_PROPERTIES_WITH_ATTR_ = {
+    "default_language",
+    "default_options",
+    "supported_languages",
+    "supported_options",
+}
+
+
+@dataclass
+class TTSAudioRequest:
+    """Request to get TTS audio."""
+
+    language: str
+    options: dict[str, Any]
+    message_gen: AsyncGenerator[str]
+
+
+@dataclass
+class TTSAudioResponse:
+    """Response containing TTS audio stream."""
+
+    extension: str
+    data_gen: AsyncGenerator[bytes]
+
+
+class TextToSpeechEntity(RestoreEntity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
+    """Represent a single TTS engine."""
+
+    _attr_should_poll = False
+    __last_tts_loaded: str | None = None
+
+    _attr_default_language: str
+    _attr_default_options: Mapping[str, Any] | None = None
+    _attr_supported_languages: list[str]
+    _attr_supported_options: list[str] | None = None
+
+    @property
+    @final
+    def state(self) -> str | None:
+        """Return the state of the entity."""
+        if self.__last_tts_loaded is None:
+            return None
+        return self.__last_tts_loaded
+
+    @cached_property
+    def supported_languages(self) -> list[str]:
+        """Return a list of supported languages."""
+        return self._attr_supported_languages
+
+    @cached_property
+    def default_language(self) -> str:
+        """Return the default language."""
+        return self._attr_default_language
+
+    @cached_property
+    def supported_options(self) -> list[str] | None:
+        """Return a list of supported options like voice, emotions."""
+        return self._attr_supported_options
+
+    @cached_property
+    def default_options(self) -> Mapping[str, Any] | None:
+        """Return a mapping with the default options."""
+        return self._attr_default_options
+
+    @callback
+    def async_get_supported_voices(self, language: str) -> list[Voice] | None:
+        """Return a list of supported voices for a language."""
+        return None
+
+    async def async_internal_added_to_hass(self) -> None:
+        """Call when the entity is added to hass."""
+        await super().async_internal_added_to_hass()
+        try:
+            _ = self.default_language
+        except AttributeError as err:
+            raise AttributeError(
+                "TTS entities must either set the '_attr_default_language' attribute or override the 'default_language' property"
+            ) from err
+        try:
+            _ = self.supported_languages
+        except AttributeError as err:
+            raise AttributeError(
+                "TTS entities must either set the '_attr_supported_languages' attribute or override the 'supported_languages' property"
+            ) from err
+        state = await self.async_get_last_state()
+        if (
+            state is not None
+            and state.state is not None
+            and state.state not in (STATE_UNAVAILABLE, STATE_UNKNOWN)
+        ):
+            self.__last_tts_loaded = state.state
+
+    async def async_speak(
+        self,
+        media_player_entity_id: list[str],
+        message: str,
+        cache: bool,
+        language: str | None = None,
+        options: dict | None = None,
+    ) -> None:
+        """Speak via a Media Player."""
+        await self.hass.services.async_call(
+            DOMAIN_MP,
+            SERVICE_PLAY_MEDIA,
+            {
+                ATTR_ENTITY_ID: media_player_entity_id,
+                ATTR_MEDIA_CONTENT_ID: generate_media_source_id(
+                    self.hass,
+                    message=message,
+                    engine=self.entity_id,
+                    language=language,
+                    options=options,
+                    cache=cache,
+                ),
+                ATTR_MEDIA_CONTENT_TYPE: MediaType.MUSIC,
+                ATTR_MEDIA_ANNOUNCE: True,
+            },
+            blocking=True,
+            context=self._context,
+        )
+
+    @final
+    async def internal_async_stream_tts_audio(
+        self, request: TTSAudioRequest
+    ) -> TTSAudioResponse:
+        """Process an audio stream to TTS service.
+
+        Only streaming content is allowed!
+        """
+        self.__last_tts_loaded = dt_util.utcnow().isoformat()
+        self.async_write_ha_state()
+        return await self.async_stream_tts_audio(request)
+
+    async def async_stream_tts_audio(
+        self, request: TTSAudioRequest
+    ) -> TTSAudioResponse:
+        """Generate speech from an incoming message.
+
+        The default implementation is backwards compatible with async_get_tts_audio.
+        """
+        message = "".join([chunk async for chunk in request.message_gen])
+        extension, data = await self.async_get_tts_audio(
+            message, request.language, request.options
+        )
+
+        if extension is None or data is None:
+            raise HomeAssistantError(f"No TTS from {self.entity_id} for '{message}'")
+
+        async def data_gen() -> AsyncGenerator[bytes]:
+            yield data
+
+        return TTSAudioResponse(extension, data_gen())
+
+    def get_tts_audio(
+        self, message: str, language: str, options: dict[str, Any]
+    ) -> TtsAudioType:
+        """Load tts audio file from the engine."""
+        raise NotImplementedError
+
+    async def async_get_tts_audio(
+        self, message: str, language: str, options: dict[str, Any]
+    ) -> TtsAudioType:
+        """Load tts audio file from the engine.
+
+        Return a tuple of file extension and data as bytes.
+        """
+        return await self.hass.async_add_executor_job(
+            partial(self.get_tts_audio, message, language, options=options)
+        )
diff --git a/homeassistant/components/tts/legacy.py b/homeassistant/components/tts/legacy.py
index 54ea89cb674..6f0541734d1 100644
--- a/homeassistant/components/tts/legacy.py
+++ b/homeassistant/components/tts/legacy.py
@@ -27,8 +27,7 @@ from homeassistant.const import (
     CONF_PLATFORM,
 )
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.service import async_set_service_schema
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.setup import (
diff --git a/homeassistant/components/tts/media_source.py b/homeassistant/components/tts/media_source.py
index 4f1fa59f001..aa2cd6e7555 100644
--- a/homeassistant/components/tts/media_source.py
+++ b/homeassistant/components/tts/media_source.py
@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import json
-import mimetypes
 from typing import TypedDict
 
 from yarl import URL
@@ -73,7 +72,7 @@ class MediaSourceOptions(TypedDict):
     message: str
     language: str | None
     options: dict | None
-    cache: bool | None
+    use_file_cache: bool | None
 
 
 @callback
@@ -98,10 +97,10 @@ def media_source_id_to_kwargs(media_source_id: str) -> MediaSourceOptions:
         "message": parsed.query["message"],
         "language": parsed.query.get("language"),
         "options": options,
-        "cache": None,
+        "use_file_cache": None,
     }
     if "cache" in parsed.query:
-        kwargs["cache"] = parsed.query["cache"] == "true"
+        kwargs["use_file_cache"] = parsed.query["cache"] == "true"
 
     return kwargs
 
@@ -119,7 +118,7 @@ class TTSMediaSource(MediaSource):
     async def async_resolve_media(self, item: MediaSourceItem) -> PlayMedia:
         """Resolve media to a url."""
         try:
-            url = await self.hass.data[DATA_TTS_MANAGER].async_get_url_path(
+            stream = self.hass.data[DATA_TTS_MANAGER].async_create_result_stream(
                 **media_source_id_to_kwargs(item.identifier)
             )
         except Unresolvable:
@@ -127,9 +126,7 @@ class TTSMediaSource(MediaSource):
         except HomeAssistantError as err:
             raise Unresolvable(str(err)) from err
 
-        mime_type = mimetypes.guess_type(url)[0] or "audio/mpeg"
-
-        return PlayMedia(url, mime_type)
+        return PlayMedia(stream.url, stream.content_type)
 
     async def async_browse_media(
         self,
diff --git a/homeassistant/components/tts/notify.py b/homeassistant/components/tts/notify.py
index 429d46660e7..c4c1bb1ae15 100644
--- a/homeassistant/components/tts/notify.py
+++ b/homeassistant/components/tts/notify.py
@@ -13,7 +13,7 @@ from homeassistant.components.notify import (
 )
 from homeassistant.const import ATTR_ENTITY_ID, CONF_ENTITY_ID, CONF_NAME
 from homeassistant.core import HomeAssistant, split_entity_id
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import ATTR_LANGUAGE, ATTR_MEDIA_PLAYER_ENTITY_ID, ATTR_MESSAGE, DOMAIN
diff --git a/homeassistant/components/tuya/__init__.py b/homeassistant/components/tuya/__init__.py
index c8a639cd239..32119add5f4 100644
--- a/homeassistant/components/tuya/__init__.py
+++ b/homeassistant/components/tuya/__init__.py
@@ -3,7 +3,8 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, NamedTuple
+from typing import TYPE_CHECKING, Any, NamedTuple
+from urllib.parse import urlsplit
 
 from tuya_sharing import (
     CustomerDevice,
@@ -11,6 +12,7 @@ from tuya_sharing import (
     SharingDeviceListener,
     SharingTokenListener,
 )
+from tuya_sharing.mq import SharingMQ, SharingMQConfig
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
@@ -45,13 +47,81 @@ class HomeAssistantTuyaData(NamedTuple):
     listener: SharingDeviceListener
 
 
+if TYPE_CHECKING:
+    import paho.mqtt.client as mqtt
+
+
+class ManagerCompat(Manager):
+    """Extended Manager class from the Tuya device sharing SDK.
+
+    The extension ensures compatibility a paho-mqtt client version >= 2.1.0.
+    It overrides extend refresh_mq method to ensure correct paho.mqtt client calls.
+
+    This code can be removed when a version of tuya-device-sharing with
+    https://github.com/tuya/tuya-device-sharing-sdk/pull/25 is available.
+    """
+
+    def refresh_mq(self):
+        """Refresh the MQTT connection."""
+        if self.mq is not None:
+            self.mq.stop()
+            self.mq = None
+
+        home_ids = [home.id for home in self.user_homes]
+        device = [
+            device
+            for device in self.device_map.values()
+            if hasattr(device, "id") and getattr(device, "set_up", False)
+        ]
+
+        sharing_mq = SharingMQCompat(self.customer_api, home_ids, device)
+        sharing_mq.start()
+        sharing_mq.add_message_listener(self.on_message)
+        self.mq = sharing_mq
+
+
+class SharingMQCompat(SharingMQ):
+    """Extended SharingMQ class from the Tuya device sharing SDK.
+
+    The extension ensures compatibility a paho-mqtt client version >= 2.1.0.
+    It overrides _start method to ensure correct paho.mqtt client calls.
+
+    This code can be removed when a version of tuya-device-sharing with
+    https://github.com/tuya/tuya-device-sharing-sdk/pull/25 is available.
+    """
+
+    def _start(self, mq_config: SharingMQConfig) -> mqtt.Client:
+        """Start the MQTT client."""
+        # We don't import on the top because some integrations
+        # should be able to optionally rely on MQTT.
+        import paho.mqtt.client as mqtt  # pylint: disable=import-outside-toplevel
+
+        mqttc = mqtt.Client(client_id=mq_config.client_id)
+        mqttc.username_pw_set(mq_config.username, mq_config.password)
+        mqttc.user_data_set({"mqConfig": mq_config})
+        mqttc.on_connect = self._on_connect
+        mqttc.on_message = self._on_message
+        mqttc.on_subscribe = self._on_subscribe
+        mqttc.on_log = self._on_log
+        mqttc.on_disconnect = self._on_disconnect
+
+        url = urlsplit(mq_config.url)
+        if url.scheme == "ssl":
+            mqttc.tls_set()
+
+        mqttc.connect(url.hostname, url.port)
+
+        mqttc.loop_start()
+        return mqttc
+
+
 async def async_setup_entry(hass: HomeAssistant, entry: TuyaConfigEntry) -> bool:
     """Async setup hass config entry."""
     if CONF_APP_TYPE in entry.data:
         raise ConfigEntryAuthFailed("Authentication failed. Please re-authenticate.")
 
     token_listener = TokenListener(hass, entry)
-    manager = Manager(
+    manager = ManagerCompat(
         TUYA_CLIENT_ID,
         entry.data[CONF_USER_CODE],
         entry.data[CONF_TERMINAL_ID],
diff --git a/homeassistant/components/tuya/alarm_control_panel.py b/homeassistant/components/tuya/alarm_control_panel.py
index 56bccc73581..96f7d3a1e1c 100644
--- a/homeassistant/components/tuya/alarm_control_panel.py
+++ b/homeassistant/components/tuya/alarm_control_panel.py
@@ -14,7 +14,7 @@ from homeassistant.components.alarm_control_panel import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TuyaConfigEntry
 from .const import TUYA_DISCOVERY_NEW, DPCode, DPType
@@ -53,7 +53,9 @@ ALARM: dict[str, tuple[AlarmControlPanelEntityDescription, ...]] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TuyaConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TuyaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tuya alarm dynamically through Tuya discovery."""
     hass_data = entry.runtime_data
diff --git a/homeassistant/components/tuya/binary_sensor.py b/homeassistant/components/tuya/binary_sensor.py
index 12661a26fd1..486dd6e1387 100644
--- a/homeassistant/components/tuya/binary_sensor.py
+++ b/homeassistant/components/tuya/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TuyaConfigEntry
 from .const import TUYA_DISCOVERY_NEW, DPCode
@@ -256,7 +256,7 @@ BINARY_SENSORS: dict[str, tuple[TuyaBinarySensorEntityDescription, ...]] = {
         TuyaBinarySensorEntityDescription(
             key=DPCode.WATERSENSOR_STATE,
             device_class=BinarySensorDeviceClass.MOISTURE,
-            on_value="alarm",
+            on_value={"1", "alarm"},
         ),
         TAMPER_BINARY_SENSOR,
     ),
@@ -291,6 +291,9 @@ BINARY_SENSORS: dict[str, tuple[TuyaBinarySensorEntityDescription, ...]] = {
     # Temperature and Humidity Sensor
     # https://developer.tuya.com/en/docs/iot/categorywsdcg?id=Kaiuz3hinij34
     "wsdcg": (TAMPER_BINARY_SENSOR,),
+    # Temperature and Humidity Sensor with External Probe
+    # New undocumented category qxj, see https://github.com/home-assistant/core/issues/136472
+    "qxj": (TAMPER_BINARY_SENSOR,),
     # Pressure Sensor
     # https://developer.tuya.com/en/docs/iot/categoryylcg?id=Kaiuz3kc2e4gm
     "ylcg": (
@@ -341,7 +344,9 @@ BINARY_SENSORS: dict[str, tuple[TuyaBinarySensorEntityDescription, ...]] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TuyaConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TuyaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tuya binary sensor dynamically through Tuya discovery."""
     hass_data = entry.runtime_data
diff --git a/homeassistant/components/tuya/button.py b/homeassistant/components/tuya/button.py
index f77fed776b0..8e538b07309 100644
--- a/homeassistant/components/tuya/button.py
+++ b/homeassistant/components/tuya/button.py
@@ -8,7 +8,7 @@ from homeassistant.components.button import ButtonEntity, ButtonEntityDescriptio
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TuyaConfigEntry
 from .const import TUYA_DISCOVERY_NEW, DPCode
@@ -58,7 +58,9 @@ BUTTONS: dict[str, tuple[ButtonEntityDescription, ...]] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TuyaConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TuyaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tuya buttons dynamically through Tuya discovery."""
     hass_data = entry.runtime_data
diff --git a/homeassistant/components/tuya/camera.py b/homeassistant/components/tuya/camera.py
index 9e66531dd51..c04a8a043dc 100644
--- a/homeassistant/components/tuya/camera.py
+++ b/homeassistant/components/tuya/camera.py
@@ -8,7 +8,7 @@ from homeassistant.components import ffmpeg
 from homeassistant.components.camera import Camera as CameraEntity, CameraEntityFeature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TuyaConfigEntry
 from .const import TUYA_DISCOVERY_NEW, DPCode
@@ -20,11 +20,16 @@ CAMERAS: tuple[str, ...] = (
     # Smart Camera (including doorbells)
     # https://developer.tuya.com/en/docs/iot/categorysgbj?id=Kaiuz37tlpbnu
     "sp",
+    # Smart Camera - Low power consumption camera
+    # Undocumented, see https://github.com/home-assistant/core/issues/132844
+    "dghsxj",
 )
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TuyaConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TuyaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tuya cameras dynamically through Tuya discovery."""
     hass_data = entry.runtime_data
diff --git a/homeassistant/components/tuya/climate.py b/homeassistant/components/tuya/climate.py
index 1780256a740..deccb08c5aa 100644
--- a/homeassistant/components/tuya/climate.py
+++ b/homeassistant/components/tuya/climate.py
@@ -21,7 +21,7 @@ from homeassistant.components.climate import (
 from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TuyaConfigEntry
 from .const import TUYA_DISCOVERY_NEW, DPCode, DPType
@@ -84,7 +84,9 @@ CLIMATE_DESCRIPTIONS: dict[str, TuyaClimateEntityDescription] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TuyaConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TuyaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tuya climate dynamically through Tuya discovery."""
     hass_data = entry.runtime_data
diff --git a/homeassistant/components/tuya/const.py b/homeassistant/components/tuya/const.py
index 08bdef474ef..a40260ed787 100644
--- a/homeassistant/components/tuya/const.py
+++ b/homeassistant/components/tuya/const.py
@@ -333,6 +333,12 @@ class DPCode(StrEnum):
     TEMP_CONTROLLER = "temp_controller"
     TEMP_CURRENT = "temp_current"  # Current temperature in °C
     TEMP_CURRENT_F = "temp_current_f"  # Current temperature in °F
+    TEMP_CURRENT_EXTERNAL = (
+        "temp_current_external"  # Current external temperature in Celsius
+    )
+    TEMP_CURRENT_EXTERNAL_F = (
+        "temp_current_external_f"  # Current external temperature in Fahrenheit
+    )
     TEMP_INDOOR = "temp_indoor"  # Indoor temperature in °C
     TEMP_SET = "temp_set"  # Set the temperature in °C
     TEMP_SET_F = "temp_set_f"  # Set the temperature in °F
diff --git a/homeassistant/components/tuya/cover.py b/homeassistant/components/tuya/cover.py
index 9c3269c27f2..315075e7f37 100644
--- a/homeassistant/components/tuya/cover.py
+++ b/homeassistant/components/tuya/cover.py
@@ -17,7 +17,7 @@ from homeassistant.components.cover import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TuyaConfigEntry
 from .const import TUYA_DISCOVERY_NEW, DPCode, DPType
@@ -142,7 +142,9 @@ COVERS: dict[str, tuple[TuyaCoverEntityDescription, ...]] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TuyaConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TuyaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tuya cover dynamically through Tuya discovery."""
     hass_data = entry.runtime_data
diff --git a/homeassistant/components/tuya/fan.py b/homeassistant/components/tuya/fan.py
index ffab9efdde8..3b951e75da1 100644
--- a/homeassistant/components/tuya/fan.py
+++ b/homeassistant/components/tuya/fan.py
@@ -14,7 +14,7 @@ from homeassistant.components.fan import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     ordered_list_item_to_percentage,
     percentage_to_ordered_list_item,
@@ -34,7 +34,9 @@ TUYA_SUPPORT_TYPE = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TuyaConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TuyaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up tuya fan dynamically through tuya discovery."""
     hass_data = entry.runtime_data
diff --git a/homeassistant/components/tuya/humidifier.py b/homeassistant/components/tuya/humidifier.py
index cb872d67719..6c47148eeda 100644
--- a/homeassistant/components/tuya/humidifier.py
+++ b/homeassistant/components/tuya/humidifier.py
@@ -14,7 +14,7 @@ from homeassistant.components.humidifier import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TuyaConfigEntry
 from .const import TUYA_DISCOVERY_NEW, DPCode, DPType
@@ -55,7 +55,9 @@ HUMIDIFIERS: dict[str, TuyaHumidifierEntityDescription] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TuyaConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TuyaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tuya (de)humidifier dynamically through Tuya discovery."""
     hass_data = entry.runtime_data
diff --git a/homeassistant/components/tuya/light.py b/homeassistant/components/tuya/light.py
index d7dffc16b58..67a94c4e267 100644
--- a/homeassistant/components/tuya/light.py
+++ b/homeassistant/components/tuya/light.py
@@ -20,7 +20,7 @@ from homeassistant.components.light import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import color as color_util
 
 from . import TuyaConfigEntry
@@ -327,6 +327,18 @@ LIGHTS: dict[str, tuple[TuyaLightEntityDescription, ...]] = {
             brightness_min=DPCode.BRIGHTNESS_MIN_1,
         ),
     ),
+    # Outdoor Flood Light
+    # Not documented
+    "tyd": (
+        TuyaLightEntityDescription(
+            key=DPCode.SWITCH_LED,
+            name=None,
+            color_mode=DPCode.WORK_MODE,
+            brightness=DPCode.BRIGHT_VALUE,
+            color_temp=DPCode.TEMP_VALUE,
+            color_data=DPCode.COLOUR_DATA,
+        ),
+    ),
     # Solar Light
     # https://developer.tuya.com/en/docs/iot/tynd?id=Kaof8j02e1t98
     "tyndj": (
@@ -392,6 +404,10 @@ LIGHTS["cz"] = LIGHTS["kg"]
 # https://developer.tuya.com/en/docs/iot/s?id=K9gf7o5prgf7s
 LIGHTS["pc"] = LIGHTS["kg"]
 
+# Smart Camera - Low power consumption camera (duplicate of `sp`)
+# Undocumented, see https://github.com/home-assistant/core/issues/132844
+LIGHTS["dghsxj"] = LIGHTS["sp"]
+
 # Dimmer (duplicate of `tgq`)
 # https://developer.tuya.com/en/docs/iot/tgq?id=Kaof8ke9il4k4
 LIGHTS["tdq"] = LIGHTS["tgq"]
@@ -421,7 +437,9 @@ class ColorData:
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TuyaConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TuyaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up tuya light dynamically through tuya discovery."""
     hass_data = entry.runtime_data
diff --git a/homeassistant/components/tuya/number.py b/homeassistant/components/tuya/number.py
index 8d5b5dbfa19..d4fe7836daa 100644
--- a/homeassistant/components/tuya/number.py
+++ b/homeassistant/components/tuya/number.py
@@ -12,7 +12,7 @@ from homeassistant.components.number import (
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfTime
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TuyaConfigEntry
 from .const import DEVICE_CLASS_UNITS, DOMAIN, TUYA_DISCOVERY_NEW, DPCode, DPType
@@ -305,9 +305,15 @@ NUMBERS: dict[str, tuple[NumberEntityDescription, ...]] = {
     ),
 }
 
+# Smart Camera - Low power consumption camera (duplicate of `sp`)
+# Undocumented, see https://github.com/home-assistant/core/issues/132844
+NUMBERS["dghsxj"] = NUMBERS["sp"]
+
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TuyaConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TuyaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tuya number dynamically through Tuya discovery."""
     hass_data = entry.runtime_data
diff --git a/homeassistant/components/tuya/scene.py b/homeassistant/components/tuya/scene.py
index dbc849356b2..4ad027d39ee 100644
--- a/homeassistant/components/tuya/scene.py
+++ b/homeassistant/components/tuya/scene.py
@@ -9,14 +9,16 @@ from tuya_sharing import Manager, SharingScene
 from homeassistant.components.scene import Scene
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TuyaConfigEntry
 from .const import DOMAIN
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TuyaConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TuyaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tuya scenes."""
     hass_data = entry.runtime_data
diff --git a/homeassistant/components/tuya/select.py b/homeassistant/components/tuya/select.py
index 831d3cb3e0c..553191b7d45 100644
--- a/homeassistant/components/tuya/select.py
+++ b/homeassistant/components/tuya/select.py
@@ -8,7 +8,7 @@ from homeassistant.components.select import SelectEntity, SelectEntityDescriptio
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TuyaConfigEntry
 from .const import TUYA_DISCOVERY_NEW, DPCode, DPType
@@ -326,9 +326,15 @@ SELECTS["cz"] = SELECTS["kg"]
 # https://developer.tuya.com/en/docs/iot/s?id=K9gf7o5prgf7s
 SELECTS["pc"] = SELECTS["kg"]
 
+# Smart Camera - Low power consumption camera (duplicate of `sp`)
+# Undocumented, see https://github.com/home-assistant/core/issues/132844
+SELECTS["dghsxj"] = SELECTS["sp"]
+
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TuyaConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TuyaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tuya select dynamically through Tuya discovery."""
     hass_data = entry.runtime_data
diff --git a/homeassistant/components/tuya/sensor.py b/homeassistant/components/tuya/sensor.py
index f766c744998..b1150be306a 100644
--- a/homeassistant/components/tuya/sensor.py
+++ b/homeassistant/components/tuya/sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import TuyaConfigEntry
@@ -45,7 +45,7 @@ class TuyaSensorEntityDescription(SensorEntityDescription):
     subkey: str | None = None
 
 
-# Commonly used battery sensors, that are re-used in the sensors down below.
+# Commonly used battery sensors, that are reused in the sensors down below.
 BATTERY_SENSORS: tuple[TuyaSensorEntityDescription, ...] = (
     TuyaSensorEntityDescription(
         key=DPCode.BATTERY_PERCENTAGE,
@@ -715,6 +715,47 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
         ),
         *BATTERY_SENSORS,
     ),
+    # Temperature and Humidity Sensor with External Probe
+    # New undocumented category qxj, see https://github.com/home-assistant/core/issues/136472
+    "qxj": (
+        TuyaSensorEntityDescription(
+            key=DPCode.VA_TEMPERATURE,
+            translation_key="temperature",
+            device_class=SensorDeviceClass.TEMPERATURE,
+            state_class=SensorStateClass.MEASUREMENT,
+        ),
+        TuyaSensorEntityDescription(
+            key=DPCode.TEMP_CURRENT,
+            translation_key="temperature",
+            device_class=SensorDeviceClass.TEMPERATURE,
+            state_class=SensorStateClass.MEASUREMENT,
+        ),
+        TuyaSensorEntityDescription(
+            key=DPCode.TEMP_CURRENT_EXTERNAL,
+            translation_key="temperature_external",
+            device_class=SensorDeviceClass.TEMPERATURE,
+            state_class=SensorStateClass.MEASUREMENT,
+        ),
+        TuyaSensorEntityDescription(
+            key=DPCode.VA_HUMIDITY,
+            translation_key="humidity",
+            device_class=SensorDeviceClass.HUMIDITY,
+            state_class=SensorStateClass.MEASUREMENT,
+        ),
+        TuyaSensorEntityDescription(
+            key=DPCode.HUMIDITY_VALUE,
+            translation_key="humidity",
+            device_class=SensorDeviceClass.HUMIDITY,
+            state_class=SensorStateClass.MEASUREMENT,
+        ),
+        TuyaSensorEntityDescription(
+            key=DPCode.BRIGHT_VALUE,
+            translation_key="illuminance",
+            device_class=SensorDeviceClass.ILLUMINANCE,
+            state_class=SensorStateClass.MEASUREMENT,
+        ),
+        *BATTERY_SENSORS,
+    ),
     # Pressure Sensor
     # https://developer.tuya.com/en/docs/iot/categoryylcg?id=Kaiuz3kc2e4gm
     "ylcg": (
@@ -1220,9 +1261,15 @@ SENSORS["cz"] = SENSORS["kg"]
 # https://developer.tuya.com/en/docs/iot/s?id=K9gf7o5prgf7s
 SENSORS["pc"] = SENSORS["kg"]
 
+# Smart Camera - Low power consumption camera (duplicate of `sp`)
+# Undocumented, see https://github.com/home-assistant/core/issues/132844
+SENSORS["dghsxj"] = SENSORS["sp"]
+
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TuyaConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TuyaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tuya sensor dynamically through Tuya discovery."""
     hass_data = entry.runtime_data
diff --git a/homeassistant/components/tuya/siren.py b/homeassistant/components/tuya/siren.py
index 6f7dfe4c96c..039442dafe5 100644
--- a/homeassistant/components/tuya/siren.py
+++ b/homeassistant/components/tuya/siren.py
@@ -14,7 +14,7 @@ from homeassistant.components.siren import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TuyaConfigEntry
 from .const import TUYA_DISCOVERY_NEW, DPCode
@@ -54,9 +54,15 @@ SIRENS: dict[str, tuple[SirenEntityDescription, ...]] = {
     ),
 }
 
+# Smart Camera - Low power consumption camera (duplicate of `sp`)
+# Undocumented, see https://github.com/home-assistant/core/issues/132844
+SIRENS["dghsxj"] = SIRENS["sp"]
+
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TuyaConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TuyaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tuya siren dynamically through Tuya discovery."""
     hass_data = entry.runtime_data
diff --git a/homeassistant/components/tuya/strings.json b/homeassistant/components/tuya/strings.json
index 8ec61cc8aa5..83847d32fb5 100644
--- a/homeassistant/components/tuya/strings.json
+++ b/homeassistant/components/tuya/strings.json
@@ -469,6 +469,9 @@
       "temperature": {
         "name": "[%key:component::sensor::entity_component::temperature::name%]"
       },
+      "temperature_external": {
+        "name": "Probe temperature"
+      },
       "humidity": {
         "name": "[%key:component::sensor::entity_component::humidity::name%]"
       },
diff --git a/homeassistant/components/tuya/switch.py b/homeassistant/components/tuya/switch.py
index 2b5e6fec4a6..4000e8d9b24 100644
--- a/homeassistant/components/tuya/switch.py
+++ b/homeassistant/components/tuya/switch.py
@@ -14,7 +14,7 @@ from homeassistant.components.switch import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TuyaConfigEntry
 from .const import TUYA_DISCOVERY_NEW, DPCode
@@ -612,6 +612,15 @@ SWITCHES: dict[str, tuple[SwitchEntityDescription, ...]] = {
             device_class=SwitchDeviceClass.OUTLET,
         ),
     ),
+    # SIREN: Siren (switch) with Temperature and Humidity Sensor with External Probe
+    # New undocumented category qxj, see https://github.com/home-assistant/core/issues/136472
+    "qxj": (
+        SwitchEntityDescription(
+            key=DPCode.SWITCH,
+            translation_key="switch",
+            device_class=SwitchDeviceClass.OUTLET,
+        ),
+    ),
     # Ceiling Light
     # https://developer.tuya.com/en/docs/iot/ceiling-light?id=Kaiuz03xxfc4r
     "xdd": (
@@ -726,9 +735,15 @@ SWITCHES: dict[str, tuple[SwitchEntityDescription, ...]] = {
 # https://developer.tuya.com/en/docs/iot/s?id=K9gf7o5prgf7s
 SWITCHES["cz"] = SWITCHES["pc"]
 
+# Smart Camera - Low power consumption camera (duplicate of `sp`)
+# Undocumented, see https://github.com/home-assistant/core/issues/132844
+SWITCHES["dghsxj"] = SWITCHES["sp"]
+
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TuyaConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TuyaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up tuya sensors dynamically through tuya discovery."""
     hass_data = entry.runtime_data
diff --git a/homeassistant/components/tuya/vacuum.py b/homeassistant/components/tuya/vacuum.py
index bab9ac309ec..e36a682fa4e 100644
--- a/homeassistant/components/tuya/vacuum.py
+++ b/homeassistant/components/tuya/vacuum.py
@@ -13,7 +13,7 @@ from homeassistant.components.vacuum import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import TuyaConfigEntry
 from .const import TUYA_DISCOVERY_NEW, DPCode, DPType
@@ -48,7 +48,9 @@ TUYA_STATUS_TO_HA = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: TuyaConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: TuyaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Tuya vacuum dynamically through Tuya discovery."""
     hass_data = entry.runtime_data
diff --git a/homeassistant/components/twentemilieu/calendar.py b/homeassistant/components/twentemilieu/calendar.py
index 69c509b9edf..19e3f4f3337 100644
--- a/homeassistant/components/twentemilieu/calendar.py
+++ b/homeassistant/components/twentemilieu/calendar.py
@@ -7,8 +7,8 @@ from datetime import datetime, timedelta
 from homeassistant.components.calendar import CalendarEntity, CalendarEvent
 from homeassistant.const import CONF_ID
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from .const import WASTE_TYPE_TO_DESCRIPTION
 from .coordinator import TwenteMilieuConfigEntry
@@ -18,7 +18,7 @@ from .entity import TwenteMilieuEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TwenteMilieuConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Twente Milieu calendar based on a config entry."""
     async_add_entities([TwenteMilieuCalendar(entry)])
diff --git a/homeassistant/components/twentemilieu/sensor.py b/homeassistant/components/twentemilieu/sensor.py
index 4605ede1f87..81751d10a81 100644
--- a/homeassistant/components/twentemilieu/sensor.py
+++ b/homeassistant/components/twentemilieu/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_ID
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import TwenteMilieuConfigEntry
@@ -65,7 +65,7 @@ SENSORS: tuple[TwenteMilieuSensorDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TwenteMilieuConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Twente Milieu sensor based on a config entry."""
     async_add_entities(
diff --git a/homeassistant/components/twilio/__init__.py b/homeassistant/components/twilio/__init__.py
index b54af031af3..7ed65bdd54b 100644
--- a/homeassistant/components/twilio/__init__.py
+++ b/homeassistant/components/twilio/__init__.py
@@ -8,8 +8,7 @@ from homeassistant.components import webhook
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_WEBHOOK_ID
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_entry_flow
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_entry_flow, config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
diff --git a/homeassistant/components/twilio/strings.json b/homeassistant/components/twilio/strings.json
index 871711ff087..f4b7dee707f 100644
--- a/homeassistant/components/twilio/strings.json
+++ b/homeassistant/components/twilio/strings.json
@@ -12,7 +12,7 @@
       "webhook_not_internet_accessible": "[%key:common::config_flow::abort::webhook_not_internet_accessible%]"
     },
     "create_entry": {
-      "default": "To send events to Home Assistant, you will need to setup [Webhooks with Twilio]({twilio_url}).\n\nFill in the following info:\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/x-www-form-urlencoded\n\nSee [the documentation]({docs_url}) on how to configure automations to handle incoming data."
+      "default": "To send events to Home Assistant, you will need to set up [webhooks with Twilio]({twilio_url}).\n\nFill in the following info:\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/x-www-form-urlencoded\n\nSee [the documentation]({docs_url}) on how to configure automations to handle incoming data."
     }
   }
 }
diff --git a/homeassistant/components/twilio_call/notify.py b/homeassistant/components/twilio_call/notify.py
index ab79ea9692d..4c432e0aeb5 100644
--- a/homeassistant/components/twilio_call/notify.py
+++ b/homeassistant/components/twilio_call/notify.py
@@ -15,7 +15,7 @@ from homeassistant.components.notify import (
 )
 from homeassistant.components.twilio import DATA_TWILIO
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/twilio_sms/notify.py b/homeassistant/components/twilio_sms/notify.py
index 531fadcf259..a3f824f375f 100644
--- a/homeassistant/components/twilio_sms/notify.py
+++ b/homeassistant/components/twilio_sms/notify.py
@@ -14,7 +14,7 @@ from homeassistant.components.notify import (
 )
 from homeassistant.components.twilio import DATA_TWILIO
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/twinkly/__init__.py b/homeassistant/components/twinkly/__init__.py
index cd29ffaf423..e3b53bba6c9 100644
--- a/homeassistant/components/twinkly/__init__.py
+++ b/homeassistant/components/twinkly/__init__.py
@@ -5,23 +5,19 @@ import logging
 from aiohttp import ClientError
 from ttls.client import Twinkly
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DOMAIN
-from .coordinator import TwinklyCoordinator
+from .coordinator import TwinklyConfigEntry, TwinklyCoordinator
 
 PLATFORMS = [Platform.LIGHT, Platform.SELECT]
 
 _LOGGER = logging.getLogger(__name__)
 
 
-type TwinklyConfigEntry = ConfigEntry[TwinklyCoordinator]
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: TwinklyConfigEntry) -> bool:
     """Set up entries from config flow."""
     # We setup the client here so if at some point we add any other entity for this device,
@@ -30,7 +26,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: TwinklyConfigEntry) -> b
 
     client = Twinkly(host, async_get_clientsession(hass))
 
-    coordinator = TwinklyCoordinator(hass, client)
+    coordinator = TwinklyCoordinator(hass, entry, client)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/twinkly/coordinator.py b/homeassistant/components/twinkly/coordinator.py
index 627fb0b39ba..2c2fc2a41d4 100644
--- a/homeassistant/components/twinkly/coordinator.py
+++ b/homeassistant/components/twinkly/coordinator.py
@@ -9,6 +9,7 @@ from aiohttp import ClientError
 from awesomeversion import AwesomeVersion
 from ttls.client import Twinkly, TwinklyError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -17,6 +18,8 @@ from .const import DEV_NAME, DOMAIN, MIN_EFFECT_VERSION
 
 _LOGGER = logging.getLogger(__name__)
 
+type TwinklyConfigEntry = ConfigEntry[TwinklyCoordinator]
+
 
 @dataclass
 class TwinklyData:
@@ -33,15 +36,19 @@ class TwinklyData:
 class TwinklyCoordinator(DataUpdateCoordinator[TwinklyData]):
     """Class to manage fetching Twinkly data from API."""
 
+    config_entry: TwinklyConfigEntry
     software_version: str
     supports_effects: bool
     device_name: str
 
-    def __init__(self, hass: HomeAssistant, client: Twinkly) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: TwinklyConfigEntry, client: Twinkly
+    ) -> None:
         """Initialize global Twinkly data updater."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=30),
         )
diff --git a/homeassistant/components/twinkly/diagnostics.py b/homeassistant/components/twinkly/diagnostics.py
index d732ce14929..2bf46a208e8 100644
--- a/homeassistant/components/twinkly/diagnostics.py
+++ b/homeassistant/components/twinkly/diagnostics.py
@@ -10,8 +10,8 @@ from homeassistant.const import ATTR_SW_VERSION, CONF_HOST, CONF_IP_ADDRESS, CON
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
-from . import TwinklyConfigEntry
 from .const import DOMAIN
+from .coordinator import TwinklyConfigEntry
 
 TO_REDACT = [CONF_HOST, CONF_IP_ADDRESS, CONF_MAC]
 
diff --git a/homeassistant/components/twinkly/icons.json b/homeassistant/components/twinkly/icons.json
index 82c95aebce6..d57d54aa507 100644
--- a/homeassistant/components/twinkly/icons.json
+++ b/homeassistant/components/twinkly/icons.json
@@ -4,6 +4,11 @@
       "light": {
         "default": "mdi:string-lights"
       }
+    },
+    "select": {
+      "mode": {
+        "default": "mdi:cogs"
+      }
     }
   }
 }
diff --git a/homeassistant/components/twinkly/light.py b/homeassistant/components/twinkly/light.py
index de55aa5f217..c270421d8cd 100644
--- a/homeassistant/components/twinkly/light.py
+++ b/homeassistant/components/twinkly/light.py
@@ -15,10 +15,10 @@ from homeassistant.components.light import (
     LightEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import TwinklyConfigEntry, TwinklyCoordinator
 from .const import DEV_LED_PROFILE, DEV_PROFILE_RGB, DEV_PROFILE_RGBW
+from .coordinator import TwinklyConfigEntry, TwinklyCoordinator
 from .entity import TwinklyEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -27,7 +27,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: TwinklyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Setups an entity from a config entry (UI config flow)."""
     entity = TwinklyLight(config_entry.runtime_data)
@@ -99,9 +99,9 @@ class TwinklyLight(TwinklyEntity, LightEntity):
         ):
             await self.client.interview()
             if LightEntityFeature.EFFECT & self.supported_features:
-                # Static color only supports rgb
                 await self.client.set_static_colour(
                     (
+                        kwargs[ATTR_RGBW_COLOR][3],
                         kwargs[ATTR_RGBW_COLOR][0],
                         kwargs[ATTR_RGBW_COLOR][1],
                         kwargs[ATTR_RGBW_COLOR][2],
diff --git a/homeassistant/components/twinkly/select.py b/homeassistant/components/twinkly/select.py
index 38e5c9a6fc7..a5283b3f91d 100644
--- a/homeassistant/components/twinkly/select.py
+++ b/homeassistant/components/twinkly/select.py
@@ -8,9 +8,9 @@ from ttls.client import TWINKLY_MODES
 
 from homeassistant.components.select import SelectEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import TwinklyConfigEntry, TwinklyCoordinator
+from .coordinator import TwinklyConfigEntry, TwinklyCoordinator
 from .entity import TwinklyEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -19,7 +19,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: TwinklyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a mode select from a config entry."""
     entity = TwinklyModeSelect(config_entry.runtime_data)
@@ -29,7 +29,7 @@ async def async_setup_entry(
 class TwinklyModeSelect(TwinklyEntity, SelectEntity):
     """Twinkly Mode Selection."""
 
-    _attr_name = "Mode"
+    _attr_translation_key = "mode"
     _attr_options = TWINKLY_MODES
 
     def __init__(self, coordinator: TwinklyCoordinator) -> None:
diff --git a/homeassistant/components/twinkly/strings.json b/homeassistant/components/twinkly/strings.json
index bbc3d67373d..c2e0efef92c 100644
--- a/homeassistant/components/twinkly/strings.json
+++ b/homeassistant/components/twinkly/strings.json
@@ -20,5 +20,21 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "select": {
+      "mode": {
+        "name": "Mode",
+        "state": {
+          "color": "Color",
+          "demo": "Demo",
+          "effect": "Effect",
+          "movie": "Uploaded effect",
+          "off": "[%key:common::state::off%]",
+          "playlist": "Playlist",
+          "rt": "Real time"
+        }
+      }
+    }
   }
 }
diff --git a/homeassistant/components/twitch/sensor.py b/homeassistant/components/twitch/sensor.py
index b407eae0319..deec319e5cf 100644
--- a/homeassistant/components/twitch/sensor.py
+++ b/homeassistant/components/twitch/sensor.py
@@ -6,7 +6,7 @@ from typing import Any
 
 from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -32,7 +32,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: TwitchConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize entries."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/twitter/notify.py b/homeassistant/components/twitter/notify.py
index eef51ca9613..f94bcd54459 100644
--- a/homeassistant/components/twitter/notify.py
+++ b/homeassistant/components/twitter/notify.py
@@ -21,7 +21,7 @@ from homeassistant.components.notify import (
 )
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import async_track_point_in_time
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/ublockout/__init__.py b/homeassistant/components/ublockout/__init__.py
new file mode 100644
index 00000000000..87127e331da
--- /dev/null
+++ b/homeassistant/components/ublockout/__init__.py
@@ -0,0 +1 @@
+"""Virtual integration: Ublockout."""
diff --git a/homeassistant/components/ublockout/manifest.json b/homeassistant/components/ublockout/manifest.json
new file mode 100644
index 00000000000..d5ef46b8ad2
--- /dev/null
+++ b/homeassistant/components/ublockout/manifest.json
@@ -0,0 +1,6 @@
+{
+  "domain": "ublockout",
+  "name": "Ublockout",
+  "integration_type": "virtual",
+  "supported_by": "motion_blinds"
+}
diff --git a/homeassistant/components/ubus/device_tracker.py b/homeassistant/components/ubus/device_tracker.py
index 285a176af0a..7c50b69683f 100644
--- a/homeassistant/components/ubus/device_tracker.py
+++ b/homeassistant/components/ubus/device_tracker.py
@@ -15,7 +15,7 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/uk_transport/sensor.py b/homeassistant/components/uk_transport/sensor.py
index a86f7a1cc83..594d46c74ab 100644
--- a/homeassistant/components/uk_transport/sensor.py
+++ b/homeassistant/components/uk_transport/sensor.py
@@ -17,11 +17,10 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_MODE, UnitOfTime
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import Throttle
-import homeassistant.util.dt as dt_util
+from homeassistant.util import Throttle, dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -33,6 +32,7 @@ ATTR_NEXT_BUSES = "next_buses"
 ATTR_STATION_CODE = "station_code"
 ATTR_CALLING_AT = "calling_at"
 ATTR_NEXT_TRAINS = "next_trains"
+ATTR_LAST_UPDATED = "last_updated"
 
 CONF_API_APP_KEY = "app_key"
 CONF_API_APP_ID = "app_id"
@@ -200,7 +200,9 @@ class UkTransportLiveBusTimeSensor(UkTransportSensor):
     def extra_state_attributes(self) -> dict[str, Any] | None:
         """Return other details about the sensor state."""
         if self._data is not None:
-            attrs = {ATTR_NEXT_BUSES: self._next_buses}
+            attrs = {
+                ATTR_NEXT_BUSES: self._next_buses,
+            }
             for key in (
                 ATTR_ATCOCODE,
                 ATTR_LOCALITY,
@@ -273,6 +275,7 @@ class UkTransportLiveTrainTimeSensor(UkTransportSensor):
             attrs = {
                 ATTR_STATION_CODE: self._station_code,
                 ATTR_CALLING_AT: self._calling_at,
+                ATTR_LAST_UPDATED: self._data[ATTR_REQUEST_TIME],
             }
             if self._next_trains:
                 attrs[ATTR_NEXT_TRAINS] = self._next_trains
diff --git a/homeassistant/components/ukraine_alarm/__init__.py b/homeassistant/components/ukraine_alarm/__init__.py
index d850ed6eba8..3658b821625 100644
--- a/homeassistant/components/ukraine_alarm/__init__.py
+++ b/homeassistant/components/ukraine_alarm/__init__.py
@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_REGION
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
@@ -13,11 +12,9 @@ from .coordinator import UkraineAlarmDataUpdateCoordinator
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Ukraine Alarm as config entry."""
-    region_id = entry.data[CONF_REGION]
-
     websession = async_get_clientsession(hass)
 
-    coordinator = UkraineAlarmDataUpdateCoordinator(hass, websession, region_id)
+    coordinator = UkraineAlarmDataUpdateCoordinator(hass, entry, websession)
     await coordinator.async_config_entry_first_refresh()
 
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
diff --git a/homeassistant/components/ukraine_alarm/binary_sensor.py b/homeassistant/components/ukraine_alarm/binary_sensor.py
index 30cb8e0f553..9009031ea14 100644
--- a/homeassistant/components/ukraine_alarm/binary_sensor.py
+++ b/homeassistant/components/ukraine_alarm/binary_sensor.py
@@ -11,7 +11,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
@@ -64,7 +64,7 @@ BINARY_SENSOR_TYPES: tuple[BinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Ukraine Alarm binary sensor entities based on a config entry."""
     name = config_entry.data[CONF_NAME]
diff --git a/homeassistant/components/ukraine_alarm/coordinator.py b/homeassistant/components/ukraine_alarm/coordinator.py
index fbf7c9f81c2..b4e1decb1a1 100644
--- a/homeassistant/components/ukraine_alarm/coordinator.py
+++ b/homeassistant/components/ukraine_alarm/coordinator.py
@@ -10,6 +10,8 @@ import aiohttp
 from aiohttp import ClientSession
 from uasiren.client import Client
 
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_REGION
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -23,17 +25,25 @@ UPDATE_INTERVAL = timedelta(seconds=10)
 class UkraineAlarmDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Class to manage fetching Ukraine Alarm API."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         session: ClientSession,
-        region_id: str,
     ) -> None:
         """Initialize."""
-        self.region_id = region_id
+        self.region_id = config_entry.data[CONF_REGION]
         self.uasiren = Client(session)
 
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=UPDATE_INTERVAL)
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=UPDATE_INTERVAL,
+        )
 
     async def _async_update_data(self) -> dict[str, Any]:
         """Update data via library."""
@@ -42,7 +52,7 @@ class UkraineAlarmDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         except aiohttp.ClientError as error:
             raise UpdateFailed(f"Error fetching alerts from API: {error}") from error
 
-        current = {alert_type: False for alert_type in ALERT_TYPES}
+        current = dict.fromkeys(ALERT_TYPES, False)
         for alert in res[0]["activeAlerts"]:
             current[alert["type"]] = True
 
diff --git a/homeassistant/components/unifi/button.py b/homeassistant/components/unifi/button.py
index 25c6816d794..3e5ef62f49e 100644
--- a/homeassistant/components/unifi/button.py
+++ b/homeassistant/components/unifi/button.py
@@ -31,7 +31,7 @@ from homeassistant.components.button import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import UnifiConfigEntry
 from .entity import (
@@ -135,7 +135,7 @@ ENTITY_DESCRIPTIONS: tuple[UnifiButtonEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: UnifiConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up button platform for UniFi Network integration."""
     config_entry.runtime_data.entity_loader.register_platform(
diff --git a/homeassistant/components/unifi/config_flow.py b/homeassistant/components/unifi/config_flow.py
index 479055b84eb..3878e4c60eb 100644
--- a/homeassistant/components/unifi/config_flow.py
+++ b/homeassistant/components/unifi/config_flow.py
@@ -33,7 +33,7 @@ from homeassistant.const import (
     CONF_VERIFY_SSL,
 )
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.service_info.ssdp import (
     ATTR_UPNP_MODEL_DESCRIPTION,
diff --git a/homeassistant/components/unifi/device_tracker.py b/homeassistant/components/unifi/device_tracker.py
index 2ac47e67913..a26232664a8 100644
--- a/homeassistant/components/unifi/device_tracker.py
+++ b/homeassistant/components/unifi/device_tracker.py
@@ -24,10 +24,10 @@ from homeassistant.components.device_tracker import (
     ScannerEntityDescription,
 )
 from homeassistant.core import Event as core_Event, HomeAssistant, callback
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.helpers.entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from . import UnifiConfigEntry
 from .const import DOMAIN as UNIFI_DOMAIN
@@ -222,7 +222,7 @@ def async_update_unique_id(hass: HomeAssistant, config_entry: UnifiConfigEntry)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: UnifiConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up device tracker for UniFi Network integration."""
     async_update_unique_id(hass, config_entry)
diff --git a/homeassistant/components/unifi/hub/entity_helper.py b/homeassistant/components/unifi/hub/entity_helper.py
index 782b026d6e4..b353ba6fc5c 100644
--- a/homeassistant/components/unifi/hub/entity_helper.py
+++ b/homeassistant/components/unifi/hub/entity_helper.py
@@ -10,7 +10,7 @@ from aiounifi.models.device import DeviceSetPoePortModeRequest
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.event import async_call_later, async_track_time_interval
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 
 class UnifiEntityHelper:
diff --git a/homeassistant/components/unifi/hub/entity_loader.py b/homeassistant/components/unifi/hub/entity_loader.py
index 64403152b0c..84948a92e98 100644
--- a/homeassistant/components/unifi/hub/entity_loader.py
+++ b/homeassistant/components/unifi/hub/entity_loader.py
@@ -46,6 +46,7 @@ class UnifiEntityLoader:
             hub.api.port_forwarding.update,
             hub.api.sites.update,
             hub.api.system_information.update,
+            hub.api.firewall_policies.update,
             hub.api.traffic_rules.update,
             hub.api.traffic_routes.update,
             hub.api.wlans.update,
diff --git a/homeassistant/components/unifi/icons.json b/homeassistant/components/unifi/icons.json
index 6874bb5ae03..616d7cb185f 100644
--- a/homeassistant/components/unifi/icons.json
+++ b/homeassistant/components/unifi/icons.json
@@ -55,6 +55,9 @@
           "off": "mdi:network-off"
         }
       },
+      "firewall_policy_control": {
+        "default": "mdi:security-network"
+      },
       "port_forward_control": {
         "default": "mdi:upload-network"
       },
diff --git a/homeassistant/components/unifi/image.py b/homeassistant/components/unifi/image.py
index 1f54f56b194..f3045d5fc1c 100644
--- a/homeassistant/components/unifi/image.py
+++ b/homeassistant/components/unifi/image.py
@@ -16,8 +16,8 @@ from aiounifi.models.wlan import Wlan
 from homeassistant.components.image import ImageEntity, ImageEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from . import UnifiConfigEntry
 from .entity import (
@@ -67,7 +67,7 @@ ENTITY_DESCRIPTIONS: tuple[UnifiImageEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: UnifiConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up image platform for UniFi Network integration."""
     config_entry.runtime_data.entity_loader.register_platform(
diff --git a/homeassistant/components/unifi/manifest.json b/homeassistant/components/unifi/manifest.json
index ce573592153..dd255c57c13 100644
--- a/homeassistant/components/unifi/manifest.json
+++ b/homeassistant/components/unifi/manifest.json
@@ -7,7 +7,7 @@
   "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["aiounifi"],
-  "requirements": ["aiounifi==81"],
+  "requirements": ["aiounifi==83"],
   "ssdp": [
     {
       "manufacturer": "Ubiquiti Networks",
diff --git a/homeassistant/components/unifi/sensor.py b/homeassistant/components/unifi/sensor.py
index 194a8575174..47a2c2ba62e 100644
--- a/homeassistant/components/unifi/sensor.py
+++ b/homeassistant/components/unifi/sensor.py
@@ -46,10 +46,9 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event as core_Event, HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
-from homeassistant.util import slugify
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util, slugify
 
 from . import UnifiConfigEntry
 from .const import DEVICE_STATES
@@ -645,7 +644,7 @@ ENTITY_DESCRIPTIONS += make_wan_latency_sensors() + make_device_temperatur_senso
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: UnifiConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors for UniFi Network integration."""
     config_entry.runtime_data.entity_loader.register_platform(
diff --git a/homeassistant/components/unifi/services.py b/homeassistant/components/unifi/services.py
index fc63c092d56..9d4d92839fc 100644
--- a/homeassistant/components/unifi/services.py
+++ b/homeassistant/components/unifi/services.py
@@ -6,7 +6,6 @@ from typing import Any
 from aiounifi.models.client import ClientReconnectRequest, ClientRemoveRequest
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import ATTR_DEVICE_ID
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.helpers import device_registry as dr
@@ -67,9 +66,9 @@ async def async_reconnect_client(hass: HomeAssistant, data: Mapping[str, Any]) -
     if mac == "":
         return
 
-    for config_entry in hass.config_entries.async_entries(UNIFI_DOMAIN):
-        if config_entry.state is not ConfigEntryState.LOADED or (
-            ((hub := config_entry.runtime_data) and not hub.available)
+    for config_entry in hass.config_entries.async_loaded_entries(UNIFI_DOMAIN):
+        if (
+            (not (hub := config_entry.runtime_data).available)
             or (client := hub.api.clients.get(mac)) is None
             or client.is_wired
         ):
@@ -85,10 +84,8 @@ async def async_remove_clients(hass: HomeAssistant, data: Mapping[str, Any]) ->
     - Total time between first seen and last seen is less than 15 minutes.
     - Neither IP, hostname nor name is configured.
     """
-    for config_entry in hass.config_entries.async_entries(UNIFI_DOMAIN):
-        if config_entry.state is not ConfigEntryState.LOADED or (
-            (hub := config_entry.runtime_data) and not hub.available
-        ):
+    for config_entry in hass.config_entries.async_loaded_entries(UNIFI_DOMAIN):
+        if not (hub := config_entry.runtime_data).available:
             continue
 
         clients_to_remove = []
diff --git a/homeassistant/components/unifi/switch.py b/homeassistant/components/unifi/switch.py
index 7741e57c82c..282d0c9ae93 100644
--- a/homeassistant/components/unifi/switch.py
+++ b/homeassistant/components/unifi/switch.py
@@ -4,6 +4,7 @@ Support for controlling power supply of clients which are powered over Ethernet
 Support for controlling network access of clients selected in option flow.
 Support for controlling deep packet inspection (DPI) restriction groups.
 Support for controlling WLAN availability.
+Support for controlling zone based traffic rules.
 """
 
 from __future__ import annotations
@@ -17,6 +18,7 @@ import aiounifi
 from aiounifi.interfaces.api_handlers import ItemEvent
 from aiounifi.interfaces.clients import Clients
 from aiounifi.interfaces.dpi_restriction_groups import DPIRestrictionGroups
+from aiounifi.interfaces.firewall_policies import FirewallPolicies
 from aiounifi.interfaces.outlets import Outlets
 from aiounifi.interfaces.port_forwarding import PortForwarding
 from aiounifi.interfaces.ports import Ports
@@ -29,6 +31,7 @@ from aiounifi.models.device import DeviceSetOutletRelayRequest
 from aiounifi.models.dpi_restriction_app import DPIRestrictionAppEnableRequest
 from aiounifi.models.dpi_restriction_group import DPIRestrictionGroup
 from aiounifi.models.event import Event, EventKey
+from aiounifi.models.firewall_policy import FirewallPolicy, FirewallPolicyUpdateRequest
 from aiounifi.models.outlet import Outlet
 from aiounifi.models.port import Port
 from aiounifi.models.port_forward import PortForward, PortForwardEnableRequest
@@ -44,9 +47,9 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import UnifiConfigEntry
 from .const import ATTR_MANUFACTURER, DOMAIN as UNIFI_DOMAIN
@@ -129,6 +132,24 @@ async def async_dpi_group_control_fn(hub: UnifiHub, obj_id: str, target: bool) -
     )
 
 
+async def async_firewall_policy_control_fn(
+    hub: UnifiHub, obj_id: str, target: bool
+) -> None:
+    """Control firewall policy state."""
+    policy = hub.api.firewall_policies[obj_id].raw
+    policy["enabled"] = target
+    await hub.api.request(FirewallPolicyUpdateRequest.create(policy))
+    # Update the policies so the UI is updated appropriately
+    await hub.api.firewall_policies.update()
+
+
+@callback
+def async_firewall_policy_supported_fn(hub: UnifiHub, obj_id: str) -> bool:
+    """Check if firewall policy is able to be controlled. Predefined policies are unable to be turned off."""
+    policy = hub.api.firewall_policies[obj_id]
+    return not policy.predefined
+
+
 @callback
 def async_outlet_switching_supported_fn(hub: UnifiHub, obj_id: str) -> bool:
     """Determine if an outlet supports switching."""
@@ -236,6 +257,20 @@ ENTITY_DESCRIPTIONS: tuple[UnifiSwitchEntityDescription, ...] = (
         supported_fn=lambda hub, obj_id: bool(hub.api.dpi_groups[obj_id].dpiapp_ids),
         unique_id_fn=lambda hub, obj_id: obj_id,
     ),
+    UnifiSwitchEntityDescription[FirewallPolicies, FirewallPolicy](
+        key="Firewall policy control",
+        translation_key="firewall_policy_control",
+        device_class=SwitchDeviceClass.SWITCH,
+        entity_category=EntityCategory.CONFIG,
+        api_handler_fn=lambda api: api.firewall_policies,
+        control_fn=async_firewall_policy_control_fn,
+        device_info_fn=async_unifi_network_device_info_fn,
+        is_on_fn=lambda hub, firewall_policy: firewall_policy.enabled,
+        name_fn=lambda firewall_policy: firewall_policy.name,
+        object_fn=lambda api, obj_id: api.firewall_policies[obj_id],
+        unique_id_fn=lambda hub, obj_id: f"firewall_policy-{obj_id}",
+        supported_fn=async_firewall_policy_supported_fn,
+    ),
     UnifiSwitchEntityDescription[Outlets, Outlet](
         key="Outlet control",
         device_class=SwitchDeviceClass.OUTLET,
@@ -352,7 +387,7 @@ def async_update_unique_id(hass: HomeAssistant, config_entry: UnifiConfigEntry)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: UnifiConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switches for UniFi Network integration."""
     async_update_unique_id(hass, config_entry)
diff --git a/homeassistant/components/unifi/update.py b/homeassistant/components/unifi/update.py
index 65202045a05..589b2ff1215 100644
--- a/homeassistant/components/unifi/update.py
+++ b/homeassistant/components/unifi/update.py
@@ -19,7 +19,7 @@ from homeassistant.components.update import (
     UpdateEntityFeature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import UnifiConfigEntry
 from .entity import (
@@ -68,7 +68,7 @@ ENTITY_DESCRIPTIONS: tuple[UnifiUpdateEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: UnifiConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up update entities for UniFi Network integration."""
     config_entry.runtime_data.entity_loader.register_platform(
diff --git a/homeassistant/components/unifi_direct/device_tracker.py b/homeassistant/components/unifi_direct/device_tracker.py
index d5e2e926114..1d7511aaae8 100644
--- a/homeassistant/components/unifi_direct/device_tracker.py
+++ b/homeassistant/components/unifi_direct/device_tracker.py
@@ -15,7 +15,7 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/unifiled/light.py b/homeassistant/components/unifiled/light.py
index 4e1981875f4..dbc73177f21 100644
--- a/homeassistant/components/unifiled/light.py
+++ b/homeassistant/components/unifiled/light.py
@@ -16,7 +16,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/unifiprotect/binary_sensor.py b/homeassistant/components/unifiprotect/binary_sensor.py
index a88d4b65678..0d904d3c3ba 100644
--- a/homeassistant/components/unifiprotect/binary_sensor.py
+++ b/homeassistant/components/unifiprotect/binary_sensor.py
@@ -23,7 +23,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .data import ProtectData, ProtectDeviceType, UFPConfigEntry
 from .entity import (
@@ -769,7 +769,7 @@ def _async_nvr_entities(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: UFPConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up binary sensors for UniFi Protect integration."""
     data = entry.runtime_data
diff --git a/homeassistant/components/unifiprotect/button.py b/homeassistant/components/unifiprotect/button.py
index b24c90be3ec..7b766299946 100644
--- a/homeassistant/components/unifiprotect/button.py
+++ b/homeassistant/components/unifiprotect/button.py
@@ -19,7 +19,7 @@ from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DEVICES_THAT_ADOPT, DOMAIN
 from .data import ProtectDeviceType, UFPConfigEntry
@@ -120,7 +120,7 @@ def _async_remove_adopt_button(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: UFPConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Discover devices on a UniFi Protect NVR."""
     data = entry.runtime_data
diff --git a/homeassistant/components/unifiprotect/camera.py b/homeassistant/components/unifiprotect/camera.py
index 0b1c03b8dd6..3947324fd73 100644
--- a/homeassistant/components/unifiprotect/camera.py
+++ b/homeassistant/components/unifiprotect/camera.py
@@ -16,7 +16,7 @@ from homeassistant.components.camera import Camera, CameraEntityFeature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import issue_registry as ir
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.issue_registry import IssueSeverity
 
 from .const import (
@@ -138,7 +138,7 @@ def _async_camera_entities(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: UFPConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Discover cameras on a UniFi Protect NVR."""
     data = entry.runtime_data
diff --git a/homeassistant/components/unifiprotect/entity.py b/homeassistant/components/unifiprotect/entity.py
index 335bc1e933d..90804559297 100644
--- a/homeassistant/components/unifiprotect/entity.py
+++ b/homeassistant/components/unifiprotect/entity.py
@@ -22,7 +22,7 @@ from uiprotect.data import (
 )
 
 from homeassistant.core import callback
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import Entity, EntityDescription
 
diff --git a/homeassistant/components/unifiprotect/event.py b/homeassistant/components/unifiprotect/event.py
index 78fdf7746de..cb9090dd530 100644
--- a/homeassistant/components/unifiprotect/event.py
+++ b/homeassistant/components/unifiprotect/event.py
@@ -10,7 +10,7 @@ from homeassistant.components.event import (
     EventEntityDescription,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import Bootstrap
 from .const import (
@@ -218,7 +218,7 @@ def _async_event_entities(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: UFPConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up event entities for UniFi Protect integration."""
     data = entry.runtime_data
diff --git a/homeassistant/components/unifiprotect/light.py b/homeassistant/components/unifiprotect/light.py
index fcdfe5e85b8..873f715de58 100644
--- a/homeassistant/components/unifiprotect/light.py
+++ b/homeassistant/components/unifiprotect/light.py
@@ -9,7 +9,7 @@ from uiprotect.data import Light, ModelType, ProtectAdoptableDeviceModel
 
 from homeassistant.components.light import ColorMode, LightEntity
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .data import ProtectDeviceType, UFPConfigEntry
 from .entity import ProtectDeviceEntity
@@ -20,7 +20,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: UFPConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up lights for UniFi Protect integration."""
     data = entry.runtime_data
diff --git a/homeassistant/components/unifiprotect/lock.py b/homeassistant/components/unifiprotect/lock.py
index 3e9372db0e5..79ed47a6c3b 100644
--- a/homeassistant/components/unifiprotect/lock.py
+++ b/homeassistant/components/unifiprotect/lock.py
@@ -14,7 +14,7 @@ from uiprotect.data import (
 
 from homeassistant.components.lock import LockEntity, LockEntityDescription
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .data import ProtectDeviceType, UFPConfigEntry
 from .entity import ProtectDeviceEntity
@@ -25,7 +25,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: UFPConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up locks on a UniFi Protect NVR."""
     data = entry.runtime_data
diff --git a/homeassistant/components/unifiprotect/manifest.json b/homeassistant/components/unifiprotect/manifest.json
index 69c7f8b205b..a4bb6d20841 100644
--- a/homeassistant/components/unifiprotect/manifest.json
+++ b/homeassistant/components/unifiprotect/manifest.json
@@ -40,7 +40,7 @@
   "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["uiprotect", "unifi_discovery"],
-  "requirements": ["uiprotect==7.5.0", "unifi-discovery==1.2.0"],
+  "requirements": ["uiprotect==7.5.1", "unifi-discovery==1.2.0"],
   "ssdp": [
     {
       "manufacturer": "Ubiquiti Networks",
diff --git a/homeassistant/components/unifiprotect/media_player.py b/homeassistant/components/unifiprotect/media_player.py
index 5f9991b257b..a1e60931026 100644
--- a/homeassistant/components/unifiprotect/media_player.py
+++ b/homeassistant/components/unifiprotect/media_player.py
@@ -21,7 +21,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .data import ProtectDeviceType, UFPConfigEntry
 from .entity import ProtectDeviceEntity
@@ -36,7 +36,7 @@ _SPEAKER_DESCRIPTION = MediaPlayerEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: UFPConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Discover cameras with speakers on a UniFi Protect NVR."""
     data = entry.runtime_data
diff --git a/homeassistant/components/unifiprotect/number.py b/homeassistant/components/unifiprotect/number.py
index 767128337ba..5dbf9f2b00e 100644
--- a/homeassistant/components/unifiprotect/number.py
+++ b/homeassistant/components/unifiprotect/number.py
@@ -17,7 +17,7 @@ from uiprotect.data import (
 from homeassistant.components.number import NumberEntity, NumberEntityDescription
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfTime
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .data import ProtectData, ProtectDeviceType, UFPConfigEntry
 from .entity import (
@@ -227,7 +227,7 @@ _MODEL_DESCRIPTIONS: dict[ModelType, Sequence[ProtectEntityDescription]] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: UFPConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up number entities for UniFi Protect integration."""
     data = entry.runtime_data
diff --git a/homeassistant/components/unifiprotect/select.py b/homeassistant/components/unifiprotect/select.py
index 00c277c957e..054c9430387 100644
--- a/homeassistant/components/unifiprotect/select.py
+++ b/homeassistant/components/unifiprotect/select.py
@@ -29,7 +29,7 @@ from uiprotect.data import (
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import TYPE_EMPTY_VALUE
 from .data import ProtectData, ProtectDeviceType, UFPConfigEntry
@@ -334,7 +334,9 @@ _MODEL_DESCRIPTIONS: dict[ModelType, Sequence[ProtectEntityDescription]] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: UFPConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: UFPConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up number entities for UniFi Protect integration."""
     data = entry.runtime_data
diff --git a/homeassistant/components/unifiprotect/sensor.py b/homeassistant/components/unifiprotect/sensor.py
index 09187e023a1..a719f36c2b3 100644
--- a/homeassistant/components/unifiprotect/sensor.py
+++ b/homeassistant/components/unifiprotect/sensor.py
@@ -38,7 +38,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .data import ProtectData, ProtectDeviceType, UFPConfigEntry
 from .entity import (
@@ -640,7 +640,7 @@ _MODEL_DESCRIPTIONS: dict[ModelType, Sequence[ProtectEntityDescription]] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: UFPConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors for UniFi Protect integration."""
     data = entry.runtime_data
diff --git a/homeassistant/components/unifiprotect/strings.json b/homeassistant/components/unifiprotect/strings.json
index cde8c88d169..d5a7d615399 100644
--- a/homeassistant/components/unifiprotect/strings.json
+++ b/homeassistant/components/unifiprotect/strings.json
@@ -3,8 +3,8 @@
     "flow_title": "{name} ({ip_address})",
     "step": {
       "user": {
-        "title": "UniFi Protect Setup",
-        "description": "You will need a local user created in your UniFi OS Console to log in with. Ubiquiti Cloud Users will not work. For more information: {local_user_documentation_url}",
+        "title": "UniFi Protect setup",
+        "description": "You will need a local user created in your UniFi OS Console to log in with. Ubiquiti Cloud users will not work. For more information: {local_user_documentation_url}",
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
           "port": "[%key:common::config_flow::data::port%]",
@@ -17,17 +17,17 @@
         }
       },
       "reauth_confirm": {
-        "title": "UniFi Protect Reauth",
+        "title": "UniFi Protect reauth",
         "data": {
-          "host": "IP/Host of UniFi Protect Server",
+          "host": "IP/Host of UniFi Protect server",
           "port": "[%key:common::config_flow::data::port%]",
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]"
         }
       },
       "discovery_confirm": {
-        "title": "UniFi Protect Discovered",
-        "description": "Do you want to set up {name} ({ip_address})? You will need a local user created in your UniFi OS Console to log in with. Ubiquiti Cloud Users will not work. For more information: {local_user_documentation_url}",
+        "title": "UniFi Protect discovered",
+        "description": "Do you want to set up {name} ({ip_address})? You will need a local user created in your UniFi OS Console to log in with. Ubiquiti Cloud users will not work. For more information: {local_user_documentation_url}",
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]"
@@ -38,7 +38,7 @@
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "protect_version": "Minimum required version is v1.20.0. Please upgrade UniFi Protect and then retry.",
-      "cloud_user": "Ubiquiti Cloud users are not Supported. Please use a Local only user."
+      "cloud_user": "Ubiquiti Cloud users are not supported. Please use a local user instead."
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
@@ -49,12 +49,12 @@
   "options": {
     "step": {
       "init": {
-        "title": "UniFi Protect Options",
+        "title": "UniFi Protect options",
         "description": "Realtime metrics option should only be enabled if you have enabled the diagnostics sensors and want them updated in realtime. If not enabled, they will only update once every 15 minutes.",
         "data": {
           "disable_rtsp": "Disable the RTSP stream",
           "all_updates": "Realtime metrics (WARNING: Greatly increases CPU usage)",
-          "override_connection_host": "Override Connection Host",
+          "override_connection_host": "Override connection host",
           "max_media": "Max number of event to load for Media Browser (increases RAM usage)",
           "allow_ea_channel": "Allow Early Access versions of Protect (WARNING: Will mark your integration as unsupported)"
         }
@@ -68,7 +68,7 @@
         "step": {
           "start": {
             "title": "UniFi Protect Early Access enabled",
-            "description": "You are either running an Early Access version of UniFi Protect (v{version}) or opt-ed into a release channel that is not the Official Release Channel.\n\nAs these Early Access releases may not be tested yet, using it may cause the UniFi Protect integration to behave unexpectedly. [Read more about Early Access and Home Assistant]({learn_more}).\n\nSubmit to dismiss this message."
+            "description": "You are either running an Early Access version of UniFi Protect (v{version}) or opt-ed into a release channel that is not the official release channel.\n\nAs these Early Access releases may not be tested yet, using it may cause the UniFi Protect integration to behave unexpectedly. [Read more about Early Access and Home Assistant]({learn_more}).\n\nSubmit to dismiss this message."
           },
           "confirm": {
             "title": "[%key:component::unifiprotect::issues::ea_channel_warning::fix_flow::step::start::title%]",
@@ -123,8 +123,8 @@
       }
     },
     "deprecate_hdr_switch": {
-      "title": "HDR Mode Switch Deprecated",
-      "description": "UniFi Protect v3 added a new state for HDR (auto). As a result, the HDR Mode Switch has been replaced with an HDR Mode Select, and it is deprecated.\n\nBelow are the detected automations or scripts that use one or more of the deprecated entities:\n{items}\nThe above list may be incomplete and it does not include any template usages inside of dashboards. Please update any templates, automations or scripts accordingly."
+      "title": "HDR Mode switch deprecated",
+      "description": "UniFi Protect v3 added a new state for HDR (auto). As a result, the HDR Mode switch has been replaced with an HDR Mode select, and it is deprecated.\n\nBelow are the detected automations or scripts that use one or more of the deprecated entities:\n{items}\nThe above list may be incomplete and it does not include any template usages inside of dashboards. Please update any templates, automations or scripts accordingly."
     }
   },
   "entity": {
@@ -171,22 +171,22 @@
   },
   "services": {
     "add_doorbell_text": {
-      "name": "Add custom doorbell text",
+      "name": "Add doorbell text",
       "description": "Adds a new custom message for doorbells.",
       "fields": {
         "device_id": {
           "name": "UniFi Protect NVR",
-          "description": "Any device from the UniFi Protect instance you want to change. In case you have multiple Protect Instances."
+          "description": "Any device from the UniFi Protect instance you want to change. In case you have multiple Protect instances."
         },
         "message": {
           "name": "Custom message",
-          "description": "New custom message to add for doorbells. Must be less than 30 characters."
+          "description": "New custom message to add. Must be less than 30 characters."
         }
       }
     },
     "remove_doorbell_text": {
-      "name": "Remove custom doorbell text",
-      "description": "Removes an existing message for doorbells.",
+      "name": "Remove doorbell text",
+      "description": "Removes an existing custom message for doorbells.",
       "fields": {
         "device_id": {
           "name": "[%key:component::unifiprotect::services::add_doorbell_text::fields::device_id::name%]",
@@ -194,13 +194,13 @@
         },
         "message": {
           "name": "[%key:component::unifiprotect::services::add_doorbell_text::fields::message::name%]",
-          "description": "Existing custom message to remove for doorbells."
+          "description": "Existing custom message to remove."
         }
       }
     },
     "set_chime_paired_doorbells": {
       "name": "Set chime paired doorbells",
-      "description": "Use to set the paired doorbell(s) with a smart chime.",
+      "description": "Pairs doorbell(s) with a smart chime.",
       "fields": {
         "device_id": {
           "name": "Chime",
@@ -213,22 +213,22 @@
       }
     },
     "remove_privacy_zone": {
-      "name": "Remove camera privacy zone",
-      "description": "Use to remove a privacy zone from a camera.",
+      "name": "Remove privacy zone",
+      "description": "Removes a privacy zone from a camera.",
       "fields": {
         "device_id": {
           "name": "Camera",
-          "description": "Camera you want to remove privacy zone from."
+          "description": "Camera you want to remove the privacy zone from."
         },
         "name": {
-          "name": "Privacy Zone Name",
+          "name": "Privacy zone",
           "description": "The name of the zone to remove."
         }
       }
     },
     "get_user_keyring_info": {
-      "name": "Retrieve Keyring Details for Users",
-      "description": "Fetch a detailed list of users with NFC and fingerprint associations for automations.",
+      "name": "Get user keyring info",
+      "description": "Fetches a detailed list of users with NFC and fingerprint associations for automations.",
       "fields": {
         "device_id": {
           "name": "UniFi Protect NVR",
diff --git a/homeassistant/components/unifiprotect/switch.py b/homeassistant/components/unifiprotect/switch.py
index fa960261cf2..fce92912a52 100644
--- a/homeassistant/components/unifiprotect/switch.py
+++ b/homeassistant/components/unifiprotect/switch.py
@@ -18,7 +18,7 @@ from uiprotect.data import (
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from .data import ProtectData, ProtectDeviceType, UFPConfigEntry
@@ -568,7 +568,7 @@ class ProtectPrivacyModeSwitch(RestoreEntity, ProtectSwitch):
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: UFPConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors for UniFi Protect integration."""
     data = entry.runtime_data
diff --git a/homeassistant/components/unifiprotect/text.py b/homeassistant/components/unifiprotect/text.py
index 0c7e1322f23..1c468d44cc6 100644
--- a/homeassistant/components/unifiprotect/text.py
+++ b/homeassistant/components/unifiprotect/text.py
@@ -15,7 +15,7 @@ from uiprotect.data import (
 from homeassistant.components.text import TextEntity, TextEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .data import ProtectDeviceType, UFPConfigEntry
 from .entity import (
@@ -63,7 +63,7 @@ _MODEL_DESCRIPTIONS: dict[ModelType, Sequence[ProtectEntityDescription]] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: UFPConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up sensors for UniFi Protect integration."""
     data = entry.runtime_data
diff --git a/homeassistant/components/upb/__init__.py b/homeassistant/components/upb/__init__.py
index c9f3a2df105..ebfc8eaeece 100644
--- a/homeassistant/components/upb/__init__.py
+++ b/homeassistant/components/upb/__init__.py
@@ -27,6 +27,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     file = config_entry.data[CONF_FILE_PATH]
 
     upb = upb_lib.UpbPim({"url": url, "UPStartExportFile": file})
+    await upb.load_upstart_file()
     await upb.async_connect()
     hass.data.setdefault(DOMAIN, {})
     hass.data[DOMAIN][config_entry.entry_id] = {"upb": upb}
diff --git a/homeassistant/components/upb/config_flow.py b/homeassistant/components/upb/config_flow.py
index 788a0336d73..af1ee7d5ab0 100644
--- a/homeassistant/components/upb/config_flow.py
+++ b/homeassistant/components/upb/config_flow.py
@@ -40,8 +40,9 @@ async def _validate_input(data):
     url = _make_url_from_data(data)
 
     upb = upb_lib.UpbPim({"url": url, "UPStartExportFile": file_path})
-
-    await upb.async_connect(_connected_callback)
+    upb.add_handler("connected", _connected_callback)
+    await upb.load_upstart_file()
+    await upb.async_connect()
 
     if not upb.config_ok:
         _LOGGER.error("Missing or invalid UPB file: %s", file_path)
diff --git a/homeassistant/components/upb/const.py b/homeassistant/components/upb/const.py
index 16f2f1b7923..6e063c5a088 100644
--- a/homeassistant/components/upb/const.py
+++ b/homeassistant/components/upb/const.py
@@ -2,7 +2,7 @@
 
 import voluptuous as vol
 
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import VolDictType
 
 DOMAIN = "upb"
diff --git a/homeassistant/components/upb/entity.py b/homeassistant/components/upb/entity.py
index 13037adf680..8a9afa453b1 100644
--- a/homeassistant/components/upb/entity.py
+++ b/homeassistant/components/upb/entity.py
@@ -30,7 +30,7 @@ class UpbEntity(Entity):
         return self._element.as_dict()
 
     @property
-    def available(self):
+    def available(self) -> bool:
         """Is the entity available to be updated."""
         return self._upb.is_connected()
 
@@ -43,7 +43,7 @@ class UpbEntity(Entity):
         self._element_changed(element, changeset)
         self.async_write_ha_state()
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Register callback for UPB changes and update entity state."""
         self._element.add_callback(self._element_callback)
         self._element_callback(self._element, {})
diff --git a/homeassistant/components/upb/light.py b/homeassistant/components/upb/light.py
index 07bd50b7d9f..0838ec3ef01 100644
--- a/homeassistant/components/upb/light.py
+++ b/homeassistant/components/upb/light.py
@@ -13,7 +13,7 @@ from homeassistant.components.light import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, UPB_BLINK_RATE_SCHEMA, UPB_BRIGHTNESS_RATE_SCHEMA
 from .entity import UpbAttachedEntity
@@ -26,7 +26,7 @@ SERVICE_LIGHT_BLINK = "light_blink"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the UPB light based on a config entry."""
 
diff --git a/homeassistant/components/upb/manifest.json b/homeassistant/components/upb/manifest.json
index 1e61747b3f1..b40388be71b 100644
--- a/homeassistant/components/upb/manifest.json
+++ b/homeassistant/components/upb/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/upb",
   "iot_class": "local_push",
   "loggers": ["upb_lib"],
-  "requirements": ["upb-lib==0.5.9"]
+  "requirements": ["upb-lib==0.6.1"]
 }
diff --git a/homeassistant/components/upb/scene.py b/homeassistant/components/upb/scene.py
index 5a5e17b3e4c..45a1d664b15 100644
--- a/homeassistant/components/upb/scene.py
+++ b/homeassistant/components/upb/scene.py
@@ -6,7 +6,7 @@ from homeassistant.components.scene import Scene
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, UPB_BLINK_RATE_SCHEMA, UPB_BRIGHTNESS_RATE_SCHEMA
 from .entity import UpbEntity
@@ -21,7 +21,7 @@ SERVICE_LINK_BLINK = "link_blink"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the UPB link based on a config entry."""
     upb = hass.data[DOMAIN][config_entry.entry_id]["upb"]
diff --git a/homeassistant/components/upb/services.yaml b/homeassistant/components/upb/services.yaml
index cf415705d72..985ce11c436 100644
--- a/homeassistant/components/upb/services.yaml
+++ b/homeassistant/components/upb/services.yaml
@@ -49,7 +49,7 @@ link_deactivate:
   target:
     entity:
       integration: upb
-      domain: light
+      domain: scene
 
 link_goto:
   target:
diff --git a/homeassistant/components/upc_connect/device_tracker.py b/homeassistant/components/upc_connect/device_tracker.py
index c279be78666..bdaf01518f1 100644
--- a/homeassistant/components/upc_connect/device_tracker.py
+++ b/homeassistant/components/upc_connect/device_tracker.py
@@ -15,8 +15,8 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/upcloud/binary_sensor.py b/homeassistant/components/upcloud/binary_sensor.py
index bca313d306f..923d8f2d896 100644
--- a/homeassistant/components/upcloud/binary_sensor.py
+++ b/homeassistant/components/upcloud/binary_sensor.py
@@ -5,7 +5,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import UpCloudConfigEntry
 from .entity import UpCloudServerEntity
@@ -14,7 +14,7 @@ from .entity import UpCloudServerEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: UpCloudConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the UpCloud server binary sensor."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/upcloud/switch.py b/homeassistant/components/upcloud/switch.py
index 97c08b19188..de180907919 100644
--- a/homeassistant/components/upcloud/switch.py
+++ b/homeassistant/components/upcloud/switch.py
@@ -6,7 +6,7 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.const import STATE_OFF
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import dispatcher_send
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import UpCloudConfigEntry
 from .entity import UpCloudServerEntity
@@ -17,7 +17,7 @@ SIGNAL_UPDATE_UPCLOUD = "upcloud_update"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: UpCloudConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the UpCloud server switch."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/update/__init__.py b/homeassistant/components/update/__init__.py
index 0ff8c448197..47cc5aa369b 100644
--- a/homeassistant/components/update/__init__.py
+++ b/homeassistant/components/update/__init__.py
@@ -226,7 +226,7 @@ class UpdateEntity(
     _attr_installed_version: str | None = None
     _attr_device_class: UpdateDeviceClass | None
     _attr_display_precision: int
-    _attr_in_progress: bool | int = False
+    _attr_in_progress: bool = False
     _attr_latest_version: str | None = None
     _attr_release_summary: str | None = None
     _attr_release_url: str | None = None
@@ -295,7 +295,7 @@ class UpdateEntity(
         )
 
     @cached_property
-    def in_progress(self) -> bool | int | None:
+    def in_progress(self) -> bool | None:
         """Update installation progress.
 
         Needs UpdateEntityFeature.PROGRESS flag to be set for it to be used.
@@ -442,7 +442,7 @@ class UpdateEntity(
             in_progress = self.in_progress
             update_percentage = self.update_percentage if in_progress else None
             if type(in_progress) is not bool and isinstance(in_progress, int):
-                update_percentage = in_progress
+                update_percentage = in_progress  # type: ignore[unreachable]
                 in_progress = True
         else:
             in_progress = self.__in_progress
diff --git a/homeassistant/components/upnp/__init__.py b/homeassistant/components/upnp/__init__.py
index aacb7538b61..757cad221b5 100644
--- a/homeassistant/components/upnp/__init__.py
+++ b/homeassistant/components/upnp/__init__.py
@@ -8,7 +8,6 @@ from datetime import timedelta
 from async_upnp_client.exceptions import UpnpConnectionError
 
 from homeassistant.components import ssdp
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
@@ -28,7 +27,7 @@ from .const import (
     IDENTIFIER_SERIAL_NUMBER,
     LOGGER,
 )
-from .coordinator import UpnpDataUpdateCoordinator
+from .coordinator import UpnpConfigEntry, UpnpDataUpdateCoordinator
 from .device import async_create_device, get_preferred_location
 
 NOTIFICATION_ID = "upnp_notification"
@@ -37,9 +36,6 @@ NOTIFICATION_TITLE = "UPnP/IGD Setup"
 PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR]
 
 
-type UpnpConfigEntry = ConfigEntry[UpnpDataUpdateCoordinator]
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: UpnpConfigEntry) -> bool:
     """Set up UPnP/IGD device from a config entry."""
     LOGGER.debug("Setting up config entry: %s", entry.entry_id)
@@ -176,6 +172,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: UpnpConfigEntry) -> bool
     update_interval = timedelta(seconds=DEFAULT_SCAN_INTERVAL)
     coordinator = UpnpDataUpdateCoordinator(
         hass,
+        config_entry=entry,
         device=device,
         device_entry=device_entry,
         update_interval=update_interval,
@@ -193,7 +190,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: UpnpConfigEntry) -> bool
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: UpnpConfigEntry) -> bool:
     """Unload a UPnP/IGD device from a config entry."""
     LOGGER.debug("Unloading config entry: %s", entry.entry_id)
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/upnp/binary_sensor.py b/homeassistant/components/upnp/binary_sensor.py
index fb32946bf7d..0c7b7aa5dc2 100644
--- a/homeassistant/components/upnp/binary_sensor.py
+++ b/homeassistant/components/upnp/binary_sensor.py
@@ -11,10 +11,10 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import UpnpConfigEntry, UpnpDataUpdateCoordinator
 from .const import LOGGER, WAN_STATUS
+from .coordinator import UpnpConfigEntry, UpnpDataUpdateCoordinator
 from .entity import UpnpEntity, UpnpEntityDescription
 
 
@@ -38,7 +38,7 @@ SENSOR_DESCRIPTIONS: tuple[UpnpBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: UpnpConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the UPnP/IGD sensors."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/upnp/coordinator.py b/homeassistant/components/upnp/coordinator.py
index 37ff700bfe2..03e4c53f143 100644
--- a/homeassistant/components/upnp/coordinator.py
+++ b/homeassistant/components/upnp/coordinator.py
@@ -6,6 +6,7 @@ from datetime import datetime, timedelta
 
 from async_upnp_client.exceptions import UpnpCommunicationError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntry
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -13,15 +14,20 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 from .const import LOGGER
 from .device import Device
 
+type UpnpConfigEntry = ConfigEntry[UpnpDataUpdateCoordinator]
+
 
 class UpnpDataUpdateCoordinator(
     DataUpdateCoordinator[dict[str, str | datetime | int | float | None]]
 ):
     """Define an object to update data from UPNP device."""
 
+    config_entry: UpnpConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: UpnpConfigEntry,
         device: Device,
         device_entry: DeviceEntry,
         update_interval: timedelta,
@@ -34,6 +40,7 @@ class UpnpDataUpdateCoordinator(
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=device.name,
             update_interval=update_interval,
         )
diff --git a/homeassistant/components/upnp/sensor.py b/homeassistant/components/upnp/sensor.py
index aae2f8308c1..c7e343d36b5 100644
--- a/homeassistant/components/upnp/sensor.py
+++ b/homeassistant/components/upnp/sensor.py
@@ -18,9 +18,8 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import UpnpConfigEntry
 from .const import (
     BYTES_RECEIVED,
     BYTES_SENT,
@@ -38,6 +37,7 @@ from .const import (
     ROUTER_UPTIME,
     WAN_STATUS,
 )
+from .coordinator import UpnpConfigEntry
 from .entity import UpnpEntity, UpnpEntityDescription
 
 
@@ -153,7 +153,7 @@ SENSOR_DESCRIPTIONS: tuple[UpnpSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: UpnpConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the UPnP/IGD sensors."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/uptime/sensor.py b/homeassistant/components/uptime/sensor.py
index 266542de9d6..488682a79c6 100644
--- a/homeassistant/components/uptime/sensor.py
+++ b/homeassistant/components/uptime/sensor.py
@@ -6,8 +6,8 @@ from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN
 
@@ -15,7 +15,7 @@ from .const import DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the platform from config_entry."""
     async_add_entities([UptimeSensor(entry)])
diff --git a/homeassistant/components/uptimerobot/__init__.py b/homeassistant/components/uptimerobot/__init__.py
index afff0c8fe03..b8619b1fe39 100644
--- a/homeassistant/components/uptimerobot/__init__.py
+++ b/homeassistant/components/uptimerobot/__init__.py
@@ -8,7 +8,6 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
-from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DOMAIN, PLATFORMS
@@ -24,12 +23,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             "Wrong API key type detected, use the 'main' API key"
         )
     uptime_robot_api = UptimeRobot(key, async_get_clientsession(hass))
-    dev_reg = dr.async_get(hass)
 
     hass.data[DOMAIN][entry.entry_id] = coordinator = UptimeRobotDataUpdateCoordinator(
         hass,
-        config_entry_id=entry.entry_id,
-        dev_reg=dev_reg,
+        entry,
         api=uptime_robot_api,
     )
 
diff --git a/homeassistant/components/uptimerobot/binary_sensor.py b/homeassistant/components/uptimerobot/binary_sensor.py
index 0c1bd972387..73f9400c013 100644
--- a/homeassistant/components/uptimerobot/binary_sensor.py
+++ b/homeassistant/components/uptimerobot/binary_sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import UptimeRobotDataUpdateCoordinator
@@ -19,7 +19,7 @@ from .entity import UptimeRobotEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the UptimeRobot binary_sensors."""
     coordinator: UptimeRobotDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/uptimerobot/coordinator.py b/homeassistant/components/uptimerobot/coordinator.py
index 3069884eb99..fbadc237965 100644
--- a/homeassistant/components/uptimerobot/coordinator.py
+++ b/homeassistant/components/uptimerobot/coordinator.py
@@ -26,19 +26,18 @@ class UptimeRobotDataUpdateCoordinator(DataUpdateCoordinator[list[UptimeRobotMon
     def __init__(
         self,
         hass: HomeAssistant,
-        config_entry_id: str,
-        dev_reg: dr.DeviceRegistry,
+        config_entry: ConfigEntry,
         api: UptimeRobot,
     ) -> None:
         """Initialize coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=COORDINATOR_UPDATE_INTERVAL,
         )
-        self._config_entry_id = config_entry_id
-        self._device_registry = dev_reg
+        self._device_registry = dr.async_get(hass)
         self.api = api
 
     async def _async_update_data(self) -> list[UptimeRobotMonitor]:
@@ -58,7 +57,7 @@ class UptimeRobotDataUpdateCoordinator(DataUpdateCoordinator[list[UptimeRobotMon
         current_monitors = {
             list(device.identifiers)[0][1]
             for device in dr.async_entries_for_config_entry(
-                self._device_registry, self._config_entry_id
+                self._device_registry, self.config_entry.entry_id
             )
         }
         new_monitors = {str(monitor.id) for monitor in monitors}
@@ -73,7 +72,7 @@ class UptimeRobotDataUpdateCoordinator(DataUpdateCoordinator[list[UptimeRobotMon
         # create new devices and entities.
         if self.data and new_monitors - {str(monitor.id) for monitor in self.data}:
             self.hass.async_create_task(
-                self.hass.config_entries.async_reload(self._config_entry_id)
+                self.hass.config_entries.async_reload(self.config_entry.entry_id)
             )
 
         return monitors
diff --git a/homeassistant/components/uptimerobot/sensor.py b/homeassistant/components/uptimerobot/sensor.py
index c5ff8abf5d9..724c3075a3b 100644
--- a/homeassistant/components/uptimerobot/sensor.py
+++ b/homeassistant/components/uptimerobot/sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import UptimeRobotDataUpdateCoordinator
@@ -28,7 +28,7 @@ SENSORS_INFO = {
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the UptimeRobot sensors."""
     coordinator: UptimeRobotDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/uptimerobot/switch.py b/homeassistant/components/uptimerobot/switch.py
index aa7d07e10fd..31401ac7eb4 100644
--- a/homeassistant/components/uptimerobot/switch.py
+++ b/homeassistant/components/uptimerobot/switch.py
@@ -13,7 +13,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import API_ATTR_OK, DOMAIN, LOGGER
 from .coordinator import UptimeRobotDataUpdateCoordinator
@@ -21,7 +21,9 @@ from .entity import UptimeRobotEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the UptimeRobot switches."""
     coordinator: UptimeRobotDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/usb/__init__.py b/homeassistant/components/usb/__init__.py
index ec65143b984..994f4f71c35 100644
--- a/homeassistant/components/usb/__init__.py
+++ b/homeassistant/components/usb/__init__.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import asyncio
 from collections.abc import Callable, Coroutine, Sequence
 import dataclasses
 from datetime import datetime, timedelta
@@ -10,8 +11,9 @@ from functools import partial
 import logging
 import os
 import sys
-from typing import TYPE_CHECKING, Any, overload
+from typing import Any, overload
 
+from aiousbwatcher import AIOUSBWatcher, InotifyNotAvailableError
 from serial.tools.list_ports import comports
 from serial.tools.list_ports_common import ListPortInfo
 import voluptuous as vol
@@ -26,7 +28,7 @@ from homeassistant.core import (
     HomeAssistant,
     callback as hass_callback,
 )
-from homeassistant.helpers import config_validation as cv, discovery_flow, system_info
+from homeassistant.helpers import config_validation as cv, discovery_flow
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.deprecation import (
     DeprecatedConstant,
@@ -43,15 +45,13 @@ from .const import DOMAIN
 from .models import USBDevice
 from .utils import usb_device_from_port
 
-if TYPE_CHECKING:
-    from pyudev import Device, MonitorObserver
-
 _LOGGER = logging.getLogger(__name__)
 
 PORT_EVENT_CALLBACK_TYPE = Callable[[set[USBDevice], set[USBDevice]], None]
 
 POLLING_MONITOR_SCAN_PERIOD = timedelta(seconds=5)
 REQUEST_SCAN_COOLDOWN = 10  # 10 second cooldown
+ADD_REMOVE_SCAN_COOLDOWN = 5  # 5 second cooldown to give devices a chance to register
 
 __all__ = [
     "USBCallbackMatcher",
@@ -255,16 +255,25 @@ class USBDiscovery:
         self.seen: set[tuple[str, ...]] = set()
         self.observer_active = False
         self._request_debouncer: Debouncer[Coroutine[Any, Any, None]] | None = None
+        self._add_remove_debouncer: Debouncer[Coroutine[Any, Any, None]] | None = None
         self._request_callbacks: list[CALLBACK_TYPE] = []
         self.initial_scan_done = False
         self._initial_scan_callbacks: list[CALLBACK_TYPE] = []
         self._port_event_callbacks: set[PORT_EVENT_CALLBACK_TYPE] = set()
         self._last_processed_devices: set[USBDevice] = set()
+        self._scan_lock = asyncio.Lock()
 
     async def async_setup(self) -> None:
         """Set up USB Discovery."""
-        if await self._async_supports_monitoring():
-            await self._async_start_monitor()
+        try:
+            await self._async_start_aiousbwatcher()
+        except InotifyNotAvailableError as ex:
+            _LOGGER.info(
+                "Falling back to periodic filesystem polling for development, "
+                "aiousbwatcher is not available on this system: %s",
+                ex,
+            )
+            self._async_start_monitor_polling()
 
         self.hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STARTED, self.async_start)
         self.hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, self.async_stop)
@@ -279,19 +288,6 @@ class USBDiscovery:
         if self._request_debouncer:
             self._request_debouncer.async_shutdown()
 
-    async def _async_supports_monitoring(self) -> bool:
-        info = await system_info.async_get_system_info(self.hass)
-        return not info.get("docker")
-
-    async def _async_start_monitor(self) -> None:
-        """Start monitoring hardware."""
-        if not await self._async_start_monitor_udev():
-            _LOGGER.info(
-                "Falling back to periodic filesystem polling for development, libudev "
-                "is not present"
-            )
-            self._async_start_monitor_polling()
-
     @hass_callback
     def _async_start_monitor_polling(self) -> None:
         """Start monitoring hardware with polling (for development only!)."""
@@ -309,70 +305,27 @@ class USBDiscovery:
 
         self.hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _stop_polling)
 
-    async def _async_start_monitor_udev(self) -> bool:
-        """Start monitoring hardware with pyudev. Returns True if successful."""
-        if not sys.platform.startswith("linux"):
-            return False
+    async def _async_start_aiousbwatcher(self) -> None:
+        """Start monitoring hardware with aiousbwatcher.
 
-        if not (
-            observer := await self.hass.async_add_executor_job(
-                self._get_monitor_observer
-            )
-        ):
-            return False
-
-        def _stop_observer(event: Event) -> None:
-            observer.stop()
-
-        self.hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _stop_observer)
-        self.observer_active = True
-        return True
-
-    def _get_monitor_observer(self) -> MonitorObserver | None:
-        """Get the monitor observer.
-
-        This runs in the executor because the import
-        does blocking I/O.
+        Returns True if successful.
         """
-        from pyudev import (  # pylint: disable=import-outside-toplevel
-            Context,
-            Monitor,
-            MonitorObserver,
-        )
 
-        try:
-            context = Context()
-        except (ImportError, OSError):
-            return None
+        @hass_callback
+        def _usb_change_callback() -> None:
+            self._async_delayed_add_remove_scan()
 
-        monitor = Monitor.from_netlink(context)
-        try:
-            monitor.filter_by(subsystem="tty")
-        except ValueError as ex:  # this fails on WSL
-            _LOGGER.debug(
-                "Unable to setup pyudev filtering; This is expected on WSL: %s", ex
-            )
-            return None
+        watcher = AIOUSBWatcher()
+        watcher.async_register_callback(_usb_change_callback)
+        cancel = watcher.async_start()
 
-        observer = MonitorObserver(
-            monitor, callback=self._device_event, name="usb-observer"
-        )
+        @hass_callback
+        def _async_stop_watcher(event: Event) -> None:
+            cancel()
 
-        observer.start()
-        return observer
+        self.hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _async_stop_watcher)
 
-    def _device_event(self, device: Device) -> None:
-        """Call when the observer receives a USB device event."""
-        if device.action not in ("add", "remove"):
-            return
-
-        _LOGGER.info(
-            "Received a udev device event %r for %s, triggering scan",
-            device.action,
-            device.device_node,
-        )
-
-        self.hass.create_task(self._async_scan())
+        self.observer_active = True
 
     @hass_callback
     def async_register_scan_request_callback(
@@ -466,11 +419,13 @@ class USBDiscovery:
 
     async def _async_process_ports(self, ports: Sequence[ListPortInfo]) -> None:
         """Process each discovered port."""
+        _LOGGER.debug("Processing ports: %r", ports)
         usb_devices = {
             usb_device_from_port(port)
             for port in ports
             if port.vid is not None or port.pid is not None
         }
+        _LOGGER.debug("USB devices: %r", usb_devices)
 
         # CP2102N chips create *two* serial ports on macOS: `/dev/cu.usbserial-` and
         # `/dev/cu.SLAB_USBtoUART*`. The former does not work and we should ignore them.
@@ -509,11 +464,27 @@ class USBDiscovery:
         for usb_device in usb_devices:
             await self._async_process_discovered_usb_device(usb_device)
 
+    @hass_callback
+    def _async_delayed_add_remove_scan(self) -> None:
+        """Request a serial scan after a debouncer delay."""
+        if not self._add_remove_debouncer:
+            self._add_remove_debouncer = Debouncer(
+                self.hass,
+                _LOGGER,
+                cooldown=ADD_REMOVE_SCAN_COOLDOWN,
+                immediate=False,
+                function=self._async_scan,
+                background=True,
+            )
+        self._add_remove_debouncer.async_schedule_call()
+
     async def _async_scan_serial(self) -> None:
         """Scan serial ports."""
-        await self._async_process_ports(
-            await self.hass.async_add_executor_job(comports)
-        )
+        _LOGGER.debug("Executing comports scan")
+        async with self._scan_lock:
+            await self._async_process_ports(
+                await self.hass.async_add_executor_job(comports)
+            )
         if self.initial_scan_done:
             return
 
diff --git a/homeassistant/components/usb/manifest.json b/homeassistant/components/usb/manifest.json
index 19269801c11..7035e2ab2cb 100644
--- a/homeassistant/components/usb/manifest.json
+++ b/homeassistant/components/usb/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "system",
   "iot_class": "local_push",
   "quality_scale": "internal",
-  "requirements": ["pyudev==0.24.1", "pyserial==3.5"]
+  "requirements": ["aiousbwatcher==1.1.1", "pyserial==3.5"]
 }
diff --git a/homeassistant/components/usgs_earthquakes_feed/geo_location.py b/homeassistant/components/usgs_earthquakes_feed/geo_location.py
index aa9817eab7d..3dd380e79a8 100644
--- a/homeassistant/components/usgs_earthquakes_feed/geo_location.py
+++ b/homeassistant/components/usgs_earthquakes_feed/geo_location.py
@@ -27,8 +27,7 @@ from homeassistant.const import (
     UnitOfLength,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import aiohttp_client
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import aiohttp_client, config_validation as cv
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
diff --git a/homeassistant/components/utility_meter/__init__.py b/homeassistant/components/utility_meter/__init__.py
index aac31e085a0..e2b3411c193 100644
--- a/homeassistant/components/utility_meter/__init__.py
+++ b/homeassistant/components/utility_meter/__init__.py
@@ -11,8 +11,11 @@ from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_ENTITY_ID, CONF_NAME, CONF_UNIQUE_ID, Platform
 from homeassistant.core import HomeAssistant, split_entity_id
-from homeassistant.helpers import discovery, entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import (
+    config_validation as cv,
+    discovery,
+    entity_registry as er,
+)
 from homeassistant.helpers.device import (
     async_remove_stale_devices_links_keep_entity_device,
 )
diff --git a/homeassistant/components/utility_meter/select.py b/homeassistant/components/utility_meter/select.py
index 5815ce7ec95..0c818525c8d 100644
--- a/homeassistant/components/utility_meter/select.py
+++ b/homeassistant/components/utility_meter/select.py
@@ -10,7 +10,10 @@ from homeassistant.const import CONF_NAME, CONF_UNIQUE_ID
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device import async_device_info_to_link_from_entity
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
@@ -22,7 +25,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize Utility Meter config entry."""
     name = config_entry.title
diff --git a/homeassistant/components/utility_meter/sensor.py b/homeassistant/components/utility_meter/sensor.py
index 9c13aa1984a..425dfa2c3fd 100644
--- a/homeassistant/components/utility_meter/sensor.py
+++ b/homeassistant/components/utility_meter/sensor.py
@@ -41,7 +41,10 @@ from homeassistant.core import (
 from homeassistant.helpers import entity_platform, entity_registry as er
 from homeassistant.helpers.device import async_device_info_to_link_from_entity
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.event import (
     async_track_point_in_time,
     async_track_state_change_event,
@@ -49,8 +52,7 @@ from homeassistant.helpers.event import (
 from homeassistant.helpers.start import async_at_started
 from homeassistant.helpers.template import is_number
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import slugify
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util, slugify
 from homeassistant.util.enum import try_parse_enum
 
 from .const import (
@@ -117,7 +119,7 @@ def validate_is_number(value):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize Utility Meter config entry."""
     entry_id = config_entry.entry_id
diff --git a/homeassistant/components/uvc/camera.py b/homeassistant/components/uvc/camera.py
index a6f0202ee25..0e09408551d 100644
--- a/homeassistant/components/uvc/camera.py
+++ b/homeassistant/components/uvc/camera.py
@@ -20,7 +20,7 @@ from homeassistant.components.camera import (
 from homeassistant.const import CONF_PASSWORD, CONF_PORT, CONF_SSL
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util.dt import utc_from_timestamp
diff --git a/homeassistant/components/v2c/__init__.py b/homeassistant/components/v2c/__init__.py
index 0c07891df72..7cd5e71f3ae 100644
--- a/homeassistant/components/v2c/__init__.py
+++ b/homeassistant/components/v2c/__init__.py
@@ -4,12 +4,11 @@ from __future__ import annotations
 
 from pytrydan import Trydan
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.httpx_client import get_async_client
 
-from .coordinator import V2CUpdateCoordinator
+from .coordinator import V2CConfigEntry, V2CUpdateCoordinator
 
 PLATFORMS: list[Platform] = [
     Platform.BINARY_SENSOR,
@@ -19,15 +18,11 @@ PLATFORMS: list[Platform] = [
 ]
 
 
-type V2CConfigEntry = ConfigEntry[V2CUpdateCoordinator]
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: V2CConfigEntry) -> bool:
     """Set up V2C from a config entry."""
 
-    host = entry.data[CONF_HOST]
-    trydan = Trydan(host, get_async_client(hass, verify_ssl=False))
-    coordinator = V2CUpdateCoordinator(hass, trydan, host)
+    trydan = Trydan(entry.data[CONF_HOST], get_async_client(hass, verify_ssl=False))
+    coordinator = V2CUpdateCoordinator(hass, entry, trydan)
 
     await coordinator.async_config_entry_first_refresh()
 
@@ -41,6 +36,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: V2CConfigEntry) -> bool:
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: V2CConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/v2c/binary_sensor.py b/homeassistant/components/v2c/binary_sensor.py
index 28ad3665996..85f03d6b4fb 100644
--- a/homeassistant/components/v2c/binary_sensor.py
+++ b/homeassistant/components/v2c/binary_sensor.py
@@ -13,10 +13,9 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import V2CConfigEntry
-from .coordinator import V2CUpdateCoordinator
+from .coordinator import V2CConfigEntry, V2CUpdateCoordinator
 from .entity import V2CBaseEntity
 
 
@@ -51,7 +50,7 @@ TRYDAN_SENSORS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: V2CConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up V2C binary sensor platform."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/v2c/coordinator.py b/homeassistant/components/v2c/coordinator.py
index b121c84563c..de8015985f9 100644
--- a/homeassistant/components/v2c/coordinator.py
+++ b/homeassistant/components/v2c/coordinator.py
@@ -9,6 +9,7 @@ from pytrydan import Trydan, TrydanData
 from pytrydan.exceptions import TrydanError
 
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -16,19 +17,24 @@ SCAN_INTERVAL = timedelta(seconds=5)
 
 _LOGGER = logging.getLogger(__name__)
 
+type V2CConfigEntry = ConfigEntry[V2CUpdateCoordinator]
+
 
 class V2CUpdateCoordinator(DataUpdateCoordinator[TrydanData]):
     """DataUpdateCoordinator to gather data from any v2c."""
 
-    config_entry: ConfigEntry
+    config_entry: V2CConfigEntry
 
-    def __init__(self, hass: HomeAssistant, evse: Trydan, host: str) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: V2CConfigEntry, evse: Trydan
+    ) -> None:
         """Initialize DataUpdateCoordinator for a v2c evse."""
         self.evse = evse
         super().__init__(
             hass,
             _LOGGER,
-            name=f"EVSE {host}",
+            config_entry=config_entry,
+            name=f"EVSE {config_entry.data[CONF_HOST]}",
             update_interval=SCAN_INTERVAL,
         )
 
diff --git a/homeassistant/components/v2c/diagnostics.py b/homeassistant/components/v2c/diagnostics.py
index 289d585b164..994f702a7bd 100644
--- a/homeassistant/components/v2c/diagnostics.py
+++ b/homeassistant/components/v2c/diagnostics.py
@@ -8,7 +8,7 @@ from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
 
-from . import V2CConfigEntry
+from .coordinator import V2CConfigEntry
 
 TO_REDACT = {CONF_HOST, "title"}
 
diff --git a/homeassistant/components/v2c/number.py b/homeassistant/components/v2c/number.py
index 1540b098cf1..e52242f0ce0 100644
--- a/homeassistant/components/v2c/number.py
+++ b/homeassistant/components/v2c/number.py
@@ -15,10 +15,9 @@ from homeassistant.components.number import (
 )
 from homeassistant.const import EntityCategory, UnitOfElectricCurrent
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import V2CConfigEntry
-from .coordinator import V2CUpdateCoordinator
+from .coordinator import V2CConfigEntry, V2CUpdateCoordinator
 from .entity import V2CBaseEntity
 
 MIN_INTENSITY = 6
@@ -72,7 +71,7 @@ TRYDAN_NUMBER_SETTINGS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: V2CConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up V2C Trydan number platform."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/v2c/sensor.py b/homeassistant/components/v2c/sensor.py
index 97853740e9d..cfccaacda18 100644
--- a/homeassistant/components/v2c/sensor.py
+++ b/homeassistant/components/v2c/sensor.py
@@ -23,11 +23,10 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import V2CConfigEntry
-from .coordinator import V2CUpdateCoordinator
+from .coordinator import V2CConfigEntry, V2CUpdateCoordinator
 from .entity import V2CBaseEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -143,7 +142,7 @@ TRYDAN_SENSORS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: V2CConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up V2C sensor platform."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/v2c/switch.py b/homeassistant/components/v2c/switch.py
index cca7da70e48..20bc3419757 100644
--- a/homeassistant/components/v2c/switch.py
+++ b/homeassistant/components/v2c/switch.py
@@ -18,10 +18,9 @@ from pytrydan.models.trydan import (
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import V2CConfigEntry
-from .coordinator import V2CUpdateCoordinator
+from .coordinator import V2CConfigEntry, V2CUpdateCoordinator
 from .entity import V2CBaseEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -80,7 +79,7 @@ TRYDAN_SWITCHES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: V2CConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up V2C switch platform."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/vacuum/device_action.py b/homeassistant/components/vacuum/device_action.py
index 82c00a57b5e..0ae03d9219e 100644
--- a/homeassistant/components/vacuum/device_action.py
+++ b/homeassistant/components/vacuum/device_action.py
@@ -13,8 +13,7 @@ from homeassistant.const import (
     CONF_TYPE,
 )
 from homeassistant.core import Context, HomeAssistant
-from homeassistant.helpers import entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
 
 from . import DOMAIN, SERVICE_RETURN_TO_BASE, SERVICE_START
diff --git a/homeassistant/components/vallox/__init__.py b/homeassistant/components/vallox/__init__.py
index ceb34bc6ff9..785ecd09fb1 100644
--- a/homeassistant/components/vallox/__init__.py
+++ b/homeassistant/components/vallox/__init__.py
@@ -111,7 +111,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     client = Vallox(host)
 
-    coordinator = ValloxDataUpdateCoordinator(hass, name, client)
+    coordinator = ValloxDataUpdateCoordinator(hass, entry, client)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/vallox/binary_sensor.py b/homeassistant/components/vallox/binary_sensor.py
index 4a0efc7b101..a205dd2039e 100644
--- a/homeassistant/components/vallox/binary_sensor.py
+++ b/homeassistant/components/vallox/binary_sensor.py
@@ -11,7 +11,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import ValloxDataUpdateCoordinator
@@ -62,7 +62,7 @@ BINARY_SENSOR_ENTITIES: tuple[ValloxBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensors."""
 
diff --git a/homeassistant/components/vallox/config_flow.py b/homeassistant/components/vallox/config_flow.py
index 30d1d153d9e..c7e6af8891a 100644
--- a/homeassistant/components/vallox/config_flow.py
+++ b/homeassistant/components/vallox/config_flow.py
@@ -108,7 +108,7 @@ class ValloxConfigFlow(ConfigFlow, domain=DOMAIN):
             errors[CONF_HOST] = "invalid_host"
         except ValloxApiException:
             errors[CONF_HOST] = "cannot_connect"
-        except Exception:  # pylint: disable=broad-except
+        except Exception:
             _LOGGER.exception("Unexpected exception")
             errors[CONF_HOST] = "unknown"
         else:
diff --git a/homeassistant/components/vallox/coordinator.py b/homeassistant/components/vallox/coordinator.py
index c2485c7b4fd..2fe7fa533db 100644
--- a/homeassistant/components/vallox/coordinator.py
+++ b/homeassistant/components/vallox/coordinator.py
@@ -6,6 +6,8 @@ import logging
 
 from vallox_websocket_api import MetricData, Vallox, ValloxApiException
 
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -17,17 +19,20 @@ _LOGGER = logging.getLogger(__name__)
 class ValloxDataUpdateCoordinator(DataUpdateCoordinator[MetricData]):
     """The DataUpdateCoordinator for Vallox."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
-        name: str,
+        config_entry: ConfigEntry,
         client: Vallox,
     ) -> None:
         """Initialize Vallox data coordinator."""
         super().__init__(
             hass,
             _LOGGER,
-            name=f"{name} DataUpdateCoordinator",
+            config_entry=config_entry,
+            name=f"{config_entry.data[CONF_NAME]} DataUpdateCoordinator",
             update_interval=STATE_SCAN_INTERVAL,
         )
         self.client = client
diff --git a/homeassistant/components/vallox/date.py b/homeassistant/components/vallox/date.py
index 33c3ebb253c..da2906c02c2 100644
--- a/homeassistant/components/vallox/date.py
+++ b/homeassistant/components/vallox/date.py
@@ -10,7 +10,7 @@ from homeassistant.components.date import DateEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import ValloxDataUpdateCoordinator
@@ -51,7 +51,7 @@ class ValloxFilterChangeDateEntity(ValloxEntity, DateEntity):
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Vallox filter change date entity."""
 
diff --git a/homeassistant/components/vallox/fan.py b/homeassistant/components/vallox/fan.py
index 3a21ef060a7..8519b4cb913 100644
--- a/homeassistant/components/vallox/fan.py
+++ b/homeassistant/components/vallox/fan.py
@@ -11,7 +11,7 @@ from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .const import (
@@ -57,7 +57,9 @@ def _convert_to_int(value: StateType) -> int | None:
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the fan device."""
     data = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/vallox/number.py b/homeassistant/components/vallox/number.py
index 96bc07b5a93..ce3b9c72a6d 100644
--- a/homeassistant/components/vallox/number.py
+++ b/homeassistant/components/vallox/number.py
@@ -14,7 +14,7 @@ from homeassistant.components.number import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import ValloxDataUpdateCoordinator
@@ -102,7 +102,9 @@ NUMBER_ENTITIES: tuple[ValloxNumberEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensors."""
     data = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/vallox/sensor.py b/homeassistant/components/vallox/sensor.py
index 7165947861a..e9194a8254c 100644
--- a/homeassistant/components/vallox/sensor.py
+++ b/homeassistant/components/vallox/sensor.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util import dt as dt_util
 
@@ -278,7 +278,9 @@ SENSOR_ENTITIES: tuple[ValloxSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensors."""
     name = hass.data[DOMAIN][entry.entry_id]["name"]
diff --git a/homeassistant/components/vallox/strings.json b/homeassistant/components/vallox/strings.json
index 8a30ed4ad01..f00206826d3 100644
--- a/homeassistant/components/vallox/strings.json
+++ b/homeassistant/components/vallox/strings.json
@@ -110,7 +110,7 @@
       "fields": {
         "fan_speed": {
           "name": "Fan speed",
-          "description": "Fan speed."
+          "description": "Relative speed of the built-in fans."
         }
       }
     },
@@ -119,7 +119,7 @@
       "description": "Sets the fan speed of the Away profile.",
       "fields": {
         "fan_speed": {
-          "name": "Fan speed",
+          "name": "[%key:component::vallox::services::set_profile_fan_speed_home::fields::fan_speed::name%]",
           "description": "[%key:component::vallox::services::set_profile_fan_speed_home::fields::fan_speed::description%]"
         }
       }
@@ -129,7 +129,7 @@
       "description": "Sets the fan speed of the Boost profile.",
       "fields": {
         "fan_speed": {
-          "name": "Fan speed",
+          "name": "[%key:component::vallox::services::set_profile_fan_speed_home::fields::fan_speed::name%]",
           "description": "[%key:component::vallox::services::set_profile_fan_speed_home::fields::fan_speed::description%]"
         }
       }
diff --git a/homeassistant/components/vallox/switch.py b/homeassistant/components/vallox/switch.py
index 20b270f8f18..9386f914f58 100644
--- a/homeassistant/components/vallox/switch.py
+++ b/homeassistant/components/vallox/switch.py
@@ -11,7 +11,7 @@ from homeassistant.components.switch import SwitchEntity, SwitchEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import ValloxDataUpdateCoordinator
@@ -82,7 +82,7 @@ SWITCH_ENTITIES: tuple[ValloxSwitchEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the switches."""
 
diff --git a/homeassistant/components/vasttrafik/sensor.py b/homeassistant/components/vasttrafik/sensor.py
index 48f659103e1..424ffdc0ed2 100644
--- a/homeassistant/components/vasttrafik/sensor.py
+++ b/homeassistant/components/vasttrafik/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_DELAY, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/velbus/__init__.py b/homeassistant/components/velbus/__init__.py
index 41b8730eeb0..35c61892964 100644
--- a/homeassistant/components/velbus/__init__.py
+++ b/homeassistant/components/velbus/__init__.py
@@ -135,15 +135,39 @@ async def async_migrate_entry(
     hass: HomeAssistant, config_entry: VelbusConfigEntry
 ) -> bool:
     """Migrate old entry."""
-    _LOGGER.debug("Migrating from version %s", config_entry.version)
-    cache_path = hass.config.path(STORAGE_DIR, f"velbuscache-{config_entry.entry_id}/")
-    if config_entry.version == 1:
-        # This is the config entry migration for adding the new program selection
+    _LOGGER.error(
+        "Migrating from version %s.%s", config_entry.version, config_entry.minor_version
+    )
+
+    # This is the config entry migration for adding the new program selection
+    # migrate from 1.x to 2.1
+    if config_entry.version < 2:
         # clean the velbusCache
+        cache_path = hass.config.path(
+            STORAGE_DIR, f"velbuscache-{config_entry.entry_id}/"
+        )
         if os.path.isdir(cache_path):
             await hass.async_add_executor_job(shutil.rmtree, cache_path)
-        # set the new version
-        hass.config_entries.async_update_entry(config_entry, version=2)
 
-    _LOGGER.debug("Migration to version %s successful", config_entry.version)
+    # This is the config entry migration for swapping the usb unique id to the serial number
+    # migrate from 2.1 to 2.2
+    if (
+        config_entry.version < 3
+        and config_entry.minor_version == 1
+        and config_entry.unique_id is not None
+    ):
+        # not all velbus devices have a unique id, so handle this correctly
+        parts = config_entry.unique_id.split("_")
+        # old one should have 4 item
+        if len(parts) == 4:
+            hass.config_entries.async_update_entry(config_entry, unique_id=parts[1])
+
+    # update the config entry
+    hass.config_entries.async_update_entry(config_entry, version=2, minor_version=2)
+
+    _LOGGER.error(
+        "Migration to version %s.%s successful",
+        config_entry.version,
+        config_entry.minor_version,
+    )
     return True
diff --git a/homeassistant/components/velbus/binary_sensor.py b/homeassistant/components/velbus/binary_sensor.py
index 88dc994efe8..2ddf6605c19 100644
--- a/homeassistant/components/velbus/binary_sensor.py
+++ b/homeassistant/components/velbus/binary_sensor.py
@@ -4,7 +4,7 @@ from velbusaio.channels import Button as VelbusButton
 
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import VelbusConfigEntry
 from .entity import VelbusEntity
@@ -15,7 +15,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: VelbusConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Velbus switch based on config_entry."""
     await entry.runtime_data.scan_task
diff --git a/homeassistant/components/velbus/button.py b/homeassistant/components/velbus/button.py
index fc943159123..8f736dcd35b 100644
--- a/homeassistant/components/velbus/button.py
+++ b/homeassistant/components/velbus/button.py
@@ -10,7 +10,7 @@ from velbusaio.channels import (
 from homeassistant.components.button import ButtonEntity
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import VelbusConfigEntry
 from .entity import VelbusEntity, api_call
@@ -21,7 +21,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: VelbusConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Velbus switch based on config_entry."""
     await entry.runtime_data.scan_task
diff --git a/homeassistant/components/velbus/climate.py b/homeassistant/components/velbus/climate.py
index b2f3077ecee..e31d9a97416 100644
--- a/homeassistant/components/velbus/climate.py
+++ b/homeassistant/components/velbus/climate.py
@@ -14,7 +14,7 @@ from homeassistant.components.climate import (
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import VelbusConfigEntry
 from .const import DOMAIN, PRESET_MODES
@@ -26,7 +26,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: VelbusConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Velbus switch based on config_entry."""
     await entry.runtime_data.scan_task
diff --git a/homeassistant/components/velbus/config_flow.py b/homeassistant/components/velbus/config_flow.py
index 9e99b2631d4..7c93d8784ad 100644
--- a/homeassistant/components/velbus/config_flow.py
+++ b/homeassistant/components/velbus/config_flow.py
@@ -4,22 +4,23 @@ from __future__ import annotations
 
 from typing import Any
 
+import serial.tools.list_ports
 import velbusaio.controller
 from velbusaio.exceptions import VelbusConnectionFailed
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_NAME, CONF_PORT
+from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT
 from homeassistant.helpers.service_info.usb import UsbServiceInfo
-from homeassistant.util import slugify
 
-from .const import DOMAIN
+from .const import CONF_TLS, DOMAIN
 
 
 class VelbusConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow."""
 
     VERSION = 2
+    MINOR_VERSION = 2
 
     def __init__(self) -> None:
         """Initialize the velbus config flow."""
@@ -27,14 +28,16 @@ class VelbusConfigFlow(ConfigFlow, domain=DOMAIN):
         self._device: str = ""
         self._title: str = ""
 
-    def _create_device(self, name: str, prt: str) -> ConfigFlowResult:
+    def _create_device(self) -> ConfigFlowResult:
         """Create an entry async."""
-        return self.async_create_entry(title=name, data={CONF_PORT: prt})
+        return self.async_create_entry(
+            title=self._title, data={CONF_PORT: self._device}
+        )
 
-    async def _test_connection(self, prt: str) -> bool:
+    async def _test_connection(self) -> bool:
         """Try to connect to the velbus with the port specified."""
         try:
-            controller = velbusaio.controller.Velbus(prt)
+            controller = velbusaio.controller.Velbus(self._device)
             await controller.connect()
             await controller.stop()
         except VelbusConnectionFailed:
@@ -46,43 +49,86 @@ class VelbusConfigFlow(ConfigFlow, domain=DOMAIN):
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Step when user initializes a integration."""
-        self._errors = {}
+        return self.async_show_menu(
+            step_id="user", menu_options=["network", "usbselect"]
+        )
+
+    async def async_step_network(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle network step."""
         if user_input is not None:
-            name = slugify(user_input[CONF_NAME])
-            prt = user_input[CONF_PORT]
-            self._async_abort_entries_match({CONF_PORT: prt})
-            if await self._test_connection(prt):
-                return self._create_device(name, prt)
+            self._title = "Velbus Network"
+            if user_input[CONF_TLS]:
+                self._device = "tls://"
+            else:
+                self._device = ""
+            if CONF_PASSWORD in user_input and user_input[CONF_PASSWORD] != "":
+                self._device += f"{user_input[CONF_PASSWORD]}@"
+            self._device += f"{user_input[CONF_HOST]}:{user_input[CONF_PORT]}"
+            self._async_abort_entries_match({CONF_PORT: self._device})
+            if await self._test_connection():
+                return self._create_device()
+        else:
+            user_input = {
+                CONF_TLS: True,
+                CONF_PORT: 27015,
+            }
+
+        return self.async_show_form(
+            step_id="network",
+            data_schema=self.add_suggested_values_to_schema(
+                vol.Schema(
+                    {
+                        vol.Required(CONF_TLS): bool,
+                        vol.Required(CONF_HOST): str,
+                        vol.Required(CONF_PORT): int,
+                        vol.Optional(CONF_PASSWORD): str,
+                    }
+                ),
+                suggested_values=user_input,
+            ),
+            errors=self._errors,
+        )
+
+    async def async_step_usbselect(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle usb select step."""
+        ports = await self.hass.async_add_executor_job(serial.tools.list_ports.comports)
+        list_of_ports = [
+            f"{p}{', s/n: ' + p.serial_number if p.serial_number else ''}"
+            + (f" - {p.manufacturer}" if p.manufacturer else "")
+            for p in ports
+        ]
+
+        if user_input is not None:
+            self._title = "Velbus USB"
+            self._device = ports[list_of_ports.index(user_input[CONF_PORT])].device
+            self._async_abort_entries_match({CONF_PORT: self._device})
+            if await self._test_connection():
+                return self._create_device()
         else:
             user_input = {}
-            user_input[CONF_NAME] = ""
             user_input[CONF_PORT] = ""
 
         return self.async_show_form(
-            step_id="user",
-            data_schema=vol.Schema(
-                {
-                    vol.Required(CONF_NAME, default=user_input[CONF_NAME]): str,
-                    vol.Required(CONF_PORT, default=user_input[CONF_PORT]): str,
-                }
+            step_id="usbselect",
+            data_schema=self.add_suggested_values_to_schema(
+                vol.Schema({vol.Required(CONF_PORT): vol.In(list_of_ports)}),
+                suggested_values=user_input,
             ),
             errors=self._errors,
         )
 
     async def async_step_usb(self, discovery_info: UsbServiceInfo) -> ConfigFlowResult:
         """Handle USB Discovery."""
-        await self.async_set_unique_id(
-            f"{discovery_info.vid}:{discovery_info.pid}_{discovery_info.serial_number}_{discovery_info.manufacturer}_{discovery_info.description}"
-        )
-        dev_path = discovery_info.device
-        # check if this device is not already configured
-        self._async_abort_entries_match({CONF_PORT: dev_path})
-        # check if we can make a valid velbus connection
-        if not await self._test_connection(dev_path):
-            return self.async_abort(reason="cannot_connect")
-        # store the data for the config step
-        self._device = dev_path
+        await self.async_set_unique_id(discovery_info.serial_number)
+        self._device = discovery_info.device
         self._title = "Velbus USB"
+        self._async_abort_entries_match({CONF_PORT: self._device})
+        if not await self._test_connection():
+            return self.async_abort(reason="cannot_connect")
         # call the config step
         self._set_confirm_only()
         return await self.async_step_discovery_confirm()
@@ -92,7 +138,7 @@ class VelbusConfigFlow(ConfigFlow, domain=DOMAIN):
     ) -> ConfigFlowResult:
         """Handle Discovery confirmation."""
         if user_input is not None:
-            return self._create_device(self._title, self._device)
+            return self._create_device()
 
         return self.async_show_form(
             step_id="discovery_confirm",
diff --git a/homeassistant/components/velbus/const.py b/homeassistant/components/velbus/const.py
index b40f64e8607..f42e449bdcc 100644
--- a/homeassistant/components/velbus/const.py
+++ b/homeassistant/components/velbus/const.py
@@ -14,6 +14,7 @@ DOMAIN: Final = "velbus"
 CONF_CONFIG_ENTRY: Final = "config_entry"
 CONF_INTERFACE: Final = "interface"
 CONF_MEMO_TEXT: Final = "memo_text"
+CONF_TLS: Final = "tls"
 
 SERVICE_SCAN: Final = "scan"
 SERVICE_SYNC: Final = "sync_clock"
diff --git a/homeassistant/components/velbus/cover.py b/homeassistant/components/velbus/cover.py
index 2ddea37f2d6..995b7e9d59c 100644
--- a/homeassistant/components/velbus/cover.py
+++ b/homeassistant/components/velbus/cover.py
@@ -12,7 +12,7 @@ from homeassistant.components.cover import (
     CoverEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import VelbusConfigEntry
 from .entity import VelbusEntity, api_call
@@ -23,7 +23,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: VelbusConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Velbus switch based on config_entry."""
     await entry.runtime_data.scan_task
diff --git a/homeassistant/components/velbus/light.py b/homeassistant/components/velbus/light.py
index c134095c2ff..5037e2b1ced 100644
--- a/homeassistant/components/velbus/light.py
+++ b/homeassistant/components/velbus/light.py
@@ -23,7 +23,7 @@ from homeassistant.components.light import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import VelbusConfigEntry
 from .entity import VelbusEntity, api_call
@@ -34,7 +34,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: VelbusConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Velbus switch based on config_entry."""
     await entry.runtime_data.scan_task
diff --git a/homeassistant/components/velbus/manifest.json b/homeassistant/components/velbus/manifest.json
index 960f127d16e..1cb540b22ec 100644
--- a/homeassistant/components/velbus/manifest.json
+++ b/homeassistant/components/velbus/manifest.json
@@ -13,7 +13,8 @@
     "velbus-packet",
     "velbus-protocol"
   ],
-  "requirements": ["velbus-aio==2025.1.1"],
+  "quality_scale": "bronze",
+  "requirements": ["velbus-aio==2025.3.1"],
   "usb": [
     {
       "vid": "10CF",
diff --git a/homeassistant/components/velbus/quality_scale.yaml b/homeassistant/components/velbus/quality_scale.yaml
index 0ad3e3ce485..829f48e6f52 100644
--- a/homeassistant/components/velbus/quality_scale.yaml
+++ b/homeassistant/components/velbus/quality_scale.yaml
@@ -8,10 +8,7 @@ rules:
   brands: done
   common-modules: done
   config-flow-test-coverage: done
-  config-flow:
-    status: todo
-    comment: |
-      Dynamically build up the port parameter based on inputs provided by the user, do not fill-in a name parameter, build it up in the config flow
+  config-flow: done
   dependency-transparency: done
   docs-actions: done
   docs-high-level-description: done
diff --git a/homeassistant/components/velbus/select.py b/homeassistant/components/velbus/select.py
index 6c2dfe0a3b1..1d52b8d4afc 100644
--- a/homeassistant/components/velbus/select.py
+++ b/homeassistant/components/velbus/select.py
@@ -5,7 +5,7 @@ from velbusaio.channels import SelectedProgram
 from homeassistant.components.select import SelectEntity
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import VelbusConfigEntry
 from .entity import VelbusEntity, api_call
@@ -16,7 +16,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: VelbusConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Velbus select based on config_entry."""
     await entry.runtime_data.scan_task
diff --git a/homeassistant/components/velbus/sensor.py b/homeassistant/components/velbus/sensor.py
index 77833da3ee1..96ef91e8174 100644
--- a/homeassistant/components/velbus/sensor.py
+++ b/homeassistant/components/velbus/sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import VelbusConfigEntry
 from .entity import VelbusEntity
@@ -21,7 +21,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: VelbusConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Velbus switch based on config_entry."""
     await entry.runtime_data.scan_task
diff --git a/homeassistant/components/velbus/strings.json b/homeassistant/components/velbus/strings.json
index 90938a6c1d2..35f94e54470 100644
--- a/homeassistant/components/velbus/strings.json
+++ b/homeassistant/components/velbus/strings.json
@@ -2,11 +2,38 @@
   "config": {
     "step": {
       "user": {
-        "title": "Define the velbus connection type",
-        "data": {
-          "name": "The name for this velbus connection",
-          "port": "Connection string"
+        "title": "Define the Velbus connection",
+        "description": "How do you want to configure the Velbus hub?",
+        "menu_options": {
+          "network": "Via network connection",
+          "usbselect": "Via USB device"
         }
+      },
+      "network": {
+        "title": "TCP/IP configuration",
+        "data": {
+          "tls": "Use TLS (secure connection)",
+          "host": "[%key:common::config_flow::data::host%]",
+          "port": "[%key:common::config_flow::data::port%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "tls": "Enable this if you use a secure connection to your Velbus interface, like a Signum.",
+          "host": "The IP address or hostname of the Velbus interface.",
+          "port": "The port number of the Velbus interface.",
+          "password": "The password of the Velbus interface, this is only needed if the interface is password protected."
+        },
+        "description": "TCP/IP configuration, in case you use a Signum, VelServ, velbus-tcp or any other Velbus to TCP/IP interface."
+      },
+      "usbselect": {
+        "title": "USB configuration",
+        "data": {
+          "port": "[%key:common::config_flow::data::port%]"
+        },
+        "data_description": {
+          "port": "Select the serial port for your Velbus USB interface."
+        },
+        "description": "Select the serial port for your Velbus USB interface."
       }
     },
     "error": {
@@ -31,21 +58,21 @@
   "services": {
     "sync_clock": {
       "name": "Sync clock",
-      "description": "Syncs the velbus modules clock to the Home Assistant clock, this is the same as the 'sync clock' from VelbusLink.",
+      "description": "Syncs the Velbus modules clock to the Home Assistant clock, this is the same as the 'sync clock' from VelbusLink.",
       "fields": {
         "interface": {
           "name": "Interface",
-          "description": "The velbus interface to send the command to, this will be the same value as used during configuration."
+          "description": "The Velbus interface to send the command to, this will be the same value as used during configuration."
         },
         "config_entry": {
           "name": "Config entry",
-          "description": "The config entry of the velbus integration"
+          "description": "The config entry of the Velbus integration"
         }
       }
     },
     "scan": {
       "name": "Scan",
-      "description": "Scans the velbus modules, this will be needed if you see unknown module warnings in the logs, or when you added new modules.",
+      "description": "Scans the Velbus modules, this will be needed if you see unknown module warnings in the logs, or when you added new modules.",
       "fields": {
         "interface": {
           "name": "[%key:component::velbus::services::sync_clock::fields::interface::name%]",
@@ -59,7 +86,7 @@
     },
     "clear_cache": {
       "name": "Clear cache",
-      "description": "Clears the velbuscache and then starts a new scan.",
+      "description": "Clears the Velbus cache and then starts a new scan.",
       "fields": {
         "interface": {
           "name": "[%key:component::velbus::services::sync_clock::fields::interface::name%]",
@@ -101,7 +128,7 @@
   "issues": {
     "deprecated_interface_parameter": {
       "title": "Deprecated 'interface' parameter",
-      "description": "The 'interface' parameter in the Velbus service calls is deprecated. The 'config_entry' parameter should be used going forward.\n\nPlease adjust your automations or scripts to fix this issue."
+      "description": "The 'interface' parameter in the Velbus actions is deprecated. The 'config_entry' parameter should be used going forward.\n\nPlease adjust your automations or scripts to fix this issue."
     }
   }
 }
diff --git a/homeassistant/components/velbus/switch.py b/homeassistant/components/velbus/switch.py
index 8256e716d4f..40dc3c09f73 100644
--- a/homeassistant/components/velbus/switch.py
+++ b/homeassistant/components/velbus/switch.py
@@ -6,7 +6,7 @@ from velbusaio.channels import Relay as VelbusRelay
 
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import VelbusConfigEntry
 from .entity import VelbusEntity, api_call
@@ -17,7 +17,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: VelbusConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Velbus switch based on config_entry."""
     await entry.runtime_data.scan_task
diff --git a/homeassistant/components/velux/config_flow.py b/homeassistant/components/velux/config_flow.py
index fba023f7638..24f65aa3b0b 100644
--- a/homeassistant/components/velux/config_flow.py
+++ b/homeassistant/components/velux/config_flow.py
@@ -7,7 +7,7 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntryState, ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME, CONF_PASSWORD
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 
diff --git a/homeassistant/components/velux/cover.py b/homeassistant/components/velux/cover.py
index 90745f601b4..d6bf8905d91 100644
--- a/homeassistant/components/velux/cover.py
+++ b/homeassistant/components/velux/cover.py
@@ -16,7 +16,7 @@ from homeassistant.components.cover import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import VeluxEntity
@@ -25,7 +25,9 @@ PARALLEL_UPDATES = 1
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, config: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    config: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up cover(s) for Velux platform."""
     module = hass.data[DOMAIN][config.entry_id]
diff --git a/homeassistant/components/velux/entity.py b/homeassistant/components/velux/entity.py
index 674ba5dde45..1231a98e0a8 100644
--- a/homeassistant/components/velux/entity.py
+++ b/homeassistant/components/velux/entity.py
@@ -31,6 +31,6 @@ class VeluxEntity(Entity):
 
         self.node.register_device_updated_cb(after_update_callback)
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Store register state change callback."""
         self.async_register_callbacks()
diff --git a/homeassistant/components/velux/light.py b/homeassistant/components/velux/light.py
index 14f12a01060..b991239b7a4 100644
--- a/homeassistant/components/velux/light.py
+++ b/homeassistant/components/velux/light.py
@@ -9,7 +9,7 @@ from pyvlx import Intensity, LighteningDevice
 from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import VeluxEntity
@@ -18,7 +18,9 @@ PARALLEL_UPDATES = 1
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, config: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    config: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up light(s) for Velux platform."""
     module = hass.data[DOMAIN][config.entry_id]
diff --git a/homeassistant/components/velux/scene.py b/homeassistant/components/velux/scene.py
index 54888413613..636ab82e819 100644
--- a/homeassistant/components/velux/scene.py
+++ b/homeassistant/components/velux/scene.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.scene import Scene
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 
@@ -15,7 +15,9 @@ PARALLEL_UPDATES = 1
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, config: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    config: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the scenes for Velux platform."""
     module = hass.data[DOMAIN][config.entry_id]
diff --git a/homeassistant/components/venstar/__init__.py b/homeassistant/components/venstar/__init__.py
index 3243c7a6f47..faa47bfc8e4 100644
--- a/homeassistant/components/venstar/__init__.py
+++ b/homeassistant/components/venstar/__init__.py
@@ -21,14 +21,14 @@ from .coordinator import VenstarDataUpdateCoordinator
 PLATFORMS = [Platform.BINARY_SENSOR, Platform.CLIMATE, Platform.SENSOR]
 
 
-async def async_setup_entry(hass: HomeAssistant, config: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Set up the Venstar thermostat."""
-    username = config.data.get(CONF_USERNAME)
-    password = config.data.get(CONF_PASSWORD)
-    pin = config.data.get(CONF_PIN)
-    host = config.data[CONF_HOST]
+    username = config_entry.data.get(CONF_USERNAME)
+    password = config_entry.data.get(CONF_PASSWORD)
+    pin = config_entry.data.get(CONF_PIN)
+    host = config_entry.data[CONF_HOST]
     timeout = VENSTAR_TIMEOUT
-    protocol = "https" if config.data[CONF_SSL] else "http"
+    protocol = "https" if config_entry.data[CONF_SSL] else "http"
 
     client = VenstarColorTouch(
         addr=host,
@@ -41,19 +41,22 @@ async def async_setup_entry(hass: HomeAssistant, config: ConfigEntry) -> bool:
 
     venstar_data_coordinator = VenstarDataUpdateCoordinator(
         hass,
+        config_entry,
         venstar_connection=client,
     )
     await venstar_data_coordinator.async_config_entry_first_refresh()
 
-    hass.data.setdefault(DOMAIN, {})[config.entry_id] = venstar_data_coordinator
-    await hass.config_entries.async_forward_entry_setups(config, PLATFORMS)
+    hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = venstar_data_coordinator
+    await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, config: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Unload the config and platforms."""
-    unload_ok = await hass.config_entries.async_unload_platforms(config, PLATFORMS)
+    unload_ok = await hass.config_entries.async_unload_platforms(
+        config_entry, PLATFORMS
+    )
     if unload_ok:
-        hass.data[DOMAIN].pop(config.entry_id)
+        hass.data[DOMAIN].pop(config_entry.entry_id)
     return unload_ok
diff --git a/homeassistant/components/venstar/binary_sensor.py b/homeassistant/components/venstar/binary_sensor.py
index 315df09b625..672db463791 100644
--- a/homeassistant/components/venstar/binary_sensor.py
+++ b/homeassistant/components/venstar/binary_sensor.py
@@ -6,7 +6,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import VenstarEntity
@@ -15,7 +15,7 @@ from .entity import VenstarEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Vensar device binary_sensors based on a config entry."""
     coordinator = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/venstar/climate.py b/homeassistant/components/venstar/climate.py
index c5323e1e9a8..ade86e8dd71 100644
--- a/homeassistant/components/venstar/climate.py
+++ b/homeassistant/components/venstar/climate.py
@@ -32,8 +32,11 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import (
@@ -66,7 +69,7 @@ PLATFORM_SCHEMA = CLIMATE_PLATFORM_SCHEMA.extend(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Venstar thermostat."""
     venstar_data_coordinator = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/venstar/coordinator.py b/homeassistant/components/venstar/coordinator.py
index b825775de7f..1d0ff60c1e0 100644
--- a/homeassistant/components/venstar/coordinator.py
+++ b/homeassistant/components/venstar/coordinator.py
@@ -8,6 +8,7 @@ from datetime import timedelta
 from requests import RequestException
 from venstarcolortouch import VenstarColorTouch
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import update_coordinator
 
@@ -17,16 +18,19 @@ from .const import _LOGGER, DOMAIN, VENSTAR_SLEEP
 class VenstarDataUpdateCoordinator(update_coordinator.DataUpdateCoordinator[None]):
     """Class to manage fetching Venstar data."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
-        *,
+        config_entry: ConfigEntry,
         venstar_connection: VenstarColorTouch,
     ) -> None:
         """Initialize global Venstar data updater."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=60),
         )
diff --git a/homeassistant/components/venstar/sensor.py b/homeassistant/components/venstar/sensor.py
index 94180f6ad79..14e7103a83f 100644
--- a/homeassistant/components/venstar/sensor.py
+++ b/homeassistant/components/venstar/sensor.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import VenstarDataUpdateCoordinator
@@ -81,7 +81,7 @@ class VenstarSensorEntityDescription(SensorEntityDescription):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Venstar device sensors based on a config entry."""
     coordinator: VenstarDataUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/vera/binary_sensor.py b/homeassistant/components/vera/binary_sensor.py
index 3438ee81d4a..00780fec8ce 100644
--- a/homeassistant/components/vera/binary_sensor.py
+++ b/homeassistant/components/vera/binary_sensor.py
@@ -8,7 +8,7 @@ from homeassistant.components.binary_sensor import ENTITY_ID_FORMAT, BinarySenso
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .common import ControllerData, get_controller_data
 from .entity import VeraEntity
@@ -17,7 +17,7 @@ from .entity import VeraEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor config entry."""
     controller_data = get_controller_data(hass, entry)
diff --git a/homeassistant/components/vera/climate.py b/homeassistant/components/vera/climate.py
index eb2a5206f30..084725f484e 100644
--- a/homeassistant/components/vera/climate.py
+++ b/homeassistant/components/vera/climate.py
@@ -17,7 +17,7 @@ from homeassistant.components.climate import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, Platform, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .common import ControllerData, get_controller_data
 from .entity import VeraEntity
@@ -30,7 +30,7 @@ SUPPORT_HVAC = [HVACMode.COOL, HVACMode.HEAT, HVACMode.HEAT_COOL, HVACMode.OFF]
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor config entry."""
     controller_data = get_controller_data(hass, entry)
diff --git a/homeassistant/components/vera/cover.py b/homeassistant/components/vera/cover.py
index b5b57f43c0c..8256804b8a3 100644
--- a/homeassistant/components/vera/cover.py
+++ b/homeassistant/components/vera/cover.py
@@ -10,7 +10,7 @@ from homeassistant.components.cover import ATTR_POSITION, ENTITY_ID_FORMAT, Cove
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .common import ControllerData, get_controller_data
 from .entity import VeraEntity
@@ -19,7 +19,7 @@ from .entity import VeraEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor config entry."""
     controller_data = get_controller_data(hass, entry)
diff --git a/homeassistant/components/vera/entity.py b/homeassistant/components/vera/entity.py
index 84e21e54983..b3013c288c1 100644
--- a/homeassistant/components/vera/entity.py
+++ b/homeassistant/components/vera/entity.py
@@ -52,7 +52,7 @@ class VeraEntity[_DeviceTypeT: veraApi.VeraDevice](Entity):
         """Update the state."""
         self.schedule_update_ha_state(True)
 
-    def update(self):
+    def update(self) -> None:
         """Force a refresh from the device if the device is unavailable."""
         refresh_needed = self.vera_device.should_poll or not self.available
         _LOGGER.debug("%s: update called (refresh=%s)", self._name, refresh_needed)
@@ -90,7 +90,7 @@ class VeraEntity[_DeviceTypeT: veraApi.VeraDevice](Entity):
         return attr
 
     @property
-    def available(self):
+    def available(self) -> bool:
         """If device communications have failed return false."""
         return not self.vera_device.comm_failure
 
diff --git a/homeassistant/components/vera/light.py b/homeassistant/components/vera/light.py
index e512676de9a..f573fcd94ea 100644
--- a/homeassistant/components/vera/light.py
+++ b/homeassistant/components/vera/light.py
@@ -16,8 +16,8 @@ from homeassistant.components.light import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.color as color_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import color as color_util
 
 from .common import ControllerData, get_controller_data
 from .entity import VeraEntity
@@ -26,7 +26,7 @@ from .entity import VeraEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor config entry."""
     controller_data = get_controller_data(hass, entry)
diff --git a/homeassistant/components/vera/lock.py b/homeassistant/components/vera/lock.py
index 18f0b9de3e2..3f76f3a6106 100644
--- a/homeassistant/components/vera/lock.py
+++ b/homeassistant/components/vera/lock.py
@@ -10,7 +10,7 @@ from homeassistant.components.lock import ENTITY_ID_FORMAT, LockEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .common import ControllerData, get_controller_data
 from .entity import VeraEntity
@@ -22,7 +22,7 @@ ATTR_LOW_BATTERY = "low_battery"
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor config entry."""
     controller_data = get_controller_data(hass, entry)
diff --git a/homeassistant/components/vera/scene.py b/homeassistant/components/vera/scene.py
index 22061f98929..0e504b12303 100644
--- a/homeassistant/components/vera/scene.py
+++ b/homeassistant/components/vera/scene.py
@@ -9,7 +9,7 @@ import pyvera as veraApi
 from homeassistant.components.scene import Scene
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import slugify
 
 from .common import ControllerData, get_controller_data
@@ -19,7 +19,7 @@ from .const import VERA_ID_FORMAT
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor config entry."""
     controller_data = get_controller_data(hass, entry)
diff --git a/homeassistant/components/vera/sensor.py b/homeassistant/components/vera/sensor.py
index 95f1fa0bd89..d778b4c2e5d 100644
--- a/homeassistant/components/vera/sensor.py
+++ b/homeassistant/components/vera/sensor.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .common import ControllerData, get_controller_data
 from .entity import VeraEntity
@@ -32,7 +32,7 @@ SCAN_INTERVAL = timedelta(seconds=5)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor config entry."""
     controller_data = get_controller_data(hass, entry)
diff --git a/homeassistant/components/vera/switch.py b/homeassistant/components/vera/switch.py
index ad7fbe68458..67be4a7849a 100644
--- a/homeassistant/components/vera/switch.py
+++ b/homeassistant/components/vera/switch.py
@@ -10,7 +10,7 @@ from homeassistant.components.switch import ENTITY_ID_FORMAT, SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .common import ControllerData, get_controller_data
 from .entity import VeraEntity
@@ -19,7 +19,7 @@ from .entity import VeraEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor config entry."""
     controller_data = get_controller_data(hass, entry)
diff --git a/homeassistant/components/verisure/alarm_control_panel.py b/homeassistant/components/verisure/alarm_control_panel.py
index 5f34b587163..7ead1f014c8 100644
--- a/homeassistant/components/verisure/alarm_control_panel.py
+++ b/homeassistant/components/verisure/alarm_control_panel.py
@@ -13,7 +13,7 @@ from homeassistant.components.alarm_control_panel import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import ALARM_STATE_TO_HA, CONF_GIID, DOMAIN, LOGGER
@@ -23,7 +23,7 @@ from .coordinator import VerisureDataUpdateCoordinator
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Verisure alarm control panel from a config entry."""
     async_add_entities([VerisureAlarm(coordinator=hass.data[DOMAIN][entry.entry_id])])
@@ -49,14 +49,14 @@ class VerisureAlarm(
             name="Verisure Alarm",
             manufacturer="Verisure",
             model="VBox",
-            identifiers={(DOMAIN, self.coordinator.entry.data[CONF_GIID])},
+            identifiers={(DOMAIN, self.coordinator.config_entry.data[CONF_GIID])},
             configuration_url="https://mypages.verisure.com",
         )
 
     @property
     def unique_id(self) -> str:
         """Return the unique ID for this entity."""
-        return self.coordinator.entry.data[CONF_GIID]
+        return self.coordinator.config_entry.data[CONF_GIID]
 
     async def _async_set_arm_state(
         self, state: str, command_data: dict[str, str | dict[str, str]]
diff --git a/homeassistant/components/verisure/binary_sensor.py b/homeassistant/components/verisure/binary_sensor.py
index 542ee3485ce..4d9221c3ca9 100644
--- a/homeassistant/components/verisure/binary_sensor.py
+++ b/homeassistant/components/verisure/binary_sensor.py
@@ -11,7 +11,7 @@ from homeassistant.const import ATTR_LAST_TRIP_TIME, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import dt as dt_util
 
@@ -22,7 +22,7 @@ from .coordinator import VerisureDataUpdateCoordinator
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Verisure binary sensors based on a config entry."""
     coordinator: VerisureDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
@@ -62,7 +62,7 @@ class VerisureDoorWindowSensor(
             manufacturer="Verisure",
             model="Shock Sensor Detector",
             identifiers={(DOMAIN, self.serial_number)},
-            via_device=(DOMAIN, self.coordinator.entry.data[CONF_GIID]),
+            via_device=(DOMAIN, self.coordinator.config_entry.data[CONF_GIID]),
             configuration_url="https://mypages.verisure.com",
         )
 
@@ -104,7 +104,7 @@ class VerisureEthernetStatus(
     @property
     def unique_id(self) -> str:
         """Return the unique ID for this entity."""
-        return f"{self.coordinator.entry.data[CONF_GIID]}_ethernet"
+        return f"{self.coordinator.config_entry.data[CONF_GIID]}_ethernet"
 
     @property
     def device_info(self) -> DeviceInfo:
@@ -113,7 +113,7 @@ class VerisureEthernetStatus(
             name="Verisure Alarm",
             manufacturer="Verisure",
             model="VBox",
-            identifiers={(DOMAIN, self.coordinator.entry.data[CONF_GIID])},
+            identifiers={(DOMAIN, self.coordinator.config_entry.data[CONF_GIID])},
             configuration_url="https://mypages.verisure.com",
         )
 
diff --git a/homeassistant/components/verisure/camera.py b/homeassistant/components/verisure/camera.py
index 70cd436d24c..1f5d48ea197 100644
--- a/homeassistant/components/verisure/camera.py
+++ b/homeassistant/components/verisure/camera.py
@@ -13,7 +13,7 @@ from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import (
-    AddEntitiesCallback,
+    AddConfigEntryEntitiesCallback,
     async_get_current_platform,
 )
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -25,7 +25,7 @@ from .coordinator import VerisureDataUpdateCoordinator
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Verisure sensors based on a config entry."""
     coordinator: VerisureDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
@@ -75,7 +75,7 @@ class VerisureSmartcam(CoordinatorEntity[VerisureDataUpdateCoordinator], Camera)
             manufacturer="Verisure",
             model="SmartCam",
             identifiers={(DOMAIN, self.serial_number)},
-            via_device=(DOMAIN, self.coordinator.entry.data[CONF_GIID]),
+            via_device=(DOMAIN, self.coordinator.config_entry.data[CONF_GIID]),
             configuration_url="https://mypages.verisure.com",
         )
 
diff --git a/homeassistant/components/verisure/coordinator.py b/homeassistant/components/verisure/coordinator.py
index 930d862257b..5165ddc6d3d 100644
--- a/homeassistant/components/verisure/coordinator.py
+++ b/homeassistant/components/verisure/coordinator.py
@@ -25,10 +25,11 @@ from .const import CONF_GIID, DEFAULT_SCAN_INTERVAL, DOMAIN, LOGGER
 class VerisureDataUpdateCoordinator(DataUpdateCoordinator):
     """A Verisure Data Update Coordinator."""
 
+    config_entry: ConfigEntry
+
     def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
         """Initialize the Verisure hub."""
         self.imageseries: list[dict[str, str]] = []
-        self.entry = entry
         self._overview: list[dict] = []
 
         self.verisure = Verisure(
@@ -40,7 +41,11 @@ class VerisureDataUpdateCoordinator(DataUpdateCoordinator):
         )
 
         super().__init__(
-            hass, LOGGER, name=DOMAIN, update_interval=DEFAULT_SCAN_INTERVAL
+            hass,
+            LOGGER,
+            config_entry=entry,
+            name=DOMAIN,
+            update_interval=DEFAULT_SCAN_INTERVAL,
         )
 
     async def async_login(self) -> bool:
@@ -55,7 +60,7 @@ class VerisureDataUpdateCoordinator(DataUpdateCoordinator):
             return False
 
         await self.hass.async_add_executor_job(
-            self.verisure.set_giid, self.entry.data[CONF_GIID]
+            self.verisure.set_giid, self.config_entry.data[CONF_GIID]
         )
 
         return True
diff --git a/homeassistant/components/verisure/lock.py b/homeassistant/components/verisure/lock.py
index 87f5c53880e..76aeedd05fa 100644
--- a/homeassistant/components/verisure/lock.py
+++ b/homeassistant/components/verisure/lock.py
@@ -13,7 +13,7 @@ from homeassistant.const import ATTR_CODE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import (
-    AddEntitiesCallback,
+    AddConfigEntryEntitiesCallback,
     async_get_current_platform,
 )
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -33,7 +33,7 @@ from .coordinator import VerisureDataUpdateCoordinator
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Verisure alarm control panel from a config entry."""
     coordinator: VerisureDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
@@ -81,7 +81,7 @@ class VerisureDoorlock(CoordinatorEntity[VerisureDataUpdateCoordinator], LockEnt
             manufacturer="Verisure",
             model="Lockguard Smartlock",
             identifiers={(DOMAIN, self.serial_number)},
-            via_device=(DOMAIN, self.coordinator.entry.data[CONF_GIID]),
+            via_device=(DOMAIN, self.coordinator.config_entry.data[CONF_GIID]),
             configuration_url="https://mypages.verisure.com",
         )
 
@@ -109,7 +109,7 @@ class VerisureDoorlock(CoordinatorEntity[VerisureDataUpdateCoordinator], LockEnt
     @property
     def code_format(self) -> str:
         """Return the configured code format."""
-        digits = self.coordinator.entry.options.get(
+        digits = self.coordinator.config_entry.options.get(
             CONF_LOCK_CODE_DIGITS, DEFAULT_LOCK_CODE_DIGITS
         )
         return f"^\\d{{{digits}}}$"
diff --git a/homeassistant/components/verisure/sensor.py b/homeassistant/components/verisure/sensor.py
index 4f6e6b3d3c5..6ed4784bffb 100644
--- a/homeassistant/components/verisure/sensor.py
+++ b/homeassistant/components/verisure/sensor.py
@@ -12,7 +12,7 @@ from homeassistant.const import PERCENTAGE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import CONF_GIID, DEVICE_TYPE_NAME, DOMAIN
@@ -22,7 +22,7 @@ from .coordinator import VerisureDataUpdateCoordinator
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Verisure sensors based on a config entry."""
     coordinator: VerisureDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
@@ -72,7 +72,7 @@ class VerisureThermometer(
             manufacturer="Verisure",
             model=DEVICE_TYPE_NAME.get(device_type, device_type),
             identifiers={(DOMAIN, self.serial_number)},
-            via_device=(DOMAIN, self.coordinator.entry.data[CONF_GIID]),
+            via_device=(DOMAIN, self.coordinator.config_entry.data[CONF_GIID]),
             configuration_url="https://mypages.verisure.com",
         )
 
@@ -122,7 +122,7 @@ class VerisureHygrometer(
             manufacturer="Verisure",
             model=DEVICE_TYPE_NAME.get(device_type, device_type),
             identifiers={(DOMAIN, self.serial_number)},
-            via_device=(DOMAIN, self.coordinator.entry.data[CONF_GIID]),
+            via_device=(DOMAIN, self.coordinator.config_entry.data[CONF_GIID]),
             configuration_url="https://mypages.verisure.com",
         )
 
diff --git a/homeassistant/components/verisure/switch.py b/homeassistant/components/verisure/switch.py
index e0238097e01..0deb1da5e95 100644
--- a/homeassistant/components/verisure/switch.py
+++ b/homeassistant/components/verisure/switch.py
@@ -9,7 +9,7 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import CONF_GIID, DOMAIN
@@ -19,7 +19,7 @@ from .coordinator import VerisureDataUpdateCoordinator
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Verisure alarm control panel from a config entry."""
     coordinator: VerisureDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
@@ -57,7 +57,7 @@ class VerisureSmartplug(CoordinatorEntity[VerisureDataUpdateCoordinator], Switch
             manufacturer="Verisure",
             model="SmartPlug",
             identifiers={(DOMAIN, self.serial_number)},
-            via_device=(DOMAIN, self.coordinator.entry.data[CONF_GIID]),
+            via_device=(DOMAIN, self.coordinator.config_entry.data[CONF_GIID]),
             configuration_url="https://mypages.verisure.com",
         )
 
diff --git a/homeassistant/components/versasense/__init__.py b/homeassistant/components/versasense/__init__.py
index ed4a8edf32c..cbd69ba0a81 100644
--- a/homeassistant/components/versasense/__init__.py
+++ b/homeassistant/components/versasense/__init__.py
@@ -7,8 +7,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import aiohttp_client
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import aiohttp_client, config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/version/__init__.py b/homeassistant/components/version/__init__.py
index cf13821dc8a..6fabf97c8dd 100644
--- a/homeassistant/components/version/__init__.py
+++ b/homeassistant/components/version/__init__.py
@@ -6,7 +6,6 @@ import logging
 
 from pyhaversion import HaVersion
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
@@ -18,12 +17,10 @@ from .const import (
     CONF_SOURCE,
     PLATFORMS,
 )
-from .coordinator import VersionDataUpdateCoordinator
+from .coordinator import VersionConfigEntry, VersionDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
-type VersionConfigEntry = ConfigEntry[VersionDataUpdateCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: VersionConfigEntry) -> bool:
     """Set up the version integration from a config entry."""
@@ -40,6 +37,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: VersionConfigEntry) -> b
 
     coordinator = VersionDataUpdateCoordinator(
         hass=hass,
+        config_entry=entry,
         api=HaVersion(
             session=async_get_clientsession(hass),
             source=entry.data[CONF_SOURCE],
diff --git a/homeassistant/components/version/binary_sensor.py b/homeassistant/components/version/binary_sensor.py
index 827029e1d8c..900daa7aba1 100644
--- a/homeassistant/components/version/binary_sensor.py
+++ b/homeassistant/components/version/binary_sensor.py
@@ -11,10 +11,10 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import CONF_NAME, EntityCategory, __version__ as HA_VERSION
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import VersionConfigEntry
 from .const import CONF_SOURCE, DEFAULT_NAME
+from .coordinator import VersionConfigEntry
 from .entity import VersionEntity
 
 HA_VERSION_OBJECT = AwesomeVersion(HA_VERSION)
@@ -23,7 +23,7 @@ HA_VERSION_OBJECT = AwesomeVersion(HA_VERSION)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: VersionConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up version binary_sensors."""
     coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/version/coordinator.py b/homeassistant/components/version/coordinator.py
index 05adf07642b..349ede53d33 100644
--- a/homeassistant/components/version/coordinator.py
+++ b/homeassistant/components/version/coordinator.py
@@ -14,21 +14,25 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .const import DOMAIN, LOGGER, UPDATE_COORDINATOR_UPDATE_INTERVAL
 
+type VersionConfigEntry = ConfigEntry[VersionDataUpdateCoordinator]
+
 
 class VersionDataUpdateCoordinator(DataUpdateCoordinator[None]):
     """Data update coordinator for Version entities."""
 
-    config_entry: ConfigEntry
+    config_entry: VersionConfigEntry
 
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: VersionConfigEntry,
         api: HaVersion,
     ) -> None:
         """Initialize the coordinator."""
         super().__init__(
             hass=hass,
             logger=LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=UPDATE_COORDINATOR_UPDATE_INTERVAL,
         )
diff --git a/homeassistant/components/version/diagnostics.py b/homeassistant/components/version/diagnostics.py
index ca7318f468b..bcc94bd8da4 100644
--- a/homeassistant/components/version/diagnostics.py
+++ b/homeassistant/components/version/diagnostics.py
@@ -9,7 +9,7 @@ from attr import asdict
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 
-from . import VersionConfigEntry
+from .coordinator import VersionConfigEntry
 
 
 async def async_get_config_entry_diagnostics(
diff --git a/homeassistant/components/version/sensor.py b/homeassistant/components/version/sensor.py
index e1d552bcd36..7e173b46d36 100644
--- a/homeassistant/components/version/sensor.py
+++ b/homeassistant/components/version/sensor.py
@@ -7,18 +7,18 @@ from typing import Any
 from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import VersionConfigEntry
 from .const import CONF_SOURCE, DEFAULT_NAME
+from .coordinator import VersionConfigEntry
 from .entity import VersionEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: VersionConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up version sensors."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/vesync/__init__.py b/homeassistant/components/vesync/__init__.py
index 240a793f518..dddf7857545 100644
--- a/homeassistant/components/vesync/__init__.py
+++ b/homeassistant/components/vesync/__init__.py
@@ -5,8 +5,15 @@ import logging
 from pyvesync import VeSync
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.const import (
+    CONF_PASSWORD,
+    CONF_USERNAME,
+    EVENT_LOGGING_CHANGED,
+    Platform,
+)
+from homeassistant.core import Event, HomeAssistant, ServiceCall, callback
+from homeassistant.exceptions import ConfigEntryAuthFailed
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 
 from .common import async_generate_device_list
@@ -16,15 +23,18 @@ from .const import (
     VS_COORDINATOR,
     VS_DEVICES,
     VS_DISCOVERY,
+    VS_LISTENERS,
     VS_MANAGER,
 )
 from .coordinator import VeSyncDataCoordinator
 
 PLATFORMS = [
+    Platform.BINARY_SENSOR,
     Platform.FAN,
     Platform.HUMIDIFIER,
     Platform.LIGHT,
     Platform.NUMBER,
+    Platform.SELECT,
     Platform.SENSOR,
     Platform.SWITCH,
 ]
@@ -39,18 +49,23 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
 
     time_zone = str(hass.config.time_zone)
 
-    manager = VeSync(username, password, time_zone)
+    manager = VeSync(
+        username=username,
+        password=password,
+        time_zone=time_zone,
+        debug=logging.getLogger("pyvesync.vesync").level == logging.DEBUG,
+        redact=True,
+    )
 
     login = await hass.async_add_executor_job(manager.login)
 
     if not login:
-        _LOGGER.error("Unable to login to the VeSync server")
-        return False
+        raise ConfigEntryAuthFailed
 
     hass.data[DOMAIN] = {}
     hass.data[DOMAIN][VS_MANAGER] = manager
 
-    coordinator = VeSyncDataCoordinator(hass, manager)
+    coordinator = VeSyncDataCoordinator(hass, config_entry, manager)
 
     # Store coordinator at domain level since only single integration instance is permitted.
     hass.data[DOMAIN][VS_COORDINATOR] = coordinator
@@ -59,6 +74,17 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
 
     await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
 
+    @callback
+    def _async_handle_logging_changed(_event: Event) -> None:
+        """Handle when the logging level changes."""
+        manager.debug = logging.getLogger("pyvesync.vesync").level == logging.DEBUG
+
+    cleanup = hass.bus.async_listen(
+        EVENT_LOGGING_CHANGED, _async_handle_logging_changed
+    )
+
+    hass.data[DOMAIN][VS_LISTENERS] = cleanup
+
     async def async_new_device_discovery(service: ServiceCall) -> None:
         """Discover if new devices should be added."""
         manager = hass.data[DOMAIN][VS_MANAGER]
@@ -84,9 +110,43 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-
+    hass.data[DOMAIN][VS_LISTENERS]()
     unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
     if unload_ok:
         hass.data.pop(DOMAIN)
 
     return unload_ok
+
+
+async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+    """Migrate old entry."""
+    _LOGGER.debug(
+        "Migrating VeSync config entry: %s minor version: %s",
+        config_entry.version,
+        config_entry.minor_version,
+    )
+    if config_entry.minor_version == 1:
+        # Migrate switch/outlets entity to a new unique ID
+        _LOGGER.debug("Migrating VeSync config entry from version 1 to version 2")
+        entity_registry = er.async_get(hass)
+        registry_entries = er.async_entries_for_config_entry(
+            entity_registry, config_entry.entry_id
+        )
+        for reg_entry in registry_entries:
+            if "-" not in reg_entry.unique_id and reg_entry.entity_id.startswith(
+                Platform.SWITCH
+            ):
+                _LOGGER.debug(
+                    "Migrating switch/outlet entity from unique_id: %s to unique_id: %s",
+                    reg_entry.unique_id,
+                    reg_entry.unique_id + "-device_status",
+                )
+                entity_registry.async_update_entity(
+                    reg_entry.entity_id,
+                    new_unique_id=reg_entry.unique_id + "-device_status",
+                )
+            else:
+                _LOGGER.debug("Skipping entity with unique_id: %s", reg_entry.unique_id)
+        hass.config_entries.async_update_entry(config_entry, minor_version=2)
+
+    return True
diff --git a/homeassistant/components/vesync/binary_sensor.py b/homeassistant/components/vesync/binary_sensor.py
new file mode 100644
index 00000000000..7b6f14e04dc
--- /dev/null
+++ b/homeassistant/components/vesync/binary_sensor.py
@@ -0,0 +1,105 @@
+"""Binary Sensor for VeSync."""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+import logging
+
+from pyvesync.vesyncbasedevice import VeSyncBaseDevice
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDeviceClass,
+    BinarySensorEntity,
+    BinarySensorEntityDescription,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .common import rgetattr
+from .const import DOMAIN, VS_COORDINATOR, VS_DEVICES, VS_DISCOVERY
+from .coordinator import VeSyncDataCoordinator
+from .entity import VeSyncBaseEntity
+
+_LOGGER = logging.getLogger(__name__)
+
+
+@dataclass(frozen=True, kw_only=True)
+class VeSyncBinarySensorEntityDescription(BinarySensorEntityDescription):
+    """A class that describes custom binary sensor entities."""
+
+    is_on: Callable[[VeSyncBaseDevice], bool]
+
+
+SENSOR_DESCRIPTIONS: tuple[VeSyncBinarySensorEntityDescription, ...] = (
+    VeSyncBinarySensorEntityDescription(
+        key="water_lacks",
+        translation_key="water_lacks",
+        is_on=lambda device: device.water_lacks,
+        device_class=BinarySensorDeviceClass.PROBLEM,
+    ),
+    VeSyncBinarySensorEntityDescription(
+        key="details.water_tank_lifted",
+        translation_key="water_tank_lifted",
+        is_on=lambda device: device.details["water_tank_lifted"],
+        device_class=BinarySensorDeviceClass.PROBLEM,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up binary_sensor platform."""
+
+    coordinator = hass.data[DOMAIN][VS_COORDINATOR]
+
+    @callback
+    def discover(devices):
+        """Add new devices to platform."""
+        _setup_entities(devices, async_add_entities)
+
+    config_entry.async_on_unload(
+        async_dispatcher_connect(hass, VS_DISCOVERY.format(VS_DEVICES), discover)
+    )
+
+    _setup_entities(hass.data[DOMAIN][VS_DEVICES], async_add_entities, coordinator)
+
+
+@callback
+def _setup_entities(devices, async_add_entities, coordinator):
+    """Add entity."""
+    async_add_entities(
+        (
+            VeSyncBinarySensor(dev, description, coordinator)
+            for dev in devices
+            for description in SENSOR_DESCRIPTIONS
+            if rgetattr(dev, description.key) is not None
+        ),
+    )
+
+
+class VeSyncBinarySensor(BinarySensorEntity, VeSyncBaseEntity):
+    """Vesync binary sensor class."""
+
+    entity_description: VeSyncBinarySensorEntityDescription
+
+    def __init__(
+        self,
+        device: VeSyncBaseDevice,
+        description: VeSyncBinarySensorEntityDescription,
+        coordinator: VeSyncDataCoordinator,
+    ) -> None:
+        """Initialize the sensor."""
+        super().__init__(device, coordinator)
+        self.entity_description = description
+        self._attr_unique_id = f"{super().unique_id}-{description.key}"
+
+    @property
+    def is_on(self) -> bool:
+        """Return true if the binary sensor is on."""
+        return self.entity_description.is_on(self.device)
diff --git a/homeassistant/components/vesync/common.py b/homeassistant/components/vesync/common.py
index c51b6a913d3..f817c1d0714 100644
--- a/homeassistant/components/vesync/common.py
+++ b/homeassistant/components/vesync/common.py
@@ -4,6 +4,8 @@ import logging
 
 from pyvesync import VeSync
 from pyvesync.vesyncbasedevice import VeSyncBaseDevice
+from pyvesync.vesyncoutlet import VeSyncOutlet
+from pyvesync.vesyncswitch import VeSyncWallSwitch
 
 from homeassistant.core import HomeAssistant
 
@@ -12,6 +14,28 @@ from .const import VeSyncHumidifierDevice
 _LOGGER = logging.getLogger(__name__)
 
 
+def rgetattr(obj: object, attr: str):
+    """Return a string in the form word.1.2.3 and return the item as 3. Note that this last value could be in a dict as well."""
+    _this_func = rgetattr
+    sp = attr.split(".", 1)
+    if len(sp) == 1:
+        left, right = sp[0], ""
+    else:
+        left, right = sp
+
+    if isinstance(obj, dict):
+        obj = obj.get(left)
+    elif hasattr(obj, left):
+        obj = getattr(obj, left)
+    else:
+        return None
+
+    if right:
+        obj = _this_func(obj, right)
+
+    return obj
+
+
 async def async_generate_device_list(
     hass: HomeAssistant, manager: VeSync
 ) -> list[VeSyncBaseDevice]:
@@ -32,3 +56,15 @@ def is_humidifier(device: VeSyncBaseDevice) -> bool:
     """Check if the device represents a humidifier."""
 
     return isinstance(device, VeSyncHumidifierDevice)
+
+
+def is_outlet(device: VeSyncBaseDevice) -> bool:
+    """Check if the device represents an outlet."""
+
+    return isinstance(device, VeSyncOutlet)
+
+
+def is_wall_switch(device: VeSyncBaseDevice) -> bool:
+    """Check if the device represents a wall switch, note this doessn't include dimming switches."""
+
+    return isinstance(device, VeSyncWallSwitch)
diff --git a/homeassistant/components/vesync/config_flow.py b/homeassistant/components/vesync/config_flow.py
index 6115cb9ee76..e5537d8fcc9 100644
--- a/homeassistant/components/vesync/config_flow.py
+++ b/homeassistant/components/vesync/config_flow.py
@@ -1,5 +1,6 @@
 """Config flow utilities."""
 
+from collections.abc import Mapping
 from typing import Any
 
 from pyvesync import VeSync
@@ -8,7 +9,7 @@ import voluptuous as vol
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import DOMAIN
 
@@ -24,6 +25,7 @@ class VeSyncFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a config flow."""
 
     VERSION = 1
+    MINOR_VERSION = 2
 
     @callback
     def _show_form(self, errors: dict[str, str] | None = None) -> ConfigFlowResult:
@@ -56,3 +58,36 @@ class VeSyncFlowHandler(ConfigFlow, domain=DOMAIN):
             title=username,
             data={CONF_USERNAME: username, CONF_PASSWORD: password},
         )
+
+    async def async_step_reauth(
+        self, entry_data: Mapping[str, Any]
+    ) -> ConfigFlowResult:
+        """Handle re-authentication with vesync."""
+        return await self.async_step_reauth_confirm()
+
+    async def async_step_reauth_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Confirm re-authentication with vesync."""
+
+        if user_input:
+            username = user_input[CONF_USERNAME]
+            password = user_input[CONF_PASSWORD]
+
+            manager = VeSync(username, password)
+            login = await self.hass.async_add_executor_job(manager.login)
+            if login:
+                return self.async_update_reload_and_abort(
+                    self._get_reauth_entry(),
+                    data_updates={
+                        CONF_USERNAME: username,
+                        CONF_PASSWORD: password,
+                    },
+                )
+
+        return self.async_show_form(
+            step_id="reauth_confirm",
+            data_schema=DATA_SCHEMA,
+            description_placeholders={"name": "VeSync"},
+            errors={"base": "invalid_auth"},
+        )
diff --git a/homeassistant/components/vesync/const.py b/homeassistant/components/vesync/const.py
index 841185e4308..4e39fe40f2d 100644
--- a/homeassistant/components/vesync/const.py
+++ b/homeassistant/components/vesync/const.py
@@ -22,6 +22,7 @@ exceeds the quota of 7700.
 VS_DEVICES = "devices"
 VS_COORDINATOR = "coordinator"
 VS_MANAGER = "manager"
+VS_LISTENERS = "listeners"
 VS_NUMBERS = "numbers"
 
 VS_HUMIDIFIER_MODE_AUTO = "auto"
@@ -29,6 +30,14 @@ VS_HUMIDIFIER_MODE_HUMIDITY = "humidity"
 VS_HUMIDIFIER_MODE_MANUAL = "manual"
 VS_HUMIDIFIER_MODE_SLEEP = "sleep"
 
+FAN_NIGHT_LIGHT_LEVEL_DIM = "dim"
+FAN_NIGHT_LIGHT_LEVEL_OFF = "off"
+FAN_NIGHT_LIGHT_LEVEL_ON = "on"
+
+HUMIDIFIER_NIGHT_LIGHT_LEVEL_BRIGHT = "bright"
+HUMIDIFIER_NIGHT_LIGHT_LEVEL_DIM = "dim"
+HUMIDIFIER_NIGHT_LIGHT_LEVEL_OFF = "off"
+
 VeSyncHumidifierDevice = VeSyncHumid200300S | VeSyncSuperior6000S
 """Humidifier device types"""
 
@@ -48,6 +57,7 @@ DEV_TYPE_TO_HA = {
     "EverestAir": "fan",
     "Vital200S": "fan",
     "Vital100S": "fan",
+    "SmartTowerFan": "fan",
     "ESD16": "walldimmer",
     "ESWD16": "walldimmer",
     "ESL100": "bulb-dimmable",
@@ -58,6 +68,7 @@ SKU_TO_BASE_DEVICE = {
     # Air Purifiers
     "LV-PUR131S": "LV-PUR131S",
     "LV-RH131S": "LV-PUR131S",  # Alt ID Model LV-PUR131S
+    "LV-RH131S-WM": "LV-PUR131S",  # Alt ID Model LV-PUR131S
     "Core200S": "Core200S",
     "LAP-C201S-AUSR": "Core200S",  # Alt ID Model Core200S
     "LAP-C202S-WUSR": "Core200S",  # Alt ID Model Core200S
@@ -91,4 +102,9 @@ SKU_TO_BASE_DEVICE = {
     "LAP-EL551S-AEUR": "EverestAir",  # Alt ID Model EverestAir
     "LAP-EL551S-WEU": "EverestAir",  # Alt ID Model EverestAir
     "LAP-EL551S-WUS": "EverestAir",  # Alt ID Model EverestAir
+    "SmartTowerFan": "SmartTowerFan",
+    "LTF-F422S-KEU": "SmartTowerFan",  # Alt ID Model SmartTowerFan
+    "LTF-F422S-WUSR": "SmartTowerFan",  # Alt ID Model SmartTowerFan
+    "LTF-F422_WJP": "SmartTowerFan",  # Alt ID Model SmartTowerFan
+    "LTF-F422S-WUS": "SmartTowerFan",  # Alt ID Model SmartTowerFan
 }
diff --git a/homeassistant/components/vesync/coordinator.py b/homeassistant/components/vesync/coordinator.py
index f3df2970fdb..e8c8396bfb4 100644
--- a/homeassistant/components/vesync/coordinator.py
+++ b/homeassistant/components/vesync/coordinator.py
@@ -7,6 +7,7 @@ import logging
 
 from pyvesync import VeSync
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -18,13 +19,18 @@ _LOGGER = logging.getLogger(__name__)
 class VeSyncDataCoordinator(DataUpdateCoordinator[None]):
     """Class representing data coordinator for VeSync devices."""
 
-    def __init__(self, hass: HomeAssistant, manager: VeSync) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, manager: VeSync
+    ) -> None:
         """Initialize."""
         self._manager = manager
 
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="VeSyncDataCoordinator",
             update_interval=timedelta(seconds=UPDATE_INTERVAL),
         )
diff --git a/homeassistant/components/vesync/fan.py b/homeassistant/components/vesync/fan.py
index ba1880f2492..daf734d50a8 100644
--- a/homeassistant/components/vesync/fan.py
+++ b/homeassistant/components/vesync/fan.py
@@ -12,7 +12,7 @@ from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
     ranged_value_to_percentage,
@@ -36,6 +36,9 @@ FAN_MODE_AUTO = "auto"
 FAN_MODE_SLEEP = "sleep"
 FAN_MODE_PET = "pet"
 FAN_MODE_TURBO = "turbo"
+FAN_MODE_ADVANCED_SLEEP = "advancedSleep"
+FAN_MODE_NORMAL = "normal"
+
 
 PRESET_MODES = {
     "LV-PUR131S": [FAN_MODE_AUTO, FAN_MODE_SLEEP],
@@ -46,6 +49,12 @@ PRESET_MODES = {
     "EverestAir": [FAN_MODE_AUTO, FAN_MODE_SLEEP, FAN_MODE_TURBO],
     "Vital200S": [FAN_MODE_AUTO, FAN_MODE_SLEEP, FAN_MODE_PET],
     "Vital100S": [FAN_MODE_AUTO, FAN_MODE_SLEEP, FAN_MODE_PET],
+    "SmartTowerFan": [
+        FAN_MODE_ADVANCED_SLEEP,
+        FAN_MODE_AUTO,
+        FAN_MODE_TURBO,
+        FAN_MODE_NORMAL,
+    ],
 }
 SPEED_RANGE = {  # off is not included
     "LV-PUR131S": (1, 3),
@@ -56,13 +65,14 @@ SPEED_RANGE = {  # off is not included
     "EverestAir": (1, 3),
     "Vital200S": (1, 4),
     "Vital100S": (1, 4),
+    "SmartTowerFan": (1, 13),
 }
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the VeSync fan platform."""
 
@@ -151,11 +161,6 @@ class VeSyncFanHA(VeSyncBaseEntity, FanEntity):
             return self.smartfan.mode
         return None
 
-    @property
-    def unique_info(self):
-        """Return the ID of this fan."""
-        return self.smartfan.uuid
-
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
         """Return the state attributes of the fan."""
@@ -212,10 +217,14 @@ class VeSyncFanHA(VeSyncBaseEntity, FanEntity):
             self.smartfan.auto_mode()
         elif preset_mode == FAN_MODE_SLEEP:
             self.smartfan.sleep_mode()
+        elif preset_mode == FAN_MODE_ADVANCED_SLEEP:
+            self.smartfan.advanced_sleep_mode()
         elif preset_mode == FAN_MODE_PET:
             self.smartfan.pet_mode()
         elif preset_mode == FAN_MODE_TURBO:
             self.smartfan.turbo_mode()
+        elif preset_mode == FAN_MODE_NORMAL:
+            self.smartfan.normal_mode()
 
         self.schedule_update_ha_state()
 
diff --git a/homeassistant/components/vesync/humidifier.py b/homeassistant/components/vesync/humidifier.py
index 3d89d5dc6db..9a98a39aa8c 100644
--- a/homeassistant/components/vesync/humidifier.py
+++ b/homeassistant/components/vesync/humidifier.py
@@ -16,7 +16,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .common import is_humidifier
 from .const import (
@@ -50,7 +50,7 @@ VS_TO_HA_MODE_MAP = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the VeSync humidifier platform."""
 
@@ -71,7 +71,7 @@ async def async_setup_entry(
 @callback
 def _setup_entities(
     devices: list[VeSyncBaseDevice],
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     coordinator: VeSyncDataCoordinator,
 ):
     """Add humidifier entities."""
@@ -121,6 +121,8 @@ class VeSyncHumidifierHA(VeSyncBaseEntity, HumidifierEntity):
                 self._available_modes.append(ha_mode)
                 self._ha_to_vs_mode_map[ha_mode] = vs_mode
 
+        self._available_modes.sort()
+
     def _get_vs_mode(self, ha_mode: str) -> str | None:
         return self._ha_to_vs_mode_map.get(ha_mode)
 
@@ -129,6 +131,11 @@ class VeSyncHumidifierHA(VeSyncBaseEntity, HumidifierEntity):
         """Return the available mist modes."""
         return self._available_modes
 
+    @property
+    def current_humidity(self) -> int:
+        """Return the current humidity."""
+        return self.device.humidity
+
     @property
     def target_humidity(self) -> int:
         """Return the humidity we try to reach."""
@@ -137,7 +144,7 @@ class VeSyncHumidifierHA(VeSyncBaseEntity, HumidifierEntity):
     @property
     def mode(self) -> str | None:
         """Get the current preset mode."""
-        return _get_ha_mode(self.device.mode)
+        return None if self.device.mode is None else _get_ha_mode(self.device.mode)
 
     def set_humidity(self, humidity: int) -> None:
         """Set the target humidity of the device."""
@@ -150,11 +157,15 @@ class VeSyncHumidifierHA(VeSyncBaseEntity, HumidifierEntity):
         """Set the mode of the device."""
         if mode not in self.available_modes:
             raise HomeAssistantError(
-                "{mode} is not one of the valid available modes: {self.available_modes}"
+                f"{mode} is not one of the valid available modes: {self.available_modes}"
             )
         if not self.device.set_humidity_mode(self._get_vs_mode(mode)):
             raise HomeAssistantError(f"An error occurred while setting mode {mode}.")
 
+        if mode == MODE_SLEEP:
+            # We successfully changed the mode. Consider it a success even if display operation fails.
+            self.device.set_display(False)
+
         # Changing mode while humidifier is off actually turns it on, as per the app. But
         # the library does not seem to update the device_status. It is also possible that
         # other attributes get updated. Scheduling a forced refresh to get device status.
diff --git a/homeassistant/components/vesync/icons.json b/homeassistant/components/vesync/icons.json
index e4769acc9a5..c11bd002049 100644
--- a/homeassistant/components/vesync/icons.json
+++ b/homeassistant/components/vesync/icons.json
@@ -7,6 +7,7 @@
             "state": {
               "auto": "mdi:fan-auto",
               "sleep": "mdi:sleep",
+              "advanced_sleep": "mdi:sleep",
               "pet": "mdi:paw",
               "turbo": "mdi:weather-tornado"
             }
diff --git a/homeassistant/components/vesync/light.py b/homeassistant/components/vesync/light.py
index 40f68986145..887400b2cf0 100644
--- a/homeassistant/components/vesync/light.py
+++ b/homeassistant/components/vesync/light.py
@@ -14,7 +14,7 @@ from homeassistant.components.light import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import color as color_util
 
 from .const import DEV_TYPE_TO_HA, DOMAIN, VS_COORDINATOR, VS_DEVICES, VS_DISCOVERY
@@ -29,7 +29,7 @@ MIN_MIREDS = 153  # 1,000,000 divided by 6500 Kelvin = 153 Mireds
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up lights."""
 
diff --git a/homeassistant/components/vesync/manifest.json b/homeassistant/components/vesync/manifest.json
index cdb5ed96652..571c6ee0036 100644
--- a/homeassistant/components/vesync/manifest.json
+++ b/homeassistant/components/vesync/manifest.json
@@ -11,6 +11,6 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/vesync",
   "iot_class": "cloud_polling",
-  "loggers": ["pyvesync"],
-  "requirements": ["pyvesync==2.1.16"]
+  "loggers": ["pyvesync.vesync"],
+  "requirements": ["pyvesync==2.1.18"]
 }
diff --git a/homeassistant/components/vesync/number.py b/homeassistant/components/vesync/number.py
index 3c43cce28cf..707dd6ab30e 100644
--- a/homeassistant/components/vesync/number.py
+++ b/homeassistant/components/vesync/number.py
@@ -14,7 +14,7 @@ from homeassistant.components.number import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .common import is_humidifier
 from .const import DOMAIN, VS_COORDINATOR, VS_DEVICES, VS_DISCOVERY
@@ -51,7 +51,7 @@ NUMBER_DESCRIPTIONS: list[VeSyncNumberEntityDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up number entities."""
 
@@ -72,7 +72,7 @@ async def async_setup_entry(
 @callback
 def _setup_entities(
     devices: list[VeSyncBaseDevice],
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     coordinator: VeSyncDataCoordinator,
 ):
     """Add number entities."""
diff --git a/homeassistant/components/vesync/select.py b/homeassistant/components/vesync/select.py
new file mode 100644
index 00000000000..a9d2e1b533a
--- /dev/null
+++ b/homeassistant/components/vesync/select.py
@@ -0,0 +1,155 @@
+"""Support for VeSync numeric entities."""
+
+from collections.abc import Callable
+from dataclasses import dataclass
+import logging
+
+from pyvesync.vesyncbasedevice import VeSyncBaseDevice
+
+from homeassistant.components.select import SelectEntity, SelectEntityDescription
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .common import rgetattr
+from .const import (
+    DOMAIN,
+    FAN_NIGHT_LIGHT_LEVEL_DIM,
+    FAN_NIGHT_LIGHT_LEVEL_OFF,
+    FAN_NIGHT_LIGHT_LEVEL_ON,
+    HUMIDIFIER_NIGHT_LIGHT_LEVEL_BRIGHT,
+    HUMIDIFIER_NIGHT_LIGHT_LEVEL_DIM,
+    HUMIDIFIER_NIGHT_LIGHT_LEVEL_OFF,
+    VS_COORDINATOR,
+    VS_DEVICES,
+    VS_DISCOVERY,
+)
+from .coordinator import VeSyncDataCoordinator
+from .entity import VeSyncBaseEntity
+
+_LOGGER = logging.getLogger(__name__)
+
+VS_TO_HA_HUMIDIFIER_NIGHT_LIGHT_LEVEL_MAP = {
+    100: HUMIDIFIER_NIGHT_LIGHT_LEVEL_BRIGHT,
+    50: HUMIDIFIER_NIGHT_LIGHT_LEVEL_DIM,
+    0: HUMIDIFIER_NIGHT_LIGHT_LEVEL_OFF,
+}
+
+HA_TO_VS_HUMIDIFIER_NIGHT_LIGHT_LEVEL_MAP = {
+    v: k for k, v in VS_TO_HA_HUMIDIFIER_NIGHT_LIGHT_LEVEL_MAP.items()
+}
+
+
+@dataclass(frozen=True, kw_only=True)
+class VeSyncSelectEntityDescription(SelectEntityDescription):
+    """Class to describe a Vesync select entity."""
+
+    exists_fn: Callable[[VeSyncBaseDevice], bool]
+    current_option_fn: Callable[[VeSyncBaseDevice], str]
+    select_option_fn: Callable[[VeSyncBaseDevice, str], bool]
+
+
+SELECT_DESCRIPTIONS: list[VeSyncSelectEntityDescription] = [
+    # night_light for humidifier
+    VeSyncSelectEntityDescription(
+        key="night_light_level",
+        translation_key="night_light_level",
+        options=list(VS_TO_HA_HUMIDIFIER_NIGHT_LIGHT_LEVEL_MAP.values()),
+        icon="mdi:brightness-6",
+        exists_fn=lambda device: rgetattr(device, "set_night_light_brightness"),
+        # The select_option service framework ensures that only options specified are
+        # accepted. ServiceValidationError gets raised for invalid value.
+        select_option_fn=lambda device, value: device.set_night_light_brightness(
+            HA_TO_VS_HUMIDIFIER_NIGHT_LIGHT_LEVEL_MAP.get(value, 0)
+        ),
+        # Reporting "off" as the choice for unhandled level.
+        current_option_fn=lambda device: VS_TO_HA_HUMIDIFIER_NIGHT_LIGHT_LEVEL_MAP.get(
+            device.details.get("night_light_brightness"),
+            HUMIDIFIER_NIGHT_LIGHT_LEVEL_OFF,
+        ),
+    ),
+    # night_light for fan devices based on pyvesync.VeSyncAirBypass
+    VeSyncSelectEntityDescription(
+        key="night_light_level",
+        translation_key="night_light_level",
+        options=[
+            FAN_NIGHT_LIGHT_LEVEL_OFF,
+            FAN_NIGHT_LIGHT_LEVEL_DIM,
+            FAN_NIGHT_LIGHT_LEVEL_ON,
+        ],
+        icon="mdi:brightness-6",
+        exists_fn=lambda device: rgetattr(device, "set_night_light"),
+        select_option_fn=lambda device, value: device.set_night_light(value),
+        current_option_fn=lambda device: VS_TO_HA_HUMIDIFIER_NIGHT_LIGHT_LEVEL_MAP.get(
+            device.details.get("night_light"),
+            FAN_NIGHT_LIGHT_LEVEL_OFF,
+        ),
+    ),
+]
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up select entities."""
+
+    coordinator = hass.data[DOMAIN][VS_COORDINATOR]
+
+    @callback
+    def discover(devices):
+        """Add new devices to platform."""
+        _setup_entities(devices, async_add_entities, coordinator)
+
+    config_entry.async_on_unload(
+        async_dispatcher_connect(hass, VS_DISCOVERY.format(VS_DEVICES), discover)
+    )
+
+    _setup_entities(hass.data[DOMAIN][VS_DEVICES], async_add_entities, coordinator)
+
+
+@callback
+def _setup_entities(
+    devices: list[VeSyncBaseDevice],
+    async_add_entities: AddConfigEntryEntitiesCallback,
+    coordinator: VeSyncDataCoordinator,
+):
+    """Add select entities."""
+
+    async_add_entities(
+        VeSyncSelectEntity(dev, description, coordinator)
+        for dev in devices
+        for description in SELECT_DESCRIPTIONS
+        if description.exists_fn(dev)
+    )
+
+
+class VeSyncSelectEntity(VeSyncBaseEntity, SelectEntity):
+    """A class to set numeric options on Vesync device."""
+
+    entity_description: VeSyncSelectEntityDescription
+
+    def __init__(
+        self,
+        device: VeSyncBaseDevice,
+        description: VeSyncSelectEntityDescription,
+        coordinator: VeSyncDataCoordinator,
+    ) -> None:
+        """Initialize the VeSync select device."""
+        super().__init__(device, coordinator)
+        self.entity_description = description
+        self._attr_unique_id = f"{super().unique_id}-{description.key}"
+
+    @property
+    def current_option(self) -> str | None:
+        """Return an option."""
+        return self.entity_description.current_option_fn(self.device)
+
+    async def async_select_option(self, option: str) -> None:
+        """Set an option."""
+        if await self.hass.async_add_executor_job(
+            self.entity_description.select_option_fn, self.device, option
+        ):
+            await self.coordinator.async_request_refresh()
diff --git a/homeassistant/components/vesync/sensor.py b/homeassistant/components/vesync/sensor.py
index bf52050d745..3bc6608989a 100644
--- a/homeassistant/components/vesync/sensor.py
+++ b/homeassistant/components/vesync/sensor.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .common import is_humidifier
@@ -194,7 +194,7 @@ SENSORS: tuple[VeSyncSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up switches."""
 
@@ -215,7 +215,7 @@ async def async_setup_entry(
 @callback
 def _setup_entities(
     devices: list[VeSyncBaseDevice],
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     coordinator: VeSyncDataCoordinator,
 ):
     """Check if device is online and add entity."""
diff --git a/homeassistant/components/vesync/strings.json b/homeassistant/components/vesync/strings.json
index a23fe7936e7..9b63bf3e614 100644
--- a/homeassistant/components/vesync/strings.json
+++ b/homeassistant/components/vesync/strings.json
@@ -2,7 +2,15 @@
   "config": {
     "step": {
       "user": {
-        "title": "Enter Username and Password",
+        "title": "Enter username and password",
+        "data": {
+          "username": "[%key:common::config_flow::data::email%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        }
+      },
+      "reauth_confirm": {
+        "title": "[%key:common::config_flow::title::reauth%]",
+        "description": "The VeSync integration needs to re-authenticate your account",
         "data": {
           "username": "[%key:common::config_flow::data::email%]",
           "password": "[%key:common::config_flow::data::password%]"
@@ -13,7 +21,8 @@
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
     },
     "abort": {
-      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
   },
   "entity": {
@@ -43,11 +52,30 @@
         "name": "Current voltage"
       }
     },
+    "binary_sensor": {
+      "water_lacks": {
+        "name": "Low water"
+      },
+      "water_tank_lifted": {
+        "name": "Water tank lifted"
+      }
+    },
     "number": {
       "mist_level": {
         "name": "Mist level"
       }
     },
+    "select": {
+      "night_light_level": {
+        "name": "Night light level",
+        "state": {
+          "bright": "Bright",
+          "dim": "Dim",
+          "off": "[%key:common::state::off%]",
+          "on": "[%key:common::state::on%]"
+        }
+      }
+    },
     "fan": {
       "vesync": {
         "state_attributes": {
@@ -55,6 +83,7 @@
             "state": {
               "auto": "Auto",
               "sleep": "Sleep",
+              "advanced_sleep": "Advanced sleep",
               "pet": "Pet",
               "turbo": "Turbo"
             }
diff --git a/homeassistant/components/vesync/switch.py b/homeassistant/components/vesync/switch.py
index ef8e6c6051f..3e8deedb4ad 100644
--- a/homeassistant/components/vesync/switch.py
+++ b/homeassistant/components/vesync/switch.py
@@ -1,29 +1,59 @@
 """Support for VeSync switches."""
 
+from collections.abc import Callable
+from dataclasses import dataclass
 import logging
-from typing import Any
+from typing import Any, Final
 
 from pyvesync.vesyncbasedevice import VeSyncBaseDevice
 
-from homeassistant.components.switch import SwitchEntity
+from homeassistant.components.switch import (
+    SwitchDeviceClass,
+    SwitchEntity,
+    SwitchEntityDescription,
+)
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DEV_TYPE_TO_HA, DOMAIN, VS_COORDINATOR, VS_DEVICES, VS_DISCOVERY
+from .common import is_outlet, is_wall_switch
+from .const import DOMAIN, VS_COORDINATOR, VS_DEVICES, VS_DISCOVERY
 from .coordinator import VeSyncDataCoordinator
 from .entity import VeSyncBaseEntity
 
 _LOGGER = logging.getLogger(__name__)
 
 
+@dataclass(frozen=True, kw_only=True)
+class VeSyncSwitchEntityDescription(SwitchEntityDescription):
+    """A class that describes custom switch entities."""
+
+    is_on: Callable[[VeSyncBaseDevice], bool]
+    exists_fn: Callable[[VeSyncBaseDevice], bool]
+    on_fn: Callable[[VeSyncBaseDevice], bool]
+    off_fn: Callable[[VeSyncBaseDevice], bool]
+
+
+SENSOR_DESCRIPTIONS: Final[tuple[VeSyncSwitchEntityDescription, ...]] = (
+    VeSyncSwitchEntityDescription(
+        key="device_status",
+        is_on=lambda device: device.device_status == "on",
+        # Other types of wall switches support dimming.  Those use light.py platform.
+        exists_fn=lambda device: is_wall_switch(device) or is_outlet(device),
+        name=None,
+        on_fn=lambda device: device.turn_on(),
+        off_fn=lambda device: device.turn_off(),
+    ),
+)
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
-    """Set up switches."""
+    """Set up switch platform."""
 
     coordinator = hass.data[DOMAIN][VS_COORDINATOR]
 
@@ -45,53 +75,46 @@ def _setup_entities(
     async_add_entities,
     coordinator: VeSyncDataCoordinator,
 ):
-    """Check if device is a switch and add entity."""
-    entities: list[VeSyncBaseSwitch] = []
-    for dev in devices:
-        if DEV_TYPE_TO_HA.get(dev.device_type) == "outlet":
-            entities.append(VeSyncSwitchHA(dev, coordinator))
-        elif DEV_TYPE_TO_HA.get(dev.device_type) == "switch":
-            entities.append(VeSyncLightSwitch(dev, coordinator))
-
-    async_add_entities(entities, update_before_add=True)
+    """Check if device is online and add entity."""
+    async_add_entities(
+        VeSyncSwitchEntity(dev, description, coordinator)
+        for dev in devices
+        for description in SENSOR_DESCRIPTIONS
+        if description.exists_fn(dev)
+    )
 
 
-class VeSyncBaseSwitch(VeSyncBaseEntity, SwitchEntity):
-    """Base class for VeSync switch Device Representations."""
+class VeSyncSwitchEntity(SwitchEntity, VeSyncBaseEntity):
+    """VeSync switch entity class."""
 
-    _attr_name = None
+    entity_description: VeSyncSwitchEntityDescription
 
-    def turn_on(self, **kwargs: Any) -> None:
-        """Turn the device on."""
-        self.device.turn_on()
+    def __init__(
+        self,
+        device: VeSyncBaseDevice,
+        description: VeSyncSwitchEntityDescription,
+        coordinator: VeSyncDataCoordinator,
+    ) -> None:
+        """Initialize the sensor."""
+        super().__init__(device, coordinator)
+        self.entity_description = description
+        self._attr_unique_id = f"{super().unique_id}-{description.key}"
+        if is_outlet(self.device):
+            self._attr_device_class = SwitchDeviceClass.OUTLET
+        elif is_wall_switch(self.device):
+            self._attr_device_class = SwitchDeviceClass.SWITCH
 
     @property
-    def is_on(self) -> bool:
-        """Return True if device is on."""
-        return self.device.device_status == "on"
+    def is_on(self) -> bool | None:
+        """Return the entity value to represent the entity state."""
+        return self.entity_description.is_on(self.device)
 
     def turn_off(self, **kwargs: Any) -> None:
-        """Turn the device off."""
-        self.device.turn_off()
+        """Turn the entity off."""
+        if self.entity_description.off_fn(self.device):
+            self.schedule_update_ha_state()
 
-
-class VeSyncSwitchHA(VeSyncBaseSwitch, SwitchEntity):
-    """Representation of a VeSync switch."""
-
-    def __init__(
-        self, plug: VeSyncBaseDevice, coordinator: VeSyncDataCoordinator
-    ) -> None:
-        """Initialize the VeSync switch device."""
-        super().__init__(plug, coordinator)
-        self.smartplug = plug
-
-
-class VeSyncLightSwitch(VeSyncBaseSwitch, SwitchEntity):
-    """Handle representation of VeSync Light Switch."""
-
-    def __init__(
-        self, switch: VeSyncBaseDevice, coordinator: VeSyncDataCoordinator
-    ) -> None:
-        """Initialize Light Switch device class."""
-        super().__init__(switch, coordinator)
-        self.switch = switch
+    def turn_on(self, **kwargs: Any) -> None:
+        """Turn the entity on."""
+        if self.entity_description.on_fn(self.device):
+            self.schedule_update_ha_state()
diff --git a/homeassistant/components/viaggiatreno/sensor.py b/homeassistant/components/viaggiatreno/sensor.py
index cb652270c69..4a75f5cccd2 100644
--- a/homeassistant/components/viaggiatreno/sensor.py
+++ b/homeassistant/components/viaggiatreno/sensor.py
@@ -16,8 +16,8 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import UnitOfTime
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/vicare/binary_sensor.py b/homeassistant/components/vicare/binary_sensor.py
index ced02dae97e..902dfd18d30 100644
--- a/homeassistant/components/vicare/binary_sensor.py
+++ b/homeassistant/components/vicare/binary_sensor.py
@@ -25,7 +25,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import ViCareEntity
 from .types import ViCareConfigEntry, ViCareDevice, ViCareRequiredKeysMixin
@@ -106,6 +106,12 @@ GLOBAL_SENSORS: tuple[ViCareBinarySensorEntityDescription, ...] = (
         device_class=BinarySensorDeviceClass.RUNNING,
         value_getter=lambda api: api.getDomesticHotWaterPumpActive(),
     ),
+    ViCareBinarySensorEntityDescription(
+        key="one_time_charge",
+        translation_key="one_time_charge",
+        device_class=BinarySensorDeviceClass.RUNNING,
+        value_getter=lambda api: api.getOneTimeCharge(),
+    ),
 )
 
 
@@ -125,7 +131,7 @@ def _build_entities(
                 device.api,
             )
             for description in GLOBAL_SENSORS
-            if is_supported(description.key, description, device.api)
+            if is_supported(description.key, description.value_getter, device.api)
         )
         # add component entities
         for component_list, entity_description_list in (
@@ -143,7 +149,7 @@ def _build_entities(
                 )
                 for component in component_list
                 for description in entity_description_list
-                if is_supported(description.key, description, component)
+                if is_supported(description.key, description.value_getter, component)
             )
     return entities
 
@@ -151,7 +157,7 @@ def _build_entities(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ViCareConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create the ViCare binary sensor devices."""
     async_add_entities(
diff --git a/homeassistant/components/vicare/button.py b/homeassistant/components/vicare/button.py
index ad7d600eba3..9c30a9e68ee 100644
--- a/homeassistant/components/vicare/button.py
+++ b/homeassistant/components/vicare/button.py
@@ -18,7 +18,7 @@ import requests
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import ViCareEntity
 from .types import ViCareConfigEntry, ViCareDevice, ViCareRequiredKeysMixinWithSet
@@ -59,14 +59,14 @@ def _build_entities(
         )
         for device in device_list
         for description in BUTTON_DESCRIPTIONS
-        if is_supported(description.key, description, device.api)
+        if is_supported(description.key, description.value_getter, device.api)
     ]
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ViCareConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create the ViCare button entities."""
     async_add_entities(
diff --git a/homeassistant/components/vicare/climate.py b/homeassistant/components/vicare/climate.py
index 62231a4e2fe..9fba83c5700 100644
--- a/homeassistant/components/vicare/climate.py
+++ b/homeassistant/components/vicare/climate.py
@@ -32,9 +32,8 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers import entity_platform
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv, entity_platform
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import ViCareEntity
@@ -99,7 +98,7 @@ def _build_entities(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ViCareConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ViCare climate platform."""
 
diff --git a/homeassistant/components/vicare/config_flow.py b/homeassistant/components/vicare/config_flow.py
index 36db8e92cc7..c1d4adda62a 100644
--- a/homeassistant/components/vicare/config_flow.py
+++ b/homeassistant/components/vicare/config_flow.py
@@ -14,7 +14,7 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_CLIENT_ID, CONF_PASSWORD, CONF_USERNAME
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 
diff --git a/homeassistant/components/vicare/entity.py b/homeassistant/components/vicare/entity.py
index 11955a94b94..7b73d2e5ba3 100644
--- a/homeassistant/components/vicare/entity.py
+++ b/homeassistant/components/vicare/entity.py
@@ -28,6 +28,7 @@ class ViCareEntity(Entity):
         """Initialize the entity."""
         gateway_serial = device_config.getConfig().serial
         device_id = device_config.getId()
+        model = device_config.getModel().replace("_", " ")
 
         identifier = (
             f"{gateway_serial}_{device_serial.replace('zigbee-', 'zigbee_')}"
@@ -45,8 +46,8 @@ class ViCareEntity(Entity):
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, identifier)},
             serial_number=device_serial,
-            name=device_config.getModel(),
+            name=model,
             manufacturer="Viessmann",
-            model=device_config.getModel(),
+            model=model,
             configuration_url="https://developer.viessmann.com/",
         )
diff --git a/homeassistant/components/vicare/fan.py b/homeassistant/components/vicare/fan.py
index fc18bdbd8da..d84b2038dde 100644
--- a/homeassistant/components/vicare/fan.py
+++ b/homeassistant/components/vicare/fan.py
@@ -5,6 +5,7 @@ from __future__ import annotations
 from contextlib import suppress
 import enum
 import logging
+from typing import Any
 
 from PyViCare.PyViCareDevice import Device as PyViCareDevice
 from PyViCare.PyViCareDeviceConfig import PyViCareDeviceConfig
@@ -13,14 +14,11 @@ from PyViCare.PyViCareUtils import (
     PyViCareNotSupportedFeatureError,
     PyViCareRateLimitError,
 )
-from PyViCare.PyViCareVentilationDevice import (
-    VentilationDevice as PyViCareVentilationDevice,
-)
 from requests.exceptions import ConnectionError as RequestConnectionError
 
 from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     ordered_list_item_to_percentage,
     percentage_to_ordered_list_item,
@@ -28,7 +26,7 @@ from homeassistant.util.percentage import (
 
 from .entity import ViCareEntity
 from .types import ViCareConfigEntry, ViCareDevice
-from .utils import filter_state, get_device_serial
+from .utils import filter_state, get_device_serial, is_supported
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -50,6 +48,8 @@ class VentilationMode(enum.StrEnum):
 
     PERMANENT = "permanent"  # on, speed controlled by program (levelOne-levelFour)
     VENTILATION = "ventilation"  # activated by schedule
+    STANDBY = "standby"  # activated by schedule
+    STANDARD = "standard"  # activated by schedule
     SENSOR_DRIVEN = "sensor_driven"  # activated by schedule, override by sensor
     SENSOR_OVERRIDE = "sensor_override"  # activated by sensor
 
@@ -74,9 +74,17 @@ class VentilationMode(enum.StrEnum):
         return None
 
 
+class VentilationQuickmode(enum.StrEnum):
+    """ViCare ventilation quickmodes."""
+
+    STANDBY = "standby"
+
+
 HA_TO_VICARE_MODE_VENTILATION = {
     VentilationMode.PERMANENT: "permanent",
     VentilationMode.VENTILATION: "ventilation",
+    VentilationMode.STANDBY: "standby",
+    VentilationMode.STANDARD: "standard",
     VentilationMode.SENSOR_DRIVEN: "sensorDriven",
     VentilationMode.SENSOR_OVERRIDE: "sensorOverride",
 }
@@ -96,14 +104,14 @@ def _build_entities(
     return [
         ViCareFan(get_device_serial(device.api), device.config, device.api)
         for device in device_list
-        if isinstance(device.api, PyViCareVentilationDevice)
+        if device.api.isVentilationDevice()
     ]
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ViCareConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ViCare fan platform."""
     async_add_entities(
@@ -118,7 +126,6 @@ class ViCareFan(ViCareEntity, FanEntity):
     """Representation of the ViCare ventilation device."""
 
     _attr_speed_count = len(ORDERED_NAMED_FAN_SPEEDS)
-    _attr_supported_features = FanEntityFeature.SET_SPEED
     _attr_translation_key = "ventilation"
 
     def __init__(
@@ -131,8 +138,8 @@ class ViCareFan(ViCareEntity, FanEntity):
         super().__init__(
             self._attr_translation_key, device_serial, device_config, device
         )
-        # init presets
-        supported_modes = list[str](self._api.getAvailableModes())
+        # init preset_mode
+        supported_modes = list[str](self._api.getVentilationModes())
         self._attr_preset_modes = [
             mode
             for mode in VentilationMode
@@ -140,6 +147,25 @@ class ViCareFan(ViCareEntity, FanEntity):
         ]
         if len(self._attr_preset_modes) > 0:
             self._attr_supported_features |= FanEntityFeature.PRESET_MODE
+        # init set_speed
+        supported_levels: list[str] | None = None
+        with suppress(PyViCareNotSupportedFeatureError):
+            supported_levels = self._api.getVentilationLevels()
+        if supported_levels is not None and len(supported_levels) > 0:
+            self._attr_supported_features |= FanEntityFeature.SET_SPEED
+
+        # evaluate quickmodes
+        quickmodes: list[str] = (
+            device.getVentilationQuickmodes()
+            if is_supported(
+                "getVentilationQuickmodes",
+                lambda api: api.getVentilationQuickmodes(),
+                device,
+            )
+            else []
+        )
+        if VentilationQuickmode.STANDBY in quickmodes:
+            self._attr_supported_features |= FanEntityFeature.TURN_OFF
 
     def update(self) -> None:
         """Update state of fan."""
@@ -147,8 +173,9 @@ class ViCareFan(ViCareEntity, FanEntity):
         try:
             with suppress(PyViCareNotSupportedFeatureError):
                 self._attr_preset_mode = VentilationMode.from_vicare_mode(
-                    self._api.getActiveMode()
+                    self._api.getActiveVentilationMode()
                 )
+
             with suppress(PyViCareNotSupportedFeatureError):
                 level = filter_state(self._api.getVentilationLevel())
             if level is not None and level in ORDERED_NAMED_FAN_SPEEDS:
@@ -169,12 +196,27 @@ class ViCareFan(ViCareEntity, FanEntity):
     @property
     def is_on(self) -> bool | None:
         """Return true if the entity is on."""
-        # Viessmann ventilation unit cannot be turned off
-        return True
+        if (
+            self._attr_supported_features & FanEntityFeature.TURN_OFF
+            and self._api.getVentilationQuickmode(VentilationQuickmode.STANDBY)
+        ):
+            return False
+
+        return self.percentage is not None and self.percentage > 0
+
+    def turn_off(self, **kwargs: Any) -> None:
+        """Turn the entity off."""
+
+        self._api.activateVentilationQuickmode(str(VentilationQuickmode.STANDBY))
 
     @property
     def icon(self) -> str | None:
         """Return the icon to use in the frontend."""
+        if (
+            self._attr_supported_features & FanEntityFeature.TURN_OFF
+            and self._api.getVentilationQuickmode(VentilationQuickmode.STANDBY)
+        ):
+            return "mdi:fan-off"
         if hasattr(self, "_attr_preset_mode"):
             if self._attr_preset_mode == VentilationMode.VENTILATION:
                 return "mdi:fan-clock"
@@ -200,13 +242,15 @@ class ViCareFan(ViCareEntity, FanEntity):
         """Set the speed of the fan, as a percentage."""
         if self._attr_preset_mode != str(VentilationMode.PERMANENT):
             self.set_preset_mode(VentilationMode.PERMANENT)
+        elif self._api.getVentilationQuickmode(VentilationQuickmode.STANDBY):
+            self._api.deactivateVentilationQuickmode(str(VentilationQuickmode.STANDBY))
 
         level = percentage_to_ordered_list_item(ORDERED_NAMED_FAN_SPEEDS, percentage)
         _LOGGER.debug("changing ventilation level to %s", level)
-        self._api.setPermanentLevel(level)
+        self._api.setVentilationLevel(level)
 
     def set_preset_mode(self, preset_mode: str) -> None:
         """Set new preset mode."""
         target_mode = VentilationMode.to_vicare_mode(preset_mode)
         _LOGGER.debug("changing ventilation mode to %s", target_mode)
-        self._api.setActiveMode(target_mode)
+        self._api.activateVentilationMode(target_mode)
diff --git a/homeassistant/components/vicare/icons.json b/homeassistant/components/vicare/icons.json
index 52148b1fa32..c54be7af0d5 100644
--- a/homeassistant/components/vicare/icons.json
+++ b/homeassistant/components/vicare/icons.json
@@ -18,6 +18,9 @@
       },
       "domestic_hot_water_pump": {
         "default": "mdi:pump"
+      },
+      "one_time_charge": {
+        "default": "mdi:shower-head"
       }
     },
     "button": {
diff --git a/homeassistant/components/vicare/manifest.json b/homeassistant/components/vicare/manifest.json
index 766cf22cb94..e39adaf6c4c 100644
--- a/homeassistant/components/vicare/manifest.json
+++ b/homeassistant/components/vicare/manifest.json
@@ -11,5 +11,5 @@
   "documentation": "https://www.home-assistant.io/integrations/vicare",
   "iot_class": "cloud_polling",
   "loggers": ["PyViCare"],
-  "requirements": ["PyViCare==2.41.0"]
+  "requirements": ["PyViCare==2.43.1"]
 }
diff --git a/homeassistant/components/vicare/number.py b/homeassistant/components/vicare/number.py
index 8ffaa727634..04c4088bd3e 100644
--- a/homeassistant/components/vicare/number.py
+++ b/homeassistant/components/vicare/number.py
@@ -27,7 +27,7 @@ from homeassistant.components.number import (
 )
 from homeassistant.const import EntityCategory, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import ViCareEntity
 from .types import (
@@ -353,7 +353,7 @@ def _build_entities(
                 device.api,
             )
             for description in DEVICE_ENTITY_DESCRIPTIONS
-            if is_supported(description.key, description, device.api)
+            if is_supported(description.key, description.value_getter, device.api)
         )
         # add component entities
         entities.extend(
@@ -366,7 +366,7 @@ def _build_entities(
             )
             for circuit in get_circuits(device.api)
             for description in CIRCUIT_ENTITY_DESCRIPTIONS
-            if is_supported(description.key, description, circuit)
+            if is_supported(description.key, description.value_getter, circuit)
         )
     return entities
 
@@ -374,7 +374,7 @@ def _build_entities(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ViCareConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create the ViCare number devices."""
     async_add_entities(
diff --git a/homeassistant/components/vicare/quality_scale.yaml b/homeassistant/components/vicare/quality_scale.yaml
index 55b7590a092..81b03364142 100644
--- a/homeassistant/components/vicare/quality_scale.yaml
+++ b/homeassistant/components/vicare/quality_scale.yaml
@@ -1,43 +1,70 @@
 rules:
   # Bronze
-  config-flow: done
-  test-before-configure: done
-  unique-config-entry:
-    status: todo
-    comment: Uniqueness is not checked yet.
-  config-flow-test-coverage: done
-  runtime-data: done
-  test-before-setup: done
-  appropriate-polling: done
-  entity-unique-id: done
-  has-entity-name: done
-  entity-event-setup:
-    status: exempt
-    comment: Entities of this integration does not explicitly subscribe to events.
-  dependency-transparency: done
   action-setup:
     status: todo
     comment: service registered in climate async_setup_entry.
+  appropriate-polling: done
+  brands: done
   common-modules:
     status: done
     comment: No coordinator is used, data update is centrally handled by the library.
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions: done
   docs-high-level-description: done
   docs-installation-instructions: done
   docs-removal-instructions: done
-  docs-actions: done
-  brands: done
+  entity-event-setup:
+    status: exempt
+    comment: Entities of this integration does not explicitly subscribe to events.
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry:
+    status: todo
+    comment: Uniqueness is not checked yet.
+
   # Silver
-  integration-owner: done
-  reauthentication-flow: done
+  action-exceptions: todo
   config-entry-unloading: done
+  docs-configuration-parameters: todo
+  docs-installation-parameters: todo
+  entity-unavailable: todo
+  integration-owner: done
+  log-when-unavailable: todo
+  parallel-updates: todo
+  reauthentication-flow: done
+  test-coverage: todo
+
   # Gold
   devices: done
   diagnostics: done
-  entity-category: done
+  discovery-update-info: todo
+  discovery: todo
+  docs-data-update: todo
+  docs-examples: todo
+  docs-known-limitations: todo
+  docs-supported-devices: todo
+  docs-supported-functions: todo
+  docs-troubleshooting: todo
+  docs-use-cases: todo
   dynamic-devices: done
+  entity-category: done
   entity-device-class: done
-  entity-translations: done
   entity-disabled-by-default: done
+  entity-translations: done
+  exception-translations: todo
+  icon-translations: todo
+  reconfiguration-flow: todo
   repair-issues:
     status: exempt
     comment: This integration does not raise any repairable issues.
+  stale-devices: todo
+
+  # Platinum
+  async-dependency: todo
+  inject-websession: todo
+  strict-typing: todo
diff --git a/homeassistant/components/vicare/sensor.py b/homeassistant/components/vicare/sensor.py
index 44c3f3cfc0f..cddc5ca021a 100644
--- a/homeassistant/components/vicare/sensor.py
+++ b/homeassistant/components/vicare/sensor.py
@@ -29,6 +29,7 @@ from homeassistant.const import (
     PERCENTAGE,
     EntityCategory,
     UnitOfEnergy,
+    UnitOfMass,
     UnitOfPower,
     UnitOfPressure,
     UnitOfTemperature,
@@ -37,7 +38,7 @@ from homeassistant.const import (
     UnitOfVolumeFlowRate,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     VICARE_CUBIC_METER,
@@ -635,6 +636,38 @@ GLOBAL_SENSORS: tuple[ViCareSensorEntityDescription, ...] = (
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
+    ViCareSensorEntityDescription(
+        key="buffer_mid_top_temperature",
+        translation_key="buffer_mid_top_temperature",
+        state_class=SensorStateClass.MEASUREMENT,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_getter=lambda api: api.getBufferMidTopTemperature(),
+    ),
+    ViCareSensorEntityDescription(
+        key="buffer_middle_temperature",
+        translation_key="buffer_middle_temperature",
+        state_class=SensorStateClass.MEASUREMENT,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_getter=lambda api: api.getBufferMiddleTemperature(),
+    ),
+    ViCareSensorEntityDescription(
+        key="buffer_mid_bottom_temperature",
+        translation_key="buffer_mid_bottom_temperature",
+        state_class=SensorStateClass.MEASUREMENT,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_getter=lambda api: api.getBufferMidBottomTemperature(),
+    ),
+    ViCareSensorEntityDescription(
+        key="buffer_bottom_temperature",
+        translation_key="buffer_bottom_temperature",
+        state_class=SensorStateClass.MEASUREMENT,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_getter=lambda api: api.getBufferBottomTemperature(),
+    ),
     ViCareSensorEntityDescription(
         key="buffer main temperature",
         translation_key="buffer_main_temperature",
@@ -847,6 +880,59 @@ GLOBAL_SENSORS: tuple[ViCareSensorEntityDescription, ...] = (
         value_getter=lambda api: api.getSupplyPressure(),
         unit_getter=lambda api: api.getSupplyPressureUnit(),
     ),
+    ViCareSensorEntityDescription(
+        key="heating_rod_starts",
+        translation_key="heating_rod_starts",
+        value_getter=lambda api: api.getHeatingRodStarts(),
+        entity_category=EntityCategory.DIAGNOSTIC,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+    ),
+    ViCareSensorEntityDescription(
+        key="heating_rod_hours",
+        translation_key="heating_rod_hours",
+        native_unit_of_measurement=UnitOfTime.HOURS,
+        value_getter=lambda api: api.getHeatingRodHours(),
+        entity_category=EntityCategory.DIAGNOSTIC,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+    ),
+    ViCareSensorEntityDescription(
+        key="spf_total",
+        translation_key="spf_total",
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_getter=lambda api: api.getSeasonalPerformanceFactorTotal(),
+    ),
+    ViCareSensorEntityDescription(
+        key="spf_dhw",
+        translation_key="spf_dhw",
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_getter=lambda api: api.getSeasonalPerformanceFactorDHW(),
+    ),
+    ViCareSensorEntityDescription(
+        key="spf_heating",
+        translation_key="spf_heating",
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_getter=lambda api: api.getSeasonalPerformanceFactorHeating(),
+    ),
+    ViCareSensorEntityDescription(
+        key="battery_level",
+        native_unit_of_measurement=PERCENTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        device_class=SensorDeviceClass.BATTERY,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_getter=lambda api: api.getBatteryLevel(),
+    ),
+    ViCareSensorEntityDescription(
+        key="fuel_need",
+        translation_key="fuel_need",
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=UnitOfMass.KILOGRAMS,
+        value_getter=lambda api: api.getFuelNeed(),
+        unit_getter=lambda api: api.getFuelUnit(),
+    ),
 )
 
 CIRCUIT_SENSORS: tuple[ViCareSensorEntityDescription, ...] = (
@@ -971,7 +1057,7 @@ def _build_entities(
                 device.api,
             )
             for description in GLOBAL_SENSORS
-            if is_supported(description.key, description, device.api)
+            if is_supported(description.key, description.value_getter, device.api)
         )
         # add component entities
         for component_list, entity_description_list in (
@@ -989,7 +1075,7 @@ def _build_entities(
                 )
                 for component in component_list
                 for description in entity_description_list
-                if is_supported(description.key, description, component)
+                if is_supported(description.key, description.value_getter, component)
             )
     return entities
 
@@ -997,7 +1083,7 @@ def _build_entities(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ViCareConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create the ViCare sensor devices."""
     async_add_entities(
diff --git a/homeassistant/components/vicare/strings.json b/homeassistant/components/vicare/strings.json
index f49a73f1659..04049f026bd 100644
--- a/homeassistant/components/vicare/strings.json
+++ b/homeassistant/components/vicare/strings.json
@@ -63,6 +63,9 @@
       },
       "domestic_hot_water_pump": {
         "name": "DHW pump"
+      },
+      "one_time_charge": {
+        "name": "One-time charge"
       }
     },
     "button": {
@@ -81,10 +84,12 @@
         "state_attributes": {
           "preset_mode": {
             "state": {
-              "permanent": "permanent",
-              "ventilation": "schedule",
-              "sensor_driven": "sensor",
-              "sensor_override": "schedule with sensor-override"
+              "standby": "[%key:common::state::standby%]",
+              "permanent": "Permanent",
+              "ventilation": "Schedule",
+              "sensor_driven": "Sensor-driven",
+              "sensor_override": "Schedule with sensor-override",
+              "standard": "Minimal"
             }
           }
         }
@@ -333,6 +338,18 @@
       "buffer_top_temperature": {
         "name": "Buffer top temperature"
       },
+      "buffer_mid_top_temperature": {
+        "name": "Buffer mid top temperature"
+      },
+      "buffer_middle_temperature": {
+        "name": "Buffer middle temperature"
+      },
+      "buffer_mid_bottom_temperature": {
+        "name": "Buffer mid bottom temperature"
+      },
+      "buffer_bottom_temperature": {
+        "name": "Buffer bottom temperature"
+      },
       "buffer_main_temperature": {
         "name": "Buffer main temperature"
       },
@@ -375,25 +392,25 @@
         "name": "Energy export to grid"
       },
       "photovoltaic_power_production_current": {
-        "name": "Solar power"
+        "name": "PV power"
       },
       "photovoltaic_energy_production_today": {
-        "name": "Solar energy production today"
+        "name": "PV energy production today"
       },
       "photovoltaic_energy_production_this_week": {
-        "name": "Solar energy production this week"
+        "name": "PV energy production this week"
       },
       "photovoltaic_energy_production_this_month": {
-        "name": "Solar energy production this month"
+        "name": "PV energy production this month"
       },
       "photovoltaic_energy_production_this_year": {
-        "name": "Solar energy production this year"
+        "name": "PV energy production this year"
       },
       "photovoltaic_energy_production_total": {
-        "name": "Solar energy production total"
+        "name": "PV energy production total"
       },
       "photovoltaic_status": {
-        "name": "Solar state",
+        "name": "PV state",
         "state": {
           "ready": "Standby",
           "production": "Producing"
@@ -458,6 +475,24 @@
       },
       "supply_pressure": {
         "name": "Supply pressure"
+      },
+      "heating_rod_starts": {
+        "name": "Heating rod starts"
+      },
+      "heating_rod_hours": {
+        "name": "Heating rod hours"
+      },
+      "spf_total": {
+        "name": "Seasonal performance factor"
+      },
+      "spf_dhw": {
+        "name": "Seasonal performance factor - domestic hot water"
+      },
+      "spf_heating": {
+        "name": "Seasonal performance factor - heating"
+      },
+      "fuel_need": {
+        "name": "Fuel need"
       }
     },
     "water_heater": {
@@ -480,11 +515,11 @@
   "services": {
     "set_vicare_mode": {
       "name": "Set ViCare mode",
-      "description": "Set a ViCare mode.",
+      "description": "Sets the mode of the climate device as defined by Viessmann.",
       "fields": {
         "vicare_mode": {
           "name": "ViCare mode",
-          "description": "ViCare mode."
+          "description": "For supported values, see the `vicare_modes` attribute of the climate entity."
         }
       }
     }
diff --git a/homeassistant/components/vicare/utils.py b/homeassistant/components/vicare/utils.py
index a2c31df4259..ef018a60f16 100644
--- a/homeassistant/components/vicare/utils.py
+++ b/homeassistant/components/vicare/utils.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from collections.abc import Mapping
+from collections.abc import Callable, Mapping
 import logging
 from typing import Any
 
@@ -30,7 +30,7 @@ from .const import (
     VICARE_TOKEN_FILENAME,
     HeatingType,
 )
-from .types import ViCareConfigEntry, ViCareRequiredKeysMixin
+from .types import ViCareConfigEntry
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -81,12 +81,12 @@ def get_device_serial(device: PyViCareDevice) -> str | None:
 
 def is_supported(
     name: str,
-    entity_description: ViCareRequiredKeysMixin,
+    getter: Callable[[PyViCareDevice], Any],
     vicare_device,
 ) -> bool:
     """Check if the PyViCare device supports the requested sensor."""
     try:
-        entity_description.value_getter(vicare_device)
+        getter(vicare_device)
     except PyViCareNotSupportedFeatureError:
         _LOGGER.debug("Feature not supported %s", name)
         return False
@@ -131,5 +131,5 @@ def get_compressors(device: PyViCareDevice) -> list[PyViCareHeatingDeviceCompone
 
 
 def filter_state(state: str) -> str | None:
-    """Remove invalid states."""
+    """Return the state if not 'nothing' or 'unknown'."""
     return None if state in ("nothing", "unknown") else state
diff --git a/homeassistant/components/vicare/water_heater.py b/homeassistant/components/vicare/water_heater.py
index 114ff620c3f..f92c9e3e1af 100644
--- a/homeassistant/components/vicare/water_heater.py
+++ b/homeassistant/components/vicare/water_heater.py
@@ -22,7 +22,7 @@ from homeassistant.components.water_heater import (
 )
 from homeassistant.const import ATTR_TEMPERATURE, PRECISION_TENTHS, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import ViCareEntity
 from .types import ViCareConfigEntry, ViCareDevice
@@ -80,7 +80,7 @@ def _build_entities(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ViCareConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ViCare water heater platform."""
     async_add_entities(
diff --git a/homeassistant/components/vilfo/config_flow.py b/homeassistant/components/vilfo/config_flow.py
index cdba7f1b8c2..5612591c595 100644
--- a/homeassistant/components/vilfo/config_flow.py
+++ b/homeassistant/components/vilfo/config_flow.py
@@ -114,8 +114,8 @@ class DomainConfigFlow(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "cannot_connect"
             except InvalidAuth:
                 errors["base"] = "invalid_auth"
-            except Exception as err:  # noqa: BLE001
-                _LOGGER.error("Unexpected exception: %s", err)
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
                 await self.async_set_unique_id(info[CONF_ID])
diff --git a/homeassistant/components/vilfo/sensor.py b/homeassistant/components/vilfo/sensor.py
index 77a7df7a0a8..fa2d5cae196 100644
--- a/homeassistant/components/vilfo/sensor.py
+++ b/homeassistant/components/vilfo/sensor.py
@@ -11,7 +11,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     ATTR_API_DATA_FIELD_BOOT_TIME,
@@ -51,7 +51,7 @@ SENSOR_TYPES: tuple[VilfoSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add Vilfo Router entities from a config_entry."""
     vilfo = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/vizio/__init__.py b/homeassistant/components/vizio/__init__.py
index 4af42d76b62..10a71695e05 100644
--- a/homeassistant/components/vizio/__init__.py
+++ b/homeassistant/components/vizio/__init__.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from typing import Any
 
 from homeassistant.components.media_player import MediaPlayerDeviceClass
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DEVICE_CLASS, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.storage import Store
@@ -25,7 +25,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         and entry.data[CONF_DEVICE_CLASS] == MediaPlayerDeviceClass.TV
     ):
         store: Store[list[dict[str, Any]]] = Store(hass, 1, DOMAIN)
-        coordinator = VizioAppsDataUpdateCoordinator(hass, store)
+        coordinator = VizioAppsDataUpdateCoordinator(hass, entry, store)
         await coordinator.async_config_entry_first_refresh()
         hass.data[DOMAIN][CONF_APPS] = coordinator
 
@@ -39,12 +39,9 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
     unload_ok = await hass.config_entries.async_unload_platforms(
         config_entry, PLATFORMS
     )
-    # Exclude this config entry because its not unloaded yet
     if not any(
-        entry.state is ConfigEntryState.LOADED
-        and entry.entry_id != config_entry.entry_id
-        and entry.data[CONF_DEVICE_CLASS] == MediaPlayerDeviceClass.TV
-        for entry in hass.config_entries.async_entries(DOMAIN)
+        entry.data[CONF_DEVICE_CLASS] == MediaPlayerDeviceClass.TV
+        for entry in hass.config_entries.async_loaded_entries(DOMAIN)
     ):
         hass.data[DOMAIN].pop(CONF_APPS, None)
 
diff --git a/homeassistant/components/vizio/const.py b/homeassistant/components/vizio/const.py
index 8451ae747de..fbfaf222cad 100644
--- a/homeassistant/components/vizio/const.py
+++ b/homeassistant/components/vizio/const.py
@@ -10,7 +10,7 @@ from homeassistant.components.media_player import (
     MediaPlayerDeviceClass,
     MediaPlayerEntityFeature,
 )
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import VolDictType
 
 SERVICE_UPDATE_SETTING = "update_setting"
diff --git a/homeassistant/components/vizio/coordinator.py b/homeassistant/components/vizio/coordinator.py
index a7ca7d7f9ed..0f95c8a53b7 100644
--- a/homeassistant/components/vizio/coordinator.py
+++ b/homeassistant/components/vizio/coordinator.py
@@ -9,6 +9,7 @@ from typing import Any
 from pyvizio.const import APPS
 from pyvizio.util import gen_apps_list_from_url
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.storage import Store
@@ -22,11 +23,19 @@ _LOGGER = logging.getLogger(__name__)
 class VizioAppsDataUpdateCoordinator(DataUpdateCoordinator[list[dict[str, Any]]]):
     """Define an object to hold Vizio app config data."""
 
-    def __init__(self, hass: HomeAssistant, store: Store[list[dict[str, Any]]]) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        store: Store[list[dict[str, Any]]],
+    ) -> None:
         """Initialize."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(days=1),
         )
diff --git a/homeassistant/components/vizio/media_player.py b/homeassistant/components/vizio/media_player.py
index 5711d8fbac9..d44db5e45ee 100644
--- a/homeassistant/components/vizio/media_player.py
+++ b/homeassistant/components/vizio/media_player.py
@@ -32,7 +32,7 @@ from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CONF_ADDITIONAL_CONFIGS,
@@ -63,7 +63,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Vizio media player entry."""
     host = config_entry.data[CONF_HOST]
diff --git a/homeassistant/components/vlc/media_player.py b/homeassistant/components/vlc/media_player.py
index cd05c919d58..d1a481a99b1 100644
--- a/homeassistant/components/vlc/media_player.py
+++ b/homeassistant/components/vlc/media_player.py
@@ -20,10 +20,10 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/vlc_telnet/media_player.py b/homeassistant/components/vlc_telnet/media_player.py
index b95e987aef8..6ae9fbb9f5a 100644
--- a/homeassistant/components/vlc_telnet/media_player.py
+++ b/homeassistant/components/vlc_telnet/media_player.py
@@ -22,8 +22,8 @@ from homeassistant.config_entries import SOURCE_HASSIO, ConfigEntry
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from . import VlcConfigEntry
 from .const import DEFAULT_NAME, DOMAIN, LOGGER
@@ -39,7 +39,9 @@ def _get_str(data: dict, key: str) -> str | None:
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: VlcConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: VlcConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the vlc platform."""
     # CONF_NAME is only present in imported YAML.
diff --git a/homeassistant/components/vodafone_station/__init__.py b/homeassistant/components/vodafone_station/__init__.py
index b4c44ea9130..9f118fe4fbd 100644
--- a/homeassistant/components/vodafone_station/__init__.py
+++ b/homeassistant/components/vodafone_station/__init__.py
@@ -1,28 +1,27 @@
 """Vodafone Station integration."""
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
 
 from .const import DOMAIN
-from .coordinator import VodafoneStationRouter
+from .coordinator import VodafoneConfigEntry, VodafoneStationRouter
 
 PLATFORMS = [Platform.BUTTON, Platform.DEVICE_TRACKER, Platform.SENSOR]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: VodafoneConfigEntry) -> bool:
     """Set up Vodafone Station platform."""
     coordinator = VodafoneStationRouter(
         hass,
         entry.data[CONF_HOST],
         entry.data[CONF_USERNAME],
         entry.data[CONF_PASSWORD],
-        entry.unique_id,
+        entry,
     )
 
     await coordinator.async_config_entry_first_refresh()
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+    entry.runtime_data = coordinator
 
     entry.async_on_unload(entry.add_update_listener(update_listener))
 
@@ -31,10 +30,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: VodafoneConfigEntry) -> bool:
     """Unload a config entry."""
     if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        coordinator: VodafoneStationRouter = hass.data[DOMAIN][entry.entry_id]
+        coordinator = entry.runtime_data
         await coordinator.api.logout()
         await coordinator.api.close()
         hass.data[DOMAIN].pop(entry.entry_id)
@@ -42,7 +41,7 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return unload_ok
 
 
-async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+async def update_listener(hass: HomeAssistant, entry: VodafoneConfigEntry) -> None:
     """Update when config_entry options update."""
     if entry.options:
         await hass.config_entries.async_reload(entry.entry_id)
diff --git a/homeassistant/components/vodafone_station/button.py b/homeassistant/components/vodafone_station/button.py
index efea011a541..8dda4d49c7b 100644
--- a/homeassistant/components/vodafone_station/button.py
+++ b/homeassistant/components/vodafone_station/button.py
@@ -4,21 +4,32 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from dataclasses import dataclass
+from json.decoder import JSONDecodeError
 from typing import Any, Final
 
+from aiovodafone.exceptions import (
+    AlreadyLogged,
+    CannotAuthenticate,
+    CannotConnect,
+    GenericLoginError,
+)
+
 from homeassistant.components.button import (
     ButtonDeviceClass,
     ButtonEntity,
     ButtonEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import _LOGGER, DOMAIN
-from .coordinator import VodafoneStationRouter
+from .coordinator import VodafoneConfigEntry, VodafoneStationRouter
+
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -67,12 +78,14 @@ BUTTON_TYPES: Final = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: VodafoneConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry."""
     _LOGGER.debug("Setting up Vodafone Station buttons")
 
-    coordinator: VodafoneStationRouter = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
 
     sensors_data = coordinator.data.sensors
 
@@ -104,4 +117,25 @@ class VodafoneStationSensorEntity(
 
     async def async_press(self) -> None:
         """Triggers the Shelly button press service."""
-        await self.entity_description.press_action(self.coordinator)
+
+        try:
+            await self.entity_description.press_action(self.coordinator)
+        except CannotAuthenticate as err:
+            self.coordinator.config_entry.async_start_reauth(self.hass)
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="cannot_authenticate",
+                translation_placeholders={"error": repr(err)},
+            ) from err
+        except (
+            CannotConnect,
+            AlreadyLogged,
+            GenericLoginError,
+            JSONDecodeError,
+        ) as err:
+            self.coordinator.last_update_success = False
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="cannot_execute_action",
+                translation_placeholders={"error": repr(err)},
+            ) from err
diff --git a/homeassistant/components/vodafone_station/config_flow.py b/homeassistant/components/vodafone_station/config_flow.py
index 7a80244f8d6..6641f5f5711 100644
--- a/homeassistant/components/vodafone_station/config_flow.py
+++ b/homeassistant/components/vodafone_station/config_flow.py
@@ -12,16 +12,12 @@ from homeassistant.components.device_tracker import (
     CONF_CONSIDER_HOME,
     DEFAULT_CONSIDER_HOME,
 )
-from homeassistant.config_entries import (
-    ConfigEntry,
-    ConfigFlow,
-    ConfigFlowResult,
-    OptionsFlow,
-)
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult, OptionsFlow
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant, callback
 
 from .const import _LOGGER, DEFAULT_HOST, DEFAULT_USERNAME, DOMAIN
+from .coordinator import VodafoneConfigEntry
 
 
 def user_form_schema(user_input: dict[str, Any] | None) -> vol.Schema:
@@ -63,7 +59,7 @@ class VodafoneStationConfigFlow(ConfigFlow, domain=DOMAIN):
     @staticmethod
     @callback
     def async_get_options_flow(
-        config_entry: ConfigEntry,
+        config_entry: VodafoneConfigEntry,
     ) -> VodafoneStationOptionsFlowHandler:
         """Get the options flow for this handler."""
         return VodafoneStationOptionsFlowHandler()
@@ -143,6 +139,47 @@ class VodafoneStationConfigFlow(ConfigFlow, domain=DOMAIN):
             errors=errors,
         )
 
+    async def async_step_reconfigure(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle reconfiguration of the device."""
+        reconfigure_entry = self._get_reconfigure_entry()
+        if not user_input:
+            return self.async_show_form(
+                step_id="reconfigure", data_schema=user_form_schema(user_input)
+            )
+
+        updated_host = user_input[CONF_HOST]
+
+        if reconfigure_entry.data[CONF_HOST] != updated_host:
+            self._async_abort_entries_match({CONF_HOST: updated_host})
+
+        errors: dict[str, str] = {}
+
+        errors = {}
+
+        try:
+            await validate_input(self.hass, user_input)
+        except aiovodafone_exceptions.AlreadyLogged:
+            errors["base"] = "already_logged"
+        except aiovodafone_exceptions.CannotConnect:
+            errors["base"] = "cannot_connect"
+        except aiovodafone_exceptions.CannotAuthenticate:
+            errors["base"] = "invalid_auth"
+        except Exception:  # noqa: BLE001
+            _LOGGER.exception("Unexpected exception")
+            errors["base"] = "unknown"
+        else:
+            return self.async_update_reload_and_abort(
+                reconfigure_entry, data_updates={CONF_HOST: updated_host}
+            )
+
+        return self.async_show_form(
+            step_id="reconfigure",
+            data_schema=user_form_schema(user_input),
+            errors=errors,
+        )
+
 
 class VodafoneStationOptionsFlowHandler(OptionsFlow):
     """Handle a option flow."""
diff --git a/homeassistant/components/vodafone_station/coordinator.py b/homeassistant/components/vodafone_station/coordinator.py
index de794488040..cee66bd2e7c 100644
--- a/homeassistant/components/vodafone_station/coordinator.py
+++ b/homeassistant/components/vodafone_station/coordinator.py
@@ -3,21 +3,26 @@
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 from json.decoder import JSONDecodeError
-from typing import Any
+from typing import Any, cast
 
 from aiovodafone import VodafoneStationDevice, VodafoneStationSercommApi, exceptions
 
 from homeassistant.components.device_tracker import DEFAULT_CONSIDER_HOME
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from homeassistant.util import dt as dt_util
 
 from .const import _LOGGER, DOMAIN, SCAN_INTERVAL
+from .helpers import cleanup_device_tracker
 
 CONSIDER_HOME_SECONDS = DEFAULT_CONSIDER_HOME.total_seconds()
 
+type VodafoneConfigEntry = ConfigEntry[VodafoneStationRouter]
+
 
 @dataclass(slots=True)
 class VodafoneStationDeviceInfo:
@@ -39,13 +44,15 @@ class UpdateCoordinatorDataType:
 class VodafoneStationRouter(DataUpdateCoordinator[UpdateCoordinatorDataType]):
     """Queries router running Vodafone Station firmware."""
 
+    config_entry: VodafoneConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
         host: str,
         username: str,
         password: str,
-        config_entry_unique_id: str | None,
+        config_entry: VodafoneConfigEntry,
     ) -> None:
         """Initialize the scanner."""
 
@@ -53,14 +60,26 @@ class VodafoneStationRouter(DataUpdateCoordinator[UpdateCoordinatorDataType]):
         self.api = VodafoneStationSercommApi(host, username, password)
 
         # Last resort as no MAC or S/N can be retrieved via API
-        self._id = config_entry_unique_id
+        self._id = config_entry.unique_id
 
         super().__init__(
             hass=hass,
             logger=_LOGGER,
             name=f"{DOMAIN}-{host}-coordinator",
             update_interval=timedelta(seconds=SCAN_INTERVAL),
+            config_entry=config_entry,
         )
+        device_reg = dr.async_get(self.hass)
+        device_list = dr.async_entries_for_config_entry(
+            device_reg, self.config_entry.entry_id
+        )
+
+        self.previous_devices = {
+            connection[1].upper()
+            for device in device_list
+            for connection in device.connections
+            if connection[0] == dr.CONNECTION_NETWORK_MAC
+        }
 
     def _calculate_update_time_and_consider_home(
         self, device: VodafoneStationDevice, utc_point_in_time: datetime
@@ -103,14 +122,22 @@ class VodafoneStationRouter(DataUpdateCoordinator[UpdateCoordinatorDataType]):
                 data_sensors = await self.api.get_sensor_data()
                 await self.api.logout()
             except exceptions.CannotAuthenticate as err:
-                raise ConfigEntryAuthFailed from err
+                raise ConfigEntryAuthFailed(
+                    translation_domain=DOMAIN,
+                    translation_key="cannot_authenticate",
+                    translation_placeholders={"error": repr(err)},
+                ) from err
             except (
                 exceptions.CannotConnect,
                 exceptions.AlreadyLogged,
                 exceptions.GenericLoginError,
                 JSONDecodeError,
             ) as err:
-                raise UpdateFailed(f"Error fetching data: {err!r}") from err
+                raise UpdateFailed(
+                    translation_domain=DOMAIN,
+                    translation_key="update_failed",
+                    translation_placeholders={"error": repr(err)},
+                ) from err
         except (ConfigEntryAuthFailed, UpdateFailed):
             await self.api.close()
             raise
@@ -125,6 +152,18 @@ class VodafoneStationRouter(DataUpdateCoordinator[UpdateCoordinatorDataType]):
             )
             for dev_info in (raw_data_devices).values()
         }
+        current_devices = set(data_devices)
+        _LOGGER.debug(
+            "Loaded current %s devices: %s", len(current_devices), current_devices
+        )
+        if stale_devices := self.previous_devices - current_devices:
+            _LOGGER.debug(
+                "Found %s stale devices: %s", len(stale_devices), stale_devices
+            )
+            await cleanup_device_tracker(self.hass, self.config_entry, data_devices)
+
+        self.previous_devices = current_devices
+
         return UpdateCoordinatorDataType(data_devices, data_sensors)
 
     @property
@@ -135,7 +174,7 @@ class VodafoneStationRouter(DataUpdateCoordinator[UpdateCoordinatorDataType]):
     @property
     def serial_number(self) -> str:
         """Device serial number."""
-        return self.data.sensors["sys_serial_number"]
+        return cast(str, self.data.sensors["sys_serial_number"])
 
     @property
     def device_info(self) -> DeviceInfo:
diff --git a/homeassistant/components/vodafone_station/device_tracker.py b/homeassistant/components/vodafone_station/device_tracker.py
index 3e4d7763bff..4efa26cda8c 100644
--- a/homeassistant/components/vodafone_station/device_tracker.py
+++ b/homeassistant/components/vodafone_station/device_tracker.py
@@ -3,23 +3,31 @@
 from __future__ import annotations
 
 from homeassistant.components.device_tracker import ScannerEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .const import _LOGGER, DOMAIN
-from .coordinator import VodafoneStationDeviceInfo, VodafoneStationRouter
+from .const import _LOGGER
+from .coordinator import (
+    VodafoneConfigEntry,
+    VodafoneStationDeviceInfo,
+    VodafoneStationRouter,
+)
+
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: VodafoneConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up device tracker for Vodafone Station component."""
 
     _LOGGER.debug("Start device trackers setup")
-    coordinator: VodafoneStationRouter = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
 
     tracked: set = set()
 
@@ -40,7 +48,7 @@ async def async_setup_entry(
 @callback
 def async_add_new_tracked_entities(
     coordinator: VodafoneStationRouter,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     tracked: set[str],
 ) -> None:
     """Add new tracker entities from the router."""
@@ -61,6 +69,7 @@ class VodafoneStationTracker(CoordinatorEntity[VodafoneStationRouter], ScannerEn
     """Representation of a Vodafone Station device."""
 
     _attr_translation_key = "device_tracker"
+    _attr_has_entity_name = True
     mac_address: str
 
     def __init__(
@@ -72,7 +81,9 @@ class VodafoneStationTracker(CoordinatorEntity[VodafoneStationRouter], ScannerEn
         mac = device_info.device.mac
         self._attr_mac_address = mac
         self._attr_unique_id = mac
-        self._attr_hostname = device_info.device.name or mac.replace(":", "_")
+        self._attr_hostname = self._attr_name = device_info.device.name or mac.replace(
+            ":", "_"
+        )
 
     @property
     def _device_info(self) -> VodafoneStationDeviceInfo:
diff --git a/homeassistant/components/vodafone_station/diagnostics.py b/homeassistant/components/vodafone_station/diagnostics.py
index e306d6caca2..4778e7d5a4e 100644
--- a/homeassistant/components/vodafone_station/diagnostics.py
+++ b/homeassistant/components/vodafone_station/diagnostics.py
@@ -5,22 +5,20 @@ 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
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
-from .coordinator import VodafoneStationRouter
+from .coordinator import VodafoneConfigEntry
 
 TO_REDACT = {CONF_USERNAME, CONF_PASSWORD}
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: ConfigEntry
+    hass: HomeAssistant, entry: VodafoneConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
 
-    coordinator: VodafoneStationRouter = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
 
     sensors_data = coordinator.data.sensors
     return {
diff --git a/homeassistant/components/vodafone_station/helpers.py b/homeassistant/components/vodafone_station/helpers.py
new file mode 100644
index 00000000000..aa0fda3f6be
--- /dev/null
+++ b/homeassistant/components/vodafone_station/helpers.py
@@ -0,0 +1,72 @@
+"""Vodafone Station helpers."""
+
+from typing import Any
+
+from homeassistant.components.device_tracker import DOMAIN as DEVICE_TRACKER_DOMAIN
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr, entity_registry as er
+
+from .const import _LOGGER
+
+
+async def cleanup_device_tracker(
+    hass: HomeAssistant, config_entry: ConfigEntry, devices: dict[str, Any]
+) -> None:
+    """Cleanup stale device tracker."""
+    entity_reg: er.EntityRegistry = er.async_get(hass)
+
+    entities_removed: bool = False
+
+    device_hosts_macs: set[str] = set()
+    device_hosts_names: set[str] = set()
+    for mac, device_info in devices.items():
+        device_hosts_macs.add(mac)
+        device_hosts_names.add(device_info.device.name)
+
+    for entry in er.async_entries_for_config_entry(entity_reg, config_entry.entry_id):
+        if entry.domain != DEVICE_TRACKER_DOMAIN:
+            continue
+        entry_name = entry.name or entry.original_name
+        entry_host = entry_name.partition(" ")[0] if entry_name else None
+        entry_mac = entry.unique_id.partition("_")[0]
+
+        # Some devices, mainly routers, allow to change the hostname of the connected devices.
+        # This can lead to entities no longer aligned to the device UI
+        if (
+            entry_host
+            and entry_host in device_hosts_names
+            and entry_mac in device_hosts_macs
+        ):
+            _LOGGER.debug(
+                "Skipping entity %s [mac=%s, host=%s]",
+                entry_name,
+                entry_mac,
+                entry_host,
+            )
+            continue
+        # Entity is removed so that at the next coordinator update
+        # the correct one will be created
+        _LOGGER.info("Removing entity: %s", entry_name)
+        entity_reg.async_remove(entry.entity_id)
+        entities_removed = True
+
+    if entities_removed:
+        _async_remove_empty_devices(hass, entity_reg, config_entry)
+
+
+def _async_remove_empty_devices(
+    hass: HomeAssistant, entity_reg: er.EntityRegistry, config_entry: ConfigEntry
+) -> None:
+    """Remove devices with no entities."""
+
+    device_reg = dr.async_get(hass)
+    device_list = dr.async_entries_for_config_entry(device_reg, config_entry.entry_id)
+    for device_entry in device_list:
+        if not er.async_entries_for_device(
+            entity_reg,
+            device_entry.id,
+            include_disabled_entities=True,
+        ):
+            _LOGGER.info("Removing device: %s", device_entry.name)
+            device_reg.async_remove_device(device_entry.id)
diff --git a/homeassistant/components/vodafone_station/manifest.json b/homeassistant/components/vodafone_station/manifest.json
index 4acafc8df3a..29cb3c070ab 100644
--- a/homeassistant/components/vodafone_station/manifest.json
+++ b/homeassistant/components/vodafone_station/manifest.json
@@ -7,5 +7,6 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["aiovodafone"],
+  "quality_scale": "silver",
   "requirements": ["aiovodafone==0.6.1"]
 }
diff --git a/homeassistant/components/vodafone_station/quality_scale.yaml b/homeassistant/components/vodafone_station/quality_scale.yaml
new file mode 100644
index 00000000000..d60020f5e47
--- /dev/null
+++ b/homeassistant/components/vodafone_station/quality_scale.yaml
@@ -0,0 +1,76 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: no actions
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: no actions
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup:
+    status: exempt
+    comment: no events
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions: done
+  config-entry-unloading: done
+  docs-configuration-parameters: done
+  docs-installation-parameters: done
+  entity-unavailable: done
+  integration-owner: done
+  log-when-unavailable: done
+  parallel-updates: done
+  reauthentication-flow: done
+  test-coverage: done
+
+  # Gold
+  devices: done
+  diagnostics: done
+  discovery-update-info:
+    status: exempt
+    comment: device not discoverable
+  discovery:
+    status: exempt
+    comment: device not discoverable
+  docs-data-update: done
+  docs-examples: done
+  docs-known-limitations:
+    status: exempt
+    comment: no known limitations, yet
+  docs-supported-devices: done
+  docs-supported-functions: done
+  docs-troubleshooting: done
+  docs-use-cases: done
+  dynamic-devices: done
+  entity-category: done
+  entity-device-class: done
+  entity-disabled-by-default:
+    status: exempt
+    comment: no known use case
+  entity-translations: done
+  exception-translations: done
+  icon-translations: done
+  reconfiguration-flow: done
+  repair-issues:
+    status: exempt
+    comment: no known use cases for repair issues or flows, yet
+  stale-devices: done
+
+  # Platinum
+  async-dependency: done
+  inject-websession: done
+  strict-typing: done
diff --git a/homeassistant/components/vodafone_station/sensor.py b/homeassistant/components/vodafone_station/sensor.py
index 307fcaf0ea8..2573864330d 100644
--- a/homeassistant/components/vodafone_station/sensor.py
+++ b/homeassistant/components/vodafone_station/sensor.py
@@ -12,14 +12,16 @@ from homeassistant.components.sensor import (
     SensorEntity,
     SensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfDataRate
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .const import _LOGGER, DOMAIN, LINE_TYPES
-from .coordinator import VodafoneStationRouter
+from .const import _LOGGER, LINE_TYPES
+from .coordinator import VodafoneConfigEntry, VodafoneStationRouter
+
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
 
 NOT_AVAILABLE: list = ["", "N/A", "0.0.0.0"]
 UPTIME_DEVIATION = 60
@@ -165,12 +167,14 @@ SENSOR_TYPES: Final = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: VodafoneConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry."""
     _LOGGER.debug("Setting up Vodafone Station sensors")
 
-    coordinator: VodafoneStationRouter = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
 
     sensors_data = coordinator.data.sensors
 
diff --git a/homeassistant/components/vodafone_station/strings.json b/homeassistant/components/vodafone_station/strings.json
index 8910d7178b7..958b774a485 100644
--- a/homeassistant/components/vodafone_station/strings.json
+++ b/homeassistant/components/vodafone_station/strings.json
@@ -3,9 +3,11 @@
     "flow_title": "{host}",
     "step": {
       "reauth_confirm": {
-        "description": "Please enter the correct password for host: {host}",
         "data": {
           "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "password": "[%key:component::vodafone_station::config::step::user::data_description::password%]"
         }
       },
       "user": {
@@ -15,7 +17,21 @@
           "password": "[%key:common::config_flow::data::password%]"
         },
         "data_description": {
-          "host": "The hostname or IP address of your Vodafone Station."
+          "host": "The hostname or IP address of your Vodafone Station.",
+          "username": "The username for your Vodafone Station.",
+          "password": "The password for your Vodafone Station."
+        }
+      },
+      "reconfigure": {
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]",
+          "username": "[%key:common::config_flow::data::username%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "host": "[%key:component::vodafone_station::config::step::user::data_description::host%]",
+          "username": "[%key:component::vodafone_station::config::step::user::data_description::username%]",
+          "password": "[%key:component::vodafone_station::config::step::user::data_description::password%]"
         }
       }
     },
@@ -23,16 +39,17 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
       "already_logged": "User already logged-in, please try again later.",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "model_not_supported": "The device model is currently unsupported.",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "error": {
-      "already_logged": "User already logged-in, please try again later.",
+      "already_logged": "[%key:component::vodafone_station::config::abort::already_logged%]",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "model_not_supported": "The device model is currently unsupported.",
+      "model_not_supported": "[%key:component::vodafone_station::config::abort::model_not_supported%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     }
   },
@@ -41,20 +58,35 @@
       "init": {
         "data": {
           "consider_home": "Seconds to consider a device at 'home'"
+        },
+        "data_description": {
+          "consider_home": "The number of seconds to wait until marking a device as not home after it disconnects from the network."
         }
       }
     }
   },
   "entity": {
     "button": {
-      "dsl_reconnect": { "name": "DSL reconnect" },
-      "fiber_reconnect": { "name": "Fiber reconnect" },
-      "internet_key_reconnect": { "name": "Internet key reconnect" }
+      "dsl_reconnect": {
+        "name": "DSL reconnect"
+      },
+      "fiber_reconnect": {
+        "name": "Fiber reconnect"
+      },
+      "internet_key_reconnect": {
+        "name": "Internet key reconnect"
+      }
     },
     "sensor": {
-      "external_ipv4": { "name": "WAN IPv4 address" },
-      "external_ipv6": { "name": "WAN IPv6 address" },
-      "external_ip_key": { "name": "WAN internet key address" },
+      "external_ipv4": {
+        "name": "WAN IPv4 address"
+      },
+      "external_ipv6": {
+        "name": "WAN IPv6 address"
+      },
+      "external_ip_key": {
+        "name": "WAN internet key address"
+      },
       "active_connection": {
         "name": "Active connection",
         "state": {
@@ -64,15 +96,44 @@
           "internet_key": "Internet key"
         }
       },
-      "down_stream": { "name": "WAN download rate" },
-      "up_stream": { "name": "WAN upload rate" },
-      "fw_version": { "name": "Firmware version" },
-      "phone_num1": { "name": "Phone number (1)" },
-      "phone_num2": { "name": "Phone number (2)" },
-      "sys_uptime": { "name": "Uptime" },
-      "sys_cpu_usage": { "name": "CPU usage" },
-      "sys_memory_usage": { "name": "Memory usage" },
-      "sys_reboot_cause": { "name": "Reboot cause" }
+      "down_stream": {
+        "name": "WAN download rate"
+      },
+      "up_stream": {
+        "name": "WAN upload rate"
+      },
+      "fw_version": {
+        "name": "Firmware version"
+      },
+      "phone_num1": {
+        "name": "Phone number (1)"
+      },
+      "phone_num2": {
+        "name": "Phone number (2)"
+      },
+      "sys_uptime": {
+        "name": "Uptime"
+      },
+      "sys_cpu_usage": {
+        "name": "CPU usage"
+      },
+      "sys_memory_usage": {
+        "name": "Memory usage"
+      },
+      "sys_reboot_cause": {
+        "name": "Reboot cause"
+      }
+    }
+  },
+  "exceptions": {
+    "update_failed": {
+      "message": "Error fetching data: {error}"
+    },
+    "cannot_execute_action": {
+      "message": "Cannot execute requested action: {error}"
+    },
+    "cannot_authenticate": {
+      "message": "Error authenticating: {error}"
     }
   }
 }
diff --git a/homeassistant/components/voicerss/tts.py b/homeassistant/components/voicerss/tts.py
index 9f1615ffa01..6bf42d86836 100644
--- a/homeassistant/components/voicerss/tts.py
+++ b/homeassistant/components/voicerss/tts.py
@@ -13,8 +13,8 @@ from homeassistant.components.tts import (
     Provider,
 )
 from homeassistant.const import CONF_API_KEY
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/voip/assist_satellite.py b/homeassistant/components/voip/assist_satellite.py
index 0100435d6dc..2c0a3b9641a 100644
--- a/homeassistant/components/voip/assist_satellite.py
+++ b/homeassistant/components/voip/assist_satellite.py
@@ -3,28 +3,45 @@
 from __future__ import annotations
 
 import asyncio
+from datetime import timedelta
 from enum import IntFlag
 from functools import partial
 import io
 import logging
 from pathlib import Path
+import socket
+import time
 from typing import TYPE_CHECKING, Any, Final
 import wave
 
-from voip_utils import RtpDatagramProtocol
+from voip_utils import SIP_PORT, RtpDatagramProtocol
+from voip_utils.sip import SipDatagramProtocol, SipEndpoint, get_sip_endpoint
 
-from homeassistant.components import tts
+from homeassistant.components import intent, tts
 from homeassistant.components.assist_pipeline import PipelineEvent, PipelineEventType
 from homeassistant.components.assist_satellite import (
+    AssistSatelliteAnnouncement,
     AssistSatelliteConfiguration,
     AssistSatelliteEntity,
     AssistSatelliteEntityDescription,
+    AssistSatelliteEntityFeature,
 )
+from homeassistant.components.intent import TimerEventType, TimerInfo
+from homeassistant.components.network import async_get_source_ip
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import Context, HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import CHANNELS, DOMAIN, RATE, RTP_AUDIO_SETTINGS, WIDTH
+from .const import (
+    CHANNELS,
+    CONF_SIP_PORT,
+    CONF_SIP_USER,
+    DOMAIN,
+    RATE,
+    RTP_AUDIO_SETTINGS,
+    WIDTH,
+)
 from .devices import VoIPDevice
 from .entity import VoIPEntity
 
@@ -34,6 +51,10 @@ if TYPE_CHECKING:
 _LOGGER = logging.getLogger(__name__)
 
 _PIPELINE_TIMEOUT_SEC: Final = 30
+_ANNOUNCEMENT_BEFORE_DELAY: Final = 0.5
+_ANNOUNCEMENT_AFTER_DELAY: Final = 1.0
+_ANNOUNCEMENT_HANGUP_SEC: Final = 0.5
+_ANNOUNCEMENT_RING_TIMEOUT: Final = 30
 
 
 class Tones(IntFlag):
@@ -54,7 +75,7 @@ _TONE_FILENAMES: dict[Tones, str] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up VoIP Assist satellite entity."""
     domain_data: DomainData = hass.data[DOMAIN]
@@ -80,6 +101,10 @@ class VoipAssistSatellite(VoIPEntity, AssistSatelliteEntity, RtpDatagramProtocol
     entity_description = AssistSatelliteEntityDescription(key="assist_satellite")
     _attr_translation_key = "assist_satellite"
     _attr_name = None
+    _attr_supported_features = (
+        AssistSatelliteEntityFeature.ANNOUNCE
+        | AssistSatelliteEntityFeature.START_CONVERSATION
+    )
 
     def __init__(
         self,
@@ -105,6 +130,14 @@ class VoipAssistSatellite(VoIPEntity, AssistSatelliteEntity, RtpDatagramProtocol
         self._tones = tones
         self._processing_tone_done = asyncio.Event()
 
+        self._announcement: AssistSatelliteAnnouncement | None = None
+        self._announcement_future: asyncio.Future[Any] = asyncio.Future()
+        self._announcment_start_time: float = 0.0
+        self._check_announcement_ended_task: asyncio.Task | None = None
+        self._last_chunk_time: float | None = None
+        self._rtp_port: int | None = None
+        self._run_pipeline_after_announce: bool = False
+
     @property
     def pipeline_entity_id(self) -> str | None:
         """Return the entity ID of the pipeline to use for the next conversation."""
@@ -130,6 +163,13 @@ class VoipAssistSatellite(VoIPEntity, AssistSatelliteEntity, RtpDatagramProtocol
         await super().async_added_to_hass()
         self.voip_device.protocol = self
 
+        assert self.device_entry is not None
+        self.async_on_remove(
+            intent.async_register_timer_handler(
+                self.hass, self.device_entry.id, self.async_handle_timer_event
+            )
+        )
+
     async def async_will_remove_from_hass(self) -> None:
         """Run when entity will be removed from hass."""
         await super().async_will_remove_from_hass()
@@ -143,31 +183,184 @@ class VoipAssistSatellite(VoIPEntity, AssistSatelliteEntity, RtpDatagramProtocol
         """Get the current satellite configuration."""
         raise NotImplementedError
 
+    @callback
+    def async_handle_timer_event(
+        self,
+        event_type: TimerEventType,
+        timer_info: TimerInfo,
+    ) -> None:
+        """Handle timer event."""
+        if event_type != TimerEventType.FINISHED:
+            return
+
+        if timer_info.name:
+            message = f"{timer_info.name} finished"
+        else:
+            message = f"{timedelta(seconds=timer_info.created_seconds)} timer finished"
+
+        async def announce_message():
+            announcement = await self._resolve_announcement_media_id(message, None)
+            await self.async_announce(announcement)
+
+        self.config_entry.async_create_background_task(
+            self.hass, announce_message(), "voip_announce_timer"
+        )
+
     async def async_set_configuration(
         self, config: AssistSatelliteConfiguration
     ) -> None:
         """Set the current satellite configuration."""
         raise NotImplementedError
 
+    async def async_announce(self, announcement: AssistSatelliteAnnouncement) -> None:
+        """Announce media on the satellite.
+
+        Plays announcement in a loop, blocking until the caller hangs up.
+        """
+        await self._do_announce(announcement, run_pipeline_after=False)
+
+    async def _do_announce(
+        self, announcement: AssistSatelliteAnnouncement, run_pipeline_after: bool
+    ) -> None:
+        """Announce media on the satellite.
+
+        Optionally run a voice pipeline after the announcement has finished.
+        """
+        if announcement.media_id_source != "tts":
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="non_tts_announcement",
+            )
+
+        self._announcement_future = asyncio.Future()
+        self._run_pipeline_after_announce = run_pipeline_after
+
+        if self._rtp_port is None:
+            # Choose random port for RTP
+            sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+            sock.setblocking(False)
+            sock.bind(("", 0))
+            _rtp_ip, self._rtp_port = sock.getsockname()
+            sock.close()
+
+        # HA SIP server
+        source_ip = await async_get_source_ip(self.hass)
+        sip_port = self.config_entry.options.get(CONF_SIP_PORT, SIP_PORT)
+        sip_user = self.config_entry.options.get(CONF_SIP_USER)
+        source_endpoint = get_sip_endpoint(
+            host=source_ip, port=sip_port, username=sip_user
+        )
+
+        try:
+            # VoIP ID is SIP header
+            destination_endpoint = SipEndpoint(self.voip_device.voip_id)
+        except ValueError:
+            # VoIP ID is IP address
+            destination_endpoint = get_sip_endpoint(
+                host=self.voip_device.voip_id, port=SIP_PORT
+            )
+
+        # Reset state so we can time out if needed
+        self._last_chunk_time = None
+        self._announcment_start_time = time.monotonic()
+        self._announcement = announcement
+
+        # Make the call
+        sip_protocol: SipDatagramProtocol = self.hass.data[DOMAIN].protocol
+        call_info = sip_protocol.outgoing_call(
+            source=source_endpoint,
+            destination=destination_endpoint,
+            rtp_port=self._rtp_port,
+        )
+
+        # Check if caller hung up or didn't pick up
+        self._check_announcement_ended_task = (
+            self.config_entry.async_create_background_task(
+                self.hass,
+                self._check_announcement_ended(),
+                "voip_announcement_ended",
+            )
+        )
+
+        try:
+            await self._announcement_future
+        except TimeoutError:
+            # Stop ringing
+            sip_protocol.cancel_call(call_info)
+            raise
+
+    async def _check_announcement_ended(self) -> None:
+        """Continuously checks if an audio chunk was received within a time limit.
+
+        If not, the caller is presumed to have hung up and the announcement is ended.
+        """
+        while self._announcement is not None:
+            current_time = time.monotonic()
+            if (self._last_chunk_time is None) and (
+                (current_time - self._announcment_start_time)
+                > _ANNOUNCEMENT_RING_TIMEOUT
+            ):
+                # Ring timeout
+                self._announcement = None
+                self._check_announcement_ended_task = None
+                self._announcement_future.set_exception(
+                    TimeoutError("User did not pick up in time")
+                )
+                _LOGGER.debug("Timed out waiting for the user to pick up the phone")
+                break
+
+            if (self._last_chunk_time is not None) and (
+                (current_time - self._last_chunk_time) > _ANNOUNCEMENT_HANGUP_SEC
+            ):
+                # Caller hung up
+                self._announcement = None
+                self._announcement_future.set_result(None)
+                self._check_announcement_ended_task = None
+                _LOGGER.debug("Announcement ended")
+                break
+
+            await asyncio.sleep(_ANNOUNCEMENT_HANGUP_SEC / 2)
+
+    async def async_start_conversation(
+        self, start_announcement: AssistSatelliteAnnouncement
+    ) -> None:
+        """Start a conversation from the satellite."""
+        await self._do_announce(start_announcement, run_pipeline_after=True)
+
     # -------------------------------------------------------------------------
     # VoIP
     # -------------------------------------------------------------------------
 
     def on_chunk(self, audio_bytes: bytes) -> None:
         """Handle raw audio chunk."""
-        if self._run_pipeline_task is None:
-            # Run pipeline until voice command finishes, then start over
-            self._clear_audio_queue()
-            self._tts_done.clear()
+        self._last_chunk_time = time.monotonic()
+
+        if self._announcement is None:
+            # Pipeline with STT
+            if self._run_pipeline_task is None:
+                # Run pipeline until voice command finishes, then start over
+                self._clear_audio_queue()
+                self._tts_done.clear()
+                self._run_pipeline_task = (
+                    self.config_entry.async_create_background_task(
+                        self.hass,
+                        self._run_pipeline(),
+                        "voip_pipeline_run",
+                    )
+                )
+
+            self._audio_queue.put_nowait(audio_bytes)
+        elif self._run_pipeline_task is None:
+            # Announcement only
+            # Play announcement (will repeat)
             self._run_pipeline_task = self.config_entry.async_create_background_task(
                 self.hass,
-                self._run_pipeline(),
-                "voip_pipeline_run",
+                self._play_announcement(self._announcement),
+                "voip_play_announcement",
             )
 
-        self._audio_queue.put_nowait(audio_bytes)
-
     async def _run_pipeline(self) -> None:
+        """Run a pipeline with STT input and TTS output."""
         _LOGGER.debug("Starting pipeline")
 
         self.async_set_context(Context(user_id=self.config_entry.data["user"]))
@@ -209,6 +402,31 @@ class VoipAssistSatellite(VoIPEntity, AssistSatelliteEntity, RtpDatagramProtocol
             self._run_pipeline_task = None
             _LOGGER.debug("Pipeline finished")
 
+    async def _play_announcement(
+        self, announcement: AssistSatelliteAnnouncement
+    ) -> None:
+        """Play an announcement once."""
+        _LOGGER.debug("Playing announcement")
+
+        try:
+            await asyncio.sleep(_ANNOUNCEMENT_BEFORE_DELAY)
+            await self._send_tts(announcement.original_media_id, wait_for_tone=False)
+
+            if not self._run_pipeline_after_announce:
+                # Delay before looping announcement
+                await asyncio.sleep(_ANNOUNCEMENT_AFTER_DELAY)
+        except Exception:
+            _LOGGER.exception("Unexpected error while playing announcement")
+            raise
+        finally:
+            self._run_pipeline_task = None
+            _LOGGER.debug("Announcement finished")
+
+            if self._run_pipeline_after_announce:
+                # Clear announcement to allow pipeline to run
+                self._announcement = None
+                self._announcement_future.set_result(None)
+
     def _clear_audio_queue(self) -> None:
         """Ensure audio queue is empty."""
         while not self._audio_queue.empty():
@@ -239,7 +457,7 @@ class VoipAssistSatellite(VoIPEntity, AssistSatelliteEntity, RtpDatagramProtocol
             self._pipeline_had_error = True
             _LOGGER.warning(event)
 
-    async def _send_tts(self, media_id: str) -> None:
+    async def _send_tts(self, media_id: str, wait_for_tone: bool = True) -> None:
         """Send TTS audio to caller via RTP."""
         try:
             if self.transport is None:
@@ -253,7 +471,7 @@ class VoipAssistSatellite(VoIPEntity, AssistSatelliteEntity, RtpDatagramProtocol
             if extension != "wav":
                 raise ValueError(f"Only WAV audio can be streamed, got {extension}")
 
-            if (self._tones & Tones.PROCESSING) == Tones.PROCESSING:
+            if wait_for_tone and ((self._tones & Tones.PROCESSING) == Tones.PROCESSING):
                 # Don't overlap TTS and processing beep
                 _LOGGER.debug("Waiting for processing tone")
                 await self._processing_tone_done.wait()
diff --git a/homeassistant/components/voip/binary_sensor.py b/homeassistant/components/voip/binary_sensor.py
index f38b228c46c..34dac4b6068 100644
--- a/homeassistant/components/voip/binary_sensor.py
+++ b/homeassistant/components/voip/binary_sensor.py
@@ -11,7 +11,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import issue_registry as ir
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .devices import VoIPDevice
@@ -24,7 +24,7 @@ if TYPE_CHECKING:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up VoIP binary sensor entities."""
     domain_data: DomainData = hass.data[DOMAIN]
diff --git a/homeassistant/components/voip/config_flow.py b/homeassistant/components/voip/config_flow.py
index 63dcb8f86ee..7ae603f0f6a 100644
--- a/homeassistant/components/voip/config_flow.py
+++ b/homeassistant/components/voip/config_flow.py
@@ -16,7 +16,7 @@ from homeassistant.config_entries import (
 from homeassistant.core import callback
 from homeassistant.helpers import config_validation as cv
 
-from .const import CONF_SIP_PORT, DOMAIN
+from .const import CONF_SIP_PORT, CONF_SIP_USER, DOMAIN
 
 
 class VoIPConfigFlow(ConfigFlow, domain=DOMAIN):
@@ -58,7 +58,15 @@ class VoipOptionsFlowHandler(OptionsFlow):
     ) -> ConfigFlowResult:
         """Manage the options."""
         if user_input is not None:
-            return self.async_create_entry(title="", data=user_input)
+            if CONF_SIP_USER in user_input and not user_input[CONF_SIP_USER]:
+                del user_input[CONF_SIP_USER]
+            self.hass.config_entries.async_update_entry(
+                self.config_entry, options=user_input
+            )
+            return self.async_create_entry(
+                title="",
+                data=user_input,
+            )
 
         return self.async_show_form(
             step_id="init",
@@ -70,7 +78,15 @@ class VoipOptionsFlowHandler(OptionsFlow):
                             CONF_SIP_PORT,
                             SIP_PORT,
                         ),
-                    ): cv.port
+                    ): cv.port,
+                    vol.Optional(
+                        CONF_SIP_USER,
+                        description={
+                            "suggested_value": self.config_entry.options.get(
+                                CONF_SIP_USER, None
+                            )
+                        },
+                    ): vol.Any(None, cv.string),
                 }
             ),
         )
diff --git a/homeassistant/components/voip/const.py b/homeassistant/components/voip/const.py
index b4ee5d8ce7a..9a4403f9df2 100644
--- a/homeassistant/components/voip/const.py
+++ b/homeassistant/components/voip/const.py
@@ -13,3 +13,4 @@ RTP_AUDIO_SETTINGS = {
 }
 
 CONF_SIP_PORT = "sip_port"
+CONF_SIP_USER = "sip_user"
diff --git a/homeassistant/components/voip/manifest.json b/homeassistant/components/voip/manifest.json
index ed7f11f8fbc..dfd397fde14 100644
--- a/homeassistant/components/voip/manifest.json
+++ b/homeassistant/components/voip/manifest.json
@@ -3,9 +3,10 @@
   "name": "Voice over IP",
   "codeowners": ["@balloob", "@synesthesiam"],
   "config_flow": true,
-  "dependencies": ["assist_pipeline", "assist_satellite"],
+  "dependencies": ["assist_pipeline", "assist_satellite", "intent", "network"],
   "documentation": "https://www.home-assistant.io/integrations/voip",
   "iot_class": "local_push",
+  "loggers": ["voip_utils"],
   "quality_scale": "internal",
-  "requirements": ["voip-utils==0.2.2"]
+  "requirements": ["voip-utils==0.3.1"]
 }
diff --git a/homeassistant/components/voip/select.py b/homeassistant/components/voip/select.py
index f145f866ae3..bfce112d0c5 100644
--- a/homeassistant/components/voip/select.py
+++ b/homeassistant/components/voip/select.py
@@ -10,7 +10,7 @@ from homeassistant.components.assist_pipeline.select import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .devices import VoIPDevice
@@ -23,7 +23,7 @@ if TYPE_CHECKING:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up VoIP switch entities."""
     domain_data: DomainData = hass.data[DOMAIN]
diff --git a/homeassistant/components/voip/strings.json b/homeassistant/components/voip/strings.json
index c25c22f3f80..4f37ad1d6f7 100644
--- a/homeassistant/components/voip/strings.json
+++ b/homeassistant/components/voip/strings.json
@@ -53,9 +53,15 @@
     "step": {
       "init": {
         "data": {
-          "sip_port": "SIP port"
+          "sip_port": "SIP port",
+          "sip_user": "SIP user"
         }
       }
     }
+  },
+  "exceptions": {
+    "non_tts_announcement": {
+      "message": "VoIP does not currently support non-TTS announcements"
+    }
   }
 }
diff --git a/homeassistant/components/voip/switch.py b/homeassistant/components/voip/switch.py
index f8484241fc5..7690b8f125c 100644
--- a/homeassistant/components/voip/switch.py
+++ b/homeassistant/components/voip/switch.py
@@ -9,7 +9,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_ON, EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import restore_state
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .devices import VoIPDevice
@@ -22,7 +22,7 @@ if TYPE_CHECKING:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up VoIP switch entities."""
     domain_data: DomainData = hass.data[DOMAIN]
diff --git a/homeassistant/components/volkszaehler/sensor.py b/homeassistant/components/volkszaehler/sensor.py
index c4fa7b1088b..5bd4a63c923 100644
--- a/homeassistant/components/volkszaehler/sensor.py
+++ b/homeassistant/components/volkszaehler/sensor.py
@@ -26,8 +26,8 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
diff --git a/homeassistant/components/volumio/media_player.py b/homeassistant/components/volumio/media_player.py
index 5ba67d7974f..773a125d483 100644
--- a/homeassistant/components/volumio/media_player.py
+++ b/homeassistant/components/volumio/media_player.py
@@ -21,7 +21,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ID, CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import Throttle
 
 from .browse_media import browse_node, browse_top_level
@@ -33,7 +33,7 @@ PLAYLIST_UPDATE_INTERVAL = timedelta(seconds=15)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Volumio media player platform."""
 
@@ -70,7 +70,6 @@ class Volumio(MediaPlayerEntity):
         | MediaPlayerEntityFeature.CLEAR_PLAYLIST
         | MediaPlayerEntityFeature.BROWSE_MEDIA
     )
-    _attr_source_list = []
 
     def __init__(self, volumio, uid, name, info):
         """Initialize the media player."""
@@ -78,6 +77,7 @@ class Volumio(MediaPlayerEntity):
         unique_id = uid
         self._state = {}
         self.thumbnail_cache = {}
+        self._attr_source_list = []
         self._attr_unique_id = unique_id
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, unique_id)},
diff --git a/homeassistant/components/volvooncall/__init__.py b/homeassistant/components/volvooncall/__init__.py
index 9fc07dd92b0..1a53f9a5dc4 100644
--- a/homeassistant/components/volvooncall/__init__.py
+++ b/homeassistant/components/volvooncall/__init__.py
@@ -52,7 +52,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     volvo_data = VolvoData(hass, connection, entry)
 
-    coordinator = VolvoUpdateCoordinator(hass, volvo_data)
+    coordinator = VolvoUpdateCoordinator(hass, entry, volvo_data)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/volvooncall/binary_sensor.py b/homeassistant/components/volvooncall/binary_sensor.py
index e6104f8d87c..2ba8d19e3db 100644
--- a/homeassistant/components/volvooncall/binary_sensor.py
+++ b/homeassistant/components/volvooncall/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, VOLVO_DISCOVERY_NEW
 from .coordinator import VolvoUpdateCoordinator
@@ -24,7 +24,7 @@ from .entity import VolvoEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Configure binary_sensors from a config entry created in the integrations UI."""
     coordinator: VolvoUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/volvooncall/coordinator.py b/homeassistant/components/volvooncall/coordinator.py
index 5ac6a58acb0..2c3e2ba365f 100644
--- a/homeassistant/components/volvooncall/coordinator.py
+++ b/homeassistant/components/volvooncall/coordinator.py
@@ -3,6 +3,7 @@
 import asyncio
 import logging
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -15,12 +16,17 @@ _LOGGER = logging.getLogger(__name__)
 class VolvoUpdateCoordinator(DataUpdateCoordinator[None]):
     """Volvo coordinator."""
 
-    def __init__(self, hass: HomeAssistant, volvo_data: VolvoData) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, volvo_data: VolvoData
+    ) -> None:
         """Initialize the data update coordinator."""
 
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="volvooncall",
             update_interval=DEFAULT_UPDATE_INTERVAL,
         )
diff --git a/homeassistant/components/volvooncall/device_tracker.py b/homeassistant/components/volvooncall/device_tracker.py
index 96fe5a644bb..018acb02d49 100644
--- a/homeassistant/components/volvooncall/device_tracker.py
+++ b/homeassistant/components/volvooncall/device_tracker.py
@@ -8,7 +8,7 @@ from homeassistant.components.device_tracker import TrackerEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, VOLVO_DISCOVERY_NEW
 from .coordinator import VolvoUpdateCoordinator
@@ -18,7 +18,7 @@ from .entity import VolvoEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Configure device_trackers from a config entry created in the integrations UI."""
     coordinator: VolvoUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/volvooncall/entity.py b/homeassistant/components/volvooncall/entity.py
index 6ebc4bdc754..5a1194e8b1a 100644
--- a/homeassistant/components/volvooncall/entity.py
+++ b/homeassistant/components/volvooncall/entity.py
@@ -57,7 +57,7 @@ class VolvoEntity(CoordinatorEntity[VolvoUpdateCoordinator]):
         return f"{self._vehicle_name} {self._entity_name}"
 
     @property
-    def assumed_state(self):
+    def assumed_state(self) -> bool:
         """Return true if unable to access real state of entity."""
         return True
 
diff --git a/homeassistant/components/volvooncall/lock.py b/homeassistant/components/volvooncall/lock.py
index cff5df35750..75b54e9dbbc 100644
--- a/homeassistant/components/volvooncall/lock.py
+++ b/homeassistant/components/volvooncall/lock.py
@@ -10,7 +10,7 @@ from homeassistant.components.lock import LockEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, VOLVO_DISCOVERY_NEW
 from .coordinator import VolvoUpdateCoordinator
@@ -20,7 +20,7 @@ from .entity import VolvoEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Configure locks from a config entry created in the integrations UI."""
     coordinator: VolvoUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/volvooncall/sensor.py b/homeassistant/components/volvooncall/sensor.py
index 9916d37197b..feb7248ccaf 100644
--- a/homeassistant/components/volvooncall/sensor.py
+++ b/homeassistant/components/volvooncall/sensor.py
@@ -8,7 +8,7 @@ from homeassistant.components.sensor import SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, VOLVO_DISCOVERY_NEW
 from .coordinator import VolvoUpdateCoordinator
@@ -18,7 +18,7 @@ from .entity import VolvoEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Configure sensors from a config entry created in the integrations UI."""
     coordinator: VolvoUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/volvooncall/switch.py b/homeassistant/components/volvooncall/switch.py
index 7e60f47fb44..ff321577348 100644
--- a/homeassistant/components/volvooncall/switch.py
+++ b/homeassistant/components/volvooncall/switch.py
@@ -10,7 +10,7 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, VOLVO_DISCOVERY_NEW
 from .coordinator import VolvoUpdateCoordinator
@@ -20,7 +20,7 @@ from .entity import VolvoEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Configure binary_sensors from a config entry created in the integrations UI."""
     coordinator: VolvoUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/vulcan/calendar.py b/homeassistant/components/vulcan/calendar.py
index a89b6b4a116..c2ef8b70d46 100644
--- a/homeassistant/components/vulcan/calendar.py
+++ b/homeassistant/components/vulcan/calendar.py
@@ -20,7 +20,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity import generate_entity_id
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN
 from .fetch_data import get_lessons, get_student_info
@@ -31,7 +31,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the calendar platform for entity."""
     client = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/vultr/__init__.py b/homeassistant/components/vultr/__init__.py
index 36f43cf0ac0..66527bf458e 100644
--- a/homeassistant/components/vultr/__init__.py
+++ b/homeassistant/components/vultr/__init__.py
@@ -9,7 +9,7 @@ from vultr import Vultr as VultrAPI
 from homeassistant.components import persistent_notification
 from homeassistant.const import CONF_API_KEY, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import Throttle
 
diff --git a/homeassistant/components/vultr/binary_sensor.py b/homeassistant/components/vultr/binary_sensor.py
index 6a697eebe11..3972de8a625 100644
--- a/homeassistant/components/vultr/binary_sensor.py
+++ b/homeassistant/components/vultr/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/vultr/sensor.py b/homeassistant/components/vultr/sensor.py
index 843aa416297..c392c382cbd 100644
--- a/homeassistant/components/vultr/sensor.py
+++ b/homeassistant/components/vultr/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_MONITORED_CONDITIONS, CONF_NAME, UnitOfInformation
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/vultr/switch.py b/homeassistant/components/vultr/switch.py
index b03d613895a..0b1f2247684 100644
--- a/homeassistant/components/vultr/switch.py
+++ b/homeassistant/components/vultr/switch.py
@@ -13,7 +13,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/w800rf32/__init__.py b/homeassistant/components/w800rf32/__init__.py
index 62b9ba810d9..7dab0b137c5 100644
--- a/homeassistant/components/w800rf32/__init__.py
+++ b/homeassistant/components/w800rf32/__init__.py
@@ -11,7 +11,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import dispatcher_send
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/wake_on_lan/__init__.py b/homeassistant/components/wake_on_lan/__init__.py
index efd72c4564c..d68d950e641 100644
--- a/homeassistant/components/wake_on_lan/__init__.py
+++ b/homeassistant/components/wake_on_lan/__init__.py
@@ -9,7 +9,7 @@ import wakeonlan
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_BROADCAST_ADDRESS, CONF_BROADCAST_PORT, CONF_MAC
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN, PLATFORMS
diff --git a/homeassistant/components/wake_on_lan/button.py b/homeassistant/components/wake_on_lan/button.py
index 4d6b19bdd8e..e9cf69b1fe7 100644
--- a/homeassistant/components/wake_on_lan/button.py
+++ b/homeassistant/components/wake_on_lan/button.py
@@ -13,7 +13,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_BROADCAST_ADDRESS, CONF_BROADCAST_PORT, CONF_MAC
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -21,7 +21,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Wake on LAN button entry."""
     broadcast_address: str | None = entry.options.get(CONF_BROADCAST_ADDRESS)
diff --git a/homeassistant/components/wake_on_lan/switch.py b/homeassistant/components/wake_on_lan/switch.py
index fcf8936d498..16df34c1d1b 100644
--- a/homeassistant/components/wake_on_lan/switch.py
+++ b/homeassistant/components/wake_on_lan/switch.py
@@ -21,8 +21,7 @@ from homeassistant.const import (
     CONF_NAME,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.script import Script
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/wallbox/__init__.py b/homeassistant/components/wallbox/__init__.py
index b2f8ac7fd5d..fc8c6e00e84 100644
--- a/homeassistant/components/wallbox/__init__.py
+++ b/homeassistant/components/wallbox/__init__.py
@@ -9,7 +9,7 @@ from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 
-from .const import CONF_STATION, DOMAIN, UPDATE_INTERVAL
+from .const import DOMAIN, UPDATE_INTERVAL
 from .coordinator import InvalidAuth, WallboxCoordinator, async_validate_input
 
 PLATFORMS = [Platform.LOCK, Platform.NUMBER, Platform.SENSOR, Platform.SWITCH]
@@ -27,11 +27,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     except InvalidAuth as ex:
         raise ConfigEntryAuthFailed from ex
 
-    wallbox_coordinator = WallboxCoordinator(
-        entry.data[CONF_STATION],
-        wallbox,
-        hass,
-    )
+    wallbox_coordinator = WallboxCoordinator(hass, entry, wallbox)
     await wallbox_coordinator.async_config_entry_first_refresh()
 
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = wallbox_coordinator
diff --git a/homeassistant/components/wallbox/coordinator.py b/homeassistant/components/wallbox/coordinator.py
index 99c565d9c0c..4f20f5c406d 100644
--- a/homeassistant/components/wallbox/coordinator.py
+++ b/homeassistant/components/wallbox/coordinator.py
@@ -11,6 +11,7 @@ from typing import Any, Concatenate
 import requests
 from wallbox import Wallbox
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, HomeAssistantError
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
@@ -28,6 +29,7 @@ from .const import (
     CHARGER_STATUS_DESCRIPTION_KEY,
     CHARGER_STATUS_ID_KEY,
     CODE_KEY,
+    CONF_STATION,
     DOMAIN,
     UPDATE_INTERVAL,
     ChargerStatus,
@@ -107,14 +109,19 @@ async def async_validate_input(hass: HomeAssistant, wallbox: Wallbox) -> None:
 class WallboxCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Wallbox Coordinator class."""
 
-    def __init__(self, station: str, wallbox: Wallbox, hass: HomeAssistant) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, wallbox: Wallbox
+    ) -> None:
         """Initialize."""
-        self._station = station
+        self._station = config_entry.data[CONF_STATION]
         self._wallbox = wallbox
 
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=UPDATE_INTERVAL),
         )
diff --git a/homeassistant/components/wallbox/lock.py b/homeassistant/components/wallbox/lock.py
index 4853a9104f2..ef35734ed7e 100644
--- a/homeassistant/components/wallbox/lock.py
+++ b/homeassistant/components/wallbox/lock.py
@@ -8,7 +8,7 @@ from homeassistant.components.lock import LockEntity, LockEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CHARGER_DATA_KEY,
@@ -28,7 +28,9 @@ LOCK_TYPES: dict[str, LockEntityDescription] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create wallbox lock entities in HASS."""
     coordinator: WallboxCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/wallbox/manifest.json b/homeassistant/components/wallbox/manifest.json
index 63102646508..d217a018303 100644
--- a/homeassistant/components/wallbox/manifest.json
+++ b/homeassistant/components/wallbox/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/wallbox",
   "iot_class": "cloud_polling",
   "loggers": ["wallbox"],
-  "requirements": ["wallbox==0.7.0"]
+  "requirements": ["wallbox==0.8.0"]
 }
diff --git a/homeassistant/components/wallbox/number.py b/homeassistant/components/wallbox/number.py
index 24cdd16f99d..a5880f6e0f7 100644
--- a/homeassistant/components/wallbox/number.py
+++ b/homeassistant/components/wallbox/number.py
@@ -13,7 +13,7 @@ from homeassistant.components.number import NumberEntity, NumberEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     BIDIRECTIONAL_MODEL_PREFIXES,
@@ -71,9 +71,7 @@ NUMBER_TYPES: dict[str, WallboxNumberEntityDescription] = {
     CHARGER_MAX_ICP_CURRENT_KEY: WallboxNumberEntityDescription(
         key=CHARGER_MAX_ICP_CURRENT_KEY,
         translation_key="maximum_icp_current",
-        max_value_fn=lambda coordinator: cast(
-            float, coordinator.data[CHARGER_MAX_AVAILABLE_POWER_KEY]
-        ),
+        max_value_fn=lambda _: 255,
         min_value_fn=lambda _: 6,
         set_value_fn=lambda coordinator: coordinator.async_set_icp_current,
         native_step=1,
@@ -82,7 +80,9 @@ NUMBER_TYPES: dict[str, WallboxNumberEntityDescription] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create wallbox number entities in HASS."""
     coordinator: WallboxCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/wallbox/sensor.py b/homeassistant/components/wallbox/sensor.py
index 18d8afb5612..78b26520bec 100644
--- a/homeassistant/components/wallbox/sensor.py
+++ b/homeassistant/components/wallbox/sensor.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     UnitOfPower,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .const import (
@@ -157,7 +157,9 @@ SENSOR_TYPES: dict[str, WallboxSensorEntityDescription] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create wallbox sensor entities in HASS."""
     coordinator: WallboxCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/wallbox/switch.py b/homeassistant/components/wallbox/switch.py
index 06c2674579d..30275951ab2 100644
--- a/homeassistant/components/wallbox/switch.py
+++ b/homeassistant/components/wallbox/switch.py
@@ -7,7 +7,7 @@ from typing import Any
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CHARGER_DATA_KEY,
@@ -29,7 +29,9 @@ SWITCH_TYPES: dict[str, SwitchEntityDescription] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Create wallbox sensor entities in HASS."""
     coordinator: WallboxCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/waqi/__init__.py b/homeassistant/components/waqi/__init__.py
index e9feca75ee7..9821b5435d9 100644
--- a/homeassistant/components/waqi/__init__.py
+++ b/homeassistant/components/waqi/__init__.py
@@ -21,7 +21,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     client = WAQIClient(session=async_get_clientsession(hass))
     client.authenticate(entry.data[CONF_API_KEY])
 
-    waqi_coordinator = WAQIDataUpdateCoordinator(hass, client)
+    waqi_coordinator = WAQIDataUpdateCoordinator(hass, entry, client)
     await waqi_coordinator.async_config_entry_first_refresh()
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = waqi_coordinator
 
diff --git a/homeassistant/components/waqi/coordinator.py b/homeassistant/components/waqi/coordinator.py
index d1a44e9f5b8..86f553a86cd 100644
--- a/homeassistant/components/waqi/coordinator.py
+++ b/homeassistant/components/waqi/coordinator.py
@@ -18,11 +18,14 @@ class WAQIDataUpdateCoordinator(DataUpdateCoordinator[WAQIAirQuality]):
 
     config_entry: ConfigEntry
 
-    def __init__(self, hass: HomeAssistant, client: WAQIClient) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, client: WAQIClient
+    ) -> None:
         """Initialize the WAQI data coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(minutes=5),
         )
diff --git a/homeassistant/components/waqi/sensor.py b/homeassistant/components/waqi/sensor.py
index 4c921c68336..59daf60392e 100644
--- a/homeassistant/components/waqi/sensor.py
+++ b/homeassistant/components/waqi/sensor.py
@@ -19,7 +19,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, UnitOfPressure, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -138,7 +138,9 @@ SENSORS: list[WAQISensorEntityDescription] = [
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the WAQI sensor."""
     coordinator: WAQIDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/waqi/strings.json b/homeassistant/components/waqi/strings.json
index a1feb217249..f455e3ead33 100644
--- a/homeassistant/components/waqi/strings.json
+++ b/homeassistant/components/waqi/strings.json
@@ -57,7 +57,7 @@
         "name": "[%key:component::sensor::entity_component::pm25::name%]"
       },
       "neph": {
-        "name": "Visbility using nephelometry"
+        "name": "Visibility using nephelometry"
       },
       "dominant_pollutant": {
         "name": "Dominant pollutant",
diff --git a/homeassistant/components/water_heater/__init__.py b/homeassistant/components/water_heater/__init__.py
index 3e1387cb714..f2038def79c 100644
--- a/homeassistant/components/water_heater/__init__.py
+++ b/homeassistant/components/water_heater/__init__.py
@@ -25,7 +25,12 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.deprecation import deprecated_class
+from homeassistant.helpers.deprecation import (
+    DeprecatedConstant,
+    all_with_deprecated_constants,
+    check_if_deprecated_constant,
+    dir_with_deprecated_constants,
+)
 from homeassistant.helpers.entity import Entity, EntityDescription
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.temperature import display_temp as show_temp
@@ -72,6 +77,7 @@ ATTR_OPERATION_MODE = "operation_mode"
 ATTR_OPERATION_LIST = "operation_list"
 ATTR_TARGET_TEMP_HIGH = "target_temp_high"
 ATTR_TARGET_TEMP_LOW = "target_temp_low"
+ATTR_TARGET_TEMP_STEP = "target_temp_step"
 ATTR_CURRENT_TEMPERATURE = "current_temperature"
 
 CONVERTIBLE_ATTRIBUTE = [ATTR_TEMPERATURE]
@@ -134,11 +140,11 @@ class WaterHeaterEntityDescription(EntityDescription, frozen_or_thawed=True):
     """A class that describes water heater entities."""
 
 
-@deprecated_class("WaterHeaterEntityDescription", breaks_in_ha_version="2026.1")
-class WaterHeaterEntityEntityDescription(
-    WaterHeaterEntityDescription, frozen_or_thawed=True
-):
-    """A (deprecated) class that describes water heater entities."""
+_DEPRECATED_WaterHeaterEntityEntityDescription = DeprecatedConstant(
+    WaterHeaterEntityDescription,
+    "WaterHeaterEntityDescription",
+    breaks_in_ha_version="2026.1",
+)
 
 
 CACHED_PROPERTIES_WITH_ATTR_ = {
@@ -149,6 +155,7 @@ CACHED_PROPERTIES_WITH_ATTR_ = {
     "target_temperature",
     "target_temperature_high",
     "target_temperature_low",
+    "target_temperature_step",
     "is_away_mode_on",
 }
 
@@ -157,7 +164,12 @@ class WaterHeaterEntity(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
     """Base class for water heater entities."""
 
     _entity_component_unrecorded_attributes = frozenset(
-        {ATTR_OPERATION_LIST, ATTR_MIN_TEMP, ATTR_MAX_TEMP}
+        {
+            ATTR_OPERATION_LIST,
+            ATTR_MIN_TEMP,
+            ATTR_MAX_TEMP,
+            ATTR_TARGET_TEMP_STEP,
+        }
     )
 
     entity_description: WaterHeaterEntityDescription
@@ -174,6 +186,7 @@ class WaterHeaterEntity(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
     _attr_target_temperature_low: float | None = None
     _attr_target_temperature: float | None = None
     _attr_temperature_unit: str
+    _attr_target_temperature_step: float | None = None
 
     @final
     @property
@@ -201,6 +214,8 @@ class WaterHeaterEntity(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
                 self.hass, self.max_temp, self.temperature_unit, self.precision
             ),
         }
+        if target_temperature_step := self.target_temperature_step:
+            data[ATTR_TARGET_TEMP_STEP] = target_temperature_step
 
         if WaterHeaterEntityFeature.OPERATION_MODE in self.supported_features:
             data[ATTR_OPERATION_LIST] = self.operation_list
@@ -284,6 +299,11 @@ class WaterHeaterEntity(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
         """Return the lowbound target temperature we try to reach."""
         return self._attr_target_temperature_low
 
+    @cached_property
+    def target_temperature_step(self) -> float | None:
+        """Return the supported step of target temperature."""
+        return self._attr_target_temperature_step
+
     @cached_property
     def is_away_mode_on(self) -> bool | None:
         """Return true if away mode is on."""
@@ -414,3 +434,11 @@ async def async_service_temperature_set(
             kwargs[value] = temp
 
     await entity.async_set_temperature(**kwargs)
+
+
+# These can be removed if no deprecated constant are in this module anymore
+__getattr__ = ft.partial(check_if_deprecated_constant, module_globals=globals())
+__dir__ = ft.partial(
+    dir_with_deprecated_constants, module_globals_keys=[*globals().keys()]
+)
+__all__ = all_with_deprecated_constants(globals())
diff --git a/homeassistant/components/water_heater/device_action.py b/homeassistant/components/water_heater/device_action.py
index 49cfc7e9a07..d68919ff8f3 100644
--- a/homeassistant/components/water_heater/device_action.py
+++ b/homeassistant/components/water_heater/device_action.py
@@ -15,8 +15,7 @@ from homeassistant.const import (
     SERVICE_TURN_ON,
 )
 from homeassistant.core import Context, HomeAssistant
-from homeassistant.helpers import entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
 
 from . import DOMAIN
diff --git a/homeassistant/components/watergate/__init__.py b/homeassistant/components/watergate/__init__.py
index fa761110339..fd591215d8b 100644
--- a/homeassistant/components/watergate/__init__.py
+++ b/homeassistant/components/watergate/__init__.py
@@ -16,12 +16,12 @@ from homeassistant.components.webhook import (
     async_generate_url,
     async_register,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_IP_ADDRESS, CONF_WEBHOOK_ID, Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.dispatcher import async_dispatcher_send
 
-from .const import DOMAIN
-from .coordinator import WatergateDataCoordinator
+from .const import AUTO_SHUT_OFF_EVENT_NAME, DOMAIN
+from .coordinator import WatergateConfigEntry, WatergateDataCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -29,14 +29,14 @@ WEBHOOK_TELEMETRY_TYPE = "telemetry"
 WEBHOOK_VALVE_TYPE = "valve"
 WEBHOOK_WIFI_CHANGED_TYPE = "wifi-changed"
 WEBHOOK_POWER_SUPPLY_CHANGED_TYPE = "power-supply-changed"
+WEBHOOK_AUTO_SHUT_OFF = "auto-shut-off-report"
 
 PLATFORMS: list[Platform] = [
+    Platform.EVENT,
     Platform.SENSOR,
     Platform.VALVE,
 ]
 
-type WatergateConfigEntry = ConfigEntry[WatergateDataCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: WatergateConfigEntry) -> bool:
     """Set up Watergate from a config entry."""
@@ -52,7 +52,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: WatergateConfigEntry) ->
         sonic_address if sonic_address.startswith("http") else f"http://{sonic_address}"
     )
 
-    coordinator = WatergateDataCoordinator(hass, watergate_client)
+    coordinator = WatergateDataCoordinator(hass, entry, watergate_client)
     entry.runtime_data = coordinator
 
     async_register(
@@ -123,6 +123,10 @@ def get_webhook_handler(
             coordinator_data.networking.rssi = data.rssi
         elif body_type == WEBHOOK_POWER_SUPPLY_CHANGED_TYPE:
             coordinator_data.state.power_supply = data.supply
+        elif body_type == WEBHOOK_AUTO_SHUT_OFF:
+            async_dispatcher_send(
+                hass, AUTO_SHUT_OFF_EVENT_NAME.format(data.type.lower()), data
+            )
 
         coordinator.async_set_updated_data(coordinator_data)
 
diff --git a/homeassistant/components/watergate/const.py b/homeassistant/components/watergate/const.py
index 22a14330af9..c6726d9185f 100644
--- a/homeassistant/components/watergate/const.py
+++ b/homeassistant/components/watergate/const.py
@@ -3,3 +3,5 @@
 DOMAIN = "watergate"
 
 MANUFACTURER = "Watergate"
+
+AUTO_SHUT_OFF_EVENT_NAME = "watergate_{}"
diff --git a/homeassistant/components/watergate/coordinator.py b/homeassistant/components/watergate/coordinator.py
index 1d83b7a3ccb..e3f198c144d 100644
--- a/homeassistant/components/watergate/coordinator.py
+++ b/homeassistant/components/watergate/coordinator.py
@@ -7,6 +7,7 @@ import logging
 from watergate_local_api import WatergateApiException, WatergateLocalApiClient
 from watergate_local_api.models import DeviceState, NetworkingData, TelemetryData
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -24,14 +25,25 @@ class WatergateAgregatedRequests:
     networking: NetworkingData
 
 
+type WatergateConfigEntry = ConfigEntry[WatergateDataCoordinator]
+
+
 class WatergateDataCoordinator(DataUpdateCoordinator[WatergateAgregatedRequests]):
     """Class to manage fetching watergate data."""
 
-    def __init__(self, hass: HomeAssistant, api: WatergateLocalApiClient) -> None:
+    config_entry: WatergateConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: WatergateConfigEntry,
+        api: WatergateLocalApiClient,
+    ) -> None:
         """Initialize."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(minutes=2),
         )
diff --git a/homeassistant/components/watergate/event.py b/homeassistant/components/watergate/event.py
new file mode 100644
index 00000000000..cf2447df4b3
--- /dev/null
+++ b/homeassistant/components/watergate/event.py
@@ -0,0 +1,78 @@
+"""Module contains the AutoShutOffEvent class for handling auto shut off events."""
+
+from watergate_local_api.models.auto_shut_off_report import AutoShutOffReport
+
+from homeassistant.components.event import EventEntity, EventEntityDescription
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import WatergateConfigEntry
+from .const import AUTO_SHUT_OFF_EVENT_NAME
+from .coordinator import WatergateDataCoordinator
+from .entity import WatergateEntity
+
+VOLUME_AUTO_SHUT_OFF = "volume_threshold"
+DURATION_AUTO_SHUT_OFF = "duration_threshold"
+
+
+DESCRIPTIONS: list[EventEntityDescription] = [
+    EventEntityDescription(
+        translation_key="auto_shut_off_volume",
+        key="auto_shut_off_volume",
+        event_types=[VOLUME_AUTO_SHUT_OFF],
+    ),
+    EventEntityDescription(
+        translation_key="auto_shut_off_duration",
+        key="auto_shut_off_duration",
+        event_types=[DURATION_AUTO_SHUT_OFF],
+    ),
+]
+
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: WatergateConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up Event entities from config entry."""
+
+    coordinator = config_entry.runtime_data
+
+    async_add_entities(
+        AutoShutOffEvent(coordinator, description) for description in DESCRIPTIONS
+    )
+
+
+class AutoShutOffEvent(WatergateEntity, EventEntity):
+    """Event for Auto Shut Off."""
+
+    def __init__(
+        self,
+        coordinator: WatergateDataCoordinator,
+        entity_description: EventEntityDescription,
+    ) -> None:
+        """Initialize Auto Shut Off Entity."""
+        super().__init__(coordinator, entity_description.key)
+        self.entity_description = entity_description
+
+    async def async_added_to_hass(self):
+        """Register the callback for event handling when the entity is added."""
+        await super().async_added_to_hass()
+        self.async_on_remove(
+            async_dispatcher_connect(
+                self.hass,
+                AUTO_SHUT_OFF_EVENT_NAME.format(self.event_types[0]),
+                self._async_handle_event,
+            )
+        )
+
+    @callback
+    def _async_handle_event(self, event: AutoShutOffReport) -> None:
+        self._trigger_event(
+            event.type.lower(),
+            {"volume": event.volume, "duration": event.duration},
+        )
+        self.async_write_ha_state()
diff --git a/homeassistant/components/watergate/icons.json b/homeassistant/components/watergate/icons.json
new file mode 100644
index 00000000000..28a0bfbc825
--- /dev/null
+++ b/homeassistant/components/watergate/icons.json
@@ -0,0 +1,12 @@
+{
+  "entity": {
+    "event": {
+      "auto_shut_off_volume": {
+        "default": "mdi:water"
+      },
+      "auto_shut_off_duration": {
+        "default": "mdi:timelapse"
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/watergate/quality_scale.yaml b/homeassistant/components/watergate/quality_scale.yaml
index b116eff970e..73a39bd5264 100644
--- a/homeassistant/components/watergate/quality_scale.yaml
+++ b/homeassistant/components/watergate/quality_scale.yaml
@@ -17,10 +17,7 @@ rules:
   docs-high-level-description: done
   docs-installation-instructions: done
   docs-removal-instructions: done
-  entity-event-setup:
-    status: exempt
-    comment: |
-      Entities of this integration does not explicitly subscribe to events.
+  entity-event-setup: done
   entity-unique-id: done
   has-entity-name: done
   runtime-data: done
diff --git a/homeassistant/components/watergate/sensor.py b/homeassistant/components/watergate/sensor.py
index 6782a93541b..5aced8b7488 100644
--- a/homeassistant/components/watergate/sensor.py
+++ b/homeassistant/components/watergate/sensor.py
@@ -22,12 +22,15 @@ from homeassistant.const import (
     UnitOfVolume,
     UnitOfVolumeFlowRate,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util import dt as dt_util
 
-from . import WatergateConfigEntry
-from .coordinator import WatergateAgregatedRequests, WatergateDataCoordinator
+from .coordinator import (
+    WatergateAgregatedRequests,
+    WatergateConfigEntry,
+    WatergateDataCoordinator,
+)
 from .entity import WatergateEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -179,7 +182,7 @@ DESCRIPTIONS: list[WatergateSensorEntityDescription] = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: WatergateConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up all entries for Watergate Platform."""
 
diff --git a/homeassistant/components/watergate/strings.json b/homeassistant/components/watergate/strings.json
index c312525e420..634e05e7973 100644
--- a/homeassistant/components/watergate/strings.json
+++ b/homeassistant/components/watergate/strings.json
@@ -19,6 +19,42 @@
     }
   },
   "entity": {
+    "event": {
+      "auto_shut_off_volume": {
+        "name": "Volume auto shut-off",
+        "state_attributes": {
+          "event_type": {
+            "state": {
+              "volume_threshold": "Volume",
+              "duration_threshold": "Duration"
+            }
+          },
+          "volume": {
+            "name": "[%key:component::watergate::entity::event::auto_shut_off_volume::state_attributes::event_type::state::volume_threshold%]"
+          },
+          "duration": {
+            "name": "[%key:component::watergate::entity::event::auto_shut_off_volume::state_attributes::event_type::state::duration_threshold%]"
+          }
+        }
+      },
+      "auto_shut_off_duration": {
+        "name": "Duration auto shut-off",
+        "state_attributes": {
+          "event_type": {
+            "state": {
+              "volume_threshold": "[%key:component::watergate::entity::event::auto_shut_off_volume::state_attributes::event_type::state::volume_threshold%]",
+              "duration_threshold": "[%key:component::watergate::entity::event::auto_shut_off_volume::state_attributes::event_type::state::duration_threshold%]"
+            }
+          },
+          "volume": {
+            "name": "[%key:component::watergate::entity::event::auto_shut_off_volume::state_attributes::event_type::state::volume_threshold%]"
+          },
+          "duration": {
+            "name": "[%key:component::watergate::entity::event::auto_shut_off_volume::state_attributes::event_type::state::duration_threshold%]"
+          }
+        }
+      }
+    },
     "sensor": {
       "water_meter_volume": {
         "name": "Water meter volume"
diff --git a/homeassistant/components/watergate/valve.py b/homeassistant/components/watergate/valve.py
index 556b53e1d3c..cb6bfa7bd59 100644
--- a/homeassistant/components/watergate/valve.py
+++ b/homeassistant/components/watergate/valve.py
@@ -8,10 +8,9 @@ from homeassistant.components.valve import (
     ValveState,
 )
 from homeassistant.core import callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import WatergateConfigEntry
-from .coordinator import WatergateDataCoordinator
+from .coordinator import WatergateConfigEntry, WatergateDataCoordinator
 from .entity import WatergateEntity
 
 ENTITY_NAME = "valve"
@@ -21,7 +20,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: WatergateConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up all entries for Watergate Platform."""
 
diff --git a/homeassistant/components/watson_iot/__init__.py b/homeassistant/components/watson_iot/__init__.py
index de8c85f5ff0..0130b53930b 100644
--- a/homeassistant/components/watson_iot/__init__.py
+++ b/homeassistant/components/watson_iot/__init__.py
@@ -23,8 +23,7 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import state as state_helper
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, state as state_helper
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/watson_tts/tts.py b/homeassistant/components/watson_tts/tts.py
index 373d17438c9..194e0905ff0 100644
--- a/homeassistant/components/watson_tts/tts.py
+++ b/homeassistant/components/watson_tts/tts.py
@@ -10,7 +10,7 @@ from homeassistant.components.tts import (
     PLATFORM_SCHEMA as TTS_PLATFORM_SCHEMA,
     Provider,
 )
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/watttime/sensor.py b/homeassistant/components/watttime/sensor.py
index c6cc81580d7..d3aa9d8f895 100644
--- a/homeassistant/components/watttime/sensor.py
+++ b/homeassistant/components/watttime/sensor.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
@@ -52,7 +52,9 @@ REALTIME_EMISSIONS_SENSOR_DESCRIPTIONS = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up WattTime sensors based on a config entry."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/waze_travel_time/__init__.py b/homeassistant/components/waze_travel_time/__init__.py
index 34f22c9218f..3a91690ef07 100644
--- a/homeassistant/components/waze_travel_time/__init__.py
+++ b/homeassistant/components/waze_travel_time/__init__.py
@@ -17,6 +17,7 @@ from homeassistant.core import (
     SupportsResponse,
 )
 from homeassistant.helpers.httpx_client import get_async_client
+from homeassistant.helpers.location import find_coordinates
 from homeassistant.helpers.selector import (
     BooleanSelector,
     SelectSelector,
@@ -115,10 +116,21 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
         client = WazeRouteCalculator(
             region=service.data[CONF_REGION].upper(), client=httpx_client
         )
+
+        origin_coordinates = find_coordinates(hass, service.data[CONF_ORIGIN])
+        destination_coordinates = find_coordinates(hass, service.data[CONF_DESTINATION])
+
+        origin = origin_coordinates if origin_coordinates else service.data[CONF_ORIGIN]
+        destination = (
+            destination_coordinates
+            if destination_coordinates
+            else service.data[CONF_DESTINATION]
+        )
+
         response = await async_get_travel_times(
             client=client,
-            origin=service.data[CONF_ORIGIN],
-            destination=service.data[CONF_DESTINATION],
+            origin=origin,
+            destination=destination,
             vehicle_type=service.data[CONF_VEHICLE_TYPE],
             avoid_toll_roads=service.data[CONF_AVOID_TOLL_ROADS],
             avoid_subscription_roads=service.data[CONF_AVOID_SUBSCRIPTION_ROADS],
diff --git a/homeassistant/components/waze_travel_time/sensor.py b/homeassistant/components/waze_travel_time/sensor.py
index a216a02f61e..1f21cc2ea78 100644
--- a/homeassistant/components/waze_travel_time/sensor.py
+++ b/homeassistant/components/waze_travel_time/sensor.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import CoreState, HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.httpx_client import get_async_client
 from homeassistant.helpers.location import find_coordinates
 
@@ -57,7 +57,7 @@ SECONDS_BETWEEN_API_CALLS = 0.5
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Waze travel time sensor entry."""
     destination = config_entry.data[CONF_DESTINATION]
diff --git a/homeassistant/components/weather/strings.json b/homeassistant/components/weather/strings.json
index 85d331f5bd0..31e644b32e3 100644
--- a/homeassistant/components/weather/strings.json
+++ b/homeassistant/components/weather/strings.json
@@ -90,17 +90,17 @@
   "services": {
     "get_forecasts": {
       "name": "Get forecasts",
-      "description": "Get weather forecasts.",
+      "description": "Retrieves the forecast from selected weather services.",
       "fields": {
         "type": {
           "name": "Forecast type",
-          "description": "Forecast type: daily, hourly or twice daily."
+          "description": "The scope of the weather forecast."
         }
       }
     },
     "get_forecast": {
       "name": "Get forecast",
-      "description": "Get weather forecast.",
+      "description": "Retrieves the forecast from a selected weather service.",
       "fields": {
         "type": {
           "name": "[%key:component::weather::services::get_forecasts::fields::type::name%]",
@@ -111,12 +111,12 @@
   },
   "issues": {
     "deprecated_service_weather_get_forecast": {
-      "title": "Detected use of deprecated service weather.get_forecast",
+      "title": "Detected use of deprecated action weather.get_forecast",
       "fix_flow": {
         "step": {
           "confirm": {
             "title": "[%key:component::weather::issues::deprecated_service_weather_get_forecast::title%]",
-            "description": "Use `weather.get_forecasts` instead which supports multiple entities.\n\nPlease replace this service and adjust your automations and scripts and select **Submit** to close this issue."
+            "description": "Use `weather.get_forecasts` instead which supports multiple entities.\n\nPlease replace this action and adjust your automations and scripts and select **Submit** to close this issue."
           }
         }
       }
diff --git a/homeassistant/components/weatherflow/sensor.py b/homeassistant/components/weatherflow/sensor.py
index cacede55c42..10c04b3283b 100644
--- a/homeassistant/components/weatherflow/sensor.py
+++ b/homeassistant/components/weatherflow/sensor.py
@@ -40,7 +40,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util.unit_system import METRIC_SYSTEM
 
@@ -267,16 +267,17 @@ SENSORS: tuple[WeatherFlowSensorEntityDescription, ...] = (
     WeatherFlowSensorEntityDescription(
         key="wind_direction",
         translation_key="wind_direction",
+        device_class=SensorDeviceClass.WIND_DIRECTION,
+        state_class=SensorStateClass.MEASUREMENT_ANGLE,
         native_unit_of_measurement=DEGREE,
-        state_class=SensorStateClass.MEASUREMENT,
         event_subscriptions=[EVENT_RAPID_WIND, EVENT_OBSERVATION],
         raw_data_conv_fn=lambda raw_data: raw_data.magnitude,
     ),
     WeatherFlowSensorEntityDescription(
         key="wind_direction_average",
         translation_key="wind_direction_average",
+        device_class=SensorDeviceClass.WIND_DIRECTION,
         native_unit_of_measurement=DEGREE,
-        state_class=SensorStateClass.MEASUREMENT,
         raw_data_conv_fn=lambda raw_data: raw_data.magnitude,
     ),
 )
@@ -285,7 +286,7 @@ SENSORS: tuple[WeatherFlowSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up WeatherFlow sensors using config entry."""
 
diff --git a/homeassistant/components/weatherflow_cloud/__init__.py b/homeassistant/components/weatherflow_cloud/__init__.py
index 8dc26f9b9c6..94c65b7c0a1 100644
--- a/homeassistant/components/weatherflow_cloud/__init__.py
+++ b/homeassistant/components/weatherflow_cloud/__init__.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_API_TOKEN, Platform
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
 from .const import DOMAIN
@@ -15,10 +15,7 @@ PLATFORMS: list[Platform] = [Platform.SENSOR, Platform.WEATHER]
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up WeatherFlowCloud from a config entry."""
 
-    data_coordinator = WeatherFlowCloudDataUpdateCoordinator(
-        hass=hass,
-        api_token=entry.data[CONF_API_TOKEN],
-    )
+    data_coordinator = WeatherFlowCloudDataUpdateCoordinator(hass, entry)
     await data_coordinator.async_config_entry_first_refresh()
 
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = data_coordinator
diff --git a/homeassistant/components/weatherflow_cloud/coordinator.py b/homeassistant/components/weatherflow_cloud/coordinator.py
index 8b8a916262f..b6d2bfd5af2 100644
--- a/homeassistant/components/weatherflow_cloud/coordinator.py
+++ b/homeassistant/components/weatherflow_cloud/coordinator.py
@@ -6,6 +6,8 @@ from aiohttp import ClientResponseError
 from weatherflow4py.api import WeatherFlowRestAPI
 from weatherflow4py.models.rest.unified import WeatherFlowDataREST
 
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_API_TOKEN
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -18,12 +20,17 @@ class WeatherFlowCloudDataUpdateCoordinator(
 ):
     """Class to manage fetching REST Based WeatherFlow Forecast data."""
 
-    def __init__(self, hass: HomeAssistant, api_token: str) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
         """Initialize global WeatherFlow forecast data updater."""
-        self.weather_api = WeatherFlowRestAPI(api_token=api_token)
+        self.weather_api = WeatherFlowRestAPI(
+            api_token=config_entry.data[CONF_API_TOKEN]
+        )
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=60),
         )
diff --git a/homeassistant/components/weatherflow_cloud/manifest.json b/homeassistant/components/weatherflow_cloud/manifest.json
index 98c98cfbac7..9ffa457a355 100644
--- a/homeassistant/components/weatherflow_cloud/manifest.json
+++ b/homeassistant/components/weatherflow_cloud/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/weatherflow_cloud",
   "iot_class": "cloud_polling",
   "loggers": ["weatherflow4py"],
-  "requirements": ["weatherflow4py==1.0.6"]
+  "requirements": ["weatherflow4py==1.3.1"]
 }
diff --git a/homeassistant/components/weatherflow_cloud/sensor.py b/homeassistant/components/weatherflow_cloud/sensor.py
index aeab955878f..d2c62b5f281 100644
--- a/homeassistant/components/weatherflow_cloud/sensor.py
+++ b/homeassistant/components/weatherflow_cloud/sensor.py
@@ -17,7 +17,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfLength, UnitOfPressure, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .const import DOMAIN
@@ -172,7 +172,7 @@ WF_SENSORS: tuple[WeatherFlowCloudSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up WeatherFlow sensors based on a config entry."""
 
diff --git a/homeassistant/components/weatherflow_cloud/strings.json b/homeassistant/components/weatherflow_cloud/strings.json
index f707cbb0353..d22c62a030c 100644
--- a/homeassistant/components/weatherflow_cloud/strings.json
+++ b/homeassistant/components/weatherflow_cloud/strings.json
@@ -4,7 +4,7 @@
       "user": {
         "description": "Set up a WeatherFlow Forecast Station",
         "data": {
-          "api_token": "Personal api token"
+          "api_token": "Personal API token"
         }
       },
       "reauth_confirm": {
diff --git a/homeassistant/components/weatherflow_cloud/weather.py b/homeassistant/components/weatherflow_cloud/weather.py
index c475f2974a9..3cb1f477095 100644
--- a/homeassistant/components/weatherflow_cloud/weather.py
+++ b/homeassistant/components/weatherflow_cloud/weather.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, STATE_MAP
 from .coordinator import WeatherFlowCloudDataUpdateCoordinator
@@ -27,7 +27,7 @@ from .entity import WeatherFlowCloudEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add a weather entity from a config_entry."""
     coordinator: WeatherFlowCloudDataUpdateCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/weatherkit/__init__.py b/homeassistant/components/weatherkit/__init__.py
index 49158182696..4cbac2b32d8 100644
--- a/homeassistant/components/weatherkit/__init__.py
+++ b/homeassistant/components/weatherkit/__init__.py
@@ -32,6 +32,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     hass.data.setdefault(DOMAIN, {})
     coordinator = WeatherKitDataUpdateCoordinator(
         hass=hass,
+        config_entry=entry,
         client=WeatherKitApiClient(
             key_id=entry.data[CONF_KEY_ID],
             service_id=entry.data[CONF_SERVICE_ID],
diff --git a/homeassistant/components/weatherkit/coordinator.py b/homeassistant/components/weatherkit/coordinator.py
index 6438d7503db..6c7119d6fb0 100644
--- a/homeassistant/components/weatherkit/coordinator.py
+++ b/homeassistant/components/weatherkit/coordinator.py
@@ -33,6 +33,7 @@ class WeatherKitDataUpdateCoordinator(DataUpdateCoordinator):
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         client: WeatherKitApiClient,
     ) -> None:
         """Initialize."""
@@ -40,6 +41,7 @@ class WeatherKitDataUpdateCoordinator(DataUpdateCoordinator):
         super().__init__(
             hass=hass,
             logger=LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(minutes=5),
         )
diff --git a/homeassistant/components/weatherkit/sensor.py b/homeassistant/components/weatherkit/sensor.py
index d9c17bb855a..b3639fa5356 100644
--- a/homeassistant/components/weatherkit/sensor.py
+++ b/homeassistant/components/weatherkit/sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfVolumetricFlux
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -36,7 +36,7 @@ SENSORS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add sensor entities from a config_entry."""
     coordinator: WeatherKitDataUpdateCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/weatherkit/weather.py b/homeassistant/components/weatherkit/weather.py
index 98816d520ba..b57e488d06a 100644
--- a/homeassistant/components/weatherkit/weather.py
+++ b/homeassistant/components/weatherkit/weather.py
@@ -29,7 +29,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     ATTR_CURRENT_WEATHER,
@@ -45,7 +45,7 @@ from .entity import WeatherKitEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add a weather entity from a config_entry."""
     coordinator: WeatherKitDataUpdateCoordinator = hass.data[DOMAIN][
diff --git a/homeassistant/components/webdav/__init__.py b/homeassistant/components/webdav/__init__.py
new file mode 100644
index 00000000000..36a03dce4d7
--- /dev/null
+++ b/homeassistant/components/webdav/__init__.py
@@ -0,0 +1,75 @@
+"""The WebDAV integration."""
+
+from __future__ import annotations
+
+import logging
+
+from aiowebdav2.client import Client
+from aiowebdav2.exceptions import UnauthorizedError
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_PASSWORD, CONF_URL, CONF_USERNAME, CONF_VERIFY_SSL
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryError, ConfigEntryNotReady
+
+from .const import CONF_BACKUP_PATH, DATA_BACKUP_AGENT_LISTENERS, DOMAIN
+from .helpers import (
+    async_create_client,
+    async_ensure_path_exists,
+    async_migrate_wrong_folder_path,
+)
+
+type WebDavConfigEntry = ConfigEntry[Client]
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: WebDavConfigEntry) -> bool:
+    """Set up WebDAV from a config entry."""
+    client = async_create_client(
+        hass=hass,
+        url=entry.data[CONF_URL],
+        username=entry.data[CONF_USERNAME],
+        password=entry.data[CONF_PASSWORD],
+        verify_ssl=entry.data.get(CONF_VERIFY_SSL, True),
+    )
+
+    try:
+        result = await client.check()
+    except UnauthorizedError as err:
+        raise ConfigEntryError(
+            translation_domain=DOMAIN,
+            translation_key="invalid_username_password",
+        ) from err
+
+    # Check if we can connect to the WebDAV server
+    # and access the root directory
+    if not result:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="cannot_connect",
+        )
+
+    path = entry.data.get(CONF_BACKUP_PATH, "/")
+    await async_migrate_wrong_folder_path(client, path)
+
+    # Ensure the backup directory exists
+    if not await async_ensure_path_exists(client, path):
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="cannot_access_or_create_backup_path",
+        )
+
+    entry.runtime_data = client
+
+    def async_notify_backup_listeners() -> None:
+        for listener in hass.data.get(DATA_BACKUP_AGENT_LISTENERS, []):
+            listener()
+
+    entry.async_on_unload(entry.async_on_state_change(async_notify_backup_listeners))
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: WebDavConfigEntry) -> bool:
+    """Unload a WebDAV config entry."""
+    return True
diff --git a/homeassistant/components/webdav/backup.py b/homeassistant/components/webdav/backup.py
new file mode 100644
index 00000000000..fb2927a58bb
--- /dev/null
+++ b/homeassistant/components/webdav/backup.py
@@ -0,0 +1,248 @@
+"""Support for WebDAV backup."""
+
+from __future__ import annotations
+
+from collections.abc import AsyncIterator, Callable, Coroutine
+from functools import wraps
+import logging
+from time import time
+from typing import Any, Concatenate
+
+from aiohttp import ClientTimeout
+from aiowebdav2.exceptions import UnauthorizedError, WebDavError
+from propcache.api import cached_property
+
+from homeassistant.components.backup import (
+    AgentBackup,
+    BackupAgent,
+    BackupAgentError,
+    BackupNotFound,
+    suggested_filename,
+)
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.json import json_dumps
+from homeassistant.util.json import json_loads_object
+
+from . import WebDavConfigEntry
+from .const import CONF_BACKUP_PATH, DATA_BACKUP_AGENT_LISTENERS, DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+BACKUP_TIMEOUT = ClientTimeout(connect=10, total=43200)
+CACHE_TTL = 300
+
+
+async def async_get_backup_agents(
+    hass: HomeAssistant,
+) -> list[BackupAgent]:
+    """Return a list of backup agents."""
+    entries: list[WebDavConfigEntry] = hass.config_entries.async_loaded_entries(DOMAIN)
+    return [WebDavBackupAgent(hass, entry) for entry in entries]
+
+
+@callback
+def async_register_backup_agents_listener(
+    hass: HomeAssistant,
+    *,
+    listener: Callable[[], None],
+    **kwargs: Any,
+) -> Callable[[], None]:
+    """Register a listener to be called when agents are added or removed.
+
+    :return: A function to unregister the listener.
+    """
+    hass.data.setdefault(DATA_BACKUP_AGENT_LISTENERS, []).append(listener)
+
+    @callback
+    def remove_listener() -> None:
+        """Remove the listener."""
+        hass.data[DATA_BACKUP_AGENT_LISTENERS].remove(listener)
+        if not hass.data[DATA_BACKUP_AGENT_LISTENERS]:
+            del hass.data[DATA_BACKUP_AGENT_LISTENERS]
+
+    return remove_listener
+
+
+def handle_backup_errors[_R, **P](
+    func: Callable[Concatenate[WebDavBackupAgent, P], Coroutine[Any, Any, _R]],
+) -> Callable[Concatenate[WebDavBackupAgent, P], Coroutine[Any, Any, _R]]:
+    """Handle backup errors."""
+
+    @wraps(func)
+    async def wrapper(self: WebDavBackupAgent, *args: P.args, **kwargs: P.kwargs) -> _R:
+        try:
+            return await func(self, *args, **kwargs)
+        except UnauthorizedError as err:
+            raise BackupAgentError("Authentication error") from err
+        except WebDavError as err:
+            _LOGGER.debug("Full error: %s", err, exc_info=True)
+            raise BackupAgentError(
+                f"Backup operation failed: {err}",
+            ) from err
+        except TimeoutError as err:
+            _LOGGER.error(
+                "Error during backup in %s: Timeout",
+                func.__name__,
+            )
+            raise BackupAgentError("Backup operation timed out") from err
+
+    return wrapper
+
+
+def suggested_filenames(backup: AgentBackup) -> tuple[str, str]:
+    """Return the suggested filenames for the backup and metadata."""
+    base_name = suggested_filename(backup).rsplit(".", 1)[0]
+    return f"{base_name}.tar", f"{base_name}.metadata.json"
+
+
+class WebDavBackupAgent(BackupAgent):
+    """Backup agent interface."""
+
+    domain = DOMAIN
+
+    def __init__(self, hass: HomeAssistant, entry: WebDavConfigEntry) -> None:
+        """Initialize the WebDAV backup agent."""
+        super().__init__()
+        self._hass = hass
+        self._entry = entry
+        self._client = entry.runtime_data
+        self.name = entry.title
+        self.unique_id = entry.entry_id
+        self._cache_metadata_files: dict[str, AgentBackup] = {}
+        self._cache_expiration = time()
+
+    @cached_property
+    def _backup_path(self) -> str:
+        """Return the path to the backup."""
+        return self._entry.data.get(CONF_BACKUP_PATH, "")
+
+    @handle_backup_errors
+    async def async_download_backup(
+        self,
+        backup_id: str,
+        **kwargs: Any,
+    ) -> AsyncIterator[bytes]:
+        """Download a backup file.
+
+        :param backup_id: The ID of the backup that was returned in async_list_backups.
+        :return: An async iterator that yields bytes.
+        """
+        backup = await self._find_backup_by_id(backup_id)
+
+        return await self._client.download_iter(
+            f"{self._backup_path}/{suggested_filename(backup)}",
+            timeout=BACKUP_TIMEOUT,
+        )
+
+    @handle_backup_errors
+    async def async_upload_backup(
+        self,
+        *,
+        open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
+        backup: AgentBackup,
+        **kwargs: Any,
+    ) -> None:
+        """Upload a backup.
+
+        :param open_stream: A function returning an async iterator that yields bytes.
+        :param backup: Metadata about the backup that should be uploaded.
+        """
+        (filename_tar, filename_meta) = suggested_filenames(backup)
+
+        await self._client.upload_iter(
+            await open_stream(),
+            f"{self._backup_path}/{filename_tar}",
+            timeout=BACKUP_TIMEOUT,
+            content_length=backup.size,
+        )
+
+        _LOGGER.debug(
+            "Uploaded backup to %s",
+            f"{self._backup_path}/{filename_tar}",
+        )
+
+        await self._client.upload_iter(
+            json_dumps(backup.as_dict()),
+            f"{self._backup_path}/{filename_meta}",
+        )
+
+        _LOGGER.debug(
+            "Uploaded metadata file for %s",
+            f"{self._backup_path}/{filename_meta}",
+        )
+
+        # reset cache
+        self._cache_expiration = time()
+
+    @handle_backup_errors
+    async def async_delete_backup(
+        self,
+        backup_id: str,
+        **kwargs: Any,
+    ) -> None:
+        """Delete a backup file.
+
+        :param backup_id: The ID of the backup that was returned in async_list_backups.
+        """
+        backup = await self._find_backup_by_id(backup_id)
+
+        (filename_tar, filename_meta) = suggested_filenames(backup)
+        backup_path = f"{self._backup_path}/{filename_tar}"
+
+        await self._client.clean(backup_path)
+        await self._client.clean(f"{self._backup_path}/{filename_meta}")
+
+        _LOGGER.debug(
+            "Deleted backup at %s",
+            backup_path,
+        )
+
+        # reset cache
+        self._cache_expiration = time()
+
+    @handle_backup_errors
+    async def async_list_backups(self, **kwargs: Any) -> list[AgentBackup]:
+        """List backups."""
+        return list((await self._list_cached_metadata_files()).values())
+
+    @handle_backup_errors
+    async def async_get_backup(
+        self,
+        backup_id: str,
+        **kwargs: Any,
+    ) -> AgentBackup:
+        """Return a backup."""
+        return await self._find_backup_by_id(backup_id)
+
+    async def _list_cached_metadata_files(self) -> dict[str, AgentBackup]:
+        """List metadata files with a cache."""
+        if time() <= self._cache_expiration:
+            return self._cache_metadata_files
+
+        async def _download_metadata(path: str) -> AgentBackup:
+            """Download metadata file."""
+            iterator = await self._client.download_iter(path)
+            metadata = await anext(iterator)
+            return AgentBackup.from_dict(json_loads_object(metadata))
+
+        async def _list_metadata_files() -> dict[str, AgentBackup]:
+            """List metadata files."""
+            files = await self._client.list_files(self._backup_path)
+            return {
+                metadata_content.backup_id: metadata_content
+                for file_name in files
+                if file_name.endswith(".json")
+                if (metadata_content := await _download_metadata(file_name))
+            }
+
+        self._cache_metadata_files = await _list_metadata_files()
+        self._cache_expiration = time() + CACHE_TTL
+        return self._cache_metadata_files
+
+    async def _find_backup_by_id(self, backup_id: str) -> AgentBackup:
+        """Find a backup by its backup ID on remote."""
+        metadata_files = await self._list_cached_metadata_files()
+        if metadata_file := metadata_files.get(backup_id):
+            return metadata_file
+
+        raise BackupNotFound(f"Backup {backup_id} not found")
diff --git a/homeassistant/components/webdav/config_flow.py b/homeassistant/components/webdav/config_flow.py
new file mode 100644
index 00000000000..e3e46d2575a
--- /dev/null
+++ b/homeassistant/components/webdav/config_flow.py
@@ -0,0 +1,92 @@
+"""Config flow for the WebDAV integration."""
+
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+from aiowebdav2.exceptions import MethodNotSupportedError, UnauthorizedError
+import voluptuous as vol
+import yarl
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.const import CONF_PASSWORD, CONF_URL, CONF_USERNAME, CONF_VERIFY_SSL
+from homeassistant.helpers.selector import (
+    TextSelector,
+    TextSelectorConfig,
+    TextSelectorType,
+)
+
+from .const import CONF_BACKUP_PATH, DOMAIN
+from .helpers import async_create_client
+
+_LOGGER = logging.getLogger(__name__)
+
+STEP_USER_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_URL): TextSelector(
+            TextSelectorConfig(
+                type=TextSelectorType.URL,
+            )
+        ),
+        vol.Required(CONF_USERNAME): str,
+        vol.Required(CONF_PASSWORD): TextSelector(
+            TextSelectorConfig(
+                type=TextSelectorType.PASSWORD,
+            )
+        ),
+        vol.Optional(CONF_BACKUP_PATH, default="/"): str,
+        vol.Optional(CONF_VERIFY_SSL, default=True): bool,
+    }
+)
+
+
+class WebDavConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for WebDAV."""
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the initial step."""
+        errors: dict[str, str] = {}
+        if user_input is not None:
+            client = async_create_client(
+                hass=self.hass,
+                url=user_input[CONF_URL],
+                username=user_input[CONF_USERNAME],
+                password=user_input[CONF_PASSWORD],
+                verify_ssl=user_input.get(CONF_VERIFY_SSL, True),
+            )
+
+            # Check if we can connect to the WebDAV server
+            # .check() already does the most of the error handling and will return True
+            # if we can access the root directory
+            try:
+                result = await client.check()
+            except UnauthorizedError:
+                errors["base"] = "invalid_auth"
+            except MethodNotSupportedError:
+                errors["base"] = "invalid_method"
+            except Exception:
+                _LOGGER.exception("Unexpected error")
+                errors["base"] = "unknown"
+            else:
+                if result:
+                    self._async_abort_entries_match(
+                        {
+                            CONF_URL: user_input[CONF_URL],
+                            CONF_USERNAME: user_input[CONF_USERNAME],
+                        }
+                    )
+
+                    parsed_url = yarl.URL(user_input[CONF_URL])
+                    return self.async_create_entry(
+                        title=f"{user_input[CONF_USERNAME]}@{parsed_url.host}",
+                        data=user_input,
+                    )
+
+                errors["base"] = "cannot_connect"
+
+        return self.async_show_form(
+            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
+        )
diff --git a/homeassistant/components/webdav/const.py b/homeassistant/components/webdav/const.py
new file mode 100644
index 00000000000..faf8ce77ca5
--- /dev/null
+++ b/homeassistant/components/webdav/const.py
@@ -0,0 +1,13 @@
+"""Constants for the WebDAV integration."""
+
+from collections.abc import Callable
+
+from homeassistant.util.hass_dict import HassKey
+
+DOMAIN = "webdav"
+
+DATA_BACKUP_AGENT_LISTENERS: HassKey[list[Callable[[], None]]] = HassKey(
+    f"{DOMAIN}.backup_agent_listeners"
+)
+
+CONF_BACKUP_PATH = "backup_path"
diff --git a/homeassistant/components/webdav/helpers.py b/homeassistant/components/webdav/helpers.py
new file mode 100644
index 00000000000..442f69b4d3c
--- /dev/null
+++ b/homeassistant/components/webdav/helpers.py
@@ -0,0 +1,68 @@
+"""Helper functions for the WebDAV component."""
+
+import logging
+
+from aiowebdav2.client import Client, ClientOptions
+from aiowebdav2.exceptions import WebDavError
+
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+@callback
+def async_create_client(
+    *,
+    hass: HomeAssistant,
+    url: str,
+    username: str,
+    password: str,
+    verify_ssl: bool = False,
+) -> Client:
+    """Create a WebDAV client."""
+    return Client(
+        url=url,
+        username=username,
+        password=password,
+        options=ClientOptions(
+            verify_ssl=verify_ssl,
+            session=async_get_clientsession(hass),
+        ),
+    )
+
+
+async def async_ensure_path_exists(client: Client, path: str) -> bool:
+    """Ensure that a path exists recursively on the WebDAV server."""
+    parts = path.strip("/").split("/")
+    for i in range(1, len(parts) + 1):
+        sub_path = "/".join(parts[:i])
+        if not await client.check(sub_path) and not await client.mkdir(sub_path):
+            return False
+
+    return True
+
+
+async def async_migrate_wrong_folder_path(client: Client, path: str) -> None:
+    """Migrate the wrong encoded folder path to the correct one."""
+    wrong_path = path.replace(" ", "%20")
+    # migrate folder when the old folder exists
+    if wrong_path != path and await client.check(wrong_path):
+        try:
+            await client.move(wrong_path, path)
+        except WebDavError as err:
+            raise ConfigEntryNotReady(
+                translation_domain=DOMAIN,
+                translation_key="failed_to_migrate_folder",
+                translation_placeholders={
+                    "wrong_path": wrong_path,
+                    "correct_path": path,
+                },
+            ) from err
+
+        _LOGGER.debug(
+            "Migrated wrong encoded folder path from %s to %s", wrong_path, path
+        )
diff --git a/homeassistant/components/webdav/manifest.json b/homeassistant/components/webdav/manifest.json
new file mode 100644
index 00000000000..65940eccaf1
--- /dev/null
+++ b/homeassistant/components/webdav/manifest.json
@@ -0,0 +1,12 @@
+{
+  "domain": "webdav",
+  "name": "WebDAV",
+  "codeowners": ["@jpbede"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/webdav",
+  "integration_type": "service",
+  "iot_class": "cloud_polling",
+  "loggers": ["aiowebdav2"],
+  "quality_scale": "bronze",
+  "requirements": ["aiowebdav2==0.4.3"]
+}
diff --git a/homeassistant/components/webdav/quality_scale.yaml b/homeassistant/components/webdav/quality_scale.yaml
new file mode 100644
index 00000000000..560626fda7e
--- /dev/null
+++ b/homeassistant/components/webdav/quality_scale.yaml
@@ -0,0 +1,145 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: Integration does not register custom actions.
+  appropriate-polling:
+    status: exempt
+    comment: |
+      This integration does not poll.
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: |
+      This integration does not have any custom actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup:
+    status: exempt
+    comment: |
+      Entities of this integration does not explicitly subscribe to events.
+  entity-unique-id:
+    status: exempt
+    comment: |
+      This integration does not have entities.
+  has-entity-name:
+    status: exempt
+    comment: |
+      This integration does not have entities.
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions:
+    status: exempt
+    comment: Integration does not register custom actions.
+  config-entry-unloading: done
+  docs-configuration-parameters:
+    status: exempt
+    comment: |
+      No Options flow.
+  docs-installation-parameters: done
+  entity-unavailable:
+    status: exempt
+    comment: |
+      This integration does not have entities.
+  integration-owner: done
+  log-when-unavailable:
+    status: exempt
+    comment: |
+      This integration does not have entities.
+  parallel-updates:
+    status: exempt
+    comment: |
+      This integration does not have platforms.
+  reauthentication-flow: todo
+  test-coverage: todo
+
+  # Gold
+  devices:
+    status: exempt
+    comment: |
+      This integration connects to a single service.
+  diagnostics:
+    status: exempt
+    comment: |
+      There is no data to diagnose.
+  discovery-update-info:
+    status: exempt
+    comment: |
+      This integration is a cloud service and does not support discovery.
+  discovery:
+    status: exempt
+    comment: |
+      This integration is a cloud service and does not support discovery.
+  docs-data-update:
+    status: exempt
+    comment: |
+      This integration does not poll or push.
+  docs-examples:
+    status: exempt
+    comment: |
+      This integration only serves backup.
+  docs-known-limitations:
+    status: done
+    comment: |
+      No known limitations.
+  docs-supported-devices:
+    status: exempt
+    comment: |
+      This integration is a cloud service.
+  docs-supported-functions:
+    status: exempt
+    comment: |
+      This integration does not have entities.
+  docs-troubleshooting:
+    status: exempt
+    comment: |
+      No issues known to troubleshoot.
+  docs-use-cases: todo
+  dynamic-devices:
+    status: exempt
+    comment: |
+      This integration connects to a single service.
+  entity-category:
+    status: exempt
+    comment: |
+      This integration does not have entities.
+  entity-device-class:
+    status: exempt
+    comment: |
+      This integration does not have entities.
+  entity-disabled-by-default:
+    status: exempt
+    comment: |
+      This integration does not have entities.
+  entity-translations:
+    status: exempt
+    comment: |
+      This integration does not have entities.
+  exception-translations: done
+  icon-translations:
+    status: exempt
+    comment: |
+      This integration does not have entities.
+  reconfiguration-flow:
+    status: exempt
+    comment: |
+      Nothing to reconfigure.
+  repair-issues: todo
+  stale-devices:
+    status: exempt
+    comment: |
+      This integration connects to a single service.
+
+  # Platinum
+  async-dependency: done
+  inject-websession: todo
+  strict-typing: todo
diff --git a/homeassistant/components/webdav/strings.json b/homeassistant/components/webdav/strings.json
new file mode 100644
index 00000000000..ac6418f1239
--- /dev/null
+++ b/homeassistant/components/webdav/strings.json
@@ -0,0 +1,45 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "data": {
+          "url": "[%key:common::config_flow::data::url%]",
+          "username": "[%key:common::config_flow::data::username%]",
+          "password": "[%key:common::config_flow::data::password%]",
+          "backup_path": "Backup path",
+          "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
+        },
+        "data_description": {
+          "url": "The URL of the WebDAV server. Check with your provider for the correct URL.",
+          "username": "The username for the WebDAV server.",
+          "password": "The password for the WebDAV server.",
+          "backup_path": "Define the path where the backups should be located (will be created automatically if it does not exist).",
+          "verify_ssl": "Whether to verify the SSL certificate of the server. If you are using a self-signed certificate, do not select this option."
+        }
+      }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "invalid_method": "The server does not support the required methods. Please check whether you have the correct URL. Check with your provider for the correct URL.",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
+    }
+  },
+  "exceptions": {
+    "invalid_username_password": {
+      "message": "Invalid username or password"
+    },
+    "cannot_connect": {
+      "message": "Cannot connect to WebDAV server"
+    },
+    "cannot_access_or_create_backup_path": {
+      "message": "Cannot access or create backup path. Please check the path and permissions."
+    },
+    "failed_to_migrate_folder": {
+      "message": "Failed to migrate wrong encoded folder \"{wrong_path}\" to \"{correct_path}\"."
+    }
+  }
+}
diff --git a/homeassistant/components/webhook/trigger.py b/homeassistant/components/webhook/trigger.py
index b4fd3008cd8..907123561f7 100644
--- a/homeassistant/components/webhook/trigger.py
+++ b/homeassistant/components/webhook/trigger.py
@@ -11,7 +11,7 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_PLATFORM, CONF_WEBHOOK_ID
 from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/webmin/coordinator.py b/homeassistant/components/webmin/coordinator.py
index 45261787e75..261139faf10 100644
--- a/homeassistant/components/webmin/coordinator.py
+++ b/homeassistant/components/webmin/coordinator.py
@@ -22,6 +22,7 @@ from .helpers import get_instance_from_options, get_sorted_mac_addresses
 class WebminUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """The Webmin data update coordinator."""
 
+    config_entry: ConfigEntry
     mac_address: str
     unique_id: str
 
@@ -29,7 +30,11 @@ class WebminUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         """Initialize the Webmin data update coordinator."""
 
         super().__init__(
-            hass, logger=LOGGER, name=DOMAIN, update_interval=DEFAULT_SCAN_INTERVAL
+            hass,
+            logger=LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=DEFAULT_SCAN_INTERVAL,
         )
 
         self.instance, base_url = get_instance_from_options(hass, config_entry.options)
@@ -53,7 +58,6 @@ class WebminUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
                 (DOMAIN, format_mac(mac_address)) for mac_address in mac_addresses
             }
         else:
-            assert self.config_entry
             self.unique_id = self.config_entry.entry_id
 
     async def _async_update_data(self) -> dict[str, Any]:
diff --git a/homeassistant/components/webmin/sensor.py b/homeassistant/components/webmin/sensor.py
index 785140393a2..a21c73bed13 100644
--- a/homeassistant/components/webmin/sensor.py
+++ b/homeassistant/components/webmin/sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE, UnitOfInformation
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import WebminConfigEntry
@@ -200,7 +200,7 @@ def generate_filesystem_sensor_description(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: WebminConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Webmin sensors based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/webmin/strings.json b/homeassistant/components/webmin/strings.json
index 9a6d6d4fbe4..b92986f917a 100644
--- a/homeassistant/components/webmin/strings.json
+++ b/homeassistant/components/webmin/strings.json
@@ -29,13 +29,13 @@
   "entity": {
     "sensor": {
       "load_1m": {
-        "name": "Load (1m)"
+        "name": "Load (1 min)"
       },
       "load_5m": {
-        "name": "Load (5m)"
+        "name": "Load (5 min)"
       },
       "load_15m": {
-        "name": "Load (15m)"
+        "name": "Load (15 min)"
       },
       "mem_total": {
         "name": "Memory total"
diff --git a/homeassistant/components/webostv/config_flow.py b/homeassistant/components/webostv/config_flow.py
index fbc3eb958dd..80c8fb7f8f2 100644
--- a/homeassistant/components/webostv/config_flow.py
+++ b/homeassistant/components/webostv/config_flow.py
@@ -92,13 +92,13 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "cannot_connect"
             else:
                 await self.async_set_unique_id(
-                    client.hello_info["deviceUUID"], raise_on_progress=False
+                    client.tv_info.hello["deviceUUID"], raise_on_progress=False
                 )
                 self._abort_if_unique_id_configured({CONF_HOST: self._host})
                 data = {CONF_HOST: self._host, CONF_CLIENT_SECRET: client.client_key}
 
                 if not self._name:
-                    self._name = f"{DEFAULT_NAME} {client.system_info['modelName']}"
+                    self._name = f"{DEFAULT_NAME} {client.tv_info.system['modelName']}"
                 return self.async_create_entry(title=self._name, data=data)
 
         return self.async_show_form(step_id="pairing", errors=errors)
@@ -176,7 +176,7 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
             except WEBOSTV_EXCEPTIONS:
                 errors["base"] = "cannot_connect"
             else:
-                await self.async_set_unique_id(client.hello_info["deviceUUID"])
+                await self.async_set_unique_id(client.tv_info.hello["deviceUUID"])
                 self._abort_if_unique_id_mismatch(reason="wrong_device")
                 data = {CONF_HOST: host, CONF_CLIENT_SECRET: client.client_key}
                 return self.async_update_reload_and_abort(reconfigure_entry, data=data)
@@ -214,7 +214,7 @@ class OptionsFlowHandler(OptionsFlow):
         sources_list = []
         try:
             client = await async_control_connect(self.hass, self.host, self.key)
-            sources_list = get_sources(client)
+            sources_list = get_sources(client.tv_state)
         except WebOsTvPairError:
             errors["base"] = "error_pairing"
         except WEBOSTV_EXCEPTIONS:
diff --git a/homeassistant/components/webostv/const.py b/homeassistant/components/webostv/const.py
index e505611db52..118ea7b32db 100644
--- a/homeassistant/components/webostv/const.py
+++ b/homeassistant/components/webostv/const.py
@@ -31,6 +31,7 @@ WEBOSTV_EXCEPTIONS = (
     WebOsTvCommandError,
     aiohttp.ClientConnectorError,
     aiohttp.ServerDisconnectedError,
+    aiohttp.WSMessageTypeError,
     asyncio.CancelledError,
     asyncio.TimeoutError,
 )
diff --git a/homeassistant/components/webostv/diagnostics.py b/homeassistant/components/webostv/diagnostics.py
index 7fb64a2cb8f..e4ea38064a8 100644
--- a/homeassistant/components/webostv/diagnostics.py
+++ b/homeassistant/components/webostv/diagnostics.py
@@ -32,15 +32,8 @@ async def async_get_config_entry_diagnostics(
     client_data = {
         "is_registered": client.is_registered(),
         "is_connected": client.is_connected(),
-        "current_app_id": client.current_app_id,
-        "current_channel": client.current_channel,
-        "apps": client.apps,
-        "inputs": client.inputs,
-        "system_info": client.system_info,
-        "software_info": client.software_info,
-        "hello_info": client.hello_info,
-        "sound_output": client.sound_output,
-        "is_on": client.is_on,
+        "tv_info": client.tv_info.__dict__,
+        "tv_state": client.tv_state.__dict__,
     }
 
     return async_redact_data(
diff --git a/homeassistant/components/webostv/helpers.py b/homeassistant/components/webostv/helpers.py
index 3c509a56d1e..f70f250f91d 100644
--- a/homeassistant/components/webostv/helpers.py
+++ b/homeassistant/components/webostv/helpers.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import logging
 
-from aiowebostv import WebOsClient
+from aiowebostv import WebOsClient, WebOsTvState
 
 from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.const import CONF_CLIENT_SECRET, CONF_HOST
@@ -83,16 +83,16 @@ def async_get_client_by_device_entry(
     )
 
 
-def get_sources(client: WebOsClient) -> list[str]:
+def get_sources(tv_state: WebOsTvState) -> list[str]:
     """Construct sources list."""
     sources = []
     found_live_tv = False
-    for app in client.apps.values():
+    for app in tv_state.apps.values():
         sources.append(app["title"])
         if app["id"] == LIVE_TV_APP_ID:
             found_live_tv = True
 
-    for source in client.inputs.values():
+    for source in tv_state.inputs.values():
         sources.append(source["label"])
         if source["appId"] == LIVE_TV_APP_ID:
             found_live_tv = True
diff --git a/homeassistant/components/webostv/manifest.json b/homeassistant/components/webostv/manifest.json
index f1a8e163398..8ac470ae922 100644
--- a/homeassistant/components/webostv/manifest.json
+++ b/homeassistant/components/webostv/manifest.json
@@ -6,7 +6,7 @@
   "documentation": "https://www.home-assistant.io/integrations/webostv",
   "iot_class": "local_push",
   "loggers": ["aiowebostv"],
-  "requirements": ["aiowebostv==0.6.0"],
+  "requirements": ["aiowebostv==0.7.3"],
   "ssdp": [
     {
       "st": "urn:lge-com:service:webos-second-screen:1"
diff --git a/homeassistant/components/webostv/media_player.py b/homeassistant/components/webostv/media_player.py
index 4b39841e29d..780e9f418a5 100644
--- a/homeassistant/components/webostv/media_player.py
+++ b/homeassistant/components/webostv/media_player.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Awaitable, Callable, Coroutine
+from collections.abc import Callable, Coroutine
 from contextlib import suppress
 from datetime import timedelta
 from functools import wraps
@@ -11,7 +11,7 @@ from http import HTTPStatus
 import logging
 from typing import Any, Concatenate, cast
 
-from aiowebostv import WebOsClient, WebOsTvPairError
+from aiowebostv import WebOsTvPairError, WebOsTvState
 import voluptuous as vol
 
 from homeassistant import util
@@ -23,12 +23,12 @@ from homeassistant.components.media_player import (
     MediaType,
 )
 from homeassistant.const import ATTR_COMMAND, ATTR_SUPPORTED_FEATURES
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, ServiceResponse, SupportsResponse
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.trigger import PluggableAction
 from homeassistant.helpers.typing import VolDictType
@@ -78,35 +78,54 @@ COMMAND_SCHEMA: VolDictType = {
 SOUND_OUTPUT_SCHEMA: VolDictType = {vol.Required(ATTR_SOUND_OUTPUT): cv.string}
 
 SERVICES = (
-    (SERVICE_BUTTON, BUTTON_SCHEMA, "async_button"),
-    (SERVICE_COMMAND, COMMAND_SCHEMA, "async_command"),
-    (SERVICE_SELECT_SOUND_OUTPUT, SOUND_OUTPUT_SCHEMA, "async_select_sound_output"),
+    (
+        SERVICE_BUTTON,
+        BUTTON_SCHEMA,
+        "async_button",
+        SupportsResponse.NONE,
+    ),
+    (
+        SERVICE_COMMAND,
+        COMMAND_SCHEMA,
+        "async_command",
+        SupportsResponse.OPTIONAL,
+    ),
+    (
+        SERVICE_SELECT_SOUND_OUTPUT,
+        SOUND_OUTPUT_SCHEMA,
+        "async_select_sound_output",
+        SupportsResponse.OPTIONAL,
+    ),
 )
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: WebOsTvConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the LG webOS TV platform."""
     platform = entity_platform.async_get_current_platform()
 
-    for service_name, schema, method in SERVICES:
-        platform.async_register_entity_service(service_name, schema, method)
+    for service_name, schema, method, supports_response in SERVICES:
+        platform.async_register_entity_service(
+            service_name, schema, method, supports_response=supports_response
+        )
 
     async_add_entities([LgWebOSMediaPlayerEntity(entry)])
 
 
-def cmd[_T: LgWebOSMediaPlayerEntity, **_P](
-    func: Callable[Concatenate[_T, _P], Awaitable[None]],
-) -> Callable[Concatenate[_T, _P], Coroutine[Any, Any, None]]:
+def cmd[_R, **_P](
+    func: Callable[Concatenate[LgWebOSMediaPlayerEntity, _P], Coroutine[Any, Any, _R]],
+) -> Callable[Concatenate[LgWebOSMediaPlayerEntity, _P], Coroutine[Any, Any, _R]]:
     """Catch command exceptions."""
 
     @wraps(func)
-    async def cmd_wrapper(self: _T, *args: _P.args, **kwargs: _P.kwargs) -> None:
+    async def cmd_wrapper(
+        self: LgWebOSMediaPlayerEntity, *args: _P.args, **kwargs: _P.kwargs
+    ) -> _R:
         """Wrap all command methods."""
-        if self.state is MediaPlayerState.OFF:
+        if self.state is MediaPlayerState.OFF and func.__name__ != "async_turn_off":
             raise HomeAssistantError(
                 translation_domain=DOMAIN,
                 translation_key="device_off",
@@ -116,7 +135,7 @@ def cmd[_T: LgWebOSMediaPlayerEntity, **_P](
                 },
             )
         try:
-            await func(self, *args, **kwargs)
+            return await func(self, *args, **kwargs)
         except WEBOSTV_EXCEPTIONS as error:
             raise HomeAssistantError(
                 translation_domain=DOMAIN,
@@ -186,51 +205,52 @@ class LgWebOSMediaPlayerEntity(RestoreEntity, MediaPlayerEntity):
         """Call disconnect on removal."""
         self._client.unregister_state_update_callback(self.async_handle_state_update)
 
-    async def async_handle_state_update(self, _client: WebOsClient) -> None:
+    async def async_handle_state_update(self, tv_state: WebOsTvState) -> None:
         """Update state from WebOsClient."""
         self._update_states()
         self.async_write_ha_state()
 
     def _update_states(self) -> None:
         """Update entity state attributes."""
+        tv_state = self._client.tv_state
         self._update_sources()
 
         self._attr_state = (
-            MediaPlayerState.ON if self._client.is_on else MediaPlayerState.OFF
+            MediaPlayerState.ON if tv_state.is_on else MediaPlayerState.OFF
         )
-        self._attr_is_volume_muted = cast(bool, self._client.muted)
+        self._attr_is_volume_muted = cast(bool, tv_state.muted)
 
         self._attr_volume_level = None
-        if self._client.volume is not None:
-            self._attr_volume_level = self._client.volume / 100.0
+        if tv_state.volume is not None:
+            self._attr_volume_level = tv_state.volume / 100.0
 
         self._attr_source = self._current_source
         self._attr_source_list = sorted(self._source_list)
 
         self._attr_media_content_type = None
-        if self._client.current_app_id == LIVE_TV_APP_ID:
+        if tv_state.current_app_id == LIVE_TV_APP_ID:
             self._attr_media_content_type = MediaType.CHANNEL
 
         self._attr_media_title = None
-        if (self._client.current_app_id == LIVE_TV_APP_ID) and (
-            self._client.current_channel is not None
+        if (tv_state.current_app_id == LIVE_TV_APP_ID) and (
+            tv_state.current_channel is not None
         ):
             self._attr_media_title = cast(
-                str, self._client.current_channel.get("channelName")
+                str, tv_state.current_channel.get("channelName")
             )
 
         self._attr_media_image_url = None
-        if self._client.current_app_id in self._client.apps:
-            icon: str = self._client.apps[self._client.current_app_id]["largeIcon"]
+        if tv_state.current_app_id in tv_state.apps:
+            icon: str = tv_state.apps[tv_state.current_app_id]["largeIcon"]
             if not icon.startswith("http"):
-                icon = self._client.apps[self._client.current_app_id]["icon"]
+                icon = tv_state.apps[tv_state.current_app_id]["icon"]
             self._attr_media_image_url = icon
 
         if self.state != MediaPlayerState.OFF or not self._supported_features:
             supported = SUPPORT_WEBOSTV
-            if self._client.sound_output in ("external_arc", "external_speaker"):
+            if tv_state.sound_output == "external_speaker":
                 supported = supported | SUPPORT_WEBOSTV_VOLUME
-            elif self._client.sound_output != "lineout":
+            elif tv_state.sound_output != "lineout":
                 supported = (
                     supported
                     | SUPPORT_WEBOSTV_VOLUME
@@ -246,9 +266,9 @@ class LgWebOSMediaPlayerEntity(RestoreEntity, MediaPlayerEntity):
         )
 
         self._attr_assumed_state = True
-        if self._client.is_on and self._client.media_state:
+        if tv_state.is_on and tv_state.media_state:
             self._attr_assumed_state = False
-            for entry in self._client.media_state:
+            for entry in tv_state.media_state:
                 if entry.get("playState") == "playing":
                     self._attr_state = MediaPlayerState.PLAYING
                 elif entry.get("playState") == "paused":
@@ -256,32 +276,37 @@ class LgWebOSMediaPlayerEntity(RestoreEntity, MediaPlayerEntity):
                 elif entry.get("playState") == "unloaded":
                     self._attr_state = MediaPlayerState.IDLE
 
+        tv_info = self._client.tv_info
         if self.state != MediaPlayerState.OFF:
-            maj_v = self._client.software_info.get("major_ver")
-            min_v = self._client.software_info.get("minor_ver")
+            maj_v = tv_info.software.get("major_ver")
+            min_v = tv_info.software.get("minor_ver")
             if maj_v and min_v:
                 self._attr_device_info["sw_version"] = f"{maj_v}.{min_v}"
 
-            if model := self._client.system_info.get("modelName"):
+            if model := tv_info.system.get("modelName"):
                 self._attr_device_info["model"] = model
 
+            if serial_number := tv_info.system.get("serialNumber"):
+                self._attr_device_info["serial_number"] = serial_number
+
         self._attr_extra_state_attributes = {}
-        if self._client.sound_output is not None or self.state != MediaPlayerState.OFF:
+        if tv_state.sound_output is not None or self.state != MediaPlayerState.OFF:
             self._attr_extra_state_attributes = {
-                ATTR_SOUND_OUTPUT: self._client.sound_output
+                ATTR_SOUND_OUTPUT: tv_state.sound_output
             }
 
     def _update_sources(self) -> None:
         """Update list of sources from current source, apps, inputs and configured list."""
+        tv_state = self._client.tv_state
         source_list = self._source_list
         self._source_list = {}
         conf_sources = self._sources
 
         found_live_tv = False
-        for app in self._client.apps.values():
+        for app in tv_state.apps.values():
             if app["id"] == LIVE_TV_APP_ID:
                 found_live_tv = True
-            if app["id"] == self._client.current_app_id:
+            if app["id"] == tv_state.current_app_id:
                 self._current_source = app["title"]
                 self._source_list[app["title"]] = app
             elif (
@@ -292,10 +317,10 @@ class LgWebOSMediaPlayerEntity(RestoreEntity, MediaPlayerEntity):
             ):
                 self._source_list[app["title"]] = app
 
-        for source in self._client.inputs.values():
+        for source in tv_state.inputs.values():
             if source["appId"] == LIVE_TV_APP_ID:
                 found_live_tv = True
-            if source["appId"] == self._client.current_app_id:
+            if source["appId"] == tv_state.current_app_id:
                 self._current_source = source["label"]
                 self._source_list[source["label"]] = source
             elif (
@@ -312,7 +337,7 @@ class LgWebOSMediaPlayerEntity(RestoreEntity, MediaPlayerEntity):
         # not appear in the app or input lists in some cases
         elif not found_live_tv:
             app = {"id": LIVE_TV_APP_ID, "title": "Live TV"}
-            if self._client.current_app_id == LIVE_TV_APP_ID:
+            if tv_state.current_app_id == LIVE_TV_APP_ID:
                 self._current_source = app["title"]
                 self._source_list["Live TV"] = app
             elif (
@@ -376,9 +401,9 @@ class LgWebOSMediaPlayerEntity(RestoreEntity, MediaPlayerEntity):
         await self._client.set_mute(mute)
 
     @cmd
-    async def async_select_sound_output(self, sound_output: str) -> None:
+    async def async_select_sound_output(self, sound_output: str) -> ServiceResponse:
         """Select the sound output."""
-        await self._client.change_sound_output(sound_output)
+        return await self._client.change_sound_output(sound_output)
 
     @cmd
     async def async_media_play_pause(self) -> None:
@@ -412,12 +437,12 @@ class LgWebOSMediaPlayerEntity(RestoreEntity, MediaPlayerEntity):
         """Play a piece of media."""
         _LOGGER.debug("Call play media type <%s>, Id <%s>", media_type, media_id)
 
-        if media_type == MediaType.CHANNEL and self._client.channels:
+        if media_type == MediaType.CHANNEL and self._client.tv_state.channels:
             _LOGGER.debug("Searching channel")
             partial_match_channel_id = None
             perfect_match_channel_id = None
 
-            for channel in self._client.channels:
+            for channel in self._client.tv_state.channels:
                 if media_id == channel["channelNumber"]:
                     perfect_match_channel_id = channel["channelId"]
                     continue
@@ -462,7 +487,7 @@ class LgWebOSMediaPlayerEntity(RestoreEntity, MediaPlayerEntity):
     @cmd
     async def async_media_next_track(self) -> None:
         """Send next track command."""
-        if self._client.current_app_id == LIVE_TV_APP_ID:
+        if self._client.tv_state.current_app_id == LIVE_TV_APP_ID:
             await self._client.channel_up()
         else:
             await self._client.fast_forward()
@@ -470,7 +495,7 @@ class LgWebOSMediaPlayerEntity(RestoreEntity, MediaPlayerEntity):
     @cmd
     async def async_media_previous_track(self) -> None:
         """Send the previous track command."""
-        if self._client.current_app_id == LIVE_TV_APP_ID:
+        if self._client.tv_state.current_app_id == LIVE_TV_APP_ID:
             await self._client.channel_down()
         else:
             await self._client.rewind()
@@ -481,9 +506,9 @@ class LgWebOSMediaPlayerEntity(RestoreEntity, MediaPlayerEntity):
         await self._client.button(button)
 
     @cmd
-    async def async_command(self, command: str, **kwargs: Any) -> None:
+    async def async_command(self, command: str, **kwargs: Any) -> ServiceResponse:
         """Send a command."""
-        await self._client.request(command, payload=kwargs.get(ATTR_PAYLOAD))
+        return await self._client.request(command, payload=kwargs.get(ATTR_PAYLOAD))
 
     async def _async_fetch_image(self, url: str) -> tuple[bytes | None, str | None]:
         """Retrieve an image.
diff --git a/homeassistant/components/webostv/notify.py b/homeassistant/components/webostv/notify.py
index 2393cb4cd07..3966cea5e92 100644
--- a/homeassistant/components/webostv/notify.py
+++ b/homeassistant/components/webostv/notify.py
@@ -49,7 +49,7 @@ class LgWebOSNotificationService(BaseNotificationService):
         data = kwargs[ATTR_DATA]
         icon_path = data.get(ATTR_ICON) if data else None
 
-        if not client.is_on:
+        if not client.tv_state.is_on:
             raise HomeAssistantError(
                 translation_domain=DOMAIN,
                 translation_key="notify_device_off",
diff --git a/homeassistant/components/websocket_api/commands.py b/homeassistant/components/websocket_api/commands.py
index cfa132b71eb..4a360b4a43c 100644
--- a/homeassistant/components/websocket_api/commands.py
+++ b/homeassistant/components/websocket_api/commands.py
@@ -275,10 +275,10 @@ async def handle_call_service(
                 translation_domain=const.DOMAIN,
                 translation_key="child_service_not_found",
                 translation_placeholders={
-                    "domain": err.domain,
-                    "service": err.service,
-                    "child_domain": msg["domain"],
-                    "child_service": msg["service"],
+                    "domain": msg["domain"],
+                    "service": msg["service"],
+                    "child_domain": err.domain,
+                    "child_service": err.service,
                 },
             )
     except vol.Invalid as err:
diff --git a/homeassistant/components/websocket_api/http.py b/homeassistant/components/websocket_api/http.py
index 8bfa9480ff4..ebca497193b 100644
--- a/homeassistant/components/websocket_api/http.py
+++ b/homeassistant/components/websocket_api/http.py
@@ -387,7 +387,14 @@ class WebSocketHandler:
             raise Disconnect("Received close message during auth phase")
 
         if msg.type is not WSMsgType.TEXT:
-            raise Disconnect("Received non-Text message during auth phase")
+            if msg.type is WSMsgType.ERROR:
+                # msg.data is the exception
+                raise Disconnect(
+                    f"Received error message during auth phase: {msg.data}"
+                )
+            raise Disconnect(
+                f"Received non-Text message of type {msg.type} during auth phase"
+            )
 
         try:
             auth_msg_data = json_loads(msg.data)
@@ -477,7 +484,12 @@ class WebSocketHandler:
                 continue
 
             if msg_type is not WSMsgType.TEXT:
-                raise Disconnect("Received non-Text message.")
+                if msg_type is WSMsgType.ERROR:
+                    # msg.data is the exception
+                    raise Disconnect(
+                        f"Received error message during command phase: {msg.data}"
+                    )
+                raise Disconnect(f"Received non-Text message of type {msg_type}.")
 
             try:
                 command_msg_data = json_loads(msg_data)
diff --git a/homeassistant/components/weheat/__init__.py b/homeassistant/components/weheat/__init__.py
index d8d8616c867..15935f3e418 100644
--- a/homeassistant/components/weheat/__init__.py
+++ b/homeassistant/components/weheat/__init__.py
@@ -2,13 +2,13 @@
 
 from __future__ import annotations
 
+import asyncio
 from http import HTTPStatus
 
 import aiohttp
 from weheat.abstractions.discovery import HeatPumpDiscovery
 from weheat.exceptions import UnauthorizedException
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ACCESS_TOKEN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
@@ -19,12 +19,16 @@ from homeassistant.helpers.config_entry_oauth2_flow import (
 )
 
 from .const import API_URL, LOGGER
-from .coordinator import WeheatDataUpdateCoordinator
+from .coordinator import (
+    HeatPumpInfo,
+    WeheatConfigEntry,
+    WeheatData,
+    WeheatDataUpdateCoordinator,
+    WeheatEnergyUpdateCoordinator,
+)
 
 PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR]
 
-type WeheatConfigEntry = ConfigEntry[list[WeheatDataUpdateCoordinator]]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: WeheatConfigEntry) -> bool:
     """Set up Weheat from a config entry."""
@@ -55,14 +59,38 @@ async def async_setup_entry(hass: HomeAssistant, entry: WeheatConfigEntry) -> bo
     except UnauthorizedException as error:
         raise ConfigEntryAuthFailed from error
 
+    nr_of_pumps = len(discovered_heat_pumps)
+
     for pump_info in discovered_heat_pumps:
         LOGGER.debug("Adding %s", pump_info)
-        # for each pump, add a coordinator
-        new_coordinator = WeheatDataUpdateCoordinator(hass, session, pump_info)
+        # for each pump, add the coordinators
 
-        await new_coordinator.async_config_entry_first_refresh()
+        new_heat_pump = HeatPumpInfo(pump_info)
+        new_data_coordinator = WeheatDataUpdateCoordinator(
+            hass, entry, session, pump_info, nr_of_pumps
+        )
+        new_energy_coordinator = WeheatEnergyUpdateCoordinator(
+            hass, entry, session, pump_info
+        )
 
-        entry.runtime_data.append(new_coordinator)
+        entry.runtime_data.append(
+            WeheatData(
+                heat_pump_info=new_heat_pump,
+                data_coordinator=new_data_coordinator,
+                energy_coordinator=new_energy_coordinator,
+            )
+        )
+
+    await asyncio.gather(
+        *[
+            data.data_coordinator.async_config_entry_first_refresh()
+            for data in entry.runtime_data
+        ],
+        *[
+            data.energy_coordinator.async_config_entry_first_refresh()
+            for data in entry.runtime_data
+        ],
+    )
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
diff --git a/homeassistant/components/weheat/binary_sensor.py b/homeassistant/components/weheat/binary_sensor.py
index 1fb8f614a40..5e4c91fde60 100644
--- a/homeassistant/components/weheat/binary_sensor.py
+++ b/homeassistant/components/weheat/binary_sensor.py
@@ -11,11 +11,10 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import WeheatConfigEntry
-from .coordinator import WeheatDataUpdateCoordinator
+from .coordinator import HeatPumpInfo, WeheatConfigEntry, WeheatDataUpdateCoordinator
 from .entity import WeheatEntity
 
 # Coordinator is used to centralize the data updates
@@ -65,14 +64,18 @@ BINARY_SENSORS = [
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: WeheatConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensors for weheat heat pump."""
     entities = [
-        WeheatHeatPumpBinarySensor(coordinator, entity_description)
+        WeheatHeatPumpBinarySensor(
+            weheatdata.heat_pump_info,
+            weheatdata.data_coordinator,
+            entity_description,
+        )
+        for weheatdata in entry.runtime_data
         for entity_description in BINARY_SENSORS
-        for coordinator in entry.runtime_data
-        if entity_description.value_fn(coordinator.data) is not None
+        if entity_description.value_fn(weheatdata.data_coordinator.data) is not None
     ]
 
     async_add_entities(entities)
@@ -81,20 +84,21 @@ async def async_setup_entry(
 class WeheatHeatPumpBinarySensor(WeheatEntity, BinarySensorEntity):
     """Defines a Weheat heat pump binary sensor."""
 
+    heat_pump_info: HeatPumpInfo
     coordinator: WeheatDataUpdateCoordinator
     entity_description: WeHeatBinarySensorEntityDescription
 
     def __init__(
         self,
+        heat_pump_info: HeatPumpInfo,
         coordinator: WeheatDataUpdateCoordinator,
         entity_description: WeHeatBinarySensorEntityDescription,
     ) -> None:
         """Pass coordinator to CoordinatorEntity."""
-        super().__init__(coordinator)
-
+        super().__init__(heat_pump_info, coordinator)
         self.entity_description = entity_description
 
-        self._attr_unique_id = f"{coordinator.heatpump_id}_{entity_description.key}"
+        self._attr_unique_id = f"{heat_pump_info.heatpump_id}_{entity_description.key}"
 
     @property
     def is_on(self) -> bool | None:
diff --git a/homeassistant/components/weheat/const.py b/homeassistant/components/weheat/const.py
index e33fd983572..ee9b77281e6 100644
--- a/homeassistant/components/weheat/const.py
+++ b/homeassistant/components/weheat/const.py
@@ -17,7 +17,8 @@ API_URL = "https://api.weheat.nl"
 OAUTH2_SCOPES = ["openid", "offline_access"]
 
 
-UPDATE_INTERVAL = 30
+LOG_UPDATE_INTERVAL = 120
+ENERGY_UPDATE_INTERVAL = 1800
 
 LOGGER: Logger = getLogger(__package__)
 
diff --git a/homeassistant/components/weheat/coordinator.py b/homeassistant/components/weheat/coordinator.py
index 4a85380e4a3..30ca61d0387 100644
--- a/homeassistant/components/weheat/coordinator.py
+++ b/homeassistant/components/weheat/coordinator.py
@@ -1,5 +1,6 @@
 """Define a custom coordinator for the Weheat heatpump integration."""
 
+from dataclasses import dataclass
 from datetime import timedelta
 
 from weheat.abstractions.discovery import HeatPumpDiscovery
@@ -10,9 +11,11 @@ from weheat.exceptions import (
     ForbiddenException,
     NotFoundException,
     ServiceException,
+    TooManyRequestsException,
     UnauthorizedException,
 )
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ACCESS_TOKEN
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
@@ -20,7 +23,9 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.config_entry_oauth2_flow import OAuth2Session
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import API_URL, DOMAIN, LOGGER, UPDATE_INTERVAL
+from .const import API_URL, DOMAIN, ENERGY_UPDATE_INTERVAL, LOG_UPDATE_INTERVAL, LOGGER
+
+type WeheatConfigEntry = ConfigEntry[list[WeheatData]]
 
 EXCEPTIONS = (
     ServiceException,
@@ -28,55 +33,78 @@ EXCEPTIONS = (
     ForbiddenException,
     BadRequestException,
     ApiException,
+    TooManyRequestsException,
 )
 
 
+class HeatPumpInfo(HeatPumpDiscovery.HeatPumpInfo):
+    """Heat pump info with additional properties."""
+
+    def __init__(self, pump_info: HeatPumpDiscovery.HeatPumpInfo) -> None:
+        """Initialize the HeatPump object with the provided pump information.
+
+        Args:
+            pump_info (HeatPumpDiscovery.HeatPumpInfo): An object containing the heat pump's discovery information, including:
+                - uuid (str): Unique identifier for the heat pump.
+                - uuid (str): Unique identifier for the heat pump.
+                - device_name (str): Name of the heat pump device.
+                - model (str): Model of the heat pump.
+                - sn (str): Serial number of the heat pump.
+                - has_dhw (bool): Indicates if the heat pump has domestic hot water functionality.
+
+        """
+        super().__init__(
+            pump_info.uuid,
+            pump_info.device_name,
+            pump_info.model,
+            pump_info.sn,
+            pump_info.has_dhw,
+        )
+
+    @property
+    def readable_name(self) -> str | None:
+        """Return the readable name of the heat pump."""
+        return self.device_name if self.device_name else self.model
+
+    @property
+    def heatpump_id(self) -> str:
+        """Return the heat pump id."""
+        return self.uuid
+
+
 class WeheatDataUpdateCoordinator(DataUpdateCoordinator[HeatPump]):
     """A custom coordinator for the Weheat heatpump integration."""
 
+    config_entry: WeheatConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: WeheatConfigEntry,
         session: OAuth2Session,
         heat_pump: HeatPumpDiscovery.HeatPumpInfo,
+        nr_of_heat_pumps: int,
     ) -> None:
         """Initialize the data coordinator."""
         super().__init__(
             hass,
+            config_entry=config_entry,
             logger=LOGGER,
             name=DOMAIN,
-            update_interval=timedelta(seconds=UPDATE_INTERVAL),
+            update_interval=timedelta(seconds=LOG_UPDATE_INTERVAL * nr_of_heat_pumps),
         )
-        self.heat_pump_info = heat_pump
         self._heat_pump_data = HeatPump(
             API_URL, heat_pump.uuid, async_get_clientsession(hass)
         )
 
         self.session = session
 
-    @property
-    def heatpump_id(self) -> str:
-        """Return the heat pump id."""
-        return self.heat_pump_info.uuid
-
-    @property
-    def readable_name(self) -> str | None:
-        """Return the readable name of the heat pump."""
-        if self.heat_pump_info.name:
-            return self.heat_pump_info.name
-        return self.heat_pump_info.model
-
-    @property
-    def model(self) -> str:
-        """Return the model of the heat pump."""
-        return self.heat_pump_info.model
-
     async def _async_update_data(self) -> HeatPump:
         """Fetch data from the API."""
         await self.session.async_ensure_token_valid()
 
         try:
-            await self._heat_pump_data.async_get_status(
+            await self._heat_pump_data.async_get_logs(
                 self.session.token[CONF_ACCESS_TOKEN]
             )
         except UnauthorizedException as error:
@@ -85,3 +113,54 @@ class WeheatDataUpdateCoordinator(DataUpdateCoordinator[HeatPump]):
             raise UpdateFailed(error) from error
 
         return self._heat_pump_data
+
+
+class WeheatEnergyUpdateCoordinator(DataUpdateCoordinator[HeatPump]):
+    """A custom Energy coordinator for the Weheat heatpump integration."""
+
+    config_entry: WeheatConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: WeheatConfigEntry,
+        session: OAuth2Session,
+        heat_pump: HeatPumpDiscovery.HeatPumpInfo,
+    ) -> None:
+        """Initialize the data coordinator."""
+        super().__init__(
+            hass,
+            config_entry=config_entry,
+            logger=LOGGER,
+            name=DOMAIN,
+            update_interval=timedelta(seconds=ENERGY_UPDATE_INTERVAL),
+        )
+        self._heat_pump_data = HeatPump(
+            API_URL, heat_pump.uuid, async_get_clientsession(hass)
+        )
+
+        self.session = session
+
+    async def _async_update_data(self) -> HeatPump:
+        """Fetch data from the API."""
+        await self.session.async_ensure_token_valid()
+
+        try:
+            await self._heat_pump_data.async_get_energy(
+                self.session.token[CONF_ACCESS_TOKEN]
+            )
+        except UnauthorizedException as error:
+            raise ConfigEntryAuthFailed from error
+        except EXCEPTIONS as error:
+            raise UpdateFailed(error) from error
+
+        return self._heat_pump_data
+
+
+@dataclass
+class WeheatData:
+    """Data for the Weheat integration."""
+
+    heat_pump_info: HeatPumpInfo
+    data_coordinator: WeheatDataUpdateCoordinator
+    energy_coordinator: WeheatEnergyUpdateCoordinator
diff --git a/homeassistant/components/weheat/entity.py b/homeassistant/components/weheat/entity.py
index 079db596e19..7a12b2edcfa 100644
--- a/homeassistant/components/weheat/entity.py
+++ b/homeassistant/components/weheat/entity.py
@@ -3,25 +3,30 @@
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
+from . import HeatPumpInfo
 from .const import DOMAIN, MANUFACTURER
-from .coordinator import WeheatDataUpdateCoordinator
+from .coordinator import WeheatDataUpdateCoordinator, WeheatEnergyUpdateCoordinator
 
 
-class WeheatEntity(CoordinatorEntity[WeheatDataUpdateCoordinator]):
+class WeheatEntity[
+    _WeheatEntityT: WeheatDataUpdateCoordinator | WeheatEnergyUpdateCoordinator
+](CoordinatorEntity[_WeheatEntityT]):
     """Defines a base Weheat entity."""
 
     _attr_has_entity_name = True
 
     def __init__(
         self,
-        coordinator: WeheatDataUpdateCoordinator,
+        heat_pump_info: HeatPumpInfo,
+        coordinator: _WeheatEntityT,
     ) -> None:
         """Initialize the Weheat entity."""
         super().__init__(coordinator)
+        self.heat_pump_info = heat_pump_info
 
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, coordinator.heatpump_id)},
-            name=coordinator.readable_name,
+            identifiers={(DOMAIN, heat_pump_info.heatpump_id)},
+            name=heat_pump_info.readable_name,
             manufacturer=MANUFACTURER,
-            model=coordinator.model,
+            model=heat_pump_info.model,
         )
diff --git a/homeassistant/components/weheat/manifest.json b/homeassistant/components/weheat/manifest.json
index 1d60f66afba..7297c601213 100644
--- a/homeassistant/components/weheat/manifest.json
+++ b/homeassistant/components/weheat/manifest.json
@@ -6,5 +6,5 @@
   "dependencies": ["application_credentials"],
   "documentation": "https://www.home-assistant.io/integrations/weheat",
   "iot_class": "cloud_polling",
-  "requirements": ["weheat==2025.1.15"]
+  "requirements": ["weheat==2025.2.26"]
 }
diff --git a/homeassistant/components/weheat/sensor.py b/homeassistant/components/weheat/sensor.py
index 2d840aec86a..d3b758e41eb 100644
--- a/homeassistant/components/weheat/sensor.py
+++ b/homeassistant/components/weheat/sensor.py
@@ -19,16 +19,20 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import WeheatConfigEntry
 from .const import (
     DISPLAY_PRECISION_COP,
     DISPLAY_PRECISION_WATER_TEMP,
     DISPLAY_PRECISION_WATTS,
 )
-from .coordinator import WeheatDataUpdateCoordinator
+from .coordinator import (
+    HeatPumpInfo,
+    WeheatConfigEntry,
+    WeheatDataUpdateCoordinator,
+    WeheatEnergyUpdateCoordinator,
+)
 from .entity import WeheatEntity
 
 # Coordinator is used to centralize the data updates
@@ -143,22 +147,6 @@ SENSORS = [
             else None
         ),
     ),
-    WeHeatSensorEntityDescription(
-        translation_key="electricity_used",
-        key="electricity_used",
-        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        device_class=SensorDeviceClass.ENERGY,
-        state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda status: status.energy_total,
-    ),
-    WeHeatSensorEntityDescription(
-        translation_key="energy_output",
-        key="energy_output",
-        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        device_class=SensorDeviceClass.ENERGY,
-        state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda status: status.energy_output,
-    ),
     WeHeatSensorEntityDescription(
         translation_key="compressor_rpm",
         key="compressor_rpm",
@@ -175,7 +163,6 @@ SENSORS = [
     ),
 ]
 
-
 DHW_SENSORS = [
     WeHeatSensorEntityDescription(
         translation_key="dhw_top_temperature",
@@ -197,24 +184,65 @@ DHW_SENSORS = [
     ),
 ]
 
+ENERGY_SENSORS = [
+    WeHeatSensorEntityDescription(
+        translation_key="electricity_used",
+        key="electricity_used",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        value_fn=lambda status: status.energy_total,
+    ),
+    WeHeatSensorEntityDescription(
+        translation_key="energy_output",
+        key="energy_output",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        value_fn=lambda status: status.energy_output,
+    ),
+]
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: WeheatConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensors for weheat heat pump."""
-    entities = [
-        WeheatHeatPumpSensor(coordinator, entity_description)
-        for entity_description in SENSORS
-        for coordinator in entry.runtime_data
-    ]
-    entities.extend(
-        WeheatHeatPumpSensor(coordinator, entity_description)
-        for entity_description in DHW_SENSORS
-        for coordinator in entry.runtime_data
-        if coordinator.heat_pump_info.has_dhw
-    )
+
+    entities: list[WeheatHeatPumpSensor] = []
+    for weheatdata in entry.runtime_data:
+        entities.extend(
+            WeheatHeatPumpSensor(
+                weheatdata.heat_pump_info,
+                weheatdata.data_coordinator,
+                entity_description,
+            )
+            for entity_description in SENSORS
+            if entity_description.value_fn(weheatdata.data_coordinator.data) is not None
+        )
+        if weheatdata.heat_pump_info.has_dhw:
+            entities.extend(
+                WeheatHeatPumpSensor(
+                    weheatdata.heat_pump_info,
+                    weheatdata.data_coordinator,
+                    entity_description,
+                )
+                for entity_description in DHW_SENSORS
+                if entity_description.value_fn(weheatdata.data_coordinator.data)
+                is not None
+            )
+        entities.extend(
+            WeheatHeatPumpSensor(
+                weheatdata.heat_pump_info,
+                weheatdata.energy_coordinator,
+                entity_description,
+            )
+            for entity_description in ENERGY_SENSORS
+            if entity_description.value_fn(weheatdata.energy_coordinator.data)
+            is not None
+        )
 
     async_add_entities(entities)
 
@@ -222,20 +250,21 @@ async def async_setup_entry(
 class WeheatHeatPumpSensor(WeheatEntity, SensorEntity):
     """Defines a Weheat heat pump sensor."""
 
-    coordinator: WeheatDataUpdateCoordinator
+    heat_pump_info: HeatPumpInfo
+    coordinator: WeheatDataUpdateCoordinator | WeheatEnergyUpdateCoordinator
     entity_description: WeHeatSensorEntityDescription
 
     def __init__(
         self,
-        coordinator: WeheatDataUpdateCoordinator,
+        heat_pump_info: HeatPumpInfo,
+        coordinator: WeheatDataUpdateCoordinator | WeheatEnergyUpdateCoordinator,
         entity_description: WeHeatSensorEntityDescription,
     ) -> None:
         """Pass coordinator to CoordinatorEntity."""
-        super().__init__(coordinator)
-
+        super().__init__(heat_pump_info, coordinator)
         self.entity_description = entity_description
 
-        self._attr_unique_id = f"{coordinator.heatpump_id}_{entity_description.key}"
+        self._attr_unique_id = f"{heat_pump_info.heatpump_id}_{entity_description.key}"
 
     @property
     def native_value(self) -> StateType:
diff --git a/homeassistant/components/weheat/strings.json b/homeassistant/components/weheat/strings.json
index 2a208c2f8ca..3959acad053 100644
--- a/homeassistant/components/weheat/strings.json
+++ b/homeassistant/components/weheat/strings.json
@@ -37,7 +37,7 @@
         "name": "Indoor unit water pump"
       },
       "indoor_unit_auxiliary_pump_state": {
-        "name": "Indoor unit auxilary water pump"
+        "name": "Indoor unit auxiliary water pump"
       },
       "indoor_unit_dhw_valve_or_pump_state": {
         "name": "Indoor unit DHW valve or water pump"
diff --git a/homeassistant/components/wemo/binary_sensor.py b/homeassistant/components/wemo/binary_sensor.py
index f2bcb04d96f..4ed361b18ba 100644
--- a/homeassistant/components/wemo/binary_sensor.py
+++ b/homeassistant/components/wemo/binary_sensor.py
@@ -5,7 +5,7 @@ from pywemo import Insight, Maker, StandbyState
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import async_wemo_dispatcher_connect
 from .coordinator import DeviceCoordinator
@@ -15,7 +15,7 @@ from .entity import WemoBinaryStateEntity, WemoEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     _config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up WeMo binary sensors."""
 
diff --git a/homeassistant/components/wemo/coordinator.py b/homeassistant/components/wemo/coordinator.py
index 1f25c12f7ca..0aaedf598d2 100644
--- a/homeassistant/components/wemo/coordinator.py
+++ b/homeassistant/components/wemo/coordinator.py
@@ -88,13 +88,17 @@ class Options:
 class DeviceCoordinator(DataUpdateCoordinator[None]):
     """Home Assistant wrapper for a pyWeMo device."""
 
+    config_entry: ConfigEntry
     options: Options | None = None
 
-    def __init__(self, hass: HomeAssistant, wemo: WeMoDevice) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, wemo: WeMoDevice
+    ) -> None:
         """Initialize DeviceCoordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=wemo.name,
             update_interval=timedelta(seconds=30),
         )
@@ -285,7 +289,7 @@ async def async_register_device(
     hass: HomeAssistant, config_entry: ConfigEntry, wemo: WeMoDevice
 ) -> DeviceCoordinator:
     """Register a device with home assistant and enable pywemo event callbacks."""
-    device = DeviceCoordinator(hass, wemo)
+    device = DeviceCoordinator(hass, config_entry, wemo)
     await device.async_refresh()
     if not device.last_update_success and device.last_exception:
         raise device.last_exception
diff --git a/homeassistant/components/wemo/fan.py b/homeassistant/components/wemo/fan.py
index 42dae679aa5..edfdfc1c78c 100644
--- a/homeassistant/components/wemo/fan.py
+++ b/homeassistant/components/wemo/fan.py
@@ -13,7 +13,7 @@ from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import VolDictType
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
@@ -48,7 +48,7 @@ SET_HUMIDITY_SCHEMA: VolDictType = {
 async def async_setup_entry(
     hass: HomeAssistant,
     _config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up WeMo binary sensors."""
 
diff --git a/homeassistant/components/wemo/light.py b/homeassistant/components/wemo/light.py
index 6068cd3ff0b..838073be84a 100644
--- a/homeassistant/components/wemo/light.py
+++ b/homeassistant/components/wemo/light.py
@@ -20,8 +20,8 @@ from homeassistant.components.light import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import CONNECTION_ZIGBEE, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.color as color_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import color as color_util
 
 from . import async_wemo_dispatcher_connect
 from .const import DOMAIN as WEMO_DOMAIN
@@ -35,7 +35,7 @@ WEMO_OFF = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up WeMo lights."""
 
@@ -53,7 +53,7 @@ async def async_setup_entry(
 def async_setup_bridge(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
     coordinator: DeviceCoordinator,
 ) -> None:
     """Set up a WeMo link."""
diff --git a/homeassistant/components/wemo/sensor.py b/homeassistant/components/wemo/sensor.py
index 90e3546eaf7..76a0265d7da 100644
--- a/homeassistant/components/wemo/sensor.py
+++ b/homeassistant/components/wemo/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfEnergy, UnitOfPower
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import async_wemo_dispatcher_connect
@@ -59,7 +59,7 @@ ATTRIBUTE_SENSORS = (
 async def async_setup_entry(
     hass: HomeAssistant,
     _config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up WeMo sensors."""
 
diff --git a/homeassistant/components/wemo/switch.py b/homeassistant/components/wemo/switch.py
index 3f7bb08b704..7b87b3147d0 100644
--- a/homeassistant/components/wemo/switch.py
+++ b/homeassistant/components/wemo/switch.py
@@ -11,7 +11,7 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_OFF, STATE_ON, STATE_STANDBY, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import async_wemo_dispatcher_connect
 from .coordinator import DeviceCoordinator
@@ -36,7 +36,7 @@ MAKER_SWITCH_TOGGLE = "toggle"
 async def async_setup_entry(
     hass: HomeAssistant,
     _config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up WeMo switches."""
 
diff --git a/homeassistant/components/whirlpool/__init__.py b/homeassistant/components/whirlpool/__init__.py
index 64adcda4742..cb073779379 100644
--- a/homeassistant/components/whirlpool/__init__.py
+++ b/homeassistant/components/whirlpool/__init__.py
@@ -1,11 +1,10 @@
 """The Whirlpool Appliances integration."""
 
-from dataclasses import dataclass
 import logging
 
 from aiohttp import ClientError
 from whirlpool.appliancesmanager import AppliancesManager
-from whirlpool.auth import Auth
+from whirlpool.auth import AccountLockedError as WhirlpoolAccountLocked, Auth
 from whirlpool.backendselector import BackendSelector
 
 from homeassistant.config_entries import ConfigEntry
@@ -20,7 +19,7 @@ _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS = [Platform.CLIMATE, Platform.SENSOR]
 
-type WhirlpoolConfigEntry = ConfigEntry[WhirlpoolData]
+type WhirlpoolConfigEntry = ConfigEntry[AppliancesManager]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: WhirlpoolConfigEntry) -> bool:
@@ -39,6 +38,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: WhirlpoolConfigEntry) ->
         await auth.do_auth(store=False)
     except (ClientError, TimeoutError) as ex:
         raise ConfigEntryNotReady("Cannot connect") from ex
+    except WhirlpoolAccountLocked as ex:
+        raise ConfigEntryAuthFailed(
+            translation_domain=DOMAIN, translation_key="account_locked"
+        ) from ex
 
     if not auth.is_access_token_valid():
         _LOGGER.error("Authentication failed")
@@ -48,8 +51,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: WhirlpoolConfigEntry) ->
     if not await appliances_manager.fetch_appliances():
         _LOGGER.error("Cannot fetch appliances")
         return False
+    await appliances_manager.connect()
 
-    entry.runtime_data = WhirlpoolData(appliances_manager, auth, backend_selector)
+    entry.runtime_data = appliances_manager
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
@@ -57,13 +61,5 @@ async def async_setup_entry(hass: HomeAssistant, entry: WhirlpoolConfigEntry) ->
 
 async def async_unload_entry(hass: HomeAssistant, entry: WhirlpoolConfigEntry) -> bool:
     """Unload a config entry."""
+    await entry.runtime_data.disconnect()
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-
-
-@dataclass
-class WhirlpoolData:
-    """Whirlpool integaration shared data."""
-
-    appliances_manager: AppliancesManager
-    auth: Auth
-    backend_selector: BackendSelector
diff --git a/homeassistant/components/whirlpool/climate.py b/homeassistant/components/whirlpool/climate.py
index 943c5d1c956..84a2c0d52ca 100644
--- a/homeassistant/components/whirlpool/climate.py
+++ b/homeassistant/components/whirlpool/climate.py
@@ -5,10 +5,7 @@ from __future__ import annotations
 import logging
 from typing import Any
 
-from aiohttp import ClientSession
 from whirlpool.aircon import Aircon, FanSpeed as AirconFanSpeed, Mode as AirconMode
-from whirlpool.auth import Auth
-from whirlpool.backendselector import BackendSelector
 
 from homeassistant.components.climate import (
     ENTITY_ID_FORMAT,
@@ -25,10 +22,9 @@ from homeassistant.components.climate import (
 )
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import generate_entity_id
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import WhirlpoolConfigEntry
 from .const import DOMAIN
@@ -70,22 +66,11 @@ SUPPORTED_TARGET_TEMPERATURE_STEP = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: WhirlpoolConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry."""
-    whirlpool_data = config_entry.runtime_data
-
-    aircons = [
-        AirConEntity(
-            hass,
-            ac_data["SAID"],
-            ac_data["NAME"],
-            whirlpool_data.backend_selector,
-            whirlpool_data.auth,
-            async_get_clientsession(hass),
-        )
-        for ac_data in whirlpool_data.appliances_manager.aircons
-    ]
+    appliances_manager = config_entry.runtime_data
+    aircons = [AirConEntity(hass, aircon) for aircon in appliances_manager.aircons]
     async_add_entities(aircons, True)
 
 
@@ -110,36 +95,26 @@ class AirConEntity(ClimateEntity):
     _attr_target_temperature_step = SUPPORTED_TARGET_TEMPERATURE_STEP
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
 
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        said: str,
-        name: str | None,
-        backend_selector: BackendSelector,
-        auth: Auth,
-        session: ClientSession,
-    ) -> None:
+    def __init__(self, hass: HomeAssistant, aircon: Aircon) -> None:
         """Initialize the entity."""
-        self._aircon = Aircon(backend_selector, auth, said, session)
-        self.entity_id = generate_entity_id(ENTITY_ID_FORMAT, said, hass=hass)
-        self._attr_unique_id = said
+        self._aircon = aircon
+        self.entity_id = generate_entity_id(ENTITY_ID_FORMAT, aircon.said, hass=hass)
+        self._attr_unique_id = aircon.said
 
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, said)},
-            name=name if name is not None else said,
+            identifiers={(DOMAIN, aircon.said)},
+            name=aircon.name if aircon.name is not None else aircon.said,
             manufacturer="Whirlpool",
             model="Sixth Sense",
         )
 
     async def async_added_to_hass(self) -> None:
-        """Connect aircon to the cloud."""
+        """Register updates callback."""
         self._aircon.register_attr_callback(self.async_write_ha_state)
-        await self._aircon.connect()
 
     async def async_will_remove_from_hass(self) -> None:
-        """Close Whrilpool Appliance sockets before removing."""
+        """Unregister updates callback."""
         self._aircon.unregister_attr_callback(self.async_write_ha_state)
-        await self._aircon.disconnect()
 
     @property
     def available(self) -> bool:
diff --git a/homeassistant/components/whirlpool/config_flow.py b/homeassistant/components/whirlpool/config_flow.py
index 069a5ca1e4f..19715643e3a 100644
--- a/homeassistant/components/whirlpool/config_flow.py
+++ b/homeassistant/components/whirlpool/config_flow.py
@@ -9,13 +9,12 @@ from typing import Any
 from aiohttp import ClientError
 import voluptuous as vol
 from whirlpool.appliancesmanager import AppliancesManager
-from whirlpool.auth import Auth
+from whirlpool.auth import AccountLockedError as WhirlpoolAccountLocked, Auth
 from whirlpool.backendselector import BackendSelector
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_PASSWORD, CONF_REGION, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import CONF_BRAND, CONF_BRANDS_MAP, CONF_REGIONS_MAP, DOMAIN
@@ -40,31 +39,41 @@ REAUTH_SCHEMA = vol.Schema(
 )
 
 
-async def validate_input(hass: HomeAssistant, data: dict[str, str]) -> dict[str, str]:
-    """Validate the user input allows us to connect.
+async def authenticate(
+    hass: HomeAssistant, data: dict[str, str], check_appliances_exist: bool
+) -> str | None:
+    """Authenticate with the api.
 
-    Data has the keys from STEP_USER_DATA_SCHEMA with values provided by the user.
+    data has the keys from STEP_USER_DATA_SCHEMA with values provided by the user.
+    Returns the error translation key if authentication fails, or None on success.
     """
     session = async_get_clientsession(hass)
     region = CONF_REGIONS_MAP[data[CONF_REGION]]
     brand = CONF_BRANDS_MAP[data[CONF_BRAND]]
     backend_selector = BackendSelector(brand, region)
     auth = Auth(backend_selector, data[CONF_USERNAME], data[CONF_PASSWORD], session)
+
     try:
         await auth.do_auth()
-    except (TimeoutError, ClientError) as exc:
-        raise CannotConnect from exc
+    except WhirlpoolAccountLocked:
+        return "account_locked"
+    except (TimeoutError, ClientError):
+        return "cannot_connect"
+    except Exception:
+        _LOGGER.exception("Unexpected exception")
+        return "unknown"
 
     if not auth.is_access_token_valid():
-        raise InvalidAuth
+        return "invalid_auth"
 
-    appliances_manager = AppliancesManager(backend_selector, auth, session)
-    await appliances_manager.fetch_appliances()
+    if check_appliances_exist:
+        appliances_manager = AppliancesManager(backend_selector, auth, session)
+        await appliances_manager.fetch_appliances()
 
-    if not appliances_manager.aircons and not appliances_manager.washer_dryers:
-        raise NoAppliances
+        if not appliances_manager.aircons and not appliances_manager.washer_dryers:
+            return "no_appliances"
 
-    return {"title": data[CONF_USERNAME]}
+    return None
 
 
 class WhirlpoolConfigFlow(ConfigFlow, domain=DOMAIN):
@@ -90,14 +99,10 @@ class WhirlpoolConfigFlow(ConfigFlow, domain=DOMAIN):
             brand = user_input[CONF_BRAND]
             data = {**reauth_entry.data, CONF_PASSWORD: password, CONF_BRAND: brand}
 
-            try:
-                await validate_input(self.hass, data)
-            except InvalidAuth:
-                errors["base"] = "invalid_auth"
-            except (CannotConnect, TimeoutError):
-                errors["base"] = "cannot_connect"
-            else:
+            error_key = await authenticate(self.hass, data, False)
+            if not error_key:
                 return self.async_update_reload_and_abort(reauth_entry, data=data)
+            errors["base"] = error_key
 
         return self.async_show_form(
             step_id="reauth_confirm",
@@ -113,38 +118,17 @@ class WhirlpoolConfigFlow(ConfigFlow, domain=DOMAIN):
                 step_id="user", data_schema=STEP_USER_DATA_SCHEMA
             )
 
-        errors = {}
-
-        try:
-            info = await validate_input(self.hass, user_input)
-        except CannotConnect:
-            errors["base"] = "cannot_connect"
-        except InvalidAuth:
-            errors["base"] = "invalid_auth"
-        except NoAppliances:
-            errors["base"] = "no_appliances"
-        except Exception:
-            _LOGGER.exception("Unexpected exception")
-            errors["base"] = "unknown"
-        else:
+        error_key = await authenticate(self.hass, user_input, True)
+        if not error_key:
             await self.async_set_unique_id(
                 user_input[CONF_USERNAME].lower(), raise_on_progress=False
             )
             self._abort_if_unique_id_configured()
-            return self.async_create_entry(title=info["title"], data=user_input)
+            return self.async_create_entry(
+                title=user_input[CONF_USERNAME], data=user_input
+            )
 
+        errors = {"base": error_key}
         return self.async_show_form(
             step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
         )
-
-
-class CannotConnect(HomeAssistantError):
-    """Error to indicate we cannot connect."""
-
-
-class InvalidAuth(HomeAssistantError):
-    """Error to indicate there is invalid auth."""
-
-
-class NoAppliances(HomeAssistantError):
-    """Error to indicate no supported appliances in the user account."""
diff --git a/homeassistant/components/whirlpool/diagnostics.py b/homeassistant/components/whirlpool/diagnostics.py
index 87d6ea827e2..09338396de4 100644
--- a/homeassistant/components/whirlpool/diagnostics.py
+++ b/homeassistant/components/whirlpool/diagnostics.py
@@ -4,6 +4,8 @@ from __future__ import annotations
 
 from typing import Any
 
+from whirlpool.appliance import Appliance
+
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.core import HomeAssistant
 
@@ -26,18 +28,25 @@ async def async_get_config_entry_diagnostics(
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
 
-    whirlpool = config_entry.runtime_data
+    def get_appliance_diagnostics(appliance: Appliance) -> dict[str, Any]:
+        return {
+            "data_model": appliance.appliance_info.data_model,
+            "category": appliance.appliance_info.category,
+            "model_number": appliance.appliance_info.model_number,
+        }
+
+    appliances_manager = config_entry.runtime_data
     diagnostics_data = {
-        "Washer_dryers": {
-            wd["NAME"]: dict(wd.items())
-            for wd in whirlpool.appliances_manager.washer_dryers
+        "washer_dryers": {
+            wd.name: get_appliance_diagnostics(wd)
+            for wd in appliances_manager.washer_dryers
         },
         "aircons": {
-            ac["NAME"]: dict(ac.items()) for ac in whirlpool.appliances_manager.aircons
+            ac.name: get_appliance_diagnostics(ac) for ac in appliances_manager.aircons
         },
         "ovens": {
-            oven["NAME"]: dict(oven.items())
-            for oven in whirlpool.appliances_manager.ovens
+            oven.name: get_appliance_diagnostics(oven)
+            for oven in appliances_manager.ovens
         },
     }
 
diff --git a/homeassistant/components/whirlpool/manifest.json b/homeassistant/components/whirlpool/manifest.json
index b463a1a76f8..ace2e31791d 100644
--- a/homeassistant/components/whirlpool/manifest.json
+++ b/homeassistant/components/whirlpool/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_push",
   "loggers": ["whirlpool"],
-  "requirements": ["whirlpool-sixth-sense==0.18.11"]
+  "requirements": ["whirlpool-sixth-sense==0.19.1"]
 }
diff --git a/homeassistant/components/whirlpool/sensor.py b/homeassistant/components/whirlpool/sensor.py
index 9180164c272..d0d13a128e2 100644
--- a/homeassistant/components/whirlpool/sensor.py
+++ b/homeassistant/components/whirlpool/sensor.py
@@ -16,9 +16,8 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util.dt import utcnow
 
@@ -132,39 +131,18 @@ SENSOR_TIMER: tuple[SensorEntityDescription] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: WhirlpoolConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
-    """Config flow entry for Whrilpool Laundry."""
+    """Config flow entry for Whirlpool sensors."""
     entities: list = []
-    whirlpool_data = config_entry.runtime_data
-    for appliance in whirlpool_data.appliances_manager.washer_dryers:
-        _wd = WasherDryer(
-            whirlpool_data.backend_selector,
-            whirlpool_data.auth,
-            appliance["SAID"],
-            async_get_clientsession(hass),
-        )
-        await _wd.connect()
-
+    appliances_manager = config_entry.runtime_data
+    for washer_dryer in appliances_manager.washer_dryers:
         entities.extend(
-            [
-                WasherDryerClass(
-                    appliance["SAID"],
-                    appliance["NAME"],
-                    description,
-                    _wd,
-                )
-                for description in SENSORS
-            ]
+            [WasherDryerClass(washer_dryer, description) for description in SENSORS]
         )
         entities.extend(
             [
-                WasherDryerTimeClass(
-                    appliance["SAID"],
-                    appliance["NAME"],
-                    description,
-                    _wd,
-                )
+                WasherDryerTimeClass(washer_dryer, description)
                 for description in SENSOR_TIMER
             ]
         )
@@ -178,34 +156,30 @@ class WasherDryerClass(SensorEntity):
     _attr_has_entity_name = True
 
     def __init__(
-        self,
-        said: str,
-        name: str,
-        description: WhirlpoolSensorEntityDescription,
-        washdry: WasherDryer,
+        self, washer_dryer: WasherDryer, description: WhirlpoolSensorEntityDescription
     ) -> None:
         """Initialize the washer sensor."""
-        self._wd: WasherDryer = washdry
+        self._wd: WasherDryer = washer_dryer
 
-        if name == "dryer":
+        if washer_dryer.name == "dryer":
             self._attr_icon = ICON_D
         else:
             self._attr_icon = ICON_W
 
         self.entity_description: WhirlpoolSensorEntityDescription = description
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, said)},
-            name=name.capitalize(),
+            identifiers={(DOMAIN, washer_dryer.said)},
+            name=washer_dryer.name.capitalize(),
             manufacturer="Whirlpool",
         )
-        self._attr_unique_id = f"{said}-{description.key}"
+        self._attr_unique_id = f"{washer_dryer.said}-{description.key}"
 
     async def async_added_to_hass(self) -> None:
-        """Connect washer/dryer to the cloud."""
+        """Register updates callback."""
         self._wd.register_attr_callback(self.async_write_ha_state)
 
     async def async_will_remove_from_hass(self) -> None:
-        """Close Whirlpool Appliance sockets before removing."""
+        """Unregister updates callback."""
         self._wd.unregister_attr_callback(self.async_write_ha_state)
 
     @property
@@ -226,16 +200,12 @@ class WasherDryerTimeClass(RestoreSensor):
     _attr_has_entity_name = True
 
     def __init__(
-        self,
-        said: str,
-        name: str,
-        description: SensorEntityDescription,
-        washdry: WasherDryer,
+        self, washer_dryer: WasherDryer, description: SensorEntityDescription
     ) -> None:
         """Initialize the washer sensor."""
-        self._wd: WasherDryer = washdry
+        self._wd: WasherDryer = washer_dryer
 
-        if name == "dryer":
+        if washer_dryer.name == "dryer":
             self._attr_icon = ICON_D
         else:
             self._attr_icon = ICON_W
@@ -243,11 +213,11 @@ class WasherDryerTimeClass(RestoreSensor):
         self.entity_description: SensorEntityDescription = description
         self._running: bool | None = None
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, said)},
-            name=name.capitalize(),
+            identifiers={(DOMAIN, washer_dryer.said)},
+            name=washer_dryer.name.capitalize(),
             manufacturer="Whirlpool",
         )
-        self._attr_unique_id = f"{said}-{description.key}"
+        self._attr_unique_id = f"{washer_dryer.said}-{description.key}"
 
     async def async_added_to_hass(self) -> None:
         """Connect washer/dryer to the cloud."""
@@ -259,7 +229,6 @@ class WasherDryerTimeClass(RestoreSensor):
     async def async_will_remove_from_hass(self) -> None:
         """Close Whrilpool Appliance sockets before removing."""
         self._wd.unregister_attr_callback(self.update_from_latest_data)
-        await self._wd.disconnect()
 
     @property
     def available(self) -> bool:
diff --git a/homeassistant/components/whirlpool/strings.json b/homeassistant/components/whirlpool/strings.json
index 09257652ece..95df3fb9098 100644
--- a/homeassistant/components/whirlpool/strings.json
+++ b/homeassistant/components/whirlpool/strings.json
@@ -1,4 +1,7 @@
 {
+  "common": {
+    "account_locked_error": "The account is locked. Please follow the instructions in the manufacturer's app to unlock it"
+  },
   "config": {
     "step": {
       "user": {
@@ -31,6 +34,7 @@
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     },
     "error": {
+      "account_locked": "[%key:component::whirlpool::common::account_locked_error%]",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "unknown": "[%key:common::config_flow::error::unknown%]",
@@ -85,5 +89,10 @@
         "name": "End time"
       }
     }
+  },
+  "exceptions": {
+    "account_locked": {
+      "message": "[%key:component::whirlpool::common::account_locked_error%]"
+    }
   }
 }
diff --git a/homeassistant/components/whois/config_flow.py b/homeassistant/components/whois/config_flow.py
index cb4326d996d..a8306be7632 100644
--- a/homeassistant/components/whois/config_flow.py
+++ b/homeassistant/components/whois/config_flow.py
@@ -11,6 +11,8 @@ from whois.exceptions import (
     UnknownDateFormat,
     UnknownTld,
     WhoisCommandFailed,
+    WhoisPrivateRegistry,
+    WhoisQuotaExceeded,
 )
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
@@ -48,6 +50,10 @@ class WhoisFlowHandler(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "unexpected_response"
             except UnknownDateFormat:
                 errors["base"] = "unknown_date_format"
+            except WhoisPrivateRegistry:
+                errors["base"] = "private_registry"
+            except WhoisQuotaExceeded:
+                errors["base"] = "quota_exceeded"
             else:
                 return self.async_create_entry(
                     title=self.imported_name or user_input[CONF_DOMAIN],
diff --git a/homeassistant/components/whois/sensor.py b/homeassistant/components/whois/sensor.py
index fe193b16eea..8098e052575 100644
--- a/homeassistant/components/whois/sensor.py
+++ b/homeassistant/components/whois/sensor.py
@@ -18,7 +18,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DOMAIN, EntityCategory, UnitOfTime
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -127,7 +127,7 @@ SENSORS: tuple[WhoisSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the platform from config_entry."""
     coordinator: DataUpdateCoordinator[Domain | None] = hass.data[DOMAIN][
diff --git a/homeassistant/components/whois/strings.json b/homeassistant/components/whois/strings.json
index c28c079784d..3b0f9dfd4d1 100644
--- a/homeassistant/components/whois/strings.json
+++ b/homeassistant/components/whois/strings.json
@@ -11,7 +11,9 @@
       "unexpected_response": "Unexpected response from whois server",
       "unknown_date_format": "Unknown date format in whois server response",
       "unknown_tld": "The given TLD is unknown or not available to this integration",
-      "whois_command_failed": "Whois command failed: could not retrieve whois information"
+      "whois_command_failed": "Whois command failed: could not retrieve whois information",
+      "private_registry": "The given domain is registered in a private registry and cannot be monitored",
+      "quota_exceeded": "Your whois quota has been exceeded for this TLD"
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
diff --git a/homeassistant/components/wiffi/binary_sensor.py b/homeassistant/components/wiffi/binary_sensor.py
index b7431b2555c..93fdb7cce1c 100644
--- a/homeassistant/components/wiffi/binary_sensor.py
+++ b/homeassistant/components/wiffi/binary_sensor.py
@@ -4,7 +4,7 @@ from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CREATE_ENTITY_SIGNAL
 from .entity import WiffiEntity
@@ -13,7 +13,7 @@ from .entity import WiffiEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up platform for a new integration.
 
diff --git a/homeassistant/components/wiffi/entity.py b/homeassistant/components/wiffi/entity.py
index fd774c930c8..84bbc9b3df1 100644
--- a/homeassistant/components/wiffi/entity.py
+++ b/homeassistant/components/wiffi/entity.py
@@ -41,7 +41,7 @@ class WiffiEntity(Entity):
         self._value = None
         self._timeout = options.get(CONF_TIMEOUT, DEFAULT_TIMEOUT)
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Entity has been added to hass."""
         self.async_on_remove(
             async_dispatcher_connect(
diff --git a/homeassistant/components/wiffi/sensor.py b/homeassistant/components/wiffi/sensor.py
index 699a760685a..9afcc719c9b 100644
--- a/homeassistant/components/wiffi/sensor.py
+++ b/homeassistant/components/wiffi/sensor.py
@@ -9,7 +9,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import DEGREE, LIGHT_LUX, UnitOfPressure, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CREATE_ENTITY_SIGNAL
 from .entity import WiffiEntity
@@ -41,7 +41,7 @@ UOM_MAP = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up platform for a new integration.
 
diff --git a/homeassistant/components/wilight/cover.py b/homeassistant/components/wilight/cover.py
index 8a5cb45d909..2e9b92e7a21 100644
--- a/homeassistant/components/wilight/cover.py
+++ b/homeassistant/components/wilight/cover.py
@@ -18,7 +18,7 @@ from pywilight.const import (
 from homeassistant.components.cover import ATTR_POSITION, CoverEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import WiLightDevice
@@ -26,7 +26,9 @@ from .parent_device import WiLightParent
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up WiLight covers from a config entry."""
     parent: WiLightParent = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/wilight/fan.py b/homeassistant/components/wilight/fan.py
index a14198e3b5d..6a22da5879e 100644
--- a/homeassistant/components/wilight/fan.py
+++ b/homeassistant/components/wilight/fan.py
@@ -19,7 +19,7 @@ from pywilight.wilight_device import PyWiLightDevice
 from homeassistant.components.fan import DIRECTION_FORWARD, FanEntity, FanEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     ordered_list_item_to_percentage,
     percentage_to_ordered_list_item,
@@ -33,7 +33,9 @@ ORDERED_NAMED_FAN_SPEEDS = [WL_SPEED_LOW, WL_SPEED_MEDIUM, WL_SPEED_HIGH]
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up WiLight lights from a config entry."""
     parent: WiLightParent = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/wilight/light.py b/homeassistant/components/wilight/light.py
index fbe2499798d..7df0eb1a4c6 100644
--- a/homeassistant/components/wilight/light.py
+++ b/homeassistant/components/wilight/light.py
@@ -15,7 +15,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import WiLightDevice
@@ -41,7 +41,9 @@ def entities_from_discovered_wilight(api_device: PyWiLightDevice) -> list[LightE
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up WiLight lights from a config entry."""
     parent: WiLightParent = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/wilight/switch.py b/homeassistant/components/wilight/switch.py
index f2a1ce8b0c5..148ea65dd94 100644
--- a/homeassistant/components/wilight/switch.py
+++ b/homeassistant/components/wilight/switch.py
@@ -12,7 +12,7 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import WiLightDevice
@@ -75,7 +75,9 @@ def entities_from_discovered_wilight(api_device: PyWiLightDevice) -> tuple[Any]:
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up WiLight switches from a config entry."""
     parent: WiLightParent = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/wirelesstag/__init__.py b/homeassistant/components/wirelesstag/__init__.py
index a32e940073b..806e7abed00 100644
--- a/homeassistant/components/wirelesstag/__init__.py
+++ b/homeassistant/components/wirelesstag/__init__.py
@@ -10,7 +10,7 @@ from wirelesstagpy.exceptions import WirelessTagsException
 from homeassistant.components import persistent_notification
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import dispatcher_send
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/wirelesstag/binary_sensor.py b/homeassistant/components/wirelesstag/binary_sensor.py
index 9e8075dd874..8a0957e16e3 100644
--- a/homeassistant/components/wirelesstag/binary_sensor.py
+++ b/homeassistant/components/wirelesstag/binary_sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import CONF_MONITORED_CONDITIONS, STATE_OFF, STATE_ON, Platform
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/wirelesstag/entity.py b/homeassistant/components/wirelesstag/entity.py
index 31f8ee99d0d..73b13cdc397 100644
--- a/homeassistant/components/wirelesstag/entity.py
+++ b/homeassistant/components/wirelesstag/entity.py
@@ -60,11 +60,11 @@ class WirelessTagBaseSensor(Entity):
         return f"{value:.1f}"
 
     @property
-    def available(self):
+    def available(self) -> bool:
         """Return True if entity is available."""
         return self._tag.is_alive
 
-    def update(self):
+    def update(self) -> None:
         """Update state."""
         if not self.should_poll:
             return
diff --git a/homeassistant/components/wirelesstag/sensor.py b/homeassistant/components/wirelesstag/sensor.py
index 7a3cbe5efe2..9b92480ecf9 100644
--- a/homeassistant/components/wirelesstag/sensor.py
+++ b/homeassistant/components/wirelesstag/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_MONITORED_CONDITIONS, Platform
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
diff --git a/homeassistant/components/wirelesstag/switch.py b/homeassistant/components/wirelesstag/switch.py
index cae5d63988c..9fa630d4f55 100644
--- a/homeassistant/components/wirelesstag/switch.py
+++ b/homeassistant/components/wirelesstag/switch.py
@@ -13,7 +13,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import CONF_MONITORED_CONDITIONS, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/withings/__init__.py b/homeassistant/components/withings/__init__.py
index 59c3ed8433f..1392b72f16b 100644
--- a/homeassistant/components/withings/__init__.py
+++ b/homeassistant/components/withings/__init__.py
@@ -120,13 +120,17 @@ async def async_setup_entry(hass: HomeAssistant, entry: WithingsConfigEntry) ->
     client.refresh_token_function = _refresh_token
     withings_data = WithingsData(
         client=client,
-        measurement_coordinator=WithingsMeasurementDataUpdateCoordinator(hass, client),
-        sleep_coordinator=WithingsSleepDataUpdateCoordinator(hass, client),
-        bed_presence_coordinator=WithingsBedPresenceDataUpdateCoordinator(hass, client),
-        goals_coordinator=WithingsGoalsDataUpdateCoordinator(hass, client),
-        activity_coordinator=WithingsActivityDataUpdateCoordinator(hass, client),
-        workout_coordinator=WithingsWorkoutDataUpdateCoordinator(hass, client),
-        device_coordinator=WithingsDeviceDataUpdateCoordinator(hass, client),
+        measurement_coordinator=WithingsMeasurementDataUpdateCoordinator(
+            hass, entry, client
+        ),
+        sleep_coordinator=WithingsSleepDataUpdateCoordinator(hass, entry, client),
+        bed_presence_coordinator=WithingsBedPresenceDataUpdateCoordinator(
+            hass, entry, client
+        ),
+        goals_coordinator=WithingsGoalsDataUpdateCoordinator(hass, entry, client),
+        activity_coordinator=WithingsActivityDataUpdateCoordinator(hass, entry, client),
+        workout_coordinator=WithingsWorkoutDataUpdateCoordinator(hass, entry, client),
+        device_coordinator=WithingsDeviceDataUpdateCoordinator(hass, entry, client),
     )
 
     for coordinator in withings_data.coordinators:
diff --git a/homeassistant/components/withings/binary_sensor.py b/homeassistant/components/withings/binary_sensor.py
index 691026ccb9a..457bbe59bcc 100644
--- a/homeassistant/components/withings/binary_sensor.py
+++ b/homeassistant/components/withings/binary_sensor.py
@@ -10,8 +10,8 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import WithingsConfigEntry
 from .const import DOMAIN
@@ -22,7 +22,7 @@ from .entity import WithingsEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: WithingsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor config entry."""
     coordinator = entry.runtime_data.bed_presence_coordinator
diff --git a/homeassistant/components/withings/calendar.py b/homeassistant/components/withings/calendar.py
index acab0fa5c40..8dcad9d73ba 100644
--- a/homeassistant/components/withings/calendar.py
+++ b/homeassistant/components/withings/calendar.py
@@ -10,8 +10,8 @@ from aiowithings import WithingsClient, WorkoutCategory
 from homeassistant.components.calendar import CalendarEntity, CalendarEvent
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DOMAIN, WithingsConfigEntry
 from .coordinator import WithingsWorkoutDataUpdateCoordinator
@@ -21,7 +21,7 @@ from .entity import WithingsEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: WithingsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the calendar platform for entity."""
     ent_reg = er.async_get(hass)
diff --git a/homeassistant/components/withings/coordinator.py b/homeassistant/components/withings/coordinator.py
index 79419ae23ff..13789816d85 100644
--- a/homeassistant/components/withings/coordinator.py
+++ b/homeassistant/components/withings/coordinator.py
@@ -44,11 +44,17 @@ class WithingsDataUpdateCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
     webhooks_connected: bool = False
     coordinator_name: str = ""
 
-    def __init__(self, hass: HomeAssistant, client: WithingsClient) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: WithingsConfigEntry,
+        client: WithingsClient,
+    ) -> None:
         """Initialize the Withings data coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name="",
             update_interval=self._default_update_interval,
         )
@@ -95,9 +101,14 @@ class WithingsMeasurementDataUpdateCoordinator(
 
     coordinator_name: str = "measurements"
 
-    def __init__(self, hass: HomeAssistant, client: WithingsClient) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: WithingsConfigEntry,
+        client: WithingsClient,
+    ) -> None:
         """Initialize the Withings data coordinator."""
-        super().__init__(hass, client)
+        super().__init__(hass, config_entry, client)
         self.notification_categories = {
             NotificationCategory.WEIGHT,
             NotificationCategory.PRESSURE,
@@ -133,9 +144,14 @@ class WithingsSleepDataUpdateCoordinator(
 
     coordinator_name: str = "sleep"
 
-    def __init__(self, hass: HomeAssistant, client: WithingsClient) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: WithingsConfigEntry,
+        client: WithingsClient,
+    ) -> None:
         """Initialize the Withings data coordinator."""
-        super().__init__(hass, client)
+        super().__init__(hass, config_entry, client)
         self.notification_categories = {
             NotificationCategory.SLEEP,
         }
@@ -184,9 +200,14 @@ class WithingsBedPresenceDataUpdateCoordinator(WithingsDataUpdateCoordinator[Non
     in_bed: bool | None = None
     _default_update_interval = None
 
-    def __init__(self, hass: HomeAssistant, client: WithingsClient) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: WithingsConfigEntry,
+        client: WithingsClient,
+    ) -> None:
         """Initialize the Withings data coordinator."""
-        super().__init__(hass, client)
+        super().__init__(hass, config_entry, client)
         self.notification_categories = {
             NotificationCategory.IN_BED,
             NotificationCategory.OUT_BED,
@@ -226,9 +247,14 @@ class WithingsActivityDataUpdateCoordinator(
     coordinator_name: str = "activity"
     _previous_data: Activity | None = None
 
-    def __init__(self, hass: HomeAssistant, client: WithingsClient) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: WithingsConfigEntry,
+        client: WithingsClient,
+    ) -> None:
         """Initialize the Withings data coordinator."""
-        super().__init__(hass, client)
+        super().__init__(hass, config_entry, client)
         self.notification_categories = {
             NotificationCategory.ACTIVITY,
         }
@@ -265,9 +291,14 @@ class WithingsWorkoutDataUpdateCoordinator(
     coordinator_name: str = "workout"
     _previous_data: Workout | None = None
 
-    def __init__(self, hass: HomeAssistant, client: WithingsClient) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: WithingsConfigEntry,
+        client: WithingsClient,
+    ) -> None:
         """Initialize the Withings data coordinator."""
-        super().__init__(hass, client)
+        super().__init__(hass, config_entry, client)
         self.notification_categories = {
             NotificationCategory.ACTIVITY,
         }
diff --git a/homeassistant/components/withings/manifest.json b/homeassistant/components/withings/manifest.json
index 4c78e077d21..232997da054 100644
--- a/homeassistant/components/withings/manifest.json
+++ b/homeassistant/components/withings/manifest.json
@@ -13,5 +13,5 @@
   "documentation": "https://www.home-assistant.io/integrations/withings",
   "iot_class": "cloud_push",
   "loggers": ["aiowithings"],
-  "requirements": ["aiowithings==3.1.5"]
+  "requirements": ["aiowithings==3.1.6"]
 }
diff --git a/homeassistant/components/withings/sensor.py b/homeassistant/components/withings/sensor.py
index 1005b5995a5..f20145f8bf9 100644
--- a/homeassistant/components/withings/sensor.py
+++ b/homeassistant/components/withings/sensor.py
@@ -36,7 +36,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util import dt as dt_util
 
@@ -122,7 +122,7 @@ MEASUREMENT_SENSORS: dict[
         measurement_type=MeasurementType.HEIGHT,
         translation_key="height",
         native_unit_of_measurement=UnitOfLength.METERS,
-        suggested_display_precision=1,
+        suggested_display_precision=2,
         device_class=SensorDeviceClass.DISTANCE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
@@ -326,6 +326,7 @@ SLEEP_SENSORS = [
         value_fn=lambda sleep_summary: sleep_summary.deep_sleep_duration,
         translation_key="deep_sleep",
         native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
         device_class=SensorDeviceClass.DURATION,
         state_class=SensorStateClass.MEASUREMENT,
     ),
@@ -334,6 +335,7 @@ SLEEP_SENSORS = [
         value_fn=lambda sleep_summary: sleep_summary.sleep_latency,
         translation_key="time_to_sleep",
         native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
         device_class=SensorDeviceClass.DURATION,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
@@ -343,6 +345,7 @@ SLEEP_SENSORS = [
         value_fn=lambda sleep_summary: sleep_summary.wake_up_latency,
         translation_key="time_to_wakeup",
         native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
         device_class=SensorDeviceClass.DURATION,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
@@ -376,6 +379,7 @@ SLEEP_SENSORS = [
         value_fn=lambda sleep_summary: sleep_summary.light_sleep_duration,
         translation_key="light_sleep",
         native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
         device_class=SensorDeviceClass.DURATION,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
@@ -385,6 +389,7 @@ SLEEP_SENSORS = [
         value_fn=lambda sleep_summary: sleep_summary.rem_sleep_duration,
         translation_key="rem_sleep",
         native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
         device_class=SensorDeviceClass.DURATION,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
@@ -425,6 +430,9 @@ SLEEP_SENSORS = [
         key="sleep_snoring",
         value_fn=lambda sleep_summary: sleep_summary.snoring,
         translation_key="snoring",
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.MINUTES,
+        device_class=SensorDeviceClass.DURATION,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
     ),
@@ -448,6 +456,7 @@ SLEEP_SENSORS = [
         value_fn=lambda sleep_summary: sleep_summary.total_time_awake,
         translation_key="wakeup_time",
         native_unit_of_measurement=UnitOfTime.SECONDS,
+        suggested_unit_of_measurement=UnitOfTime.HOURS,
         device_class=SensorDeviceClass.DURATION,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
@@ -683,7 +692,7 @@ def get_current_goals(goals: Goals) -> set[str]:
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: WithingsConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor config entry."""
     ent_reg = er.async_get(hass)
diff --git a/homeassistant/components/wiz/binary_sensor.py b/homeassistant/components/wiz/binary_sensor.py
index 3411ee200b9..385e6827d77 100644
--- a/homeassistant/components/wiz/binary_sensor.py
+++ b/homeassistant/components/wiz/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import WizConfigEntry
 from .const import DOMAIN, SIGNAL_WIZ_PIR
@@ -27,7 +27,7 @@ OCCUPANCY_UNIQUE_ID = "{}_occupancy"
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: WizConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the WiZ binary sensor platform."""
     mac = entry.runtime_data.bulb.mac
diff --git a/homeassistant/components/wiz/light.py b/homeassistant/components/wiz/light.py
index 9ef4cd57b3d..e38d518f6bc 100644
--- a/homeassistant/components/wiz/light.py
+++ b/homeassistant/components/wiz/light.py
@@ -20,7 +20,7 @@ from homeassistant.components.light import (
     filter_supported_color_modes,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import WizConfigEntry
 from .entity import WizToggleEntity
@@ -57,7 +57,7 @@ def _async_pilot_builder(**kwargs: Any) -> PilotBuilder:
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: WizConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the WiZ Platform from config_flow."""
     if entry.runtime_data.bulb.bulbtype.bulb_type != BulbClass.SOCKET:
diff --git a/homeassistant/components/wiz/manifest.json b/homeassistant/components/wiz/manifest.json
index 7b1ecdcdb6b..947e7f0b638 100644
--- a/homeassistant/components/wiz/manifest.json
+++ b/homeassistant/components/wiz/manifest.json
@@ -26,5 +26,5 @@
   ],
   "documentation": "https://www.home-assistant.io/integrations/wiz",
   "iot_class": "local_push",
-  "requirements": ["pywizlight==0.5.14"]
+  "requirements": ["pywizlight==0.6.2"]
 }
diff --git a/homeassistant/components/wiz/number.py b/homeassistant/components/wiz/number.py
index 0591e854d7d..0c8ee3f2bf4 100644
--- a/homeassistant/components/wiz/number.py
+++ b/homeassistant/components/wiz/number.py
@@ -15,7 +15,7 @@ from homeassistant.components.number import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import WizConfigEntry
 from .entity import WizEntity
@@ -68,7 +68,7 @@ NUMBERS: tuple[WizNumberEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: WizConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the wiz speed number."""
     async_add_entities(
diff --git a/homeassistant/components/wiz/sensor.py b/homeassistant/components/wiz/sensor.py
index eb77686a5cf..217dae9e8fb 100644
--- a/homeassistant/components/wiz/sensor.py
+++ b/homeassistant/components/wiz/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.const import (
     UnitOfPower,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import WizConfigEntry
 from .entity import WizEntity
@@ -45,7 +45,7 @@ POWER_SENSORS: tuple[SensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: WizConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the wiz sensor."""
     entities = [
diff --git a/homeassistant/components/wiz/switch.py b/homeassistant/components/wiz/switch.py
index 4c089d2d6d2..a57834bc18d 100644
--- a/homeassistant/components/wiz/switch.py
+++ b/homeassistant/components/wiz/switch.py
@@ -9,7 +9,7 @@ from pywizlight.bulblibrary import BulbClass
 
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import WizConfigEntry
 from .entity import WizToggleEntity
@@ -19,7 +19,7 @@ from .models import WizData
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: WizConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the WiZ switch platform."""
     if entry.runtime_data.bulb.bulbtype.bulb_type == BulbClass.SOCKET:
diff --git a/homeassistant/components/wled/button.py b/homeassistant/components/wled/button.py
index 74799b4dcc4..119b2dc9b9f 100644
--- a/homeassistant/components/wled/button.py
+++ b/homeassistant/components/wled/button.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from homeassistant.components.button import ButtonDeviceClass, ButtonEntity
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import WLEDConfigEntry
 from .coordinator import WLEDDataUpdateCoordinator
@@ -16,7 +16,7 @@ from .helpers import wled_exception_handler
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: WLEDConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up WLED button based on a config entry."""
     async_add_entities([WLEDRestartButton(entry.runtime_data)])
diff --git a/homeassistant/components/wled/light.py b/homeassistant/components/wled/light.py
index b4edf10dc58..5e2ff117580 100644
--- a/homeassistant/components/wled/light.py
+++ b/homeassistant/components/wled/light.py
@@ -17,7 +17,7 @@ from homeassistant.components.light import (
     LightEntityFeature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import WLEDConfigEntry
 from .const import (
@@ -39,7 +39,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: WLEDConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up WLED light based on a config entry."""
     coordinator = entry.runtime_data
@@ -284,7 +284,7 @@ class WLEDSegmentLight(WLEDEntity, LightEntity):
 def async_update_segments(
     coordinator: WLEDDataUpdateCoordinator,
     current_ids: set[int],
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Update segments."""
     segment_ids = {
diff --git a/homeassistant/components/wled/number.py b/homeassistant/components/wled/number.py
index 225d783bfdb..e4ff184fd4b 100644
--- a/homeassistant/components/wled/number.py
+++ b/homeassistant/components/wled/number.py
@@ -11,7 +11,7 @@ from wled import Segment
 from homeassistant.components.number import NumberEntity, NumberEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import WLEDConfigEntry
 from .const import ATTR_INTENSITY, ATTR_SPEED
@@ -25,7 +25,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: WLEDConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up WLED number based on a config entry."""
     coordinator = entry.runtime_data
@@ -130,7 +130,7 @@ class WLEDNumber(WLEDEntity, NumberEntity):
 def async_update_segments(
     coordinator: WLEDDataUpdateCoordinator,
     current_ids: set[int],
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Update segments."""
     segment_ids = {
diff --git a/homeassistant/components/wled/select.py b/homeassistant/components/wled/select.py
index a645b04573c..e340c323151 100644
--- a/homeassistant/components/wled/select.py
+++ b/homeassistant/components/wled/select.py
@@ -9,7 +9,7 @@ from wled import LiveDataOverride
 from homeassistant.components.select import SelectEntity
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import WLEDConfigEntry
 from .coordinator import WLEDDataUpdateCoordinator
@@ -22,7 +22,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: WLEDConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up WLED select based on a config entry."""
     coordinator = entry.runtime_data
@@ -191,7 +191,7 @@ class WLEDPaletteSelect(WLEDEntity, SelectEntity):
 def async_update_segments(
     coordinator: WLEDDataUpdateCoordinator,
     current_ids: set[int],
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Update segments."""
     segment_ids = {
diff --git a/homeassistant/components/wled/sensor.py b/homeassistant/components/wled/sensor.py
index 4f97c367612..06f96782019 100644
--- a/homeassistant/components/wled/sensor.py
+++ b/homeassistant/components/wled/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     UnitOfInformation,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util.dt import utcnow
 
@@ -128,7 +128,7 @@ SENSORS: tuple[WLEDSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: WLEDConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up WLED sensor based on a config entry."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/wled/switch.py b/homeassistant/components/wled/switch.py
index 643834dcdec..8ed6ed56114 100644
--- a/homeassistant/components/wled/switch.py
+++ b/homeassistant/components/wled/switch.py
@@ -8,7 +8,7 @@ from typing import Any
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import WLEDConfigEntry
 from .const import ATTR_DURATION, ATTR_TARGET_BRIGHTNESS, ATTR_UDP_PORT
@@ -22,7 +22,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: WLEDConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up WLED switch based on a config entry."""
     coordinator = entry.runtime_data
@@ -195,7 +195,7 @@ class WLEDReverseSwitch(WLEDEntity, SwitchEntity):
 def async_update_segments(
     coordinator: WLEDDataUpdateCoordinator,
     current_ids: set[int],
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Update segments."""
     segment_ids = {
diff --git a/homeassistant/components/wled/update.py b/homeassistant/components/wled/update.py
index 384b394ac50..ccf72425b77 100644
--- a/homeassistant/components/wled/update.py
+++ b/homeassistant/components/wled/update.py
@@ -10,7 +10,7 @@ from homeassistant.components.update import (
     UpdateEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import WLED_KEY, WLEDConfigEntry
 from .coordinator import WLEDDataUpdateCoordinator, WLEDReleasesDataUpdateCoordinator
@@ -21,7 +21,7 @@ from .helpers import wled_exception_handler
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: WLEDConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up WLED update based on a config entry."""
     async_add_entities([WLEDUpdateEntity(entry.runtime_data, hass.data[WLED_KEY])])
diff --git a/homeassistant/components/wmspro/cover.py b/homeassistant/components/wmspro/cover.py
index a36b34642b7..715add3023f 100644
--- a/homeassistant/components/wmspro/cover.py
+++ b/homeassistant/components/wmspro/cover.py
@@ -12,7 +12,7 @@ from wmspro.const import (
 
 from homeassistant.components.cover import ATTR_POSITION, CoverDeviceClass, CoverEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import WebControlProConfigEntry
 from .entity import WebControlProGenericEntity
@@ -24,7 +24,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: WebControlProConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the WMS based covers from a config entry."""
     hub = config_entry.runtime_data
diff --git a/homeassistant/components/wmspro/light.py b/homeassistant/components/wmspro/light.py
index 9242982bcf9..d181beb1eaa 100644
--- a/homeassistant/components/wmspro/light.py
+++ b/homeassistant/components/wmspro/light.py
@@ -9,7 +9,7 @@ from wmspro.const import WMS_WebControl_pro_API_actionDescription
 
 from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.color import brightness_to_value, value_to_brightness
 
 from . import WebControlProConfigEntry
@@ -23,7 +23,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: WebControlProConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the WMS based lights from a config entry."""
     hub = config_entry.runtime_data
diff --git a/homeassistant/components/wmspro/scene.py b/homeassistant/components/wmspro/scene.py
index de18106b7f0..7edd7a2b186 100644
--- a/homeassistant/components/wmspro/scene.py
+++ b/homeassistant/components/wmspro/scene.py
@@ -9,7 +9,7 @@ from wmspro.scene import Scene as WMS_Scene
 from homeassistant.components.scene import Scene
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import WebControlProConfigEntry
 from .const import ATTRIBUTION, DOMAIN, MANUFACTURER
@@ -18,7 +18,7 @@ from .const import ATTRIBUTION, DOMAIN, MANUFACTURER
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: WebControlProConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the WMS based scenes from a config entry."""
     hub = config_entry.runtime_data
diff --git a/homeassistant/components/wolflink/manifest.json b/homeassistant/components/wolflink/manifest.json
index 4bfc0e6dd83..5f3a6366fe1 100644
--- a/homeassistant/components/wolflink/manifest.json
+++ b/homeassistant/components/wolflink/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/wolflink",
   "iot_class": "cloud_polling",
   "loggers": ["wolf_comm"],
-  "requirements": ["wolf-comm==0.0.15"]
+  "requirements": ["wolf-comm==0.0.23"]
 }
diff --git a/homeassistant/components/wolflink/sensor.py b/homeassistant/components/wolflink/sensor.py
index 1f6e6c42464..9380c28de89 100644
--- a/homeassistant/components/wolflink/sensor.py
+++ b/homeassistant/components/wolflink/sensor.py
@@ -2,52 +2,150 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable
+from dataclasses import dataclass
+
 from wolf_comm.models import (
+    EnergyParameter,
+    FlowParameter,
+    FrequencyParameter,
     HoursParameter,
     ListItemParameter,
     Parameter,
     PercentageParameter,
+    PowerParameter,
     Pressure,
+    RPMParameter,
     SimpleParameter,
     Temperature,
 )
 
-from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import UnitOfPressure, UnitOfTemperature, UnitOfTime
+from homeassistant.const import (
+    PERCENTAGE,
+    REVOLUTIONS_PER_MINUTE,
+    UnitOfEnergy,
+    UnitOfFrequency,
+    UnitOfPower,
+    UnitOfPressure,
+    UnitOfTemperature,
+    UnitOfTime,
+    UnitOfVolumeFlowRate,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import COORDINATOR, DEVICE_ID, DOMAIN, MANUFACTURER, PARAMETERS, STATES
 
 
+def get_listitem_resolve_state(wolf_object, state):
+    """Resolve list item state."""
+    resolved_state = [item for item in wolf_object.items if item.value == int(state)]
+    if resolved_state:
+        resolved_name = resolved_state[0].name
+        state = STATES.get(resolved_name, resolved_name)
+    return state
+
+
+@dataclass(kw_only=True, frozen=True)
+class WolflinkSensorEntityDescription(SensorEntityDescription):
+    """Describes Wolflink sensor entity."""
+
+    value_fn: Callable[[Parameter, str], str | None] = lambda param, value: value
+    supported_fn: Callable[[Parameter], bool]
+
+
+SENSOR_DESCRIPTIONS = [
+    WolflinkSensorEntityDescription(
+        key="temperature",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        supported_fn=lambda param: isinstance(param, Temperature),
+    ),
+    WolflinkSensorEntityDescription(
+        key="pressure",
+        device_class=SensorDeviceClass.PRESSURE,
+        native_unit_of_measurement=UnitOfPressure.BAR,
+        supported_fn=lambda param: isinstance(param, Pressure),
+    ),
+    WolflinkSensorEntityDescription(
+        key="energy",
+        device_class=SensorDeviceClass.ENERGY,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        supported_fn=lambda param: isinstance(param, EnergyParameter),
+    ),
+    WolflinkSensorEntityDescription(
+        key="power",
+        device_class=SensorDeviceClass.POWER,
+        native_unit_of_measurement=UnitOfPower.KILO_WATT,
+        supported_fn=lambda param: isinstance(param, PowerParameter),
+    ),
+    WolflinkSensorEntityDescription(
+        key="percentage",
+        native_unit_of_measurement=PERCENTAGE,
+        supported_fn=lambda param: isinstance(param, PercentageParameter),
+    ),
+    WolflinkSensorEntityDescription(
+        key="list_item",
+        translation_key="state",
+        supported_fn=lambda param: isinstance(param, ListItemParameter),
+        value_fn=get_listitem_resolve_state,
+    ),
+    WolflinkSensorEntityDescription(
+        key="hours",
+        icon="mdi:clock",
+        native_unit_of_measurement=UnitOfTime.HOURS,
+        supported_fn=lambda param: isinstance(param, HoursParameter),
+    ),
+    WolflinkSensorEntityDescription(
+        key="flow",
+        device_class=SensorDeviceClass.VOLUME_FLOW_RATE,
+        native_unit_of_measurement=UnitOfVolumeFlowRate.LITERS_PER_MINUTE,
+        supported_fn=lambda param: isinstance(param, FlowParameter),
+    ),
+    WolflinkSensorEntityDescription(
+        key="frequency",
+        device_class=SensorDeviceClass.FREQUENCY,
+        native_unit_of_measurement=UnitOfFrequency.HERTZ,
+        supported_fn=lambda param: isinstance(param, FrequencyParameter),
+    ),
+    WolflinkSensorEntityDescription(
+        key="rpm",
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=REVOLUTIONS_PER_MINUTE,
+        supported_fn=lambda param: isinstance(param, RPMParameter),
+    ),
+    WolflinkSensorEntityDescription(
+        key="default",
+        supported_fn=lambda param: isinstance(param, SimpleParameter),
+    ),
+]
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up all entries for Wolf Platform."""
-
     coordinator = hass.data[DOMAIN][config_entry.entry_id][COORDINATOR]
     parameters = hass.data[DOMAIN][config_entry.entry_id][PARAMETERS]
     device_id = hass.data[DOMAIN][config_entry.entry_id][DEVICE_ID]
 
-    entities: list[WolfLinkSensor] = []
-    for parameter in parameters:
-        if isinstance(parameter, Temperature):
-            entities.append(WolfLinkTemperature(coordinator, parameter, device_id))
-        if isinstance(parameter, Pressure):
-            entities.append(WolfLinkPressure(coordinator, parameter, device_id))
-        if isinstance(parameter, PercentageParameter):
-            entities.append(WolfLinkPercentage(coordinator, parameter, device_id))
-        if isinstance(parameter, ListItemParameter):
-            entities.append(WolfLinkState(coordinator, parameter, device_id))
-        if isinstance(parameter, HoursParameter):
-            entities.append(WolfLinkHours(coordinator, parameter, device_id))
-        if isinstance(parameter, SimpleParameter):
-            entities.append(WolfLinkSensor(coordinator, parameter, device_id))
+    entities: list[WolfLinkSensor] = [
+        WolfLinkSensor(coordinator, parameter, device_id, description)
+        for parameter in parameters
+        for description in SENSOR_DESCRIPTIONS
+        if description.supported_fn(parameter)
+    ]
 
     async_add_entities(entities, True)
 
@@ -55,9 +153,18 @@ async def async_setup_entry(
 class WolfLinkSensor(CoordinatorEntity, SensorEntity):
     """Base class for all Wolf entities."""
 
-    def __init__(self, coordinator, wolf_object: Parameter, device_id) -> None:
+    entity_description: WolflinkSensorEntityDescription
+
+    def __init__(
+        self,
+        coordinator,
+        wolf_object: Parameter,
+        device_id: str,
+        description: WolflinkSensorEntityDescription,
+    ) -> None:
         """Initialize."""
         super().__init__(coordinator)
+        self.entity_description = description
         self.wolf_object = wolf_object
         self._attr_name = wolf_object.name
         self._attr_unique_id = f"{device_id}:{wolf_object.parameter_id}"
@@ -69,68 +176,26 @@ class WolfLinkSensor(CoordinatorEntity, SensorEntity):
         )
 
     @property
-    def native_value(self):
+    def native_value(self) -> str | None:
         """Return the state. Wolf Client is returning only changed values so we need to store old value here."""
         if self.wolf_object.parameter_id in self.coordinator.data:
             new_state = self.coordinator.data[self.wolf_object.parameter_id]
             self.wolf_object.value_id = new_state[0]
             self._state = new_state[1]
+            if (
+                isinstance(self.wolf_object, ListItemParameter)
+                and self._state is not None
+            ):
+                self._state = self.entity_description.value_fn(
+                    self.wolf_object, self._state
+                )
         return self._state
 
     @property
-    def extra_state_attributes(self):
+    def extra_state_attributes(self) -> dict[str, str | None]:
         """Return the state attributes."""
         return {
             "parameter_id": self.wolf_object.parameter_id,
             "value_id": self.wolf_object.value_id,
             "parent": self.wolf_object.parent,
         }
-
-
-class WolfLinkHours(WolfLinkSensor):
-    """Class for hour based entities."""
-
-    _attr_icon = "mdi:clock"
-    _attr_native_unit_of_measurement = UnitOfTime.HOURS
-
-
-class WolfLinkTemperature(WolfLinkSensor):
-    """Class for temperature based entities."""
-
-    _attr_device_class = SensorDeviceClass.TEMPERATURE
-    _attr_native_unit_of_measurement = UnitOfTemperature.CELSIUS
-
-
-class WolfLinkPressure(WolfLinkSensor):
-    """Class for pressure based entities."""
-
-    _attr_device_class = SensorDeviceClass.PRESSURE
-    _attr_native_unit_of_measurement = UnitOfPressure.BAR
-
-
-class WolfLinkPercentage(WolfLinkSensor):
-    """Class for percentage based entities."""
-
-    @property
-    def native_unit_of_measurement(self):
-        """Return the unit the value is expressed in."""
-        return self.wolf_object.unit
-
-
-class WolfLinkState(WolfLinkSensor):
-    """Class for entities which has defined list of state."""
-
-    _attr_translation_key = "state"
-
-    @property
-    def native_value(self):
-        """Return the state converting with supported values."""
-        state = super().native_value
-        if state is not None:
-            resolved_state = [
-                item for item in self.wolf_object.items if item.value == int(state)
-            ]
-            if resolved_state:
-                resolved_name = resolved_state[0].name
-                return STATES.get(resolved_name, resolved_name)
-        return state
diff --git a/homeassistant/components/workday/binary_sensor.py b/homeassistant/components/workday/binary_sensor.py
index 3684208f102..6b878db8159 100644
--- a/homeassistant/components/workday/binary_sensor.py
+++ b/homeassistant/components/workday/binary_sensor.py
@@ -23,10 +23,10 @@ from homeassistant.core import (
     SupportsResponse,
     callback,
 )
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity_platform import (
-    AddEntitiesCallback,
+    AddConfigEntryEntitiesCallback,
     async_get_current_platform,
 )
 from homeassistant.helpers.event import async_track_point_in_utc_time
@@ -113,7 +113,9 @@ def _get_obj_holidays(
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Workday sensor."""
     add_holidays: list[str] = entry.options[CONF_ADD_HOLIDAYS]
diff --git a/homeassistant/components/workday/manifest.json b/homeassistant/components/workday/manifest.json
index 4b9d072f747..b08a5ed9fff 100644
--- a/homeassistant/components/workday/manifest.json
+++ b/homeassistant/components/workday/manifest.json
@@ -7,5 +7,5 @@
   "iot_class": "local_polling",
   "loggers": ["holidays"],
   "quality_scale": "internal",
-  "requirements": ["holidays==0.65"]
+  "requirements": ["holidays==0.69"]
 }
diff --git a/homeassistant/components/worldclock/sensor.py b/homeassistant/components/worldclock/sensor.py
index 89ea14bbbd0..9b52993919c 100644
--- a/homeassistant/components/worldclock/sensor.py
+++ b/homeassistant/components/worldclock/sensor.py
@@ -9,8 +9,8 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, CONF_TIME_ZONE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from .const import CONF_TIME_FORMAT, DOMAIN
 
@@ -18,7 +18,7 @@ from .const import CONF_TIME_FORMAT, DOMAIN
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the World clock sensor entry."""
     time_zone = await dt_util.async_get_time_zone(entry.options[CONF_TIME_ZONE])
diff --git a/homeassistant/components/worldtidesinfo/sensor.py b/homeassistant/components/worldtidesinfo/sensor.py
index 45f39894abb..1a64954bb4a 100644
--- a/homeassistant/components/worldtidesinfo/sensor.py
+++ b/homeassistant/components/worldtidesinfo/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/worxlandroid/sensor.py b/homeassistant/components/worxlandroid/sensor.py
index 50700b78f35..ed3312fc950 100644
--- a/homeassistant/components/worxlandroid/sensor.py
+++ b/homeassistant/components/worxlandroid/sensor.py
@@ -14,8 +14,8 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_HOST, CONF_PIN, CONF_TIMEOUT, PERCENTAGE
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/ws66i/__init__.py b/homeassistant/components/ws66i/__init__.py
index 83ad7bbf070..32c6a11f25c 100644
--- a/homeassistant/components/ws66i/__init__.py
+++ b/homeassistant/components/ws66i/__init__.py
@@ -78,6 +78,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     # Create the coordinator for the WS66i
     coordinator: Ws66iDataUpdateCoordinator = Ws66iDataUpdateCoordinator(
         hass,
+        entry,
         ws66i,
         zones,
     )
diff --git a/homeassistant/components/ws66i/coordinator.py b/homeassistant/components/ws66i/coordinator.py
index 013e4d02b15..1b2b43963fc 100644
--- a/homeassistant/components/ws66i/coordinator.py
+++ b/homeassistant/components/ws66i/coordinator.py
@@ -6,6 +6,7 @@ import logging
 
 from pyws66i import WS66i, ZoneStatus
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -17,9 +18,12 @@ _LOGGER = logging.getLogger(__name__)
 class Ws66iDataUpdateCoordinator(DataUpdateCoordinator[list[ZoneStatus]]):
     """DataUpdateCoordinator to gather data for WS66i Zones."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         my_api: WS66i,
         zones: list[int],
     ) -> None:
@@ -27,6 +31,7 @@ class Ws66iDataUpdateCoordinator(DataUpdateCoordinator[list[ZoneStatus]]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name="WS66i",
             update_interval=POLL_INTERVAL,
         )
diff --git a/homeassistant/components/ws66i/media_player.py b/homeassistant/components/ws66i/media_player.py
index a2cd7ba471b..fb8ba5ae996 100644
--- a/homeassistant/components/ws66i/media_player.py
+++ b/homeassistant/components/ws66i/media_player.py
@@ -10,7 +10,7 @@ from homeassistant.components.media_player import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, MAX_VOL
@@ -23,7 +23,7 @@ PARALLEL_UPDATES = 1
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the WS66i 6-zone amplifier platform from a config entry."""
     ws66i_data: Ws66iData = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/wsdot/sensor.py b/homeassistant/components/wsdot/sensor.py
index 73714b75c95..8ae93c809f2 100644
--- a/homeassistant/components/wsdot/sensor.py
+++ b/homeassistant/components/wsdot/sensor.py
@@ -17,7 +17,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import ATTR_NAME, CONF_API_KEY, CONF_ID, CONF_NAME, UnitOfTime
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/wyoming/__init__.py b/homeassistant/components/wyoming/__init__.py
index d639933ece6..4e76287d8e7 100644
--- a/homeassistant/components/wyoming/__init__.py
+++ b/homeassistant/components/wyoming/__init__.py
@@ -8,15 +8,19 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers import config_validation as cv, device_registry as dr
+from homeassistant.helpers.typing import ConfigType
 
 from .const import ATTR_SPEAKER, DOMAIN
 from .data import WyomingService
 from .devices import SatelliteDevice
 from .models import DomainDataItem
+from .websocket_api import async_register_websocket_api
 
 _LOGGER = logging.getLogger(__name__)
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 SATELLITE_PLATFORMS = [
     Platform.ASSIST_SATELLITE,
     Platform.BINARY_SENSOR,
@@ -28,11 +32,19 @@ SATELLITE_PLATFORMS = [
 __all__ = [
     "ATTR_SPEAKER",
     "DOMAIN",
+    "async_setup",
     "async_setup_entry",
     "async_unload_entry",
 ]
 
 
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the Wyoming integration."""
+    async_register_websocket_api(hass)
+
+    return True
+
+
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Load Wyoming."""
     service = await WyomingService.create(entry.data["host"], entry.data["port"])
diff --git a/homeassistant/components/wyoming/assist_satellite.py b/homeassistant/components/wyoming/assist_satellite.py
index 615084bcbf3..5440b2bebeb 100644
--- a/homeassistant/components/wyoming/assist_satellite.py
+++ b/homeassistant/components/wyoming/assist_satellite.py
@@ -24,18 +24,20 @@ from wyoming.tts import Synthesize, SynthesizeVoice
 from wyoming.vad import VoiceStarted, VoiceStopped
 from wyoming.wake import Detect, Detection
 
-from homeassistant.components import assist_pipeline, intent, tts
+from homeassistant.components import assist_pipeline, ffmpeg, intent, tts
 from homeassistant.components.assist_pipeline import PipelineEvent
 from homeassistant.components.assist_satellite import (
+    AssistSatelliteAnnouncement,
     AssistSatelliteConfiguration,
     AssistSatelliteEntity,
     AssistSatelliteEntityDescription,
+    AssistSatelliteEntityFeature,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN
+from .const import DOMAIN, SAMPLE_CHANNELS, SAMPLE_WIDTH
 from .data import WyomingService
 from .devices import SatelliteDevice
 from .entity import WyomingSatelliteEntity
@@ -49,6 +51,8 @@ _RESTART_SECONDS: Final = 3
 _PING_TIMEOUT: Final = 5
 _PING_SEND_DELAY: Final = 2
 _PIPELINE_FINISH_TIMEOUT: Final = 1
+_TTS_SAMPLE_RATE: Final = 22050
+_ANNOUNCE_CHUNK_BYTES: Final = 2048  # 1024 samples
 
 # Wyoming stage -> Assist stage
 _STAGES: dict[PipelineStage, assist_pipeline.PipelineStage] = {
@@ -62,7 +66,7 @@ _STAGES: dict[PipelineStage, assist_pipeline.PipelineStage] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Wyoming Assist satellite entity."""
     domain_data: DomainDataItem = hass.data[DOMAIN][config_entry.entry_id]
@@ -83,6 +87,7 @@ class WyomingAssistSatellite(WyomingSatelliteEntity, AssistSatelliteEntity):
     entity_description = AssistSatelliteEntityDescription(key="assist_satellite")
     _attr_translation_key = "assist_satellite"
     _attr_name = None
+    _attr_supported_features = AssistSatelliteEntityFeature.ANNOUNCE
 
     def __init__(
         self,
@@ -116,6 +121,10 @@ class WyomingAssistSatellite(WyomingSatelliteEntity, AssistSatelliteEntity):
         self.device.set_pipeline_listener(self._pipeline_changed)
         self.device.set_audio_settings_listener(self._audio_settings_changed)
 
+        # For announcements
+        self._ffmpeg_manager: ffmpeg.FFmpegManager | None = None
+        self._played_event_received: asyncio.Event | None = None
+
     @property
     def pipeline_entity_id(self) -> str | None:
         """Return the entity ID of the pipeline to use for the next conversation."""
@@ -131,9 +140,9 @@ class WyomingAssistSatellite(WyomingSatelliteEntity, AssistSatelliteEntity):
         """Options passed for text-to-speech."""
         return {
             tts.ATTR_PREFERRED_FORMAT: "wav",
-            tts.ATTR_PREFERRED_SAMPLE_RATE: 16000,
-            tts.ATTR_PREFERRED_SAMPLE_CHANNELS: 1,
-            tts.ATTR_PREFERRED_SAMPLE_BYTES: 2,
+            tts.ATTR_PREFERRED_SAMPLE_RATE: _TTS_SAMPLE_RATE,
+            tts.ATTR_PREFERRED_SAMPLE_CHANNELS: SAMPLE_CHANNELS,
+            tts.ATTR_PREFERRED_SAMPLE_BYTES: SAMPLE_WIDTH,
         }
 
     async def async_added_to_hass(self) -> None:
@@ -244,6 +253,76 @@ class WyomingAssistSatellite(WyomingSatelliteEntity, AssistSatelliteEntity):
                     )
                 )
 
+    async def async_announce(self, announcement: AssistSatelliteAnnouncement) -> None:
+        """Announce media on the satellite.
+
+        Should block until the announcement is done playing.
+        """
+        assert self._client is not None
+
+        if self._ffmpeg_manager is None:
+            self._ffmpeg_manager = ffmpeg.get_ffmpeg_manager(self.hass)
+
+        if self._played_event_received is None:
+            self._played_event_received = asyncio.Event()
+
+        self._played_event_received.clear()
+        await self._client.write_event(
+            AudioStart(
+                rate=_TTS_SAMPLE_RATE,
+                width=SAMPLE_WIDTH,
+                channels=SAMPLE_CHANNELS,
+                timestamp=0,
+            ).event()
+        )
+
+        timestamp = 0
+        try:
+            # Use ffmpeg to convert to raw PCM audio with the appropriate format
+            proc = await asyncio.create_subprocess_exec(
+                self._ffmpeg_manager.binary,
+                "-i",
+                announcement.media_id,
+                "-f",
+                "s16le",
+                "-ac",
+                str(SAMPLE_CHANNELS),
+                "-ar",
+                str(_TTS_SAMPLE_RATE),
+                "-nostats",
+                "pipe:",
+                stdout=asyncio.subprocess.PIPE,
+                stderr=asyncio.subprocess.PIPE,
+                close_fds=False,  # use posix_spawn in CPython < 3.13
+            )
+            assert proc.stdout is not None
+            while True:
+                chunk_bytes = await proc.stdout.read(_ANNOUNCE_CHUNK_BYTES)
+                if not chunk_bytes:
+                    break
+
+                chunk = AudioChunk(
+                    rate=_TTS_SAMPLE_RATE,
+                    width=SAMPLE_WIDTH,
+                    channels=SAMPLE_CHANNELS,
+                    audio=chunk_bytes,
+                    timestamp=timestamp,
+                )
+                await self._client.write_event(chunk.event())
+
+                timestamp += chunk.milliseconds
+        finally:
+            await self._client.write_event(AudioStop().event())
+            if timestamp > 0:
+                # Wait the length of the audio or until we receive a played event
+                audio_seconds = timestamp / 1000
+                try:
+                    async with asyncio.timeout(audio_seconds + 0.5):
+                        await self._played_event_received.wait()
+                except TimeoutError:
+                    # Older satellite clients will wait longer than necessary
+                    _LOGGER.debug("Did not receive played event for announcement")
+
     # -------------------------------------------------------------------------
 
     def start_satellite(self) -> None:
@@ -511,6 +590,9 @@ class WyomingAssistSatellite(WyomingSatelliteEntity, AssistSatelliteEntity):
                 elif Played.is_type(client_event.type):
                     # TTS response has finished playing on satellite
                     self.tts_response_finished()
+
+                    if self._played_event_received is not None:
+                        self._played_event_received.set()
                 else:
                     _LOGGER.debug("Unexpected event from satellite: %s", client_event)
 
diff --git a/homeassistant/components/wyoming/binary_sensor.py b/homeassistant/components/wyoming/binary_sensor.py
index 24ee073ec4d..a3652e7f70f 100644
--- a/homeassistant/components/wyoming/binary_sensor.py
+++ b/homeassistant/components/wyoming/binary_sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import WyomingSatelliteEntity
@@ -22,7 +22,7 @@ if TYPE_CHECKING:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up binary sensor entities."""
     item: DomainDataItem = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/wyoming/conversation.py b/homeassistant/components/wyoming/conversation.py
index 988d47925ac..5760d04bfc2 100644
--- a/homeassistant/components/wyoming/conversation.py
+++ b/homeassistant/components/wyoming/conversation.py
@@ -12,7 +12,7 @@ from homeassistant.components import conversation
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import intent
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import ulid as ulid_util
 
 from .const import DOMAIN
@@ -26,7 +26,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Wyoming conversation."""
     item: DomainDataItem = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/wyoming/manifest.json b/homeassistant/components/wyoming/manifest.json
index b837d2a9e76..d75b70dffa8 100644
--- a/homeassistant/components/wyoming/manifest.json
+++ b/homeassistant/components/wyoming/manifest.json
@@ -7,7 +7,8 @@
     "assist_satellite",
     "assist_pipeline",
     "intent",
-    "conversation"
+    "conversation",
+    "ffmpeg"
   ],
   "documentation": "https://www.home-assistant.io/integrations/wyoming",
   "integration_type": "service",
diff --git a/homeassistant/components/wyoming/number.py b/homeassistant/components/wyoming/number.py
index d9a58cc3333..96ec5877545 100644
--- a/homeassistant/components/wyoming/number.py
+++ b/homeassistant/components/wyoming/number.py
@@ -8,7 +8,7 @@ from homeassistant.components.number import NumberEntityDescription, RestoreNumb
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import WyomingSatelliteEntity
@@ -24,7 +24,7 @@ _MAX_VOLUME_MULTIPLIER: Final = 10.0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Wyoming number entities."""
     item: DomainDataItem = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/wyoming/select.py b/homeassistant/components/wyoming/select.py
index bbcaab81710..2af0438e35f 100644
--- a/homeassistant/components/wyoming/select.py
+++ b/homeassistant/components/wyoming/select.py
@@ -14,7 +14,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import restore_state
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .devices import SatelliteDevice
@@ -36,7 +36,7 @@ _DEFAULT_NOISE_SUPPRESSION_LEVEL: Final = "off"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Wyoming select entities."""
     item: DomainDataItem = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/wyoming/stt.py b/homeassistant/components/wyoming/stt.py
index a28e5fdb527..2851004a854 100644
--- a/homeassistant/components/wyoming/stt.py
+++ b/homeassistant/components/wyoming/stt.py
@@ -10,7 +10,7 @@ from wyoming.client import AsyncTcpClient
 from homeassistant.components import stt
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, SAMPLE_CHANNELS, SAMPLE_RATE, SAMPLE_WIDTH
 from .data import WyomingService
@@ -23,7 +23,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Wyoming speech-to-text."""
     item: DomainDataItem = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/wyoming/switch.py b/homeassistant/components/wyoming/switch.py
index 308429331c3..9eb91d5ef39 100644
--- a/homeassistant/components/wyoming/switch.py
+++ b/homeassistant/components/wyoming/switch.py
@@ -9,7 +9,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_ON, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import restore_state
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .entity import WyomingSatelliteEntity
@@ -21,7 +21,7 @@ if TYPE_CHECKING:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up VoIP switch entities."""
     item: DomainDataItem = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/wyoming/tts.py b/homeassistant/components/wyoming/tts.py
index 65ce4d942f1..79e431fee98 100644
--- a/homeassistant/components/wyoming/tts.py
+++ b/homeassistant/components/wyoming/tts.py
@@ -12,7 +12,7 @@ from wyoming.tts import Synthesize, SynthesizeVoice
 from homeassistant.components import tts
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import ATTR_SPEAKER, DOMAIN
 from .data import WyomingService
@@ -25,7 +25,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Wyoming speech-to-text."""
     item: DomainDataItem = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/wyoming/wake_word.py b/homeassistant/components/wyoming/wake_word.py
index 64dfd60c068..2a21b7303e5 100644
--- a/homeassistant/components/wyoming/wake_word.py
+++ b/homeassistant/components/wyoming/wake_word.py
@@ -11,7 +11,7 @@ from wyoming.wake import Detect, Detection
 from homeassistant.components import wake_word
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .data import WyomingService, load_wyoming_info
@@ -24,7 +24,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Wyoming wake-word-detection."""
     item: DomainDataItem = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/wyoming/websocket_api.py b/homeassistant/components/wyoming/websocket_api.py
new file mode 100644
index 00000000000..613238c302a
--- /dev/null
+++ b/homeassistant/components/wyoming/websocket_api.py
@@ -0,0 +1,42 @@
+"""Wyoming Websocket API."""
+
+import logging
+from typing import Any
+
+import voluptuous as vol
+
+from homeassistant.components import websocket_api
+from homeassistant.core import HomeAssistant, callback
+
+from .const import DOMAIN
+from .models import DomainDataItem
+
+_LOGGER = logging.getLogger(__name__)
+
+
+@callback
+def async_register_websocket_api(hass: HomeAssistant) -> None:
+    """Register the websocket API."""
+    websocket_api.async_register_command(hass, websocket_info)
+
+
+@callback
+@websocket_api.require_admin
+@websocket_api.websocket_command({vol.Required("type"): "wyoming/info"})
+def websocket_info(
+    hass: HomeAssistant,
+    connection: websocket_api.connection.ActiveConnection,
+    msg: dict[str, Any],
+) -> None:
+    """List service information for Wyoming all config entries."""
+    entry_items: dict[str, DomainDataItem] = hass.data.get(DOMAIN, {})
+
+    connection.send_result(
+        msg["id"],
+        {
+            "info": {
+                entry_id: item.service.info.to_dict()
+                for entry_id, item in entry_items.items()
+            }
+        },
+    )
diff --git a/homeassistant/components/x10/light.py b/homeassistant/components/x10/light.py
index d98f1f51d54..fbdebe11657 100644
--- a/homeassistant/components/x10/light.py
+++ b/homeassistant/components/x10/light.py
@@ -16,7 +16,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import CONF_DEVICES, CONF_ID, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/xbox/__init__.py b/homeassistant/components/xbox/__init__.py
index 5282a34903a..30bc7d59417 100644
--- a/homeassistant/components/xbox/__init__.py
+++ b/homeassistant/components/xbox/__init__.py
@@ -6,6 +6,7 @@ import logging
 
 from xbox.webapi.api.client import XboxLiveClient
 from xbox.webapi.api.provider.smartglass.models import SmartglassConsoleList
+from xbox.webapi.common.signed_session import SignedSession
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
@@ -36,7 +37,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         )
     )
     session = config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation)
-    auth = api.AsyncConfigEntryAuth(session)
+    signed_session = await hass.async_add_executor_job(SignedSession)
+    auth = api.AsyncConfigEntryAuth(signed_session, session)
 
     client = XboxLiveClient(auth)
     consoles: SmartglassConsoleList = await client.smartglass.get_console_list()
@@ -46,7 +48,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         consoles.dict(),
     )
 
-    coordinator = XboxUpdateCoordinator(hass, client, consoles)
+    coordinator = XboxUpdateCoordinator(hass, entry, client, consoles)
     await coordinator.async_config_entry_first_refresh()
 
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {
diff --git a/homeassistant/components/xbox/api.py b/homeassistant/components/xbox/api.py
index d4c47e4cc39..9fa7c14b5c9 100644
--- a/homeassistant/components/xbox/api.py
+++ b/homeassistant/components/xbox/api.py
@@ -11,10 +11,12 @@ from homeassistant.util.dt import utc_from_timestamp
 class AsyncConfigEntryAuth(AuthenticationManager):
     """Provide xbox authentication tied to an OAuth2 based config entry."""
 
-    def __init__(self, oauth_session: OAuth2Session) -> None:
+    def __init__(
+        self, signed_session: SignedSession, oauth_session: OAuth2Session
+    ) -> None:
         """Initialize xbox auth."""
         # Leaving out client credentials as they are handled by Home Assistant
-        super().__init__(SignedSession(), "", "", "")
+        super().__init__(signed_session, "", "", "")
         self._oauth_session = oauth_session
         self.oauth = self._get_oauth_token()
 
diff --git a/homeassistant/components/xbox/binary_sensor.py b/homeassistant/components/xbox/binary_sensor.py
index af95834425a..5339c4d7a8e 100644
--- a/homeassistant/components/xbox/binary_sensor.py
+++ b/homeassistant/components/xbox/binary_sensor.py
@@ -8,7 +8,7 @@ from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import XboxUpdateCoordinator
@@ -18,7 +18,9 @@ PRESENCE_ATTRIBUTES = ["online", "in_party", "in_game", "in_multiplayer"]
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Xbox Live friends."""
     coordinator: XboxUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
diff --git a/homeassistant/components/xbox/coordinator.py b/homeassistant/components/xbox/coordinator.py
index 4012820c43c..62c7a35e88b 100644
--- a/homeassistant/components/xbox/coordinator.py
+++ b/homeassistant/components/xbox/coordinator.py
@@ -20,6 +20,7 @@ from xbox.webapi.api.provider.smartglass.models import (
     SmartglassConsoleStatus,
 )
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -64,9 +65,12 @@ class XboxData:
 class XboxUpdateCoordinator(DataUpdateCoordinator[XboxData]):
     """Store Xbox Console Status."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         client: XboxLiveClient,
         consoles: SmartglassConsoleList,
     ) -> None:
@@ -74,6 +78,7 @@ class XboxUpdateCoordinator(DataUpdateCoordinator[XboxData]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(seconds=10),
         )
diff --git a/homeassistant/components/xbox/media_player.py b/homeassistant/components/xbox/media_player.py
index 7298c7e2da3..6464b2417cc 100644
--- a/homeassistant/components/xbox/media_player.py
+++ b/homeassistant/components/xbox/media_player.py
@@ -24,7 +24,7 @@ from homeassistant.components.media_player import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .browse_media import build_item_response
@@ -56,7 +56,9 @@ XBOX_STATE_MAP: dict[PlaybackState | PowerState, MediaPlayerState | None] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Xbox media_player from a config entry."""
     client: XboxLiveClient = hass.data[DOMAIN][entry.entry_id]["client"]
diff --git a/homeassistant/components/xbox/remote.py b/homeassistant/components/xbox/remote.py
index 1b4ffdf35cc..4e5893ddb13 100644
--- a/homeassistant/components/xbox/remote.py
+++ b/homeassistant/components/xbox/remote.py
@@ -24,7 +24,7 @@ from homeassistant.components.remote import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
@@ -32,7 +32,9 @@ from .coordinator import ConsoleData, XboxUpdateCoordinator
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Xbox media_player from a config entry."""
     client: XboxLiveClient = hass.data[DOMAIN][entry.entry_id]["client"]
diff --git a/homeassistant/components/xbox/sensor.py b/homeassistant/components/xbox/sensor.py
index f269e0a5bb9..da53557a2d3 100644
--- a/homeassistant/components/xbox/sensor.py
+++ b/homeassistant/components/xbox/sensor.py
@@ -8,7 +8,7 @@ from homeassistant.components.sensor import SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import XboxUpdateCoordinator
@@ -20,7 +20,7 @@ SENSOR_ATTRIBUTES = ["status", "gamer_score", "account_tier", "gold_tenure"]
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Xbox Live friends."""
     coordinator: XboxUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id][
diff --git a/homeassistant/components/xiaomi/device_tracker.py b/homeassistant/components/xiaomi/device_tracker.py
index 9d4a29d2c78..5968a17f418 100644
--- a/homeassistant/components/xiaomi/device_tracker.py
+++ b/homeassistant/components/xiaomi/device_tracker.py
@@ -15,7 +15,7 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/xiaomi_aqara/__init__.py b/homeassistant/components/xiaomi_aqara/__init__.py
index b7f4aa1942e..6e4d143d84e 100644
--- a/homeassistant/components/xiaomi_aqara/__init__.py
+++ b/homeassistant/components/xiaomi_aqara/__init__.py
@@ -7,7 +7,7 @@ import voluptuous as vol
 from xiaomi_gateway import AsyncXiaomiGatewayMulticast, XiaomiGateway
 
 from homeassistant.components import persistent_notification
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_DEVICE_ID,
     CONF_HOST,
@@ -17,8 +17,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.helpers import device_registry as dr
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
@@ -217,12 +216,7 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
     if unload_ok:
         hass.data[DOMAIN][GATEWAYS_KEY].pop(config_entry.entry_id)
 
-    loaded_entries = [
-        entry
-        for entry in hass.config_entries.async_entries(DOMAIN)
-        if entry.state == ConfigEntryState.LOADED
-    ]
-    if len(loaded_entries) == 1:
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
         # No gateways left, stop Xiaomi socket
         unsub_stop = hass.data[DOMAIN].pop(KEY_UNSUB_STOP)
         unsub_stop()
diff --git a/homeassistant/components/xiaomi_aqara/binary_sensor.py b/homeassistant/components/xiaomi_aqara/binary_sensor.py
index ad91dda2173..47cc823ad7f 100644
--- a/homeassistant/components/xiaomi_aqara/binary_sensor.py
+++ b/homeassistant/components/xiaomi_aqara/binary_sensor.py
@@ -8,7 +8,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.restore_state import RestoreEntity
 
@@ -32,7 +32,7 @@ ATTR_DENSITY = "Density"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Perform the setup for Xiaomi devices."""
     entities: list[XiaomiBinarySensor] = []
diff --git a/homeassistant/components/xiaomi_aqara/cover.py b/homeassistant/components/xiaomi_aqara/cover.py
index e073ef6b683..82d5129ac5e 100644
--- a/homeassistant/components/xiaomi_aqara/cover.py
+++ b/homeassistant/components/xiaomi_aqara/cover.py
@@ -5,7 +5,7 @@ from typing import Any
 from homeassistant.components.cover import ATTR_POSITION, CoverEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, GATEWAYS_KEY
 from .entity import XiaomiDevice
@@ -19,7 +19,7 @@ DATA_KEY_PROTO_V2 = "curtain_status"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Perform the setup for Xiaomi devices."""
     entities = []
diff --git a/homeassistant/components/xiaomi_aqara/entity.py b/homeassistant/components/xiaomi_aqara/entity.py
index db47015c0cf..59107984ddf 100644
--- a/homeassistant/components/xiaomi_aqara/entity.py
+++ b/homeassistant/components/xiaomi_aqara/entity.py
@@ -57,7 +57,7 @@ class XiaomiDevice(Entity):
             self._is_gateway = False
             self._device_id = self._sid
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Start unavailability tracking."""
         self._xiaomi_hub.callbacks[self._sid].append(self.push_data)
         self._async_track_unavailable()
@@ -100,7 +100,7 @@ class XiaomiDevice(Entity):
         return device_info
 
     @property
-    def available(self):
+    def available(self) -> bool:
         """Return True if entity is available."""
         return self._is_available
 
diff --git a/homeassistant/components/xiaomi_aqara/light.py b/homeassistant/components/xiaomi_aqara/light.py
index c8057f1df4a..ef1f06695f9 100644
--- a/homeassistant/components/xiaomi_aqara/light.py
+++ b/homeassistant/components/xiaomi_aqara/light.py
@@ -13,8 +13,8 @@ from homeassistant.components.light import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.color as color_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import color as color_util
 
 from .const import DOMAIN, GATEWAYS_KEY
 from .entity import XiaomiDevice
@@ -25,7 +25,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Perform the setup for Xiaomi devices."""
     entities = []
diff --git a/homeassistant/components/xiaomi_aqara/lock.py b/homeassistant/components/xiaomi_aqara/lock.py
index 5e538f25699..b3f4e9f4caf 100644
--- a/homeassistant/components/xiaomi_aqara/lock.py
+++ b/homeassistant/components/xiaomi_aqara/lock.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from homeassistant.components.lock import LockEntity, LockState
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 
 from .const import DOMAIN, GATEWAYS_KEY
@@ -24,7 +24,7 @@ UNLOCK_MAINTAIN_TIME = 5
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Perform the setup for Xiaomi devices."""
     gateway = hass.data[DOMAIN][GATEWAYS_KEY][config_entry.entry_id]
diff --git a/homeassistant/components/xiaomi_aqara/sensor.py b/homeassistant/components/xiaomi_aqara/sensor.py
index 49358276a48..59ccee5a1a8 100644
--- a/homeassistant/components/xiaomi_aqara/sensor.py
+++ b/homeassistant/components/xiaomi_aqara/sensor.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import BATTERY_MODELS, DOMAIN, GATEWAYS_KEY, POWER_MODELS
 from .entity import XiaomiDevice
@@ -85,7 +85,7 @@ SENSOR_TYPES: dict[str, SensorEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Perform the setup for Xiaomi devices."""
     entities: list[XiaomiSensor | XiaomiBatterySensor] = []
diff --git a/homeassistant/components/xiaomi_aqara/strings.json b/homeassistant/components/xiaomi_aqara/strings.json
index 75b4ab1ecda..6221b9b9d65 100644
--- a/homeassistant/components/xiaomi_aqara/strings.json
+++ b/homeassistant/components/xiaomi_aqara/strings.json
@@ -26,7 +26,7 @@
       }
     },
     "error": {
-      "discovery_error": "Failed to discover a Xiaomi Aqara Gateway, try using the IP of the device running HomeAssistant as interface",
+      "discovery_error": "Failed to discover a Xiaomi Aqara Gateway, try using the IP of the device running Home Assistant as interface",
       "invalid_interface": "Invalid network interface",
       "invalid_key": "Invalid Gateway key",
       "invalid_host": "Invalid hostname or IP address, see https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem",
@@ -59,7 +59,7 @@
         },
         "ringtone_id": {
           "name": "Ringtone ID",
-          "description": "One of the allowed ringtone ids."
+          "description": "One of the allowed ringtone IDs."
         },
         "ringtone_vol": {
           "name": "Ringtone volume",
diff --git a/homeassistant/components/xiaomi_aqara/switch.py b/homeassistant/components/xiaomi_aqara/switch.py
index f66cf8c7603..7d3abf47bd1 100644
--- a/homeassistant/components/xiaomi_aqara/switch.py
+++ b/homeassistant/components/xiaomi_aqara/switch.py
@@ -6,7 +6,7 @@ from typing import Any
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, GATEWAYS_KEY
 from .entity import XiaomiDevice
@@ -29,7 +29,7 @@ IN_USE = "inuse"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Perform the setup for Xiaomi devices."""
     entities = []
diff --git a/homeassistant/components/xiaomi_ble/binary_sensor.py b/homeassistant/components/xiaomi_ble/binary_sensor.py
index b853f83b967..8956e207253 100644
--- a/homeassistant/components/xiaomi_ble/binary_sensor.py
+++ b/homeassistant/components/xiaomi_ble/binary_sensor.py
@@ -18,7 +18,7 @@ from homeassistant.components.bluetooth.passive_update_processor import (
     PassiveBluetoothProcessorEntity,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from .coordinator import XiaomiPassiveBluetoothDataProcessor
@@ -135,7 +135,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: XiaomiBLEConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Xiaomi BLE sensors."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/xiaomi_ble/config_flow.py b/homeassistant/components/xiaomi_ble/config_flow.py
index df2de381d39..c293d7832d0 100644
--- a/homeassistant/components/xiaomi_ble/config_flow.py
+++ b/homeassistant/components/xiaomi_ble/config_flow.py
@@ -306,7 +306,7 @@ class XiaomiConfigFlow(ConfigFlow, domain=DOMAIN):
 
             return self._async_get_or_create_entry()
 
-        current_addresses = self._async_current_ids()
+        current_addresses = self._async_current_ids(include_ignore=False)
         for discovery_info in async_discovered_service_info(self.hass, False):
             address = discovery_info.address
             if address in current_addresses or address in self._discovered_devices:
diff --git a/homeassistant/components/xiaomi_ble/event.py b/homeassistant/components/xiaomi_ble/event.py
index 7265bcd112c..c5f6e01e575 100644
--- a/homeassistant/components/xiaomi_ble/event.py
+++ b/homeassistant/components/xiaomi_ble/event.py
@@ -12,7 +12,7 @@ from homeassistant.components.event import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import format_discovered_event_class, format_event_dispatcher_name
 from .const import (
@@ -183,7 +183,7 @@ class XiaomiEventEntity(EventEntity):
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: XiaomiBLEConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Xiaomi event."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/xiaomi_ble/sensor.py b/homeassistant/components/xiaomi_ble/sensor.py
index ba8f64383ee..01f15ff09b8 100644
--- a/homeassistant/components/xiaomi_ble/sensor.py
+++ b/homeassistant/components/xiaomi_ble/sensor.py
@@ -31,7 +31,7 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
 from .coordinator import XiaomiPassiveBluetoothDataProcessor
@@ -208,7 +208,7 @@ def sensor_update_to_bluetooth_data_update(
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: XiaomiBLEConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Xiaomi BLE sensors."""
     coordinator = entry.runtime_data
diff --git a/homeassistant/components/xiaomi_miio/air_quality.py b/homeassistant/components/xiaomi_miio/air_quality.py
index 199d9161353..1ce37c661a2 100644
--- a/homeassistant/components/xiaomi_miio/air_quality.py
+++ b/homeassistant/components/xiaomi_miio/air_quality.py
@@ -9,7 +9,7 @@ from homeassistant.components.air_quality import AirQualityEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DEVICE, CONF_HOST, CONF_MODEL, CONF_TOKEN
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CONF_FLOW_TYPE,
@@ -242,7 +242,7 @@ DEVICE_MAP: dict[str, dict[str, Callable]] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Xiaomi Air Quality from a config entry."""
     entities = []
diff --git a/homeassistant/components/xiaomi_miio/alarm_control_panel.py b/homeassistant/components/xiaomi_miio/alarm_control_panel.py
index 9c06198bc7e..ecab5228f6e 100644
--- a/homeassistant/components/xiaomi_miio/alarm_control_panel.py
+++ b/homeassistant/components/xiaomi_miio/alarm_control_panel.py
@@ -15,7 +15,7 @@ from homeassistant.components.alarm_control_panel import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CONF_GATEWAY, DOMAIN
 
@@ -29,7 +29,7 @@ XIAOMI_STATE_ARMING_VALUE = "oning"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Xiaomi Gateway Alarm from a config entry."""
     entities = []
diff --git a/homeassistant/components/xiaomi_miio/binary_sensor.py b/homeassistant/components/xiaomi_miio/binary_sensor.py
index a5ab7e56e6b..213886691f0 100644
--- a/homeassistant/components/xiaomi_miio/binary_sensor.py
+++ b/homeassistant/components/xiaomi_miio/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DEVICE, CONF_MODEL, EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import VacuumCoordinatorDataAttributes
 from .const import (
@@ -171,7 +171,7 @@ def _setup_vacuum_sensors(hass, config_entry, async_add_entities):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Xiaomi sensor from a config entry."""
     entities = []
diff --git a/homeassistant/components/xiaomi_miio/button.py b/homeassistant/components/xiaomi_miio/button.py
index 9a64941f398..a7bcb3a12fe 100644
--- a/homeassistant/components/xiaomi_miio/button.py
+++ b/homeassistant/components/xiaomi_miio/button.py
@@ -14,7 +14,7 @@ from homeassistant.components.button import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_MODEL, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     DOMAIN,
@@ -117,14 +117,14 @@ MODEL_TO_BUTTON_MAP: dict[str, tuple[str, ...]] = {
         ATTR_RESET_DUST_FILTER,
         ATTR_RESET_UPPER_FILTER,
     ),
-    **{model: BUTTONS_FOR_VACUUM for model in MODELS_VACUUM},
+    **dict.fromkeys(MODELS_VACUUM, BUTTONS_FOR_VACUUM),
 }
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the button from a config entry."""
     model = config_entry.data[CONF_MODEL]
diff --git a/homeassistant/components/xiaomi_miio/device_tracker.py b/homeassistant/components/xiaomi_miio/device_tracker.py
index 1dfc5e53410..518003ceedb 100644
--- a/homeassistant/components/xiaomi_miio/device_tracker.py
+++ b/homeassistant/components/xiaomi_miio/device_tracker.py
@@ -14,7 +14,7 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.const import CONF_HOST, CONF_TOKEN
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/xiaomi_miio/entity.py b/homeassistant/components/xiaomi_miio/entity.py
index 0343a7526d7..ba1148985ba 100644
--- a/homeassistant/components/xiaomi_miio/entity.py
+++ b/homeassistant/components/xiaomi_miio/entity.py
@@ -185,7 +185,7 @@ class XiaomiGatewayDevice(CoordinatorEntity, Entity):
         )
 
     @property
-    def available(self):
+    def available(self) -> bool:
         """Return if entity is available."""
         if self.coordinator.data is None:
             return False
diff --git a/homeassistant/components/xiaomi_miio/fan.py b/homeassistant/components/xiaomi_miio/fan.py
index e1de3f56252..31d5dd9de2c 100644
--- a/homeassistant/components/xiaomi_miio/fan.py
+++ b/homeassistant/components/xiaomi_miio/fan.py
@@ -33,8 +33,8 @@ from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_ENTITY_ID, CONF_DEVICE, CONF_MODEL
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
     ranged_value_to_percentage,
@@ -205,7 +205,7 @@ FAN_DIRECTIONS_MAP = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Fan from a config entry."""
     entities: list[FanEntity] = []
diff --git a/homeassistant/components/xiaomi_miio/humidifier.py b/homeassistant/components/xiaomi_miio/humidifier.py
index 4701345756a..f19fbec5e78 100644
--- a/homeassistant/components/xiaomi_miio/humidifier.py
+++ b/homeassistant/components/xiaomi_miio/humidifier.py
@@ -23,7 +23,7 @@ from homeassistant.components.humidifier import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_MODE, CONF_DEVICE, CONF_MODEL
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import percentage_to_ranged_value
 
 from .const import (
@@ -71,7 +71,7 @@ AVAILABLE_MODES_OTHER = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Humidifier from a config entry."""
     if config_entry.data[CONF_FLOW_TYPE] != CONF_DEVICE:
diff --git a/homeassistant/components/xiaomi_miio/light.py b/homeassistant/components/xiaomi_miio/light.py
index 3f1f8b926b3..81f68306cbc 100644
--- a/homeassistant/components/xiaomi_miio/light.py
+++ b/homeassistant/components/xiaomi_miio/light.py
@@ -42,9 +42,9 @@ from homeassistant.const import (
     CONF_TOKEN,
 )
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import color as color_util, dt as dt_util
 
 from .const import (
@@ -132,7 +132,7 @@ SERVICE_TO_METHOD = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Xiaomi light from a config entry."""
     entities: list[LightEntity] = []
diff --git a/homeassistant/components/xiaomi_miio/number.py b/homeassistant/components/xiaomi_miio/number.py
index a3c501aad3f..f30d4728275 100644
--- a/homeassistant/components/xiaomi_miio/number.py
+++ b/homeassistant/components/xiaomi_miio/number.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import (
@@ -289,7 +289,7 @@ FAVORITE_LEVEL_VALUES = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Selectors from a config entry."""
     entities = []
diff --git a/homeassistant/components/xiaomi_miio/select.py b/homeassistant/components/xiaomi_miio/select.py
index 6729ce2e0f4..94a93fc1fae 100644
--- a/homeassistant/components/xiaomi_miio/select.py
+++ b/homeassistant/components/xiaomi_miio/select.py
@@ -32,7 +32,7 @@ from homeassistant.components.select import SelectEntity, SelectEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DEVICE, CONF_MODEL, EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CONF_FLOW_TYPE,
@@ -205,7 +205,7 @@ SELECTOR_TYPES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Selectors from a config entry."""
     if config_entry.data[CONF_FLOW_TYPE] != CONF_DEVICE:
diff --git a/homeassistant/components/xiaomi_miio/sensor.py b/homeassistant/components/xiaomi_miio/sensor.py
index aafcba97487..6f623c46af8 100644
--- a/homeassistant/components/xiaomi_miio/sensor.py
+++ b/homeassistant/components/xiaomi_miio/sensor.py
@@ -45,7 +45,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from . import VacuumCoordinatorDataAttributes
@@ -755,7 +755,7 @@ def _setup_vacuum_sensors(hass, config_entry, async_add_entities):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Xiaomi sensor from a config entry."""
     entities: list[SensorEntity] = []
diff --git a/homeassistant/components/xiaomi_miio/strings.json b/homeassistant/components/xiaomi_miio/strings.json
index bafc1ec543b..bd3b3499689 100644
--- a/homeassistant/components/xiaomi_miio/strings.json
+++ b/homeassistant/components/xiaomi_miio/strings.json
@@ -331,7 +331,7 @@
       "fields": {
         "entity_id": {
           "name": "Entity ID",
-          "description": "Name of the xiaomi miio entity."
+          "description": "Name of the Xiaomi Miio entity."
         }
       }
     },
@@ -365,7 +365,7 @@
     },
     "light_set_delayed_turn_off": {
       "name": "Light set delayed turn off",
-      "description": "Delayed turn off.",
+      "description": "Sets the delayed turning off of a light.",
       "fields": {
         "entity_id": {
           "name": "Entity ID",
@@ -373,7 +373,7 @@
         },
         "time_period": {
           "name": "Time period",
-          "description": "Time period for the delayed turn off."
+          "description": "Time period for the delayed turning off."
         }
       }
     },
@@ -398,8 +398,8 @@
       }
     },
     "light_night_light_mode_on": {
-      "name": "Night light mode on",
-      "description": "Turns the eyecare mode on (EYECARE SMART LAMP 2 ONLY).",
+      "name": "Light night light mode on",
+      "description": "Turns on the night light mode of a light (EYECARE SMART LAMP 2 ONLY).",
       "fields": {
         "entity_id": {
           "name": "Entity ID",
@@ -408,8 +408,8 @@
       }
     },
     "light_night_light_mode_off": {
-      "name": "Night light mode off",
-      "description": "Turns the eyecare mode fan_set_dry_off (EYECARE SMART LAMP 2 ONLY).",
+      "name": "Light night light mode off",
+      "description": "Turns off the night light mode of a light (EYECARE SMART LAMP 2 ONLY).",
       "fields": {
         "entity_id": {
           "name": "Entity ID",
@@ -419,7 +419,7 @@
     },
     "light_eyecare_mode_on": {
       "name": "Light eyecare mode on",
-      "description": "[%key:component::xiaomi_miio::services::light_reminder_on::description%]",
+      "description": "Turns on the eyecare mode of a light (EYECARE SMART LAMP 2 ONLY).",
       "fields": {
         "entity_id": {
           "name": "Entity ID",
@@ -429,7 +429,7 @@
     },
     "light_eyecare_mode_off": {
       "name": "Light eyecare mode off",
-      "description": "[%key:component::xiaomi_miio::services::light_reminder_off::description%]",
+      "description": "Turns off the eyecare mode of a light (EYECARE SMART LAMP 2 ONLY).",
       "fields": {
         "entity_id": {
           "name": "Entity ID",
@@ -439,7 +439,7 @@
     },
     "remote_learn_command": {
       "name": "Remote learn command",
-      "description": "Learns an IR command, select **Perform action**, point the remote at the IR device, and the learned command will be shown as a notification in Overview.",
+      "description": "Learns an IR command. Select **Perform action**, point the remote at the IR device, and the learned command will be shown as a notification in Overview.",
       "fields": {
         "slot": {
           "name": "Slot",
@@ -447,21 +447,21 @@
         },
         "timeout": {
           "name": "Timeout",
-          "description": "Define the timeout, before which the command must be learned."
+          "description": "Define the timeout before which the command must be learned."
         }
       }
     },
     "remote_set_led_on": {
       "name": "Remote set LED on",
-      "description": "Turns on blue LED."
+      "description": "Turns on the remote’s blue LED."
     },
     "remote_set_led_off": {
       "name": "Remote set LED off",
-      "description": "Turns off blue LED."
+      "description": "Turns off the remote’s blue LED."
     },
     "switch_set_wifi_led_on": {
       "name": "Switch set Wi-Fi LED on",
-      "description": "Turns the wifi led on.",
+      "description": "Turns on the Wi-Fi LED of a switch.",
       "fields": {
         "entity_id": {
           "name": "Entity ID",
@@ -471,7 +471,7 @@
     },
     "switch_set_wifi_led_off": {
       "name": "Switch set Wi-Fi LED off",
-      "description": "Turn the Wi-Fi led off.",
+      "description": "Turns off the Wi-Fi LED of a switch.",
       "fields": {
         "entity_id": {
           "name": "Entity ID",
@@ -509,7 +509,7 @@
     },
     "vacuum_remote_control_start": {
       "name": "Vacuum remote control start",
-      "description": "Starts remote control of the vacuum cleaner. You can then move it with `remote_control_move`, when done call `remote_control_stop`."
+      "description": "Starts remote control of the vacuum cleaner. You can then move it with the 'Vacuum remote control move' action, when done use 'Vacuum remote control stop'."
     },
     "vacuum_remote_control_stop": {
       "name": "Vacuum remote control stop",
@@ -517,7 +517,7 @@
     },
     "vacuum_remote_control_move": {
       "name": "Vacuum remote control move",
-      "description": "Remote controls the vacuum cleaner, make sure you first set it in remote control mode with `remote_control_start`.",
+      "description": "Remote controls the vacuum cleaner, make sure you first set it in remote control mode with the 'Vacuum remote control start' action.",
       "fields": {
         "velocity": {
           "name": "Velocity",
@@ -567,7 +567,7 @@
     },
     "vacuum_goto": {
       "name": "Vacuum go to",
-      "description": "Go to the specified coordinates.",
+      "description": "Sends the robot to the specified coordinates.",
       "fields": {
         "x_coord": {
           "name": "X coordinate",
diff --git a/homeassistant/components/xiaomi_miio/switch.py b/homeassistant/components/xiaomi_miio/switch.py
index 02f4d4e94e5..e4b94aebc20 100644
--- a/homeassistant/components/xiaomi_miio/switch.py
+++ b/homeassistant/components/xiaomi_miio/switch.py
@@ -29,8 +29,8 @@ from homeassistant.const import (
     EntityCategory,
 )
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     CONF_FLOW_TYPE,
@@ -341,7 +341,7 @@ SWITCH_TYPES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the switch from a config entry."""
     model = config_entry.data[CONF_MODEL]
diff --git a/homeassistant/components/xiaomi_miio/vacuum.py b/homeassistant/components/xiaomi_miio/vacuum.py
index 532eb9581cd..1cbc79b89f3 100644
--- a/homeassistant/components/xiaomi_miio/vacuum.py
+++ b/homeassistant/components/xiaomi_miio/vacuum.py
@@ -18,7 +18,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DEVICE
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 from homeassistant.util.dt import as_utc
 
@@ -79,7 +79,7 @@ STATE_CODE_TO_STATE = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Xiaomi vacuum cleaner robot from a config entry."""
     entities = []
diff --git a/homeassistant/components/xiaomi_tv/media_player.py b/homeassistant/components/xiaomi_tv/media_player.py
index 675c802f79c..19cb4faf2b9 100644
--- a/homeassistant/components/xiaomi_tv/media_player.py
+++ b/homeassistant/components/xiaomi_tv/media_player.py
@@ -15,7 +15,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.const import CONF_HOST, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/xmpp/notify.py b/homeassistant/components/xmpp/notify.py
index 3fb5dd166a1..968f925d1e8 100644
--- a/homeassistant/components/xmpp/notify.py
+++ b/homeassistant/components/xmpp/notify.py
@@ -35,8 +35,7 @@ from homeassistant.const import (
     CONF_SENDER,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
-import homeassistant.helpers.template as template_helper
+from homeassistant.helpers import config_validation as cv, template as template_helper
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/xs1/__init__.py b/homeassistant/components/xs1/__init__.py
index 6f7197817d7..15fb9d021c6 100644
--- a/homeassistant/components/xs1/__init__.py
+++ b/homeassistant/components/xs1/__init__.py
@@ -14,8 +14,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/xs1/entity.py b/homeassistant/components/xs1/entity.py
index 7239a6fd446..c1ec43ec33c 100644
--- a/homeassistant/components/xs1/entity.py
+++ b/homeassistant/components/xs1/entity.py
@@ -17,7 +17,7 @@ class XS1DeviceEntity(Entity):
         """Initialize the XS1 device."""
         self.device = device
 
-    async def async_update(self):
+    async def async_update(self) -> None:
         """Retrieve latest device state."""
         async with UPDATE_LOCK:
             await self.hass.async_add_executor_job(self.device.update)
diff --git a/homeassistant/components/yale/binary_sensor.py b/homeassistant/components/yale/binary_sensor.py
index dbb00ad7d42..bb9acb16644 100644
--- a/homeassistant/components/yale/binary_sensor.py
+++ b/homeassistant/components/yale/binary_sensor.py
@@ -21,7 +21,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 
 from . import YaleConfigEntry, YaleData
@@ -92,7 +92,7 @@ SENSOR_TYPES_DOORBELL: tuple[YaleDoorbellBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: YaleConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Yale binary sensors."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/yale/button.py b/homeassistant/components/yale/button.py
index b04ad638f0c..005d477e4ca 100644
--- a/homeassistant/components/yale/button.py
+++ b/homeassistant/components/yale/button.py
@@ -2,7 +2,7 @@
 
 from homeassistant.components.button import ButtonEntity
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import YaleConfigEntry
 from .entity import YaleEntity
@@ -11,7 +11,7 @@ from .entity import YaleEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: YaleConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Yale lock wake buttons."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/yale/camera.py b/homeassistant/components/yale/camera.py
index 217e8f5f6fd..acabba23b59 100644
--- a/homeassistant/components/yale/camera.py
+++ b/homeassistant/components/yale/camera.py
@@ -12,7 +12,7 @@ from yalexs.util import update_doorbell_image_from_activity
 from homeassistant.components.camera import Camera
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import aiohttp_client
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import YaleConfigEntry, YaleData
 from .const import DEFAULT_NAME, DEFAULT_TIMEOUT
@@ -24,7 +24,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: YaleConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Yale cameras."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/yale/event.py b/homeassistant/components/yale/event.py
index 935ba7376f8..0ea7694be6d 100644
--- a/homeassistant/components/yale/event.py
+++ b/homeassistant/components/yale/event.py
@@ -16,7 +16,7 @@ from homeassistant.components.event import (
     EventEntityDescription,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import YaleConfigEntry, YaleData
 from .entity import YaleDescriptionEntity
@@ -59,7 +59,7 @@ TYPES_DOORBELL: tuple[YaleEventEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: YaleConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the yale event platform."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/yale/lock.py b/homeassistant/components/yale/lock.py
index b911c92ba0f..079c1dcd3dd 100644
--- a/homeassistant/components/yale/lock.py
+++ b/homeassistant/components/yale/lock.py
@@ -14,9 +14,9 @@ from yalexs.util import get_latest_activity, update_lock_detail_from_activity
 from homeassistant.components.lock import ATTR_CHANGED_BY, LockEntity, LockEntityFeature
 from homeassistant.const import ATTR_BATTERY_LEVEL
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import YaleConfigEntry, YaleData
 from .entity import YaleEntity
@@ -29,7 +29,7 @@ LOCK_JAMMED_ERR = 531
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: YaleConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Yale locks."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/yale/manifest.json b/homeassistant/components/yale/manifest.json
index f1cde31d066..5c8e98b1e6e 100644
--- a/homeassistant/components/yale/manifest.json
+++ b/homeassistant/components/yale/manifest.json
@@ -13,5 +13,5 @@
   "documentation": "https://www.home-assistant.io/integrations/yale",
   "iot_class": "cloud_push",
   "loggers": ["socketio", "engineio", "yalexs"],
-  "requirements": ["yalexs==8.10.0", "yalexs-ble==2.5.6"]
+  "requirements": ["yalexs==8.10.0", "yalexs-ble==2.5.7"]
 }
diff --git a/homeassistant/components/yale/sensor.py b/homeassistant/components/yale/sensor.py
index bb3d4317277..91ecbea704d 100644
--- a/homeassistant/components/yale/sensor.py
+++ b/homeassistant/components/yale/sensor.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
     EntityCategory,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import YaleConfigEntry
 from .const import (
@@ -82,7 +82,7 @@ SENSOR_TYPE_KEYPAD_BATTERY = YaleSensorEntityDescription[KeypadDetail](
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: YaleConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Yale sensors."""
     data = config_entry.runtime_data
diff --git a/homeassistant/components/yale_smart_alarm/alarm_control_panel.py b/homeassistant/components/yale_smart_alarm/alarm_control_panel.py
index 8244d96064a..b443ba016d6 100644
--- a/homeassistant/components/yale_smart_alarm/alarm_control_panel.py
+++ b/homeassistant/components/yale_smart_alarm/alarm_control_panel.py
@@ -17,7 +17,7 @@ from homeassistant.components.alarm_control_panel import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import YaleConfigEntry
 from .const import DOMAIN, STATE_MAP, YALE_ALL_ERRORS
@@ -26,7 +26,9 @@ from .entity import YaleAlarmEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: YaleConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: YaleConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the alarm entry."""
 
diff --git a/homeassistant/components/yale_smart_alarm/binary_sensor.py b/homeassistant/components/yale_smart_alarm/binary_sensor.py
index fa9584505e2..20fe3648eed 100644
--- a/homeassistant/components/yale_smart_alarm/binary_sensor.py
+++ b/homeassistant/components/yale_smart_alarm/binary_sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import YaleConfigEntry
 from .coordinator import YaleDataUpdateCoordinator
@@ -44,7 +44,9 @@ SENSOR_TYPES = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: YaleConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: YaleConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Yale binary sensor entry."""
 
diff --git a/homeassistant/components/yale_smart_alarm/button.py b/homeassistant/components/yale_smart_alarm/button.py
index 0e53c814fd4..0875ab4514d 100644
--- a/homeassistant/components/yale_smart_alarm/button.py
+++ b/homeassistant/components/yale_smart_alarm/button.py
@@ -7,7 +7,7 @@ from typing import TYPE_CHECKING
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import YaleConfigEntry
 from .const import DOMAIN, YALE_ALL_ERRORS
@@ -25,7 +25,7 @@ BUTTON_TYPES = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: YaleConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the button from a config entry."""
 
diff --git a/homeassistant/components/yale_smart_alarm/config_flow.py b/homeassistant/components/yale_smart_alarm/config_flow.py
index 3ceee367284..1aaad2aa63a 100644
--- a/homeassistant/components/yale_smart_alarm/config_flow.py
+++ b/homeassistant/components/yale_smart_alarm/config_flow.py
@@ -17,7 +17,7 @@ from homeassistant.config_entries import (
 )
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 from .const import (
     CONF_AREA_ID,
diff --git a/homeassistant/components/yale_smart_alarm/lock.py b/homeassistant/components/yale_smart_alarm/lock.py
index 7a93baf0827..f4fae531b67 100644
--- a/homeassistant/components/yale_smart_alarm/lock.py
+++ b/homeassistant/components/yale_smart_alarm/lock.py
@@ -10,7 +10,7 @@ from homeassistant.components.lock import LockEntity, LockState
 from homeassistant.const import ATTR_CODE
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import YaleConfigEntry
 from .const import (
@@ -30,7 +30,9 @@ LOCK_STATE_MAP = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: YaleConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: YaleConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Yale lock entry."""
 
diff --git a/homeassistant/components/yale_smart_alarm/select.py b/homeassistant/components/yale_smart_alarm/select.py
index 55b56dd8e54..0b443e762e6 100644
--- a/homeassistant/components/yale_smart_alarm/select.py
+++ b/homeassistant/components/yale_smart_alarm/select.py
@@ -6,7 +6,7 @@ from yalesmartalarmclient import YaleLock, YaleLockVolume
 
 from homeassistant.components.select import SelectEntity
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import YaleConfigEntry
 from .coordinator import YaleDataUpdateCoordinator
@@ -16,7 +16,9 @@ VOLUME_OPTIONS = {value.name.lower(): str(value.value) for value in YaleLockVolu
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: YaleConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: YaleConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Yale select entry."""
 
diff --git a/homeassistant/components/yale_smart_alarm/sensor.py b/homeassistant/components/yale_smart_alarm/sensor.py
index 50343f2e41f..14301d0c6b5 100644
--- a/homeassistant/components/yale_smart_alarm/sensor.py
+++ b/homeassistant/components/yale_smart_alarm/sensor.py
@@ -7,7 +7,7 @@ from typing import cast
 from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import YaleConfigEntry
@@ -15,7 +15,9 @@ from .entity import YaleEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: YaleConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: YaleConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Yale sensor entry."""
 
diff --git a/homeassistant/components/yale_smart_alarm/switch.py b/homeassistant/components/yale_smart_alarm/switch.py
index e8c0817c2de..e4523a66802 100644
--- a/homeassistant/components/yale_smart_alarm/switch.py
+++ b/homeassistant/components/yale_smart_alarm/switch.py
@@ -8,7 +8,7 @@ from yalesmartalarmclient import YaleLock
 
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import YaleConfigEntry
 from .coordinator import YaleDataUpdateCoordinator
@@ -16,7 +16,9 @@ from .entity import YaleLockEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: YaleConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: YaleConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Yale switch entry."""
 
diff --git a/homeassistant/components/yalexs_ble/binary_sensor.py b/homeassistant/components/yalexs_ble/binary_sensor.py
index 7cd142bb9ba..dc924486df2 100644
--- a/homeassistant/components/yalexs_ble/binary_sensor.py
+++ b/homeassistant/components/yalexs_ble/binary_sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import YALEXSBLEConfigEntry
 from .entity import YALEXSBLEEntity
@@ -18,7 +18,7 @@ from .entity import YALEXSBLEEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: YALEXSBLEConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up YALE XS binary sensors."""
     data = entry.runtime_data
diff --git a/homeassistant/components/yalexs_ble/config_flow.py b/homeassistant/components/yalexs_ble/config_flow.py
index 6de74759686..0e1eabdf6b2 100644
--- a/homeassistant/components/yalexs_ble/config_flow.py
+++ b/homeassistant/components/yalexs_ble/config_flow.py
@@ -267,7 +267,7 @@ class YalexsConfigFlow(ConfigFlow, domain=DOMAIN):
         if discovery := self._discovery_info:
             self._discovered_devices[discovery.address] = discovery
         else:
-            current_addresses = self._async_current_ids()
+            current_addresses = self._async_current_ids(include_ignore=False)
             current_unique_names = {
                 entry.data.get(CONF_LOCAL_NAME)
                 for entry in self._async_current_entries()
diff --git a/homeassistant/components/yalexs_ble/lock.py b/homeassistant/components/yalexs_ble/lock.py
index 6eb32e3f78a..78b92ab9eb1 100644
--- a/homeassistant/components/yalexs_ble/lock.py
+++ b/homeassistant/components/yalexs_ble/lock.py
@@ -8,7 +8,7 @@ from yalexs_ble import ConnectionInfo, LockInfo, LockState, LockStatus
 
 from homeassistant.components.lock import LockEntity
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import YALEXSBLEConfigEntry
 from .entity import YALEXSBLEEntity
@@ -17,7 +17,7 @@ from .entity import YALEXSBLEEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: YALEXSBLEConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up locks."""
     async_add_entities([YaleXSBLELock(entry.runtime_data)])
diff --git a/homeassistant/components/yalexs_ble/manifest.json b/homeassistant/components/yalexs_ble/manifest.json
index 15b11719fdb..c44f0fdd1e9 100644
--- a/homeassistant/components/yalexs_ble/manifest.json
+++ b/homeassistant/components/yalexs_ble/manifest.json
@@ -12,5 +12,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/yalexs_ble",
   "iot_class": "local_push",
-  "requirements": ["yalexs-ble==2.5.6"]
+  "requirements": ["yalexs-ble==2.5.7"]
 }
diff --git a/homeassistant/components/yalexs_ble/sensor.py b/homeassistant/components/yalexs_ble/sensor.py
index 90f61219e0b..bc9312effe3 100644
--- a/homeassistant/components/yalexs_ble/sensor.py
+++ b/homeassistant/components/yalexs_ble/sensor.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     UnitOfElectricPotential,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import YALEXSBLEConfigEntry
 from .entity import YALEXSBLEEntity
@@ -75,7 +75,7 @@ SENSORS: tuple[YaleXSBLESensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: YALEXSBLEConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up YALE XS Bluetooth sensors."""
     data = entry.runtime_data
diff --git a/homeassistant/components/yamaha_musiccast/__init__.py b/homeassistant/components/yamaha_musiccast/__init__.py
index a2ce98dde56..3e890c8b943 100644
--- a/homeassistant/components/yamaha_musiccast/__init__.py
+++ b/homeassistant/components/yamaha_musiccast/__init__.py
@@ -55,7 +55,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         async_get_clientsession(hass),
         entry.data[CONF_UPNP_DESC],
     )
-    coordinator = MusicCastDataUpdateCoordinator(hass, client=client)
+    coordinator = MusicCastDataUpdateCoordinator(hass, entry, client=client)
     await coordinator.async_config_entry_first_refresh()
     coordinator.musiccast.build_capabilities()
 
diff --git a/homeassistant/components/yamaha_musiccast/coordinator.py b/homeassistant/components/yamaha_musiccast/coordinator.py
index d5e0c67310a..13afbe3aa5e 100644
--- a/homeassistant/components/yamaha_musiccast/coordinator.py
+++ b/homeassistant/components/yamaha_musiccast/coordinator.py
@@ -9,6 +9,7 @@ from typing import TYPE_CHECKING
 from aiomusiccast import MusicCastConnectionException
 from aiomusiccast.musiccast_device import MusicCastData, MusicCastDevice
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -25,11 +26,21 @@ SCAN_INTERVAL = timedelta(seconds=60)
 class MusicCastDataUpdateCoordinator(DataUpdateCoordinator[MusicCastData]):
     """Class to manage fetching data from the API."""
 
-    def __init__(self, hass: HomeAssistant, client: MusicCastDevice) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, client: MusicCastDevice
+    ) -> None:
         """Initialize."""
         self.musiccast = client
 
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=SCAN_INTERVAL)
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=SCAN_INTERVAL,
+        )
         self.entities: list[MusicCastDeviceEntity] = []
 
     async def _async_update_data(self) -> MusicCastData:
diff --git a/homeassistant/components/yamaha_musiccast/entity.py b/homeassistant/components/yamaha_musiccast/entity.py
index 4f1add825e4..8023b13c10a 100644
--- a/homeassistant/components/yamaha_musiccast/entity.py
+++ b/homeassistant/components/yamaha_musiccast/entity.py
@@ -78,13 +78,13 @@ class MusicCastDeviceEntity(MusicCastEntity):
 
         return device_info
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Run when this Entity has been added to HA."""
         await super().async_added_to_hass()
         # All entities should register callbacks to update HA when their state changes
         self.coordinator.musiccast.register_callback(self.async_write_ha_state)
 
-    async def async_will_remove_from_hass(self):
+    async def async_will_remove_from_hass(self) -> None:
         """Entity being removed from hass."""
         await super().async_will_remove_from_hass()
         self.coordinator.musiccast.remove_callback(self.async_write_ha_state)
diff --git a/homeassistant/components/yamaha_musiccast/media_player.py b/homeassistant/components/yamaha_musiccast/media_player.py
index cff14f2b67d..7bf139e9c3b 100644
--- a/homeassistant/components/yamaha_musiccast/media_player.py
+++ b/homeassistant/components/yamaha_musiccast/media_player.py
@@ -24,7 +24,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import uuid as uuid_util
 
 from .const import (
@@ -55,7 +55,7 @@ MUSIC_PLAYER_BASE_SUPPORT = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MusicCast sensor based on a config entry."""
     coordinator: MusicCastDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/yamaha_musiccast/number.py b/homeassistant/components/yamaha_musiccast/number.py
index 02dd6720d91..0de14ef142d 100644
--- a/homeassistant/components/yamaha_musiccast/number.py
+++ b/homeassistant/components/yamaha_musiccast/number.py
@@ -7,7 +7,7 @@ from aiomusiccast.capabilities import NumberSetter
 from homeassistant.components.number import NumberEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import MusicCastDataUpdateCoordinator
@@ -17,7 +17,7 @@ from .entity import MusicCastCapabilityEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MusicCast number entities based on a config entry."""
     coordinator: MusicCastDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/yamaha_musiccast/select.py b/homeassistant/components/yamaha_musiccast/select.py
index 3a4649b9ae5..133cb4c4d7b 100644
--- a/homeassistant/components/yamaha_musiccast/select.py
+++ b/homeassistant/components/yamaha_musiccast/select.py
@@ -7,7 +7,7 @@ from aiomusiccast.capabilities import OptionSetter
 from homeassistant.components.select import SelectEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, TRANSLATION_KEY_MAPPING
 from .coordinator import MusicCastDataUpdateCoordinator
@@ -17,7 +17,7 @@ from .entity import MusicCastCapabilityEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MusicCast select entities based on a config entry."""
     coordinator: MusicCastDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/yamaha_musiccast/switch.py b/homeassistant/components/yamaha_musiccast/switch.py
index 49d031a02b5..148f09930f3 100644
--- a/homeassistant/components/yamaha_musiccast/switch.py
+++ b/homeassistant/components/yamaha_musiccast/switch.py
@@ -7,7 +7,7 @@ from aiomusiccast.capabilities import BinarySetter
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import MusicCastDataUpdateCoordinator
@@ -17,7 +17,7 @@ from .entity import MusicCastCapabilityEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up MusicCast sensor based on a config entry."""
     coordinator: MusicCastDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/yandex_transport/sensor.py b/homeassistant/components/yandex_transport/sensor.py
index 95c4785a341..f87d29fffed 100644
--- a/homeassistant/components/yandex_transport/sensor.py
+++ b/homeassistant/components/yandex_transport/sensor.py
@@ -15,11 +15,11 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_create_clientsession
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/yandextts/tts.py b/homeassistant/components/yandextts/tts.py
index 850afd05150..c7621eb639a 100644
--- a/homeassistant/components/yandextts/tts.py
+++ b/homeassistant/components/yandextts/tts.py
@@ -13,8 +13,8 @@ from homeassistant.components.tts import (
     Provider,
 )
 from homeassistant.const import CONF_API_KEY
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/yardian/coordinator.py b/homeassistant/components/yardian/coordinator.py
index b0c8a882474..da016ca4ec4 100644
--- a/homeassistant/components/yardian/coordinator.py
+++ b/homeassistant/components/yardian/coordinator.py
@@ -28,6 +28,8 @@ SCAN_INTERVAL = datetime.timedelta(seconds=30)
 class YardianUpdateCoordinator(DataUpdateCoordinator[YardianDeviceState]):
     """Coordinator for Yardian API calls."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
@@ -38,6 +40,7 @@ class YardianUpdateCoordinator(DataUpdateCoordinator[YardianDeviceState]):
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             name=entry.title,
             update_interval=SCAN_INTERVAL,
             always_update=False,
diff --git a/homeassistant/components/yardian/switch.py b/homeassistant/components/yardian/switch.py
index 910bacc1c2e..6531a48dc82 100644
--- a/homeassistant/components/yardian/switch.py
+++ b/homeassistant/components/yardian/switch.py
@@ -10,7 +10,7 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import VolDictType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -26,7 +26,7 @@ SERVICE_SCHEMA_START_IRRIGATION: VolDictType = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up entry for a Yardian irrigation switches."""
     coordinator = hass.data[DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/yeelight/__init__.py b/homeassistant/components/yeelight/__init__.py
index 9b71bbc3b16..0b3ceaf2aee 100644
--- a/homeassistant/components/yeelight/__init__.py
+++ b/homeassistant/components/yeelight/__init__.py
@@ -19,7 +19,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, VolDictType
 
 from .const import (
diff --git a/homeassistant/components/yeelight/binary_sensor.py b/homeassistant/components/yeelight/binary_sensor.py
index 9993272d510..69427c65fd5 100644
--- a/homeassistant/components/yeelight/binary_sensor.py
+++ b/homeassistant/components/yeelight/binary_sensor.py
@@ -6,7 +6,7 @@ from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DATA_CONFIG_ENTRIES, DATA_DEVICE, DATA_UPDATED, DOMAIN
 from .entity import YeelightEntity
@@ -17,7 +17,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Yeelight from a config entry."""
     device = hass.data[DOMAIN][DATA_CONFIG_ENTRIES][config_entry.entry_id][DATA_DEVICE]
diff --git a/homeassistant/components/yeelight/config_flow.py b/homeassistant/components/yeelight/config_flow.py
index 35892764bcb..15975ba22bd 100644
--- a/homeassistant/components/yeelight/config_flow.py
+++ b/homeassistant/components/yeelight/config_flow.py
@@ -22,7 +22,7 @@ from homeassistant.config_entries import (
 from homeassistant.const import CONF_DEVICE, CONF_HOST, CONF_ID, CONF_MODEL, CONF_NAME
 from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 from homeassistant.helpers.service_info.ssdp import SsdpServiceInfo
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
diff --git a/homeassistant/components/yeelight/light.py b/homeassistant/components/yeelight/light.py
index 8cc3f2600e5..a2f705298c9 100644
--- a/homeassistant/components/yeelight/light.py
+++ b/homeassistant/components/yeelight/light.py
@@ -32,13 +32,12 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_ENTITY_ID, ATTR_MODE, CONF_NAME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import entity_platform
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.typing import VolDictType
-import homeassistant.util.color as color_util
+from homeassistant.util import color as color_util
 
 from . import YEELIGHT_FLOW_TRANSITION_SCHEMA
 from .const import (
@@ -279,7 +278,7 @@ def _async_cmd[_YeelightBaseLightT: YeelightBaseLight, **_P, _R](
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Yeelight from a config entry."""
     custom_effects = _parse_custom_effects(hass.data[DOMAIN][DATA_CUSTOM_EFFECTS])
diff --git a/homeassistant/components/yeelight/manifest.json b/homeassistant/components/yeelight/manifest.json
index 6efb66449ab..cf7bc9c9035 100644
--- a/homeassistant/components/yeelight/manifest.json
+++ b/homeassistant/components/yeelight/manifest.json
@@ -16,7 +16,7 @@
   },
   "iot_class": "local_push",
   "loggers": ["async_upnp_client", "yeelight"],
-  "requirements": ["yeelight==0.7.14", "async-upnp-client==0.43.0"],
+  "requirements": ["yeelight==0.7.16", "async-upnp-client==0.43.0"],
   "zeroconf": [
     {
       "type": "_miio._udp.local.",
diff --git a/homeassistant/components/yeelight/strings.json b/homeassistant/components/yeelight/strings.json
index 72e400b7cf3..d53c28cb64a 100644
--- a/homeassistant/components/yeelight/strings.json
+++ b/homeassistant/components/yeelight/strings.json
@@ -161,11 +161,11 @@
     },
     "set_music_mode": {
       "name": "Set music mode",
-      "description": "Enables or disables music_mode.",
+      "description": "Enables or disables music mode.",
       "fields": {
         "music_mode": {
           "name": "Music mode",
-          "description": "Use true or false to enable / disable music_mode."
+          "description": "Whether to enable or disable music mode."
         }
       }
     }
diff --git a/homeassistant/components/yeelightsunflower/light.py b/homeassistant/components/yeelightsunflower/light.py
index 0d8247fc865..4cacd1def22 100644
--- a/homeassistant/components/yeelightsunflower/light.py
+++ b/homeassistant/components/yeelightsunflower/light.py
@@ -17,10 +17,10 @@ from homeassistant.components.light import (
 )
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.color as color_util
+from homeassistant.util import color as color_util
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/yolink/__init__.py b/homeassistant/components/yolink/__init__.py
index 004c5a70cc1..7ba7433f53f 100644
--- a/homeassistant/components/yolink/__init__.py
+++ b/homeassistant/components/yolink/__init__.py
@@ -7,7 +7,7 @@ from dataclasses import dataclass
 from datetime import timedelta
 from typing import Any
 
-from yolink.const import ATTR_DEVICE_SMART_REMOTER
+from yolink.const import ATTR_DEVICE_SMART_REMOTER, ATTR_DEVICE_SWITCH
 from yolink.device import YoLinkDevice
 from yolink.exception import YoLinkAuthFailError, YoLinkClientError
 from yolink.home_manager import YoLinkHome
@@ -75,7 +75,8 @@ class YoLinkHomeMessageListener(MessageListener):
         device_coordinator.async_set_updated_data(msg_data)
         # handling events
         if (
-            device_coordinator.device.device_type == ATTR_DEVICE_SMART_REMOTER
+            device_coordinator.device.device_type
+            in [ATTR_DEVICE_SMART_REMOTER, ATTR_DEVICE_SWITCH]
             and msg_data.get("event") is not None
         ):
             device_registry = dr.async_get(self._hass)
@@ -152,7 +153,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             paried_device_id := device_pairing_mapping.get(device.device_id)
         ) is not None:
             paried_device = yolink_home.get_device(paried_device_id)
-        device_coordinator = YoLinkCoordinator(hass, device, paried_device)
+        device_coordinator = YoLinkCoordinator(hass, entry, device, paried_device)
         try:
             await device_coordinator.async_config_entry_first_refresh()
         except ConfigEntryNotReady:
diff --git a/homeassistant/components/yolink/binary_sensor.py b/homeassistant/components/yolink/binary_sensor.py
index fa4c2202b03..30c04d3a424 100644
--- a/homeassistant/components/yolink/binary_sensor.py
+++ b/homeassistant/components/yolink/binary_sensor.py
@@ -23,7 +23,7 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import YoLinkCoordinator
@@ -101,7 +101,7 @@ SENSOR_TYPES: tuple[YoLinkBinarySensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up YoLink Sensor from a config entry."""
     device_coordinators = hass.data[DOMAIN][config_entry.entry_id].device_coordinators
diff --git a/homeassistant/components/yolink/climate.py b/homeassistant/components/yolink/climate.py
index ff3bbf0d93b..65253094fa9 100644
--- a/homeassistant/components/yolink/climate.py
+++ b/homeassistant/components/yolink/climate.py
@@ -22,7 +22,7 @@ from homeassistant.components.climate import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import YoLinkCoordinator
@@ -47,7 +47,7 @@ YOLINK_ACTION_2_HA = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up YoLink Thermostat from a config entry."""
     device_coordinators = hass.data[DOMAIN][config_entry.entry_id].device_coordinators
diff --git a/homeassistant/components/yolink/const.py b/homeassistant/components/yolink/const.py
index eb6169eccad..8879ef15125 100644
--- a/homeassistant/components/yolink/const.py
+++ b/homeassistant/components/yolink/const.py
@@ -33,3 +33,7 @@ DEV_MODEL_PLUG_YS6602_UC = "YS6602-UC"
 DEV_MODEL_PLUG_YS6602_EC = "YS6602-EC"
 DEV_MODEL_PLUG_YS6803_UC = "YS6803-UC"
 DEV_MODEL_PLUG_YS6803_EC = "YS6803-EC"
+DEV_MODEL_SWITCH_YS5708_UC = "YS5708-UC"
+DEV_MODEL_SWITCH_YS5708_EC = "YS5708-EC"
+DEV_MODEL_SWITCH_YS5709_UC = "YS5709-UC"
+DEV_MODEL_SWITCH_YS5709_EC = "YS5709-EC"
diff --git a/homeassistant/components/yolink/coordinator.py b/homeassistant/components/yolink/coordinator.py
index b7db36541b1..d18a37bd276 100644
--- a/homeassistant/components/yolink/coordinator.py
+++ b/homeassistant/components/yolink/coordinator.py
@@ -9,6 +9,7 @@ import logging
 from yolink.device import YoLinkDevice
 from yolink.exception import YoLinkAuthFailError, YoLinkClientError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -21,9 +22,12 @@ _LOGGER = logging.getLogger(__name__)
 class YoLinkCoordinator(DataUpdateCoordinator[dict]):
     """YoLink DataUpdateCoordinator."""
 
+    config_entry: ConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: ConfigEntry,
         device: YoLinkDevice,
         paired_device: YoLinkDevice | None = None,
     ) -> None:
@@ -34,7 +38,11 @@ class YoLinkCoordinator(DataUpdateCoordinator[dict]):
         data at first update
         """
         super().__init__(
-            hass, _LOGGER, name=DOMAIN, update_interval=timedelta(minutes=30)
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=timedelta(minutes=30),
         )
         self.device = device
         self.paired_device = paired_device
diff --git a/homeassistant/components/yolink/cover.py b/homeassistant/components/yolink/cover.py
index b2454bd0d4a..b1cfc3681cc 100644
--- a/homeassistant/components/yolink/cover.py
+++ b/homeassistant/components/yolink/cover.py
@@ -14,7 +14,7 @@ from homeassistant.components.cover import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import YoLinkCoordinator
@@ -24,7 +24,7 @@ from .entity import YoLinkEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up YoLink garage door from a config entry."""
     device_coordinators = hass.data[DOMAIN][config_entry.entry_id].device_coordinators
diff --git a/homeassistant/components/yolink/device_trigger.py b/homeassistant/components/yolink/device_trigger.py
index 6e247bf858e..6f5ed8b24fa 100644
--- a/homeassistant/components/yolink/device_trigger.py
+++ b/homeassistant/components/yolink/device_trigger.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from typing import Any
 
 import voluptuous as vol
-from yolink.const import ATTR_DEVICE_SMART_REMOTER
+from yolink.const import ATTR_DEVICE_SMART_REMOTER, ATTR_DEVICE_SWITCH
 
 from homeassistant.components.device_automation import DEVICE_TRIGGER_BASE_SCHEMA
 from homeassistant.components.homeassistant.triggers import event as event_trigger
@@ -21,6 +21,10 @@ from .const import (
     DEV_MODEL_FLEX_FOB_YS3604_UC,
     DEV_MODEL_FLEX_FOB_YS3614_EC,
     DEV_MODEL_FLEX_FOB_YS3614_UC,
+    DEV_MODEL_SWITCH_YS5708_EC,
+    DEV_MODEL_SWITCH_YS5708_UC,
+    DEV_MODEL_SWITCH_YS5709_EC,
+    DEV_MODEL_SWITCH_YS5709_UC,
 )
 
 CONF_BUTTON_1 = "button_1"
@@ -30,7 +34,7 @@ CONF_BUTTON_4 = "button_4"
 CONF_SHORT_PRESS = "short_press"
 CONF_LONG_PRESS = "long_press"
 
-FLEX_FOB_4_BUTTONS = {
+FLEX_BUTTONS_4 = {
     f"{CONF_BUTTON_1}_{CONF_SHORT_PRESS}",
     f"{CONF_BUTTON_1}_{CONF_LONG_PRESS}",
     f"{CONF_BUTTON_2}_{CONF_SHORT_PRESS}",
@@ -41,7 +45,7 @@ FLEX_FOB_4_BUTTONS = {
     f"{CONF_BUTTON_4}_{CONF_LONG_PRESS}",
 }
 
-FLEX_FOB_2_BUTTONS = {
+FLEX_BUTTONS_2 = {
     f"{CONF_BUTTON_1}_{CONF_SHORT_PRESS}",
     f"{CONF_BUTTON_1}_{CONF_LONG_PRESS}",
     f"{CONF_BUTTON_2}_{CONF_SHORT_PRESS}",
@@ -49,16 +53,19 @@ FLEX_FOB_2_BUTTONS = {
 }
 
 TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
-    {vol.Required(CONF_TYPE): vol.In(FLEX_FOB_4_BUTTONS)}
+    {vol.Required(CONF_TYPE): vol.In(FLEX_BUTTONS_4)}
 )
 
-
-# YoLink Remotes YS3604/YS3614
-FLEX_FOB_TRIGGER_TYPES: dict[str, set[str]] = {
-    DEV_MODEL_FLEX_FOB_YS3604_EC: FLEX_FOB_4_BUTTONS,
-    DEV_MODEL_FLEX_FOB_YS3604_UC: FLEX_FOB_4_BUTTONS,
-    DEV_MODEL_FLEX_FOB_YS3614_UC: FLEX_FOB_2_BUTTONS,
-    DEV_MODEL_FLEX_FOB_YS3614_EC: FLEX_FOB_2_BUTTONS,
+# YoLink Remotes YS3604/YS3614, Switch YS5708/YS5709
+TRIGGER_MAPPINGS: dict[str, set[str]] = {
+    DEV_MODEL_FLEX_FOB_YS3604_EC: FLEX_BUTTONS_4,
+    DEV_MODEL_FLEX_FOB_YS3604_UC: FLEX_BUTTONS_4,
+    DEV_MODEL_FLEX_FOB_YS3614_UC: FLEX_BUTTONS_2,
+    DEV_MODEL_FLEX_FOB_YS3614_EC: FLEX_BUTTONS_2,
+    DEV_MODEL_SWITCH_YS5708_EC: FLEX_BUTTONS_2,
+    DEV_MODEL_SWITCH_YS5708_UC: FLEX_BUTTONS_2,
+    DEV_MODEL_SWITCH_YS5709_EC: FLEX_BUTTONS_2,
+    DEV_MODEL_SWITCH_YS5709_UC: FLEX_BUTTONS_2,
 }
 
 
@@ -68,9 +75,12 @@ async def async_get_triggers(
     """List device triggers for YoLink devices."""
     device_registry = dr.async_get(hass)
     registry_device = device_registry.async_get(device_id)
-    if not registry_device or registry_device.model != ATTR_DEVICE_SMART_REMOTER:
+    if not registry_device or registry_device.model not in [
+        ATTR_DEVICE_SMART_REMOTER,
+        ATTR_DEVICE_SWITCH,
+    ]:
         return []
-    if registry_device.model_id not in list(FLEX_FOB_TRIGGER_TYPES.keys()):
+    if registry_device.model_id not in list(TRIGGER_MAPPINGS.keys()):
         return []
     return [
         {
@@ -79,7 +89,7 @@ async def async_get_triggers(
             CONF_PLATFORM: "device",
             CONF_TYPE: trigger,
         }
-        for trigger in FLEX_FOB_TRIGGER_TYPES[registry_device.model_id]
+        for trigger in TRIGGER_MAPPINGS[registry_device.model_id]
     ]
 
 
diff --git a/homeassistant/components/yolink/light.py b/homeassistant/components/yolink/light.py
index e07d17f7d74..54470673fa5 100644
--- a/homeassistant/components/yolink/light.py
+++ b/homeassistant/components/yolink/light.py
@@ -10,7 +10,7 @@ from yolink.const import ATTR_DEVICE_DIMMER
 from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import YoLinkCoordinator
@@ -20,7 +20,7 @@ from .entity import YoLinkEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up YoLink Dimmer from a config entry."""
     device_coordinators = hass.data[DOMAIN][config_entry.entry_id].device_coordinators
diff --git a/homeassistant/components/yolink/lock.py b/homeassistant/components/yolink/lock.py
index d675fd8cf06..5e244dd08f2 100644
--- a/homeassistant/components/yolink/lock.py
+++ b/homeassistant/components/yolink/lock.py
@@ -10,7 +10,7 @@ from yolink.const import ATTR_DEVICE_LOCK, ATTR_DEVICE_LOCK_V2
 from homeassistant.components.lock import LockEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import YoLinkCoordinator
@@ -20,7 +20,7 @@ from .entity import YoLinkEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up YoLink lock from a config entry."""
     device_coordinators = hass.data[DOMAIN][config_entry.entry_id].device_coordinators
@@ -51,15 +51,16 @@ class YoLinkLockEntity(YoLinkEntity, LockEntity):
     def update_entity_state(self, state: dict[str, Any]) -> None:
         """Update HA Entity State."""
         state_value = state.get("state")
-        if self.coordinator.device.device_type == ATTR_DEVICE_LOCK_V2:
-            self._attr_is_locked = (
-                state_value["lock"] == "locked" if state_value is not None else None
-            )
-        else:
-            self._attr_is_locked = (
-                state_value == "locked" if state_value is not None else None
-            )
-        self.async_write_ha_state()
+        if state_value is not None:
+            if self.coordinator.device.device_type == ATTR_DEVICE_LOCK_V2:
+                self._attr_is_locked = (
+                    state_value["lock"] == "locked" if state_value is not None else None
+                )
+            else:
+                self._attr_is_locked = (
+                    state_value == "locked" if state_value is not None else None
+                )
+            self.async_write_ha_state()
 
     async def call_lock_state_change(self, state: str) -> None:
         """Call setState api to change lock state."""
@@ -69,7 +70,7 @@ class YoLinkLockEntity(YoLinkEntity, LockEntity):
             )
         else:
             await self.call_device(ClientRequest("setState", {"state": state}))
-        self._attr_is_locked = state == "lock"
+        self._attr_is_locked = state in ["locked", "lock"]
         self.async_write_ha_state()
 
     async def async_lock(self, **kwargs: Any) -> None:
diff --git a/homeassistant/components/yolink/manifest.json b/homeassistant/components/yolink/manifest.json
index 78b553d7978..8c297c68670 100644
--- a/homeassistant/components/yolink/manifest.json
+++ b/homeassistant/components/yolink/manifest.json
@@ -6,5 +6,5 @@
   "dependencies": ["auth", "application_credentials"],
   "documentation": "https://www.home-assistant.io/integrations/yolink",
   "iot_class": "cloud_push",
-  "requirements": ["yolink-api==0.4.7"]
+  "requirements": ["yolink-api==0.4.9"]
 }
diff --git a/homeassistant/components/yolink/number.py b/homeassistant/components/yolink/number.py
index 7b7b582382b..c643a20d0ea 100644
--- a/homeassistant/components/yolink/number.py
+++ b/homeassistant/components/yolink/number.py
@@ -17,7 +17,7 @@ from homeassistant.components.number import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import YoLinkCoordinator
@@ -66,7 +66,7 @@ DEVICE_CONFIG_DESCRIPTIONS: tuple[YoLinkNumberTypeConfigEntityDescription, ...]
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up device number type config option entity from a config entry."""
     device_coordinators = hass.data[DOMAIN][config_entry.entry_id].device_coordinators
diff --git a/homeassistant/components/yolink/sensor.py b/homeassistant/components/yolink/sensor.py
index 8f263cdae07..511b7718e26 100644
--- a/homeassistant/components/yolink/sensor.py
+++ b/homeassistant/components/yolink/sensor.py
@@ -47,7 +47,7 @@ from homeassistant.const import (
     UnitOfVolume,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import percentage
 
 from .const import (
@@ -280,7 +280,7 @@ SENSOR_TYPES: tuple[YoLinkSensorEntityDescription, ...] = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up YoLink Sensor from a config entry."""
     device_coordinators = hass.data[DOMAIN][config_entry.entry_id].device_coordinators
diff --git a/homeassistant/components/yolink/services.py b/homeassistant/components/yolink/services.py
index 8d622de70e7..f17408a7005 100644
--- a/homeassistant/components/yolink/services.py
+++ b/homeassistant/components/yolink/services.py
@@ -39,7 +39,7 @@ def async_register_services(hass: HomeAssistant) -> None:
                     continue
                 if entry.domain == DOMAIN:
                     break
-            if entry is None or entry.state == ConfigEntryState.NOT_LOADED:
+            if entry is None or entry.state != ConfigEntryState.LOADED:
                 raise ServiceValidationError(
                     translation_domain=DOMAIN,
                     translation_key="invalid_config_entry",
diff --git a/homeassistant/components/yolink/siren.py b/homeassistant/components/yolink/siren.py
index 9e02f50bb70..d13e2dc6573 100644
--- a/homeassistant/components/yolink/siren.py
+++ b/homeassistant/components/yolink/siren.py
@@ -17,7 +17,7 @@ from homeassistant.components.siren import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import YoLinkCoordinator
@@ -46,7 +46,7 @@ DEVICE_TYPE = [ATTR_DEVICE_SIREN]
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up YoLink siren from a config entry."""
     device_coordinators = hass.data[DOMAIN][config_entry.entry_id].device_coordinators
diff --git a/homeassistant/components/yolink/strings.json b/homeassistant/components/yolink/strings.json
index cbb092405d7..8ec7612fd73 100644
--- a/homeassistant/components/yolink/strings.json
+++ b/homeassistant/components/yolink/strings.json
@@ -6,7 +6,7 @@
       },
       "reauth_confirm": {
         "title": "[%key:common::config_flow::title::reauth%]",
-        "description": "The yolink integration needs to re-authenticate your account"
+        "description": "The YoLink integration needs to re-authenticate your account"
       }
     },
     "abort": {
@@ -99,11 +99,11 @@
   "services": {
     "play_on_speaker_hub": {
       "name": "Play on SpeakerHub",
-      "description": "Convert text to audio play on YoLink SpeakerHub",
+      "description": "Converts text to speech for playback on a YoLink SpeakerHub",
       "fields": {
         "target_device": {
-          "name": "SpeakerHub Device",
-          "description": "SpeakerHub Device"
+          "name": "SpeakerHub device",
+          "description": "SpeakerHub device for audio playback."
         },
         "message": {
           "name": "Text message",
@@ -115,7 +115,7 @@
         },
         "volume": {
           "name": "Volume",
-          "description": "Override the speaker volume during playback of this message only."
+          "description": "Overrides the speaker volume during playback of this message only."
         },
         "repeat": {
           "name": "Repeat",
diff --git a/homeassistant/components/yolink/switch.py b/homeassistant/components/yolink/switch.py
index c999f04d90d..2af7a3c9ddc 100644
--- a/homeassistant/components/yolink/switch.py
+++ b/homeassistant/components/yolink/switch.py
@@ -23,7 +23,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DEV_MODEL_MULTI_OUTLET_YS6801, DOMAIN
 from .coordinator import YoLinkCoordinator
@@ -116,7 +116,7 @@ DEVICE_TYPE = [
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up YoLink switch from a config entry."""
     device_coordinators = hass.data[DOMAIN][config_entry.entry_id].device_coordinators
@@ -162,11 +162,12 @@ class YoLinkSwitchEntity(YoLinkEntity, SwitchEntity):
     @callback
     def update_entity_state(self, state: dict[str, str | list[str]]) -> None:
         """Update HA Entity State."""
-        self._attr_is_on = self._get_state(
-            state.get("state"),
-            self.entity_description.plug_index_fn(self.coordinator.device),
-        )
-        self.async_write_ha_state()
+        if (state_value := state.get("state")) is not None:
+            self._attr_is_on = self._get_state(
+                state_value,
+                self.entity_description.plug_index_fn(self.coordinator.device),
+            )
+            self.async_write_ha_state()
 
     async def call_state_change(self, state: str) -> None:
         """Call setState api to change switch state."""
diff --git a/homeassistant/components/yolink/valve.py b/homeassistant/components/yolink/valve.py
index d8c199697c3..26ce72a53d1 100644
--- a/homeassistant/components/yolink/valve.py
+++ b/homeassistant/components/yolink/valve.py
@@ -17,7 +17,7 @@ from homeassistant.components.valve import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DEV_MODEL_WATER_METER_YS5007, DOMAIN
 from .coordinator import YoLinkCoordinator
@@ -50,7 +50,7 @@ DEVICE_TYPE = [ATTR_DEVICE_WATER_METER_CONTROLLER]
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up YoLink valve from a config entry."""
     device_coordinators = hass.data[DOMAIN][config_entry.entry_id].device_coordinators
diff --git a/homeassistant/components/youless/__init__.py b/homeassistant/components/youless/__init__.py
index 03a27b5a378..af14d597b79 100644
--- a/homeassistant/components/youless/__init__.py
+++ b/homeassistant/components/youless/__init__.py
@@ -27,7 +27,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     except URLError as exception:
         raise ConfigEntryNotReady from exception
 
-    youless_coordinator = YouLessCoordinator(hass, api)
+    youless_coordinator = YouLessCoordinator(hass, entry, api)
     await youless_coordinator.async_config_entry_first_refresh()
 
     hass.data.setdefault(DOMAIN, {})
diff --git a/homeassistant/components/youless/coordinator.py b/homeassistant/components/youless/coordinator.py
index 0be5e463689..81e4b3a4c76 100644
--- a/homeassistant/components/youless/coordinator.py
+++ b/homeassistant/components/youless/coordinator.py
@@ -5,6 +5,7 @@ import logging
 
 from youless_api import YoulessAPI
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -14,10 +15,18 @@ _LOGGER = logging.getLogger(__name__)
 class YouLessCoordinator(DataUpdateCoordinator[None]):
     """Class to manage fetching YouLess data."""
 
-    def __init__(self, hass: HomeAssistant, device: YoulessAPI) -> None:
+    config_entry: ConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, device: YoulessAPI
+    ) -> None:
         """Initialize global YouLess data provider."""
         super().__init__(
-            hass, _LOGGER, name="youless_gateway", update_interval=timedelta(seconds=10)
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name="youless_gateway",
+            update_interval=timedelta(seconds=10),
         )
         self.device = device
 
diff --git a/homeassistant/components/youless/entity.py b/homeassistant/components/youless/entity.py
index 9931768c267..4500fe71a96 100644
--- a/homeassistant/components/youless/entity.py
+++ b/homeassistant/components/youless/entity.py
@@ -20,6 +20,6 @@ class YouLessEntity(CoordinatorEntity[YouLessCoordinator]):
             identifiers={(DOMAIN, device_group)},
             manufacturer="YouLess",
             model=self.device.model,
-            name=device_name,
+            translation_key=device_name,
             sw_version=self.device.firmware_version,
         )
diff --git a/homeassistant/components/youless/sensor.py b/homeassistant/components/youless/sensor.py
index 413f1ad6958..be17bed4352 100644
--- a/homeassistant/components/youless/sensor.py
+++ b/homeassistant/components/youless/sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
     UnitOfVolume,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import DOMAIN
@@ -36,17 +36,14 @@ class YouLessSensorEntityDescription(SensorEntityDescription):
     """Describes a YouLess sensor entity."""
 
     device_group: str
-    device_group_name: str
-    value_func: Callable[[YoulessAPI], float | None]
+    value_func: Callable[[YoulessAPI], float | None | str]
 
 
 SENSOR_TYPES: tuple[YouLessSensorEntityDescription, ...] = (
     YouLessSensorEntityDescription(
         key="water",
         device_group="water",
-        device_group_name="Water meter",
-        name="Water usage",
-        icon="mdi:water",
+        translation_key="total_water",
         device_class=SensorDeviceClass.WATER,
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
@@ -57,9 +54,7 @@ SENSOR_TYPES: tuple[YouLessSensorEntityDescription, ...] = (
     YouLessSensorEntityDescription(
         key="gas",
         device_group="gas",
-        device_group_name="Gas meter",
-        name="Gas usage",
-        icon="mdi:fire",
+        translation_key="total_gas_m3",
         device_class=SensorDeviceClass.GAS,
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
@@ -68,9 +63,7 @@ SENSOR_TYPES: tuple[YouLessSensorEntityDescription, ...] = (
     YouLessSensorEntityDescription(
         key="usage",
         device_group="power",
-        device_group_name="Power usage",
-        name="Power Usage",
-        icon="mdi:meter-electric",
+        translation_key="active_power_w",
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -83,9 +76,8 @@ SENSOR_TYPES: tuple[YouLessSensorEntityDescription, ...] = (
     YouLessSensorEntityDescription(
         key="power_low",
         device_group="power",
-        device_group_name="Power usage",
-        name="Energy low",
-        icon="mdi:transmission-tower-export",
+        translation_key="total_energy_import_tariff_kwh",
+        translation_placeholders={"tariff": "1"},
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
@@ -96,9 +88,8 @@ SENSOR_TYPES: tuple[YouLessSensorEntityDescription, ...] = (
     YouLessSensorEntityDescription(
         key="power_high",
         device_group="power",
-        device_group_name="Power usage",
-        name="Energy high",
-        icon="mdi:transmission-tower-export",
+        translation_key="total_energy_import_tariff_kwh",
+        translation_placeholders={"tariff": "2"},
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
@@ -109,9 +100,7 @@ SENSOR_TYPES: tuple[YouLessSensorEntityDescription, ...] = (
     YouLessSensorEntityDescription(
         key="power_total",
         device_group="power",
-        device_group_name="Power usage",
-        name="Energy total",
-        icon="mdi:transmission-tower-export",
+        translation_key="total_energy_import_kwh",
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
@@ -124,9 +113,8 @@ SENSOR_TYPES: tuple[YouLessSensorEntityDescription, ...] = (
     YouLessSensorEntityDescription(
         key="phase_1_power",
         device_group="power",
-        device_group_name="Power usage",
-        name="Phase 1 power",
-        icon=None,
+        translation_key="active_power_phase_w",
+        translation_placeholders={"phase": "1"},
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -135,9 +123,8 @@ SENSOR_TYPES: tuple[YouLessSensorEntityDescription, ...] = (
     YouLessSensorEntityDescription(
         key="phase_1_voltage",
         device_group="power",
-        device_group_name="Power usage",
-        name="Phase 1 voltage",
-        icon=None,
+        translation_key="active_voltage_phase_v",
+        translation_placeholders={"phase": "1"},
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
@@ -148,9 +135,8 @@ SENSOR_TYPES: tuple[YouLessSensorEntityDescription, ...] = (
     YouLessSensorEntityDescription(
         key="phase_1_current",
         device_group="power",
-        device_group_name="Power usage",
-        name="Phase 1 current",
-        icon=None,
+        translation_key="active_current_phase_a",
+        translation_placeholders={"phase": "1"},
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
@@ -161,9 +147,8 @@ SENSOR_TYPES: tuple[YouLessSensorEntityDescription, ...] = (
     YouLessSensorEntityDescription(
         key="phase_2_power",
         device_group="power",
-        device_group_name="Power usage",
-        name="Phase 2 power",
-        icon=None,
+        translation_key="active_power_phase_w",
+        translation_placeholders={"phase": "2"},
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -172,9 +157,8 @@ SENSOR_TYPES: tuple[YouLessSensorEntityDescription, ...] = (
     YouLessSensorEntityDescription(
         key="phase_2_voltage",
         device_group="power",
-        device_group_name="Power usage",
-        name="Phase 2 voltage",
-        icon=None,
+        translation_key="active_voltage_phase_v",
+        translation_placeholders={"phase": "2"},
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
@@ -185,9 +169,8 @@ SENSOR_TYPES: tuple[YouLessSensorEntityDescription, ...] = (
     YouLessSensorEntityDescription(
         key="phase_2_current",
         device_group="power",
-        device_group_name="Power usage",
-        name="Phase 2 current",
-        icon=None,
+        translation_key="active_current_phase_a",
+        translation_placeholders={"phase": "2"},
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
@@ -198,9 +181,8 @@ SENSOR_TYPES: tuple[YouLessSensorEntityDescription, ...] = (
     YouLessSensorEntityDescription(
         key="phase_3_power",
         device_group="power",
-        device_group_name="Power usage",
-        name="Phase 3 power",
-        icon=None,
+        translation_key="active_power_phase_w",
+        translation_placeholders={"phase": "3"},
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -209,9 +191,8 @@ SENSOR_TYPES: tuple[YouLessSensorEntityDescription, ...] = (
     YouLessSensorEntityDescription(
         key="phase_3_voltage",
         device_group="power",
-        device_group_name="Power usage",
-        name="Phase 3 voltage",
-        icon=None,
+        translation_key="active_voltage_phase_v",
+        translation_placeholders={"phase": "3"},
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
@@ -222,9 +203,8 @@ SENSOR_TYPES: tuple[YouLessSensorEntityDescription, ...] = (
     YouLessSensorEntityDescription(
         key="phase_3_current",
         device_group="power",
-        device_group_name="Power usage",
-        name="Phase 3 current",
-        icon=None,
+        translation_key="active_current_phase_a",
+        translation_placeholders={"phase": "3"},
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
@@ -232,12 +212,43 @@ SENSOR_TYPES: tuple[YouLessSensorEntityDescription, ...] = (
             lambda device: device.phase3.current.value if device.phase1 else None
         ),
     ),
+    YouLessSensorEntityDescription(
+        key="tariff",
+        device_group="power",
+        translation_key="active_tariff",
+        device_class=SensorDeviceClass.ENUM,
+        options=["1", "2"],
+        value_func=(
+            lambda device: str(device.current_tariff) if device.current_tariff else None
+        ),
+    ),
+    YouLessSensorEntityDescription(
+        key="average_peak",
+        device_group="power",
+        translation_key="average_peak",
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfPower.WATT,
+        value_func=(
+            lambda device: device.average_power.value if device.average_power else None
+        ),
+    ),
+    YouLessSensorEntityDescription(
+        key="month_peak",
+        device_group="power",
+        translation_key="month_peak",
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfPower.WATT,
+        value_func=(
+            lambda device: device.peak_power.value if device.peak_power else None
+        ),
+    ),
     YouLessSensorEntityDescription(
         key="delivery_low",
         device_group="delivery",
-        device_group_name="Energy delivery",
-        name="Energy delivery low",
-        icon="mdi:transmission-tower-import",
+        translation_key="total_energy_export_tariff_kwh",
+        translation_placeholders={"tariff": "1"},
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
@@ -250,9 +261,8 @@ SENSOR_TYPES: tuple[YouLessSensorEntityDescription, ...] = (
     YouLessSensorEntityDescription(
         key="delivery_high",
         device_group="delivery",
-        device_group_name="Energy delivery",
-        name="Energy delivery high",
-        icon="mdi:transmission-tower-import",
+        translation_key="total_energy_export_tariff_kwh",
+        translation_placeholders={"tariff": "2"},
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
@@ -265,9 +275,7 @@ SENSOR_TYPES: tuple[YouLessSensorEntityDescription, ...] = (
     YouLessSensorEntityDescription(
         key="extra_total",
         device_group="extra",
-        device_group_name="Extra meter",
-        name="Extra total",
-        icon="mdi:meter-electric",
+        translation_key="total_s0_kwh",
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
@@ -280,9 +288,7 @@ SENSOR_TYPES: tuple[YouLessSensorEntityDescription, ...] = (
     YouLessSensorEntityDescription(
         key="extra_usage",
         device_group="extra",
-        device_group_name="Extra meter",
-        name="Extra usage",
-        icon="mdi:lightning-bolt",
+        translation_key="active_s0_w",
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -296,7 +302,9 @@ SENSOR_TYPES: tuple[YouLessSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize the integration."""
     coordinator: YouLessCoordinator = hass.data[DOMAIN][entry.entry_id]
@@ -316,6 +324,7 @@ class YouLessSensor(YouLessEntity, SensorEntity):
     """Representation of a Sensor."""
 
     entity_description: YouLessSensorEntityDescription
+    _attr_has_entity_name = True
 
     def __init__(
         self,
@@ -327,7 +336,7 @@ class YouLessSensor(YouLessEntity, SensorEntity):
         super().__init__(
             coordinator,
             f"{device}_{description.device_group}",
-            description.device_group_name,
+            description.device_group,
         )
         self._attr_unique_id = f"{DOMAIN}_{device}_{description.key}"
         self.entity_description = description
diff --git a/homeassistant/components/youless/strings.json b/homeassistant/components/youless/strings.json
index e0eddd7d137..c735e2b2ff2 100644
--- a/homeassistant/components/youless/strings.json
+++ b/homeassistant/components/youless/strings.json
@@ -14,5 +14,68 @@
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     }
+  },
+  "device": {
+    "water": {
+      "name": "Water meter"
+    },
+    "gas": {
+      "name": "Gas meter"
+    },
+    "power": {
+      "name": "Power meter"
+    },
+    "delivery": {
+      "name": "Energy delivery meter"
+    },
+    "extra": {
+      "name": "S0 meter"
+    }
+  },
+  "entity": {
+    "sensor": {
+      "total_water": {
+        "name": "Total water usage"
+      },
+      "total_gas_m3": {
+        "name": "Total gas usage"
+      },
+      "active_power_w": {
+        "name": "Current power usage"
+      },
+      "active_power_phase_w": {
+        "name": "Power phase {phase}"
+      },
+      "active_voltage_phase_v": {
+        "name": "Voltage phase {phase}"
+      },
+      "active_current_phase_a": {
+        "name": "Current phase {phase}"
+      },
+      "active_tariff": {
+        "name": "Tariff"
+      },
+      "total_energy_import_tariff_kwh": {
+        "name": "Energy import tariff {tariff}"
+      },
+      "total_energy_import_kwh": {
+        "name": "Total energy import"
+      },
+      "total_energy_export_tariff_kwh": {
+        "name": "Energy export tariff {tariff}"
+      },
+      "total_s0_kwh": {
+        "name": "Total energy"
+      },
+      "active_s0_w": {
+        "name": "Current usage"
+      },
+      "average_peak": {
+        "name": "Average peak"
+      },
+      "month_peak": {
+        "name": "Month peak"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/youtube/__init__.py b/homeassistant/components/youtube/__init__.py
index 8460a105fcb..ec8a3f325cb 100644
--- a/homeassistant/components/youtube/__init__.py
+++ b/homeassistant/components/youtube/__init__.py
@@ -8,11 +8,11 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.config_entry_oauth2_flow import (
     OAuth2Session,
     async_get_config_entry_implementation,
 )
-import homeassistant.helpers.device_registry as dr
 
 from .api import AsyncConfigEntryAuth
 from .const import AUTH, COORDINATOR, DOMAIN
@@ -36,7 +36,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         raise ConfigEntryNotReady from err
     except ClientError as err:
         raise ConfigEntryNotReady from err
-    coordinator = YouTubeDataUpdateCoordinator(hass, auth)
+    coordinator = YouTubeDataUpdateCoordinator(hass, entry, auth)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/youtube/coordinator.py b/homeassistant/components/youtube/coordinator.py
index 0da480f1169..476e5bb4022 100644
--- a/homeassistant/components/youtube/coordinator.py
+++ b/homeassistant/components/youtube/coordinator.py
@@ -35,12 +35,15 @@ class YouTubeDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
 
     config_entry: ConfigEntry
 
-    def __init__(self, hass: HomeAssistant, auth: AsyncConfigEntryAuth) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: ConfigEntry, auth: AsyncConfigEntryAuth
+    ) -> None:
         """Initialize the YouTube data coordinator."""
         self._auth = auth
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=timedelta(minutes=15),
         )
diff --git a/homeassistant/components/youtube/sensor.py b/homeassistant/components/youtube/sensor.py
index 8832382508c..128c23f7082 100644
--- a/homeassistant/components/youtube/sensor.py
+++ b/homeassistant/components/youtube/sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.sensor import SensorEntity, SensorEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_ICON
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import YouTubeDataUpdateCoordinator
@@ -72,7 +72,9 @@ SENSOR_TYPES = [
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the YouTube sensor."""
     coordinator: YouTubeDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
diff --git a/homeassistant/components/zabbix/__init__.py b/homeassistant/components/zabbix/__init__.py
index 05881d649cf..524bac271de 100644
--- a/homeassistant/components/zabbix/__init__.py
+++ b/homeassistant/components/zabbix/__init__.py
@@ -27,8 +27,11 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import Event, EventStateChangedData, HomeAssistant, callback
-from homeassistant.helpers import event as event_helper, state as state_helper
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import (
+    config_validation as cv,
+    event as event_helper,
+    state as state_helper,
+)
 from homeassistant.helpers.entityfilter import (
     INCLUDE_EXCLUDE_BASE_FILTER_SCHEMA,
     convert_include_exclude_filter,
diff --git a/homeassistant/components/zabbix/sensor.py b/homeassistant/components/zabbix/sensor.py
index 7728233ebc0..27d7e71d8d9 100644
--- a/homeassistant/components/zabbix/sensor.py
+++ b/homeassistant/components/zabbix/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, StateType
 
diff --git a/homeassistant/components/zamg/coordinator.py b/homeassistant/components/zamg/coordinator.py
index d53c743f500..a88c97ad267 100644
--- a/homeassistant/components/zamg/coordinator.py
+++ b/homeassistant/components/zamg/coordinator.py
@@ -32,6 +32,7 @@ class ZamgDataUpdateCoordinator(DataUpdateCoordinator[ZamgDevice]):
         super().__init__(
             hass,
             LOGGER,
+            config_entry=entry,
             name=DOMAIN,
             update_interval=MIN_TIME_BETWEEN_UPDATES,
         )
diff --git a/homeassistant/components/zamg/sensor.py b/homeassistant/components/zamg/sensor.py
index 7c7f5fd6c16..fdb9d51185c 100644
--- a/homeassistant/components/zamg/sensor.py
+++ b/homeassistant/components/zamg/sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -82,7 +82,8 @@ SENSOR_TYPES: tuple[ZamgSensorEntityDescription, ...] = (
         key="wind_bearing",
         name="Wind Bearing",
         native_unit_of_measurement=DEGREE,
-        state_class=SensorStateClass.MEASUREMENT,
+        state_class=SensorStateClass.MEASUREMENT_ANGLE,
+        device_class=SensorDeviceClass.WIND_DIRECTION,
         para_name="DD",
     ),
     ZamgSensorEntityDescription(
@@ -163,7 +164,9 @@ API_FIELDS: list[str] = [desc.para_name for desc in SENSOR_TYPES]
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ZAMG sensor platform."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/zamg/weather.py b/homeassistant/components/zamg/weather.py
index 286a6460f19..ac376577ade 100644
--- a/homeassistant/components/zamg/weather.py
+++ b/homeassistant/components/zamg/weather.py
@@ -12,7 +12,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import ATTRIBUTION, CONF_STATION_ID, DOMAIN, MANUFACTURER_URL
@@ -20,7 +20,9 @@ from .coordinator import ZamgDataUpdateCoordinator
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the ZAMG weather platform."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/zengge/light.py b/homeassistant/components/zengge/light.py
index 69b7c63476a..ccb6733c650 100644
--- a/homeassistant/components/zengge/light.py
+++ b/homeassistant/components/zengge/light.py
@@ -2,138 +2,38 @@
 
 from __future__ import annotations
 
-import logging
-from typing import Any
-
 import voluptuous as vol
-from zengge import zengge
 
-from homeassistant.components.light import (
-    ATTR_BRIGHTNESS,
-    ATTR_HS_COLOR,
-    ATTR_WHITE,
-    PLATFORM_SCHEMA as LIGHT_PLATFORM_SCHEMA,
-    ColorMode,
-    LightEntity,
-)
+from homeassistant.components.light import PLATFORM_SCHEMA as LIGHT_PLATFORM_SCHEMA
 from homeassistant.const import CONF_DEVICES, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, issue_registry as ir
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-import homeassistant.util.color as color_util
-
-_LOGGER = logging.getLogger(__name__)
 
 DEVICE_SCHEMA = vol.Schema({vol.Optional(CONF_NAME): cv.string})
+DOMAIN = "zengge"
 
 PLATFORM_SCHEMA = LIGHT_PLATFORM_SCHEMA.extend(
     {vol.Optional(CONF_DEVICES, default={}): {cv.string: DEVICE_SCHEMA}}
 )
 
 
-def setup_platform(
+def async_setup_platform(
     hass: HomeAssistant,
     config: ConfigType,
     add_entities: AddEntitiesCallback,
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the Zengge platform."""
-    lights = []
-    for address, device_config in config[CONF_DEVICES].items():
-        light = ZenggeLight(device_config[CONF_NAME], address)
-        if light.is_valid:
-            lights.append(light)
-
-    add_entities(lights, True)
-
-
-class ZenggeLight(LightEntity):
-    """Representation of a Zengge light."""
-
-    _attr_supported_color_modes = {ColorMode.HS, ColorMode.WHITE}
-
-    def __init__(self, name: str, address: str) -> None:
-        """Initialize the light."""
-
-        self._attr_name = name
-        self._attr_unique_id = address
-        self.is_valid = True
-        self._bulb = zengge(address)
-        self._white = 0
-        self._attr_brightness = 0
-        self._attr_hs_color = (0, 0)
-        self._attr_is_on = False
-        if self._bulb.connect() is False:
-            self.is_valid = False
-            _LOGGER.error("Failed to connect to bulb %s, %s", address, name)
-            return
-
-    @property
-    def white_value(self) -> int:
-        """Return the white property."""
-        return self._white
-
-    @property
-    def color_mode(self) -> ColorMode:
-        """Return the current color mode."""
-        if self._white != 0:
-            return ColorMode.WHITE
-        return ColorMode.HS
-
-    def _set_rgb(self, red: int, green: int, blue: int) -> None:
-        """Set the rgb state."""
-        self._bulb.set_rgb(red, green, blue)
-
-    def _set_white(self, white):
-        """Set the white state."""
-        return self._bulb.set_white(white)
-
-    def turn_on(self, **kwargs: Any) -> None:
-        """Turn the specified light on."""
-        self._attr_is_on = True
-        self._bulb.on()
-
-        hs_color = kwargs.get(ATTR_HS_COLOR)
-        white = kwargs.get(ATTR_WHITE)
-        brightness = kwargs.get(ATTR_BRIGHTNESS)
-
-        if white is not None:
-            # Change the bulb to white
-            self._attr_brightness = white
-            self._white = white
-            self._attr_hs_color = (0, 0)
-
-        if hs_color is not None:
-            # Change the bulb to hs
-            self._white = 0
-            self._attr_hs_color = hs_color
-
-        if brightness is not None:
-            self._attr_brightness = brightness
-
-        if self._white != 0:
-            self._set_white(self.brightness)
-        else:
-            assert self.hs_color is not None
-            assert self.brightness is not None
-            rgb = color_util.color_hsv_to_RGB(
-                self.hs_color[0], self.hs_color[1], self.brightness / 255 * 100
-            )
-            self._set_rgb(*rgb)
-
-    def turn_off(self, **kwargs: Any) -> None:
-        """Turn the specified light off."""
-        self._attr_is_on = False
-        self._bulb.off()
-
-    def update(self) -> None:
-        """Synchronise internal state with the actual light state."""
-        rgb = self._bulb.get_colour()
-        hsv = color_util.color_RGB_to_hsv(*rgb)
-        self._attr_hs_color = hsv[:2]
-        self._attr_brightness = int((hsv[2] / 100) * 255)
-        self._white = self._bulb.get_white()
-        if self._white:
-            self._attr_brightness = self._white
-        self._attr_is_on = self._bulb.get_on()
+    ir.async_create_issue(
+        hass,
+        DOMAIN,
+        DOMAIN,
+        is_fixable=False,
+        severity=ir.IssueSeverity.ERROR,
+        translation_key="integration_removed",
+        translation_placeholders={
+            "led_ble_url": "https://www.home-assistant.io/integrations/led_ble/",
+        },
+    )
diff --git a/homeassistant/components/zengge/manifest.json b/homeassistant/components/zengge/manifest.json
index 03d989c5f3b..daa63b4de3d 100644
--- a/homeassistant/components/zengge/manifest.json
+++ b/homeassistant/components/zengge/manifest.json
@@ -5,6 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/zengge",
   "iot_class": "local_polling",
   "loggers": ["zengge"],
-  "quality_scale": "legacy",
-  "requirements": ["bluepy==1.3.0", "zengge==0.2"]
+  "quality_scale": "legacy"
 }
diff --git a/homeassistant/components/zengge/strings.json b/homeassistant/components/zengge/strings.json
new file mode 100644
index 00000000000..abc3b2450aa
--- /dev/null
+++ b/homeassistant/components/zengge/strings.json
@@ -0,0 +1,8 @@
+{
+  "issues": {
+    "integration_removed": {
+      "title": "The Zengge integration has been removed",
+      "description": "The Zengge integration has been removed from Home Assistant. Support for Zengge lights is provided by the `led_ble` integration.\n\nTo resolve this issue, please remove the (now defunct) `zengge` light configuration from your Home Assistant configuration and [configure the `led_ble` integration]({led_ble_url})."
+    }
+  }
+}
diff --git a/homeassistant/components/zeroconf/__init__.py b/homeassistant/components/zeroconf/__init__.py
index b748006336c..e80b6b8cfdb 100644
--- a/homeassistant/components/zeroconf/__init__.py
+++ b/homeassistant/components/zeroconf/__init__.py
@@ -141,13 +141,13 @@ def async_get_async_zeroconf(hass: HomeAssistant) -> HaAsyncZeroconf:
     return _async_get_instance(hass)
 
 
-def _async_get_instance(hass: HomeAssistant, **zcargs: Any) -> HaAsyncZeroconf:
+def _async_get_instance(hass: HomeAssistant) -> HaAsyncZeroconf:
     if DOMAIN in hass.data:
         return cast(HaAsyncZeroconf, hass.data[DOMAIN])
 
     logging.getLogger("zeroconf").setLevel(logging.NOTSET)
 
-    zeroconf = HaZeroconf(**zcargs)
+    zeroconf = HaZeroconf(**_async_get_zc_args(hass))
     aio_zc = HaAsyncZeroconf(zc=zeroconf)
 
     install_multiple_zeroconf_catcher(zeroconf)
@@ -175,12 +175,10 @@ def _async_zc_has_functional_dual_stack() -> bool:
     )
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up Zeroconf and make Home Assistant discoverable."""
-    zc_args: dict = {"ip_version": IPVersion.V4Only}
-
-    adapters = await network.async_get_adapters(hass)
-
+def _async_get_zc_args(hass: HomeAssistant) -> dict[str, Any]:
+    """Get zeroconf arguments from config."""
+    zc_args: dict[str, Any] = {"ip_version": IPVersion.V4Only}
+    adapters = network.async_get_loaded_adapters(hass)
     ipv6 = False
     if _async_zc_has_functional_dual_stack():
         if any(adapter["enabled"] and adapter["ipv6"] for adapter in adapters):
@@ -195,7 +193,9 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     else:
         zc_args["interfaces"] = [
             str(source_ip)
-            for source_ip in await network.async_get_enabled_source_ips(hass)
+            for source_ip in network.async_get_enabled_source_ips_from_adapters(
+                adapters
+            )
             if not source_ip.is_loopback
             and not (isinstance(source_ip, IPv6Address) and source_ip.is_global)
             and not (
@@ -207,8 +207,12 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                 and zc_args["ip_version"] == IPVersion.V6Only
             )
         ]
+    return zc_args
 
-    aio_zc = _async_get_instance(hass, **zc_args)
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up Zeroconf and make Home Assistant discoverable."""
+    aio_zc = _async_get_instance(hass)
     zeroconf = cast(HaZeroconf, aio_zc.zeroconf)
     zeroconf_types = await async_get_zeroconf(hass)
     homekit_models = await async_get_homekit(hass)
diff --git a/homeassistant/components/zeroconf/manifest.json b/homeassistant/components/zeroconf/manifest.json
index 6fe2b5b1923..a7fbfdfeada 100644
--- a/homeassistant/components/zeroconf/manifest.json
+++ b/homeassistant/components/zeroconf/manifest.json
@@ -8,5 +8,5 @@
   "iot_class": "local_push",
   "loggers": ["zeroconf"],
   "quality_scale": "internal",
-  "requirements": ["zeroconf==0.141.0"]
+  "requirements": ["zeroconf==0.146.0"]
 }
diff --git a/homeassistant/components/zerproc/light.py b/homeassistant/components/zerproc/light.py
index ed6ed03ad27..19175ae3084 100644
--- a/homeassistant/components/zerproc/light.py
+++ b/homeassistant/components/zerproc/light.py
@@ -18,9 +18,9 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import Event, HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_track_time_interval
-import homeassistant.util.color as color_util
+from homeassistant.util import color as color_util
 
 from .const import DATA_ADDRESSES, DATA_DISCOVERY_SUBSCRIPTION, DOMAIN
 
@@ -51,7 +51,7 @@ async def discover_entities(hass: HomeAssistant) -> list[ZerprocLight]:
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Zerproc light devices."""
     warned = False
diff --git a/homeassistant/components/zestimate/sensor.py b/homeassistant/components/zestimate/sensor.py
index 12831c96932..ec8850b187d 100644
--- a/homeassistant/components/zestimate/sensor.py
+++ b/homeassistant/components/zestimate/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import CONF_API_KEY, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/zeversolar/coordinator.py b/homeassistant/components/zeversolar/coordinator.py
index 9f6ff49eaf8..ec68cf4b56f 100644
--- a/homeassistant/components/zeversolar/coordinator.py
+++ b/homeassistant/components/zeversolar/coordinator.py
@@ -20,11 +20,14 @@ _LOGGER = logging.getLogger(__name__)
 class ZeversolarCoordinator(DataUpdateCoordinator[zeversolar.ZeverSolarData]):
     """Data update coordinator."""
 
+    config_entry: ConfigEntry
+
     def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
         """Initialize the coordinator."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             name=DOMAIN,
             update_interval=timedelta(minutes=1),
         )
diff --git a/homeassistant/components/zeversolar/sensor.py b/homeassistant/components/zeversolar/sensor.py
index 5023e274267..330e5bb72d8 100644
--- a/homeassistant/components/zeversolar/sensor.py
+++ b/homeassistant/components/zeversolar/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, UnitOfEnergy, UnitOfPower
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import ZeversolarCoordinator
@@ -52,7 +52,9 @@ SENSOR_TYPES = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Zeversolar sensor."""
     coordinator: ZeversolarCoordinator = hass.data[DOMAIN][entry.entry_id]
diff --git a/homeassistant/components/zha/__init__.py b/homeassistant/components/zha/__init__.py
index 1897b741d87..e446f32cf08 100644
--- a/homeassistant/components/zha/__init__.py
+++ b/homeassistant/components/zha/__init__.py
@@ -12,6 +12,10 @@ from zha.zigbee.device import get_device_automation_triggers
 from zigpy.config import CONF_DATABASE, CONF_DEVICE, CONF_DEVICE_PATH
 from zigpy.exceptions import NetworkSettingsInconsistent, TransientConnectionError
 
+from homeassistant.components.homeassistant_hardware.helpers import (
+    async_notify_firmware_info,
+    async_register_firmware_info_provider,
+)
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_TYPE,
@@ -21,12 +25,11 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryError, ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.typing import ConfigType
 
-from . import repairs, websocket_api
+from . import homeassistant_hardware, repairs, websocket_api
 from .const import (
     CONF_BAUDRATE,
     CONF_CUSTOM_QUIRKS_PATH,
@@ -111,6 +114,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     ha_zha_data = HAZHAData(yaml_config=config.get(DOMAIN, {}))
     hass.data[DATA_ZHA] = ha_zha_data
 
+    async_register_firmware_info_provider(hass, DOMAIN, homeassistant_hardware)
+
     return True
 
 
@@ -219,6 +224,13 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
         hass.bus.async_listen(EVENT_CORE_CONFIG_UPDATE, update_config)
     )
 
+    if fw_info := homeassistant_hardware.get_firmware_info(hass, config_entry):
+        await async_notify_firmware_info(
+            hass,
+            DOMAIN,
+            firmware_info=fw_info,
+        )
+
     await ha_zha_data.gateway_proxy.async_initialize_devices_and_entities()
     await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
     async_dispatcher_send(hass, SIGNAL_ADD_ENTITIES)
diff --git a/homeassistant/components/zha/alarm_control_panel.py b/homeassistant/components/zha/alarm_control_panel.py
index 734683e5497..ff61ce07d23 100644
--- a/homeassistant/components/zha/alarm_control_panel.py
+++ b/homeassistant/components/zha/alarm_control_panel.py
@@ -18,7 +18,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import ZHAEntity
 from .helpers import (
@@ -46,7 +46,7 @@ ZHA_STATE_TO_ALARM_STATE_MAP = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Zigbee Home Automation alarm control panel from config entry."""
     zha_data = get_zha_data(hass)
diff --git a/homeassistant/components/zha/binary_sensor.py b/homeassistant/components/zha/binary_sensor.py
index f45ebf0c5a5..f8146026384 100644
--- a/homeassistant/components/zha/binary_sensor.py
+++ b/homeassistant/components/zha/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import ZHAEntity
 from .helpers import (
@@ -26,7 +26,7 @@ from .helpers import (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Zigbee Home Automation binary sensor from config entry."""
     zha_data = get_zha_data(hass)
diff --git a/homeassistant/components/zha/button.py b/homeassistant/components/zha/button.py
index ecd5cd51f61..dd90bcd29b1 100644
--- a/homeassistant/components/zha/button.py
+++ b/homeassistant/components/zha/button.py
@@ -10,7 +10,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import ZHAEntity
 from .helpers import (
@@ -27,7 +27,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Zigbee Home Automation button from config entry."""
     zha_data = get_zha_data(hass)
diff --git a/homeassistant/components/zha/climate.py b/homeassistant/components/zha/climate.py
index af9f56cd7dc..a3f60420a38 100644
--- a/homeassistant/components/zha/climate.py
+++ b/homeassistant/components/zha/climate.py
@@ -30,7 +30,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PRECISION_TENTHS, Platform, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import ZHAEntity
 from .helpers import (
@@ -66,7 +66,7 @@ ZHA_TO_HA_HVAC_ACTION = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Zigbee Home Automation sensor from config entry."""
     zha_data = get_zha_data(hass)
diff --git a/homeassistant/components/zha/config_flow.py b/homeassistant/components/zha/config_flow.py
index d41ae7dbfee..b98e53f98d8 100644
--- a/homeassistant/components/zha/config_flow.py
+++ b/homeassistant/components/zha/config_flow.py
@@ -113,9 +113,14 @@ async def list_serial_ports(hass: HomeAssistant) -> list[ListPortInfo]:
     except HomeAssistantError:
         pass
     else:
-        yellow_radio = next(p for p in ports if p.device == "/dev/ttyAMA1")
-        yellow_radio.description = "Yellow Zigbee module"
-        yellow_radio.manufacturer = "Nabu Casa"
+        # PySerial does not properly handle the Yellow's serial port with the CM5
+        # so we manually include it
+        port = ListPortInfo(device="/dev/ttyAMA1", skip_link_detection=True)
+        port.description = "Yellow Zigbee module"
+        port.manufacturer = "Nabu Casa"
+
+        ports = [p for p in ports if not p.device.startswith("/dev/ttyAMA")]
+        ports.insert(0, port)
 
     if is_hassio(hass):
         # Present the multi-PAN addon as a setup option, if it's available
diff --git a/homeassistant/components/zha/cover.py b/homeassistant/components/zha/cover.py
index 0d6be2dbb35..d058f37ff6b 100644
--- a/homeassistant/components/zha/cover.py
+++ b/homeassistant/components/zha/cover.py
@@ -23,7 +23,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, State, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import ZHAEntity
 from .helpers import (
@@ -40,7 +40,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Zigbee Home Automation cover from config entry."""
     zha_data = get_zha_data(hass)
diff --git a/homeassistant/components/zha/device_tracker.py b/homeassistant/components/zha/device_tracker.py
index 7bdfc54c986..c86bb3352b5 100644
--- a/homeassistant/components/zha/device_tracker.py
+++ b/homeassistant/components/zha/device_tracker.py
@@ -10,7 +10,7 @@ from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import ZHAEntity
 from .helpers import (
@@ -23,7 +23,7 @@ from .helpers import (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Zigbee Home Automation device tracker from config entry."""
     zha_data = get_zha_data(hass)
diff --git a/homeassistant/components/zha/entity.py b/homeassistant/components/zha/entity.py
index 499721722fa..e3339661d15 100644
--- a/homeassistant/components/zha/entity.py
+++ b/homeassistant/components/zha/entity.py
@@ -59,6 +59,10 @@ class ZHAEntity(LogMixin, RestoreEntity, Entity):
     def name(self) -> str | UndefinedType | None:
         """Return the name of the entity."""
         meta = self.entity_data.entity.info_object
+        if meta.primary:
+            self._attr_name = None
+            return super().name
+
         original_name = super().name
 
         if original_name not in (UNDEFINED, None) or meta.fallback_name is None:
diff --git a/homeassistant/components/zha/fan.py b/homeassistant/components/zha/fan.py
index 73b23e97387..81206f8819e 100644
--- a/homeassistant/components/zha/fan.py
+++ b/homeassistant/components/zha/fan.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import ZHAEntity
 from .helpers import (
@@ -27,7 +27,7 @@ from .helpers import (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Zigbee Home Automation fan from config entry."""
     zha_data = get_zha_data(hass)
diff --git a/homeassistant/components/zha/helpers.py b/homeassistant/components/zha/helpers.py
index c31627d3dc3..700e2833705 100644
--- a/homeassistant/components/zha/helpers.py
+++ b/homeassistant/components/zha/helpers.py
@@ -11,6 +11,7 @@ import enum
 import functools
 import itertools
 import logging
+import queue
 import re
 import time
 from types import MappingProxyType
@@ -111,9 +112,10 @@ from homeassistant.helpers import (
     device_registry as dr,
     entity_registry as er,
 )
-from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers.dispatcher import async_dispatcher_send, dispatcher_send
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType
+from homeassistant.util.logging import HomeAssistantQueueHandler
 
 from .const import (
     ATTR_ACTIVE_COORDINATOR,
@@ -505,7 +507,14 @@ class ZHAGatewayProxy(EventBase):
             DEBUG_LEVEL_CURRENT: async_capture_log_levels(),
         }
         self.debug_enabled: bool = False
-        self._log_relay_handler: LogRelayHandler = LogRelayHandler(hass, self)
+
+        log_relay_handler: LogRelayHandler = LogRelayHandler(hass, self)
+        log_simple_queue: queue.SimpleQueue[logging.Handler] = queue.SimpleQueue()
+        self._log_queue_handler = HomeAssistantQueueHandler(log_simple_queue)
+        self._log_queue_handler.listener = logging.handlers.QueueListener(
+            log_simple_queue, log_relay_handler
+        )
+
         self._unsubs: list[Callable[[], None]] = []
         self._unsubs.append(self.gateway.on_all_events(self._handle_event_protocol))
         self._reload_task: asyncio.Task | None = None
@@ -736,10 +745,13 @@ class ZHAGatewayProxy(EventBase):
         self._log_levels[DEBUG_LEVEL_CURRENT] = async_capture_log_levels()
 
         if filterer:
-            self._log_relay_handler.addFilter(filterer)
+            self._log_queue_handler.addFilter(filterer)
+
+        if self._log_queue_handler.listener:
+            self._log_queue_handler.listener.start()
 
         for logger_name in DEBUG_RELAY_LOGGERS:
-            logging.getLogger(logger_name).addHandler(self._log_relay_handler)
+            logging.getLogger(logger_name).addHandler(self._log_queue_handler)
 
         self.debug_enabled = True
 
@@ -749,9 +761,14 @@ class ZHAGatewayProxy(EventBase):
         async_set_logger_levels(self._log_levels[DEBUG_LEVEL_ORIGINAL])
         self._log_levels[DEBUG_LEVEL_CURRENT] = async_capture_log_levels()
         for logger_name in DEBUG_RELAY_LOGGERS:
-            logging.getLogger(logger_name).removeHandler(self._log_relay_handler)
+            logging.getLogger(logger_name).removeHandler(self._log_queue_handler)
+
+        if self._log_queue_handler.listener:
+            self._log_queue_handler.listener.stop()
+
         if filterer:
-            self._log_relay_handler.removeFilter(filterer)
+            self._log_queue_handler.removeFilter(filterer)
+
         self.debug_enabled = False
 
     async def shutdown(self) -> None:
@@ -978,7 +995,7 @@ class LogRelayHandler(logging.Handler):
         entry = LogEntry(
             record, self.paths_re, figure_out_source=record.levelno >= logging.WARNING
         )
-        async_dispatcher_send(
+        dispatcher_send(
             self.hass,
             ZHA_GW_MSG,
             {ATTR_TYPE: ZHA_GW_MSG_LOG_OUTPUT, ZHA_GW_MSG_LOG_ENTRY: entry.to_dict()},
diff --git a/homeassistant/components/zha/homeassistant_hardware.py b/homeassistant/components/zha/homeassistant_hardware.py
new file mode 100644
index 00000000000..18057d3b64d
--- /dev/null
+++ b/homeassistant/components/zha/homeassistant_hardware.py
@@ -0,0 +1,43 @@
+"""Home Assistant Hardware firmware utilities."""
+
+from __future__ import annotations
+
+from homeassistant.components.homeassistant_hardware.util import (
+    ApplicationType,
+    FirmwareInfo,
+    OwningIntegration,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant, callback
+
+from .const import DOMAIN
+from .helpers import get_zha_gateway
+
+
+@callback
+def get_firmware_info(
+    hass: HomeAssistant, config_entry: ConfigEntry
+) -> FirmwareInfo | None:
+    """Return firmware information for the ZHA instance, synchronously."""
+
+    # We only support EZSP firmware for now
+    if config_entry.data.get("radio_type", None) != "ezsp":
+        return None
+
+    if (device := config_entry.data.get("device", {}).get("path")) is None:
+        return None
+
+    try:
+        gateway = get_zha_gateway(hass)
+    except ValueError:
+        firmware_version = None
+    else:
+        firmware_version = gateway.state.node_info.version
+
+    return FirmwareInfo(
+        device=device,
+        firmware_type=ApplicationType.EZSP,
+        firmware_version=firmware_version,
+        source=DOMAIN,
+        owners=[OwningIntegration(config_entry_id=config_entry.entry_id)],
+    )
diff --git a/homeassistant/components/zha/icons.json b/homeassistant/components/zha/icons.json
index 6ba4aab18ab..d43e213aa4a 100644
--- a/homeassistant/components/zha/icons.json
+++ b/homeassistant/components/zha/icons.json
@@ -124,6 +124,12 @@
       },
       "on_led_color": {
         "default": "mdi:palette"
+      },
+      "device_mode": {
+        "default": "mdi:cogs"
+      },
+      "pilot_wire_mode": {
+        "default": "mdi:radiator"
       }
     },
     "sensor": {
diff --git a/homeassistant/components/zha/light.py b/homeassistant/components/zha/light.py
index 2f5d9e9e4c9..a2fb61dc019 100644
--- a/homeassistant/components/zha/light.py
+++ b/homeassistant/components/zha/light.py
@@ -28,7 +28,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_ON, Platform
 from homeassistant.core import HomeAssistant, State, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import color as color_util
 
 from .entity import ZHAEntity
@@ -59,7 +59,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Zigbee Home Automation light from config entry."""
     zha_data = get_zha_data(hass)
diff --git a/homeassistant/components/zha/lock.py b/homeassistant/components/zha/lock.py
index ebac03eb7b8..dc27ec7a6fa 100644
--- a/homeassistant/components/zha/lock.py
+++ b/homeassistant/components/zha/lock.py
@@ -12,7 +12,7 @@ from homeassistant.core import HomeAssistant, State, callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import (
-    AddEntitiesCallback,
+    AddConfigEntryEntitiesCallback,
     async_get_current_platform,
 )
 
@@ -33,7 +33,7 @@ SERVICE_CLEAR_LOCK_USER_CODE = "clear_lock_user_code"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Zigbee Home Automation Door Lock from config entry."""
     zha_data = get_zha_data(hass)
diff --git a/homeassistant/components/zha/logbook.py b/homeassistant/components/zha/logbook.py
index 3de81e1255d..05539a063d2 100644
--- a/homeassistant/components/zha/logbook.py
+++ b/homeassistant/components/zha/logbook.py
@@ -10,7 +10,7 @@ from zha.application.const import ZHA_EVENT
 from homeassistant.components.logbook import LOGBOOK_ENTRY_MESSAGE, LOGBOOK_ENTRY_NAME
 from homeassistant.const import ATTR_COMMAND, ATTR_DEVICE_ID
 from homeassistant.core import Event, HomeAssistant, callback
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import device_registry as dr
 
 from .const import DOMAIN as ZHA_DOMAIN
 from .helpers import async_get_zha_device_proxy
diff --git a/homeassistant/components/zha/manifest.json b/homeassistant/components/zha/manifest.json
index f9323fe99df..4daa2f2aa40 100644
--- a/homeassistant/components/zha/manifest.json
+++ b/homeassistant/components/zha/manifest.json
@@ -21,7 +21,7 @@
     "zha",
     "universal_silabs_flasher"
   ],
-  "requirements": ["zha==0.0.45"],
+  "requirements": ["zha==0.0.54"],
   "usb": [
     {
       "vid": "10C4",
diff --git a/homeassistant/components/zha/number.py b/homeassistant/components/zha/number.py
index 263f5262994..567e2a5b37a 100644
--- a/homeassistant/components/zha/number.py
+++ b/homeassistant/components/zha/number.py
@@ -10,7 +10,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import UndefinedType
 
 from .entity import ZHAEntity
@@ -27,7 +27,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Zigbee Home Automation Analog Output from config entry."""
     zha_data = get_zha_data(hass)
diff --git a/homeassistant/components/zha/radio_manager.py b/homeassistant/components/zha/radio_manager.py
index aaf156290a7..6a5d39bc3db 100644
--- a/homeassistant/components/zha/radio_manager.py
+++ b/homeassistant/components/zha/radio_manager.py
@@ -420,7 +420,7 @@ class ZhaMultiPANMigrationHelper:
         self._radio_mgr.radio_type = new_radio_type
         self._radio_mgr.device_path = new_device_settings[CONF_DEVICE_PATH]
         self._radio_mgr.device_settings = new_device_settings
-        device_settings = self._radio_mgr.device_settings.copy()  # type: ignore[union-attr]
+        device_settings = self._radio_mgr.device_settings.copy()
 
         # Update the config entry settings
         self._hass.config_entries.async_update_entry(
diff --git a/homeassistant/components/zha/select.py b/homeassistant/components/zha/select.py
index fdb47b550fe..4a38738b7dd 100644
--- a/homeassistant/components/zha/select.py
+++ b/homeassistant/components/zha/select.py
@@ -11,7 +11,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN, Platform
 from homeassistant.core import HomeAssistant, State, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import ZHAEntity
 from .helpers import (
@@ -28,7 +28,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Zigbee Home Automation siren from config entry."""
     zha_data = get_zha_data(hass)
diff --git a/homeassistant/components/zha/sensor.py b/homeassistant/components/zha/sensor.py
index 670d6af3c52..a8383857e57 100644
--- a/homeassistant/components/zha/sensor.py
+++ b/homeassistant/components/zha/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from .entity import ZHAEntity
@@ -46,9 +46,15 @@ _EXTRA_STATE_ATTRIBUTES: set[str] = {
     "rms_current_max_ph_b",
     "rms_current_max_ph_c",
     "rms_voltage_max",
+    "rms_voltage_max_ph_b",
+    "rms_voltage_max_ph_c",
     "ac_frequency_max",
     "power_factor_max",
+    "power_factor_max_ph_b",
+    "power_factor_max_ph_c",
     "active_power_max",
+    "active_power_max_ph_b",
+    "active_power_max_ph_c",
     # Smart Energy metering
     "device_type",
     "status",
@@ -74,7 +80,7 @@ _EXTRA_STATE_ATTRIBUTES: set[str] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Zigbee Home Automation sensor from config entry."""
     zha_data = get_zha_data(hass)
diff --git a/homeassistant/components/zha/siren.py b/homeassistant/components/zha/siren.py
index 9d876d9ca4d..0c8b447cb37 100644
--- a/homeassistant/components/zha/siren.py
+++ b/homeassistant/components/zha/siren.py
@@ -26,7 +26,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import ZHAEntity
 from .helpers import (
@@ -41,7 +41,7 @@ from .helpers import (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Zigbee Home Automation siren from config entry."""
     zha_data = get_zha_data(hass)
diff --git a/homeassistant/components/zha/strings.json b/homeassistant/components/zha/strings.json
index 35c9f35887d..a35dd50df54 100644
--- a/homeassistant/components/zha/strings.json
+++ b/homeassistant/components/zha/strings.json
@@ -3,11 +3,11 @@
     "flow_title": "{name}",
     "step": {
       "choose_serial_port": {
-        "title": "Select a Serial Port",
+        "title": "Select a serial port",
+        "description": "Select the serial port for your Zigbee radio",
         "data": {
-          "path": "Serial Device Path"
-        },
-        "description": "Select the serial port for your Zigbee radio"
+          "path": "Serial device path"
+        }
       },
       "confirm": {
         "description": "Do you want to set up {name}?"
@@ -16,14 +16,14 @@
         "description": "Do you want to set up {name}?"
       },
       "manual_pick_radio_type": {
+        "title": "Select a radio type",
+        "description": "Pick your Zigbee radio type",
         "data": {
-          "radio_type": "Radio Type"
-        },
-        "title": "[%key:component::zha::config::step::manual_pick_radio_type::data::radio_type%]",
-        "description": "Pick your Zigbee radio type"
+          "radio_type": "Radio type"
+        }
       },
       "manual_port_config": {
-        "title": "Serial Port Settings",
+        "title": "Serial port settings",
         "description": "Enter the serial port settings",
         "data": {
           "path": "Serial device path",
@@ -36,7 +36,7 @@
         "description": "The radio you are using ({name}) is not recommended and support for it may be removed in the future. Please see the Zigbee Home Automation integration's documentation for [a list of recommended adapters]({docs_recommended_adapters_url})."
       },
       "choose_formation_strategy": {
-        "title": "Network Formation",
+        "title": "Network formation",
         "description": "Choose the network settings for your radio.",
         "menu_options": {
           "form_new_network": "Erase network settings and create a new network",
@@ -47,21 +47,21 @@
         }
       },
       "choose_automatic_backup": {
-        "title": "Restore Automatic Backup",
+        "title": "Restore automatic backup",
         "description": "Restore your network settings from an automatic backup",
         "data": {
           "choose_automatic_backup": "Choose an automatic backup"
         }
       },
       "upload_manual_backup": {
-        "title": "Upload a Manual Backup",
+        "title": "Upload a manual backup",
         "description": "Restore your network settings from an uploaded backup JSON file. You can download one from a different ZHA installation from **Network Settings**, or use a Zigbee2MQTT `coordinator_backup.json` file.",
         "data": {
           "uploaded_backup_file": "Upload a file"
         }
       },
       "maybe_confirm_ezsp_restore": {
-        "title": "Overwrite Radio IEEE Address",
+        "title": "Overwrite radio IEEE address",
         "description": "Your backup has a different IEEE address than your radio. For your network to function properly, the IEEE address of your radio should also be changed.\n\nThis is a permanent operation.",
         "data": {
           "overwrite_coordinator_ieee": "Permanently replace the radio IEEE address"
@@ -74,10 +74,10 @@
     },
     "abort": {
       "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
-      "not_zha_device": "This device is not a zha device",
-      "usb_probe_failed": "Failed to probe the usb device",
+      "not_zha_device": "This device is not a ZHA device",
+      "usb_probe_failed": "Failed to probe the USB device",
       "wrong_firmware_installed": "Your device is running the wrong firmware and cannot be used with ZHA until the correct firmware is installed. [A repair has been created]({repair_url}) with more information and instructions for how to fix this.",
-      "invalid_zeroconf_data": "The coordinator has invalid zeroconf service info and cannot be identified by ZHA"
+      "invalid_zeroconf_data": "The coordinator has invalid Zeroconf service info and cannot be identified by ZHA"
     }
   },
   "options": {
@@ -176,7 +176,7 @@
   },
   "config_panel": {
     "zha_options": {
-      "title": "Global Options",
+      "title": "Global options",
       "enhanced_light_transition": "Enable enhanced light color/temperature transition from an off-state",
       "light_transitioning_flag": "Enable enhanced brightness slider during light transition",
       "group_members_assume_state": "Group members assume state of group",
@@ -187,7 +187,7 @@
       "consider_unavailable_battery": "Consider battery powered devices unavailable after (seconds)"
     },
     "zha_alarm_options": {
-      "title": "Alarm Control Panel Options",
+      "title": "Alarm control panel options",
       "alarm_master_code": "Master code for the alarm control panel(s)",
       "alarm_failed_tries": "The number of consecutive failed code entries to trigger an alarm",
       "alarm_arm_requires_code": "Code required for arming actions"
@@ -274,15 +274,15 @@
         },
         "source_ieee": {
           "name": "Source IEEE",
-          "description": "IEEE address of the joining device (must be used with the install code)."
+          "description": "IEEE address of the joining device (must be combined with the 'Install code' field)."
         },
         "install_code": {
           "name": "Install code",
-          "description": "Install code of the joining device (must be used with the source_ieee)."
+          "description": "Install code of the joining device (must be combined with the 'Source IEEE' field)."
         },
         "qr_code": {
           "name": "QR code",
-          "description": "Value of the QR install code (different between vendors)."
+          "description": "Provides both the IEEE address and the install code of the joining device (different between vendors)."
         }
       }
     },
@@ -307,7 +307,7 @@
       }
     },
     "set_zigbee_cluster_attribute": {
-      "name": "Set zigbee cluster attribute",
+      "name": "Set Zigbee cluster attribute",
       "description": "Sets an attribute value for the specified cluster on the specified entity.",
       "fields": {
         "ieee": {
@@ -323,7 +323,7 @@
           "description": "ZCL cluster to retrieve attributes for."
         },
         "cluster_type": {
-          "name": "Cluster Type",
+          "name": "Cluster type",
           "description": "Type of the cluster."
         },
         "attribute": {
@@ -341,7 +341,7 @@
       }
     },
     "issue_zigbee_cluster_command": {
-      "name": "Issue zigbee cluster command",
+      "name": "Issue Zigbee cluster command",
       "description": "Issues a command on the specified cluster on the specified entity.",
       "fields": {
         "ieee": {
@@ -383,8 +383,8 @@
       }
     },
     "issue_zigbee_group_command": {
-      "name": "Issue zigbee group command",
-      "description": "Issue command on the specified cluster on the specified group.",
+      "name": "Issue Zigbee group command",
+      "description": "Issues a command on the specified cluster on the specified group.",
       "fields": {
         "group": {
           "name": "Group",
@@ -592,6 +592,30 @@
       },
       "window_detection": {
         "name": "Open window detection"
+      },
+      "silence_alarm": {
+        "name": "Silence alarm"
+      },
+      "preheat_active": {
+        "name": "Preheat active"
+      },
+      "fault_alarm": {
+        "name": "Fault alarm"
+      },
+      "led_indicator": {
+        "name": "LED indicator"
+      },
+      "error_or_battery_low": {
+        "name": "Error or battery low"
+      },
+      "flow_switch": {
+        "name": "Flow switch"
+      },
+      "water_leak": {
+        "name": "Water leak"
+      },
+      "water_supply": {
+        "name": "Water supply"
       }
     },
     "button": {
@@ -612,6 +636,9 @@
       },
       "restart_device": {
         "name": "Restart device"
+      },
+      "frost_lock_reset": {
+        "name": "Frost lock reset"
       }
     },
     "climate": {
@@ -885,6 +912,222 @@
       },
       "fading_time": {
         "name": "Fading time"
+      },
+      "temperature_offset": {
+        "name": "Temperature offset"
+      },
+      "humidity_offset": {
+        "name": "Humidity offset"
+      },
+      "comfort_temperature_min": {
+        "name": "Comfort temperature min"
+      },
+      "comfort_temperature_max": {
+        "name": "Comfort temperature max"
+      },
+      "comfort_humidity_min": {
+        "name": "Comfort humidity min"
+      },
+      "comfort_humidity_max": {
+        "name": "Comfort humidity max"
+      },
+      "measurement_interval": {
+        "name": "Measurement interval"
+      },
+      "on_time": {
+        "name": "On time"
+      },
+      "alarm_duration": {
+        "name": "Alarm duration"
+      },
+      "max_set": {
+        "name": "Liquid max percentage"
+      },
+      "mini_set": {
+        "name": "Liquid minimal percentage"
+      },
+      "installation_height": {
+        "name": "Height from sensor to tank bottom"
+      },
+      "liquid_depth_max": {
+        "name": "Height from sensor to liquid level"
+      },
+      "interval_time": {
+        "name": "Interval time"
+      },
+      "target_distance": {
+        "name": "Target distance"
+      },
+      "hold_delay_time": {
+        "name": "Hold delay time"
+      },
+      "breath_detection_max": {
+        "name": "Breath detection max"
+      },
+      "breath_detection_min": {
+        "name": "Breath detection min"
+      },
+      "small_move_detection_max": {
+        "name": "Small move detection max"
+      },
+      "small_move_detection_min": {
+        "name": "Small move detection min"
+      },
+      "small_move_sensitivity": {
+        "name": "Small move sensitivity"
+      },
+      "breath_sensitivity": {
+        "name": "Breath sensitivity"
+      },
+      "entry_sensitivity": {
+        "name": "Entry sensitivity"
+      },
+      "entry_distance_indentation": {
+        "name": "Entry distance indentation"
+      },
+      "illuminance_threshold": {
+        "name": "Illuminance threshold"
+      },
+      "block_time": {
+        "name": "Block time"
+      },
+      "motion_sensitivity": {
+        "name": "Motion sensitivity"
+      },
+      "radar_sensitivity": {
+        "name": "Radar sensitivity"
+      },
+      "motionless_detection": {
+        "name": "Motionless detection"
+      },
+      "motionless_sensitivity": {
+        "name": "Motionless detection sensitivity"
+      },
+      "output_time": {
+        "name": "Output time"
+      },
+      "illuminance_interval": {
+        "name": "Illuminance interval"
+      },
+      "temperature_report_interval": {
+        "name": "Temperature report interval"
+      },
+      "humidity_report_interval": {
+        "name": "Humidity report interval"
+      },
+      "alarm_temperature_max": {
+        "name": "Alarm temperature max"
+      },
+      "alarm_temperature_min": {
+        "name": "Alarm temperature min"
+      },
+      "temperature_sensitivity": {
+        "name": "Temperature sensitivity"
+      },
+      "alarm_humidity_max": {
+        "name": "Alarm humidity max"
+      },
+      "alarm_humidity_min": {
+        "name": "Alarm humidity min"
+      },
+      "humidity_sensitivity": {
+        "name": "Humidity sensitivity"
+      },
+      "deadzone_temperature": {
+        "name": "Deadzone temperature"
+      },
+      "min_temperature": {
+        "name": "Min temperature"
+      },
+      "max_temperature": {
+        "name": "Max temperature"
+      },
+      "valve_countdown": {
+        "name": "Irrigation time"
+      },
+      "quantitative_watering": {
+        "name": "Quantitative watering"
+      },
+      "valve_duration": {
+        "name": "Irrigation duration"
+      },
+      "down_movement": {
+        "name": "Down movement"
+      },
+      "sustain_time": {
+        "name": "Sustain time"
+      },
+      "up_movement": {
+        "name": "Up movement"
+      },
+      "large_motion_detection_sensitivity": {
+        "name": "Motion detection sensitivity"
+      },
+      "large_motion_detection_distance": {
+        "name": "Motion detection distance"
+      },
+      "medium_motion_detection_distance": {
+        "name": "Medium motion detection distance"
+      },
+      "medium_motion_detection_sensitivity": {
+        "name": "Medium motion detection sensitivity"
+      },
+      "small_motion_detection_distance": {
+        "name": "Small motion detection distance"
+      },
+      "small_motion_detection_sensitivity": {
+        "name": "Small motion detection sensitivity"
+      },
+      "static_detection_sensitivity": {
+        "name": "Static detection sensitivity"
+      },
+      "static_detection_distance": {
+        "name": "Static detection distance"
+      },
+      "motion_detection_sensitivity": {
+        "name": "Motion detection sensitivity"
+      },
+      "holiday_temperature": {
+        "name": "Holiday temperature"
+      },
+      "boost_time": {
+        "name": "Boost time"
+      },
+      "antifrost_temperature": {
+        "name": "Antifrost temperature"
+      },
+      "eco_temperature": {
+        "name": "Eco temperature"
+      },
+      "comfort_temperature": {
+        "name": "Comfort temperature"
+      },
+      "valve_state_auto_shutdown": {
+        "name": "Valve state auto shutdown"
+      },
+      "shutdown_timer": {
+        "name": "Shutdown timer"
+      },
+      "calibration_vertical_run_time_up": {
+        "name": "Calibration vertical run time up"
+      },
+      "calibration_vertical_run_time_down": {
+        "name": "Calibration vertical run time down"
+      },
+      "calibration_rotation_run_time_up": {
+        "name": "Calibration rotation run time up"
+      },
+      "calibration_rotation_run_time_down": {
+        "name": "Calibration rotation run time down"
+      },
+      "impulse_mode_duration": {
+        "name": "Impulse mode duration"
+      },
+      "water_duration": {
+        "name": "Water duration"
+      },
+      "water_interval": {
+        "name": "Water interval"
       }
     },
     "select": {
@@ -928,10 +1171,10 @@
         "name": "Switch type"
       },
       "led_scaling_mode": {
-        "name": "Led scaling mode"
+        "name": "LED scaling mode"
       },
       "smart_fan_led_display_levels": {
-        "name": "Smart fan led display levels"
+        "name": "Smart fan LED display levels"
       },
       "increased_non_neutral_output": {
         "name": "Non neutral output"
@@ -1028,9 +1271,93 @@
       },
       "operation_mode": {
         "name": "Operation mode"
+      },
+      "device_mode": {
+        "name": "Device mode"
+      },
+      "pilot_wire_mode": {
+        "name": "Pilot wire mode"
+      },
+      "alarm_ringtone": {
+        "name": "Alarm ringtone"
+      },
+      "liquid_state": {
+        "name": "Liquid state"
+      },
+      "breaker_mode": {
+        "name": "Breaker mode"
+      },
+      "breaker_status": {
+        "name": "Breaker status"
+      },
+      "status_indication": {
+        "name": "Status indication"
+      },
+      "breaker_polarity": {
+        "name": "Breaker polarity"
+      },
+      "work_mode": {
+        "name": "Work mode"
+      },
+      "presence_sensitivity": {
+        "name": "Presence sensitivity"
+      },
+      "fading_time": {
+        "name": "Fading time"
+      },
+      "display_unit": {
+        "name": "Display unit"
+      },
+      "alarm_mode": {
+        "name": "Alarm mode"
+      },
+      "alarm_volume": {
+        "name": "Alarm volume"
+      },
+      "working_day": {
+        "name": "Working day"
+      },
+      "eco_mode": {
+        "name": "Eco mode"
+      },
+      "mode": {
+        "name": "Mode"
+      },
+      "reverse": {
+        "name": "Reverse"
+      },
+      "motion_state": {
+        "name": "Motion state"
+      },
+      "motion_detection_mode": {
+        "name": "Motion detection mode"
+      },
+      "screen_orientation": {
+        "name": "Screen orientation"
+      },
+      "motor_thrust": {
+        "name": "Motor thrust"
+      },
+      "display_brightness": {
+        "name": "Display brightness"
+      },
+      "display_orientation": {
+        "name": "Display orientation"
+      },
+      "hysteresis_mode": {
+        "name": "Hysteresis mode"
+      },
+      "speed": {
+        "name": "Speed"
       }
     },
     "sensor": {
+      "active_power_ph_b": {
+        "name": "Power phase B"
+      },
+      "active_power_ph_c": {
+        "name": "Power phase C"
+      },
       "analog_input": {
         "name": "Analog input"
       },
@@ -1046,12 +1373,24 @@
       "instantaneous_demand": {
         "name": "Instantaneous demand"
       },
+      "power_factor_ph_b": {
+        "name": "Power factor phase B"
+      },
+      "power_factor_ph_c": {
+        "name": "Power factor phase C"
+      },
       "rms_current_ph_b": {
         "name": "Current phase B"
       },
       "rms_current_ph_c": {
         "name": "Current phase C"
       },
+      "rms_voltage_ph_b": {
+        "name": "Voltage phase B"
+      },
+      "rms_voltage_ph_c": {
+        "name": "Voltage phase C"
+      },
       "summation_delivered": {
         "name": "Summation delivered"
       },
@@ -1252,6 +1591,114 @@
       },
       "self_test": {
         "name": "Self test result"
+      },
+      "voc_index": {
+        "name": "VOC index"
+      },
+      "energy_ph_a": {
+        "name": "Energy phase A"
+      },
+      "energy_ph_b": {
+        "name": "Energy phase B"
+      },
+      "energy_ph_c": {
+        "name": "Energy phase C"
+      },
+      "energy_produced": {
+        "name": "Energy produced"
+      },
+      "energy_produced_ph_a": {
+        "name": "Energy produced phase A"
+      },
+      "energy_produced_ph_b": {
+        "name": "Energy produced phase B"
+      },
+      "energy_produced_ph_c": {
+        "name": "Energy produced phase C"
+      },
+      "total_power_factor": {
+        "name": "Total power factor"
+      },
+      "self_test_result": {
+        "name": "Self test result"
+      },
+      "lower_explosive_limit": {
+        "name": "% Lower explosive limit"
+      },
+      "liquid_depth": {
+        "name": "Liquid depth"
+      },
+      "liquid_level_percent": {
+        "name": "Liquid level ratio"
+      },
+      "target_distance": {
+        "name": "Target distance"
+      },
+      "human_motion_state": {
+        "name": "Human motion state"
+      },
+      "temperature_alarm": {
+        "name": "Temperature alarm"
+      },
+      "humidity_alarm": {
+        "name": "Humidity alarm"
+      },
+      "alarm_state": {
+        "name": "Alarm state"
+      },
+      "power_type": {
+        "name": "Power type"
+      },
+      "valve_position": {
+        "name": "Valve position"
+      },
+      "time_left": {
+        "name": "Time left"
+      },
+      "valve_status": {
+        "name": "Valve status"
+      },
+      "valve_duration": {
+        "name": "Irrigation duration"
+      },
+      "smart_irrigation": {
+        "name": "Smart irrigation"
+      },
+      "surplus_flow": {
+        "name": "Surplus flow"
+      },
+      "single_watering_duration": {
+        "name": "Single watering duration"
+      },
+      "single_watering_amount": {
+        "name": "Single watering amount"
+      },
+      "error_status": {
+        "name": "Error status"
+      },
+      "brightness_level": {
+        "name": "Brightness level"
+      },
+      "average_light_intensity_20mins": {
+        "name": "Average light intensity last 20 min"
+      },
+      "todays_max_light_intensity": {
+        "name": "Today's max light intensity"
+      },
+      "fault_code": {
+        "name": "Fault code"
+      },
+      "water_flow": {
+        "name": "Water flow"
+      },
+      "remaining_watering_time": {
+        "name": "Remaining watering time"
+      },
+      "last_watering_duration": {
+        "name": "Last watering duration"
+      },
+      "device_status": {
+        "name": "Device status"
       }
     },
     "switch": {
@@ -1380,6 +1827,87 @@
       },
       "find_switch": {
         "name": "Distance switch"
+      },
+      "display_enabled": {
+        "name": "Display enabled"
+      },
+      "show_smiley": {
+        "name": "Show smiley"
+      },
+      "on_only_when_dark": {
+        "name": "On only when dark"
+      },
+      "mute_siren": {
+        "name": "Mute siren"
+      },
+      "self_test_switch": {
+        "name": "Self test"
+      },
+      "output_switch": {
+        "name": "Output switch"
+      },
+      "siren_on": {
+        "name": "Siren on"
+      },
+      "enable_tamper_alarm": {
+        "name": "Enable tamper alarm"
+      },
+      "temperature_alarm": {
+        "name": "Temperature alarm"
+      },
+      "humidity_alarm": {
+        "name": "Humidity alarm"
+      },
+      "silence_alarm": {
+        "name": "Silence alarm"
+      },
+      "frost_protection": {
+        "name": "Frost protection"
+      },
+      "factory_reset": {
+        "name": "Factory reset"
+      },
+      "away_mode": {
+        "name": "Away mode"
+      },
+      "schedule_enable": {
+        "name": "Schedule enable"
+      },
+      "scale_protection": {
+        "name": "Scale protection"
+      },
+      "frost_lock": {
+        "name": "Frost lock"
+      },
+      "switch_enabled": {
+        "name": "Switch enabled"
+      },
+      "total_flow_reset_switch": {
+        "name": "Total flow reset switch"
+      },
+      "touch_control": {
+        "name": "Touch control"
+      },
+      "sound_enabled": {
+        "name": "Sound enabled"
+      },
+      "invert_relay": {
+        "name": "Invert relay"
+      },
+      "boost_heating": {
+        "name": "Boost heating"
+      },
+      "holiday_mode": {
+        "name": "Holiday mode"
+      },
+      "heating_stop": {
+        "name": "Heating stop"
+      },
+      "schedule_mode": {
+        "name": "Schedule mode"
+      },
+      "auto_clean": {
+        "name": "Auto clean"
       }
     }
   }
diff --git a/homeassistant/components/zha/switch.py b/homeassistant/components/zha/switch.py
index cb0268f98e0..dc150e2407d 100644
--- a/homeassistant/components/zha/switch.py
+++ b/homeassistant/components/zha/switch.py
@@ -11,7 +11,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import ZHAEntity
 from .helpers import (
@@ -27,7 +27,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Zigbee Home Automation switch from config entry."""
     zha_data = get_zha_data(hass)
diff --git a/homeassistant/components/zha/update.py b/homeassistant/components/zha/update.py
index 2f540da5ea7..062581fd259 100644
--- a/homeassistant/components/zha/update.py
+++ b/homeassistant/components/zha/update.py
@@ -19,7 +19,7 @@ from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -52,7 +52,7 @@ OTA_MESSAGE_RELIABILITY = (
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Zigbee Home Automation update from config entry."""
     zha_data = get_zha_data(hass)
diff --git a/homeassistant/components/zha/websocket_api.py b/homeassistant/components/zha/websocket_api.py
index 5ffd7117d93..07d897bcfd6 100644
--- a/homeassistant/components/zha/websocket_api.py
+++ b/homeassistant/components/zha/websocket_api.py
@@ -37,6 +37,7 @@ from zha.application.const import (
     WARNING_DEVICE_STROBE_HIGH,
     WARNING_DEVICE_STROBE_YES,
     ZHA_CLUSTER_HANDLER_MSG,
+    ZHA_GW_MSG,
 )
 from zha.application.gateway import Gateway
 from zha.application.helpers import (
@@ -59,8 +60,7 @@ from homeassistant.components import websocket_api
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_COMMAND, ATTR_ID, ATTR_NAME
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.helpers import entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.service import async_register_admin_service
 from homeassistant.helpers.typing import VolDictType, VolSchemaType
@@ -331,7 +331,7 @@ async def websocket_permit_devices(
         connection.send_message(websocket_api.event_message(msg["id"], data))
 
     remove_dispatcher_function = async_dispatcher_connect(
-        hass, "zha_gateway_message", forward_messages
+        hass, ZHA_GW_MSG, forward_messages
     )
 
     @callback
diff --git a/homeassistant/components/zhong_hong/climate.py b/homeassistant/components/zhong_hong/climate.py
index b5acc230472..af3287d3068 100644
--- a/homeassistant/components/zhong_hong/climate.py
+++ b/homeassistant/components/zhong_hong/climate.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
diff --git a/homeassistant/components/ziggo_mediabox_xl/media_player.py b/homeassistant/components/ziggo_mediabox_xl/media_player.py
index 6e858b454e9..fe180208801 100644
--- a/homeassistant/components/ziggo_mediabox_xl/media_player.py
+++ b/homeassistant/components/ziggo_mediabox_xl/media_player.py
@@ -16,7 +16,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.const import CONF_HOST, CONF_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/zodiac/sensor.py b/homeassistant/components/zodiac/sensor.py
index d7cac07a322..41f200366ae 100644
--- a/homeassistant/components/zodiac/sensor.py
+++ b/homeassistant/components/zodiac/sensor.py
@@ -6,7 +6,7 @@ from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.dt import as_local, utcnow
 
 from .const import (
@@ -150,7 +150,7 @@ ZODIAC_BY_DATE = (
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize the entries."""
 
diff --git a/homeassistant/components/zone/__init__.py b/homeassistant/components/zone/__init__.py
index 1c43a79e10e..813425c95f2 100644
--- a/homeassistant/components/zone/__init__.py
+++ b/homeassistant/components/zone/__init__.py
@@ -363,7 +363,7 @@ class Zone(collection.CollectionEntity):
         """Return entity instance initialized from storage."""
         zone = cls(config)
         zone.editable = True
-        zone._generate_attrs()  # noqa: SLF001
+        zone._generate_attrs()
         return zone
 
     @classmethod
@@ -371,7 +371,7 @@ class Zone(collection.CollectionEntity):
         """Return entity instance initialized from yaml."""
         zone = cls(config)
         zone.editable = False
-        zone._generate_attrs()  # noqa: SLF001
+        zone._generate_attrs()
         return zone
 
     @property
diff --git a/homeassistant/components/zoneminder/__init__.py b/homeassistant/components/zoneminder/__init__.py
index e87a2b1531d..c2e57b0448b 100644
--- a/homeassistant/components/zoneminder/__init__.py
+++ b/homeassistant/components/zoneminder/__init__.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.typing import ConfigType
 
diff --git a/homeassistant/components/zoneminder/sensor.py b/homeassistant/components/zoneminder/sensor.py
index 75769d9fd98..4f79f8876e5 100644
--- a/homeassistant/components/zoneminder/sensor.py
+++ b/homeassistant/components/zoneminder/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import CONF_MONITORED_CONDITIONS
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/zoneminder/switch.py b/homeassistant/components/zoneminder/switch.py
index 23adf2f4c88..13da0927196 100644
--- a/homeassistant/components/zoneminder/switch.py
+++ b/homeassistant/components/zoneminder/switch.py
@@ -16,7 +16,7 @@ from homeassistant.components.switch import (
 from homeassistant.const import CONF_COMMAND_OFF, CONF_COMMAND_ON
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
diff --git a/homeassistant/components/zwave_js/__init__.py b/homeassistant/components/zwave_js/__init__.py
index c8503b1f4c6..a7b8f9ed665 100644
--- a/homeassistant/components/zwave_js/__init__.py
+++ b/homeassistant/components/zwave_js/__init__.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import asyncio
 from collections import defaultdict
-from contextlib import suppress
+import contextlib
 import logging
 from typing import Any
 
@@ -12,7 +12,11 @@ from awesomeversion import AwesomeVersion
 import voluptuous as vol
 from zwave_js_server.client import Client as ZwaveClient
 from zwave_js_server.const import CommandClass, RemoveNodeReason
-from zwave_js_server.exceptions import BaseZwaveJSServerError, InvalidServerVersion
+from zwave_js_server.exceptions import (
+    BaseZwaveJSServerError,
+    InvalidServerVersion,
+    NotConnected,
+)
 from zwave_js_server.model.driver import Driver
 from zwave_js_server.model.node import Node as ZwaveNode
 from zwave_js_server.model.notification import (
@@ -25,7 +29,7 @@ from zwave_js_server.model.value import Value, ValueNotification
 
 from homeassistant.components.hassio import AddonError, AddonManager, AddonState
 from homeassistant.components.persistent_notification import async_create
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.const import (
     ATTR_DEVICE_ID,
     ATTR_DOMAIN,
@@ -36,7 +40,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import Event, HomeAssistant, callback
-from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.exceptions import ConfigEntryNotReady, HomeAssistantError
 from homeassistant.helpers import (
     config_validation as cv,
     device_registry as dr,
@@ -130,9 +134,8 @@ from .migrate import async_migrate_discovered_value
 from .services import ZWaveServices
 
 CONNECT_TIMEOUT = 10
-DATA_CLIENT_LISTEN_TASK = "client_listen_task"
 DATA_DRIVER_EVENTS = "driver_events"
-DATA_START_CLIENT_TASK = "start_client_task"
+DRIVER_READY_TIMEOUT = 60
 
 CONFIG_SCHEMA = vol.Schema(
     {
@@ -145,6 +148,24 @@ CONFIG_SCHEMA = vol.Schema(
     extra=vol.ALLOW_EXTRA,
 )
 
+PLATFORMS = [
+    Platform.BINARY_SENSOR,
+    Platform.BUTTON,
+    Platform.CLIMATE,
+    Platform.COVER,
+    Platform.EVENT,
+    Platform.FAN,
+    Platform.HUMIDIFIER,
+    Platform.LIGHT,
+    Platform.LOCK,
+    Platform.NUMBER,
+    Platform.SELECT,
+    Platform.SENSOR,
+    Platform.SIREN,
+    Platform.SWITCH,
+    Platform.UPDATE,
+]
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Z-Wave JS component."""
@@ -196,53 +217,99 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         raise ConfigEntryNotReady(f"Failed to connect: {err}") from err
 
     async_delete_issue(hass, DOMAIN, "invalid_server_version")
-    LOGGER.info("Connected to Zwave JS Server")
+    LOGGER.debug("Connected to Zwave JS Server")
 
     # Set up websocket API
     async_register_api(hass)
-    entry.runtime_data = {}
 
-    # Create a task to allow the config entry to be unloaded before the driver is ready.
-    # Unloading the config entry is needed if the client listen task errors.
-    start_client_task = hass.async_create_task(start_client(hass, entry, client))
-    entry.runtime_data[DATA_START_CLIENT_TASK] = start_client_task
+    driver_ready = asyncio.Event()
+    listen_task = entry.async_create_background_task(
+        hass,
+        client_listen(hass, entry, client, driver_ready),
+        f"{DOMAIN}_{entry.title}_client_listen",
+    )
 
-    return True
-
-
-async def start_client(
-    hass: HomeAssistant, entry: ConfigEntry, client: ZwaveClient
-) -> None:
-    """Start listening with the client."""
-    entry.runtime_data[DATA_CLIENT] = client
-    driver_events = entry.runtime_data[DATA_DRIVER_EVENTS] = DriverEvents(hass, entry)
+    entry.async_on_unload(client.disconnect)
 
     async def handle_ha_shutdown(event: Event) -> None:
         """Handle HA shutdown."""
-        await disconnect_client(hass, entry)
+        await client.disconnect()
 
-    listen_task = asyncio.create_task(
-        client_listen(hass, entry, client, driver_events.ready)
-    )
-    entry.runtime_data[DATA_CLIENT_LISTEN_TASK] = listen_task
     entry.async_on_unload(
         hass.bus.async_listen(EVENT_HOMEASSISTANT_STOP, handle_ha_shutdown)
     )
 
-    try:
-        await driver_events.ready.wait()
-    except asyncio.CancelledError:
-        LOGGER.debug("Cancelling start client")
-        return
-
-    LOGGER.info("Connection to Zwave JS Server initialized")
-
-    assert client.driver
-    async_dispatcher_send(
-        hass, f"{DOMAIN}_{client.driver.controller.home_id}_connected_to_server"
+    driver_ready_task = entry.async_create_task(
+        hass,
+        driver_ready.wait(),
+        f"{DOMAIN}_{entry.title}_driver_ready",
+    )
+    done, pending = await asyncio.wait(
+        (driver_ready_task, listen_task),
+        return_when=asyncio.FIRST_COMPLETED,
+        timeout=DRIVER_READY_TIMEOUT,
     )
 
-    await driver_events.setup(client.driver)
+    if driver_ready_task in pending or listen_task in done:
+        error_message = "Driver ready timed out"
+        listen_error: BaseException | None = None
+        if listen_task.done():
+            listen_error, error_message = _get_listen_task_error(listen_task)
+        else:
+            listen_task.cancel()
+        driver_ready_task.cancel()
+        raise ConfigEntryNotReady(error_message) from listen_error
+
+    LOGGER.debug("Connection to Zwave JS Server initialized")
+
+    entry_runtime_data = entry.runtime_data = {
+        DATA_CLIENT: client,
+    }
+    entry_runtime_data[DATA_DRIVER_EVENTS] = driver_events = DriverEvents(hass, entry)
+
+    driver = client.driver
+    # When the driver is ready we know it's set on the client.
+    assert driver is not None
+
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    with contextlib.suppress(NotConnected):
+        # If the client isn't connected the listen task may have an exception
+        # and we'll handle the clean up below.
+        await driver_events.setup(driver)
+
+    # If the listen task is already failed, we need to raise ConfigEntryNotReady
+    if listen_task.done():
+        listen_error, error_message = _get_listen_task_error(listen_task)
+        await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+        raise ConfigEntryNotReady(error_message) from listen_error
+
+    # Re-attach trigger listeners.
+    # Schedule this call to make sure the config entry is loaded first.
+
+    @callback
+    def on_config_entry_loaded() -> None:
+        """Signal that server connection and driver are ready."""
+        if entry.state is ConfigEntryState.LOADED:
+            async_dispatcher_send(
+                hass,
+                f"{DOMAIN}_{driver.controller.home_id}_connected_to_server",
+            )
+
+    entry.async_on_unload(entry.async_on_state_change(on_config_entry_loaded))
+
+    return True
+
+
+def _get_listen_task_error(
+    listen_task: asyncio.Task,
+) -> tuple[BaseException | None, str]:
+    """Check the listen task for errors."""
+    if listen_error := listen_task.exception():
+        error_message = f"Client listen failed: {listen_error}"
+    else:
+        error_message = "Client connection was closed"
+    return listen_error, error_message
 
 
 class DriverEvents:
@@ -255,8 +322,6 @@ class DriverEvents:
         self.config_entry = entry
         self.dev_reg = dr.async_get(hass)
         self.hass = hass
-        self.platform_setup_tasks: dict[str, asyncio.Task] = {}
-        self.ready = asyncio.Event()
         # Make sure to not pass self to ControllerEvents until all attributes are set.
         self.controller_events = ControllerEvents(hass, self)
 
@@ -339,16 +404,6 @@ class DriverEvents:
             controller.on("identify", self.controller_events.async_on_identify)
         )
 
-    async def async_setup_platform(self, platform: Platform) -> None:
-        """Set up platform if needed."""
-        if platform not in self.platform_setup_tasks:
-            self.platform_setup_tasks[platform] = self.hass.async_create_task(
-                self.hass.config_entries.async_forward_entry_setups(
-                    self.config_entry, [platform]
-                )
-            )
-        await self.platform_setup_tasks[platform]
-
 
 class ControllerEvents:
     """Represent controller events.
@@ -380,9 +435,6 @@ class ControllerEvents:
 
     async def async_on_node_added(self, node: ZwaveNode) -> None:
         """Handle node added event."""
-        # Every node including the controller will have at least one sensor
-        await self.driver_events.async_setup_platform(Platform.SENSOR)
-
         # Remove stale entities that may exist from a previous interview when an
         # interview is started.
         base_unique_id = get_valueless_base_unique_id(self.driver_events.driver, node)
@@ -411,7 +463,6 @@ class ControllerEvents:
             )
 
             # Create a ping button for each device
-            await self.driver_events.async_setup_platform(Platform.BUTTON)
             async_dispatcher_send(
                 self.hass,
                 f"{DOMAIN}_{self.config_entry.entry_id}_add_ping_button_entity",
@@ -668,9 +719,6 @@ class NodeEvents:
             cc.id == CommandClass.FIRMWARE_UPDATE_MD.value
             for cc in node.command_classes
         ):
-            await self.controller_events.driver_events.async_setup_platform(
-                Platform.UPDATE
-            )
             async_dispatcher_send(
                 self.hass,
                 f"{DOMAIN}_{self.config_entry.entry_id}_add_firmware_update_entity",
@@ -701,21 +749,19 @@ class NodeEvents:
         value_updates_disc_info: dict[str, ZwaveDiscoveryInfo],
     ) -> None:
         """Handle discovery info and all dependent tasks."""
+        platform = disc_info.platform
         # This migration logic was added in 2021.3 to handle a breaking change to
         # the value_id format. Some time in the future, this call (as well as the
         # helper functions) can be removed.
         async_migrate_discovered_value(
             self.hass,
             self.ent_reg,
-            self.controller_events.registered_unique_ids[device.id][disc_info.platform],
+            self.controller_events.registered_unique_ids[device.id][platform],
             device,
             self.controller_events.driver_events.driver,
             disc_info,
         )
 
-        platform = disc_info.platform
-        await self.controller_events.driver_events.async_setup_platform(platform)
-
         LOGGER.debug("Discovered entity: %s", disc_info)
         async_dispatcher_send(
             self.hass,
@@ -930,63 +976,37 @@ async def client_listen(
     driver_ready: asyncio.Event,
 ) -> None:
     """Listen with the client."""
-    should_reload = True
     try:
         await client.listen(driver_ready)
-    except asyncio.CancelledError:
-        should_reload = False
     except BaseZwaveJSServerError as err:
-        LOGGER.error("Failed to listen: %s", err)
-    except Exception as err:  # noqa: BLE001
+        if entry.state is not ConfigEntryState.LOADED:
+            raise
+        LOGGER.error("Client listen failed: %s", err)
+    except Exception as err:
         # We need to guard against unknown exceptions to not crash this task.
         LOGGER.exception("Unexpected exception: %s", err)
+        if entry.state is not ConfigEntryState.LOADED:
+            raise
 
     # The entry needs to be reloaded since a new driver state
     # will be acquired on reconnect.
     # All model instances will be replaced when the new state is acquired.
-    if should_reload:
-        LOGGER.info("Disconnected from server. Reloading integration")
-        hass.async_create_task(hass.config_entries.async_reload(entry.entry_id))
-
-
-async def disconnect_client(hass: HomeAssistant, entry: ConfigEntry) -> None:
-    """Disconnect client."""
-    client: ZwaveClient = entry.runtime_data[DATA_CLIENT]
-    listen_task: asyncio.Task = entry.runtime_data[DATA_CLIENT_LISTEN_TASK]
-    start_client_task: asyncio.Task = entry.runtime_data[DATA_START_CLIENT_TASK]
-    driver_events: DriverEvents = entry.runtime_data[DATA_DRIVER_EVENTS]
-    listen_task.cancel()
-    start_client_task.cancel()
-    platform_setup_tasks = driver_events.platform_setup_tasks.values()
-    for task in platform_setup_tasks:
-        task.cancel()
-
-    tasks = (listen_task, start_client_task, *platform_setup_tasks)
-    await asyncio.gather(*tasks, return_exceptions=True)
-    for task in tasks:
-        with suppress(asyncio.CancelledError):
-            await task
-
-    if client.connected:
-        await client.disconnect()
-        LOGGER.info("Disconnected from Zwave JS Server")
+    if not hass.is_stopping:
+        if entry.state is not ConfigEntryState.LOADED:
+            raise HomeAssistantError("Listen task ended unexpectedly")
+        LOGGER.debug("Disconnected from server. Reloading integration")
+        hass.config_entries.async_schedule_reload(entry.entry_id)
 
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    client: ZwaveClient = entry.runtime_data[DATA_CLIENT]
-    driver_events: DriverEvents = entry.runtime_data[DATA_DRIVER_EVENTS]
-    platforms = [
-        platform
-        for platform, task in driver_events.platform_setup_tasks.items()
-        if not task.cancel()
-    ]
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, platforms)
+    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
-    if client.connected and client.driver:
-        await async_disable_server_logging_if_needed(hass, entry, client.driver)
-    if DATA_CLIENT_LISTEN_TASK in entry.runtime_data:
-        await disconnect_client(hass, entry)
+    entry_runtime_data = entry.runtime_data
+    client: ZwaveClient = entry_runtime_data[DATA_CLIENT]
+
+    if client.connected and (driver := client.driver):
+        await async_disable_server_logging_if_needed(hass, entry, driver)
 
     if entry.data.get(CONF_USE_ADDON) and entry.disabled_by:
         addon_manager: AddonManager = get_addon_manager(hass)
diff --git a/homeassistant/components/zwave_js/api.py b/homeassistant/components/zwave_js/api.py
index 1a1cd6ae9c1..dd698d9ed66 100644
--- a/homeassistant/components/zwave_js/api.py
+++ b/homeassistant/components/zwave_js/api.py
@@ -70,9 +70,8 @@ from homeassistant.components.websocket_api import (
 )
 from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.device_registry as dr
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from .config_validation import BITMASK_SCHEMA
@@ -406,6 +405,7 @@ def async_register_api(hass: HomeAssistant) -> None:
     websocket_api.async_register_command(
         hass, websocket_try_parse_dsk_from_qr_code_string
     )
+    websocket_api.async_register_command(hass, websocket_lookup_device)
     websocket_api.async_register_command(hass, websocket_supports_feature)
     websocket_api.async_register_command(hass, websocket_stop_inclusion)
     websocket_api.async_register_command(hass, websocket_stop_exclusion)
@@ -455,6 +455,8 @@ def async_register_api(hass: HomeAssistant) -> None:
     websocket_api.async_register_command(hass, websocket_node_capabilities)
     websocket_api.async_register_command(hass, websocket_invoke_cc_api)
     websocket_api.async_register_command(hass, websocket_get_integration_settings)
+    websocket_api.async_register_command(hass, websocket_backup_nvm)
+    websocket_api.async_register_command(hass, websocket_restore_nvm)
     hass.http.register_view(FirmwareUploadView(dr.async_get(hass)))
 
 
@@ -519,6 +521,7 @@ async def websocket_network_status(
             "supported_function_types": controller.supported_function_types,
             "suc_node_id": controller.suc_node_id,
             "supports_timers": controller.supports_timers,
+            "supports_long_range": controller.supports_long_range,
             "is_rebuilding_routes": controller.is_rebuilding_routes,
             "inclusion_state": controller.inclusion_state,
             "rf_region": controller.rf_region,
@@ -806,7 +809,7 @@ async def websocket_add_node(
     ]
     msg[DATA_UNSUBSCRIBE] = unsubs
 
-    if controller.inclusion_state == InclusionState.INCLUDING:
+    if controller.inclusion_state in (InclusionState.INCLUDING, InclusionState.BUSY):
         connection.send_result(
             msg[ID],
             True,  # Inclusion is already in progress
@@ -884,6 +887,11 @@ async def websocket_subscribe_s2_inclusion(
 ) -> None:
     """Subscribe to S2 inclusion initiated by the controller."""
 
+    @callback
+    def async_cleanup() -> None:
+        for unsub in unsubs:
+            unsub()
+
     @callback
     def forward_dsk(event: dict) -> None:
         connection.send_message(
@@ -892,9 +900,18 @@ async def websocket_subscribe_s2_inclusion(
             )
         )
 
-    unsub = driver.controller.on("validate dsk and enter pin", forward_dsk)
-    connection.subscriptions[msg["id"]] = unsub
-    msg[DATA_UNSUBSCRIBE] = [unsub]
+    @callback
+    def handle_requested_grant(event: dict) -> None:
+        """Accept the requested security classes without user interaction."""
+        hass.async_create_task(
+            driver.controller.async_grant_security_classes(event["requested_grant"])
+        )
+
+    connection.subscriptions[msg["id"]] = async_cleanup
+    msg[DATA_UNSUBSCRIBE] = unsubs = [
+        driver.controller.on("grant security classes", handle_requested_grant),
+        driver.controller.on("validate dsk and enter pin", forward_dsk),
+    ]
     connection.send_result(msg[ID])
 
 
@@ -959,13 +976,7 @@ async def websocket_validate_dsk_and_enter_pin(
     {
         vol.Required(TYPE): "zwave_js/provision_smart_start_node",
         vol.Required(ENTRY_ID): str,
-        vol.Exclusive(
-            PLANNED_PROVISIONING_ENTRY, "options"
-        ): PLANNED_PROVISIONING_ENTRY_SCHEMA,
-        vol.Exclusive(
-            QR_PROVISIONING_INFORMATION, "options"
-        ): QR_PROVISIONING_INFORMATION_SCHEMA,
-        vol.Exclusive(QR_CODE_STRING, "options"): QR_CODE_STRING_SCHEMA,
+        vol.Required(QR_PROVISIONING_INFORMATION): QR_PROVISIONING_INFORMATION_SCHEMA,
     }
 )
 @websocket_api.async_response
@@ -980,28 +991,10 @@ async def websocket_provision_smart_start_node(
     driver: Driver,
 ) -> None:
     """Pre-provision a smart start node."""
-    try:
-        cv.has_at_least_one_key(
-            PLANNED_PROVISIONING_ENTRY, QR_PROVISIONING_INFORMATION, QR_CODE_STRING
-        )(msg)
-    except vol.Invalid as err:
-        connection.send_error(
-            msg[ID],
-            ERR_INVALID_FORMAT,
-            err.args[0],
-        )
-        return
 
-    provisioning_info = (
-        msg.get(PLANNED_PROVISIONING_ENTRY)
-        or msg.get(QR_PROVISIONING_INFORMATION)
-        or msg[QR_CODE_STRING]
-    )
+    provisioning_info = msg[QR_PROVISIONING_INFORMATION]
 
-    if (
-        QR_PROVISIONING_INFORMATION in msg
-        and provisioning_info.version == QRCodeVersion.S2
-    ):
+    if provisioning_info.version == QRCodeVersion.S2:
         connection.send_error(
             msg[ID],
             ERR_INVALID_FORMAT,
@@ -1122,6 +1115,41 @@ async def websocket_try_parse_dsk_from_qr_code_string(
     )
 
 
+@websocket_api.require_admin
+@websocket_api.websocket_command(
+    {
+        vol.Required(TYPE): "zwave_js/lookup_device",
+        vol.Required(ENTRY_ID): str,
+        vol.Required(MANUFACTURER_ID): int,
+        vol.Required(PRODUCT_TYPE): int,
+        vol.Required(PRODUCT_ID): int,
+        vol.Optional(APPLICATION_VERSION): str,
+    }
+)
+@websocket_api.async_response
+@async_handle_failed_command
+@async_get_entry
+async def websocket_lookup_device(
+    hass: HomeAssistant,
+    connection: ActiveConnection,
+    msg: dict[str, Any],
+    entry: ConfigEntry,
+    client: Client,
+    driver: Driver,
+) -> None:
+    """Look up the definition of a given device in the configuration DB."""
+    device = await driver.config_manager.lookup_device(
+        msg[MANUFACTURER_ID],
+        msg[PRODUCT_TYPE],
+        msg[PRODUCT_ID],
+        msg.get(APPLICATION_VERSION),
+    )
+    if device is None:
+        connection.send_error(msg[ID], ERR_NOT_FOUND, "Device not found")
+    else:
+        connection.send_result(msg[ID], device.to_dict())
+
+
 @websocket_api.require_admin
 @websocket_api.websocket_command(
     {
@@ -2766,3 +2794,126 @@ def websocket_get_integration_settings(
             CONF_INSTALLER_MODE: hass.data[DOMAIN].get(CONF_INSTALLER_MODE, False),
         },
     )
+
+
+@websocket_api.require_admin
+@websocket_api.websocket_command(
+    {
+        vol.Required(TYPE): "zwave_js/backup_nvm",
+        vol.Required(ENTRY_ID): str,
+    }
+)
+@websocket_api.async_response
+@async_handle_failed_command
+@async_get_entry
+async def websocket_backup_nvm(
+    hass: HomeAssistant,
+    connection: ActiveConnection,
+    msg: dict[str, Any],
+    entry: ConfigEntry,
+    client: Client,
+    driver: Driver,
+) -> None:
+    """Backup NVM data."""
+    controller = driver.controller
+
+    @callback
+    def async_cleanup() -> None:
+        """Remove signal listeners."""
+        for unsub in unsubs:
+            unsub()
+
+    @callback
+    def forward_progress(event: dict) -> None:
+        """Forward progress events to websocket."""
+        connection.send_message(
+            websocket_api.event_message(
+                msg[ID],
+                {
+                    "event": event["event"],
+                    "bytesRead": event["bytesRead"],
+                    "total": event["total"],
+                },
+            )
+        )
+
+    # Set up subscription for progress events
+    connection.subscriptions[msg["id"]] = async_cleanup
+    msg[DATA_UNSUBSCRIBE] = unsubs = [
+        controller.on("nvm backup progress", forward_progress),
+    ]
+
+    result = await controller.async_backup_nvm_raw_base64()
+    # Send the finished event with the backup data
+    connection.send_message(
+        websocket_api.event_message(
+            msg[ID],
+            {
+                "event": "finished",
+                "data": result,
+            },
+        )
+    )
+    connection.send_result(msg[ID])
+
+
+@websocket_api.require_admin
+@websocket_api.websocket_command(
+    {
+        vol.Required(TYPE): "zwave_js/restore_nvm",
+        vol.Required(ENTRY_ID): str,
+        vol.Required("data"): str,
+    }
+)
+@websocket_api.async_response
+@async_handle_failed_command
+@async_get_entry
+async def websocket_restore_nvm(
+    hass: HomeAssistant,
+    connection: ActiveConnection,
+    msg: dict[str, Any],
+    entry: ConfigEntry,
+    client: Client,
+    driver: Driver,
+) -> None:
+    """Restore NVM data."""
+    controller = driver.controller
+
+    @callback
+    def async_cleanup() -> None:
+        """Remove signal listeners."""
+        for unsub in unsubs:
+            unsub()
+
+    @callback
+    def forward_progress(event: dict) -> None:
+        """Forward progress events to websocket."""
+        connection.send_message(
+            websocket_api.event_message(
+                msg[ID],
+                {
+                    "event": event["event"],
+                    "bytesRead": event.get("bytesRead"),
+                    "bytesWritten": event.get("bytesWritten"),
+                    "total": event["total"],
+                },
+            )
+        )
+
+    # Set up subscription for progress events
+    connection.subscriptions[msg["id"]] = async_cleanup
+    msg[DATA_UNSUBSCRIBE] = unsubs = [
+        controller.on("nvm convert progress", forward_progress),
+        controller.on("nvm restore progress", forward_progress),
+    ]
+
+    await controller.async_restore_nvm_base64(msg["data"])
+    connection.send_message(
+        websocket_api.event_message(
+            msg[ID],
+            {
+                "event": "finished",
+            },
+        )
+    )
+    connection.send_result(msg[ID])
diff --git a/homeassistant/components/zwave_js/binary_sensor.py b/homeassistant/components/zwave_js/binary_sensor.py
index 0f1495fc6e6..d07846c8dcc 100644
--- a/homeassistant/components/zwave_js/binary_sensor.py
+++ b/homeassistant/components/zwave_js/binary_sensor.py
@@ -22,7 +22,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DATA_CLIENT, DOMAIN
 from .discovery import ZwaveDiscoveryInfo
@@ -261,7 +261,7 @@ def is_valid_notification_binary_sensor(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Z-Wave binary sensor from config entry."""
     client: ZwaveClient = config_entry.runtime_data[DATA_CLIENT]
diff --git a/homeassistant/components/zwave_js/button.py b/homeassistant/components/zwave_js/button.py
index 7fd42700a05..f3a1d5af04d 100644
--- a/homeassistant/components/zwave_js/button.py
+++ b/homeassistant/components/zwave_js/button.py
@@ -11,7 +11,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DATA_CLIENT, DOMAIN, LOGGER
 from .discovery import ZwaveDiscoveryInfo
@@ -24,7 +24,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Z-Wave button from config entry."""
     client: ZwaveClient = config_entry.runtime_data[DATA_CLIENT]
diff --git a/homeassistant/components/zwave_js/climate.py b/homeassistant/components/zwave_js/climate.py
index 580694cae11..b27dbdad1a0 100644
--- a/homeassistant/components/zwave_js/climate.py
+++ b/homeassistant/components/zwave_js/climate.py
@@ -35,7 +35,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, PRECISION_TENTHS, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.unit_conversion import TemperatureConverter
 
 from .const import DATA_CLIENT, DOMAIN
@@ -97,7 +97,7 @@ ATTR_FAN_STATE = "fan_state"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Z-Wave climate from config entry."""
     client: ZwaveClient = config_entry.runtime_data[DATA_CLIENT]
diff --git a/homeassistant/components/zwave_js/config_flow.py b/homeassistant/components/zwave_js/config_flow.py
index 44adf6a12ab..d95f3208e17 100644
--- a/homeassistant/components/zwave_js/config_flow.py
+++ b/homeassistant/components/zwave_js/config_flow.py
@@ -21,19 +21,16 @@ from homeassistant.components.hassio import (
 )
 from homeassistant.config_entries import (
     SOURCE_USB,
-    ConfigEntriesFlowManager,
     ConfigEntry,
     ConfigEntryBaseFlow,
     ConfigEntryState,
     ConfigFlow,
-    ConfigFlowContext,
     ConfigFlowResult,
     OptionsFlow,
-    OptionsFlowManager,
 )
 from homeassistant.const import CONF_NAME, CONF_URL
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.data_entry_flow import AbortFlow, FlowManager
+from homeassistant.data_entry_flow import AbortFlow
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.hassio import is_hassio
@@ -42,7 +39,6 @@ from homeassistant.helpers.service_info.usb import UsbServiceInfo
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 from homeassistant.helpers.typing import VolDictType
 
-from . import disconnect_client
 from .addon import get_addon_manager
 from .const import (
     ADDON_SLUG,
@@ -192,11 +188,6 @@ class BaseZwaveJSFlow(ConfigEntryBaseFlow, ABC):
         self.start_task: asyncio.Task | None = None
         self.version_info: VersionInfo | None = None
 
-    @property
-    @abstractmethod
-    def flow_manager(self) -> FlowManager[ConfigFlowContext, ConfigFlowResult]:
-        """Return the flow manager of the flow."""
-
     async def async_step_install_addon(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -356,11 +347,6 @@ class ZWaveJSConfigFlow(BaseZwaveJSFlow, ConfigFlow, domain=DOMAIN):
         self.use_addon = False
         self._usb_discovery = False
 
-    @property
-    def flow_manager(self) -> ConfigEntriesFlowManager:
-        """Return the correct flow manager."""
-        return self.hass.config_entries.flow
-
     @staticmethod
     @callback
     def async_get_options_flow(
@@ -730,11 +716,6 @@ class OptionsFlowHandler(BaseZwaveJSFlow, OptionsFlow):
         self.original_addon_config: dict[str, Any] | None = None
         self.revert_reason: str | None = None
 
-    @property
-    def flow_manager(self) -> OptionsFlowManager:
-        """Return the correct flow manager."""
-        return self.hass.config_entries.options
-
     @callback
     def _async_update_entry(self, data: dict[str, Any]) -> None:
         """Update the config entry with new data."""
@@ -861,7 +842,7 @@ class OptionsFlowHandler(BaseZwaveJSFlow, OptionsFlow):
                 and self.config_entry.state == ConfigEntryState.LOADED
             ):
                 # Disconnect integration before restarting add-on.
-                await disconnect_client(self.hass, self.config_entry)
+                await self.hass.config_entries.async_unload(self.config_entry.entry_id)
 
             return await self.async_step_start_addon()
 
diff --git a/homeassistant/components/zwave_js/config_validation.py b/homeassistant/components/zwave_js/config_validation.py
index 30bc2f16789..2615bfc72b3 100644
--- a/homeassistant/components/zwave_js/config_validation.py
+++ b/homeassistant/components/zwave_js/config_validation.py
@@ -4,7 +4,7 @@ from typing import Any
 
 import voluptuous as vol
 
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 
 # Validates that a bitmask is provided in hex form and converts it to decimal
 # int equivalent since that's what the library uses
diff --git a/homeassistant/components/zwave_js/cover.py b/homeassistant/components/zwave_js/cover.py
index 218c5cc82fe..dc44f46a3ce 100644
--- a/homeassistant/components/zwave_js/cover.py
+++ b/homeassistant/components/zwave_js/cover.py
@@ -37,7 +37,7 @@ from homeassistant.components.cover import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     COVER_POSITION_PROPERTY_KEYS,
@@ -55,7 +55,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Z-Wave Cover from Config Entry."""
     client: ZwaveClient = config_entry.runtime_data[DATA_CLIENT]
diff --git a/homeassistant/components/zwave_js/event.py b/homeassistant/components/zwave_js/event.py
index 8dae66c26ac..66959aa9b75 100644
--- a/homeassistant/components/zwave_js/event.py
+++ b/homeassistant/components/zwave_js/event.py
@@ -10,7 +10,7 @@ from homeassistant.components.event import DOMAIN as EVENT_DOMAIN, EventEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import ATTR_VALUE, DATA_CLIENT, DOMAIN
 from .discovery import ZwaveDiscoveryInfo
@@ -22,7 +22,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Z-Wave Event entity from Config Entry."""
     client: ZwaveClient = config_entry.runtime_data[DATA_CLIENT]
diff --git a/homeassistant/components/zwave_js/fan.py b/homeassistant/components/zwave_js/fan.py
index d83132e4b95..ae36e0afb42 100644
--- a/homeassistant/components/zwave_js/fan.py
+++ b/homeassistant/components/zwave_js/fan.py
@@ -24,7 +24,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
     ranged_value_to_percentage,
@@ -46,7 +46,7 @@ ATTR_FAN_STATE = "fan_state"
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Z-Wave Fan from Config Entry."""
     client: ZwaveClient = config_entry.runtime_data[DATA_CLIENT]
diff --git a/homeassistant/components/zwave_js/helpers.py b/homeassistant/components/zwave_js/helpers.py
index 904a26acc78..8a90ebf6f88 100644
--- a/homeassistant/components/zwave_js/helpers.py
+++ b/homeassistant/components/zwave_js/helpers.py
@@ -187,7 +187,7 @@ async def async_disable_server_logging_if_needed(
             old_server_log_level,
         )
         await driver.async_update_log_config(LogConfig(level=old_server_log_level))
-    await driver.client.disable_server_logging()
+    driver.client.disable_server_logging()
     LOGGER.info("Zwave-js-server logging is enabled")
 
 
diff --git a/homeassistant/components/zwave_js/humidifier.py b/homeassistant/components/zwave_js/humidifier.py
index e883858036b..2b85bd4449f 100644
--- a/homeassistant/components/zwave_js/humidifier.py
+++ b/homeassistant/components/zwave_js/humidifier.py
@@ -26,7 +26,7 @@ from homeassistant.components.humidifier import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DATA_CLIENT, DOMAIN
 from .discovery import ZwaveDiscoveryInfo
@@ -70,7 +70,7 @@ DEHUMIDIFIER_ENTITY_DESCRIPTION = ZwaveHumidifierEntityDescription(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Z-Wave humidifier from config entry."""
     client: ZwaveClient = config_entry.runtime_data[DATA_CLIENT]
diff --git a/homeassistant/components/zwave_js/light.py b/homeassistant/components/zwave_js/light.py
index 639d2fbcd7a..f60e129cc77 100644
--- a/homeassistant/components/zwave_js/light.py
+++ b/homeassistant/components/zwave_js/light.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any, cast
+from typing import TYPE_CHECKING, Any, cast
 
 from zwave_js_server.client import Client as ZwaveClient
 from zwave_js_server.const import (
@@ -41,8 +41,8 @@ from homeassistant.components.light import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.color as color_util
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import color as color_util
 
 from .const import DATA_CLIENT, DOMAIN
 from .discovery import ZwaveDiscoveryInfo
@@ -67,7 +67,7 @@ MAX_MIREDS = 370  # 2700K as a safe default
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Z-Wave Light from Config Entry."""
     client: ZwaveClient = config_entry.runtime_data[DATA_CLIENT]
@@ -483,7 +483,7 @@ class ZwaveLight(ZWaveBaseEntity, LightEntity):
             red = multi_color.get(COLOR_SWITCH_COMBINED_RED, red_val.value)
             green = multi_color.get(COLOR_SWITCH_COMBINED_GREEN, green_val.value)
             blue = multi_color.get(COLOR_SWITCH_COMBINED_BLUE, blue_val.value)
-            if None not in (red, green, blue):
+            if red is not None and green is not None and blue is not None:
                 # convert to HS
                 self._hs_color = color_util.color_RGB_to_hs(red, green, blue)
                 # Light supports color, set color mode to hs
@@ -496,7 +496,8 @@ class ZwaveLight(ZWaveBaseEntity, LightEntity):
             # Calculate color temps based on whites
             if cold_white or warm_white:
                 self._color_temp = color_util.color_temperature_mired_to_kelvin(
-                    MAX_MIREDS - ((cold_white / 255) * (MAX_MIREDS - MIN_MIREDS))
+                    MAX_MIREDS
+                    - ((cast(int, cold_white) / 255) * (MAX_MIREDS - MIN_MIREDS))
                 )
                 # White channels turned on, set color mode to color_temp
                 self._color_mode = ColorMode.COLOR_TEMP
@@ -505,6 +506,13 @@ class ZwaveLight(ZWaveBaseEntity, LightEntity):
         # only one white channel (warm white) = rgbw support
         elif red_val and green_val and blue_val and ww_val:
             white = multi_color.get(COLOR_SWITCH_COMBINED_WARM_WHITE, ww_val.value)
+            if TYPE_CHECKING:
+                assert (
+                    red is not None
+                    and green is not None
+                    and blue is not None
+                    and white is not None
+                )
             self._rgbw_color = (red, green, blue, white)
             # Light supports rgbw, set color mode to rgbw
             self._color_mode = ColorMode.RGBW
@@ -512,6 +520,13 @@ class ZwaveLight(ZWaveBaseEntity, LightEntity):
         elif cw_val:
             self._supports_rgbw = True
             white = multi_color.get(COLOR_SWITCH_COMBINED_COLD_WHITE, cw_val.value)
+            if TYPE_CHECKING:
+                assert (
+                    red is not None
+                    and green is not None
+                    and blue is not None
+                    and white is not None
+                )
             self._rgbw_color = (red, green, blue, white)
             # Light supports rgbw, set color mode to rgbw
             self._color_mode = ColorMode.RGBW
diff --git a/homeassistant/components/zwave_js/lock.py b/homeassistant/components/zwave_js/lock.py
index c14517f4b03..f609084955c 100644
--- a/homeassistant/components/zwave_js/lock.py
+++ b/homeassistant/components/zwave_js/lock.py
@@ -25,7 +25,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     ATTR_AUTO_RELOCK_TIME,
@@ -62,7 +62,7 @@ UNIT16_SCHEMA = vol.All(vol.Coerce(int), vol.Range(min=0, max=65535))
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Z-Wave lock from config entry."""
     client: ZwaveClient = config_entry.runtime_data[DATA_CLIENT]
diff --git a/homeassistant/components/zwave_js/logbook.py b/homeassistant/components/zwave_js/logbook.py
index 315793b9726..120084788e1 100644
--- a/homeassistant/components/zwave_js/logbook.py
+++ b/homeassistant/components/zwave_js/logbook.py
@@ -9,7 +9,7 @@ from zwave_js_server.const import CommandClass
 from homeassistant.components.logbook import LOGBOOK_ENTRY_MESSAGE, LOGBOOK_ENTRY_NAME
 from homeassistant.const import ATTR_DEVICE_ID
 from homeassistant.core import Event, HomeAssistant, callback
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import device_registry as dr
 
 from .const import (
     ATTR_COMMAND_CLASS,
diff --git a/homeassistant/components/zwave_js/manifest.json b/homeassistant/components/zwave_js/manifest.json
index 011776f4556..7e8b473922f 100644
--- a/homeassistant/components/zwave_js/manifest.json
+++ b/homeassistant/components/zwave_js/manifest.json
@@ -9,7 +9,7 @@
   "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["zwave_js_server"],
-  "requirements": ["pyserial==3.5", "zwave-js-server-python==0.60.0"],
+  "requirements": ["pyserial==3.5", "zwave-js-server-python==0.62.0"],
   "usb": [
     {
       "vid": "0658",
diff --git a/homeassistant/components/zwave_js/number.py b/homeassistant/components/zwave_js/number.py
index 54162488d89..2e2d93bbdbe 100644
--- a/homeassistant/components/zwave_js/number.py
+++ b/homeassistant/components/zwave_js/number.py
@@ -16,7 +16,7 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import ATTR_RESERVED_VALUES, DATA_CLIENT, DOMAIN
 from .discovery import ZwaveDiscoveryInfo
@@ -28,7 +28,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Z-Wave Number entity from Config Entry."""
     client: ZwaveClient = config_entry.runtime_data[DATA_CLIENT]
diff --git a/homeassistant/components/zwave_js/select.py b/homeassistant/components/zwave_js/select.py
index 49ad1868005..8a6ccc57c17 100644
--- a/homeassistant/components/zwave_js/select.py
+++ b/homeassistant/components/zwave_js/select.py
@@ -15,7 +15,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DATA_CLIENT, DOMAIN
 from .discovery import ZwaveDiscoveryInfo
@@ -27,7 +27,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Z-Wave Select entity from Config Entry."""
     client: ZwaveClient = config_entry.runtime_data[DATA_CLIENT]
diff --git a/homeassistant/components/zwave_js/sensor.py b/homeassistant/components/zwave_js/sensor.py
index b259711d21b..4db14d003b1 100644
--- a/homeassistant/components/zwave_js/sensor.py
+++ b/homeassistant/components/zwave_js/sensor.py
@@ -48,7 +48,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import UNDEFINED, StateType
 
 from .binary_sensor import is_valid_notification_binary_sensor
@@ -552,7 +552,7 @@ def get_entity_description(
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Z-Wave sensor from config entry."""
     client: ZwaveClient = config_entry.runtime_data[DATA_CLIENT]
diff --git a/homeassistant/components/zwave_js/services.py b/homeassistant/components/zwave_js/services.py
index fe293fd178b..8389eff8cb2 100644
--- a/homeassistant/components/zwave_js/services.py
+++ b/homeassistant/components/zwave_js/services.py
@@ -29,8 +29,11 @@ from zwave_js_server.util.node import (
 from homeassistant.const import ATTR_AREA_ID, ATTR_DEVICE_ID, ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import device_registry as dr, entity_registry as er
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    entity_registry as er,
+)
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.group import expand_entity_ids
 
diff --git a/homeassistant/components/zwave_js/siren.py b/homeassistant/components/zwave_js/siren.py
index 3a09049def3..f0526171a70 100644
--- a/homeassistant/components/zwave_js/siren.py
+++ b/homeassistant/components/zwave_js/siren.py
@@ -18,7 +18,7 @@ from homeassistant.components.siren import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DATA_CLIENT, DOMAIN
 from .discovery import ZwaveDiscoveryInfo
@@ -30,7 +30,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Z-Wave Siren entity from Config Entry."""
     client: ZwaveClient = config_entry.runtime_data[DATA_CLIENT]
diff --git a/homeassistant/components/zwave_js/strings.json b/homeassistant/components/zwave_js/strings.json
index e2d7720189d..8f23fee4447 100644
--- a/homeassistant/components/zwave_js/strings.json
+++ b/homeassistant/components/zwave_js/strings.json
@@ -344,8 +344,8 @@
           "name": "[%key:component::zwave_js::services::set_value::fields::area_id::name%]"
         },
         "broadcast": {
-          "description": "Whether command should be broadcast to all devices on the network.",
-          "name": "Broadcast?"
+          "description": "Whether the command should be broadcast to all devices on the network.",
+          "name": "Broadcast"
         },
         "command_class": {
           "description": "[%key:component::zwave_js::services::set_value::fields::command_class::description%]",
@@ -434,8 +434,8 @@
           "name": "Entities"
         },
         "refresh_all_values": {
-          "description": "Whether to refresh all values (true) or just the primary value (false).",
-          "name": "Refresh all values?"
+          "description": "Whether to refresh all values or just the primary value.",
+          "name": "Refresh all values"
         }
       },
       "name": "Refresh values"
@@ -516,8 +516,8 @@
           "name": "Auto relock time"
         },
         "block_to_block": {
-          "description": "Enable block-to-block functionality.",
-          "name": "Block to block"
+          "description": "Whether the lock should run the motor until it hits resistance.",
+          "name": "Block to Block"
         },
         "hold_and_release_time": {
           "description": "Duration in seconds the latch stays retracted.",
@@ -529,11 +529,11 @@
         },
         "operation_type": {
           "description": "The operation type of the lock.",
-          "name": "Operation Type"
+          "name": "Operation type"
         },
         "twist_assist": {
-          "description": "Enable Twist Assist.",
-          "name": "Twist assist"
+          "description": "Whether the motor should help in locking and unlocking.",
+          "name": "Twist Assist"
         }
       },
       "name": "Set lock configuration"
@@ -592,8 +592,8 @@
           "name": "[%key:component::zwave_js::services::set_config_parameter::fields::value::name%]"
         },
         "wait_for_result": {
-          "description": "Whether or not to wait for a response from the node. If not included in the payload, the integration will decide whether to wait or not. If set to `true`, note that the action can take a while if setting a value on an asleep battery device.",
-          "name": "Wait for result?"
+          "description": "Whether to wait for a response from the node. If not included in the payload, the integration will decide whether to wait or not. If enabled, the action can take a while if setting a value on an asleep battery device.",
+          "name": "Wait for result"
         }
       },
       "name": "Set a value (advanced)"
diff --git a/homeassistant/components/zwave_js/switch.py b/homeassistant/components/zwave_js/switch.py
index ef769209b31..2ff80d8505e 100644
--- a/homeassistant/components/zwave_js/switch.py
+++ b/homeassistant/components/zwave_js/switch.py
@@ -16,7 +16,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DATA_CLIENT, DOMAIN
 from .discovery import ZwaveDiscoveryInfo
@@ -28,7 +28,7 @@ PARALLEL_UPDATES = 0
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Z-Wave sensor from config entry."""
     client: ZwaveClient = config_entry.runtime_data[DATA_CLIENT]
diff --git a/homeassistant/components/zwave_js/update.py b/homeassistant/components/zwave_js/update.py
index d060abe007d..985c4a86813 100644
--- a/homeassistant/components/zwave_js/update.py
+++ b/homeassistant/components/zwave_js/update.py
@@ -32,7 +32,7 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import CoreState, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.restore_state import ExtraStoredData
 
@@ -77,7 +77,7 @@ class ZWaveNodeFirmwareUpdateExtraStoredData(ExtraStoredData):
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Z-Wave update entity from config entry."""
     client: ZwaveClient = config_entry.runtime_data[DATA_CLIENT]
diff --git a/homeassistant/components/zwave_me/binary_sensor.py b/homeassistant/components/zwave_me/binary_sensor.py
index d121c17770b..8563ef76ce1 100644
--- a/homeassistant/components/zwave_me/binary_sensor.py
+++ b/homeassistant/components/zwave_me/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import ZWaveMeController
 from .const import DOMAIN, ZWaveMePlatform
@@ -33,7 +33,7 @@ DEVICE_NAME = ZWaveMePlatform.BINARY_SENSOR
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the binary sensor platform."""
 
diff --git a/homeassistant/components/zwave_me/button.py b/homeassistant/components/zwave_me/button.py
index 50ddf01aeab..27d95a14199 100644
--- a/homeassistant/components/zwave_me/button.py
+++ b/homeassistant/components/zwave_me/button.py
@@ -4,7 +4,7 @@ from homeassistant.components.button import ButtonEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, ZWaveMePlatform
 from .entity import ZWaveMeEntity
@@ -15,7 +15,7 @@ DEVICE_NAME = ZWaveMePlatform.BUTTON
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the number platform."""
 
diff --git a/homeassistant/components/zwave_me/climate.py b/homeassistant/components/zwave_me/climate.py
index b8eed88b505..d54cc6a9310 100644
--- a/homeassistant/components/zwave_me/climate.py
+++ b/homeassistant/components/zwave_me/climate.py
@@ -15,7 +15,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, ZWaveMePlatform
 from .entity import ZWaveMeEntity
@@ -28,7 +28,7 @@ DEVICE_NAME = ZWaveMePlatform.CLIMATE
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the climate platform."""
 
diff --git a/homeassistant/components/zwave_me/cover.py b/homeassistant/components/zwave_me/cover.py
index c9359402c01..3ae8ec894e1 100644
--- a/homeassistant/components/zwave_me/cover.py
+++ b/homeassistant/components/zwave_me/cover.py
@@ -12,7 +12,7 @@ from homeassistant.components.cover import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, ZWaveMePlatform
 from .entity import ZWaveMeEntity
@@ -23,7 +23,7 @@ DEVICE_NAME = ZWaveMePlatform.COVER
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the cover platform."""
 
diff --git a/homeassistant/components/zwave_me/fan.py b/homeassistant/components/zwave_me/fan.py
index bd0feba0dfb..6ab1df618cb 100644
--- a/homeassistant/components/zwave_me/fan.py
+++ b/homeassistant/components/zwave_me/fan.py
@@ -8,7 +8,7 @@ from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, ZWaveMePlatform
 from .entity import ZWaveMeEntity
@@ -19,7 +19,7 @@ DEVICE_NAME = ZWaveMePlatform.FAN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the fan platform."""
 
diff --git a/homeassistant/components/zwave_me/light.py b/homeassistant/components/zwave_me/light.py
index ef3eca5d389..f8ed397ea25 100644
--- a/homeassistant/components/zwave_me/light.py
+++ b/homeassistant/components/zwave_me/light.py
@@ -15,7 +15,7 @@ from homeassistant.components.light import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import ZWaveMeController
 from .const import DOMAIN, ZWaveMePlatform
@@ -25,7 +25,7 @@ from .entity import ZWaveMeEntity
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the rgb platform."""
 
diff --git a/homeassistant/components/zwave_me/lock.py b/homeassistant/components/zwave_me/lock.py
index 0bcc8f092ae..cdc8b6471c1 100644
--- a/homeassistant/components/zwave_me/lock.py
+++ b/homeassistant/components/zwave_me/lock.py
@@ -10,7 +10,7 @@ from homeassistant.components.lock import LockEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, ZWaveMePlatform
 from .entity import ZWaveMeEntity
@@ -21,7 +21,7 @@ DEVICE_NAME = ZWaveMePlatform.LOCK
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the lock platform."""
 
diff --git a/homeassistant/components/zwave_me/number.py b/homeassistant/components/zwave_me/number.py
index 9a98a4f8d00..2d6b88840f4 100644
--- a/homeassistant/components/zwave_me/number.py
+++ b/homeassistant/components/zwave_me/number.py
@@ -4,7 +4,7 @@ from homeassistant.components.number import NumberEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, ZWaveMePlatform
 from .entity import ZWaveMeEntity
@@ -15,7 +15,7 @@ DEVICE_NAME = ZWaveMePlatform.NUMBER
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the number platform."""
 
diff --git a/homeassistant/components/zwave_me/sensor.py b/homeassistant/components/zwave_me/sensor.py
index be0b0bae284..fa9ccdfee99 100644
--- a/homeassistant/components/zwave_me/sensor.py
+++ b/homeassistant/components/zwave_me/sensor.py
@@ -26,7 +26,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import ZWaveMeController
 from .const import DOMAIN, ZWaveMePlatform
@@ -118,7 +118,7 @@ DEVICE_NAME = ZWaveMePlatform.SENSOR
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor platform."""
 
diff --git a/homeassistant/components/zwave_me/siren.py b/homeassistant/components/zwave_me/siren.py
index 443b2cc7b37..7bfbf2b2cd4 100644
--- a/homeassistant/components/zwave_me/siren.py
+++ b/homeassistant/components/zwave_me/siren.py
@@ -6,7 +6,7 @@ from homeassistant.components.siren import SirenEntity, SirenEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, ZWaveMePlatform
 from .entity import ZWaveMeEntity
@@ -17,7 +17,7 @@ DEVICE_NAME = ZWaveMePlatform.SIREN
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the siren platform."""
 
diff --git a/homeassistant/components/zwave_me/switch.py b/homeassistant/components/zwave_me/switch.py
index 05cf06484e9..26d832ca022 100644
--- a/homeassistant/components/zwave_me/switch.py
+++ b/homeassistant/components/zwave_me/switch.py
@@ -11,7 +11,7 @@ from homeassistant.components.switch import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, ZWaveMePlatform
 from .entity import ZWaveMeEntity
@@ -30,7 +30,7 @@ SWITCH_MAP: dict[str, SwitchEntityDescription] = {
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the switch platform."""
 
diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index 620e4bc8197..d3e681ecca1 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -15,6 +15,7 @@ from collections.abc import (
 )
 from contextvars import ContextVar
 from copy import deepcopy
+from dataclasses import dataclass, field
 from datetime import datetime
 from enum import Enum, StrEnum
 import functools
@@ -22,7 +23,7 @@ from functools import cache
 import logging
 from random import randint
 from types import MappingProxyType
-from typing import TYPE_CHECKING, Any, Self, cast
+from typing import TYPE_CHECKING, Any, Self, TypedDict, cast
 
 from async_interrupt import interrupt
 from propcache.api import cached_property
@@ -127,7 +128,7 @@ HANDLERS: Registry[str, type[ConfigFlow]] = Registry()
 
 STORAGE_KEY = "core.config_entries"
 STORAGE_VERSION = 1
-STORAGE_VERSION_MINOR = 4
+STORAGE_VERSION_MINOR = 5
 
 SAVE_DELAY = 1
 
@@ -154,6 +155,8 @@ class ConfigEntryState(Enum):
     """An error occurred when trying to unload the entry"""
     SETUP_IN_PROGRESS = "setup_in_progress", False
     """The config entry is setting up."""
+    UNLOAD_IN_PROGRESS = "unload_in_progress", False
+    """The config entry is being unloaded."""
 
     _recoverable: bool
 
@@ -192,8 +195,6 @@ DISCOVERY_SOURCES = {
     SOURCE_ZEROCONF,
 }
 
-RECONFIGURE_NOTIFICATION_ID = "config_entry_reconfigure"
-
 EVENT_FLOW_DISCOVERED = "config_entry_discovered"
 
 SIGNAL_CONFIG_ENTRY_CHANGED = SignalType["ConfigEntryChange", "ConfigEntry"](
@@ -253,6 +254,10 @@ class UnknownEntry(ConfigError):
     """Unknown entry specified."""
 
 
+class UnknownSubEntry(ConfigError):
+    """Unknown subentry specified."""
+
+
 class OperationNotAllowed(ConfigError):
     """Raised when a config entry operation is not allowed."""
 
@@ -297,6 +302,7 @@ class ConfigFlowResult(FlowResult[ConfigFlowContext, str], total=False):
 
     minor_version: int
     options: Mapping[str, Any]
+    subentries: Iterable[ConfigSubentryData]
     version: int
 
 
@@ -310,6 +316,61 @@ def _validate_item(*, disabled_by: ConfigEntryDisabler | Any | None = None) -> N
         )
 
 
+class ConfigSubentryData(TypedDict):
+    """Container for configuration subentry data.
+
+    Returned by integrations, a subentry_id will be assigned automatically.
+    """
+
+    data: Mapping[str, Any]
+    subentry_type: str
+    title: str
+    unique_id: str | None
+
+
+class ConfigSubentryDataWithId(ConfigSubentryData):
+    """Container for configuration subentry data.
+
+    This type is used when loading existing subentries from storage.
+    """
+
+    subentry_id: str
+
+
+class SubentryFlowContext(FlowContext, total=False):
+    """Typed context dict for subentry flow."""
+
+    entry_id: str
+    subentry_id: str
+
+
+class SubentryFlowResult(FlowResult[SubentryFlowContext, tuple[str, str]], total=False):
+    """Typed result dict for subentry flow."""
+
+    unique_id: str | None
+
+
+@dataclass(frozen=True, kw_only=True)
+class ConfigSubentry:
+    """Container for a configuration subentry."""
+
+    data: MappingProxyType[str, Any]
+    subentry_id: str = field(default_factory=ulid_util.ulid_now)
+    subentry_type: str
+    title: str
+    unique_id: str | None
+
+    def as_dict(self) -> ConfigSubentryDataWithId:
+        """Return dictionary version of this subentry."""
+        return {
+            "data": dict(self.data),
+            "subentry_id": self.subentry_id,
+            "subentry_type": self.subentry_type,
+            "title": self.title,
+            "unique_id": self.unique_id,
+        }
+
+
 class ConfigEntry[_DataT = Any]:
     """Hold a configuration entry."""
 
@@ -319,6 +380,7 @@ class ConfigEntry[_DataT = Any]:
     data: MappingProxyType[str, Any]
     runtime_data: _DataT
     options: MappingProxyType[str, Any]
+    subentries: MappingProxyType[str, ConfigSubentry]
     unique_id: str | None
     state: ConfigEntryState
     reason: str | None
@@ -334,9 +396,11 @@ class ConfigEntry[_DataT = Any]:
     supports_remove_device: bool | None
     _supports_options: bool | None
     _supports_reconfigure: bool | None
+    _supported_subentry_types: dict[str, dict[str, bool]] | None
     update_listeners: list[UpdateListenerType]
     _async_cancel_retry_setup: Callable[[], Any] | None
     _on_unload: list[Callable[[], Coroutine[Any, Any, None] | None]] | None
+    _on_state_change: list[CALLBACK_TYPE] | None
     setup_lock: asyncio.Lock
     _reauth_lock: asyncio.Lock
     _tasks: set[asyncio.Future[Any]]
@@ -363,6 +427,7 @@ class ConfigEntry[_DataT = Any]:
         pref_disable_polling: bool | None = None,
         source: str,
         state: ConfigEntryState = ConfigEntryState.NOT_LOADED,
+        subentries_data: Iterable[ConfigSubentryData | ConfigSubentryDataWithId] | None,
         title: str,
         unique_id: str | None,
         version: int,
@@ -388,6 +453,25 @@ class ConfigEntry[_DataT = Any]:
         # Entry options
         _setter(self, "options", MappingProxyType(options or {}))
 
+        # Subentries
+        subentries_data = subentries_data or ()
+        subentries = {}
+        for subentry_data in subentries_data:
+            subentry_kwargs = {}
+            if "subentry_id" in subentry_data:
+                # If subentry_data has key "subentry_id", we're loading from storage
+                subentry_kwargs["subentry_id"] = subentry_data["subentry_id"]  # type: ignore[typeddict-item]
+            subentry = ConfigSubentry(
+                data=MappingProxyType(subentry_data["data"]),
+                subentry_type=subentry_data["subentry_type"],
+                title=subentry_data["title"],
+                unique_id=subentry_data.get("unique_id"),
+                **subentry_kwargs,
+            )
+            subentries[subentry.subentry_id] = subentry
+
+        _setter(self, "subentries", MappingProxyType(subentries))
+
         # Entry system options
         if pref_disable_new_entities is None:
             pref_disable_new_entities = False
@@ -424,6 +508,9 @@ class ConfigEntry[_DataT = Any]:
         # Supports reconfigure
         _setter(self, "_supports_reconfigure", None)
 
+        # Supports subentries
+        _setter(self, "_supported_subentry_types", None)
+
         # Listeners to call on update
         _setter(self, "update_listeners", [])
 
@@ -438,6 +525,9 @@ class ConfigEntry[_DataT = Any]:
         # Hold list for actions to call on unload.
         _setter(self, "_on_unload", None)
 
+        # Hold list for actions to call on state change.
+        _setter(self, "_on_state_change", None)
+
         # Reload lock to prevent conflicting reloads
         _setter(self, "setup_lock", asyncio.Lock())
         # Reauth lock to prevent concurrent reauth flows
@@ -496,6 +586,28 @@ class ConfigEntry[_DataT = Any]:
             )
         return self._supports_reconfigure or False
 
+    @property
+    def supported_subentry_types(self) -> dict[str, dict[str, bool]]:
+        """Return supported subentry types."""
+        if self._supported_subentry_types is None and (
+            handler := HANDLERS.get(self.domain)
+        ):
+            # work out sub entries supported by the handler
+            supported_flows = handler.async_get_supported_subentry_types(self)
+            object.__setattr__(
+                self,
+                "_supported_subentry_types",
+                {
+                    subentry_flow_type: {
+                        "supports_reconfigure": hasattr(
+                            subentry_flow_handler, "async_step_reconfigure"
+                        )
+                    }
+                    for subentry_flow_type, subentry_flow_handler in supported_flows.items()
+                },
+            )
+        return self._supported_subentry_types or {}
+
     def clear_state_cache(self) -> None:
         """Clear cached properties that are included in as_json_fragment."""
         self.__dict__.pop("as_json_fragment", None)
@@ -515,12 +627,14 @@ class ConfigEntry[_DataT = Any]:
             "supports_remove_device": self.supports_remove_device or False,
             "supports_unload": self.supports_unload or False,
             "supports_reconfigure": self.supports_reconfigure,
+            "supported_subentry_types": self.supported_subentry_types,
             "pref_disable_new_entities": self.pref_disable_new_entities,
             "pref_disable_polling": self.pref_disable_polling,
             "disabled_by": self.disabled_by,
             "reason": self.reason,
             "error_reason_translation_key": self.error_reason_translation_key,
             "error_reason_translation_placeholders": self.error_reason_translation_placeholders,
+            "num_subentries": len(self.subentries),
         }
         return json_fragment(json_bytes(json_repr))
 
@@ -845,18 +959,25 @@ class ConfigEntry[_DataT = Any]:
                 )
             return False
 
+        if domain_is_integration:
+            self._async_set_state(hass, ConfigEntryState.UNLOAD_IN_PROGRESS, None)
         try:
             result = await component.async_unload_entry(hass, self)
 
             assert isinstance(result, bool)
 
-            # Only adjust state if we unloaded the component
-            if domain_is_integration and result:
-                await self._async_process_on_unload(hass)
-                if hasattr(self, "runtime_data"):
-                    object.__delattr__(self, "runtime_data")
+            # Only do side effects if we unloaded the integration
+            if domain_is_integration:
+                if result:
+                    await self._async_process_on_unload(hass)
+                    if hasattr(self, "runtime_data"):
+                        object.__delattr__(self, "runtime_data")
 
-                self._async_set_state(hass, ConfigEntryState.NOT_LOADED, None)
+                    self._async_set_state(hass, ConfigEntryState.NOT_LOADED, None)
+                else:
+                    self._async_set_state(
+                        hass, ConfigEntryState.FAILED_UNLOAD, "Unload failed"
+                    )
 
         except Exception as exc:
             _LOGGER.exception(
@@ -939,6 +1060,8 @@ class ConfigEntry[_DataT = Any]:
             hass, SIGNAL_CONFIG_ENTRY_CHANGED, ConfigEntryChange.UPDATED, self
         )
 
+        self._async_process_on_state_change()
+
     async def async_migrate(self, hass: HomeAssistant) -> bool:
         """Migrate an entry.
 
@@ -1012,6 +1135,7 @@ class ConfigEntry[_DataT = Any]:
             "pref_disable_new_entities": self.pref_disable_new_entities,
             "pref_disable_polling": self.pref_disable_polling,
             "source": self.source,
+            "subentries": [subentry.as_dict() for subentry in self.subentries.values()],
             "title": self.title,
             "unique_id": self.unique_id,
             "version": self.version,
@@ -1052,6 +1176,28 @@ class ConfigEntry[_DataT = Any]:
                 task,
             )
 
+    @callback
+    def async_on_state_change(self, func: CALLBACK_TYPE) -> CALLBACK_TYPE:
+        """Add a function to call when a config entry changes its state."""
+        if self._on_state_change is None:
+            self._on_state_change = []
+        self._on_state_change.append(func)
+        return lambda: cast(list, self._on_state_change).remove(func)
+
+    def _async_process_on_state_change(self) -> None:
+        """Process the on_state_change callbacks and wait for pending tasks."""
+        if self._on_state_change is None:
+            return
+        for func in self._on_state_change:
+            try:
+                func()
+            except Exception:
+                _LOGGER.exception(
+                    "Error calling on_state_change callback for %s (%s)",
+                    self.title,
+                    self.domain,
+                )
+
     @callback
     def async_start_reauth(
         self,
@@ -1480,6 +1626,23 @@ class ConfigEntriesFlowManager(
                 result["handler"], flow.unique_id
             )
 
+        if existing_entry is not None and flow.handler != "mobile_app":
+            # This causes the old entry to be removed and replaced, when the flow
+            # should instead be aborted.
+            # In case of manual flows, integrations should implement options, reauth,
+            # reconfigure to allow the user to change settings.
+            # In case of non user visible flows, the integration should optionally
+            # update the existing entry before aborting.
+            # see https://developers.home-assistant.io/blog/2025/03/01/config-flow-unique-id/
+            report_usage(
+                "creates a config entry when another entry with the same unique ID "
+                "exists",
+                core_behavior=ReportBehavior.LOG,
+                core_integration_behavior=ReportBehavior.LOG,
+                custom_integration_behavior=ReportBehavior.LOG,
+                integration_domain=flow.handler,
+            )
+
         # Unload the entry before setting up the new one.
         if existing_entry is not None and existing_entry.state.recoverable:
             await self.config_entries.async_unload(existing_entry.entry_id)
@@ -1497,6 +1660,7 @@ class ConfigEntriesFlowManager(
             minor_version=result["minor_version"],
             options=result["options"],
             source=flow.context["source"],
+            subentries_data=result["subentries"],
             title=result["title"],
             unique_id=flow.unique_id,
             version=result["version"],
@@ -1548,16 +1712,6 @@ class ConfigEntriesFlowManager(
         # Create notification.
         if source in DISCOVERY_SOURCES:
             await self._discovery_debouncer.async_call()
-        elif source == SOURCE_REAUTH:
-            persistent_notification.async_create(
-                self.hass,
-                title="Integration requires reconfiguration",
-                message=(
-                    "At least one of your integrations requires reconfiguration to "
-                    "continue functioning. [Check it out](/config/integrations)."
-                ),
-                notification_id=RECONFIGURE_NOTIFICATION_ID,
-            )
 
     @callback
     def _async_discovery(self) -> None:
@@ -1787,6 +1941,11 @@ class ConfigEntryStore(storage.Store[dict[str, list[dict[str, Any]]]]):
                 for entry in data["entries"]:
                     entry["discovery_keys"] = {}
 
+            if old_minor_version < 5:
+                # Version 1.4 adds config subentries
+                for entry in data["entries"]:
+                    entry.setdefault("subentries", entry.get("subentries", {}))
+
         if old_major_version > 1:
             raise NotImplementedError
         return data
@@ -1803,6 +1962,7 @@ class ConfigEntries:
         self.hass = hass
         self.flow = ConfigEntriesFlowManager(hass, self, hass_config)
         self.options = OptionsFlowManager(hass)
+        self.subentries = ConfigSubentryFlowManager(hass)
         self._hass_config = hass_config
         self._entries = ConfigEntryItems(hass)
         self._store = ConfigEntryStore(hass)
@@ -1834,7 +1994,7 @@ class ConfigEntries:
         Raises UnknownEntry if entry is not found.
         """
         if (entry := self.async_get_entry(entry_id)) is None:
-            raise UnknownEntry
+            raise UnknownEntry(entry_id)
         return entry
 
     @callback
@@ -1934,9 +2094,9 @@ class ConfigEntries:
             else:
                 unload_success = await self.async_unload(entry_id, _lock=False)
 
+            del self._entries[entry.entry_id]
             await entry.async_remove(self.hass)
 
-            del self._entries[entry.entry_id]
             self.async_update_issues()
             self._async_schedule_save()
 
@@ -2005,6 +2165,7 @@ class ConfigEntries:
                 pref_disable_new_entities=entry["pref_disable_new_entities"],
                 pref_disable_polling=entry["pref_disable_polling"],
                 source=entry["source"],
+                subentries_data=entry["subentries"],
                 title=entry["title"],
                 unique_id=entry["unique_id"],
                 version=entry["version"],
@@ -2164,6 +2325,44 @@ class ConfigEntries:
         If the entry was changed, the update_listeners are
         fired and this function returns True
 
+        If the entry was not changed, the update_listeners are
+        not fired and this function returns False
+        """
+        return self._async_update_entry(
+            entry,
+            data=data,
+            discovery_keys=discovery_keys,
+            minor_version=minor_version,
+            options=options,
+            pref_disable_new_entities=pref_disable_new_entities,
+            pref_disable_polling=pref_disable_polling,
+            title=title,
+            unique_id=unique_id,
+            version=version,
+        )
+
+    @callback
+    def _async_update_entry(
+        self,
+        entry: ConfigEntry,
+        *,
+        data: Mapping[str, Any] | UndefinedType = UNDEFINED,
+        discovery_keys: MappingProxyType[str, tuple[DiscoveryKey, ...]]
+        | UndefinedType = UNDEFINED,
+        minor_version: int | UndefinedType = UNDEFINED,
+        options: Mapping[str, Any] | UndefinedType = UNDEFINED,
+        pref_disable_new_entities: bool | UndefinedType = UNDEFINED,
+        pref_disable_polling: bool | UndefinedType = UNDEFINED,
+        subentries: dict[str, ConfigSubentry] | UndefinedType = UNDEFINED,
+        title: str | UndefinedType = UNDEFINED,
+        unique_id: str | None | UndefinedType = UNDEFINED,
+        version: int | UndefinedType = UNDEFINED,
+    ) -> bool:
+        """Update a config entry.
+
+        If the entry was changed, the update_listeners are
+        fired and this function returns True
+
         If the entry was not changed, the update_listeners are
         not fired and this function returns False
         """
@@ -2226,11 +2425,21 @@ class ConfigEntries:
             changed = True
             _setter(entry, "options", MappingProxyType(options))
 
+        if subentries is not UNDEFINED:
+            if entry.subentries != subentries:
+                changed = True
+                _setter(entry, "subentries", MappingProxyType(subentries))
+
         if not changed:
             return False
 
         _setter(entry, "modified_at", utcnow())
 
+        self._async_save_and_notify(entry)
+        return True
+
+    @callback
+    def _async_save_and_notify(self, entry: ConfigEntry) -> None:
         for listener in entry.update_listeners:
             self.hass.async_create_task(
                 listener(self.hass, entry),
@@ -2241,8 +2450,92 @@ class ConfigEntries:
         entry.clear_state_cache()
         entry.clear_storage_cache()
         self._async_dispatch(ConfigEntryChange.UPDATED, entry)
+
+    @callback
+    def async_add_subentry(self, entry: ConfigEntry, subentry: ConfigSubentry) -> bool:
+        """Add a subentry to a config entry."""
+        self._raise_if_subentry_unique_id_exists(entry, subentry.unique_id)
+
+        return self._async_update_entry(
+            entry,
+            subentries=entry.subentries | {subentry.subentry_id: subentry},
+        )
+
+    @callback
+    def async_remove_subentry(self, entry: ConfigEntry, subentry_id: str) -> bool:
+        """Remove a subentry from a config entry."""
+        subentries = dict(entry.subentries)
+        try:
+            subentries.pop(subentry_id)
+        except KeyError as err:
+            raise UnknownSubEntry from err
+
+        result = self._async_update_entry(entry, subentries=subentries)
+        dev_reg = dr.async_get(self.hass)
+        ent_reg = er.async_get(self.hass)
+
+        dev_reg.async_clear_config_subentry(entry.entry_id, subentry_id)
+        ent_reg.async_clear_config_subentry(entry.entry_id, subentry_id)
+        return result
+
+    @callback
+    def async_update_subentry(
+        self,
+        entry: ConfigEntry,
+        subentry: ConfigSubentry,
+        *,
+        data: Mapping[str, Any] | UndefinedType = UNDEFINED,
+        title: str | UndefinedType = UNDEFINED,
+        unique_id: str | None | UndefinedType = UNDEFINED,
+    ) -> bool:
+        """Update a config subentry.
+
+        If the subentry was changed, the update_listeners are
+        fired and this function returns True
+
+        If the subentry was not changed, the update_listeners are
+        not fired and this function returns False
+        """
+        if entry.entry_id not in self._entries:
+            raise UnknownEntry(entry.entry_id)
+        if subentry.subentry_id not in entry.subentries:
+            raise UnknownSubEntry(subentry.subentry_id)
+
+        self.hass.verify_event_loop_thread("hass.config_entries.async_update_subentry")
+        changed = False
+        _setter = object.__setattr__
+
+        if unique_id is not UNDEFINED and subentry.unique_id != unique_id:
+            self._raise_if_subentry_unique_id_exists(entry, unique_id)
+            changed = True
+            _setter(subentry, "unique_id", unique_id)
+
+        if title is not UNDEFINED and subentry.title != title:
+            changed = True
+            _setter(subentry, "title", title)
+
+        if data is not UNDEFINED and subentry.data != data:
+            changed = True
+            _setter(subentry, "data", MappingProxyType(data))
+
+        if not changed:
+            return False
+
+        _setter(entry, "modified_at", utcnow())
+
+        self._async_save_and_notify(entry)
         return True
 
+    def _raise_if_subentry_unique_id_exists(
+        self, entry: ConfigEntry, unique_id: str | None
+    ) -> None:
+        """Raise if a subentry with the same unique_id exists."""
+        if unique_id is None:
+            return
+        for existing_subentry in entry.subentries.values():
+            if existing_subentry.unique_id == unique_id:
+                raise data_entry_flow.AbortFlow("already_configured")
+
     @callback
     def _async_dispatch(
         self, change_type: ConfigEntryChange, entry: ConfigEntry
@@ -2579,6 +2872,14 @@ class ConfigFlow(ConfigEntryBaseFlow):
         """Return options flow support for this handler."""
         return cls.async_get_options_flow is not ConfigFlow.async_get_options_flow
 
+    @classmethod
+    @callback
+    def async_get_supported_subentry_types(
+        cls, config_entry: ConfigEntry
+    ) -> dict[str, type[ConfigSubentryFlow]]:
+        """Return subentries supported by this handler."""
+        return {}
+
     @callback
     def _async_abort_entries_match(
         self, match_dict: dict[str, Any] | None = None
@@ -2673,8 +2974,11 @@ class ConfigFlow(ConfigEntryBaseFlow):
             return None
 
         if raise_on_progress:
-            if self._async_in_progress(
-                include_uninitialized=True, match_context={"unique_id": unique_id}
+            if any(
+                flow["context"]["source"] != SOURCE_REAUTH
+                for flow in self._async_in_progress(
+                    include_uninitialized=True, match_context={"unique_id": unique_id}
+                )
             ):
                 raise data_entry_flow.AbortFlow("already_in_progress")
 
@@ -2803,29 +3107,6 @@ class ConfigFlow(ConfigEntryBaseFlow):
         """Handle a flow initialized by discovery."""
         return await self._async_step_discovery_without_unique_id()
 
-    @callback
-    def async_abort(
-        self,
-        *,
-        reason: str,
-        description_placeholders: Mapping[str, str] | None = None,
-    ) -> ConfigFlowResult:
-        """Abort the config flow."""
-        # Remove reauth notification if no reauth flows are in progress
-        if self.source == SOURCE_REAUTH and not any(
-            ent["flow_id"] != self.flow_id
-            for ent in self.hass.config_entries.flow.async_progress_by_handler(
-                self.handler, match_context={"source": SOURCE_REAUTH}
-            )
-        ):
-            persistent_notification.async_dismiss(
-                self.hass, RECONFIGURE_NOTIFICATION_ID
-            )
-
-        return super().async_abort(
-            reason=reason, description_placeholders=description_placeholders
-        )
-
     async def async_step_bluetooth(
         self, discovery_info: BluetoothServiceInfoBleak
     ) -> ConfigFlowResult:
@@ -2887,6 +3168,7 @@ class ConfigFlow(ConfigEntryBaseFlow):
         description: str | None = None,
         description_placeholders: Mapping[str, str] | None = None,
         options: Mapping[str, Any] | None = None,
+        subentries: Iterable[ConfigSubentryData] | None = None,
     ) -> ConfigFlowResult:
         """Finish config flow and create a config entry."""
         if self.source in {SOURCE_REAUTH, SOURCE_RECONFIGURE}:
@@ -2906,6 +3188,7 @@ class ConfigFlow(ConfigEntryBaseFlow):
 
         result["minor_version"] = self.MINOR_VERSION
         result["options"] = options or {}
+        result["subentries"] = subentries or ()
         result["version"] = self.VERSION
 
         return result
@@ -3020,17 +3303,193 @@ class ConfigFlow(ConfigEntryBaseFlow):
         )
 
 
-class OptionsFlowManager(
-    data_entry_flow.FlowManager[ConfigFlowContext, ConfigFlowResult]
-):
-    """Flow to set options for a configuration entry."""
+class _ConfigSubFlowManager:
+    """Mixin class for flow managers which manage flows tied to a config entry."""
 
-    _flow_result = ConfigFlowResult
+    hass: HomeAssistant
 
     def _async_get_config_entry(self, config_entry_id: str) -> ConfigEntry:
         """Return config entry or raise if not found."""
         return self.hass.config_entries.async_get_known_entry(config_entry_id)
 
+
+class ConfigSubentryFlowManager(
+    data_entry_flow.FlowManager[
+        SubentryFlowContext, SubentryFlowResult, tuple[str, str]
+    ],
+    _ConfigSubFlowManager,
+):
+    """Manage all the config subentry flows that are in progress."""
+
+    _flow_result = SubentryFlowResult
+
+    async def async_create_flow(
+        self,
+        handler_key: tuple[str, str],
+        *,
+        context: FlowContext | None = None,
+        data: dict[str, Any] | None = None,
+    ) -> ConfigSubentryFlow:
+        """Create a subentry flow for a config entry.
+
+        The entry_id and flow.handler[0] is the same thing to map entry with flow.
+        """
+        if not context or "source" not in context:
+            raise KeyError("Context not set or doesn't have a source set")
+
+        entry_id, subentry_type = handler_key
+        entry = self._async_get_config_entry(entry_id)
+        handler = await _async_get_flow_handler(self.hass, entry.domain, {})
+        subentry_types = handler.async_get_supported_subentry_types(entry)
+        if subentry_type not in subentry_types:
+            raise data_entry_flow.UnknownHandler(
+                f"Config entry '{entry.domain}' does not support subentry '{subentry_type}'"
+            )
+        subentry_flow = subentry_types[subentry_type]()
+        subentry_flow.init_step = context["source"]
+        return subentry_flow
+
+    async def async_finish_flow(
+        self,
+        flow: data_entry_flow.FlowHandler[
+            SubentryFlowContext, SubentryFlowResult, tuple[str, str]
+        ],
+        result: SubentryFlowResult,
+    ) -> SubentryFlowResult:
+        """Finish a subentry flow and add a new subentry to the configuration entry.
+
+        The flow.handler[0] and entry_id is the same thing to map flow with entry.
+        """
+        flow = cast(ConfigSubentryFlow, flow)
+
+        if result["type"] != data_entry_flow.FlowResultType.CREATE_ENTRY:
+            return result
+
+        entry_id, subentry_type = flow.handler
+        entry = self.hass.config_entries.async_get_entry(entry_id)
+        if entry is None:
+            raise UnknownEntry(entry_id)
+
+        unique_id = result.get("unique_id")
+        if unique_id is not None and not isinstance(unique_id, str):
+            raise HomeAssistantError("unique_id must be a string")
+
+        self.hass.config_entries.async_add_subentry(
+            entry,
+            ConfigSubentry(
+                data=MappingProxyType(result["data"]),
+                subentry_type=subentry_type,
+                title=result["title"],
+                unique_id=unique_id,
+            ),
+        )
+
+        result["result"] = True
+        return result
+
+
+class ConfigSubentryFlow(
+    data_entry_flow.FlowHandler[
+        SubentryFlowContext, SubentryFlowResult, tuple[str, str]
+    ]
+):
+    """Base class for config subentry flows."""
+
+    _flow_result = SubentryFlowResult
+    handler: tuple[str, str]
+
+    @callback
+    def async_create_entry(
+        self,
+        *,
+        title: str | None = None,
+        data: Mapping[str, Any],
+        description: str | None = None,
+        description_placeholders: Mapping[str, str] | None = None,
+        unique_id: str | None = None,
+    ) -> SubentryFlowResult:
+        """Finish config flow and create a config entry."""
+        if self.source != SOURCE_USER:
+            raise ValueError(f"Source is {self.source}, expected {SOURCE_USER}")
+
+        result = super().async_create_entry(
+            title=title,
+            data=data,
+            description=description,
+            description_placeholders=description_placeholders,
+        )
+
+        result["unique_id"] = unique_id
+
+        return result
+
+    @callback
+    def async_update_and_abort(
+        self,
+        entry: ConfigEntry,
+        subentry: ConfigSubentry,
+        *,
+        unique_id: str | None | UndefinedType = UNDEFINED,
+        title: str | UndefinedType = UNDEFINED,
+        data: Mapping[str, Any] | UndefinedType = UNDEFINED,
+        data_updates: Mapping[str, Any] | UndefinedType = UNDEFINED,
+    ) -> SubentryFlowResult:
+        """Update config subentry and finish subentry flow.
+
+        :param data: replace the subentry data with new data
+        :param data_updates: add items from data_updates to subentry data - existing
+        keys are overridden
+        :param title: replace the title of the subentry
+        :param unique_id: replace the unique_id of the subentry
+        """
+        if data_updates is not UNDEFINED:
+            if data is not UNDEFINED:
+                raise ValueError("Cannot set both data and data_updates")
+            data = subentry.data | data_updates
+        self.hass.config_entries.async_update_subentry(
+            entry=entry,
+            subentry=subentry,
+            unique_id=unique_id,
+            title=title,
+            data=data,
+        )
+        return self.async_abort(reason="reconfigure_successful")
+
+    @property
+    def _entry_id(self) -> str:
+        """Return config entry id."""
+        return self.handler[0]
+
+    @callback
+    def _get_entry(self) -> ConfigEntry:
+        """Return the config entry linked to the current context."""
+        return self.hass.config_entries.async_get_known_entry(self._entry_id)
+
+    @property
+    def _reconfigure_subentry_id(self) -> str:
+        """Return reconfigure subentry id."""
+        if self.source != SOURCE_RECONFIGURE:
+            raise ValueError(f"Source is {self.source}, expected {SOURCE_RECONFIGURE}")
+        return self.context["subentry_id"]
+
+    @callback
+    def _get_reconfigure_subentry(self) -> ConfigSubentry:
+        """Return the reconfigure config subentry linked to the current context."""
+        entry = self.hass.config_entries.async_get_known_entry(self._entry_id)
+        subentry_id = self._reconfigure_subentry_id
+        if subentry_id not in entry.subentries:
+            raise UnknownSubEntry(subentry_id)
+        return entry.subentries[subentry_id]
+
+
+class OptionsFlowManager(
+    data_entry_flow.FlowManager[ConfigFlowContext, ConfigFlowResult],
+    _ConfigSubFlowManager,
+):
+    """Manage all the config entry option flows that are in progress."""
+
+    _flow_result = ConfigFlowResult
+
     async def async_create_flow(
         self,
         handler_key: str,
@@ -3040,7 +3499,7 @@ class OptionsFlowManager(
     ) -> OptionsFlow:
         """Create an options flow for a config entry.
 
-        Entry_id and flow.handler is the same thing to map entry with flow.
+        The entry_id and the flow.handler is the same thing to map entry with flow.
         """
         entry = self._async_get_config_entry(handler_key)
         handler = await _async_get_flow_handler(self.hass, entry.domain, {})
@@ -3056,7 +3515,7 @@ class OptionsFlowManager(
         This method is called when a flow step returns FlowResultType.ABORT or
         FlowResultType.CREATE_ENTRY.
 
-        Flow.handler and entry_id is the same thing to map flow with entry.
+        The flow.handler and the entry_id is the same thing to map flow with entry.
         """
         flow = cast(OptionsFlow, flow)
 
diff --git a/homeassistant/const.py b/homeassistant/const.py
index 699aebcafdf..a6f39db8532 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -24,7 +24,7 @@ if TYPE_CHECKING:
 
 APPLICATION_NAME: Final = "HomeAssistant"
 MAJOR_VERSION: Final = 2025
-MINOR_VERSION: Final = 2
+MINOR_VERSION: Final = 5
 PATCH_VERSION: Final = "0.dev0"
 __short_version__: Final = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 __version__: Final = f"{__short_version__}.{PATCH_VERSION}"
@@ -632,6 +632,15 @@ class UnitOfEnergy(StrEnum):
     GIGA_CALORIE = "Gcal"
 
 
+# Energy Distance units
+class UnitOfEnergyDistance(StrEnum):
+    """Energy Distance units."""
+
+    KILO_WATT_HOUR_PER_100_KM = "kWh/100km"
+    MILES_PER_KILO_WATT_HOUR = "mi/kWh"
+    KM_PER_KILO_WATT_HOUR = "km/kWh"
+
+
 # Electric_current units
 class UnitOfElectricCurrent(StrEnum):
     """Electric current units."""
diff --git a/homeassistant/data_entry_flow.py b/homeassistant/data_entry_flow.py
index e5ee5a79922..f7be891b61b 100644
--- a/homeassistant/data_entry_flow.py
+++ b/homeassistant/data_entry_flow.py
@@ -561,7 +561,7 @@ class FlowManager(abc.ABC, Generic[_FlowContextT, _FlowResultT, _HandlerT]):
         if not hasattr(flow, method):
             self._async_remove_flow_progress(flow.flow_id)
             raise UnknownStep(
-                f"Handler {self.__class__.__name__} doesn't support step {step_id}"
+                f"Handler {flow.__class__.__name__} doesn't support step {step_id}"
             )
 
     async def _async_setup_preview(
@@ -657,6 +657,19 @@ class FlowHandler(Generic[_FlowContextT, _FlowResultT, _HandlerT]):
                 ):
                     continue
 
+            # Process the section schema options
+            if (
+                suggested_values is not None
+                and isinstance(val, section)
+                and key in suggested_values
+            ):
+                new_section_key = copy.copy(key)
+                schema[new_section_key] = val
+                val.schema = self.add_suggested_values_to_schema(
+                    val.schema, suggested_values[key]
+                )
+                continue
+
             new_key = key
             if (
                 suggested_values
diff --git a/homeassistant/generated/application_credentials.py b/homeassistant/generated/application_credentials.py
index 6b3028826dc..68c6de405e6 100644
--- a/homeassistant/generated/application_credentials.py
+++ b/homeassistant/generated/application_credentials.py
@@ -9,6 +9,7 @@ APPLICATION_CREDENTIALS = [
     "geocaching",
     "google",
     "google_assistant_sdk",
+    "google_drive",
     "google_mail",
     "google_photos",
     "google_sheets",
@@ -24,8 +25,11 @@ APPLICATION_CREDENTIALS = [
     "neato",
     "nest",
     "netatmo",
+    "ondilo_ico",
+    "onedrive",
     "point",
     "senz",
+    "smartthings",
     "spotify",
     "tesla_fleet",
     "twitch",
diff --git a/homeassistant/generated/bluetooth.py b/homeassistant/generated/bluetooth.py
index 8a5880dcde9..1ff444ca25f 100644
--- a/homeassistant/generated/bluetooth.py
+++ b/homeassistant/generated/bluetooth.py
@@ -187,6 +187,11 @@ BLUETOOTH: Final[list[dict[str, bool | str | int | list[int]]]] = [
         "domain": "govee_ble",
         "local_name": "GV5126*",
     },
+    {
+        "connectable": False,
+        "domain": "govee_ble",
+        "local_name": "GV5179*",
+    },
     {
         "connectable": False,
         "domain": "govee_ble",
@@ -351,6 +356,21 @@ BLUETOOTH: Final[list[dict[str, bool | str | int | list[int]]]] = [
         "domain": "inkbird",
         "local_name": "tps",
     },
+    {
+        "connectable": False,
+        "domain": "inkbird",
+        "local_name": "ITH-11-B",
+    },
+    {
+        "connectable": False,
+        "domain": "inkbird",
+        "local_name": "ITH-13-B",
+    },
+    {
+        "connectable": False,
+        "domain": "inkbird",
+        "local_name": "ITH-21-B",
+    },
     {
         "connectable": True,
         "domain": "iron_os",
@@ -683,6 +703,15 @@ BLUETOOTH: Final[list[dict[str, bool | str | int | list[int]]]] = [
         "manufacturer_id": 17,
         "service_uuid": "0000fff0-0000-1000-8000-00805f9b34fb",
     },
+    {
+        "connectable": False,
+        "domain": "thermobeacon",
+        "manufacturer_data_start": [
+            0,
+        ],
+        "manufacturer_id": 20,
+        "service_uuid": "0000fff0-0000-1000-8000-00805f9b34fb",
+    },
     {
         "connectable": False,
         "domain": "thermobeacon",
diff --git a/homeassistant/generated/config_flows.py b/homeassistant/generated/config_flows.py
index b393e5c8851..d192b8fcd13 100644
--- a/homeassistant/generated/config_flows.py
+++ b/homeassistant/generated/config_flows.py
@@ -6,6 +6,7 @@ To update, run python3 -m script.hassfest
 FLOWS = {
     "helper": [
         "derivative",
+        "filter",
         "generic_hygrostat",
         "generic_thermostat",
         "group",
@@ -78,6 +79,7 @@ FLOWS = {
         "azure_data_explorer",
         "azure_devops",
         "azure_event_hub",
+        "azure_storage",
         "baf",
         "balboa",
         "bang_olufsen",
@@ -89,6 +91,7 @@ FLOWS = {
         "bluetooth",
         "bmw_connected_drive",
         "bond",
+        "bosch_alarm",
         "bosch_shc",
         "braviatv",
         "bring",
@@ -230,6 +233,7 @@ FLOWS = {
         "google",
         "google_assistant_sdk",
         "google_cloud",
+        "google_drive",
         "google_generative_ai_conversation",
         "google_mail",
         "google_photos",
@@ -287,6 +291,7 @@ FLOWS = {
         "inkbird",
         "insteon",
         "intellifire",
+        "iometer",
         "ios",
         "iotawatt",
         "iotty",
@@ -358,6 +363,7 @@ FLOWS = {
         "mailgun",
         "mastodon",
         "matter",
+        "mcp",
         "mcp_server",
         "mealie",
         "meater",
@@ -433,6 +439,7 @@ FLOWS = {
         "omnilogic",
         "oncue",
         "ondilo_ico",
+        "onedrive",
         "onewire",
         "onkyo",
         "onvif",
@@ -462,6 +469,7 @@ FLOWS = {
         "peco",
         "pegel_online",
         "permobil",
+        "pglab",
         "philips_js",
         "pi_hole",
         "picnic",
@@ -481,6 +489,7 @@ FLOWS = {
         "proximity",
         "prusalink",
         "ps4",
+        "pterodactyl",
         "pure_energie",
         "purpleair",
         "pushbullet",
@@ -506,6 +515,7 @@ FLOWS = {
         "rdw",
         "recollect_waste",
         "refoss",
+        "remote_calendar",
         "renault",
         "renson",
         "reolink",
@@ -540,6 +550,7 @@ FLOWS = {
         "sensirion_ble",
         "sensorpro",
         "sensorpush",
+        "sensorpush_cloud",
         "sensoterra",
         "sentry",
         "senz",
@@ -568,6 +579,7 @@ FLOWS = {
         "smlight",
         "sms",
         "snapcast",
+        "snoo",
         "snooz",
         "solaredge",
         "solarlog",
@@ -684,6 +696,7 @@ FLOWS = {
         "weatherflow",
         "weatherflow_cloud",
         "weatherkit",
+        "webdav",
         "webmin",
         "webostv",
         "weheat",
diff --git a/homeassistant/generated/dhcp.py b/homeassistant/generated/dhcp.py
index 7d14ab0f444..8ee1ea270f3 100644
--- a/homeassistant/generated/dhcp.py
+++ b/homeassistant/generated/dhcp.py
@@ -61,6 +61,14 @@ DHCP: Final[list[dict[str, str | bool]]] = [
         "hostname": "axis-e82725*",
         "macaddress": "E82725*",
     },
+    {
+        "domain": "balboa",
+        "registered_devices": True,
+    },
+    {
+        "domain": "balboa",
+        "macaddress": "001527*",
+    },
     {
         "domain": "blink",
         "hostname": "blink*",
@@ -490,6 +498,18 @@ DHCP: Final[list[dict[str, str | bool]]] = [
         "hostname": "ring*",
         "macaddress": "341513*",
     },
+    {
+        "domain": "roborock",
+        "macaddress": "249E7D*",
+    },
+    {
+        "domain": "roborock",
+        "macaddress": "B04A39*",
+    },
+    {
+        "domain": "roborock",
+        "hostname": "roborock-*",
+    },
     {
         "domain": "roomba",
         "hostname": "irobot-*",
@@ -608,6 +628,10 @@ DHCP: Final[list[dict[str, str | bool]]] = [
         "hostname": "hub*",
         "macaddress": "286D97*",
     },
+    {
+        "domain": "smlight",
+        "registered_devices": True,
+    },
     {
         "domain": "solaredge",
         "hostname": "target",
diff --git a/homeassistant/generated/integrations.json b/homeassistant/generated/integrations.json
index 9a7167f5367..58f7f7fab20 100644
--- a/homeassistant/generated/integrations.json
+++ b/homeassistant/generated/integrations.json
@@ -345,6 +345,11 @@
       "config_flow": true,
       "iot_class": "local_polling"
     },
+    "apollo_automation": {
+      "name": "Apollo Automation",
+      "integration_type": "virtual",
+      "supported_by": "esphome"
+    },
     "appalachianpower": {
       "name": "Appalachian Power",
       "integration_type": "virtual",
@@ -606,6 +611,13 @@
       "config_flow": true,
       "iot_class": "local_push"
     },
+    "backup": {
+      "name": "Backup",
+      "integration_type": "service",
+      "config_flow": false,
+      "iot_class": "calculated",
+      "single_config_entry": true
+    },
     "baf": {
       "name": "Big Ass Fans",
       "integration_type": "hub",
@@ -747,6 +759,12 @@
       "config_flow": true,
       "iot_class": "local_push"
     },
+    "bosch_alarm": {
+      "name": "Bosch Alarm",
+      "integration_type": "device",
+      "config_flow": true,
+      "iot_class": "local_push"
+    },
     "bosch_shc": {
       "name": "Bosch SHC",
       "integration_type": "hub",
@@ -850,6 +868,11 @@
       "config_flow": true,
       "iot_class": "cloud_polling"
     },
+    "burbank_water_and_power": {
+      "name": "Burbank Water and Power (BWP)",
+      "integration_type": "virtual",
+      "supported_by": "opower"
+    },
     "caldav": {
       "name": "CalDAV",
       "integration_type": "hub",
@@ -2041,6 +2064,11 @@
       "config_flow": false,
       "iot_class": "cloud_push"
     },
+    "frankever": {
+      "name": "FrankEver",
+      "integration_type": "virtual",
+      "supported_by": "shelly"
+    },
     "free_mobile": {
       "name": "Free Mobile",
       "integration_type": "hub",
@@ -2295,6 +2323,12 @@
           "iot_class": "cloud_push",
           "name": "Google Cloud"
         },
+        "google_drive": {
+          "integration_type": "service",
+          "config_flow": true,
+          "iot_class": "cloud_polling",
+          "name": "Google Drive"
+        },
         "google_generative_ai_conversation": {
           "integration_type": "service",
           "config_flow": true,
@@ -2468,6 +2502,12 @@
       "config_flow": true,
       "iot_class": "cloud_polling"
     },
+    "hardkernel": {
+      "name": "Hardkernel",
+      "integration_type": "hardware",
+      "config_flow": false,
+      "single_config_entry": true
+    },
     "harman_kardon_avr": {
       "name": "Harman Kardon AVR",
       "integration_type": "hub",
@@ -2515,6 +2555,11 @@
       "config_flow": false,
       "iot_class": "local_polling"
     },
+    "heicko": {
+      "name": "Heicko",
+      "integration_type": "virtual",
+      "supported_by": "motion_blinds"
+    },
     "heiwa": {
       "name": "Heiwa",
       "integration_type": "virtual",
@@ -2598,13 +2643,31 @@
       "name": "Home Connect",
       "integration_type": "hub",
       "config_flow": true,
-      "iot_class": "cloud_push"
+      "iot_class": "cloud_push",
+      "single_config_entry": true
     },
     "home_plus_control": {
       "name": "Legrand Home+ Control",
       "integration_type": "virtual",
       "supported_by": "netatmo"
     },
+    "homeassistant_green": {
+      "name": "Home Assistant Green",
+      "integration_type": "hardware",
+      "config_flow": false,
+      "single_config_entry": true
+    },
+    "homeassistant_sky_connect": {
+      "name": "Home Assistant Connect ZBT-1",
+      "integration_type": "hardware",
+      "config_flow": true
+    },
+    "homeassistant_yellow": {
+      "name": "Home Assistant Yellow",
+      "integration_type": "hardware",
+      "config_flow": false,
+      "single_config_entry": true
+    },
     "homee": {
       "name": "Homee",
       "integration_type": "hub",
@@ -2860,7 +2923,7 @@
       "iot_class": "local_polling"
     },
     "incomfort": {
-      "name": "Intergas InComfort/Intouch Lan2RF gateway",
+      "name": "Intergas gateway",
       "integration_type": "hub",
       "config_flow": true,
       "iot_class": "local_polling"
@@ -2918,6 +2981,12 @@
       "config_flow": false,
       "iot_class": "cloud_push"
     },
+    "iometer": {
+      "name": "IOmeter",
+      "integration_type": "device",
+      "config_flow": true,
+      "iot_class": "local_polling"
+    },
     "ios": {
       "name": "Home Assistant iOS",
       "integration_type": "hub",
@@ -3374,12 +3443,22 @@
       "config_flow": false,
       "iot_class": "assumed_state"
     },
+    "linak": {
+      "name": "LINAK",
+      "integration_type": "virtual",
+      "supported_by": "idasen_desk"
+    },
     "linear_garage_door": {
       "name": "Linear Garage Door",
       "integration_type": "hub",
       "config_flow": true,
       "iot_class": "cloud_polling"
     },
+    "linkedgo": {
+      "name": "LinkedGo",
+      "integration_type": "virtual",
+      "supported_by": "shelly"
+    },
     "linkplay": {
       "name": "LinkPlay",
       "integration_type": "hub",
@@ -3404,6 +3483,11 @@
       "config_flow": false,
       "iot_class": "local_polling"
     },
+    "linx": {
+      "name": "Linx",
+      "integration_type": "virtual",
+      "supported_by": "motion_blinds"
+    },
     "lirc": {
       "name": "LIRC",
       "integration_type": "hub",
@@ -3602,11 +3686,17 @@
       "iot_class": "cloud_push"
     },
     "matter": {
-      "name": "Matter (BETA)",
+      "name": "Matter",
       "integration_type": "hub",
       "config_flow": true,
       "iot_class": "local_push"
     },
+    "mcp": {
+      "name": "Model Context Protocol",
+      "integration_type": "hub",
+      "config_flow": true,
+      "iot_class": "local_polling"
+    },
     "mcp_server": {
       "name": "Model Context Protocol Server",
       "integration_type": "service",
@@ -3766,6 +3856,12 @@
           "iot_class": "cloud_push",
           "name": "Azure Service Bus"
         },
+        "azure_storage": {
+          "integration_type": "service",
+          "config_flow": true,
+          "iot_class": "cloud_polling",
+          "name": "Azure Storage"
+        },
         "microsoft_face_detect": {
           "integration_type": "hub",
           "config_flow": false,
@@ -3796,6 +3892,12 @@
           "iot_class": "cloud_push",
           "name": "Microsoft Teams"
         },
+        "onedrive": {
+          "integration_type": "service",
+          "config_flow": true,
+          "iot_class": "cloud_polling",
+          "name": "OneDrive"
+        },
         "xbox": {
           "integration_type": "hub",
           "config_flow": true,
@@ -3934,7 +4036,10 @@
           "iot_class": "assumed_state",
           "name": "Motionblinds Bluetooth"
         }
-      }
+      },
+      "iot_standards": [
+        "matter"
+      ]
     },
     "motioneye": {
       "name": "motionEye",
@@ -4360,6 +4465,11 @@
       "config_flow": false,
       "iot_class": "local_polling"
     },
+    "ogemray": {
+      "name": "Ogemray",
+      "integration_type": "virtual",
+      "supported_by": "shelly"
+    },
     "ohmconnect": {
       "name": "OhmConnect",
       "integration_type": "hub",
@@ -4704,6 +4814,13 @@
       "integration_type": "virtual",
       "supported_by": "opower"
     },
+    "pglab": {
+      "name": "PG LAB Electronics",
+      "integration_type": "hub",
+      "config_flow": true,
+      "iot_class": "local_push",
+      "single_config_entry": true
+    },
     "philips": {
       "name": "Philips",
       "integrations": {
@@ -4910,6 +5027,12 @@
       "integration_type": "virtual",
       "supported_by": "opower"
     },
+    "pterodactyl": {
+      "name": "Pterodactyl",
+      "integration_type": "hub",
+      "config_flow": true,
+      "iot_class": "local_polling"
+    },
     "pulseaudio_loopback": {
       "name": "PulseAudio Loopback",
       "integration_type": "hub",
@@ -5114,6 +5237,11 @@
     "raspberry_pi": {
       "name": "Raspberry Pi",
       "integrations": {
+        "raspberry_pi": {
+          "integration_type": "hardware",
+          "config_flow": false,
+          "name": "Raspberry Pi"
+        },
         "rpi_camera": {
           "integration_type": "hub",
           "config_flow": false,
@@ -5187,6 +5315,11 @@
       "config_flow": false,
       "iot_class": "cloud_push"
     },
+    "remote_calendar": {
+      "integration_type": "service",
+      "config_flow": true,
+      "iot_class": "cloud_polling"
+    },
     "renault": {
       "name": "Renault",
       "integration_type": "hub",
@@ -5540,9 +5673,20 @@
     },
     "sensorpush": {
       "name": "SensorPush",
-      "integration_type": "hub",
-      "config_flow": true,
-      "iot_class": "local_push"
+      "integrations": {
+        "sensorpush": {
+          "integration_type": "hub",
+          "config_flow": true,
+          "iot_class": "local_push",
+          "name": "SensorPush"
+        },
+        "sensorpush_cloud": {
+          "integration_type": "hub",
+          "config_flow": true,
+          "iot_class": "cloud_polling",
+          "name": "SensorPush Cloud"
+        }
+      }
     },
     "sensoterra": {
       "name": "Sensoterra",
@@ -5783,6 +5927,11 @@
       "config_flow": true,
       "iot_class": "cloud_polling"
     },
+    "smart_rollos": {
+      "name": "Smart Rollos",
+      "integration_type": "virtual",
+      "supported_by": "motion_blinds"
+    },
     "smarther": {
       "name": "Smarther",
       "integration_type": "virtual",
@@ -5853,6 +6002,12 @@
       "config_flow": false,
       "iot_class": "local_polling"
     },
+    "snoo": {
+      "name": "Happiest Baby Snoo",
+      "integration_type": "hub",
+      "config_flow": true,
+      "iot_class": "cloud_push"
+    },
     "snooz": {
       "name": "Snooz",
       "integration_type": "hub",
@@ -6718,6 +6873,11 @@
       "integration_type": "virtual",
       "supported_by": "overkiz"
     },
+    "ublockout": {
+      "name": "Ublockout",
+      "integration_type": "virtual",
+      "supported_by": "motion_blinds"
+    },
     "uk_transport": {
       "name": "UK Transport",
       "integration_type": "hub",
@@ -7018,6 +7178,12 @@
         }
       }
     },
+    "webdav": {
+      "name": "WebDAV",
+      "integration_type": "service",
+      "config_flow": true,
+      "iot_class": "cloud_polling"
+    },
     "webmin": {
       "name": "Webmin",
       "integration_type": "device",
@@ -7418,7 +7584,7 @@
     },
     "filter": {
       "integration_type": "helper",
-      "config_flow": false,
+      "config_flow": true,
       "iot_class": "local_push"
     },
     "generic_hygrostat": {
@@ -7579,6 +7745,7 @@
     "plant",
     "proximity",
     "random",
+    "remote_calendar",
     "rpi_power",
     "schedule",
     "season",
diff --git a/homeassistant/generated/mqtt.py b/homeassistant/generated/mqtt.py
index 72f160ee2ec..c4eb8708b0e 100644
--- a/homeassistant/generated/mqtt.py
+++ b/homeassistant/generated/mqtt.py
@@ -16,6 +16,9 @@ MQTT = {
     "fully_kiosk": [
         "fully/deviceInfo/+",
     ],
+    "pglab": [
+        "pglab/discovery/#",
+    ],
     "qbus": [
         "cloudapp/QBUSMQTTGW/state",
         "cloudapp/QBUSMQTTGW/config",
diff --git a/homeassistant/generated/ssdp.py b/homeassistant/generated/ssdp.py
index 89d1aa30cb8..5bbc178ba17 100644
--- a/homeassistant/generated/ssdp.py
+++ b/homeassistant/generated/ssdp.py
@@ -211,6 +211,12 @@ SSDP = {
         {
             "st": "nanoleaf:nl52",
         },
+        {
+            "st": "nanoleaf:nl69",
+        },
+        {
+            "st": "inanoleaf:nl81",
+        },
     ],
     "netgear": [
         {
diff --git a/homeassistant/generated/zeroconf.py b/homeassistant/generated/zeroconf.py
index 203f01e7d68..cc1683a3603 100644
--- a/homeassistant/generated/zeroconf.py
+++ b/homeassistant/generated/zeroconf.py
@@ -208,6 +208,14 @@ HOMEKIT = {
         "always_discover": False,
         "domain": "nanoleaf",
     },
+    "NL69": {
+        "always_discover": False,
+        "domain": "nanoleaf",
+    },
+    "NL81": {
+        "always_discover": False,
+        "domain": "nanoleaf",
+    },
     "Netatmo Relay": {
         "always_discover": True,
         "domain": "netatmo",
@@ -522,6 +530,11 @@ ZEROCONF = {
             "domain": "homekit",
         },
     ],
+    "_homewizard._tcp.local.": [
+        {
+            "domain": "homewizard",
+        },
+    ],
     "_hscp._tcp.local.": [
         {
             "domain": "apple_tv",
@@ -609,6 +622,11 @@ ZEROCONF = {
             "domain": "homewizard",
         },
     ],
+    "_iometer._tcp.local.": [
+        {
+            "domain": "iometer",
+        },
+    ],
     "_ipp._tcp.local.": [
         {
             "domain": "ipp",
@@ -785,6 +803,11 @@ ZEROCONF = {
             "domain": "russound_rio",
         },
     ],
+    "_shelly._tcp.local.": [
+        {
+            "domain": "shelly",
+        },
+    ],
     "_sideplay._tcp.local.": [
         {
             "domain": "ecobee",
diff --git a/homeassistant/helpers/aiohttp_client.py b/homeassistant/helpers/aiohttp_client.py
index b5f5ee9a961..3d8dc247857 100644
--- a/homeassistant/helpers/aiohttp_client.py
+++ b/homeassistant/helpers/aiohttp_client.py
@@ -15,7 +15,7 @@ import aiohttp
 from aiohttp import web
 from aiohttp.hdrs import CONTENT_TYPE, USER_AGENT
 from aiohttp.web_exceptions import HTTPBadGateway, HTTPGatewayTimeout
-from aiohttp_asyncmdnsresolver.api import AsyncMDNSResolver
+from aiohttp_asyncmdnsresolver.api import AsyncDualMDNSResolver
 
 from homeassistant import config_entries
 from homeassistant.components import zeroconf
@@ -377,5 +377,5 @@ def _async_get_connector(
 
 
 @callback
-def _async_make_resolver(hass: HomeAssistant) -> AsyncMDNSResolver:
-    return AsyncMDNSResolver(async_zeroconf=zeroconf.async_get_async_zeroconf(hass))
+def _async_make_resolver(hass: HomeAssistant) -> AsyncDualMDNSResolver:
+    return AsyncDualMDNSResolver(async_zeroconf=zeroconf.async_get_async_zeroconf(hass))
diff --git a/homeassistant/helpers/area_registry.py b/homeassistant/helpers/area_registry.py
index 5601ce4032d..ba02ed51f6b 100644
--- a/homeassistant/helpers/area_registry.py
+++ b/homeassistant/helpers/area_registry.py
@@ -20,6 +20,7 @@ from .json import json_bytes, json_fragment
 from .normalized_name_base_registry import (
     NormalizedNameBaseRegistryEntry,
     NormalizedNameBaseRegistryItems,
+    normalize_name,
 )
 from .registry import BaseRegistry, RegistryIndexType
 from .singleton import singleton
@@ -169,6 +170,7 @@ class AreaRegistryItems(NormalizedNameBaseRegistryItems[AreaEntry]):
         super().__init__()
         self._labels_index: RegistryIndexType = defaultdict(dict)
         self._floors_index: RegistryIndexType = defaultdict(dict)
+        self._aliases_index: RegistryIndexType = defaultdict(dict)
 
     def _index_entry(self, key: str, entry: AreaEntry) -> None:
         """Index an entry."""
@@ -177,6 +179,9 @@ class AreaRegistryItems(NormalizedNameBaseRegistryItems[AreaEntry]):
             self._floors_index[entry.floor_id][key] = True
         for label in entry.labels:
             self._labels_index[label][key] = True
+        for alias in entry.aliases:
+            normalized_alias = normalize_name(alias)
+            self._aliases_index[normalized_alias][key] = True
 
     def _unindex_entry(
         self, key: str, replacement_entry: AreaEntry | None = None
@@ -184,6 +189,10 @@ class AreaRegistryItems(NormalizedNameBaseRegistryItems[AreaEntry]):
         # always call base class before other indices
         super()._unindex_entry(key, replacement_entry)
         entry = self.data[key]
+        if aliases := entry.aliases:
+            for alias in aliases:
+                normalized_alias = normalize_name(alias)
+                self._unindex_entry_value(key, normalized_alias, self._aliases_index)
         if labels := entry.labels:
             for label in labels:
                 self._unindex_entry_value(key, label, self._labels_index)
@@ -200,6 +209,12 @@ class AreaRegistryItems(NormalizedNameBaseRegistryItems[AreaEntry]):
         data = self.data
         return [data[key] for key in self._floors_index.get(floor, ())]
 
+    def get_areas_for_alias(self, alias: str) -> list[AreaEntry]:
+        """Get areas for alias."""
+        data = self.data
+        normalized_alias = normalize_name(alias)
+        return [data[key] for key in self._aliases_index.get(normalized_alias, ())]
+
 
 class AreaRegistry(BaseRegistry[AreasRegistryStoreData]):
     """Class to hold a registry of areas."""
@@ -232,6 +247,11 @@ class AreaRegistry(BaseRegistry[AreasRegistryStoreData]):
         """Get area by name."""
         return self.areas.get_by_name(name)
 
+    @callback
+    def async_get_areas_by_alias(self, alias: str) -> list[AreaEntry]:
+        """Get areas by alias."""
+        return self.areas.get_areas_for_alias(alias)
+
     @callback
     def async_list_areas(self) -> Iterable[AreaEntry]:
         """Get all areas."""
diff --git a/homeassistant/helpers/backup.py b/homeassistant/helpers/backup.py
new file mode 100644
index 00000000000..b3607f6653c
--- /dev/null
+++ b/homeassistant/helpers/backup.py
@@ -0,0 +1,94 @@
+"""Helpers for the backup integration."""
+
+from __future__ import annotations
+
+import asyncio
+from collections.abc import Callable
+from dataclasses import dataclass, field
+from typing import TYPE_CHECKING
+
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.util.hass_dict import HassKey
+
+if TYPE_CHECKING:
+    from homeassistant.components.backup import (
+        BackupManager,
+        BackupPlatformEvent,
+        ManagerStateEvent,
+    )
+
+DATA_BACKUP: HassKey[BackupData] = HassKey("backup_data")
+DATA_MANAGER: HassKey[BackupManager] = HassKey("backup")
+
+
+@dataclass(slots=True)
+class BackupData:
+    """Backup data stored in hass.data."""
+
+    backup_event_subscriptions: list[Callable[[ManagerStateEvent], None]] = field(
+        default_factory=list
+    )
+    backup_platform_event_subscriptions: list[Callable[[BackupPlatformEvent], None]] = (
+        field(default_factory=list)
+    )
+    manager_ready: asyncio.Future[None] = field(default_factory=asyncio.Future)
+
+
+@callback
+def async_initialize_backup(hass: HomeAssistant) -> None:
+    """Initialize backup data.
+
+    This creates the BackupData instance stored in hass.data[DATA_BACKUP] and
+    registers the basic backup websocket API which is used by frontend to subscribe
+    to backup events.
+    """
+    # pylint: disable-next=import-outside-toplevel
+    from homeassistant.components.backup import basic_websocket
+
+    hass.data[DATA_BACKUP] = BackupData()
+    basic_websocket.async_register_websocket_handlers(hass)
+
+
+async def async_get_manager(hass: HomeAssistant) -> BackupManager:
+    """Get the backup manager instance.
+
+    Raises HomeAssistantError if the backup integration is not available.
+    """
+    if DATA_BACKUP not in hass.data:
+        raise HomeAssistantError("Backup integration is not available")
+
+    await hass.data[DATA_BACKUP].manager_ready
+    return hass.data[DATA_MANAGER]
+
+
+@callback
+def async_subscribe_events(
+    hass: HomeAssistant,
+    on_event: Callable[[ManagerStateEvent], None],
+) -> Callable[[], None]:
+    """Subscribe to backup events."""
+    backup_event_subscriptions = hass.data[DATA_BACKUP].backup_event_subscriptions
+
+    def remove_subscription() -> None:
+        backup_event_subscriptions.remove(on_event)
+
+    backup_event_subscriptions.append(on_event)
+    return remove_subscription
+
+
+@callback
+def async_subscribe_platform_events(
+    hass: HomeAssistant,
+    on_event: Callable[[BackupPlatformEvent], None],
+) -> Callable[[], None]:
+    """Subscribe to backup platform events."""
+    backup_platform_event_subscriptions = hass.data[
+        DATA_BACKUP
+    ].backup_platform_event_subscriptions
+
+    def remove_subscription() -> None:
+        backup_platform_event_subscriptions.remove(on_event)
+
+    backup_platform_event_subscriptions.append(on_event)
+    return remove_subscription
diff --git a/homeassistant/helpers/chat_session.py b/homeassistant/helpers/chat_session.py
new file mode 100644
index 00000000000..e7a4ecd2ca9
--- /dev/null
+++ b/homeassistant/helpers/chat_session.py
@@ -0,0 +1,165 @@
+"""Helper to organize chat sessions between integrations."""
+
+from __future__ import annotations
+
+from collections.abc import Generator
+from contextlib import contextmanager
+from contextvars import ContextVar
+from dataclasses import dataclass, field
+from datetime import datetime, timedelta
+import logging
+
+from homeassistant.const import EVENT_HOMEASSISTANT_STOP
+from homeassistant.core import (
+    CALLBACK_TYPE,
+    Event,
+    HassJob,
+    HassJobType,
+    HomeAssistant,
+    callback,
+)
+from homeassistant.util import dt as dt_util
+from homeassistant.util.hass_dict import HassKey
+from homeassistant.util.ulid import ulid_now, ulid_to_bytes
+
+from .event import async_call_later
+
+DATA_CHAT_SESSION: HassKey[dict[str, ChatSession]] = HassKey("chat_session")
+DATA_CHAT_SESSION_CLEANUP: HassKey[SessionCleanup] = HassKey("chat_session_cleanup")
+
+CONVERSATION_TIMEOUT = timedelta(minutes=5)
+LOGGER = logging.getLogger(__name__)
+
+current_session: ContextVar[ChatSession | None] = ContextVar(
+    "current_session", default=None
+)
+
+
+@dataclass
+class ChatSession:
+    """Represent a chat session."""
+
+    conversation_id: str
+    last_updated: datetime = field(default_factory=dt_util.utcnow)
+    _cleanup_callbacks: list[CALLBACK_TYPE] = field(default_factory=list)
+
+    @callback
+    def async_updated(self) -> None:
+        """Update the last updated time."""
+        self.last_updated = dt_util.utcnow()
+
+    @callback
+    def async_on_cleanup(self, cb: CALLBACK_TYPE) -> None:
+        """Register a callback to clean up the session."""
+        self._cleanup_callbacks.append(cb)
+
+    @callback
+    def async_cleanup(self) -> None:
+        """Call all clean up callbacks."""
+        for cb in self._cleanup_callbacks:
+            cb()
+        self._cleanup_callbacks.clear()
+
+
+class SessionCleanup:
+    """Helper to clean up the stale sessions."""
+
+    unsub: CALLBACK_TYPE | None = None
+
+    def __init__(self, hass: HomeAssistant) -> None:
+        """Initialize the session cleanup."""
+        self.hass = hass
+        hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, self._on_hass_stop)
+        self.cleanup_job = HassJob(
+            self._cleanup, "chat_session_cleanup", job_type=HassJobType.Callback
+        )
+
+    @callback
+    def schedule(self) -> None:
+        """Schedule the cleanup."""
+        if self.unsub:
+            return
+        self.unsub = async_call_later(
+            self.hass,
+            CONVERSATION_TIMEOUT.total_seconds() + 1,
+            self.cleanup_job,
+        )
+
+    @callback
+    def _on_hass_stop(self, event: Event) -> None:
+        """Cancel the cleanup on shutdown."""
+        if self.unsub:
+            self.unsub()
+        self.unsub = None
+
+    @callback
+    def _cleanup(self, now: datetime) -> None:
+        """Clean up the history and schedule follow-up if necessary."""
+        self.unsub = None
+        all_sessions = self.hass.data[DATA_CHAT_SESSION]
+
+        # We mutate original object because current commands could be
+        # yielding session based on it.
+        for conversation_id, session in list(all_sessions.items()):
+            if session.last_updated + CONVERSATION_TIMEOUT < now:
+                LOGGER.debug("Cleaning up session %s", conversation_id)
+                del all_sessions[conversation_id]
+                session.async_cleanup()
+
+        # Still conversations left, check again in timeout time.
+        if all_sessions:
+            self.schedule()
+
+
+@contextmanager
+def async_get_chat_session(
+    hass: HomeAssistant,
+    conversation_id: str | None = None,
+) -> Generator[ChatSession]:
+    """Return a chat session."""
+    if session := current_session.get():
+        # If a session is already active and it's the requested conversation ID,
+        # return that. We won't update the last updated time in this case.
+        if session.conversation_id == conversation_id:
+            yield session
+            return
+
+        # If it's not the same conversation ID, we will create a new session
+        # because it might be a conversation agent calling a tool that is talking
+        # to another LLM.
+        session = None
+
+    all_sessions = hass.data.get(DATA_CHAT_SESSION)
+    if all_sessions is None:
+        all_sessions = {}
+        hass.data[DATA_CHAT_SESSION] = all_sessions
+        hass.data[DATA_CHAT_SESSION_CLEANUP] = SessionCleanup(hass)
+
+    if conversation_id is None:
+        conversation_id = ulid_now()
+
+    elif conversation_id in all_sessions:
+        session = all_sessions[conversation_id]
+
+    else:
+        # Conversation IDs are ULIDs. We generate a new one if not provided.
+        # If an old ULID is passed in, we will generate a new one to indicate
+        # a new conversation was started. If the user picks their own, they
+        # want to track a conversation and we respect it.
+        try:
+            ulid_to_bytes(conversation_id)
+            conversation_id = ulid_now()
+        except ValueError:
+            pass
+
+    if session is None:
+        LOGGER.debug("Creating new session %s", conversation_id)
+        session = ChatSession(conversation_id)
+
+    current_session.set(session)
+    yield session
+    current_session.set(None)
+
+    session.last_updated = dt_util.utcnow()
+    all_sessions[conversation_id] = session
+    hass.data[DATA_CHAT_SESSION_CLEANUP].schedule()
diff --git a/homeassistant/helpers/check_config.py b/homeassistant/helpers/check_config.py
index a8e8fa4160d..836536da9ee 100644
--- a/homeassistant/helpers/check_config.py
+++ b/homeassistant/helpers/check_config.py
@@ -8,6 +8,7 @@ import os
 from pathlib import Path
 from typing import NamedTuple, Self
 
+from annotatedyaml import loader as yaml_loader
 import voluptuous as vol
 
 from homeassistant import loader
@@ -29,7 +30,6 @@ from homeassistant.requirements import (
     async_clear_install_history,
     async_get_integration_with_requirements,
 )
-import homeassistant.util.yaml.loader as yaml_loader
 
 from . import config_validation as cv
 from .typing import ConfigType
diff --git a/homeassistant/helpers/condition.py b/homeassistant/helpers/condition.py
index 695af80bc1c..fa2dd42589b 100644
--- a/homeassistant/helpers/condition.py
+++ b/homeassistant/helpers/condition.py
@@ -56,8 +56,8 @@ from homeassistant.exceptions import (
     TemplateError,
 )
 from homeassistant.loader import IntegrationNotFound, async_get_integration
+from homeassistant.util import dt as dt_util
 from homeassistant.util.async_ import run_callback_threadsafe
-import homeassistant.util.dt as dt_util
 
 from . import config_validation as cv, entity_registry as er
 from .sun import get_astral_event_date
diff --git a/homeassistant/helpers/config_entry_oauth2_flow.py b/homeassistant/helpers/config_entry_oauth2_flow.py
index c2a61335769..84728978ede 100644
--- a/homeassistant/helpers/config_entry_oauth2_flow.py
+++ b/homeassistant/helpers/config_entry_oauth2_flow.py
@@ -11,7 +11,9 @@ from __future__ import annotations
 from abc import ABC, ABCMeta, abstractmethod
 import asyncio
 from asyncio import Lock
+import base64
 from collections.abc import Awaitable, Callable
+import hashlib
 from http import HTTPStatus
 from json import JSONDecodeError
 import logging
@@ -55,6 +57,21 @@ OAUTH_AUTHORIZE_URL_TIMEOUT_SEC = 30
 OAUTH_TOKEN_TIMEOUT_SEC = 30
 
 
+@callback
+def async_get_redirect_uri(hass: HomeAssistant) -> str:
+    """Return the redirect uri."""
+    if "my" in hass.config.components:
+        return MY_AUTH_CALLBACK_PATH
+
+    if (req := http.current_request.get()) is None:
+        raise RuntimeError("No current request in context")
+
+    if (ha_host := req.headers.get(HEADER_FRONTEND_BASE)) is None:
+        raise RuntimeError("No header in request")
+
+    return f"{ha_host}{AUTH_CALLBACK_PATH}"
+
+
 class AbstractOAuth2Implementation(ABC):
     """Base class to abstract OAuth2 authentication."""
 
@@ -144,22 +161,18 @@ class LocalOAuth2Implementation(AbstractOAuth2Implementation):
     @property
     def redirect_uri(self) -> str:
         """Return the redirect uri."""
-        if "my" in self.hass.config.components:
-            return MY_AUTH_CALLBACK_PATH
-
-        if (req := http.current_request.get()) is None:
-            raise RuntimeError("No current request in context")
-
-        if (ha_host := req.headers.get(HEADER_FRONTEND_BASE)) is None:
-            raise RuntimeError("No header in request")
-
-        return f"{ha_host}{AUTH_CALLBACK_PATH}"
+        return async_get_redirect_uri(self.hass)
 
     @property
     def extra_authorize_data(self) -> dict:
         """Extra data that needs to be appended to the authorize url."""
         return {}
 
+    @property
+    def extra_token_resolve_data(self) -> dict:
+        """Extra data for the token resolve request."""
+        return {}
+
     async def async_generate_authorize_url(self, flow_id: str) -> str:
         """Generate a url for the user to authorize."""
         redirect_uri = self.redirect_uri
@@ -180,13 +193,13 @@ class LocalOAuth2Implementation(AbstractOAuth2Implementation):
 
     async def async_resolve_external_data(self, external_data: Any) -> dict:
         """Resolve the authorization code to tokens."""
-        return await self._token_request(
-            {
-                "grant_type": "authorization_code",
-                "code": external_data["code"],
-                "redirect_uri": external_data["state"]["redirect_uri"],
-            }
-        )
+        request_data: dict = {
+            "grant_type": "authorization_code",
+            "code": external_data["code"],
+            "redirect_uri": external_data["state"]["redirect_uri"],
+        }
+        request_data.update(self.extra_token_resolve_data)
+        return await self._token_request(request_data)
 
     async def _async_refresh_token(self, token: dict) -> dict:
         """Refresh tokens."""
@@ -205,7 +218,7 @@ class LocalOAuth2Implementation(AbstractOAuth2Implementation):
 
         data["client_id"] = self.client_id
 
-        if self.client_secret is not None:
+        if self.client_secret:
             data["client_secret"] = self.client_secret
 
         _LOGGER.debug("Sending token request to %s", self.token_url)
@@ -227,6 +240,100 @@ class LocalOAuth2Implementation(AbstractOAuth2Implementation):
         return cast(dict, await resp.json())
 
 
+class LocalOAuth2ImplementationWithPkce(LocalOAuth2Implementation):
+    """Local OAuth2 implementation with PKCE."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        domain: str,
+        client_id: str,
+        authorize_url: str,
+        token_url: str,
+        client_secret: str = "",
+        code_verifier_length: int = 128,
+    ) -> None:
+        """Initialize local auth implementation."""
+        super().__init__(
+            hass,
+            domain,
+            client_id,
+            client_secret,
+            authorize_url,
+            token_url,
+        )
+
+        # Generate code verifier
+        self.code_verifier = LocalOAuth2ImplementationWithPkce.generate_code_verifier(
+            code_verifier_length
+        )
+
+    @property
+    def extra_authorize_data(self) -> dict:
+        """Extra data that needs to be appended to the authorize url.
+
+        If you want to override this method,
+        calling super is mandatory (for adding scopes):
+        ```
+        @def extra_authorize_data(self) -> dict:
+            data: dict = {
+                "scope": "openid profile email",
+            }
+            data.update(super().extra_authorize_data)
+            return data
+        ```
+        """
+        return {
+            "code_challenge": LocalOAuth2ImplementationWithPkce.compute_code_challenge(
+                self.code_verifier
+            ),
+            "code_challenge_method": "S256",
+        }
+
+    @property
+    def extra_token_resolve_data(self) -> dict:
+        """Extra data that needs to be included in the token resolve request.
+
+        If you want to override this method,
+        calling super is mandatory (for adding `someKey`):
+        ```
+        @def extra_token_resolve_data(self) -> dict:
+            data: dict = {
+                "someKey": "someValue",
+            }
+            data.update(super().extra_token_resolve_data)
+            return data
+        ```
+        """
+
+        return {"code_verifier": self.code_verifier}
+
+    @staticmethod
+    def generate_code_verifier(code_verifier_length: int = 128) -> str:
+        """Generate a code verifier."""
+        if not 43 <= code_verifier_length <= 128:
+            msg = (
+                "Parameter `code_verifier_length` must validate"
+                "`43 <= code_verifier_length <= 128`."
+            )
+            raise ValueError(msg)
+        return secrets.token_urlsafe(96)[:code_verifier_length]
+
+    @staticmethod
+    def compute_code_challenge(code_verifier: str) -> str:
+        """Compute the code challenge."""
+        if not 43 <= len(code_verifier) <= 128:
+            msg = (
+                "Parameter `code_verifier` must validate "
+                "`43 <= len(code_verifier) <= 128`."
+            )
+            raise ValueError(msg)
+
+        hashed = hashlib.sha256(code_verifier.encode("ascii")).digest()
+        encoded = base64.urlsafe_b64encode(hashed)
+        return encoded.decode("ascii").replace("=", "")
+
+
 class AbstractOAuth2FlowHandler(config_entries.ConfigFlow, metaclass=ABCMeta):
     """Handle a config flow."""
 
diff --git a/homeassistant/helpers/config_validation.py b/homeassistant/helpers/config_validation.py
index 2c8dbe69c22..5c1a7c99565 100644
--- a/homeassistant/helpers/config_validation.py
+++ b/homeassistant/helpers/config_validation.py
@@ -107,8 +107,11 @@ from homeassistant.exceptions import HomeAssistantError, TemplateError
 from homeassistant.generated import currencies
 from homeassistant.generated.countries import COUNTRIES
 from homeassistant.generated.languages import LANGUAGES
-from homeassistant.util import raise_if_invalid_path, slugify as util_slugify
-import homeassistant.util.dt as dt_util
+from homeassistant.util import (
+    dt as dt_util,
+    raise_if_invalid_path,
+    slugify as util_slugify,
+)
 from homeassistant.util.yaml.objects import NodeStrClass
 
 from . import script_variables as script_variables_helper, template as template_helper
@@ -1150,41 +1153,6 @@ def _custom_serializer(schema: Any, *, allow_section: bool) -> Any:
     return voluptuous_serialize.UNSUPPORTED
 
 
-def expand_condition_shorthand(value: Any | None) -> Any:
-    """Expand boolean condition shorthand notations."""
-
-    if not isinstance(value, dict) or CONF_CONDITIONS in value:
-        return value
-
-    for key, schema in (
-        ("and", AND_CONDITION_SHORTHAND_SCHEMA),
-        ("or", OR_CONDITION_SHORTHAND_SCHEMA),
-        ("not", NOT_CONDITION_SHORTHAND_SCHEMA),
-    ):
-        try:
-            schema(value)
-            return {
-                CONF_CONDITION: key,
-                CONF_CONDITIONS: value[key],
-                **{k: value[k] for k in value if k != key},
-            }
-        except vol.MultipleInvalid:
-            pass
-
-    if isinstance(value.get(CONF_CONDITION), list):
-        try:
-            CONDITION_SHORTHAND_SCHEMA(value)
-            return {
-                CONF_CONDITION: "and",
-                CONF_CONDITIONS: value[CONF_CONDITION],
-                **{k: value[k] for k in value if k != CONF_CONDITION},
-            }
-        except vol.MultipleInvalid:
-            pass
-
-    return value
-
-
 # Schemas
 def empty_config_schema(domain: str) -> Callable[[dict], dict]:
     """Return a config schema which logs if there are configuration parameters."""
@@ -1680,7 +1648,43 @@ DEVICE_CONDITION_BASE_SCHEMA = vol.Schema(
 
 DEVICE_CONDITION_SCHEMA = DEVICE_CONDITION_BASE_SCHEMA.extend({}, extra=vol.ALLOW_EXTRA)
 
-dynamic_template_condition_action = vol.All(
+
+def expand_condition_shorthand(value: Any | None) -> Any:
+    """Expand boolean condition shorthand notations."""
+
+    if not isinstance(value, dict) or CONF_CONDITIONS in value:
+        return value
+
+    for key, schema in (
+        ("and", AND_CONDITION_SHORTHAND_SCHEMA),
+        ("or", OR_CONDITION_SHORTHAND_SCHEMA),
+        ("not", NOT_CONDITION_SHORTHAND_SCHEMA),
+    ):
+        try:
+            schema(value)
+            return {
+                CONF_CONDITION: key,
+                CONF_CONDITIONS: value[key],
+                **{k: value[k] for k in value if k != key},
+            }
+        except vol.MultipleInvalid:
+            pass
+
+    if isinstance(value.get(CONF_CONDITION), list):
+        try:
+            CONDITION_SHORTHAND_SCHEMA(value)
+            return {
+                CONF_CONDITION: "and",
+                CONF_CONDITIONS: value[CONF_CONDITION],
+                **{k: value[k] for k in value if k != CONF_CONDITION},
+            }
+        except vol.MultipleInvalid:
+            pass
+
+    return value
+
+
+dynamic_template_condition = vol.All(
     # Wrap a shorthand template condition in a template condition
     dynamic_template,
     lambda config: {
@@ -1721,7 +1725,7 @@ CONDITION_SCHEMA: vol.Schema = vol.Schema(
                 },
             ),
         ),
-        dynamic_template_condition_action,
+        dynamic_template_condition,
     )
 )
 
@@ -1870,12 +1874,8 @@ _SCRIPT_REPEAT_SCHEMA = vol.Schema(
                 vol.Exclusive(CONF_FOR_EACH, "repeat"): vol.Any(
                     dynamic_template, vol.All(list, template_complex)
                 ),
-                vol.Exclusive(CONF_WHILE, "repeat"): vol.All(
-                    ensure_list, [CONDITION_SCHEMA]
-                ),
-                vol.Exclusive(CONF_UNTIL, "repeat"): vol.All(
-                    ensure_list, [CONDITION_SCHEMA]
-                ),
+                vol.Exclusive(CONF_WHILE, "repeat"): CONDITIONS_SCHEMA,
+                vol.Exclusive(CONF_UNTIL, "repeat"): CONDITIONS_SCHEMA,
                 vol.Required(CONF_SEQUENCE): SCRIPT_SCHEMA,
             },
             has_at_least_one_key(CONF_COUNT, CONF_FOR_EACH, CONF_WHILE, CONF_UNTIL),
@@ -1891,9 +1891,7 @@ _SCRIPT_CHOOSE_SCHEMA = vol.Schema(
             [
                 {
                     vol.Optional(CONF_ALIAS): string,
-                    vol.Required(CONF_CONDITIONS): vol.All(
-                        ensure_list, [CONDITION_SCHEMA]
-                    ),
+                    vol.Required(CONF_CONDITIONS): CONDITIONS_SCHEMA,
                     vol.Required(CONF_SEQUENCE): SCRIPT_SCHEMA,
                 }
             ],
@@ -1914,7 +1912,7 @@ _SCRIPT_WAIT_FOR_TRIGGER_SCHEMA = vol.Schema(
 _SCRIPT_IF_SCHEMA = vol.Schema(
     {
         **SCRIPT_ACTION_BASE_SCHEMA,
-        vol.Required(CONF_IF): vol.All(ensure_list, [CONDITION_SCHEMA]),
+        vol.Required(CONF_IF): CONDITIONS_SCHEMA,
         vol.Required(CONF_THEN): SCRIPT_SCHEMA,
         vol.Optional(CONF_ELSE): SCRIPT_SCHEMA,
     }
diff --git a/homeassistant/helpers/data_entry_flow.py b/homeassistant/helpers/data_entry_flow.py
index b15d8b9e607..65eb2786aaf 100644
--- a/homeassistant/helpers/data_entry_flow.py
+++ b/homeassistant/helpers/data_entry_flow.py
@@ -17,7 +17,7 @@ from . import config_validation as cv
 
 _FlowManagerT = TypeVar(
     "_FlowManagerT",
-    bound=data_entry_flow.FlowManager[Any, Any],
+    bound=data_entry_flow.FlowManager[Any, Any, Any],
     default=data_entry_flow.FlowManager,
 )
 
@@ -70,7 +70,7 @@ class FlowManagerIndexView(_BaseFlowManagerView[_FlowManagerT]):
     async def post(self, request: web.Request, data: dict[str, Any]) -> web.Response:
         """Initialize a POST request.
 
-        Override `_post_impl` in subclasses which need
+        Override `post` and call `_post_impl` in subclasses which need
         to implement their own `RequestDataValidator`
         """
         return await self._post_impl(request, data)
diff --git a/homeassistant/helpers/debounce.py b/homeassistant/helpers/debounce.py
index 83555b56dcb..c46c6806d5d 100644
--- a/homeassistant/helpers/debounce.py
+++ b/homeassistant/helpers/debounce.py
@@ -146,6 +146,10 @@ class Debouncer[_R_co]:
         """Cancel any scheduled call, and prevent new runs."""
         self._shutdown_requested = True
         self.async_cancel()
+        # Release hard references to parent function
+        # https://github.com/home-assistant/core/issues/137237
+        self._function = None
+        self._job = None
 
     @callback
     def async_cancel(self) -> None:
diff --git a/homeassistant/helpers/deprecation.py b/homeassistant/helpers/deprecation.py
index f02c6507d02..101b9731caf 100644
--- a/homeassistant/helpers/deprecation.py
+++ b/homeassistant/helpers/deprecation.py
@@ -244,35 +244,35 @@ def _print_deprecation_warning_internal_impl(
             )
 
 
-class DeprecatedConstant(NamedTuple):
+class DeprecatedConstant[T](NamedTuple):
     """Deprecated constant."""
 
-    value: Any
+    value: T
     replacement: str
     breaks_in_ha_version: str | None
 
 
-class DeprecatedConstantEnum(NamedTuple):
+class DeprecatedConstantEnum[T: (StrEnum | IntEnum | IntFlag)](NamedTuple):
     """Deprecated constant."""
 
-    enum: StrEnum | IntEnum | IntFlag
+    enum: T
     breaks_in_ha_version: str | None
 
 
-class DeprecatedAlias(NamedTuple):
+class DeprecatedAlias[T](NamedTuple):
     """Deprecated alias."""
 
-    value: Any
+    value: T
     replacement: str
     breaks_in_ha_version: str | None
 
 
-class DeferredDeprecatedAlias:
+class DeferredDeprecatedAlias[T]:
     """Deprecated alias with deferred evaluation of the value."""
 
     def __init__(
         self,
-        value_fn: Callable[[], Any],
+        value_fn: Callable[[], T],
         replacement: str,
         breaks_in_ha_version: str | None,
     ) -> None:
@@ -282,7 +282,7 @@ class DeferredDeprecatedAlias:
         self._value_fn = value_fn
 
     @functools.cached_property
-    def value(self) -> Any:
+    def value(self) -> T:
         """Return the value."""
         return self._value_fn()
 
@@ -369,7 +369,7 @@ class EnumWithDeprecatedMembers(EnumType):
     """Enum with deprecated members."""
 
     def __new__(
-        mcs,  # noqa: N804  ruff bug, ruff does not understand this is a metaclass
+        mcs,
         cls: str,
         bases: tuple[type, ...],
         classdict: _EnumDict,
diff --git a/homeassistant/helpers/device_registry.py b/homeassistant/helpers/device_registry.py
index 685509cb29d..991a6cf5a57 100644
--- a/homeassistant/helpers/device_registry.py
+++ b/homeassistant/helpers/device_registry.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from collections import defaultdict
-from collections.abc import Mapping
+from collections.abc import Iterable, Mapping
 from datetime import datetime
 from enum import StrEnum
 from functools import lru_cache
@@ -24,11 +24,11 @@ from homeassistant.core import (
 )
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.loader import async_suggest_report_issue
+from homeassistant.util import uuid as uuid_util
 from homeassistant.util.dt import utc_from_timestamp, utcnow
 from homeassistant.util.event_type import EventType
 from homeassistant.util.hass_dict import HassKey
 from homeassistant.util.json import format_unserializable_data
-import homeassistant.util.uuid as uuid_util
 
 from . import storage, translation
 from .debounce import Debouncer
@@ -56,7 +56,7 @@ EVENT_DEVICE_REGISTRY_UPDATED: EventType[EventDeviceRegistryUpdatedData] = Event
 )
 STORAGE_KEY = "core.device_registry"
 STORAGE_VERSION_MAJOR = 1
-STORAGE_VERSION_MINOR = 8
+STORAGE_VERSION_MINOR = 9
 
 CLEANUP_DELAY = 10
 
@@ -272,6 +272,7 @@ class DeviceEntry:
 
     area_id: str | None = attr.ib(default=None)
     config_entries: set[str] = attr.ib(converter=set, factory=set)
+    config_entries_subentries: dict[str, set[str | None]] = attr.ib(factory=dict)
     configuration_url: str | None = attr.ib(default=None)
     connections: set[tuple[str, str]] = attr.ib(converter=set, factory=set)
     created_at: datetime = attr.ib(factory=utcnow)
@@ -311,6 +312,10 @@ class DeviceEntry:
             "area_id": self.area_id,
             "configuration_url": self.configuration_url,
             "config_entries": list(self.config_entries),
+            "config_entries_subentries": {
+                config_entry_id: list(subentries)
+                for config_entry_id, subentries in self.config_entries_subentries.items()
+            },
             "connections": list(self.connections),
             "created_at": self.created_at.timestamp(),
             "disabled_by": self.disabled_by,
@@ -354,7 +359,13 @@ class DeviceEntry:
             json_bytes(
                 {
                     "area_id": self.area_id,
+                    # The config_entries list can be removed from the storage
+                    # representation in HA Core 2026.2
                     "config_entries": list(self.config_entries),
+                    "config_entries_subentries": {
+                        config_entry_id: list(subentries)
+                        for config_entry_id, subentries in self.config_entries_subentries.items()
+                    },
                     "configuration_url": self.configuration_url,
                     "connections": list(self.connections),
                     "created_at": self.created_at,
@@ -384,6 +395,7 @@ class DeletedDeviceEntry:
     """Deleted Device Registry Entry."""
 
     config_entries: set[str] = attr.ib()
+    config_entries_subentries: dict[str, set[str | None]] = attr.ib()
     connections: set[tuple[str, str]] = attr.ib()
     identifiers: set[tuple[str, str]] = attr.ib()
     id: str = attr.ib()
@@ -395,6 +407,7 @@ class DeletedDeviceEntry:
     def to_device_entry(
         self,
         config_entry_id: str,
+        config_subentry_id: str | None,
         connections: set[tuple[str, str]],
         identifiers: set[tuple[str, str]],
     ) -> DeviceEntry:
@@ -402,6 +415,7 @@ class DeletedDeviceEntry:
         return DeviceEntry(
             # type ignores: likely https://github.com/python/mypy/issues/8625
             config_entries={config_entry_id},  # type: ignore[arg-type]
+            config_entries_subentries={config_entry_id: {config_subentry_id}},
             connections=self.connections & connections,  # type: ignore[arg-type]
             created_at=self.created_at,
             identifiers=self.identifiers & identifiers,  # type: ignore[arg-type]
@@ -415,7 +429,13 @@ class DeletedDeviceEntry:
         return json_fragment(
             json_bytes(
                 {
+                    # The config_entries list can be removed from the storage
+                    # representation in HA Core 2026.2
                     "config_entries": list(self.config_entries),
+                    "config_entries_subentries": {
+                        config_entry_id: list(subentries)
+                        for config_entry_id, subentries in self.config_entries_subentries.items()
+                    },
                     "connections": list(self.connections),
                     "created_at": self.created_at,
                     "identifiers": list(self.identifiers),
@@ -458,7 +478,10 @@ class DeviceRegistryStore(storage.Store[dict[str, list[dict[str, Any]]]]):
         old_data: dict[str, list[dict[str, Any]]],
     ) -> dict[str, Any]:
         """Migrate to the new version."""
-        if old_major_version < 2:
+        # Support for a future major version bump to 2 added in HA Core 2025.2.
+        # Major versions 1 and 2 will be the same, except that version 2 will no
+        # longer store a list of config_entries.
+        if old_major_version < 3:
             if old_minor_version < 2:
                 # Version 1.2 implements migration and freezes the available keys,
                 # populate keys which were introduced before version 1.2
@@ -505,8 +528,20 @@ class DeviceRegistryStore(storage.Store[dict[str, list[dict[str, Any]]]]):
                     device["created_at"] = device["modified_at"] = created_at
                 for device in old_data["deleted_devices"]:
                     device["created_at"] = device["modified_at"] = created_at
+            if old_minor_version < 9:
+                # Introduced in 2025.2
+                for device in old_data["devices"]:
+                    device["config_entries_subentries"] = {
+                        config_entry_id: {None}
+                        for config_entry_id in device["config_entries"]
+                    }
+                for device in old_data["deleted_devices"]:
+                    device["config_entries_subentries"] = {
+                        config_entry_id: {None}
+                        for config_entry_id in device["config_entries"]
+                    }
 
-        if old_major_version > 1:
+        if old_major_version > 2:
             raise NotImplementedError
         return old_data
 
@@ -561,6 +596,21 @@ class DeviceRegistryItems[_EntryTypeT: (DeviceEntry, DeletedDeviceEntry)](
                 return self._connections[connection]
         return None
 
+    def get_entries(
+        self,
+        identifiers: set[tuple[str, str]] | None,
+        connections: set[tuple[str, str]] | None,
+    ) -> Iterable[_EntryTypeT]:
+        """Get entries from identifiers or connections."""
+        if identifiers:
+            for identifier in identifiers:
+                if identifier in self._identifiers:
+                    yield self._identifiers[identifier]
+        if connections:
+            for connection in _normalize_connections(connections):
+                if connection in self._connections:
+                    yield self._connections[connection]
+
 
 class ActiveDeviceRegistryItems(DeviceRegistryItems[DeviceEntry]):
     """Container for active (non-deleted) device registry entries."""
@@ -667,6 +717,14 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
         """Check if device is deleted."""
         return self.deleted_devices.get_entry(identifiers, connections)
 
+    def _async_get_deleted_devices(
+        self,
+        identifiers: set[tuple[str, str]] | None = None,
+        connections: set[tuple[str, str]] | None = None,
+    ) -> Iterable[DeletedDeviceEntry]:
+        """List devices that are deleted."""
+        return self.deleted_devices.get_entries(identifiers, connections)
+
     def _substitute_name_placeholders(
         self,
         domain: str,
@@ -699,6 +757,7 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
         self,
         *,
         config_entry_id: str,
+        config_subentry_id: str | None | UndefinedType = UNDEFINED,
         configuration_url: str | URL | None | UndefinedType = UNDEFINED,
         connections: set[tuple[str, str]] | None | UndefinedType = UNDEFINED,
         created_at: str | datetime | UndefinedType = UNDEFINED,  # will be ignored
@@ -789,7 +848,11 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
             else:
                 self.deleted_devices.pop(deleted_device.id)
                 device = deleted_device.to_device_entry(
-                    config_entry_id, connections, identifiers
+                    config_entry_id,
+                    # Interpret not specifying a subentry as None
+                    config_subentry_id if config_subentry_id is not UNDEFINED else None,
+                    connections,
+                    identifiers,
                 )
             self.devices[device.id] = device
             # If creating a new device, default to the config entry name
@@ -823,6 +886,7 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
             device.id,
             allow_collisions=True,
             add_config_entry_id=config_entry_id,
+            add_config_subentry_id=config_subentry_id,
             configuration_url=configuration_url,
             device_info_type=device_info_type,
             disabled_by=disabled_by,
@@ -851,6 +915,7 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
         device_id: str,
         *,
         add_config_entry_id: str | UndefinedType = UNDEFINED,
+        add_config_subentry_id: str | None | UndefinedType = UNDEFINED,
         # Temporary flag so we don't blow up when collisions are implicitly introduced
         # by calls to async_get_or_create. Must not be set by integrations.
         allow_collisions: bool = False,
@@ -871,25 +936,58 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
         new_connections: set[tuple[str, str]] | UndefinedType = UNDEFINED,
         new_identifiers: set[tuple[str, str]] | UndefinedType = UNDEFINED,
         remove_config_entry_id: str | UndefinedType = UNDEFINED,
+        remove_config_subentry_id: str | None | UndefinedType = UNDEFINED,
         serial_number: str | None | UndefinedType = UNDEFINED,
         suggested_area: str | None | UndefinedType = UNDEFINED,
         sw_version: str | None | UndefinedType = UNDEFINED,
         via_device_id: str | None | UndefinedType = UNDEFINED,
     ) -> DeviceEntry | None:
-        """Update device attributes."""
+        """Update device attributes.
+
+        :param add_config_subentry_id: Add the device to a specific subentry of add_config_entry_id
+        :param remove_config_subentry_id: Remove the device from a specific subentry of remove_config_subentry_id
+        """
         old = self.devices[device_id]
 
         new_values: dict[str, Any] = {}  # Dict with new key/value pairs
         old_values: dict[str, Any] = {}  # Dict with old key/value pairs
 
         config_entries = old.config_entries
+        config_entries_subentries = old.config_entries_subentries
 
         if add_config_entry_id is not UNDEFINED:
-            if self.hass.config_entries.async_get_entry(add_config_entry_id) is None:
+            if (
+                add_config_entry := self.hass.config_entries.async_get_entry(
+                    add_config_entry_id
+                )
+            ) is None:
                 raise HomeAssistantError(
                     f"Can't link device to unknown config entry {add_config_entry_id}"
                 )
 
+        if add_config_subentry_id is not UNDEFINED:
+            if add_config_entry_id is UNDEFINED:
+                raise HomeAssistantError(
+                    "Can't add config subentry without specifying config entry"
+                )
+            if (
+                add_config_subentry_id
+                # mypy says add_config_entry can be None. That's impossible, because we
+                # raise above if that happens
+                and add_config_subentry_id not in add_config_entry.subentries  # type: ignore[union-attr]
+            ):
+                raise HomeAssistantError(
+                    f"Config entry {add_config_entry_id} has no subentry {add_config_subentry_id}"
+                )
+
+        if (
+            remove_config_subentry_id is not UNDEFINED
+            and remove_config_entry_id is UNDEFINED
+        ):
+            raise HomeAssistantError(
+                "Can't remove config subentry without specifying config entry"
+            )
+
         if not new_connections and not new_identifiers:
             raise HomeAssistantError(
                 "A device must have at least one of identifiers or connections"
@@ -920,6 +1018,10 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
             area_id = area.id
 
         if add_config_entry_id is not UNDEFINED:
+            if add_config_subentry_id is UNDEFINED:
+                # Interpret not specifying a subentry as None (the main entry)
+                add_config_subentry_id = None
+
             primary_entry_id = old.primary_config_entry
             if (
                 device_info_type == "primary"
@@ -939,25 +1041,62 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
 
             if add_config_entry_id not in old.config_entries:
                 config_entries = old.config_entries | {add_config_entry_id}
+                config_entries_subentries = old.config_entries_subentries | {
+                    add_config_entry_id: {add_config_subentry_id}
+                }
+            elif (
+                add_config_subentry_id
+                not in old.config_entries_subentries[add_config_entry_id]
+            ):
+                config_entries_subentries = old.config_entries_subentries | {
+                    add_config_entry_id: old.config_entries_subentries[
+                        add_config_entry_id
+                    ]
+                    | {add_config_subentry_id}
+                }
 
         if (
             remove_config_entry_id is not UNDEFINED
             and remove_config_entry_id in config_entries
         ):
-            if config_entries == {remove_config_entry_id}:
-                self.async_remove_device(device_id)
-                return None
+            if remove_config_subentry_id is UNDEFINED:
+                config_entries_subentries = dict(old.config_entries_subentries)
+                del config_entries_subentries[remove_config_entry_id]
+            elif (
+                remove_config_subentry_id
+                in old.config_entries_subentries[remove_config_entry_id]
+            ):
+                config_entries_subentries = old.config_entries_subentries | {
+                    remove_config_entry_id: old.config_entries_subentries[
+                        remove_config_entry_id
+                    ]
+                    - {remove_config_subentry_id}
+                }
+                if not config_entries_subentries[remove_config_entry_id]:
+                    del config_entries_subentries[remove_config_entry_id]
 
-            if remove_config_entry_id == old.primary_config_entry:
-                new_values["primary_config_entry"] = None
-                old_values["primary_config_entry"] = old.primary_config_entry
+            if remove_config_entry_id not in config_entries_subentries:
+                if config_entries == {remove_config_entry_id}:
+                    self.async_remove_device(device_id)
+                    return None
 
-            config_entries = config_entries - {remove_config_entry_id}
+                if remove_config_entry_id == old.primary_config_entry:
+                    new_values["primary_config_entry"] = None
+                    old_values["primary_config_entry"] = old.primary_config_entry
+
+                config_entries = config_entries - {remove_config_entry_id}
 
         if config_entries != old.config_entries:
             new_values["config_entries"] = config_entries
             old_values["config_entries"] = old.config_entries
 
+        if config_entries_subentries != old.config_entries_subentries:
+            new_values["config_entries_subentries"] = config_entries_subentries
+            old_values["config_entries_subentries"] = old.config_entries_subentries
+
+        added_connections: set[tuple[str, str]] | None = None
+        added_identifiers: set[tuple[str, str]] | None = None
+
         if merge_connections is not UNDEFINED:
             normalized_connections = self._validate_connections(
                 device_id,
@@ -966,6 +1105,7 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
             )
             old_connections = old.connections
             if not normalized_connections.issubset(old_connections):
+                added_connections = normalized_connections
                 new_values["connections"] = old_connections | normalized_connections
                 old_values["connections"] = old_connections
 
@@ -975,17 +1115,18 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
             )
             old_identifiers = old.identifiers
             if not merge_identifiers.issubset(old_identifiers):
+                added_identifiers = merge_identifiers
                 new_values["identifiers"] = old_identifiers | merge_identifiers
                 old_values["identifiers"] = old_identifiers
 
         if new_connections is not UNDEFINED:
-            new_values["connections"] = self._validate_connections(
+            added_connections = new_values["connections"] = self._validate_connections(
                 device_id, new_connections, False
             )
             old_values["connections"] = old.connections
 
         if new_identifiers is not UNDEFINED:
-            new_values["identifiers"] = self._validate_identifiers(
+            added_identifiers = new_values["identifiers"] = self._validate_identifiers(
                 device_id, new_identifiers, False
             )
             old_values["identifiers"] = old.identifiers
@@ -1028,6 +1169,14 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
         new = attr.evolve(old, **new_values)
         self.devices[device_id] = new
 
+        # NOTE: Once we solve the broader issue of duplicated devices, we might
+        # want to revisit it. Instead of simply removing the duplicated deleted device,
+        # we might want to merge the information from it into the non-deleted device.
+        for deleted_device in self._async_get_deleted_devices(
+            added_identifiers, added_connections
+        ):
+            del self.deleted_devices[deleted_device.id]
+
         # If its only run time attributes (suggested_area)
         # that do not get saved we do not want to write
         # to disk or fire an event as we would end up
@@ -1102,6 +1251,7 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
         device = self.devices.pop(device_id)
         self.deleted_devices[device_id] = DeletedDeviceEntry(
             config_entries=device.config_entries,
+            config_entries_subentries=device.config_entries_subentries,
             connections=device.connections,
             created_at=device.created_at,
             identifiers=device.identifiers,
@@ -1132,7 +1282,13 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
             for device in data["devices"]:
                 devices[device["id"]] = DeviceEntry(
                     area_id=device["area_id"],
-                    config_entries=set(device["config_entries"]),
+                    config_entries=set(device["config_entries_subentries"]),
+                    config_entries_subentries={
+                        config_entry_id: set(subentries)
+                        for config_entry_id, subentries in device[
+                            "config_entries_subentries"
+                        ].items()
+                    },
                     configuration_url=device["configuration_url"],
                     # type ignores (if tuple arg was cast): likely https://github.com/python/mypy/issues/8625
                     connections={
@@ -1172,6 +1328,12 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
             for device in data["deleted_devices"]:
                 deleted_devices[device["id"]] = DeletedDeviceEntry(
                     config_entries=set(device["config_entries"]),
+                    config_entries_subentries={
+                        config_entry_id: set(subentries)
+                        for config_entry_id, subentries in device[
+                            "config_entries_subentries"
+                        ].items()
+                    },
                     connections={tuple(conn) for conn in device["connections"]},
                     created_at=datetime.fromisoformat(device["created_at"]),
                     identifiers={tuple(iden) for iden in device["identifiers"]},
@@ -1207,14 +1369,70 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
             if config_entries == {config_entry_id}:
                 # Add a time stamp when the deleted device became orphaned
                 self.deleted_devices[deleted_device.id] = attr.evolve(
-                    deleted_device, orphaned_timestamp=now_time, config_entries=set()
+                    deleted_device,
+                    orphaned_timestamp=now_time,
+                    config_entries=set(),
+                    config_entries_subentries={},
                 )
             else:
                 config_entries = config_entries - {config_entry_id}
+                config_entries_subentries = dict(
+                    deleted_device.config_entries_subentries
+                )
+                del config_entries_subentries[config_entry_id]
                 # No need to reindex here since we currently
                 # do not have a lookup by config entry
                 self.deleted_devices[deleted_device.id] = attr.evolve(
-                    deleted_device, config_entries=config_entries
+                    deleted_device,
+                    config_entries=config_entries,
+                    config_entries_subentries=config_entries_subentries,
+                )
+            self.async_schedule_save()
+
+    @callback
+    def async_clear_config_subentry(
+        self, config_entry_id: str, config_subentry_id: str
+    ) -> None:
+        """Clear config entry from registry entries."""
+        now_time = time.time()
+        now_time = time.time()
+        for device in self.devices.get_devices_for_config_entry_id(config_entry_id):
+            self.async_update_device(
+                device.id,
+                remove_config_entry_id=config_entry_id,
+                remove_config_subentry_id=config_subentry_id,
+            )
+        for deleted_device in list(self.deleted_devices.values()):
+            config_entries = deleted_device.config_entries
+            config_entries_subentries = deleted_device.config_entries_subentries
+            if (
+                config_entry_id not in config_entries_subentries
+                or config_subentry_id not in config_entries_subentries[config_entry_id]
+            ):
+                continue
+            if config_entries_subentries == {config_entry_id: {config_subentry_id}}:
+                # We're removing the last config subentry from the last config
+                # entry, add a time stamp when the deleted device became orphaned
+                self.deleted_devices[deleted_device.id] = attr.evolve(
+                    deleted_device,
+                    orphaned_timestamp=now_time,
+                    config_entries=set(),
+                    config_entries_subentries={},
+                )
+            else:
+                config_entries_subentries = config_entries_subentries | {
+                    config_entry_id: config_entries_subentries[config_entry_id]
+                    - {config_subentry_id}
+                }
+                if not config_entries_subentries[config_entry_id]:
+                    del config_entries_subentries[config_entry_id]
+                    config_entries = config_entries - {config_entry_id}
+                # No need to reindex here since we currently
+                # do not have a lookup by config entry
+                self.deleted_devices[deleted_device.id] = attr.evolve(
+                    deleted_device,
+                    config_entries=config_entries,
+                    config_entries_subentries=config_entries_subentries,
                 )
             self.async_schedule_save()
 
diff --git a/homeassistant/helpers/entity.py b/homeassistant/helpers/entity.py
index 2b9f2d7069e..bdcda58c054 100644
--- a/homeassistant/helpers/entity.py
+++ b/homeassistant/helpers/entity.py
@@ -281,7 +281,7 @@ class CachedProperties(type):
     """
 
     def __new__(
-        mcs,  # noqa: N804  ruff bug, ruff does not understand this is a metaclass
+        mcs,
         name: str,
         bases: tuple[type, ...],
         namespace: dict[Any, Any],
@@ -1085,9 +1085,9 @@ class Entity(
         state = self._stringify_state(available)
         if available:
             if state_attributes := self.state_attributes:
-                attr.update(state_attributes)
+                attr |= state_attributes
             if extra_state_attributes := self.extra_state_attributes:
-                attr.update(extra_state_attributes)
+                attr |= extra_state_attributes
 
         if (unit_of_measurement := self.unit_of_measurement) is not None:
             attr[ATTR_UNIT_OF_MEASUREMENT] = unit_of_measurement
@@ -1214,7 +1214,7 @@ class Entity(
         else:
             # Overwrite properties that have been set in the config file.
             if custom := customize.get(entity_id):
-                attr.update(custom)
+                attr |= custom
 
         if (
             self._context_set is not None
diff --git a/homeassistant/helpers/entity_platform.py b/homeassistant/helpers/entity_platform.py
index 0d7614c569c..11a9786f86e 100644
--- a/homeassistant/helpers/entity_platform.py
+++ b/homeassistant/helpers/entity_platform.py
@@ -80,6 +80,22 @@ class AddEntitiesCallback(Protocol):
         """Define add_entities type."""
 
 
+class AddConfigEntryEntitiesCallback(Protocol):
+    """Protocol type for EntityPlatform.add_entities callback."""
+
+    def __call__(
+        self,
+        new_entities: Iterable[Entity],
+        update_before_add: bool = False,
+        *,
+        config_subentry_id: str | None = None,
+    ) -> None:
+        """Define add_entities type.
+
+        :param config_subentry_id: subentry which the entities should be added to
+        """
+
+
 class EntityPlatformModule(Protocol):
     """Protocol type for entity platform modules."""
 
@@ -105,7 +121,7 @@ class EntityPlatformModule(Protocol):
         self,
         hass: HomeAssistant,
         entry: config_entries.ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up an integration platform from a config entry."""
 
@@ -426,11 +442,12 @@ class EntityPlatform:
                 type(exc).__name__,
             )
             return False
-        except Exception:
+        except Exception as exc:
             logger.exception(
-                "Error while setting up %s platform for %s",
+                "Error while setting up %s platform for %s: %s",
                 self.platform_name,
                 self.domain,
+                exc,  # noqa: TRY401
             )
             return False
         else:
@@ -516,13 +533,21 @@ class EntityPlatform:
 
     @callback
     def _async_schedule_add_entities_for_entry(
-        self, new_entities: Iterable[Entity], update_before_add: bool = False
+        self,
+        new_entities: Iterable[Entity],
+        update_before_add: bool = False,
+        *,
+        config_subentry_id: str | None = None,
     ) -> None:
         """Schedule adding entities for a single platform async and track the task."""
         assert self.config_entry
         task = self.config_entry.async_create_task(
             self.hass,
-            self.async_add_entities(new_entities, update_before_add=update_before_add),
+            self.async_add_entities(
+                new_entities,
+                update_before_add=update_before_add,
+                config_subentry_id=config_subentry_id,
+            ),
             f"EntityPlatform async_add_entities_for_entry {self.domain}.{self.platform_name}",
             eager_start=True,
         )
@@ -624,12 +649,27 @@ class EntityPlatform:
             )
 
     async def async_add_entities(
-        self, new_entities: Iterable[Entity], update_before_add: bool = False
+        self,
+        new_entities: Iterable[Entity],
+        update_before_add: bool = False,
+        *,
+        config_subentry_id: str | None = None,
     ) -> None:
         """Add entities for a single platform async.
 
         This method must be run in the event loop.
+
+        :param config_subentry_id: subentry which the entities should be added to
         """
+        if config_subentry_id and (
+            not self.config_entry
+            or config_subentry_id not in self.config_entry.subentries
+        ):
+            raise HomeAssistantError(
+                f"Can't add entities to unknown subentry {config_subentry_id} of config "
+                f"entry {self.config_entry.entry_id if self.config_entry else None}"
+            )
+
         # handle empty list from component/platform
         if not new_entities:  # type: ignore[truthy-iterable]
             return
@@ -640,7 +680,9 @@ class EntityPlatform:
         entities: list[Entity] = []
         for entity in new_entities:
             coros.append(
-                self._async_add_entity(entity, update_before_add, entity_registry)
+                self._async_add_entity(
+                    entity, update_before_add, entity_registry, config_subentry_id
+                )
             )
             entities.append(entity)
 
@@ -719,6 +761,7 @@ class EntityPlatform:
         entity: Entity,
         update_before_add: bool,
         entity_registry: EntityRegistry,
+        config_subentry_id: str | None,
     ) -> None:
         """Add an entity to the platform."""
         if entity is None:
@@ -778,6 +821,7 @@ class EntityPlatform:
                 try:
                     device = dev_reg.async_get(self.hass).async_get_or_create(
                         config_entry_id=self.config_entry.entry_id,
+                        config_subentry_id=config_subentry_id,
                         **device_info,
                     )
                 except dev_reg.DeviceInfoError as exc:
@@ -824,6 +868,7 @@ class EntityPlatform:
                 entity.unique_id,
                 capabilities=entity.capability_attributes,
                 config_entry=self.config_entry,
+                config_subentry_id=config_subentry_id,
                 device_id=device.id if device else None,
                 disabled_by=disabled_by,
                 entity_category=entity.entity_category,
diff --git a/homeassistant/helpers/entity_registry.py b/homeassistant/helpers/entity_registry.py
index 7300b148c77..684d00fe344 100644
--- a/homeassistant/helpers/entity_registry.py
+++ b/homeassistant/helpers/entity_registry.py
@@ -79,16 +79,14 @@ EVENT_ENTITY_REGISTRY_UPDATED: EventType[EventEntityRegistryUpdatedData] = Event
 _LOGGER = logging.getLogger(__name__)
 
 STORAGE_VERSION_MAJOR = 1
-STORAGE_VERSION_MINOR = 15
+STORAGE_VERSION_MINOR = 16
 STORAGE_KEY = "core.entity_registry"
 
 CLEANUP_INTERVAL = 3600 * 24
 ORPHANED_ENTITY_KEEP_SECONDS = 3600 * 24 * 30
 
 ENTITY_CATEGORY_VALUE_TO_INDEX: dict[EntityCategory | None, int] = {
-    # mypy does not understand strenum
-    val: idx  # type: ignore[misc]
-    for idx, val in enumerate(EntityCategory)
+    val: idx for idx, val in enumerate(EntityCategory)
 }
 ENTITY_CATEGORY_INDEX_TO_VALUE = dict(enumerate(EntityCategory))
 
@@ -179,6 +177,7 @@ class RegistryEntry:
     categories: dict[str, str] = attr.ib(factory=dict)
     capabilities: Mapping[str, Any] | None = attr.ib(default=None)
     config_entry_id: str | None = attr.ib(default=None)
+    config_subentry_id: str | None = attr.ib(default=None)
     created_at: datetime = attr.ib(factory=utcnow)
     device_class: str | None = attr.ib(default=None)
     device_id: str | None = attr.ib(default=None)
@@ -282,6 +281,7 @@ class RegistryEntry:
             "area_id": self.area_id,
             "categories": self.categories,
             "config_entry_id": self.config_entry_id,
+            "config_subentry_id": self.config_subentry_id,
             "created_at": self.created_at.timestamp(),
             "device_id": self.device_id,
             "disabled_by": self.disabled_by,
@@ -343,6 +343,7 @@ class RegistryEntry:
                     "categories": self.categories,
                     "capabilities": self.capabilities,
                     "config_entry_id": self.config_entry_id,
+                    "config_subentry_id": self.config_subentry_id,
                     "created_at": self.created_at,
                     "device_class": self.device_class,
                     "device_id": self.device_id,
@@ -407,6 +408,7 @@ class DeletedRegistryEntry:
     unique_id: str = attr.ib()
     platform: str = attr.ib()
     config_entry_id: str | None = attr.ib()
+    config_subentry_id: str | None = attr.ib()
     domain: str = attr.ib(init=False, repr=False)
     id: str = attr.ib()
     orphaned_timestamp: float | None = attr.ib()
@@ -426,6 +428,7 @@ class DeletedRegistryEntry:
             json_bytes(
                 {
                     "config_entry_id": self.config_entry_id,
+                    "config_subentry_id": self.config_subentry_id,
                     "created_at": self.created_at,
                     "entity_id": self.entity_id,
                     "id": self.id,
@@ -541,6 +544,13 @@ class EntityRegistryStore(storage.Store[dict[str, list[dict[str, Any]]]]):
                 for entity in data["deleted_entities"]:
                     entity["created_at"] = entity["modified_at"] = created_at
 
+            if old_minor_version < 16:
+                # Version 1.16 adds config_subentry_id
+                for entity in data["entities"]:
+                    entity["config_subentry_id"] = None
+                for entity in data["deleted_entities"]:
+                    entity["config_subentry_id"] = None
+
         if old_major_version > 1:
             raise NotImplementedError
         return data
@@ -649,10 +659,12 @@ def _validate_item(
     platform: str,
     *,
     config_entry_id: str | None | UndefinedType = None,
+    config_subentry_id: str | None | UndefinedType = None,
     device_id: str | None | UndefinedType = None,
     disabled_by: RegistryEntryDisabler | None | UndefinedType = None,
     entity_category: EntityCategory | None | UndefinedType = None,
     hidden_by: RegistryEntryHider | None | UndefinedType = None,
+    old_config_subentry_id: str | None = None,
     report_non_string_unique_id: bool = True,
     unique_id: str | Hashable | UndefinedType | Any,
 ) -> None:
@@ -678,6 +690,26 @@ def _validate_item(
             raise ValueError(
                 f"Can't link entity to unknown config entry {config_entry_id}"
             )
+    if (
+        config_entry_id
+        and config_entry_id is not UNDEFINED
+        and old_config_subentry_id
+        and config_subentry_id is UNDEFINED
+    ):
+        raise ValueError("Can't change config entry without changing subentry")
+    if (
+        config_entry_id
+        and config_entry_id is not UNDEFINED
+        and config_subentry_id
+        and config_subentry_id is not UNDEFINED
+    ):
+        if (
+            not (config_entry := hass.config_entries.async_get_entry(config_entry_id))
+            or config_subentry_id not in config_entry.subentries
+        ):
+            raise ValueError(
+                f"Config entry {config_entry_id} has no subentry {config_subentry_id}"
+            )
     if device_id and device_id is not UNDEFINED:
         device_registry = dr.async_get(hass)
         if not device_registry.async_get(device_id):
@@ -828,6 +860,7 @@ class EntityRegistry(BaseRegistry):
         # Data that we want entry to have
         capabilities: Mapping[str, Any] | None | UndefinedType = UNDEFINED,
         config_entry: ConfigEntry | None | UndefinedType = UNDEFINED,
+        config_subentry_id: str | None | UndefinedType = UNDEFINED,
         device_id: str | None | UndefinedType = UNDEFINED,
         entity_category: EntityCategory | UndefinedType | None = UNDEFINED,
         has_entity_name: bool | UndefinedType = UNDEFINED,
@@ -854,6 +887,7 @@ class EntityRegistry(BaseRegistry):
                 entity_id,
                 capabilities=capabilities,
                 config_entry_id=config_entry_id,
+                config_subentry_id=config_subentry_id,
                 device_id=device_id,
                 entity_category=entity_category,
                 has_entity_name=has_entity_name,
@@ -871,6 +905,7 @@ class EntityRegistry(BaseRegistry):
             domain,
             platform,
             config_entry_id=config_entry_id,
+            config_subentry_id=config_subentry_id,
             device_id=device_id,
             disabled_by=disabled_by,
             entity_category=entity_category,
@@ -909,6 +944,7 @@ class EntityRegistry(BaseRegistry):
         entry = RegistryEntry(
             capabilities=none_if_undefined(capabilities),
             config_entry_id=none_if_undefined(config_entry_id),
+            config_subentry_id=none_if_undefined(config_subentry_id),
             created_at=created_at,
             device_id=none_if_undefined(device_id),
             disabled_by=disabled_by,
@@ -951,6 +987,7 @@ class EntityRegistry(BaseRegistry):
         orphaned_timestamp = None if config_entry_id else time.time()
         self.deleted_entities[key] = DeletedRegistryEntry(
             config_entry_id=config_entry_id,
+            config_subentry_id=entity.config_subentry_id,
             created_at=entity.created_at,
             entity_id=entity_id,
             id=entity.id,
@@ -1010,6 +1047,20 @@ class EntityRegistry(BaseRegistry):
             ):
                 self.async_remove(entity.entity_id)
 
+        # Remove entities which belong to config subentries no longer associated with the
+        # device
+        entities = async_entries_for_device(
+            self, event.data["device_id"], include_disabled_entities=True
+        )
+        for entity in entities:
+            if (
+                (config_entry_id := entity.config_entry_id) is not None
+                and config_entry_id in device.config_entries
+                and entity.config_subentry_id
+                not in device.config_entries_subentries[config_entry_id]
+            ):
+                self.async_remove(entity.entity_id)
+
         # Re-enable disabled entities if the device is no longer disabled
         if not device.disabled:
             entities = async_entries_for_device(
@@ -1043,6 +1094,7 @@ class EntityRegistry(BaseRegistry):
         categories: dict[str, str] | UndefinedType = UNDEFINED,
         capabilities: Mapping[str, Any] | None | UndefinedType = UNDEFINED,
         config_entry_id: str | None | UndefinedType = UNDEFINED,
+        config_subentry_id: str | None | UndefinedType = UNDEFINED,
         device_class: str | None | UndefinedType = UNDEFINED,
         device_id: str | None | UndefinedType = UNDEFINED,
         disabled_by: RegistryEntryDisabler | None | UndefinedType = UNDEFINED,
@@ -1075,6 +1127,7 @@ class EntityRegistry(BaseRegistry):
             ("categories", categories),
             ("capabilities", capabilities),
             ("config_entry_id", config_entry_id),
+            ("config_subentry_id", config_subentry_id),
             ("device_class", device_class),
             ("device_id", device_id),
             ("disabled_by", disabled_by),
@@ -1104,10 +1157,12 @@ class EntityRegistry(BaseRegistry):
                 old.domain,
                 old.platform,
                 config_entry_id=config_entry_id,
+                config_subentry_id=config_subentry_id,
                 device_id=device_id,
                 disabled_by=disabled_by,
                 entity_category=entity_category,
                 hidden_by=hidden_by,
+                old_config_subentry_id=old.config_subentry_id,
                 unique_id=new_unique_id,
             )
 
@@ -1172,6 +1227,7 @@ class EntityRegistry(BaseRegistry):
         categories: dict[str, str] | UndefinedType = UNDEFINED,
         capabilities: Mapping[str, Any] | None | UndefinedType = UNDEFINED,
         config_entry_id: str | None | UndefinedType = UNDEFINED,
+        config_subentry_id: str | None | UndefinedType = UNDEFINED,
         device_class: str | None | UndefinedType = UNDEFINED,
         device_id: str | None | UndefinedType = UNDEFINED,
         disabled_by: RegistryEntryDisabler | None | UndefinedType = UNDEFINED,
@@ -1198,6 +1254,7 @@ class EntityRegistry(BaseRegistry):
             categories=categories,
             capabilities=capabilities,
             config_entry_id=config_entry_id,
+            config_subentry_id=config_subentry_id,
             device_class=device_class,
             device_id=device_id,
             disabled_by=disabled_by,
@@ -1224,6 +1281,7 @@ class EntityRegistry(BaseRegistry):
         new_platform: str,
         *,
         new_config_entry_id: str | UndefinedType = UNDEFINED,
+        new_config_subentry_id: str | UndefinedType = UNDEFINED,
         new_unique_id: str | UndefinedType = UNDEFINED,
         new_device_id: str | None | UndefinedType = UNDEFINED,
     ) -> RegistryEntry:
@@ -1248,6 +1306,7 @@ class EntityRegistry(BaseRegistry):
             entity_id,
             new_unique_id=new_unique_id,
             config_entry_id=new_config_entry_id,
+            config_subentry_id=new_config_subentry_id,
             device_id=new_device_id,
             platform=new_platform,
         )
@@ -1310,6 +1369,7 @@ class EntityRegistry(BaseRegistry):
                     categories=entity["categories"],
                     capabilities=entity["capabilities"],
                     config_entry_id=entity["config_entry_id"],
+                    config_subentry_id=entity["config_subentry_id"],
                     created_at=datetime.fromisoformat(entity["created_at"]),
                     device_class=entity["device_class"],
                     device_id=entity["device_id"],
@@ -1359,6 +1419,7 @@ class EntityRegistry(BaseRegistry):
                 )
                 deleted_entities[key] = DeletedRegistryEntry(
                     config_entry_id=entity["config_entry_id"],
+                    config_subentry_id=entity["config_subentry_id"],
                     created_at=datetime.fromisoformat(entity["created_at"]),
                     entity_id=entity["entity_id"],
                     id=entity["id"],
@@ -1417,6 +1478,30 @@ class EntityRegistry(BaseRegistry):
             )
             self.async_schedule_save()
 
+    @callback
+    def async_clear_config_subentry(
+        self, config_entry_id: str, config_subentry_id: str
+    ) -> None:
+        """Clear config subentry from registry entries."""
+        now_time = time.time()
+        for entity_id in [
+            entry.entity_id
+            for entry in self.entities.get_entries_for_config_entry_id(config_entry_id)
+            if entry.config_subentry_id == config_subentry_id
+        ]:
+            self.async_remove(entity_id)
+        for key, deleted_entity in list(self.deleted_entities.items()):
+            if config_subentry_id != deleted_entity.config_subentry_id:
+                continue
+            # Add a time stamp when the deleted entity became orphaned
+            self.deleted_entities[key] = attr.evolve(
+                deleted_entity,
+                orphaned_timestamp=now_time,
+                config_entry_id=None,
+                config_subentry_id=None,
+            )
+            self.async_schedule_save()
+
     @callback
     def async_purge_expired_orphaned_entities(self) -> None:
         """Purge expired orphaned entities from the registry.
diff --git a/homeassistant/helpers/floor_registry.py b/homeassistant/helpers/floor_registry.py
index fcfca8e3212..186ad2b31f7 100644
--- a/homeassistant/helpers/floor_registry.py
+++ b/homeassistant/helpers/floor_registry.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from collections import defaultdict
 from collections.abc import Iterable
 import dataclasses
 from dataclasses import dataclass
@@ -16,8 +17,9 @@ from homeassistant.util.hass_dict import HassKey
 from .normalized_name_base_registry import (
     NormalizedNameBaseRegistryEntry,
     NormalizedNameBaseRegistryItems,
+    normalize_name,
 )
-from .registry import BaseRegistry
+from .registry import BaseRegistry, RegistryIndexType
 from .singleton import singleton
 from .storage import Store
 from .typing import UNDEFINED, UndefinedType
@@ -92,10 +94,43 @@ class FloorRegistryStore(Store[FloorRegistryStoreData]):
         return old_data  # type: ignore[return-value]
 
 
+class FloorRegistryItems(NormalizedNameBaseRegistryItems[FloorEntry]):
+    """Class to hold floor registry items."""
+
+    def __init__(self) -> None:
+        """Initialize the floor registry items."""
+        super().__init__()
+        self._aliases_index: RegistryIndexType = defaultdict(dict)
+
+    def _index_entry(self, key: str, entry: FloorEntry) -> None:
+        """Index an entry."""
+        super()._index_entry(key, entry)
+        for alias in entry.aliases:
+            normalized_alias = normalize_name(alias)
+            self._aliases_index[normalized_alias][key] = True
+
+    def _unindex_entry(
+        self, key: str, replacement_entry: FloorEntry | None = None
+    ) -> None:
+        # always call base class before other indices
+        super()._unindex_entry(key, replacement_entry)
+        entry = self.data[key]
+        if aliases := entry.aliases:
+            for alias in aliases:
+                normalized_alias = normalize_name(alias)
+                self._unindex_entry_value(key, normalized_alias, self._aliases_index)
+
+    def get_floors_for_alias(self, alias: str) -> list[FloorEntry]:
+        """Get floors for alias."""
+        data = self.data
+        normalized_alias = normalize_name(alias)
+        return [data[key] for key in self._aliases_index.get(normalized_alias, ())]
+
+
 class FloorRegistry(BaseRegistry[FloorRegistryStoreData]):
     """Class to hold a registry of floors."""
 
-    floors: NormalizedNameBaseRegistryItems[FloorEntry]
+    floors: FloorRegistryItems
     _floor_data: dict[str, FloorEntry]
 
     def __init__(self, hass: HomeAssistant) -> None:
@@ -123,6 +158,11 @@ class FloorRegistry(BaseRegistry[FloorRegistryStoreData]):
         """Get floor by name."""
         return self.floors.get_by_name(name)
 
+    @callback
+    def async_get_floors_by_alias(self, alias: str) -> list[FloorEntry]:
+        """Get floors by alias."""
+        return self.floors.get_floors_for_alias(alias)
+
     @callback
     def async_list_floors(self) -> Iterable[FloorEntry]:
         """Get all floors."""
@@ -226,7 +266,7 @@ class FloorRegistry(BaseRegistry[FloorRegistryStoreData]):
     async def async_load(self) -> None:
         """Load the floor registry."""
         data = await self._store.async_load()
-        floors = NormalizedNameBaseRegistryItems[FloorEntry]()
+        floors = FloorRegistryItems()
 
         if data is not None:
             for floor in data["floors"]:
diff --git a/homeassistant/helpers/frame.py b/homeassistant/helpers/frame.py
index f33f8407e47..ca7b097d90d 100644
--- a/homeassistant/helpers/frame.py
+++ b/homeassistant/helpers/frame.py
@@ -10,18 +10,20 @@ import functools
 import linecache
 import logging
 import sys
+import threading
 from types import FrameType
 from typing import Any, cast
 
 from propcache.api import cached_property
 
-from homeassistant.core import HomeAssistant, async_get_hass_or_none
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.loader import (
     Integration,
     async_get_issue_integration,
     async_suggest_report_issue,
 )
+from homeassistant.util.async_ import run_callback_threadsafe
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -29,6 +31,21 @@ _LOGGER = logging.getLogger(__name__)
 _REPORTED_INTEGRATIONS: set[str] = set()
 
 
+class _Hass:
+    """Container which makes a HomeAssistant instance available to frame helper."""
+
+    hass: HomeAssistant | None = None
+
+
+_hass = _Hass()
+
+
+@callback
+def async_setup(hass: HomeAssistant) -> None:
+    """Set up the frame helper."""
+    _hass.hass = hass
+
+
 @dataclass(kw_only=True)
 class IntegrationFrame:
     """Integration frame container."""
@@ -133,44 +150,6 @@ class MissingIntegrationFrame(HomeAssistantError):
     """Raised when no integration is found in the frame."""
 
 
-def report(
-    what: str,
-    *,
-    exclude_integrations: set[str] | None = None,
-    error_if_core: bool = True,
-    error_if_integration: bool = False,
-    level: int = logging.WARNING,
-    log_custom_component_only: bool = False,
-) -> None:
-    """Report incorrect usage.
-
-    If error_if_core is True, raise instead of log if an integration is not found
-    when unwinding the stack frame.
-    If error_if_integration is True, raise instead of log if an integration is found
-    when unwinding the stack frame.
-    """
-    core_behavior = ReportBehavior.ERROR if error_if_core else ReportBehavior.LOG
-    core_integration_behavior = (
-        ReportBehavior.ERROR if error_if_integration else ReportBehavior.LOG
-    )
-    custom_integration_behavior = core_integration_behavior
-
-    if log_custom_component_only:
-        if core_behavior is ReportBehavior.LOG:
-            core_behavior = ReportBehavior.IGNORE
-        if core_integration_behavior is ReportBehavior.LOG:
-            core_integration_behavior = ReportBehavior.IGNORE
-
-    report_usage(
-        what,
-        core_behavior=core_behavior,
-        core_integration_behavior=core_integration_behavior,
-        custom_integration_behavior=custom_integration_behavior,
-        exclude_integrations=exclude_integrations,
-        level=level,
-    )
-
-
 class ReportBehavior(enum.Enum):
     """Enum for behavior on code usage."""
 
@@ -201,18 +180,49 @@ def report_usage(
     breaking version
     :param exclude_integrations: skip specified integration when reviewing the stack.
     If no integration is found, the core behavior will be applied
-    :param integration_domain: fallback for identifying the integration if the
-    frame is not found
+    :param integration_domain: domain of the integration causing the issue. If None, the
+    stack frame will be searched to identify the integration causing the issue.
     """
-    try:
-        integration_frame = get_integration_frame(
-            exclude_integrations=exclude_integrations
-        )
-    except MissingIntegrationFrame as err:
-        if integration := async_get_issue_integration(
-            hass := async_get_hass_or_none(), integration_domain
-        ):
-            _report_integration_domain(
+    if (hass := _hass.hass) is None:
+        raise RuntimeError("Frame helper not set up")
+    _report_usage_partial = functools.partial(
+        _report_usage,
+        hass,
+        what,
+        breaks_in_ha_version=breaks_in_ha_version,
+        core_behavior=core_behavior,
+        core_integration_behavior=core_integration_behavior,
+        custom_integration_behavior=custom_integration_behavior,
+        exclude_integrations=exclude_integrations,
+        integration_domain=integration_domain,
+        level=level,
+    )
+    if hass.loop_thread_id != threading.get_ident():
+        future = run_callback_threadsafe(hass.loop, _report_usage_partial)
+        future.result()
+        return
+    _report_usage_partial()
+
+
+def _report_usage(
+    hass: HomeAssistant,
+    what: str,
+    *,
+    breaks_in_ha_version: str | None,
+    core_behavior: ReportBehavior,
+    core_integration_behavior: ReportBehavior,
+    custom_integration_behavior: ReportBehavior,
+    exclude_integrations: set[str] | None,
+    integration_domain: str | None,
+    level: int,
+) -> None:
+    """Report incorrect code usage.
+
+    Must be called from the event loop.
+    """
+    if integration_domain:
+        if integration := async_get_issue_integration(hass, integration_domain):
+            _report_usage_integration_domain(
                 hass,
                 what,
                 breaks_in_ha_version,
@@ -222,16 +232,15 @@ def report_usage(
                 level,
             )
             return
-        msg = f"Detected code that {what}. Please report this issue"
-        if core_behavior is ReportBehavior.ERROR:
-            raise RuntimeError(msg) from err
-        if core_behavior is ReportBehavior.LOG:
-            if breaks_in_ha_version:
-                msg = (
-                    f"Detected code that {what}. This will stop working in Home "
-                    f"Assistant {breaks_in_ha_version}, please report this issue"
-                )
-            _LOGGER.warning(msg, stack_info=True)
+        _report_usage_no_integration(what, core_behavior, breaks_in_ha_version, None)
+        return
+
+    try:
+        integration_frame = get_integration_frame(
+            exclude_integrations=exclude_integrations
+        )
+    except MissingIntegrationFrame as err:
+        _report_usage_no_integration(what, core_behavior, breaks_in_ha_version, err)
         return
 
     integration_behavior = core_integration_behavior
@@ -239,7 +248,8 @@ def report_usage(
         integration_behavior = custom_integration_behavior
 
     if integration_behavior is not ReportBehavior.IGNORE:
-        _report_integration_frame(
+        _report_usage_integration_frame(
+            hass,
             what,
             breaks_in_ha_version,
             integration_frame,
@@ -248,7 +258,7 @@ def report_usage(
         )
 
 
-def _report_integration_domain(
+def _report_usage_integration_domain(
     hass: HomeAssistant | None,
     what: str,
     breaks_in_ha_version: str | None,
@@ -298,7 +308,8 @@ def _report_integration_domain(
         )
 
 
-def _report_integration_frame(
+def _report_usage_integration_frame(
+    hass: HomeAssistant,
     what: str,
     breaks_in_ha_version: str | None,
     integration_frame: IntegrationFrame,
@@ -316,7 +327,7 @@ def _report_integration_frame(
     _REPORTED_INTEGRATIONS.add(key)
 
     report_issue = async_suggest_report_issue(
-        async_get_hass_or_none(),
+        hass,
         integration_domain=integration_frame.integration,
         module=integration_frame.module,
     )
@@ -346,31 +357,55 @@ def _report_integration_frame(
     )
 
 
+def _report_usage_no_integration(
+    what: str,
+    core_behavior: ReportBehavior,
+    breaks_in_ha_version: str | None,
+    err: MissingIntegrationFrame | None,
+) -> None:
+    """Report incorrect usage without an integration.
+
+    This could happen because the offending call happened outside of an integration,
+    or because the integration could not be identified.
+    """
+    msg = f"Detected code that {what}. Please report this issue"
+    if core_behavior is ReportBehavior.ERROR:
+        raise RuntimeError(msg) from err
+    if core_behavior is ReportBehavior.LOG:
+        if breaks_in_ha_version:
+            msg = (
+                f"Detected code that {what}. This will stop working in Home "
+                f"Assistant {breaks_in_ha_version}, please report this issue"
+            )
+        _LOGGER.warning(msg, stack_info=True)
+
+
 def warn_use[_CallableT: Callable](func: _CallableT, what: str) -> _CallableT:
     """Mock a function to warn when it was about to be used."""
     if asyncio.iscoroutinefunction(func):
 
         @functools.wraps(func)
         async def report_use(*args: Any, **kwargs: Any) -> None:
-            report(what)
+            report_usage(what)
 
     else:
 
         @functools.wraps(func)
         def report_use(*args: Any, **kwargs: Any) -> None:
-            report(what)
+            report_usage(what)
 
     return cast(_CallableT, report_use)
 
 
 def report_non_thread_safe_operation(what: str) -> None:
     """Report a non-thread safe operation."""
-    report(
+    report_usage(
         f"calls {what} from a thread other than the event loop, "
         "which may cause Home Assistant to crash or data to corrupt. "
         "For more information, see "
         "https://developers.home-assistant.io/docs/asyncio_thread_safety/"
         f"#{what.replace('.', '')}",
-        error_if_core=True,
-        error_if_integration=True,
+        core_behavior=ReportBehavior.ERROR,
+        core_integration_behavior=ReportBehavior.ERROR,
+        custom_integration_behavior=ReportBehavior.ERROR,
     )
diff --git a/homeassistant/helpers/intent.py b/homeassistant/helpers/intent.py
index 649819a5f06..75572194bb8 100644
--- a/homeassistant/helpers/intent.py
+++ b/homeassistant/helpers/intent.py
@@ -38,7 +38,7 @@ from .typing import VolSchemaType
 _LOGGER = logging.getLogger(__name__)
 type _SlotsType = dict[str, Any]
 type _IntentSlotsType = dict[
-    str | tuple[str, str], VolSchemaType | Callable[[Any], Any]
+    str | tuple[str, str], IntentSlotInfo | VolSchemaType | Callable[[Any], Any]
 ]
 
 INTENT_TURN_OFF = "HassTurnOff"
@@ -59,6 +59,7 @@ INTENT_GET_CURRENT_DATE = "HassGetCurrentDate"
 INTENT_GET_CURRENT_TIME = "HassGetCurrentTime"
 INTENT_RESPOND = "HassRespond"
 INTENT_BROADCAST = "HassBroadcast"
+INTENT_GET_TEMPERATURE = "HassClimateGetTemperature"
 
 SLOT_SCHEMA = vol.Schema({}, extra=vol.ALLOW_EXTRA)
 
@@ -215,6 +216,9 @@ class MatchFailedReason(Enum):
     DUPLICATE_NAME = auto()
     """Two or more entities matched the same name constraint and could not be disambiguated."""
 
+    MULTIPLE_TARGETS = auto()
+    """Two or more entities matched when a single target is required."""
+
     def is_no_entities_reason(self) -> bool:
         """Return True if the match failed because no entities matched."""
         return self not in (
@@ -255,6 +259,9 @@ class MatchTargetsConstraints:
     allow_duplicate_names: bool = False
     """True if entities with duplicate names are allowed in result."""
 
+    single_target: bool = False
+    """True if result must contain a single target."""
+
     @property
     def has_constraints(self) -> bool:
         """Returns True if at least one constraint is set (ignores assistant)."""
@@ -266,6 +273,7 @@ class MatchTargetsConstraints:
             or self.device_classes
             or self.features
             or self.states
+            or self.single_target
         )
 
 
@@ -291,7 +299,7 @@ class MatchTargetsResult:
     """Reason for failed match when is_match = False."""
 
     states: list[State] = field(default_factory=list)
-    """List of matched entity states when is_match = True."""
+    """List of matched entity states."""
 
     no_match_name: str | None = None
     """Name of invalid area/floor or duplicate name when match fails for those reasons."""
@@ -357,7 +365,6 @@ class MatchTargetsCandidate:
     is_exposed: bool
     entity: entity_registry.RegistryEntry | None = None
     area: area_registry.AreaEntry | None = None
-    floor: floor_registry.FloorEntry | None = None
     device: device_registry.DeviceEntry | None = None
     matched_name: str | None = None
 
@@ -500,12 +507,22 @@ def _add_areas(
             candidate.area = areas.async_get_area(candidate.device.area_id)
 
 
+def _default_area_candidate_filter(
+    candidate: MatchTargetsCandidate, possible_area_ids: Collection[str]
+) -> bool:
+    """Keep candidates in the possible areas."""
+    return (candidate.area is not None) and (candidate.area.id in possible_area_ids)
+
+
 @callback
 def async_match_targets(  # noqa: C901
     hass: HomeAssistant,
     constraints: MatchTargetsConstraints,
     preferences: MatchTargetsPreferences | None = None,
     states: list[State] | None = None,
+    area_candidate_filter: Callable[
+        [MatchTargetsCandidate, Collection[str]], bool
+    ] = _default_area_candidate_filter,
 ) -> MatchTargetsResult:
     """Match entities based on constraints in order to handle an intent."""
     preferences = preferences or MatchTargetsPreferences()
@@ -549,6 +566,7 @@ def async_match_targets(  # noqa: C901
         or constraints.device_classes
         or constraints.area_name
         or constraints.floor_name
+        or constraints.single_target
     ):
         if constraints.assistant:
             # Check exposure
@@ -615,9 +633,7 @@ def async_match_targets(  # noqa: C901
             }
 
             candidates = [
-                c
-                for c in candidates
-                if (c.area is not None) and (c.area.id in possible_area_ids)
+                c for c in candidates if area_candidate_filter(c, possible_area_ids)
             ]
             if not candidates:
                 return MatchTargetsResult(
@@ -641,9 +657,7 @@ def async_match_targets(  # noqa: C901
             # May be constrained by floors above
             possible_area_ids.intersection_update(matching_area_ids)
             candidates = [
-                c
-                for c in candidates
-                if (c.area is not None) and (c.area.id in possible_area_ids)
+                c for c in candidates if area_candidate_filter(c, possible_area_ids)
             ]
             if not candidates:
                 return MatchTargetsResult(
@@ -693,7 +707,7 @@ def async_match_targets(  # noqa: C901
                 group_candidates = [
                     c
                     for c in group_candidates
-                    if (c.area is not None) and (c.area.id == preferences.area_id)
+                    if area_candidate_filter(c, {preferences.area_id})
                 ]
                 if len(group_candidates) < 2:
                     # Disambiguated by area
@@ -719,6 +733,48 @@ def async_match_targets(  # noqa: C901
 
         candidates = final_candidates
 
+    if constraints.single_target and len(candidates) > 1:
+        # Find best match using preferences
+        if not (preferences.area_id or preferences.floor_id):
+            # No preferences
+            return MatchTargetsResult(
+                False,
+                MatchFailedReason.MULTIPLE_TARGETS,
+                states=[c.state for c in candidates],
+            )
+
+        if not areas_added:
+            ar = area_registry.async_get(hass)
+            dr = device_registry.async_get(hass)
+            _add_areas(ar, dr, candidates)
+            areas_added = True
+
+        filtered_candidates: list[MatchTargetsCandidate] = candidates
+        if preferences.area_id:
+            # Filter by area
+            filtered_candidates = [
+                c for c in candidates if area_candidate_filter(c, {preferences.area_id})
+            ]
+
+        if (len(filtered_candidates) > 1) and preferences.floor_id:
+            # Filter by floor
+            filtered_candidates = [
+                c
+                for c in candidates
+                if c.area and (c.area.floor_id == preferences.floor_id)
+            ]
+
+        if len(filtered_candidates) != 1:
+            # Filtering could not restrict to a single target
+            return MatchTargetsResult(
+                False,
+                MatchFailedReason.MULTIPLE_TARGETS,
+                states=[c.state for c in candidates],
+            )
+
+        # Filtering succeeded
+        candidates = filtered_candidates
+
     return MatchTargetsResult(
         True,
         None,
@@ -818,6 +874,34 @@ def non_empty_string(value: Any) -> str:
     return value_str
 
 
+@dataclass(kw_only=True)
+class IntentSlotInfo:
+    """Details about how intent slots are processed and validated."""
+
+    service_data_name: str | None = None
+    """Optional name of the service data input to map to this slot."""
+
+    description: str | None = None
+    """Human readable description of the slot."""
+
+    value_schema: VolSchemaType | Callable[[Any], Any] = vol.Any
+    """Validator for the slot."""
+
+
+def _convert_slot_info(
+    key: str | tuple[str, str],
+    value: IntentSlotInfo | VolSchemaType | Callable[[Any], Any],
+) -> tuple[str, IntentSlotInfo]:
+    """Create an IntentSlotInfo from the various supported input arguments."""
+    if isinstance(value, IntentSlotInfo):
+        if not isinstance(key, str):
+            raise TypeError("Tuple key and IntentSlotDescription value not supported")
+        return key, value
+    if isinstance(key, tuple):
+        return key[0], IntentSlotInfo(service_data_name=key[1], value_schema=value)
+    return key, IntentSlotInfo(value_schema=value)
+
+
 class DynamicServiceIntentHandler(IntentHandler):
     """Service Intent handler registration (dynamic).
 
@@ -851,23 +935,14 @@ class DynamicServiceIntentHandler(IntentHandler):
         self.platforms = platforms
         self.device_classes = device_classes
 
-        self.required_slots: _IntentSlotsType = {}
-        if required_slots:
-            for key, value_schema in required_slots.items():
-                if isinstance(key, str):
-                    # Slot name/service data key
-                    key = (key, key)
-
-                self.required_slots[key] = value_schema
-
-        self.optional_slots: _IntentSlotsType = {}
-        if optional_slots:
-            for key, value_schema in optional_slots.items():
-                if isinstance(key, str):
-                    # Slot name/service data key
-                    key = (key, key)
-
-                self.optional_slots[key] = value_schema
+        self.required_slots: dict[str, IntentSlotInfo] = dict(
+            _convert_slot_info(key, value)
+            for key, value in (required_slots or {}).items()
+        )
+        self.optional_slots: dict[str, IntentSlotInfo] = dict(
+            _convert_slot_info(key, value)
+            for key, value in (optional_slots or {}).items()
+        )
 
     @cached_property
     def slot_schema(self) -> dict:
@@ -908,16 +983,20 @@ class DynamicServiceIntentHandler(IntentHandler):
         if self.required_slots:
             slot_schema.update(
                 {
-                    vol.Required(key[0]): validator
-                    for key, validator in self.required_slots.items()
+                    vol.Required(
+                        key, description=slot_info.description
+                    ): slot_info.value_schema
+                    for key, slot_info in self.required_slots.items()
                 }
             )
 
         if self.optional_slots:
             slot_schema.update(
                 {
-                    vol.Optional(key[0]): validator
-                    for key, validator in self.optional_slots.items()
+                    vol.Optional(
+                        key, description=slot_info.description
+                    ): slot_info.value_schema
+                    for key, slot_info in self.optional_slots.items()
                 }
             )
 
@@ -1100,18 +1179,15 @@ class DynamicServiceIntentHandler(IntentHandler):
 
         service_data: dict[str, Any] = {ATTR_ENTITY_ID: state.entity_id}
         if self.required_slots:
-            service_data.update(
-                {
-                    key[1]: intent_obj.slots[key[0]]["value"]
-                    for key in self.required_slots
-                }
-            )
+            for key, slot_info in self.required_slots.items():
+                service_data[slot_info.service_data_name or key] = intent_obj.slots[
+                    key
+                ]["value"]
 
         if self.optional_slots:
-            for key in self.optional_slots:
-                value = intent_obj.slots.get(key[0])
-                if value:
-                    service_data[key[1]] = value["value"]
+            for key, slot_info in self.optional_slots.items():
+                if value := intent_obj.slots.get(key):
+                    service_data[slot_info.service_data_name or key] = value["value"]
 
         await self._run_then_background(
             hass.async_create_task_internal(
diff --git a/homeassistant/helpers/issue_registry.py b/homeassistant/helpers/issue_registry.py
index 109d363d262..1a1373e19ef 100644
--- a/homeassistant/helpers/issue_registry.py
+++ b/homeassistant/helpers/issue_registry.py
@@ -12,8 +12,8 @@ from awesomeversion import AwesomeVersion, AwesomeVersionStrategy
 
 from homeassistant.const import __version__ as ha_version
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.util import dt as dt_util
 from homeassistant.util.async_ import run_callback_threadsafe
-import homeassistant.util.dt as dt_util
 from homeassistant.util.event_type import EventType
 from homeassistant.util.hass_dict import HassKey
 
diff --git a/homeassistant/helpers/llm.py b/homeassistant/helpers/llm.py
index ea376923f9d..7f6fe22ec70 100644
--- a/homeassistant/helpers/llm.py
+++ b/homeassistant/helpers/llm.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from abc import ABC, abstractmethod
 from collections.abc import Callable
-from dataclasses import dataclass
+from dataclasses import dataclass, field as dc_field
 from datetime import timedelta
 from decimal import Decimal
 from enum import Enum
@@ -19,7 +19,6 @@ from homeassistant.components.calendar import (
     DOMAIN as CALENDAR_DOMAIN,
     SERVICE_GET_EVENTS,
 )
-from homeassistant.components.climate import INTENT_GET_TEMPERATURE
 from homeassistant.components.cover import INTENT_CLOSE_COVER, INTENT_OPEN_COVER
 from homeassistant.components.homeassistant import async_should_expose
 from homeassistant.components.intent import async_device_supports_timers
@@ -36,6 +35,7 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.util import dt as dt_util, yaml as yaml_util
 from homeassistant.util.hass_dict import HassKey
 from homeassistant.util.json import JsonObjectType
+from homeassistant.util.ulid import ulid_now
 
 from . import (
     area_registry as ar,
@@ -49,9 +49,9 @@ from . import (
 )
 from .singleton import singleton
 
-SCRIPT_PARAMETERS_CACHE: HassKey[dict[str, tuple[str | None, vol.Schema]]] = HassKey(
-    "llm_script_parameters_cache"
-)
+ACTION_PARAMETERS_CACHE: HassKey[
+    dict[str, dict[str, tuple[str | None, vol.Schema]]]
+] = HassKey("llm_action_parameters_cache")
 
 
 LLM_API_ASSIST = "assist"
@@ -66,6 +66,11 @@ Answer questions about the world truthfully.
 Answer in plain text. Keep it simple and to the point.
 """
 
+NO_ENTITIES_PROMPT = (
+    "Only if the user wants to control a device, tell them to expose entities "
+    "to their voice assistant in Home Assistant."
+)
+
 
 @callback
 def async_render_no_api_prompt(hass: HomeAssistant) -> str:
@@ -139,6 +144,8 @@ class ToolInput:
 
     tool_name: str
     tool_args: dict[str, Any]
+    # Using lambda for default to allow patching in tests
+    id: str = dc_field(default_factory=lambda: ulid_now())  # pylint: disable=unnecessary-lambda
 
 
 class Tool:
@@ -282,7 +289,7 @@ class AssistAPI(API):
     """API exposing Assist API to LLMs."""
 
     IGNORE_INTENTS = {
-        INTENT_GET_TEMPERATURE,
+        intent.INTENT_GET_TEMPERATURE,
         INTENT_GET_WEATHER,
         INTENT_OPEN_COVER,  # deprecated
         INTENT_CLOSE_COVER,  # deprecated
@@ -309,7 +316,7 @@ class AssistAPI(API):
         """Return the instance of the API."""
         if llm_context.assistant:
             exposed_entities: dict | None = _get_exposed_entities(
-                self.hass, llm_context.assistant
+                self.hass, llm_context.assistant, include_state=False
             )
         else:
             exposed_entities = None
@@ -326,12 +333,18 @@ class AssistAPI(API):
     def _async_get_api_prompt(
         self, llm_context: LLMContext, exposed_entities: dict | None
     ) -> str:
+        if not exposed_entities or not exposed_entities["entities"]:
+            return NO_ENTITIES_PROMPT
+        return "\n".join(
+            [
+                *self._async_get_preable(llm_context),
+                *self._async_get_exposed_entities_prompt(llm_context, exposed_entities),
+            ]
+        )
+
+    @callback
+    def _async_get_preable(self, llm_context: LLMContext) -> list[str]:
         """Return the prompt for the API."""
-        if not exposed_entities:
-            return (
-                "Only if the user wants to control a device, tell them to expose entities "
-                "to their voice assistant in Home Assistant."
-            )
 
         prompt = [
             (
@@ -371,13 +384,22 @@ class AssistAPI(API):
         ):
             prompt.append("This device is not able to start timers.")
 
-        if exposed_entities:
+        return prompt
+
+    @callback
+    def _async_get_exposed_entities_prompt(
+        self, llm_context: LLMContext, exposed_entities: dict | None
+    ) -> list[str]:
+        """Return the prompt for the API for exposed entities."""
+        prompt = []
+
+        if exposed_entities and exposed_entities["entities"]:
             prompt.append(
                 "An overview of the areas and the devices in this smart home:"
             )
-            prompt.append(yaml_util.dump(list(exposed_entities.values())))
+            prompt.append(yaml_util.dump(list(exposed_entities["entities"].values())))
 
-        return "\n".join(prompt)
+        return prompt
 
     @callback
     def _async_get_tools(
@@ -407,8 +429,9 @@ class AssistAPI(API):
         exposed_domains: set[str] | None = None
         if exposed_entities is not None:
             exposed_domains = {
-                split_entity_id(entity_id)[0] for entity_id in exposed_entities
+                info["domain"] for info in exposed_entities["entities"].values()
             }
+
             intent_handlers = [
                 intent_handler
                 for intent_handler in intent_handlers
@@ -420,25 +443,34 @@ class AssistAPI(API):
             IntentTool(self.cached_slugify(intent_handler.intent_type), intent_handler)
             for intent_handler in intent_handlers
         ]
-        if exposed_domains and CALENDAR_DOMAIN in exposed_domains:
-            tools.append(CalendarGetEventsTool())
 
-        if llm_context.assistant is not None:
-            for state in self.hass.states.async_all(SCRIPT_DOMAIN):
-                if not async_should_expose(
-                    self.hass, llm_context.assistant, state.entity_id
-                ):
-                    continue
+        if exposed_entities:
+            if exposed_entities[CALENDAR_DOMAIN]:
+                names = []
+                for info in exposed_entities[CALENDAR_DOMAIN].values():
+                    names.extend(info["names"].split(", "))
+                tools.append(CalendarGetEventsTool(names))
 
-                tools.append(ScriptTool(self.hass, state.entity_id))
+            tools.extend(
+                ScriptTool(self.hass, script_entity_id)
+                for script_entity_id in exposed_entities[SCRIPT_DOMAIN]
+            )
+
+        if exposed_domains:
+            tools.append(GetHomeStateTool())
 
         return tools
 
 
 def _get_exposed_entities(
-    hass: HomeAssistant, assistant: str
-) -> dict[str, dict[str, Any]]:
-    """Get exposed entities."""
+    hass: HomeAssistant,
+    assistant: str,
+    include_state: bool = True,
+) -> dict[str, dict[str, dict[str, Any]]]:
+    """Get exposed entities.
+
+    Splits out calendars and scripts.
+    """
     area_registry = ar.async_get(hass)
     entity_registry = er.async_get(hass)
     device_registry = dr.async_get(hass)
@@ -459,12 +491,13 @@ def _get_exposed_entities(
     }
 
     entities = {}
+    data: dict[str, dict[str, Any]] = {
+        SCRIPT_DOMAIN: {},
+        CALENDAR_DOMAIN: {},
+    }
 
     for state in hass.states.async_all():
-        if (
-            not async_should_expose(hass, assistant, state.entity_id)
-            or state.domain == SCRIPT_DOMAIN
-        ):
+        if not async_should_expose(hass, assistant, state.entity_id):
             continue
 
         description: str | None = None
@@ -493,27 +526,37 @@ def _get_exposed_entities(
         info: dict[str, Any] = {
             "names": ", ".join(names),
             "domain": state.domain,
-            "state": state.state,
         }
 
+        if include_state:
+            info["state"] = state.state
+
         if description:
             info["description"] = description
 
         if area_names:
             info["areas"] = ", ".join(area_names)
 
-        if attributes := {
-            attr_name: str(attr_value)
-            if isinstance(attr_value, (Enum, Decimal, int))
-            else attr_value
-            for attr_name, attr_value in state.attributes.items()
-            if attr_name in interesting_attributes
-        }:
+        if include_state and (
+            attributes := {
+                attr_name: (
+                    str(attr_value)
+                    if isinstance(attr_value, (Enum, Decimal, int))
+                    else attr_value
+                )
+                for attr_name, attr_value in state.attributes.items()
+                if attr_name in interesting_attributes
+            }
+        ):
             info["attributes"] = attributes
 
-        entities[state.entity_id] = info
+        if state.domain in data:
+            data[state.domain][state.entity_id] = info
+        else:
+            entities[state.entity_id] = info
 
-    return entities
+    data["entities"] = entities
+    return data
 
 
 def _selector_serializer(schema: Any) -> Any:  # noqa: C901
@@ -624,104 +667,105 @@ def _selector_serializer(schema: Any) -> Any:  # noqa: C901
     return {"type": "string"}
 
 
-def _get_cached_script_parameters(
-    hass: HomeAssistant, entity_id: str
+def _get_cached_action_parameters(
+    hass: HomeAssistant, domain: str, action: str
 ) -> tuple[str | None, vol.Schema]:
-    """Get script description and schema."""
-    entity_registry = er.async_get(hass)
-
+    """Get action description and schema."""
     description = None
     parameters = vol.Schema({})
-    entity_entry = entity_registry.async_get(entity_id)
-    if entity_entry and entity_entry.unique_id:
-        parameters_cache = hass.data.get(SCRIPT_PARAMETERS_CACHE)
 
-        if parameters_cache is None:
-            parameters_cache = hass.data[SCRIPT_PARAMETERS_CACHE] = {}
+    parameters_cache = hass.data.get(ACTION_PARAMETERS_CACHE)
 
-            @callback
-            def clear_cache(event: Event) -> None:
-                """Clear script parameter cache on script reload or delete."""
-                if (
-                    event.data[ATTR_DOMAIN] == SCRIPT_DOMAIN
-                    and event.data[ATTR_SERVICE] in parameters_cache
-                ):
-                    parameters_cache.pop(event.data[ATTR_SERVICE])
+    if parameters_cache is None:
+        parameters_cache = hass.data[ACTION_PARAMETERS_CACHE] = {}
 
-            cancel = hass.bus.async_listen(EVENT_SERVICE_REMOVED, clear_cache)
+        @callback
+        def clear_cache(event: Event) -> None:
+            """Clear action parameter cache on action removal."""
+            if (
+                event.data[ATTR_DOMAIN] in parameters_cache
+                and event.data[ATTR_SERVICE]
+                in parameters_cache[event.data[ATTR_DOMAIN]]
+            ):
+                parameters_cache[event.data[ATTR_DOMAIN]].pop(event.data[ATTR_SERVICE])
 
-            @callback
-            def on_homeassistant_close(event: Event) -> None:
-                """Cleanup."""
-                cancel()
+        cancel = hass.bus.async_listen(EVENT_SERVICE_REMOVED, clear_cache)
 
-            hass.bus.async_listen_once(
-                EVENT_HOMEASSISTANT_CLOSE, on_homeassistant_close
-            )
+        @callback
+        def on_homeassistant_close(event: Event) -> None:
+            """Cleanup."""
+            cancel()
 
-        if entity_entry.unique_id in parameters_cache:
-            return parameters_cache[entity_entry.unique_id]
+        hass.bus.async_listen_once(EVENT_HOMEASSISTANT_CLOSE, on_homeassistant_close)
 
-        if service_desc := service.async_get_cached_service_description(
-            hass, SCRIPT_DOMAIN, entity_entry.unique_id
-        ):
-            description = service_desc.get("description")
-            schema: dict[vol.Marker, Any] = {}
-            fields = service_desc.get("fields", {})
+    if domain in parameters_cache and action in parameters_cache[domain]:
+        return parameters_cache[domain][action]
 
-            for field, config in fields.items():
-                field_description = config.get("description")
-                if not field_description:
-                    field_description = config.get("name")
-                key: vol.Marker
-                if config.get("required"):
-                    key = vol.Required(field, description=field_description)
-                else:
-                    key = vol.Optional(field, description=field_description)
-                if "selector" in config:
-                    schema[key] = selector.selector(config["selector"])
-                else:
-                    schema[key] = cv.string
+    if action_desc := service.async_get_cached_service_description(
+        hass, domain, action
+    ):
+        description = action_desc.get("description")
+        schema: dict[vol.Marker, Any] = {}
+        fields = action_desc.get("fields", {})
 
-            parameters = vol.Schema(schema)
+        for field, config in fields.items():
+            field_description = config.get("description")
+            if not field_description:
+                field_description = config.get("name")
+            key: vol.Marker
+            if config.get("required"):
+                key = vol.Required(field, description=field_description)
+            else:
+                key = vol.Optional(field, description=field_description)
+            if "selector" in config:
+                schema[key] = selector.selector(config["selector"])
+            else:
+                schema[key] = cv.string
 
-            aliases: list[str] = []
-            if entity_entry.name:
-                aliases.append(entity_entry.name)
-            if entity_entry.aliases:
-                aliases.extend(entity_entry.aliases)
-            if aliases:
-                if description:
-                    description = description + ". Aliases: " + str(list(aliases))
-                else:
-                    description = "Aliases: " + str(list(aliases))
+        parameters = vol.Schema(schema)
 
-            parameters_cache[entity_entry.unique_id] = (description, parameters)
+        if domain == SCRIPT_DOMAIN:
+            entity_registry = er.async_get(hass)
+            if (
+                entity_id := entity_registry.async_get_entity_id(domain, domain, action)
+            ) and (entity_entry := entity_registry.async_get(entity_id)):
+                aliases: list[str] = []
+                if entity_entry.name:
+                    aliases.append(entity_entry.name)
+                if entity_entry.aliases:
+                    aliases.extend(entity_entry.aliases)
+                if aliases:
+                    if description:
+                        description = description + ". Aliases: " + str(list(aliases))
+                    else:
+                        description = "Aliases: " + str(list(aliases))
+
+        parameters_cache.setdefault(domain, {})[action] = (description, parameters)
 
     return description, parameters
 
 
-class ScriptTool(Tool):
-    """LLM Tool representing a Script."""
+class ActionTool(Tool):
+    """LLM Tool representing an action."""
 
     def __init__(
         self,
         hass: HomeAssistant,
-        script_entity_id: str,
+        domain: str,
+        action: str,
     ) -> None:
         """Init the class."""
-        self._object_id = self.name = split_entity_id(script_entity_id)[1]
-        if self.name[0].isdigit():
-            self.name = "_" + self.name
-
-        self.description, self.parameters = _get_cached_script_parameters(
-            hass, script_entity_id
+        self._domain = domain
+        self._action = action
+        self.name = f"{domain}.{action}"
+        self.description, self.parameters = _get_cached_action_parameters(
+            hass, domain, action
         )
 
     async def async_call(
         self, hass: HomeAssistant, tool_input: ToolInput, llm_context: LLMContext
     ) -> JsonObjectType:
-        """Run the script."""
+        """Call the action."""
 
         for field, validator in self.parameters.schema.items():
             if field not in tool_input.tool_args:
@@ -753,8 +797,8 @@ class ScriptTool(Tool):
                     tool_input.tool_args[field] = floor
 
         result = await hass.services.async_call(
-            SCRIPT_DOMAIN,
-            self._object_id,
+            self._domain,
+            self._action,
             tool_input.tool_args,
             context=llm_context.context,
             blocking=True,
@@ -764,21 +808,48 @@ class ScriptTool(Tool):
         return {"success": True, "result": result}
 
 
+class ScriptTool(ActionTool):
+    """LLM Tool representing a Script."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        script_entity_id: str,
+    ) -> None:
+        """Init the class."""
+        script_name = split_entity_id(script_entity_id)[1]
+
+        action = script_name
+        entity_registry = er.async_get(hass)
+        entity_entry = entity_registry.async_get(script_entity_id)
+        if entity_entry and entity_entry.unique_id:
+            action = entity_entry.unique_id
+
+        super().__init__(hass, SCRIPT_DOMAIN, action)
+
+        self.name = script_name
+        if self.name[0].isdigit():
+            self.name = "_" + self.name
+
+
 class CalendarGetEventsTool(Tool):
     """LLM Tool allowing querying a calendar."""
 
     name = "calendar_get_events"
     description = (
         "Get events from a calendar. "
-        "When asked when something happens, search the whole week. "
+        "When asked if something happens, search the whole week. "
         "Results are RFC 5545 which means 'end' is exclusive."
     )
-    parameters = vol.Schema(
-        {
-            vol.Required("calendar"): cv.string,
-            vol.Required("range"): vol.In(["today", "week"]),
-        }
-    )
+
+    def __init__(self, calendars: list[str]) -> None:
+        """Init the get events tool."""
+        self.parameters = vol.Schema(
+            {
+                vol.Required("calendar"): vol.In(calendars),
+                vol.Required("range"): vol.In(["today", "week"]),
+            }
+        )
 
     async def async_call(
         self, hass: HomeAssistant, tool_input: ToolInput, llm_context: LLMContext
@@ -825,3 +896,39 @@ class CalendarGetEventsTool(Tool):
         ]
 
         return {"success": True, "result": events}
+
+
+class GetHomeStateTool(Tool):
+    """Tool for getting the current state of exposed entities.
+
+    This returns state for all entities that have been exposed to
+    the assistant. This is different than the GetState intent, which
+    returns state for entities based on intent parameters.
+    """
+
+    name = "get_home_state"
+    description = "Get the current state of all devices in the home. "
+
+    async def async_call(
+        self,
+        hass: HomeAssistant,
+        tool_input: ToolInput,
+        llm_context: LLMContext,
+    ) -> JsonObjectType:
+        """Get the current state of exposed entities."""
+        if llm_context.assistant is None:
+            # Note this doesn't happen in practice since this tool won't be
+            # exposed if no assistant is configured.
+            return {"success": False, "error": "No assistant configured"}
+
+        exposed_entities = _get_exposed_entities(hass, llm_context.assistant)
+        if not exposed_entities["entities"]:
+            return {"success": False, "error": NO_ENTITIES_PROMPT}
+        prompt = [
+            "An overview of the areas and the devices in this smart home:",
+            yaml_util.dump(list(exposed_entities["entities"].values())),
+        ]
+        return {
+            "success": True,
+            "result": "\n".join(prompt),
+        }
diff --git a/homeassistant/helpers/recorder.py b/homeassistant/helpers/recorder.py
index 59604944eeb..7ad319419c1 100644
--- a/homeassistant/helpers/recorder.py
+++ b/homeassistant/helpers/recorder.py
@@ -20,7 +20,7 @@ if TYPE_CHECKING:
 
 _LOGGER = logging.getLogger(__name__)
 
-DOMAIN: HassKey[RecorderData] = HassKey("recorder")
+DATA_RECORDER: HassKey[RecorderData] = HassKey("recorder")
 DATA_INSTANCE: HassKey[Recorder] = HassKey("recorder_instance")
 
 
@@ -52,24 +52,19 @@ def async_migration_is_live(hass: HomeAssistant) -> bool:
 
 @callback
 def async_initialize_recorder(hass: HomeAssistant) -> None:
-    """Initialize recorder data."""
+    """Initialize recorder data.
+
+    This creates the RecorderData instance stored in hass.data[DATA_RECORDER] and
+    registers the basic recorder websocket API which is used by frontend to determine
+    if the recorder is migrating the database.
+    """
     # pylint: disable-next=import-outside-toplevel
     from homeassistant.components.recorder.basic_websocket_api import async_setup
 
-    hass.data[DOMAIN] = RecorderData()
+    hass.data[DATA_RECORDER] = RecorderData()
     async_setup(hass)
 
 
-async def async_wait_recorder(hass: HomeAssistant) -> bool:
-    """Wait for recorder to initialize and return connection status.
-
-    Returns False immediately if the recorder is not enabled.
-    """
-    if DOMAIN not in hass.data:
-        return False
-    return await hass.data[DOMAIN].db_connected
-
-
 @functools.lru_cache(maxsize=1)
 def get_instance(hass: HomeAssistant) -> Recorder:
     """Get the recorder instance."""
diff --git a/homeassistant/helpers/restore_state.py b/homeassistant/helpers/restore_state.py
index fd1f84a85ff..78812061a03 100644
--- a/homeassistant/helpers/restore_state.py
+++ b/homeassistant/helpers/restore_state.py
@@ -10,7 +10,7 @@ from typing import Any, Self, cast
 from homeassistant.const import ATTR_RESTORED, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant, State, callback, valid_entity_id
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.hass_dict import HassKey
 from homeassistant.util.json import json_loads
 
diff --git a/homeassistant/helpers/script.py b/homeassistant/helpers/script.py
index bd3babc8793..1242ef3e4d5 100644
--- a/homeassistant/helpers/script.py
+++ b/homeassistant/helpers/script.py
@@ -12,7 +12,6 @@ from datetime import datetime, timedelta
 from functools import partial
 import itertools
 import logging
-from types import MappingProxyType
 from typing import Any, Literal, TypedDict, cast, overload
 
 import async_interrupt
@@ -90,7 +89,7 @@ from . import condition, config_validation as cv, service, template
 from .condition import ConditionCheckerType, trace_condition_function
 from .dispatcher import async_dispatcher_connect, async_dispatcher_send_internal
 from .event import async_call_later, async_track_template
-from .script_variables import ScriptVariables
+from .script_variables import ScriptRunVariables, ScriptVariables
 from .template import Template
 from .trace import (
     TraceElement,
@@ -177,7 +176,7 @@ def _set_result_unless_done(future: asyncio.Future[None]) -> None:
         future.set_result(None)
 
 
-def action_trace_append(variables: dict[str, Any], path: str) -> TraceElement:
+def action_trace_append(variables: TemplateVarsType, path: str) -> TraceElement:
     """Append a TraceElement to trace[path]."""
     trace_element = TraceElement(variables, path)
     trace_append_element(trace_element, ACTION_TRACE_NODE_MAX_LEN)
@@ -189,7 +188,7 @@ async def trace_action(
     hass: HomeAssistant,
     script_run: _ScriptRun,
     stop: asyncio.Future[None],
-    variables: dict[str, Any],
+    variables: TemplateVarsType,
 ) -> AsyncGenerator[TraceElement]:
     """Trace action execution."""
     path = trace_path_get()
@@ -411,7 +410,7 @@ class _ScriptRun:
         self,
         hass: HomeAssistant,
         script: Script,
-        variables: dict[str, Any],
+        variables: ScriptRunVariables,
         context: Context | None,
         log_exceptions: bool,
     ) -> None:
@@ -430,9 +429,6 @@ class _ScriptRun:
         if not self._stop.done():
             self._script._changed()  # noqa: SLF001
 
-    async def _async_get_condition(self, config: ConfigType) -> ConditionCheckerType:
-        return await self._script._async_get_condition(config)  # noqa: SLF001
-
     def _log(
         self, msg: str, *args: Any, level: int = logging.INFO, **kwargs: Any
     ) -> None:
@@ -488,14 +484,16 @@ class _ScriptRun:
             script_stack.pop()
             self._finish()
 
-        return ScriptRunResult(self._conversation_response, response, self._variables)
+        return ScriptRunResult(
+            self._conversation_response, response, self._variables.local_scope
+        )
 
     async def _async_step(self, log_exceptions: bool) -> None:
         continue_on_error = self._action.get(CONF_CONTINUE_ON_ERROR, False)
 
         with trace_path(str(self._step)):
             async with trace_action(
-                self._hass, self, self._stop, self._variables
+                self._hass, self, self._stop, self._variables.non_parallel_scope
             ) as trace_element:
                 if self._stop.done():
                     return
@@ -521,7 +519,7 @@ class _ScriptRun:
                         trace_set_result(enabled=False)
                         return
 
-                handler = f"_async_{action}_step"
+                handler = f"_async_step_{action}"
                 try:
                     await getattr(self, handler)()
                 except Exception as ex:  # noqa: BLE001
@@ -529,7 +527,7 @@ class _ScriptRun:
                         ex, continue_on_error, self._log_exceptions or log_exceptions
                     )
                 finally:
-                    trace_element.update_variables(self._variables)
+                    trace_element.update_variables(self._variables.non_parallel_scope)
 
     def _finish(self) -> None:
         self._script._runs.remove(self)  # noqa: SLF001
@@ -614,107 +612,6 @@ class _ScriptRun:
             level=level,
         )
 
-    def _get_pos_time_period_template(self, key: str) -> timedelta:
-        try:
-            return cv.positive_time_period(  # type: ignore[no-any-return]
-                template.render_complex(self._action[key], self._variables)
-            )
-        except (exceptions.TemplateError, vol.Invalid) as ex:
-            self._log(
-                "Error rendering %s %s template: %s",
-                self._script.name,
-                key,
-                ex,
-                level=logging.ERROR,
-            )
-            raise _AbortScript from ex
-
-    async def _async_delay_step(self) -> None:
-        """Handle delay."""
-        delay_delta = self._get_pos_time_period_template(CONF_DELAY)
-
-        self._step_log(f"delay {delay_delta}")
-
-        delay = delay_delta.total_seconds()
-        self._changed()
-        if not delay:
-            # Handle an empty delay
-            trace_set_result(delay=delay, done=True)
-            return
-
-        trace_set_result(delay=delay, done=False)
-        futures, timeout_handle, timeout_future = self._async_futures_with_timeout(
-            delay
-        )
-
-        try:
-            await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED)
-        finally:
-            if timeout_future.done():
-                trace_set_result(delay=delay, done=True)
-            else:
-                timeout_handle.cancel()
-
-    def _get_timeout_seconds_from_action(self) -> float | None:
-        """Get the timeout from the action."""
-        if CONF_TIMEOUT in self._action:
-            return self._get_pos_time_period_template(CONF_TIMEOUT).total_seconds()
-        return None
-
-    async def _async_wait_template_step(self) -> None:
-        """Handle a wait template."""
-        timeout = self._get_timeout_seconds_from_action()
-        self._step_log("wait template", timeout)
-
-        self._variables["wait"] = {"remaining": timeout, "completed": False}
-        trace_set_result(wait=self._variables["wait"])
-
-        wait_template = self._action[CONF_WAIT_TEMPLATE]
-
-        # check if condition already okay
-        if condition.async_template(self._hass, wait_template, self._variables, False):
-            self._variables["wait"]["completed"] = True
-            self._changed()
-            return
-
-        if timeout == 0:
-            self._changed()
-            self._async_handle_timeout()
-            return
-
-        futures, timeout_handle, timeout_future = self._async_futures_with_timeout(
-            timeout
-        )
-        done = self._hass.loop.create_future()
-        futures.append(done)
-
-        @callback
-        def async_script_wait(
-            entity_id: str, from_s: State | None, to_s: State | None
-        ) -> None:
-            """Handle script after template condition is true."""
-            self._async_set_remaining_time_var(timeout_handle)
-            self._variables["wait"]["completed"] = True
-            _set_result_unless_done(done)
-
-        unsub = async_track_template(
-            self._hass, wait_template, async_script_wait, self._variables
-        )
-        self._changed()
-        await self._async_wait_with_optional_timeout(
-            futures, timeout_handle, timeout_future, unsub
-        )
-
-    def _async_set_remaining_time_var(
-        self, timeout_handle: asyncio.TimerHandle | None
-    ) -> None:
-        """Set the remaining time variable for a wait step."""
-        wait_var = self._variables["wait"]
-        if timeout_handle:
-            wait_var["remaining"] = timeout_handle.when() - self._hass.loop.time()
-        else:
-            wait_var["remaining"] = None
-
     async def _async_run_long_action[_T](
         self, long_task: asyncio.Task[_T]
     ) -> _T | None:
@@ -728,111 +625,54 @@ class _ScriptRun:
         except ScriptStoppedError as ex:
             raise asyncio.CancelledError from ex
 
-    async def _async_call_service_step(self) -> None:
-        """Call the service specified in the action."""
-        self._step_log("call service")
-
-        params = service.async_prepare_call_from_config(
-            self._hass, self._action, self._variables
-        )
-
-        # Validate response data parameters. This check ignores services that do
-        # not exist which will raise an appropriate error in the service call below.
-        response_variable = self._action.get(CONF_RESPONSE_VARIABLE)
-        return_response = response_variable is not None
-        if self._hass.services.has_service(params[CONF_DOMAIN], params[CONF_SERVICE]):
-            supports_response = self._hass.services.supports_response(
-                params[CONF_DOMAIN], params[CONF_SERVICE]
-            )
-            if supports_response == SupportsResponse.ONLY and not return_response:
-                raise vol.Invalid(
-                    f"Script requires '{CONF_RESPONSE_VARIABLE}' for response data "
-                    f"for service call {params[CONF_DOMAIN]}.{params[CONF_SERVICE]}"
-                )
-            if supports_response == SupportsResponse.NONE and return_response:
-                raise vol.Invalid(
-                    f"Script does not support '{CONF_RESPONSE_VARIABLE}' for service "
-                    f"'{CONF_RESPONSE_VARIABLE}' which does not support response data."
-                )
-
-        running_script = (
-            params[CONF_DOMAIN] == "automation" and params[CONF_SERVICE] == "trigger"
-        ) or params[CONF_DOMAIN] in ("python_script", "script")
-        trace_set_result(params=params, running_script=running_script)
-        response_data = await self._async_run_long_action(
+    async def _async_run_script(
+        self, script: Script, *, parallel: bool = False
+    ) -> None:
+        """Execute a script."""
+        result = await self._async_run_long_action(
             self._hass.async_create_task_internal(
-                self._hass.services.async_call(
-                    **params,
-                    blocking=True,
-                    context=self._context,
-                    return_response=return_response,
+                script.async_run(
+                    self._variables.enter_scope(parallel=parallel), self._context
                 ),
                 eager_start=True,
             )
         )
-        if response_variable:
-            self._variables[response_variable] = response_data
+        if result and result.conversation_response is not UNDEFINED:
+            self._conversation_response = result.conversation_response
 
-    async def _async_device_step(self) -> None:
-        """Perform the device automation specified in the action."""
-        self._step_log("device automation")
-        await device_action.async_call_action_from_config(
-            self._hass, self._action, self._variables, self._context
+    ## Flow control actions ##
+
+    ### Sequence actions ###
+
+    @async_trace_path("parallel")
+    async def _async_step_parallel(self) -> None:
+        """Run a sequence in parallel."""
+        scripts = await self._script._async_get_parallel_scripts(self._step)  # noqa: SLF001
+
+        async def async_run_with_trace(idx: int, script: Script) -> None:
+            """Run a script with a trace path."""
+            trace_path_stack_cv.set(copy(trace_path_stack_cv.get()))
+            with trace_path([str(idx), "sequence"]):
+                await self._async_run_script(script, parallel=True)
+
+        results = await asyncio.gather(
+            *(async_run_with_trace(idx, script) for idx, script in enumerate(scripts)),
+            return_exceptions=True,
         )
+        for result in results:
+            if isinstance(result, Exception):
+                raise result
 
-    async def _async_scene_step(self) -> None:
-        """Activate the scene specified in the action."""
-        self._step_log("activate scene")
-        trace_set_result(scene=self._action[CONF_SCENE])
-        await self._hass.services.async_call(
-            scene.DOMAIN,
-            SERVICE_TURN_ON,
-            {ATTR_ENTITY_ID: self._action[CONF_SCENE]},
-            blocking=True,
-            context=self._context,
-        )
+    @async_trace_path("sequence")
+    async def _async_step_sequence(self) -> None:
+        """Run a sequence."""
+        sequence = await self._script._async_get_sequence_script(self._step)  # noqa: SLF001
+        await self._async_run_script(sequence)
 
-    async def _async_event_step(self) -> None:
-        """Fire an event."""
-        self._step_log(self._action.get(CONF_ALIAS, self._action[CONF_EVENT]))
-        event_data = {}
-        for conf in (CONF_EVENT_DATA, CONF_EVENT_DATA_TEMPLATE):
-            if conf not in self._action:
-                continue
+    ### Condition actions ###
 
-            try:
-                event_data.update(
-                    template.render_complex(self._action[conf], self._variables)
-                )
-            except exceptions.TemplateError as ex:
-                self._log(
-                    "Error rendering event data template: %s", ex, level=logging.ERROR
-                )
-
-        trace_set_result(event=self._action[CONF_EVENT], event_data=event_data)
-        self._hass.bus.async_fire_internal(
-            self._action[CONF_EVENT], event_data, context=self._context
-        )
-
-    async def _async_condition_step(self) -> None:
-        """Test if condition is matching."""
-        self._script.last_action = self._action.get(
-            CONF_ALIAS, self._action[CONF_CONDITION]
-        )
-        cond = await self._async_get_condition(self._action)
-        try:
-            trace_element = trace_stack_top(trace_stack_cv)
-            if trace_element:
-                trace_element.reuse_by_child = True
-            check = cond(self._hass, self._variables)
-        except exceptions.ConditionError as ex:
-            _LOGGER.warning("Error in 'condition' evaluation:\n%s", ex)
-            check = False
-
-        self._log("Test condition %s: %s", self._script.last_action, check)
-        trace_update_result(result=check)
-        if not check:
-            raise _ConditionFail
+    async def _async_get_condition(self, config: ConfigType) -> ConditionCheckerType:
+        return await self._script._async_get_condition(config)  # noqa: SLF001
 
     def _test_conditions(
         self,
@@ -861,14 +701,76 @@ class _ScriptRun:
 
         return traced_test_conditions(self._hass, self._variables)
 
-    @async_trace_path("repeat")
-    async def _async_repeat_step(self) -> None:  # noqa: C901
-        """Repeat a sequence."""
+    async def _async_step_choose(self) -> None:
+        """Choose a sequence."""
+        choose_data = await self._script._async_get_choose_data(self._step)  # noqa: SLF001
+
+        with trace_path("choose"):
+            for idx, (conditions, script) in enumerate(choose_data["choices"]):
+                with trace_path(str(idx)):
+                    try:
+                        if self._test_conditions(conditions, "choose", "conditions"):
+                            trace_set_result(choice=idx)
+                            with trace_path("sequence"):
+                                await self._async_run_script(script)
+                                return
+                    except exceptions.ConditionError as ex:
+                        _LOGGER.warning("Error in 'choose' evaluation:\n%s", ex)
+
+        if choose_data["default"] is not None:
+            trace_set_result(choice="default")
+            with trace_path(["default"]):
+                await self._async_run_script(choose_data["default"])
+
+    async def _async_step_condition(self) -> None:
+        """Test if condition is matching."""
+        self._script.last_action = self._action.get(
+            CONF_ALIAS, self._action[CONF_CONDITION]
+        )
+        cond = await self._async_get_condition(self._action)
+        try:
+            trace_element = trace_stack_top(trace_stack_cv)
+            if trace_element:
+                trace_element.reuse_by_child = True
+            check = cond(self._hass, self._variables)
+        except exceptions.ConditionError as ex:
+            _LOGGER.warning("Error in 'condition' evaluation:\n%s", ex)
+            check = False
+
+        self._log("Test condition %s: %s", self._script.last_action, check)
+        trace_update_result(result=check)
+        if not check:
+            raise _ConditionFail
+
+    async def _async_step_if(self) -> None:
+        """If sequence."""
+        if_data = await self._script._async_get_if_data(self._step)  # noqa: SLF001
+
+        test_conditions: bool | None = False
+        try:
+            with trace_path("if"):
+                test_conditions = self._test_conditions(
+                    if_data["if_conditions"], "if", "condition"
+                )
+        except exceptions.ConditionError as ex:
+            _LOGGER.warning("Error in 'if' evaluation:\n%s", ex)
+
+        if test_conditions:
+            trace_set_result(choice="then")
+            with trace_path("then"):
+                await self._async_run_script(if_data["if_then"])
+                return
+
+        if if_data["if_else"] is not None:
+            trace_set_result(choice="else")
+            with trace_path("else"):
+                await self._async_run_script(if_data["if_else"])
+
+    async def _async_do_step_repeat(self) -> None:  # noqa: C901
+        """Repeat a sequence helper."""
         description = self._action.get(CONF_ALIAS, "sequence")
         repeat = self._action[CONF_REPEAT]
 
-        saved_repeat_vars = self._variables.get("repeat")
-
         def set_repeat_var(
             iteration: int, count: int | None = None, item: Any = None
         ) -> None:
@@ -877,7 +779,7 @@ class _ScriptRun:
                 repeat_vars["last"] = iteration == count
             if item is not None:
                 repeat_vars["item"] = item
-            self._variables["repeat"] = repeat_vars
+            self._variables.define_local("repeat", repeat_vars)
 
         script = self._script._get_repeat_script(self._step)  # noqa: SLF001
         warned_too_many_loops = False
@@ -1028,55 +930,137 @@ class _ScriptRun:
                 # while all the cpu time is consumed.
                 await asyncio.sleep(0)
 
-        if saved_repeat_vars:
-            self._variables["repeat"] = saved_repeat_vars
-        else:
-            self._variables.pop("repeat", None)  # Not set if count = 0
-
-    async def _async_choose_step(self) -> None:
-        """Choose a sequence."""
-        choose_data = await self._script._async_get_choose_data(self._step)  # noqa: SLF001
-
-        with trace_path("choose"):
-            for idx, (conditions, script) in enumerate(choose_data["choices"]):
-                with trace_path(str(idx)):
-                    try:
-                        if self._test_conditions(conditions, "choose", "conditions"):
-                            trace_set_result(choice=idx)
-                            with trace_path("sequence"):
-                                await self._async_run_script(script)
-                                return
-                    except exceptions.ConditionError as ex:
-                        _LOGGER.warning("Error in 'choose' evaluation:\n%s", ex)
-
-        if choose_data["default"] is not None:
-            trace_set_result(choice="default")
-            with trace_path(["default"]):
-                await self._async_run_script(choose_data["default"])
-
-    async def _async_if_step(self) -> None:
-        """If sequence."""
-        if_data = await self._script._async_get_if_data(self._step)  # noqa: SLF001
-
-        test_conditions: bool | None = False
+    @async_trace_path("repeat")
+    async def _async_step_repeat(self) -> None:
+        """Repeat a sequence."""
+        self._variables = self._variables.enter_scope()
         try:
-            with trace_path("if"):
-                test_conditions = self._test_conditions(
-                    if_data["if_conditions"], "if", "condition"
+            await self._async_do_step_repeat()
+        finally:
+            self._variables = self._variables.exit_scope()
+
+    ### Stop actions ###
+
+    async def _async_step_stop(self) -> None:
+        """Stop script execution."""
+        stop = self._action[CONF_STOP]
+        error = self._action.get(CONF_ERROR, False)
+        trace_set_result(stop=stop, error=error)
+        if error:
+            self._log("Error script sequence: %s", stop)
+            raise _AbortScript(stop)
+
+        self._log("Stop script sequence: %s", stop)
+        if CONF_RESPONSE_VARIABLE in self._action:
+            try:
+                response = self._variables[self._action[CONF_RESPONSE_VARIABLE]]
+            except KeyError as ex:
+                raise _AbortScript(
+                    f"Response variable '{self._action[CONF_RESPONSE_VARIABLE]}' "
+                    "is not defined"
+                ) from ex
+        else:
+            response = None
+        raise _StopScript(stop, response)
+
+    ## Variable actions ##
+
+    async def _async_step_variables(self) -> None:
+        """Assign values to variables."""
+        self._step_log("assigning variables")
+        self._variables.update(
+            self._action[CONF_VARIABLES].async_simple_render(self._variables)
+        )
+
+    ## External actions ##
+
+    async def _async_step_call_service(self) -> None:
+        """Call the service specified in the action."""
+        self._step_log("call service")
+
+        params = service.async_prepare_call_from_config(
+            self._hass, self._action, self._variables
+        )
+
+        # Validate response data parameters. This check ignores services that do
+        # not exist which will raise an appropriate error in the service call below.
+        response_variable = self._action.get(CONF_RESPONSE_VARIABLE)
+        return_response = response_variable is not None
+        if self._hass.services.has_service(params[CONF_DOMAIN], params[CONF_SERVICE]):
+            supports_response = self._hass.services.supports_response(
+                params[CONF_DOMAIN], params[CONF_SERVICE]
+            )
+            if supports_response == SupportsResponse.ONLY and not return_response:
+                raise vol.Invalid(
+                    f"Script requires '{CONF_RESPONSE_VARIABLE}' for response data "
+                    f"for service call {params[CONF_DOMAIN]}.{params[CONF_SERVICE]}"
+                )
+            if supports_response == SupportsResponse.NONE and return_response:
+                raise vol.Invalid(
+                    f"Script does not support '{CONF_RESPONSE_VARIABLE}' for service "
+                    f"'{CONF_RESPONSE_VARIABLE}' which does not support response data."
                 )
-        except exceptions.ConditionError as ex:
-            _LOGGER.warning("Error in 'if' evaluation:\n%s", ex)
 
-        if test_conditions:
-            trace_set_result(choice="then")
-            with trace_path("then"):
-                await self._async_run_script(if_data["if_then"])
-                return
+        running_script = (
+            params[CONF_DOMAIN] == "automation" and params[CONF_SERVICE] == "trigger"
+        ) or params[CONF_DOMAIN] in ("python_script", "script")
+        trace_set_result(params=params, running_script=running_script)
+        response_data = await self._async_run_long_action(
+            self._hass.async_create_task_internal(
+                self._hass.services.async_call(
+                    **params,
+                    blocking=True,
+                    context=self._context,
+                    return_response=return_response,
+                ),
+                eager_start=True,
+            )
+        )
+        if response_variable:
+            self._variables[response_variable] = response_data
 
-        if if_data["if_else"] is not None:
-            trace_set_result(choice="else")
-            with trace_path("else"):
-                await self._async_run_script(if_data["if_else"])
+    async def _async_step_device(self) -> None:
+        """Perform the device automation specified in the action."""
+        self._step_log("device automation")
+        await device_action.async_call_action_from_config(
+            self._hass, self._action, dict(self._variables), self._context
+        )
+
+    async def _async_step_event(self) -> None:
+        """Fire an event."""
+        self._step_log(self._action.get(CONF_ALIAS, self._action[CONF_EVENT]))
+        event_data = {}
+        for conf in (CONF_EVENT_DATA, CONF_EVENT_DATA_TEMPLATE):
+            if conf not in self._action:
+                continue
+
+            try:
+                event_data.update(
+                    template.render_complex(self._action[conf], self._variables)
+                )
+            except exceptions.TemplateError as ex:
+                self._log(
+                    "Error rendering event data template: %s", ex, level=logging.ERROR
+                )
+
+        trace_set_result(event=self._action[CONF_EVENT], event_data=event_data)
+        self._hass.bus.async_fire_internal(
+            self._action[CONF_EVENT], event_data, context=self._context
+        )
+
+    async def _async_step_scene(self) -> None:
+        """Activate the scene specified in the action."""
+        self._step_log("activate scene")
+        trace_set_result(scene=self._action[CONF_SCENE])
+        await self._hass.services.async_call(
+            scene.DOMAIN,
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: self._action[CONF_SCENE]},
+            blocking=True,
+            context=self._context,
+        )
+
+    ## Time-based actions ##
 
     @overload
     def _async_futures_with_timeout(
@@ -1124,18 +1108,103 @@ class _ScriptRun:
             futures.append(timeout_future)
         return futures, timeout_handle, timeout_future
 
-    async def _async_wait_for_trigger_step(self) -> None:
+    def _get_pos_time_period_template(self, key: str) -> timedelta:
+        try:
+            return cv.positive_time_period(  # type: ignore[no-any-return]
+                template.render_complex(self._action[key], self._variables)
+            )
+        except (exceptions.TemplateError, vol.Invalid) as ex:
+            self._log(
+                "Error rendering %s %s template: %s",
+                self._script.name,
+                key,
+                ex,
+                level=logging.ERROR,
+            )
+            raise _AbortScript from ex
+
+    async def _async_step_delay(self) -> None:
+        """Handle delay."""
+        delay_delta = self._get_pos_time_period_template(CONF_DELAY)
+
+        self._step_log(f"delay {delay_delta}")
+
+        delay = delay_delta.total_seconds()
+        self._changed()
+        if not delay:
+            # Handle an empty delay
+            trace_set_result(delay=delay, done=True)
+            return
+
+        trace_set_result(delay=delay, done=False)
+        futures, timeout_handle, timeout_future = self._async_futures_with_timeout(
+            delay
+        )
+
+        try:
+            await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED)
+        finally:
+            if timeout_future.done():
+                trace_set_result(delay=delay, done=True)
+            else:
+                timeout_handle.cancel()
+
+    def _get_timeout_seconds_from_action(self) -> float | None:
+        """Get the timeout from the action."""
+        if CONF_TIMEOUT in self._action:
+            return self._get_pos_time_period_template(CONF_TIMEOUT).total_seconds()
+        return None
+
+    def _async_handle_timeout(self) -> None:
+        """Handle timeout."""
+        self._variables["wait"]["remaining"] = 0.0
+        if not self._action.get(CONF_CONTINUE_ON_TIMEOUT, True):
+            self._log(_TIMEOUT_MSG)
+            trace_set_result(wait=self._variables["wait"], timeout=True)
+            raise _AbortScript from TimeoutError()
+
+    async def _async_wait_with_optional_timeout(
+        self,
+        futures: list[asyncio.Future[None]],
+        timeout_handle: asyncio.TimerHandle | None,
+        timeout_future: asyncio.Future[None] | None,
+        unsub: Callable[[], None],
+    ) -> None:
+        try:
+            await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED)
+            if timeout_future and timeout_future.done():
+                self._async_handle_timeout()
+        finally:
+            if timeout_future and not timeout_future.done() and timeout_handle:
+                timeout_handle.cancel()
+
+            unsub()
+
+    def _async_set_remaining_time_var(
+        self, timeout_handle: asyncio.TimerHandle | None
+    ) -> None:
+        """Set the remaining time variable for a wait step."""
+        wait_var = self._variables["wait"]
+        if timeout_handle:
+            wait_var["remaining"] = timeout_handle.when() - self._hass.loop.time()
+        else:
+            wait_var["remaining"] = None
+
+    async def _async_step_wait_for_trigger(self) -> None:
         """Wait for a trigger event."""
         timeout = self._get_timeout_seconds_from_action()
 
         self._step_log("wait for trigger", timeout)
 
-        variables = {**self._variables}
-        self._variables["wait"] = {
-            "remaining": timeout,
-            "completed": False,
-            "trigger": None,
-        }
+        variables = dict(self._variables)
+        self._variables.assign_parallel_protected(
+            "wait",
+            {
+                "remaining": timeout,
+                "completed": False,
+                "trigger": None,
+            },
+        )
         trace_set_result(wait=self._variables["wait"])
 
         if timeout == 0:
@@ -1176,39 +1245,55 @@ class _ScriptRun:
             futures, timeout_handle, timeout_future, remove_triggers
         )
 
-    def _async_handle_timeout(self) -> None:
-        """Handle timeout."""
-        self._variables["wait"]["remaining"] = 0.0
-        if not self._action.get(CONF_CONTINUE_ON_TIMEOUT, True):
-            self._log(_TIMEOUT_MSG)
-            trace_set_result(wait=self._variables["wait"], timeout=True)
-            raise _AbortScript from TimeoutError()
+    async def _async_step_wait_template(self) -> None:
+        """Handle a wait template."""
+        timeout = self._get_timeout_seconds_from_action()
+        self._step_log("wait template", timeout)
 
-    async def _async_wait_with_optional_timeout(
-        self,
-        futures: list[asyncio.Future[None]],
-        timeout_handle: asyncio.TimerHandle | None,
-        timeout_future: asyncio.Future[None] | None,
-        unsub: Callable[[], None],
-    ) -> None:
-        try:
-            await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED)
-            if timeout_future and timeout_future.done():
-                self._async_handle_timeout()
-        finally:
-            if timeout_future and not timeout_future.done() and timeout_handle:
-                timeout_handle.cancel()
+        self._variables.assign_parallel_protected(
+            "wait", {"remaining": timeout, "completed": False}
+        )
+        trace_set_result(wait=self._variables["wait"])
 
-            unsub()
+        wait_template = self._action[CONF_WAIT_TEMPLATE]
 
-    async def _async_variables_step(self) -> None:
-        """Set a variable value."""
-        self._step_log("setting variables")
-        self._variables = self._action[CONF_VARIABLES].async_render(
-            self._hass, self._variables, render_as_defaults=False
+        # check if condition already okay
+        if condition.async_template(self._hass, wait_template, self._variables, False):
+            self._variables["wait"]["completed"] = True
+            self._changed()
+            return
+
+        if timeout == 0:
+            self._changed()
+            self._async_handle_timeout()
+            return
+
+        futures, timeout_handle, timeout_future = self._async_futures_with_timeout(
+            timeout
+        )
+        done = self._hass.loop.create_future()
+        futures.append(done)
+
+        @callback
+        def async_script_wait(
+            entity_id: str, from_s: State | None, to_s: State | None
+        ) -> None:
+            """Handle script after template condition is true."""
+            self._async_set_remaining_time_var(timeout_handle)
+            self._variables["wait"]["completed"] = True
+            _set_result_unless_done(done)
+
+        unsub = async_track_template(
+            self._hass, wait_template, async_script_wait, self._variables
+        )
+        self._changed()
+        await self._async_wait_with_optional_timeout(
+            futures, timeout_handle, timeout_future, unsub
         )
 
-    async def _async_set_conversation_response_step(self) -> None:
+    ## Conversation actions ##
+
+    async def _async_step_set_conversation_response(self) -> None:
         """Set conversation response."""
         self._step_log("setting conversation response")
         resp: template.Template | None = self._action[CONF_SET_CONVERSATION_RESPONSE]
@@ -1220,63 +1305,6 @@ class _ScriptRun:
             )
         trace_set_result(conversation_response=self._conversation_response)
 
-    async def _async_stop_step(self) -> None:
-        """Stop script execution."""
-        stop = self._action[CONF_STOP]
-        error = self._action.get(CONF_ERROR, False)
-        trace_set_result(stop=stop, error=error)
-        if error:
-            self._log("Error script sequence: %s", stop)
-            raise _AbortScript(stop)
-
-        self._log("Stop script sequence: %s", stop)
-        if CONF_RESPONSE_VARIABLE in self._action:
-            try:
-                response = self._variables[self._action[CONF_RESPONSE_VARIABLE]]
-            except KeyError as ex:
-                raise _AbortScript(
-                    f"Response variable '{self._action[CONF_RESPONSE_VARIABLE]}' "
-                    "is not defined"
-                ) from ex
-        else:
-            response = None
-        raise _StopScript(stop, response)
-
-    @async_trace_path("sequence")
-    async def _async_sequence_step(self) -> None:
-        """Run a sequence."""
-        sequence = await self._script._async_get_sequence_script(self._step)  # noqa: SLF001
-        await self._async_run_script(sequence)
-
-    @async_trace_path("parallel")
-    async def _async_parallel_step(self) -> None:
-        """Run a sequence in parallel."""
-        scripts = await self._script._async_get_parallel_scripts(self._step)  # noqa: SLF001
-
-        async def async_run_with_trace(idx: int, script: Script) -> None:
-            """Run a script with a trace path."""
-            trace_path_stack_cv.set(copy(trace_path_stack_cv.get()))
-            with trace_path([str(idx), "sequence"]):
-                await self._async_run_script(script)
-
-        results = await asyncio.gather(
-            *(async_run_with_trace(idx, script) for idx, script in enumerate(scripts)),
-            return_exceptions=True,
-        )
-        for result in results:
-            if isinstance(result, Exception):
-                raise result
-
-    async def _async_run_script(self, script: Script) -> None:
-        """Execute a script."""
-        result = await self._async_run_long_action(
-            self._hass.async_create_task_internal(
-                script.async_run(self._variables, self._context), eager_start=True
-            )
-        )
-        if result and result.conversation_response is not UNDEFINED:
-            self._conversation_response = result.conversation_response
-
 
 class _QueuedScriptRun(_ScriptRun):
     """Manage queued Script sequence run."""
@@ -1353,7 +1381,7 @@ async def _async_stop_scripts_at_shutdown(hass: HomeAssistant, event: Event) ->
         )
 
 
-type _VarsType = dict[str, Any] | Mapping[str, Any] | MappingProxyType[str, Any]
+type _VarsType = dict[str, Any] | Mapping[str, Any] | ScriptRunVariables
 
 
 def _referenced_extract_ids(data: Any, key: str, found: set[str]) -> None:
@@ -1391,7 +1419,7 @@ class ScriptRunResult:
 
     conversation_response: str | None | UndefinedType
     service_response: ServiceResponse
-    variables: dict[str, Any]
+    variables: Mapping[str, Any]
 
 
 class Script:
@@ -1406,7 +1434,6 @@ class Script:
         *,
         # Used in "Running <running_description>" log message
         change_listener: Callable[[], Any] | None = None,
-        copy_variables: bool = False,
         log_exceptions: bool = True,
         logger: logging.Logger | None = None,
         max_exceeded: str = DEFAULT_MAX_EXCEEDED,
@@ -1460,8 +1487,6 @@ class Script:
         self._parallel_scripts: dict[int, list[Script]] = {}
         self._sequence_scripts: dict[int, Script] = {}
         self.variables = variables
-        self._variables_dynamic = template.is_complex(variables)
-        self._copy_variables_on_run = copy_variables
 
     @property
     def change_listener(self) -> Callable[..., Any] | None:
@@ -1739,25 +1764,19 @@ class Script:
         if self.top_level:
             if self.variables:
                 try:
-                    variables = self.variables.async_render(
+                    run_variables = self.variables.async_render(
                         self._hass,
                         run_variables,
                     )
                 except exceptions.TemplateError as err:
                     self._log("Error rendering variables: %s", err, level=logging.ERROR)
                     raise
-            elif run_variables:
-                variables = dict(run_variables)
-            else:
-                variables = {}
 
+            variables = ScriptRunVariables.create_top_level(run_variables)
             variables["context"] = context
-        elif self._copy_variables_on_run:
-            # This is not the top level script, variables have been turned to a dict
-            variables = cast(dict[str, Any], copy(run_variables))
         else:
-            # This is not the top level script, variables have been turned to a dict
-            variables = cast(dict[str, Any], run_variables)
+            # This is not the top level script, run_variables is an instance of ScriptRunVariables
+            variables = cast(ScriptRunVariables, run_variables)
 
         # Prevent non-allowed recursive calls which will cause deadlocks when we try to
         # stop (restart) or wait for (queued) our own script run.
@@ -1983,7 +2002,6 @@ class Script:
                 max_runs=self.max_runs,
                 logger=self._logger,
                 top_level=False,
-                copy_variables=True,
             )
             parallel_script.change_listener = partial(
                 self._chain_change_listener, parallel_script
diff --git a/homeassistant/helpers/script_variables.py b/homeassistant/helpers/script_variables.py
index 2b4507abd64..54200e094e6 100644
--- a/homeassistant/helpers/script_variables.py
+++ b/homeassistant/helpers/script_variables.py
@@ -2,8 +2,10 @@
 
 from __future__ import annotations
 
+from collections import ChainMap, UserDict
 from collections.abc import Mapping
-from typing import Any
+from dataclasses import dataclass, field
+from typing import Any, cast
 
 from homeassistant.core import HomeAssistant, callback
 
@@ -24,30 +26,23 @@ class ScriptVariables:
         hass: HomeAssistant,
         run_variables: Mapping[str, Any] | None,
         *,
-        render_as_defaults: bool = True,
         limited: bool = False,
     ) -> dict[str, Any]:
         """Render script variables.
 
-        The run variables are used to compute the static variables.
-
-        If `render_as_defaults` is True, the run variables will not be overridden.
-
+        The run variables are included in the result.
+        The run variables are used to compute the rendered variable values.
+        The run variables will not be overridden.
+        The rendering happens one at a time, with previous results influencing the next.
         """
         if self._has_template is None:
             self._has_template = template.is_complex(self.variables)
 
         if not self._has_template:
-            if render_as_defaults:
-                rendered_variables = dict(self.variables)
+            rendered_variables = dict(self.variables)
 
-                if run_variables is not None:
-                    rendered_variables.update(run_variables)
-            else:
-                rendered_variables = (
-                    {} if run_variables is None else dict(run_variables)
-                )
-                rendered_variables.update(self.variables)
+            if run_variables is not None:
+                rendered_variables.update(run_variables)
 
             return rendered_variables
 
@@ -56,7 +51,7 @@ class ScriptVariables:
         for key, value in self.variables.items():
             # We can skip if we're going to override this key with
             # run variables anyway
-            if render_as_defaults and key in rendered_variables:
+            if key in rendered_variables:
                 continue
 
             rendered_variables[key] = template.render_complex(
@@ -65,6 +60,197 @@ class ScriptVariables:
 
         return rendered_variables
 
+    @callback
+    def async_simple_render(self, run_variables: Mapping[str, Any]) -> dict[str, Any]:
+        """Render script variables.
+
+        Simply renders the variables, the run variables are not included in the result.
+        The run variables are used to compute the rendered variable values.
+        The rendering happens one at a time, with previous results influencing the next.
+        """
+        if self._has_template is None:
+            self._has_template = template.is_complex(self.variables)
+
+        if not self._has_template:
+            return self.variables
+
+        run_variables = dict(run_variables)
+        rendered_variables = {}
+
+        for key, value in self.variables.items():
+            rendered_variable = template.render_complex(value, run_variables)
+            rendered_variables[key] = rendered_variable
+            run_variables[key] = rendered_variable
+
+        return rendered_variables
+
     def as_dict(self) -> dict[str, Any]:
         """Return dict version of this class."""
         return self.variables
+
+
+@dataclass
+class _ParallelData:
+    """Data used in each parallel sequence."""
+
+    # `protected` is for variables that need special protection in parallel sequences.
+    # What this means is that such a variable defined in one parallel sequence will not be
+    # clobbered by the variable with the same name assigned in another parallel sequence.
+    # It also means that such a variable will not be visible in the outer scope.
+    # Currently the only such variable is `wait`.
+    protected: dict[str, Any] = field(default_factory=dict)
+    # `outer_scope_writes` is for variables that are written to the outer scope from
+    # a parallel sequence. This is used for generating correct traces of changed variables
+    # for each of the parallel sequences, isolating them from one another.
+    outer_scope_writes: dict[str, Any] = field(default_factory=dict)
+
+
+@dataclass(kw_only=True)
+class ScriptRunVariables(UserDict[str, Any]):
+    """Class to hold script run variables.
+
+    The purpose of this class is to provide proper variable scoping semantics for scripts.
+    Each instance institutes a new local scope, in which variables can be defined.
+    Each instance has a reference to the previous instance, except for the top-level instance.
+    The instances therefore form a chain, in which variable lookup and assignment is performed.
+    The variables defined lower in the chain naturally override those defined higher up.
+    """
+
+    # _previous is the previous ScriptRunVariables in the chain
+    _previous: ScriptRunVariables | None = None
+    # _parent is the previous non-empty ScriptRunVariables in the chain
+    _parent: ScriptRunVariables | None = None
+
+    # _local_data is the store for local variables
+    _local_data: dict[str, Any] | None = None
+    # _parallel_data is used for each parallel sequence
+    _parallel_data: _ParallelData | None = None
+
+    # _non_parallel_scope includes all scopes all the way to the most recent parallel split
+    _non_parallel_scope: ChainMap[str, Any]
+    # _full_scope includes all scopes (all the way to the top-level)
+    _full_scope: ChainMap[str, Any]
+
+    @classmethod
+    def create_top_level(
+        cls,
+        initial_data: Mapping[str, Any] | None = None,
+    ) -> ScriptRunVariables:
+        """Create a new top-level ScriptRunVariables."""
+        local_data: dict[str, Any] = {}
+        non_parallel_scope = full_scope = ChainMap(local_data)
+        self = cls(
+            _local_data=local_data,
+            _non_parallel_scope=non_parallel_scope,
+            _full_scope=full_scope,
+        )
+        if initial_data is not None:
+            self.update(initial_data)
+        return self
+
+    def enter_scope(self, *, parallel: bool = False) -> ScriptRunVariables:
+        """Return a new child scope.
+
+        :param parallel: Whether the new scope starts a parallel sequence.
+        """
+        if self._local_data is not None or self._parallel_data is not None:
+            parent = self
+        else:
+            parent = cast(  # top level always has local data, so we can cast safely
+                ScriptRunVariables, self._parent
+            )
+
+        parallel_data: _ParallelData | None
+        if not parallel:
+            parallel_data = None
+            non_parallel_scope = self._non_parallel_scope
+            full_scope = self._full_scope
+        else:
+            parallel_data = _ParallelData()
+            non_parallel_scope = ChainMap(
+                parallel_data.protected, parallel_data.outer_scope_writes
+            )
+            full_scope = self._full_scope.new_child(parallel_data.protected)
+
+        return ScriptRunVariables(
+            _previous=self,
+            _parent=parent,
+            _parallel_data=parallel_data,
+            _non_parallel_scope=non_parallel_scope,
+            _full_scope=full_scope,
+        )
+
+    def exit_scope(self) -> ScriptRunVariables:
+        """Exit the current scope.
+
+        Does no clean-up, but simply returns the previous scope.
+        """
+        if self._previous is None:
+            raise ValueError("Cannot exit top-level scope")
+        return self._previous
+
+    def __delitem__(self, key: str) -> None:
+        """Delete a variable (disallowed)."""
+        raise TypeError("Deleting items is not allowed in ScriptRunVariables.")
+
+    def __setitem__(self, key: str, value: Any) -> None:
+        """Assign value to a variable."""
+        self._assign(key, value, parallel_protected=False)
+
+    def assign_parallel_protected(self, key: str, value: Any) -> None:
+        """Assign value to a variable which is to be protected in parallel sequences."""
+        self._assign(key, value, parallel_protected=True)
+
+    def _assign(self, key: str, value: Any, *, parallel_protected: bool) -> None:
+        """Assign value to a variable.
+
+        Value is always assigned to the variable in the nearest scope, in which it is defined.
+        If the variable is not defined at all, it is created in the top-level scope.
+
+        :param parallel_protected: Whether variable is to be protected in parallel sequences.
+        """
+        if self._local_data is not None and key in self._local_data:
+            self._local_data[key] = value
+            return
+
+        if self._parent is None:
+            assert self._local_data is not None  # top level always has local data
+            self._local_data[key] = value
+            return
+
+        if self._parallel_data is not None:
+            if parallel_protected:
+                self._parallel_data.protected[key] = value
+                return
+            self._parallel_data.protected.pop(key, None)
+            self._parallel_data.outer_scope_writes[key] = value
+
+        self._parent._assign(key, value, parallel_protected=parallel_protected)  # noqa: SLF001
+
+    def define_local(self, key: str, value: Any) -> None:
+        """Define a local variable and assign value to it."""
+        if self._local_data is None:
+            self._local_data = {}
+            self._non_parallel_scope = self._non_parallel_scope.new_child(
+                self._local_data
+            )
+            self._full_scope = self._full_scope.new_child(self._local_data)
+        self._local_data[key] = value
+
+    @property
+    def data(self) -> Mapping[str, Any]:  # type: ignore[override]
+        """Return variables in full scope.
+
+        Defined here for UserDict compatibility.
+        """
+        return self._full_scope
+
+    @property
+    def non_parallel_scope(self) -> Mapping[str, Any]:
+        """Return variables in non-parallel scope."""
+        return self._non_parallel_scope
+
+    @property
+    def local_scope(self) -> Mapping[str, Any]:
+        """Return variables in local scope."""
+        return self._local_data if self._local_data is not None else {}
diff --git a/homeassistant/helpers/selector.py b/homeassistant/helpers/selector.py
index 025b8de8896..f2c76d1d019 100644
--- a/homeassistant/helpers/selector.py
+++ b/homeassistant/helpers/selector.py
@@ -164,6 +164,8 @@ DEVICE_FILTER_SELECTOR_CONFIG_SCHEMA = vol.Schema(
         vol.Optional("manufacturer"): str,
         # Model of device
         vol.Optional("model"): str,
+        # Model ID of device
+        vol.Optional("model_id"): str,
         # Device has to contain entities matching this selector
         vol.Optional("entity"): vol.All(
             cv.ensure_list, [ENTITY_FILTER_SELECTOR_CONFIG_SCHEMA]
@@ -178,6 +180,7 @@ class DeviceFilterSelectorConfig(TypedDict, total=False):
     integration: str
     manufacturer: str
     model: str
+    model_id: str
 
 
 class ActionSelectorConfig(TypedDict):
@@ -1133,7 +1136,7 @@ class SelectOptionDict(TypedDict):
 
 
 class SelectSelectorMode(StrEnum):
-    """Possible modes for a number selector."""
+    """Possible modes for a select selector."""
 
     LIST = "list"
     DROPDOWN = "dropdown"
diff --git a/homeassistant/helpers/service.py b/homeassistant/helpers/service.py
index 255739c0059..4873d935537 100644
--- a/homeassistant/helpers/service.py
+++ b/homeassistant/helpers/service.py
@@ -88,6 +88,7 @@ def _base_components() -> dict[str, ModuleType]:
     # pylint: disable-next=import-outside-toplevel
     from homeassistant.components import (
         alarm_control_panel,
+        assist_satellite,
         calendar,
         camera,
         climate,
@@ -108,6 +109,7 @@ def _base_components() -> dict[str, ModuleType]:
 
     return {
         "alarm_control_panel": alarm_control_panel,
+        "assist_satellite": assist_satellite,
         "calendar": calendar,
         "camera": camera,
         "climate": climate,
diff --git a/homeassistant/helpers/storage.py b/homeassistant/helpers/storage.py
index ac1fe3bb29d..fe94be68763 100644
--- a/homeassistant/helpers/storage.py
+++ b/homeassistant/helpers/storage.py
@@ -30,8 +30,7 @@ from homeassistant.core import (
 )
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.loader import bind_hass
-from homeassistant.util import json as json_util
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util, json as json_util
 from homeassistant.util.file import WriteError
 from homeassistant.util.hass_dict import HassKey
 
diff --git a/homeassistant/helpers/template.py b/homeassistant/helpers/template.py
index 7866250d658..9468eb6bf49 100644
--- a/homeassistant/helpers/template.py
+++ b/homeassistant/helpers/template.py
@@ -6,12 +6,13 @@ from ast import literal_eval
 import asyncio
 import base64
 import collections.abc
-from collections.abc import Callable, Generator, Iterable
+from collections.abc import Callable, Generator, Iterable, MutableSequence
 from contextlib import AbstractContextManager
 from contextvars import ContextVar
 from copy import deepcopy
 from datetime import date, datetime, time, timedelta
 from functools import cache, lru_cache, partial, wraps
+import hashlib
 import json
 import logging
 import math
@@ -1477,10 +1478,14 @@ def floors(hass: HomeAssistant) -> Iterable[str | None]:
 
 
 def floor_id(hass: HomeAssistant, lookup_value: Any) -> str | None:
-    """Get the floor ID from a floor name."""
+    """Get the floor ID from a floor or area name, alias, device id, or entity id."""
     floor_registry = fr.async_get(hass)
-    if floor := floor_registry.async_get_floor_by_name(str(lookup_value)):
+    lookup_str = str(lookup_value)
+    if floor := floor_registry.async_get_floor_by_name(lookup_str):
         return floor.floor_id
+    floors_list = floor_registry.async_get_floors_by_alias(lookup_str)
+    if floors_list:
+        return floors_list[0].floor_id
 
     if aid := area_id(hass, lookup_value):
         area_reg = area_registry.async_get(hass)
@@ -1525,16 +1530,29 @@ def floor_areas(hass: HomeAssistant, floor_id_or_name: str) -> Iterable[str]:
     return [entry.id for entry in entries if entry.id]
 
 
+def floor_entities(hass: HomeAssistant, floor_id_or_name: str) -> Iterable[str]:
+    """Return entity_ids for a given floor ID or name."""
+    return [
+        entity_id
+        for area_id in floor_areas(hass, floor_id_or_name)
+        for entity_id in area_entities(hass, area_id)
+    ]
+
+
 def areas(hass: HomeAssistant) -> Iterable[str | None]:
     """Return all areas."""
     return list(area_registry.async_get(hass).areas)
 
 
 def area_id(hass: HomeAssistant, lookup_value: str) -> str | None:
-    """Get the area ID from an area name, device id, or entity id."""
+    """Get the area ID from an area name, alias, device id, or entity id."""
     area_reg = area_registry.async_get(hass)
-    if area := area_reg.async_get_area_by_name(str(lookup_value)):
+    lookup_str = str(lookup_value)
+    if area := area_reg.async_get_area_by_name(lookup_str):
         return area.id
+    areas_list = area_reg.async_get_areas_by_alias(lookup_str)
+    if areas_list:
+        return areas_list[0].id
 
     ent_reg = entity_registry.async_get(hass)
     dev_reg = device_registry.async_get(hass)
@@ -2727,6 +2745,144 @@ def iif(
     return if_false
 
 
+def shuffle(*args: Any, seed: Any = None) -> MutableSequence[Any]:
+    """Shuffle a list, either with a seed or without."""
+    if not args:
+        raise TypeError("shuffle expected at least 1 argument, got 0")
+
+    # If first argument is iterable and more than 1 argument provided
+    # but not a named seed, then use 2nd argument as seed.
+    if isinstance(args[0], Iterable):
+        items = list(args[0])
+        if len(args) > 1 and seed is None:
+            seed = args[1]
+    elif len(args) == 1:
+        raise TypeError(f"'{type(args[0]).__name__}' object is not iterable")
+    else:
+        items = list(args)
+
+    if seed:
+        r = random.Random(seed)
+        r.shuffle(items)
+    else:
+        random.shuffle(items)
+    return items
+
+
+def typeof(value: Any) -> Any:
+    """Return the type of value passed to debug types."""
+    return value.__class__.__name__
+
+
+def flatten(value: Iterable[Any], levels: int | None = None) -> list[Any]:
+    """Flattens list of lists."""
+    if not isinstance(value, Iterable) or isinstance(value, str):
+        raise TypeError(f"flatten expected a list, got {type(value).__name__}")
+
+    flattened: list[Any] = []
+    for item in value:
+        if isinstance(item, Iterable) and not isinstance(item, str):
+            if levels is None:
+                flattened.extend(flatten(item))
+            elif levels >= 1:
+                flattened.extend(flatten(item, levels=(levels - 1)))
+            else:
+                flattened.append(item)
+        else:
+            flattened.append(item)
+    return flattened
+
+
+def intersect(value: Iterable[Any], other: Iterable[Any]) -> list[Any]:
+    """Return the common elements between two lists."""
+    if not isinstance(value, Iterable) or isinstance(value, str):
+        raise TypeError(f"intersect expected a list, got {type(value).__name__}")
+    if not isinstance(other, Iterable) or isinstance(other, str):
+        raise TypeError(f"intersect expected a list, got {type(other).__name__}")
+
+    return list(set(value) & set(other))
+
+
+def difference(value: Iterable[Any], other: Iterable[Any]) -> list[Any]:
+    """Return elements in first list that are not in second list."""
+    if not isinstance(value, Iterable) or isinstance(value, str):
+        raise TypeError(f"difference expected a list, got {type(value).__name__}")
+    if not isinstance(other, Iterable) or isinstance(other, str):
+        raise TypeError(f"difference expected a list, got {type(other).__name__}")
+
+    return list(set(value) - set(other))
+
+
+def union(value: Iterable[Any], other: Iterable[Any]) -> list[Any]:
+    """Return all unique elements from both lists combined."""
+    if not isinstance(value, Iterable) or isinstance(value, str):
+        raise TypeError(f"union expected a list, got {type(value).__name__}")
+    if not isinstance(other, Iterable) or isinstance(other, str):
+        raise TypeError(f"union expected a list, got {type(other).__name__}")
+
+    return list(set(value) | set(other))
+
+
+def symmetric_difference(value: Iterable[Any], other: Iterable[Any]) -> list[Any]:
+    """Return elements that are in either list but not in both."""
+    if not isinstance(value, Iterable) or isinstance(value, str):
+        raise TypeError(
+            f"symmetric_difference expected a list, got {type(value).__name__}"
+        )
+    if not isinstance(other, Iterable) or isinstance(other, str):
+        raise TypeError(
+            f"symmetric_difference expected a list, got {type(other).__name__}"
+        )
+
+    return list(set(value) ^ set(other))
+
+
+def combine(*args: Any, recursive: bool = False) -> dict[Any, Any]:
+    """Combine multiple dictionaries into one."""
+    if not args:
+        raise TypeError("combine expected at least 1 argument, got 0")
+
+    result: dict[Any, Any] = {}
+    for arg in args:
+        if not isinstance(arg, dict):
+            raise TypeError(f"combine expected a dict, got {type(arg).__name__}")
+
+        if recursive:
+            for key, value in arg.items():
+                if (
+                    key in result
+                    and isinstance(result[key], dict)
+                    and isinstance(value, dict)
+                ):
+                    result[key] = combine(result[key], value, recursive=True)
+                else:
+                    result[key] = value
+        else:
+            result |= arg
+
+    return result
+
+
+def md5(value: str) -> str:
+    """Generate md5 hash from a string."""
+    return hashlib.md5(value.encode()).hexdigest()
+
+
+def sha1(value: str) -> str:
+    """Generate sha1 hash from a string."""
+    return hashlib.sha1(value.encode()).hexdigest()
+
+
+def sha256(value: str) -> str:
+    """Generate sha256 hash from a string."""
+    return hashlib.sha256(value.encode()).hexdigest()
+
+
+def sha512(value: str) -> str:
+    """Generate sha512 hash from a string."""
+    return hashlib.sha512(value.encode()).hexdigest()
+
+
 class TemplateContextManager(AbstractContextManager):
     """Context manager to store template being parsed or rendered in a ContextVar."""
 
@@ -2879,100 +3035,127 @@ class TemplateEnvironment(ImmutableSandboxedEnvironment):
             str | jinja2.nodes.Template, CodeType | None
         ] = weakref.WeakValueDictionary()
         self.add_extension("jinja2.ext.loopcontrols")
-        self.filters["round"] = forgiving_round
-        self.filters["multiply"] = multiply
-        self.filters["add"] = add
-        self.filters["log"] = logarithm
-        self.filters["sin"] = sine
-        self.filters["cos"] = cosine
-        self.filters["tan"] = tangent
-        self.filters["asin"] = arc_sine
-        self.filters["acos"] = arc_cosine
-        self.filters["atan"] = arc_tangent
-        self.filters["atan2"] = arc_tangent2
-        self.filters["sqrt"] = square_root
-        self.filters["as_datetime"] = as_datetime
-        self.filters["as_timedelta"] = as_timedelta
-        self.filters["as_timestamp"] = forgiving_as_timestamp
-        self.filters["as_local"] = dt_util.as_local
-        self.filters["timestamp_custom"] = timestamp_custom
-        self.filters["timestamp_local"] = timestamp_local
-        self.filters["timestamp_utc"] = timestamp_utc
-        self.filters["to_json"] = to_json
-        self.filters["from_json"] = from_json
-        self.filters["is_defined"] = fail_when_undefined
-        self.filters["average"] = average
-        self.filters["median"] = median
-        self.filters["statistical_mode"] = statistical_mode
-        self.filters["random"] = random_every_time
-        self.filters["base64_encode"] = base64_encode
-        self.filters["base64_decode"] = base64_decode
-        self.filters["ordinal"] = ordinal
-        self.filters["regex_match"] = regex_match
-        self.filters["regex_replace"] = regex_replace
-        self.filters["regex_search"] = regex_search
-        self.filters["regex_findall"] = regex_findall
-        self.filters["regex_findall_index"] = regex_findall_index
-        self.filters["bitwise_and"] = bitwise_and
-        self.filters["bitwise_or"] = bitwise_or
-        self.filters["bitwise_xor"] = bitwise_xor
-        self.filters["pack"] = struct_pack
-        self.filters["unpack"] = struct_unpack
-        self.filters["ord"] = ord
-        self.filters["is_number"] = is_number
-        self.filters["float"] = forgiving_float_filter
-        self.filters["int"] = forgiving_int_filter
-        self.filters["slugify"] = slugify
-        self.filters["iif"] = iif
-        self.filters["bool"] = forgiving_boolean
-        self.filters["version"] = version
-        self.filters["contains"] = contains
-        self.globals["log"] = logarithm
-        self.globals["sin"] = sine
-        self.globals["cos"] = cosine
-        self.globals["tan"] = tangent
-        self.globals["sqrt"] = square_root
-        self.globals["pi"] = math.pi
-        self.globals["tau"] = math.pi * 2
-        self.globals["e"] = math.e
-        self.globals["asin"] = arc_sine
+
         self.globals["acos"] = arc_cosine
-        self.globals["atan"] = arc_tangent
-        self.globals["atan2"] = arc_tangent2
-        self.globals["float"] = forgiving_float
         self.globals["as_datetime"] = as_datetime
         self.globals["as_local"] = dt_util.as_local
         self.globals["as_timedelta"] = as_timedelta
         self.globals["as_timestamp"] = forgiving_as_timestamp
-        self.globals["timedelta"] = timedelta
-        self.globals["merge_response"] = merge_response
-        self.globals["strptime"] = strptime
-        self.globals["urlencode"] = urlencode
+        self.globals["asin"] = arc_sine
+        self.globals["atan"] = arc_tangent
+        self.globals["atan2"] = arc_tangent2
         self.globals["average"] = average
-        self.globals["median"] = median
-        self.globals["statistical_mode"] = statistical_mode
-        self.globals["max"] = min_max_from_filter(self.filters["max"], "max")
-        self.globals["min"] = min_max_from_filter(self.filters["min"], "min")
-        self.globals["is_number"] = is_number
-        self.globals["set"] = _to_set
-        self.globals["tuple"] = _to_tuple
-        self.globals["int"] = forgiving_int
-        self.globals["pack"] = struct_pack
-        self.globals["unpack"] = struct_unpack
-        self.globals["slugify"] = slugify
-        self.globals["iif"] = iif
         self.globals["bool"] = forgiving_boolean
+        self.globals["combine"] = combine
+        self.globals["cos"] = cosine
+        self.globals["difference"] = difference
+        self.globals["e"] = math.e
+        self.globals["flatten"] = flatten
+        self.globals["float"] = forgiving_float
+        self.globals["iif"] = iif
+        self.globals["int"] = forgiving_int
+        self.globals["intersect"] = intersect
+        self.globals["is_number"] = is_number
+        self.globals["log"] = logarithm
+        self.globals["max"] = min_max_from_filter(self.filters["max"], "max")
+        self.globals["md5"] = md5
+        self.globals["median"] = median
+        self.globals["merge_response"] = merge_response
+        self.globals["min"] = min_max_from_filter(self.filters["min"], "min")
+        self.globals["pack"] = struct_pack
+        self.globals["pi"] = math.pi
+        self.globals["set"] = _to_set
+        self.globals["sha1"] = sha1
+        self.globals["sha256"] = sha256
+        self.globals["sha512"] = sha512
+        self.globals["shuffle"] = shuffle
+        self.globals["sin"] = sine
+        self.globals["slugify"] = slugify
+        self.globals["sqrt"] = square_root
+        self.globals["statistical_mode"] = statistical_mode
+        self.globals["strptime"] = strptime
+        self.globals["symmetric_difference"] = symmetric_difference
+        self.globals["tan"] = tangent
+        self.globals["tau"] = math.pi * 2
+        self.globals["timedelta"] = timedelta
+        self.globals["tuple"] = _to_tuple
+        self.globals["typeof"] = typeof
+        self.globals["union"] = union
+        self.globals["unpack"] = struct_unpack
+        self.globals["urlencode"] = urlencode
         self.globals["version"] = version
         self.globals["zip"] = zip
+
+        self.filters["acos"] = arc_cosine
+        self.filters["add"] = add
+        self.filters["as_datetime"] = as_datetime
+        self.filters["as_local"] = dt_util.as_local
+        self.filters["as_timedelta"] = as_timedelta
+        self.filters["as_timestamp"] = forgiving_as_timestamp
+        self.filters["asin"] = arc_sine
+        self.filters["atan"] = arc_tangent
+        self.filters["atan2"] = arc_tangent2
+        self.filters["average"] = average
+        self.filters["base64_decode"] = base64_decode
+        self.filters["base64_encode"] = base64_encode
+        self.filters["bitwise_and"] = bitwise_and
+        self.filters["bitwise_or"] = bitwise_or
+        self.filters["bitwise_xor"] = bitwise_xor
+        self.filters["bool"] = forgiving_boolean
+        self.filters["combine"] = combine
+        self.filters["contains"] = contains
+        self.filters["cos"] = cosine
+        self.filters["difference"] = difference
+        self.filters["flatten"] = flatten
+        self.filters["float"] = forgiving_float_filter
+        self.filters["from_json"] = from_json
+        self.filters["iif"] = iif
+        self.filters["int"] = forgiving_int_filter
+        self.filters["intersect"] = intersect
+        self.filters["is_defined"] = fail_when_undefined
+        self.filters["is_number"] = is_number
+        self.filters["log"] = logarithm
+        self.filters["md5"] = md5
+        self.filters["median"] = median
+        self.filters["multiply"] = multiply
+        self.filters["ord"] = ord
+        self.filters["ordinal"] = ordinal
+        self.filters["pack"] = struct_pack
+        self.filters["random"] = random_every_time
+        self.filters["regex_findall_index"] = regex_findall_index
+        self.filters["regex_findall"] = regex_findall
+        self.filters["regex_match"] = regex_match
+        self.filters["regex_replace"] = regex_replace
+        self.filters["regex_search"] = regex_search
+        self.filters["round"] = forgiving_round
+        self.filters["sha1"] = sha1
+        self.filters["sha256"] = sha256
+        self.filters["sha512"] = sha512
+        self.filters["shuffle"] = shuffle
+        self.filters["sin"] = sine
+        self.filters["slugify"] = slugify
+        self.filters["sqrt"] = square_root
+        self.filters["statistical_mode"] = statistical_mode
+        self.filters["symmetric_difference"] = symmetric_difference
+        self.filters["tan"] = tangent
+        self.filters["timestamp_custom"] = timestamp_custom
+        self.filters["timestamp_local"] = timestamp_local
+        self.filters["timestamp_utc"] = timestamp_utc
+        self.filters["to_json"] = to_json
+        self.filters["typeof"] = typeof
+        self.filters["union"] = union
+        self.filters["unpack"] = struct_unpack
+        self.filters["version"] = version
+
+        self.tests["contains"] = contains
+        self.tests["datetime"] = _is_datetime
         self.tests["is_number"] = is_number
         self.tests["list"] = _is_list
-        self.tests["set"] = _is_set
-        self.tests["tuple"] = _is_tuple
-        self.tests["datetime"] = _is_datetime
-        self.tests["string_like"] = _is_string_like
         self.tests["match"] = regex_match
         self.tests["search"] = regex_search
-        self.tests["contains"] = contains
+        self.tests["set"] = _is_set
+        self.tests["string_like"] = _is_string_like
+        self.tests["tuple"] = _is_tuple
 
         if hass is None:
             return
@@ -2999,28 +3182,7 @@ class TemplateEnvironment(ImmutableSandboxedEnvironment):
 
             return jinja_context(wrapper)
 
-        self.globals["device_entities"] = hassfunction(device_entities)
-        self.filters["device_entities"] = self.globals["device_entities"]
-
-        self.globals["device_attr"] = hassfunction(device_attr)
-        self.filters["device_attr"] = self.globals["device_attr"]
-
-        self.globals["config_entry_attr"] = hassfunction(config_entry_attr)
-        self.filters["config_entry_attr"] = self.globals["config_entry_attr"]
-
-        self.globals["is_device_attr"] = hassfunction(is_device_attr)
-        self.tests["is_device_attr"] = hassfunction(is_device_attr, pass_eval_context)
-
-        self.globals["config_entry_id"] = hassfunction(config_entry_id)
-        self.filters["config_entry_id"] = self.globals["config_entry_id"]
-
-        self.globals["device_id"] = hassfunction(device_id)
-        self.filters["device_id"] = self.globals["device_id"]
-
-        self.globals["issues"] = hassfunction(issues)
-
-        self.globals["issue"] = hassfunction(issue)
-        self.filters["issue"] = self.globals["issue"]
+        # Area extensions
 
         self.globals["areas"] = hassfunction(areas)
 
@@ -3036,6 +3198,8 @@ class TemplateEnvironment(ImmutableSandboxedEnvironment):
         self.globals["area_devices"] = hassfunction(area_devices)
         self.filters["area_devices"] = self.globals["area_devices"]
 
+        # Floor extensions
+
         self.globals["floors"] = hassfunction(floors)
         self.filters["floors"] = self.globals["floors"]
 
@@ -3048,9 +3212,38 @@ class TemplateEnvironment(ImmutableSandboxedEnvironment):
         self.globals["floor_areas"] = hassfunction(floor_areas)
         self.filters["floor_areas"] = self.globals["floor_areas"]
 
+        self.globals["floor_entities"] = hassfunction(floor_entities)
+        self.filters["floor_entities"] = self.globals["floor_entities"]
+
+        # Integration extensions
+
         self.globals["integration_entities"] = hassfunction(integration_entities)
         self.filters["integration_entities"] = self.globals["integration_entities"]
 
+        # Config entry extensions
+
+        self.globals["config_entry_attr"] = hassfunction(config_entry_attr)
+        self.filters["config_entry_attr"] = self.globals["config_entry_attr"]
+
+        self.globals["config_entry_id"] = hassfunction(config_entry_id)
+        self.filters["config_entry_id"] = self.globals["config_entry_id"]
+
+        # Device extensions
+
+        self.globals["device_attr"] = hassfunction(device_attr)
+        self.filters["device_attr"] = self.globals["device_attr"]
+
+        self.globals["device_entities"] = hassfunction(device_entities)
+        self.filters["device_entities"] = self.globals["device_entities"]
+
+        self.globals["is_device_attr"] = hassfunction(is_device_attr)
+        self.tests["is_device_attr"] = hassfunction(is_device_attr, pass_eval_context)
+
+        self.globals["device_id"] = hassfunction(device_id)
+        self.filters["device_id"] = self.globals["device_id"]
+
+        # Label extensions
+
         self.globals["labels"] = hassfunction(labels)
         self.filters["labels"] = self.globals["labels"]
 
@@ -3069,6 +3262,12 @@ class TemplateEnvironment(ImmutableSandboxedEnvironment):
         self.globals["label_entities"] = hassfunction(label_entities)
         self.filters["label_entities"] = self.globals["label_entities"]
 
+        # Issue extensions
+
+        self.globals["issues"] = hassfunction(issues)
+        self.globals["issue"] = hassfunction(issue)
+        self.filters["issue"] = self.globals["issue"]
+
         if limited:
             # Only device_entities is available to limited templates, mark other
             # functions and filters as unsupported.
@@ -3081,38 +3280,38 @@ class TemplateEnvironment(ImmutableSandboxedEnvironment):
                 return warn_unsupported
 
             hass_globals = [
-                "closest",
-                "distance",
-                "expand",
-                "is_hidden_entity",
-                "is_state",
-                "is_state_attr",
-                "state_attr",
-                "states",
-                "state_translated",
-                "has_value",
-                "utcnow",
-                "now",
-                "device_attr",
-                "is_device_attr",
-                "device_id",
                 "area_id",
                 "area_name",
+                "closest",
+                "device_attr",
+                "device_id",
+                "distance",
+                "expand",
                 "floor_id",
                 "floor_name",
+                "has_value",
+                "is_device_attr",
+                "is_hidden_entity",
+                "is_state_attr",
+                "is_state",
+                "label_id",
+                "label_name",
+                "now",
                 "relative_time",
+                "state_attr",
+                "state_translated",
+                "states",
                 "time_since",
                 "time_until",
                 "today_at",
-                "label_id",
-                "label_name",
+                "utcnow",
             ]
             hass_filters = [
-                "closest",
-                "expand",
-                "device_id",
                 "area_id",
                 "area_name",
+                "closest",
+                "device_id",
+                "expand",
                 "floor_id",
                 "floor_name",
                 "has_value",
@@ -3122,8 +3321,8 @@ class TemplateEnvironment(ImmutableSandboxedEnvironment):
             hass_tests = [
                 "has_value",
                 "is_hidden_entity",
-                "is_state",
                 "is_state_attr",
+                "is_state",
             ]
             for glob in hass_globals:
                 self.globals[glob] = unsupported(glob)
@@ -3133,38 +3332,46 @@ class TemplateEnvironment(ImmutableSandboxedEnvironment):
                 self.filters[test] = unsupported(test)
             return
 
-        self.globals["expand"] = hassfunction(expand)
-        self.filters["expand"] = self.globals["expand"]
         self.globals["closest"] = hassfunction(closest)
-        self.filters["closest"] = hassfunction(closest_filter)
         self.globals["distance"] = hassfunction(distance)
+        self.globals["expand"] = hassfunction(expand)
+        self.globals["has_value"] = hassfunction(has_value)
+        self.globals["now"] = hassfunction(now)
+        self.globals["relative_time"] = hassfunction(relative_time)
+        self.globals["time_since"] = hassfunction(time_since)
+        self.globals["time_until"] = hassfunction(time_until)
+        self.globals["today_at"] = hassfunction(today_at)
+        self.globals["utcnow"] = hassfunction(utcnow)
+
+        self.filters["closest"] = hassfunction(closest_filter)
+        self.filters["expand"] = self.globals["expand"]
+        self.filters["has_value"] = self.globals["has_value"]
+        self.filters["relative_time"] = self.globals["relative_time"]
+        self.filters["time_since"] = self.globals["time_since"]
+        self.filters["time_until"] = self.globals["time_until"]
+        self.filters["today_at"] = self.globals["today_at"]
+
+        self.tests["has_value"] = hassfunction(has_value, pass_eval_context)
+
+        # Entity extensions
+
         self.globals["is_hidden_entity"] = hassfunction(is_hidden_entity)
         self.tests["is_hidden_entity"] = hassfunction(
             is_hidden_entity, pass_eval_context
         )
-        self.globals["is_state"] = hassfunction(is_state)
-        self.tests["is_state"] = hassfunction(is_state, pass_eval_context)
+
+        # State extensions
+
         self.globals["is_state_attr"] = hassfunction(is_state_attr)
-        self.tests["is_state_attr"] = hassfunction(is_state_attr, pass_eval_context)
+        self.globals["is_state"] = hassfunction(is_state)
         self.globals["state_attr"] = hassfunction(state_attr)
-        self.filters["state_attr"] = self.globals["state_attr"]
-        self.globals["states"] = AllStates(hass)
-        self.filters["states"] = self.globals["states"]
         self.globals["state_translated"] = StateTranslated(hass)
+        self.globals["states"] = AllStates(hass)
+        self.filters["state_attr"] = self.globals["state_attr"]
         self.filters["state_translated"] = self.globals["state_translated"]
-        self.globals["has_value"] = hassfunction(has_value)
-        self.filters["has_value"] = self.globals["has_value"]
-        self.tests["has_value"] = hassfunction(has_value, pass_eval_context)
-        self.globals["utcnow"] = hassfunction(utcnow)
-        self.globals["now"] = hassfunction(now)
-        self.globals["relative_time"] = hassfunction(relative_time)
-        self.filters["relative_time"] = self.globals["relative_time"]
-        self.globals["time_since"] = hassfunction(time_since)
-        self.filters["time_since"] = self.globals["time_since"]
-        self.globals["time_until"] = hassfunction(time_until)
-        self.filters["time_until"] = self.globals["time_until"]
-        self.globals["today_at"] = hassfunction(today_at)
-        self.filters["today_at"] = self.globals["today_at"]
+        self.filters["states"] = self.globals["states"]
+        self.tests["is_state_attr"] = hassfunction(is_state_attr, pass_eval_context)
+        self.tests["is_state"] = hassfunction(is_state, pass_eval_context)
 
     def is_safe_callable(self, obj):
         """Test if callback is safe."""
diff --git a/homeassistant/helpers/trace.py b/homeassistant/helpers/trace.py
index d191d474480..ef11028515a 100644
--- a/homeassistant/helpers/trace.py
+++ b/homeassistant/helpers/trace.py
@@ -10,7 +10,7 @@ from functools import wraps
 from typing import Any
 
 from homeassistant.core import ServiceResponse
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .typing import TemplateVarsType
 
diff --git a/homeassistant/helpers/trigger.py b/homeassistant/helpers/trigger.py
index 67e9010df79..a27c85a5c58 100644
--- a/homeassistant/helpers/trigger.py
+++ b/homeassistant/helpers/trigger.py
@@ -265,18 +265,18 @@ def _trigger_action_wrapper(
     while isinstance(check_func, functools.partial):
         check_func = check_func.func
 
-    wrapper_func: Callable[..., None] | Callable[..., Coroutine[Any, Any, None]]
+    wrapper_func: Callable[..., Any] | Callable[..., Coroutine[Any, Any, Any]]
     if asyncio.iscoroutinefunction(check_func):
-        async_action = cast(Callable[..., Coroutine[Any, Any, None]], action)
+        async_action = cast(Callable[..., Coroutine[Any, Any, Any]], action)
 
         @functools.wraps(async_action)
         async def async_with_vars(
             run_variables: dict[str, Any], context: Context | None = None
-        ) -> None:
+        ) -> Any:
             """Wrap action with extra vars."""
             trigger_variables = conf[CONF_VARIABLES]
             run_variables.update(trigger_variables.async_render(hass, run_variables))
-            await action(run_variables, context)
+            return await action(run_variables, context)
 
         wrapper_func = async_with_vars
 
@@ -285,11 +285,11 @@ def _trigger_action_wrapper(
         @functools.wraps(action)
         async def with_vars(
             run_variables: dict[str, Any], context: Context | None = None
-        ) -> None:
+        ) -> Any:
             """Wrap action with extra vars."""
             trigger_variables = conf[CONF_VARIABLES]
             run_variables.update(trigger_variables.async_render(hass, run_variables))
-            action(run_variables, context)
+            return action(run_variables, context)
 
         if is_callback(check_func):
             with_vars = callback(with_vars)
diff --git a/homeassistant/helpers/update_coordinator.py b/homeassistant/helpers/update_coordinator.py
index 943eadff19a..7130264eb0d 100644
--- a/homeassistant/helpers/update_coordinator.py
+++ b/homeassistant/helpers/update_coordinator.py
@@ -6,6 +6,7 @@ from abc import abstractmethod
 import asyncio
 from collections.abc import Awaitable, Callable, Coroutine, Generator
 from datetime import datetime, timedelta
+from functools import partial
 import logging
 from random import randint
 from time import monotonic
@@ -103,7 +104,8 @@ class DataUpdateCoordinator(BaseDataUpdateCoordinatorProtocol, Generic[_DataT]):
             randint(event.RANDOM_MICROSECOND_MIN, event.RANDOM_MICROSECOND_MAX) / 10**6
         )
 
-        self._listeners: dict[CALLBACK_TYPE, tuple[CALLBACK_TYPE, object | None]] = {}
+        self._listeners: dict[int, tuple[CALLBACK_TYPE, object | None]] = {}
+        self._last_listener_id: int = 0
         self._unsub_refresh: CALLBACK_TYPE | None = None
         self._unsub_shutdown: CALLBACK_TYPE | None = None
         self._request_refresh_task: asyncio.TimerHandle | None = None
@@ -148,21 +150,26 @@ class DataUpdateCoordinator(BaseDataUpdateCoordinatorProtocol, Generic[_DataT]):
     ) -> Callable[[], None]:
         """Listen for data updates."""
         schedule_refresh = not self._listeners
-
-        @callback
-        def remove_listener() -> None:
-            """Remove update listener."""
-            self._listeners.pop(remove_listener)
-            if not self._listeners:
-                self._unschedule_refresh()
-
-        self._listeners[remove_listener] = (update_callback, context)
+        self._last_listener_id += 1
+        self._listeners[self._last_listener_id] = (update_callback, context)
 
         # This is the first listener, set up interval.
         if schedule_refresh:
             self._schedule_refresh()
 
-        return remove_listener
+        return partial(self.__async_remove_listener_internal, self._last_listener_id)
+
+    @callback
+    def __async_remove_listener_internal(self, listener_id: int) -> None:
+        """Remove a listener.
+
+        This is an internal function that is not to be overridden
+        in subclasses as it may change in the future.
+        """
+        self._listeners.pop(listener_id)
+        if not self._listeners:
+            self._unschedule_refresh()
+            self._debounced_refresh.async_cancel()
 
     @callback
     def async_update_listeners(self) -> None:
@@ -341,8 +348,8 @@ class DataUpdateCoordinator(BaseDataUpdateCoordinatorProtocol, Generic[_DataT]):
         only once during the first refresh.
         """
         if self.setup_method is None:
-            return None
-        return await self.setup_method()
+            return
+        await self.setup_method()
 
     async def async_refresh(self) -> None:
         """Refresh data and log errors."""
diff --git a/homeassistant/loader.py b/homeassistant/loader.py
index 92b588dbe15..20763dc7b30 100644
--- a/homeassistant/loader.py
+++ b/homeassistant/loader.py
@@ -40,7 +40,8 @@ from .generated.ssdp import SSDP
 from .generated.usb import USB
 from .generated.zeroconf import HOMEKIT, ZEROCONF
 from .helpers.json import json_bytes, json_fragment
-from .helpers.typing import UNDEFINED
+from .helpers.typing import UNDEFINED, UndefinedType
+from .util.async_ import create_eager_task
 from .util.hass_dict import HassKey
 from .util.json import JSON_DECODE_EXCEPTIONS, json_loads
 
@@ -125,9 +126,9 @@ BLOCKED_CUSTOM_INTEGRATIONS: dict[str, BlockedIntegration] = {
 DATA_COMPONENTS: HassKey[dict[str, ModuleType | ComponentProtocol]] = HassKey(
     "components"
 )
-DATA_INTEGRATIONS: HassKey[dict[str, Integration | asyncio.Future[None]]] = HassKey(
-    "integrations"
-)
+DATA_INTEGRATIONS: HassKey[
+    dict[str, Integration | asyncio.Future[Integration | IntegrationNotFound]]
+] = HassKey("integrations")
 DATA_MISSING_PLATFORMS: HassKey[dict[str, bool]] = HassKey("missing_platforms")
 DATA_CUSTOM_COMPONENTS: HassKey[
     dict[str, Integration] | asyncio.Future[dict[str, Integration]]
@@ -759,10 +760,8 @@ class Integration:
         manifest["overwrites_built_in"] = self.overwrites_built_in
 
         if self.dependencies:
-            self._all_dependencies_resolved: bool | None = None
-            self._all_dependencies: set[str] | None = None
+            self._all_dependencies: set[str] | Exception | None = None
         else:
-            self._all_dependencies_resolved = True
             self._all_dependencies = set()
 
         self._platforms_to_preload = hass.data[DATA_PRELOAD_PLATFORMS]
@@ -934,47 +933,25 @@ class Integration:
         """Return all dependencies including sub-dependencies."""
         if self._all_dependencies is None:
             raise RuntimeError("Dependencies not resolved!")
+        if isinstance(self._all_dependencies, Exception):
+            raise self._all_dependencies
 
         return self._all_dependencies
 
     @property
     def all_dependencies_resolved(self) -> bool:
         """Return if all dependencies have been resolved."""
-        return self._all_dependencies_resolved is not None
+        return self._all_dependencies is not None
 
-    async def resolve_dependencies(self) -> bool:
+    async def resolve_dependencies(self) -> set[str] | None:
         """Resolve all dependencies."""
-        if self._all_dependencies_resolved is not None:
-            return self._all_dependencies_resolved
+        if self._all_dependencies is not None:
+            if isinstance(self._all_dependencies, Exception):
+                return None
+            return self._all_dependencies
 
-        self._all_dependencies_resolved = False
-        try:
-            dependencies = await _async_component_dependencies(self.hass, self)
-        except IntegrationNotFound as err:
-            _LOGGER.error(
-                (
-                    "Unable to resolve dependencies for %s: unable to resolve"
-                    " (sub)dependency %s"
-                ),
-                self.domain,
-                err.domain,
-            )
-        except CircularDependency as err:
-            _LOGGER.error(
-                (
-                    "Unable to resolve dependencies for %s: it contains a circular"
-                    " dependency: %s -> %s"
-                ),
-                self.domain,
-                err.from_domain,
-                err.to_domain,
-            )
-        else:
-            dependencies.discard(self.domain)
-            self._all_dependencies = dependencies
-            self._all_dependencies_resolved = True
-
-        return self._all_dependencies_resolved
+        result = await resolve_integrations_dependencies(self.hass, (self,))
+        return result.get(self.domain)
 
     async def async_get_component(self) -> ComponentProtocol:
         """Return the component.
@@ -1345,7 +1322,7 @@ def async_get_loaded_integration(hass: HomeAssistant, domain: str) -> Integratio
     Raises IntegrationNotLoaded if the integration is not loaded.
     """
     cache = hass.data[DATA_INTEGRATIONS]
-    int_or_fut = cache.get(domain, UNDEFINED)
+    int_or_fut = cache.get(domain)
     # Integration is never subclassed, so we can check for type
     if type(int_or_fut) is Integration:
         return int_or_fut
@@ -1355,7 +1332,7 @@ def async_get_loaded_integration(hass: HomeAssistant, domain: str) -> Integratio
 async def async_get_integration(hass: HomeAssistant, domain: str) -> Integration:
     """Get integration."""
     cache = hass.data[DATA_INTEGRATIONS]
-    if type(int_or_fut := cache.get(domain, UNDEFINED)) is Integration:
+    if type(int_or_fut := cache.get(domain)) is Integration:
         return int_or_fut
     integrations_or_excs = await async_get_integrations(hass, [domain])
     int_or_exc = integrations_or_excs[domain]
@@ -1370,15 +1347,17 @@ async def async_get_integrations(
     """Get integrations."""
     cache = hass.data[DATA_INTEGRATIONS]
     results: dict[str, Integration | Exception] = {}
-    needed: dict[str, asyncio.Future[None]] = {}
-    in_progress: dict[str, asyncio.Future[None]] = {}
+    needed: dict[str, asyncio.Future[Integration | IntegrationNotFound]] = {}
+    in_progress: dict[str, asyncio.Future[Integration | IntegrationNotFound]] = {}
     for domain in domains:
-        int_or_fut = cache.get(domain, UNDEFINED)
+        int_or_fut = cache.get(domain)
         # Integration is never subclassed, so we can check for type
         if type(int_or_fut) is Integration:
             results[domain] = int_or_fut
-        elif int_or_fut is not UNDEFINED:
-            in_progress[domain] = cast(asyncio.Future[None], int_or_fut)
+        elif int_or_fut:
+            if TYPE_CHECKING:
+                assert isinstance(int_or_fut, asyncio.Future)
+            in_progress[domain] = int_or_fut
         elif "." in domain:
             results[domain] = ValueError(f"Invalid domain {domain}")
         else:
@@ -1386,14 +1365,13 @@ async def async_get_integrations(
 
     if in_progress:
         await asyncio.wait(in_progress.values())
-        for domain in in_progress:
-            # When we have waited and it's UNDEFINED, it doesn't exist
-            # We don't cache that it doesn't exist, or else people can't fix it
-            # and then restart, because their config will never be valid.
-            if (int_or_fut := cache.get(domain, UNDEFINED)) is UNDEFINED:
-                results[domain] = IntegrationNotFound(domain)
-            else:
-                results[domain] = cast(Integration, int_or_fut)
+        # Here we retrieve the results we waited for
+        # instead of reading them from the cache since
+        # reading from the cache will have a race if
+        # the integration gets removed from the cache
+        # because it was not found.
+        for domain, future in in_progress.items():
+            results[domain] = future.result()
 
     if not needed:
         return results
@@ -1405,7 +1383,7 @@ async def async_get_integrations(
     for domain, future in needed.items():
         if integration := custom.get(domain):
             results[domain] = cache[domain] = integration
-            future.set_result(None)
+            future.set_result(integration)
 
     for domain in results:
         if domain in needed:
@@ -1419,22 +1397,211 @@ async def async_get_integrations(
             _resolve_integrations_from_root, hass, components, needed
         )
         for domain, future in needed.items():
-            int_or_exc = integrations.get(domain)
-            if not int_or_exc:
-                cache.pop(domain)
-                results[domain] = IntegrationNotFound(domain)
-            elif isinstance(int_or_exc, Exception):
-                cache.pop(domain)
-                exc = IntegrationNotFound(domain)
-                exc.__cause__ = int_or_exc
-                results[domain] = exc
+            if integration := integrations.get(domain):
+                results[domain] = cache[domain] = integration
+                future.set_result(integration)
             else:
-                results[domain] = cache[domain] = int_or_exc
-            future.set_result(None)
+                # We don't cache that it doesn't exist as configuration
+                # validation that relies on integrations being loaded
+                # would be unfixable. For example if a custom integration
+                # was temporarily removed.
+                # This allows restoring a missing integration to fix the
+                # validation error so the config validations checks do not
+                # block restarting.
+                del cache[domain]
+                exc = IntegrationNotFound(domain)
+                results[domain] = exc
+                # We don't use set_exception because
+                # we expect there will be cases where
+                # the future exception is never retrieved
+                future.set_result(exc)
 
     return results
 
 
+class _ResolveDependenciesCacheProtocol(Protocol):
+    def get(self, itg: Integration) -> set[str] | Exception | None: ...
+
+    def __setitem__(
+        self, itg: Integration, all_dependencies: set[str] | Exception
+    ) -> None: ...
+
+
+class _ResolveDependenciesCache(_ResolveDependenciesCacheProtocol):
+    """Cache for resolve_integrations_dependencies."""
+
+    def get(self, itg: Integration) -> set[str] | Exception | None:
+        return itg._all_dependencies  # noqa: SLF001
+
+    def __setitem__(
+        self, itg: Integration, all_dependencies: set[str] | Exception
+    ) -> None:
+        itg._all_dependencies = all_dependencies  # noqa: SLF001
+
+
+async def resolve_integrations_dependencies(
+    hass: HomeAssistant, integrations: Iterable[Integration]
+) -> dict[str, set[str]]:
+    """Resolve all dependencies for integrations.
+
+    Detects circular dependencies and missing integrations.
+    """
+    resolved = _ResolveDependenciesCache()
+
+    async def _resolve_deps_catch_exceptions(itg: Integration) -> set[str] | None:
+        try:
+            return await _do_resolve_dependencies(itg, cache=resolved)
+        except Exception as exc:  # noqa: BLE001
+            _LOGGER.error("Unable to resolve dependencies for %s: %s", itg.domain, exc)
+            return None
+
+    resolve_dependencies_tasks = {
+        itg.domain: create_eager_task(
+            _resolve_deps_catch_exceptions(itg),
+            name=f"resolve dependencies {itg.domain}",
+            loop=hass.loop,
+        )
+        for itg in integrations
+    }
+
+    result = await asyncio.gather(*resolve_dependencies_tasks.values())
+
+    return {
+        domain: deps
+        for domain, deps in zip(resolve_dependencies_tasks, result, strict=True)
+        if deps is not None
+    }
+
+
+async def resolve_integrations_after_dependencies(
+    hass: HomeAssistant,
+    integrations: Iterable[Integration],
+    possible_after_dependencies: set[str] | None = None,
+    *,
+    ignore_exceptions: bool = False,
+) -> dict[str, set[str]]:
+    """Resolve all dependencies, including after_dependencies, for integrations.
+
+    Detects circular dependencies and missing integrations.
+    """
+    resolved: dict[Integration, set[str] | Exception] = {}
+
+    async def _resolve_deps_catch_exceptions(itg: Integration) -> set[str] | None:
+        try:
+            return await _do_resolve_dependencies(
+                itg,
+                cache=resolved,
+                possible_after_dependencies=possible_after_dependencies,
+                ignore_exceptions=ignore_exceptions,
+            )
+        except Exception as exc:  # noqa: BLE001
+            _LOGGER.error(
+                "Unable to resolve (after) dependencies for %s: %s", itg.domain, exc
+            )
+            return None
+
+    resolve_dependencies_tasks = {
+        itg.domain: create_eager_task(
+            _resolve_deps_catch_exceptions(itg),
+            name=f"resolve after dependencies {itg.domain}",
+            loop=hass.loop,
+        )
+        for itg in integrations
+    }
+
+    result = await asyncio.gather(*resolve_dependencies_tasks.values())
+
+    return {
+        domain: deps
+        for domain, deps in zip(resolve_dependencies_tasks, result, strict=True)
+        if deps is not None
+    }
+
+
+async def _do_resolve_dependencies(
+    itg: Integration,
+    *,
+    cache: _ResolveDependenciesCacheProtocol,
+    possible_after_dependencies: set[str] | None | UndefinedType = UNDEFINED,
+    ignore_exceptions: bool = False,
+) -> set[str]:
+    """Recursively resolve all dependencies.
+
+    Uses `cache` to cache the results.
+
+    If `possible_after_dependencies` is not UNDEFINED,
+    listed after dependencies are also considered.
+    If `possible_after_dependencies` is None,
+    all the possible after dependencies are considered.
+
+    If `ignore_exceptions` is True, exceptions are caught and ignored
+    and the normal resolution algorithm continues.
+    Otherwise, exceptions are raised.
+    """
+    resolved = cache
+    resolving: set[str] = set()
+
+    async def do_resolve_dependencies_impl(itg: Integration) -> set[str]:
+        domain = itg.domain
+
+        # If it's already resolved, no point doing it again.
+        if (result := resolved.get(itg)) is not None:
+            if isinstance(result, Exception):
+                raise result
+            return result
+
+        # If we are already resolving it, we have a circular dependency.
+        if domain in resolving:
+            if ignore_exceptions:
+                resolved[itg] = set()
+                return set()
+            exc = CircularDependency([domain])
+            resolved[itg] = exc
+            raise exc
+
+        resolving.add(domain)
+
+        dependencies_domains = set(itg.dependencies)
+        if possible_after_dependencies is not UNDEFINED:
+            if possible_after_dependencies is None:
+                after_dependencies: Iterable[str] = itg.after_dependencies
+            else:
+                after_dependencies = (
+                    set(itg.after_dependencies) & possible_after_dependencies
+                )
+            dependencies_domains.update(after_dependencies)
+        dependencies = await async_get_integrations(itg.hass, dependencies_domains)
+
+        all_dependencies: set[str] = set()
+        for dep_domain, dep_integration in dependencies.items():
+            if isinstance(dep_integration, Exception):
+                if ignore_exceptions:
+                    continue
+                resolved[itg] = dep_integration
+                raise dep_integration
+
+            all_dependencies.add(dep_domain)
+
+            try:
+                dep_dependencies = await do_resolve_dependencies_impl(dep_integration)
+            except CircularDependency as exc:
+                exc.extend_cycle(domain)
+                resolved[itg] = exc
+                raise
+            except Exception as exc:
+                resolved[itg] = exc
+                raise
+
+            all_dependencies.update(dep_dependencies)
+
+        resolving.remove(domain)
+
+        resolved[itg] = all_dependencies
+        return all_dependencies
+
+    return await do_resolve_dependencies_impl(itg)
+
+
 class LoaderError(Exception):
     """Loader base error."""
 
@@ -1460,11 +1627,13 @@ class IntegrationNotLoaded(LoaderError):
 class CircularDependency(LoaderError):
     """Raised when a circular dependency is found when resolving components."""
 
-    def __init__(self, from_domain: str | set[str], to_domain: str) -> None:
+    def __init__(self, domain_cycle: list[str]) -> None:
         """Initialize circular dependency error."""
-        super().__init__(f"Circular dependency detected: {from_domain} -> {to_domain}.")
-        self.from_domain = from_domain
-        self.to_domain = to_domain
+        super().__init__("Circular dependency detected", domain_cycle)
+
+    def extend_cycle(self, domain: str) -> None:
+        """Extend the cycle with the domain."""
+        self.args[1].insert(0, domain)
 
 
 def _load_file(
@@ -1618,50 +1787,6 @@ def bind_hass[_CallableT: Callable[..., Any]](func: _CallableT) -> _CallableT:
     return func
 
 
-async def _async_component_dependencies(
-    hass: HomeAssistant,
-    integration: Integration,
-) -> set[str]:
-    """Get component dependencies."""
-    loading: set[str] = set()
-    loaded: set[str] = set()
-
-    async def component_dependencies_impl(integration: Integration) -> None:
-        """Recursively get component dependencies."""
-        domain = integration.domain
-        if not (dependencies := integration.dependencies):
-            loaded.add(domain)
-            return
-
-        loading.add(domain)
-        dep_integrations = await async_get_integrations(hass, dependencies)
-        for dependency_domain, dep_integration in dep_integrations.items():
-            if isinstance(dep_integration, Exception):
-                raise dep_integration
-
-            # If we are already loading it, we have a circular dependency.
-            # We have to check it here to make sure that every integration that
-            # depends on us, does not appear in our own after_dependencies.
-            if conflict := loading.intersection(dep_integration.after_dependencies):
-                raise CircularDependency(conflict, dependency_domain)
-
-            # If we have already loaded it, no point doing it again.
-            if dependency_domain in loaded:
-                continue
-
-            # If we are already loading it, we have a circular dependency.
-            if dependency_domain in loading:
-                raise CircularDependency(dependency_domain, domain)
-
-            await component_dependencies_impl(dep_integration)
-        loading.remove(domain)
-        loaded.add(domain)
-
-    await component_dependencies_impl(integration)
-
-    return loaded
-
-
 def _async_mount_config_dir(hass: HomeAssistant) -> None:
     """Mount config dir in order to load custom_component.
 
diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index cb29214390b..bff67afd0d4 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -1,79 +1,80 @@
 # Automatically generated by gen_requirements_all.py, do not edit
 
-aiodhcpwatcher==1.0.2
-aiodiscover==2.1.0
+aiodhcpwatcher==1.1.1
+aiodiscover==2.6.1
 aiodns==3.2.0
-aiohasupervisor==0.2.2b5
-aiohttp-asyncmdnsresolver==0.0.1
-aiohttp-fast-zlib==0.2.0
-aiohttp==3.11.11
+aiohasupervisor==0.3.0
+aiohttp-asyncmdnsresolver==0.1.1
+aiohttp-fast-zlib==0.2.3
+aiohttp==3.11.14
 aiohttp_cors==0.7.0
-aiozoneinfo==0.2.1
+aiousbwatcher==1.1.1
+aiozoneinfo==0.2.3
+annotatedyaml==0.4.5
 astral==2.2
-async-interrupt==1.2.0
+async-interrupt==1.2.2
 async-upnp-client==0.43.0
 atomicwrites-homeassistant==1.4.1
-attrs==24.2.0
-audioop-lts==0.2.1;python_version>='3.13'
+attrs==25.1.0
+audioop-lts==0.2.1
 av==13.1.0
 awesomeversion==24.6.0
 bcrypt==4.2.0
-bleak-retry-connector==3.8.0
+bleak-retry-connector==3.9.0
 bleak==0.22.3
-bluetooth-adapters==0.21.1
-bluetooth-auto-recovery==1.4.2
-bluetooth-data-tools==1.22.0
-cached-ipaddress==0.8.0
+bluetooth-adapters==0.21.4
+bluetooth-auto-recovery==1.4.5
+bluetooth-data-tools==1.26.1
+cached-ipaddress==0.10.0
 certifi>=2021.5.30
 ciso8601==2.3.2
 cronsim==2.6
-cryptography==44.0.0
-dbus-fast==2.30.2
-fnv-hash-fast==1.2.2
+cryptography==44.0.1
+dbus-fast==2.43.0
+fnv-hash-fast==1.4.0
 go2rtc-client==0.1.2
 ha-ffmpeg==3.2.2
-habluetooth==3.12.0
-hass-nabucasa==0.88.1
-hassil==2.1.0
-home-assistant-bluetooth==1.13.0
-home-assistant-frontend==20250109.2
-home-assistant-intents==2025.1.1
+habluetooth==3.37.0
+hass-nabucasa==0.94.0
+hassil==2.2.3
+home-assistant-bluetooth==1.13.1
+home-assistant-frontend==20250327.0
+home-assistant-intents==2025.3.24
 httpx==0.28.1
 ifaddr==0.2.0
-Jinja2==3.1.5
+Jinja2==3.1.6
 lru-dict==1.3.0
 mutagen==1.47.0
-orjson==3.10.12
+orjson==3.10.16
 packaging>=23.1
-paho-mqtt==1.6.1
+paho-mqtt==2.1.0
 Pillow==11.1.0
-propcache==0.2.1
+propcache==0.3.0
 psutil-home-assistant==0.0.1
 PyJWT==2.10.1
 pymicro-vad==1.0.1
 PyNaCl==1.5.0
-pyOpenSSL==24.3.0
+pyOpenSSL==25.0.0
 pyserial==3.5
 pyspeex-noise==1.0.2
 python-slugify==8.0.4
 PyTurboJPEG==1.7.5
-pyudev==0.24.1
 PyYAML==6.0.2
 requests==2.32.3
-securetar==2025.1.3
-SQLAlchemy==2.0.36
-standard-aifc==3.13.0;python_version>='3.13'
-standard-telnetlib==3.13.0;python_version>='3.13'
-typing-extensions>=4.12.2,<5.0
-ulid-transform==1.2.0
+securetar==2025.2.1
+SQLAlchemy==2.0.39
+standard-aifc==3.13.0
+standard-telnetlib==3.13.0
+typing-extensions>=4.13.0,<5.0
+ulid-transform==1.4.0
 urllib3>=1.26.5,<2
-uv==0.5.21
+uv==0.6.10
 voluptuous-openapi==0.0.6
 voluptuous-serialize==2.6.0
 voluptuous==0.15.2
 webrtc-models==0.3.0
 yarl==1.18.3
-zeroconf==0.141.0
+zeroconf==0.146.0
 
 # Constrain pycryptodome to avoid vulnerability
 # see https://github.com/home-assistant/core/pull/16238
@@ -108,7 +109,7 @@ uuid==1000000000.0.0
 # these requirements are quite loose. As the entire stack has some outstanding issues, and
 # even newer versions seem to introduce new issues, it's useful for us to pin all these
 # requirements so we can directly link HA versions to these library versions.
-anyio==4.8.0
+anyio==4.9.0
 h11==0.14.0
 httpcore==1.0.7
 
@@ -168,6 +169,10 @@ pysnmplib==1000000000.0.0
 # breaks getmac due to them both sharing the same python package name inside 'getmac'.
 get-mac==1000000000.0.0
 
+# Poetry is a build dependency. Installing it as a runtime dependency almost
+# always indicates an issue with library requirements.
+poetry==1000000000.0.0
+
 # We want to skip the binary wheels for the 'charset-normalizer' packages.
 # They are build with mypyc, but causes issues with our wheel builder.
 # In order to do so, we need to constrain the version.
diff --git a/homeassistant/scripts/check_config.py b/homeassistant/scripts/check_config.py
index 568e8c84a30..ca3df5080b5 100644
--- a/homeassistant/scripts/check_config.py
+++ b/homeassistant/scripts/check_config.py
@@ -12,6 +12,9 @@ import os
 from typing import Any
 from unittest.mock import patch
 
+from annotatedyaml import loader as yaml_loader
+from annotatedyaml.loader import Secrets
+
 from homeassistant import core, loader
 from homeassistant.config import get_default_config_dir
 from homeassistant.config_entries import ConfigEntries
@@ -23,8 +26,6 @@ from homeassistant.helpers import (
     issue_registry as ir,
 )
 from homeassistant.helpers.check_config import async_check_ha_config_file
-from homeassistant.util.yaml import Secrets
-import homeassistant.util.yaml.loader as yaml_loader
 
 # mypy: allow-untyped-calls, allow-untyped-defs
 
@@ -32,9 +33,9 @@ REQUIREMENTS = ("colorlog==6.8.2",)
 
 _LOGGER = logging.getLogger(__name__)
 MOCKS: dict[str, tuple[str, Callable]] = {
-    "load": ("homeassistant.util.yaml.loader.load_yaml", yaml_loader.load_yaml),
+    "load": ("annotatedyaml.loader.load_yaml", yaml_loader.load_yaml),
     "load*": ("homeassistant.config.load_yaml_dict", yaml_loader.load_yaml_dict),
-    "secrets": ("homeassistant.util.yaml.loader.secret_yaml", yaml_loader.secret_yaml),
+    "secrets": ("annotatedyaml.loader.secret_yaml", yaml_loader.secret_yaml),
 }
 
 PATCHES: dict[str, Any] = {}
diff --git a/homeassistant/scripts/ensure_config.py b/homeassistant/scripts/ensure_config.py
index e1ae7bc9142..1d568ec68b0 100644
--- a/homeassistant/scripts/ensure_config.py
+++ b/homeassistant/scripts/ensure_config.py
@@ -4,7 +4,7 @@ import argparse
 import asyncio
 import os
 
-import homeassistant.config as config_util
+from homeassistant import config as config_util
 from homeassistant.core import HomeAssistant
 
 # mypy: allow-untyped-calls, allow-untyped-defs
diff --git a/homeassistant/setup.py b/homeassistant/setup.py
index 331389da7c6..9572136559a 100644
--- a/homeassistant/setup.py
+++ b/homeassistant/setup.py
@@ -132,7 +132,13 @@ def async_set_domains_to_be_loaded(hass: core.HomeAssistant, domains: set[str])
      - Keep track of domains which will load but have not yet finished loading
     """
     setup_done_futures = hass.data.setdefault(DATA_SETUP_DONE, {})
-    setup_done_futures.update({domain: hass.loop.create_future() for domain in domains})
+    setup_futures = hass.data.setdefault(DATA_SETUP, {})
+    old_domains = set(setup_futures) | set(setup_done_futures) | hass.config.components
+    if overlap := old_domains & domains:
+        _LOGGER.debug("Domains to be loaded %s already loaded or pending", overlap)
+    setup_done_futures.update(
+        {domain: hass.loop.create_future() for domain in domains - old_domains}
+    )
 
 
 def setup_component(hass: core.HomeAssistant, domain: str, config: ConfigType) -> bool:
@@ -317,7 +323,7 @@ async def _async_setup_component(
             translation.async_load_integrations(hass, integration_set), loop=hass.loop
         )
     # Validate all dependencies exist and there are no circular dependencies
-    if not await integration.resolve_dependencies():
+    if await integration.resolve_dependencies() is None:
         return False
 
     # Process requirements as soon as possible, so we can import the component
@@ -425,8 +431,8 @@ async def _async_setup_component(
             )
             return False
         # pylint: disable-next=broad-except
-        except (asyncio.CancelledError, SystemExit, Exception):
-            _LOGGER.exception("Error during setup of component %s", domain)
+        except (asyncio.CancelledError, SystemExit, Exception) as exc:
+            _LOGGER.exception("Error during setup of component %s: %s", domain, exc)  # noqa: TRY401
             async_notify_setup_error(hass, domain, integration.documentation)
             return False
         finally:
diff --git a/homeassistant/strings.json b/homeassistant/strings.json
index fca55353aa0..29b7db7a011 100644
--- a/homeassistant/strings.json
+++ b/homeassistant/strings.json
@@ -1,13 +1,101 @@
 {
   "common": {
-    "generic": {
-      "model": "Model",
-      "ui_managed": "Managed via UI"
+    "action": {
+      "close": "Close",
+      "connect": "Connect",
+      "disable": "Disable",
+      "disconnect": "Disconnect",
+      "enable": "Enable",
+      "open": "Open",
+      "pause": "Pause",
+      "reload": "Reload",
+      "restart": "Restart",
+      "start": "Start",
+      "stop": "Stop",
+      "toggle": "Toggle",
+      "turn_off": "Turn off",
+      "turn_on": "Turn on"
+    },
+    "config_flow": {
+      "abort": {
+        "already_configured_account": "Account is already configured",
+        "already_configured_device": "Device is already configured",
+        "already_configured_location": "Location is already configured",
+        "already_configured_service": "Service is already configured",
+        "already_in_progress": "Configuration flow is already in progress",
+        "cloud_not_connected": "Not connected to Home Assistant Cloud.",
+        "no_devices_found": "No devices found on the network",
+        "oauth2_authorize_url_timeout": "Timeout generating authorize URL.",
+        "oauth2_error": "Received invalid token data.",
+        "oauth2_failed": "Error while obtaining access token.",
+        "oauth2_missing_configuration": "The component is not configured. Please follow the documentation.",
+        "oauth2_missing_credentials": "The integration requires application credentials.",
+        "oauth2_no_url_available": "No URL available. For information about this error, [check the help section]({docs_url})",
+        "oauth2_timeout": "Timeout resolving OAuth token.",
+        "oauth2_unauthorized": "OAuth authorization error while obtaining access token.",
+        "oauth2_user_rejected_authorize": "Account linking rejected: {error}",
+        "reauth_successful": "Re-authentication was successful",
+        "reconfigure_successful": "Re-configuration was successful",
+        "single_instance_allowed": "Already configured. Only a single configuration possible.",
+        "unknown_authorize_url_generation": "Unknown error generating an authorize URL.",
+        "webhook_not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive webhook messages."
+      },
+      "create_entry": {
+        "authenticated": "Successfully authenticated"
+      },
+      "data": {
+        "access_token": "Access token",
+        "api_key": "API key",
+        "api_token": "API token",
+        "device": "Device",
+        "elevation": "Elevation",
+        "email": "Email",
+        "host": "Host",
+        "ip": "IP address",
+        "language": "Language",
+        "latitude": "Latitude",
+        "llm_hass_api": "Control Home Assistant",
+        "location": "Location",
+        "longitude": "Longitude",
+        "mode": "Mode",
+        "name": "Name",
+        "password": "Password",
+        "path": "Path",
+        "pin": "PIN code",
+        "port": "Port",
+        "ssl": "Uses an SSL certificate",
+        "url": "URL",
+        "usb_path": "USB device path",
+        "username": "Username",
+        "verify_ssl": "Verify SSL certificate"
+      },
+      "description": {
+        "confirm_setup": "Do you want to start setup?"
+      },
+      "error": {
+        "cannot_connect": "Failed to connect",
+        "invalid_access_token": "Invalid access token",
+        "invalid_api_key": "Invalid API key",
+        "invalid_auth": "Invalid authentication",
+        "invalid_host": "Invalid hostname or IP address",
+        "timeout_connect": "Timeout establishing connection",
+        "unknown": "Unexpected error"
+      },
+      "title": {
+        "oauth2_pick_implementation": "Pick authentication method",
+        "reauth": "Authentication expired for {name}",
+        "via_hassio_addon": "{name} via Home Assistant add-on"
+      }
     },
     "device_automation": {
+      "action_type": {
+        "toggle": "Toggle {entity_name}",
+        "turn_off": "Turn off {entity_name}",
+        "turn_on": "Turn on {entity_name}"
+      },
       "condition_type": {
-        "is_on": "{entity_name} is on",
-        "is_off": "{entity_name} is off"
+        "is_off": "{entity_name} is off",
+        "is_on": "{entity_name} is on"
       },
       "extra_fields": {
         "above": "Above",
@@ -19,30 +107,35 @@
       },
       "trigger_type": {
         "changed_states": "{entity_name} turned on or off",
-        "turned_on": "{entity_name} turned on",
-        "turned_off": "{entity_name} turned off"
-      },
-      "action_type": {
-        "toggle": "Toggle {entity_name}",
-        "turn_on": "Turn on {entity_name}",
-        "turn_off": "Turn off {entity_name}"
+        "turned_off": "{entity_name} turned off",
+        "turned_on": "{entity_name} turned on"
       }
     },
-    "action": {
-      "connect": "Connect",
-      "disconnect": "Disconnect",
-      "enable": "Enable",
-      "disable": "Disable",
+    "generic": {
+      "model": "Model",
+      "ui_managed": "Managed via UI"
+    },
+    "state": {
+      "active": "Active",
+      "charging": "Charging",
+      "closed": "Closed",
+      "connected": "Connected",
+      "disabled": "Disabled",
+      "discharging": "Discharging",
+      "disconnected": "Disconnected",
+      "enabled": "Enabled",
+      "home": "Home",
+      "idle": "Idle",
+      "locked": "Locked",
+      "no": "No",
+      "not_home": "Away",
+      "off": "Off",
+      "on": "On",
       "open": "Open",
-      "close": "Close",
-      "reload": "Reload",
-      "restart": "Restart",
-      "start": "Start",
-      "stop": "Stop",
-      "pause": "Pause",
-      "turn_on": "Turn on",
-      "turn_off": "Turn off",
-      "toggle": "Toggle"
+      "paused": "Paused",
+      "standby": "Standby",
+      "unlocked": "Unlocked",
+      "yes": "Yes"
     },
     "time": {
       "monday": "Monday",
@@ -52,97 +145,6 @@
       "friday": "Friday",
       "saturday": "Saturday",
       "sunday": "Sunday"
-    },
-    "state": {
-      "off": "Off",
-      "on": "On",
-      "yes": "Yes",
-      "no": "No",
-      "open": "Open",
-      "closed": "Closed",
-      "enabled": "Enabled",
-      "disabled": "Disabled",
-      "connected": "Connected",
-      "disconnected": "Disconnected",
-      "locked": "Locked",
-      "unlocked": "Unlocked",
-      "active": "Active",
-      "idle": "Idle",
-      "standby": "Standby",
-      "paused": "Paused",
-      "home": "Home",
-      "not_home": "Away"
-    },
-    "config_flow": {
-      "title": {
-        "oauth2_pick_implementation": "Pick authentication method",
-        "reauth": "Authentication expired for {name}",
-        "via_hassio_addon": "{name} via Home Assistant add-on"
-      },
-      "description": {
-        "confirm_setup": "Do you want to start setup?"
-      },
-      "data": {
-        "device": "Device",
-        "name": "Name",
-        "email": "Email",
-        "username": "Username",
-        "password": "Password",
-        "host": "Host",
-        "ip": "IP address",
-        "port": "Port",
-        "url": "URL",
-        "usb_path": "USB device path",
-        "access_token": "Access token",
-        "api_key": "API key",
-        "api_token": "API token",
-        "llm_hass_api": "Control Home Assistant",
-        "ssl": "Uses an SSL certificate",
-        "verify_ssl": "Verify SSL certificate",
-        "elevation": "Elevation",
-        "longitude": "Longitude",
-        "latitude": "Latitude",
-        "location": "Location",
-        "pin": "PIN code",
-        "mode": "Mode",
-        "path": "Path",
-        "language": "Language"
-      },
-      "create_entry": {
-        "authenticated": "Successfully authenticated"
-      },
-      "error": {
-        "cannot_connect": "Failed to connect",
-        "invalid_access_token": "Invalid access token",
-        "invalid_api_key": "Invalid API key",
-        "invalid_auth": "Invalid authentication",
-        "invalid_host": "Invalid hostname or IP address",
-        "unknown": "Unexpected error",
-        "timeout_connect": "Timeout establishing connection"
-      },
-      "abort": {
-        "single_instance_allowed": "Already configured. Only a single configuration possible.",
-        "already_configured_account": "Account is already configured",
-        "already_configured_device": "Device is already configured",
-        "already_configured_location": "Location is already configured",
-        "already_configured_service": "Service is already configured",
-        "already_in_progress": "Configuration flow is already in progress",
-        "no_devices_found": "No devices found on the network",
-        "webhook_not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive webhook messages.",
-        "oauth2_error": "Received invalid token data.",
-        "oauth2_timeout": "Timeout resolving OAuth token.",
-        "oauth2_missing_configuration": "The component is not configured. Please follow the documentation.",
-        "oauth2_missing_credentials": "The integration requires application credentials.",
-        "oauth2_authorize_url_timeout": "Timeout generating authorize URL.",
-        "oauth2_no_url_available": "No URL available. For information about this error, [check the help section]({docs_url})",
-        "oauth2_user_rejected_authorize": "Account linking rejected: {error}",
-        "oauth2_unauthorized": "OAuth authorization error while obtaining access token.",
-        "oauth2_failed": "Error while obtaining access token.",
-        "reauth_successful": "Re-authentication was successful",
-        "reconfigure_successful": "Re-configuration was successful",
-        "unknown_authorize_url_generation": "Unknown error generating an authorize URL.",
-        "cloud_not_connected": "Not connected to Home Assistant Cloud."
-      }
     }
   }
 }
diff --git a/homeassistant/util/frozen_dataclass_compat.py b/homeassistant/util/frozen_dataclass_compat.py
index 81ce9961a0b..518515d4f85 100644
--- a/homeassistant/util/frozen_dataclass_compat.py
+++ b/homeassistant/util/frozen_dataclass_compat.py
@@ -63,7 +63,7 @@ class FrozenOrThawed(type):
         )
 
     def __new__(
-        mcs,  # noqa: N804  ruff bug, ruff does not understand this is a metaclass
+        mcs,
         name: str,
         bases: tuple[type, ...],
         namespace: dict[Any, Any],
diff --git a/homeassistant/util/logging.py b/homeassistant/util/logging.py
index 2c4eb744614..1e516742bfe 100644
--- a/homeassistant/util/logging.py
+++ b/homeassistant/util/logging.py
@@ -2,14 +2,16 @@
 
 from __future__ import annotations
 
+from collections import defaultdict
 from collections.abc import Callable, Coroutine
 from functools import partial, wraps
 import inspect
 import logging
 import logging.handlers
-import queue
+from queue import SimpleQueue
+import time
 import traceback
-from typing import Any, cast, overload
+from typing import Any, cast, overload, override
 
 from homeassistant.core import (
     HassJobType,
@@ -18,6 +20,59 @@ from homeassistant.core import (
     get_hassjob_callable_job_type,
 )
 
+_LOGGER = logging.getLogger(__name__)
+
+
+class HomeAssistantQueueListener(logging.handlers.QueueListener):
+    """Custom QueueListener to watch for noisy loggers."""
+
+    LOG_COUNTS_RESET_INTERVAL = 300
+    MAX_LOGS_COUNT = 200
+
+    _last_reset: float
+    _log_counts: dict[str, int]
+    _warned_modules: set[str]
+
+    def __init__(
+        self, queue: SimpleQueue[logging.Handler], *handlers: logging.Handler
+    ) -> None:
+        """Initialize the handler."""
+        super().__init__(queue, *handlers)
+        self._warned_modules = set()
+        self._reset_counters(time.time())
+
+    @override
+    def handle(self, record: logging.LogRecord) -> None:
+        """Handle the record."""
+        super().handle(record)
+
+        if record.levelno < logging.INFO:
+            return
+
+        if (record.created - self._last_reset) > self.LOG_COUNTS_RESET_INTERVAL:
+            self._reset_counters(record.created)
+
+        module_name = record.name
+        if module_name == __name__ or module_name in self._warned_modules:
+            return
+
+        self._log_counts[module_name] += 1
+        module_count = self._log_counts[module_name]
+        if module_count < self.MAX_LOGS_COUNT:
+            return
+
+        _LOGGER.warning(
+            "Module %s is logging too frequently. %d messages since last count",
+            module_name,
+            module_count,
+        )
+        self._warned_modules.add(module_name)
+
+    def _reset_counters(self, time_sec: float) -> None:
+        _LOGGER.debug("Resetting log counters")
+        self._last_reset = time_sec
+        self._log_counts = defaultdict(int)
+
 
 class HomeAssistantQueueHandler(logging.handlers.QueueHandler):
     """Process the log in another thread."""
@@ -60,7 +115,7 @@ def async_activate_log_queue_handler(hass: HomeAssistant) -> None:
     This allows us to avoid blocking I/O and formatting messages
     in the event loop as log messages are written in another thread.
     """
-    simple_queue: queue.SimpleQueue[logging.Handler] = queue.SimpleQueue()
+    simple_queue: SimpleQueue[logging.Handler] = SimpleQueue()
     queue_handler = HomeAssistantQueueHandler(simple_queue)
     logging.root.addHandler(queue_handler)
 
@@ -71,7 +126,7 @@ def async_activate_log_queue_handler(hass: HomeAssistant) -> None:
         logging.root.removeHandler(handler)
         migrated_handlers.append(handler)
 
-    listener = logging.handlers.QueueListener(simple_queue, *migrated_handlers)
+    listener = HomeAssistantQueueListener(simple_queue, *migrated_handlers)
     queue_handler.listener = listener
 
     listener.start()
diff --git a/homeassistant/util/unit_conversion.py b/homeassistant/util/unit_conversion.py
index ad320cdb9ae..f2619c5dd61 100644
--- a/homeassistant/util/unit_conversion.py
+++ b/homeassistant/util/unit_conversion.py
@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from functools import lru_cache
+from math import floor, log10
 
 from homeassistant.const import (
     CONCENTRATION_PARTS_PER_BILLION,
@@ -17,6 +18,7 @@ from homeassistant.const import (
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
+    UnitOfEnergyDistance,
     UnitOfInformation,
     UnitOfLength,
     UnitOfMass,
@@ -90,6 +92,7 @@ class BaseUnitConverter:
     VALID_UNITS: set[str | None]
 
     _UNIT_CONVERSION: dict[str | None, float]
+    _UNIT_INVERSES: set[str] = set()
 
     @classmethod
     def convert(cls, value: float, from_unit: str | None, to_unit: str | None) -> float:
@@ -105,6 +108,8 @@ class BaseUnitConverter:
         if from_unit == to_unit:
             return lambda value: value
         from_ratio, to_ratio = cls._get_from_to_ratio(from_unit, to_unit)
+        if cls._are_unit_inverses(from_unit, to_unit):
+            return lambda val: to_ratio / (val / from_ratio)
         return lambda val: (val / from_ratio) * to_ratio
 
     @classmethod
@@ -129,6 +134,8 @@ class BaseUnitConverter:
         if from_unit == to_unit:
             return lambda value: value
         from_ratio, to_ratio = cls._get_from_to_ratio(from_unit, to_unit)
+        if cls._are_unit_inverses(from_unit, to_unit):
+            return lambda val: None if val is None else to_ratio / (val / from_ratio)
         return lambda val: None if val is None else (val / from_ratio) * to_ratio
 
     @classmethod
@@ -138,6 +145,21 @@ class BaseUnitConverter:
         from_ratio, to_ratio = cls._get_from_to_ratio(from_unit, to_unit)
         return from_ratio / to_ratio
 
+    @classmethod
+    @lru_cache
+    def get_unit_floored_log_ratio(
+        cls, from_unit: str | None, to_unit: str | None
+    ) -> float:
+        """Get floored base10 log ratio between units of measurement."""
+        from_ratio, to_ratio = cls._get_from_to_ratio(from_unit, to_unit)
+        return floor(max(0, log10(from_ratio / to_ratio)))
+
+    @classmethod
+    @lru_cache
+    def _are_unit_inverses(cls, from_unit: str | None, to_unit: str | None) -> bool:
+        """Return true if one unit is an inverse but not the other."""
+        return (from_unit in cls._UNIT_INVERSES) != (to_unit in cls._UNIT_INVERSES)
+
 
 class DataRateConverter(BaseUnitConverter):
     """Utility to convert data rate values."""
@@ -284,6 +306,22 @@ class EnergyConverter(BaseUnitConverter):
     VALID_UNITS = set(UnitOfEnergy)
 
 
+class EnergyDistanceConverter(BaseUnitConverter):
+    """Utility to convert vehicle energy consumption values."""
+
+    UNIT_CLASS = "energy_distance"
+    _UNIT_CONVERSION: dict[str | None, float] = {
+        UnitOfEnergyDistance.KILO_WATT_HOUR_PER_100_KM: 1,
+        UnitOfEnergyDistance.MILES_PER_KILO_WATT_HOUR: 100 * _KM_TO_M / _MILE_TO_M,
+        UnitOfEnergyDistance.KM_PER_KILO_WATT_HOUR: 100,
+    }
+    _UNIT_INVERSES: set[str] = {
+        UnitOfEnergyDistance.MILES_PER_KILO_WATT_HOUR,
+        UnitOfEnergyDistance.KM_PER_KILO_WATT_HOUR,
+    }
+    VALID_UNITS = set(UnitOfEnergyDistance)
+
+
 class InformationConverter(BaseUnitConverter):
     """Utility to convert information values."""
 
diff --git a/homeassistant/util/unit_system.py b/homeassistant/util/unit_system.py
index 15993cbae47..055f435503f 100644
--- a/homeassistant/util/unit_system.py
+++ b/homeassistant/util/unit_system.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from dataclasses import dataclass
 from numbers import Number
 from typing import TYPE_CHECKING, Final
 
@@ -82,9 +83,21 @@ def _is_valid_unit(unit: str, unit_type: str) -> bool:
     return False
 
 
+@dataclass(frozen=True, kw_only=True)
 class UnitSystem:
     """A container for units of measure."""
 
+    _name: str
+    accumulated_precipitation_unit: UnitOfPrecipitationDepth
+    area_unit: UnitOfArea
+    length_unit: UnitOfLength
+    mass_unit: UnitOfMass
+    pressure_unit: UnitOfPressure
+    temperature_unit: UnitOfTemperature
+    volume_unit: UnitOfVolume
+    wind_speed_unit: UnitOfSpeed
+    _conversions: dict[tuple[SensorDeviceClass | str | None, str | None], str]
+
     def __init__(
         self,
         name: str,
@@ -118,16 +131,16 @@ class UnitSystem:
         if errors:
             raise ValueError(errors)
 
-        self._name = name
-        self.accumulated_precipitation_unit = accumulated_precipitation
-        self.area_unit = area
-        self.length_unit = length
-        self.mass_unit = mass
-        self.pressure_unit = pressure
-        self.temperature_unit = temperature
-        self.volume_unit = volume
-        self.wind_speed_unit = wind_speed
-        self._conversions = conversions
+        super().__setattr__("_name", name)
+        super().__setattr__("accumulated_precipitation_unit", accumulated_precipitation)
+        super().__setattr__("area_unit", area)
+        super().__setattr__("length_unit", length)
+        super().__setattr__("mass_unit", mass)
+        super().__setattr__("pressure_unit", pressure)
+        super().__setattr__("temperature_unit", temperature)
+        super().__setattr__("volume_unit", volume)
+        super().__setattr__("wind_speed_unit", wind_speed)
+        super().__setattr__("_conversions", conversions)
 
     def temperature(self, temperature: float, from_unit: str) -> float:
         """Convert the given temperature to this unit system."""
diff --git a/homeassistant/util/yaml/__init__.py b/homeassistant/util/yaml/__init__.py
index 3b1f5c4cc0a..323383ef53f 100644
--- a/homeassistant/util/yaml/__init__.py
+++ b/homeassistant/util/yaml/__init__.py
@@ -1,17 +1,10 @@
 """YAML utility functions."""
 
-from .const import SECRET_YAML
+from annotatedyaml import SECRET_YAML, Input, YamlTypeError
+from annotatedyaml.input import UndefinedSubstitution, extract_inputs, substitute
+
 from .dumper import dump, save_yaml
-from .input import UndefinedSubstitution, extract_inputs, substitute
-from .loader import (
-    Secrets,
-    YamlTypeError,
-    load_yaml,
-    load_yaml_dict,
-    parse_yaml,
-    secret_yaml,
-)
-from .objects import Input
+from .loader import Secrets, load_yaml, load_yaml_dict, parse_yaml, secret_yaml
 
 __all__ = [
     "SECRET_YAML",
diff --git a/homeassistant/util/yaml/const.py b/homeassistant/util/yaml/const.py
deleted file mode 100644
index 811c7d149f7..00000000000
--- a/homeassistant/util/yaml/const.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""Constants."""
-
-SECRET_YAML = "secrets.yaml"
diff --git a/homeassistant/util/yaml/dumper.py b/homeassistant/util/yaml/dumper.py
index 61772b6989d..059be2c1c5b 100644
--- a/homeassistant/util/yaml/dumper.py
+++ b/homeassistant/util/yaml/dumper.py
@@ -1,96 +1,5 @@
 """Custom dumper and representers."""
 
-from collections import OrderedDict
-from typing import Any
+from annotatedyaml.dumper import add_representer, dump, represent_odict, save_yaml
 
-import yaml
-
-from .objects import Input, NodeDictClass, NodeListClass, NodeStrClass
-
-# mypy: allow-untyped-calls, no-warn-return-any
-
-
-try:
-    from yaml import CSafeDumper as FastestAvailableSafeDumper
-except ImportError:
-    from yaml import (  # type: ignore[assignment]
-        SafeDumper as FastestAvailableSafeDumper,
-    )
-
-
-def dump(_dict: dict | list) -> str:
-    """Dump YAML to a string and remove null."""
-    return yaml.dump(
-        _dict,
-        default_flow_style=False,
-        allow_unicode=True,
-        sort_keys=False,
-        Dumper=FastestAvailableSafeDumper,
-    ).replace(": null\n", ":\n")
-
-
-def save_yaml(path: str, data: dict) -> None:
-    """Save YAML to a file."""
-    # Dump before writing to not truncate the file if dumping fails
-    str_data = dump(data)
-    with open(path, "w", encoding="utf-8") as outfile:
-        outfile.write(str_data)
-
-
-# From: https://gist.github.com/miracle2k/3184458
-def represent_odict(  # type: ignore[no-untyped-def]
-    dumper, tag, mapping, flow_style=None
-) -> yaml.MappingNode:
-    """Like BaseRepresenter.represent_mapping but does not issue the sort()."""
-    value: list = []
-    node = yaml.MappingNode(tag, value, flow_style=flow_style)
-    if dumper.alias_key is not None:
-        dumper.represented_objects[dumper.alias_key] = node
-    best_style = True
-    if hasattr(mapping, "items"):
-        mapping = mapping.items()
-    for item_key, item_value in mapping:
-        node_key = dumper.represent_data(item_key)
-        node_value = dumper.represent_data(item_value)
-        if not (isinstance(node_key, yaml.ScalarNode) and not node_key.style):
-            best_style = False
-        if not (isinstance(node_value, yaml.ScalarNode) and not node_value.style):
-            best_style = False
-        value.append((node_key, node_value))
-    if flow_style is None:
-        if dumper.default_flow_style is not None:
-            node.flow_style = dumper.default_flow_style
-        else:
-            node.flow_style = best_style
-    return node
-
-
-def add_representer(klass: Any, representer: Any) -> None:
-    """Add to representer to the dumper."""
-    FastestAvailableSafeDumper.add_representer(klass, representer)
-
-
-add_representer(
-    OrderedDict,
-    lambda dumper, value: represent_odict(dumper, "tag:yaml.org,2002:map", value),
-)
-
-add_representer(
-    NodeDictClass,
-    lambda dumper, value: represent_odict(dumper, "tag:yaml.org,2002:map", value),
-)
-
-add_representer(
-    NodeListClass,
-    lambda dumper, value: dumper.represent_sequence("tag:yaml.org,2002:seq", value),
-)
-
-add_representer(
-    NodeStrClass,
-    lambda dumper, value: dumper.represent_scalar("tag:yaml.org,2002:str", str(value)),
-)
-
-add_representer(
-    Input,
-    lambda dumper, value: dumper.represent_scalar("!input", value.name),
-)
+__all__ = ["add_representer", "dump", "represent_odict", "save_yaml"]
diff --git a/homeassistant/util/yaml/input.py b/homeassistant/util/yaml/input.py
index ff9b37f18f1..5dad8a63ae5 100644
--- a/homeassistant/util/yaml/input.py
+++ b/homeassistant/util/yaml/input.py
@@ -2,55 +2,8 @@
 
 from __future__ import annotations
 
-from typing import Any
+from annotatedyaml.input import UndefinedSubstitution, extract_inputs, substitute
 
 from .objects import Input
 
-
-class UndefinedSubstitution(Exception):
-    """Error raised when we find a substitution that is not defined."""
-
-    def __init__(self, input_name: str) -> None:
-        """Initialize the undefined substitution exception."""
-        super().__init__(f"No substitution found for input {input_name}")
-        self.input = input
-
-
-def extract_inputs(obj: Any) -> set[str]:
-    """Extract input from a structure."""
-    found: set[str] = set()
-    _extract_inputs(obj, found)
-    return found
-
-
-def _extract_inputs(obj: Any, found: set[str]) -> None:
-    """Extract input from a structure."""
-    if isinstance(obj, Input):
-        found.add(obj.name)
-        return
-
-    if isinstance(obj, list):
-        for val in obj:
-            _extract_inputs(val, found)
-        return
-
-    if isinstance(obj, dict):
-        for val in obj.values():
-            _extract_inputs(val, found)
-        return
-
-
-def substitute(obj: Any, substitutions: dict[str, Any]) -> Any:
-    """Substitute values."""
-    if isinstance(obj, Input):
-        if obj.name not in substitutions:
-            raise UndefinedSubstitution(obj.name)
-        return substitutions[obj.name]
-
-    if isinstance(obj, list):
-        return [substitute(val, substitutions) for val in obj]
-
-    if isinstance(obj, dict):
-        return {key: substitute(val, substitutions) for key, val in obj.items()}
-
-    return obj
+__all__ = ["Input", "UndefinedSubstitution", "extract_inputs", "substitute"]
diff --git a/homeassistant/util/yaml/loader.py b/homeassistant/util/yaml/loader.py
index 3911d62040b..1f8338a1ff7 100644
--- a/homeassistant/util/yaml/loader.py
+++ b/homeassistant/util/yaml/loader.py
@@ -2,157 +2,37 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable, Iterator
-import fnmatch
-from io import StringIO, TextIOWrapper
-import logging
+from io import StringIO
 import os
-from pathlib import Path
-from typing import Any, TextIO, overload
+from typing import TextIO
 
+from annotatedyaml import YAMLException, YamlTypeError
+from annotatedyaml.loader import (
+    HAS_C_LOADER,
+    JSON_TYPE,
+    LoaderType,
+    Secrets,
+    add_constructor,
+    load_yaml as load_annotated_yaml,
+    load_yaml_dict as load_annotated_yaml_dict,
+    parse_yaml as parse_annotated_yaml,
+    secret_yaml as annotated_secret_yaml,
+)
 import yaml
 
-try:
-    from yaml import CSafeLoader as FastestAvailableSafeLoader
-
-    HAS_C_LOADER = True
-except ImportError:
-    HAS_C_LOADER = False
-    from yaml import (  # type: ignore[assignment]
-        SafeLoader as FastestAvailableSafeLoader,
-    )
-
-from propcache.api import cached_property
-
 from homeassistant.exceptions import HomeAssistantError
 
-from .const import SECRET_YAML
-from .objects import Input, NodeDictClass, NodeListClass, NodeStrClass
-
-# mypy: allow-untyped-calls, no-warn-return-any
-
-JSON_TYPE = list | dict | str
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class YamlTypeError(HomeAssistantError):
-    """Raised by load_yaml_dict if top level data is not a dict."""
-
-
-class Secrets:
-    """Store secrets while loading YAML."""
-
-    def __init__(self, config_dir: Path) -> None:
-        """Initialize secrets."""
-        self.config_dir = config_dir
-        self._cache: dict[Path, dict[str, str]] = {}
-
-    def get(self, requester_path: str, secret: str) -> str:
-        """Return the value of a secret."""
-        current_path = Path(requester_path)
-
-        secret_dir = current_path
-        while True:
-            secret_dir = secret_dir.parent
-
-            try:
-                secret_dir.relative_to(self.config_dir)
-            except ValueError:
-                # We went above the config dir
-                break
-
-            secrets = self._load_secret_yaml(secret_dir)
-
-            if secret in secrets:
-                _LOGGER.debug(
-                    "Secret %s retrieved from secrets.yaml in folder %s",
-                    secret,
-                    secret_dir,
-                )
-                return secrets[secret]
-
-        raise HomeAssistantError(f"Secret {secret} not defined")
-
-    def _load_secret_yaml(self, secret_dir: Path) -> dict[str, str]:
-        """Load the secrets yaml from path."""
-        if (secret_path := secret_dir / SECRET_YAML) in self._cache:
-            return self._cache[secret_path]
-
-        _LOGGER.debug("Loading %s", secret_path)
-        try:
-            secrets = load_yaml(str(secret_path))
-
-            if not isinstance(secrets, dict):
-                raise HomeAssistantError("Secrets is not a dictionary")
-
-            if "logger" in secrets:
-                logger = str(secrets["logger"]).lower()
-                if logger == "debug":
-                    _LOGGER.setLevel(logging.DEBUG)
-                else:
-                    _LOGGER.error(
-                        (
-                            "Error in secrets.yaml: 'logger: debug' expected, but"
-                            " 'logger: %s' found"
-                        ),
-                        logger,
-                    )
-                del secrets["logger"]
-        except FileNotFoundError:
-            secrets = {}
-
-        self._cache[secret_path] = secrets
-
-        return secrets
-
-
-class _LoaderMixin:
-    """Mixin class with extensions for YAML loader."""
-
-    name: str
-    stream: Any
-
-    @cached_property
-    def get_name(self) -> str:
-        """Get the name of the loader."""
-        return self.name
-
-    @cached_property
-    def get_stream_name(self) -> str:
-        """Get the name of the stream."""
-        return getattr(self.stream, "name", "")
-
-
-class FastSafeLoader(FastestAvailableSafeLoader, _LoaderMixin):
-    """The fastest available safe loader, either C or Python."""
-
-    def __init__(self, stream: Any, secrets: Secrets | None = None) -> None:
-        """Initialize a safe line loader."""
-        self.stream = stream
-
-        # Set name in same way as the Python loader does in yaml.reader.__init__
-        if isinstance(stream, str):
-            self.name = "<unicode string>"
-        elif isinstance(stream, bytes):
-            self.name = "<byte string>"
-        else:
-            self.name = getattr(stream, "name", "<file>")
-
-        super().__init__(stream)
-        self.secrets = secrets
-
-
-class PythonSafeLoader(yaml.SafeLoader, _LoaderMixin):
-    """Python safe loader."""
-
-    def __init__(self, stream: Any, secrets: Secrets | None = None) -> None:
-        """Initialize a safe line loader."""
-        super().__init__(stream)
-        self.secrets = secrets
-
-
-type LoaderType = FastSafeLoader | PythonSafeLoader
+__all__ = [
+    "HAS_C_LOADER",
+    "JSON_TYPE",
+    "Secrets",
+    "YamlTypeError",
+    "add_constructor",
+    "load_yaml",
+    "load_yaml_dict",
+    "parse_yaml",
+    "secret_yaml",
+]
 
 
 def load_yaml(
@@ -164,15 +44,9 @@ def load_yaml(
     except for FileNotFoundError which will be re-raised.
     """
     try:
-        with open(fname, encoding="utf-8") as conf_file:
-            return parse_yaml(conf_file, secrets)
-    except UnicodeDecodeError as exc:
-        _LOGGER.error("Unable to read file %s: %s", fname, exc)
-        raise HomeAssistantError(exc) from exc
-    except FileNotFoundError:
-        raise
-    except OSError as exc:
-        raise HomeAssistantError(exc) from exc
+        return load_annotated_yaml(fname, secrets)
+    except YAMLException as exc:
+        raise HomeAssistantError(str(exc)) from exc
 
 
 def load_yaml_dict(
@@ -183,320 +57,27 @@ def load_yaml_dict(
     Raise if the top level is not a dict.
     Return an empty dict if the file is empty.
     """
-    loaded_yaml = load_yaml(fname, secrets)
-    if loaded_yaml is None:
-        loaded_yaml = {}
-    if not isinstance(loaded_yaml, dict):
-        raise YamlTypeError(f"YAML file {fname} does not contain a dict")
-    return loaded_yaml
+    try:
+        return load_annotated_yaml_dict(fname, secrets)
+    except YamlTypeError:
+        raise
+    except YAMLException as exc:
+        raise HomeAssistantError(str(exc)) from exc
 
 
 def parse_yaml(
     content: str | TextIO | StringIO, secrets: Secrets | None = None
 ) -> JSON_TYPE:
     """Parse YAML with the fastest available loader."""
-    if not HAS_C_LOADER:
-        return _parse_yaml_python(content, secrets)
     try:
-        return _parse_yaml(FastSafeLoader, content, secrets)
-    except yaml.YAMLError:
-        # Loading failed, so we now load with the Python loader which has more
-        # readable exceptions
-        if isinstance(content, (StringIO, TextIO, TextIOWrapper)):
-            # Rewind the stream so we can try again
-            content.seek(0, 0)
-        return _parse_yaml_python(content, secrets)
-
-
-def _parse_yaml_python(
-    content: str | TextIO | StringIO, secrets: Secrets | None = None
-) -> JSON_TYPE:
-    """Parse YAML with the python loader (this is very slow)."""
-    try:
-        return _parse_yaml(PythonSafeLoader, content, secrets)
-    except yaml.YAMLError as exc:
-        _LOGGER.error(str(exc))
-        raise HomeAssistantError(exc) from exc
-
-
-def _parse_yaml(
-    loader: type[FastSafeLoader | PythonSafeLoader],
-    content: str | TextIO,
-    secrets: Secrets | None = None,
-) -> JSON_TYPE:
-    """Load a YAML file."""
-    return yaml.load(content, Loader=lambda stream: loader(stream, secrets))  # type: ignore[arg-type]
-
-
-@overload
-def _add_reference(
-    obj: list | NodeListClass, loader: LoaderType, node: yaml.nodes.Node
-) -> NodeListClass: ...
-
-
-@overload
-def _add_reference(
-    obj: str | NodeStrClass, loader: LoaderType, node: yaml.nodes.Node
-) -> NodeStrClass: ...
-
-
-@overload
-def _add_reference(
-    obj: dict | NodeDictClass, loader: LoaderType, node: yaml.nodes.Node
-) -> NodeDictClass: ...
-
-
-def _add_reference(
-    obj: dict | list | str | NodeDictClass | NodeListClass | NodeStrClass,
-    loader: LoaderType,
-    node: yaml.nodes.Node,
-) -> NodeDictClass | NodeListClass | NodeStrClass:
-    """Add file reference information to an object."""
-    if isinstance(obj, list):
-        obj = NodeListClass(obj)
-    elif isinstance(obj, str):
-        obj = NodeStrClass(obj)
-    elif isinstance(obj, dict):
-        obj = NodeDictClass(obj)
-    return _add_reference_to_node_class(obj, loader, node)
-
-
-@overload
-def _add_reference_to_node_class(
-    obj: NodeListClass, loader: LoaderType, node: yaml.nodes.Node
-) -> NodeListClass: ...
-
-
-@overload
-def _add_reference_to_node_class(
-    obj: NodeStrClass, loader: LoaderType, node: yaml.nodes.Node
-) -> NodeStrClass: ...
-
-
-@overload
-def _add_reference_to_node_class(
-    obj: NodeDictClass, loader: LoaderType, node: yaml.nodes.Node
-) -> NodeDictClass: ...
-
-
-def _add_reference_to_node_class(
-    obj: NodeDictClass | NodeListClass | NodeStrClass,
-    loader: LoaderType,
-    node: yaml.nodes.Node,
-) -> NodeDictClass | NodeListClass | NodeStrClass:
-    """Add file reference information to a node class object."""
-    try:  # suppress is much slower
-        obj.__config_file__ = loader.get_name
-        obj.__line__ = node.start_mark.line + 1
-    except AttributeError:
-        pass
-    return obj
-
-
-def _raise_if_no_value[NodeT: yaml.nodes.Node, _R](
-    func: Callable[[LoaderType, NodeT], _R],
-) -> Callable[[LoaderType, NodeT], _R]:
-    def wrapper(loader: LoaderType, node: NodeT) -> _R:
-        if not node.value:
-            raise HomeAssistantError(
-                f"{node.start_mark}: {node.tag} needs an argument."
-            )
-        return func(loader, node)
-
-    return wrapper
-
-
-@_raise_if_no_value
-def _include_yaml(loader: LoaderType, node: yaml.nodes.Node) -> JSON_TYPE:
-    """Load another YAML file and embed it using the !include tag.
-
-    Example:
-        device_tracker: !include device_tracker.yaml
-
-    """
-    fname = os.path.join(os.path.dirname(loader.get_name), node.value)
-    try:
-        loaded_yaml = load_yaml(fname, loader.secrets)
-        if loaded_yaml is None:
-            loaded_yaml = NodeDictClass()
-        return _add_reference(loaded_yaml, loader, node)
-    except FileNotFoundError as exc:
-        raise HomeAssistantError(
-            f"{node.start_mark}: Unable to read file {fname}"
-        ) from exc
-
-
-def _is_file_valid(name: str) -> bool:
-    """Decide if a file is valid."""
-    return not name.startswith(".")
-
-
-def _find_files(directory: str, pattern: str) -> Iterator[str]:
-    """Recursively load files in a directory."""
-    for root, dirs, files in os.walk(directory, topdown=True):
-        dirs[:] = [d for d in dirs if _is_file_valid(d)]
-        for basename in sorted(files):
-            if _is_file_valid(basename) and fnmatch.fnmatch(basename, pattern):
-                filename = os.path.join(root, basename)
-                yield filename
-
-
-@_raise_if_no_value
-def _include_dir_named_yaml(loader: LoaderType, node: yaml.nodes.Node) -> NodeDictClass:
-    """Load multiple files from directory as a dictionary."""
-    mapping = NodeDictClass()
-    loc = os.path.join(os.path.dirname(loader.get_name), node.value)
-    for fname in _find_files(loc, "*.yaml"):
-        filename = os.path.splitext(os.path.basename(fname))[0]
-        if os.path.basename(fname) == SECRET_YAML:
-            continue
-        loaded_yaml = load_yaml(fname, loader.secrets)
-        if loaded_yaml is None:
-            # Special case, an empty file included by !include_dir_named is treated
-            # as an empty dictionary
-            loaded_yaml = NodeDictClass()
-        mapping[filename] = loaded_yaml
-    return _add_reference_to_node_class(mapping, loader, node)
-
-
-@_raise_if_no_value
-def _include_dir_merge_named_yaml(
-    loader: LoaderType, node: yaml.nodes.Node
-) -> NodeDictClass:
-    """Load multiple files from directory as a merged dictionary."""
-    mapping = NodeDictClass()
-    loc = os.path.join(os.path.dirname(loader.get_name), node.value)
-    for fname in _find_files(loc, "*.yaml"):
-        if os.path.basename(fname) == SECRET_YAML:
-            continue
-        loaded_yaml = load_yaml(fname, loader.secrets)
-        if isinstance(loaded_yaml, dict):
-            mapping.update(loaded_yaml)
-    return _add_reference_to_node_class(mapping, loader, node)
-
-
-@_raise_if_no_value
-def _include_dir_list_yaml(
-    loader: LoaderType, node: yaml.nodes.Node
-) -> list[JSON_TYPE]:
-    """Load multiple files from directory as a list."""
-    loc = os.path.join(os.path.dirname(loader.get_name), node.value)
-    return [
-        loaded_yaml
-        for f in _find_files(loc, "*.yaml")
-        if os.path.basename(f) != SECRET_YAML
-        and (loaded_yaml := load_yaml(f, loader.secrets)) is not None
-    ]
-
-
-@_raise_if_no_value
-def _include_dir_merge_list_yaml(
-    loader: LoaderType, node: yaml.nodes.Node
-) -> JSON_TYPE:
-    """Load multiple files from directory as a merged list."""
-    loc: str = os.path.join(os.path.dirname(loader.get_name), node.value)
-    merged_list: list[JSON_TYPE] = []
-    for fname in _find_files(loc, "*.yaml"):
-        if os.path.basename(fname) == SECRET_YAML:
-            continue
-        loaded_yaml = load_yaml(fname, loader.secrets)
-        if isinstance(loaded_yaml, list):
-            merged_list.extend(loaded_yaml)
-    return _add_reference(merged_list, loader, node)
-
-
-def _handle_mapping_tag(
-    loader: LoaderType, node: yaml.nodes.MappingNode
-) -> NodeDictClass:
-    """Load YAML mappings into an ordered dictionary to preserve key order."""
-    loader.flatten_mapping(node)
-    nodes = loader.construct_pairs(node)
-
-    seen: dict = {}
-    for (key, _), (child_node, _) in zip(nodes, node.value, strict=False):
-        line = child_node.start_mark.line
-
-        try:
-            hash(key)
-        except TypeError as exc:
-            fname = loader.get_stream_name
-            raise yaml.MarkedYAMLError(
-                context=f'invalid key: "{key}"',
-                context_mark=yaml.Mark(
-                    fname,
-                    0,
-                    line,
-                    -1,
-                    None,
-                    None,  # type: ignore[arg-type]
-                ),
-            ) from exc
-
-        if key in seen:
-            fname = loader.get_stream_name
-            _LOGGER.warning(
-                'YAML file %s contains duplicate key "%s". Check lines %d and %d',
-                fname,
-                key,
-                seen[key],
-                line,
-            )
-        seen[key] = line
-
-    return _add_reference_to_node_class(NodeDictClass(nodes), loader, node)
-
-
-def _construct_seq(loader: LoaderType, node: yaml.nodes.Node) -> JSON_TYPE:
-    """Add line number and file name to Load YAML sequence."""
-    (obj,) = loader.construct_yaml_seq(node)
-    return _add_reference(obj, loader, node)
-
-
-def _handle_scalar_tag(
-    loader: LoaderType, node: yaml.nodes.ScalarNode
-) -> str | int | float | None:
-    """Add line number and file name to Load YAML sequence."""
-    obj = node.value
-    if not isinstance(obj, str):
-        return obj
-    return _add_reference_to_node_class(NodeStrClass(obj), loader, node)
-
-
-def _env_var_yaml(loader: LoaderType, node: yaml.nodes.Node) -> str:
-    """Load environment variables and embed it into the configuration YAML."""
-    args = node.value.split()
-
-    # Check for a default value
-    if len(args) > 1:
-        return os.getenv(args[0], " ".join(args[1:]))
-    if args[0] in os.environ:
-        return os.environ[args[0]]
-    _LOGGER.error("Environment variable %s not defined", node.value)
-    raise HomeAssistantError(node.value)
+        return parse_annotated_yaml(content, secrets)
+    except YAMLException as exc:
+        raise HomeAssistantError(str(exc)) from exc
 
 
 def secret_yaml(loader: LoaderType, node: yaml.nodes.Node) -> JSON_TYPE:
     """Load secrets and embed it into the configuration YAML."""
-    if loader.secrets is None:
-        raise HomeAssistantError("Secrets not supported in this YAML file")
-
-    return loader.secrets.get(loader.get_name, node.value)
-
-
-def add_constructor(tag: Any, constructor: Any) -> None:
-    """Add to constructor to all loaders."""
-    for yaml_loader in (FastSafeLoader, PythonSafeLoader):
-        yaml_loader.add_constructor(tag, constructor)
-
-
-add_constructor("!include", _include_yaml)
-add_constructor(yaml.resolver.BaseResolver.DEFAULT_MAPPING_TAG, _handle_mapping_tag)
-add_constructor(yaml.resolver.BaseResolver.DEFAULT_SCALAR_TAG, _handle_scalar_tag)
-add_constructor(yaml.resolver.BaseResolver.DEFAULT_SEQUENCE_TAG, _construct_seq)
-add_constructor("!env_var", _env_var_yaml)
-add_constructor("!secret", secret_yaml)
-add_constructor("!include_dir_list", _include_dir_list_yaml)
-add_constructor("!include_dir_merge_list", _include_dir_merge_list_yaml)
-add_constructor("!include_dir_named", _include_dir_named_yaml)
-add_constructor("!include_dir_merge_named", _include_dir_merge_named_yaml)
-add_constructor("!input", Input.from_node)
+    try:
+        return annotated_secret_yaml(loader, node)
+    except YAMLException as exc:
+        raise HomeAssistantError(str(exc)) from exc
diff --git a/homeassistant/util/yaml/objects.py b/homeassistant/util/yaml/objects.py
index 7e4019331c6..26714b0fdd4 100644
--- a/homeassistant/util/yaml/objects.py
+++ b/homeassistant/util/yaml/objects.py
@@ -2,52 +2,6 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass
-from typing import Any
+from annotatedyaml import Input, NodeDictClass, NodeListClass, NodeStrClass
 
-import voluptuous as vol
-from voluptuous.schema_builder import _compile_scalar
-import yaml
-
-
-class NodeListClass(list):
-    """Wrapper class to be able to add attributes on a list."""
-
-    __slots__ = ("__config_file__", "__line__")
-
-    __config_file__: str
-    __line__: int | str
-
-
-class NodeStrClass(str):
-    """Wrapper class to be able to add attributes on a string."""
-
-    __slots__ = ("__config_file__", "__line__")
-
-    __config_file__: str
-    __line__: int | str
-
-    def __voluptuous_compile__(self, schema: vol.Schema) -> Any:
-        """Needed because vol.Schema.compile does not handle str subclasses."""
-        return _compile_scalar(self)  # type: ignore[no-untyped-call]
-
-
-class NodeDictClass(dict):
-    """Wrapper class to be able to add attributes on a dict."""
-
-    __slots__ = ("__config_file__", "__line__")
-
-    __config_file__: str
-    __line__: int | str
-
-
-@dataclass(slots=True, frozen=True)
-class Input:
-    """Input that should be substituted."""
-
-    name: str
-
-    @classmethod
-    def from_node(cls, loader: yaml.Loader, node: yaml.nodes.Node) -> Input:
-        """Create a new placeholder from a node."""
-        return cls(node.value)
+__all__ = ["Input", "NodeDictClass", "NodeListClass", "NodeStrClass"]
diff --git a/mypy.ini b/mypy.ini
index 7f7b66e238f..9831a183ec4 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -785,6 +785,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.azure_storage.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.backup.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -935,6 +945,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.bosch_alarm.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.braviatv.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -945,6 +965,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.bring.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.brother.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -1095,6 +1125,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.comelit.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.command_line.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -1926,6 +1966,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.google_drive.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.google_photos.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -2026,6 +2076,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.heos.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.here_travel_time.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -2066,6 +2126,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.home_connect.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.homeassistant.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -2916,6 +2986,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.mcp.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.mcp_server.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -3336,6 +3416,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.onedrive.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.onewire.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -3646,6 +3736,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.pyload.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.python_script.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -3766,6 +3866,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.remember_the_milk.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.remote.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -3776,6 +3886,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.remote_calendar.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.renault.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -4076,6 +4196,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.sensorpush_cloud.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.sensoterra.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -4949,6 +5079,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.vodafone_station.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.wake_on_lan.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
diff --git a/pylint/plugins/hass_enforce_class_module.py b/pylint/plugins/hass_enforce_class_module.py
index 09fe61b68c6..cc7b33d9946 100644
--- a/pylint/plugins/hass_enforce_class_module.py
+++ b/pylint/plugins/hass_enforce_class_module.py
@@ -140,7 +140,7 @@ class HassEnforceClassModule(BaseChecker):
 
             for ancestor in top_level_ancestors:
                 if ancestor.name in _BASE_ENTITY_MODULES and not any(
-                    anc.name in _MODULE_CLASSES for anc in ancestors
+                    parent.name in _MODULE_CLASSES for parent in ancestors
                 ):
                     self.add_message(
                         "hass-enforce-class-module",
diff --git a/pylint/plugins/hass_enforce_type_hints.py b/pylint/plugins/hass_enforce_type_hints.py
index f76e0b43c10..ca7777da959 100644
--- a/pylint/plugins/hass_enforce_type_hints.py
+++ b/pylint/plugins/hass_enforce_type_hints.py
@@ -252,7 +252,7 @@ _FUNCTION_MATCH: dict[str, list[TypeHintMatch]] = {
             arg_types={
                 0: "HomeAssistant",
                 1: "ConfigEntry",
-                2: "AddEntitiesCallback",
+                2: "AddConfigEntryEntitiesCallback",
             },
             return_type=None,
         ),
@@ -1410,6 +1410,16 @@ _INHERITANCE_MATCH: dict[str, list[ClassTypeHintMatch]] = {
             ],
         ),
     ],
+    "entity": [
+        ClassTypeHintMatch(
+            base_class="Entity",
+            matches=_ENTITY_MATCH,
+        ),
+        ClassTypeHintMatch(
+            base_class="RestoreEntity",
+            matches=_RESTORE_ENTITY_MATCH,
+        ),
+    ],
     "fan": [
         ClassTypeHintMatch(
             base_class="Entity",
@@ -2558,7 +2568,7 @@ _INHERITANCE_MATCH: dict[str, list[ClassTypeHintMatch]] = {
                 ),
                 TypeHintMatch(
                     function_name="in_progress",
-                    return_type=["bool", "int", None],
+                    return_type=["bool", None],
                 ),
                 TypeHintMatch(
                     function_name="latest_version",
@@ -2580,6 +2590,10 @@ _INHERITANCE_MATCH: dict[str, list[ClassTypeHintMatch]] = {
                     function_name="title",
                     return_type=["str", None],
                 ),
+                TypeHintMatch(
+                    function_name="update_percentage",
+                    return_type=["int", "float", None],
+                ),
                 TypeHintMatch(
                     function_name="install",
                     arg_types={1: "str | None", 2: "bool"},
diff --git a/pyproject.toml b/pyproject.toml
index 56f2533840a..0a56de0f6f7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,97 +1,98 @@
 [build-system]
-requires = ["setuptools==75.1.0"]
+requires = ["setuptools==77.0.3"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name        = "homeassistant"
-version     = "2025.2.0.dev0"
-license     = {text = "Apache-2.0"}
+name = "homeassistant"
+version = "2025.5.0.dev0"
+license = "Apache-2.0"
+license-files = ["LICENSE*", "homeassistant/backports/LICENSE*"]
 description = "Open-source home automation platform running on Python 3."
-readme      = "README.rst"
-authors     = [
-    {name = "The Home Assistant Authors", email = "hello@home-assistant.io"}
+readme = "README.rst"
+authors = [
+  { name = "The Home Assistant Authors", email = "hello@home-assistant.io" },
 ]
-keywords    = ["home", "automation"]
+keywords = ["home", "automation"]
 classifiers = [
-    "Development Status :: 5 - Production/Stable",
-    "Intended Audience :: End Users/Desktop",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: Apache Software License",
-    "Operating System :: OS Independent",
-    "Programming Language :: Python :: 3.13",
-    "Topic :: Home Automation",
+  "Development Status :: 5 - Production/Stable",
+  "Intended Audience :: End Users/Desktop",
+  "Intended Audience :: Developers",
+  "Operating System :: OS Independent",
+  "Programming Language :: Python :: 3.13",
+  "Topic :: Home Automation",
 ]
 requires-python = ">=3.13.0"
-dependencies    = [
-    "aiodns==3.2.0",
-    # Integrations may depend on hassio integration without listing it to
-    # change behavior based on presence of supervisor. Deprecated with #127228
-    # Lib can be removed with 2025.11
-    "aiohasupervisor==0.2.2b5",
-    "aiohttp==3.11.11",
-    "aiohttp_cors==0.7.0",
-    "aiohttp-fast-zlib==0.2.0",
-    "aiohttp-asyncmdnsresolver==0.0.1",
-    "aiozoneinfo==0.2.1",
-    "astral==2.2",
-    "async-interrupt==1.2.0",
-    "attrs==24.2.0",
-    "atomicwrites-homeassistant==1.4.1",
-    "audioop-lts==0.2.1;python_version>='3.13'",
-    "awesomeversion==24.6.0",
-    "bcrypt==4.2.0",
-    "certifi>=2021.5.30",
-    "ciso8601==2.3.2",
-    "cronsim==2.6",
-    "fnv-hash-fast==1.2.2",
-    # hass-nabucasa is imported by helpers which don't depend on the cloud
-    # integration
-    "hass-nabucasa==0.88.1",
-    # When bumping httpx, please check the version pins of
-    # httpcore, anyio, and h11 in gen_requirements_all
-    "httpx==0.28.1",
-    "home-assistant-bluetooth==1.13.0",
-    "ifaddr==0.2.0",
-    "Jinja2==3.1.5",
-    "lru-dict==1.3.0",
-    "PyJWT==2.10.1",
-    # PyJWT has loose dependency. We want the latest one.
-    "cryptography==44.0.0",
-    "Pillow==11.1.0",
-    "propcache==0.2.1",
-    "pyOpenSSL==24.3.0",
-    "orjson==3.10.12",
-    "packaging>=23.1",
-    "psutil-home-assistant==0.0.1",
-    "python-slugify==8.0.4",
-    "PyYAML==6.0.2",
-    "requests==2.32.3",
-    "securetar==2025.1.3",
-    "SQLAlchemy==2.0.36",
-    "standard-aifc==3.13.0;python_version>='3.13'",
-    "standard-telnetlib==3.13.0;python_version>='3.13'",
-    "typing-extensions>=4.12.2,<5.0",
-    "ulid-transform==1.2.0",
-    # Constrain urllib3 to ensure we deal with CVE-2020-26137 and CVE-2021-33503
-    # Temporary setting an upper bound, to prevent compat issues with urllib3>=2
-    # https://github.com/home-assistant/core/issues/97248
-    "urllib3>=1.26.5,<2",
-    "uv==0.5.21",
-    "voluptuous==0.15.2",
-    "voluptuous-serialize==2.6.0",
-    "voluptuous-openapi==0.0.6",
-    "yarl==1.18.3",
-    "webrtc-models==0.3.0",
-    "zeroconf==0.141.0"
+dependencies = [
+  "aiodns==3.2.0",
+  # Integrations may depend on hassio integration without listing it to
+  # change behavior based on presence of supervisor. Deprecated with #127228
+  # Lib can be removed with 2025.11
+  "aiohasupervisor==0.3.0",
+  "aiohttp==3.11.14",
+  "aiohttp_cors==0.7.0",
+  "aiohttp-fast-zlib==0.2.3",
+  "aiohttp-asyncmdnsresolver==0.1.1",
+  "aiozoneinfo==0.2.3",
+  "annotatedyaml==0.4.5",
+  "astral==2.2",
+  "async-interrupt==1.2.2",
+  "attrs==25.1.0",
+  "atomicwrites-homeassistant==1.4.1",
+  "audioop-lts==0.2.1",
+  "awesomeversion==24.6.0",
+  "bcrypt==4.2.0",
+  "certifi>=2021.5.30",
+  "ciso8601==2.3.2",
+  "cronsim==2.6",
+  "fnv-hash-fast==1.4.0",
+  # hass-nabucasa is imported by helpers which don't depend on the cloud
+  # integration
+  "hass-nabucasa==0.94.0",
+  # When bumping httpx, please check the version pins of
+  # httpcore, anyio, and h11 in gen_requirements_all
+  "httpx==0.28.1",
+  "home-assistant-bluetooth==1.13.1",
+  "ifaddr==0.2.0",
+  "Jinja2==3.1.6",
+  "lru-dict==1.3.0",
+  "PyJWT==2.10.1",
+  # PyJWT has loose dependency. We want the latest one.
+  "cryptography==44.0.1",
+  "Pillow==11.1.0",
+  "propcache==0.3.0",
+  "pyOpenSSL==25.0.0",
+  "orjson==3.10.16",
+  "packaging>=23.1",
+  "psutil-home-assistant==0.0.1",
+  "python-slugify==8.0.4",
+  "PyYAML==6.0.2",
+  "requests==2.32.3",
+  "securetar==2025.2.1",
+  "SQLAlchemy==2.0.39",
+  "standard-aifc==3.13.0",
+  "standard-telnetlib==3.13.0",
+  "typing-extensions>=4.13.0,<5.0",
+  "ulid-transform==1.4.0",
+  # Constrain urllib3 to ensure we deal with CVE-2020-26137 and CVE-2021-33503
+  # Temporary setting an upper bound, to prevent compat issues with urllib3>=2
+  # https://github.com/home-assistant/core/issues/97248
+  "urllib3>=1.26.5,<2",
+  "uv==0.6.10",
+  "voluptuous==0.15.2",
+  "voluptuous-serialize==2.6.0",
+  "voluptuous-openapi==0.0.6",
+  "yarl==1.18.3",
+  "webrtc-models==0.3.0",
+  "zeroconf==0.146.0",
 ]
 
 [project.urls]
-"Homepage"    = "https://www.home-assistant.io/"
+"Homepage" = "https://www.home-assistant.io/"
 "Source Code" = "https://github.com/home-assistant/core"
 "Bug Reports" = "https://github.com/home-assistant/core/issues"
-"Docs: Dev"   = "https://developers.home-assistant.io/"
-"Discord"     = "https://www.home-assistant.io/join-chat/"
-"Forum"       = "https://community.home-assistant.io/"
+"Docs: Dev" = "https://developers.home-assistant.io/"
+"Discord" = "https://www.home-assistant.io/join-chat/"
+"Forum" = "https://community.home-assistant.io/"
 
 [project.scripts]
 hass = "homeassistant.__main__:main"
@@ -118,30 +119,28 @@ init-hook = """\
     ) \
     """
 load-plugins = [
-    "pylint.extensions.code_style",
-    "pylint.extensions.typing",
-    "hass_decorator",
-    "hass_enforce_class_module",
-    "hass_enforce_sorted_platforms",
-    "hass_enforce_super_call",
-    "hass_enforce_type_hints",
-    "hass_inheritance",
-    "hass_imports",
-    "hass_logger",
-    "pylint_per_file_ignores",
+  "pylint.extensions.code_style",
+  "pylint.extensions.typing",
+  "hass_decorator",
+  "hass_enforce_class_module",
+  "hass_enforce_sorted_platforms",
+  "hass_enforce_super_call",
+  "hass_enforce_type_hints",
+  "hass_inheritance",
+  "hass_imports",
+  "hass_logger",
+  "pylint_per_file_ignores",
 ]
 persistent = false
 extension-pkg-allow-list = [
-    "av.audio.stream",
-    "av.logging",
-    "av.stream",
-    "ciso8601",
-    "orjson",
-    "cv2",
-]
-fail-on = [
-    "I",
+  "av.audio.stream",
+  "av.logging",
+  "av.stream",
+  "ciso8601",
+  "orjson",
+  "cv2",
 ]
+fail-on = ["I"]
 
 [tool.pylint.BASIC]
 class-const-naming-style = "any"
@@ -166,257 +165,257 @@ class-const-naming-style = "any"
 # consider-using-namedtuple-or-dataclass - too opinionated
 # consider-using-assignment-expr - decision to use := better left to devs
 disable = [
-    "format",
-    "abstract-method",
-    "cyclic-import",
-    "duplicate-code",
-    "inconsistent-return-statements",
-    "locally-disabled",
-    "not-context-manager",
-    "too-few-public-methods",
-    "too-many-ancestors",
-    "too-many-arguments",
-    "too-many-instance-attributes",
-    "too-many-lines",
-    "too-many-locals",
-    "too-many-public-methods",
-    "too-many-boolean-expressions",
-    "too-many-positional-arguments",
-    "wrong-import-order",
-    "consider-using-namedtuple-or-dataclass",
-    "consider-using-assignment-expr",
-    "possibly-used-before-assignment",
+  "format",
+  "abstract-method",
+  "cyclic-import",
+  "duplicate-code",
+  "inconsistent-return-statements",
+  "locally-disabled",
+  "not-context-manager",
+  "too-few-public-methods",
+  "too-many-ancestors",
+  "too-many-arguments",
+  "too-many-instance-attributes",
+  "too-many-lines",
+  "too-many-locals",
+  "too-many-public-methods",
+  "too-many-boolean-expressions",
+  "too-many-positional-arguments",
+  "wrong-import-order",
+  "consider-using-namedtuple-or-dataclass",
+  "consider-using-assignment-expr",
+  "possibly-used-before-assignment",
 
-    # Handled by ruff
-    # Ref: <https://github.com/astral-sh/ruff/issues/970>
-    "await-outside-async", # PLE1142
-    "bad-str-strip-call", # PLE1310
-    "bad-string-format-type", # PLE1307
-    "bidirectional-unicode", # PLE2502
-    "continue-in-finally", # PLE0116
-    "duplicate-bases", # PLE0241
-    "misplaced-bare-raise", # PLE0704
-    "format-needs-mapping", # F502
-    "function-redefined", # F811
-    # Needed because ruff does not understand type of __all__ generated by a function
-    # "invalid-all-format", # PLE0605
-    "invalid-all-object", # PLE0604
-    "invalid-character-backspace", # PLE2510
-    "invalid-character-esc", # PLE2513
-    "invalid-character-nul", # PLE2514
-    "invalid-character-sub", # PLE2512
-    "invalid-character-zero-width-space", # PLE2515
-    "logging-too-few-args", # PLE1206
-    "logging-too-many-args", # PLE1205
-    "missing-format-string-key", # F524
-    "mixed-format-string", # F506
-    "no-method-argument", # N805
-    "no-self-argument", # N805
-    "nonexistent-operator", # B002
-    "nonlocal-without-binding", # PLE0117
-    "not-in-loop", # F701, F702
-    "notimplemented-raised", # F901
-    "return-in-init", # PLE0101
-    "return-outside-function", # F706
-    "syntax-error", # E999
-    "too-few-format-args", # F524
-    "too-many-format-args", # F522
-    "too-many-star-expressions", # F622
-    "truncated-format-string", # F501
-    "undefined-all-variable", # F822
-    "undefined-variable", # F821
-    "used-prior-global-declaration", # PLE0118
-    "yield-inside-async-function", # PLE1700
-    "yield-outside-function", # F704
-    "anomalous-backslash-in-string", # W605
-    "assert-on-string-literal", # PLW0129
-    "assert-on-tuple", # F631
-    "bad-format-string", # W1302, F
-    "bad-format-string-key", # W1300, F
-    "bare-except", # E722
-    "binary-op-exception", # PLW0711
-    "cell-var-from-loop", # B023
-    # "dangerous-default-value", # B006, ruff catches new occurrences, needs more work
-    "duplicate-except", # B014
-    "duplicate-key", # F601
-    "duplicate-string-formatting-argument", # F
-    "duplicate-value", # F
-    "eval-used", # S307
-    "exec-used", # S102
-    "expression-not-assigned", # B018
-    "f-string-without-interpolation", # F541
-    "forgotten-debug-statement", # T100
-    "format-string-without-interpolation", # F
-    # "global-statement", # PLW0603, ruff catches new occurrences, needs more work
-    "global-variable-not-assigned", # PLW0602
-    "implicit-str-concat", # ISC001
-    "import-self", # PLW0406
-    "inconsistent-quotes", # Q000
-    "invalid-envvar-default", # PLW1508
-    "keyword-arg-before-vararg", # B026
-    "logging-format-interpolation", # G
-    "logging-fstring-interpolation", # G
-    "logging-not-lazy", # G
-    "misplaced-future", # F404
-    "named-expr-without-context", # PLW0131
-    "nested-min-max", # PLW3301
-    "pointless-statement", # B018
-    "raise-missing-from", # B904
-    "redefined-builtin", # A001
-    "try-except-raise", # TRY302
-    "unused-argument", # ARG001, we don't use it
-    "unused-format-string-argument", #F507
-    "unused-format-string-key", # F504
-    "unused-import", # F401
-    "unused-variable", # F841
-    "useless-else-on-loop", # PLW0120
-    "wildcard-import", # F403
-    "bad-classmethod-argument", # N804
-    "consider-iterating-dictionary", # SIM118
-    "empty-docstring", # D419
-    "invalid-name", # N815
-    "line-too-long", # E501, disabled globally
-    "missing-class-docstring", # D101
-    "missing-final-newline", # W292
-    "missing-function-docstring", # D103
-    "missing-module-docstring", # D100
-    "multiple-imports", #E401
-    "singleton-comparison", # E711, E712
-    "subprocess-run-check", # PLW1510
-    "superfluous-parens", # UP034
-    "ungrouped-imports", # I001
-    "unidiomatic-typecheck", # E721
-    "unnecessary-direct-lambda-call", # PLC3002
-    "unnecessary-lambda-assignment", # PLC3001
-    "unnecessary-pass", # PIE790
-    "unneeded-not", # SIM208
-    "useless-import-alias", # PLC0414
-    "wrong-import-order", # I001
-    "wrong-import-position", # E402
-    "comparison-of-constants", # PLR0133
-    "comparison-with-itself", # PLR0124
-    "consider-alternative-union-syntax", # UP007
-    "consider-merging-isinstance", # PLR1701
-    "consider-using-alias", # UP006
-    "consider-using-dict-comprehension", # C402
-    "consider-using-generator", # C417
-    "consider-using-get", # SIM401
-    "consider-using-set-comprehension", # C401
-    "consider-using-sys-exit", # PLR1722
-    "consider-using-ternary", # SIM108
-    "literal-comparison", # F632
-    "property-with-parameters", # PLR0206
-    "super-with-arguments", # UP008
-    "too-many-branches", # PLR0912
-    "too-many-return-statements", # PLR0911
-    "too-many-statements", # PLR0915
-    "trailing-comma-tuple", # COM818
-    "unnecessary-comprehension", # C416
-    "use-a-generator", # C417
-    "use-dict-literal", # C406
-    "use-list-literal", # C405
-    "useless-object-inheritance", # UP004
-    "useless-return", # PLR1711
-    "no-else-break", # RET508
-    "no-else-continue", # RET507
-    "no-else-raise", # RET506
-    "no-else-return", # RET505
-    "broad-except", # BLE001
-    "protected-access", # SLF001
-    "broad-exception-raised", # TRY002
-    "consider-using-f-string", # PLC0209
-    # "no-self-use", # PLR6301  # Optional plugin, not enabled
+  # Handled by ruff
+  # Ref: <https://github.com/astral-sh/ruff/issues/970>
+  "await-outside-async",    # PLE1142
+  "bad-str-strip-call",     # PLE1310
+  "bad-string-format-type", # PLE1307
+  "bidirectional-unicode",  # PLE2502
+  "continue-in-finally",    # PLE0116
+  "duplicate-bases",        # PLE0241
+  "misplaced-bare-raise",   # PLE0704
+  "format-needs-mapping",   # F502
+  "function-redefined",     # F811
+  # Needed because ruff does not understand type of __all__ generated by a function
+  # "invalid-all-format", # PLE0605
+  "invalid-all-object",                 # PLE0604
+  "invalid-character-backspace",        # PLE2510
+  "invalid-character-esc",              # PLE2513
+  "invalid-character-nul",              # PLE2514
+  "invalid-character-sub",              # PLE2512
+  "invalid-character-zero-width-space", # PLE2515
+  "logging-too-few-args",               # PLE1206
+  "logging-too-many-args",              # PLE1205
+  "missing-format-string-key",          # F524
+  "mixed-format-string",                # F506
+  "no-method-argument",                 # N805
+  "no-self-argument",                   # N805
+  "nonexistent-operator",               # B002
+  "nonlocal-without-binding",           # PLE0117
+  "not-in-loop",                        # F701, F702
+  "notimplemented-raised",              # F901
+  "return-in-init",                     # PLE0101
+  "return-outside-function",            # F706
+  "syntax-error",                       # E999
+  "too-few-format-args",                # F524
+  "too-many-format-args",               # F522
+  "too-many-star-expressions",          # F622
+  "truncated-format-string",            # F501
+  "undefined-all-variable",             # F822
+  "undefined-variable",                 # F821
+  "used-prior-global-declaration",      # PLE0118
+  "yield-inside-async-function",        # PLE1700
+  "yield-outside-function",             # F704
+  "anomalous-backslash-in-string",      # W605
+  "assert-on-string-literal",           # PLW0129
+  "assert-on-tuple",                    # F631
+  "bad-format-string",                  # W1302, F
+  "bad-format-string-key",              # W1300, F
+  "bare-except",                        # E722
+  "binary-op-exception",                # PLW0711
+  "cell-var-from-loop",                 # B023
+  # "dangerous-default-value", # B006, ruff catches new occurrences, needs more work
+  "duplicate-except",                     # B014
+  "duplicate-key",                        # F601
+  "duplicate-string-formatting-argument", # F
+  "duplicate-value",                      # F
+  "eval-used",                            # S307
+  "exec-used",                            # S102
+  "expression-not-assigned",              # B018
+  "f-string-without-interpolation",       # F541
+  "forgotten-debug-statement",            # T100
+  "format-string-without-interpolation",  # F
+  # "global-statement", # PLW0603, ruff catches new occurrences, needs more work
+  "global-variable-not-assigned",      # PLW0602
+  "implicit-str-concat",               # ISC001
+  "import-self",                       # PLW0406
+  "inconsistent-quotes",               # Q000
+  "invalid-envvar-default",            # PLW1508
+  "keyword-arg-before-vararg",         # B026
+  "logging-format-interpolation",      # G
+  "logging-fstring-interpolation",     # G
+  "logging-not-lazy",                  # G
+  "misplaced-future",                  # F404
+  "named-expr-without-context",        # PLW0131
+  "nested-min-max",                    # PLW3301
+  "pointless-statement",               # B018
+  "raise-missing-from",                # B904
+  "redefined-builtin",                 # A001
+  "try-except-raise",                  # TRY302
+  "unused-argument",                   # ARG001, we don't use it
+  "unused-format-string-argument",     #F507
+  "unused-format-string-key",          # F504
+  "unused-import",                     # F401
+  "unused-variable",                   # F841
+  "useless-else-on-loop",              # PLW0120
+  "wildcard-import",                   # F403
+  "bad-classmethod-argument",          # N804
+  "consider-iterating-dictionary",     # SIM118
+  "empty-docstring",                   # D419
+  "invalid-name",                      # N815
+  "line-too-long",                     # E501, disabled globally
+  "missing-class-docstring",           # D101
+  "missing-final-newline",             # W292
+  "missing-function-docstring",        # D103
+  "missing-module-docstring",          # D100
+  "multiple-imports",                  #E401
+  "singleton-comparison",              # E711, E712
+  "subprocess-run-check",              # PLW1510
+  "superfluous-parens",                # UP034
+  "ungrouped-imports",                 # I001
+  "unidiomatic-typecheck",             # E721
+  "unnecessary-direct-lambda-call",    # PLC3002
+  "unnecessary-lambda-assignment",     # PLC3001
+  "unnecessary-pass",                  # PIE790
+  "unneeded-not",                      # SIM208
+  "useless-import-alias",              # PLC0414
+  "wrong-import-order",                # I001
+  "wrong-import-position",             # E402
+  "comparison-of-constants",           # PLR0133
+  "comparison-with-itself",            # PLR0124
+  "consider-alternative-union-syntax", # UP007
+  "consider-merging-isinstance",       # PLR1701
+  "consider-using-alias",              # UP006
+  "consider-using-dict-comprehension", # C402
+  "consider-using-generator",          # C417
+  "consider-using-get",                # SIM401
+  "consider-using-set-comprehension",  # C401
+  "consider-using-sys-exit",           # PLR1722
+  "consider-using-ternary",            # SIM108
+  "literal-comparison",                # F632
+  "property-with-parameters",          # PLR0206
+  "super-with-arguments",              # UP008
+  "too-many-branches",                 # PLR0912
+  "too-many-return-statements",        # PLR0911
+  "too-many-statements",               # PLR0915
+  "trailing-comma-tuple",              # COM818
+  "unnecessary-comprehension",         # C416
+  "use-a-generator",                   # C417
+  "use-dict-literal",                  # C406
+  "use-list-literal",                  # C405
+  "useless-object-inheritance",        # UP004
+  "useless-return",                    # PLR1711
+  "no-else-break",                     # RET508
+  "no-else-continue",                  # RET507
+  "no-else-raise",                     # RET506
+  "no-else-return",                    # RET505
+  "broad-except",                      # BLE001
+  "protected-access",                  # SLF001
+  "broad-exception-raised",            # TRY002
+  "consider-using-f-string",           # PLC0209
+  # "no-self-use", # PLR6301  # Optional plugin, not enabled
 
-    # Handled by mypy
-    # Ref: <https://github.com/antonagestam/pylint-mypy-overlap>
-    "abstract-class-instantiated",
-    "arguments-differ",
-    "assigning-non-slot",
-    "assignment-from-no-return",
-    "assignment-from-none",
-    "bad-exception-cause",
-    "bad-format-character",
-    "bad-reversed-sequence",
-    "bad-super-call",
-    "bad-thread-instantiation",
-    "catching-non-exception",
-    "comparison-with-callable",
-    "deprecated-class",
-    "dict-iter-missing-items",
-    "format-combined-specification",
-    "global-variable-undefined",
-    "import-error",
-    "inconsistent-mro",
-    "inherit-non-class",
-    "init-is-generator",
-    "invalid-class-object",
-    "invalid-enum-extension",
-    "invalid-envvar-value",
-    "invalid-format-returned",
-    "invalid-hash-returned",
-    "invalid-metaclass",
-    "invalid-overridden-method",
-    "invalid-repr-returned",
-    "invalid-sequence-index",
-    "invalid-slice-index",
-    "invalid-slots-object",
-    "invalid-slots",
-    "invalid-star-assignment-target",
-    "invalid-str-returned",
-    "invalid-unary-operand-type",
-    "invalid-unicode-codec",
-    "isinstance-second-argument-not-valid-type",
-    "method-hidden",
-    "misplaced-format-function",
-    "missing-format-argument-key",
-    "missing-format-attribute",
-    "missing-kwoa",
-    "no-member",
-    "no-value-for-parameter",
-    "non-iterator-returned",
-    "non-str-assignment-to-dunder-name",
-    "nonlocal-and-global",
-    "not-a-mapping",
-    "not-an-iterable",
-    "not-async-context-manager",
-    "not-callable",
-    "not-context-manager",
-    "overridden-final-method",
-    "raising-bad-type",
-    "raising-non-exception",
-    "redundant-keyword-arg",
-    "relative-beyond-top-level",
-    "self-cls-assignment",
-    "signature-differs",
-    "star-needs-assignment-target",
-    "subclassed-final-class",
-    "super-without-brackets",
-    "too-many-function-args",
-    "typevar-double-variance",
-    "typevar-name-mismatch",
-    "unbalanced-dict-unpacking",
-    "unbalanced-tuple-unpacking",
-    "unexpected-keyword-arg",
-    "unhashable-member",
-    "unpacking-non-sequence",
-    "unsubscriptable-object",
-    "unsupported-assignment-operation",
-    "unsupported-binary-operation",
-    "unsupported-delete-operation",
-    "unsupported-membership-test",
-    "used-before-assignment",
-    "using-final-decorator-in-unsupported-version",
-    "wrong-exception-operation",
+  # Handled by mypy
+  # Ref: <https://github.com/antonagestam/pylint-mypy-overlap>
+  "abstract-class-instantiated",
+  "arguments-differ",
+  "assigning-non-slot",
+  "assignment-from-no-return",
+  "assignment-from-none",
+  "bad-exception-cause",
+  "bad-format-character",
+  "bad-reversed-sequence",
+  "bad-super-call",
+  "bad-thread-instantiation",
+  "catching-non-exception",
+  "comparison-with-callable",
+  "deprecated-class",
+  "dict-iter-missing-items",
+  "format-combined-specification",
+  "global-variable-undefined",
+  "import-error",
+  "inconsistent-mro",
+  "inherit-non-class",
+  "init-is-generator",
+  "invalid-class-object",
+  "invalid-enum-extension",
+  "invalid-envvar-value",
+  "invalid-format-returned",
+  "invalid-hash-returned",
+  "invalid-metaclass",
+  "invalid-overridden-method",
+  "invalid-repr-returned",
+  "invalid-sequence-index",
+  "invalid-slice-index",
+  "invalid-slots-object",
+  "invalid-slots",
+  "invalid-star-assignment-target",
+  "invalid-str-returned",
+  "invalid-unary-operand-type",
+  "invalid-unicode-codec",
+  "isinstance-second-argument-not-valid-type",
+  "method-hidden",
+  "misplaced-format-function",
+  "missing-format-argument-key",
+  "missing-format-attribute",
+  "missing-kwoa",
+  "no-member",
+  "no-value-for-parameter",
+  "non-iterator-returned",
+  "non-str-assignment-to-dunder-name",
+  "nonlocal-and-global",
+  "not-a-mapping",
+  "not-an-iterable",
+  "not-async-context-manager",
+  "not-callable",
+  "not-context-manager",
+  "overridden-final-method",
+  "raising-bad-type",
+  "raising-non-exception",
+  "redundant-keyword-arg",
+  "relative-beyond-top-level",
+  "self-cls-assignment",
+  "signature-differs",
+  "star-needs-assignment-target",
+  "subclassed-final-class",
+  "super-without-brackets",
+  "too-many-function-args",
+  "typevar-double-variance",
+  "typevar-name-mismatch",
+  "unbalanced-dict-unpacking",
+  "unbalanced-tuple-unpacking",
+  "unexpected-keyword-arg",
+  "unhashable-member",
+  "unpacking-non-sequence",
+  "unsubscriptable-object",
+  "unsupported-assignment-operation",
+  "unsupported-binary-operation",
+  "unsupported-delete-operation",
+  "unsupported-membership-test",
+  "used-before-assignment",
+  "using-final-decorator-in-unsupported-version",
+  "wrong-exception-operation",
 ]
 enable = [
-    #"useless-suppression",  # temporarily every now and then to clean them up
-    "use-symbolic-message-instead",
+  #"useless-suppression",  # temporarily every now and then to clean them up
+  "use-symbolic-message-instead",
 ]
 per-file-ignores = [
-    # redefined-outer-name: Tests reference fixtures in the test function
-    # use-implicit-booleaness-not-comparison: Tests need to validate that a list
-    # or a dict is returned
-    "/tests/:redefined-outer-name,use-implicit-booleaness-not-comparison",
+  # redefined-outer-name: Tests reference fixtures in the test function
+  # use-implicit-booleaness-not-comparison: Tests need to validate that a list
+  # or a dict is returned
+  "/tests/:redefined-outer-name,use-implicit-booleaness-not-comparison",
 ]
 
 [tool.pylint.REPORTS]
@@ -424,7 +423,7 @@ score = false
 
 [tool.pylint.TYPECHECK]
 ignored-classes = [
-    "_CountingAttr",  # for attrs
+  "_CountingAttr", # for attrs
 ]
 mixin-class-rgx = ".*[Mm]ix[Ii]n"
 
@@ -433,9 +432,9 @@ expected-line-ending-format = "LF"
 
 [tool.pylint.EXCEPTIONS]
 overgeneral-exceptions = [
-    "builtins.BaseException",
-    "builtins.Exception",
-    # "homeassistant.exceptions.HomeAssistantError",  # too many issues
+  "builtins.BaseException",
+  "builtins.Exception",
+  # "homeassistant.exceptions.HomeAssistantError",  # too many issues
 ]
 
 [tool.pylint.TYPING]
@@ -445,241 +444,236 @@ runtime-typing = false
 max-line-length-suggestions = 72
 
 [tool.pytest.ini_options]
-testpaths = [
-    "tests",
-]
-norecursedirs = [
-    ".git",
-    "testing_config",
-]
+testpaths = ["tests"]
+norecursedirs = [".git", "testing_config"]
 log_format = "%(asctime)s.%(msecs)03d %(levelname)-8s %(threadName)s %(name)s:%(filename)s:%(lineno)s %(message)s"
 log_date_format = "%Y-%m-%d %H:%M:%S"
 asyncio_mode = "auto"
 asyncio_default_fixture_loop_scope = "function"
 filterwarnings = [
-    "error::sqlalchemy.exc.SAWarning",
+  "error::sqlalchemy.exc.SAWarning",
 
-    # -- HomeAssistant - aiohttp
-    # Overwrite web.Application to pass a custom default argument to _make_request
-    "ignore:Inheritance class HomeAssistantApplication from web.Application is discouraged:DeprecationWarning",
-    # Hass wraps `ClientSession.close` to emit a warning if the session is closed accidentally
-    "ignore:Setting custom ClientSession.close attribute is discouraged:DeprecationWarning:homeassistant.helpers.aiohttp_client",
-    # Modify app state for testing
-    "ignore:Changing state of started or joined application is deprecated:DeprecationWarning:tests.components.http.test_ban",
+  # -- HomeAssistant - aiohttp
+  # Overwrite web.Application to pass a custom default argument to _make_request
+  "ignore:Inheritance class HomeAssistantApplication from web.Application is discouraged:DeprecationWarning",
+  # Hass wraps `ClientSession.close` to emit a warning if the session is closed accidentally
+  "ignore:Setting custom ClientSession.close attribute is discouraged:DeprecationWarning:homeassistant.helpers.aiohttp_client",
+  # Modify app state for testing
+  "ignore:Changing state of started or joined application is deprecated:DeprecationWarning:tests.components.http.test_ban",
 
-    # -- Tests
-    # Ignore custom pytest marks
-    "ignore:Unknown pytest.mark.disable_autouse_fixture:pytest.PytestUnknownMarkWarning:tests.components.met",
-    "ignore:Unknown pytest.mark.dataset:pytest.PytestUnknownMarkWarning:tests.components.screenlogic",
-    # https://github.com/rokam/sunweg/blob/3.1.0/sunweg/plant.py#L96 - v3.1.0 - 2024-10-02
-    "ignore:The '(kwh_per_kwp|performance_rate)' property is deprecated and will return 0:DeprecationWarning:tests.components.sunweg.test_init",
+  # -- Tests
+  # Ignore custom pytest marks
+  "ignore:Unknown pytest.mark.disable_autouse_fixture:pytest.PytestUnknownMarkWarning:tests.components.met",
+  "ignore:Unknown pytest.mark.dataset:pytest.PytestUnknownMarkWarning:tests.components.screenlogic",
+  # https://github.com/rokam/sunweg/blob/3.1.0/sunweg/plant.py#L96 - v3.1.0 - 2024-10-02
+  "ignore:The '(kwh_per_kwp|performance_rate)' property is deprecated and will return 0:DeprecationWarning:tests.components.sunweg.test_init",
 
-    # -- design choice 3rd party
-    # https://github.com/gwww/elkm1/blob/2.2.10/elkm1_lib/util.py#L8-L19
-    "ignore:ssl.TLSVersion.TLSv1 is deprecated:DeprecationWarning:elkm1_lib.util",
-    # https://github.com/allenporter/ical/pull/215
-    # https://github.com/allenporter/ical/blob/8.2.0/ical/util.py#L21-L23
-    "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:ical.util",
-    # https://github.com/bachya/regenmaschine/blob/2024.03.0/regenmaschine/client.py#L52
-    "ignore:ssl.TLSVersion.SSLv3 is deprecated:DeprecationWarning:regenmaschine.client",
+  # -- design choice 3rd party
+  # https://github.com/gwww/elkm1/blob/2.2.10/elkm1_lib/util.py#L8-L19
+  "ignore:ssl.TLSVersion.TLSv1 is deprecated:DeprecationWarning:elkm1_lib.util",
+  # https://github.com/allenporter/ical/pull/215
+  # https://github.com/allenporter/ical/blob/8.2.0/ical/util.py#L21-L23
+  "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:ical.util",
+  # https://github.com/bachya/regenmaschine/blob/2024.03.0/regenmaschine/client.py#L52
+  "ignore:ssl.TLSVersion.SSLv3 is deprecated:DeprecationWarning:regenmaschine.client",
 
-    # -- Setuptools DeprecationWarnings
-    # https://github.com/googleapis/google-cloud-python/issues/11184
-    # https://github.com/zopefoundation/meta/issues/194
-    # https://github.com/Azure/azure-sdk-for-python
-    "ignore:Deprecated call to `pkg_resources.declare_namespace\\(('azure'|'google.*'|'pywinusb'|'repoze'|'xbox'|'zope')\\)`:DeprecationWarning:pkg_resources",
+  # -- Setuptools DeprecationWarnings
+  # https://github.com/googleapis/google-cloud-python/issues/11184
+  # https://github.com/zopefoundation/meta/issues/194
+  # https://github.com/Azure/azure-sdk-for-python
+  "ignore:Deprecated call to `pkg_resources.declare_namespace\\(('azure'|'google.*'|'pywinusb'|'repoze'|'xbox'|'zope')\\)`:DeprecationWarning:pkg_resources",
 
-    # -- tracked upstream / open PRs
-    # - pyOpenSSL v24.2.1
-    # https://github.com/certbot/certbot/issues/9828 - v2.11.0
-    # https://github.com/certbot/certbot/issues/9992
-    "ignore:X509Extension support in pyOpenSSL is deprecated. You should use the APIs in cryptography:DeprecationWarning:acme.crypto_util",
-    "ignore:CSR support in pyOpenSSL is deprecated. You should use the APIs in cryptography:DeprecationWarning:acme.crypto_util",
-    "ignore:CSR support in pyOpenSSL is deprecated. You should use the APIs in cryptography:DeprecationWarning:josepy.util",
-    # - other
-    # https://github.com/foxel/python_ndms2_client/issues/6 - v0.1.3
-    # https://github.com/foxel/python_ndms2_client/pull/8
-    "ignore:'telnetlib' is deprecated and slated for removal in Python 3.13:DeprecationWarning:ndms2_client.connection",
+  # -- tracked upstream / open PRs
+  # - pyOpenSSL v24.2.1
+  # https://github.com/certbot/certbot/issues/9828 - v2.11.0
+  # https://github.com/certbot/certbot/issues/9992
+  "ignore:X509Extension support in pyOpenSSL is deprecated. You should use the APIs in cryptography:DeprecationWarning:acme.crypto_util",
+  "ignore:CSR support in pyOpenSSL is deprecated. You should use the APIs in cryptography:DeprecationWarning:acme.crypto_util",
+  "ignore:CSR support in pyOpenSSL is deprecated. You should use the APIs in cryptography:DeprecationWarning:josepy.util",
+  # - other
+  # https://github.com/foxel/python_ndms2_client/issues/6 - v0.1.3
+  # https://github.com/foxel/python_ndms2_client/pull/8
+  "ignore:'telnetlib' is deprecated and slated for removal in Python 3.13:DeprecationWarning:ndms2_client.connection",
 
-    # -- fixed, waiting for release / update
-    # https://github.com/bachya/aiopurpleair/pull/200 - >=2023.10.0
-    "ignore:datetime.*utcfromtimestamp\\(\\) is deprecated and scheduled for removal:DeprecationWarning:aiopurpleair.helpers.validators",
-    # https://bugs.launchpad.net/beautifulsoup/+bug/2076897 - >4.12.3
-    "ignore:The 'strip_cdata' option of HTMLParser\\(\\) has never done anything and will eventually be removed:DeprecationWarning:bs4.builder._lxml",
-    # https://github.com/DataDog/datadogpy/pull/290 - >=0.23.0
-    "ignore:invalid escape sequence:SyntaxWarning:.*datadog.dogstatsd.base",
-    # https://github.com/DataDog/datadogpy/pull/566/files - >=0.37.0
-    "ignore:pkg_resources is deprecated as an API:DeprecationWarning:datadog.util.compat",
-    # https://github.com/fwestenberg/devialet/pull/6 - >1.4.5
-    "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:devialet.devialet_api",
-    # https://github.com/httplib2/httplib2/pull/226 - >=0.21.0
-    "ignore:ssl.PROTOCOL_TLS is deprecated:DeprecationWarning:httplib2",
-    # https://github.com/influxdata/influxdb-client-python/issues/603 >=1.45.0
-    # https://github.com/influxdata/influxdb-client-python/pull/652
-    "ignore:datetime.*utcfromtimestamp\\(\\) is deprecated and scheduled for removal:DeprecationWarning:influxdb_client.client.write.point",
-    # https://github.com/majuss/lupupy/pull/15 - >0.3.2
-    "ignore:\"is not\" with 'str' literal. Did you mean \"!=\"?:SyntaxWarning:.*lupupy.devices.alarm",
-    # https://github.com/nextcord/nextcord/pull/1095 - >2.6.1
-    "ignore:pkg_resources is deprecated as an API:DeprecationWarning:nextcord.health_check",
-    # https://github.com/eclipse/paho.mqtt.python/issues/653 - >=2.0.0
-    # https://github.com/eclipse/paho.mqtt.python/pull/665
-    "ignore:ssl.PROTOCOL_TLS is deprecated:DeprecationWarning:paho.mqtt.client",
-    # https://github.com/vacanza/python-holidays/discussions/1800 - >1.0.0
-    "ignore::DeprecationWarning:holidays",
-    # https://github.com/rytilahti/python-miio/pull/1809 - >=0.6.0.dev0
-    "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:miio.protocol",
-    "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:miio.miioprotocol",
-    # https://github.com/okunishinishi/python-stringcase/commit/6a5c5bbd3fe5337862abc7fd0853a0f36e18b2e1 - >1.2.0
-    "ignore:invalid escape sequence:SyntaxWarning:.*stringcase",
+  # -- fixed, waiting for release / update
+  # https://github.com/bachya/aiopurpleair/pull/200 - >=2023.10.0
+  "ignore:datetime.*utcfromtimestamp\\(\\) is deprecated and scheduled for removal:DeprecationWarning:aiopurpleair.helpers.validators",
+  # https://bugs.launchpad.net/beautifulsoup/+bug/2076897 - >4.12.3
+  "ignore:The 'strip_cdata' option of HTMLParser\\(\\) has never done anything and will eventually be removed:DeprecationWarning:bs4.builder._lxml",
+  # https://github.com/DataDog/datadogpy/pull/290 - >=0.23.0
+  "ignore:invalid escape sequence:SyntaxWarning:.*datadog.dogstatsd.base",
+  # https://github.com/DataDog/datadogpy/pull/566/files - >=0.37.0
+  "ignore:pkg_resources is deprecated as an API:DeprecationWarning:datadog.util.compat",
+  # https://github.com/fwestenberg/devialet/pull/6 - >1.4.5
+  "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:devialet.devialet_api",
+  # https://github.com/httplib2/httplib2/pull/226 - >=0.21.0
+  "ignore:ssl.PROTOCOL_TLS is deprecated:DeprecationWarning:httplib2",
+  # https://github.com/influxdata/influxdb-client-python/issues/603 >=1.45.0
+  # https://github.com/influxdata/influxdb-client-python/pull/652
+  "ignore:datetime.*utcfromtimestamp\\(\\) is deprecated and scheduled for removal:DeprecationWarning:influxdb_client.client.write.point",
+  # https://github.com/majuss/lupupy/pull/15 - >0.3.2
+  "ignore:\"is not\" with 'str' literal. Did you mean \"!=\"?:SyntaxWarning:.*lupupy.devices.alarm",
+  # https://github.com/nextcord/nextcord/pull/1095 - >2.6.1
+  "ignore:pkg_resources is deprecated as an API:DeprecationWarning:nextcord.health_check",
+  # https://github.com/eclipse/paho.mqtt.python/issues/653 - >=2.0.0
+  # https://github.com/eclipse/paho.mqtt.python/pull/665
+  "ignore:ssl.PROTOCOL_TLS is deprecated:DeprecationWarning:paho.mqtt.client",
+  # https://github.com/vacanza/python-holidays/discussions/1800 - >1.0.0
+  "ignore::DeprecationWarning:holidays",
+  # https://github.com/rytilahti/python-miio/pull/1809 - >=0.6.0.dev0
+  "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:miio.protocol",
+  "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:miio.miioprotocol",
+  # https://github.com/okunishinishi/python-stringcase/commit/6a5c5bbd3fe5337862abc7fd0853a0f36e18b2e1 - >1.2.0
+  "ignore:invalid escape sequence:SyntaxWarning:.*stringcase",
 
-    # -- fixed for Python 3.13
-    # https://github.com/rhasspy/wyoming/commit/e34af30d455b6f2bb9e5cfb25fad8d276914bc54 - >=1.4.2
-    "ignore:'audioop' is deprecated and slated for removal in Python 3.13:DeprecationWarning:wyoming.audio",
+  # -- fixed for Python 3.13
+  # https://github.com/rhasspy/wyoming/commit/e34af30d455b6f2bb9e5cfb25fad8d276914bc54 - >=1.4.2
+  "ignore:'audioop' is deprecated and slated for removal in Python 3.13:DeprecationWarning:wyoming.audio",
 
-    # -- other
-    # Locale changes might take some time to resolve upstream
-    # https://github.com/Squachen/micloud/blob/v_0.6/micloud/micloud.py#L35 - v0.6 - 2022-12-08
-    "ignore:'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15:DeprecationWarning:micloud.micloud",
-    # https://github.com/MatsNl/pyatag/issues/11 - v0.3.7.1 - 2023-10-09
-    "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:pyatag.gateway",
-    # https://github.com/lidatong/dataclasses-json/issues/328
-    # https://github.com/lidatong/dataclasses-json/pull/351
-    "ignore:The 'default' argument to fields is deprecated. Use 'dump_default' instead:DeprecationWarning:dataclasses_json.mm",
-    # https://pypi.org/project/emulated-roku/ - v0.3.0 - 2023-12-19
-    # https://github.com/martonperei/emulated_roku
-    "ignore:loop argument is deprecated:DeprecationWarning:emulated_roku",
-    # https://github.com/w1ll1am23/pyeconet/blob/v0.1.23/src/pyeconet/api.py#L38 - v0.1.23 - 2024-10-08
-    "ignore:ssl.PROTOCOL_TLS is deprecated:DeprecationWarning:pyeconet.api",
-    # https://github.com/thecynic/pylutron - v0.2.16 - 2024-10-22
-    "ignore:setDaemon\\(\\) is deprecated, set the daemon attribute instead:DeprecationWarning:pylutron",
-    # https://github.com/pschmitt/pynuki/blob/1.6.3/pynuki/utils.py#L21 - v1.6.3 - 2024-02-24
-    "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:pynuki.utils",
-    # https://github.com/lextudio/pysnmp/blob/v7.1.10/pysnmp/smi/compiler.py#L23-L31 - v7.1.10 - 2024-11-04
-    "ignore:smiV1Relaxed is deprecated. Please use smi_v1_relaxed instead:DeprecationWarning:pysnmp.smi.compiler",
-    "ignore:getReadersFromUrls is deprecated. Please use get_readers_from_urls instead:DeprecationWarning:pysmi.reader.url",  # wrong stacklevel
-    # https://github.com/briis/pyweatherflowudp/blob/v1.4.5/pyweatherflowudp/const.py#L20 - v1.4.5 - 2023-10-10
-    "ignore:This function will be removed in future versions of pint:DeprecationWarning:pyweatherflowudp.const",
-    # Wrong stacklevel
-    # https://bugs.launchpad.net/beautifulsoup/+bug/2034451 fixed in >4.12.3
-    "ignore:It looks like you're parsing an XML document using an HTML parser:UserWarning:html.parser",
-    # New in aiohttp - v3.9.0
-    "ignore:It is recommended to use web.AppKey instances for keys:UserWarning:(homeassistant|tests|aiohttp_cors)",
-    # - SyntaxWarnings
-    # https://pypi.org/project/aprslib/ - v0.7.2 - 2022-07-10
-    "ignore:invalid escape sequence:SyntaxWarning:.*aprslib.parsing.common",
-    "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:aprslib.parsing.common",
-    # https://pypi.org/project/panasonic-viera/ - v0.4.2 - 2024-04-24
-    # https://github.com/florianholzapfel/panasonic-viera/blob/0.4.2/panasonic_viera/__init__.py#L789
-    "ignore:invalid escape sequence:SyntaxWarning:.*panasonic_viera",
-    # https://pypi.org/project/pyblackbird/ - v0.6 - 2023-03-15
-    # https://github.com/koolsb/pyblackbird/pull/9 -> closed
-    "ignore:invalid escape sequence:SyntaxWarning:.*pyblackbird",
-    # https://pypi.org/project/pyws66i/ - v1.1 - 2022-04-05
-    "ignore:invalid escape sequence:SyntaxWarning:.*pyws66i",
-    # https://pypi.org/project/sanix/ - v1.0.6 - 2024-05-01
-    # https://github.com/tomaszsluszniak/sanix_py/blob/v1.0.6/sanix/__init__.py#L42
-    "ignore:invalid escape sequence:SyntaxWarning:.*sanix",
-    # https://pypi.org/project/sleekxmppfs/ - v1.4.1 - 2022-08-18
-    "ignore:invalid escape sequence:SyntaxWarning:.*sleekxmppfs.thirdparty.mini_dateutil",  # codespell:ignore thirdparty
-    # - pkg_resources
-    # https://pypi.org/project/aiomusiccast/ - v0.14.8 - 2023-03-20
-    "ignore:pkg_resources is deprecated as an API:DeprecationWarning:aiomusiccast",
-    # https://pypi.org/project/habitipy/ - v0.3.3 - 2024-10-28
-    "ignore:pkg_resources is deprecated as an API:DeprecationWarning:habitipy.api",
-    # https://github.com/eavanvalkenburg/pysiaalarm/blob/v3.1.1/src/pysiaalarm/data/data.py#L7 - v3.1.1 - 2023-04-17
-    "ignore:pkg_resources is deprecated as an API:DeprecationWarning:pysiaalarm.data.data",
-    # https://pypi.org/project/pybotvac/ - v0.0.25 - 2024-04-11
-    "ignore:pkg_resources is deprecated as an API:DeprecationWarning:pybotvac.version",
-    # https://github.com/home-assistant-ecosystem/python-mystrom/blob/2.2.0/pymystrom/__init__.py#L10 - v2.2.0 - 2023-05-21
-    "ignore:pkg_resources is deprecated as an API:DeprecationWarning:pymystrom",
+  # -- other
+  # Locale changes might take some time to resolve upstream
+  # https://github.com/Squachen/micloud/blob/v_0.6/micloud/micloud.py#L35 - v0.6 - 2022-12-08
+  "ignore:'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15:DeprecationWarning:micloud.micloud",
+  # https://github.com/MatsNl/pyatag/issues/11 - v0.3.7.1 - 2023-10-09
+  "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:pyatag.gateway",
+  # https://github.com/lidatong/dataclasses-json/issues/328
+  # https://github.com/lidatong/dataclasses-json/pull/351
+  "ignore:The 'default' argument to fields is deprecated. Use 'dump_default' instead:DeprecationWarning:dataclasses_json.mm",
+  # https://pypi.org/project/emulated-roku/ - v0.3.0 - 2023-12-19
+  # https://github.com/martonperei/emulated_roku
+  "ignore:loop argument is deprecated:DeprecationWarning:emulated_roku",
+  # https://github.com/w1ll1am23/pyeconet/blob/v0.1.23/src/pyeconet/api.py#L38 - v0.1.23 - 2024-10-08
+  "ignore:ssl.PROTOCOL_TLS is deprecated:DeprecationWarning:pyeconet.api",
+  # https://github.com/thecynic/pylutron - v0.2.16 - 2024-10-22
+  "ignore:setDaemon\\(\\) is deprecated, set the daemon attribute instead:DeprecationWarning:pylutron",
+  # https://github.com/pschmitt/pynuki/blob/1.6.3/pynuki/utils.py#L21 - v1.6.3 - 2024-02-24
+  "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:pynuki.utils",
+  # https://github.com/lextudio/pysnmp/blob/v7.1.10/pysnmp/smi/compiler.py#L23-L31 - v7.1.10 - 2024-11-04
+  "ignore:smiV1Relaxed is deprecated. Please use smi_v1_relaxed instead:DeprecationWarning:pysnmp.smi.compiler",
+  "ignore:getReadersFromUrls is deprecated. Please use get_readers_from_urls instead:DeprecationWarning:pysmi.reader.url", # wrong stacklevel
+  # https://github.com/briis/pyweatherflowudp/blob/v1.4.5/pyweatherflowudp/const.py#L20 - v1.4.5 - 2023-10-10
+  "ignore:This function will be removed in future versions of pint:DeprecationWarning:pyweatherflowudp.const",
+  # Wrong stacklevel
+  # https://bugs.launchpad.net/beautifulsoup/+bug/2034451 fixed in >4.12.3
+  "ignore:It looks like you're parsing an XML document using an HTML parser:UserWarning:html.parser",
+  # New in aiohttp - v3.9.0
+  "ignore:It is recommended to use web.AppKey instances for keys:UserWarning:(homeassistant|tests|aiohttp_cors)",
+  # - SyntaxWarnings
+  # https://pypi.org/project/aprslib/ - v0.7.2 - 2022-07-10
+  "ignore:invalid escape sequence:SyntaxWarning:.*aprslib.parsing.common",
+  "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:aprslib.parsing.common",
+  # https://pypi.org/project/panasonic-viera/ - v0.4.2 - 2024-04-24
+  # https://github.com/florianholzapfel/panasonic-viera/blob/0.4.2/panasonic_viera/__init__.py#L789
+  "ignore:invalid escape sequence:SyntaxWarning:.*panasonic_viera",
+  # https://pypi.org/project/pyblackbird/ - v0.6 - 2023-03-15
+  # https://github.com/koolsb/pyblackbird/pull/9 -> closed
+  "ignore:invalid escape sequence:SyntaxWarning:.*pyblackbird",
+  # https://pypi.org/project/pyws66i/ - v1.1 - 2022-04-05
+  "ignore:invalid escape sequence:SyntaxWarning:.*pyws66i",
+  # https://pypi.org/project/sanix/ - v1.0.6 - 2024-05-01
+  # https://github.com/tomaszsluszniak/sanix_py/blob/v1.0.6/sanix/__init__.py#L42
+  "ignore:invalid escape sequence:SyntaxWarning:.*sanix",
+  # https://pypi.org/project/sleekxmppfs/ - v1.4.1 - 2022-08-18
+  "ignore:invalid escape sequence:SyntaxWarning:.*sleekxmppfs.thirdparty.mini_dateutil", # codespell:ignore thirdparty
+  # - pkg_resources
+  # https://pypi.org/project/aiomusiccast/ - v0.14.8 - 2023-03-20
+  "ignore:pkg_resources is deprecated as an API:DeprecationWarning:aiomusiccast",
+  # https://pypi.org/project/habitipy/ - v0.3.3 - 2024-10-28
+  "ignore:pkg_resources is deprecated as an API:DeprecationWarning:habitipy.api",
+  # https://github.com/eavanvalkenburg/pysiaalarm/blob/v3.1.1/src/pysiaalarm/data/data.py#L7 - v3.1.1 - 2023-04-17
+  "ignore:pkg_resources is deprecated as an API:DeprecationWarning:pysiaalarm.data.data",
+  # https://pypi.org/project/pybotvac/ - v0.0.25 - 2024-04-11
+  "ignore:pkg_resources is deprecated as an API:DeprecationWarning:pybotvac.version",
+  # https://github.com/home-assistant-ecosystem/python-mystrom/blob/2.2.0/pymystrom/__init__.py#L10 - v2.2.0 - 2023-05-21
+  "ignore:pkg_resources is deprecated as an API:DeprecationWarning:pymystrom",
 
-    # -- Python 3.13
-    # HomeAssistant
-    "ignore:'audioop' is deprecated and slated for removal in Python 3.13:DeprecationWarning:homeassistant.components.assist_pipeline.websocket_api",
-    "ignore:'telnetlib' is deprecated and slated for removal in Python 3.13:DeprecationWarning:homeassistant.components.hddtemp.sensor",
-    # https://pypi.org/project/nextcord/ - v2.6.0 - 2023-09-23
-    # https://github.com/nextcord/nextcord/issues/1174
-    # https://github.com/nextcord/nextcord/blob/v2.6.1/nextcord/player.py#L5
-    "ignore:'audioop' is deprecated and slated for removal in Python 3.13:DeprecationWarning:nextcord.player",
-    # https://pypi.org/project/SpeechRecognition/ - v3.11.0 - 2024-05-05
-    # https://github.com/Uberi/speech_recognition/blob/3.11.0/speech_recognition/__init__.py#L7
-    "ignore:'aifc' is deprecated and slated for removal in Python 3.13:DeprecationWarning:speech_recognition",
-    # https://pypi.org/project/voip-utils/ - v0.2.0 - 2024-09-06
-    # https://github.com/home-assistant-libs/voip-utils/blob/0.2.0/voip_utils/rtp_audio.py#L3
-    "ignore:'audioop' is deprecated and slated for removal in Python 3.13:DeprecationWarning:voip_utils.rtp_audio",
+  # -- Python 3.13
+  # HomeAssistant
+  "ignore:'audioop' is deprecated and slated for removal in Python 3.13:DeprecationWarning:homeassistant.components.assist_pipeline.websocket_api",
+  "ignore:'telnetlib' is deprecated and slated for removal in Python 3.13:DeprecationWarning:homeassistant.components.hddtemp.sensor",
+  # https://pypi.org/project/nextcord/ - v2.6.0 - 2023-09-23
+  # https://github.com/nextcord/nextcord/issues/1174
+  # https://github.com/nextcord/nextcord/blob/v2.6.1/nextcord/player.py#L5
+  "ignore:'audioop' is deprecated and slated for removal in Python 3.13:DeprecationWarning:nextcord.player",
+  # https://pypi.org/project/SpeechRecognition/ - v3.11.0 - 2024-05-05
+  # https://github.com/Uberi/speech_recognition/blob/3.11.0/speech_recognition/__init__.py#L7
+  "ignore:'aifc' is deprecated and slated for removal in Python 3.13:DeprecationWarning:speech_recognition",
+  # https://pypi.org/project/voip-utils/ - v0.2.0 - 2024-09-06
+  # https://github.com/home-assistant-libs/voip-utils/blob/0.2.0/voip_utils/rtp_audio.py#L3
+  "ignore:'audioop' is deprecated and slated for removal in Python 3.13:DeprecationWarning:voip_utils.rtp_audio",
 
-    # -- Python 3.13 - unmaintained projects, last release about 2+ years
-    # https://pypi.org/project/pydub/ - v0.25.1 - 2021-03-10
-    "ignore:'audioop' is deprecated and slated for removal in Python 3.13:DeprecationWarning:pydub.utils",
-    # https://github.com/heathbar/plum-lightpad-python/issues/7 - v0.0.11 - 2018-10-16
-    "ignore:'telnetlib' is deprecated and slated for removal in Python 3.13:DeprecationWarning:plumlightpad.lightpad",
-    # https://pypi.org/project/pyws66i/ - v1.1 - 2022-04-05
-    # https://github.com/ssaenger/pyws66i/blob/v1.1/pyws66i/__init__.py#L2
-    "ignore:'telnetlib' is deprecated and slated for removal in Python 3.13:DeprecationWarning:pyws66i",
+  # -- Python 3.13 - unmaintained projects, last release about 2+ years
+  # https://pypi.org/project/pydub/ - v0.25.1 - 2021-03-10
+  "ignore:'audioop' is deprecated and slated for removal in Python 3.13:DeprecationWarning:pydub.utils",
+  # https://github.com/heathbar/plum-lightpad-python/issues/7 - v0.0.11 - 2018-10-16
+  "ignore:'telnetlib' is deprecated and slated for removal in Python 3.13:DeprecationWarning:plumlightpad.lightpad",
+  # https://pypi.org/project/pyws66i/ - v1.1 - 2022-04-05
+  # https://github.com/ssaenger/pyws66i/blob/v1.1/pyws66i/__init__.py#L2
+  "ignore:'telnetlib' is deprecated and slated for removal in Python 3.13:DeprecationWarning:pyws66i",
 
-    # -- New in Python 3.13
-    # https://github.com/kurtmckee/feedparser/pull/389 - >6.0.11
-    # https://github.com/kurtmckee/feedparser/issues/481
-    "ignore:'count' is passed as positional argument:DeprecationWarning:feedparser.html",
-    # https://github.com/youknowone/python-deadlib - Backports for aifc, telnetlib
-    "ignore:aifc was removed in Python 3.13.*'standard-aifc':DeprecationWarning:speech_recognition",
-    "ignore:telnetlib was removed in Python 3.13.*'standard-telnetlib':DeprecationWarning:homeassistant.components.hddtemp.sensor",
-    "ignore:telnetlib was removed in Python 3.13.*'standard-telnetlib':DeprecationWarning:ndms2_client.connection",
-    "ignore:telnetlib was removed in Python 3.13.*'standard-telnetlib':DeprecationWarning:plumlightpad.lightpad",
-    "ignore:telnetlib was removed in Python 3.13.*'standard-telnetlib':DeprecationWarning:pyws66i",
+  # -- New in Python 3.13
+  # https://github.com/kurtmckee/feedparser/pull/389 - >6.0.11
+  # https://github.com/kurtmckee/feedparser/issues/481
+  "ignore:'count' is passed as positional argument:DeprecationWarning:feedparser.html",
+  # https://github.com/youknowone/python-deadlib - Backports for aifc, telnetlib
+  "ignore:aifc was removed in Python 3.13.*'standard-aifc':DeprecationWarning:speech_recognition",
+  "ignore:telnetlib was removed in Python 3.13.*'standard-telnetlib':DeprecationWarning:homeassistant.components.hddtemp.sensor",
+  "ignore:telnetlib was removed in Python 3.13.*'standard-telnetlib':DeprecationWarning:ndms2_client.connection",
+  "ignore:telnetlib was removed in Python 3.13.*'standard-telnetlib':DeprecationWarning:plumlightpad.lightpad",
+  "ignore:telnetlib was removed in Python 3.13.*'standard-telnetlib':DeprecationWarning:pyws66i",
 
-    # -- unmaintained projects, last release about 2+ years
-    # https://pypi.org/project/agent-py/ - v0.0.23 - 2020-06-04
-    "ignore:with timeout\\(\\) is deprecated:DeprecationWarning:agent.a",
-    # https://pypi.org/project/aiomodernforms/ - v0.1.8 - 2021-06-27
-    "ignore:with timeout\\(\\) is deprecated:DeprecationWarning:aiomodernforms.modernforms",
-    # https://pypi.org/project/alarmdecoder/ - v1.13.11 - 2021-06-01
-    "ignore:invalid escape sequence:SyntaxWarning:.*alarmdecoder",
-    # https://pypi.org/project/directv/ - v0.4.0 - 2020-09-12
-    "ignore:with timeout\\(\\) is deprecated:DeprecationWarning:directv.directv",
-    "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:directv.models",
-    # https://pypi.org/project/foobot_async/ - v1.0.1 - 2024-08-16
-    "ignore:with timeout\\(\\) is deprecated:DeprecationWarning:foobot_async",
-    # https://pypi.org/project/httpsig/ - v1.3.0 - 2018-11-28
-    "ignore:pkg_resources is deprecated as an API:DeprecationWarning:httpsig",
-    # https://pypi.org/project/influxdb/ - v5.3.2 - 2024-04-18 (archived)
-    "ignore:datetime.*utcfromtimestamp\\(\\) is deprecated and scheduled for removal:DeprecationWarning:influxdb.line_protocol",
-    # https://pypi.org/project/lark-parser/ - v0.12.0 - 2021-08-30 -> moved to `lark`
-    # https://pypi.org/project/commentjson/ - v0.9.0 - 2020-10-05
-    # https://github.com/vaidik/commentjson/issues/51
-    # https://github.com/vaidik/commentjson/pull/52
-    # Fixed upstream, commentjson depends on old version and seems to be unmaintained
-    "ignore:module '(sre_parse|sre_constants)' is deprecate:DeprecationWarning:lark.utils",
-    # https://pypi.org/project/lomond/ - v0.3.3 - 2018-09-21
-    "ignore:ssl.PROTOCOL_TLS is deprecated:DeprecationWarning:lomond.session",
-    # https://pypi.org/project/oauth2client/ - v4.1.3 - 2018-09-07 (archived)
-    "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:oauth2client.client",
-    # https://pypi.org/project/opuslib/ - v3.0.1 - 2018-01-16
-    "ignore:\"is not\" with 'int' literal. Did you mean \"!=\"?:SyntaxWarning:.*opuslib.api.decoder",
-    # https://pypi.org/project/passlib/ - v1.7.4 - 2020-10-08
-    "ignore:'crypt' is deprecated and slated for removal in Python 3.13:DeprecationWarning:passlib.utils",
-    # https://pypi.org/project/pilight/ - v0.1.1 - 2016-10-19
-    "ignore:pkg_resources is deprecated as an API:DeprecationWarning:pilight",
-    # https://pypi.org/project/plumlightpad/ - v0.0.11 - 2018-10-16
-    "ignore:invalid escape sequence:SyntaxWarning:.*plumlightpad.plumdiscovery",
-    "ignore:\"is\" with 'int' literal. Did you mean \"==\"?:SyntaxWarning:.*plumlightpad.(lightpad|logicalload)",
-    # https://pypi.org/project/pure-python-adb/ - v0.3.0.dev0 - 2020-08-05
-    "ignore:invalid escape sequence:SyntaxWarning:.*ppadb",
-    # https://pypi.org/project/pydub/ - v0.25.1 - 2021-03-10
-    "ignore:invalid escape sequence:SyntaxWarning:.*pydub.utils",
-    # https://pypi.org/project/pyiss/ - v1.0.1 - 2016-12-19
-    "ignore:\"is\" with 'int' literal. Did you mean \"==\"?:SyntaxWarning:.*pyiss",
-    # https://pypi.org/project/PyMetEireann/ - v2021.8.0 - 2021-08-16
-    "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:meteireann",
-    # https://pypi.org/project/PyPasser/ - v0.0.5 - 2021-10-21
-    "ignore:invalid escape sequence:SyntaxWarning:.*pypasser.utils",
-    # https://pypi.org/project/pyqwikswitch/ - v0.94 - 2019-08-19
-    "ignore:client.loop property is deprecated:DeprecationWarning:pyqwikswitch.async_",
-    "ignore:with timeout\\(\\) is deprecated:DeprecationWarning:pyqwikswitch.async_",
-    # https://pypi.org/project/Rx/ - v3.2.0 - 2021-04-25
-    "ignore:datetime.*utcfromtimestamp\\(\\) is deprecated and scheduled for removal:DeprecationWarning:rx.internal.constants",
-    # https://pypi.org/project/rxv/ - v0.7.0 - 2021-10-10
-    "ignore:defusedxml.cElementTree is deprecated, import from defusedxml.ElementTree instead:DeprecationWarning:rxv.ssdp",
+  # -- unmaintained projects, last release about 2+ years
+  # https://pypi.org/project/agent-py/ - v0.0.23 - 2020-06-04
+  "ignore:with timeout\\(\\) is deprecated:DeprecationWarning:agent.a",
+  # https://pypi.org/project/aiomodernforms/ - v0.1.8 - 2021-06-27
+  "ignore:with timeout\\(\\) is deprecated:DeprecationWarning:aiomodernforms.modernforms",
+  # https://pypi.org/project/alarmdecoder/ - v1.13.11 - 2021-06-01
+  "ignore:invalid escape sequence:SyntaxWarning:.*alarmdecoder",
+  # https://pypi.org/project/directv/ - v0.4.0 - 2020-09-12
+  "ignore:with timeout\\(\\) is deprecated:DeprecationWarning:directv.directv",
+  "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:directv.models",
+  # https://pypi.org/project/foobot_async/ - v1.0.1 - 2024-08-16
+  "ignore:with timeout\\(\\) is deprecated:DeprecationWarning:foobot_async",
+  # https://pypi.org/project/httpsig/ - v1.3.0 - 2018-11-28
+  "ignore:pkg_resources is deprecated as an API:DeprecationWarning:httpsig",
+  # https://pypi.org/project/influxdb/ - v5.3.2 - 2024-04-18 (archived)
+  "ignore:datetime.*utcfromtimestamp\\(\\) is deprecated and scheduled for removal:DeprecationWarning:influxdb.line_protocol",
+  # https://pypi.org/project/lark-parser/ - v0.12.0 - 2021-08-30 -> moved to `lark`
+  # https://pypi.org/project/commentjson/ - v0.9.0 - 2020-10-05
+  # https://github.com/vaidik/commentjson/issues/51
+  # https://github.com/vaidik/commentjson/pull/52
+  # Fixed upstream, commentjson depends on old version and seems to be unmaintained
+  "ignore:module '(sre_parse|sre_constants)' is deprecate:DeprecationWarning:lark.utils",
+  # https://pypi.org/project/lomond/ - v0.3.3 - 2018-09-21
+  "ignore:ssl.PROTOCOL_TLS is deprecated:DeprecationWarning:lomond.session",
+  # https://pypi.org/project/oauth2client/ - v4.1.3 - 2018-09-07 (archived)
+  "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:oauth2client.client",
+  # https://pypi.org/project/opuslib/ - v3.0.1 - 2018-01-16
+  "ignore:\"is not\" with 'int' literal. Did you mean \"!=\"?:SyntaxWarning:.*opuslib.api.decoder",
+  # https://pypi.org/project/passlib/ - v1.7.4 - 2020-10-08
+  "ignore:'crypt' is deprecated and slated for removal in Python 3.13:DeprecationWarning:passlib.utils",
+  # https://pypi.org/project/pilight/ - v0.1.1 - 2016-10-19
+  "ignore:pkg_resources is deprecated as an API:DeprecationWarning:pilight",
+  # https://pypi.org/project/plumlightpad/ - v0.0.11 - 2018-10-16
+  "ignore:invalid escape sequence:SyntaxWarning:.*plumlightpad.plumdiscovery",
+  "ignore:\"is\" with 'int' literal. Did you mean \"==\"?:SyntaxWarning:.*plumlightpad.(lightpad|logicalload)",
+  # https://pypi.org/project/pure-python-adb/ - v0.3.0.dev0 - 2020-08-05
+  "ignore:invalid escape sequence:SyntaxWarning:.*ppadb",
+  # https://pypi.org/project/pydub/ - v0.25.1 - 2021-03-10
+  "ignore:invalid escape sequence:SyntaxWarning:.*pydub.utils",
+  # https://pypi.org/project/pyiss/ - v1.0.1 - 2016-12-19
+  "ignore:\"is\" with 'int' literal. Did you mean \"==\"?:SyntaxWarning:.*pyiss",
+  # https://pypi.org/project/PyMetEireann/ - v2021.8.0 - 2021-08-16
+  "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:meteireann",
+  # https://pypi.org/project/PyPasser/ - v0.0.5 - 2021-10-21
+  "ignore:invalid escape sequence:SyntaxWarning:.*pypasser.utils",
+  # https://pypi.org/project/pyqwikswitch/ - v0.94 - 2019-08-19
+  "ignore:client.loop property is deprecated:DeprecationWarning:pyqwikswitch.async_",
+  "ignore:with timeout\\(\\) is deprecated:DeprecationWarning:pyqwikswitch.async_",
+  # https://pypi.org/project/Rx/ - v3.2.0 - 2021-04-25
+  "ignore:datetime.*utcfromtimestamp\\(\\) is deprecated and scheduled for removal:DeprecationWarning:rx.internal.constants",
+  # https://pypi.org/project/rxv/ - v0.7.0 - 2021-10-10
+  "ignore:defusedxml.cElementTree is deprecated, import from defusedxml.ElementTree instead:DeprecationWarning:rxv.ssdp",
 ]
 
 [tool.coverage.run]
@@ -687,177 +681,175 @@ source = ["homeassistant"]
 
 [tool.coverage.report]
 exclude_lines = [
-    # Have to re-enable the standard pragma
-    "pragma: no cover",
-    # Don't complain about missing debug-only code:
-    "def __repr__",
-    # Don't complain if tests don't hit defensive assertion code:
-    "raise AssertionError",
-    "raise NotImplementedError",
-    # TYPE_CHECKING and @overload blocks are never executed during pytest run
-    "if TYPE_CHECKING:",
-    "@overload",
+  # Have to re-enable the standard pragma
+  "pragma: no cover",
+  # Don't complain about missing debug-only code:
+  "def __repr__",
+  # Don't complain if tests don't hit defensive assertion code:
+  "raise AssertionError",
+  "raise NotImplementedError",
+  # TYPE_CHECKING and @overload blocks are never executed during pytest run
+  "if TYPE_CHECKING:",
+  "@overload",
 ]
 
 [tool.ruff]
-required-version = ">=0.9.1"
+required-version = ">=0.11.0"
 
 [tool.ruff.lint]
 select = [
-    "A001", # Variable {name} is shadowing a Python builtin
-    "ASYNC210", # Async functions should not call blocking HTTP methods
-    "ASYNC220", # Async functions should not create subprocesses with blocking methods
-    "ASYNC221", # Async functions should not run processes with blocking methods
-    "ASYNC222", # Async functions should not wait on processes with blocking methods
-    "ASYNC230", # Async functions should not open files with blocking methods like open
-    "ASYNC251", # Async functions should not call time.sleep
-    "B002", # Python does not support the unary prefix increment
-    "B005", # Using .strip() with multi-character strings is misleading
-    "B007", # Loop control variable {name} not used within loop body
-    "B014", # Exception handler with duplicate exception
-    "B015", # Pointless comparison. Did you mean to assign a value? Otherwise, prepend assert or remove it.
-    "B017", # pytest.raises(BaseException) should be considered evil
-    "B018", # Found useless attribute access. Either assign it to a variable or remove it.
-    "B023", # Function definition does not bind loop variable {name}
-    "B024", # `{name}` is an abstract base class, but it has no abstract methods or properties
-    "B026", # Star-arg unpacking after a keyword argument is strongly discouraged
-    "B032", # Possible unintentional type annotation (using :). Did you mean to assign (using =)?
-    "B035", # Dictionary comprehension uses static key
-    "B904", # Use raise from to specify exception cause
-    "B905", # zip() without an explicit strict= parameter
-    "BLE",
-    "C", # complexity
-    "COM818", # Trailing comma on bare tuple prohibited
-    "D", # docstrings
-    "DTZ003", # Use datetime.now(tz=) instead of datetime.utcnow()
-    "DTZ004", # Use datetime.fromtimestamp(ts, tz=) instead of datetime.utcfromtimestamp(ts)
-    "E", # pycodestyle
-    "F", # pyflakes/autoflake
-    "F541", # f-string without any placeholders
-    "FLY", # flynt
-    "FURB", # refurb
-    "G", # flake8-logging-format
-    "I", # isort
-    "INP", # flake8-no-pep420
-    "ISC", # flake8-implicit-str-concat
-    "ICN001", # import concentions; {name} should be imported as {asname}
-    "LOG", # flake8-logging
-    "N804", # First argument of a class method should be named cls
-    "N805", # First argument of a method should be named self
-    "N815", # Variable {name} in class scope should not be mixedCase
-    "PERF", # Perflint
-    "PGH", # pygrep-hooks
-    "PIE", # flake8-pie
-    "PL", # pylint
-    "PT", # flake8-pytest-style
-    "PTH", # flake8-pathlib
-    "PYI", # flake8-pyi
-    "RET", # flake8-return
-    "RSE", # flake8-raise
-    "RUF005", # Consider iterable unpacking instead of concatenation
-    "RUF006", # Store a reference to the return value of asyncio.create_task
-    "RUF007", # Prefer itertools.pairwise() over zip() when iterating over successive pairs
-    "RUF008", # Do not use mutable default values for dataclass attributes
-    "RUF010", # Use explicit conversion flag
-    "RUF013", # PEP 484 prohibits implicit Optional
-    "RUF016", # Slice in indexed access to type {value_type} uses type {index_type} instead of an integer
-    "RUF017", # Avoid quadratic list summation
-    "RUF018", # Avoid assignment expressions in assert statements
-    "RUF019", # Unnecessary key check before dictionary access
-    "RUF020", # {never_like} | T is equivalent to T
-    "RUF021", # Parenthesize a and b expressions when chaining and and or together, to make the precedence clear
-    "RUF022", # Sort __all__
-    "RUF023", # Sort __slots__
-    "RUF024", # Do not pass mutable objects as values to dict.fromkeys
-    "RUF026", # default_factory is a positional-only argument to defaultdict
-    "RUF030", # print() call in assert statement is likely unintentional
-    "RUF032", # Decimal() called with float literal argument
-    "RUF033", # __post_init__ method with argument defaults
-    "RUF034", # Useless if-else condition
-    "RUF100", # Unused `noqa` directive
-    "RUF101", # noqa directives that use redirected rule codes
-    "RUF200", # Failed to parse pyproject.toml: {message}
-    "S102", # Use of exec detected
-    "S103", # bad-file-permissions
-    "S108", # hardcoded-temp-file
-    "S306", # suspicious-mktemp-usage
-    "S307", # suspicious-eval-usage
-    "S313", # suspicious-xmlc-element-tree-usage
-    "S314", # suspicious-xml-element-tree-usage
-    "S315", # suspicious-xml-expat-reader-usage
-    "S316", # suspicious-xml-expat-builder-usage
-    "S317", # suspicious-xml-sax-usage
-    "S318", # suspicious-xml-mini-dom-usage
-    "S319", # suspicious-xml-pull-dom-usage
-    "S320", # suspicious-xmle-tree-usage
-    "S601", # paramiko-call
-    "S602", # subprocess-popen-with-shell-equals-true
-    "S604", # call-with-shell-equals-true
-    "S608", # hardcoded-sql-expression
-    "S609", # unix-command-wildcard-injection
-    "SIM", # flake8-simplify
-    "SLF", # flake8-self
-    "SLOT", # flake8-slots
-    "T100", # Trace found: {name} used
-    "T20", # flake8-print
-    "TC", # flake8-type-checking
-    "TID", # Tidy imports
-    "TRY", # tryceratops
-    "UP", # pyupgrade
-    "UP031", # Use format specifiers instead of percent format
-    "UP032", # Use f-string instead of `format` call
-    "W", # pycodestyle
+  "A001",   # Variable {name} is shadowing a Python builtin
+  "ASYNC",  # flake8-async
+  "B002",   # Python does not support the unary prefix increment
+  "B005",   # Using .strip() with multi-character strings is misleading
+  "B007",   # Loop control variable {name} not used within loop body
+  "B014",   # Exception handler with duplicate exception
+  "B015",   # Pointless comparison. Did you mean to assign a value? Otherwise, prepend assert or remove it.
+  "B017",   # pytest.raises(BaseException) should be considered evil
+  "B018",   # Found useless attribute access. Either assign it to a variable or remove it.
+  "B023",   # Function definition does not bind loop variable {name}
+  "B024",   # `{name}` is an abstract base class, but it has no abstract methods or properties
+  "B026",   # Star-arg unpacking after a keyword argument is strongly discouraged
+  "B032",   # Possible unintentional type annotation (using :). Did you mean to assign (using =)?
+  "B035",   # Dictionary comprehension uses static key
+  "B904",   # Use raise from to specify exception cause
+  "B905",   # zip() without an explicit strict= parameter
+  "BLE",
+  "C",      # complexity
+  "COM818", # Trailing comma on bare tuple prohibited
+  "D",      # docstrings
+  "DTZ003", # Use datetime.now(tz=) instead of datetime.utcnow()
+  "DTZ004", # Use datetime.fromtimestamp(ts, tz=) instead of datetime.utcfromtimestamp(ts)
+  "E",      # pycodestyle
+  "F",      # pyflakes/autoflake
+  "F541",   # f-string without any placeholders
+  "FLY",    # flynt
+  "FURB",   # refurb
+  "G",      # flake8-logging-format
+  "I",      # isort
+  "INP",    # flake8-no-pep420
+  "ISC",    # flake8-implicit-str-concat
+  "ICN001", # import concentions; {name} should be imported as {asname}
+  "LOG",    # flake8-logging
+  "N804",   # First argument of a class method should be named cls
+  "N805",   # First argument of a method should be named self
+  "N815",   # Variable {name} in class scope should not be mixedCase
+  "PERF",   # Perflint
+  "PGH",    # pygrep-hooks
+  "PIE",    # flake8-pie
+  "PL",     # pylint
+  "PT",     # flake8-pytest-style
+  "PTH",    # flake8-pathlib
+  "PYI",    # flake8-pyi
+  "RET",    # flake8-return
+  "RSE",    # flake8-raise
+  "RUF005", # Consider iterable unpacking instead of concatenation
+  "RUF006", # Store a reference to the return value of asyncio.create_task
+  "RUF007", # Prefer itertools.pairwise() over zip() when iterating over successive pairs
+  "RUF008", # Do not use mutable default values for dataclass attributes
+  "RUF010", # Use explicit conversion flag
+  "RUF013", # PEP 484 prohibits implicit Optional
+  "RUF016", # Slice in indexed access to type {value_type} uses type {index_type} instead of an integer
+  "RUF017", # Avoid quadratic list summation
+  "RUF018", # Avoid assignment expressions in assert statements
+  "RUF019", # Unnecessary key check before dictionary access
+  "RUF020", # {never_like} | T is equivalent to T
+  "RUF021", # Parenthesize a and b expressions when chaining and and or together, to make the precedence clear
+  "RUF022", # Sort __all__
+  "RUF023", # Sort __slots__
+  "RUF024", # Do not pass mutable objects as values to dict.fromkeys
+  "RUF026", # default_factory is a positional-only argument to defaultdict
+  "RUF030", # print() call in assert statement is likely unintentional
+  "RUF032", # Decimal() called with float literal argument
+  "RUF033", # __post_init__ method with argument defaults
+  "RUF034", # Useless if-else condition
+  "RUF100", # Unused `noqa` directive
+  "RUF101", # noqa directives that use redirected rule codes
+  "RUF200", # Failed to parse pyproject.toml: {message}
+  "S102",   # Use of exec detected
+  "S103",   # bad-file-permissions
+  "S108",   # hardcoded-temp-file
+  "S306",   # suspicious-mktemp-usage
+  "S307",   # suspicious-eval-usage
+  "S313",   # suspicious-xmlc-element-tree-usage
+  "S314",   # suspicious-xml-element-tree-usage
+  "S315",   # suspicious-xml-expat-reader-usage
+  "S316",   # suspicious-xml-expat-builder-usage
+  "S317",   # suspicious-xml-sax-usage
+  "S318",   # suspicious-xml-mini-dom-usage
+  "S319",   # suspicious-xml-pull-dom-usage
+  "S601",   # paramiko-call
+  "S602",   # subprocess-popen-with-shell-equals-true
+  "S604",   # call-with-shell-equals-true
+  "S608",   # hardcoded-sql-expression
+  "S609",   # unix-command-wildcard-injection
+  "SIM",    # flake8-simplify
+  "SLF",    # flake8-self
+  "SLOT",   # flake8-slots
+  "T100",   # Trace found: {name} used
+  "T20",    # flake8-print
+  "TC",     # flake8-type-checking
+  "TID",    # Tidy imports
+  "TRY",    # tryceratops
+  "UP",     # pyupgrade
+  "UP031",  # Use format specifiers instead of percent format
+  "UP032",  # Use f-string instead of `format` call
+  "W",      # pycodestyle
 ]
 
 ignore = [
-    "D202", # No blank lines allowed after function docstring
-    "D203", # 1 blank line required before class docstring
-    "D213", # Multi-line docstring summary should start at the second line
-    "D406", # Section name should end with a newline
-    "D407", # Section name underlining
-    "E501", # line too long
+  "ASYNC109", # Async function definition with a `timeout` parameter Use `asyncio.timeout` instead
+  "ASYNC110", # Use `asyncio.Event` instead of awaiting `asyncio.sleep` in a `while` loop
+  "D202",     # No blank lines allowed after function docstring
+  "D203",     # 1 blank line required before class docstring
+  "D213",     # Multi-line docstring summary should start at the second line
+  "D406",     # Section name should end with a newline
+  "D407",     # Section name underlining
+  "E501",     # line too long
 
-    "PLC1901", # {existing} can be simplified to {replacement} as an empty string is falsey; too many false positives
-    "PLR0911", # Too many return statements ({returns} > {max_returns})
-    "PLR0912", # Too many branches ({branches} > {max_branches})
-    "PLR0913", # Too many arguments to function call ({c_args} > {max_args})
-    "PLR0915", # Too many statements ({statements} > {max_statements})
-    "PLR2004", # Magic value used in comparison, consider replacing {value} with a constant variable
-    "PLW2901", # Outer {outer_kind} variable {name} overwritten by inner {inner_kind} target
-    "PT011", # pytest.raises({exception}) is too broad, set the `match` parameter or use a more specific exception
-    "PT018", # Assertion should be broken down into multiple parts
-    "RUF001", # String contains ambiguous unicode character.
-    "RUF002", # Docstring contains ambiguous unicode character.
-    "RUF003", # Comment contains ambiguous unicode character.
-    "RUF015", # Prefer next(...) over single element slice
-    "SIM102", # Use a single if statement instead of nested if statements
-    "SIM103", # Return the condition {condition} directly
-    "SIM108", # Use ternary operator {contents} instead of if-else-block
-    "SIM115", # Use context handler for opening files
+  "PLC1901", # {existing} can be simplified to {replacement} as an empty string is falsey; too many false positives
+  "PLR0911", # Too many return statements ({returns} > {max_returns})
+  "PLR0912", # Too many branches ({branches} > {max_branches})
+  "PLR0913", # Too many arguments to function call ({c_args} > {max_args})
+  "PLR0915", # Too many statements ({statements} > {max_statements})
+  "PLR2004", # Magic value used in comparison, consider replacing {value} with a constant variable
+  "PLW2901", # Outer {outer_kind} variable {name} overwritten by inner {inner_kind} target
+  "PT011",   # pytest.raises({exception}) is too broad, set the `match` parameter or use a more specific exception
+  "PT018",   # Assertion should be broken down into multiple parts
+  "RUF001",  # String contains ambiguous unicode character.
+  "RUF002",  # Docstring contains ambiguous unicode character.
+  "RUF003",  # Comment contains ambiguous unicode character.
+  "RUF015",  # Prefer next(...) over single element slice
+  "SIM102",  # Use a single if statement instead of nested if statements
+  "SIM103",  # Return the condition {condition} directly
+  "SIM108",  # Use ternary operator {contents} instead of if-else-block
+  "SIM115",  # Use context handler for opening files
 
-    # Moving imports into type-checking blocks can mess with pytest.patch()
-    "TC001", # Move application import {} into a type-checking block
-    "TC002", # Move third-party import {} into a type-checking block
-    "TC003", # Move standard library import {} into a type-checking block
+  # Moving imports into type-checking blocks can mess with pytest.patch()
+  "TC001", # Move application import {} into a type-checking block
+  "TC002", # Move third-party import {} into a type-checking block
+  "TC003", # Move standard library import {} into a type-checking block
+  # Quotes for typing.cast generally not necessary, only for performance critical paths
+  "TC006", # Add quotes to type expression in typing.cast()
 
-    "TRY003", # Avoid specifying long messages outside the exception class
-    "TRY400", # Use `logging.exception` instead of `logging.error`
-    # Ignored due to performance: https://github.com/charliermarsh/ruff/issues/2923
-    "UP038", # Use `X | Y` in `isinstance` call instead of `(X, Y)`
+  "TRY003", # Avoid specifying long messages outside the exception class
+  "TRY400", # Use `logging.exception` instead of `logging.error`
+  # Ignored due to performance: https://github.com/charliermarsh/ruff/issues/2923
+  "UP038", # Use `X | Y` in `isinstance` call instead of `(X, Y)`
 
-    # May conflict with the formatter, https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
-    "W191",
-    "E111",
-    "E114",
-    "E117",
-    "D206",
-    "D300",
-    "Q",
-    "COM812",
-    "COM819",
+  # May conflict with the formatter, https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
+  "W191",
+  "E111",
+  "E114",
+  "E117",
+  "D206",
+  "D300",
+  "Q",
+  "COM812",
+  "COM819",
 
-    # Disabled because ruff does not understand type of __all__ generated by a function
-    "PLE0605"
+  # Disabled because ruff does not understand type of __all__ generated by a function
+  "PLE0605",
 ]
 
 [tool.ruff.lint.flake8-import-conventions.extend-aliases]
@@ -933,9 +925,7 @@ mark-parentheses = false
 
 [tool.ruff.lint.isort]
 force-sort-within-sections = true
-known-first-party = [
-    "homeassistant",
-]
+known-first-party = ["homeassistant"]
 combine-as-imports = true
 split-on-trailing-comma = false
 
diff --git a/requirements.txt b/requirements.txt
index f1eb8dac825..378240607cf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,51 +4,52 @@
 
 # Home Assistant Core
 aiodns==3.2.0
-aiohasupervisor==0.2.2b5
-aiohttp==3.11.11
+aiohasupervisor==0.3.0
+aiohttp==3.11.14
 aiohttp_cors==0.7.0
-aiohttp-fast-zlib==0.2.0
-aiohttp-asyncmdnsresolver==0.0.1
-aiozoneinfo==0.2.1
+aiohttp-fast-zlib==0.2.3
+aiohttp-asyncmdnsresolver==0.1.1
+aiozoneinfo==0.2.3
+annotatedyaml==0.4.5
 astral==2.2
-async-interrupt==1.2.0
-attrs==24.2.0
+async-interrupt==1.2.2
+attrs==25.1.0
 atomicwrites-homeassistant==1.4.1
-audioop-lts==0.2.1;python_version>='3.13'
+audioop-lts==0.2.1
 awesomeversion==24.6.0
 bcrypt==4.2.0
 certifi>=2021.5.30
 ciso8601==2.3.2
 cronsim==2.6
-fnv-hash-fast==1.2.2
-hass-nabucasa==0.88.1
+fnv-hash-fast==1.4.0
+hass-nabucasa==0.94.0
 httpx==0.28.1
-home-assistant-bluetooth==1.13.0
+home-assistant-bluetooth==1.13.1
 ifaddr==0.2.0
-Jinja2==3.1.5
+Jinja2==3.1.6
 lru-dict==1.3.0
 PyJWT==2.10.1
-cryptography==44.0.0
+cryptography==44.0.1
 Pillow==11.1.0
-propcache==0.2.1
-pyOpenSSL==24.3.0
-orjson==3.10.12
+propcache==0.3.0
+pyOpenSSL==25.0.0
+orjson==3.10.16
 packaging>=23.1
 psutil-home-assistant==0.0.1
 python-slugify==8.0.4
 PyYAML==6.0.2
 requests==2.32.3
-securetar==2025.1.3
-SQLAlchemy==2.0.36
-standard-aifc==3.13.0;python_version>='3.13'
-standard-telnetlib==3.13.0;python_version>='3.13'
-typing-extensions>=4.12.2,<5.0
-ulid-transform==1.2.0
+securetar==2025.2.1
+SQLAlchemy==2.0.39
+standard-aifc==3.13.0
+standard-telnetlib==3.13.0
+typing-extensions>=4.13.0,<5.0
+ulid-transform==1.4.0
 urllib3>=1.26.5,<2
-uv==0.5.21
+uv==0.6.10
 voluptuous==0.15.2
 voluptuous-serialize==2.6.0
 voluptuous-openapi==0.0.6
 yarl==1.18.3
 webrtc-models==0.3.0
-zeroconf==0.141.0
+zeroconf==0.146.0
diff --git a/requirements_all.txt b/requirements_all.txt
index 2a92d18f57d..7b72e788a0c 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -7,7 +7,7 @@
 AEMET-OpenData==0.6.4
 
 # homeassistant.components.honeywell
-AIOSomecomfort==0.0.30
+AIOSomecomfort==0.0.32
 
 # homeassistant.components.adax
 Adax-local==0.1.5
@@ -19,10 +19,10 @@ DoorBirdPy==3.0.8
 HAP-python==4.9.2
 
 # homeassistant.components.tasmota
-HATasmota==0.9.2
+HATasmota==0.10.0
 
 # homeassistant.components.mastodon
-Mastodon.py==1.8.1
+Mastodon.py==2.0.1
 
 # homeassistant.components.doods
 # homeassistant.components.generic
@@ -45,7 +45,7 @@ ProgettiHWSW==0.1.3
 # PyBluez==0.22
 
 # homeassistant.components.cast
-PyChromecast==14.0.5
+PyChromecast==14.0.7
 
 # homeassistant.components.flick_electric
 PyFlick==1.1.3
@@ -54,10 +54,10 @@ PyFlick==1.1.3
 PyFlume==0.6.5
 
 # homeassistant.components.fronius
-PyFronius==0.7.3
+PyFronius==0.7.7
 
 # homeassistant.components.pyload
-PyLoadAPI==1.3.2
+PyLoadAPI==1.4.2
 
 # homeassistant.components.met_eireann
 PyMetEireann==2024.11.0
@@ -84,7 +84,7 @@ PyQRCode==1.2.1
 PyRMVtransport==0.3.3
 
 # homeassistant.components.switchbot
-PySwitchbot==0.55.4
+PySwitchbot==0.58.0
 
 # homeassistant.components.switchmate
 PySwitchmate==0.5.1
@@ -100,7 +100,7 @@ PyTransportNSW==0.1.1
 PyTurboJPEG==1.7.5
 
 # homeassistant.components.vicare
-PyViCare==2.41.0
+PyViCare==2.43.1
 
 # homeassistant.components.xiaomi_aqara
 PyXiaomiGateway==0.14.3
@@ -109,14 +109,14 @@ PyXiaomiGateway==0.14.3
 RachioPy==1.1.0
 
 # homeassistant.components.python_script
-RestrictedPython==7.4
+RestrictedPython==8.0
 
 # homeassistant.components.remember_the_milk
 RtmAPI==0.7.2
 
 # homeassistant.components.recorder
 # homeassistant.components.sql
-SQLAlchemy==2.0.36
+SQLAlchemy==2.0.39
 
 # homeassistant.components.tami4
 Tami4EdgeAPI==3.0
@@ -131,7 +131,7 @@ TwitterAPI==2.7.12
 WSDiscovery==2.1.2
 
 # homeassistant.components.accuweather
-accuweather==4.0.0
+accuweather==4.2.0
 
 # homeassistant.components.adax
 adax==0.4.0
@@ -140,7 +140,7 @@ adax==0.4.0
 adb-shell[async]==0.4.4
 
 # homeassistant.components.alarmdecoder
-adext==0.4.3
+adext==0.4.4
 
 # homeassistant.components.adguard
 adguardhome==0.7.0
@@ -176,10 +176,10 @@ aio-georss-gdacs==0.10
 aioacaia==0.1.14
 
 # homeassistant.components.airq
-aioairq==0.4.3
+aioairq==0.4.4
 
 # homeassistant.components.airzone_cloud
-aioairzone-cloud==0.6.10
+aioairzone-cloud==0.6.11
 
 # homeassistant.components.airzone
 aioairzone==0.9.9
@@ -201,7 +201,7 @@ aioaseko==1.0.0
 aioasuswrt==1.4.0
 
 # homeassistant.components.husqvarna_automower
-aioautomower==2025.1.1
+aioautomower==2025.3.2
 
 # homeassistant.components.azure_devops
 aioazuredevops==2.2.1
@@ -210,16 +210,16 @@ aioazuredevops==2.2.1
 aiobafi6==0.9.0
 
 # homeassistant.components.aws
-aiobotocore==2.13.1
+aiobotocore==2.21.1
 
 # homeassistant.components.comelit
-aiocomelit==0.10.1
+aiocomelit==0.11.3
 
 # homeassistant.components.dhcp
-aiodhcpwatcher==1.0.2
+aiodhcpwatcher==1.1.1
 
 # homeassistant.components.dhcp
-aiodiscover==2.1.0
+aiodiscover==2.6.1
 
 # homeassistant.components.dnsip
 aiodns==3.2.0
@@ -234,7 +234,7 @@ aioeafm==0.1.2
 aioeagle==1.1.0
 
 # homeassistant.components.ecowitt
-aioecowitt==2024.2.1
+aioecowitt==2025.3.1
 
 # homeassistant.components.co2signal
 aioelectricitymaps==0.4.0
@@ -243,7 +243,7 @@ aioelectricitymaps==0.4.0
 aioemonitor==1.0.5
 
 # homeassistant.components.esphome
-aioesphomeapi==28.0.1
+aioesphomeapi==29.7.0
 
 # homeassistant.components.flo
 aioflo==2021.11.0
@@ -258,22 +258,25 @@ aiogithubapi==24.6.0
 aioguardian==2022.07.0
 
 # homeassistant.components.harmony
-aioharmony==0.4.1
+aioharmony==0.5.2
 
 # homeassistant.components.hassio
-aiohasupervisor==0.2.2b5
+aiohasupervisor==0.3.0
+
+# homeassistant.components.home_connect
+aiohomeconnect==0.16.3
 
 # homeassistant.components.homekit_controller
-aiohomekit==3.2.7
+aiohomekit==3.2.8
 
 # homeassistant.components.mcp_server
 aiohttp_sse==2.2.0
 
 # homeassistant.components.hue
-aiohue==4.7.3
+aiohue==4.7.4
 
 # homeassistant.components.imap
-aioimaplib==2.0.0
+aioimaplib==2.0.1
 
 # homeassistant.components.apache_kafka
 aiokafka==0.10.0
@@ -288,7 +291,7 @@ aiolifx-effects==0.3.2
 aiolifx-themes==0.6.4
 
 # homeassistant.components.lifx
-aiolifx==1.1.2
+aiolifx==1.1.4
 
 # homeassistant.components.lookin
 aiolookin==1.0.0
@@ -312,10 +315,10 @@ aionanoleaf==0.2.1
 aionotion==2024.03.0
 
 # homeassistant.components.nut
-aionut==4.3.3
+aionut==4.3.4
 
 # homeassistant.components.oncue
-aiooncue==0.3.7
+aiooncue==0.3.9
 
 # homeassistant.components.openexchangerates
 aioopenexchangerates==0.6.8
@@ -368,7 +371,7 @@ aioruuvigateway==0.1.0
 aiosenz==1.0.0
 
 # homeassistant.components.shelly
-aioshelly==12.3.1
+aioshelly==13.4.0
 
 # homeassistant.components.skybell
 aioskybell==22.7.0
@@ -380,10 +383,10 @@ aioslimproto==3.0.0
 aiosolaredge==0.2.0
 
 # homeassistant.components.steamist
-aiosteamist==1.0.0
+aiosteamist==1.0.1
 
 # homeassistant.components.cambridge_audio
-aiostreammagic==2.10.0
+aiostreammagic==2.11.0
 
 # homeassistant.components.switcher_kis
 aioswitcher==6.0.0
@@ -401,7 +404,10 @@ aiotedee==0.2.20
 aiotractive==0.6.0
 
 # homeassistant.components.unifi
-aiounifi==81
+aiounifi==83
+
+# homeassistant.components.usb
+aiousbwatcher==1.1.1
 
 # homeassistant.components.vlc_telnet
 aiovlc==0.5.1
@@ -415,17 +421,20 @@ aiowaqi==3.1.0
 # homeassistant.components.watttime
 aiowatttime==0.1.1
 
+# homeassistant.components.webdav
+aiowebdav2==0.4.3
+
 # homeassistant.components.webostv
-aiowebostv==0.6.0
+aiowebostv==0.7.3
 
 # homeassistant.components.withings
-aiowithings==3.1.5
+aiowithings==3.1.6
 
 # homeassistant.components.yandex_transport
 aioymaps==1.2.5
 
 # homeassistant.components.airgradient
-airgradient==0.9.1
+airgradient==0.9.2
 
 # homeassistant.components.airly
 airly==1.1.0
@@ -455,7 +464,7 @@ amcrest==1.9.8
 androidtv[async]==0.0.75
 
 # homeassistant.components.androidtv_remote
-androidtvremote2==0.1.2
+androidtvremote2==0.2.1
 
 # homeassistant.components.anel_pwrctrl
 anel-pwrctrl-homeassistant==0.0.1.dev2
@@ -467,10 +476,10 @@ anova-wifi==0.17.0
 anthemav==1.4.1
 
 # homeassistant.components.anthropic
-anthropic==0.44.0
+anthropic==0.47.2
 
 # homeassistant.components.mcp_server
-anyio==4.8.0
+anyio==4.9.0
 
 # homeassistant.components.weatherkit
 apple_weatherkit==1.1.3
@@ -488,10 +497,10 @@ apsystems-ez1==2.4.0
 aqualogic==2.6
 
 # homeassistant.components.aranet
-aranet4==2.5.0
+aranet4==2.5.1
 
 # homeassistant.components.arcam_fmj
-arcam-fmj==1.5.2
+arcam-fmj==1.8.1
 
 # homeassistant.components.arris_tg2492lg
 arris-tg2492lg==2.2.0
@@ -511,7 +520,7 @@ async-upnp-client==0.43.0
 asyncarve==0.1.1
 
 # homeassistant.components.keyboard_remote
-asyncinotify==4.0.2
+asyncinotify==4.2.0
 
 # homeassistant.components.supla
 asyncpysupla==0.0.5
@@ -548,7 +557,7 @@ av==13.1.0
 axis==64
 
 # homeassistant.components.fujitsu_fglair
-ayla-iot-unofficial==1.4.5
+ayla-iot-unofficial==1.4.7
 
 # homeassistant.components.azure_event_hub
 azure-eventhub==5.11.1
@@ -562,6 +571,9 @@ azure-kusto-ingest==4.5.1
 # homeassistant.components.azure_service_bus
 azure-servicebus==7.10.0
 
+# homeassistant.components.azure_storage
+azure-storage-blob==12.24.0
+
 # homeassistant.components.holiday
 babel==2.15.0
 
@@ -591,10 +603,10 @@ bizkaibus==0.1.1
 
 # homeassistant.components.eq3btsmart
 # homeassistant.components.esphome
-bleak-esphome==2.1.1
+bleak-esphome==2.12.0
 
 # homeassistant.components.bluetooth
-bleak-retry-connector==3.8.0
+bleak-retry-connector==3.9.0
 
 # homeassistant.components.bluetooth
 bleak==0.22.3
@@ -615,36 +627,38 @@ bluecurrent-api==1.2.3
 bluemaestro-ble==0.2.3
 
 # homeassistant.components.decora
-# homeassistant.components.zengge
 # bluepy==1.3.0
 
 # homeassistant.components.bluetooth
-bluetooth-adapters==0.21.1
+bluetooth-adapters==0.21.4
 
 # homeassistant.components.bluetooth
-bluetooth-auto-recovery==1.4.2
+bluetooth-auto-recovery==1.4.5
 
 # homeassistant.components.bluetooth
 # homeassistant.components.ld2410_ble
 # homeassistant.components.led_ble
 # homeassistant.components.private_ble_device
-bluetooth-data-tools==1.22.0
+bluetooth-data-tools==1.26.1
 
 # homeassistant.components.bond
 bond-async==0.2.1
 
+# homeassistant.components.bosch_alarm
+bosch-alarm-mode2==0.4.3
+
 # homeassistant.components.bosch_shc
 boschshcpy==0.2.91
 
 # homeassistant.components.amazon_polly
 # homeassistant.components.route53
-boto3==1.34.131
+boto3==1.37.1
 
 # homeassistant.components.aws
-botocore==1.34.131
+botocore==1.37.1
 
 # homeassistant.components.bring
-bring-api==0.9.1
+bring-api==1.1.0
 
 # homeassistant.components.broadlink
 broadlink==0.19.0
@@ -662,7 +676,7 @@ brunt==1.2.0
 bt-proximity==0.2.1
 
 # homeassistant.components.bthome
-bthome-ble==3.9.1
+bthome-ble==3.12.4
 
 # homeassistant.components.bt_home_hub_5
 bthomehub5-devicelist==0.1.1
@@ -674,7 +688,7 @@ btsmarthub-devicelist==0.2.3
 buienradar==1.0.6
 
 # homeassistant.components.dhcp
-cached-ipaddress==0.8.0
+cached-ipaddress==0.10.0
 
 # homeassistant.components.caldav
 caldav==1.3.9
@@ -732,10 +746,10 @@ datadog==0.15.0
 datapoint==0.9.9
 
 # homeassistant.components.bluetooth
-dbus-fast==2.30.2
+dbus-fast==2.43.0
 
 # homeassistant.components.debugpy
-debugpy==1.8.11
+debugpy==1.8.13
 
 # homeassistant.components.decora_wifi
 # decora-wifi==1.4
@@ -744,7 +758,7 @@ debugpy==1.8.11
 # decora==0.6
 
 # homeassistant.components.ecovacs
-deebot-client==11.0.0
+deebot-client==12.4.0
 
 # homeassistant.components.ihc
 # homeassistant.components.namecheapdns
@@ -779,7 +793,7 @@ directv==0.4.0
 discogs-client==2.3.0
 
 # homeassistant.components.steamist
-discovery30303==0.3.2
+discovery30303==0.3.3
 
 # homeassistant.components.dremel_3d_printer
 dremel3dpy==2.1.1
@@ -815,10 +829,10 @@ ebusdpy==0.0.17
 ecoaliface==0.4.0
 
 # homeassistant.components.eheimdigital
-eheimdigital==1.0.5
+eheimdigital==1.0.6
 
 # homeassistant.components.electric_kiwi
-electrickiwi-api==0.8.5
+electrickiwi-api==0.9.14
 
 # homeassistant.components.elevenlabs
 elevenlabs==1.9.0
@@ -857,7 +871,7 @@ enocean==0.50
 enturclient==0.2.4
 
 # homeassistant.components.environment_canada
-env-canada==0.7.2
+env-canada==0.8.0
 
 # homeassistant.components.season
 ephem==4.1.6
@@ -887,7 +901,7 @@ eufylife-ble-client==0.1.8
 # evdev==1.6.1
 
 # homeassistant.components.evohome
-evohome-async==0.4.21
+evohome-async==1.0.4
 
 # homeassistant.components.bryant_evolution
 evolutionhttp==0.0.18
@@ -924,17 +938,17 @@ fixerio==1.0.0a0
 fjaraskupan==2.3.2
 
 # homeassistant.components.flexit_bacnet
-flexit_bacnet==2.2.1
+flexit_bacnet==2.2.3
 
 # homeassistant.components.flipr
 flipr-api==1.6.1
 
 # homeassistant.components.flux_led
-flux-led==1.1.0
+flux-led==1.1.3
 
 # homeassistant.components.homekit
 # homeassistant.components.recorder
-fnv-hash-fast==1.2.2
+fnv-hash-fast==1.4.0
 
 # homeassistant.components.foobot
 foobot_async==1.0.0
@@ -956,16 +970,16 @@ freesms==0.2.0
 fritzconnection[qr]==1.14.0
 
 # homeassistant.components.fyta
-fyta_cli==0.7.0
+fyta_cli==0.7.2
 
 # homeassistant.components.google_translate
 gTTS==2.5.3
 
 # homeassistant.components.gardena_bluetooth
-gardena-bluetooth==1.5.0
+gardena-bluetooth==1.6.0
 
 # homeassistant.components.google_assistant_sdk
-gassist-text==0.0.11
+gassist-text==0.0.12
 
 # homeassistant.components.google
 gcal-sync==7.0.0
@@ -974,7 +988,7 @@ gcal-sync==7.0.0
 geniushub-client==0.7.1
 
 # homeassistant.components.geocaching
-geocachingapi==0.2.1
+geocachingapi==0.3.0
 
 # homeassistant.components.aprs
 geopy==2.3.0
@@ -996,7 +1010,7 @@ georss-qld-bushfire-alert-client==0.8
 getmac==0.9.5
 
 # homeassistant.components.gios
-gios==5.0.0
+gios==6.0.0
 
 # homeassistant.components.gitter
 gitterpy==0.1.7
@@ -1018,7 +1032,7 @@ goodwe==0.3.6
 google-api-python-client==2.71.0
 
 # homeassistant.components.google_pubsub
-google-cloud-pubsub==2.23.0
+google-cloud-pubsub==2.29.0
 
 # homeassistant.components.google_cloud
 google-cloud-speech==2.27.0
@@ -1027,10 +1041,10 @@ google-cloud-speech==2.27.0
 google-cloud-texttospeech==2.17.2
 
 # homeassistant.components.google_generative_ai_conversation
-google-generativeai==0.8.2
+google-genai==1.7.0
 
 # homeassistant.components.nest
-google-nest-sdm==7.0.0
+google-nest-sdm==7.1.4
 
 # homeassistant.components.google_photos
 google-photos-library-api==0.12.1
@@ -1046,10 +1060,10 @@ goslide-api==0.7.0
 gotailwind==0.3.0
 
 # homeassistant.components.govee_ble
-govee-ble==0.42.0
+govee-ble==0.43.1
 
 # homeassistant.components.govee_light_local
-govee-local-api==1.5.3
+govee-local-api==2.1.0
 
 # homeassistant.components.remote_rpi_gpio
 gpiozero==1.6.2
@@ -1093,23 +1107,26 @@ ha-iotawattpy==0.1.2
 # homeassistant.components.philips_js
 ha-philipsjs==3.2.2
 
+# homeassistant.components.homeassistant_hardware
+ha-silabs-firmware-client==0.2.0
+
 # homeassistant.components.habitica
-habiticalib==0.3.3
+habiticalib==0.3.7
 
 # homeassistant.components.bluetooth
-habluetooth==3.12.0
+habluetooth==3.37.0
 
 # homeassistant.components.cloud
-hass-nabucasa==0.88.1
+hass-nabucasa==0.94.0
 
 # homeassistant.components.splunk
 hass-splunk==0.1.1
 
 # homeassistant.components.conversation
-hassil==2.1.0
+hassil==2.2.3
 
 # homeassistant.components.jewish_calendar
-hdate==0.11.1
+hdate[astral]==1.0.3
 
 # homeassistant.components.heatmiser
 heatmiserV3==2.0.3
@@ -1137,19 +1154,16 @@ hole==0.8.0
 
 # homeassistant.components.holiday
 # homeassistant.components.workday
-holidays==0.65
+holidays==0.69
 
 # homeassistant.components.frontend
-home-assistant-frontend==20250109.2
+home-assistant-frontend==20250327.0
 
 # homeassistant.components.conversation
-home-assistant-intents==2025.1.1
-
-# homeassistant.components.home_connect
-homeconnect==0.8.0
+home-assistant-intents==2025.3.24
 
 # homeassistant.components.homematicip_cloud
-homematicip==1.1.6
+homematicip==1.1.7
 
 # homeassistant.components.horizon
 horimote==0.4.1
@@ -1181,7 +1195,8 @@ ibmiotf==0.3.4
 # homeassistant.components.google
 # homeassistant.components.local_calendar
 # homeassistant.components.local_todo
-ical==8.3.0
+# homeassistant.components.remote_calendar
+ical==9.0.1
 
 # homeassistant.components.caldav
 icalendar==6.1.0
@@ -1199,13 +1214,13 @@ ifaddr==0.2.0
 iglo==1.2.7
 
 # homeassistant.components.igloohome
-igloohome-api==0.0.6
+igloohome-api==0.1.0
 
 # homeassistant.components.ihc
 ihcsdk==2.8.5
 
 # homeassistant.components.imgw_pib
-imgw_pib==1.0.9
+imgw_pib==1.0.10
 
 # homeassistant.components.incomfort
 incomfort-client==0.6.7
@@ -1217,7 +1232,7 @@ influxdb-client==1.24.0
 influxdb==5.3.1
 
 # homeassistant.components.inkbird
-inkbird-ble==0.5.8
+inkbird-ble==0.9.0
 
 # homeassistant.components.insteon
 insteon-frontend-home-assistant==0.5.0
@@ -1225,6 +1240,9 @@ insteon-frontend-home-assistant==0.5.0
 # homeassistant.components.intellifire
 intellifire4py==4.1.9
 
+# homeassistant.components.iometer
+iometer==0.1.0
+
 # homeassistant.components.iotty
 iottycloud==0.3.0
 
@@ -1235,7 +1253,7 @@ iperf3==0.1.11
 isal==1.7.1
 
 # homeassistant.components.gogogate2
-ismartgate==5.0.1
+ismartgate==5.0.2
 
 # homeassistant.components.israel_rail
 israel-rail-api==0.1.2
@@ -1244,7 +1262,7 @@ israel-rail-api==0.1.2
 jaraco.abode==6.2.1
 
 # homeassistant.components.jellyfin
-jellyfin-apiclient-python==1.9.2
+jellyfin-apiclient-python==1.10.0
 
 # homeassistant.components.command_line
 # homeassistant.components.rest
@@ -1269,7 +1287,7 @@ kiwiki-client==0.1.1
 knocki==0.4.2
 
 # homeassistant.components.knx
-knx-frontend==2025.1.18.164225
+knx-frontend==2025.3.8.214559
 
 # homeassistant.components.konnected
 konnected==1.2.0
@@ -1278,7 +1296,7 @@ konnected==1.2.0
 krakenex==2.2.2
 
 # homeassistant.components.lacrosse_view
-lacrosse-view==1.0.3
+lacrosse-view==1.1.1
 
 # homeassistant.components.eufy
 lakeside==0.13
@@ -1296,13 +1314,13 @@ ld2410-ble==0.1.1
 leaone-ble==0.1.0
 
 # homeassistant.components.led_ble
-led-ble==1.1.4
+led-ble==1.1.6
 
 # homeassistant.components.lektrico
 lektricowifi==0.0.43
 
 # homeassistant.components.letpot
-letpot==0.3.0
+letpot==0.4.0
 
 # homeassistant.components.foscam
 libpyfoscam==1.2.2
@@ -1364,8 +1382,9 @@ maxcube-api==0.4.3
 # homeassistant.components.mythicbeastsdns
 mbddns==0.1.2
 
+# homeassistant.components.mcp
 # homeassistant.components.mcp_server
-mcp==1.1.2
+mcp==1.5.0
 
 # homeassistant.components.minecraft_server
 mcstatus==11.1.1
@@ -1386,7 +1405,7 @@ messagebird==1.2.0
 meteoalertapi==0.3.1
 
 # homeassistant.components.meteo_france
-meteofrance-api==1.3.0
+meteofrance-api==1.4.0
 
 # homeassistant.components.mfi
 mficlient==0.5.0
@@ -1401,7 +1420,7 @@ microBeesPy==0.3.5
 mill-local==0.3.0
 
 # homeassistant.components.mill
-millheater==0.12.2
+millheater==0.12.3
 
 # homeassistant.components.minio
 minio==7.1.12
@@ -1410,7 +1429,7 @@ minio==7.1.12
 moat-ble==0.1.1
 
 # homeassistant.components.moehlenhoff_alpha2
-moehlenhoff-alpha2==1.3.1
+moehlenhoff-alpha2==1.4.0
 
 # homeassistant.components.monzo
 monzopy==1.4.2
@@ -1419,7 +1438,7 @@ monzopy==1.4.2
 mopeka-iot-ble==0.8.0
 
 # homeassistant.components.motion_blinds
-motionblinds==0.6.25
+motionblinds==0.6.26
 
 # homeassistant.components.motionblinds_ble
 motionblindsble==0.1.3
@@ -1434,7 +1453,7 @@ mozart-api==4.1.1.116.4
 mullvad-api==1.0.0
 
 # homeassistant.components.music_assistant
-music-assistant-client==1.0.8
+music-assistant-client==1.1.1
 
 # homeassistant.components.tts
 mutagen==1.47.0
@@ -1464,13 +1483,13 @@ netdata==1.3.0
 netmap==0.7.0.2
 
 # homeassistant.components.nam
-nettigo-air-monitor==4.0.0
+nettigo-air-monitor==4.1.0
 
 # homeassistant.components.neurio_energy
 neurio==0.3.1
 
 # homeassistant.components.nexia
-nexia==2.0.8
+nexia==2.4.0
 
 # homeassistant.components.nextcloud
 nextcloudmonitor==1.5.1
@@ -1482,19 +1501,19 @@ nextcord==2.6.0
 nextdns==4.0.0
 
 # homeassistant.components.niko_home_control
-nhc==0.3.9
+nhc==0.4.10
 
 # homeassistant.components.nibe_heatpump
-nibe==2.14.0
+nibe==2.17.0
 
 # homeassistant.components.nice_go
-nice-go==1.0.0
+nice-go==1.0.1
 
 # homeassistant.components.nilu
 niluclient==0.1.2
 
 # homeassistant.components.noaa_tides
-noaa-coops==0.1.9
+noaa-coops==0.4.0
 
 # homeassistant.components.nfandroidtv
 notifications-android-tv==0.1.5
@@ -1540,7 +1559,7 @@ odp-amsterdam==6.0.2
 oemthermostat==1.1.1
 
 # homeassistant.components.ohme
-ohme==1.2.5
+ohme==1.4.1
 
 # homeassistant.components.ollama
 ollama==0.4.7
@@ -1551,6 +1570,9 @@ omnilogic==0.4.5
 # homeassistant.components.ondilo_ico
 ondilo==0.5.0
 
+# homeassistant.components.onedrive
+onedrive-personal-sdk==0.0.13
+
 # homeassistant.components.onvif
 onvif-zeep-async==3.2.5
 
@@ -1561,7 +1583,7 @@ open-garage==0.2.0
 open-meteo==0.3.2
 
 # homeassistant.components.openai_conversation
-openai==1.59.9
+openai==1.68.2
 
 # homeassistant.components.openerz
 openerz-api==0.3.0
@@ -1585,7 +1607,7 @@ openwrt-luci-rpc==1.1.17
 openwrt-ubus-rpc==0.0.2
 
 # homeassistant.components.opower
-opower==0.8.7
+opower==0.9.0
 
 # homeassistant.components.oralb
 oralb-ble==0.17.6
@@ -1606,7 +1628,7 @@ ovoenergy==2.0.0
 p1monitor==3.1.0
 
 # homeassistant.components.mqtt
-paho-mqtt==1.6.1
+paho-mqtt==2.1.0
 
 # homeassistant.components.panasonic_bluray
 panacotta==0.2
@@ -1621,7 +1643,7 @@ pdunehd==1.3.2
 peblar==0.4.0
 
 # homeassistant.components.peco
-peco==0.0.30
+peco==0.1.2
 
 # homeassistant.components.pencom
 pencompy==0.0.3
@@ -1653,7 +1675,7 @@ plexauth==0.0.6
 plexwebsocket==0.0.14
 
 # homeassistant.components.plugwise
-plugwise==1.6.4
+plugwise==1.7.2
 
 # homeassistant.components.plum_lightpad
 plumlightpad==0.0.11
@@ -1688,7 +1710,7 @@ proxmoxer==2.0.1
 psutil-home-assistant==0.0.1
 
 # homeassistant.components.systemmonitor
-psutil==6.1.1
+psutil==7.0.0
 
 # homeassistant.components.pulseaudio_loopback
 pulsectl==23.5.2
@@ -1714,6 +1736,9 @@ py-ccm15==0.0.9
 # homeassistant.components.cpuspeed
 py-cpuinfo==9.0.0
 
+# homeassistant.components.pterodactyl
+py-dactyl==2.0.4
+
 # homeassistant.components.dormakaba_dkey
 py-dormakaba-dkey==1.0.5
 
@@ -1739,7 +1764,7 @@ py-schluter==0.1.7
 py-sucks==0.9.10
 
 # homeassistant.components.synology_dsm
-py-synologydsm-api==2.6.0
+py-synologydsm-api==2.7.1
 
 # homeassistant.components.atome
 pyAtome==0.1.1
@@ -1763,7 +1788,7 @@ pyEmby==1.10
 pyHik==0.3.2
 
 # homeassistant.components.homee
-pyHomee==1.2.3
+pyHomee==1.2.8
 
 # homeassistant.components.rfxtrx
 pyRFXtrx==0.31.1
@@ -1797,7 +1822,7 @@ pyairnow==1.2.1
 pyairvisual==2023.08.1
 
 # homeassistant.components.aprilaire
-pyaprilaire==0.7.7
+pyaprilaire==0.8.1
 
 # homeassistant.components.asuswrt
 pyasuswrt==0.1.21
@@ -1815,7 +1840,7 @@ pyatv==0.16.0
 pyaussiebb==0.1.5
 
 # homeassistant.components.balboa
-pybalboa==1.0.2
+pybalboa==1.1.3
 
 # homeassistant.components.bbox
 pybbox==0.0.5-alpha
@@ -1827,7 +1852,7 @@ pyblackbird==0.6
 pyblu==2.0.0
 
 # homeassistant.components.neato
-pybotvac==0.0.25
+pybotvac==0.0.26
 
 # homeassistant.components.braviatv
 pybravia==0.3.4
@@ -1866,7 +1891,7 @@ pycsspeechtts==1.0.8
 # pycups==2.0.4
 
 # homeassistant.components.daikin
-pydaikin==2.13.8
+pydaikin==2.14.1
 
 # homeassistant.components.danfoss_air
 pydanfossair==0.1.0
@@ -1875,7 +1900,7 @@ pydanfossair==0.1.0
 pydeako==0.6.0
 
 # homeassistant.components.deconz
-pydeconz==118
+pydeconz==120
 
 # homeassistant.components.delijn
 pydelijn==1.1.0
@@ -1890,7 +1915,7 @@ pydiscovergy==3.0.2
 pydoods==1.0.2
 
 # homeassistant.components.hydrawise
-pydrawise==2025.1.0
+pydrawise==2025.3.0
 
 # homeassistant.components.android_ip_webcam
 pydroid-ipcam==2.0.0
@@ -1902,7 +1927,7 @@ pyebox==1.1.4
 pyecoforest==0.4.0
 
 # homeassistant.components.econet
-pyeconet==0.1.23
+pyeconet==0.1.28
 
 # homeassistant.components.ista_ecotrend
 pyecotrend-ista==3.3.1
@@ -1923,7 +1948,7 @@ pyeiscp==0.0.7
 pyemoncms==0.1.1
 
 # homeassistant.components.enphase_envoy
-pyenphase==1.23.1
+pyenphase==1.25.1
 
 # homeassistant.components.envisalink
 pyenvisalink==4.7
@@ -1941,13 +1966,13 @@ pyevilgenius==2.0.0
 pyezviz==0.2.1.2
 
 # homeassistant.components.fibaro
-pyfibaro==0.8.0
+pyfibaro==0.8.2
 
 # homeassistant.components.fido
 pyfido==2.1.2
 
 # homeassistant.components.fireservicerota
-pyfireservicerota==0.0.43
+pyfireservicerota==0.0.46
 
 # homeassistant.components.flic
 pyflic==2.0.4
@@ -1962,7 +1987,7 @@ pyforked-daapd==0.1.14
 pyfreedompro==1.1.0
 
 # homeassistant.components.fritzbox
-pyfritzhome==0.6.12
+pyfritzhome==0.6.17
 
 # homeassistant.components.ifttt
 pyfttt==0.3
@@ -1980,10 +2005,10 @@ pygti==0.9.4
 pyhaversion==22.8.0
 
 # homeassistant.components.heos
-pyheos==1.0.0
+pyheos==1.0.4
 
 # homeassistant.components.hive
-pyhive-integration==1.0.1
+pyhive-integration==1.0.2
 
 # homeassistant.components.homematic
 pyhomematic==0.1.77
@@ -2004,7 +2029,7 @@ pyinsteon==1.6.3
 pyintesishome==1.8.0
 
 # homeassistant.components.ipma
-pyipma==3.0.8
+pyipma==3.0.9
 
 # homeassistant.components.ipp
 pyipp==0.17.0
@@ -2016,7 +2041,7 @@ pyiqvia==2022.04.0
 pyirishrail==0.0.2
 
 # homeassistant.components.iskra
-pyiskra==0.1.14
+pyiskra==0.1.15
 
 # homeassistant.components.iss
 pyiss==1.0.1
@@ -2061,7 +2086,7 @@ pykwb==0.0.8
 pylacrosse==0.4
 
 # homeassistant.components.lamarzocco
-pylamarzocco==1.4.6
+pylamarzocco==1.4.9
 
 # homeassistant.components.lastfm
 pylast==5.1.0
@@ -2082,7 +2107,7 @@ pylitejet==0.6.3
 pylitterbot==2024.0.0
 
 # homeassistant.components.lutron_caseta
-pylutron-caseta==0.23.0
+pylutron-caseta==0.24.0
 
 # homeassistant.components.lutron
 pylutron==0.2.16
@@ -2124,7 +2149,7 @@ pymsteams==0.1.12
 pymysensors==0.24.0
 
 # homeassistant.components.iron_os
-pynecil==4.0.1
+pynecil==4.1.0
 
 # homeassistant.components.netgear
 pynetgear==0.10.10
@@ -2163,7 +2188,7 @@ pyombi==0.1.10
 pyopenuv==2023.02.0
 
 # homeassistant.components.openweathermap
-pyopenweathermap==0.2.1
+pyopenweathermap==0.2.2
 
 # homeassistant.components.opnsense
 pyopnsense==0.4.0
@@ -2183,7 +2208,7 @@ pyotgw==2.2.2
 pyotp==2.8.0
 
 # homeassistant.components.overkiz
-pyoverkiz==1.15.5
+pyoverkiz==1.16.5
 
 # homeassistant.components.onewire
 pyownet==0.10.0.post1
@@ -2195,7 +2220,10 @@ pypalazzetti==0.1.19
 pypca==0.0.7
 
 # homeassistant.components.lcn
-pypck==0.8.3
+pypck==0.8.5
+
+# homeassistant.components.pglab
+pypglab==0.0.3
 
 # homeassistant.components.pjlink
 pypjlink2==1.2.1
@@ -2210,7 +2238,7 @@ pypoint==3.0.0
 pyprof2calltree==1.4.5
 
 # homeassistant.components.prosegur
-pyprosegur==0.0.9
+pyprosegur==0.0.14
 
 # homeassistant.components.prusalink
 pyprusalink==2.1.1
@@ -2225,7 +2253,7 @@ pyqvrpro==0.52
 pyqwikswitch==0.93
 
 # homeassistant.components.nmbs
-pyrail==0.0.3
+pyrail==0.4.1
 
 # homeassistant.components.rainbird
 pyrainbird==6.0.1
@@ -2237,7 +2265,7 @@ pyrecswitch==1.0.2
 pyrepetierng==0.1.0
 
 # homeassistant.components.risco
-pyrisco==0.6.5
+pyrisco==0.6.7
 
 # homeassistant.components.rituals_perfume_genie
 pyrituals==0.0.6
@@ -2246,7 +2274,7 @@ pyrituals==0.0.6
 pyroute2==0.7.5
 
 # homeassistant.components.rympro
-pyrympro==0.0.8
+pyrympro==0.0.9
 
 # homeassistant.components.sabnzbd
 pysabnzbd==1.1.1
@@ -2261,7 +2289,7 @@ pyschlage==2024.11.0
 pysensibo==1.1.0
 
 # homeassistant.components.serial
-pyserial-asyncio-fast==0.14
+pyserial-asyncio-fast==0.16
 
 # homeassistant.components.acer_projector
 # homeassistant.components.crownstone
@@ -2273,7 +2301,7 @@ pyserial==3.5
 pysesame2==1.0.1
 
 # homeassistant.components.seventeentrack
-pyseventeentrack==1.0.1
+pyseventeentrack==1.0.2
 
 # homeassistant.components.sia
 pysiaalarm==3.1.1
@@ -2291,19 +2319,19 @@ pysma==0.7.5
 pysmappee==0.2.29
 
 # homeassistant.components.smartthings
-pysmartapp==0.3.5
-
-# homeassistant.components.smartthings
-pysmartthings==0.7.8
+pysmartthings==3.0.0
 
 # homeassistant.components.smarty
-pysmarty2==0.10.1
+pysmarty2==0.10.2
+
+# homeassistant.components.smhi
+pysmhi==1.0.0
 
 # homeassistant.components.edl21
 pysml==0.0.12
 
 # homeassistant.components.smlight
-pysmlight==0.1.6
+pysmlight==0.2.4
 
 # homeassistant.components.snmp
 pysnmp==6.2.6
@@ -2321,13 +2349,13 @@ pyspcwebgw==0.7.0
 pyspeex-noise==1.0.2
 
 # homeassistant.components.squeezebox
-pysqueezebox==0.11.1
+pysqueezebox==0.12.0
 
 # homeassistant.components.stiebel_eltron
 pystiebeleltron==0.0.1.dev2
 
 # homeassistant.components.suez_water
-pysuezV2==2.0.3
+pysuezV2==2.0.4
 
 # homeassistant.components.switchbee
 pyswitchbee==1.8.3
@@ -2339,7 +2367,7 @@ pytautulli==23.1.1
 pythinkingcleaner==0.0.3
 
 # homeassistant.components.motionmount
-python-MotionMount==2.2.0
+python-MotionMount==2.3.0
 
 # homeassistant.components.awair
 python-awair==0.2.4
@@ -2377,11 +2405,14 @@ python-gc100==1.0.3a0
 # homeassistant.components.gitlab_ci
 python-gitlab==1.6.0
 
+# homeassistant.components.google_drive
+python-google-drive-api==0.1.0
+
 # homeassistant.components.analytics_insights
-python-homeassistant-analytics==0.8.1
+python-homeassistant-analytics==0.9.0
 
 # homeassistant.components.homewizard
-python-homewizard-energy==v8.1.1
+python-homewizard-energy==v8.3.2
 
 # homeassistant.components.hp_ilo
 python-hpilo==4.4.3
@@ -2396,10 +2427,10 @@ python-join-api==0.0.9
 python-juicenet==1.1.0
 
 # homeassistant.components.tplink
-python-kasa[speedups]==0.9.1
+python-kasa[speedups]==0.10.2
 
 # homeassistant.components.linkplay
-python-linkplay==0.1.3
+python-linkplay==0.2.2
 
 # homeassistant.components.lirc
 # python-lirc==1.2.3
@@ -2427,10 +2458,10 @@ python-opensky==1.0.1
 python-otbr-api==2.7.0
 
 # homeassistant.components.overseerr
-python-overseerr==0.6.0
+python-overseerr==0.7.1
 
 # homeassistant.components.picnic
-python-picnic-api==1.1.0
+python-picnic-api2==1.2.4
 
 # homeassistant.components.rabbitair
 python-rabbitair==0.0.8
@@ -2439,19 +2470,22 @@ python-rabbitair==0.0.8
 python-ripple-api==0.0.3
 
 # homeassistant.components.roborock
-python-roborock==2.8.4
+python-roborock==2.16.1
 
 # homeassistant.components.smarttub
-python-smarttub==0.0.38
+python-smarttub==0.0.39
+
+# homeassistant.components.snoo
+python-snoo==0.6.4
 
 # homeassistant.components.songpal
 python-songpal==0.16.2
 
 # homeassistant.components.tado
-python-tado==0.18.5
+python-tado==0.18.9
 
 # homeassistant.components.technove
-python-technove==1.3.1
+python-technove==2.0.0
 
 # homeassistant.components.telegram_bot
 python-telegram-bot[socks]==21.5
@@ -2469,7 +2503,7 @@ pytile==2024.12.0
 pytomorrowio==0.3.6
 
 # homeassistant.components.touchline
-pytouchline==0.7
+pytouchline_extended==0.4.5
 
 # homeassistant.components.touchline_sl
 pytouchlinesl==0.3.0
@@ -2490,9 +2524,6 @@ pytrafikverket==1.1.1
 # homeassistant.components.v2c
 pytrydan==0.8.0
 
-# homeassistant.components.usb
-pyudev==0.24.1
-
 # homeassistant.components.uptimerobot
 pyuptimerobot==22.2.0
 
@@ -2506,7 +2537,7 @@ pyvera==0.3.15
 pyversasense==0.0.6
 
 # homeassistant.components.vesync
-pyvesync==2.1.16
+pyvesync==2.1.18
 
 # homeassistant.components.vizio
 pyvizio==0.1.61
@@ -2533,7 +2564,7 @@ pywemo==1.4.0
 pywilight==0.0.74
 
 # homeassistant.components.wiz
-pywizlight==0.5.14
+pywizlight==0.6.2
 
 # homeassistant.components.wmspro
 pywmspro==0.2.1
@@ -2557,7 +2588,7 @@ pyzerproc==0.4.8
 qbittorrent-api==2024.2.59
 
 # homeassistant.components.qbus
-qbusmqttapi==1.2.3
+qbusmqttapi==1.3.0
 
 # homeassistant.components.qingping
 qingping-ble==0.10.0
@@ -2596,7 +2627,7 @@ renault-api==0.2.9
 renson-endura-delta==1.7.2
 
 # homeassistant.components.reolink
-reolink-aio==0.11.8
+reolink-aio==0.13.0
 
 # homeassistant.components.idteck_prox
 rfk101py==0.0.1
@@ -2623,7 +2654,7 @@ rokuecp==0.19.3
 romy==0.0.10
 
 # homeassistant.components.roomba
-roombapy==1.8.1
+roombapy==1.9.0
 
 # homeassistant.components.roon
 roonapi==0.1.6
@@ -2665,14 +2696,14 @@ screenlogicpy==0.10.0
 scsgate==0.1.0
 
 # homeassistant.components.backup
-securetar==2025.1.3
+securetar==2025.2.1
 
 # homeassistant.components.sendgrid
 sendgrid==6.8.2
 
 # homeassistant.components.emulated_kasa
 # homeassistant.components.sense
-sense-energy==0.13.4
+sense-energy==0.13.7
 
 # homeassistant.components.sensirion_ble
 sensirion-ble==0.1.1
@@ -2680,14 +2711,20 @@ sensirion-ble==0.1.1
 # homeassistant.components.sensorpro
 sensorpro-ble==0.5.3
 
+# homeassistant.components.sensorpush_cloud
+sensorpush-api==2.1.1
+
 # homeassistant.components.sensorpush
 sensorpush-ble==1.7.1
 
+# homeassistant.components.sensorpush_cloud
+sensorpush-ha==1.3.2
+
 # homeassistant.components.sensoterra
 sensoterra==2.0.1
 
 # homeassistant.components.sentry
-sentry-sdk==1.40.3
+sentry-sdk==1.45.1
 
 # homeassistant.components.sfr_box
 sfrbox-api==0.0.11
@@ -2728,14 +2765,11 @@ slixmpp==1.8.5
 # homeassistant.components.smart_meter_texas
 smart-meter-texas==0.5.5
 
-# homeassistant.components.smhi
-smhi-pkg==1.0.19
-
 # homeassistant.components.snapcast
 snapcast==2.3.6
 
 # homeassistant.components.sonos
-soco==0.30.6
+soco==0.30.9
 
 # homeassistant.components.solaredge_local
 solaredge-local==0.2.3
@@ -2783,7 +2817,7 @@ statsd==3.2.1
 steamodd==4.21
 
 # homeassistant.components.stookwijzer
-stookwijzer==1.5.1
+stookwijzer==1.6.1
 
 # homeassistant.components.streamlabswater
 streamlabswater==1.0.1
@@ -2847,7 +2881,7 @@ temperusb==1.6.1
 # homeassistant.components.tesla_fleet
 # homeassistant.components.teslemetry
 # homeassistant.components.tessie
-tesla-fleet-api==0.9.2
+tesla-fleet-api==1.0.16
 
 # homeassistant.components.powerwall
 tesla-powerwall==0.5.2
@@ -2856,7 +2890,7 @@ tesla-powerwall==0.5.2
 tesla-wall-connector==1.0.2
 
 # homeassistant.components.teslemetry
-teslemetry-stream==0.6.6
+teslemetry-stream==0.6.12
 
 # homeassistant.components.tessie
 tessie-api==0.1.1
@@ -2865,16 +2899,16 @@ tessie-api==0.1.1
 # tf-models-official==2.5.0
 
 # homeassistant.components.thermobeacon
-thermobeacon-ble==0.7.0
+thermobeacon-ble==0.8.1
 
 # homeassistant.components.thermopro
-thermopro-ble==0.10.1
+thermopro-ble==0.11.0
 
 # homeassistant.components.thingspeak
 thingspeak==1.0.0
 
 # homeassistant.components.lg_thinq
-thinqconnect==1.0.2
+thinqconnect==1.0.5
 
 # homeassistant.components.tikteck
 tikteck==0.4
@@ -2886,22 +2920,22 @@ tilt-ble==0.2.3
 tmb==0.0.4
 
 # homeassistant.components.todoist
-todoist-api-python==2.1.2
+todoist-api-python==2.1.7
 
 # homeassistant.components.tolo
-tololib==1.1.0
+tololib==1.2.2
 
 # homeassistant.components.toon
 toonapi==0.3.0
 
 # homeassistant.components.totalconnect
-total-connect-client==2024.12
+total-connect-client==2025.1.4
 
 # homeassistant.components.tplink_lte
 tp-connected==0.0.4
 
 # homeassistant.components.tplink_omada
-tplink-omada-client==1.4.3
+tplink-omada-client==1.4.4
 
 # homeassistant.components.transmission
 transmission-rpc==7.0.3
@@ -2928,13 +2962,13 @@ twilio==6.32.0
 twitchAPI==4.2.1
 
 # homeassistant.components.monarch_money
-typedmonarchmoney==0.3.1
+typedmonarchmoney==0.4.4
 
 # homeassistant.components.ukraine_alarm
 uasiren==0.0.1
 
 # homeassistant.components.unifiprotect
-uiprotect==7.5.0
+uiprotect==7.5.1
 
 # homeassistant.components.landisgyr_heat_meter
 ultraheat-api==0.5.7
@@ -2949,10 +2983,10 @@ unifi_ap==0.0.2
 unifiled==0.11
 
 # homeassistant.components.homeassistant_hardware
-universal-silabs-flasher==0.0.25
+universal-silabs-flasher==0.0.30
 
 # homeassistant.components.upb
-upb-lib==0.5.9
+upb-lib==0.6.1
 
 # homeassistant.components.upcloud
 upcloud-api==2.6.0
@@ -2975,7 +3009,7 @@ vallox-websocket-api==5.3.0
 vehicle==2.2.2
 
 # homeassistant.components.velbus
-velbus-aio==2025.1.1
+velbus-aio==2025.3.1
 
 # homeassistant.components.venstar
 venstarcolortouch==0.19
@@ -2984,7 +3018,7 @@ venstarcolortouch==0.19
 vilfo-api-client==0.5.0
 
 # homeassistant.components.voip
-voip-utils==0.2.2
+voip-utils==0.3.1
 
 # homeassistant.components.volkszaehler
 volkszaehler==0.4.0
@@ -3009,7 +3043,7 @@ vultr==0.1.2
 wakeonlan==2.1.0
 
 # homeassistant.components.wallbox
-wallbox==0.7.0
+wallbox==0.8.0
 
 # homeassistant.components.folder_watcher
 watchdog==6.0.0
@@ -3021,7 +3055,7 @@ waterfurnace==1.1.0
 watergate-local-api==2024.4.1
 
 # homeassistant.components.weatherflow_cloud
-weatherflow4py==1.0.6
+weatherflow4py==1.3.1
 
 # homeassistant.components.cisco_webex_teams
 webexpythonsdk==2.0.1
@@ -3033,10 +3067,10 @@ webio-api==0.1.11
 webmin-xmlrpc==0.0.2
 
 # homeassistant.components.weheat
-weheat==2025.1.15
+weheat==2025.2.26
 
 # homeassistant.components.whirlpool
-whirlpool-sixth-sense==0.18.11
+whirlpool-sixth-sense==0.19.1
 
 # homeassistant.components.whois
 whois==0.9.27
@@ -3051,7 +3085,7 @@ wirelesstagpy==0.8.1
 wled==0.21.0
 
 # homeassistant.components.wolflink
-wolf-comm==0.0.15
+wolf-comm==0.0.23
 
 # homeassistant.components.wyoming
 wyoming==1.5.4
@@ -3063,10 +3097,10 @@ xbox-webapi==2.1.0
 xiaomi-ble==0.33.0
 
 # homeassistant.components.knx
-xknx==3.4.0
+xknx==3.6.0
 
 # homeassistant.components.knx
-xknxproject==3.8.1
+xknxproject==3.8.2
 
 # homeassistant.components.fritz
 # homeassistant.components.rest
@@ -3084,20 +3118,20 @@ yalesmartalarmclient==0.4.3
 # homeassistant.components.august
 # homeassistant.components.yale
 # homeassistant.components.yalexs_ble
-yalexs-ble==2.5.6
+yalexs-ble==2.5.7
 
 # homeassistant.components.august
 # homeassistant.components.yale
 yalexs==8.10.0
 
 # homeassistant.components.yeelight
-yeelight==0.7.14
+yeelight==0.7.16
 
 # homeassistant.components.yeelightsunflower
 yeelightsunflower==0.0.10
 
 # homeassistant.components.yolink
-yolink-api==0.4.7
+yolink-api==0.4.9
 
 # homeassistant.components.youless
 youless-api==2.2.0
@@ -3106,7 +3140,7 @@ youless-api==2.2.0
 youtubeaio==1.1.5
 
 # homeassistant.components.media_extractor
-yt-dlp[default]==2025.01.15
+yt-dlp[default]==2025.03.26
 
 # homeassistant.components.zabbix
 zabbix-utils==2.0.2
@@ -3114,17 +3148,14 @@ zabbix-utils==2.0.2
 # homeassistant.components.zamg
 zamg==0.3.6
 
-# homeassistant.components.zengge
-zengge==0.2
-
 # homeassistant.components.zeroconf
-zeroconf==0.141.0
+zeroconf==0.146.0
 
 # homeassistant.components.zeversolar
 zeversolar==0.3.2
 
 # homeassistant.components.zha
-zha==0.0.45
+zha==0.0.54
 
 # homeassistant.components.zhong_hong
 zhong-hong-hvac==1.0.13
@@ -3136,7 +3167,7 @@ ziggo-mediabox-xl==1.1.0
 zm-py==0.5.4
 
 # homeassistant.components.zwave_js
-zwave-js-server-python==0.60.0
+zwave-js-server-python==0.62.0
 
 # homeassistant.components.zwave_me
 zwave-me-ws==0.4.3
diff --git a/requirements_test.txt b/requirements_test.txt
index 68945852298..c7bb9b11b87 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -7,49 +7,48 @@
 
 -c homeassistant/package_constraints.txt
 -r requirements_test_pre_commit.txt
-astroid==3.3.8
-coverage==7.6.8
+astroid==3.3.9
+coverage==7.6.12
 freezegun==1.5.1
-license-expression==30.4.0
+license-expression==30.4.1
 mock-open==1.4.0
-mypy-dev==1.15.0a2
+mypy-dev==1.16.0a7
 pre-commit==4.0.0
 pydantic==2.10.6
-pylint==3.3.3
-pylint-per-file-ignores==1.3.2
-pipdeptree==2.23.4
-pytest-asyncio==0.24.0
-pytest-aiohttp==1.0.5
+pylint==3.3.6
+pylint-per-file-ignores==1.4.0
+pipdeptree==2.25.1
+pytest-asyncio==0.26.0
+pytest-aiohttp==1.1.0
 pytest-cov==6.0.0
-pytest-freezer==0.4.8
-pytest-github-actions-annotate-failures==0.2.0
+pytest-freezer==0.4.9
+pytest-github-actions-annotate-failures==0.3.0
 pytest-socket==0.7.0
 pytest-sugar==1.0.0
 pytest-timeout==2.3.1
 pytest-unordered==0.6.1
-pytest-picked==0.5.0
+pytest-picked==0.5.1
 pytest-xdist==3.6.1
-pytest==8.3.4
+pytest==8.3.5
 requests-mock==1.12.1
 respx==0.22.0
-syrupy==4.8.0
-tqdm==4.66.5
+syrupy==4.8.1
+tqdm==4.67.1
 types-aiofiles==24.1.0.20241221
 types-atomicwrites==1.4.5.1
 types-croniter==5.0.1.20241205
-types-beautifulsoup4==4.12.0.20241020
+types-beautifulsoup4==4.12.0.20250204
 types-caldav==1.3.0.20241107
 types-chardet==0.1.5
-types-decorator==5.1.8.20240310
-types-paho-mqtt==1.6.0.20240321
+types-decorator==5.1.8.20250121
 types-pexpect==4.9.0.20241208
 types-pillow==10.2.0.20240822
 types-protobuf==5.29.1.20241207
 types-psutil==6.1.0.20241221
-types-pyserial==3.5.0.20241221
+types-pyserial==3.5.0.20250130
 types-python-dateutil==2.9.0.20241206
 types-python-slugify==8.0.2.20240310
-types-pytz==2024.2.0.20241221
+types-pytz==2025.1.0.20250204
 types-PyYAML==6.0.12.20241230
 types-requests==2.31.0.3
 types-xmltodict==0.13.0.3
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index dde87698b6b..24c14f1ca89 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -7,7 +7,7 @@
 AEMET-OpenData==0.6.4
 
 # homeassistant.components.honeywell
-AIOSomecomfort==0.0.30
+AIOSomecomfort==0.0.32
 
 # homeassistant.components.adax
 Adax-local==0.1.5
@@ -19,10 +19,10 @@ DoorBirdPy==3.0.8
 HAP-python==4.9.2
 
 # homeassistant.components.tasmota
-HATasmota==0.9.2
+HATasmota==0.10.0
 
 # homeassistant.components.mastodon
-Mastodon.py==1.8.1
+Mastodon.py==2.0.1
 
 # homeassistant.components.doods
 # homeassistant.components.generic
@@ -42,7 +42,7 @@ PlexAPI==4.15.16
 ProgettiHWSW==0.1.3
 
 # homeassistant.components.cast
-PyChromecast==14.0.5
+PyChromecast==14.0.7
 
 # homeassistant.components.flick_electric
 PyFlick==1.1.3
@@ -51,10 +51,10 @@ PyFlick==1.1.3
 PyFlume==0.6.5
 
 # homeassistant.components.fronius
-PyFronius==0.7.3
+PyFronius==0.7.7
 
 # homeassistant.components.pyload
-PyLoadAPI==1.3.2
+PyLoadAPI==1.4.2
 
 # homeassistant.components.met_eireann
 PyMetEireann==2024.11.0
@@ -81,7 +81,7 @@ PyQRCode==1.2.1
 PyRMVtransport==0.3.3
 
 # homeassistant.components.switchbot
-PySwitchbot==0.55.4
+PySwitchbot==0.58.0
 
 # homeassistant.components.syncthru
 PySyncThru==0.8.0
@@ -94,7 +94,7 @@ PyTransportNSW==0.1.1
 PyTurboJPEG==1.7.5
 
 # homeassistant.components.vicare
-PyViCare==2.41.0
+PyViCare==2.43.1
 
 # homeassistant.components.xiaomi_aqara
 PyXiaomiGateway==0.14.3
@@ -103,14 +103,14 @@ PyXiaomiGateway==0.14.3
 RachioPy==1.1.0
 
 # homeassistant.components.python_script
-RestrictedPython==7.4
+RestrictedPython==8.0
 
 # homeassistant.components.remember_the_milk
 RtmAPI==0.7.2
 
 # homeassistant.components.recorder
 # homeassistant.components.sql
-SQLAlchemy==2.0.36
+SQLAlchemy==2.0.39
 
 # homeassistant.components.tami4
 Tami4EdgeAPI==3.0
@@ -119,7 +119,7 @@ Tami4EdgeAPI==3.0
 WSDiscovery==2.1.2
 
 # homeassistant.components.accuweather
-accuweather==4.0.0
+accuweather==4.2.0
 
 # homeassistant.components.adax
 adax==0.4.0
@@ -128,7 +128,7 @@ adax==0.4.0
 adb-shell[async]==0.4.4
 
 # homeassistant.components.alarmdecoder
-adext==0.4.3
+adext==0.4.4
 
 # homeassistant.components.adguard
 adguardhome==0.7.0
@@ -164,10 +164,10 @@ aio-georss-gdacs==0.10
 aioacaia==0.1.14
 
 # homeassistant.components.airq
-aioairq==0.4.3
+aioairq==0.4.4
 
 # homeassistant.components.airzone_cloud
-aioairzone-cloud==0.6.10
+aioairzone-cloud==0.6.11
 
 # homeassistant.components.airzone
 aioairzone==0.9.9
@@ -189,7 +189,7 @@ aioaseko==1.0.0
 aioasuswrt==1.4.0
 
 # homeassistant.components.husqvarna_automower
-aioautomower==2025.1.1
+aioautomower==2025.3.2
 
 # homeassistant.components.azure_devops
 aioazuredevops==2.2.1
@@ -198,16 +198,16 @@ aioazuredevops==2.2.1
 aiobafi6==0.9.0
 
 # homeassistant.components.aws
-aiobotocore==2.13.1
+aiobotocore==2.21.1
 
 # homeassistant.components.comelit
-aiocomelit==0.10.1
+aiocomelit==0.11.3
 
 # homeassistant.components.dhcp
-aiodhcpwatcher==1.0.2
+aiodhcpwatcher==1.1.1
 
 # homeassistant.components.dhcp
-aiodiscover==2.1.0
+aiodiscover==2.6.1
 
 # homeassistant.components.dnsip
 aiodns==3.2.0
@@ -222,7 +222,7 @@ aioeafm==0.1.2
 aioeagle==1.1.0
 
 # homeassistant.components.ecowitt
-aioecowitt==2024.2.1
+aioecowitt==2025.3.1
 
 # homeassistant.components.co2signal
 aioelectricitymaps==0.4.0
@@ -231,7 +231,7 @@ aioelectricitymaps==0.4.0
 aioemonitor==1.0.5
 
 # homeassistant.components.esphome
-aioesphomeapi==28.0.1
+aioesphomeapi==29.7.0
 
 # homeassistant.components.flo
 aioflo==2021.11.0
@@ -243,22 +243,25 @@ aiogithubapi==24.6.0
 aioguardian==2022.07.0
 
 # homeassistant.components.harmony
-aioharmony==0.4.1
+aioharmony==0.5.2
 
 # homeassistant.components.hassio
-aiohasupervisor==0.2.2b5
+aiohasupervisor==0.3.0
+
+# homeassistant.components.home_connect
+aiohomeconnect==0.16.3
 
 # homeassistant.components.homekit_controller
-aiohomekit==3.2.7
+aiohomekit==3.2.8
 
 # homeassistant.components.mcp_server
 aiohttp_sse==2.2.0
 
 # homeassistant.components.hue
-aiohue==4.7.3
+aiohue==4.7.4
 
 # homeassistant.components.imap
-aioimaplib==2.0.0
+aioimaplib==2.0.1
 
 # homeassistant.components.apache_kafka
 aiokafka==0.10.0
@@ -270,7 +273,7 @@ aiolifx-effects==0.3.2
 aiolifx-themes==0.6.4
 
 # homeassistant.components.lifx
-aiolifx==1.1.2
+aiolifx==1.1.4
 
 # homeassistant.components.lookin
 aiolookin==1.0.0
@@ -294,10 +297,10 @@ aionanoleaf==0.2.1
 aionotion==2024.03.0
 
 # homeassistant.components.nut
-aionut==4.3.3
+aionut==4.3.4
 
 # homeassistant.components.oncue
-aiooncue==0.3.7
+aiooncue==0.3.9
 
 # homeassistant.components.openexchangerates
 aioopenexchangerates==0.6.8
@@ -350,7 +353,7 @@ aioruuvigateway==0.1.0
 aiosenz==1.0.0
 
 # homeassistant.components.shelly
-aioshelly==12.3.1
+aioshelly==13.4.0
 
 # homeassistant.components.skybell
 aioskybell==22.7.0
@@ -362,10 +365,10 @@ aioslimproto==3.0.0
 aiosolaredge==0.2.0
 
 # homeassistant.components.steamist
-aiosteamist==1.0.0
+aiosteamist==1.0.1
 
 # homeassistant.components.cambridge_audio
-aiostreammagic==2.10.0
+aiostreammagic==2.11.0
 
 # homeassistant.components.switcher_kis
 aioswitcher==6.0.0
@@ -383,7 +386,10 @@ aiotedee==0.2.20
 aiotractive==0.6.0
 
 # homeassistant.components.unifi
-aiounifi==81
+aiounifi==83
+
+# homeassistant.components.usb
+aiousbwatcher==1.1.1
 
 # homeassistant.components.vlc_telnet
 aiovlc==0.5.1
@@ -397,17 +403,20 @@ aiowaqi==3.1.0
 # homeassistant.components.watttime
 aiowatttime==0.1.1
 
+# homeassistant.components.webdav
+aiowebdav2==0.4.3
+
 # homeassistant.components.webostv
-aiowebostv==0.6.0
+aiowebostv==0.7.3
 
 # homeassistant.components.withings
-aiowithings==3.1.5
+aiowithings==3.1.6
 
 # homeassistant.components.yandex_transport
 aioymaps==1.2.5
 
 # homeassistant.components.airgradient
-airgradient==0.9.1
+airgradient==0.9.2
 
 # homeassistant.components.airly
 airly==1.1.0
@@ -431,7 +440,7 @@ amberelectric==2.0.12
 androidtv[async]==0.0.75
 
 # homeassistant.components.androidtv_remote
-androidtvremote2==0.1.2
+androidtvremote2==0.2.1
 
 # homeassistant.components.anova
 anova-wifi==0.17.0
@@ -440,10 +449,10 @@ anova-wifi==0.17.0
 anthemav==1.4.1
 
 # homeassistant.components.anthropic
-anthropic==0.44.0
+anthropic==0.47.2
 
 # homeassistant.components.mcp_server
-anyio==4.8.0
+anyio==4.9.0
 
 # homeassistant.components.weatherkit
 apple_weatherkit==1.1.3
@@ -458,10 +467,10 @@ aprslib==0.7.2
 apsystems-ez1==2.4.0
 
 # homeassistant.components.aranet
-aranet4==2.5.0
+aranet4==2.5.1
 
 # homeassistant.components.arcam_fmj
-arcam-fmj==1.5.2
+arcam-fmj==1.8.1
 
 # homeassistant.components.dlna_dmr
 # homeassistant.components.dlna_dms
@@ -497,7 +506,7 @@ av==13.1.0
 axis==64
 
 # homeassistant.components.fujitsu_fglair
-ayla-iot-unofficial==1.4.5
+ayla-iot-unofficial==1.4.7
 
 # homeassistant.components.azure_event_hub
 azure-eventhub==5.11.1
@@ -508,6 +517,9 @@ azure-kusto-data[aio]==4.5.1
 # homeassistant.components.azure_data_explorer
 azure-kusto-ingest==4.5.1
 
+# homeassistant.components.azure_storage
+azure-storage-blob==12.24.0
+
 # homeassistant.components.holiday
 babel==2.15.0
 
@@ -522,10 +534,10 @@ bimmer-connected[china]==0.17.2
 
 # homeassistant.components.eq3btsmart
 # homeassistant.components.esphome
-bleak-esphome==2.1.1
+bleak-esphome==2.12.0
 
 # homeassistant.components.bluetooth
-bleak-retry-connector==3.8.0
+bleak-retry-connector==3.9.0
 
 # homeassistant.components.bluetooth
 bleak==0.22.3
@@ -543,28 +555,31 @@ bluecurrent-api==1.2.3
 bluemaestro-ble==0.2.3
 
 # homeassistant.components.bluetooth
-bluetooth-adapters==0.21.1
+bluetooth-adapters==0.21.4
 
 # homeassistant.components.bluetooth
-bluetooth-auto-recovery==1.4.2
+bluetooth-auto-recovery==1.4.5
 
 # homeassistant.components.bluetooth
 # homeassistant.components.ld2410_ble
 # homeassistant.components.led_ble
 # homeassistant.components.private_ble_device
-bluetooth-data-tools==1.22.0
+bluetooth-data-tools==1.26.1
 
 # homeassistant.components.bond
 bond-async==0.2.1
 
+# homeassistant.components.bosch_alarm
+bosch-alarm-mode2==0.4.3
+
 # homeassistant.components.bosch_shc
 boschshcpy==0.2.91
 
 # homeassistant.components.aws
-botocore==1.34.131
+botocore==1.37.1
 
 # homeassistant.components.bring
-bring-api==0.9.1
+bring-api==1.1.0
 
 # homeassistant.components.broadlink
 broadlink==0.19.0
@@ -579,13 +594,13 @@ brottsplatskartan==1.0.5
 brunt==1.2.0
 
 # homeassistant.components.bthome
-bthome-ble==3.9.1
+bthome-ble==3.12.4
 
 # homeassistant.components.buienradar
 buienradar==1.0.6
 
 # homeassistant.components.dhcp
-cached-ipaddress==0.8.0
+cached-ipaddress==0.10.0
 
 # homeassistant.components.caldav
 caldav==1.3.9
@@ -628,13 +643,13 @@ datadog==0.15.0
 datapoint==0.9.9
 
 # homeassistant.components.bluetooth
-dbus-fast==2.30.2
+dbus-fast==2.43.0
 
 # homeassistant.components.debugpy
-debugpy==1.8.11
+debugpy==1.8.13
 
 # homeassistant.components.ecovacs
-deebot-client==11.0.0
+deebot-client==12.4.0
 
 # homeassistant.components.ihc
 # homeassistant.components.namecheapdns
@@ -666,7 +681,7 @@ dio-chacon-wifi-api==1.2.1
 directv==0.4.0
 
 # homeassistant.components.steamist
-discovery30303==0.3.2
+discovery30303==0.3.3
 
 # homeassistant.components.dremel_3d_printer
 dremel3dpy==2.1.1
@@ -693,10 +708,10 @@ eagle100==0.1.1
 easyenergy==2.1.2
 
 # homeassistant.components.eheimdigital
-eheimdigital==1.0.5
+eheimdigital==1.0.6
 
 # homeassistant.components.electric_kiwi
-electrickiwi-api==0.8.5
+electrickiwi-api==0.9.14
 
 # homeassistant.components.elevenlabs
 elevenlabs==1.9.0
@@ -726,7 +741,7 @@ energyzero==2.1.1
 enocean==0.50
 
 # homeassistant.components.environment_canada
-env-canada==0.7.2
+env-canada==0.8.0
 
 # homeassistant.components.season
 ephem==4.1.6
@@ -753,7 +768,7 @@ eternalegypt==0.0.16
 eufylife-ble-client==0.1.8
 
 # homeassistant.components.evohome
-evohome-async==0.4.21
+evohome-async==1.0.4
 
 # homeassistant.components.bryant_evolution
 evolutionhttp==0.0.18
@@ -783,17 +798,17 @@ fivem-api==0.1.2
 fjaraskupan==2.3.2
 
 # homeassistant.components.flexit_bacnet
-flexit_bacnet==2.2.1
+flexit_bacnet==2.2.3
 
 # homeassistant.components.flipr
 flipr-api==1.6.1
 
 # homeassistant.components.flux_led
-flux-led==1.1.0
+flux-led==1.1.3
 
 # homeassistant.components.homekit
 # homeassistant.components.recorder
-fnv-hash-fast==1.2.2
+fnv-hash-fast==1.4.0
 
 # homeassistant.components.foobot
 foobot_async==1.0.0
@@ -809,16 +824,16 @@ freebox-api==1.2.2
 fritzconnection[qr]==1.14.0
 
 # homeassistant.components.fyta
-fyta_cli==0.7.0
+fyta_cli==0.7.2
 
 # homeassistant.components.google_translate
 gTTS==2.5.3
 
 # homeassistant.components.gardena_bluetooth
-gardena-bluetooth==1.5.0
+gardena-bluetooth==1.6.0
 
 # homeassistant.components.google_assistant_sdk
-gassist-text==0.0.11
+gassist-text==0.0.12
 
 # homeassistant.components.google
 gcal-sync==7.0.0
@@ -827,7 +842,7 @@ gcal-sync==7.0.0
 geniushub-client==0.7.1
 
 # homeassistant.components.geocaching
-geocachingapi==0.2.1
+geocachingapi==0.3.0
 
 # homeassistant.components.aprs
 geopy==2.3.0
@@ -849,7 +864,7 @@ georss-qld-bushfire-alert-client==0.8
 getmac==0.9.5
 
 # homeassistant.components.gios
-gios==5.0.0
+gios==6.0.0
 
 # homeassistant.components.glances
 glances-api==0.8.0
@@ -868,7 +883,7 @@ goodwe==0.3.6
 google-api-python-client==2.71.0
 
 # homeassistant.components.google_pubsub
-google-cloud-pubsub==2.23.0
+google-cloud-pubsub==2.29.0
 
 # homeassistant.components.google_cloud
 google-cloud-speech==2.27.0
@@ -877,10 +892,10 @@ google-cloud-speech==2.27.0
 google-cloud-texttospeech==2.17.2
 
 # homeassistant.components.google_generative_ai_conversation
-google-generativeai==0.8.2
+google-genai==1.7.0
 
 # homeassistant.components.nest
-google-nest-sdm==7.0.0
+google-nest-sdm==7.1.4
 
 # homeassistant.components.google_photos
 google-photos-library-api==0.12.1
@@ -896,10 +911,10 @@ goslide-api==0.7.0
 gotailwind==0.3.0
 
 # homeassistant.components.govee_ble
-govee-ble==0.42.0
+govee-ble==0.43.1
 
 # homeassistant.components.govee_light_local
-govee-local-api==1.5.3
+govee-local-api==2.1.0
 
 # homeassistant.components.gpsd
 gps3==0.33.3
@@ -935,19 +950,19 @@ ha-iotawattpy==0.1.2
 ha-philipsjs==3.2.2
 
 # homeassistant.components.habitica
-habiticalib==0.3.3
+habiticalib==0.3.7
 
 # homeassistant.components.bluetooth
-habluetooth==3.12.0
+habluetooth==3.37.0
 
 # homeassistant.components.cloud
-hass-nabucasa==0.88.1
+hass-nabucasa==0.94.0
 
 # homeassistant.components.conversation
-hassil==2.1.0
+hassil==2.2.3
 
 # homeassistant.components.jewish_calendar
-hdate==0.11.1
+hdate[astral]==1.0.3
 
 # homeassistant.components.here_travel_time
 here-routing==1.0.1
@@ -966,19 +981,16 @@ hole==0.8.0
 
 # homeassistant.components.holiday
 # homeassistant.components.workday
-holidays==0.65
+holidays==0.69
 
 # homeassistant.components.frontend
-home-assistant-frontend==20250109.2
+home-assistant-frontend==20250327.0
 
 # homeassistant.components.conversation
-home-assistant-intents==2025.1.1
-
-# homeassistant.components.home_connect
-homeconnect==0.8.0
+home-assistant-intents==2025.3.24
 
 # homeassistant.components.homematicip_cloud
-homematicip==1.1.6
+homematicip==1.1.7
 
 # homeassistant.components.remember_the_milk
 httplib2==0.20.4
@@ -1001,7 +1013,8 @@ ibeacon-ble==1.2.0
 # homeassistant.components.google
 # homeassistant.components.local_calendar
 # homeassistant.components.local_todo
-ical==8.3.0
+# homeassistant.components.remote_calendar
+ical==9.0.1
 
 # homeassistant.components.caldav
 icalendar==6.1.0
@@ -1016,10 +1029,10 @@ idasen-ha==2.6.3
 ifaddr==0.2.0
 
 # homeassistant.components.igloohome
-igloohome-api==0.0.6
+igloohome-api==0.1.0
 
 # homeassistant.components.imgw_pib
-imgw_pib==1.0.9
+imgw_pib==1.0.10
 
 # homeassistant.components.incomfort
 incomfort-client==0.6.7
@@ -1031,7 +1044,7 @@ influxdb-client==1.24.0
 influxdb==5.3.1
 
 # homeassistant.components.inkbird
-inkbird-ble==0.5.8
+inkbird-ble==0.9.0
 
 # homeassistant.components.insteon
 insteon-frontend-home-assistant==0.5.0
@@ -1039,6 +1052,9 @@ insteon-frontend-home-assistant==0.5.0
 # homeassistant.components.intellifire
 intellifire4py==4.1.9
 
+# homeassistant.components.iometer
+iometer==0.1.0
+
 # homeassistant.components.iotty
 iottycloud==0.3.0
 
@@ -1046,7 +1062,7 @@ iottycloud==0.3.0
 isal==1.7.1
 
 # homeassistant.components.gogogate2
-ismartgate==5.0.1
+ismartgate==5.0.2
 
 # homeassistant.components.israel_rail
 israel-rail-api==0.1.2
@@ -1055,7 +1071,7 @@ israel-rail-api==0.1.2
 jaraco.abode==6.2.1
 
 # homeassistant.components.jellyfin
-jellyfin-apiclient-python==1.9.2
+jellyfin-apiclient-python==1.10.0
 
 # homeassistant.components.command_line
 # homeassistant.components.rest
@@ -1071,7 +1087,7 @@ kegtron-ble==0.4.0
 knocki==0.4.2
 
 # homeassistant.components.knx
-knx-frontend==2025.1.18.164225
+knx-frontend==2025.3.8.214559
 
 # homeassistant.components.konnected
 konnected==1.2.0
@@ -1080,7 +1096,7 @@ konnected==1.2.0
 krakenex==2.2.2
 
 # homeassistant.components.lacrosse_view
-lacrosse-view==1.0.3
+lacrosse-view==1.1.1
 
 # homeassistant.components.laundrify
 laundrify-aio==1.2.2
@@ -1095,13 +1111,13 @@ ld2410-ble==0.1.1
 leaone-ble==0.1.0
 
 # homeassistant.components.led_ble
-led-ble==1.1.4
+led-ble==1.1.6
 
 # homeassistant.components.lektrico
 lektricowifi==0.0.43
 
 # homeassistant.components.letpot
-letpot==0.3.0
+letpot==0.4.0
 
 # homeassistant.components.foscam
 libpyfoscam==1.2.2
@@ -1142,8 +1158,9 @@ maxcube-api==0.4.3
 # homeassistant.components.mythicbeastsdns
 mbddns==0.1.2
 
+# homeassistant.components.mcp
 # homeassistant.components.mcp_server
-mcp==1.1.2
+mcp==1.5.0
 
 # homeassistant.components.minecraft_server
 mcstatus==11.1.1
@@ -1158,7 +1175,7 @@ medcom-ble==0.1.1
 melnor-bluetooth==0.0.25
 
 # homeassistant.components.meteo_france
-meteofrance-api==1.3.0
+meteofrance-api==1.4.0
 
 # homeassistant.components.mfi
 mficlient==0.5.0
@@ -1173,7 +1190,7 @@ microBeesPy==0.3.5
 mill-local==0.3.0
 
 # homeassistant.components.mill
-millheater==0.12.2
+millheater==0.12.3
 
 # homeassistant.components.minio
 minio==7.1.12
@@ -1182,7 +1199,7 @@ minio==7.1.12
 moat-ble==0.1.1
 
 # homeassistant.components.moehlenhoff_alpha2
-moehlenhoff-alpha2==1.3.1
+moehlenhoff-alpha2==1.4.0
 
 # homeassistant.components.monzo
 monzopy==1.4.2
@@ -1191,7 +1208,7 @@ monzopy==1.4.2
 mopeka-iot-ble==0.8.0
 
 # homeassistant.components.motion_blinds
-motionblinds==0.6.25
+motionblinds==0.6.26
 
 # homeassistant.components.motionblinds_ble
 motionblindsble==0.1.3
@@ -1206,7 +1223,7 @@ mozart-api==4.1.1.116.4
 mullvad-api==1.0.0
 
 # homeassistant.components.music_assistant
-music-assistant-client==1.0.8
+music-assistant-client==1.1.1
 
 # homeassistant.components.tts
 mutagen==1.47.0
@@ -1230,10 +1247,10 @@ nessclient==1.1.2
 netmap==0.7.0.2
 
 # homeassistant.components.nam
-nettigo-air-monitor==4.0.0
+nettigo-air-monitor==4.1.0
 
 # homeassistant.components.nexia
-nexia==2.0.8
+nexia==2.4.0
 
 # homeassistant.components.nextcloud
 nextcloudmonitor==1.5.1
@@ -1245,13 +1262,13 @@ nextcord==2.6.0
 nextdns==4.0.0
 
 # homeassistant.components.niko_home_control
-nhc==0.3.9
+nhc==0.4.10
 
 # homeassistant.components.nibe_heatpump
-nibe==2.14.0
+nibe==2.17.0
 
 # homeassistant.components.nice_go
-nice-go==1.0.0
+nice-go==1.0.1
 
 # homeassistant.components.nfandroidtv
 notifications-android-tv==0.1.5
@@ -1288,7 +1305,7 @@ objgraph==3.5.0
 odp-amsterdam==6.0.2
 
 # homeassistant.components.ohme
-ohme==1.2.5
+ohme==1.4.1
 
 # homeassistant.components.ollama
 ollama==0.4.7
@@ -1299,6 +1316,9 @@ omnilogic==0.4.5
 # homeassistant.components.ondilo_ico
 ondilo==0.5.0
 
+# homeassistant.components.onedrive
+onedrive-personal-sdk==0.0.13
+
 # homeassistant.components.onvif
 onvif-zeep-async==3.2.5
 
@@ -1309,7 +1329,7 @@ open-garage==0.2.0
 open-meteo==0.3.2
 
 # homeassistant.components.openai_conversation
-openai==1.59.9
+openai==1.68.2
 
 # homeassistant.components.openerz
 openerz-api==0.3.0
@@ -1321,7 +1341,7 @@ openhomedevice==2.2.0
 openwebifpy==4.3.1
 
 # homeassistant.components.opower
-opower==0.8.7
+opower==0.9.0
 
 # homeassistant.components.oralb
 oralb-ble==0.17.6
@@ -1336,7 +1356,7 @@ ovoenergy==2.0.0
 p1monitor==3.1.0
 
 # homeassistant.components.mqtt
-paho-mqtt==1.6.1
+paho-mqtt==2.1.0
 
 # homeassistant.components.panasonic_viera
 panasonic-viera==0.4.2
@@ -1348,7 +1368,7 @@ pdunehd==1.3.2
 peblar==0.4.0
 
 # homeassistant.components.peco
-peco==0.0.30
+peco==0.1.2
 
 # homeassistant.components.escea
 pescea==1.0.12
@@ -1366,7 +1386,7 @@ plexauth==0.0.6
 plexwebsocket==0.0.14
 
 # homeassistant.components.plugwise
-plugwise==1.6.4
+plugwise==1.7.2
 
 # homeassistant.components.plum_lightpad
 plumlightpad==0.0.11
@@ -1392,7 +1412,7 @@ prometheus-client==0.21.0
 psutil-home-assistant==0.0.1
 
 # homeassistant.components.systemmonitor
-psutil==6.1.1
+psutil==7.0.0
 
 # homeassistant.components.pushbullet
 pushbullet.py==0.11.0
@@ -1415,6 +1435,9 @@ py-ccm15==0.0.9
 # homeassistant.components.cpuspeed
 py-cpuinfo==9.0.0
 
+# homeassistant.components.pterodactyl
+py-dactyl==2.0.4
+
 # homeassistant.components.dormakaba_dkey
 py-dormakaba-dkey==1.0.5
 
@@ -1437,7 +1460,7 @@ py-nightscout==1.2.2
 py-sucks==0.9.10
 
 # homeassistant.components.synology_dsm
-py-synologydsm-api==2.6.0
+py-synologydsm-api==2.7.1
 
 # homeassistant.components.hdmi_cec
 pyCEC==0.5.2
@@ -1452,7 +1475,7 @@ pyDuotecno==2024.10.1
 pyElectra==1.2.4
 
 # homeassistant.components.homee
-pyHomee==1.2.3
+pyHomee==1.2.8
 
 # homeassistant.components.rfxtrx
 pyRFXtrx==0.31.1
@@ -1477,7 +1500,7 @@ pyairnow==1.2.1
 pyairvisual==2023.08.1
 
 # homeassistant.components.aprilaire
-pyaprilaire==0.7.7
+pyaprilaire==0.8.1
 
 # homeassistant.components.asuswrt
 pyasuswrt==0.1.21
@@ -1495,7 +1518,7 @@ pyatv==0.16.0
 pyaussiebb==0.1.5
 
 # homeassistant.components.balboa
-pybalboa==1.0.2
+pybalboa==1.1.3
 
 # homeassistant.components.blackbird
 pyblackbird==0.6
@@ -1504,7 +1527,7 @@ pyblackbird==0.6
 pyblu==2.0.0
 
 # homeassistant.components.neato
-pybotvac==0.0.25
+pybotvac==0.0.26
 
 # homeassistant.components.braviatv
 pybravia==0.3.4
@@ -1525,13 +1548,13 @@ pycountry==24.6.1
 pycsspeechtts==1.0.8
 
 # homeassistant.components.daikin
-pydaikin==2.13.8
+pydaikin==2.14.1
 
 # homeassistant.components.deako
 pydeako==0.6.0
 
 # homeassistant.components.deconz
-pydeconz==118
+pydeconz==120
 
 # homeassistant.components.dexcom
 pydexcom==0.2.3
@@ -1540,7 +1563,7 @@ pydexcom==0.2.3
 pydiscovergy==3.0.2
 
 # homeassistant.components.hydrawise
-pydrawise==2025.1.0
+pydrawise==2025.3.0
 
 # homeassistant.components.android_ip_webcam
 pydroid-ipcam==2.0.0
@@ -1549,7 +1572,7 @@ pydroid-ipcam==2.0.0
 pyecoforest==0.4.0
 
 # homeassistant.components.econet
-pyeconet==0.1.23
+pyeconet==0.1.28
 
 # homeassistant.components.ista_ecotrend
 pyecotrend-ista==3.3.1
@@ -1567,7 +1590,7 @@ pyeiscp==0.0.7
 pyemoncms==0.1.1
 
 # homeassistant.components.enphase_envoy
-pyenphase==1.23.1
+pyenphase==1.25.1
 
 # homeassistant.components.everlights
 pyeverlights==0.1.0
@@ -1579,13 +1602,13 @@ pyevilgenius==2.0.0
 pyezviz==0.2.1.2
 
 # homeassistant.components.fibaro
-pyfibaro==0.8.0
+pyfibaro==0.8.2
 
 # homeassistant.components.fido
 pyfido==2.1.2
 
 # homeassistant.components.fireservicerota
-pyfireservicerota==0.0.43
+pyfireservicerota==0.0.46
 
 # homeassistant.components.flic
 pyflic==2.0.4
@@ -1597,7 +1620,7 @@ pyforked-daapd==0.1.14
 pyfreedompro==1.1.0
 
 # homeassistant.components.fritzbox
-pyfritzhome==0.6.12
+pyfritzhome==0.6.17
 
 # homeassistant.components.ifttt
 pyfttt==0.3
@@ -1609,10 +1632,10 @@ pygti==0.9.4
 pyhaversion==22.8.0
 
 # homeassistant.components.heos
-pyheos==1.0.0
+pyheos==1.0.4
 
 # homeassistant.components.hive
-pyhive-integration==1.0.1
+pyhive-integration==1.0.2
 
 # homeassistant.components.homematic
 pyhomematic==0.1.77
@@ -1630,7 +1653,7 @@ pyicloud==1.0.0
 pyinsteon==1.6.3
 
 # homeassistant.components.ipma
-pyipma==3.0.8
+pyipma==3.0.9
 
 # homeassistant.components.ipp
 pyipp==0.17.0
@@ -1639,7 +1662,7 @@ pyipp==0.17.0
 pyiqvia==2022.04.0
 
 # homeassistant.components.iskra
-pyiskra==0.1.14
+pyiskra==0.1.15
 
 # homeassistant.components.iss
 pyiss==1.0.1
@@ -1675,7 +1698,7 @@ pykrakenapi==0.1.8
 pykulersky==0.5.2
 
 # homeassistant.components.lamarzocco
-pylamarzocco==1.4.6
+pylamarzocco==1.4.9
 
 # homeassistant.components.lastfm
 pylast==5.1.0
@@ -1696,7 +1719,7 @@ pylitejet==0.6.3
 pylitterbot==2024.0.0
 
 # homeassistant.components.lutron_caseta
-pylutron-caseta==0.23.0
+pylutron-caseta==0.24.0
 
 # homeassistant.components.lutron
 pylutron==0.2.16
@@ -1729,7 +1752,7 @@ pymonoprice==0.4
 pymysensors==0.24.0
 
 # homeassistant.components.iron_os
-pynecil==4.0.1
+pynecil==4.1.0
 
 # homeassistant.components.netgear
 pynetgear==0.10.10
@@ -1762,7 +1785,7 @@ pyoctoprintapi==0.1.12
 pyopenuv==2023.02.0
 
 # homeassistant.components.openweathermap
-pyopenweathermap==0.2.1
+pyopenweathermap==0.2.2
 
 # homeassistant.components.opnsense
 pyopnsense==0.4.0
@@ -1779,7 +1802,7 @@ pyotgw==2.2.2
 pyotp==2.8.0
 
 # homeassistant.components.overkiz
-pyoverkiz==1.15.5
+pyoverkiz==1.16.5
 
 # homeassistant.components.onewire
 pyownet==0.10.0.post1
@@ -1788,7 +1811,10 @@ pyownet==0.10.0.post1
 pypalazzetti==0.1.19
 
 # homeassistant.components.lcn
-pypck==0.8.3
+pypck==0.8.5
+
+# homeassistant.components.pglab
+pypglab==0.0.3
 
 # homeassistant.components.pjlink
 pypjlink2==1.2.1
@@ -1803,7 +1829,7 @@ pypoint==3.0.0
 pyprof2calltree==1.4.5
 
 # homeassistant.components.prosegur
-pyprosegur==0.0.9
+pyprosegur==0.0.14
 
 # homeassistant.components.prusalink
 pyprusalink==2.1.1
@@ -1815,13 +1841,13 @@ pyps4-2ndscreen==1.3.1
 pyqwikswitch==0.93
 
 # homeassistant.components.nmbs
-pyrail==0.0.3
+pyrail==0.4.1
 
 # homeassistant.components.rainbird
 pyrainbird==6.0.1
 
 # homeassistant.components.risco
-pyrisco==0.6.5
+pyrisco==0.6.7
 
 # homeassistant.components.rituals_perfume_genie
 pyrituals==0.0.6
@@ -1830,7 +1856,7 @@ pyrituals==0.0.6
 pyroute2==0.7.5
 
 # homeassistant.components.rympro
-pyrympro==0.0.8
+pyrympro==0.0.9
 
 # homeassistant.components.sabnzbd
 pysabnzbd==1.1.1
@@ -1848,7 +1874,7 @@ pysensibo==1.1.0
 pyserial==3.5
 
 # homeassistant.components.seventeentrack
-pyseventeentrack==1.0.1
+pyseventeentrack==1.0.2
 
 # homeassistant.components.sia
 pysiaalarm==3.1.1
@@ -1863,19 +1889,19 @@ pysma==0.7.5
 pysmappee==0.2.29
 
 # homeassistant.components.smartthings
-pysmartapp==0.3.5
-
-# homeassistant.components.smartthings
-pysmartthings==0.7.8
+pysmartthings==3.0.0
 
 # homeassistant.components.smarty
-pysmarty2==0.10.1
+pysmarty2==0.10.2
+
+# homeassistant.components.smhi
+pysmhi==1.0.0
 
 # homeassistant.components.edl21
 pysml==0.0.12
 
 # homeassistant.components.smlight
-pysmlight==0.1.6
+pysmlight==0.2.4
 
 # homeassistant.components.snmp
 pysnmp==6.2.6
@@ -1893,10 +1919,10 @@ pyspcwebgw==0.7.0
 pyspeex-noise==1.0.2
 
 # homeassistant.components.squeezebox
-pysqueezebox==0.11.1
+pysqueezebox==0.12.0
 
 # homeassistant.components.suez_water
-pysuezV2==2.0.3
+pysuezV2==2.0.4
 
 # homeassistant.components.switchbee
 pyswitchbee==1.8.3
@@ -1905,7 +1931,7 @@ pyswitchbee==1.8.3
 pytautulli==23.1.1
 
 # homeassistant.components.motionmount
-python-MotionMount==2.2.0
+python-MotionMount==2.3.0
 
 # homeassistant.components.awair
 python-awair==0.2.4
@@ -1922,11 +1948,14 @@ python-fullykiosk==0.0.14
 # homeassistant.components.sms
 # python-gammu==3.2.4
 
+# homeassistant.components.google_drive
+python-google-drive-api==0.1.0
+
 # homeassistant.components.analytics_insights
-python-homeassistant-analytics==0.8.1
+python-homeassistant-analytics==0.9.0
 
 # homeassistant.components.homewizard
-python-homewizard-energy==v8.1.1
+python-homewizard-energy==v8.3.2
 
 # homeassistant.components.izone
 python-izone==1.2.9
@@ -1935,10 +1964,10 @@ python-izone==1.2.9
 python-juicenet==1.1.0
 
 # homeassistant.components.tplink
-python-kasa[speedups]==0.9.1
+python-kasa[speedups]==0.10.2
 
 # homeassistant.components.linkplay
-python-linkplay==0.1.3
+python-linkplay==0.2.2
 
 # homeassistant.components.matter
 python-matter-server==7.0.0
@@ -1963,28 +1992,31 @@ python-opensky==1.0.1
 python-otbr-api==2.7.0
 
 # homeassistant.components.overseerr
-python-overseerr==0.6.0
+python-overseerr==0.7.1
 
 # homeassistant.components.picnic
-python-picnic-api==1.1.0
+python-picnic-api2==1.2.4
 
 # homeassistant.components.rabbitair
 python-rabbitair==0.0.8
 
 # homeassistant.components.roborock
-python-roborock==2.8.4
+python-roborock==2.16.1
 
 # homeassistant.components.smarttub
-python-smarttub==0.0.38
+python-smarttub==0.0.39
+
+# homeassistant.components.snoo
+python-snoo==0.6.4
 
 # homeassistant.components.songpal
 python-songpal==0.16.2
 
 # homeassistant.components.tado
-python-tado==0.18.5
+python-tado==0.18.9
 
 # homeassistant.components.technove
-python-technove==1.3.1
+python-technove==2.0.0
 
 # homeassistant.components.telegram_bot
 python-telegram-bot[socks]==21.5
@@ -2014,9 +2046,6 @@ pytrafikverket==1.1.1
 # homeassistant.components.v2c
 pytrydan==0.8.0
 
-# homeassistant.components.usb
-pyudev==0.24.1
-
 # homeassistant.components.uptimerobot
 pyuptimerobot==22.2.0
 
@@ -2024,7 +2053,7 @@ pyuptimerobot==22.2.0
 pyvera==0.3.15
 
 # homeassistant.components.vesync
-pyvesync==2.1.16
+pyvesync==2.1.18
 
 # homeassistant.components.vizio
 pyvizio==0.1.61
@@ -2051,7 +2080,7 @@ pywemo==1.4.0
 pywilight==0.0.74
 
 # homeassistant.components.wiz
-pywizlight==0.5.14
+pywizlight==0.6.2
 
 # homeassistant.components.wmspro
 pywmspro==0.2.1
@@ -2069,7 +2098,7 @@ pyzerproc==0.4.8
 qbittorrent-api==2024.2.59
 
 # homeassistant.components.qbus
-qbusmqttapi==1.2.3
+qbusmqttapi==1.3.0
 
 # homeassistant.components.qingping
 qingping-ble==0.10.0
@@ -2099,7 +2128,7 @@ renault-api==0.2.9
 renson-endura-delta==1.7.2
 
 # homeassistant.components.reolink
-reolink-aio==0.11.8
+reolink-aio==0.13.0
 
 # homeassistant.components.rflink
 rflink==0.0.66
@@ -2114,7 +2143,7 @@ rokuecp==0.19.3
 romy==0.0.10
 
 # homeassistant.components.roomba
-roombapy==1.8.1
+roombapy==1.9.0
 
 # homeassistant.components.roon
 roonapi==0.1.6
@@ -2147,11 +2176,11 @@ sanix==1.0.6
 screenlogicpy==0.10.0
 
 # homeassistant.components.backup
-securetar==2025.1.3
+securetar==2025.2.1
 
 # homeassistant.components.emulated_kasa
 # homeassistant.components.sense
-sense-energy==0.13.4
+sense-energy==0.13.7
 
 # homeassistant.components.sensirion_ble
 sensirion-ble==0.1.1
@@ -2159,14 +2188,20 @@ sensirion-ble==0.1.1
 # homeassistant.components.sensorpro
 sensorpro-ble==0.5.3
 
+# homeassistant.components.sensorpush_cloud
+sensorpush-api==2.1.1
+
 # homeassistant.components.sensorpush
 sensorpush-ble==1.7.1
 
+# homeassistant.components.sensorpush_cloud
+sensorpush-ha==1.3.2
+
 # homeassistant.components.sensoterra
 sensoterra==2.0.1
 
 # homeassistant.components.sentry
-sentry-sdk==1.40.3
+sentry-sdk==1.45.1
 
 # homeassistant.components.sfr_box
 sfrbox-api==0.0.11
@@ -2195,14 +2230,11 @@ slack_sdk==3.33.4
 # homeassistant.components.smart_meter_texas
 smart-meter-texas==0.5.5
 
-# homeassistant.components.smhi
-smhi-pkg==1.0.19
-
 # homeassistant.components.snapcast
 snapcast==2.3.6
 
 # homeassistant.components.sonos
-soco==0.30.6
+soco==0.30.9
 
 # homeassistant.components.solarlog
 solarlog_cli==0.4.0
@@ -2244,7 +2276,7 @@ statsd==3.2.1
 steamodd==4.21
 
 # homeassistant.components.stookwijzer
-stookwijzer==1.5.1
+stookwijzer==1.6.1
 
 # homeassistant.components.streamlabswater
 streamlabswater==1.0.1
@@ -2287,7 +2319,7 @@ temperusb==1.6.1
 # homeassistant.components.tesla_fleet
 # homeassistant.components.teslemetry
 # homeassistant.components.tessie
-tesla-fleet-api==0.9.2
+tesla-fleet-api==1.0.16
 
 # homeassistant.components.powerwall
 tesla-powerwall==0.5.2
@@ -2296,37 +2328,37 @@ tesla-powerwall==0.5.2
 tesla-wall-connector==1.0.2
 
 # homeassistant.components.teslemetry
-teslemetry-stream==0.6.6
+teslemetry-stream==0.6.12
 
 # homeassistant.components.tessie
 tessie-api==0.1.1
 
 # homeassistant.components.thermobeacon
-thermobeacon-ble==0.7.0
+thermobeacon-ble==0.8.1
 
 # homeassistant.components.thermopro
-thermopro-ble==0.10.1
+thermopro-ble==0.11.0
 
 # homeassistant.components.lg_thinq
-thinqconnect==1.0.2
+thinqconnect==1.0.5
 
 # homeassistant.components.tilt_ble
 tilt-ble==0.2.3
 
 # homeassistant.components.todoist
-todoist-api-python==2.1.2
+todoist-api-python==2.1.7
 
 # homeassistant.components.tolo
-tololib==1.1.0
+tololib==1.2.2
 
 # homeassistant.components.toon
 toonapi==0.3.0
 
 # homeassistant.components.totalconnect
-total-connect-client==2024.12
+total-connect-client==2025.1.4
 
 # homeassistant.components.tplink_omada
-tplink-omada-client==1.4.3
+tplink-omada-client==1.4.4
 
 # homeassistant.components.transmission
 transmission-rpc==7.0.3
@@ -2353,13 +2385,13 @@ twilio==6.32.0
 twitchAPI==4.2.1
 
 # homeassistant.components.monarch_money
-typedmonarchmoney==0.3.1
+typedmonarchmoney==0.4.4
 
 # homeassistant.components.ukraine_alarm
 uasiren==0.0.1
 
 # homeassistant.components.unifiprotect
-uiprotect==7.5.0
+uiprotect==7.5.1
 
 # homeassistant.components.landisgyr_heat_meter
 ultraheat-api==0.5.7
@@ -2368,7 +2400,7 @@ ultraheat-api==0.5.7
 unifi-discovery==1.2.0
 
 # homeassistant.components.upb
-upb-lib==0.5.9
+upb-lib==0.6.1
 
 # homeassistant.components.upcloud
 upcloud-api==2.6.0
@@ -2391,7 +2423,7 @@ vallox-websocket-api==5.3.0
 vehicle==2.2.2
 
 # homeassistant.components.velbus
-velbus-aio==2025.1.1
+velbus-aio==2025.3.1
 
 # homeassistant.components.venstar
 venstarcolortouch==0.19
@@ -2400,7 +2432,7 @@ venstarcolortouch==0.19
 vilfo-api-client==0.5.0
 
 # homeassistant.components.voip
-voip-utils==0.2.2
+voip-utils==0.3.1
 
 # homeassistant.components.volvooncall
 volvooncall==0.10.3
@@ -2419,7 +2451,7 @@ vultr==0.1.2
 wakeonlan==2.1.0
 
 # homeassistant.components.wallbox
-wallbox==0.7.0
+wallbox==0.8.0
 
 # homeassistant.components.folder_watcher
 watchdog==6.0.0
@@ -2428,7 +2460,7 @@ watchdog==6.0.0
 watergate-local-api==2024.4.1
 
 # homeassistant.components.weatherflow_cloud
-weatherflow4py==1.0.6
+weatherflow4py==1.3.1
 
 # homeassistant.components.nasweb
 webio-api==0.1.11
@@ -2437,10 +2469,10 @@ webio-api==0.1.11
 webmin-xmlrpc==0.0.2
 
 # homeassistant.components.weheat
-weheat==2025.1.15
+weheat==2025.2.26
 
 # homeassistant.components.whirlpool
-whirlpool-sixth-sense==0.18.11
+whirlpool-sixth-sense==0.19.1
 
 # homeassistant.components.whois
 whois==0.9.27
@@ -2452,7 +2484,7 @@ wiffi==1.1.2
 wled==0.21.0
 
 # homeassistant.components.wolflink
-wolf-comm==0.0.15
+wolf-comm==0.0.23
 
 # homeassistant.components.wyoming
 wyoming==1.5.4
@@ -2464,10 +2496,10 @@ xbox-webapi==2.1.0
 xiaomi-ble==0.33.0
 
 # homeassistant.components.knx
-xknx==3.4.0
+xknx==3.6.0
 
 # homeassistant.components.knx
-xknxproject==3.8.1
+xknxproject==3.8.2
 
 # homeassistant.components.fritz
 # homeassistant.components.rest
@@ -2482,17 +2514,17 @@ yalesmartalarmclient==0.4.3
 # homeassistant.components.august
 # homeassistant.components.yale
 # homeassistant.components.yalexs_ble
-yalexs-ble==2.5.6
+yalexs-ble==2.5.7
 
 # homeassistant.components.august
 # homeassistant.components.yale
 yalexs==8.10.0
 
 # homeassistant.components.yeelight
-yeelight==0.7.14
+yeelight==0.7.16
 
 # homeassistant.components.yolink
-yolink-api==0.4.7
+yolink-api==0.4.9
 
 # homeassistant.components.youless
 youless-api==2.2.0
@@ -2501,22 +2533,22 @@ youless-api==2.2.0
 youtubeaio==1.1.5
 
 # homeassistant.components.media_extractor
-yt-dlp[default]==2025.01.15
+yt-dlp[default]==2025.03.26
 
 # homeassistant.components.zamg
 zamg==0.3.6
 
 # homeassistant.components.zeroconf
-zeroconf==0.141.0
+zeroconf==0.146.0
 
 # homeassistant.components.zeversolar
 zeversolar==0.3.2
 
 # homeassistant.components.zha
-zha==0.0.45
+zha==0.0.54
 
 # homeassistant.components.zwave_js
-zwave-js-server-python==0.60.0
+zwave-js-server-python==0.62.0
 
 # homeassistant.components.zwave_me
 zwave-me-ws==0.4.3
diff --git a/requirements_test_pre_commit.txt b/requirements_test_pre_commit.txt
index 4dd3bc46010..ff86915bbf3 100644
--- a/requirements_test_pre_commit.txt
+++ b/requirements_test_pre_commit.txt
@@ -1,5 +1,5 @@
 # Automatically generated from .pre-commit-config.yaml by gen_requirements_all.py, do not edit
 
-codespell==2.3.0
-ruff==0.9.1
+codespell==2.4.1
+ruff==0.11.0
 yamllint==1.35.1
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index ef57b9140ce..1be6286d30c 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -139,7 +139,7 @@ uuid==1000000000.0.0
 # these requirements are quite loose. As the entire stack has some outstanding issues, and
 # even newer versions seem to introduce new issues, it's useful for us to pin all these
 # requirements so we can directly link HA versions to these library versions.
-anyio==4.8.0
+anyio==4.9.0
 h11==0.14.0
 httpcore==1.0.7
 
@@ -199,6 +199,10 @@ pysnmplib==1000000000.0.0
 # breaks getmac due to them both sharing the same python package name inside 'getmac'.
 get-mac==1000000000.0.0
 
+# Poetry is a build dependency. Installing it as a runtime dependency almost
+# always indicates an issue with library requirements.
+poetry==1000000000.0.0
+
 # We want to skip the binary wheels for the 'charset-normalizer' packages.
 # They are build with mypyc, but causes issues with our wheel builder.
 # In order to do so, we need to constrain the version.
diff --git a/script/hassfest/__main__.py b/script/hassfest/__main__.py
index c93d8fd4499..277696c669b 100644
--- a/script/hassfest/__main__.py
+++ b/script/hassfest/__main__.py
@@ -107,7 +107,13 @@ def get_config() -> Config:
         "--plugins",
         type=validate_plugins,
         default=ALL_PLUGIN_NAMES,
-        help="Comma-separate list of plugins to run. Valid plugin names: %(default)s",
+        help="Comma-separated list of plugins to run. Valid plugin names: %(default)s",
+    )
+    parser.add_argument(
+        "--skip-plugins",
+        type=validate_plugins,
+        default=[],
+        help=f"Comma-separated list of plugins to skip. Valid plugin names: {ALL_PLUGIN_NAMES}",
     )
     parser.add_argument(
         "--core-path",
@@ -131,6 +137,9 @@ def get_config() -> Config:
     ):
         raise RuntimeError("Run from Home Assistant root")
 
+    if parsed.skip_plugins:
+        parsed.plugins = set(parsed.plugins) - set(parsed.skip_plugins)
+
     return Config(
         root=parsed.core_path.absolute(),
         specific_integrations=parsed.integration_path,
diff --git a/script/hassfest/config_flow.py b/script/hassfest/config_flow.py
index f842ec61b97..1f8b7d1139b 100644
--- a/script/hassfest/config_flow.py
+++ b/script/hassfest/config_flow.py
@@ -95,7 +95,6 @@ def _populate_brand_integrations(
         integration = integrations.get(domain)
         if not integration or integration.integration_type in (
             "entity",
-            "hardware",
             "system",
         ):
             continue
@@ -171,7 +170,7 @@ def _generate_integrations(
             result["integration"][domain] = metadata
         else:  # integration
             integration = integrations[domain]
-            if integration.integration_type in ("entity", "system", "hardware"):
+            if integration.integration_type in ("entity", "system"):
                 continue
 
             if integration.translated_name:
diff --git a/script/hassfest/dependencies.py b/script/hassfest/dependencies.py
index d29571eaa83..52ea79d32fe 100644
--- a/script/hassfest/dependencies.py
+++ b/script/hassfest/dependencies.py
@@ -153,8 +153,6 @@ ALLOWED_USED_COMPONENTS = {
 }
 
 IGNORE_VIOLATIONS = {
-    # Has same requirement, gets defaults.
-    ("sql", "recorder"),
     # Sharing a base class
     ("lutron_caseta", "lutron"),
     ("ffmpeg_noise", "ffmpeg_motion"),
@@ -175,6 +173,11 @@ IGNORE_VIOLATIONS = {
     "logbook",
     # Temporary needed for migration until 2024.10
     ("conversation", "assist_pipeline"),
+    # The onboarding integration provides limited backup and cloud APIs for use
+    # during onboarding. The onboarding integration waits for the backup manager
+    # and cloud to be ready before calling any backup or cloud functionality.
+    ("onboarding", "backup"),
+    ("onboarding", "cloud"),
 }
 
 
diff --git a/script/hassfest/docker.py b/script/hassfest/docker.py
index edc47e2f9d7..4bf6c3bb0a6 100644
--- a/script/hassfest/docker.py
+++ b/script/hassfest/docker.py
@@ -26,6 +26,24 @@ ENV \
 
 ARG QEMU_CPU
 
+# Home Assistant S6-Overlay
+COPY rootfs /
+
+# Needs to be redefined inside the FROM statement to be set for RUN commands
+ARG BUILD_ARCH
+# Get go2rtc binary
+RUN \
+    case "${{BUILD_ARCH}}" in \
+        "aarch64") go2rtc_suffix='arm64' ;; \
+        "armhf") go2rtc_suffix='armv6' ;; \
+        "armv7") go2rtc_suffix='arm' ;; \
+        *) go2rtc_suffix=${{BUILD_ARCH}} ;; \
+    esac \
+    && curl -L https://github.com/AlexxIT/go2rtc/releases/download/v{go2rtc}/go2rtc_linux_${{go2rtc_suffix}} --output /bin/go2rtc \
+    && chmod +x /bin/go2rtc \
+    # Verify go2rtc can be executed
+    && go2rtc --version
+
 # Install uv
 RUN pip3 install uv=={uv}
 
@@ -56,24 +74,6 @@ RUN \
     && python3 -m compileall \
         homeassistant/homeassistant
 
-# Home Assistant S6-Overlay
-COPY rootfs /
-
-# Needs to be redefined inside the FROM statement to be set for RUN commands
-ARG BUILD_ARCH
-# Get go2rtc binary
-RUN \
-    case "${{BUILD_ARCH}}" in \
-        "aarch64") go2rtc_suffix='arm64' ;; \
-        "armhf") go2rtc_suffix='armv6' ;; \
-        "armv7") go2rtc_suffix='arm' ;; \
-        *) go2rtc_suffix=${{BUILD_ARCH}} ;; \
-    esac \
-    && curl -L https://github.com/AlexxIT/go2rtc/releases/download/v{go2rtc}/go2rtc_linux_${{go2rtc_suffix}} --output /bin/go2rtc \
-    && chmod +x /bin/go2rtc \
-    # Verify go2rtc can be executed
-    && go2rtc --version
-
 WORKDIR /config
 """
 
diff --git a/script/hassfest/docker/Dockerfile b/script/hassfest/docker/Dockerfile
index 21b98d30f1e..21e97ac097b 100644
--- a/script/hassfest/docker/Dockerfile
+++ b/script/hassfest/docker/Dockerfile
@@ -14,7 +14,7 @@ WORKDIR "/github/workspace"
 COPY . /usr/src/homeassistant
 
 # Uv is only needed during build
-RUN --mount=from=ghcr.io/astral-sh/uv:0.5.21,source=/uv,target=/bin/uv \
+RUN --mount=from=ghcr.io/astral-sh/uv:0.6.10,source=/uv,target=/bin/uv \
     # Uv creates a lock file in /tmp
     --mount=type=tmpfs,target=/tmp \
     # Required for PyTurboJPEG
@@ -24,8 +24,8 @@ RUN --mount=from=ghcr.io/astral-sh/uv:0.5.21,source=/uv,target=/bin/uv \
         --no-cache \
         -c /usr/src/homeassistant/homeassistant/package_constraints.txt \
         -r /usr/src/homeassistant/requirements.txt \
-        stdlib-list==0.10.0 pipdeptree==2.23.4 tqdm==4.66.5 ruff==0.9.1 \
-        PyTurboJPEG==1.7.5 go2rtc-client==0.1.2 ha-ffmpeg==3.2.2 hassil==2.1.0 home-assistant-intents==2025.1.1 mutagen==1.47.0 pymicro-vad==1.0.1 pyspeex-noise==1.0.2
+        stdlib-list==0.10.0 pipdeptree==2.25.1 tqdm==4.67.1 ruff==0.11.0 \
+        PyTurboJPEG==1.7.5 go2rtc-client==0.1.2 ha-ffmpeg==3.2.2 hassil==2.2.3 home-assistant-intents==2025.3.24 mutagen==1.47.0 pymicro-vad==1.0.1 pyspeex-noise==1.0.2
 
 LABEL "name"="hassfest"
 LABEL "maintainer"="Home Assistant <hello@home-assistant.io>"
diff --git a/script/hassfest/manifest.py b/script/hassfest/manifest.py
index 6e9cd8bdedc..02c96930bf5 100644
--- a/script/hassfest/manifest.py
+++ b/script/hassfest/manifest.py
@@ -19,6 +19,7 @@ from voluptuous.humanize import humanize_error
 
 from homeassistant.const import Platform
 from homeassistant.helpers import config_validation as cv
+from script.util import sort_manifest as util_sort_manifest
 
 from .model import Config, Integration, ScaledQualityScaleTiers
 
@@ -376,20 +377,20 @@ def validate_manifest(integration: Integration, core_components_dir: Path) -> No
         validate_version(integration)
 
 
-_SORT_KEYS = {"domain": ".domain", "name": ".name"}
-
-
-def _sort_manifest_keys(key: str) -> str:
-    return _SORT_KEYS.get(key, key)
-
-
 def sort_manifest(integration: Integration, config: Config) -> bool:
     """Sort manifest."""
-    keys = list(integration.manifest.keys())
-    if (keys_sorted := sorted(keys, key=_sort_manifest_keys)) != keys:
-        manifest = {key: integration.manifest[key] for key in keys_sorted}
+    if integration.manifest_path is None:
+        integration.add_error(
+            "manifest",
+            "Manifest path not set, unable to sort manifest keys",
+        )
+        return False
+
+    if util_sort_manifest(integration.manifest):
         if config.action == "generate":
-            integration.manifest_path.write_text(json.dumps(manifest, indent=2))
+            integration.manifest_path.write_text(
+                json.dumps(integration.manifest, indent=2) + "\n"
+            )
             text = "have been sorted"
         else:
             text = "are not sorted correctly"
diff --git a/script/hassfest/model.py b/script/hassfest/model.py
index 08ded687096..1ca4178d9c2 100644
--- a/script/hassfest/model.py
+++ b/script/hassfest/model.py
@@ -157,8 +157,10 @@ class Integration:
     @property
     def core(self) -> bool:
         """Core integration."""
-        return self.path.as_posix().startswith(
-            self._config.core_integrations_path.as_posix()
+        return (
+            self.path.absolute()
+            .as_posix()
+            .startswith(self._config.core_integrations_path.as_posix())
         )
 
     @property
diff --git a/script/hassfest/quality_scale.py b/script/hassfest/quality_scale.py
index 3732101913c..ea6e657ec50 100644
--- a/script/hassfest/quality_scale.py
+++ b/script/hassfest/quality_scale.py
@@ -335,7 +335,6 @@ INTEGRATIONS_WITHOUT_QUALITY_SCALE_FILE = [
     "egardia",
     "eight_sleep",
     "electrasmart",
-    "electric_kiwi",
     "eliqonline",
     "elkm1",
     "elmax",
@@ -391,7 +390,6 @@ INTEGRATIONS_WITHOUT_QUALITY_SCALE_FILE = [
     "fjaraskupan",
     "fleetgo",
     "flexit",
-    "flexit_bacnet",
     "flic",
     "flick_electric",
     "flipr",
@@ -517,7 +515,6 @@ INTEGRATIONS_WITHOUT_QUALITY_SCALE_FILE = [
     "ihc",
     "imgw_pib",
     "improv_ble",
-    "incomfort",
     "influxdb",
     "inkbird",
     "insteon",
@@ -669,7 +666,6 @@ INTEGRATIONS_WITHOUT_QUALITY_SCALE_FILE = [
     "motion_blinds",
     "motionblinds_ble",
     "motioneye",
-    "motionmount",
     "mpd",
     "mqtt_eventstream",
     "mqtt_json",
@@ -815,7 +811,6 @@ INTEGRATIONS_WITHOUT_QUALITY_SCALE_FILE = [
     "pushsafer",
     "pvoutput",
     "pvpc_hourly_pricing",
-    "pyload",
     "qbittorrent",
     "qingping",
     "qld_bushfire",
@@ -859,7 +854,6 @@ INTEGRATIONS_WITHOUT_QUALITY_SCALE_FILE = [
     "risco",
     "rituals_perfume_genie",
     "rmvtransport",
-    "roborock",
     "rocketchat",
     "roku",
     "romy",
@@ -926,7 +920,6 @@ INTEGRATIONS_WITHOUT_QUALITY_SCALE_FILE = [
     "sma",
     "smappee",
     "smart_meter_texas",
-    "smartthings",
     "smarttub",
     "smarty",
     "smhi",
@@ -1093,7 +1086,6 @@ INTEGRATIONS_WITHOUT_QUALITY_SCALE_FILE = [
     "vizio",
     "vlc",
     "vlc_telnet",
-    "vodafone_station",
     "voicerss",
     "voip",
     "volkszaehler",
@@ -1287,7 +1279,6 @@ INTEGRATIONS_WITHOUT_SCALE = [
     "brottsplatskartan",
     "browser",
     "brunt",
-    "bring",
     "bryant_evolution",
     "bsblan",
     "bt_home_hub_5",
@@ -1397,7 +1388,6 @@ INTEGRATIONS_WITHOUT_SCALE = [
     "egardia",
     "eight_sleep",
     "electrasmart",
-    "electric_kiwi",
     "elevenlabs",
     "eliqonline",
     "elkm1",
@@ -1457,7 +1447,6 @@ INTEGRATIONS_WITHOUT_SCALE = [
     "fjaraskupan",
     "fleetgo",
     "flexit",
-    "flexit_bacnet",
     "flic",
     "flick_electric",
     "flipr",
@@ -1537,14 +1526,12 @@ INTEGRATIONS_WITHOUT_SCALE = [
     "gstreamer",
     "gtfs",
     "guardian",
-    "habitica",
     "harman_kardon_avr",
     "harmony",
     "hassio",
     "haveibeenpwned",
     "hddtemp",
     "hdmi_cec",
-    "heos",
     "heatmiser",
     "here_travel_time",
     "hikvision",
@@ -1589,7 +1576,6 @@ INTEGRATIONS_WITHOUT_SCALE = [
     "imap",
     "imgw_pib",
     "improv_ble",
-    "incomfort",
     "influxdb",
     "inkbird",
     "insteon",
@@ -1597,7 +1583,6 @@ INTEGRATIONS_WITHOUT_SCALE = [
     "intellifire",
     "intesishome",
     "ios",
-    "iron_os",
     "iotawatt",
     "iotty",
     "iperf3",
@@ -1672,7 +1657,6 @@ INTEGRATIONS_WITHOUT_SCALE = [
     "linux_battery",
     "lirc",
     "litejet",
-    "litterrobot",
     "livisi",
     "llamalab_automate",
     "local_calendar",
@@ -1731,7 +1715,6 @@ INTEGRATIONS_WITHOUT_SCALE = [
     "mikrotik",
     "mill",
     "min_max",
-    "minecraft_server",
     "minio",
     "mjpeg",
     "moat",
@@ -1750,7 +1733,6 @@ INTEGRATIONS_WITHOUT_SCALE = [
     "motion_blinds",
     "motionblinds_ble",
     "motioneye",
-    "motionmount",
     "mpd",
     "mqtt_eventstream",
     "mqtt_json",
@@ -1874,7 +1856,6 @@ INTEGRATIONS_WITHOUT_SCALE = [
     "pioneer",
     "pjlink",
     "plaato",
-    "plugwise",
     "plant",
     "plex",
     "plum_lightpad",
@@ -1902,7 +1883,6 @@ INTEGRATIONS_WITHOUT_SCALE = [
     "pushsafer",
     "pvoutput",
     "pvpc_hourly_pricing",
-    "pyload",
     "qbittorrent",
     "qingping",
     "qld_bushfire",
@@ -1947,7 +1927,6 @@ INTEGRATIONS_WITHOUT_SCALE = [
     "risco",
     "rituals_perfume_genie",
     "rmvtransport",
-    "roborock",
     "rocketchat",
     "roku",
     "romy",
@@ -1977,7 +1956,6 @@ INTEGRATIONS_WITHOUT_SCALE = [
     "season",
     "sendgrid",
     "sense",
-    "sensibo",
     "sensirion_ble",
     "sensorpro",
     "sensorpush",
@@ -2016,7 +1994,6 @@ INTEGRATIONS_WITHOUT_SCALE = [
     "sma",
     "smappee",
     "smart_meter_texas",
-    "smartthings",
     "smarttub",
     "smarty",
     "smhi",
@@ -2132,7 +2109,6 @@ INTEGRATIONS_WITHOUT_SCALE = [
     "torque",
     "touchline",
     "touchline_sl",
-    "tplink",
     "tplink_lte",
     "tplink_omada",
     "traccar",
@@ -2179,7 +2155,6 @@ INTEGRATIONS_WITHOUT_SCALE = [
     "velux",
     "venstar",
     "vera",
-    "velbus",
     "verisure",
     "versasense",
     "version",
@@ -2191,7 +2166,6 @@ INTEGRATIONS_WITHOUT_SCALE = [
     "vizio",
     "vlc",
     "vlc_telnet",
-    "vodafone_station",
     "voicerss",
     "voip",
     "volkszaehler",
diff --git a/script/hassfest/quality_scale_validation/runtime_data.py b/script/hassfest/quality_scale_validation/runtime_data.py
index cfc4c5224de..3562d897967 100644
--- a/script/hassfest/quality_scale_validation/runtime_data.py
+++ b/script/hassfest/quality_scale_validation/runtime_data.py
@@ -10,7 +10,7 @@ from homeassistant.const import Platform
 from script.hassfest import ast_parse_module
 from script.hassfest.model import Config, Integration
 
-_ANNOTATION_MATCH = re.compile(r"^[A-Za-z]+ConfigEntry$")
+_ANNOTATION_MATCH = re.compile(r"^[A-Za-z][A-Za-z0-9]+ConfigEntry$")
 _FUNCTIONS: dict[str, dict[str, int]] = {
     "__init__": {  # based on ComponentProtocol
         "async_migrate_entry": 2,
diff --git a/script/hassfest/translations.py b/script/hassfest/translations.py
index b3d397dbd55..f4c05f504ca 100644
--- a/script/hassfest/translations.py
+++ b/script/hassfest/translations.py
@@ -29,6 +29,7 @@ ALLOW_NAME_TRANSLATION = {
     "cert_expiry",
     "cpuspeed",
     "emulated_roku",
+    "energenie_power_sockets",
     "faa_delays",
     "garages_amsterdam",
     "generic",
@@ -40,6 +41,7 @@ ALLOW_NAME_TRANSLATION = {
     "local_ip",
     "local_todo",
     "nmap_tracker",
+    "remote_calendar",
     "rpi_power",
     "swiss_public_transport",
     "waze_travel_time",
@@ -185,6 +187,8 @@ def gen_data_entry_schema(
         vol.Optional("abort"): {str: translation_value_validator},
         vol.Optional("progress"): {str: translation_value_validator},
         vol.Optional("create_entry"): {str: translation_value_validator},
+        vol.Optional("initiate_flow"): {str: translation_value_validator},
+        vol.Optional("entry_type"): translation_value_validator,
     }
     if flow_title == REQUIRED:
         schema[vol.Required("title")] = translation_value_validator
@@ -285,6 +289,15 @@ def gen_strings_schema(config: Config, integration: Integration) -> vol.Schema:
                     "user" if integration.integration_type == "helper" else None
                 ),
             ),
+            vol.Optional("config_subentries"): cv.schema_with_slug_keys(
+                gen_data_entry_schema(
+                    config=config,
+                    integration=integration,
+                    flow_title=REMOVED,
+                    require_step_title=False,
+                ),
+                slug_validator=vol.Any("_", cv.slug),
+            ),
             vol.Optional("options"): gen_data_entry_schema(
                 config=config,
                 integration=integration,
diff --git a/script/licenses.py b/script/licenses.py
index 464a2fc456b..448e9dd2a67 100644
--- a/script/licenses.py
+++ b/script/licenses.py
@@ -180,7 +180,6 @@ EXCEPTIONS = {
     "PyMicroBot",  # https://github.com/spycle/pyMicroBot/pull/3
     "PySwitchmate",  # https://github.com/Danielhiversen/pySwitchmate/pull/16
     "PyXiaomiGateway",  # https://github.com/Danielhiversen/PyXiaomiGateway/pull/201
-    "aioecowitt",  # https://github.com/home-assistant-libs/aioecowitt/pull/180
     "chacha20poly1305",  # LGPL
     "commentjson",  # https://github.com/vaidik/commentjson/pull/55
     "crownstone-cloud",  # https://github.com/crownstone/crownstone-lib-python-cloud/pull/5
@@ -199,7 +198,6 @@ EXCEPTIONS = {
     "pigpio",  # https://github.com/joan2937/pigpio/pull/608
     "pymitv",  # MIT
     "pybbox",  # https://github.com/HydrelioxGitHub/pybbox/pull/5
-    "pyeconet",  # https://github.com/w1ll1am23/pyeconet/pull/41
     "pysabnzbd",  # https://github.com/jeradM/pysabnzbd/pull/6
     "pyvera",  # https://github.com/maximvelichko/pyvera/pull/164
     "repoze.lru",
diff --git a/script/scaffold/__main__.py b/script/scaffold/__main__.py
index 93c787df50f..243ea9507f7 100644
--- a/script/scaffold/__main__.py
+++ b/script/scaffold/__main__.py
@@ -8,6 +8,7 @@ import sys
 from script.util import valid_integration
 
 from . import docs, error, gather_info, generate
+from .model import Info
 
 TEMPLATES = [
     p.name for p in (Path(__file__).parent / "templates").glob("*") if p.is_dir()
@@ -28,6 +29,40 @@ def get_arguments() -> argparse.Namespace:
     return parser.parse_args()
 
 
+def run_process(name: str, cmd: list[str], info: Info) -> None:
+    """Run a sub process and handle the result.
+
+    :param name: The name of the sub process used in reporting.
+    :param cmd: The sub process arguments.
+    :param info: The Info object.
+    :raises subprocess.CalledProcessError: If the subprocess failed.
+
+    If the sub process was successful print a success message, otherwise
+    print an error message and raise a subprocess.CalledProcessError.
+    """
+    print(f"Command: {' '.join(cmd)}")
+    print()
+    result: subprocess.CompletedProcess = subprocess.run(cmd, check=False)
+    if result.returncode == 0:
+        print()
+        print(f"Completed {name} successfully.")
+        print()
+        return
+
+    print()
+    print(f"Fatal Error: {name} failed with exit code {result.returncode}")
+    print()
+    if info.is_new:
+        print("This is a bug, please report an issue!")
+    else:
+        print(
+            "This may be an existing issue with your integration,",
+            "if so fix and run `script.scaffold` again,",
+            "otherwise please report an issue.",
+        )
+    result.check_returncode()
+
+
 def main() -> int:
     """Scaffold an integration."""
     if not Path("requirements_all.txt").is_file():
@@ -64,20 +99,32 @@ def main() -> int:
     if args.template != "integration":
         generate.generate(args.template, info)
 
-    pipe_null = {} if args.develop else {"stdout": subprocess.DEVNULL}
-
+    # Always output sub commands as the output will contain useful information if a command fails.
     print("Running hassfest to pick up new information.")
-    subprocess.run(["python", "-m", "script.hassfest"], **pipe_null, check=True)
-    print()
+    run_process(
+        "hassfest",
+        [
+            "python",
+            "-m",
+            "script.hassfest",
+            "--integration-path",
+            str(info.integration_dir),
+            "--skip-plugins",
+            "quality_scale",  # Skip quality scale as it will fail for newly generated integrations.
+        ],
+        info,
+    )
 
     print("Running gen_requirements_all to pick up new information.")
-    subprocess.run(
-        ["python", "-m", "script.gen_requirements_all"], **pipe_null, check=True
+    run_process(
+        "gen_requirements_all",
+        ["python", "-m", "script.gen_requirements_all"],
+        info,
     )
-    print()
 
-    print("Running script/translations_develop to pick up new translation strings.")
-    subprocess.run(
+    print("Running translations to pick up new translation strings.")
+    run_process(
+        "translations",
         [
             "python",
             "-m",
@@ -86,15 +133,13 @@ def main() -> int:
             "--integration",
             info.domain,
         ],
-        **pipe_null,
-        check=True,
+        info,
     )
-    print()
 
     if args.develop:
         print("Running tests")
-        print(f"$ python3 -b -m pytest -vvv tests/components/{info.domain}")
-        subprocess.run(
+        run_process(
+            "pytest",
             [
                 "python3",
                 "-b",
@@ -103,9 +148,8 @@ def main() -> int:
                 "-vvv",
                 f"tests/components/{info.domain}",
             ],
-            check=True,
+            info,
         )
-        print()
 
     docs.print_relevant_docs(args.template, info)
 
@@ -115,6 +159,8 @@ def main() -> int:
 if __name__ == "__main__":
     try:
         sys.exit(main())
+    except subprocess.CalledProcessError as err:
+        sys.exit(err.returncode)
     except error.ExitApp as err:
         print()
         print(f"Fatal Error: {err.reason}")
diff --git a/script/scaffold/model.py b/script/scaffold/model.py
index 3b5a5e50fe4..e3a7be210ab 100644
--- a/script/scaffold/model.py
+++ b/script/scaffold/model.py
@@ -4,9 +4,12 @@ from __future__ import annotations
 
 import json
 from pathlib import Path
+from typing import Any
 
 import attr
 
+from script.util import sort_manifest
+
 from .const import COMPONENT_DIR, TESTS_DIR
 
 
@@ -44,16 +47,19 @@ class Info:
         """Path to the manifest."""
         return COMPONENT_DIR / self.domain / "manifest.json"
 
-    def manifest(self) -> dict:
+    def manifest(self) -> dict[str, Any]:
         """Return integration manifest."""
         return json.loads(self.manifest_path.read_text())
 
     def update_manifest(self, **kwargs) -> None:
         """Update the integration manifest."""
         print(f"Updating {self.domain} manifest: {kwargs}")
-        self.manifest_path.write_text(
-            json.dumps({**self.manifest(), **kwargs}, indent=2) + "\n"
-        )
+
+        # Sort keys in manifest so we don't trigger hassfest errors.
+        manifest: dict[str, Any] = {**self.manifest(), **kwargs}
+        sort_manifest(manifest)
+
+        self.manifest_path.write_text(json.dumps(manifest, indent=2) + "\n")
 
     @property
     def strings_path(self) -> Path:
diff --git a/script/scaffold/templates/config_flow_helper/integration/sensor.py b/script/scaffold/templates/config_flow_helper/integration/sensor.py
index 741b2e85eb2..9c00dd568eb 100644
--- a/script/scaffold/templates/config_flow_helper/integration/sensor.py
+++ b/script/scaffold/templates/config_flow_helper/integration/sensor.py
@@ -7,13 +7,13 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ENTITY_ID
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Initialize NEW_NAME config entry."""
     registry = er.async_get(hass)
diff --git a/script/scaffold/templates/integration/integration/manifest.json b/script/scaffold/templates/integration/integration/manifest.json
index 7235500391d..15bc84a9b5e 100644
--- a/script/scaffold/templates/integration/integration/manifest.json
+++ b/script/scaffold/templates/integration/integration/manifest.json
@@ -7,6 +7,7 @@
   "documentation": "https://www.home-assistant.io/integrations/NEW_DOMAIN",
   "homekit": {},
   "iot_class": "IOT_CLASS",
+  "quality_scale": "bronze",
   "requirements": [],
   "ssdp": [],
   "zeroconf": []
diff --git a/script/util.py b/script/util.py
index b7c37c72102..c9fada38c80 100644
--- a/script/util.py
+++ b/script/util.py
@@ -1,6 +1,7 @@
 """Utility functions for the scaffold script."""
 
 import argparse
+from typing import Any
 
 from .const import COMPONENT_DIR
 
@@ -13,3 +14,23 @@ def valid_integration(integration):
         )
 
     return integration
+
+
+_MANIFEST_SORT_KEYS = {"domain": ".domain", "name": ".name"}
+
+
+def _sort_manifest_keys(key: str) -> str:
+    """Sort manifest keys."""
+    return _MANIFEST_SORT_KEYS.get(key, key)
+
+
+def sort_manifest(manifest: dict[str, Any]) -> bool:
+    """Sort manifest."""
+    keys = list(manifest)
+    if (keys_sorted := sorted(keys, key=_sort_manifest_keys)) != keys:
+        sorted_manifest = {key: manifest[key] for key in keys_sorted}
+        manifest.clear()
+        manifest.update(sorted_manifest)
+        return True
+
+    return False
diff --git a/tests/common.py b/tests/common.py
index 0315ee6d845..f426d2aebd2 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -29,6 +29,7 @@ from typing import Any, Literal, NoReturn
 from unittest.mock import AsyncMock, Mock, patch
 
 from aiohttp.test_utils import unused_port as get_test_instance_port  # noqa: F401
+from annotatedyaml import load_yaml_dict, loader as yaml_loader
 import pytest
 from syrupy import SnapshotAssertion
 import voluptuous as vol
@@ -86,7 +87,10 @@ from homeassistant.helpers.dispatcher import (
     async_dispatcher_send,
 )
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.json import JSONEncoder, _orjson_default_encoder, json_dumps
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util, ulid as ulid_util
@@ -106,7 +110,6 @@ from homeassistant.util.json import (
 )
 from homeassistant.util.signal_type import SignalType
 from homeassistant.util.unit_system import METRIC_SYSTEM
-from homeassistant.util.yaml import load_yaml_dict, loader as yaml_loader
 
 from .testing_config.custom_components.test_constant_deprecation import (
     import_deprecated_constant,
@@ -407,6 +410,25 @@ def async_mock_intent(hass: HomeAssistant, intent_typ: str) -> list[intent.Inten
     return intents
 
 
+class MockMqttReasonCode:
+    """Class to fake a MQTT ReasonCode."""
+
+    value: int
+    is_failure: bool
+
+    def __init__(
+        self, value: int = 0, is_failure: bool = False, name: str = "Success"
+    ) -> None:
+        """Initialize the mock reason code."""
+        self.value = value
+        self.is_failure = is_failure
+        self._name = name
+
+    def getName(self) -> str:
+        """Return the name of the reason code."""
+        return self._name
+
+
 @callback
 def async_fire_mqtt_message(
     hass: HomeAssistant,
@@ -1004,6 +1026,7 @@ class MockConfigEntry(config_entries.ConfigEntry):
         reason=None,
         source=config_entries.SOURCE_USER,
         state=None,
+        subentries_data=None,
         title="Mock Title",
         unique_id=None,
         version=1,
@@ -1020,6 +1043,7 @@ class MockConfigEntry(config_entries.ConfigEntry):
             "options": options or {},
             "pref_disable_new_entities": pref_disable_new_entities,
             "pref_disable_polling": pref_disable_polling,
+            "subentries_data": subentries_data or (),
             "title": title,
             "unique_id": unique_id,
             "version": version,
@@ -1092,6 +1116,28 @@ class MockConfigEntry(config_entries.ConfigEntry):
             },
         )
 
+    async def start_subentry_reconfigure_flow(
+        self,
+        hass: HomeAssistant,
+        subentry_flow_type: str,
+        subentry_id: str,
+        *,
+        show_advanced_options: bool = False,
+    ) -> ConfigFlowResult:
+        """Start a subentry reconfiguration flow."""
+        if self.entry_id not in hass.config_entries._entries:
+            raise ValueError(
+                "Config entry must be added to hass to start reconfiguration flow"
+            )
+        return await hass.config_entries.subentries.async_init(
+            (self.entry_id, subentry_flow_type),
+            context={
+                "source": config_entries.SOURCE_RECONFIGURE,
+                "subentry_id": subentry_id,
+                "show_advanced_options": show_advanced_options,
+            },
+        )
+
 
 async def start_reauth_flow(
     hass: HomeAssistant,
@@ -1789,7 +1835,7 @@ def setup_test_component_platform(
         async def _async_setup_entry(
             hass: HomeAssistant,
             entry: ConfigEntry,
-            async_add_entities: AddEntitiesCallback,
+            async_add_entities: AddConfigEntryEntitiesCallback,
         ) -> None:
             """Set up a test component platform."""
             async_add_entities(entities)
@@ -1821,23 +1867,6 @@ async def snapshot_platform(
         assert state == snapshot(name=f"{entity_entry.entity_id}-state")
 
 
-def reset_translation_cache(hass: HomeAssistant, components: list[str]) -> None:
-    """Reset translation cache for specified components.
-
-    Use this if you are mocking a core component (for example via
-    mock_integration), to ensure that the mocked translations are not
-    persisted in the shared session cache.
-    """
-    translations_cache = translation._async_get_translations_cache(hass)
-    for loaded_components in translations_cache.cache_data.loaded.values():
-        for component_to_unload in components:
-            loaded_components.discard(component_to_unload)
-    for loaded_categories in translations_cache.cache_data.cache.values():
-        for loaded_components in loaded_categories.values():
-            for component_to_unload in components:
-                loaded_components.pop(component_to_unload, None)
-
-
 @lru_cache
 def get_quality_scale(integration: str) -> dict[str, QualityScaleStatus]:
     """Load quality scale for integration."""
diff --git a/tests/components/acaia/snapshots/test_binary_sensor.ambr b/tests/components/acaia/snapshots/test_binary_sensor.ambr
index 113b5f1501e..a9c52c052a3 100644
--- a/tests/components/acaia/snapshots/test_binary_sensor.ambr
+++ b/tests/components/acaia/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/acaia/snapshots/test_button.ambr b/tests/components/acaia/snapshots/test_button.ambr
index cd91ca1a17a..11827c0997f 100644
--- a/tests/components/acaia/snapshots/test_button.ambr
+++ b/tests/components/acaia/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/acaia/snapshots/test_init.ambr b/tests/components/acaia/snapshots/test_init.ambr
index 7011b20f68c..c7a11cb58df 100644
--- a/tests/components/acaia/snapshots/test_init.ambr
+++ b/tests/components/acaia/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': 'kitchen',
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
diff --git a/tests/components/acaia/snapshots/test_sensor.ambr b/tests/components/acaia/snapshots/test_sensor.ambr
index c3c8ce966ee..9214db4f102 100644
--- a/tests/components/acaia/snapshots/test_sensor.ambr
+++ b/tests/components/acaia/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -113,6 +115,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/accuweather/snapshots/test_sensor.ambr b/tests/components/accuweather/snapshots/test_sensor.ambr
index 3468d638bc0..cbd2e14207e 100644
--- a/tests/components/accuweather/snapshots/test_sensor.ambr
+++ b/tests/components/accuweather/snapshots/test_sensor.ambr
@@ -7,14 +7,14 @@
     'capabilities': dict({
       'options': list([
         'good',
-        'hazardous',
-        'high',
-        'low',
         'moderate',
         'unhealthy',
+        'very_unhealthy',
+        'hazardous',
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -49,11 +49,10 @@
       'friendly_name': 'Home Air quality day 0',
       'options': list([
         'good',
-        'hazardous',
-        'high',
-        'low',
         'moderate',
         'unhealthy',
+        'very_unhealthy',
+        'hazardous',
       ]),
     }),
     'context': <ANY>,
@@ -72,14 +71,14 @@
     'capabilities': dict({
       'options': list([
         'good',
-        'hazardous',
-        'high',
-        'low',
         'moderate',
         'unhealthy',
+        'very_unhealthy',
+        'hazardous',
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -114,11 +113,10 @@
       'friendly_name': 'Home Air quality day 1',
       'options': list([
         'good',
-        'hazardous',
-        'high',
-        'low',
         'moderate',
         'unhealthy',
+        'very_unhealthy',
+        'hazardous',
       ]),
     }),
     'context': <ANY>,
@@ -137,14 +135,14 @@
     'capabilities': dict({
       'options': list([
         'good',
-        'hazardous',
-        'high',
-        'low',
         'moderate',
         'unhealthy',
+        'very_unhealthy',
+        'hazardous',
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -179,11 +177,10 @@
       'friendly_name': 'Home Air quality day 2',
       'options': list([
         'good',
-        'hazardous',
-        'high',
-        'low',
         'moderate',
         'unhealthy',
+        'very_unhealthy',
+        'hazardous',
       ]),
     }),
     'context': <ANY>,
@@ -202,14 +199,14 @@
     'capabilities': dict({
       'options': list([
         'good',
-        'hazardous',
-        'high',
-        'low',
         'moderate',
         'unhealthy',
+        'very_unhealthy',
+        'hazardous',
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -244,11 +241,10 @@
       'friendly_name': 'Home Air quality day 3',
       'options': list([
         'good',
-        'hazardous',
-        'high',
-        'low',
         'moderate',
         'unhealthy',
+        'very_unhealthy',
+        'hazardous',
       ]),
     }),
     'context': <ANY>,
@@ -267,14 +263,14 @@
     'capabilities': dict({
       'options': list([
         'good',
-        'hazardous',
-        'high',
-        'low',
         'moderate',
         'unhealthy',
+        'very_unhealthy',
+        'hazardous',
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -309,11 +305,10 @@
       'friendly_name': 'Home Air quality day 4',
       'options': list([
         'good',
-        'hazardous',
-        'high',
-        'low',
         'moderate',
         'unhealthy',
+        'very_unhealthy',
+        'hazardous',
       ]),
     }),
     'context': <ANY>,
@@ -333,6 +328,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -385,6 +381,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -440,6 +437,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -489,6 +487,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -537,6 +536,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -585,6 +585,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -633,6 +634,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -681,6 +683,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -729,6 +732,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -777,6 +781,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -825,6 +830,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -873,6 +879,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -921,6 +928,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -969,6 +977,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1016,6 +1025,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1063,6 +1073,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1110,6 +1121,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1157,6 +1169,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1204,6 +1217,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1251,6 +1265,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1298,6 +1313,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1345,6 +1361,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1392,6 +1409,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1441,6 +1459,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1491,6 +1510,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1540,6 +1560,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1589,6 +1610,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1638,6 +1660,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1687,6 +1710,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1736,6 +1760,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1784,6 +1809,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1832,6 +1858,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1880,6 +1907,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1928,6 +1956,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1978,6 +2007,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2028,6 +2058,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2077,6 +2108,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2126,6 +2158,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2175,6 +2208,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2224,6 +2258,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2275,6 +2310,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2328,6 +2364,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2387,6 +2424,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2440,6 +2478,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2489,6 +2528,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2538,6 +2578,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2587,6 +2628,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2636,6 +2678,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2687,6 +2730,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2737,6 +2781,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2786,6 +2831,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2835,6 +2881,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2884,6 +2931,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2933,6 +2981,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2982,6 +3031,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3031,6 +3081,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3080,6 +3131,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3129,6 +3181,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3178,6 +3231,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3229,6 +3283,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3279,6 +3334,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3328,6 +3384,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3377,6 +3434,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3426,6 +3484,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3475,6 +3534,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3524,6 +3584,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3573,6 +3634,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3622,6 +3684,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3671,6 +3734,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3720,6 +3784,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3769,6 +3834,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3818,6 +3884,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3867,6 +3934,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3916,6 +3984,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3965,6 +4034,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4014,6 +4084,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4063,6 +4134,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4112,6 +4184,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4161,6 +4234,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4210,6 +4284,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4261,6 +4336,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4311,6 +4387,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4359,6 +4436,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4407,6 +4485,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4455,6 +4534,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4503,6 +4583,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4551,6 +4632,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4599,6 +4681,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4647,6 +4730,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4695,6 +4779,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4743,6 +4828,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4791,6 +4877,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4840,6 +4927,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4889,6 +4977,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4938,6 +5027,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4987,6 +5077,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5038,6 +5129,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5088,6 +5180,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5137,6 +5230,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5186,6 +5280,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5235,6 +5330,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5284,6 +5380,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5335,6 +5432,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5387,6 +5485,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5439,6 +5538,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5489,6 +5589,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5539,6 +5640,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5589,6 +5691,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5639,6 +5742,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5689,6 +5793,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5739,6 +5844,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5789,6 +5895,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5839,6 +5946,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5889,6 +5997,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5939,6 +6048,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5991,6 +6101,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6041,6 +6152,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6091,6 +6203,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6141,6 +6254,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6191,6 +6305,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6241,6 +6356,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6291,6 +6407,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6341,6 +6458,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6391,6 +6509,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6441,6 +6560,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6491,6 +6611,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/accuweather/snapshots/test_weather.ambr b/tests/components/accuweather/snapshots/test_weather.ambr
index cbe1891d216..862d79c2fde 100644
--- a/tests/components/accuweather/snapshots/test_weather.ambr
+++ b/tests/components/accuweather/snapshots/test_weather.ambr
@@ -247,6 +247,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/advantage_air/snapshots/test_climate.ambr b/tests/components/advantage_air/snapshots/test_climate.ambr
index bd1fb431ae1..b2559b5bdfd 100644
--- a/tests/components/advantage_air/snapshots/test_climate.ambr
+++ b/tests/components/advantage_air/snapshots/test_climate.ambr
@@ -30,6 +30,7 @@
         'auto',
       ]),
       'friendly_name': 'myauto',
+      'hvac_action': <HVACAction.COOLING: 'cooling'>,
       'hvac_modes': list([
         <HVACMode.OFF: 'off'>,
         <HVACMode.COOL: 'cool'>,
diff --git a/tests/components/aemet/snapshots/test_diagnostics.ambr b/tests/components/aemet/snapshots/test_diagnostics.ambr
index 0e40cce1b86..165e682de68 100644
--- a/tests/components/aemet/snapshots/test_diagnostics.ambr
+++ b/tests/components/aemet/snapshots/test_diagnostics.ambr
@@ -22,6 +22,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': '**REDACTED**',
       'version': 1,
diff --git a/tests/components/aemet/test_sensor.py b/tests/components/aemet/test_sensor.py
index d0f577c8068..d4fca62e98b 100644
--- a/tests/components/aemet/test_sensor.py
+++ b/tests/components/aemet/test_sensor.py
@@ -4,7 +4,7 @@ from freezegun.api import FrozenDateTimeFactory
 
 from homeassistant.components.weather import ATTR_CONDITION_SNOWY
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .util import async_init_integration
 
diff --git a/tests/components/airgradient/snapshots/test_button.ambr b/tests/components/airgradient/snapshots/test_button.ambr
index fa3f8994c3c..85ad29f98f2 100644
--- a/tests/components/airgradient/snapshots/test_button.ambr
+++ b/tests/components/airgradient/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/airgradient/snapshots/test_diagnostics.ambr b/tests/components/airgradient/snapshots/test_diagnostics.ambr
index a96dfb95382..624a6f76f8d 100644
--- a/tests/components/airgradient/snapshots/test_diagnostics.ambr
+++ b/tests/components/airgradient/snapshots/test_diagnostics.ambr
@@ -25,13 +25,13 @@
       'nitrogen_index': 1,
       'pm003_count': 270,
       'pm01': 22,
-      'pm02': 34,
+      'pm02': 34.0,
       'pm10': 41,
       'raw_ambient_temperature': 27.96,
-      'raw_nitrogen': 16931,
+      'raw_nitrogen': 16931.0,
       'raw_pm02': 34,
       'raw_relative_humidity': 48.0,
-      'raw_total_volatile_organic_component': 31792,
+      'raw_total_volatile_organic_component': 31792.0,
       'rco2': 778,
       'relative_humidity': 47.0,
       'serial_number': '84fce612f5b8',
diff --git a/tests/components/airgradient/snapshots/test_init.ambr b/tests/components/airgradient/snapshots/test_init.ambr
index 72cb12535f1..4e0c8027b43 100644
--- a/tests/components/airgradient/snapshots/test_init.ambr
+++ b/tests/components/airgradient/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -35,6 +36,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/airgradient/snapshots/test_number.ambr b/tests/components/airgradient/snapshots/test_number.ambr
index 87df8757eeb..f847a4a472d 100644
--- a/tests/components/airgradient/snapshots/test_number.ambr
+++ b/tests/components/airgradient/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -67,6 +68,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/airgradient/snapshots/test_select.ambr b/tests/components/airgradient/snapshots/test_select.ambr
index b8fca4a110b..cc080560ae5 100644
--- a/tests/components/airgradient/snapshots/test_select.ambr
+++ b/tests/components/airgradient/snapshots/test_select.ambr
@@ -15,6 +15,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -74,6 +75,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -129,6 +131,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -184,6 +187,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -240,6 +244,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -299,6 +304,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -360,6 +366,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -422,6 +429,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -481,6 +489,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -539,6 +548,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -600,6 +610,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/airgradient/snapshots/test_sensor.ambr b/tests/components/airgradient/snapshots/test_sensor.ambr
index 3db188bed95..374d9a60e4e 100644
--- a/tests/components/airgradient/snapshots/test_sensor.ambr
+++ b/tests/components/airgradient/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -57,6 +58,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -105,6 +107,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -157,6 +160,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -213,6 +217,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -266,6 +271,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -315,6 +321,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -368,6 +375,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -422,6 +430,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -469,6 +478,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -519,6 +529,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -569,6 +580,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -620,6 +632,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -671,6 +684,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -710,7 +724,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '34',
+    'state': '34.0',
   })
 # ---
 # name: test_all_entities[indoor][sensor.airgradient_raw_nox-entry]
@@ -722,6 +736,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -760,7 +775,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '16931',
+    'state': '16931.0',
   })
 # ---
 # name: test_all_entities[indoor][sensor.airgradient_raw_pm2_5-entry]
@@ -772,6 +787,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -823,6 +839,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -861,7 +878,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '31792',
+    'state': '31792.0',
   })
 # ---
 # name: test_all_entities[indoor][sensor.airgradient_signal_strength-entry]
@@ -873,6 +890,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -924,6 +942,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -975,6 +994,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1022,6 +1042,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1070,6 +1091,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1120,6 +1142,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1167,6 +1190,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1217,6 +1241,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1255,7 +1280,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '16359',
+    'state': '16359.0',
   })
 # ---
 # name: test_all_entities[outdoor][sensor.airgradient_raw_voc-entry]
@@ -1267,6 +1292,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1305,7 +1331,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '30802',
+    'state': '30802.0',
   })
 # ---
 # name: test_all_entities[outdoor][sensor.airgradient_signal_strength-entry]
@@ -1317,6 +1343,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1368,6 +1395,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1415,6 +1443,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/airgradient/snapshots/test_switch.ambr b/tests/components/airgradient/snapshots/test_switch.ambr
index 752355dbe97..ae2116d5b29 100644
--- a/tests/components/airgradient/snapshots/test_switch.ambr
+++ b/tests/components/airgradient/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/airgradient/snapshots/test_update.ambr b/tests/components/airgradient/snapshots/test_update.ambr
index 1f944bb528b..53c815629f2 100644
--- a/tests/components/airgradient/snapshots/test_update.ambr
+++ b/tests/components/airgradient/snapshots/test_update.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/airly/snapshots/test_diagnostics.ambr b/tests/components/airly/snapshots/test_diagnostics.ambr
index ec501b2fd7e..1c760eaec52 100644
--- a/tests/components/airly/snapshots/test_diagnostics.ambr
+++ b/tests/components/airly/snapshots/test_diagnostics.ambr
@@ -19,6 +19,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Home',
       'unique_id': '**REDACTED**',
       'version': 1,
diff --git a/tests/components/airly/snapshots/test_sensor.ambr b/tests/components/airly/snapshots/test_sensor.ambr
index 23a4d13cd00..134023f34e0 100644
--- a/tests/components/airly/snapshots/test_sensor.ambr
+++ b/tests/components/airly/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -62,6 +63,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -118,6 +120,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -173,6 +176,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -230,6 +234,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -287,6 +292,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -342,6 +348,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -399,6 +406,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -456,6 +464,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -511,6 +520,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -568,6 +578,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/airnow/snapshots/test_diagnostics.ambr b/tests/components/airnow/snapshots/test_diagnostics.ambr
index 3dd4788dc61..73ba6a7123f 100644
--- a/tests/components/airnow/snapshots/test_diagnostics.ambr
+++ b/tests/components/airnow/snapshots/test_diagnostics.ambr
@@ -35,6 +35,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': '**REDACTED**',
       'unique_id': '**REDACTED**',
       'version': 2,
diff --git a/tests/components/airq/test_config_flow.py b/tests/components/airq/test_config_flow.py
index d70c1526510..09da6343e05 100644
--- a/tests/components/airq/test_config_flow.py
+++ b/tests/components/airq/test_config_flow.py
@@ -1,5 +1,6 @@
 """Test the air-Q config flow."""
 
+import logging
 from unittest.mock import patch
 
 from aioairq import DeviceInfo, InvalidAuth
@@ -37,8 +38,9 @@ DEFAULT_OPTIONS = {
 }
 
 
-async def test_form(hass: HomeAssistant) -> None:
+async def test_form(hass: HomeAssistant, caplog: pytest.LogCaptureFixture) -> None:
     """Test we get the form."""
+    caplog.set_level(logging.DEBUG)
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
@@ -54,6 +56,7 @@ async def test_form(hass: HomeAssistant) -> None:
             TEST_USER_DATA,
         )
         await hass.async_block_till_done()
+        assert f"Creating an entry for {TEST_DEVICE_INFO['name']}" in caplog.text
 
     assert result2["type"] is FlowResultType.CREATE_ENTRY
     assert result2["title"] == TEST_DEVICE_INFO["name"]
diff --git a/tests/components/airq/test_coordinator.py b/tests/components/airq/test_coordinator.py
new file mode 100644
index 00000000000..69f7c9dee17
--- /dev/null
+++ b/tests/components/airq/test_coordinator.py
@@ -0,0 +1,129 @@
+"""Test the air-Q coordinator."""
+
+import logging
+from unittest.mock import patch
+
+from aioairq import DeviceInfo as AirQDeviceInfo
+import pytest
+
+from homeassistant.components.airq import AirQCoordinator
+from homeassistant.components.airq.const import DOMAIN
+from homeassistant.const import CONF_IP_ADDRESS, CONF_PASSWORD
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import DeviceInfo
+
+from tests.common import MockConfigEntry
+
+pytestmark = pytest.mark.usefixtures("mock_setup_entry")
+MOCKED_ENTRY = MockConfigEntry(
+    domain=DOMAIN,
+    data={
+        CONF_IP_ADDRESS: "192.168.0.0",
+        CONF_PASSWORD: "password",
+    },
+    unique_id="123-456",
+)
+
+TEST_DEVICE_INFO = AirQDeviceInfo(
+    id="id",
+    name="name",
+    model="model",
+    sw_version="sw",
+    hw_version="hw",
+)
+TEST_DEVICE_DATA = {"co2": 500.0, "Status": "OK"}
+STATUS_WARMUP = {
+    "co": "co sensor still in warm up phase; waiting time = 18 s",
+    "tvoc": "tvoc sensor still in warm up phase; waiting time = 18 s",
+    "so2": "so2 sensor still in warm up phase; waiting time = 17 s",
+}
+
+
+async def test_logging_in_coordinator_first_update_data(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test that the first AirQCoordinator._async_update_data call logs necessary setup.
+
+    The fields of AirQCoordinator.device_info that are specific to the device are only
+    populated upon the first call to AirQCoordinator._async_update_data. The one field
+    which is actually necessary is 'name', and its absence is checked and logged,
+    as well as its being set.
+    """
+    caplog.set_level(logging.DEBUG)
+    coordinator = AirQCoordinator(hass, MOCKED_ENTRY)
+
+    # check that the name _is_ missing
+    assert "name" not in coordinator.device_info
+
+    # First call: fetch missing device info
+    with (
+        patch("aioairq.AirQ.fetch_device_info", return_value=TEST_DEVICE_INFO),
+        patch("aioairq.AirQ.get_latest_data", return_value=TEST_DEVICE_DATA),
+    ):
+        await coordinator._async_update_data()
+
+    # check that the missing name is logged...
+    assert (
+        "'name' not found in AirQCoordinator.device_info, fetching from the device"
+        in caplog.text
+    )
+    # ...and fixed
+    assert coordinator.device_info.get("name") == TEST_DEVICE_INFO["name"]
+    assert (
+        f"Updated AirQCoordinator.device_info for 'name' {TEST_DEVICE_INFO['name']}"
+        in caplog.text
+    )
+
+    # Also that no warming up sensors is found as none are mocked
+    assert "Following sensors are still warming up" not in caplog.text
+
+
+async def test_logging_in_coordinator_subsequent_update_data(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test that the second AirQCoordinator._async_update_data call has nothing to log.
+
+    The second call is emulated by setting up AirQCoordinator.device_info correctly,
+    instead of actually calling the _async_update_data, which would populate the log
+    with the messages we want to see not being repeated.
+    """
+    caplog.set_level(logging.DEBUG)
+    coordinator = AirQCoordinator(hass, MOCKED_ENTRY)
+    coordinator.device_info.update(DeviceInfo(**TEST_DEVICE_INFO))
+
+    with (
+        patch("aioairq.AirQ.fetch_device_info", return_value=TEST_DEVICE_INFO),
+        patch("aioairq.AirQ.get_latest_data", return_value=TEST_DEVICE_DATA),
+    ):
+        await coordinator._async_update_data()
+    # check that the name _is not_ missing
+    assert "name" in coordinator.device_info
+    # and that nothing of the kind is logged
+    assert (
+        "'name' not found in AirQCoordinator.device_info, fetching from the device"
+        not in caplog.text
+    )
+    assert (
+        f"Updated AirQCoordinator.device_info for 'name' {TEST_DEVICE_INFO['name']}"
+        not in caplog.text
+    )
+
+
+async def test_logging_when_warming_up_sensor_present(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test that warming up sensors are logged."""
+    caplog.set_level(logging.DEBUG)
+    coordinator = AirQCoordinator(hass, MOCKED_ENTRY)
+    with (
+        patch("aioairq.AirQ.fetch_device_info", return_value=TEST_DEVICE_INFO),
+        patch(
+            "aioairq.AirQ.get_latest_data",
+            return_value=TEST_DEVICE_DATA | {"Status": STATUS_WARMUP},
+        ),
+    ):
+        await coordinator._async_update_data()
+    assert (
+        f"Following sensors are still warming up: {set(STATUS_WARMUP.keys())}"
+        in caplog.text
+    )
diff --git a/tests/components/airthings_ble/test_config_flow.py b/tests/components/airthings_ble/test_config_flow.py
index 79ae46500dd..2adc5498e7b 100644
--- a/tests/components/airthings_ble/test_config_flow.py
+++ b/tests/components/airthings_ble/test_config_flow.py
@@ -7,7 +7,7 @@ from bleak import BleakError
 import pytest
 
 from homeassistant.components.airthings_ble.const import DOMAIN
-from homeassistant.config_entries import SOURCE_BLUETOOTH, SOURCE_USER
+from homeassistant.config_entries import SOURCE_BLUETOOTH, SOURCE_IGNORE, SOURCE_USER
 from homeassistant.const import CONF_ADDRESS
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
@@ -153,6 +153,56 @@ async def test_user_setup(hass: HomeAssistant) -> None:
     assert result["result"].unique_id == "cc:cc:cc:cc:cc:cc"
 
 
+async def test_user_setup_replaces_ignored_device(hass: HomeAssistant) -> None:
+    """Test the user initiated form can replace an ignored device."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id="cc:cc:cc:cc:cc:cc",
+        source=SOURCE_IGNORE,
+    )
+    entry.add_to_hass(hass)
+    with (
+        patch(
+            "homeassistant.components.airthings_ble.config_flow.async_discovered_service_info",
+            return_value=[WAVE_SERVICE_INFO],
+        ),
+        patch_async_ble_device_from_address(WAVE_SERVICE_INFO),
+        patch_airthings_ble(
+            AirthingsDevice(
+                manufacturer="Airthings AS",
+                model=AirthingsDeviceType.WAVE_PLUS,
+                name="Airthings Wave Plus",
+                identifier="123456",
+            )
+        ),
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_USER}
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] is None
+    assert result["data_schema"] is not None
+    schema = result["data_schema"].schema
+
+    assert schema.get(CONF_ADDRESS).container == {
+        "cc:cc:cc:cc:cc:cc": "Airthings Wave Plus"
+    }
+
+    with patch(
+        "homeassistant.components.airthings_ble.async_setup_entry",
+        return_value=True,
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input={CONF_ADDRESS: "cc:cc:cc:cc:cc:cc"}
+        )
+
+    await hass.async_block_till_done()
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "Airthings Wave Plus (123456)"
+    assert result["result"].unique_id == "cc:cc:cc:cc:cc:cc"
+
+
 async def test_user_setup_no_device(hass: HomeAssistant) -> None:
     """Test the user initiated form without any device detected."""
     with patch(
diff --git a/tests/components/airtouch5/snapshots/test_cover.ambr b/tests/components/airtouch5/snapshots/test_cover.ambr
index a8e57f69527..d2ae3cddc7f 100644
--- a/tests/components/airtouch5/snapshots/test_cover.ambr
+++ b/tests/components/airtouch5/snapshots/test_cover.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -55,6 +56,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/airvisual/snapshots/test_diagnostics.ambr b/tests/components/airvisual/snapshots/test_diagnostics.ambr
index 606d6082351..0dbdef1d508 100644
--- a/tests/components/airvisual/snapshots/test_diagnostics.ambr
+++ b/tests/components/airvisual/snapshots/test_diagnostics.ambr
@@ -47,6 +47,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': '**REDACTED**',
       'unique_id': '**REDACTED**',
       'version': 3,
diff --git a/tests/components/airvisual_pro/snapshots/test_diagnostics.ambr b/tests/components/airvisual_pro/snapshots/test_diagnostics.ambr
index cb1d3a7aee7..113db6e3b96 100644
--- a/tests/components/airvisual_pro/snapshots/test_diagnostics.ambr
+++ b/tests/components/airvisual_pro/snapshots/test_diagnostics.ambr
@@ -101,6 +101,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': 'XXXXXXX',
       'version': 1,
diff --git a/tests/components/airzone/snapshots/test_diagnostics.ambr b/tests/components/airzone/snapshots/test_diagnostics.ambr
index 0c3c0ba7c7a..b4976c07e1b 100644
--- a/tests/components/airzone/snapshots/test_diagnostics.ambr
+++ b/tests/components/airzone/snapshots/test_diagnostics.ambr
@@ -289,6 +289,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': '**REDACTED**',
       'version': 1,
diff --git a/tests/components/airzone_cloud/snapshots/test_diagnostics.ambr b/tests/components/airzone_cloud/snapshots/test_diagnostics.ambr
index c6ad36916bf..4bd7bfaccdd 100644
--- a/tests/components/airzone_cloud/snapshots/test_diagnostics.ambr
+++ b/tests/components/airzone_cloud/snapshots/test_diagnostics.ambr
@@ -101,6 +101,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': 'installation1',
       'version': 1,
diff --git a/tests/components/aladdin_connect/test_init.py b/tests/components/aladdin_connect/test_init.py
index b01af287b7b..b2ef0a722fd 100644
--- a/tests/components/aladdin_connect/test_init.py
+++ b/tests/components/aladdin_connect/test_init.py
@@ -1,7 +1,11 @@
 """Tests for the Aladdin Connect integration."""
 
 from homeassistant.components.aladdin_connect import DOMAIN
-from homeassistant.config_entries import ConfigEntryState
+from homeassistant.config_entries import (
+    SOURCE_IGNORE,
+    ConfigEntryDisabler,
+    ConfigEntryState,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import issue_registry as ir
 
@@ -33,6 +37,28 @@ async def test_aladdin_connect_repair_issue(
     assert config_entry_2.state is ConfigEntryState.LOADED
     assert issue_registry.async_get_issue(DOMAIN, DOMAIN)
 
+    # Add an ignored entry
+    config_entry_3 = MockConfigEntry(
+        source=SOURCE_IGNORE,
+        domain=DOMAIN,
+    )
+    config_entry_3.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry_3.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry_3.state is ConfigEntryState.NOT_LOADED
+
+    # Add a disabled entry
+    config_entry_4 = MockConfigEntry(
+        disabled_by=ConfigEntryDisabler.USER,
+        domain=DOMAIN,
+    )
+    config_entry_4.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry_4.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry_4.state is ConfigEntryState.NOT_LOADED
+
     # Remove the first one
     await hass.config_entries.async_remove(config_entry_1.entry_id)
     await hass.async_block_till_done()
@@ -48,3 +74,6 @@ async def test_aladdin_connect_repair_issue(
     assert config_entry_1.state is ConfigEntryState.NOT_LOADED
     assert config_entry_2.state is ConfigEntryState.NOT_LOADED
     assert issue_registry.async_get_issue(DOMAIN, DOMAIN) is None
+
+    # Check the ignored and disabled entries are removed
+    assert not hass.config_entries.async_entries(DOMAIN)
diff --git a/tests/components/alarm_control_panel/conftest.py b/tests/components/alarm_control_panel/conftest.py
index ddf67b27860..541644def38 100644
--- a/tests/components/alarm_control_panel/conftest.py
+++ b/tests/components/alarm_control_panel/conftest.py
@@ -14,7 +14,7 @@ from homeassistant.components.alarm_control_panel.const import CodeFormat
 from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er, frame
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .common import MockAlarm
 
@@ -194,7 +194,7 @@ async def setup_alarm_control_panel_platform_test_entity(
     async def async_setup_entry_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test alarm control panel platform via config entry."""
         async_add_entities([entity])
diff --git a/tests/components/alarm_control_panel/test_device_trigger.py b/tests/components/alarm_control_panel/test_device_trigger.py
index 17a301ccdf1..3efacb80560 100644
--- a/tests/components/alarm_control_panel/test_device_trigger.py
+++ b/tests/components/alarm_control_panel/test_device_trigger.py
@@ -16,7 +16,7 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/alarm_control_panel/test_init.py b/tests/components/alarm_control_panel/test_init.py
index 168d7ecc269..01d103d01aa 100644
--- a/tests/components/alarm_control_panel/test_init.py
+++ b/tests/components/alarm_control_panel/test_init.py
@@ -1,7 +1,6 @@
 """Test for the alarm control panel const module."""
 
 from typing import Any
-from unittest.mock import patch
 
 import pytest
 
@@ -23,7 +22,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers import entity_registry as er, frame
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.typing import UNDEFINED, UndefinedType
 
 from . import help_async_setup_entry_init, help_async_unload_entry
@@ -222,7 +221,6 @@ async def test_alarm_control_panel_with_default_code(
     mock_alarm_control_panel_entity.calls_disarm.assert_called_with("1234")
 
 
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
 async def test_alarm_control_panel_not_log_deprecated_state_warning(
     hass: HomeAssistant,
     mock_alarm_control_panel_entity: MockAlarmControlPanel,
@@ -238,7 +236,6 @@ async def test_alarm_control_panel_not_log_deprecated_state_warning(
 
 
 @pytest.mark.usefixtures("mock_as_custom_component")
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
 async def test_alarm_control_panel_log_deprecated_state_warning_using_state_prop(
     hass: HomeAssistant,
     code_format: CodeFormat | None,
@@ -292,18 +289,17 @@ async def test_alarm_control_panel_log_deprecated_state_warning_using_state_prop
     assert state is not None
 
     assert (
-        "Detected that custom integration 'alarm_control_panel' is setting state"
-        " directly. Entity None (<class 'tests.components.alarm_control_panel."
+        "Detected that custom integration 'test' is setting state "
+        "directly. Entity None (<class 'tests.components.alarm_control_panel."
         "test_init.test_alarm_control_panel_log_deprecated_state_warning_using"
         "_state_prop.<locals>.MockLegacyAlarmControlPanel'>) should implement"
         " the 'alarm_state' property and return its state using the AlarmControlPanelState"
-        " enum at test_init.py, line 123: yield. This will stop working in Home Assistant"
-        " 2025.11, please create a bug report at" in caplog.text
+        " enum. This will stop working in Home Assistant 2025.11, please report it to"
+        " the author of the 'test' custom integration" in caplog.text
     )
 
 
 @pytest.mark.usefixtures("mock_as_custom_component")
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
 async def test_alarm_control_panel_log_deprecated_state_warning_using_attr_state_attr(
     hass: HomeAssistant,
     code_format: CodeFormat | None,
@@ -345,6 +341,7 @@ async def test_alarm_control_panel_log_deprecated_state_warning_using_attr_state
             async_setup_entry=help_async_setup_entry_init,
             async_unload_entry=help_async_unload_entry,
         ),
+        built_in=False,
     )
     setup_test_component_platform(
         hass, ALARM_CONTROL_PANEL_DOMAIN, [entity], from_config_entry=True
@@ -355,7 +352,7 @@ async def test_alarm_control_panel_log_deprecated_state_warning_using_attr_state
     assert state is not None
 
     assert (
-        "Detected that custom integration 'alarm_control_panel' is setting state directly."
+        "Detected that custom integration 'test' is setting state directly."
         not in caplog.text
     )
 
@@ -364,14 +361,14 @@ async def test_alarm_control_panel_log_deprecated_state_warning_using_attr_state
     )
 
     assert (
-        "Detected that custom integration 'alarm_control_panel' is setting state directly."
+        "Detected that custom integration 'test' is setting state directly."
         " Entity alarm_control_panel.test_alarm_control_panel"
         " (<class 'tests.components.alarm_control_panel.test_init."
         "test_alarm_control_panel_log_deprecated_state_warning_using_attr_state_attr."
         "<locals>.MockLegacyAlarmControlPanel'>) should implement the 'alarm_state' property"
-        " and return its state using the AlarmControlPanelState enum at test_init.py, line 123:"
-        " yield. This will stop working in Home Assistant 2025.11,"
-        " please create a bug report at" in caplog.text
+        " and return its state using the AlarmControlPanelState enum. "
+        "This will stop working in Home Assistant 2025.11, please report "
+        "it to the author of the 'test' custom integration" in caplog.text
     )
     caplog.clear()
     await help_test_async_alarm_control_panel_service(
@@ -379,13 +376,12 @@ async def test_alarm_control_panel_log_deprecated_state_warning_using_attr_state
     )
     # Test we only log once
     assert (
-        "Detected that custom integration 'alarm_control_panel' is setting state directly."
+        "Detected that custom integration 'test' is setting state directly."
         not in caplog.text
     )
 
 
 @pytest.mark.usefixtures("mock_as_custom_component")
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
 async def test_alarm_control_panel_deprecated_state_does_not_break_state(
     hass: HomeAssistant,
     code_format: CodeFormat | None,
@@ -428,6 +424,7 @@ async def test_alarm_control_panel_deprecated_state_does_not_break_state(
             async_setup_entry=help_async_setup_entry_init,
             async_unload_entry=help_async_unload_entry,
         ),
+        built_in=False,
     )
     setup_test_component_platform(
         hass, ALARM_CONTROL_PANEL_DOMAIN, [entity], from_config_entry=True
diff --git a/tests/components/alert/test_init.py b/tests/components/alert/test_init.py
index 27997a093e5..4407775a582 100644
--- a/tests/components/alert/test_init.py
+++ b/tests/components/alert/test_init.py
@@ -28,6 +28,7 @@ from homeassistant.const import (
     STATE_ON,
 )
 from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.exceptions import ServiceValidationError
 from homeassistant.setup import async_setup_component
 
 from tests.common import MockEntityPlatform, async_mock_service
@@ -116,6 +117,35 @@ async def test_silence(hass: HomeAssistant, mock_notifier: list[ServiceCall]) ->
     assert hass.states.get(ENTITY_ID).state == STATE_ON
 
 
+async def test_silence_can_acknowledge_false(hass: HomeAssistant) -> None:
+    """Test that attempting to silence an alert with can_acknowledge=False will not silence."""
+    # Create copy of config where can_acknowledge is False
+    config = deepcopy(TEST_CONFIG)
+    config[DOMAIN][NAME]["can_acknowledge"] = False
+
+    # Setup the alert component
+    assert await async_setup_component(hass, DOMAIN, config)
+    await hass.async_block_till_done()
+
+    # Ensure the alert is currently on
+    hass.states.async_set(ENTITY_ID, STATE_ON)
+    await hass.async_block_till_done()
+    assert hass.states.get(ENTITY_ID).state == STATE_ON
+
+    # Attempt to acknowledge
+    with pytest.raises(ServiceValidationError):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_TURN_OFF,
+            {ATTR_ENTITY_ID: ENTITY_ID},
+            blocking=True,
+        )
+    await hass.async_block_till_done()
+
+    # The state should still be ON because can_acknowledge=False
+    assert hass.states.get(ENTITY_ID).state == STATE_ON
+
+
 async def test_reset(hass: HomeAssistant, mock_notifier: list[ServiceCall]) -> None:
     """Test resetting the alert."""
     assert await async_setup_component(hass, DOMAIN, TEST_CONFIG)
diff --git a/tests/components/amberelectric/test_coordinator.py b/tests/components/amberelectric/test_coordinator.py
index 0a8f5b874fa..6faabc924b4 100644
--- a/tests/components/amberelectric/test_coordinator.py
+++ b/tests/components/amberelectric/test_coordinator.py
@@ -16,10 +16,12 @@ from amberelectric.models.spike_status import SpikeStatus
 from dateutil import parser
 import pytest
 
+from homeassistant.components.amberelectric.const import CONF_SITE_ID, CONF_SITE_NAME
 from homeassistant.components.amberelectric.coordinator import (
     AmberUpdateCoordinator,
     normalize_descriptor,
 )
+from homeassistant.const import CONF_API_TOKEN
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import UpdateFailed
 
@@ -33,6 +35,17 @@ from .helpers import (
     generate_current_interval,
 )
 
+from tests.common import MockConfigEntry
+
+MOCKED_ENTRY = MockConfigEntry(
+    domain="amberelectric",
+    data={
+        CONF_SITE_NAME: "mock_title",
+        CONF_API_TOKEN: "psk_0000000000000000",
+        CONF_SITE_ID: GENERAL_ONLY_SITE_ID,
+    },
+)
+
 
 @pytest.fixture(name="current_price_api")
 def mock_api_current_price() -> Generator:
@@ -101,7 +114,9 @@ async def test_fetch_general_site(hass: HomeAssistant, current_price_api: Mock)
     """Test fetching a site with only a general channel."""
 
     current_price_api.get_current_prices.return_value = GENERAL_CHANNEL
-    data_service = AmberUpdateCoordinator(hass, current_price_api, GENERAL_ONLY_SITE_ID)
+    data_service = AmberUpdateCoordinator(
+        hass, MOCKED_ENTRY, current_price_api, GENERAL_ONLY_SITE_ID
+    )
     result = await data_service._async_update_data()
 
     current_price_api.get_current_prices.assert_called_with(
@@ -130,7 +145,9 @@ async def test_fetch_no_general_site(
     """Test fetching a site with no general channel."""
 
     current_price_api.get_current_prices.return_value = CONTROLLED_LOAD_CHANNEL
-    data_service = AmberUpdateCoordinator(hass, current_price_api, GENERAL_ONLY_SITE_ID)
+    data_service = AmberUpdateCoordinator(
+        hass, MOCKED_ENTRY, current_price_api, GENERAL_ONLY_SITE_ID
+    )
     with pytest.raises(UpdateFailed):
         await data_service._async_update_data()
 
@@ -143,7 +160,9 @@ async def test_fetch_api_error(hass: HomeAssistant, current_price_api: Mock) ->
     """Test that the old values are maintained if a second call fails."""
 
     current_price_api.get_current_prices.return_value = GENERAL_CHANNEL
-    data_service = AmberUpdateCoordinator(hass, current_price_api, GENERAL_ONLY_SITE_ID)
+    data_service = AmberUpdateCoordinator(
+        hass, MOCKED_ENTRY, current_price_api, GENERAL_ONLY_SITE_ID
+    )
     result = await data_service._async_update_data()
 
     current_price_api.get_current_prices.assert_called_with(
@@ -193,7 +212,7 @@ async def test_fetch_general_and_controlled_load_site(
         GENERAL_CHANNEL + CONTROLLED_LOAD_CHANNEL
     )
     data_service = AmberUpdateCoordinator(
-        hass, current_price_api, GENERAL_AND_CONTROLLED_SITE_ID
+        hass, MOCKED_ENTRY, current_price_api, GENERAL_AND_CONTROLLED_SITE_ID
     )
     result = await data_service._async_update_data()
 
@@ -233,7 +252,7 @@ async def test_fetch_general_and_feed_in_site(
         GENERAL_CHANNEL + FEED_IN_CHANNEL
     )
     data_service = AmberUpdateCoordinator(
-        hass, current_price_api, GENERAL_AND_FEED_IN_SITE_ID
+        hass, MOCKED_ENTRY, current_price_api, GENERAL_AND_FEED_IN_SITE_ID
     )
     result = await data_service._async_update_data()
 
@@ -273,7 +292,9 @@ async def test_fetch_potential_spike(
     ]
     general_channel[0].actual_instance.spike_status = SpikeStatus.POTENTIAL
     current_price_api.get_current_prices.return_value = general_channel
-    data_service = AmberUpdateCoordinator(hass, current_price_api, GENERAL_ONLY_SITE_ID)
+    data_service = AmberUpdateCoordinator(
+        hass, MOCKED_ENTRY, current_price_api, GENERAL_ONLY_SITE_ID
+    )
     result = await data_service._async_update_data()
     assert result["grid"]["price_spike"] == "potential"
 
@@ -288,6 +309,8 @@ async def test_fetch_spike(hass: HomeAssistant, current_price_api: Mock) -> None
     ]
     general_channel[0].actual_instance.spike_status = SpikeStatus.SPIKE
     current_price_api.get_current_prices.return_value = general_channel
-    data_service = AmberUpdateCoordinator(hass, current_price_api, GENERAL_ONLY_SITE_ID)
+    data_service = AmberUpdateCoordinator(
+        hass, MOCKED_ENTRY, current_price_api, GENERAL_ONLY_SITE_ID
+    )
     result = await data_service._async_update_data()
     assert result["grid"]["price_spike"] == "spike"
diff --git a/tests/components/ambient_network/snapshots/test_sensor.ambr b/tests/components/ambient_network/snapshots/test_sensor.ambr
index fd48184ca0b..ddf05c99b88 100644
--- a/tests/components/ambient_network/snapshots/test_sensor.ambr
+++ b/tests/components/ambient_network/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -67,6 +68,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -126,6 +128,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -182,6 +185,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -238,6 +242,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -297,6 +302,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -353,6 +359,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -407,6 +414,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -458,6 +466,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -517,6 +526,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -576,6 +586,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -635,6 +646,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -691,6 +703,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -746,6 +759,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -801,8 +815,11 @@
     'aliases': set({
     }),
     'area_id': None,
-    'capabilities': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
+    }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -821,7 +838,7 @@
         'suggested_display_precision': 0,
       }),
     }),
-    'original_device_class': None,
+    'original_device_class': <SensorDeviceClass.WIND_DIRECTION: 'wind_direction'>,
     'original_icon': None,
     'original_name': 'Wind direction',
     'platform': 'ambient_network',
@@ -836,8 +853,10 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'attribution': 'Data provided by ambientnetwork.net',
+      'device_class': 'wind_direction',
       'friendly_name': 'Station A Wind direction',
       'last_measured': HAFakeDatetime(2023, 11, 8, 12, 12, 0, 914000, tzinfo=zoneinfo.ZoneInfo(key='US/Pacific')),
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
       'unit_of_measurement': '°',
     }),
     'context': <ANY>,
@@ -857,6 +876,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -916,6 +936,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -975,6 +996,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1034,6 +1056,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1093,6 +1116,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1149,6 +1173,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1205,6 +1230,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1264,6 +1290,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1320,6 +1347,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1374,6 +1402,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1425,6 +1454,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1484,6 +1514,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1543,6 +1574,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1602,6 +1634,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1658,6 +1691,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1713,6 +1747,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1768,8 +1803,11 @@
     'aliases': set({
     }),
     'area_id': None,
-    'capabilities': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
+    }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1788,7 +1826,7 @@
         'suggested_display_precision': 0,
       }),
     }),
-    'original_device_class': None,
+    'original_device_class': <SensorDeviceClass.WIND_DIRECTION: 'wind_direction'>,
     'original_icon': None,
     'original_name': 'Wind direction',
     'platform': 'ambient_network',
@@ -1803,8 +1841,10 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'attribution': 'Data provided by ambientnetwork.net',
+      'device_class': 'wind_direction',
       'friendly_name': 'Station C Wind direction',
       'last_measured': HAFakeDatetime(2024, 6, 6, 8, 28, 3, tzinfo=zoneinfo.ZoneInfo(key='US/Pacific')),
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
       'unit_of_measurement': '°',
     }),
     'context': <ANY>,
@@ -1824,6 +1864,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1883,6 +1924,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1942,6 +1984,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2000,6 +2043,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2058,6 +2102,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2113,6 +2158,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2168,6 +2214,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2226,6 +2273,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2281,6 +2329,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2336,6 +2385,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2394,6 +2444,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2452,6 +2503,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2510,6 +2562,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2565,6 +2618,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2619,6 +2673,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2673,8 +2728,11 @@
     'aliases': set({
     }),
     'area_id': None,
-    'capabilities': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
+    }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2693,7 +2751,7 @@
         'suggested_display_precision': 0,
       }),
     }),
-    'original_device_class': None,
+    'original_device_class': <SensorDeviceClass.WIND_DIRECTION: 'wind_direction'>,
     'original_icon': None,
     'original_name': 'Wind direction',
     'platform': 'ambient_network',
@@ -2708,7 +2766,9 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'attribution': 'Data provided by ambientnetwork.net',
+      'device_class': 'wind_direction',
       'friendly_name': 'Station D Wind direction',
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
       'unit_of_measurement': '°',
     }),
     'context': <ANY>,
@@ -2728,6 +2788,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2786,6 +2847,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ambient_station/snapshots/test_diagnostics.ambr b/tests/components/ambient_station/snapshots/test_diagnostics.ambr
index 2f90b09d39f..07db19101ab 100644
--- a/tests/components/ambient_station/snapshots/test_diagnostics.ambr
+++ b/tests/components/ambient_station/snapshots/test_diagnostics.ambr
@@ -17,6 +17,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': '**REDACTED**',
       'unique_id': '**REDACTED**',
       'version': 2,
diff --git a/tests/components/analytics_insights/snapshots/test_sensor.ambr b/tests/components/analytics_insights/snapshots/test_sensor.ambr
index 6e11b344b0b..799738eb677 100644
--- a/tests/components/analytics_insights/snapshots/test_sensor.ambr
+++ b/tests/components/analytics_insights/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -58,6 +59,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -108,6 +110,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -158,6 +161,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -208,6 +212,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -258,6 +263,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -308,6 +314,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/anthropic/conftest.py b/tests/components/anthropic/conftest.py
index ce6b98c480c..7419ea6c28f 100644
--- a/tests/components/anthropic/conftest.py
+++ b/tests/components/anthropic/conftest.py
@@ -1,10 +1,11 @@
 """Tests helpers."""
 
 from collections.abc import AsyncGenerator
-from unittest.mock import AsyncMock, patch
+from unittest.mock import patch
 
 import pytest
 
+from homeassistant.components.anthropic import CONF_CHAT_MODEL
 from homeassistant.const import CONF_LLM_HASS_API
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import llm
@@ -38,14 +39,27 @@ def mock_config_entry_with_assist(
     return mock_config_entry
 
 
+@pytest.fixture
+def mock_config_entry_with_extended_thinking(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry
+) -> MockConfigEntry:
+    """Mock a config entry with assist."""
+    hass.config_entries.async_update_entry(
+        mock_config_entry,
+        options={
+            CONF_LLM_HASS_API: llm.LLM_API_ASSIST,
+            CONF_CHAT_MODEL: "claude-3-7-sonnet-latest",
+        },
+    )
+    return mock_config_entry
+
+
 @pytest.fixture
 async def mock_init_component(
     hass: HomeAssistant, mock_config_entry: MockConfigEntry
 ) -> AsyncGenerator[None]:
     """Initialize integration."""
-    with patch(
-        "anthropic.resources.messages.AsyncMessages.create", new_callable=AsyncMock
-    ):
+    with patch("anthropic.resources.models.AsyncModels.retrieve"):
         assert await async_setup_component(hass, "anthropic", {})
         await hass.async_block_till_done()
         yield
diff --git a/tests/components/anthropic/snapshots/test_conversation.ambr b/tests/components/anthropic/snapshots/test_conversation.ambr
index e4dd7cd00bb..c0ed986f002 100644
--- a/tests/components/anthropic/snapshots/test_conversation.ambr
+++ b/tests/components/anthropic/snapshots/test_conversation.ambr
@@ -1,7 +1,325 @@
 # serializer version: 1
+# name: test_extended_thinking_tool_call
+  list([
+    dict({
+      'content': '''
+        Current time is 16:00:00. Today's date is 2024-06-03.
+        You are a voice assistant for Home Assistant.
+        Answer questions about the world truthfully.
+        Answer in plain text. Keep it simple and to the point.
+        Only if the user wants to control a device, tell them to expose entities to their voice assistant in Home Assistant.
+      ''',
+      'role': 'system',
+    }),
+    dict({
+      'content': 'Please call the test function',
+      'role': 'user',
+    }),
+    dict({
+      'agent_id': 'conversation.claude',
+      'content': 'Certainly, calling it now!',
+      'role': 'assistant',
+      'tool_calls': list([
+        dict({
+          'id': 'toolu_0123456789AbCdEfGhIjKlM',
+          'tool_args': dict({
+            'param1': 'test_value',
+          }),
+          'tool_name': 'test_tool',
+        }),
+      ]),
+    }),
+    dict({
+      'agent_id': 'conversation.claude',
+      'role': 'tool_result',
+      'tool_call_id': 'toolu_0123456789AbCdEfGhIjKlM',
+      'tool_name': 'test_tool',
+      'tool_result': 'Test response',
+    }),
+    dict({
+      'agent_id': 'conversation.claude',
+      'content': 'I have successfully called the function',
+      'role': 'assistant',
+      'tool_calls': None,
+    }),
+  ])
+# ---
+# name: test_extended_thinking_tool_call.1
+  list([
+    dict({
+      'content': 'Please call the test function',
+      'role': 'user',
+    }),
+    dict({
+      'content': list([
+        dict({
+          'signature': 'ErUBCkYIARgCIkCYXaVNJShe3A86Hp7XUzh9YsCYBbJTbQsrklTAPtJ2sP/NoB6tSzpK/nTL6CjSo2R6n0KNBIg5MH6asM2R/kmaEgyB/X1FtZq5OQAC7jUaDEPWCdcwGQ4RaBy5wiIwmRxExIlDhoY6tILoVPnOExkC/0igZxHEwxK8RU/fmw0b+o+TwAarzUitwzbo21E5Kh3pa3I6yqVROf1t2F8rFocNUeCegsWV/ytwYV+ayA==',
+          'thinking': 'The user asked me to call a test function.Is it a test? What would the function do? Would it violate any privacy or security policies?',
+          'type': 'thinking',
+        }),
+        dict({
+          'data': 'EroBCkYIARgCKkBJDytPJhw//4vy3t7aE+LfIkxvkAh51cBPrAvBCo6AjgI57Zt9KWPnUVV50OQJ0KZzUFoGZG5sxg95zx4qMwkoEgz43Su3myJKckvj03waDBZLIBSeoAeRUeVsJCIwQ5edQN0sa+HNeB/KUBkoMUwV+IT0eIhcpFxnILdvxUAKM4R1o4KG3x+yO0eo/kyOKiKfrCPFQhvBVmTZPFhgA2Ow8L9gGDVipcz6x3Uu9YETGEny',
+          'type': 'redacted_thinking',
+        }),
+        dict({
+          'signature': 'ErUBCkYIARgCIkCYXaVNJShe3A86Hp7XUzh9YsCYBbJTbQsrklTAPtJ2sP/NoB6tSzpK/nTL6CjSo2R6n0KNBIg5MH6asM2R/kmaEgyB/X1FtZq5OQAC7jUaDEPWCdcwGQ4RaBy5wiIwmRxExIlDhoY6tILoVPnOExkC/0igZxHEwxK8RU/fmw0b+o+TwAarzUitwzbo21E5Kh3pa3I6yqVROf1t2F8rFocNUeCegsWV/ytwYV+ayA==',
+          'thinking': "Okay, let's give it a shot. Will I pass the test?",
+          'type': 'thinking',
+        }),
+        dict({
+          'text': 'Certainly, calling it now!',
+          'type': 'text',
+        }),
+        dict({
+          'id': 'toolu_0123456789AbCdEfGhIjKlM',
+          'input': dict({
+            'param1': 'test_value',
+          }),
+          'name': 'test_tool',
+          'type': 'tool_use',
+        }),
+      ]),
+      'role': 'assistant',
+    }),
+    dict({
+      'content': list([
+        dict({
+          'content': '"Test response"',
+          'tool_use_id': 'toolu_0123456789AbCdEfGhIjKlM',
+          'type': 'tool_result',
+        }),
+      ]),
+      'role': 'user',
+    }),
+    dict({
+      'content': list([
+        dict({
+          'text': 'I have successfully called the function',
+          'type': 'text',
+        }),
+      ]),
+      'role': 'assistant',
+    }),
+  ])
+# ---
+# name: test_history_conversion[content0]
+  list([
+    dict({
+      'content': 'Are you sure?',
+      'role': 'user',
+    }),
+    dict({
+      'content': list([
+        dict({
+          'text': 'Yes, I am sure!',
+          'type': 'text',
+        }),
+      ]),
+      'role': 'assistant',
+    }),
+  ])
+# ---
+# name: test_history_conversion[content1]
+  list([
+    dict({
+      'content': 'What shape is a donut?',
+      'role': 'user',
+    }),
+    dict({
+      'content': list([
+        dict({
+          'text': 'A donut is a torus.',
+          'type': 'text',
+        }),
+      ]),
+      'role': 'assistant',
+    }),
+    dict({
+      'content': 'Are you sure?',
+      'role': 'user',
+    }),
+    dict({
+      'content': list([
+        dict({
+          'text': 'Yes, I am sure!',
+          'type': 'text',
+        }),
+      ]),
+      'role': 'assistant',
+    }),
+  ])
+# ---
+# name: test_history_conversion[content2]
+  list([
+    dict({
+      'content': list([
+        dict({
+          'text': 'What shape is a donut?',
+          'type': 'text',
+        }),
+        dict({
+          'text': 'Can you tell me?',
+          'type': 'text',
+        }),
+      ]),
+      'role': 'user',
+    }),
+    dict({
+      'content': list([
+        dict({
+          'text': 'A donut is a torus.',
+          'type': 'text',
+        }),
+        dict({
+          'text': 'Hope this helps.',
+          'type': 'text',
+        }),
+      ]),
+      'role': 'assistant',
+    }),
+    dict({
+      'content': 'Are you sure?',
+      'role': 'user',
+    }),
+    dict({
+      'content': list([
+        dict({
+          'text': 'Yes, I am sure!',
+          'type': 'text',
+        }),
+      ]),
+      'role': 'assistant',
+    }),
+  ])
+# ---
+# name: test_history_conversion[content3]
+  list([
+    dict({
+      'content': list([
+        dict({
+          'text': 'What shape is a donut?',
+          'type': 'text',
+        }),
+        dict({
+          'text': 'Can you tell me?',
+          'type': 'text',
+        }),
+        dict({
+          'text': 'Please?',
+          'type': 'text',
+        }),
+      ]),
+      'role': 'user',
+    }),
+    dict({
+      'content': list([
+        dict({
+          'text': 'A donut is a torus.',
+          'type': 'text',
+        }),
+        dict({
+          'text': 'Hope this helps.',
+          'type': 'text',
+        }),
+        dict({
+          'text': 'You are welcome.',
+          'type': 'text',
+        }),
+      ]),
+      'role': 'assistant',
+    }),
+    dict({
+      'content': 'Are you sure?',
+      'role': 'user',
+    }),
+    dict({
+      'content': list([
+        dict({
+          'text': 'Yes, I am sure!',
+          'type': 'text',
+        }),
+      ]),
+      'role': 'assistant',
+    }),
+  ])
+# ---
+# name: test_history_conversion[content4]
+  list([
+    dict({
+      'content': 'Turn off the lights and make me coffee',
+      'role': 'user',
+    }),
+    dict({
+      'content': list([
+        dict({
+          'text': 'Sure.',
+          'type': 'text',
+        }),
+        dict({
+          'id': 'mock-tool-call-id',
+          'input': dict({
+            'domain': 'light',
+          }),
+          'name': 'HassTurnOff',
+          'type': 'tool_use',
+        }),
+        dict({
+          'id': 'mock-tool-call-id-2',
+          'input': dict({
+          }),
+          'name': 'MakeCoffee',
+          'type': 'tool_use',
+        }),
+      ]),
+      'role': 'assistant',
+    }),
+    dict({
+      'content': list([
+        dict({
+          'text': 'Thank you',
+          'type': 'text',
+        }),
+        dict({
+          'content': '{"success": true, "response": "Lights are off."}',
+          'tool_use_id': 'mock-tool-call-id',
+          'type': 'tool_result',
+        }),
+        dict({
+          'content': '{"success": false, "response": "Not enough milk."}',
+          'tool_use_id': 'mock-tool-call-id-2',
+          'type': 'tool_result',
+        }),
+      ]),
+      'role': 'user',
+    }),
+    dict({
+      'content': list([
+        dict({
+          'text': 'Should I add milk to the shopping list?',
+          'type': 'text',
+        }),
+      ]),
+      'role': 'assistant',
+    }),
+    dict({
+      'content': 'Are you sure?',
+      'role': 'user',
+    }),
+    dict({
+      'content': list([
+        dict({
+          'text': 'Yes, I am sure!',
+          'type': 'text',
+        }),
+      ]),
+      'role': 'assistant',
+    }),
+  ])
+# ---
 # name: test_unknown_hass_api
   dict({
-    'conversation_id': None,
+    'continue_conversation': False,
+    'conversation_id': '1234',
     'response': IntentResponse(
       card=dict({
       }),
@@ -20,7 +338,7 @@
       speech=dict({
         'plain': dict({
           'extra_data': None,
-          'speech': 'Error preparing LLM API: API non-existing not found',
+          'speech': 'Error preparing LLM API',
         }),
       }),
       speech_slots=dict({
diff --git a/tests/components/anthropic/test_config_flow.py b/tests/components/anthropic/test_config_flow.py
index a5a025b00d0..30aba6e1b1f 100644
--- a/tests/components/anthropic/test_config_flow.py
+++ b/tests/components/anthropic/test_config_flow.py
@@ -21,9 +21,11 @@ from homeassistant.components.anthropic.const import (
     CONF_PROMPT,
     CONF_RECOMMENDED,
     CONF_TEMPERATURE,
+    CONF_THINKING_BUDGET,
     DOMAIN,
     RECOMMENDED_CHAT_MODEL,
     RECOMMENDED_MAX_TOKENS,
+    RECOMMENDED_THINKING_BUDGET,
 )
 from homeassistant.const import CONF_LLM_HASS_API
 from homeassistant.core import HomeAssistant
@@ -49,7 +51,7 @@ async def test_form(hass: HomeAssistant) -> None:
 
     with (
         patch(
-            "homeassistant.components.anthropic.config_flow.anthropic.resources.messages.AsyncMessages.create",
+            "homeassistant.components.anthropic.config_flow.anthropic.resources.models.AsyncModels.list",
             new_callable=AsyncMock,
         ),
         patch(
@@ -94,6 +96,28 @@ async def test_options(
     assert options["data"][CONF_CHAT_MODEL] == RECOMMENDED_CHAT_MODEL
 
 
+async def test_options_thinking_budget_more_than_max(
+    hass: HomeAssistant, mock_config_entry, mock_init_component
+) -> None:
+    """Test error about thinking budget being more than max tokens."""
+    options_flow = await hass.config_entries.options.async_init(
+        mock_config_entry.entry_id
+    )
+    options = await hass.config_entries.options.async_configure(
+        options_flow["flow_id"],
+        {
+            "prompt": "Speak like a pirate",
+            "max_tokens": 8192,
+            "chat_model": "claude-3-7-sonnet-latest",
+            "temperature": 1,
+            "thinking_budget": 16384,
+        },
+    )
+    await hass.async_block_till_done()
+    assert options["type"] is FlowResultType.FORM
+    assert options["errors"] == {"thinking_budget": "thinking_budget_too_large"}
+
+
 @pytest.mark.parametrize(
     ("side_effect", "error"),
     [
@@ -151,7 +175,7 @@ async def test_form_invalid_auth(hass: HomeAssistant, side_effect, error) -> Non
     )
 
     with patch(
-        "homeassistant.components.anthropic.config_flow.anthropic.resources.messages.AsyncMessages.create",
+        "homeassistant.components.anthropic.config_flow.anthropic.resources.models.AsyncModels.list",
         new_callable=AsyncMock,
         side_effect=side_effect,
     ):
@@ -186,6 +210,7 @@ async def test_form_invalid_auth(hass: HomeAssistant, side_effect, error) -> Non
                 CONF_TEMPERATURE: 0.3,
                 CONF_CHAT_MODEL: RECOMMENDED_CHAT_MODEL,
                 CONF_MAX_TOKENS: RECOMMENDED_MAX_TOKENS,
+                CONF_THINKING_BUDGET: RECOMMENDED_THINKING_BUDGET,
             },
         ),
         (
@@ -195,6 +220,7 @@ async def test_form_invalid_auth(hass: HomeAssistant, side_effect, error) -> Non
                 CONF_TEMPERATURE: 0.3,
                 CONF_CHAT_MODEL: RECOMMENDED_CHAT_MODEL,
                 CONF_MAX_TOKENS: RECOMMENDED_MAX_TOKENS,
+                CONF_THINKING_BUDGET: RECOMMENDED_THINKING_BUDGET,
             },
             {
                 CONF_RECOMMENDED: True,
diff --git a/tests/components/anthropic/test_conversation.py b/tests/components/anthropic/test_conversation.py
index fa5bcb8137a..67a4434a664 100644
--- a/tests/components/anthropic/test_conversation.py
+++ b/tests/components/anthropic/test_conversation.py
@@ -1,26 +1,171 @@
 """Tests for the Anthropic integration."""
 
+from collections.abc import AsyncGenerator
+from typing import Any
 from unittest.mock import AsyncMock, Mock, patch
 
 from anthropic import RateLimitError
-from anthropic.types import Message, TextBlock, ToolUseBlock, Usage
+from anthropic.types import (
+    InputJSONDelta,
+    Message,
+    RawContentBlockDeltaEvent,
+    RawContentBlockStartEvent,
+    RawContentBlockStopEvent,
+    RawMessageStartEvent,
+    RawMessageStopEvent,
+    RawMessageStreamEvent,
+    RedactedThinkingBlock,
+    SignatureDelta,
+    TextBlock,
+    TextDelta,
+    ThinkingBlock,
+    ThinkingDelta,
+    ToolUseBlock,
+    Usage,
+)
 from freezegun import freeze_time
 from httpx import URL, Request, Response
+import pytest
 from syrupy.assertion import SnapshotAssertion
 import voluptuous as vol
 
 from homeassistant.components import conversation
-from homeassistant.components.conversation import trace
 from homeassistant.const import CONF_LLM_HASS_API
 from homeassistant.core import Context, HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import intent, llm
+from homeassistant.helpers import chat_session, intent, llm
 from homeassistant.setup import async_setup_component
 from homeassistant.util import ulid as ulid_util
 
 from tests.common import MockConfigEntry
 
 
+async def stream_generator(
+    responses: list[RawMessageStreamEvent],
+) -> AsyncGenerator[RawMessageStreamEvent]:
+    """Generate a response from the assistant."""
+    for msg in responses:
+        yield msg
+
+
+def create_messages(
+    content_blocks: list[RawMessageStreamEvent],
+) -> list[RawMessageStreamEvent]:
+    """Create a stream of messages with the specified content blocks."""
+    return [
+        RawMessageStartEvent(
+            message=Message(
+                type="message",
+                id="msg_1234567890ABCDEFGHIJKLMN",
+                content=[],
+                role="assistant",
+                model="claude-3-5-sonnet-20240620",
+                usage=Usage(input_tokens=0, output_tokens=0),
+            ),
+            type="message_start",
+        ),
+        *content_blocks,
+        RawMessageStopEvent(type="message_stop"),
+    ]
+
+
+def create_content_block(
+    index: int, text_parts: list[str]
+) -> list[RawMessageStreamEvent]:
+    """Create a text content block with the specified deltas."""
+    return [
+        RawContentBlockStartEvent(
+            type="content_block_start",
+            content_block=TextBlock(text="", type="text"),
+            index=index,
+        ),
+        *[
+            RawContentBlockDeltaEvent(
+                delta=TextDelta(text=text_part, type="text_delta"),
+                index=index,
+                type="content_block_delta",
+            )
+            for text_part in text_parts
+        ],
+        RawContentBlockStopEvent(index=index, type="content_block_stop"),
+    ]
+
+
+def create_thinking_block(
+    index: int, thinking_parts: list[str]
+) -> list[RawMessageStreamEvent]:
+    """Create a thinking block with the specified deltas."""
+    return [
+        RawContentBlockStartEvent(
+            type="content_block_start",
+            content_block=ThinkingBlock(signature="", thinking="", type="thinking"),
+            index=index,
+        ),
+        *[
+            RawContentBlockDeltaEvent(
+                delta=ThinkingDelta(thinking=thinking_part, type="thinking_delta"),
+                index=index,
+                type="content_block_delta",
+            )
+            for thinking_part in thinking_parts
+        ],
+        RawContentBlockDeltaEvent(
+            delta=SignatureDelta(
+                signature="ErUBCkYIARgCIkCYXaVNJShe3A86Hp7XUzh9YsCYBbJTbQsrklTAPtJ2sP/N"
+                "oB6tSzpK/nTL6CjSo2R6n0KNBIg5MH6asM2R/kmaEgyB/X1FtZq5OQAC7jUaDEPWCdcwGQ"
+                "4RaBy5wiIwmRxExIlDhoY6tILoVPnOExkC/0igZxHEwxK8RU/fmw0b+o+TwAarzUitwzbo"
+                "21E5Kh3pa3I6yqVROf1t2F8rFocNUeCegsWV/ytwYV+ayA==",
+                type="signature_delta",
+            ),
+            index=index,
+            type="content_block_delta",
+        ),
+        RawContentBlockStopEvent(index=index, type="content_block_stop"),
+    ]
+
+
+def create_redacted_thinking_block(index: int) -> list[RawMessageStreamEvent]:
+    """Create a redacted thinking block."""
+    return [
+        RawContentBlockStartEvent(
+            type="content_block_start",
+            content_block=RedactedThinkingBlock(
+                data="EroBCkYIARgCKkBJDytPJhw//4vy3t7aE+LfIkxvkAh51cBPrAvBCo6AjgI57Zt9K"
+                "WPnUVV50OQJ0KZzUFoGZG5sxg95zx4qMwkoEgz43Su3myJKckvj03waDBZLIBSeoAeRUeV"
+                "sJCIwQ5edQN0sa+HNeB/KUBkoMUwV+IT0eIhcpFxnILdvxUAKM4R1o4KG3x+yO0eo/kyOK"
+                "iKfrCPFQhvBVmTZPFhgA2Ow8L9gGDVipcz6x3Uu9YETGEny",
+                type="redacted_thinking",
+            ),
+            index=index,
+        ),
+        RawContentBlockStopEvent(index=index, type="content_block_stop"),
+    ]
+
+
+def create_tool_use_block(
+    index: int, tool_id: str, tool_name: str, json_parts: list[str]
+) -> list[RawMessageStreamEvent]:
+    """Create a tool use content block with the specified deltas."""
+    return [
+        RawContentBlockStartEvent(
+            type="content_block_start",
+            content_block=ToolUseBlock(
+                id=tool_id, name=tool_name, input={}, type="tool_use"
+            ),
+            index=index,
+        ),
+        *[
+            RawContentBlockDeltaEvent(
+                delta=InputJSONDelta(partial_json=json_part, type="input_json_delta"),
+                index=index,
+                type="content_block_delta",
+            )
+            for json_part in json_parts
+        ],
+        RawContentBlockStopEvent(index=index, type="content_block_stop"),
+    ]
+
+
 async def test_entity(
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,
@@ -38,9 +183,7 @@ async def test_entity(
             CONF_LLM_HASS_API: "assist",
         },
     )
-    with patch(
-        "anthropic.resources.messages.AsyncMessages.create", new_callable=AsyncMock
-    ):
+    with patch("anthropic.resources.models.AsyncModels.retrieve"):
         await hass.config_entries.async_reload(mock_config_entry.entry_id)
 
     state = hass.states.get("conversation.claude")
@@ -84,8 +227,11 @@ async def test_template_error(
             "prompt": "talk like a {% if True %}smarthome{% else %}pirate please.",
         },
     )
-    with patch(
-        "anthropic.resources.messages.AsyncMessages.create", new_callable=AsyncMock
+    with (
+        patch("anthropic.resources.models.AsyncModels.retrieve"),
+        patch(
+            "anthropic.resources.messages.AsyncMessages.create", new_callable=AsyncMock
+        ),
     ):
         await hass.config_entries.async_setup(mock_config_entry.entry_id)
         await hass.async_block_till_done()
@@ -116,11 +262,19 @@ async def test_template_variables(
         },
     )
     with (
+        patch("anthropic.resources.models.AsyncModels.retrieve"),
         patch(
             "anthropic.resources.messages.AsyncMessages.create", new_callable=AsyncMock
         ) as mock_create,
         patch("homeassistant.auth.AuthManager.async_get_user", return_value=mock_user),
     ):
+        mock_create.return_value = stream_generator(
+            create_messages(
+                create_content_block(
+                    0, ["Okay, let", " me take care of that for you", "."]
+                )
+            )
+        )
         await hass.config_entries.async_setup(mock_config_entry.entry_id)
         await hass.async_block_till_done()
         result = await conversation.async_converse(
@@ -130,8 +284,12 @@ async def test_template_variables(
     assert result.response.response_type == intent.IntentResponseType.ACTION_DONE, (
         result
     )
-    assert "The user name is Test User." in mock_create.mock_calls[1][2]["system"]
-    assert "The user id is 12345." in mock_create.mock_calls[1][2]["system"]
+    assert (
+        result.response.speech["plain"]["speech"]
+        == "Okay, let me take care of that for you."
+    )
+    assert "The user name is Test User." in mock_create.call_args.kwargs["system"]
+    assert "The user id is 12345." in mock_create.call_args.kwargs["system"]
 
 
 async def test_conversation_agent(
@@ -169,39 +327,26 @@ async def test_function_call(
         for message in messages:
             for content in message["content"]:
                 if not isinstance(content, str) and content["type"] == "tool_use":
-                    return Message(
-                        type="message",
-                        id="msg_1234567890ABCDEFGHIJKLMN",
-                        content=[
-                            TextBlock(
-                                type="text",
-                                text="I have successfully called the function",
-                            )
-                        ],
-                        model="claude-3-5-sonnet-20240620",
-                        role="assistant",
-                        stop_reason="end_turn",
-                        stop_sequence=None,
-                        usage=Usage(input_tokens=8, output_tokens=12),
+                    return stream_generator(
+                        create_messages(
+                            create_content_block(
+                                0, ["I have ", "successfully called ", "the function"]
+                            ),
+                        )
                     )
 
-        return Message(
-            type="message",
-            id="msg_1234567890ABCDEFGHIJKLMN",
-            content=[
-                TextBlock(type="text", text="Certainly, calling it now!"),
-                ToolUseBlock(
-                    type="tool_use",
-                    id="toolu_0123456789AbCdEfGhIjKlM",
-                    name="test_tool",
-                    input={"param1": "test_value"},
-                ),
-            ],
-            model="claude-3-5-sonnet-20240620",
-            role="assistant",
-            stop_reason="tool_use",
-            stop_sequence=None,
-            usage=Usage(input_tokens=8, output_tokens=12),
+        return stream_generator(
+            create_messages(
+                [
+                    *create_content_block(0, ["Certainly, calling it now!"]),
+                    *create_tool_use_block(
+                        1,
+                        "toolu_0123456789AbCdEfGhIjKlM",
+                        "test_tool",
+                        ['{"para', 'm1": "test_valu', 'e"}'],
+                    ),
+                ]
+            )
         )
 
     with (
@@ -223,6 +368,10 @@ async def test_function_call(
     assert "Today's date is 2024-06-03." in mock_create.mock_calls[1][2]["system"]
 
     assert result.response.response_type == intent.IntentResponseType.ACTION_DONE
+    assert (
+        result.response.speech["plain"]["speech"]
+        == "I have successfully called the function"
+    )
     assert mock_create.mock_calls[1][2]["messages"][2] == {
         "role": "user",
         "content": [
@@ -236,6 +385,7 @@ async def test_function_call(
     mock_tool.async_call.assert_awaited_once_with(
         hass,
         llm.ToolInput(
+            id="toolu_0123456789AbCdEfGhIjKlM",
             tool_name="test_tool",
             tool_args={"param1": "test_value"},
         ),
@@ -249,42 +399,6 @@ async def test_function_call(
         ),
     )
 
-    # Test Conversation tracing
-    traces = trace.async_get_traces()
-    assert traces
-    last_trace = traces[-1].as_dict()
-    trace_events = last_trace.get("events", [])
-    assert [event["event_type"] for event in trace_events] == [
-        trace.ConversationTraceEventType.ASYNC_PROCESS,
-        trace.ConversationTraceEventType.AGENT_DETAIL,
-        trace.ConversationTraceEventType.TOOL_CALL,
-    ]
-    # AGENT_DETAIL event contains the raw prompt passed to the model
-    detail_event = trace_events[1]
-    assert "Answer in plain text" in detail_event["data"]["system"]
-    assert "Today's date is 2024-06-03." in trace_events[1]["data"]["system"]
-
-    # Call it again, make sure we have updated prompt
-    with (
-        patch(
-            "anthropic.resources.messages.AsyncMessages.create",
-            new_callable=AsyncMock,
-            side_effect=completion_result,
-        ) as mock_create,
-        freeze_time("2024-06-04 23:00:00"),
-    ):
-        result = await conversation.async_converse(
-            hass,
-            "Please call the test function",
-            None,
-            context,
-            agent_id=agent_id,
-        )
-
-    assert "Today's date is 2024-06-04." in mock_create.mock_calls[1][2]["system"]
-    # Test old assert message not updated
-    assert "Today's date is 2024-06-03." in trace_events[1]["data"]["system"]
-
 
 @patch("homeassistant.components.anthropic.conversation.llm.AssistAPI._async_get_tools")
 async def test_function_exception(
@@ -311,39 +425,27 @@ async def test_function_exception(
         for message in messages:
             for content in message["content"]:
                 if not isinstance(content, str) and content["type"] == "tool_use":
-                    return Message(
-                        type="message",
-                        id="msg_1234567890ABCDEFGHIJKLMN",
-                        content=[
-                            TextBlock(
-                                type="text",
-                                text="There was an error calling the function",
+                    return stream_generator(
+                        create_messages(
+                            create_content_block(
+                                0,
+                                ["There was an error calling the function"],
                             )
-                        ],
-                        model="claude-3-5-sonnet-20240620",
-                        role="assistant",
-                        stop_reason="end_turn",
-                        stop_sequence=None,
-                        usage=Usage(input_tokens=8, output_tokens=12),
+                        )
                     )
 
-        return Message(
-            type="message",
-            id="msg_1234567890ABCDEFGHIJKLMN",
-            content=[
-                TextBlock(type="text", text="Certainly, calling it now!"),
-                ToolUseBlock(
-                    type="tool_use",
-                    id="toolu_0123456789AbCdEfGhIjKlM",
-                    name="test_tool",
-                    input={"param1": "test_value"},
-                ),
-            ],
-            model="claude-3-5-sonnet-20240620",
-            role="assistant",
-            stop_reason="tool_use",
-            stop_sequence=None,
-            usage=Usage(input_tokens=8, output_tokens=12),
+        return stream_generator(
+            create_messages(
+                [
+                    *create_content_block(0, ["Certainly, calling it now!"]),
+                    *create_tool_use_block(
+                        1,
+                        "toolu_0123456789AbCdEfGhIjKlM",
+                        "test_tool",
+                        ['{"param1": "test_value"}'],
+                    ),
+                ]
+            )
         )
 
     with patch(
@@ -360,6 +462,10 @@ async def test_function_exception(
         )
 
     assert result.response.response_type == intent.IntentResponseType.ACTION_DONE
+    assert (
+        result.response.speech["plain"]["speech"]
+        == "There was an error calling the function"
+    )
     assert mock_create.mock_calls[1][2]["messages"][2] == {
         "role": "user",
         "content": [
@@ -373,6 +479,7 @@ async def test_function_exception(
     mock_tool.async_call.assert_awaited_once_with(
         hass,
         llm.ToolInput(
+            id="toolu_0123456789AbCdEfGhIjKlM",
             tool_name="test_tool",
             tool_args={"param1": "test_value"},
         ),
@@ -411,15 +518,10 @@ async def test_assist_api_tools_conversion(
     with patch(
         "anthropic.resources.messages.AsyncMessages.create",
         new_callable=AsyncMock,
-        return_value=Message(
-            type="message",
-            id="msg_1234567890ABCDEFGHIJKLMN",
-            content=[TextBlock(type="text", text="Hello, how can I help you?")],
-            model="claude-3-5-sonnet-20240620",
-            role="assistant",
-            stop_reason="end_turn",
-            stop_sequence=None,
-            usage=Usage(input_tokens=8, output_tokens=12),
+        return_value=stream_generator(
+            create_messages(
+                create_content_block(0, ["Hello, how can I help you?"]),
+            ),
         ),
     ) as mock_create:
         await conversation.async_converse(
@@ -444,44 +546,340 @@ async def test_unknown_hass_api(
             CONF_LLM_HASS_API: "non-existing",
         },
     )
+    await hass.async_block_till_done()
 
     result = await conversation.async_converse(
-        hass, "hello", None, Context(), agent_id="conversation.claude"
+        hass, "hello", "1234", Context(), agent_id="conversation.claude"
     )
 
     assert result == snapshot
 
 
-@patch("anthropic.resources.messages.AsyncMessages.create", new_callable=AsyncMock)
 async def test_conversation_id(
-    mock_create,
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,
     mock_init_component,
 ) -> None:
     """Test conversation ID is honored."""
-    result = await conversation.async_converse(
-        hass, "hello", None, None, agent_id="conversation.claude"
+
+    def create_stream_generator(*args, **kwargs) -> Any:
+        return stream_generator(
+            create_messages(
+                create_content_block(0, ["Hello, how can I help you?"]),
+            ),
+        )
+
+    with patch(
+        "anthropic.resources.messages.AsyncMessages.create",
+        new_callable=AsyncMock,
+        side_effect=create_stream_generator,
+    ):
+        result = await conversation.async_converse(
+            hass, "hello", "1234", Context(), agent_id="conversation.claude"
+        )
+
+        result = await conversation.async_converse(
+            hass, "hello", None, None, agent_id="conversation.claude"
+        )
+
+        conversation_id = result.conversation_id
+
+        result = await conversation.async_converse(
+            hass, "hello", conversation_id, None, agent_id="conversation.claude"
+        )
+
+        assert result.conversation_id == conversation_id
+
+        unknown_id = ulid_util.ulid()
+
+        result = await conversation.async_converse(
+            hass, "hello", unknown_id, None, agent_id="conversation.claude"
+        )
+
+        assert result.conversation_id != unknown_id
+
+        result = await conversation.async_converse(
+            hass, "hello", "koala", None, agent_id="conversation.claude"
+        )
+
+        assert result.conversation_id == "koala"
+
+
+async def test_extended_thinking(
+    hass: HomeAssistant,
+    mock_config_entry_with_extended_thinking: MockConfigEntry,
+    mock_init_component,
+) -> None:
+    """Test extended thinking support."""
+    with patch(
+        "anthropic.resources.messages.AsyncMessages.create",
+        new_callable=AsyncMock,
+        return_value=stream_generator(
+            create_messages(
+                [
+                    *create_thinking_block(
+                        0,
+                        [
+                            "The user has just",
+                            ' greeted me with "Hi".',
+                            " This is a simple greeting an",
+                            "d doesn't require any Home Assistant function",
+                            " calls. I should respond with",
+                            " a friendly greeting and let them know I'm available",
+                            " to help with their smart home.",
+                        ],
+                    ),
+                    *create_content_block(1, ["Hello, how can I help you today?"]),
+                ]
+            ),
+        ),
+    ):
+        result = await conversation.async_converse(
+            hass, "hello", None, Context(), agent_id="conversation.claude"
+        )
+
+    chat_log = hass.data.get(conversation.chat_log.DATA_CHAT_LOGS).get(
+        result.conversation_id
+    )
+    assert len(chat_log.content) == 3
+    assert chat_log.content[1].content == "hello"
+    assert chat_log.content[2].content == "Hello, how can I help you today?"
+
+
+async def test_redacted_thinking(
+    hass: HomeAssistant,
+    mock_config_entry_with_extended_thinking: MockConfigEntry,
+    mock_init_component,
+) -> None:
+    """Test extended thinking with redacted thinking blocks."""
+    with patch(
+        "anthropic.resources.messages.AsyncMessages.create",
+        new_callable=AsyncMock,
+        return_value=stream_generator(
+            create_messages(
+                [
+                    *create_redacted_thinking_block(0),
+                    *create_redacted_thinking_block(1),
+                    *create_redacted_thinking_block(2),
+                    *create_content_block(3, ["How can I help you today?"]),
+                ]
+            ),
+        ),
+    ):
+        result = await conversation.async_converse(
+            hass,
+            "ANTHROPIC_MAGIC_STRING_TRIGGER_REDACTED_THINKING_46C9A13E193C177646C7398A9"
+            "8432ECCCE4C1253D5E2D82641AC0E52CC2876CB",
+            None,
+            Context(),
+            agent_id="conversation.claude",
+        )
+
+    chat_log = hass.data.get(conversation.chat_log.DATA_CHAT_LOGS).get(
+        result.conversation_id
+    )
+    assert len(chat_log.content) == 3
+    assert chat_log.content[2].content == "How can I help you today?"
+
+
+@patch("homeassistant.components.anthropic.conversation.llm.AssistAPI._async_get_tools")
+async def test_extended_thinking_tool_call(
+    mock_get_tools,
+    hass: HomeAssistant,
+    mock_config_entry_with_extended_thinking: MockConfigEntry,
+    mock_init_component,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test that thinking blocks and their order are preserved in with tool calls."""
+    agent_id = "conversation.claude"
+    context = Context()
+
+    mock_tool = AsyncMock()
+    mock_tool.name = "test_tool"
+    mock_tool.description = "Test function"
+    mock_tool.parameters = vol.Schema(
+        {vol.Optional("param1", description="Test parameters"): str}
+    )
+    mock_tool.async_call.return_value = "Test response"
+
+    mock_get_tools.return_value = [mock_tool]
+
+    def completion_result(*args, messages, **kwargs):
+        for message in messages:
+            for content in message["content"]:
+                if not isinstance(content, str) and content["type"] == "tool_use":
+                    return stream_generator(
+                        create_messages(
+                            create_content_block(
+                                0, ["I have ", "successfully called ", "the function"]
+                            ),
+                        )
+                    )
+
+        return stream_generator(
+            create_messages(
+                [
+                    *create_thinking_block(
+                        0,
+                        [
+                            "The user asked me to",
+                            " call a test function.",
+                            "Is it a test? What",
+                            " would the function",
+                            " do? Would it violate",
+                            " any privacy or security",
+                            " policies?",
+                        ],
+                    ),
+                    *create_redacted_thinking_block(1),
+                    *create_thinking_block(
+                        2, ["Okay, let's give it a shot.", " Will I pass the test?"]
+                    ),
+                    *create_content_block(3, ["Certainly, calling it now!"]),
+                    *create_tool_use_block(
+                        1,
+                        "toolu_0123456789AbCdEfGhIjKlM",
+                        "test_tool",
+                        ['{"para', 'm1": "test_valu', 'e"}'],
+                    ),
+                ]
+            )
+        )
+
+    with (
+        patch(
+            "anthropic.resources.messages.AsyncMessages.create",
+            new_callable=AsyncMock,
+            side_effect=completion_result,
+        ) as mock_create,
+        freeze_time("2024-06-03 23:00:00"),
+    ):
+        result = await conversation.async_converse(
+            hass,
+            "Please call the test function",
+            None,
+            context,
+            agent_id=agent_id,
+        )
+
+    chat_log = hass.data.get(conversation.chat_log.DATA_CHAT_LOGS).get(
+        result.conversation_id
     )
 
-    conversation_id = result.conversation_id
+    assert chat_log.content == snapshot
+    assert mock_create.mock_calls[1][2]["messages"] == snapshot
 
-    result = await conversation.async_converse(
-        hass, "hello", conversation_id, None, agent_id="conversation.claude"
-    )
 
-    assert result.conversation_id == conversation_id
+@pytest.mark.parametrize(
+    "content",
+    [
+        [
+            conversation.chat_log.SystemContent("You are a helpful assistant."),
+        ],
+        [
+            conversation.chat_log.SystemContent("You are a helpful assistant."),
+            conversation.chat_log.UserContent("What shape is a donut?"),
+            conversation.chat_log.AssistantContent(
+                agent_id="conversation.claude", content="A donut is a torus."
+            ),
+        ],
+        [
+            conversation.chat_log.SystemContent("You are a helpful assistant."),
+            conversation.chat_log.UserContent("What shape is a donut?"),
+            conversation.chat_log.UserContent("Can you tell me?"),
+            conversation.chat_log.AssistantContent(
+                agent_id="conversation.claude", content="A donut is a torus."
+            ),
+            conversation.chat_log.AssistantContent(
+                agent_id="conversation.claude", content="Hope this helps."
+            ),
+        ],
+        [
+            conversation.chat_log.SystemContent("You are a helpful assistant."),
+            conversation.chat_log.UserContent("What shape is a donut?"),
+            conversation.chat_log.UserContent("Can you tell me?"),
+            conversation.chat_log.UserContent("Please?"),
+            conversation.chat_log.AssistantContent(
+                agent_id="conversation.claude", content="A donut is a torus."
+            ),
+            conversation.chat_log.AssistantContent(
+                agent_id="conversation.claude", content="Hope this helps."
+            ),
+            conversation.chat_log.AssistantContent(
+                agent_id="conversation.claude", content="You are welcome."
+            ),
+        ],
+        [
+            conversation.chat_log.SystemContent("You are a helpful assistant."),
+            conversation.chat_log.UserContent("Turn off the lights and make me coffee"),
+            conversation.chat_log.AssistantContent(
+                agent_id="conversation.claude",
+                content="Sure.",
+                tool_calls=[
+                    llm.ToolInput(
+                        id="mock-tool-call-id",
+                        tool_name="HassTurnOff",
+                        tool_args={"domain": "light"},
+                    ),
+                    llm.ToolInput(
+                        id="mock-tool-call-id-2",
+                        tool_name="MakeCoffee",
+                        tool_args={},
+                    ),
+                ],
+            ),
+            conversation.chat_log.UserContent("Thank you"),
+            conversation.chat_log.ToolResultContent(
+                agent_id="conversation.claude",
+                tool_call_id="mock-tool-call-id",
+                tool_name="HassTurnOff",
+                tool_result={"success": True, "response": "Lights are off."},
+            ),
+            conversation.chat_log.ToolResultContent(
+                agent_id="conversation.claude",
+                tool_call_id="mock-tool-call-id-2",
+                tool_name="MakeCoffee",
+                tool_result={"success": False, "response": "Not enough milk."},
+            ),
+            conversation.chat_log.AssistantContent(
+                agent_id="conversation.claude",
+                content="Should I add milk to the shopping list?",
+            ),
+        ],
+    ],
+)
+async def test_history_conversion(
+    hass: HomeAssistant,
+    mock_config_entry_with_assist: MockConfigEntry,
+    mock_init_component,
+    snapshot: SnapshotAssertion,
+    content: list[conversation.chat_log.Content],
+) -> None:
+    """Test conversion of chat_log entries into API parameters."""
+    conversation_id = "conversation_id"
+    with (
+        chat_session.async_get_chat_session(hass, conversation_id) as session,
+        conversation.async_get_chat_log(hass, session) as chat_log,
+        patch(
+            "anthropic.resources.messages.AsyncMessages.create",
+            new_callable=AsyncMock,
+            return_value=stream_generator(
+                create_messages(
+                    [
+                        *create_content_block(0, ["Yes, I am sure!"]),
+                    ]
+                ),
+            ),
+        ) as mock_create,
+    ):
+        chat_log.content = content
 
-    unknown_id = ulid_util.ulid()
+        await conversation.async_converse(
+            hass,
+            "Are you sure?",
+            conversation_id,
+            Context(),
+            agent_id="conversation.claude",
+        )
 
-    result = await conversation.async_converse(
-        hass, "hello", unknown_id, None, agent_id="conversation.claude"
-    )
-
-    assert result.conversation_id != unknown_id
-
-    result = await conversation.async_converse(
-        hass, "hello", "koala", None, agent_id="conversation.claude"
-    )
-
-    assert result.conversation_id == "koala"
+        assert mock_create.mock_calls[0][2]["messages"] == snapshot
diff --git a/tests/components/anthropic/test_init.py b/tests/components/anthropic/test_init.py
index ee87bb708d0..305e442f52d 100644
--- a/tests/components/anthropic/test_init.py
+++ b/tests/components/anthropic/test_init.py
@@ -1,6 +1,6 @@
 """Tests for the Anthropic integration."""
 
-from unittest.mock import AsyncMock, patch
+from unittest.mock import patch
 
 from anthropic import (
     APIConnectionError,
@@ -55,8 +55,7 @@ async def test_init_error(
 ) -> None:
     """Test initialization errors."""
     with patch(
-        "anthropic.resources.messages.AsyncMessages.create",
-        new_callable=AsyncMock,
+        "anthropic.resources.models.AsyncModels.retrieve",
         side_effect=side_effect,
     ):
         assert await async_setup_component(hass, "anthropic", {})
diff --git a/tests/components/aosmith/snapshots/test_device.ambr b/tests/components/aosmith/snapshots/test_device.ambr
index dec33a92fe2..e647b7fa6a5 100644
--- a/tests/components/aosmith/snapshots/test_device.ambr
+++ b/tests/components/aosmith/snapshots/test_device.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': 'basement',
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/aosmith/snapshots/test_sensor.ambr b/tests/components/aosmith/snapshots/test_sensor.ambr
index 563b52f6df7..c422e8fdab5 100644
--- a/tests/components/aosmith/snapshots/test_sensor.ambr
+++ b/tests/components/aosmith/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -60,6 +61,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/aosmith/snapshots/test_water_heater.ambr b/tests/components/aosmith/snapshots/test_water_heater.ambr
index deb079570f1..43db89807b6 100644
--- a/tests/components/aosmith/snapshots/test_water_heater.ambr
+++ b/tests/components/aosmith/snapshots/test_water_heater.ambr
@@ -9,6 +9,7 @@
       'min_temp': 95,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -71,6 +72,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/api/test_init.py b/tests/components/api/test_init.py
index abce262fd12..6363304effc 100644
--- a/tests/components/api/test_init.py
+++ b/tests/components/api/test_init.py
@@ -11,10 +11,9 @@ from aiohttp.test_utils import TestClient
 import pytest
 import voluptuous as vol
 
-from homeassistant import const
+from homeassistant import const, core as ha
 from homeassistant.auth.models import Credentials
 from homeassistant.bootstrap import DATA_LOGGING
-import homeassistant.core as ha
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
diff --git a/tests/components/application_credentials/test_init.py b/tests/components/application_credentials/test_init.py
index b72d9653c2d..9896e4c9fc0 100644
--- a/tests/components/application_credentials/test_init.py
+++ b/tests/components/application_credentials/test_init.py
@@ -423,10 +423,7 @@ async def test_import_named_credential(
     ]
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.fake_integration.config.abort.missing_credentials"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["fake_integration"])
 async def test_config_flow_no_credentials(hass: HomeAssistant) -> None:
     """Test config flow base case with no credentials registered."""
     result = await hass.config_entries.flow.async_init(
@@ -436,10 +433,7 @@ async def test_config_flow_no_credentials(hass: HomeAssistant) -> None:
     assert result.get("reason") == "missing_credentials"
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.fake_integration.config.abort.missing_credentials"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["fake_integration"])
 async def test_config_flow_other_domain(
     hass: HomeAssistant,
     ws_client: ClientFixture,
@@ -567,10 +561,7 @@ async def test_config_flow_multiple_entries(
     )
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.fake_integration.config.abort.missing_credentials"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["fake_integration"])
 async def test_config_flow_create_delete_credential(
     hass: HomeAssistant,
     ws_client: ClientFixture,
@@ -616,10 +607,7 @@ async def test_config_flow_with_config_credential(
     assert result["data"].get("auth_implementation") == TEST_DOMAIN
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.fake_integration.config.abort.missing_configuration"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["fake_integration"])
 @pytest.mark.parametrize("mock_application_credentials_integration", [None])
 async def test_import_without_setup(hass: HomeAssistant, config_credential) -> None:
     """Test import of credentials without setting up the integration."""
@@ -635,10 +623,7 @@ async def test_import_without_setup(hass: HomeAssistant, config_credential) -> N
     assert result.get("reason") == "missing_configuration"
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.fake_integration.config.abort.missing_configuration"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["fake_integration"])
 @pytest.mark.parametrize("mock_application_credentials_integration", [None])
 async def test_websocket_without_platform(
     hass: HomeAssistant, ws_client: ClientFixture
diff --git a/tests/components/apsystems/snapshots/test_binary_sensor.ambr b/tests/components/apsystems/snapshots/test_binary_sensor.ambr
index 0875c88976b..381fc1864fc 100644
--- a/tests/components/apsystems/snapshots/test_binary_sensor.ambr
+++ b/tests/components/apsystems/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/apsystems/snapshots/test_number.ambr b/tests/components/apsystems/snapshots/test_number.ambr
index a2b82e23596..21141de7d64 100644
--- a/tests/components/apsystems/snapshots/test_number.ambr
+++ b/tests/components/apsystems/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/apsystems/snapshots/test_sensor.ambr b/tests/components/apsystems/snapshots/test_sensor.ambr
index 669e89fda17..251a8d8428c 100644
--- a/tests/components/apsystems/snapshots/test_sensor.ambr
+++ b/tests/components/apsystems/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -110,6 +112,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -161,6 +164,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -212,6 +216,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -263,6 +268,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -314,6 +320,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -365,6 +372,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -416,6 +424,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/apsystems/snapshots/test_switch.ambr b/tests/components/apsystems/snapshots/test_switch.ambr
index 6daa9fd6e14..a9f74ee5517 100644
--- a/tests/components/apsystems/snapshots/test_switch.ambr
+++ b/tests/components/apsystems/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/aquacell/snapshots/test_sensor.ambr b/tests/components/aquacell/snapshots/test_sensor.ambr
index a237f59881a..eeac14c000d 100644
--- a/tests/components/aquacell/snapshots/test_sensor.ambr
+++ b/tests/components/aquacell/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -56,6 +57,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -104,6 +106,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -154,6 +157,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -202,6 +206,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -256,6 +261,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/aranet/test_config_flow.py b/tests/components/aranet/test_config_flow.py
index 9596507960b..c40725c397d 100644
--- a/tests/components/aranet/test_config_flow.py
+++ b/tests/components/aranet/test_config_flow.py
@@ -4,6 +4,7 @@ from unittest.mock import patch
 
 from homeassistant import config_entries
 from homeassistant.components.aranet.const import DOMAIN
+from homeassistant.config_entries import SOURCE_IGNORE, SOURCE_USER
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
@@ -275,3 +276,31 @@ async def test_async_step_user_integrations_disabled(hass: HomeAssistant) -> Non
         )
     assert result2["type"] is FlowResultType.ABORT
     assert result2["reason"] == "integrations_disabled"
+
+
+async def test_user_setup_replaces_ignored_device(hass: HomeAssistant) -> None:
+    """Test the user initiated form can replace an ignored device."""
+    entry = MockConfigEntry(
+        domain=DOMAIN, unique_id="aa:bb:cc:dd:ee:ff", source=SOURCE_IGNORE
+    )
+    entry.add_to_hass(hass)
+
+    with patch(
+        "homeassistant.components.aranet.config_flow.async_discovered_service_info",
+        return_value=[VALID_DATA_SERVICE_INFO],
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_USER}
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+
+    with patch("homeassistant.components.aranet.async_setup_entry", return_value=True):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input={"address": "aa:bb:cc:dd:ee:ff"}
+        )
+    await hass.async_block_till_done()
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "Aranet4 12345"
+    assert result2["data"] == {}
+    assert result2["result"].unique_id == "aa:bb:cc:dd:ee:ff"
diff --git a/tests/components/aranet/test_sensor.py b/tests/components/aranet/test_sensor.py
index 78a1d4aa9c9..a1a5ca32378 100644
--- a/tests/components/aranet/test_sensor.py
+++ b/tests/components/aranet/test_sensor.py
@@ -3,7 +3,7 @@
 import pytest
 
 from homeassistant.components.aranet.const import DOMAIN
-from homeassistant.components.sensor import ATTR_STATE_CLASS
+from homeassistant.components.sensor import ATTR_OPTIONS, ATTR_STATE_CLASS
 from homeassistant.const import ATTR_FRIENDLY_NAME, ATTR_UNIT_OF_MEASUREMENT
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
@@ -170,7 +170,7 @@ async def test_sensors_aranet4(
     assert len(hass.states.async_all("sensor")) == 0
     inject_bluetooth_service_info(hass, VALID_DATA_SERVICE_INFO)
     await hass.async_block_till_done()
-    assert len(hass.states.async_all("sensor")) == 6
+    assert len(hass.states.async_all("sensor")) == 7
 
     batt_sensor = hass.states.get("sensor.aranet4_12345_battery")
     batt_sensor_attrs = batt_sensor.attributes
@@ -214,6 +214,12 @@ async def test_sensors_aranet4(
     assert interval_sensor_attrs[ATTR_UNIT_OF_MEASUREMENT] == "s"
     assert interval_sensor_attrs[ATTR_STATE_CLASS] == "measurement"
 
+    status_sensor = hass.states.get("sensor.aranet4_12345_threshold")
+    status_sensor_attrs = status_sensor.attributes
+    assert status_sensor.state == "green"
+    assert status_sensor_attrs[ATTR_FRIENDLY_NAME] == "Aranet4 12345 Threshold"
+    assert status_sensor_attrs[ATTR_OPTIONS] == ["error", "green", "yellow", "red"]
+
     # Check device context for the battery sensor
     entity = entity_registry.async_get("sensor.aranet4_12345_battery")
     device = device_registry.async_get(entity.device_id)
@@ -245,7 +251,7 @@ async def test_sensors_aranetrn(
     assert len(hass.states.async_all("sensor")) == 0
     inject_bluetooth_service_info(hass, VALID_ARANET_RADON_DATA_SERVICE_INFO)
     await hass.async_block_till_done()
-    assert len(hass.states.async_all("sensor")) == 6
+    assert len(hass.states.async_all("sensor")) == 7
 
     batt_sensor = hass.states.get("sensor.aranetrn_12345_battery")
     batt_sensor_attrs = batt_sensor.attributes
@@ -291,6 +297,12 @@ async def test_sensors_aranetrn(
     assert interval_sensor_attrs[ATTR_UNIT_OF_MEASUREMENT] == "s"
     assert interval_sensor_attrs[ATTR_STATE_CLASS] == "measurement"
 
+    status_sensor = hass.states.get("sensor.aranetrn_12345_threshold")
+    status_sensor_attrs = status_sensor.attributes
+    assert status_sensor.state == "green"
+    assert status_sensor_attrs[ATTR_FRIENDLY_NAME] == "AranetRn+ 12345 Threshold"
+    assert status_sensor_attrs[ATTR_OPTIONS] == ["error", "green", "yellow", "red"]
+
     # Check device context for the battery sensor
     entity = entity_registry.async_get("sensor.aranetrn_12345_battery")
     device = device_registry.async_get(entity.device_id)
diff --git a/tests/components/arve/snapshots/test_sensor.ambr b/tests/components/arve/snapshots/test_sensor.ambr
index 5c7888c41de..ed2494c3197 100644
--- a/tests/components/arve/snapshots/test_sensor.ambr
+++ b/tests/components/arve/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -43,6 +44,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -78,6 +80,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -113,6 +116,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -148,6 +152,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -183,6 +188,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -218,6 +224,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/assist_pipeline/conftest.py b/tests/components/assist_pipeline/conftest.py
index 0f6872edbfe..a0549f27f05 100644
--- a/tests/components/assist_pipeline/conftest.py
+++ b/tests/components/assist_pipeline/conftest.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from collections.abc import AsyncIterable, Generator
 from pathlib import Path
 from typing import Any
-from unittest.mock import AsyncMock
+from unittest.mock import AsyncMock, patch
 
 import pytest
 
@@ -24,8 +24,8 @@ from homeassistant.components.assist_pipeline.pipeline import (
 from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import chat_session, device_registry as dr
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.setup import async_setup_component
 
 from tests.common import (
@@ -225,7 +225,7 @@ async def init_supporting_components(
     async def async_setup_entry_stt_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test stt platform via config entry."""
         async_add_entities([mock_stt_provider_entity])
@@ -233,7 +233,7 @@ async def init_supporting_components(
     async def async_setup_entry_wake_word_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test wake word platform via config entry."""
         async_add_entities(
@@ -325,7 +325,7 @@ async def assist_device(
     async def async_setup_entry_select_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test select platform via config entry."""
         entities = [
@@ -379,3 +379,14 @@ def pipeline_storage(pipeline_data) -> PipelineStorageCollection:
 def make_10ms_chunk(header: bytes) -> bytes:
     """Return 10ms of zeros with the given header."""
     return header + bytes(BYTES_PER_CHUNK - len(header))
+
+
+@pytest.fixture
+def mock_chat_session(hass: HomeAssistant) -> Generator[chat_session.ChatSession]:
+    """Mock the ulid of chat sessions."""
+    # pylint: disable-next=contextmanager-generator-missing-cleanup
+    with (
+        patch("homeassistant.helpers.chat_session.ulid_now", return_value="mock-ulid"),
+        chat_session.async_get_chat_session(hass) as session,
+    ):
+        yield session
diff --git a/tests/components/assist_pipeline/snapshots/test_init.ambr b/tests/components/assist_pipeline/snapshots/test_init.ambr
index 526e1bff151..f772f877d3a 100644
--- a/tests/components/assist_pipeline/snapshots/test_init.ambr
+++ b/tests/components/assist_pipeline/snapshots/test_init.ambr
@@ -3,8 +3,14 @@
   list([
     dict({
       'data': dict({
+        'conversation_id': 'mock-ulid',
         'language': 'en',
         'pipeline': <ANY>,
+        'tts_output': dict({
+          'mime_type': 'audio/mpeg',
+          'token': 'test_token.mp3',
+          'url': '/api/tts_proxy/test_token.mp3',
+        }),
       }),
       'type': <PipelineEventType.RUN_START: 'run-start'>,
     }),
@@ -32,7 +38,7 @@
     }),
     dict({
       'data': dict({
-        'conversation_id': None,
+        'conversation_id': 'mock-ulid',
         'device_id': None,
         'engine': 'conversation.home_assistant',
         'intent_input': 'test transcript',
@@ -44,6 +50,7 @@
     dict({
       'data': dict({
         'intent_output': dict({
+          'continue_conversation': False,
           'conversation_id': <ANY>,
           'response': dict({
             'card': dict({
@@ -79,6 +86,7 @@
         'tts_output': dict({
           'media_id': "media-source://tts/test?message=Sorry,+I+couldn't+understand+that&language=en-US&tts_options=%7B%22voice%22:%22james_earl_jones%22%7D",
           'mime_type': 'audio/mpeg',
+          'token': 'test_token.mp3',
           'url': '/api/tts_proxy/test_token.mp3',
         }),
       }),
@@ -94,8 +102,14 @@
   list([
     dict({
       'data': dict({
+        'conversation_id': 'mock-ulid',
         'language': 'en',
         'pipeline': <ANY>,
+        'tts_output': dict({
+          'mime_type': 'audio/mpeg',
+          'token': 'test_token.mp3',
+          'url': '/api/tts_proxy/test_token.mp3',
+        }),
       }),
       'type': <PipelineEventType.RUN_START: 'run-start'>,
     }),
@@ -123,7 +137,7 @@
     }),
     dict({
       'data': dict({
-        'conversation_id': None,
+        'conversation_id': 'mock-ulid',
         'device_id': None,
         'engine': 'conversation.home_assistant',
         'intent_input': 'test transcript',
@@ -135,6 +149,7 @@
     dict({
       'data': dict({
         'intent_output': dict({
+          'continue_conversation': False,
           'conversation_id': <ANY>,
           'response': dict({
             'card': dict({
@@ -170,6 +185,7 @@
         'tts_output': dict({
           'media_id': "media-source://tts/test?message=Sorry,+I+couldn't+understand+that&language=en-US&tts_options=%7B%22voice%22:%22Arnold+Schwarzenegger%22%7D",
           'mime_type': 'audio/mpeg',
+          'token': 'test_token.mp3',
           'url': '/api/tts_proxy/test_token.mp3',
         }),
       }),
@@ -185,8 +201,14 @@
   list([
     dict({
       'data': dict({
+        'conversation_id': 'mock-ulid',
         'language': 'en',
         'pipeline': <ANY>,
+        'tts_output': dict({
+          'mime_type': 'audio/mpeg',
+          'token': 'test_token.mp3',
+          'url': '/api/tts_proxy/test_token.mp3',
+        }),
       }),
       'type': <PipelineEventType.RUN_START: 'run-start'>,
     }),
@@ -214,7 +236,7 @@
     }),
     dict({
       'data': dict({
-        'conversation_id': None,
+        'conversation_id': 'mock-ulid',
         'device_id': None,
         'engine': 'conversation.home_assistant',
         'intent_input': 'test transcript',
@@ -226,6 +248,7 @@
     dict({
       'data': dict({
         'intent_output': dict({
+          'continue_conversation': False,
           'conversation_id': <ANY>,
           'response': dict({
             'card': dict({
@@ -261,6 +284,7 @@
         'tts_output': dict({
           'media_id': "media-source://tts/test?message=Sorry,+I+couldn't+understand+that&language=en-US&tts_options=%7B%22voice%22:%22Arnold+Schwarzenegger%22%7D",
           'mime_type': 'audio/mpeg',
+          'token': 'test_token.mp3',
           'url': '/api/tts_proxy/test_token.mp3',
         }),
       }),
@@ -276,8 +300,14 @@
   list([
     dict({
       'data': dict({
+        'conversation_id': 'mock-ulid',
         'language': 'en',
         'pipeline': <ANY>,
+        'tts_output': dict({
+          'mime_type': 'audio/mpeg',
+          'token': 'test_token.mp3',
+          'url': '/api/tts_proxy/test_token.mp3',
+        }),
       }),
       'type': <PipelineEventType.RUN_START: 'run-start'>,
     }),
@@ -329,7 +359,7 @@
     }),
     dict({
       'data': dict({
-        'conversation_id': None,
+        'conversation_id': 'mock-ulid',
         'device_id': None,
         'engine': 'conversation.home_assistant',
         'intent_input': 'test transcript',
@@ -341,6 +371,7 @@
     dict({
       'data': dict({
         'intent_output': dict({
+          'continue_conversation': False,
           'conversation_id': <ANY>,
           'response': dict({
             'card': dict({
@@ -376,6 +407,7 @@
         'tts_output': dict({
           'media_id': "media-source://tts/test?message=Sorry,+I+couldn't+understand+that&language=en-US&tts_options=%7B%22voice%22:%22james_earl_jones%22%7D",
           'mime_type': 'audio/mpeg',
+          'token': 'test_token.mp3',
           'url': '/api/tts_proxy/test_token.mp3',
         }),
       }),
@@ -391,8 +423,14 @@
   list([
     dict({
       'data': dict({
+        'conversation_id': 'mock-ulid',
         'language': 'en',
         'pipeline': <ANY>,
+        'tts_output': dict({
+          'mime_type': 'audio/mpeg',
+          'token': 'mocked-token.mp3',
+          'url': '/api/tts_proxy/mocked-token.mp3',
+        }),
       }),
       'type': <PipelineEventType.RUN_START: 'run-start'>,
     }),
@@ -427,6 +465,7 @@
   list([
     dict({
       'data': dict({
+        'conversation_id': 'mock-ulid',
         'language': 'en',
         'pipeline': <ANY>,
       }),
@@ -434,7 +473,7 @@
     }),
     dict({
       'data': dict({
-        'conversation_id': None,
+        'conversation_id': 'mock-ulid',
         'device_id': None,
         'engine': 'conversation.home_assistant',
         'intent_input': 'test input',
@@ -446,6 +485,7 @@
     dict({
       'data': dict({
         'intent_output': dict({
+          'continue_conversation': False,
           'conversation_id': <ANY>,
           'response': dict({
             'card': dict({
@@ -478,6 +518,7 @@
   list([
     dict({
       'data': dict({
+        'conversation_id': 'mock-ulid',
         'language': 'en',
         'pipeline': <ANY>,
       }),
@@ -485,7 +526,7 @@
     }),
     dict({
       'data': dict({
-        'conversation_id': None,
+        'conversation_id': 'mock-ulid',
         'device_id': None,
         'engine': 'conversation.home_assistant',
         'intent_input': 'test input',
@@ -497,6 +538,7 @@
     dict({
       'data': dict({
         'intent_output': dict({
+          'continue_conversation': False,
           'conversation_id': <ANY>,
           'response': dict({
             'card': dict({
@@ -529,6 +571,7 @@
   list([
     dict({
       'data': dict({
+        'conversation_id': 'mock-ulid',
         'language': 'en',
         'pipeline': <ANY>,
       }),
@@ -536,7 +579,7 @@
     }),
     dict({
       'data': dict({
-        'conversation_id': None,
+        'conversation_id': 'mock-ulid',
         'device_id': None,
         'engine': 'conversation.home_assistant',
         'intent_input': 'test input',
@@ -548,6 +591,7 @@
     dict({
       'data': dict({
         'intent_output': dict({
+          'continue_conversation': False,
           'conversation_id': <ANY>,
           'response': dict({
             'card': dict({
@@ -580,8 +624,14 @@
   list([
     dict({
       'data': dict({
+        'conversation_id': 'mock-ulid',
         'language': 'en',
         'pipeline': <ANY>,
+        'tts_output': dict({
+          'mime_type': 'audio/mpeg',
+          'token': 'mocked-token.mp3',
+          'url': '/api/tts_proxy/mocked-token.mp3',
+        }),
       }),
       'type': <PipelineEventType.RUN_START: 'run-start'>,
     }),
diff --git a/tests/components/assist_pipeline/snapshots/test_websocket.ambr b/tests/components/assist_pipeline/snapshots/test_websocket.ambr
index 917a9b654d5..57ae0095236 100644
--- a/tests/components/assist_pipeline/snapshots/test_websocket.ambr
+++ b/tests/components/assist_pipeline/snapshots/test_websocket.ambr
@@ -1,12 +1,18 @@
 # serializer version: 1
 # name: test_audio_pipeline
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
       'stt_binary_handler_id': 1,
       'timeout': 300,
     }),
+    'tts_output': dict({
+      'mime_type': 'audio/mpeg',
+      'token': 'test_token.mp3',
+      'url': '/api/tts_proxy/test_token.mp3',
+    }),
   })
 # ---
 # name: test_audio_pipeline.1
@@ -31,7 +37,7 @@
 # ---
 # name: test_audio_pipeline.3
   dict({
-    'conversation_id': None,
+    'conversation_id': 'mock-ulid',
     'device_id': None,
     'engine': 'conversation.home_assistant',
     'intent_input': 'test transcript',
@@ -42,6 +48,7 @@
 # name: test_audio_pipeline.4
   dict({
     'intent_output': dict({
+      'continue_conversation': False,
       'conversation_id': <ANY>,
       'response': dict({
         'card': dict({
@@ -75,6 +82,7 @@
     'tts_output': dict({
       'media_id': "media-source://tts/test?message=Sorry,+I+couldn't+understand+that&language=en-US&tts_options=%7B%22voice%22:%22james_earl_jones%22%7D",
       'mime_type': 'audio/mpeg',
+      'token': 'test_token.mp3',
       'url': '/api/tts_proxy/test_token.mp3',
     }),
   })
@@ -84,12 +92,18 @@
 # ---
 # name: test_audio_pipeline_debug
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
       'stt_binary_handler_id': 1,
       'timeout': 300,
     }),
+    'tts_output': dict({
+      'mime_type': 'audio/mpeg',
+      'token': 'test_token.mp3',
+      'url': '/api/tts_proxy/test_token.mp3',
+    }),
   })
 # ---
 # name: test_audio_pipeline_debug.1
@@ -114,7 +128,7 @@
 # ---
 # name: test_audio_pipeline_debug.3
   dict({
-    'conversation_id': None,
+    'conversation_id': 'mock-ulid',
     'device_id': None,
     'engine': 'conversation.home_assistant',
     'intent_input': 'test transcript',
@@ -125,6 +139,7 @@
 # name: test_audio_pipeline_debug.4
   dict({
     'intent_output': dict({
+      'continue_conversation': False,
       'conversation_id': <ANY>,
       'response': dict({
         'card': dict({
@@ -158,6 +173,7 @@
     'tts_output': dict({
       'media_id': "media-source://tts/test?message=Sorry,+I+couldn't+understand+that&language=en-US&tts_options=%7B%22voice%22:%22james_earl_jones%22%7D",
       'mime_type': 'audio/mpeg',
+      'token': 'test_token.mp3',
       'url': '/api/tts_proxy/test_token.mp3',
     }),
   })
@@ -179,12 +195,18 @@
 # ---
 # name: test_audio_pipeline_with_enhancements
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
       'stt_binary_handler_id': 1,
       'timeout': 300,
     }),
+    'tts_output': dict({
+      'mime_type': 'audio/mpeg',
+      'token': 'test_token.mp3',
+      'url': '/api/tts_proxy/test_token.mp3',
+    }),
   })
 # ---
 # name: test_audio_pipeline_with_enhancements.1
@@ -209,7 +231,7 @@
 # ---
 # name: test_audio_pipeline_with_enhancements.3
   dict({
-    'conversation_id': None,
+    'conversation_id': 'mock-ulid',
     'device_id': None,
     'engine': 'conversation.home_assistant',
     'intent_input': 'test transcript',
@@ -220,6 +242,7 @@
 # name: test_audio_pipeline_with_enhancements.4
   dict({
     'intent_output': dict({
+      'continue_conversation': False,
       'conversation_id': <ANY>,
       'response': dict({
         'card': dict({
@@ -253,6 +276,7 @@
     'tts_output': dict({
       'media_id': "media-source://tts/test?message=Sorry,+I+couldn't+understand+that&language=en-US&tts_options=%7B%22voice%22:%22james_earl_jones%22%7D",
       'mime_type': 'audio/mpeg',
+      'token': 'test_token.mp3',
       'url': '/api/tts_proxy/test_token.mp3',
     }),
   })
@@ -262,12 +286,18 @@
 # ---
 # name: test_audio_pipeline_with_wake_word_no_timeout
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
       'stt_binary_handler_id': 1,
       'timeout': 300,
     }),
+    'tts_output': dict({
+      'mime_type': 'audio/mpeg',
+      'token': 'test_token.mp3',
+      'url': '/api/tts_proxy/test_token.mp3',
+    }),
   })
 # ---
 # name: test_audio_pipeline_with_wake_word_no_timeout.1
@@ -314,7 +344,7 @@
 # ---
 # name: test_audio_pipeline_with_wake_word_no_timeout.5
   dict({
-    'conversation_id': None,
+    'conversation_id': 'mock-ulid',
     'device_id': None,
     'engine': 'conversation.home_assistant',
     'intent_input': 'test transcript',
@@ -325,6 +355,7 @@
 # name: test_audio_pipeline_with_wake_word_no_timeout.6
   dict({
     'intent_output': dict({
+      'continue_conversation': False,
       'conversation_id': <ANY>,
       'response': dict({
         'card': dict({
@@ -358,6 +389,7 @@
     'tts_output': dict({
       'media_id': "media-source://tts/test?message=Sorry,+I+couldn't+understand+that&language=en-US&tts_options=%7B%22voice%22:%22james_earl_jones%22%7D",
       'mime_type': 'audio/mpeg',
+      'token': 'test_token.mp3',
       'url': '/api/tts_proxy/test_token.mp3',
     }),
   })
@@ -367,12 +399,18 @@
 # ---
 # name: test_audio_pipeline_with_wake_word_timeout
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
       'stt_binary_handler_id': 1,
       'timeout': 300,
     }),
+    'tts_output': dict({
+      'mime_type': 'audio/mpeg',
+      'token': 'test_token.mp3',
+      'url': '/api/tts_proxy/test_token.mp3',
+    }),
   })
 # ---
 # name: test_audio_pipeline_with_wake_word_timeout.1
@@ -399,6 +437,7 @@
 # ---
 # name: test_device_capture
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
@@ -425,6 +464,7 @@
 # ---
 # name: test_device_capture_override
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
@@ -473,6 +513,7 @@
 # ---
 # name: test_device_capture_queue_full
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
@@ -512,6 +553,7 @@
 # ---
 # name: test_intent_failed
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
@@ -522,7 +564,7 @@
 # ---
 # name: test_intent_failed.1
   dict({
-    'conversation_id': None,
+    'conversation_id': 'mock-ulid',
     'device_id': None,
     'engine': 'conversation.home_assistant',
     'intent_input': 'Are the lights on?',
@@ -535,6 +577,7 @@
 # ---
 # name: test_intent_timeout
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
@@ -545,7 +588,7 @@
 # ---
 # name: test_intent_timeout.1
   dict({
-    'conversation_id': None,
+    'conversation_id': 'mock-ulid',
     'device_id': None,
     'engine': 'conversation.home_assistant',
     'intent_input': 'Are the lights on?',
@@ -564,17 +607,23 @@
 # ---
 # name: test_pipeline_empty_tts_output
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
       'stt_binary_handler_id': None,
       'timeout': 300,
     }),
+    'tts_output': dict({
+      'mime_type': 'audio/mpeg',
+      'token': 'mocked-token.mp3',
+      'url': '/api/tts_proxy/mocked-token.mp3',
+    }),
   })
 # ---
 # name: test_pipeline_empty_tts_output.1
   dict({
-    'conversation_id': None,
+    'conversation_id': 'mock-ulid',
     'device_id': None,
     'engine': 'conversation.home_assistant',
     'intent_input': 'never mind',
@@ -585,6 +634,7 @@
 # name: test_pipeline_empty_tts_output.2
   dict({
     'intent_output': dict({
+      'continue_conversation': False,
       'conversation_id': <ANY>,
       'response': dict({
         'card': dict({
@@ -611,52 +661,82 @@
 # ---
 # name: test_stt_cooldown_different_ids
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
       'stt_binary_handler_id': 1,
       'timeout': 300,
     }),
+    'tts_output': dict({
+      'mime_type': 'audio/mpeg',
+      'token': 'mocked-token.mp3',
+      'url': '/api/tts_proxy/mocked-token.mp3',
+    }),
   })
 # ---
 # name: test_stt_cooldown_different_ids.1
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
       'stt_binary_handler_id': 1,
       'timeout': 300,
     }),
+    'tts_output': dict({
+      'mime_type': 'audio/mpeg',
+      'token': 'mocked-token.mp3',
+      'url': '/api/tts_proxy/mocked-token.mp3',
+    }),
   })
 # ---
 # name: test_stt_cooldown_same_id
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
       'stt_binary_handler_id': 1,
       'timeout': 300,
     }),
+    'tts_output': dict({
+      'mime_type': 'audio/mpeg',
+      'token': 'mocked-token.mp3',
+      'url': '/api/tts_proxy/mocked-token.mp3',
+    }),
   })
 # ---
 # name: test_stt_cooldown_same_id.1
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
       'stt_binary_handler_id': 1,
       'timeout': 300,
     }),
+    'tts_output': dict({
+      'mime_type': 'audio/mpeg',
+      'token': 'mocked-token.mp3',
+      'url': '/api/tts_proxy/mocked-token.mp3',
+    }),
   })
 # ---
 # name: test_stt_stream_failed
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
       'stt_binary_handler_id': 1,
       'timeout': 300,
     }),
+    'tts_output': dict({
+      'mime_type': 'audio/mpeg',
+      'token': 'mocked-token.mp3',
+      'url': '/api/tts_proxy/mocked-token.mp3',
+    }),
   })
 # ---
 # name: test_stt_stream_failed.1
@@ -677,6 +757,7 @@
 # ---
 # name: test_text_only_pipeline[extra_msg0]
   dict({
+    'conversation_id': 'mock-conversation-id',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
@@ -698,6 +779,7 @@
 # name: test_text_only_pipeline[extra_msg0].2
   dict({
     'intent_output': dict({
+      'continue_conversation': False,
       'conversation_id': <ANY>,
       'response': dict({
         'card': dict({
@@ -710,7 +792,7 @@
         'speech': dict({
           'plain': dict({
             'extra_data': None,
-            'speech': 'Sorry, I am not aware of any area called Are',
+            'speech': 'Sorry, I am not aware of any area called Are the',
           }),
         }),
       }),
@@ -723,6 +805,7 @@
 # ---
 # name: test_text_only_pipeline[extra_msg1]
   dict({
+    'conversation_id': 'mock-conversation-id',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
@@ -744,6 +827,7 @@
 # name: test_text_only_pipeline[extra_msg1].2
   dict({
     'intent_output': dict({
+      'continue_conversation': False,
       'conversation_id': <ANY>,
       'response': dict({
         'card': dict({
@@ -756,7 +840,7 @@
         'speech': dict({
           'plain': dict({
             'extra_data': None,
-            'speech': 'Sorry, I am not aware of any area called Are',
+            'speech': 'Sorry, I am not aware of any area called Are the',
           }),
         }),
       }),
@@ -773,45 +857,36 @@
     'message': 'Timeout running pipeline',
   })
 # ---
-# name: test_tts_failed
-  dict({
-    'language': 'en',
-    'pipeline': <ANY>,
-    'runner_data': dict({
-      'stt_binary_handler_id': None,
-      'timeout': 300,
-    }),
-  })
-# ---
-# name: test_tts_failed.1
-  dict({
-    'engine': 'test',
-    'language': 'en-US',
-    'tts_input': 'Lights are on.',
-    'voice': 'james_earl_jones',
-  })
-# ---
-# name: test_tts_failed.2
-  None
-# ---
 # name: test_wake_word_cooldown_different_entities
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
       'stt_binary_handler_id': 1,
       'timeout': 300,
     }),
+    'tts_output': dict({
+      'mime_type': 'audio/mpeg',
+      'token': 'mocked-token.mp3',
+      'url': '/api/tts_proxy/mocked-token.mp3',
+    }),
   })
 # ---
 # name: test_wake_word_cooldown_different_entities.1
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
       'stt_binary_handler_id': 1,
       'timeout': 300,
     }),
+    'tts_output': dict({
+      'mime_type': 'audio/mpeg',
+      'token': 'mocked-token.mp3',
+      'url': '/api/tts_proxy/mocked-token.mp3',
+    }),
   })
 # ---
 # name: test_wake_word_cooldown_different_entities.2
@@ -857,22 +932,34 @@
 # ---
 # name: test_wake_word_cooldown_different_ids
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
       'stt_binary_handler_id': 1,
       'timeout': 300,
     }),
+    'tts_output': dict({
+      'mime_type': 'audio/mpeg',
+      'token': 'mocked-token.mp3',
+      'url': '/api/tts_proxy/mocked-token.mp3',
+    }),
   })
 # ---
 # name: test_wake_word_cooldown_different_ids.1
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
       'stt_binary_handler_id': 1,
       'timeout': 300,
     }),
+    'tts_output': dict({
+      'mime_type': 'audio/mpeg',
+      'token': 'mocked-token.mp3',
+      'url': '/api/tts_proxy/mocked-token.mp3',
+    }),
   })
 # ---
 # name: test_wake_word_cooldown_different_ids.2
@@ -921,22 +1008,34 @@
 # ---
 # name: test_wake_word_cooldown_same_id
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
       'stt_binary_handler_id': 1,
       'timeout': 300,
     }),
+    'tts_output': dict({
+      'mime_type': 'audio/mpeg',
+      'token': 'mocked-token.mp3',
+      'url': '/api/tts_proxy/mocked-token.mp3',
+    }),
   })
 # ---
 # name: test_wake_word_cooldown_same_id.1
   dict({
+    'conversation_id': 'mock-ulid',
     'language': 'en',
     'pipeline': <ANY>,
     'runner_data': dict({
       'stt_binary_handler_id': 1,
       'timeout': 300,
     }),
+    'tts_output': dict({
+      'mime_type': 'audio/mpeg',
+      'token': 'mocked-token.mp3',
+      'url': '/api/tts_proxy/mocked-token.mp3',
+    }),
   })
 # ---
 # name: test_wake_word_cooldown_same_id.2
diff --git a/tests/components/assist_pipeline/test_init.py b/tests/components/assist_pipeline/test_init.py
index a2cb9ef382a..0e04d1f0cd2 100644
--- a/tests/components/assist_pipeline/test_init.py
+++ b/tests/components/assist_pipeline/test_init.py
@@ -1,11 +1,12 @@
 """Test Voice Assistant init."""
 
 import asyncio
+from collections.abc import Generator
 from dataclasses import asdict
 import itertools as it
 from pathlib import Path
 import tempfile
-from unittest.mock import ANY, patch
+from unittest.mock import ANY, Mock, patch
 import wave
 
 import hass_nabucasa
@@ -26,7 +27,7 @@ from homeassistant.components.assist_pipeline.const import (
 )
 from homeassistant.const import MATCH_ALL
 from homeassistant.core import Context, HomeAssistant
-from homeassistant.helpers import intent
+from homeassistant.helpers import chat_session, intent
 from homeassistant.setup import async_setup_component
 
 from .conftest import (
@@ -41,6 +42,22 @@ from .conftest import (
 from tests.typing import ClientSessionGenerator, WebSocketGenerator
 
 
+@pytest.fixture(autouse=True)
+def mock_chat_session_id() -> Generator[Mock]:
+    """Mock the conversation ID of chat sessions."""
+    with patch(
+        "homeassistant.helpers.chat_session.ulid_now", return_value="mock-ulid"
+    ) as mock_ulid_now:
+        yield mock_ulid_now
+
+
+@pytest.fixture(autouse=True)
+def mock_tts_token() -> Generator[None]:
+    """Mock the TTS token for URLs."""
+    with patch("secrets.token_urlsafe", return_value="mocked-token"):
+        yield
+
+
 def process_events(events: list[assist_pipeline.PipelineEvent]) -> list[dict]:
     """Process events to remove dynamic values."""
     processed = []
@@ -666,6 +683,7 @@ async def test_wake_word_detection_aborted(
     mock_wake_word_provider_entity: MockWakeWordEntity,
     init_components,
     pipeline_data: assist_pipeline.pipeline.PipelineData,
+    mock_chat_session: chat_session.ChatSession,
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test creating a pipeline from an audio stream with wake word."""
@@ -684,7 +702,7 @@ async def test_wake_word_detection_aborted(
     pipeline = assist_pipeline.pipeline.async_get_pipeline(hass, pipeline_id)
 
     pipeline_input = assist_pipeline.pipeline.PipelineInput(
-        conversation_id=None,
+        session=mock_chat_session,
         device_id=None,
         stt_metadata=stt.SpeechMetadata(
             language="",
@@ -757,6 +775,7 @@ async def test_tts_audio_output(
     mock_tts_provider: MockTTSProvider,
     init_components,
     pipeline_data: assist_pipeline.pipeline.PipelineData,
+    mock_chat_session: chat_session.ChatSession,
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test using tts_audio_output with wav sets options correctly."""
@@ -771,7 +790,7 @@ async def test_tts_audio_output(
 
     pipeline_input = assist_pipeline.pipeline.PipelineInput(
         tts_input="This is a test.",
-        conversation_id=None,
+        session=mock_chat_session,
         device_id=None,
         run=assist_pipeline.pipeline.PipelineRun(
             hass,
@@ -786,10 +805,16 @@ async def test_tts_audio_output(
     await pipeline_input.validate()
 
     # Verify TTS audio settings
-    assert pipeline_input.run.tts_options is not None
-    assert pipeline_input.run.tts_options.get(tts.ATTR_PREFERRED_FORMAT) == "wav"
-    assert pipeline_input.run.tts_options.get(tts.ATTR_PREFERRED_SAMPLE_RATE) == 16000
-    assert pipeline_input.run.tts_options.get(tts.ATTR_PREFERRED_SAMPLE_CHANNELS) == 1
+    assert pipeline_input.run.tts_stream.options is not None
+    assert pipeline_input.run.tts_stream.options.get(tts.ATTR_PREFERRED_FORMAT) == "wav"
+    assert (
+        pipeline_input.run.tts_stream.options.get(tts.ATTR_PREFERRED_SAMPLE_RATE)
+        == 16000
+    )
+    assert (
+        pipeline_input.run.tts_stream.options.get(tts.ATTR_PREFERRED_SAMPLE_CHANNELS)
+        == 1
+    )
 
     with patch.object(mock_tts_provider, "get_tts_audio") as mock_get_tts_audio:
         await pipeline_input.execute()
@@ -798,9 +823,7 @@ async def test_tts_audio_output(
             if event.type == assist_pipeline.PipelineEventType.TTS_END:
                 # We must fetch the media URL to trigger the TTS
                 assert event.data
-                media_id = event.data["tts_output"]["media_id"]
-                resolved = await media_source.async_resolve_media(hass, media_id, None)
-                await client.get(resolved.url)
+                await client.get(event.data["tts_output"]["url"])
 
         # Ensure that no unsupported options were passed in
         assert mock_get_tts_audio.called
@@ -814,6 +837,7 @@ async def test_tts_wav_preferred_format(
     hass_client: ClientSessionGenerator,
     mock_tts_provider: MockTTSProvider,
     init_components,
+    mock_chat_session: chat_session.ChatSession,
     pipeline_data: assist_pipeline.pipeline.PipelineData,
 ) -> None:
     """Test that preferred format options are given to the TTS system if supported."""
@@ -828,7 +852,7 @@ async def test_tts_wav_preferred_format(
 
     pipeline_input = assist_pipeline.pipeline.PipelineInput(
         tts_input="This is a test.",
-        conversation_id=None,
+        session=mock_chat_session,
         device_id=None,
         run=assist_pipeline.pipeline.PipelineRun(
             hass,
@@ -863,9 +887,7 @@ async def test_tts_wav_preferred_format(
             if event.type == assist_pipeline.PipelineEventType.TTS_END:
                 # We must fetch the media URL to trigger the TTS
                 assert event.data
-                media_id = event.data["tts_output"]["media_id"]
-                resolved = await media_source.async_resolve_media(hass, media_id, None)
-                await client.get(resolved.url)
+                await client.get(event.data["tts_output"]["url"])
 
         assert mock_get_tts_audio.called
         options = mock_get_tts_audio.call_args_list[0].kwargs["options"]
@@ -882,6 +904,7 @@ async def test_tts_dict_preferred_format(
     hass_client: ClientSessionGenerator,
     mock_tts_provider: MockTTSProvider,
     init_components,
+    mock_chat_session: chat_session.ChatSession,
     pipeline_data: assist_pipeline.pipeline.PipelineData,
 ) -> None:
     """Test that preferred format options are given to the TTS system if supported."""
@@ -896,7 +919,7 @@ async def test_tts_dict_preferred_format(
 
     pipeline_input = assist_pipeline.pipeline.PipelineInput(
         tts_input="This is a test.",
-        conversation_id=None,
+        session=mock_chat_session,
         device_id=None,
         run=assist_pipeline.pipeline.PipelineRun(
             hass,
@@ -936,9 +959,7 @@ async def test_tts_dict_preferred_format(
             if event.type == assist_pipeline.PipelineEventType.TTS_END:
                 # We must fetch the media URL to trigger the TTS
                 assert event.data
-                media_id = event.data["tts_output"]["media_id"]
-                resolved = await media_source.async_resolve_media(hass, media_id, None)
-                await client.get(resolved.url)
+                await client.get(event.data["tts_output"]["url"])
 
         assert mock_get_tts_audio.called
         options = mock_get_tts_audio.call_args_list[0].kwargs["options"]
@@ -953,6 +974,7 @@ async def test_tts_dict_preferred_format(
 async def test_sentence_trigger_overrides_conversation_agent(
     hass: HomeAssistant,
     init_components,
+    mock_chat_session: chat_session.ChatSession,
     pipeline_data: assist_pipeline.pipeline.PipelineData,
 ) -> None:
     """Test that sentence triggers are checked before a non-default conversation agent."""
@@ -982,6 +1004,7 @@ async def test_sentence_trigger_overrides_conversation_agent(
 
     pipeline_input = assist_pipeline.pipeline.PipelineInput(
         intent_input="test trigger sentence",
+        session=mock_chat_session,
         run=assist_pipeline.pipeline.PipelineRun(
             hass,
             context=Context(),
@@ -1029,6 +1052,7 @@ async def test_sentence_trigger_overrides_conversation_agent(
 async def test_prefer_local_intents(
     hass: HomeAssistant,
     init_components,
+    mock_chat_session: chat_session.ChatSession,
     pipeline_data: assist_pipeline.pipeline.PipelineData,
 ) -> None:
     """Test that the default agent is checked first when local intents are preferred."""
@@ -1059,6 +1083,7 @@ async def test_prefer_local_intents(
 
     pipeline_input = assist_pipeline.pipeline.PipelineInput(
         intent_input="I'd like to order a stout please",
+        session=mock_chat_session,
         run=assist_pipeline.pipeline.PipelineRun(
             hass,
             context=Context(),
@@ -1102,10 +1127,150 @@ async def test_prefer_local_intents(
         )
 
 
+async def test_intent_continue_conversation(
+    hass: HomeAssistant,
+    init_components,
+    mock_chat_session: chat_session.ChatSession,
+    pipeline_data: assist_pipeline.pipeline.PipelineData,
+) -> None:
+    """Test that a conversation agent flagging continue conversation gets response."""
+    events: list[assist_pipeline.PipelineEvent] = []
+
+    # Fake a test agent and prefer local intents
+    pipeline_store = pipeline_data.pipeline_store
+    pipeline_id = pipeline_store.async_get_preferred_item()
+    pipeline = assist_pipeline.pipeline.async_get_pipeline(hass, pipeline_id)
+    await assist_pipeline.pipeline.async_update_pipeline(
+        hass, pipeline, conversation_engine="test-agent"
+    )
+    pipeline = assist_pipeline.pipeline.async_get_pipeline(hass, pipeline_id)
+
+    pipeline_input = assist_pipeline.pipeline.PipelineInput(
+        intent_input="Set a timer",
+        session=mock_chat_session,
+        run=assist_pipeline.pipeline.PipelineRun(
+            hass,
+            context=Context(),
+            pipeline=pipeline,
+            start_stage=assist_pipeline.PipelineStage.INTENT,
+            end_stage=assist_pipeline.PipelineStage.INTENT,
+            event_callback=events.append,
+        ),
+    )
+
+    # Ensure prepare succeeds
+    with patch(
+        "homeassistant.components.assist_pipeline.pipeline.conversation.async_get_agent_info",
+        return_value=conversation.AgentInfo(id="test-agent", name="Test Agent"),
+    ):
+        await pipeline_input.validate()
+
+    response = intent.IntentResponse("en")
+    response.async_set_speech("For how long?")
+
+    with patch(
+        "homeassistant.components.assist_pipeline.pipeline.conversation.async_converse",
+        return_value=conversation.ConversationResult(
+            response=response,
+            conversation_id=mock_chat_session.conversation_id,
+            continue_conversation=True,
+        ),
+    ) as mock_async_converse:
+        await pipeline_input.execute()
+
+        mock_async_converse.assert_called()
+
+    results = [
+        event.data
+        for event in events
+        if event.type
+        in (
+            assist_pipeline.PipelineEventType.INTENT_START,
+            assist_pipeline.PipelineEventType.INTENT_END,
+        )
+    ]
+    assert results[1]["intent_output"]["continue_conversation"] is True
+
+    # Change conversation agent to default one and register sentence trigger that should not be called
+    await assist_pipeline.pipeline.async_update_pipeline(
+        hass, pipeline, conversation_engine=None
+    )
+    pipeline = assist_pipeline.pipeline.async_get_pipeline(hass, pipeline_id)
+    assert await async_setup_component(
+        hass,
+        "automation",
+        {
+            "automation": {
+                "trigger": {
+                    "platform": "conversation",
+                    "command": ["Hello"],
+                },
+                "action": {
+                    "set_conversation_response": "test trigger response",
+                },
+            }
+        },
+    )
+
+    # Because we did continue conversation, it should respond to the test agent again.
+    events.clear()
+
+    pipeline_input = assist_pipeline.pipeline.PipelineInput(
+        intent_input="Hello",
+        session=mock_chat_session,
+        run=assist_pipeline.pipeline.PipelineRun(
+            hass,
+            context=Context(),
+            pipeline=pipeline,
+            start_stage=assist_pipeline.PipelineStage.INTENT,
+            end_stage=assist_pipeline.PipelineStage.INTENT,
+            event_callback=events.append,
+        ),
+    )
+
+    # Ensure prepare succeeds
+    with patch(
+        "homeassistant.components.assist_pipeline.pipeline.conversation.async_get_agent_info",
+        return_value=conversation.AgentInfo(id="test-agent", name="Test Agent"),
+    ) as mock_prepare:
+        await pipeline_input.validate()
+
+    # It requested test agent even if that was not default agent.
+    assert mock_prepare.mock_calls[0][1][1] == "test-agent"
+
+    response = intent.IntentResponse("en")
+    response.async_set_speech("Timer set for 20 minutes")
+
+    with patch(
+        "homeassistant.components.assist_pipeline.pipeline.conversation.async_converse",
+        return_value=conversation.ConversationResult(
+            response=response,
+            conversation_id=mock_chat_session.conversation_id,
+        ),
+    ) as mock_async_converse:
+        await pipeline_input.execute()
+
+        mock_async_converse.assert_called()
+
+    # Snapshot will show it was still handled by the test agent and not default agent
+    results = [
+        event.data
+        for event in events
+        if event.type
+        in (
+            assist_pipeline.PipelineEventType.INTENT_START,
+            assist_pipeline.PipelineEventType.INTENT_END,
+        )
+    ]
+    assert results[0]["engine"] == "test-agent"
+    assert results[1]["intent_output"]["continue_conversation"] is False
+
+
 async def test_stt_language_used_instead_of_conversation_language(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
     init_components,
+    mock_chat_session: chat_session.ChatSession,
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test that the STT language is used first when the conversation language is '*' (all languages)."""
@@ -1136,6 +1301,7 @@ async def test_stt_language_used_instead_of_conversation_language(
 
     pipeline_input = assist_pipeline.pipeline.PipelineInput(
         intent_input="test input",
+        session=mock_chat_session,
         run=assist_pipeline.pipeline.PipelineRun(
             hass,
             context=Context(),
@@ -1180,6 +1346,7 @@ async def test_tts_language_used_instead_of_conversation_language(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
     init_components,
+    mock_chat_session: chat_session.ChatSession,
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test that the TTS language is used after STT when the conversation language is '*' (all languages)."""
@@ -1210,6 +1377,7 @@ async def test_tts_language_used_instead_of_conversation_language(
 
     pipeline_input = assist_pipeline.pipeline.PipelineInput(
         intent_input="test input",
+        session=mock_chat_session,
         run=assist_pipeline.pipeline.PipelineRun(
             hass,
             context=Context(),
@@ -1254,6 +1422,7 @@ async def test_pipeline_language_used_instead_of_conversation_language(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
     init_components,
+    mock_chat_session: chat_session.ChatSession,
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test that the pipeline language is used last when the conversation language is '*' (all languages)."""
@@ -1284,6 +1453,7 @@ async def test_pipeline_language_used_instead_of_conversation_language(
 
     pipeline_input = assist_pipeline.pipeline.PipelineInput(
         intent_input="test input",
+        session=mock_chat_session,
         run=assist_pipeline.pipeline.PipelineRun(
             hass,
             context=Context(),
diff --git a/tests/components/assist_pipeline/test_pipeline.py b/tests/components/assist_pipeline/test_pipeline.py
index d52e2a762ee..d67a0fd1726 100644
--- a/tests/components/assist_pipeline/test_pipeline.py
+++ b/tests/components/assist_pipeline/test_pipeline.py
@@ -4,6 +4,7 @@ from collections.abc import AsyncGenerator
 from typing import Any
 from unittest.mock import ANY, patch
 
+from hassil.recognize import Intent, IntentData, RecognizeResult
 import pytest
 
 from homeassistant.components import conversation
@@ -16,6 +17,7 @@ from homeassistant.components.assist_pipeline.pipeline import (
     PipelineData,
     PipelineStorageCollection,
     PipelineStore,
+    _async_local_fallback_intent_filter,
     async_create_default_pipeline,
     async_get_pipeline,
     async_get_pipelines,
@@ -23,6 +25,7 @@ from homeassistant.components.assist_pipeline.pipeline import (
     async_update_pipeline,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import intent
 from homeassistant.setup import async_setup_component
 
 from . import MANY_LANGUAGES
@@ -657,3 +660,40 @@ async def test_migrate_after_load(hass: HomeAssistant) -> None:
 
     assert pipeline_updated.stt_engine == "stt.test"
     assert pipeline_updated.tts_engine == "tts.test"
+
+
+def test_fallback_intent_filter() -> None:
+    """Test that we filter the right things."""
+    assert (
+        _async_local_fallback_intent_filter(
+            RecognizeResult(
+                intent=Intent(intent.INTENT_GET_STATE),
+                intent_data=IntentData([]),
+                entities={},
+                entities_list=[],
+            )
+        )
+        is True
+    )
+    assert (
+        _async_local_fallback_intent_filter(
+            RecognizeResult(
+                intent=Intent(intent.INTENT_NEVERMIND),
+                intent_data=IntentData([]),
+                entities={},
+                entities_list=[],
+            )
+        )
+        is False
+    )
+    assert (
+        _async_local_fallback_intent_filter(
+            RecognizeResult(
+                intent=Intent(intent.INTENT_TURN_ON),
+                intent_data=IntentData([]),
+                entities={},
+                entities_list=[],
+            )
+        )
+        is False
+    )
diff --git a/tests/components/assist_pipeline/test_select.py b/tests/components/assist_pipeline/test_select.py
index 5ce3b1020d0..fec34cb2496 100644
--- a/tests/components/assist_pipeline/test_select.py
+++ b/tests/components/assist_pipeline/test_select.py
@@ -19,7 +19,7 @@ from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from tests.common import MockConfigEntry, MockPlatform, mock_platform
 
@@ -31,7 +31,7 @@ class SelectPlatform(MockPlatform):
         self,
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up fake select platform."""
         pipeline_entity = AssistPipelineSelect(hass, "test-domain", "test-prefix")
diff --git a/tests/components/assist_pipeline/test_websocket.py b/tests/components/assist_pipeline/test_websocket.py
index c1caf6f86a4..060c0dce660 100644
--- a/tests/components/assist_pipeline/test_websocket.py
+++ b/tests/components/assist_pipeline/test_websocket.py
@@ -2,12 +2,14 @@
 
 import asyncio
 import base64
+from collections.abc import Generator
 from typing import Any
-from unittest.mock import ANY, patch
+from unittest.mock import ANY, Mock, patch
 
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
+from homeassistant.components import conversation
 from homeassistant.components.assist_pipeline.const import (
     DOMAIN,
     SAMPLE_CHANNELS,
@@ -18,10 +20,12 @@ from homeassistant.components.assist_pipeline.pipeline import (
     DeviceAudioQueue,
     Pipeline,
     PipelineData,
+    async_get_pipelines,
+    async_update_pipeline,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers import chat_session, device_registry as dr
 
 from .conftest import (
     BYTES_ONE_SECOND,
@@ -35,6 +39,22 @@ from tests.common import MockConfigEntry
 from tests.typing import WebSocketGenerator
 
 
+@pytest.fixture(autouse=True)
+def mock_chat_session_id() -> Generator[Mock]:
+    """Mock the conversation ID of chat sessions."""
+    with patch(
+        "homeassistant.helpers.chat_session.ulid_now", return_value="mock-ulid"
+    ) as mock_ulid_now:
+        yield mock_ulid_now
+
+
+@pytest.fixture(autouse=True)
+def mock_tts_token() -> Generator[None]:
+    """Mock the TTS token for URLs."""
+    with patch("secrets.token_urlsafe", return_value="mocked-token"):
+        yield
+
+
 @pytest.mark.parametrize(
     "extra_msg",
     [
@@ -815,74 +835,6 @@ async def test_stt_stream_failed(
     assert msg["result"] == {"events": events}
 
 
-async def test_tts_failed(
-    hass: HomeAssistant,
-    hass_ws_client: WebSocketGenerator,
-    init_components,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test pipeline run with text-to-speech error."""
-    events = []
-    client = await hass_ws_client(hass)
-
-    with patch(
-        "homeassistant.components.media_source.async_resolve_media",
-        side_effect=RuntimeError,
-    ):
-        await client.send_json_auto_id(
-            {
-                "type": "assist_pipeline/run",
-                "start_stage": "tts",
-                "end_stage": "tts",
-                "input": {"text": "Lights are on."},
-            }
-        )
-
-        # result
-        msg = await client.receive_json()
-        assert msg["success"]
-
-        # run start
-        msg = await client.receive_json()
-        assert msg["event"]["type"] == "run-start"
-        msg["event"]["data"]["pipeline"] = ANY
-        assert msg["event"]["data"] == snapshot
-        events.append(msg["event"])
-
-        # tts start
-        msg = await client.receive_json()
-        assert msg["event"]["type"] == "tts-start"
-        assert msg["event"]["data"] == snapshot
-        events.append(msg["event"])
-
-        # tts error
-        msg = await client.receive_json()
-        assert msg["event"]["type"] == "error"
-        assert msg["event"]["data"]["code"] == "tts-failed"
-        events.append(msg["event"])
-
-        # run end
-        msg = await client.receive_json()
-        assert msg["event"]["type"] == "run-end"
-        assert msg["event"]["data"] == snapshot
-        events.append(msg["event"])
-
-    pipeline_data: PipelineData = hass.data[DOMAIN]
-    pipeline_id = list(pipeline_data.pipeline_debug)[0]
-    pipeline_run_id = list(pipeline_data.pipeline_debug[pipeline_id])[0]
-
-    await client.send_json_auto_id(
-        {
-            "type": "assist_pipeline/pipeline_debug/get",
-            "pipeline_id": pipeline_id,
-            "pipeline_run_id": pipeline_run_id,
-        }
-    )
-    msg = await client.receive_json()
-    assert msg["success"]
-    assert msg["result"] == {"events": events}
-
-
 async def test_tts_provider_missing(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
@@ -893,23 +845,22 @@ async def test_tts_provider_missing(
     """Test pipeline run with text-to-speech error."""
     client = await hass_ws_client(hass)
 
-    with patch(
-        "homeassistant.components.tts.async_support_options",
-        side_effect=HomeAssistantError,
-    ):
-        await client.send_json_auto_id(
-            {
-                "type": "assist_pipeline/run",
-                "start_stage": "tts",
-                "end_stage": "tts",
-                "input": {"text": "Lights are on."},
-            }
-        )
+    pipelines = async_get_pipelines(hass)
+    await async_update_pipeline(hass, pipelines[0], tts_engine="unavailable")
 
-        # result
-        msg = await client.receive_json()
-        assert not msg["success"]
-        assert msg["error"]["code"] == "tts-not-supported"
+    await client.send_json_auto_id(
+        {
+            "type": "assist_pipeline/run",
+            "start_stage": "tts",
+            "end_stage": "tts",
+            "input": {"text": "Lights are on."},
+        }
+    )
+
+    # result
+    msg = await client.receive_json()
+    assert not msg["success"]
+    assert msg["error"]["code"] == "tts-not-supported"
 
 
 async def test_tts_provider_bad_options(
@@ -923,8 +874,8 @@ async def test_tts_provider_bad_options(
     client = await hass_ws_client(hass)
 
     with patch(
-        "homeassistant.components.tts.async_support_options",
-        return_value=False,
+        "homeassistant.components.tts.SpeechManager.process_options",
+        side_effect=HomeAssistantError("Language not supported"),
     ):
         await client.send_json_auto_id(
             {
@@ -2718,3 +2669,62 @@ async def test_stt_cooldown_different_ids(
 
     # Both should start stt
     assert {event_type_1, event_type_2} == {"stt-start"}
+
+
+async def test_intent_progress_event(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    init_components,
+) -> None:
+    """Test intent-progress events from a pipeline are forwarded."""
+    client = await hass_ws_client(hass)
+
+    orig_converse = conversation.async_converse
+    expected_delta_events = [
+        {"chat_log_delta": {"role": "assistant"}},
+        {"chat_log_delta": {"content": "Hello"}},
+    ]
+
+    async def mock_delta_stream():
+        """Mock delta stream."""
+        for d in expected_delta_events:
+            yield d["chat_log_delta"]
+
+    async def mock_converse(**kwargs):
+        """Mock converse method."""
+        with (
+            chat_session.async_get_chat_session(
+                kwargs["hass"], kwargs["conversation_id"]
+            ) as session,
+            conversation.async_get_chat_log(hass, session) as chat_log,
+        ):
+            async for _content in chat_log.async_add_delta_content_stream(
+                "", mock_delta_stream()
+            ):
+                pass
+
+            return await orig_converse(**kwargs)
+
+    with patch("homeassistant.components.conversation.async_converse", mock_converse):
+        await client.send_json_auto_id(
+            {
+                "type": "assist_pipeline/run",
+                "start_stage": "intent",
+                "end_stage": "intent",
+                "input": {"text": "Are the lights on?"},
+                "conversation_id": "mock-conversation-id",
+                "device_id": "mock-device-id",
+            }
+        )
+
+        # result
+        msg = await client.receive_json()
+        assert msg["success"]
+
+        events = []
+        for _ in range(6):
+            msg = await client.receive_json()
+            if msg["event"]["type"] == "intent-progress":
+                events.append(msg["event"]["data"])
+
+    assert events == expected_delta_events
diff --git a/tests/components/assist_satellite/conftest.py b/tests/components/assist_satellite/conftest.py
index d75cbd072e0..79e4061bacc 100644
--- a/tests/components/assist_satellite/conftest.py
+++ b/tests/components/assist_satellite/conftest.py
@@ -40,6 +40,8 @@ def mock_tts(mock_tts_cache_dir: pathlib.Path) -> None:
 class MockAssistSatellite(AssistSatelliteEntity):
     """Mock Assist Satellite Entity."""
 
+    _attr_tts_options = {"test-option": "test-value"}
+
     def __init__(self, name: str, features: AssistSatelliteEntityFeature) -> None:
         """Initialize the mock entity."""
         self._attr_unique_id = ulid_hex()
@@ -67,6 +69,7 @@ class MockAssistSatellite(AssistSatelliteEntity):
             active_wake_words=["1234"],
             max_active_wake_words=1,
         )
+        self.start_conversations = []
 
     def on_pipeline_event(self, event: PipelineEvent) -> None:
         """Handle pipeline events."""
@@ -87,11 +90,23 @@ class MockAssistSatellite(AssistSatelliteEntity):
         """Set the current satellite configuration."""
         self.config = config
 
+    async def async_start_conversation(
+        self, start_announcement: AssistSatelliteConfiguration
+    ) -> None:
+        """Start a conversation from the satellite."""
+        self.start_conversations.append(
+            (self._conversation_id, self._extra_system_prompt, start_announcement)
+        )
+
 
 @pytest.fixture
 def entity() -> MockAssistSatellite:
     """Mock Assist Satellite Entity."""
-    return MockAssistSatellite("Test Entity", AssistSatelliteEntityFeature.ANNOUNCE)
+    return MockAssistSatellite(
+        "Test Entity",
+        AssistSatelliteEntityFeature.ANNOUNCE
+        | AssistSatelliteEntityFeature.START_CONVERSATION,
+    )
 
 
 @pytest.fixture
diff --git a/tests/components/assist_satellite/test_entity.py b/tests/components/assist_satellite/test_entity.py
index c3464beac97..2b1cc78943f 100644
--- a/tests/components/assist_satellite/test_entity.py
+++ b/tests/components/assist_satellite/test_entity.py
@@ -1,7 +1,8 @@
 """Test the Assist Satellite entity."""
 
 import asyncio
-from unittest.mock import patch
+from collections.abc import Generator
+from unittest.mock import Mock, patch
 
 import pytest
 
@@ -21,14 +22,38 @@ from homeassistant.components.assist_satellite import (
     AssistSatelliteAnnouncement,
     SatelliteBusyError,
 )
+from homeassistant.components.assist_satellite.const import PREANNOUNCE_URL
 from homeassistant.components.assist_satellite.entity import AssistSatelliteState
 from homeassistant.components.media_source import PlayMedia
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import Context, HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 
 from . import ENTITY_ID
 from .conftest import MockAssistSatellite
 
+from tests.components.tts.common import MockResultStream
+
+
+@pytest.fixture
+def mock_chat_session_conversation_id() -> Generator[Mock]:
+    """Mock the ulid library."""
+    with patch("homeassistant.helpers.chat_session.ulid_now") as mock_ulid_now:
+        mock_ulid_now.return_value = "mock-conversation-id"
+        yield mock_ulid_now
+
+
+@pytest.fixture(autouse=True)
+async def set_pipeline_tts(hass: HomeAssistant, init_components: ConfigEntry) -> None:
+    """Set up a pipeline with a TTS engine."""
+    await async_update_pipeline(
+        hass,
+        async_get_pipeline(hass),
+        tts_engine="tts.mock_entity",
+        tts_language="en",
+        tts_voice="test-voice",
+    )
+
 
 async def test_entity_state(
     hass: HomeAssistant, init_components: ConfigEntry, entity: MockAssistSatellite
@@ -64,7 +89,7 @@ async def test_entity_state(
     assert kwargs["stt_stream"] is audio_stream
     assert kwargs["pipeline_id"] is None
     assert kwargs["device_id"] is entity.device_entry.id
-    assert kwargs["tts_audio_output"] is None
+    assert kwargs["tts_audio_output"] == {"test-option": "test-value"}
     assert kwargs["wake_word_phrase"] is None
     assert kwargs["audio_settings"] == AudioSettings(
         silence_seconds=vad.VadSensitivity.to_seconds(vad.VadSensitivity.DEFAULT)
@@ -161,11 +186,12 @@ async def test_new_pipeline_cancels_pipeline(
     ("service_data", "expected_params"),
     [
         (
-            {"message": "Hello"},
+            {"message": "Hello", "preannounce_media_id": None},
             AssistSatelliteAnnouncement(
                 message="Hello",
-                media_id="https://www.home-assistant.io/resolved.mp3",
+                media_id="http://10.10.10.10:8123/api/tts_proxy/test-token",
                 original_media_id="media-source://bla",
+                tts_token="test-token",
                 media_id_source="tts",
             ),
         ),
@@ -173,23 +199,40 @@ async def test_new_pipeline_cancels_pipeline(
             {
                 "message": "Hello",
                 "media_id": "media-source://given",
+                "preannounce_media_id": None,
             },
             AssistSatelliteAnnouncement(
                 message="Hello",
                 media_id="https://www.home-assistant.io/resolved.mp3",
                 original_media_id="media-source://given",
+                tts_token=None,
                 media_id_source="media_id",
             ),
         ),
         (
-            {"media_id": "http://example.com/bla.mp3"},
+            {"media_id": "http://example.com/bla.mp3", "preannounce_media_id": None},
             AssistSatelliteAnnouncement(
                 message="",
                 media_id="http://example.com/bla.mp3",
                 original_media_id="http://example.com/bla.mp3",
+                tts_token=None,
                 media_id_source="url",
             ),
         ),
+        (
+            {
+                "media_id": "http://example.com/bla.mp3",
+                "preannounce_media_id": "http://example.com/preannounce.mp3",
+            },
+            AssistSatelliteAnnouncement(
+                message="",
+                media_id="http://example.com/bla.mp3",
+                original_media_id="http://example.com/bla.mp3",
+                tts_token=None,
+                media_id_source="url",
+                preannounce_media_id="http://example.com/preannounce.mp3",
+            ),
+        ),
     ],
 )
 async def test_announce(
@@ -200,24 +243,12 @@ async def test_announce(
     expected_params: tuple[str, str],
 ) -> None:
     """Test announcing on a device."""
-    await async_update_pipeline(
-        hass,
-        async_get_pipeline(hass),
-        tts_engine="tts.mock_entity",
-        tts_language="en",
-        tts_voice="test-voice",
-    )
-
-    entity._attr_tts_options = {"test-option": "test-value"}
-
     original_announce = entity.async_announce
-    announce_started = asyncio.Event()
 
     async def async_announce(announcement):
         # Verify state change
         assert entity.state == AssistSatelliteState.RESPONDING
         await original_announce(announcement)
-        announce_started.set()
 
     def tts_generate_media_source_id(
         hass: HomeAssistant,
@@ -233,9 +264,17 @@ async def test_announce(
 
     with (
         patch(
-            "homeassistant.components.assist_satellite.entity.tts_generate_media_source_id",
+            "homeassistant.components.tts.generate_media_source_id",
             new=tts_generate_media_source_id,
         ),
+        patch(
+            "homeassistant.components.tts.async_resolve_engine",
+            return_value="tts.cloud",
+        ),
+        patch(
+            "homeassistant.components.tts.async_create_stream",
+            return_value=MockResultStream(hass, "wav", b""),
+        ),
         patch(
             "homeassistant.components.media_source.async_resolve_media",
             return_value=PlayMedia(
@@ -331,6 +370,24 @@ async def test_announce_cancels_pipeline(
         mock_async_announce.assert_called_once()
 
 
+async def test_announce_default_preannounce(
+    hass: HomeAssistant, init_components: ConfigEntry, entity: MockAssistSatellite
+) -> None:
+    """Test announcing on a device with the default preannouncement sound."""
+
+    async def async_announce(announcement):
+        assert announcement.preannounce_media_id.endswith(PREANNOUNCE_URL)
+
+    with patch.object(entity, "async_announce", new=async_announce):
+        await hass.services.async_call(
+            "assist_satellite",
+            "announce",
+            {"media_id": "test-media-id"},
+            target={"entity_id": "assist_satellite.test_entity"},
+            blocking=True,
+        )
+
+
 async def test_context_refresh(
     hass: HomeAssistant, init_components: ConfigEntry, entity: MockAssistSatellite
 ) -> None:
@@ -475,3 +532,228 @@ async def test_vad_sensitivity_entity_not_found(
 
     with pytest.raises(RuntimeError):
         await entity.async_accept_pipeline_from_satellite(audio_stream)
+
+
+@pytest.mark.parametrize(
+    ("service_data", "expected_params"),
+    [
+        (
+            {
+                "start_message": "Hello",
+                "extra_system_prompt": "Better system prompt",
+                "preannounce_media_id": None,
+            },
+            (
+                "mock-conversation-id",
+                "Better system prompt",
+                AssistSatelliteAnnouncement(
+                    message="Hello",
+                    media_id="http://10.10.10.10:8123/api/tts_proxy/test-token",
+                    tts_token="test-token",
+                    original_media_id="media-source://generated",
+                    media_id_source="tts",
+                ),
+            ),
+        ),
+        (
+            {
+                "start_message": "Hello",
+                "start_media_id": "media-source://given",
+                "preannounce_media_id": None,
+            },
+            (
+                "mock-conversation-id",
+                "Hello",
+                AssistSatelliteAnnouncement(
+                    message="Hello",
+                    media_id="https://www.home-assistant.io/resolved.mp3",
+                    tts_token=None,
+                    original_media_id="media-source://given",
+                    media_id_source="media_id",
+                ),
+            ),
+        ),
+        (
+            {
+                "start_media_id": "http://example.com/given.mp3",
+                "preannounce_media_id": None,
+            },
+            (
+                "mock-conversation-id",
+                None,
+                AssistSatelliteAnnouncement(
+                    message="",
+                    media_id="http://example.com/given.mp3",
+                    tts_token=None,
+                    original_media_id="http://example.com/given.mp3",
+                    media_id_source="url",
+                ),
+            ),
+        ),
+        (
+            {
+                "start_media_id": "http://example.com/given.mp3",
+                "preannounce_media_id": "http://example.com/preannounce.mp3",
+            },
+            (
+                "mock-conversation-id",
+                None,
+                AssistSatelliteAnnouncement(
+                    message="",
+                    media_id="http://example.com/given.mp3",
+                    tts_token=None,
+                    original_media_id="http://example.com/given.mp3",
+                    media_id_source="url",
+                    preannounce_media_id="http://example.com/preannounce.mp3",
+                ),
+            ),
+        ),
+    ],
+)
+@pytest.mark.usefixtures("mock_chat_session_conversation_id")
+async def test_start_conversation(
+    hass: HomeAssistant,
+    init_components: ConfigEntry,
+    entity: MockAssistSatellite,
+    service_data: dict,
+    expected_params: tuple[str, str],
+) -> None:
+    """Test starting a conversation on a device."""
+    original_start_conversation = entity.async_start_conversation
+
+    async def async_start_conversation(start_announcement):
+        # Verify state change
+        assert entity.state == AssistSatelliteState.RESPONDING
+        await original_start_conversation(start_announcement)
+
+    await async_update_pipeline(
+        hass,
+        async_get_pipeline(hass),
+        conversation_engine="conversation.some_llm",
+    )
+
+    with (
+        patch(
+            "homeassistant.components.tts.generate_media_source_id",
+            return_value="media-source://generated",
+        ),
+        patch(
+            "homeassistant.components.tts.async_resolve_engine",
+            return_value="tts.cloud",
+        ),
+        patch(
+            "homeassistant.components.tts.async_create_stream",
+            return_value=MockResultStream(hass, "wav", b""),
+        ),
+        patch(
+            "homeassistant.components.media_source.async_resolve_media",
+            return_value=PlayMedia(
+                url="https://www.home-assistant.io/resolved.mp3",
+                mime_type="audio/mp3",
+            ),
+        ),
+        patch.object(entity, "async_start_conversation", new=async_start_conversation),
+    ):
+        await hass.services.async_call(
+            "assist_satellite",
+            "start_conversation",
+            service_data,
+            target={"entity_id": "assist_satellite.test_entity"},
+            blocking=True,
+        )
+        assert entity.state == AssistSatelliteState.IDLE
+
+    assert entity.start_conversations[0] == expected_params
+
+
+async def test_start_conversation_reject_builtin_agent(
+    hass: HomeAssistant,
+    init_components: ConfigEntry,
+    entity: MockAssistSatellite,
+) -> None:
+    """Test starting a conversation on a device."""
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            "assist_satellite",
+            "start_conversation",
+            {"start_message": "Hey!"},
+            target={"entity_id": "assist_satellite.test_entity"},
+            blocking=True,
+        )
+
+
+async def test_start_conversation_default_preannounce(
+    hass: HomeAssistant, init_components: ConfigEntry, entity: MockAssistSatellite
+) -> None:
+    """Test starting a conversation on a device with the default preannouncement sound."""
+
+    async def async_start_conversation(start_announcement):
+        assert PREANNOUNCE_URL in start_announcement.preannounce_media_id
+
+    await async_update_pipeline(
+        hass,
+        async_get_pipeline(hass),
+        conversation_engine="conversation.some_llm",
+    )
+
+    with (
+        patch.object(entity, "async_start_conversation", new=async_start_conversation),
+    ):
+        await hass.services.async_call(
+            "assist_satellite",
+            "start_conversation",
+            {"start_media_id": "test-media-id"},
+            target={"entity_id": "assist_satellite.test_entity"},
+            blocking=True,
+        )
+
+
+async def test_wake_word_start_keeps_responding(
+    hass: HomeAssistant, init_components: ConfigEntry, entity: MockAssistSatellite
+) -> None:
+    """Test entity state stays responding on wake word start event."""
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.state == AssistSatelliteState.IDLE
+
+    # Get into responding state
+    audio_stream = object()
+
+    with patch(
+        "homeassistant.components.assist_satellite.entity.async_pipeline_from_audio_stream"
+    ) as mock_start_pipeline:
+        await entity.async_accept_pipeline_from_satellite(
+            audio_stream, start_stage=PipelineStage.TTS
+        )
+
+    assert mock_start_pipeline.called
+    kwargs = mock_start_pipeline.call_args[1]
+    event_callback = kwargs["event_callback"]
+    event_callback(PipelineEvent(PipelineEventType.TTS_START, {}))
+
+    state = hass.states.get(ENTITY_ID)
+    assert state.state == AssistSatelliteState.RESPONDING
+
+    # Verify that starting a new wake word stream keeps the state
+    audio_stream = object()
+
+    with patch(
+        "homeassistant.components.assist_satellite.entity.async_pipeline_from_audio_stream"
+    ) as mock_start_pipeline:
+        await entity.async_accept_pipeline_from_satellite(
+            audio_stream, start_stage=PipelineStage.WAKE_WORD
+        )
+
+    assert mock_start_pipeline.called
+    kwargs = mock_start_pipeline.call_args[1]
+    event_callback = kwargs["event_callback"]
+    event_callback(PipelineEvent(PipelineEventType.WAKE_WORD_START, {}))
+
+    state = hass.states.get(ENTITY_ID)
+    assert state.state == AssistSatelliteState.RESPONDING
+
+    # Only return to idle once TTS is finished
+    entity.tts_response_finished()
+    state = hass.states.get(ENTITY_ID)
+    assert state.state == AssistSatelliteState.IDLE
diff --git a/tests/components/assist_satellite/test_intent.py b/tests/components/assist_satellite/test_intent.py
index 27107c7d2e9..0e531811adc 100644
--- a/tests/components/assist_satellite/test_intent.py
+++ b/tests/components/assist_satellite/test_intent.py
@@ -4,28 +4,28 @@ from unittest.mock import patch
 
 import pytest
 
-from homeassistant.components.media_source import PlayMedia
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import intent
+from homeassistant.setup import async_setup_component
 
-from .conftest import MockAssistSatellite
+from .conftest import TEST_DOMAIN, MockAssistSatellite
+
+from tests.components.tts.common import MockResultStream
 
 
 @pytest.fixture
-def mock_tts():
+async def mock_tts(hass: HomeAssistant):
     """Mock TTS service."""
+    assert await async_setup_component(hass, "tts", {})
     with (
         patch(
-            "homeassistant.components.assist_satellite.entity.tts_generate_media_source_id",
+            "homeassistant.components.tts.generate_media_source_id",
             return_value="media-source://bla",
         ),
         patch(
-            "homeassistant.components.media_source.async_resolve_media",
-            return_value=PlayMedia(
-                url="https://www.home-assistant.io/resolved.mp3",
-                mime_type="audio/mp3",
-            ),
+            "homeassistant.components.tts.async_create_stream",
+            return_value=MockResultStream(hass, "wav", b""),
         ),
     ):
         yield
@@ -41,9 +41,13 @@ async def test_broadcast_intent(
 ) -> None:
     """Test we can invoke a broadcast intent."""
 
-    result = await intent.async_handle(
-        hass, "test", intent.INTENT_BROADCAST, {"message": {"value": "Hello"}}
-    )
+    with patch(
+        "homeassistant.components.tts.async_resolve_engine",
+        return_value="tts.cloud",
+    ):
+        result = await intent.async_handle(
+            hass, "test", intent.INTENT_BROADCAST, {"message": {"value": "Hello"}}
+        )
 
     assert result.as_dict() == {
         "card": {},
@@ -65,24 +69,23 @@ async def test_broadcast_intent(
         },
         "language": "en",
         "response_type": "action_done",
-        "speech": {
-            "plain": {
-                "extra_data": None,
-                "speech": "Done",
-            }
-        },
+        "speech": {},  # response comes from intents
     }
     assert len(entity.announcements) == 1
     assert len(entity2.announcements) == 1
     assert len(entity_no_features.announcements) == 0
 
-    result = await intent.async_handle(
-        hass,
-        "test",
-        intent.INTENT_BROADCAST,
-        {"message": {"value": "Hello"}},
-        device_id=entity.device_entry.id,
-    )
+    with patch(
+        "homeassistant.components.tts.async_resolve_engine",
+        return_value="tts.cloud",
+    ):
+        result = await intent.async_handle(
+            hass,
+            "test",
+            intent.INTENT_BROADCAST,
+            {"message": {"value": "Hello"}},
+            device_id=entity.device_entry.id,
+        )
     # Broadcast doesn't targets device that triggered it.
     assert result.as_dict() == {
         "card": {},
@@ -99,12 +102,37 @@ async def test_broadcast_intent(
         },
         "language": "en",
         "response_type": "action_done",
-        "speech": {
-            "plain": {
-                "extra_data": None,
-                "speech": "Done",
-            }
-        },
+        "speech": {},  # response comes from intents
     }
     assert len(entity.announcements) == 1
     assert len(entity2.announcements) == 2
+
+
+async def test_broadcast_intent_excluded_domains(
+    hass: HomeAssistant,
+    init_components: ConfigEntry,
+    entity: MockAssistSatellite,
+    entity2: MockAssistSatellite,
+    mock_tts: None,
+) -> None:
+    """Test that the broadcast intent filters out entities in excluded domains."""
+
+    # Exclude the "test" domain
+    with patch(
+        "homeassistant.components.assist_satellite.intent.EXCLUDED_DOMAINS",
+        new={TEST_DOMAIN},
+    ):
+        result = await intent.async_handle(
+            hass, "test", intent.INTENT_BROADCAST, {"message": {"value": "Hello"}}
+        )
+        assert result.as_dict() == {
+            "card": {},
+            "data": {
+                "failed": [],
+                "success": [],  # no satellites
+                "targets": [],
+            },
+            "language": "en",
+            "response_type": "action_done",
+            "speech": {},
+        }
diff --git a/tests/components/assist_satellite/test_websocket_api.py b/tests/components/assist_satellite/test_websocket_api.py
index 257961a5b32..f0a8f02fc50 100644
--- a/tests/components/assist_satellite/test_websocket_api.py
+++ b/tests/components/assist_satellite/test_websocket_api.py
@@ -313,6 +313,37 @@ async def test_get_configuration(
         }
 
 
+async def test_get_configuration_not_implemented(
+    hass: HomeAssistant,
+    init_components: ConfigEntry,
+    entity: MockAssistSatellite,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test getting stub satellite configuration when the entity doesn't implement the method."""
+    ws_client = await hass_ws_client(hass)
+
+    with patch.object(
+        entity, "async_get_configuration", side_effect=NotImplementedError()
+    ):
+        await ws_client.send_json_auto_id(
+            {
+                "type": "assist_satellite/get_configuration",
+                "entity_id": ENTITY_ID,
+            }
+        )
+        msg = await ws_client.receive_json()
+        assert msg["success"]
+
+        # Stub configuration
+        assert msg["result"] == {
+            "active_wake_words": [],
+            "available_wake_words": [],
+            "max_active_wake_words": 1,
+            "pipeline_entity_id": None,
+            "vad_entity_id": None,
+        }
+
+
 async def test_set_wake_words(
     hass: HomeAssistant,
     init_components: ConfigEntry,
diff --git a/tests/components/august/snapshots/test_binary_sensor.ambr b/tests/components/august/snapshots/test_binary_sensor.ambr
index 6e95b0ce552..be5947372f5 100644
--- a/tests/components/august/snapshots/test_binary_sensor.ambr
+++ b/tests/components/august/snapshots/test_binary_sensor.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': 'tmt100_name',
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://account.august.com',
     'connections': set({
     }),
diff --git a/tests/components/august/snapshots/test_lock.ambr b/tests/components/august/snapshots/test_lock.ambr
index 6aad3a140ca..0a594fed1ee 100644
--- a/tests/components/august/snapshots/test_lock.ambr
+++ b/tests/components/august/snapshots/test_lock.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': 'online_with_doorsense_name',
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://account.august.com',
     'connections': set({
       tuple(
diff --git a/tests/components/august/test_binary_sensor.py b/tests/components/august/test_binary_sensor.py
index 4ae300ae56b..bcdd4d55330 100644
--- a/tests/components/august/test_binary_sensor.py
+++ b/tests/components/august/test_binary_sensor.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .mocks import (
     _create_august_with_devices,
diff --git a/tests/components/august/test_lock.py b/tests/components/august/test_lock.py
index eb177a35cfb..065ffef91ff 100644
--- a/tests/components/august/test_lock.py
+++ b/tests/components/august/test_lock.py
@@ -23,7 +23,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceNotSupported
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .mocks import (
     _create_august_with_devices,
diff --git a/tests/components/autarco/snapshots/test_sensor.ambr b/tests/components/autarco/snapshots/test_sensor.ambr
index dbbd8e9b47d..d57f4be5da0 100644
--- a/tests/components/autarco/snapshots/test_sensor.ambr
+++ b/tests/components/autarco/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -110,6 +112,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -161,6 +164,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -212,6 +216,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -263,6 +268,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -314,6 +320,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -365,6 +372,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -416,6 +424,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -467,6 +476,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -518,6 +528,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -569,6 +580,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -620,6 +632,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -671,6 +684,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -722,6 +736,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -773,6 +788,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/automation/test_init.py b/tests/components/automation/test_init.py
index 6466e5e7f22..243e132dae2 100644
--- a/tests/components/automation/test_init.py
+++ b/tests/components/automation/test_init.py
@@ -51,8 +51,7 @@ from homeassistant.helpers.script import (
     _async_stop_scripts_at_shutdown,
 )
 from homeassistant.setup import async_setup_component
-from homeassistant.util import yaml as yaml_util
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util, yaml as yaml_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/axis/snapshots/test_binary_sensor.ambr b/tests/components/axis/snapshots/test_binary_sensor.ambr
index ab860489d55..6c0f3ead473 100644
--- a/tests/components/axis/snapshots/test_binary_sensor.ambr
+++ b/tests/components/axis/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -194,6 +198,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -241,6 +246,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -288,6 +294,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -335,6 +342,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -382,6 +390,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -429,6 +438,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -476,6 +486,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/axis/snapshots/test_camera.ambr b/tests/components/axis/snapshots/test_camera.ambr
index 564ff96b3d8..1e70e2a799f 100644
--- a/tests/components/axis/snapshots/test_camera.ambr
+++ b/tests/components/axis/snapshots/test_camera.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -56,6 +57,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/axis/snapshots/test_diagnostics.ambr b/tests/components/axis/snapshots/test_diagnostics.ambr
index ebd0061f416..b475c796d2b 100644
--- a/tests/components/axis/snapshots/test_diagnostics.ambr
+++ b/tests/components/axis/snapshots/test_diagnostics.ambr
@@ -47,6 +47,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': '**REDACTED**',
       'version': 3,
diff --git a/tests/components/axis/snapshots/test_hub.ambr b/tests/components/axis/snapshots/test_hub.ambr
index 16579287f09..9e407bfef0b 100644
--- a/tests/components/axis/snapshots/test_hub.ambr
+++ b/tests/components/axis/snapshots/test_hub.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://1.2.3.4:80',
     'connections': set({
       tuple(
@@ -39,6 +40,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://1.2.3.4:80',
     'connections': set({
       tuple(
diff --git a/tests/components/axis/snapshots/test_light.ambr b/tests/components/axis/snapshots/test_light.ambr
index b37da39fe27..d8d01543ee5 100644
--- a/tests/components/axis/snapshots/test_light.ambr
+++ b/tests/components/axis/snapshots/test_light.ambr
@@ -10,6 +10,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/axis/snapshots/test_switch.ambr b/tests/components/axis/snapshots/test_switch.ambr
index dc4c75371cf..fa6091550e5 100644
--- a/tests/components/axis/snapshots/test_switch.ambr
+++ b/tests/components/axis/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/azure_devops/snapshots/test_sensor.ambr b/tests/components/azure_devops/snapshots/test_sensor.ambr
index aa8d1d9e7e0..3fe4d470a63 100644
--- a/tests/components/azure_devops/snapshots/test_sensor.ambr
+++ b/tests/components/azure_devops/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -64,6 +65,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -111,6 +113,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -128,7 +131,7 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': 'CI latest build id',
+    'original_name': 'CI latest build ID',
     'platform': 'azure_devops',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -140,7 +143,7 @@
 # name: test_sensors[sensor.testproject_ci_latest_build_id-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'testproject CI latest build id',
+      'friendly_name': 'testproject CI latest build ID',
     }),
     'context': <ANY>,
     'entity_id': 'sensor.testproject_ci_latest_build_id',
@@ -157,6 +160,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -204,6 +208,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -250,6 +255,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -296,6 +302,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -342,6 +349,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -388,6 +396,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -435,6 +444,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -452,7 +462,7 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': 'CI latest build url',
+    'original_name': 'CI latest build URL',
     'platform': 'azure_devops',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -464,7 +474,7 @@
 # name: test_sensors[sensor.testproject_ci_latest_build_url-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'testproject CI latest build url',
+      'friendly_name': 'testproject CI latest build URL',
     }),
     'context': <ANY>,
     'entity_id': 'sensor.testproject_ci_latest_build_url',
@@ -516,7 +526,7 @@
 # name: test_sensors_missing_data[sensor.testproject_ci_latest_build_id-state-missing-data]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'testproject CI latest build id',
+      'friendly_name': 'testproject CI latest build ID',
     }),
     'context': <ANY>,
     'entity_id': 'sensor.testproject_ci_latest_build_id',
@@ -609,7 +619,7 @@
 # name: test_sensors_missing_data[sensor.testproject_ci_latest_build_url-state-missing-data]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'testproject CI latest build url',
+      'friendly_name': 'testproject CI latest build URL',
     }),
     'context': <ANY>,
     'entity_id': 'sensor.testproject_ci_latest_build_url',
diff --git a/tests/components/azure_storage/__init__.py b/tests/components/azure_storage/__init__.py
new file mode 100644
index 00000000000..bfd2e72d979
--- /dev/null
+++ b/tests/components/azure_storage/__init__.py
@@ -0,0 +1,14 @@
+"""Azure Storage integration tests."""
+
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+async def setup_integration(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry
+) -> None:
+    """Set up the azure_storage integration for testing."""
+    mock_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
diff --git a/tests/components/azure_storage/conftest.py b/tests/components/azure_storage/conftest.py
new file mode 100644
index 00000000000..7c583ac391e
--- /dev/null
+++ b/tests/components/azure_storage/conftest.py
@@ -0,0 +1,63 @@
+"""Fixtures for Azure Storage tests."""
+
+from collections.abc import AsyncIterator, Generator
+from unittest.mock import AsyncMock, MagicMock, patch
+
+from azure.storage.blob import BlobProperties
+import pytest
+
+from homeassistant.components.azure_storage.const import DOMAIN
+
+from .const import BACKUP_METADATA, USER_INPUT
+
+from tests.common import MockConfigEntry
+
+
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock]:
+    """Mock setting up a config entry."""
+    with patch(
+        "homeassistant.components.azure_storage.async_setup_entry", return_value=True
+    ) as mock_setup:
+        yield mock_setup
+
+
+@pytest.fixture(autouse=True)
+def mock_client() -> Generator[MagicMock]:
+    """Mock the Azure Storage client."""
+    with (
+        patch(
+            "homeassistant.components.azure_storage.config_flow.ContainerClient",
+            autospec=True,
+        ) as container_client,
+        patch(
+            "homeassistant.components.azure_storage.ContainerClient",
+            new=container_client,
+        ),
+    ):
+        client = container_client.return_value
+        client.exists.return_value = False
+
+        async def async_list_blobs():
+            yield BlobProperties(metadata=BACKUP_METADATA)
+            yield BlobProperties(metadata=BACKUP_METADATA)
+
+        client.list_blobs.return_value = async_list_blobs()
+
+        class MockStream:
+            async def chunks(self) -> AsyncIterator[bytes]:
+                yield b"backup data"
+
+        client.download_blob.return_value = MockStream()
+
+        yield client
+
+
+@pytest.fixture
+def mock_config_entry() -> MockConfigEntry:
+    """Return the default mocked config entry."""
+    return MockConfigEntry(
+        title="account/container1",
+        domain=DOMAIN,
+        data=USER_INPUT,
+    )
diff --git a/tests/components/azure_storage/const.py b/tests/components/azure_storage/const.py
new file mode 100644
index 00000000000..4edb754f650
--- /dev/null
+++ b/tests/components/azure_storage/const.py
@@ -0,0 +1,36 @@
+"""Consts for Azure Storage tests."""
+
+from json import dumps
+
+from homeassistant.components.azure_storage.const import (
+    CONF_ACCOUNT_NAME,
+    CONF_CONTAINER_NAME,
+    CONF_STORAGE_ACCOUNT_KEY,
+)
+from homeassistant.components.backup import AgentBackup
+
+USER_INPUT = {
+    CONF_ACCOUNT_NAME: "account",
+    CONF_CONTAINER_NAME: "container1",
+    CONF_STORAGE_ACCOUNT_KEY: "test",
+}
+
+TEST_BACKUP = AgentBackup(
+    addons=[],
+    backup_id="23e64aec",
+    date="2024-11-22T11:48:48.727189+01:00",
+    database_included=True,
+    extra_metadata={},
+    folders=[],
+    homeassistant_included=True,
+    homeassistant_version="2024.12.0.dev0",
+    name="Core 2024.12.0.dev0",
+    protected=False,
+    size=34519040,
+)
+
+BACKUP_METADATA = {
+    "metadata_version": "1",
+    "backup_id": "23e64aec",
+    "backup_metadata": dumps(TEST_BACKUP.as_dict()),
+}
diff --git a/tests/components/azure_storage/test_backup.py b/tests/components/azure_storage/test_backup.py
new file mode 100644
index 00000000000..7c5912a4981
--- /dev/null
+++ b/tests/components/azure_storage/test_backup.py
@@ -0,0 +1,319 @@
+"""Test the backups for OneDrive."""
+
+from __future__ import annotations
+
+from collections.abc import AsyncGenerator
+from io import StringIO
+from unittest.mock import ANY, Mock, patch
+
+from azure.core.exceptions import HttpResponseError
+from azure.storage.blob import BlobProperties
+import pytest
+
+from homeassistant.components.azure_storage.backup import (
+    async_register_backup_agents_listener,
+)
+from homeassistant.components.azure_storage.const import (
+    DATA_BACKUP_AGENT_LISTENERS,
+    DOMAIN,
+)
+from homeassistant.components.backup import DOMAIN as BACKUP_DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.backup import async_initialize_backup
+from homeassistant.setup import async_setup_component
+
+from . import setup_integration
+from .const import BACKUP_METADATA, TEST_BACKUP
+
+from tests.common import MockConfigEntry
+from tests.typing import ClientSessionGenerator, MagicMock, WebSocketGenerator
+
+
+@pytest.fixture(autouse=True)
+async def setup_backup_integration(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+) -> AsyncGenerator[None]:
+    """Set up onedrive integration."""
+    with (
+        patch("homeassistant.components.backup.is_hassio", return_value=False),
+        patch("homeassistant.components.backup.store.STORE_DELAY_SAVE", 0),
+    ):
+        async_initialize_backup(hass)
+        assert await async_setup_component(hass, BACKUP_DOMAIN, {})
+        await setup_integration(hass, mock_config_entry)
+
+        await hass.async_block_till_done()
+        yield
+
+
+async def test_agents_info(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test backup agent info."""
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id({"type": "backup/agents/info"})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {
+        "agents": [
+            {"agent_id": "backup.local", "name": "local"},
+            {
+                "agent_id": f"{DOMAIN}.{mock_config_entry.entry_id}",
+                "name": mock_config_entry.title,
+            },
+        ],
+    }
+
+
+async def test_agents_list_backups(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test agent list backups."""
+
+    client = await hass_ws_client(hass)
+    await client.send_json_auto_id({"type": "backup/info"})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"]["agent_errors"] == {}
+    assert response["result"]["backups"] == [
+        {
+            "addons": [],
+            "agents": {
+                f"{DOMAIN}.{mock_config_entry.entry_id}": {
+                    "protected": False,
+                    "size": 34519040,
+                }
+            },
+            "backup_id": "23e64aec",
+            "date": "2024-11-22T11:48:48.727189+01:00",
+            "database_included": True,
+            "folders": [],
+            "homeassistant_included": True,
+            "homeassistant_version": "2024.12.0.dev0",
+            "name": "Core 2024.12.0.dev0",
+            "failed_agent_ids": [],
+            "extra_metadata": {},
+            "with_automatic_settings": None,
+        }
+    ]
+
+
+async def test_agents_get_backup(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test agent get backup."""
+
+    backup_id = TEST_BACKUP.backup_id
+    client = await hass_ws_client(hass)
+    await client.send_json_auto_id({"type": "backup/details", "backup_id": backup_id})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"]["agent_errors"] == {}
+    assert response["result"]["backup"] == {
+        "addons": [],
+        "agents": {
+            f"{DOMAIN}.{mock_config_entry.entry_id}": {
+                "protected": False,
+                "size": 34519040,
+            }
+        },
+        "backup_id": "23e64aec",
+        "date": "2024-11-22T11:48:48.727189+01:00",
+        "database_included": True,
+        "folders": [],
+        "homeassistant_included": True,
+        "homeassistant_version": "2024.12.0.dev0",
+        "extra_metadata": {},
+        "name": "Core 2024.12.0.dev0",
+        "failed_agent_ids": [],
+        "with_automatic_settings": None,
+    }
+
+
+async def test_agents_get_backup_does_not_throw_on_not_found(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test agent get backup does not throw on a backup not found."""
+
+    client = await hass_ws_client(hass)
+    await client.send_json_auto_id({"type": "backup/details", "backup_id": "random"})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"]["agent_errors"] == {}
+    assert response["result"]["backup"] is None
+
+
+async def test_agents_delete(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_client: MagicMock,
+) -> None:
+    """Test agent delete backup."""
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id(
+        {
+            "type": "backup/delete",
+            "backup_id": TEST_BACKUP.backup_id,
+        }
+    )
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {"agent_errors": {}}
+    mock_client.delete_blob.assert_called_once()
+
+
+async def test_agents_delete_not_throwing_on_not_found(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_client: MagicMock,
+) -> None:
+    """Test agent delete backup does not throw on a backup not found."""
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id(
+        {
+            "type": "backup/delete",
+            "backup_id": "random",
+        }
+    )
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {"agent_errors": {}}
+    assert mock_client.delete_blob.call_count == 0
+
+
+async def test_agents_upload(
+    hass_client: ClientSessionGenerator,
+    caplog: pytest.LogCaptureFixture,
+    mock_client: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test agent upload backup."""
+    client = await hass_client()
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_get_backup",
+        ) as fetch_backup,
+        patch(
+            "homeassistant.components.backup.manager.read_backup",
+            return_value=TEST_BACKUP,
+        ),
+        patch("pathlib.Path.open") as mocked_open,
+    ):
+        mocked_open.return_value.read = Mock(side_effect=[b"test", b""])
+        fetch_backup.return_value = TEST_BACKUP
+        resp = await client.post(
+            f"/api/backup/upload?agent_id={DOMAIN}.{mock_config_entry.entry_id}",
+            data={"file": StringIO("test")},
+        )
+
+    assert resp.status == 201
+    assert f"Uploading backup {TEST_BACKUP.backup_id}" in caplog.text
+    mock_client.upload_blob.assert_called_once_with(
+        name="Core_2024.12.0.dev0_2024-11-22_11.48_48727189.tar",
+        metadata=BACKUP_METADATA,
+        data=ANY,
+        length=ANY,
+    )
+
+
+async def test_agents_download(
+    hass_client: ClientSessionGenerator,
+    mock_client: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test agent download backup."""
+    client = await hass_client()
+    backup_id = BACKUP_METADATA["backup_id"]
+
+    resp = await client.get(
+        f"/api/backup/download/{backup_id}?agent_id={DOMAIN}.{mock_config_entry.entry_id}"
+    )
+    assert resp.status == 200
+    assert await resp.content.read() == b"backup data"
+    mock_client.download_blob.assert_called_once()
+
+
+async def test_agents_error_on_download_not_found(
+    hass_client: ClientSessionGenerator,
+    mock_client: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test agent download backup."""
+
+    async def async_list_blobs(
+        metadata: dict[str, str],
+    ) -> AsyncGenerator[BlobProperties]:
+        yield BlobProperties(metadata=metadata)
+
+    mock_client.list_blobs.side_effect = [
+        async_list_blobs(BACKUP_METADATA),
+        async_list_blobs({}),
+    ]
+    client = await hass_client()
+    backup_id = BACKUP_METADATA["backup_id"]
+
+    resp = await client.get(
+        f"/api/backup/download/{backup_id}?agent_id={DOMAIN}.{mock_config_entry.entry_id}"
+    )
+    assert resp.status == 404
+    assert mock_client.download_blob.call_count == 0
+
+
+async def test_error_during_delete(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_client: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test the error wrapper."""
+    mock_client.delete_blob.side_effect = HttpResponseError("Failed to delete backup")
+
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id(
+        {
+            "type": "backup/delete",
+            "backup_id": BACKUP_METADATA["backup_id"],
+        }
+    )
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {
+        "agent_errors": {
+            f"{DOMAIN}.{mock_config_entry.entry_id}": (
+                "Error during backup operation in async_delete_backup: "
+                "Status None, message: Failed to delete backup"
+            )
+        }
+    }
+
+
+async def test_listeners_get_cleaned_up(hass: HomeAssistant) -> None:
+    """Test listener gets cleaned up."""
+    listener = MagicMock()
+    remove_listener = async_register_backup_agents_listener(hass, listener=listener)
+
+    hass.data[DATA_BACKUP_AGENT_LISTENERS] = [
+        listener
+    ]  # make sure it's the last listener
+    remove_listener()
+
+    assert hass.data.get(DATA_BACKUP_AGENT_LISTENERS) is None
diff --git a/tests/components/azure_storage/test_config_flow.py b/tests/components/azure_storage/test_config_flow.py
new file mode 100644
index 00000000000..67dc44f9f2c
--- /dev/null
+++ b/tests/components/azure_storage/test_config_flow.py
@@ -0,0 +1,198 @@
+"""Test the Azure storage config flow."""
+
+from unittest.mock import AsyncMock, MagicMock
+
+from azure.core.exceptions import ClientAuthenticationError, ResourceNotFoundError
+import pytest
+
+from homeassistant.components.azure_storage.const import (
+    CONF_ACCOUNT_NAME,
+    CONF_CONTAINER_NAME,
+    CONF_STORAGE_ACCOUNT_KEY,
+    DOMAIN,
+)
+from homeassistant.config_entries import SOURCE_USER, ConfigFlowResult
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from . import setup_integration
+from .const import USER_INPUT
+
+from tests.common import MockConfigEntry
+
+
+async def __async_start_flow(
+    hass: HomeAssistant,
+) -> ConfigFlowResult:
+    """Initialize the  config flow."""
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    await hass.async_block_till_done()
+    assert result["type"] is FlowResultType.FORM
+
+    return await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        USER_INPUT,
+    )
+
+
+async def test_flow(
+    hass: HomeAssistant,
+    mock_client: MagicMock,
+    mock_setup_entry: AsyncMock,
+) -> None:
+    """Test config flow."""
+    mock_client.exists.return_value = False
+    result = await __async_start_flow(hass)
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert (
+        result["title"]
+        == f"{USER_INPUT[CONF_ACCOUNT_NAME]}/{USER_INPUT[CONF_CONTAINER_NAME]}"
+    )
+    assert result["data"] == {
+        CONF_ACCOUNT_NAME: "account",
+        CONF_CONTAINER_NAME: "container1",
+        CONF_STORAGE_ACCOUNT_KEY: "test",
+    }
+
+
+@pytest.mark.parametrize(
+    ("exception", "errors"),
+    [
+        (ResourceNotFoundError, {"base": "cannot_connect"}),
+        (ClientAuthenticationError, {CONF_STORAGE_ACCOUNT_KEY: "invalid_auth"}),
+        (Exception, {"base": "unknown"}),
+    ],
+)
+async def test_flow_errors(
+    hass: HomeAssistant,
+    mock_client: MagicMock,
+    mock_setup_entry: AsyncMock,
+    exception: Exception,
+    errors: dict[str, str],
+) -> None:
+    """Test config flow errors."""
+    mock_client.exists.side_effect = exception
+
+    result = await __async_start_flow(hass)
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == errors
+
+    # fix and finish the test
+    mock_client.exists.side_effect = None
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        USER_INPUT,
+    )
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert (
+        result["title"]
+        == f"{USER_INPUT[CONF_ACCOUNT_NAME]}/{USER_INPUT[CONF_CONTAINER_NAME]}"
+    )
+    assert result["data"] == {
+        CONF_ACCOUNT_NAME: "account",
+        CONF_CONTAINER_NAME: "container1",
+        CONF_STORAGE_ACCOUNT_KEY: "test",
+    }
+
+
+async def test_abort_if_already_configured(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test we abort if the account is already configured."""
+    mock_config_entry.add_to_hass(hass)
+
+    result = await __async_start_flow(hass)
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+
+
+async def test_reauth_flow(
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test that the reauth flow works."""
+
+    await setup_integration(hass, mock_config_entry)
+
+    result = await mock_config_entry.start_reauth_flow(hass)
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reauth_confirm"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {CONF_STORAGE_ACCOUNT_KEY: "new_key"}
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reauth_successful"
+    assert mock_config_entry.data == {
+        **USER_INPUT,
+        CONF_STORAGE_ACCOUNT_KEY: "new_key",
+    }
+
+
+async def test_reauth_flow_errors(
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_client: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test that the reauth flow works with an errors."""
+
+    await setup_integration(hass, mock_config_entry)
+
+    mock_client.exists.side_effect = Exception()
+
+    result = await mock_config_entry.start_reauth_flow(hass)
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reauth_confirm"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {CONF_STORAGE_ACCOUNT_KEY: "new_key"}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {"base": "unknown"}
+
+    # fix the error and finish the flow successfully
+    mock_client.exists.side_effect = None
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {CONF_STORAGE_ACCOUNT_KEY: "new_key"}
+    )
+    assert result["reason"] == "reauth_successful"
+    assert mock_config_entry.data == {
+        **USER_INPUT,
+        CONF_STORAGE_ACCOUNT_KEY: "new_key",
+    }
+
+
+async def test_reconfigure_flow(
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test that the reconfigure flow works."""
+
+    mock_config_entry.add_to_hass(hass)
+    result = await mock_config_entry.start_reconfigure_flow(hass)
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reconfigure"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {CONF_CONTAINER_NAME: "new_container"}
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reconfigure_successful"
+    assert mock_config_entry.data == {
+        **USER_INPUT,
+        CONF_CONTAINER_NAME: "new_container",
+    }
diff --git a/tests/components/azure_storage/test_init.py b/tests/components/azure_storage/test_init.py
new file mode 100644
index 00000000000..ca725134737
--- /dev/null
+++ b/tests/components/azure_storage/test_init.py
@@ -0,0 +1,54 @@
+"""Test the Azure storage integration."""
+
+from unittest.mock import MagicMock
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceNotFoundError,
+)
+import pytest
+
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry
+
+
+async def test_load_unload_config_entry(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test loading and unloading the integration."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert mock_config_entry.state is ConfigEntryState.LOADED
+
+    await hass.config_entries.async_unload(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert mock_config_entry.state is ConfigEntryState.NOT_LOADED
+
+
+@pytest.mark.parametrize(
+    ("exception", "state"),
+    [
+        (ClientAuthenticationError, ConfigEntryState.SETUP_ERROR),
+        (HttpResponseError, ConfigEntryState.SETUP_RETRY),
+        (ResourceNotFoundError, ConfigEntryState.SETUP_ERROR),
+    ],
+)
+async def test_setup_errors(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_client: MagicMock,
+    exception: Exception,
+    state: ConfigEntryState,
+) -> None:
+    """Test various setup errors."""
+    mock_client.exists.side_effect = exception()
+    await setup_integration(hass, mock_config_entry)
+
+    assert mock_config_entry.state is state
diff --git a/tests/components/backup/common.py b/tests/components/backup/common.py
index 4f456cc6d72..3197cbfadeb 100644
--- a/tests/components/backup/common.py
+++ b/tests/components/backup/common.py
@@ -2,10 +2,10 @@
 
 from __future__ import annotations
 
-from collections.abc import AsyncIterator, Callable, Coroutine
+from collections.abc import AsyncIterator, Buffer, Callable, Coroutine, Iterable
 from pathlib import Path
-from typing import Any
-from unittest.mock import ANY, AsyncMock, Mock, patch
+from typing import Any, cast
+from unittest.mock import AsyncMock, Mock, patch
 
 from homeassistant.components.backup import (
     DOMAIN,
@@ -13,14 +13,16 @@ from homeassistant.components.backup import (
     AgentBackup,
     BackupAgent,
     BackupAgentPlatformProtocol,
+    BackupNotFound,
     Folder,
 )
+from homeassistant.components.backup.backup import CoreLocalBackupAgent
 from homeassistant.components.backup.const import DATA_MANAGER
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.typing import ConfigType
+from homeassistant.helpers.backup import async_initialize_backup
 from homeassistant.setup import async_setup_component
 
-from tests.common import MockPlatform, mock_platform
+from tests.common import mock_platform
 
 LOCAL_AGENT_ID = f"{DOMAIN}.local"
 
@@ -29,7 +31,7 @@ TEST_BACKUP_ABC123 = AgentBackup(
     backup_id="abc123",
     database_included=True,
     date="1970-01-01T00:00:00.000Z",
-    extra_metadata={"instance_id": ANY, "with_automatic_settings": True},
+    extra_metadata={"instance_id": "our_uuid", "with_automatic_settings": True},
     folders=[Folder.MEDIA, Folder.SHARE],
     homeassistant_included=True,
     homeassistant_version="2024.12.0",
@@ -52,89 +54,85 @@ TEST_BACKUP_DEF456 = AgentBackup(
     protected=False,
     size=1,
 )
+TEST_BACKUP_PATH_DEF456 = Path("custom_def456.tar")
 
 TEST_DOMAIN = "test"
 
 
-class BackupAgentTest(BackupAgent):
-    """Test backup agent."""
+async def aiter_from_iter(iterable: Iterable) -> AsyncIterator:
+    """Convert an iterable to an async iterator."""
+    for i in iterable:
+        yield i
 
-    domain = "test"
 
-    def __init__(self, name: str, backups: list[AgentBackup] | None = None) -> None:
-        """Initialize the backup agent."""
-        self.name = name
-        if backups is None:
-            backups = [
-                AgentBackup(
-                    addons=[AddonInfo(name="Test", slug="test", version="1.0.0")],
-                    backup_id="abc123",
-                    database_included=True,
-                    date="1970-01-01T00:00:00Z",
-                    extra_metadata={},
-                    folders=[Folder.MEDIA, Folder.SHARE],
-                    homeassistant_included=True,
-                    homeassistant_version="2024.12.0",
-                    name="Test",
-                    protected=False,
-                    size=13,
-                )
-            ]
+def mock_backup_agent(name: str, backups: list[AgentBackup] | None = None) -> Mock:
+    """Create a mock backup agent."""
 
-        self._backup_data: bytearray | None = None
-        self._backups = {backup.backup_id: backup for backup in backups}
+    async def delete_backup(backup_id: str, **kwargs: Any) -> None:
+        """Mock delete."""
+        await get_backup(backup_id)
 
-    async def async_download_backup(
-        self,
-        backup_id: str,
-        **kwargs: Any,
-    ) -> AsyncIterator[bytes]:
-        """Download a backup file."""
-        return AsyncMock(spec_set=["__aiter__"])
+    async def download_backup(backup_id: str, **kwargs: Any) -> AsyncIterator[bytes]:
+        """Mock download."""
+        return aiter_from_iter((backups_data.get(backup_id, b"backup data"),))
 
-    async def async_upload_backup(
-        self,
+    async def get_backup(backup_id: str, **kwargs: Any) -> AgentBackup:
+        """Get a backup."""
+        backup = next((b for b in _backups if b.backup_id == backup_id), None)
+        if backup is None:
+            raise BackupNotFound
+        return backup
+
+    async def upload_backup(
         *,
         open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
         backup: AgentBackup,
         **kwargs: Any,
     ) -> None:
         """Upload a backup."""
-        self._backups[backup.backup_id] = backup
+        _backups.append(backup)
         backup_stream = await open_stream()
-        self._backup_data = bytearray()
+        backup_data = bytearray()
         async for chunk in backup_stream:
-            self._backup_data += chunk
+            backup_data += chunk
+        backups_data[backup.backup_id] = backup_data
 
-    async def async_list_backups(self, **kwargs: Any) -> list[AgentBackup]:
-        """List backups."""
-        return list(self._backups.values())
-
-    async def async_get_backup(
-        self,
-        backup_id: str,
-        **kwargs: Any,
-    ) -> AgentBackup | None:
-        """Return a backup."""
-        return self._backups.get(backup_id)
-
-    async def async_delete_backup(
-        self,
-        backup_id: str,
-        **kwargs: Any,
-    ) -> None:
-        """Delete a backup file."""
+    _backups = backups or []
+    backups_data: dict[str, Buffer] = {}
+    mock_agent = Mock(spec=BackupAgent)
+    mock_agent.domain = TEST_DOMAIN
+    mock_agent.name = name
+    mock_agent.unique_id = name
+    type(mock_agent).agent_id = BackupAgent.agent_id
+    mock_agent.async_delete_backup = AsyncMock(
+        side_effect=delete_backup, spec_set=[BackupAgent.async_delete_backup]
+    )
+    mock_agent.async_download_backup = AsyncMock(
+        side_effect=download_backup, spec_set=[BackupAgent.async_download_backup]
+    )
+    mock_agent.async_get_backup = AsyncMock(
+        side_effect=get_backup, spec_set=[BackupAgent.async_get_backup]
+    )
+    mock_agent.async_list_backups = AsyncMock(
+        return_value=_backups, spec_set=[BackupAgent.async_list_backups]
+    )
+    mock_agent.async_upload_backup = AsyncMock(
+        side_effect=upload_backup,
+        spec_set=[BackupAgent.async_upload_backup],
+    )
+    return mock_agent
 
 
 async def setup_backup_integration(
     hass: HomeAssistant,
     with_hassio: bool = False,
-    configuration: ConfigType | None = None,
     *,
     backups: dict[str, list[AgentBackup]] | None = None,
     remote_agents: list[str] | None = None,
-) -> bool:
+) -> dict[str, Mock]:
     """Set up the Backup integration."""
+    backups = backups or {}
+    async_initialize_backup(hass)
     with (
         patch("homeassistant.components.backup.is_hassio", return_value=with_hassio),
         patch(
@@ -142,30 +140,41 @@ async def setup_backup_integration(
         ),
     ):
         remote_agents = remote_agents or []
-        platform = Mock(
-            async_get_backup_agents=AsyncMock(
-                return_value=[BackupAgentTest(agent, []) for agent in remote_agents]
-            ),
-            spec_set=BackupAgentPlatformProtocol,
+        remote_agents_dict = {}
+        for agent in remote_agents:
+            if not agent.startswith(f"{TEST_DOMAIN}."):
+                raise ValueError(f"Invalid agent_id: {agent}")
+            name = agent.partition(".")[2]
+            remote_agents_dict[agent] = mock_backup_agent(name, backups.get(agent))
+        if remote_agents:
+            platform = Mock(
+                async_get_backup_agents=AsyncMock(
+                    return_value=list(remote_agents_dict.values())
+                ),
+                spec_set=BackupAgentPlatformProtocol,
+            )
+            await setup_backup_platform(hass, domain=TEST_DOMAIN, platform=platform)
+
+        assert await async_setup_component(hass, DOMAIN, {})
+        await hass.async_block_till_done()
+
+        if LOCAL_AGENT_ID not in backups or with_hassio:
+            return remote_agents_dict
+
+        local_agent = cast(
+            CoreLocalBackupAgent, hass.data[DATA_MANAGER].backup_agents[LOCAL_AGENT_ID]
         )
 
-        mock_platform(hass, f"{TEST_DOMAIN}.backup", platform or MockPlatform())
-        assert await async_setup_component(hass, TEST_DOMAIN, {})
+        for backup in backups[LOCAL_AGENT_ID]:
+            await local_agent.async_upload_backup(
+                open_stream=AsyncMock(
+                    side_effect=RuntimeError("Local agent does not open stream")
+                ),
+                backup=backup,
+            )
+        local_agent._loaded_backups = True
 
-        result = await async_setup_component(hass, DOMAIN, configuration or {})
-        await hass.async_block_till_done()
-        if not backups:
-            return result
-
-        for agent_id, agent_backups in backups.items():
-            if with_hassio and agent_id == LOCAL_AGENT_ID:
-                continue
-            agent = hass.data[DATA_MANAGER].backup_agents[agent_id]
-            agent._backups = {backups.backup_id: backups for backups in agent_backups}
-            if agent_id == LOCAL_AGENT_ID:
-                agent._loaded_backups = True
-
-        return result
+        return remote_agents_dict
 
 
 async def setup_backup_platform(
diff --git a/tests/components/backup/conftest.py b/tests/components/backup/conftest.py
index 7831efeff9a..d391df44475 100644
--- a/tests/components/backup/conftest.py
+++ b/tests/components/backup/conftest.py
@@ -13,11 +13,21 @@ from homeassistant.components.backup import DOMAIN
 from homeassistant.components.backup.manager import NewBackup, WrittenBackup
 from homeassistant.core import HomeAssistant
 
-from .common import TEST_BACKUP_PATH_ABC123
+from .common import TEST_BACKUP_PATH_ABC123, TEST_BACKUP_PATH_DEF456
 
 from tests.common import get_fixture_path
 
 
+@pytest.fixture(name="instance_id", autouse=True)
+def instance_id_fixture(hass: HomeAssistant) -> Generator[None]:
+    """Mock instance ID."""
+    with patch(
+        "homeassistant.components.backup.manager.instance_id.async_get",
+        return_value="our_uuid",
+    ):
+        yield
+
+
 @pytest.fixture(name="mocked_json_bytes")
 def mocked_json_bytes_fixture() -> Generator[Mock]:
     """Mock json_bytes."""
@@ -38,33 +48,62 @@ def mocked_tarfile_fixture() -> Generator[Mock]:
 
 
 @pytest.fixture(name="path_glob")
-def path_glob_fixture() -> Generator[MagicMock]:
+def path_glob_fixture(hass: HomeAssistant) -> Generator[MagicMock]:
     """Mock path glob."""
     with patch(
-        "pathlib.Path.glob", return_value=[TEST_BACKUP_PATH_ABC123]
+        "pathlib.Path.glob",
+        return_value=[
+            Path(hass.config.path()) / "backups" / TEST_BACKUP_PATH_ABC123,
+            Path(hass.config.path()) / "backups" / TEST_BACKUP_PATH_DEF456,
+        ],
     ) as path_glob:
         yield path_glob
 
 
 CONFIG_DIR = {
-    "testing_config": [
+    "tests/testing_config": [
         Path("test.txt"),
         Path(".DS_Store"),
         Path(".storage"),
+        Path("another_subdir"),
         Path("backups"),
         Path("tmp_backups"),
+        Path("tts"),
         Path("home-assistant_v2.db"),
     ],
-    "backups": [
+    "/backups": [
         Path("backups/backup.tar"),
         Path("backups/not_backup"),
     ],
-    "tmp_backups": [
+    "/another_subdir": [
+        Path("another_subdir/.DS_Store"),
+        Path("another_subdir/backups"),
+        Path("another_subdir/tts"),
+    ],
+    "another_subdir/backups": [
+        Path("another_subdir/backups/backup.tar"),
+        Path("another_subdir/backups/not_backup"),
+    ],
+    "another_subdir/tts": [
+        Path("another_subdir/tts/voice.mp3"),
+    ],
+    "/tmp_backups": [  # noqa: S108
         Path("tmp_backups/forgotten_backup.tar"),
         Path("tmp_backups/not_backup"),
     ],
+    "/tts": [
+        Path("tts/voice.mp3"),
+    ],
+}
+CONFIG_DIR_DIRS = {
+    Path(".storage"),
+    Path("another_subdir"),
+    Path("another_subdir/backups"),
+    Path("another_subdir/tts"),
+    Path("backups"),
+    Path("tmp_backups"),
+    Path("tts"),
 }
-CONFIG_DIR_DIRS = {Path(".storage"), Path("backups"), Path("tmp_backups")}
 
 
 @pytest.fixture(name="create_backup")
@@ -72,6 +111,7 @@ def mock_create_backup() -> Generator[AsyncMock]:
     """Mock manager create backup."""
     mock_written_backup = MagicMock(spec_set=WrittenBackup)
     mock_written_backup.backup.backup_id = "abc123"
+    mock_written_backup.backup.protected = False
     mock_written_backup.open_stream = AsyncMock()
     mock_written_backup.release_stream = AsyncMock()
     fut: Future[MagicMock] = Future()
@@ -90,7 +130,10 @@ def mock_backup_generation_fixture(
     """Mock backup generator."""
 
     with (
-        patch("pathlib.Path.iterdir", lambda x: CONFIG_DIR.get(x.name, [])),
+        patch(
+            "pathlib.Path.iterdir",
+            lambda x: CONFIG_DIR.get(f"{x.parent.name}/{x.name}", []),
+        ),
         patch("pathlib.Path.stat", return_value=MagicMock(st_size=123)),
         patch("pathlib.Path.is_file", lambda x: x not in CONFIG_DIR_DIRS),
         patch("pathlib.Path.is_dir", lambda x: x in CONFIG_DIR_DIRS),
diff --git a/tests/components/backup/fixtures/test_backups/c0cb53bd.tar.decrypted b/tests/components/backup/fixtures/test_backups/c0cb53bd.tar.decrypted
new file mode 100644
index 00000000000..c97533fc1af
Binary files /dev/null and b/tests/components/backup/fixtures/test_backups/c0cb53bd.tar.decrypted differ
diff --git a/tests/components/backup/snapshots/test_backup.ambr b/tests/components/backup/snapshots/test_backup.ambr
index f91473e3b70..7cbbb9ddbce 100644
--- a/tests/components/backup/snapshots/test_backup.ambr
+++ b/tests/components/backup/snapshots/test_backup.ambr
@@ -1,5 +1,5 @@
 # serializer version: 1
-# name: test_delete_backup[found_backups0-True-1]
+# name: test_delete_backup[found_backups0-abc123-1-unlink_path0]
   dict({
     'id': 1,
     'result': dict({
@@ -10,7 +10,7 @@
     'type': 'result',
   })
 # ---
-# name: test_delete_backup[found_backups1-False-0]
+# name: test_delete_backup[found_backups1-def456-1-unlink_path1]
   dict({
     'id': 1,
     'result': dict({
@@ -21,7 +21,7 @@
     'type': 'result',
   })
 # ---
-# name: test_delete_backup[found_backups2-True-0]
+# name: test_delete_backup[found_backups2-abc123-0-None]
   dict({
     'id': 1,
     'result': dict({
@@ -32,13 +32,14 @@
     'type': 'result',
   })
 # ---
-# name: test_load_backups[None]
+# name: test_load_backups[mock_read_backup]
   dict({
     'id': 1,
     'result': dict({
       'agents': list([
         dict({
           'agent_id': 'backup.local',
+          'name': 'local',
         }),
       ]),
     }),
@@ -46,7 +47,7 @@
     'type': 'result',
   })
 # ---
-# name: test_load_backups[None].1
+# name: test_load_backups[mock_read_backup].1
   dict({
     'id': 2,
     'result': dict({
@@ -61,12 +62,19 @@
               'version': '1.0.0',
             }),
           ]),
-          'agent_ids': list([
-            'backup.local',
-          ]),
+          'agents': dict({
+            'backup.local': dict({
+              'protected': False,
+              'size': 0,
+            }),
+          }),
           'backup_id': 'abc123',
           'database_included': True,
           'date': '1970-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'our_uuid',
+            'with_automatic_settings': True,
+          }),
           'failed_agent_ids': list([
           ]),
           'folders': list([
@@ -76,15 +84,42 @@
           'homeassistant_included': True,
           'homeassistant_version': '2024.12.0',
           'name': 'Test',
-          'protected': False,
-          'size': 0,
           'with_automatic_settings': True,
         }),
+        dict({
+          'addons': list([
+          ]),
+          'agents': dict({
+            'backup.local': dict({
+              'protected': False,
+              'size': 1,
+            }),
+          }),
+          'backup_id': 'def456',
+          'database_included': False,
+          'date': '1980-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'unknown_uuid',
+            'with_automatic_settings': True,
+          }),
+          'failed_agent_ids': list([
+          ]),
+          'folders': list([
+            'media',
+            'share',
+          ]),
+          'homeassistant_included': True,
+          'homeassistant_version': '2024.12.0',
+          'name': 'Test 2',
+          'with_automatic_settings': None,
+        }),
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -97,6 +132,7 @@
       'agents': list([
         dict({
           'agent_id': 'backup.local',
+          'name': 'local',
         }),
       ]),
     }),
@@ -112,10 +148,12 @@
       }),
       'backups': list([
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -128,6 +166,7 @@
       'agents': list([
         dict({
           'agent_id': 'backup.local',
+          'name': 'local',
         }),
       ]),
     }),
@@ -143,10 +182,12 @@
       }),
       'backups': list([
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -159,6 +200,7 @@
       'agents': list([
         dict({
           'agent_id': 'backup.local',
+          'name': 'local',
         }),
       ]),
     }),
@@ -174,10 +216,12 @@
       }),
       'backups': list([
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -190,6 +234,7 @@
       'agents': list([
         dict({
           'agent_id': 'backup.local',
+          'name': 'local',
         }),
       ]),
     }),
@@ -205,10 +250,12 @@
       }),
       'backups': list([
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
diff --git a/tests/components/backup/snapshots/test_diagnostics.ambr b/tests/components/backup/snapshots/test_diagnostics.ambr
new file mode 100644
index 00000000000..cf412970204
--- /dev/null
+++ b/tests/components/backup/snapshots/test_diagnostics.ambr
@@ -0,0 +1,39 @@
+# serializer version: 1
+# name: test_diagnostics
+  dict({
+    'backup_agents': list([
+      dict({
+        'agent_id': 'backup.local',
+        'name': 'local',
+      }),
+    ]),
+    'backup_config': dict({
+      'agents': dict({
+      }),
+      'automatic_backups_configured': False,
+      'create_backup': dict({
+        'agent_ids': list([
+        ]),
+        'include_addons': None,
+        'include_all_addons': False,
+        'include_database': True,
+        'include_folders': None,
+        'name': None,
+        'password': None,
+      }),
+      'last_attempted_automatic_backup': None,
+      'last_completed_automatic_backup': None,
+      'retention': dict({
+        'copies': None,
+        'days': None,
+      }),
+      'schedule': dict({
+        'days': list([
+        ]),
+        'recurrence': 'never',
+        'state': 'never',
+        'time': None,
+      }),
+    }),
+  })
+# ---
diff --git a/tests/components/backup/snapshots/test_sensors.ambr b/tests/components/backup/snapshots/test_sensors.ambr
new file mode 100644
index 00000000000..924038ef81f
--- /dev/null
+++ b/tests/components/backup/snapshots/test_sensors.ambr
@@ -0,0 +1,160 @@
+# serializer version: 1
+# name: test_sensors[sensor.backup_backup_manager_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'idle',
+        'create_backup',
+        'blocked',
+        'receive_backup',
+        'restore_backup',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.backup_backup_manager_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Backup Manager State',
+    'platform': 'backup',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'backup_manager_state',
+    'unique_id': 'backup_manager_state',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensors[sensor.backup_backup_manager_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Backup Backup Manager State',
+      'options': list([
+        'idle',
+        'create_backup',
+        'blocked',
+        'receive_backup',
+        'restore_backup',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.backup_backup_manager_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'idle',
+  })
+# ---
+# name: test_sensors[sensor.backup_last_successful_automatic_backup-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.backup_last_successful_automatic_backup',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Last successful automatic backup',
+    'platform': 'backup',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'last_successful_automatic_backup',
+    'unique_id': 'last_successful_automatic_backup',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensors[sensor.backup_last_successful_automatic_backup-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'timestamp',
+      'friendly_name': 'Backup Last successful automatic backup',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.backup_last_successful_automatic_backup',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_sensors[sensor.backup_next_scheduled_automatic_backup-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.backup_next_scheduled_automatic_backup',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Next scheduled automatic backup',
+    'platform': 'backup',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'next_scheduled_automatic_backup',
+    'unique_id': 'next_scheduled_automatic_backup',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensors[sensor.backup_next_scheduled_automatic_backup-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'timestamp',
+      'friendly_name': 'Backup Next scheduled automatic backup',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.backup_next_scheduled_automatic_backup',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
diff --git a/tests/components/backup/snapshots/test_store.ambr b/tests/components/backup/snapshots/test_store.ambr
index 45af91645ad..41778322825 100644
--- a/tests/components/backup/snapshots/test_store.ambr
+++ b/tests/components/backup/snapshots/test_store.ambr
@@ -11,6 +11,9 @@
         }),
       ]),
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -37,7 +40,7 @@
       }),
     }),
     'key': 'backup',
-    'minor_version': 2,
+    'minor_version': 5,
     'version': 1,
   })
 # ---
@@ -53,6 +56,9 @@
         }),
       ]),
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -80,7 +86,7 @@
       }),
     }),
     'key': 'backup',
-    'minor_version': 2,
+    'minor_version': 5,
     'version': 1,
   })
 # ---
@@ -96,6 +102,103 @@
         }),
       ]),
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'state': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'key': 'backup',
+    'minor_version': 5,
+    'version': 1,
+  })
+# ---
+# name: test_store_migration[store_data1].1
+  dict({
+    'data': dict({
+      'backups': list([
+        dict({
+          'backup_id': 'abc123',
+          'failed_agent_ids': list([
+            'test.remote',
+          ]),
+        }),
+      ]),
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+            'test-agent',
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'state': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'key': 'backup',
+    'minor_version': 5,
+    'version': 1,
+  })
+# ---
+# name: test_store_migration[store_data2]
+  dict({
+    'data': dict({
+      'backups': list([
+        dict({
+          'backup_id': 'abc123',
+          'failed_agent_ids': list([
+            'test.remote',
+          ]),
+        }),
+      ]),
+      'config': dict({
+        'agents': dict({
+          'test.remote': dict({
+            'protected': True,
+          }),
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -122,11 +225,11 @@
       }),
     }),
     'key': 'backup',
-    'minor_version': 2,
+    'minor_version': 5,
     'version': 1,
   })
 # ---
-# name: test_store_migration[store_data1].1
+# name: test_store_migration[store_data2].1
   dict({
     'data': dict({
       'backups': list([
@@ -138,6 +241,12 @@
         }),
       ]),
       'config': dict({
+        'agents': dict({
+          'test.remote': dict({
+            'protected': True,
+          }),
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -165,7 +274,201 @@
       }),
     }),
     'key': 'backup',
-    'minor_version': 2,
+    'minor_version': 5,
+    'version': 1,
+  })
+# ---
+# name: test_store_migration[store_data3]
+  dict({
+    'data': dict({
+      'backups': list([
+        dict({
+          'backup_id': 'abc123',
+          'failed_agent_ids': list([
+            'test.remote',
+          ]),
+        }),
+      ]),
+      'config': dict({
+        'agents': dict({
+          'test.remote': dict({
+            'protected': True,
+          }),
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'state': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'key': 'backup',
+    'minor_version': 5,
+    'version': 1,
+  })
+# ---
+# name: test_store_migration[store_data3].1
+  dict({
+    'data': dict({
+      'backups': list([
+        dict({
+          'backup_id': 'abc123',
+          'failed_agent_ids': list([
+            'test.remote',
+          ]),
+        }),
+      ]),
+      'config': dict({
+        'agents': dict({
+          'test.remote': dict({
+            'protected': True,
+          }),
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+            'test-agent',
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'state': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'key': 'backup',
+    'minor_version': 5,
+    'version': 1,
+  })
+# ---
+# name: test_store_migration[store_data4]
+  dict({
+    'data': dict({
+      'backups': list([
+        dict({
+          'backup_id': 'abc123',
+          'failed_agent_ids': list([
+            'test.remote',
+          ]),
+        }),
+      ]),
+      'config': dict({
+        'agents': dict({
+          'test.remote': dict({
+            'protected': True,
+          }),
+        }),
+        'automatic_backups_configured': True,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': 'hunter2',
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'state': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'key': 'backup',
+    'minor_version': 5,
+    'version': 1,
+  })
+# ---
+# name: test_store_migration[store_data4].1
+  dict({
+    'data': dict({
+      'backups': list([
+        dict({
+          'backup_id': 'abc123',
+          'failed_agent_ids': list([
+            'test.remote',
+          ]),
+        }),
+      ]),
+      'config': dict({
+        'agents': dict({
+          'test.remote': dict({
+            'protected': True,
+          }),
+        }),
+        'automatic_backups_configured': True,
+        'create_backup': dict({
+          'agent_ids': list([
+            'test-agent',
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': 'hunter2',
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'state': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'key': 'backup',
+    'minor_version': 5,
     'version': 1,
   })
 # ---
diff --git a/tests/components/backup/snapshots/test_websocket.ambr b/tests/components/backup/snapshots/test_websocket.ambr
index 43b4c1260dd..0bef632f0b4 100644
--- a/tests/components/backup/snapshots/test_websocket.ambr
+++ b/tests/components/backup/snapshots/test_websocket.ambr
@@ -16,10 +16,12 @@
     'result': dict({
       'agents': list([
         dict({
-          'agent_id': 'backup.local',
+          'agent_id': 'test.remote',
+          'name': 'remote',
         }),
         dict({
-          'agent_id': 'domain.test',
+          'agent_id': 'backup.local',
+          'name': 'local',
         }),
       ]),
     }),
@@ -227,11 +229,47 @@
     'type': 'result',
   })
 # ---
-# name: test_config_info[storage_data0]
+# name: test_can_decrypt_on_download_get_backup_returns_none
+  dict({
+    'error': dict({
+      'code': 'home_assistant_error',
+      'message': 'Backup abc123 not found in agent test.remote',
+    }),
+    'id': 1,
+    'success': False,
+    'type': 'result',
+  })
+# ---
+# name: test_can_decrypt_on_download_with_agent_error[BackupAgentError]
+  dict({
+    'error': dict({
+      'code': 'home_assistant_error',
+      'message': 'Unknown error',
+    }),
+    'id': 1,
+    'success': False,
+    'type': 'result',
+  })
+# ---
+# name: test_can_decrypt_on_download_with_agent_error[BackupNotFound]
+  dict({
+    'error': dict({
+      'code': 'backup_not_found',
+      'message': 'Backup not found',
+    }),
+    'id': 1,
+    'success': False,
+    'type': 'result',
+  })
+# ---
+# name: test_config_load_config_info[with_hassio-storage_data0]
   dict({
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -262,11 +300,14 @@
     'type': 'result',
   })
 # ---
-# name: test_config_info[storage_data1]
+# name: test_config_load_config_info[with_hassio-storage_data1]
   dict({
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -309,11 +350,14 @@
     'type': 'result',
   })
 # ---
-# name: test_config_info[storage_data2]
+# name: test_config_load_config_info[with_hassio-storage_data2]
   dict({
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': True,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -345,11 +389,14 @@
     'type': 'result',
   })
 # ---
-# name: test_config_info[storage_data3]
+# name: test_config_load_config_info[with_hassio-storage_data3]
   dict({
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -381,11 +428,14 @@
     'type': 'result',
   })
 # ---
-# name: test_config_info[storage_data4]
+# name: test_config_load_config_info[with_hassio-storage_data4]
   dict({
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -418,11 +468,14 @@
     'type': 'result',
   })
 # ---
-# name: test_config_info[storage_data5]
+# name: test_config_load_config_info[with_hassio-storage_data5]
   dict({
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -454,11 +507,14 @@
     'type': 'result',
   })
 # ---
-# name: test_config_info[storage_data6]
+# name: test_config_load_config_info[with_hassio-storage_data6]
   dict({
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -492,11 +548,142 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command0]
+# name: test_config_load_config_info[with_hassio-storage_data7]
   dict({
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+          'test-agent1': dict({
+            'protected': True,
+          }),
+          'test-agent2': dict({
+            'protected': False,
+          }),
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+            'test-agent',
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': False,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': '2024-11-17T04:55:00+01:00',
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+            'mon',
+            'sun',
+          ]),
+          'recurrence': 'custom_days',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_load_config_info[with_hassio-storage_data8]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': True,
+        'create_backup': dict({
+          'agent_ids': list([
+            'hassio.local',
+            'hassio.share',
+            'test-agent',
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': False,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_load_config_info[with_hassio-storage_data9]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': True,
+        'create_backup': dict({
+          'agent_ids': list([
+            'hassio.local',
+            'test-agent',
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': False,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_load_config_info[without_hassio-storage_data0]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -527,11 +714,423 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command0].1
+# name: test_config_load_config_info[without_hassio-storage_data1]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+            'test-agent',
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': 'test-name',
+          'password': 'test-password',
+        }),
+        'last_attempted_automatic_backup': '2024-10-26T04:45:00+01:00',
+        'last_completed_automatic_backup': '2024-10-26T04:45:00+01:00',
+        'next_automatic_backup': '2024-11-14T04:55:00+01:00',
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': 3,
+          'days': 7,
+        }),
+        'schedule': dict({
+          'days': list([
+            'mon',
+            'tue',
+            'wed',
+            'thu',
+            'fri',
+            'sat',
+            'sun',
+          ]),
+          'recurrence': 'custom_days',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_load_config_info[without_hassio-storage_data2]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': True,
+        'create_backup': dict({
+          'agent_ids': list([
+            'test-agent',
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': False,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': 3,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_load_config_info[without_hassio-storage_data3]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+            'test-agent',
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': False,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': '2024-10-27T04:45:00+01:00',
+        'last_completed_automatic_backup': '2024-10-26T04:45:00+01:00',
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': 7,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_load_config_info[without_hassio-storage_data4]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+            'test-agent',
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': False,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': '2024-11-18T04:55:00+01:00',
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+            'mon',
+          ]),
+          'recurrence': 'custom_days',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_load_config_info[without_hassio-storage_data5]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+            'test-agent',
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': False,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_load_config_info[without_hassio-storage_data6]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+            'test-agent',
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': False,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': '2024-11-17T04:55:00+01:00',
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+            'mon',
+            'sun',
+          ]),
+          'recurrence': 'custom_days',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_load_config_info[without_hassio-storage_data7]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+          'test-agent1': dict({
+            'protected': True,
+          }),
+          'test-agent2': dict({
+            'protected': False,
+          }),
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+            'test-agent',
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': False,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': '2024-11-17T04:55:00+01:00',
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+            'mon',
+            'sun',
+          ]),
+          'recurrence': 'custom_days',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_load_config_info[without_hassio-storage_data8]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': True,
+        'create_backup': dict({
+          'agent_ids': list([
+            'backup.local',
+            'test-agent',
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': False,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_load_config_info[without_hassio-storage_data9]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': True,
+        'create_backup': dict({
+          'agent_ids': list([
+            'backup.local',
+            'test-agent',
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': False,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_update[commands0]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_update[commands0].1
   dict({
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -563,12 +1162,15 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command0].2
+# name: test_config_update[commands0].2
   dict({
     'data': dict({
       'backups': list([
       ]),
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -596,15 +1198,18 @@
       }),
     }),
     'key': 'backup',
-    'minor_version': 2,
+    'minor_version': 5,
     'version': 1,
   })
 # ---
-# name: test_config_update[command10]
+# name: test_config_update[commands10]
   dict({
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -635,11 +1240,14 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command10].1
+# name: test_config_update[commands10].1
   dict({
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -671,12 +1279,15 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command10].2
+# name: test_config_update[commands10].2
   dict({
     'data': dict({
       'backups': list([
       ]),
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -704,15 +1315,18 @@
       }),
     }),
     'key': 'backup',
-    'minor_version': 2,
+    'minor_version': 5,
     'version': 1,
   })
 # ---
-# name: test_config_update[command11]
+# name: test_config_update[commands11]
   dict({
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -743,11 +1357,14 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command11].1
+# name: test_config_update[commands11].1
   dict({
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -779,12 +1396,15 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command11].2
+# name: test_config_update[commands11].2
   dict({
     'data': dict({
       'backups': list([
       ]),
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -812,15 +1432,18 @@
       }),
     }),
     'key': 'backup',
-    'minor_version': 2,
+    'minor_version': 5,
     'version': 1,
   })
 # ---
-# name: test_config_update[command1]
+# name: test_config_update[commands12]
   dict({
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -851,11 +1474,542 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command1].1
+# name: test_config_update[commands12].1
   dict({
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+          'test-agent1': dict({
+            'protected': True,
+          }),
+          'test-agent2': dict({
+            'protected': False,
+          }),
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_update[commands12].2
+  dict({
+    'data': dict({
+      'backups': list([
+      ]),
+      'config': dict({
+        'agents': dict({
+          'test-agent1': dict({
+            'protected': True,
+          }),
+          'test-agent2': dict({
+            'protected': False,
+          }),
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'state': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'key': 'backup',
+    'minor_version': 5,
+    'version': 1,
+  })
+# ---
+# name: test_config_update[commands13]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_update[commands13].1
+  dict({
+    'id': 3,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+          'test-agent1': dict({
+            'protected': True,
+          }),
+          'test-agent2': dict({
+            'protected': False,
+          }),
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_update[commands13].2
+  dict({
+    'id': 5,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+          'test-agent1': dict({
+            'protected': False,
+          }),
+          'test-agent2': dict({
+            'protected': True,
+          }),
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_update[commands13].3
+  dict({
+    'data': dict({
+      'backups': list([
+      ]),
+      'config': dict({
+        'agents': dict({
+          'test-agent1': dict({
+            'protected': False,
+          }),
+          'test-agent2': dict({
+            'protected': True,
+          }),
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'state': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'key': 'backup',
+    'minor_version': 5,
+    'version': 1,
+  })
+# ---
+# name: test_config_update[commands14]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_update[commands14].1
+  dict({
+    'id': 3,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_update[commands14].2
+  dict({
+    'data': dict({
+      'backups': list([
+      ]),
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'state': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'key': 'backup',
+    'minor_version': 5,
+    'version': 1,
+  })
+# ---
+# name: test_config_update[commands15]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_update[commands15].1
+  dict({
+    'id': 3,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': True,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_update[commands15].2
+  dict({
+    'data': dict({
+      'backups': list([
+      ]),
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': True,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'state': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'key': 'backup',
+    'minor_version': 5,
+    'version': 1,
+  })
+# ---
+# name: test_config_update[commands1]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_update[commands1].1
+  dict({
+    'id': 3,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -887,12 +2041,15 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command1].2
+# name: test_config_update[commands1].2
   dict({
     'data': dict({
       'backups': list([
       ]),
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -920,15 +2077,18 @@
       }),
     }),
     'key': 'backup',
-    'minor_version': 2,
+    'minor_version': 5,
     'version': 1,
   })
 # ---
-# name: test_config_update[command2]
+# name: test_config_update[commands2]
   dict({
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -959,11 +2119,14 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command2].1
+# name: test_config_update[commands2].1
   dict({
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -996,12 +2159,15 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command2].2
+# name: test_config_update[commands2].2
   dict({
     'data': dict({
       'backups': list([
       ]),
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -1030,15 +2196,18 @@
       }),
     }),
     'key': 'backup',
-    'minor_version': 2,
+    'minor_version': 5,
     'version': 1,
   })
 # ---
-# name: test_config_update[command3]
+# name: test_config_update[commands3]
   dict({
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -1069,11 +2238,14 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command3].1
+# name: test_config_update[commands3].1
   dict({
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -1105,12 +2277,15 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command3].2
+# name: test_config_update[commands3].2
   dict({
     'data': dict({
       'backups': list([
       ]),
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -1138,15 +2313,18 @@
       }),
     }),
     'key': 'backup',
-    'minor_version': 2,
+    'minor_version': 5,
     'version': 1,
   })
 # ---
-# name: test_config_update[command4]
+# name: test_config_update[commands4]
   dict({
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -1177,11 +2355,14 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command4].1
+# name: test_config_update[commands4].1
   dict({
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -1215,12 +2396,15 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command4].2
+# name: test_config_update[commands4].2
   dict({
     'data': dict({
       'backups': list([
       ]),
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -1250,15 +2434,18 @@
       }),
     }),
     'key': 'backup',
-    'minor_version': 2,
+    'minor_version': 5,
     'version': 1,
   })
 # ---
-# name: test_config_update[command5]
+# name: test_config_update[commands5]
   dict({
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -1289,11 +2476,14 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command5].1
+# name: test_config_update[commands5].1
   dict({
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -1329,12 +2519,15 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command5].2
+# name: test_config_update[commands5].2
   dict({
     'data': dict({
       'backups': list([
       ]),
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -1366,15 +2559,18 @@
       }),
     }),
     'key': 'backup',
-    'minor_version': 2,
+    'minor_version': 5,
     'version': 1,
   })
 # ---
-# name: test_config_update[command6]
+# name: test_config_update[commands6]
   dict({
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -1405,11 +2601,14 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command6].1
+# name: test_config_update[commands6].1
   dict({
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -1441,12 +2640,15 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command6].2
+# name: test_config_update[commands6].2
   dict({
     'data': dict({
       'backups': list([
       ]),
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -1474,15 +2676,18 @@
       }),
     }),
     'key': 'backup',
-    'minor_version': 2,
+    'minor_version': 5,
     'version': 1,
   })
 # ---
-# name: test_config_update[command7]
+# name: test_config_update[commands7]
   dict({
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -1513,11 +2718,14 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command7].1
+# name: test_config_update[commands7].1
   dict({
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -1549,12 +2757,15 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command7].2
+# name: test_config_update[commands7].2
   dict({
     'data': dict({
       'backups': list([
       ]),
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -1582,15 +2793,18 @@
       }),
     }),
     'key': 'backup',
-    'minor_version': 2,
+    'minor_version': 5,
     'version': 1,
   })
 # ---
-# name: test_config_update[command8]
+# name: test_config_update[commands8]
   dict({
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -1621,11 +2835,14 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command8].1
+# name: test_config_update[commands8].1
   dict({
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -1657,12 +2874,15 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command8].2
+# name: test_config_update[commands8].2
   dict({
     'data': dict({
       'backups': list([
       ]),
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -1690,15 +2910,18 @@
       }),
     }),
     'key': 'backup',
-    'minor_version': 2,
+    'minor_version': 5,
     'version': 1,
   })
 # ---
-# name: test_config_update[command9]
+# name: test_config_update[commands9]
   dict({
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -1729,11 +2952,14 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command9].1
+# name: test_config_update[commands9].1
   dict({
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -1765,12 +2991,15 @@
     'type': 'result',
   })
 # ---
-# name: test_config_update[command9].2
+# name: test_config_update[commands9].2
   dict({
     'data': dict({
       'backups': list([
       ]),
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
             'test-agent',
@@ -1798,7 +3027,7 @@
       }),
     }),
     'key': 'backup',
-    'minor_version': 2,
+    'minor_version': 5,
     'version': 1,
   })
 # ---
@@ -1807,6 +3036,9 @@
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -1842,6 +3074,161 @@
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_update_errors[command10]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_update_errors[command10].1
+  dict({
+    'id': 3,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_update_errors[command11]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_update_errors[command11].1
+  dict({
+    'id': 3,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -1877,6 +3264,9 @@
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -1912,6 +3302,9 @@
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -1947,6 +3340,9 @@
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -1982,6 +3378,9 @@
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -2017,6 +3416,9 @@
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -2052,6 +3454,9 @@
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -2087,6 +3492,9 @@
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -2122,6 +3530,9 @@
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -2157,6 +3568,9 @@
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -2192,6 +3606,9 @@
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -2227,6 +3644,9 @@
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -2262,6 +3682,9 @@
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -2297,6 +3720,9 @@
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -2332,6 +3758,9 @@
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -2367,6 +3796,9 @@
     'id': 1,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -2402,6 +3834,85 @@
     'id': 3,
     'result': dict({
       'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_update_errors[command9]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_update_errors[command9].1
+  dict({
+    'id': 3,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
         'create_backup': dict({
           'agent_ids': list([
           ]),
@@ -2440,10 +3951,12 @@
       }),
       'backups': list([
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -2468,10 +3981,12 @@
       }),
       'backups': list([
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -2492,12 +4007,19 @@
               'version': '1.0.0',
             }),
           ]),
-          'agent_ids': list([
-            'backup.local',
-          ]),
+          'agents': dict({
+            'backup.local': dict({
+              'protected': False,
+              'size': 0,
+            }),
+          }),
           'backup_id': 'abc123',
           'database_included': True,
           'date': '1970-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'our_uuid',
+            'with_automatic_settings': True,
+          }),
           'failed_agent_ids': list([
           ]),
           'folders': list([
@@ -2507,15 +4029,15 @@
           'homeassistant_included': True,
           'homeassistant_version': '2024.12.0',
           'name': 'Test',
-          'protected': False,
-          'size': 0,
           'with_automatic_settings': True,
         }),
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -2540,10 +4062,12 @@
       }),
       'backups': list([
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -2564,12 +4088,19 @@
               'version': '1.0.0',
             }),
           ]),
-          'agent_ids': list([
-            'test.remote',
-          ]),
+          'agents': dict({
+            'test.remote': dict({
+              'protected': False,
+              'size': 0,
+            }),
+          }),
           'backup_id': 'abc123',
           'database_included': True,
           'date': '1970-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'our_uuid',
+            'with_automatic_settings': True,
+          }),
           'failed_agent_ids': list([
           ]),
           'folders': list([
@@ -2579,15 +4110,15 @@
           'homeassistant_included': True,
           'homeassistant_version': '2024.12.0',
           'name': 'Test',
-          'protected': False,
-          'size': 0,
           'with_automatic_settings': True,
         }),
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -2619,12 +4150,19 @@
               'version': '1.0.0',
             }),
           ]),
-          'agent_ids': list([
-            'test.remote',
-          ]),
+          'agents': dict({
+            'test.remote': dict({
+              'protected': False,
+              'size': 0,
+            }),
+          }),
           'backup_id': 'abc123',
           'database_included': True,
           'date': '1970-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'our_uuid',
+            'with_automatic_settings': True,
+          }),
           'failed_agent_ids': list([
           ]),
           'folders': list([
@@ -2634,15 +4172,15 @@
           'homeassistant_included': True,
           'homeassistant_version': '2024.12.0',
           'name': 'Test',
-          'protected': False,
-          'size': 0,
           'with_automatic_settings': True,
         }),
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -2658,12 +4196,19 @@
         dict({
           'addons': list([
           ]),
-          'agent_ids': list([
-            'test.remote',
-          ]),
+          'agents': dict({
+            'test.remote': dict({
+              'protected': False,
+              'size': 1,
+            }),
+          }),
           'backup_id': 'def456',
           'database_included': False,
           'date': '1980-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'unknown_uuid',
+            'with_automatic_settings': True,
+          }),
           'failed_agent_ids': list([
           ]),
           'folders': list([
@@ -2673,15 +4218,15 @@
           'homeassistant_included': True,
           'homeassistant_version': '2024.12.0',
           'name': 'Test 2',
-          'protected': False,
-          'size': 1,
           'with_automatic_settings': None,
         }),
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -2708,12 +4253,19 @@
         dict({
           'addons': list([
           ]),
-          'agent_ids': list([
-            'test.remote',
-          ]),
+          'agents': dict({
+            'test.remote': dict({
+              'protected': False,
+              'size': 1,
+            }),
+          }),
           'backup_id': 'def456',
           'database_included': False,
           'date': '1980-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'unknown_uuid',
+            'with_automatic_settings': True,
+          }),
           'failed_agent_ids': list([
           ]),
           'folders': list([
@@ -2723,15 +4275,15 @@
           'homeassistant_included': True,
           'homeassistant_version': '2024.12.0',
           'name': 'Test 2',
-          'protected': False,
-          'size': 1,
           'with_automatic_settings': None,
         }),
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -2752,13 +4304,23 @@
               'version': '1.0.0',
             }),
           ]),
-          'agent_ids': list([
-            'test.remote',
-            'backup.local',
-          ]),
+          'agents': dict({
+            'backup.local': dict({
+              'protected': False,
+              'size': 0,
+            }),
+            'test.remote': dict({
+              'protected': False,
+              'size': 0,
+            }),
+          }),
           'backup_id': 'abc123',
           'database_included': True,
           'date': '1970-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'our_uuid',
+            'with_automatic_settings': True,
+          }),
           'failed_agent_ids': list([
           ]),
           'folders': list([
@@ -2768,15 +4330,15 @@
           'homeassistant_included': True,
           'homeassistant_version': '2024.12.0',
           'name': 'Test',
-          'protected': False,
-          'size': 0,
           'with_automatic_settings': True,
         }),
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -2808,12 +4370,19 @@
               'version': '1.0.0',
             }),
           ]),
-          'agent_ids': list([
-            'test.remote',
-          ]),
+          'agents': dict({
+            'test.remote': dict({
+              'protected': False,
+              'size': 0,
+            }),
+          }),
           'backup_id': 'abc123',
           'database_included': True,
           'date': '1970-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'our_uuid',
+            'with_automatic_settings': True,
+          }),
           'failed_agent_ids': list([
           ]),
           'folders': list([
@@ -2823,15 +4392,15 @@
           'homeassistant_included': True,
           'homeassistant_version': '2024.12.0',
           'name': 'Test',
-          'protected': False,
-          'size': 0,
           'with_automatic_settings': True,
         }),
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -2842,7 +4411,7 @@
     'id': 1,
     'result': dict({
       'agent_errors': dict({
-        'domain.test': 'The backup agent is unreachable.',
+        'test.remote': 'The backup agent is unreachable.',
       }),
     }),
     'success': True,
@@ -2864,12 +4433,19 @@
               'version': '1.0.0',
             }),
           ]),
-          'agent_ids': list([
-            'domain.test',
-          ]),
+          'agents': dict({
+            'test.remote': dict({
+              'protected': False,
+              'size': 0,
+            }),
+          }),
           'backup_id': 'abc123',
           'database_included': True,
-          'date': '1970-01-01T00:00:00Z',
+          'date': '1970-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'our_uuid',
+            'with_automatic_settings': True,
+          }),
           'failed_agent_ids': list([
           ]),
           'folders': list([
@@ -2879,15 +4455,15 @@
           'homeassistant_included': True,
           'homeassistant_version': '2024.12.0',
           'name': 'Test',
-          'protected': False,
-          'size': 13,
-          'with_automatic_settings': None,
+          'with_automatic_settings': True,
         }),
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -2898,7 +4474,7 @@
     'id': 1,
     'result': dict({
       'agent_errors': dict({
-        'domain.test': 'The backup agent is unreachable.',
+        'test.remote': 'The backup agent is unreachable.',
       }),
     }),
     'success': True,
@@ -2920,12 +4496,19 @@
               'version': '1.0.0',
             }),
           ]),
-          'agent_ids': list([
-            'domain.test',
-          ]),
+          'agents': dict({
+            'test.remote': dict({
+              'protected': False,
+              'size': 0,
+            }),
+          }),
           'backup_id': 'abc123',
           'database_included': True,
-          'date': '1970-01-01T00:00:00Z',
+          'date': '1970-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'our_uuid',
+            'with_automatic_settings': True,
+          }),
           'failed_agent_ids': list([
             'test.remote',
           ]),
@@ -2936,15 +4519,15 @@
           'homeassistant_included': True,
           'homeassistant_version': '2024.12.0',
           'name': 'Test',
-          'protected': False,
-          'size': 13,
-          'with_automatic_settings': None,
+          'with_automatic_settings': True,
         }),
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -2976,12 +4559,19 @@
               'version': '1.0.0',
             }),
           ]),
-          'agent_ids': list([
-            'domain.test',
-          ]),
+          'agents': dict({
+            'test.remote': dict({
+              'protected': False,
+              'size': 0,
+            }),
+          }),
           'backup_id': 'abc123',
           'database_included': True,
-          'date': '1970-01-01T00:00:00Z',
+          'date': '1970-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'our_uuid',
+            'with_automatic_settings': True,
+          }),
           'failed_agent_ids': list([
           ]),
           'folders': list([
@@ -2991,15 +4581,15 @@
           'homeassistant_included': True,
           'homeassistant_version': '2024.12.0',
           'name': 'Test',
-          'protected': False,
-          'size': 13,
-          'with_automatic_settings': None,
+          'with_automatic_settings': True,
         }),
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -3031,12 +4621,19 @@
               'version': '1.0.0',
             }),
           ]),
-          'agent_ids': list([
-            'domain.test',
-          ]),
+          'agents': dict({
+            'test.remote': dict({
+              'protected': False,
+              'size': 0,
+            }),
+          }),
           'backup_id': 'abc123',
           'database_included': True,
-          'date': '1970-01-01T00:00:00Z',
+          'date': '1970-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'our_uuid',
+            'with_automatic_settings': True,
+          }),
           'failed_agent_ids': list([
           ]),
           'folders': list([
@@ -3046,15 +4643,15 @@
           'homeassistant_included': True,
           'homeassistant_version': '2024.12.0',
           'name': 'Test',
-          'protected': False,
-          'size': 13,
-          'with_automatic_settings': None,
+          'with_automatic_settings': True,
         }),
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -3062,12 +4659,13 @@
 # ---
 # name: test_delete_with_errors[side_effect1-storage_data0]
   dict({
-    'error': dict({
-      'code': 'home_assistant_error',
-      'message': 'Boom!',
-    }),
     'id': 1,
-    'success': False,
+    'result': dict({
+      'agent_errors': dict({
+        'test.remote': 'Boom!',
+      }),
+    }),
+    'success': True,
     'type': 'result',
   })
 # ---
@@ -3086,12 +4684,19 @@
               'version': '1.0.0',
             }),
           ]),
-          'agent_ids': list([
-            'domain.test',
-          ]),
+          'agents': dict({
+            'test.remote': dict({
+              'protected': False,
+              'size': 0,
+            }),
+          }),
           'backup_id': 'abc123',
           'database_included': True,
-          'date': '1970-01-01T00:00:00Z',
+          'date': '1970-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'our_uuid',
+            'with_automatic_settings': True,
+          }),
           'failed_agent_ids': list([
           ]),
           'folders': list([
@@ -3101,15 +4706,15 @@
           'homeassistant_included': True,
           'homeassistant_version': '2024.12.0',
           'name': 'Test',
-          'protected': False,
-          'size': 13,
-          'with_automatic_settings': None,
+          'with_automatic_settings': True,
         }),
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -3117,12 +4722,13 @@
 # ---
 # name: test_delete_with_errors[side_effect1-storage_data1]
   dict({
-    'error': dict({
-      'code': 'home_assistant_error',
-      'message': 'Boom!',
-    }),
     'id': 1,
-    'success': False,
+    'result': dict({
+      'agent_errors': dict({
+        'test.remote': 'Boom!',
+      }),
+    }),
+    'success': True,
     'type': 'result',
   })
 # ---
@@ -3141,12 +4747,19 @@
               'version': '1.0.0',
             }),
           ]),
-          'agent_ids': list([
-            'domain.test',
-          ]),
+          'agents': dict({
+            'test.remote': dict({
+              'protected': False,
+              'size': 0,
+            }),
+          }),
           'backup_id': 'abc123',
           'database_included': True,
-          'date': '1970-01-01T00:00:00Z',
+          'date': '1970-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'our_uuid',
+            'with_automatic_settings': True,
+          }),
           'failed_agent_ids': list([
             'test.remote',
           ]),
@@ -3157,15 +4770,15 @@
           'homeassistant_included': True,
           'homeassistant_version': '2024.12.0',
           'name': 'Test',
-          'protected': False,
-          'size': 13,
-          'with_automatic_settings': None,
+          'with_automatic_settings': True,
         }),
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -3197,12 +4810,19 @@
             'version': '1.0.0',
           }),
         ]),
-        'agent_ids': list([
-          'backup.local',
-        ]),
+        'agents': dict({
+          'backup.local': dict({
+            'protected': False,
+            'size': 0,
+          }),
+        }),
         'backup_id': 'abc123',
         'database_included': True,
         'date': '1970-01-01T00:00:00.000Z',
+        'extra_metadata': dict({
+          'instance_id': 'our_uuid',
+          'with_automatic_settings': True,
+        }),
         'failed_agent_ids': list([
         ]),
         'folders': list([
@@ -3212,8 +4832,6 @@
         'homeassistant_included': True,
         'homeassistant_version': '2024.12.0',
         'name': 'Test',
-        'protected': False,
-        'size': 0,
         'with_automatic_settings': True,
       }),
     }),
@@ -3235,12 +4853,19 @@
             'version': '1.0.0',
           }),
         ]),
-        'agent_ids': list([
-          'test.remote',
-        ]),
+        'agents': dict({
+          'test.remote': dict({
+            'protected': False,
+            'size': 0,
+          }),
+        }),
         'backup_id': 'abc123',
         'database_included': True,
         'date': '1970-01-01T00:00:00.000Z',
+        'extra_metadata': dict({
+          'instance_id': 'our_uuid',
+          'with_automatic_settings': True,
+        }),
         'failed_agent_ids': list([
         ]),
         'folders': list([
@@ -3250,8 +4875,6 @@
         'homeassistant_included': True,
         'homeassistant_version': '2024.12.0',
         'name': 'Test',
-        'protected': False,
-        'size': 0,
         'with_automatic_settings': True,
       }),
     }),
@@ -3285,13 +4908,23 @@
             'version': '1.0.0',
           }),
         ]),
-        'agent_ids': list([
-          'test.remote',
-          'backup.local',
-        ]),
+        'agents': dict({
+          'backup.local': dict({
+            'protected': False,
+            'size': 0,
+          }),
+          'test.remote': dict({
+            'protected': False,
+            'size': 0,
+          }),
+        }),
         'backup_id': 'abc123',
         'database_included': True,
         'date': '1970-01-01T00:00:00.000Z',
+        'extra_metadata': dict({
+          'instance_id': 'our_uuid',
+          'with_automatic_settings': True,
+        }),
         'failed_agent_ids': list([
         ]),
         'folders': list([
@@ -3301,8 +4934,6 @@
         'homeassistant_included': True,
         'homeassistant_version': '2024.12.0',
         'name': 'Test',
-        'protected': False,
-        'size': 0,
         'with_automatic_settings': True,
       }),
     }),
@@ -3310,12 +4941,24 @@
     'type': 'result',
   })
 # ---
+# name: test_details_get_backup_returns_none
+  dict({
+    'id': 1,
+    'result': dict({
+      'agent_errors': dict({
+      }),
+      'backup': None,
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
 # name: test_details_with_errors[BackupAgentUnreachableError]
   dict({
     'id': 1,
     'result': dict({
       'agent_errors': dict({
-        'domain.test': 'The backup agent is unreachable.',
+        'test.remote': 'The backup agent is unreachable.',
       }),
       'backup': dict({
         'addons': list([
@@ -3325,12 +4968,19 @@
             'version': '1.0.0',
           }),
         ]),
-        'agent_ids': list([
-          'backup.local',
-        ]),
+        'agents': dict({
+          'backup.local': dict({
+            'protected': False,
+            'size': 0,
+          }),
+        }),
         'backup_id': 'abc123',
         'database_included': True,
         'date': '1970-01-01T00:00:00.000Z',
+        'extra_metadata': dict({
+          'instance_id': 'our_uuid',
+          'with_automatic_settings': True,
+        }),
         'failed_agent_ids': list([
         ]),
         'folders': list([
@@ -3340,8 +4990,6 @@
         'homeassistant_included': True,
         'homeassistant_version': '2024.12.0',
         'name': 'Test',
-        'protected': False,
-        'size': 0,
         'with_automatic_settings': True,
       }),
     }),
@@ -3351,12 +4999,89 @@
 # ---
 # name: test_details_with_errors[side_effect0]
   dict({
-    'error': dict({
-      'code': 'home_assistant_error',
-      'message': 'Boom!',
-    }),
     'id': 1,
-    'success': False,
+    'result': dict({
+      'agent_errors': dict({
+        'test.remote': 'Oops',
+      }),
+      'backup': dict({
+        'addons': list([
+          dict({
+            'name': 'Test',
+            'slug': 'test',
+            'version': '1.0.0',
+          }),
+        ]),
+        'agents': dict({
+          'backup.local': dict({
+            'protected': False,
+            'size': 0,
+          }),
+        }),
+        'backup_id': 'abc123',
+        'database_included': True,
+        'date': '1970-01-01T00:00:00.000Z',
+        'extra_metadata': dict({
+          'instance_id': 'our_uuid',
+          'with_automatic_settings': True,
+        }),
+        'failed_agent_ids': list([
+        ]),
+        'folders': list([
+          'media',
+          'share',
+        ]),
+        'homeassistant_included': True,
+        'homeassistant_version': '2024.12.0',
+        'name': 'Test',
+        'with_automatic_settings': True,
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_details_with_errors[side_effect1]
+  dict({
+    'id': 1,
+    'result': dict({
+      'agent_errors': dict({
+        'test.remote': 'Boom!',
+      }),
+      'backup': dict({
+        'addons': list([
+          dict({
+            'name': 'Test',
+            'slug': 'test',
+            'version': '1.0.0',
+          }),
+        ]),
+        'agents': dict({
+          'backup.local': dict({
+            'protected': False,
+            'size': 0,
+          }),
+        }),
+        'backup_id': 'abc123',
+        'database_included': True,
+        'date': '1970-01-01T00:00:00.000Z',
+        'extra_metadata': dict({
+          'instance_id': 'our_uuid',
+          'with_automatic_settings': True,
+        }),
+        'failed_agent_ids': list([
+        ]),
+        'folders': list([
+          'media',
+          'share',
+        ]),
+        'homeassistant_included': True,
+        'homeassistant_version': '2024.12.0',
+        'name': 'Test',
+        'with_automatic_settings': True,
+      }),
+    }),
+    'success': True,
     'type': 'result',
   })
 # ---
@@ -3381,6 +5106,7 @@
   dict({
     'event': dict({
       'manager_state': 'create_backup',
+      'reason': None,
       'stage': None,
       'state': 'in_progress',
     }),
@@ -3402,6 +5128,7 @@
   dict({
     'event': dict({
       'manager_state': 'create_backup',
+      'reason': None,
       'stage': 'home_assistant',
       'state': 'in_progress',
     }),
@@ -3413,6 +5140,7 @@
   dict({
     'event': dict({
       'manager_state': 'create_backup',
+      'reason': None,
       'stage': 'upload_to_agents',
       'state': 'in_progress',
     }),
@@ -3424,6 +5152,7 @@
   dict({
     'event': dict({
       'manager_state': 'create_backup',
+      'reason': None,
       'stage': None,
       'state': 'completed',
     }),
@@ -3452,6 +5181,7 @@
   dict({
     'event': dict({
       'manager_state': 'create_backup',
+      'reason': None,
       'stage': None,
       'state': 'in_progress',
     }),
@@ -3473,6 +5203,7 @@
   dict({
     'event': dict({
       'manager_state': 'create_backup',
+      'reason': None,
       'stage': 'home_assistant',
       'state': 'in_progress',
     }),
@@ -3484,6 +5215,7 @@
   dict({
     'event': dict({
       'manager_state': 'create_backup',
+      'reason': None,
       'stage': 'upload_to_agents',
       'state': 'in_progress',
     }),
@@ -3495,6 +5227,7 @@
   dict({
     'event': dict({
       'manager_state': 'create_backup',
+      'reason': None,
       'stage': None,
       'state': 'completed',
     }),
@@ -3523,6 +5256,7 @@
   dict({
     'event': dict({
       'manager_state': 'create_backup',
+      'reason': None,
       'stage': None,
       'state': 'in_progress',
     }),
@@ -3544,6 +5278,7 @@
   dict({
     'event': dict({
       'manager_state': 'create_backup',
+      'reason': None,
       'stage': 'home_assistant',
       'state': 'in_progress',
     }),
@@ -3555,6 +5290,7 @@
   dict({
     'event': dict({
       'manager_state': 'create_backup',
+      'reason': None,
       'stage': 'upload_to_agents',
       'state': 'in_progress',
     }),
@@ -3566,6 +5302,7 @@
   dict({
     'event': dict({
       'manager_state': 'create_backup',
+      'reason': None,
       'stage': None,
       'state': 'completed',
     }),
@@ -3588,12 +5325,19 @@
               'version': '1.0.0',
             }),
           ]),
-          'agent_ids': list([
-            'backup.local',
-          ]),
+          'agents': dict({
+            'backup.local': dict({
+              'protected': False,
+              'size': 0,
+            }),
+          }),
           'backup_id': 'abc123',
           'database_included': True,
           'date': '1970-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'our_uuid',
+            'with_automatic_settings': True,
+          }),
           'failed_agent_ids': list([
           ]),
           'folders': list([
@@ -3603,15 +5347,15 @@
           'homeassistant_included': True,
           'homeassistant_version': '2024.12.0',
           'name': 'Test',
-          'protected': False,
-          'size': 0,
           'with_automatic_settings': True,
         }),
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -3632,12 +5376,19 @@
               'version': '1.0.0',
             }),
           ]),
-          'agent_ids': list([
-            'backup.local',
-          ]),
+          'agents': dict({
+            'backup.local': dict({
+              'protected': False,
+              'size': 0,
+            }),
+          }),
           'backup_id': 'abc123',
           'database_included': True,
           'date': '1970-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'our_uuid',
+            'with_automatic_settings': True,
+          }),
           'failed_agent_ids': list([
           ]),
           'folders': list([
@@ -3647,15 +5398,15 @@
           'homeassistant_included': True,
           'homeassistant_version': '2024.12.0',
           'name': 'Test',
-          'protected': False,
-          'size': 0,
           'with_automatic_settings': True,
         }),
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -3676,13 +5427,23 @@
               'version': '1.0.0',
             }),
           ]),
-          'agent_ids': list([
-            'test.remote',
-            'backup.local',
-          ]),
+          'agents': dict({
+            'backup.local': dict({
+              'protected': False,
+              'size': 0,
+            }),
+            'test.remote': dict({
+              'protected': False,
+              'size': 0,
+            }),
+          }),
           'backup_id': 'abc123',
           'database_included': True,
           'date': '1970-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'our_uuid',
+            'with_automatic_settings': True,
+          }),
           'failed_agent_ids': list([
           ]),
           'folders': list([
@@ -3692,15 +5453,15 @@
           'homeassistant_included': True,
           'homeassistant_version': '2024.12.0',
           'name': 'Test',
-          'protected': False,
-          'size': 0,
           'with_automatic_settings': True,
         }),
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -3716,12 +5477,19 @@
         dict({
           'addons': list([
           ]),
-          'agent_ids': list([
-            'test.remote',
-          ]),
+          'agents': dict({
+            'test.remote': dict({
+              'protected': False,
+              'size': 1,
+            }),
+          }),
           'backup_id': 'def456',
           'database_included': False,
           'date': '1980-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'unknown_uuid',
+            'with_automatic_settings': True,
+          }),
           'failed_agent_ids': list([
           ]),
           'folders': list([
@@ -3731,8 +5499,6 @@
           'homeassistant_included': True,
           'homeassistant_version': '2024.12.0',
           'name': 'Test 2',
-          'protected': False,
-          'size': 1,
           'with_automatic_settings': None,
         }),
         dict({
@@ -3743,12 +5509,19 @@
               'version': '1.0.0',
             }),
           ]),
-          'agent_ids': list([
-            'backup.local',
-          ]),
+          'agents': dict({
+            'backup.local': dict({
+              'protected': False,
+              'size': 0,
+            }),
+          }),
           'backup_id': 'abc123',
           'database_included': True,
           'date': '1970-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'our_uuid',
+            'with_automatic_settings': True,
+          }),
           'failed_agent_ids': list([
           ]),
           'folders': list([
@@ -3758,15 +5531,15 @@
           'homeassistant_included': True,
           'homeassistant_version': '2024.12.0',
           'name': 'Test',
-          'protected': False,
-          'size': 0,
           'with_automatic_settings': True,
         }),
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -3777,7 +5550,7 @@
     'id': 1,
     'result': dict({
       'agent_errors': dict({
-        'domain.test': 'The backup agent is unreachable.',
+        'test.remote': 'The backup agent is unreachable.',
       }),
       'backups': list([
         dict({
@@ -3788,12 +5561,19 @@
               'version': '1.0.0',
             }),
           ]),
-          'agent_ids': list([
-            'backup.local',
-          ]),
+          'agents': dict({
+            'backup.local': dict({
+              'protected': False,
+              'size': 0,
+            }),
+          }),
           'backup_id': 'abc123',
           'database_included': True,
           'date': '1970-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'our_uuid',
+            'with_automatic_settings': True,
+          }),
           'failed_agent_ids': list([
           ]),
           'folders': list([
@@ -3803,15 +5583,15 @@
           'homeassistant_included': True,
           'homeassistant_version': '2024.12.0',
           'name': 'Test',
-          'protected': False,
-          'size': 0,
           'with_automatic_settings': True,
         }),
       ]),
+      'last_action_event': None,
       'last_attempted_automatic_backup': None,
       'last_completed_automatic_backup': None,
       'next_automatic_backup': None,
       'next_automatic_backup_additional': False,
+      'state': 'idle',
     }),
     'success': True,
     'type': 'result',
@@ -3819,12 +5599,105 @@
 # ---
 # name: test_info_with_errors[side_effect0]
   dict({
-    'error': dict({
-      'code': 'home_assistant_error',
-      'message': 'Boom!',
-    }),
     'id': 1,
-    'success': False,
+    'result': dict({
+      'agent_errors': dict({
+        'test.remote': 'Oops',
+      }),
+      'backups': list([
+        dict({
+          'addons': list([
+            dict({
+              'name': 'Test',
+              'slug': 'test',
+              'version': '1.0.0',
+            }),
+          ]),
+          'agents': dict({
+            'backup.local': dict({
+              'protected': False,
+              'size': 0,
+            }),
+          }),
+          'backup_id': 'abc123',
+          'database_included': True,
+          'date': '1970-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'our_uuid',
+            'with_automatic_settings': True,
+          }),
+          'failed_agent_ids': list([
+          ]),
+          'folders': list([
+            'media',
+            'share',
+          ]),
+          'homeassistant_included': True,
+          'homeassistant_version': '2024.12.0',
+          'name': 'Test',
+          'with_automatic_settings': True,
+        }),
+      ]),
+      'last_action_event': None,
+      'last_attempted_automatic_backup': None,
+      'last_completed_automatic_backup': None,
+      'next_automatic_backup': None,
+      'next_automatic_backup_additional': False,
+      'state': 'idle',
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_info_with_errors[side_effect1]
+  dict({
+    'id': 1,
+    'result': dict({
+      'agent_errors': dict({
+        'test.remote': 'Boom!',
+      }),
+      'backups': list([
+        dict({
+          'addons': list([
+            dict({
+              'name': 'Test',
+              'slug': 'test',
+              'version': '1.0.0',
+            }),
+          ]),
+          'agents': dict({
+            'backup.local': dict({
+              'protected': False,
+              'size': 0,
+            }),
+          }),
+          'backup_id': 'abc123',
+          'database_included': True,
+          'date': '1970-01-01T00:00:00.000Z',
+          'extra_metadata': dict({
+            'instance_id': 'our_uuid',
+            'with_automatic_settings': True,
+          }),
+          'failed_agent_ids': list([
+          ]),
+          'folders': list([
+            'media',
+            'share',
+          ]),
+          'homeassistant_included': True,
+          'homeassistant_version': '2024.12.0',
+          'name': 'Test',
+          'with_automatic_settings': True,
+        }),
+      ]),
+      'last_action_event': None,
+      'last_attempted_automatic_backup': None,
+      'last_completed_automatic_backup': None,
+      'next_automatic_backup': None,
+      'next_automatic_backup_additional': False,
+      'state': 'idle',
+    }),
+    'success': True,
     'type': 'result',
   })
 # ---
@@ -3878,6 +5751,17 @@
 # name: test_restore_remote_agent[remote_agents1-backups1].1
   1
 # ---
+# name: test_restore_remote_agent_get_backup_returns_none
+  dict({
+    'error': dict({
+      'code': 'home_assistant_error',
+      'message': 'Backup abc123 not found in agent test.remote',
+    }),
+    'id': 1,
+    'success': False,
+    'type': 'result',
+  })
+# ---
 # name: test_restore_wrong_password
   dict({
     'error': dict({
@@ -3910,6 +5794,7 @@
   dict({
     'event': dict({
       'manager_state': 'create_backup',
+      'reason': None,
       'stage': None,
       'state': 'in_progress',
     }),
@@ -3917,3 +5802,20 @@
     'type': 'event',
   })
 # ---
+# name: test_subscribe_event_early
+  dict({
+    'event': dict({
+      'manager_state': 'idle',
+    }),
+    'id': 1,
+    'type': 'event',
+  })
+# ---
+# name: test_subscribe_event_early.1
+  dict({
+    'id': 1,
+    'result': None,
+    'success': True,
+    'type': 'result',
+  })
+# ---
diff --git a/tests/components/backup/test_backup.py b/tests/components/backup/test_backup.py
index 02252ef6fa5..c9d797f4e30 100644
--- a/tests/components/backup/test_backup.py
+++ b/tests/components/backup/test_backup.py
@@ -12,21 +12,36 @@ from unittest.mock import MagicMock, mock_open, patch
 import pytest
 from syrupy import SnapshotAssertion
 
-from homeassistant.components.backup import DOMAIN
+from homeassistant.components.backup import DOMAIN, AgentBackup
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.backup import async_initialize_backup
 from homeassistant.setup import async_setup_component
 
-from .common import TEST_BACKUP_ABC123, TEST_BACKUP_PATH_ABC123
+from .common import (
+    TEST_BACKUP_ABC123,
+    TEST_BACKUP_DEF456,
+    TEST_BACKUP_PATH_ABC123,
+    TEST_BACKUP_PATH_DEF456,
+)
 
 from tests.typing import ClientSessionGenerator, WebSocketGenerator
 
 
+def mock_read_backup(backup_path: Path) -> AgentBackup:
+    """Mock read backup."""
+    mock_backups = {
+        "abc123": TEST_BACKUP_ABC123,
+        "custom_def456": TEST_BACKUP_DEF456,
+    }
+    return mock_backups[backup_path.stem]
+
+
 @pytest.fixture(name="read_backup")
 def read_backup_fixture(path_glob: MagicMock) -> Generator[MagicMock]:
     """Mock read backup."""
     with patch(
         "homeassistant.components.backup.backup.read_backup",
-        return_value=TEST_BACKUP_ABC123,
+        side_effect=mock_read_backup,
     ) as read_backup:
         yield read_backup
 
@@ -34,7 +49,7 @@ def read_backup_fixture(path_glob: MagicMock) -> Generator[MagicMock]:
 @pytest.mark.parametrize(
     "side_effect",
     [
-        None,
+        mock_read_backup,
         OSError("Boom"),
         TarError("Boom"),
         json.JSONDecodeError("Boom", "test", 1),
@@ -49,6 +64,7 @@ async def test_load_backups(
     side_effect: Exception | None,
 ) -> None:
     """Test load backups."""
+    async_initialize_backup(hass)
     assert await async_setup_component(hass, DOMAIN, {})
     await hass.async_block_till_done()
     client = await hass_ws_client(hass)
@@ -68,6 +84,7 @@ async def test_upload(
     hass_client: ClientSessionGenerator,
 ) -> None:
     """Test upload backup."""
+    async_initialize_backup(hass)
     assert await async_setup_component(hass, DOMAIN, {})
     await hass.async_block_till_done()
     client = await hass_client()
@@ -89,16 +106,26 @@ async def test_upload(
     assert resp.status == 201
     assert open_mock.call_count == 1
     assert move_mock.call_count == 1
-    assert move_mock.mock_calls[0].args[1].name == "abc123.tar"
+    assert move_mock.mock_calls[0].args[1].name == "Test_1970-01-01_00.00_00000000.tar"
 
 
 @pytest.mark.usefixtures("read_backup")
 @pytest.mark.parametrize(
-    ("found_backups", "backup_exists", "unlink_calls"),
+    ("found_backups", "backup_id", "unlink_calls", "unlink_path"),
     [
-        ([TEST_BACKUP_PATH_ABC123], True, 1),
-        ([TEST_BACKUP_PATH_ABC123], False, 0),
-        (([], True, 0)),
+        (
+            [TEST_BACKUP_PATH_ABC123, TEST_BACKUP_PATH_DEF456],
+            TEST_BACKUP_ABC123.backup_id,
+            1,
+            TEST_BACKUP_PATH_ABC123,
+        ),
+        (
+            [TEST_BACKUP_PATH_ABC123, TEST_BACKUP_PATH_DEF456],
+            TEST_BACKUP_DEF456.backup_id,
+            1,
+            TEST_BACKUP_PATH_DEF456,
+        ),
+        (([], TEST_BACKUP_ABC123.backup_id, 0, None)),
     ],
 )
 async def test_delete_backup(
@@ -108,22 +135,25 @@ async def test_delete_backup(
     snapshot: SnapshotAssertion,
     path_glob: MagicMock,
     found_backups: list[Path],
-    backup_exists: bool,
+    backup_id: str,
     unlink_calls: int,
+    unlink_path: Path | None,
 ) -> None:
     """Test delete backup."""
+    async_initialize_backup(hass)
     assert await async_setup_component(hass, DOMAIN, {})
     await hass.async_block_till_done()
     client = await hass_ws_client(hass)
     path_glob.return_value = found_backups
 
     with (
-        patch("pathlib.Path.exists", return_value=backup_exists),
-        patch("pathlib.Path.unlink") as unlink,
+        patch("pathlib.Path.unlink", autospec=True) as unlink,
     ):
         await client.send_json_auto_id(
-            {"type": "backup/delete", "backup_id": TEST_BACKUP_ABC123.backup_id}
+            {"type": "backup/delete", "backup_id": backup_id}
         )
         assert await client.receive_json() == snapshot
 
     assert unlink.call_count == unlink_calls
+    for call in unlink.mock_calls:
+        assert call.args[0] == unlink_path
diff --git a/tests/components/backup/test_diagnostics.py b/tests/components/backup/test_diagnostics.py
new file mode 100644
index 00000000000..a66b4a9a2ea
--- /dev/null
+++ b/tests/components/backup/test_diagnostics.py
@@ -0,0 +1,26 @@
+"""Tests the diagnostics for Home Assistant Backup integration."""
+
+from syrupy import SnapshotAssertion
+
+from homeassistant.components.backup.const import DOMAIN
+from homeassistant.core import HomeAssistant
+
+from .common import setup_backup_integration
+
+from tests.components.diagnostics import get_diagnostics_for_config_entry
+from tests.typing import ClientSessionGenerator
+
+
+async def test_diagnostics(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test diagnostics."""
+    await setup_backup_integration(hass, with_hassio=False)
+    await hass.async_block_till_done(wait_background_tasks=True)
+
+    entry = hass.config_entries.async_entries(DOMAIN)[0]
+    diag_data = await get_diagnostics_for_config_entry(hass, hass_client, entry)
+
+    assert diag_data == snapshot
diff --git a/tests/components/backup/test_http.py b/tests/components/backup/test_http.py
index b7b86cc1d45..92bf454095e 100644
--- a/tests/components/backup/test_http.py
+++ b/tests/components/backup/test_http.py
@@ -1,7 +1,7 @@
 """Tests for the Backup integration."""
 
 import asyncio
-from collections.abc import AsyncIterator, Iterable
+from collections.abc import AsyncIterator
 from io import BytesIO, StringIO
 import json
 import tarfile
@@ -11,15 +11,35 @@ from unittest.mock import patch
 from aiohttp import web
 import pytest
 
-from homeassistant.components.backup import AddonInfo, AgentBackup, Folder
-from homeassistant.components.backup.const import DATA_MANAGER, DOMAIN
+from homeassistant.components.backup import (
+    AddonInfo,
+    AgentBackup,
+    BackupAgentError,
+    BackupNotFound,
+    Folder,
+)
+from homeassistant.components.backup.const import DOMAIN
 from homeassistant.core import HomeAssistant
 
-from .common import TEST_BACKUP_ABC123, BackupAgentTest, setup_backup_integration
+from .common import TEST_BACKUP_ABC123, aiter_from_iter, setup_backup_integration
 
 from tests.common import MockUser, get_fixture_path
 from tests.typing import ClientSessionGenerator
 
+PROTECTED_BACKUP = AgentBackup(
+    addons=[AddonInfo(name="Test", slug="test", version="1.0.0")],
+    backup_id="c0cb53bd",
+    database_included=True,
+    date="1970-01-01T00:00:00Z",
+    extra_metadata={},
+    folders=[Folder.MEDIA, Folder.SHARE],
+    homeassistant_included=True,
+    homeassistant_version="2024.12.0",
+    name="Test",
+    protected=True,
+    size=13,
+)
+
 
 async def test_downloading_local_backup(
     hass: HomeAssistant,
@@ -35,6 +55,9 @@ async def test_downloading_local_backup(
             "homeassistant.components.backup.backup.CoreLocalBackupAgent.async_get_backup",
             return_value=TEST_BACKUP_ABC123,
         ),
+        patch(
+            "homeassistant.components.backup.backup.CoreLocalBackupAgent.get_backup_path",
+        ),
         patch("pathlib.Path.exists", return_value=True),
         patch(
             "homeassistant.components.backup.http.FileResponse",
@@ -50,19 +73,16 @@ async def test_downloading_remote_backup(
     hass_client: ClientSessionGenerator,
 ) -> None:
     """Test downloading a remote backup."""
+
     await setup_backup_integration(
-        hass, backups={"test.test": [TEST_BACKUP_ABC123]}, remote_agents=["test"]
+        hass, backups={"test.test": [TEST_BACKUP_ABC123]}, remote_agents=["test.test"]
     )
 
     client = await hass_client()
 
-    with (
-        patch.object(BackupAgentTest, "async_download_backup") as download_mock,
-    ):
-        download_mock.return_value.__aiter__.return_value = iter((b"backup data",))
-        resp = await client.get("/api/backup/download/abc123?agent_id=test.test")
-        assert resp.status == 200
-        assert await resp.content.read() == b"backup data"
+    resp = await client.get("/api/backup/download/abc123?agent_id=test.test")
+    assert resp.status == 200
+    assert await resp.content.read() == b"backup data"
 
 
 async def test_downloading_local_encrypted_backup_file_not_found(
@@ -73,9 +93,14 @@ async def test_downloading_local_encrypted_backup_file_not_found(
     await setup_backup_integration(hass)
     client = await hass_client()
 
-    with patch(
-        "homeassistant.components.backup.backup.CoreLocalBackupAgent.async_get_backup",
-        return_value=TEST_BACKUP_ABC123,
+    with (
+        patch(
+            "homeassistant.components.backup.backup.CoreLocalBackupAgent.async_get_backup",
+            return_value=TEST_BACKUP_ABC123,
+        ),
+        patch(
+            "homeassistant.components.backup.backup.CoreLocalBackupAgent.get_backup_path",
+        ),
     ):
         resp = await client.get(
             "/api/backup/download/abc123?agent_id=backup.local&password=blah"
@@ -93,45 +118,47 @@ async def test_downloading_local_encrypted_backup(
     await _test_downloading_encrypted_backup(hass_client, "backup.local")
 
 
-async def aiter_from_iter(iterable: Iterable) -> AsyncIterator:
-    """Convert an iterable to an async iterator."""
-    for i in iterable:
-        yield i
-
-
-@patch.object(BackupAgentTest, "async_download_backup")
 async def test_downloading_remote_encrypted_backup(
-    download_mock,
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
 ) -> None:
     """Test downloading a local backup file."""
     backup_path = get_fixture_path("test_backups/c0cb53bd.tar", DOMAIN)
-    await setup_backup_integration(hass)
-    hass.data[DATA_MANAGER].backup_agents["domain.test"] = BackupAgentTest(
-        "test",
-        [
-            AgentBackup(
-                addons=[AddonInfo(name="Test", slug="test", version="1.0.0")],
-                backup_id="c0cb53bd",
-                database_included=True,
-                date="1970-01-01T00:00:00Z",
-                extra_metadata={},
-                folders=[Folder.MEDIA, Folder.SHARE],
-                homeassistant_included=True,
-                homeassistant_version="2024.12.0",
-                name="Test",
-                protected=True,
-                size=13,
-            )
-        ],
+    mock_agents = await setup_backup_integration(
+        hass, remote_agents=["test.test"], backups={"test.test": [PROTECTED_BACKUP]}
     )
 
     async def download_backup(backup_id: str, **kwargs: Any) -> AsyncIterator[bytes]:
         return aiter_from_iter((backup_path.read_bytes(),))
 
-    download_mock.side_effect = download_backup
-    await _test_downloading_encrypted_backup(hass_client, "domain.test")
+    mock_agents["test.test"].async_download_backup.side_effect = download_backup
+    await _test_downloading_encrypted_backup(hass_client, "test.test")
+
+
+@pytest.mark.parametrize(
+    ("error", "status"),
+    [
+        (BackupAgentError, 500),
+        (BackupNotFound, 404),
+    ],
+)
+async def test_downloading_remote_encrypted_backup_with_error(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    error: Exception,
+    status: int,
+) -> None:
+    """Test downloading a local backup file."""
+    mock_agents = await setup_backup_integration(
+        hass, remote_agents=["test.test"], backups={"test.test": [PROTECTED_BACKUP]}
+    )
+
+    mock_agents["test.test"].async_download_backup.side_effect = error
+    client = await hass_client()
+    resp = await client.get(
+        f"/api/backup/download/{PROTECTED_BACKUP.backup_id}?agent_id=test.test&password=blah"
+    )
+    assert resp.status == status
 
 
 async def _test_downloading_encrypted_backup(
@@ -207,6 +234,26 @@ async def test_downloading_backup_not_found(
     assert resp.status == 404
 
 
+async def test_downloading_backup_not_found_get_backup_returns_none(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test downloading a backup file that does not exist."""
+    mock_agents = await setup_backup_integration(hass, remote_agents=["test.test"])
+    mock_agents["test.test"].async_get_backup.return_value = None
+    mock_agents["test.test"].async_get_backup.side_effect = None
+
+    client = await hass_client()
+
+    resp = await client.get("/api/backup/download/abc123?agent_id=test.test")
+    assert resp.status == 404
+    assert (
+        "Detected that integration 'test' returns None from BackupAgent.async_get_backup."
+        in caplog.text
+    )
+
+
 async def test_downloading_as_non_admin(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
@@ -233,12 +280,14 @@ async def test_uploading_a_backup_file(
 
     with patch(
         "homeassistant.components.backup.manager.BackupManager.async_receive_backup",
+        return_value=TEST_BACKUP_ABC123.backup_id,
     ) as async_receive_backup_mock:
         resp = await client.post(
             "/api/backup/upload?agent_id=backup.local",
             data={"file": StringIO("test")},
         )
         assert resp.status == 201
+        assert await resp.json() == {"backup_id": TEST_BACKUP_ABC123.backup_id}
         assert async_receive_backup_mock.called
 
 
diff --git a/tests/components/backup/test_init.py b/tests/components/backup/test_init.py
index 925e2cb9b7a..10bd2d8b97a 100644
--- a/tests/components/backup/test_init.py
+++ b/tests/components/backup/test_init.py
@@ -6,11 +6,13 @@ from unittest.mock import patch
 import pytest
 
 from homeassistant.components.backup.const import DATA_MANAGER, DOMAIN
+from homeassistant.config_entries import SOURCE_SYSTEM, ConfigEntryState
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceNotFound
 
 from .common import setup_backup_integration
 
+from tests.common import MockConfigEntry
 from tests.typing import WebSocketGenerator
 
 
@@ -20,11 +22,7 @@ async def test_setup_with_hassio(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test the setup of the integration with hassio enabled."""
-    assert await setup_backup_integration(
-        hass=hass,
-        with_hassio=True,
-        configuration={DOMAIN: {}},
-    )
+    await setup_backup_integration(hass=hass, with_hassio=True)
     manager = hass.data[DATA_MANAGER]
     assert not manager.backup_agents
 
@@ -59,6 +57,7 @@ async def test_create_service(
     )
 
 
+@pytest.mark.usefixtures("supervisor_client")
 async def test_create_service_with_hassio(hass: HomeAssistant) -> None:
     """Test action backup.create does not exist with hassio."""
     await setup_backup_integration(hass, with_hassio=True)
@@ -144,3 +143,17 @@ async def test_create_automatic_service(
         )
 
     generate_backup.assert_called_once_with(**expected_kwargs)
+
+
+async def test_setup_entry(
+    hass: HomeAssistant,
+) -> None:
+    """Test setup backup config entry."""
+    await setup_backup_integration(hass, with_hassio=False)
+    entry = MockConfigEntry(domain=DOMAIN, source=SOURCE_SYSTEM)
+    entry.add_to_hass(hass)
+
+    with patch("homeassistant.components.backup.PLATFORMS", return_value=[]):
+        assert await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+    assert entry.state is ConfigEntryState.LOADED
diff --git a/tests/components/backup/test_manager.py b/tests/components/backup/test_manager.py
index c961230e9e6..04072dae864 100644
--- a/tests/components/backup/test_manager.py
+++ b/tests/components/backup/test_manager.py
@@ -3,11 +3,12 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Generator
+from collections.abc import Callable, Generator
 from dataclasses import replace
 from io import StringIO
 import json
 from pathlib import Path
+import re
 import tarfile
 from typing import Any
 from unittest.mock import (
@@ -21,21 +22,21 @@ from unittest.mock import (
     patch,
 )
 
+from freezegun.api import FrozenDateTimeFactory
 import pytest
 
 from homeassistant.components.backup import (
     DOMAIN,
     AgentBackup,
-    BackupAgentPlatformProtocol,
     BackupReaderWriterError,
     Folder,
     LocalBackupAgent,
-    backup as local_backup_platform,
 )
 from homeassistant.components.backup.agent import BackupAgentError
 from homeassistant.components.backup.const import DATA_MANAGER
 from homeassistant.components.backup.manager import (
     BackupManagerError,
+    BackupManagerExceptionGroup,
     BackupManagerState,
     CreateBackupStage,
     CreateBackupState,
@@ -45,16 +46,20 @@ from homeassistant.components.backup.manager import (
     RestoreBackupState,
     WrittenBackup,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.components.backup.util import password_to_key
+from homeassistant.const import EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STARTED
+from homeassistant.core import CoreState, HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import issue_registry as ir
-from homeassistant.setup import async_setup_component
 
 from .common import (
     LOCAL_AGENT_ID,
     TEST_BACKUP_ABC123,
     TEST_BACKUP_DEF456,
-    BackupAgentTest,
+    TEST_BACKUP_PATH_ABC123,
+    TEST_BACKUP_PATH_DEF456,
+    mock_backup_agent,
+    setup_backup_integration,
     setup_backup_platform,
 )
 
@@ -63,10 +68,17 @@ from tests.typing import ClientSessionGenerator, WebSocketGenerator
 _EXPECTED_FILES = [
     "test.txt",
     ".storage",
+    "another_subdir",
+    "another_subdir/backups",
+    "another_subdir/backups/backup.tar",
+    "another_subdir/backups/not_backup",
+    "another_subdir/tts",
+    "another_subdir/tts/voice.mp3",
     "backups",
     "backups/not_backup",
     "tmp_backups",
     "tmp_backups/not_backup",
+    "tts",
 ]
 _EXPECTED_FILES_WITH_DATABASE = {
     True: [*_EXPECTED_FILES, "home-assistant_v2.db"],
@@ -89,16 +101,24 @@ def generate_backup_id_fixture() -> Generator[MagicMock]:
         yield mock
 
 
+def mock_read_backup(backup_path: Path) -> AgentBackup:
+    """Mock read backup."""
+    mock_backups = {
+        "abc123": TEST_BACKUP_ABC123,
+        "custom_def456": TEST_BACKUP_DEF456,
+    }
+    return mock_backups[backup_path.stem]
+
+
 @pytest.mark.usefixtures("mock_backup_generation")
-async def test_async_create_backup(
+async def test_create_backup_service(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
     mocked_json_bytes: Mock,
     mocked_tarfile: Mock,
 ) -> None:
-    """Test create backup."""
-    assert await async_setup_component(hass, DOMAIN, {})
-    await hass.async_block_till_done()
+    """Test create backup service."""
+    await setup_backup_integration(hass)
 
     new_backup = NewBackup(backup_job_id="time-123")
     backup_task = AsyncMock(
@@ -124,7 +144,7 @@ async def test_async_create_backup(
         agent_ids=["backup.local"],
         backup_name="Custom backup 2025.1.0",
         extra_metadata={
-            "instance_id": hass.data["core.uuid"],
+            "instance_id": "our_uuid",
             "with_automatic_settings": False,
         },
         include_addons=None,
@@ -137,14 +157,192 @@ async def test_async_create_backup(
     )
 
 
+@pytest.mark.usefixtures("mock_backup_generation")
+@pytest.mark.parametrize(
+    ("manager_kwargs", "expected_writer_kwargs"),
+    [
+        (
+            {
+                "agent_ids": ["backup.local"],
+                "include_addons": None,
+                "include_all_addons": False,
+                "include_database": True,
+                "include_folders": None,
+                "include_homeassistant": True,
+                "name": None,
+                "password": None,
+            },
+            {
+                "agent_ids": ["backup.local"],
+                "backup_name": "Custom backup 2025.1.0",
+                "extra_metadata": {
+                    "instance_id": ANY,
+                    "with_automatic_settings": False,
+                },
+                "include_addons": None,
+                "include_all_addons": False,
+                "include_database": True,
+                "include_folders": None,
+                "include_homeassistant": True,
+                "on_progress": ANY,
+                "password": None,
+            },
+        ),
+        (
+            {
+                "agent_ids": ["backup.local"],
+                "include_addons": None,
+                "include_all_addons": False,
+                "include_database": True,
+                "include_folders": None,
+                "include_homeassistant": True,
+                "name": None,
+                "password": None,
+                "with_automatic_settings": True,
+            },
+            {
+                "agent_ids": ["backup.local"],
+                "backup_name": "Automatic backup 2025.1.0",
+                "extra_metadata": {
+                    "instance_id": ANY,
+                    "with_automatic_settings": True,
+                },
+                "include_addons": None,
+                "include_all_addons": False,
+                "include_database": True,
+                "include_folders": None,
+                "include_homeassistant": True,
+                "on_progress": ANY,
+                "password": None,
+            },
+        ),
+        (
+            {
+                "agent_ids": ["backup.local"],
+                "extra_metadata": {"custom": "data"},
+                "include_addons": None,
+                "include_all_addons": False,
+                "include_database": True,
+                "include_folders": None,
+                "include_homeassistant": True,
+                "name": None,
+                "password": None,
+            },
+            {
+                "agent_ids": ["backup.local"],
+                "backup_name": "Custom backup 2025.1.0",
+                "extra_metadata": {
+                    "custom": "data",
+                    "instance_id": ANY,
+                    "with_automatic_settings": False,
+                },
+                "include_addons": None,
+                "include_all_addons": False,
+                "include_database": True,
+                "include_folders": None,
+                "include_homeassistant": True,
+                "on_progress": ANY,
+                "password": None,
+            },
+        ),
+        (
+            {
+                "agent_ids": ["backup.local"],
+                "extra_metadata": {"custom": "data"},
+                "include_addons": None,
+                "include_all_addons": False,
+                "include_database": True,
+                "include_folders": None,
+                "include_homeassistant": True,
+                "name": "user defined name",
+                "password": None,
+            },
+            {
+                "agent_ids": ["backup.local"],
+                "backup_name": "user defined name",
+                "extra_metadata": {
+                    "custom": "data",
+                    "instance_id": ANY,
+                    "with_automatic_settings": False,
+                },
+                "include_addons": None,
+                "include_all_addons": False,
+                "include_database": True,
+                "include_folders": None,
+                "include_homeassistant": True,
+                "on_progress": ANY,
+                "password": None,
+            },
+        ),
+        (
+            {
+                "agent_ids": ["backup.local"],
+                "extra_metadata": {"custom": "data"},
+                "include_addons": None,
+                "include_all_addons": False,
+                "include_database": True,
+                "include_folders": None,
+                "include_homeassistant": True,
+                "name": "  ",  # Name which is just whitespace
+                "password": None,
+            },
+            {
+                "agent_ids": ["backup.local"],
+                "backup_name": "Custom backup 2025.1.0",
+                "extra_metadata": {
+                    "custom": "data",
+                    "instance_id": ANY,
+                    "with_automatic_settings": False,
+                },
+                "include_addons": None,
+                "include_all_addons": False,
+                "include_database": True,
+                "include_folders": None,
+                "include_homeassistant": True,
+                "on_progress": ANY,
+                "password": None,
+            },
+        ),
+    ],
+)
+async def test_async_create_backup(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    mocked_json_bytes: Mock,
+    mocked_tarfile: Mock,
+    manager_kwargs: dict[str, Any],
+    expected_writer_kwargs: dict[str, Any],
+) -> None:
+    """Test create backup."""
+    await setup_backup_integration(hass)
+    manager = hass.data[DATA_MANAGER]
+
+    new_backup = NewBackup(backup_job_id="time-123")
+    backup_task = AsyncMock(
+        return_value=WrittenBackup(
+            backup=TEST_BACKUP_ABC123,
+            open_stream=AsyncMock(),
+            release_stream=AsyncMock(),
+        ),
+    )()  # call it so that it can be awaited
+
+    with patch(
+        "homeassistant.components.backup.manager.CoreBackupReaderWriter.async_create_backup",
+        return_value=(new_backup, backup_task),
+    ) as create_backup:
+        await manager.async_create_backup(**manager_kwargs)
+
+    assert create_backup.called
+    assert create_backup.call_args == call(**expected_writer_kwargs)
+
+
 @pytest.mark.usefixtures("mock_backup_generation")
 async def test_create_backup_when_busy(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
 ) -> None:
     """Test generate backup with busy manager."""
-    assert await async_setup_component(hass, DOMAIN, {})
-    await hass.async_block_till_done()
+    await setup_backup_integration(hass)
     ws_client = await hass_ws_client(hass)
 
     await ws_client.send_json_auto_id(
@@ -167,8 +365,14 @@ async def test_create_backup_when_busy(
 @pytest.mark.parametrize(
     ("parameters", "expected_error"),
     [
-        ({"agent_ids": []}, "At least one agent must be selected"),
-        ({"agent_ids": ["non_existing"]}, "Invalid agents selected: ['non_existing']"),
+        (
+            {"agent_ids": []},
+            "At least one available backup agent must be selected, got []",
+        ),
+        (
+            {"agent_ids": ["non_existing"]},
+            "At least one available backup agent must be selected, got ['non_existing']",
+        ),
         (
             {"include_addons": ["ssl"], "include_all_addons": True},
             "Cannot include all addons and specify specific addons",
@@ -186,8 +390,7 @@ async def test_create_backup_wrong_parameters(
     expected_error: str,
 ) -> None:
     """Test create backup with wrong parameters."""
-    assert await async_setup_component(hass, DOMAIN, {})
-    await hass.async_block_till_done()
+    await setup_backup_integration(hass)
 
     ws_client = await hass_ws_client(hass)
 
@@ -212,18 +415,95 @@ async def test_create_backup_wrong_parameters(
 
 @pytest.mark.usefixtures("mock_backup_generation")
 @pytest.mark.parametrize(
-    ("agent_ids", "backup_directory", "temp_file_unlink_call_count"),
+    (
+        "agent_ids",
+        "backup_directory",
+        "name",
+        "expected_name",
+        "expected_filename",
+        "expected_agent_ids",
+        "expected_failed_agent_ids",
+        "temp_file_unlink_call_count",
+    ),
     [
-        ([LOCAL_AGENT_ID], "backups", 0),
-        (["test.remote"], "tmp_backups", 1),
-        ([LOCAL_AGENT_ID, "test.remote"], "backups", 0),
+        (
+            [LOCAL_AGENT_ID],
+            "backups",
+            None,
+            "Custom backup 2025.1.0",
+            "Custom_backup_2025.1.0_2025-01-30_05.42_12345678.tar",
+            [LOCAL_AGENT_ID],
+            [],
+            0,
+        ),
+        (
+            ["test.remote"],
+            "tmp_backups",
+            None,
+            "Custom backup 2025.1.0",
+            "abc123.tar",  # We don't use friendly name for temporary backups
+            ["test.remote"],
+            [],
+            1,
+        ),
+        (
+            [LOCAL_AGENT_ID, "test.remote"],
+            "backups",
+            None,
+            "Custom backup 2025.1.0",
+            "Custom_backup_2025.1.0_2025-01-30_05.42_12345678.tar",
+            [LOCAL_AGENT_ID, "test.remote"],
+            [],
+            0,
+        ),
+        (
+            [LOCAL_AGENT_ID],
+            "backups",
+            "custom_name",
+            "custom_name",
+            "custom_name_2025-01-30_05.42_12345678.tar",
+            [LOCAL_AGENT_ID],
+            [],
+            0,
+        ),
+        (
+            ["test.remote"],
+            "tmp_backups",
+            "custom_name",
+            "custom_name",
+            "abc123.tar",  # We don't use friendly name for temporary backups
+            ["test.remote"],
+            [],
+            1,
+        ),
+        (
+            [LOCAL_AGENT_ID, "test.remote"],
+            "backups",
+            "custom_name",
+            "custom_name",
+            "custom_name_2025-01-30_05.42_12345678.tar",
+            [LOCAL_AGENT_ID, "test.remote"],
+            [],
+            0,
+        ),
+        (
+            # Test we create a backup when at least one agent is available
+            [LOCAL_AGENT_ID, "test.unavailable"],
+            "backups",
+            "custom_name",
+            "custom_name",
+            "custom_name_2025-01-30_05.42_12345678.tar",
+            [LOCAL_AGENT_ID],
+            ["test.unavailable"],
+            0,
+        ),
     ],
 )
 @pytest.mark.parametrize(
     "params",
     [
         {},
-        {"include_database": True, "name": "abc123"},
+        {"include_database": True},
         {"include_database": False},
         {"password": "pass123"},
     ],
@@ -231,6 +511,7 @@ async def test_create_backup_wrong_parameters(
 async def test_initiate_backup(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
+    freezer: FrozenDateTimeFactory,
     mocked_json_bytes: Mock,
     mocked_tarfile: Mock,
     generate_backup_id: MagicMock,
@@ -238,31 +519,20 @@ async def test_initiate_backup(
     params: dict[str, Any],
     agent_ids: list[str],
     backup_directory: str,
+    name: str | None,
+    expected_name: str,
+    expected_filename: str,
+    expected_agent_ids: list[str],
+    expected_failed_agent_ids: list[str],
     temp_file_unlink_call_count: int,
 ) -> None:
     """Test generate backup."""
-    local_agent = local_backup_platform.CoreLocalBackupAgent(hass)
-    remote_agent = BackupAgentTest("remote", backups=[])
-
-    with patch(
-        "homeassistant.components.backup.backup.async_get_backup_agents"
-    ) as core_get_backup_agents:
-        core_get_backup_agents.return_value = [local_agent]
-        await async_setup_component(hass, DOMAIN, {})
-        await hass.async_block_till_done()
-        await setup_backup_platform(
-            hass,
-            domain="test",
-            platform=Mock(
-                async_get_backup_agents=AsyncMock(return_value=[remote_agent]),
-                spec_set=BackupAgentPlatformProtocol,
-            ),
-        )
+    await setup_backup_integration(hass, remote_agents=["test.remote"])
 
     ws_client = await hass_ws_client(hass)
+    freezer.move_to("2025-01-30 13:42:12.345678")
 
     include_database = params.get("include_database", True)
-    name = params.get("name", "Custom backup 2025.1.0")
     password = params.get("password")
     path_glob.return_value = []
 
@@ -275,8 +545,10 @@ async def test_initiate_backup(
         "agent_errors": {},
         "last_attempted_automatic_backup": None,
         "last_completed_automatic_backup": None,
+        "last_action_event": None,
         "next_automatic_backup": None,
         "next_automatic_backup_additional": False,
+        "state": "idle",
     }
 
     await ws_client.send_json_auto_id({"type": "backup/subscribe_events"})
@@ -292,11 +564,12 @@ async def test_initiate_backup(
         patch("pathlib.Path.unlink") as unlink_mock,
     ):
         await ws_client.send_json_auto_id(
-            {"type": "backup/generate", "agent_ids": agent_ids} | params
+            {"type": "backup/generate", "agent_ids": agent_ids, "name": name} | params
         )
         result = await ws_client.receive_json()
         assert result["event"] == {
             "manager_state": BackupManagerState.CREATE_BACKUP,
+            "reason": None,
             "stage": None,
             "state": CreateBackupState.IN_PROGRESS,
         }
@@ -311,6 +584,7 @@ async def test_initiate_backup(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.CREATE_BACKUP,
+        "reason": None,
         "stage": CreateBackupStage.HOME_ASSISTANT,
         "state": CreateBackupState.IN_PROGRESS,
     }
@@ -318,6 +592,7 @@ async def test_initiate_backup(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.CREATE_BACKUP,
+        "reason": None,
         "stage": CreateBackupStage.UPLOAD_TO_AGENTS,
         "state": CreateBackupState.IN_PROGRESS,
     }
@@ -325,6 +600,7 @@ async def test_initiate_backup(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.CREATE_BACKUP,
+        "reason": None,
         "stage": None,
         "state": CreateBackupState.COMPLETED,
     }
@@ -341,14 +617,14 @@ async def test_initiate_backup(
         "compressed": True,
         "date": ANY,
         "extra": {
-            "instance_id": hass.data["core.uuid"],
+            "instance_id": "our_uuid",
             "with_automatic_settings": False,
         },
         "homeassistant": {
             "exclude_database": not include_database,
             "version": "2025.1.0",
         },
-        "name": name,
+        "name": expected_name,
         "protected": bool(password),
         "slug": backup_id,
         "type": "partial",
@@ -361,21 +637,22 @@ async def test_initiate_backup(
     result = await ws_client.receive_json()
 
     backup_data = result["result"]["backup"]
-    backup_agent_ids = backup_data.pop("agent_ids")
 
-    assert backup_agent_ids == agent_ids
     assert backup_data == {
         "addons": [],
+        "agents": {
+            agent_id: {"protected": bool(password), "size": ANY}
+            for agent_id in expected_agent_ids
+        },
         "backup_id": backup_id,
         "database_included": include_database,
         "date": ANY,
-        "failed_agent_ids": [],
+        "extra_metadata": {"instance_id": "our_uuid", "with_automatic_settings": False},
+        "failed_agent_ids": expected_failed_agent_ids,
         "folders": [],
         "homeassistant_included": True,
         "homeassistant_version": "2025.1.0",
-        "name": name,
-        "protected": bool(password),
-        "size": ANY,
+        "name": expected_name,
         "with_automatic_settings": False,
     }
 
@@ -389,7 +666,7 @@ async def test_initiate_backup(
 
     tar_file_path = str(mocked_tarfile.call_args_list[0][0][0])
     backup_directory = hass.config.path(backup_directory)
-    assert tar_file_path == f"{backup_directory}/{backup_id}.tar"
+    assert tar_file_path == f"{backup_directory}/{expected_filename}"
 
 
 @pytest.mark.usefixtures("mock_backup_generation")
@@ -404,7 +681,6 @@ async def test_initiate_backup_with_agent_error(
 ) -> None:
     """Test agent upload error during backup generation."""
     agent_ids = [LOCAL_AGENT_ID, "test.remote"]
-    local_agent = local_backup_platform.CoreLocalBackupAgent(hass)
     backup_1 = replace(TEST_BACKUP_ABC123, backup_id="backup1")  # matching instance id
     backup_2 = replace(TEST_BACKUP_DEF456, backup_id="backup2")  # other instance id
     backup_3 = replace(TEST_BACKUP_ABC123, backup_id="backup3")  # matching instance id
@@ -417,12 +693,14 @@ async def test_initiate_backup_with_agent_error(
                     "version": "1.0.0",
                 },
             ],
-            "agent_ids": [
-                "test.remote",
-            ],
+            "agents": {"test.remote": {"protected": False, "size": 0}},
             "backup_id": "backup1",
             "database_included": True,
             "date": "1970-01-01T00:00:00.000Z",
+            "extra_metadata": {
+                "instance_id": "our_uuid",
+                "with_automatic_settings": True,
+            },
             "failed_agent_ids": [],
             "folders": [
                 "media",
@@ -431,18 +709,18 @@ async def test_initiate_backup_with_agent_error(
             "homeassistant_included": True,
             "homeassistant_version": "2024.12.0",
             "name": "Test",
-            "protected": False,
-            "size": 0,
             "with_automatic_settings": True,
         },
         {
             "addons": [],
-            "agent_ids": [
-                "test.remote",
-            ],
+            "agents": {"test.remote": {"protected": False, "size": 1}},
             "backup_id": "backup2",
             "database_included": False,
             "date": "1980-01-01T00:00:00.000Z",
+            "extra_metadata": {
+                "instance_id": "unknown_uuid",
+                "with_automatic_settings": True,
+            },
             "failed_agent_ids": [],
             "folders": [
                 "media",
@@ -451,8 +729,6 @@ async def test_initiate_backup_with_agent_error(
             "homeassistant_included": True,
             "homeassistant_version": "2024.12.0",
             "name": "Test 2",
-            "protected": False,
-            "size": 1,
             "with_automatic_settings": None,
         },
         {
@@ -463,12 +739,14 @@ async def test_initiate_backup_with_agent_error(
                     "version": "1.0.0",
                 },
             ],
-            "agent_ids": [
-                "test.remote",
-            ],
+            "agents": {"test.remote": {"protected": False, "size": 0}},
             "backup_id": "backup3",
             "database_included": True,
             "date": "1970-01-01T00:00:00.000Z",
+            "extra_metadata": {
+                "instance_id": "our_uuid",
+                "with_automatic_settings": True,
+            },
             "failed_agent_ids": [],
             "folders": [
                 "media",
@@ -477,27 +755,15 @@ async def test_initiate_backup_with_agent_error(
             "homeassistant_included": True,
             "homeassistant_version": "2024.12.0",
             "name": "Test",
-            "protected": False,
-            "size": 0,
             "with_automatic_settings": True,
         },
     ]
-    remote_agent = BackupAgentTest("remote", backups=[backup_1, backup_2, backup_3])
 
-    with patch(
-        "homeassistant.components.backup.backup.async_get_backup_agents"
-    ) as core_get_backup_agents:
-        core_get_backup_agents.return_value = [local_agent]
-        await async_setup_component(hass, DOMAIN, {})
-        await hass.async_block_till_done()
-        await setup_backup_platform(
-            hass,
-            domain="test",
-            platform=Mock(
-                async_get_backup_agents=AsyncMock(return_value=[remote_agent]),
-                spec_set=BackupAgentPlatformProtocol,
-            ),
-        )
+    mock_agents = await setup_backup_integration(
+        hass,
+        remote_agents=["test.remote"],
+        backups={"test.remote": [backup_1, backup_2, backup_3]},
+    )
 
     ws_client = await hass_ws_client(hass)
 
@@ -512,8 +778,10 @@ async def test_initiate_backup_with_agent_error(
         "agent_errors": {},
         "last_attempted_automatic_backup": None,
         "last_completed_automatic_backup": None,
+        "last_action_event": None,
         "next_automatic_backup": None,
         "next_automatic_backup_additional": False,
+        "state": "idle",
     }
 
     await ws_client.send_json_auto_id(
@@ -530,17 +798,8 @@ async def test_initiate_backup_with_agent_error(
     result = await ws_client.receive_json()
     assert result["success"] is True
 
-    delete_backup = AsyncMock()
-
-    with (
-        patch("pathlib.Path.open", mock_open(read_data=b"test")),
-        patch.object(
-            remote_agent,
-            "async_upload_backup",
-            side_effect=exception,
-        ),
-        patch.object(remote_agent, "async_delete_backup", delete_backup),
-    ):
+    mock_agents["test.remote"].async_upload_backup.side_effect = exception
+    with patch("pathlib.Path.open", mock_open(read_data=b"test")):
         await ws_client.send_json_auto_id(
             {"type": "backup/generate", "agent_ids": agent_ids}
         )
@@ -548,6 +807,7 @@ async def test_initiate_backup_with_agent_error(
         assert result["event"] == {
             "manager_state": BackupManagerState.CREATE_BACKUP,
             "stage": None,
+            "reason": None,
             "state": CreateBackupState.IN_PROGRESS,
         }
         result = await ws_client.receive_json()
@@ -561,6 +821,7 @@ async def test_initiate_backup_with_agent_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.CREATE_BACKUP,
+        "reason": None,
         "stage": CreateBackupStage.HOME_ASSISTANT,
         "state": CreateBackupState.IN_PROGRESS,
     }
@@ -568,6 +829,7 @@ async def test_initiate_backup_with_agent_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.CREATE_BACKUP,
+        "reason": None,
         "stage": CreateBackupStage.UPLOAD_TO_AGENTS,
         "state": CreateBackupState.IN_PROGRESS,
     }
@@ -575,6 +837,7 @@ async def test_initiate_backup_with_agent_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.CREATE_BACKUP,
+        "reason": "upload_failed",
         "stage": None,
         "state": CreateBackupState.FAILED,
     }
@@ -584,17 +847,16 @@ async def test_initiate_backup_with_agent_error(
 
     new_expected_backup_data = {
         "addons": [],
-        "agent_ids": ["backup.local"],
+        "agents": {"backup.local": {"protected": False, "size": 123}},
         "backup_id": "abc123",
         "database_included": True,
         "date": ANY,
+        "extra_metadata": {"instance_id": "our_uuid", "with_automatic_settings": False},
         "failed_agent_ids": ["test.remote"],
         "folders": [],
         "homeassistant_included": True,
         "homeassistant_version": "2025.1.0",
         "name": "Custom backup 2025.1.0",
-        "protected": False,
-        "size": 123,
         "with_automatic_settings": False,
     }
 
@@ -608,8 +870,15 @@ async def test_initiate_backup_with_agent_error(
         "agent_errors": {},
         "last_attempted_automatic_backup": None,
         "last_completed_automatic_backup": None,
+        "last_action_event": {
+            "manager_state": "create_backup",
+            "reason": "upload_failed",
+            "stage": None,
+            "state": "failed",
+        },
         "next_automatic_backup": None,
         "next_automatic_backup_additional": False,
+        "state": "idle",
     }
 
     await hass.async_block_till_done()
@@ -621,7 +890,7 @@ async def test_initiate_backup_with_agent_error(
     ]
 
     # one of the two matching backups with the remote agent should have been deleted
-    assert delete_backup.call_count == 1
+    assert mock_agents["test.remote"].async_delete_backup.call_count == 1
 
 
 @pytest.mark.usefixtures("mock_backup_generation")
@@ -645,8 +914,7 @@ async def test_create_backup_success_clears_issue(
     issues_after_create_backup: set[tuple[str, str]],
 ) -> None:
     """Test backup issue is cleared after backup is created."""
-    await async_setup_component(hass, DOMAIN, {})
-    await hass.async_block_till_done()
+    await setup_backup_integration(hass)
 
     # Create a backup issue
     ir.async_create_issue(
@@ -692,15 +960,17 @@ async def delayed_boom(*args, **kwargs) -> tuple[NewBackup, Any]:
 
 @pytest.mark.parametrize(
     (
+        "automatic_agents",
         "create_backup_command",
         "create_backup_side_effect",
-        "agent_upload_side_effect",
+        "upload_side_effect",
         "create_backup_result",
         "issues_after_create_backup",
     ),
     [
         # No error
         (
+            ["test.remote"],
             {"type": "backup/generate", "agent_ids": ["test.remote"]},
             None,
             None,
@@ -708,14 +978,53 @@ async def delayed_boom(*args, **kwargs) -> tuple[NewBackup, Any]:
             {},
         ),
         (
+            ["test.remote"],
             {"type": "backup/generate_with_automatic_settings"},
             None,
             None,
             True,
             {},
         ),
+        # One agent unavailable
+        (
+            ["test.remote", "test.unknown"],
+            {"type": "backup/generate", "agent_ids": ["test.remote", "test.unknown"]},
+            None,
+            None,
+            True,
+            {
+                (DOMAIN, "automatic_backup_agents_unavailable_test.unknown"): {
+                    "translation_key": "automatic_backup_agents_unavailable",
+                    "translation_placeholders": {
+                        "agent_id": "test.unknown",
+                        "backup_settings": "/config/backup/settings",
+                    },
+                },
+            },
+        ),
+        (
+            ["test.remote", "test.unknown"],
+            {"type": "backup/generate_with_automatic_settings"},
+            None,
+            None,
+            True,
+            {
+                (DOMAIN, "automatic_backup_failed"): {
+                    "translation_key": "automatic_backup_failed_upload_agents",
+                    "translation_placeholders": {"failed_agents": "test.unknown"},
+                },
+                (DOMAIN, "automatic_backup_agents_unavailable_test.unknown"): {
+                    "translation_key": "automatic_backup_agents_unavailable",
+                    "translation_placeholders": {
+                        "agent_id": "test.unknown",
+                        "backup_settings": "/config/backup/settings",
+                    },
+                },
+            },
+        ),
         # Error raised in async_initiate_backup
         (
+            ["test.remote"],
             {"type": "backup/generate", "agent_ids": ["test.remote"]},
             Exception("Boom!"),
             None,
@@ -723,6 +1032,7 @@ async def delayed_boom(*args, **kwargs) -> tuple[NewBackup, Any]:
             {},
         ),
         (
+            ["test.remote"],
             {"type": "backup/generate_with_automatic_settings"},
             Exception("Boom!"),
             None,
@@ -736,6 +1046,7 @@ async def delayed_boom(*args, **kwargs) -> tuple[NewBackup, Any]:
         ),
         # Error raised when awaiting the backup task
         (
+            ["test.remote"],
             {"type": "backup/generate", "agent_ids": ["test.remote"]},
             delayed_boom,
             None,
@@ -743,6 +1054,7 @@ async def delayed_boom(*args, **kwargs) -> tuple[NewBackup, Any]:
             {},
         ),
         (
+            ["test.remote"],
             {"type": "backup/generate_with_automatic_settings"},
             delayed_boom,
             None,
@@ -756,6 +1068,7 @@ async def delayed_boom(*args, **kwargs) -> tuple[NewBackup, Any]:
         ),
         # Error raised in async_upload_backup
         (
+            ["test.remote"],
             {"type": "backup/generate", "agent_ids": ["test.remote"]},
             None,
             Exception("Boom!"),
@@ -763,6 +1076,7 @@ async def delayed_boom(*args, **kwargs) -> tuple[NewBackup, Any]:
             {},
         ),
         (
+            ["test.remote"],
             {"type": "backup/generate_with_automatic_settings"},
             None,
             Exception("Boom!"),
@@ -770,7 +1084,7 @@ async def delayed_boom(*args, **kwargs) -> tuple[NewBackup, Any]:
             {
                 (DOMAIN, "automatic_backup_failed"): {
                     "translation_key": "automatic_backup_failed_upload_agents",
-                    "translation_placeholders": {"failed_agents": "test.remote"},
+                    "translation_placeholders": {"failed_agents": "remote"},
                 }
             },
         ),
@@ -780,28 +1094,15 @@ async def test_create_backup_failure_raises_issue(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
     create_backup: AsyncMock,
+    automatic_agents: list[str],
     create_backup_command: dict[str, Any],
     create_backup_side_effect: Exception | None,
-    agent_upload_side_effect: Exception | None,
+    upload_side_effect: Exception | None,
     create_backup_result: bool,
     issues_after_create_backup: dict[tuple[str, str], dict[str, Any]],
 ) -> None:
     """Test backup issue is cleared after backup is created."""
-    remote_agent = BackupAgentTest("remote", backups=[])
-
-    await async_setup_component(hass, DOMAIN, {})
-    await hass.async_block_till_done()
-    await setup_backup_platform(
-        hass,
-        domain="test",
-        platform=Mock(
-            async_get_backup_agents=AsyncMock(return_value=[remote_agent]),
-            spec_set=BackupAgentPlatformProtocol,
-        ),
-    )
-
-    await async_setup_component(hass, DOMAIN, {})
-    await hass.async_block_till_done()
+    mock_agents = await setup_backup_integration(hass, remote_agents=["test.remote"])
 
     ws_client = await hass_ws_client(hass)
 
@@ -810,19 +1111,17 @@ async def test_create_backup_failure_raises_issue(
     await ws_client.send_json_auto_id(
         {
             "type": "backup/config/update",
-            "create_backup": {"agent_ids": ["test.remote"]},
+            "create_backup": {"agent_ids": automatic_agents},
         }
     )
     result = await ws_client.receive_json()
     assert result["success"] is True
 
-    with patch.object(
-        remote_agent, "async_upload_backup", side_effect=agent_upload_side_effect
-    ):
-        await ws_client.send_json_auto_id(create_backup_command)
-        result = await ws_client.receive_json()
-        assert result["success"] == create_backup_result
-        await hass.async_block_till_done()
+    mock_agents["test.remote"].async_upload_backup.side_effect = upload_side_effect
+    await ws_client.send_json_auto_id(create_backup_command)
+    result = await ws_client.receive_json()
+    assert result["success"] == create_backup_result
+    await hass.async_block_till_done()
 
     issue_registry = ir.async_get(hass)
     assert set(issue_registry.issues) == set(issues_after_create_backup)
@@ -846,23 +1145,7 @@ async def test_initiate_backup_non_agent_upload_error(
 ) -> None:
     """Test an unknown or writer upload error during backup generation."""
     agent_ids = [LOCAL_AGENT_ID, "test.remote"]
-    local_agent = local_backup_platform.CoreLocalBackupAgent(hass)
-    remote_agent = BackupAgentTest("remote", backups=[])
-
-    with patch(
-        "homeassistant.components.backup.backup.async_get_backup_agents"
-    ) as core_get_backup_agents:
-        core_get_backup_agents.return_value = [local_agent]
-        await async_setup_component(hass, DOMAIN, {})
-        await hass.async_block_till_done()
-        await setup_backup_platform(
-            hass,
-            domain="test",
-            platform=Mock(
-                async_get_backup_agents=AsyncMock(return_value=[remote_agent]),
-                spec_set=BackupAgentPlatformProtocol,
-            ),
-        )
+    mock_agents = await setup_backup_integration(hass, remote_agents=["test.remote"])
 
     ws_client = await hass_ws_client(hass)
 
@@ -877,8 +1160,10 @@ async def test_initiate_backup_non_agent_upload_error(
         "agent_errors": {},
         "last_attempted_automatic_backup": None,
         "last_completed_automatic_backup": None,
+        "last_action_event": None,
         "next_automatic_backup": None,
         "next_automatic_backup_additional": False,
+        "state": "idle",
     }
 
     await ws_client.send_json_auto_id({"type": "backup/subscribe_events"})
@@ -889,20 +1174,15 @@ async def test_initiate_backup_non_agent_upload_error(
     result = await ws_client.receive_json()
     assert result["success"] is True
 
-    with (
-        patch("pathlib.Path.open", mock_open(read_data=b"test")),
-        patch.object(
-            remote_agent,
-            "async_upload_backup",
-            side_effect=exception,
-        ),
-    ):
+    mock_agents["test.remote"].async_upload_backup.side_effect = exception
+    with patch("pathlib.Path.open", mock_open(read_data=b"test")):
         await ws_client.send_json_auto_id(
             {"type": "backup/generate", "agent_ids": agent_ids}
         )
         result = await ws_client.receive_json()
         assert result["event"] == {
             "manager_state": BackupManagerState.CREATE_BACKUP,
+            "reason": None,
             "stage": None,
             "state": CreateBackupState.IN_PROGRESS,
         }
@@ -917,6 +1197,7 @@ async def test_initiate_backup_non_agent_upload_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.CREATE_BACKUP,
+        "reason": None,
         "stage": CreateBackupStage.HOME_ASSISTANT,
         "state": CreateBackupState.IN_PROGRESS,
     }
@@ -924,6 +1205,7 @@ async def test_initiate_backup_non_agent_upload_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.CREATE_BACKUP,
+        "reason": None,
         "stage": CreateBackupStage.UPLOAD_TO_AGENTS,
         "state": CreateBackupState.IN_PROGRESS,
     }
@@ -931,6 +1213,7 @@ async def test_initiate_backup_non_agent_upload_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.CREATE_BACKUP,
+        "reason": "upload_failed",
         "stage": None,
         "state": CreateBackupState.FAILED,
     }
@@ -958,23 +1241,8 @@ async def test_initiate_backup_with_task_error(
     backup_task.set_exception(exception)
     create_backup.return_value = (NewBackup(backup_job_id="abc123"), backup_task)
     agent_ids = [LOCAL_AGENT_ID, "test.remote"]
-    local_agent = local_backup_platform.CoreLocalBackupAgent(hass)
-    remote_agent = BackupAgentTest("remote", backups=[])
 
-    with patch(
-        "homeassistant.components.backup.backup.async_get_backup_agents"
-    ) as core_get_backup_agents:
-        core_get_backup_agents.return_value = [local_agent]
-        await async_setup_component(hass, DOMAIN, {})
-        await hass.async_block_till_done()
-        await setup_backup_platform(
-            hass,
-            domain="test",
-            platform=Mock(
-                async_get_backup_agents=AsyncMock(return_value=[remote_agent]),
-                spec_set=BackupAgentPlatformProtocol,
-            ),
-        )
+    await setup_backup_integration(hass, remote_agents=["test.remote"])
 
     ws_client = await hass_ws_client(hass)
 
@@ -989,8 +1257,10 @@ async def test_initiate_backup_with_task_error(
         "agent_errors": {},
         "last_attempted_automatic_backup": None,
         "last_completed_automatic_backup": None,
+        "last_action_event": None,
         "next_automatic_backup": None,
         "next_automatic_backup_additional": False,
+        "state": "idle",
     }
 
     await ws_client.send_json_auto_id({"type": "backup/subscribe_events"})
@@ -1009,6 +1279,7 @@ async def test_initiate_backup_with_task_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.CREATE_BACKUP,
+        "reason": None,
         "stage": None,
         "state": CreateBackupState.IN_PROGRESS,
     }
@@ -1016,6 +1287,7 @@ async def test_initiate_backup_with_task_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.CREATE_BACKUP,
+        "reason": "upload_failed",
         "stage": None,
         "state": CreateBackupState.FAILED,
     }
@@ -1049,7 +1321,7 @@ async def test_initiate_backup_with_task_error(
         (1, None, 1, None, 1, None, 1, OSError("Boom!")),
     ],
 )
-async def test_initiate_backup_file_error(
+async def test_initiate_backup_file_error_upload_to_agents(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
     generate_backup_id: MagicMock,
@@ -1063,24 +1335,10 @@ async def test_initiate_backup_file_error(
     unlink_call_count: int,
     unlink_exception: Exception | None,
 ) -> None:
-    """Test file error during generate backup."""
+    """Test file error during generate backup, while uploading to agents."""
     agent_ids = ["test.remote"]
-    local_agent = local_backup_platform.CoreLocalBackupAgent(hass)
-    remote_agent = BackupAgentTest("remote", backups=[])
-    with patch(
-        "homeassistant.components.backup.backup.async_get_backup_agents"
-    ) as core_get_backup_agents:
-        core_get_backup_agents.return_value = [local_agent]
-        await async_setup_component(hass, DOMAIN, {})
-        await hass.async_block_till_done()
-        await setup_backup_platform(
-            hass,
-            domain="test",
-            platform=Mock(
-                async_get_backup_agents=AsyncMock(return_value=[remote_agent]),
-                spec_set=BackupAgentPlatformProtocol,
-            ),
-        )
+
+    await setup_backup_integration(hass, remote_agents=["test.remote"])
 
     ws_client = await hass_ws_client(hass)
 
@@ -1095,8 +1353,10 @@ async def test_initiate_backup_file_error(
         "agent_errors": {},
         "last_attempted_automatic_backup": None,
         "last_completed_automatic_backup": None,
+        "last_action_event": None,
         "next_automatic_backup": None,
         "next_automatic_backup_additional": False,
+        "state": "idle",
     }
 
     await ws_client.send_json_auto_id({"type": "backup/subscribe_events"})
@@ -1123,6 +1383,7 @@ async def test_initiate_backup_file_error(
         result = await ws_client.receive_json()
         assert result["event"] == {
             "manager_state": BackupManagerState.CREATE_BACKUP,
+            "reason": None,
             "stage": None,
             "state": CreateBackupState.IN_PROGRESS,
         }
@@ -1137,6 +1398,7 @@ async def test_initiate_backup_file_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.CREATE_BACKUP,
+        "reason": None,
         "stage": CreateBackupStage.HOME_ASSISTANT,
         "state": CreateBackupState.IN_PROGRESS,
     }
@@ -1144,6 +1406,7 @@ async def test_initiate_backup_file_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.CREATE_BACKUP,
+        "reason": None,
         "stage": CreateBackupStage.UPLOAD_TO_AGENTS,
         "state": CreateBackupState.IN_PROGRESS,
     }
@@ -1151,6 +1414,7 @@ async def test_initiate_backup_file_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.CREATE_BACKUP,
+        "reason": "upload_failed",
         "stage": None,
         "state": CreateBackupState.FAILED,
     }
@@ -1164,30 +1428,145 @@ async def test_initiate_backup_file_error(
     assert unlink_mock.call_count == unlink_call_count
 
 
-class LocalBackupAgentTest(BackupAgentTest, LocalBackupAgent):
-    """Local backup agent."""
+@pytest.mark.usefixtures("mock_backup_generation")
+@pytest.mark.parametrize(
+    (
+        "mkdir_call_count",
+        "mkdir_exception",
+        "atomic_contents_add_call_count",
+        "atomic_contents_add_exception",
+        "stat_call_count",
+        "stat_exception",
+        "error_message",
+    ),
+    [
+        (1, OSError("Boom!"), 0, None, 0, None, "Failed to create dir"),
+        (1, None, 1, OSError("Boom!"), 0, None, "Boom!"),
+        (1, None, 1, None, 1, OSError("Boom!"), "Error getting size"),
+    ],
+)
+async def test_initiate_backup_file_error_create_backup(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    generate_backup_id: MagicMock,
+    path_glob: MagicMock,
+    caplog: pytest.LogCaptureFixture,
+    mkdir_call_count: int,
+    mkdir_exception: Exception | None,
+    atomic_contents_add_call_count: int,
+    atomic_contents_add_exception: Exception | None,
+    stat_call_count: int,
+    stat_exception: Exception | None,
+    error_message: str,
+) -> None:
+    """Test file error during generate backup, while creating backup."""
+    agent_ids = ["test.remote"]
 
-    def get_backup_path(self, backup_id: str) -> Path:
-        """Return the local path to a backup."""
-        return Path("test.tar")
+    await setup_backup_integration(hass, remote_agents=["test.remote"])
+
+    ws_client = await hass_ws_client(hass)
+
+    path_glob.return_value = []
+
+    await ws_client.send_json_auto_id({"type": "backup/info"})
+    result = await ws_client.receive_json()
+
+    assert result["success"] is True
+    assert result["result"] == {
+        "backups": [],
+        "agent_errors": {},
+        "last_attempted_automatic_backup": None,
+        "last_completed_automatic_backup": None,
+        "last_action_event": None,
+        "next_automatic_backup": None,
+        "next_automatic_backup_additional": False,
+        "state": "idle",
+    }
+
+    await ws_client.send_json_auto_id({"type": "backup/subscribe_events"})
+
+    result = await ws_client.receive_json()
+    assert result["event"] == {"manager_state": BackupManagerState.IDLE}
+
+    result = await ws_client.receive_json()
+    assert result["success"] is True
+
+    with (
+        patch(
+            "homeassistant.components.backup.manager.atomic_contents_add",
+            side_effect=atomic_contents_add_exception,
+        ) as atomic_contents_add_mock,
+        patch("pathlib.Path.mkdir", side_effect=mkdir_exception) as mkdir_mock,
+        patch("pathlib.Path.stat", side_effect=stat_exception) as stat_mock,
+    ):
+        await ws_client.send_json_auto_id(
+            {"type": "backup/generate", "agent_ids": agent_ids}
+        )
+
+        result = await ws_client.receive_json()
+        assert result["event"] == {
+            "manager_state": BackupManagerState.CREATE_BACKUP,
+            "reason": None,
+            "stage": None,
+            "state": CreateBackupState.IN_PROGRESS,
+        }
+        result = await ws_client.receive_json()
+        assert result["success"] is True
+
+        backup_id = result["result"]["backup_job_id"]
+        assert backup_id == generate_backup_id.return_value
+
+        await hass.async_block_till_done()
+
+    result = await ws_client.receive_json()
+    assert result["event"] == {
+        "manager_state": BackupManagerState.CREATE_BACKUP,
+        "reason": None,
+        "stage": CreateBackupStage.HOME_ASSISTANT,
+        "state": CreateBackupState.IN_PROGRESS,
+    }
+
+    result = await ws_client.receive_json()
+    assert result["event"] == {
+        "manager_state": BackupManagerState.CREATE_BACKUP,
+        "reason": "upload_failed",
+        "stage": None,
+        "state": CreateBackupState.FAILED,
+    }
+
+    result = await ws_client.receive_json()
+    assert result["event"] == {"manager_state": BackupManagerState.IDLE}
+
+    assert atomic_contents_add_mock.call_count == atomic_contents_add_call_count
+    assert mkdir_mock.call_count == mkdir_call_count
+    assert stat_mock.call_count == stat_call_count
+
+    assert error_message in caplog.text
+
+
+def _mock_local_backup_agent(name: str) -> Mock:
+    local_agent = mock_backup_agent(name)
+    # This makes the local_agent pass isinstance checks for LocalBackupAgent
+    local_agent.mock_add_spec(LocalBackupAgent)
+    return local_agent
 
 
 @pytest.mark.parametrize(
-    ("agent_class", "num_local_agents"),
-    [(LocalBackupAgentTest, 2), (BackupAgentTest, 1)],
+    ("agent_creator", "num_local_agents"),
+    [(_mock_local_backup_agent, 2), (mock_backup_agent, 1)],
 )
 async def test_loading_platform_with_listener(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
-    agent_class: type[BackupAgentTest],
+    agent_creator: Callable[[str], Mock],
     num_local_agents: int,
 ) -> None:
     """Test loading a backup agent platform which can be listened to."""
     ws_client = await hass_ws_client(hass)
-    assert await async_setup_component(hass, DOMAIN, {})
+    await setup_backup_integration(hass)
     manager = hass.data[DATA_MANAGER]
 
-    get_agents_mock = AsyncMock(return_value=[agent_class("remote1", backups=[])])
+    get_agents_mock = AsyncMock(return_value=[agent_creator("remote1")])
     register_listener_mock = Mock()
 
     await setup_backup_platform(
@@ -1203,8 +1582,8 @@ async def test_loading_platform_with_listener(
     await ws_client.send_json_auto_id({"type": "backup/agents/info"})
     resp = await ws_client.receive_json()
     assert resp["result"]["agents"] == [
-        {"agent_id": "backup.local"},
-        {"agent_id": "test.remote1"},
+        {"agent_id": "backup.local", "name": "local"},
+        {"agent_id": "test.remote1", "name": "remote1"},
     ]
     assert len(manager.local_backup_agents) == num_local_agents
 
@@ -1212,7 +1591,7 @@ async def test_loading_platform_with_listener(
     register_listener_mock.assert_called_once_with(hass, listener=ANY)
 
     get_agents_mock.reset_mock()
-    get_agents_mock.return_value = [agent_class("remote2", backups=[])]
+    get_agents_mock.return_value = [agent_creator("remote2")]
     listener = register_listener_mock.call_args[1]["listener"]
     listener()
 
@@ -1220,8 +1599,8 @@ async def test_loading_platform_with_listener(
     await ws_client.send_json_auto_id({"type": "backup/agents/info"})
     resp = await ws_client.receive_json()
     assert resp["result"]["agents"] == [
-        {"agent_id": "backup.local"},
-        {"agent_id": "test.remote2"},
+        {"agent_id": "backup.local", "name": "local"},
+        {"agent_id": "test.remote2", "name": "remote2"},
     ]
     assert len(manager.local_backup_agents) == num_local_agents
 
@@ -1244,8 +1623,7 @@ async def test_not_loading_bad_platforms(
         domain="test",
         platform=platform_mock,
     )
-    assert await async_setup_component(hass, DOMAIN, {})
-    await hass.async_block_till_done()
+    await setup_backup_integration(hass)
 
     assert platform_mock.mock_calls == []
 
@@ -1256,7 +1634,7 @@ async def test_exception_platform_pre(hass: HomeAssistant) -> None:
     async def _mock_step(hass: HomeAssistant) -> None:
         raise HomeAssistantError("Test exception")
 
-    remote_agent = BackupAgentTest("remote", backups=[])
+    remote_agent = mock_backup_agent("remote")
     await setup_backup_platform(
         hass,
         domain="test",
@@ -1266,8 +1644,7 @@ async def test_exception_platform_pre(hass: HomeAssistant) -> None:
             async_get_backup_agents=AsyncMock(return_value=[remote_agent]),
         ),
     )
-    assert await async_setup_component(hass, DOMAIN, {})
-    await hass.async_block_till_done()
+    await setup_backup_integration(hass)
 
     with pytest.raises(BackupManagerError) as err:
         await hass.services.async_call(
@@ -1279,35 +1656,60 @@ async def test_exception_platform_pre(hass: HomeAssistant) -> None:
     assert str(err.value) == "Error during pre-backup: Test exception"
 
 
+@pytest.mark.parametrize(
+    ("unhandled_error", "expected_exception", "expected_msg"),
+    [
+        (None, BackupManagerError, "Error during post-backup: Test exception"),
+        (
+            HomeAssistantError("Boom"),
+            BackupManagerExceptionGroup,
+            (
+                "Multiple errors when creating backup: Error during pre-backup: Boom, "
+                "Error during post-backup: Test exception (2 sub-exceptions)"
+            ),
+        ),
+        (
+            Exception("Boom"),
+            BackupManagerExceptionGroup,
+            (
+                "Multiple errors when creating backup: Error during pre-backup: Boom, "
+                "Error during post-backup: Test exception (2 sub-exceptions)"
+            ),
+        ),
+    ],
+)
 @pytest.mark.usefixtures("mock_backup_generation")
-async def test_exception_platform_post(hass: HomeAssistant) -> None:
+async def test_exception_platform_post(
+    hass: HomeAssistant,
+    unhandled_error: Exception | None,
+    expected_exception: type[Exception],
+    expected_msg: str,
+) -> None:
     """Test exception in post step."""
 
-    async def _mock_step(hass: HomeAssistant) -> None:
-        raise HomeAssistantError("Test exception")
-
-    remote_agent = BackupAgentTest("remote", backups=[])
+    remote_agent = mock_backup_agent("remote")
     await setup_backup_platform(
         hass,
         domain="test",
         platform=Mock(
-            async_pre_backup=AsyncMock(),
-            async_post_backup=_mock_step,
+            # We let the pre_backup fail to test that unhandled errors are not discarded
+            # when post backup fails
+            async_pre_backup=AsyncMock(side_effect=unhandled_error),
+            async_post_backup=AsyncMock(
+                side_effect=HomeAssistantError("Test exception")
+            ),
             async_get_backup_agents=AsyncMock(return_value=[remote_agent]),
         ),
     )
-    assert await async_setup_component(hass, DOMAIN, {})
-    await hass.async_block_till_done()
+    await setup_backup_integration(hass)
 
-    with pytest.raises(BackupManagerError) as err:
+    with pytest.raises(expected_exception, match=re.escape(expected_msg)):
         await hass.services.async_call(
             DOMAIN,
             "create",
             blocking=True,
         )
 
-    assert str(err.value) == "Error during post-backup: Test exception"
-
 
 @pytest.mark.parametrize(
     (
@@ -1324,8 +1726,8 @@ async def test_exception_platform_post(hass: HomeAssistant) -> None:
             "agent_id=backup.local&agent_id=test.remote",
             2,
             1,
-            ["abc123.tar"],
-            {TEST_BACKUP_ABC123.backup_id: TEST_BACKUP_ABC123},
+            ["Test_1970-01-01_00.00_00000000.tar"],
+            {TEST_BACKUP_ABC123.backup_id: (TEST_BACKUP_ABC123, b"test")},
             b"test",
             0,
         ),
@@ -1333,7 +1735,7 @@ async def test_exception_platform_post(hass: HomeAssistant) -> None:
             "agent_id=backup.local",
             1,
             1,
-            ["abc123.tar"],
+            ["Test_1970-01-01_00.00_00000000.tar"],
             {},
             None,
             0,
@@ -1343,7 +1745,7 @@ async def test_exception_platform_post(hass: HomeAssistant) -> None:
             2,
             0,
             [],
-            {TEST_BACKUP_ABC123.backup_id: TEST_BACKUP_ABC123},
+            {TEST_BACKUP_ABC123.backup_id: (TEST_BACKUP_ABC123, b"test")},
             b"test",
             1,
         ),
@@ -1361,17 +1763,7 @@ async def test_receive_backup(
     temp_file_unlink_call_count: int,
 ) -> None:
     """Test receive backup and upload to the local and a remote agent."""
-    remote_agent = BackupAgentTest("remote", backups=[])
-    await setup_backup_platform(
-        hass,
-        domain="test",
-        platform=Mock(
-            async_get_backup_agents=AsyncMock(return_value=[remote_agent]),
-            spec_set=BackupAgentPlatformProtocol,
-        ),
-    )
-    assert await async_setup_component(hass, DOMAIN, {})
-    await hass.async_block_till_done()
+    mock_agents = await setup_backup_integration(hass, remote_agents=["test.remote"])
     client = await hass_client()
 
     upload_data = "test"
@@ -1401,8 +1793,13 @@ async def test_receive_backup(
     assert move_mock.call_count == move_call_count
     for index, name in enumerate(move_path_names):
         assert move_mock.call_args_list[index].args[1].name == name
-    assert remote_agent._backups == remote_agent_backups
-    assert remote_agent._backup_data == remote_agent_backup_data
+    remote_agent = mock_agents["test.remote"]
+    for backup_id, (backup, expected_backup_data) in remote_agent_backups.items():
+        assert await remote_agent.async_get_backup(backup_id) == backup
+        backup_data = bytearray()
+        async for chunk in await remote_agent.async_download_backup(backup_id):
+            backup_data += chunk
+        assert backup_data == expected_backup_data
     assert unlink_mock.call_count == temp_file_unlink_call_count
 
 
@@ -1417,8 +1814,7 @@ async def test_receive_backup_busy_manager(
     new_backup = NewBackup(backup_job_id="time-123")
     backup_task: asyncio.Future[WrittenBackup] = asyncio.Future()
     create_backup.return_value = (new_backup, backup_task)
-    assert await async_setup_component(hass, DOMAIN, {})
-    await hass.async_block_till_done()
+    await setup_backup_integration(hass)
     client = await hass_client()
     ws_client = await hass_ws_client(hass)
 
@@ -1437,6 +1833,7 @@ async def test_receive_backup_busy_manager(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": "create_backup",
+        "reason": None,
         "stage": None,
         "state": "in_progress",
     }
@@ -1479,7 +1876,6 @@ async def test_receive_backup_agent_error(
     exception: Exception,
 ) -> None:
     """Test upload error during backup receive."""
-    local_agent = local_backup_platform.CoreLocalBackupAgent(hass)
     backup_1 = replace(TEST_BACKUP_ABC123, backup_id="backup1")  # matching instance id
     backup_2 = replace(TEST_BACKUP_DEF456, backup_id="backup2")  # other instance id
     backup_3 = replace(TEST_BACKUP_ABC123, backup_id="backup3")  # matching instance id
@@ -1492,12 +1888,14 @@ async def test_receive_backup_agent_error(
                     "version": "1.0.0",
                 },
             ],
-            "agent_ids": [
-                "test.remote",
-            ],
+            "agents": {"test.remote": {"protected": False, "size": 0}},
             "backup_id": "backup1",
             "database_included": True,
             "date": "1970-01-01T00:00:00.000Z",
+            "extra_metadata": {
+                "instance_id": "our_uuid",
+                "with_automatic_settings": True,
+            },
             "failed_agent_ids": [],
             "folders": [
                 "media",
@@ -1506,18 +1904,18 @@ async def test_receive_backup_agent_error(
             "homeassistant_included": True,
             "homeassistant_version": "2024.12.0",
             "name": "Test",
-            "protected": False,
-            "size": 0,
             "with_automatic_settings": True,
         },
         {
             "addons": [],
-            "agent_ids": [
-                "test.remote",
-            ],
+            "agents": {"test.remote": {"protected": False, "size": 1}},
             "backup_id": "backup2",
             "database_included": False,
             "date": "1980-01-01T00:00:00.000Z",
+            "extra_metadata": {
+                "instance_id": "unknown_uuid",
+                "with_automatic_settings": True,
+            },
             "failed_agent_ids": [],
             "folders": [
                 "media",
@@ -1526,8 +1924,6 @@ async def test_receive_backup_agent_error(
             "homeassistant_included": True,
             "homeassistant_version": "2024.12.0",
             "name": "Test 2",
-            "protected": False,
-            "size": 1,
             "with_automatic_settings": None,
         },
         {
@@ -1538,12 +1934,14 @@ async def test_receive_backup_agent_error(
                     "version": "1.0.0",
                 },
             ],
-            "agent_ids": [
-                "test.remote",
-            ],
+            "agents": {"test.remote": {"protected": False, "size": 0}},
             "backup_id": "backup3",
             "database_included": True,
             "date": "1970-01-01T00:00:00.000Z",
+            "extra_metadata": {
+                "instance_id": "our_uuid",
+                "with_automatic_settings": True,
+            },
             "failed_agent_ids": [],
             "folders": [
                 "media",
@@ -1552,27 +1950,15 @@ async def test_receive_backup_agent_error(
             "homeassistant_included": True,
             "homeassistant_version": "2024.12.0",
             "name": "Test",
-            "protected": False,
-            "size": 0,
             "with_automatic_settings": True,
         },
     ]
-    remote_agent = BackupAgentTest("remote", backups=[backup_1, backup_2, backup_3])
 
-    with patch(
-        "homeassistant.components.backup.backup.async_get_backup_agents"
-    ) as core_get_backup_agents:
-        core_get_backup_agents.return_value = [local_agent]
-        await async_setup_component(hass, DOMAIN, {})
-        await hass.async_block_till_done()
-        await setup_backup_platform(
-            hass,
-            domain="test",
-            platform=Mock(
-                async_get_backup_agents=AsyncMock(return_value=[remote_agent]),
-                spec_set=BackupAgentPlatformProtocol,
-            ),
-        )
+    mock_agents = await setup_backup_integration(
+        hass,
+        remote_agents=["test.remote"],
+        backups={"test.remote": [backup_1, backup_2, backup_3]},
+    )
 
     client = await hass_client()
     ws_client = await hass_ws_client(hass)
@@ -1588,8 +1974,10 @@ async def test_receive_backup_agent_error(
         "agent_errors": {},
         "last_attempted_automatic_backup": None,
         "last_completed_automatic_backup": None,
+        "last_action_event": None,
         "next_automatic_backup": None,
         "next_automatic_backup_additional": False,
+        "state": "idle",
     }
 
     await ws_client.send_json_auto_id(
@@ -1606,13 +1994,11 @@ async def test_receive_backup_agent_error(
     result = await ws_client.receive_json()
     assert result["success"] is True
 
-    delete_backup = AsyncMock()
     upload_data = "test"
     open_mock = mock_open(read_data=upload_data.encode(encoding="utf-8"))
 
+    mock_agents["test.remote"].async_upload_backup.side_effect = exception
     with (
-        patch.object(remote_agent, "async_delete_backup", delete_backup),
-        patch.object(remote_agent, "async_upload_backup", side_effect=exception),
         patch("pathlib.Path.open", open_mock),
         patch("shutil.move") as move_mock,
         patch(
@@ -1630,6 +2016,7 @@ async def test_receive_backup_agent_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.RECEIVE_BACKUP,
+        "reason": None,
         "stage": None,
         "state": ReceiveBackupState.IN_PROGRESS,
     }
@@ -1637,6 +2024,7 @@ async def test_receive_backup_agent_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.RECEIVE_BACKUP,
+        "reason": None,
         "stage": ReceiveBackupStage.RECEIVE_FILE,
         "state": ReceiveBackupState.IN_PROGRESS,
     }
@@ -1644,6 +2032,7 @@ async def test_receive_backup_agent_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.RECEIVE_BACKUP,
+        "reason": None,
         "stage": ReceiveBackupStage.UPLOAD_TO_AGENTS,
         "state": ReceiveBackupState.IN_PROGRESS,
     }
@@ -1651,6 +2040,7 @@ async def test_receive_backup_agent_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.RECEIVE_BACKUP,
+        "reason": None,
         "stage": None,
         "state": ReceiveBackupState.COMPLETED,
     }
@@ -1667,8 +2057,15 @@ async def test_receive_backup_agent_error(
         "agent_errors": {},
         "last_attempted_automatic_backup": None,
         "last_completed_automatic_backup": None,
+        "last_action_event": {
+            "manager_state": "receive_backup",
+            "reason": None,
+            "stage": None,
+            "state": "completed",
+        },
         "next_automatic_backup": None,
         "next_automatic_backup_additional": False,
+        "state": "idle",
     }
 
     await hass.async_block_till_done()
@@ -1683,7 +2080,7 @@ async def test_receive_backup_agent_error(
     assert open_mock.call_count == 1
     assert move_mock.call_count == 0
     assert unlink_mock.call_count == 1
-    assert delete_backup.call_count == 0
+    assert mock_agents["test.remote"].async_delete_backup.call_count == 0
 
 
 @pytest.mark.usefixtures("mock_backup_generation")
@@ -1697,23 +2094,7 @@ async def test_receive_backup_non_agent_upload_error(
     exception: Exception,
 ) -> None:
     """Test non agent upload error during backup receive."""
-    local_agent = local_backup_platform.CoreLocalBackupAgent(hass)
-    remote_agent = BackupAgentTest("remote", backups=[])
-
-    with patch(
-        "homeassistant.components.backup.backup.async_get_backup_agents"
-    ) as core_get_backup_agents:
-        core_get_backup_agents.return_value = [local_agent]
-        await async_setup_component(hass, DOMAIN, {})
-        await hass.async_block_till_done()
-        await setup_backup_platform(
-            hass,
-            domain="test",
-            platform=Mock(
-                async_get_backup_agents=AsyncMock(return_value=[remote_agent]),
-                spec_set=BackupAgentPlatformProtocol,
-            ),
-        )
+    mock_agents = await setup_backup_integration(hass, remote_agents=["test.remote"])
 
     client = await hass_client()
     ws_client = await hass_ws_client(hass)
@@ -1729,8 +2110,10 @@ async def test_receive_backup_non_agent_upload_error(
         "agent_errors": {},
         "last_attempted_automatic_backup": None,
         "last_completed_automatic_backup": None,
+        "last_action_event": None,
         "next_automatic_backup": None,
         "next_automatic_backup_additional": False,
+        "state": "idle",
     }
 
     await ws_client.send_json_auto_id({"type": "backup/subscribe_events"})
@@ -1744,8 +2127,8 @@ async def test_receive_backup_non_agent_upload_error(
     upload_data = "test"
     open_mock = mock_open(read_data=upload_data.encode(encoding="utf-8"))
 
+    mock_agents["test.remote"].async_upload_backup.side_effect = exception
     with (
-        patch.object(remote_agent, "async_upload_backup", side_effect=exception),
         patch("pathlib.Path.open", open_mock),
         patch("shutil.move") as move_mock,
         patch(
@@ -1763,6 +2146,7 @@ async def test_receive_backup_non_agent_upload_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.RECEIVE_BACKUP,
+        "reason": None,
         "stage": None,
         "state": ReceiveBackupState.IN_PROGRESS,
     }
@@ -1770,6 +2154,7 @@ async def test_receive_backup_non_agent_upload_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.RECEIVE_BACKUP,
+        "reason": None,
         "stage": ReceiveBackupStage.RECEIVE_FILE,
         "state": ReceiveBackupState.IN_PROGRESS,
     }
@@ -1777,6 +2162,7 @@ async def test_receive_backup_non_agent_upload_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.RECEIVE_BACKUP,
+        "reason": None,
         "stage": ReceiveBackupStage.UPLOAD_TO_AGENTS,
         "state": ReceiveBackupState.IN_PROGRESS,
     }
@@ -1820,22 +2206,7 @@ async def test_receive_backup_file_write_error(
     close_exception: Exception | None,
 ) -> None:
     """Test file write error during backup receive."""
-    local_agent = local_backup_platform.CoreLocalBackupAgent(hass)
-    remote_agent = BackupAgentTest("remote", backups=[])
-    with patch(
-        "homeassistant.components.backup.backup.async_get_backup_agents"
-    ) as core_get_backup_agents:
-        core_get_backup_agents.return_value = [local_agent]
-        await async_setup_component(hass, DOMAIN, {})
-        await hass.async_block_till_done()
-        await setup_backup_platform(
-            hass,
-            domain="test",
-            platform=Mock(
-                async_get_backup_agents=AsyncMock(return_value=[remote_agent]),
-                spec_set=BackupAgentPlatformProtocol,
-            ),
-        )
+    await setup_backup_integration(hass, remote_agents=["test.remote"])
 
     client = await hass_client()
     ws_client = await hass_ws_client(hass)
@@ -1851,8 +2222,10 @@ async def test_receive_backup_file_write_error(
         "agent_errors": {},
         "last_attempted_automatic_backup": None,
         "last_completed_automatic_backup": None,
+        "last_action_event": None,
         "next_automatic_backup": None,
         "next_automatic_backup_additional": False,
+        "state": "idle",
     }
 
     await ws_client.send_json_auto_id({"type": "backup/subscribe_events"})
@@ -1871,10 +2244,6 @@ async def test_receive_backup_file_write_error(
 
     with (
         patch("pathlib.Path.open", open_mock),
-        patch(
-            "homeassistant.components.backup.manager.read_backup",
-            return_value=TEST_BACKUP_ABC123,
-        ),
     ):
         resp = await client.post(
             "/api/backup/upload?agent_id=test.remote",
@@ -1885,6 +2254,7 @@ async def test_receive_backup_file_write_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.RECEIVE_BACKUP,
+        "reason": None,
         "stage": None,
         "state": ReceiveBackupState.IN_PROGRESS,
     }
@@ -1892,6 +2262,7 @@ async def test_receive_backup_file_write_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.RECEIVE_BACKUP,
+        "reason": None,
         "stage": ReceiveBackupStage.RECEIVE_FILE,
         "state": ReceiveBackupState.IN_PROGRESS,
     }
@@ -1899,6 +2270,7 @@ async def test_receive_backup_file_write_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.RECEIVE_BACKUP,
+        "reason": "unknown_error",
         "stage": None,
         "state": ReceiveBackupState.FAILED,
     }
@@ -1930,22 +2302,7 @@ async def test_receive_backup_read_tar_error(
     exception: Exception,
 ) -> None:
     """Test read tar error during backup receive."""
-    local_agent = local_backup_platform.CoreLocalBackupAgent(hass)
-    remote_agent = BackupAgentTest("remote", backups=[])
-    with patch(
-        "homeassistant.components.backup.backup.async_get_backup_agents"
-    ) as core_get_backup_agents:
-        core_get_backup_agents.return_value = [local_agent]
-        await async_setup_component(hass, DOMAIN, {})
-        await hass.async_block_till_done()
-        await setup_backup_platform(
-            hass,
-            domain="test",
-            platform=Mock(
-                async_get_backup_agents=AsyncMock(return_value=[remote_agent]),
-                spec_set=BackupAgentPlatformProtocol,
-            ),
-        )
+    await setup_backup_integration(hass, remote_agents=["test.remote"])
 
     client = await hass_client()
     ws_client = await hass_ws_client(hass)
@@ -1961,8 +2318,10 @@ async def test_receive_backup_read_tar_error(
         "agent_errors": {},
         "last_attempted_automatic_backup": None,
         "last_completed_automatic_backup": None,
+        "last_action_event": None,
         "next_automatic_backup": None,
         "next_automatic_backup_additional": False,
+        "state": "idle",
     }
 
     await ws_client.send_json_auto_id({"type": "backup/subscribe_events"})
@@ -1992,6 +2351,7 @@ async def test_receive_backup_read_tar_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.RECEIVE_BACKUP,
+        "reason": None,
         "stage": None,
         "state": ReceiveBackupState.IN_PROGRESS,
     }
@@ -1999,6 +2359,7 @@ async def test_receive_backup_read_tar_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.RECEIVE_BACKUP,
+        "reason": None,
         "stage": ReceiveBackupStage.RECEIVE_FILE,
         "state": ReceiveBackupState.IN_PROGRESS,
     }
@@ -2006,6 +2367,7 @@ async def test_receive_backup_read_tar_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.RECEIVE_BACKUP,
+        "reason": "unknown_error",
         "stage": None,
         "state": ReceiveBackupState.FAILED,
     }
@@ -2029,6 +2391,7 @@ async def test_receive_backup_read_tar_error(
         "unlink_call_count",
         "unlink_exception",
         "final_state",
+        "final_state_reason",
         "response_status",
     ),
     [
@@ -2042,6 +2405,7 @@ async def test_receive_backup_read_tar_error(
             1,
             None,
             ReceiveBackupState.COMPLETED,
+            None,
             201,
         ),
         (
@@ -2054,6 +2418,7 @@ async def test_receive_backup_read_tar_error(
             1,
             None,
             ReceiveBackupState.COMPLETED,
+            None,
             201,
         ),
         (
@@ -2066,6 +2431,7 @@ async def test_receive_backup_read_tar_error(
             1,
             None,
             ReceiveBackupState.COMPLETED,
+            None,
             201,
         ),
         (
@@ -2078,6 +2444,7 @@ async def test_receive_backup_read_tar_error(
             1,
             OSError("Boom!"),
             ReceiveBackupState.FAILED,
+            "unknown_error",
             500,
         ),
     ],
@@ -2096,25 +2463,11 @@ async def test_receive_backup_file_read_error(
     unlink_call_count: int,
     unlink_exception: Exception | None,
     final_state: ReceiveBackupState,
+    final_state_reason: str | None,
     response_status: int,
 ) -> None:
     """Test file read error during backup receive."""
-    local_agent = local_backup_platform.CoreLocalBackupAgent(hass)
-    remote_agent = BackupAgentTest("remote", backups=[])
-    with patch(
-        "homeassistant.components.backup.backup.async_get_backup_agents"
-    ) as core_get_backup_agents:
-        core_get_backup_agents.return_value = [local_agent]
-        await async_setup_component(hass, DOMAIN, {})
-        await hass.async_block_till_done()
-        await setup_backup_platform(
-            hass,
-            domain="test",
-            platform=Mock(
-                async_get_backup_agents=AsyncMock(return_value=[remote_agent]),
-                spec_set=BackupAgentPlatformProtocol,
-            ),
-        )
+    await setup_backup_integration(hass, remote_agents=["test.remote"])
 
     client = await hass_client()
     ws_client = await hass_ws_client(hass)
@@ -2130,8 +2483,10 @@ async def test_receive_backup_file_read_error(
         "agent_errors": {},
         "last_attempted_automatic_backup": None,
         "last_completed_automatic_backup": None,
+        "last_action_event": None,
         "next_automatic_backup": None,
         "next_automatic_backup_additional": False,
+        "state": "idle",
     }
 
     await ws_client.send_json_auto_id({"type": "backup/subscribe_events"})
@@ -2166,6 +2521,7 @@ async def test_receive_backup_file_read_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.RECEIVE_BACKUP,
+        "reason": None,
         "stage": None,
         "state": ReceiveBackupState.IN_PROGRESS,
     }
@@ -2173,6 +2529,7 @@ async def test_receive_backup_file_read_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.RECEIVE_BACKUP,
+        "reason": None,
         "stage": ReceiveBackupStage.RECEIVE_FILE,
         "state": ReceiveBackupState.IN_PROGRESS,
     }
@@ -2180,6 +2537,7 @@ async def test_receive_backup_file_read_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.RECEIVE_BACKUP,
+        "reason": None,
         "stage": ReceiveBackupStage.UPLOAD_TO_AGENTS,
         "state": ReceiveBackupState.IN_PROGRESS,
     }
@@ -2187,6 +2545,7 @@ async def test_receive_backup_file_read_error(
     result = await ws_client.receive_json()
     assert result["event"] == {
         "manager_state": BackupManagerState.RECEIVE_BACKUP,
+        "reason": final_state_reason,
         "stage": None,
         "state": final_state,
     }
@@ -2203,34 +2562,71 @@ async def test_receive_backup_file_read_error(
 
 @pytest.mark.usefixtures("path_glob")
 @pytest.mark.parametrize(
-    ("agent_id", "password_param", "restore_database", "restore_homeassistant", "dir"),
+    (
+        "agent_id",
+        "backup_id",
+        "password_param",
+        "backup_path",
+        "restore_database",
+        "restore_homeassistant",
+        "dir",
+    ),
     [
-        (LOCAL_AGENT_ID, {}, True, False, "backups"),
-        (LOCAL_AGENT_ID, {"password": "abc123"}, False, True, "backups"),
-        ("test.remote", {}, True, True, "tmp_backups"),
+        (
+            LOCAL_AGENT_ID,
+            TEST_BACKUP_ABC123.backup_id,
+            {},
+            TEST_BACKUP_PATH_ABC123,
+            True,
+            False,
+            "backups",
+        ),
+        (
+            LOCAL_AGENT_ID,
+            TEST_BACKUP_DEF456.backup_id,
+            {},
+            TEST_BACKUP_PATH_DEF456,
+            True,
+            False,
+            "backups",
+        ),
+        (
+            LOCAL_AGENT_ID,
+            TEST_BACKUP_ABC123.backup_id,
+            {"password": "abc123"},
+            TEST_BACKUP_PATH_ABC123,
+            False,
+            True,
+            "backups",
+        ),
+        (
+            "test.remote",
+            TEST_BACKUP_ABC123.backup_id,
+            {},
+            TEST_BACKUP_PATH_ABC123,
+            True,
+            True,
+            "tmp_backups",
+        ),
     ],
 )
 async def test_restore_backup(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
     agent_id: str,
+    backup_id: str,
     password_param: dict[str, str],
+    backup_path: Path,
     restore_database: bool,
     restore_homeassistant: bool,
     dir: str,
 ) -> None:
     """Test restore backup."""
     password = password_param.get("password")
-    remote_agent = BackupAgentTest("remote", backups=[TEST_BACKUP_ABC123])
-    await async_setup_component(hass, DOMAIN, {})
-    await hass.async_block_till_done()
-    await setup_backup_platform(
+    await setup_backup_integration(
         hass,
-        domain="test",
-        platform=Mock(
-            async_get_backup_agents=AsyncMock(return_value=[remote_agent]),
-            spec_set=BackupAgentPlatformProtocol,
-        ),
+        remote_agents=["test.remote"],
+        backups={"test.remote": [TEST_BACKUP_ABC123]},
     )
 
     ws_client = await hass_ws_client(hass)
@@ -2251,17 +2647,15 @@ async def test_restore_backup(
         patch(
             "homeassistant.components.backup.manager.validate_password"
         ) as validate_password_mock,
-        patch.object(remote_agent, "async_download_backup") as download_mock,
         patch(
             "homeassistant.components.backup.backup.read_backup",
-            return_value=TEST_BACKUP_ABC123,
+            side_effect=mock_read_backup,
         ),
     ):
-        download_mock.return_value.__aiter__.return_value = iter((b"backup data",))
         await ws_client.send_json_auto_id(
             {
                 "type": "backup/restore",
-                "backup_id": TEST_BACKUP_ABC123.backup_id,
+                "backup_id": backup_id,
                 "agent_id": agent_id,
                 "restore_database": restore_database,
                 "restore_homeassistant": restore_homeassistant,
@@ -2272,6 +2666,7 @@ async def test_restore_backup(
         result = await ws_client.receive_json()
         assert result["event"] == {
             "manager_state": BackupManagerState.RESTORE_BACKUP,
+            "reason": None,
             "stage": None,
             "state": RestoreBackupState.IN_PROGRESS,
         }
@@ -2279,6 +2674,7 @@ async def test_restore_backup(
         result = await ws_client.receive_json()
         assert result["event"] == {
             "manager_state": BackupManagerState.RESTORE_BACKUP,
+            "reason": None,
             "stage": None,
             "state": RestoreBackupState.CORE_RESTART,
         }
@@ -2288,6 +2684,7 @@ async def test_restore_backup(
         result = await ws_client.receive_json()
         assert result["event"] == {
             "manager_state": BackupManagerState.RESTORE_BACKUP,
+            "reason": None,
             "stage": None,
             "state": RestoreBackupState.COMPLETED,
         }
@@ -2298,17 +2695,17 @@ async def test_restore_backup(
         result = await ws_client.receive_json()
         assert result["success"] is True
 
-    backup_path = f"{hass.config.path()}/{dir}/abc123.tar"
+    full_backup_path = f"{hass.config.path()}/{dir}/{backup_path.name}"
     expected_restore_file = json.dumps(
         {
-            "path": backup_path,
+            "path": full_backup_path,
             "password": password,
             "remove_after_restore": agent_id != LOCAL_AGENT_ID,
             "restore_database": restore_database,
             "restore_homeassistant": restore_homeassistant,
         }
     )
-    validate_password_mock.assert_called_once_with(Path(backup_path), password)
+    validate_password_mock.assert_called_once_with(Path(full_backup_path), password)
     assert mocked_write_text.call_args[0][0] == expected_restore_file
     assert mocked_service_call.called
 
@@ -2325,16 +2722,10 @@ async def test_restore_backup_wrong_password(
 ) -> None:
     """Test restore backup wrong password."""
     password = "hunter2"
-    remote_agent = BackupAgentTest("remote", backups=[TEST_BACKUP_ABC123])
-    await async_setup_component(hass, DOMAIN, {})
-    await hass.async_block_till_done()
-    await setup_backup_platform(
+    await setup_backup_integration(
         hass,
-        domain="test",
-        platform=Mock(
-            async_get_backup_agents=AsyncMock(return_value=[remote_agent]),
-            spec_set=BackupAgentPlatformProtocol,
-        ),
+        remote_agents=["test.remote"],
+        backups={"test.remote": [TEST_BACKUP_ABC123]},
     )
 
     ws_client = await hass_ws_client(hass)
@@ -2355,13 +2746,11 @@ async def test_restore_backup_wrong_password(
         patch(
             "homeassistant.components.backup.manager.validate_password"
         ) as validate_password_mock,
-        patch.object(remote_agent, "async_download_backup") as download_mock,
         patch(
             "homeassistant.components.backup.backup.read_backup",
-            return_value=TEST_BACKUP_ABC123,
+            side_effect=mock_read_backup,
         ),
     ):
-        download_mock.return_value.__aiter__.return_value = iter((b"backup data",))
         validate_password_mock.return_value = False
         await ws_client.send_json_auto_id(
             {
@@ -2375,6 +2764,7 @@ async def test_restore_backup_wrong_password(
         result = await ws_client.receive_json()
         assert result["event"] == {
             "manager_state": BackupManagerState.RESTORE_BACKUP,
+            "reason": None,
             "stage": None,
             "state": RestoreBackupState.IN_PROGRESS,
         }
@@ -2382,6 +2772,7 @@ async def test_restore_backup_wrong_password(
         result = await ws_client.receive_json()
         assert result["event"] == {
             "manager_state": BackupManagerState.RESTORE_BACKUP,
+            "reason": "password_incorrect",
             "stage": None,
             "state": RestoreBackupState.FAILED,
         }
@@ -2401,23 +2792,27 @@ async def test_restore_backup_wrong_password(
 
 @pytest.mark.usefixtures("path_glob")
 @pytest.mark.parametrize(
-    ("parameters", "expected_error"),
+    ("parameters", "expected_error", "expected_reason"),
     [
         (
-            {"backup_id": TEST_BACKUP_DEF456.backup_id},
-            f"Backup def456 not found in agent {LOCAL_AGENT_ID}",
+            {"backup_id": "no_such_backup"},
+            f"Backup no_such_backup not found in agent {LOCAL_AGENT_ID}",
+            "backup_manager_error",
         ),
         (
             {"restore_addons": ["blah"]},
             "Addons and folders are not supported in core restore",
+            "backup_reader_writer_error",
         ),
         (
             {"restore_folders": [Folder.ADDONS]},
             "Addons and folders are not supported in core restore",
+            "backup_reader_writer_error",
         ),
         (
             {"restore_database": False, "restore_homeassistant": False},
             "Home Assistant or database must be included in restore",
+            "backup_reader_writer_error",
         ),
     ],
 )
@@ -2426,10 +2821,10 @@ async def test_restore_backup_wrong_parameters(
     hass_ws_client: WebSocketGenerator,
     parameters: dict[str, Any],
     expected_error: str,
+    expected_reason: str,
 ) -> None:
     """Test restore backup wrong parameters."""
-    await async_setup_component(hass, DOMAIN, {})
-    await hass.async_block_till_done()
+    await setup_backup_integration(hass)
 
     ws_client = await hass_ws_client(hass)
 
@@ -2447,7 +2842,7 @@ async def test_restore_backup_wrong_parameters(
         patch("homeassistant.core.ServiceRegistry.async_call") as mocked_service_call,
         patch(
             "homeassistant.components.backup.backup.read_backup",
-            return_value=TEST_BACKUP_ABC123,
+            side_effect=mock_read_backup,
         ),
     ):
         await ws_client.send_json_auto_id(
@@ -2462,6 +2857,7 @@ async def test_restore_backup_wrong_parameters(
         result = await ws_client.receive_json()
         assert result["event"] == {
             "manager_state": BackupManagerState.RESTORE_BACKUP,
+            "reason": None,
             "stage": None,
             "state": RestoreBackupState.IN_PROGRESS,
         }
@@ -2469,6 +2865,7 @@ async def test_restore_backup_wrong_parameters(
         result = await ws_client.receive_json()
         assert result["event"] == {
             "manager_state": BackupManagerState.RESTORE_BACKUP,
+            "reason": expected_reason,
             "stage": None,
             "state": RestoreBackupState.FAILED,
         }
@@ -2483,3 +2880,663 @@ async def test_restore_backup_wrong_parameters(
 
     mocked_write_text.assert_not_called()
     mocked_service_call.assert_not_called()
+
+
+@pytest.mark.usefixtures("mock_backup_generation")
+async def test_restore_backup_when_busy(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test restore backup with busy manager."""
+    await setup_backup_integration(hass)
+    ws_client = await hass_ws_client(hass)
+
+    await ws_client.send_json_auto_id(
+        {"type": "backup/generate", "agent_ids": [LOCAL_AGENT_ID]}
+    )
+    result = await ws_client.receive_json()
+
+    assert result["success"] is True
+
+    await ws_client.send_json_auto_id(
+        {
+            "type": "backup/restore",
+            "backup_id": TEST_BACKUP_ABC123.backup_id,
+            "agent_id": LOCAL_AGENT_ID,
+        }
+    )
+    result = await ws_client.receive_json()
+
+    assert result["success"] is False
+    assert result["error"]["code"] == "home_assistant_error"
+    assert result["error"]["message"] == "Backup manager busy: create_backup"
+
+
+@pytest.mark.usefixtures("mock_backup_generation")
+@pytest.mark.parametrize(
+    ("exception", "error_code", "error_message", "expected_reason"),
+    [
+        (
+            BackupAgentError("Boom!"),
+            "home_assistant_error",
+            "Boom!",
+            "backup_agent_error",
+        ),
+        (
+            Exception("Boom!"),
+            "unknown_error",
+            "Unknown error",
+            "unknown_error",
+        ),
+    ],
+)
+async def test_restore_backup_agent_error(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    exception: Exception,
+    error_code: str,
+    error_message: str,
+    expected_reason: str,
+) -> None:
+    """Test restore backup with agent error."""
+    mock_agents = await setup_backup_integration(
+        hass,
+        remote_agents=["test.remote"],
+        backups={"test.remote": [TEST_BACKUP_ABC123]},
+    )
+    ws_client = await hass_ws_client(hass)
+
+    await ws_client.send_json_auto_id({"type": "backup/subscribe_events"})
+
+    result = await ws_client.receive_json()
+    assert result["event"] == {"manager_state": BackupManagerState.IDLE}
+
+    result = await ws_client.receive_json()
+    assert result["success"] is True
+
+    mock_agents["test.remote"].async_download_backup.side_effect = exception
+    with (
+        patch("pathlib.Path.open"),
+        patch("pathlib.Path.write_text") as mocked_write_text,
+        patch("homeassistant.core.ServiceRegistry.async_call") as mocked_service_call,
+    ):
+        await ws_client.send_json_auto_id(
+            {
+                "type": "backup/restore",
+                "backup_id": TEST_BACKUP_ABC123.backup_id,
+                "agent_id": "test.remote",
+            }
+        )
+
+        result = await ws_client.receive_json()
+        assert result["event"] == {
+            "manager_state": BackupManagerState.RESTORE_BACKUP,
+            "reason": None,
+            "stage": None,
+            "state": RestoreBackupState.IN_PROGRESS,
+        }
+
+        result = await ws_client.receive_json()
+        assert result["event"] == {
+            "manager_state": BackupManagerState.RESTORE_BACKUP,
+            "reason": expected_reason,
+            "stage": None,
+            "state": RestoreBackupState.FAILED,
+        }
+
+        result = await ws_client.receive_json()
+        assert result["event"] == {"manager_state": BackupManagerState.IDLE}
+
+        result = await ws_client.receive_json()
+        assert not result["success"]
+        assert result["error"]["code"] == error_code
+        assert result["error"]["message"] == error_message
+
+    assert mock_agents["test.remote"].async_download_backup.call_count == 1
+    assert mocked_write_text.call_count == 0
+    assert mocked_service_call.call_count == 0
+
+
+@pytest.mark.usefixtures("mock_backup_generation")
+@pytest.mark.parametrize(
+    (
+        "open_call_count",
+        "open_exception",
+        "write_call_count",
+        "write_exception",
+        "close_call_count",
+        "close_exception",
+        "write_text_call_count",
+        "write_text_exception",
+        "validate_password_call_count",
+    ),
+    [
+        (
+            1,
+            OSError("Boom!"),
+            0,
+            None,
+            0,
+            None,
+            0,
+            None,
+            0,
+        ),
+        (
+            1,
+            None,
+            1,
+            OSError("Boom!"),
+            1,
+            None,
+            0,
+            None,
+            0,
+        ),
+        (
+            1,
+            None,
+            1,
+            None,
+            1,
+            OSError("Boom!"),
+            0,
+            None,
+            0,
+        ),
+        (
+            1,
+            None,
+            1,
+            None,
+            1,
+            None,
+            1,
+            OSError("Boom!"),
+            1,
+        ),
+    ],
+)
+async def test_restore_backup_file_error(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    open_call_count: int,
+    open_exception: list[Exception | None],
+    write_call_count: int,
+    write_exception: Exception | None,
+    close_call_count: int,
+    close_exception: list[Exception | None],
+    write_text_call_count: int,
+    write_text_exception: Exception | None,
+    validate_password_call_count: int,
+) -> None:
+    """Test restore backup with file error."""
+    mock_agents = await setup_backup_integration(
+        hass,
+        remote_agents=["test.remote"],
+        backups={"test.remote": [TEST_BACKUP_ABC123]},
+    )
+    ws_client = await hass_ws_client(hass)
+
+    await ws_client.send_json_auto_id({"type": "backup/subscribe_events"})
+
+    result = await ws_client.receive_json()
+    assert result["event"] == {"manager_state": BackupManagerState.IDLE}
+
+    result = await ws_client.receive_json()
+    assert result["success"] is True
+
+    open_mock = mock_open()
+    open_mock.side_effect = open_exception
+    open_mock.return_value.write.side_effect = write_exception
+    open_mock.return_value.close.side_effect = close_exception
+
+    with (
+        patch("pathlib.Path.open", open_mock),
+        patch(
+            "pathlib.Path.write_text", side_effect=write_text_exception
+        ) as mocked_write_text,
+        patch("homeassistant.core.ServiceRegistry.async_call") as mocked_service_call,
+        patch(
+            "homeassistant.components.backup.manager.validate_password"
+        ) as validate_password_mock,
+    ):
+        await ws_client.send_json_auto_id(
+            {
+                "type": "backup/restore",
+                "backup_id": TEST_BACKUP_ABC123.backup_id,
+                "agent_id": "test.remote",
+            }
+        )
+
+        result = await ws_client.receive_json()
+        assert result["event"] == {
+            "manager_state": BackupManagerState.RESTORE_BACKUP,
+            "reason": None,
+            "stage": None,
+            "state": RestoreBackupState.IN_PROGRESS,
+        }
+
+        result = await ws_client.receive_json()
+        assert result["event"] == {
+            "manager_state": BackupManagerState.RESTORE_BACKUP,
+            "reason": "unknown_error",
+            "stage": None,
+            "state": RestoreBackupState.FAILED,
+        }
+
+        result = await ws_client.receive_json()
+        assert result["event"] == {"manager_state": BackupManagerState.IDLE}
+
+        result = await ws_client.receive_json()
+        assert not result["success"]
+        assert result["error"]["code"] == "unknown_error"
+        assert result["error"]["message"] == "Unknown error"
+
+    assert mock_agents["test.remote"].async_download_backup.call_count == 1
+    assert validate_password_mock.call_count == validate_password_call_count
+    assert open_mock.call_count == open_call_count
+    assert open_mock.return_value.write.call_count == write_call_count
+    assert open_mock.return_value.close.call_count == close_call_count
+    assert mocked_write_text.call_count == write_text_call_count
+    assert mocked_service_call.call_count == 0
+
+
+@pytest.mark.parametrize(
+    ("commands", "agent_ids", "password", "protected_backup", "inner_tar_key"),
+    [
+        (
+            [],
+            ["backup.local", "test.remote"],
+            None,
+            {"backup.local": False, "test.remote": False},
+            None,
+        ),
+        (
+            [],
+            ["backup.local", "test.remote"],
+            "hunter2",
+            {"backup.local": True, "test.remote": True},
+            password_to_key("hunter2"),
+        ),
+        (
+            [
+                {
+                    "type": "backup/config/update",
+                    "agents": {
+                        "backup.local": {"protected": False},
+                        "test.remote": {"protected": False},
+                    },
+                }
+            ],
+            ["backup.local", "test.remote"],
+            "hunter2",
+            {"backup.local": False, "test.remote": False},
+            None,  # None of the agents are protected
+        ),
+        (
+            [
+                {
+                    "type": "backup/config/update",
+                    "agents": {
+                        "backup.local": {"protected": False},
+                        "test.remote": {"protected": True},
+                    },
+                }
+            ],
+            ["backup.local", "test.remote"],
+            "hunter2",
+            {"backup.local": False, "test.remote": True},
+            None,  # Local agent is not protected
+        ),
+        (
+            [
+                {
+                    "type": "backup/config/update",
+                    "agents": {
+                        "backup.local": {"protected": True},
+                        "test.remote": {"protected": False},
+                    },
+                }
+            ],
+            ["backup.local", "test.remote"],
+            "hunter2",
+            {"backup.local": True, "test.remote": False},
+            password_to_key("hunter2"),  # Local agent is protected
+        ),
+        (
+            [
+                {
+                    "type": "backup/config/update",
+                    "agents": {
+                        "backup.local": {"protected": True},
+                        "test.remote": {"protected": True},
+                    },
+                }
+            ],
+            ["backup.local", "test.remote"],
+            "hunter2",
+            {"backup.local": True, "test.remote": True},
+            password_to_key("hunter2"),
+        ),
+        (
+            [
+                {
+                    "type": "backup/config/update",
+                    "agents": {
+                        "backup.local": {"protected": False},
+                        "test.remote": {"protected": True},
+                    },
+                }
+            ],
+            ["backup.local", "test.remote"],
+            None,
+            {"backup.local": False, "test.remote": False},
+            None,  # No password supplied
+        ),
+        (
+            [
+                {
+                    "type": "backup/config/update",
+                    "agents": {
+                        "backup.local": {"protected": False},
+                        "test.remote": {"protected": True},
+                    },
+                }
+            ],
+            ["test.remote"],
+            "hunter2",
+            {"test.remote": True},
+            password_to_key("hunter2"),
+        ),
+        (
+            [
+                {
+                    "type": "backup/config/update",
+                    "agents": {
+                        "backup.local": {"protected": False},
+                        "test.remote": {"protected": False},
+                    },
+                }
+            ],
+            ["test.remote"],
+            "hunter2",
+            {"test.remote": False},
+            password_to_key("hunter2"),  # Temporary backup protected when password set
+        ),
+    ],
+)
+@pytest.mark.usefixtures("mock_backup_generation")
+async def test_initiate_backup_per_agent_encryption(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    generate_backup_id: MagicMock,
+    mocked_tarfile: Mock,
+    path_glob: MagicMock,
+    commands: dict[str, Any],
+    agent_ids: list[str],
+    password: str | None,
+    protected_backup: dict[str, bool],
+    inner_tar_key: bytes | None,
+) -> None:
+    """Test generate backup where encryption is selectively set on agents."""
+    await setup_backup_integration(hass, remote_agents=["test.remote"])
+
+    ws_client = await hass_ws_client(hass)
+
+    path_glob.return_value = []
+
+    await ws_client.send_json_auto_id({"type": "backup/info"})
+    result = await ws_client.receive_json()
+    assert result["success"] is True
+    assert result["result"] == {
+        "backups": [],
+        "agent_errors": {},
+        "last_attempted_automatic_backup": None,
+        "last_completed_automatic_backup": None,
+        "last_action_event": None,
+        "next_automatic_backup": None,
+        "next_automatic_backup_additional": False,
+        "state": "idle",
+    }
+
+    for command in commands:
+        await ws_client.send_json_auto_id(command)
+        result = await ws_client.receive_json()
+        assert result["success"] is True
+
+    await ws_client.send_json_auto_id({"type": "backup/subscribe_events"})
+
+    result = await ws_client.receive_json()
+    assert result["event"] == {"manager_state": BackupManagerState.IDLE}
+
+    result = await ws_client.receive_json()
+    assert result["success"] is True
+
+    with (
+        patch("pathlib.Path.open", mock_open(read_data=b"test")),
+    ):
+        await ws_client.send_json_auto_id(
+            {
+                "type": "backup/generate",
+                "agent_ids": agent_ids,
+                "password": password,
+                "name": "test",
+            }
+        )
+        result = await ws_client.receive_json()
+        assert result["event"] == {
+            "manager_state": BackupManagerState.CREATE_BACKUP,
+            "reason": None,
+            "stage": None,
+            "state": CreateBackupState.IN_PROGRESS,
+        }
+        result = await ws_client.receive_json()
+        assert result["success"] is True
+
+        backup_id = result["result"]["backup_job_id"]
+        assert backup_id == generate_backup_id.return_value
+
+        await hass.async_block_till_done()
+
+    mocked_tarfile.return_value.create_inner_tar.assert_called_once_with(
+        ANY, gzip=True, key=inner_tar_key
+    )
+
+    result = await ws_client.receive_json()
+    assert result["event"] == {
+        "manager_state": BackupManagerState.CREATE_BACKUP,
+        "reason": None,
+        "stage": CreateBackupStage.HOME_ASSISTANT,
+        "state": CreateBackupState.IN_PROGRESS,
+    }
+
+    result = await ws_client.receive_json()
+    assert result["event"] == {
+        "manager_state": BackupManagerState.CREATE_BACKUP,
+        "reason": None,
+        "stage": CreateBackupStage.UPLOAD_TO_AGENTS,
+        "state": CreateBackupState.IN_PROGRESS,
+    }
+
+    result = await ws_client.receive_json()
+    assert result["event"] == {
+        "manager_state": BackupManagerState.CREATE_BACKUP,
+        "reason": None,
+        "stage": None,
+        "state": CreateBackupState.COMPLETED,
+    }
+
+    result = await ws_client.receive_json()
+    assert result["event"] == {"manager_state": BackupManagerState.IDLE}
+
+    await ws_client.send_json_auto_id(
+        {"type": "backup/details", "backup_id": backup_id}
+    )
+    result = await ws_client.receive_json()
+
+    backup_data = result["result"]["backup"]
+
+    assert backup_data == {
+        "addons": [],
+        "agents": {
+            agent_id: {"protected": protected_backup[agent_id], "size": ANY}
+            for agent_id in agent_ids
+        },
+        "backup_id": backup_id,
+        "database_included": True,
+        "date": ANY,
+        "extra_metadata": {"instance_id": "our_uuid", "with_automatic_settings": False},
+        "failed_agent_ids": [],
+        "folders": [],
+        "homeassistant_included": True,
+        "homeassistant_version": "2025.1.0",
+        "name": "test",
+        "with_automatic_settings": False,
+    }
+
+
+@pytest.mark.parametrize(
+    ("restore_result", "last_action_event"),
+    [
+        (
+            {"error": None, "error_type": None, "success": True},
+            {
+                "manager_state": "restore_backup",
+                "reason": None,
+                "stage": None,
+                "state": "completed",
+            },
+        ),
+        (
+            {"error": "Boom!", "error_type": "ValueError", "success": False},
+            {
+                "manager_state": "restore_backup",
+                "reason": "Boom!",
+                "stage": None,
+                "state": "failed",
+            },
+        ),
+    ],
+)
+async def test_restore_progress_after_restart(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    restore_result: dict[str, Any],
+    last_action_event: dict[str, Any],
+) -> None:
+    """Test restore backup progress after restart."""
+
+    with patch(
+        "pathlib.Path.read_bytes", return_value=json.dumps(restore_result).encode()
+    ):
+        await setup_backup_integration(hass)
+
+    ws_client = await hass_ws_client(hass)
+    await ws_client.send_json_auto_id({"type": "backup/info"})
+    result = await ws_client.receive_json()
+    assert result["success"] is True
+    assert result["result"] == {
+        "agent_errors": {},
+        "backups": [],
+        "last_attempted_automatic_backup": None,
+        "last_completed_automatic_backup": None,
+        "last_action_event": last_action_event,
+        "next_automatic_backup": None,
+        "next_automatic_backup_additional": False,
+        "state": "idle",
+    }
+
+
+async def test_restore_progress_after_restart_fail_to_remove(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test restore backup progress after restart when failing to remove result file."""
+
+    with patch("pathlib.Path.unlink", side_effect=OSError("Boom!")):
+        await setup_backup_integration(hass)
+
+    ws_client = await hass_ws_client(hass)
+    await ws_client.send_json_auto_id({"type": "backup/info"})
+    result = await ws_client.receive_json()
+    assert result["success"] is True
+    assert result["result"] == {
+        "agent_errors": {},
+        "backups": [],
+        "last_attempted_automatic_backup": None,
+        "last_completed_automatic_backup": None,
+        "last_action_event": None,
+        "next_automatic_backup": None,
+        "next_automatic_backup_additional": False,
+        "state": "idle",
+    }
+
+    assert (
+        "Unexpected error deleting backup restore result file: <class 'OSError'> Boom!"
+        in caplog.text
+    )
+
+
+async def test_manager_blocked_until_home_assistant_started(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test backup manager's state is blocked until Home Assistant has started."""
+
+    hass.set_state(CoreState.not_running)
+
+    await setup_backup_integration(hass)
+    manager = hass.data[DATA_MANAGER]
+
+    assert manager.state == BackupManagerState.BLOCKED
+    assert manager.last_action_event is None
+
+    # Fired when Home Assistant changes to starting state
+    hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    assert manager.state == BackupManagerState.BLOCKED
+    assert manager.last_action_event is None
+
+    # Fired when Home Assistant changes to running state
+    hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
+    await hass.async_block_till_done()
+    assert manager.state == BackupManagerState.IDLE
+    assert manager.last_action_event is None
+
+
+async def test_manager_not_blocked_after_restore(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test restore backup progress after restart."""
+    restore_result = {"error": None, "error_type": None, "success": True}
+
+    hass.set_state(CoreState.not_running)
+    with patch(
+        "pathlib.Path.read_bytes", return_value=json.dumps(restore_result).encode()
+    ):
+        await setup_backup_integration(hass)
+
+    ws_client = await hass_ws_client(hass)
+    await ws_client.send_json_auto_id({"type": "backup/info"})
+    result = await ws_client.receive_json()
+    assert result["success"] is True
+    assert result["result"] == {
+        "agent_errors": {},
+        "backups": [],
+        "last_attempted_automatic_backup": None,
+        "last_completed_automatic_backup": None,
+        "last_action_event": {
+            "manager_state": "restore_backup",
+            "reason": None,
+            "stage": None,
+            "state": "completed",
+        },
+        "next_automatic_backup": None,
+        "next_automatic_backup_additional": False,
+        "state": "idle",
+    }
diff --git a/tests/components/backup/test_sensors.py b/tests/components/backup/test_sensors.py
new file mode 100644
index 00000000000..bee61887ea5
--- /dev/null
+++ b/tests/components/backup/test_sensors.py
@@ -0,0 +1,119 @@
+"""Tests for the sensors of the Backup integration."""
+
+from typing import Any
+from unittest.mock import AsyncMock, MagicMock, patch
+
+from freezegun.api import FrozenDateTimeFactory
+import pytest
+from syrupy import SnapshotAssertion
+
+from homeassistant.components.backup import store
+from homeassistant.components.backup.const import DOMAIN
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from .common import setup_backup_integration
+
+from tests.common import async_fire_time_changed, snapshot_platform
+from tests.typing import WebSocketGenerator
+
+
+@pytest.mark.usefixtures("mock_backup_generation")
+async def test_sensors(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test setup of backup sensors."""
+    with patch("homeassistant.components.backup.PLATFORMS", [Platform.SENSOR]):
+        await setup_backup_integration(hass, with_hassio=False)
+        await hass.async_block_till_done(wait_background_tasks=True)
+
+    entry = hass.config_entries.async_entries(DOMAIN)[0]
+    await snapshot_platform(hass, entity_registry, snapshot, entry.entry_id)
+
+    # start backup and check sensor states again
+    client = await hass_ws_client(hass)
+    await hass.async_block_till_done()
+    await client.send_json_auto_id(
+        {"type": "backup/generate", "agent_ids": ["backup.local"]}
+    )
+
+    assert await client.receive_json()
+    state = hass.states.get("sensor.backup_backup_manager_state")
+    assert state.state == "create_backup"
+
+    await hass.async_block_till_done(wait_background_tasks=True)
+    state = hass.states.get("sensor.backup_backup_manager_state")
+    assert state.state == "idle"
+
+
+async def test_sensor_updates(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    freezer: FrozenDateTimeFactory,
+    hass_storage: dict[str, Any],
+    create_backup: AsyncMock,
+) -> None:
+    """Test update of backup sensors."""
+    # Ensure created backup is already protected,
+    # to avoid manager creating a new EncryptedBackupStreamer
+    # instead of using the already mocked stream writer.
+    created_backup: MagicMock = create_backup.return_value[1].result().backup
+    created_backup.protected = True
+
+    await hass.config.async_set_time_zone("Europe/Amsterdam")
+    freezer.move_to("2024-11-12T12:00:00+01:00")
+    storage_data = {
+        "backups": [],
+        "config": {
+            "agents": {},
+            "automatic_backups_configured": True,
+            "create_backup": {
+                "agent_ids": ["test.remote"],
+                "include_addons": [],
+                "include_all_addons": False,
+                "include_database": True,
+                "include_folders": [],
+                "name": "test-name",
+                "password": "test-password",
+            },
+            "retention": {"copies": None, "days": None},
+            "last_attempted_automatic_backup": "2024-11-11T04:45:00+01:00",
+            "last_completed_automatic_backup": "2024-11-11T04:45:00+01:00",
+            "schedule": {
+                "days": [],
+                "recurrence": "daily",
+                "state": "never",
+                "time": "06:00",
+            },
+        },
+    }
+    hass_storage[DOMAIN] = {
+        "data": storage_data,
+        "key": DOMAIN,
+        "version": store.STORAGE_VERSION,
+        "minor_version": store.STORAGE_VERSION_MINOR,
+    }
+
+    with patch("homeassistant.components.backup.PLATFORMS", [Platform.SENSOR]):
+        await setup_backup_integration(
+            hass, with_hassio=False, remote_agents=["test.remote"]
+        )
+        await hass.async_block_till_done(wait_background_tasks=True)
+
+    state = hass.states.get("sensor.backup_last_successful_automatic_backup")
+    assert state.state == "2024-11-11T03:45:00+00:00"
+    state = hass.states.get("sensor.backup_next_scheduled_automatic_backup")
+    assert state.state == "2024-11-13T05:00:00+00:00"
+
+    freezer.move_to("2024-11-13T12:00:00+01:00")
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.backup_last_successful_automatic_backup")
+    assert state.state == "2024-11-13T11:00:00+00:00"
+    state = hass.states.get("sensor.backup_next_scheduled_automatic_backup")
+    assert state.state == "2024-11-14T05:00:00+00:00"
diff --git a/tests/components/backup/test_store.py b/tests/components/backup/test_store.py
index cc84b66340c..0d29bb2006a 100644
--- a/tests/components/backup/test_store.py
+++ b/tests/components/backup/test_store.py
@@ -66,6 +66,40 @@ def mock_delay_save() -> Generator[None]:
                     }
                 ],
                 "config": {
+                    "create_backup": {
+                        "agent_ids": [],
+                        "include_addons": None,
+                        "include_all_addons": False,
+                        "include_database": True,
+                        "include_folders": None,
+                        "name": None,
+                        "password": None,
+                    },
+                    "last_attempted_automatic_backup": None,
+                    "last_completed_automatic_backup": None,
+                    "retention": {
+                        "copies": 0,
+                        "days": 0,
+                    },
+                    "schedule": {
+                        "state": "never",
+                    },
+                },
+            },
+            "key": DOMAIN,
+            "version": 1,
+        },
+        {
+            "data": {
+                "backups": [
+                    {
+                        "backup_id": "abc123",
+                        "failed_agent_ids": ["test.remote"],
+                    }
+                ],
+                "config": {
+                    "agents": {"test.remote": {"protected": True}},
+                    "automatic_backups_configured": False,
                     "create_backup": {
                         "agent_ids": [],
                         "include_addons": None,
@@ -92,6 +126,80 @@ def mock_delay_save() -> Generator[None]:
             "key": DOMAIN,
             "version": 2,
         },
+        {
+            "data": {
+                "backups": [
+                    {
+                        "backup_id": "abc123",
+                        "failed_agent_ids": ["test.remote"],
+                    }
+                ],
+                "config": {
+                    "agents": {"test.remote": {"protected": True}},
+                    "create_backup": {
+                        "agent_ids": [],
+                        "include_addons": None,
+                        "include_all_addons": False,
+                        "include_database": True,
+                        "include_folders": None,
+                        "name": None,
+                        "password": None,
+                    },
+                    "last_attempted_automatic_backup": None,
+                    "last_completed_automatic_backup": None,
+                    "retention": {
+                        "copies": None,
+                        "days": None,
+                    },
+                    "schedule": {
+                        "days": [],
+                        "recurrence": "never",
+                        "state": "never",
+                        "time": None,
+                    },
+                },
+            },
+            "key": DOMAIN,
+            "minor_version": 4,
+            "version": 1,
+        },
+        {
+            "data": {
+                "backups": [
+                    {
+                        "backup_id": "abc123",
+                        "failed_agent_ids": ["test.remote"],
+                    }
+                ],
+                "config": {
+                    "agents": {"test.remote": {"protected": True}},
+                    "create_backup": {
+                        "agent_ids": [],
+                        "include_addons": None,
+                        "include_all_addons": False,
+                        "include_database": True,
+                        "include_folders": None,
+                        "name": None,
+                        "password": "hunter2",
+                    },
+                    "last_attempted_automatic_backup": None,
+                    "last_completed_automatic_backup": None,
+                    "retention": {
+                        "copies": None,
+                        "days": None,
+                    },
+                    "schedule": {
+                        "days": [],
+                        "recurrence": "never",
+                        "state": "never",
+                        "time": None,
+                    },
+                },
+            },
+            "key": DOMAIN,
+            "minor_version": 4,
+            "version": 1,
+        },
     ],
 )
 async def test_store_migration(
diff --git a/tests/components/backup/test_util.py b/tests/components/backup/test_util.py
index 60cfc77b1aa..97e94eafb73 100644
--- a/tests/components/backup/test_util.py
+++ b/tests/components/backup/test_util.py
@@ -2,13 +2,26 @@
 
 from __future__ import annotations
 
+import asyncio
+from collections.abc import AsyncIterator
+import dataclasses
 import tarfile
 from unittest.mock import Mock, patch
 
 import pytest
+import securetar
 
-from homeassistant.components.backup import AddonInfo, AgentBackup, Folder
-from homeassistant.components.backup.util import read_backup, validate_password
+from homeassistant.components.backup import DOMAIN, AddonInfo, AgentBackup, Folder
+from homeassistant.components.backup.util import (
+    DecryptedBackupStreamer,
+    EncryptedBackupStreamer,
+    read_backup,
+    suggested_filename,
+    validate_password,
+)
+from homeassistant.core import HomeAssistant
+
+from tests.common import get_fixture_path
 
 
 @pytest.mark.parametrize(
@@ -76,6 +89,28 @@ from homeassistant.components.backup.util import read_backup, validate_password
                 size=1234,
             ),
         ),
+        # Check the backup_request_date is used as date if present
+        (
+            b'{"compressed":true,"date":"2024-12-01T00:00:00.000000-00:00","homeassistant":'
+            b'{"exclude_database":true,"version":"2024.12.0.dev0"},"name":"test",'
+            b'"extra":{"supervisor.backup_request_date":"2025-12-01T00:00:00.000000-00:00"},'
+            b'"protected":true,"slug":"455645fe","type":"partial","version":2}',
+            AgentBackup(
+                addons=[],
+                backup_id="455645fe",
+                date="2025-12-01T00:00:00.000000-00:00",
+                database_included=False,
+                extra_metadata={
+                    "supervisor.backup_request_date": "2025-12-01T00:00:00.000000-00:00"
+                },
+                folders=[],
+                homeassistant_included=True,
+                homeassistant_version="2024.12.0.dev0",
+                name="test",
+                protected=True,
+                size=1234,
+            ),
+        ),
     ],
 )
 def test_read_backup(backup_json_content: bytes, expected_backup: AgentBackup) -> None:
@@ -130,3 +165,411 @@ def test_validate_password_no_homeassistant() -> None:
             KeyError
         )
         assert validate_password(mock_path, "hunter2") is False
+
+
+async def test_decrypted_backup_streamer(hass: HomeAssistant) -> None:
+    """Test the decrypted backup streamer."""
+    decrypted_backup_path = get_fixture_path(
+        "test_backups/c0cb53bd.tar.decrypted", DOMAIN
+    )
+    encrypted_backup_path = get_fixture_path("test_backups/c0cb53bd.tar", DOMAIN)
+    backup = AgentBackup(
+        addons=["addon_1", "addon_2"],
+        backup_id="1234",
+        date="2024-12-02T07:23:58.261875-05:00",
+        database_included=False,
+        extra_metadata={},
+        folders=[],
+        homeassistant_included=True,
+        homeassistant_version="2024.12.0.dev0",
+        name="test",
+        protected=True,
+        size=encrypted_backup_path.stat().st_size,
+    )
+    expected_padding = b"\0" * 40960  # 4 x 10240 byte of padding
+
+    async def send_backup() -> AsyncIterator[bytes]:
+        f = encrypted_backup_path.open("rb")
+        while chunk := f.read(1024):
+            yield chunk
+
+    async def open_backup() -> AsyncIterator[bytes]:
+        return send_backup()
+
+    decryptor = DecryptedBackupStreamer(hass, backup, open_backup, "hunter2")
+    assert decryptor.backup() == dataclasses.replace(
+        backup, protected=False, size=backup.size + len(expected_padding)
+    )
+    decrypted_stream = await decryptor.open_stream()
+    decrypted_output = b""
+    async for chunk in decrypted_stream:
+        decrypted_output += chunk
+    await decryptor.wait()
+
+    # Expect the output to match the stored decrypted backup file, with additional
+    # padding.
+    decrypted_backup_data = decrypted_backup_path.read_bytes()
+    assert decrypted_output == decrypted_backup_data + expected_padding
+
+
+async def test_decrypted_backup_streamer_interrupt_stuck_reader(
+    hass: HomeAssistant,
+) -> None:
+    """Test the decrypted backup streamer."""
+    encrypted_backup_path = get_fixture_path("test_backups/c0cb53bd.tar", DOMAIN)
+    backup = AgentBackup(
+        addons=["addon_1", "addon_2"],
+        backup_id="1234",
+        date="2024-12-02T07:23:58.261875-05:00",
+        database_included=False,
+        extra_metadata={},
+        folders=[],
+        homeassistant_included=True,
+        homeassistant_version="2024.12.0.dev0",
+        name="test",
+        protected=True,
+        size=encrypted_backup_path.stat().st_size,
+    )
+
+    stuck = asyncio.Event()
+
+    async def send_backup() -> AsyncIterator[bytes]:
+        f = encrypted_backup_path.open("rb")
+        while chunk := f.read(1024):
+            await stuck.wait()
+            yield chunk
+
+    async def open_backup() -> AsyncIterator[bytes]:
+        return send_backup()
+
+    decryptor = DecryptedBackupStreamer(hass, backup, open_backup, "hunter2")
+    await decryptor.open_stream()
+    await decryptor.wait()
+
+
+async def test_decrypted_backup_streamer_interrupt_stuck_writer(
+    hass: HomeAssistant,
+) -> None:
+    """Test the decrypted backup streamer."""
+    encrypted_backup_path = get_fixture_path("test_backups/c0cb53bd.tar", DOMAIN)
+    backup = AgentBackup(
+        addons=["addon_1", "addon_2"],
+        backup_id="1234",
+        date="2024-12-02T07:23:58.261875-05:00",
+        database_included=False,
+        extra_metadata={},
+        folders=[],
+        homeassistant_included=True,
+        homeassistant_version="2024.12.0.dev0",
+        name="test",
+        protected=True,
+        size=encrypted_backup_path.stat().st_size,
+    )
+
+    async def send_backup() -> AsyncIterator[bytes]:
+        f = encrypted_backup_path.open("rb")
+        while chunk := f.read(1024):
+            yield chunk
+
+    async def open_backup() -> AsyncIterator[bytes]:
+        return send_backup()
+
+    decryptor = DecryptedBackupStreamer(hass, backup, open_backup, "hunter2")
+    await decryptor.open_stream()
+    await decryptor.wait()
+
+
+async def test_decrypted_backup_streamer_wrong_password(hass: HomeAssistant) -> None:
+    """Test the decrypted backup streamer with wrong password."""
+    encrypted_backup_path = get_fixture_path("test_backups/c0cb53bd.tar", DOMAIN)
+    backup = AgentBackup(
+        addons=["addon_1", "addon_2"],
+        backup_id="1234",
+        date="2024-12-02T07:23:58.261875-05:00",
+        database_included=False,
+        extra_metadata={},
+        folders=[],
+        homeassistant_included=True,
+        homeassistant_version="2024.12.0.dev0",
+        name="test",
+        protected=True,
+        size=encrypted_backup_path.stat().st_size,
+    )
+
+    async def send_backup() -> AsyncIterator[bytes]:
+        f = encrypted_backup_path.open("rb")
+        while chunk := f.read(1024):
+            yield chunk
+
+    async def open_backup() -> AsyncIterator[bytes]:
+        return send_backup()
+
+    decryptor = DecryptedBackupStreamer(hass, backup, open_backup, "wrong_password")
+    decrypted_stream = await decryptor.open_stream()
+    async for _ in decrypted_stream:
+        pass
+
+    await decryptor.wait()
+    assert isinstance(decryptor._workers[0].error, securetar.SecureTarReadError)
+
+
+async def test_encrypted_backup_streamer(hass: HomeAssistant) -> None:
+    """Test the encrypted backup streamer."""
+    decrypted_backup_path = get_fixture_path(
+        "test_backups/c0cb53bd.tar.decrypted", DOMAIN
+    )
+    encrypted_backup_path = get_fixture_path("test_backups/c0cb53bd.tar", DOMAIN)
+    backup = AgentBackup(
+        addons=["addon_1", "addon_2"],
+        backup_id="1234",
+        date="2024-12-02T07:23:58.261875-05:00",
+        database_included=False,
+        extra_metadata={},
+        folders=[],
+        homeassistant_included=True,
+        homeassistant_version="2024.12.0.dev0",
+        name="test",
+        protected=False,
+        size=decrypted_backup_path.stat().st_size,
+    )
+    expected_padding = b"\0" * 40960  # 4 x 10240 byte of padding
+
+    async def send_backup() -> AsyncIterator[bytes]:
+        f = decrypted_backup_path.open("rb")
+        while chunk := f.read(1024):
+            yield chunk
+
+    async def open_backup() -> AsyncIterator[bytes]:
+        return send_backup()
+
+    # Patch os.urandom to return values matching the nonce used in the encrypted
+    # test backup. The backup has three inner tar files, but we need an extra nonce
+    # for a future planned supervisor.tar.
+    with patch("os.urandom") as mock_randbytes:
+        mock_randbytes.side_effect = (
+            bytes.fromhex("bd34ea6fc93b0614ce7af2b44b4f3957"),
+            bytes.fromhex("1296d6f7554e2cb629a3dc4082bae36c"),
+            bytes.fromhex("8b7a58e48faf2efb23845eb3164382e0"),
+            bytes.fromhex("00000000000000000000000000000000"),
+        )
+        encryptor = EncryptedBackupStreamer(hass, backup, open_backup, "hunter2")
+    assert encryptor.backup() == dataclasses.replace(
+        backup, protected=True, size=backup.size + len(expected_padding)
+    )
+
+    encrypted_stream = await encryptor.open_stream()
+    encrypted_output = b""
+    async for chunk in encrypted_stream:
+        encrypted_output += chunk
+    await encryptor.wait()
+
+    # Expect the output to match the stored encrypted backup file, with additional
+    # padding.
+    encrypted_backup_data = encrypted_backup_path.read_bytes()
+    assert encrypted_output == encrypted_backup_data + expected_padding
+
+
+async def test_encrypted_backup_streamer_interrupt_stuck_reader(
+    hass: HomeAssistant,
+) -> None:
+    """Test the encrypted backup streamer."""
+    decrypted_backup_path = get_fixture_path(
+        "test_backups/c0cb53bd.tar.decrypted", DOMAIN
+    )
+    backup = AgentBackup(
+        addons=["addon_1", "addon_2"],
+        backup_id="1234",
+        date="2024-12-02T07:23:58.261875-05:00",
+        database_included=False,
+        extra_metadata={},
+        folders=[],
+        homeassistant_included=True,
+        homeassistant_version="2024.12.0.dev0",
+        name="test",
+        protected=False,
+        size=decrypted_backup_path.stat().st_size,
+    )
+
+    stuck = asyncio.Event()
+
+    async def send_backup() -> AsyncIterator[bytes]:
+        f = decrypted_backup_path.open("rb")
+        while chunk := f.read(1024):
+            await stuck.wait()
+            yield chunk
+
+    async def open_backup() -> AsyncIterator[bytes]:
+        return send_backup()
+
+    decryptor = EncryptedBackupStreamer(hass, backup, open_backup, "hunter2")
+    await decryptor.open_stream()
+    await decryptor.wait()
+
+
+async def test_encrypted_backup_streamer_interrupt_stuck_writer(
+    hass: HomeAssistant,
+) -> None:
+    """Test the encrypted backup streamer."""
+    decrypted_backup_path = get_fixture_path(
+        "test_backups/c0cb53bd.tar.decrypted", DOMAIN
+    )
+    backup = AgentBackup(
+        addons=["addon_1", "addon_2"],
+        backup_id="1234",
+        date="2024-12-02T07:23:58.261875-05:00",
+        database_included=False,
+        extra_metadata={},
+        folders=[],
+        homeassistant_included=True,
+        homeassistant_version="2024.12.0.dev0",
+        name="test",
+        protected=True,
+        size=decrypted_backup_path.stat().st_size,
+    )
+
+    async def send_backup() -> AsyncIterator[bytes]:
+        f = decrypted_backup_path.open("rb")
+        while chunk := f.read(1024):
+            yield chunk
+
+    async def open_backup() -> AsyncIterator[bytes]:
+        return send_backup()
+
+    decryptor = EncryptedBackupStreamer(hass, backup, open_backup, "hunter2")
+    await decryptor.open_stream()
+    await decryptor.wait()
+
+
+async def test_encrypted_backup_streamer_random_nonce(hass: HomeAssistant) -> None:
+    """Test the encrypted backup streamer."""
+    decrypted_backup_path = get_fixture_path(
+        "test_backups/c0cb53bd.tar.decrypted", DOMAIN
+    )
+    encrypted_backup_path = get_fixture_path("test_backups/c0cb53bd.tar", DOMAIN)
+    backup = AgentBackup(
+        addons=["addon_1", "addon_2"],
+        backup_id="1234",
+        date="2024-12-02T07:23:58.261875-05:00",
+        database_included=False,
+        extra_metadata={},
+        folders=[],
+        homeassistant_included=True,
+        homeassistant_version="2024.12.0.dev0",
+        name="test",
+        protected=False,
+        size=decrypted_backup_path.stat().st_size,
+    )
+
+    async def send_backup() -> AsyncIterator[bytes]:
+        f = decrypted_backup_path.open("rb")
+        while chunk := f.read(1024):
+            yield chunk
+
+    async def open_backup() -> AsyncIterator[bytes]:
+        return send_backup()
+
+    encryptor1 = EncryptedBackupStreamer(hass, backup, open_backup, "hunter2")
+    encryptor2 = EncryptedBackupStreamer(hass, backup, open_backup, "hunter2")
+
+    async def read_stream(stream: AsyncIterator[bytes]) -> bytes:
+        output = b""
+        async for chunk in stream:
+            output += chunk
+        return output
+
+    # When reading twice from the same streamer, the same nonce is used.
+    encrypted_output1 = await read_stream(await encryptor1.open_stream())
+    encrypted_output2 = await read_stream(await encryptor1.open_stream())
+    assert encrypted_output1 == encrypted_output2
+
+    encrypted_output3 = await read_stream(await encryptor2.open_stream())
+    encrypted_output4 = await read_stream(await encryptor2.open_stream())
+    assert encrypted_output3 == encrypted_output4
+
+    # Wait for workers to terminate
+    await encryptor1.wait()
+    await encryptor2.wait()
+
+    # Output from the two streames should differ but have the same length.
+    assert encrypted_output1 != encrypted_output3
+    assert len(encrypted_output1) == len(encrypted_output3)
+
+    # Expect the output length to match the stored encrypted backup file, with
+    # additional padding.
+    encrypted_backup_data = encrypted_backup_path.read_bytes()
+    # 4 x 10240 byte of padding
+    assert len(encrypted_output1) == len(encrypted_backup_data) + 40960
+    assert encrypted_output1[: len(encrypted_backup_data)] != encrypted_backup_data
+
+
+async def test_encrypted_backup_streamer_error(hass: HomeAssistant) -> None:
+    """Test the encrypted backup streamer."""
+    decrypted_backup_path = get_fixture_path(
+        "test_backups/c0cb53bd.tar.decrypted", DOMAIN
+    )
+    backup = AgentBackup(
+        addons=["addon_1", "addon_2"],
+        backup_id="1234",
+        date="2024-12-02T07:23:58.261875-05:00",
+        database_included=False,
+        extra_metadata={},
+        folders=[],
+        homeassistant_included=True,
+        homeassistant_version="2024.12.0.dev0",
+        name="test",
+        protected=False,
+        size=decrypted_backup_path.stat().st_size,
+    )
+
+    async def send_backup() -> AsyncIterator[bytes]:
+        f = decrypted_backup_path.open("rb")
+        while chunk := f.read(1024):
+            yield chunk
+
+    async def open_backup() -> AsyncIterator[bytes]:
+        return send_backup()
+
+    # Patch os.urandom to return values matching the nonce used in the encrypted
+    # test backup. The backup has three inner tar files, but we need an extra nonce
+    # for a future planned supervisor.tar.
+    encryptor = EncryptedBackupStreamer(hass, backup, open_backup, "hunter2")
+
+    with patch(
+        "homeassistant.components.backup.util.tarfile.open",
+        side_effect=tarfile.TarError,
+    ):
+        encrypted_stream = await encryptor.open_stream()
+        async for _ in encrypted_stream:
+            pass
+
+    # Expect the output to match the stored encrypted backup file, with additional
+    # padding.
+    await encryptor.wait()
+    assert isinstance(encryptor._workers[0].error, tarfile.TarError)
+
+
+@pytest.mark.parametrize(
+    ("name", "resulting_filename"),
+    [
+        ("test", "test_2025-01-30_13.42_12345678.tar"),
+        ("  leading spaces", "leading_spaces_2025-01-30_13.42_12345678.tar"),
+        ("trailing spaces  ", "trailing_spaces_2025-01-30_13.42_12345678.tar"),
+        ("double  spaces  ", "double_spaces_2025-01-30_13.42_12345678.tar"),
+    ],
+)
+def test_suggested_filename(name: str, resulting_filename: str) -> None:
+    """Test suggesting a filename."""
+    backup = AgentBackup(
+        addons=[],
+        backup_id="1234",
+        date="2025-01-30 13:42:12.345678-05:00",
+        database_included=False,
+        extra_metadata={},
+        folders=[],
+        homeassistant_included=True,
+        homeassistant_version="2024.12.0.dev0",
+        name=name,
+        protected=False,
+        size=1234,
+    )
+    assert suggested_filename(backup) == resulting_filename
diff --git a/tests/components/backup/test_websocket.py b/tests/components/backup/test_websocket.py
index 52c04474162..d89e68f4ed8 100644
--- a/tests/components/backup/test_websocket.py
+++ b/tests/components/backup/test_websocket.py
@@ -11,7 +11,7 @@ from syrupy import SnapshotAssertion
 from homeassistant.components.backup import (
     AgentBackup,
     BackupAgentError,
-    BackupAgentPlatformProtocol,
+    BackupNotFound,
     BackupReaderWriterError,
     Folder,
     store,
@@ -19,6 +19,7 @@ from homeassistant.components.backup import (
 from homeassistant.components.backup.agent import BackupAgentUnreachableError
 from homeassistant.components.backup.const import DATA_MANAGER, DOMAIN
 from homeassistant.components.backup.manager import (
+    AgentBackupStatus,
     CreateBackupEvent,
     CreateBackupState,
     ManagerBackup,
@@ -26,13 +27,15 @@ from homeassistant.components.backup.manager import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import issue_registry as ir
+from homeassistant.helpers.backup import async_initialize_backup
 from homeassistant.setup import async_setup_component
 
 from .common import (
     LOCAL_AGENT_ID,
     TEST_BACKUP_ABC123,
     TEST_BACKUP_DEF456,
-    BackupAgentTest,
+    mock_backup_agent,
     setup_backup_integration,
     setup_backup_platform,
 )
@@ -44,10 +47,10 @@ BACKUP_CALL = call(
     agent_ids=["test.test-agent"],
     backup_name="test-name",
     extra_metadata={"instance_id": ANY, "with_automatic_settings": True},
-    include_addons=["test-addon"],
+    include_addons=[],
     include_all_addons=False,
     include_database=True,
-    include_folders=["media"],
+    include_folders=None,
     include_homeassistant=True,
     password="test-password",
     on_progress=ANY,
@@ -56,6 +59,8 @@ BACKUP_CALL = call(
 DEFAULT_STORAGE_DATA: dict[str, Any] = {
     "backups": [],
     "config": {
+        "agents": {},
+        "automatic_backups_configured": False,
         "create_backup": {
             "agent_ids": [],
             "include_addons": None,
@@ -96,15 +101,6 @@ def mock_delay_save() -> Generator[None]:
         yield
 
 
-@pytest.fixture(name="delete_backup")
-def mock_delete_backup() -> Generator[AsyncMock]:
-    """Mock manager delete backup."""
-    with patch(
-        "homeassistant.components.backup.BackupManager.async_delete_backup"
-    ) as mock_delete_backup:
-        yield mock_delete_backup
-
-
 @pytest.fixture(name="get_backups")
 def mock_get_backups() -> Generator[AsyncMock]:
     """Mock manager get backups."""
@@ -118,9 +114,9 @@ def mock_get_backups() -> Generator[AsyncMock]:
     ("remote_agents", "remote_backups"),
     [
         ([], {}),
-        (["remote"], {}),
-        (["remote"], {"test.remote": [TEST_BACKUP_ABC123]}),
-        (["remote"], {"test.remote": [TEST_BACKUP_DEF456]}),
+        (["test.remote"], {}),
+        (["test.remote"], {"test.remote": [TEST_BACKUP_ABC123]}),
+        (["test.remote"], {"test.remote": [TEST_BACKUP_DEF456]}),
     ],
 )
 async def test_info(
@@ -146,7 +142,8 @@ async def test_info(
 
 
 @pytest.mark.parametrize(
-    "side_effect", [HomeAssistantError("Boom!"), BackupAgentUnreachableError]
+    "side_effect",
+    [Exception("Oops"), HomeAssistantError("Boom!"), BackupAgentUnreachableError],
 )
 async def test_info_with_errors(
     hass: HomeAssistant,
@@ -155,28 +152,30 @@ async def test_info_with_errors(
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test getting backup info with one unavailable agent."""
-    await setup_backup_integration(
-        hass, with_hassio=False, backups={LOCAL_AGENT_ID: [TEST_BACKUP_ABC123]}
+    mock_agents = await setup_backup_integration(
+        hass,
+        with_hassio=False,
+        backups={LOCAL_AGENT_ID: [TEST_BACKUP_ABC123]},
+        remote_agents=["test.remote"],
     )
-    hass.data[DATA_MANAGER].backup_agents["domain.test"] = BackupAgentTest("test")
+    mock_agents["test.remote"].async_list_backups.side_effect = side_effect
 
     client = await hass_ws_client(hass)
     await hass.async_block_till_done()
 
-    with patch.object(BackupAgentTest, "async_list_backups", side_effect=side_effect):
-        await client.send_json_auto_id({"type": "backup/info"})
-        assert await client.receive_json() == snapshot
+    await client.send_json_auto_id({"type": "backup/info"})
+    assert await client.receive_json() == snapshot
 
 
 @pytest.mark.parametrize(
     ("remote_agents", "backups"),
     [
         ([], {}),
-        (["remote"], {LOCAL_AGENT_ID: [TEST_BACKUP_ABC123]}),
-        (["remote"], {"test.remote": [TEST_BACKUP_ABC123]}),
-        (["remote"], {"test.remote": [TEST_BACKUP_DEF456]}),
+        (["test.remote"], {LOCAL_AGENT_ID: [TEST_BACKUP_ABC123]}),
+        (["test.remote"], {"test.remote": [TEST_BACKUP_ABC123]}),
+        (["test.remote"], {"test.remote": [TEST_BACKUP_DEF456]}),
         (
-            ["remote"],
+            ["test.remote"],
             {
                 LOCAL_AGENT_ID: [TEST_BACKUP_ABC123],
                 "test.remote": [TEST_BACKUP_ABC123],
@@ -207,7 +206,8 @@ async def test_details(
 
 
 @pytest.mark.parametrize(
-    "side_effect", [HomeAssistantError("Boom!"), BackupAgentUnreachableError]
+    "side_effect",
+    [Exception("Oops"), HomeAssistantError("Boom!"), BackupAgentUnreachableError],
 )
 async def test_details_with_errors(
     hass: HomeAssistant,
@@ -216,33 +216,58 @@ async def test_details_with_errors(
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test getting backup info with one unavailable agent."""
-    await setup_backup_integration(
-        hass, with_hassio=False, backups={LOCAL_AGENT_ID: [TEST_BACKUP_ABC123]}
+    mock_agents = await setup_backup_integration(
+        hass,
+        with_hassio=False,
+        backups={LOCAL_AGENT_ID: [TEST_BACKUP_ABC123]},
+        remote_agents=["test.remote"],
     )
-    hass.data[DATA_MANAGER].backup_agents["domain.test"] = BackupAgentTest("test")
+    mock_agents["test.remote"].async_get_backup.side_effect = side_effect
 
     client = await hass_ws_client(hass)
     await hass.async_block_till_done()
 
-    with (
-        patch("pathlib.Path.exists", return_value=True),
-        patch.object(BackupAgentTest, "async_get_backup", side_effect=side_effect),
-    ):
+    with patch("pathlib.Path.exists", return_value=True):
         await client.send_json_auto_id(
             {"type": "backup/details", "backup_id": "abc123"}
         )
         assert await client.receive_json() == snapshot
 
 
+async def test_details_get_backup_returns_none(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    caplog: pytest.LogCaptureFixture,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test getting backup info when the agent returns None from get_backup."""
+    mock_agents = await setup_backup_integration(hass, remote_agents=["test.remote"])
+    mock_agents["test.remote"].async_get_backup.return_value = None
+    mock_agents["test.remote"].async_get_backup.side_effect = None
+
+    client = await hass_ws_client(hass)
+    await hass.async_block_till_done()
+
+    with patch("pathlib.Path.exists", return_value=True):
+        await client.send_json_auto_id(
+            {"type": "backup/details", "backup_id": "abc123"}
+        )
+        assert await client.receive_json() == snapshot
+    assert (
+        "Detected that integration 'test' returns None from BackupAgent.async_get_backup."
+        in caplog.text
+    )
+
+
 @pytest.mark.parametrize(
     ("remote_agents", "backups"),
     [
         ([], {}),
-        (["remote"], {LOCAL_AGENT_ID: [TEST_BACKUP_ABC123]}),
-        (["remote"], {"test.remote": [TEST_BACKUP_ABC123]}),
-        (["remote"], {"test.remote": [TEST_BACKUP_DEF456]}),
+        (["test.remote"], {LOCAL_AGENT_ID: [TEST_BACKUP_ABC123]}),
+        (["test.remote"], {"test.remote": [TEST_BACKUP_ABC123]}),
+        (["test.remote"], {"test.remote": [TEST_BACKUP_DEF456]}),
         (
-            ["remote"],
+            ["test.remote"],
             {
                 LOCAL_AGENT_ID: [TEST_BACKUP_ABC123],
                 "test.remote": [TEST_BACKUP_ABC123],
@@ -308,17 +333,22 @@ async def test_delete_with_errors(
         "version": store.STORAGE_VERSION,
         "minor_version": store.STORAGE_VERSION_MINOR,
     }
-    await setup_backup_integration(
-        hass, with_hassio=False, backups={LOCAL_AGENT_ID: [TEST_BACKUP_ABC123]}
+    mock_agents = await setup_backup_integration(
+        hass,
+        with_hassio=False,
+        backups={
+            LOCAL_AGENT_ID: [TEST_BACKUP_ABC123],
+            "test.remote": [TEST_BACKUP_ABC123],
+        },
+        remote_agents=["test.remote"],
     )
-    hass.data[DATA_MANAGER].backup_agents["domain.test"] = BackupAgentTest("test")
+    mock_agents["test.remote"].async_delete_backup.side_effect = side_effect
 
     client = await hass_ws_client(hass)
     await hass.async_block_till_done()
 
-    with patch.object(BackupAgentTest, "async_delete_backup", side_effect=side_effect):
-        await client.send_json_auto_id({"type": "backup/delete", "backup_id": "abc123"})
-        assert await client.receive_json() == snapshot
+    await client.send_json_auto_id({"type": "backup/delete", "backup_id": "abc123"})
+    assert await client.receive_json() == snapshot
 
     await client.send_json_auto_id({"type": "backup/info"})
     assert await client.receive_json() == snapshot
@@ -330,22 +360,22 @@ async def test_agent_delete_backup(
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test deleting a backup file with a mock agent."""
-    await setup_backup_integration(hass)
-    hass.data[DATA_MANAGER].backup_agents = {"domain.test": BackupAgentTest("test")}
+    mock_agents = await setup_backup_integration(
+        hass, with_hassio=False, remote_agents=["test.remote"]
+    )
 
     client = await hass_ws_client(hass)
     await hass.async_block_till_done()
 
-    with patch.object(BackupAgentTest, "async_delete_backup") as delete_mock:
-        await client.send_json_auto_id(
-            {
-                "type": "backup/delete",
-                "backup_id": "abc123",
-            }
-        )
-        assert await client.receive_json() == snapshot
+    await client.send_json_auto_id(
+        {
+            "type": "backup/delete",
+            "backup_id": "abc123",
+        }
+    )
+    assert await client.receive_json() == snapshot
 
-    assert delete_mock.call_args == call("abc123")
+    assert mock_agents["test.remote"].async_delete_backup.call_args == call("abc123")
 
 
 @pytest.mark.parametrize(
@@ -587,20 +617,14 @@ async def test_generate_with_default_settings_calls_create(
     last_completed_automatic_backup: str,
 ) -> None:
     """Test backup/generate_with_automatic_settings calls async_initiate_backup."""
+    created_backup: MagicMock = create_backup.return_value[1].result().backup
+    created_backup.protected = create_backup_settings["password"] is not None
     client = await hass_ws_client(hass)
     await hass.config.async_set_time_zone("Europe/Amsterdam")
     freezer.move_to("2024-11-13T12:01:00+01:00")
-    remote_agent = BackupAgentTest("remote", backups=[])
-    await setup_backup_platform(
-        hass,
-        domain="test",
-        platform=Mock(
-            async_get_backup_agents=AsyncMock(return_value=[remote_agent]),
-            spec_set=BackupAgentPlatformProtocol,
-        ),
+    mock_agents = await setup_backup_integration(
+        hass, with_hassio=False, remote_agents=["test.remote"]
     )
-    await async_setup_component(hass, DOMAIN, {})
-    await hass.async_block_till_done()
 
     await client.send_json_auto_id(
         {"type": "backup/config/update", "create_backup": create_backup_settings}
@@ -625,15 +649,13 @@ async def test_generate_with_default_settings_calls_create(
         is None
     )
 
-    with patch.object(remote_agent, "async_upload_backup", side_effect=side_effect):
-        await client.send_json_auto_id(
-            {"type": "backup/generate_with_automatic_settings"}
-        )
-        result = await client.receive_json()
-        assert result["success"]
-        assert result["result"] == {"backup_job_id": "abc123"}
+    mock_agents["test.remote"].async_upload_backup.side_effect = side_effect
+    await client.send_json_auto_id({"type": "backup/generate_with_automatic_settings"})
+    result = await client.receive_json()
+    assert result["success"]
+    assert result["result"] == {"backup_job_id": "abc123"}
 
-        await hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     create_backup.assert_called_once_with(**expected_call_params)
 
@@ -690,8 +712,8 @@ async def test_restore_local_agent(
 @pytest.mark.parametrize(
     ("remote_agents", "backups"),
     [
-        (["remote"], {}),
-        (["remote"], {"test.remote": [TEST_BACKUP_ABC123]}),
+        (["test.remote"], {}),
+        (["test.remote"], {"test.remote": [TEST_BACKUP_ABC123]}),
     ],
 )
 async def test_restore_remote_agent(
@@ -702,6 +724,7 @@ async def test_restore_remote_agent(
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test calling the restore command."""
+
     await setup_backup_integration(
         hass, with_hassio=False, backups=backups, remote_agents=remote_agents
     )
@@ -726,6 +749,36 @@ async def test_restore_remote_agent(
     assert len(restart_calls) == snapshot
 
 
+async def test_restore_remote_agent_get_backup_returns_none(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    caplog: pytest.LogCaptureFixture,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test calling the restore command when the agent returns None from get_backup."""
+    mock_agents = await setup_backup_integration(hass, remote_agents=["test.remote"])
+    mock_agents["test.remote"].async_get_backup.return_value = None
+    mock_agents["test.remote"].async_get_backup.side_effect = None
+    restart_calls = async_mock_service(hass, "homeassistant", "restart")
+
+    client = await hass_ws_client(hass)
+    await hass.async_block_till_done()
+
+    await client.send_json_auto_id(
+        {
+            "type": "backup/restore",
+            "backup_id": "abc123",
+            "agent_id": "test.remote",
+        }
+    )
+    assert await client.receive_json() == snapshot
+    assert len(restart_calls) == 0
+    assert (
+        "Detected that integration 'test' returns None from BackupAgent.async_get_backup."
+        in caplog.text
+    )
+
+
 async def test_restore_wrong_password(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
@@ -893,8 +946,9 @@ async def test_agents_info(
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test getting backup agents info."""
-    await setup_backup_integration(hass, with_hassio=False)
-    hass.data[DATA_MANAGER].backup_agents["domain.test"] = BackupAgentTest("test")
+    await setup_backup_integration(
+        hass, with_hassio=False, remote_agents=["test.remote"]
+    )
 
     client = await hass_ws_client(hass)
     await hass.async_block_till_done()
@@ -903,7 +957,7 @@ async def test_agents_info(
     assert await client.receive_json() == snapshot
 
 
-@pytest.mark.usefixtures("create_backup", "delete_backup", "get_backups")
+@pytest.mark.usefixtures("get_backups")
 @pytest.mark.parametrize(
     "storage_data",
     [
@@ -913,6 +967,8 @@ async def test_agents_info(
                 "data": {
                     "backups": [],
                     "config": {
+                        "agents": {},
+                        "automatic_backups_configured": False,
                         "create_backup": {
                             "agent_ids": ["test-agent"],
                             "include_addons": ["test-addon"],
@@ -943,6 +999,8 @@ async def test_agents_info(
                 "data": {
                     "backups": [],
                     "config": {
+                        "agents": {},
+                        "automatic_backups_configured": True,
                         "create_backup": {
                             "agent_ids": ["test-agent"],
                             "include_addons": None,
@@ -973,6 +1031,8 @@ async def test_agents_info(
                 "data": {
                     "backups": [],
                     "config": {
+                        "agents": {},
+                        "automatic_backups_configured": False,
                         "create_backup": {
                             "agent_ids": ["test-agent"],
                             "include_addons": None,
@@ -1003,6 +1063,8 @@ async def test_agents_info(
                 "data": {
                     "backups": [],
                     "config": {
+                        "agents": {},
+                        "automatic_backups_configured": False,
                         "create_backup": {
                             "agent_ids": ["test-agent"],
                             "include_addons": None,
@@ -1033,6 +1095,8 @@ async def test_agents_info(
                 "data": {
                     "backups": [],
                     "config": {
+                        "agents": {},
+                        "automatic_backups_configured": False,
                         "create_backup": {
                             "agent_ids": ["test-agent"],
                             "include_addons": None,
@@ -1063,6 +1127,8 @@ async def test_agents_info(
                 "data": {
                     "backups": [],
                     "config": {
+                        "agents": {},
+                        "automatic_backups_configured": False,
                         "create_backup": {
                             "agent_ids": ["test-agent"],
                             "include_addons": None,
@@ -1088,107 +1154,277 @@ async def test_agents_info(
                 "minor_version": store.STORAGE_VERSION_MINOR,
             },
         },
+        {
+            "backup": {
+                "data": {
+                    "backups": [],
+                    "config": {
+                        "agents": {
+                            "test-agent1": {"protected": True},
+                            "test-agent2": {"protected": False},
+                        },
+                        "automatic_backups_configured": False,
+                        "create_backup": {
+                            "agent_ids": ["test-agent"],
+                            "include_addons": None,
+                            "include_all_addons": False,
+                            "include_database": False,
+                            "include_folders": None,
+                            "name": None,
+                            "password": None,
+                        },
+                        "retention": {"copies": None, "days": None},
+                        "last_attempted_automatic_backup": None,
+                        "last_completed_automatic_backup": None,
+                        "schedule": {
+                            "days": ["mon", "sun"],
+                            "recurrence": "custom_days",
+                            "state": "never",
+                            "time": None,
+                        },
+                    },
+                },
+                "key": DOMAIN,
+                "version": store.STORAGE_VERSION,
+                "minor_version": store.STORAGE_VERSION_MINOR,
+            },
+        },
+        {
+            "backup": {
+                "data": {
+                    "backups": [],
+                    "config": {
+                        "agents": {},
+                        "automatic_backups_configured": True,
+                        "create_backup": {
+                            "agent_ids": ["hassio.local", "hassio.share", "test-agent"],
+                            "include_addons": None,
+                            "include_all_addons": False,
+                            "include_database": False,
+                            "include_folders": None,
+                            "name": None,
+                            "password": None,
+                        },
+                        "retention": {"copies": None, "days": None},
+                        "last_attempted_automatic_backup": None,
+                        "last_completed_automatic_backup": None,
+                        "schedule": {
+                            "days": [],
+                            "recurrence": "never",
+                            "state": "never",
+                            "time": None,
+                        },
+                    },
+                },
+                "key": DOMAIN,
+                "version": store.STORAGE_VERSION,
+                "minor_version": store.STORAGE_VERSION_MINOR,
+            },
+        },
+        {
+            "backup": {
+                "data": {
+                    "backups": [],
+                    "config": {
+                        "agents": {},
+                        "automatic_backups_configured": True,
+                        "create_backup": {
+                            "agent_ids": ["backup.local", "test-agent"],
+                            "include_addons": None,
+                            "include_all_addons": False,
+                            "include_database": False,
+                            "include_folders": None,
+                            "name": None,
+                            "password": None,
+                        },
+                        "retention": {"copies": None, "days": None},
+                        "last_attempted_automatic_backup": None,
+                        "last_completed_automatic_backup": None,
+                        "schedule": {
+                            "days": [],
+                            "recurrence": "never",
+                            "state": "never",
+                            "time": None,
+                        },
+                    },
+                },
+                "key": DOMAIN,
+                "version": store.STORAGE_VERSION,
+                "minor_version": store.STORAGE_VERSION_MINOR,
+            },
+        },
     ],
 )
+@pytest.mark.parametrize(
+    ("with_hassio"),
+    [
+        pytest.param(True, id="with_hassio"),
+        pytest.param(False, id="without_hassio"),
+    ],
+)
+@pytest.mark.usefixtures("supervisor_client")
 @patch("homeassistant.components.backup.config.random.randint", Mock(return_value=600))
-async def test_config_info(
+async def test_config_load_config_info(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
     freezer: FrozenDateTimeFactory,
     snapshot: SnapshotAssertion,
     hass_storage: dict[str, Any],
+    with_hassio: bool,
     storage_data: dict[str, Any] | None,
 ) -> None:
-    """Test getting backup config info."""
+    """Test loading stored backup config and reading it via config/info."""
     client = await hass_ws_client(hass)
     await hass.config.async_set_time_zone("Europe/Amsterdam")
     freezer.move_to("2024-11-13T12:01:00+01:00")
 
     hass_storage.update(storage_data)
 
-    await setup_backup_integration(hass)
+    await setup_backup_integration(hass, with_hassio=with_hassio)
     await hass.async_block_till_done()
 
     await client.send_json_auto_id({"type": "backup/config/info"})
     assert await client.receive_json() == snapshot
 
 
-@pytest.mark.usefixtures("create_backup", "delete_backup", "get_backups")
+@pytest.mark.usefixtures("get_backups")
 @pytest.mark.parametrize(
-    "command",
+    "commands",
     [
-        {
-            "type": "backup/config/update",
-            "create_backup": {"agent_ids": ["test-agent"]},
-            "retention": {"copies": None, "days": 7},
-        },
-        {
-            "type": "backup/config/update",
-            "create_backup": {"agent_ids": ["test-agent"]},
-            "schedule": {"recurrence": "daily", "time": "06:00"},
-        },
-        {
-            "type": "backup/config/update",
-            "create_backup": {"agent_ids": ["test-agent"]},
-            "schedule": {"days": ["mon"], "recurrence": "custom_days"},
-        },
-        {
-            "type": "backup/config/update",
-            "create_backup": {"agent_ids": ["test-agent"]},
-            "schedule": {"recurrence": "never"},
-        },
-        {
-            "type": "backup/config/update",
-            "create_backup": {"agent_ids": ["test-agent"]},
-            "schedule": {"days": ["mon", "sun"], "recurrence": "custom_days"},
-        },
-        {
-            "type": "backup/config/update",
-            "create_backup": {
-                "agent_ids": ["test-agent"],
-                "include_addons": ["test-addon"],
-                "include_folders": ["media"],
-                "name": "test-name",
-                "password": "test-password",
+        [
+            {
+                "type": "backup/config/update",
+                "create_backup": {"agent_ids": ["test-agent"]},
+                "retention": {"copies": None, "days": 7},
+            }
+        ],
+        [
+            {
+                "type": "backup/config/update",
+                "create_backup": {"agent_ids": ["test-agent"]},
+                "schedule": {"recurrence": "daily", "time": "06:00"},
+            }
+        ],
+        [
+            {
+                "type": "backup/config/update",
+                "create_backup": {"agent_ids": ["test-agent"]},
+                "schedule": {"days": ["mon"], "recurrence": "custom_days"},
+            }
+        ],
+        [
+            {
+                "type": "backup/config/update",
+                "create_backup": {"agent_ids": ["test-agent"]},
+                "schedule": {"recurrence": "never"},
+            }
+        ],
+        [
+            {
+                "type": "backup/config/update",
+                "create_backup": {"agent_ids": ["test-agent"]},
+                "schedule": {"days": ["mon", "sun"], "recurrence": "custom_days"},
+            }
+        ],
+        [
+            {
+                "type": "backup/config/update",
+                "create_backup": {
+                    "agent_ids": ["test-agent"],
+                    "include_addons": ["test-addon"],
+                    "include_folders": ["media"],
+                    "name": "test-name",
+                    "password": "test-password",
+                },
+                "schedule": {"recurrence": "daily"},
+            }
+        ],
+        [
+            {
+                "type": "backup/config/update",
+                "create_backup": {"agent_ids": ["test-agent"]},
+                "retention": {"copies": 3, "days": 7},
+                "schedule": {"recurrence": "daily"},
+            }
+        ],
+        [
+            {
+                "type": "backup/config/update",
+                "create_backup": {"agent_ids": ["test-agent"]},
+                "retention": {"copies": None, "days": None},
+                "schedule": {"recurrence": "daily"},
+            }
+        ],
+        [
+            {
+                "type": "backup/config/update",
+                "create_backup": {"agent_ids": ["test-agent"]},
+                "retention": {"copies": 3, "days": None},
+                "schedule": {"recurrence": "daily"},
+            }
+        ],
+        [
+            {
+                "type": "backup/config/update",
+                "create_backup": {"agent_ids": ["test-agent"]},
+                "retention": {"copies": None, "days": 7},
+                "schedule": {"recurrence": "daily"},
+            }
+        ],
+        [
+            {
+                "type": "backup/config/update",
+                "create_backup": {"agent_ids": ["test-agent"]},
+                "retention": {"copies": 3},
+                "schedule": {"recurrence": "daily"},
+            }
+        ],
+        [
+            {
+                "type": "backup/config/update",
+                "create_backup": {"agent_ids": ["test-agent"]},
+                "retention": {"days": 7},
+                "schedule": {"recurrence": "daily"},
+            }
+        ],
+        [
+            {
+                "type": "backup/config/update",
+                "agents": {
+                    "test-agent1": {"protected": True},
+                    "test-agent2": {"protected": False},
+                },
+            }
+        ],
+        [
+            # Test we can update AgentConfig
+            {
+                "type": "backup/config/update",
+                "agents": {
+                    "test-agent1": {"protected": True},
+                    "test-agent2": {"protected": False},
+                },
             },
-            "schedule": {"recurrence": "daily"},
-        },
-        {
-            "type": "backup/config/update",
-            "create_backup": {"agent_ids": ["test-agent"]},
-            "retention": {"copies": 3, "days": 7},
-            "schedule": {"recurrence": "daily"},
-        },
-        {
-            "type": "backup/config/update",
-            "create_backup": {"agent_ids": ["test-agent"]},
-            "retention": {"copies": None, "days": None},
-            "schedule": {"recurrence": "daily"},
-        },
-        {
-            "type": "backup/config/update",
-            "create_backup": {"agent_ids": ["test-agent"]},
-            "retention": {"copies": 3, "days": None},
-            "schedule": {"recurrence": "daily"},
-        },
-        {
-            "type": "backup/config/update",
-            "create_backup": {"agent_ids": ["test-agent"]},
-            "retention": {"copies": None, "days": 7},
-            "schedule": {"recurrence": "daily"},
-        },
-        {
-            "type": "backup/config/update",
-            "create_backup": {"agent_ids": ["test-agent"]},
-            "retention": {"copies": 3},
-            "schedule": {"recurrence": "daily"},
-        },
-        {
-            "type": "backup/config/update",
-            "create_backup": {"agent_ids": ["test-agent"]},
-            "retention": {"days": 7},
-            "schedule": {"recurrence": "daily"},
-        },
+            {
+                "type": "backup/config/update",
+                "agents": {
+                    "test-agent1": {"protected": False},
+                    "test-agent2": {"protected": True},
+                },
+            },
+        ],
+        [
+            {
+                "type": "backup/config/update",
+                "automatic_backups_configured": False,
+            }
+        ],
+        [
+            {
+                "type": "backup/config/update",
+                "automatic_backups_configured": True,
+            }
+        ],
     ],
 )
 @patch("homeassistant.components.backup.config.random.randint", Mock(return_value=600))
@@ -1197,7 +1433,7 @@ async def test_config_update(
     hass_ws_client: WebSocketGenerator,
     freezer: FrozenDateTimeFactory,
     snapshot: SnapshotAssertion,
-    command: dict[str, Any],
+    commands: dict[str, Any],
     hass_storage: dict[str, Any],
 ) -> None:
     """Test updating the backup config."""
@@ -1211,14 +1447,14 @@ async def test_config_update(
     await client.send_json_auto_id({"type": "backup/config/info"})
     assert await client.receive_json() == snapshot
 
-    await client.send_json_auto_id(command)
-    result = await client.receive_json()
+    for command in commands:
+        await client.send_json_auto_id(command)
+        result = await client.receive_json()
+        assert result["success"]
 
-    assert result["success"]
-
-    await client.send_json_auto_id({"type": "backup/config/info"})
-    assert await client.receive_json() == snapshot
-    await hass.async_block_till_done()
+        await client.send_json_auto_id({"type": "backup/config/info"})
+        assert await client.receive_json() == snapshot
+        await hass.async_block_till_done()
 
     # Trigger store write
     freezer.tick(60)
@@ -1228,7 +1464,7 @@ async def test_config_update(
     assert hass_storage[DOMAIN] == snapshot
 
 
-@pytest.mark.usefixtures("create_backup", "delete_backup", "get_backups")
+@pytest.mark.usefixtures("get_backups")
 @pytest.mark.parametrize(
     "command",
     [
@@ -1274,6 +1510,18 @@ async def test_config_update(
             "type": "backup/config/update",
             "create_backup": {"include_folders": ["media", "media"]},
         },
+        {
+            "type": "backup/config/update",
+            "agents": {"test-agent1": {"favorite": True}},
+        },
+        {
+            "type": "backup/config/update",
+            "retention": {"copies": 0},
+        },
+        {
+            "type": "backup/config/update",
+            "retention": {"days": 0},
+        },
     ],
 )
 async def test_config_update_errors(
@@ -1600,16 +1848,21 @@ async def test_config_schedule_logic(
     create_backup_side_effect: list[Exception | None] | None,
 ) -> None:
     """Test config schedule logic."""
+    created_backup: MagicMock = create_backup.return_value[1].result().backup
+    created_backup.protected = True
+
     client = await hass_ws_client(hass)
     storage_data = {
         "backups": [],
         "config": {
+            "agents": {},
+            "automatic_backups_configured": False,
             "create_backup": {
                 "agent_ids": ["test.test-agent"],
-                "include_addons": ["test-addon"],
+                "include_addons": [],
                 "include_all_addons": False,
                 "include_database": True,
-                "include_folders": ["media"],
+                "include_folders": [],
                 "name": "test-name",
                 "password": "test-password",
             },
@@ -1634,7 +1887,7 @@ async def test_config_schedule_logic(
     await hass.config.async_set_time_zone("Europe/Amsterdam")
     freezer.move_to("2024-11-11 12:00:00+01:00")
 
-    await setup_backup_integration(hass, remote_agents=["test-agent"])
+    await setup_backup_integration(hass, remote_agents=["test.test-agent"])
     await hass.async_block_till_done()
 
     for command in commands:
@@ -1677,14 +1930,13 @@ async def test_config_schedule_logic(
         "command",
         "backups",
         "get_backups_agent_errors",
-        "delete_backup_agent_errors",
+        "delete_backup_side_effects",
         "last_backup_time",
         "next_time",
         "backup_time",
         "backup_calls",
         "get_backups_calls",
         "delete_calls",
-        "delete_args_list",
     ),
     [
         (
@@ -1696,21 +1948,25 @@ async def test_config_schedule_logic(
             },
             {
                 "backup-1": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-3": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-4": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
@@ -1723,8 +1979,7 @@ async def test_config_schedule_logic(
             "2024-11-12T04:45:00+01:00",
             1,
             1,  # we get backups even if backup retention copies is None
-            0,
-            [],
+            {},
         ),
         (
             {
@@ -1735,21 +1990,25 @@ async def test_config_schedule_logic(
             },
             {
                 "backup-1": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-3": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-4": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
@@ -1762,8 +2021,7 @@ async def test_config_schedule_logic(
             "2024-11-12T04:45:00+01:00",
             1,
             1,
-            0,
-            [],
+            {},
         ),
         (
             {
@@ -1774,11 +2032,13 @@ async def test_config_schedule_logic(
             },
             {
                 "backup-1": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
@@ -1791,8 +2051,7 @@ async def test_config_schedule_logic(
             "2024-11-12T04:45:00+01:00",
             1,
             1,
-            0,
-            [],
+            {},
         ),
         (
             {
@@ -1803,26 +2062,46 @@ async def test_config_schedule_logic(
             },
             {
                 "backup-1": MagicMock(
+                    agents={
+                        "test.test-agent": MagicMock(spec=AgentBackupStatus),
+                        "test.test-agent2": MagicMock(spec=AgentBackupStatus),
+                    },
                     date="2024-11-09T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={
+                        "test.test-agent": MagicMock(spec=AgentBackupStatus),
+                        "test.test-agent2": MagicMock(spec=AgentBackupStatus),
+                    },
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-3": MagicMock(
+                    agents={
+                        "test.test-agent": MagicMock(spec=AgentBackupStatus),
+                        "test.test-agent2": MagicMock(spec=AgentBackupStatus),
+                    },
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-4": MagicMock(
+                    agents={
+                        "test.test-agent": MagicMock(spec=AgentBackupStatus),
+                        "test.test-agent2": MagicMock(spec=AgentBackupStatus),
+                    },
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-5": MagicMock(
+                    agents={
+                        "test.test-agent": MagicMock(spec=AgentBackupStatus),
+                        "test.test-agent2": MagicMock(spec=AgentBackupStatus),
+                    },
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
@@ -1835,8 +2114,75 @@ async def test_config_schedule_logic(
             "2024-11-12T04:45:00+01:00",
             1,
             1,
+            {
+                "test.test-agent": [call("backup-1")],
+                "test.test-agent2": [call("backup-1")],
+            },
+        ),
+        (
+            {
+                "type": "backup/config/update",
+                "create_backup": {"agent_ids": ["test.test-agent"]},
+                "retention": {"copies": 3, "days": None},
+                "schedule": {"recurrence": "daily"},
+            },
+            {
+                "backup-1": MagicMock(
+                    agents={
+                        "test.test-agent": MagicMock(spec=AgentBackupStatus),
+                        "test.test-agent2": MagicMock(spec=AgentBackupStatus),
+                    },
+                    date="2024-11-09T04:45:00+01:00",
+                    with_automatic_settings=True,
+                    spec=ManagerBackup,
+                ),
+                "backup-2": MagicMock(
+                    agents={
+                        "test.test-agent": MagicMock(spec=AgentBackupStatus),
+                        "test.test-agent2": MagicMock(spec=AgentBackupStatus),
+                    },
+                    date="2024-11-10T04:45:00+01:00",
+                    with_automatic_settings=True,
+                    spec=ManagerBackup,
+                ),
+                "backup-3": MagicMock(
+                    agents={
+                        "test.test-agent": MagicMock(spec=AgentBackupStatus),
+                        "test.test-agent2": MagicMock(spec=AgentBackupStatus),
+                    },
+                    date="2024-11-11T04:45:00+01:00",
+                    with_automatic_settings=True,
+                    spec=ManagerBackup,
+                ),
+                "backup-4": MagicMock(
+                    agents={
+                        "test.test-agent": MagicMock(spec=AgentBackupStatus),
+                    },
+                    date="2024-11-12T04:45:00+01:00",
+                    with_automatic_settings=True,
+                    spec=ManagerBackup,
+                ),
+                "backup-5": MagicMock(
+                    agents={
+                        "test.test-agent": MagicMock(spec=AgentBackupStatus),
+                        "test.test-agent2": MagicMock(spec=AgentBackupStatus),
+                    },
+                    date="2024-11-12T04:45:00+01:00",
+                    with_automatic_settings=False,
+                    spec=ManagerBackup,
+                ),
+            },
+            {},
+            {},
+            "2024-11-11T04:45:00+01:00",
+            "2024-11-12T04:45:00+01:00",
+            "2024-11-12T04:45:00+01:00",
             1,
-            [call("backup-1")],
+            1,
+            {
+                "test.test-agent": [call("backup-1")],
+                "test.test-agent2": [call("backup-1")],
+            },
         ),
         (
             {
@@ -1847,26 +2193,31 @@ async def test_config_schedule_logic(
             },
             {
                 "backup-1": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-09T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-3": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-4": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-5": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
@@ -1879,8 +2230,7 @@ async def test_config_schedule_logic(
             "2024-11-12T04:45:00+01:00",
             1,
             1,
-            2,
-            [call("backup-1"), call("backup-2")],
+            {"test.test-agent": [call("backup-1"), call("backup-2")]},
         ),
         (
             {
@@ -1891,35 +2241,38 @@ async def test_config_schedule_logic(
             },
             {
                 "backup-1": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-3": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-4": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
                 ),
             },
-            {"test-agent": BackupAgentError("Boom!")},
+            {"test.test-agent": BackupAgentError("Boom!")},
             {},
             "2024-11-11T04:45:00+01:00",
             "2024-11-12T04:45:00+01:00",
             "2024-11-12T04:45:00+01:00",
             1,
             1,
-            1,
-            [call("backup-1")],
+            {"test.test-agent": [call("backup-1")]},
         ),
         (
             {
@@ -1930,65 +2283,88 @@ async def test_config_schedule_logic(
             },
             {
                 "backup-1": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-3": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-4": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
                 ),
             },
             {},
-            {"test-agent": BackupAgentError("Boom!")},
+            {"test.test-agent": BackupAgentError("Boom!")},
             "2024-11-11T04:45:00+01:00",
             "2024-11-12T04:45:00+01:00",
             "2024-11-12T04:45:00+01:00",
             1,
             1,
-            1,
-            [call("backup-1")],
+            {"test.test-agent": [call("backup-1")]},
         ),
         (
             {
                 "type": "backup/config/update",
                 "create_backup": {"agent_ids": ["test.test-agent"]},
-                "retention": {"copies": 0, "days": None},
+                "retention": {"copies": 1, "days": None},
                 "schedule": {"recurrence": "daily"},
             },
             {
                 "backup-1": MagicMock(
+                    agents={
+                        "test.test-agent": MagicMock(spec=AgentBackupStatus),
+                        "test.test-agent2": MagicMock(spec=AgentBackupStatus),
+                    },
                     date="2024-11-09T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={
+                        "test.test-agent": MagicMock(spec=AgentBackupStatus),
+                        "test.test-agent2": MagicMock(spec=AgentBackupStatus),
+                    },
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-3": MagicMock(
+                    agents={
+                        "test.test-agent": MagicMock(spec=AgentBackupStatus),
+                        "test.test-agent2": MagicMock(spec=AgentBackupStatus),
+                    },
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-4": MagicMock(
+                    agents={
+                        "test.test-agent": MagicMock(spec=AgentBackupStatus),
+                        "test.test-agent2": MagicMock(spec=AgentBackupStatus),
+                    },
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-5": MagicMock(
+                    agents={
+                        "test.test-agent": MagicMock(spec=AgentBackupStatus),
+                        "test.test-agent2": MagicMock(spec=AgentBackupStatus),
+                    },
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
@@ -2001,23 +2377,67 @@ async def test_config_schedule_logic(
             "2024-11-12T04:45:00+01:00",
             1,
             1,
-            3,
-            [call("backup-1"), call("backup-2"), call("backup-3")],
+            {
+                "test.test-agent": [
+                    call("backup-1"),
+                    call("backup-2"),
+                    call("backup-3"),
+                ],
+                "test.test-agent2": [
+                    call("backup-1"),
+                    call("backup-2"),
+                    call("backup-3"),
+                ],
+            },
         ),
         (
             {
                 "type": "backup/config/update",
                 "create_backup": {"agent_ids": ["test.test-agent"]},
-                "retention": {"copies": 0, "days": None},
+                "retention": {"copies": 1, "days": None},
                 "schedule": {"recurrence": "daily"},
             },
             {
                 "backup-1": MagicMock(
-                    date="2024-11-12T04:45:00+01:00",
+                    agents={
+                        "test.test-agent": MagicMock(spec=AgentBackupStatus),
+                        "test.test-agent2": MagicMock(spec=AgentBackupStatus),
+                    },
+                    date="2024-11-09T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={
+                        "test.test-agent": MagicMock(spec=AgentBackupStatus),
+                        "test.test-agent2": MagicMock(spec=AgentBackupStatus),
+                    },
+                    date="2024-11-10T04:45:00+01:00",
+                    with_automatic_settings=True,
+                    spec=ManagerBackup,
+                ),
+                "backup-3": MagicMock(
+                    agents={
+                        "test.test-agent": MagicMock(spec=AgentBackupStatus),
+                        "test.test-agent2": MagicMock(spec=AgentBackupStatus),
+                    },
+                    date="2024-11-11T04:45:00+01:00",
+                    with_automatic_settings=True,
+                    spec=ManagerBackup,
+                ),
+                "backup-4": MagicMock(
+                    agents={
+                        "test.test-agent": MagicMock(spec=AgentBackupStatus),
+                    },
+                    date="2024-11-12T04:45:00+01:00",
+                    with_automatic_settings=True,
+                    spec=ManagerBackup,
+                ),
+                "backup-5": MagicMock(
+                    agents={
+                        "test.test-agent": MagicMock(spec=AgentBackupStatus),
+                        "test.test-agent2": MagicMock(spec=AgentBackupStatus),
+                    },
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
@@ -2030,8 +2450,44 @@ async def test_config_schedule_logic(
             "2024-11-12T04:45:00+01:00",
             1,
             1,
-            0,
-            [],
+            {
+                "test.test-agent": [
+                    call("backup-1"),
+                    call("backup-2"),
+                    call("backup-3"),
+                ],
+                "test.test-agent2": [call("backup-1"), call("backup-2")],
+            },
+        ),
+        (
+            {
+                "type": "backup/config/update",
+                "create_backup": {"agent_ids": ["test.test-agent"]},
+                "retention": {"copies": 1, "days": None},
+                "schedule": {"recurrence": "daily"},
+            },
+            {
+                "backup-1": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
+                    date="2024-11-12T04:45:00+01:00",
+                    with_automatic_settings=True,
+                    spec=ManagerBackup,
+                ),
+                "backup-2": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
+                    date="2024-11-12T04:45:00+01:00",
+                    with_automatic_settings=False,
+                    spec=ManagerBackup,
+                ),
+            },
+            {},
+            {},
+            "2024-11-11T04:45:00+01:00",
+            "2024-11-12T04:45:00+01:00",
+            "2024-11-12T04:45:00+01:00",
+            1,
+            1,
+            {},
         ),
     ],
 )
@@ -2042,25 +2498,28 @@ async def test_config_retention_copies_logic(
     freezer: FrozenDateTimeFactory,
     hass_storage: dict[str, Any],
     create_backup: AsyncMock,
-    delete_backup: AsyncMock,
     get_backups: AsyncMock,
     command: dict[str, Any],
     backups: dict[str, Any],
     get_backups_agent_errors: dict[str, Exception],
-    delete_backup_agent_errors: dict[str, Exception],
+    delete_backup_side_effects: dict[str, Exception],
     last_backup_time: str,
     next_time: str,
     backup_time: str,
     backup_calls: int,
     get_backups_calls: int,
-    delete_calls: int,
-    delete_args_list: Any,
+    delete_calls: dict[str, Any],
 ) -> None:
     """Test config backup retention copies logic."""
+    created_backup: MagicMock = create_backup.return_value[1].result().backup
+    created_backup.protected = True
+
     client = await hass_ws_client(hass)
     storage_data = {
         "backups": [],
         "config": {
+            "agents": {},
+            "automatic_backups_configured": False,
             "create_backup": {
                 "agent_ids": ["test-agent"],
                 "include_addons": ["test-addon"],
@@ -2088,13 +2547,17 @@ async def test_config_retention_copies_logic(
         "minor_version": store.STORAGE_VERSION_MINOR,
     }
     get_backups.return_value = (backups, get_backups_agent_errors)
-    delete_backup.return_value = delete_backup_agent_errors
     await hass.config.async_set_time_zone("Europe/Amsterdam")
     freezer.move_to("2024-11-11 12:00:00+01:00")
 
-    await setup_backup_integration(hass, remote_agents=["test-agent"])
+    mock_agents = await setup_backup_integration(
+        hass, remote_agents=["test.test-agent", "test.test-agent2"]
+    )
     await hass.async_block_till_done()
 
+    for agent_id, agent in mock_agents.items():
+        agent.async_delete_backup.side_effect = delete_backup_side_effects.get(agent_id)
+
     await client.send_json_auto_id(command)
     result = await client.receive_json()
 
@@ -2105,8 +2568,10 @@ async def test_config_retention_copies_logic(
     await hass.async_block_till_done()
     assert create_backup.call_count == backup_calls
     assert get_backups.call_count == get_backups_calls
-    assert delete_backup.call_count == delete_calls
-    assert delete_backup.call_args_list == delete_args_list
+    for agent_id, agent in mock_agents.items():
+        agent_delete_calls = delete_calls.get(agent_id, [])
+        assert agent.async_delete_backup.call_count == len(agent_delete_calls)
+        assert agent.async_delete_backup.call_args_list == agent_delete_calls
     async_fire_time_changed(hass, fire_all=True)  # flush out storage save
     await hass.async_block_till_done()
     assert (
@@ -2137,11 +2602,9 @@ async def test_config_retention_copies_logic(
         "config_command",
         "backups",
         "get_backups_agent_errors",
-        "delete_backup_agent_errors",
         "backup_calls",
         "get_backups_calls",
         "delete_calls",
-        "delete_args_list",
     ),
     [
         (
@@ -2153,32 +2616,34 @@ async def test_config_retention_copies_logic(
             },
             {
                 "backup-1": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-3": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-4": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
                 ),
             },
             {},
-            {},
             1,
             1,  # we get backups even if backup retention copies is None
-            0,
-            [],
+            {},
         ),
         (
             {
@@ -2189,32 +2654,34 @@ async def test_config_retention_copies_logic(
             },
             {
                 "backup-1": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-3": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-4": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
                 ),
             },
             {},
+            1,
+            1,
             {},
-            1,
-            1,
-            0,
-            [],
         ),
         (
             {
@@ -2225,37 +2692,40 @@ async def test_config_retention_copies_logic(
             },
             {
                 "backup-1": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-09T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-3": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-4": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-5": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
                 ),
             },
             {},
-            {},
             1,
             1,
-            1,
-            [call("backup-1")],
+            {"test.test-agent": [call("backup-1")]},
         ),
         (
             {
@@ -2266,37 +2736,40 @@ async def test_config_retention_copies_logic(
             },
             {
                 "backup-1": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-09T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-3": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-4": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-5": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-12T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
                 ),
             },
             {},
-            {},
             1,
             1,
-            2,
-            [call("backup-1"), call("backup-2")],
+            {"test.test-agent": [call("backup-1"), call("backup-2")]},
         ),
     ],
 )
@@ -2306,24 +2779,26 @@ async def test_config_retention_copies_logic_manual_backup(
     freezer: FrozenDateTimeFactory,
     hass_storage: dict[str, Any],
     create_backup: AsyncMock,
-    delete_backup: AsyncMock,
     get_backups: AsyncMock,
     config_command: dict[str, Any],
     backup_command: dict[str, Any],
     backups: dict[str, Any],
     get_backups_agent_errors: dict[str, Exception],
-    delete_backup_agent_errors: dict[str, Exception],
     backup_time: str,
     backup_calls: int,
     get_backups_calls: int,
-    delete_calls: int,
-    delete_args_list: Any,
+    delete_calls: dict[str, Any],
 ) -> None:
     """Test config backup retention copies logic for manual backup."""
+    created_backup: MagicMock = create_backup.return_value[1].result().backup
+    created_backup.protected = True
+
     client = await hass_ws_client(hass)
     storage_data = {
         "backups": [],
         "config": {
+            "agents": {},
+            "automatic_backups_configured": False,
             "create_backup": {
                 "agent_ids": ["test-agent"],
                 "include_addons": ["test-addon"],
@@ -2351,11 +2826,12 @@ async def test_config_retention_copies_logic_manual_backup(
         "minor_version": store.STORAGE_VERSION_MINOR,
     }
     get_backups.return_value = (backups, get_backups_agent_errors)
-    delete_backup.return_value = delete_backup_agent_errors
     await hass.config.async_set_time_zone("Europe/Amsterdam")
     freezer.move_to("2024-11-11 12:00:00+01:00")
 
-    await setup_backup_integration(hass, remote_agents=["test-agent"])
+    mock_agents = await setup_backup_integration(
+        hass, remote_agents=["test.test-agent"]
+    )
     await hass.async_block_till_done()
 
     await client.send_json_auto_id(config_command)
@@ -2372,8 +2848,10 @@ async def test_config_retention_copies_logic_manual_backup(
 
     assert create_backup.call_count == backup_calls
     assert get_backups.call_count == get_backups_calls
-    assert delete_backup.call_count == delete_calls
-    assert delete_backup.call_args_list == delete_args_list
+    for agent_id, agent in mock_agents.items():
+        agent_delete_calls = delete_calls.get(agent_id, [])
+        assert agent.async_delete_backup.call_count == len(agent_delete_calls)
+        assert agent.async_delete_backup.call_args_list == agent_delete_calls
     async_fire_time_changed(hass, fire_all=True)  # flush out storage save
     await hass.async_block_till_done()
     assert (
@@ -2392,13 +2870,12 @@ async def test_config_retention_copies_logic_manual_backup(
         "commands",
         "backups",
         "get_backups_agent_errors",
-        "delete_backup_agent_errors",
+        "delete_backup_side_effects",
         "last_backup_time",
         "start_time",
         "next_time",
         "get_backups_calls",
         "delete_calls",
-        "delete_args_list",
     ),
     [
         # No config update - cleanup backups older than 2 days
@@ -2407,16 +2884,19 @@ async def test_config_retention_copies_logic_manual_backup(
             [],
             {
                 "backup-1": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-3": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
@@ -2428,8 +2908,7 @@ async def test_config_retention_copies_logic_manual_backup(
             "2024-11-11T12:00:00+01:00",
             "2024-11-12T12:00:00+01:00",
             1,
-            1,
-            [call("backup-1")],
+            {"test.test-agent": [call("backup-1")]},
         ),
         # No config update - No cleanup
         (
@@ -2437,16 +2916,19 @@ async def test_config_retention_copies_logic_manual_backup(
             [],
             {
                 "backup-1": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-3": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
@@ -2458,8 +2940,7 @@ async def test_config_retention_copies_logic_manual_backup(
             "2024-11-11T12:00:00+01:00",
             "2024-11-12T12:00:00+01:00",
             0,
-            0,
-            [],
+            {},
         ),
         # Unchanged config
         (
@@ -2474,16 +2955,19 @@ async def test_config_retention_copies_logic_manual_backup(
             ],
             {
                 "backup-1": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-3": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
@@ -2495,8 +2979,7 @@ async def test_config_retention_copies_logic_manual_backup(
             "2024-11-11T12:00:00+01:00",
             "2024-11-12T12:00:00+01:00",
             1,
-            1,
-            [call("backup-1")],
+            {"test.test-agent": [call("backup-1")]},
         ),
         (
             None,
@@ -2510,16 +2993,19 @@ async def test_config_retention_copies_logic_manual_backup(
             ],
             {
                 "backup-1": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-3": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
@@ -2531,8 +3017,7 @@ async def test_config_retention_copies_logic_manual_backup(
             "2024-11-11T12:00:00+01:00",
             "2024-11-12T12:00:00+01:00",
             1,
-            1,
-            [call("backup-1")],
+            {"test.test-agent": [call("backup-1")]},
         ),
         (
             None,
@@ -2546,16 +3031,19 @@ async def test_config_retention_copies_logic_manual_backup(
             ],
             {
                 "backup-1": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-3": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
@@ -2567,8 +3055,7 @@ async def test_config_retention_copies_logic_manual_backup(
             "2024-11-11T12:00:00+01:00",
             "2024-11-12T12:00:00+01:00",
             1,
-            0,
-            [],
+            {},
         ),
         (
             None,
@@ -2582,21 +3069,25 @@ async def test_config_retention_copies_logic_manual_backup(
             ],
             {
                 "backup-1": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-09T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-3": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-4": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
@@ -2608,8 +3099,7 @@ async def test_config_retention_copies_logic_manual_backup(
             "2024-11-11T12:00:00+01:00",
             "2024-11-12T12:00:00+01:00",
             1,
-            2,
-            [call("backup-1"), call("backup-2")],
+            {"test.test-agent": [call("backup-1"), call("backup-2")]},
         ),
         (
             None,
@@ -2623,16 +3113,19 @@ async def test_config_retention_copies_logic_manual_backup(
             ],
             {
                 "backup-1": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-3": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
@@ -2644,8 +3137,7 @@ async def test_config_retention_copies_logic_manual_backup(
             "2024-11-11T12:00:00+01:00",
             "2024-11-12T12:00:00+01:00",
             1,
-            1,
-            [call("backup-1")],
+            {"test.test-agent": [call("backup-1")]},
         ),
         (
             None,
@@ -2659,16 +3151,19 @@ async def test_config_retention_copies_logic_manual_backup(
             ],
             {
                 "backup-1": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-3": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
@@ -2680,8 +3175,7 @@ async def test_config_retention_copies_logic_manual_backup(
             "2024-11-11T12:00:00+01:00",
             "2024-11-12T12:00:00+01:00",
             1,
-            1,
-            [call("backup-1")],
+            {"test.test-agent": [call("backup-1")]},
         ),
         (
             None,
@@ -2689,27 +3183,31 @@ async def test_config_retention_copies_logic_manual_backup(
                 {
                     "type": "backup/config/update",
                     "create_backup": {"agent_ids": ["test-agent"]},
-                    "retention": {"copies": None, "days": 0},
+                    "retention": {"copies": None, "days": 1},
                     "schedule": {"recurrence": "never"},
                 }
             ],
             {
                 "backup-1": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-09T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-2": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-3": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-11T04:45:00+01:00",
                     with_automatic_settings=True,
                     spec=ManagerBackup,
                 ),
                 "backup-4": MagicMock(
+                    agents={"test.test-agent": MagicMock(spec=AgentBackupStatus)},
                     date="2024-11-10T04:45:00+01:00",
                     with_automatic_settings=False,
                     spec=ManagerBackup,
@@ -2721,8 +3219,7 @@ async def test_config_retention_copies_logic_manual_backup(
             "2024-11-11T12:00:00+01:00",
             "2024-11-12T12:00:00+01:00",
             1,
-            2,
-            [call("backup-1"), call("backup-2")],
+            {"test.test-agent": [call("backup-1"), call("backup-2")]},
         ),
     ],
 )
@@ -2731,25 +3228,25 @@ async def test_config_retention_days_logic(
     hass_ws_client: WebSocketGenerator,
     freezer: FrozenDateTimeFactory,
     hass_storage: dict[str, Any],
-    delete_backup: AsyncMock,
     get_backups: AsyncMock,
     stored_retained_days: int | None,
     commands: list[dict[str, Any]],
     backups: dict[str, Any],
     get_backups_agent_errors: dict[str, Exception],
-    delete_backup_agent_errors: dict[str, Exception],
+    delete_backup_side_effects: dict[str, Exception],
     last_backup_time: str,
     start_time: str,
     next_time: str,
     get_backups_calls: int,
-    delete_calls: int,
-    delete_args_list: list[Any],
+    delete_calls: dict[str, Any],
 ) -> None:
     """Test config backup retention logic."""
     client = await hass_ws_client(hass)
     storage_data = {
         "backups": [],
         "config": {
+            "agents": {},
+            "automatic_backups_configured": False,
             "create_backup": {
                 "agent_ids": ["test-agent"],
                 "include_addons": ["test-addon"],
@@ -2777,13 +3274,17 @@ async def test_config_retention_days_logic(
         "minor_version": store.STORAGE_VERSION_MINOR,
     }
     get_backups.return_value = (backups, get_backups_agent_errors)
-    delete_backup.return_value = delete_backup_agent_errors
     await hass.config.async_set_time_zone("Europe/Amsterdam")
     freezer.move_to(start_time)
 
-    await setup_backup_integration(hass)
+    mock_agents = await setup_backup_integration(
+        hass, remote_agents=["test.test-agent"]
+    )
     await hass.async_block_till_done()
 
+    for agent_id, agent in mock_agents.items():
+        agent.async_delete_backup.side_effect = delete_backup_side_effects.get(agent_id)
+
     for command in commands:
         await client.send_json_auto_id(command)
         result = await client.receive_json()
@@ -2793,12 +3294,193 @@ async def test_config_retention_days_logic(
     async_fire_time_changed(hass)
     await hass.async_block_till_done()
     assert get_backups.call_count == get_backups_calls
-    assert delete_backup.call_count == delete_calls
-    assert delete_backup.call_args_list == delete_args_list
+    for agent_id, agent in mock_agents.items():
+        agent_delete_calls = delete_calls.get(agent_id, [])
+        assert agent.async_delete_backup.call_count == len(agent_delete_calls)
+        assert agent.async_delete_backup.call_args_list == agent_delete_calls
     async_fire_time_changed(hass, fire_all=True)  # flush out storage save
     await hass.async_block_till_done()
 
 
+async def test_configured_agents_unavailable_repair(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    issue_registry: ir.IssueRegistry,
+    hass_storage: dict[str, Any],
+) -> None:
+    """Test creating and deleting repair issue for configured unavailable agents."""
+    issue_id = "automatic_backup_agents_unavailable_test.agent"
+    ws_client = await hass_ws_client(hass)
+    hass_storage.update(
+        {
+            "backup": {
+                "data": {
+                    "backups": [],
+                    "config": {
+                        "agents": {},
+                        "automatic_backups_configured": True,
+                        "create_backup": {
+                            "agent_ids": ["test.agent"],
+                            "include_addons": None,
+                            "include_all_addons": False,
+                            "include_database": False,
+                            "include_folders": None,
+                            "name": None,
+                            "password": None,
+                        },
+                        "retention": {"copies": None, "days": None},
+                        "last_attempted_automatic_backup": None,
+                        "last_completed_automatic_backup": None,
+                        "schedule": {
+                            "days": ["mon"],
+                            "recurrence": "custom_days",
+                            "state": "never",
+                            "time": None,
+                        },
+                    },
+                },
+                "key": DOMAIN,
+                "version": store.STORAGE_VERSION,
+                "minor_version": store.STORAGE_VERSION_MINOR,
+            },
+        }
+    )
+
+    await setup_backup_integration(hass)
+    get_agents_mock = AsyncMock(return_value=[mock_backup_agent("agent")])
+    register_listener_mock = Mock()
+    await setup_backup_platform(
+        hass,
+        domain="test",
+        platform=Mock(
+            async_get_backup_agents=get_agents_mock,
+            async_register_backup_agents_listener=register_listener_mock,
+        ),
+    )
+    await hass.async_block_till_done()
+
+    reload_backup_agents = register_listener_mock.call_args[1]["listener"]
+
+    await ws_client.send_json_auto_id({"type": "backup/agents/info"})
+    resp = await ws_client.receive_json()
+    assert resp["result"]["agents"] == [
+        {"agent_id": "backup.local", "name": "local"},
+        {"agent_id": "test.agent", "name": "agent"},
+    ]
+
+    assert not issue_registry.async_get_issue(domain=DOMAIN, issue_id=issue_id)
+
+    # Reload the agents with no agents returned.
+
+    get_agents_mock.return_value = []
+    reload_backup_agents()
+    await hass.async_block_till_done()
+
+    await ws_client.send_json_auto_id({"type": "backup/agents/info"})
+    resp = await ws_client.receive_json()
+    assert resp["result"]["agents"] == [
+        {"agent_id": "backup.local", "name": "local"},
+    ]
+
+    assert issue_registry.async_get_issue(domain=DOMAIN, issue_id=issue_id)
+
+    await ws_client.send_json_auto_id({"type": "backup/config/info"})
+    result = await ws_client.receive_json()
+    assert result["result"]["config"]["create_backup"]["agent_ids"] == ["test.agent"]
+
+    # Update the automatic backup configuration removing the unavailable agent.
+
+    await ws_client.send_json_auto_id(
+        {
+            "type": "backup/config/update",
+            "create_backup": {"agent_ids": ["backup.local"]},
+        }
+    )
+    result = await ws_client.receive_json()
+
+    assert not issue_registry.async_get_issue(domain=DOMAIN, issue_id=issue_id)
+
+    await ws_client.send_json_auto_id({"type": "backup/config/info"})
+    result = await ws_client.receive_json()
+    assert result["result"]["config"]["create_backup"]["agent_ids"] == ["backup.local"]
+
+    # Reload the agents with one agent returned
+    # but not configured for automatic backups.
+
+    get_agents_mock.return_value = [mock_backup_agent("agent")]
+    reload_backup_agents()
+    await hass.async_block_till_done()
+
+    await ws_client.send_json_auto_id({"type": "backup/agents/info"})
+    resp = await ws_client.receive_json()
+    assert resp["result"]["agents"] == [
+        {"agent_id": "backup.local", "name": "local"},
+        {"agent_id": "test.agent", "name": "agent"},
+    ]
+
+    assert not issue_registry.async_get_issue(domain=DOMAIN, issue_id=issue_id)
+
+    await ws_client.send_json_auto_id({"type": "backup/config/info"})
+    result = await ws_client.receive_json()
+    assert result["result"]["config"]["create_backup"]["agent_ids"] == ["backup.local"]
+
+    # Update the automatic backup configuration and configure the test agent.
+
+    await ws_client.send_json_auto_id(
+        {
+            "type": "backup/config/update",
+            "create_backup": {"agent_ids": ["backup.local", "test.agent"]},
+        }
+    )
+    result = await ws_client.receive_json()
+
+    assert not issue_registry.async_get_issue(domain=DOMAIN, issue_id=issue_id)
+
+    await ws_client.send_json_auto_id({"type": "backup/config/info"})
+    result = await ws_client.receive_json()
+    assert result["result"]["config"]["create_backup"]["agent_ids"] == [
+        "backup.local",
+        "test.agent",
+    ]
+
+    # Reload the agents with no agents returned again.
+
+    get_agents_mock.return_value = []
+    reload_backup_agents()
+    await hass.async_block_till_done()
+
+    await ws_client.send_json_auto_id({"type": "backup/agents/info"})
+    resp = await ws_client.receive_json()
+    assert resp["result"]["agents"] == [
+        {"agent_id": "backup.local", "name": "local"},
+    ]
+
+    assert issue_registry.async_get_issue(domain=DOMAIN, issue_id=issue_id)
+
+    await ws_client.send_json_auto_id({"type": "backup/config/info"})
+    result = await ws_client.receive_json()
+    assert result["result"]["config"]["create_backup"]["agent_ids"] == [
+        "backup.local",
+        "test.agent",
+    ]
+
+    # Update the automatic backup configuration removing all agents.
+
+    await ws_client.send_json_auto_id(
+        {
+            "type": "backup/config/update",
+            "create_backup": {"agent_ids": []},
+        }
+    )
+    result = await ws_client.receive_json()
+
+    assert not issue_registry.async_get_issue(domain=DOMAIN, issue_id=issue_id)
+
+    await ws_client.send_json_auto_id({"type": "backup/config/info"})
+    result = await ws_client.receive_json()
+    assert result["result"]["config"]["create_backup"]["agent_ids"] == []
+
+
 async def test_subscribe_event(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
@@ -2816,7 +3498,30 @@ async def test_subscribe_event(
     assert await client.receive_json() == snapshot
 
     manager.async_on_backup_event(
-        CreateBackupEvent(stage=None, state=CreateBackupState.IN_PROGRESS)
+        CreateBackupEvent(stage=None, state=CreateBackupState.IN_PROGRESS, reason=None)
+    )
+    assert await client.receive_json() == snapshot
+
+
+async def test_subscribe_event_early(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test subscribe event before backup integration has started."""
+    async_initialize_backup(hass)
+    await setup_backup_integration(hass, with_hassio=False)
+
+    client = await hass_ws_client(hass)
+    await client.send_json_auto_id({"type": "backup/subscribe_events"})
+    assert await client.receive_json() == snapshot
+
+    assert await async_setup_component(hass, DOMAIN, {})
+    await hass.async_block_till_done()
+    manager = hass.data[DATA_MANAGER]
+
+    manager.async_on_backup_event(
+        CreateBackupEvent(stage=None, state=CreateBackupState.IN_PROGRESS, reason=None)
     )
     assert await client.receive_json() == snapshot
 
@@ -2857,3 +3562,68 @@ async def test_can_decrypt_on_download(
         }
     )
     assert await client.receive_json() == snapshot
+
+
+@pytest.mark.parametrize(
+    "error",
+    [
+        BackupAgentError,
+        BackupNotFound,
+    ],
+)
+@pytest.mark.usefixtures("mock_backups")
+async def test_can_decrypt_on_download_with_agent_error(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    snapshot: SnapshotAssertion,
+    error: Exception,
+) -> None:
+    """Test can decrypt on download."""
+
+    mock_agents = await setup_backup_integration(
+        hass,
+        with_hassio=False,
+        backups={"test.remote": [TEST_BACKUP_ABC123]},
+        remote_agents=["test.remote"],
+    )
+    client = await hass_ws_client(hass)
+
+    mock_agents["test.remote"].async_download_backup.side_effect = error
+    await client.send_json_auto_id(
+        {
+            "type": "backup/can_decrypt_on_download",
+            "backup_id": TEST_BACKUP_ABC123.backup_id,
+            "agent_id": "test.remote",
+            "password": "hunter2",
+        }
+    )
+    assert await client.receive_json() == snapshot
+
+
+@pytest.mark.usefixtures("mock_backups")
+async def test_can_decrypt_on_download_get_backup_returns_none(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    caplog: pytest.LogCaptureFixture,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test can decrypt on download when the agent returns None from get_backup."""
+
+    mock_agents = await setup_backup_integration(hass, remote_agents=["test.remote"])
+    mock_agents["test.remote"].async_get_backup.return_value = None
+    mock_agents["test.remote"].async_get_backup.side_effect = None
+
+    client = await hass_ws_client(hass)
+    await client.send_json_auto_id(
+        {
+            "type": "backup/can_decrypt_on_download",
+            "backup_id": TEST_BACKUP_ABC123.backup_id,
+            "agent_id": "test.remote",
+            "password": "hunter2",
+        }
+    )
+    assert await client.receive_json() == snapshot
+    assert (
+        "Detected that integration 'test' returns None from BackupAgent.async_get_backup."
+        in caplog.text
+    )
diff --git a/tests/components/balboa/conftest.py b/tests/components/balboa/conftest.py
index 0bb8b2cd468..18639b0c9be 100644
--- a/tests/components/balboa/conftest.py
+++ b/tests/components/balboa/conftest.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Callable, Generator
+from datetime import time
 from unittest.mock import AsyncMock, MagicMock, patch
 
 from pybalboa.enums import HeatMode, LowHighRange
@@ -48,7 +49,12 @@ def client_fixture() -> Generator[MagicMock]:
         client.blowers = []
         client.circulation_pump.state = 0
         client.filter_cycle_1_running = False
+        client.filter_cycle_1_start = time(8, 0)
+        client.filter_cycle_1_end = time(9, 0)
         client.filter_cycle_2_running = False
+        client.filter_cycle_2_enabled = True
+        client.filter_cycle_2_start = time(19, 0)
+        client.filter_cycle_2_end = time(21, 30)
         client.temperature_unit = 1
         client.temperature = 10
         client.temperature_minimum = 10
@@ -62,4 +68,6 @@ def client_fixture() -> Generator[MagicMock]:
         client.pumps = []
         client.temperature_range.state = LowHighRange.LOW
 
+        client.fault = None
+
         yield client
diff --git a/tests/components/balboa/snapshots/test_binary_sensor.ambr b/tests/components/balboa/snapshots/test_binary_sensor.ambr
index c37c8a20d4b..4aa0f1d71fe 100644
--- a/tests/components/balboa/snapshots/test_binary_sensor.ambr
+++ b/tests/components/balboa/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/balboa/snapshots/test_climate.ambr b/tests/components/balboa/snapshots/test_climate.ambr
index d3060077341..70e33c4065f 100644
--- a/tests/components/balboa/snapshots/test_climate.ambr
+++ b/tests/components/balboa/snapshots/test_climate.ambr
@@ -17,6 +17,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/balboa/snapshots/test_event.ambr b/tests/components/balboa/snapshots/test_event.ambr
new file mode 100644
index 00000000000..fc8f591a9fc
--- /dev/null
+++ b/tests/components/balboa/snapshots/test_event.ambr
@@ -0,0 +1,90 @@
+# serializer version: 1
+# name: test_events[event.fakespa_fault-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'event_types': list([
+        'clock_failed',
+        'flow_failed',
+        'gfci_test_failed',
+        'heater_dry',
+        'heater_may_be_dry',
+        'heater_too_hot',
+        'hot_fault',
+        'low_flow',
+        'memory_failure',
+        'priming_mode',
+        'pump_stuck',
+        'sensor_a_fault',
+        'sensor_b_fault',
+        'sensor_out_of_sync',
+        'service_sensor_sync',
+        'settings_reset',
+        'standby_mode',
+        'water_too_hot',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'event',
+    'entity_category': None,
+    'entity_id': 'event.fakespa_fault',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Fault',
+    'platform': 'balboa',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'fault',
+    'unique_id': 'FakeSpa-fault-c0ffee',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_events[event.fakespa_fault-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'event_type': None,
+      'event_types': list([
+        'clock_failed',
+        'flow_failed',
+        'gfci_test_failed',
+        'heater_dry',
+        'heater_may_be_dry',
+        'heater_too_hot',
+        'hot_fault',
+        'low_flow',
+        'memory_failure',
+        'priming_mode',
+        'pump_stuck',
+        'sensor_a_fault',
+        'sensor_b_fault',
+        'sensor_out_of_sync',
+        'service_sensor_sync',
+        'settings_reset',
+        'standby_mode',
+        'water_too_hot',
+      ]),
+      'friendly_name': 'FakeSpa Fault',
+    }),
+    'context': <ANY>,
+    'entity_id': 'event.fakespa_fault',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
diff --git a/tests/components/balboa/snapshots/test_fan.ambr b/tests/components/balboa/snapshots/test_fan.ambr
index 8d35ab6de7c..4df73c3178c 100644
--- a/tests/components/balboa/snapshots/test_fan.ambr
+++ b/tests/components/balboa/snapshots/test_fan.ambr
@@ -8,6 +8,7 @@
       'preset_modes': None,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/balboa/snapshots/test_light.ambr b/tests/components/balboa/snapshots/test_light.ambr
index 31777744740..fdfd7af1d0c 100644
--- a/tests/components/balboa/snapshots/test_light.ambr
+++ b/tests/components/balboa/snapshots/test_light.ambr
@@ -10,6 +10,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/balboa/snapshots/test_select.ambr b/tests/components/balboa/snapshots/test_select.ambr
index a0cfd68d009..68368bf3602 100644
--- a/tests/components/balboa/snapshots/test_select.ambr
+++ b/tests/components/balboa/snapshots/test_select.ambr
@@ -11,6 +11,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/balboa/snapshots/test_switch.ambr b/tests/components/balboa/snapshots/test_switch.ambr
new file mode 100644
index 00000000000..ad63fcdf387
--- /dev/null
+++ b/tests/components/balboa/snapshots/test_switch.ambr
@@ -0,0 +1,48 @@
+# serializer version: 1
+# name: test_switches[switch.fakespa_filter_cycle_2_enabled-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'switch.fakespa_filter_cycle_2_enabled',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Filter cycle 2 enabled',
+    'platform': 'balboa',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'filter_cycle_2_enabled',
+    'unique_id': 'FakeSpa-filter_cycle_2_enabled-c0ffee',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_switches[switch.fakespa_filter_cycle_2_enabled-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'FakeSpa Filter cycle 2 enabled',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.fakespa_filter_cycle_2_enabled',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
diff --git a/tests/components/balboa/snapshots/test_time.ambr b/tests/components/balboa/snapshots/test_time.ambr
new file mode 100644
index 00000000000..6b27717e2d3
--- /dev/null
+++ b/tests/components/balboa/snapshots/test_time.ambr
@@ -0,0 +1,189 @@
+# serializer version: 1
+# name: test_times[time.fakespa_filter_cycle_1_end-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'time',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'time.fakespa_filter_cycle_1_end',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Filter cycle 1 end',
+    'platform': 'balboa',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'filter_cycle_end',
+    'unique_id': 'FakeSpa-filter_cycle_1_end-c0ffee',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_times[time.fakespa_filter_cycle_1_end-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'FakeSpa Filter cycle 1 end',
+    }),
+    'context': <ANY>,
+    'entity_id': 'time.fakespa_filter_cycle_1_end',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '09:00:00',
+  })
+# ---
+# name: test_times[time.fakespa_filter_cycle_1_start-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'time',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'time.fakespa_filter_cycle_1_start',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Filter cycle 1 start',
+    'platform': 'balboa',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'filter_cycle_start',
+    'unique_id': 'FakeSpa-filter_cycle_1_start-c0ffee',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_times[time.fakespa_filter_cycle_1_start-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'FakeSpa Filter cycle 1 start',
+    }),
+    'context': <ANY>,
+    'entity_id': 'time.fakespa_filter_cycle_1_start',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '08:00:00',
+  })
+# ---
+# name: test_times[time.fakespa_filter_cycle_2_end-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'time',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'time.fakespa_filter_cycle_2_end',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Filter cycle 2 end',
+    'platform': 'balboa',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'filter_cycle_end',
+    'unique_id': 'FakeSpa-filter_cycle_2_end-c0ffee',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_times[time.fakespa_filter_cycle_2_end-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'FakeSpa Filter cycle 2 end',
+    }),
+    'context': <ANY>,
+    'entity_id': 'time.fakespa_filter_cycle_2_end',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '21:30:00',
+  })
+# ---
+# name: test_times[time.fakespa_filter_cycle_2_start-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'time',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'time.fakespa_filter_cycle_2_start',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Filter cycle 2 start',
+    'platform': 'balboa',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'filter_cycle_start',
+    'unique_id': 'FakeSpa-filter_cycle_2_start-c0ffee',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_times[time.fakespa_filter_cycle_2_start-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'FakeSpa Filter cycle 2 start',
+    }),
+    'context': <ANY>,
+    'entity_id': 'time.fakespa_filter_cycle_2_start',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '19:00:00',
+  })
+# ---
diff --git a/tests/components/balboa/test_climate.py b/tests/components/balboa/test_climate.py
index 850184a7d71..9c23833518e 100644
--- a/tests/components/balboa/test_climate.py
+++ b/tests/components/balboa/test_climate.py
@@ -26,10 +26,11 @@ from homeassistant.components.climate import (
     HVACAction,
     HVACMode,
 )
-from homeassistant.const import ATTR_TEMPERATURE, Platform, UnitOfTemperature
+from homeassistant.const import ATTR_TEMPERATURE, Platform
 from homeassistant.core import HomeAssistant, State
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import entity_registry as er
+from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM
 
 from . import client_update, init_integration
 
@@ -97,11 +98,10 @@ async def test_spa_temperature_unit(
     hass: HomeAssistant, client: MagicMock, integration: MockConfigEntry
 ) -> None:
     """Test temperature unit conversions."""
-    with patch.object(
-        hass.config.units, "temperature_unit", UnitOfTemperature.FAHRENHEIT
-    ):
-        state = await _patch_spa_settemp(hass, client, 0, 15.4)
-        assert state.attributes.get(ATTR_TEMPERATURE) == 15.0
+    hass.config.units = US_CUSTOMARY_SYSTEM
+
+    state = await _patch_spa_settemp(hass, client, 0, 15.4)
+    assert state.attributes.get(ATTR_TEMPERATURE) == 15.0
 
 
 async def test_spa_hvac_modes(
diff --git a/tests/components/balboa/test_config_flow.py b/tests/components/balboa/test_config_flow.py
index afa170577df..d81edaad3b4 100644
--- a/tests/components/balboa/test_config_flow.py
+++ b/tests/components/balboa/test_config_flow.py
@@ -3,19 +3,23 @@
 from unittest.mock import MagicMock, patch
 
 from pybalboa.exceptions import SpaConnectionError
+import pytest
 
 from homeassistant import config_entries
 from homeassistant.components.balboa.const import CONF_SYNC_TIME, DOMAIN
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 
 from tests.common import MockConfigEntry
 
-TEST_DATA = {
-    CONF_HOST: "1.1.1.1",
-}
-TEST_ID = "FakeBalboa"
+TEST_HOST = "1.1.1.1"
+TEST_DATA = {CONF_HOST: TEST_HOST}
+TEST_MAC = "ef:ef:ef:c0:ff:ee"
+TEST_DHCP_SERVICE_INFO = DhcpServiceInfo(
+    ip=TEST_HOST, macaddress=TEST_MAC.replace(":", ""), hostname="fakespa"
+)
 
 
 async def test_form(hass: HomeAssistant, client: MagicMock) -> None:
@@ -107,7 +111,7 @@ async def test_unknown_error(hass: HomeAssistant, client: MagicMock) -> None:
 
 async def test_already_configured(hass: HomeAssistant, client: MagicMock) -> None:
     """Test when provided credentials are already configured."""
-    MockConfigEntry(domain=DOMAIN, data=TEST_DATA, unique_id=TEST_ID).add_to_hass(hass)
+    MockConfigEntry(domain=DOMAIN, data=TEST_DATA, unique_id=TEST_MAC).add_to_hass(hass)
 
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
@@ -138,7 +142,7 @@ async def test_already_configured(hass: HomeAssistant, client: MagicMock) -> Non
 
 async def test_options_flow(hass: HomeAssistant, client: MagicMock) -> None:
     """Test specifying non default settings using options flow."""
-    config_entry = MockConfigEntry(domain=DOMAIN, data=TEST_DATA, unique_id=TEST_ID)
+    config_entry = MockConfigEntry(domain=DOMAIN, data=TEST_DATA, unique_id=TEST_MAC)
     config_entry.add_to_hass(hass)
 
     assert await hass.config_entries.async_setup(config_entry.entry_id)
@@ -161,3 +165,111 @@ async def test_options_flow(hass: HomeAssistant, client: MagicMock) -> None:
 
     assert result["type"] is FlowResultType.CREATE_ENTRY
     assert dict(config_entry.options) == {CONF_SYNC_TIME: True}
+
+
+async def test_dhcp_discovery(hass: HomeAssistant, client: MagicMock) -> None:
+    """Test we can process the discovery from dhcp."""
+    with patch(
+        "homeassistant.components.balboa.config_flow.SpaClient.__aenter__",
+        return_value=client,
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_DHCP},
+            data=TEST_DHCP_SERVICE_INFO,
+        )
+
+        assert result["type"] is FlowResultType.FORM
+        result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+        await hass.async_block_till_done()
+
+        assert result["type"] is FlowResultType.CREATE_ENTRY
+        assert result["title"] == "FakeSpa"
+        assert result["data"] == TEST_DATA
+        assert result["result"].unique_id == TEST_MAC
+
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_DHCP},
+            data=TEST_DHCP_SERVICE_INFO,
+        )
+        assert result["type"] is FlowResultType.ABORT
+        assert result["reason"] == "already_configured"
+
+
+async def test_dhcp_discovery_updates_host(
+    hass: HomeAssistant, client: MagicMock
+) -> None:
+    """Test dhcp discovery updates host and aborts."""
+    entry = MockConfigEntry(domain=DOMAIN, data=TEST_DATA, unique_id=TEST_MAC)
+    entry.add_to_hass(hass)
+
+    updated_ip = "1.1.1.2"
+    TEST_DHCP_SERVICE_INFO.ip = updated_ip
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_DHCP},
+        data=TEST_DHCP_SERVICE_INFO,
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+
+    assert entry.data[CONF_HOST] == updated_ip
+
+
+@pytest.mark.parametrize(
+    ("side_effect", "reason"),
+    [
+        (SpaConnectionError, "cannot_connect"),
+        (Exception, "unknown"),
+    ],
+)
+async def test_dhcp_discovery_failed(
+    hass: HomeAssistant, client: MagicMock, side_effect: Exception, reason: str
+) -> None:
+    """Test failed setup from dhcp."""
+    with patch(
+        "homeassistant.components.balboa.config_flow.SpaClient.__aenter__",
+        return_value=client,
+        side_effect=side_effect(),
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_DHCP},
+            data=TEST_DHCP_SERVICE_INFO,
+        )
+        assert result["type"] is FlowResultType.ABORT
+        assert result["reason"] == reason
+
+
+async def test_dhcp_discovery_manual_user_setup(
+    hass: HomeAssistant, client: MagicMock
+) -> None:
+    """Test dhcp discovery with manual user setup."""
+    with patch(
+        "homeassistant.components.balboa.config_flow.SpaClient.__aenter__",
+        return_value=client,
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_DHCP},
+            data=TEST_DHCP_SERVICE_INFO,
+        )
+
+        assert result["type"] is FlowResultType.FORM
+
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_USER},
+        )
+        assert result["type"] is FlowResultType.FORM
+
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            TEST_DATA,
+        )
+        await hass.async_block_till_done()
+
+        assert result["type"] is FlowResultType.CREATE_ENTRY
+        assert result["data"] == TEST_DATA
diff --git a/tests/components/balboa/test_event.py b/tests/components/balboa/test_event.py
new file mode 100644
index 00000000000..04f25f6cfa0
--- /dev/null
+++ b/tests/components/balboa/test_event.py
@@ -0,0 +1,82 @@
+"""Tests of the events of the balboa integration."""
+
+from __future__ import annotations
+
+from datetime import datetime
+from unittest.mock import MagicMock, patch
+
+import pytest
+from syrupy import SnapshotAssertion
+
+from homeassistant.components.event import ATTR_EVENT_TYPE
+from homeassistant.const import STATE_UNKNOWN, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import init_integration
+
+from tests.common import snapshot_platform
+
+ENTITY_EVENT = "event.fakespa_fault"
+FAULT_DATE = "fault_date"
+
+
+async def test_events(
+    hass: HomeAssistant,
+    client: MagicMock,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test spa events."""
+    with patch("homeassistant.components.balboa.PLATFORMS", [Platform.EVENT]):
+        entry = await init_integration(hass)
+
+    await snapshot_platform(hass, entity_registry, snapshot, entry.entry_id)
+
+
+async def test_event(hass: HomeAssistant, client: MagicMock) -> None:
+    """Test spa fault event."""
+    await init_integration(hass)
+
+    # check the state is unknown
+    state = hass.states.get(ENTITY_EVENT)
+    assert state.state == STATE_UNKNOWN
+
+    # set a fault
+    client.fault = MagicMock(
+        fault_datetime=datetime(2025, 2, 15, 13, 0), message_code=16
+    )
+    client.emit("")
+    await hass.async_block_till_done()
+
+    # check new state is what we expect
+    state = hass.states.get(ENTITY_EVENT)
+    assert state.attributes[ATTR_EVENT_TYPE] == "low_flow"
+    assert state.attributes[FAULT_DATE] == "2025-02-15T13:00:00"
+    assert state.attributes["code"] == 16
+
+    # set fault to None
+    client.fault = None
+    client.emit("")
+    await hass.async_block_till_done()
+
+    # validate state remains unchanged
+    state = hass.states.get(ENTITY_EVENT)
+    assert state.attributes[ATTR_EVENT_TYPE] == "low_flow"
+    assert state.attributes[FAULT_DATE] == "2025-02-15T13:00:00"
+    assert state.attributes["code"] == 16
+
+    # set fault to an unknown one
+    client.fault = MagicMock(
+        fault_datetime=datetime(2025, 2, 15, 14, 0), message_code=-1
+    )
+    # validate a ValueError is raises
+    with pytest.raises(ValueError):
+        client.emit("")
+    await hass.async_block_till_done()
+
+    # validate state remains unchanged
+    state = hass.states.get(ENTITY_EVENT)
+    assert state.attributes[ATTR_EVENT_TYPE] == "low_flow"
+    assert state.attributes[FAULT_DATE] == "2025-02-15T13:00:00"
+    assert state.attributes["code"] == 16
diff --git a/tests/components/balboa/test_switch.py b/tests/components/balboa/test_switch.py
new file mode 100644
index 00000000000..4b6bae172f4
--- /dev/null
+++ b/tests/components/balboa/test_switch.py
@@ -0,0 +1,55 @@
+"""Tests of the switches of the balboa integration."""
+
+from __future__ import annotations
+
+from unittest.mock import MagicMock, patch
+
+from syrupy import SnapshotAssertion
+
+from homeassistant.const import STATE_OFF, STATE_ON, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import init_integration
+
+from tests.common import snapshot_platform
+from tests.components.switch import common
+
+ENTITY_SWITCH = "switch.fakespa_filter_cycle_2_enabled"
+
+
+async def test_switches(
+    hass: HomeAssistant,
+    client: MagicMock,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test spa switches."""
+    with patch("homeassistant.components.balboa.PLATFORMS", [Platform.SWITCH]):
+        entry = await init_integration(hass)
+
+    await snapshot_platform(hass, entity_registry, snapshot, entry.entry_id)
+
+
+async def test_switch(hass: HomeAssistant, client: MagicMock) -> None:
+    """Test spa filter cycle enabled switch."""
+    await init_integration(hass)
+
+    # check if the initial state is on
+    state = hass.states.get(ENTITY_SWITCH)
+    assert state.state == STATE_ON
+
+    # test calling turn off
+    await common.async_turn_off(hass, ENTITY_SWITCH)
+    client.configure_filter_cycle.assert_called_with(2, enabled=False)
+
+    setattr(client, "filter_cycle_2_enabled", False)
+    client.emit("")
+    await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY_SWITCH)
+    assert state.state == STATE_OFF
+
+    # test calling turn on
+    await common.async_turn_on(hass, ENTITY_SWITCH)
+    client.configure_filter_cycle.assert_called_with(2, enabled=True)
diff --git a/tests/components/balboa/test_time.py b/tests/components/balboa/test_time.py
new file mode 100644
index 00000000000..21778d08e2d
--- /dev/null
+++ b/tests/components/balboa/test_time.py
@@ -0,0 +1,72 @@
+"""Tests of the times of the balboa integration."""
+
+from __future__ import annotations
+
+from datetime import time
+from unittest.mock import MagicMock, patch
+
+import pytest
+from syrupy import SnapshotAssertion
+
+from homeassistant.components.time import (
+    ATTR_TIME,
+    DOMAIN as TIME_DOMAIN,
+    SERVICE_SET_VALUE,
+)
+from homeassistant.const import ATTR_ENTITY_ID, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import init_integration
+
+from tests.common import snapshot_platform
+
+ENTITY_TIME = "time.fakespa_"
+
+
+async def test_times(
+    hass: HomeAssistant,
+    client: MagicMock,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test spa times."""
+    with patch("homeassistant.components.balboa.PLATFORMS", [Platform.TIME]):
+        entry = await init_integration(hass)
+
+    await snapshot_platform(hass, entity_registry, snapshot, entry.entry_id)
+
+
+@pytest.mark.parametrize(
+    ("filter_cycle", "period", "value"),
+    [
+        (1, "start", "08:00:00"),
+        (1, "end", "09:00:00"),
+        (2, "start", "19:00:00"),
+        (2, "end", "21:30:00"),
+    ],
+)
+async def test_time(
+    hass: HomeAssistant, client: MagicMock, filter_cycle: int, period: str, value: str
+) -> None:
+    """Test spa filter cycle time."""
+    await init_integration(hass)
+
+    time_entity = f"{ENTITY_TIME}filter_cycle_{filter_cycle}_{period}"
+
+    # check the expected state of the time entity
+    state = hass.states.get(time_entity)
+    assert state.state == value
+
+    new_time = time(hour=7, minute=0)
+
+    await hass.services.async_call(
+        TIME_DOMAIN,
+        SERVICE_SET_VALUE,
+        service_data={ATTR_TIME: new_time},
+        blocking=True,
+        target={ATTR_ENTITY_ID: time_entity},
+    )
+
+    # check we made a call with the right parameters
+    client.configure_filter_cycle.assert_called_with(filter_cycle, **{period: new_time})
diff --git a/tests/components/bang_olufsen/snapshots/test_diagnostics.ambr b/tests/components/bang_olufsen/snapshots/test_diagnostics.ambr
index e9540b5cec6..bc51f89f96d 100644
--- a/tests/components/bang_olufsen/snapshots/test_diagnostics.ambr
+++ b/tests/components/bang_olufsen/snapshots/test_diagnostics.ambr
@@ -1,6 +1,22 @@
 # serializer version: 1
 # name: test_async_get_config_entry_diagnostics
   dict({
+    'PlayPause_event': dict({
+      'attributes': dict({
+        'device_class': 'button',
+        'event_type': None,
+        'event_types': list([
+          'short_press_release',
+          'long_press_timeout',
+          'long_press_release',
+          'very_long_press_timeout',
+          'very_long_press_release',
+        ]),
+        'friendly_name': 'Living room Balance Play / Pause',
+      }),
+      'entity_id': 'event.beosound_balance_11111111_play_pause',
+      'state': 'unknown',
+    }),
     'config_entry': dict({
       'data': dict({
         'host': '192.168.0.1',
@@ -18,6 +34,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Beosound Balance-11111111',
       'unique_id': '11111111',
       'version': 1,
diff --git a/tests/components/bang_olufsen/test_diagnostics.py b/tests/components/bang_olufsen/test_diagnostics.py
index 7c99648ace4..a9415a222a8 100644
--- a/tests/components/bang_olufsen/test_diagnostics.py
+++ b/tests/components/bang_olufsen/test_diagnostics.py
@@ -6,6 +6,9 @@ from syrupy import SnapshotAssertion
 from syrupy.filters import props
 
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_registry import EntityRegistry
+
+from .const import TEST_BUTTON_EVENT_ENTITY_ID
 
 from tests.common import MockConfigEntry
 from tests.components.diagnostics import get_diagnostics_for_config_entry
@@ -14,6 +17,7 @@ from tests.typing import ClientSessionGenerator
 
 async def test_async_get_config_entry_diagnostics(
     hass: HomeAssistant,
+    entity_registry: EntityRegistry,
     hass_client: ClientSessionGenerator,
     mock_config_entry: MockConfigEntry,
     mock_mozart_client: AsyncMock,
@@ -23,6 +27,10 @@ async def test_async_get_config_entry_diagnostics(
     mock_config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
 
+    # Enable an Event entity
+    entity_registry.async_update_entity(TEST_BUTTON_EVENT_ENTITY_ID, disabled_by=None)
+    hass.config_entries.async_schedule_reload(mock_config_entry.entry_id)
+
     result = await get_diagnostics_for_config_entry(
         hass, hass_client, mock_config_entry
     )
diff --git a/tests/components/binary_sensor/test_device_condition.py b/tests/components/binary_sensor/test_device_condition.py
index 8a0132ff2af..59fbdf9a253 100644
--- a/tests/components/binary_sensor/test_device_condition.py
+++ b/tests/components/binary_sensor/test_device_condition.py
@@ -14,7 +14,7 @@ from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON, EntityCatego
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import MockBinarySensor
 
diff --git a/tests/components/binary_sensor/test_device_trigger.py b/tests/components/binary_sensor/test_device_trigger.py
index 78e382f77bf..dd71c1e5d06 100644
--- a/tests/components/binary_sensor/test_device_trigger.py
+++ b/tests/components/binary_sensor/test_device_trigger.py
@@ -13,7 +13,7 @@ from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON, EntityCatego
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import MockBinarySensor
 
diff --git a/tests/components/binary_sensor/test_init.py b/tests/components/binary_sensor/test_init.py
index 26b8d919d72..de2b2565fe1 100644
--- a/tests/components/binary_sensor/test_init.py
+++ b/tests/components/binary_sensor/test_init.py
@@ -9,7 +9,7 @@ from homeassistant.components import binary_sensor
 from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.const import STATE_OFF, STATE_ON, EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .common import MockBinarySensor
 
@@ -102,7 +102,7 @@ async def test_name(hass: HomeAssistant) -> None:
     async def async_setup_entry_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test binary_sensor platform via config entry."""
         async_add_entities([entity1, entity2, entity3, entity4])
@@ -172,7 +172,7 @@ async def test_entity_category_config_raises_error(
     async def async_setup_entry_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test binary_sensor platform via config entry."""
         async_add_entities([entity1, entity2])
diff --git a/tests/components/blink/snapshots/test_diagnostics.ambr b/tests/components/blink/snapshots/test_diagnostics.ambr
index edc2879a66b..54df2b48cdb 100644
--- a/tests/components/blink/snapshots/test_diagnostics.ambr
+++ b/tests/components/blink/snapshots/test_diagnostics.ambr
@@ -48,6 +48,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': None,
       'version': 3,
diff --git a/tests/components/bluemaestro/snapshots/test_sensor.ambr b/tests/components/bluemaestro/snapshots/test_sensor.ambr
index 2b777ec6f09..48f20aa97b5 100644
--- a/tests/components/bluemaestro/snapshots/test_sensor.ambr
+++ b/tests/components/bluemaestro/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -110,6 +112,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -161,6 +164,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -212,6 +216,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/bluesound/test_config_flow.py b/tests/components/bluesound/test_config_flow.py
index d0e0f75991b..a4d5eecd744 100644
--- a/tests/components/bluesound/test_config_flow.py
+++ b/tests/components/bluesound/test_config_flow.py
@@ -1,5 +1,6 @@
 """Test the Bluesound config flow."""
 
+from ipaddress import IPv4Address, IPv6Address
 from unittest.mock import AsyncMock
 
 from pyblu.errors import PlayerUnreachableError
@@ -121,8 +122,8 @@ async def test_zeroconf_flow_success(
         DOMAIN,
         context={"source": SOURCE_ZEROCONF},
         data=ZeroconfServiceInfo(
-            ip_address="1.1.1.1",
-            ip_addresses=["1.1.1.1"],
+            ip_address=IPv4Address("1.1.1.1"),
+            ip_addresses=[IPv4Address("1.1.1.1")],
             port=11000,
             hostname="player-name1111",
             type="_musc._tcp.local.",
@@ -160,8 +161,8 @@ async def test_zeroconf_flow_cannot_connect(
         DOMAIN,
         context={"source": SOURCE_ZEROCONF},
         data=ZeroconfServiceInfo(
-            ip_address="1.1.1.1",
-            ip_addresses=["1.1.1.1"],
+            ip_address=IPv4Address("1.1.1.1"),
+            ip_addresses=[IPv4Address("1.1.1.1")],
             port=11000,
             hostname="player-name1111",
             type="_musc._tcp.local.",
@@ -187,8 +188,8 @@ async def test_zeroconf_flow_already_configured(
         DOMAIN,
         context={"source": SOURCE_ZEROCONF},
         data=ZeroconfServiceInfo(
-            ip_address="1.1.1.2",
-            ip_addresses=["1.1.1.2"],
+            ip_address=IPv4Address("1.1.1.2"),
+            ip_addresses=[IPv4Address("1.1.1.2")],
             port=11000,
             hostname="player-name1112",
             type="_musc._tcp.local.",
@@ -203,3 +204,23 @@ async def test_zeroconf_flow_already_configured(
     assert config_entry.data[CONF_HOST] == "1.1.1.2"
 
     player_mocks.player_data_for_already_configured.player.sync_status.assert_called_once()
+
+
+async def test_zeroconf_flow_no_ipv4_address(hass: HomeAssistant) -> None:
+    """Test abort flow when no ipv4 address is found in zeroconf data."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_ZEROCONF},
+        data=ZeroconfServiceInfo(
+            ip_address=IPv6Address("2001:db8::1"),
+            ip_addresses=[IPv6Address("2001:db8::1")],
+            port=11000,
+            hostname="player-name1112",
+            type="_musc._tcp.local.",
+            name="player-name._musc._tcp.local.",
+            properties={},
+        ),
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "no_ipv4_address"
diff --git a/tests/components/bluetooth/__init__.py b/tests/components/bluetooth/__init__.py
index c672de7424b..31d301e2dac 100644
--- a/tests/components/bluetooth/__init__.py
+++ b/tests/components/bluetooth/__init__.py
@@ -10,7 +10,7 @@ from unittest.mock import MagicMock, patch
 from bleak import BleakClient
 from bleak.backends.scanner import AdvertisementData, BLEDevice
 from bluetooth_adapters import DEFAULT_ADDRESS
-from habluetooth import BaseHaScanner, BluetoothManager, get_manager
+from habluetooth import BaseHaScanner, get_manager
 
 from homeassistant.components.bluetooth import (
     DOMAIN,
@@ -21,6 +21,7 @@ from homeassistant.components.bluetooth import (
     BluetoothServiceInfoBleak,
     async_get_advertisement_callback,
 )
+from homeassistant.components.bluetooth.manager import HomeAssistantBluetoothManager
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
@@ -57,6 +58,11 @@ BLE_DEVICE_DEFAULTS = {
 }
 
 
+HCI0_SOURCE_ADDRESS = "AA:BB:CC:DD:EE:00"
+HCI1_SOURCE_ADDRESS = "AA:BB:CC:DD:EE:11"
+NON_CONNECTABLE_REMOTE_SOURCE_ADDRESS = "AA:BB:CC:DD:EE:FF"
+
+
 @contextmanager
 def patch_bluetooth_time(mock_time: float) -> None:
     """Patch the bluetooth time."""
@@ -101,9 +107,10 @@ def generate_ble_device(
     return BLEDevice(**new)
 
 
-def _get_manager() -> BluetoothManager:
+def _get_manager() -> HomeAssistantBluetoothManager:
     """Return the bluetooth manager."""
-    return get_manager()
+    manager: HomeAssistantBluetoothManager = get_manager()
+    return manager
 
 
 def inject_advertisement(
diff --git a/tests/components/bluetooth/conftest.py b/tests/components/bluetooth/conftest.py
index 6fa0b375e81..e07b580acb2 100644
--- a/tests/components/bluetooth/conftest.py
+++ b/tests/components/bluetooth/conftest.py
@@ -5,13 +5,19 @@ from unittest.mock import patch
 
 from bleak_retry_connector import bleak_manager
 from dbus_fast.aio import message_bus
+from habluetooth import BaseHaRemoteScanner
 import habluetooth.util as habluetooth_utils
 import pytest
 
 from homeassistant.components import bluetooth
 from homeassistant.core import HomeAssistant
 
-from . import FakeScanner
+from . import (
+    HCI0_SOURCE_ADDRESS,
+    HCI1_SOURCE_ADDRESS,
+    NON_CONNECTABLE_REMOTE_SOURCE_ADDRESS,
+    FakeScanner,
+)
 
 
 @pytest.fixture(name="disable_bluez_manager_socket", autouse=True, scope="package")
@@ -314,8 +320,9 @@ def disable_new_discovery_flows_fixture():
 @pytest.fixture
 def register_hci0_scanner(hass: HomeAssistant) -> Generator[None]:
     """Register an hci0 scanner."""
-    hci0_scanner = FakeScanner("hci0", "hci0")
-    cancel = bluetooth.async_register_scanner(hass, hci0_scanner)
+    hci0_scanner = FakeScanner(HCI0_SOURCE_ADDRESS, "hci0")
+    hci0_scanner.connectable = True
+    cancel = bluetooth.async_register_scanner(hass, hci0_scanner, connection_slots=5)
     yield
     cancel()
     bluetooth.async_remove_scanner(hass, hci0_scanner.source)
@@ -324,8 +331,21 @@ def register_hci0_scanner(hass: HomeAssistant) -> Generator[None]:
 @pytest.fixture
 def register_hci1_scanner(hass: HomeAssistant) -> Generator[None]:
     """Register an hci1 scanner."""
-    hci1_scanner = FakeScanner("hci1", "hci1")
-    cancel = bluetooth.async_register_scanner(hass, hci1_scanner)
+    hci1_scanner = FakeScanner(HCI1_SOURCE_ADDRESS, "hci1")
+    hci1_scanner.connectable = True
+    cancel = bluetooth.async_register_scanner(hass, hci1_scanner, connection_slots=5)
     yield
     cancel()
     bluetooth.async_remove_scanner(hass, hci1_scanner.source)
+
+
+@pytest.fixture
+def register_non_connectable_scanner(hass: HomeAssistant) -> Generator[None]:
+    """Register an non connectable remote scanner."""
+    remote_scanner = BaseHaRemoteScanner(
+        NON_CONNECTABLE_REMOTE_SOURCE_ADDRESS, "non connectable", None, False
+    )
+    cancel = bluetooth.async_register_scanner(hass, remote_scanner)
+    yield
+    cancel()
+    bluetooth.async_remove_scanner(hass, remote_scanner.source)
diff --git a/tests/components/bluetooth/test_base_scanner.py b/tests/components/bluetooth/test_base_scanner.py
index e3bdca256c0..acd630863d2 100644
--- a/tests/components/bluetooth/test_base_scanner.py
+++ b/tests/components/bluetooth/test_base_scanner.py
@@ -29,7 +29,7 @@ from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.json import json_loads
 
 from . import (
diff --git a/tests/components/bluetooth/test_config_flow.py b/tests/components/bluetooth/test_config_flow.py
index abb3a5e2393..45d177de132 100644
--- a/tests/components/bluetooth/test_config_flow.py
+++ b/tests/components/bluetooth/test_config_flow.py
@@ -13,12 +13,14 @@ from homeassistant.components.bluetooth.const import (
     CONF_PASSIVE,
     CONF_SOURCE,
     CONF_SOURCE_CONFIG_ENTRY_ID,
+    CONF_SOURCE_DEVICE_ID,
     CONF_SOURCE_DOMAIN,
     CONF_SOURCE_MODEL,
     DOMAIN,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.helpers import area_registry as ar, device_registry as dr
 from homeassistant.setup import async_setup_component
 
 from . import FakeRemoteScanner, MockBleakClient, _get_manager
@@ -487,9 +489,38 @@ async def test_options_flow_remote_adapter(hass: HomeAssistant) -> None:
     assert result["reason"] == "remote_adapters_not_supported"
 
 
+@pytest.mark.usefixtures(
+    "one_adapter", "mock_bleak_scanner_start", "mock_bluetooth_adapters"
+)
+async def test_options_flow_local_no_passive_support(hass: HomeAssistant) -> None:
+    """Test options are not available for local adapters without passive support."""
+    source_entry = MockConfigEntry(
+        domain="test",
+    )
+    source_entry.add_to_hass(hass)
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={},
+        options={},
+        unique_id="BB:BB:BB:BB:BB:BB",
+    )
+    entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    _get_manager()._adapters["hci0"]["passive_scan"] = False
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "local_adapters_no_passive_support"
+
+
 @pytest.mark.usefixtures("one_adapter")
-async def test_async_step_user_linux_adapter_is_ignored(hass: HomeAssistant) -> None:
-    """Test we give a hint that the adapter is ignored."""
+async def test_async_step_user_linux_adapter_replace_ignored(
+    hass: HomeAssistant,
+) -> None:
+    """Test we can replace an ignored adapter from user flow."""
     entry = MockConfigEntry(
         domain=DOMAIN,
         unique_id="00:00:00:00:00:01",
@@ -501,41 +532,54 @@ async def test_async_step_user_linux_adapter_is_ignored(hass: HomeAssistant) ->
         context={"source": config_entries.SOURCE_USER},
         data={},
     )
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "no_adapters"
-    assert result["description_placeholders"] == {"ignored_adapters": "1"}
-
-
-@pytest.mark.usefixtures("enable_bluetooth")
-async def test_async_step_integration_discovery_remote_adapter(
-    hass: HomeAssistant,
-) -> None:
-    """Test remote adapter configuration via integration discovery."""
-    entry = MockConfigEntry(domain="test")
-    connector = (
-        HaBluetoothConnector(MockBleakClient, "mock_bleak_client", lambda: False),
-    )
-    scanner = FakeRemoteScanner("esp32", "esp32", connector, True)
-    manager = _get_manager()
-    cancel_scanner = manager.async_register_scanner(scanner)
-
-    entry.add_to_hass(hass)
     with (
         patch("homeassistant.components.bluetooth.async_setup", return_value=True),
         patch(
             "homeassistant.components.bluetooth.async_setup_entry", return_value=True
         ) as mock_setup_entry,
     ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_INTEGRATION_DISCOVERY},
-            data={
-                CONF_SOURCE: scanner.source,
-                CONF_SOURCE_DOMAIN: "test",
-                CONF_SOURCE_MODEL: "test",
-                CONF_SOURCE_CONFIG_ENTRY_ID: entry.entry_id,
-            },
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input={}
         )
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "ACME Bluetooth Adapter 5.0 (00:00:00:00:00:01)"
+    assert result2["data"] == {}
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+@pytest.mark.usefixtures("enable_bluetooth")
+async def test_async_step_integration_discovery_remote_adapter(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    area_registry: ar.AreaRegistry,
+) -> None:
+    """Test remote adapter configuration via integration discovery."""
+    entry = MockConfigEntry(domain="test")
+    entry.add_to_hass(hass)
+    connector = (
+        HaBluetoothConnector(MockBleakClient, "mock_bleak_client", lambda: False),
+    )
+    scanner = FakeRemoteScanner("esp32", "esp32", connector, True)
+    manager = _get_manager()
+    area_entry = area_registry.async_get_or_create("test")
+    cancel_scanner = manager.async_register_scanner(scanner)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=entry.entry_id,
+        identifiers={("test", "BB:BB:BB:BB:BB:BB")},
+        suggested_area=area_entry.id,
+    )
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_INTEGRATION_DISCOVERY},
+        data={
+            CONF_SOURCE: scanner.source,
+            CONF_SOURCE_DOMAIN: "test",
+            CONF_SOURCE_MODEL: "test",
+            CONF_SOURCE_CONFIG_ENTRY_ID: entry.entry_id,
+            CONF_SOURCE_DEVICE_ID: device_entry.id,
+        },
+    )
     assert result["type"] is FlowResultType.CREATE_ENTRY
     assert result["title"] == "esp32"
     assert result["data"] == {
@@ -543,10 +587,61 @@ async def test_async_step_integration_discovery_remote_adapter(
         CONF_SOURCE_DOMAIN: "test",
         CONF_SOURCE_MODEL: "test",
         CONF_SOURCE_CONFIG_ENTRY_ID: entry.entry_id,
+        CONF_SOURCE_DEVICE_ID: device_entry.id,
     }
-    assert len(mock_setup_entry.mock_calls) == 1
     await hass.async_block_till_done()
+
+    new_entry_id: str = result["result"].entry_id
+    new_entry = hass.config_entries.async_get_entry(new_entry_id)
+    assert new_entry is not None
+    assert new_entry.state is config_entries.ConfigEntryState.LOADED
+
+    ble_device_entry = device_registry.async_get_device(
+        connections={(dr.CONNECTION_BLUETOOTH, scanner.source)}
+    )
+    assert ble_device_entry is not None
+    assert ble_device_entry.via_device_id == device_entry.id
+    assert ble_device_entry.area_id == area_entry.id
+
+    await hass.config_entries.async_unload(new_entry.entry_id)
     await hass.config_entries.async_unload(entry.entry_id)
     await hass.async_block_till_done()
     cancel_scanner()
     await hass.async_block_till_done()
+
+
+@pytest.mark.usefixtures("enable_bluetooth")
+async def test_async_step_integration_discovery_remote_adapter_mac_fix(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    area_registry: ar.AreaRegistry,
+) -> None:
+    """Test remote adapter corrects mac address via integration discovery."""
+    entry = MockConfigEntry(domain="test")
+    entry.add_to_hass(hass)
+    bluetooth_entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            CONF_SOURCE: "AA:BB:CC:DD:EE:FF",
+            CONF_SOURCE_DOMAIN: "test",
+            CONF_SOURCE_MODEL: "test",
+            CONF_SOURCE_CONFIG_ENTRY_ID: entry.entry_id,
+            CONF_SOURCE_DEVICE_ID: None,
+        },
+    )
+    bluetooth_entry.add_to_hass(hass)
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_INTEGRATION_DISCOVERY},
+        data={
+            CONF_SOURCE: "AA:AA:AA:AA:AA:AA",
+            CONF_SOURCE_DOMAIN: "test",
+            CONF_SOURCE_MODEL: "test",
+            CONF_SOURCE_CONFIG_ENTRY_ID: entry.entry_id,
+            CONF_SOURCE_DEVICE_ID: None,
+        },
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+    assert bluetooth_entry.unique_id == "AA:AA:AA:AA:AA:AA"
+    assert bluetooth_entry.data[CONF_SOURCE] == "AA:AA:AA:AA:AA:AA"
diff --git a/tests/components/bluetooth/test_diagnostics.py b/tests/components/bluetooth/test_diagnostics.py
index be4412db4d8..e38ae19ce52 100644
--- a/tests/components/bluetooth/test_diagnostics.py
+++ b/tests/components/bluetooth/test_diagnostics.py
@@ -133,6 +133,20 @@ async def test_diagnostics(
                 }
             },
             "manager": {
+                "allocations": {
+                    "00:00:00:00:00:01": {
+                        "allocated": [],
+                        "free": 5,
+                        "slots": 5,
+                        "source": "00:00:00:00:00:01",
+                    },
+                    "00:00:00:00:00:02": {
+                        "allocated": [],
+                        "free": 2,
+                        "slots": 2,
+                        "source": "00:00:00:00:00:02",
+                    },
+                },
                 "adapters": {
                     "hci0": {
                         "address": "00:00:00:00:00:01",
@@ -168,6 +182,7 @@ async def test_diagnostics(
                 "scanners": [
                     {
                         "adapter": "hci0",
+                        "connectable": True,
                         "discovered_devices_and_advertisement_data": [],
                         "last_detection": ANY,
                         "monotonic_time": ANY,
@@ -204,6 +219,7 @@ async def test_diagnostics(
                                 "rssi": -127,
                             }
                         ],
+                        "connectable": True,
                         "last_detection": ANY,
                         "monotonic_time": ANY,
                         "name": "hci1 (00:00:00:00:00:02)",
@@ -291,6 +307,14 @@ async def test_diagnostics_macos(
                 }
             },
             "manager": {
+                "allocations": {
+                    "Core Bluetooth": {
+                        "allocated": [],
+                        "free": 5,
+                        "slots": 5,
+                        "source": "Core Bluetooth",
+                    },
+                },
                 "adapters": {
                     "Core Bluetooth": {
                         "address": "00:00:00:00:00:00",
@@ -369,6 +393,7 @@ async def test_diagnostics_macos(
                 "scanners": [
                     {
                         "adapter": "Core Bluetooth",
+                        "connectable": True,
                         "discovered_devices_and_advertisement_data": [
                             {
                                 "address": "44:44:33:11:23:45",
@@ -484,6 +509,14 @@ async def test_diagnostics_remote_adapter(
             },
             "dbus": {},
             "manager": {
+                "allocations": {
+                    "00:00:00:00:00:01": {
+                        "allocated": [],
+                        "free": 5,
+                        "slots": 5,
+                        "source": "00:00:00:00:00:01",
+                    },
+                },
                 "adapters": {
                     "hci0": {
                         "address": "00:00:00:00:00:01",
@@ -563,6 +596,7 @@ async def test_diagnostics_remote_adapter(
                 "scanners": [
                     {
                         "adapter": "hci0",
+                        "connectable": True,
                         "discovered_devices_and_advertisement_data": [],
                         "last_detection": ANY,
                         "monotonic_time": ANY,
@@ -582,6 +616,8 @@ async def test_diagnostics_remote_adapter(
                     },
                     {
                         "connectable": True,
+                        "current_mode": None,
+                        "requested_mode": None,
                         "discovered_device_timestamps": {"44:44:33:11:23:45": ANY},
                         "discovered_devices_and_advertisement_data": [
                             {
diff --git a/tests/components/bluetooth/test_init.py b/tests/components/bluetooth/test_init.py
index 2c8c9e70e7f..de299c58b93 100644
--- a/tests/components/bluetooth/test_init.py
+++ b/tests/components/bluetooth/test_init.py
@@ -3300,3 +3300,52 @@ async def test_cleanup_orphened_remote_scanner_config_entry(
     assert not hass.config_entries.async_entry_for_domain_unique_id(
         "bluetooth", scanner.source
     )
+
+
+@pytest.mark.usefixtures("enable_bluetooth")
+async def test_fix_incorrect_mac_remote_scanner_config_entry(
+    hass: HomeAssistant,
+) -> None:
+    """Test the remote scanner config entries can replace a incorrect mac."""
+    source_entry = MockConfigEntry(domain="test")
+    source_entry.add_to_hass(hass)
+    connector = (
+        HaBluetoothConnector(MockBleakClient, "mock_bleak_client", lambda: False),
+    )
+    scanner = FakeRemoteScanner("AA:BB:CC:DD:EE:FF", "esp32", connector, True)
+    assert scanner.source == "AA:BB:CC:DD:EE:FF"
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            CONF_SOURCE: scanner.source,
+            CONF_SOURCE_DOMAIN: "test",
+            CONF_SOURCE_MODEL: "test",
+            CONF_SOURCE_CONFIG_ENTRY_ID: source_entry.entry_id,
+        },
+        unique_id=scanner.source,
+    )
+    entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+    assert hass.config_entries.async_entry_for_domain_unique_id(
+        "bluetooth", scanner.source
+    )
+    await hass.config_entries.async_unload(entry.entry_id)
+
+    new_scanner = FakeRemoteScanner("AA:BB:CC:DD:EE:AA", "esp32", connector, True)
+    assert new_scanner.source == "AA:BB:CC:DD:EE:AA"
+    hass.config_entries.async_update_entry(
+        entry,
+        data={**entry.data, CONF_SOURCE: new_scanner.source},
+        unique_id=new_scanner.source,
+    )
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+    assert hass.config_entries.async_entry_for_domain_unique_id(
+        "bluetooth", new_scanner.source
+    )
+    # Incorrect connection should be removed
+    assert not hass.config_entries.async_entry_for_domain_unique_id(
+        "bluetooth", scanner.source
+    )
diff --git a/tests/components/bluetooth/test_manager.py b/tests/components/bluetooth/test_manager.py
index 77071368dd0..48d1a38375d 100644
--- a/tests/components/bluetooth/test_manager.py
+++ b/tests/components/bluetooth/test_manager.py
@@ -45,6 +45,8 @@ from homeassistant.util.dt import utcnow
 from homeassistant.util.json import json_loads
 
 from . import (
+    HCI0_SOURCE_ADDRESS,
+    HCI1_SOURCE_ADDRESS,
     FakeScanner,
     MockBleakClient,
     _get_manager,
@@ -82,7 +84,7 @@ async def test_advertisements_do_not_switch_adapters_for_no_reason(
         local_name="wohand_signal_100", service_uuids=[]
     )
     inject_advertisement_with_source(
-        hass, switchbot_device_signal_100, switchbot_adv_signal_100, "hci0"
+        hass, switchbot_device_signal_100, switchbot_adv_signal_100, HCI0_SOURCE_ADDRESS
     )
 
     assert (
@@ -97,7 +99,7 @@ async def test_advertisements_do_not_switch_adapters_for_no_reason(
         local_name="wohand_signal_99", service_uuids=[]
     )
     inject_advertisement_with_source(
-        hass, switchbot_device_signal_99, switchbot_adv_signal_99, "hci0"
+        hass, switchbot_device_signal_99, switchbot_adv_signal_99, HCI0_SOURCE_ADDRESS
     )
 
     assert (
@@ -112,7 +114,7 @@ async def test_advertisements_do_not_switch_adapters_for_no_reason(
         local_name="wohand_good_signal", service_uuids=[]
     )
     inject_advertisement_with_source(
-        hass, switchbot_device_signal_98, switchbot_adv_signal_98, "hci1"
+        hass, switchbot_device_signal_98, switchbot_adv_signal_98, HCI1_SOURCE_ADDRESS
     )
 
     # should not switch to hci1
@@ -137,7 +139,10 @@ async def test_switching_adapters_based_on_rssi(
         local_name="wohand_poor_signal", service_uuids=[], rssi=-100
     )
     inject_advertisement_with_source(
-        hass, switchbot_device_poor_signal, switchbot_adv_poor_signal, "hci0"
+        hass,
+        switchbot_device_poor_signal,
+        switchbot_adv_poor_signal,
+        HCI0_SOURCE_ADDRESS,
     )
 
     assert (
@@ -150,7 +155,10 @@ async def test_switching_adapters_based_on_rssi(
         local_name="wohand_good_signal", service_uuids=[], rssi=-60
     )
     inject_advertisement_with_source(
-        hass, switchbot_device_good_signal, switchbot_adv_good_signal, "hci1"
+        hass,
+        switchbot_device_good_signal,
+        switchbot_adv_good_signal,
+        HCI1_SOURCE_ADDRESS,
     )
 
     assert (
@@ -159,7 +167,10 @@ async def test_switching_adapters_based_on_rssi(
     )
 
     inject_advertisement_with_source(
-        hass, switchbot_device_good_signal, switchbot_adv_poor_signal, "hci0"
+        hass,
+        switchbot_device_good_signal,
+        switchbot_adv_poor_signal,
+        HCI0_SOURCE_ADDRESS,
     )
     assert (
         bluetooth.async_ble_device_from_address(hass, address)
@@ -175,7 +186,10 @@ async def test_switching_adapters_based_on_rssi(
     )
 
     inject_advertisement_with_source(
-        hass, switchbot_device_similar_signal, switchbot_adv_similar_signal, "hci0"
+        hass,
+        switchbot_device_similar_signal,
+        switchbot_adv_similar_signal,
+        HCI0_SOURCE_ADDRESS,
     )
     assert (
         bluetooth.async_ble_device_from_address(hass, address)
@@ -198,7 +212,7 @@ async def test_switching_adapters_based_on_zero_rssi(
         local_name="wohand_no_rssi", service_uuids=[], rssi=0
     )
     inject_advertisement_with_source(
-        hass, switchbot_device_no_rssi, switchbot_adv_no_rssi, "hci0"
+        hass, switchbot_device_no_rssi, switchbot_adv_no_rssi, HCI0_SOURCE_ADDRESS
     )
 
     assert (
@@ -211,7 +225,10 @@ async def test_switching_adapters_based_on_zero_rssi(
         local_name="wohand_good_signal", service_uuids=[], rssi=-60
     )
     inject_advertisement_with_source(
-        hass, switchbot_device_good_signal, switchbot_adv_good_signal, "hci1"
+        hass,
+        switchbot_device_good_signal,
+        switchbot_adv_good_signal,
+        HCI1_SOURCE_ADDRESS,
     )
 
     assert (
@@ -220,7 +237,7 @@ async def test_switching_adapters_based_on_zero_rssi(
     )
 
     inject_advertisement_with_source(
-        hass, switchbot_device_good_signal, switchbot_adv_no_rssi, "hci0"
+        hass, switchbot_device_good_signal, switchbot_adv_no_rssi, HCI0_SOURCE_ADDRESS
     )
     assert (
         bluetooth.async_ble_device_from_address(hass, address)
@@ -236,7 +253,10 @@ async def test_switching_adapters_based_on_zero_rssi(
     )
 
     inject_advertisement_with_source(
-        hass, switchbot_device_similar_signal, switchbot_adv_similar_signal, "hci0"
+        hass,
+        switchbot_device_similar_signal,
+        switchbot_adv_similar_signal,
+        HCI0_SOURCE_ADDRESS,
     )
     assert (
         bluetooth.async_ble_device_from_address(hass, address)
@@ -266,7 +286,7 @@ async def test_switching_adapters_based_on_stale(
         switchbot_device_poor_signal_hci0,
         switchbot_adv_poor_signal_hci0,
         start_time_monotonic,
-        "hci0",
+        HCI0_SOURCE_ADDRESS,
     )
 
     assert (
@@ -285,7 +305,7 @@ async def test_switching_adapters_based_on_stale(
         switchbot_device_poor_signal_hci1,
         switchbot_adv_poor_signal_hci1,
         start_time_monotonic,
-        "hci1",
+        HCI1_SOURCE_ADDRESS,
     )
 
     # Should not switch adapters until the advertisement is stale
@@ -333,7 +353,7 @@ async def test_switching_adapters_based_on_stale_with_discovered_interval(
         switchbot_device_poor_signal_hci0,
         switchbot_adv_poor_signal_hci0,
         start_time_monotonic,
-        "hci0",
+        HCI0_SOURCE_ADDRESS,
     )
 
     assert (
@@ -354,7 +374,7 @@ async def test_switching_adapters_based_on_stale_with_discovered_interval(
         switchbot_device_poor_signal_hci1,
         switchbot_adv_poor_signal_hci1,
         start_time_monotonic,
-        "hci1",
+        HCI1_SOURCE_ADDRESS,
     )
 
     # Should not switch adapters until the advertisement is stale
@@ -368,7 +388,7 @@ async def test_switching_adapters_based_on_stale_with_discovered_interval(
         switchbot_device_poor_signal_hci1,
         switchbot_adv_poor_signal_hci1,
         start_time_monotonic + 10 + 1,
-        "hci1",
+        HCI1_SOURCE_ADDRESS,
     )
 
     # Should not switch yet since we are not within the
@@ -383,7 +403,7 @@ async def test_switching_adapters_based_on_stale_with_discovered_interval(
         switchbot_device_poor_signal_hci1,
         switchbot_adv_poor_signal_hci1,
         start_time_monotonic + 10 + TRACKER_BUFFERING_WOBBLE_SECONDS + 1,
-        "hci1",
+        HCI1_SOURCE_ADDRESS,
     )
     # Should switch to hci1 since the previous advertisement is stale
     # even though the signal is poor because the device is now
@@ -404,7 +424,9 @@ async def test_restore_history_from_dbus(
     ble_device = generate_ble_device(address, "name")
     history = {
         address: AdvertisementHistory(
-            ble_device, generate_advertisement_data(local_name="name"), "hci0"
+            ble_device,
+            generate_advertisement_data(local_name="name"),
+            "hci0",
         )
     }
 
@@ -416,6 +438,8 @@ async def test_restore_history_from_dbus(
         await hass.async_block_till_done()
 
     assert bluetooth.async_ble_device_from_address(hass, address) is ble_device
+    info = bluetooth.async_last_service_info(hass, address, False)
+    assert info.source == "00:00:00:00:00:01"
 
 
 @pytest.mark.usefixtures("one_adapter")
@@ -440,7 +464,9 @@ async def test_restore_history_from_dbus_and_remote_adapters(
     ble_device = generate_ble_device(address, "name")
     history = {
         address: AdvertisementHistory(
-            ble_device, generate_advertisement_data(local_name="name"), "hci0"
+            ble_device,
+            generate_advertisement_data(local_name="name"),
+            HCI0_SOURCE_ADDRESS,
         )
     }
 
@@ -480,7 +506,9 @@ async def test_restore_history_from_dbus_and_corrupted_remote_adapters(
     ble_device = generate_ble_device(address, "name")
     history = {
         address: AdvertisementHistory(
-            ble_device, generate_advertisement_data(local_name="name"), "hci0"
+            ble_device,
+            generate_advertisement_data(local_name="name"),
+            HCI0_SOURCE_ADDRESS,
         )
     }
 
@@ -511,7 +539,12 @@ async def test_switching_adapters_based_on_rssi_connectable_to_non_connectable(
         local_name="wohand_poor_signal", service_uuids=[], rssi=-100
     )
     inject_advertisement_with_time_and_source_connectable(
-        hass, switchbot_device_poor_signal, switchbot_adv_poor_signal, now, "hci0", True
+        hass,
+        switchbot_device_poor_signal,
+        switchbot_adv_poor_signal,
+        now,
+        HCI0_SOURCE_ADDRESS,
+        True,
     )
 
     assert (
@@ -607,7 +640,7 @@ async def test_connectable_advertisement_can_be_retrieved_with_best_path_is_non_
         switchbot_device_good_signal,
         switchbot_adv_good_signal,
         now,
-        "hci1",
+        HCI1_SOURCE_ADDRESS,
         False,
     )
 
@@ -622,7 +655,12 @@ async def test_connectable_advertisement_can_be_retrieved_with_best_path_is_non_
         local_name="wohand_poor_signal", service_uuids=[], rssi=-100
     )
     inject_advertisement_with_time_and_source_connectable(
-        hass, switchbot_device_poor_signal, switchbot_adv_poor_signal, now, "hci0", True
+        hass,
+        switchbot_device_poor_signal,
+        switchbot_adv_poor_signal,
+        now,
+        HCI0_SOURCE_ADDRESS,
+        True,
     )
 
     assert (
@@ -662,7 +700,10 @@ async def test_switching_adapters_when_one_goes_away(
         local_name="wohand_poor_signal", service_uuids=[], rssi=-100
     )
     inject_advertisement_with_source(
-        hass, switchbot_device_poor_signal, switchbot_adv_poor_signal, "hci0"
+        hass,
+        switchbot_device_poor_signal,
+        switchbot_adv_poor_signal,
+        HCI0_SOURCE_ADDRESS,
     )
 
     # We want to prefer the good signal when we have options
@@ -674,7 +715,10 @@ async def test_switching_adapters_when_one_goes_away(
     cancel_hci2()
 
     inject_advertisement_with_source(
-        hass, switchbot_device_poor_signal, switchbot_adv_poor_signal, "hci0"
+        hass,
+        switchbot_device_poor_signal,
+        switchbot_adv_poor_signal,
+        HCI0_SOURCE_ADDRESS,
     )
 
     # Now that hci2 is gone, we should prefer the poor signal
@@ -713,7 +757,10 @@ async def test_switching_adapters_when_one_stop_scanning(
         local_name="wohand_poor_signal", service_uuids=[], rssi=-100
     )
     inject_advertisement_with_source(
-        hass, switchbot_device_poor_signal, switchbot_adv_poor_signal, "hci0"
+        hass,
+        switchbot_device_poor_signal,
+        switchbot_adv_poor_signal,
+        HCI0_SOURCE_ADDRESS,
     )
 
     # We want to prefer the good signal when we have options
@@ -725,7 +772,10 @@ async def test_switching_adapters_when_one_stop_scanning(
     hci2_scanner.scanning = False
 
     inject_advertisement_with_source(
-        hass, switchbot_device_poor_signal, switchbot_adv_poor_signal, "hci0"
+        hass,
+        switchbot_device_poor_signal,
+        switchbot_adv_poor_signal,
+        HCI0_SOURCE_ADDRESS,
     )
 
     # Now that hci2 has stopped scanning, we should prefer the poor signal
@@ -969,8 +1019,6 @@ async def test_goes_unavailable_dismisses_discovery_and_makes_discoverable(
 
         def clear_all_devices(self) -> None:
             """Clear all devices."""
-            self._discovered_device_advertisement_datas.clear()
-            self._discovered_device_timestamps.clear()
             self._previous_service_info.clear()
 
     connector = (
@@ -1396,8 +1444,6 @@ async def test_bluetooth_rediscover(
 
         def clear_all_devices(self) -> None:
             """Clear all devices."""
-            self._discovered_device_advertisement_datas.clear()
-            self._discovered_device_timestamps.clear()
             self._previous_service_info.clear()
 
     connector = (
@@ -1575,8 +1621,6 @@ async def test_bluetooth_rediscover_no_match(
 
         def clear_all_devices(self) -> None:
             """Clear all devices."""
-            self._discovered_device_advertisement_datas.clear()
-            self._discovered_device_timestamps.clear()
             self._previous_service_info.clear()
 
     connector = (
diff --git a/tests/components/bluetooth/test_websocket_api.py b/tests/components/bluetooth/test_websocket_api.py
index c9670f2f895..57199d04078 100644
--- a/tests/components/bluetooth/test_websocket_api.py
+++ b/tests/components/bluetooth/test_websocket_api.py
@@ -5,19 +5,26 @@ from datetime import timedelta
 import time
 from unittest.mock import ANY, patch
 
+from bleak_retry_connector import Allocations
 from freezegun import freeze_time
 import pytest
 
+from homeassistant.components.bluetooth import DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.util.dt import utcnow
 
 from . import (
+    HCI0_SOURCE_ADDRESS,
+    HCI1_SOURCE_ADDRESS,
+    NON_CONNECTABLE_REMOTE_SOURCE_ADDRESS,
+    FakeScanner,
+    _get_manager,
     generate_advertisement_data,
     generate_ble_device,
     inject_advertisement_with_source,
 )
 
-from tests.common import async_fire_time_changed
+from tests.common import MockConfigEntry, async_fire_time_changed
 from tests.typing import WebSocketGenerator
 
 
@@ -38,7 +45,7 @@ async def test_subscribe_advertisements(
         local_name="wohand_signal_100", service_uuids=[]
     )
     inject_advertisement_with_source(
-        hass, switchbot_device_signal_100, switchbot_adv_signal_100, "hci0"
+        hass, switchbot_device_signal_100, switchbot_adv_signal_100, HCI0_SOURCE_ADDRESS
     )
 
     client = await hass_ws_client()
@@ -64,7 +71,7 @@ async def test_subscribe_advertisements(
                 "rssi": -127,
                 "service_data": {},
                 "service_uuids": [],
-                "source": "hci0",
+                "source": HCI0_SOURCE_ADDRESS,
                 "time": ANY,
                 "tx_power": -127,
             }
@@ -79,7 +86,7 @@ async def test_subscribe_advertisements(
         rssi=-80,
     )
     inject_advertisement_with_source(
-        hass, switchbot_device_signal_100, switchbot_adv_signal_100, "hci1"
+        hass, switchbot_device_signal_100, switchbot_adv_signal_100, HCI1_SOURCE_ADDRESS
     )
     async with asyncio.timeout(1):
         response = await client.receive_json()
@@ -93,7 +100,7 @@ async def test_subscribe_advertisements(
                 "rssi": -80,
                 "service_data": {},
                 "service_uuids": [],
-                "source": "hci1",
+                "source": HCI1_SOURCE_ADDRESS,
                 "time": ANY,
                 "tx_power": -127,
             }
@@ -114,3 +121,312 @@ async def test_subscribe_advertisements(
     async with asyncio.timeout(1):
         response = await client.receive_json()
     assert response["event"] == {"remove": [{"address": "44:44:33:11:23:12"}]}
+
+
+@pytest.mark.usefixtures("enable_bluetooth")
+async def test_subscribe_connection_allocations(
+    hass: HomeAssistant,
+    register_hci0_scanner: None,
+    register_hci1_scanner: None,
+    register_non_connectable_scanner: None,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test bluetooth subscribe_connection_allocations."""
+    address = "44:44:33:11:23:12"
+
+    switchbot_device_signal_100 = generate_ble_device(
+        address, "wohand_signal_100", rssi=-100
+    )
+    switchbot_adv_signal_100 = generate_advertisement_data(
+        local_name="wohand_signal_100", service_uuids=[]
+    )
+    inject_advertisement_with_source(
+        hass, switchbot_device_signal_100, switchbot_adv_signal_100, HCI0_SOURCE_ADDRESS
+    )
+
+    client = await hass_ws_client()
+    await client.send_json(
+        {
+            "id": 1,
+            "type": "bluetooth/subscribe_connection_allocations",
+        }
+    )
+    async with asyncio.timeout(1):
+        response = await client.receive_json()
+    assert response["success"]
+
+    async with asyncio.timeout(1):
+        response = await client.receive_json()
+
+    assert response["event"] == [
+        {
+            "allocated": [],
+            "free": 5,
+            "slots": 5,
+            "source": "00:00:00:00:00:01",
+        },
+        {
+            "allocated": [],
+            "free": 5,
+            "slots": 5,
+            "source": HCI0_SOURCE_ADDRESS,
+        },
+        {
+            "allocated": [],
+            "free": 5,
+            "slots": 5,
+            "source": HCI1_SOURCE_ADDRESS,
+        },
+        {
+            "allocated": [],
+            "free": 0,
+            "slots": 0,
+            "source": NON_CONNECTABLE_REMOTE_SOURCE_ADDRESS,
+        },
+    ]
+
+    manager = _get_manager()
+    manager.async_on_allocation_changed(
+        Allocations(
+            adapter="hci1",  # Will be translated to source
+            slots=5,
+            free=4,
+            allocated=["AA:BB:CC:DD:EE:EE"],
+        )
+    )
+    async with asyncio.timeout(1):
+        response = await client.receive_json()
+    assert response["event"] == [
+        {
+            "allocated": ["AA:BB:CC:DD:EE:EE"],
+            "free": 4,
+            "slots": 5,
+            "source": "AA:BB:CC:DD:EE:11",
+        },
+    ]
+    manager.async_on_allocation_changed(
+        Allocations(
+            adapter="hci1",  # Will be translated to source
+            slots=5,
+            free=5,
+            allocated=[],
+        )
+    )
+    async with asyncio.timeout(1):
+        response = await client.receive_json()
+    assert response["event"] == [
+        {"allocated": [], "free": 5, "slots": 5, "source": HCI1_SOURCE_ADDRESS}
+    ]
+
+
+@pytest.mark.usefixtures("enable_bluetooth")
+async def test_subscribe_connection_allocations_specific_scanner(
+    hass: HomeAssistant,
+    register_non_connectable_scanner: None,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test bluetooth subscribe_connection_allocations for a specific source address."""
+    entry = MockConfigEntry(
+        domain=DOMAIN, unique_id=NON_CONNECTABLE_REMOTE_SOURCE_ADDRESS
+    )
+    entry.add_to_hass(hass)
+    client = await hass_ws_client()
+    await client.send_json(
+        {
+            "id": 1,
+            "type": "bluetooth/subscribe_connection_allocations",
+            "config_entry_id": entry.entry_id,
+        }
+    )
+    async with asyncio.timeout(1):
+        response = await client.receive_json()
+    assert response["success"]
+
+    async with asyncio.timeout(1):
+        response = await client.receive_json()
+
+    assert response["event"] == [
+        {
+            "allocated": [],
+            "free": 0,
+            "slots": 0,
+            "source": NON_CONNECTABLE_REMOTE_SOURCE_ADDRESS,
+        }
+    ]
+
+
+@pytest.mark.usefixtures("enable_bluetooth")
+async def test_subscribe_connection_allocations_invalid_config_entry_id(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test bluetooth subscribe_connection_allocations for an invalid config entry id."""
+    client = await hass_ws_client()
+    await client.send_json(
+        {
+            "id": 1,
+            "type": "bluetooth/subscribe_connection_allocations",
+            "config_entry_id": "non_existent",
+        }
+    )
+    async with asyncio.timeout(1):
+        response = await client.receive_json()
+    assert not response["success"]
+    assert response["error"]["code"] == "invalid_config_entry_id"
+    assert response["error"]["message"] == "Config entry non_existent not found"
+
+
+@pytest.mark.usefixtures("enable_bluetooth")
+async def test_subscribe_connection_allocations_invalid_scanner(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test bluetooth subscribe_connection_allocations for an invalid source address."""
+    entry = MockConfigEntry(domain=DOMAIN, unique_id="invalid")
+    entry.add_to_hass(hass)
+    client = await hass_ws_client()
+    await client.send_json(
+        {
+            "id": 1,
+            "type": "bluetooth/subscribe_connection_allocations",
+            "config_entry_id": entry.entry_id,
+        }
+    )
+    async with asyncio.timeout(1):
+        response = await client.receive_json()
+    assert not response["success"]
+    assert response["error"]["code"] == "invalid_source"
+    assert response["error"]["message"] == "Source invalid not found"
+
+
+@pytest.mark.usefixtures("enable_bluetooth")
+async def test_subscribe_scanner_details(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test bluetooth subscribe_connection_allocations."""
+    client = await hass_ws_client()
+    await client.send_json(
+        {
+            "id": 1,
+            "type": "bluetooth/subscribe_scanner_details",
+        }
+    )
+    async with asyncio.timeout(1):
+        response = await client.receive_json()
+    assert response["success"]
+
+    async with asyncio.timeout(1):
+        response = await client.receive_json()
+
+    assert response["event"] == {
+        "add": [
+            {
+                "adapter": "hci0",
+                "connectable": False,
+                "name": "hci0 (00:00:00:00:00:01)",
+                "source": "00:00:00:00:00:01",
+            }
+        ]
+    }
+
+    manager = _get_manager()
+    hci3_scanner = FakeScanner("AA:BB:CC:DD:EE:33", "hci3")
+    cancel_hci3 = manager.async_register_hass_scanner(hci3_scanner)
+
+    async with asyncio.timeout(1):
+        response = await client.receive_json()
+    assert response["event"] == {
+        "add": [
+            {
+                "adapter": "hci3",
+                "connectable": False,
+                "name": "hci3 (AA:BB:CC:DD:EE:33)",
+                "source": "AA:BB:CC:DD:EE:33",
+            }
+        ]
+    }
+    cancel_hci3()
+    async with asyncio.timeout(1):
+        response = await client.receive_json()
+    assert response["event"] == {
+        "remove": [
+            {
+                "adapter": "hci3",
+                "connectable": False,
+                "name": "hci3 (AA:BB:CC:DD:EE:33)",
+                "source": "AA:BB:CC:DD:EE:33",
+            }
+        ]
+    }
+
+
+@pytest.mark.usefixtures("enable_bluetooth")
+async def test_subscribe_scanner_details_specific_scanner(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test bluetooth subscribe_scanner_details for a specific source address."""
+    entry = MockConfigEntry(domain=DOMAIN, unique_id="AA:BB:CC:DD:EE:33")
+    entry.add_to_hass(hass)
+    client = await hass_ws_client()
+    await client.send_json(
+        {
+            "id": 1,
+            "type": "bluetooth/subscribe_scanner_details",
+            "config_entry_id": entry.entry_id,
+        }
+    )
+    async with asyncio.timeout(1):
+        response = await client.receive_json()
+    assert response["success"]
+    manager = _get_manager()
+    hci3_scanner = FakeScanner("AA:BB:CC:DD:EE:33", "hci3")
+    cancel_hci3 = manager.async_register_hass_scanner(hci3_scanner)
+
+    async with asyncio.timeout(1):
+        response = await client.receive_json()
+    assert response["event"] == {
+        "add": [
+            {
+                "adapter": "hci3",
+                "connectable": False,
+                "name": "hci3 (AA:BB:CC:DD:EE:33)",
+                "source": "AA:BB:CC:DD:EE:33",
+            }
+        ]
+    }
+    cancel_hci3()
+    async with asyncio.timeout(1):
+        response = await client.receive_json()
+    assert response["event"] == {
+        "remove": [
+            {
+                "adapter": "hci3",
+                "connectable": False,
+                "name": "hci3 (AA:BB:CC:DD:EE:33)",
+                "source": "AA:BB:CC:DD:EE:33",
+            }
+        ]
+    }
+
+
+@pytest.mark.usefixtures("enable_bluetooth")
+async def test_subscribe_scanner_details_invalid_config_entry_id(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test bluetooth subscribe_scanner_details for an invalid config entry id."""
+    client = await hass_ws_client()
+    await client.send_json(
+        {
+            "id": 1,
+            "type": "bluetooth/subscribe_scanner_details",
+            "config_entry_id": "non_existent",
+        }
+    )
+    async with asyncio.timeout(1):
+        response = await client.receive_json()
+    assert not response["success"]
+    assert response["error"]["code"] == "invalid_config_entry_id"
+    assert response["error"]["message"] == "Invalid config entry id: non_existent"
diff --git a/tests/components/bluetooth_le_tracker/test_device_tracker.py b/tests/components/bluetooth_le_tracker/test_device_tracker.py
index da90980640b..738cae90c22 100644
--- a/tests/components/bluetooth_le_tracker/test_device_tracker.py
+++ b/tests/components/bluetooth_le_tracker/test_device_tracker.py
@@ -215,7 +215,7 @@ async def test_see_device_if_time_updated(hass: HomeAssistant) -> None:
 
 @pytest.mark.usefixtures("mock_bluetooth", "mock_device_tracker_conf")
 async def test_preserve_new_tracked_device_name(hass: HomeAssistant) -> None:
-    """Test preserving tracked device name across new seens."""
+    """Test preserving tracked device name across new seens."""  # codespell:ignore seens
 
     address = "DE:AD:BE:EF:13:37"
     name = "Mock device name"
diff --git a/tests/components/bmw_connected_drive/snapshots/test_binary_sensor.ambr b/tests/components/bmw_connected_drive/snapshots/test_binary_sensor.ambr
index c0462279e59..569d39c1a5a 100644
--- a/tests/components/bmw_connected_drive/snapshots/test_binary_sensor.ambr
+++ b/tests/components/bmw_connected_drive/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -153,6 +156,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -200,6 +204,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -248,6 +253,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -302,6 +308,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -348,6 +355,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -397,6 +405,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -444,6 +453,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -492,6 +502,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -550,6 +561,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -597,6 +609,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -645,6 +658,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -698,6 +712,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -744,6 +759,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -796,6 +812,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -843,6 +860,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -891,6 +909,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -949,6 +968,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -996,6 +1016,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1044,6 +1065,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1098,6 +1120,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1144,6 +1167,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1196,6 +1220,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1245,6 +1270,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1306,6 +1332,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1354,6 +1381,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1407,6 +1435,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/bmw_connected_drive/snapshots/test_button.ambr b/tests/components/bmw_connected_drive/snapshots/test_button.ambr
index f38441125ce..5072b918d2e 100644
--- a/tests/components/bmw_connected_drive/snapshots/test_button.ambr
+++ b/tests/components/bmw_connected_drive/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -190,6 +194,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +241,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -282,6 +288,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -328,6 +335,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -374,6 +382,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -420,6 +429,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -466,6 +476,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -512,6 +523,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -558,6 +570,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -604,6 +617,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -650,6 +664,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -696,6 +711,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -742,6 +758,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -788,6 +805,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -834,6 +852,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/bmw_connected_drive/snapshots/test_lock.ambr b/tests/components/bmw_connected_drive/snapshots/test_lock.ambr
index 395c6e56dda..3dc4e59b7b1 100644
--- a/tests/components/bmw_connected_drive/snapshots/test_lock.ambr
+++ b/tests/components/bmw_connected_drive/snapshots/test_lock.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -102,6 +104,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/bmw_connected_drive/snapshots/test_number.ambr b/tests/components/bmw_connected_drive/snapshots/test_number.ambr
index 71dbc46b454..866e52e7982 100644
--- a/tests/components/bmw_connected_drive/snapshots/test_number.ambr
+++ b/tests/components/bmw_connected_drive/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 5.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -67,6 +68,7 @@
       'step': 5.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/bmw_connected_drive/snapshots/test_select.ambr b/tests/components/bmw_connected_drive/snapshots/test_select.ambr
index b827dfe478a..de76b07057e 100644
--- a/tests/components/bmw_connected_drive/snapshots/test_select.ambr
+++ b/tests/components/bmw_connected_drive/snapshots/test_select.ambr
@@ -12,6 +12,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -79,6 +80,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +149,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -214,6 +217,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -282,6 +286,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/bmw_connected_drive/snapshots/test_sensor.ambr b/tests/components/bmw_connected_drive/snapshots/test_sensor.ambr
index 624b2c6007f..230025fc865 100644
--- a/tests/components/bmw_connected_drive/snapshots/test_sensor.ambr
+++ b/tests/components/bmw_connected_drive/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -57,6 +58,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -104,6 +106,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -166,6 +169,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -227,6 +231,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -279,6 +284,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -333,6 +339,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -387,6 +394,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -441,6 +449,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -494,6 +503,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -548,6 +558,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -602,6 +613,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -654,6 +666,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -705,6 +718,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -752,6 +766,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -814,6 +829,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -875,6 +891,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -933,6 +950,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -989,6 +1007,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1046,6 +1065,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1103,6 +1123,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1160,6 +1181,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1217,6 +1239,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1271,6 +1294,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1328,6 +1352,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1385,6 +1410,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1442,6 +1468,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1499,6 +1526,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1553,6 +1581,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1607,6 +1636,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1659,6 +1689,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1710,6 +1741,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1757,6 +1789,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1819,6 +1852,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1880,6 +1914,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1938,6 +1973,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1994,6 +2030,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2051,6 +2088,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2108,6 +2146,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2165,6 +2204,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2222,6 +2262,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2276,6 +2317,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2333,6 +2375,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2390,6 +2433,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2447,6 +2491,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2504,6 +2549,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2558,6 +2604,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2612,6 +2659,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2672,6 +2720,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2728,6 +2777,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2785,6 +2835,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2842,6 +2893,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2899,6 +2951,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2956,6 +3009,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3010,6 +3064,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3067,6 +3122,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3124,6 +3180,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3181,6 +3238,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3238,6 +3296,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3292,6 +3351,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3345,6 +3405,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3399,6 +3460,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/bmw_connected_drive/snapshots/test_switch.ambr b/tests/components/bmw_connected_drive/snapshots/test_switch.ambr
index 5b60a32c3be..ce6ebc21f51 100644
--- a/tests/components/bmw_connected_drive/snapshots/test_switch.ambr
+++ b/tests/components/bmw_connected_drive/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/bosch_alarm/__init__.py b/tests/components/bosch_alarm/__init__.py
new file mode 100644
index 00000000000..2b2d94cf1e5
--- /dev/null
+++ b/tests/components/bosch_alarm/__init__.py
@@ -0,0 +1,22 @@
+"""Tests for the Bosch Alarm component."""
+
+from unittest.mock import AsyncMock
+
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+async def setup_integration(hass: HomeAssistant, config_entry: MockConfigEntry) -> None:
+    """Fixture for setting up the component."""
+    config_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+
+async def call_observable(hass: HomeAssistant, observable: AsyncMock) -> None:
+    """Call the observable with the given event."""
+    for callback in observable.attach.call_args_list:
+        callback[0][0]()
+    await hass.async_block_till_done()
diff --git a/tests/components/bosch_alarm/conftest.py b/tests/components/bosch_alarm/conftest.py
new file mode 100644
index 00000000000..45ec0072a37
--- /dev/null
+++ b/tests/components/bosch_alarm/conftest.py
@@ -0,0 +1,131 @@
+"""Define fixtures for Bosch Alarm tests."""
+
+from collections.abc import Generator
+from typing import Any
+from unittest.mock import AsyncMock, patch
+
+from bosch_alarm_mode2.panel import Area
+from bosch_alarm_mode2.utils import Observable
+import pytest
+
+from homeassistant.components.bosch_alarm.const import (
+    CONF_INSTALLER_CODE,
+    CONF_USER_CODE,
+    DOMAIN,
+)
+from homeassistant.const import CONF_HOST, CONF_MODEL, CONF_PASSWORD, CONF_PORT
+
+from tests.common import MockConfigEntry
+
+
+@pytest.fixture(
+    params=[
+        "solution_3000",
+        "amax_3000",
+        "b5512",
+    ]
+)
+def model(request: pytest.FixtureRequest) -> Generator[str]:
+    """Return every device."""
+    return request.param
+
+
+@pytest.fixture
+def extra_config_entry_data(
+    model: str, model_name: str, config_flow_data: dict[str, Any]
+) -> dict[str, Any]:
+    """Return extra config entry data."""
+    return {CONF_MODEL: model_name} | config_flow_data
+
+
+@pytest.fixture
+def config_flow_data(model: str) -> dict[str, Any]:
+    """Return extra config entry data."""
+    if model == "solution_3000":
+        return {CONF_USER_CODE: "1234"}
+    if model == "amax_3000":
+        return {CONF_INSTALLER_CODE: "1234", CONF_PASSWORD: "1234567890"}
+    if model == "b5512":
+        return {CONF_PASSWORD: "1234567890"}
+    pytest.fail("Invalid model")
+
+
+@pytest.fixture
+def model_name(model: str) -> str | None:
+    """Return extra config entry data."""
+    return {
+        "solution_3000": "Solution 3000",
+        "amax_3000": "AMAX 3000",
+        "b5512": "B5512 (US1B)",
+    }.get(model)
+
+
+@pytest.fixture
+def serial_number(model: str) -> str | None:
+    """Return extra config entry data."""
+    if model == "solution_3000":
+        return "1234567890"
+    return None
+
+
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.bosch_alarm.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
+@pytest.fixture
+def area() -> Generator[Area]:
+    """Define a mocked area."""
+    mock = AsyncMock(spec=Area)
+    mock.name = "Area1"
+    mock.status_observer = AsyncMock(spec=Observable)
+    mock.is_triggered.return_value = False
+    mock.is_disarmed.return_value = True
+    mock.is_arming.return_value = False
+    mock.is_pending.return_value = False
+    mock.is_part_armed.return_value = False
+    mock.is_all_armed.return_value = False
+    return mock
+
+
+@pytest.fixture
+def mock_panel(
+    area: AsyncMock, model_name: str, serial_number: str | None
+) -> Generator[AsyncMock]:
+    """Define a fixture to set up Bosch Alarm."""
+    with (
+        patch(
+            "homeassistant.components.bosch_alarm.Panel", autospec=True
+        ) as mock_panel,
+        patch("homeassistant.components.bosch_alarm.config_flow.Panel", new=mock_panel),
+    ):
+        client = mock_panel.return_value
+        client.areas = {1: area}
+        client.model = model_name
+        client.firmware_version = "1.0.0"
+        client.serial_number = serial_number
+        client.connection_status_observer = AsyncMock(spec=Observable)
+        yield client
+
+
+@pytest.fixture
+def mock_config_entry(
+    extra_config_entry_data: dict[str, Any], serial_number: str | None
+) -> MockConfigEntry:
+    """Mock config entry for bosch alarm."""
+    return MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=serial_number,
+        entry_id="01JQ917ACKQ33HHM7YCFXYZX51",
+        data={
+            CONF_HOST: "0.0.0.0",
+            CONF_PORT: 7700,
+            CONF_MODEL: "bosch_alarm_test_data.model",
+        }
+        | extra_config_entry_data,
+    )
diff --git a/tests/components/bosch_alarm/snapshots/test_alarm_control_panel.ambr b/tests/components/bosch_alarm/snapshots/test_alarm_control_panel.ambr
new file mode 100644
index 00000000000..76568cef56c
--- /dev/null
+++ b/tests/components/bosch_alarm/snapshots/test_alarm_control_panel.ambr
@@ -0,0 +1,154 @@
+# serializer version: 1
+# name: test_alarm_control_panel[amax_3000][alarm_control_panel.area1-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'alarm_control_panel',
+    'entity_category': None,
+    'entity_id': 'alarm_control_panel.area1',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'bosch_alarm',
+    'previous_unique_id': None,
+    'supported_features': <AlarmControlPanelEntityFeature: 3>,
+    'translation_key': None,
+    'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_area_1',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_alarm_control_panel[amax_3000][alarm_control_panel.area1-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'changed_by': None,
+      'code_arm_required': False,
+      'code_format': None,
+      'friendly_name': 'Area1',
+      'supported_features': <AlarmControlPanelEntityFeature: 3>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'alarm_control_panel.area1',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'disarmed',
+  })
+# ---
+# name: test_alarm_control_panel[b5512][alarm_control_panel.area1-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'alarm_control_panel',
+    'entity_category': None,
+    'entity_id': 'alarm_control_panel.area1',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'bosch_alarm',
+    'previous_unique_id': None,
+    'supported_features': <AlarmControlPanelEntityFeature: 3>,
+    'translation_key': None,
+    'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_area_1',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_alarm_control_panel[b5512][alarm_control_panel.area1-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'changed_by': None,
+      'code_arm_required': False,
+      'code_format': None,
+      'friendly_name': 'Area1',
+      'supported_features': <AlarmControlPanelEntityFeature: 3>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'alarm_control_panel.area1',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'disarmed',
+  })
+# ---
+# name: test_alarm_control_panel[solution_3000][alarm_control_panel.area1-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'alarm_control_panel',
+    'entity_category': None,
+    'entity_id': 'alarm_control_panel.area1',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'bosch_alarm',
+    'previous_unique_id': None,
+    'supported_features': <AlarmControlPanelEntityFeature: 3>,
+    'translation_key': None,
+    'unique_id': '1234567890_area_1',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_alarm_control_panel[solution_3000][alarm_control_panel.area1-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'changed_by': None,
+      'code_arm_required': False,
+      'code_format': None,
+      'friendly_name': 'Area1',
+      'supported_features': <AlarmControlPanelEntityFeature: 3>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'alarm_control_panel.area1',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'disarmed',
+  })
+# ---
diff --git a/tests/components/bosch_alarm/test_alarm_control_panel.py b/tests/components/bosch_alarm/test_alarm_control_panel.py
new file mode 100644
index 00000000000..31d2f928ec5
--- /dev/null
+++ b/tests/components/bosch_alarm/test_alarm_control_panel.py
@@ -0,0 +1,145 @@
+"""Tests for Bosch Alarm component."""
+
+from collections.abc import AsyncGenerator
+from unittest.mock import AsyncMock, patch
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.alarm_control_panel import (
+    DOMAIN as ALARM_CONTROL_PANEL_DOMAIN,
+    AlarmControlPanelState,
+)
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    SERVICE_ALARM_ARM_AWAY,
+    SERVICE_ALARM_ARM_HOME,
+    SERVICE_ALARM_DISARM,
+    STATE_UNAVAILABLE,
+    Platform,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import call_observable, setup_integration
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+@pytest.fixture(autouse=True)
+async def platforms() -> AsyncGenerator[None]:
+    """Return the platforms to be loaded for this test."""
+    with patch(
+        "homeassistant.components.bosch_alarm.PLATFORMS", [Platform.ALARM_CONTROL_PANEL]
+    ):
+        yield
+
+
+async def test_update_alarm_device(
+    hass: HomeAssistant,
+    mock_panel: AsyncMock,
+    area: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test that alarm panel state changes after arming the panel."""
+    await setup_integration(hass, mock_config_entry)
+    entity_id = "alarm_control_panel.area1"
+    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+
+    area.is_arming.return_value = True
+    area.is_disarmed.return_value = False
+
+    await hass.services.async_call(
+        ALARM_CONTROL_PANEL_DOMAIN,
+        SERVICE_ALARM_ARM_AWAY,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+    await call_observable(hass, area.status_observer)
+
+    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMING
+
+    area.is_arming.return_value = False
+    area.is_all_armed.return_value = True
+
+    await call_observable(hass, area.status_observer)
+
+    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+
+    await hass.services.async_call(
+        ALARM_CONTROL_PANEL_DOMAIN,
+        SERVICE_ALARM_DISARM,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+
+    area.is_all_armed.return_value = False
+    area.is_disarmed.return_value = True
+
+    await call_observable(hass, area.status_observer)
+
+    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    await hass.services.async_call(
+        ALARM_CONTROL_PANEL_DOMAIN,
+        SERVICE_ALARM_ARM_HOME,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+
+    area.is_disarmed.return_value = False
+    area.is_arming.return_value = True
+
+    await call_observable(hass, area.status_observer)
+
+    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMING
+
+    area.is_arming.return_value = False
+    area.is_part_armed.return_value = True
+
+    await call_observable(hass, area.status_observer)
+
+    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_HOME
+    await hass.services.async_call(
+        ALARM_CONTROL_PANEL_DOMAIN,
+        SERVICE_ALARM_DISARM,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+    area.is_part_armed.return_value = False
+    area.is_disarmed.return_value = True
+
+    await call_observable(hass, area.status_observer)
+    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+
+
+async def test_alarm_control_panel(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+    mock_panel: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test the alarm_control_panel state."""
+    await setup_integration(hass, mock_config_entry)
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
+
+
+async def test_alarm_control_panel_availability(
+    hass: HomeAssistant,
+    mock_panel: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test the alarm_control_panel availability."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert (
+        hass.states.get("alarm_control_panel.area1").state
+        == AlarmControlPanelState.DISARMED
+    )
+
+    mock_panel.connection_status.return_value = False
+
+    await call_observable(hass, mock_panel.connection_status_observer)
+
+    assert hass.states.get("alarm_control_panel.area1").state == STATE_UNAVAILABLE
diff --git a/tests/components/bosch_alarm/test_config_flow.py b/tests/components/bosch_alarm/test_config_flow.py
new file mode 100644
index 00000000000..066b3008821
--- /dev/null
+++ b/tests/components/bosch_alarm/test_config_flow.py
@@ -0,0 +1,212 @@
+"""Tests for the bosch_alarm config flow."""
+
+import asyncio
+from typing import Any
+from unittest.mock import AsyncMock
+
+import pytest
+
+from homeassistant import config_entries
+from homeassistant.components.bosch_alarm.const import DOMAIN
+from homeassistant.config_entries import SOURCE_USER
+from homeassistant.const import CONF_HOST, CONF_MODEL, CONF_PORT
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from tests.common import MockConfigEntry
+
+
+async def test_form_user(
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_panel: AsyncMock,
+    model_name: str,
+    serial_number: str,
+    config_flow_data: dict[str, Any],
+) -> None:
+    """Test the config flow for bosch_alarm."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_HOST: "1.1.1.1", CONF_PORT: 7700},
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "auth"
+    assert result["errors"] == {}
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        config_flow_data,
+    )
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == f"Bosch {model_name}"
+    assert (
+        result["data"]
+        == {
+            CONF_HOST: "1.1.1.1",
+            CONF_PORT: 7700,
+            CONF_MODEL: model_name,
+        }
+        | config_flow_data
+    )
+    assert result["result"].unique_id == serial_number
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+@pytest.mark.parametrize(
+    ("exception", "message"),
+    [
+        (asyncio.TimeoutError, "cannot_connect"),
+        (Exception, "unknown"),
+    ],
+)
+async def test_form_exceptions(
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_panel: AsyncMock,
+    config_flow_data: dict[str, Any],
+    exception: Exception,
+    message: str,
+) -> None:
+    """Test we handle exceptions correctly."""
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+    mock_panel.connect.side_effect = exception
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_HOST: "1.1.1.1", CONF_PORT: 7700},
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {"base": message}
+
+    mock_panel.connect.side_effect = None
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_HOST: "1.1.1.1", CONF_PORT: 7700},
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "auth"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        config_flow_data,
+    )
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+
+
+@pytest.mark.parametrize(
+    ("exception", "message"),
+    [
+        (PermissionError, "invalid_auth"),
+        (asyncio.TimeoutError, "cannot_connect"),
+        (Exception, "unknown"),
+    ],
+)
+async def test_form_exceptions_user(
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_panel: AsyncMock,
+    config_flow_data: dict[str, Any],
+    exception: Exception,
+    message: str,
+) -> None:
+    """Test we handle exceptions correctly."""
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_HOST: "1.1.1.1", CONF_PORT: 7700},
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "auth"
+    assert result["errors"] == {}
+    mock_panel.connect.side_effect = exception
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], config_flow_data
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "auth"
+    assert result["errors"] == {"base": message}
+
+    mock_panel.connect.side_effect = None
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], config_flow_data
+    )
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+
+
+@pytest.mark.parametrize("model", ["solution_3000", "amax_3000"])
+async def test_entry_already_configured_host(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_panel: AsyncMock,
+    config_flow_data: dict[str, Any],
+) -> None:
+    """Test if configuring an entity twice results in an error."""
+    mock_config_entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {CONF_HOST: "0.0.0.0"}
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "auth"
+    assert result["errors"] == {}
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], config_flow_data
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+
+
+@pytest.mark.parametrize("model", ["b5512"])
+async def test_entry_already_configured_serial(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_panel: AsyncMock,
+    config_flow_data: dict[str, Any],
+) -> None:
+    """Test if configuring an entity twice results in an error."""
+    mock_config_entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {CONF_HOST: "0.0.0.0"}
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "auth"
+    assert result["errors"] == {}
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], config_flow_data
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
diff --git a/tests/components/bosch_alarm/test_init.py b/tests/components/bosch_alarm/test_init.py
new file mode 100644
index 00000000000..0497a91eadf
--- /dev/null
+++ b/tests/components/bosch_alarm/test_init.py
@@ -0,0 +1,33 @@
+"""Tests for bosch alarm integration init."""
+
+from unittest.mock import AsyncMock, patch
+
+import pytest
+
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry
+
+
+@pytest.fixture(autouse=True)
+def disable_platform_only():
+    """Disable platforms to speed up tests."""
+    with patch("homeassistant.components.bosch_alarm.PLATFORMS", []):
+        yield
+
+
+@pytest.mark.parametrize("model", ["solution_3000"])
+@pytest.mark.parametrize("exception", [PermissionError(), TimeoutError()])
+async def test_incorrect_auth(
+    hass: HomeAssistant,
+    mock_panel: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    exception: Exception,
+) -> None:
+    """Test errors with incorrect auth."""
+    mock_panel.connect.side_effect = exception
+    await setup_integration(hass, mock_config_entry)
+    assert mock_config_entry.state is ConfigEntryState.SETUP_RETRY
diff --git a/tests/components/braviatv/snapshots/test_diagnostics.ambr b/tests/components/braviatv/snapshots/test_diagnostics.ambr
index cd29c647df7..de76c00cd23 100644
--- a/tests/components/braviatv/snapshots/test_diagnostics.ambr
+++ b/tests/components/braviatv/snapshots/test_diagnostics.ambr
@@ -19,6 +19,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': 'very_unique_string',
       'version': 1,
diff --git a/tests/components/bring/conftest.py b/tests/components/bring/conftest.py
index 7d1b787ff0b..da630f7fbc8 100644
--- a/tests/components/bring/conftest.py
+++ b/tests/components/bring/conftest.py
@@ -1,17 +1,23 @@
 """Common fixtures for the Bring! tests."""
 
 from collections.abc import Generator
-from typing import cast
 from unittest.mock import AsyncMock, patch
 import uuid
 
-from bring_api.types import BringAuthResponse
+from bring_api import (
+    BringActivityResponse,
+    BringAuthResponse,
+    BringItemsResponse,
+    BringListResponse,
+    BringUserSettingsResponse,
+    BringUsersResponse,
+)
 import pytest
 
 from homeassistant.components.bring.const import DOMAIN
 from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
 
-from tests.common import MockConfigEntry, load_json_object_fixture
+from tests.common import MockConfigEntry, load_fixture
 
 EMAIL = "test-email"
 PASSWORD = "test-password"
@@ -44,12 +50,25 @@ def mock_bring_client() -> Generator[AsyncMock]:
         client = mock_client.return_value
         client.uuid = UUID
         client.mail = EMAIL
-        client.login.return_value = cast(BringAuthResponse, {"name": "Bring"})
-        client.load_lists.return_value = load_json_object_fixture("lists.json", DOMAIN)
-        client.get_list.return_value = load_json_object_fixture("items.json", DOMAIN)
-        client.get_all_user_settings.return_value = load_json_object_fixture(
-            "usersettings.json", DOMAIN
+        client.login.return_value = BringAuthResponse.from_json(
+            load_fixture("login.json", DOMAIN)
         )
+        client.load_lists.return_value = BringListResponse.from_json(
+            load_fixture("lists.json", DOMAIN)
+        )
+        client.get_list.return_value = BringItemsResponse.from_json(
+            load_fixture("items.json", DOMAIN)
+        )
+        client.get_all_user_settings.return_value = BringUserSettingsResponse.from_json(
+            load_fixture("usersettings.json", DOMAIN)
+        )
+        client.get_activity.return_value = BringActivityResponse.from_json(
+            load_fixture("activity.json", DOMAIN)
+        )
+        client.get_list_users.return_value = BringUsersResponse.from_json(
+            load_fixture("users.json", DOMAIN)
+        )
+
         yield client
 
 
diff --git a/tests/components/bring/fixtures/activity.json b/tests/components/bring/fixtures/activity.json
new file mode 100644
index 00000000000..5e9a8c089d3
--- /dev/null
+++ b/tests/components/bring/fixtures/activity.json
@@ -0,0 +1,62 @@
+{
+  "timeline": [
+    {
+      "type": "LIST_ITEMS_CHANGED",
+      "content": {
+        "uuid": "673594a9-f92d-4cb6-adf1-d2f7a83207a4",
+        "purchase": [
+          {
+            "uuid": "658a3770-1a03-4ee0-94a6-10362a642377",
+            "itemId": "Gurke",
+            "specification": "",
+            "attributes": []
+          }
+        ],
+        "recently": [
+          {
+            "uuid": "1ed22d3d-f19b-4530-a518-19872da3fd3e",
+            "itemId": "Milch",
+            "specification": "",
+            "attributes": []
+          }
+        ],
+        "sessionDate": "2025-01-01T03:09:33.036Z",
+        "publicUserUuid": "9a21fdfc-63a4-441a-afc1-ef3030605a9d"
+      }
+    },
+    {
+      "type": "LIST_ITEMS_ADDED",
+      "content": {
+        "uuid": "9a16635c-dea2-4e00-904a-c5034f9cfecf",
+        "items": [
+          {
+            "uuid": "66a633a2-ae09-47bf-8845-3c0198480544",
+            "itemId": "Joghurt",
+            "specification": "",
+            "attributes": []
+          }
+        ],
+        "sessionDate": "2025-01-01T02:54:57.656Z",
+        "publicUserUuid": "73af455f-c158-4004-a5e0-79f4f8a6d4bd"
+      }
+    },
+    {
+      "type": "LIST_ITEMS_REMOVED",
+      "content": {
+        "uuid": "303dedf6-d4b2-4d25-a8cd-1c7967b84fcb",
+        "items": [
+          {
+            "uuid": "2ba8ddb6-01c6-4b0b-a89d-f3da6b291528",
+            "itemId": "Tofu",
+            "specification": "",
+            "attributes": []
+          }
+        ],
+        "sessionDate": "2025-01-01T03:09:12.380Z",
+        "publicUserUuid": "7d5e9d08-877a-4c36-8740-a9bf74ec690a"
+      }
+    }
+  ],
+  "timestamp": "2025-01-01T03:09:33.036Z",
+  "totalEvents": 3
+}
diff --git a/tests/components/bring/fixtures/items.json b/tests/components/bring/fixtures/items.json
index e0b9006167b..02bfdc9e038 100644
--- a/tests/components/bring/fixtures/items.json
+++ b/tests/components/bring/fixtures/items.json
@@ -1,44 +1,46 @@
 {
-  "uuid": "77a151f8-77c4-47a3-8295-c750a0e69d4f",
+  "uuid": "e542eef6-dba7-4c31-a52c-29e6ab9d83a5",
   "status": "REGISTERED",
-  "purchase": [
-    {
-      "uuid": "b5d0790b-5f32-4d5c-91da-e29066f167de",
-      "itemId": "Paprika",
-      "specification": "Rot",
-      "attributes": [
-        {
-          "type": "PURCHASE_CONDITIONS",
-          "content": {
-            "urgent": true,
-            "convenient": true,
-            "discounted": true
+  "items": {
+    "purchase": [
+      {
+        "uuid": "b5d0790b-5f32-4d5c-91da-e29066f167de",
+        "itemId": "Paprika",
+        "specification": "Rot",
+        "attributes": [
+          {
+            "type": "PURCHASE_CONDITIONS",
+            "content": {
+              "urgent": true,
+              "convenient": true,
+              "discounted": true
+            }
           }
-        }
-      ]
-    },
-    {
-      "uuid": "72d370ab-d8ca-4e41-b956-91df94795b4e",
-      "itemId": "Pouletbrüstli",
-      "specification": "Bio",
-      "attributes": [
-        {
-          "type": "PURCHASE_CONDITIONS",
-          "content": {
-            "urgent": true,
-            "convenient": true,
-            "discounted": true
+        ]
+      },
+      {
+        "uuid": "72d370ab-d8ca-4e41-b956-91df94795b4e",
+        "itemId": "Pouletbrüstli",
+        "specification": "Bio",
+        "attributes": [
+          {
+            "type": "PURCHASE_CONDITIONS",
+            "content": {
+              "urgent": true,
+              "convenient": true,
+              "discounted": true
+            }
           }
-        }
-      ]
-    }
-  ],
-  "recently": [
-    {
-      "uuid": "fc8db30a-647e-4e6c-9d71-3b85d6a2d954",
-      "itemId": "Ananas",
-      "specification": "",
-      "attributes": []
-    }
-  ]
+        ]
+      }
+    ],
+    "recently": [
+      {
+        "uuid": "fc8db30a-647e-4e6c-9d71-3b85d6a2d954",
+        "itemId": "Ananas",
+        "specification": "",
+        "attributes": []
+      }
+    ]
+  }
 }
diff --git a/tests/components/bring/fixtures/items2.json b/tests/components/bring/fixtures/items2.json
new file mode 100644
index 00000000000..c8f2a5e9d02
--- /dev/null
+++ b/tests/components/bring/fixtures/items2.json
@@ -0,0 +1,46 @@
+{
+  "uuid": "b4776778-7f6c-496e-951b-92a35d3db0dd",
+  "status": "REGISTERED",
+  "items": {
+    "purchase": [
+      {
+        "uuid": "b5d0790b-5f32-4d5c-91da-e29066f167de",
+        "itemId": "Paprika",
+        "specification": "Rot",
+        "attributes": [
+          {
+            "type": "PURCHASE_CONDITIONS",
+            "content": {
+              "urgent": true,
+              "convenient": true,
+              "discounted": true
+            }
+          }
+        ]
+      },
+      {
+        "uuid": "72d370ab-d8ca-4e41-b956-91df94795b4e",
+        "itemId": "Pouletbrüstli",
+        "specification": "Bio",
+        "attributes": [
+          {
+            "type": "PURCHASE_CONDITIONS",
+            "content": {
+              "urgent": true,
+              "convenient": true,
+              "discounted": true
+            }
+          }
+        ]
+      }
+    ],
+    "recently": [
+      {
+        "uuid": "fc8db30a-647e-4e6c-9d71-3b85d6a2d954",
+        "itemId": "Ananas",
+        "specification": "",
+        "attributes": []
+      }
+    ]
+  }
+}
diff --git a/tests/components/bring/fixtures/items_invitation.json b/tests/components/bring/fixtures/items_invitation.json
index 82ef623e439..6b6623011da 100644
--- a/tests/components/bring/fixtures/items_invitation.json
+++ b/tests/components/bring/fixtures/items_invitation.json
@@ -1,44 +1,46 @@
 {
-  "uuid": "77a151f8-77c4-47a3-8295-c750a0e69d4f",
+  "uuid": "e542eef6-dba7-4c31-a52c-29e6ab9d83a5",
   "status": "INVITATION",
-  "purchase": [
-    {
-      "uuid": "b5d0790b-5f32-4d5c-91da-e29066f167de",
-      "itemId": "Paprika",
-      "specification": "Rot",
-      "attributes": [
-        {
-          "type": "PURCHASE_CONDITIONS",
-          "content": {
-            "urgent": true,
-            "convenient": true,
-            "discounted": true
+  "items": {
+    "purchase": [
+      {
+        "uuid": "b5d0790b-5f32-4d5c-91da-e29066f167de",
+        "itemId": "Paprika",
+        "specification": "Rot",
+        "attributes": [
+          {
+            "type": "PURCHASE_CONDITIONS",
+            "content": {
+              "urgent": true,
+              "convenient": true,
+              "discounted": true
+            }
           }
-        }
-      ]
-    },
-    {
-      "uuid": "72d370ab-d8ca-4e41-b956-91df94795b4e",
-      "itemId": "Pouletbrüstli",
-      "specification": "Bio",
-      "attributes": [
-        {
-          "type": "PURCHASE_CONDITIONS",
-          "content": {
-            "urgent": true,
-            "convenient": true,
-            "discounted": true
+        ]
+      },
+      {
+        "uuid": "72d370ab-d8ca-4e41-b956-91df94795b4e",
+        "itemId": "Pouletbrüstli",
+        "specification": "Bio",
+        "attributes": [
+          {
+            "type": "PURCHASE_CONDITIONS",
+            "content": {
+              "urgent": true,
+              "convenient": true,
+              "discounted": true
+            }
           }
-        }
-      ]
-    }
-  ],
-  "recently": [
-    {
-      "uuid": "fc8db30a-647e-4e6c-9d71-3b85d6a2d954",
-      "itemId": "Ananas",
-      "specification": "",
-      "attributes": []
-    }
-  ]
+        ]
+      }
+    ],
+    "recently": [
+      {
+        "uuid": "fc8db30a-647e-4e6c-9d71-3b85d6a2d954",
+        "itemId": "Ananas",
+        "specification": "",
+        "attributes": []
+      }
+    ]
+  }
 }
diff --git a/tests/components/bring/fixtures/items_shared.json b/tests/components/bring/fixtures/items_shared.json
index 9ac999729d3..6892e07e4e6 100644
--- a/tests/components/bring/fixtures/items_shared.json
+++ b/tests/components/bring/fixtures/items_shared.json
@@ -1,44 +1,46 @@
 {
-  "uuid": "77a151f8-77c4-47a3-8295-c750a0e69d4f",
+  "uuid": "e542eef6-dba7-4c31-a52c-29e6ab9d83a5",
   "status": "SHARED",
-  "purchase": [
-    {
-      "uuid": "b5d0790b-5f32-4d5c-91da-e29066f167de",
-      "itemId": "Paprika",
-      "specification": "Rot",
-      "attributes": [
-        {
-          "type": "PURCHASE_CONDITIONS",
-          "content": {
-            "urgent": true,
-            "convenient": true,
-            "discounted": true
+  "items": {
+    "purchase": [
+      {
+        "uuid": "b5d0790b-5f32-4d5c-91da-e29066f167de",
+        "itemId": "Paprika",
+        "specification": "Rot",
+        "attributes": [
+          {
+            "type": "PURCHASE_CONDITIONS",
+            "content": {
+              "urgent": true,
+              "convenient": true,
+              "discounted": true
+            }
           }
-        }
-      ]
-    },
-    {
-      "uuid": "72d370ab-d8ca-4e41-b956-91df94795b4e",
-      "itemId": "Pouletbrüstli",
-      "specification": "Bio",
-      "attributes": [
-        {
-          "type": "PURCHASE_CONDITIONS",
-          "content": {
-            "urgent": true,
-            "convenient": true,
-            "discounted": true
+        ]
+      },
+      {
+        "uuid": "72d370ab-d8ca-4e41-b956-91df94795b4e",
+        "itemId": "Pouletbrüstli",
+        "specification": "Bio",
+        "attributes": [
+          {
+            "type": "PURCHASE_CONDITIONS",
+            "content": {
+              "urgent": true,
+              "convenient": true,
+              "discounted": true
+            }
           }
-        }
-      ]
-    }
-  ],
-  "recently": [
-    {
-      "uuid": "fc8db30a-647e-4e6c-9d71-3b85d6a2d954",
-      "itemId": "Ananas",
-      "specification": "",
-      "attributes": []
-    }
-  ]
+        ]
+      }
+    ],
+    "recently": [
+      {
+        "uuid": "fc8db30a-647e-4e6c-9d71-3b85d6a2d954",
+        "itemId": "Ananas",
+        "specification": "",
+        "attributes": []
+      }
+    ]
+  }
 }
diff --git a/tests/components/bring/fixtures/lists2.json b/tests/components/bring/fixtures/lists2.json
new file mode 100644
index 00000000000..511de7bd181
--- /dev/null
+++ b/tests/components/bring/fixtures/lists2.json
@@ -0,0 +1,9 @@
+{
+  "lists": [
+    {
+      "listUuid": "e542eef6-dba7-4c31-a52c-29e6ab9d83a5",
+      "name": "Einkauf",
+      "theme": "ch.publisheria.bring.theme.home"
+    }
+  ]
+}
diff --git a/tests/components/bring/fixtures/login.json b/tests/components/bring/fixtures/login.json
new file mode 100644
index 00000000000..62616471734
--- /dev/null
+++ b/tests/components/bring/fixtures/login.json
@@ -0,0 +1,12 @@
+{
+  "uuid": "4d717571-174a-4bc1-ab24-929c7227ca43",
+  "publicUuid": "9a21fdfc-63a4-441a-afc1-ef3030605a9d",
+  "email": "test-email",
+  "name": "Bring",
+  "photoPath": "",
+  "bringListUUID": "e542eef6-dba7-4c31-a52c-29e6ab9d83a5",
+  "access_token": "ACCESS_TOKEN",
+  "refresh_token": "REFRESH_TOKEN",
+  "token_type": "Bearer",
+  "expires_in": 604799
+}
diff --git a/tests/components/bring/fixtures/users.json b/tests/components/bring/fixtures/users.json
new file mode 100644
index 00000000000..c9393dcb20d
--- /dev/null
+++ b/tests/components/bring/fixtures/users.json
@@ -0,0 +1,31 @@
+{
+  "users": [
+    {
+      "publicUuid": "9a21fdfc-63a4-441a-afc1-ef3030605a9d",
+      "name": "Bring",
+      "email": "test-email",
+      "photoPath": "",
+      "pushEnabled": true,
+      "plusTryOut": false,
+      "country": "DE",
+      "language": "de"
+    },
+    {
+      "publicUuid": "73af455f-c158-4004-a5e0-79f4f8a6d4bd",
+      "name": "NAME",
+      "email": "EMAIL",
+      "photoPath": "",
+      "pushEnabled": true,
+      "plusTryOut": false,
+      "country": "US",
+      "language": "en"
+    },
+    {
+      "publicUuid": "7d5e9d08-877a-4c36-8740-a9bf74ec690a",
+      "pushEnabled": true,
+      "plusTryOut": false,
+      "country": "US",
+      "language": "en"
+    }
+  ]
+}
diff --git a/tests/components/bring/snapshots/test_diagnostics.ambr b/tests/components/bring/snapshots/test_diagnostics.ambr
index 6d830a12133..3f4c8f5f339 100644
--- a/tests/components/bring/snapshots/test_diagnostics.ambr
+++ b/tests/components/bring/snapshots/test_diagnostics.ambr
@@ -1,101 +1,413 @@
 # serializer version: 1
 # name: test_diagnostics
   dict({
-    'b4776778-7f6c-496e-951b-92a35d3db0dd': dict({
-      'listUuid': 'b4776778-7f6c-496e-951b-92a35d3db0dd',
-      'name': 'Baumarkt',
-      'purchase': list([
-        dict({
-          'attributes': list([
+    'data': dict({
+      'b4776778-7f6c-496e-951b-92a35d3db0dd': dict({
+        'activity': dict({
+          'timeline': list([
             dict({
               'content': dict({
-                'convenient': True,
-                'discounted': True,
-                'urgent': True,
+                'items': list([
+                ]),
+                'publicUserUuid': '9a21fdfc-63a4-441a-afc1-ef3030605a9d',
+                'purchase': list([
+                  dict({
+                    'attributes': list([
+                    ]),
+                    'itemId': 'Gurke',
+                    'specification': '',
+                    'uuid': '658a3770-1a03-4ee0-94a6-10362a642377',
+                  }),
+                ]),
+                'recently': list([
+                  dict({
+                    'attributes': list([
+                    ]),
+                    'itemId': 'Milch',
+                    'specification': '',
+                    'uuid': '1ed22d3d-f19b-4530-a518-19872da3fd3e',
+                  }),
+                ]),
+                'sessionDate': '2025-01-01T03:09:33.036000+00:00',
+                'uuid': '673594a9-f92d-4cb6-adf1-d2f7a83207a4',
               }),
-              'type': 'PURCHASE_CONDITIONS',
+              'type': 'LIST_ITEMS_CHANGED',
             }),
-          ]),
-          'itemId': 'Paprika',
-          'specification': 'Rot',
-          'uuid': 'b5d0790b-5f32-4d5c-91da-e29066f167de',
-        }),
-        dict({
-          'attributes': list([
             dict({
               'content': dict({
-                'convenient': True,
-                'discounted': True,
-                'urgent': True,
+                'items': list([
+                  dict({
+                    'attributes': list([
+                    ]),
+                    'itemId': 'Joghurt',
+                    'specification': '',
+                    'uuid': '66a633a2-ae09-47bf-8845-3c0198480544',
+                  }),
+                ]),
+                'publicUserUuid': '73af455f-c158-4004-a5e0-79f4f8a6d4bd',
+                'purchase': list([
+                ]),
+                'recently': list([
+                ]),
+                'sessionDate': '2025-01-01T02:54:57.656000+00:00',
+                'uuid': '9a16635c-dea2-4e00-904a-c5034f9cfecf',
               }),
-              'type': 'PURCHASE_CONDITIONS',
+              'type': 'LIST_ITEMS_ADDED',
+            }),
+            dict({
+              'content': dict({
+                'items': list([
+                  dict({
+                    'attributes': list([
+                    ]),
+                    'itemId': 'Tofu',
+                    'specification': '',
+                    'uuid': '2ba8ddb6-01c6-4b0b-a89d-f3da6b291528',
+                  }),
+                ]),
+                'publicUserUuid': '7d5e9d08-877a-4c36-8740-a9bf74ec690a',
+                'purchase': list([
+                ]),
+                'recently': list([
+                ]),
+                'sessionDate': '2025-01-01T03:09:12.380000+00:00',
+                'uuid': '303dedf6-d4b2-4d25-a8cd-1c7967b84fcb',
+              }),
+              'type': 'LIST_ITEMS_REMOVED',
             }),
           ]),
-          'itemId': 'Pouletbrüstli',
-          'specification': 'Bio',
-          'uuid': '72d370ab-d8ca-4e41-b956-91df94795b4e',
+          'timestamp': '2025-01-01T03:09:33.036000+00:00',
+          'totalEvents': 3,
         }),
-      ]),
-      'recently': list([
-        dict({
-          'attributes': list([
+        'content': dict({
+          'items': dict({
+            'purchase': list([
+              dict({
+                'attributes': list([
+                  dict({
+                    'content': dict({
+                      'convenient': True,
+                      'discounted': True,
+                      'urgent': True,
+                    }),
+                    'type': 'PURCHASE_CONDITIONS',
+                  }),
+                ]),
+                'itemId': 'Paprika',
+                'specification': 'Rot',
+                'uuid': 'b5d0790b-5f32-4d5c-91da-e29066f167de',
+              }),
+              dict({
+                'attributes': list([
+                  dict({
+                    'content': dict({
+                      'convenient': True,
+                      'discounted': True,
+                      'urgent': True,
+                    }),
+                    'type': 'PURCHASE_CONDITIONS',
+                  }),
+                ]),
+                'itemId': 'Pouletbrüstli',
+                'specification': 'Bio',
+                'uuid': '72d370ab-d8ca-4e41-b956-91df94795b4e',
+              }),
+            ]),
+            'recently': list([
+              dict({
+                'attributes': list([
+                ]),
+                'itemId': 'Ananas',
+                'specification': '',
+                'uuid': 'fc8db30a-647e-4e6c-9d71-3b85d6a2d954',
+              }),
+            ]),
+          }),
+          'status': 'REGISTERED',
+          'uuid': 'b4776778-7f6c-496e-951b-92a35d3db0dd',
+        }),
+        'lst': dict({
+          'listUuid': 'b4776778-7f6c-496e-951b-92a35d3db0dd',
+          'name': '**REDACTED**',
+          'theme': 'ch.publisheria.bring.theme.home',
+        }),
+        'users': dict({
+          'users': list([
+            dict({
+              'country': 'DE',
+              'email': '**REDACTED**',
+              'language': 'de',
+              'name': '**REDACTED**',
+              'photoPath': '',
+              'plusExpiry': None,
+              'plusTryOut': False,
+              'publicUuid': '9a21fdfc-63a4-441a-afc1-ef3030605a9d',
+              'pushEnabled': True,
+            }),
+            dict({
+              'country': 'US',
+              'email': '**REDACTED**',
+              'language': 'en',
+              'name': '**REDACTED**',
+              'photoPath': '',
+              'plusExpiry': None,
+              'plusTryOut': False,
+              'publicUuid': '73af455f-c158-4004-a5e0-79f4f8a6d4bd',
+              'pushEnabled': True,
+            }),
+            dict({
+              'country': 'US',
+              'email': None,
+              'language': 'en',
+              'name': None,
+              'photoPath': None,
+              'plusExpiry': None,
+              'plusTryOut': False,
+              'publicUuid': '7d5e9d08-877a-4c36-8740-a9bf74ec690a',
+              'pushEnabled': True,
+            }),
           ]),
-          'itemId': 'Ananas',
-          'specification': '',
-          'uuid': 'fc8db30a-647e-4e6c-9d71-3b85d6a2d954',
         }),
-      ]),
-      'status': 'REGISTERED',
-      'theme': 'ch.publisheria.bring.theme.home',
-      'uuid': '77a151f8-77c4-47a3-8295-c750a0e69d4f',
+      }),
+      'e542eef6-dba7-4c31-a52c-29e6ab9d83a5': dict({
+        'activity': dict({
+          'timeline': list([
+            dict({
+              'content': dict({
+                'items': list([
+                ]),
+                'publicUserUuid': '9a21fdfc-63a4-441a-afc1-ef3030605a9d',
+                'purchase': list([
+                  dict({
+                    'attributes': list([
+                    ]),
+                    'itemId': 'Gurke',
+                    'specification': '',
+                    'uuid': '658a3770-1a03-4ee0-94a6-10362a642377',
+                  }),
+                ]),
+                'recently': list([
+                  dict({
+                    'attributes': list([
+                    ]),
+                    'itemId': 'Milch',
+                    'specification': '',
+                    'uuid': '1ed22d3d-f19b-4530-a518-19872da3fd3e',
+                  }),
+                ]),
+                'sessionDate': '2025-01-01T03:09:33.036000+00:00',
+                'uuid': '673594a9-f92d-4cb6-adf1-d2f7a83207a4',
+              }),
+              'type': 'LIST_ITEMS_CHANGED',
+            }),
+            dict({
+              'content': dict({
+                'items': list([
+                  dict({
+                    'attributes': list([
+                    ]),
+                    'itemId': 'Joghurt',
+                    'specification': '',
+                    'uuid': '66a633a2-ae09-47bf-8845-3c0198480544',
+                  }),
+                ]),
+                'publicUserUuid': '73af455f-c158-4004-a5e0-79f4f8a6d4bd',
+                'purchase': list([
+                ]),
+                'recently': list([
+                ]),
+                'sessionDate': '2025-01-01T02:54:57.656000+00:00',
+                'uuid': '9a16635c-dea2-4e00-904a-c5034f9cfecf',
+              }),
+              'type': 'LIST_ITEMS_ADDED',
+            }),
+            dict({
+              'content': dict({
+                'items': list([
+                  dict({
+                    'attributes': list([
+                    ]),
+                    'itemId': 'Tofu',
+                    'specification': '',
+                    'uuid': '2ba8ddb6-01c6-4b0b-a89d-f3da6b291528',
+                  }),
+                ]),
+                'publicUserUuid': '7d5e9d08-877a-4c36-8740-a9bf74ec690a',
+                'purchase': list([
+                ]),
+                'recently': list([
+                ]),
+                'sessionDate': '2025-01-01T03:09:12.380000+00:00',
+                'uuid': '303dedf6-d4b2-4d25-a8cd-1c7967b84fcb',
+              }),
+              'type': 'LIST_ITEMS_REMOVED',
+            }),
+          ]),
+          'timestamp': '2025-01-01T03:09:33.036000+00:00',
+          'totalEvents': 3,
+        }),
+        'content': dict({
+          'items': dict({
+            'purchase': list([
+              dict({
+                'attributes': list([
+                  dict({
+                    'content': dict({
+                      'convenient': True,
+                      'discounted': True,
+                      'urgent': True,
+                    }),
+                    'type': 'PURCHASE_CONDITIONS',
+                  }),
+                ]),
+                'itemId': 'Paprika',
+                'specification': 'Rot',
+                'uuid': 'b5d0790b-5f32-4d5c-91da-e29066f167de',
+              }),
+              dict({
+                'attributes': list([
+                  dict({
+                    'content': dict({
+                      'convenient': True,
+                      'discounted': True,
+                      'urgent': True,
+                    }),
+                    'type': 'PURCHASE_CONDITIONS',
+                  }),
+                ]),
+                'itemId': 'Pouletbrüstli',
+                'specification': 'Bio',
+                'uuid': '72d370ab-d8ca-4e41-b956-91df94795b4e',
+              }),
+            ]),
+            'recently': list([
+              dict({
+                'attributes': list([
+                ]),
+                'itemId': 'Ananas',
+                'specification': '',
+                'uuid': 'fc8db30a-647e-4e6c-9d71-3b85d6a2d954',
+              }),
+            ]),
+          }),
+          'status': 'REGISTERED',
+          'uuid': 'e542eef6-dba7-4c31-a52c-29e6ab9d83a5',
+        }),
+        'lst': dict({
+          'listUuid': 'e542eef6-dba7-4c31-a52c-29e6ab9d83a5',
+          'name': '**REDACTED**',
+          'theme': 'ch.publisheria.bring.theme.home',
+        }),
+        'users': dict({
+          'users': list([
+            dict({
+              'country': 'DE',
+              'email': '**REDACTED**',
+              'language': 'de',
+              'name': '**REDACTED**',
+              'photoPath': '',
+              'plusExpiry': None,
+              'plusTryOut': False,
+              'publicUuid': '9a21fdfc-63a4-441a-afc1-ef3030605a9d',
+              'pushEnabled': True,
+            }),
+            dict({
+              'country': 'US',
+              'email': '**REDACTED**',
+              'language': 'en',
+              'name': '**REDACTED**',
+              'photoPath': '',
+              'plusExpiry': None,
+              'plusTryOut': False,
+              'publicUuid': '73af455f-c158-4004-a5e0-79f4f8a6d4bd',
+              'pushEnabled': True,
+            }),
+            dict({
+              'country': 'US',
+              'email': None,
+              'language': 'en',
+              'name': None,
+              'photoPath': None,
+              'plusExpiry': None,
+              'plusTryOut': False,
+              'publicUuid': '7d5e9d08-877a-4c36-8740-a9bf74ec690a',
+              'pushEnabled': True,
+            }),
+          ]),
+        }),
+      }),
     }),
-    'e542eef6-dba7-4c31-a52c-29e6ab9d83a5': dict({
-      'listUuid': 'e542eef6-dba7-4c31-a52c-29e6ab9d83a5',
-      'name': 'Einkauf',
-      'purchase': list([
+    'lists': list([
+      dict({
+        'listUuid': 'e542eef6-dba7-4c31-a52c-29e6ab9d83a5',
+        'name': 'Einkauf',
+        'theme': 'ch.publisheria.bring.theme.home',
+      }),
+      dict({
+        'listUuid': 'b4776778-7f6c-496e-951b-92a35d3db0dd',
+        'name': 'Baumarkt',
+        'theme': 'ch.publisheria.bring.theme.home',
+      }),
+    ]),
+    'user_settings': dict({
+      'userlistsettings': list([
         dict({
-          'attributes': list([
+          'listUuid': 'e542eef6-dba7-4c31-a52c-29e6ab9d83a5',
+          'usersettings': list([
             dict({
-              'content': dict({
-                'convenient': True,
-                'discounted': True,
-                'urgent': True,
-              }),
-              'type': 'PURCHASE_CONDITIONS',
+              'key': 'listSectionOrder',
+              'value': '["Früchte & Gemüse","Brot & Gebäck","Milch & Käse","Fleisch & Fisch","Zutaten & Gewürze","Fertig- & Tiefkühlprodukte","Getreideprodukte","Snacks & Süsswaren","Getränke & Tabak","Haushalt & Gesundheit","Pflege & Gesundheit","Tierbedarf","Baumarkt & Garten","Eigene Artikel"]',
+            }),
+            dict({
+              'key': 'listArticleLanguage',
+              'value': 'de-DE',
             }),
           ]),
-          'itemId': 'Paprika',
-          'specification': 'Rot',
-          'uuid': 'b5d0790b-5f32-4d5c-91da-e29066f167de',
         }),
         dict({
-          'attributes': list([
+          'listUuid': 'b4776778-7f6c-496e-951b-92a35d3db0dd',
+          'usersettings': list([
             dict({
-              'content': dict({
-                'convenient': True,
-                'discounted': True,
-                'urgent': True,
-              }),
-              'type': 'PURCHASE_CONDITIONS',
+              'key': 'listSectionOrder',
+              'value': '["Früchte & Gemüse","Brot & Gebäck","Milch & Käse","Fleisch & Fisch","Zutaten & Gewürze","Fertig- & Tiefkühlprodukte","Getreideprodukte","Snacks & Süsswaren","Getränke & Tabak","Haushalt & Gesundheit","Pflege & Gesundheit","Tierbedarf","Baumarkt & Garten","Eigene Artikel"]',
+            }),
+            dict({
+              'key': 'listArticleLanguage',
+              'value': 'en-US',
             }),
           ]),
-          'itemId': 'Pouletbrüstli',
-          'specification': 'Bio',
-          'uuid': '72d370ab-d8ca-4e41-b956-91df94795b4e',
         }),
       ]),
-      'recently': list([
+      'usersettings': list([
         dict({
-          'attributes': list([
-          ]),
-          'itemId': 'Ananas',
-          'specification': '',
-          'uuid': 'fc8db30a-647e-4e6c-9d71-3b85d6a2d954',
+          'key': 'autoPush',
+          'value': 'ON',
+        }),
+        dict({
+          'key': 'premiumHideOffersBadge',
+          'value': 'ON',
+        }),
+        dict({
+          'key': 'premiumHideSponsoredCategories',
+          'value': 'ON',
+        }),
+        dict({
+          'key': 'premiumHideInspirationsBadge',
+          'value': 'ON',
+        }),
+        dict({
+          'key': 'onboardClient',
+          'value': 'android',
+        }),
+        dict({
+          'key': 'premiumHideOffersOnMain',
+          'value': 'ON',
+        }),
+        dict({
+          'key': 'defaultListUUID',
+          'value': 'e542eef6-dba7-4c31-a52c-29e6ab9d83a5',
         }),
       ]),
-      'status': 'REGISTERED',
-      'theme': 'ch.publisheria.bring.theme.home',
-      'uuid': '77a151f8-77c4-47a3-8295-c750a0e69d4f',
     }),
   })
 # ---
diff --git a/tests/components/bring/snapshots/test_event.ambr b/tests/components/bring/snapshots/test_event.ambr
new file mode 100644
index 00000000000..0bcdcb5b565
--- /dev/null
+++ b/tests/components/bring/snapshots/test_event.ambr
@@ -0,0 +1,169 @@
+# serializer version: 1
+# name: test_setup[event.baumarkt_activities-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'event_types': list([
+        'list_items_changed',
+        'list_items_added',
+        'list_items_removed',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'event',
+    'entity_category': None,
+    'entity_id': 'event.baumarkt_activities',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Activities',
+    'platform': 'bring',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'activities',
+    'unique_id': '00000000-00000000-00000000-00000000_b4776778-7f6c-496e-951b-92a35d3db0dd_activities',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_setup[event.baumarkt_activities-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'entity_picture': 'https://api.getbring.com/rest/v2/bringusers/profilepictures/9a21fdfc-63a4-441a-afc1-ef3030605a9d',
+      'event_type': 'list_items_changed',
+      'event_types': list([
+        'list_items_changed',
+        'list_items_added',
+        'list_items_removed',
+      ]),
+      'friendly_name': 'Baumarkt Activities',
+      'items': list([
+      ]),
+      'last_activity_by': 'Bring',
+      'publicUserUuid': '9a21fdfc-63a4-441a-afc1-ef3030605a9d',
+      'purchase': list([
+        dict({
+          'attributes': list([
+          ]),
+          'itemId': 'Gurke',
+          'specification': '',
+          'uuid': '658a3770-1a03-4ee0-94a6-10362a642377',
+        }),
+      ]),
+      'recently': list([
+        dict({
+          'attributes': list([
+          ]),
+          'itemId': 'Milch',
+          'specification': '',
+          'uuid': '1ed22d3d-f19b-4530-a518-19872da3fd3e',
+        }),
+      ]),
+      'sessionDate': HAFakeDatetime(2025, 1, 1, 3, 9, 33, 36000, tzinfo=datetime.timezone.utc),
+      'uuid': '673594a9-f92d-4cb6-adf1-d2f7a83207a4',
+    }),
+    'context': <ANY>,
+    'entity_id': 'event.baumarkt_activities',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2025-01-01T03:30:00.000+00:00',
+  })
+# ---
+# name: test_setup[event.einkauf_activities-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'event_types': list([
+        'list_items_changed',
+        'list_items_added',
+        'list_items_removed',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'event',
+    'entity_category': None,
+    'entity_id': 'event.einkauf_activities',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Activities',
+    'platform': 'bring',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'activities',
+    'unique_id': '00000000-00000000-00000000-00000000_e542eef6-dba7-4c31-a52c-29e6ab9d83a5_activities',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_setup[event.einkauf_activities-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'entity_picture': 'https://api.getbring.com/rest/v2/bringusers/profilepictures/9a21fdfc-63a4-441a-afc1-ef3030605a9d',
+      'event_type': 'list_items_changed',
+      'event_types': list([
+        'list_items_changed',
+        'list_items_added',
+        'list_items_removed',
+      ]),
+      'friendly_name': 'Einkauf Activities',
+      'items': list([
+      ]),
+      'last_activity_by': 'Bring',
+      'publicUserUuid': '9a21fdfc-63a4-441a-afc1-ef3030605a9d',
+      'purchase': list([
+        dict({
+          'attributes': list([
+          ]),
+          'itemId': 'Gurke',
+          'specification': '',
+          'uuid': '658a3770-1a03-4ee0-94a6-10362a642377',
+        }),
+      ]),
+      'recently': list([
+        dict({
+          'attributes': list([
+          ]),
+          'itemId': 'Milch',
+          'specification': '',
+          'uuid': '1ed22d3d-f19b-4530-a518-19872da3fd3e',
+        }),
+      ]),
+      'sessionDate': HAFakeDatetime(2025, 1, 1, 3, 9, 33, 36000, tzinfo=datetime.timezone.utc),
+      'uuid': '673594a9-f92d-4cb6-adf1-d2f7a83207a4',
+    }),
+    'context': <ANY>,
+    'entity_id': 'event.einkauf_activities',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2025-01-01T03:30:00.000+00:00',
+  })
+# ---
diff --git a/tests/components/bring/snapshots/test_sensor.ambr b/tests/components/bring/snapshots/test_sensor.ambr
index 97e1d1b4bd9..eb307d31396 100644
--- a/tests/components/bring/snapshots/test_sensor.ambr
+++ b/tests/components/bring/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -111,6 +113,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -181,6 +184,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -250,6 +254,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -297,6 +302,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -350,6 +356,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -402,6 +409,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -472,6 +480,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -541,6 +550,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/bring/snapshots/test_todo.ambr b/tests/components/bring/snapshots/test_todo.ambr
index 6a7104727a1..46146415bf6 100644
--- a/tests/components/bring/snapshots/test_todo.ambr
+++ b/tests/components/bring/snapshots/test_todo.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/bring/test_config_flow.py b/tests/components/bring/test_config_flow.py
index 93e86051a75..b9208324c61 100644
--- a/tests/components/bring/test_config_flow.py
+++ b/tests/components/bring/test_config_flow.py
@@ -2,11 +2,7 @@
 
 from unittest.mock import AsyncMock
 
-from bring_api.exceptions import (
-    BringAuthException,
-    BringParseException,
-    BringRequestException,
-)
+from bring_api import BringAuthException, BringParseException, BringRequestException
 import pytest
 
 from homeassistant.components.bring.const import DOMAIN
@@ -214,3 +210,104 @@ async def test_flow_reauth_unique_id_mismatch(
 
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "unique_id_mismatch"
+
+
+@pytest.mark.usefixtures("mock_bring_client")
+async def test_flow_reconfigure(
+    hass: HomeAssistant, bring_config_entry: MockConfigEntry
+) -> None:
+    """Test reconfigure flow."""
+    bring_config_entry.add_to_hass(hass)
+    result = await bring_config_entry.start_reconfigure_flow(hass)
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reconfigure"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_EMAIL: "new-email", CONF_PASSWORD: "new-password"},
+    )
+
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reconfigure_successful"
+    assert bring_config_entry.data[CONF_EMAIL] == "new-email"
+    assert bring_config_entry.data[CONF_PASSWORD] == "new-password"
+
+    assert len(hass.config_entries.async_entries()) == 1
+
+
+@pytest.mark.parametrize(
+    ("raise_error", "text_error"),
+    [
+        (BringRequestException(), "cannot_connect"),
+        (BringAuthException(), "invalid_auth"),
+        (BringParseException(), "unknown"),
+        (IndexError(), "unknown"),
+    ],
+)
+async def test_flow_reconfigure_errors(
+    hass: HomeAssistant,
+    mock_bring_client: AsyncMock,
+    bring_config_entry: MockConfigEntry,
+    raise_error: Exception,
+    text_error: str,
+) -> None:
+    """Test reconfigure flow errors."""
+    bring_config_entry.add_to_hass(hass)
+    result = await bring_config_entry.start_reconfigure_flow(hass)
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reconfigure"
+
+    mock_bring_client.login.side_effect = raise_error
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_EMAIL: "new-email", CONF_PASSWORD: "new-password"},
+    )
+
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {"base": text_error}
+
+    mock_bring_client.login.side_effect = None
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={CONF_EMAIL: "new-email", CONF_PASSWORD: "new-password"},
+    )
+
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reconfigure_successful"
+    assert bring_config_entry.data[CONF_EMAIL] == "new-email"
+    assert bring_config_entry.data[CONF_PASSWORD] == "new-password"
+
+    assert len(hass.config_entries.async_entries()) == 1
+
+
+async def test_flow_reconfigure_unique_id_mismatch(
+    hass: HomeAssistant,
+    bring_config_entry: MockConfigEntry,
+    mock_bring_client: AsyncMock,
+) -> None:
+    """Test we abort reconfigure if unique id mismatch."""
+
+    mock_bring_client.uuid = "11111111-11111111-11111111-11111111"
+
+    bring_config_entry.add_to_hass(hass)
+
+    result = await bring_config_entry.start_reconfigure_flow(hass)
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reconfigure"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_EMAIL: "new-email", CONF_PASSWORD: "new-password"},
+    )
+
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "unique_id_mismatch"
diff --git a/tests/components/bring/test_diagnostics.py b/tests/components/bring/test_diagnostics.py
index a86de5a0d2d..c4b8defca82 100644
--- a/tests/components/bring/test_diagnostics.py
+++ b/tests/components/bring/test_diagnostics.py
@@ -1,11 +1,15 @@
 """Test for diagnostics platform of the Bring! integration."""
 
+from unittest.mock import AsyncMock
+
+from bring_api import BringItemsResponse
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
+from homeassistant.components.bring.const import DOMAIN
 from homeassistant.core import HomeAssistant
 
-from tests.common import MockConfigEntry
+from tests.common import MockConfigEntry, load_fixture
 from tests.components.diagnostics import get_diagnostics_for_config_entry
 from tests.typing import ClientSessionGenerator
 
@@ -16,8 +20,13 @@ async def test_diagnostics(
     hass_client: ClientSessionGenerator,
     bring_config_entry: MockConfigEntry,
     snapshot: SnapshotAssertion,
+    mock_bring_client: AsyncMock,
 ) -> None:
     """Test diagnostics."""
+    mock_bring_client.get_list.side_effect = [
+        BringItemsResponse.from_json(load_fixture("items.json", DOMAIN)),
+        BringItemsResponse.from_json(load_fixture("items2.json", DOMAIN)),
+    ]
     bring_config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(bring_config_entry.entry_id)
     await hass.async_block_till_done()
diff --git a/tests/components/bring/test_event.py b/tests/components/bring/test_event.py
new file mode 100644
index 00000000000..99b96c27153
--- /dev/null
+++ b/tests/components/bring/test_event.py
@@ -0,0 +1,46 @@
+"""Test for event platform of the Bring! integration."""
+
+from collections.abc import Generator
+from unittest.mock import patch
+
+from freezegun.api import freeze_time
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+@pytest.fixture(autouse=True)
+def event_only() -> Generator[None]:
+    """Enable only the event platform."""
+    with patch(
+        "homeassistant.components.bring.PLATFORMS",
+        [Platform.EVENT],
+    ):
+        yield
+
+
+@pytest.mark.usefixtures("mock_bring_client")
+@freeze_time("2025-01-01T03:30:00.000Z")
+async def test_setup(
+    hass: HomeAssistant,
+    bring_config_entry: MockConfigEntry,
+    snapshot: SnapshotAssertion,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Snapshot test states of event platform."""
+
+    bring_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(bring_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert bring_config_entry.state is ConfigEntryState.LOADED
+
+    await snapshot_platform(
+        hass, entity_registry, snapshot, bring_config_entry.entry_id
+    )
diff --git a/tests/components/bring/test_init.py b/tests/components/bring/test_init.py
index 8c215e024d5..f053f294ef1 100644
--- a/tests/components/bring/test_init.py
+++ b/tests/components/bring/test_init.py
@@ -3,7 +3,12 @@
 from datetime import timedelta
 from unittest.mock import AsyncMock
 
-from bring_api import BringAuthException, BringParseException, BringRequestException
+from bring_api import (
+    BringAuthException,
+    BringListResponse,
+    BringParseException,
+    BringRequestException,
+)
 from freezegun.api import FrozenDateTimeFactory
 import pytest
 
@@ -16,7 +21,7 @@ from homeassistant.helpers import device_registry as dr
 
 from .conftest import UUID
 
-from tests.common import MockConfigEntry, async_fire_time_changed
+from tests.common import MockConfigEntry, async_fire_time_changed, load_fixture
 
 
 async def setup_integration(
@@ -115,10 +120,28 @@ async def test_config_entry_not_ready(
     assert bring_config_entry.state is ConfigEntryState.SETUP_RETRY
 
 
+@pytest.mark.parametrize("exception", [BringRequestException, BringParseException])
+async def test_config_entry_not_ready_udpdate_failed(
+    hass: HomeAssistant,
+    bring_config_entry: MockConfigEntry,
+    mock_bring_client: AsyncMock,
+    exception: Exception,
+) -> None:
+    """Test config entry not ready from update failed in _async_update_data."""
+    mock_bring_client.load_lists.side_effect = [
+        mock_bring_client.load_lists.return_value,
+        exception,
+    ]
+    bring_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(bring_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert bring_config_entry.state is ConfigEntryState.SETUP_RETRY
+
+
 @pytest.mark.parametrize(
     ("exception", "state"),
     [
-        (None, ConfigEntryState.LOADED),
         (BringAuthException, ConfigEntryState.SETUP_ERROR),
         (BringRequestException, ConfigEntryState.SETUP_RETRY),
         (BringParseException, ConfigEntryState.SETUP_RETRY),
@@ -133,8 +156,10 @@ async def test_config_entry_not_ready_auth_error(
 ) -> None:
     """Test config entry not ready from authentication error."""
 
-    mock_bring_client.load_lists.side_effect = BringAuthException
-    mock_bring_client.retrieve_new_access_token.side_effect = exception
+    mock_bring_client.load_lists.side_effect = [
+        mock_bring_client.load_lists.return_value,
+        exception,
+    ]
 
     bring_config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(bring_config_entry.entry_id)
@@ -170,3 +195,71 @@ async def test_coordinator_skips_deactivated(
     await hass.async_block_till_done()
 
     assert mock_bring_client.get_list.await_count == 1
+
+
+async def test_purge_devices(
+    hass: HomeAssistant,
+    bring_config_entry: MockConfigEntry,
+    mock_bring_client: AsyncMock,
+    device_registry: dr.DeviceRegistry,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test removing device entry of deleted list."""
+    list_uuid = "b4776778-7f6c-496e-951b-92a35d3db0dd"
+    await setup_integration(hass, bring_config_entry)
+
+    assert bring_config_entry.state is ConfigEntryState.LOADED
+
+    assert device_registry.async_get_device(
+        {(DOMAIN, f"{bring_config_entry.unique_id}_{list_uuid}")}
+    )
+
+    mock_bring_client.load_lists.return_value = BringListResponse.from_json(
+        load_fixture("lists2.json", DOMAIN)
+    )
+
+    freezer.tick(timedelta(seconds=90))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    assert (
+        device_registry.async_get_device(
+            {(DOMAIN, f"{bring_config_entry.unique_id}_{list_uuid}")}
+        )
+        is None
+    )
+
+
+async def test_create_devices(
+    hass: HomeAssistant,
+    bring_config_entry: MockConfigEntry,
+    mock_bring_client: AsyncMock,
+    device_registry: dr.DeviceRegistry,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test create device entry for new lists."""
+    list_uuid = "b4776778-7f6c-496e-951b-92a35d3db0dd"
+    mock_bring_client.load_lists.return_value = BringListResponse.from_json(
+        load_fixture("lists2.json", DOMAIN)
+    )
+    await setup_integration(hass, bring_config_entry)
+
+    assert bring_config_entry.state is ConfigEntryState.LOADED
+
+    assert (
+        device_registry.async_get_device(
+            {(DOMAIN, f"{bring_config_entry.unique_id}_{list_uuid}")}
+        )
+        is None
+    )
+
+    mock_bring_client.load_lists.return_value = BringListResponse.from_json(
+        load_fixture("lists.json", DOMAIN)
+    )
+    freezer.tick(timedelta(seconds=90))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    assert device_registry.async_get_device(
+        {(DOMAIN, f"{bring_config_entry.unique_id}_{list_uuid}")}
+    )
diff --git a/tests/components/bring/test_sensor.py b/tests/components/bring/test_sensor.py
index 974818ccedf..f704debcea9 100644
--- a/tests/components/bring/test_sensor.py
+++ b/tests/components/bring/test_sensor.py
@@ -3,6 +3,7 @@
 from collections.abc import Generator
 from unittest.mock import AsyncMock, patch
 
+from bring_api import BringItemsResponse
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
@@ -12,7 +13,7 @@ from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
-from tests.common import MockConfigEntry, load_json_object_fixture, snapshot_platform
+from tests.common import MockConfigEntry, load_fixture, snapshot_platform
 
 
 @pytest.fixture(autouse=True)
@@ -25,15 +26,19 @@ def sensor_only() -> Generator[None]:
         yield
 
 
-@pytest.mark.usefixtures("mock_bring_client")
 async def test_setup(
     hass: HomeAssistant,
     bring_config_entry: MockConfigEntry,
     snapshot: SnapshotAssertion,
     entity_registry: er.EntityRegistry,
+    mock_bring_client: AsyncMock,
 ) -> None:
     """Snapshot test states of sensor platform."""
 
+    mock_bring_client.get_list.side_effect = [
+        BringItemsResponse.from_json(load_fixture("items.json", DOMAIN)),
+        BringItemsResponse.from_json(load_fixture("items2.json", DOMAIN)),
+    ]
     bring_config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(bring_config_entry.entry_id)
     await hass.async_block_till_done()
@@ -62,10 +67,9 @@ async def test_list_access_states(
 ) -> None:
     """Snapshot test states of list access sensor."""
 
-    mock_bring_client.get_list.return_value = load_json_object_fixture(
-        f"{fixture}.json", DOMAIN
+    mock_bring_client.get_list.return_value = BringItemsResponse.from_json(
+        load_fixture(f"{fixture}.json", DOMAIN)
     )
-
     bring_config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(bring_config_entry.entry_id)
     await hass.async_block_till_done()
diff --git a/tests/components/bring/test_todo.py b/tests/components/bring/test_todo.py
index 9cc4ae3d888..9df7b892db8 100644
--- a/tests/components/bring/test_todo.py
+++ b/tests/components/bring/test_todo.py
@@ -4,10 +4,11 @@ from collections.abc import Generator
 import re
 from unittest.mock import AsyncMock, patch
 
-from bring_api import BringItemOperation, BringRequestException
+from bring_api import BringItemOperation, BringItemsResponse, BringRequestException
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
+from homeassistant.components.bring.const import DOMAIN
 from homeassistant.components.todo import (
     ATTR_DESCRIPTION,
     ATTR_ITEM,
@@ -21,7 +22,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
 
-from tests.common import MockConfigEntry, snapshot_platform
+from tests.common import MockConfigEntry, load_fixture, snapshot_platform
 
 
 @pytest.fixture(autouse=True)
@@ -40,9 +41,13 @@ async def test_todo(
     bring_config_entry: MockConfigEntry,
     snapshot: SnapshotAssertion,
     entity_registry: er.EntityRegistry,
+    mock_bring_client: AsyncMock,
 ) -> None:
     """Snapshot test states of todo platform."""
-
+    mock_bring_client.get_list.side_effect = [
+        BringItemsResponse.from_json(load_fixture("items.json", DOMAIN)),
+        BringItemsResponse.from_json(load_fixture("items2.json", DOMAIN)),
+    ]
     bring_config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(bring_config_entry.entry_id)
     await hass.async_block_till_done()
diff --git a/tests/components/bring/test_util.py b/tests/components/bring/test_util.py
index 88379530362..673c4e68a4d 100644
--- a/tests/components/bring/test_util.py
+++ b/tests/components/bring/test_util.py
@@ -1,15 +1,19 @@
 """Test for utility functions of the Bring! integration."""
 
-from typing import cast
-
-from bring_api import BringUserSettingsResponse
+from bring_api import (
+    BringActivityResponse,
+    BringItemsResponse,
+    BringListResponse,
+    BringUserSettingsResponse,
+)
+from bring_api.types import BringUsersResponse
 import pytest
 
 from homeassistant.components.bring.const import DOMAIN
 from homeassistant.components.bring.coordinator import BringData
 from homeassistant.components.bring.util import list_language, sum_attributes
 
-from tests.common import load_json_object_fixture
+from tests.common import load_fixture
 
 
 @pytest.mark.parametrize(
@@ -17,7 +21,7 @@ from tests.common import load_json_object_fixture
     [
         ("e542eef6-dba7-4c31-a52c-29e6ab9d83a5", "de-DE"),
         ("b4776778-7f6c-496e-951b-92a35d3db0dd", "en-US"),
-        ("00000000-0000-0000-0000-00000000", None),
+        ("00000000-0000-0000-0000-000000000000", None),
     ],
 )
 def test_list_language(list_uuid: str, expected: str | None) -> None:
@@ -25,10 +29,7 @@ def test_list_language(list_uuid: str, expected: str | None) -> None:
 
     result = list_language(
         list_uuid,
-        cast(
-            BringUserSettingsResponse,
-            load_json_object_fixture("usersettings.json", DOMAIN),
-        ),
+        BringUserSettingsResponse.from_json(load_fixture("usersettings.json", DOMAIN)),
     )
 
     assert result == expected
@@ -44,12 +45,12 @@ def test_list_language(list_uuid: str, expected: str | None) -> None:
 )
 def test_sum_attributes(attribute: str, expected: int) -> None:
     """Test function sum_attributes."""
-
+    items = BringItemsResponse.from_json(load_fixture("items.json", DOMAIN))
+    lst = BringListResponse.from_json(load_fixture("lists.json", DOMAIN))
+    activity = BringActivityResponse.from_json(load_fixture("activity.json", DOMAIN))
+    users = BringUsersResponse.from_json(load_fixture("users.json", DOMAIN))
     result = sum_attributes(
-        cast(
-            BringData,
-            load_json_object_fixture("items.json", DOMAIN),
-        ),
+        BringData(lst.lists[0], items, activity, users),
         attribute,
     )
 
diff --git a/tests/components/brother/snapshots/test_sensor.ambr b/tests/components/brother/snapshots/test_sensor.ambr
index 4de85859461..847ea0a2c6b 100644
--- a/tests/components/brother/snapshots/test_sensor.ambr
+++ b/tests/components/brother/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -58,6 +59,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -108,6 +110,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -158,6 +161,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -208,6 +212,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -258,6 +263,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -308,6 +314,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -358,6 +365,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -408,6 +416,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -458,6 +467,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -508,6 +518,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -558,6 +569,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -608,6 +620,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -658,6 +671,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -708,6 +722,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -758,6 +773,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -806,6 +822,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -855,6 +872,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -905,6 +923,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -955,6 +974,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1005,6 +1025,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1055,6 +1076,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1105,6 +1127,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1153,6 +1176,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1201,6 +1225,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1251,6 +1276,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1301,6 +1327,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1351,6 +1378,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/bryant_evolution/snapshots/test_climate.ambr b/tests/components/bryant_evolution/snapshots/test_climate.ambr
index 4f6c1f2bbc4..3aeaf66329f 100644
--- a/tests/components/bryant_evolution/snapshots/test_climate.ambr
+++ b/tests/components/bryant_evolution/snapshots/test_climate.ambr
@@ -21,6 +21,7 @@
       'min_temp': 45,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/bsblan/snapshots/test_climate.ambr b/tests/components/bsblan/snapshots/test_climate.ambr
index 16828fea752..70d13f1cb95 100644
--- a/tests/components/bsblan/snapshots/test_climate.ambr
+++ b/tests/components/bsblan/snapshots/test_climate.ambr
@@ -18,6 +18,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -91,6 +92,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/bsblan/snapshots/test_sensor.ambr b/tests/components/bsblan/snapshots/test_sensor.ambr
index 0146dd23b3d..df7ceecc957 100644
--- a/tests/components/bsblan/snapshots/test_sensor.ambr
+++ b/tests/components/bsblan/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/bsblan/snapshots/test_water_heater.ambr b/tests/components/bsblan/snapshots/test_water_heater.ambr
index c1a13b764c0..37fdb14aca9 100644
--- a/tests/components/bsblan/snapshots/test_water_heater.ambr
+++ b/tests/components/bsblan/snapshots/test_water_heater.ambr
@@ -14,6 +14,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/bsblan/test_climate.py b/tests/components/bsblan/test_climate.py
index 7ee12c5fa1a..41d566fc375 100644
--- a/tests/components/bsblan/test_climate.py
+++ b/tests/components/bsblan/test_climate.py
@@ -22,7 +22,7 @@ from homeassistant.components.climate import (
 from homeassistant.const import ATTR_ENTITY_ID, ATTR_TEMPERATURE, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from . import setup_with_selected_platforms
 
diff --git a/tests/components/bsblan/test_sensor.py b/tests/components/bsblan/test_sensor.py
index c95671a1a6b..ba2af40f319 100644
--- a/tests/components/bsblan/test_sensor.py
+++ b/tests/components/bsblan/test_sensor.py
@@ -7,7 +7,7 @@ from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from . import setup_with_selected_platforms
 
diff --git a/tests/components/bsblan/test_water_heater.py b/tests/components/bsblan/test_water_heater.py
index ed920774aa5..173498b14ff 100644
--- a/tests/components/bsblan/test_water_heater.py
+++ b/tests/components/bsblan/test_water_heater.py
@@ -20,7 +20,7 @@ from homeassistant.components.water_heater import (
 from homeassistant.const import ATTR_ENTITY_ID, ATTR_TEMPERATURE, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from . import setup_with_selected_platforms
 
diff --git a/tests/components/bthome/test_config_flow.py b/tests/components/bthome/test_config_flow.py
index faf2f1c9ef5..5aea3a3cc9b 100644
--- a/tests/components/bthome/test_config_flow.py
+++ b/tests/components/bthome/test_config_flow.py
@@ -213,6 +213,36 @@ async def test_async_step_user_with_found_devices(hass: HomeAssistant) -> None:
     assert result2["result"].unique_id == "54:48:E6:8F:80:A5"
 
 
+async def test_async_step_user_replaces_ignored(hass: HomeAssistant) -> None:
+    """Test setup from service info cache replaces an ignored entry."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id="54:48:E6:8F:80:A5",
+        data={},
+        source=config_entries.SOURCE_IGNORE,
+    )
+    entry.add_to_hass(hass)
+    with patch(
+        "homeassistant.components.bthome.config_flow.async_discovered_service_info",
+        return_value=[PRST_SERVICE_INFO],
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_USER},
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    with patch("homeassistant.components.bthome.async_setup_entry", return_value=True):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input={"address": "54:48:E6:8F:80:A5"},
+        )
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "b-parasite 80A5"
+    assert result2["data"] == {}
+    assert result2["result"].unique_id == "54:48:E6:8F:80:A5"
+
+
 async def test_async_step_user_with_found_devices_encryption(
     hass: HomeAssistant,
 ) -> None:
diff --git a/tests/components/button/conftest.py b/tests/components/button/conftest.py
index 75d5509efc9..0784aa09963 100644
--- a/tests/components/button/conftest.py
+++ b/tests/components/button/conftest.py
@@ -6,7 +6,7 @@ import pytest
 
 from homeassistant.components.button import DOMAIN, ButtonEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import TEST_DOMAIN
@@ -31,7 +31,7 @@ async def setup_platform(hass: HomeAssistant) -> None:
     async def async_setup_platform(
         hass: HomeAssistant,
         config: ConfigType,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
         discovery_info: DiscoveryInfoType | None = None,
     ) -> None:
         """Set up test button platform."""
diff --git a/tests/components/button/test_init.py b/tests/components/button/test_init.py
index 7df5308e096..783fd786a50 100644
--- a/tests/components/button/test_init.py
+++ b/tests/components/button/test_init.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import HomeAssistant, State
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
 
@@ -175,7 +175,7 @@ async def test_name(hass: HomeAssistant) -> None:
     async def async_setup_entry_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test button platform via config entry."""
         async_add_entities([entity1, entity2, entity3, entity4])
diff --git a/tests/components/calendar/conftest.py b/tests/components/calendar/conftest.py
index 3e18f595764..5bf061591ee 100644
--- a/tests/components/calendar/conftest.py
+++ b/tests/components/calendar/conftest.py
@@ -12,7 +12,7 @@ from homeassistant.components.calendar import DOMAIN, CalendarEntity, CalendarEv
 from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util
 
 from tests.common import (
@@ -145,7 +145,7 @@ def mock_setup_integration(
     async def async_setup_entry_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test event platform via config entry."""
         new_entities = create_test_entities()
diff --git a/tests/components/calendar/test_init.py b/tests/components/calendar/test_init.py
index 36b102b933a..6de0a7ef936 100644
--- a/tests/components/calendar/test_init.py
+++ b/tests/components/calendar/test_init.py
@@ -5,6 +5,7 @@ from __future__ import annotations
 from collections.abc import Generator
 from datetime import timedelta
 from http import HTTPStatus
+import re
 from typing import Any
 
 from freezegun import freeze_time
@@ -16,7 +17,7 @@ from homeassistant.components.calendar import DOMAIN, SERVICE_GET_EVENTS
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceNotSupported
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import MockCalendarEntity, MockConfigEntry
 
@@ -448,7 +449,7 @@ async def test_list_events_service(
     service: str,
     expected: dict[str, Any],
 ) -> None:
-    """Test listing events from the service call using exlplicit start and end time.
+    """Test listing events from the service call using explicit start and end time.
 
     This test uses a fixed date/time so that it can deterministically test the
     string output values.
@@ -553,3 +554,53 @@ async def test_list_events_missing_fields(hass: HomeAssistant) -> None:
             blocking=True,
             return_response=True,
         )
+
+
+@pytest.mark.parametrize(
+    "frozen_time", ["2023-06-22 10:30:00+00:00"], ids=["frozen_time"]
+)
+@pytest.mark.parametrize(
+    ("service_data", "error_msg"),
+    [
+        (
+            {
+                "start_date_time": "2023-06-22T04:30:00-06:00",
+                "end_date_time": "2023-06-22T04:30:00-06:00",
+            },
+            "Expected end time to be after start time (2023-06-22 04:30:00-06:00, 2023-06-22 04:30:00-06:00)",
+        ),
+        (
+            {
+                "start_date_time": "2023-06-22T04:30:00",
+                "end_date_time": "2023-06-22T04:30:00",
+            },
+            "Expected end time to be after start time (2023-06-22 04:30:00, 2023-06-22 04:30:00)",
+        ),
+        (
+            {"start_date_time": "2023-06-22", "end_date_time": "2023-06-22"},
+            "Expected end time to be after start time (2023-06-22 00:00:00, 2023-06-22 00:00:00)",
+        ),
+        (
+            {"start_date_time": "2023-06-22 10:00:00", "duration": "0"},
+            "Expected positive duration (0:00:00)",
+        ),
+    ],
+)
+async def test_list_events_service_same_dates(
+    hass: HomeAssistant,
+    service_data: dict[str, str],
+    error_msg: str,
+) -> None:
+    """Test listing events from the service call using the same start and end time."""
+
+    with pytest.raises(vol.error.MultipleInvalid, match=re.escape(error_msg)):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_GET_EVENTS,
+            service_data={
+                "entity_id": "calendar.calendar_1",
+                **service_data,
+            },
+            blocking=True,
+            return_response=True,
+        )
diff --git a/tests/components/calendar/test_trigger.py b/tests/components/calendar/test_trigger.py
index dfe4622e82e..b0d7944041d 100644
--- a/tests/components/calendar/test_trigger.py
+++ b/tests/components/calendar/test_trigger.py
@@ -25,7 +25,7 @@ from homeassistant.components.calendar.trigger import EVENT_END, EVENT_START
 from homeassistant.const import ATTR_ENTITY_ID, SERVICE_TURN_OFF
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import MockCalendarEntity
 
diff --git a/tests/components/cambridge_audio/snapshots/test_init.ambr b/tests/components/cambridge_audio/snapshots/test_init.ambr
index 64182ee2188..7f4bbed36f7 100644
--- a/tests/components/cambridge_audio/snapshots/test_init.ambr
+++ b/tests/components/cambridge_audio/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://192.168.20.218',
     'connections': set({
     }),
@@ -30,4 +31,4 @@
     'sw_version': None,
     'via_device_id': None,
   })
-# ---
\ No newline at end of file
+# ---
diff --git a/tests/components/cambridge_audio/snapshots/test_select.ambr b/tests/components/cambridge_audio/snapshots/test_select.ambr
index b40c8a8d5c4..8c9801b101b 100644
--- a/tests/components/cambridge_audio/snapshots/test_select.ambr
+++ b/tests/components/cambridge_audio/snapshots/test_select.ambr
@@ -12,6 +12,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -69,6 +70,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/cambridge_audio/snapshots/test_switch.ambr b/tests/components/cambridge_audio/snapshots/test_switch.ambr
index 9bfcd7c6da7..cd4326fdcc3 100644
--- a/tests/components/cambridge_audio/snapshots/test_switch.ambr
+++ b/tests/components/cambridge_audio/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/camera/test_init.py b/tests/components/camera/test_init.py
index 5a26e3b44f6..7fd469fa51a 100644
--- a/tests/components/camera/test_init.py
+++ b/tests/components/camera/test_init.py
@@ -301,13 +301,24 @@ async def test_snapshot_service_not_allowed_path(hass: HomeAssistant) -> None:
 
 
 @pytest.mark.usefixtures("mock_camera")
-async def test_snapshot_service_os_error(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+@pytest.mark.parametrize(
+    ("target", "side_effect"),
+    [
+        ("homeassistant.components.camera.os.makedirs", OSError),
+        (
+            "homeassistant.components.demo.camera.DemoCamera.async_camera_image",
+            TimeoutError,
+        ),
+    ],
+)
+async def test_snapshot_service_error(
+    hass: HomeAssistant, target: str, side_effect: Exception
 ) -> None:
-    """Test snapshot service with os error."""
+    """Test snapshot service with error."""
     with (
         patch.object(hass.config, "is_allowed_path", return_value=True),
-        patch("homeassistant.components.camera.os.makedirs", side_effect=OSError),
+        patch(target, side_effect=side_effect),
+        pytest.raises(HomeAssistantError),
     ):
         await hass.services.async_call(
             camera.DOMAIN,
@@ -319,8 +330,6 @@ async def test_snapshot_service_os_error(
             blocking=True,
         )
 
-    assert "Can't write image to file:" in caplog.text
-
 
 @pytest.mark.usefixtures("mock_camera", "mock_stream")
 async def test_websocket_stream_no_source(
diff --git a/tests/components/cast/test_config_flow.py b/tests/components/cast/test_config_flow.py
index 2dcf007c6d4..e02230892bf 100644
--- a/tests/components/cast/test_config_flow.py
+++ b/tests/components/cast/test_config_flow.py
@@ -87,7 +87,7 @@ async def test_user_setup_options(hass: HomeAssistant) -> None:
     assert result["type"] is FlowResultType.FORM
 
     result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {"known_hosts": "192.168.0.1,  ,  192.168.0.2 "}
+        result["flow_id"], {"known_hosts": ["192.168.0.1", "", " ", "192.168.0.2 "]}
     )
 
     users = await hass.auth.async_get_users()
@@ -152,13 +152,13 @@ def get_suggested(schema, key):
 
 
 @pytest.mark.parametrize(
-    "parameter_data",
+    ("parameter", "initial", "suggested", "user_input", "updated"),
     [
         (
             "known_hosts",
             ["192.168.0.10", "192.168.0.11"],
-            "192.168.0.10,192.168.0.11",
-            "192.168.0.1,  ,  192.168.0.2 ",
+            ["192.168.0.10", "192.168.0.11"],
+            ["192.168.0.1", " ", "  192.168.0.2 "],
             ["192.168.0.1", "192.168.0.2"],
         ),
         (
@@ -177,11 +177,17 @@ def get_suggested(schema, key):
         ),
     ],
 )
-async def test_option_flow(hass: HomeAssistant, parameter_data) -> None:
+async def test_option_flow(
+    hass: HomeAssistant,
+    parameter: str,
+    initial: list[str],
+    suggested: str | list[str],
+    user_input: str | list[str],
+    updated: list[str],
+) -> None:
     """Test config flow options."""
     basic_parameters = ["known_hosts"]
     advanced_parameters = ["ignore_cec", "uuid"]
-    parameter, initial, suggested, user_input, updated = parameter_data
 
     data = {
         "ignore_cec": [],
@@ -213,7 +219,7 @@ async def test_option_flow(hass: HomeAssistant, parameter_data) -> None:
     for other_param in basic_parameters:
         if other_param == parameter:
             continue
-        assert get_suggested(data_schema, other_param) == ""
+        assert get_suggested(data_schema, other_param) == []
     if parameter in basic_parameters:
         assert get_suggested(data_schema, parameter) == suggested
 
@@ -261,7 +267,7 @@ async def test_option_flow(hass: HomeAssistant, parameter_data) -> None:
     result = await hass.config_entries.options.async_init(config_entry.entry_id)
     result = await hass.config_entries.options.async_configure(
         result["flow_id"],
-        user_input={"known_hosts": ""},
+        user_input={},
     )
     assert result["type"] is FlowResultType.CREATE_ENTRY
     assert result["data"] == {}
@@ -277,7 +283,7 @@ async def test_known_hosts(hass: HomeAssistant, castbrowser_mock) -> None:
         "cast", context={"source": config_entries.SOURCE_USER}
     )
     result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {"known_hosts": "192.168.0.1, 192.168.0.2"}
+        result["flow_id"], {"known_hosts": ["192.168.0.1", "192.168.0.2"]}
     )
     assert result["type"] is FlowResultType.CREATE_ENTRY
     await hass.async_block_till_done(wait_background_tasks=True)
@@ -290,7 +296,7 @@ async def test_known_hosts(hass: HomeAssistant, castbrowser_mock) -> None:
     result = await hass.config_entries.options.async_init(config_entry.entry_id)
     result = await hass.config_entries.options.async_configure(
         result["flow_id"],
-        user_input={"known_hosts": "192.168.0.11, 192.168.0.12"},
+        user_input={"known_hosts": ["192.168.0.11", "192.168.0.12"]},
     )
 
     await hass.async_block_till_done(wait_background_tasks=True)
diff --git a/tests/components/cast/test_media_player.py b/tests/components/cast/test_media_player.py
index b2ce60e9393..668ed985154 100644
--- a/tests/components/cast/test_media_player.py
+++ b/tests/components/cast/test_media_player.py
@@ -1909,6 +1909,7 @@ async def test_group_media_control(
     )
 
 
+@pytest.mark.usefixtures("mock_tts_cache_dir")
 async def test_failed_cast_on_idle(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
@@ -1939,6 +1940,7 @@ async def test_failed_cast_on_idle(
     assert "Failed to cast media http://example.com:8123/tts.mp3." in caplog.text
 
 
+@pytest.mark.usefixtures("mock_tts_cache_dir")
 async def test_failed_cast_other_url(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
@@ -1963,6 +1965,7 @@ async def test_failed_cast_other_url(
     assert "Failed to cast media http://example.com:8123/tts.mp3." in caplog.text
 
 
+@pytest.mark.usefixtures("mock_tts_cache_dir")
 async def test_failed_cast_internal_url(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
@@ -1992,6 +1995,7 @@ async def test_failed_cast_internal_url(
     )
 
 
+@pytest.mark.usefixtures("mock_tts_cache_dir")
 async def test_failed_cast_external_url(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
diff --git a/tests/components/ccm15/snapshots/test_climate.ambr b/tests/components/ccm15/snapshots/test_climate.ambr
index 27dcbcb3405..a3cda75463f 100644
--- a/tests/components/ccm15/snapshots/test_climate.ambr
+++ b/tests/components/ccm15/snapshots/test_climate.ambr
@@ -28,6 +28,7 @@
       'target_temp_step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -83,6 +84,7 @@
       'target_temp_step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -218,6 +220,7 @@
       'target_temp_step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -273,6 +276,7 @@
       'target_temp_step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/chacon_dio/snapshots/test_cover.ambr b/tests/components/chacon_dio/snapshots/test_cover.ambr
index b2febe20070..afac3359410 100644
--- a/tests/components/chacon_dio/snapshots/test_cover.ambr
+++ b/tests/components/chacon_dio/snapshots/test_cover.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/chacon_dio/snapshots/test_switch.ambr b/tests/components/chacon_dio/snapshots/test_switch.ambr
index 7a65dad5445..a2620005531 100644
--- a/tests/components/chacon_dio/snapshots/test_switch.ambr
+++ b/tests/components/chacon_dio/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/clicksend_tts/test_notify.py b/tests/components/clicksend_tts/test_notify.py
index 892d7541354..811978eead5 100644
--- a/tests/components/clicksend_tts/test_notify.py
+++ b/tests/components/clicksend_tts/test_notify.py
@@ -9,7 +9,7 @@ import pytest
 import requests_mock
 
 from homeassistant.components import notify
-import homeassistant.components.clicksend_tts.notify as cs_tts
+from homeassistant.components.clicksend_tts import notify as cs_tts
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
diff --git a/tests/components/climate/common.py b/tests/components/climate/common.py
index d6aedd23671..8f5834d9180 100644
--- a/tests/components/climate/common.py
+++ b/tests/components/climate/common.py
@@ -11,6 +11,7 @@ from homeassistant.components.climate import (
     ATTR_HUMIDITY,
     ATTR_HVAC_MODE,
     ATTR_PRESET_MODE,
+    ATTR_SWING_HORIZONTAL_MODE,
     ATTR_SWING_MODE,
     ATTR_TARGET_TEMP_HIGH,
     ATTR_TARGET_TEMP_LOW,
@@ -20,10 +21,11 @@ from homeassistant.components.climate import (
     SERVICE_SET_HUMIDITY,
     SERVICE_SET_HVAC_MODE,
     SERVICE_SET_PRESET_MODE,
+    SERVICE_SET_SWING_HORIZONTAL_MODE,
     SERVICE_SET_SWING_MODE,
     SERVICE_SET_TEMPERATURE,
+    HVACMode,
 )
-from homeassistant.components.climate.const import HVACMode
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_TEMPERATURE,
@@ -211,6 +213,20 @@ def set_operation_mode(
     hass.services.call(DOMAIN, SERVICE_SET_HVAC_MODE, data)
 
 
+async def async_set_swing_horizontal_mode(
+    hass: HomeAssistant, swing_horizontal_mode: str, entity_id: str = ENTITY_MATCH_ALL
+) -> None:
+    """Set new target swing horizontal mode."""
+    data = {ATTR_SWING_HORIZONTAL_MODE: swing_horizontal_mode}
+
+    if entity_id is not None:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    await hass.services.async_call(
+        DOMAIN, SERVICE_SET_SWING_HORIZONTAL_MODE, data, blocking=True
+    )
+
+
 async def async_set_swing_mode(
     hass: HomeAssistant, swing_mode: str, entity_id: str = ENTITY_MATCH_ALL
 ) -> None:
diff --git a/tests/components/climate/test_init.py b/tests/components/climate/test_init.py
index 45570c63008..8900a9faefa 100644
--- a/tests/components/climate/test_init.py
+++ b/tests/components/climate/test_init.py
@@ -42,7 +42,7 @@ from homeassistant.const import ATTR_TEMPERATURE, PRECISION_WHOLE, UnitOfTempera
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import issue_registry as ir
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from tests.common import (
     MockConfigEntry,
@@ -582,7 +582,7 @@ async def test_issue_aux_property_deprecated(
     async def async_setup_entry_climate_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test weather platform via config entry."""
         async_add_entities([climate_entity])
diff --git a/tests/components/climate/test_intent.py b/tests/components/climate/test_intent.py
index d17f3a1747d..4ce06199eb8 100644
--- a/tests/components/climate/test_intent.py
+++ b/tests/components/climate/test_intent.py
@@ -1,22 +1,29 @@
 """Test climate intents."""
 
 from collections.abc import Generator
+from typing import Any
 
 import pytest
 
 from homeassistant.components import conversation
 from homeassistant.components.climate import (
+    ATTR_TEMPERATURE,
     DOMAIN,
     ClimateEntity,
+    ClimateEntityFeature,
     HVACMode,
     intent as climate_intent,
 )
-from homeassistant.components.homeassistant.exposed_entities import async_expose_entity
 from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.const import Platform, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import area_registry as ar, entity_registry as er, intent
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers import (
+    area_registry as ar,
+    entity_registry as er,
+    floor_registry as fr,
+    intent,
+)
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.setup import async_setup_component
 
 from tests.common import (
@@ -82,7 +89,7 @@ async def create_mock_platform(
     async def async_setup_entry_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test event platform via config entry."""
         async_add_entities(entities)
@@ -107,14 +114,29 @@ class MockClimateEntity(ClimateEntity):
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
     _attr_hvac_mode = HVACMode.OFF
     _attr_hvac_modes = [HVACMode.OFF, HVACMode.HEAT]
+    _attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
+
+    async def async_set_temperature(self, **kwargs: Any) -> None:
+        """Set the thermostat temperature."""
+        value = kwargs[ATTR_TEMPERATURE]
+        self._attr_target_temperature = value
 
 
-async def test_get_temperature(
+class MockClimateEntityNoSetTemperature(ClimateEntity):
+    """Mock Climate device to use in tests."""
+
+    _attr_temperature_unit = UnitOfTemperature.CELSIUS
+    _attr_hvac_mode = HVACMode.OFF
+    _attr_hvac_modes = [HVACMode.OFF, HVACMode.HEAT]
+
+
+async def test_set_temperature(
     hass: HomeAssistant,
     area_registry: ar.AreaRegistry,
     entity_registry: er.EntityRegistry,
+    floor_registry: fr.FloorRegistry,
 ) -> None:
-    """Test HassClimateGetTemperature intent."""
+    """Test HassClimateSetTemperature intent."""
     assert await async_setup_component(hass, "homeassistant", {})
     await climate_intent.async_setup_intents(hass)
 
@@ -122,6 +144,7 @@ async def test_get_temperature(
     climate_1._attr_name = "Climate 1"
     climate_1._attr_unique_id = "1234"
     climate_1._attr_current_temperature = 10.0
+    climate_1._attr_target_temperature = 10.0
     entity_registry.async_get_or_create(
         DOMAIN, "test", "1234", suggested_object_id="climate_1"
     )
@@ -130,6 +153,7 @@ async def test_get_temperature(
     climate_2._attr_name = "Climate 2"
     climate_2._attr_unique_id = "5678"
     climate_2._attr_current_temperature = 22.0
+    climate_2._attr_target_temperature = 22.0
     entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", suggested_object_id="climate_2"
     )
@@ -149,55 +173,117 @@ async def test_get_temperature(
     )
     entity_registry.async_update_entity(climate_2.entity_id, area_id=bedroom_area.id)
 
-    # First climate entity will be selected (no area)
-    response = await intent.async_handle(
-        hass,
-        "test",
-        climate_intent.INTENT_GET_TEMPERATURE,
-        {},
-        assistant=conversation.DOMAIN,
+    # Put areas on different floors:
+    # first floor => living room and office
+    # upstairs => bedroom
+    floor_registry = fr.async_get(hass)
+    first_floor = floor_registry.async_create("First floor")
+    living_room_area = area_registry.async_update(
+        living_room_area.id, floor_id=first_floor.floor_id
+    )
+    office_area = area_registry.async_update(
+        office_area.id, floor_id=first_floor.floor_id
     )
-    assert response.response_type == intent.IntentResponseType.QUERY_ANSWER
-    assert response.matched_states
-    assert response.matched_states[0].entity_id == climate_1.entity_id
-    state = response.matched_states[0]
-    assert state.attributes["current_temperature"] == 10.0
 
-    # Select by area (climate_2)
+    second_floor = floor_registry.async_create("Second floor")
+    bedroom_area = area_registry.async_update(
+        bedroom_area.id, floor_id=second_floor.floor_id
+    )
+
+    # Cannot target multiple climate devices
+    with pytest.raises(intent.MatchFailedError) as err:
+        await intent.async_handle(
+            hass,
+            "test",
+            climate_intent.INTENT_SET_TEMPERATURE,
+            {"temperature": {"value": 20}},
+            assistant=conversation.DOMAIN,
+        )
+    assert err.value.result.no_match_reason == intent.MatchFailedReason.MULTIPLE_TARGETS
+
+    # Select by area explicitly (climate_2)
     response = await intent.async_handle(
         hass,
         "test",
-        climate_intent.INTENT_GET_TEMPERATURE,
-        {"area": {"value": bedroom_area.name}},
+        climate_intent.INTENT_SET_TEMPERATURE,
+        {"area": {"value": bedroom_area.name}, "temperature": {"value": 20.1}},
         assistant=conversation.DOMAIN,
     )
-    assert response.response_type == intent.IntentResponseType.QUERY_ANSWER
+    assert response.response_type == intent.IntentResponseType.ACTION_DONE
     assert len(response.matched_states) == 1
     assert response.matched_states[0].entity_id == climate_2.entity_id
-    state = response.matched_states[0]
-    assert state.attributes["current_temperature"] == 22.0
+    state = hass.states.get(climate_2.entity_id)
+    assert state.attributes[ATTR_TEMPERATURE] == 20.1
+
+    # Select by area implicitly (climate_2)
+    response = await intent.async_handle(
+        hass,
+        "test",
+        climate_intent.INTENT_SET_TEMPERATURE,
+        {
+            "preferred_area_id": {"value": bedroom_area.id},
+            "temperature": {"value": 20.2},
+        },
+        assistant=conversation.DOMAIN,
+    )
+    assert response.response_type == intent.IntentResponseType.ACTION_DONE
+    assert response.matched_states
+    assert response.matched_states[0].entity_id == climate_2.entity_id
+    state = hass.states.get(climate_2.entity_id)
+    assert state.attributes[ATTR_TEMPERATURE] == 20.2
+
+    # Select by floor explicitly (climate_2)
+    response = await intent.async_handle(
+        hass,
+        "test",
+        climate_intent.INTENT_SET_TEMPERATURE,
+        {"floor": {"value": second_floor.name}, "temperature": {"value": 20.3}},
+        assistant=conversation.DOMAIN,
+    )
+    assert response.response_type == intent.IntentResponseType.ACTION_DONE
+    assert response.matched_states
+    assert response.matched_states[0].entity_id == climate_2.entity_id
+    state = hass.states.get(climate_2.entity_id)
+    assert state.attributes[ATTR_TEMPERATURE] == 20.3
+
+    # Select by floor implicitly (climate_2)
+    response = await intent.async_handle(
+        hass,
+        "test",
+        climate_intent.INTENT_SET_TEMPERATURE,
+        {
+            "preferred_floor_id": {"value": second_floor.floor_id},
+            "temperature": {"value": 20.4},
+        },
+        assistant=conversation.DOMAIN,
+    )
+    assert response.response_type == intent.IntentResponseType.ACTION_DONE
+    assert response.matched_states
+    assert response.matched_states[0].entity_id == climate_2.entity_id
+    state = hass.states.get(climate_2.entity_id)
+    assert state.attributes[ATTR_TEMPERATURE] == 20.4
 
     # Select by name (climate_2)
     response = await intent.async_handle(
         hass,
         "test",
-        climate_intent.INTENT_GET_TEMPERATURE,
-        {"name": {"value": "Climate 2"}},
+        climate_intent.INTENT_SET_TEMPERATURE,
+        {"name": {"value": "Climate 2"}, "temperature": {"value": 20.5}},
         assistant=conversation.DOMAIN,
     )
-    assert response.response_type == intent.IntentResponseType.QUERY_ANSWER
+    assert response.response_type == intent.IntentResponseType.ACTION_DONE
     assert len(response.matched_states) == 1
     assert response.matched_states[0].entity_id == climate_2.entity_id
-    state = response.matched_states[0]
-    assert state.attributes["current_temperature"] == 22.0
+    state = hass.states.get(climate_2.entity_id)
+    assert state.attributes[ATTR_TEMPERATURE] == 20.5
 
-    # Check area with no climate entities
+    # Check area with no climate entities (explicit)
     with pytest.raises(intent.MatchFailedError) as error:
         response = await intent.async_handle(
             hass,
             "test",
-            climate_intent.INTENT_GET_TEMPERATURE,
-            {"area": {"value": office_area.name}},
+            climate_intent.INTENT_SET_TEMPERATURE,
+            {"area": {"value": office_area.name}, "temperature": {"value": 20.6}},
             assistant=conversation.DOMAIN,
         )
 
@@ -210,45 +296,25 @@ async def test_get_temperature(
     assert constraints.domains and (set(constraints.domains) == {DOMAIN})
     assert constraints.device_classes is None
 
-    # Check wrong name
-    with pytest.raises(intent.MatchFailedError) as error:
-        response = await intent.async_handle(
+    # Implicit area with no climate entities will fail with multiple targets
+    with pytest.raises(intent.MatchFailedError) as err:
+        await intent.async_handle(
             hass,
             "test",
-            climate_intent.INTENT_GET_TEMPERATURE,
-            {"name": {"value": "Does not exist"}},
+            climate_intent.INTENT_SET_TEMPERATURE,
+            {
+                "preferred_area_id": {"value": office_area.id},
+                "temperature": {"value": 20.7},
+            },
+            assistant=conversation.DOMAIN,
         )
-
-    assert isinstance(error.value, intent.MatchFailedError)
-    assert error.value.result.no_match_reason == intent.MatchFailedReason.NAME
-    constraints = error.value.constraints
-    assert constraints.name == "Does not exist"
-    assert constraints.area_name is None
-    assert constraints.domains and (set(constraints.domains) == {DOMAIN})
-    assert constraints.device_classes is None
-
-    # Check wrong name with area
-    with pytest.raises(intent.MatchFailedError) as error:
-        response = await intent.async_handle(
-            hass,
-            "test",
-            climate_intent.INTENT_GET_TEMPERATURE,
-            {"name": {"value": "Climate 1"}, "area": {"value": bedroom_area.name}},
-        )
-
-    assert isinstance(error.value, intent.MatchFailedError)
-    assert error.value.result.no_match_reason == intent.MatchFailedReason.AREA
-    constraints = error.value.constraints
-    assert constraints.name == "Climate 1"
-    assert constraints.area_name == bedroom_area.name
-    assert constraints.domains and (set(constraints.domains) == {DOMAIN})
-    assert constraints.device_classes is None
+    assert err.value.result.no_match_reason == intent.MatchFailedReason.MULTIPLE_TARGETS
 
 
-async def test_get_temperature_no_entities(
+async def test_set_temperature_no_entities(
     hass: HomeAssistant,
 ) -> None:
-    """Test HassClimateGetTemperature intent with no climate entities."""
+    """Test HassClimateSetTemperature intent with no climate entities."""
     assert await async_setup_component(hass, "homeassistant", {})
     await climate_intent.async_setup_intents(hass)
 
@@ -258,181 +324,35 @@ async def test_get_temperature_no_entities(
         await intent.async_handle(
             hass,
             "test",
-            climate_intent.INTENT_GET_TEMPERATURE,
-            {},
+            climate_intent.INTENT_SET_TEMPERATURE,
+            {"temperature": {"value": 20}},
             assistant=conversation.DOMAIN,
         )
     assert err.value.result.no_match_reason == intent.MatchFailedReason.DOMAIN
 
 
-async def test_not_exposed(
-    hass: HomeAssistant,
-    area_registry: ar.AreaRegistry,
-    entity_registry: er.EntityRegistry,
-) -> None:
-    """Test HassClimateGetTemperature intent when entities aren't exposed."""
+async def test_set_temperature_not_supported(hass: HomeAssistant) -> None:
+    """Test HassClimateSetTemperature intent when climate entity doesn't support required feature."""
     assert await async_setup_component(hass, "homeassistant", {})
     await climate_intent.async_setup_intents(hass)
 
-    climate_1 = MockClimateEntity()
+    climate_1 = MockClimateEntityNoSetTemperature()
     climate_1._attr_name = "Climate 1"
     climate_1._attr_unique_id = "1234"
     climate_1._attr_current_temperature = 10.0
-    entity_registry.async_get_or_create(
-        DOMAIN, "test", "1234", suggested_object_id="climate_1"
-    )
+    climate_1._attr_target_temperature = 10.0
 
-    climate_2 = MockClimateEntity()
-    climate_2._attr_name = "Climate 2"
-    climate_2._attr_unique_id = "5678"
-    climate_2._attr_current_temperature = 22.0
-    entity_registry.async_get_or_create(
-        DOMAIN, "test", "5678", suggested_object_id="climate_2"
-    )
+    await create_mock_platform(hass, [climate_1])
 
-    await create_mock_platform(hass, [climate_1, climate_2])
-
-    # Add climate entities to same area
-    living_room_area = area_registry.async_create(name="Living Room")
-    bedroom_area = area_registry.async_create(name="Bedroom")
-    entity_registry.async_update_entity(
-        climate_1.entity_id, area_id=living_room_area.id
-    )
-    entity_registry.async_update_entity(
-        climate_2.entity_id, area_id=living_room_area.id
-    )
-
-    # Should fail with empty name
-    with pytest.raises(intent.InvalidSlotInfo):
+    with pytest.raises(intent.MatchFailedError) as error:
         await intent.async_handle(
             hass,
             "test",
-            climate_intent.INTENT_GET_TEMPERATURE,
-            {"name": {"value": ""}},
+            climate_intent.INTENT_SET_TEMPERATURE,
+            {"temperature": {"value": 20.0}},
             assistant=conversation.DOMAIN,
         )
 
-    # Should fail with empty area
-    with pytest.raises(intent.InvalidSlotInfo):
-        await intent.async_handle(
-            hass,
-            "test",
-            climate_intent.INTENT_GET_TEMPERATURE,
-            {"area": {"value": ""}},
-            assistant=conversation.DOMAIN,
-        )
-
-    # Expose second, hide first
-    async_expose_entity(hass, conversation.DOMAIN, climate_1.entity_id, False)
-    async_expose_entity(hass, conversation.DOMAIN, climate_2.entity_id, True)
-
-    # Second climate entity is exposed
-    response = await intent.async_handle(
-        hass,
-        "test",
-        climate_intent.INTENT_GET_TEMPERATURE,
-        {},
-        assistant=conversation.DOMAIN,
-    )
-    assert response.response_type == intent.IntentResponseType.QUERY_ANSWER
-    assert len(response.matched_states) == 1
-    assert response.matched_states[0].entity_id == climate_2.entity_id
-
-    # Using the area should work
-    response = await intent.async_handle(
-        hass,
-        "test",
-        climate_intent.INTENT_GET_TEMPERATURE,
-        {"area": {"value": living_room_area.name}},
-        assistant=conversation.DOMAIN,
-    )
-    assert response.response_type == intent.IntentResponseType.QUERY_ANSWER
-    assert len(response.matched_states) == 1
-    assert response.matched_states[0].entity_id == climate_2.entity_id
-
-    # Using the name of the exposed entity should work
-    response = await intent.async_handle(
-        hass,
-        "test",
-        climate_intent.INTENT_GET_TEMPERATURE,
-        {"name": {"value": climate_2.name}},
-        assistant=conversation.DOMAIN,
-    )
-    assert response.response_type == intent.IntentResponseType.QUERY_ANSWER
-    assert len(response.matched_states) == 1
-    assert response.matched_states[0].entity_id == climate_2.entity_id
-
-    # Using the name of the *unexposed* entity should fail
-    with pytest.raises(intent.MatchFailedError) as err:
-        await intent.async_handle(
-            hass,
-            "test",
-            climate_intent.INTENT_GET_TEMPERATURE,
-            {"name": {"value": climate_1.name}},
-            assistant=conversation.DOMAIN,
-        )
-    assert err.value.result.no_match_reason == intent.MatchFailedReason.ASSISTANT
-
-    # Expose first, hide second
-    async_expose_entity(hass, conversation.DOMAIN, climate_1.entity_id, True)
-    async_expose_entity(hass, conversation.DOMAIN, climate_2.entity_id, False)
-
-    # Second climate entity is exposed
-    response = await intent.async_handle(
-        hass,
-        "test",
-        climate_intent.INTENT_GET_TEMPERATURE,
-        {},
-        assistant=conversation.DOMAIN,
-    )
-    assert response.response_type == intent.IntentResponseType.QUERY_ANSWER
-    assert len(response.matched_states) == 1
-    assert response.matched_states[0].entity_id == climate_1.entity_id
-
-    # Wrong area name
-    with pytest.raises(intent.MatchFailedError) as err:
-        await intent.async_handle(
-            hass,
-            "test",
-            climate_intent.INTENT_GET_TEMPERATURE,
-            {"area": {"value": bedroom_area.name}},
-            assistant=conversation.DOMAIN,
-        )
-    assert err.value.result.no_match_reason == intent.MatchFailedReason.AREA
-
-    # Neither are exposed
-    async_expose_entity(hass, conversation.DOMAIN, climate_1.entity_id, False)
-    async_expose_entity(hass, conversation.DOMAIN, climate_2.entity_id, False)
-
-    with pytest.raises(intent.MatchFailedError) as err:
-        await intent.async_handle(
-            hass,
-            "test",
-            climate_intent.INTENT_GET_TEMPERATURE,
-            {},
-            assistant=conversation.DOMAIN,
-        )
-    assert err.value.result.no_match_reason == intent.MatchFailedReason.ASSISTANT
-
-    # Should fail with area
-    with pytest.raises(intent.MatchFailedError) as err:
-        await intent.async_handle(
-            hass,
-            "test",
-            climate_intent.INTENT_GET_TEMPERATURE,
-            {"area": {"value": living_room_area.name}},
-            assistant=conversation.DOMAIN,
-        )
-    assert err.value.result.no_match_reason == intent.MatchFailedReason.ASSISTANT
-
-    # Should fail with both names
-    for name in (climate_1.name, climate_2.name):
-        with pytest.raises(intent.MatchFailedError) as err:
-            await intent.async_handle(
-                hass,
-                "test",
-                climate_intent.INTENT_GET_TEMPERATURE,
-                {"name": {"value": name}},
-                assistant=conversation.DOMAIN,
-            )
-        assert err.value.result.no_match_reason == intent.MatchFailedReason.ASSISTANT
+    # Exception should contain details of what we tried to match
+    assert isinstance(error.value, intent.MatchFailedError)
+    assert error.value.result.no_match_reason == intent.MatchFailedReason.FEATURE
diff --git a/tests/components/cloud/conftest.py b/tests/components/cloud/conftest.py
index 7002f7c39ec..2d594fd9345 100644
--- a/tests/components/cloud/conftest.py
+++ b/tests/components/cloud/conftest.py
@@ -9,6 +9,7 @@ from hass_nabucasa import Cloud
 from hass_nabucasa.auth import CognitoAuth
 from hass_nabucasa.cloudhooks import Cloudhooks
 from hass_nabucasa.const import DEFAULT_SERVERS, DEFAULT_VALUES, STATE_CONNECTED
+from hass_nabucasa.files import Files
 from hass_nabucasa.google_report_state import GoogleReportState
 from hass_nabucasa.ice_servers import IceServers
 from hass_nabucasa.iot import CloudIoT
@@ -68,6 +69,7 @@ async def cloud_fixture() -> AsyncGenerator[MagicMock]:
             spec=CloudIoT, last_disconnect_reason=None, state=STATE_CONNECTED
         )
         mock_cloud.voice = MagicMock(spec=Voice)
+        mock_cloud.files = MagicMock(spec=Files)
         mock_cloud.started = None
         mock_cloud.ice_servers = MagicMock(
             spec=IceServers,
@@ -143,7 +145,12 @@ async def cloud_fixture() -> AsyncGenerator[MagicMock]:
 
         # Methods that we mock with a custom side effect.
 
-        async def mock_login(email: str, password: str) -> None:
+        async def mock_login(
+            email: str,
+            password: str,
+            *,
+            check_connection: bool = False,
+        ) -> None:
             """Mock login.
 
             When called, it should call the on_start callback.
diff --git a/tests/components/cloud/snapshots/test_http_api.ambr b/tests/components/cloud/snapshots/test_http_api.ambr
new file mode 100644
index 00000000000..b15cd08c23a
--- /dev/null
+++ b/tests/components/cloud/snapshots/test_http_api.ambr
@@ -0,0 +1,60 @@
+# serializer version: 1
+# name: test_download_support_package
+  '''
+  ## System Information
+  
+  version | core-2025.2.0
+  --- | ---
+  installation_type | Home Assistant Core
+  dev | False
+  hassio | False
+  docker | False
+  user | hass
+  virtualenv | False
+  python_version | 3.13.1
+  os_name | Linux
+  os_version | 6.12.9
+  arch | x86_64
+  timezone | US/Pacific
+  config_dir | config
+  
+  <details><summary>mock_no_info_integration</summary>
+  
+  No information available
+  </details>
+  
+  <details><summary>cloud</summary>
+  
+  logged_in | True
+  --- | ---
+  subscription_expiration | 2025-01-17T11:19:31+00:00
+  relayer_connected | True
+  relayer_region | xx-earth-616
+  remote_enabled | True
+  remote_connected | False
+  alexa_enabled | True
+  google_enabled | False
+  cloud_ice_servers_enabled | True
+  remote_server | us-west-1
+  certificate_status | CertificateStatus.READY
+  instance_id | 12345678901234567890
+  can_reach_cert_server | Exception: Unexpected exception
+  can_reach_cloud_auth | Failed: unreachable
+  can_reach_cloud | ok
+  
+  </details>
+  
+  ## Full logs
+  
+  <details><summary>Logs</summary>
+  
+  ```logs
+  2025-02-10 12:00:00.000 INFO (MainThread) [hass_nabucasa.iot] Hass nabucasa log
+  2025-02-10 12:00:00.000 WARNING (MainThread) [snitun.utils.aiohttp_client] Snitun log
+  2025-02-10 12:00:00.000 ERROR (MainThread) [homeassistant.components.cloud.client] Cloud log
+  ```
+  
+  </details>
+  
+  '''
+# ---
diff --git a/tests/components/cloud/test_backup.py b/tests/components/cloud/test_backup.py
index db742525a48..8399e69ab09 100644
--- a/tests/components/cloud/test_backup.py
+++ b/tests/components/cloud/test_backup.py
@@ -1,14 +1,15 @@
 """Test the cloud backup platform."""
 
-from collections.abc import AsyncGenerator, AsyncIterator, Generator
+from collections.abc import AsyncGenerator, Generator
 from io import StringIO
 from typing import Any
-from unittest.mock import Mock, PropertyMock, patch
+from unittest.mock import ANY, Mock, PropertyMock, patch
 
-from aiohttp import ClientError
+from aiohttp import ClientError, ClientResponseError
 from hass_nabucasa import CloudError
+from hass_nabucasa.api import CloudApiError, CloudApiNonRetryableError
+from hass_nabucasa.files import FilesError, StorageType
 import pytest
-from yarl import URL
 
 from homeassistant.components.backup import (
     DOMAIN as BACKUP_DOMAIN,
@@ -20,13 +21,23 @@ from homeassistant.components.cloud import DOMAIN
 from homeassistant.components.cloud.backup import async_register_backup_agents_listener
 from homeassistant.components.cloud.const import EVENT_CLOUD_EVENT
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.backup import async_initialize_backup
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.setup import async_setup_component
+from homeassistant.util.aiohttp import MockStreamReader
 
 from tests.test_util.aiohttp import AiohttpClientMocker
 from tests.typing import ClientSessionGenerator, MagicMock, WebSocketGenerator
 
 
+class MockStreamReaderChunked(MockStreamReader):
+    """Mock a stream reader with simulated chunked data."""
+
+    async def readchunk(self) -> tuple[bytes, bool]:
+        """Read bytes."""
+        return (self._content.read(), False)
+
+
 @pytest.fixture(autouse=True)
 async def setup_integration(
     hass: HomeAssistant,
@@ -34,7 +45,8 @@ async def setup_integration(
     cloud: MagicMock,
     cloud_logged_in: None,
 ) -> AsyncGenerator[None]:
-    """Set up cloud integration."""
+    """Set up cloud and backup integrations."""
+    async_initialize_backup(hass)
     with (
         patch("homeassistant.components.backup.is_hassio", return_value=False),
         patch("homeassistant.components.backup.store.STORE_DELAY_SAVE", 0),
@@ -55,49 +67,6 @@ def mock_delete_file() -> Generator[MagicMock]:
         yield delete_file
 
 
-@pytest.fixture
-def mock_get_download_details() -> Generator[MagicMock]:
-    """Mock list files."""
-    with patch(
-        "homeassistant.components.cloud.backup.async_files_download_details",
-        spec_set=True,
-    ) as download_details:
-        download_details.return_value = {
-            "url": (
-                "https://blabla.cloudflarestorage.com/blabla/backup/"
-                "462e16810d6841228828d9dd2f9e341e.tar?X-Amz-Algorithm=blah"
-            ),
-        }
-        yield download_details
-
-
-@pytest.fixture
-def mock_get_upload_details() -> Generator[MagicMock]:
-    """Mock list files."""
-    with patch(
-        "homeassistant.components.cloud.backup.async_files_upload_details",
-        spec_set=True,
-    ) as download_details:
-        download_details.return_value = {
-            "url": (
-                "https://blabla.cloudflarestorage.com/blabla/backup/"
-                "ea5c969e492c49df89d432a1483b8dc3.tar?X-Amz-Algorithm=blah"
-            ),
-            "headers": {
-                "content-md5": "HOhSM3WZkpHRYGiz4YRGIQ==",
-                "x-amz-meta-storage-type": "backup",
-                "x-amz-meta-b64json": (
-                    "eyJhZGRvbnMiOltdLCJiYWNrdXBfaWQiOiJjNDNiNWU2MCIsImRhdGUiOiIyMDI0LT"
-                    "EyLTAzVDA0OjI1OjUwLjMyMDcwMy0wNTowMCIsImRhdGFiYXNlX2luY2x1ZGVkIjpm"
-                    "YWxzZSwiZm9sZGVycyI6W10sImhvbWVhc3Npc3RhbnRfaW5jbHVkZWQiOnRydWUsIm"
-                    "hvbWVhc3Npc3RhbnRfdmVyc2lvbiI6IjIwMjQuMTIuMC5kZXYwIiwibmFtZSI6ImVy"
-                    "aWsiLCJwcm90ZWN0ZWQiOnRydWUsInNpemUiOjM1NjI0OTYwfQ=="
-                ),
-            },
-        }
-        yield download_details
-
-
 @pytest.fixture
 def mock_list_files() -> Generator[MagicMock]:
     """Mock list files."""
@@ -123,7 +92,26 @@ def mock_list_files() -> Generator[MagicMock]:
                     "size": 34519040,
                     "storage-type": "backup",
                 },
-            }
+            },
+            {
+                "Key": "462e16810d6841228828d9dd2f9e341f.tar",
+                "LastModified": "2024-11-22T10:49:01.182Z",
+                "Size": 34519040,
+                "Metadata": {
+                    "addons": [],
+                    "backup_id": "23e64aed",
+                    "date": "2024-11-22T11:48:48.727189+01:00",
+                    "database_included": True,
+                    "extra_metadata": {},
+                    "folders": [],
+                    "homeassistant_included": True,
+                    "homeassistant_version": "2024.12.0.dev0",
+                    "name": "Core 2024.12.0.dev0",
+                    "protected": False,
+                    "size": 34519040,
+                    "storage-type": "backup",
+                },
+            },
         ]
         yield list_files
 
@@ -146,7 +134,10 @@ async def test_agents_info(
 
     assert response["success"]
     assert response["result"] == {
-        "agents": [{"agent_id": "backup.local"}, {"agent_id": "cloud.cloud"}],
+        "agents": [
+            {"agent_id": "backup.local", "name": "local"},
+            {"agent_id": "cloud.cloud", "name": "cloud"},
+        ],
     }
 
 
@@ -167,19 +158,32 @@ async def test_agents_list_backups(
     assert response["result"]["backups"] == [
         {
             "addons": [],
+            "agents": {"cloud.cloud": {"protected": False, "size": 34519040}},
             "backup_id": "23e64aec",
             "date": "2024-11-22T11:48:48.727189+01:00",
             "database_included": True,
+            "extra_metadata": {},
             "folders": [],
             "homeassistant_included": True,
             "homeassistant_version": "2024.12.0.dev0",
             "name": "Core 2024.12.0.dev0",
-            "protected": False,
-            "size": 34519040,
-            "agent_ids": ["cloud.cloud"],
             "failed_agent_ids": [],
             "with_automatic_settings": None,
-        }
+        },
+        {
+            "addons": [],
+            "agents": {"cloud.cloud": {"protected": False, "size": 34519040}},
+            "backup_id": "23e64aed",
+            "date": "2024-11-22T11:48:48.727189+01:00",
+            "database_included": True,
+            "extra_metadata": {},
+            "folders": [],
+            "homeassistant_included": True,
+            "homeassistant_version": "2024.12.0.dev0",
+            "name": "Core 2024.12.0.dev0",
+            "failed_agent_ids": [],
+            "with_automatic_settings": None,
+        },
     ]
 
 
@@ -204,8 +208,10 @@ async def test_agents_list_backups_fail_cloud(
         "backups": [],
         "last_attempted_automatic_backup": None,
         "last_completed_automatic_backup": None,
+        "last_action_event": None,
         "next_automatic_backup": None,
         "next_automatic_backup_additional": False,
+        "state": "idle",
     }
 
 
@@ -216,16 +222,15 @@ async def test_agents_list_backups_fail_cloud(
             "23e64aec",
             {
                 "addons": [],
+                "agents": {"cloud.cloud": {"protected": False, "size": 34519040}},
                 "backup_id": "23e64aec",
                 "date": "2024-11-22T11:48:48.727189+01:00",
                 "database_included": True,
+                "extra_metadata": {},
                 "folders": [],
                 "homeassistant_included": True,
                 "homeassistant_version": "2024.12.0.dev0",
                 "name": "Core 2024.12.0.dev0",
-                "protected": False,
-                "size": 34519040,
-                "agent_ids": ["cloud.cloud"],
                 "failed_agent_ids": [],
                 "with_automatic_settings": None,
             },
@@ -261,52 +266,34 @@ async def test_agents_download(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
     aioclient_mock: AiohttpClientMocker,
-    mock_get_download_details: Mock,
+    cloud: Mock,
 ) -> None:
     """Test agent download backup."""
     client = await hass_client()
     backup_id = "23e64aec"
 
-    aioclient_mock.get(
-        mock_get_download_details.return_value["url"], content=b"backup data"
-    )
+    cloud.files.download.return_value = MockStreamReaderChunked(b"backup data")
 
     resp = await client.get(f"/api/backup/download/{backup_id}?agent_id=cloud.cloud")
     assert resp.status == 200
     assert await resp.content.read() == b"backup data"
-
-
-@pytest.mark.parametrize("side_effect", [ClientError, CloudError])
-@pytest.mark.usefixtures("cloud_logged_in", "mock_list_files")
-async def test_agents_download_fail_cloud(
-    hass: HomeAssistant,
-    hass_client: ClientSessionGenerator,
-    mock_get_download_details: Mock,
-    side_effect: Exception,
-) -> None:
-    """Test agent download backup, when cloud user is logged in."""
-    client = await hass_client()
-    backup_id = "23e64aec"
-    mock_get_download_details.side_effect = side_effect
-
-    resp = await client.get(f"/api/backup/download/{backup_id}?agent_id=cloud.cloud")
-    assert resp.status == 500
-    content = await resp.content.read()
-    assert "Failed to get download details" in content.decode()
+    cloud.files.download.assert_called_once_with(
+        filename="462e16810d6841228828d9dd2f9e341e.tar",
+        storage_type=StorageType.BACKUP,
+    )
 
 
 @pytest.mark.usefixtures("cloud_logged_in", "mock_list_files")
 async def test_agents_download_fail_get(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
-    aioclient_mock: AiohttpClientMocker,
-    mock_get_download_details: Mock,
+    cloud: Mock,
 ) -> None:
     """Test agent download backup, when cloud user is logged in."""
     client = await hass_client()
     backup_id = "23e64aec"
 
-    aioclient_mock.get(mock_get_download_details.return_value["url"], status=500)
+    cloud.files.download.side_effect = FilesError("Oh no :(")
 
     resp = await client.get(f"/api/backup/download/{backup_id}?agent_id=cloud.cloud")
     assert resp.status == 500
@@ -333,11 +320,11 @@ async def test_agents_upload(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
     caplog: pytest.LogCaptureFixture,
-    aioclient_mock: AiohttpClientMocker,
-    mock_get_upload_details: Mock,
+    cloud: Mock,
 ) -> None:
     """Test agent upload backup."""
     client = await hass_client()
+    backup_data = "test"
     backup_id = "test-backup"
     test_backup = AgentBackup(
         addons=[AddonInfo(name="Test", slug="test", version="1.0.0")],
@@ -350,10 +337,8 @@ async def test_agents_upload(
         homeassistant_version="2024.12.0",
         name="Test",
         protected=True,
-        size=0,
+        size=len(backup_data),
     )
-    aioclient_mock.put(mock_get_upload_details.return_value["url"])
-
     with (
         patch(
             "homeassistant.components.backup.manager.BackupManager.async_get_backup",
@@ -364,37 +349,41 @@ async def test_agents_upload(
         ),
         patch("pathlib.Path.open") as mocked_open,
     ):
-        mocked_open.return_value.read = Mock(side_effect=[b"test", b""])
+        mocked_open.return_value.read = Mock(side_effect=[backup_data.encode(), b""])
         fetch_backup.return_value = test_backup
         resp = await client.post(
             "/api/backup/upload?agent_id=cloud.cloud",
-            data={"file": StringIO("test")},
+            data={"file": StringIO(backup_data)},
         )
 
-    assert len(aioclient_mock.mock_calls) == 1
-    assert aioclient_mock.mock_calls[-1][0] == "PUT"
-    assert aioclient_mock.mock_calls[-1][1] == URL(
-        mock_get_upload_details.return_value["url"]
+    cloud.files.upload.assert_called_once_with(
+        storage_type=StorageType.BACKUP,
+        open_stream=ANY,
+        filename=f"{cloud.client.prefs.instance_id}.tar",
+        base64md5hash=ANY,
+        metadata=ANY,
+        size=ANY,
     )
-    assert isinstance(aioclient_mock.mock_calls[-1][2], AsyncIterator)
+    metadata = cloud.files.upload.mock_calls[-1].kwargs["metadata"]
+    assert metadata["backup_id"] == backup_id
 
     assert resp.status == 201
     assert f"Uploading backup {backup_id}" in caplog.text
 
 
-@pytest.mark.parametrize("put_mock_kwargs", [{"status": 500}, {"exc": TimeoutError}])
+@pytest.mark.parametrize("side_effect", [FilesError("Boom!"), CloudError("Boom!")])
 @pytest.mark.usefixtures("cloud_logged_in", "mock_list_files")
-async def test_agents_upload_fail_put(
+async def test_agents_upload_fail(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
     hass_storage: dict[str, Any],
-    aioclient_mock: AiohttpClientMocker,
-    mock_get_upload_details: Mock,
-    put_mock_kwargs: dict[str, Any],
+    side_effect: Exception,
+    cloud: Mock,
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test agent upload backup fails."""
     client = await hass_client()
+    backup_data = "test"
     backup_id = "test-backup"
     test_backup = AgentBackup(
         addons=[AddonInfo(name="Test", slug="test", version="1.0.0")],
@@ -407,9 +396,10 @@ async def test_agents_upload_fail_put(
         homeassistant_version="2024.12.0",
         name="Test",
         protected=True,
-        size=0,
+        size=len(backup_data),
     )
-    aioclient_mock.put(mock_get_upload_details.return_value["url"], **put_mock_kwargs)
+
+    cloud.files.upload.side_effect = side_effect
 
     with (
         patch(
@@ -424,17 +414,17 @@ async def test_agents_upload_fail_put(
         patch("homeassistant.components.cloud.backup.random.randint", return_value=60),
         patch("homeassistant.components.cloud.backup._RETRY_LIMIT", 2),
     ):
-        mocked_open.return_value.read = Mock(side_effect=[b"test", b""])
+        mocked_open.return_value.read = Mock(side_effect=[backup_data.encode(), b""])
         fetch_backup.return_value = test_backup
         resp = await client.post(
             "/api/backup/upload?agent_id=cloud.cloud",
-            data={"file": StringIO("test")},
+            data={"file": StringIO(backup_data)},
         )
         await hass.async_block_till_done()
 
-    assert len(aioclient_mock.mock_calls) == 2
     assert "Failed to upload backup, retrying (2/2) in 60s" in caplog.text
     assert resp.status == 201
+    assert cloud.files.upload.call_count == 2
     store_backups = hass_storage[BACKUP_DOMAIN]["data"]["backups"]
     assert len(store_backups) == 1
     stored_backup = store_backups[0]
@@ -442,19 +432,33 @@ async def test_agents_upload_fail_put(
     assert stored_backup["failed_agent_ids"] == ["cloud.cloud"]
 
 
-@pytest.mark.parametrize("side_effect", [ClientError, CloudError])
-@pytest.mark.usefixtures("cloud_logged_in")
-async def test_agents_upload_fail_cloud(
+@pytest.mark.parametrize(
+    ("side_effect", "logmsg"),
+    [
+        (
+            CloudApiNonRetryableError("Boom!", code="NC-SH-FH-03"),
+            "The backup size of 13.37GB is too large to be uploaded to Home Assistant Cloud",
+        ),
+        (
+            CloudApiNonRetryableError("Boom!", code="NC-CE-01"),
+            "Failed to upload backup Boom!",
+        ),
+    ],
+)
+@pytest.mark.usefixtures("cloud_logged_in", "mock_list_files")
+async def test_agents_upload_fail_non_retryable(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
     hass_storage: dict[str, Any],
-    mock_get_upload_details: Mock,
     side_effect: Exception,
+    logmsg: str,
+    cloud: Mock,
+    caplog: pytest.LogCaptureFixture,
 ) -> None:
-    """Test agent upload backup, when cloud user is logged in."""
+    """Test agent upload backup fails with non-retryable error."""
     client = await hass_client()
+    backup_data = "test"
     backup_id = "test-backup"
-    mock_get_upload_details.side_effect = side_effect
     test_backup = AgentBackup(
         addons=[AddonInfo(name="Test", slug="test", version="1.0.0")],
         backup_id=backup_id,
@@ -466,8 +470,11 @@ async def test_agents_upload_fail_cloud(
         homeassistant_version="2024.12.0",
         name="Test",
         protected=True,
-        size=0,
+        size=14358124749,
     )
+
+    cloud.files.upload.side_effect = side_effect
+
     with (
         patch(
             "homeassistant.components.backup.manager.BackupManager.async_get_backup",
@@ -477,17 +484,19 @@ async def test_agents_upload_fail_cloud(
             return_value=test_backup,
         ),
         patch("pathlib.Path.open") as mocked_open,
-        patch("homeassistant.components.cloud.backup.asyncio.sleep"),
+        patch("homeassistant.components.cloud.backup.calculate_b64md5"),
     ):
-        mocked_open.return_value.read = Mock(side_effect=[b"test", b""])
+        mocked_open.return_value.read = Mock(side_effect=[backup_data.encode(), b""])
         fetch_backup.return_value = test_backup
         resp = await client.post(
             "/api/backup/upload?agent_id=cloud.cloud",
-            data={"file": StringIO("test")},
+            data={"file": StringIO(backup_data)},
         )
         await hass.async_block_till_done()
 
+    assert logmsg in caplog.text
     assert resp.status == 201
+    assert cloud.files.upload.call_count == 1
     store_backups = hass_storage[BACKUP_DOMAIN]["data"]["backups"]
     assert len(store_backups) == 1
     stored_backup = store_backups[0]
@@ -502,6 +511,7 @@ async def test_agents_upload_not_protected(
 ) -> None:
     """Test agent upload backup, when cloud user is logged in."""
     client = await hass_client()
+    backup_data = "test"
     backup_id = "test-backup"
     test_backup = AgentBackup(
         addons=[AddonInfo(name="Test", slug="test", version="1.0.0")],
@@ -514,7 +524,7 @@ async def test_agents_upload_not_protected(
         homeassistant_version="2024.12.0",
         name="Test",
         protected=False,
-        size=0,
+        size=len(backup_data),
     )
     with (
         patch("pathlib.Path.open"),
@@ -525,7 +535,7 @@ async def test_agents_upload_not_protected(
     ):
         resp = await client.post(
             "/api/backup/upload?agent_id=cloud.cloud",
-            data={"file": StringIO("test")},
+            data={"file": StringIO(backup_data)},
         )
         await hass.async_block_till_done()
 
@@ -537,10 +547,172 @@ async def test_agents_upload_not_protected(
     assert stored_backup["failed_agent_ids"] == ["cloud.cloud"]
 
 
+@pytest.mark.usefixtures("cloud_logged_in", "mock_list_files")
+async def test_agents_upload_not_subscribed(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    hass_storage: dict[str, Any],
+    cloud: Mock,
+) -> None:
+    """Test upload backup when cloud user is not subscribed."""
+    cloud.subscription_expired = True
+    client = await hass_client()
+    backup_data = "test"
+    backup_id = "test-backup"
+    test_backup = AgentBackup(
+        addons=[AddonInfo(name="Test", slug="test", version="1.0.0")],
+        backup_id=backup_id,
+        database_included=True,
+        date="1970-01-01T00:00:00.000Z",
+        extra_metadata={},
+        folders=[Folder.MEDIA, Folder.SHARE],
+        homeassistant_included=True,
+        homeassistant_version="2024.12.0",
+        name="Test",
+        protected=True,
+        size=len(backup_data),
+    )
+
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_get_backup",
+        ) as fetch_backup,
+        patch(
+            "homeassistant.components.backup.manager.read_backup",
+            return_value=test_backup,
+        ),
+        patch("pathlib.Path.open") as mocked_open,
+    ):
+        mocked_open.return_value.read = Mock(side_effect=[backup_data.encode(), b""])
+        fetch_backup.return_value = test_backup
+        resp = await client.post(
+            "/api/backup/upload?agent_id=cloud.cloud",
+            data={"file": StringIO(backup_data)},
+        )
+        await hass.async_block_till_done()
+
+    assert resp.status == 201
+    assert cloud.files.upload.call_count == 0
+    store_backups = hass_storage[BACKUP_DOMAIN]["data"]["backups"]
+    assert len(store_backups) == 1
+    stored_backup = store_backups[0]
+    assert stored_backup["backup_id"] == backup_id
+    assert stored_backup["failed_agent_ids"] == ["cloud.cloud"]
+
+
+@pytest.mark.usefixtures("cloud_logged_in", "mock_list_files")
+async def test_agents_upload_not_subscribed_midway(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    hass_storage: dict[str, Any],
+    cloud: Mock,
+) -> None:
+    """Test upload backup when cloud subscription expires during the call."""
+    client = await hass_client()
+    backup_data = "test"
+    backup_id = "test-backup"
+    test_backup = AgentBackup(
+        addons=[AddonInfo(name="Test", slug="test", version="1.0.0")],
+        backup_id=backup_id,
+        database_included=True,
+        date="1970-01-01T00:00:00.000Z",
+        extra_metadata={},
+        folders=[Folder.MEDIA, Folder.SHARE],
+        homeassistant_included=True,
+        homeassistant_version="2024.12.0",
+        name="Test",
+        protected=True,
+        size=len(backup_data),
+    )
+
+    async def mock_upload(*args: Any, **kwargs: Any) -> None:
+        """Mock file upload."""
+        cloud.subscription_expired = True
+        raise CloudApiError(
+            "Boom!", orig_exc=ClientResponseError(Mock(), Mock(), status=403)
+        )
+
+    cloud.files.upload.side_effect = mock_upload
+
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_get_backup",
+        ) as fetch_backup,
+        patch(
+            "homeassistant.components.backup.manager.read_backup",
+            return_value=test_backup,
+        ),
+        patch("pathlib.Path.open") as mocked_open,
+    ):
+        mocked_open.return_value.read = Mock(side_effect=[backup_data.encode(), b""])
+        fetch_backup.return_value = test_backup
+        resp = await client.post(
+            "/api/backup/upload?agent_id=cloud.cloud",
+            data={"file": StringIO(backup_data)},
+        )
+        await hass.async_block_till_done()
+
+    assert resp.status == 201
+    assert cloud.files.upload.call_count == 1
+    store_backups = hass_storage[BACKUP_DOMAIN]["data"]["backups"]
+    assert len(store_backups) == 1
+    stored_backup = store_backups[0]
+    assert stored_backup["backup_id"] == backup_id
+    assert stored_backup["failed_agent_ids"] == ["cloud.cloud"]
+
+
+@pytest.mark.usefixtures("cloud_logged_in", "mock_list_files")
+async def test_agents_upload_wrong_size(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    caplog: pytest.LogCaptureFixture,
+    cloud: Mock,
+) -> None:
+    """Test agent upload backup with the wrong size."""
+    client = await hass_client()
+    backup_data = "test"
+    backup_id = "test-backup"
+    test_backup = AgentBackup(
+        addons=[AddonInfo(name="Test", slug="test", version="1.0.0")],
+        backup_id=backup_id,
+        database_included=True,
+        date="1970-01-01T00:00:00.000Z",
+        extra_metadata={},
+        folders=[Folder.MEDIA, Folder.SHARE],
+        homeassistant_included=True,
+        homeassistant_version="2024.12.0",
+        name="Test",
+        protected=True,
+        size=len(backup_data) - 1,
+    )
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_get_backup",
+        ) as fetch_backup,
+        patch(
+            "homeassistant.components.backup.manager.read_backup",
+            return_value=test_backup,
+        ),
+        patch("pathlib.Path.open") as mocked_open,
+    ):
+        mocked_open.return_value.read = Mock(side_effect=[backup_data.encode(), b""])
+        fetch_backup.return_value = test_backup
+        resp = await client.post(
+            "/api/backup/upload?agent_id=cloud.cloud",
+            data={"file": StringIO(backup_data)},
+        )
+
+    assert len(cloud.files.upload.mock_calls) == 0
+
+    assert resp.status == 201
+    assert "Upload failed for cloud.cloud" in caplog.text
+
+
 @pytest.mark.usefixtures("cloud_logged_in", "mock_list_files")
 async def test_agents_delete(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
+    cloud: Mock,
     mock_delete_file: Mock,
 ) -> None:
     """Test agent delete backup."""
@@ -557,7 +729,11 @@ async def test_agents_delete(
 
     assert response["success"]
     assert response["result"] == {"agent_errors": {}}
-    mock_delete_file.assert_called_once()
+    mock_delete_file.assert_called_once_with(
+        cloud,
+        filename="462e16810d6841228828d9dd2f9e341e.tar",
+        storage_type=StorageType.BACKUP,
+    )
 
 
 @pytest.mark.parametrize("side_effect", [ClientError, CloudError])
diff --git a/tests/components/cloud/test_http_api.py b/tests/components/cloud/test_http_api.py
index 910fa03d46c..81e8554ebf2 100644
--- a/tests/components/cloud/test_http_api.py
+++ b/tests/components/cloud/test_http_api.py
@@ -1,13 +1,17 @@
 """Tests for the HTTP API for the cloud component."""
 
+from collections.abc import Callable, Coroutine
 from copy import deepcopy
+import datetime
 from http import HTTPStatus
 import json
+import logging
 from typing import Any
-from unittest.mock import AsyncMock, MagicMock, Mock, patch
+from unittest.mock import AsyncMock, MagicMock, Mock, PropertyMock, patch
 
 import aiohttp
-from hass_nabucasa import thingtalk
+from freezegun.api import FrozenDateTimeFactory
+from hass_nabucasa import AlreadyConnectedError, thingtalk
 from hass_nabucasa.auth import (
     InvalidTotpCode,
     MFARequired,
@@ -15,9 +19,12 @@ from hass_nabucasa.auth import (
     UnknownError,
 )
 from hass_nabucasa.const import STATE_CONNECTED
+from hass_nabucasa.remote import CertificateStatus
 from hass_nabucasa.voice import TTS_VOICES
 import pytest
+from syrupy.assertion import SnapshotAssertion
 
+from homeassistant.components import system_health
 from homeassistant.components.alexa import errors as alexa_errors
 
 # pylint: disable-next=hass-component-root-import
@@ -30,8 +37,10 @@ from homeassistant.components.websocket_api import ERR_INVALID_FORMAT
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
+from homeassistant.util import dt as dt_util
 from homeassistant.util.location import LocationInfo
 
+from tests.common import mock_platform
 from tests.components.google_assistant import MockConfig
 from tests.test_util.aiohttp import AiohttpClientMocker
 from tests.typing import ClientSessionGenerator, WebSocketGenerator
@@ -113,6 +122,7 @@ async def setup_cloud_fixture(hass: HomeAssistant, cloud: MagicMock) -> None:
                 "user_pool_id": "user_pool_id",
                 "region": "region",
                 "relayer_server": "relayer",
+                "acme_server": "cert-server",
                 "accounts_server": "api-test.hass.io",
                 "google_actions": {"filter": {"include_domains": "light"}},
                 "alexa": {
@@ -363,9 +373,40 @@ async def test_login_view_request_timeout(
         "/api/cloud/login", json={"email": "my_username", "password": "my_password"}
     )
 
+    assert cloud.login.call_args[1]["check_connection"] is False
+
     assert req.status == HTTPStatus.BAD_GATEWAY
 
 
+async def test_login_view_with_already_existing_connection(
+    cloud: MagicMock,
+    setup_cloud: None,
+    hass_client: ClientSessionGenerator,
+) -> None:
+    """Test request timeout while trying to log in."""
+    cloud_client = await hass_client()
+    cloud.login.side_effect = AlreadyConnectedError(
+        details={"remote_ip_address": "127.0.0.1", "connected_at": "1"}
+    )
+
+    req = await cloud_client.post(
+        "/api/cloud/login",
+        json={
+            "email": "my_username",
+            "password": "my_password",
+            "check_connection": True,
+        },
+    )
+
+    assert cloud.login.call_args[1]["check_connection"] is True
+    assert req.status == HTTPStatus.CONFLICT
+    resp = await req.json()
+    assert resp == {
+        "code": "alreadyconnectederror",
+        "message": '{"remote_ip_address": "127.0.0.1", "connected_at": "1"}',
+    }
+
+
 async def test_login_view_invalid_credentials(
     cloud: MagicMock,
     setup_cloud: None,
@@ -1860,3 +1901,112 @@ async def test_logout_view_dispatch_event(
     assert async_dispatcher_send_mock.call_count == 1
     assert async_dispatcher_send_mock.mock_calls[0][1][1] == "cloud_event"
     assert async_dispatcher_send_mock.mock_calls[0][1][2] == {"type": "logout"}
+
+
+@patch("homeassistant.components.cloud.helpers.FixedSizeQueueLogHandler.MAX_RECORDS", 3)
+async def test_download_support_package(
+    hass: HomeAssistant,
+    cloud: MagicMock,
+    set_cloud_prefs: Callable[[dict[str, Any]], Coroutine[Any, Any, None]],
+    hass_client: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    freezer: FrozenDateTimeFactory,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test downloading a support package file."""
+
+    aioclient_mock.get("https://cloud.bla.com/status", text="")
+    aioclient_mock.get(
+        "https://cert-server/directory", exc=Exception("Unexpected exception")
+    )
+    aioclient_mock.get(
+        "https://cognito-idp.us-east-1.amazonaws.com/AAAA/.well-known/jwks.json",
+        exc=aiohttp.ClientError,
+    )
+
+    def async_register_mock_platform(
+        hass: HomeAssistant, register: system_health.SystemHealthRegistration
+    ) -> None:
+        async def mock_empty_info(hass: HomeAssistant) -> dict[str, Any]:
+            return {}
+
+        register.async_register_info(mock_empty_info, "/config/mock_integration")
+
+    mock_platform(
+        hass,
+        "mock_no_info_integration.system_health",
+        MagicMock(async_register=async_register_mock_platform),
+    )
+    hass.config.components.add("mock_no_info_integration")
+
+    assert await async_setup_component(hass, "system_health", {})
+
+    with patch("uuid.UUID.hex", new_callable=PropertyMock) as hexmock:
+        hexmock.return_value = "12345678901234567890"
+        assert await async_setup_component(
+            hass,
+            DOMAIN,
+            {
+                DOMAIN: {
+                    "user_pool_id": "AAAA",
+                    "region": "us-east-1",
+                    "acme_server": "cert-server",
+                    "relayer_server": "cloud.bla.com",
+                },
+            },
+        )
+        await hass.async_block_till_done()
+
+    await cloud.login("test-user", "test-pass")
+
+    cloud.remote.snitun_server = "us-west-1"
+    cloud.remote.certificate_status = CertificateStatus.READY
+    cloud.expiration_date = dt_util.parse_datetime("2025-01-17T11:19:31.0+00:00")
+
+    await cloud.client.async_system_message({"region": "xx-earth-616"})
+    await set_cloud_prefs(
+        {
+            "alexa_enabled": True,
+            "google_enabled": False,
+            "remote_enabled": True,
+            "cloud_ice_servers_enabled": True,
+        }
+    )
+
+    now = dt_util.utcnow()
+    # The logging is done with local time according to the system timezone. Set the
+    # fake time to 12:00 local time
+    tz = now.astimezone().tzinfo
+    freezer.move_to(datetime.datetime(2025, 2, 10, 12, 0, 0, tzinfo=tz))
+    logging.getLogger("hass_nabucasa.iot").info(
+        "This message will be dropped since this test patches MAX_RECORDS"
+    )
+    logging.getLogger("hass_nabucasa.iot").info("Hass nabucasa log")
+    logging.getLogger("snitun.utils.aiohttp_client").warning("Snitun log")
+    logging.getLogger("homeassistant.components.cloud.client").error("Cloud log")
+    freezer.move_to(now)  # Reset time otherwise hass_client auth fails
+
+    cloud_client = await hass_client()
+    with (
+        patch.object(hass.config, "config_dir", new="config"),
+        patch(
+            "homeassistant.components.homeassistant.system_health.system_info.async_get_system_info",
+            return_value={
+                "installation_type": "Home Assistant Core",
+                "version": "2025.2.0",
+                "dev": False,
+                "hassio": False,
+                "virtualenv": False,
+                "python_version": "3.13.1",
+                "docker": False,
+                "arch": "x86_64",
+                "timezone": "US/Pacific",
+                "os_name": "Linux",
+                "os_version": "6.12.9",
+                "user": "hass",
+            },
+        ),
+    ):
+        req = await cloud_client.get("/api/cloud/support_package")
+    assert req.status == HTTPStatus.OK
+    assert await req.text() == snapshot
diff --git a/tests/components/cloud/test_repairs.py b/tests/components/cloud/test_repairs.py
index d165a129dbe..d131d211e2f 100644
--- a/tests/components/cloud/test_repairs.py
+++ b/tests/components/cloud/test_repairs.py
@@ -12,7 +12,7 @@ from homeassistant.components.cloud.repairs import (
 )
 from homeassistant.components.repairs import DOMAIN as REPAIRS_DOMAIN
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.issue_registry as ir
+from homeassistant.helpers import issue_registry as ir
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
 
diff --git a/tests/components/cloud/test_tts.py b/tests/components/cloud/test_tts.py
index bf9fd7302ae..81b10866dff 100644
--- a/tests/components/cloud/test_tts.py
+++ b/tests/components/cloud/test_tts.py
@@ -12,7 +12,12 @@ import voluptuous as vol
 
 from homeassistant.components.assist_pipeline.pipeline import STORAGE_KEY
 from homeassistant.components.cloud.const import DEFAULT_TTS_DEFAULT_VOICE, DOMAIN
-from homeassistant.components.cloud.tts import PLATFORM_SCHEMA, SUPPORT_LANGUAGES, Voice
+from homeassistant.components.cloud.tts import (
+    DEFAULT_VOICES,
+    PLATFORM_SCHEMA,
+    SUPPORT_LANGUAGES,
+    Voice,
+)
 from homeassistant.components.media_player import (
     ATTR_MEDIA_CONTENT_ID,
     DOMAIN as DOMAIN_MP,
@@ -61,6 +66,19 @@ def test_default_exists() -> None:
     assert DEFAULT_TTS_DEFAULT_VOICE[1] in TTS_VOICES[DEFAULT_TTS_DEFAULT_VOICE[0]]
 
 
+def test_all_languages_have_default() -> None:
+    """Test all languages have a default voice."""
+    assert set(SUPPORT_LANGUAGES).difference(DEFAULT_VOICES) == set()
+    assert set(DEFAULT_VOICES).difference(SUPPORT_LANGUAGES) == set()
+
+
+@pytest.mark.parametrize(("language", "voice"), DEFAULT_VOICES.items())
+def test_default_voice_is_valid(language: str, voice: str) -> None:
+    """Test that the default voice is valid."""
+    assert language in TTS_VOICES
+    assert voice in TTS_VOICES[language]
+
+
 def test_schema() -> None:
     """Test schema."""
     assert "nl-NL" in SUPPORT_LANGUAGES
diff --git a/tests/components/cloudflare/test_init.py b/tests/components/cloudflare/test_init.py
index d629607e503..15a6c5740ff 100644
--- a/tests/components/cloudflare/test_init.py
+++ b/tests/components/cloudflare/test_init.py
@@ -15,7 +15,7 @@ from homeassistant.components.cloudflare.const import (
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntryState
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.location import LocationInfo
 
 from . import ENTRY_CONFIG, init_integration
diff --git a/tests/components/co2signal/snapshots/test_diagnostics.ambr b/tests/components/co2signal/snapshots/test_diagnostics.ambr
index 9218e7343ec..4159c8ec1a1 100644
--- a/tests/components/co2signal/snapshots/test_diagnostics.ambr
+++ b/tests/components/co2signal/snapshots/test_diagnostics.ambr
@@ -17,6 +17,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': None,
       'version': 1,
diff --git a/tests/components/co2signal/snapshots/test_sensor.ambr b/tests/components/co2signal/snapshots/test_sensor.ambr
index 3702521e4c3..1e241735102 100644
--- a/tests/components/co2signal/snapshots/test_sensor.ambr
+++ b/tests/components/co2signal/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -60,6 +61,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/coinbase/snapshots/test_diagnostics.ambr b/tests/components/coinbase/snapshots/test_diagnostics.ambr
index 51bd946f140..3eab18fb9f3 100644
--- a/tests/components/coinbase/snapshots/test_diagnostics.ambr
+++ b/tests/components/coinbase/snapshots/test_diagnostics.ambr
@@ -44,6 +44,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': '**REDACTED**',
       'unique_id': None,
       'version': 1,
diff --git a/tests/components/color_extractor/test_service.py b/tests/components/color_extractor/test_service.py
index 23ba5e7808c..3f920b7dee2 100644
--- a/tests/components/color_extractor/test_service.py
+++ b/tests/components/color_extractor/test_service.py
@@ -25,7 +25,7 @@ from homeassistant.components.light import (
 from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.color as color_util
+from homeassistant.util import color as color_util
 
 from tests.common import load_fixture
 from tests.test_util.aiohttp import AiohttpClientMocker
diff --git a/tests/components/comelit/__init__.py b/tests/components/comelit/__init__.py
index 916a684de4b..6475f500f01 100644
--- a/tests/components/comelit/__init__.py
+++ b/tests/components/comelit/__init__.py
@@ -1 +1,13 @@
 """Tests for the Comelit SimpleHome integration."""
+
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+async def setup_integration(hass: HomeAssistant, config_entry: MockConfigEntry) -> None:
+    """Fixture for setting up the component."""
+    config_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
diff --git a/tests/components/comelit/conftest.py b/tests/components/comelit/conftest.py
new file mode 100644
index 00000000000..d2d450ccb8d
--- /dev/null
+++ b/tests/components/comelit/conftest.py
@@ -0,0 +1,104 @@
+"""Configure tests for Comelit SimpleHome."""
+
+import pytest
+
+from homeassistant.components.comelit.const import (
+    BRIDGE,
+    DOMAIN as COMELIT_DOMAIN,
+    VEDO,
+)
+from homeassistant.const import CONF_HOST, CONF_PIN, CONF_PORT, CONF_TYPE
+
+from .const import (
+    BRIDGE_DEVICE_QUERY,
+    BRIDGE_HOST,
+    BRIDGE_PIN,
+    BRIDGE_PORT,
+    VEDO_DEVICE_QUERY,
+    VEDO_HOST,
+    VEDO_PIN,
+    VEDO_PORT,
+)
+
+from tests.common import AsyncMock, Generator, MockConfigEntry, patch
+
+
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.comelit.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
+@pytest.fixture
+def mock_serial_bridge() -> Generator[AsyncMock]:
+    """Mock a Comelit serial bridge."""
+    with (
+        patch(
+            "homeassistant.components.comelit.coordinator.ComeliteSerialBridgeApi",
+            autospec=True,
+        ) as mock_comelit_serial_bridge,
+        patch(
+            "homeassistant.components.comelit.config_flow.ComeliteSerialBridgeApi",
+            new=mock_comelit_serial_bridge,
+        ),
+    ):
+        bridge = mock_comelit_serial_bridge.return_value
+        bridge.get_all_devices.return_value = BRIDGE_DEVICE_QUERY
+        bridge.host = BRIDGE_HOST
+        bridge.port = BRIDGE_PORT
+        bridge.pin = BRIDGE_PIN
+        yield bridge
+
+
+@pytest.fixture
+def mock_serial_bridge_config_entry() -> Generator[MockConfigEntry]:
+    """Mock a Comelit config entry for Comelit bridge."""
+    return MockConfigEntry(
+        domain=COMELIT_DOMAIN,
+        data={
+            CONF_HOST: BRIDGE_HOST,
+            CONF_PORT: BRIDGE_PORT,
+            CONF_PIN: BRIDGE_PIN,
+            CONF_TYPE: BRIDGE,
+        },
+    )
+
+
+@pytest.fixture
+def mock_vedo() -> Generator[AsyncMock]:
+    """Mock a Comelit vedo."""
+    with (
+        patch(
+            "homeassistant.components.comelit.coordinator.ComelitVedoApi",
+            autospec=True,
+        ) as mock_comelit_vedo,
+        patch(
+            "homeassistant.components.comelit.config_flow.ComelitVedoApi",
+            new=mock_comelit_vedo,
+        ),
+    ):
+        vedo = mock_comelit_vedo.return_value
+        vedo.get_all_areas_and_zones.return_value = VEDO_DEVICE_QUERY
+        vedo.host = VEDO_HOST
+        vedo.port = VEDO_PORT
+        vedo.pin = VEDO_PIN
+        vedo.type = VEDO
+        yield vedo
+
+
+@pytest.fixture
+def mock_vedo_config_entry() -> Generator[MockConfigEntry]:
+    """Mock a Comelit config entry for Comelit vedo."""
+    return MockConfigEntry(
+        domain=COMELIT_DOMAIN,
+        data={
+            CONF_HOST: VEDO_HOST,
+            CONF_PORT: VEDO_PORT,
+            CONF_PIN: VEDO_PIN,
+            CONF_TYPE: VEDO,
+        },
+    )
diff --git a/tests/components/comelit/const.py b/tests/components/comelit/const.py
index 92fdfebfa1d..f353ec97628 100644
--- a/tests/components/comelit/const.py
+++ b/tests/components/comelit/const.py
@@ -1,7 +1,11 @@
 """Common stuff for Comelit SimpleHome tests."""
 
-from aiocomelit import ComelitVedoAreaObject, ComelitVedoZoneObject
-from aiocomelit.api import ComelitSerialBridgeObject
+from aiocomelit.api import (
+    AlarmDataObject,
+    ComelitSerialBridgeObject,
+    ComelitVedoAreaObject,
+    ComelitVedoZoneObject,
+)
 from aiocomelit.const import (
     CLIMATE,
     COVER,
@@ -9,37 +13,20 @@ from aiocomelit.const import (
     LIGHT,
     OTHER,
     SCENARIO,
-    VEDO,
     WATT,
     AlarmAreaState,
     AlarmZoneState,
 )
 
-from homeassistant.components.comelit.const import DOMAIN
-from homeassistant.const import CONF_DEVICES, CONF_HOST, CONF_PIN, CONF_PORT, CONF_TYPE
+BRIDGE_HOST = "fake_bridge_host"
+BRIDGE_PORT = 80
+BRIDGE_PIN = 1234
 
-MOCK_CONFIG = {
-    DOMAIN: {
-        CONF_DEVICES: [
-            {
-                CONF_HOST: "fake_host",
-                CONF_PORT: 80,
-                CONF_PIN: 1234,
-            },
-            {
-                CONF_HOST: "fake_vedo_host",
-                CONF_PORT: 8080,
-                CONF_PIN: 1234,
-                CONF_TYPE: VEDO,
-            },
-        ]
-    }
-}
+VEDO_HOST = "fake_vedo_host"
+VEDO_PORT = 8080
+VEDO_PIN = 5678
 
-MOCK_USER_BRIDGE_DATA = MOCK_CONFIG[DOMAIN][CONF_DEVICES][0]
-MOCK_USER_VEDO_DATA = MOCK_CONFIG[DOMAIN][CONF_DEVICES][1]
-
-FAKE_PIN = 5678
+FAKE_PIN = 0000
 
 BRIDGE_DEVICE_QUERY = {
     CLIMATE: {},
@@ -76,8 +63,8 @@ BRIDGE_DEVICE_QUERY = {
     SCENARIO: {},
 }
 
-VEDO_DEVICE_QUERY = {
-    "aree": {
+VEDO_DEVICE_QUERY = AlarmDataObject(
+    alarm_areas={
         0: ComelitVedoAreaObject(
             index=0,
             name="Area0",
@@ -94,7 +81,7 @@ VEDO_DEVICE_QUERY = {
             human_status=AlarmAreaState.UNKNOWN,
         )
     },
-    "zone": {
+    alarm_zones={
         0: ComelitVedoZoneObject(
             index=0,
             name="Zone0",
@@ -103,4 +90,4 @@ VEDO_DEVICE_QUERY = {
             human_status=AlarmZoneState.REST,
         )
     },
-}
+)
diff --git a/tests/components/comelit/snapshots/test_diagnostics.ambr b/tests/components/comelit/snapshots/test_diagnostics.ambr
index 58ce74035f9..c4544f38f52 100644
--- a/tests/components/comelit/snapshots/test_diagnostics.ambr
+++ b/tests/components/comelit/snapshots/test_diagnostics.ambr
@@ -57,9 +57,10 @@
     }),
     'entry': dict({
       'data': dict({
-        'host': 'fake_host',
+        'host': 'fake_bridge_host',
         'pin': '**REDACTED**',
         'port': 80,
+        'type': 'Serial bridge',
       }),
       'disabled_by': None,
       'discovery_keys': dict({
@@ -71,6 +72,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': None,
       'version': 1,
@@ -83,7 +86,7 @@
     'device_info': dict({
       'devices': list([
         dict({
-          'aree': list([
+          'alarm_areas': list([
             dict({
               '0': dict({
                 'alarm': False,
@@ -103,7 +106,7 @@
           ]),
         }),
         dict({
-          'zone': list([
+          'alarm_zones': list([
             dict({
               '0': dict({
                 'human_status': 'rest',
@@ -135,6 +138,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': None,
       'version': 1,
diff --git a/tests/components/comelit/test_config_flow.py b/tests/components/comelit/test_config_flow.py
index eeaea0e41e9..dd1d1fb3836 100644
--- a/tests/components/comelit/test_config_flow.py
+++ b/tests/components/comelit/test_config_flow.py
@@ -1,59 +1,93 @@
 """Tests for Comelit SimpleHome config flow."""
 
-from typing import Any
-from unittest.mock import patch
+from unittest.mock import AsyncMock
 
 from aiocomelit import CannotAuthenticate, CannotConnect
+from aiocomelit.const import BRIDGE, VEDO
 import pytest
 
 from homeassistant.components.comelit.const import DOMAIN
 from homeassistant.config_entries import SOURCE_USER
-from homeassistant.const import CONF_HOST, CONF_PIN, CONF_PORT
+from homeassistant.const import CONF_HOST, CONF_PIN, CONF_PORT, CONF_TYPE
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
-from .const import FAKE_PIN, MOCK_USER_BRIDGE_DATA, MOCK_USER_VEDO_DATA
+from .const import (
+    BRIDGE_HOST,
+    BRIDGE_PIN,
+    BRIDGE_PORT,
+    FAKE_PIN,
+    VEDO_HOST,
+    VEDO_PIN,
+    VEDO_PORT,
+)
 
 from tests.common import MockConfigEntry
 
 
-@pytest.mark.parametrize(
-    ("class_api", "user_input"),
-    [
-        ("ComeliteSerialBridgeApi", MOCK_USER_BRIDGE_DATA),
-        ("ComelitVedoApi", MOCK_USER_VEDO_DATA),
-    ],
-)
-async def test_full_flow(
-    hass: HomeAssistant, class_api: str, user_input: dict[str, Any]
+async def test_flow_serial_bridge(
+    hass: HomeAssistant,
+    mock_serial_bridge: AsyncMock,
+    mock_serial_bridge_config_entry: MockConfigEntry,
 ) -> None:
     """Test starting a flow by user."""
-    with (
-        patch(
-            f"aiocomelit.api.{class_api}.login",
-        ),
-        patch(
-            f"aiocomelit.api.{class_api}.logout",
-        ),
-        patch("homeassistant.components.comelit.async_setup_entry") as mock_setup_entry,
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": SOURCE_USER}
-        )
-        assert result["type"] is FlowResultType.FORM
-        assert result["step_id"] == "user"
 
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"], user_input=user_input
-        )
-        assert result["type"] is FlowResultType.CREATE_ENTRY
-        assert result["data"][CONF_HOST] == user_input[CONF_HOST]
-        assert result["data"][CONF_PORT] == user_input[CONF_PORT]
-        assert result["data"][CONF_PIN] == user_input[CONF_PIN]
-        assert not result["result"].unique_id
-        await hass.async_block_till_done()
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
 
-    assert mock_setup_entry.called
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={
+            CONF_HOST: BRIDGE_HOST,
+            CONF_PORT: BRIDGE_PORT,
+            CONF_PIN: BRIDGE_PIN,
+        },
+    )
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["data"] == {
+        CONF_HOST: BRIDGE_HOST,
+        CONF_PORT: BRIDGE_PORT,
+        CONF_PIN: BRIDGE_PIN,
+        CONF_TYPE: BRIDGE,
+    }
+    assert not result["result"].unique_id
+    await hass.async_block_till_done()
+
+
+async def test_flow_vedo(
+    hass: HomeAssistant,
+    mock_vedo: AsyncMock,
+    mock_vedo_config_entry: MockConfigEntry,
+) -> None:
+    """Test starting a flow by user."""
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={
+            CONF_HOST: VEDO_HOST,
+            CONF_PORT: VEDO_PORT,
+            CONF_PIN: VEDO_PIN,
+            CONF_TYPE: VEDO,
+        },
+    )
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["data"] == {
+        CONF_HOST: VEDO_HOST,
+        CONF_PORT: VEDO_PORT,
+        CONF_PIN: VEDO_PIN,
+        CONF_TYPE: VEDO,
+    }
+    assert not result["result"].unique_id
+    await hass.async_block_till_done()
 
 
 @pytest.mark.parametrize(
@@ -64,7 +98,13 @@ async def test_full_flow(
         (ConnectionResetError, "unknown"),
     ],
 )
-async def test_exception_connection(hass: HomeAssistant, side_effect, error) -> None:
+async def test_exception_connection(
+    hass: HomeAssistant,
+    mock_vedo: AsyncMock,
+    mock_vedo_config_entry: MockConfigEntry,
+    side_effect,
+    error,
+) -> None:
     """Test starting a flow by user with a connection error."""
 
     result = await hass.config_entries.flow.async_init(
@@ -73,59 +113,65 @@ async def test_exception_connection(hass: HomeAssistant, side_effect, error) ->
     assert result.get("type") is FlowResultType.FORM
     assert result.get("step_id") == "user"
 
-    with (
-        patch(
-            "aiocomelit.api.ComeliteSerialBridgeApi.login",
-            side_effect=side_effect,
-        ),
-        patch(
-            "aiocomelit.api.ComeliteSerialBridgeApi.logout",
-        ),
-        patch(
-            "homeassistant.components.comelit.async_setup_entry",
-        ),
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"], user_input=MOCK_USER_BRIDGE_DATA
-        )
+    mock_vedo.login.side_effect = side_effect
 
-        assert result["type"] is FlowResultType.FORM
-        assert result["step_id"] == "user"
-        assert result["errors"] is not None
-        assert result["errors"]["base"] == error
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={
+            CONF_HOST: VEDO_HOST,
+            CONF_PORT: VEDO_PORT,
+            CONF_PIN: VEDO_PIN,
+            CONF_TYPE: VEDO,
+        },
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {"base": error}
+
+    mock_vedo.login.side_effect = None
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={
+            CONF_HOST: VEDO_HOST,
+            CONF_PORT: VEDO_PORT,
+            CONF_PIN: VEDO_PIN,
+            CONF_TYPE: VEDO,
+        },
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == VEDO_HOST
+    assert result["data"] == {
+        CONF_HOST: VEDO_HOST,
+        CONF_PORT: VEDO_PORT,
+        CONF_PIN: VEDO_PIN,
+        CONF_TYPE: VEDO,
+    }
 
 
-async def test_reauth_successful(hass: HomeAssistant) -> None:
+async def test_reauth_successful(
+    hass: HomeAssistant,
+    mock_vedo: AsyncMock,
+    mock_vedo_config_entry: MockConfigEntry,
+) -> None:
     """Test starting a reauthentication flow."""
 
-    mock_config = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_BRIDGE_DATA)
-    mock_config.add_to_hass(hass)
-    result = await mock_config.start_reauth_flow(hass)
+    mock_vedo_config_entry.add_to_hass(hass)
+    result = await mock_vedo_config_entry.start_reauth_flow(hass)
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "reauth_confirm"
 
-    with (
-        patch(
-            "aiocomelit.api.ComeliteSerialBridgeApi.login",
-        ),
-        patch(
-            "aiocomelit.api.ComeliteSerialBridgeApi.logout",
-        ),
-        patch("homeassistant.components.comelit.async_setup_entry"),
-        patch("requests.get") as mock_request_get,
-    ):
-        mock_request_get.return_value.status_code = 200
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={
+            CONF_PIN: FAKE_PIN,
+        },
+    )
 
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input={
-                CONF_PIN: FAKE_PIN,
-            },
-        )
-        await hass.async_block_till_done()
-
-        assert result["type"] is FlowResultType.ABORT
-        assert result["reason"] == "reauth_successful"
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reauth_successful"
 
 
 @pytest.mark.parametrize(
@@ -136,30 +182,40 @@ async def test_reauth_successful(hass: HomeAssistant) -> None:
         (ConnectionResetError, "unknown"),
     ],
 )
-async def test_reauth_not_successful(hass: HomeAssistant, side_effect, error) -> None:
+async def test_reauth_not_successful(
+    hass: HomeAssistant,
+    mock_vedo: AsyncMock,
+    mock_vedo_config_entry: MockConfigEntry,
+    side_effect: Exception,
+    error: str,
+) -> None:
     """Test starting a reauthentication flow but no connection found."""
-
-    mock_config = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_BRIDGE_DATA)
-    mock_config.add_to_hass(hass)
-    result = await mock_config.start_reauth_flow(hass)
+    mock_vedo_config_entry.add_to_hass(hass)
+    result = await mock_vedo_config_entry.start_reauth_flow(hass)
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "reauth_confirm"
 
-    with (
-        patch("aiocomelit.api.ComeliteSerialBridgeApi.login", side_effect=side_effect),
-        patch(
-            "aiocomelit.api.ComeliteSerialBridgeApi.logout",
-        ),
-        patch("homeassistant.components.comelit.async_setup_entry"),
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input={
-                CONF_PIN: FAKE_PIN,
-            },
-        )
+    mock_vedo.login.side_effect = side_effect
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={
+            CONF_PIN: FAKE_PIN,
+        },
+    )
 
-        assert result["type"] is FlowResultType.FORM
-        assert result["step_id"] == "reauth_confirm"
-        assert result["errors"] is not None
-        assert result["errors"]["base"] == error
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reauth_confirm"
+    assert result["errors"] == {"base": error}
+
+    mock_vedo.login.side_effect = None
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={
+            CONF_PIN: VEDO_PIN,
+        },
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reauth_successful"
+    assert mock_vedo_config_entry.data[CONF_PIN] == VEDO_PIN
diff --git a/tests/components/comelit/test_coordinator.py b/tests/components/comelit/test_coordinator.py
new file mode 100644
index 00000000000..a8ef82a7e89
--- /dev/null
+++ b/tests/components/comelit/test_coordinator.py
@@ -0,0 +1,49 @@
+"""Tests for Comelit SimpleHome coordinator."""
+
+from unittest.mock import AsyncMock
+
+from aiocomelit.exceptions import CannotAuthenticate, CannotConnect, CannotRetrieveData
+from freezegun.api import FrozenDateTimeFactory
+import pytest
+
+from homeassistant.components.comelit.const import SCAN_INTERVAL
+from homeassistant.const import STATE_OFF, STATE_UNAVAILABLE
+from homeassistant.core import HomeAssistant
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry, async_fire_time_changed
+
+
+@pytest.mark.parametrize(
+    "side_effect",
+    [
+        CannotConnect,
+        CannotRetrieveData,
+        CannotAuthenticate,
+    ],
+)
+async def test_coordinator_data_update_fails(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    mock_serial_bridge: AsyncMock,
+    mock_serial_bridge_config_entry: MockConfigEntry,
+    side_effect: Exception,
+) -> None:
+    """Test coordinator data update exceptions."""
+
+    entity_id = "light.light0"
+
+    await setup_integration(hass, mock_serial_bridge_config_entry)
+
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_OFF
+
+    mock_serial_bridge.login.side_effect = side_effect
+
+    freezer.tick(SCAN_INTERVAL)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done(wait_background_tasks=True)
+
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_UNAVAILABLE
diff --git a/tests/components/comelit/test_diagnostics.py b/tests/components/comelit/test_diagnostics.py
index 39d75af1152..cabcd0f4cac 100644
--- a/tests/components/comelit/test_diagnostics.py
+++ b/tests/components/comelit/test_diagnostics.py
@@ -2,21 +2,14 @@
 
 from __future__ import annotations
 
-from unittest.mock import patch
+from unittest.mock import AsyncMock
 
 from syrupy import SnapshotAssertion
 from syrupy.filters import props
 
-from homeassistant.components.comelit.const import DOMAIN
-from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 
-from .const import (
-    BRIDGE_DEVICE_QUERY,
-    MOCK_USER_BRIDGE_DATA,
-    MOCK_USER_VEDO_DATA,
-    VEDO_DEVICE_QUERY,
-)
+from . import setup_integration
 
 from tests.common import MockConfigEntry
 from tests.components.diagnostics import get_diagnostics_for_config_entry
@@ -25,25 +18,17 @@ from tests.typing import ClientSessionGenerator
 
 async def test_entry_diagnostics_bridge(
     hass: HomeAssistant,
+    mock_serial_bridge: AsyncMock,
+    mock_serial_bridge_config_entry: MockConfigEntry,
     hass_client: ClientSessionGenerator,
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test Bridge config entry diagnostics."""
-    entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_BRIDGE_DATA)
-    entry.add_to_hass(hass)
+    await setup_integration(hass, mock_serial_bridge_config_entry)
 
-    with (
-        patch("aiocomelit.api.ComeliteSerialBridgeApi.login"),
-        patch(
-            "aiocomelit.api.ComeliteSerialBridgeApi.get_all_devices",
-            return_value=BRIDGE_DEVICE_QUERY,
-        ),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-    assert entry.state == ConfigEntryState.LOADED
-    assert await get_diagnostics_for_config_entry(hass, hass_client, entry) == snapshot(
+    assert await get_diagnostics_for_config_entry(
+        hass, hass_client, mock_serial_bridge_config_entry
+    ) == snapshot(
         exclude=props(
             "entry_id",
             "created_at",
@@ -54,25 +39,17 @@ async def test_entry_diagnostics_bridge(
 
 async def test_entry_diagnostics_vedo(
     hass: HomeAssistant,
+    mock_vedo: AsyncMock,
+    mock_vedo_config_entry: MockConfigEntry,
     hass_client: ClientSessionGenerator,
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test Vedo System config entry diagnostics."""
-    entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_VEDO_DATA)
-    entry.add_to_hass(hass)
+    await setup_integration(hass, mock_vedo_config_entry)
 
-    with (
-        patch("aiocomelit.api.ComelitVedoApi.login"),
-        patch(
-            "aiocomelit.api.ComelitVedoApi.get_all_areas_and_zones",
-            return_value=VEDO_DEVICE_QUERY,
-        ),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-    assert entry.state == ConfigEntryState.LOADED
-    assert await get_diagnostics_for_config_entry(hass, hass_client, entry) == snapshot(
+    assert await get_diagnostics_for_config_entry(
+        hass, hass_client, mock_vedo_config_entry
+    ) == snapshot(
         exclude=props(
             "entry_id",
             "created_at",
diff --git a/tests/components/command_line/test_cover.py b/tests/components/command_line/test_cover.py
index 426968eccc5..a6e384fdd6b 100644
--- a/tests/components/command_line/test_cover.py
+++ b/tests/components/command_line/test_cover.py
@@ -32,7 +32,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import mock_asyncio_subprocess_run
 
diff --git a/tests/components/command_line/test_init.py b/tests/components/command_line/test_init.py
index 3fbd0e0f898..16a783d4f59 100644
--- a/tests/components/command_line/test_init.py
+++ b/tests/components/command_line/test_init.py
@@ -11,7 +11,7 @@ from homeassistant import config as hass_config
 from homeassistant.components.command_line.const import DOMAIN
 from homeassistant.const import SERVICE_RELOAD, STATE_ON, STATE_OPEN
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed, get_fixture_path
 
diff --git a/tests/components/command_line/test_switch.py b/tests/components/command_line/test_switch.py
index d62410fa792..6b34cf0fa77 100644
--- a/tests/components/command_line/test_switch.py
+++ b/tests/components/command_line/test_switch.py
@@ -30,7 +30,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import mock_asyncio_subprocess_run
 
diff --git a/tests/components/config/test_config_entries.py b/tests/components/config/test_config_entries.py
index ee000c5ada2..ce10a36c42c 100644
--- a/tests/components/config/test_config_entries.py
+++ b/tests/components/config/test_config_entries.py
@@ -1,8 +1,8 @@
 """Test config entries API."""
 
-from collections import OrderedDict
 from collections.abc import Generator
 from http import HTTPStatus
+from typing import Any
 from unittest.mock import ANY, AsyncMock, patch
 
 from aiohttp.test_utils import TestClient
@@ -12,12 +12,13 @@ import voluptuous as vol
 
 from homeassistant import config_entries as core_ce, data_entry_flow, loader
 from homeassistant.components.config import config_entries
-from homeassistant.config_entries import HANDLERS, ConfigFlow
+from homeassistant.config_entries import HANDLERS, ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE, CONF_RADIUS
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers import config_entry_flow, config_validation as cv
 from homeassistant.helpers.discovery_flow import DiscoveryKey
+from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 from homeassistant.loader import IntegrationNotFound
 from homeassistant.setup import async_setup_component
 from homeassistant.util.dt import utcnow
@@ -137,11 +138,13 @@ async def test_get_entries(hass: HomeAssistant, client: TestClient) -> None:
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
             "source": "bla",
             "state": core_ce.ConfigEntryState.NOT_LOADED.value,
+            "supported_subentry_types": {},
             "supports_options": True,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -155,11 +158,13 @@ async def test_get_entries(hass: HomeAssistant, client: TestClient) -> None:
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": "Unsupported API",
             "source": "bla2",
             "state": core_ce.ConfigEntryState.SETUP_ERROR.value,
+            "supported_subentry_types": {},
             "supports_options": False,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -173,11 +178,13 @@ async def test_get_entries(hass: HomeAssistant, client: TestClient) -> None:
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
             "source": "bla3",
             "state": core_ce.ConfigEntryState.NOT_LOADED.value,
+            "supported_subentry_types": {},
             "supports_options": False,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -191,11 +198,13 @@ async def test_get_entries(hass: HomeAssistant, client: TestClient) -> None:
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
             "source": "bla4",
             "state": core_ce.ConfigEntryState.NOT_LOADED.value,
+            "supported_subentry_types": {},
             "supports_options": False,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -209,11 +218,13 @@ async def test_get_entries(hass: HomeAssistant, client: TestClient) -> None:
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
             "source": "bla5",
             "state": core_ce.ConfigEntryState.NOT_LOADED.value,
+            "supported_subentry_types": {},
             "supports_options": False,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -389,19 +400,17 @@ async def test_available_flows(
 ############################
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test.config.error.Should be unique."],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 async def test_initialize_flow(hass: HomeAssistant, client: TestClient) -> None:
     """Test we can initialize a flow."""
     mock_platform(hass, "test.config_flow", None)
 
     class TestFlow(core_ce.ConfigFlow):
         async def async_step_user(self, user_input=None):
-            schema = OrderedDict()
-            schema[vol.Required("username")] = str
-            schema[vol.Required("password")] = str
+            schema = {
+                vol.Required("username"): str,
+                vol.Required("password"): str,
+            }
 
             return self.async_show_form(
                 step_id="user",
@@ -481,13 +490,14 @@ async def test_initialize_flow_unauth(
 
     class TestFlow(core_ce.ConfigFlow):
         async def async_step_user(self, user_input=None):
-            schema = OrderedDict()
-            schema[vol.Required("username")] = str
-            schema[vol.Required("password")] = str
+            schema = {
+                vol.Required("username"): str,
+                vol.Required("password"): str,
+            }
 
             return self.async_show_form(
                 step_id="user",
-                data_schema=schema,
+                data_schema=vol.Schema(schema),
                 description_placeholders={"url": "https://example.com"},
                 errors={"username": "Should be unique."},
             )
@@ -500,10 +510,7 @@ async def test_initialize_flow_unauth(
     assert resp.status == HTTPStatus.UNAUTHORIZED
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test.config.abort.bla"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 async def test_abort(hass: HomeAssistant, client: TestClient) -> None:
     """Test a flow that aborts."""
     mock_platform(hass, "test.config_flow", None)
@@ -528,7 +535,7 @@ async def test_abort(hass: HomeAssistant, client: TestClient) -> None:
     }
 
 
-@pytest.mark.usefixtures("enable_custom_integrations", "freezer")
+@pytest.mark.usefixtures("freezer")
 async def test_create_account(hass: HomeAssistant, client: TestClient) -> None:
     """Test a flow that creates an account."""
     mock_platform(hass, "test.config_flow", None)
@@ -571,11 +578,13 @@ async def test_create_account(hass: HomeAssistant, client: TestClient) -> None:
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
             "source": core_ce.SOURCE_USER,
             "state": core_ce.ConfigEntryState.LOADED.value,
+            "supported_subentry_types": {},
             "supports_options": False,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -586,10 +595,11 @@ async def test_create_account(hass: HomeAssistant, client: TestClient) -> None:
         "description_placeholders": None,
         "options": {},
         "minor_version": 1,
+        "subentries": [],
     }
 
 
-@pytest.mark.usefixtures("enable_custom_integrations", "freezer")
+@pytest.mark.usefixtures("freezer")
 async def test_two_step_flow(hass: HomeAssistant, client: TestClient) -> None:
     """Test we can finish a two step flow."""
     mock_integration(
@@ -654,11 +664,13 @@ async def test_two_step_flow(hass: HomeAssistant, client: TestClient) -> None:
                 "error_reason_translation_key": None,
                 "error_reason_translation_placeholders": None,
                 "modified_at": timestamp,
+                "num_subentries": 0,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
                 "source": core_ce.SOURCE_USER,
                 "state": core_ce.ConfigEntryState.LOADED.value,
+                "supported_subentry_types": {},
                 "supports_options": False,
                 "supports_reconfigure": False,
                 "supports_remove_device": False,
@@ -669,6 +681,7 @@ async def test_two_step_flow(hass: HomeAssistant, client: TestClient) -> None:
             "description_placeholders": None,
             "options": {},
             "minor_version": 1,
+            "subentries": [],
         }
 
 
@@ -729,27 +742,62 @@ async def test_get_progress_index(
     mock_platform(hass, "test.config_flow", None)
     ws_client = await hass_ws_client(hass)
 
+    mock_integration(
+        hass, MockModule("test", async_setup_entry=AsyncMock(return_value=True))
+    )
+
+    entry = MockConfigEntry(domain="test", title="Test", entry_id="1234")
+    entry.add_to_hass(hass)
+
     class TestFlow(core_ce.ConfigFlow):
         VERSION = 5
 
-        async def async_step_hassio(self, discovery_info):
+        async def async_step_hassio(
+            self, discovery_info: HassioServiceInfo
+        ) -> ConfigFlowResult:
+            """Handle a Hass.io discovery."""
             return await self.async_step_account()
 
-        async def async_step_account(self, user_input=None):
+        async def async_step_account(self, user_input: dict[str, Any] | None = None):
+            """Show a form to the user."""
             return self.async_show_form(step_id="account")
 
+        async def async_step_user(self, user_input: dict[str, Any] | None = None):
+            """Handle a config flow initialized by the user."""
+            return await self.async_step_account()
+
+        async def async_step_reconfigure(
+            self, user_input: dict[str, Any] | None = None
+        ):
+            """Handle a reconfiguration flow initialized by the user."""
+            nonlocal entry
+            assert self._get_reconfigure_entry() is entry
+            return await self.async_step_account()
+
     with patch.dict(HANDLERS, {"test": TestFlow}):
-        form = await hass.config_entries.flow.async_init(
+        form_hassio = await hass.config_entries.flow.async_init(
             "test", context={"source": core_ce.SOURCE_HASSIO}
         )
+        form_user = await hass.config_entries.flow.async_init(
+            "test", context={"source": core_ce.SOURCE_USER}
+        )
+        form_reconfigure = await hass.config_entries.flow.async_init(
+            "test", context={"source": core_ce.SOURCE_RECONFIGURE, "entry_id": "1234"}
+        )
+
+    for form in (form_hassio, form_user, form_reconfigure):
+        assert form["type"] == data_entry_flow.FlowResultType.FORM
+        assert form["step_id"] == "account"
 
     await ws_client.send_json({"id": 5, "type": "config_entries/flow/progress"})
     response = await ws_client.receive_json()
 
     assert response["success"]
+
+    # Active flows with SOURCE_USER and SOURCE_RECONFIGURE should be filtered out
     assert response["result"] == [
         {
-            "flow_id": form["flow_id"],
+            "flow_id": form_hassio["flow_id"],
             "handler": "test",
             "step_id": "account",
             "context": {"source": core_ce.SOURCE_HASSIO},
@@ -772,19 +820,17 @@ async def test_get_progress_index_unauth(
     assert response["error"]["code"] == "unauthorized"
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test.config.error.Should be unique."],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 async def test_get_progress_flow(hass: HomeAssistant, client: TestClient) -> None:
     """Test we can query the API for same result as we get from init a flow."""
     mock_platform(hass, "test.config_flow", None)
 
     class TestFlow(core_ce.ConfigFlow):
         async def async_step_user(self, user_input=None):
-            schema = OrderedDict()
-            schema[vol.Required("username")] = str
-            schema[vol.Required("password")] = str
+            schema = {
+                vol.Required("username"): str,
+                vol.Required("password"): str,
+            }
 
             return self.async_show_form(
                 step_id="user",
@@ -808,10 +854,7 @@ async def test_get_progress_flow(hass: HomeAssistant, client: TestClient) -> Non
     assert data == data2
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test.config.error.Should be unique."],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 async def test_get_progress_flow_unauth(
     hass: HomeAssistant, client: TestClient, hass_admin_user: MockUser
 ) -> None:
@@ -820,9 +863,10 @@ async def test_get_progress_flow_unauth(
 
     class TestFlow(core_ce.ConfigFlow):
         async def async_step_user(self, user_input=None):
-            schema = OrderedDict()
-            schema[vol.Required("username")] = str
-            schema[vol.Required("password")] = str
+            schema = {
+                vol.Required("username"): str,
+                vol.Required("password"): str,
+            }
 
             return self.async_show_form(
                 step_id="user",
@@ -854,11 +898,9 @@ async def test_options_flow(hass: HomeAssistant, client: TestClient) -> None:
         def async_get_options_flow(config_entry):
             class OptionsFlowHandler(data_entry_flow.FlowHandler):
                 async def async_step_init(self, user_input=None):
-                    schema = OrderedDict()
-                    schema[vol.Required("enabled")] = bool
                     return self.async_show_form(
                         step_id="user",
-                        data_schema=vol.Schema(schema),
+                        data_schema=vol.Schema({vol.Required("enabled"): bool}),
                         description_placeholders={"enabled": "Set to true to be true"},
                     )
 
@@ -919,11 +961,9 @@ async def test_options_flow_unauth(
         def async_get_options_flow(config_entry):
             class OptionsFlowHandler(data_entry_flow.FlowHandler):
                 async def async_step_init(self, user_input=None):
-                    schema = OrderedDict()
-                    schema[vol.Required("enabled")] = bool
                     return self.async_show_form(
                         step_id="user",
-                        data_schema=schema,
+                        data_schema=vol.Schema({vol.Required("enabled"): bool}),
                         description_placeholders={"enabled": "Set to true to be true"},
                     )
 
@@ -1088,6 +1128,409 @@ async def test_options_flow_with_invalid_data(
         assert data == {"errors": {"choices": "invalid is not a valid option"}}
 
 
+async def test_subentry_flow(hass: HomeAssistant, client) -> None:
+    """Test we can start a subentry flow."""
+
+    class TestFlow(core_ce.ConfigFlow):
+        class SubentryFlowHandler(core_ce.ConfigSubentryFlow):
+            async def async_step_init(self, user_input=None):
+                raise NotImplementedError
+
+            async def async_step_user(self, user_input=None):
+                return self.async_show_form(
+                    step_id="user",
+                    data_schema=vol.Schema({vol.Required("enabled"): bool}),
+                    description_placeholders={"enabled": "Set to true to be true"},
+                )
+
+        @classmethod
+        @callback
+        def async_get_supported_subentry_types(
+            cls, config_entry: core_ce.ConfigEntry
+        ) -> dict[str, type[core_ce.ConfigSubentryFlow]]:
+            return {"test": TestFlow.SubentryFlowHandler}
+
+    mock_integration(hass, MockModule("test"))
+    mock_platform(hass, "test.config_flow", None)
+    MockConfigEntry(
+        domain="test",
+        entry_id="test1",
+        source="bla",
+    ).add_to_hass(hass)
+    entry = hass.config_entries.async_entries()[0]
+
+    with mock_config_flow("test", TestFlow):
+        url = "/api/config/config_entries/subentries/flow"
+        resp = await client.post(url, json={"handler": [entry.entry_id, "test"]})
+
+    assert resp.status == HTTPStatus.OK
+    data = await resp.json()
+
+    data.pop("flow_id")
+    assert data == {
+        "type": "form",
+        "handler": ["test1", "test"],
+        "step_id": "user",
+        "data_schema": [{"name": "enabled", "required": True, "type": "boolean"}],
+        "description_placeholders": {"enabled": "Set to true to be true"},
+        "errors": None,
+        "last_step": None,
+        "preview": None,
+    }
+
+
+async def test_subentry_reconfigure_flow(hass: HomeAssistant, client) -> None:
+    """Test we can start and finish a subentry reconfigure flow."""
+
+    class TestFlow(core_ce.ConfigFlow):
+        class SubentryFlowHandler(core_ce.ConfigSubentryFlow):
+            async def async_step_init(self, user_input=None):
+                raise NotImplementedError
+
+            async def async_step_user(self, user_input=None):
+                raise NotImplementedError
+
+            async def async_step_reconfigure(self, user_input=None):
+                if user_input is not None:
+                    return self.async_update_and_abort(
+                        self._get_entry(),
+                        self._get_reconfigure_subentry(),
+                        title="Test Entry",
+                        data={"test": "blah"},
+                    )
+
+                return self.async_show_form(
+                    step_id="reconfigure",
+                    data_schema=vol.Schema({vol.Required("enabled"): bool}),
+                    description_placeholders={"enabled": "Set to true to be true"},
+                )
+
+        @classmethod
+        @callback
+        def async_get_supported_subentry_types(
+            cls, config_entry: core_ce.ConfigEntry
+        ) -> dict[str, type[core_ce.ConfigSubentryFlow]]:
+            return {"test": TestFlow.SubentryFlowHandler}
+
+    mock_integration(hass, MockModule("test"))
+    mock_platform(hass, "test.config_flow", None)
+    MockConfigEntry(
+        domain="test",
+        entry_id="test1",
+        source="bla",
+        subentries_data=[
+            core_ce.ConfigSubentryData(
+                data={},
+                subentry_id="mock_id",
+                subentry_type="test",
+                title="Title",
+                unique_id=None,
+            )
+        ],
+    ).add_to_hass(hass)
+    entry = hass.config_entries.async_entries()[0]
+
+    with mock_config_flow("test", TestFlow):
+        url = "/api/config/config_entries/subentries/flow"
+        resp = await client.post(
+            url, json={"handler": [entry.entry_id, "test"], "subentry_id": "mock_id"}
+        )
+
+    assert resp.status == HTTPStatus.OK
+    data = await resp.json()
+
+    flow_id = data.pop("flow_id")
+    assert data == {
+        "type": "form",
+        "handler": ["test1", "test"],
+        "step_id": "reconfigure",
+        "data_schema": [{"name": "enabled", "required": True, "type": "boolean"}],
+        "description_placeholders": {"enabled": "Set to true to be true"},
+        "errors": None,
+        "last_step": None,
+        "preview": None,
+    }
+
+    with mock_config_flow("test", TestFlow):
+        resp = await client.post(
+            f"/api/config/config_entries/subentries/flow/{flow_id}",
+            json={"enabled": True},
+        )
+    assert resp.status == HTTPStatus.OK
+
+    entries = hass.config_entries.async_entries("test")
+    assert len(entries) == 1
+
+    data = await resp.json()
+    data.pop("flow_id")
+    assert data == {
+        "handler": ["test1", "test"],
+        "reason": "reconfigure_successful",
+        "type": "abort",
+        "description_placeholders": None,
+    }
+
+    entry = hass.config_entries.async_entries()[0]
+    assert entry.subentries == {
+        "mock_id": core_ce.ConfigSubentry(
+            data={"test": "blah"},
+            subentry_id="mock_id",
+            subentry_type="test",
+            title="Test Entry",
+            unique_id=None,
+        ),
+    }
+
+
+async def test_subentry_does_not_support_reconfigure(
+    hass: HomeAssistant, client: TestClient
+) -> None:
+    """Test a subentry flow that does not support reconfigure step."""
+
+    class TestFlow(core_ce.ConfigFlow):
+        class SubentryFlowHandler(core_ce.ConfigSubentryFlow):
+            async def async_step_init(self, user_input=None):
+                raise NotImplementedError
+
+            async def async_step_user(self, user_input=None):
+                raise NotImplementedError
+
+        @classmethod
+        @callback
+        def async_get_supported_subentry_types(
+            cls, config_entry: core_ce.ConfigEntry
+        ) -> dict[str, type[core_ce.ConfigSubentryFlow]]:
+            return {"test": TestFlow.SubentryFlowHandler}
+
+    mock_integration(hass, MockModule("test"))
+    mock_platform(hass, "test.config_flow", None)
+    MockConfigEntry(
+        domain="test",
+        entry_id="test1",
+        source="bla",
+        subentries_data=[
+            core_ce.ConfigSubentryData(
+                data={},
+                subentry_id="mock_id",
+                subentry_type="test",
+                title="Title",
+                unique_id=None,
+            )
+        ],
+    ).add_to_hass(hass)
+    entry = hass.config_entries.async_entries()[0]
+
+    with mock_config_flow("test", TestFlow):
+        url = "/api/config/config_entries/subentries/flow"
+        resp = await client.post(
+            url, json={"handler": [entry.entry_id, "test"], "subentry_id": "mock_id"}
+        )
+
+    assert resp.status == HTTPStatus.BAD_REQUEST
+    response = await resp.json()
+    assert response == {
+        "message": "Handler SubentryFlowHandler doesn't support step reconfigure"
+    }
+
+
+@pytest.mark.parametrize(
+    ("endpoint", "method"),
+    [
+        ("/api/config/config_entries/subentries/flow", "post"),
+        ("/api/config/config_entries/subentries/flow/1", "get"),
+        ("/api/config/config_entries/subentries/flow/1", "post"),
+    ],
+)
+async def test_subentry_flow_unauth(
+    hass: HomeAssistant, client, hass_admin_user: MockUser, endpoint: str, method: str
+) -> None:
+    """Test unauthorized on subentry flow."""
+
+    class TestFlow(core_ce.ConfigFlow):
+        class SubentryFlowHandler(core_ce.ConfigSubentryFlow):
+            async def async_step_init(self, user_input=None):
+                return self.async_show_form(
+                    step_id="user",
+                    data_schema=vol.Schema({vol.Required("enabled"): bool}),
+                    description_placeholders={"enabled": "Set to true to be true"},
+                )
+
+        @classmethod
+        @callback
+        def async_get_supported_subentry_types(
+            cls, config_entry: core_ce.ConfigEntry
+        ) -> dict[str, type[core_ce.ConfigSubentryFlow]]:
+            return {"test": TestFlow.SubentryFlowHandler}
+
+    mock_integration(hass, MockModule("test"))
+    mock_platform(hass, "test.config_flow", None)
+    MockConfigEntry(
+        domain="test",
+        entry_id="test1",
+        source="bla",
+    ).add_to_hass(hass)
+    entry = hass.config_entries.async_entries()[0]
+
+    hass_admin_user.groups = []
+
+    with mock_config_flow("test", TestFlow):
+        resp = await getattr(client, method)(endpoint, json={"handler": entry.entry_id})
+
+    assert resp.status == HTTPStatus.UNAUTHORIZED
+
+
+async def test_two_step_subentry_flow(hass: HomeAssistant, client) -> None:
+    """Test we can finish a two step subentry flow."""
+    mock_integration(
+        hass, MockModule("test", async_setup_entry=AsyncMock(return_value=True))
+    )
+    mock_platform(hass, "test.config_flow", None)
+
+    class TestFlow(core_ce.ConfigFlow):
+        class SubentryFlowHandler(core_ce.ConfigSubentryFlow):
+            async def async_step_user(self, user_input=None):
+                return await self.async_step_finish()
+
+            async def async_step_finish(self, user_input=None):
+                if user_input:
+                    return self.async_create_entry(
+                        title="Mock title", data=user_input, unique_id="test"
+                    )
+
+                return self.async_show_form(
+                    step_id="finish", data_schema=vol.Schema({"enabled": bool})
+                )
+
+        @classmethod
+        @callback
+        def async_get_supported_subentry_types(
+            cls, config_entry: core_ce.ConfigEntry
+        ) -> dict[str, type[core_ce.ConfigSubentryFlow]]:
+            return {"test": TestFlow.SubentryFlowHandler}
+
+    MockConfigEntry(
+        domain="test",
+        entry_id="test1",
+        source="bla",
+    ).add_to_hass(hass)
+    entry = hass.config_entries.async_entries()[0]
+
+    with mock_config_flow("test", TestFlow):
+        url = "/api/config/config_entries/subentries/flow"
+        resp = await client.post(url, json={"handler": [entry.entry_id, "test"]})
+
+        assert resp.status == HTTPStatus.OK
+        data = await resp.json()
+        flow_id = data["flow_id"]
+        expected_data = {
+            "data_schema": [{"name": "enabled", "type": "boolean"}],
+            "description_placeholders": None,
+            "errors": None,
+            "flow_id": flow_id,
+            "handler": ["test1", "test"],
+            "last_step": None,
+            "preview": None,
+            "step_id": "finish",
+            "type": "form",
+        }
+        assert data == expected_data
+
+        resp = await client.get(f"/api/config/config_entries/subentries/flow/{flow_id}")
+        assert resp.status == HTTPStatus.OK
+        data = await resp.json()
+        assert data == expected_data
+
+        resp = await client.post(
+            f"/api/config/config_entries/subentries/flow/{flow_id}",
+            json={"enabled": True},
+        )
+        assert resp.status == HTTPStatus.OK
+        data = await resp.json()
+        assert data == {
+            "description_placeholders": None,
+            "description": None,
+            "flow_id": flow_id,
+            "handler": ["test1", "test"],
+            "title": "Mock title",
+            "type": "create_entry",
+            "unique_id": "test",
+        }
+
+
+async def test_subentry_flow_with_invalid_data(hass: HomeAssistant, client) -> None:
+    """Test a subentry flow with invalid_data."""
+    mock_integration(
+        hass, MockModule("test", async_setup_entry=AsyncMock(return_value=True))
+    )
+    mock_platform(hass, "test.config_flow", None)
+
+    class TestFlow(core_ce.ConfigFlow):
+        class SubentryFlowHandler(core_ce.ConfigSubentryFlow):
+            async def async_step_user(self, user_input=None):
+                return self.async_show_form(
+                    step_id="finish",
+                    data_schema=vol.Schema(
+                        {
+                            vol.Required(
+                                "choices", default=["invalid", "valid"]
+                            ): cv.multi_select({"valid": "Valid"})
+                        }
+                    ),
+                )
+
+            async def async_step_finish(self, user_input=None):
+                return self.async_create_entry(title="Enable disable", data=user_input)
+
+        @classmethod
+        @callback
+        def async_get_supported_subentry_types(
+            cls, config_entry: core_ce.ConfigEntry
+        ) -> dict[str, type[core_ce.ConfigSubentryFlow]]:
+            return {"test": TestFlow.SubentryFlowHandler}
+
+    MockConfigEntry(
+        domain="test",
+        entry_id="test1",
+        source="bla",
+    ).add_to_hass(hass)
+    entry = hass.config_entries.async_entries()[0]
+
+    with mock_config_flow("test", TestFlow):
+        url = "/api/config/config_entries/subentries/flow"
+        resp = await client.post(url, json={"handler": [entry.entry_id, "test"]})
+
+        assert resp.status == HTTPStatus.OK
+        data = await resp.json()
+        flow_id = data.pop("flow_id")
+        assert data == {
+            "type": "form",
+            "handler": ["test1", "test"],
+            "step_id": "finish",
+            "data_schema": [
+                {
+                    "default": ["invalid", "valid"],
+                    "name": "choices",
+                    "options": {"valid": "Valid"},
+                    "required": True,
+                    "type": "multi_select",
+                }
+            ],
+            "description_placeholders": None,
+            "errors": None,
+            "last_step": None,
+            "preview": None,
+        }
+
+    with mock_config_flow("test", TestFlow):
+        resp = await client.post(
+            f"/api/config/config_entries/subentries/flow/{flow_id}",
+            json={"choices": ["valid", "invalid"]},
+        )
+        assert resp.status == HTTPStatus.BAD_REQUEST
+        data = await resp.json()
+        assert data == {"errors": {"choices": "invalid is not a valid option"}}
+
+
 @pytest.mark.usefixtures("freezer")
 async def test_get_single(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
@@ -1120,11 +1563,13 @@ async def test_get_single(
         "error_reason_translation_key": None,
         "error_reason_translation_placeholders": None,
         "modified_at": timestamp,
+        "num_subentries": 0,
         "pref_disable_new_entities": False,
         "pref_disable_polling": False,
         "reason": None,
         "source": "user",
         "state": "loaded",
+        "supported_subentry_types": {},
         "supports_options": False,
         "supports_reconfigure": False,
         "supports_remove_device": False,
@@ -1480,11 +1925,13 @@ async def test_get_matching_entries_ws(
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
             "source": "bla",
             "state": "not_loaded",
+            "supported_subentry_types": {},
             "supports_options": False,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -1499,11 +1946,13 @@ async def test_get_matching_entries_ws(
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": "Unsupported API",
             "source": "bla2",
             "state": "setup_error",
+            "supported_subentry_types": {},
             "supports_options": False,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -1518,11 +1967,13 @@ async def test_get_matching_entries_ws(
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
             "source": "bla3",
             "state": "not_loaded",
+            "supported_subentry_types": {},
             "supports_options": False,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -1537,11 +1988,13 @@ async def test_get_matching_entries_ws(
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
             "source": "bla4",
             "state": "not_loaded",
+            "supported_subentry_types": {},
             "supports_options": False,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -1556,11 +2009,13 @@ async def test_get_matching_entries_ws(
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
             "source": "bla5",
             "state": "not_loaded",
+            "supported_subentry_types": {},
             "supports_options": False,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -1586,11 +2041,13 @@ async def test_get_matching_entries_ws(
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
             "source": "bla",
             "state": "not_loaded",
+            "supported_subentry_types": {},
             "supports_options": False,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -1615,11 +2072,13 @@ async def test_get_matching_entries_ws(
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
             "source": "bla4",
             "state": "not_loaded",
+            "supported_subentry_types": {},
             "supports_options": False,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -1634,11 +2093,13 @@ async def test_get_matching_entries_ws(
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
             "source": "bla5",
             "state": "not_loaded",
+            "supported_subentry_types": {},
             "supports_options": False,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -1663,11 +2124,13 @@ async def test_get_matching_entries_ws(
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
             "source": "bla",
             "state": "not_loaded",
+            "supported_subentry_types": {},
             "supports_options": False,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -1682,11 +2145,13 @@ async def test_get_matching_entries_ws(
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
             "source": "bla3",
             "state": "not_loaded",
+            "supported_subentry_types": {},
             "supports_options": False,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -1717,11 +2182,13 @@ async def test_get_matching_entries_ws(
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
             "source": "bla",
             "state": "not_loaded",
+            "supported_subentry_types": {},
             "supports_options": False,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -1736,11 +2203,13 @@ async def test_get_matching_entries_ws(
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": "Unsupported API",
             "source": "bla2",
             "state": "setup_error",
+            "supported_subentry_types": {},
             "supports_options": False,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -1755,11 +2224,13 @@ async def test_get_matching_entries_ws(
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
             "source": "bla3",
             "state": "not_loaded",
+            "supported_subentry_types": {},
             "supports_options": False,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -1774,11 +2245,13 @@ async def test_get_matching_entries_ws(
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
             "source": "bla4",
             "state": "not_loaded",
+            "supported_subentry_types": {},
             "supports_options": False,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -1793,11 +2266,13 @@ async def test_get_matching_entries_ws(
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
             "modified_at": timestamp,
+            "num_subentries": 0,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
             "source": "bla5",
             "state": "not_loaded",
+            "supported_subentry_types": {},
             "supports_options": False,
             "supports_reconfigure": False,
             "supports_remove_device": False,
@@ -1900,11 +2375,13 @@ async def test_subscribe_entries_ws(
                 "error_reason_translation_key": None,
                 "error_reason_translation_placeholders": None,
                 "modified_at": created,
+                "num_subentries": 0,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
                 "source": "bla",
                 "state": "not_loaded",
+                "supported_subentry_types": {},
                 "supports_options": False,
                 "supports_reconfigure": False,
                 "supports_remove_device": False,
@@ -1922,11 +2399,13 @@ async def test_subscribe_entries_ws(
                 "error_reason_translation_key": None,
                 "error_reason_translation_placeholders": None,
                 "modified_at": created,
+                "num_subentries": 0,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": "Unsupported API",
                 "source": "bla2",
                 "state": "setup_error",
+                "supported_subentry_types": {},
                 "supports_options": False,
                 "supports_reconfigure": False,
                 "supports_remove_device": False,
@@ -1944,11 +2423,13 @@ async def test_subscribe_entries_ws(
                 "error_reason_translation_key": None,
                 "error_reason_translation_placeholders": None,
                 "modified_at": created,
+                "num_subentries": 0,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
                 "source": "bla3",
                 "state": "not_loaded",
+                "supported_subentry_types": {},
                 "supports_options": False,
                 "supports_reconfigure": False,
                 "supports_remove_device": False,
@@ -1972,11 +2453,13 @@ async def test_subscribe_entries_ws(
                 "error_reason_translation_key": None,
                 "error_reason_translation_placeholders": None,
                 "modified_at": modified,
+                "num_subentries": 0,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
                 "source": "bla",
                 "state": "not_loaded",
+                "supported_subentry_types": {},
                 "supports_options": False,
                 "supports_reconfigure": False,
                 "supports_remove_device": False,
@@ -2001,11 +2484,13 @@ async def test_subscribe_entries_ws(
                 "error_reason_translation_key": None,
                 "error_reason_translation_placeholders": None,
                 "modified_at": modified,
+                "num_subentries": 0,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
                 "source": "bla",
                 "state": "not_loaded",
+                "supported_subentry_types": {},
                 "supports_options": False,
                 "supports_reconfigure": False,
                 "supports_remove_device": False,
@@ -2029,11 +2514,13 @@ async def test_subscribe_entries_ws(
                 "error_reason_translation_key": None,
                 "error_reason_translation_placeholders": None,
                 "modified_at": entry.modified_at.timestamp(),
+                "num_subentries": 0,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
                 "source": "bla",
                 "state": "not_loaded",
+                "supported_subentry_types": {},
                 "supports_options": False,
                 "supports_reconfigure": False,
                 "supports_remove_device": False,
@@ -2119,11 +2606,13 @@ async def test_subscribe_entries_ws_filtered(
                 "error_reason_translation_key": None,
                 "error_reason_translation_placeholders": None,
                 "modified_at": created,
+                "num_subentries": 0,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
                 "source": "bla",
                 "state": "not_loaded",
+                "supported_subentry_types": {},
                 "supports_options": False,
                 "supports_reconfigure": False,
                 "supports_remove_device": False,
@@ -2141,11 +2630,13 @@ async def test_subscribe_entries_ws_filtered(
                 "error_reason_translation_key": None,
                 "error_reason_translation_placeholders": None,
                 "modified_at": created,
+                "num_subentries": 0,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
                 "source": "bla3",
                 "state": "not_loaded",
+                "supported_subentry_types": {},
                 "supports_options": False,
                 "supports_reconfigure": False,
                 "supports_remove_device": False,
@@ -2171,11 +2662,13 @@ async def test_subscribe_entries_ws_filtered(
                 "error_reason_translation_key": None,
                 "error_reason_translation_placeholders": None,
                 "modified_at": modified,
+                "num_subentries": 0,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
                 "source": "bla",
                 "state": "not_loaded",
+                "supported_subentry_types": {},
                 "supports_options": False,
                 "supports_reconfigure": False,
                 "supports_remove_device": False,
@@ -2197,11 +2690,13 @@ async def test_subscribe_entries_ws_filtered(
                 "error_reason_translation_key": None,
                 "error_reason_translation_placeholders": None,
                 "modified_at": modified,
+                "num_subentries": 0,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
                 "source": "bla3",
                 "state": "not_loaded",
+                "supported_subentry_types": {},
                 "supports_options": False,
                 "supports_reconfigure": False,
                 "supports_remove_device": False,
@@ -2227,11 +2722,13 @@ async def test_subscribe_entries_ws_filtered(
                 "error_reason_translation_key": None,
                 "error_reason_translation_placeholders": None,
                 "modified_at": modified,
+                "num_subentries": 0,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
                 "source": "bla",
                 "state": "not_loaded",
+                "supported_subentry_types": {},
                 "supports_options": False,
                 "supports_reconfigure": False,
                 "supports_remove_device": False,
@@ -2255,11 +2752,13 @@ async def test_subscribe_entries_ws_filtered(
                 "error_reason_translation_key": None,
                 "error_reason_translation_placeholders": None,
                 "modified_at": entry.modified_at.timestamp(),
+                "num_subentries": 0,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
                 "source": "bla",
                 "state": "not_loaded",
+                "supported_subentry_types": {},
                 "supports_options": False,
                 "supports_reconfigure": False,
                 "supports_remove_device": False,
@@ -2359,11 +2858,8 @@ async def test_flow_with_multiple_schema_errors_base(
         }
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test.config.abort.reconfigure_successful"],
-)
-@pytest.mark.usefixtures("enable_custom_integrations", "freezer")
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
+@pytest.mark.usefixtures("freezer")
 async def test_supports_reconfigure(
     hass: HomeAssistant,
     client: TestClient,
@@ -2439,7 +2935,6 @@ async def test_supports_reconfigure(
     }
 
 
-@pytest.mark.usefixtures("enable_custom_integrations")
 async def test_does_not_support_reconfigure(
     hass: HomeAssistant, client: TestClient
 ) -> None:
@@ -2465,8 +2960,144 @@ async def test_does_not_support_reconfigure(
         )
 
     assert resp.status == HTTPStatus.BAD_REQUEST
-    response = await resp.text()
-    assert (
-        response
-        == '{"message":"Handler ConfigEntriesFlowManager doesn\'t support step reconfigure"}'
+    response = await resp.json()
+    assert response == {"message": "Handler TestFlow doesn't support step reconfigure"}
+
+
+async def test_list_subentries(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test that we can list subentries."""
+    assert await async_setup_component(hass, "config", {})
+    ws_client = await hass_ws_client(hass)
+
+    entry = MockConfigEntry(
+        domain="test",
+        state=core_ce.ConfigEntryState.LOADED,
+        subentries_data=[
+            core_ce.ConfigSubentryData(
+                data={"test": "test"},
+                subentry_id="mock_id",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            )
+        ],
     )
+    entry.add_to_hass(hass)
+
+    assert entry.pref_disable_new_entities is False
+    assert entry.pref_disable_polling is False
+
+    await ws_client.send_json_auto_id(
+        {
+            "type": "config_entries/subentries/list",
+            "entry_id": entry.entry_id,
+        }
+    )
+    response = await ws_client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == [
+        {
+            "subentry_id": "mock_id",
+            "subentry_type": "test",
+            "title": "Mock title",
+            "unique_id": "test",
+        },
+    ]
+
+    # Try listing subentries for an unknown entry
+    await ws_client.send_json_auto_id(
+        {
+            "type": "config_entries/subentries/list",
+            "entry_id": "no_such_entry",
+        }
+    )
+    response = await ws_client.receive_json()
+
+    assert not response["success"]
+    assert response["error"] == {
+        "code": "not_found",
+        "message": "Config entry not found",
+    }
+
+
+async def test_delete_subentry(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test that we can delete a subentry."""
+    assert await async_setup_component(hass, "config", {})
+    ws_client = await hass_ws_client(hass)
+
+    entry = MockConfigEntry(
+        domain="test",
+        state=core_ce.ConfigEntryState.LOADED,
+        subentries_data=[
+            core_ce.ConfigSubentryData(
+                data={"test": "test"},
+                subentry_id="mock_id",
+                subentry_type="test",
+                title="Mock title",
+            )
+        ],
+    )
+    entry.add_to_hass(hass)
+
+    assert entry.pref_disable_new_entities is False
+    assert entry.pref_disable_polling is False
+
+    await ws_client.send_json_auto_id(
+        {
+            "type": "config_entries/subentries/delete",
+            "entry_id": entry.entry_id,
+            "subentry_id": "mock_id",
+        }
+    )
+    response = await ws_client.receive_json()
+
+    assert response["success"]
+    assert response["result"] is None
+
+    await ws_client.send_json_auto_id(
+        {
+            "type": "config_entries/subentries/list",
+            "entry_id": entry.entry_id,
+        }
+    )
+    response = await ws_client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == []
+
+    # Try deleting the subentry again
+    await ws_client.send_json_auto_id(
+        {
+            "type": "config_entries/subentries/delete",
+            "entry_id": entry.entry_id,
+            "subentry_id": "mock_id",
+        }
+    )
+    response = await ws_client.receive_json()
+
+    assert not response["success"]
+    assert response["error"] == {
+        "code": "not_found",
+        "message": "Config subentry not found",
+    }
+
+    # Try deleting subentry from an unknown entry
+    await ws_client.send_json_auto_id(
+        {
+            "type": "config_entries/subentries/delete",
+            "entry_id": "no_such_entry",
+            "subentry_id": "mock_id",
+        }
+    )
+    response = await ws_client.receive_json()
+
+    assert not response["success"]
+    assert response["error"] == {
+        "code": "not_found",
+        "message": "Config entry not found",
+    }
diff --git a/tests/components/config/test_device_registry.py b/tests/components/config/test_device_registry.py
index c840ce2bed2..8a4e1ef234f 100644
--- a/tests/components/config/test_device_registry.py
+++ b/tests/components/config/test_device_registry.py
@@ -65,6 +65,7 @@ async def test_list_devices(
         {
             "area_id": None,
             "config_entries": [entry.entry_id],
+            "config_entries_subentries": {entry.entry_id: [None]},
             "configuration_url": None,
             "connections": [["ethernet", "12:34:56:78:90:AB:CD:EF"]],
             "created_at": utcnow().timestamp(),
@@ -87,6 +88,7 @@ async def test_list_devices(
         {
             "area_id": None,
             "config_entries": [entry.entry_id],
+            "config_entries_subentries": {entry.entry_id: [None]},
             "configuration_url": None,
             "connections": [],
             "created_at": utcnow().timestamp(),
@@ -121,6 +123,7 @@ async def test_list_devices(
         {
             "area_id": None,
             "config_entries": [entry.entry_id],
+            "config_entries_subentries": {entry.entry_id: [None]},
             "configuration_url": None,
             "connections": [["ethernet", "12:34:56:78:90:AB:CD:EF"]],
             "created_at": utcnow().timestamp(),
diff --git a/tests/components/config/test_entity_registry.py b/tests/components/config/test_entity_registry.py
index bfbd69ec9bd..2e3de33d808 100644
--- a/tests/components/config/test_entity_registry.py
+++ b/tests/components/config/test_entity_registry.py
@@ -67,6 +67,7 @@ async def test_list_entities(
             "area_id": None,
             "categories": {},
             "config_entry_id": None,
+            "config_subentry_id": None,
             "created_at": utcnow().timestamp(),
             "device_id": None,
             "disabled_by": None,
@@ -89,6 +90,7 @@ async def test_list_entities(
             "area_id": None,
             "categories": {},
             "config_entry_id": None,
+            "config_subentry_id": None,
             "created_at": utcnow().timestamp(),
             "device_id": None,
             "disabled_by": None,
@@ -138,6 +140,7 @@ async def test_list_entities(
             "area_id": None,
             "categories": {},
             "config_entry_id": None,
+            "config_subentry_id": None,
             "created_at": utcnow().timestamp(),
             "device_id": None,
             "disabled_by": None,
@@ -374,6 +377,7 @@ async def test_get_entity(hass: HomeAssistant, client: MockHAClientWebSocket) ->
         "capabilities": None,
         "categories": {},
         "config_entry_id": None,
+        "config_subentry_id": None,
         "created_at": name_created_at.timestamp(),
         "device_class": None,
         "device_id": None,
@@ -410,6 +414,7 @@ async def test_get_entity(hass: HomeAssistant, client: MockHAClientWebSocket) ->
         "capabilities": None,
         "categories": {},
         "config_entry_id": None,
+        "config_subentry_id": None,
         "created_at": no_name_created_at.timestamp(),
         "device_class": None,
         "device_id": None,
@@ -477,6 +482,7 @@ async def test_get_entities(hass: HomeAssistant, client: MockHAClientWebSocket)
             "capabilities": None,
             "categories": {},
             "config_entry_id": None,
+            "config_subentry_id": None,
             "created_at": name_created_at.timestamp(),
             "device_class": None,
             "device_id": None,
@@ -504,6 +510,7 @@ async def test_get_entities(hass: HomeAssistant, client: MockHAClientWebSocket)
             "capabilities": None,
             "categories": {},
             "config_entry_id": None,
+            "config_subentry_id": None,
             "created_at": no_name_created_at.timestamp(),
             "device_class": None,
             "device_id": None,
@@ -586,6 +593,7 @@ async def test_update_entity(
             "categories": {"scope1": "id", "scope2": "id"},
             "created_at": created.timestamp(),
             "config_entry_id": None,
+            "config_subentry_id": None,
             "device_class": "custom_device_class",
             "device_id": None,
             "disabled_by": None,
@@ -668,6 +676,7 @@ async def test_update_entity(
             "capabilities": None,
             "categories": {"scope1": "id", "scope2": "id"},
             "config_entry_id": None,
+            "config_subentry_id": None,
             "created_at": created.timestamp(),
             "device_class": "custom_device_class",
             "device_id": None,
@@ -714,6 +723,7 @@ async def test_update_entity(
             "capabilities": None,
             "categories": {"scope1": "id", "scope2": "id"},
             "config_entry_id": None,
+            "config_subentry_id": None,
             "created_at": created.timestamp(),
             "device_class": "custom_device_class",
             "device_id": None,
@@ -759,6 +769,7 @@ async def test_update_entity(
             "capabilities": None,
             "categories": {"scope1": "id", "scope2": "id", "scope3": "id"},
             "config_entry_id": None,
+            "config_subentry_id": None,
             "created_at": created.timestamp(),
             "device_class": "custom_device_class",
             "device_id": None,
@@ -804,6 +815,7 @@ async def test_update_entity(
             "capabilities": None,
             "categories": {"scope1": "id", "scope2": "id", "scope3": "other_id"},
             "config_entry_id": None,
+            "config_subentry_id": None,
             "created_at": created.timestamp(),
             "device_class": "custom_device_class",
             "device_id": None,
@@ -849,6 +861,7 @@ async def test_update_entity(
             "capabilities": None,
             "categories": {"scope1": "id", "scope3": "other_id"},
             "config_entry_id": None,
+            "config_subentry_id": None,
             "created_at": created.timestamp(),
             "device_class": "custom_device_class",
             "device_id": None,
@@ -911,6 +924,7 @@ async def test_update_entity_require_restart(
             "capabilities": None,
             "categories": {},
             "config_entry_id": config_entry.entry_id,
+            "config_subentry_id": None,
             "created_at": created.timestamp(),
             "device_class": None,
             "device_id": None,
@@ -1032,6 +1046,7 @@ async def test_update_entity_no_changes(
             "capabilities": None,
             "categories": {},
             "config_entry_id": None,
+            "config_subentry_id": None,
             "created_at": created.timestamp(),
             "device_class": None,
             "device_id": None,
@@ -1129,6 +1144,7 @@ async def test_update_entity_id(
             "capabilities": None,
             "categories": {},
             "config_entry_id": None,
+            "config_subentry_id": None,
             "created_at": created.timestamp(),
             "device_class": None,
             "device_id": None,
diff --git a/tests/components/configurator/test_init.py b/tests/components/configurator/test_init.py
index a4faab483ee..1985c6e5c8c 100644
--- a/tests/components/configurator/test_init.py
+++ b/tests/components/configurator/test_init.py
@@ -5,7 +5,7 @@ from datetime import timedelta
 from homeassistant.components import configurator
 from homeassistant.const import ATTR_FRIENDLY_NAME
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
diff --git a/tests/components/conftest.py b/tests/components/conftest.py
index 9e1ce8d7f43..e0db306cae9 100644
--- a/tests/components/conftest.py
+++ b/tests/components/conftest.py
@@ -22,6 +22,7 @@ from aiohasupervisor.models import (
 import pytest
 import voluptuous as vol
 
+from homeassistant import components, loader
 from homeassistant.components import repairs
 from homeassistant.config_entries import (
     DISCOVERY_SOURCES,
@@ -528,13 +529,15 @@ def resolution_suggestions_for_issue_fixture(supervisor_client: AsyncMock) -> As
 @pytest.fixture(name="supervisor_client")
 def supervisor_client() -> Generator[AsyncMock]:
     """Mock the supervisor client."""
-    mounts_info_mock = AsyncMock(spec_set=["mounts"])
+    mounts_info_mock = AsyncMock(spec_set=["default_backup_mount", "mounts"])
+    mounts_info_mock.default_backup_mount = None
     mounts_info_mock.mounts = []
     supervisor_client = AsyncMock()
     supervisor_client.addons = AsyncMock()
     supervisor_client.discovery = AsyncMock()
     supervisor_client.homeassistant = AsyncMock()
     supervisor_client.host = AsyncMock()
+    supervisor_client.jobs = AsyncMock()
     supervisor_client.mounts.info.return_value = mounts_info_mock
     supervisor_client.os = AsyncMock()
     supervisor_client.resolution = AsyncMock()
@@ -572,6 +575,10 @@ def supervisor_client() -> Generator[AsyncMock]:
             "homeassistant.components.hassio.repairs.get_supervisor_client",
             return_value=supervisor_client,
         ),
+        patch(
+            "homeassistant.components.hassio.update_helper.get_supervisor_client",
+            return_value=supervisor_client,
+        ),
     ):
         yield supervisor_client
 
@@ -599,6 +606,7 @@ def _validate_translation_placeholders(
 async def _validate_translation(
     hass: HomeAssistant,
     translation_errors: dict[str, str],
+    ignore_translations_for_mock_domains: set[str],
     category: str,
     component: str,
     key: str,
@@ -608,7 +616,25 @@ async def _validate_translation(
 ) -> None:
     """Raise if translation doesn't exist."""
     full_key = f"component.{component}.{category}.{key}"
+    if component in ignore_translations_for_mock_domains:
+        try:
+            integration = await loader.async_get_integration(hass, component)
+        except loader.IntegrationNotFound:
+            return
+        component_paths = components.__path__
+        if not any(
+            Path(f"{component_path}/{component}") == integration.file_path
+            for component_path in component_paths
+        ):
+            return
+        # If the integration exists, translation errors should be ignored via the
+        # ignore_missing_translations fixture instead of the
+        # ignore_translations_for_mock_domains fixture.
+        translation_errors[full_key] = f"The integration '{component}' exists"
+        return
+
     translations = await async_get_translations(hass, "en", category, [component])
+
     if (translation := translations.get(full_key)) is not None:
         _validate_translation_placeholders(
             full_key, translation, description_placeholders, translation_errors
@@ -618,7 +644,20 @@ async def _validate_translation(
     if not translation_required:
         return
 
-    if full_key in translation_errors:
+    if translation_errors.get(full_key) in {"used", "unused"}:
+        # If the does not integration exist, translation errors should be ignored
+        # via the ignore_translations_for_mock_domains fixture instead of the
+        # ignore_missing_translations fixture.
+        try:
+            await loader.async_get_integration(hass, component)
+        except loader.IntegrationNotFound:
+            translation_errors[full_key] = (
+                f"Translation not found for {component}: `{category}.{key}`. "
+                f"The integration '{component}' does not exist."
+            )
+            return
+
+        # This translation key is in the ignore list, mark it as used
         translation_errors[full_key] = "used"
         return
 
@@ -629,11 +668,22 @@ async def _validate_translation(
 
 
 @pytest.fixture
-def ignore_translations() -> str | list[str]:
-    """Ignore specific translations.
+def ignore_missing_translations() -> str | list[str]:
+    """Ignore specific missing translations.
 
-    Override or parametrize this fixture with a fixture that returns,
-    a list of translation that should be ignored.
+    Override or parametrize this fixture with a fixture that returns
+    a list of missing translation that should be ignored.
+    """
+    return []
+
+
+@pytest.fixture
+def ignore_translations_for_mock_domains() -> str | list[str]:
+    """Don't validate translations for specific domains.
+
+    Override or parametrize this fixture with a fixture that returns
+    a list of domains for which translations should not be validated.
+    This should only be used when testing mocked integrations.
     """
     return []
 
@@ -666,6 +716,7 @@ async def _check_step_or_section_translations(
     translation_prefix: str,
     description_placeholders: dict[str, str],
     data_schema: vol.Schema | None,
+    ignore_translations_for_mock_domains: set[str],
 ) -> None:
     # neither title nor description are required
     # - title defaults to integration name
@@ -674,6 +725,7 @@ async def _check_step_or_section_translations(
         await _validate_translation(
             hass,
             translation_errors,
+            ignore_translations_for_mock_domains,
             category,
             integration,
             f"{translation_prefix}.{header}",
@@ -695,6 +747,7 @@ async def _check_step_or_section_translations(
                 f"{translation_prefix}.sections.{data_key}",
                 description_placeholders,
                 data_value.schema,
+                ignore_translations_for_mock_domains,
             )
             continue
         iqs_config_flow = _get_integration_quality_scale_rule(
@@ -705,6 +758,7 @@ async def _check_step_or_section_translations(
             await _validate_translation(
                 hass,
                 translation_errors,
+                ignore_translations_for_mock_domains,
                 category,
                 integration,
                 f"{translation_prefix}.{header}.{data_key}",
@@ -718,6 +772,7 @@ async def _check_config_flow_result_translations(
     flow: FlowHandler,
     result: FlowResult[FlowContext, str],
     translation_errors: dict[str, str],
+    ignore_translations_for_mock_domains: set[str],
 ) -> None:
     if result["type"] is FlowResultType.CREATE_ENTRY:
         # No need to check translations for a completed flow
@@ -753,6 +808,7 @@ async def _check_config_flow_result_translations(
                 f"{key_prefix}step.{step_id}",
                 result["description_placeholders"],
                 result["data_schema"],
+                ignore_translations_for_mock_domains,
             )
 
         if errors := result.get("errors"):
@@ -760,6 +816,7 @@ async def _check_config_flow_result_translations(
                 await _validate_translation(
                     flow.hass,
                     translation_errors,
+                    ignore_translations_for_mock_domains,
                     category,
                     integration,
                     f"{key_prefix}error.{error}",
@@ -775,6 +832,7 @@ async def _check_config_flow_result_translations(
         await _validate_translation(
             flow.hass,
             translation_errors,
+            ignore_translations_for_mock_domains,
             category,
             integration,
             f"{key_prefix}abort.{result['reason']}",
@@ -786,6 +844,7 @@ async def _check_create_issue_translations(
     issue_registry: ir.IssueRegistry,
     issue: ir.IssueEntry,
     translation_errors: dict[str, str],
+    ignore_translations_for_mock_domains: set[str],
 ) -> None:
     if issue.translation_key is None:
         # `translation_key` is only None on dismissed issues
@@ -793,6 +852,7 @@ async def _check_create_issue_translations(
     await _validate_translation(
         issue_registry.hass,
         translation_errors,
+        ignore_translations_for_mock_domains,
         "issues",
         issue.domain,
         f"{issue.translation_key}.title",
@@ -803,6 +863,7 @@ async def _check_create_issue_translations(
         await _validate_translation(
             issue_registry.hass,
             translation_errors,
+            ignore_translations_for_mock_domains,
             "issues",
             issue.domain,
             f"{issue.translation_key}.description",
@@ -824,6 +885,7 @@ async def _check_exception_translation(
     exception: HomeAssistantError,
     translation_errors: dict[str, str],
     request: pytest.FixtureRequest,
+    ignore_translations_for_mock_domains: set[str],
 ) -> None:
     if exception.translation_key is None:
         if (
@@ -837,6 +899,7 @@ async def _check_exception_translation(
     await _validate_translation(
         hass,
         translation_errors,
+        ignore_translations_for_mock_domains,
         "exceptions",
         exception.translation_domain,
         f"{exception.translation_key}.message",
@@ -846,7 +909,9 @@ async def _check_exception_translation(
 
 @pytest.fixture(autouse=True)
 async def check_translations(
-    ignore_translations: str | list[str], request: pytest.FixtureRequest
+    ignore_missing_translations: str | list[str],
+    ignore_translations_for_mock_domains: str | list[str],
+    request: pytest.FixtureRequest,
 ) -> AsyncGenerator[None]:
     """Check that translation requirements are met.
 
@@ -855,10 +920,16 @@ async def check_translations(
     - issue registry entries
     - action (service) exceptions
     """
-    if not isinstance(ignore_translations, list):
-        ignore_translations = [ignore_translations]
+    if not isinstance(ignore_missing_translations, list):
+        ignore_missing_translations = [ignore_missing_translations]
 
-    translation_errors = {k: "unused" for k in ignore_translations}
+    if not isinstance(ignore_translations_for_mock_domains, list):
+        ignored_domains = {ignore_translations_for_mock_domains}
+    else:
+        ignored_domains = set(ignore_translations_for_mock_domains)
+
+    # Set all ignored translation keys to "unused"
+    translation_errors = dict.fromkeys(ignore_missing_translations, "unused")
 
     translation_coros = set()
 
@@ -873,7 +944,7 @@ async def check_translations(
     ) -> FlowResult:
         result = await _original_flow_manager_async_handle_step(self, flow, *args)
         await _check_config_flow_result_translations(
-            self, flow, result, translation_errors
+            self, flow, result, translation_errors, ignored_domains
         )
         return result
 
@@ -884,7 +955,9 @@ async def check_translations(
             self, domain, issue_id, *args, **kwargs
         )
         translation_coros.add(
-            _check_create_issue_translations(self, result, translation_errors)
+            _check_create_issue_translations(
+                self, result, translation_errors, ignored_domains
+            )
         )
         return result
 
@@ -912,7 +985,11 @@ async def check_translations(
         except HomeAssistantError as err:
             translation_coros.add(
                 _check_exception_translation(
-                    self._hass, err, translation_errors, request
+                    self._hass,
+                    err,
+                    translation_errors,
+                    request,
+                    ignored_domains,
                 )
             )
             raise
@@ -939,10 +1016,11 @@ async def check_translations(
     # Run final checks
     unused_ignore = [k for k, v in translation_errors.items() if v == "unused"]
     if unused_ignore:
+        # Some ignored translations were not used
         pytest.fail(
             f"Unused ignore translations: {', '.join(unused_ignore)}. "
-            "Please remove them from the ignore_translations fixture."
+            "Please remove them from the ignore_missing_translations fixture."
         )
     for description in translation_errors.values():
-        if description not in {"used", "unused"}:
+        if description != "used":
             pytest.fail(description)
diff --git a/tests/components/conversation/__init__.py b/tests/components/conversation/__init__.py
index 1ae3372968e..eeab8b6b9af 100644
--- a/tests/components/conversation/__init__.py
+++ b/tests/components/conversation/__init__.py
@@ -2,7 +2,12 @@
 
 from __future__ import annotations
 
+from collections.abc import AsyncGenerator
+from dataclasses import dataclass, field
 from typing import Literal
+from unittest.mock import patch
+
+import pytest
 
 from homeassistant.components import conversation
 from homeassistant.components.conversation.models import (
@@ -14,7 +19,7 @@ from homeassistant.components.homeassistant.exposed_entities import (
     async_expose_entity,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import intent
+from homeassistant.helpers import chat_session, intent
 
 
 class MockAgent(conversation.AbstractConversationAgent):
@@ -44,6 +49,53 @@ class MockAgent(conversation.AbstractConversationAgent):
         )
 
 
+@pytest.fixture
+async def mock_chat_log(hass: HomeAssistant) -> AsyncGenerator[MockChatLog]:
+    """Return mock chat logs."""
+    # pylint: disable-next=contextmanager-generator-missing-cleanup
+    with (
+        patch(
+            "homeassistant.components.conversation.chat_log.ChatLog",
+            MockChatLog,
+        ),
+        chat_session.async_get_chat_session(hass, "mock-conversation-id") as session,
+        conversation.async_get_chat_log(hass, session) as chat_log,
+    ):
+        yield chat_log
+
+
+@dataclass
+class MockChatLog(conversation.ChatLog):
+    """Mock chat log."""
+
+    _mock_tool_results: dict = field(default_factory=dict)
+
+    def mock_tool_results(self, results: dict) -> None:
+        """Set tool results."""
+        self._mock_tool_results = results
+
+    @property
+    def llm_api(self):
+        """Return LLM API."""
+        return self._llm_api
+
+    @llm_api.setter
+    def llm_api(self, value):
+        """Set LLM API."""
+        self._llm_api = value
+
+        if not value:
+            return
+
+        async def async_call_tool(tool_input):
+            """Call tool."""
+            if tool_input.id not in self._mock_tool_results:
+                raise ValueError(f"Tool {tool_input.id} not found")
+            return self._mock_tool_results[tool_input.id]
+
+        self._llm_api.async_call_tool = async_call_tool
+
+
 def expose_new(hass: HomeAssistant, expose_new: bool) -> None:
     """Enable exposing new entities to the default agent."""
     exposed_entities = hass.data[DATA_EXPOSED_ENTITIES]
diff --git a/tests/components/conversation/snapshots/test_chat_log.ambr b/tests/components/conversation/snapshots/test_chat_log.ambr
new file mode 100644
index 00000000000..ff8ebf724cd
--- /dev/null
+++ b/tests/components/conversation/snapshots/test_chat_log.ambr
@@ -0,0 +1,193 @@
+# serializer version: 1
+# name: test_add_delta_content_stream[deltas0]
+  list([
+  ])
+# ---
+# name: test_add_delta_content_stream[deltas1]
+  list([
+    dict({
+      'agent_id': 'mock-agent-id',
+      'content': 'Test',
+      'role': 'assistant',
+      'tool_calls': None,
+    }),
+  ])
+# ---
+# name: test_add_delta_content_stream[deltas2]
+  list([
+    dict({
+      'agent_id': 'mock-agent-id',
+      'content': 'Test',
+      'role': 'assistant',
+      'tool_calls': None,
+    }),
+    dict({
+      'agent_id': 'mock-agent-id',
+      'content': 'Test 2',
+      'role': 'assistant',
+      'tool_calls': None,
+    }),
+  ])
+# ---
+# name: test_add_delta_content_stream[deltas3]
+  list([
+    dict({
+      'agent_id': 'mock-agent-id',
+      'content': None,
+      'role': 'assistant',
+      'tool_calls': list([
+        dict({
+          'id': 'mock-tool-call-id',
+          'tool_args': dict({
+            'param1': 'Test Param 1',
+          }),
+          'tool_name': 'test_tool',
+        }),
+      ]),
+    }),
+    dict({
+      'agent_id': 'mock-agent-id',
+      'role': 'tool_result',
+      'tool_call_id': 'mock-tool-call-id',
+      'tool_name': 'test_tool',
+      'tool_result': 'Test Param 1',
+    }),
+  ])
+# ---
+# name: test_add_delta_content_stream[deltas4]
+  list([
+    dict({
+      'agent_id': 'mock-agent-id',
+      'content': 'Test',
+      'role': 'assistant',
+      'tool_calls': list([
+        dict({
+          'id': 'mock-tool-call-id',
+          'tool_args': dict({
+            'param1': 'Test Param 1',
+          }),
+          'tool_name': 'test_tool',
+        }),
+      ]),
+    }),
+    dict({
+      'agent_id': 'mock-agent-id',
+      'role': 'tool_result',
+      'tool_call_id': 'mock-tool-call-id',
+      'tool_name': 'test_tool',
+      'tool_result': 'Test Param 1',
+    }),
+  ])
+# ---
+# name: test_add_delta_content_stream[deltas5]
+  list([
+    dict({
+      'agent_id': 'mock-agent-id',
+      'content': 'Test',
+      'role': 'assistant',
+      'tool_calls': list([
+        dict({
+          'id': 'mock-tool-call-id',
+          'tool_args': dict({
+            'param1': 'Test Param 1',
+          }),
+          'tool_name': 'test_tool',
+        }),
+      ]),
+    }),
+    dict({
+      'agent_id': 'mock-agent-id',
+      'role': 'tool_result',
+      'tool_call_id': 'mock-tool-call-id',
+      'tool_name': 'test_tool',
+      'tool_result': 'Test Param 1',
+    }),
+    dict({
+      'agent_id': 'mock-agent-id',
+      'content': 'Test 2',
+      'role': 'assistant',
+      'tool_calls': None,
+    }),
+  ])
+# ---
+# name: test_add_delta_content_stream[deltas6]
+  list([
+    dict({
+      'agent_id': 'mock-agent-id',
+      'content': None,
+      'role': 'assistant',
+      'tool_calls': list([
+        dict({
+          'id': 'mock-tool-call-id',
+          'tool_args': dict({
+            'param1': 'Test Param 1',
+          }),
+          'tool_name': 'test_tool',
+        }),
+        dict({
+          'id': 'mock-tool-call-id-2',
+          'tool_args': dict({
+            'param1': 'Test Param 2',
+          }),
+          'tool_name': 'test_tool',
+        }),
+      ]),
+    }),
+    dict({
+      'agent_id': 'mock-agent-id',
+      'role': 'tool_result',
+      'tool_call_id': 'mock-tool-call-id',
+      'tool_name': 'test_tool',
+      'tool_result': 'Test Param 1',
+    }),
+    dict({
+      'agent_id': 'mock-agent-id',
+      'role': 'tool_result',
+      'tool_call_id': 'mock-tool-call-id-2',
+      'tool_name': 'test_tool',
+      'tool_result': 'Test Param 2',
+    }),
+  ])
+# ---
+# name: test_template_error
+  dict({
+    'continue_conversation': False,
+    'conversation_id': <ANY>,
+    'response': dict({
+      'card': dict({
+      }),
+      'data': dict({
+        'code': 'unknown',
+      }),
+      'language': 'en',
+      'response_type': 'error',
+      'speech': dict({
+        'plain': dict({
+          'extra_data': None,
+          'speech': 'Sorry, I had a problem with my template',
+        }),
+      }),
+    }),
+  })
+# ---
+# name: test_unknown_llm_api
+  dict({
+    'continue_conversation': False,
+    'conversation_id': <ANY>,
+    'response': dict({
+      'card': dict({
+      }),
+      'data': dict({
+        'code': 'unknown',
+      }),
+      'language': 'en',
+      'response_type': 'error',
+      'speech': dict({
+        'plain': dict({
+          'extra_data': None,
+          'speech': 'Error preparing LLM API',
+        }),
+      }),
+    }),
+  })
+# ---
diff --git a/tests/components/conversation/snapshots/test_default_agent.ambr b/tests/components/conversation/snapshots/test_default_agent.ambr
index c2b16ea2912..02e4ef1befe 100644
--- a/tests/components/conversation/snapshots/test_default_agent.ambr
+++ b/tests/components/conversation/snapshots/test_default_agent.ambr
@@ -1,6 +1,7 @@
 # serializer version: 1
 # name: test_custom_sentences
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -26,6 +27,7 @@
 # ---
 # name: test_custom_sentences.1
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -51,6 +53,7 @@
 # ---
 # name: test_custom_sentences_config
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -76,6 +79,7 @@
 # ---
 # name: test_intent_alias_added_removed
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -106,6 +110,7 @@
 # ---
 # name: test_intent_alias_added_removed.1
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -136,6 +141,7 @@
 # ---
 # name: test_intent_alias_added_removed.2
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -156,6 +162,7 @@
 # ---
 # name: test_intent_conversion_not_expose_new
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -176,6 +183,7 @@
 # ---
 # name: test_intent_conversion_not_expose_new.1
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -206,6 +214,7 @@
 # ---
 # name: test_intent_entity_added_removed
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -236,6 +245,7 @@
 # ---
 # name: test_intent_entity_added_removed.1
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -266,6 +276,7 @@
 # ---
 # name: test_intent_entity_added_removed.2
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -296,6 +307,7 @@
 # ---
 # name: test_intent_entity_added_removed.3
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -316,6 +328,7 @@
 # ---
 # name: test_intent_entity_exposed
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -346,6 +359,7 @@
 # ---
 # name: test_intent_entity_fail_if_unexposed
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -366,6 +380,7 @@
 # ---
 # name: test_intent_entity_remove_custom_name
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -386,6 +401,7 @@
 # ---
 # name: test_intent_entity_remove_custom_name.1
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -416,6 +432,7 @@
 # ---
 # name: test_intent_entity_remove_custom_name.2
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -436,6 +453,7 @@
 # ---
 # name: test_intent_entity_renamed
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -466,6 +484,7 @@
 # ---
 # name: test_intent_entity_renamed.1
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
diff --git a/tests/components/conversation/snapshots/test_http.ambr b/tests/components/conversation/snapshots/test_http.ambr
index 1102a41e6c3..abce735dd8a 100644
--- a/tests/components/conversation/snapshots/test_http.ambr
+++ b/tests/components/conversation/snapshots/test_http.ambr
@@ -32,6 +32,7 @@
           'it',
           'ka',
           'ko',
+          'kw',
           'lb',
           'lt',
           'lv',
@@ -49,6 +50,7 @@
           'sk',
           'sl',
           'sr',
+          'sr-Latn',
           'sv',
           'sw',
           'te',
@@ -201,6 +203,7 @@
 # ---
 # name: test_http_api_handle_failure
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -221,6 +224,7 @@
 # ---
 # name: test_http_api_no_match
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -241,6 +245,7 @@
 # ---
 # name: test_http_api_unexpected_failure
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -261,6 +266,7 @@
 # ---
 # name: test_http_processing_intent[None]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -291,6 +297,7 @@
 # ---
 # name: test_http_processing_intent[conversation.home_assistant]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -321,6 +328,7 @@
 # ---
 # name: test_http_processing_intent[homeassistant]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -351,6 +359,7 @@
 # ---
 # name: test_ws_api[payload0]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -371,6 +380,7 @@
 # ---
 # name: test_ws_api[payload1]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -391,6 +401,7 @@
 # ---
 # name: test_ws_api[payload2]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -411,6 +422,7 @@
 # ---
 # name: test_ws_api[payload3]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -431,6 +443,7 @@
 # ---
 # name: test_ws_api[payload4]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -451,6 +464,7 @@
 # ---
 # name: test_ws_api[payload5]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -539,7 +553,7 @@
           'name': 'HassTurnOn',
         }),
         'match': True,
-        'sentence_template': '<turn> on [<all>] <light> <in> <area>',
+        'sentence_template': '<turn> on [(<all>|<the>)] <light> <in> <area>',
         'slots': dict({
           'area': 'kitchen',
           'domain': 'light',
@@ -638,7 +652,7 @@
           'brightness': dict({
             'name': 'brightness',
             'text': '100',
-            'value': 100,
+            'value': 100.0,
           }),
           'name': dict({
             'name': 'name',
@@ -690,7 +704,7 @@
         'targets': dict({
         }),
         'unmatched_slots': dict({
-          'brightness': 1001,
+          'brightness': 1001.0,
         }),
       }),
     ]),
diff --git a/tests/components/conversation/snapshots/test_init.ambr b/tests/components/conversation/snapshots/test_init.ambr
index 911c7043a6d..3d843d4e32a 100644
--- a/tests/components/conversation/snapshots/test_init.ambr
+++ b/tests/components/conversation/snapshots/test_init.ambr
@@ -1,6 +1,7 @@
 # serializer version: 1
 # name: test_custom_agent
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -44,6 +45,7 @@
 # ---
 # name: test_turn_on_intent[None-turn kitchen on-None]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -74,6 +76,7 @@
 # ---
 # name: test_turn_on_intent[None-turn kitchen on-conversation.home_assistant]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -104,6 +107,7 @@
 # ---
 # name: test_turn_on_intent[None-turn kitchen on-homeassistant]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -134,6 +138,7 @@
 # ---
 # name: test_turn_on_intent[None-turn on kitchen-None]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -164,6 +169,7 @@
 # ---
 # name: test_turn_on_intent[None-turn on kitchen-conversation.home_assistant]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -194,6 +200,7 @@
 # ---
 # name: test_turn_on_intent[None-turn on kitchen-homeassistant]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -224,6 +231,7 @@
 # ---
 # name: test_turn_on_intent[my_new_conversation-turn kitchen on-None]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -254,6 +262,7 @@
 # ---
 # name: test_turn_on_intent[my_new_conversation-turn kitchen on-conversation.home_assistant]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -284,6 +293,7 @@
 # ---
 # name: test_turn_on_intent[my_new_conversation-turn kitchen on-homeassistant]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -314,6 +324,7 @@
 # ---
 # name: test_turn_on_intent[my_new_conversation-turn on kitchen-None]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -344,6 +355,7 @@
 # ---
 # name: test_turn_on_intent[my_new_conversation-turn on kitchen-conversation.home_assistant]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
@@ -374,6 +386,7 @@
 # ---
 # name: test_turn_on_intent[my_new_conversation-turn on kitchen-homeassistant]
   dict({
+    'continue_conversation': False,
     'conversation_id': <ANY>,
     'response': dict({
       'card': dict({
diff --git a/tests/components/conversation/snapshots/test_session.ambr b/tests/components/conversation/snapshots/test_session.ambr
deleted file mode 100644
index 4e94157c601..00000000000
--- a/tests/components/conversation/snapshots/test_session.ambr
+++ /dev/null
@@ -1,41 +0,0 @@
-# serializer version: 1
-# name: test_template_error
-  dict({
-    'conversation_id': <ANY>,
-    'response': dict({
-      'card': dict({
-      }),
-      'data': dict({
-        'code': 'unknown',
-      }),
-      'language': 'en',
-      'response_type': 'error',
-      'speech': dict({
-        'plain': dict({
-          'extra_data': None,
-          'speech': 'Sorry, I had a problem with my template',
-        }),
-      }),
-    }),
-  })
-# ---
-# name: test_unknown_llm_api
-  dict({
-    'conversation_id': <ANY>,
-    'response': dict({
-      'card': dict({
-      }),
-      'data': dict({
-        'code': 'unknown',
-      }),
-      'language': 'en',
-      'response_type': 'error',
-      'speech': dict({
-        'plain': dict({
-          'extra_data': None,
-          'speech': 'Error preparing LLM API',
-        }),
-      }),
-    }),
-  })
-# ---
diff --git a/tests/components/conversation/test_chat_log.py b/tests/components/conversation/test_chat_log.py
new file mode 100644
index 00000000000..d7b3531c658
--- /dev/null
+++ b/tests/components/conversation/test_chat_log.py
@@ -0,0 +1,673 @@
+"""Test the conversation session."""
+
+from collections.abc import Generator
+from dataclasses import asdict
+from datetime import timedelta
+from unittest.mock import AsyncMock, Mock, patch
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+import voluptuous as vol
+
+from homeassistant.components.conversation import (
+    AssistantContent,
+    ConversationInput,
+    ConverseError,
+    ToolResultContent,
+    UserContent,
+    async_get_chat_log,
+)
+from homeassistant.components.conversation.chat_log import DATA_CHAT_LOGS
+from homeassistant.core import Context, HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import chat_session, llm
+from homeassistant.util import dt as dt_util
+
+from tests.common import async_fire_time_changed
+
+
+@pytest.fixture
+def mock_conversation_input(hass: HomeAssistant) -> ConversationInput:
+    """Return a conversation input instance."""
+    return ConversationInput(
+        text="Hello",
+        context=Context(),
+        conversation_id=None,
+        agent_id="mock-agent-id",
+        device_id=None,
+        language="en",
+    )
+
+
+@pytest.fixture
+def mock_ulid() -> Generator[Mock]:
+    """Mock the ulid library."""
+    with patch("homeassistant.helpers.chat_session.ulid_now") as mock_ulid_now:
+        mock_ulid_now.return_value = "mock-ulid"
+        yield mock_ulid_now
+
+
+async def test_cleanup(
+    hass: HomeAssistant,
+    mock_conversation_input: ConversationInput,
+) -> None:
+    """Test cleanup of the chat log."""
+    with (
+        chat_session.async_get_chat_session(hass) as session,
+        async_get_chat_log(hass, session, mock_conversation_input) as chat_log,
+    ):
+        conversation_id = session.conversation_id
+        # Add message so it persists
+        chat_log.async_add_assistant_content_without_tools(
+            AssistantContent(
+                agent_id="mock-agent-id",
+                content="Hey!",
+            )
+        )
+
+    assert conversation_id in hass.data[DATA_CHAT_LOGS]
+
+    # Set the last updated to be older than the timeout
+    hass.data[chat_session.DATA_CHAT_SESSION][conversation_id].last_updated = (
+        dt_util.utcnow() + chat_session.CONVERSATION_TIMEOUT
+    )
+
+    async_fire_time_changed(
+        hass,
+        dt_util.utcnow() + chat_session.CONVERSATION_TIMEOUT * 2 + timedelta(seconds=1),
+    )
+
+    assert conversation_id not in hass.data[DATA_CHAT_LOGS]
+
+
+async def test_default_content(
+    hass: HomeAssistant, mock_conversation_input: ConversationInput
+) -> None:
+    """Test filtering of messages."""
+    with (
+        chat_session.async_get_chat_session(hass) as session,
+        async_get_chat_log(hass, session, mock_conversation_input) as chat_log,
+        async_get_chat_log(hass, session, mock_conversation_input) as chat_log2,
+    ):
+        assert chat_log is chat_log2
+        assert len(chat_log.content) == 2
+        assert chat_log.content[0].role == "system"
+        assert chat_log.content[0].content == ""
+        assert chat_log.content[1].role == "user"
+        assert chat_log.content[1].content == mock_conversation_input.text
+
+
+async def test_llm_api(
+    hass: HomeAssistant,
+    mock_conversation_input: ConversationInput,
+) -> None:
+    """Test when we reference an LLM API."""
+    with (
+        chat_session.async_get_chat_session(hass) as session,
+        async_get_chat_log(hass, session, mock_conversation_input) as chat_log,
+    ):
+        await chat_log.async_update_llm_data(
+            conversing_domain="test",
+            user_input=mock_conversation_input,
+            user_llm_hass_api="assist",
+            user_llm_prompt=None,
+        )
+
+    assert isinstance(chat_log.llm_api, llm.APIInstance)
+    assert chat_log.llm_api.api.id == "assist"
+
+
+async def test_unknown_llm_api(
+    hass: HomeAssistant,
+    mock_conversation_input: ConversationInput,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test when we reference an LLM API that does not exists."""
+    with (
+        chat_session.async_get_chat_session(hass) as session,
+        async_get_chat_log(hass, session, mock_conversation_input) as chat_log,
+        pytest.raises(ConverseError) as exc_info,
+    ):
+        await chat_log.async_update_llm_data(
+            conversing_domain="test",
+            user_input=mock_conversation_input,
+            user_llm_hass_api="unknown-api",
+            user_llm_prompt=None,
+        )
+
+    assert str(exc_info.value) == "Error getting LLM API unknown-api"
+    assert exc_info.value.as_conversation_result().as_dict() == snapshot
+
+
+async def test_template_error(
+    hass: HomeAssistant,
+    mock_conversation_input: ConversationInput,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test that template error handling works."""
+    with (
+        chat_session.async_get_chat_session(hass) as session,
+        async_get_chat_log(hass, session, mock_conversation_input) as chat_log,
+        pytest.raises(ConverseError) as exc_info,
+    ):
+        await chat_log.async_update_llm_data(
+            conversing_domain="test",
+            user_input=mock_conversation_input,
+            user_llm_hass_api=None,
+            user_llm_prompt="{{ invalid_syntax",
+        )
+
+    assert str(exc_info.value) == "Error rendering prompt"
+    assert exc_info.value.as_conversation_result().as_dict() == snapshot
+
+
+async def test_template_variables(
+    hass: HomeAssistant, mock_conversation_input: ConversationInput
+) -> None:
+    """Test that template variables work."""
+    mock_user = Mock()
+    mock_user.id = "12345"
+    mock_user.name = "Test User"
+    mock_conversation_input.context = Context(user_id=mock_user.id)
+
+    with (
+        chat_session.async_get_chat_session(hass) as session,
+        async_get_chat_log(hass, session, mock_conversation_input) as chat_log,
+        patch("homeassistant.auth.AuthManager.async_get_user", return_value=mock_user),
+    ):
+        await chat_log.async_update_llm_data(
+            conversing_domain="test",
+            user_input=mock_conversation_input,
+            user_llm_hass_api=None,
+            user_llm_prompt=(
+                "The instance name is {{ ha_name }}. "
+                "The user name is {{ user_name }}. "
+                "The user id is {{ llm_context.context.user_id }}."
+                "The calling platform is {{ llm_context.platform }}."
+            ),
+        )
+
+    assert "The instance name is test home." in chat_log.content[0].content
+    assert "The user name is Test User." in chat_log.content[0].content
+    assert "The user id is 12345." in chat_log.content[0].content
+    assert "The calling platform is test." in chat_log.content[0].content
+
+
+async def test_extra_systen_prompt(
+    hass: HomeAssistant, mock_conversation_input: ConversationInput
+) -> None:
+    """Test that extra system prompt works."""
+    extra_system_prompt = "Garage door cover.garage_door has been left open for 30 minutes. We asked the user if they want to close it."
+    extra_system_prompt2 = (
+        "User person.paulus came home. Asked him what he wants to do."
+    )
+    mock_conversation_input.extra_system_prompt = extra_system_prompt
+
+    with (
+        chat_session.async_get_chat_session(hass) as session,
+        async_get_chat_log(hass, session, mock_conversation_input) as chat_log,
+    ):
+        await chat_log.async_update_llm_data(
+            conversing_domain="test",
+            user_input=mock_conversation_input,
+            user_llm_hass_api=None,
+            user_llm_prompt=None,
+        )
+        chat_log.async_add_assistant_content_without_tools(
+            AssistantContent(
+                agent_id="mock-agent-id",
+                content="Hey!",
+            )
+        )
+
+    assert chat_log.extra_system_prompt == extra_system_prompt
+    assert chat_log.content[0].content.endswith(extra_system_prompt)
+
+    # Verify that follow-up conversations with no system prompt take previous one
+    conversation_id = chat_log.conversation_id
+    mock_conversation_input.extra_system_prompt = None
+
+    with (
+        chat_session.async_get_chat_session(hass, conversation_id) as session,
+        async_get_chat_log(hass, session, mock_conversation_input) as chat_log,
+    ):
+        await chat_log.async_update_llm_data(
+            conversing_domain="test",
+            user_input=mock_conversation_input,
+            user_llm_hass_api=None,
+            user_llm_prompt=None,
+        )
+
+    assert chat_log.extra_system_prompt == extra_system_prompt
+    assert chat_log.content[0].content.endswith(extra_system_prompt)
+
+    # Verify that we take new system prompts
+    mock_conversation_input.extra_system_prompt = extra_system_prompt2
+
+    with (
+        chat_session.async_get_chat_session(hass, conversation_id) as session,
+        async_get_chat_log(hass, session, mock_conversation_input) as chat_log,
+    ):
+        await chat_log.async_update_llm_data(
+            conversing_domain="test",
+            user_input=mock_conversation_input,
+            user_llm_hass_api=None,
+            user_llm_prompt=None,
+        )
+        chat_log.async_add_assistant_content_without_tools(
+            AssistantContent(
+                agent_id="mock-agent-id",
+                content="Hey!",
+            )
+        )
+
+    assert chat_log.extra_system_prompt == extra_system_prompt2
+    assert chat_log.content[0].content.endswith(extra_system_prompt2)
+    assert extra_system_prompt not in chat_log.content[0].content
+
+    # Verify that follow-up conversations with no system prompt take previous one
+    mock_conversation_input.extra_system_prompt = None
+
+    with (
+        chat_session.async_get_chat_session(hass, conversation_id) as session,
+        async_get_chat_log(hass, session, mock_conversation_input) as chat_log,
+    ):
+        await chat_log.async_update_llm_data(
+            conversing_domain="test",
+            user_input=mock_conversation_input,
+            user_llm_hass_api=None,
+            user_llm_prompt=None,
+        )
+
+    assert chat_log.extra_system_prompt == extra_system_prompt2
+    assert chat_log.content[0].content.endswith(extra_system_prompt2)
+
+
+@pytest.mark.parametrize(
+    "prerun_tool_tasks",
+    [
+        (),
+        ("mock-tool-call-id",),
+        ("mock-tool-call-id", "mock-tool-call-id-2"),
+    ],
+)
+async def test_tool_call(
+    hass: HomeAssistant,
+    mock_conversation_input: ConversationInput,
+    prerun_tool_tasks: tuple[str],
+) -> None:
+    """Test using the session tool calling API."""
+
+    mock_tool = AsyncMock()
+    mock_tool.name = "test_tool"
+    mock_tool.description = "Test function"
+    mock_tool.parameters = vol.Schema(
+        {vol.Optional("param1", description="Test parameters"): str}
+    )
+    mock_tool.async_call.return_value = "Test response"
+
+    with patch(
+        "homeassistant.helpers.llm.AssistAPI._async_get_tools", return_value=[]
+    ) as mock_get_tools:
+        mock_get_tools.return_value = [mock_tool]
+
+        with (
+            chat_session.async_get_chat_session(hass) as session,
+            async_get_chat_log(hass, session, mock_conversation_input) as chat_log,
+        ):
+            await chat_log.async_update_llm_data(
+                conversing_domain="test",
+                user_input=mock_conversation_input,
+                user_llm_hass_api="assist",
+                user_llm_prompt=None,
+            )
+            content = AssistantContent(
+                agent_id=mock_conversation_input.agent_id,
+                content="",
+                tool_calls=[
+                    llm.ToolInput(
+                        id="mock-tool-call-id",
+                        tool_name="test_tool",
+                        tool_args={"param1": "Test Param"},
+                    ),
+                    llm.ToolInput(
+                        id="mock-tool-call-id-2",
+                        tool_name="test_tool",
+                        tool_args={"param1": "Test Param"},
+                    ),
+                ],
+            )
+
+            tool_call_tasks = {
+                tool_call_id: hass.async_create_task(
+                    chat_log.llm_api.async_call_tool(content.tool_calls[0]),
+                    tool_call_id,
+                )
+                for tool_call_id in prerun_tool_tasks
+            }
+
+            with pytest.raises(ValueError):
+                chat_log.async_add_assistant_content_without_tools(content)
+
+            results = [
+                tool_result_content
+                async for tool_result_content in chat_log.async_add_assistant_content(
+                    content, tool_call_tasks=tool_call_tasks or None
+                )
+            ]
+
+            assert results[0] == ToolResultContent(
+                agent_id=mock_conversation_input.agent_id,
+                tool_call_id="mock-tool-call-id",
+                tool_result="Test response",
+                tool_name="test_tool",
+            )
+            assert results[1] == ToolResultContent(
+                agent_id=mock_conversation_input.agent_id,
+                tool_call_id="mock-tool-call-id-2",
+                tool_result="Test response",
+                tool_name="test_tool",
+            )
+
+
+async def test_tool_call_exception(
+    hass: HomeAssistant,
+    mock_conversation_input: ConversationInput,
+) -> None:
+    """Test using the session tool calling API."""
+
+    mock_tool = AsyncMock()
+    mock_tool.name = "test_tool"
+    mock_tool.description = "Test function"
+    mock_tool.parameters = vol.Schema(
+        {vol.Optional("param1", description="Test parameters"): str}
+    )
+    mock_tool.async_call.side_effect = HomeAssistantError("Test error")
+
+    with (
+        patch(
+            "homeassistant.helpers.llm.AssistAPI._async_get_tools", return_value=[]
+        ) as mock_get_tools,
+        chat_session.async_get_chat_session(hass) as session,
+        async_get_chat_log(hass, session, mock_conversation_input) as chat_log,
+    ):
+        mock_get_tools.return_value = [mock_tool]
+        await chat_log.async_update_llm_data(
+            conversing_domain="test",
+            user_input=mock_conversation_input,
+            user_llm_hass_api="assist",
+            user_llm_prompt=None,
+        )
+        result = None
+        async for tool_result_content in chat_log.async_add_assistant_content(
+            AssistantContent(
+                agent_id=mock_conversation_input.agent_id,
+                content="",
+                tool_calls=[
+                    llm.ToolInput(
+                        id="mock-tool-call-id",
+                        tool_name="test_tool",
+                        tool_args={"param1": "Test Param"},
+                    )
+                ],
+            )
+        ):
+            assert result is None
+            result = tool_result_content
+
+    assert result == ToolResultContent(
+        agent_id=mock_conversation_input.agent_id,
+        tool_call_id="mock-tool-call-id",
+        tool_result={"error": "HomeAssistantError", "error_text": "Test error"},
+        tool_name="test_tool",
+    )
+
+
+@pytest.mark.parametrize(
+    "deltas",
+    [
+        [],
+        # With content
+        [
+            {"role": "assistant"},
+            {"content": "Test"},
+        ],
+        # With 2 content
+        [
+            {"role": "assistant"},
+            {"content": "Test"},
+            {"role": "assistant"},
+            {"content": "Test 2"},
+        ],
+        # With 1 tool call
+        [
+            {"role": "assistant"},
+            {
+                "tool_calls": [
+                    llm.ToolInput(
+                        id="mock-tool-call-id",
+                        tool_name="test_tool",
+                        tool_args={"param1": "Test Param 1"},
+                    )
+                ]
+            },
+        ],
+        # With content and 1 tool call
+        [
+            {"role": "assistant"},
+            {"content": "Test"},
+            {
+                "tool_calls": [
+                    llm.ToolInput(
+                        id="mock-tool-call-id",
+                        tool_name="test_tool",
+                        tool_args={"param1": "Test Param 1"},
+                    )
+                ]
+            },
+        ],
+        # With 2 contents and 1 tool call
+        [
+            {"role": "assistant"},
+            {"content": "Test"},
+            {
+                "tool_calls": [
+                    llm.ToolInput(
+                        id="mock-tool-call-id",
+                        tool_name="test_tool",
+                        tool_args={"param1": "Test Param 1"},
+                    )
+                ]
+            },
+            {"role": "assistant"},
+            {"content": "Test 2"},
+        ],
+        # With 2 tool calls
+        [
+            {"role": "assistant"},
+            {
+                "tool_calls": [
+                    llm.ToolInput(
+                        id="mock-tool-call-id",
+                        tool_name="test_tool",
+                        tool_args={"param1": "Test Param 1"},
+                    )
+                ]
+            },
+            {
+                "tool_calls": [
+                    llm.ToolInput(
+                        id="mock-tool-call-id-2",
+                        tool_name="test_tool",
+                        tool_args={"param1": "Test Param 2"},
+                    )
+                ]
+            },
+        ],
+    ],
+)
+async def test_add_delta_content_stream(
+    hass: HomeAssistant,
+    mock_conversation_input: ConversationInput,
+    snapshot: SnapshotAssertion,
+    deltas: list[dict],
+) -> None:
+    """Test streaming deltas."""
+
+    mock_tool = AsyncMock()
+    mock_tool.name = "test_tool"
+    mock_tool.description = "Test function"
+    mock_tool.parameters = vol.Schema(
+        {vol.Optional("param1", description="Test parameters"): str}
+    )
+
+    async def tool_call(
+        hass: HomeAssistant, tool_input: llm.ToolInput, llm_context: llm.LLMContext
+    ) -> str:
+        """Call the tool."""
+        return tool_input.tool_args["param1"]
+
+    mock_tool.async_call.side_effect = tool_call
+    expected_delta = []
+
+    async def stream():
+        """Yield deltas."""
+        for d in deltas:
+            yield d
+            expected_delta.append(d)
+
+    captured_deltas = []
+
+    with (
+        patch(
+            "homeassistant.helpers.llm.AssistAPI._async_get_tools", return_value=[]
+        ) as mock_get_tools,
+        chat_session.async_get_chat_session(hass) as session,
+        async_get_chat_log(
+            hass,
+            session,
+            mock_conversation_input,
+            chat_log_delta_listener=lambda chat_log, delta: captured_deltas.append(
+                delta
+            ),
+        ) as chat_log,
+    ):
+        mock_get_tools.return_value = [mock_tool]
+        await chat_log.async_update_llm_data(
+            conversing_domain="test",
+            user_input=mock_conversation_input,
+            user_llm_hass_api="assist",
+            user_llm_prompt=None,
+        )
+
+        results = []
+        async for content in chat_log.async_add_delta_content_stream(
+            "mock-agent-id", stream()
+        ):
+            results.append(content)
+
+            # Interweave the tool results with the source deltas into expected_delta
+            if content.role == "tool_result":
+                expected_delta.append(asdict(content))
+
+        assert captured_deltas == expected_delta
+        assert results == snapshot
+        assert chat_log.content[2:] == results
+
+
+async def test_add_delta_content_stream_errors(
+    hass: HomeAssistant,
+    mock_conversation_input: ConversationInput,
+) -> None:
+    """Test streaming deltas error handling."""
+
+    async def stream(deltas):
+        """Yield deltas."""
+        for d in deltas:
+            yield d
+
+    with (
+        chat_session.async_get_chat_session(hass) as session,
+        async_get_chat_log(hass, session, mock_conversation_input) as chat_log,
+    ):
+        # Stream content without LLM API set
+        with pytest.raises(ValueError):
+            async for _tool_result_content in chat_log.async_add_delta_content_stream(
+                "mock-agent-id",
+                stream(
+                    [
+                        {"role": "assistant"},
+                        {
+                            "tool_calls": [
+                                llm.ToolInput(
+                                    id="mock-tool-call-id",
+                                    tool_name="test_tool",
+                                    tool_args={},
+                                )
+                            ]
+                        },
+                    ]
+                ),
+            ):
+                pass
+
+        # Non assistant role
+        for role in "system", "user":
+            with pytest.raises(ValueError):
+                async for (
+                    _tool_result_content
+                ) in chat_log.async_add_delta_content_stream(
+                    "mock-agent-id",
+                    stream([{"role": role}]),
+                ):
+                    pass
+
+
+async def test_chat_log_reuse(
+    hass: HomeAssistant,
+    mock_conversation_input: ConversationInput,
+) -> None:
+    """Test that we can reuse a chat log."""
+    with (
+        chat_session.async_get_chat_session(hass) as session,
+        async_get_chat_log(hass, session) as chat_log,
+    ):
+        assert chat_log.conversation_id == session.conversation_id
+        assert len(chat_log.content) == 1
+
+        with async_get_chat_log(hass, session) as chat_log2:
+            assert chat_log2 is chat_log
+            assert len(chat_log.content) == 1
+
+        with async_get_chat_log(hass, session, mock_conversation_input) as chat_log2:
+            assert chat_log2 is chat_log
+            assert len(chat_log.content) == 2
+            assert chat_log.content[1].role == "user"
+            assert chat_log.content[1].content == mock_conversation_input.text
+
+
+async def test_chat_log_continue_conversation(
+    hass: HomeAssistant,
+    mock_conversation_input: ConversationInput,
+) -> None:
+    """Test continue conversation."""
+    with (
+        chat_session.async_get_chat_session(hass) as session,
+        async_get_chat_log(hass, session) as chat_log,
+    ):
+        assert chat_log.continue_conversation is False
+        chat_log.async_add_user_content(UserContent(mock_conversation_input.text))
+        assert chat_log.continue_conversation is False
+        chat_log.async_add_assistant_content_without_tools(
+            AssistantContent(
+                agent_id="mock-agent-id",
+                content="Hey? ",
+            )
+        )
+        chat_log.async_add_assistant_content_without_tools(
+            AssistantContent(
+                agent_id="mock-agent-id",
+                content="Ποιο είναι το αγαπημένο σου χρώμα στα ελληνικά;",
+            )
+        )
+        assert chat_log.continue_conversation is True
diff --git a/tests/components/conversation/test_default_agent.py b/tests/components/conversation/test_default_agent.py
index 54aa30b3fcf..dca4653b480 100644
--- a/tests/components/conversation/test_default_agent.py
+++ b/tests/components/conversation/test_default_agent.py
@@ -3154,6 +3154,79 @@ async def test_handle_intents_with_response_errors(
         assert response is None
 
 
+@pytest.mark.usefixtures("init_components")
+async def test_handle_intents_filters_results(
+    hass: HomeAssistant,
+    init_components: None,
+    area_registry: ar.AreaRegistry,
+) -> None:
+    """Test that handle_intents can filter responses."""
+    assert await async_setup_component(hass, "climate", {})
+    area_registry.async_create("living room")
+
+    agent: default_agent.DefaultAgent = hass.data[DATA_DEFAULT_ENTITY]
+
+    user_input = ConversationInput(
+        text="What is the temperature in the living room?",
+        context=Context(),
+        conversation_id=None,
+        device_id=None,
+        language=hass.config.language,
+        agent_id=None,
+    )
+
+    mock_result = RecognizeResult(
+        intent=Intent("HassTurnOn"),
+        intent_data=IntentData([]),
+        entities={},
+        entities_list=[],
+    )
+    results = []
+
+    def _filter_intents(result):
+        results.append(result)
+        # We filter first, not 2nd.
+        return len(results) == 1
+
+    with (
+        patch(
+            "homeassistant.components.conversation.default_agent.DefaultAgent.async_recognize_intent",
+            return_value=mock_result,
+        ) as mock_recognize,
+        patch(
+            "homeassistant.components.conversation.default_agent.DefaultAgent._async_process_intent_result",
+        ) as mock_process,
+    ):
+        response = await agent.async_handle_intents(
+            user_input, intent_filter=_filter_intents
+        )
+
+        assert len(mock_recognize.mock_calls) == 1
+        assert len(mock_process.mock_calls) == 0
+
+        # It was ignored
+        assert response is None
+
+        # Check we filtered things
+        assert len(results) == 1
+        assert results[0] is mock_result
+
+        # Second time it is not filtered
+        response = await agent.async_handle_intents(
+            user_input, intent_filter=_filter_intents
+        )
+
+        assert len(mock_recognize.mock_calls) == 2
+        assert len(mock_process.mock_calls) == 2
+
+        # Check we filtered things
+        assert len(results) == 2
+        assert results[1] is mock_result
+
+        # It was ignored
+        assert response is not None
+
+
 @pytest.mark.usefixtures("init_components")
 async def test_state_names_are_not_translated(
     hass: HomeAssistant,
@@ -3178,3 +3251,39 @@ async def test_state_names_are_not_translated(
             mock_async_render.call_args.args[0]["state"].state
             == weather.ATTR_CONDITION_PARTLYCLOUDY
         )
+
+
+async def test_language_with_alternative_code(
+    hass: HomeAssistant, init_components
+) -> None:
+    """Test different codes for the same language."""
+    entity_ids: dict[str, str] = {}
+    for i, (lang_code, sentence, name) in enumerate(
+        (
+            ("no", "slå på lampen", "lampen"),  # nb
+            ("no-NO", "slå på lampen", "lampen"),  # nb
+            ("iw", "הדליקי את המנורה", "מנורה"),  # he
+        )
+    ):
+        if not (entity_id := entity_ids.get(name)):
+            # Reuse entity id for the same name
+            entity_id = f"light.test{i}"
+            entity_ids[name] = entity_id
+
+        hass.states.async_set(entity_id, "off", attributes={ATTR_FRIENDLY_NAME: name})
+        calls = async_mock_service(hass, LIGHT_DOMAIN, "turn_on")
+        await hass.services.async_call(
+            "conversation",
+            "process",
+            {
+                conversation.ATTR_TEXT: sentence,
+                conversation.ATTR_LANGUAGE: lang_code,
+            },
+        )
+        await hass.async_block_till_done()
+
+        assert len(calls) == 1, f"Failed for {lang_code}, {sentence}"
+        call = calls[0]
+        assert call.domain == LIGHT_DOMAIN
+        assert call.service == "turn_on"
+        assert call.data == {"entity_id": [entity_id]}
diff --git a/tests/components/conversation/test_entity.py b/tests/components/conversation/test_entity.py
index 109c0ed361f..f03b24818bf 100644
--- a/tests/components/conversation/test_entity.py
+++ b/tests/components/conversation/test_entity.py
@@ -6,7 +6,7 @@ from homeassistant.components import conversation
 from homeassistant.core import Context, HomeAssistant, State
 from homeassistant.helpers import intent
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import mock_restore_cache
 
diff --git a/tests/components/conversation/test_http.py b/tests/components/conversation/test_http.py
index 6d69ec3c739..77fa97ad845 100644
--- a/tests/components/conversation/test_http.py
+++ b/tests/components/conversation/test_http.py
@@ -536,3 +536,60 @@ async def test_ws_hass_agent_debug_sentence_trigger(
 
     # Trigger should not have been executed
     assert len(calls) == 0
+
+
+async def test_ws_hass_language_scores(
+    hass: HomeAssistant, init_components, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test getting language support scores."""
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id(
+        {"type": "conversation/agent/homeassistant/language_scores"}
+    )
+
+    msg = await client.receive_json()
+    assert msg["success"]
+
+    # Sanity check
+    result = msg["result"]
+    assert result["languages"]["en-US"] == {
+        "cloud": 3,
+        "focused_local": 2,
+        "full_local": 3,
+    }
+
+
+async def test_ws_hass_language_scores_with_filter(
+    hass: HomeAssistant, init_components, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test getting language support scores with language/country filter."""
+    client = await hass_ws_client(hass)
+
+    # Language filter
+    await client.send_json_auto_id(
+        {"type": "conversation/agent/homeassistant/language_scores", "language": "de"}
+    )
+
+    msg = await client.receive_json()
+    assert msg["success"]
+
+    # German should be preferred
+    result = msg["result"]
+    assert result["preferred_language"] == "de-DE"
+
+    # Language/country filter
+    await client.send_json_auto_id(
+        {
+            "type": "conversation/agent/homeassistant/language_scores",
+            "language": "en",
+            "country": "GB",
+        }
+    )
+
+    msg = await client.receive_json()
+    assert msg["success"]
+
+    # GB English should be preferred
+    result = msg["result"]
+    assert result["preferred_language"] == "en-GB"
diff --git a/tests/components/conversation/test_init.py b/tests/components/conversation/test_init.py
index 6900ba2d419..9ac5c7d16a4 100644
--- a/tests/components/conversation/test_init.py
+++ b/tests/components/conversation/test_init.py
@@ -271,6 +271,7 @@ async def test_async_handle_sentence_triggers(
             text="my trigger",
             context=Context(),
             conversation_id=None,
+            agent_id=conversation.HOME_ASSISTANT_AGENT,
             device_id=device_id,
             language=hass.config.language,
         ),
@@ -306,6 +307,7 @@ async def test_async_handle_intents(hass: HomeAssistant) -> None:
         ConversationInput(
             text="I'd like to order a stout",
             context=Context(),
+            agent_id=conversation.HOME_ASSISTANT_AGENT,
             conversation_id=None,
             device_id=None,
             language=hass.config.language,
@@ -321,6 +323,7 @@ async def test_async_handle_intents(hass: HomeAssistant) -> None:
         hass,
         ConversationInput(
             text="this sentence does not exist",
+            agent_id=conversation.HOME_ASSISTANT_AGENT,
             context=Context(),
             conversation_id=None,
             device_id=None,
diff --git a/tests/components/conversation/test_session.py b/tests/components/conversation/test_session.py
deleted file mode 100644
index feb6ca2a9e8..00000000000
--- a/tests/components/conversation/test_session.py
+++ /dev/null
@@ -1,415 +0,0 @@
-"""Test the conversation session."""
-
-from collections.abc import Generator
-from datetime import timedelta
-from unittest.mock import Mock, patch
-
-import pytest
-from syrupy.assertion import SnapshotAssertion
-
-from homeassistant.components.conversation import ConversationInput, session
-from homeassistant.core import Context, HomeAssistant
-from homeassistant.helpers import llm
-from homeassistant.util import dt as dt_util
-
-from tests.common import async_fire_time_changed
-
-
-@pytest.fixture
-def mock_conversation_input(hass: HomeAssistant) -> ConversationInput:
-    """Return a conversation input instance."""
-    return ConversationInput(
-        text="Hello",
-        context=Context(),
-        conversation_id=None,
-        agent_id="mock-agent-id",
-        device_id=None,
-        language="en",
-    )
-
-
-@pytest.fixture
-def mock_ulid() -> Generator[Mock]:
-    """Mock the ulid library."""
-    with patch("homeassistant.util.ulid.ulid_now") as mock_ulid_now:
-        mock_ulid_now.return_value = "mock-ulid"
-        yield mock_ulid_now
-
-
-@pytest.mark.parametrize(
-    ("start_id", "given_id"),
-    [
-        (None, "mock-ulid"),
-        # This ULID is not known as a session
-        ("01JHXE0952TSJCFJZ869AW6HMD", "mock-ulid"),
-        ("not-a-ulid", "not-a-ulid"),
-    ],
-)
-async def test_conversation_id(
-    hass: HomeAssistant,
-    mock_conversation_input: ConversationInput,
-    mock_ulid: Mock,
-    start_id: str | None,
-    given_id: str,
-) -> None:
-    """Test conversation ID generation."""
-    mock_conversation_input.conversation_id = start_id
-    async with session.async_get_chat_session(
-        hass, mock_conversation_input
-    ) as chat_session:
-        assert chat_session.conversation_id == given_id
-
-
-async def test_cleanup(
-    hass: HomeAssistant,
-    mock_conversation_input: ConversationInput,
-) -> None:
-    """Mock cleanup of the conversation session."""
-    async with session.async_get_chat_session(
-        hass, mock_conversation_input
-    ) as chat_session:
-        assert len(chat_session.messages) == 2
-        conversation_id = chat_session.conversation_id
-
-    # Generate session entry.
-    async with session.async_get_chat_session(
-        hass, mock_conversation_input
-    ) as chat_session:
-        # Because we didn't add a message to the session in the last block,
-        # the conversation was not be persisted and we get a new ID
-        assert chat_session.conversation_id != conversation_id
-        conversation_id = chat_session.conversation_id
-        chat_session.async_add_message(
-            session.ChatMessage(
-                role="assistant",
-                agent_id="mock-agent-id",
-                content="Hey!",
-            )
-        )
-        assert len(chat_session.messages) == 3
-
-    # Reuse conversation ID to ensure we can chat with same session
-    mock_conversation_input.conversation_id = conversation_id
-    async with session.async_get_chat_session(
-        hass, mock_conversation_input
-    ) as chat_session:
-        assert len(chat_session.messages) == 4
-        assert chat_session.conversation_id == conversation_id
-
-    # Set the last updated to be older than the timeout
-    hass.data[session.DATA_CHAT_HISTORY][conversation_id].last_updated = (
-        dt_util.utcnow() + session.CONVERSATION_TIMEOUT
-    )
-
-    async_fire_time_changed(
-        hass, dt_util.utcnow() + session.CONVERSATION_TIMEOUT + timedelta(seconds=1)
-    )
-
-    # Should not be cleaned up, but it should have scheduled another cleanup
-    mock_conversation_input.conversation_id = conversation_id
-    async with session.async_get_chat_session(
-        hass, mock_conversation_input
-    ) as chat_session:
-        assert len(chat_session.messages) == 4
-        assert chat_session.conversation_id == conversation_id
-
-    async_fire_time_changed(
-        hass, dt_util.utcnow() + session.CONVERSATION_TIMEOUT * 2 + timedelta(seconds=1)
-    )
-
-    # It should be cleaned up now and we start a new conversation
-    async with session.async_get_chat_session(
-        hass, mock_conversation_input
-    ) as chat_session:
-        assert chat_session.conversation_id != conversation_id
-        assert len(chat_session.messages) == 2
-
-
-def test_chat_message() -> None:
-    """Test chat message."""
-    with pytest.raises(ValueError):
-        session.ChatMessage(role="native", agent_id=None, content="", native=None)
-
-
-async def test_add_message(
-    hass: HomeAssistant, mock_conversation_input: ConversationInput
-) -> None:
-    """Test filtering of messages."""
-    async with session.async_get_chat_session(
-        hass, mock_conversation_input
-    ) as chat_session:
-        assert len(chat_session.messages) == 2
-
-        with pytest.raises(ValueError):
-            chat_session.async_add_message(
-                session.ChatMessage(role="system", agent_id=None, content="")
-            )
-
-        # No 2 user messages in a row
-        assert chat_session.messages[1].role == "user"
-
-        with pytest.raises(ValueError):
-            chat_session.async_add_message(
-                session.ChatMessage(role="user", agent_id=None, content="")
-            )
-
-        # No 2 assistant messages in a row
-        chat_session.async_add_message(
-            session.ChatMessage(role="assistant", agent_id=None, content="")
-        )
-        assert len(chat_session.messages) == 3
-        assert chat_session.messages[-1].role == "assistant"
-
-        with pytest.raises(ValueError):
-            chat_session.async_add_message(
-                session.ChatMessage(role="assistant", agent_id=None, content="")
-            )
-
-
-async def test_message_filtering(
-    hass: HomeAssistant, mock_conversation_input: ConversationInput
-) -> None:
-    """Test filtering of messages."""
-    async with session.async_get_chat_session(
-        hass, mock_conversation_input
-    ) as chat_session:
-        messages = chat_session.async_get_messages(agent_id=None)
-        assert len(messages) == 2
-        assert messages[0] == session.ChatMessage(
-            role="system",
-            agent_id=None,
-            content="",
-        )
-        assert messages[1] == session.ChatMessage(
-            role="user",
-            agent_id=mock_conversation_input.agent_id,
-            content=mock_conversation_input.text,
-        )
-        # Cannot add a second user message in a row
-        with pytest.raises(ValueError):
-            chat_session.async_add_message(
-                session.ChatMessage(
-                    role="user",
-                    agent_id="mock-agent-id",
-                    content="Hey!",
-                )
-            )
-
-        chat_session.async_add_message(
-            session.ChatMessage(
-                role="assistant",
-                agent_id="mock-agent-id",
-                content="Hey!",
-                native="assistant-reply-native",
-            )
-        )
-        # Different agent, will be filtered out.
-        chat_session.async_add_message(
-            session.ChatMessage(
-                role="native", agent_id="another-mock-agent-id", content="", native=1
-            )
-        )
-        chat_session.async_add_message(
-            session.ChatMessage(
-                role="native", agent_id="mock-agent-id", content="", native=1
-            )
-        )
-
-    assert len(chat_session.messages) == 5
-
-    messages = chat_session.async_get_messages(agent_id="mock-agent-id")
-    assert len(messages) == 4
-
-    assert messages[2] == session.ChatMessage(
-        role="assistant",
-        agent_id="mock-agent-id",
-        content="Hey!",
-        native="assistant-reply-native",
-    )
-    assert messages[3] == session.ChatMessage(
-        role="native", agent_id="mock-agent-id", content="", native=1
-    )
-
-
-async def test_llm_api(
-    hass: HomeAssistant,
-    mock_conversation_input: ConversationInput,
-) -> None:
-    """Test when we reference an LLM API."""
-    async with session.async_get_chat_session(
-        hass, mock_conversation_input
-    ) as chat_session:
-        await chat_session.async_update_llm_data(
-            conversing_domain="test",
-            user_input=mock_conversation_input,
-            user_llm_hass_api="assist",
-            user_llm_prompt=None,
-        )
-
-    assert isinstance(chat_session.llm_api, llm.APIInstance)
-    assert chat_session.llm_api.api.id == "assist"
-
-
-async def test_unknown_llm_api(
-    hass: HomeAssistant,
-    mock_conversation_input: ConversationInput,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test when we reference an LLM API that does not exists."""
-    async with session.async_get_chat_session(
-        hass, mock_conversation_input
-    ) as chat_session:
-        with pytest.raises(session.ConverseError) as exc_info:
-            await chat_session.async_update_llm_data(
-                conversing_domain="test",
-                user_input=mock_conversation_input,
-                user_llm_hass_api="unknown-api",
-                user_llm_prompt=None,
-            )
-
-    assert str(exc_info.value) == "Error getting LLM API unknown-api"
-    assert exc_info.value.as_conversation_result().as_dict() == snapshot
-
-
-async def test_template_error(
-    hass: HomeAssistant,
-    mock_conversation_input: ConversationInput,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test that template error handling works."""
-    async with session.async_get_chat_session(
-        hass, mock_conversation_input
-    ) as chat_session:
-        with pytest.raises(session.ConverseError) as exc_info:
-            await chat_session.async_update_llm_data(
-                conversing_domain="test",
-                user_input=mock_conversation_input,
-                user_llm_hass_api=None,
-                user_llm_prompt="{{ invalid_syntax",
-            )
-
-    assert str(exc_info.value) == "Error rendering prompt"
-    assert exc_info.value.as_conversation_result().as_dict() == snapshot
-
-
-async def test_template_variables(
-    hass: HomeAssistant, mock_conversation_input: ConversationInput
-) -> None:
-    """Test that template variables work."""
-    mock_user = Mock()
-    mock_user.id = "12345"
-    mock_user.name = "Test User"
-    mock_conversation_input.context = Context(user_id=mock_user.id)
-
-    async with session.async_get_chat_session(
-        hass, mock_conversation_input
-    ) as chat_session:
-        with patch(
-            "homeassistant.auth.AuthManager.async_get_user", return_value=mock_user
-        ):
-            await chat_session.async_update_llm_data(
-                conversing_domain="test",
-                user_input=mock_conversation_input,
-                user_llm_hass_api=None,
-                user_llm_prompt=(
-                    "The instance name is {{ ha_name }}. "
-                    "The user name is {{ user_name }}. "
-                    "The user id is {{ llm_context.context.user_id }}."
-                    "The calling platform is {{ llm_context.platform }}."
-                ),
-            )
-
-    assert chat_session.user_name == "Test User"
-
-    assert "The instance name is test home." in chat_session.messages[0].content
-    assert "The user name is Test User." in chat_session.messages[0].content
-    assert "The user id is 12345." in chat_session.messages[0].content
-    assert "The calling platform is test." in chat_session.messages[0].content
-
-
-async def test_extra_systen_prompt(
-    hass: HomeAssistant, mock_conversation_input: ConversationInput
-) -> None:
-    """Test that extra system prompt works."""
-    extra_system_prompt = "Garage door cover.garage_door has been left open for 30 minutes. We asked the user if they want to close it."
-    extra_system_prompt2 = (
-        "User person.paulus came home. Asked him what he wants to do."
-    )
-    mock_conversation_input.extra_system_prompt = extra_system_prompt
-
-    async with session.async_get_chat_session(
-        hass, mock_conversation_input
-    ) as chat_session:
-        await chat_session.async_update_llm_data(
-            conversing_domain="test",
-            user_input=mock_conversation_input,
-            user_llm_hass_api=None,
-            user_llm_prompt=None,
-        )
-        chat_session.async_add_message(
-            session.ChatMessage(
-                role="assistant",
-                agent_id="mock-agent-id",
-                content="Hey!",
-            )
-        )
-
-    assert chat_session.extra_system_prompt == extra_system_prompt
-    assert chat_session.messages[0].content.endswith(extra_system_prompt)
-
-    # Verify that follow-up conversations with no system prompt take previous one
-    mock_conversation_input.conversation_id = chat_session.conversation_id
-    mock_conversation_input.extra_system_prompt = None
-
-    async with session.async_get_chat_session(
-        hass, mock_conversation_input
-    ) as chat_session:
-        await chat_session.async_update_llm_data(
-            conversing_domain="test",
-            user_input=mock_conversation_input,
-            user_llm_hass_api=None,
-            user_llm_prompt=None,
-        )
-
-    assert chat_session.extra_system_prompt == extra_system_prompt
-    assert chat_session.messages[0].content.endswith(extra_system_prompt)
-
-    # Verify that we take new system prompts
-    mock_conversation_input.extra_system_prompt = extra_system_prompt2
-
-    async with session.async_get_chat_session(
-        hass, mock_conversation_input
-    ) as chat_session:
-        await chat_session.async_update_llm_data(
-            conversing_domain="test",
-            user_input=mock_conversation_input,
-            user_llm_hass_api=None,
-            user_llm_prompt=None,
-        )
-        chat_session.async_add_message(
-            session.ChatMessage(
-                role="assistant",
-                agent_id="mock-agent-id",
-                content="Hey!",
-            )
-        )
-
-    assert chat_session.extra_system_prompt == extra_system_prompt2
-    assert chat_session.messages[0].content.endswith(extra_system_prompt2)
-    assert extra_system_prompt not in chat_session.messages[0].content
-
-    # Verify that follow-up conversations with no system prompt take previous one
-    mock_conversation_input.extra_system_prompt = None
-
-    async with session.async_get_chat_session(
-        hass, mock_conversation_input
-    ) as chat_session:
-        await chat_session.async_update_llm_data(
-            conversing_domain="test",
-            user_input=mock_conversation_input,
-            user_llm_hass_api=None,
-            user_llm_prompt=None,
-        )
-
-    assert chat_session.extra_system_prompt == extra_system_prompt2
-    assert chat_session.messages[0].content.endswith(extra_system_prompt2)
diff --git a/tests/components/conversation/test_trace.py b/tests/components/conversation/test_trace.py
index 7c00b9a80b2..a975c9b7983 100644
--- a/tests/components/conversation/test_trace.py
+++ b/tests/components/conversation/test_trace.py
@@ -61,18 +61,18 @@ async def test_converation_trace(
     }
 
 
-async def test_converation_trace_error(
+async def test_converation_trace_uncaught_error(
     hass: HomeAssistant,
     init_components: None,
     sl_setup: None,
 ) -> None:
-    """Test tracing a conversation."""
+    """Test tracing a conversation that raises an uncaught error."""
     with (
         patch(
             "homeassistant.components.conversation.default_agent.DefaultAgent.async_process",
-            side_effect=HomeAssistantError("Failed to talk to agent"),
+            side_effect=ValueError("Unexpected error"),
         ),
-        pytest.raises(HomeAssistantError),
+        pytest.raises(ValueError),
     ):
         await conversation.async_converse(
             hass, "add apples to my shopping list", None, Context()
@@ -87,4 +87,35 @@ async def test_converation_trace_error(
     assert (
         trace_event.get("event_type") == trace.ConversationTraceEventType.ASYNC_PROCESS
     )
-    assert last_trace.get("error") == "Failed to talk to agent"
+    assert last_trace.get("error") == "Unexpected error"
+    assert not last_trace.get("result")
+
+
+async def test_converation_trace_homeassistant_error(
+    hass: HomeAssistant,
+    init_components: None,
+    sl_setup: None,
+) -> None:
+    """Test tracing a conversation with a HomeAssistant error."""
+    with (
+        patch(
+            "homeassistant.components.conversation.default_agent.DefaultAgent.async_process",
+            side_effect=HomeAssistantError("Failed to talk to agent"),
+        ),
+    ):
+        await conversation.async_converse(
+            hass, "add apples to my shopping list", None, Context()
+        )
+
+    traces = trace.async_get_traces()
+    assert traces
+    last_trace = traces[-1].as_dict()
+    assert last_trace.get("events")
+    assert len(last_trace.get("events")) == 1
+    trace_event = last_trace["events"][0]
+    assert (
+        trace_event.get("event_type") == trace.ConversationTraceEventType.ASYNC_PROCESS
+    )
+    result = last_trace.get("result")
+    assert result
+    assert result["response"]["speech"]["plain"]["speech"] == "Failed to talk to agent"
diff --git a/tests/components/conversation/test_trigger.py b/tests/components/conversation/test_trigger.py
index 9b57bb43b58..a01f4cd8112 100644
--- a/tests/components/conversation/test_trigger.py
+++ b/tests/components/conversation/test_trigger.py
@@ -5,7 +5,7 @@ import logging
 import pytest
 import voluptuous as vol
 
-from homeassistant.components.conversation import default_agent
+from homeassistant.components.conversation import HOME_ASSISTANT_AGENT, default_agent
 from homeassistant.components.conversation.const import DATA_DEFAULT_ENTITY
 from homeassistant.components.conversation.models import ConversationInput
 from homeassistant.core import Context, HomeAssistant, ServiceCall
@@ -82,7 +82,7 @@ async def test_if_fires_on_event(
         "details": {},
         "device_id": None,
         "user_input": {
-            "agent_id": None,
+            "agent_id": HOME_ASSISTANT_AGENT,
             "context": context.as_dict(),
             "conversation_id": None,
             "device_id": None,
@@ -104,6 +104,7 @@ async def test_response(hass: HomeAssistant) -> None:
                 "trigger": {
                     "platform": "conversation",
                     "command": ["Open the pod bay door Hal"],
+                    "variables": {"name": "Dr. David Bowman"},
                 },
                 "action": {
                     "set_conversation_response": response,
@@ -230,7 +231,7 @@ async def test_response_same_sentence(
         "details": {},
         "device_id": None,
         "user_input": {
-            "agent_id": None,
+            "agent_id": HOME_ASSISTANT_AGENT,
             "context": context.as_dict(),
             "conversation_id": None,
             "device_id": None,
@@ -408,7 +409,7 @@ async def test_same_trigger_multiple_sentences(
         "details": {},
         "device_id": None,
         "user_input": {
-            "agent_id": None,
+            "agent_id": HOME_ASSISTANT_AGENT,
             "context": context.as_dict(),
             "conversation_id": None,
             "device_id": None,
@@ -636,7 +637,7 @@ async def test_wildcards(hass: HomeAssistant, service_calls: list[ServiceCall])
         },
         "device_id": None,
         "user_input": {
-            "agent_id": None,
+            "agent_id": HOME_ASSISTANT_AGENT,
             "context": context.as_dict(),
             "conversation_id": None,
             "device_id": None,
diff --git a/tests/components/conversation/test_util.py b/tests/components/conversation/test_util.py
deleted file mode 100644
index 72a334232c1..00000000000
--- a/tests/components/conversation/test_util.py
+++ /dev/null
@@ -1,56 +0,0 @@
-"""Test the conversation utils."""
-
-from homeassistant.components.conversation.util import create_matcher
-
-
-def test_create_matcher() -> None:
-    """Test the create matcher method."""
-    # Basic sentence
-    pattern = create_matcher("Hello world")
-    assert pattern.match("Hello world") is not None
-
-    # Match a part
-    pattern = create_matcher("Hello {name}")
-    match = pattern.match("hello world")
-    assert match is not None
-    assert match.groupdict()["name"] == "world"
-    no_match = pattern.match("Hello world, how are you?")
-    assert no_match is None
-
-    # Optional and matching part
-    pattern = create_matcher("Turn on [the] {name}")
-    match = pattern.match("turn on the kitchen lights")
-    assert match is not None
-    assert match.groupdict()["name"] == "kitchen lights"
-    match = pattern.match("turn on kitchen lights")
-    assert match is not None
-    assert match.groupdict()["name"] == "kitchen lights"
-    match = pattern.match("turn off kitchen lights")
-    assert match is None
-
-    # Two different optional parts, 1 matching part
-    pattern = create_matcher("Turn on [the] [a] {name}")
-    match = pattern.match("turn on the kitchen lights")
-    assert match is not None
-    assert match.groupdict()["name"] == "kitchen lights"
-    match = pattern.match("turn on kitchen lights")
-    assert match is not None
-    assert match.groupdict()["name"] == "kitchen lights"
-    match = pattern.match("turn on a kitchen light")
-    assert match is not None
-    assert match.groupdict()["name"] == "kitchen light"
-
-    # Strip plural
-    pattern = create_matcher("Turn {name}[s] on")
-    match = pattern.match("turn kitchen lights on")
-    assert match is not None
-    assert match.groupdict()["name"] == "kitchen light"
-
-    # Optional 2 words
-    pattern = create_matcher("Turn [the great] {name} on")
-    match = pattern.match("turn the great kitchen lights on")
-    assert match is not None
-    assert match.groupdict()["name"] == "kitchen lights"
-    match = pattern.match("turn kitchen lights on")
-    assert match is not None
-    assert match.groupdict()["name"] == "kitchen lights"
diff --git a/tests/components/cookidoo/conftest.py b/tests/components/cookidoo/conftest.py
index a14bc285379..7d84e7ac83e 100644
--- a/tests/components/cookidoo/conftest.py
+++ b/tests/components/cookidoo/conftest.py
@@ -8,6 +8,8 @@ from cookidoo_api import (
     CookidooAdditionalItem,
     CookidooAuthResponse,
     CookidooIngredientItem,
+    CookidooSubscription,
+    CookidooUserInfo,
 )
 import pytest
 
@@ -54,6 +56,12 @@ def mock_cookidoo_client() -> Generator[AsyncMock]:
                 "data"
             ]
         ]
+        client.get_active_subscription.return_value = CookidooSubscription(
+            **load_json_object_fixture("subscriptions.json", DOMAIN)["data"]
+        )
+        client.get_user_info.return_value = CookidooUserInfo(
+            **load_json_object_fixture("user_info.json", DOMAIN)["data"]
+        )
         client.login.return_value = CookidooAuthResponse(
             **load_json_object_fixture("login.json", DOMAIN)
         )
diff --git a/tests/components/cookidoo/fixtures/subscriptions.json b/tests/components/cookidoo/fixtures/subscriptions.json
new file mode 100644
index 00000000000..12b74b3af08
--- /dev/null
+++ b/tests/components/cookidoo/fixtures/subscriptions.json
@@ -0,0 +1,12 @@
+{
+  "data": {
+    "active": true,
+    "start_date": "2024-12-16T00:00:00Z",
+    "expires": "2025-12-16T23:59:00Z",
+    "type": "REGULAR",
+    "extended_type": "REGULAR",
+    "subscription_level": "FULL",
+    "subscription_source": "COMMERCE",
+    "status": "ACTIVE"
+  }
+}
diff --git a/tests/components/cookidoo/fixtures/user_info.json b/tests/components/cookidoo/fixtures/user_info.json
new file mode 100644
index 00000000000..1c99ae84823
--- /dev/null
+++ b/tests/components/cookidoo/fixtures/user_info.json
@@ -0,0 +1,7 @@
+{
+  "data": {
+    "username": "username_1234",
+    "description": null,
+    "picture": null
+  }
+}
diff --git a/tests/components/cookidoo/snapshots/test_button.ambr b/tests/components/cookidoo/snapshots/test_button.ambr
index a6223059aa1..f316b0cfc82 100644
--- a/tests/components/cookidoo/snapshots/test_button.ambr
+++ b/tests/components/cookidoo/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/cookidoo/snapshots/test_diagnostics.ambr b/tests/components/cookidoo/snapshots/test_diagnostics.ambr
new file mode 100644
index 00000000000..3dc799c1108
--- /dev/null
+++ b/tests/components/cookidoo/snapshots/test_diagnostics.ambr
@@ -0,0 +1,43 @@
+# serializer version: 1
+# name: test_diagnostics
+  dict({
+    'data': dict({
+      'additional_items': list([
+        dict({
+          'id': 'unique_id_tomaten',
+          'is_owned': False,
+          'name': 'Tomaten',
+        }),
+      ]),
+      'ingredient_items': list([
+        dict({
+          'description': '200 g',
+          'id': 'unique_id_mehl',
+          'is_owned': False,
+          'name': 'Mehl',
+        }),
+      ]),
+      'subscription': dict({
+        'active': True,
+        'expires': '2025-12-16T23:59:00Z',
+        'extended_type': 'REGULAR',
+        'start_date': '2024-12-16T00:00:00Z',
+        'status': 'ACTIVE',
+        'subscription_level': 'FULL',
+        'subscription_source': 'COMMERCE',
+        'type': 'REGULAR',
+      }),
+    }),
+    'entry_data': dict({
+      'country': 'CH',
+      'email': 'test-email',
+      'language': 'de-CH',
+      'password': '**REDACTED**',
+    }),
+    'user': dict({
+      'description': None,
+      'picture': None,
+      'username': 'username_1234',
+    }),
+  })
+# ---
diff --git a/tests/components/cookidoo/snapshots/test_sensor.ambr b/tests/components/cookidoo/snapshots/test_sensor.ambr
new file mode 100644
index 00000000000..ca861241971
--- /dev/null
+++ b/tests/components/cookidoo/snapshots/test_sensor.ambr
@@ -0,0 +1,108 @@
+# serializer version: 1
+# name: test_setup[sensor.cookidoo_subscription-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'free',
+        'trial',
+        'premium',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.cookidoo_subscription',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Subscription',
+    'platform': 'cookidoo',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': <CookidooSensor.SUBSCRIPTION: 'subscription'>,
+    'unique_id': 'sub_uuid_subscription',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_setup[sensor.cookidoo_subscription-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Cookidoo Subscription',
+      'options': list([
+        'free',
+        'trial',
+        'premium',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.cookidoo_subscription',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'premium',
+  })
+# ---
+# name: test_setup[sensor.cookidoo_subscription_expiration_date-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.cookidoo_subscription_expiration_date',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Subscription expiration date',
+    'platform': 'cookidoo',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': <CookidooSensor.EXPIRES: 'expires'>,
+    'unique_id': 'sub_uuid_expires',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_setup[sensor.cookidoo_subscription_expiration_date-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'timestamp',
+      'friendly_name': 'Cookidoo Subscription expiration date',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.cookidoo_subscription_expiration_date',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2025-12-16T23:59:00+00:00',
+  })
+# ---
diff --git a/tests/components/cookidoo/snapshots/test_todo.ambr b/tests/components/cookidoo/snapshots/test_todo.ambr
index be641432929..5b2c7552548 100644
--- a/tests/components/cookidoo/snapshots/test_todo.ambr
+++ b/tests/components/cookidoo/snapshots/test_todo.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/cookidoo/test_diagnostics.py b/tests/components/cookidoo/test_diagnostics.py
new file mode 100644
index 00000000000..c253e1f6e09
--- /dev/null
+++ b/tests/components/cookidoo/test_diagnostics.py
@@ -0,0 +1,29 @@
+"""Tests for the diagnostics data provided by the Cookidoo integration."""
+
+from unittest.mock import AsyncMock
+
+from syrupy import SnapshotAssertion
+
+from homeassistant.core import HomeAssistant
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry
+from tests.components.diagnostics import get_diagnostics_for_config_entry
+from tests.typing import ClientSessionGenerator
+
+
+async def test_diagnostics(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    mock_cookidoo_client: AsyncMock,
+    cookidoo_config_entry: MockConfigEntry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test diagnostics."""
+    await setup_integration(hass, cookidoo_config_entry)
+
+    assert (
+        await get_diagnostics_for_config_entry(hass, hass_client, cookidoo_config_entry)
+        == snapshot
+    )
diff --git a/tests/components/cookidoo/test_sensor.py b/tests/components/cookidoo/test_sensor.py
new file mode 100644
index 00000000000..d2ef88f2857
--- /dev/null
+++ b/tests/components/cookidoo/test_sensor.py
@@ -0,0 +1,44 @@
+"""Test for sensor platform of the Cookidoo integration."""
+
+from collections.abc import Generator
+from unittest.mock import patch
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+@pytest.fixture(autouse=True)
+def sensor_only() -> Generator[None]:
+    """Enable only the sensor platform."""
+    with patch(
+        "homeassistant.components.cookidoo.PLATFORMS",
+        [Platform.SENSOR],
+    ):
+        yield
+
+
+@pytest.mark.usefixtures("mock_cookidoo_client")
+async def test_setup(
+    hass: HomeAssistant,
+    cookidoo_config_entry: MockConfigEntry,
+    snapshot: SnapshotAssertion,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Snapshot test states of sensor platform."""
+
+    cookidoo_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(cookidoo_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert cookidoo_config_entry.state is ConfigEntryState.LOADED
+
+    await snapshot_platform(
+        hass, entity_registry, snapshot, cookidoo_config_entry.entry_id
+    )
diff --git a/tests/components/cover/test_device_trigger.py b/tests/components/cover/test_device_trigger.py
index a6c10d4acf1..7901baaa3b8 100644
--- a/tests/components/cover/test_device_trigger.py
+++ b/tests/components/cover/test_device_trigger.py
@@ -13,7 +13,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import MockCover
 
diff --git a/tests/components/cover/test_reproduce_state.py b/tests/components/cover/test_reproduce_state.py
index 4aad27011fa..57fc5aed5e9 100644
--- a/tests/components/cover/test_reproduce_state.py
+++ b/tests/components/cover/test_reproduce_state.py
@@ -7,9 +7,11 @@ from homeassistant.components.cover import (
     ATTR_CURRENT_TILT_POSITION,
     ATTR_POSITION,
     ATTR_TILT_POSITION,
+    CoverEntityFeature,
     CoverState,
 )
 from homeassistant.const import (
+    ATTR_SUPPORTED_FEATURES,
     SERVICE_CLOSE_COVER,
     SERVICE_CLOSE_COVER_TILT,
     SERVICE_OPEN_COVER,
@@ -27,35 +29,213 @@ async def test_reproducing_states(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
     """Test reproducing Cover states."""
-    hass.states.async_set("cover.entity_close", CoverState.CLOSED, {})
+    hass.states.async_set(
+        "cover.entity_close",
+        CoverState.CLOSED,
+        {
+            ATTR_SUPPORTED_FEATURES: CoverEntityFeature.CLOSE | CoverEntityFeature.OPEN,
+        },
+    )
+    hass.states.async_set(
+        "cover.closed_only_supports_close_open",
+        CoverState.CLOSED,
+        {
+            ATTR_SUPPORTED_FEATURES: CoverEntityFeature.CLOSE | CoverEntityFeature.OPEN,
+        },
+    )
+    hass.states.async_set(
+        "cover.open_only_supports_close_open",
+        CoverState.OPEN,
+        {
+            ATTR_SUPPORTED_FEATURES: CoverEntityFeature.CLOSE | CoverEntityFeature.OPEN,
+        },
+    )
+    hass.states.async_set(
+        "cover.open_missing_all_features",
+        CoverState.OPEN,
+    )
+    hass.states.async_set(
+        "cover.closed_missing_all_features_has_position",
+        CoverState.CLOSED,
+        {
+            ATTR_CURRENT_POSITION: 0,
+        },
+    )
+    hass.states.async_set(
+        "cover.open_missing_all_features_has_tilt_position",
+        CoverState.OPEN,
+        {
+            ATTR_CURRENT_TILT_POSITION: 50,
+        },
+    )
+    hass.states.async_set(
+        "cover.closed_only_supports_tilt_close_open",
+        CoverState.CLOSED,
+        {
+            ATTR_SUPPORTED_FEATURES: CoverEntityFeature.CLOSE_TILT
+            | CoverEntityFeature.OPEN_TILT,
+        },
+    )
+    hass.states.async_set(
+        "cover.open_only_supports_tilt_close_open",
+        CoverState.OPEN,
+        {
+            ATTR_SUPPORTED_FEATURES: CoverEntityFeature.CLOSE_TILT
+            | CoverEntityFeature.OPEN_TILT,
+        },
+    )
+    hass.states.async_set(
+        "cover.closed_only_supports_position",
+        CoverState.CLOSED,
+        {
+            ATTR_CURRENT_POSITION: 0,
+            ATTR_SUPPORTED_FEATURES: CoverEntityFeature.SET_POSITION,
+        },
+    )
+    hass.states.async_set(
+        "cover.open_only_supports_position",
+        CoverState.OPEN,
+        {ATTR_SUPPORTED_FEATURES: CoverEntityFeature.SET_POSITION},
+    )
     hass.states.async_set(
         "cover.entity_close_attr",
         CoverState.CLOSED,
-        {ATTR_CURRENT_POSITION: 0, ATTR_CURRENT_TILT_POSITION: 0},
+        {
+            ATTR_CURRENT_POSITION: 0,
+            ATTR_CURRENT_TILT_POSITION: 0,
+            ATTR_SUPPORTED_FEATURES: CoverEntityFeature.CLOSE_TILT
+            | CoverEntityFeature.OPEN_TILT
+            | CoverEntityFeature.SET_POSITION
+            | CoverEntityFeature.SET_TILT_POSITION
+            | CoverEntityFeature.CLOSE
+            | CoverEntityFeature.OPEN,
+        },
     )
     hass.states.async_set(
-        "cover.entity_close_tilt", CoverState.CLOSED, {ATTR_CURRENT_TILT_POSITION: 50}
+        "cover.entity_close_tilt",
+        CoverState.CLOSED,
+        {
+            ATTR_CURRENT_TILT_POSITION: 50,
+            ATTR_SUPPORTED_FEATURES: CoverEntityFeature.CLOSE_TILT
+            | CoverEntityFeature.OPEN_TILT
+            | CoverEntityFeature.SET_TILT_POSITION,
+        },
     )
-    hass.states.async_set("cover.entity_open", CoverState.OPEN, {})
     hass.states.async_set(
-        "cover.entity_slightly_open", CoverState.OPEN, {ATTR_CURRENT_POSITION: 50}
+        "cover.entity_open",
+        CoverState.OPEN,
+        {ATTR_SUPPORTED_FEATURES: CoverEntityFeature.CLOSE | CoverEntityFeature.OPEN},
+    )
+    hass.states.async_set(
+        "cover.entity_slightly_open",
+        CoverState.OPEN,
+        {
+            ATTR_CURRENT_POSITION: 50,
+            ATTR_SUPPORTED_FEATURES: CoverEntityFeature.SET_POSITION
+            | CoverEntityFeature.CLOSE
+            | CoverEntityFeature.OPEN,
+        },
     )
     hass.states.async_set(
         "cover.entity_open_attr",
         CoverState.OPEN,
-        {ATTR_CURRENT_POSITION: 100, ATTR_CURRENT_TILT_POSITION: 0},
+        {
+            ATTR_CURRENT_POSITION: 100,
+            ATTR_CURRENT_TILT_POSITION: 0,
+            ATTR_SUPPORTED_FEATURES: CoverEntityFeature.CLOSE_TILT
+            | CoverEntityFeature.OPEN_TILT
+            | CoverEntityFeature.SET_POSITION
+            | CoverEntityFeature.SET_TILT_POSITION
+            | CoverEntityFeature.CLOSE
+            | CoverEntityFeature.OPEN,
+        },
     )
     hass.states.async_set(
         "cover.entity_open_tilt",
         CoverState.OPEN,
-        {ATTR_CURRENT_POSITION: 50, ATTR_CURRENT_TILT_POSITION: 50},
+        {
+            ATTR_CURRENT_POSITION: 50,
+            ATTR_CURRENT_TILT_POSITION: 50,
+            ATTR_SUPPORTED_FEATURES: CoverEntityFeature.CLOSE_TILT
+            | CoverEntityFeature.OPEN_TILT
+            | CoverEntityFeature.SET_POSITION
+            | CoverEntityFeature.SET_TILT_POSITION
+            | CoverEntityFeature.CLOSE
+            | CoverEntityFeature.OPEN,
+        },
     )
     hass.states.async_set(
         "cover.entity_entirely_open",
         CoverState.OPEN,
-        {ATTR_CURRENT_POSITION: 100, ATTR_CURRENT_TILT_POSITION: 100},
+        {
+            ATTR_CURRENT_POSITION: 100,
+            ATTR_CURRENT_TILT_POSITION: 100,
+            ATTR_SUPPORTED_FEATURES: CoverEntityFeature.CLOSE_TILT
+            | CoverEntityFeature.OPEN_TILT
+            | CoverEntityFeature.SET_POSITION
+            | CoverEntityFeature.SET_TILT_POSITION
+            | CoverEntityFeature.CLOSE
+            | CoverEntityFeature.OPEN,
+        },
+    )
+    hass.states.async_set(
+        "cover.tilt_only_open",
+        CoverState.OPEN,
+        {
+            ATTR_SUPPORTED_FEATURES: CoverEntityFeature.CLOSE_TILT
+            | CoverEntityFeature.OPEN_TILT,
+        },
+    )
+    hass.states.async_set(
+        "cover.tilt_only_closed",
+        CoverState.CLOSED,
+        {
+            ATTR_SUPPORTED_FEATURES: CoverEntityFeature.CLOSE_TILT
+            | CoverEntityFeature.OPEN_TILT,
+        },
+    )
+    hass.states.async_set(
+        "cover.tilt_only_tilt_position_100",
+        CoverState.OPEN,
+        {
+            ATTR_CURRENT_TILT_POSITION: 100,
+            ATTR_SUPPORTED_FEATURES: CoverEntityFeature.CLOSE_TILT
+            | CoverEntityFeature.OPEN_TILT
+            | CoverEntityFeature.SET_TILT_POSITION,
+        },
+    )
+    hass.states.async_set(
+        "cover.tilt_only_tilt_position_0",
+        CoverState.CLOSED,
+        {
+            ATTR_CURRENT_TILT_POSITION: 0,
+            ATTR_SUPPORTED_FEATURES: CoverEntityFeature.CLOSE_TILT
+            | CoverEntityFeature.OPEN_TILT
+            | CoverEntityFeature.SET_TILT_POSITION,
+        },
+    )
+    hass.states.async_set(
+        "cover.tilt_open_only_supports_tilt_position",
+        CoverState.OPEN,
+        {
+            ATTR_SUPPORTED_FEATURES: CoverEntityFeature.SET_TILT_POSITION,
+        },
+    )
+    hass.states.async_set(
+        "cover.tilt_partial_open_only_supports_tilt_position",
+        CoverState.OPEN,
+        {
+            ATTR_SUPPORTED_FEATURES: CoverEntityFeature.SET_TILT_POSITION,
+            ATTR_CURRENT_TILT_POSITION: 50,
+        },
+    )
+    hass.states.async_set(
+        "cover.tilt_closed_only_supports_tilt_position",
+        CoverState.CLOSED,
+        {
+            ATTR_SUPPORTED_FEATURES: CoverEntityFeature.SET_TILT_POSITION,
+        },
     )
-
     close_calls = async_mock_service(hass, "cover", SERVICE_CLOSE_COVER)
     open_calls = async_mock_service(hass, "cover", SERVICE_OPEN_COVER)
     close_tilt_calls = async_mock_service(hass, "cover", SERVICE_CLOSE_COVER_TILT)
@@ -70,6 +250,31 @@ async def test_reproducing_states(
         hass,
         [
             State("cover.entity_close", CoverState.CLOSED),
+            State("cover.closed_only_supports_close_open", CoverState.CLOSED),
+            State("cover.closed_only_supports_tilt_close_open", CoverState.CLOSED),
+            State("cover.open_only_supports_close_open", CoverState.OPEN),
+            State("cover.open_only_supports_tilt_close_open", CoverState.OPEN),
+            State("cover.open_missing_all_features", CoverState.OPEN),
+            State(
+                "cover.closed_missing_all_features_has_position",
+                CoverState.CLOSED,
+                {
+                    ATTR_CURRENT_POSITION: 0,
+                },
+            ),
+            State(
+                "cover.open_missing_all_features_has_tilt_position",
+                CoverState.OPEN,
+                {
+                    ATTR_CURRENT_TILT_POSITION: 50,
+                },
+            ),
+            State(
+                "cover.closed_only_supports_position",
+                CoverState.CLOSED,
+                {ATTR_CURRENT_POSITION: 0},
+            ),
+            State("cover.open_only_supports_position", CoverState.OPEN),
             State(
                 "cover.entity_close_attr",
                 CoverState.CLOSED,
@@ -101,6 +306,39 @@ async def test_reproducing_states(
                 CoverState.OPEN,
                 {ATTR_CURRENT_POSITION: 100, ATTR_CURRENT_TILT_POSITION: 100},
             ),
+            State(
+                "cover.tilt_only_open",
+                CoverState.OPEN,
+                {},
+            ),
+            State(
+                "cover.tilt_only_tilt_position_100",
+                CoverState.OPEN,
+                {ATTR_CURRENT_TILT_POSITION: 100},
+            ),
+            State(
+                "cover.tilt_only_closed",
+                CoverState.CLOSED,
+                {},
+            ),
+            State(
+                "cover.tilt_only_tilt_position_0",
+                CoverState.CLOSED,
+                {ATTR_CURRENT_TILT_POSITION: 0},
+            ),
+            State(
+                "cover.tilt_partial_open_only_supports_tilt_position",
+                CoverState.OPEN,
+                {ATTR_CURRENT_TILT_POSITION: 50},
+            ),
+            State(
+                "cover.tilt_open_only_supports_tilt_position",
+                CoverState.OPEN,
+            ),
+            State(
+                "cover.tilt_closed_only_supports_tilt_position",
+                CoverState.CLOSED,
+            ),
         ],
     )
 
@@ -127,6 +365,35 @@ async def test_reproducing_states(
         hass,
         [
             State("cover.entity_close", CoverState.OPEN),
+            State(
+                "cover.closed_only_supports_close_open",
+                CoverState.OPEN,
+                {ATTR_CURRENT_POSITION: 100},
+            ),
+            State(
+                "cover.open_only_supports_close_open",
+                CoverState.CLOSED,
+                {ATTR_CURRENT_POSITION: 50},
+            ),
+            State(
+                "cover.open_only_supports_tilt_close_open",
+                CoverState.CLOSED,
+                {ATTR_CURRENT_TILT_POSITION: 50},
+            ),
+            State("cover.closed_only_supports_tilt_close_open", CoverState.OPEN),
+            State("cover.open_missing_all_features", CoverState.CLOSED),
+            State(
+                "cover.closed_missing_all_features_has_position",
+                CoverState.OPEN,
+                {ATTR_CURRENT_POSITION: 70},
+            ),
+            State(
+                "cover.open_missing_all_features_has_tilt_position",
+                CoverState.OPEN,
+                {ATTR_CURRENT_TILT_POSITION: 20},
+            ),
+            State("cover.closed_only_supports_position", CoverState.OPEN),
+            State("cover.open_only_supports_position", CoverState.CLOSED),
             State(
                 "cover.entity_close_attr",
                 CoverState.OPEN,
@@ -152,6 +419,39 @@ async def test_reproducing_states(
             ),
             # Should not raise
             State("cover.non_existing", "on"),
+            State(
+                "cover.tilt_only_open",
+                CoverState.CLOSED,
+                {},
+            ),
+            State(
+                "cover.tilt_only_tilt_position_100",
+                CoverState.CLOSED,
+                {ATTR_CURRENT_TILT_POSITION: 0},
+            ),
+            State(
+                "cover.tilt_only_closed",
+                CoverState.OPEN,
+                {},
+            ),
+            State(
+                "cover.tilt_only_tilt_position_0",
+                CoverState.OPEN,
+                {ATTR_CURRENT_TILT_POSITION: 100},
+            ),
+            State(
+                "cover.tilt_partial_open_only_supports_tilt_position",
+                CoverState.OPEN,
+                {ATTR_CURRENT_TILT_POSITION: 70},
+            ),
+            State(
+                "cover.tilt_open_only_supports_tilt_position",
+                CoverState.CLOSED,
+            ),
+            State(
+                "cover.tilt_closed_only_supports_tilt_position",
+                CoverState.OPEN,
+            ),
         ],
     )
 
@@ -159,8 +459,10 @@ async def test_reproducing_states(
         {"entity_id": "cover.entity_open"},
         {"entity_id": "cover.entity_open_attr"},
         {"entity_id": "cover.entity_entirely_open"},
+        {"entity_id": "cover.open_only_supports_close_open"},
+        {"entity_id": "cover.open_missing_all_features"},
     ]
-    assert len(close_calls) == 3
+    assert len(close_calls) == len(valid_close_calls)
     for call in close_calls:
         assert call.domain == "cover"
         assert call.data in valid_close_calls
@@ -170,8 +472,9 @@ async def test_reproducing_states(
         {"entity_id": "cover.entity_close"},
         {"entity_id": "cover.entity_slightly_open"},
         {"entity_id": "cover.entity_open_tilt"},
+        {"entity_id": "cover.closed_only_supports_close_open"},
     ]
-    assert len(open_calls) == 3
+    assert len(open_calls) == len(valid_open_calls)
     for call in open_calls:
         assert call.domain == "cover"
         assert call.data in valid_open_calls
@@ -180,27 +483,77 @@ async def test_reproducing_states(
     valid_close_tilt_calls = [
         {"entity_id": "cover.entity_open_tilt"},
         {"entity_id": "cover.entity_entirely_open"},
+        {"entity_id": "cover.tilt_only_open"},
+        {"entity_id": "cover.entity_open_attr"},
+        {"entity_id": "cover.tilt_only_tilt_position_100"},
+        {"entity_id": "cover.open_only_supports_tilt_close_open"},
     ]
-    assert len(close_tilt_calls) == 2
+    assert len(close_tilt_calls) == len(valid_close_tilt_calls)
     for call in close_tilt_calls:
         assert call.domain == "cover"
         assert call.data in valid_close_tilt_calls
         valid_close_tilt_calls.remove(call.data)
 
-    assert len(open_tilt_calls) == 1
-    assert open_tilt_calls[0].domain == "cover"
-    assert open_tilt_calls[0].data == {"entity_id": "cover.entity_close_tilt"}
+    valid_open_tilt_calls = [
+        {"entity_id": "cover.entity_close_tilt"},
+        {"entity_id": "cover.tilt_only_closed"},
+        {"entity_id": "cover.tilt_only_tilt_position_0"},
+        {"entity_id": "cover.closed_only_supports_tilt_close_open"},
+    ]
+    assert len(open_tilt_calls) == len(valid_open_tilt_calls)
+    for call in open_tilt_calls:
+        assert call.domain == "cover"
+        assert call.data in valid_open_tilt_calls
+        valid_open_tilt_calls.remove(call.data)
 
-    assert len(position_calls) == 1
-    assert position_calls[0].domain == "cover"
-    assert position_calls[0].data == {
-        "entity_id": "cover.entity_close_attr",
-        ATTR_POSITION: 50,
-    }
+    valid_position_calls = [
+        {
+            "entity_id": "cover.entity_close_attr",
+            ATTR_POSITION: 50,
+        },
+        {
+            "entity_id": "cover.closed_missing_all_features_has_position",
+            ATTR_POSITION: 70,
+        },
+        {
+            "entity_id": "cover.closed_only_supports_position",
+            ATTR_POSITION: 100,
+        },
+        {
+            "entity_id": "cover.open_only_supports_position",
+            ATTR_POSITION: 0,
+        },
+    ]
+    assert len(position_calls) == len(valid_position_calls)
+    for call in position_calls:
+        assert call.domain == "cover"
+        assert call.data in valid_position_calls
+        valid_position_calls.remove(call.data)
 
-    assert len(position_tilt_calls) == 1
-    assert position_tilt_calls[0].domain == "cover"
-    assert position_tilt_calls[0].data == {
-        "entity_id": "cover.entity_close_attr",
-        ATTR_TILT_POSITION: 50,
-    }
+    valid_position_tilt_calls = [
+        {
+            "entity_id": "cover.entity_close_attr",
+            ATTR_TILT_POSITION: 50,
+        },
+        {
+            "entity_id": "cover.open_missing_all_features_has_tilt_position",
+            ATTR_TILT_POSITION: 20,
+        },
+        {
+            "entity_id": "cover.tilt_open_only_supports_tilt_position",
+            ATTR_TILT_POSITION: 0,
+        },
+        {
+            "entity_id": "cover.tilt_closed_only_supports_tilt_position",
+            ATTR_TILT_POSITION: 100,
+        },
+        {
+            "entity_id": "cover.tilt_partial_open_only_supports_tilt_position",
+            ATTR_TILT_POSITION: 70,
+        },
+    ]
+    assert len(position_tilt_calls) == len(valid_position_tilt_calls)
+    for call in position_tilt_calls:
+        assert call.domain == "cover"
+        assert call.data in valid_position_tilt_calls
+        valid_position_tilt_calls.remove(call.data)
diff --git a/tests/components/crownstone/test_config_flow.py b/tests/components/crownstone/test_config_flow.py
index a38a04cb2ad..c3bb17cb6d6 100644
--- a/tests/components/crownstone/test_config_flow.py
+++ b/tests/components/crownstone/test_config_flow.py
@@ -163,7 +163,7 @@ async def start_config_flow(hass: HomeAssistant, mocked_cloud: MagicMock):
 
 
 async def start_options_flow(
-    hass: HomeAssistant, entry_id: str, mocked_manager: MagicMock
+    hass: HomeAssistant, entry: MockConfigEntry, mocked_manager: MagicMock
 ):
     """Patch CrownstoneEntryManager and start the flow."""
     # set up integration
@@ -171,9 +171,10 @@ async def start_options_flow(
         "homeassistant.components.crownstone.CrownstoneEntryManager",
         return_value=mocked_manager,
     ):
-        await hass.config_entries.async_setup(entry_id)
+        await hass.config_entries.async_setup(entry.entry_id)
 
-    return await hass.config_entries.options.async_init(entry_id)
+    entry.runtime_data = mocked_manager
+    return await hass.config_entries.options.async_init(entry.entry_id)
 
 
 async def test_no_user_input(
@@ -413,7 +414,7 @@ async def test_options_flow_setup_usb(
 
     result = await start_options_flow(
         hass,
-        entry.entry_id,
+        entry,
         get_mocked_crownstone_entry_manager(
             get_mocked_crownstone_cloud(create_mocked_spheres(2))
         ),
@@ -490,7 +491,7 @@ async def test_options_flow_remove_usb(hass: HomeAssistant) -> None:
 
     result = await start_options_flow(
         hass,
-        entry.entry_id,
+        entry,
         get_mocked_crownstone_entry_manager(
             get_mocked_crownstone_cloud(create_mocked_spheres(2))
         ),
@@ -543,7 +544,7 @@ async def test_options_flow_manual_usb_path(
 
     result = await start_options_flow(
         hass,
-        entry.entry_id,
+        entry,
         get_mocked_crownstone_entry_manager(
             get_mocked_crownstone_cloud(create_mocked_spheres(1))
         ),
@@ -602,7 +603,7 @@ async def test_options_flow_change_usb_sphere(hass: HomeAssistant) -> None:
 
     result = await start_options_flow(
         hass,
-        entry.entry_id,
+        entry,
         get_mocked_crownstone_entry_manager(
             get_mocked_crownstone_cloud(create_mocked_spheres(3))
         ),
diff --git a/tests/components/deako/snapshots/test_light.ambr b/tests/components/deako/snapshots/test_light.ambr
index 7bc170654e1..f5ef5fd19e8 100644
--- a/tests/components/deako/snapshots/test_light.ambr
+++ b/tests/components/deako/snapshots/test_light.ambr
@@ -10,6 +10,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -66,6 +67,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -121,6 +123,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/deconz/conftest.py b/tests/components/deconz/conftest.py
index fd3003b96ef..4a74a673ef8 100644
--- a/tests/components/deconz/conftest.py
+++ b/tests/components/deconz/conftest.py
@@ -19,9 +19,14 @@ from tests.common import MockConfigEntry
 from tests.components.light.conftest import mock_light_profiles  # noqa: F401
 from tests.test_util.aiohttp import AiohttpClientMocker
 
-type ConfigEntryFactoryType = Callable[
-    [MockConfigEntry], Coroutine[Any, Any, MockConfigEntry]
-]
+
+class ConfigEntryFactoryType(Protocol):
+    """Fixture factory that can set up deCONZ config entry."""
+
+    async def __call__(self, entry: MockConfigEntry = ..., /) -> MockConfigEntry:
+        """Set up a deCONZ config entry."""
+
+
 type WebsocketDataType = Callable[[dict[str, Any]], Coroutine[Any, Any, None]]
 type WebsocketStateType = Callable[[str], Coroutine[Any, Any, None]]
 
@@ -203,10 +208,10 @@ async def fixture_config_entry_factory(
     config_entry: MockConfigEntry,
     mock_requests: Callable[[str], None],
 ) -> ConfigEntryFactoryType:
-    """Fixture factory that can set up UniFi network integration."""
+    """Fixture factory that can set up deCONZ integration."""
 
     async def __mock_setup_config_entry(
-        entry: MockConfigEntry = config_entry,
+        entry: MockConfigEntry = config_entry, /
     ) -> MockConfigEntry:
         entry.add_to_hass(hass)
         mock_requests(entry.data[CONF_HOST])
diff --git a/tests/components/deconz/snapshots/test_alarm_control_panel.ambr b/tests/components/deconz/snapshots/test_alarm_control_panel.ambr
index 86b97a62dfe..e1a6126498c 100644
--- a/tests/components/deconz/snapshots/test_alarm_control_panel.ambr
+++ b/tests/components/deconz/snapshots/test_alarm_control_panel.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/deconz/snapshots/test_binary_sensor.ambr b/tests/components/deconz/snapshots/test_binary_sensor.ambr
index 584575c23af..6b348d3ed0a 100644
--- a/tests/components/deconz/snapshots/test_binary_sensor.ambr
+++ b/tests/components/deconz/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -55,6 +56,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -103,6 +105,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -197,6 +201,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -247,6 +252,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -294,6 +300,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -341,6 +348,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -389,6 +397,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -436,6 +445,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -484,6 +494,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -531,6 +542,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -578,6 +590,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -627,6 +640,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -676,6 +690,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -725,6 +740,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -772,6 +788,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -819,6 +836,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -875,6 +893,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -925,6 +944,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -972,6 +992,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/deconz/snapshots/test_button.ambr b/tests/components/deconz/snapshots/test_button.ambr
index 1ef5248ebc3..b7ad00cdacd 100644
--- a/tests/components/deconz/snapshots/test_button.ambr
+++ b/tests/components/deconz/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/deconz/snapshots/test_climate.ambr b/tests/components/deconz/snapshots/test_climate.ambr
index 4e33e11534e..f8d572ab2ca 100644
--- a/tests/components/deconz/snapshots/test_climate.ambr
+++ b/tests/components/deconz/snapshots/test_climate.ambr
@@ -24,6 +24,7 @@
       'min_temp': 7,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -111,6 +112,7 @@
       'min_temp': 7,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -207,6 +209,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -294,6 +297,7 @@
       'min_temp': 7,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -360,6 +364,7 @@
       'min_temp': 7,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -425,6 +430,7 @@
       'min_temp': 7,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -491,6 +497,7 @@
       'min_temp': 7,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/deconz/snapshots/test_cover.ambr b/tests/components/deconz/snapshots/test_cover.ambr
index 5c50923453c..41ff4e950a8 100644
--- a/tests/components/deconz/snapshots/test_cover.ambr
+++ b/tests/components/deconz/snapshots/test_cover.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -55,6 +56,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -105,6 +107,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/deconz/snapshots/test_diagnostics.ambr b/tests/components/deconz/snapshots/test_diagnostics.ambr
index 1ca674a4fbe..20558b4bbbd 100644
--- a/tests/components/deconz/snapshots/test_diagnostics.ambr
+++ b/tests/components/deconz/snapshots/test_diagnostics.ambr
@@ -21,6 +21,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': '**REDACTED**',
       'version': 1,
diff --git a/tests/components/deconz/snapshots/test_fan.ambr b/tests/components/deconz/snapshots/test_fan.ambr
index 8b7dbba64e4..6a260c39673 100644
--- a/tests/components/deconz/snapshots/test_fan.ambr
+++ b/tests/components/deconz/snapshots/test_fan.ambr
@@ -8,6 +8,7 @@
       'preset_modes': None,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/deconz/snapshots/test_hub.ambr b/tests/components/deconz/snapshots/test_hub.ambr
index f3aa9a5e65d..06067b69c17 100644
--- a/tests/components/deconz/snapshots/test_hub.ambr
+++ b/tests/components/deconz/snapshots/test_hub.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://1.2.3.4:80',
     'connections': set({
     }),
diff --git a/tests/components/deconz/snapshots/test_light.ambr b/tests/components/deconz/snapshots/test_light.ambr
index b73bbcca216..212ccd84d0c 100644
--- a/tests/components/deconz/snapshots/test_light.ambr
+++ b/tests/components/deconz/snapshots/test_light.ambr
@@ -10,6 +10,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -75,6 +76,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -160,6 +162,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -238,6 +241,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -314,6 +318,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -379,6 +384,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -464,6 +470,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -542,6 +549,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -618,6 +626,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -683,6 +692,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -768,6 +778,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -846,6 +857,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -931,6 +943,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1022,6 +1035,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1122,6 +1136,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1215,6 +1230,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1291,6 +1307,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1348,6 +1365,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1418,6 +1436,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/deconz/snapshots/test_number.ambr b/tests/components/deconz/snapshots/test_number.ambr
index 26e044e1d31..173d5e87043 100644
--- a/tests/components/deconz/snapshots/test_number.ambr
+++ b/tests/components/deconz/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -66,6 +67,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/deconz/snapshots/test_scene.ambr b/tests/components/deconz/snapshots/test_scene.ambr
index 85a5ab92c5c..21456afaea1 100644
--- a/tests/components/deconz/snapshots/test_scene.ambr
+++ b/tests/components/deconz/snapshots/test_scene.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/deconz/snapshots/test_select.ambr b/tests/components/deconz/snapshots/test_select.ambr
index 997eab0901f..7fa2aaf11cb 100644
--- a/tests/components/deconz/snapshots/test_select.ambr
+++ b/tests/components/deconz/snapshots/test_select.ambr
@@ -11,6 +11,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -67,6 +68,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -124,6 +126,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -180,6 +183,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +240,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -293,6 +298,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -349,6 +355,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -405,6 +412,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -462,6 +470,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -523,6 +532,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/deconz/snapshots/test_sensor.ambr b/tests/components/deconz/snapshots/test_sensor.ambr
index 0b76366b5d1..be397f0e22a 100644
--- a/tests/components/deconz/snapshots/test_sensor.ambr
+++ b/tests/components/deconz/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -55,6 +56,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -106,6 +108,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -160,6 +163,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -209,6 +213,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -257,6 +262,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -305,6 +311,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -353,6 +360,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -401,6 +409,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -450,6 +459,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -505,6 +515,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -557,6 +568,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -611,6 +623,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -663,6 +676,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -717,6 +731,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -771,6 +786,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -822,6 +838,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -876,6 +893,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -928,6 +946,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -980,6 +999,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1035,6 +1055,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1085,6 +1106,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1134,6 +1156,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1186,6 +1209,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1239,6 +1263,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1290,6 +1315,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1341,6 +1367,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1392,6 +1419,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1443,6 +1471,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1493,6 +1522,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1544,6 +1574,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1600,6 +1631,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1651,6 +1683,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1702,6 +1735,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1753,6 +1787,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1803,6 +1838,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1854,6 +1890,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1905,6 +1942,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1956,6 +1994,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2006,6 +2045,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2058,6 +2098,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2109,6 +2150,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2160,6 +2202,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2211,6 +2254,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/demo/test_cover.py b/tests/components/demo/test_cover.py
index 97cad5bbe14..dcec921c01d 100644
--- a/tests/components/demo/test_cover.py
+++ b/tests/components/demo/test_cover.py
@@ -31,7 +31,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import assert_setup_component, async_fire_time_changed
 
diff --git a/tests/components/demo/test_geo_location.py b/tests/components/demo/test_geo_location.py
index d3c2937d12b..a93c79828d6 100644
--- a/tests/components/demo/test_geo_location.py
+++ b/tests/components/demo/test_geo_location.py
@@ -15,7 +15,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import assert_setup_component, async_fire_time_changed
 
diff --git a/tests/components/demo/test_notify.py b/tests/components/demo/test_notify.py
index 98b3de8448a..f3677c6e373 100644
--- a/tests/components/demo/test_notify.py
+++ b/tests/components/demo/test_notify.py
@@ -6,8 +6,7 @@ from unittest.mock import patch
 import pytest
 
 from homeassistant.components import notify
-from homeassistant.components.demo import DOMAIN
-import homeassistant.components.demo.notify as demo
+from homeassistant.components.demo import DOMAIN, notify as demo
 from homeassistant.const import Platform
 from homeassistant.core import Event, HomeAssistant
 from homeassistant.setup import async_setup_component
diff --git a/tests/components/demo/test_valve.py b/tests/components/demo/test_valve.py
new file mode 100644
index 00000000000..1057065ce70
--- /dev/null
+++ b/tests/components/demo/test_valve.py
@@ -0,0 +1,83 @@
+"""The tests for the Demo valve platform."""
+
+from unittest.mock import patch
+
+import pytest
+
+from homeassistant.components.demo import DOMAIN, valve as demo_valve
+from homeassistant.components.valve import (
+    DOMAIN as VALVE_DOMAIN,
+    SERVICE_CLOSE_VALVE,
+    SERVICE_OPEN_VALVE,
+    ValveState,
+)
+from homeassistant.const import ATTR_ENTITY_ID, EVENT_STATE_CHANGED, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.common import async_capture_events
+
+FRONT_GARDEN = "valve.front_garden"
+ORCHARD = "valve.orchard"
+
+
+@pytest.fixture
+async def valve_only() -> None:
+    """Enable only the valve platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.VALVE],
+    ):
+        yield
+
+
+@pytest.fixture(autouse=True)
+async def setup_comp(hass: HomeAssistant, valve_only: None):
+    """Set up demo component."""
+    assert await async_setup_component(
+        hass, VALVE_DOMAIN, {VALVE_DOMAIN: {"platform": DOMAIN}}
+    )
+    await hass.async_block_till_done()
+
+
+@patch.object(demo_valve, "OPEN_CLOSE_DELAY", 0)
+async def test_closing(hass: HomeAssistant) -> None:
+    """Test the closing of a valve."""
+    state = hass.states.get(FRONT_GARDEN)
+    assert state.state == ValveState.OPEN
+    await hass.async_block_till_done()
+
+    state_changes = async_capture_events(hass, EVENT_STATE_CHANGED)
+    await hass.services.async_call(
+        VALVE_DOMAIN,
+        SERVICE_CLOSE_VALVE,
+        {ATTR_ENTITY_ID: FRONT_GARDEN},
+        blocking=False,
+    )
+    await hass.async_block_till_done()
+
+    assert state_changes[0].data["entity_id"] == FRONT_GARDEN
+    assert state_changes[0].data["new_state"].state == ValveState.CLOSING
+
+    assert state_changes[1].data["entity_id"] == FRONT_GARDEN
+    assert state_changes[1].data["new_state"].state == ValveState.CLOSED
+
+
+@patch.object(demo_valve, "OPEN_CLOSE_DELAY", 0)
+async def test_opening(hass: HomeAssistant) -> None:
+    """Test the opening of a valve."""
+    state = hass.states.get(ORCHARD)
+    assert state.state == ValveState.CLOSED
+    await hass.async_block_till_done()
+
+    state_changes = async_capture_events(hass, EVENT_STATE_CHANGED)
+    await hass.services.async_call(
+        VALVE_DOMAIN, SERVICE_OPEN_VALVE, {ATTR_ENTITY_ID: ORCHARD}, blocking=False
+    )
+    await hass.async_block_till_done()
+
+    assert state_changes[0].data["entity_id"] == ORCHARD
+    assert state_changes[0].data["new_state"].state == ValveState.OPENING
+
+    assert state_changes[1].data["entity_id"] == ORCHARD
+    assert state_changes[1].data["new_state"].state == ValveState.OPEN
diff --git a/tests/components/demo/test_water_heater.py b/tests/components/demo/test_water_heater.py
index 48859610d39..257e1ab5ffb 100644
--- a/tests/components/demo/test_water_heater.py
+++ b/tests/components/demo/test_water_heater.py
@@ -43,6 +43,7 @@ async def test_setup_params(hass: HomeAssistant) -> None:
     assert state.attributes.get("temperature") == 119
     assert state.attributes.get("away_mode") == "off"
     assert state.attributes.get("operation_mode") == "eco"
+    assert state.attributes.get("target_temp_step") == 1
 
 
 async def test_default_setup_params(hass: HomeAssistant) -> None:
diff --git a/tests/components/derivative/test_sensor.py b/tests/components/derivative/test_sensor.py
index 4a4d8519b25..f8d88066f16 100644
--- a/tests/components/derivative/test_sensor.py
+++ b/tests/components/derivative/test_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.const import UnitOfPower, UnitOfTime
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry
 
@@ -39,7 +39,7 @@ async def test_state(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
         freezer.move_to(dt_util.utcnow() + timedelta(seconds=3600))
-        hass.states.async_set(entity_id, 1, {}, force_update=True)
+        hass.states.async_set(entity_id, 1, {})
         await hass.async_block_till_done()
 
     state = hass.states.get("sensor.derivative")
@@ -51,6 +51,49 @@ async def test_state(hass: HomeAssistant) -> None:
     assert state.attributes.get("unit_of_measurement") == "kW"
 
 
+async def test_no_change(hass: HomeAssistant) -> None:
+    """Test derivative sensor state updated when source sensor doesn't change."""
+    config = {
+        "sensor": {
+            "platform": "derivative",
+            "name": "derivative",
+            "source": "sensor.energy",
+            "unit": "kW",
+            "round": 2,
+        }
+    }
+
+    assert await async_setup_component(hass, "sensor", config)
+
+    entity_id = config["sensor"]["source"]
+    base = dt_util.utcnow()
+    with freeze_time(base) as freezer:
+        hass.states.async_set(entity_id, 0, {})
+        await hass.async_block_till_done()
+
+        freezer.move_to(dt_util.utcnow() + timedelta(seconds=3600))
+        hass.states.async_set(entity_id, 1, {})
+        await hass.async_block_till_done()
+
+        freezer.move_to(dt_util.utcnow() + timedelta(seconds=3600))
+        hass.states.async_set(entity_id, 1, {})
+        await hass.async_block_till_done()
+
+        freezer.move_to(dt_util.utcnow() + timedelta(seconds=3600))
+        hass.states.async_set(entity_id, 1, {})
+        await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.derivative")
+    assert state is not None
+
+    # Testing a energy sensor at 1 kWh for 1hour = 0kW
+    assert round(float(state.state), config["sensor"]["round"]) == 0.0
+
+    assert state.attributes.get("unit_of_measurement") == "kW"
+
+    assert state.last_changed == base + timedelta(seconds=2 * 3600)
+
+
 async def _setup_sensor(
     hass: HomeAssistant, config: dict[str, Any]
 ) -> tuple[dict[str, Any], str]:
@@ -86,7 +129,7 @@ async def setup_tests(
     with freeze_time(base) as freezer:
         for time, value in zip(times, values, strict=False):
             freezer.move_to(base + timedelta(seconds=time))
-            hass.states.async_set(entity_id, value, {}, force_update=True)
+            hass.states.async_set(entity_id, value, {})
             await hass.async_block_till_done()
 
     state = hass.states.get("sensor.power")
@@ -159,6 +202,53 @@ async def test_dataSet6(hass: HomeAssistant) -> None:
     await setup_tests(hass, {}, times=[0, 60], values=[0, 1 / 60], expected_state=1)
 
 
+async def test_data_moving_average_with_zeroes(hass: HomeAssistant) -> None:
+    """Test that zeroes are properly handled within the time window."""
+    # We simulate the following situation:
+    # The temperature rises 1 °C per minute for 10 minutes long. Then, it
+    # stays constant for another 10 minutes. There is a data point every
+    # minute and we use a time window of 10 minutes.
+    # Therefore, we can expect the derivative to peak at 1 after 10 minutes
+    # and then fall down to 0 in steps of 10%.
+
+    temperature_values = []
+    for temperature in range(10):
+        temperature_values += [temperature]
+    temperature_values += [10] * 11
+    time_window = 600
+    times = list(range(0, 1200 + 60, 60))
+
+    config, entity_id = await _setup_sensor(
+        hass,
+        {
+            "time_window": {"seconds": time_window},
+            "unit_time": UnitOfTime.MINUTES,
+            "round": 1,
+        },
+    )
+
+    base = dt_util.utcnow()
+    with freeze_time(base) as freezer:
+        last_derivative = 0
+        for time, value in zip(times, temperature_values, strict=True):
+            now = base + timedelta(seconds=time)
+            freezer.move_to(now)
+            hass.states.async_set(entity_id, value, {})
+            await hass.async_block_till_done()
+
+            state = hass.states.get("sensor.power")
+            derivative = round(float(state.state), config["sensor"]["round"])
+
+            if time_window == time:
+                assert derivative == 1.0
+            elif time_window < time < time_window * 2:
+                assert (0.1 - 1e-6) < abs(derivative - last_derivative) < (0.1 + 1e-6)
+            elif time == time_window * 2:
+                assert derivative == 0
+
+            last_derivative = derivative
+
+
 async def test_data_moving_average_for_discrete_sensor(hass: HomeAssistant) -> None:
     """Test derivative sensor state."""
     # We simulate the following situation:
@@ -188,7 +278,7 @@ async def test_data_moving_average_for_discrete_sensor(hass: HomeAssistant) -> N
         for time, value in zip(times, temperature_values, strict=False):
             now = base + timedelta(seconds=time)
             freezer.move_to(now)
-            hass.states.async_set(entity_id, value, {}, force_update=True)
+            hass.states.async_set(entity_id, value, {})
             await hass.async_block_till_done()
 
             if time_window < time < times[-1] - time_window:
@@ -232,7 +322,7 @@ async def test_data_moving_average_for_irregular_times(hass: HomeAssistant) -> N
         for time, value in zip(times, temperature_values, strict=False):
             now = base + timedelta(seconds=time)
             freezer.move_to(now)
-            hass.states.async_set(entity_id, value, {}, force_update=True)
+            hass.states.async_set(entity_id, value, {})
             await hass.async_block_till_done()
 
             if time_window < time and time > times[3]:
@@ -270,7 +360,7 @@ async def test_double_signal_after_delay(hass: HomeAssistant) -> None:
         for time, value in zip(times, temperature_values, strict=False):
             now = base + timedelta(seconds=time)
             freezer.move_to(now)
-            hass.states.async_set(entity_id, value, {}, force_update=True)
+            hass.states.async_set(entity_id, value, {})
             await hass.async_block_till_done()
             state = hass.states.get("sensor.power")
             derivative = round(float(state.state), config["sensor"]["round"])
@@ -302,24 +392,22 @@ async def test_prefix(hass: HomeAssistant) -> None:
             entity_id,
             1000,
             {"unit_of_measurement": UnitOfPower.WATT},
-            force_update=True,
         )
         await hass.async_block_till_done()
 
         freezer.move_to(dt_util.utcnow() + timedelta(seconds=3600))
         hass.states.async_set(
             entity_id,
-            1000,
+            2000,
             {"unit_of_measurement": UnitOfPower.WATT},
-            force_update=True,
         )
         await hass.async_block_till_done()
 
     state = hass.states.get("sensor.derivative")
     assert state is not None
 
-    # Testing a power sensor at 1000 Watts for 1hour = 0kW/h
-    assert round(float(state.state), config["sensor"]["round"]) == 0.0
+    # Testing a power sensor increasing by 1000 Watts per hour = 1kW/h
+    assert round(float(state.state), config["sensor"]["round"]) == 1.0
     assert state.attributes.get("unit_of_measurement") == f"kW/{UnitOfTime.HOURS}"
 
 
@@ -345,7 +433,7 @@ async def test_suffix(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
         freezer.move_to(dt_util.utcnow() + timedelta(seconds=3600))
-        hass.states.async_set(entity_id, 1000, {}, force_update=True)
+        hass.states.async_set(entity_id, 1000, {})
         await hass.async_block_till_done()
 
     state = hass.states.get("sensor.derivative")
@@ -375,7 +463,6 @@ async def test_total_increasing_reset(hass: HomeAssistant) -> None:
                 entity_id,
                 value,
                 {ATTR_STATE_CLASS: SensorStateClass.TOTAL_INCREASING},
-                force_update=True,
             )
             await hass.async_block_till_done()
 
diff --git a/tests/components/devialet/test_init.py b/tests/components/devialet/test_init.py
index a87e8ac05c3..6808ee0983e 100644
--- a/tests/components/devialet/test_init.py
+++ b/tests/components/devialet/test_init.py
@@ -1,6 +1,5 @@
 """Test the Devialet init."""
 
-from homeassistant.components.devialet.const import DOMAIN
 from homeassistant.components.media_player import DOMAIN as MP_DOMAIN, MediaPlayerState
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
@@ -16,7 +15,6 @@ async def test_load_unload_config_entry(
     """Test the Devialet configuration entry loading and unloading."""
     entry = await setup_integration(hass, aioclient_mock)
 
-    assert entry.entry_id in hass.data[DOMAIN]
     assert entry.state is ConfigEntryState.LOADED
     assert entry.unique_id is not None
 
@@ -26,7 +24,6 @@ async def test_load_unload_config_entry(
     await hass.config_entries.async_unload(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert entry.entry_id not in hass.data[DOMAIN]
     assert entry.state is ConfigEntryState.NOT_LOADED
 
 
@@ -36,7 +33,6 @@ async def test_load_unload_config_entry_when_device_unavailable(
     """Test the Devialet configuration entry loading and unloading when the device is unavailable."""
     entry = await setup_integration(hass, aioclient_mock, state="unavailable")
 
-    assert entry.entry_id in hass.data[DOMAIN]
     assert entry.state is ConfigEntryState.LOADED
     assert entry.unique_id is not None
 
@@ -46,5 +42,4 @@ async def test_load_unload_config_entry_when_device_unavailable(
     await hass.config_entries.async_unload(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert entry.entry_id not in hass.data[DOMAIN]
     assert entry.state is ConfigEntryState.NOT_LOADED
diff --git a/tests/components/devialet/test_media_player.py b/tests/components/devialet/test_media_player.py
index 6ca3d23218f..fd593a10a98 100644
--- a/tests/components/devialet/test_media_player.py
+++ b/tests/components/devialet/test_media_player.py
@@ -6,7 +6,6 @@ from devialet import DevialetApi
 from devialet.const import UrlSuffix
 from yarl import URL
 
-from homeassistant.components.devialet.const import DOMAIN
 from homeassistant.components.devialet.media_player import SUPPORT_DEVIALET
 from homeassistant.components.homeassistant import SERVICE_UPDATE_ENTITY
 from homeassistant.components.media_player import (
@@ -108,7 +107,6 @@ async def test_media_player_playing(
     await async_setup_component(hass, "homeassistant", {})
     entry = await setup_integration(hass, aioclient_mock)
 
-    assert entry.entry_id in hass.data[DOMAIN]
     assert entry.state is ConfigEntryState.LOADED
 
     await hass.services.async_call(
@@ -227,7 +225,6 @@ async def test_media_player_playing(
     await hass.config_entries.async_unload(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert entry.entry_id not in hass.data[DOMAIN]
     assert entry.state is ConfigEntryState.NOT_LOADED
 
 
@@ -237,7 +234,6 @@ async def test_media_player_offline(
     """Test the Devialet configuration entry loading and unloading."""
     entry = await setup_integration(hass, aioclient_mock, state=STATE_UNAVAILABLE)
 
-    assert entry.entry_id in hass.data[DOMAIN]
     assert entry.state is ConfigEntryState.LOADED
 
     state = hass.states.get(f"{MP_DOMAIN}.{NAME.lower()}")
@@ -247,7 +243,6 @@ async def test_media_player_offline(
     await hass.config_entries.async_unload(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert entry.entry_id not in hass.data[DOMAIN]
     assert entry.state is ConfigEntryState.NOT_LOADED
 
 
@@ -257,14 +252,12 @@ async def test_media_player_without_serial(
     """Test the Devialet configuration entry loading and unloading."""
     entry = await setup_integration(hass, aioclient_mock, serial=None)
 
-    assert entry.entry_id in hass.data[DOMAIN]
     assert entry.state is ConfigEntryState.LOADED
     assert entry.unique_id is None
 
     await hass.config_entries.async_unload(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert entry.entry_id not in hass.data[DOMAIN]
     assert entry.state is ConfigEntryState.NOT_LOADED
 
 
@@ -276,7 +269,6 @@ async def test_media_player_services(
         hass, aioclient_mock, state=MediaPlayerState.PLAYING
     )
 
-    assert entry.entry_id in hass.data[DOMAIN]
     assert entry.state is ConfigEntryState.LOADED
 
     target = {ATTR_ENTITY_ID: hass.states.get(f"{MP_DOMAIN}.{NAME}").entity_id}
@@ -309,5 +301,4 @@ async def test_media_player_services(
     await hass.config_entries.async_unload(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert entry.entry_id not in hass.data[DOMAIN]
     assert entry.state is ConfigEntryState.NOT_LOADED
diff --git a/tests/components/device_automation/test_toggle_entity.py b/tests/components/device_automation/test_toggle_entity.py
index be4d3bd4c9e..a7b2f8a3b75 100644
--- a/tests/components/device_automation/test_toggle_entity.py
+++ b/tests/components/device_automation/test_toggle_entity.py
@@ -9,7 +9,7 @@ from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/device_tracker/test_config_entry.py b/tests/components/device_tracker/test_config_entry.py
index bc721803450..fa1e65ded51 100644
--- a/tests/components/device_tracker/test_config_entry.py
+++ b/tests/components/device_tracker/test_config_entry.py
@@ -35,7 +35,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from tests.common import (
     MockConfigEntry,
@@ -114,7 +114,7 @@ async def create_mock_platform(
     async def async_setup_entry_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test event platform via config entry."""
         async_add_entities(entities)
diff --git a/tests/components/device_tracker/test_init.py b/tests/components/device_tracker/test_init.py
index 6226669aa0f..ea07365bd2f 100644
--- a/tests/components/device_tracker/test_init.py
+++ b/tests/components/device_tracker/test_init.py
@@ -28,7 +28,7 @@ from homeassistant.helpers import discovery
 from homeassistant.helpers.entity_registry import RegistryEntry
 from homeassistant.helpers.json import JSONEncoder
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import common
 from .common import MockScanner, mock_legacy_device_tracker_setup
diff --git a/tests/components/devolo_home_control/snapshots/test_binary_sensor.ambr b/tests/components/devolo_home_control/snapshots/test_binary_sensor.ambr
index c5daed73b33..659420c1590 100644
--- a/tests/components/devolo_home_control/snapshots/test_binary_sensor.ambr
+++ b/tests/components/devolo_home_control/snapshots/test_binary_sensor.ambr
@@ -20,6 +20,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -67,6 +68,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -113,6 +115,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/devolo_home_control/snapshots/test_climate.ambr b/tests/components/devolo_home_control/snapshots/test_climate.ambr
index be7d6f78142..96ffe45c4a4 100644
--- a/tests/components/devolo_home_control/snapshots/test_climate.ambr
+++ b/tests/components/devolo_home_control/snapshots/test_climate.ambr
@@ -35,6 +35,7 @@
       'target_temp_step': 0.5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/devolo_home_control/snapshots/test_cover.ambr b/tests/components/devolo_home_control/snapshots/test_cover.ambr
index 7d88d42d5c2..44bff626923 100644
--- a/tests/components/devolo_home_control/snapshots/test_cover.ambr
+++ b/tests/components/devolo_home_control/snapshots/test_cover.ambr
@@ -22,6 +22,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/devolo_home_control/snapshots/test_diagnostics.ambr b/tests/components/devolo_home_control/snapshots/test_diagnostics.ambr
index abedc128756..0e507ca0b28 100644
--- a/tests/components/devolo_home_control/snapshots/test_diagnostics.ambr
+++ b/tests/components/devolo_home_control/snapshots/test_diagnostics.ambr
@@ -47,6 +47,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': '123456',
       'version': 1,
diff --git a/tests/components/devolo_home_control/snapshots/test_light.ambr b/tests/components/devolo_home_control/snapshots/test_light.ambr
index 959656b52a4..11dc768a519 100644
--- a/tests/components/devolo_home_control/snapshots/test_light.ambr
+++ b/tests/components/devolo_home_control/snapshots/test_light.ambr
@@ -29,6 +29,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -85,6 +86,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/devolo_home_control/snapshots/test_sensor.ambr b/tests/components/devolo_home_control/snapshots/test_sensor.ambr
index 3c23385594a..7cca8b23e77 100644
--- a/tests/components/devolo_home_control/snapshots/test_sensor.ambr
+++ b/tests/components/devolo_home_control/snapshots/test_sensor.ambr
@@ -24,6 +24,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -74,6 +75,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -125,6 +127,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -176,6 +179,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -227,6 +231,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/devolo_home_control/snapshots/test_siren.ambr b/tests/components/devolo_home_control/snapshots/test_siren.ambr
index 5c94674998c..41b68574065 100644
--- a/tests/components/devolo_home_control/snapshots/test_siren.ambr
+++ b/tests/components/devolo_home_control/snapshots/test_siren.ambr
@@ -27,6 +27,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -81,6 +82,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -135,6 +137,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/devolo_home_control/snapshots/test_switch.ambr b/tests/components/devolo_home_control/snapshots/test_switch.ambr
index 3e2f6f705d3..d3097716092 100644
--- a/tests/components/devolo_home_control/snapshots/test_switch.ambr
+++ b/tests/components/devolo_home_control/snapshots/test_switch.ambr
@@ -19,6 +19,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/devolo_home_network/conftest.py b/tests/components/devolo_home_network/conftest.py
index fd03063cd34..2b3fd989754 100644
--- a/tests/components/devolo_home_network/conftest.py
+++ b/tests/components/devolo_home_network/conftest.py
@@ -27,6 +27,13 @@ def mock_repeater_device(mock_device: MockDevice):
     return mock_device
 
 
+@pytest.fixture
+def mock_ipv6_device(mock_device: MockDevice):
+    """Mock connecting to a devolo home network device using IPv6."""
+    mock_device.ip = "2001:db8::1"
+    return mock_device
+
+
 @pytest.fixture
 def mock_nonwifi_device(mock_device: MockDevice):
     """Mock connecting to a devolo home network device without wifi."""
diff --git a/tests/components/devolo_home_network/snapshots/test_binary_sensor.ambr b/tests/components/devolo_home_network/snapshots/test_binary_sensor.ambr
index c0df0d5d5a5..a33fdf084dd 100644
--- a/tests/components/devolo_home_network/snapshots/test_binary_sensor.ambr
+++ b/tests/components/devolo_home_network/snapshots/test_binary_sensor.ambr
@@ -20,6 +20,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/devolo_home_network/snapshots/test_button.ambr b/tests/components/devolo_home_network/snapshots/test_button.ambr
index 126ac4e7cdb..31d8ebf31a0 100644
--- a/tests/components/devolo_home_network/snapshots/test_button.ambr
+++ b/tests/components/devolo_home_network/snapshots/test_button.ambr
@@ -20,6 +20,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -67,6 +68,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -113,6 +115,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -159,6 +162,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/devolo_home_network/snapshots/test_diagnostics.ambr b/tests/components/devolo_home_network/snapshots/test_diagnostics.ambr
index 53940bf5119..1288b7f3ef6 100644
--- a/tests/components/devolo_home_network/snapshots/test_diagnostics.ambr
+++ b/tests/components/devolo_home_network/snapshots/test_diagnostics.ambr
@@ -32,6 +32,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': '1234567890',
       'version': 1,
diff --git a/tests/components/devolo_home_network/snapshots/test_image.ambr b/tests/components/devolo_home_network/snapshots/test_image.ambr
index b3924a508cf..3772672d8cb 100644
--- a/tests/components/devolo_home_network/snapshots/test_image.ambr
+++ b/tests/components/devolo_home_network/snapshots/test_image.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/devolo_home_network/snapshots/test_init.ambr b/tests/components/devolo_home_network/snapshots/test_init.ambr
index 297c9a25183..5753fd82817 100644
--- a/tests/components/devolo_home_network/snapshots/test_init.ambr
+++ b/tests/components/devolo_home_network/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://192.0.2.1',
     'connections': set({
       tuple(
@@ -35,10 +36,48 @@
     'via_device_id': None,
   })
 # ---
+# name: test_setup_entry[mock_ipv6_device]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'http://[2001:db8::1]',
+    'connections': set({
+      tuple(
+        'mac',
+        'aa:bb:cc:dd:ee:ff',
+      ),
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'devolo_home_network',
+        '1234567890',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'devolo',
+    'model': 'dLAN pro 1200+ WiFi ac',
+    'model_id': '2730',
+    'name': 'Mock Title',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': '1234567890',
+    'suggested_area': None,
+    'sw_version': '5.6.1',
+    'via_device_id': None,
+  })
+# ---
 # name: test_setup_entry[mock_repeater_device]
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://192.0.2.1',
     'connections': set({
     }),
diff --git a/tests/components/devolo_home_network/snapshots/test_sensor.ambr b/tests/components/devolo_home_network/snapshots/test_sensor.ambr
index 2e6730cdb21..9e2d8879ac9 100644
--- a/tests/components/devolo_home_network/snapshots/test_sensor.ambr
+++ b/tests/components/devolo_home_network/snapshots/test_sensor.ambr
@@ -19,6 +19,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -68,6 +69,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -115,6 +117,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -161,6 +164,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -209,6 +213,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -260,6 +265,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/devolo_home_network/snapshots/test_switch.ambr b/tests/components/devolo_home_network/snapshots/test_switch.ambr
index a2df5d2579f..6499bb9a17b 100644
--- a/tests/components/devolo_home_network/snapshots/test_switch.ambr
+++ b/tests/components/devolo_home_network/snapshots/test_switch.ambr
@@ -19,6 +19,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -65,6 +66,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/devolo_home_network/snapshots/test_update.ambr b/tests/components/devolo_home_network/snapshots/test_update.ambr
index 8a1065f9a60..f4d1c0480cf 100644
--- a/tests/components/devolo_home_network/snapshots/test_update.ambr
+++ b/tests/components/devolo_home_network/snapshots/test_update.ambr
@@ -32,6 +32,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/devolo_home_network/test_init.py b/tests/components/devolo_home_network/test_init.py
index 71823eabe82..56d2c21a5b2 100644
--- a/tests/components/devolo_home_network/test_init.py
+++ b/tests/components/devolo_home_network/test_init.py
@@ -27,7 +27,9 @@ from .mock import MockDevice
 from tests.common import MockConfigEntry
 
 
-@pytest.mark.parametrize("device", ["mock_device", "mock_repeater_device"])
+@pytest.mark.parametrize(
+    "device", ["mock_device", "mock_repeater_device", "mock_ipv6_device"]
+)
 async def test_setup_entry(
     hass: HomeAssistant,
     device: str,
diff --git a/tests/components/dhcp/test_init.py b/tests/components/dhcp/test_init.py
index 9f3435f0cd9..223dc83f83a 100644
--- a/tests/components/dhcp/test_init.py
+++ b/tests/components/dhcp/test_init.py
@@ -31,12 +31,12 @@ from homeassistant.const import (
     STATE_NOT_HOME,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.discovery_flow import DiscoveryKey
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/discovergy/snapshots/test_sensor.ambr b/tests/components/discovergy/snapshots/test_sensor.ambr
index b4831d81bda..866a57c8dda 100644
--- a/tests/components/discovergy/snapshots/test_sensor.ambr
+++ b/tests/components/discovergy/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -44,6 +45,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -188,6 +192,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/dormakaba_dkey/test_config_flow.py b/tests/components/dormakaba_dkey/test_config_flow.py
index 8d8140d609a..b3657810006 100644
--- a/tests/components/dormakaba_dkey/test_config_flow.py
+++ b/tests/components/dormakaba_dkey/test_config_flow.py
@@ -9,6 +9,7 @@ import pytest
 
 from homeassistant import config_entries
 from homeassistant.components.dormakaba_dkey.const import DOMAIN
+from homeassistant.config_entries import SOURCE_IGNORE
 from homeassistant.const import CONF_ADDRESS
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResult, FlowResultType
@@ -143,6 +144,43 @@ async def test_async_step_user_takes_precedence_over_discovery(
     assert not hass.config_entries.flow.async_progress(DOMAIN)
 
 
+async def test_user_setup_removes_ignored_entry(hass: HomeAssistant) -> None:
+    """Test the user initiated form can replace an ignored device."""
+    ignored_entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=DKEY_DISCOVERY_INFO.address,
+        source=SOURCE_IGNORE,
+    )
+    ignored_entry.add_to_hass(hass)
+    assert hass.config_entries.async_entries(DOMAIN) == [ignored_entry]
+
+    with patch(
+        "homeassistant.components.dormakaba_dkey.config_flow.async_discovered_service_info",
+        return_value=[NOT_DKEY_DISCOVERY_INFO, DKEY_DISCOVERY_INFO],
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": config_entries.SOURCE_USER}
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_ADDRESS: DKEY_DISCOVERY_INFO.address,
+        },
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "associate"
+    assert result["errors"] is None
+
+    await _test_common_success(hass, result)
+
+    # Check the ignored entry is removed
+    assert ignored_entry not in hass.config_entries.async_entries(DOMAIN)
+
+
 async def test_bluetooth_step_success(hass: HomeAssistant) -> None:
     """Test bluetooth step success path."""
     result = await hass.config_entries.flow.async_init(
diff --git a/tests/components/dremel_3d_printer/test_init.py b/tests/components/dremel_3d_printer/test_init.py
index 6b008c7fac1..fda1ecc6cf6 100644
--- a/tests/components/dremel_3d_printer/test_init.py
+++ b/tests/components/dremel_3d_printer/test_init.py
@@ -12,7 +12,7 @@ from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/drop_connect/snapshots/test_binary_sensor.ambr b/tests/components/drop_connect/snapshots/test_binary_sensor.ambr
index 9b0cc201573..8d83482e208 100644
--- a/tests/components/drop_connect/snapshots/test_binary_sensor.ambr
+++ b/tests/components/drop_connect/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -193,6 +197,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -240,6 +245,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -287,6 +293,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -334,6 +341,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -380,6 +388,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -427,6 +436,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/dsmr/conftest.py b/tests/components/dsmr/conftest.py
index ccb7920e141..769e98f6db4 100644
--- a/tests/components/dsmr/conftest.py
+++ b/tests/components/dsmr/conftest.py
@@ -113,6 +113,12 @@ def dsmr_connection_send_validate_fixture() -> Generator[
                     EQUIPMENT_IDENTIFIER_GAS, [{"value": "123456789", "unit": ""}]
                 ),
             }
+        if args[1] == "5EONHU":
+            protocol.telegram = {
+                LUXEMBOURG_EQUIPMENT_IDENTIFIER: CosemObject(
+                    LUXEMBOURG_EQUIPMENT_IDENTIFIER, [{"value": "12345678", "unit": ""}]
+                ),
+            }
         if args[1] == "5S":
             protocol.telegram = {
                 P1_MESSAGE_TIMESTAMP: CosemObject(
diff --git a/tests/components/dsmr/test_config_flow.py b/tests/components/dsmr/test_config_flow.py
index 91adf38eacf..961c9831f44 100644
--- a/tests/components/dsmr/test_config_flow.py
+++ b/tests/components/dsmr/test_config_flow.py
@@ -163,6 +163,16 @@ async def test_setup_network_rfxtrx(
                 "serial_id_gas": "123456789",
             },
         ),
+        (
+            "5EONHU",
+            {
+                "port": "/dev/ttyUSB1234",
+                "dsmr_version": "5EONHU",
+                "protocol": "dsmr_protocol",
+                "serial_id": "12345678",
+                "serial_id_gas": None,
+            },
+        ),
         (
             "5S",
             {
diff --git a/tests/components/dsmr/test_sensor.py b/tests/components/dsmr/test_sensor.py
index fbe14b38aa3..5657c5999ce 100644
--- a/tests/components/dsmr/test_sensor.py
+++ b/tests/components/dsmr/test_sensor.py
@@ -512,6 +512,76 @@ async def test_luxembourg_meter(
     )
 
 
+async def test_eonhu_meter(
+    hass: HomeAssistant, dsmr_connection_fixture: tuple[MagicMock, MagicMock, MagicMock]
+) -> None:
+    """Test if v5 meter is correctly parsed."""
+    (connection_factory, transport, protocol) = dsmr_connection_fixture
+
+    entry_data = {
+        "port": "/dev/ttyUSB0",
+        "dsmr_version": "5EONHU",
+        "serial_id": "1234",
+    }
+    entry_options = {
+        "time_between_update": 0,
+    }
+
+    telegram = Telegram()
+    telegram.add(
+        ELECTRICITY_IMPORTED_TOTAL,
+        CosemObject(
+            (0, 0),
+            [{"value": Decimal("123.456"), "unit": UnitOfEnergy.KILO_WATT_HOUR}],
+        ),
+        "ELECTRICITY_IMPORTED_TOTAL",
+    )
+    telegram.add(
+        ELECTRICITY_EXPORTED_TOTAL,
+        CosemObject(
+            (0, 0),
+            [{"value": Decimal("654.321"), "unit": UnitOfEnergy.KILO_WATT_HOUR}],
+        ),
+        "ELECTRICITY_EXPORTED_TOTAL",
+    )
+
+    mock_entry = MockConfigEntry(
+        domain="dsmr", unique_id="/dev/ttyUSB0", data=entry_data, options=entry_options
+    )
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
+    await hass.async_block_till_done()
+
+    telegram_callback = connection_factory.call_args_list[0][0][2]
+
+    # simulate a telegram pushed from the smartmeter and parsed by dsmr_parser
+    telegram_callback(telegram)
+
+    # after receiving telegram entities need to have the chance to be created
+    await hass.async_block_till_done()
+
+    active_tariff = hass.states.get("sensor.electricity_meter_energy_consumption_total")
+    assert active_tariff.state == "123.456"
+    assert active_tariff.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY
+    assert (
+        active_tariff.attributes.get(ATTR_STATE_CLASS)
+        == SensorStateClass.TOTAL_INCREASING
+    )
+    assert (
+        active_tariff.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
+        == UnitOfEnergy.KILO_WATT_HOUR
+    )
+
+    active_tariff = hass.states.get("sensor.electricity_meter_energy_production_total")
+    assert active_tariff.state == "654.321"
+    assert (
+        active_tariff.attributes.get("unit_of_measurement")
+        == UnitOfEnergy.KILO_WATT_HOUR
+    )
+
+
 async def test_belgian_meter(
     hass: HomeAssistant, dsmr_connection_fixture: tuple[MagicMock, MagicMock, MagicMock]
 ) -> None:
diff --git a/tests/components/dsmr_reader/snapshots/test_diagnostics.ambr b/tests/components/dsmr_reader/snapshots/test_diagnostics.ambr
index d407fe2dc5b..0a46dd7f476 100644
--- a/tests/components/dsmr_reader/snapshots/test_diagnostics.ambr
+++ b/tests/components/dsmr_reader/snapshots/test_diagnostics.ambr
@@ -17,6 +17,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'dsmr_reader',
       'unique_id': 'UNIQUE_TEST_ID',
       'version': 1,
diff --git a/tests/components/dynalite/test_init.py b/tests/components/dynalite/test_init.py
index 4bf4eb53ad6..3335e12b2a2 100644
--- a/tests/components/dynalite/test_init.py
+++ b/tests/components/dynalite/test_init.py
@@ -5,7 +5,7 @@ from unittest.mock import call, patch
 import pytest
 from voluptuous import MultipleInvalid
 
-import homeassistant.components.dynalite.const as dynalite
+from homeassistant.components.dynalite import const as dynalite
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
diff --git a/tests/components/eafm/conftest.py b/tests/components/eafm/conftest.py
index 3b060563a30..5dbdc98ad29 100644
--- a/tests/components/eafm/conftest.py
+++ b/tests/components/eafm/conftest.py
@@ -15,5 +15,5 @@ def mock_get_stations():
 @pytest.fixture
 def mock_get_station():
     """Mock aioeafm.get_station."""
-    with patch("homeassistant.components.eafm.get_station") as patched:
+    with patch("homeassistant.components.eafm.coordinator.get_station") as patched:
         yield patched
diff --git a/tests/components/eafm/test_sensor.py b/tests/components/eafm/test_sensor.py
index add604167b9..11febb26669 100644
--- a/tests/components/eafm/test_sensor.py
+++ b/tests/components/eafm/test_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import ATTR_UNIT_OF_MEASUREMENT, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/ecobee/fixtures/ecobee-data.json b/tests/components/ecobee/fixtures/ecobee-data.json
index e0e82d68863..87d85250780 100644
--- a/tests/components/ecobee/fixtures/ecobee-data.json
+++ b/tests/components/ecobee/fixtures/ecobee-data.json
@@ -67,7 +67,7 @@
         "hasHeatPump": false,
         "humidity": "30"
       },
-      "equipmentStatus": "fan",
+      "equipmentStatus": "fan,humidifier",
       "events": [
         {
           "name": "Event1",
diff --git a/tests/components/ecobee/test_config_flow.py b/tests/components/ecobee/test_config_flow.py
index 5c919ffab5c..9edb1d42331 100644
--- a/tests/components/ecobee/test_config_flow.py
+++ b/tests/components/ecobee/test_config_flow.py
@@ -2,15 +2,8 @@
 
 from unittest.mock import patch
 
-from pyecobee import ECOBEE_API_KEY, ECOBEE_REFRESH_TOKEN
-import pytest
-
 from homeassistant.components.ecobee import config_flow
-from homeassistant.components.ecobee.const import (
-    CONF_REFRESH_TOKEN,
-    DATA_ECOBEE_CONFIG,
-    DOMAIN,
-)
+from homeassistant.components.ecobee.const import CONF_REFRESH_TOKEN, DOMAIN
 from homeassistant.config_entries import SOURCE_USER
 from homeassistant.const import CONF_API_KEY
 from homeassistant.core import HomeAssistant
@@ -35,7 +28,6 @@ async def test_user_step_without_user_input(hass: HomeAssistant) -> None:
     """Test expected result if user step is called."""
     flow = config_flow.EcobeeFlowHandler()
     flow.hass = hass
-    flow.hass.data[DATA_ECOBEE_CONFIG] = {}
 
     result = await flow.async_step_user()
     assert result["type"] is FlowResultType.FORM
@@ -46,7 +38,6 @@ async def test_pin_request_succeeds(hass: HomeAssistant) -> None:
     """Test expected result if pin request succeeds."""
     flow = config_flow.EcobeeFlowHandler()
     flow.hass = hass
-    flow.hass.data[DATA_ECOBEE_CONFIG] = {}
 
     with patch("homeassistant.components.ecobee.config_flow.Ecobee") as mock_ecobee:
         mock_ecobee = mock_ecobee.return_value
@@ -64,7 +55,6 @@ async def test_pin_request_fails(hass: HomeAssistant) -> None:
     """Test expected result if pin request fails."""
     flow = config_flow.EcobeeFlowHandler()
     flow.hass = hass
-    flow.hass.data[DATA_ECOBEE_CONFIG] = {}
 
     with patch("homeassistant.components.ecobee.config_flow.Ecobee") as mock_ecobee:
         mock_ecobee = mock_ecobee.return_value
@@ -81,7 +71,6 @@ async def test_token_request_succeeds(hass: HomeAssistant) -> None:
     """Test expected result if token request succeeds."""
     flow = config_flow.EcobeeFlowHandler()
     flow.hass = hass
-    flow.hass.data[DATA_ECOBEE_CONFIG] = {}
 
     with patch("homeassistant.components.ecobee.config_flow.Ecobee") as mock_ecobee:
         mock_ecobee = mock_ecobee.return_value
@@ -105,7 +94,6 @@ async def test_token_request_fails(hass: HomeAssistant) -> None:
     """Test expected result if token request fails."""
     flow = config_flow.EcobeeFlowHandler()
     flow.hass = hass
-    flow.hass.data[DATA_ECOBEE_CONFIG] = {}
 
     with patch("homeassistant.components.ecobee.config_flow.Ecobee") as mock_ecobee:
         mock_ecobee = mock_ecobee.return_value
@@ -120,99 +108,3 @@ async def test_token_request_fails(hass: HomeAssistant) -> None:
         assert result["step_id"] == "authorize"
         assert result["errors"]["base"] == "token_request_failed"
         assert result["description_placeholders"] == {"pin": "test-pin"}
-
-
-@pytest.mark.skip(reason="Flaky/slow")
-async def test_import_flow_triggered_but_no_ecobee_conf(hass: HomeAssistant) -> None:
-    """Test expected result if import flow triggers but ecobee.conf doesn't exist."""
-    flow = config_flow.EcobeeFlowHandler()
-    flow.hass = hass
-    flow.hass.data[DATA_ECOBEE_CONFIG] = {}
-
-    result = await flow.async_step_import(import_data=None)
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-
-
-async def test_import_flow_triggered_with_ecobee_conf_and_valid_data_and_valid_tokens(
-    hass: HomeAssistant,
-) -> None:
-    """Test expected result if import flow triggers and ecobee.conf exists with valid tokens."""
-    flow = config_flow.EcobeeFlowHandler()
-    flow.hass = hass
-
-    MOCK_ECOBEE_CONF = {ECOBEE_API_KEY: None, ECOBEE_REFRESH_TOKEN: None}
-
-    with (
-        patch(
-            "homeassistant.components.ecobee.config_flow.load_json_object",
-            return_value=MOCK_ECOBEE_CONF,
-        ),
-        patch("homeassistant.components.ecobee.config_flow.Ecobee") as mock_ecobee,
-    ):
-        mock_ecobee = mock_ecobee.return_value
-        mock_ecobee.refresh_tokens.return_value = True
-        mock_ecobee.api_key = "test-api-key"
-        mock_ecobee.refresh_token = "test-token"
-
-        result = await flow.async_step_import(import_data=None)
-
-        assert result["type"] is FlowResultType.CREATE_ENTRY
-        assert result["title"] == DOMAIN
-        assert result["data"] == {
-            CONF_API_KEY: "test-api-key",
-            CONF_REFRESH_TOKEN: "test-token",
-        }
-
-
-async def test_import_flow_triggered_with_ecobee_conf_and_invalid_data(
-    hass: HomeAssistant,
-) -> None:
-    """Test expected result if import flow triggers and ecobee.conf exists with invalid data."""
-    flow = config_flow.EcobeeFlowHandler()
-    flow.hass = hass
-    flow.hass.data[DATA_ECOBEE_CONFIG] = {CONF_API_KEY: "test-api-key"}
-
-    MOCK_ECOBEE_CONF = {}
-
-    with (
-        patch(
-            "homeassistant.components.ecobee.config_flow.load_json_object",
-            return_value=MOCK_ECOBEE_CONF,
-        ),
-        patch.object(flow, "async_step_user") as mock_async_step_user,
-    ):
-        await flow.async_step_import(import_data=None)
-
-        mock_async_step_user.assert_called_once_with(
-            user_input={CONF_API_KEY: "test-api-key"}
-        )
-
-
-async def test_import_flow_triggered_with_ecobee_conf_and_valid_data_and_stale_tokens(
-    hass: HomeAssistant,
-) -> None:
-    """Test expected result if import flow triggers and ecobee.conf exists with stale tokens."""
-    flow = config_flow.EcobeeFlowHandler()
-    flow.hass = hass
-    flow.hass.data[DATA_ECOBEE_CONFIG] = {CONF_API_KEY: "test-api-key"}
-
-    MOCK_ECOBEE_CONF = {ECOBEE_API_KEY: None, ECOBEE_REFRESH_TOKEN: None}
-
-    with (
-        patch(
-            "homeassistant.components.ecobee.config_flow.load_json_object",
-            return_value=MOCK_ECOBEE_CONF,
-        ),
-        patch("homeassistant.components.ecobee.config_flow.Ecobee") as mock_ecobee,
-        patch.object(flow, "async_step_user") as mock_async_step_user,
-    ):
-        mock_ecobee = mock_ecobee.return_value
-        mock_ecobee.refresh_tokens.return_value = False
-
-        await flow.async_step_import(import_data=None)
-
-        mock_async_step_user.assert_called_once_with(
-            user_input={CONF_API_KEY: "test-api-key"}
-        )
diff --git a/tests/components/ecobee/test_humidifier.py b/tests/components/ecobee/test_humidifier.py
index 696ca3d6c0d..6f20d38deaa 100644
--- a/tests/components/ecobee/test_humidifier.py
+++ b/tests/components/ecobee/test_humidifier.py
@@ -6,6 +6,7 @@ import pytest
 
 from homeassistant.components.ecobee.humidifier import MODE_MANUAL, MODE_OFF
 from homeassistant.components.humidifier import (
+    ATTR_ACTION,
     ATTR_AVAILABLE_MODES,
     ATTR_CURRENT_HUMIDITY,
     ATTR_HUMIDITY,
@@ -17,6 +18,7 @@ from homeassistant.components.humidifier import (
     MODE_AUTO,
     SERVICE_SET_HUMIDITY,
     SERVICE_SET_MODE,
+    HumidifierAction,
     HumidifierDeviceClass,
     HumidifierEntityFeature,
 )
@@ -44,6 +46,7 @@ async def test_attributes(hass: HomeAssistant) -> None:
 
     state = hass.states.get(DEVICE_ID)
     assert state.state == STATE_ON
+    assert state.attributes[ATTR_ACTION] == HumidifierAction.HUMIDIFYING
     assert state.attributes[ATTR_CURRENT_HUMIDITY] == 15
     assert state.attributes[ATTR_MIN_HUMIDITY] == DEFAULT_MIN_HUMIDITY
     assert state.attributes[ATTR_MAX_HUMIDITY] == DEFAULT_MAX_HUMIDITY
diff --git a/tests/components/ecoforest/conftest.py b/tests/components/ecoforest/conftest.py
index 85bfff08bdf..8678cfd4d05 100644
--- a/tests/components/ecoforest/conftest.py
+++ b/tests/components/ecoforest/conftest.py
@@ -6,7 +6,7 @@ from unittest.mock import AsyncMock, Mock, patch
 from pyecoforest.models.device import Alarm, Device, OperationMode, State
 import pytest
 
-from homeassistant.components.ecoforest import DOMAIN
+from homeassistant.components.ecoforest.const import DOMAIN
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 
diff --git a/tests/components/econet/test_config_flow.py b/tests/components/econet/test_config_flow.py
index 2ef10c1bd41..2fc4356d1d8 100644
--- a/tests/components/econet/test_config_flow.py
+++ b/tests/components/econet/test_config_flow.py
@@ -5,7 +5,7 @@ from unittest.mock import patch
 from pyeconet.api import EcoNetApiInterface
 from pyeconet.errors import InvalidCredentialsError, PyeconetError
 
-from homeassistant.components.econet import DOMAIN
+from homeassistant.components.econet.const import DOMAIN
 from homeassistant.config_entries import SOURCE_USER
 from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
 from homeassistant.core import HomeAssistant
diff --git a/tests/components/ecovacs/snapshots/test_binary_sensor.ambr b/tests/components/ecovacs/snapshots/test_binary_sensor.ambr
index 62b356e379d..59e2f5a24b7 100644
--- a/tests/components/ecovacs/snapshots/test_binary_sensor.ambr
+++ b/tests/components/ecovacs/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ecovacs/snapshots/test_button.ambr b/tests/components/ecovacs/snapshots/test_button.ambr
index f21d019a7b1..2c657080c12 100644
--- a/tests/components/ecovacs/snapshots/test_button.ambr
+++ b/tests/components/ecovacs/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -190,6 +194,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +241,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -282,6 +288,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -328,6 +335,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -374,6 +382,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -420,6 +429,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -466,6 +476,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -512,6 +523,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -558,6 +570,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ecovacs/snapshots/test_diagnostics.ambr b/tests/components/ecovacs/snapshots/test_diagnostics.ambr
index 38c8a9a5ab9..f9540e06038 100644
--- a/tests/components/ecovacs/snapshots/test_diagnostics.ambr
+++ b/tests/components/ecovacs/snapshots/test_diagnostics.ambr
@@ -17,6 +17,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': '**REDACTED**',
       'unique_id': None,
       'version': 1,
@@ -70,6 +72,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': '**REDACTED**',
       'unique_id': None,
       'version': 1,
diff --git a/tests/components/ecovacs/snapshots/test_event.ambr b/tests/components/ecovacs/snapshots/test_event.ambr
index 8f433560cd1..d29bf8dd57a 100644
--- a/tests/components/ecovacs/snapshots/test_event.ambr
+++ b/tests/components/ecovacs/snapshots/test_event.ambr
@@ -12,6 +12,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ecovacs/snapshots/test_init.ambr b/tests/components/ecovacs/snapshots/test_init.ambr
index 9113445cc31..e403c937394 100644
--- a/tests/components/ecovacs/snapshots/test_init.ambr
+++ b/tests/components/ecovacs/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/ecovacs/snapshots/test_lawn_mower.ambr b/tests/components/ecovacs/snapshots/test_lawn_mower.ambr
index 29c710a5cb7..6367872c7f7 100644
--- a/tests/components/ecovacs/snapshots/test_lawn_mower.ambr
+++ b/tests/components/ecovacs/snapshots/test_lawn_mower.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -39,6 +40,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ecovacs/snapshots/test_number.ambr b/tests/components/ecovacs/snapshots/test_number.ambr
index c80132784e1..952fa4556b0 100644
--- a/tests/components/ecovacs/snapshots/test_number.ambr
+++ b/tests/components/ecovacs/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -67,6 +68,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -122,6 +124,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ecovacs/snapshots/test_select.ambr b/tests/components/ecovacs/snapshots/test_select.ambr
index 125e7f0cee8..354afca1178 100644
--- a/tests/components/ecovacs/snapshots/test_select.ambr
+++ b/tests/components/ecovacs/snapshots/test_select.ambr
@@ -13,6 +13,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ecovacs/snapshots/test_sensor.ambr b/tests/components/ecovacs/snapshots/test_sensor.ambr
index 755fcda9e7d..c4e5a5b1966 100644
--- a/tests/components/ecovacs/snapshots/test_sensor.ambr
+++ b/tests/components/ecovacs/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -154,6 +157,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -201,6 +205,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -249,6 +254,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -296,6 +302,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -347,6 +354,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -394,6 +402,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -440,6 +449,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -489,6 +499,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -539,6 +550,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -593,6 +605,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -640,6 +653,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -686,6 +700,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -732,6 +747,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -779,6 +795,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -827,6 +844,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -878,6 +896,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -925,6 +944,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -972,6 +992,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1018,6 +1039,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1065,6 +1087,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1112,6 +1135,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1164,6 +1188,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1217,6 +1242,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1267,6 +1293,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1321,6 +1348,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1368,6 +1396,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1415,6 +1444,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1461,6 +1491,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1507,6 +1538,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1554,6 +1586,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1602,6 +1635,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1653,6 +1687,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1700,6 +1735,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1747,6 +1783,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1793,6 +1830,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1840,6 +1878,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1889,6 +1928,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1939,6 +1979,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1993,6 +2034,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2040,6 +2082,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2086,6 +2129,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ecovacs/snapshots/test_switch.ambr b/tests/components/ecovacs/snapshots/test_switch.ambr
index 59e891bea5e..48aa9d8fc17 100644
--- a/tests/components/ecovacs/snapshots/test_switch.ambr
+++ b/tests/components/ecovacs/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -190,6 +194,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +241,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -282,6 +288,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -328,6 +335,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -374,6 +382,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -420,6 +429,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/efergy/test_sensor.py b/tests/components/efergy/test_sensor.py
index addaa1b9c48..49c18bab239 100644
--- a/tests/components/efergy/test_sensor.py
+++ b/tests/components/efergy/test_sensor.py
@@ -19,7 +19,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import MULTI_SENSOR_TOKEN, mock_responses, setup_platform
 
diff --git a/tests/components/eheimdigital/conftest.py b/tests/components/eheimdigital/conftest.py
index cdad628de6b..ae1bc74df90 100644
--- a/tests/components/eheimdigital/conftest.py
+++ b/tests/components/eheimdigital/conftest.py
@@ -4,12 +4,14 @@ from collections.abc import Generator
 from unittest.mock import AsyncMock, MagicMock, patch
 
 from eheimdigital.classic_led_ctrl import EheimDigitalClassicLEDControl
+from eheimdigital.heater import EheimDigitalHeater
 from eheimdigital.hub import EheimDigitalHub
-from eheimdigital.types import EheimDeviceType, LightMode
+from eheimdigital.types import EheimDeviceType, HeaterMode, HeaterUnit, LightMode
 import pytest
 
 from homeassistant.components.eheimdigital.const import DOMAIN
 from homeassistant.const import CONF_HOST
+from homeassistant.core import HomeAssistant
 
 from tests.common import MockConfigEntry
 
@@ -33,13 +35,34 @@ def classic_led_ctrl_mock():
     )
     classic_led_ctrl_mock.name = "Mock classicLEDcontrol+e"
     classic_led_ctrl_mock.aquarium_name = "Mock Aquarium"
+    classic_led_ctrl_mock.sw_version = "1.0.0_1.0.0"
     classic_led_ctrl_mock.light_mode = LightMode.DAYCL_MODE
     classic_led_ctrl_mock.light_level = (10, 39)
     return classic_led_ctrl_mock
 
 
 @pytest.fixture
-def eheimdigital_hub_mock(classic_led_ctrl_mock: MagicMock) -> Generator[AsyncMock]:
+def heater_mock():
+    """Mock a Heater device."""
+    heater_mock = MagicMock(spec=EheimDigitalHeater)
+    heater_mock.mac_address = "00:00:00:00:00:02"
+    heater_mock.device_type = EheimDeviceType.VERSION_EHEIM_EXT_HEATER
+    heater_mock.name = "Mock Heater"
+    heater_mock.aquarium_name = "Mock Aquarium"
+    heater_mock.sw_version = "1.0.0_1.0.0"
+    heater_mock.temperature_unit = HeaterUnit.CELSIUS
+    heater_mock.current_temperature = 24.2
+    heater_mock.target_temperature = 25.5
+    heater_mock.is_heating = True
+    heater_mock.is_active = True
+    heater_mock.operation_mode = HeaterMode.MANUAL
+    return heater_mock
+
+
+@pytest.fixture
+def eheimdigital_hub_mock(
+    classic_led_ctrl_mock: MagicMock, heater_mock: MagicMock
+) -> Generator[AsyncMock]:
     """Mock eheimdigital hub."""
     with (
         patch(
@@ -52,7 +75,20 @@ def eheimdigital_hub_mock(classic_led_ctrl_mock: MagicMock) -> Generator[AsyncMo
         ),
     ):
         eheimdigital_hub_mock.return_value.devices = {
-            "00:00:00:00:00:01": classic_led_ctrl_mock
+            "00:00:00:00:00:01": classic_led_ctrl_mock,
+            "00:00:00:00:00:02": heater_mock,
         }
         eheimdigital_hub_mock.return_value.main = classic_led_ctrl_mock
         yield eheimdigital_hub_mock
+
+
+async def init_integration(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry
+) -> None:
+    """Initialize the integration."""
+
+    mock_config_entry.add_to_hass(hass)
+    with patch(
+        "homeassistant.components.eheimdigital.coordinator.asyncio.Event", new=AsyncMock
+    ):
+        await hass.config_entries.async_setup(mock_config_entry.entry_id)
diff --git a/tests/components/eheimdigital/snapshots/test_climate.ambr b/tests/components/eheimdigital/snapshots/test_climate.ambr
new file mode 100644
index 00000000000..73c7cf638e8
--- /dev/null
+++ b/tests/components/eheimdigital/snapshots/test_climate.ambr
@@ -0,0 +1,155 @@
+# serializer version: 1
+# name: test_dynamic_new_devices[climate.mock_heater-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+        <HVACMode.AUTO: 'auto'>,
+      ]),
+      'max_temp': 32,
+      'min_temp': 18,
+      'preset_modes': list([
+        'none',
+        'bio_mode',
+        'smart_mode',
+      ]),
+      'target_temp_step': 0.5,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'climate',
+    'entity_category': None,
+    'entity_id': 'climate.mock_heater',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'eheimdigital',
+    'previous_unique_id': None,
+    'supported_features': <ClimateEntityFeature: 401>,
+    'translation_key': 'heater',
+    'unique_id': '00:00:00:00:00:02',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_dynamic_new_devices[climate.mock_heater-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_temperature': 24.2,
+      'friendly_name': 'Mock Heater',
+      'hvac_action': <HVACAction.HEATING: 'heating'>,
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+        <HVACMode.AUTO: 'auto'>,
+      ]),
+      'max_temp': 32,
+      'min_temp': 18,
+      'preset_mode': 'none',
+      'preset_modes': list([
+        'none',
+        'bio_mode',
+        'smart_mode',
+      ]),
+      'supported_features': <ClimateEntityFeature: 401>,
+      'target_temp_step': 0.5,
+      'temperature': 25.5,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.mock_heater',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'auto',
+  })
+# ---
+# name: test_setup_heater[climate.mock_heater-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+        <HVACMode.AUTO: 'auto'>,
+      ]),
+      'max_temp': 32,
+      'min_temp': 18,
+      'preset_modes': list([
+        'none',
+        'bio_mode',
+        'smart_mode',
+      ]),
+      'target_temp_step': 0.5,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'climate',
+    'entity_category': None,
+    'entity_id': 'climate.mock_heater',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'eheimdigital',
+    'previous_unique_id': None,
+    'supported_features': <ClimateEntityFeature: 401>,
+    'translation_key': 'heater',
+    'unique_id': '00:00:00:00:00:02',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_setup_heater[climate.mock_heater-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_temperature': 24.2,
+      'friendly_name': 'Mock Heater',
+      'hvac_action': <HVACAction.HEATING: 'heating'>,
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+        <HVACMode.AUTO: 'auto'>,
+      ]),
+      'max_temp': 32,
+      'min_temp': 18,
+      'preset_mode': 'none',
+      'preset_modes': list([
+        'none',
+        'bio_mode',
+        'smart_mode',
+      ]),
+      'supported_features': <ClimateEntityFeature: 401>,
+      'target_temp_step': 0.5,
+      'temperature': 25.5,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.mock_heater',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'auto',
+  })
+# ---
diff --git a/tests/components/eheimdigital/snapshots/test_light.ambr b/tests/components/eheimdigital/snapshots/test_light.ambr
index 8df4745997e..a8b454f416e 100644
--- a/tests/components/eheimdigital/snapshots/test_light.ambr
+++ b/tests/components/eheimdigital/snapshots/test_light.ambr
@@ -13,6 +13,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -76,6 +77,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -139,6 +141,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -202,6 +205,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -265,6 +269,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/eheimdigital/test_climate.py b/tests/components/eheimdigital/test_climate.py
new file mode 100644
index 00000000000..4abc33e449e
--- /dev/null
+++ b/tests/components/eheimdigital/test_climate.py
@@ -0,0 +1,261 @@
+"""Tests for the climate module."""
+
+from unittest.mock import AsyncMock, MagicMock, patch
+
+from eheimdigital.types import (
+    EheimDeviceType,
+    EheimDigitalClientError,
+    HeaterMode,
+    HeaterUnit,
+)
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.climate import (
+    ATTR_HVAC_MODE,
+    ATTR_PRESET_MODE,
+    DOMAIN as CLIMATE_DOMAIN,
+    PRESET_NONE,
+    SERVICE_SET_HVAC_MODE,
+    SERVICE_SET_PRESET_MODE,
+    SERVICE_SET_TEMPERATURE,
+    HVACAction,
+    HVACMode,
+)
+from homeassistant.components.eheimdigital.const import (
+    HEATER_BIO_MODE,
+    HEATER_SMART_MODE,
+)
+from homeassistant.const import ATTR_ENTITY_ID, ATTR_TEMPERATURE, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import entity_registry as er
+
+from .conftest import init_integration
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+@pytest.mark.usefixtures("heater_mock")
+async def test_setup_heater(
+    hass: HomeAssistant,
+    eheimdigital_hub_mock: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test climate platform setup for heater."""
+    mock_config_entry.add_to_hass(hass)
+
+    with (
+        patch("homeassistant.components.eheimdigital.PLATFORMS", [Platform.CLIMATE]),
+        patch(
+            "homeassistant.components.eheimdigital.coordinator.asyncio.Event",
+            new=AsyncMock,
+        ),
+    ):
+        await hass.config_entries.async_setup(mock_config_entry.entry_id)
+
+    await eheimdigital_hub_mock.call_args.kwargs["device_found_callback"](
+        "00:00:00:00:00:02", EheimDeviceType.VERSION_EHEIM_EXT_HEATER
+    )
+    await hass.async_block_till_done()
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
+
+
+async def test_dynamic_new_devices(
+    hass: HomeAssistant,
+    eheimdigital_hub_mock: MagicMock,
+    heater_mock: MagicMock,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test light platform setup with at first no devices and dynamically adding a device."""
+    mock_config_entry.add_to_hass(hass)
+
+    eheimdigital_hub_mock.return_value.devices = {}
+
+    with (
+        patch("homeassistant.components.eheimdigital.PLATFORMS", [Platform.CLIMATE]),
+        patch(
+            "homeassistant.components.eheimdigital.coordinator.asyncio.Event",
+            new=AsyncMock,
+        ),
+    ):
+        await hass.config_entries.async_setup(mock_config_entry.entry_id)
+
+    assert (
+        len(
+            entity_registry.entities.get_entries_for_config_entry_id(
+                mock_config_entry.entry_id
+            )
+        )
+        == 0
+    )
+
+    eheimdigital_hub_mock.return_value.devices = {"00:00:00:00:00:02": heater_mock}
+
+    await eheimdigital_hub_mock.call_args.kwargs["device_found_callback"](
+        "00:00:00:00:00:02", EheimDeviceType.VERSION_EHEIM_EXT_HEATER
+    )
+    await hass.async_block_till_done()
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
+
+
+@pytest.mark.parametrize(
+    ("preset_mode", "heater_mode"),
+    [
+        (PRESET_NONE, HeaterMode.MANUAL),
+        (HEATER_BIO_MODE, HeaterMode.BIO),
+        (HEATER_SMART_MODE, HeaterMode.SMART),
+    ],
+)
+async def test_set_preset_mode(
+    hass: HomeAssistant,
+    eheimdigital_hub_mock: MagicMock,
+    heater_mock: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    preset_mode: str,
+    heater_mode: HeaterMode,
+) -> None:
+    """Test setting a preset mode."""
+    await init_integration(hass, mock_config_entry)
+
+    await eheimdigital_hub_mock.call_args.kwargs["device_found_callback"](
+        "00:00:00:00:00:02", EheimDeviceType.VERSION_EHEIM_EXT_HEATER
+    )
+    await hass.async_block_till_done()
+
+    heater_mock.set_operation_mode.side_effect = EheimDigitalClientError
+
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            CLIMATE_DOMAIN,
+            SERVICE_SET_PRESET_MODE,
+            {ATTR_ENTITY_ID: "climate.mock_heater", ATTR_PRESET_MODE: preset_mode},
+            blocking=True,
+        )
+
+    heater_mock.set_operation_mode.side_effect = None
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_PRESET_MODE,
+        {ATTR_ENTITY_ID: "climate.mock_heater", ATTR_PRESET_MODE: preset_mode},
+        blocking=True,
+    )
+
+    heater_mock.set_operation_mode.assert_awaited_with(heater_mode)
+
+
+async def test_set_temperature(
+    hass: HomeAssistant,
+    eheimdigital_hub_mock: MagicMock,
+    heater_mock: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test setting a preset mode."""
+    await init_integration(hass, mock_config_entry)
+
+    await eheimdigital_hub_mock.call_args.kwargs["device_found_callback"](
+        "00:00:00:00:00:02", EheimDeviceType.VERSION_EHEIM_EXT_HEATER
+    )
+    await hass.async_block_till_done()
+
+    heater_mock.set_target_temperature.side_effect = EheimDigitalClientError
+
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            CLIMATE_DOMAIN,
+            SERVICE_SET_TEMPERATURE,
+            {ATTR_ENTITY_ID: "climate.mock_heater", ATTR_TEMPERATURE: 26.0},
+            blocking=True,
+        )
+
+    heater_mock.set_target_temperature.side_effect = None
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {ATTR_ENTITY_ID: "climate.mock_heater", ATTR_TEMPERATURE: 26.0},
+        blocking=True,
+    )
+
+    heater_mock.set_target_temperature.assert_awaited_with(26.0)
+
+
+@pytest.mark.parametrize(
+    ("hvac_mode", "active"), [(HVACMode.AUTO, True), (HVACMode.OFF, False)]
+)
+async def test_set_hvac_mode(
+    hass: HomeAssistant,
+    eheimdigital_hub_mock: MagicMock,
+    heater_mock: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    hvac_mode: HVACMode,
+    active: bool,
+) -> None:
+    """Test setting a preset mode."""
+    await init_integration(hass, mock_config_entry)
+
+    await eheimdigital_hub_mock.call_args.kwargs["device_found_callback"](
+        "00:00:00:00:00:02", EheimDeviceType.VERSION_EHEIM_EXT_HEATER
+    )
+    await hass.async_block_till_done()
+
+    heater_mock.set_active.side_effect = EheimDigitalClientError
+
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            CLIMATE_DOMAIN,
+            SERVICE_SET_HVAC_MODE,
+            {ATTR_ENTITY_ID: "climate.mock_heater", ATTR_HVAC_MODE: hvac_mode},
+            blocking=True,
+        )
+
+    heater_mock.set_active.side_effect = None
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {ATTR_ENTITY_ID: "climate.mock_heater", ATTR_HVAC_MODE: hvac_mode},
+        blocking=True,
+    )
+
+    heater_mock.set_active.assert_awaited_with(active=active)
+
+
+async def test_state_update(
+    hass: HomeAssistant,
+    eheimdigital_hub_mock: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    heater_mock: MagicMock,
+) -> None:
+    """Test the climate state update."""
+    heater_mock.temperature_unit = HeaterUnit.FAHRENHEIT
+    heater_mock.is_heating = False
+    heater_mock.operation_mode = HeaterMode.BIO
+
+    await init_integration(hass, mock_config_entry)
+
+    await eheimdigital_hub_mock.call_args.kwargs["device_found_callback"](
+        "00:00:00:00:00:02", EheimDeviceType.VERSION_EHEIM_EXT_HEATER
+    )
+    await hass.async_block_till_done()
+
+    assert (state := hass.states.get("climate.mock_heater"))
+
+    assert state.attributes["hvac_action"] == HVACAction.IDLE
+    assert state.attributes["preset_mode"] == HEATER_BIO_MODE
+
+    heater_mock.is_active = False
+    heater_mock.operation_mode = HeaterMode.SMART
+
+    await eheimdigital_hub_mock.call_args.kwargs["receive_callback"]()
+
+    assert (state := hass.states.get("climate.mock_heater"))
+    assert state.state == HVACMode.OFF
+    assert state.attributes["preset_mode"] == HEATER_SMART_MODE
diff --git a/tests/components/eheimdigital/test_init.py b/tests/components/eheimdigital/test_init.py
index 211a8b3b6fd..c64997ee372 100644
--- a/tests/components/eheimdigital/test_init.py
+++ b/tests/components/eheimdigital/test_init.py
@@ -8,6 +8,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 from homeassistant.setup import async_setup_component
 
+from .conftest import init_integration
+
 from tests.common import MockConfigEntry
 from tests.typing import WebSocketGenerator
 
@@ -21,9 +23,8 @@ async def test_remove_device(
 ) -> None:
     """Test removing a device."""
     assert await async_setup_component(hass, "config", {})
-    mock_config_entry.add_to_hass(hass)
 
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await init_integration(hass, mock_config_entry)
 
     await eheimdigital_hub_mock.call_args.kwargs["device_found_callback"](
         "00:00:00:00:00:01", EheimDeviceType.VERSION_EHEIM_CLASSIC_LED_CTRL_PLUS_E
diff --git a/tests/components/eheimdigital/test_light.py b/tests/components/eheimdigital/test_light.py
index da224979c43..81b63218085 100644
--- a/tests/components/eheimdigital/test_light.py
+++ b/tests/components/eheimdigital/test_light.py
@@ -1,7 +1,7 @@
 """Tests for the light module."""
 
 from datetime import timedelta
-from unittest.mock import MagicMock, patch
+from unittest.mock import AsyncMock, MagicMock, patch
 
 from aiohttp import ClientError
 from eheimdigital.types import EheimDeviceType, LightMode
@@ -26,6 +26,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.util.color import value_to_brightness
 
+from .conftest import init_integration
+
 from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
 
 
@@ -51,7 +53,13 @@ async def test_setup_classic_led_ctrl(
 
     classic_led_ctrl_mock.tankconfig = tankconfig
 
-    with patch("homeassistant.components.eheimdigital.PLATFORMS", [Platform.LIGHT]):
+    with (
+        patch("homeassistant.components.eheimdigital.PLATFORMS", [Platform.LIGHT]),
+        patch(
+            "homeassistant.components.eheimdigital.coordinator.asyncio.Event",
+            new=AsyncMock,
+        ),
+    ):
         await hass.config_entries.async_setup(mock_config_entry.entry_id)
 
     await eheimdigital_hub_mock.call_args.kwargs["device_found_callback"](
@@ -75,7 +83,13 @@ async def test_dynamic_new_devices(
 
     eheimdigital_hub_mock.return_value.devices = {}
 
-    with patch("homeassistant.components.eheimdigital.PLATFORMS", [Platform.LIGHT]):
+    with (
+        patch("homeassistant.components.eheimdigital.PLATFORMS", [Platform.LIGHT]),
+        patch(
+            "homeassistant.components.eheimdigital.coordinator.asyncio.Event",
+            new=AsyncMock,
+        ),
+    ):
         await hass.config_entries.async_setup(mock_config_entry.entry_id)
 
     assert (
@@ -106,10 +120,8 @@ async def test_turn_off(
     classic_led_ctrl_mock: MagicMock,
 ) -> None:
     """Test turning off the light."""
-    mock_config_entry.add_to_hass(hass)
+    await init_integration(hass, mock_config_entry)
 
-    with patch("homeassistant.components.eheimdigital.PLATFORMS", [Platform.LIGHT]):
-        await hass.config_entries.async_setup(mock_config_entry.entry_id)
     await mock_config_entry.runtime_data._async_device_found(
         "00:00:00:00:00:01", EheimDeviceType.VERSION_EHEIM_CLASSIC_LED_CTRL_PLUS_E
     )
@@ -143,10 +155,8 @@ async def test_turn_on_brightness(
     expected_dim_value: int,
 ) -> None:
     """Test turning on the light with different brightness values."""
-    mock_config_entry.add_to_hass(hass)
+    await init_integration(hass, mock_config_entry)
 
-    with patch("homeassistant.components.eheimdigital.PLATFORMS", [Platform.LIGHT]):
-        await hass.config_entries.async_setup(mock_config_entry.entry_id)
     await eheimdigital_hub_mock.call_args.kwargs["device_found_callback"](
         "00:00:00:00:00:01", EheimDeviceType.VERSION_EHEIM_CLASSIC_LED_CTRL_PLUS_E
     )
@@ -173,12 +183,10 @@ async def test_turn_on_effect(
     classic_led_ctrl_mock: MagicMock,
 ) -> None:
     """Test turning on the light with an effect value."""
-    mock_config_entry.add_to_hass(hass)
-
     classic_led_ctrl_mock.light_mode = LightMode.MAN_MODE
 
-    with patch("homeassistant.components.eheimdigital.PLATFORMS", [Platform.LIGHT]):
-        await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await init_integration(hass, mock_config_entry)
+
     await eheimdigital_hub_mock.call_args.kwargs["device_found_callback"](
         "00:00:00:00:00:01", EheimDeviceType.VERSION_EHEIM_CLASSIC_LED_CTRL_PLUS_E
     )
@@ -204,10 +212,8 @@ async def test_state_update(
     classic_led_ctrl_mock: MagicMock,
 ) -> None:
     """Test the light state update."""
-    mock_config_entry.add_to_hass(hass)
+    await init_integration(hass, mock_config_entry)
 
-    with patch("homeassistant.components.eheimdigital.PLATFORMS", [Platform.LIGHT]):
-        await hass.config_entries.async_setup(mock_config_entry.entry_id)
     await eheimdigital_hub_mock.call_args.kwargs["device_found_callback"](
         "00:00:00:00:00:01", EheimDeviceType.VERSION_EHEIM_CLASSIC_LED_CTRL_PLUS_E
     )
@@ -228,10 +234,8 @@ async def test_update_failed(
     freezer: FrozenDateTimeFactory,
 ) -> None:
     """Test an failed update."""
-    mock_config_entry.add_to_hass(hass)
+    await init_integration(hass, mock_config_entry)
 
-    with patch("homeassistant.components.eheimdigital.PLATFORMS", [Platform.LIGHT]):
-        await hass.config_entries.async_setup(mock_config_entry.entry_id)
     await eheimdigital_hub_mock.call_args.kwargs["device_found_callback"](
         "00:00:00:00:00:01", EheimDeviceType.VERSION_EHEIM_CLASSIC_LED_CTRL_PLUS_E
     )
diff --git a/tests/components/eight_sleep/test_init.py b/tests/components/eight_sleep/test_init.py
index 6b94ff31139..2a1845191d3 100644
--- a/tests/components/eight_sleep/test_init.py
+++ b/tests/components/eight_sleep/test_init.py
@@ -1,14 +1,18 @@
 """Tests for the Eight Sleep integration."""
 
 from homeassistant.components.eight_sleep import DOMAIN
-from homeassistant.config_entries import ConfigEntryState
+from homeassistant.config_entries import (
+    SOURCE_IGNORE,
+    ConfigEntryDisabler,
+    ConfigEntryState,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import issue_registry as ir
 
 from tests.common import MockConfigEntry
 
 
-async def test_mazda_repair_issue(
+async def test_eight_sleep_repair_issue(
     hass: HomeAssistant, issue_registry: ir.IssueRegistry
 ) -> None:
     """Test the Eight Sleep configuration entry loading/unloading handles the repair."""
@@ -33,6 +37,28 @@ async def test_mazda_repair_issue(
     assert config_entry_2.state is ConfigEntryState.LOADED
     assert issue_registry.async_get_issue(DOMAIN, DOMAIN)
 
+    # Add an ignored entry
+    config_entry_3 = MockConfigEntry(
+        source=SOURCE_IGNORE,
+        domain=DOMAIN,
+    )
+    config_entry_3.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry_3.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry_3.state is ConfigEntryState.NOT_LOADED
+
+    # Add a disabled entry
+    config_entry_4 = MockConfigEntry(
+        disabled_by=ConfigEntryDisabler.USER,
+        domain=DOMAIN,
+    )
+    config_entry_4.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry_4.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry_4.state is ConfigEntryState.NOT_LOADED
+
     # Remove the first one
     await hass.config_entries.async_remove(config_entry_1.entry_id)
     await hass.async_block_till_done()
@@ -48,3 +74,6 @@ async def test_mazda_repair_issue(
     assert config_entry_1.state is ConfigEntryState.NOT_LOADED
     assert config_entry_2.state is ConfigEntryState.NOT_LOADED
     assert issue_registry.async_get_issue(DOMAIN, DOMAIN) is None
+
+    # Check the ignored and disabled entries are removed
+    assert not hass.config_entries.async_entries(DOMAIN)
diff --git a/tests/components/electric_kiwi/__init__.py b/tests/components/electric_kiwi/__init__.py
index 7f5e08a56b5..936557ac3bf 100644
--- a/tests/components/electric_kiwi/__init__.py
+++ b/tests/components/electric_kiwi/__init__.py
@@ -1 +1,13 @@
 """Tests for the Electric Kiwi integration."""
+
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+async def init_integration(hass: HomeAssistant, entry: MockConfigEntry) -> None:
+    """Fixture for setting up the integration with args."""
+    entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
diff --git a/tests/components/electric_kiwi/conftest.py b/tests/components/electric_kiwi/conftest.py
index 010efcb7b5f..cc967631be4 100644
--- a/tests/components/electric_kiwi/conftest.py
+++ b/tests/components/electric_kiwi/conftest.py
@@ -2,11 +2,18 @@
 
 from __future__ import annotations
 
-from collections.abc import Awaitable, Callable, Generator
+from collections.abc import Generator
 from time import time
 from unittest.mock import AsyncMock, patch
 
-from electrickiwi_api.model import AccountBalance, Hop, HopIntervals
+from electrickiwi_api.model import (
+    AccountSummary,
+    CustomerConnection,
+    Hop,
+    HopIntervals,
+    Service,
+    Session,
+)
 import pytest
 
 from homeassistant.components.application_credentials import (
@@ -23,37 +30,55 @@ CLIENT_ID = "1234"
 CLIENT_SECRET = "5678"
 REDIRECT_URI = "https://example.com/auth/external/callback"
 
-type YieldFixture = Generator[AsyncMock]
-type ComponentSetup = Callable[[], Awaitable[bool]]
+
+@pytest.fixture(autouse=True)
+async def setup_credentials(hass: HomeAssistant) -> None:
+    """Fixture to setup application credentials component."""
+    await async_setup_component(hass, "application_credentials", {})
+    await async_import_client_credential(
+        hass,
+        DOMAIN,
+        ClientCredential(CLIENT_ID, CLIENT_SECRET),
+    )
 
 
 @pytest.fixture(autouse=True)
-async def request_setup(current_request_with_host: None) -> None:
-    """Request setup."""
-
-
-@pytest.fixture
-def component_setup(
-    hass: HomeAssistant, config_entry: MockConfigEntry
-) -> ComponentSetup:
-    """Fixture for setting up the integration."""
-
-    async def _setup_func() -> bool:
-        assert await async_setup_component(hass, "application_credentials", {})
-        await hass.async_block_till_done()
-        await async_import_client_credential(
-            hass,
-            DOMAIN,
-            ClientCredential(CLIENT_ID, CLIENT_SECRET),
-            DOMAIN,
+def electrickiwi_api() -> Generator[AsyncMock]:
+    """Mock ek api and return values."""
+    with (
+        patch(
+            "homeassistant.components.electric_kiwi.ElectricKiwiApi",
+            autospec=True,
+        ) as mock_client,
+        patch(
+            "homeassistant.components.electric_kiwi.config_flow.ElectricKiwiApi",
+            new=mock_client,
+        ),
+    ):
+        client = mock_client.return_value
+        client.customer_number = 123456
+        client.electricity = Service(
+            identifier="00000000DDA",
+            service="electricity",
+            service_status="Y",
+            is_primary_service=True,
         )
-        await hass.async_block_till_done()
-        config_entry.add_to_hass(hass)
-        result = await hass.config_entries.async_setup(config_entry.entry_id)
-        await hass.async_block_till_done()
-        return result
-
-    return _setup_func
+        client.get_active_session.return_value = Session.from_dict(
+            load_json_value_fixture("session.json", DOMAIN)
+        )
+        client.get_hop_intervals.return_value = HopIntervals.from_dict(
+            load_json_value_fixture("hop_intervals.json", DOMAIN)
+        )
+        client.get_hop.return_value = Hop.from_dict(
+            load_json_value_fixture("get_hop.json", DOMAIN)
+        )
+        client.get_account_summary.return_value = AccountSummary.from_dict(
+            load_json_value_fixture("account_summary.json", DOMAIN)
+        )
+        client.get_connection_details.return_value = CustomerConnection.from_dict(
+            load_json_value_fixture("connection_details.json", DOMAIN)
+        )
+        yield client
 
 
 @pytest.fixture(name="config_entry")
@@ -63,7 +88,7 @@ def mock_config_entry(hass: HomeAssistant) -> MockConfigEntry:
         title="Electric Kiwi",
         domain=DOMAIN,
         data={
-            "id": "12345",
+            "id": "123456",
             "auth_implementation": DOMAIN,
             "token": {
                 "refresh_token": "mock-refresh-token",
@@ -74,6 +99,54 @@ def mock_config_entry(hass: HomeAssistant) -> MockConfigEntry:
             },
         },
         unique_id=DOMAIN,
+        version=1,
+        minor_version=1,
+    )
+
+
+@pytest.fixture(name="config_entry2")
+def mock_config_entry2(hass: HomeAssistant) -> MockConfigEntry:
+    """Create mocked config entry."""
+    return MockConfigEntry(
+        title="Electric Kiwi",
+        domain=DOMAIN,
+        data={
+            "id": "123457",
+            "auth_implementation": DOMAIN,
+            "token": {
+                "refresh_token": "mock-refresh-token",
+                "access_token": "mock-access-token",
+                "type": "Bearer",
+                "expires_in": 60,
+                "expires_at": time() + 60,
+            },
+        },
+        unique_id="1234567",
+        version=1,
+        minor_version=1,
+    )
+
+
+@pytest.fixture(name="migrated_config_entry")
+def mock_migrated_config_entry(hass: HomeAssistant) -> MockConfigEntry:
+    """Create mocked config entry."""
+    return MockConfigEntry(
+        title="Electric Kiwi",
+        domain=DOMAIN,
+        data={
+            "id": "123456",
+            "auth_implementation": DOMAIN,
+            "token": {
+                "refresh_token": "mock-refresh-token",
+                "access_token": "mock-access-token",
+                "type": "Bearer",
+                "expires_in": 60,
+                "expires_at": time() + 60,
+            },
+        },
+        unique_id="123456",
+        version=1,
+        minor_version=2,
     )
 
 
@@ -87,35 +160,10 @@ def mock_setup_entry() -> Generator[AsyncMock]:
 
 
 @pytest.fixture(name="ek_auth")
-def electric_kiwi_auth() -> YieldFixture:
+def electric_kiwi_auth() -> Generator[AsyncMock]:
     """Patch access to electric kiwi access token."""
     with patch(
-        "homeassistant.components.electric_kiwi.api.AsyncConfigEntryAuth"
+        "homeassistant.components.electric_kiwi.api.ConfigEntryElectricKiwiAuth"
     ) as mock_auth:
         mock_auth.return_value.async_get_access_token = AsyncMock("auth_token")
         yield mock_auth
-
-
-@pytest.fixture(name="ek_api")
-def ek_api() -> YieldFixture:
-    """Mock ek api and return values."""
-    with patch(
-        "homeassistant.components.electric_kiwi.ElectricKiwiApi", autospec=True
-    ) as mock_ek_api:
-        mock_ek_api.return_value.customer_number = 123456
-        mock_ek_api.return_value.connection_id = 123456
-        mock_ek_api.return_value.set_active_session.return_value = None
-        mock_ek_api.return_value.get_hop_intervals.return_value = (
-            HopIntervals.from_dict(
-                load_json_value_fixture("hop_intervals.json", DOMAIN)
-            )
-        )
-        mock_ek_api.return_value.get_hop.return_value = Hop.from_dict(
-            load_json_value_fixture("get_hop.json", DOMAIN)
-        )
-        mock_ek_api.return_value.get_account_balance.return_value = (
-            AccountBalance.from_dict(
-                load_json_value_fixture("account_balance.json", DOMAIN)
-            )
-        )
-        yield mock_ek_api
diff --git a/tests/components/electric_kiwi/fixtures/account_balance.json b/tests/components/electric_kiwi/fixtures/account_balance.json
deleted file mode 100644
index 25bc57784ee..00000000000
--- a/tests/components/electric_kiwi/fixtures/account_balance.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "data": {
-    "connections": [
-      {
-        "hop_percentage": "3.5",
-        "id": 3,
-        "running_balance": "184.09",
-        "start_date": "2020-10-04",
-        "unbilled_days": 15
-      }
-    ],
-    "last_billed_amount": "-66.31",
-    "last_billed_date": "2020-10-03",
-    "next_billing_date": "2020-11-03",
-    "is_prepay": "N",
-    "summary": {
-      "credits": "0.0",
-      "electricity_used": "184.09",
-      "other_charges": "0.00",
-      "payments": "-220.0"
-    },
-    "total_account_balance": "-102.22",
-    "total_billing_days": 30,
-    "total_running_balance": "184.09",
-    "type": "account_running_balance"
-  },
-  "status": 1
-}
diff --git a/tests/components/electric_kiwi/fixtures/account_summary.json b/tests/components/electric_kiwi/fixtures/account_summary.json
new file mode 100644
index 00000000000..6a05d6a3fe7
--- /dev/null
+++ b/tests/components/electric_kiwi/fixtures/account_summary.json
@@ -0,0 +1,43 @@
+{
+  "data": {
+    "type": "account_summary",
+    "total_running_balance": "184.09",
+    "total_account_balance": "-102.22",
+    "total_billing_days": 31,
+    "next_billing_date": "2025-02-19",
+    "service_names": ["power"],
+    "services": {
+      "power": {
+        "connections": [
+          {
+            "id": 515363,
+            "running_balance": "12.98",
+            "unbilled_days": 5,
+            "hop_percentage": "11.2",
+            "start_date": "2025-01-19",
+            "service_label": "Power"
+          }
+        ]
+      }
+    },
+    "date_to_pay": "",
+    "invoice_id": "",
+    "total_invoiced_charges": "",
+    "default_to_pay": "",
+    "invoice_exists": 1,
+    "display_date": "2025-01-19",
+    "last_billed_date": "2025-01-18",
+    "last_billed_amount": "-21.02",
+    "summary": {
+      "electricity_used": "12.98",
+      "other_charges": "0.00",
+      "payments": "0.00",
+      "credits": "0.00",
+      "mobile_charges": "0.00",
+      "broadband_charges": "0.00",
+      "addon_unbilled_charges": {}
+    },
+    "is_prepay": "N"
+  },
+  "status": 1
+}
diff --git a/tests/components/electric_kiwi/fixtures/connection_details.json b/tests/components/electric_kiwi/fixtures/connection_details.json
new file mode 100644
index 00000000000..5b446659aab
--- /dev/null
+++ b/tests/components/electric_kiwi/fixtures/connection_details.json
@@ -0,0 +1,73 @@
+{
+  "data": {
+    "type": "connection",
+    "id": 515363,
+    "customer_id": 273941,
+    "customer_number": 34030646,
+    "icp_identifier": "00000000DDA",
+    "address": "",
+    "short_address": "",
+    "physical_address_unit": "",
+    "physical_address_number": "555",
+    "physical_address_street": "RACECOURSE ROAD",
+    "physical_address_suburb": "",
+    "physical_address_town": "Blah",
+    "physical_address_region": "Blah",
+    "physical_address_postcode": "0000",
+    "is_active": "Y",
+    "pricing_plan": {
+      "id": 51423,
+      "usage": "0.0000",
+      "fixed": "0.6000",
+      "usage_rate_inc_gst": "0.0000",
+      "supply_rate_inc_gst": "0.6900",
+      "plan_description": "MoveMaster Anytime Residential (Low User)",
+      "plan_type": "movemaster_tou",
+      "signup_price_plan_blurb": "Better rates every day during off-peak, and all day on weekends. Plus half price nights (11pm-7am) and our best solar buyback.",
+      "signup_price_plan_label": "MoveMaster",
+      "app_price_plan_label": "Your MoveMaster rates are...",
+      "solar_rate_excl_gst": "0.1250",
+      "solar_rate_incl_gst": "0.1438",
+      "pricing_type": "tou_plus",
+      "tou_plus": {
+        "fixed_rate_excl_gst": "0.6000",
+        "fixed_rate_incl_gst": "0.6900",
+        "interval_types": ["peak", "off_peak_shoulder", "off_peak_night"],
+        "peak": {
+          "price_excl_gst": "0.5390",
+          "price_incl_gst": "0.6199",
+          "display_text": {
+            "Weekdays": "7am-9am, 5pm-9pm"
+          },
+          "tou_plus_label": "Peak"
+        },
+        "off_peak_shoulder": {
+          "price_excl_gst": "0.3234",
+          "price_incl_gst": "0.3719",
+          "display_text": {
+            "Weekdays": "9am-5pm, 9pm-11pm",
+            "Weekends": "7am-11pm"
+          },
+          "tou_plus_label": "Off-peak shoulder"
+        },
+        "off_peak_night": {
+          "price_excl_gst": "0.2695",
+          "price_incl_gst": "0.3099",
+          "display_text": {
+            "Every day": "11pm-7am"
+          },
+          "tou_plus_label": "Off-peak night"
+        }
+      }
+    },
+    "hop": {
+      "start_time": "9:00 PM",
+      "end_time": "10:00 PM",
+      "interval_start": "43",
+      "interval_end": "44"
+    },
+    "start_date": "2022-03-03",
+    "end_date": "",
+    "property_type": "residential"
+  }
+}
diff --git a/tests/components/electric_kiwi/fixtures/get_hop.json b/tests/components/electric_kiwi/fixtures/get_hop.json
index d29825391e9..2b126bfc017 100644
--- a/tests/components/electric_kiwi/fixtures/get_hop.json
+++ b/tests/components/electric_kiwi/fixtures/get_hop.json
@@ -1,16 +1,18 @@
 {
   "data": {
-    "connection_id": "3",
-    "customer_number": 1000001,
-    "end": {
-      "end_time": "5:00 PM",
-      "interval": "34"
-    },
+    "type": "hop_customer",
+    "customer_id": 123456,
+    "service_type": "electricity",
+    "connection_id": 515363,
+    "billing_id": 1247975,
     "start": {
-      "start_time": "4:00 PM",
-      "interval": "33"
+      "interval": "33",
+      "start_time": "4:00 PM"
     },
-    "type": "hop_customer"
+    "end": {
+      "interval": "34",
+      "end_time": "5:00 PM"
+    }
   },
   "status": 1
 }
diff --git a/tests/components/electric_kiwi/fixtures/hop_intervals.json b/tests/components/electric_kiwi/fixtures/hop_intervals.json
index 15ecc174f13..860630b000a 100644
--- a/tests/components/electric_kiwi/fixtures/hop_intervals.json
+++ b/tests/components/electric_kiwi/fixtures/hop_intervals.json
@@ -1,249 +1,250 @@
 {
   "data": {
-    "hop_duration": "60",
     "type": "hop_intervals",
+    "hop_duration": "60",
     "intervals": {
       "1": {
-        "active": 1,
+        "start_time": "12:00 AM",
         "end_time": "1:00 AM",
-        "start_time": "12:00 AM"
+        "active": 1
       },
       "2": {
-        "active": 1,
+        "start_time": "12:30 AM",
         "end_time": "1:30 AM",
-        "start_time": "12:30 AM"
+        "active": 1
       },
       "3": {
-        "active": 1,
+        "start_time": "1:00 AM",
         "end_time": "2:00 AM",
-        "start_time": "1:00 AM"
+        "active": 1
       },
       "4": {
-        "active": 1,
+        "start_time": "1:30 AM",
         "end_time": "2:30 AM",
-        "start_time": "1:30 AM"
+        "active": 1
       },
       "5": {
-        "active": 1,
+        "start_time": "2:00 AM",
         "end_time": "3:00 AM",
-        "start_time": "2:00 AM"
+        "active": 1
       },
       "6": {
-        "active": 1,
+        "start_time": "2:30 AM",
         "end_time": "3:30 AM",
-        "start_time": "2:30 AM"
+        "active": 1
       },
       "7": {
-        "active": 1,
+        "start_time": "3:00 AM",
         "end_time": "4:00 AM",
-        "start_time": "3:00 AM"
+        "active": 1
       },
       "8": {
-        "active": 1,
+        "start_time": "3:30 AM",
         "end_time": "4:30 AM",
-        "start_time": "3:30 AM"
+        "active": 1
       },
       "9": {
-        "active": 1,
+        "start_time": "4:00 AM",
         "end_time": "5:00 AM",
-        "start_time": "4:00 AM"
+        "active": 1
       },
       "10": {
-        "active": 1,
+        "start_time": "4:30 AM",
         "end_time": "5:30 AM",
-        "start_time": "4:30 AM"
+        "active": 1
       },
       "11": {
-        "active": 1,
+        "start_time": "5:00 AM",
         "end_time": "6:00 AM",
-        "start_time": "5:00 AM"
+        "active": 1
       },
       "12": {
-        "active": 1,
+        "start_time": "5:30 AM",
         "end_time": "6:30 AM",
-        "start_time": "5:30 AM"
+        "active": 1
       },
       "13": {
-        "active": 1,
+        "start_time": "6:00 AM",
         "end_time": "7:00 AM",
-        "start_time": "6:00 AM"
+        "active": 1
       },
       "14": {
-        "active": 1,
+        "start_time": "6:30 AM",
         "end_time": "7:30 AM",
-        "start_time": "6:30 AM"
+        "active": 0
       },
       "15": {
-        "active": 1,
+        "start_time": "7:00 AM",
         "end_time": "8:00 AM",
-        "start_time": "7:00 AM"
+        "active": 0
       },
       "16": {
-        "active": 1,
+        "start_time": "7:30 AM",
         "end_time": "8:30 AM",
-        "start_time": "7:30 AM"
+        "active": 0
       },
       "17": {
-        "active": 1,
+        "start_time": "8:00 AM",
         "end_time": "9:00 AM",
-        "start_time": "8:00 AM"
+        "active": 0
       },
       "18": {
-        "active": 1,
+        "start_time": "8:30 AM",
         "end_time": "9:30 AM",
-        "start_time": "8:30 AM"
+        "active": 0
       },
       "19": {
-        "active": 1,
+        "start_time": "9:00 AM",
         "end_time": "10:00 AM",
-        "start_time": "9:00 AM"
+        "active": 1
       },
       "20": {
-        "active": 1,
+        "start_time": "9:30 AM",
         "end_time": "10:30 AM",
-        "start_time": "9:30 AM"
+        "active": 1
       },
       "21": {
-        "active": 1,
+        "start_time": "10:00 AM",
         "end_time": "11:00 AM",
-        "start_time": "10:00 AM"
+        "active": 1
       },
       "22": {
-        "active": 1,
+        "start_time": "10:30 AM",
         "end_time": "11:30 AM",
-        "start_time": "10:30 AM"
+        "active": 1
       },
       "23": {
-        "active": 1,
+        "start_time": "11:00 AM",
         "end_time": "12:00 PM",
-        "start_time": "11:00 AM"
+        "active": 1
       },
       "24": {
-        "active": 1,
+        "start_time": "11:30 AM",
         "end_time": "12:30 PM",
-        "start_time": "11:30 AM"
+        "active": 1
       },
       "25": {
-        "active": 1,
+        "start_time": "12:00 PM",
         "end_time": "1:00 PM",
-        "start_time": "12:00 PM"
+        "active": 1
       },
       "26": {
-        "active": 1,
+        "start_time": "12:30 PM",
         "end_time": "1:30 PM",
-        "start_time": "12:30 PM"
+        "active": 1
       },
       "27": {
-        "active": 1,
+        "start_time": "1:00 PM",
         "end_time": "2:00 PM",
-        "start_time": "1:00 PM"
+        "active": 1
       },
       "28": {
-        "active": 1,
+        "start_time": "1:30 PM",
         "end_time": "2:30 PM",
-        "start_time": "1:30 PM"
+        "active": 1
       },
       "29": {
-        "active": 1,
+        "start_time": "2:00 PM",
         "end_time": "3:00 PM",
-        "start_time": "2:00 PM"
+        "active": 1
       },
       "30": {
-        "active": 1,
+        "start_time": "2:30 PM",
         "end_time": "3:30 PM",
-        "start_time": "2:30 PM"
+        "active": 1
       },
       "31": {
-        "active": 1,
+        "start_time": "3:00 PM",
         "end_time": "4:00 PM",
-        "start_time": "3:00 PM"
+        "active": 1
       },
       "32": {
-        "active": 1,
+        "start_time": "3:30 PM",
         "end_time": "4:30 PM",
-        "start_time": "3:30 PM"
+        "active": 1
       },
       "33": {
-        "active": 1,
+        "start_time": "4:00 PM",
         "end_time": "5:00 PM",
-        "start_time": "4:00 PM"
+        "active": 1
       },
       "34": {
-        "active": 1,
+        "start_time": "4:30 PM",
         "end_time": "5:30 PM",
-        "start_time": "4:30 PM"
+        "active": 0
       },
       "35": {
-        "active": 1,
+        "start_time": "5:00 PM",
         "end_time": "6:00 PM",
-        "start_time": "5:00 PM"
+        "active": 0
       },
       "36": {
-        "active": 1,
+        "start_time": "5:30 PM",
         "end_time": "6:30 PM",
-        "start_time": "5:30 PM"
+        "active": 0
       },
       "37": {
-        "active": 1,
+        "start_time": "6:00 PM",
         "end_time": "7:00 PM",
-        "start_time": "6:00 PM"
+        "active": 0
       },
       "38": {
-        "active": 1,
+        "start_time": "6:30 PM",
         "end_time": "7:30 PM",
-        "start_time": "6:30 PM"
+        "active": 0
       },
       "39": {
-        "active": 1,
+        "start_time": "7:00 PM",
         "end_time": "8:00 PM",
-        "start_time": "7:00 PM"
+        "active": 0
       },
       "40": {
-        "active": 1,
+        "start_time": "7:30 PM",
         "end_time": "8:30 PM",
-        "start_time": "7:30 PM"
+        "active": 0
       },
       "41": {
-        "active": 1,
+        "start_time": "8:00 PM",
         "end_time": "9:00 PM",
-        "start_time": "8:00 PM"
+        "active": 0
       },
       "42": {
-        "active": 1,
+        "start_time": "8:30 PM",
         "end_time": "9:30 PM",
-        "start_time": "8:30 PM"
+        "active": 0
       },
       "43": {
-        "active": 1,
+        "start_time": "9:00 PM",
         "end_time": "10:00 PM",
-        "start_time": "9:00 PM"
+        "active": 1
       },
       "44": {
-        "active": 1,
+        "start_time": "9:30 PM",
         "end_time": "10:30 PM",
-        "start_time": "9:30 PM"
+        "active": 1
       },
       "45": {
-        "active": 1,
-        "end_time": "11:00 AM",
-        "start_time": "10:00 PM"
+        "start_time": "10:00 PM",
+        "end_time": "11:00 PM",
+        "active": 1
       },
       "46": {
-        "active": 1,
+        "start_time": "10:30 PM",
         "end_time": "11:30 PM",
-        "start_time": "10:30 PM"
+        "active": 1
       },
       "47": {
-        "active": 1,
+        "start_time": "11:00 PM",
         "end_time": "12:00 AM",
-        "start_time": "11:00 PM"
+        "active": 1
       },
       "48": {
-        "active": 1,
+        "start_time": "11:30 PM",
         "end_time": "12:30 AM",
-        "start_time": "11:30 PM"
+        "active": 0
       }
-    }
+    },
+    "service_type": "electricity"
   },
   "status": 1
 }
diff --git a/tests/components/electric_kiwi/fixtures/session.json b/tests/components/electric_kiwi/fixtures/session.json
new file mode 100644
index 00000000000..ee04aaca549
--- /dev/null
+++ b/tests/components/electric_kiwi/fixtures/session.json
@@ -0,0 +1,23 @@
+{
+  "data": {
+    "data": {
+      "type": "session",
+      "avatar": [],
+      "customer_number": 123456,
+      "customer_name": "Joe Dirt",
+      "email": "joe@dirt.kiwi",
+      "customer_status": "Y",
+      "services": [
+        {
+          "service": "Electricity",
+          "identifier": "00000000DDA",
+          "is_primary_service": true,
+          "service_status": "Y"
+        }
+      ],
+      "res_partner_id": 285554,
+      "nuid": "EK_GUID"
+    }
+  },
+  "status": 1
+}
diff --git a/tests/components/electric_kiwi/fixtures/session_no_services.json b/tests/components/electric_kiwi/fixtures/session_no_services.json
new file mode 100644
index 00000000000..62ae7aea20a
--- /dev/null
+++ b/tests/components/electric_kiwi/fixtures/session_no_services.json
@@ -0,0 +1,16 @@
+{
+  "data": {
+    "data": {
+      "type": "session",
+      "avatar": [],
+      "customer_number": 123456,
+      "customer_name": "Joe Dirt",
+      "email": "joe@dirt.kiwi",
+      "customer_status": "Y",
+      "services": [],
+      "res_partner_id": 285554,
+      "nuid": "EK_GUID"
+    }
+  },
+  "status": 1
+}
diff --git a/tests/components/electric_kiwi/test_config_flow.py b/tests/components/electric_kiwi/test_config_flow.py
index 681320972b5..ab643a0ddf1 100644
--- a/tests/components/electric_kiwi/test_config_flow.py
+++ b/tests/components/electric_kiwi/test_config_flow.py
@@ -3,70 +3,40 @@
 from __future__ import annotations
 
 from http import HTTPStatus
-from unittest.mock import AsyncMock, MagicMock
+from unittest.mock import AsyncMock
 
+from electrickiwi_api.exceptions import ApiException
 import pytest
 
-from homeassistant import config_entries
-from homeassistant.components.application_credentials import (
-    ClientCredential,
-    async_import_client_credential,
-)
 from homeassistant.components.electric_kiwi.const import (
     DOMAIN,
     OAUTH2_AUTHORIZE,
     OAUTH2_TOKEN,
     SCOPE_VALUES,
 )
+from homeassistant.config_entries import SOURCE_USER
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers import config_entry_oauth2_flow
-from homeassistant.setup import async_setup_component
 
-from .conftest import CLIENT_ID, CLIENT_SECRET, REDIRECT_URI
+from .conftest import CLIENT_ID, REDIRECT_URI
 
 from tests.common import MockConfigEntry
 from tests.test_util.aiohttp import AiohttpClientMocker
 from tests.typing import ClientSessionGenerator
 
-pytestmark = pytest.mark.usefixtures("mock_setup_entry")
 
-
-@pytest.fixture
-async def setup_credentials(hass: HomeAssistant) -> None:
-    """Fixture to setup application credentials component."""
-    await async_setup_component(hass, "application_credentials", {})
-    await async_import_client_credential(
-        hass,
-        DOMAIN,
-        ClientCredential(CLIENT_ID, CLIENT_SECRET),
-    )
-
-
-async def test_config_flow_no_credentials(hass: HomeAssistant) -> None:
-    """Test config flow base case with no credentials registered."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result.get("type") is FlowResultType.ABORT
-    assert result.get("reason") == "missing_credentials"
-
-
-@pytest.mark.usefixtures("current_request_with_host")
+@pytest.mark.usefixtures("current_request_with_host", "electrickiwi_api")
 async def test_full_flow(
     hass: HomeAssistant,
     hass_client_no_auth: ClientSessionGenerator,
     aioclient_mock: AiohttpClientMocker,
-    setup_credentials: None,
     mock_setup_entry: AsyncMock,
 ) -> None:
     """Check full flow."""
-    await async_import_client_credential(
-        hass, DOMAIN, ClientCredential(CLIENT_ID, CLIENT_SECRET)
-    )
 
     result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER, "entry_id": DOMAIN}
+        DOMAIN, context={"source": SOURCE_USER}
     )
     state = config_entry_oauth2_flow._encode_jwt(
         hass,
@@ -76,13 +46,13 @@ async def test_full_flow(
         },
     )
 
-    URL_SCOPE = SCOPE_VALUES.replace(" ", "+")
+    url_scope = SCOPE_VALUES.replace(" ", "+")
 
     assert result["url"] == (
         f"{OAUTH2_AUTHORIZE}?response_type=code&client_id={CLIENT_ID}"
         f"&redirect_uri={REDIRECT_URI}"
         f"&state={state}"
-        f"&scope={URL_SCOPE}"
+        f"&scope={url_scope}"
     )
 
     client = await hass_client_no_auth()
@@ -90,6 +60,7 @@ async def test_full_flow(
     assert resp.status == HTTPStatus.OK
     assert resp.headers["content-type"] == "text/html; charset=utf-8"
 
+    aioclient_mock.clear_requests()
     aioclient_mock.post(
         OAUTH2_TOKEN,
         json={
@@ -106,20 +77,73 @@ async def test_full_flow(
     assert len(mock_setup_entry.mock_calls) == 1
 
 
+@pytest.mark.usefixtures("current_request_with_host")
+async def test_flow_failure(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    electrickiwi_api: AsyncMock,
+) -> None:
+    """Check failure on creation of entry."""
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": REDIRECT_URI,
+        },
+    )
+
+    url_scope = SCOPE_VALUES.replace(" ", "+")
+
+    assert result["url"] == (
+        f"{OAUTH2_AUTHORIZE}?response_type=code&client_id={CLIENT_ID}"
+        f"&redirect_uri={REDIRECT_URI}"
+        f"&state={state}"
+        f"&scope={url_scope}"
+    )
+
+    client = await hass_client_no_auth()
+    resp = await client.get(f"/auth/external/callback?code=abcd&state={state}")
+    assert resp.status == HTTPStatus.OK
+    assert resp.headers["content-type"] == "text/html; charset=utf-8"
+
+    aioclient_mock.clear_requests()
+    aioclient_mock.post(
+        OAUTH2_TOKEN,
+        json={
+            "refresh_token": "mock-refresh-token",
+            "access_token": "mock-access-token",
+            "type": "Bearer",
+            "expires_in": 60,
+        },
+    )
+
+    electrickiwi_api.get_active_session.side_effect = ApiException()
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 0
+    assert result.get("type") is FlowResultType.ABORT
+    assert result.get("reason") == "connection_error"
+
+
 @pytest.mark.usefixtures("current_request_with_host")
 async def test_existing_entry(
     hass: HomeAssistant,
     hass_client_no_auth: ClientSessionGenerator,
     aioclient_mock: AiohttpClientMocker,
-    setup_credentials: None,
-    config_entry: MockConfigEntry,
+    migrated_config_entry: MockConfigEntry,
 ) -> None:
     """Check existing entry."""
-    config_entry.add_to_hass(hass)
+    migrated_config_entry.add_to_hass(hass)
     assert len(hass.config_entries.async_entries(DOMAIN)) == 1
 
     result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER, "entry_id": DOMAIN}
+        DOMAIN, context={"source": SOURCE_USER, "entry_id": DOMAIN}
     )
 
     state = config_entry_oauth2_flow._encode_jwt(
@@ -145,7 +169,9 @@ async def test_existing_entry(
         },
     )
 
-    await hass.config_entries.flow.async_configure(result["flow_id"])
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+    assert result.get("type") is FlowResultType.ABORT
+    assert result.get("reason") == "already_configured"
     assert len(hass.config_entries.async_entries(DOMAIN)) == 1
 
 
@@ -154,13 +180,13 @@ async def test_reauthentication(
     hass: HomeAssistant,
     hass_client_no_auth: ClientSessionGenerator,
     aioclient_mock: AiohttpClientMocker,
-    mock_setup_entry: MagicMock,
-    config_entry: MockConfigEntry,
-    setup_credentials: None,
+    mock_setup_entry: AsyncMock,
+    migrated_config_entry: MockConfigEntry,
 ) -> None:
     """Test Electric Kiwi reauthentication."""
-    config_entry.add_to_hass(hass)
-    result = await config_entry.start_reauth_flow(hass)
+    migrated_config_entry.add_to_hass(hass)
+
+    result = await migrated_config_entry.start_reauth_flow(hass)
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "reauth_confirm"
 
@@ -189,8 +215,11 @@ async def test_reauthentication(
         },
     )
 
-    await hass.config_entries.flow.async_configure(result["flow_id"])
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
     await hass.async_block_till_done()
 
     assert len(hass.config_entries.async_entries(DOMAIN)) == 1
     assert len(mock_setup_entry.mock_calls) == 1
+
+    assert result.get("type") is FlowResultType.ABORT
+    assert result.get("reason") == "reauth_successful"
diff --git a/tests/components/electric_kiwi/test_init.py b/tests/components/electric_kiwi/test_init.py
new file mode 100644
index 00000000000..947f788ad55
--- /dev/null
+++ b/tests/components/electric_kiwi/test_init.py
@@ -0,0 +1,135 @@
+"""Test the Electric Kiwi init."""
+
+import http
+from unittest.mock import AsyncMock, patch
+
+from aiohttp import RequestInfo
+from aiohttp.client_exceptions import ClientResponseError
+from electrickiwi_api.exceptions import ApiException, AuthException
+import pytest
+
+from homeassistant.components.electric_kiwi.const import DOMAIN
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import init_integration
+
+from tests.common import MockConfigEntry
+
+
+async def test_async_setup_entry(
+    hass: HomeAssistant, config_entry: MockConfigEntry
+) -> None:
+    """Test a successful setup entry and unload of entry."""
+    await init_integration(hass, config_entry)
+
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    assert await hass.config_entries.async_unload(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry.state is ConfigEntryState.NOT_LOADED
+
+
+async def test_async_setup_multiple_entries(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    config_entry2: MockConfigEntry,
+) -> None:
+    """Test a successful setup and unload of multiple entries."""
+
+    for entry in (config_entry, config_entry2):
+        await init_integration(hass, entry)
+
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 2
+
+    for entry in (config_entry, config_entry2):
+        assert await hass.config_entries.async_unload(entry.entry_id)
+        await hass.async_block_till_done()
+
+        assert entry.state is ConfigEntryState.NOT_LOADED
+
+
+@pytest.mark.parametrize(
+    ("status", "expected_state"),
+    [
+        (
+            http.HTTPStatus.UNAUTHORIZED,
+            ConfigEntryState.SETUP_ERROR,
+        ),
+        (
+            http.HTTPStatus.INTERNAL_SERVER_ERROR,
+            ConfigEntryState.SETUP_RETRY,
+        ),
+    ],
+    ids=["failure_requires_reauth", "transient_failure"],
+)
+async def test_refresh_token_validity_failures(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    status: http.HTTPStatus,
+    expected_state: ConfigEntryState,
+) -> None:
+    """Test token refresh failure status."""
+    with patch(
+        "homeassistant.helpers.config_entry_oauth2_flow.OAuth2Session.async_ensure_token_valid",
+        side_effect=ClientResponseError(
+            RequestInfo("", "POST", {}, ""), None, status=status
+        ),
+    ) as mock_async_ensure_token_valid:
+        await init_integration(hass, config_entry)
+        mock_async_ensure_token_valid.assert_called_once()
+
+        assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+
+        entries = hass.config_entries.async_entries(DOMAIN)
+        assert entries[0].state is expected_state
+
+
+async def test_unique_id_migration(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that the unique ID is migrated to the customer number."""
+
+    config_entry.add_to_hass(hass)
+    entity_registry.async_get_or_create(
+        SENSOR_DOMAIN, DOMAIN, "123456_515363_sensor", config_entry=config_entry
+    )
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+    new_entry = hass.config_entries.async_get_entry(config_entry.entry_id)
+    assert new_entry.minor_version == 2
+    assert new_entry.unique_id == "123456"
+    entity_entry = entity_registry.async_get(
+        "sensor.electric_kiwi_123456_515363_sensor"
+    )
+    assert entity_entry.unique_id == "123456_00000000DDA_sensor"
+
+
+async def test_unique_id_migration_failure(
+    hass: HomeAssistant, config_entry: MockConfigEntry, electrickiwi_api: AsyncMock
+) -> None:
+    """Test that the unique ID is migrated to the customer number."""
+    electrickiwi_api.set_active_session.side_effect = ApiException()
+    await init_integration(hass, config_entry)
+
+    assert config_entry.minor_version == 1
+    assert config_entry.unique_id == DOMAIN
+    assert config_entry.state is ConfigEntryState.MIGRATION_ERROR
+
+
+async def test_unique_id_migration_auth_failure(
+    hass: HomeAssistant, config_entry: MockConfigEntry, electrickiwi_api: AsyncMock
+) -> None:
+    """Test that the unique ID is migrated to the customer number."""
+    electrickiwi_api.set_active_session.side_effect = AuthException()
+    await init_integration(hass, config_entry)
+
+    assert config_entry.minor_version == 1
+    assert config_entry.unique_id == DOMAIN
+    assert config_entry.state is ConfigEntryState.MIGRATION_ERROR
diff --git a/tests/components/electric_kiwi/test_sensor.py b/tests/components/electric_kiwi/test_sensor.py
index bb3304ec66c..3e58b33a998 100644
--- a/tests/components/electric_kiwi/test_sensor.py
+++ b/tests/components/electric_kiwi/test_sensor.py
@@ -18,9 +18,9 @@ from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import ATTR_ATTRIBUTION, ATTR_DEVICE_CLASS
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_registry import EntityRegistry
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
-from .conftest import ComponentSetup, YieldFixture
+from . import init_integration
 
 from tests.common import MockConfigEntry
 
@@ -47,10 +47,9 @@ def restore_timezone():
 async def test_hop_sensors(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    ek_api: YieldFixture,
-    ek_auth: YieldFixture,
+    electrickiwi_api: Mock,
+    ek_auth: AsyncMock,
     entity_registry: EntityRegistry,
-    component_setup: ComponentSetup,
     sensor: str,
     sensor_state: str,
 ) -> None:
@@ -61,7 +60,7 @@ async def test_hop_sensors(
     sensor state should be set to today at 4pm or if now is past 4pm,
     then tomorrow at 4pm.
     """
-    assert await component_setup()
+    await init_integration(hass, config_entry)
     assert config_entry.state is ConfigEntryState.LOADED
 
     entity = entity_registry.async_get(sensor)
@@ -70,8 +69,7 @@ async def test_hop_sensors(
     state = hass.states.get(sensor)
     assert state
 
-    api = ek_api(Mock())
-    hop_data = await api.get_hop()
+    hop_data = await electrickiwi_api.get_hop()
 
     value = _check_and_move_time(hop_data, sensor_state)
 
@@ -98,20 +96,19 @@ async def test_hop_sensors(
         ),
         (
             "sensor.next_billing_date",
-            "2020-11-03T00:00:00",
+            "2025-02-19T00:00:00",
             SensorDeviceClass.DATE,
             None,
         ),
-        ("sensor.hour_of_power_savings", "3.5", None, SensorStateClass.MEASUREMENT),
+        ("sensor.hour_of_power_savings", "11.2", None, SensorStateClass.MEASUREMENT),
     ],
 )
 async def test_account_sensors(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    ek_api: YieldFixture,
-    ek_auth: YieldFixture,
+    electrickiwi_api: AsyncMock,
+    ek_auth: AsyncMock,
     entity_registry: EntityRegistry,
-    component_setup: ComponentSetup,
     sensor: str,
     sensor_state: str,
     device_class: str,
@@ -119,7 +116,7 @@ async def test_account_sensors(
 ) -> None:
     """Test Account sensors for the Electric Kiwi integration."""
 
-    assert await component_setup()
+    await init_integration(hass, config_entry)
     assert config_entry.state is ConfigEntryState.LOADED
 
     entity = entity_registry.async_get(sensor)
@@ -133,9 +130,9 @@ async def test_account_sensors(
     assert state.attributes.get(ATTR_STATE_CLASS) == state_class
 
 
-async def test_check_and_move_time(ek_api: AsyncMock) -> None:
+async def test_check_and_move_time(electrickiwi_api: AsyncMock) -> None:
     """Test correct time is returned depending on time of day."""
-    hop = await ek_api(Mock()).get_hop()
+    hop = await electrickiwi_api.get_hop()
 
     test_time = datetime(2023, 6, 21, 18, 0, 0, tzinfo=TEST_TIMEZONE)
     dt_util.set_default_time_zone(TEST_TIMEZONE)
diff --git a/tests/components/elevenlabs/test_tts.py b/tests/components/elevenlabs/test_tts.py
index c4234cb38ae..a63672cc85d 100644
--- a/tests/components/elevenlabs/test_tts.py
+++ b/tests/components/elevenlabs/test_tts.py
@@ -350,7 +350,7 @@ async def test_tts_service_speak_error(
     assert len(calls) == 1
     assert (
         await retrieve_media(hass, hass_client, calls[0].data[ATTR_MEDIA_CONTENT_ID])
-        == HTTPStatus.NOT_FOUND
+        == HTTPStatus.INTERNAL_SERVER_ERROR
     )
 
     tts_entity._client.generate.assert_called_once_with(
diff --git a/tests/components/elgato/snapshots/test_button.ambr b/tests/components/elgato/snapshots/test_button.ambr
index dcf9d1c87d0..81a817f2738 100644
--- a/tests/components/elgato/snapshots/test_button.ambr
+++ b/tests/components/elgato/snapshots/test_button.ambr
@@ -20,6 +20,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -50,6 +51,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -103,6 +105,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -133,6 +136,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
diff --git a/tests/components/elgato/snapshots/test_light.ambr b/tests/components/elgato/snapshots/test_light.ambr
index 4bb4644ab86..84f7ca45843 100644
--- a/tests/components/elgato/snapshots/test_light.ambr
+++ b/tests/components/elgato/snapshots/test_light.ambr
@@ -52,6 +52,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -82,6 +83,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -169,6 +171,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -199,6 +202,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -286,6 +290,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -316,6 +321,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
diff --git a/tests/components/elgato/snapshots/test_sensor.ambr b/tests/components/elgato/snapshots/test_sensor.ambr
index be0ec0a56c5..f64893798e9 100644
--- a/tests/components/elgato/snapshots/test_sensor.ambr
+++ b/tests/components/elgato/snapshots/test_sensor.ambr
@@ -24,6 +24,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -57,6 +58,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -114,6 +116,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -207,6 +211,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -243,6 +248,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -300,6 +306,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -333,6 +340,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -390,6 +398,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -426,6 +435,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
diff --git a/tests/components/elgato/snapshots/test_switch.ambr b/tests/components/elgato/snapshots/test_switch.ambr
index ba95160d28a..254e4deb7d9 100644
--- a/tests/components/elgato/snapshots/test_switch.ambr
+++ b/tests/components/elgato/snapshots/test_switch.ambr
@@ -19,6 +19,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -49,6 +50,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -101,6 +103,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -131,6 +134,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
diff --git a/tests/components/elmax/__init__.py b/tests/components/elmax/__init__.py
index e1a6728f1f5..391c3ccbfb2 100644
--- a/tests/components/elmax/__init__.py
+++ b/tests/components/elmax/__init__.py
@@ -30,6 +30,7 @@ MOCK_PANEL_PIN = "000000"
 MOCK_WRONG_PANEL_PIN = "000000"
 MOCK_PASSWORD = "password"
 MOCK_DIRECT_HOST = "1.1.1.1"
+MOCK_DIRECT_HOST_V6 = "fd00::be2:54:34:2"
 MOCK_DIRECT_HOST_CHANGED = "2.2.2.2"
 MOCK_DIRECT_PORT = 443
 MOCK_DIRECT_SSL = True
diff --git a/tests/components/elmax/conftest.py b/tests/components/elmax/conftest.py
index f8cf33ffe1a..02f01036996 100644
--- a/tests/components/elmax/conftest.py
+++ b/tests/components/elmax/conftest.py
@@ -18,6 +18,7 @@ import respx
 
 from . import (
     MOCK_DIRECT_HOST,
+    MOCK_DIRECT_HOST_V6,
     MOCK_DIRECT_PORT,
     MOCK_DIRECT_SSL,
     MOCK_PANEL_ID,
@@ -29,6 +30,7 @@ from tests.common import load_fixture
 MOCK_DIRECT_BASE_URI = (
     f"{'https' if MOCK_DIRECT_SSL else 'http'}://{MOCK_DIRECT_HOST}:{MOCK_DIRECT_PORT}"
 )
+MOCK_DIRECT_BASE_URI_V6 = f"{'https' if MOCK_DIRECT_SSL else 'http'}://[{MOCK_DIRECT_HOST_V6}]:{MOCK_DIRECT_PORT}"
 
 
 @pytest.fixture(autouse=True)
@@ -58,12 +60,16 @@ def httpx_mock_cloud_fixture() -> Generator[respx.MockRouter]:
         yield respx_mock
 
 
+@pytest.fixture
+def base_uri() -> str:
+    """Configure the base-uri for the respx mock fixtures."""
+    return MOCK_DIRECT_BASE_URI
+
+
 @pytest.fixture(autouse=True)
-def httpx_mock_direct_fixture() -> Generator[respx.MockRouter]:
+def httpx_mock_direct_fixture(base_uri: str) -> Generator[respx.MockRouter]:
     """Configure httpx fixture for direct Panel-API communication."""
-    with respx.mock(
-        base_url=MOCK_DIRECT_BASE_URI, assert_all_called=False
-    ) as respx_mock:
+    with respx.mock(base_url=base_uri, assert_all_called=False) as respx_mock:
         # Mock Login POST.
         login_route = respx_mock.post(f"/api/v2/{ENDPOINT_LOGIN}", name="login")
 
diff --git a/tests/components/elmax/snapshots/test_alarm_control_panel.ambr b/tests/components/elmax/snapshots/test_alarm_control_panel.ambr
index f175fc707bb..2bf3aa48430 100644
--- a/tests/components/elmax/snapshots/test_alarm_control_panel.ambr
+++ b/tests/components/elmax/snapshots/test_alarm_control_panel.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -56,6 +57,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -106,6 +108,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/elmax/snapshots/test_binary_sensor.ambr b/tests/components/elmax/snapshots/test_binary_sensor.ambr
index 3c3f63b44ca..7515547406e 100644
--- a/tests/components/elmax/snapshots/test_binary_sensor.ambr
+++ b/tests/components/elmax/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -194,6 +198,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -241,6 +246,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -288,6 +294,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -335,6 +342,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/elmax/snapshots/test_cover.ambr b/tests/components/elmax/snapshots/test_cover.ambr
index 0dbea416934..8cb230e1523 100644
--- a/tests/components/elmax/snapshots/test_cover.ambr
+++ b/tests/components/elmax/snapshots/test_cover.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/elmax/snapshots/test_switch.ambr b/tests/components/elmax/snapshots/test_switch.ambr
index 0ae1942e7e0..f5845223717 100644
--- a/tests/components/elmax/snapshots/test_switch.ambr
+++ b/tests/components/elmax/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/elmax/test_alarm_control_panel.py b/tests/components/elmax/test_alarm_control_panel.py
index 76dc8845662..88fc0a33c51 100644
--- a/tests/components/elmax/test_alarm_control_panel.py
+++ b/tests/components/elmax/test_alarm_control_panel.py
@@ -5,7 +5,7 @@ from unittest.mock import patch
 
 from syrupy import SnapshotAssertion
 
-from homeassistant.components.elmax import POLLING_SECONDS
+from homeassistant.components.elmax.const import POLLING_SECONDS
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
diff --git a/tests/components/elmax/test_config_flow.py b/tests/components/elmax/test_config_flow.py
index be89ee4d5d6..379cfa98bbc 100644
--- a/tests/components/elmax/test_config_flow.py
+++ b/tests/components/elmax/test_config_flow.py
@@ -1,8 +1,10 @@
 """Tests for the Elmax config flow."""
 
+from ipaddress import IPv4Address, IPv6Address
 from unittest.mock import patch
 
 from elmax_api.exceptions import ElmaxBadLoginError, ElmaxBadPinError, ElmaxNetworkError
+import pytest
 
 from homeassistant import config_entries
 from homeassistant.components.elmax.const import (
@@ -28,6 +30,7 @@ from . import (
     MOCK_DIRECT_CERT,
     MOCK_DIRECT_HOST,
     MOCK_DIRECT_HOST_CHANGED,
+    MOCK_DIRECT_HOST_V6,
     MOCK_DIRECT_PORT,
     MOCK_DIRECT_SSL,
     MOCK_PANEL_ID,
@@ -37,12 +40,27 @@ from . import (
     MOCK_USERNAME,
     MOCK_WRONG_PANEL_PIN,
 )
+from .conftest import MOCK_DIRECT_BASE_URI_V6
 
 from tests.common import MockConfigEntry
 
 MOCK_ZEROCONF_DISCOVERY_INFO = ZeroconfServiceInfo(
-    ip_address=MOCK_DIRECT_HOST,
-    ip_addresses=[MOCK_DIRECT_HOST],
+    ip_address=IPv4Address(address=MOCK_DIRECT_HOST),
+    ip_addresses=[IPv4Address(address=MOCK_DIRECT_HOST)],
+    hostname="VideoBox.local",
+    name="VideoBox",
+    port=443,
+    properties={
+        "idl": MOCK_PANEL_ID,
+        "idr": MOCK_PANEL_ID,
+        "v1": "PHANTOM64PRO_GSM 11.9.844",
+        "v2": "4.9.13",
+    },
+    type="_elmax-ssl._tcp",
+)
+MOCK_ZEROCONF_DISCOVERY_INFO_V6 = ZeroconfServiceInfo(
+    ip_address=IPv6Address(address=MOCK_DIRECT_HOST_V6),
+    ip_addresses=[IPv6Address(address=MOCK_DIRECT_HOST_V6)],
     hostname="VideoBox.local",
     name="VideoBox",
     port=443,
@@ -55,8 +73,8 @@ MOCK_ZEROCONF_DISCOVERY_INFO = ZeroconfServiceInfo(
     type="_elmax-ssl._tcp",
 )
 MOCK_ZEROCONF_DISCOVERY_CHANGED_INFO = ZeroconfServiceInfo(
-    ip_address=MOCK_DIRECT_HOST_CHANGED,
-    ip_addresses=[MOCK_DIRECT_HOST_CHANGED],
+    ip_address=IPv4Address(address=MOCK_DIRECT_HOST_CHANGED),
+    ip_addresses=[IPv4Address(address=MOCK_DIRECT_HOST_CHANGED)],
     hostname="VideoBox.local",
     name="VideoBox",
     port=443,
@@ -69,8 +87,8 @@ MOCK_ZEROCONF_DISCOVERY_CHANGED_INFO = ZeroconfServiceInfo(
     type="_elmax-ssl._tcp",
 )
 MOCK_ZEROCONF_DISCOVERY_INFO_NOT_SUPPORTED = ZeroconfServiceInfo(
-    ip_address=MOCK_DIRECT_HOST,
-    ip_addresses=[MOCK_DIRECT_HOST],
+    ip_address=IPv4Address(MOCK_DIRECT_HOST),
+    ip_addresses=[IPv4Address(MOCK_DIRECT_HOST)],
     hostname="VideoBox.local",
     name="VideoBox",
     port=443,
@@ -194,6 +212,18 @@ async def test_zeroconf_discovery(hass: HomeAssistant) -> None:
     assert result["errors"] is None
 
 
+async def test_zeroconf_discovery_ipv6(hass: HomeAssistant) -> None:
+    """Test discovery of Elmax local api panel."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_ZEROCONF},
+        data=MOCK_ZEROCONF_DISCOVERY_INFO_V6,
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "zeroconf_setup"
+    assert result["errors"] is None
+
+
 async def test_zeroconf_setup_show_form(hass: HomeAssistant) -> None:
     """Test discovery shows a form when activated."""
     result = await hass.config_entries.flow.async_init(
@@ -230,6 +260,27 @@ async def test_zeroconf_setup(hass: HomeAssistant) -> None:
     assert result["type"] is FlowResultType.CREATE_ENTRY
 
 
+@pytest.mark.parametrize("base_uri", [MOCK_DIRECT_BASE_URI_V6])
+async def test_zeroconf_ipv6_setup(hass: HomeAssistant) -> None:
+    """Test the successful creation of config entry via discovery flow."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_ZEROCONF},
+        data=MOCK_ZEROCONF_DISCOVERY_INFO_V6,
+    )
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_ELMAX_PANEL_PIN: MOCK_PANEL_PIN,
+            CONF_ELMAX_MODE_DIRECT_SSL: MOCK_DIRECT_SSL,
+        },
+    )
+
+    await hass.async_block_till_done()
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+
+
 async def test_zeroconf_already_configured(hass: HomeAssistant) -> None:
     """Ensure local discovery aborts when same panel is already added to ha."""
     MockConfigEntry(
diff --git a/tests/components/emoncms/snapshots/test_sensor.ambr b/tests/components/emoncms/snapshots/test_sensor.ambr
index 210196ce414..6dc19155863 100644
--- a/tests/components/emoncms/snapshots/test_sensor.ambr
+++ b/tests/components/emoncms/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/emulated_hue/test_hue_api.py b/tests/components/emulated_hue/test_hue_api.py
index 8a340d5e2dd..97dcc782096 100644
--- a/tests/components/emulated_hue/test_hue_api.py
+++ b/tests/components/emulated_hue/test_hue_api.py
@@ -58,7 +58,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.typing import ConfigType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.json import JsonObjectType
 
 from tests.common import (
diff --git a/tests/components/energenie_power_sockets/conftest.py b/tests/components/energenie_power_sockets/conftest.py
index c142e436fd3..d0301034cf8 100644
--- a/tests/components/energenie_power_sockets/conftest.py
+++ b/tests/components/energenie_power_sockets/conftest.py
@@ -44,7 +44,7 @@ def get_pyegps_device_mock() -> MagicMock:
     fkObj = FakePowerStrip(
         devId=DEMO_CONFIG_DATA[CONF_DEVICE_API_ID], number_of_sockets=4
     )
-    fkObj.release = lambda: True
+    fkObj.release = lambda: None
     fkObj._status = [0, 1, 0, 1]
 
     usb_device_mock = MagicMock(wraps=fkObj)
diff --git a/tests/components/energenie_power_sockets/snapshots/test_switch.ambr b/tests/components/energenie_power_sockets/snapshots/test_switch.ambr
index d462d6ca6d4..99595168157 100644
--- a/tests/components/energenie_power_sockets/snapshots/test_switch.ambr
+++ b/tests/components/energenie_power_sockets/snapshots/test_switch.ambr
@@ -20,6 +20,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -67,6 +68,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -114,6 +116,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -161,6 +164,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/energenie_power_sockets/test_init.py b/tests/components/energenie_power_sockets/test_init.py
index 4e2fe51665b..a11cef319b2 100644
--- a/tests/components/energenie_power_sockets/test_init.py
+++ b/tests/components/energenie_power_sockets/test_init.py
@@ -4,7 +4,6 @@ from unittest.mock import MagicMock
 
 from pyegps.exceptions import UsbError
 
-from homeassistant.components.energenie_power_sockets.const import DOMAIN
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 
@@ -24,13 +23,11 @@ async def test_load_unload_entry(
     await hass.async_block_till_done()
 
     assert entry.state is ConfigEntryState.LOADED
-    assert entry.entry_id in hass.data[DOMAIN]
 
     assert await hass.config_entries.async_unload(entry.entry_id)
     await hass.async_block_till_done()
 
     assert entry.state is ConfigEntryState.NOT_LOADED
-    assert DOMAIN not in hass.data
 
 
 async def test_device_not_found_on_load_entry(
diff --git a/tests/components/energenie_power_sockets/test_switch.py b/tests/components/energenie_power_sockets/test_switch.py
index 4cd2bd60028..27f13390a83 100644
--- a/tests/components/energenie_power_sockets/test_switch.py
+++ b/tests/components/energenie_power_sockets/test_switch.py
@@ -6,7 +6,6 @@ from pyegps.exceptions import EgpsException
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
-from homeassistant.components.energenie_power_sockets.const import DOMAIN
 from homeassistant.components.homeassistant import (
     DOMAIN as HOME_ASSISTANT_DOMAIN,
     SERVICE_UPDATE_ENTITY,
@@ -118,7 +117,6 @@ async def test_switch_setup(
     await hass.async_block_till_done()
 
     assert entry.state is ConfigEntryState.LOADED
-    assert entry.entry_id in hass.data[DOMAIN]
 
     state = hass.states.get(f"switch.{entity_name}")
     assert state == snapshot
diff --git a/tests/components/energy/test_sensor.py b/tests/components/energy/test_sensor.py
index a27451b853d..a438842f8a5 100644
--- a/tests/components/energy/test_sensor.py
+++ b/tests/components/energy/test_sensor.py
@@ -28,7 +28,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.unit_system import METRIC_SYSTEM, US_CUSTOMARY_SYSTEM
 
 from tests.components.recorder.common import async_wait_recording_done
diff --git a/tests/components/energy/test_websocket_api.py b/tests/components/energy/test_websocket_api.py
index 959ec7d1687..e4b0e568a70 100644
--- a/tests/components/energy/test_websocket_api.py
+++ b/tests/components/energy/test_websocket_api.py
@@ -149,7 +149,13 @@ async def test_save_preferences(
                 "stat_energy_to": "my_battery_charging",
             },
         ],
-        "device_consumption": [{"stat_consumption": "some_device_usage"}],
+        "device_consumption": [
+            {
+                "stat_consumption": "some_device_usage",
+                "name": "My Device",
+                "included_in_stat": "sensor.some_other_device",
+            }
+        ],
     }
 
     await client.send_json({"id": 6, "type": "energy/save_prefs", **new_prefs})
diff --git a/tests/components/energyzero/snapshots/test_sensor.ambr b/tests/components/energyzero/snapshots/test_sensor.ambr
index 452f4ae748e..5407ac8f0e9 100644
--- a/tests/components/energyzero/snapshots/test_sensor.ambr
+++ b/tests/components/energyzero/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -56,6 +57,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -105,6 +107,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -153,6 +156,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -201,6 +205,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -249,6 +254,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -297,6 +303,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -345,6 +352,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -393,6 +401,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -443,6 +452,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -492,6 +502,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/enocean/test_config_flow.py b/tests/components/enocean/test_config_flow.py
index 96c0843906f..fb5b1de19d8 100644
--- a/tests/components/enocean/test_config_flow.py
+++ b/tests/components/enocean/test_config_flow.py
@@ -32,7 +32,7 @@ async def test_user_flow_cannot_create_multiple_instances(hass: HomeAssistant) -
 
 
 async def test_user_flow_with_detected_dongle(hass: HomeAssistant) -> None:
-    """Test the user flow with a detected ENOcean dongle."""
+    """Test the user flow with a detected EnOcean dongle."""
     FAKE_DONGLE_PATH = "/fake/dongle"
 
     with patch(DONGLE_DETECT_METHOD, Mock(return_value=[FAKE_DONGLE_PATH])):
@@ -42,13 +42,13 @@ async def test_user_flow_with_detected_dongle(hass: HomeAssistant) -> None:
 
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "detect"
-    devices = result["data_schema"].schema.get("device").container
+    devices = result["data_schema"].schema.get(CONF_DEVICE).config.get("options")
     assert FAKE_DONGLE_PATH in devices
     assert EnOceanFlowHandler.MANUAL_PATH_VALUE in devices
 
 
 async def test_user_flow_with_no_detected_dongle(hass: HomeAssistant) -> None:
-    """Test the user flow with a detected ENOcean dongle."""
+    """Test the user flow with a detected EnOcean dongle."""
     with patch(DONGLE_DETECT_METHOD, Mock(return_value=[])):
         result = await hass.config_entries.flow.async_init(
             DOMAIN, context={"source": config_entries.SOURCE_USER}
diff --git a/tests/components/enphase_envoy/__init__.py b/tests/components/enphase_envoy/__init__.py
index f69ab8e44f2..f5381eda2a7 100644
--- a/tests/components/enphase_envoy/__init__.py
+++ b/tests/components/enphase_envoy/__init__.py
@@ -1,13 +1,19 @@
 """Tests for the Enphase Envoy integration."""
 
+from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 
 from tests.common import MockConfigEntry
 
 
-async def setup_integration(hass: HomeAssistant, config_entry: MockConfigEntry) -> None:
-    """Fixture for setting up the component."""
+async def setup_integration(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    expected_state: ConfigEntryState = ConfigEntryState.LOADED,
+) -> None:
+    """Fixture for setting up the component and testing expected state."""
     config_entry.add_to_hass(hass)
 
     await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
+    await hass.async_block_till_done(wait_background_tasks=True)
+    assert config_entry.state is expected_state
diff --git a/tests/components/enphase_envoy/fixtures/envoy_1p_metered.json b/tests/components/enphase_envoy/fixtures/envoy_1p_metered.json
index 05a6f265dfb..22aeca50ca0 100644
--- a/tests/components/enphase_envoy/fixtures/envoy_1p_metered.json
+++ b/tests/components/enphase_envoy/fixtures/envoy_1p_metered.json
@@ -93,7 +93,8 @@
         "reserved_soc": 15.0,
         "very_low_soc": 5,
         "charge_from_grid": true,
-        "date": "1695598084"
+        "date": "1695598084",
+        "opt_schedules": true
       },
       "single_rate": {
         "rate": 0.0,
diff --git a/tests/components/enphase_envoy/fixtures/envoy_acb_batt.json b/tests/components/enphase_envoy/fixtures/envoy_acb_batt.json
index 618b40027b8..52e812f979e 100644
--- a/tests/components/enphase_envoy/fixtures/envoy_acb_batt.json
+++ b/tests/components/enphase_envoy/fixtures/envoy_acb_batt.json
@@ -235,7 +235,8 @@
         "reserved_soc": 0.0,
         "very_low_soc": 5,
         "charge_from_grid": true,
-        "date": "1714749724"
+        "date": "1714749724",
+        "opt_schedules": true
       },
       "single_rate": {
         "rate": 0.0,
diff --git a/tests/components/enphase_envoy/fixtures/envoy_eu_batt.json b/tests/components/enphase_envoy/fixtures/envoy_eu_batt.json
index 8118630200f..30fbc8d0f4f 100644
--- a/tests/components/enphase_envoy/fixtures/envoy_eu_batt.json
+++ b/tests/components/enphase_envoy/fixtures/envoy_eu_batt.json
@@ -223,7 +223,8 @@
         "reserved_soc": 0.0,
         "very_low_soc": 5,
         "charge_from_grid": true,
-        "date": "1714749724"
+        "date": "1714749724",
+        "opt_schedules": true
       },
       "single_rate": {
         "rate": 0.0,
diff --git a/tests/components/enphase_envoy/fixtures/envoy_metered_batt_relay.json b/tests/components/enphase_envoy/fixtures/envoy_metered_batt_relay.json
index 7affc1bea0d..6cfbfed1e8e 100644
--- a/tests/components/enphase_envoy/fixtures/envoy_metered_batt_relay.json
+++ b/tests/components/enphase_envoy/fixtures/envoy_metered_batt_relay.json
@@ -427,7 +427,8 @@
         "reserved_soc": 15.0,
         "very_low_soc": 5,
         "charge_from_grid": true,
-        "date": "1695598084"
+        "date": "1695598084",
+        "opt_schedules": true
       },
       "single_rate": {
         "rate": 0.0,
diff --git a/tests/components/enphase_envoy/fixtures/envoy_nobatt_metered_3p.json b/tests/components/enphase_envoy/fixtures/envoy_nobatt_metered_3p.json
index ff975b690ed..8c2767e33e5 100644
--- a/tests/components/enphase_envoy/fixtures/envoy_nobatt_metered_3p.json
+++ b/tests/components/enphase_envoy/fixtures/envoy_nobatt_metered_3p.json
@@ -242,7 +242,8 @@
         "reserved_soc": 15.0,
         "very_low_soc": 5,
         "charge_from_grid": true,
-        "date": "1695598084"
+        "date": "1695598084",
+        "opt_schedules": true
       },
       "single_rate": {
         "rate": 0.0,
diff --git a/tests/components/enphase_envoy/fixtures/envoy_tot_cons_metered.json b/tests/components/enphase_envoy/fixtures/envoy_tot_cons_metered.json
index 62df69c6d88..15cf2c173cb 100644
--- a/tests/components/enphase_envoy/fixtures/envoy_tot_cons_metered.json
+++ b/tests/components/enphase_envoy/fixtures/envoy_tot_cons_metered.json
@@ -88,7 +88,8 @@
         "reserved_soc": 15.0,
         "very_low_soc": 5,
         "charge_from_grid": true,
-        "date": "1695598084"
+        "date": "1695598084",
+        "opt_schedules": true
       },
       "single_rate": {
         "rate": 0.0,
diff --git a/tests/components/enphase_envoy/snapshots/test_binary_sensor.ambr b/tests/components/enphase_envoy/snapshots/test_binary_sensor.ambr
index e9bf8378d79..e4810c21226 100644
--- a/tests/components/enphase_envoy/snapshots/test_binary_sensor.ambr
+++ b/tests/components/enphase_envoy/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -99,6 +101,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -146,6 +149,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -192,6 +196,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -239,6 +244,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/enphase_envoy/snapshots/test_diagnostics.ambr b/tests/components/enphase_envoy/snapshots/test_diagnostics.ambr
index 4254ffe961a..152cf803258 100644
--- a/tests/components/enphase_envoy/snapshots/test_diagnostics.ambr
+++ b/tests/components/enphase_envoy/snapshots/test_diagnostics.ambr
@@ -20,6 +20,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': '**REDACTED**',
       'unique_id': '**REDACTED**',
       'version': 1,
@@ -31,6 +33,11 @@
           'config_entries': list([
             '45a36e55aaddb2007c5f6602e0c38e72',
           ]),
+          'config_entries_subentries': dict({
+            '45a36e55aaddb2007c5f6602e0c38e72': list([
+              None,
+            ]),
+          }),
           'configuration_url': None,
           'connections': list([
           ]),
@@ -68,6 +75,7 @@
               'categories': dict({
               }),
               'config_entry_id': '45a36e55aaddb2007c5f6602e0c38e72',
+              'config_subentry_id': None,
               'device_class': None,
               'disabled_by': None,
               'domain': 'sensor',
@@ -119,6 +127,7 @@
               'categories': dict({
               }),
               'config_entry_id': '45a36e55aaddb2007c5f6602e0c38e72',
+              'config_subentry_id': None,
               'device_class': None,
               'disabled_by': None,
               'domain': 'sensor',
@@ -168,6 +177,7 @@
               'categories': dict({
               }),
               'config_entry_id': '45a36e55aaddb2007c5f6602e0c38e72',
+              'config_subentry_id': None,
               'device_class': None,
               'disabled_by': None,
               'domain': 'sensor',
@@ -218,6 +228,7 @@
               'categories': dict({
               }),
               'config_entry_id': '45a36e55aaddb2007c5f6602e0c38e72',
+              'config_subentry_id': None,
               'device_class': None,
               'disabled_by': None,
               'domain': 'sensor',
@@ -266,6 +277,11 @@
           'config_entries': list([
             '45a36e55aaddb2007c5f6602e0c38e72',
           ]),
+          'config_entries_subentries': dict({
+            '45a36e55aaddb2007c5f6602e0c38e72': list([
+              None,
+            ]),
+          }),
           'configuration_url': None,
           'connections': list([
           ]),
@@ -303,6 +319,7 @@
               'categories': dict({
               }),
               'config_entry_id': '45a36e55aaddb2007c5f6602e0c38e72',
+              'config_subentry_id': None,
               'device_class': None,
               'disabled_by': None,
               'domain': 'sensor',
@@ -346,6 +363,7 @@
               'categories': dict({
               }),
               'config_entry_id': '45a36e55aaddb2007c5f6602e0c38e72',
+              'config_subentry_id': None,
               'device_class': None,
               'disabled_by': 'integration',
               'domain': 'sensor',
@@ -449,6 +467,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': '**REDACTED**',
       'unique_id': '**REDACTED**',
       'version': 1,
@@ -460,6 +480,11 @@
           'config_entries': list([
             '45a36e55aaddb2007c5f6602e0c38e72',
           ]),
+          'config_entries_subentries': dict({
+            '45a36e55aaddb2007c5f6602e0c38e72': list([
+              None,
+            ]),
+          }),
           'configuration_url': None,
           'connections': list([
           ]),
@@ -497,6 +522,7 @@
               'categories': dict({
               }),
               'config_entry_id': '45a36e55aaddb2007c5f6602e0c38e72',
+              'config_subentry_id': None,
               'device_class': None,
               'disabled_by': None,
               'domain': 'sensor',
@@ -548,6 +574,7 @@
               'categories': dict({
               }),
               'config_entry_id': '45a36e55aaddb2007c5f6602e0c38e72',
+              'config_subentry_id': None,
               'device_class': None,
               'disabled_by': None,
               'domain': 'sensor',
@@ -597,6 +624,7 @@
               'categories': dict({
               }),
               'config_entry_id': '45a36e55aaddb2007c5f6602e0c38e72',
+              'config_subentry_id': None,
               'device_class': None,
               'disabled_by': None,
               'domain': 'sensor',
@@ -647,6 +675,7 @@
               'categories': dict({
               }),
               'config_entry_id': '45a36e55aaddb2007c5f6602e0c38e72',
+              'config_subentry_id': None,
               'device_class': None,
               'disabled_by': None,
               'domain': 'sensor',
@@ -695,6 +724,11 @@
           'config_entries': list([
             '45a36e55aaddb2007c5f6602e0c38e72',
           ]),
+          'config_entries_subentries': dict({
+            '45a36e55aaddb2007c5f6602e0c38e72': list([
+              None,
+            ]),
+          }),
           'configuration_url': None,
           'connections': list([
           ]),
@@ -732,6 +766,7 @@
               'categories': dict({
               }),
               'config_entry_id': '45a36e55aaddb2007c5f6602e0c38e72',
+              'config_subentry_id': None,
               'device_class': None,
               'disabled_by': None,
               'domain': 'sensor',
@@ -775,6 +810,7 @@
               'categories': dict({
               }),
               'config_entry_id': '45a36e55aaddb2007c5f6602e0c38e72',
+              'config_subentry_id': None,
               'device_class': None,
               'disabled_by': 'integration',
               'domain': 'sensor',
@@ -918,6 +954,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': '**REDACTED**',
       'unique_id': '**REDACTED**',
       'version': 1,
@@ -929,6 +967,11 @@
           'config_entries': list([
             '45a36e55aaddb2007c5f6602e0c38e72',
           ]),
+          'config_entries_subentries': dict({
+            '45a36e55aaddb2007c5f6602e0c38e72': list([
+              None,
+            ]),
+          }),
           'configuration_url': None,
           'connections': list([
           ]),
@@ -966,6 +1009,7 @@
               'categories': dict({
               }),
               'config_entry_id': '45a36e55aaddb2007c5f6602e0c38e72',
+              'config_subentry_id': None,
               'device_class': None,
               'disabled_by': None,
               'domain': 'sensor',
@@ -1017,6 +1061,7 @@
               'categories': dict({
               }),
               'config_entry_id': '45a36e55aaddb2007c5f6602e0c38e72',
+              'config_subentry_id': None,
               'device_class': None,
               'disabled_by': None,
               'domain': 'sensor',
@@ -1066,6 +1111,7 @@
               'categories': dict({
               }),
               'config_entry_id': '45a36e55aaddb2007c5f6602e0c38e72',
+              'config_subentry_id': None,
               'device_class': None,
               'disabled_by': None,
               'domain': 'sensor',
@@ -1116,6 +1162,7 @@
               'categories': dict({
               }),
               'config_entry_id': '45a36e55aaddb2007c5f6602e0c38e72',
+              'config_subentry_id': None,
               'device_class': None,
               'disabled_by': None,
               'domain': 'sensor',
@@ -1164,6 +1211,11 @@
           'config_entries': list([
             '45a36e55aaddb2007c5f6602e0c38e72',
           ]),
+          'config_entries_subentries': dict({
+            '45a36e55aaddb2007c5f6602e0c38e72': list([
+              None,
+            ]),
+          }),
           'configuration_url': None,
           'connections': list([
           ]),
@@ -1201,6 +1253,7 @@
               'categories': dict({
               }),
               'config_entry_id': '45a36e55aaddb2007c5f6602e0c38e72',
+              'config_subentry_id': None,
               'device_class': None,
               'disabled_by': None,
               'domain': 'sensor',
@@ -1244,6 +1297,7 @@
               'categories': dict({
               }),
               'config_entry_id': '45a36e55aaddb2007c5f6602e0c38e72',
+              'config_subentry_id': None,
               'device_class': None,
               'disabled_by': 'integration',
               'domain': 'sensor',
diff --git a/tests/components/enphase_envoy/snapshots/test_number.ambr b/tests/components/enphase_envoy/snapshots/test_number.ambr
index b7e799c9ac8..eb8f5266f32 100644
--- a/tests/components/enphase_envoy/snapshots/test_number.ambr
+++ b/tests/components/enphase_envoy/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -68,6 +69,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -125,6 +127,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -181,6 +184,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -237,6 +241,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -293,6 +298,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -349,6 +355,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -405,6 +412,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/enphase_envoy/snapshots/test_select.ambr b/tests/components/enphase_envoy/snapshots/test_select.ambr
index f091879d9fc..d8238926dfd 100644
--- a/tests/components/enphase_envoy/snapshots/test_select.ambr
+++ b/tests/components/enphase_envoy/snapshots/test_select.ambr
@@ -12,6 +12,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -69,6 +70,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -127,6 +129,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -186,6 +189,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -245,6 +249,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -302,6 +307,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -359,6 +365,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -418,6 +425,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -477,6 +485,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -534,6 +543,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -591,6 +601,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -650,6 +661,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -709,6 +721,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -766,6 +779,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/enphase_envoy/snapshots/test_sensor.ambr b/tests/components/enphase_envoy/snapshots/test_sensor.ambr
index 0f251b5e859..101caaf1aea 100644
--- a/tests/components/enphase_envoy/snapshots/test_sensor.ambr
+++ b/tests/components/enphase_envoy/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -63,6 +64,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -119,6 +121,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -176,6 +179,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -233,6 +237,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -282,6 +287,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -331,6 +337,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -354,7 +361,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER: 'power'>,
     'original_icon': None,
-    'original_name': 'balanced net power consumption',
+    'original_name': 'Balanced net power consumption',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -367,7 +374,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power',
-      'friendly_name': 'Envoy 1234 balanced net power consumption',
+      'friendly_name': 'Envoy 1234 Balanced net power consumption',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
     }),
@@ -388,6 +395,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -445,6 +453,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -502,6 +511,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -557,6 +567,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -613,6 +624,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -668,6 +680,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -724,6 +737,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -781,6 +795,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -835,6 +850,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -889,6 +905,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -946,6 +963,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1003,6 +1021,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1060,6 +1079,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1117,6 +1137,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1172,6 +1193,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1218,6 +1240,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1270,6 +1293,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1328,6 +1352,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1382,6 +1407,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1430,7 +1456,7 @@
     'state': '0.3',
   })
 # ---
-# name: test_sensor[envoy_1p_metered][sensor.envoy_1234_powerfactor_net_consumption_ct-entry]
+# name: test_sensor[envoy_1p_metered][sensor.envoy_1234_power_factor_net_consumption_ct-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -1439,12 +1465,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -1459,7 +1486,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor net consumption CT',
+    'original_name': 'Power factor net consumption CT',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -1468,22 +1495,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_1p_metered][sensor.envoy_1234_powerfactor_net_consumption_ct-state]
+# name: test_sensor[envoy_1p_metered][sensor.envoy_1234_power_factor_net_consumption_ct-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor net consumption CT',
+      'friendly_name': 'Envoy 1234 Power factor net consumption CT',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.21',
   })
 # ---
-# name: test_sensor[envoy_1p_metered][sensor.envoy_1234_powerfactor_production_ct-entry]
+# name: test_sensor[envoy_1p_metered][sensor.envoy_1234_power_factor_production_ct-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -1492,12 +1519,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -1512,7 +1540,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'powerfactor production CT',
+    'original_name': 'Power factor production CT',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -1521,15 +1549,15 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_1p_metered][sensor.envoy_1234_powerfactor_production_ct-state]
+# name: test_sensor[envoy_1p_metered][sensor.envoy_1234_power_factor_production_ct-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 powerfactor production CT',
+      'friendly_name': 'Envoy 1234 Power factor production CT',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -1545,6 +1573,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1602,6 +1631,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1659,6 +1689,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1716,6 +1747,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1765,6 +1797,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1812,6 +1845,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1867,6 +1901,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1920,6 +1955,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1968,6 +2004,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2016,6 +2053,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2064,6 +2102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2111,6 +2150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2159,6 +2199,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2207,6 +2248,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2255,6 +2297,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2303,6 +2346,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2351,6 +2395,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2399,6 +2444,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2449,6 +2495,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2472,7 +2519,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER: 'power'>,
     'original_icon': None,
-    'original_name': 'balanced net power consumption',
+    'original_name': 'Balanced net power consumption',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -2485,7 +2532,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power',
-      'friendly_name': 'Envoy 1234 balanced net power consumption',
+      'friendly_name': 'Envoy 1234 Balanced net power consumption',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
     }),
@@ -2504,6 +2551,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2552,6 +2600,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2602,6 +2651,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2659,6 +2709,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2716,6 +2767,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2773,6 +2825,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2830,6 +2883,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2887,6 +2941,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2942,6 +2997,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2998,6 +3054,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3053,6 +3110,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3109,6 +3167,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3166,6 +3225,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3220,6 +3280,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3274,6 +3335,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3328,6 +3390,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3382,6 +3445,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3436,6 +3500,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3490,6 +3555,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3544,6 +3610,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3598,6 +3665,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3655,6 +3723,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3712,6 +3781,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3769,6 +3839,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3826,6 +3897,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3883,6 +3955,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3940,6 +4013,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3997,6 +4071,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4054,6 +4129,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4111,6 +4187,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4168,6 +4245,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4223,6 +4301,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4269,6 +4348,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4315,6 +4395,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4361,6 +4442,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4407,6 +4489,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4453,6 +4536,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4499,6 +4583,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4545,6 +4630,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4597,6 +4683,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4655,6 +4742,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4713,6 +4801,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4771,6 +4860,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4829,6 +4919,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4887,6 +4978,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4945,6 +5037,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5003,6 +5096,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5057,6 +5151,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5114,6 +5209,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5171,6 +5267,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5228,6 +5325,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5276,7 +5374,7 @@
     'state': '0.3',
   })
 # ---
-# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_powerfactor_net_consumption_ct-entry]
+# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_power_factor_net_consumption_ct-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -5285,12 +5383,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -5305,7 +5404,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor net consumption CT',
+    'original_name': 'Power factor net consumption CT',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -5314,22 +5413,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_powerfactor_net_consumption_ct-state]
+# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_power_factor_net_consumption_ct-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor net consumption CT',
+      'friendly_name': 'Envoy 1234 Power factor net consumption CT',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.21',
   })
 # ---
-# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_powerfactor_net_consumption_ct_l1-entry]
+# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_power_factor_net_consumption_ct_l1-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -5338,12 +5437,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l1',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l1',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -5358,7 +5458,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor net consumption CT l1',
+    'original_name': 'Power factor net consumption CT l1',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -5367,22 +5467,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_powerfactor_net_consumption_ct_l1-state]
+# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_power_factor_net_consumption_ct_l1-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor net consumption CT l1',
+      'friendly_name': 'Envoy 1234 Power factor net consumption CT l1',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l1',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l1',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.22',
   })
 # ---
-# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_powerfactor_net_consumption_ct_l2-entry]
+# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_power_factor_net_consumption_ct_l2-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -5391,12 +5491,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l2',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l2',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -5411,7 +5512,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor net consumption CT l2',
+    'original_name': 'Power factor net consumption CT l2',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -5420,22 +5521,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_powerfactor_net_consumption_ct_l2-state]
+# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_power_factor_net_consumption_ct_l2-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor net consumption CT l2',
+      'friendly_name': 'Envoy 1234 Power factor net consumption CT l2',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l2',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l2',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.23',
   })
 # ---
-# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_powerfactor_net_consumption_ct_l3-entry]
+# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_power_factor_net_consumption_ct_l3-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -5444,12 +5545,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l3',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l3',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -5464,7 +5566,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor net consumption CT l3',
+    'original_name': 'Power factor net consumption CT l3',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -5473,22 +5575,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_powerfactor_net_consumption_ct_l3-state]
+# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_power_factor_net_consumption_ct_l3-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor net consumption CT l3',
+      'friendly_name': 'Envoy 1234 Power factor net consumption CT l3',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l3',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l3',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.24',
   })
 # ---
-# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_powerfactor_production_ct-entry]
+# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_power_factor_production_ct-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -5497,12 +5599,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -5517,7 +5620,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'powerfactor production CT',
+    'original_name': 'Power factor production CT',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -5526,22 +5629,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_powerfactor_production_ct-state]
+# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_power_factor_production_ct-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 powerfactor production CT',
+      'friendly_name': 'Envoy 1234 Power factor production CT',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.11',
   })
 # ---
-# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_powerfactor_production_ct_l1-entry]
+# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_power_factor_production_ct_l1-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -5550,12 +5653,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l1',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l1',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -5570,7 +5674,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor production CT l1',
+    'original_name': 'Power factor production CT l1',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -5579,22 +5683,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_powerfactor_production_ct_l1-state]
+# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_power_factor_production_ct_l1-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor production CT l1',
+      'friendly_name': 'Envoy 1234 Power factor production CT l1',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l1',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l1',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.12',
   })
 # ---
-# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_powerfactor_production_ct_l2-entry]
+# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_power_factor_production_ct_l2-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -5603,12 +5707,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l2',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l2',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -5623,7 +5728,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor production CT l2',
+    'original_name': 'Power factor production CT l2',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -5632,22 +5737,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_powerfactor_production_ct_l2-state]
+# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_power_factor_production_ct_l2-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor production CT l2',
+      'friendly_name': 'Envoy 1234 Power factor production CT l2',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l2',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l2',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.13',
   })
 # ---
-# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_powerfactor_production_ct_l3-entry]
+# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_power_factor_production_ct_l3-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -5656,12 +5761,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l3',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l3',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -5676,7 +5782,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor production CT l3',
+    'original_name': 'Power factor production CT l3',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -5685,15 +5791,15 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_powerfactor_production_ct_l3-state]
+# name: test_sensor[envoy_acb_batt][sensor.envoy_1234_power_factor_production_ct_l3-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor production CT l3',
+      'friendly_name': 'Envoy 1234 Power factor production CT l3',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l3',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l3',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -5709,6 +5815,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5766,6 +5873,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5823,6 +5931,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5880,6 +5989,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5935,6 +6045,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5983,6 +6094,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6033,6 +6145,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6090,6 +6203,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6147,6 +6261,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6204,6 +6319,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6261,6 +6377,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6318,6 +6435,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6375,6 +6493,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6432,6 +6551,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6489,6 +6609,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6538,6 +6659,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6585,6 +6707,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6633,6 +6756,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6681,6 +6805,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6728,6 +6853,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6776,6 +6902,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6824,6 +6951,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6874,6 +7002,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6897,7 +7026,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER: 'power'>,
     'original_icon': None,
-    'original_name': 'balanced net power consumption',
+    'original_name': 'Balanced net power consumption',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -6910,7 +7039,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power',
-      'friendly_name': 'Envoy 1234 balanced net power consumption',
+      'friendly_name': 'Envoy 1234 Balanced net power consumption',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
     }),
@@ -6929,6 +7058,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6977,6 +7107,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7027,6 +7158,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7084,6 +7216,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7141,6 +7274,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7198,6 +7332,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7255,6 +7390,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7312,6 +7448,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7367,6 +7504,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7423,6 +7561,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7478,6 +7617,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7534,6 +7674,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7591,6 +7732,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7645,6 +7787,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7699,6 +7842,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7753,6 +7897,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7807,6 +7952,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7861,6 +8007,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7915,6 +8062,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7969,6 +8117,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8023,6 +8172,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8080,6 +8230,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8137,6 +8288,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8194,6 +8346,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8251,6 +8404,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8308,6 +8462,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8365,6 +8520,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8422,6 +8578,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8479,6 +8636,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8536,6 +8694,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8593,6 +8752,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8648,6 +8808,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8694,6 +8855,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8740,6 +8902,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8786,6 +8949,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8832,6 +8996,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8878,6 +9043,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8924,6 +9090,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8970,6 +9137,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9022,6 +9190,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9080,6 +9249,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9138,6 +9308,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9196,6 +9367,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9254,6 +9426,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9312,6 +9485,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9370,6 +9544,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9428,6 +9603,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9482,6 +9658,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9539,6 +9716,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9596,6 +9774,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9653,6 +9832,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9701,7 +9881,7 @@
     'state': '0.3',
   })
 # ---
-# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_powerfactor_net_consumption_ct-entry]
+# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_power_factor_net_consumption_ct-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -9710,12 +9890,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -9730,7 +9911,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor net consumption CT',
+    'original_name': 'Power factor net consumption CT',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -9739,22 +9920,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_powerfactor_net_consumption_ct-state]
+# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_power_factor_net_consumption_ct-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor net consumption CT',
+      'friendly_name': 'Envoy 1234 Power factor net consumption CT',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.21',
   })
 # ---
-# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_powerfactor_net_consumption_ct_l1-entry]
+# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_power_factor_net_consumption_ct_l1-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -9763,12 +9944,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l1',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l1',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -9783,7 +9965,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor net consumption CT l1',
+    'original_name': 'Power factor net consumption CT l1',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -9792,22 +9974,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_powerfactor_net_consumption_ct_l1-state]
+# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_power_factor_net_consumption_ct_l1-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor net consumption CT l1',
+      'friendly_name': 'Envoy 1234 Power factor net consumption CT l1',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l1',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l1',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.22',
   })
 # ---
-# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_powerfactor_net_consumption_ct_l2-entry]
+# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_power_factor_net_consumption_ct_l2-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -9816,12 +9998,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l2',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l2',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -9836,7 +10019,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor net consumption CT l2',
+    'original_name': 'Power factor net consumption CT l2',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -9845,22 +10028,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_powerfactor_net_consumption_ct_l2-state]
+# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_power_factor_net_consumption_ct_l2-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor net consumption CT l2',
+      'friendly_name': 'Envoy 1234 Power factor net consumption CT l2',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l2',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l2',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.23',
   })
 # ---
-# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_powerfactor_net_consumption_ct_l3-entry]
+# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_power_factor_net_consumption_ct_l3-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -9869,12 +10052,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l3',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l3',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -9889,7 +10073,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor net consumption CT l3',
+    'original_name': 'Power factor net consumption CT l3',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -9898,22 +10082,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_powerfactor_net_consumption_ct_l3-state]
+# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_power_factor_net_consumption_ct_l3-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor net consumption CT l3',
+      'friendly_name': 'Envoy 1234 Power factor net consumption CT l3',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l3',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l3',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.24',
   })
 # ---
-# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_powerfactor_production_ct-entry]
+# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_power_factor_production_ct-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -9922,12 +10106,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -9942,7 +10127,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'powerfactor production CT',
+    'original_name': 'Power factor production CT',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -9951,22 +10136,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_powerfactor_production_ct-state]
+# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_power_factor_production_ct-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 powerfactor production CT',
+      'friendly_name': 'Envoy 1234 Power factor production CT',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.11',
   })
 # ---
-# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_powerfactor_production_ct_l1-entry]
+# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_power_factor_production_ct_l1-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -9975,12 +10160,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l1',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l1',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -9995,7 +10181,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor production CT l1',
+    'original_name': 'Power factor production CT l1',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -10004,22 +10190,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_powerfactor_production_ct_l1-state]
+# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_power_factor_production_ct_l1-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor production CT l1',
+      'friendly_name': 'Envoy 1234 Power factor production CT l1',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l1',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l1',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.12',
   })
 # ---
-# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_powerfactor_production_ct_l2-entry]
+# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_power_factor_production_ct_l2-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -10028,12 +10214,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l2',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l2',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -10048,7 +10235,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor production CT l2',
+    'original_name': 'Power factor production CT l2',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -10057,22 +10244,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_powerfactor_production_ct_l2-state]
+# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_power_factor_production_ct_l2-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor production CT l2',
+      'friendly_name': 'Envoy 1234 Power factor production CT l2',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l2',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l2',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.13',
   })
 # ---
-# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_powerfactor_production_ct_l3-entry]
+# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_power_factor_production_ct_l3-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -10081,12 +10268,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l3',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l3',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -10101,7 +10289,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor production CT l3',
+    'original_name': 'Power factor production CT l3',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -10110,15 +10298,15 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_powerfactor_production_ct_l3-state]
+# name: test_sensor[envoy_eu_batt][sensor.envoy_1234_power_factor_production_ct_l3-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor production CT l3',
+      'friendly_name': 'Envoy 1234 Power factor production CT l3',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l3',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l3',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -10134,6 +10322,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10191,6 +10380,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10248,6 +10438,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10305,6 +10496,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10360,6 +10552,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10408,6 +10601,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10458,6 +10652,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10515,6 +10710,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10572,6 +10768,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10629,6 +10826,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10686,6 +10884,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10743,6 +10942,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10800,6 +11000,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10857,6 +11058,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10914,6 +11116,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10963,6 +11166,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11010,6 +11214,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11058,6 +11263,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11106,6 +11312,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11153,6 +11360,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11201,6 +11409,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11249,6 +11458,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11296,6 +11506,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11344,6 +11555,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11394,6 +11606,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11417,7 +11630,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER: 'power'>,
     'original_icon': None,
-    'original_name': 'balanced net power consumption',
+    'original_name': 'Balanced net power consumption',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -11430,7 +11643,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power',
-      'friendly_name': 'Envoy 1234 balanced net power consumption',
+      'friendly_name': 'Envoy 1234 Balanced net power consumption',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
     }),
@@ -11451,6 +11664,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11474,7 +11688,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER: 'power'>,
     'original_icon': None,
-    'original_name': 'balanced net power consumption l1',
+    'original_name': 'Balanced net power consumption l1',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -11487,7 +11701,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power',
-      'friendly_name': 'Envoy 1234 balanced net power consumption l1',
+      'friendly_name': 'Envoy 1234 Balanced net power consumption l1',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
     }),
@@ -11508,6 +11722,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11531,7 +11746,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER: 'power'>,
     'original_icon': None,
-    'original_name': 'balanced net power consumption l2',
+    'original_name': 'Balanced net power consumption l2',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -11544,7 +11759,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power',
-      'friendly_name': 'Envoy 1234 balanced net power consumption l2',
+      'friendly_name': 'Envoy 1234 Balanced net power consumption l2',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
     }),
@@ -11565,6 +11780,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11588,7 +11804,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER: 'power'>,
     'original_icon': None,
-    'original_name': 'balanced net power consumption l3',
+    'original_name': 'Balanced net power consumption l3',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -11601,7 +11817,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power',
-      'friendly_name': 'Envoy 1234 balanced net power consumption l3',
+      'friendly_name': 'Envoy 1234 Balanced net power consumption l3',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
     }),
@@ -11620,6 +11836,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11668,6 +11885,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11718,6 +11936,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11775,6 +11994,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11832,6 +12052,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11889,6 +12110,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11946,6 +12168,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12003,6 +12226,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12060,6 +12284,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12117,6 +12342,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12174,6 +12400,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12231,6 +12458,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12288,6 +12516,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12345,6 +12574,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12402,6 +12632,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12459,6 +12690,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12516,6 +12748,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12573,6 +12806,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12628,6 +12862,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12682,6 +12917,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12736,6 +12972,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12790,6 +13027,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12846,6 +13084,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12903,6 +13142,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12960,6 +13200,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13017,6 +13258,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13072,6 +13314,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13126,6 +13369,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13180,6 +13424,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13234,6 +13479,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13290,6 +13536,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13347,6 +13594,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13404,6 +13652,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13461,6 +13710,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13518,6 +13768,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13572,6 +13823,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13626,6 +13878,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13680,6 +13933,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13734,6 +13988,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13788,6 +14043,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13842,6 +14098,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13896,6 +14153,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13950,6 +14208,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14004,6 +14263,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14058,6 +14318,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14112,6 +14373,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14166,6 +14428,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14223,6 +14486,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14280,6 +14544,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14337,6 +14602,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14394,6 +14660,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14451,6 +14718,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14508,6 +14776,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14565,6 +14834,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14622,6 +14892,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14679,6 +14950,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14736,6 +15008,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14793,6 +15066,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14850,6 +15124,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14907,6 +15182,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14964,6 +15240,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15021,6 +15298,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15078,6 +15356,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15135,6 +15414,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15192,6 +15472,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15249,6 +15530,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15306,6 +15588,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15363,6 +15646,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15420,6 +15704,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15477,6 +15762,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15534,6 +15820,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15591,6 +15878,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15648,6 +15936,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15705,6 +15994,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15760,6 +16050,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15806,6 +16097,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15852,6 +16144,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15898,6 +16191,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15944,6 +16238,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15990,6 +16285,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16036,6 +16332,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16082,6 +16379,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16128,6 +16426,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16174,6 +16473,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16220,6 +16520,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16266,6 +16567,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16318,6 +16620,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16376,6 +16679,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16434,6 +16738,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16492,6 +16797,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16550,6 +16856,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16608,6 +16915,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16666,6 +16974,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16724,6 +17033,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16782,6 +17092,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16840,6 +17151,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16898,6 +17210,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16956,6 +17269,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -17010,6 +17324,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -17067,6 +17382,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -17124,6 +17440,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -17181,6 +17498,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -17229,7 +17547,7 @@
     'state': '0.3',
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_net_consumption_ct-entry]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_net_consumption_ct-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -17238,12 +17556,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -17258,7 +17577,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor net consumption CT',
+    'original_name': 'Power factor net consumption CT',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -17267,22 +17586,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_net_consumption_ct-state]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_net_consumption_ct-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor net consumption CT',
+      'friendly_name': 'Envoy 1234 Power factor net consumption CT',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.21',
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_net_consumption_ct_l1-entry]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_net_consumption_ct_l1-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -17291,12 +17610,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l1',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l1',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -17311,7 +17631,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor net consumption CT l1',
+    'original_name': 'Power factor net consumption CT l1',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -17320,22 +17640,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_net_consumption_ct_l1-state]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_net_consumption_ct_l1-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor net consumption CT l1',
+      'friendly_name': 'Envoy 1234 Power factor net consumption CT l1',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l1',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l1',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.22',
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_net_consumption_ct_l2-entry]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_net_consumption_ct_l2-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -17344,12 +17664,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l2',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l2',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -17364,7 +17685,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor net consumption CT l2',
+    'original_name': 'Power factor net consumption CT l2',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -17373,22 +17694,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_net_consumption_ct_l2-state]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_net_consumption_ct_l2-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor net consumption CT l2',
+      'friendly_name': 'Envoy 1234 Power factor net consumption CT l2',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l2',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l2',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.23',
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_net_consumption_ct_l3-entry]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_net_consumption_ct_l3-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -17397,12 +17718,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l3',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l3',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -17417,7 +17739,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor net consumption CT l3',
+    'original_name': 'Power factor net consumption CT l3',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -17426,22 +17748,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_net_consumption_ct_l3-state]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_net_consumption_ct_l3-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor net consumption CT l3',
+      'friendly_name': 'Envoy 1234 Power factor net consumption CT l3',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l3',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l3',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.24',
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_production_ct-entry]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_production_ct-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -17450,12 +17772,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -17470,7 +17793,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'powerfactor production CT',
+    'original_name': 'Power factor production CT',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -17479,22 +17802,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_production_ct-state]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_production_ct-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 powerfactor production CT',
+      'friendly_name': 'Envoy 1234 Power factor production CT',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.11',
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_production_ct_l1-entry]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_production_ct_l1-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -17503,12 +17826,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l1',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l1',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -17523,7 +17847,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor production CT l1',
+    'original_name': 'Power factor production CT l1',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -17532,22 +17856,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_production_ct_l1-state]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_production_ct_l1-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor production CT l1',
+      'friendly_name': 'Envoy 1234 Power factor production CT l1',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l1',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l1',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.12',
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_production_ct_l2-entry]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_production_ct_l2-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -17556,12 +17880,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l2',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l2',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -17576,7 +17901,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor production CT l2',
+    'original_name': 'Power factor production CT l2',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -17585,22 +17910,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_production_ct_l2-state]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_production_ct_l2-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor production CT l2',
+      'friendly_name': 'Envoy 1234 Power factor production CT l2',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l2',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l2',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.13',
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_production_ct_l3-entry]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_production_ct_l3-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -17609,12 +17934,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l3',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l3',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -17629,7 +17955,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor production CT l3',
+    'original_name': 'Power factor production CT l3',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -17638,22 +17964,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_production_ct_l3-state]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_production_ct_l3-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor production CT l3',
+      'friendly_name': 'Envoy 1234 Power factor production CT l3',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l3',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l3',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.14',
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_storage_ct-entry]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_storage_ct-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -17662,12 +17988,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_storage_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_storage_ct',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -17682,7 +18009,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor storage CT',
+    'original_name': 'Power factor storage CT',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -17691,22 +18018,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_storage_ct-state]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_storage_ct-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor storage CT',
+      'friendly_name': 'Envoy 1234 Power factor storage CT',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_storage_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_storage_ct',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.23',
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_storage_ct_l1-entry]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_storage_ct_l1-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -17715,12 +18042,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_storage_ct_l1',
+    'entity_id': 'sensor.envoy_1234_power_factor_storage_ct_l1',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -17735,7 +18063,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor storage CT l1',
+    'original_name': 'Power factor storage CT l1',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -17744,22 +18072,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_storage_ct_l1-state]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_storage_ct_l1-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor storage CT l1',
+      'friendly_name': 'Envoy 1234 Power factor storage CT l1',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_storage_ct_l1',
+    'entity_id': 'sensor.envoy_1234_power_factor_storage_ct_l1',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.32',
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_storage_ct_l2-entry]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_storage_ct_l2-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -17768,12 +18096,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_storage_ct_l2',
+    'entity_id': 'sensor.envoy_1234_power_factor_storage_ct_l2',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -17788,7 +18117,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor storage CT l2',
+    'original_name': 'Power factor storage CT l2',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -17797,22 +18126,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_storage_ct_l2-state]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_storage_ct_l2-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor storage CT l2',
+      'friendly_name': 'Envoy 1234 Power factor storage CT l2',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_storage_ct_l2',
+    'entity_id': 'sensor.envoy_1234_power_factor_storage_ct_l2',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.23',
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_storage_ct_l3-entry]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_storage_ct_l3-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -17821,12 +18150,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_storage_ct_l3',
+    'entity_id': 'sensor.envoy_1234_power_factor_storage_ct_l3',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -17841,7 +18171,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor storage CT l3',
+    'original_name': 'Power factor storage CT l3',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -17850,15 +18180,15 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_powerfactor_storage_ct_l3-state]
+# name: test_sensor[envoy_metered_batt_relay][sensor.envoy_1234_power_factor_storage_ct_l3-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor storage CT l3',
+      'friendly_name': 'Envoy 1234 Power factor storage CT l3',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_storage_ct_l3',
+    'entity_id': 'sensor.envoy_1234_power_factor_storage_ct_l3',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -17874,6 +18204,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -17931,6 +18262,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -17988,6 +18320,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18045,6 +18378,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18100,6 +18434,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18148,6 +18483,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18198,6 +18534,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18255,6 +18592,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18312,6 +18650,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18369,6 +18708,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18426,6 +18766,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18483,6 +18824,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18540,6 +18882,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18597,6 +18940,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18654,6 +18998,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18711,6 +19056,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18768,6 +19114,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18825,6 +19172,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18882,6 +19230,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18939,6 +19288,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18996,6 +19346,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -19053,6 +19404,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -19110,6 +19462,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -19159,6 +19512,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -19208,6 +19562,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -19231,7 +19586,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER: 'power'>,
     'original_icon': None,
-    'original_name': 'balanced net power consumption',
+    'original_name': 'Balanced net power consumption',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -19244,7 +19599,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power',
-      'friendly_name': 'Envoy 1234 balanced net power consumption',
+      'friendly_name': 'Envoy 1234 Balanced net power consumption',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
     }),
@@ -19265,6 +19620,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -19288,7 +19644,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER: 'power'>,
     'original_icon': None,
-    'original_name': 'balanced net power consumption l1',
+    'original_name': 'Balanced net power consumption l1',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -19301,7 +19657,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power',
-      'friendly_name': 'Envoy 1234 balanced net power consumption l1',
+      'friendly_name': 'Envoy 1234 Balanced net power consumption l1',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
     }),
@@ -19322,6 +19678,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -19345,7 +19702,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER: 'power'>,
     'original_icon': None,
-    'original_name': 'balanced net power consumption l2',
+    'original_name': 'Balanced net power consumption l2',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -19358,7 +19715,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power',
-      'friendly_name': 'Envoy 1234 balanced net power consumption l2',
+      'friendly_name': 'Envoy 1234 Balanced net power consumption l2',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
     }),
@@ -19379,6 +19736,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -19402,7 +19760,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER: 'power'>,
     'original_icon': None,
-    'original_name': 'balanced net power consumption l3',
+    'original_name': 'Balanced net power consumption l3',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -19415,7 +19773,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power',
-      'friendly_name': 'Envoy 1234 balanced net power consumption l3',
+      'friendly_name': 'Envoy 1234 Balanced net power consumption l3',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
     }),
@@ -19436,6 +19794,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -19493,6 +19852,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -19550,6 +19910,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -19607,6 +19968,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -19664,6 +20026,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -19721,6 +20084,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -19778,6 +20142,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -19835,6 +20200,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -19892,6 +20258,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -19949,6 +20316,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -20006,6 +20374,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -20063,6 +20432,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -20118,6 +20488,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -20172,6 +20543,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -20226,6 +20598,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -20280,6 +20653,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -20336,6 +20710,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -20393,6 +20768,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -20450,6 +20826,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -20507,6 +20884,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -20562,6 +20940,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -20616,6 +20995,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -20670,6 +21050,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -20724,6 +21105,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -20780,6 +21162,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -20837,6 +21220,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -20894,6 +21278,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -20951,6 +21336,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -21008,6 +21394,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -21062,6 +21449,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -21116,6 +21504,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -21170,6 +21559,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -21224,6 +21614,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -21278,6 +21669,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -21332,6 +21724,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -21386,6 +21779,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -21440,6 +21834,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -21497,6 +21892,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -21554,6 +21950,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -21611,6 +22008,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -21668,6 +22066,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -21725,6 +22124,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -21782,6 +22182,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -21839,6 +22240,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -21896,6 +22298,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -21953,6 +22356,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -22010,6 +22414,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -22067,6 +22472,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -22124,6 +22530,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -22181,6 +22588,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -22238,6 +22646,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -22295,6 +22704,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -22352,6 +22762,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -22409,6 +22820,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -22466,6 +22878,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -22523,6 +22936,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -22578,6 +22992,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -22624,6 +23039,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -22670,6 +23086,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -22716,6 +23133,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -22762,6 +23180,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -22808,6 +23227,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -22854,6 +23274,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -22900,6 +23321,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -22952,6 +23374,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -23010,6 +23433,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -23068,6 +23492,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -23126,6 +23551,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -23184,6 +23610,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -23242,6 +23669,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -23300,6 +23728,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -23358,6 +23787,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -23412,6 +23842,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -23469,6 +23900,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -23526,6 +23958,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -23583,6 +24016,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -23631,7 +24065,7 @@
     'state': '0.3',
   })
 # ---
-# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_powerfactor_net_consumption_ct-entry]
+# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_power_factor_net_consumption_ct-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -23640,12 +24074,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -23660,7 +24095,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor net consumption CT',
+    'original_name': 'Power factor net consumption CT',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -23669,22 +24104,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_powerfactor_net_consumption_ct-state]
+# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_power_factor_net_consumption_ct-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor net consumption CT',
+      'friendly_name': 'Envoy 1234 Power factor net consumption CT',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.21',
   })
 # ---
-# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_powerfactor_net_consumption_ct_l1-entry]
+# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_power_factor_net_consumption_ct_l1-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -23693,12 +24128,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l1',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l1',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -23713,7 +24149,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor net consumption CT l1',
+    'original_name': 'Power factor net consumption CT l1',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -23722,22 +24158,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_powerfactor_net_consumption_ct_l1-state]
+# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_power_factor_net_consumption_ct_l1-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor net consumption CT l1',
+      'friendly_name': 'Envoy 1234 Power factor net consumption CT l1',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l1',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l1',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.22',
   })
 # ---
-# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_powerfactor_net_consumption_ct_l2-entry]
+# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_power_factor_net_consumption_ct_l2-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -23746,12 +24182,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l2',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l2',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -23766,7 +24203,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor net consumption CT l2',
+    'original_name': 'Power factor net consumption CT l2',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -23775,22 +24212,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_powerfactor_net_consumption_ct_l2-state]
+# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_power_factor_net_consumption_ct_l2-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor net consumption CT l2',
+      'friendly_name': 'Envoy 1234 Power factor net consumption CT l2',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l2',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l2',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.23',
   })
 # ---
-# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_powerfactor_net_consumption_ct_l3-entry]
+# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_power_factor_net_consumption_ct_l3-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -23799,12 +24236,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l3',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l3',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -23819,7 +24257,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor net consumption CT l3',
+    'original_name': 'Power factor net consumption CT l3',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -23828,22 +24266,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_powerfactor_net_consumption_ct_l3-state]
+# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_power_factor_net_consumption_ct_l3-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor net consumption CT l3',
+      'friendly_name': 'Envoy 1234 Power factor net consumption CT l3',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_net_consumption_ct_l3',
+    'entity_id': 'sensor.envoy_1234_power_factor_net_consumption_ct_l3',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.24',
   })
 # ---
-# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_powerfactor_production_ct-entry]
+# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_power_factor_production_ct-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -23852,12 +24290,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -23872,7 +24311,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'powerfactor production CT',
+    'original_name': 'Power factor production CT',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -23881,22 +24320,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_powerfactor_production_ct-state]
+# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_power_factor_production_ct-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 powerfactor production CT',
+      'friendly_name': 'Envoy 1234 Power factor production CT',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.11',
   })
 # ---
-# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_powerfactor_production_ct_l1-entry]
+# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_power_factor_production_ct_l1-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -23905,12 +24344,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l1',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l1',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -23925,7 +24365,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor production CT l1',
+    'original_name': 'Power factor production CT l1',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -23934,22 +24374,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_powerfactor_production_ct_l1-state]
+# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_power_factor_production_ct_l1-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor production CT l1',
+      'friendly_name': 'Envoy 1234 Power factor production CT l1',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l1',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l1',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.12',
   })
 # ---
-# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_powerfactor_production_ct_l2-entry]
+# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_power_factor_production_ct_l2-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -23958,12 +24398,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l2',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l2',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -23978,7 +24419,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor production CT l2',
+    'original_name': 'Power factor production CT l2',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -23987,22 +24428,22 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_powerfactor_production_ct_l2-state]
+# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_power_factor_production_ct_l2-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor production CT l2',
+      'friendly_name': 'Envoy 1234 Power factor production CT l2',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l2',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l2',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.13',
   })
 # ---
-# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_powerfactor_production_ct_l3-entry]
+# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_power_factor_production_ct_l3-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -24011,12 +24452,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l3',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l3',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -24031,7 +24473,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'Powerfactor production CT l3',
+    'original_name': 'Power factor production CT l3',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -24040,15 +24482,15 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_powerfactor_production_ct_l3-state]
+# name: test_sensor[envoy_nobatt_metered_3p][sensor.envoy_1234_power_factor_production_ct_l3-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 Powerfactor production CT l3',
+      'friendly_name': 'Envoy 1234 Power factor production CT l3',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct_l3',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct_l3',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -24064,6 +24506,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -24121,6 +24564,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -24178,6 +24622,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -24235,6 +24680,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -24292,6 +24738,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -24349,6 +24796,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -24406,6 +24854,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -24463,6 +24912,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -24520,6 +24970,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -24577,6 +25028,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -24634,6 +25086,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -24691,6 +25144,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -24748,6 +25202,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -24797,6 +25252,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -24846,6 +25302,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -24869,7 +25326,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER: 'power'>,
     'original_icon': None,
-    'original_name': 'balanced net power consumption',
+    'original_name': 'Balanced net power consumption',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -24882,7 +25339,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power',
-      'friendly_name': 'Envoy 1234 balanced net power consumption',
+      'friendly_name': 'Envoy 1234 Balanced net power consumption',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
     }),
@@ -24903,6 +25360,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -24958,6 +25416,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -25014,6 +25473,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -25071,6 +25531,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -25125,6 +25586,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -25182,6 +25644,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -25237,6 +25700,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -25289,6 +25753,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -25334,7 +25799,7 @@
     'state': 'normal',
   })
 # ---
-# name: test_sensor[envoy_tot_cons_metered][sensor.envoy_1234_powerfactor_production_ct-entry]
+# name: test_sensor[envoy_tot_cons_metered][sensor.envoy_1234_power_factor_production_ct-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -25343,12 +25808,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -25363,7 +25829,7 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER_FACTOR: 'power_factor'>,
     'original_icon': None,
-    'original_name': 'powerfactor production CT',
+    'original_name': 'Power factor production CT',
     'platform': 'enphase_envoy',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -25372,15 +25838,15 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[envoy_tot_cons_metered][sensor.envoy_1234_powerfactor_production_ct-state]
+# name: test_sensor[envoy_tot_cons_metered][sensor.envoy_1234_power_factor_production_ct-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power_factor',
-      'friendly_name': 'Envoy 1234 powerfactor production CT',
+      'friendly_name': 'Envoy 1234 Power factor production CT',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.envoy_1234_powerfactor_production_ct',
+    'entity_id': 'sensor.envoy_1234_power_factor_production_ct',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -25396,6 +25862,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -25453,6 +25920,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -25510,6 +25978,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -25559,6 +26028,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/enphase_envoy/snapshots/test_switch.ambr b/tests/components/enphase_envoy/snapshots/test_switch.ambr
index a022e476d5c..77b682cb948 100644
--- a/tests/components/enphase_envoy/snapshots/test_switch.ambr
+++ b/tests/components/enphase_envoy/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -190,6 +194,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +241,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/enphase_envoy/test_config_flow.py b/tests/components/enphase_envoy/test_config_flow.py
index a3da14b3835..efbe6da9b13 100644
--- a/tests/components/enphase_envoy/test_config_flow.py
+++ b/tests/components/enphase_envoy/test_config_flow.py
@@ -439,7 +439,7 @@ async def test_zero_conf_old_blank_entry(
     mock_setup_entry: AsyncMock,
     mock_envoy: AsyncMock,
 ) -> None:
-    """Test re-using old blank entry."""
+    """Test reusing old blank entry."""
     entry = MockConfigEntry(
         domain=DOMAIN,
         data={
@@ -478,7 +478,7 @@ async def test_zero_conf_old_blank_entry_standard_title(
     mock_setup_entry: AsyncMock,
     mock_envoy: AsyncMock,
 ) -> None:
-    """Test re-using old blank entry was Envoy as title."""
+    """Test reusing old blank entry was Envoy as title."""
     entry = MockConfigEntry(
         domain=DOMAIN,
         data={
@@ -519,7 +519,7 @@ async def test_zero_conf_old_blank_entry_user_title(
     mock_setup_entry: AsyncMock,
     mock_envoy: AsyncMock,
 ) -> None:
-    """Test re-using old blank entry with user title."""
+    """Test reusing old blank entry with user title."""
     entry = MockConfigEntry(
         domain=DOMAIN,
         data={
diff --git a/tests/components/enphase_envoy/test_init.py b/tests/components/enphase_envoy/test_init.py
index 620bd654aca..93a150cfc5c 100644
--- a/tests/components/enphase_envoy/test_init.py
+++ b/tests/components/enphase_envoy/test_init.py
@@ -52,8 +52,6 @@ async def test_with_pre_v7_firmware(
     )
     await setup_integration(hass, config_entry)
 
-    assert config_entry.state is ConfigEntryState.LOADED
-
     assert (entity_state := hass.states.get("sensor.inverter_1"))
     assert entity_state.state == "1"
 
@@ -84,8 +82,6 @@ async def test_token_in_config_file(
     )
     mock_envoy.auth = EnvoyTokenAuth("127.0.0.1", token=token, envoy_serial="1234")
     await setup_integration(hass, entry)
-    await hass.async_block_till_done(wait_background_tasks=True)
-    assert entry.state is ConfigEntryState.LOADED
 
     assert (entity_state := hass.states.get("sensor.inverter_1"))
     assert entity_state.state == "1"
@@ -129,8 +125,6 @@ async def test_expired_token_in_config(
         cloud_password="test_password",
     )
     await setup_integration(hass, entry)
-    await hass.async_block_till_done(wait_background_tasks=True)
-    assert entry.state is ConfigEntryState.LOADED
 
     assert (entity_state := hass.states.get("sensor.inverter_1"))
     assert entity_state.state == "1"
@@ -230,9 +224,6 @@ async def test_coordinator_token_refresh_error(
     ):
         await setup_integration(hass, entry)
 
-    await hass.async_block_till_done(wait_background_tasks=True)
-    assert entry.state is ConfigEntryState.LOADED
-
     assert (entity_state := hass.states.get("sensor.inverter_1"))
     assert entity_state.state == "1"
 
@@ -255,7 +246,6 @@ async def test_config_no_unique_id(
         },
     )
     await setup_integration(hass, entry)
-    assert entry.state is ConfigEntryState.LOADED
     assert entry.unique_id == mock_envoy.serial_number
 
 
@@ -276,8 +266,7 @@ async def test_config_different_unique_id(
             CONF_PASSWORD: "test-password",
         },
     )
-    await setup_integration(hass, entry)
-    assert entry.state is ConfigEntryState.SETUP_RETRY
+    await setup_integration(hass, entry, expected_state=ConfigEntryState.SETUP_RETRY)
 
 
 @pytest.mark.parametrize(
@@ -298,7 +287,6 @@ async def test_remove_config_entry_device(
     """Test removing enphase_envoy config entry device."""
     assert await async_setup_component(hass, "config", {})
     await setup_integration(hass, config_entry)
-    assert config_entry.state is ConfigEntryState.LOADED
 
     # use client to send remove_device command
     hass_client = await hass_ws_client(hass)
@@ -349,8 +337,6 @@ async def test_option_change_reload(
 ) -> None:
     """Test options change will reload entity."""
     await setup_integration(hass, config_entry)
-    await hass.async_block_till_done(wait_background_tasks=True)
-    assert config_entry.state is ConfigEntryState.LOADED
     # By default neither option is available
     assert config_entry.options == {}
 
@@ -403,8 +389,6 @@ async def test_coordinator_firmware_refresh(
 ) -> None:
     """Test coordinator scheduled firmware check."""
     await setup_integration(hass, config_entry)
-    await hass.async_block_till_done(wait_background_tasks=True)
-    assert config_entry.state is ConfigEntryState.LOADED
 
     # Move time to next firmware check moment
     # SCAN_INTERVAL is patched to 1 day to disable it's firmware detection
@@ -447,8 +431,6 @@ async def test_coordinator_firmware_refresh_with_envoy_error(
 ) -> None:
     """Test coordinator scheduled firmware check."""
     await setup_integration(hass, config_entry)
-    await hass.async_block_till_done(wait_background_tasks=True)
-    assert config_entry.state is ConfigEntryState.LOADED
 
     caplog.set_level(logging.DEBUG)
     logging.getLogger("homeassistant.components.enphase_envoy.coordinator").setLevel(
diff --git a/tests/components/enphase_envoy/test_number.py b/tests/components/enphase_envoy/test_number.py
index dbf711cacaa..07826174c7d 100644
--- a/tests/components/enphase_envoy/test_number.py
+++ b/tests/components/enphase_envoy/test_number.py
@@ -2,6 +2,7 @@
 
 from unittest.mock import AsyncMock, patch
 
+from pyenphase.exceptions import EnvoyError
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
@@ -13,6 +14,7 @@ from homeassistant.components.number import (
 )
 from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
 
 from . import setup_integration
@@ -21,9 +23,9 @@ from tests.common import MockConfigEntry, snapshot_platform
 
 
 @pytest.mark.parametrize(
-    ("mock_envoy"),
+    "mock_envoy",
     ["envoy_metered_batt_relay", "envoy_eu_batt"],
-    indirect=["mock_envoy"],
+    indirect=True,
 )
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
 async def test_number(
@@ -40,14 +42,14 @@ async def test_number(
 
 
 @pytest.mark.parametrize(
-    ("mock_envoy"),
+    "mock_envoy",
     [
         "envoy",
         "envoy_1p_metered",
         "envoy_nobatt_metered_3p",
         "envoy_tot_cons_metered",
     ],
-    indirect=["mock_envoy"],
+    indirect=True,
 )
 async def test_no_number(
     hass: HomeAssistant,
@@ -62,10 +64,10 @@ async def test_no_number(
 
 
 @pytest.mark.parametrize(
-    ("mock_envoy", "use_serial"),
+    ("mock_envoy", "use_serial", "expected_value", "test_value"),
     [
-        ("envoy_metered_batt_relay", "enpower_654321"),
-        ("envoy_eu_batt", "envoy_1234"),
+        ("envoy_metered_batt_relay", "enpower_654321", 15.0, 30.0),
+        ("envoy_eu_batt", "envoy_1234", 0.0, 80.0),
     ],
     indirect=["mock_envoy"],
 )
@@ -74,6 +76,8 @@ async def test_number_operation_storage(
     mock_envoy: AsyncMock,
     config_entry: MockConfigEntry,
     use_serial: bool,
+    expected_value: float,
+    test_value: float,
 ) -> None:
     """Test enphase_envoy number storage entities operation."""
     with patch("homeassistant.components.enphase_envoy.PLATFORMS", [Platform.NUMBER]):
@@ -82,10 +86,8 @@ async def test_number_operation_storage(
     test_entity = f"{Platform.NUMBER}.{use_serial}_reserve_battery_level"
 
     assert (entity_state := hass.states.get(test_entity))
-    assert mock_envoy.data.tariff.storage_settings.reserved_soc == float(
-        entity_state.state
-    )
-    test_value = 30.0
+    assert float(entity_state.state) == expected_value
+
     await hass.services.async_call(
         NUMBER_DOMAIN,
         SERVICE_SET_VALUE,
@@ -100,29 +102,120 @@ async def test_number_operation_storage(
 
 
 @pytest.mark.parametrize(
-    ("mock_envoy"), ["envoy_metered_batt_relay"], indirect=["mock_envoy"]
+    ("mock_envoy", "use_serial", "target", "test_value"),
+    [
+        ("envoy_metered_batt_relay", "enpower_654321", "reserve_battery_level", 30.0),
+    ],
+    indirect=["mock_envoy"],
+)
+async def test_number_operation_storage_with_error(
+    hass: HomeAssistant,
+    mock_envoy: AsyncMock,
+    config_entry: MockConfigEntry,
+    use_serial: bool,
+    target: str,
+    test_value: float,
+) -> None:
+    """Test enphase_envoy number storage entities operation."""
+    with patch("homeassistant.components.enphase_envoy.PLATFORMS", [Platform.NUMBER]):
+        await setup_integration(hass, config_entry)
+
+    test_entity = f"number.{use_serial}_{target}"
+
+    mock_envoy.set_reserve_soc.side_effect = EnvoyError("Test")
+    with pytest.raises(
+        HomeAssistantError,
+        match=f"Failed to execute async_set_native_value for {test_entity}, host",
+    ):
+        await hass.services.async_call(
+            NUMBER_DOMAIN,
+            SERVICE_SET_VALUE,
+            {
+                ATTR_ENTITY_ID: test_entity,
+                ATTR_VALUE: test_value,
+            },
+            blocking=True,
+        )
+
+
+@pytest.mark.parametrize("mock_envoy", ["envoy_metered_batt_relay"], indirect=True)
+@pytest.mark.parametrize(
+    ("relay", "target", "expected_value", "test_value", "test_field"),
+    [
+        ("NC1", "cutoff_battery_level", 25.0, 15.0, "soc_low"),
+        ("NC1", "restore_battery_level", 70.0, 75.0, "soc_high"),
+        ("NC2", "cutoff_battery_level", 30.0, 25.0, "soc_low"),
+        ("NC2", "restore_battery_level", 70.0, 80.0, "soc_high"),
+        ("NC3", "cutoff_battery_level", 30.0, 45.0, "soc_low"),
+        ("NC3", "restore_battery_level", 70.0, 90.0, "soc_high"),
+    ],
 )
 async def test_number_operation_relays(
     hass: HomeAssistant,
     mock_envoy: AsyncMock,
     config_entry: MockConfigEntry,
+    relay: str,
+    target: str,
+    expected_value: float,
+    test_value: float,
+    test_field: str,
 ) -> None:
     """Test enphase_envoy number relay entities operation."""
     with patch("homeassistant.components.enphase_envoy.PLATFORMS", [Platform.NUMBER]):
         await setup_integration(hass, config_entry)
 
-    entity_base = f"{Platform.NUMBER}."
+    assert (dry_contact := mock_envoy.data.dry_contact_settings[relay])
+    assert (name := dry_contact.load_name.lower().replace(" ", "_"))
 
-    for counter, (contact_id, dry_contact) in enumerate(
-        mock_envoy.data.dry_contact_settings.items()
+    test_entity = f"number.{name}_{target}"
+
+    assert (entity_state := hass.states.get(test_entity))
+    assert float(entity_state.state) == expected_value
+
+    await hass.services.async_call(
+        NUMBER_DOMAIN,
+        SERVICE_SET_VALUE,
+        {
+            ATTR_ENTITY_ID: test_entity,
+            ATTR_VALUE: test_value,
+        },
+        blocking=True,
+    )
+
+    mock_envoy.update_dry_contact.assert_awaited_once_with(
+        {"id": relay, test_field: int(test_value)}
+    )
+
+
+@pytest.mark.parametrize(
+    ("mock_envoy", "relay", "target", "test_value"),
+    [
+        ("envoy_metered_batt_relay", "NC1", "cutoff_battery_level", 15.0),
+    ],
+    indirect=["mock_envoy"],
+)
+async def test_number_operation_relays_with_error(
+    hass: HomeAssistant,
+    mock_envoy: AsyncMock,
+    config_entry: MockConfigEntry,
+    relay: str,
+    target: str,
+    test_value: float,
+) -> None:
+    """Test enphase_envoy number relay entities operation with error returned."""
+    with patch("homeassistant.components.enphase_envoy.PLATFORMS", [Platform.NUMBER]):
+        await setup_integration(hass, config_entry)
+
+    assert (dry_contact := mock_envoy.data.dry_contact_settings[relay])
+    assert (name := dry_contact.load_name.lower().replace(" ", "_"))
+
+    test_entity = f"number.{name}_{target}"
+
+    mock_envoy.update_dry_contact.side_effect = EnvoyError("Test")
+    with pytest.raises(
+        HomeAssistantError,
+        match=f"Failed to execute async_set_native_value for {test_entity}, host",
     ):
-        name = dry_contact.load_name.lower().replace(" ", "_")
-        test_entity = f"{entity_base}{name}_cutoff_battery_level"
-        assert (entity_state := hass.states.get(test_entity))
-        assert mock_envoy.data.dry_contact_settings[contact_id].soc_low == float(
-            entity_state.state
-        )
-        test_value = 10.0 + counter
         await hass.services.async_call(
             NUMBER_DOMAIN,
             SERVICE_SET_VALUE,
@@ -132,29 +225,3 @@ async def test_number_operation_relays(
             },
             blocking=True,
         )
-
-        mock_envoy.update_dry_contact.assert_awaited_once_with(
-            {"id": contact_id, "soc_low": test_value}
-        )
-        mock_envoy.update_dry_contact.reset_mock()
-
-        test_entity = f"{entity_base}{name}_restore_battery_level"
-        assert (entity_state := hass.states.get(test_entity))
-        assert mock_envoy.data.dry_contact_settings[contact_id].soc_high == float(
-            entity_state.state
-        )
-        test_value = 80.0 - counter
-        await hass.services.async_call(
-            NUMBER_DOMAIN,
-            SERVICE_SET_VALUE,
-            {
-                ATTR_ENTITY_ID: test_entity,
-                ATTR_VALUE: test_value,
-            },
-            blocking=True,
-        )
-
-        mock_envoy.update_dry_contact.assert_awaited_once_with(
-            {"id": contact_id, "soc_high": test_value}
-        )
-        mock_envoy.update_dry_contact.reset_mock()
diff --git a/tests/components/enphase_envoy/test_select.py b/tests/components/enphase_envoy/test_select.py
index 9b3a63d1e23..a81a06a3441 100644
--- a/tests/components/enphase_envoy/test_select.py
+++ b/tests/components/enphase_envoy/test_select.py
@@ -2,24 +2,23 @@
 
 from unittest.mock import AsyncMock, patch
 
+from pyenphase.exceptions import EnvoyError
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components.enphase_envoy.const import Platform
 from homeassistant.components.enphase_envoy.select import (
-    ACTION_OPTIONS,
-    MODE_OPTIONS,
     RELAY_ACTION_MAP,
     RELAY_MODE_MAP,
     REVERSE_RELAY_ACTION_MAP,
     REVERSE_RELAY_MODE_MAP,
     REVERSE_STORAGE_MODE_MAP,
     STORAGE_MODE_MAP,
-    STORAGE_MODE_OPTIONS,
 )
 from homeassistant.components.select import ATTR_OPTION, DOMAIN as SELECT_DOMAIN
 from homeassistant.const import ATTR_ENTITY_ID, SERVICE_SELECT_OPTION
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
 
 from . import setup_integration
@@ -28,9 +27,9 @@ from tests.common import MockConfigEntry, snapshot_platform
 
 
 @pytest.mark.parametrize(
-    ("mock_envoy"),
+    "mock_envoy",
     ["envoy_metered_batt_relay", "envoy_eu_batt"],
-    indirect=["mock_envoy"],
+    indirect=True,
 )
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
 async def test_select(
@@ -47,14 +46,14 @@ async def test_select(
 
 
 @pytest.mark.parametrize(
-    ("mock_envoy"),
+    "mock_envoy",
     [
         "envoy",
         "envoy_1p_metered",
         "envoy_nobatt_metered_3p",
         "envoy_tot_cons_metered",
     ],
-    indirect=["mock_envoy"],
+    indirect=True,
 )
 async def test_no_select(
     hass: HomeAssistant,
@@ -68,13 +67,31 @@ async def test_no_select(
     assert not er.async_entries_for_config_entry(entity_registry, config_entry.entry_id)
 
 
+@pytest.mark.parametrize("mock_envoy", ["envoy_metered_batt_relay"], indirect=True)
 @pytest.mark.parametrize(
-    ("mock_envoy"), ["envoy_metered_batt_relay"], indirect=["mock_envoy"]
+    ("relay", "target", "expected_state", "call_parameter"),
+    [
+        ("NC1", "generator_action", "shed", "generator_action"),
+        ("NC1", "microgrid_action", "shed", "micro_grid_action"),
+        ("NC1", "grid_action", "shed", "grid_action"),
+        ("NC2", "generator_action", "shed", "generator_action"),
+        ("NC2", "microgrid_action", "shed", "micro_grid_action"),
+        ("NC2", "grid_action", "apply", "grid_action"),
+        ("NC3", "generator_action", "apply", "generator_action"),
+        ("NC3", "microgrid_action", "apply", "micro_grid_action"),
+        ("NC3", "grid_action", "shed", "grid_action"),
+    ],
 )
+@pytest.mark.parametrize("action", ["powered", "not_powered", "schedule", "none"])
 async def test_select_relay_actions(
     hass: HomeAssistant,
     mock_envoy: AsyncMock,
     config_entry: MockConfigEntry,
+    target: str,
+    expected_state: str,
+    call_parameter: str,
+    relay: str,
+    action: str,
 ) -> None:
     """Test select platform entities dry contact relay actions."""
     with patch("homeassistant.components.enphase_envoy.PLATFORMS", [Platform.SELECT]):
@@ -82,54 +99,37 @@ async def test_select_relay_actions(
 
     entity_base = f"{Platform.SELECT}."
 
-    for contact_id, dry_contact in mock_envoy.data.dry_contact_settings.items():
-        name = dry_contact.load_name.lower().replace(" ", "_")
-        for target in (
-            ("generator_action", dry_contact.generator_action, "generator_action"),
-            ("microgrid_action", dry_contact.micro_grid_action, "micro_grid_action"),
-            ("grid_action", dry_contact.grid_action, "grid_action"),
-        ):
-            test_entity = f"{entity_base}{name}_{target[0]}"
-            assert (entity_state := hass.states.get(test_entity))
-            assert RELAY_ACTION_MAP[target[1]] == (current_state := entity_state.state)
-            # set all relay modes except current mode
-            for action in [action for action in ACTION_OPTIONS if not current_state]:
-                await hass.services.async_call(
-                    SELECT_DOMAIN,
-                    SERVICE_SELECT_OPTION,
-                    {
-                        ATTR_ENTITY_ID: test_entity,
-                        ATTR_OPTION: action,
-                    },
-                    blocking=True,
-                )
-                mock_envoy.update_dry_contact.assert_called_once_with(
-                    {"id": contact_id, target[2]: REVERSE_RELAY_ACTION_MAP[action]}
-                )
-                mock_envoy.update_dry_contact.reset_mock()
-            # and finally back to original
-            await hass.services.async_call(
-                SELECT_DOMAIN,
-                SERVICE_SELECT_OPTION,
-                {
-                    ATTR_ENTITY_ID: test_entity,
-                    ATTR_OPTION: current_state,
-                },
-                blocking=True,
-            )
-            mock_envoy.update_dry_contact.assert_called_once_with(
-                {"id": contact_id, target[2]: REVERSE_RELAY_ACTION_MAP[current_state]}
-            )
-            mock_envoy.update_dry_contact.reset_mock()
+    assert (dry_contact := mock_envoy.data.dry_contact_settings[relay])
+    assert (name := dry_contact.load_name.lower().replace(" ", "_"))
+
+    test_entity = f"{entity_base}{name}_{target}"
+
+    assert (entity_state := hass.states.get(test_entity))
+    assert entity_state.state == RELAY_ACTION_MAP[expected_state]
+
+    await hass.services.async_call(
+        SELECT_DOMAIN,
+        SERVICE_SELECT_OPTION,
+        {
+            ATTR_ENTITY_ID: test_entity,
+            ATTR_OPTION: action,
+        },
+        blocking=True,
+    )
+    mock_envoy.update_dry_contact.assert_called_once_with(
+        {"id": relay, call_parameter: REVERSE_RELAY_ACTION_MAP[action]}
+    )
 
 
-@pytest.mark.parametrize(
-    ("mock_envoy"), ["envoy_metered_batt_relay"], indirect=["mock_envoy"]
-)
+@pytest.mark.parametrize("mock_envoy", ["envoy_metered_batt_relay"], indirect=True)
+@pytest.mark.parametrize("relay_mode", ["battery", "standard"])
+@pytest.mark.parametrize("relay", ["NC1", "NC2", "NC3"])
 async def test_select_relay_modes(
     hass: HomeAssistant,
     mock_envoy: AsyncMock,
     config_entry: MockConfigEntry,
+    relay_mode: str,
+    relay: str,
 ) -> None:
     """Test select platform dry contact relay mode changes."""
     with patch("homeassistant.components.enphase_envoy.PLATFORMS", [Platform.SELECT]):
@@ -137,40 +137,66 @@ async def test_select_relay_modes(
 
     entity_base = f"{Platform.SELECT}."
 
-    for contact_id, dry_contact in mock_envoy.data.dry_contact_settings.items():
-        name = dry_contact.load_name.lower().replace(" ", "_")
-        test_entity = f"{entity_base}{name}_mode"
-        assert (entity_state := hass.states.get(test_entity))
-        assert RELAY_MODE_MAP[dry_contact.mode] == (current_state := entity_state.state)
-        for mode in [mode for mode in MODE_OPTIONS if not current_state]:
-            await hass.services.async_call(
-                SELECT_DOMAIN,
-                SERVICE_SELECT_OPTION,
-                {
-                    ATTR_ENTITY_ID: test_entity,
-                    ATTR_OPTION: mode,
-                },
-                blocking=True,
-            )
-            mock_envoy.update_dry_contact.assert_called_once_with(
-                {"id": contact_id, "mode": REVERSE_RELAY_MODE_MAP[mode]}
-            )
-            mock_envoy.update_dry_contact.reset_mock()
+    assert (dry_contact := mock_envoy.data.dry_contact_settings[relay])
+    assert (name := dry_contact.load_name.lower().replace(" ", "_"))
 
-        # and finally current mode again
+    test_entity = f"{entity_base}{name}_mode"
+
+    assert (entity_state := hass.states.get(test_entity))
+    assert entity_state.state == RELAY_MODE_MAP[dry_contact.mode]
+
+    await hass.services.async_call(
+        SELECT_DOMAIN,
+        SERVICE_SELECT_OPTION,
+        {
+            ATTR_ENTITY_ID: test_entity,
+            ATTR_OPTION: relay_mode,
+        },
+        blocking=True,
+    )
+    mock_envoy.update_dry_contact.assert_called_once_with(
+        {"id": relay, "mode": REVERSE_RELAY_MODE_MAP[relay_mode]}
+    )
+
+
+@pytest.mark.parametrize(
+    ("mock_envoy", "relay", "target", "action"),
+    [("envoy_metered_batt_relay", "NC1", "generator_action", "powered")],
+    indirect=["mock_envoy"],
+)
+async def test_update_dry_contact_actions_with_error(
+    hass: HomeAssistant,
+    mock_envoy: AsyncMock,
+    config_entry: MockConfigEntry,
+    target: str,
+    relay: str,
+    action: str,
+) -> None:
+    """Test select platform update dry contact action with error return."""
+    with patch("homeassistant.components.enphase_envoy.PLATFORMS", [Platform.SELECT]):
+        await setup_integration(hass, config_entry)
+
+    entity_base = f"{Platform.SELECT}."
+
+    assert (dry_contact := mock_envoy.data.dry_contact_settings[relay])
+    assert (name := dry_contact.load_name.lower().replace(" ", "_"))
+
+    test_entity = f"{entity_base}{name}_{target}"
+
+    mock_envoy.update_dry_contact.side_effect = EnvoyError("Test")
+    with pytest.raises(
+        HomeAssistantError,
+        match=f"Failed to execute async_select_option for {test_entity}, host",
+    ):
         await hass.services.async_call(
             SELECT_DOMAIN,
             SERVICE_SELECT_OPTION,
             {
                 ATTR_ENTITY_ID: test_entity,
-                ATTR_OPTION: current_state,
+                ATTR_OPTION: action,
             },
             blocking=True,
         )
-        mock_envoy.update_dry_contact.assert_called_once_with(
-            {"id": contact_id, "mode": REVERSE_RELAY_MODE_MAP[current_state]}
-        )
-        mock_envoy.update_dry_contact.reset_mock()
 
 
 @pytest.mark.parametrize(
@@ -181,11 +207,13 @@ async def test_select_relay_modes(
     ],
     indirect=["mock_envoy"],
 )
+@pytest.mark.parametrize(("mode"), ["backup", "self_consumption", "savings"])
 async def test_select_storage_modes(
     hass: HomeAssistant,
     mock_envoy: AsyncMock,
     config_entry: MockConfigEntry,
     use_serial: str,
+    mode: str,
 ) -> None:
     """Test select platform entities storage mode changes."""
     with patch("homeassistant.components.enphase_envoy.PLATFORMS", [Platform.SELECT]):
@@ -194,11 +222,50 @@ async def test_select_storage_modes(
     test_entity = f"{Platform.SELECT}.{use_serial}_storage_mode"
 
     assert (entity_state := hass.states.get(test_entity))
-    assert STORAGE_MODE_MAP[mock_envoy.data.tariff.storage_settings.mode] == (
-        current_state := entity_state.state
+    assert (
+        entity_state.state
+        == STORAGE_MODE_MAP[mock_envoy.data.tariff.storage_settings.mode]
     )
 
-    for mode in [mode for mode in STORAGE_MODE_OPTIONS if not current_state]:
+    await hass.services.async_call(
+        SELECT_DOMAIN,
+        SERVICE_SELECT_OPTION,
+        {
+            ATTR_ENTITY_ID: test_entity,
+            ATTR_OPTION: mode,
+        },
+        blocking=True,
+    )
+    mock_envoy.set_storage_mode.assert_called_once_with(REVERSE_STORAGE_MODE_MAP[mode])
+
+
+@pytest.mark.parametrize(
+    ("mock_envoy", "use_serial"),
+    [
+        ("envoy_metered_batt_relay", "enpower_654321"),
+        ("envoy_eu_batt", "envoy_1234"),
+    ],
+    indirect=["mock_envoy"],
+)
+@pytest.mark.parametrize(("mode"), ["backup"])
+async def test_set_storage_modes_with_error(
+    hass: HomeAssistant,
+    mock_envoy: AsyncMock,
+    config_entry: MockConfigEntry,
+    use_serial: str,
+    mode: str,
+) -> None:
+    """Test select platform set storage mode with error return."""
+    with patch("homeassistant.components.enphase_envoy.PLATFORMS", [Platform.SELECT]):
+        await setup_integration(hass, config_entry)
+
+    test_entity = f"{Platform.SELECT}.{use_serial}_storage_mode"
+
+    mock_envoy.set_storage_mode.side_effect = EnvoyError("Test")
+    with pytest.raises(
+        HomeAssistantError,
+        match=f"Failed to execute async_select_option for {test_entity}, host",
+    ):
         await hass.services.async_call(
             SELECT_DOMAIN,
             SERVICE_SELECT_OPTION,
@@ -208,24 +275,6 @@ async def test_select_storage_modes(
             },
             blocking=True,
         )
-        mock_envoy.set_storage_mode.assert_called_once_with(
-            REVERSE_STORAGE_MODE_MAP[mode]
-        )
-        mock_envoy.set_storage_mode.reset_mock()
-
-    # and finally with original mode
-    await hass.services.async_call(
-        SELECT_DOMAIN,
-        SERVICE_SELECT_OPTION,
-        {
-            ATTR_ENTITY_ID: test_entity,
-            ATTR_OPTION: current_state,
-        },
-        blocking=True,
-    )
-    mock_envoy.set_storage_mode.assert_called_once_with(
-        REVERSE_STORAGE_MODE_MAP[current_state]
-    )
 
 
 @pytest.mark.parametrize(
diff --git a/tests/components/enphase_envoy/test_switch.py b/tests/components/enphase_envoy/test_switch.py
index f30cba4d201..d15c0ad740f 100644
--- a/tests/components/enphase_envoy/test_switch.py
+++ b/tests/components/enphase_envoy/test_switch.py
@@ -2,6 +2,7 @@
 
 from unittest.mock import AsyncMock, patch
 
+from pyenphase.exceptions import EnvoyError
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
@@ -16,6 +17,7 @@ from homeassistant.const import (
     STATE_ON,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
 
 from . import setup_integration
@@ -112,6 +114,46 @@ async def test_switch_grid_operation(
     mock_envoy.go_off_grid.reset_mock()
 
 
+@pytest.mark.parametrize("mock_envoy", ["envoy_metered_batt_relay"], indirect=True)
+async def test_switch_grid_operation_with_error(
+    hass: HomeAssistant,
+    mock_envoy: AsyncMock,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test switch platform operation for grid switches when error occurs."""
+    with patch("homeassistant.components.enphase_envoy.PLATFORMS", [Platform.SWITCH]):
+        await setup_integration(hass, config_entry)
+
+    sn = mock_envoy.data.enpower.serial_number
+    test_entity = f"{Platform.SWITCH}.enpower_{sn}_grid_enabled"
+
+    mock_envoy.go_off_grid.side_effect = EnvoyError("Test")
+    mock_envoy.go_on_grid.side_effect = EnvoyError("Test")
+
+    with pytest.raises(
+        HomeAssistantError,
+        match=f"Failed to execute async_turn_off for {test_entity}, host",
+    ):
+        # test grid status switch operation
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_OFF,
+            {ATTR_ENTITY_ID: test_entity},
+            blocking=True,
+        )
+
+    with pytest.raises(
+        HomeAssistantError,
+        match=f"Failed to execute async_turn_on for {test_entity}, host",
+    ):
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: test_entity},
+            blocking=True,
+        )
+
+
 @pytest.mark.parametrize(
     ("mock_envoy", "use_serial"),
     [
@@ -165,6 +207,53 @@ async def test_switch_charge_from_grid_operation(
     mock_envoy.disable_charge_from_grid.reset_mock()
 
 
+@pytest.mark.parametrize(
+    ("mock_envoy", "use_serial"),
+    [
+        ("envoy_metered_batt_relay", "enpower_654321"),
+        ("envoy_eu_batt", "envoy_1234"),
+    ],
+    indirect=["mock_envoy"],
+)
+async def test_switch_charge_from_grid_operation_with_error(
+    hass: HomeAssistant,
+    mock_envoy: AsyncMock,
+    config_entry: MockConfigEntry,
+    use_serial: str,
+) -> None:
+    """Test switch platform operation for charge from grid switches."""
+    with patch("homeassistant.components.enphase_envoy.PLATFORMS", [Platform.SWITCH]):
+        await setup_integration(hass, config_entry)
+
+    test_entity = f"{Platform.SWITCH}.{use_serial}_charge_from_grid"
+
+    mock_envoy.disable_charge_from_grid.side_effect = EnvoyError("Test")
+    mock_envoy.enable_charge_from_grid.side_effect = EnvoyError("Test")
+
+    with pytest.raises(
+        HomeAssistantError,
+        match=f"Failed to execute async_turn_off for {test_entity}, host",
+    ):
+        # test grid status switch operation
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_OFF,
+            {ATTR_ENTITY_ID: test_entity},
+            blocking=True,
+        )
+
+    with pytest.raises(
+        HomeAssistantError,
+        match=f"Failed to execute async_turn_on for {test_entity}, host",
+    ):
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: test_entity},
+            blocking=True,
+        )
+
+
 @pytest.mark.parametrize(
     ("mock_envoy", "entity_states"),
     [
@@ -232,3 +321,51 @@ async def test_switch_relay_operation(
         assert mock_envoy.close_dry_contact.await_count == close_count
         mock_envoy.open_dry_contact.reset_mock()
         mock_envoy.close_dry_contact.reset_mock()
+
+
+@pytest.mark.parametrize(
+    ("mock_envoy", "relay"),
+    [("envoy_metered_batt_relay", "NC1")],
+    indirect=["mock_envoy"],
+)
+async def test_switch_relay_operation_with_error(
+    hass: HomeAssistant,
+    mock_envoy: AsyncMock,
+    config_entry: MockConfigEntry,
+    relay: str,
+) -> None:
+    """Test enphase_envoy switch relay entities operation."""
+    with patch("homeassistant.components.enphase_envoy.PLATFORMS", [Platform.SWITCH]):
+        await setup_integration(hass, config_entry)
+
+    entity_base = f"{Platform.SWITCH}."
+
+    assert (dry_contact := mock_envoy.data.dry_contact_settings[relay])
+    assert (name := dry_contact.load_name.lower().replace(" ", "_"))
+
+    test_entity = f"{entity_base}{name}"
+
+    mock_envoy.close_dry_contact.side_effect = EnvoyError("Test")
+    mock_envoy.open_dry_contact.side_effect = EnvoyError("Test")
+
+    with pytest.raises(
+        HomeAssistantError,
+        match=f"Failed to execute async_turn_off for {test_entity}, host",
+    ):
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_OFF,
+            {ATTR_ENTITY_ID: test_entity},
+            blocking=True,
+        )
+
+    with pytest.raises(
+        HomeAssistantError,
+        match=f"Failed to execute async_turn_on for {test_entity}, host",
+    ):
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: test_entity},
+            blocking=True,
+        )
diff --git a/tests/components/environment_canada/__init__.py b/tests/components/environment_canada/__init__.py
index 92c28e09b74..edc7a92a12f 100644
--- a/tests/components/environment_canada/__init__.py
+++ b/tests/components/environment_canada/__init__.py
@@ -37,6 +37,7 @@ async def init_integration(hass: HomeAssistant, ec_data) -> MockConfigEntry:
     weather_mock.conditions = ec_data["conditions"]
     weather_mock.alerts = ec_data["alerts"]
     weather_mock.daily_forecasts = ec_data["daily_forecasts"]
+    weather_mock.hourly_forecasts = ec_data["hourly_forecasts"]
     weather_mock.metadata = ec_data["metadata"]
 
     radar_mock = mock_ec()
diff --git a/tests/components/environment_canada/conftest.py b/tests/components/environment_canada/conftest.py
index 69cec187d11..19180052c93 100644
--- a/tests/components/environment_canada/conftest.py
+++ b/tests/components/environment_canada/conftest.py
@@ -19,6 +19,9 @@ def ec_data():
         if t := weather.get("timestamp"):
             with contextlib.suppress(ValueError):
                 weather["timestamp"] = datetime.fromisoformat(t)
+        elif t := weather.get("period"):
+            with contextlib.suppress(ValueError):
+                weather["period"] = datetime.fromisoformat(t)
         return weather
 
     return json.loads(
diff --git a/tests/components/environment_canada/fixtures/current_conditions_data.json b/tests/components/environment_canada/fixtures/current_conditions_data.json
index ceb00028f95..e3b9563ef0b 100644
--- a/tests/components/environment_canada/fixtures/current_conditions_data.json
+++ b/tests/components/environment_canada/fixtures/current_conditions_data.json
@@ -238,6 +238,224 @@
       "timestamp": "2022-10-09 15:00:00+00:00"
     }
   ],
+  "hourly_forecasts": [
+    {
+      "period": "2025-02-19T19:00:00+00:00",
+      "condition": "A mix of sun and cloud",
+      "temperature": -11,
+      "icon_code": "02",
+      "precip_probability": 20,
+      "wind_speed": 10,
+      "wind_direction": "W"
+    },
+    {
+      "period": "2025-02-19T20:00:00+00:00",
+      "condition": "A mix of sun and cloud",
+      "temperature": -10,
+      "icon_code": "02",
+      "precip_probability": 20,
+      "wind_speed": 10,
+      "wind_direction": "W"
+    },
+    {
+      "period": "2025-02-19T21:00:00+00:00",
+      "condition": "A mix of sun and cloud",
+      "temperature": -10,
+      "icon_code": "02",
+      "precip_probability": 20,
+      "wind_speed": 10,
+      "wind_direction": "W"
+    },
+    {
+      "period": "2025-02-19T22:00:00+00:00",
+      "condition": "A mix of sun and cloud",
+      "temperature": -11,
+      "icon_code": "02",
+      "precip_probability": 20,
+      "wind_speed": 10,
+      "wind_direction": "W"
+    },
+    {
+      "period": "2025-02-19T23:00:00+00:00",
+      "condition": "Mainly cloudy",
+      "temperature": -11,
+      "icon_code": "33",
+      "precip_probability": 20,
+      "wind_speed": 10,
+      "wind_direction": "W"
+    },
+    {
+      "period": "2025-02-20T00:00:00+00:00",
+      "condition": "Cloudy",
+      "temperature": -12,
+      "icon_code": "10",
+      "precip_probability": 20,
+      "wind_speed": 10,
+      "wind_direction": "W"
+    },
+    {
+      "period": "2025-02-20T01:00:00+00:00",
+      "condition": "Cloudy",
+      "temperature": -13,
+      "icon_code": "10",
+      "precip_probability": 20,
+      "wind_speed": 10,
+      "wind_direction": "W"
+    },
+    {
+      "period": "2025-02-20T02:00:00+00:00",
+      "condition": "Cloudy",
+      "temperature": -13,
+      "icon_code": "10",
+      "precip_probability": 20,
+      "wind_speed": 10,
+      "wind_direction": "W"
+    },
+    {
+      "period": "2025-02-20T03:00:00+00:00",
+      "condition": "Mainly cloudy",
+      "temperature": -14,
+      "icon_code": "33",
+      "precip_probability": 20,
+      "wind_speed": 10,
+      "wind_direction": "W"
+    },
+    {
+      "period": "2025-02-20T04:00:00+00:00",
+      "condition": "Mainly cloudy",
+      "temperature": -14,
+      "icon_code": "33",
+      "precip_probability": 20,
+      "wind_speed": 10,
+      "wind_direction": "W"
+    },
+    {
+      "period": "2025-02-20T05:00:00+00:00",
+      "condition": "Mainly cloudy",
+      "temperature": -15,
+      "icon_code": "33",
+      "precip_probability": 20,
+      "wind_speed": 10,
+      "wind_direction": "W"
+    },
+    {
+      "period": "2025-02-20T06:00:00+00:00",
+      "condition": "Mainly cloudy",
+      "temperature": -15,
+      "icon_code": "33",
+      "precip_probability": 20,
+      "wind_speed": 10,
+      "wind_direction": "W"
+    },
+    {
+      "period": "2025-02-20T07:00:00+00:00",
+      "condition": "Mainly cloudy",
+      "temperature": -15,
+      "icon_code": "33",
+      "precip_probability": 20,
+      "wind_speed": 10,
+      "wind_direction": "W"
+    },
+    {
+      "period": "2025-02-20T08:00:00+00:00",
+      "condition": "Mainly cloudy",
+      "temperature": -16,
+      "icon_code": "33",
+      "precip_probability": 20,
+      "wind_speed": 10,
+      "wind_direction": "W"
+    },
+    {
+      "period": "2025-02-20T09:00:00+00:00",
+      "condition": "Mainly cloudy",
+      "temperature": -16,
+      "icon_code": "33",
+      "precip_probability": 20,
+      "wind_speed": 10,
+      "wind_direction": "W"
+    },
+    {
+      "period": "2025-02-20T10:00:00+00:00",
+      "condition": "Partly cloudy",
+      "temperature": -16,
+      "icon_code": "32",
+      "precip_probability": 20,
+      "wind_speed": 10,
+      "wind_direction": "W"
+    },
+    {
+      "period": "2025-02-20T11:00:00+00:00",
+      "condition": "Partly cloudy",
+      "temperature": -16,
+      "icon_code": "32",
+      "precip_probability": 20,
+      "wind_speed": 10,
+      "wind_direction": "W"
+    },
+    {
+      "period": "2025-02-20T12:00:00+00:00",
+      "condition": "A mix of sun and cloud",
+      "temperature": -16,
+      "icon_code": "02",
+      "precip_probability": 20,
+      "wind_speed": 5,
+      "wind_direction": "VR"
+    },
+    {
+      "period": "2025-02-20T13:00:00+00:00",
+      "condition": "A mix of sun and cloud",
+      "temperature": -15,
+      "icon_code": "02",
+      "precip_probability": 20,
+      "wind_speed": 5,
+      "wind_direction": "VR"
+    },
+    {
+      "period": "2025-02-20T14:00:00+00:00",
+      "condition": "A mix of sun and cloud",
+      "temperature": -14,
+      "icon_code": "02",
+      "precip_probability": 20,
+      "wind_speed": 5,
+      "wind_direction": "VR"
+    },
+    {
+      "period": "2025-02-20T15:00:00+00:00",
+      "condition": "A mix of sun and cloud",
+      "temperature": -13,
+      "icon_code": "02",
+      "precip_probability": 20,
+      "wind_speed": 10,
+      "wind_direction": "NW"
+    },
+    {
+      "period": "2025-02-20T16:00:00+00:00",
+      "condition": "Mainly cloudy",
+      "temperature": -11,
+      "icon_code": "03",
+      "precip_probability": 20,
+      "wind_speed": 10,
+      "wind_direction": "NW"
+    },
+    {
+      "period": "2025-02-20T17:00:00+00:00",
+      "condition": "Periods of light snow",
+      "temperature": -10,
+      "icon_code": "16",
+      "precip_probability": 70,
+      "wind_speed": 10,
+      "wind_direction": "NW"
+    },
+    {
+      "period": "2025-02-20T18:00:00+00:00",
+      "condition": "Periods of light snow",
+      "temperature": -8,
+      "icon_code": "16",
+      "precip_probability": 70,
+      "wind_speed": 20,
+      "wind_direction": "NW"
+    }
+  ],
   "metadata": {
     "attribution": "Data provided by Environment Canada",
     "timestamp": "2022/10/3",
diff --git a/tests/components/environment_canada/snapshots/test_weather.ambr b/tests/components/environment_canada/snapshots/test_weather.ambr
index cfa0ad912a4..46dcacce8a4 100644
--- a/tests/components/environment_canada/snapshots/test_weather.ambr
+++ b/tests/components/environment_canada/snapshots/test_weather.ambr
@@ -92,3 +92,337 @@
     }),
   })
 # ---
+# name: test_get_environment_canada_raw_forecast_data
+  dict({
+    'weather.home_forecast': dict({
+      'daily_forecast': list([
+        dict({
+          'icon_code': '30',
+          'period': 'Monday night',
+          'precip_probability': 0,
+          'temperature': -1,
+          'temperature_class': 'low',
+          'text_summary': 'Clear. Fog patches developing after midnight. Low minus 1 with frost.',
+          'timestamp': '2022-10-03T15:00:00+00:00',
+        }),
+        dict({
+          'icon_code': '00',
+          'period': 'Tuesday',
+          'precip_probability': 0,
+          'temperature': 18,
+          'temperature_class': 'high',
+          'text_summary': 'Sunny. Fog patches dissipating in the morning. High 18. UV index 5 or moderate.',
+          'timestamp': '2022-10-04T15:00:00+00:00',
+        }),
+        dict({
+          'icon_code': '30',
+          'period': 'Tuesday night',
+          'precip_probability': 0,
+          'temperature': 3,
+          'temperature_class': 'low',
+          'text_summary': 'Clear. Fog patches developing overnight. Low plus 3.',
+          'timestamp': '2022-10-04T15:00:00+00:00',
+        }),
+        dict({
+          'icon_code': '00',
+          'period': 'Wednesday',
+          'precip_probability': 0,
+          'temperature': 20,
+          'temperature_class': 'high',
+          'text_summary': 'Sunny. High 20.',
+          'timestamp': '2022-10-05T15:00:00+00:00',
+        }),
+        dict({
+          'icon_code': '30',
+          'period': 'Wednesday night',
+          'precip_probability': 0,
+          'temperature': 9,
+          'temperature_class': 'low',
+          'text_summary': 'Clear. Low 9.',
+          'timestamp': '2022-10-05T15:00:00+00:00',
+        }),
+        dict({
+          'icon_code': '02',
+          'period': 'Thursday',
+          'precip_probability': 0,
+          'temperature': 20,
+          'temperature_class': 'high',
+          'text_summary': 'A mix of sun and cloud. High 20.',
+          'timestamp': '2022-10-06T15:00:00+00:00',
+        }),
+        dict({
+          'icon_code': '12',
+          'period': 'Thursday night',
+          'precip_probability': 0,
+          'temperature': 7,
+          'temperature_class': 'low',
+          'text_summary': 'Showers. Low 7.',
+          'timestamp': '2022-10-06T15:00:00+00:00',
+        }),
+        dict({
+          'icon_code': '12',
+          'period': 'Friday',
+          'precip_probability': 40,
+          'temperature': 13,
+          'temperature_class': 'high',
+          'text_summary': 'Cloudy with 40 percent chance of showers. High 13.',
+          'timestamp': '2022-10-07T15:00:00+00:00',
+        }),
+        dict({
+          'icon_code': '32',
+          'period': 'Friday night',
+          'precip_probability': 0,
+          'temperature': 1,
+          'temperature_class': 'low',
+          'text_summary': 'Cloudy periods. Low plus 1.',
+          'timestamp': '2022-10-07T15:00:00+00:00',
+        }),
+        dict({
+          'icon_code': '02',
+          'period': 'Saturday',
+          'precip_probability': 0,
+          'temperature': 10,
+          'temperature_class': 'high',
+          'text_summary': 'A mix of sun and cloud. High 10.',
+          'timestamp': '2022-10-08T15:00:00+00:00',
+        }),
+        dict({
+          'icon_code': '32',
+          'period': 'Saturday night',
+          'precip_probability': 0,
+          'temperature': 3,
+          'temperature_class': 'low',
+          'text_summary': 'Cloudy periods. Low plus 3.',
+          'timestamp': '2022-10-08T15:00:00+00:00',
+        }),
+        dict({
+          'icon_code': '02',
+          'period': 'Sunday',
+          'precip_probability': 0,
+          'temperature': 12,
+          'temperature_class': 'high',
+          'text_summary': 'A mix of sun and cloud. High 12.',
+          'timestamp': '2022-10-09T15:00:00+00:00',
+        }),
+      ]),
+      'hourly_forecast': list([
+        dict({
+          'condition': 'A mix of sun and cloud',
+          'icon_code': '02',
+          'precip_probability': 20,
+          'temperature': -11,
+          'timestamp': '2025-02-19T19:00:00+00:00',
+          'wind_direction': 'W',
+          'wind_speed': 10,
+        }),
+        dict({
+          'condition': 'A mix of sun and cloud',
+          'icon_code': '02',
+          'precip_probability': 20,
+          'temperature': -10,
+          'timestamp': '2025-02-19T20:00:00+00:00',
+          'wind_direction': 'W',
+          'wind_speed': 10,
+        }),
+        dict({
+          'condition': 'A mix of sun and cloud',
+          'icon_code': '02',
+          'precip_probability': 20,
+          'temperature': -10,
+          'timestamp': '2025-02-19T21:00:00+00:00',
+          'wind_direction': 'W',
+          'wind_speed': 10,
+        }),
+        dict({
+          'condition': 'A mix of sun and cloud',
+          'icon_code': '02',
+          'precip_probability': 20,
+          'temperature': -11,
+          'timestamp': '2025-02-19T22:00:00+00:00',
+          'wind_direction': 'W',
+          'wind_speed': 10,
+        }),
+        dict({
+          'condition': 'Mainly cloudy',
+          'icon_code': '33',
+          'precip_probability': 20,
+          'temperature': -11,
+          'timestamp': '2025-02-19T23:00:00+00:00',
+          'wind_direction': 'W',
+          'wind_speed': 10,
+        }),
+        dict({
+          'condition': 'Cloudy',
+          'icon_code': '10',
+          'precip_probability': 20,
+          'temperature': -12,
+          'timestamp': '2025-02-20T00:00:00+00:00',
+          'wind_direction': 'W',
+          'wind_speed': 10,
+        }),
+        dict({
+          'condition': 'Cloudy',
+          'icon_code': '10',
+          'precip_probability': 20,
+          'temperature': -13,
+          'timestamp': '2025-02-20T01:00:00+00:00',
+          'wind_direction': 'W',
+          'wind_speed': 10,
+        }),
+        dict({
+          'condition': 'Cloudy',
+          'icon_code': '10',
+          'precip_probability': 20,
+          'temperature': -13,
+          'timestamp': '2025-02-20T02:00:00+00:00',
+          'wind_direction': 'W',
+          'wind_speed': 10,
+        }),
+        dict({
+          'condition': 'Mainly cloudy',
+          'icon_code': '33',
+          'precip_probability': 20,
+          'temperature': -14,
+          'timestamp': '2025-02-20T03:00:00+00:00',
+          'wind_direction': 'W',
+          'wind_speed': 10,
+        }),
+        dict({
+          'condition': 'Mainly cloudy',
+          'icon_code': '33',
+          'precip_probability': 20,
+          'temperature': -14,
+          'timestamp': '2025-02-20T04:00:00+00:00',
+          'wind_direction': 'W',
+          'wind_speed': 10,
+        }),
+        dict({
+          'condition': 'Mainly cloudy',
+          'icon_code': '33',
+          'precip_probability': 20,
+          'temperature': -15,
+          'timestamp': '2025-02-20T05:00:00+00:00',
+          'wind_direction': 'W',
+          'wind_speed': 10,
+        }),
+        dict({
+          'condition': 'Mainly cloudy',
+          'icon_code': '33',
+          'precip_probability': 20,
+          'temperature': -15,
+          'timestamp': '2025-02-20T06:00:00+00:00',
+          'wind_direction': 'W',
+          'wind_speed': 10,
+        }),
+        dict({
+          'condition': 'Mainly cloudy',
+          'icon_code': '33',
+          'precip_probability': 20,
+          'temperature': -15,
+          'timestamp': '2025-02-20T07:00:00+00:00',
+          'wind_direction': 'W',
+          'wind_speed': 10,
+        }),
+        dict({
+          'condition': 'Mainly cloudy',
+          'icon_code': '33',
+          'precip_probability': 20,
+          'temperature': -16,
+          'timestamp': '2025-02-20T08:00:00+00:00',
+          'wind_direction': 'W',
+          'wind_speed': 10,
+        }),
+        dict({
+          'condition': 'Mainly cloudy',
+          'icon_code': '33',
+          'precip_probability': 20,
+          'temperature': -16,
+          'timestamp': '2025-02-20T09:00:00+00:00',
+          'wind_direction': 'W',
+          'wind_speed': 10,
+        }),
+        dict({
+          'condition': 'Partly cloudy',
+          'icon_code': '32',
+          'precip_probability': 20,
+          'temperature': -16,
+          'timestamp': '2025-02-20T10:00:00+00:00',
+          'wind_direction': 'W',
+          'wind_speed': 10,
+        }),
+        dict({
+          'condition': 'Partly cloudy',
+          'icon_code': '32',
+          'precip_probability': 20,
+          'temperature': -16,
+          'timestamp': '2025-02-20T11:00:00+00:00',
+          'wind_direction': 'W',
+          'wind_speed': 10,
+        }),
+        dict({
+          'condition': 'A mix of sun and cloud',
+          'icon_code': '02',
+          'precip_probability': 20,
+          'temperature': -16,
+          'timestamp': '2025-02-20T12:00:00+00:00',
+          'wind_direction': 'VR',
+          'wind_speed': 5,
+        }),
+        dict({
+          'condition': 'A mix of sun and cloud',
+          'icon_code': '02',
+          'precip_probability': 20,
+          'temperature': -15,
+          'timestamp': '2025-02-20T13:00:00+00:00',
+          'wind_direction': 'VR',
+          'wind_speed': 5,
+        }),
+        dict({
+          'condition': 'A mix of sun and cloud',
+          'icon_code': '02',
+          'precip_probability': 20,
+          'temperature': -14,
+          'timestamp': '2025-02-20T14:00:00+00:00',
+          'wind_direction': 'VR',
+          'wind_speed': 5,
+        }),
+        dict({
+          'condition': 'A mix of sun and cloud',
+          'icon_code': '02',
+          'precip_probability': 20,
+          'temperature': -13,
+          'timestamp': '2025-02-20T15:00:00+00:00',
+          'wind_direction': 'NW',
+          'wind_speed': 10,
+        }),
+        dict({
+          'condition': 'Mainly cloudy',
+          'icon_code': '03',
+          'precip_probability': 20,
+          'temperature': -11,
+          'timestamp': '2025-02-20T16:00:00+00:00',
+          'wind_direction': 'NW',
+          'wind_speed': 10,
+        }),
+        dict({
+          'condition': 'Periods of light snow',
+          'icon_code': '16',
+          'precip_probability': 70,
+          'temperature': -10,
+          'timestamp': '2025-02-20T17:00:00+00:00',
+          'wind_direction': 'NW',
+          'wind_speed': 10,
+        }),
+        dict({
+          'condition': 'Periods of light snow',
+          'icon_code': '16',
+          'precip_probability': 70,
+          'temperature': -8,
+          'timestamp': '2025-02-20T18:00:00+00:00',
+          'wind_direction': 'NW',
+          'wind_speed': 20,
+        }),
+      ]),
+    }),
+  })
+# ---
diff --git a/tests/components/environment_canada/test_weather.py b/tests/components/environment_canada/test_weather.py
index 8e22f68462f..06166f41bca 100644
--- a/tests/components/environment_canada/test_weather.py
+++ b/tests/components/environment_canada/test_weather.py
@@ -5,6 +5,10 @@ from typing import Any
 
 from syrupy.assertion import SnapshotAssertion
 
+from homeassistant.components.environment_canada.const import (
+    DOMAIN,
+    SERVICE_ENVIRONMENT_CANADA_FORECASTS,
+)
 from homeassistant.components.weather import (
     DOMAIN as WEATHER_DOMAIN,
     SERVICE_GET_FORECASTS,
@@ -56,3 +60,22 @@ async def test_forecast_daily_with_some_previous_days_data(
         return_response=True,
     )
     assert response == snapshot
+
+
+async def test_get_environment_canada_raw_forecast_data(
+    hass: HomeAssistant, snapshot: SnapshotAssertion, ec_data: dict[str, Any]
+) -> None:
+    """Test forecast with half day at start."""
+
+    await init_integration(hass, ec_data)
+
+    response = await hass.services.async_call(
+        DOMAIN,
+        SERVICE_ENVIRONMENT_CANADA_FORECASTS,
+        {
+            "entity_id": "weather.home_forecast",
+        },
+        blocking=True,
+        return_response=True,
+    )
+    assert response == snapshot
diff --git a/tests/components/esphome/bluetooth/test_client.py b/tests/components/esphome/bluetooth/test_client.py
index 77d315f096d..554f1725f4b 100644
--- a/tests/components/esphome/bluetooth/test_client.py
+++ b/tests/components/esphome/bluetooth/test_client.py
@@ -6,7 +6,9 @@ from aioesphomeapi import APIClient, APIVersion, BluetoothProxyFeature, DeviceIn
 from bleak.exc import BleakError
 from bleak_esphome.backend.client import ESPHomeClient, ESPHomeClientData
 from bleak_esphome.backend.device import ESPHomeBluetoothDevice
-from bleak_esphome.backend.scanner import ESPHomeScanner
+from bleak_esphome.backend.scanner import (  # pylint: disable=no-name-in-module
+    ESPHomeScanner,
+)
 import pytest
 
 from homeassistant.components.bluetooth import HaBluetoothConnector
diff --git a/tests/components/esphome/conftest.py b/tests/components/esphome/conftest.py
index 2b7c127efd3..2786ed8324c 100644
--- a/tests/components/esphome/conftest.py
+++ b/tests/components/esphome/conftest.py
@@ -6,7 +6,7 @@ import asyncio
 from asyncio import Event
 from collections.abc import AsyncGenerator, Awaitable, Callable, Coroutine
 from pathlib import Path
-from typing import Any
+from typing import TYPE_CHECKING, Any
 from unittest.mock import AsyncMock, MagicMock, Mock, patch
 
 from aioesphomeapi import (
@@ -17,6 +17,7 @@ from aioesphomeapi import (
     EntityInfo,
     EntityState,
     HomeassistantServiceCall,
+    LogLevel,
     ReconnectLogic,
     UserService,
     VoiceAssistantAnnounceFinished,
@@ -29,6 +30,7 @@ from zeroconf import Zeroconf
 from homeassistant.components.esphome import dashboard
 from homeassistant.components.esphome.const import (
     CONF_ALLOW_SERVICE_CALLS,
+    CONF_BLUETOOTH_MAC_ADDRESS,
     CONF_DEVICE_NAME,
     CONF_NOISE_PSK,
     DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS,
@@ -42,6 +44,10 @@ from . import DASHBOARD_HOST, DASHBOARD_PORT, DASHBOARD_SLUG
 
 from tests.common import MockConfigEntry
 
+if TYPE_CHECKING:
+    from aioesphomeapi.api_pb2 import SubscribeLogsResponse
+
+
 _ONE_SECOND = 16000 * 2  # 16Khz 16-bit
 
 
@@ -154,6 +160,7 @@ def mock_client(mock_device_info) -> APIClient:
     mock_client.device_info = AsyncMock(return_value=mock_device_info)
     mock_client.connect = AsyncMock()
     mock_client.disconnect = AsyncMock()
+    mock_client.subscribe_logs = Mock()
     mock_client.list_entities_services = AsyncMock(return_value=([], []))
     mock_client.address = "127.0.0.1"
     mock_client.api_version = APIVersion(99, 99)
@@ -222,7 +229,9 @@ class MockESPHomeDevice:
             ]
             | None
         )
+        self.on_log_message: Callable[[SubscribeLogsResponse], None]
         self.device_info = device_info
+        self.current_log_level = LogLevel.LOG_LEVEL_NONE
 
     def set_state_callback(self, state_callback: Callable[[EntityState], None]) -> None:
         """Set the state callback."""
@@ -250,6 +259,16 @@ class MockESPHomeDevice:
         """Mock disconnecting."""
         await self.on_disconnect(expected_disconnect)
 
+    def set_on_log_message(
+        self, on_log_message: Callable[[SubscribeLogsResponse], None]
+    ) -> None:
+        """Set the log message callback."""
+        self.on_log_message = on_log_message
+
+    def mock_on_log_message(self, log_message: SubscribeLogsResponse) -> None:
+        """Mock on log message."""
+        self.on_log_message(log_message)
+
     def set_on_connect(self, on_connect: Callable[[], None]) -> None:
         """Set the connect callback."""
         self.on_connect = on_connect
@@ -413,6 +432,14 @@ async def _mock_generic_device_entry(
             on_state_sub, on_state_request
         )
 
+    def _subscribe_logs(
+        on_log_message: Callable[[SubscribeLogsResponse], None], log_level: LogLevel
+    ) -> Callable[[], None]:
+        """Subscribe to log messages."""
+        mock_device.set_on_log_message(on_log_message)
+        mock_device.current_log_level = log_level
+        return lambda: None
+
     def _subscribe_voice_assistant(
         *,
         handle_start: Callable[
@@ -453,6 +480,7 @@ async def _mock_generic_device_entry(
     mock_client.subscribe_states = _subscribe_states
     mock_client.subscribe_service_calls = _subscribe_service_calls
     mock_client.subscribe_home_assistant_states = _subscribe_home_assistant_states
+    mock_client.subscribe_logs = _subscribe_logs
 
     try_connect_done = Event()
 
@@ -551,12 +579,29 @@ async def mock_bluetooth_entry(
     async def _mock_bluetooth_entry(
         bluetooth_proxy_feature_flags: BluetoothProxyFeature,
     ) -> MockESPHomeDevice:
+        entry = MockConfigEntry(
+            domain=DOMAIN,
+            data={
+                CONF_HOST: "test.local",
+                CONF_PORT: 6053,
+                CONF_PASSWORD: "",
+                CONF_BLUETOOTH_MAC_ADDRESS: "AA:BB:CC:DD:EE:FC",
+            },
+            options={
+                CONF_ALLOW_SERVICE_CALLS: DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS
+            },
+        )
+        entry.add_to_hass(hass)
         return await _mock_generic_device_entry(
             hass,
             mock_client,
-            {"bluetooth_proxy_feature_flags": bluetooth_proxy_feature_flags},
+            {
+                "bluetooth_mac_address": "AA:BB:CC:DD:EE:FC",
+                "bluetooth_proxy_feature_flags": bluetooth_proxy_feature_flags,
+            },
             ([], []),
             [],
+            entry=entry,
         )
 
     return _mock_bluetooth_entry
diff --git a/tests/components/esphome/snapshots/test_diagnostics.ambr b/tests/components/esphome/snapshots/test_diagnostics.ambr
index 4f7ea679b20..8f1711e829e 100644
--- a/tests/components/esphome/snapshots/test_diagnostics.ambr
+++ b/tests/components/esphome/snapshots/test_diagnostics.ambr
@@ -20,6 +20,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'ESPHome Device',
       'unique_id': '11:22:33:44:55:aa',
       'version': 1,
diff --git a/tests/components/esphome/test_assist_satellite.py b/tests/components/esphome/test_assist_satellite.py
index 5ca333df1e2..5f433a6c0ed 100644
--- a/tests/components/esphome/test_assist_satellite.py
+++ b/tests/components/esphome/test_assist_satellite.py
@@ -25,7 +25,12 @@ from aioesphomeapi import (
 )
 import pytest
 
-from homeassistant.components import assist_satellite, tts
+from homeassistant.components import (
+    assist_pipeline,
+    assist_satellite,
+    conversation,
+    tts,
+)
 from homeassistant.components.assist_pipeline import PipelineEvent, PipelineEventType
 from homeassistant.components.assist_satellite import (
     AssistSatelliteConfiguration,
@@ -41,19 +46,23 @@ from homeassistant.components.esphome.assist_satellite import (
     EsphomeAssistSatellite,
     VoiceAssistantUDPServer,
 )
-from homeassistant.components.media_source import PlayMedia
 from homeassistant.components.select import (
     DOMAIN as SELECT_DOMAIN,
     SERVICE_SELECT_OPTION,
 )
 from homeassistant.const import STATE_UNAVAILABLE, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er, intent as intent_helper
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import (
+    device_registry as dr,
+    entity_registry as er,
+    intent as intent_helper,
+)
 from homeassistant.helpers.entity_component import EntityComponent
 
 from .conftest import MockESPHomeDevice
 
+from tests.components.tts.common import MockResultStream
+
 
 def get_satellite_entity(
     hass: HomeAssistant, mac_address: str
@@ -282,12 +291,21 @@ async def test_pipeline_api_audio(
         event_callback(
             PipelineEvent(
                 type=PipelineEventType.INTENT_END,
-                data={"intent_output": {"conversation_id": conversation_id}},
+                data={
+                    "intent_output": conversation.ConversationResult(
+                        response=intent_helper.IntentResponse("en"),
+                        conversation_id=conversation_id,
+                        continue_conversation=True,
+                    ).as_dict()
+                },
             )
         )
         assert mock_client.send_voice_assistant_event.call_args_list[-1].args == (
             VoiceAssistantEventType.VOICE_ASSISTANT_INTENT_END,
-            {"conversation_id": conversation_id},
+            {
+                "conversation_id": conversation_id,
+                "continue_conversation": "1",
+            },
         )
 
         # TTS
@@ -481,7 +499,12 @@ async def test_pipeline_udp_audio(
         event_callback(
             PipelineEvent(
                 type=PipelineEventType.INTENT_END,
-                data={"intent_output": {"conversation_id": conversation_id}},
+                data={
+                    "intent_output": conversation.ConversationResult(
+                        response=intent_helper.IntentResponse("en"),
+                        conversation_id=conversation_id,
+                    ).as_dict()
+                },
             )
         )
 
@@ -687,7 +710,12 @@ async def test_pipeline_media_player(
         event_callback(
             PipelineEvent(
                 type=PipelineEventType.INTENT_END,
-                data={"intent_output": {"conversation_id": conversation_id}},
+                data={
+                    "intent_output": conversation.ConversationResult(
+                        response=intent_helper.IntentResponse("en"),
+                        conversation_id=conversation_id,
+                    ).as_dict()
+                },
             )
         )
 
@@ -1137,7 +1165,7 @@ async def test_announce_supported_features(
         Awaitable[MockESPHomeDevice],
     ],
 ) -> None:
-    """Test that the announce supported feature is set by flags."""
+    """Test that the announce supported feature is not set by default."""
     mock_device: MockESPHomeDevice = await mock_esphome_device(
         mock_client=mock_client,
         entity_info=[],
@@ -1184,25 +1212,32 @@ async def test_announce_message(
     done = asyncio.Event()
 
     async def send_voice_assistant_announcement_await_response(
-        media_id: str, timeout: float, text: str
+        media_id: str,
+        timeout: float,
+        text: str,
+        start_conversation: bool,
+        preannounce_media_id: str | None = None,
     ):
         assert satellite.state == AssistSatelliteState.RESPONDING
-        assert media_id == "https://www.home-assistant.io/resolved.mp3"
+        assert media_id == "http://10.10.10.10:8123/api/tts_proxy/test-token"
         assert text == "test-text"
+        assert not start_conversation
+        assert not preannounce_media_id
 
         done.set()
 
     with (
         patch(
-            "homeassistant.components.assist_satellite.entity.tts_generate_media_source_id",
+            "homeassistant.components.tts.generate_media_source_id",
             return_value="media-source://bla",
         ),
         patch(
-            "homeassistant.components.media_source.async_resolve_media",
-            return_value=PlayMedia(
-                url="https://www.home-assistant.io/resolved.mp3",
-                mime_type="audio/mp3",
-            ),
+            "homeassistant.components.tts.async_resolve_engine",
+            return_value="tts.cloud_tts",
+        ),
+        patch(
+            "homeassistant.components.tts.async_create_stream",
+            return_value=MockResultStream(hass, "wav", b""),
         ),
         patch.object(
             mock_client,
@@ -1214,7 +1249,11 @@ async def test_announce_message(
             await hass.services.async_call(
                 assist_satellite.DOMAIN,
                 "announce",
-                {"entity_id": satellite.entity_id, "message": "test-text"},
+                {
+                    "entity_id": satellite.entity_id,
+                    "message": "test-text",
+                    "preannounce_media_id": None,
+                },
                 blocking=True,
             )
             await done.wait()
@@ -1272,10 +1311,16 @@ async def test_announce_media_id(
     done = asyncio.Event()
 
     async def send_voice_assistant_announcement_await_response(
-        media_id: str, timeout: float, text: str
+        media_id: str,
+        timeout: float,
+        text: str,
+        start_conversation: bool,
+        preannounce_media_id: str | None = None,
     ):
         assert satellite.state == AssistSatelliteState.RESPONDING
         assert media_id == "https://www.home-assistant.io/proxied.flac"
+        assert not start_conversation
+        assert not preannounce_media_id
 
         done.set()
 
@@ -1297,6 +1342,7 @@ async def test_announce_media_id(
                 {
                     "entity_id": satellite.entity_id,
                     "media_id": "https://www.home-assistant.io/resolved.mp3",
+                    "preannounce_media_id": None,
                 },
                 blocking=True,
             )
@@ -1304,9 +1350,9 @@ async def test_announce_media_id(
             assert satellite.state == AssistSatelliteState.IDLE
 
         mock_async_create_proxy_url.assert_called_once_with(
-            hass,
-            dev.id,
-            "https://www.home-assistant.io/resolved.mp3",
+            hass=hass,
+            device_id=dev.id,
+            media_url="https://www.home-assistant.io/resolved.mp3",
             media_format="flac",
             rate=48000,
             channels=2,
@@ -1314,6 +1360,422 @@ async def test_announce_media_id(
         )
 
 
+async def test_announce_message_with_preannounce(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+) -> None:
+    """Test announcement with message and preannounce media id."""
+    mock_device: MockESPHomeDevice = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=[],
+        user_service=[],
+        states=[],
+        device_info={
+            "voice_assistant_feature_flags": VoiceAssistantFeature.VOICE_ASSISTANT
+            | VoiceAssistantFeature.SPEAKER
+            | VoiceAssistantFeature.API_AUDIO
+            | VoiceAssistantFeature.ANNOUNCE
+        },
+    )
+    await hass.async_block_till_done()
+
+    satellite = get_satellite_entity(hass, mock_device.device_info.mac_address)
+    assert satellite is not None
+
+    done = asyncio.Event()
+
+    async def send_voice_assistant_announcement_await_response(
+        media_id: str,
+        timeout: float,
+        text: str,
+        start_conversation: bool,
+        preannounce_media_id: str | None = None,
+    ):
+        assert satellite.state == AssistSatelliteState.RESPONDING
+        assert media_id == "http://10.10.10.10:8123/api/tts_proxy/test-token"
+        assert text == "test-text"
+        assert not start_conversation
+        assert preannounce_media_id == "test-preannounce"
+
+        done.set()
+
+    with (
+        patch(
+            "homeassistant.components.tts.generate_media_source_id",
+            return_value="media-source://bla",
+        ),
+        patch(
+            "homeassistant.components.tts.async_resolve_engine",
+            return_value="tts.cloud_tts",
+        ),
+        patch(
+            "homeassistant.components.tts.async_create_stream",
+            return_value=MockResultStream(hass, "wav", b""),
+        ),
+        patch.object(
+            mock_client,
+            "send_voice_assistant_announcement_await_response",
+            new=send_voice_assistant_announcement_await_response,
+        ),
+    ):
+        async with asyncio.timeout(1):
+            await hass.services.async_call(
+                assist_satellite.DOMAIN,
+                "announce",
+                {
+                    "entity_id": satellite.entity_id,
+                    "message": "test-text",
+                    "preannounce_media_id": "test-preannounce",
+                },
+                blocking=True,
+            )
+            await done.wait()
+            assert satellite.state == AssistSatelliteState.IDLE
+
+
+async def test_start_conversation_supported_features(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+) -> None:
+    """Test that the start conversation supported feature is not set by default."""
+    mock_device: MockESPHomeDevice = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=[],
+        user_service=[],
+        states=[],
+        device_info={
+            "voice_assistant_feature_flags": VoiceAssistantFeature.VOICE_ASSISTANT
+        },
+    )
+    await hass.async_block_till_done()
+
+    satellite = get_satellite_entity(hass, mock_device.device_info.mac_address)
+    assert satellite is not None
+
+    assert not (
+        satellite.supported_features & AssistSatelliteEntityFeature.START_CONVERSATION
+    )
+
+
+async def test_start_conversation_message(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+) -> None:
+    """Test start conversation with message."""
+    mock_device: MockESPHomeDevice = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=[],
+        user_service=[],
+        states=[],
+        device_info={
+            "voice_assistant_feature_flags": VoiceAssistantFeature.VOICE_ASSISTANT
+            | VoiceAssistantFeature.SPEAKER
+            | VoiceAssistantFeature.API_AUDIO
+            | VoiceAssistantFeature.ANNOUNCE
+            | VoiceAssistantFeature.START_CONVERSATION
+        },
+    )
+    await hass.async_block_till_done()
+
+    satellite = get_satellite_entity(hass, mock_device.device_info.mac_address)
+    assert satellite is not None
+
+    pipeline = assist_pipeline.Pipeline(
+        conversation_engine="test engine",
+        conversation_language="en",
+        language="en",
+        name="test pipeline",
+        stt_engine="test stt",
+        stt_language="en",
+        tts_engine="test tts",
+        tts_language="en",
+        tts_voice=None,
+        wake_word_entity=None,
+        wake_word_id=None,
+    )
+
+    done = asyncio.Event()
+
+    async def send_voice_assistant_announcement_await_response(
+        media_id: str,
+        timeout: float,
+        text: str,
+        start_conversation: bool,
+        preannounce_media_id: str,
+    ):
+        assert satellite.state == AssistSatelliteState.RESPONDING
+        assert media_id == "http://10.10.10.10:8123/api/tts_proxy/test-token"
+        assert text == "test-text"
+        assert start_conversation
+        assert not preannounce_media_id
+
+        done.set()
+
+    with (
+        patch(
+            "homeassistant.components.tts.generate_media_source_id",
+            return_value="media-source://bla",
+        ),
+        patch(
+            "homeassistant.components.tts.async_resolve_engine",
+            return_value="tts.cloud_tts",
+        ),
+        patch(
+            "homeassistant.components.tts.async_create_stream",
+            return_value=MockResultStream(hass, "wav", b""),
+        ),
+        patch.object(
+            mock_client,
+            "send_voice_assistant_announcement_await_response",
+            new=send_voice_assistant_announcement_await_response,
+        ),
+        patch(
+            "homeassistant.components.assist_satellite.entity.async_get_pipeline",
+            return_value=pipeline,
+        ),
+    ):
+        async with asyncio.timeout(1):
+            await hass.services.async_call(
+                assist_satellite.DOMAIN,
+                "start_conversation",
+                {
+                    "entity_id": satellite.entity_id,
+                    "start_message": "test-text",
+                    "preannounce_media_id": None,
+                },
+                blocking=True,
+            )
+            await done.wait()
+            assert satellite.state == AssistSatelliteState.IDLE
+
+
+async def test_start_conversation_media_id(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+    device_registry: dr.DeviceRegistry,
+) -> None:
+    """Test start conversation with media id."""
+    mock_device: MockESPHomeDevice = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=[
+            MediaPlayerInfo(
+                object_id="mymedia_player",
+                key=1,
+                name="my media_player",
+                unique_id="my_media_player",
+                supports_pause=True,
+                supported_formats=[
+                    MediaPlayerSupportedFormat(
+                        format="flac",
+                        sample_rate=48000,
+                        num_channels=2,
+                        purpose=MediaPlayerFormatPurpose.ANNOUNCEMENT,
+                        sample_bytes=2,
+                    ),
+                ],
+            )
+        ],
+        user_service=[],
+        states=[],
+        device_info={
+            "voice_assistant_feature_flags": VoiceAssistantFeature.VOICE_ASSISTANT
+            | VoiceAssistantFeature.SPEAKER
+            | VoiceAssistantFeature.API_AUDIO
+            | VoiceAssistantFeature.ANNOUNCE
+            | VoiceAssistantFeature.START_CONVERSATION
+        },
+    )
+    await hass.async_block_till_done()
+
+    dev = device_registry.async_get_device(
+        connections={(dr.CONNECTION_NETWORK_MAC, mock_device.entry.unique_id)}
+    )
+
+    satellite = get_satellite_entity(hass, mock_device.device_info.mac_address)
+    assert satellite is not None
+
+    pipeline = assist_pipeline.Pipeline(
+        conversation_engine="test engine",
+        conversation_language="en",
+        language="en",
+        name="test pipeline",
+        stt_engine="test stt",
+        stt_language="en",
+        tts_engine="test tts",
+        tts_language="en",
+        tts_voice=None,
+        wake_word_entity=None,
+        wake_word_id=None,
+    )
+
+    done = asyncio.Event()
+
+    async def send_voice_assistant_announcement_await_response(
+        media_id: str,
+        timeout: float,
+        text: str,
+        start_conversation: bool,
+        preannounce_media_id: str,
+    ):
+        assert satellite.state == AssistSatelliteState.RESPONDING
+        assert media_id == "https://www.home-assistant.io/proxied.flac"
+        assert start_conversation
+        assert not preannounce_media_id
+
+        done.set()
+
+    with (
+        patch.object(
+            mock_client,
+            "send_voice_assistant_announcement_await_response",
+            new=send_voice_assistant_announcement_await_response,
+        ),
+        patch(
+            "homeassistant.components.esphome.assist_satellite.async_create_proxy_url",
+            return_value="https://www.home-assistant.io/proxied.flac",
+        ) as mock_async_create_proxy_url,
+        patch(
+            "homeassistant.components.assist_satellite.entity.async_get_pipeline",
+            return_value=pipeline,
+        ),
+    ):
+        async with asyncio.timeout(1):
+            await hass.services.async_call(
+                assist_satellite.DOMAIN,
+                "start_conversation",
+                {
+                    "entity_id": satellite.entity_id,
+                    "start_media_id": "https://www.home-assistant.io/resolved.mp3",
+                    "preannounce_media_id": None,
+                },
+                blocking=True,
+            )
+            await done.wait()
+            assert satellite.state == AssistSatelliteState.IDLE
+
+        mock_async_create_proxy_url.assert_called_once_with(
+            hass=hass,
+            device_id=dev.id,
+            media_url="https://www.home-assistant.io/resolved.mp3",
+            media_format="flac",
+            rate=48000,
+            channels=2,
+            width=2,
+        )
+
+
+async def test_start_conversation_message_with_preannounce(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+) -> None:
+    """Test start conversation with message and preannounce media id."""
+    mock_device: MockESPHomeDevice = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=[],
+        user_service=[],
+        states=[],
+        device_info={
+            "voice_assistant_feature_flags": VoiceAssistantFeature.VOICE_ASSISTANT
+            | VoiceAssistantFeature.SPEAKER
+            | VoiceAssistantFeature.API_AUDIO
+            | VoiceAssistantFeature.ANNOUNCE
+            | VoiceAssistantFeature.START_CONVERSATION
+        },
+    )
+    await hass.async_block_till_done()
+
+    satellite = get_satellite_entity(hass, mock_device.device_info.mac_address)
+    assert satellite is not None
+
+    pipeline = assist_pipeline.Pipeline(
+        conversation_engine="test engine",
+        conversation_language="en",
+        language="en",
+        name="test pipeline",
+        stt_engine="test stt",
+        stt_language="en",
+        tts_engine="test tts",
+        tts_language="en",
+        tts_voice=None,
+        wake_word_entity=None,
+        wake_word_id=None,
+    )
+
+    done = asyncio.Event()
+
+    async def send_voice_assistant_announcement_await_response(
+        media_id: str,
+        timeout: float,
+        text: str,
+        start_conversation: bool,
+        preannounce_media_id: str,
+    ):
+        assert satellite.state == AssistSatelliteState.RESPONDING
+        assert media_id == "http://10.10.10.10:8123/api/tts_proxy/test-token"
+        assert text == "test-text"
+        assert start_conversation
+        assert preannounce_media_id == "test-preannounce"
+
+        done.set()
+
+    with (
+        patch(
+            "homeassistant.components.tts.generate_media_source_id",
+            return_value="media-source://bla",
+        ),
+        patch(
+            "homeassistant.components.tts.async_resolve_engine",
+            return_value="tts.cloud_tts",
+        ),
+        patch(
+            "homeassistant.components.tts.async_create_stream",
+            return_value=MockResultStream(hass, "wav", b""),
+        ),
+        patch.object(
+            mock_client,
+            "send_voice_assistant_announcement_await_response",
+            new=send_voice_assistant_announcement_await_response,
+        ),
+        patch(
+            "homeassistant.components.assist_satellite.entity.async_get_pipeline",
+            return_value=pipeline,
+        ),
+    ):
+        async with asyncio.timeout(1):
+            await hass.services.async_call(
+                assist_satellite.DOMAIN,
+                "start_conversation",
+                {
+                    "entity_id": satellite.entity_id,
+                    "start_message": "test-text",
+                    "preannounce_media_id": "test-preannounce",
+                },
+                blocking=True,
+            )
+            await done.wait()
+            assert satellite.state == AssistSatelliteState.IDLE
+
+
 async def test_satellite_unloaded_on_disconnect(
     hass: HomeAssistant,
     mock_client: APIClient,
diff --git a/tests/components/esphome/test_bluetooth.py b/tests/components/esphome/test_bluetooth.py
index 31d9fcd34f9..dd7a8f59fe5 100644
--- a/tests/components/esphome/test_bluetooth.py
+++ b/tests/components/esphome/test_bluetooth.py
@@ -4,6 +4,7 @@ from unittest.mock import patch
 
 from homeassistant.components import bluetooth
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr
 
 from .conftest import MockESPHomeDevice
 
@@ -12,7 +13,7 @@ async def test_bluetooth_connect_with_raw_adv(
     hass: HomeAssistant, mock_bluetooth_entry_with_raw_adv: MockESPHomeDevice
 ) -> None:
     """Test bluetooth connect with raw advertisements."""
-    scanner = bluetooth.async_scanner_by_source(hass, "11:22:33:44:55:AA")
+    scanner = bluetooth.async_scanner_by_source(hass, "AA:BB:CC:DD:EE:FC")
     assert scanner is not None
     assert scanner.connectable is True
     assert scanner.scanning is True
@@ -20,11 +21,11 @@ async def test_bluetooth_connect_with_raw_adv(
     await mock_bluetooth_entry_with_raw_adv.mock_disconnect(True)
     await hass.async_block_till_done()
 
-    scanner = bluetooth.async_scanner_by_source(hass, "11:22:33:44:55:AA")
+    scanner = bluetooth.async_scanner_by_source(hass, "AA:BB:CC:DD:EE:FC")
     assert scanner is None
     await mock_bluetooth_entry_with_raw_adv.mock_connect()
     await hass.async_block_till_done()
-    scanner = bluetooth.async_scanner_by_source(hass, "11:22:33:44:55:AA")
+    scanner = bluetooth.async_scanner_by_source(hass, "AA:BB:CC:DD:EE:FC")
     assert scanner.scanning is True
 
 
@@ -32,7 +33,7 @@ async def test_bluetooth_connect_with_legacy_adv(
     hass: HomeAssistant, mock_bluetooth_entry_with_legacy_adv: MockESPHomeDevice
 ) -> None:
     """Test bluetooth connect with legacy advertisements."""
-    scanner = bluetooth.async_scanner_by_source(hass, "11:22:33:44:55:AA")
+    scanner = bluetooth.async_scanner_by_source(hass, "AA:BB:CC:DD:EE:FC")
     assert scanner is not None
     assert scanner.connectable is True
     assert scanner.scanning is True
@@ -40,19 +41,47 @@ async def test_bluetooth_connect_with_legacy_adv(
     await mock_bluetooth_entry_with_legacy_adv.mock_disconnect(True)
     await hass.async_block_till_done()
 
-    scanner = bluetooth.async_scanner_by_source(hass, "11:22:33:44:55:AA")
+    scanner = bluetooth.async_scanner_by_source(hass, "AA:BB:CC:DD:EE:FC")
     assert scanner is None
     await mock_bluetooth_entry_with_legacy_adv.mock_connect()
     await hass.async_block_till_done()
-    scanner = bluetooth.async_scanner_by_source(hass, "11:22:33:44:55:AA")
+    scanner = bluetooth.async_scanner_by_source(hass, "AA:BB:CC:DD:EE:FC")
     assert scanner.scanning is True
 
 
+async def test_bluetooth_device_linked_via_device(
+    hass: HomeAssistant,
+    mock_bluetooth_entry_with_raw_adv: MockESPHomeDevice,
+    device_registry: dr.DeviceRegistry,
+) -> None:
+    """Test the Bluetooth device is linked to the ESPHome device."""
+    scanner = bluetooth.async_scanner_by_source(hass, "AA:BB:CC:DD:EE:FC")
+    assert scanner.connectable is True
+    entry = hass.config_entries.async_entry_for_domain_unique_id(
+        "bluetooth", "AA:BB:CC:DD:EE:FC"
+    )
+    assert entry is not None
+    esp_device = device_registry.async_get_device(
+        connections={
+            (
+                dr.CONNECTION_NETWORK_MAC,
+                mock_bluetooth_entry_with_raw_adv.device_info.mac_address,
+            )
+        }
+    )
+    assert esp_device is not None
+    device = device_registry.async_get_device(
+        connections={(dr.CONNECTION_BLUETOOTH, "AA:BB:CC:DD:EE:FC")}
+    )
+    assert device is not None
+    assert device.via_device_id == esp_device.id
+
+
 async def test_bluetooth_cleanup_on_remove_entry(
     hass: HomeAssistant, mock_bluetooth_entry_with_raw_adv: MockESPHomeDevice
 ) -> None:
     """Test bluetooth is cleaned up on entry removal."""
-    scanner = bluetooth.async_scanner_by_source(hass, "11:22:33:44:55:AA")
+    scanner = bluetooth.async_scanner_by_source(hass, "AA:BB:CC:DD:EE:FC")
     assert scanner.connectable is True
     await hass.config_entries.async_unload(
         mock_bluetooth_entry_with_raw_adv.entry.entry_id
diff --git a/tests/components/esphome/test_climate.py b/tests/components/esphome/test_climate.py
index 2a5013444dd..03d2f78a5d2 100644
--- a/tests/components/esphome/test_climate.py
+++ b/tests/components/esphome/test_climate.py
@@ -407,7 +407,7 @@ async def test_climate_entity_with_inf_value(
             target_temperature=math.inf,
             fan_mode=ClimateFanMode.AUTO,
             swing_mode=ClimateSwingMode.BOTH,
-            current_humidity=20.1,
+            current_humidity=math.inf,
             target_humidity=25.7,
         )
     ]
@@ -422,7 +422,7 @@ async def test_climate_entity_with_inf_value(
     assert state is not None
     assert state.state == HVACMode.AUTO
     attributes = state.attributes
-    assert attributes[ATTR_CURRENT_HUMIDITY] == 20
+    assert ATTR_CURRENT_HUMIDITY not in attributes
     assert attributes[ATTR_HUMIDITY] == 26
     assert attributes[ATTR_MAX_HUMIDITY] == 30
     assert attributes[ATTR_MIN_HUMIDITY] == 10
diff --git a/tests/components/esphome/test_config_flow.py b/tests/components/esphome/test_config_flow.py
index 65dab4c516f..afca6f76b43 100644
--- a/tests/components/esphome/test_config_flow.py
+++ b/tests/components/esphome/test_config_flow.py
@@ -23,6 +23,7 @@ from homeassistant.components.esphome.const import (
     CONF_ALLOW_SERVICE_CALLS,
     CONF_DEVICE_NAME,
     CONF_NOISE_PSK,
+    CONF_SUBSCRIBE_LOGS,
     DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS,
     DOMAIN,
 )
@@ -1295,14 +1296,57 @@ async def test_zeroconf_no_encryption_key_via_dashboard(
     assert result["step_id"] == "encryption_key"
 
 
-@pytest.mark.parametrize("option_value", [True, False])
-async def test_option_flow(
+async def test_option_flow_allow_service_calls(
     hass: HomeAssistant,
-    option_value: bool,
     mock_client: APIClient,
     mock_generic_device_entry,
 ) -> None:
-    """Test config flow options."""
+    """Test config flow options for allow service calls."""
+    entry = await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=[],
+        user_service=[],
+        states=[],
+    )
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "init"
+    assert result["data_schema"]({}) == {
+        CONF_ALLOW_SERVICE_CALLS: DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS,
+        CONF_SUBSCRIBE_LOGS: False,
+    }
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "init"
+    assert result["data_schema"]({}) == {
+        CONF_ALLOW_SERVICE_CALLS: DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS,
+        CONF_SUBSCRIBE_LOGS: False,
+    }
+    with patch(
+        "homeassistant.components.esphome.async_setup_entry", return_value=True
+    ) as mock_reload:
+        result = await hass.config_entries.options.async_configure(
+            result["flow_id"],
+            user_input={CONF_ALLOW_SERVICE_CALLS: True, CONF_SUBSCRIBE_LOGS: False},
+        )
+        await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["data"] == {
+        CONF_ALLOW_SERVICE_CALLS: True,
+        CONF_SUBSCRIBE_LOGS: False,
+    }
+    assert len(mock_reload.mock_calls) == 1
+
+
+async def test_option_flow_subscribe_logs(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test config flow options with subscribe logs."""
     entry = await mock_generic_device_entry(
         mock_client=mock_client,
         entity_info=[],
@@ -1315,7 +1359,8 @@ async def test_option_flow(
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "init"
     assert result["data_schema"]({}) == {
-        CONF_ALLOW_SERVICE_CALLS: DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS
+        CONF_ALLOW_SERVICE_CALLS: DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS,
+        CONF_SUBSCRIBE_LOGS: False,
     }
 
     with patch(
@@ -1323,15 +1368,16 @@ async def test_option_flow(
     ) as mock_reload:
         result = await hass.config_entries.options.async_configure(
             result["flow_id"],
-            user_input={
-                CONF_ALLOW_SERVICE_CALLS: option_value,
-            },
+            user_input={CONF_ALLOW_SERVICE_CALLS: False, CONF_SUBSCRIBE_LOGS: True},
         )
         await hass.async_block_till_done()
 
     assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["data"] == {CONF_ALLOW_SERVICE_CALLS: option_value}
-    assert len(mock_reload.mock_calls) == int(option_value)
+    assert result["data"] == {
+        CONF_ALLOW_SERVICE_CALLS: False,
+        CONF_SUBSCRIBE_LOGS: True,
+    }
+    assert len(mock_reload.mock_calls) == 1
 
 
 @pytest.mark.usefixtures("mock_zeroconf")
diff --git a/tests/components/esphome/test_diagnostics.py b/tests/components/esphome/test_diagnostics.py
index 832e7d6572f..2d64170bc97 100644
--- a/tests/components/esphome/test_diagnostics.py
+++ b/tests/components/esphome/test_diagnostics.py
@@ -37,7 +37,7 @@ async def test_diagnostics_with_bluetooth(
     mock_bluetooth_entry_with_raw_adv: MockESPHomeDevice,
 ) -> None:
     """Test diagnostics for config entry with Bluetooth."""
-    scanner = bluetooth.async_scanner_by_source(hass, "11:22:33:44:55:AA")
+    scanner = bluetooth.async_scanner_by_source(hass, "AA:BB:CC:DD:EE:FC")
     assert scanner is not None
     assert scanner.connectable is True
     entry = mock_bluetooth_entry_with_raw_adv.entry
@@ -49,13 +49,15 @@ async def test_diagnostics_with_bluetooth(
             "connections_limit": 0,
             "scanner": {
                 "connectable": True,
+                "current_mode": None,
+                "requested_mode": None,
                 "discovered_device_timestamps": {},
                 "discovered_devices_and_advertisement_data": [],
                 "last_detection": ANY,
                 "monotonic_time": ANY,
-                "name": "test (11:22:33:44:55:AA)",
+                "name": "test (AA:BB:CC:DD:EE:FC)",
                 "scanning": True,
-                "source": "11:22:33:44:55:AA",
+                "source": "AA:BB:CC:DD:EE:FC",
                 "start_time": ANY,
                 "time_since_last_device_detection": {},
                 "type": "ESPHomeScanner",
@@ -64,6 +66,7 @@ async def test_diagnostics_with_bluetooth(
         "config": {
             "created_at": ANY,
             "data": {
+                "bluetooth_mac_address": "**REDACTED**",
                 "device_name": "test",
                 "host": "test.local",
                 "password": "",
@@ -79,6 +82,7 @@ async def test_diagnostics_with_bluetooth(
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "source": "user",
+            "subentries": [],
             "title": "Mock Title",
             "unique_id": "11:22:33:44:55:aa",
             "version": 1,
@@ -86,6 +90,7 @@ async def test_diagnostics_with_bluetooth(
         "storage_data": {
             "api_version": {"major": 99, "minor": 99},
             "device_info": {
+                "bluetooth_mac_address": "**REDACTED**",
                 "bluetooth_proxy_feature_flags": 63,
                 "compilation_time": "",
                 "esphome_version": "1.0.0",
diff --git a/tests/components/esphome/test_manager.py b/tests/components/esphome/test_manager.py
index 6fbd3726f64..905a3f6bdc7 100644
--- a/tests/components/esphome/test_manager.py
+++ b/tests/components/esphome/test_manager.py
@@ -2,7 +2,8 @@
 
 import asyncio
 from collections.abc import Awaitable, Callable
-from unittest.mock import AsyncMock, call
+import logging
+from unittest.mock import AsyncMock, Mock, call
 
 from aioesphomeapi import (
     APIClient,
@@ -13,6 +14,7 @@ from aioesphomeapi import (
     HomeassistantServiceCall,
     InvalidAuthAPIError,
     InvalidEncryptionKeyAPIError,
+    LogLevel,
     RequiresEncryptionAPIError,
     UserService,
     UserServiceArg,
@@ -23,8 +25,11 @@ import pytest
 from homeassistant import config_entries
 from homeassistant.components.esphome.const import (
     CONF_ALLOW_SERVICE_CALLS,
+    CONF_BLUETOOTH_MAC_ADDRESS,
     CONF_DEVICE_NAME,
+    CONF_SUBSCRIBE_LOGS,
     DOMAIN,
+    STABLE_BLE_URL_VERSION,
     STABLE_BLE_VERSION_STR,
 )
 from homeassistant.const import (
@@ -44,6 +49,95 @@ from .conftest import MockESPHomeDevice
 from tests.common import MockConfigEntry, async_capture_events, async_mock_service
 
 
+async def test_esphome_device_subscribe_logs(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test configuring a device to subscribe to logs."""
+    assert await async_setup_component(hass, "logger", {"logger": {}})
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            CONF_HOST: "fe80::1",
+            CONF_PORT: 6053,
+            CONF_PASSWORD: "",
+        },
+        options={CONF_SUBSCRIBE_LOGS: True},
+    )
+    entry.add_to_hass(hass)
+    device: MockESPHomeDevice = await mock_esphome_device(
+        mock_client=mock_client,
+        entry=entry,
+        entity_info=[],
+        user_service=[],
+        device_info={},
+        states=[],
+    )
+    await hass.async_block_till_done()
+
+    await hass.services.async_call(
+        "logger",
+        "set_level",
+        {"homeassistant.components.esphome": "DEBUG"},
+        blocking=True,
+    )
+    assert device.current_log_level == LogLevel.LOG_LEVEL_VERY_VERBOSE
+
+    caplog.set_level(logging.DEBUG)
+    device.mock_on_log_message(
+        Mock(level=LogLevel.LOG_LEVEL_INFO, message=b"test_log_message")
+    )
+    await hass.async_block_till_done()
+    assert "test_log_message" in caplog.text
+
+    device.mock_on_log_message(
+        Mock(level=LogLevel.LOG_LEVEL_ERROR, message=b"test_error_log_message")
+    )
+    await hass.async_block_till_done()
+    assert "test_error_log_message" in caplog.text
+
+    caplog.set_level(logging.ERROR)
+    device.mock_on_log_message(
+        Mock(level=LogLevel.LOG_LEVEL_DEBUG, message=b"test_debug_log_message")
+    )
+    await hass.async_block_till_done()
+    assert "test_debug_log_message" not in caplog.text
+
+    caplog.set_level(logging.DEBUG)
+    device.mock_on_log_message(
+        Mock(level=LogLevel.LOG_LEVEL_DEBUG, message=b"test_debug_log_message")
+    )
+    await hass.async_block_till_done()
+    assert "test_debug_log_message" in caplog.text
+
+    await hass.services.async_call(
+        "logger",
+        "set_level",
+        {"homeassistant.components.esphome": "WARNING"},
+        blocking=True,
+    )
+    assert device.current_log_level == LogLevel.LOG_LEVEL_WARN
+    await hass.services.async_call(
+        "logger",
+        "set_level",
+        {"homeassistant.components.esphome": "ERROR"},
+        blocking=True,
+    )
+    assert device.current_log_level == LogLevel.LOG_LEVEL_ERROR
+    await hass.services.async_call(
+        "logger",
+        "set_level",
+        {"homeassistant.components.esphome": "INFO"},
+        blocking=True,
+    )
+    assert device.current_log_level == LogLevel.LOG_LEVEL_CONFIG
+
+
 async def test_esphome_device_service_calls_not_allowed(
     hass: HomeAssistant,
     mock_client: APIClient,
@@ -273,7 +367,7 @@ async def test_esphome_device_with_old_bluetooth(
     )
     assert (
         issue.learn_more_url
-        == f"https://esphome.io/changelog/{STABLE_BLE_VERSION_STR}.html"
+        == f"https://esphome.io/changelog/{STABLE_BLE_URL_VERSION}.html"
     )
 
 
@@ -383,6 +477,39 @@ async def test_unique_id_updated_to_mac(hass: HomeAssistant, mock_client) -> Non
     assert entry.unique_id == "11:22:33:44:55:aa"
 
 
+@pytest.mark.usefixtures("mock_zeroconf")
+async def test_add_missing_bluetooth_mac_address(
+    hass: HomeAssistant, mock_client
+) -> None:
+    """Test bluetooth mac is added if its missing."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={CONF_HOST: "test.local", CONF_PORT: 6053, CONF_PASSWORD: ""},
+        unique_id="mock-config-name",
+    )
+    entry.add_to_hass(hass)
+    subscribe_done = hass.loop.create_future()
+
+    def async_subscribe_states(*args, **kwargs) -> None:
+        subscribe_done.set_result(None)
+
+    mock_client.subscribe_states = async_subscribe_states
+    mock_client.device_info = AsyncMock(
+        return_value=DeviceInfo(
+            mac_address="1122334455aa",
+            bluetooth_mac_address="AA:BB:CC:DD:EE:FF",
+        )
+    )
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+    async with asyncio.timeout(1):
+        await subscribe_done
+
+    assert entry.unique_id == "11:22:33:44:55:aa"
+    assert entry.data.get(CONF_BLUETOOTH_MAC_ADDRESS) == "AA:BB:CC:DD:EE:FF"
+
+
 @pytest.mark.usefixtures("mock_zeroconf")
 async def test_unique_id_not_updated_if_name_same_and_already_mac(
     hass: HomeAssistant, mock_client: APIClient
@@ -1100,6 +1227,42 @@ async def test_esphome_device_with_web_server(
     assert dev.configuration_url == "http://test.local:80"
 
 
+async def test_esphome_device_with_ipv6_web_server(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    mock_client: APIClient,
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+) -> None:
+    """Test a device with a web server."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            CONF_HOST: "fe80::1",
+            CONF_PORT: 6053,
+            CONF_PASSWORD: "",
+        },
+        options={},
+    )
+    entry.add_to_hass(hass)
+    device = await mock_esphome_device(
+        mock_client=mock_client,
+        entry=entry,
+        entity_info=[],
+        user_service=[],
+        device_info={"webserver_port": 80},
+        states=[],
+    )
+    await hass.async_block_till_done()
+    entry = device.entry
+    dev = device_registry.async_get_device(
+        connections={(dr.CONNECTION_NETWORK_MAC, entry.unique_id)}
+    )
+    assert dev.configuration_url == "http://[fe80::1]:80"
+
+
 async def test_esphome_device_with_compilation_time(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
@@ -1209,3 +1372,32 @@ async def test_entry_missing_unique_id(
     await mock_esphome_device(mock_client=mock_client, mock_storage=True)
     await hass.async_block_till_done()
     assert entry.unique_id == "11:22:33:44:55:aa"
+
+
+async def test_entry_missing_bluetooth_mac_address(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+) -> None:
+    """Test the bluetooth_mac_address is added if available."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=None,
+        data={
+            CONF_HOST: "test.local",
+            CONF_PORT: 6053,
+            CONF_PASSWORD: "",
+        },
+        options={CONF_ALLOW_SERVICE_CALLS: True},
+    )
+    entry.add_to_hass(hass)
+    await mock_esphome_device(
+        mock_client=mock_client,
+        mock_storage=True,
+        device_info={"bluetooth_mac_address": "AA:BB:CC:DD:EE:FC"},
+    )
+    await hass.async_block_till_done()
+    assert entry.data[CONF_BLUETOOTH_MAC_ADDRESS] == "AA:BB:CC:DD:EE:FC"
diff --git a/tests/components/esphome/test_media_player.py b/tests/components/esphome/test_media_player.py
index 42b7e72a06e..a425b730771 100644
--- a/tests/components/esphome/test_media_player.py
+++ b/tests/components/esphome/test_media_player.py
@@ -38,7 +38,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import device_registry as dr
 from homeassistant.setup import async_setup_component
 
 from .conftest import MockESPHomeDevice
diff --git a/tests/components/event/test_init.py b/tests/components/event/test_init.py
index c6828c2c290..bc43a234ffc 100644
--- a/tests/components/event/test_init.py
+++ b/tests/components/event/test_init.py
@@ -17,7 +17,7 @@ from homeassistant.components.event import (
 from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.const import CONF_PLATFORM, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant, State
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import STORAGE_KEY as RESTORE_STATE_KEY
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -297,7 +297,7 @@ async def test_name(hass: HomeAssistant) -> None:
     async def async_setup_entry_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test event platform via config entry."""
         async_add_entities([entity1, entity2, entity3, entity4])
diff --git a/tests/components/evohome/conftest.py b/tests/components/evohome/conftest.py
index 6daab3f32bb..313982e3f97 100644
--- a/tests/components/evohome/conftest.py
+++ b/tests/components/evohome/conftest.py
@@ -3,26 +3,26 @@
 from __future__ import annotations
 
 from collections.abc import AsyncGenerator, Callable
-from datetime import datetime, timedelta, timezone
+from datetime import timedelta, timezone
 from http import HTTPMethod
 from typing import Any
 from unittest.mock import MagicMock, patch
 
-from aiohttp import ClientSession
 from evohomeasync2 import EvohomeClient
-from evohomeasync2.broker import Broker
-from evohomeasync2.controlsystem import ControlSystem
+from evohomeasync2.auth import AbstractTokenManager, Auth
+from evohomeasync2.control_system import ControlSystem
 from evohomeasync2.zone import Zone
+from freezegun.api import FrozenDateTimeFactory
 import pytest
 
-from homeassistant.components.evohome import CONF_PASSWORD, CONF_USERNAME, DOMAIN
-from homeassistant.const import Platform
+from homeassistant.components.evohome.const import DOMAIN
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util, slugify
 from homeassistant.util.json import JsonArrayType, JsonObjectType
 
-from .const import ACCESS_TOKEN, REFRESH_TOKEN, USERNAME
+from .const import ACCESS_TOKEN, REFRESH_TOKEN, SESSION_ID, USERNAME
 
 from tests.common import load_json_array_fixture, load_json_object_fixture
 
@@ -48,60 +48,85 @@ def location_status_fixture(install: str, loc_id: str | None = None) -> JsonObje
     return load_json_object_fixture(f"{install}/status_{loc_id}.json", DOMAIN)
 
 
-def dhw_schedule_fixture(install: str) -> JsonObjectType:
+def dhw_schedule_fixture(install: str, dhw_id: str | None = None) -> JsonObjectType:
     """Load JSON for the schedule of a domesticHotWater zone."""
     try:
-        return load_json_object_fixture(f"{install}/schedule_dhw.json", DOMAIN)
+        return load_json_object_fixture(f"{install}/schedule_{dhw_id}.json", DOMAIN)
     except FileNotFoundError:
         return load_json_object_fixture("default/schedule_dhw.json", DOMAIN)
 
 
-def zone_schedule_fixture(install: str) -> JsonObjectType:
+def zone_schedule_fixture(install: str, zon_id: str | None = None) -> JsonObjectType:
     """Load JSON for the schedule of a temperatureZone zone."""
     try:
-        return load_json_object_fixture(f"{install}/schedule_zone.json", DOMAIN)
+        return load_json_object_fixture(f"{install}/schedule_{zon_id}.json", DOMAIN)
     except FileNotFoundError:
         return load_json_object_fixture("default/schedule_zone.json", DOMAIN)
 
 
-def mock_get_factory(install: str) -> Callable:
+def mock_post_request(install: str) -> Callable:
+    """Obtain an access token via a POST to the vendor's web API."""
+
+    async def post_request(
+        self: AbstractTokenManager, url: str, /, **kwargs: Any
+    ) -> JsonArrayType | JsonObjectType:
+        """Obtain an access token via a POST to the vendor's web API."""
+
+        if "Token" in url:
+            return {
+                "access_token": f"new_{ACCESS_TOKEN}",
+                "token_type": "bearer",
+                "expires_in": 1800,
+                "refresh_token": f"new_{REFRESH_TOKEN}",
+                # "scope": "EMEA-V1-Basic EMEA-V1-Anonymous",  # optional
+            }
+
+        if "session" in url:
+            return {"sessionId": f"new_{SESSION_ID}"}
+
+        pytest.fail(f"Unexpected request: {HTTPMethod.POST} {url}")
+
+    return post_request
+
+
+def mock_make_request(install: str) -> Callable:
     """Return a get method for a specified installation."""
 
-    async def mock_get(
-        self: Broker, url: str, **kwargs: Any
+    async def make_request(
+        self: Auth, method: HTTPMethod, url: str, **kwargs: Any
     ) -> JsonArrayType | JsonObjectType:
         """Return the JSON for a HTTP get of a given URL."""
 
-        # a proxy for the behaviour of the real web API
-        if self.refresh_token is None:
-            self.refresh_token = f"new_{REFRESH_TOKEN}"
+        if method != HTTPMethod.GET:
+            pytest.fail(f"Unmocked method: {method} {url}")
 
-        if (
-            self.access_token_expires is None
-            or self.access_token_expires < datetime.now()
-        ):
-            self.access_token = f"new_{ACCESS_TOKEN}"
-            self.access_token_expires = datetime.now() + timedelta(minutes=30)
+        await self._headers()
 
         # assume a valid GET, and return the JSON for that web API
-        if url == "userAccount":  # userAccount
+        if url == "accountInfo":  # /v0/accountInfo
+            return {}  # will throw a KeyError -> BadApiResponseError
+
+        if url.startswith("locations/"):  # /v0/locations?userId={id}&allData=True
+            return []  # user has no locations
+
+        if url == "userAccount":  # /v2/userAccount
             return user_account_config_fixture(install)
 
-        if url.startswith("location"):
-            if "installationInfo" in url:  # location/installationInfo?userId={id}
+        if url.startswith("location/"):
+            if "installationInfo" in url:  # /v2/location/installationInfo?userId={id}
                 return user_locations_config_fixture(install)
-            if "location" in url:  # location/{id}/status
+            if "status" in url:  # /v2/location/{id}/status
                 return location_status_fixture(install)
 
         elif "schedule" in url:
-            if url.startswith("domesticHotWater"):  # domesticHotWater/{id}/schedule
-                return dhw_schedule_fixture(install)
-            if url.startswith("temperatureZone"):  # temperatureZone/{id}/schedule
-                return zone_schedule_fixture(install)
+            if url.startswith("domesticHotWater"):  # /v2/domesticHotWater/{id}/schedule
+                return dhw_schedule_fixture(install, url[16:23])
+            if url.startswith("temperatureZone"):  # /v2/temperatureZone/{id}/schedule
+                return zone_schedule_fixture(install, url[16:23])
 
         pytest.fail(f"Unexpected request: {HTTPMethod.GET} {url}")
 
-    return mock_get
+    return make_request
 
 
 @pytest.fixture
@@ -137,9 +162,13 @@ async def setup_evohome(
     dt_util.set_default_time_zone(timezone(timedelta(minutes=utc_offset)))
 
     with (
-        patch("homeassistant.components.evohome.evo.EvohomeClient") as mock_client,
-        patch("homeassistant.components.evohome.ev1.EvohomeClient", return_value=None),
-        patch("evohomeasync2.broker.Broker.get", mock_get_factory(install)),
+        # patch("homeassistant.components.evohome.ec1.EvohomeClient", return_value=None),
+        patch("homeassistant.components.evohome.ec2.EvohomeClient") as mock_client,
+        patch(
+            "evohomeasync2.auth.CredentialsManagerBase._post_request",
+            mock_post_request(install),
+        ),
+        patch("evohome.auth.AbstractAuth._make_request", mock_make_request(install)),
     ):
         evo: EvohomeClient | None = None
 
@@ -155,12 +184,11 @@ async def setup_evohome(
 
         mock_client.assert_called_once()
 
-        assert mock_client.call_args.args[0] == config[CONF_USERNAME]
-        assert mock_client.call_args.args[1] == config[CONF_PASSWORD]
+        assert isinstance(evo, EvohomeClient)
+        assert evo._token_manager.client_id == config[CONF_USERNAME]
+        assert evo._token_manager._secret == config[CONF_PASSWORD]
 
-        assert isinstance(mock_client.call_args.kwargs["session"], ClientSession)
-
-        assert evo and evo.account_info is not None
+        assert evo.user_account
 
         mock_client.return_value = evo
         yield mock_client
@@ -170,39 +198,32 @@ async def setup_evohome(
 async def evohome(
     hass: HomeAssistant,
     config: dict[str, str],
+    freezer: FrozenDateTimeFactory,
     install: str,
 ) -> AsyncGenerator[MagicMock]:
     """Return the mocked evohome client for this install fixture."""
 
+    freezer.move_to("2024-07-10T12:00:00Z")  # so schedules are as expected
+
     async for mock_client in setup_evohome(hass, config, install=install):
         yield mock_client
 
 
 @pytest.fixture
-async def ctl_id(
-    hass: HomeAssistant,
-    config: dict[str, str],
-    install: MagicMock,
-) -> AsyncGenerator[str]:
+def ctl_id(evohome: MagicMock) -> str:
     """Return the entity_id of the evohome integration's controller."""
 
-    async for mock_client in setup_evohome(hass, config, install=install):
-        evo: EvohomeClient = mock_client.return_value
-        ctl: ControlSystem = evo._get_single_tcs()
+    evo: EvohomeClient = evohome.return_value
+    ctl: ControlSystem = evo.tcs
 
-        yield f"{Platform.CLIMATE}.{slugify(ctl.location.name)}"
+    return f"{Platform.CLIMATE}.{slugify(ctl.location.name)}"
 
 
 @pytest.fixture
-async def zone_id(
-    hass: HomeAssistant,
-    config: dict[str, str],
-    install: MagicMock,
-) -> AsyncGenerator[str]:
+def zone_id(evohome: MagicMock) -> str:
     """Return the entity_id of the evohome integration's first zone."""
 
-    async for mock_client in setup_evohome(hass, config, install=install):
-        evo: EvohomeClient = mock_client.return_value
-        zone: Zone = list(evo._get_single_tcs().zones.values())[0]
+    evo: EvohomeClient = evohome.return_value
+    zone: Zone = evo.tcs.zones[0]
 
-        yield f"{Platform.CLIMATE}.{slugify(zone.name)}"
+    return f"{Platform.CLIMATE}.{slugify(zone.name)}"
diff --git a/tests/components/evohome/const.py b/tests/components/evohome/const.py
index c3dc92c3fbc..dceb2f60a06 100644
--- a/tests/components/evohome/const.py
+++ b/tests/components/evohome/const.py
@@ -15,8 +15,9 @@ TEST_INSTALLS: Final = (
     "default",  # evohome: multi-zone, with DHW
     "h032585",  # VisionProWifi: no preset modes for TCS, zoneId=systemId
     "h099625",  # RoundThermostat
+    "h139906",  # zone with null schedule
     "sys_004",  # RoundModulation
 )
 #   "botched",  # as default: but with activeFaults, ghost zones & unknown types
 
-TEST_INSTALLS_WITH_DHW: Final = ("default",)
+TEST_INSTALLS_WITH_DHW: Final = ("default", "botched")
diff --git a/tests/components/evohome/fixtures/botched/schedule_3933910.json b/tests/components/evohome/fixtures/botched/schedule_3933910.json
new file mode 100644
index 00000000000..0e5a9308d5b
--- /dev/null
+++ b/tests/components/evohome/fixtures/botched/schedule_3933910.json
@@ -0,0 +1,3 @@
+{
+  "dailySchedules": []
+}
diff --git a/tests/components/evohome/fixtures/botched/user_locations.json b/tests/components/evohome/fixtures/botched/user_locations.json
index f2f4091a2dc..0016c5db007 100644
--- a/tests/components/evohome/fixtures/botched/user_locations.json
+++ b/tests/components/evohome/fixtures/botched/user_locations.json
@@ -8,14 +8,14 @@
       "country": "UnitedKingdom",
       "postcode": "E1 1AA",
       "locationType": "Residential",
-      "useDaylightSaveSwitching": true,
       "timeZone": {
-        "timeZoneId": "GMTStandardTime",
-        "displayName": "(UTC+00:00) Dublin, Edinburgh, Lisbon, London",
-        "offsetMinutes": 0,
-        "currentOffsetMinutes": 60,
+        "timeZoneId": "PacificSAStandardTime",
+        "displayName": "(UTC-04:00) Santiago",
+        "offsetMinutes": -240,
+        "currentOffsetMinutes": -180,
         "supportsDaylightSaving": true
       },
+      "useDaylightSaveSwitching": true,
       "locationOwner": {
         "userId": "2263181",
         "username": "user_2263181@gmail.com",
diff --git a/tests/components/evohome/fixtures/h032585/user_locations.json b/tests/components/evohome/fixtures/h032585/user_locations.json
index b4ea2e5c420..c291d591c99 100644
--- a/tests/components/evohome/fixtures/h032585/user_locations.json
+++ b/tests/components/evohome/fixtures/h032585/user_locations.json
@@ -3,6 +3,7 @@
     "locationInfo": {
       "locationId": "111111",
       "name": "My Home",
+      "useDaylightSaveSwitching": true,
       "timeZone": {
         "timeZoneId": "GMTStandardTime",
         "displayName": "(UTC+00:00) Dublin, Edinburgh, Lisbon, London",
diff --git a/tests/components/evohome/fixtures/h099625/user_locations.json b/tests/components/evohome/fixtures/h099625/user_locations.json
index cc32caccc73..31cac00ae9e 100644
--- a/tests/components/evohome/fixtures/h099625/user_locations.json
+++ b/tests/components/evohome/fixtures/h099625/user_locations.json
@@ -3,6 +3,7 @@
     "locationInfo": {
       "locationId": "111111",
       "name": "My Home",
+      "useDaylightSaveSwitching": true,
       "timeZone": {
         "timeZoneId": "FLEStandardTime",
         "displayName": "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius",
diff --git a/tests/components/evohome/fixtures/h139906/schedule_3454854.json b/tests/components/evohome/fixtures/h139906/schedule_3454854.json
new file mode 100644
index 00000000000..0e5a9308d5b
--- /dev/null
+++ b/tests/components/evohome/fixtures/h139906/schedule_3454854.json
@@ -0,0 +1,3 @@
+{
+  "dailySchedules": []
+}
diff --git a/tests/components/evohome/fixtures/h139906/schedule_3454855.json b/tests/components/evohome/fixtures/h139906/schedule_3454855.json
new file mode 100644
index 00000000000..12f8a6cb390
--- /dev/null
+++ b/tests/components/evohome/fixtures/h139906/schedule_3454855.json
@@ -0,0 +1,143 @@
+{
+  "dailySchedules": [
+    {
+      "dayOfWeek": "Monday",
+      "switchpoints": [
+        {
+          "heatSetpoint": 22.0,
+          "timeOfDay": "05:30:00"
+        },
+        {
+          "heatSetpoint": 20.0,
+          "timeOfDay": "08:00:00"
+        },
+        {
+          "heatSetpoint": 22.5,
+          "timeOfDay": "16:00:00"
+        },
+        {
+          "heatSetpoint": 15.0,
+          "timeOfDay": "23:00:00"
+        }
+      ]
+    },
+    {
+      "dayOfWeek": "Tuesday",
+      "switchpoints": [
+        {
+          "heatSetpoint": 22.0,
+          "timeOfDay": "05:30:00"
+        },
+        {
+          "heatSetpoint": 20.0,
+          "timeOfDay": "08:00:00"
+        },
+        {
+          "heatSetpoint": 22.5,
+          "timeOfDay": "16:00:00"
+        },
+        {
+          "heatSetpoint": 15.0,
+          "timeOfDay": "23:00:00"
+        }
+      ]
+    },
+    {
+      "dayOfWeek": "Wednesday",
+      "switchpoints": [
+        {
+          "heatSetpoint": 22.0,
+          "timeOfDay": "05:30:00"
+        },
+        {
+          "heatSetpoint": 20.0,
+          "timeOfDay": "08:00:00"
+        },
+        {
+          "heatSetpoint": 22.5,
+          "timeOfDay": "12:00:00"
+        },
+        {
+          "heatSetpoint": 15.0,
+          "timeOfDay": "23:00:00"
+        }
+      ]
+    },
+    {
+      "dayOfWeek": "Thursday",
+      "switchpoints": [
+        {
+          "heatSetpoint": 22.0,
+          "timeOfDay": "05:30:00"
+        },
+        {
+          "heatSetpoint": 20.0,
+          "timeOfDay": "08:00:00"
+        },
+        {
+          "heatSetpoint": 22.5,
+          "timeOfDay": "16:00:00"
+        },
+        {
+          "heatSetpoint": 15.0,
+          "timeOfDay": "23:00:00"
+        }
+      ]
+    },
+    {
+      "dayOfWeek": "Friday",
+      "switchpoints": [
+        {
+          "heatSetpoint": 22.0,
+          "timeOfDay": "05:30:00"
+        },
+        {
+          "heatSetpoint": 20.0,
+          "timeOfDay": "08:00:00"
+        },
+        {
+          "heatSetpoint": 22.5,
+          "timeOfDay": "16:00:00"
+        },
+        {
+          "heatSetpoint": 15.0,
+          "timeOfDay": "23:00:00"
+        }
+      ]
+    },
+    {
+      "dayOfWeek": "Saturday",
+      "switchpoints": [
+        {
+          "heatSetpoint": 22.0,
+          "timeOfDay": "07:00:00"
+        },
+        {
+          "heatSetpoint": 22.5,
+          "timeOfDay": "16:00:00"
+        },
+        {
+          "heatSetpoint": 15.0,
+          "timeOfDay": "23:00:00"
+        }
+      ]
+    },
+    {
+      "dayOfWeek": "Sunday",
+      "switchpoints": [
+        {
+          "heatSetpoint": 22.0,
+          "timeOfDay": "07:30:00"
+        },
+        {
+          "heatSetpoint": 22.5,
+          "timeOfDay": "16:00:00"
+        },
+        {
+          "heatSetpoint": 15.0,
+          "timeOfDay": "23:00:00"
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/components/evohome/fixtures/h139906/status_2727366.json b/tests/components/evohome/fixtures/h139906/status_2727366.json
new file mode 100644
index 00000000000..2c123b796bd
--- /dev/null
+++ b/tests/components/evohome/fixtures/h139906/status_2727366.json
@@ -0,0 +1,52 @@
+{
+  "locationId": "2727366",
+  "gateways": [
+    {
+      "gatewayId": "2513794",
+      "temperatureControlSystems": [
+        {
+          "systemId": "3454856",
+          "zones": [
+            {
+              "zoneId": "3454854",
+              "temperatureStatus": {
+                "temperature": 22.0,
+                "isAvailable": true
+              },
+              "activeFaults": [
+                {
+                  "faultType": "TempZoneSensorCommunicationLost",
+                  "since": "2025-02-06T11:20:29"
+                }
+              ],
+              "setpointStatus": {
+                "targetHeatTemperature": 5.0,
+                "setpointMode": "FollowSchedule"
+              },
+              "name": "Thermostat"
+            },
+            {
+              "zoneId": "3454855",
+              "temperatureStatus": {
+                "temperature": 22.0,
+                "isAvailable": true
+              },
+              "activeFaults": [],
+              "setpointStatus": {
+                "targetHeatTemperature": 20.0,
+                "setpointMode": "FollowSchedule"
+              },
+              "name": "Thermostat 2"
+            }
+          ],
+          "activeFaults": [],
+          "systemModeStatus": {
+            "mode": "Auto",
+            "isPermanent": true
+          }
+        }
+      ],
+      "activeFaults": []
+    }
+  ]
+}
diff --git a/tests/components/evohome/fixtures/h139906/user_locations.json b/tests/components/evohome/fixtures/h139906/user_locations.json
new file mode 100644
index 00000000000..14db65a5e0d
--- /dev/null
+++ b/tests/components/evohome/fixtures/h139906/user_locations.json
@@ -0,0 +1,125 @@
+[
+  {
+    "locationInfo": {
+      "locationId": "2727366",
+      "name": "Vr**********",
+      "streetAddress": "********** *",
+      "city": "*********",
+      "country": "Netherlands",
+      "postcode": "******",
+      "locationType": "Residential",
+      "useDaylightSaveSwitching": true,
+      "timeZone": {
+        "timeZoneId": "WEuropeStandardTime",
+        "displayName": "(UTC+01:00) Amsterdam, Berlijn, Bern, Rome, Stockholm, Wenen",
+        "offsetMinutes": 60,
+        "currentOffsetMinutes": 60,
+        "supportsDaylightSaving": true
+      },
+      "locationOwner": {
+        "userId": "2276512",
+        "username": "nobody@nowhere.com",
+        "firstname": "Gl***",
+        "lastname": "de*****"
+      }
+    },
+    "gateways": [
+      {
+        "gatewayInfo": {
+          "gatewayId": "2513794",
+          "mac": "************",
+          "crc": "****",
+          "isWiFi": false
+        },
+        "temperatureControlSystems": [
+          {
+            "systemId": "3454856",
+            "modelType": "EvoTouch",
+            "zones": [
+              {
+                "zoneId": "3454854",
+                "modelType": "HeatingZone",
+                "setpointCapabilities": {
+                  "maxHeatSetpoint": 35.0,
+                  "minHeatSetpoint": 5.0,
+                  "valueResolution": 0.5,
+                  "canControlHeat": true,
+                  "canControlCool": false,
+                  "allowedSetpointModes": [
+                    "PermanentOverride",
+                    "FollowSchedule",
+                    "TemporaryOverride"
+                  ],
+                  "maxDuration": "1.00:00:00",
+                  "timingResolution": "00:10:00"
+                },
+                "scheduleCapabilities": {
+                  "maxSwitchpointsPerDay": 6,
+                  "minSwitchpointsPerDay": 1,
+                  "timingResolution": "00:10:00",
+                  "setpointValueResolution": 0.5
+                },
+                "name": "Thermostat",
+                "zoneType": "ZoneTemperatureControl"
+              },
+              {
+                "zoneId": "3454855",
+                "modelType": "RoundWireless",
+                "setpointCapabilities": {
+                  "maxHeatSetpoint": 35.0,
+                  "minHeatSetpoint": 5.0,
+                  "valueResolution": 0.5,
+                  "canControlHeat": true,
+                  "canControlCool": false,
+                  "allowedSetpointModes": [
+                    "PermanentOverride",
+                    "FollowSchedule",
+                    "TemporaryOverride"
+                  ],
+                  "maxDuration": "1.00:00:00",
+                  "timingResolution": "00:10:00"
+                },
+                "scheduleCapabilities": {
+                  "maxSwitchpointsPerDay": 6,
+                  "minSwitchpointsPerDay": 0,
+                  "timingResolution": "00:10:00",
+                  "setpointValueResolution": 0.5
+                },
+                "name": "Thermostat 2",
+                "zoneType": "Thermostat"
+              }
+            ],
+            "allowedSystemModes": [
+              {
+                "systemMode": "Auto",
+                "canBePermanent": true,
+                "canBeTemporary": false
+              },
+              {
+                "systemMode": "AutoWithEco",
+                "canBePermanent": true,
+                "canBeTemporary": true,
+                "maxDuration": "1.00:00:00",
+                "timingResolution": "01:00:00",
+                "timingMode": "Duration"
+              },
+              {
+                "systemMode": "Away",
+                "canBePermanent": true,
+                "canBeTemporary": true,
+                "maxDuration": "99.00:00:00",
+                "timingResolution": "1.00:00:00",
+                "timingMode": "Period"
+              },
+              {
+                "systemMode": "HeatingOff",
+                "canBePermanent": true,
+                "canBeTemporary": false
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/tests/components/evohome/snapshots/test_climate.ambr b/tests/components/evohome/snapshots/test_climate.ambr
index ce7fcf2744e..7fb0ae5aaec 100644
--- a/tests/components/evohome/snapshots/test_climate.ambr
+++ b/tests/components/evohome/snapshots/test_climate.ambr
@@ -2,120 +2,144 @@
 # name: test_ctl_set_hvac_mode[default]
   list([
     tuple(
-      'HeatingOff',
+      <SystemMode.HEATING_OFF: 'HeatingOff'>,
     ),
     tuple(
-      'Auto',
+      <SystemMode.AUTO: 'Auto'>,
     ),
   ])
 # ---
 # name: test_ctl_set_hvac_mode[h032585]
   list([
     tuple(
-      'Off',
+      <SystemMode.OFF: 'Off'>,
     ),
     tuple(
-      'Heat',
+      <SystemMode.HEAT: 'Heat'>,
     ),
   ])
 # ---
 # name: test_ctl_set_hvac_mode[h099625]
   list([
     tuple(
-      'HeatingOff',
+      <SystemMode.HEATING_OFF: 'HeatingOff'>,
     ),
     tuple(
-      'Auto',
+      <SystemMode.AUTO: 'Auto'>,
+    ),
+  ])
+# ---
+# name: test_ctl_set_hvac_mode[h139906]
+  list([
+    tuple(
+      <SystemMode.HEATING_OFF: 'HeatingOff'>,
+    ),
+    tuple(
+      <SystemMode.AUTO: 'Auto'>,
     ),
   ])
 # ---
 # name: test_ctl_set_hvac_mode[minimal]
   list([
     tuple(
-      'HeatingOff',
+      <SystemMode.HEATING_OFF: 'HeatingOff'>,
     ),
     tuple(
-      'Auto',
+      <SystemMode.AUTO: 'Auto'>,
     ),
   ])
 # ---
 # name: test_ctl_set_hvac_mode[sys_004]
   list([
     tuple(
-      'HeatingOff',
+      <SystemMode.HEATING_OFF: 'HeatingOff'>,
     ),
     tuple(
-      'Auto',
+      <SystemMode.AUTO: 'Auto'>,
     ),
   ])
 # ---
 # name: test_ctl_turn_off[default]
   list([
     tuple(
-      'HeatingOff',
+      <SystemMode.HEATING_OFF: 'HeatingOff'>,
     ),
   ])
 # ---
 # name: test_ctl_turn_off[h032585]
   list([
     tuple(
-      'Off',
+      <SystemMode.OFF: 'Off'>,
     ),
   ])
 # ---
 # name: test_ctl_turn_off[h099625]
   list([
     tuple(
-      'HeatingOff',
+      <SystemMode.HEATING_OFF: 'HeatingOff'>,
+    ),
+  ])
+# ---
+# name: test_ctl_turn_off[h139906]
+  list([
+    tuple(
+      <SystemMode.HEATING_OFF: 'HeatingOff'>,
     ),
   ])
 # ---
 # name: test_ctl_turn_off[minimal]
   list([
     tuple(
-      'HeatingOff',
+      <SystemMode.HEATING_OFF: 'HeatingOff'>,
     ),
   ])
 # ---
 # name: test_ctl_turn_off[sys_004]
   list([
     tuple(
-      'HeatingOff',
+      <SystemMode.HEATING_OFF: 'HeatingOff'>,
     ),
   ])
 # ---
 # name: test_ctl_turn_on[default]
   list([
     tuple(
-      'Auto',
+      <SystemMode.AUTO: 'Auto'>,
     ),
   ])
 # ---
 # name: test_ctl_turn_on[h032585]
   list([
     tuple(
-      'Heat',
+      <SystemMode.HEAT: 'Heat'>,
     ),
   ])
 # ---
 # name: test_ctl_turn_on[h099625]
   list([
     tuple(
-      'Auto',
+      <SystemMode.AUTO: 'Auto'>,
+    ),
+  ])
+# ---
+# name: test_ctl_turn_on[h139906]
+  list([
+    tuple(
+      <SystemMode.AUTO: 'Auto'>,
     ),
   ])
 # ---
 # name: test_ctl_turn_on[minimal]
   list([
     tuple(
-      'Auto',
+      <SystemMode.AUTO: 'Auto'>,
     ),
   ])
 # ---
 # name: test_ctl_turn_on[sys_004]
   list([
     tuple(
-      'Auto',
+      <SystemMode.AUTO: 'Auto'>,
     ),
   ])
 # ---
@@ -137,17 +161,17 @@
         'permanent',
       ]),
       'status': dict({
-        'active_faults': list([
-        ]),
+        'activeFaults': tuple(
+        ),
         'setpoint_status': dict({
           'setpoint_mode': 'FollowSchedule',
           'target_heat_temperature': 16.0,
         }),
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='America/Santiago')),
+          'next_sp_temp': 16.0,
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 7, 0, tzinfo=zoneinfo.ZoneInfo(key='America/Santiago')),
+          'this_sp_temp': 18.1,
         }),
         'temperature_status': dict({
           'is_available': True,
@@ -184,17 +208,17 @@
         'permanent',
       ]),
       'status': dict({
-        'active_faults': list([
-        ]),
+        'activeFaults': tuple(
+        ),
         'setpoint_status': dict({
           'setpoint_mode': 'FollowSchedule',
           'target_heat_temperature': 17.0,
         }),
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='America/Santiago')),
+          'next_sp_temp': 16.0,
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 7, 0, tzinfo=zoneinfo.ZoneInfo(key='America/Santiago')),
+          'this_sp_temp': 18.1,
         }),
         'temperature_status': dict({
           'is_available': False,
@@ -230,22 +254,22 @@
         'permanent',
       ]),
       'status': dict({
-        'active_faults': list([
+        'activeFaults': tuple(
           dict({
-            'faultType': 'TempZoneActuatorLowBattery',
-            'since': '2022-03-02T04:50:20',
+            'fault_type': 'TempZoneActuatorLowBattery',
+            'since': '2022-03-02T04:50:20-03:00',
           }),
-        ]),
+        ),
         'setpoint_status': dict({
           'setpoint_mode': 'TemporaryOverride',
           'target_heat_temperature': 21.0,
-          'until': '2022-03-07T20:00:00+01:00',
+          'until': '2022-03-07T16:00:00-03:00',
         }),
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='America/Santiago')),
+          'next_sp_temp': 16.0,
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 7, 0, tzinfo=zoneinfo.ZoneInfo(key='America/Santiago')),
+          'this_sp_temp': 18.1,
         }),
         'temperature_status': dict({
           'is_available': True,
@@ -282,17 +306,17 @@
         'permanent',
       ]),
       'status': dict({
-        'active_faults': list([
-        ]),
+        'activeFaults': tuple(
+        ),
         'setpoint_status': dict({
           'setpoint_mode': 'FollowSchedule',
           'target_heat_temperature': 17.0,
         }),
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='America/Santiago')),
+          'next_sp_temp': 16.0,
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 7, 0, tzinfo=zoneinfo.ZoneInfo(key='America/Santiago')),
+          'this_sp_temp': 18.1,
         }),
         'temperature_status': dict({
           'is_available': True,
@@ -329,17 +353,17 @@
         'permanent',
       ]),
       'status': dict({
-        'active_faults': list([
-        ]),
+        'activeFaults': tuple(
+        ),
         'setpoint_status': dict({
           'setpoint_mode': 'FollowSchedule',
           'target_heat_temperature': 17.0,
         }),
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='America/Santiago')),
+          'next_sp_temp': 16.0,
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 7, 0, tzinfo=zoneinfo.ZoneInfo(key='America/Santiago')),
+          'this_sp_temp': 18.1,
         }),
         'temperature_status': dict({
           'is_available': True,
@@ -376,17 +400,17 @@
         'permanent',
       ]),
       'status': dict({
-        'active_faults': list([
-        ]),
+        'activeFaults': tuple(
+        ),
         'setpoint_status': dict({
           'setpoint_mode': 'FollowSchedule',
           'target_heat_temperature': 16.0,
         }),
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='America/Santiago')),
+          'next_sp_temp': 16.0,
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 7, 0, tzinfo=zoneinfo.ZoneInfo(key='America/Santiago')),
+          'this_sp_temp': 18.1,
         }),
         'temperature_status': dict({
           'is_available': True,
@@ -423,21 +447,21 @@
         'permanent',
       ]),
       'status': dict({
-        'active_faults': list([
+        'activeFaults': tuple(
           dict({
-            'faultType': 'TempZoneActuatorCommunicationLost',
-            'since': '2022-03-02T15:56:01',
+            'fault_type': 'TempZoneActuatorCommunicationLost',
+            'since': '2022-03-02T15:56:01-03:00',
           }),
-        ]),
+        ),
         'setpoint_status': dict({
           'setpoint_mode': 'PermanentOverride',
           'target_heat_temperature': 17.0,
         }),
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='America/Santiago')),
+          'next_sp_temp': 16.0,
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 7, 0, tzinfo=zoneinfo.ZoneInfo(key='America/Santiago')),
+          'this_sp_temp': 18.1,
         }),
         'temperature_status': dict({
           'is_available': True,
@@ -477,8 +501,8 @@
         'Custom',
       ]),
       'status': dict({
-        'active_system_faults': list([
-        ]),
+        'activeSystemFaults': tuple(
+        ),
         'system_id': '3432522',
         'system_mode_status': dict({
           'is_permanent': True,
@@ -513,16 +537,16 @@
         'permanent',
       ]),
       'status': dict({
-        'active_faults': list([
-        ]),
+        'activeFaults': tuple(
+        ),
         'setpoint_status': dict({
           'setpoint_mode': 'FollowSchedule',
           'target_heat_temperature': 16.0,
         }),
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 22, 10, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'this_sp_temp': 16.0,
         }),
         'temperature_status': dict({
@@ -560,16 +584,16 @@
         'permanent',
       ]),
       'status': dict({
-        'active_faults': list([
-        ]),
+        'activeFaults': tuple(
+        ),
         'setpoint_status': dict({
           'setpoint_mode': 'FollowSchedule',
           'target_heat_temperature': 17.0,
         }),
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 22, 10, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'this_sp_temp': 16.0,
         }),
         'temperature_status': dict({
@@ -606,17 +630,17 @@
         'permanent',
       ]),
       'status': dict({
-        'active_faults': list([
-        ]),
+        'activeFaults': tuple(
+        ),
         'setpoint_status': dict({
           'setpoint_mode': 'TemporaryOverride',
           'target_heat_temperature': 21.0,
-          'until': '2022-03-07T20:00:00+01:00',
+          'until': '2022-03-07T19:00:00+00:00',
         }),
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 22, 10, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'this_sp_temp': 16.0,
         }),
         'temperature_status': dict({
@@ -654,16 +678,16 @@
         'permanent',
       ]),
       'status': dict({
-        'active_faults': list([
-        ]),
+        'activeFaults': tuple(
+        ),
         'setpoint_status': dict({
           'setpoint_mode': 'FollowSchedule',
           'target_heat_temperature': 17.0,
         }),
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 22, 10, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'this_sp_temp': 16.0,
         }),
         'temperature_status': dict({
@@ -701,16 +725,16 @@
         'permanent',
       ]),
       'status': dict({
-        'active_faults': list([
-        ]),
+        'activeFaults': tuple(
+        ),
         'setpoint_status': dict({
           'setpoint_mode': 'FollowSchedule',
           'target_heat_temperature': 17.0,
         }),
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 22, 10, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'this_sp_temp': 16.0,
         }),
         'temperature_status': dict({
@@ -748,16 +772,16 @@
         'permanent',
       ]),
       'status': dict({
-        'active_faults': list([
-        ]),
+        'activeFaults': tuple(
+        ),
         'setpoint_status': dict({
           'setpoint_mode': 'FollowSchedule',
           'target_heat_temperature': 16.0,
         }),
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 22, 10, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'this_sp_temp': 16.0,
         }),
         'temperature_status': dict({
@@ -795,16 +819,16 @@
         'permanent',
       ]),
       'status': dict({
-        'active_faults': list([
-        ]),
+        'activeFaults': tuple(
+        ),
         'setpoint_status': dict({
           'setpoint_mode': 'PermanentOverride',
           'target_heat_temperature': 17.0,
         }),
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 22, 10, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'this_sp_temp': 16.0,
         }),
         'temperature_status': dict({
@@ -845,8 +869,8 @@
         'Custom',
       ]),
       'status': dict({
-        'active_system_faults': list([
-        ]),
+        'activeSystemFaults': tuple(
+        ),
         'system_id': '3432522',
         'system_mode_status': dict({
           'is_permanent': True,
@@ -881,16 +905,16 @@
         'permanent',
       ]),
       'status': dict({
-        'active_faults': list([
-        ]),
+        'activeFaults': tuple(
+        ),
         'setpoint_status': dict({
           'setpoint_mode': 'PermanentOverride',
           'target_heat_temperature': 14.0,
         }),
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 22, 10, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'this_sp_temp': 16.0,
         }),
         'temperature_status': dict({
@@ -923,8 +947,8 @@
       'max_temp': 35,
       'min_temp': 7,
       'status': dict({
-        'active_system_faults': list([
-        ]),
+        'activeSystemFaults': tuple(
+        ),
         'system_id': '416856',
         'system_mode_status': dict({
           'is_permanent': True,
@@ -959,16 +983,16 @@
         'permanent',
       ]),
       'status': dict({
-        'active_faults': list([
-        ]),
+        'activeFaults': tuple(
+        ),
         'setpoint_status': dict({
           'setpoint_mode': 'FollowSchedule',
           'target_heat_temperature': 21.5,
         }),
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 22, 10, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'this_sp_temp': 16.0,
         }),
         'temperature_status': dict({
@@ -1006,8 +1030,8 @@
         'away',
       ]),
       'status': dict({
-        'active_system_faults': list([
-        ]),
+        'activeSystemFaults': tuple(
+        ),
         'system_id': '8557535',
         'system_mode_status': dict({
           'is_permanent': True,
@@ -1042,16 +1066,16 @@
         'permanent',
       ]),
       'status': dict({
-        'active_faults': list([
-        ]),
+        'activeFaults': tuple(
+        ),
         'setpoint_status': dict({
           'setpoint_mode': 'FollowSchedule',
           'target_heat_temperature': 21.5,
         }),
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+03:00',
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 22, 10, tzinfo=zoneinfo.ZoneInfo(key='Europe/Kiev')),
           'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+03:00',
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Kiev')),
           'this_sp_temp': 16.0,
         }),
         'temperature_status': dict({
@@ -1089,16 +1113,16 @@
         'permanent',
       ]),
       'status': dict({
-        'active_faults': list([
-        ]),
+        'activeFaults': tuple(
+        ),
         'setpoint_status': dict({
           'setpoint_mode': 'FollowSchedule',
           'target_heat_temperature': 21.5,
         }),
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+03:00',
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 22, 10, tzinfo=zoneinfo.ZoneInfo(key='Europe/Kiev')),
           'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+03:00',
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Kiev')),
           'this_sp_temp': 16.0,
         }),
         'temperature_status': dict({
@@ -1118,6 +1142,136 @@
     'state': 'heat',
   })
 # ---
+# name: test_setup_platform[h139906][climate.thermostat-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_temperature': 22.0,
+      'friendly_name': 'Thermostat',
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'max_temp': 35.0,
+      'min_temp': 5.0,
+      'preset_mode': 'none',
+      'preset_modes': list([
+        'none',
+        'temporary',
+        'permanent',
+      ]),
+      'status': dict({
+        'activeFaults': tuple(
+          dict({
+            'fault_type': 'TempZoneSensorCommunicationLost',
+            'since': '2025-02-06T11:20:29+01:00',
+          }),
+        ),
+        'setpoint_status': dict({
+          'setpoint_mode': 'FollowSchedule',
+          'target_heat_temperature': 5.0,
+        }),
+        'setpoints': dict({
+        }),
+        'temperature_status': dict({
+          'is_available': True,
+          'temperature': 22.0,
+        }),
+        'zone_id': '3454854',
+      }),
+      'supported_features': <ClimateEntityFeature: 401>,
+      'temperature': 5.0,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.thermostat',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_setup_platform[h139906][climate.thermostat_2-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_temperature': 22.0,
+      'friendly_name': 'Thermostat 2',
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'max_temp': 35.0,
+      'min_temp': 5.0,
+      'preset_mode': 'none',
+      'preset_modes': list([
+        'none',
+        'temporary',
+        'permanent',
+      ]),
+      'status': dict({
+        'activeFaults': tuple(
+        ),
+        'setpoint_status': dict({
+          'setpoint_mode': 'FollowSchedule',
+          'target_heat_temperature': 20.0,
+        }),
+        'setpoints': dict({
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 23, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Berlin')),
+          'next_sp_temp': 15.0,
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 12, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Berlin')),
+          'this_sp_temp': 22.5,
+        }),
+        'temperature_status': dict({
+          'is_available': True,
+          'temperature': 22.0,
+        }),
+        'zone_id': '3454855',
+      }),
+      'supported_features': <ClimateEntityFeature: 401>,
+      'temperature': 20.0,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.thermostat_2',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'heat',
+  })
+# ---
+# name: test_setup_platform[h139906][climate.vr-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_temperature': 22.0,
+      'friendly_name': 'Vr**********',
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'icon': 'mdi:thermostat',
+      'max_temp': 35,
+      'min_temp': 7,
+      'preset_mode': None,
+      'preset_modes': list([
+        'eco',
+        'away',
+      ]),
+      'status': dict({
+        'activeSystemFaults': tuple(
+        ),
+        'system_id': '3454856',
+        'system_mode_status': dict({
+          'is_permanent': True,
+          'mode': 'Auto',
+        }),
+      }),
+      'supported_features': <ClimateEntityFeature: 400>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.vr',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'heat',
+  })
+# ---
 # name: test_setup_platform[minimal][climate.main_room-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
@@ -1136,16 +1290,16 @@
         'permanent',
       ]),
       'status': dict({
-        'active_faults': list([
-        ]),
+        'activeFaults': tuple(
+        ),
         'setpoint_status': dict({
           'setpoint_mode': 'FollowSchedule',
           'target_heat_temperature': 17.0,
         }),
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 22, 10, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'this_sp_temp': 16.0,
         }),
         'temperature_status': dict({
@@ -1186,8 +1340,8 @@
         'Custom',
       ]),
       'status': dict({
-        'active_system_faults': list([
-        ]),
+        'activeSystemFaults': tuple(
+        ),
         'system_id': '3432522',
         'system_mode_status': dict({
           'is_permanent': True,
@@ -1222,8 +1376,12 @@
         'away',
       ]),
       'status': dict({
-        'active_system_faults': list([
-        ]),
+        'activeSystemFaults': tuple(
+          dict({
+            'fault_type': 'GatewayCommunicationLost',
+            'since': '2023-05-04T18:47:36.772704+02:00',
+          }),
+        ),
         'system_id': '4187769',
         'system_mode_status': dict({
           'is_permanent': True,
@@ -1258,16 +1416,16 @@
         'permanent',
       ]),
       'status': dict({
-        'active_faults': list([
-        ]),
+        'activeFaults': tuple(
+        ),
         'setpoint_status': dict({
           'setpoint_mode': 'PermanentOverride',
           'target_heat_temperature': 15.0,
         }),
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+02:00',
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 22, 10, tzinfo=zoneinfo.ZoneInfo(key='Europe/Berlin')),
           'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+02:00',
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 8, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/Berlin')),
           'this_sp_temp': 16.0,
         }),
         'temperature_status': dict({
@@ -1308,6 +1466,13 @@
     ),
   ])
 # ---
+# name: test_zone_set_hvac_mode[h139906]
+  list([
+    tuple(
+      5.0,
+    ),
+  ])
+# ---
 # name: test_zone_set_hvac_mode[minimal]
   list([
     tuple(
@@ -1331,7 +1496,7 @@
       17.0,
     ),
     dict({
-      'until': datetime.datetime(2024, 7, 10, 21, 10, tzinfo=datetime.timezone.utc),
+      'until': HAFakeDatetime(2024, 7, 10, 21, 10, tzinfo=datetime.timezone.utc),
     }),
   ])
 # ---
@@ -1344,7 +1509,7 @@
       21.5,
     ),
     dict({
-      'until': datetime.datetime(2024, 7, 10, 21, 10, tzinfo=datetime.timezone.utc),
+      'until': HAFakeDatetime(2024, 7, 10, 21, 10, tzinfo=datetime.timezone.utc),
     }),
   ])
 # ---
@@ -1357,7 +1522,20 @@
       21.5,
     ),
     dict({
-      'until': datetime.datetime(2024, 7, 10, 19, 10, tzinfo=datetime.timezone.utc),
+      'until': HAFakeDatetime(2024, 7, 10, 19, 10, tzinfo=datetime.timezone.utc),
+    }),
+  ])
+# ---
+# name: test_zone_set_preset_mode[h139906]
+  list([
+    tuple(
+      5.0,
+    ),
+    tuple(
+      5.0,
+    ),
+    dict({
+      'until': None,
     }),
   ])
 # ---
@@ -1370,7 +1548,7 @@
       17.0,
     ),
     dict({
-      'until': datetime.datetime(2024, 7, 10, 21, 10, tzinfo=datetime.timezone.utc),
+      'until': HAFakeDatetime(2024, 7, 10, 21, 10, tzinfo=datetime.timezone.utc),
     }),
   ])
 # ---
@@ -1383,35 +1561,42 @@
       15.0,
     ),
     dict({
-      'until': datetime.datetime(2024, 7, 10, 20, 10, tzinfo=datetime.timezone.utc),
+      'until': HAFakeDatetime(2024, 7, 10, 20, 10, tzinfo=datetime.timezone.utc),
     }),
   ])
 # ---
 # name: test_zone_set_temperature[default]
   list([
     dict({
-      'until': datetime.datetime(2024, 7, 10, 21, 10, tzinfo=datetime.timezone.utc),
+      'until': HAFakeDatetime(2024, 7, 10, 21, 10, tzinfo=datetime.timezone.utc),
     }),
   ])
 # ---
 # name: test_zone_set_temperature[h032585]
   list([
     dict({
-      'until': datetime.datetime(2024, 7, 10, 21, 10, tzinfo=datetime.timezone.utc),
+      'until': HAFakeDatetime(2024, 7, 10, 21, 10, tzinfo=datetime.timezone.utc),
     }),
   ])
 # ---
 # name: test_zone_set_temperature[h099625]
   list([
     dict({
-      'until': datetime.datetime(2024, 7, 10, 19, 10, tzinfo=datetime.timezone.utc),
+      'until': HAFakeDatetime(2024, 7, 10, 19, 10, tzinfo=datetime.timezone.utc),
+    }),
+  ])
+# ---
+# name: test_zone_set_temperature[h139906]
+  list([
+    dict({
+      'until': None,
     }),
   ])
 # ---
 # name: test_zone_set_temperature[minimal]
   list([
     dict({
-      'until': datetime.datetime(2024, 7, 10, 21, 10, tzinfo=datetime.timezone.utc),
+      'until': HAFakeDatetime(2024, 7, 10, 21, 10, tzinfo=datetime.timezone.utc),
     }),
   ])
 # ---
@@ -1443,6 +1628,13 @@
     ),
   ])
 # ---
+# name: test_zone_turn_off[h139906]
+  list([
+    tuple(
+      5.0,
+    ),
+  ])
+# ---
 # name: test_zone_turn_off[minimal]
   list([
     tuple(
diff --git a/tests/components/evohome/snapshots/test_init.ambr b/tests/components/evohome/snapshots/test_init.ambr
index d2e91e3c43d..d6174a53356 100644
--- a/tests/components/evohome/snapshots/test_init.ambr
+++ b/tests/components/evohome/snapshots/test_init.ambr
@@ -11,6 +11,9 @@
 # name: test_setup[h099625]
   dict_keys(['refresh_system', 'set_system_mode', 'clear_zone_override', 'set_zone_override'])
 # ---
+# name: test_setup[h139906]
+  dict_keys(['refresh_system', 'set_system_mode', 'clear_zone_override', 'set_zone_override'])
+# ---
 # name: test_setup[minimal]
   dict_keys(['refresh_system', 'reset_system', 'set_system_mode', 'clear_zone_override', 'set_zone_override'])
 # ---
diff --git a/tests/components/evohome/snapshots/test_water_heater.ambr b/tests/components/evohome/snapshots/test_water_heater.ambr
index 4cdeb28f445..13fb375c097 100644
--- a/tests/components/evohome/snapshots/test_water_heater.ambr
+++ b/tests/components/evohome/snapshots/test_water_heater.ambr
@@ -1,11 +1,21 @@
 # serializer version: 1
+# name: test_set_operation_mode[botched]
+  list([
+    dict({
+      'until': HAFakeDatetime(2024, 7, 10, 12, 30, tzinfo=datetime.timezone.utc),
+    }),
+    dict({
+      'until': HAFakeDatetime(2024, 7, 10, 12, 30, tzinfo=datetime.timezone.utc),
+    }),
+  ])
+# ---
 # name: test_set_operation_mode[default]
   list([
     dict({
-      'until': datetime.datetime(2024, 7, 10, 12, 0, tzinfo=datetime.timezone.utc),
+      'until': HAFakeDatetime(2024, 7, 10, 12, 0, tzinfo=datetime.timezone.utc),
     }),
     dict({
-      'until': datetime.datetime(2024, 7, 10, 12, 0, tzinfo=datetime.timezone.utc),
+      'until': HAFakeDatetime(2024, 7, 10, 12, 0, tzinfo=datetime.timezone.utc),
     }),
   ])
 # ---
@@ -13,11 +23,11 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'away_mode': 'on',
-      'current_temperature': 23,
+      'current_temperature': 23.0,
       'friendly_name': 'Domestic Hot Water',
       'icon': 'mdi:thermometer-lines',
-      'max_temp': 60,
-      'min_temp': 43,
+      'max_temp': 60.0,
+      'min_temp': 43.3,
       'operation_list': list([
         'auto',
         'on',
@@ -25,13 +35,13 @@
       ]),
       'operation_mode': 'off',
       'status': dict({
-        'active_faults': list([
-        ]),
+        'activeFaults': tuple(
+        ),
         'dhw_id': '3933910',
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T13:00:00+01:00',
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 8, 30, tzinfo=zoneinfo.ZoneInfo(key='America/Santiago')),
           'next_sp_state': 'Off',
-          'this_sp_from': '2024-07-10T12:00:00+01:00',
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 6, 30, tzinfo=zoneinfo.ZoneInfo(key='America/Santiago')),
           'this_sp_state': 'On',
         }),
         'state_status': dict({
@@ -60,11 +70,11 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'away_mode': 'on',
-      'current_temperature': 23,
+      'current_temperature': 23.0,
       'friendly_name': 'Domestic Hot Water',
       'icon': 'mdi:thermometer-lines',
-      'max_temp': 60,
-      'min_temp': 43,
+      'max_temp': 60.0,
+      'min_temp': 43.3,
       'operation_list': list([
         'auto',
         'on',
@@ -72,13 +82,13 @@
       ]),
       'operation_mode': 'off',
       'status': dict({
-        'active_faults': list([
-        ]),
+        'activeFaults': tuple(
+        ),
         'dhw_id': '3933910',
         'setpoints': dict({
-          'next_sp_from': '2024-07-10T13:00:00+01:00',
+          'next_sp_from': HAFakeDatetime(2024, 7, 10, 13, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'next_sp_state': 'Off',
-          'this_sp_from': '2024-07-10T12:00:00+01:00',
+          'this_sp_from': HAFakeDatetime(2024, 7, 10, 12, 0, tzinfo=zoneinfo.ZoneInfo(key='Europe/London')),
           'this_sp_state': 'On',
         }),
         'state_status': dict({
diff --git a/tests/components/evohome/test_climate.py b/tests/components/evohome/test_climate.py
index 325dd914bc0..b1b930c6382 100644
--- a/tests/components/evohome/test_climate.py
+++ b/tests/components/evohome/test_climate.py
@@ -65,7 +65,7 @@ async def test_ctl_set_hvac_mode(
     results = []
 
     # SERVICE_SET_HVAC_MODE: HVACMode.OFF
-    with patch("evohomeasync2.controlsystem.ControlSystem.set_mode") as mock_fcn:
+    with patch("evohomeasync2.control_system.ControlSystem.set_mode") as mock_fcn:
         await hass.services.async_call(
             Platform.CLIMATE,
             SERVICE_SET_HVAC_MODE,
@@ -76,14 +76,15 @@ async def test_ctl_set_hvac_mode(
             blocking=True,
         )
 
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args != ()  # 'HeatingOff' or 'Off'
-        assert mock_fcn.await_args.kwargs == {"until": None}
+        try:
+            mock_fcn.assert_awaited_once_with("HeatingOff", until=None)
+        except AssertionError:
+            mock_fcn.assert_awaited_once_with("Off", until=None)
 
-        results.append(mock_fcn.await_args.args)
+        results.append(mock_fcn.await_args.args)  # type: ignore[union-attr]
 
     # SERVICE_SET_HVAC_MODE: HVACMode.HEAT
-    with patch("evohomeasync2.controlsystem.ControlSystem.set_mode") as mock_fcn:
+    with patch("evohomeasync2.control_system.ControlSystem.set_mode") as mock_fcn:
         await hass.services.async_call(
             Platform.CLIMATE,
             SERVICE_SET_HVAC_MODE,
@@ -94,11 +95,12 @@ async def test_ctl_set_hvac_mode(
             blocking=True,
         )
 
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args != ()  # 'Auto' or 'Heat'
-        assert mock_fcn.await_args.kwargs == {"until": None}
+        try:
+            mock_fcn.assert_awaited_once_with("Auto", until=None)
+        except AssertionError:
+            mock_fcn.assert_awaited_once_with("Heat", until=None)
 
-        results.append(mock_fcn.await_args.args)
+        results.append(mock_fcn.await_args.args)  # type: ignore[union-attr]
 
     assert results == snapshot
 
@@ -134,7 +136,7 @@ async def test_ctl_turn_off(
     results = []
 
     # SERVICE_TURN_OFF
-    with patch("evohomeasync2.controlsystem.ControlSystem.set_mode") as mock_fcn:
+    with patch("evohomeasync2.control_system.ControlSystem.set_mode") as mock_fcn:
         await hass.services.async_call(
             Platform.CLIMATE,
             SERVICE_TURN_OFF,
@@ -144,11 +146,12 @@ async def test_ctl_turn_off(
             blocking=True,
         )
 
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args != ()  # 'HeatingOff' or 'Off'
-        assert mock_fcn.await_args.kwargs == {"until": None}
+        try:
+            mock_fcn.assert_awaited_once_with("HeatingOff", until=None)
+        except AssertionError:
+            mock_fcn.assert_awaited_once_with("Off", until=None)
 
-        results.append(mock_fcn.await_args.args)
+        results.append(mock_fcn.await_args.args)  # type: ignore[union-attr]
 
     assert results == snapshot
 
@@ -164,7 +167,7 @@ async def test_ctl_turn_on(
     results = []
 
     # SERVICE_TURN_ON
-    with patch("evohomeasync2.controlsystem.ControlSystem.set_mode") as mock_fcn:
+    with patch("evohomeasync2.control_system.ControlSystem.set_mode") as mock_fcn:
         await hass.services.async_call(
             Platform.CLIMATE,
             SERVICE_TURN_ON,
@@ -174,11 +177,12 @@ async def test_ctl_turn_on(
             blocking=True,
         )
 
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args != ()  # 'Auto' or 'Heat'
-        assert mock_fcn.await_args.kwargs == {"until": None}
+        try:
+            mock_fcn.assert_awaited_once_with("Auto", until=None)
+        except AssertionError:
+            mock_fcn.assert_awaited_once_with("Heat", until=None)
 
-        results.append(mock_fcn.await_args.args)
+        results.append(mock_fcn.await_args.args)  # type: ignore[union-attr]
 
     assert results == snapshot
 
@@ -194,7 +198,7 @@ async def test_zone_set_hvac_mode(
     results = []
 
     # SERVICE_SET_HVAC_MODE: HVACMode.HEAT
-    with patch("evohomeasync2.zone.Zone.reset_mode") as mock_fcn:
+    with patch("evohomeasync2.zone.Zone.reset") as mock_fcn:
         await hass.services.async_call(
             Platform.CLIMATE,
             SERVICE_SET_HVAC_MODE,
@@ -205,9 +209,7 @@ async def test_zone_set_hvac_mode(
             blocking=True,
         )
 
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args == ()
-        assert mock_fcn.await_args.kwargs == {}
+        mock_fcn.assert_awaited_once_with()
 
     # SERVICE_SET_HVAC_MODE: HVACMode.OFF
     with patch("evohomeasync2.zone.Zone.set_temperature") as mock_fcn:
@@ -221,7 +223,9 @@ async def test_zone_set_hvac_mode(
             blocking=True,
         )
 
-        assert mock_fcn.await_count == 1
+        mock_fcn.assert_awaited_once()
+
+        assert mock_fcn.await_args is not None  # mypy hint
         assert mock_fcn.await_args.args != ()  # minimum target temp
         assert mock_fcn.await_args.kwargs == {"until": None}
 
@@ -243,7 +247,7 @@ async def test_zone_set_preset_mode(
     results = []
 
     # SERVICE_SET_PRESET_MODE: none
-    with patch("evohomeasync2.zone.Zone.reset_mode") as mock_fcn:
+    with patch("evohomeasync2.zone.Zone.reset") as mock_fcn:
         await hass.services.async_call(
             Platform.CLIMATE,
             SERVICE_SET_PRESET_MODE,
@@ -254,9 +258,7 @@ async def test_zone_set_preset_mode(
             blocking=True,
         )
 
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args == ()
-        assert mock_fcn.await_args.kwargs == {}
+        mock_fcn.assert_awaited_once_with()
 
     # SERVICE_SET_PRESET_MODE: permanent
     with patch("evohomeasync2.zone.Zone.set_temperature") as mock_fcn:
@@ -270,7 +272,9 @@ async def test_zone_set_preset_mode(
             blocking=True,
         )
 
-        assert mock_fcn.await_count == 1
+        mock_fcn.assert_awaited_once()
+
+        assert mock_fcn.await_args is not None  # mypy hint
         assert mock_fcn.await_args.args != ()  # current target temp
         assert mock_fcn.await_args.kwargs == {"until": None}
 
@@ -288,7 +292,9 @@ async def test_zone_set_preset_mode(
             blocking=True,
         )
 
-        assert mock_fcn.await_count == 1
+        mock_fcn.assert_awaited_once()
+
+        assert mock_fcn.await_args is not None  # mypy hint
         assert mock_fcn.await_args.args != ()  # current target temp
         assert mock_fcn.await_args.kwargs != {}  # next setpoint dtm
 
@@ -302,12 +308,10 @@ async def test_zone_set_preset_mode(
 async def test_zone_set_temperature(
     hass: HomeAssistant,
     zone_id: str,
-    freezer: FrozenDateTimeFactory,
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test SERVICE_SET_TEMPERATURE of an evohome heating zone."""
 
-    freezer.move_to("2024-07-10T12:00:00Z")
     results = []
 
     # SERVICE_SET_TEMPERATURE: temperature
@@ -322,7 +326,9 @@ async def test_zone_set_temperature(
             blocking=True,
         )
 
-        assert mock_fcn.await_count == 1
+        mock_fcn.assert_awaited_once()
+
+        assert mock_fcn.await_args is not None  # mypy hint
         assert mock_fcn.await_args.args == (19.1,)
         assert mock_fcn.await_args.kwargs != {}  # next setpoint dtm
 
@@ -352,7 +358,9 @@ async def test_zone_turn_off(
             blocking=True,
         )
 
-        assert mock_fcn.await_count == 1
+        mock_fcn.assert_awaited_once()
+
+        assert mock_fcn.await_args is not None  # mypy hint
         assert mock_fcn.await_args.args != ()  # minimum target temp
         assert mock_fcn.await_args.kwargs == {"until": None}
 
@@ -369,7 +377,7 @@ async def test_zone_turn_on(
     """Test SERVICE_TURN_ON of an evohome heating zone."""
 
     # SERVICE_TURN_ON
-    with patch("evohomeasync2.zone.Zone.reset_mode") as mock_fcn:
+    with patch("evohomeasync2.zone.Zone.reset") as mock_fcn:
         await hass.services.async_call(
             Platform.CLIMATE,
             SERVICE_TURN_ON,
@@ -379,6 +387,4 @@ async def test_zone_turn_on(
             blocking=True,
         )
 
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args == ()
-        assert mock_fcn.await_args.kwargs == {}
+        mock_fcn.assert_awaited_once_with()
diff --git a/tests/components/evohome/test_coordinator.py b/tests/components/evohome/test_coordinator.py
new file mode 100644
index 00000000000..7fb325d55b9
--- /dev/null
+++ b/tests/components/evohome/test_coordinator.py
@@ -0,0 +1,55 @@
+"""The tests for the evohome coordinator."""
+
+from __future__ import annotations
+
+from datetime import timedelta
+from unittest.mock import patch
+
+from evohomeasync2 import EvohomeClient
+from freezegun.api import FrozenDateTimeFactory
+import pytest
+
+from homeassistant.components.evohome import EvoData
+from homeassistant.components.evohome.const import DOMAIN
+from homeassistant.const import STATE_UNAVAILABLE
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import UpdateFailed
+
+from tests.common import async_fire_time_changed
+
+
+@pytest.mark.parametrize("install", ["minimal"])
+async def test_setup_platform(
+    hass: HomeAssistant,
+    config: dict[str, str],
+    evohome: EvohomeClient,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test entities and their states after setup of evohome."""
+
+    evo_data: EvoData = hass.data.get(DOMAIN)  # type: ignore[assignment]
+    update_interval: timedelta = evo_data.coordinator.update_interval  # type: ignore[assignment]
+
+    # confirm initial state after coordinator.async_first_refresh()...
+    state = hass.states.get("climate.my_home")
+    assert state is not None and state.state != STATE_UNAVAILABLE
+
+    with patch(
+        "homeassistant.components.evohome.coordinator.EvoDataUpdateCoordinator._async_update_data",
+        side_effect=UpdateFailed,
+    ):
+        freezer.tick(update_interval)
+        async_fire_time_changed(hass)
+        await hass.async_block_till_done()
+
+    # confirm appropriate response to loss of state...
+    state = hass.states.get("climate.my_home")
+    assert state is not None and state.state == STATE_UNAVAILABLE
+
+    freezer.tick(update_interval)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    # if coordinator is working, the state will be restored
+    state = hass.states.get("climate.my_home")
+    assert state is not None and state.state != STATE_UNAVAILABLE
diff --git a/tests/components/evohome/test_evo_services.py b/tests/components/evohome/test_evo_services.py
new file mode 100644
index 00000000000..c9f20aecd4f
--- /dev/null
+++ b/tests/components/evohome/test_evo_services.py
@@ -0,0 +1,177 @@
+"""The tests for the native services of Evohome."""
+
+from __future__ import annotations
+
+from datetime import UTC, datetime
+from unittest.mock import patch
+
+from evohomeasync2 import EvohomeClient
+from freezegun.api import FrozenDateTimeFactory
+import pytest
+
+from homeassistant.components.evohome.const import (
+    ATTR_DURATION,
+    ATTR_PERIOD,
+    ATTR_SETPOINT,
+    DOMAIN,
+    EvoService,
+)
+from homeassistant.const import ATTR_ENTITY_ID, ATTR_MODE
+from homeassistant.core import HomeAssistant
+
+
+@pytest.mark.parametrize("install", ["default"])
+async def test_service_refresh_system(
+    hass: HomeAssistant,
+    evohome: EvohomeClient,
+) -> None:
+    """Test Evohome's refresh_system service (for all temperature control systems)."""
+
+    # EvoService.REFRESH_SYSTEM
+    with patch("evohomeasync2.location.Location.update") as mock_fcn:
+        await hass.services.async_call(
+            DOMAIN,
+            EvoService.REFRESH_SYSTEM,
+            {},
+            blocking=True,
+        )
+
+        mock_fcn.assert_awaited_once_with()
+
+
+@pytest.mark.parametrize("install", ["default"])
+async def test_service_reset_system(
+    hass: HomeAssistant,
+    ctl_id: str,
+) -> None:
+    """Test Evohome's reset_system service (for a temperature control system)."""
+
+    # EvoService.RESET_SYSTEM (if SZ_AUTO_WITH_RESET in modes)
+    with patch("evohomeasync2.control_system.ControlSystem.set_mode") as mock_fcn:
+        await hass.services.async_call(
+            DOMAIN,
+            EvoService.RESET_SYSTEM,
+            {},
+            blocking=True,
+        )
+
+        mock_fcn.assert_awaited_once_with("AutoWithReset", until=None)
+
+
+@pytest.mark.parametrize("install", ["default"])
+async def test_ctl_set_system_mode(
+    hass: HomeAssistant,
+    ctl_id: str,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test Evohome's set_system_mode service (for a temperature control system)."""
+
+    # EvoService.SET_SYSTEM_MODE: Auto
+    with patch("evohomeasync2.control_system.ControlSystem.set_mode") as mock_fcn:
+        await hass.services.async_call(
+            DOMAIN,
+            EvoService.SET_SYSTEM_MODE,
+            {
+                ATTR_MODE: "Auto",
+            },
+            blocking=True,
+        )
+
+        mock_fcn.assert_awaited_once_with("Auto", until=None)
+
+    freezer.move_to("2024-07-10T12:00:00+00:00")
+
+    # EvoService.SET_SYSTEM_MODE: AutoWithEco, hours=12
+    with patch("evohomeasync2.control_system.ControlSystem.set_mode") as mock_fcn:
+        await hass.services.async_call(
+            DOMAIN,
+            EvoService.SET_SYSTEM_MODE,
+            {
+                ATTR_MODE: "AutoWithEco",
+                ATTR_DURATION: {"hours": 12},
+            },
+            blocking=True,
+        )
+
+        mock_fcn.assert_awaited_once_with(
+            "AutoWithEco", until=datetime(2024, 7, 11, 0, 0, tzinfo=UTC)
+        )
+
+    # EvoService.SET_SYSTEM_MODE: Away, days=7
+    with patch("evohomeasync2.control_system.ControlSystem.set_mode") as mock_fcn:
+        await hass.services.async_call(
+            DOMAIN,
+            EvoService.SET_SYSTEM_MODE,
+            {
+                ATTR_MODE: "Away",
+                ATTR_PERIOD: {"days": 7},
+            },
+            blocking=True,
+        )
+
+        mock_fcn.assert_awaited_once_with(
+            "Away", until=datetime(2024, 7, 16, 23, 0, tzinfo=UTC)
+        )
+
+
+@pytest.mark.parametrize("install", ["default"])
+async def test_zone_clear_zone_override(
+    hass: HomeAssistant,
+    zone_id: str,
+) -> None:
+    """Test Evohome's clear_zone_override service (for a heating zone)."""
+
+    # EvoZoneMode.FOLLOW_SCHEDULE
+    with patch("evohomeasync2.zone.Zone.reset") as mock_fcn:
+        await hass.services.async_call(
+            DOMAIN,
+            EvoService.RESET_ZONE_OVERRIDE,
+            {
+                ATTR_ENTITY_ID: zone_id,
+            },
+            blocking=True,
+        )
+
+        mock_fcn.assert_awaited_once_with()
+
+
+@pytest.mark.parametrize("install", ["default"])
+async def test_zone_set_zone_override(
+    hass: HomeAssistant,
+    zone_id: str,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test Evohome's set_zone_override service (for a heating zone)."""
+
+    freezer.move_to("2024-07-10T12:00:00+00:00")
+
+    # EvoZoneMode.PERMANENT_OVERRIDE
+    with patch("evohomeasync2.zone.Zone.set_temperature") as mock_fcn:
+        await hass.services.async_call(
+            DOMAIN,
+            EvoService.SET_ZONE_OVERRIDE,
+            {
+                ATTR_ENTITY_ID: zone_id,
+                ATTR_SETPOINT: 19.5,
+            },
+            blocking=True,
+        )
+
+        mock_fcn.assert_awaited_once_with(19.5, until=None)
+
+    # EvoZoneMode.TEMPORARY_OVERRIDE
+    with patch("evohomeasync2.zone.Zone.set_temperature") as mock_fcn:
+        await hass.services.async_call(
+            DOMAIN,
+            EvoService.SET_ZONE_OVERRIDE,
+            {
+                ATTR_ENTITY_ID: zone_id,
+                ATTR_SETPOINT: 19.5,
+                ATTR_DURATION: {"minutes": 135},
+            },
+            blocking=True,
+        )
+
+        mock_fcn.assert_awaited_once_with(
+            19.5, until=datetime(2024, 7, 10, 14, 15, tzinfo=UTC)
+        )
diff --git a/tests/components/evohome/test_init.py b/tests/components/evohome/test_init.py
index 49a854016ea..53b9258523d 100644
--- a/tests/components/evohome/test_init.py
+++ b/tests/components/evohome/test_init.py
@@ -1,83 +1,133 @@
-"""The tests for evohome."""
+"""The tests for Evohome."""
 
 from __future__ import annotations
 
 from http import HTTPStatus
 import logging
-from unittest.mock import patch
+from unittest.mock import Mock, patch
 
+import aiohttp
 from evohomeasync2 import EvohomeClient, exceptions as exc
-from evohomeasync2.broker import _ERR_MSG_LOOKUP_AUTH, _ERR_MSG_LOOKUP_BASE
 import pytest
-from syrupy import SnapshotAssertion
+from syrupy.assertion import SnapshotAssertion
 
-from homeassistant.components.evohome import DOMAIN, EvoService
+from homeassistant.components.evohome.const import DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
+from .conftest import mock_post_request
 from .const import TEST_INSTALLS
 
-SETUP_FAILED_ANTICIPATED = (
+_MSG_429 = (
+    "You have exceeded the server's API rate limit. Wait a while "
+    "and try again (consider reducing your polling interval)."
+)
+_MSG_OTH = (
+    "Unable to contact the vendor's server. Check your network "
+    "and review the vendor's status page, https://status.resideo.com."
+)
+_MSG_USR = (
+    "Failed to authenticate. Check the username/password. Note that some "
+    "special characters accepted via the vendor's website are not valid here."
+)
+
+LOG_HINT_429_CREDS = ("evohome.credentials", logging.ERROR, _MSG_429)
+LOG_HINT_OTH_CREDS = ("evohome.credentials", logging.ERROR, _MSG_OTH)
+LOG_HINT_USR_CREDS = ("evohome.credentials", logging.ERROR, _MSG_USR)
+
+LOG_HINT_429_AUTH = ("evohome.auth", logging.ERROR, _MSG_429)
+LOG_HINT_OTH_AUTH = ("evohome.auth", logging.ERROR, _MSG_OTH)
+LOG_HINT_USR_AUTH = ("evohome.auth", logging.ERROR, _MSG_USR)
+
+LOG_FAIL_CONNECTION = (
+    "homeassistant.components.evohome",
+    logging.ERROR,
+    "Failed to fetch initial data: Authenticator response is invalid: Connection error",
+)
+LOG_FAIL_CREDENTIALS = (
+    "homeassistant.components.evohome",
+    logging.ERROR,
+    "Failed to fetch initial data: "
+    "Authenticator response is invalid: {'error': 'invalid_grant'}",
+)
+LOG_FAIL_GATEWAY = (
+    "homeassistant.components.evohome",
+    logging.ERROR,
+    "Failed to fetch initial data: "
+    "Authenticator response is invalid: 502 Bad Gateway, response=None",
+)
+LOG_FAIL_TOO_MANY = (
+    "homeassistant.components.evohome",
+    logging.ERROR,
+    "Failed to fetch initial data: "
+    "Authenticator response is invalid: 429 Too Many Requests, response=None",
+)
+
+LOG_FGET_CONNECTION = (
+    "homeassistant.components.evohome",
+    logging.ERROR,
+    "Failed to fetch initial data: "
+    "GET https://tccna.resideo.com/WebAPI/emea/api/v1/userAccount: "
+    "Connection error",
+)
+LOG_FGET_GATEWAY = (
+    "homeassistant.components.evohome",
+    logging.ERROR,
+    "Failed to fetch initial data: "
+    "GET https://tccna.resideo.com/WebAPI/emea/api/v1/userAccount: "
+    "502 Bad Gateway, response=None",
+)
+LOG_FGET_TOO_MANY = (
+    "homeassistant.components.evohome",
+    logging.ERROR,
+    "Failed to fetch initial data: "
+    "GET https://tccna.resideo.com/WebAPI/emea/api/v1/userAccount: "
+    "429 Too Many Requests, response=None",
+)
+
+
+LOG_SETUP_FAILED = (
     "homeassistant.setup",
     logging.ERROR,
     "Setup failed for 'evohome': Integration failed to initialize.",
 )
-SETUP_FAILED_UNEXPECTED = (
-    "homeassistant.setup",
-    logging.ERROR,
-    "Error during setup of component evohome",
+
+EXC_BAD_CONNECTION = aiohttp.ClientConnectionError(
+    "Connection error",
 )
-AUTHENTICATION_FAILED = (
-    "homeassistant.components.evohome.helpers",
-    logging.ERROR,
-    "Failed to authenticate with the vendor's server. Check your username"
-    " and password. NB: Some special password characters that work"
-    " correctly via the website will not work via the web API. Message"
-    " is: ",
+EXC_BAD_CREDENTIALS = exc.AuthenticationFailedError(
+    "Authenticator response is invalid: {'error': 'invalid_grant'}",
+    status=HTTPStatus.BAD_REQUEST,
 )
-REQUEST_FAILED_NONE = (
-    "homeassistant.components.evohome.helpers",
-    logging.WARNING,
-    "Unable to connect with the vendor's server. "
-    "Check your network and the vendor's service status page. "
-    "Message is: ",
+EXC_TOO_MANY_REQUESTS = aiohttp.ClientResponseError(
+    Mock(),
+    (),
+    status=HTTPStatus.TOO_MANY_REQUESTS,
+    message=HTTPStatus.TOO_MANY_REQUESTS.phrase,
 )
-REQUEST_FAILED_503 = (
-    "homeassistant.components.evohome.helpers",
-    logging.WARNING,
-    "The vendor says their server is currently unavailable. "
-    "Check the vendor's service status page",
-)
-REQUEST_FAILED_429 = (
-    "homeassistant.components.evohome.helpers",
-    logging.WARNING,
-    "The vendor's API rate limit has been exceeded. "
-    "If this message persists, consider increasing the scan_interval",
+EXC_BAD_GATEWAY = aiohttp.ClientResponseError(
+    Mock(), (), status=HTTPStatus.BAD_GATEWAY, message=HTTPStatus.BAD_GATEWAY.phrase
 )
 
-REQUEST_FAILED_LOOKUP = {
-    None: [
-        REQUEST_FAILED_NONE,
-        SETUP_FAILED_ANTICIPATED,
-    ],
-    HTTPStatus.SERVICE_UNAVAILABLE: [
-        REQUEST_FAILED_503,
-        SETUP_FAILED_ANTICIPATED,
-    ],
-    HTTPStatus.TOO_MANY_REQUESTS: [
-        REQUEST_FAILED_429,
-        SETUP_FAILED_ANTICIPATED,
-    ],
+AUTHENTICATION_TESTS: dict[Exception, list] = {
+    EXC_BAD_CONNECTION: [LOG_HINT_OTH_CREDS, LOG_FAIL_CONNECTION, LOG_SETUP_FAILED],
+    EXC_BAD_CREDENTIALS: [LOG_HINT_USR_CREDS, LOG_FAIL_CREDENTIALS, LOG_SETUP_FAILED],
+    EXC_BAD_GATEWAY: [LOG_HINT_OTH_CREDS, LOG_FAIL_GATEWAY, LOG_SETUP_FAILED],
+    EXC_TOO_MANY_REQUESTS: [LOG_HINT_429_CREDS, LOG_FAIL_TOO_MANY, LOG_SETUP_FAILED],
+}
+
+CLIENT_REQUEST_TESTS: dict[Exception, list] = {
+    EXC_BAD_CONNECTION: [LOG_HINT_OTH_AUTH, LOG_FGET_CONNECTION, LOG_SETUP_FAILED],
+    EXC_BAD_GATEWAY: [LOG_HINT_OTH_AUTH, LOG_FGET_GATEWAY, LOG_SETUP_FAILED],
+    EXC_TOO_MANY_REQUESTS: [LOG_HINT_429_AUTH, LOG_FGET_TOO_MANY, LOG_SETUP_FAILED],
 }
 
 
-@pytest.mark.parametrize(
-    "status", [*sorted([*_ERR_MSG_LOOKUP_AUTH, HTTPStatus.BAD_GATEWAY]), None]
-)
+@pytest.mark.parametrize("exception", AUTHENTICATION_TESTS)
 async def test_authentication_failure_v2(
     hass: HomeAssistant,
     config: dict[str, str],
-    status: HTTPStatus,
+    exception: Exception,
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test failure to setup an evohome-compatible system.
@@ -85,27 +135,24 @@ async def test_authentication_failure_v2(
     In this instance, the failure occurs in the v2 API.
     """
 
-    with patch("evohomeasync2.broker.Broker.get") as mock_fcn:
-        mock_fcn.side_effect = exc.AuthenticationFailed("", status=status)
-
-        with caplog.at_level(logging.WARNING):
-            result = await async_setup_component(hass, DOMAIN, {DOMAIN: config})
+    with (
+        patch(
+            "evohome.credentials.CredentialsManagerBase._request", side_effect=exception
+        ),
+        caplog.at_level(logging.WARNING),
+    ):
+        result = await async_setup_component(hass, DOMAIN, {DOMAIN: config})
 
     assert result is False
 
-    assert caplog.record_tuples == [
-        AUTHENTICATION_FAILED,
-        SETUP_FAILED_ANTICIPATED,
-    ]
+    assert caplog.record_tuples == AUTHENTICATION_TESTS[exception]
 
 
-@pytest.mark.parametrize(
-    "status", [*sorted([*_ERR_MSG_LOOKUP_BASE, HTTPStatus.BAD_GATEWAY]), None]
-)
+@pytest.mark.parametrize("exception", CLIENT_REQUEST_TESTS)
 async def test_client_request_failure_v2(
     hass: HomeAssistant,
     config: dict[str, str],
-    status: HTTPStatus,
+    exception: Exception,
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test failure to setup an evohome-compatible system.
@@ -113,17 +160,19 @@ async def test_client_request_failure_v2(
     In this instance, the failure occurs in the v2 API.
     """
 
-    with patch("evohomeasync2.broker.Broker.get") as mock_fcn:
-        mock_fcn.side_effect = exc.RequestFailed("", status=status)
-
-        with caplog.at_level(logging.WARNING):
-            result = await async_setup_component(hass, DOMAIN, {DOMAIN: config})
+    with (
+        patch(
+            "evohomeasync2.auth.CredentialsManagerBase._post_request",
+            mock_post_request("default"),
+        ),
+        patch("evohome.auth.AbstractAuth._request", side_effect=exception),
+        caplog.at_level(logging.WARNING),
+    ):
+        result = await async_setup_component(hass, DOMAIN, {DOMAIN: config})
 
     assert result is False
 
-    assert caplog.record_tuples == REQUEST_FAILED_LOOKUP.get(
-        status, [SETUP_FAILED_UNEXPECTED]
-    )
+    assert caplog.record_tuples == CLIENT_REQUEST_TESTS[exception]
 
 
 @pytest.mark.parametrize("install", [*TEST_INSTALLS, "botched"])
@@ -138,45 +187,3 @@ async def test_setup(
     """
 
     assert hass.services.async_services_for_domain(DOMAIN).keys() == snapshot
-
-
-@pytest.mark.parametrize("install", ["default"])
-async def test_service_refresh_system(
-    hass: HomeAssistant,
-    evohome: EvohomeClient,
-) -> None:
-    """Test EvoService.REFRESH_SYSTEM of an evohome system."""
-
-    # EvoService.REFRESH_SYSTEM
-    with patch("evohomeasync2.location.Location.refresh_status") as mock_fcn:
-        await hass.services.async_call(
-            DOMAIN,
-            EvoService.REFRESH_SYSTEM,
-            {},
-            blocking=True,
-        )
-
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args == ()
-        assert mock_fcn.await_args.kwargs == {}
-
-
-@pytest.mark.parametrize("install", ["default"])
-async def test_service_reset_system(
-    hass: HomeAssistant,
-    evohome: EvohomeClient,
-) -> None:
-    """Test EvoService.RESET_SYSTEM of an evohome system."""
-
-    # EvoService.RESET_SYSTEM (if SZ_AUTO_WITH_RESET in modes)
-    with patch("evohomeasync2.controlsystem.ControlSystem.set_mode") as mock_fcn:
-        await hass.services.async_call(
-            DOMAIN,
-            EvoService.RESET_SYSTEM,
-            {},
-            blocking=True,
-        )
-
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args == ("AutoWithReset",)
-        assert mock_fcn.await_args.kwargs == {"until": None}
diff --git a/tests/components/evohome/test_storage.py b/tests/components/evohome/test_storage.py
index 4cc21078333..4528f1c8590 100644
--- a/tests/components/evohome/test_storage.py
+++ b/tests/components/evohome/test_storage.py
@@ -7,22 +7,17 @@ from typing import Any, Final, NotRequired, TypedDict
 
 import pytest
 
-from homeassistant.components.evohome import (
-    CONF_USERNAME,
-    DOMAIN,
-    STORAGE_KEY,
-    STORAGE_VER,
-    dt_aware_to_naive,
-)
+from homeassistant.components.evohome.const import DOMAIN, STORAGE_KEY, STORAGE_VER
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import setup_evohome
 from .const import ACCESS_TOKEN, REFRESH_TOKEN, SESSION_ID, USERNAME
 
 
 class _SessionDataT(TypedDict):
-    sessionId: str
+    session_id: str
+    session_id_expires: NotRequired[str]  # 2024-07-27T23:57:30+01:00
 
 
 class _TokenStoreT(TypedDict):
@@ -65,7 +60,7 @@ _TEST_STORAGE_BASE: Final[_TokenStoreT] = {
 TEST_STORAGE_DATA: Final[dict[str, _TokenStoreT]] = {
     "sans_session_id": _TEST_STORAGE_BASE,
     "null_session_id": _TEST_STORAGE_BASE | {SZ_USER_DATA: None},  # type: ignore[dict-item]
-    "with_session_id": _TEST_STORAGE_BASE | {SZ_USER_DATA: {"sessionId": SESSION_ID}},
+    "with_session_id": _TEST_STORAGE_BASE | {SZ_USER_DATA: {"session_id": SESSION_ID}},
 }
 
 TEST_STORAGE_NULL: Final[dict[str, _EmptyStoreT | None]] = {
@@ -89,15 +84,12 @@ async def test_auth_tokens_null(
     idx: str,
     install: str,
 ) -> None:
-    """Test loading/saving authentication tokens when no cached tokens in the store."""
+    """Test credentials manager when cache is empty."""
 
     hass_storage[DOMAIN] = DOMAIN_STORAGE_BASE | {"data": TEST_STORAGE_NULL[idx]}
 
-    async for mock_client in setup_evohome(hass, config, install=install):
-        # Confirm client was instantiated without tokens, as cache was empty...
-        assert SZ_REFRESH_TOKEN not in mock_client.call_args.kwargs
-        assert SZ_ACCESS_TOKEN not in mock_client.call_args.kwargs
-        assert SZ_ACCESS_TOKEN_EXPIRES not in mock_client.call_args.kwarg
+    async for _ in setup_evohome(hass, config, install=install):
+        pass
 
     # Confirm the expected tokens were cached to storage...
     data: _TokenStoreT = hass_storage[DOMAIN]["data"]
@@ -120,17 +112,12 @@ async def test_auth_tokens_same(
     idx: str,
     install: str,
 ) -> None:
-    """Test loading/saving authentication tokens when matching username."""
+    """Test credentials manager when cache contains valid data for this user."""
 
     hass_storage[DOMAIN] = DOMAIN_STORAGE_BASE | {"data": TEST_STORAGE_DATA[idx]}
 
-    async for mock_client in setup_evohome(hass, config, install=install):
-        # Confirm client was instantiated with the cached tokens...
-        assert mock_client.call_args.kwargs[SZ_REFRESH_TOKEN] == REFRESH_TOKEN
-        assert mock_client.call_args.kwargs[SZ_ACCESS_TOKEN] == ACCESS_TOKEN
-        assert mock_client.call_args.kwargs[
-            SZ_ACCESS_TOKEN_EXPIRES
-        ] == dt_aware_to_naive(ACCESS_TOKEN_EXP_DTM)
+    async for _ in setup_evohome(hass, config, install=install):
+        pass
 
     # Confirm the expected tokens were cached to storage...
     data: _TokenStoreT = hass_storage[DOMAIN]["data"]
@@ -150,7 +137,7 @@ async def test_auth_tokens_past(
     idx: str,
     install: str,
 ) -> None:
-    """Test loading/saving authentication tokens with matching username, but expired."""
+    """Test credentials manager when cache contains expired data for this user."""
 
     dt_dtm, dt_str = dt_pair(dt_util.now() - timedelta(hours=1))
 
@@ -160,19 +147,14 @@ async def test_auth_tokens_past(
 
     hass_storage[DOMAIN] = DOMAIN_STORAGE_BASE | {"data": test_data}
 
-    async for mock_client in setup_evohome(hass, config, install=install):
-        # Confirm client was instantiated with the cached tokens...
-        assert mock_client.call_args.kwargs[SZ_REFRESH_TOKEN] == REFRESH_TOKEN
-        assert mock_client.call_args.kwargs[SZ_ACCESS_TOKEN] == ACCESS_TOKEN
-        assert mock_client.call_args.kwargs[
-            SZ_ACCESS_TOKEN_EXPIRES
-        ] == dt_aware_to_naive(dt_dtm)
+    async for _ in setup_evohome(hass, config, install=install):
+        pass
 
     # Confirm the expected tokens were cached to storage...
     data: _TokenStoreT = hass_storage[DOMAIN]["data"]
 
     assert data[SZ_USERNAME] == USERNAME_SAME
-    assert data[SZ_REFRESH_TOKEN] == REFRESH_TOKEN
+    assert data[SZ_REFRESH_TOKEN] == f"new_{REFRESH_TOKEN}"
     assert data[SZ_ACCESS_TOKEN] == f"new_{ACCESS_TOKEN}"
     assert (
         dt_util.parse_datetime(data[SZ_ACCESS_TOKEN_EXPIRES], raise_on_error=True)
@@ -189,17 +171,13 @@ async def test_auth_tokens_diff(
     idx: str,
     install: str,
 ) -> None:
-    """Test loading/saving authentication tokens when unmatched username."""
+    """Test credentials manager when cache contains data for a different user."""
 
     hass_storage[DOMAIN] = DOMAIN_STORAGE_BASE | {"data": TEST_STORAGE_DATA[idx]}
+    config["username"] = USERNAME_DIFF
 
-    async for mock_client in setup_evohome(
-        hass, config | {CONF_USERNAME: USERNAME_DIFF}, install=install
-    ):
-        # Confirm client was instantiated without tokens, as username was different...
-        assert SZ_REFRESH_TOKEN not in mock_client.call_args.kwargs
-        assert SZ_ACCESS_TOKEN not in mock_client.call_args.kwargs
-        assert SZ_ACCESS_TOKEN_EXPIRES not in mock_client.call_args.kwarg
+    async for _ in setup_evohome(hass, config, install=install):
+        pass
 
     # Confirm the expected tokens were cached to storage...
     data: _TokenStoreT = hass_storage[DOMAIN]["data"]
diff --git a/tests/components/evohome/test_water_heater.py b/tests/components/evohome/test_water_heater.py
index 8acfd469b59..ca9a5ba6af8 100644
--- a/tests/components/evohome/test_water_heater.py
+++ b/tests/components/evohome/test_water_heater.py
@@ -33,7 +33,7 @@ from .const import TEST_INSTALLS_WITH_DHW
 DHW_ENTITY_ID = "water_heater.domestic_hot_water"
 
 
-@pytest.mark.parametrize("install", [*TEST_INSTALLS_WITH_DHW, "botched"])
+@pytest.mark.parametrize("install", TEST_INSTALLS_WITH_DHW)
 async def test_setup_platform(
     hass: HomeAssistant,
     config: dict[str, str],
@@ -67,7 +67,7 @@ async def test_set_operation_mode(
     results = []
 
     # SERVICE_SET_OPERATION_MODE: auto
-    with patch("evohomeasync2.hotwater.HotWater.reset_mode") as mock_fcn:
+    with patch("evohomeasync2.hotwater.HotWater.reset") as mock_fcn:
         await hass.services.async_call(
             Platform.WATER_HEATER,
             SERVICE_SET_OPERATION_MODE,
@@ -78,12 +78,10 @@ async def test_set_operation_mode(
             blocking=True,
         )
 
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args == ()
-        assert mock_fcn.await_args.kwargs == {}
+        mock_fcn.assert_awaited_once_with()
 
     # SERVICE_SET_OPERATION_MODE: off (until next scheduled setpoint)
-    with patch("evohomeasync2.hotwater.HotWater.set_off") as mock_fcn:
+    with patch("evohomeasync2.hotwater.HotWater.off") as mock_fcn:
         await hass.services.async_call(
             Platform.WATER_HEATER,
             SERVICE_SET_OPERATION_MODE,
@@ -94,14 +92,16 @@ async def test_set_operation_mode(
             blocking=True,
         )
 
-        assert mock_fcn.await_count == 1
+        mock_fcn.assert_awaited_once()
+
+        assert mock_fcn.await_args is not None  # mypy hint
         assert mock_fcn.await_args.args == ()
         assert mock_fcn.await_args.kwargs != {}
 
         results.append(mock_fcn.await_args.kwargs)
 
     # SERVICE_SET_OPERATION_MODE: on (until next scheduled setpoint)
-    with patch("evohomeasync2.hotwater.HotWater.set_on") as mock_fcn:
+    with patch("evohomeasync2.hotwater.HotWater.on") as mock_fcn:
         await hass.services.async_call(
             Platform.WATER_HEATER,
             SERVICE_SET_OPERATION_MODE,
@@ -112,7 +112,9 @@ async def test_set_operation_mode(
             blocking=True,
         )
 
-        assert mock_fcn.await_count == 1
+        mock_fcn.assert_awaited_once()
+
+        assert mock_fcn.await_args is not None  # mypy hint
         assert mock_fcn.await_args.args == ()
         assert mock_fcn.await_args.kwargs != {}
 
@@ -126,7 +128,7 @@ async def test_set_away_mode(hass: HomeAssistant, evohome: EvohomeClient) -> Non
     """Test SERVICE_SET_AWAY_MODE of an evohome DHW zone."""
 
     # set_away_mode: off
-    with patch("evohomeasync2.hotwater.HotWater.reset_mode") as mock_fcn:
+    with patch("evohomeasync2.hotwater.HotWater.reset") as mock_fcn:
         await hass.services.async_call(
             Platform.WATER_HEATER,
             SERVICE_SET_AWAY_MODE,
@@ -137,12 +139,10 @@ async def test_set_away_mode(hass: HomeAssistant, evohome: EvohomeClient) -> Non
             blocking=True,
         )
 
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args == ()
-        assert mock_fcn.await_args.kwargs == {}
+        mock_fcn.assert_awaited_once_with()
 
     # set_away_mode: on
-    with patch("evohomeasync2.hotwater.HotWater.set_off") as mock_fcn:
+    with patch("evohomeasync2.hotwater.HotWater.off") as mock_fcn:
         await hass.services.async_call(
             Platform.WATER_HEATER,
             SERVICE_SET_AWAY_MODE,
@@ -153,9 +153,7 @@ async def test_set_away_mode(hass: HomeAssistant, evohome: EvohomeClient) -> Non
             blocking=True,
         )
 
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args == ()
-        assert mock_fcn.await_args.kwargs == {}
+        mock_fcn.assert_awaited_once_with()
 
 
 @pytest.mark.parametrize("install", TEST_INSTALLS_WITH_DHW)
diff --git a/tests/components/facebook/test_notify.py b/tests/components/facebook/test_notify.py
index 77ae544646d..db9cd86e086 100644
--- a/tests/components/facebook/test_notify.py
+++ b/tests/components/facebook/test_notify.py
@@ -5,7 +5,7 @@ from http import HTTPStatus
 import pytest
 import requests_mock
 
-import homeassistant.components.facebook.notify as fb
+from homeassistant.components.facebook import notify as fb
 from homeassistant.core import HomeAssistant
 
 
diff --git a/tests/components/fan/test_device_trigger.py b/tests/components/fan/test_device_trigger.py
index f4673636637..bef44c92f34 100644
--- a/tests/components/fan/test_device_trigger.py
+++ b/tests/components/fan/test_device_trigger.py
@@ -13,7 +13,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/fan/test_init.py b/tests/components/fan/test_init.py
index 90061ec60a1..0ab7686a68b 100644
--- a/tests/components/fan/test_init.py
+++ b/tests/components/fan/test_init.py
@@ -12,7 +12,7 @@ from homeassistant.components.fan import (
     NotValidPresetModeError,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
 
 from .common import MockFan
diff --git a/tests/components/feedreader/test_event.py b/tests/components/feedreader/test_event.py
index 32f8ecb8080..8f5f3870bfe 100644
--- a/tests/components/feedreader/test_event.py
+++ b/tests/components/feedreader/test_event.py
@@ -13,7 +13,7 @@ from homeassistant.components.feedreader.event import (
     ATTR_TITLE,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import create_mock_entry
 from .const import VALID_CONFIG_DEFAULT
diff --git a/tests/components/feedreader/test_init.py b/tests/components/feedreader/test_init.py
index 9a2575bf591..5d2ac1a4406 100644
--- a/tests/components/feedreader/test_init.py
+++ b/tests/components/feedreader/test_init.py
@@ -14,7 +14,7 @@ from homeassistant.components.feedreader.const import DOMAIN
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import Event, HomeAssistant
 from homeassistant.helpers import device_registry as dr
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import async_setup_config_entry, create_mock_entry
 from .const import (
diff --git a/tests/components/fibaro/conftest.py b/tests/components/fibaro/conftest.py
index 583c44a41e6..55b7e35132c 100644
--- a/tests/components/fibaro/conftest.py
+++ b/tests/components/fibaro/conftest.py
@@ -157,12 +157,31 @@ def mock_thermostat() -> Mock:
     return climate
 
 
+@pytest.fixture
+def mock_thermostat_parent() -> Mock:
+    """Fixture for a thermostat."""
+    climate = Mock()
+    climate.fibaro_id = 5
+    climate.parent_fibaro_id = 0
+    climate.name = "Test climate"
+    climate.room_id = 1
+    climate.dead = False
+    climate.visible = True
+    climate.enabled = True
+    climate.type = "com.fibaro.device"
+    climate.base_type = "com.fibaro.device"
+    climate.properties = {"manufacturer": ""}
+    climate.actions = []
+    return climate
+
+
 @pytest.fixture
 def mock_thermostat_with_operating_mode() -> Mock:
     """Fixture for a thermostat."""
     climate = Mock()
-    climate.fibaro_id = 4
-    climate.parent_fibaro_id = 0
+    climate.fibaro_id = 6
+    climate.endpoint_id = 1
+    climate.parent_fibaro_id = 5
     climate.name = "Test climate"
     climate.room_id = 1
     climate.dead = False
@@ -171,20 +190,47 @@ def mock_thermostat_with_operating_mode() -> Mock:
     climate.type = "com.fibaro.thermostatDanfoss"
     climate.base_type = "com.fibaro.device"
     climate.properties = {"manufacturer": ""}
-    climate.actions = {"setOperationMode": 1}
+    climate.actions = {"setOperatingMode": 1, "setTargetLevel": 1}
     climate.supported_features = {}
     climate.has_supported_operating_modes = True
     climate.supported_operating_modes = [0, 1, 15]
     climate.has_operating_mode = True
     climate.operating_mode = 15
+    climate.has_supported_thermostat_modes = False
     climate.has_thermostat_mode = False
+    climate.has_unit = True
+    climate.unit = "C"
+    climate.has_heating_thermostat_setpoint = False
+    climate.has_heating_thermostat_setpoint_future = False
+    climate.target_level = 23
     value_mock = Mock()
     value_mock.has_value = True
-    value_mock.int_value.return_value = 20
+    value_mock.float_value.return_value = 20
     climate.value = value_mock
     return climate
 
 
+@pytest.fixture
+def mock_fan_device() -> Mock:
+    """Fixture for a fan endpoint of a thermostat device."""
+    climate = Mock()
+    climate.fibaro_id = 7
+    climate.endpoint_id = 1
+    climate.parent_fibaro_id = 5
+    climate.name = "Test fan"
+    climate.room_id = 1
+    climate.dead = False
+    climate.visible = True
+    climate.enabled = True
+    climate.type = "com.fibaro.fan"
+    climate.base_type = "com.fibaro.device"
+    climate.properties = {"manufacturer": ""}
+    climate.actions = {"setFanMode": 1}
+    climate.supported_modes = [0, 1, 2]
+    climate.mode = 1
+    return climate
+
+
 @pytest.fixture
 def mock_config_entry(hass: HomeAssistant) -> MockConfigEntry:
     """Return the default mocked config entry."""
@@ -209,19 +255,22 @@ def mock_fibaro_client() -> Generator[Mock]:
     info_mock.hc_name = TEST_NAME
     info_mock.current_version = TEST_VERSION
     info_mock.platform = TEST_MODEL
+    info_mock.manufacturer_name = "Fibaro"
+    info_mock.model_name = "Home Center 2"
+    info_mock.mac_address = "00:22:4d:b7:13:24"
 
     with patch(
         "homeassistant.components.fibaro.FibaroClient", autospec=True
     ) as fibaro_client_mock:
         client = fibaro_client_mock.return_value
-        client.set_authentication.return_value = None
-        client.connect.return_value = True
+        client.connect_with_credentials.return_value = info_mock
         client.read_info.return_value = info_mock
         client.read_rooms.return_value = []
         client.read_scenes.return_value = []
         client.read_devices.return_value = []
         client.register_update_handler.return_value = None
         client.unregister_update_handler.return_value = None
+        client.frontend_url.return_value = TEST_URL.removesuffix("/api/")
         yield client
 
 
diff --git a/tests/components/fibaro/test_climate.py b/tests/components/fibaro/test_climate.py
index 31022e19a08..339d9d23077 100644
--- a/tests/components/fibaro/test_climate.py
+++ b/tests/components/fibaro/test_climate.py
@@ -130,5 +130,153 @@ async def test_hvac_mode_with_operation_mode_support(
         # Act
         await init_integration(hass, mock_config_entry)
         # Assert
-        state = hass.states.get("climate.room_1_test_climate_4")
+        state = hass.states.get("climate.room_1_test_climate_6")
         assert state.state == HVACMode.AUTO
+
+
+async def test_set_hvac_mode_with_operation_mode_support(
+    hass: HomeAssistant,
+    mock_fibaro_client: Mock,
+    mock_config_entry: MockConfigEntry,
+    mock_thermostat_with_operating_mode: Mock,
+    mock_room: Mock,
+) -> None:
+    """Test that set_hvac_mode() works."""
+
+    # Arrange
+    mock_fibaro_client.read_rooms.return_value = [mock_room]
+    mock_fibaro_client.read_devices.return_value = [mock_thermostat_with_operating_mode]
+
+    with patch("homeassistant.components.fibaro.PLATFORMS", [Platform.CLIMATE]):
+        # Act
+        await init_integration(hass, mock_config_entry)
+        await hass.services.async_call(
+            "climate",
+            "set_hvac_mode",
+            {"entity_id": "climate.room_1_test_climate_6", "hvac_mode": HVACMode.HEAT},
+            blocking=True,
+        )
+
+        # Assert
+        mock_thermostat_with_operating_mode.execute_action.assert_called_once()
+
+
+async def test_fan_mode(
+    hass: HomeAssistant,
+    mock_fibaro_client: Mock,
+    mock_config_entry: MockConfigEntry,
+    mock_thermostat_parent: Mock,
+    mock_thermostat_with_operating_mode: Mock,
+    mock_fan_device: Mock,
+    mock_room: Mock,
+) -> None:
+    """Test that operating mode works."""
+
+    # Arrange
+    mock_fibaro_client.read_rooms.return_value = [mock_room]
+    mock_fibaro_client.read_devices.return_value = [
+        mock_thermostat_parent,
+        mock_thermostat_with_operating_mode,
+        mock_fan_device,
+    ]
+
+    with patch("homeassistant.components.fibaro.PLATFORMS", [Platform.CLIMATE]):
+        # Act
+        await init_integration(hass, mock_config_entry)
+        # Assert
+        state = hass.states.get("climate.room_1_test_climate_6")
+        assert state.attributes["fan_mode"] == "low"
+        assert state.attributes["fan_modes"] == ["off", "low", "auto_high"]
+
+
+async def test_set_fan_mode(
+    hass: HomeAssistant,
+    mock_fibaro_client: Mock,
+    mock_config_entry: MockConfigEntry,
+    mock_thermostat_parent: Mock,
+    mock_thermostat_with_operating_mode: Mock,
+    mock_fan_device: Mock,
+    mock_room: Mock,
+) -> None:
+    """Test that set_fan_mode() works."""
+
+    # Arrange
+    mock_fibaro_client.read_rooms.return_value = [mock_room]
+    mock_fibaro_client.read_devices.return_value = [
+        mock_thermostat_parent,
+        mock_thermostat_with_operating_mode,
+        mock_fan_device,
+    ]
+
+    with patch("homeassistant.components.fibaro.PLATFORMS", [Platform.CLIMATE]):
+        # Act
+        await init_integration(hass, mock_config_entry)
+        await hass.services.async_call(
+            "climate",
+            "set_fan_mode",
+            {"entity_id": "climate.room_1_test_climate_6", "fan_mode": "off"},
+            blocking=True,
+        )
+
+        # Assert
+        mock_fan_device.execute_action.assert_called_once()
+
+
+async def test_target_temperature(
+    hass: HomeAssistant,
+    mock_fibaro_client: Mock,
+    mock_config_entry: MockConfigEntry,
+    mock_thermostat_parent: Mock,
+    mock_thermostat_with_operating_mode: Mock,
+    mock_fan_device: Mock,
+    mock_room: Mock,
+) -> None:
+    """Test that operating mode works."""
+
+    # Arrange
+    mock_fibaro_client.read_rooms.return_value = [mock_room]
+    mock_fibaro_client.read_devices.return_value = [
+        mock_thermostat_parent,
+        mock_thermostat_with_operating_mode,
+        mock_fan_device,
+    ]
+
+    with patch("homeassistant.components.fibaro.PLATFORMS", [Platform.CLIMATE]):
+        # Act
+        await init_integration(hass, mock_config_entry)
+        # Assert
+        state = hass.states.get("climate.room_1_test_climate_6")
+        assert state.attributes["temperature"] == 23
+
+
+async def test_set_target_temperature(
+    hass: HomeAssistant,
+    mock_fibaro_client: Mock,
+    mock_config_entry: MockConfigEntry,
+    mock_thermostat_parent: Mock,
+    mock_thermostat_with_operating_mode: Mock,
+    mock_fan_device: Mock,
+    mock_room: Mock,
+) -> None:
+    """Test that set_fan_mode() works."""
+
+    # Arrange
+    mock_fibaro_client.read_rooms.return_value = [mock_room]
+    mock_fibaro_client.read_devices.return_value = [
+        mock_thermostat_parent,
+        mock_thermostat_with_operating_mode,
+        mock_fan_device,
+    ]
+
+    with patch("homeassistant.components.fibaro.PLATFORMS", [Platform.CLIMATE]):
+        # Act
+        await init_integration(hass, mock_config_entry)
+        await hass.services.async_call(
+            "climate",
+            "set_temperature",
+            {"entity_id": "climate.room_1_test_climate_6", "temperature": 25.5},
+            blocking=True,
+        )
+
+        # Assert
+        mock_thermostat_with_operating_mode.execute_action.assert_called_once()
diff --git a/tests/components/fibaro/test_config_flow.py b/tests/components/fibaro/test_config_flow.py
index 508bb81973d..aee7c2eb903 100644
--- a/tests/components/fibaro/test_config_flow.py
+++ b/tests/components/fibaro/test_config_flow.py
@@ -2,8 +2,8 @@
 
 from unittest.mock import Mock
 
+from pyfibaro.fibaro_client import FibaroAuthenticationFailed, FibaroConnectFailed
 import pytest
-from requests.exceptions import HTTPError
 
 from homeassistant import config_entries
 from homeassistant.components.fibaro import DOMAIN
@@ -23,8 +23,10 @@ pytestmark = pytest.mark.usefixtures("mock_setup_entry", "mock_fibaro_client")
 async def _recovery_after_failure_works(
     hass: HomeAssistant, mock_fibaro_client: Mock, result: FlowResult
 ) -> None:
-    mock_fibaro_client.connect.side_effect = None
-    mock_fibaro_client.connect.return_value = True
+    mock_fibaro_client.connect_with_credentials.side_effect = None
+    mock_fibaro_client.connect_with_credentials.return_value = (
+        mock_fibaro_client.read_info()
+    )
 
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"],
@@ -48,8 +50,10 @@ async def _recovery_after_failure_works(
 async def _recovery_after_reauth_failure_works(
     hass: HomeAssistant, mock_fibaro_client: Mock, result: FlowResult
 ) -> None:
-    mock_fibaro_client.connect.side_effect = None
-    mock_fibaro_client.connect.return_value = True
+    mock_fibaro_client.connect_with_credentials.side_effect = None
+    mock_fibaro_client.connect_with_credentials.return_value = (
+        mock_fibaro_client.read_info()
+    )
 
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"],
@@ -101,7 +105,9 @@ async def test_config_flow_user_initiated_auth_failure(
     assert result["step_id"] == "user"
     assert result["errors"] == {}
 
-    mock_fibaro_client.connect.side_effect = HTTPError(response=Mock(status_code=403))
+    mock_fibaro_client.connect_with_credentials.side_effect = (
+        FibaroAuthenticationFailed()
+    )
 
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"],
@@ -119,7 +125,7 @@ async def test_config_flow_user_initiated_auth_failure(
     await _recovery_after_failure_works(hass, mock_fibaro_client, result)
 
 
-async def test_config_flow_user_initiated_unknown_failure_1(
+async def test_config_flow_user_initiated_connect_failure(
     hass: HomeAssistant, mock_fibaro_client: Mock
 ) -> None:
     """Unknown failure in flow manually initialized by the user."""
@@ -131,37 +137,7 @@ async def test_config_flow_user_initiated_unknown_failure_1(
     assert result["step_id"] == "user"
     assert result["errors"] == {}
 
-    mock_fibaro_client.connect.side_effect = HTTPError(response=Mock(status_code=500))
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {
-            CONF_URL: TEST_URL,
-            CONF_USERNAME: TEST_USERNAME,
-            CONF_PASSWORD: TEST_PASSWORD,
-        },
-    )
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-    assert result["errors"] == {"base": "cannot_connect"}
-
-    await _recovery_after_failure_works(hass, mock_fibaro_client, result)
-
-
-async def test_config_flow_user_initiated_unknown_failure_2(
-    hass: HomeAssistant, mock_fibaro_client: Mock
-) -> None:
-    """Unknown failure in flow manually initialized by the user."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-    assert result["errors"] == {}
-
-    mock_fibaro_client.connect.side_effect = Exception()
+    mock_fibaro_client.connect_with_credentials.side_effect = FibaroConnectFailed()
 
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"],
@@ -208,7 +184,7 @@ async def test_reauth_connect_failure(
     assert result["step_id"] == "reauth_confirm"
     assert result["errors"] == {}
 
-    mock_fibaro_client.connect.side_effect = Exception()
+    mock_fibaro_client.connect_with_credentials.side_effect = FibaroConnectFailed()
 
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"],
@@ -233,7 +209,9 @@ async def test_reauth_auth_failure(
     assert result["step_id"] == "reauth_confirm"
     assert result["errors"] == {}
 
-    mock_fibaro_client.connect.side_effect = HTTPError(response=Mock(status_code=403))
+    mock_fibaro_client.connect_with_credentials.side_effect = (
+        FibaroAuthenticationFailed()
+    )
 
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"],
diff --git a/tests/components/fibaro/test_light.py b/tests/components/fibaro/test_light.py
index d0a24e009b7..88576e86dc6 100644
--- a/tests/components/fibaro/test_light.py
+++ b/tests/components/fibaro/test_light.py
@@ -2,7 +2,8 @@
 
 from unittest.mock import Mock, patch
 
-from homeassistant.const import Platform
+from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN
+from homeassistant.const import ATTR_ENTITY_ID, SERVICE_TURN_OFF, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
@@ -55,3 +56,28 @@ async def test_light_brightness(
         state = hass.states.get("light.room_1_test_light_3")
         assert state.attributes["brightness"] == 51
         assert state.state == "on"
+
+
+async def test_light_turn_off(
+    hass: HomeAssistant,
+    mock_fibaro_client: Mock,
+    mock_config_entry: MockConfigEntry,
+    mock_light: Mock,
+    mock_room: Mock,
+) -> None:
+    """Test activate scene is called."""
+    # Arrange
+    mock_fibaro_client.read_rooms.return_value = [mock_room]
+    mock_fibaro_client.read_devices.return_value = [mock_light]
+
+    with patch("homeassistant.components.fibaro.PLATFORMS", [Platform.LIGHT]):
+        await init_integration(hass, mock_config_entry)
+        # Act
+        await hass.services.async_call(
+            LIGHT_DOMAIN,
+            SERVICE_TURN_OFF,
+            {ATTR_ENTITY_ID: "light.room_1_test_light_3"},
+            blocking=True,
+        )
+        # Assert
+        assert mock_light.execute_action.call_count == 1
diff --git a/tests/components/file/test_notify.py b/tests/components/file/test_notify.py
index e7cb85a9cfc..44b9d61efec 100644
--- a/tests/components/file/test_notify.py
+++ b/tests/components/file/test_notify.py
@@ -12,7 +12,7 @@ from homeassistant.components.file import DOMAIN
 from homeassistant.components.notify import ATTR_TITLE_DEFAULT
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry
 
diff --git a/tests/components/filesize/snapshots/test_sensor.ambr b/tests/components/filesize/snapshots/test_sensor.ambr
index 339d64acf91..e7f6f9d042b 100644
--- a/tests/components/filesize/snapshots/test_sensor.ambr
+++ b/tests/components/filesize/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -102,6 +104,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -153,6 +156,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/filter/conftest.py b/tests/components/filter/conftest.py
new file mode 100644
index 00000000000..a576a2edb37
--- /dev/null
+++ b/tests/components/filter/conftest.py
@@ -0,0 +1,93 @@
+"""Fixtures for the Filter integration."""
+
+from __future__ import annotations
+
+from collections.abc import Generator
+from datetime import timedelta
+from typing import Any
+from unittest.mock import AsyncMock, patch
+
+import pytest
+
+from homeassistant.components.filter.const import (
+    CONF_FILTER_NAME,
+    CONF_FILTER_PRECISION,
+    CONF_FILTER_RADIUS,
+    CONF_FILTER_WINDOW_SIZE,
+    DEFAULT_FILTER_RADIUS,
+    DEFAULT_NAME,
+    DEFAULT_PRECISION,
+    DEFAULT_WINDOW_SIZE,
+    DOMAIN,
+    FILTER_NAME_OUTLIER,
+)
+from homeassistant.config_entries import SOURCE_USER
+from homeassistant.const import CONF_ENTITY_ID, CONF_NAME
+from homeassistant.core import HomeAssistant, State
+from homeassistant.util import dt as dt_util
+
+from tests.common import MockConfigEntry
+
+
+@pytest.fixture(name="values")
+def values_fixture() -> list[State]:
+    """Fixture for a list of test States."""
+    values = []
+    raw_values = [20, 19, 18, 21, 22, 0]
+    timestamp = dt_util.utcnow()
+    for val in raw_values:
+        values.append(State("sensor.test_monitored", str(val), last_updated=timestamp))
+        timestamp += timedelta(minutes=1)
+    return values
+
+
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock]:
+    """Automatically patch setup_entry."""
+    with patch(
+        "homeassistant.components.filter.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
+@pytest.fixture(name="get_config")
+async def get_config_to_integration_load() -> dict[str, Any]:
+    """Return configuration.
+
+    To override the config, tests can be marked with:
+    @pytest.mark.parametrize("get_config", [{...}])
+    """
+    return {
+        CONF_NAME: DEFAULT_NAME,
+        CONF_ENTITY_ID: "sensor.test_monitored",
+        CONF_FILTER_NAME: FILTER_NAME_OUTLIER,
+        CONF_FILTER_WINDOW_SIZE: DEFAULT_WINDOW_SIZE,
+        CONF_FILTER_RADIUS: DEFAULT_FILTER_RADIUS,
+        CONF_FILTER_PRECISION: DEFAULT_PRECISION,
+    }
+
+
+@pytest.fixture(name="loaded_entry")
+async def load_integration(
+    hass: HomeAssistant, get_config: dict[str, Any], values: list[State]
+) -> MockConfigEntry:
+    """Set up the Filter integration in Home Assistant."""
+    config_entry = MockConfigEntry(
+        domain=DOMAIN,
+        source=SOURCE_USER,
+        options=get_config,
+        entry_id="1",
+    )
+
+    config_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    for value in values:
+        hass.states.async_set(get_config["entity_id"], value.state)
+        await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    return config_entry
diff --git a/tests/components/filter/test_config_flow.py b/tests/components/filter/test_config_flow.py
new file mode 100644
index 00000000000..d4a7f7a854f
--- /dev/null
+++ b/tests/components/filter/test_config_flow.py
@@ -0,0 +1,227 @@
+"""Test the Filter config flow."""
+
+from __future__ import annotations
+
+from typing import Any
+from unittest.mock import AsyncMock
+
+import pytest
+
+from homeassistant import config_entries
+from homeassistant.components.filter.const import (
+    CONF_FILTER_LOWER_BOUND,
+    CONF_FILTER_NAME,
+    CONF_FILTER_PRECISION,
+    CONF_FILTER_RADIUS,
+    CONF_FILTER_TIME_CONSTANT,
+    CONF_FILTER_UPPER_BOUND,
+    CONF_FILTER_WINDOW_SIZE,
+    CONF_TIME_SMA_TYPE,
+    DEFAULT_FILTER_RADIUS,
+    DEFAULT_NAME,
+    DEFAULT_PRECISION,
+    DEFAULT_WINDOW_SIZE,
+    DOMAIN,
+    FILTER_NAME_LOWPASS,
+    FILTER_NAME_OUTLIER,
+    FILTER_NAME_RANGE,
+    FILTER_NAME_THROTTLE,
+    FILTER_NAME_TIME_SMA,
+    FILTER_NAME_TIME_THROTTLE,
+    TIME_SMA_LAST,
+)
+from homeassistant.components.recorder import Recorder
+from homeassistant.const import CONF_ENTITY_ID, CONF_NAME
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from tests.common import MockConfigEntry
+
+
+@pytest.mark.parametrize(
+    ("entry_config", "options", "result_options"),
+    [
+        (
+            {CONF_FILTER_NAME: FILTER_NAME_OUTLIER},
+            {
+                CONF_FILTER_WINDOW_SIZE: 1.0,
+                CONF_FILTER_RADIUS: 2.0,
+            },
+            {
+                CONF_FILTER_NAME: FILTER_NAME_OUTLIER,
+                CONF_FILTER_WINDOW_SIZE: 1,
+                CONF_FILTER_RADIUS: 2.0,
+            },
+        ),
+        (
+            {CONF_FILTER_NAME: FILTER_NAME_LOWPASS},
+            {
+                CONF_FILTER_WINDOW_SIZE: 1.0,
+                CONF_FILTER_TIME_CONSTANT: 10.0,
+            },
+            {
+                CONF_FILTER_NAME: FILTER_NAME_LOWPASS,
+                CONF_FILTER_WINDOW_SIZE: 1,
+                CONF_FILTER_TIME_CONSTANT: 10,
+            },
+        ),
+        (
+            {CONF_FILTER_NAME: FILTER_NAME_RANGE},
+            {
+                CONF_FILTER_LOWER_BOUND: 1.0,
+                CONF_FILTER_UPPER_BOUND: 10.0,
+            },
+            {
+                CONF_FILTER_NAME: FILTER_NAME_RANGE,
+                CONF_FILTER_LOWER_BOUND: 1.0,
+                CONF_FILTER_UPPER_BOUND: 10.0,
+            },
+        ),
+        (
+            {CONF_FILTER_NAME: FILTER_NAME_TIME_SMA},
+            {
+                CONF_TIME_SMA_TYPE: TIME_SMA_LAST,
+                CONF_FILTER_WINDOW_SIZE: {"hours": 40, "minutes": 5, "seconds": 5},
+            },
+            {
+                CONF_FILTER_NAME: FILTER_NAME_TIME_SMA,
+                CONF_TIME_SMA_TYPE: TIME_SMA_LAST,
+                CONF_FILTER_WINDOW_SIZE: {"hours": 40, "minutes": 5, "seconds": 5},
+            },
+        ),
+        (
+            {CONF_FILTER_NAME: FILTER_NAME_THROTTLE},
+            {
+                CONF_FILTER_WINDOW_SIZE: 1.0,
+            },
+            {
+                CONF_FILTER_NAME: FILTER_NAME_THROTTLE,
+                CONF_FILTER_WINDOW_SIZE: 1,
+            },
+        ),
+        (
+            {CONF_FILTER_NAME: FILTER_NAME_TIME_THROTTLE},
+            {
+                CONF_FILTER_WINDOW_SIZE: {"hours": 40, "minutes": 5, "seconds": 5},
+            },
+            {
+                CONF_FILTER_NAME: FILTER_NAME_TIME_THROTTLE,
+                CONF_FILTER_WINDOW_SIZE: {"hours": 40, "minutes": 5, "seconds": 5},
+            },
+        ),
+    ],
+)
+async def test_form(
+    recorder_mock: Recorder,
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    entry_config: dict[str, Any],
+    options: dict[str, Any],
+    result_options: dict[str, Any],
+) -> None:
+    """Test we get the form."""
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["step_id"] == "user"
+    assert result["type"] is FlowResultType.FORM
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_NAME: DEFAULT_NAME,
+            CONF_ENTITY_ID: "sensor.test_monitored",
+            **entry_config,
+        },
+    )
+    await hass.async_block_till_done()
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_FILTER_PRECISION: DEFAULT_PRECISION, **options},
+    )
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["version"] == 1
+    assert result["options"] == {
+        CONF_NAME: DEFAULT_NAME,
+        CONF_ENTITY_ID: "sensor.test_monitored",
+        CONF_FILTER_PRECISION: DEFAULT_PRECISION,
+        **result_options,
+    }
+
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_options_flow(
+    recorder_mock: Recorder, hass: HomeAssistant, loaded_entry: MockConfigEntry
+) -> None:
+    """Test options flow."""
+
+    result = await hass.config_entries.options.async_init(loaded_entry.entry_id)
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "outlier"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            CONF_FILTER_WINDOW_SIZE: 2.0,
+            CONF_FILTER_RADIUS: 3.0,
+            CONF_FILTER_PRECISION: DEFAULT_PRECISION,
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["data"] == {
+        CONF_NAME: DEFAULT_NAME,
+        CONF_ENTITY_ID: "sensor.test_monitored",
+        CONF_FILTER_NAME: FILTER_NAME_OUTLIER,
+        CONF_FILTER_WINDOW_SIZE: 2,
+        CONF_FILTER_RADIUS: 3.0,
+        CONF_FILTER_PRECISION: DEFAULT_PRECISION,
+    }
+
+    await hass.async_block_till_done()
+
+    # Check the entity was updated, no new entity was created
+    assert len(hass.states.async_all()) == 2
+
+    state = hass.states.get("sensor.filtered_sensor")
+    assert state is not None
+
+
+async def test_entry_already_exist(
+    recorder_mock: Recorder, hass: HomeAssistant, loaded_entry: MockConfigEntry
+) -> None:
+    """Test abort when entry already exist."""
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["step_id"] == "user"
+    assert result["type"] is FlowResultType.FORM
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_NAME: DEFAULT_NAME,
+            CONF_ENTITY_ID: "sensor.test_monitored",
+            CONF_FILTER_NAME: FILTER_NAME_OUTLIER,
+        },
+    )
+    await hass.async_block_till_done()
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_FILTER_WINDOW_SIZE: DEFAULT_WINDOW_SIZE,
+            CONF_FILTER_RADIUS: DEFAULT_FILTER_RADIUS,
+            CONF_FILTER_PRECISION: DEFAULT_PRECISION,
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
diff --git a/tests/components/filter/test_init.py b/tests/components/filter/test_init.py
new file mode 100644
index 00000000000..a5d5cf84a67
--- /dev/null
+++ b/tests/components/filter/test_init.py
@@ -0,0 +1,20 @@
+"""Test Filter component setup process."""
+
+from __future__ import annotations
+
+from homeassistant.components.recorder import Recorder
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+async def test_unload_entry(
+    recorder_mock: Recorder, hass: HomeAssistant, loaded_entry: MockConfigEntry
+) -> None:
+    """Test unload an entry."""
+
+    assert loaded_entry.state is ConfigEntryState.LOADED
+    assert await hass.config_entries.async_unload(loaded_entry.entry_id)
+    await hass.async_block_till_done()
+    assert loaded_entry.state is ConfigEntryState.NOT_LOADED
diff --git a/tests/components/filter/test_sensor.py b/tests/components/filter/test_sensor.py
index a3e0e58908a..22db1c3cec2 100644
--- a/tests/components/filter/test_sensor.py
+++ b/tests/components/filter/test_sensor.py
@@ -6,8 +6,18 @@ from unittest.mock import patch
 import pytest
 
 from homeassistant import config as hass_config
-from homeassistant.components.filter.sensor import (
+from homeassistant.components.filter.const import (
+    CONF_FILTER_NAME,
+    CONF_FILTER_PRECISION,
+    CONF_FILTER_WINDOW_SIZE,
+    CONF_TIME_SMA_TYPE,
+    DEFAULT_NAME,
+    DEFAULT_PRECISION,
     DOMAIN,
+    FILTER_NAME_TIME_SMA,
+    TIME_SMA_LAST,
+)
+from homeassistant.components.filter.sensor import (
     LowPassFilter,
     OutlierFilter,
     RangeFilter,
@@ -24,6 +34,8 @@ from homeassistant.components.sensor import (
 from homeassistant.const import (
     ATTR_DEVICE_CLASS,
     ATTR_UNIT_OF_MEASUREMENT,
+    CONF_ENTITY_ID,
+    CONF_NAME,
     SERVICE_RELOAD,
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
@@ -32,9 +44,9 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
-from tests.common import assert_setup_component, get_fixture_path
+from tests.common import MockConfigEntry, assert_setup_component, get_fixture_path
 
 
 @pytest.fixture(autouse=True, name="stub_blueprint_populate")
@@ -97,6 +109,41 @@ async def test_chain(
         assert state.state == "18.05"
 
 
+async def test_from_config_entry(
+    recorder_mock: Recorder,
+    hass: HomeAssistant,
+    loaded_entry: MockConfigEntry,
+) -> None:
+    """Test if filter works loaded from config entry."""
+
+    state = hass.states.get("sensor.filtered_sensor")
+    assert state.state == "22.0"
+
+
+@pytest.mark.parametrize(
+    "get_config",
+    [
+        {
+            CONF_NAME: DEFAULT_NAME,
+            CONF_ENTITY_ID: "sensor.test_monitored",
+            CONF_FILTER_NAME: FILTER_NAME_TIME_SMA,
+            CONF_TIME_SMA_TYPE: TIME_SMA_LAST,
+            CONF_FILTER_WINDOW_SIZE: {"hours": 40, "minutes": 5, "seconds": 5},
+            CONF_FILTER_PRECISION: DEFAULT_PRECISION,
+        }
+    ],
+)
+async def test_from_config_entry_duration(
+    recorder_mock: Recorder,
+    hass: HomeAssistant,
+    loaded_entry: MockConfigEntry,
+) -> None:
+    """Test if filter works loaded from config entry with duration."""
+
+    state = hass.states.get("sensor.filtered_sensor")
+    assert state.state == "20.0"
+
+
 @pytest.mark.parametrize("missing", [True, False])
 async def test_chain_history(
     recorder_mock: Recorder,
diff --git a/tests/components/fireservicerota/test_config_flow.py b/tests/components/fireservicerota/test_config_flow.py
index 5555a8d649c..8d150034ec9 100644
--- a/tests/components/fireservicerota/test_config_flow.py
+++ b/tests/components/fireservicerota/test_config_flow.py
@@ -66,7 +66,7 @@ async def test_invalid_credentials(hass: HomeAssistant) -> None:
     """Test that invalid credentials throws an error."""
 
     with patch(
-        "homeassistant.components.fireservicerota.FireServiceRota.request_tokens",
+        "homeassistant.components.fireservicerota.coordinator.FireServiceRota.request_tokens",
         side_effect=InvalidAuthError,
     ):
         result = await hass.config_entries.flow.async_init(
diff --git a/tests/components/flexit_bacnet/conftest.py b/tests/components/flexit_bacnet/conftest.py
index 6ce17261bfc..09957fe496f 100644
--- a/tests/components/flexit_bacnet/conftest.py
+++ b/tests/components/flexit_bacnet/conftest.py
@@ -67,6 +67,7 @@ def mock_flexit_bacnet() -> Generator[AsyncMock]:
         flexit_bacnet.air_filter_polluted = False
         flexit_bacnet.air_filter_exchange_interval = 8784
         flexit_bacnet.electric_heater = True
+        flexit_bacnet.fireplace_mode_runtime = 10
 
         # Mock fan setpoints
         flexit_bacnet.fan_setpoint_extract_air_fire = 56
diff --git a/tests/components/flexit_bacnet/snapshots/test_binary_sensor.ambr b/tests/components/flexit_bacnet/snapshots/test_binary_sensor.ambr
index f983d834927..0b45e1f19be 100644
--- a/tests/components/flexit_bacnet/snapshots/test_binary_sensor.ambr
+++ b/tests/components/flexit_bacnet/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/flexit_bacnet/snapshots/test_climate.ambr b/tests/components/flexit_bacnet/snapshots/test_climate.ambr
index 790c377b1f2..d15fc291a16 100644
--- a/tests/components/flexit_bacnet/snapshots/test_climate.ambr
+++ b/tests/components/flexit_bacnet/snapshots/test_climate.ambr
@@ -19,6 +19,7 @@
       'target_temp_step': 0.5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/flexit_bacnet/snapshots/test_number.ambr b/tests/components/flexit_bacnet/snapshots/test_number.ambr
index 78eefd08345..622ec81e45d 100644
--- a/tests/components/flexit_bacnet/snapshots/test_number.ambr
+++ b/tests/components/flexit_bacnet/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -68,6 +69,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -125,6 +127,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -182,6 +185,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -239,6 +243,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -284,6 +289,64 @@
     'state': '56',
   })
 # ---
+# name: test_numbers[number.device_name_fireplace_mode_runtime-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 360,
+      'min': 1,
+      'mode': <NumberMode.SLIDER: 'slider'>,
+      'step': 1,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': None,
+    'entity_id': 'number.device_name_fireplace_mode_runtime',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <NumberDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Fireplace mode runtime',
+    'platform': 'flexit_bacnet',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'fireplace_mode_runtime',
+    'unique_id': '0000-0001-fireplace_mode_runtime',
+    'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+  })
+# ---
+# name: test_numbers[number.device_name_fireplace_mode_runtime-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'duration',
+      'friendly_name': 'Device Name Fireplace mode runtime',
+      'max': 360,
+      'min': 1,
+      'mode': <NumberMode.SLIDER: 'slider'>,
+      'step': 1,
+      'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.device_name_fireplace_mode_runtime',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '10',
+  })
+# ---
 # name: test_numbers[number.device_name_fireplace_supply_fan_setpoint-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -296,6 +359,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -353,6 +417,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -410,6 +475,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -467,6 +533,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -524,6 +591,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/flexit_bacnet/snapshots/test_sensor.ambr b/tests/components/flexit_bacnet/snapshots/test_sensor.ambr
index 2c65bd53a6e..b265a4402dc 100644
--- a/tests/components/flexit_bacnet/snapshots/test_sensor.ambr
+++ b/tests/components/flexit_bacnet/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -112,6 +114,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -162,6 +165,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -210,6 +214,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -258,6 +263,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -308,6 +314,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -362,6 +369,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -412,6 +420,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -460,6 +469,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -510,6 +520,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -562,6 +573,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -612,6 +624,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -662,6 +675,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -710,6 +724,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/flexit_bacnet/snapshots/test_switch.ambr b/tests/components/flexit_bacnet/snapshots/test_switch.ambr
index d054608f1f7..0e27c2e938a 100644
--- a/tests/components/flexit_bacnet/snapshots/test_switch.ambr
+++ b/tests/components/flexit_bacnet/snapshots/test_switch.ambr
@@ -1,4 +1,52 @@
 # serializer version: 1
+# name: test_switches[switch.device_name_cooker_hood_mode-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.device_name_cooker_hood_mode',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SwitchDeviceClass.SWITCH: 'switch'>,
+    'original_icon': None,
+    'original_name': 'Cooker hood mode',
+    'platform': 'flexit_bacnet',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'cooker_hood_mode',
+    'unique_id': '0000-0001-cooker_hood_mode',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_switches[switch.device_name_cooker_hood_mode-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'switch',
+      'friendly_name': 'Device Name Cooker hood mode',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.device_name_cooker_hood_mode',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
 # name: test_switches[switch.device_name_electric_heater-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -6,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -46,6 +95,54 @@
     'state': 'on',
   })
 # ---
+# name: test_switches[switch.device_name_fireplace_mode-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.device_name_fireplace_mode',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SwitchDeviceClass.SWITCH: 'switch'>,
+    'original_icon': None,
+    'original_name': 'Fireplace mode',
+    'platform': 'flexit_bacnet',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'fireplace_mode',
+    'unique_id': '0000-0001-fireplace_mode',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_switches[switch.device_name_fireplace_mode-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'switch',
+      'friendly_name': 'Device Name Fireplace mode',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.device_name_fireplace_mode',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
 # name: test_switches_implementation[switch.device_name_electric_heater-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
diff --git a/tests/components/flexit_bacnet/test_climate.py b/tests/components/flexit_bacnet/test_climate.py
index 7b0546f60ea..be361541c39 100644
--- a/tests/components/flexit_bacnet/test_climate.py
+++ b/tests/components/flexit_bacnet/test_climate.py
@@ -1,17 +1,40 @@
 """Tests for the Flexit Nordic (BACnet) climate entity."""
 
+import asyncio
 from unittest.mock import AsyncMock
 
+from flexit_bacnet import (
+    VENTILATION_MODE_AWAY,
+    VENTILATION_MODE_HOME,
+    VENTILATION_MODE_STOP,
+)
+import pytest
 from syrupy.assertion import SnapshotAssertion
 
-from homeassistant.const import Platform
+from homeassistant.components.climate import (
+    ATTR_HVAC_ACTION,
+    ATTR_HVAC_MODE,
+    ATTR_PRESET_MODE,
+    PRESET_AWAY,
+    PRESET_HOME,
+    SERVICE_SET_HVAC_MODE,
+    SERVICE_SET_PRESET_MODE,
+    SERVICE_SET_TEMPERATURE,
+    HVACAction,
+    HVACMode,
+)
+from homeassistant.components.flexit_bacnet.const import PRESET_TO_VENTILATION_MODE_MAP
+from homeassistant.const import ATTR_ENTITY_ID, ATTR_TEMPERATURE, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import entity_registry as er
 
 from . import setup_with_selected_platforms
 
 from tests.common import MockConfigEntry, snapshot_platform
 
+ENTITY_ID = "climate.device_name"
+
 
 async def test_climate_entity(
     hass: HomeAssistant,
@@ -24,3 +47,175 @@ async def test_climate_entity(
     await setup_with_selected_platforms(hass, mock_config_entry, [Platform.CLIMATE])
 
     await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
+
+
+async def test_set_hvac_preset_mode(
+    hass: HomeAssistant,
+    mock_flexit_bacnet: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test the initial parameters."""
+    await setup_with_selected_platforms(hass, mock_config_entry, [Platform.CLIMATE])
+
+    # Set preset mode to away
+    mock_flexit_bacnet.ventilation_mode = VENTILATION_MODE_AWAY
+    await hass.services.async_call(
+        Platform.CLIMATE,
+        SERVICE_SET_PRESET_MODE,
+        {
+            ATTR_ENTITY_ID: ENTITY_ID,
+            ATTR_PRESET_MODE: PRESET_AWAY,
+        },
+        blocking=True,
+    )
+
+    state = hass.states.get(ENTITY_ID)
+    assert state.attributes[ATTR_PRESET_MODE] == PRESET_AWAY
+
+    mock_flexit_bacnet.set_ventilation_mode.assert_called_once_with(
+        PRESET_TO_VENTILATION_MODE_MAP[PRESET_AWAY]
+    )
+
+    # Set preset mode to home
+    mock_flexit_bacnet.ventilation_mode = VENTILATION_MODE_HOME
+    await hass.services.async_call(
+        Platform.CLIMATE,
+        SERVICE_SET_PRESET_MODE,
+        {
+            ATTR_ENTITY_ID: ENTITY_ID,
+            ATTR_PRESET_MODE: PRESET_HOME,
+        },
+        blocking=True,
+    )
+
+    state = hass.states.get(ENTITY_ID)
+    assert state.attributes[ATTR_PRESET_MODE] == PRESET_HOME
+
+    mock_flexit_bacnet.set_ventilation_mode.assert_called_with(
+        PRESET_TO_VENTILATION_MODE_MAP[PRESET_HOME]
+    )
+
+    mock_flexit_bacnet.set_ventilation_mode.side_effect = asyncio.TimeoutError
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            Platform.CLIMATE,
+            SERVICE_SET_PRESET_MODE,
+            {
+                ATTR_ENTITY_ID: ENTITY_ID,
+                ATTR_PRESET_MODE: PRESET_AWAY,
+            },
+            blocking=True,
+        )
+
+    mock_flexit_bacnet.set_ventilation_mode.assert_called_with(
+        PRESET_TO_VENTILATION_MODE_MAP[PRESET_AWAY]
+    )
+
+
+async def test_set_hvac_mode(
+    hass: HomeAssistant,
+    mock_flexit_bacnet: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test setting HVAC mode."""
+    await setup_with_selected_platforms(hass, mock_config_entry, [Platform.CLIMATE])
+
+    mock_flexit_bacnet.ventilation_mode = VENTILATION_MODE_STOP
+    await hass.services.async_call(
+        Platform.CLIMATE,
+        SERVICE_SET_HVAC_MODE,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_HVAC_MODE: HVACMode.OFF},
+        blocking=True,
+    )
+
+    state = hass.states.get(ENTITY_ID)
+    assert state.state == HVACMode.OFF
+    mock_flexit_bacnet.set_ventilation_mode.assert_called_once_with(
+        VENTILATION_MODE_STOP
+    )
+
+    mock_flexit_bacnet.set_ventilation_mode.side_effect = asyncio.TimeoutError
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            Platform.CLIMATE,
+            SERVICE_SET_HVAC_MODE,
+            {ATTR_ENTITY_ID: ENTITY_ID, ATTR_HVAC_MODE: HVACMode.OFF},
+            blocking=True,
+        )
+
+    mock_flexit_bacnet.set_ventilation_mode.assert_called_with(VENTILATION_MODE_STOP)
+
+
+async def test_hvac_action(
+    hass: HomeAssistant,
+    mock_flexit_bacnet: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test hvac_action property."""
+    await setup_with_selected_platforms(hass, mock_config_entry, [Platform.CLIMATE])
+
+    # Simulate electric heater being ON
+    mock_flexit_bacnet.electric_heater = True
+    await hass.helpers.entity_component.async_update_entity(ENTITY_ID)
+
+    state = hass.states.get(ENTITY_ID)
+    assert state.attributes[ATTR_HVAC_ACTION] == HVACAction.HEATING
+
+    # Simulate electric heater being OFF
+    mock_flexit_bacnet.electric_heater = False
+    await hass.helpers.entity_component.async_update_entity(ENTITY_ID)
+
+    state = hass.states.get(ENTITY_ID)
+    assert state.attributes[ATTR_HVAC_ACTION] == HVACAction.FAN
+
+
+async def test_set_temperature(
+    hass: HomeAssistant,
+    mock_flexit_bacnet: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test setting the temperature."""
+    await setup_with_selected_platforms(hass, mock_config_entry, [Platform.CLIMATE])
+
+    # Set ventilation mode to HOME and set temperature to 22.5°C
+    mock_flexit_bacnet.ventilation_mode = VENTILATION_MODE_HOME
+    await hass.services.async_call(
+        Platform.CLIMATE,
+        SERVICE_SET_TEMPERATURE,
+        {
+            ATTR_ENTITY_ID: ENTITY_ID,
+            ATTR_TEMPERATURE: 22.5,
+        },
+        blocking=True,
+    )
+
+    # Ensure that the correct method was called
+    mock_flexit_bacnet.set_air_temp_setpoint_home.assert_called_once_with(22.5)
+
+    # Change ventilation mode to AWAY and set temperature
+    mock_flexit_bacnet.ventilation_mode = VENTILATION_MODE_AWAY
+    await hass.services.async_call(
+        Platform.CLIMATE,
+        SERVICE_SET_TEMPERATURE,
+        {
+            ATTR_ENTITY_ID: ENTITY_ID,
+            ATTR_TEMPERATURE: 18.0,
+        },
+        blocking=True,
+    )
+
+    # Ensure that the correct method was called
+    mock_flexit_bacnet.set_air_temp_setpoint_away.assert_called_once_with(18.0)
+
+    # Test handling of connection errors
+    mock_flexit_bacnet.set_air_temp_setpoint_away.side_effect = ConnectionError
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            Platform.CLIMATE,
+            SERVICE_SET_TEMPERATURE,
+            {
+                ATTR_ENTITY_ID: ENTITY_ID,
+                ATTR_TEMPERATURE: 20.0,
+            },
+            blocking=True,
+        )
diff --git a/tests/components/flick_electric/__init__.py b/tests/components/flick_electric/__init__.py
index 36936cad047..3632ce204aa 100644
--- a/tests/components/flick_electric/__init__.py
+++ b/tests/components/flick_electric/__init__.py
@@ -7,15 +7,26 @@ from homeassistant.components.flick_electric.const import (
     CONF_SUPPLY_NODE_REF,
 )
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
 
 CONF = {
-    CONF_USERNAME: "test-username",
+    CONF_USERNAME: "9973debf-963f-49b0-9a73-ba9c3400cbed@anonymised.example.com",
     CONF_PASSWORD: "test-password",
-    CONF_ACCOUNT_ID: "1234",
-    CONF_SUPPLY_NODE_REF: "123",
+    CONF_ACCOUNT_ID: "134800",
+    CONF_SUPPLY_NODE_REF: "/network/nz/supply_nodes/ed7617df-4b10-4c8a-a05d-deadbeef8299",
 }
 
 
+async def setup_integration(hass: HomeAssistant, config_entry: MockConfigEntry) -> None:
+    """Fixture for setting up the component."""
+    config_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+
 def _mock_flick_price():
     return FlickPrice(
         {
diff --git a/tests/components/flick_electric/conftest.py b/tests/components/flick_electric/conftest.py
new file mode 100644
index 00000000000..2abfafab55d
--- /dev/null
+++ b/tests/components/flick_electric/conftest.py
@@ -0,0 +1,105 @@
+"""Flick Electric tests configuration."""
+
+from collections.abc import Generator
+from unittest.mock import AsyncMock, patch
+
+import json_api_doc
+from pyflick import FlickPrice
+import pytest
+
+from homeassistant.components.flick_electric.const import CONF_ACCOUNT_ID, DOMAIN
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+
+from . import CONF
+
+from tests.common import MockConfigEntry, load_json_value_fixture
+
+
+@pytest.fixture
+def mock_config_entry() -> MockConfigEntry:
+    """Mock a config entry."""
+    return MockConfigEntry(
+        domain=DOMAIN,
+        title="123 Fake Street, Newtown, Wellington 6021",
+        data={**CONF},
+        version=2,
+        entry_id="974e52a5c0724d17b7ed876dd6ff4bc8",
+        unique_id=CONF[CONF_ACCOUNT_ID],
+    )
+
+
+@pytest.fixture
+def mock_old_config_entry() -> MockConfigEntry:
+    """Mock an outdated config entry."""
+    return MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            CONF_USERNAME: CONF[CONF_USERNAME],
+            CONF_PASSWORD: CONF[CONF_PASSWORD],
+        },
+        title=CONF[CONF_USERNAME],
+        unique_id=CONF[CONF_USERNAME],
+        version=1,
+    )
+
+
+@pytest.fixture
+def mock_flick_client() -> Generator[AsyncMock]:
+    """Mock a Flick Electric client."""
+    with (
+        patch(
+            "homeassistant.components.flick_electric.FlickAPI",
+            autospec=True,
+        ) as mock_api,
+        patch(
+            "homeassistant.components.flick_electric.config_flow.FlickAPI",
+            new=mock_api,
+        ),
+        patch(
+            "homeassistant.components.flick_electric.config_flow.SimpleFlickAuth.async_get_access_token",
+            return_value="123456789abcdef",
+        ),
+    ):
+        api = mock_api.return_value
+
+        api.getCustomerAccounts.return_value = json_api_doc.deserialize(
+            load_json_value_fixture("accounts.json", DOMAIN)
+        )
+        api.getPricing.return_value = FlickPrice(
+            json_api_doc.deserialize(
+                load_json_value_fixture("rated_period.json", DOMAIN)
+            )
+        )
+
+        yield api
+
+
+@pytest.fixture
+def mock_flick_client_multiple() -> Generator[AsyncMock]:
+    """Mock a Flick Electric with multiple accounts."""
+    with (
+        patch(
+            "homeassistant.components.flick_electric.FlickAPI",
+            autospec=True,
+        ) as mock_api,
+        patch(
+            "homeassistant.components.flick_electric.config_flow.FlickAPI",
+            new=mock_api,
+        ),
+        patch(
+            "homeassistant.components.flick_electric.config_flow.SimpleFlickAuth.async_get_access_token",
+            return_value="123456789abcdef",
+        ),
+    ):
+        api = mock_api.return_value
+
+        api.getCustomerAccounts.return_value = json_api_doc.deserialize(
+            load_json_value_fixture("accounts_multi.json", DOMAIN)
+        )
+        api.getPricing.return_value = FlickPrice(
+            json_api_doc.deserialize(
+                load_json_value_fixture("rated_period.json", DOMAIN)
+            )
+        )
+
+        yield api
diff --git a/tests/components/flick_electric/fixtures/accounts.json b/tests/components/flick_electric/fixtures/accounts.json
new file mode 100644
index 00000000000..a1c08ecd7c0
--- /dev/null
+++ b/tests/components/flick_electric/fixtures/accounts.json
@@ -0,0 +1,105 @@
+{
+  "data": [
+    {
+      "id": "134800",
+      "type": "customer_account",
+      "attributes": {
+        "account_number": "10123404",
+        "billing_name": "9973debf-963f-49b0-9a73-Ba9c3400cbed@Anonymised Example",
+        "billing_email": null,
+        "address": "123 Fake Street, Newtown, Wellington 6021",
+        "brand": "flick",
+        "vulnerability_state": "none",
+        "medical_dependency": false,
+        "status": "active",
+        "start_at": "2023-03-02T00:00:00.000+13:00",
+        "end_at": null,
+        "application_id": "5dfc4978-07de-4d18-8ef7-055603805ba6",
+        "active": true,
+        "on_join_journey": false,
+        "placeholder": false
+      },
+      "relationships": {
+        "user": {
+          "data": {
+            "id": "106676",
+            "type": "customer_user"
+          }
+        },
+        "sign_up": {
+          "data": {
+            "id": "877039",
+            "type": "customer_sign_up"
+          }
+        },
+        "main_customer": {
+          "data": {
+            "id": "108335",
+            "type": "customer_customer"
+          }
+        },
+        "main_consumer": {
+          "data": {
+            "id": "108291",
+            "type": "customer_icp_consumer"
+          }
+        },
+        "primary_contact": {
+          "data": {
+            "id": "121953",
+            "type": "customer_contact"
+          }
+        },
+        "default_payment_method": {
+          "data": {
+            "id": "602801",
+            "type": "customer_payment_method"
+          }
+        },
+        "phone_numbers": {
+          "data": [
+            {
+              "id": "111604",
+              "type": "customer_phone_number"
+            }
+          ]
+        },
+        "payment_methods": {
+          "data": [
+            {
+              "id": "602801",
+              "type": "customer_payment_method"
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "included": [
+    {
+      "id": "108291",
+      "type": "customer_icp_consumer",
+      "attributes": {
+        "start_date": "2023-03-02",
+        "end_date": null,
+        "icp_number": "0001234567UNB12",
+        "supply_node_ref": "/network/nz/supply_nodes/ed7617df-4b10-4c8a-a05d-deadbeef8299",
+        "physical_address": "123 FAKE STREET,NEWTOWN,WELLINGTON,6021"
+      }
+    }
+  ],
+  "meta": {
+    "verb": "get",
+    "type": "customer_account",
+    "params": [],
+    "permission": {
+      "uri": "flick:customer_app:resource:account:list",
+      "data_context": null
+    },
+    "host": "https://api.flickuat.com",
+    "service": "customer",
+    "path": "/accounts",
+    "description": "Returns the accounts viewable by the current user",
+    "respond_with_array": true
+  }
+}
diff --git a/tests/components/flick_electric/fixtures/accounts_multi.json b/tests/components/flick_electric/fixtures/accounts_multi.json
new file mode 100644
index 00000000000..7c1f3fba2ef
--- /dev/null
+++ b/tests/components/flick_electric/fixtures/accounts_multi.json
@@ -0,0 +1,144 @@
+{
+  "data": [
+    {
+      "id": "134800",
+      "type": "customer_account",
+      "attributes": {
+        "account_number": "10123404",
+        "billing_name": "9973debf-963f-49b0-9a73-Ba9c3400cbed@Anonymised Example",
+        "billing_email": null,
+        "address": "123 Fake Street, Newtown, Wellington 6021",
+        "brand": "flick",
+        "vulnerability_state": "none",
+        "medical_dependency": false,
+        "status": "active",
+        "start_at": "2023-03-02T00:00:00.000+13:00",
+        "end_at": null,
+        "application_id": "5dfc4978-07de-4d18-8ef7-055603805ba6",
+        "active": true,
+        "on_join_journey": false,
+        "placeholder": false
+      },
+      "relationships": {
+        "user": {
+          "data": {
+            "id": "106676",
+            "type": "customer_user"
+          }
+        },
+        "sign_up": {
+          "data": {
+            "id": "877039",
+            "type": "customer_sign_up"
+          }
+        },
+        "main_customer": {
+          "data": {
+            "id": "108335",
+            "type": "customer_customer"
+          }
+        },
+        "main_consumer": {
+          "data": {
+            "id": "108291",
+            "type": "customer_icp_consumer"
+          }
+        },
+        "primary_contact": {
+          "data": {
+            "id": "121953",
+            "type": "customer_contact"
+          }
+        },
+        "default_payment_method": {
+          "data": {
+            "id": "602801",
+            "type": "customer_payment_method"
+          }
+        },
+        "phone_numbers": {
+          "data": [
+            {
+              "id": "111604",
+              "type": "customer_phone_number"
+            }
+          ]
+        },
+        "payment_methods": {
+          "data": [
+            {
+              "id": "602801",
+              "type": "customer_payment_method"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "123456",
+      "type": "customer_account",
+      "attributes": {
+        "account_number": "123123123",
+        "billing_name": "9973debf-963f-49b0-9a73-Ba9c3400cbed@Anonymised Example",
+        "billing_email": null,
+        "address": "456 Fake Street, Newtown, Wellington 6021",
+        "brand": "flick",
+        "vulnerability_state": "none",
+        "medical_dependency": false,
+        "status": "active",
+        "start_at": "2023-03-02T00:00:00.000+13:00",
+        "end_at": null,
+        "application_id": "5dfc4978-07de-4d18-8ef7-055603805ba6",
+        "active": true,
+        "on_join_journey": false,
+        "placeholder": false
+      },
+      "relationships": {
+        "main_consumer": {
+          "data": {
+            "id": "11223344",
+            "type": "customer_icp_consumer"
+          }
+        }
+      }
+    }
+  ],
+  "included": [
+    {
+      "id": "108291",
+      "type": "customer_icp_consumer",
+      "attributes": {
+        "start_date": "2023-03-02",
+        "end_date": null,
+        "icp_number": "0001234567UNB12",
+        "supply_node_ref": "/network/nz/supply_nodes/ed7617df-4b10-4c8a-a05d-deadbeef8299",
+        "physical_address": "123 FAKE STREET,NEWTOWN,WELLINGTON,6021"
+      }
+    },
+    {
+      "id": "11223344",
+      "type": "customer_icp_consumer",
+      "attributes": {
+        "start_date": "2023-03-02",
+        "end_date": null,
+        "icp_number": "9991234567UNB12",
+        "supply_node_ref": "/network/nz/supply_nodes/ed7617df-4b10-4c8a-a05d-deadbeef1234",
+        "physical_address": "456 FAKE STREET,NEWTOWN,WELLINGTON,6021"
+      }
+    }
+  ],
+  "meta": {
+    "verb": "get",
+    "type": "customer_account",
+    "params": [],
+    "permission": {
+      "uri": "flick:customer_app:resource:account:list",
+      "data_context": null
+    },
+    "host": "https://api.flickuat.com",
+    "service": "customer",
+    "path": "/accounts",
+    "description": "Returns the accounts viewable by the current user",
+    "respond_with_array": true
+  }
+}
diff --git a/tests/components/flick_electric/fixtures/rated_period.json b/tests/components/flick_electric/fixtures/rated_period.json
new file mode 100644
index 00000000000..8e6ce96a9b7
--- /dev/null
+++ b/tests/components/flick_electric/fixtures/rated_period.json
@@ -0,0 +1,112 @@
+{
+  "data": {
+    "id": "_2025-02-09 05:30:00 UTC..2025-02-09 05:59:59 UTC",
+    "type": "rating_rated_period",
+    "attributes": {
+      "start_at": "2025-02-09T05:30:00.000Z",
+      "end_at": "2025-02-09T05:59:59.000Z",
+      "status": "final",
+      "cost": "0.20011",
+      "import_cost": "0.20011",
+      "export_cost": null,
+      "cost_unit": "NZD",
+      "quantity": "1.0",
+      "import_quantity": "1.0",
+      "export_quantity": null,
+      "quantity_unit": "kwh",
+      "renewable_quantity": null,
+      "generation_price_contract": null
+    },
+    "relationships": {
+      "components": {
+        "data": [
+          {
+            "id": "213507464_1_kwh_generation_UN_24_default_2025-02-09 05:30:00 UTC..2025-02-09 05:59:59 UTC",
+            "type": "rating_component"
+          },
+          {
+            "id": "213507464_1_kwh_network_UN_24_offpeak_2025-02-09 05:30:00 UTC..2025-02-09 05:59:59 UTC",
+            "type": "rating_component"
+          }
+        ]
+      }
+    }
+  },
+  "included": [
+    {
+      "id": "213507464_1_kwh_generation_UN_24_default_2025-02-09 05:30:00 UTC..2025-02-09 05:59:59 UTC",
+      "type": "rating_component",
+      "attributes": {
+        "charge_method": "kwh",
+        "charge_setter": "generation",
+        "value": "0.20011",
+        "quantity": "1.0",
+        "unit_code": "NZD",
+        "charge_per": "kwh",
+        "flow_direction": "import",
+        "content_code": "UN",
+        "hours_of_availability": 24,
+        "channel_number": 1,
+        "meter_serial_number": "213507464",
+        "price_name": "default",
+        "applicable_periods": [],
+        "single_unit_price": "0.20011",
+        "billable": true,
+        "renewable_quantity": null,
+        "generation_price_contract": "FLICK_FLAT_2024_04_01_midpoint"
+      }
+    },
+    {
+      "id": "213507464_1_kwh_network_UN_24_offpeak_2025-02-09 05:30:00 UTC..2025-02-09 05:59:59 UTC",
+      "type": "rating_component",
+      "attributes": {
+        "charge_method": "kwh",
+        "charge_setter": "network",
+        "value": "0.0406",
+        "quantity": "1.0",
+        "unit_code": "NZD",
+        "charge_per": "kwh",
+        "flow_direction": "import",
+        "content_code": "UN",
+        "hours_of_availability": 24,
+        "channel_number": 1,
+        "meter_serial_number": "213507464",
+        "price_name": "offpeak",
+        "applicable_periods": [],
+        "single_unit_price": "0.0406",
+        "billable": false,
+        "renewable_quantity": null,
+        "generation_price_contract": "FLICK_FLAT_2024_04_01_midpoint"
+      }
+    }
+  ],
+  "meta": {
+    "verb": "get",
+    "type": "rating_rated_period",
+    "params": [
+      {
+        "name": "supply_node_ref",
+        "type": "String",
+        "description": "The supply node to rate",
+        "example": "/network/nz/supply_nodes/bccd6f52-448b-4edf-a0c1-459ee67d215b",
+        "required": true
+      },
+      {
+        "name": "as_at",
+        "type": "DateTime",
+        "description": "The time to rate the supply node at; defaults to the current time",
+        "example": "2023-04-01T15:20:15-07:00",
+        "required": false
+      }
+    ],
+    "permission": {
+      "uri": "flick:rating:resource:rated_period:show",
+      "data_context": "supply_node"
+    },
+    "host": "https://api.flickuat.com",
+    "service": "rating",
+    "path": "/rated_period",
+    "description": "Fetch a rated period for a supply node in a specific point in time",
+    "respond_with_array": false
+  }
+}
diff --git a/tests/components/flick_electric/test_config_flow.py b/tests/components/flick_electric/test_config_flow.py
index 7ac605f1c8c..c14303278a3 100644
--- a/tests/components/flick_electric/test_config_flow.py
+++ b/tests/components/flick_electric/test_config_flow.py
@@ -1,6 +1,6 @@
 """Test the Flick Electric config flow."""
 
-from unittest.mock import patch
+from unittest.mock import AsyncMock, patch
 
 from pyflick.authentication import AuthException
 from pyflick.types import APIException
@@ -16,10 +16,16 @@ from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
-from . import CONF, _mock_flick_price
+from . import CONF, setup_integration
 
 from tests.common import MockConfigEntry
 
+# From test fixtures
+ACCOUNT_NAME_1 = "123 Fake Street, Newtown, Wellington 6021"
+ACCOUNT_NAME_2 = "456 Fake Street, Newtown, Wellington 6021"
+ACCOUNT_ID_2 = "123456"
+SUPPLY_NODE_REF_2 = "/network/nz/supply_nodes/ed7617df-4b10-4c8a-a05d-deadbeef1234"
+
 
 async def _flow_submit(hass: HomeAssistant) -> ConfigFlowResult:
     return await hass.config_entries.flow.async_init(
@@ -32,7 +38,7 @@ async def _flow_submit(hass: HomeAssistant) -> ConfigFlowResult:
     )
 
 
-async def test_form(hass: HomeAssistant) -> None:
+async def test_form(hass: HomeAssistant, mock_flick_client: AsyncMock) -> None:
     """Test we get the form with only one, with no account picker."""
 
     result = await hass.config_entries.flow.async_init(
@@ -41,48 +47,24 @@ async def test_form(hass: HomeAssistant) -> None:
     assert result["type"] is FlowResultType.FORM
     assert result["errors"] == {}
 
-    with (
-        patch(
-            "homeassistant.components.flick_electric.config_flow.SimpleFlickAuth.async_get_access_token",
-            return_value="123456789abcdef",
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getCustomerAccounts",
-            return_value=[
-                {
-                    "id": "1234",
-                    "status": "active",
-                    "address": "123 Fake St",
-                    "main_consumer": {"supply_node_ref": "123"},
-                }
-            ],
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getPricing",
-            return_value=_mock_flick_price(),
-        ),
-        patch(
-            "homeassistant.components.flick_electric.async_setup_entry",
-            return_value=True,
-        ) as mock_setup_entry,
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                CONF_USERNAME: "test-username",
-                CONF_PASSWORD: "test-password",
-            },
-        )
-        await hass.async_block_till_done()
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_USERNAME: CONF[CONF_USERNAME],
+            CONF_PASSWORD: CONF[CONF_PASSWORD],
+        },
+    )
+    await hass.async_block_till_done()
 
     assert result2["type"] is FlowResultType.CREATE_ENTRY
-    assert result2["title"] == "123 Fake St"
+    assert result2["title"] == ACCOUNT_NAME_1
     assert result2["data"] == CONF
-    assert result2["result"].unique_id == "1234"
-    assert len(mock_setup_entry.mock_calls) == 1
+    assert result2["result"].unique_id == CONF[CONF_ACCOUNT_ID]
 
 
-async def test_form_multi_account(hass: HomeAssistant) -> None:
+async def test_form_multi_account(
+    hass: HomeAssistant, mock_flick_client_multiple: AsyncMock
+) -> None:
     """Test the form when multiple accounts are available."""
 
     result = await hass.config_entries.flow.async_init(
@@ -91,272 +73,114 @@ async def test_form_multi_account(hass: HomeAssistant) -> None:
     assert result["type"] is FlowResultType.FORM
     assert result["errors"] == {}
 
-    with (
-        patch(
-            "homeassistant.components.flick_electric.config_flow.SimpleFlickAuth.async_get_access_token",
-            return_value="123456789abcdef",
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getCustomerAccounts",
-            return_value=[
-                {
-                    "id": "1234",
-                    "status": "active",
-                    "address": "123 Fake St",
-                    "main_consumer": {"supply_node_ref": "123"},
-                },
-                {
-                    "id": "5678",
-                    "status": "active",
-                    "address": "456 Fake St",
-                    "main_consumer": {"supply_node_ref": "456"},
-                },
-            ],
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getPricing",
-            return_value=_mock_flick_price(),
-        ),
-        patch(
-            "homeassistant.components.flick_electric.async_setup_entry",
-            return_value=True,
-        ) as mock_setup_entry,
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                CONF_USERNAME: "test-username",
-                CONF_PASSWORD: "test-password",
-            },
-        )
-        await hass.async_block_till_done()
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_USERNAME: CONF[CONF_USERNAME],
+            CONF_PASSWORD: CONF[CONF_PASSWORD],
+        },
+    )
+    await hass.async_block_till_done()
 
-        assert result2["type"] is FlowResultType.FORM
-        assert result2["step_id"] == "select_account"
-        assert len(mock_setup_entry.mock_calls) == 0
+    assert result2["type"] is FlowResultType.FORM
+    assert result2["step_id"] == "select_account"
 
-        result3 = await hass.config_entries.flow.async_configure(
-            result2["flow_id"],
-            {"account_id": "5678"},
-        )
+    result3 = await hass.config_entries.flow.async_configure(
+        result2["flow_id"],
+        {CONF_ACCOUNT_ID: ACCOUNT_ID_2},
+    )
 
-        await hass.async_block_till_done()
+    await hass.async_block_till_done()
 
-        assert result3["type"] is FlowResultType.CREATE_ENTRY
-        assert result3["title"] == "456 Fake St"
-        assert result3["data"] == {
-            **CONF,
-            CONF_SUPPLY_NODE_REF: "456",
-            CONF_ACCOUNT_ID: "5678",
-        }
-        assert result3["result"].unique_id == "5678"
-        assert len(mock_setup_entry.mock_calls) == 1
+    assert result3["type"] is FlowResultType.CREATE_ENTRY
+    assert result3["title"] == ACCOUNT_NAME_2
+    assert result3["data"] == {
+        **CONF,
+        CONF_SUPPLY_NODE_REF: SUPPLY_NODE_REF_2,
+        CONF_ACCOUNT_ID: ACCOUNT_ID_2,
+    }
+    assert result3["result"].unique_id == ACCOUNT_ID_2
 
 
-async def test_reauth_token(hass: HomeAssistant) -> None:
+async def test_reauth_token(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_flick_client: AsyncMock,
+) -> None:
     """Test reauth flow when username/password is wrong."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={**CONF},
-        title="123 Fake St",
-        unique_id="1234",
-        version=2,
+    await setup_integration(hass, mock_config_entry)
+
+    with patch(
+        "homeassistant.components.flick_electric.config_flow.SimpleFlickAuth.async_get_access_token",
+        side_effect=AuthException,
+    ):
+        result = await mock_config_entry.start_reauth_flow(hass)
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {"base": "invalid_auth"}
+    assert result["step_id"] == "user"
+
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_USERNAME: CONF[CONF_USERNAME], CONF_PASSWORD: CONF[CONF_PASSWORD]},
     )
-    entry.add_to_hass(hass)
 
-    with (
-        patch(
-            "homeassistant.components.flick_electric.config_flow.SimpleFlickAuth.async_get_access_token",
-            side_effect=AuthException,
-        ),
-    ):
-        result = await entry.start_reauth_flow(hass)
-
-        assert result["type"] is FlowResultType.FORM
-        assert result["errors"] == {"base": "invalid_auth"}
-        assert result["step_id"] == "user"
-
-    with (
-        patch(
-            "homeassistant.components.flick_electric.config_flow.SimpleFlickAuth.async_get_access_token",
-            return_value="123456789abcdef",
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getCustomerAccounts",
-            return_value=[
-                {
-                    "id": "1234",
-                    "status": "active",
-                    "address": "123 Fake St",
-                    "main_consumer": {"supply_node_ref": "123"},
-                },
-            ],
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getPricing",
-            return_value=_mock_flick_price(),
-        ),
-        patch(
-            "homeassistant.config_entries.ConfigEntries.async_update_entry",
-            return_value=True,
-        ) as mock_update_entry,
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                CONF_USERNAME: "test-username",
-                CONF_PASSWORD: "test-password",
-            },
-        )
-
-        assert result2["type"] is FlowResultType.ABORT
-        assert result2["reason"] == "reauth_successful"
-        assert len(mock_update_entry.mock_calls) > 0
+    assert result2["type"] is FlowResultType.ABORT
+    assert result2["reason"] == "reauth_successful"
 
 
-async def test_form_reauth_migrate(hass: HomeAssistant) -> None:
+async def test_form_reauth_migrate(
+    hass: HomeAssistant,
+    mock_old_config_entry: MockConfigEntry,
+    mock_flick_client: AsyncMock,
+) -> None:
     """Test reauth flow for v1 with single account."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={
-            CONF_USERNAME: "test-username",
-            CONF_PASSWORD: "test-password",
-        },
-        title="123 Fake St",
-        unique_id="test-username",
-        version=1,
-    )
-    entry.add_to_hass(hass)
+    mock_old_config_entry.add_to_hass(hass)
+    result = await mock_old_config_entry.start_reauth_flow(hass)
 
-    with (
-        patch(
-            "homeassistant.components.flick_electric.config_flow.SimpleFlickAuth.async_get_access_token",
-            return_value="123456789abcdef",
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getCustomerAccounts",
-            return_value=[
-                {
-                    "id": "1234",
-                    "status": "active",
-                    "address": "123 Fake St",
-                    "main_consumer": {"supply_node_ref": "123"},
-                },
-            ],
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getPricing",
-            return_value=_mock_flick_price(),
-        ),
-    ):
-        result = await entry.start_reauth_flow(hass)
-
-        assert result["type"] is FlowResultType.ABORT
-        assert result["reason"] == "reauth_successful"
-        assert entry.version == 2
-        assert entry.unique_id == "1234"
-        assert entry.data == CONF
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reauth_successful"
+    assert mock_old_config_entry.version == 2
+    assert mock_old_config_entry.unique_id == CONF[CONF_ACCOUNT_ID]
+    assert mock_old_config_entry.data == CONF
 
 
-async def test_form_reauth_migrate_multi_account(hass: HomeAssistant) -> None:
+async def test_form_reauth_migrate_multi_account(
+    hass: HomeAssistant,
+    mock_old_config_entry: MockConfigEntry,
+    mock_flick_client_multiple: AsyncMock,
+) -> None:
     """Test the form when multiple accounts are available."""
+    mock_old_config_entry.add_to_hass(hass)
+    result = await mock_old_config_entry.start_reauth_flow(hass)
 
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={
-            CONF_USERNAME: "test-username",
-            CONF_PASSWORD: "test-password",
-        },
-        title="123 Fake St",
-        unique_id="test-username",
-        version=1,
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "select_account"
+
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_ACCOUNT_ID: CONF[CONF_ACCOUNT_ID]},
     )
-    entry.add_to_hass(hass)
 
-    with (
-        patch(
-            "homeassistant.components.flick_electric.config_flow.SimpleFlickAuth.async_get_access_token",
-            return_value="123456789abcdef",
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getCustomerAccounts",
-            return_value=[
-                {
-                    "id": "1234",
-                    "status": "active",
-                    "address": "123 Fake St",
-                    "main_consumer": {"supply_node_ref": "123"},
-                },
-                {
-                    "id": "5678",
-                    "status": "active",
-                    "address": "456 Fake St",
-                    "main_consumer": {"supply_node_ref": "456"},
-                },
-            ],
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getPricing",
-            return_value=_mock_flick_price(),
-        ),
-    ):
-        result = await entry.start_reauth_flow(hass)
+    await hass.async_block_till_done()
 
-        assert result["type"] is FlowResultType.FORM
-        assert result["step_id"] == "select_account"
+    assert result2["type"] is FlowResultType.ABORT
+    assert result2["reason"] == "reauth_successful"
 
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {"account_id": "5678"},
-        )
-
-        await hass.async_block_till_done()
-
-        assert result2["type"] is FlowResultType.ABORT
-        assert result2["reason"] == "reauth_successful"
-
-        assert entry.version == 2
-        assert entry.unique_id == "5678"
-        assert entry.data == {
-            **CONF,
-            CONF_ACCOUNT_ID: "5678",
-            CONF_SUPPLY_NODE_REF: "456",
-        }
+    assert mock_old_config_entry.version == 2
+    assert mock_old_config_entry.unique_id == CONF[CONF_ACCOUNT_ID]
+    assert mock_old_config_entry.data == CONF
 
 
-async def test_form_duplicate_account(hass: HomeAssistant) -> None:
+async def test_form_duplicate_account(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_flick_client: AsyncMock,
+) -> None:
     """Test uniqueness for account_id."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={**CONF, CONF_ACCOUNT_ID: "1234", CONF_SUPPLY_NODE_REF: "123"},
-        title="123 Fake St",
-        unique_id="1234",
-        version=2,
-    )
-    entry.add_to_hass(hass)
+    await setup_integration(hass, mock_config_entry)
 
-    with (
-        patch(
-            "homeassistant.components.flick_electric.config_flow.SimpleFlickAuth.async_get_access_token",
-            return_value="123456789abcdef",
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getCustomerAccounts",
-            return_value=[
-                {
-                    "id": "1234",
-                    "status": "active",
-                    "address": "123 Fake St",
-                    "main_consumer": {"supply_node_ref": "123"},
-                }
-            ],
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getPricing",
-            return_value=_mock_flick_price(),
-        ),
-    ):
-        result = await _flow_submit(hass)
+    result = await _flow_submit(hass)
 
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "already_configured"
@@ -398,7 +222,9 @@ async def test_form_generic_exception(hass: HomeAssistant) -> None:
     assert result["errors"] == {"base": "unknown"}
 
 
-async def test_form_select_account_cannot_connect(hass: HomeAssistant) -> None:
+async def test_form_select_account_cannot_connect(
+    hass: HomeAssistant, mock_flick_client_multiple: AsyncMock
+) -> None:
     """Test we handle connection errors for select account."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
@@ -406,38 +232,16 @@ async def test_form_select_account_cannot_connect(hass: HomeAssistant) -> None:
     assert result["type"] is FlowResultType.FORM
     assert result["errors"] == {}
 
-    with (
-        patch(
-            "homeassistant.components.flick_electric.config_flow.SimpleFlickAuth.async_get_access_token",
-            return_value="123456789abcdef",
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getCustomerAccounts",
-            return_value=[
-                {
-                    "id": "1234",
-                    "status": "active",
-                    "address": "123 Fake St",
-                    "main_consumer": {"supply_node_ref": "123"},
-                },
-                {
-                    "id": "5678",
-                    "status": "active",
-                    "address": "456 Fake St",
-                    "main_consumer": {"supply_node_ref": "456"},
-                },
-            ],
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getPricing",
-            side_effect=APIException,
-        ),
+    with patch.object(
+        mock_flick_client_multiple,
+        "getPricing",
+        side_effect=APIException,
     ):
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             {
-                CONF_USERNAME: "test-username",
-                CONF_PASSWORD: "test-password",
+                CONF_USERNAME: CONF[CONF_USERNAME],
+                CONF_PASSWORD: CONF[CONF_PASSWORD],
             },
         )
         await hass.async_block_till_done()
@@ -447,7 +251,7 @@ async def test_form_select_account_cannot_connect(hass: HomeAssistant) -> None:
 
         result3 = await hass.config_entries.flow.async_configure(
             result2["flow_id"],
-            {"account_id": "5678"},
+            {CONF_ACCOUNT_ID: CONF[CONF_ACCOUNT_ID]},
         )
 
         assert result3["type"] is FlowResultType.FORM
@@ -455,7 +259,9 @@ async def test_form_select_account_cannot_connect(hass: HomeAssistant) -> None:
         assert result3["errors"] == {"base": "cannot_connect"}
 
 
-async def test_form_select_account_invalid_auth(hass: HomeAssistant) -> None:
+async def test_form_select_account_invalid_auth(
+    hass: HomeAssistant, mock_flick_client_multiple: AsyncMock
+) -> None:
     """Test we handle auth errors for select account."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
@@ -463,65 +269,41 @@ async def test_form_select_account_invalid_auth(hass: HomeAssistant) -> None:
     assert result["type"] is FlowResultType.FORM
     assert result["errors"] == {}
 
-    with (
-        patch(
-            "homeassistant.components.flick_electric.config_flow.SimpleFlickAuth.async_get_access_token",
-            return_value="123456789abcdef",
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getCustomerAccounts",
-            return_value=[
-                {
-                    "id": "1234",
-                    "status": "active",
-                    "address": "123 Fake St",
-                    "main_consumer": {"supply_node_ref": "123"},
-                },
-                {
-                    "id": "5678",
-                    "status": "active",
-                    "address": "456 Fake St",
-                    "main_consumer": {"supply_node_ref": "456"},
-                },
-            ],
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getPricing",
-            side_effect=AuthException,
-        ),
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                CONF_USERNAME: "test-username",
-                CONF_PASSWORD: "test-password",
-            },
-        )
-        await hass.async_block_till_done()
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_USERNAME: CONF[CONF_USERNAME],
+            CONF_PASSWORD: CONF[CONF_PASSWORD],
+        },
+    )
+    await hass.async_block_till_done()
 
-        assert result2["type"] is FlowResultType.FORM
-        assert result2["step_id"] == "select_account"
+    assert result2["type"] is FlowResultType.FORM
+    assert result2["step_id"] == "select_account"
 
     with (
         patch(
             "homeassistant.components.flick_electric.config_flow.SimpleFlickAuth.async_get_access_token",
             side_effect=AuthException,
         ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getCustomerAccounts",
+        patch.object(
+            mock_flick_client_multiple,
+            "getPricing",
             side_effect=AuthException,
         ),
     ):
         result3 = await hass.config_entries.flow.async_configure(
             result2["flow_id"],
-            {"account_id": "5678"},
+            {CONF_ACCOUNT_ID: CONF[CONF_ACCOUNT_ID]},
         )
 
         assert result3["type"] is FlowResultType.ABORT
         assert result3["reason"] == "no_permissions"
 
 
-async def test_form_select_account_failed_to_connect(hass: HomeAssistant) -> None:
+async def test_form_select_account_failed_to_connect(
+    hass: HomeAssistant, mock_flick_client_multiple: AsyncMock
+) -> None:
     """Test we handle connection errors for select account."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
@@ -529,115 +311,56 @@ async def test_form_select_account_failed_to_connect(hass: HomeAssistant) -> Non
     assert result["type"] is FlowResultType.FORM
     assert result["errors"] == {}
 
-    with (
-        patch(
-            "homeassistant.components.flick_electric.config_flow.SimpleFlickAuth.async_get_access_token",
-            return_value="123456789abcdef",
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getCustomerAccounts",
-            return_value=[
-                {
-                    "id": "1234",
-                    "status": "active",
-                    "address": "123 Fake St",
-                    "main_consumer": {"supply_node_ref": "123"},
-                },
-                {
-                    "id": "5678",
-                    "status": "active",
-                    "address": "456 Fake St",
-                    "main_consumer": {"supply_node_ref": "456"},
-                },
-            ],
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getPricing",
-            side_effect=AuthException,
-        ),
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                CONF_USERNAME: "test-username",
-                CONF_PASSWORD: "test-password",
-            },
-        )
-        await hass.async_block_till_done()
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_USERNAME: CONF[CONF_USERNAME],
+            CONF_PASSWORD: CONF[CONF_PASSWORD],
+        },
+    )
+    await hass.async_block_till_done()
 
-        assert result2["type"] is FlowResultType.FORM
-        assert result2["step_id"] == "select_account"
+    assert result2["type"] is FlowResultType.FORM
+    assert result2["step_id"] == "select_account"
 
     with (
-        patch(
-            "homeassistant.components.flick_electric.config_flow.SimpleFlickAuth.async_get_access_token",
-            return_value="123456789abcdef",
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getCustomerAccounts",
+        patch.object(
+            mock_flick_client_multiple,
+            "getCustomerAccounts",
             side_effect=APIException,
         ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getPricing",
+        patch.object(
+            mock_flick_client_multiple,
+            "getPricing",
             side_effect=APIException,
         ),
     ):
         result3 = await hass.config_entries.flow.async_configure(
             result2["flow_id"],
-            {"account_id": "5678"},
+            {CONF_ACCOUNT_ID: CONF[CONF_ACCOUNT_ID]},
         )
 
         assert result3["type"] is FlowResultType.FORM
         assert result3["errors"] == {"base": "cannot_connect"}
 
-    with (
-        patch(
-            "homeassistant.components.flick_electric.config_flow.SimpleFlickAuth.async_get_access_token",
-            return_value="123456789abcdef",
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getCustomerAccounts",
-            return_value=[
-                {
-                    "id": "1234",
-                    "status": "active",
-                    "address": "123 Fake St",
-                    "main_consumer": {"supply_node_ref": "123"},
-                },
-                {
-                    "id": "5678",
-                    "status": "active",
-                    "address": "456 Fake St",
-                    "main_consumer": {"supply_node_ref": "456"},
-                },
-            ],
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getPricing",
-            return_value=_mock_flick_price(),
-        ),
-        patch(
-            "homeassistant.components.flick_electric.async_setup_entry",
-            return_value=True,
-        ) as mock_setup_entry,
-    ):
-        result4 = await hass.config_entries.flow.async_configure(
-            result3["flow_id"],
-            {"account_id": "5678"},
-        )
+    result4 = await hass.config_entries.flow.async_configure(
+        result3["flow_id"],
+        {CONF_ACCOUNT_ID: ACCOUNT_ID_2},
+    )
 
-        assert result4["type"] is FlowResultType.CREATE_ENTRY
-        assert result4["title"] == "456 Fake St"
-        assert result4["data"] == {
-            **CONF,
-            CONF_SUPPLY_NODE_REF: "456",
-            CONF_ACCOUNT_ID: "5678",
-        }
-        assert result4["result"].unique_id == "5678"
-        assert len(mock_setup_entry.mock_calls) == 1
+    assert result4["type"] is FlowResultType.CREATE_ENTRY
+    assert result4["title"] == ACCOUNT_NAME_2
+    assert result4["data"] == {
+        **CONF,
+        CONF_SUPPLY_NODE_REF: SUPPLY_NODE_REF_2,
+        CONF_ACCOUNT_ID: ACCOUNT_ID_2,
+    }
+    assert result4["result"].unique_id == ACCOUNT_ID_2
 
 
-async def test_form_select_account_no_accounts(hass: HomeAssistant) -> None:
+async def test_form_select_account_no_accounts(
+    hass: HomeAssistant, mock_flick_client: AsyncMock
+) -> None:
     """Test we handle connection errors for select account."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
@@ -645,28 +368,23 @@ async def test_form_select_account_no_accounts(hass: HomeAssistant) -> None:
     assert result["type"] is FlowResultType.FORM
     assert result["errors"] == {}
 
-    with (
-        patch(
-            "homeassistant.components.flick_electric.config_flow.SimpleFlickAuth.async_get_access_token",
-            return_value="123456789abcdef",
-        ),
-        patch(
-            "homeassistant.components.flick_electric.config_flow.FlickAPI.getCustomerAccounts",
-            return_value=[
-                {
-                    "id": "1234",
-                    "status": "closed",
-                    "address": "123 Fake St",
-                    "main_consumer": {"supply_node_ref": "123"},
-                },
-            ],
-        ),
+    with patch.object(
+        mock_flick_client,
+        "getCustomerAccounts",
+        return_value=[
+            {
+                "id": "1234",
+                "status": "closed",
+                "address": "123 Fake St",
+                "main_consumer": {"supply_node_ref": "123"},
+            },
+        ],
     ):
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             {
-                CONF_USERNAME: "test-username",
-                CONF_PASSWORD: "test-password",
+                CONF_USERNAME: CONF[CONF_USERNAME],
+                CONF_PASSWORD: CONF[CONF_PASSWORD],
             },
         )
         await hass.async_block_till_done()
diff --git a/tests/components/flick_electric/test_init.py b/tests/components/flick_electric/test_init.py
index e022b6e03bc..d420a78ccfc 100644
--- a/tests/components/flick_electric/test_init.py
+++ b/tests/components/flick_electric/test_init.py
@@ -1,135 +1,154 @@
 """Test the Flick Electric config flow."""
 
-from unittest.mock import patch
+from unittest.mock import AsyncMock, patch
 
-from pyflick.authentication import AuthException
+import jwt
+from pyflick.types import APIException, AuthException
+import pytest
 
-from homeassistant.components.flick_electric.const import CONF_ACCOUNT_ID, DOMAIN
+from homeassistant.components.flick_electric import CONF_ID_TOKEN, HassFlickAuth
+from homeassistant.components.flick_electric.const import (
+    CONF_ACCOUNT_ID,
+    CONF_TOKEN_EXPIRY,
+)
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import CONF_ACCESS_TOKEN
 from homeassistant.core import HomeAssistant
+from homeassistant.util import dt as dt_util
 
-from . import CONF, _mock_flick_price
+from . import CONF, setup_integration
 
 from tests.common import MockConfigEntry
 
-
-async def test_init_auth_failure_triggers_auth(hass: HomeAssistant) -> None:
-    """Test reauth flow is triggered when username/password is wrong."""
-    with (
-        patch(
-            "homeassistant.components.flick_electric.HassFlickAuth.async_get_access_token",
-            side_effect=AuthException,
-        ),
-    ):
-        entry = MockConfigEntry(
-            domain=DOMAIN,
-            data={**CONF},
-            title="123 Fake St",
-            unique_id="1234",
-            version=2,
-        )
-        entry.add_to_hass(hass)
-
-        # Ensure setup fails
-        assert not await hass.config_entries.async_setup(entry.entry_id)
-        assert entry.state is ConfigEntryState.SETUP_ERROR
-
-        # Ensure reauth flow is triggered
-        await hass.async_block_till_done()
-        assert len(hass.config_entries.flow.async_progress()) == 1
+NEW_TOKEN = jwt.encode(
+    {"exp": dt_util.now().timestamp() + 86400}, "secret", algorithm="HS256"
+)
+EXISTING_TOKEN = jwt.encode(
+    {"exp": dt_util.now().timestamp() + 3600}, "secret", algorithm="HS256"
+)
+EXPIRED_TOKEN = jwt.encode(
+    {"exp": dt_util.now().timestamp() - 3600}, "secret", algorithm="HS256"
+)
 
 
-async def test_init_migration_single_account(hass: HomeAssistant) -> None:
+@pytest.mark.parametrize(
+    ("exception", "config_entry_state"),
+    [
+        (AuthException, ConfigEntryState.SETUP_ERROR),
+        (APIException, ConfigEntryState.SETUP_RETRY),
+    ],
+)
+async def test_init_auth_failure_triggers_auth(
+    hass: HomeAssistant,
+    mock_flick_client: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    exception: Exception,
+    config_entry_state: ConfigEntryState,
+) -> None:
+    """Test integration handles initialisation errors."""
+    with patch.object(mock_flick_client, "getPricing", side_effect=exception):
+        await setup_integration(hass, mock_config_entry)
+
+    assert mock_config_entry.state == config_entry_state
+
+
+async def test_init_migration_single_account(
+    hass: HomeAssistant,
+    mock_old_config_entry: MockConfigEntry,
+    mock_flick_client: AsyncMock,
+) -> None:
     """Test migration with single account."""
-    with (
-        patch(
-            "homeassistant.components.flick_electric.HassFlickAuth.async_get_access_token",
-            return_value="123456789abcdef",
-        ),
-        patch(
-            "homeassistant.components.flick_electric.FlickAPI.getCustomerAccounts",
-            return_value=[
-                {
-                    "id": "1234",
-                    "status": "active",
-                    "address": "123 Fake St",
-                    "main_consumer": {"supply_node_ref": "123"},
-                }
-            ],
-        ),
-        patch(
-            "homeassistant.components.flick_electric.FlickAPI.getPricing",
-            return_value=_mock_flick_price(),
-        ),
-    ):
-        entry = MockConfigEntry(
-            domain=DOMAIN,
-            data={
-                CONF_USERNAME: CONF[CONF_USERNAME],
-                CONF_PASSWORD: CONF[CONF_PASSWORD],
-            },
-            title=CONF_USERNAME,
-            unique_id=CONF_USERNAME,
-            version=1,
-        )
-        entry.add_to_hass(hass)
+    await setup_integration(hass, mock_old_config_entry)
 
-        assert await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-        assert len(hass.config_entries.flow.async_progress()) == 0
-        assert entry.state is ConfigEntryState.LOADED
-        assert entry.version == 2
-        assert entry.unique_id == CONF[CONF_ACCOUNT_ID]
-        assert entry.data == CONF
+    assert len(hass.config_entries.flow.async_progress()) == 0
+    assert mock_old_config_entry.state is ConfigEntryState.LOADED
+    assert mock_old_config_entry.version == 2
+    assert mock_old_config_entry.unique_id == CONF[CONF_ACCOUNT_ID]
+    assert mock_old_config_entry.data == CONF
 
 
-async def test_init_migration_multi_account_reauth(hass: HomeAssistant) -> None:
+async def test_init_migration_multi_account_reauth(
+    hass: HomeAssistant,
+    mock_old_config_entry: MockConfigEntry,
+    mock_flick_client_multiple: AsyncMock,
+) -> None:
     """Test migration triggers reauth with multiple accounts."""
-    with (
-        patch(
-            "homeassistant.components.flick_electric.HassFlickAuth.async_get_access_token",
-            return_value="123456789abcdef",
-        ),
-        patch(
-            "homeassistant.components.flick_electric.FlickAPI.getCustomerAccounts",
-            return_value=[
-                {
-                    "id": "1234",
-                    "status": "active",
-                    "address": "123 Fake St",
-                    "main_consumer": {"supply_node_ref": "123"},
-                },
-                {
-                    "id": "5678",
-                    "status": "active",
-                    "address": "456 Fake St",
-                    "main_consumer": {"supply_node_ref": "456"},
-                },
-            ],
-        ),
-        patch(
-            "homeassistant.components.flick_electric.FlickAPI.getPricing",
-            return_value=_mock_flick_price(),
-        ),
-    ):
-        entry = MockConfigEntry(
-            domain=DOMAIN,
-            data={
-                CONF_USERNAME: CONF[CONF_USERNAME],
-                CONF_PASSWORD: CONF[CONF_PASSWORD],
-            },
-            title=CONF_USERNAME,
-            unique_id=CONF_USERNAME,
-            version=1,
-        )
-        entry.add_to_hass(hass)
+    await setup_integration(hass, mock_old_config_entry)
 
-        # ensure setup fails
-        assert not await hass.config_entries.async_setup(entry.entry_id)
-        assert entry.state is ConfigEntryState.MIGRATION_ERROR
-        await hass.async_block_till_done()
+    assert mock_old_config_entry.state is ConfigEntryState.MIGRATION_ERROR
 
-        # Ensure reauth flow is triggered
-        await hass.async_block_till_done()
-        assert len(hass.config_entries.flow.async_progress()) == 1
+    # Ensure reauth flow is triggered
+    await hass.async_block_till_done()
+    assert len(hass.config_entries.flow.async_progress()) == 1
+
+
+async def test_fetch_fresh_token(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_flick_client: AsyncMock,
+) -> None:
+    """Test fetching a fresh token."""
+    await setup_integration(hass, mock_config_entry)
+
+    with patch(
+        "homeassistant.components.flick_electric.config_flow.SimpleFlickAuth.get_new_token",
+        return_value={CONF_ID_TOKEN: NEW_TOKEN},
+    ) as mock_get_new_token:
+        auth = HassFlickAuth(hass, mock_config_entry)
+
+        assert await auth.async_get_access_token() == NEW_TOKEN
+        assert mock_get_new_token.call_count == 1
+
+
+async def test_reuse_token(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_flick_client: AsyncMock,
+) -> None:
+    """Test reusing entry token."""
+    await setup_integration(hass, mock_config_entry)
+
+    hass.config_entries.async_update_entry(
+        mock_config_entry,
+        data={
+            **mock_config_entry.data,
+            CONF_ACCESS_TOKEN: {CONF_ID_TOKEN: EXISTING_TOKEN},
+            CONF_TOKEN_EXPIRY: dt_util.now().timestamp() + 3600,
+        },
+    )
+
+    with patch(
+        "homeassistant.components.flick_electric.config_flow.SimpleFlickAuth.get_new_token",
+        return_value={CONF_ID_TOKEN: NEW_TOKEN},
+    ) as mock_get_new_token:
+        auth = HassFlickAuth(hass, mock_config_entry)
+
+        assert await auth.async_get_access_token() == EXISTING_TOKEN
+        assert mock_get_new_token.call_count == 0
+
+
+async def test_fetch_expired_token(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_flick_client: AsyncMock,
+) -> None:
+    """Test fetching token when existing token is expired."""
+    await setup_integration(hass, mock_config_entry)
+
+    hass.config_entries.async_update_entry(
+        mock_config_entry,
+        data={
+            **mock_config_entry.data,
+            CONF_ACCESS_TOKEN: {CONF_ID_TOKEN: EXPIRED_TOKEN},
+            CONF_TOKEN_EXPIRY: dt_util.now().timestamp() - 3600,
+        },
+    )
+
+    with patch(
+        "homeassistant.components.flick_electric.config_flow.SimpleFlickAuth.get_new_token",
+        return_value={CONF_ID_TOKEN: NEW_TOKEN},
+    ) as mock_get_new_token:
+        auth = HassFlickAuth(hass, mock_config_entry)
+
+        assert await auth.async_get_access_token() == NEW_TOKEN
+        assert mock_get_new_token.call_count == 1
diff --git a/tests/components/flo/snapshots/test_init.ambr b/tests/components/flo/snapshots/test_init.ambr
new file mode 100644
index 00000000000..edba0ebe162
--- /dev/null
+++ b/tests/components/flo/snapshots/test_init.ambr
@@ -0,0 +1,75 @@
+# serializer version: 1
+# name: test_setup_entry
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+        tuple(
+          'mac',
+          '11:11:11:11:11:11',
+        ),
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'flo',
+          '98765',
+        ),
+      }),
+      'is_new': False,
+      'labels': set({
+      }),
+      'manufacturer': 'Flo by Moen',
+      'model': 'flo_device_075_v2',
+      'model_id': None,
+      'name': 'Smart water shutoff',
+      'name_by_user': None,
+      'primary_config_entry': <ANY>,
+      'serial_number': '111111111111',
+      'suggested_area': None,
+      'sw_version': '6.1.1',
+      'via_device_id': None,
+    }),
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+        tuple(
+          'mac',
+          '1a:2b:3c:4d:5e:6f',
+        ),
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'flo',
+          '32839',
+        ),
+      }),
+      'is_new': False,
+      'labels': set({
+      }),
+      'manufacturer': 'Flo by Moen',
+      'model': 'puck_v1',
+      'model_id': None,
+      'name': 'Kitchen sink',
+      'name_by_user': None,
+      'primary_config_entry': <ANY>,
+      'serial_number': '111111111112',
+      'suggested_area': None,
+      'sw_version': '1.1.15',
+      'via_device_id': None,
+    }),
+  ])
+# ---
diff --git a/tests/components/flo/test_binary_sensor.py b/tests/components/flo/test_binary_sensor.py
index 23a84734b0d..9c174abb0d6 100644
--- a/tests/components/flo/test_binary_sensor.py
+++ b/tests/components/flo/test_binary_sensor.py
@@ -2,18 +2,8 @@
 
 import pytest
 
-from homeassistant.components.flo.const import DOMAIN as FLO_DOMAIN
-from homeassistant.const import (
-    ATTR_FRIENDLY_NAME,
-    CONF_PASSWORD,
-    CONF_USERNAME,
-    STATE_OFF,
-    STATE_ON,
-)
+from homeassistant.const import ATTR_FRIENDLY_NAME, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
-from homeassistant.setup import async_setup_component
-
-from .common import TEST_PASSWORD, TEST_USER_ID
 
 from tests.common import MockConfigEntry
 
@@ -24,13 +14,9 @@ async def test_binary_sensors(
 ) -> None:
     """Test Flo by Moen sensors."""
     config_entry.add_to_hass(hass)
-    assert await async_setup_component(
-        hass, FLO_DOMAIN, {CONF_USERNAME: TEST_USER_ID, CONF_PASSWORD: TEST_PASSWORD}
-    )
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    assert len(hass.data[FLO_DOMAIN][config_entry.entry_id]["devices"]) == 2
-
     valve_state = hass.states.get(
         "binary_sensor.smart_water_shutoff_pending_system_alerts"
     )
diff --git a/tests/components/flo/test_device.py b/tests/components/flo/test_device.py
index c3e26e77370..b89d5a1e68c 100644
--- a/tests/components/flo/test_device.py
+++ b/tests/components/flo/test_device.py
@@ -7,13 +7,8 @@ from aioflo.errors import RequestError
 from freezegun.api import FrozenDateTimeFactory
 import pytest
 
-from homeassistant.components.flo.const import DOMAIN as FLO_DOMAIN
-from homeassistant.components.flo.coordinator import FloDeviceDataUpdateCoordinator
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, STATE_UNAVAILABLE
+from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
-from homeassistant.setup import async_setup_component
-
-from .common import TEST_PASSWORD, TEST_USER_ID
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 from tests.test_util.aiohttp import AiohttpClientMocker
@@ -28,59 +23,8 @@ async def test_device(
 ) -> None:
     """Test Flo by Moen devices."""
     config_entry.add_to_hass(hass)
-    assert await async_setup_component(
-        hass, FLO_DOMAIN, {CONF_USERNAME: TEST_USER_ID, CONF_PASSWORD: TEST_PASSWORD}
-    )
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
-    assert len(hass.data[FLO_DOMAIN][config_entry.entry_id]["devices"]) == 2
-
-    valve: FloDeviceDataUpdateCoordinator = hass.data[FLO_DOMAIN][
-        config_entry.entry_id
-    ]["devices"][0]
-    assert valve.api_client is not None
-    assert valve.available
-    assert valve.consumption_today == 3.674
-    assert valve.current_flow_rate == 0
-    assert valve.current_psi == 54.20000076293945
-    assert valve.current_system_mode == "home"
-    assert valve.target_system_mode == "home"
-    assert valve.firmware_version == "6.1.1"
-    assert valve.device_type == "flo_device_v2"
-    assert valve.id == "98765"
-    assert valve.last_heard_from_time == "2020-07-24T12:45:00Z"
-    assert valve.location_id == "mmnnoopp"
-    assert valve.hass is not None
-    assert valve.temperature == 70
-    assert valve.mac_address == "111111111111"
-    assert valve.model == "flo_device_075_v2"
-    assert valve.manufacturer == "Flo by Moen"
-    assert valve.device_name == "Smart Water Shutoff"
-    assert valve.rssi == -47
-    assert valve.pending_info_alerts_count == 0
-    assert valve.pending_critical_alerts_count == 0
-    assert valve.pending_warning_alerts_count == 2
-    assert valve.has_alerts is True
-    assert valve.last_known_valve_state == "open"
-    assert valve.target_valve_state == "open"
-
-    detector: FloDeviceDataUpdateCoordinator = hass.data[FLO_DOMAIN][
-        config_entry.entry_id
-    ]["devices"][1]
-    assert detector.api_client is not None
-    assert detector.available
-    assert detector.device_type == "puck_oem"
-    assert detector.id == "32839"
-    assert detector.last_heard_from_time == "2021-03-07T14:05:00Z"
-    assert detector.location_id == "mmnnoopp"
-    assert detector.hass is not None
-    assert detector.temperature == 61
-    assert detector.humidity == 43
-    assert detector.water_detected is False
-    assert detector.mac_address == "1a2b3c4d5e6f"
-    assert detector.model == "puck_v1"
-    assert detector.manufacturer == "Flo by Moen"
-    assert detector.device_name == "Kitchen Sink"
-    assert detector.serial_number == "111111111112"
 
     call_count = aioclient_mock.call_count
 
diff --git a/tests/components/flo/test_init.py b/tests/components/flo/test_init.py
index 805a6278395..c1983b898da 100644
--- a/tests/components/flo/test_init.py
+++ b/tests/components/flo/test_init.py
@@ -1,25 +1,32 @@
 """Test init."""
 
 import pytest
+from syrupy import SnapshotAssertion
 
-from homeassistant.components.flo.const import DOMAIN as FLO_DOMAIN
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
-from homeassistant.setup import async_setup_component
-
-from .common import TEST_PASSWORD, TEST_USER_ID
+from homeassistant.helpers import device_registry as dr
 
 from tests.common import MockConfigEntry
 
 
 @pytest.mark.usefixtures("aioclient_mock_fixture")
-async def test_setup_entry(hass: HomeAssistant, config_entry: MockConfigEntry) -> None:
+async def test_setup_entry(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    device_registry: dr.DeviceRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
     """Test migration of config entry from v1."""
     config_entry.add_to_hass(hass)
-    assert await async_setup_component(
-        hass, FLO_DOMAIN, {CONF_USERNAME: TEST_USER_ID, CONF_PASSWORD: TEST_PASSWORD}
-    )
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
-    assert len(hass.data[FLO_DOMAIN][config_entry.entry_id]["devices"]) == 2
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    assert (
+        dr.async_entries_for_config_entry(device_registry, config_entry.entry_id)
+        == snapshot
+    )
 
     assert await hass.config_entries.async_unload(config_entry.entry_id)
+    assert config_entry.state is ConfigEntryState.NOT_LOADED
diff --git a/tests/components/flo/test_sensor.py b/tests/components/flo/test_sensor.py
index 0c763927296..828e4f3b4d5 100644
--- a/tests/components/flo/test_sensor.py
+++ b/tests/components/flo/test_sensor.py
@@ -2,15 +2,12 @@
 
 import pytest
 
-from homeassistant.components.flo.const import DOMAIN as FLO_DOMAIN
 from homeassistant.components.sensor import ATTR_STATE_CLASS, SensorStateClass
-from homeassistant.const import ATTR_ENTITY_ID, CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM
 
-from .common import TEST_PASSWORD, TEST_USER_ID
-
 from tests.common import MockConfigEntry
 from tests.test_util.aiohttp import AiohttpClientMocker
 
@@ -20,13 +17,9 @@ async def test_sensors(hass: HomeAssistant, config_entry: MockConfigEntry) -> No
     """Test Flo by Moen sensors."""
     hass.config.units = US_CUSTOMARY_SYSTEM
     config_entry.add_to_hass(hass)
-    assert await async_setup_component(
-        hass, FLO_DOMAIN, {CONF_USERNAME: TEST_USER_ID, CONF_PASSWORD: TEST_PASSWORD}
-    )
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    assert len(hass.data[FLO_DOMAIN][config_entry.entry_id]["devices"]) == 2
-
     # we should have 5 entities for the valve
     assert (
         hass.states.get("sensor.smart_water_shutoff_current_system_mode").state
@@ -95,13 +88,9 @@ async def test_manual_update_entity(
 ) -> None:
     """Test manual update entity via service homeasasistant/update_entity."""
     config_entry.add_to_hass(hass)
-    assert await async_setup_component(
-        hass, FLO_DOMAIN, {CONF_USERNAME: TEST_USER_ID, CONF_PASSWORD: TEST_PASSWORD}
-    )
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    assert len(hass.data[FLO_DOMAIN][config_entry.entry_id]["devices"]) == 2
-
     await async_setup_component(hass, "homeassistant", {})
 
     call_count = aioclient_mock.call_count
diff --git a/tests/components/flo/test_services.py b/tests/components/flo/test_services.py
index 565f39f69fe..980d5906a56 100644
--- a/tests/components/flo/test_services.py
+++ b/tests/components/flo/test_services.py
@@ -13,11 +13,8 @@ from homeassistant.components.flo.switch import (
     SERVICE_SET_SLEEP_MODE,
     SYSTEM_MODE_HOME,
 )
-from homeassistant.const import ATTR_ENTITY_ID, CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant
-from homeassistant.setup import async_setup_component
-
-from .common import TEST_PASSWORD, TEST_USER_ID
 
 from tests.common import MockConfigEntry
 from tests.test_util.aiohttp import AiohttpClientMocker
@@ -33,12 +30,9 @@ async def test_services(
 ) -> None:
     """Test Flo services."""
     config_entry.add_to_hass(hass)
-    assert await async_setup_component(
-        hass, FLO_DOMAIN, {CONF_USERNAME: TEST_USER_ID, CONF_PASSWORD: TEST_PASSWORD}
-    )
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    assert len(hass.data[FLO_DOMAIN][config_entry.entry_id]["devices"]) == 2
     assert aioclient_mock.call_count == 8
 
     await hass.services.async_call(
diff --git a/tests/components/flo/test_switch.py b/tests/components/flo/test_switch.py
index 5c124d312a7..86fa8dd522d 100644
--- a/tests/components/flo/test_switch.py
+++ b/tests/components/flo/test_switch.py
@@ -2,13 +2,9 @@
 
 import pytest
 
-from homeassistant.components.flo.const import DOMAIN as FLO_DOMAIN
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, STATE_OFF, STATE_ON
+from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
-from homeassistant.setup import async_setup_component
-
-from .common import TEST_PASSWORD, TEST_USER_ID
 
 from tests.common import MockConfigEntry
 
@@ -19,13 +15,9 @@ async def test_valve_switches(
 ) -> None:
     """Test Flo by Moen valve switches."""
     config_entry.add_to_hass(hass)
-    assert await async_setup_component(
-        hass, FLO_DOMAIN, {CONF_USERNAME: TEST_USER_ID, CONF_PASSWORD: TEST_PASSWORD}
-    )
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    assert len(hass.data[FLO_DOMAIN][config_entry.entry_id]["devices"]) == 2
-
     entity_id = "switch.smart_water_shutoff_shutoff_valve"
     assert hass.states.get(entity_id).state == STATE_ON
 
diff --git a/tests/components/flux/test_switch.py b/tests/components/flux/test_switch.py
index f7dc30db240..e1bd07cdfd7 100644
--- a/tests/components/flux/test_switch.py
+++ b/tests/components/flux/test_switch.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     assert_setup_component,
diff --git a/tests/components/flux_led/test_number.py b/tests/components/flux_led/test_number.py
index 2ed0d34989f..8dd8196a2db 100644
--- a/tests/components/flux_led/test_number.py
+++ b/tests/components/flux_led/test_number.py
@@ -24,7 +24,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import (
     DEFAULT_ENTRY_TITLE,
diff --git a/tests/components/folder_watcher/snapshots/test_event.ambr b/tests/components/folder_watcher/snapshots/test_event.ambr
index 04405e0694b..1101380703a 100644
--- a/tests/components/folder_watcher/snapshots/test_event.ambr
+++ b/tests/components/folder_watcher/snapshots/test_event.ambr
@@ -14,6 +14,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/forecast_solar/snapshots/test_init.ambr b/tests/components/forecast_solar/snapshots/test_init.ambr
index 6ae4c2f6198..c0db54c2d4e 100644
--- a/tests/components/forecast_solar/snapshots/test_init.ambr
+++ b/tests/components/forecast_solar/snapshots/test_init.ambr
@@ -23,6 +23,8 @@
     'pref_disable_new_entities': False,
     'pref_disable_polling': False,
     'source': 'user',
+    'subentries': list([
+    ]),
     'title': 'Green House',
     'unique_id': 'unique',
     'version': 2,
diff --git a/tests/components/forked_daapd/test_browse_media.py b/tests/components/forked_daapd/test_browse_media.py
index cbd278128ae..88b29c2bbba 100644
--- a/tests/components/forked_daapd/test_browse_media.py
+++ b/tests/components/forked_daapd/test_browse_media.py
@@ -34,7 +34,7 @@ async def test_async_browse_media(
     await hass.async_block_till_done()
 
     with patch(
-        "homeassistant.components.forked_daapd.media_player.ForkedDaapdAPI",
+        "homeassistant.components.forked_daapd.ForkedDaapdAPI",
         autospec=True,
     ) as mock_api:
         mock_api.return_value.get_request.return_value = {"websocket_port": 2}
@@ -214,7 +214,7 @@ async def test_async_browse_media_not_found(
     await hass.async_block_till_done()
 
     with patch(
-        "homeassistant.components.forked_daapd.media_player.ForkedDaapdAPI",
+        "homeassistant.components.forked_daapd.ForkedDaapdAPI",
         autospec=True,
     ) as mock_api:
         mock_api.return_value.get_request.return_value = {"websocket_port": 2}
@@ -375,7 +375,7 @@ async def test_async_browse_image(
     """Test browse media images."""
 
     with patch(
-        "homeassistant.components.forked_daapd.media_player.ForkedDaapdAPI",
+        "homeassistant.components.forked_daapd.ForkedDaapdAPI",
         autospec=True,
     ) as mock_api:
         mock_api.return_value.get_request.return_value = {"websocket_port": 2}
@@ -430,7 +430,7 @@ async def test_async_browse_image_missing(
     """Test browse media images with no image available."""
 
     with patch(
-        "homeassistant.components.forked_daapd.media_player.ForkedDaapdAPI",
+        "homeassistant.components.forked_daapd.ForkedDaapdAPI",
         autospec=True,
     ) as mock_api:
         mock_api.return_value.get_request.return_value = {"websocket_port": 2}
diff --git a/tests/components/forked_daapd/test_config_flow.py b/tests/components/forked_daapd/test_config_flow.py
index 8bf5de31da2..ba1f0e6c227 100644
--- a/tests/components/forked_daapd/test_config_flow.py
+++ b/tests/components/forked_daapd/test_config_flow.py
@@ -1,7 +1,7 @@
 """The config flow tests for the forked_daapd media player platform."""
 
 from ipaddress import ip_address
-from unittest.mock import AsyncMock, MagicMock, patch
+from unittest.mock import AsyncMock, patch
 
 import pytest
 
@@ -12,12 +12,10 @@ from homeassistant.components.forked_daapd.const import (
     CONF_TTS_VOLUME,
     DOMAIN,
 )
-from homeassistant.components.forked_daapd.media_player import async_setup_entry
-from homeassistant.config_entries import SOURCE_USER, SOURCE_ZEROCONF
+from homeassistant.config_entries import SOURCE_USER, SOURCE_ZEROCONF, ConfigEntryState
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.exceptions import PlatformNotReady
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
 from tests.common import MockConfigEntry
@@ -75,7 +73,7 @@ async def test_config_flow(hass: HomeAssistant, config_entry: MockConfigEntry) -
             new=AsyncMock(),
         ) as mock_test_connection,
         patch(
-            "homeassistant.components.forked_daapd.media_player.ForkedDaapdAPI.get_request",
+            "homeassistant.components.forked_daapd.ForkedDaapdAPI.get_request",
             autospec=True,
         ) as mock_get_request,
     ):
@@ -232,7 +230,7 @@ async def test_options_flow(hass: HomeAssistant, config_entry: MockConfigEntry)
     """Test config flow options."""
 
     with patch(
-        "homeassistant.components.forked_daapd.media_player.ForkedDaapdAPI.get_request",
+        "homeassistant.components.forked_daapd.ForkedDaapdAPI.get_request",
         autospec=True,
     ) as mock_get_request:
         mock_get_request.return_value = SAMPLE_CONFIG
@@ -256,17 +254,18 @@ async def test_options_flow(hass: HomeAssistant, config_entry: MockConfigEntry)
 
 
 async def test_async_setup_entry_not_ready(
-    hass: HomeAssistant, config_entry: MockConfigEntry
+    hass: HomeAssistant, config_entry: MockConfigEntry, caplog: pytest.LogCaptureFixture
 ) -> None:
     """Test that a PlatformNotReady exception is thrown during platform setup."""
 
     with patch(
-        "homeassistant.components.forked_daapd.media_player.ForkedDaapdAPI",
+        "homeassistant.components.forked_daapd.ForkedDaapdAPI",
         autospec=True,
     ) as mock_api:
         mock_api.return_value.get_request.return_value = None
         config_entry.add_to_hass(hass)
-        with pytest.raises(PlatformNotReady):
-            await async_setup_entry(hass, config_entry, MagicMock())
+        await hass.config_entries.async_setup(config_entry.entry_id)
         await hass.async_block_till_done()
         mock_api.return_value.get_request.assert_called_once()
+        assert "Platform forked_daapd not ready yet" in caplog.text
+        assert config_entry.state is ConfigEntryState.LOADED
diff --git a/tests/components/forked_daapd/test_media_player.py b/tests/components/forked_daapd/test_media_player.py
index 6d7d267eb63..8f0105d48d7 100644
--- a/tests/components/forked_daapd/test_media_player.py
+++ b/tests/components/forked_daapd/test_media_player.py
@@ -313,7 +313,7 @@ async def mock_api_object_fixture(
         return get_request_return_values[update_type]
 
     with patch(
-        "homeassistant.components.forked_daapd.media_player.ForkedDaapdAPI",
+        "homeassistant.components.forked_daapd.ForkedDaapdAPI",
         autospec=True,
     ) as mock_api:
         mock_api.return_value.get_request.side_effect = get_request_side_effect
@@ -808,7 +808,7 @@ async def test_invalid_websocket_port(
 ) -> None:
     """Test invalid websocket port on async_init."""
     with patch(
-        "homeassistant.components.forked_daapd.media_player.ForkedDaapdAPI",
+        "homeassistant.components.forked_daapd.ForkedDaapdAPI",
         autospec=True,
     ) as mock_api:
         mock_api.return_value.get_request.return_value = SAMPLE_CONFIG_NO_WEBSOCKET
diff --git a/tests/components/foscam/test_init.py b/tests/components/foscam/test_init.py
index 0b82ed3b02a..a7b6a8c8f0b 100644
--- a/tests/components/foscam/test_init.py
+++ b/tests/components/foscam/test_init.py
@@ -2,7 +2,7 @@
 
 from unittest.mock import patch
 
-from homeassistant.components.foscam import DOMAIN, config_flow
+from homeassistant.components.foscam.const import DOMAIN
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
@@ -18,9 +18,7 @@ async def test_unique_id_new_entry(
     entity_registry: er.EntityRegistry,
 ) -> None:
     """Test unique ID for a newly added device is correct."""
-    entry = MockConfigEntry(
-        domain=config_flow.DOMAIN, data=VALID_CONFIG, entry_id=ENTRY_ID
-    )
+    entry = MockConfigEntry(domain=DOMAIN, data=VALID_CONFIG, entry_id=ENTRY_ID)
     entry.add_to_hass(hass)
 
     with (
@@ -46,7 +44,7 @@ async def test_switch_unique_id_migration_ok(
 ) -> None:
     """Test that the unique ID for a sleep switch is migrated to the new format."""
     entry = MockConfigEntry(
-        domain=config_flow.DOMAIN, data=VALID_CONFIG, entry_id=ENTRY_ID, version=1
+        domain=DOMAIN, data=VALID_CONFIG, entry_id=ENTRY_ID, version=1
     )
     entry.add_to_hass(hass)
 
@@ -57,7 +55,7 @@ async def test_switch_unique_id_migration_ok(
 
     # Update config entry with version 2
     entry = MockConfigEntry(
-        domain=config_flow.DOMAIN, data=VALID_CONFIG, entry_id=ENTRY_ID, version=2
+        domain=DOMAIN, data=VALID_CONFIG, entry_id=ENTRY_ID, version=2
     )
     entry.add_to_hass(hass)
 
@@ -84,9 +82,7 @@ async def test_unique_id_migration_not_needed(
     entity_registry: er.EntityRegistry,
 ) -> None:
     """Test that the unique ID for a sleep switch is not executed if already in right format."""
-    entry = MockConfigEntry(
-        domain=config_flow.DOMAIN, data=VALID_CONFIG, entry_id=ENTRY_ID
-    )
+    entry = MockConfigEntry(domain=DOMAIN, data=VALID_CONFIG, entry_id=ENTRY_ID)
     entry.add_to_hass(hass)
 
     entity_registry.async_get_or_create(
diff --git a/tests/components/fritz/snapshots/test_button.ambr b/tests/components/fritz/snapshots/test_button.ambr
index ed0b0e72160..748d8c1ba29 100644
--- a/tests/components/fritz/snapshots/test_button.ambr
+++ b/tests/components/fritz/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -99,6 +101,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -146,6 +149,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -193,6 +197,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/fritz/snapshots/test_diagnostics.ambr b/tests/components/fritz/snapshots/test_diagnostics.ambr
index 53f7093a21b..9b5b8c9353a 100644
--- a/tests/components/fritz/snapshots/test_diagnostics.ambr
+++ b/tests/components/fritz/snapshots/test_diagnostics.ambr
@@ -61,6 +61,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': None,
       'version': 1,
diff --git a/tests/components/fritz/snapshots/test_sensor.ambr b/tests/components/fritz/snapshots/test_sensor.ambr
index 50744815aa5..5ff0e448b15 100644
--- a/tests/components/fritz/snapshots/test_sensor.ambr
+++ b/tests/components/fritz/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -55,6 +56,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -104,6 +106,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -198,6 +202,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -249,6 +254,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -298,6 +304,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -345,6 +352,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -392,6 +400,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -439,6 +448,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -487,6 +497,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -534,6 +545,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -581,6 +593,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -629,6 +642,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -677,6 +691,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -727,6 +742,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/fritz/snapshots/test_switch.ambr b/tests/components/fritz/snapshots/test_switch.ambr
index b34a3626fe2..a1097d3333b 100644
--- a/tests/components/fritz/snapshots/test_switch.ambr
+++ b/tests/components/fritz/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -194,6 +198,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -241,6 +246,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -288,6 +294,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -335,6 +342,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -382,6 +390,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -429,6 +438,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -482,6 +492,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -529,6 +540,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/fritz/snapshots/test_update.ambr b/tests/components/fritz/snapshots/test_update.ambr
index 3c7880d01e7..746823e9dc9 100644
--- a/tests/components/fritz/snapshots/test_update.ambr
+++ b/tests/components/fritz/snapshots/test_update.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -64,6 +65,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -122,6 +124,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/fritz/test_sensor.py b/tests/components/fritz/test_sensor.py
index 7dec640b898..1b10ddb8fc1 100644
--- a/tests/components/fritz/test_sensor.py
+++ b/tests/components/fritz/test_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.const import STATE_UNAVAILABLE, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import MOCK_USER_DATA
 
diff --git a/tests/components/fritz/test_services.py b/tests/components/fritz/test_services.py
new file mode 100644
index 00000000000..d7b85cbc448
--- /dev/null
+++ b/tests/components/fritz/test_services.py
@@ -0,0 +1,134 @@
+"""Tests for Fritz!Tools services."""
+
+from unittest.mock import patch
+
+from fritzconnection.core.exceptions import FritzConnectionException, FritzServiceError
+import pytest
+
+from homeassistant.components.fritz.const import DOMAIN
+from homeassistant.components.fritz.services import SERVICE_SET_GUEST_WIFI_PW
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr
+from homeassistant.setup import async_setup_component
+
+from .const import MOCK_USER_DATA
+
+from tests.common import MockConfigEntry
+
+
+async def test_setup_services(hass: HomeAssistant) -> None:
+    """Test setup of Fritz!Tools services."""
+    assert await async_setup_component(hass, DOMAIN, {})
+    await hass.async_block_till_done()
+
+    services = hass.services.async_services_for_domain(DOMAIN)
+    assert services
+    assert SERVICE_SET_GUEST_WIFI_PW in services
+
+
+async def test_service_set_guest_wifi_password(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    caplog: pytest.LogCaptureFixture,
+    fc_class_mock,
+    fh_class_mock,
+) -> None:
+    """Test service set_guest_wifi_password."""
+    assert await async_setup_component(hass, DOMAIN, {})
+    entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA)
+    entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(
+        identifiers={(DOMAIN, "1C:ED:6F:12:34:11")}
+    )
+    assert device
+    with patch(
+        "homeassistant.components.fritz.coordinator.AvmWrapper.async_trigger_set_guest_password"
+    ) as mock_async_trigger_set_guest_password:
+        await hass.services.async_call(
+            DOMAIN, SERVICE_SET_GUEST_WIFI_PW, {"device_id": device.id}
+        )
+        assert mock_async_trigger_set_guest_password.called
+
+
+async def test_service_set_guest_wifi_password_unknown_parameter(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    caplog: pytest.LogCaptureFixture,
+    fc_class_mock,
+    fh_class_mock,
+) -> None:
+    """Test service set_guest_wifi_password with unknown parameter."""
+    assert await async_setup_component(hass, DOMAIN, {})
+    entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA)
+    entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(
+        identifiers={(DOMAIN, "1C:ED:6F:12:34:11")}
+    )
+    assert device
+
+    with patch(
+        "homeassistant.components.fritz.coordinator.AvmWrapper.async_trigger_set_guest_password",
+        side_effect=FritzServiceError("boom"),
+    ) as mock_async_trigger_set_guest_password:
+        await hass.services.async_call(
+            DOMAIN, SERVICE_SET_GUEST_WIFI_PW, {"device_id": device.id}
+        )
+        assert mock_async_trigger_set_guest_password.called
+        assert "HomeAssistantError: Action or parameter unknown" in caplog.text
+
+
+async def test_service_set_guest_wifi_password_service_not_supported(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    caplog: pytest.LogCaptureFixture,
+    fc_class_mock,
+    fh_class_mock,
+) -> None:
+    """Test service set_guest_wifi_password with connection error."""
+    assert await async_setup_component(hass, DOMAIN, {})
+    entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA)
+    entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(
+        identifiers={(DOMAIN, "1C:ED:6F:12:34:11")}
+    )
+    assert device
+
+    with patch(
+        "homeassistant.components.fritz.coordinator.AvmWrapper.async_trigger_set_guest_password",
+        side_effect=FritzConnectionException("boom"),
+    ) as mock_async_trigger_set_guest_password:
+        await hass.services.async_call(
+            DOMAIN, SERVICE_SET_GUEST_WIFI_PW, {"device_id": device.id}
+        )
+        assert mock_async_trigger_set_guest_password.called
+        assert "HomeAssistantError: Action not supported" in caplog.text
+
+
+async def test_service_set_guest_wifi_password_unloaded(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test service set_guest_wifi_password."""
+    assert await async_setup_component(hass, DOMAIN, {})
+    await hass.async_block_till_done()
+
+    with patch(
+        "homeassistant.components.fritz.coordinator.AvmWrapper.async_trigger_set_guest_password"
+    ) as mock_async_trigger_set_guest_password:
+        await hass.services.async_call(
+            DOMAIN, SERVICE_SET_GUEST_WIFI_PW, {"device_id": "12345678"}
+        )
+        assert not mock_async_trigger_set_guest_password.called
+        assert (
+            'ServiceValidationError: Failed to perform action "set_guest_wifi_password". Config entry for target not found'
+            in caplog.text
+        )
diff --git a/tests/components/fritzbox/test_binary_sensor.py b/tests/components/fritzbox/test_binary_sensor.py
index f4cc1b2e2ca..594ed14a7d1 100644
--- a/tests/components/fritzbox/test_binary_sensor.py
+++ b/tests/components/fritzbox/test_binary_sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import FritzDeviceBinarySensorMock, set_devices, setup_config_entry
 from .const import CONF_FAKE_NAME, MOCK_CONFIG
diff --git a/tests/components/fritzbox/test_button.py b/tests/components/fritzbox/test_button.py
index 913f828efbc..0053a8d3446 100644
--- a/tests/components/fritzbox/test_button.py
+++ b/tests/components/fritzbox/test_button.py
@@ -12,7 +12,7 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import FritzEntityBaseMock, set_devices, setup_config_entry
 from .const import CONF_FAKE_NAME, MOCK_CONFIG
diff --git a/tests/components/fritzbox/test_climate.py b/tests/components/fritzbox/test_climate.py
index 29f5742216f..0784d7b6188 100644
--- a/tests/components/fritzbox/test_climate.py
+++ b/tests/components/fritzbox/test_climate.py
@@ -23,7 +23,12 @@ from homeassistant.components.climate import (
     SERVICE_SET_TEMPERATURE,
     HVACMode,
 )
-from homeassistant.components.fritzbox.climate import PRESET_HOLIDAY, PRESET_SUMMER
+from homeassistant.components.fritzbox.climate import (
+    OFF_API_TEMPERATURE,
+    ON_API_TEMPERATURE,
+    PRESET_HOLIDAY,
+    PRESET_SUMMER,
+)
 from homeassistant.components.fritzbox.const import (
     ATTR_STATE_BATTERY_LOW,
     ATTR_STATE_HOLIDAY_MODE,
@@ -44,7 +49,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import (
     FritzDeviceClimateMock,
@@ -273,20 +278,20 @@ async def test_update_error(hass: HomeAssistant, fritz: Mock) -> None:
 @pytest.mark.parametrize(
     ("service_data", "expected_call_args"),
     [
-        ({ATTR_TEMPERATURE: 23}, [call(23)]),
+        ({ATTR_TEMPERATURE: 23}, [call(23, True)]),
         (
             {
                 ATTR_HVAC_MODE: HVACMode.OFF,
                 ATTR_TEMPERATURE: 23,
             },
-            [call(0)],
+            [call(0, True)],
         ),
         (
             {
                 ATTR_HVAC_MODE: HVACMode.HEAT,
                 ATTR_TEMPERATURE: 23,
             },
-            [call(23)],
+            [call(23, True)],
         ),
     ],
 )
@@ -316,14 +321,14 @@ async def test_set_temperature(
     ("service_data", "target_temperature", "current_preset", "expected_call_args"),
     [
         # mode off always sets target temperature to 0
-        ({ATTR_HVAC_MODE: HVACMode.OFF}, 22, PRESET_COMFORT, [call(0)]),
-        ({ATTR_HVAC_MODE: HVACMode.OFF}, 16, PRESET_ECO, [call(0)]),
-        ({ATTR_HVAC_MODE: HVACMode.OFF}, 16, None, [call(0)]),
+        ({ATTR_HVAC_MODE: HVACMode.OFF}, 22, PRESET_COMFORT, [call(0, True)]),
+        ({ATTR_HVAC_MODE: HVACMode.OFF}, 16, PRESET_ECO, [call(0, True)]),
+        ({ATTR_HVAC_MODE: HVACMode.OFF}, 16, None, [call(0, True)]),
         # mode heat sets target temperature based on current scheduled preset,
         # when not already in mode heat
-        ({ATTR_HVAC_MODE: HVACMode.HEAT}, 0.0, PRESET_COMFORT, [call(22)]),
-        ({ATTR_HVAC_MODE: HVACMode.HEAT}, 0.0, PRESET_ECO, [call(16)]),
-        ({ATTR_HVAC_MODE: HVACMode.HEAT}, 0.0, None, [call(22)]),
+        ({ATTR_HVAC_MODE: HVACMode.HEAT}, 0.0, PRESET_COMFORT, [call(22, True)]),
+        ({ATTR_HVAC_MODE: HVACMode.HEAT}, 0.0, PRESET_ECO, [call(16, True)]),
+        ({ATTR_HVAC_MODE: HVACMode.HEAT}, 0.0, None, [call(22, True)]),
         # mode heat does not set target temperature, when already in mode heat
         ({ATTR_HVAC_MODE: HVACMode.HEAT}, 16, PRESET_COMFORT, []),
         ({ATTR_HVAC_MODE: HVACMode.HEAT}, 16, PRESET_ECO, []),
@@ -367,9 +372,23 @@ async def test_set_hvac_mode(
     assert device.set_target_temperature.call_args_list == expected_call_args
 
 
-async def test_set_preset_mode_comfort(hass: HomeAssistant, fritz: Mock) -> None:
+@pytest.mark.parametrize(
+    ("comfort_temperature", "expected_call_args"),
+    [
+        (20, [call(20, True)]),
+        (28, [call(28, True)]),
+        (ON_API_TEMPERATURE, [call(30, True)]),
+    ],
+)
+async def test_set_preset_mode_comfort(
+    hass: HomeAssistant,
+    fritz: Mock,
+    comfort_temperature: int,
+    expected_call_args: list[_Call],
+) -> None:
     """Test setting preset mode."""
     device = FritzDeviceClimateMock()
+    device.comfort_temperature = comfort_temperature
     assert await setup_config_entry(
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
@@ -380,12 +399,27 @@ async def test_set_preset_mode_comfort(hass: HomeAssistant, fritz: Mock) -> None
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_PRESET_MODE: PRESET_COMFORT},
         True,
     )
-    assert device.set_target_temperature.call_args_list == [call(22)]
+    assert device.set_target_temperature.call_count == len(expected_call_args)
+    assert device.set_target_temperature.call_args_list == expected_call_args
 
 
-async def test_set_preset_mode_eco(hass: HomeAssistant, fritz: Mock) -> None:
+@pytest.mark.parametrize(
+    ("eco_temperature", "expected_call_args"),
+    [
+        (20, [call(20, True)]),
+        (16, [call(16, True)]),
+        (OFF_API_TEMPERATURE, [call(0, True)]),
+    ],
+)
+async def test_set_preset_mode_eco(
+    hass: HomeAssistant,
+    fritz: Mock,
+    eco_temperature: int,
+    expected_call_args: list[_Call],
+) -> None:
     """Test setting preset mode."""
     device = FritzDeviceClimateMock()
+    device.eco_temperature = eco_temperature
     assert await setup_config_entry(
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
@@ -396,7 +430,8 @@ async def test_set_preset_mode_eco(hass: HomeAssistant, fritz: Mock) -> None:
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_PRESET_MODE: PRESET_ECO},
         True,
     )
-    assert device.set_target_temperature.call_args_list == [call(16)]
+    assert device.set_target_temperature.call_count == len(expected_call_args)
+    assert device.set_target_temperature.call_args_list == expected_call_args
 
 
 async def test_preset_mode_update(hass: HomeAssistant, fritz: Mock) -> None:
@@ -493,7 +528,7 @@ async def test_holidy_summer_mode(
 
     with pytest.raises(
         HomeAssistantError,
-        match="Can't change hvac mode while holiday or summer mode is active on the device",
+        match="Can't change HVAC mode while holiday or summer mode is active on the device",
     ):
         await hass.services.async_call(
             "climate",
@@ -529,7 +564,7 @@ async def test_holidy_summer_mode(
 
     with pytest.raises(
         HomeAssistantError,
-        match="Can't change hvac mode while holiday or summer mode is active on the device",
+        match="Can't change HVAC mode while holiday or summer mode is active on the device",
     ):
         await hass.services.async_call(
             "climate",
diff --git a/tests/components/fritzbox/test_cover.py b/tests/components/fritzbox/test_cover.py
index f26e65fc28a..535306e4ef2 100644
--- a/tests/components/fritzbox/test_cover.py
+++ b/tests/components/fritzbox/test_cover.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import (
     FritzDeviceCoverMock,
@@ -99,7 +99,7 @@ async def test_set_position_cover(hass: HomeAssistant, fritz: Mock) -> None:
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_POSITION: 50},
         True,
     )
-    assert device.set_level_percentage.call_args_list == [call(50)]
+    assert device.set_level_percentage.call_args_list == [call(50, True)]
 
 
 async def test_stop_cover(hass: HomeAssistant, fritz: Mock) -> None:
diff --git a/tests/components/fritzbox/test_light.py b/tests/components/fritzbox/test_light.py
index 84fafe25521..fe8bb32066e 100644
--- a/tests/components/fritzbox/test_light.py
+++ b/tests/components/fritzbox/test_light.py
@@ -3,7 +3,6 @@
 from datetime import timedelta
 from unittest.mock import Mock, call
 
-import pytest
 from requests.exceptions import HTTPError
 
 from homeassistant.components.fritzbox.const import (
@@ -31,7 +30,7 @@ from homeassistant.const import (
     STATE_ON,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import FritzDeviceLightMock, set_devices, setup_config_entry
 from .const import CONF_FAKE_NAME, MOCK_CONFIG
@@ -155,8 +154,8 @@ async def test_turn_on(hass: HomeAssistant, fritz: Mock) -> None:
     assert device.set_state_on.call_count == 1
     assert device.set_level.call_count == 1
     assert device.set_color_temp.call_count == 1
-    assert device.set_color_temp.call_args_list == [call(3000)]
-    assert device.set_level.call_args_list == [call(100)]
+    assert device.set_color_temp.call_args_list == [call(3000, 0, True)]
+    assert device.set_level.call_args_list == [call(100, True)]
 
 
 async def test_turn_on_color(hass: HomeAssistant, fritz: Mock) -> None:
@@ -166,6 +165,7 @@ async def test_turn_on_color(hass: HomeAssistant, fritz: Mock) -> None:
     device.get_colors.return_value = {
         "Red": [("100", "70", "10"), ("100", "50", "10"), ("100", "30", "10")]
     }
+    device.fullcolorsupport = True
     assert await setup_config_entry(
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
@@ -178,13 +178,14 @@ async def test_turn_on_color(hass: HomeAssistant, fritz: Mock) -> None:
     assert device.set_state_on.call_count == 1
     assert device.set_level.call_count == 1
     assert device.set_unmapped_color.call_count == 1
-    assert device.set_level.call_args_list == [call(100)]
+    assert device.set_color.call_count == 0
+    assert device.set_level.call_args_list == [call(100, True)]
     assert device.set_unmapped_color.call_args_list == [
-        call((100, round(70 * 255.0 / 100.0)))
+        call((100, round(70 * 255.0 / 100.0)), 0, True)
     ]
 
 
-async def test_turn_on_color_unsupported_api_method(
+async def test_turn_on_color_no_fullcolorsupport(
     hass: HomeAssistant, fritz: Mock
 ) -> None:
     """Test turn device on in mapped color mode if unmapped is not supported."""
@@ -193,16 +194,11 @@ async def test_turn_on_color_unsupported_api_method(
     device.get_colors.return_value = {
         "Red": [("100", "70", "10"), ("100", "50", "10"), ("100", "30", "10")]
     }
+    device.fullcolorsupport = False
     assert await setup_config_entry(
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    # test fallback to `setcolor`
-    error = HTTPError("Bad Request")
-    error.response = Mock()
-    error.response.status_code = 400
-    device.set_unmapped_color.side_effect = error
-
     await hass.services.async_call(
         LIGHT_DOMAIN,
         SERVICE_TURN_ON,
@@ -212,18 +208,9 @@ async def test_turn_on_color_unsupported_api_method(
     assert device.set_state_on.call_count == 1
     assert device.set_level.call_count == 1
     assert device.set_color.call_count == 1
-    assert device.set_level.call_args_list == [call(100)]
-    assert device.set_color.call_args_list == [call((100, 70))]
-
-    # test for unknown error
-    error.response.status_code = 500
-    with pytest.raises(HTTPError, match="Bad Request"):
-        await hass.services.async_call(
-            LIGHT_DOMAIN,
-            SERVICE_TURN_ON,
-            {ATTR_ENTITY_ID: ENTITY_ID, ATTR_BRIGHTNESS: 100, ATTR_HS_COLOR: (100, 70)},
-            True,
-        )
+    assert device.set_unmapped_color.call_count == 0
+    assert device.set_level.call_args_list == [call(100, True)]
+    assert device.set_color.call_args_list == [call((100, 70), 0, True)]
 
 
 async def test_turn_off(hass: HomeAssistant, fritz: Mock) -> None:
diff --git a/tests/components/fritzbox/test_sensor.py b/tests/components/fritzbox/test_sensor.py
index 0da040bbb5b..67b2c3e8ab6 100644
--- a/tests/components/fritzbox/test_sensor.py
+++ b/tests/components/fritzbox/test_sensor.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import (
     FritzDeviceClimateMock,
diff --git a/tests/components/fritzbox/test_switch.py b/tests/components/fritzbox/test_switch.py
index e394ccbc7f3..511725c663f 100644
--- a/tests/components/fritzbox/test_switch.py
+++ b/tests/components/fritzbox/test_switch.py
@@ -32,7 +32,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import FritzDeviceSwitchMock, set_devices, setup_config_entry
 from .const import CONF_FAKE_NAME, MOCK_CONFIG
diff --git a/tests/components/fronius/snapshots/test_diagnostics.ambr b/tests/components/fronius/snapshots/test_diagnostics.ambr
index 010de06e276..b112839835a 100644
--- a/tests/components/fronius/snapshots/test_diagnostics.ambr
+++ b/tests/components/fronius/snapshots/test_diagnostics.ambr
@@ -17,6 +17,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': '**REDACTED**',
       'version': 1,
diff --git a/tests/components/fronius/snapshots/test_sensor.ambr b/tests/components/fronius/snapshots/test_sensor.ambr
index 81770893273..5384e9c6389 100644
--- a/tests/components/fronius/snapshots/test_sensor.ambr
+++ b/tests/components/fronius/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -110,6 +112,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -161,6 +164,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -212,6 +216,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -263,6 +268,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -314,6 +320,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -363,6 +370,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -508,6 +516,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -655,6 +664,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -704,6 +714,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -750,6 +761,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -807,6 +819,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -866,6 +879,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -917,6 +931,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -968,6 +983,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1019,6 +1035,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1070,6 +1087,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1121,6 +1139,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1172,6 +1191,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1223,6 +1243,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1274,6 +1295,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1323,6 +1345,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1377,6 +1400,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1433,6 +1457,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1483,6 +1508,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1533,6 +1559,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1583,6 +1610,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1633,6 +1661,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1683,6 +1712,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1733,6 +1763,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1784,6 +1815,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1835,6 +1867,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1886,6 +1919,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1937,6 +1971,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1988,6 +2023,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2039,6 +2075,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2090,6 +2127,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2141,6 +2179,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2192,6 +2231,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2243,6 +2283,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2294,6 +2335,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2345,6 +2387,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2396,6 +2439,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2447,6 +2491,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2498,6 +2543,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2549,6 +2595,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2600,6 +2647,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2649,6 +2697,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2697,6 +2746,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2748,6 +2798,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2799,6 +2850,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2850,6 +2902,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2901,6 +2954,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2952,6 +3006,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3003,6 +3058,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3054,6 +3110,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3104,6 +3161,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3154,6 +3212,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3205,6 +3264,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3256,6 +3316,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3305,6 +3366,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3352,6 +3414,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3401,6 +3464,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3452,6 +3516,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3503,6 +3568,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3554,6 +3620,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3605,6 +3672,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3656,6 +3724,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3707,6 +3776,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3758,6 +3828,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3809,6 +3880,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3858,6 +3930,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4003,6 +4076,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4150,6 +4224,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4199,6 +4274,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4245,6 +4321,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4302,6 +4379,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4361,6 +4439,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4412,6 +4491,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4463,6 +4543,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4512,6 +4593,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4567,6 +4649,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4624,6 +4707,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4675,6 +4759,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4726,6 +4811,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4777,6 +4863,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4828,6 +4915,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4879,6 +4967,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4930,6 +5019,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4981,6 +5071,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5032,6 +5123,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5081,6 +5173,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5135,6 +5228,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5191,6 +5285,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5241,6 +5336,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5291,6 +5387,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5341,6 +5438,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5391,6 +5489,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5441,6 +5540,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5491,6 +5591,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5542,6 +5643,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5593,6 +5695,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5644,6 +5747,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5695,6 +5799,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5746,6 +5851,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5797,6 +5903,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5848,6 +5955,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5899,6 +6007,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5950,6 +6059,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6001,6 +6111,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6052,6 +6163,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6103,6 +6215,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6154,6 +6267,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6205,6 +6319,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6256,6 +6371,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6307,6 +6423,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6358,6 +6475,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6407,6 +6525,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6455,6 +6574,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6506,6 +6626,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6557,6 +6678,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6608,6 +6730,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6659,6 +6782,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6710,6 +6834,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6761,6 +6886,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6812,6 +6938,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6863,6 +6990,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6914,6 +7042,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6965,6 +7094,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7015,6 +7145,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7065,6 +7196,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7116,6 +7248,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7167,6 +7300,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7218,6 +7352,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7269,6 +7404,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7320,6 +7456,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7371,6 +7508,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7422,6 +7560,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7471,6 +7610,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7616,6 +7756,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7763,6 +7904,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7812,6 +7954,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7858,6 +8001,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7904,6 +8048,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7961,6 +8106,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8020,6 +8166,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8071,6 +8218,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8122,6 +8270,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8173,6 +8322,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8224,6 +8374,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8275,6 +8426,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8326,6 +8478,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8377,6 +8530,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8426,6 +8580,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8571,6 +8726,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8718,6 +8874,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8767,6 +8924,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8813,6 +8971,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8859,6 +9018,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8916,6 +9076,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8975,6 +9136,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9024,6 +9186,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9078,6 +9241,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9134,6 +9298,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9185,6 +9350,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9235,6 +9401,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9286,6 +9453,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9337,6 +9505,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9387,6 +9556,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9435,6 +9605,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9483,6 +9654,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9534,6 +9706,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9585,6 +9758,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9636,6 +9810,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9687,6 +9862,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9738,6 +9914,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9789,6 +9966,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9840,6 +10018,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9890,6 +10069,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9940,6 +10120,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/fujitsu_fglair/snapshots/test_climate.ambr b/tests/components/fujitsu_fglair/snapshots/test_climate.ambr
index 31b143c6f95..21c5b3429f4 100644
--- a/tests/components/fujitsu_fglair/snapshots/test_climate.ambr
+++ b/tests/components/fujitsu_fglair/snapshots/test_climate.ambr
@@ -28,6 +28,7 @@
       'target_temp_step': 0.5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -122,6 +123,7 @@
       'target_temp_step': 0.5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/fujitsu_fglair/snapshots/test_sensor.ambr b/tests/components/fujitsu_fglair/snapshots/test_sensor.ambr
index 89738cc4a66..751ad3cd2d9 100644
--- a/tests/components/fujitsu_fglair/snapshots/test_sensor.ambr
+++ b/tests/components/fujitsu_fglair/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/fujitsu_fglair/test_sensor.py b/tests/components/fujitsu_fglair/test_sensor.py
index e3f6109a2e8..b8200f114ad 100644
--- a/tests/components/fujitsu_fglair/test_sensor.py
+++ b/tests/components/fujitsu_fglair/test_sensor.py
@@ -31,3 +31,20 @@ async def test_entities(
     assert await integration_setup()
 
     await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
+
+
+async def test_no_outside_temperature(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    mock_ayla_api: AsyncMock,
+    integration_setup: Callable[[], Awaitable[bool]],
+) -> None:
+    """Test that the outside sensor doesn't get added if the reading is None."""
+    mock_ayla_api.async_get_devices.return_value[0].outdoor_temperature = None
+
+    assert await integration_setup()
+
+    assert (
+        len(entity_registry.entities)
+        == len(mock_ayla_api.async_get_devices.return_value) - 1
+    )
diff --git a/tests/components/fyta/conftest.py b/tests/components/fyta/conftest.py
index 299b96be959..92abab7091a 100644
--- a/tests/components/fyta/conftest.py
+++ b/tests/components/fyta/conftest.py
@@ -81,3 +81,13 @@ def mock_setup_entry() -> Generator[AsyncMock]:
         "homeassistant.components.fyta.async_setup_entry", return_value=True
     ) as mock_setup_entry:
         yield mock_setup_entry
+
+
+@pytest.fixture(autouse=True)
+def mock_getrandbits():
+    """Mock image access token which normally is randomized."""
+    with patch(
+        "homeassistant.components.image.SystemRandom.getrandbits",
+        return_value=1,
+    ):
+        yield
diff --git a/tests/components/fyta/fixtures/plant_status1.json b/tests/components/fyta/fixtures/plant_status1.json
index ca5662714a0..91157c57c3a 100644
--- a/tests/components/fyta/fixtures/plant_status1.json
+++ b/tests/components/fyta/fixtures/plant_status1.json
@@ -6,10 +6,18 @@
   "low_battery": false,
   "last_updated": "2023-01-10 10:10:00",
   "light": 2,
+  "light_min_good": "20",
+  "light_max_good": "450",
+  "light_min_acceptable": "18",
+  "light_max_acceptable": "675",
   "light_status": 3,
   "nickname": "Gummibaum",
   "nutrients_status": 3,
   "moisture": 61,
+  "moisture_min_good": "35",
+  "moisture_max_good": "70",
+  "moisture_min_acceptable": "25",
+  "moisture_max_acceptable": "80",
   "moisture_status": 3,
   "sensor_available": true,
   "sensor_id": "FD:1D:B7:E3:D0:E2",
@@ -17,14 +25,24 @@
   "sw_version": "1.0",
   "status": 1,
   "online": true,
+  "origin_path": "http://www.plant_picture.com/user_picture",
   "ph": null,
   "plant_id": 0,
-  "plant_origin_path": "",
-  "plant_thumb_path": "",
+  "plant_origin_path": "http://www.plant_picture.com/picture",
+  "plant_thumb_path": "http://www.plant_picture.com/picture_thumb",
   "is_productive_plant": false,
   "salinity": 1,
+  "salinity_min_good": "0.6",
+  "salinity_max_good": "1",
+  "salinity_min_acceptable": "0.4",
+  "salinity_max_acceptable": "1.2",
   "salinity_status": 4,
   "scientific_name": "Ficus elastica",
   "temperature": 25.2,
-  "temperature_status": 3
+  "temperature_min_good": "17",
+  "temperature_max_good": "36",
+  "temperature_min_acceptable": "10",
+  "temperature_max_acceptable": "42",
+  "temperature_status": 3,
+  "thumb_path": "http://www.plant_picture.com/user_picture_thumb"
 }
diff --git a/tests/components/fyta/fixtures/plant_status1_update.json b/tests/components/fyta/fixtures/plant_status1_update.json
new file mode 100644
index 00000000000..5363c5bd290
--- /dev/null
+++ b/tests/components/fyta/fixtures/plant_status1_update.json
@@ -0,0 +1,48 @@
+{
+  "battery_level": 80,
+  "fertilisation": {
+    "was_repotted": true
+  },
+  "low_battery": false,
+  "last_updated": "2023-01-10 10:10:00",
+  "light": 2,
+  "light_min_good": "20",
+  "light_max_good": "450",
+  "light_min_acceptable": "18",
+  "light_max_acceptable": "675",
+  "light_status": 3,
+  "nickname": "Gummibaum",
+  "nutrients_status": 3,
+  "moisture": 61,
+  "moisture_min_good": "35",
+  "moisture_max_good": "70",
+  "moisture_min_acceptable": "25",
+  "moisture_max_acceptable": "80",
+  "moisture_status": 3,
+  "sensor_available": true,
+  "sensor_id": "FD:1D:B7:E3:D0:E2",
+  "sensor_update_available": true,
+  "sw_version": "1.0",
+  "status": 1,
+  "online": true,
+  "origin_path": "http://www.plant_picture.com/user_picture",
+  "ph": null,
+  "plant_id": 0,
+  "plant_origin_path": "http://www.plant_picture.com/picture1",
+  "plant_thumb_path": "http://www.plant_picture.com/picture_thumb",
+  "is_productive_plant": false,
+  "salinity": 1,
+  "salinity_min_good": "0.6",
+  "salinity_max_good": "1",
+  "salinity_min_acceptable": "0.4",
+  "salinity_max_acceptable": "1.2",
+  "salinity_status": 4,
+  "scientific_name": "Ficus elastica",
+  "temperature": 25.2,
+  "temperature_min_good": "17",
+  "temperature_max_good": "36",
+  "temperature_min_acceptable": "10",
+  "temperature_max_acceptable": "42",
+  "temperature_status": 3,
+  "thumb_path": "http://www.plant_picture.com/user_picture_thumb"
+}
diff --git a/tests/components/fyta/fixtures/plant_status2.json b/tests/components/fyta/fixtures/plant_status2.json
index bf90ab1e50d..5a181bee576 100644
--- a/tests/components/fyta/fixtures/plant_status2.json
+++ b/tests/components/fyta/fixtures/plant_status2.json
@@ -6,10 +6,18 @@
   "low_battery": true,
   "last_updated": "2023-01-02 10:10:00",
   "light": 2,
+  "light_min_good": "20",
+  "light_max_good": "450",
+  "light_min_acceptable": "18",
+  "light_max_acceptable": "675",
   "light_status": 3,
   "nickname": "Kakaobaum",
   "nutrients_status": 3,
   "moisture": 61,
+  "moisture_min_good": "35",
+  "moisture_max_good": "70",
+  "moisture_min_acceptable": "25",
+  "moisture_max_acceptable": "80",
   "moisture_status": 3,
   "sensor_available": true,
   "sensor_id": "FD:1D:B7:E3:D0:E3",
@@ -17,14 +25,24 @@
   "sw_version": "1.0",
   "status": 1,
   "online": true,
+  "origin_path": "http://www.plant_picture.com/user_picture",
   "ph": 7,
   "plant_id": 0,
   "plant_origin_path": "",
   "plant_thumb_path": "",
   "is_productive_plant": false,
   "salinity": 1,
+  "salinity_min_good": "0.6",
+  "salinity_max_good": "1",
+  "salinity_min_acceptable": "0.4",
+  "salinity_max_acceptable": "1.2",
   "salinity_status": 4,
   "scientific_name": "Theobroma cacao",
   "temperature": 25.2,
-  "temperature_status": 3
+  "temperature_min_good": "17",
+  "temperature_max_good": "36",
+  "temperature_min_acceptable": "10",
+  "temperature_max_acceptable": "42",
+  "temperature_status": 3,
+  "thumb_path": "http://www.plant_picture.com/user_picture_thumb"
 }
diff --git a/tests/components/fyta/fixtures/plant_status3.json b/tests/components/fyta/fixtures/plant_status3.json
index 2bedd196fe1..ad34e01065e 100644
--- a/tests/components/fyta/fixtures/plant_status3.json
+++ b/tests/components/fyta/fixtures/plant_status3.json
@@ -6,10 +6,18 @@
   "low_battery": true,
   "last_updated": "2023-01-02 10:10:00",
   "light": 2,
+  "light_min_good": "20",
+  "light_max_good": "450",
+  "light_min_acceptable": "18",
+  "light_max_acceptable": "675",
   "light_status": 3,
   "nickname": "Tomatenpflanze",
   "nutrients_status": 0,
   "moisture": 61,
+  "moisture_min_good": "35",
+  "moisture_max_good": "70",
+  "moisture_min_acceptable": "25",
+  "moisture_max_acceptable": "80",
   "moisture_status": 3,
   "sensor_available": true,
   "sensor_id": "FD:1D:B7:E3:D0:E3",
@@ -17,14 +25,24 @@
   "sw_version": "1.0",
   "status": 1,
   "online": true,
+  "origin_path": "http://www.plant_picture.com/user_picture",
   "ph": 7,
   "plant_id": 0,
-  "plant_origin_path": "",
-  "plant_thumb_path": "",
+  "plant_origin_path": "http://www.plant_picture.com/picture",
+  "plant_thumb_path": "http://www.plant_picture.com/picture_thumb",
   "is_productive_plant": true,
   "salinity": 1,
+  "salinity_min_good": "0.6",
+  "salinity_max_good": "1",
+  "salinity_min_acceptable": "0.4",
+  "salinity_max_acceptable": "1.2",
   "salinity_status": 4,
   "scientific_name": "Solanum lycopersicum",
   "temperature": 25.2,
-  "temperature_status": 3
+  "temperature_min_good": "17",
+  "temperature_max_good": "36",
+  "temperature_min_acceptable": "10",
+  "temperature_max_acceptable": "42",
+  "temperature_status": 3,
+  "thumb_path": "http://www.plant_picture.com/user_picture_thumb"
 }
diff --git a/tests/components/fyta/snapshots/test_binary_sensor.ambr b/tests/components/fyta/snapshots/test_binary_sensor.ambr
index c90db22bc7f..1218a3da71c 100644
--- a/tests/components/fyta/snapshots/test_binary_sensor.ambr
+++ b/tests/components/fyta/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -99,6 +101,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -145,6 +148,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -191,6 +195,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -237,6 +242,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -283,6 +289,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -330,6 +337,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -376,6 +384,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -423,6 +432,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -469,6 +479,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -515,6 +526,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -561,6 +573,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -607,6 +620,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -653,6 +667,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -700,6 +715,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/fyta/snapshots/test_diagnostics.ambr b/tests/components/fyta/snapshots/test_diagnostics.ambr
index b4da0238db0..7bc6a6f7b5a 100644
--- a/tests/components/fyta/snapshots/test_diagnostics.ambr
+++ b/tests/components/fyta/snapshots/test_diagnostics.ambr
@@ -19,6 +19,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'fyta_user',
       'unique_id': None,
       'version': 1,
@@ -30,9 +32,17 @@
         'fertilise_next': None,
         'last_updated': '2023-01-10T10:10:00',
         'light': 2.0,
+        'light_max_acceptable': 675.0,
+        'light_max_good': 450.0,
+        'light_min_acceptable': 18.0,
+        'light_min_good': 20.0,
         'light_status': 3,
         'low_battery': False,
         'moisture': 61.0,
+        'moisture_max_acceptable': 80.0,
+        'moisture_max_good': 70.0,
+        'moisture_min_acceptable': 25.0,
+        'moisture_min_good': 35.0,
         'moisture_status': 3,
         'name': 'Gummibaum',
         'notification_light': False,
@@ -43,11 +53,15 @@
         'online': True,
         'ph': None,
         'plant_id': 0,
-        'plant_origin_path': '',
-        'plant_thumb_path': '',
+        'plant_origin_path': 'http://www.plant_picture.com/picture',
+        'plant_thumb_path': 'http://www.plant_picture.com/picture_thumb',
         'productive_plant': False,
         'repotted': True,
         'salinity': 1.0,
+        'salinity_max_acceptable': 1.2,
+        'salinity_max_good': 1.0,
+        'salinity_min_acceptable': 0.4,
+        'salinity_min_good': 0.6,
         'salinity_status': 4,
         'scientific_name': 'Ficus elastica',
         'sensor_available': True,
@@ -57,7 +71,13 @@
         'status': 1,
         'sw_version': '1.0',
         'temperature': 25.2,
+        'temperature_max_acceptable': 42.0,
+        'temperature_max_good': 36.0,
+        'temperature_min_acceptable': 10.0,
+        'temperature_min_good': 17.0,
         'temperature_status': 3,
+        'user_picture_path': 'http://www.plant_picture.com/user_picture',
+        'user_thumb_path': 'http://www.plant_picture.com/user_picture_thumb',
       }),
       '1': dict({
         'battery_level': 80.0,
@@ -65,9 +85,17 @@
         'fertilise_next': None,
         'last_updated': '2023-01-02T10:10:00',
         'light': 2.0,
+        'light_max_acceptable': 675.0,
+        'light_max_good': 450.0,
+        'light_min_acceptable': 18.0,
+        'light_min_good': 20.0,
         'light_status': 3,
         'low_battery': True,
         'moisture': 61.0,
+        'moisture_max_acceptable': 80.0,
+        'moisture_max_good': 70.0,
+        'moisture_min_acceptable': 25.0,
+        'moisture_min_good': 35.0,
         'moisture_status': 3,
         'name': 'Kakaobaum',
         'notification_light': False,
@@ -83,6 +111,10 @@
         'productive_plant': False,
         'repotted': True,
         'salinity': 1.0,
+        'salinity_max_acceptable': 1.2,
+        'salinity_max_good': 1.0,
+        'salinity_min_acceptable': 0.4,
+        'salinity_min_good': 0.6,
         'salinity_status': 4,
         'scientific_name': 'Theobroma cacao',
         'sensor_available': True,
@@ -92,7 +124,13 @@
         'status': 1,
         'sw_version': '1.0',
         'temperature': 25.2,
+        'temperature_max_acceptable': 42.0,
+        'temperature_max_good': 36.0,
+        'temperature_min_acceptable': 10.0,
+        'temperature_min_good': 17.0,
         'temperature_status': 3,
+        'user_picture_path': 'http://www.plant_picture.com/user_picture',
+        'user_thumb_path': 'http://www.plant_picture.com/user_picture_thumb',
       }),
     }),
   })
diff --git a/tests/components/fyta/snapshots/test_image.ambr b/tests/components/fyta/snapshots/test_image.ambr
new file mode 100644
index 00000000000..cb39efb4500
--- /dev/null
+++ b/tests/components/fyta/snapshots/test_image.ambr
@@ -0,0 +1,99 @@
+# serializer version: 1
+# name: test_all_entities[image.gummibaum-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'image',
+    'entity_category': None,
+    'entity_id': 'image.gummibaum',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'fyta',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'ce5f5431554d101905d31797e1232da8-0-plant_image',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[image.gummibaum-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'access_token': '1',
+      'entity_picture': '/api/image_proxy/image.gummibaum?token=1',
+      'friendly_name': 'Gummibaum',
+    }),
+    'context': <ANY>,
+    'entity_id': 'image.gummibaum',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_all_entities[image.kakaobaum-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'image',
+    'entity_category': None,
+    'entity_id': 'image.kakaobaum',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'fyta',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'ce5f5431554d101905d31797e1232da8-1-plant_image',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[image.kakaobaum-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'access_token': '1',
+      'entity_picture': '/api/image_proxy/image.kakaobaum?token=1',
+      'friendly_name': 'Kakaobaum',
+    }),
+    'context': <ANY>,
+    'entity_id': 'image.kakaobaum',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
diff --git a/tests/components/fyta/snapshots/test_sensor.ambr b/tests/components/fyta/snapshots/test_sensor.ambr
index 8b75579f557..c43a7446f11 100644
--- a/tests/components/fyta/snapshots/test_sensor.ambr
+++ b/tests/components/fyta/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -57,6 +58,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -106,6 +108,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -163,6 +166,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -220,6 +224,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -278,6 +283,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -333,6 +339,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -389,6 +396,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -446,6 +454,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -501,6 +510,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -556,6 +566,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -614,6 +625,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -669,6 +681,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -717,6 +730,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -775,6 +789,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -832,6 +847,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -881,6 +897,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -930,6 +947,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -987,6 +1005,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1044,6 +1063,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1102,6 +1122,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1157,6 +1178,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1213,6 +1235,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1270,6 +1293,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1325,6 +1349,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1380,6 +1405,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1438,6 +1464,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1493,6 +1520,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1541,6 +1569,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1599,6 +1628,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/fyta/test_image.py b/tests/components/fyta/test_image.py
new file mode 100644
index 00000000000..4feb125bd15
--- /dev/null
+++ b/tests/components/fyta/test_image.py
@@ -0,0 +1,129 @@
+"""Test the Home Assistant fyta sensor module."""
+
+from datetime import timedelta
+from unittest.mock import AsyncMock
+
+from freezegun.api import FrozenDateTimeFactory
+from fyta_cli.fyta_exceptions import FytaConnectionError, FytaPlantError
+from fyta_cli.fyta_models import Plant
+import pytest
+from syrupy import SnapshotAssertion
+
+from homeassistant.components.fyta.const import DOMAIN as FYTA_DOMAIN
+from homeassistant.components.image import ImageEntity
+from homeassistant.const import STATE_UNAVAILABLE, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import setup_platform
+
+from tests.common import (
+    MockConfigEntry,
+    async_fire_time_changed,
+    load_json_object_fixture,
+    snapshot_platform,
+)
+
+
+async def test_all_entities(
+    hass: HomeAssistant,
+    mock_fyta_connector: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test all entities."""
+
+    await setup_platform(hass, mock_config_entry, [Platform.IMAGE])
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
+
+    assert len(hass.states.async_all("image")) == 2
+
+
+@pytest.mark.parametrize(
+    "exception",
+    [
+        FytaConnectionError,
+        FytaPlantError,
+    ],
+)
+async def test_connection_error(
+    hass: HomeAssistant,
+    exception: Exception,
+    mock_fyta_connector: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test connection error."""
+    await setup_platform(hass, mock_config_entry, [Platform.IMAGE])
+
+    mock_fyta_connector.update_all_plants.side_effect = exception
+
+    freezer.tick(delta=timedelta(hours=12))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    assert hass.states.get("image.gummibaum").state == STATE_UNAVAILABLE
+
+
+async def test_add_remove_entities(
+    hass: HomeAssistant,
+    mock_fyta_connector: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test if entities are added and old are removed."""
+
+    await setup_platform(hass, mock_config_entry, [Platform.IMAGE])
+
+    assert hass.states.get("image.gummibaum") is not None
+
+    plants: dict[int, Plant] = {
+        0: Plant.from_dict(load_json_object_fixture("plant_status1.json", FYTA_DOMAIN)),
+        2: Plant.from_dict(load_json_object_fixture("plant_status3.json", FYTA_DOMAIN)),
+    }
+    mock_fyta_connector.update_all_plants.return_value = plants
+    mock_fyta_connector.plant_list = {
+        0: "Kautschukbaum",
+        2: "Tomatenpflanze",
+    }
+
+    freezer.tick(delta=timedelta(minutes=10))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    assert hass.states.get("image.kakaobaum") is None
+    assert hass.states.get("image.tomatenpflanze") is not None
+
+
+async def test_update_image(
+    hass: HomeAssistant,
+    mock_fyta_connector: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test if entity picture is updated."""
+
+    await setup_platform(hass, mock_config_entry, [Platform.IMAGE])
+
+    image_entity: ImageEntity = hass.data["domain_entities"]["image"]["image.gummibaum"]
+
+    assert image_entity.image_url == "http://www.plant_picture.com/picture"
+
+    plants: dict[int, Plant] = {
+        0: Plant.from_dict(
+            load_json_object_fixture("plant_status1_update.json", FYTA_DOMAIN)
+        ),
+        2: Plant.from_dict(load_json_object_fixture("plant_status3.json", FYTA_DOMAIN)),
+    }
+    mock_fyta_connector.update_all_plants.return_value = plants
+    mock_fyta_connector.plant_list = {
+        0: "Kautschukbaum",
+        2: "Tomatenpflanze",
+    }
+
+    freezer.tick(delta=timedelta(minutes=10))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    assert image_entity.image_url == "http://www.plant_picture.com/picture1"
diff --git a/tests/components/garages_amsterdam/snapshots/test_binary_sensor.ambr b/tests/components/garages_amsterdam/snapshots/test_binary_sensor.ambr
index 5f6511090ee..b93a8656ecc 100644
--- a/tests/components/garages_amsterdam/snapshots/test_binary_sensor.ambr
+++ b/tests/components/garages_amsterdam/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/garages_amsterdam/snapshots/test_sensor.ambr b/tests/components/garages_amsterdam/snapshots/test_sensor.ambr
index 2c579631bae..3453817da10 100644
--- a/tests/components/garages_amsterdam/snapshots/test_sensor.ambr
+++ b/tests/components/garages_amsterdam/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -56,6 +57,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -105,6 +107,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -155,6 +158,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/gardena_bluetooth/snapshots/test_config_flow.ambr b/tests/components/gardena_bluetooth/snapshots/test_config_flow.ambr
index 6d521b1f2c8..10f23759fae 100644
--- a/tests/components/gardena_bluetooth/snapshots/test_config_flow.ambr
+++ b/tests/components/gardena_bluetooth/snapshots/test_config_flow.ambr
@@ -66,10 +66,14 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'bluetooth',
+      'subentries': list([
+      ]),
       'title': 'Gardena Water Computer',
       'unique_id': '00000000-0000-0000-0000-000000000001',
       'version': 1,
     }),
+    'subentries': tuple(
+    ),
     'title': 'Gardena Water Computer',
     'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
     'version': 1,
@@ -223,10 +227,14 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Gardena Water Computer',
       'unique_id': '00000000-0000-0000-0000-000000000001',
       'version': 1,
     }),
+    'subentries': tuple(
+    ),
     'title': 'Gardena Water Computer',
     'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
     'version': 1,
diff --git a/tests/components/gardena_bluetooth/snapshots/test_init.ambr b/tests/components/gardena_bluetooth/snapshots/test_init.ambr
index 71195918bb1..8dc9d220e85 100644
--- a/tests/components/gardena_bluetooth/snapshots/test_init.ambr
+++ b/tests/components/gardena_bluetooth/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/gdacs/test_geo_location.py b/tests/components/gdacs/test_geo_location.py
index 4ea28bd8fd3..68e2d061259 100644
--- a/tests/components/gdacs/test_geo_location.py
+++ b/tests/components/gdacs/test_geo_location.py
@@ -33,7 +33,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM
 
 from . import _generate_mock_feed_entry
diff --git a/tests/components/gdacs/test_sensor.py b/tests/components/gdacs/test_sensor.py
index 87b66295006..01609cf485e 100644
--- a/tests/components/gdacs/test_sensor.py
+++ b/tests/components/gdacs/test_sensor.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_START,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import _generate_mock_feed_entry
 
diff --git a/tests/components/generic_hygrostat/test_humidifier.py b/tests/components/generic_hygrostat/test_humidifier.py
index 33a8a0f37bd..3acb50fa38d 100644
--- a/tests/components/generic_hygrostat/test_humidifier.py
+++ b/tests/components/generic_hygrostat/test_humidifier.py
@@ -7,6 +7,7 @@ from freezegun.api import FrozenDateTimeFactory
 import pytest
 import voluptuous as vol
 
+from homeassistant import core as ha
 from homeassistant.components import input_boolean, switch
 from homeassistant.components.generic_hygrostat import (
     DOMAIN as GENERIC_HYDROSTAT_DOMAIN,
@@ -28,7 +29,6 @@ from homeassistant.const import (
     STATE_ON,
     STATE_UNAVAILABLE,
 )
-import homeassistant.core as ha
 from homeassistant.core import (
     DOMAIN as HOMEASSISTANT_DOMAIN,
     CoreState,
@@ -40,7 +40,7 @@ from homeassistant.core import (
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.typing import StateType
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/generic_thermostat/test_climate.py b/tests/components/generic_thermostat/test_climate.py
index 8cbbdbb49d4..7e2e92f025b 100644
--- a/tests/components/generic_thermostat/test_climate.py
+++ b/tests/components/generic_thermostat/test_climate.py
@@ -7,7 +7,7 @@ from freezegun import freeze_time
 import pytest
 import voluptuous as vol
 
-from homeassistant import config as hass_config
+from homeassistant import config as hass_config, core as ha
 from homeassistant.components import input_boolean, switch
 from homeassistant.components.climate import (
     ATTR_PRESET_MODE,
@@ -35,7 +35,6 @@ from homeassistant.const import (
     STATE_UNKNOWN,
     UnitOfTemperature,
 )
-import homeassistant.core as ha
 from homeassistant.core import (
     DOMAIN as HOMEASSISTANT_DOMAIN,
     CoreState,
diff --git a/tests/components/geniushub/snapshots/test_binary_sensor.ambr b/tests/components/geniushub/snapshots/test_binary_sensor.ambr
index fcc256b5232..c295ab8d10a 100644
--- a/tests/components/geniushub/snapshots/test_binary_sensor.ambr
+++ b/tests/components/geniushub/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/geniushub/snapshots/test_climate.ambr b/tests/components/geniushub/snapshots/test_climate.ambr
index eb372de784e..8f897c84559 100644
--- a/tests/components/geniushub/snapshots/test_climate.ambr
+++ b/tests/components/geniushub/snapshots/test_climate.ambr
@@ -16,6 +16,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -96,6 +97,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -178,6 +180,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -260,6 +263,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -342,6 +346,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -423,6 +428,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -503,6 +509,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/geniushub/snapshots/test_sensor.ambr b/tests/components/geniushub/snapshots/test_sensor.ambr
index 874f24cff95..aaf3030d4a4 100644
--- a/tests/components/geniushub/snapshots/test_sensor.ambr
+++ b/tests/components/geniushub/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -102,6 +104,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -203,6 +207,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -256,6 +261,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -309,6 +315,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -362,6 +369,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -415,6 +423,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -468,6 +477,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -521,6 +531,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -574,6 +585,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -629,6 +641,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -684,6 +697,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -739,6 +753,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -794,6 +809,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -849,6 +865,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -904,6 +921,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/geniushub/snapshots/test_switch.ambr b/tests/components/geniushub/snapshots/test_switch.ambr
index 6c3c95af477..cc0451b4e94 100644
--- a/tests/components/geniushub/snapshots/test_switch.ambr
+++ b/tests/components/geniushub/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -61,6 +62,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -116,6 +118,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/geo_json_events/conftest.py b/tests/components/geo_json_events/conftest.py
index 11928e6f012..a4fff4563be 100644
--- a/tests/components/geo_json_events/conftest.py
+++ b/tests/components/geo_json_events/conftest.py
@@ -5,7 +5,7 @@ from unittest.mock import AsyncMock, patch
 
 import pytest
 
-from homeassistant.components.geo_json_events import DOMAIN
+from homeassistant.components.geo_json_events.const import DOMAIN
 from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE, CONF_RADIUS, CONF_URL
 
 from tests.common import MockConfigEntry
diff --git a/tests/components/geo_json_events/test_config_flow.py b/tests/components/geo_json_events/test_config_flow.py
index fe21bccc7aa..9a52cb599b2 100644
--- a/tests/components/geo_json_events/test_config_flow.py
+++ b/tests/components/geo_json_events/test_config_flow.py
@@ -3,7 +3,7 @@
 import pytest
 
 from homeassistant import config_entries
-from homeassistant.components.geo_json_events import DOMAIN
+from homeassistant.components.geo_json_events.const import DOMAIN
 from homeassistant.const import (
     CONF_LATITUDE,
     CONF_LOCATION,
diff --git a/tests/components/geo_json_events/test_init.py b/tests/components/geo_json_events/test_init.py
index e90e663d8b6..0553190395d 100644
--- a/tests/components/geo_json_events/test_init.py
+++ b/tests/components/geo_json_events/test_init.py
@@ -2,8 +2,8 @@
 
 from unittest.mock import patch
 
-from homeassistant.components.geo_json_events.const import DOMAIN
 from homeassistant.components.geo_location import DOMAIN as GEO_LOCATION_DOMAIN
+from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
@@ -24,11 +24,11 @@ async def test_component_unload_config_entry(
         assert await hass.config_entries.async_setup(config_entry.entry_id)
         await hass.async_block_till_done()
         assert mock_feed_manager_update.call_count == 1
-        assert hass.data[DOMAIN][config_entry.entry_id] is not None
+        assert config_entry.state is ConfigEntryState.LOADED
         # Unload config entry.
         assert await hass.config_entries.async_unload(config_entry.entry_id)
         await hass.async_block_till_done()
-        assert hass.data[DOMAIN].get(config_entry.entry_id) is None
+        assert config_entry.state is ConfigEntryState.NOT_LOADED
 
 
 async def test_remove_orphaned_entities(
diff --git a/tests/components/geo_rss_events/test_sensor.py b/tests/components/geo_rss_events/test_sensor.py
index d19262c3339..3b6ef8a0642 100644
--- a/tests/components/geo_rss_events/test_sensor.py
+++ b/tests/components/geo_rss_events/test_sensor.py
@@ -6,7 +6,7 @@ from freezegun.api import FrozenDateTimeFactory
 import pytest
 
 from homeassistant.components import sensor
-import homeassistant.components.geo_rss_events.sensor as geo_rss_events
+from homeassistant.components.geo_rss_events import sensor as geo_rss_events
 from homeassistant.const import (
     ATTR_FRIENDLY_NAME,
     ATTR_ICON,
@@ -15,7 +15,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import assert_setup_component, async_fire_time_changed
 
diff --git a/tests/components/geonetnz_quakes/test_geo_location.py b/tests/components/geonetnz_quakes/test_geo_location.py
index 163bca775c9..fd8ba81fca7 100644
--- a/tests/components/geonetnz_quakes/test_geo_location.py
+++ b/tests/components/geonetnz_quakes/test_geo_location.py
@@ -31,7 +31,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM
 
 from . import _generate_mock_feed_entry
diff --git a/tests/components/geonetnz_quakes/test_sensor.py b/tests/components/geonetnz_quakes/test_sensor.py
index 82143baa374..2daeab9e7ef 100644
--- a/tests/components/geonetnz_quakes/test_sensor.py
+++ b/tests/components/geonetnz_quakes/test_sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import _generate_mock_feed_entry
 
diff --git a/tests/components/geonetnz_volcano/test_sensor.py b/tests/components/geonetnz_volcano/test_sensor.py
index d6ebbcd6582..a79d8512df6 100644
--- a/tests/components/geonetnz_volcano/test_sensor.py
+++ b/tests/components/geonetnz_volcano/test_sensor.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM
 
 from . import _generate_mock_feed_entry
diff --git a/tests/components/gios/snapshots/test_diagnostics.ambr b/tests/components/gios/snapshots/test_diagnostics.ambr
index 71e0afdc495..890edc00482 100644
--- a/tests/components/gios/snapshots/test_diagnostics.ambr
+++ b/tests/components/gios/snapshots/test_diagnostics.ambr
@@ -17,6 +17,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Home',
       'unique_id': '123',
       'version': 1,
diff --git a/tests/components/gios/snapshots/test_sensor.ambr b/tests/components/gios/snapshots/test_sensor.ambr
index c67cc3e4d7c..ab8a2359d0c 100644
--- a/tests/components/gios/snapshots/test_sensor.ambr
+++ b/tests/components/gios/snapshots/test_sensor.ambr
@@ -15,6 +15,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -73,6 +74,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -127,6 +129,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -181,6 +184,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -243,6 +247,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -301,6 +306,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -363,6 +369,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -421,6 +428,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -483,6 +491,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -541,6 +550,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -603,6 +613,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -661,6 +672,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -723,6 +735,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/gios/test_config_flow.py b/tests/components/gios/test_config_flow.py
index d81758b0de0..3764c52a810 100644
--- a/tests/components/gios/test_config_flow.py
+++ b/tests/components/gios/test_config_flow.py
@@ -6,7 +6,8 @@ from unittest.mock import patch
 from gios import ApiError
 
 from homeassistant.components.gios import config_flow
-from homeassistant.components.gios.const import CONF_STATION_ID
+from homeassistant.components.gios.const import CONF_STATION_ID, DOMAIN
+from homeassistant.config_entries import SOURCE_USER
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
@@ -17,36 +18,35 @@ from tests.common import load_fixture
 
 CONFIG = {
     CONF_NAME: "Foo",
-    CONF_STATION_ID: 123,
+    CONF_STATION_ID: "123",
 }
 
 
 async def test_show_form(hass: HomeAssistant) -> None:
     """Test that the form is served with no input."""
-    flow = config_flow.GiosFlowHandler()
-    flow.hass = hass
-
-    result = await flow.async_step_user(user_input=None)
+    with patch(
+        "homeassistant.components.gios.coordinator.Gios._get_stations",
+        return_value=STATIONS,
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_USER}
+        )
 
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "user"
 
 
-async def test_invalid_station_id(hass: HomeAssistant) -> None:
-    """Test that errors are shown when measuring station ID is invalid."""
+async def test_form_with_api_error(hass: HomeAssistant) -> None:
+    """Test the form is aborted because of API error."""
     with patch(
         "homeassistant.components.gios.coordinator.Gios._get_stations",
-        return_value=STATIONS,
+        side_effect=ApiError("error"),
     ):
-        flow = config_flow.GiosFlowHandler()
-        flow.hass = hass
-        flow.context = {}
-
-        result = await flow.async_step_user(
-            user_input={CONF_NAME: "Foo", CONF_STATION_ID: 0}
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_USER}
         )
 
-        assert result["errors"] == {CONF_STATION_ID: "wrong_station_id"}
+    assert result["type"] is FlowResultType.ABORT
 
 
 async def test_invalid_sensor_data(hass: HomeAssistant) -> None:
@@ -76,17 +76,25 @@ async def test_invalid_sensor_data(hass: HomeAssistant) -> None:
 
 async def test_cannot_connect(hass: HomeAssistant) -> None:
     """Test that errors are shown when cannot connect to GIOS server."""
-    with patch(
-        "homeassistant.components.gios.coordinator.Gios._async_get",
-        side_effect=ApiError("error"),
+    with (
+        patch(
+            "homeassistant.components.gios.coordinator.Gios._get_stations",
+            return_value=STATIONS,
+        ),
+        patch(
+            "homeassistant.components.gios.coordinator.Gios._async_get",
+            side_effect=ApiError("error"),
+        ),
     ):
-        flow = config_flow.GiosFlowHandler()
-        flow.hass = hass
-        flow.context = {}
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_USER}
+        )
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], CONFIG
+        )
+        await hass.async_block_till_done()
 
-        result = await flow.async_step_user(user_input=CONFIG)
-
-        assert result["errors"] == {"base": "cannot_connect"}
+    assert result["errors"] == {"base": "cannot_connect"}
 
 
 async def test_create_entry(hass: HomeAssistant) -> None:
diff --git a/tests/components/glances/snapshots/test_sensor.ambr b/tests/components/glances/snapshots/test_sensor.ambr
index 662e95c6a1c..baac4c5b056 100644
--- a/tests/components/glances/snapshots/test_sensor.ambr
+++ b/tests/components/glances/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -57,6 +58,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -107,6 +109,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -158,6 +161,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -209,6 +213,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -263,6 +268,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -317,6 +323,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -368,6 +375,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -422,6 +430,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -476,6 +485,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -530,6 +540,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -584,6 +595,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -633,6 +645,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -682,6 +695,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -731,6 +745,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -780,6 +795,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -831,6 +847,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -881,6 +898,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -932,6 +950,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -983,6 +1002,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1033,6 +1053,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1084,6 +1105,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1135,6 +1157,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1185,6 +1208,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1235,6 +1259,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1288,6 +1313,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1339,6 +1365,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1393,6 +1420,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1447,6 +1475,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1501,6 +1530,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1555,6 +1585,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1606,6 +1637,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1656,6 +1688,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1705,6 +1738,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/goalzero/test_init.py b/tests/components/goalzero/test_init.py
index 1d44c7e808e..4817be1ce35 100644
--- a/tests/components/goalzero/test_init.py
+++ b/tests/components/goalzero/test_init.py
@@ -10,7 +10,7 @@ from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import STATE_ON, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import CONF_DATA, async_init_integration, create_entry, create_mocked_yeti
 
diff --git a/tests/components/goodwe/snapshots/test_diagnostics.ambr b/tests/components/goodwe/snapshots/test_diagnostics.ambr
index f52e47688e8..40ed22195d5 100644
--- a/tests/components/goodwe/snapshots/test_diagnostics.ambr
+++ b/tests/components/goodwe/snapshots/test_diagnostics.ambr
@@ -17,6 +17,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': None,
       'version': 1,
diff --git a/tests/components/google/test_calendar.py b/tests/components/google/test_calendar.py
index 305f30d99d4..720c0176850 100644
--- a/tests/components/google/test_calendar.py
+++ b/tests/components/google/test_calendar.py
@@ -21,7 +21,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryDisabler
 from homeassistant.helpers.template import DATE_STR_FORMAT
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import (
     CALENDAR_ID,
@@ -1451,6 +1451,14 @@ async def test_working_location_ignored(
     assert state.attributes.get("message") == expected_event_message
 
 
+@pytest.mark.parametrize(
+    ("event_type", "expected_event_message"),
+    [
+        ("workingLocation", "Test All Day Event"),
+        ("birthday", None),
+        ("default", None),
+    ],
+)
 @pytest.mark.parametrize("calendar_is_primary", [True])
 async def test_working_location_entity(
     hass: HomeAssistant,
@@ -1458,12 +1466,14 @@ async def test_working_location_entity(
     entity_registry: er.EntityRegistry,
     mock_events_list_items: Callable[[list[dict[str, Any]]], None],
     component_setup: ComponentSetup,
+    event_type: str,
+    expected_event_message: str | None,
 ) -> None:
     """Test that working location events are registered under a disabled by default entity."""
     event = {
         **TEST_EVENT,
         **upcoming(),
-        "eventType": "workingLocation",
+        "eventType": event_type,
     }
     mock_events_list_items([event])
     assert await component_setup()
@@ -1484,7 +1494,7 @@ async def test_working_location_entity(
     state = hass.states.get("calendar.working_location")
     assert state
     assert state.name == "Working location"
-    assert state.attributes.get("message") == "Test All Day Event"
+    assert state.attributes.get("message") == expected_event_message
 
 
 @pytest.mark.parametrize("calendar_is_primary", [False])
@@ -1506,3 +1516,49 @@ async def test_no_working_location_entity(
 
     entity_entry = entity_registry.async_get("calendar.working_location")
     assert not entity_entry
+
+
+@pytest.mark.parametrize(
+    ("event_type", "expected_event_message"),
+    [
+        ("workingLocation", None),
+        ("birthday", "Test All Day Event"),
+        ("default", None),
+    ],
+)
+@pytest.mark.parametrize("calendar_is_primary", [True])
+async def test_birthday_entity(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    entity_registry: er.EntityRegistry,
+    mock_events_list_items: Callable[[list[dict[str, Any]]], None],
+    component_setup: ComponentSetup,
+    event_type: str,
+    expected_event_message: str | None,
+) -> None:
+    """Test that birthday events appear only on the birthdays calendar."""
+    event = {
+        **TEST_EVENT,
+        **upcoming(),
+        "eventType": event_type,
+    }
+    mock_events_list_items([event])
+    assert await component_setup()
+
+    entity_entry = entity_registry.async_get("calendar.birthdays")
+    assert entity_entry
+    assert entity_entry.disabled_by is None  # Enabled by default
+
+    entity_registry.async_update_entity(
+        entity_id="calendar.birthdays", disabled_by=None
+    )
+    async_fire_time_changed(
+        hass,
+        dt_util.utcnow() + datetime.timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("calendar.birthdays")
+    assert state
+    assert state.name == "Birthdays"
+    assert state.attributes.get("message") == expected_event_message
diff --git a/tests/components/google_assistant/snapshots/test_diagnostics.ambr b/tests/components/google_assistant/snapshots/test_diagnostics.ambr
index edbbdb1ba28..cc5ccbb1de1 100644
--- a/tests/components/google_assistant/snapshots/test_diagnostics.ambr
+++ b/tests/components/google_assistant/snapshots/test_diagnostics.ambr
@@ -15,6 +15,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'import',
+      'subentries': list([
+      ]),
       'title': '1234',
       'unique_id': '1234',
       'version': 1,
@@ -96,6 +98,7 @@
         'humidifier',
         'input_boolean',
         'input_select',
+        'lawn_mower',
         'light',
         'lock',
         'media_player',
diff --git a/tests/components/google_assistant/test_google_assistant.py b/tests/components/google_assistant/test_google_assistant.py
index 2b0bfd82908..035a8d151c4 100644
--- a/tests/components/google_assistant/test_google_assistant.py
+++ b/tests/components/google_assistant/test_google_assistant.py
@@ -16,13 +16,9 @@ from homeassistant.components import (
     light,
     media_player,
 )
-from homeassistant.const import (
-    CLOUD_NEVER_EXPOSED_ENTITIES,
-    EntityCategory,
-    Platform,
-    UnitOfTemperature,
-)
+from homeassistant.const import CLOUD_NEVER_EXPOSED_ENTITIES, EntityCategory, Platform
 from homeassistant.helpers import entity_registry as er
+from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM
 
 from . import DEMO_DEVICES
 
@@ -275,7 +271,7 @@ async def test_query_climate_request_f(
 ) -> None:
     """Test a query request."""
     # Mock demo devices as fahrenheit to see if we convert to celsius
-    hass_fixture.config.units.temperature_unit = UnitOfTemperature.FAHRENHEIT
+    hass_fixture.config.units = US_CUSTOMARY_SYSTEM
     for entity_id in ("climate.hvac", "climate.heatpump", "climate.ecobee"):
         state = hass_fixture.states.get(entity_id)
         attr = dict(state.attributes)
@@ -332,7 +328,6 @@ async def test_query_climate_request_f(
         "thermostatHumidityAmbient": 54.2,
         "currentFanSpeedSetting": "on_high",
     }
-    hass_fixture.config.units.temperature_unit = UnitOfTemperature.CELSIUS
 
 
 async def test_query_humidifier_request(
diff --git a/tests/components/google_assistant/test_trait.py b/tests/components/google_assistant/test_trait.py
index dafe85d97b2..cf9c8047049 100644
--- a/tests/components/google_assistant/test_trait.py
+++ b/tests/components/google_assistant/test_trait.py
@@ -21,6 +21,7 @@ from homeassistant.components import (
     input_boolean,
     input_button,
     input_select,
+    lawn_mower,
     light,
     lock,
     media_player,
@@ -44,6 +45,7 @@ from homeassistant.components.fan import FanEntityFeature
 from homeassistant.components.google_assistant import const, error, helpers, trait
 from homeassistant.components.google_assistant.error import SmartHomeError
 from homeassistant.components.humidifier import HumidifierEntityFeature
+from homeassistant.components.lawn_mower import LawnMowerEntityFeature
 from homeassistant.components.light import LightEntityFeature
 from homeassistant.components.lock import LockEntityFeature
 from homeassistant.components.media_player import (
@@ -79,6 +81,11 @@ from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, St
 from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.util import dt as dt_util
 from homeassistant.util.unit_conversion import TemperatureConverter
+from homeassistant.util.unit_system import (
+    METRIC_SYSTEM,
+    US_CUSTOMARY_SYSTEM,
+    UnitSystem,
+)
 
 from . import BASIC_CONFIG, MockConfig
 
@@ -584,6 +591,64 @@ async def test_startstop_vacuum(hass: HomeAssistant) -> None:
     assert unpause_calls[0].data == {ATTR_ENTITY_ID: "vacuum.bla"}
 
 
+async def test_dock_lawn_mower(hass: HomeAssistant) -> None:
+    """Test dock trait support for lawn mower domain."""
+    assert helpers.get_google_type(lawn_mower.DOMAIN, None) is not None
+    assert trait.DockTrait.supported(lawn_mower.DOMAIN, 0, None, None)
+
+    trt = trait.DockTrait(
+        hass, State("lawn_mower.bla", lawn_mower.LawnMowerActivity.MOWING), BASIC_CONFIG
+    )
+
+    assert trt.sync_attributes() == {}
+
+    assert trt.query_attributes() == {"isDocked": False}
+
+    calls = async_mock_service(hass, lawn_mower.DOMAIN, lawn_mower.SERVICE_DOCK)
+    await trt.execute(trait.COMMAND_DOCK, BASIC_DATA, {}, {})
+    assert len(calls) == 1
+    assert calls[0].data == {ATTR_ENTITY_ID: "lawn_mower.bla"}
+
+
+async def test_startstop_lawn_mower(hass: HomeAssistant) -> None:
+    """Test startStop trait support for lawn mower domain."""
+    assert helpers.get_google_type(lawn_mower.DOMAIN, None) is not None
+    assert trait.StartStopTrait.supported(lawn_mower.DOMAIN, 0, None, None)
+
+    trt = trait.StartStopTrait(
+        hass,
+        State(
+            "lawn_mower.bla",
+            lawn_mower.LawnMowerActivity.PAUSED,
+            {ATTR_SUPPORTED_FEATURES: LawnMowerEntityFeature.PAUSE},
+        ),
+        BASIC_CONFIG,
+    )
+
+    assert trt.sync_attributes() == {"pausable": True}
+
+    assert trt.query_attributes() == {"isRunning": False, "isPaused": True}
+
+    start_calls = async_mock_service(
+        hass, lawn_mower.DOMAIN, lawn_mower.SERVICE_START_MOWING
+    )
+    await trt.execute(trait.COMMAND_START_STOP, BASIC_DATA, {"start": True}, {})
+    assert len(start_calls) == 1
+    assert start_calls[0].data == {ATTR_ENTITY_ID: "lawn_mower.bla"}
+
+    pause_calls = async_mock_service(hass, lawn_mower.DOMAIN, lawn_mower.SERVICE_PAUSE)
+    await trt.execute(trait.COMMAND_PAUSE_UNPAUSE, BASIC_DATA, {"pause": True}, {})
+    assert len(pause_calls) == 1
+    assert pause_calls[0].data == {ATTR_ENTITY_ID: "lawn_mower.bla"}
+
+    unpause_calls = async_mock_service(
+        hass, lawn_mower.DOMAIN, lawn_mower.SERVICE_START_MOWING
+    )
+    await trt.execute(trait.COMMAND_PAUSE_UNPAUSE, BASIC_DATA, {"pause": False}, {})
+    assert len(unpause_calls) == 1
+    assert unpause_calls[0].data == {ATTR_ENTITY_ID: "lawn_mower.bla"}
+
+
 @pytest.mark.parametrize(
     (
         "domain",
@@ -1072,7 +1137,7 @@ async def test_temperature_setting_climate_onoff(hass: HomeAssistant) -> None:
     assert helpers.get_google_type(climate.DOMAIN, None) is not None
     assert trait.TemperatureSettingTrait.supported(climate.DOMAIN, 0, None, None)
 
-    hass.config.units.temperature_unit = UnitOfTemperature.FAHRENHEIT
+    hass.config.units = US_CUSTOMARY_SYSTEM
 
     trt = trait.TemperatureSettingTrait(
         hass,
@@ -1123,8 +1188,6 @@ async def test_temperature_setting_climate_no_modes(hass: HomeAssistant) -> None
     assert helpers.get_google_type(climate.DOMAIN, None) is not None
     assert trait.TemperatureSettingTrait.supported(climate.DOMAIN, 0, None, None)
 
-    hass.config.units.temperature_unit = UnitOfTemperature.CELSIUS
-
     trt = trait.TemperatureSettingTrait(
         hass,
         State(
@@ -1153,7 +1216,7 @@ async def test_temperature_setting_climate_range(hass: HomeAssistant) -> None:
     assert helpers.get_google_type(climate.DOMAIN, None) is not None
     assert trait.TemperatureSettingTrait.supported(climate.DOMAIN, 0, None, None)
 
-    hass.config.units.temperature_unit = UnitOfTemperature.FAHRENHEIT
+    hass.config.units = US_CUSTOMARY_SYSTEM
 
     trt = trait.TemperatureSettingTrait(
         hass,
@@ -1261,7 +1324,6 @@ async def test_temperature_setting_climate_range(hass: HomeAssistant) -> None:
         ATTR_ENTITY_ID: "climate.bla",
         climate.ATTR_TEMPERATURE: 75,
     }
-    hass.config.units.temperature_unit = UnitOfTemperature.CELSIUS
 
 
 async def test_temperature_setting_climate_setpoint(hass: HomeAssistant) -> None:
@@ -1269,8 +1331,6 @@ async def test_temperature_setting_climate_setpoint(hass: HomeAssistant) -> None
     assert helpers.get_google_type(climate.DOMAIN, None) is not None
     assert trait.TemperatureSettingTrait.supported(climate.DOMAIN, 0, None, None)
 
-    hass.config.units.temperature_unit = UnitOfTemperature.CELSIUS
-
     trt = trait.TemperatureSettingTrait(
         hass,
         State(
@@ -1356,8 +1416,6 @@ async def test_temperature_setting_climate_setpoint_auto(hass: HomeAssistant) ->
 
     Setpoint in auto mode.
     """
-    hass.config.units.temperature_unit = UnitOfTemperature.CELSIUS
-
     trt = trait.TemperatureSettingTrait(
         hass,
         State(
@@ -1407,8 +1465,6 @@ async def test_temperature_setting_climate_setpoint_auto(hass: HomeAssistant) ->
 
 async def test_temperature_control(hass: HomeAssistant) -> None:
     """Test TemperatureControl trait support for sensor domain."""
-    hass.config.units.temperature_unit = UnitOfTemperature.CELSIUS
-
     trt = trait.TemperatureControlTrait(
         hass,
         State("sensor.temp", 18),
@@ -1431,13 +1487,13 @@ async def test_temperature_control(hass: HomeAssistant) -> None:
 @pytest.mark.parametrize(
     ("unit_in", "unit_out", "temp_in", "temp_out", "current_in", "current_out"),
     [
-        (UnitOfTemperature.CELSIUS, "C", "120", 120, "130", 130),
-        (UnitOfTemperature.FAHRENHEIT, "F", "248", 120, "266", 130),
+        (METRIC_SYSTEM, "C", "120", 120, "130", 130),
+        (US_CUSTOMARY_SYSTEM, "F", "248", 120, "266", 130),
     ],
 )
 async def test_temperature_control_water_heater(
     hass: HomeAssistant,
-    unit_in: UnitOfTemperature,
+    unit_in: UnitSystem,
     unit_out: str,
     temp_in: str,
     temp_out: float,
@@ -1445,17 +1501,17 @@ async def test_temperature_control_water_heater(
     current_out: float,
 ) -> None:
     """Test TemperatureControl trait support for water heater domain."""
-    hass.config.units.temperature_unit = unit_in
+    hass.config.units = unit_in
 
     min_temp = TemperatureConverter.convert(
         water_heater.DEFAULT_MIN_TEMP,
         UnitOfTemperature.CELSIUS,
-        unit_in,
+        unit_in.temperature_unit,
     )
     max_temp = TemperatureConverter.convert(
         water_heater.DEFAULT_MAX_TEMP,
         UnitOfTemperature.CELSIUS,
-        unit_in,
+        unit_in.temperature_unit,
     )
 
     trt = trait.TemperatureControlTrait(
@@ -1489,30 +1545,30 @@ async def test_temperature_control_water_heater(
 @pytest.mark.parametrize(
     ("unit", "temp_init", "temp_in", "temp_out", "current_init"),
     [
-        (UnitOfTemperature.CELSIUS, "180", 220, 220, "180"),
-        (UnitOfTemperature.FAHRENHEIT, "356", 220, 428, "356"),
+        (METRIC_SYSTEM, "180", 220, 220, "180"),
+        (US_CUSTOMARY_SYSTEM, "356", 220, 428, "356"),
     ],
 )
 async def test_temperature_control_water_heater_set_temperature(
     hass: HomeAssistant,
-    unit: UnitOfTemperature,
+    unit: UnitSystem,
     temp_init: str,
     temp_in: float,
     temp_out: float,
     current_init: str,
 ) -> None:
     """Test TemperatureControl trait support for water heater domain - SetTemperature."""
-    hass.config.units.temperature_unit = unit
+    hass.config.units = unit
 
     min_temp = TemperatureConverter.convert(
         40,
         UnitOfTemperature.CELSIUS,
-        unit,
+        unit.temperature_unit,
     )
     max_temp = TemperatureConverter.convert(
         230,
         UnitOfTemperature.CELSIUS,
-        unit,
+        unit.temperature_unit,
     )
 
     trt = trait.TemperatureControlTrait(
@@ -3633,17 +3689,17 @@ async def test_temperature_control_sensor(hass: HomeAssistant) -> None:
 @pytest.mark.parametrize(
     ("unit_in", "unit_out", "state", "ambient"),
     [
-        (UnitOfTemperature.FAHRENHEIT, "F", "70", 21.1),
-        (UnitOfTemperature.CELSIUS, "C", "21.1", 21.1),
-        (UnitOfTemperature.FAHRENHEIT, "F", "unavailable", None),
-        (UnitOfTemperature.FAHRENHEIT, "F", "unknown", None),
+        (US_CUSTOMARY_SYSTEM, "F", "70", 21.1),
+        (METRIC_SYSTEM, "C", "21.1", 21.1),
+        (US_CUSTOMARY_SYSTEM, "F", "unavailable", None),
+        (US_CUSTOMARY_SYSTEM, "F", "unknown", None),
     ],
 )
 async def test_temperature_control_sensor_data(
-    hass: HomeAssistant, unit_in, unit_out, state, ambient
+    hass: HomeAssistant, unit_in: UnitSystem, unit_out, state, ambient
 ) -> None:
     """Test TemperatureControl trait support for temperature sensor."""
-    hass.config.units.temperature_unit = unit_in
+    hass.config.units = unit_in
 
     trt = trait.TemperatureControlTrait(
         hass,
@@ -3668,7 +3724,6 @@ async def test_temperature_control_sensor_data(
         }
     else:
         assert trt.query_attributes() == {}
-    hass.config.units.temperature_unit = UnitOfTemperature.CELSIUS
 
 
 async def test_humidity_setting_sensor(hass: HomeAssistant) -> None:
diff --git a/tests/components/google_drive/__init__.py b/tests/components/google_drive/__init__.py
new file mode 100644
index 00000000000..7a55f70a3d6
--- /dev/null
+++ b/tests/components/google_drive/__init__.py
@@ -0,0 +1 @@
+"""Tests for the Google Drive integration."""
diff --git a/tests/components/google_drive/conftest.py b/tests/components/google_drive/conftest.py
new file mode 100644
index 00000000000..479412ddbe2
--- /dev/null
+++ b/tests/components/google_drive/conftest.py
@@ -0,0 +1,80 @@
+"""PyTest fixtures and test helpers."""
+
+from collections.abc import Generator
+import time
+from unittest.mock import AsyncMock, MagicMock, patch
+
+import pytest
+
+from homeassistant.components.application_credentials import (
+    ClientCredential,
+    async_import_client_credential,
+)
+from homeassistant.components.google_drive.const import DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.common import MockConfigEntry
+
+CLIENT_ID = "1234"
+CLIENT_SECRET = "5678"
+HA_UUID = "0a123c"
+TEST_AGENT_ID = "google_drive.testuser_domain_com"
+TEST_USER_EMAIL = "testuser@domain.com"
+CONFIG_ENTRY_TITLE = "Google Drive entry title"
+
+
+@pytest.fixture(autouse=True)
+async def setup_credentials(hass: HomeAssistant) -> None:
+    """Fixture to setup credentials."""
+    assert await async_setup_component(hass, "application_credentials", {})
+    await async_import_client_credential(
+        hass,
+        DOMAIN,
+        ClientCredential(CLIENT_ID, CLIENT_SECRET),
+    )
+
+
+@pytest.fixture
+def mock_api() -> Generator[MagicMock]:
+    """Return a mocked GoogleDriveApi."""
+    with patch(
+        "homeassistant.components.google_drive.api.GoogleDriveApi"
+    ) as mock_api_cl:
+        mock_api = mock_api_cl.return_value
+        yield mock_api
+
+
+@pytest.fixture(autouse=True)
+def mock_instance_id() -> Generator[AsyncMock]:
+    """Mock instance_id."""
+    with patch(
+        "homeassistant.components.google_drive.config_flow.instance_id.async_get",
+        return_value=HA_UUID,
+    ):
+        yield
+
+
+@pytest.fixture(name="expires_at")
+def mock_expires_at() -> int:
+    """Fixture to set the oauth token expiration time."""
+    return time.time() + 3600
+
+
+@pytest.fixture(name="config_entry")
+def mock_config_entry(expires_at: int) -> MockConfigEntry:
+    """Fixture for MockConfigEntry."""
+    return MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=TEST_USER_EMAIL,
+        title=CONFIG_ENTRY_TITLE,
+        data={
+            "auth_implementation": DOMAIN,
+            "token": {
+                "access_token": "mock-access-token",
+                "refresh_token": "mock-refresh-token",
+                "expires_at": expires_at,
+                "scope": "https://www.googleapis.com/auth/drive.file",
+            },
+        },
+    )
diff --git a/tests/components/google_drive/snapshots/test_backup.ambr b/tests/components/google_drive/snapshots/test_backup.ambr
new file mode 100644
index 00000000000..891eb0e1cbe
--- /dev/null
+++ b/tests/components/google_drive/snapshots/test_backup.ambr
@@ -0,0 +1,239 @@
+# serializer version: 1
+# name: test_agents_delete
+  list([
+    tuple(
+      'list_files',
+      tuple(
+      ),
+      dict({
+        'params': dict({
+          'fields': 'files(id,name)',
+          'q': "properties has { key='home_assistant' and value='root' } and properties has { key='instance_id' and value='0a123c' } and trashed=false",
+        }),
+      }),
+    ),
+    tuple(
+      'list_files',
+      tuple(
+      ),
+      dict({
+        'params': dict({
+          'fields': 'files(id)',
+          'q': "properties has { key='home_assistant' and value='backup' } and properties has { key='instance_id' and value='0a123c' } and properties has { key='backup_id' and value='test-backup' }",
+        }),
+      }),
+    ),
+    tuple(
+      'delete_file',
+      tuple(
+        'backup-file-id',
+      ),
+      dict({
+      }),
+    ),
+  ])
+# ---
+# name: test_agents_download
+  list([
+    tuple(
+      'list_files',
+      tuple(
+      ),
+      dict({
+        'params': dict({
+          'fields': 'files(id,name)',
+          'q': "properties has { key='home_assistant' and value='root' } and properties has { key='instance_id' and value='0a123c' } and trashed=false",
+        }),
+      }),
+    ),
+    tuple(
+      'list_files',
+      tuple(
+      ),
+      dict({
+        'params': dict({
+          'fields': 'files(description)',
+          'q': "properties has { key='home_assistant' and value='backup' } and properties has { key='instance_id' and value='0a123c' } and trashed=false",
+        }),
+      }),
+    ),
+    tuple(
+      'list_files',
+      tuple(
+      ),
+      dict({
+        'params': dict({
+          'fields': 'files(id)',
+          'q': "properties has { key='home_assistant' and value='backup' } and properties has { key='instance_id' and value='0a123c' } and properties has { key='backup_id' and value='test-backup' }",
+        }),
+      }),
+    ),
+    tuple(
+      'get_file_content',
+      tuple(
+        'backup-file-id',
+      ),
+      dict({
+        'timeout': dict({
+          'ceil_threshold': 5,
+          'connect': None,
+          'sock_connect': None,
+          'sock_read': None,
+          'total': 43200,
+        }),
+      }),
+    ),
+  ])
+# ---
+# name: test_agents_list_backups
+  list([
+    tuple(
+      'list_files',
+      tuple(
+      ),
+      dict({
+        'params': dict({
+          'fields': 'files(id,name)',
+          'q': "properties has { key='home_assistant' and value='root' } and properties has { key='instance_id' and value='0a123c' } and trashed=false",
+        }),
+      }),
+    ),
+    tuple(
+      'list_files',
+      tuple(
+      ),
+      dict({
+        'params': dict({
+          'fields': 'files(description)',
+          'q': "properties has { key='home_assistant' and value='backup' } and properties has { key='instance_id' and value='0a123c' } and trashed=false",
+        }),
+      }),
+    ),
+  ])
+# ---
+# name: test_agents_upload
+  list([
+    tuple(
+      'list_files',
+      tuple(
+      ),
+      dict({
+        'params': dict({
+          'fields': 'files(id,name)',
+          'q': "properties has { key='home_assistant' and value='root' } and properties has { key='instance_id' and value='0a123c' } and trashed=false",
+        }),
+      }),
+    ),
+    tuple(
+      'list_files',
+      tuple(
+      ),
+      dict({
+        'params': dict({
+          'fields': 'files(id,name)',
+          'q': "properties has { key='home_assistant' and value='root' } and properties has { key='instance_id' and value='0a123c' } and trashed=false",
+        }),
+      }),
+    ),
+    tuple(
+      'resumable_upload_file',
+      tuple(
+        dict({
+          'description': '{"addons": [{"name": "Test", "slug": "test", "version": "1.0.0"}], "backup_id": "test-backup", "date": "2025-01-01T01:23:45.678Z", "database_included": true, "extra_metadata": {"with_automatic_settings": false}, "folders": [], "homeassistant_included": true, "homeassistant_version": "2024.12.0", "name": "Test", "protected": false, "size": 987}',
+          'name': 'Test_2025-01-01_01.23_45678000.tar',
+          'parents': list([
+            'HA folder ID',
+          ]),
+          'properties': dict({
+            'backup_id': 'test-backup',
+            'home_assistant': 'backup',
+            'instance_id': '0a123c',
+          }),
+        }),
+        "CoreBackupReaderWriter.async_receive_backup.<locals>.open_backup() -> 'AsyncIterator[bytes]'",
+        987,
+      ),
+      dict({
+        'timeout': dict({
+          'ceil_threshold': 5,
+          'connect': None,
+          'sock_connect': None,
+          'sock_read': None,
+          'total': 43200,
+        }),
+      }),
+    ),
+  ])
+# ---
+# name: test_agents_upload_create_folder_if_missing
+  list([
+    tuple(
+      'list_files',
+      tuple(
+      ),
+      dict({
+        'params': dict({
+          'fields': 'files(id,name)',
+          'q': "properties has { key='home_assistant' and value='root' } and properties has { key='instance_id' and value='0a123c' } and trashed=false",
+        }),
+      }),
+    ),
+    tuple(
+      'list_files',
+      tuple(
+      ),
+      dict({
+        'params': dict({
+          'fields': 'files(id,name)',
+          'q': "properties has { key='home_assistant' and value='root' } and properties has { key='instance_id' and value='0a123c' } and trashed=false",
+        }),
+      }),
+    ),
+    tuple(
+      'create_file',
+      tuple(
+      ),
+      dict({
+        'json': dict({
+          'mimeType': 'application/vnd.google-apps.folder',
+          'name': 'Home Assistant',
+          'properties': dict({
+            'home_assistant': 'root',
+            'instance_id': '0a123c',
+          }),
+        }),
+        'params': dict({
+          'fields': 'id,name',
+        }),
+      }),
+    ),
+    tuple(
+      'resumable_upload_file',
+      tuple(
+        dict({
+          'description': '{"addons": [{"name": "Test", "slug": "test", "version": "1.0.0"}], "backup_id": "test-backup", "date": "2025-01-01T01:23:45.678Z", "database_included": true, "extra_metadata": {"with_automatic_settings": false}, "folders": [], "homeassistant_included": true, "homeassistant_version": "2024.12.0", "name": "Test", "protected": false, "size": 987}',
+          'name': 'Test_2025-01-01_01.23_45678000.tar',
+          'parents': list([
+            'new folder id',
+          ]),
+          'properties': dict({
+            'backup_id': 'test-backup',
+            'home_assistant': 'backup',
+            'instance_id': '0a123c',
+          }),
+        }),
+        "CoreBackupReaderWriter.async_receive_backup.<locals>.open_backup() -> 'AsyncIterator[bytes]'",
+        987,
+      ),
+      dict({
+        'timeout': dict({
+          'ceil_threshold': 5,
+          'connect': None,
+          'sock_connect': None,
+          'sock_read': None,
+          'total': 43200,
+        }),
+      }),
+    ),
+  ])
+# ---
diff --git a/tests/components/google_drive/snapshots/test_config_flow.ambr b/tests/components/google_drive/snapshots/test_config_flow.ambr
new file mode 100644
index 00000000000..68e5416c5ec
--- /dev/null
+++ b/tests/components/google_drive/snapshots/test_config_flow.ambr
@@ -0,0 +1,44 @@
+# serializer version: 1
+# name: test_full_flow
+  list([
+    tuple(
+      'get_user',
+      tuple(
+      ),
+      dict({
+        'params': dict({
+          'fields': 'user(emailAddress)',
+        }),
+      }),
+    ),
+    tuple(
+      'list_files',
+      tuple(
+      ),
+      dict({
+        'params': dict({
+          'fields': 'files(id,name)',
+          'q': "properties has { key='home_assistant' and value='root' } and properties has { key='instance_id' and value='0a123c' } and trashed=false",
+        }),
+      }),
+    ),
+    tuple(
+      'create_file',
+      tuple(
+      ),
+      dict({
+        'json': dict({
+          'mimeType': 'application/vnd.google-apps.folder',
+          'name': 'Home Assistant',
+          'properties': dict({
+            'home_assistant': 'root',
+            'instance_id': '0a123c',
+          }),
+        }),
+        'params': dict({
+          'fields': 'id,name',
+        }),
+      }),
+    ),
+  ])
+# ---
diff --git a/tests/components/google_drive/test_application_credentials.py b/tests/components/google_drive/test_application_credentials.py
new file mode 100644
index 00000000000..ec46db510a5
--- /dev/null
+++ b/tests/components/google_drive/test_application_credentials.py
@@ -0,0 +1,36 @@
+"""Test the Google Drive application_credentials."""
+
+import pytest
+
+from homeassistant import setup
+from homeassistant.components.google_drive.application_credentials import (
+    async_get_description_placeholders,
+)
+from homeassistant.core import HomeAssistant
+
+
+@pytest.mark.parametrize(
+    ("additional_components", "external_url", "expected_redirect_uri"),
+    [
+        ([], "https://example.com", "https://example.com/auth/external/callback"),
+        ([], None, "https://YOUR_DOMAIN:PORT/auth/external/callback"),
+        (["my"], "https://example.com", "https://my.home-assistant.io/redirect/oauth"),
+    ],
+)
+async def test_description_placeholders(
+    hass: HomeAssistant,
+    additional_components: list[str],
+    external_url: str | None,
+    expected_redirect_uri: str,
+) -> None:
+    """Test description placeholders."""
+    for component in additional_components:
+        assert await setup.async_setup_component(hass, component, {})
+    hass.config.external_url = external_url
+    placeholders = await async_get_description_placeholders(hass)
+    assert placeholders == {
+        "oauth_consent_url": "https://console.cloud.google.com/apis/credentials/consent",
+        "more_info_url": "https://www.home-assistant.io/integrations/google_drive/",
+        "oauth_creds_url": "https://console.cloud.google.com/apis/credentials",
+        "redirect_url": expected_redirect_uri,
+    }
diff --git a/tests/components/google_drive/test_backup.py b/tests/components/google_drive/test_backup.py
new file mode 100644
index 00000000000..9cf86a280bd
--- /dev/null
+++ b/tests/components/google_drive/test_backup.py
@@ -0,0 +1,464 @@
+"""Test the Google Drive backup platform."""
+
+from io import StringIO
+import json
+from typing import Any
+from unittest.mock import AsyncMock, MagicMock, Mock, patch
+
+from aiohttp import ClientResponse
+from google_drive_api.exceptions import GoogleDriveApiError
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.backup import (
+    DOMAIN as BACKUP_DOMAIN,
+    AddonInfo,
+    AgentBackup,
+)
+from homeassistant.components.google_drive import DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.backup import async_initialize_backup
+from homeassistant.setup import async_setup_component
+
+from .conftest import CONFIG_ENTRY_TITLE, TEST_AGENT_ID
+
+from tests.common import MockConfigEntry
+from tests.test_util.aiohttp import mock_stream
+from tests.typing import ClientSessionGenerator, WebSocketGenerator
+
+FOLDER_ID = "google-folder-id"
+TEST_AGENT_BACKUP = AgentBackup(
+    addons=[AddonInfo(name="Test", slug="test", version="1.0.0")],
+    backup_id="test-backup",
+    database_included=True,
+    date="2025-01-01T01:23:45.678Z",
+    extra_metadata={
+        "with_automatic_settings": False,
+    },
+    folders=[],
+    homeassistant_included=True,
+    homeassistant_version="2024.12.0",
+    name="Test",
+    protected=False,
+    size=987,
+)
+TEST_AGENT_BACKUP_RESULT = {
+    "addons": [{"name": "Test", "slug": "test", "version": "1.0.0"}],
+    "agents": {TEST_AGENT_ID: {"protected": False, "size": 987}},
+    "backup_id": "test-backup",
+    "database_included": True,
+    "date": "2025-01-01T01:23:45.678Z",
+    "extra_metadata": {"with_automatic_settings": False},
+    "folders": [],
+    "homeassistant_included": True,
+    "homeassistant_version": "2024.12.0",
+    "name": "Test",
+    "failed_agent_ids": [],
+    "with_automatic_settings": None,
+}
+
+
+@pytest.fixture(autouse=True)
+async def setup_integration(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    mock_api: MagicMock,
+) -> None:
+    """Set up Google Drive and backup integrations."""
+    async_initialize_backup(hass)
+    config_entry.add_to_hass(hass)
+    assert await async_setup_component(hass, BACKUP_DOMAIN, {BACKUP_DOMAIN: {}})
+    mock_api.list_files = AsyncMock(
+        return_value={"files": [{"id": "HA folder ID", "name": "HA folder name"}]}
+    )
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+
+async def test_agents_info(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test backup agent info."""
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id({"type": "backup/agents/info"})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {
+        "agents": [
+            {"agent_id": "backup.local", "name": "local"},
+            {"agent_id": TEST_AGENT_ID, "name": CONFIG_ENTRY_TITLE},
+        ],
+    }
+
+    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
+    await hass.config_entries.async_unload(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    await client.send_json_auto_id({"type": "backup/agents/info"})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {
+        "agents": [{"agent_id": "backup.local", "name": "local"}]
+    }
+
+
+async def test_agents_list_backups(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_api: MagicMock,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test agent list backups."""
+    mock_api.list_files = AsyncMock(
+        return_value={
+            "files": [{"description": json.dumps(TEST_AGENT_BACKUP.as_dict())}]
+        }
+    )
+
+    client = await hass_ws_client(hass)
+    await client.send_json_auto_id({"type": "backup/info"})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"]["agent_errors"] == {}
+    assert response["result"]["backups"] == [TEST_AGENT_BACKUP_RESULT]
+    assert [tuple(mock_call) for mock_call in mock_api.mock_calls] == snapshot
+
+
+async def test_agents_list_backups_fail(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_api: MagicMock,
+) -> None:
+    """Test agent list backups fails."""
+    mock_api.list_files = AsyncMock(side_effect=GoogleDriveApiError("some error"))
+
+    client = await hass_ws_client(hass)
+    await client.send_json_auto_id({"type": "backup/info"})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"]["backups"] == []
+    assert response["result"]["agent_errors"] == {
+        TEST_AGENT_ID: "Failed to list backups: some error"
+    }
+
+
+@pytest.mark.parametrize(
+    ("backup_id", "expected_result"),
+    [
+        (TEST_AGENT_BACKUP.backup_id, TEST_AGENT_BACKUP_RESULT),
+        ("12345", None),
+    ],
+    ids=["found", "not_found"],
+)
+async def test_agents_get_backup(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_api: MagicMock,
+    backup_id: str,
+    expected_result: dict[str, Any] | None,
+) -> None:
+    """Test agent get backup."""
+    mock_api.list_files = AsyncMock(
+        return_value={
+            "files": [{"description": json.dumps(TEST_AGENT_BACKUP.as_dict())}]
+        }
+    )
+    client = await hass_ws_client(hass)
+    await client.send_json_auto_id({"type": "backup/details", "backup_id": backup_id})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"]["agent_errors"] == {}
+    assert response["result"]["backup"] == expected_result
+
+
+async def test_agents_download(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    mock_api: MagicMock,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test agent download backup."""
+    mock_api.list_files = AsyncMock(
+        side_effect=[
+            {"files": [{"description": json.dumps(TEST_AGENT_BACKUP.as_dict())}]},
+            {"files": [{"id": "backup-file-id"}]},
+        ]
+    )
+    mock_response = AsyncMock(spec=ClientResponse)
+    mock_response.content = mock_stream(b"backup data")
+    mock_api.get_file_content = AsyncMock(return_value=mock_response)
+
+    client = await hass_client()
+    resp = await client.get(
+        f"/api/backup/download/{TEST_AGENT_BACKUP.backup_id}?agent_id={TEST_AGENT_ID}"
+    )
+    assert resp.status == 200
+    assert await resp.content.read() == b"backup data"
+
+    assert [tuple(mock_call) for mock_call in mock_api.mock_calls] == snapshot
+
+
+async def test_agents_download_fail(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    mock_api: MagicMock,
+) -> None:
+    """Test agent download backup fails."""
+    mock_api.list_files = AsyncMock(
+        side_effect=[
+            {"files": [{"description": json.dumps(TEST_AGENT_BACKUP.as_dict())}]},
+            {"files": [{"id": "backup-file-id"}]},
+        ]
+    )
+    mock_response = AsyncMock(spec=ClientResponse)
+    mock_response.content = mock_stream(b"backup data")
+    mock_api.get_file_content = AsyncMock(side_effect=GoogleDriveApiError("some error"))
+
+    client = await hass_client()
+    resp = await client.get(
+        f"/api/backup/download/{TEST_AGENT_BACKUP.backup_id}?agent_id={TEST_AGENT_ID}"
+    )
+    assert resp.status == 500
+    content = await resp.content.read()
+    assert "Failed to download backup" in content.decode()
+
+
+async def test_agents_download_file_not_found(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    mock_api: MagicMock,
+) -> None:
+    """Test agent download backup raises error if not found."""
+    mock_api.list_files = AsyncMock(
+        side_effect=[
+            {"files": [{"description": json.dumps(TEST_AGENT_BACKUP.as_dict())}]},
+            {"files": []},
+        ]
+    )
+
+    client = await hass_client()
+    resp = await client.get(
+        f"/api/backup/download/{TEST_AGENT_BACKUP.backup_id}?agent_id={TEST_AGENT_ID}"
+    )
+    assert resp.status == 404
+    content = await resp.content.read()
+    assert content == b""
+
+
+async def test_agents_download_metadata_not_found(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    mock_api: MagicMock,
+) -> None:
+    """Test agent download backup raises error if not found."""
+    mock_api.list_files = AsyncMock(
+        return_value={
+            "files": [{"description": json.dumps(TEST_AGENT_BACKUP.as_dict())}]
+        }
+    )
+
+    client = await hass_client()
+    backup_id = "1234"
+    assert backup_id != TEST_AGENT_BACKUP.backup_id
+
+    resp = await client.get(
+        f"/api/backup/download/{backup_id}?agent_id={TEST_AGENT_ID}"
+    )
+    assert resp.status == 404
+    assert await resp.content.read() == b""
+
+
+async def test_agents_upload(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    caplog: pytest.LogCaptureFixture,
+    mock_api: MagicMock,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test agent upload backup."""
+    mock_api.resumable_upload_file = AsyncMock(return_value=None)
+
+    client = await hass_client()
+
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_get_backup",
+        ) as fetch_backup,
+        patch(
+            "homeassistant.components.backup.manager.read_backup",
+            return_value=TEST_AGENT_BACKUP,
+        ),
+        patch("pathlib.Path.open") as mocked_open,
+    ):
+        mocked_open.return_value.read = Mock(side_effect=[b"test", b""])
+        fetch_backup.return_value = TEST_AGENT_BACKUP
+        resp = await client.post(
+            f"/api/backup/upload?agent_id={TEST_AGENT_ID}",
+            data={"file": StringIO("test")},
+        )
+
+    assert resp.status == 201
+    assert f"Uploading backup: {TEST_AGENT_BACKUP.backup_id}" in caplog.text
+    assert f"Uploaded backup: {TEST_AGENT_BACKUP.backup_id}" in caplog.text
+
+    mock_api.resumable_upload_file.assert_called_once()
+    assert [tuple(mock_call) for mock_call in mock_api.mock_calls] == snapshot
+
+
+async def test_agents_upload_create_folder_if_missing(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    caplog: pytest.LogCaptureFixture,
+    mock_api: MagicMock,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test agent upload backup creates folder if missing."""
+    mock_api.list_files = AsyncMock(return_value={"files": []})
+    mock_api.create_file = AsyncMock(
+        return_value={"id": "new folder id", "name": "Home Assistant"}
+    )
+    mock_api.resumable_upload_file = AsyncMock(return_value=None)
+
+    client = await hass_client()
+
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_get_backup",
+        ) as fetch_backup,
+        patch(
+            "homeassistant.components.backup.manager.read_backup",
+            return_value=TEST_AGENT_BACKUP,
+        ),
+        patch("pathlib.Path.open") as mocked_open,
+    ):
+        mocked_open.return_value.read = Mock(side_effect=[b"test", b""])
+        fetch_backup.return_value = TEST_AGENT_BACKUP
+        resp = await client.post(
+            f"/api/backup/upload?agent_id={TEST_AGENT_ID}",
+            data={"file": StringIO("test")},
+        )
+
+    assert resp.status == 201
+    assert f"Uploading backup: {TEST_AGENT_BACKUP.backup_id}" in caplog.text
+    assert f"Uploaded backup: {TEST_AGENT_BACKUP.backup_id}" in caplog.text
+
+    mock_api.create_file.assert_called_once()
+    mock_api.resumable_upload_file.assert_called_once()
+    assert [tuple(mock_call) for mock_call in mock_api.mock_calls] == snapshot
+
+
+async def test_agents_upload_fail(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    caplog: pytest.LogCaptureFixture,
+    mock_api: MagicMock,
+) -> None:
+    """Test agent upload backup fails."""
+    mock_api.resumable_upload_file = AsyncMock(
+        side_effect=GoogleDriveApiError("some error")
+    )
+
+    client = await hass_client()
+
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_get_backup",
+        ) as fetch_backup,
+        patch(
+            "homeassistant.components.backup.manager.read_backup",
+            return_value=TEST_AGENT_BACKUP,
+        ),
+        patch("pathlib.Path.open") as mocked_open,
+    ):
+        mocked_open.return_value.read = Mock(side_effect=[b"test", b""])
+        fetch_backup.return_value = TEST_AGENT_BACKUP
+        resp = await client.post(
+            f"/api/backup/upload?agent_id={TEST_AGENT_ID}",
+            data={"file": StringIO("test")},
+        )
+        await hass.async_block_till_done()
+
+    assert resp.status == 201
+    assert "Failed to upload backup: some error" in caplog.text
+
+
+async def test_agents_delete(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_api: MagicMock,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test agent delete backup."""
+    mock_api.list_files = AsyncMock(return_value={"files": [{"id": "backup-file-id"}]})
+    mock_api.delete_file = AsyncMock(return_value=None)
+
+    client = await hass_ws_client(hass)
+    await client.send_json_auto_id(
+        {
+            "type": "backup/delete",
+            "backup_id": TEST_AGENT_BACKUP.backup_id,
+        }
+    )
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {"agent_errors": {}}
+
+    mock_api.delete_file.assert_called_once()
+    assert [tuple(mock_call) for mock_call in mock_api.mock_calls] == snapshot
+
+
+async def test_agents_delete_fail(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_api: MagicMock,
+) -> None:
+    """Test agent delete backup fails."""
+    mock_api.list_files = AsyncMock(return_value={"files": [{"id": "backup-file-id"}]})
+    mock_api.delete_file = AsyncMock(side_effect=GoogleDriveApiError("some error"))
+
+    client = await hass_ws_client(hass)
+    await client.send_json_auto_id(
+        {
+            "type": "backup/delete",
+            "backup_id": TEST_AGENT_BACKUP.backup_id,
+        }
+    )
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {
+        "agent_errors": {TEST_AGENT_ID: "Failed to delete backup: some error"}
+    }
+
+
+async def test_agents_delete_not_found(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_api: MagicMock,
+) -> None:
+    """Test agent delete backup not found."""
+    mock_api.list_files = AsyncMock(return_value={"files": []})
+
+    client = await hass_ws_client(hass)
+    backup_id = "1234"
+
+    await client.send_json_auto_id(
+        {
+            "type": "backup/delete",
+            "backup_id": backup_id,
+        }
+    )
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {"agent_errors": {}}
+
+    mock_api.delete_file.assert_not_called()
diff --git a/tests/components/google_drive/test_config_flow.py b/tests/components/google_drive/test_config_flow.py
new file mode 100644
index 00000000000..10f73d53a66
--- /dev/null
+++ b/tests/components/google_drive/test_config_flow.py
@@ -0,0 +1,363 @@
+"""Test the Google Drive config flow."""
+
+from unittest.mock import AsyncMock, MagicMock, patch
+
+from google_drive_api.exceptions import GoogleDriveApiError
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.google_drive.const import DOMAIN
+from homeassistant.config_entries import SOURCE_USER
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.helpers import config_entry_oauth2_flow
+
+from .conftest import CLIENT_ID, TEST_USER_EMAIL
+
+from tests.common import MockConfigEntry
+from tests.test_util.aiohttp import AiohttpClientMocker
+from tests.typing import ClientSessionGenerator
+
+GOOGLE_AUTH_URI = "https://accounts.google.com/o/oauth2/v2/auth"
+GOOGLE_TOKEN_URI = "https://oauth2.googleapis.com/token"
+FOLDER_ID = "google-folder-id"
+FOLDER_NAME = "folder name"
+TITLE = "Google Drive"
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+async def test_full_flow(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_api: MagicMock,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Check full flow."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+
+    assert result["url"] == (
+        f"{GOOGLE_AUTH_URI}?response_type=code&client_id={CLIENT_ID}"
+        "&redirect_uri=https://example.com/auth/external/callback"
+        f"&state={state}&scope=https://www.googleapis.com/auth/drive.file"
+        "&access_type=offline&prompt=consent"
+    )
+
+    client = await hass_client_no_auth()
+    resp = await client.get(f"/auth/external/callback?code=abcd&state={state}")
+    assert resp.status == 200
+    assert resp.headers["content-type"] == "text/html; charset=utf-8"
+
+    # Prepare API responses
+    mock_api.get_user = AsyncMock(
+        return_value={"user": {"emailAddress": TEST_USER_EMAIL}}
+    )
+    mock_api.list_files = AsyncMock(return_value={"files": []})
+    mock_api.create_file = AsyncMock(
+        return_value={"id": FOLDER_ID, "name": FOLDER_NAME}
+    )
+
+    aioclient_mock.post(
+        GOOGLE_TOKEN_URI,
+        json={
+            "refresh_token": "mock-refresh-token",
+            "access_token": "mock-access-token",
+            "type": "Bearer",
+            "expires_in": 60,
+        },
+    )
+
+    with patch(
+        "homeassistant.components.google_drive.async_setup_entry", return_value=True
+    ) as mock_setup:
+        result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    assert len(mock_setup.mock_calls) == 1
+    assert len(aioclient_mock.mock_calls) == 1
+    assert [tuple(mock_call) for mock_call in mock_api.mock_calls] == snapshot
+
+    assert result.get("type") is FlowResultType.CREATE_ENTRY
+    assert result.get("title") == TITLE
+    assert result.get("description_placeholders") == {
+        "folder_name": FOLDER_NAME,
+        "url": f"https://drive.google.com/drive/folders/{FOLDER_ID}",
+    }
+    assert "result" in result
+    assert result.get("result").unique_id == TEST_USER_EMAIL
+    assert "token" in result.get("result").data
+    assert result.get("result").data["token"].get("access_token") == "mock-access-token"
+    assert (
+        result.get("result").data["token"].get("refresh_token") == "mock-refresh-token"
+    )
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+async def test_create_folder_error(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_api: MagicMock,
+) -> None:
+    """Test case where creating the folder fails."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+
+    assert result["url"] == (
+        f"{GOOGLE_AUTH_URI}?response_type=code&client_id={CLIENT_ID}"
+        "&redirect_uri=https://example.com/auth/external/callback"
+        f"&state={state}&scope=https://www.googleapis.com/auth/drive.file"
+        "&access_type=offline&prompt=consent"
+    )
+
+    client = await hass_client_no_auth()
+    resp = await client.get(f"/auth/external/callback?code=abcd&state={state}")
+    assert resp.status == 200
+    assert resp.headers["content-type"] == "text/html; charset=utf-8"
+
+    # Prepare API responses
+    mock_api.get_user = AsyncMock(
+        return_value={"user": {"emailAddress": TEST_USER_EMAIL}}
+    )
+    mock_api.list_files = AsyncMock(return_value={"files": []})
+    mock_api.create_file = AsyncMock(side_effect=GoogleDriveApiError("some error"))
+
+    aioclient_mock.post(
+        GOOGLE_TOKEN_URI,
+        json={
+            "refresh_token": "mock-refresh-token",
+            "access_token": "mock-access-token",
+            "type": "Bearer",
+            "expires_in": 60,
+        },
+    )
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+    assert result.get("type") is FlowResultType.ABORT
+    assert result.get("reason") == "create_folder_failure"
+    assert result.get("description_placeholders") == {"message": "some error"}
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+@pytest.mark.parametrize(
+    ("exception", "expected_abort_reason", "expected_placeholders"),
+    [
+        (
+            GoogleDriveApiError("some error"),
+            "access_not_configured",
+            {"message": "some error"},
+        ),
+        (Exception, "unknown", None),
+    ],
+    ids=["api_not_enabled", "general_exception"],
+)
+async def test_get_email_error(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_api: MagicMock,
+    exception: Exception,
+    expected_abort_reason,
+    expected_placeholders,
+) -> None:
+    """Test case where getting the email address fails."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+
+    assert result["url"] == (
+        f"{GOOGLE_AUTH_URI}?response_type=code&client_id={CLIENT_ID}"
+        "&redirect_uri=https://example.com/auth/external/callback"
+        f"&state={state}&scope=https://www.googleapis.com/auth/drive.file"
+        "&access_type=offline&prompt=consent"
+    )
+
+    client = await hass_client_no_auth()
+    resp = await client.get(f"/auth/external/callback?code=abcd&state={state}")
+    assert resp.status == 200
+    assert resp.headers["content-type"] == "text/html; charset=utf-8"
+
+    # Prepare API responses
+    mock_api.get_user = AsyncMock(side_effect=exception)
+    aioclient_mock.post(
+        GOOGLE_TOKEN_URI,
+        json={
+            "refresh_token": "mock-refresh-token",
+            "access_token": "mock-access-token",
+            "type": "Bearer",
+            "expires_in": 60,
+        },
+    )
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+    assert result.get("type") is FlowResultType.ABORT
+    assert result.get("reason") == expected_abort_reason
+    assert result.get("description_placeholders") == expected_placeholders
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+@pytest.mark.parametrize(
+    (
+        "new_email",
+        "expected_abort_reason",
+        "expected_placeholders",
+        "expected_access_token",
+        "expected_setup_calls",
+    ),
+    [
+        (TEST_USER_EMAIL, "reauth_successful", None, "updated-access-token", 1),
+        (
+            "other.user@domain.com",
+            "wrong_account",
+            {"email": TEST_USER_EMAIL},
+            "mock-access-token",
+            0,
+        ),
+    ],
+    ids=["reauth_successful", "wrong_account"],
+)
+async def test_reauth(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    config_entry: MockConfigEntry,
+    aioclient_mock: AiohttpClientMocker,
+    mock_api: MagicMock,
+    new_email: str,
+    expected_abort_reason: str,
+    expected_placeholders: dict[str, str] | None,
+    expected_access_token: str,
+    expected_setup_calls: int,
+) -> None:
+    """Test the reauthentication flow."""
+    config_entry.add_to_hass(hass)
+    result = await config_entry.start_reauth_flow(hass)
+
+    assert result["step_id"] == "reauth_confirm"
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+    assert result["url"] == (
+        f"{GOOGLE_AUTH_URI}?response_type=code&client_id={CLIENT_ID}"
+        "&redirect_uri=https://example.com/auth/external/callback"
+        f"&state={state}&scope=https://www.googleapis.com/auth/drive.file"
+        "&access_type=offline&prompt=consent"
+    )
+    client = await hass_client_no_auth()
+    resp = await client.get(f"/auth/external/callback?code=abcd&state={state}")
+    assert resp.status == 200
+    assert resp.headers["content-type"] == "text/html; charset=utf-8"
+
+    # Prepare API responses
+    mock_api.get_user = AsyncMock(return_value={"user": {"emailAddress": new_email}})
+    aioclient_mock.post(
+        GOOGLE_TOKEN_URI,
+        json={
+            "refresh_token": "mock-refresh-token",
+            "access_token": "updated-access-token",
+            "type": "Bearer",
+            "expires_in": 60,
+        },
+    )
+
+    with patch(
+        "homeassistant.components.google_drive.async_setup_entry", return_value=True
+    ) as mock_setup:
+        result = await hass.config_entries.flow.async_configure(result["flow_id"])
+        await hass.async_block_till_done()
+
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    assert len(mock_setup.mock_calls) == expected_setup_calls
+
+    assert result.get("type") is FlowResultType.ABORT
+    assert result.get("reason") == expected_abort_reason
+    assert result.get("description_placeholders") == expected_placeholders
+
+    assert config_entry.unique_id == TEST_USER_EMAIL
+    assert "token" in config_entry.data
+
+    # Verify access token is refreshed
+    assert config_entry.data["token"].get("access_token") == expected_access_token
+    assert config_entry.data["token"].get("refresh_token") == "mock-refresh-token"
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+async def test_already_configured(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    config_entry: MockConfigEntry,
+    aioclient_mock: AiohttpClientMocker,
+    mock_api: MagicMock,
+) -> None:
+    """Test already configured account."""
+    config_entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+
+    assert result["url"] == (
+        f"{GOOGLE_AUTH_URI}?response_type=code&client_id={CLIENT_ID}"
+        "&redirect_uri=https://example.com/auth/external/callback"
+        f"&state={state}&scope=https://www.googleapis.com/auth/drive.file"
+        "&access_type=offline&prompt=consent"
+    )
+
+    client = await hass_client_no_auth()
+    resp = await client.get(f"/auth/external/callback?code=abcd&state={state}")
+    assert resp.status == 200
+    assert resp.headers["content-type"] == "text/html; charset=utf-8"
+
+    # Prepare API responses
+    mock_api.get_user = AsyncMock(
+        return_value={"user": {"emailAddress": TEST_USER_EMAIL}}
+    )
+    aioclient_mock.post(
+        GOOGLE_TOKEN_URI,
+        json={
+            "refresh_token": "mock-refresh-token",
+            "access_token": "mock-access-token",
+            "type": "Bearer",
+            "expires_in": 60,
+        },
+    )
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+    assert result.get("type") is FlowResultType.ABORT
+    assert result.get("reason") == "already_configured"
diff --git a/tests/components/google_drive/test_init.py b/tests/components/google_drive/test_init.py
new file mode 100644
index 00000000000..8173e00fb54
--- /dev/null
+++ b/tests/components/google_drive/test_init.py
@@ -0,0 +1,164 @@
+"""Tests for Google Drive."""
+
+from collections.abc import Awaitable, Callable, Coroutine
+import http
+import time
+from typing import Any
+from unittest.mock import AsyncMock, MagicMock
+
+from google_drive_api.exceptions import GoogleDriveApiError
+import pytest
+
+from homeassistant.components.google_drive.const import DOMAIN
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+from tests.test_util.aiohttp import AiohttpClientMocker
+
+type ComponentSetup = Callable[[], Awaitable[None]]
+
+
+@pytest.fixture(name="setup_integration")
+async def mock_setup_integration(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+) -> Callable[[], Coroutine[Any, Any, None]]:
+    """Fixture for setting up the component."""
+    config_entry.add_to_hass(hass)
+
+    async def func() -> None:
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    return func
+
+
+async def test_setup_success(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    mock_api: MagicMock,
+) -> None:
+    """Test successful setup and unload."""
+    # Setup looks up existing folder to make sure it still exists
+    mock_api.list_files = AsyncMock(
+        return_value={"files": [{"id": "HA folder ID", "name": "HA folder name"}]}
+    )
+
+    await setup_integration()
+
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert len(entries) == 1
+    assert entries[0].state is ConfigEntryState.LOADED
+
+    await hass.config_entries.async_unload(entries[0].entry_id)
+    await hass.async_block_till_done()
+
+    assert entries[0].state is ConfigEntryState.NOT_LOADED
+
+
+async def test_create_folder_if_missing(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    mock_api: MagicMock,
+) -> None:
+    """Test folder is created if missing."""
+    # Setup looks up existing folder to make sure it still exists
+    # and creates it if missing
+    mock_api.list_files = AsyncMock(return_value={"files": []})
+    mock_api.create_file = AsyncMock(
+        return_value={"id": "new folder id", "name": "Home Assistant"}
+    )
+
+    await setup_integration()
+
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert len(entries) == 1
+    assert entries[0].state is ConfigEntryState.LOADED
+
+    mock_api.list_files.assert_called_once()
+    mock_api.create_file.assert_called_once()
+
+
+async def test_setup_error(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    mock_api: MagicMock,
+) -> None:
+    """Test setup error."""
+    # Simulate failure looking up existing folder
+    mock_api.list_files = AsyncMock(side_effect=GoogleDriveApiError("some error"))
+
+    await setup_integration()
+
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert len(entries) == 1
+    assert entries[0].state is ConfigEntryState.SETUP_RETRY
+
+
+@pytest.mark.parametrize("expires_at", [time.time() - 3600], ids=["expired"])
+async def test_expired_token_refresh_success(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    aioclient_mock: AiohttpClientMocker,
+    mock_api: MagicMock,
+) -> None:
+    """Test expired token is refreshed."""
+    # Setup looks up existing folder to make sure it still exists
+    mock_api.list_files = AsyncMock(
+        return_value={"files": [{"id": "HA folder ID", "name": "HA folder name"}]}
+    )
+    aioclient_mock.post(
+        "https://oauth2.googleapis.com/token",
+        json={
+            "access_token": "updated-access-token",
+            "refresh_token": "updated-refresh-token",
+            "expires_at": time.time() + 3600,
+            "expires_in": 3600,
+        },
+    )
+
+    await setup_integration()
+
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert len(entries) == 1
+    assert entries[0].state is ConfigEntryState.LOADED
+    assert entries[0].data["token"]["access_token"] == "updated-access-token"
+    assert entries[0].data["token"]["expires_in"] == 3600
+
+
+@pytest.mark.parametrize(
+    ("expires_at", "status", "expected_state"),
+    [
+        (
+            time.time() - 3600,
+            http.HTTPStatus.UNAUTHORIZED,
+            ConfigEntryState.SETUP_ERROR,
+        ),
+        (
+            time.time() - 3600,
+            http.HTTPStatus.INTERNAL_SERVER_ERROR,
+            ConfigEntryState.SETUP_RETRY,
+        ),
+    ],
+    ids=["failure_requires_reauth", "transient_failure"],
+)
+async def test_expired_token_refresh_failure(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    aioclient_mock: AiohttpClientMocker,
+    status: http.HTTPStatus,
+    expected_state: ConfigEntryState,
+) -> None:
+    """Test failure while refreshing token with a transient error."""
+
+    aioclient_mock.post(
+        "https://oauth2.googleapis.com/token",
+        status=status,
+    )
+
+    await setup_integration()
+
+    # Verify a transient failure has occurred
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert entries[0].state is expected_state
diff --git a/tests/components/google_generative_ai_conversation/__init__.py b/tests/components/google_generative_ai_conversation/__init__.py
index 8f789d9737e..fbf9ee545db 100644
--- a/tests/components/google_generative_ai_conversation/__init__.py
+++ b/tests/components/google_generative_ai_conversation/__init__.py
@@ -1 +1,31 @@
 """Tests for the Google Generative AI Conversation integration."""
+
+from unittest.mock import Mock
+
+from google.genai.errors import ClientError
+import httpx
+
+CLIENT_ERROR_500 = ClientError(
+    500,
+    Mock(
+        __class__=httpx.Response,
+        json=Mock(
+            return_value={
+                "message": "Internal Server Error",
+                "status": "internal-error",
+            }
+        ),
+    ),
+)
+CLIENT_ERROR_API_KEY_INVALID = ClientError(
+    400,
+    Mock(
+        __class__=httpx.Response,
+        json=Mock(
+            return_value={
+                "message": "'reason': API_KEY_INVALID",
+                "status": "unauthorized",
+            }
+        ),
+    ),
+)
diff --git a/tests/components/google_generative_ai_conversation/conftest.py b/tests/components/google_generative_ai_conversation/conftest.py
index 28c21a9b791..6ec147da2ab 100644
--- a/tests/components/google_generative_ai_conversation/conftest.py
+++ b/tests/components/google_generative_ai_conversation/conftest.py
@@ -1,10 +1,12 @@
 """Tests helpers."""
 
-from collections.abc import Generator
-from unittest.mock import patch
+from unittest.mock import Mock, patch
 
 import pytest
 
+from homeassistant.components.google_generative_ai_conversation.conversation import (
+    CONF_USE_GOOGLE_SEARCH_TOOL,
+)
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_LLM_HASS_API
 from homeassistant.core import HomeAssistant
@@ -15,14 +17,7 @@ from tests.common import MockConfigEntry
 
 
 @pytest.fixture
-def mock_genai() -> Generator[None]:
-    """Mock the genai call in async_setup_entry."""
-    with patch("google.ai.generativelanguage_v1beta.ModelServiceAsyncClient.get_model"):
-        yield
-
-
-@pytest.fixture
-def mock_config_entry(hass: HomeAssistant, mock_genai: None) -> MockConfigEntry:
+def mock_config_entry(hass: HomeAssistant) -> MockConfigEntry:
     """Mock a config entry."""
     entry = MockConfigEntry(
         domain="google_generative_ai_conversation",
@@ -31,18 +26,38 @@ def mock_config_entry(hass: HomeAssistant, mock_genai: None) -> MockConfigEntry:
             "api_key": "bla",
         },
     )
+    entry.runtime_data = Mock()
     entry.add_to_hass(hass)
     return entry
 
 
 @pytest.fixture
-def mock_config_entry_with_assist(
+async def mock_config_entry_with_assist(
     hass: HomeAssistant, mock_config_entry: MockConfigEntry
 ) -> MockConfigEntry:
     """Mock a config entry with assist."""
-    hass.config_entries.async_update_entry(
-        mock_config_entry, options={CONF_LLM_HASS_API: llm.LLM_API_ASSIST}
-    )
+    with patch("google.genai.models.AsyncModels.get"):
+        hass.config_entries.async_update_entry(
+            mock_config_entry, options={CONF_LLM_HASS_API: llm.LLM_API_ASSIST}
+        )
+        await hass.async_block_till_done()
+    return mock_config_entry
+
+
+@pytest.fixture
+async def mock_config_entry_with_google_search(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry
+) -> MockConfigEntry:
+    """Mock a config entry with assist."""
+    with patch("google.genai.models.AsyncModels.get"):
+        hass.config_entries.async_update_entry(
+            mock_config_entry,
+            options={
+                CONF_LLM_HASS_API: llm.LLM_API_ASSIST,
+                CONF_USE_GOOGLE_SEARCH_TOOL: True,
+            },
+        )
+        await hass.async_block_till_done()
     return mock_config_entry
 
 
@@ -51,8 +66,11 @@ async def mock_init_component(
     hass: HomeAssistant, mock_config_entry: ConfigEntry
 ) -> None:
     """Initialize integration."""
-    assert await async_setup_component(hass, "google_generative_ai_conversation", {})
-    await hass.async_block_till_done()
+    with patch("google.genai.models.AsyncModels.get"):
+        assert await async_setup_component(
+            hass, "google_generative_ai_conversation", {}
+        )
+        await hass.async_block_till_done()
 
 
 @pytest.fixture(autouse=True)
diff --git a/tests/components/google_generative_ai_conversation/snapshots/test_conversation.ambr b/tests/components/google_generative_ai_conversation/snapshots/test_conversation.ambr
index 65238c5212a..ec98bdd6529 100644
--- a/tests/components/google_generative_ai_conversation/snapshots/test_conversation.ambr
+++ b/tests/components/google_generative_ai_conversation/snapshots/test_conversation.ambr
@@ -1,414 +1,4 @@
 # serializer version: 1
-# name: test_chat_history[models/gemini-1.0-pro-False]
-  list([
-    tuple(
-      '',
-      tuple(
-      ),
-      dict({
-        'generation_config': dict({
-          'max_output_tokens': 150,
-          'temperature': 1.0,
-          'top_k': 64,
-          'top_p': 0.95,
-        }),
-        'model_name': 'models/gemini-1.0-pro',
-        'safety_settings': dict({
-          'DANGEROUS': 'BLOCK_MEDIUM_AND_ABOVE',
-          'HARASSMENT': 'BLOCK_MEDIUM_AND_ABOVE',
-          'HATE': 'BLOCK_MEDIUM_AND_ABOVE',
-          'SEXUAL': 'BLOCK_MEDIUM_AND_ABOVE',
-        }),
-        'system_instruction': None,
-        'tools': None,
-      }),
-    ),
-    tuple(
-      '().start_chat',
-      tuple(
-      ),
-      dict({
-        'history': list([
-          dict({
-            'parts': '''
-              Current time is 05:00:00. Today's date is 2024-05-24.
-              You are a voice assistant for Home Assistant.
-              Answer questions about the world truthfully.
-              Answer in plain text. Keep it simple and to the point.
-            ''',
-            'role': 'user',
-          }),
-          dict({
-            'parts': 'Ok',
-            'role': 'model',
-          }),
-        ]),
-      }),
-    ),
-    tuple(
-      '().start_chat().send_message_async',
-      tuple(
-        '1st user request',
-      ),
-      dict({
-      }),
-    ),
-    tuple(
-      '',
-      tuple(
-      ),
-      dict({
-        'generation_config': dict({
-          'max_output_tokens': 150,
-          'temperature': 1.0,
-          'top_k': 64,
-          'top_p': 0.95,
-        }),
-        'model_name': 'models/gemini-1.0-pro',
-        'safety_settings': dict({
-          'DANGEROUS': 'BLOCK_MEDIUM_AND_ABOVE',
-          'HARASSMENT': 'BLOCK_MEDIUM_AND_ABOVE',
-          'HATE': 'BLOCK_MEDIUM_AND_ABOVE',
-          'SEXUAL': 'BLOCK_MEDIUM_AND_ABOVE',
-        }),
-        'system_instruction': None,
-        'tools': None,
-      }),
-    ),
-    tuple(
-      '().start_chat',
-      tuple(
-      ),
-      dict({
-        'history': list([
-          dict({
-            'parts': '''
-              Current time is 05:00:00. Today's date is 2024-05-24.
-              You are a voice assistant for Home Assistant.
-              Answer questions about the world truthfully.
-              Answer in plain text. Keep it simple and to the point.
-            ''',
-            'role': 'user',
-          }),
-          dict({
-            'parts': 'Ok',
-            'role': 'model',
-          }),
-          dict({
-            'parts': '1st user request',
-            'role': 'user',
-          }),
-          dict({
-            'parts': '1st model response',
-            'role': 'model',
-          }),
-        ]),
-      }),
-    ),
-    tuple(
-      '().start_chat().send_message_async',
-      tuple(
-        '2nd user request',
-      ),
-      dict({
-      }),
-    ),
-  ])
-# ---
-# name: test_chat_history[models/gemini-1.5-pro-True]
-  list([
-    tuple(
-      '',
-      tuple(
-      ),
-      dict({
-        'generation_config': dict({
-          'max_output_tokens': 150,
-          'temperature': 1.0,
-          'top_k': 64,
-          'top_p': 0.95,
-        }),
-        'model_name': 'models/gemini-1.5-pro',
-        'safety_settings': dict({
-          'DANGEROUS': 'BLOCK_MEDIUM_AND_ABOVE',
-          'HARASSMENT': 'BLOCK_MEDIUM_AND_ABOVE',
-          'HATE': 'BLOCK_MEDIUM_AND_ABOVE',
-          'SEXUAL': 'BLOCK_MEDIUM_AND_ABOVE',
-        }),
-        'system_instruction': '''
-          Current time is 05:00:00. Today's date is 2024-05-24.
-          You are a voice assistant for Home Assistant.
-          Answer questions about the world truthfully.
-          Answer in plain text. Keep it simple and to the point.
-        ''',
-        'tools': None,
-      }),
-    ),
-    tuple(
-      '().start_chat',
-      tuple(
-      ),
-      dict({
-        'history': list([
-        ]),
-      }),
-    ),
-    tuple(
-      '().start_chat().send_message_async',
-      tuple(
-        '1st user request',
-      ),
-      dict({
-      }),
-    ),
-    tuple(
-      '',
-      tuple(
-      ),
-      dict({
-        'generation_config': dict({
-          'max_output_tokens': 150,
-          'temperature': 1.0,
-          'top_k': 64,
-          'top_p': 0.95,
-        }),
-        'model_name': 'models/gemini-1.5-pro',
-        'safety_settings': dict({
-          'DANGEROUS': 'BLOCK_MEDIUM_AND_ABOVE',
-          'HARASSMENT': 'BLOCK_MEDIUM_AND_ABOVE',
-          'HATE': 'BLOCK_MEDIUM_AND_ABOVE',
-          'SEXUAL': 'BLOCK_MEDIUM_AND_ABOVE',
-        }),
-        'system_instruction': '''
-          Current time is 05:00:00. Today's date is 2024-05-24.
-          You are a voice assistant for Home Assistant.
-          Answer questions about the world truthfully.
-          Answer in plain text. Keep it simple and to the point.
-        ''',
-        'tools': None,
-      }),
-    ),
-    tuple(
-      '().start_chat',
-      tuple(
-      ),
-      dict({
-        'history': list([
-          dict({
-            'parts': '1st user request',
-            'role': 'user',
-          }),
-          dict({
-            'parts': '1st model response',
-            'role': 'model',
-          }),
-        ]),
-      }),
-    ),
-    tuple(
-      '().start_chat().send_message_async',
-      tuple(
-        '2nd user request',
-      ),
-      dict({
-      }),
-    ),
-  ])
-# ---
-# name: test_default_prompt[config_entry_options0-0-None]
-  list([
-    tuple(
-      '',
-      tuple(
-      ),
-      dict({
-        'generation_config': dict({
-          'max_output_tokens': 150,
-          'temperature': 1.0,
-          'top_k': 64,
-          'top_p': 0.95,
-        }),
-        'model_name': 'models/gemini-1.5-flash-latest',
-        'safety_settings': dict({
-          'DANGEROUS': 'BLOCK_MEDIUM_AND_ABOVE',
-          'HARASSMENT': 'BLOCK_MEDIUM_AND_ABOVE',
-          'HATE': 'BLOCK_MEDIUM_AND_ABOVE',
-          'SEXUAL': 'BLOCK_MEDIUM_AND_ABOVE',
-        }),
-        'system_instruction': '''
-          Current time is 05:00:00. Today's date is 2024-05-24.
-          You are a voice assistant for Home Assistant.
-          Answer questions about the world truthfully.
-          Answer in plain text. Keep it simple and to the point.
-        ''',
-        'tools': None,
-      }),
-    ),
-    tuple(
-      '().start_chat',
-      tuple(
-      ),
-      dict({
-        'history': list([
-        ]),
-      }),
-    ),
-    tuple(
-      '().start_chat().send_message_async',
-      tuple(
-        'hello',
-      ),
-      dict({
-      }),
-    ),
-  ])
-# ---
-# name: test_default_prompt[config_entry_options0-0-conversation.google_generative_ai_conversation]
-  list([
-    tuple(
-      '',
-      tuple(
-      ),
-      dict({
-        'generation_config': dict({
-          'max_output_tokens': 150,
-          'temperature': 1.0,
-          'top_k': 64,
-          'top_p': 0.95,
-        }),
-        'model_name': 'models/gemini-1.5-flash-latest',
-        'safety_settings': dict({
-          'DANGEROUS': 'BLOCK_MEDIUM_AND_ABOVE',
-          'HARASSMENT': 'BLOCK_MEDIUM_AND_ABOVE',
-          'HATE': 'BLOCK_MEDIUM_AND_ABOVE',
-          'SEXUAL': 'BLOCK_MEDIUM_AND_ABOVE',
-        }),
-        'system_instruction': '''
-          Current time is 05:00:00. Today's date is 2024-05-24.
-          You are a voice assistant for Home Assistant.
-          Answer questions about the world truthfully.
-          Answer in plain text. Keep it simple and to the point.
-        ''',
-        'tools': None,
-      }),
-    ),
-    tuple(
-      '().start_chat',
-      tuple(
-      ),
-      dict({
-        'history': list([
-        ]),
-      }),
-    ),
-    tuple(
-      '().start_chat().send_message_async',
-      tuple(
-        'hello',
-      ),
-      dict({
-      }),
-    ),
-  ])
-# ---
-# name: test_default_prompt[config_entry_options1-1-None]
-  list([
-    tuple(
-      '',
-      tuple(
-      ),
-      dict({
-        'generation_config': dict({
-          'max_output_tokens': 150,
-          'temperature': 1.0,
-          'top_k': 64,
-          'top_p': 0.95,
-        }),
-        'model_name': 'models/gemini-1.5-flash-latest',
-        'safety_settings': dict({
-          'DANGEROUS': 'BLOCK_MEDIUM_AND_ABOVE',
-          'HARASSMENT': 'BLOCK_MEDIUM_AND_ABOVE',
-          'HATE': 'BLOCK_MEDIUM_AND_ABOVE',
-          'SEXUAL': 'BLOCK_MEDIUM_AND_ABOVE',
-        }),
-        'system_instruction': '''
-          Current time is 05:00:00. Today's date is 2024-05-24.
-          You are a voice assistant for Home Assistant.
-          Answer questions about the world truthfully.
-          Answer in plain text. Keep it simple and to the point.
-          <api_prompt>
-        ''',
-        'tools': None,
-      }),
-    ),
-    tuple(
-      '().start_chat',
-      tuple(
-      ),
-      dict({
-        'history': list([
-        ]),
-      }),
-    ),
-    tuple(
-      '().start_chat().send_message_async',
-      tuple(
-        'hello',
-      ),
-      dict({
-      }),
-    ),
-  ])
-# ---
-# name: test_default_prompt[config_entry_options1-1-conversation.google_generative_ai_conversation]
-  list([
-    tuple(
-      '',
-      tuple(
-      ),
-      dict({
-        'generation_config': dict({
-          'max_output_tokens': 150,
-          'temperature': 1.0,
-          'top_k': 64,
-          'top_p': 0.95,
-        }),
-        'model_name': 'models/gemini-1.5-flash-latest',
-        'safety_settings': dict({
-          'DANGEROUS': 'BLOCK_MEDIUM_AND_ABOVE',
-          'HARASSMENT': 'BLOCK_MEDIUM_AND_ABOVE',
-          'HATE': 'BLOCK_MEDIUM_AND_ABOVE',
-          'SEXUAL': 'BLOCK_MEDIUM_AND_ABOVE',
-        }),
-        'system_instruction': '''
-          Current time is 05:00:00. Today's date is 2024-05-24.
-          You are a voice assistant for Home Assistant.
-          Answer questions about the world truthfully.
-          Answer in plain text. Keep it simple and to the point.
-          <api_prompt>
-        ''',
-        'tools': None,
-      }),
-    ),
-    tuple(
-      '().start_chat',
-      tuple(
-      ),
-      dict({
-        'history': list([
-        ]),
-      }),
-    ),
-    tuple(
-      '().start_chat().send_message_async',
-      tuple(
-        'hello',
-      ),
-      dict({
-      }),
-    ),
-  ])
-# ---
 # name: test_function_call
   list([
     tuple(
@@ -416,102 +6,28 @@
       tuple(
       ),
       dict({
-        'generation_config': dict({
-          'max_output_tokens': 150,
-          'temperature': 1.0,
-          'top_k': 64,
-          'top_p': 0.95,
-        }),
-        'model_name': 'models/gemini-1.5-flash-latest',
-        'safety_settings': dict({
-          'DANGEROUS': 'BLOCK_MEDIUM_AND_ABOVE',
-          'HARASSMENT': 'BLOCK_MEDIUM_AND_ABOVE',
-          'HATE': 'BLOCK_MEDIUM_AND_ABOVE',
-          'SEXUAL': 'BLOCK_MEDIUM_AND_ABOVE',
-        }),
-        'system_instruction': '''
-          Current time is 05:00:00. Today's date is 2024-05-24.
-          You are a voice assistant for Home Assistant.
-          Answer questions about the world truthfully.
-          Answer in plain text. Keep it simple and to the point.
-          Only if the user wants to control a device, tell them to expose entities to their voice assistant in Home Assistant.
-        ''',
-        'tools': list([
-          function_declarations {
-    name: "test_tool"
-    description: "Test function"
-    parameters {
-      type_: OBJECT
-      properties {
-        key: "param3"
-        value {
-          type_: OBJECT
-          properties {
-            key: "json"
-            value {
-              type_: STRING
-            }
-          }
-        }
-      }
-      properties {
-        key: "param2"
-        value {
-          type_: NUMBER
-        }
-      }
-      properties {
-        key: "param1"
-        value {
-          type_: ARRAY
-          description: "Test parameters"
-          items {
-            type_: STRING
-          }
-        }
-      }
-    }
-  }
-  ,
-        ]),
-      }),
-    ),
-    tuple(
-      '().start_chat',
-      tuple(
-      ),
-      dict({
+        'config': GenerateContentConfig(http_options=None, system_instruction="Current time is 05:00:00. Today's date is 2024-05-24.\nYou are a voice assistant for Home Assistant.\nAnswer questions about the world truthfully.\nAnswer in plain text. Keep it simple and to the point.\nOnly if the user wants to control a device, tell them to expose entities to their voice assistant in Home Assistant.", temperature=1.0, top_p=0.95, top_k=64.0, candidate_count=None, max_output_tokens=150, stop_sequences=None, response_logprobs=None, logprobs=None, presence_penalty=None, frequency_penalty=None, seed=None, response_mime_type=None, response_schema=None, routing_config=None, safety_settings=[SafetySetting(method=None, category=<HarmCategory.HARM_CATEGORY_HATE_SPEECH: 'HARM_CATEGORY_HATE_SPEECH'>, threshold=<HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE: 'BLOCK_MEDIUM_AND_ABOVE'>), SafetySetting(method=None, category=<HarmCategory.HARM_CATEGORY_HARASSMENT: 'HARM_CATEGORY_HARASSMENT'>, threshold=<HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE: 'BLOCK_MEDIUM_AND_ABOVE'>), SafetySetting(method=None, category=<HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: 'HARM_CATEGORY_DANGEROUS_CONTENT'>, threshold=<HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE: 'BLOCK_MEDIUM_AND_ABOVE'>), SafetySetting(method=None, category=<HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT: 'HARM_CATEGORY_SEXUALLY_EXPLICIT'>, threshold=<HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE: 'BLOCK_MEDIUM_AND_ABOVE'>)], tools=[Tool(function_declarations=[FunctionDeclaration(response=None, description='Test function', name='test_tool', parameters=Schema(example=None, pattern=None, default=None, max_length=None, title=None, min_length=None, min_properties=None, max_properties=None, any_of=None, description=None, enum=None, format=None, items=None, max_items=None, maximum=None, min_items=None, minimum=None, nullable=None, properties={'param1': Schema(example=None, pattern=None, default=None, max_length=None, title=None, min_length=None, min_properties=None, max_properties=None, any_of=None, description='Test parameters', enum=None, format=None, items=Schema(example=None, pattern=None, default=None, max_length=None, title=None, min_length=None, min_properties=None, max_properties=None, any_of=None, description=None, enum=None, format=None, items=None, max_items=None, maximum=None, min_items=None, minimum=None, nullable=None, properties=None, property_ordering=None, required=None, type=<Type.STRING: 'STRING'>), max_items=None, maximum=None, min_items=None, minimum=None, nullable=None, properties=None, property_ordering=None, required=None, type=<Type.ARRAY: 'ARRAY'>), 'param2': Schema(example=None, pattern=None, default=None, max_length=None, title=None, min_length=None, min_properties=None, max_properties=None, any_of=None, description=None, enum=None, format=None, items=None, max_items=None, maximum=None, min_items=None, minimum=None, nullable=None, properties=None, property_ordering=None, required=None, type=None), 'param3': Schema(example=None, pattern=None, default=None, max_length=None, title=None, min_length=None, min_properties=None, max_properties=None, any_of=None, description=None, enum=None, format=None, items=None, max_items=None, maximum=None, min_items=None, minimum=None, nullable=None, properties={'json': Schema(example=None, pattern=None, default=None, max_length=None, title=None, min_length=None, min_properties=None, max_properties=None, any_of=None, description=None, enum=None, format=None, items=None, max_items=None, maximum=None, min_items=None, minimum=None, nullable=None, properties=None, property_ordering=None, required=None, type=<Type.STRING: 'STRING'>)}, property_ordering=None, required=[], type=<Type.OBJECT: 'OBJECT'>)}, property_ordering=None, required=[], type=<Type.OBJECT: 'OBJECT'>))], retrieval=None, google_search=None, google_search_retrieval=None, code_execution=None)], tool_config=None, labels=None, cached_content=None, response_modalities=None, media_resolution=None, speech_config=None, audio_timestamp=None, automatic_function_calling=AutomaticFunctionCallingConfig(disable=True, maximum_remote_calls=None, ignore_call_history=None), thinking_config=None),
         'history': list([
         ]),
+        'model': 'models/gemini-2.0-flash',
       }),
     ),
     tuple(
-      '().start_chat().send_message_async',
+      '().send_message',
       tuple(
-        'Please call the test function',
       ),
       dict({
+        'message': 'Please call the test function',
       }),
     ),
     tuple(
-      '().start_chat().send_message_async',
+      '().send_message',
       tuple(
-        parts {
-    function_response {
-      name: "test_tool"
-      response {
-        fields {
-          key: "result"
-          value {
-            string_value: "Test response"
-          }
-        }
-      }
-    }
-  }
-  ,
       ),
       dict({
+        'message': list([
+          Part(video_metadata=None, thought=None, code_execution_result=None, executable_code=None, file_data=None, function_call=None, function_response=FunctionResponse(id=None, name='test_tool', response={'result': 'Test response'}), inline_data=None, text=None),
+        ]),
       }),
     ),
   ])
@@ -523,71 +39,61 @@
       tuple(
       ),
       dict({
-        'generation_config': dict({
-          'max_output_tokens': 150,
-          'temperature': 1.0,
-          'top_k': 64,
-          'top_p': 0.95,
-        }),
-        'model_name': 'models/gemini-1.5-flash-latest',
-        'safety_settings': dict({
-          'DANGEROUS': 'BLOCK_MEDIUM_AND_ABOVE',
-          'HARASSMENT': 'BLOCK_MEDIUM_AND_ABOVE',
-          'HATE': 'BLOCK_MEDIUM_AND_ABOVE',
-          'SEXUAL': 'BLOCK_MEDIUM_AND_ABOVE',
-        }),
-        'system_instruction': '''
-          Current time is 05:00:00. Today's date is 2024-05-24.
-          You are a voice assistant for Home Assistant.
-          Answer questions about the world truthfully.
-          Answer in plain text. Keep it simple and to the point.
-          Only if the user wants to control a device, tell them to expose entities to their voice assistant in Home Assistant.
-        ''',
-        'tools': list([
-          function_declarations {
-    name: "test_tool"
-    description: "Test function"
-  }
-  ,
-        ]),
-      }),
-    ),
-    tuple(
-      '().start_chat',
-      tuple(
-      ),
-      dict({
+        'config': GenerateContentConfig(http_options=None, system_instruction="Current time is 05:00:00. Today's date is 2024-05-24.\nYou are a voice assistant for Home Assistant.\nAnswer questions about the world truthfully.\nAnswer in plain text. Keep it simple and to the point.\nOnly if the user wants to control a device, tell them to expose entities to their voice assistant in Home Assistant.", temperature=1.0, top_p=0.95, top_k=64.0, candidate_count=None, max_output_tokens=150, stop_sequences=None, response_logprobs=None, logprobs=None, presence_penalty=None, frequency_penalty=None, seed=None, response_mime_type=None, response_schema=None, routing_config=None, safety_settings=[SafetySetting(method=None, category=<HarmCategory.HARM_CATEGORY_HATE_SPEECH: 'HARM_CATEGORY_HATE_SPEECH'>, threshold=<HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE: 'BLOCK_MEDIUM_AND_ABOVE'>), SafetySetting(method=None, category=<HarmCategory.HARM_CATEGORY_HARASSMENT: 'HARM_CATEGORY_HARASSMENT'>, threshold=<HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE: 'BLOCK_MEDIUM_AND_ABOVE'>), SafetySetting(method=None, category=<HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: 'HARM_CATEGORY_DANGEROUS_CONTENT'>, threshold=<HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE: 'BLOCK_MEDIUM_AND_ABOVE'>), SafetySetting(method=None, category=<HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT: 'HARM_CATEGORY_SEXUALLY_EXPLICIT'>, threshold=<HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE: 'BLOCK_MEDIUM_AND_ABOVE'>)], tools=[Tool(function_declarations=[FunctionDeclaration(response=None, description='Test function', name='test_tool', parameters=None)], retrieval=None, google_search=None, google_search_retrieval=None, code_execution=None)], tool_config=None, labels=None, cached_content=None, response_modalities=None, media_resolution=None, speech_config=None, audio_timestamp=None, automatic_function_calling=AutomaticFunctionCallingConfig(disable=True, maximum_remote_calls=None, ignore_call_history=None), thinking_config=None),
         'history': list([
         ]),
+        'model': 'models/gemini-2.0-flash',
       }),
     ),
     tuple(
-      '().start_chat().send_message_async',
+      '().send_message',
       tuple(
-        'Please call the test function',
       ),
       dict({
+        'message': 'Please call the test function',
       }),
     ),
     tuple(
-      '().start_chat().send_message_async',
+      '().send_message',
       tuple(
-        parts {
-    function_response {
-      name: "test_tool"
-      response {
-        fields {
-          key: "result"
-          value {
-            string_value: "Test response"
-          }
-        }
-      }
-    }
-  }
-  ,
       ),
       dict({
+        'message': list([
+          Part(video_metadata=None, thought=None, code_execution_result=None, executable_code=None, file_data=None, function_call=None, function_response=FunctionResponse(id=None, name='test_tool', response={'result': 'Test response'}), inline_data=None, text=None),
+        ]),
+      }),
+    ),
+  ])
+# ---
+# name: test_use_google_search
+  list([
+    tuple(
+      '',
+      tuple(
+      ),
+      dict({
+        'config': GenerateContentConfig(http_options=None, system_instruction="Current time is 05:00:00. Today's date is 2024-05-24.\nYou are a voice assistant for Home Assistant.\nAnswer questions about the world truthfully.\nAnswer in plain text. Keep it simple and to the point.\nOnly if the user wants to control a device, tell them to expose entities to their voice assistant in Home Assistant.", temperature=1.0, top_p=0.95, top_k=64.0, candidate_count=None, max_output_tokens=150, stop_sequences=None, response_logprobs=None, logprobs=None, presence_penalty=None, frequency_penalty=None, seed=None, response_mime_type=None, response_schema=None, routing_config=None, safety_settings=[SafetySetting(method=None, category=<HarmCategory.HARM_CATEGORY_HATE_SPEECH: 'HARM_CATEGORY_HATE_SPEECH'>, threshold=<HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE: 'BLOCK_MEDIUM_AND_ABOVE'>), SafetySetting(method=None, category=<HarmCategory.HARM_CATEGORY_HARASSMENT: 'HARM_CATEGORY_HARASSMENT'>, threshold=<HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE: 'BLOCK_MEDIUM_AND_ABOVE'>), SafetySetting(method=None, category=<HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: 'HARM_CATEGORY_DANGEROUS_CONTENT'>, threshold=<HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE: 'BLOCK_MEDIUM_AND_ABOVE'>), SafetySetting(method=None, category=<HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT: 'HARM_CATEGORY_SEXUALLY_EXPLICIT'>, threshold=<HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE: 'BLOCK_MEDIUM_AND_ABOVE'>)], tools=[Tool(function_declarations=[FunctionDeclaration(response=None, description='Test function', name='test_tool', parameters=Schema(example=None, pattern=None, default=None, max_length=None, title=None, min_length=None, min_properties=None, max_properties=None, any_of=None, description=None, enum=None, format=None, items=None, max_items=None, maximum=None, min_items=None, minimum=None, nullable=None, properties={'param1': Schema(example=None, pattern=None, default=None, max_length=None, title=None, min_length=None, min_properties=None, max_properties=None, any_of=None, description='Test parameters', enum=None, format=None, items=Schema(example=None, pattern=None, default=None, max_length=None, title=None, min_length=None, min_properties=None, max_properties=None, any_of=None, description=None, enum=None, format=None, items=None, max_items=None, maximum=None, min_items=None, minimum=None, nullable=None, properties=None, property_ordering=None, required=None, type=<Type.STRING: 'STRING'>), max_items=None, maximum=None, min_items=None, minimum=None, nullable=None, properties=None, property_ordering=None, required=None, type=<Type.ARRAY: 'ARRAY'>), 'param2': Schema(example=None, pattern=None, default=None, max_length=None, title=None, min_length=None, min_properties=None, max_properties=None, any_of=None, description=None, enum=None, format=None, items=None, max_items=None, maximum=None, min_items=None, minimum=None, nullable=None, properties=None, property_ordering=None, required=None, type=None), 'param3': Schema(example=None, pattern=None, default=None, max_length=None, title=None, min_length=None, min_properties=None, max_properties=None, any_of=None, description=None, enum=None, format=None, items=None, max_items=None, maximum=None, min_items=None, minimum=None, nullable=None, properties={'json': Schema(example=None, pattern=None, default=None, max_length=None, title=None, min_length=None, min_properties=None, max_properties=None, any_of=None, description=None, enum=None, format=None, items=None, max_items=None, maximum=None, min_items=None, minimum=None, nullable=None, properties=None, property_ordering=None, required=None, type=<Type.STRING: 'STRING'>)}, property_ordering=None, required=[], type=<Type.OBJECT: 'OBJECT'>)}, property_ordering=None, required=[], type=<Type.OBJECT: 'OBJECT'>))], retrieval=None, google_search=None, google_search_retrieval=None, code_execution=None), Tool(function_declarations=None, retrieval=None, google_search=GoogleSearch(), google_search_retrieval=None, code_execution=None)], tool_config=None, labels=None, cached_content=None, response_modalities=None, media_resolution=None, speech_config=None, audio_timestamp=None, automatic_function_calling=AutomaticFunctionCallingConfig(disable=True, maximum_remote_calls=None, ignore_call_history=None), thinking_config=None),
+        'history': list([
+        ]),
+        'model': 'models/gemini-2.0-flash',
+      }),
+    ),
+    tuple(
+      '().send_message',
+      tuple(
+      ),
+      dict({
+        'message': 'Please call the test function',
+      }),
+    ),
+    tuple(
+      '().send_message',
+      tuple(
+      ),
+      dict({
+        'message': list([
+          Part(video_metadata=None, thought=None, code_execution_result=None, executable_code=None, file_data=None, function_call=None, function_response=FunctionResponse(id=None, name='test_tool', response={'result': 'Test response'}), inline_data=None, text=None),
+        ]),
       }),
     ),
   ])
diff --git a/tests/components/google_generative_ai_conversation/snapshots/test_diagnostics.ambr b/tests/components/google_generative_ai_conversation/snapshots/test_diagnostics.ambr
index 316bf74b72a..b445499ad49 100644
--- a/tests/components/google_generative_ai_conversation/snapshots/test_diagnostics.ambr
+++ b/tests/components/google_generative_ai_conversation/snapshots/test_diagnostics.ambr
@@ -5,7 +5,7 @@
       'api_key': '**REDACTED**',
     }),
     'options': dict({
-      'chat_model': 'models/gemini-1.5-flash-latest',
+      'chat_model': 'models/gemini-2.0-flash',
       'dangerous_block_threshold': 'BLOCK_MEDIUM_AND_ABOVE',
       'harassment_block_threshold': 'BLOCK_MEDIUM_AND_ABOVE',
       'hate_block_threshold': 'BLOCK_MEDIUM_AND_ABOVE',
diff --git a/tests/components/google_generative_ai_conversation/snapshots/test_init.ambr b/tests/components/google_generative_ai_conversation/snapshots/test_init.ambr
index f68f4c6bf14..ce882adf6e6 100644
--- a/tests/components/google_generative_ai_conversation/snapshots/test_init.ambr
+++ b/tests/components/google_generative_ai_conversation/snapshots/test_init.ambr
@@ -6,21 +6,12 @@
       tuple(
       ),
       dict({
-        'model_name': 'models/gemini-1.5-flash-latest',
-      }),
-    ),
-    tuple(
-      '().generate_content_async',
-      tuple(
-        list([
+        'contents': list([
           'Describe this image from my doorbell camera',
-          dict({
-            'data': b'image bytes',
-            'mime_type': 'image/jpeg',
-          }),
+          b'some file',
+          b'some file',
         ]),
-      ),
-      dict({
+        'model': 'models/gemini-2.0-flash',
       }),
     ),
   ])
@@ -32,17 +23,25 @@
       tuple(
       ),
       dict({
-        'model_name': 'models/gemini-1.5-flash-latest',
-      }),
-    ),
-    tuple(
-      '().generate_content_async',
-      tuple(
-        list([
+        'contents': list([
           'Write an opening speech for a Home Assistant release party',
         ]),
-      ),
-      dict({
+        'model': 'models/gemini-2.0-flash',
+      }),
+    ),
+  ])
+# ---
+# name: test_load_entry_with_unloaded_entries
+  list([
+    tuple(
+      '',
+      tuple(
+      ),
+      dict({
+        'contents': list([
+          'Write an opening speech for a Home Assistant release party',
+        ]),
+        'model': 'models/gemini-2.0-flash',
       }),
     ),
   ])
diff --git a/tests/components/google_generative_ai_conversation/test_config_flow.py b/tests/components/google_generative_ai_conversation/test_config_flow.py
index d4992c732e1..f7635c0b45e 100644
--- a/tests/components/google_generative_ai_conversation/test_config_flow.py
+++ b/tests/components/google_generative_ai_conversation/test_config_flow.py
@@ -1,10 +1,9 @@
 """Test the Google Generative AI Conversation config flow."""
 
-from unittest.mock import AsyncMock, Mock, patch
+from unittest.mock import Mock, patch
 
-from google.api_core.exceptions import ClientError, DeadlineExceeded
-from google.rpc.error_details_pb2 import ErrorInfo  # pylint: disable=no-name-in-module
 import pytest
+from requests.exceptions import Timeout
 
 from homeassistant import config_entries
 from homeassistant.components.google_generative_ai_conversation.config_flow import (
@@ -22,43 +21,60 @@ from homeassistant.components.google_generative_ai_conversation.const import (
     CONF_TEMPERATURE,
     CONF_TOP_K,
     CONF_TOP_P,
+    CONF_USE_GOOGLE_SEARCH_TOOL,
     DOMAIN,
     RECOMMENDED_CHAT_MODEL,
     RECOMMENDED_HARM_BLOCK_THRESHOLD,
     RECOMMENDED_MAX_TOKENS,
     RECOMMENDED_TOP_K,
     RECOMMENDED_TOP_P,
+    RECOMMENDED_USE_GOOGLE_SEARCH_TOOL,
 )
 from homeassistant.const import CONF_LLM_HASS_API
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
+from . import CLIENT_ERROR_500, CLIENT_ERROR_API_KEY_INVALID
+
 from tests.common import MockConfigEntry
 
 
 @pytest.fixture
 def mock_models():
     """Mock the model list API."""
+    model_20_flash = Mock(
+        display_name="Gemini 2.0 Flash",
+        supported_actions=["generateContent"],
+    )
+    model_20_flash.name = "models/gemini-2.0-flash"
+
     model_15_flash = Mock(
         display_name="Gemini 1.5 Flash",
-        supported_generation_methods=["generateContent"],
+        supported_actions=["generateContent"],
     )
     model_15_flash.name = "models/gemini-1.5-flash-latest"
 
     model_15_pro = Mock(
         display_name="Gemini 1.5 Pro",
-        supported_generation_methods=["generateContent"],
+        supported_actions=["generateContent"],
     )
     model_15_pro.name = "models/gemini-1.5-pro-latest"
 
     model_10_pro = Mock(
         display_name="Gemini 1.0 Pro",
-        supported_generation_methods=["generateContent"],
+        supported_actions=["generateContent"],
     )
     model_10_pro.name = "models/gemini-pro"
+
+    async def models_pager():
+        yield model_20_flash
+        yield model_15_flash
+        yield model_15_pro
+        yield model_10_pro
+
     with patch(
-        "homeassistant.components.google_generative_ai_conversation.config_flow.genai.list_models",
-        return_value=iter([model_15_flash, model_15_pro, model_10_pro]),
+        "google.genai.models.AsyncModels.list",
+        return_value=models_pager(),
     ):
         yield
 
@@ -80,7 +96,7 @@ async def test_form(hass: HomeAssistant) -> None:
 
     with (
         patch(
-            "google.ai.generativelanguage_v1beta.ModelServiceAsyncClient.list_models",
+            "google.genai.models.AsyncModels.list",
         ),
         patch(
             "homeassistant.components.google_generative_ai_conversation.async_setup_entry",
@@ -129,6 +145,7 @@ async def test_form(hass: HomeAssistant) -> None:
                 CONF_HATE_BLOCK_THRESHOLD: RECOMMENDED_HARM_BLOCK_THRESHOLD,
                 CONF_SEXUAL_BLOCK_THRESHOLD: RECOMMENDED_HARM_BLOCK_THRESHOLD,
                 CONF_DANGEROUS_BLOCK_THRESHOLD: RECOMMENDED_HARM_BLOCK_THRESHOLD,
+                CONF_USE_GOOGLE_SEARCH_TOOL: RECOMMENDED_USE_GOOGLE_SEARCH_TOOL,
             },
         ),
         (
@@ -164,7 +181,11 @@ async def test_options_switching(
     expected_options,
 ) -> None:
     """Test the options form."""
-    hass.config_entries.async_update_entry(mock_config_entry, options=current_options)
+    with patch("google.genai.models.AsyncModels.get"):
+        hass.config_entries.async_update_entry(
+            mock_config_entry, options=current_options
+        )
+        await hass.async_block_till_done()
     options_flow = await hass.config_entries.options.async_init(
         mock_config_entry.entry_id
     )
@@ -189,17 +210,15 @@ async def test_options_switching(
     ("side_effect", "error"),
     [
         (
-            ClientError("some error"),
+            CLIENT_ERROR_500,
             "cannot_connect",
         ),
         (
-            DeadlineExceeded("deadline exceeded"),
+            Timeout("deadline exceeded"),
             "cannot_connect",
         ),
         (
-            ClientError(
-                "invalid api key", error_info=ErrorInfo(reason="API_KEY_INVALID")
-            ),
+            CLIENT_ERROR_API_KEY_INVALID,
             "invalid_auth",
         ),
         (Exception, "unknown"),
@@ -211,12 +230,7 @@ async def test_form_errors(hass: HomeAssistant, side_effect, error) -> None:
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
 
-    mock_client = AsyncMock()
-    mock_client.list_models.side_effect = side_effect
-    with patch(
-        "google.ai.generativelanguage_v1beta.ModelServiceAsyncClient",
-        return_value=mock_client,
-    ):
+    with patch("google.genai.models.AsyncModels.list", side_effect=side_effect):
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             {
@@ -253,7 +267,7 @@ async def test_reauth_flow(hass: HomeAssistant) -> None:
 
     with (
         patch(
-            "google.ai.generativelanguage_v1beta.ModelServiceAsyncClient.list_models",
+            "google.genai.models.AsyncModels.list",
         ),
         patch(
             "homeassistant.components.google_generative_ai_conversation.async_setup_entry",
diff --git a/tests/components/google_generative_ai_conversation/test_conversation.py b/tests/components/google_generative_ai_conversation/test_conversation.py
index df0b11487d8..a2b238b9399 100644
--- a/tests/components/google_generative_ai_conversation/test_conversation.py
+++ b/tests/components/google_generative_ai_conversation/test_conversation.py
@@ -1,32 +1,28 @@
 """Tests for the Google Generative AI Conversation integration conversation platform."""
 
 from typing import Any
-from unittest.mock import AsyncMock, MagicMock, patch
+from unittest.mock import AsyncMock, Mock, patch
 
 from freezegun import freeze_time
-from google.ai.generativelanguage_v1beta.types.content import FunctionCall
-from google.api_core.exceptions import GoogleAPIError
-import google.generativeai.types as genai_types
+from google.genai.types import FunctionCall
 import pytest
 from syrupy.assertion import SnapshotAssertion
 import voluptuous as vol
 
 from homeassistant.components import conversation
-from homeassistant.components.conversation import trace
-from homeassistant.components.google_generative_ai_conversation.const import (
-    CONF_CHAT_MODEL,
-)
+from homeassistant.components.conversation import UserContent, async_get_chat_log, trace
 from homeassistant.components.google_generative_ai_conversation.conversation import (
     _escape_decode,
     _format_schema,
 )
-from homeassistant.const import ATTR_SUPPORTED_FEATURES, CONF_LLM_HASS_API
+from homeassistant.const import CONF_LLM_HASS_API
 from homeassistant.core import Context, HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import intent, llm
+from homeassistant.helpers import chat_session, intent, llm
+
+from . import CLIENT_ERROR_500
 
 from tests.common import MockConfigEntry
-from tests.typing import WebSocketGenerator
 
 
 @pytest.fixture(autouse=True)
@@ -36,147 +32,18 @@ def freeze_the_time():
         yield
 
 
-@pytest.mark.parametrize(
-    "agent_id", [None, "conversation.google_generative_ai_conversation"]
-)
-@pytest.mark.parametrize(
-    ("config_entry_options", "expected_features"),
-    [
-        ({}, 0),
-        (
-            {CONF_LLM_HASS_API: llm.LLM_API_ASSIST},
-            conversation.ConversationEntityFeature.CONTROL,
-        ),
-    ],
-)
-@pytest.mark.usefixtures("mock_init_component")
-async def test_default_prompt(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    snapshot: SnapshotAssertion,
-    agent_id: str | None,
-    config_entry_options: {},
-    expected_features: conversation.ConversationEntityFeature,
-    hass_ws_client: WebSocketGenerator,
-) -> None:
-    """Test that the default prompt works."""
-    entry = MockConfigEntry(title=None)
-    entry.add_to_hass(hass)
-
-    if agent_id is None:
-        agent_id = mock_config_entry.entry_id
-
-    hass.config_entries.async_update_entry(
-        mock_config_entry,
-        options={**mock_config_entry.options, **config_entry_options},
-    )
-
-    with (
-        patch("google.generativeai.GenerativeModel") as mock_model,
-        patch(
-            "homeassistant.components.google_generative_ai_conversation.conversation.llm.AssistAPI._async_get_tools",
-            return_value=[],
-        ) as mock_get_tools,
-        patch(
-            "homeassistant.components.google_generative_ai_conversation.conversation.llm.AssistAPI._async_get_api_prompt",
-            return_value="<api_prompt>",
-        ),
-    ):
-        mock_chat = AsyncMock()
-        mock_model.return_value.start_chat.return_value = mock_chat
-        chat_response = MagicMock()
-        mock_chat.send_message_async.return_value = chat_response
-        mock_part = MagicMock()
-        mock_part.function_call = None
-        mock_part.text = "Hi there!\n"
-        chat_response.parts = [mock_part]
-        result = await conversation.async_converse(
-            hass,
-            "hello",
-            None,
-            Context(),
-            agent_id=agent_id,
-        )
-
-    assert result.response.response_type == intent.IntentResponseType.ACTION_DONE
-    assert result.response.as_dict()["speech"]["plain"]["speech"] == "Hi there!"
-    assert [tuple(mock_call) for mock_call in mock_model.mock_calls] == snapshot
-    assert mock_get_tools.called == (CONF_LLM_HASS_API in config_entry_options)
-
-    state = hass.states.get("conversation.google_generative_ai_conversation")
-    assert state.attributes[ATTR_SUPPORTED_FEATURES] == expected_features
-
-
-@pytest.mark.parametrize(
-    ("model_name", "supports_system_instruction"),
-    [("models/gemini-1.5-pro", True), ("models/gemini-1.0-pro", False)],
-)
-@pytest.mark.usefixtures("mock_init_component")
-async def test_chat_history(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    model_name: str,
-    supports_system_instruction: bool,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test that the agent keeps track of the chat history."""
-    hass.config_entries.async_update_entry(
-        mock_config_entry, options={CONF_CHAT_MODEL: model_name}
-    )
-    with patch("google.generativeai.GenerativeModel") as mock_model:
-        mock_chat = AsyncMock()
-        mock_model.return_value.start_chat.return_value = mock_chat
-        chat_response = MagicMock()
-        mock_chat.send_message_async.return_value = chat_response
-        mock_part = MagicMock()
-        mock_part.function_call = None
-        mock_part.text = "1st model response"
-        chat_response.parts = [mock_part]
-        if supports_system_instruction:
-            mock_chat.history = []
-        else:
-            mock_chat.history = [
-                {"role": "user", "parts": "prompt"},
-                {"role": "model", "parts": "Ok"},
-            ]
-        mock_chat.history += [
-            {"role": "user", "parts": "1st user request"},
-            {"role": "model", "parts": "1st model response"},
-        ]
-        result = await conversation.async_converse(
-            hass,
-            "1st user request",
-            None,
-            Context(),
-            agent_id=mock_config_entry.entry_id,
-        )
-        assert result.response.response_type == intent.IntentResponseType.ACTION_DONE
-        assert (
-            result.response.as_dict()["speech"]["plain"]["speech"]
-            == "1st model response"
-        )
-        mock_part.text = "2nd model response"
-        chat_response.parts = [mock_part]
-        result = await conversation.async_converse(
-            hass,
-            "2nd user request",
-            result.conversation_id,
-            Context(),
-            agent_id=mock_config_entry.entry_id,
-        )
-        assert result.response.response_type == intent.IntentResponseType.ACTION_DONE
-        assert (
-            result.response.as_dict()["speech"]["plain"]["speech"]
-            == "2nd model response"
-        )
-
-    assert [tuple(mock_call) for mock_call in mock_model.mock_calls] == snapshot
+@pytest.fixture(autouse=True)
+def mock_ulid_tools():
+    """Mock generated ULIDs for tool calls."""
+    with patch("homeassistant.helpers.llm.ulid_now", return_value="mock-tool-call"):
+        yield
 
 
 @patch(
     "homeassistant.components.google_generative_ai_conversation.conversation.llm.AssistAPI._async_get_tools"
 )
 @pytest.mark.usefixtures("mock_init_component")
+@pytest.mark.usefixtures("mock_ulid_tools")
 async def test_function_call(
     mock_get_tools,
     hass: HomeAssistant,
@@ -184,7 +51,7 @@ async def test_function_call(
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test function calling."""
-    agent_id = mock_config_entry_with_assist.entry_id
+    agent_id = "conversation.google_generative_ai_conversation"
     context = Context()
 
     mock_tool = AsyncMock()
@@ -202,12 +69,13 @@ async def test_function_call(
 
     mock_get_tools.return_value = [mock_tool]
 
-    with patch("google.generativeai.GenerativeModel") as mock_model:
+    with patch("google.genai.chats.AsyncChats.create") as mock_create:
         mock_chat = AsyncMock()
-        mock_model.return_value.start_chat.return_value = mock_chat
-        chat_response = MagicMock()
-        mock_chat.send_message_async.return_value = chat_response
-        mock_part = MagicMock()
+        mock_create.return_value.send_message = mock_chat
+        chat_response = Mock(prompt_feedback=None)
+        mock_chat.return_value = chat_response
+        mock_part = Mock()
+        mock_part.text = ""
         mock_part.function_call = FunctionCall(
             name="test_tool",
             args={
@@ -224,7 +92,7 @@ async def test_function_call(
             return {"result": "Test response"}
 
         mock_tool.async_call.side_effect = tool_call
-        chat_response.parts = [mock_part]
+        chat_response.candidates = [Mock(content=Mock(parts=[mock_part]))]
         result = await conversation.async_converse(
             hass,
             "Please call the test function",
@@ -236,25 +104,30 @@ async def test_function_call(
 
     assert result.response.response_type == intent.IntentResponseType.ACTION_DONE
     assert result.response.as_dict()["speech"]["plain"]["speech"] == "Hi there!"
-    mock_tool_call = mock_chat.send_message_async.mock_calls[1][1][0]
-    mock_tool_call = type(mock_tool_call).to_dict(mock_tool_call)
-    assert mock_tool_call == {
-        "parts": [
-            {
-                "function_response": {
-                    "name": "test_tool",
-                    "response": {
-                        "result": "Test response",
-                    },
-                },
+    mock_tool_response_parts = mock_create.mock_calls[2][2]["message"]
+    assert len(mock_tool_response_parts) == 1
+    assert mock_tool_response_parts[0].model_dump() == {
+        "code_execution_result": None,
+        "executable_code": None,
+        "file_data": None,
+        "function_call": None,
+        "function_response": {
+            "id": None,
+            "name": "test_tool",
+            "response": {
+                "result": "Test response",
             },
-        ],
-        "role": "",
+        },
+        "inline_data": None,
+        "text": None,
+        "thought": None,
+        "video_metadata": None,
     }
 
     mock_tool.async_call.assert_awaited_once_with(
         hass,
         llm.ToolInput(
+            id="mock-tool-call",
             tool_name="test_tool",
             tool_args={
                 "param1": ["test_value", "param1's value"],
@@ -270,7 +143,7 @@ async def test_function_call(
             device_id="test_device",
         ),
     )
-    assert [tuple(mock_call) for mock_call in mock_model.mock_calls] == snapshot
+    assert [tuple(mock_call) for mock_call in mock_create.mock_calls] == snapshot
 
     # Test conversating tracing
     traces = trace.async_get_traces()
@@ -279,13 +152,90 @@ async def test_function_call(
     trace_events = last_trace.get("events", [])
     assert [event["event_type"] for event in trace_events] == [
         trace.ConversationTraceEventType.ASYNC_PROCESS,
-        trace.ConversationTraceEventType.AGENT_DETAIL,
+        trace.ConversationTraceEventType.AGENT_DETAIL,  # prompt and tools
+        trace.ConversationTraceEventType.AGENT_DETAIL,  # stats for response
         trace.ConversationTraceEventType.TOOL_CALL,
+        trace.ConversationTraceEventType.AGENT_DETAIL,  # stats for response
     ]
     # AGENT_DETAIL event contains the raw prompt passed to the model
     detail_event = trace_events[1]
-    assert "Answer in plain text" in detail_event["data"]["prompt"]
-    assert [t.name for t in detail_event["data"]["tools"]] == ["test_tool"]
+    assert "Answer in plain text" in detail_event["data"]["messages"][0]["content"]
+    assert [
+        p["tool_name"] for p in detail_event["data"]["messages"][2]["tool_calls"]
+    ] == ["test_tool"]
+
+    detail_event = trace_events[2]
+    assert set(detail_event["data"]["stats"].keys()) == {
+        "input_tokens",
+        "cached_input_tokens",
+        "output_tokens",
+    }
+
+
+@patch(
+    "homeassistant.components.google_generative_ai_conversation.conversation.llm.AssistAPI._async_get_tools"
+)
+@pytest.mark.usefixtures("mock_init_component")
+@pytest.mark.usefixtures("mock_ulid_tools")
+async def test_use_google_search(
+    mock_get_tools,
+    hass: HomeAssistant,
+    mock_config_entry_with_google_search: MockConfigEntry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test function calling."""
+    agent_id = "conversation.google_generative_ai_conversation"
+    context = Context()
+
+    mock_tool = AsyncMock()
+    mock_tool.name = "test_tool"
+    mock_tool.description = "Test function"
+    mock_tool.parameters = vol.Schema(
+        {
+            vol.Optional("param1", description="Test parameters"): [
+                vol.All(str, vol.Lower)
+            ],
+            vol.Optional("param2"): vol.Any(float, int),
+            vol.Optional("param3"): dict,
+        }
+    )
+
+    mock_get_tools.return_value = [mock_tool]
+
+    with patch("google.genai.chats.AsyncChats.create") as mock_create:
+        mock_chat = AsyncMock()
+        mock_create.return_value.send_message = mock_chat
+        chat_response = Mock(prompt_feedback=None)
+        mock_chat.return_value = chat_response
+        mock_part = Mock()
+        mock_part.text = ""
+        mock_part.function_call = FunctionCall(
+            name="test_tool",
+            args={
+                "param1": ["test_value", "param1\\'s value"],
+                "param2": 2.7,
+            },
+        )
+
+        def tool_call(
+            hass: HomeAssistant, tool_input: llm.ToolInput, tool_context: llm.LLMContext
+        ) -> dict[str, Any]:
+            mock_part.function_call = None
+            mock_part.text = "Hi there!"
+            return {"result": "Test response"}
+
+        mock_tool.async_call.side_effect = tool_call
+        chat_response.candidates = [Mock(content=Mock(parts=[mock_part]))]
+        await conversation.async_converse(
+            hass,
+            "Please call the test function",
+            None,
+            context,
+            agent_id=agent_id,
+            device_id="test_device",
+        )
+
+    assert [tuple(mock_call) for mock_call in mock_create.mock_calls] == snapshot
 
 
 @patch(
@@ -299,7 +249,7 @@ async def test_function_call_without_parameters(
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test function calling without parameters."""
-    agent_id = mock_config_entry_with_assist.entry_id
+    agent_id = "conversation.google_generative_ai_conversation"
     context = Context()
 
     mock_tool = AsyncMock()
@@ -309,12 +259,13 @@ async def test_function_call_without_parameters(
 
     mock_get_tools.return_value = [mock_tool]
 
-    with patch("google.generativeai.GenerativeModel") as mock_model:
+    with patch("google.genai.chats.AsyncChats.create") as mock_create:
         mock_chat = AsyncMock()
-        mock_model.return_value.start_chat.return_value = mock_chat
-        chat_response = MagicMock()
-        mock_chat.send_message_async.return_value = chat_response
-        mock_part = MagicMock()
+        mock_create.return_value.send_message = mock_chat
+        chat_response = Mock(prompt_feedback=None)
+        mock_chat.return_value = chat_response
+        mock_part = Mock()
+        mock_part.text = ""
         mock_part.function_call = FunctionCall(name="test_tool", args={})
 
         def tool_call(
@@ -325,7 +276,7 @@ async def test_function_call_without_parameters(
             return {"result": "Test response"}
 
         mock_tool.async_call.side_effect = tool_call
-        chat_response.parts = [mock_part]
+        chat_response.candidates = [Mock(content=Mock(parts=[mock_part]))]
         result = await conversation.async_converse(
             hass,
             "Please call the test function",
@@ -337,25 +288,30 @@ async def test_function_call_without_parameters(
 
     assert result.response.response_type == intent.IntentResponseType.ACTION_DONE
     assert result.response.as_dict()["speech"]["plain"]["speech"] == "Hi there!"
-    mock_tool_call = mock_chat.send_message_async.mock_calls[1][1][0]
-    mock_tool_call = type(mock_tool_call).to_dict(mock_tool_call)
-    assert mock_tool_call == {
-        "parts": [
-            {
-                "function_response": {
-                    "name": "test_tool",
-                    "response": {
-                        "result": "Test response",
-                    },
-                },
+    mock_tool_response_parts = mock_create.mock_calls[2][2]["message"]
+    assert len(mock_tool_response_parts) == 1
+    assert mock_tool_response_parts[0].model_dump() == {
+        "code_execution_result": None,
+        "executable_code": None,
+        "file_data": None,
+        "function_call": None,
+        "function_response": {
+            "id": None,
+            "name": "test_tool",
+            "response": {
+                "result": "Test response",
             },
-        ],
-        "role": "",
+        },
+        "inline_data": None,
+        "text": None,
+        "thought": None,
+        "video_metadata": None,
     }
 
     mock_tool.async_call.assert_awaited_once_with(
         hass,
         llm.ToolInput(
+            id="mock-tool-call",
             tool_name="test_tool",
             tool_args={},
         ),
@@ -368,7 +324,7 @@ async def test_function_call_without_parameters(
             device_id="test_device",
         ),
     )
-    assert [tuple(mock_call) for mock_call in mock_model.mock_calls] == snapshot
+    assert [tuple(mock_call) for mock_call in mock_create.mock_calls] == snapshot
 
 
 @patch(
@@ -381,7 +337,7 @@ async def test_function_exception(
     mock_config_entry_with_assist: MockConfigEntry,
 ) -> None:
     """Test exception in function calling."""
-    agent_id = mock_config_entry_with_assist.entry_id
+    agent_id = "conversation.google_generative_ai_conversation"
     context = Context()
 
     mock_tool = AsyncMock()
@@ -397,12 +353,13 @@ async def test_function_exception(
 
     mock_get_tools.return_value = [mock_tool]
 
-    with patch("google.generativeai.GenerativeModel") as mock_model:
+    with patch("google.genai.chats.AsyncChats.create") as mock_create:
         mock_chat = AsyncMock()
-        mock_model.return_value.start_chat.return_value = mock_chat
-        chat_response = MagicMock()
-        mock_chat.send_message_async.return_value = chat_response
-        mock_part = MagicMock()
+        mock_create.return_value.send_message = mock_chat
+        chat_response = Mock(prompt_feedback=None)
+        mock_chat.return_value = chat_response
+        mock_part = Mock()
+        mock_part.text = ""
         mock_part.function_call = FunctionCall(name="test_tool", args={"param1": 1})
 
         def tool_call(
@@ -413,7 +370,7 @@ async def test_function_exception(
             raise HomeAssistantError("Test tool exception")
 
         mock_tool.async_call.side_effect = tool_call
-        chat_response.parts = [mock_part]
+        chat_response.candidates = [Mock(content=Mock(parts=[mock_part]))]
         result = await conversation.async_converse(
             hass,
             "Please call the test function",
@@ -425,25 +382,30 @@ async def test_function_exception(
 
     assert result.response.response_type == intent.IntentResponseType.ACTION_DONE
     assert result.response.as_dict()["speech"]["plain"]["speech"] == "Hi there!"
-    mock_tool_call = mock_chat.send_message_async.mock_calls[1][1][0]
-    mock_tool_call = type(mock_tool_call).to_dict(mock_tool_call)
-    assert mock_tool_call == {
-        "parts": [
-            {
-                "function_response": {
-                    "name": "test_tool",
-                    "response": {
-                        "error": "HomeAssistantError",
-                        "error_text": "Test tool exception",
-                    },
-                },
+    mock_tool_response_parts = mock_create.mock_calls[2][2]["message"]
+    assert len(mock_tool_response_parts) == 1
+    assert mock_tool_response_parts[0].model_dump() == {
+        "code_execution_result": None,
+        "executable_code": None,
+        "file_data": None,
+        "function_call": None,
+        "function_response": {
+            "id": None,
+            "name": "test_tool",
+            "response": {
+                "error": "HomeAssistantError",
+                "error_text": "Test tool exception",
             },
-        ],
-        "role": "",
+        },
+        "inline_data": None,
+        "text": None,
+        "thought": None,
+        "video_metadata": None,
     }
     mock_tool.async_call.assert_awaited_once_with(
         hass,
         llm.ToolInput(
+            id="mock-tool-call",
             tool_name="test_tool",
             tool_args={"param1": 1},
         ),
@@ -463,18 +425,22 @@ async def test_error_handling(
     hass: HomeAssistant, mock_config_entry: MockConfigEntry
 ) -> None:
     """Test that client errors are caught."""
-    with patch("google.generativeai.GenerativeModel") as mock_model:
+    with patch("google.genai.chats.AsyncChats.create") as mock_create:
         mock_chat = AsyncMock()
-        mock_model.return_value.start_chat.return_value = mock_chat
-        mock_chat.send_message_async.side_effect = GoogleAPIError("some error")
+        mock_create.return_value.send_message = mock_chat
+        mock_chat.side_effect = CLIENT_ERROR_500
         result = await conversation.async_converse(
-            hass, "hello", None, Context(), agent_id=mock_config_entry.entry_id
+            hass,
+            "hello",
+            None,
+            Context(),
+            agent_id="conversation.google_generative_ai_conversation",
         )
 
     assert result.response.response_type == intent.IntentResponseType.ERROR, result
     assert result.response.error_code == "unknown", result
     assert result.response.as_dict()["speech"]["plain"]["speech"] == (
-        "Sorry, I had a problem talking to Google Generative AI: some error"
+        "Sorry, I had a problem talking to Google Generative AI: 500 internal-error. {'message': 'Internal Server Error', 'status': 'internal-error'}"
     )
 
 
@@ -483,20 +449,24 @@ async def test_blocked_response(
     hass: HomeAssistant, mock_config_entry: MockConfigEntry
 ) -> None:
     """Test blocked response."""
-    with patch("google.generativeai.GenerativeModel") as mock_model:
+    with patch("google.genai.chats.AsyncChats.create") as mock_create:
         mock_chat = AsyncMock()
-        mock_model.return_value.start_chat.return_value = mock_chat
-        mock_chat.send_message_async.side_effect = genai_types.StopCandidateException(
-            "finish_reason: SAFETY\n"
-        )
+        mock_create.return_value.send_message = mock_chat
+        chat_response = Mock(prompt_feedback=Mock(block_reason_message="SAFETY"))
+        mock_chat.return_value = chat_response
+
         result = await conversation.async_converse(
-            hass, "hello", None, Context(), agent_id=mock_config_entry.entry_id
+            hass,
+            "hello",
+            None,
+            Context(),
+            agent_id="conversation.google_generative_ai_conversation",
         )
 
     assert result.response.response_type == intent.IntentResponseType.ERROR, result
     assert result.response.error_code == "unknown", result
     assert result.response.as_dict()["speech"]["plain"]["speech"] == (
-        "The message got blocked by your safety settings"
+        "The message got blocked due to content violations, reason: SAFETY"
     )
 
 
@@ -505,14 +475,18 @@ async def test_empty_response(
     hass: HomeAssistant, mock_config_entry: MockConfigEntry
 ) -> None:
     """Test empty response."""
-    with patch("google.generativeai.GenerativeModel") as mock_model:
+    with patch("google.genai.chats.AsyncChats.create") as mock_create:
         mock_chat = AsyncMock()
-        mock_model.return_value.start_chat.return_value = mock_chat
-        chat_response = MagicMock()
-        mock_chat.send_message_async.return_value = chat_response
-        chat_response.parts = []
+        mock_create.return_value.send_message = mock_chat
+        chat_response = Mock(prompt_feedback=None)
+        mock_chat.return_value = chat_response
+        chat_response.candidates = [Mock(content=Mock(parts=[]))]
         result = await conversation.async_converse(
-            hass, "hello", None, Context(), agent_id=mock_config_entry.entry_id
+            hass,
+            "hello",
+            None,
+            Context(),
+            agent_id="conversation.google_generative_ai_conversation",
         )
 
     assert result.response.response_type == intent.IntentResponseType.ERROR, result
@@ -523,96 +497,32 @@ async def test_empty_response(
 
 
 @pytest.mark.usefixtures("mock_init_component")
-async def test_invalid_llm_api(
+async def test_converse_error(
     hass: HomeAssistant, mock_config_entry: MockConfigEntry
 ) -> None:
-    """Test handling of invalid llm api."""
-    hass.config_entries.async_update_entry(
-        mock_config_entry,
-        options={**mock_config_entry.options, CONF_LLM_HASS_API: "invalid_llm_api"},
-    )
+    """Test handling ChatLog raising ConverseError."""
+    with patch("google.genai.models.AsyncModels.get"):
+        hass.config_entries.async_update_entry(
+            mock_config_entry,
+            options={**mock_config_entry.options, CONF_LLM_HASS_API: "invalid_llm_api"},
+        )
+        await hass.async_block_till_done()
 
     result = await conversation.async_converse(
         hass,
         "hello",
         None,
         Context(),
-        agent_id=mock_config_entry.entry_id,
+        agent_id="conversation.google_generative_ai_conversation",
     )
 
     assert result.response.response_type == intent.IntentResponseType.ERROR, result
     assert result.response.error_code == "unknown", result
     assert result.response.as_dict()["speech"]["plain"]["speech"] == (
-        "Error preparing LLM API: API invalid_llm_api not found"
+        "Error preparing LLM API"
     )
 
 
-async def test_template_error(
-    hass: HomeAssistant, mock_config_entry: MockConfigEntry
-) -> None:
-    """Test that template error handling works."""
-    hass.config_entries.async_update_entry(
-        mock_config_entry,
-        options={
-            "prompt": "talk like a {% if True %}smarthome{% else %}pirate please.",
-        },
-    )
-    with patch("google.generativeai.GenerativeModel"):
-        await hass.config_entries.async_setup(mock_config_entry.entry_id)
-        await hass.async_block_till_done()
-        result = await conversation.async_converse(
-            hass, "hello", None, Context(), agent_id=mock_config_entry.entry_id
-        )
-
-    assert result.response.response_type == intent.IntentResponseType.ERROR, result
-    assert result.response.error_code == "unknown", result
-
-
-async def test_template_variables(
-    hass: HomeAssistant, mock_config_entry: MockConfigEntry
-) -> None:
-    """Test that template variables work."""
-    context = Context(user_id="12345")
-    mock_user = MagicMock()
-    mock_user.id = "12345"
-    mock_user.name = "Test User"
-
-    hass.config_entries.async_update_entry(
-        mock_config_entry,
-        options={
-            "prompt": (
-                "The user name is {{ user_name }}. "
-                "The user id is {{ llm_context.context.user_id }}."
-            ),
-        },
-    )
-    with (
-        patch("google.generativeai.GenerativeModel") as mock_model,
-        patch("homeassistant.auth.AuthManager.async_get_user", return_value=mock_user),
-    ):
-        await hass.config_entries.async_setup(mock_config_entry.entry_id)
-        await hass.async_block_till_done()
-        mock_chat = AsyncMock()
-        mock_model.return_value.start_chat.return_value = mock_chat
-        chat_response = MagicMock()
-        mock_chat.send_message_async.return_value = chat_response
-        mock_part = MagicMock()
-        mock_part.text = "Model response"
-        chat_response.parts = [mock_part]
-        result = await conversation.async_converse(
-            hass, "hello", None, context, agent_id=mock_config_entry.entry_id
-        )
-
-    assert result.response.response_type == intent.IntentResponseType.ACTION_DONE, (
-        result
-    )
-    assert (
-        "The user name is Test User."
-        in mock_model.mock_calls[0][2]["system_instruction"]
-    )
-    assert "The user id is 12345." in mock_model.mock_calls[0][2]["system_instruction"]
-
-
 @pytest.mark.usefixtures("mock_init_component")
 async def test_conversation_agent(
     hass: HomeAssistant, mock_config_entry: MockConfigEntry
@@ -640,31 +550,85 @@ async def test_escape_decode() -> None:
 
 
 @pytest.mark.parametrize(
-    ("openapi", "protobuf"),
+    ("openapi", "genai_schema"),
     [
         (
             {"type": "string", "enum": ["a", "b", "c"]},
-            {"type_": "STRING", "enum": ["a", "b", "c"]},
+            {"type": "STRING", "enum": ["a", "b", "c"]},
+        ),
+        (
+            {"type": "string", "default": "default"},
+            {"type": "STRING"},
+        ),
+        (
+            {"type": "string", "pattern": "default"},
+            {"type": "STRING"},
+        ),
+        (
+            {"type": "string", "maxLength": 10},
+            {"type": "STRING"},
+        ),
+        (
+            {"type": "string", "minLength": 10},
+            {"type": "STRING"},
+        ),
+        (
+            {"type": "string", "title": "title"},
+            {"type": "STRING"},
+        ),
+        (
+            {"type": "string", "format": "enum", "enum": ["a", "b", "c"]},
+            {"type": "STRING", "format": "enum", "enum": ["a", "b", "c"]},
+        ),
+        (
+            {"type": "string", "format": "date-time"},
+            {"type": "STRING", "format": "date-time"},
+        ),
+        (
+            {"type": "string", "format": "byte"},
+            {"type": "STRING"},
+        ),
+        (
+            {"type": "number", "format": "float"},
+            {"type": "NUMBER", "format": "float"},
+        ),
+        (
+            {"type": "number", "format": "double"},
+            {"type": "NUMBER", "format": "double"},
+        ),
+        (
+            {"type": "number", "format": "hex"},
+            {"type": "NUMBER"},
+        ),
+        (
+            {"type": "number", "minimum": 1},
+            {"type": "NUMBER"},
+        ),
+        (
+            {"type": "integer", "format": "int32"},
+            {"type": "INTEGER", "format": "int32"},
+        ),
+        (
+            {"type": "integer", "format": "int64"},
+            {"type": "INTEGER", "format": "int64"},
+        ),
+        (
+            {"type": "integer", "format": "int8"},
+            {"type": "INTEGER"},
         ),
         (
             {"type": "integer", "enum": [1, 2, 3]},
-            {"type_": "STRING", "enum": ["1", "2", "3"]},
+            {"type": "STRING", "enum": ["1", "2", "3"]},
         ),
-        ({"anyOf": [{"type": "integer"}, {"type": "number"}]}, {"type_": "INTEGER"}),
         (
-            {
-                "anyOf": [
-                    {"anyOf": [{"type": "integer"}, {"type": "number"}]},
-                    {"anyOf": [{"type": "integer"}, {"type": "number"}]},
-                ]
-            },
-            {"type_": "INTEGER"},
+            {"anyOf": [{"type": "integer"}, {"type": "number"}]},
+            {},
         ),
-        ({"type": "string", "format": "lower"}, {"type_": "STRING"}),
-        ({"type": "boolean", "format": "bool"}, {"type_": "BOOLEAN"}),
+        ({"type": "string", "format": "lower"}, {"type": "STRING"}),
+        ({"type": "boolean", "format": "bool"}, {"type": "BOOLEAN"}),
         (
             {"type": "number", "format": "percent"},
-            {"type_": "NUMBER", "format_": "percent"},
+            {"type": "NUMBER"},
         ),
         (
             {
@@ -673,25 +637,81 @@ async def test_escape_decode() -> None:
                 "required": [],
             },
             {
-                "type_": "OBJECT",
-                "properties": {"var": {"type_": "STRING"}},
+                "type": "OBJECT",
+                "properties": {"var": {"type": "STRING"}},
                 "required": [],
             },
         ),
         (
-            {"type": "object", "additionalProperties": True},
+            {"type": "object", "additionalProperties": True, "minProperties": 1},
             {
-                "type_": "OBJECT",
-                "properties": {"json": {"type_": "STRING"}},
+                "type": "OBJECT",
+                "properties": {"json": {"type": "STRING"}},
+                "required": [],
+            },
+        ),
+        (
+            {"type": "object", "additionalProperties": True, "maxProperties": 1},
+            {
+                "type": "OBJECT",
+                "properties": {"json": {"type": "STRING"}},
                 "required": [],
             },
         ),
         (
             {"type": "array", "items": {"type": "string"}},
-            {"type_": "ARRAY", "items": {"type_": "STRING"}},
+            {"type": "ARRAY", "items": {"type": "STRING"}},
+        ),
+        (
+            {
+                "type": "array",
+                "items": {"type": "string"},
+                "minItems": 1,
+                "maxItems": 2,
+            },
+            {
+                "type": "ARRAY",
+                "items": {"type": "STRING"},
+                "min_items": 1,
+                "max_items": 2,
+            },
         ),
     ],
 )
-async def test_format_schema(openapi, protobuf) -> None:
+async def test_format_schema(openapi, genai_schema) -> None:
     """Test _format_schema."""
-    assert _format_schema(openapi) == protobuf
+    assert _format_schema(openapi) == genai_schema
+
+
+@pytest.mark.usefixtures("mock_init_component")
+async def test_empty_content_in_chat_history(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry
+) -> None:
+    """Tests that in case of an empty entry in the chat history the google API will receive an injected space sign instead."""
+    with (
+        patch("google.genai.chats.AsyncChats.create") as mock_create,
+        chat_session.async_get_chat_session(hass) as session,
+        async_get_chat_log(hass, session) as chat_log,
+    ):
+        mock_chat = AsyncMock()
+        mock_create.return_value.send_message = mock_chat
+
+        # Chat preparation with two inputs, one being an empty string
+        first_input = "First request"
+        second_input = ""
+        chat_log.async_add_user_content(UserContent(first_input))
+        chat_log.async_add_user_content(UserContent(second_input))
+
+        await conversation.async_converse(
+            hass,
+            "Second request",
+            session.conversation_id,
+            Context(),
+            agent_id="conversation.google_generative_ai_conversation",
+        )
+
+        _, kwargs = mock_create.call_args
+        actual_history = kwargs.get("history")
+
+        assert actual_history[0].parts[0].text == first_input
+        assert actual_history[1].parts[0].text == " "
diff --git a/tests/components/google_generative_ai_conversation/test_init.py b/tests/components/google_generative_ai_conversation/test_init.py
index 4875323d094..a08acc0df3f 100644
--- a/tests/components/google_generative_ai_conversation/test_init.py
+++ b/tests/components/google_generative_ai_conversation/test_init.py
@@ -1,16 +1,17 @@
 """Tests for the Google Generative AI Conversation integration."""
 
-from unittest.mock import AsyncMock, MagicMock, patch
+from unittest.mock import AsyncMock, Mock, mock_open, patch
 
-from google.api_core.exceptions import ClientError, DeadlineExceeded
-from google.rpc.error_details_pb2 import ErrorInfo  # pylint: disable=no-name-in-module
 import pytest
+from requests.exceptions import Timeout
 from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 
+from . import CLIENT_ERROR_500, CLIENT_ERROR_API_KEY_INVALID
+
 from tests.common import MockConfigEntry
 
 
@@ -24,12 +25,14 @@ async def test_generate_content_service_without_images(
         "party for the latest version of Home Assistant!"
     )
 
-    with patch("google.generativeai.GenerativeModel") as mock_model:
-        mock_response = MagicMock()
-        mock_response.text = stubbed_generated_content
-        mock_model.return_value.generate_content_async = AsyncMock(
-            return_value=mock_response
-        )
+    with patch(
+        "google.genai.models.AsyncModels.generate_content",
+        return_value=Mock(
+            text=stubbed_generated_content,
+            prompt_feedback=None,
+            candidates=[Mock()],
+        ),
+    ) as mock_generate:
         response = await hass.services.async_call(
             "google_generative_ai_conversation",
             "generate_content",
@@ -41,7 +44,7 @@ async def test_generate_content_service_without_images(
     assert response == {
         "text": stubbed_generated_content,
     }
-    assert [tuple(mock_call) for mock_call in mock_model.mock_calls] == snapshot
+    assert [tuple(mock_call) for mock_call in mock_generate.mock_calls] == snapshot
 
 
 @pytest.mark.usefixtures("mock_init_component")
@@ -54,25 +57,29 @@ async def test_generate_content_service_with_image(
     )
 
     with (
-        patch("google.generativeai.GenerativeModel") as mock_model,
         patch(
-            "homeassistant.components.google_generative_ai_conversation.Path.read_bytes",
-            return_value=b"image bytes",
+            "google.genai.models.AsyncModels.generate_content",
+            return_value=Mock(
+                text=stubbed_generated_content,
+                prompt_feedback=None,
+                candidates=[Mock()],
+            ),
+        ) as mock_generate,
+        patch(
+            "google.genai.files.Files.upload",
+            return_value=b"some file",
         ),
         patch("pathlib.Path.exists", return_value=True),
         patch.object(hass.config, "is_allowed_path", return_value=True),
+        patch("builtins.open", mock_open(read_data="this is an image")),
+        patch("mimetypes.guess_type", return_value=["image/jpeg"]),
     ):
-        mock_response = MagicMock()
-        mock_response.text = stubbed_generated_content
-        mock_model.return_value.generate_content_async = AsyncMock(
-            return_value=mock_response
-        )
         response = await hass.services.async_call(
             "google_generative_ai_conversation",
             "generate_content",
             {
                 "prompt": "Describe this image from my doorbell camera",
-                "image_filename": "doorbell_snapshot.jpg",
+                "filenames": ["doorbell_snapshot.jpg", "context.txt", "context.txt"],
             },
             blocking=True,
             return_response=True,
@@ -81,7 +88,7 @@ async def test_generate_content_service_with_image(
     assert response == {
         "text": stubbed_generated_content,
     }
-    assert [tuple(mock_call) for mock_call in mock_model.mock_calls] == snapshot
+    assert [tuple(mock_call) for mock_call in mock_generate.mock_calls] == snapshot
 
 
 @pytest.mark.usefixtures("mock_init_component")
@@ -90,20 +97,23 @@ async def test_generate_content_service_error(
     mock_config_entry: MockConfigEntry,
 ) -> None:
     """Test generate content service handles errors."""
-    with patch("google.generativeai.GenerativeModel") as mock_model:
-        mock_model.return_value.generate_content_async = AsyncMock(
-            side_effect=ClientError("reason")
+    with (
+        patch(
+            "google.genai.models.AsyncModels.generate_content",
+            side_effect=CLIENT_ERROR_500,
+        ),
+        pytest.raises(
+            HomeAssistantError,
+            match="Error generating content: 500 internal-error. {'message': 'Internal Server Error', 'status': 'internal-error'}",
+        ),
+    ):
+        await hass.services.async_call(
+            "google_generative_ai_conversation",
+            "generate_content",
+            {"prompt": "write a story about an epic fail"},
+            blocking=True,
+            return_response=True,
         )
-        with pytest.raises(
-            HomeAssistantError, match="Error generating content: None reason"
-        ):
-            await hass.services.async_call(
-                "google_generative_ai_conversation",
-                "generate_content",
-                {"prompt": "write a story about an epic fail"},
-                blocking=True,
-                return_response=True,
-            )
 
 
 @pytest.mark.usefixtures("mock_init_component")
@@ -113,21 +123,22 @@ async def test_generate_content_response_has_empty_parts(
 ) -> None:
     """Test generate content service handles response with empty parts."""
     with (
-        patch("google.generativeai.GenerativeModel") as mock_model,
+        patch(
+            "google.genai.models.AsyncModels.generate_content",
+            return_value=Mock(
+                prompt_feedback=None,
+                candidates=[Mock(content=Mock(parts=[]))],
+            ),
+        ),
+        pytest.raises(HomeAssistantError, match="Unknown error generating content"),
     ):
-        mock_response = MagicMock()
-        mock_response.parts = []
-        mock_model.return_value.generate_content_async = AsyncMock(
-            return_value=mock_response
+        await hass.services.async_call(
+            "google_generative_ai_conversation",
+            "generate_content",
+            {"prompt": "write a story about an epic fail"},
+            blocking=True,
+            return_response=True,
         )
-        with pytest.raises(HomeAssistantError, match="Error generating content"):
-            await hass.services.async_call(
-                "google_generative_ai_conversation",
-                "generate_content",
-                {"prompt": "write a story about an epic fail"},
-                blocking=True,
-                return_response=True,
-            )
 
 
 @pytest.mark.usefixtures("mock_init_component")
@@ -152,7 +163,7 @@ async def test_generate_content_service_with_image_not_allowed_path(
             "generate_content",
             {
                 "prompt": "Describe this image from my doorbell camera",
-                "image_filename": "doorbell_snapshot.jpg",
+                "filenames": "doorbell_snapshot.jpg",
             },
             blocking=True,
             return_response=True,
@@ -177,30 +188,7 @@ async def test_generate_content_service_with_image_not_exists(
             "generate_content",
             {
                 "prompt": "Describe this image from my doorbell camera",
-                "image_filename": "doorbell_snapshot.jpg",
-            },
-            blocking=True,
-            return_response=True,
-        )
-
-
-@pytest.mark.usefixtures("mock_init_component")
-async def test_generate_content_service_with_non_image(hass: HomeAssistant) -> None:
-    """Test generate content service with a non image."""
-    with (
-        patch("pathlib.Path.exists", return_value=True),
-        patch.object(hass.config, "is_allowed_path", return_value=True),
-        patch("pathlib.Path.exists", return_value=True),
-        pytest.raises(
-            HomeAssistantError, match="`doorbell_snapshot.mp4` is not an image"
-        ),
-    ):
-        await hass.services.async_call(
-            "google_generative_ai_conversation",
-            "generate_content",
-            {
-                "prompt": "Describe this image from my doorbell camera",
-                "image_filename": "doorbell_snapshot.mp4",
+                "filenames": "doorbell_snapshot.jpg",
             },
             blocking=True,
             return_response=True,
@@ -211,19 +199,17 @@ async def test_generate_content_service_with_non_image(hass: HomeAssistant) -> N
     ("side_effect", "state", "reauth"),
     [
         (
-            ClientError("some error"),
+            CLIENT_ERROR_500,
             ConfigEntryState.SETUP_ERROR,
             False,
         ),
         (
-            DeadlineExceeded("deadline exceeded"),
+            Timeout,
             ConfigEntryState.SETUP_RETRY,
             False,
         ),
         (
-            ClientError(
-                "invalid api key", error_info=ErrorInfo(reason="API_KEY_INVALID")
-            ),
+            CLIENT_ERROR_API_KEY_INVALID,
             ConfigEntryState.SETUP_ERROR,
             True,
         ),
@@ -235,11 +221,57 @@ async def test_config_entry_error(
     """Test different configuration entry errors."""
     mock_client = AsyncMock()
     mock_client.get_model.side_effect = side_effect
-    with patch(
-        "google.ai.generativelanguage_v1beta.ModelServiceAsyncClient",
-        return_value=mock_client,
-    ):
+    with patch("google.genai.models.AsyncModels.get", side_effect=side_effect):
         assert not await hass.config_entries.async_setup(mock_config_entry.entry_id)
         await hass.async_block_till_done()
         assert mock_config_entry.state == state
         assert any(mock_config_entry.async_get_active_flows(hass, {"reauth"})) == reauth
+
+
+@pytest.mark.usefixtures("mock_init_component")
+async def test_load_entry_with_unloaded_entries(
+    hass: HomeAssistant, snapshot: SnapshotAssertion
+) -> None:
+    """Test loading an entry with unloaded entries."""
+    config_entries = hass.config_entries.async_entries(
+        "google_generative_ai_conversation"
+    )
+    runtime_data = config_entries[0].runtime_data
+    await hass.config_entries.async_unload(config_entries[0].entry_id)
+
+    entry = MockConfigEntry(
+        domain="google_generative_ai_conversation",
+        title="Google Generative AI Conversation",
+        data={
+            "api_key": "bla",
+        },
+        state=ConfigEntryState.LOADED,
+    )
+    entry.runtime_data = runtime_data
+    entry.add_to_hass(hass)
+
+    stubbed_generated_content = (
+        "I'm thrilled to welcome you all to the release "
+        "party for the latest version of Home Assistant!"
+    )
+
+    with patch(
+        "google.genai.models.AsyncModels.generate_content",
+        return_value=Mock(
+            text=stubbed_generated_content,
+            prompt_feedback=None,
+            candidates=[Mock()],
+        ),
+    ) as mock_generate:
+        response = await hass.services.async_call(
+            "google_generative_ai_conversation",
+            "generate_content",
+            {"prompt": "Write an opening speech for a Home Assistant release party"},
+            blocking=True,
+            return_response=True,
+        )
+
+    assert response == {
+        "text": stubbed_generated_content,
+    }
+    assert [tuple(mock_call) for mock_call in mock_generate.mock_calls] == snapshot
diff --git a/tests/components/google_mail/test_sensor.py b/tests/components/google_mail/test_sensor.py
index 6f2f1a4ec32..e9dd2da85de 100644
--- a/tests/components/google_mail/test_sensor.py
+++ b/tests/components/google_mail/test_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.google_mail.const import DOMAIN
 from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import ATTR_DEVICE_CLASS, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import SENSOR, TOKEN, ComponentSetup
 
diff --git a/tests/components/google_translate/test_tts.py b/tests/components/google_translate/test_tts.py
index 5b691da4bdc..54ad47405a1 100644
--- a/tests/components/google_translate/test_tts.py
+++ b/tests/components/google_translate/test_tts.py
@@ -475,6 +475,6 @@ async def test_service_say_error(
         await retrieve_media(
             hass, hass_client, service_calls[1].data[ATTR_MEDIA_CONTENT_ID]
         )
-        == HTTPStatus.NOT_FOUND
+        == HTTPStatus.INTERNAL_SERVER_ERROR
     )
     assert len(mock_gtts.mock_calls) == 2
diff --git a/tests/components/google_wifi/test_sensor.py b/tests/components/google_wifi/test_sensor.py
index 18d96e3a1c0..88adcbf6587 100644
--- a/tests/components/google_wifi/test_sensor.py
+++ b/tests/components/google_wifi/test_sensor.py
@@ -7,7 +7,7 @@ from unittest.mock import Mock, patch
 
 import requests_mock
 
-import homeassistant.components.google_wifi.sensor as google_wifi
+from homeassistant.components.google_wifi import sensor as google_wifi
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
diff --git a/tests/components/govee_ble/test_config_flow.py b/tests/components/govee_ble/test_config_flow.py
index eb0719f832c..ac8970ca977 100644
--- a/tests/components/govee_ble/test_config_flow.py
+++ b/tests/components/govee_ble/test_config_flow.py
@@ -79,6 +79,38 @@ async def test_async_step_user_with_found_devices(hass: HomeAssistant) -> None:
     assert result2["result"].unique_id == "4125DDBA-2774-4851-9889-6AADDD4CAC3D"
 
 
+async def test_async_step_user_replace_ignored_device(hass: HomeAssistant) -> None:
+    """Test setup user step can replace an ignored device."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=GVH5177_SERVICE_INFO.address,
+        data={},
+        source=config_entries.SOURCE_IGNORE,
+    )
+    entry.add_to_hass(hass)
+    with patch(
+        "homeassistant.components.govee_ble.config_flow.async_discovered_service_info",
+        return_value=[GVH5177_SERVICE_INFO],
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_USER},
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    with patch(
+        "homeassistant.components.govee_ble.async_setup_entry", return_value=True
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input={"address": "4125DDBA-2774-4851-9889-6AADDD4CAC3D"},
+        )
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "H5177 2EC8"
+    assert result2["data"] == {CONF_DEVICE_TYPE: "H5177"}
+    assert result2["result"].unique_id == "4125DDBA-2774-4851-9889-6AADDD4CAC3D"
+
+
 async def test_async_step_user_device_added_between_steps(hass: HomeAssistant) -> None:
     """Test the device gets added via another flow between steps."""
     with patch(
diff --git a/tests/components/govee_light_local/conftest.py b/tests/components/govee_light_local/conftest.py
index 6a8ee99b764..a8b6955c384 100644
--- a/tests/components/govee_light_local/conftest.py
+++ b/tests/components/govee_light_local/conftest.py
@@ -4,14 +4,15 @@ from asyncio import Event
 from collections.abc import Generator
 from unittest.mock import AsyncMock, MagicMock, patch
 
-from govee_local_api import GoveeLightCapability
+from govee_local_api import GoveeLightCapabilities, GoveeLightFeatures
+from govee_local_api.light_capabilities import COMMON_FEATURES, SCENE_CODES
 import pytest
 
 from homeassistant.components.govee_light_local.coordinator import GoveeController
 
 
 @pytest.fixture(name="mock_govee_api")
-def fixture_mock_govee_api():
+def fixture_mock_govee_api() -> Generator[AsyncMock]:
     """Set up Govee Local API fixture."""
     mock_api = AsyncMock(spec=GoveeController)
     mock_api.start = AsyncMock()
@@ -20,8 +21,20 @@ def fixture_mock_govee_api():
     mock_api.turn_on_off = AsyncMock()
     mock_api.set_brightness = AsyncMock()
     mock_api.set_color = AsyncMock()
+    mock_api.set_scene = AsyncMock()
     mock_api._async_update_data = AsyncMock()
-    return mock_api
+
+    with (
+        patch(
+            "homeassistant.components.govee_light_local.coordinator.GoveeController",
+            return_value=mock_api,
+        ) as mock_controller,
+        patch(
+            "homeassistant.components.govee_light_local.config_flow.GoveeController",
+            return_value=mock_api,
+        ),
+    ):
+        yield mock_controller.return_value
 
 
 @pytest.fixture(name="mock_setup_entry")
@@ -34,8 +47,12 @@ def fixture_mock_setup_entry() -> Generator[AsyncMock]:
         yield mock_setup_entry
 
 
-DEFAULT_CAPABILITEIS: set[GoveeLightCapability] = {
-    GoveeLightCapability.COLOR_RGB,
-    GoveeLightCapability.COLOR_KELVIN_TEMPERATURE,
-    GoveeLightCapability.BRIGHTNESS,
-}
+DEFAULT_CAPABILITIES: GoveeLightCapabilities = GoveeLightCapabilities(
+    features=COMMON_FEATURES, segments=[], scenes={}
+)
+
+SCENE_CAPABILITIES: GoveeLightCapabilities = GoveeLightCapabilities(
+    features=COMMON_FEATURES | GoveeLightFeatures.SCENES,
+    segments=[],
+    scenes=SCENE_CODES,
+)
diff --git a/tests/components/govee_light_local/test_config_flow.py b/tests/components/govee_light_local/test_config_flow.py
index 2e7144fae3a..e6e336a70f2 100644
--- a/tests/components/govee_light_local/test_config_flow.py
+++ b/tests/components/govee_light_local/test_config_flow.py
@@ -10,7 +10,7 @@ from homeassistant.components.govee_light_local.const import DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
-from .conftest import DEFAULT_CAPABILITEIS
+from .conftest import DEFAULT_CAPABILITIES
 
 
 def _get_devices(mock_govee_api: AsyncMock) -> list[GoveeDevice]:
@@ -20,7 +20,7 @@ def _get_devices(mock_govee_api: AsyncMock) -> list[GoveeDevice]:
             ip="192.168.1.100",
             fingerprint="asdawdqwdqwd1",
             sku="H615A",
-            capabilities=DEFAULT_CAPABILITEIS,
+            capabilities=DEFAULT_CAPABILITIES,
         )
     ]
 
@@ -32,15 +32,9 @@ async def test_creating_entry_has_no_devices(
 
     mock_govee_api.devices = []
 
-    with (
-        patch(
-            "homeassistant.components.govee_light_local.config_flow.GoveeController",
-            return_value=mock_govee_api,
-        ),
-        patch(
-            "homeassistant.components.govee_light_local.config_flow.DISCOVERY_TIMEOUT",
-            0,
-        ),
+    with patch(
+        "homeassistant.components.govee_light_local.config_flow.DISCOVERY_TIMEOUT",
+        0,
     ):
         result = await hass.config_entries.flow.async_init(
             DOMAIN, context={"source": config_entries.SOURCE_USER}
@@ -67,24 +61,20 @@ async def test_creating_entry_has_with_devices(
 
     mock_govee_api.devices = _get_devices(mock_govee_api)
 
-    with patch(
-        "homeassistant.components.govee_light_local.config_flow.GoveeController",
-        return_value=mock_govee_api,
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": config_entries.SOURCE_USER}
-        )
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
 
-        # Confirmation form
-        assert result["type"] is FlowResultType.FORM
+    # Confirmation form
+    assert result["type"] is FlowResultType.FORM
 
-        result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
-        assert result["type"] is FlowResultType.CREATE_ENTRY
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+    assert result["type"] is FlowResultType.CREATE_ENTRY
 
-        await hass.async_block_till_done()
+    await hass.async_block_till_done()
 
-        mock_govee_api.start.assert_awaited_once()
-        mock_setup_entry.assert_awaited_once()
+    mock_govee_api.start.assert_awaited_once()
+    mock_setup_entry.assert_awaited_once()
 
 
 async def test_creating_entry_errno(
@@ -99,21 +89,17 @@ async def test_creating_entry_errno(
     mock_govee_api.start.side_effect = e
     mock_govee_api.devices = _get_devices(mock_govee_api)
 
-    with patch(
-        "homeassistant.components.govee_light_local.config_flow.GoveeController",
-        return_value=mock_govee_api,
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": config_entries.SOURCE_USER}
-        )
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
 
-        # Confirmation form
-        assert result["type"] is FlowResultType.FORM
+    # Confirmation form
+    assert result["type"] is FlowResultType.FORM
 
-        result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
-        assert result["type"] is FlowResultType.ABORT
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+    assert result["type"] is FlowResultType.ABORT
 
-        await hass.async_block_till_done()
+    await hass.async_block_till_done()
 
-        assert mock_govee_api.start.call_count == 1
-        mock_setup_entry.assert_not_awaited()
+    assert mock_govee_api.start.call_count == 1
+    mock_setup_entry.assert_not_awaited()
diff --git a/tests/components/govee_light_local/test_light.py b/tests/components/govee_light_local/test_light.py
index 4a1125643fa..c5dde6a9b9e 100644
--- a/tests/components/govee_light_local/test_light.py
+++ b/tests/components/govee_light_local/test_light.py
@@ -10,7 +10,7 @@ from homeassistant.components.light import ATTR_SUPPORTED_COLOR_MODES, ColorMode
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 
-from .conftest import DEFAULT_CAPABILITEIS
+from .conftest import DEFAULT_CAPABILITIES, SCENE_CAPABILITIES
 
 from tests.common import MockConfigEntry
 
@@ -26,32 +26,28 @@ async def test_light_known_device(
             ip="192.168.1.100",
             fingerprint="asdawdqwdqwd",
             sku="H615A",
-            capabilities=DEFAULT_CAPABILITEIS,
+            capabilities=DEFAULT_CAPABILITIES,
         )
     ]
 
-    with patch(
-        "homeassistant.components.govee_light_local.coordinator.GoveeController",
-        return_value=mock_govee_api,
-    ):
-        entry = MockConfigEntry(domain=DOMAIN)
-        entry.add_to_hass(hass)
+    entry = MockConfigEntry(domain=DOMAIN)
+    entry.add_to_hass(hass)
 
-        assert await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
+    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
 
-        assert len(hass.states.async_all()) == 1
+    assert len(hass.states.async_all()) == 1
 
-        light = hass.states.get("light.H615A")
-        assert light is not None
+    light = hass.states.get("light.H615A")
+    assert light is not None
 
-        color_modes = light.attributes[ATTR_SUPPORTED_COLOR_MODES]
-        assert set(color_modes) == {ColorMode.COLOR_TEMP, ColorMode.RGB}
+    color_modes = light.attributes[ATTR_SUPPORTED_COLOR_MODES]
+    assert set(color_modes) == {ColorMode.COLOR_TEMP, ColorMode.RGB}
 
-        # Remove
-        assert await hass.config_entries.async_remove(entry.entry_id)
-        await hass.async_block_till_done()
-        assert hass.states.get("light.H615A") is None
+    # Remove
+    assert await hass.config_entries.async_remove(entry.entry_id)
+    await hass.async_block_till_done()
+    assert hass.states.get("light.H615A") is None
 
 
 async def test_light_unknown_device(
@@ -69,26 +65,22 @@ async def test_light_unknown_device(
         )
     ]
 
-    with patch(
-        "homeassistant.components.govee_light_local.coordinator.GoveeController",
-        return_value=mock_govee_api,
-    ):
-        entry = MockConfigEntry(domain=DOMAIN)
-        entry.add_to_hass(hass)
+    entry = MockConfigEntry(domain=DOMAIN)
+    entry.add_to_hass(hass)
 
-        assert await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
+    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
 
-        assert len(hass.states.async_all()) == 1
+    assert len(hass.states.async_all()) == 1
 
-        light = hass.states.get("light.XYZK")
-        assert light is not None
+    light = hass.states.get("light.XYZK")
+    assert light is not None
 
-        assert light.attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.ONOFF]
+    assert light.attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.ONOFF]
 
 
 async def test_light_remove(hass: HomeAssistant, mock_govee_api: AsyncMock) -> None:
-    """Test adding a known device."""
+    """Test remove device."""
 
     mock_govee_api.devices = [
         GoveeDevice(
@@ -96,53 +88,45 @@ async def test_light_remove(hass: HomeAssistant, mock_govee_api: AsyncMock) -> N
             ip="192.168.1.100",
             fingerprint="asdawdqwdqwd1",
             sku="H615A",
-            capabilities=DEFAULT_CAPABILITEIS,
+            capabilities=DEFAULT_CAPABILITIES,
         )
     ]
 
-    with patch(
-        "homeassistant.components.govee_light_local.coordinator.GoveeController",
-        return_value=mock_govee_api,
-    ):
-        entry = MockConfigEntry(domain=DOMAIN)
-        entry.add_to_hass(hass)
+    entry = MockConfigEntry(domain=DOMAIN)
+    entry.add_to_hass(hass)
 
-        assert await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-        assert hass.states.get("light.H615A") is not None
+    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+    assert hass.states.get("light.H615A") is not None
 
-        # Remove 1
-        assert await hass.config_entries.async_remove(entry.entry_id)
-        await hass.async_block_till_done()
-        assert len(hass.states.async_all()) == 0
+    # Remove 1
+    assert await hass.config_entries.async_remove(entry.entry_id)
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 0
 
 
 async def test_light_setup_retry(
     hass: HomeAssistant, mock_govee_api: AsyncMock
 ) -> None:
-    """Test adding an unknown device."""
+    """Test setup retry."""
 
     mock_govee_api.devices = []
 
-    with patch(
-        "homeassistant.components.govee_light_local.coordinator.GoveeController",
-        return_value=mock_govee_api,
-    ):
-        entry = MockConfigEntry(domain=DOMAIN)
-        entry.add_to_hass(hass)
+    entry = MockConfigEntry(domain=DOMAIN)
+    entry.add_to_hass(hass)
 
-        with patch(
-            "homeassistant.components.govee_light_local.DISCOVERY_TIMEOUT",
-            0,
-        ):
-            await hass.config_entries.async_setup(entry.entry_id)
-        assert entry.state is ConfigEntryState.SETUP_RETRY
+    with patch(
+        "homeassistant.components.govee_light_local.DISCOVERY_TIMEOUT",
+        0,
+    ):
+        await hass.config_entries.async_setup(entry.entry_id)
+    assert entry.state is ConfigEntryState.SETUP_RETRY
 
 
 async def test_light_setup_retry_eaddrinuse(
     hass: HomeAssistant, mock_govee_api: AsyncMock
 ) -> None:
-    """Test adding an unknown device."""
+    """Test retry on address already in use."""
 
     mock_govee_api.start.side_effect = OSError()
     mock_govee_api.start.side_effect.errno = EADDRINUSE
@@ -152,25 +136,21 @@ async def test_light_setup_retry_eaddrinuse(
             ip="192.168.1.100",
             fingerprint="asdawdqwdqwd",
             sku="H615A",
-            capabilities=DEFAULT_CAPABILITEIS,
+            capabilities=DEFAULT_CAPABILITIES,
         )
     ]
 
-    with patch(
-        "homeassistant.components.govee_light_local.coordinator.GoveeController",
-        return_value=mock_govee_api,
-    ):
-        entry = MockConfigEntry(domain=DOMAIN)
-        entry.add_to_hass(hass)
+    entry = MockConfigEntry(domain=DOMAIN)
+    entry.add_to_hass(hass)
 
-        await hass.config_entries.async_setup(entry.entry_id)
-        assert entry.state is ConfigEntryState.SETUP_RETRY
+    await hass.config_entries.async_setup(entry.entry_id)
+    assert entry.state is ConfigEntryState.SETUP_RETRY
 
 
 async def test_light_setup_error(
     hass: HomeAssistant, mock_govee_api: AsyncMock
 ) -> None:
-    """Test adding an unknown device."""
+    """Test setup error."""
 
     mock_govee_api.start.side_effect = OSError()
     mock_govee_api.start.side_effect.errno = ENETDOWN
@@ -180,23 +160,19 @@ async def test_light_setup_error(
             ip="192.168.1.100",
             fingerprint="asdawdqwdqwd",
             sku="H615A",
-            capabilities=DEFAULT_CAPABILITEIS,
+            capabilities=DEFAULT_CAPABILITIES,
         )
     ]
 
-    with patch(
-        "homeassistant.components.govee_light_local.coordinator.GoveeController",
-        return_value=mock_govee_api,
-    ):
-        entry = MockConfigEntry(domain=DOMAIN)
-        entry.add_to_hass(hass)
+    entry = MockConfigEntry(domain=DOMAIN)
+    entry.add_to_hass(hass)
 
-        await hass.config_entries.async_setup(entry.entry_id)
-        assert entry.state is ConfigEntryState.SETUP_ERROR
+    await hass.config_entries.async_setup(entry.entry_id)
+    assert entry.state is ConfigEntryState.SETUP_ERROR
 
 
 async def test_light_on_off(hass: HomeAssistant, mock_govee_api: MagicMock) -> None:
-    """Test adding a known device."""
+    """Test light on and then off."""
 
     mock_govee_api.devices = [
         GoveeDevice(
@@ -204,52 +180,48 @@ async def test_light_on_off(hass: HomeAssistant, mock_govee_api: MagicMock) -> N
             ip="192.168.1.100",
             fingerprint="asdawdqwdqwd",
             sku="H615A",
-            capabilities=DEFAULT_CAPABILITEIS,
+            capabilities=DEFAULT_CAPABILITIES,
         )
     ]
 
-    with patch(
-        "homeassistant.components.govee_light_local.coordinator.GoveeController",
-        return_value=mock_govee_api,
-    ):
-        entry = MockConfigEntry(domain=DOMAIN)
-        entry.add_to_hass(hass)
+    entry = MockConfigEntry(domain=DOMAIN)
+    entry.add_to_hass(hass)
 
-        assert await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
+    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
 
-        assert len(hass.states.async_all()) == 1
+    assert len(hass.states.async_all()) == 1
 
-        light = hass.states.get("light.H615A")
-        assert light is not None
-        assert light.state == "off"
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "off"
 
-        await hass.services.async_call(
-            "light",
-            "turn_on",
-            {"entity_id": light.entity_id},
-            blocking=True,
-        )
-        await hass.async_block_till_done()
+    await hass.services.async_call(
+        "light",
+        "turn_on",
+        {"entity_id": light.entity_id},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
 
-        light = hass.states.get("light.H615A")
-        assert light is not None
-        assert light.state == "on"
-        mock_govee_api.turn_on_off.assert_awaited_with(mock_govee_api.devices[0], True)
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "on"
+    mock_govee_api.turn_on_off.assert_awaited_with(mock_govee_api.devices[0], True)
 
-        # Turn off
-        await hass.services.async_call(
-            "light",
-            "turn_off",
-            {"entity_id": light.entity_id},
-            blocking=True,
-        )
-        await hass.async_block_till_done()
+    # Turn off
+    await hass.services.async_call(
+        "light",
+        "turn_off",
+        {"entity_id": light.entity_id},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
 
-        light = hass.states.get("light.H615A")
-        assert light is not None
-        assert light.state == "off"
-        mock_govee_api.turn_on_off.assert_awaited_with(mock_govee_api.devices[0], False)
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "off"
+    mock_govee_api.turn_on_off.assert_awaited_with(mock_govee_api.devices[0], False)
 
 
 async def test_light_brightness(hass: HomeAssistant, mock_govee_api: MagicMock) -> None:
@@ -260,71 +232,63 @@ async def test_light_brightness(hass: HomeAssistant, mock_govee_api: MagicMock)
             ip="192.168.1.100",
             fingerprint="asdawdqwdqwd",
             sku="H615A",
-            capabilities=DEFAULT_CAPABILITEIS,
+            capabilities=DEFAULT_CAPABILITIES,
         )
     ]
 
-    with patch(
-        "homeassistant.components.govee_light_local.coordinator.GoveeController",
-        return_value=mock_govee_api,
-    ):
-        entry = MockConfigEntry(domain=DOMAIN)
-        entry.add_to_hass(hass)
+    entry = MockConfigEntry(domain=DOMAIN)
+    entry.add_to_hass(hass)
 
-        assert await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
+    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
 
-        assert len(hass.states.async_all()) == 1
+    assert len(hass.states.async_all()) == 1
 
-        light = hass.states.get("light.H615A")
-        assert light is not None
-        assert light.state == "off"
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "off"
 
-        await hass.services.async_call(
-            "light",
-            "turn_on",
-            {"entity_id": light.entity_id, "brightness_pct": 50},
-            blocking=True,
-        )
-        await hass.async_block_till_done()
+    await hass.services.async_call(
+        "light",
+        "turn_on",
+        {"entity_id": light.entity_id, "brightness_pct": 50},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
 
-        light = hass.states.get("light.H615A")
-        assert light is not None
-        assert light.state == "on"
-        mock_govee_api.set_brightness.assert_awaited_with(mock_govee_api.devices[0], 50)
-        assert light.attributes["brightness"] == 127
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "on"
+    mock_govee_api.set_brightness.assert_awaited_with(mock_govee_api.devices[0], 50)
+    assert light.attributes["brightness"] == 127
 
-        await hass.services.async_call(
-            "light",
-            "turn_on",
-            {"entity_id": light.entity_id, "brightness": 255},
-            blocking=True,
-        )
-        await hass.async_block_till_done()
+    await hass.services.async_call(
+        "light",
+        "turn_on",
+        {"entity_id": light.entity_id, "brightness": 255},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
 
-        light = hass.states.get("light.H615A")
-        assert light is not None
-        assert light.state == "on"
-        assert light.attributes["brightness"] == 255
-        mock_govee_api.set_brightness.assert_awaited_with(
-            mock_govee_api.devices[0], 100
-        )
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "on"
+    assert light.attributes["brightness"] == 255
+    mock_govee_api.set_brightness.assert_awaited_with(mock_govee_api.devices[0], 100)
 
-        await hass.services.async_call(
-            "light",
-            "turn_on",
-            {"entity_id": light.entity_id, "brightness": 255},
-            blocking=True,
-        )
-        await hass.async_block_till_done()
+    await hass.services.async_call(
+        "light",
+        "turn_on",
+        {"entity_id": light.entity_id, "brightness": 255},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
 
-        light = hass.states.get("light.H615A")
-        assert light is not None
-        assert light.state == "on"
-        assert light.attributes["brightness"] == 255
-        mock_govee_api.set_brightness.assert_awaited_with(
-            mock_govee_api.devices[0], 100
-        )
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "on"
+    assert light.attributes["brightness"] == 255
+    mock_govee_api.set_brightness.assert_awaited_with(mock_govee_api.devices[0], 100)
 
 
 async def test_light_color(hass: HomeAssistant, mock_govee_api: MagicMock) -> None:
@@ -335,58 +299,316 @@ async def test_light_color(hass: HomeAssistant, mock_govee_api: MagicMock) -> No
             ip="192.168.1.100",
             fingerprint="asdawdqwdqwd",
             sku="H615A",
-            capabilities=DEFAULT_CAPABILITEIS,
+            capabilities=DEFAULT_CAPABILITIES,
         )
     ]
 
-    with patch(
-        "homeassistant.components.govee_light_local.coordinator.GoveeController",
-        return_value=mock_govee_api,
-    ):
-        entry = MockConfigEntry(domain=DOMAIN)
-        entry.add_to_hass(hass)
+    entry = MockConfigEntry(domain=DOMAIN)
+    entry.add_to_hass(hass)
 
-        assert await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
+    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
 
-        assert len(hass.states.async_all()) == 1
+    assert len(hass.states.async_all()) == 1
 
-        light = hass.states.get("light.H615A")
-        assert light is not None
-        assert light.state == "off"
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "off"
 
-        await hass.services.async_call(
-            "light",
-            "turn_on",
-            {"entity_id": light.entity_id, "rgb_color": [100, 255, 50]},
-            blocking=True,
+    await hass.services.async_call(
+        "light",
+        "turn_on",
+        {"entity_id": light.entity_id, "rgb_color": [100, 255, 50]},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "on"
+    assert light.attributes["rgb_color"] == (100, 255, 50)
+    assert light.attributes["color_mode"] == ColorMode.RGB
+
+    mock_govee_api.set_color.assert_awaited_with(
+        mock_govee_api.devices[0], rgb=(100, 255, 50), temperature=None
+    )
+
+    await hass.services.async_call(
+        "light",
+        "turn_on",
+        {"entity_id": light.entity_id, "kelvin": 4400},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "on"
+    assert light.attributes["color_temp_kelvin"] == 4400
+    assert light.attributes["color_mode"] == ColorMode.COLOR_TEMP
+
+    mock_govee_api.set_color.assert_awaited_with(
+        mock_govee_api.devices[0], rgb=None, temperature=4400
+    )
+
+
+async def test_scene_on(hass: HomeAssistant, mock_govee_api: MagicMock) -> None:
+    """Test turning on scene."""
+
+    mock_govee_api.devices = [
+        GoveeDevice(
+            controller=mock_govee_api,
+            ip="192.168.1.100",
+            fingerprint="asdawdqwdqwd",
+            sku="H615A",
+            capabilities=SCENE_CAPABILITIES,
         )
-        await hass.async_block_till_done()
+    ]
 
-        light = hass.states.get("light.H615A")
-        assert light is not None
-        assert light.state == "on"
-        assert light.attributes["rgb_color"] == (100, 255, 50)
-        assert light.attributes["color_mode"] == ColorMode.RGB
+    entry = MockConfigEntry(domain=DOMAIN)
+    entry.add_to_hass(hass)
 
-        mock_govee_api.set_color.assert_awaited_with(
-            mock_govee_api.devices[0], rgb=(100, 255, 50), temperature=None
+    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert len(hass.states.async_all()) == 1
+
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "off"
+
+    await hass.services.async_call(
+        "light",
+        "turn_on",
+        {"entity_id": light.entity_id, "effect": "sunrise"},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "on"
+    assert light.attributes["effect"] == "sunrise"
+    mock_govee_api.turn_on_off.assert_awaited_with(mock_govee_api.devices[0], True)
+
+
+async def test_scene_restore_rgb(
+    hass: HomeAssistant, mock_govee_api: MagicMock
+) -> None:
+    """Test restore rgb color."""
+
+    mock_govee_api.devices = [
+        GoveeDevice(
+            controller=mock_govee_api,
+            ip="192.168.1.100",
+            fingerprint="asdawdqwdqwd",
+            sku="H615A",
+            capabilities=SCENE_CAPABILITIES,
         )
+    ]
 
-        await hass.services.async_call(
-            "light",
-            "turn_on",
-            {"entity_id": light.entity_id, "kelvin": 4400},
-            blocking=True,
+    entry = MockConfigEntry(domain=DOMAIN)
+    entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert len(hass.states.async_all()) == 1
+
+    initial_color = (12, 34, 56)
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "off"
+
+    # Set initial color
+    await hass.services.async_call(
+        "light",
+        "turn_on",
+        {"entity_id": light.entity_id, "rgb_color": initial_color},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+    await hass.services.async_call(
+        "light",
+        "turn_on",
+        {"entity_id": light.entity_id, "brightness": 255},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "on"
+    assert light.attributes["rgb_color"] == initial_color
+    assert light.attributes["brightness"] == 255
+    mock_govee_api.turn_on_off.assert_awaited_with(mock_govee_api.devices[0], True)
+
+    # Activate scene
+    await hass.services.async_call(
+        "light",
+        "turn_on",
+        {"entity_id": light.entity_id, "effect": "sunrise"},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "on"
+    assert light.attributes["effect"] == "sunrise"
+    mock_govee_api.turn_on_off.assert_awaited_with(mock_govee_api.devices[0], True)
+
+    # Deactivate scene
+    await hass.services.async_call(
+        "light",
+        "turn_on",
+        {"entity_id": light.entity_id, "effect": "none"},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "on"
+    assert light.attributes["effect"] is None
+    assert light.attributes["rgb_color"] == initial_color
+    assert light.attributes["brightness"] == 255
+
+
+async def test_scene_restore_temperature(
+    hass: HomeAssistant, mock_govee_api: MagicMock
+) -> None:
+    """Test restore color temperature."""
+
+    mock_govee_api.devices = [
+        GoveeDevice(
+            controller=mock_govee_api,
+            ip="192.168.1.100",
+            fingerprint="asdawdqwdqwd",
+            sku="H615A",
+            capabilities=SCENE_CAPABILITIES,
         )
-        await hass.async_block_till_done()
+    ]
 
-        light = hass.states.get("light.H615A")
-        assert light is not None
-        assert light.state == "on"
-        assert light.attributes["color_temp_kelvin"] == 4400
-        assert light.attributes["color_mode"] == ColorMode.COLOR_TEMP
+    entry = MockConfigEntry(domain=DOMAIN)
+    entry.add_to_hass(hass)
 
-        mock_govee_api.set_color.assert_awaited_with(
-            mock_govee_api.devices[0], rgb=None, temperature=4400
+    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert len(hass.states.async_all()) == 1
+
+    initial_color = 3456
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "off"
+
+    # Set initial color
+    await hass.services.async_call(
+        "light",
+        "turn_on",
+        {"entity_id": light.entity_id, "color_temp_kelvin": initial_color},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "on"
+    assert light.attributes["color_temp_kelvin"] == initial_color
+    mock_govee_api.turn_on_off.assert_awaited_with(mock_govee_api.devices[0], True)
+
+    # Activate scene
+    await hass.services.async_call(
+        "light",
+        "turn_on",
+        {"entity_id": light.entity_id, "effect": "sunrise"},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "on"
+    assert light.attributes["effect"] == "sunrise"
+    mock_govee_api.set_scene.assert_awaited_with(mock_govee_api.devices[0], "sunrise")
+
+    # Deactivate scene
+    await hass.services.async_call(
+        "light",
+        "turn_on",
+        {"entity_id": light.entity_id, "effect": "none"},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "on"
+    assert light.attributes["effect"] is None
+    assert light.attributes["color_temp_kelvin"] == initial_color
+
+
+async def test_scene_none(hass: HomeAssistant, mock_govee_api: MagicMock) -> None:
+    """Test turn on 'none' scene."""
+
+    mock_govee_api.devices = [
+        GoveeDevice(
+            controller=mock_govee_api,
+            ip="192.168.1.100",
+            fingerprint="asdawdqwdqwd",
+            sku="H615A",
+            capabilities=SCENE_CAPABILITIES,
         )
+    ]
+
+    entry = MockConfigEntry(domain=DOMAIN)
+    entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert len(hass.states.async_all()) == 1
+
+    initial_color = (12, 34, 56)
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "off"
+
+    # Set initial color
+    await hass.services.async_call(
+        "light",
+        "turn_on",
+        {"entity_id": light.entity_id, "rgb_color": initial_color},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+    await hass.services.async_call(
+        "light",
+        "turn_on",
+        {"entity_id": light.entity_id, "brightness": 255},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "on"
+    assert light.attributes["rgb_color"] == initial_color
+    assert light.attributes["brightness"] == 255
+    mock_govee_api.turn_on_off.assert_awaited_with(mock_govee_api.devices[0], True)
+
+    # Activate scene
+    await hass.services.async_call(
+        "light",
+        "turn_on",
+        {"entity_id": light.entity_id, "effect": "none"},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    light = hass.states.get("light.H615A")
+    assert light is not None
+    assert light.state == "on"
+    assert light.attributes["effect"] is None
+    mock_govee_api.set_scene.assert_not_called()
diff --git a/tests/components/gree/snapshots/test_climate.ambr b/tests/components/gree/snapshots/test_climate.ambr
index 4f62be5cded..9111b909f04 100644
--- a/tests/components/gree/snapshots/test_climate.ambr
+++ b/tests/components/gree/snapshots/test_climate.ambr
@@ -93,6 +93,7 @@
         'target_temp_step': 1,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
diff --git a/tests/components/gree/snapshots/test_switch.ambr b/tests/components/gree/snapshots/test_switch.ambr
index 71c6d3ea71d..836641cb2ab 100644
--- a/tests/components/gree/snapshots/test_switch.ambr
+++ b/tests/components/gree/snapshots/test_switch.ambr
@@ -71,6 +71,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -102,6 +103,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -133,6 +135,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -164,6 +167,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -195,6 +199,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
diff --git a/tests/components/gree/test_bridge.py b/tests/components/gree/test_bridge.py
index ae2f0c74236..acfa1ba43f5 100644
--- a/tests/components/gree/test_bridge.py
+++ b/tests/components/gree/test_bridge.py
@@ -12,7 +12,7 @@ from homeassistant.components.gree.const import (
     UPDATE_INTERVAL,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import async_setup_gree, build_device_mock
 
diff --git a/tests/components/gree/test_climate.py b/tests/components/gree/test_climate.py
index 0cb187f5a60..e6bfc43252f 100644
--- a/tests/components/gree/test_climate.py
+++ b/tests/components/gree/test_climate.py
@@ -52,6 +52,7 @@ from homeassistant.components.gree.const import (
     DISCOVERY_SCAN_INTERVAL,
     FAN_MEDIUM_HIGH,
     FAN_MEDIUM_LOW,
+    MAX_EXPECTED_RESPONSE_TIME_INTERVAL,
     UPDATE_INTERVAL,
 )
 from homeassistant.const import (
@@ -66,6 +67,11 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import entity_registry as er
+from homeassistant.util.unit_system import (
+    METRIC_SYSTEM,
+    US_CUSTOMARY_SYSTEM,
+    UnitSystem,
+)
 
 from .common import async_setup_gree, build_device_mock
 
@@ -346,7 +352,7 @@ async def test_unresponsive_device(
     await async_setup_gree(hass)
 
     async def run_update():
-        freezer.tick(timedelta(seconds=UPDATE_INTERVAL))
+        freezer.tick(timedelta(seconds=MAX_EXPECTED_RESPONSE_TIME_INTERVAL))
         async_fire_time_changed(hass)
         await hass.async_block_till_done()
 
@@ -410,19 +416,19 @@ async def test_send_power_off_device_timeout(
 
 @pytest.mark.parametrize(
     ("units", "temperature"),
-    [(UnitOfTemperature.CELSIUS, 26), (UnitOfTemperature.FAHRENHEIT, 73)],
+    [(METRIC_SYSTEM, 26), (US_CUSTOMARY_SYSTEM, 73)],
 )
 async def test_send_target_temperature(
-    hass: HomeAssistant, discovery, device, units, temperature
+    hass: HomeAssistant, discovery, device, units: UnitSystem, temperature
 ) -> None:
     """Test for sending target temperature command to the device."""
-    hass.config.units.temperature_unit = units
+    hass.config.units = units
 
     device().power = True
     device().mode = HVAC_MODES_REVERSE.get(HVACMode.AUTO)
 
     fake_device = device()
-    if units == UnitOfTemperature.FAHRENHEIT:
+    if units.temperature_unit == UnitOfTemperature.FAHRENHEIT:
         fake_device.temperature_units = 1
 
     await async_setup_gree(hass)
@@ -434,7 +440,7 @@ async def test_send_target_temperature(
         ENTITY_ID,
         "off",
         {
-            ATTR_UNIT_OF_MEASUREMENT: units,
+            ATTR_UNIT_OF_MEASUREMENT: units.temperature_unit,
         },
     )
 
@@ -450,10 +456,6 @@ async def test_send_target_temperature(
     assert state.attributes.get(ATTR_TEMPERATURE) == temperature
     assert state.state == HVAC_MODES.get(fake_device.mode)
 
-    # Reset config temperature_unit back to CELSIUS, required for
-    # additional tests outside this component.
-    hass.config.units.temperature_unit = UnitOfTemperature.CELSIUS
-
 
 @pytest.mark.parametrize(
     ("temperature", "hvac_mode"),
@@ -492,17 +494,17 @@ async def test_send_target_temperature_with_hvac_mode(
 @pytest.mark.parametrize(
     ("units", "temperature"),
     [
-        (UnitOfTemperature.CELSIUS, 25),
-        (UnitOfTemperature.FAHRENHEIT, 73),
-        (UnitOfTemperature.FAHRENHEIT, 74),
+        (METRIC_SYSTEM, 25),
+        (US_CUSTOMARY_SYSTEM, 73),
+        (US_CUSTOMARY_SYSTEM, 74),
     ],
 )
 async def test_send_target_temperature_device_timeout(
-    hass: HomeAssistant, discovery, device, units, temperature
+    hass: HomeAssistant, discovery, device, units: UnitSystem, temperature
 ) -> None:
     """Test for sending target temperature command to the device with a device timeout."""
-    hass.config.units.temperature_unit = units
-    if units == UnitOfTemperature.FAHRENHEIT:
+    hass.config.units = units
+    if units.temperature_unit == UnitOfTemperature.FAHRENHEIT:
         device().temperature_units = 1
     device().push_state_update.side_effect = DeviceTimeoutError
 
@@ -519,24 +521,21 @@ async def test_send_target_temperature_device_timeout(
     assert state is not None
     assert state.attributes.get(ATTR_TEMPERATURE) == temperature
 
-    # Reset config temperature_unit back to CELSIUS, required for additional tests outside this component.
-    hass.config.units.temperature_unit = UnitOfTemperature.CELSIUS
-
 
 @pytest.mark.parametrize(
     ("units", "temperature"),
     [
-        (UnitOfTemperature.CELSIUS, 25),
-        (UnitOfTemperature.FAHRENHEIT, 73),
-        (UnitOfTemperature.FAHRENHEIT, 74),
+        (METRIC_SYSTEM, 25),
+        (US_CUSTOMARY_SYSTEM, 73),
+        (US_CUSTOMARY_SYSTEM, 74),
     ],
 )
 async def test_update_target_temperature(
-    hass: HomeAssistant, discovery, device, units, temperature
+    hass: HomeAssistant, discovery, device, units: UnitSystem, temperature
 ) -> None:
     """Test for updating target temperature from the device."""
-    hass.config.units.temperature_unit = units
-    if units == UnitOfTemperature.FAHRENHEIT:
+    hass.config.units = units
+    if units.temperature_unit == UnitOfTemperature.FAHRENHEIT:
         device().temperature_units = 1
     device().target_temperature = temperature
 
@@ -553,9 +552,6 @@ async def test_update_target_temperature(
     assert state is not None
     assert state.attributes.get(ATTR_TEMPERATURE) == temperature
 
-    # Reset config temperature_unit back to CELSIUS, required for additional tests outside this component.
-    hass.config.units.temperature_unit = UnitOfTemperature.CELSIUS
-
 
 @pytest.mark.parametrize(
     "preset", [PRESET_AWAY, PRESET_ECO, PRESET_SLEEP, PRESET_BOOST, PRESET_NONE]
diff --git a/tests/components/group/test_cover.py b/tests/components/group/test_cover.py
index b1f622569bd..ab92b18cc91 100644
--- a/tests/components/group/test_cover.py
+++ b/tests/components/group/test_cover.py
@@ -38,7 +38,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import assert_setup_component, async_fire_time_changed
 
diff --git a/tests/components/group/test_light.py b/tests/components/group/test_light.py
index 91604d663b3..dbd74e95780 100644
--- a/tests/components/group/test_light.py
+++ b/tests/components/group/test_light.py
@@ -6,8 +6,7 @@ from unittest.mock import MagicMock, patch
 import pytest
 
 from homeassistant import config as hass_config
-from homeassistant.components.group import DOMAIN, SERVICE_RELOAD
-import homeassistant.components.group.light as group
+from homeassistant.components.group import DOMAIN, SERVICE_RELOAD, light as group
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
     ATTR_COLOR_MODE,
diff --git a/tests/components/group/test_sensor.py b/tests/components/group/test_sensor.py
index de406cb251c..187991141e7 100644
--- a/tests/components/group/test_sensor.py
+++ b/tests/components/group/test_sensor.py
@@ -35,8 +35,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import issue_registry as ir
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er, issue_registry as ir
 from homeassistant.setup import async_setup_component
 
 from tests.common import get_fixture_path
diff --git a/tests/components/guardian/test_diagnostics.py b/tests/components/guardian/test_diagnostics.py
index faba2103000..4487d0b6ac6 100644
--- a/tests/components/guardian/test_diagnostics.py
+++ b/tests/components/guardian/test_diagnostics.py
@@ -42,6 +42,7 @@ async def test_entry_diagnostics(
             "created_at": ANY,
             "modified_at": ANY,
             "discovery_keys": {},
+            "subentries": [],
         },
         "data": {
             "valve_controller": {
diff --git a/tests/components/habitica/__snapshots__/test_image/test_image_platform.1.png b/tests/components/habitica/__snapshots__/test_image/test_image_platform.1.png
new file mode 100644
index 00000000000..5bb8c9d9f09
Binary files /dev/null and b/tests/components/habitica/__snapshots__/test_image/test_image_platform.1.png differ
diff --git a/tests/components/habitica/__snapshots__/test_image/test_image_platform.png b/tests/components/habitica/__snapshots__/test_image/test_image_platform.png
new file mode 100644
index 00000000000..8e9b046ee05
Binary files /dev/null and b/tests/components/habitica/__snapshots__/test_image/test_image_platform.png differ
diff --git a/tests/components/habitica/conftest.py b/tests/components/habitica/conftest.py
index daf1c669463..4ef14699e0b 100644
--- a/tests/components/habitica/conftest.py
+++ b/tests/components/habitica/conftest.py
@@ -1,7 +1,8 @@
 """Tests for the habitica component."""
 
 from collections.abc import Generator
-from unittest.mock import AsyncMock, patch
+from unittest.mock import AsyncMock, MagicMock, patch
+from uuid import UUID
 
 from habiticalib import (
     BadRequestError,
@@ -14,10 +15,11 @@ from habiticalib import (
     HabiticaResponse,
     HabiticaScoreResponse,
     HabiticaSleepResponse,
+    HabiticaTagResponse,
     HabiticaTaskOrderResponse,
     HabiticaTaskResponse,
     HabiticaTasksResponse,
-    HabiticaUserAnonymizedrResponse,
+    HabiticaUserAnonymizedResponse,
     HabiticaUserResponse,
     NotAuthorizedError,
     NotFoundError,
@@ -140,10 +142,19 @@ async def mock_habiticalib() -> Generator[AsyncMock]:
             {"data": [], "success": True}
         )
         client.get_user_anonymized.return_value = (
-            HabiticaUserAnonymizedrResponse.from_json(
+            HabiticaUserAnonymizedResponse.from_json(
                 load_fixture("anonymized.json", DOMAIN)
             )
         )
+        client.update_task.return_value = HabiticaTaskResponse.from_json(
+            load_fixture("task.json", DOMAIN)
+        )
+        client.create_tag.return_value = HabiticaTagResponse.from_json(
+            load_fixture("create_tag.json", DOMAIN)
+        )
+        client.create_task.return_value = HabiticaTaskResponse.from_json(
+            load_fixture("task.json", DOMAIN)
+        )
         client.habitipy.return_value = {
             "tasks": {
                 "user": {
@@ -166,3 +177,13 @@ def mock_setup_entry() -> Generator[AsyncMock]:
         "homeassistant.components.habitica.async_setup_entry", return_value=True
     ) as mock_setup_entry:
         yield mock_setup_entry
+
+
+@pytest.fixture
+def mock_uuid4() -> Generator[MagicMock]:
+    """Mock uuid4."""
+    with patch(
+        "homeassistant.components.habitica.services.uuid4", autospec=True
+    ) as mock_uuid4:
+        mock_uuid4.return_value = UUID("12345678-1234-5678-1234-567812345678")
+        yield mock_uuid4
diff --git a/tests/components/habitica/fixtures/create_tag.json b/tests/components/habitica/fixtures/create_tag.json
new file mode 100644
index 00000000000..638ec69d84e
--- /dev/null
+++ b/tests/components/habitica/fixtures/create_tag.json
@@ -0,0 +1,8 @@
+{
+  "success": true,
+  "data": {
+    "name": "Home Assistant",
+    "id": "8bc0afbf-ab8e-49a4-982d-67a40557ed1a"
+  },
+  "notifications": []
+}
diff --git a/tests/components/habitica/fixtures/reorder_dailies_response.json b/tests/components/habitica/fixtures/reorder_dailies_response.json
new file mode 100644
index 00000000000..3ad38ae9c2f
--- /dev/null
+++ b/tests/components/habitica/fixtures/reorder_dailies_response.json
@@ -0,0 +1,15 @@
+{
+  "success": true,
+  "data": [
+    "f21fa608-cfc6-4413-9fc7-0eb1b48ca43a",
+    "2c6d136c-a1c3-4bef-b7c4-fa980784b1e1",
+    "bc1d1855-b2b8-4663-98ff-62e7b763dfc4",
+    "e97659e0-2c42-4599-a7bb-00282adc410d",
+    "564b9ac9-c53d-4638-9e7f-1cd96fe19baa",
+    "f2c85972-1a19-4426-bc6d-ce3337b9d99f",
+    "6e53f1f5-a315-4edd-984d-8d762e4a08ef"
+  ],
+  "notifications": [],
+  "userV": 589,
+  "appVersion": "5.28.6"
+}
diff --git a/tests/components/habitica/fixtures/reorder_todos_response.json b/tests/components/habitica/fixtures/reorder_todos_response.json
new file mode 100644
index 00000000000..ba8118aa1da
--- /dev/null
+++ b/tests/components/habitica/fixtures/reorder_todos_response.json
@@ -0,0 +1,12 @@
+{
+  "success": true,
+  "data": [
+    "88de7cd9-af2b-49ce-9afd-bf941d87336b",
+    "1aa3137e-ef72-4d1f-91ee-41933602f438",
+    "2f6fcabc-f670-4ec3-ba65-817e8deea490",
+    "86ea2475-d1b5-4020-bdcc-c188c7996afa"
+  ],
+  "notifications": [],
+  "userV": 589,
+  "appVersion": "5.28.6"
+}
diff --git a/tests/components/habitica/fixtures/reward.json b/tests/components/habitica/fixtures/reward.json
new file mode 100644
index 00000000000..1c639c4298e
--- /dev/null
+++ b/tests/components/habitica/fixtures/reward.json
@@ -0,0 +1,27 @@
+{
+  "success": true,
+  "data": {
+    "_id": "5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b",
+    "type": "reward",
+    "text": "Belohne Dich selbst",
+    "notes": "Schaue fern, spiele ein Spiel, gönne Dir einen Leckerbissen, es liegt ganz bei Dir!",
+    "tags": [],
+    "value": 10,
+    "priority": 1,
+    "attribute": "str",
+    "challenge": {},
+    "group": {
+      "completedBy": {},
+      "assignedUsers": []
+    },
+    "byHabitica": false,
+    "reminders": [],
+    "createdAt": "2024-07-07T17:51:53.266Z",
+    "updatedAt": "2024-07-07T17:51:53.266Z",
+    "userId": "5f359083-ef78-4af0-985a-0b2c6d05797c",
+    "id": "5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b"
+  },
+  "notifications": [],
+  "userV": 589,
+  "appVersion": "5.28.6"
+}
diff --git a/tests/components/habitica/fixtures/tasks.json b/tests/components/habitica/fixtures/tasks.json
index cf6e3864675..085508b4432 100644
--- a/tests/components/habitica/fixtures/tasks.json
+++ b/tests/components/habitica/fixtures/tasks.json
@@ -425,7 +425,18 @@
       "date": "2024-09-27T22:17:00.000Z",
       "completed": false,
       "collapseChecklist": false,
-      "checklist": [],
+      "checklist": [
+        {
+          "completed": false,
+          "id": "fccc26f2-1e2b-4bf8-9dd0-a405be261036",
+          "text": "Checklist-item1"
+        },
+        {
+          "completed": true,
+          "id": "5a897af4-ea94-456a-a2bd-f336bcd79509",
+          "text": "Checklist-item2"
+        }
+      ],
       "type": "todo",
       "text": "Buch zu Ende lesen",
       "notes": "Das Buch, das du angefangen hast, bis zum Wochenende fertig lesen.",
@@ -533,7 +544,10 @@
       "type": "reward",
       "text": "Belohne Dich selbst",
       "notes": "Schaue fern, spiele ein Spiel, gönne Dir einen Leckerbissen, es liegt ganz bei Dir!",
-      "tags": [],
+      "tags": [
+        "3450351f-1323-4c7e-9fd2-0cdff25b3ce0",
+        "b2780f82-b3b5-49a3-a677-48f2c8c7e3bb"
+      ],
       "value": 10,
       "priority": 1,
       "attribute": "str",
@@ -591,7 +605,18 @@
       "startDate": "2024-09-20T23:00:00.000Z",
       "daysOfMonth": [],
       "weeksOfMonth": [3],
-      "checklist": [],
+      "checklist": [
+        {
+          "completed": false,
+          "id": "a2a6702d-58e1-46c2-a3ce-422d525cc0b6",
+          "text": "Checklist-item1"
+        },
+        {
+          "completed": true,
+          "id": "9f64e1cd-b0ab-4577-8344-c7a5e1827997",
+          "text": "Checklist-item2"
+        }
+      ],
       "reminders": [],
       "createdAt": "2024-10-10T15:57:14.304Z",
       "updatedAt": "2024-11-27T23:47:29.986Z",
diff --git a/tests/components/habitica/fixtures/user.json b/tests/components/habitica/fixtures/user.json
index 255d9c7c3b5..58eca2837b6 100644
--- a/tests/components/habitica/fixtures/user.json
+++ b/tests/components/habitica/fixtures/user.json
@@ -2,8 +2,18 @@
   "success": true,
   "data": {
     "api_user": "test-api-user",
-    "profile": { "name": "test-user" },
-    "auth": { "local": { "username": "test-username" } },
+    "profile": {
+      "name": "test-user",
+      "blurb": "My mind is a swirling miasma of scintillating thoughts and turgid ideas.",
+      "imageUrl": "https://pbs.twimg.com/profile_images/378800000771780608/a32e71fe6a64eba6773c20d289eddc8e.png"
+    },
+    "auth": {
+      "local": { "username": "test-username" },
+      "timestamps": {
+        "created": "2013-12-02T22:23:29.249Z",
+        "loggedin": "2025-02-02T03:14:33.864Z"
+      }
+    },
     "stats": {
       "buffs": {
         "str": 26,
@@ -143,6 +153,26 @@
           "trinkets": 0
         }
       }
-    }
+    },
+    "webhooks": [
+      {
+        "id": "43a67e37-1bae-4b11-8d3d-6c4b1b480231",
+        "type": "taskActivity",
+        "label": "My Webhook",
+        "url": "https://some-webhook-url.com",
+        "enabled": true,
+        "failures": 0,
+        "options": {
+          "created": false,
+          "updated": false,
+          "deleted": false,
+          "checklistScored": false,
+          "scored": true
+        },
+        "createdAt": "2025-02-08T22:06:08.894Z",
+        "updatedAt": "2025-02-08T22:06:17.195Z"
+      }
+    ],
+    "loginIncentives": 241
   }
 }
diff --git a/tests/components/habitica/snapshots/test_binary_sensor.ambr b/tests/components/habitica/snapshots/test_binary_sensor.ambr
index 0a4076a6135..ffe4ce83d0e 100644
--- a/tests/components/habitica/snapshots/test_binary_sensor.ambr
+++ b/tests/components/habitica/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/habitica/snapshots/test_button.ambr b/tests/components/habitica/snapshots/test_button.ambr
index 76a0198d5b2..5c6ad640039 100644
--- a/tests/components/habitica/snapshots/test_button.ambr
+++ b/tests/components/habitica/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -99,6 +101,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -146,6 +149,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -193,6 +197,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -240,6 +245,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -286,6 +292,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -333,6 +340,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -379,6 +387,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -425,6 +434,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -472,6 +482,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -518,6 +529,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -564,6 +576,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -611,6 +624,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -658,6 +672,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -704,6 +719,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -751,6 +767,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -798,6 +815,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -845,6 +863,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -891,6 +910,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -937,6 +957,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -984,6 +1005,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1030,6 +1052,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1077,6 +1100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1124,6 +1148,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1171,6 +1196,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1218,6 +1244,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1264,6 +1291,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/habitica/snapshots/test_calendar.ambr b/tests/components/habitica/snapshots/test_calendar.ambr
index 8be45ccc0fd..2948f31f1cf 100644
--- a/tests/components/habitica/snapshots/test_calendar.ambr
+++ b/tests/components/habitica/snapshots/test_calendar.ambr
@@ -906,6 +906,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -959,6 +960,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1011,6 +1013,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1063,6 +1066,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/habitica/snapshots/test_diagnostics.ambr b/tests/components/habitica/snapshots/test_diagnostics.ambr
index b4304e33ec8..718aea99ebc 100644
--- a/tests/components/habitica/snapshots/test_diagnostics.ambr
+++ b/tests/components/habitica/snapshots/test_diagnostics.ambr
@@ -8,49 +8,31 @@
     'habitica_data': dict({
       'tasks': list([
         dict({
-          'Type': 'habit',
-          'alias': None,
           'attribute': 'str',
           'byHabitica': False,
           'challenge': dict({
-            'broken': None,
-            'id': None,
-            'shortName': None,
-            'taskId': None,
-            'winner': None,
           }),
           'checklist': list([
           ]),
           'collapseChecklist': False,
-          'completed': None,
           'counterDown': 0,
           'counterUp': 0,
           'createdAt': '2024-10-10T15:57:14.287000+00:00',
-          'date': None,
           'daysOfMonth': list([
           ]),
           'down': False,
-          'everyX': None,
           'frequency': 'daily',
           'group': dict({
-            'assignedDate': None,
             'assignedUsers': list([
             ]),
             'assignedUsersDetail': dict({
             }),
-            'assigningUsername': None,
             'completedBy': dict({
-              'date': None,
-              'userId': None,
             }),
-            'id': None,
-            'managerNotes': None,
-            'taskId': None,
           }),
           'history': list([
           ]),
           'id': '30923acd-3b4c-486d-9ef3-c8f57cf56049',
-          'isDue': None,
           'nextDue': list([
           ]),
           'notes': 'task notes',
@@ -66,62 +48,40 @@
             'th': False,
             'w': True,
           }),
-          'startDate': None,
-          'streak': None,
           'tags': list([
           ]),
           'text': 'task text',
+          'type': 'habit',
           'up': True,
           'updatedAt': '2024-10-10T15:57:14.287000+00:00',
           'userId': 'ffce870c-3ff3-4fa4-bad1-87612e52b8e7',
           'value': 0.0,
           'weeksOfMonth': list([
           ]),
-          'yesterDaily': None,
         }),
         dict({
-          'Type': 'todo',
-          'alias': None,
           'attribute': 'str',
           'byHabitica': True,
           'challenge': dict({
-            'broken': None,
-            'id': None,
-            'shortName': None,
-            'taskId': None,
-            'winner': None,
           }),
           'checklist': list([
           ]),
           'collapseChecklist': False,
           'completed': False,
-          'counterDown': None,
-          'counterUp': None,
           'createdAt': '2024-10-10T15:57:14.290000+00:00',
-          'date': None,
           'daysOfMonth': list([
           ]),
-          'down': None,
-          'everyX': None,
-          'frequency': None,
           'group': dict({
-            'assignedDate': None,
             'assignedUsers': list([
             ]),
             'assignedUsersDetail': dict({
             }),
-            'assigningUsername': None,
             'completedBy': dict({
-              'date': None,
-              'userId': None,
             }),
-            'id': None,
-            'managerNotes': None,
-            'taskId': None,
           }),
-          'history': None,
+          'history': list([
+          ]),
           'id': 'e6e06dc6-c887-4b86-b175-b99cc2e20fdf',
-          'isDue': None,
           'nextDue': list([
           ]),
           'notes': 'task notes',
@@ -137,62 +97,38 @@
             'th': False,
             'w': True,
           }),
-          'startDate': None,
-          'streak': None,
           'tags': list([
           ]),
           'text': 'task text',
-          'up': None,
+          'type': 'todo',
           'updatedAt': '2024-11-27T19:34:29.001000+00:00',
           'userId': 'ffce870c-3ff3-4fa4-bad1-87612e52b8e7',
           'value': -6.418582324043852,
           'weeksOfMonth': list([
           ]),
-          'yesterDaily': None,
         }),
         dict({
-          'Type': 'reward',
-          'alias': None,
           'attribute': 'str',
           'byHabitica': False,
           'challenge': dict({
-            'broken': None,
-            'id': None,
-            'shortName': None,
-            'taskId': None,
-            'winner': None,
           }),
           'checklist': list([
           ]),
           'collapseChecklist': False,
-          'completed': None,
-          'counterDown': None,
-          'counterUp': None,
           'createdAt': '2024-10-10T15:57:14.290000+00:00',
-          'date': None,
           'daysOfMonth': list([
           ]),
-          'down': None,
-          'everyX': None,
-          'frequency': None,
           'group': dict({
-            'assignedDate': None,
             'assignedUsers': list([
             ]),
             'assignedUsersDetail': dict({
             }),
-            'assigningUsername': None,
             'completedBy': dict({
-              'date': None,
-              'userId': None,
             }),
-            'id': None,
-            'managerNotes': None,
-            'taskId': None,
           }),
-          'history': None,
+          'history': list([
+          ]),
           'id': '2fbf11a5-ab1e-4fb7-97f0-dfb5c45c96a9',
-          'isDue': None,
           'nextDue': list([
           ]),
           'notes': 'task notes',
@@ -208,106 +144,73 @@
             'th': False,
             'w': True,
           }),
-          'startDate': None,
-          'streak': None,
           'tags': list([
           ]),
           'text': 'task text',
-          'up': None,
+          'type': 'reward',
           'updatedAt': '2024-10-10T15:57:14.290000+00:00',
           'userId': 'ffce870c-3ff3-4fa4-bad1-87612e52b8e7',
           'value': 10.0,
           'weeksOfMonth': list([
           ]),
-          'yesterDaily': None,
         }),
         dict({
-          'Type': 'daily',
-          'alias': None,
           'attribute': 'str',
           'byHabitica': False,
           'challenge': dict({
-            'broken': None,
-            'id': None,
-            'shortName': None,
-            'taskId': None,
-            'winner': None,
           }),
           'checklist': list([
           ]),
           'collapseChecklist': False,
           'completed': False,
-          'counterDown': None,
-          'counterUp': None,
           'createdAt': '2024-10-10T15:57:14.304000+00:00',
-          'date': None,
           'daysOfMonth': list([
           ]),
-          'down': None,
           'everyX': 1,
           'frequency': 'weekly',
           'group': dict({
-            'assignedDate': None,
             'assignedUsers': list([
             ]),
             'assignedUsersDetail': dict({
             }),
-            'assigningUsername': None,
             'completedBy': dict({
-              'date': None,
-              'userId': None,
             }),
-            'id': None,
-            'managerNotes': None,
-            'taskId': None,
           }),
           'history': list([
             dict({
               'completed': True,
               'date': '2024-10-30T19:37:01.817000+00:00',
               'isDue': True,
-              'scoredDown': None,
-              'scoredUp': None,
               'value': 1.0,
             }),
             dict({
               'completed': True,
               'date': '2024-10-31T23:33:14.890000+00:00',
               'isDue': True,
-              'scoredDown': None,
-              'scoredUp': None,
               'value': 1.9747,
             }),
             dict({
               'completed': False,
               'date': '2024-11-05T18:25:04.730000+00:00',
               'isDue': True,
-              'scoredDown': None,
-              'scoredUp': None,
               'value': 1.024043774264157,
             }),
             dict({
               'completed': False,
               'date': '2024-11-21T15:09:07.573000+00:00',
               'isDue': True,
-              'scoredDown': None,
-              'scoredUp': None,
               'value': 0.049944135963563174,
             }),
             dict({
               'completed': False,
               'date': '2024-11-22T00:41:21.228000+00:00',
               'isDue': True,
-              'scoredDown': None,
-              'scoredUp': None,
               'value': -0.9487768368544092,
             }),
             dict({
               'completed': False,
               'date': '2024-11-27T19:34:28.973000+00:00',
               'isDue': True,
-              'scoredDown': None,
-              'scoredUp': None,
               'value': -1.973387732005249,
             }),
           ]),
@@ -339,7 +242,7 @@
           'tags': list([
           ]),
           'text': 'task text',
-          'up': None,
+          'type': 'daily',
           'updatedAt': '2024-11-27T19:34:29.001000+00:00',
           'userId': 'ffce870c-3ff3-4fa4-bad1-87612e52b8e7',
           'value': -1.973387732005249,
@@ -350,60 +253,23 @@
       ]),
       'user': dict({
         'achievements': dict({
-          'backToBasics': None,
-          'boneCollector': None,
           'challenges': list([
           ]),
           'completedTask': True,
           'createdTask': True,
-          'dustDevil': None,
-          'fedPet': None,
-          'goodAsGold': None,
-          'hatchedPet': None,
-          'joinedChallenge': None,
-          'joinedGuild': None,
-          'partyUp': None,
           'perfect': 2,
-          'primedForPainting': None,
-          'purchasedEquipment': None,
           'quests': dict({
-            'atom1': None,
-            'atom2': None,
-            'atom3': None,
-            'bewilder': None,
-            'burnout': None,
-            'dilatory': None,
-            'dilatory_derby': None,
-            'dysheartener': None,
-            'evilsanta': None,
-            'evilsanta2': None,
-            'gryphon': None,
-            'harpy': None,
-            'stressbeast': None,
-            'vice1': None,
-            'vice3': None,
           }),
-          'seeingRed': None,
-          'shadyCustomer': None,
           'streak': 0,
-          'tickledPink': None,
           'ultimateGearSets': dict({
             'healer': False,
             'rogue': False,
             'warrior': False,
             'wizard': False,
           }),
-          'violetsAreBlue': None,
         }),
         'auth': dict({
-          'apple': None,
-          'facebook': None,
-          'google': None,
           'local': dict({
-            'email': None,
-            'has_password': None,
-            'lowerCaseUsername': None,
-            'username': None,
           }),
           'timestamps': dict({
             'created': '2024-10-10T15:57:01.106000+00:00',
@@ -412,17 +278,11 @@
           }),
         }),
         'backer': dict({
-          'npc': None,
-          'tier': None,
-          'tokensApplied': None,
         }),
         'balance': 0.0,
         'challenges': list([
         ]),
         'contributor': dict({
-          'contributions': None,
-          'level': None,
-          'text': None,
         }),
         'extra': dict({
         }),
@@ -431,23 +291,17 @@
           'armoireEnabled': True,
           'armoireOpened': False,
           'cardReceived': False,
-          'chatRevoked': None,
-          'chatShadowMuted': None,
           'classSelected': False,
           'communityGuidelinesAccepted': True,
           'cronCount': 6,
           'customizationsNotification': True,
           'dropsEnabled': False,
           'itemsEnabled': True,
-          'lastFreeRebirth': None,
           'lastNewStuffRead': '',
           'lastWeeklyRecap': '2024-10-10T15:57:01.106000+00:00',
-          'lastWeeklyRecapDiscriminator': None,
           'levelDrops': dict({
           }),
-          'mathUpdates': None,
           'newStuff': False,
-          'onboardingEmailsPhase': None,
           'rebirthEnabled': False,
           'recaptureEmailsPhase': 0,
           'rewrite': True,
@@ -506,101 +360,53 @@
         'history': dict({
           'exp': list([
             dict({
-              'completed': None,
               'date': '2024-10-30T19:37:01.970000+00:00',
-              'isDue': None,
-              'scoredDown': None,
-              'scoredUp': None,
               'value': 24.0,
             }),
             dict({
-              'completed': None,
               'date': '2024-10-31T23:33:14.972000+00:00',
-              'isDue': None,
-              'scoredDown': None,
-              'scoredUp': None,
               'value': 48.0,
             }),
             dict({
-              'completed': None,
               'date': '2024-11-05T18:25:04.681000+00:00',
-              'isDue': None,
-              'scoredDown': None,
-              'scoredUp': None,
               'value': 66.0,
             }),
             dict({
-              'completed': None,
               'date': '2024-11-21T15:09:07.501000+00:00',
-              'isDue': None,
-              'scoredDown': None,
-              'scoredUp': None,
               'value': 66.0,
             }),
             dict({
-              'completed': None,
               'date': '2024-11-22T00:41:21.137000+00:00',
-              'isDue': None,
-              'scoredDown': None,
-              'scoredUp': None,
               'value': 66.0,
             }),
             dict({
-              'completed': None,
               'date': '2024-11-27T19:34:28.887000+00:00',
-              'isDue': None,
-              'scoredDown': None,
-              'scoredUp': None,
               'value': 66.0,
             }),
           ]),
           'todos': list([
             dict({
-              'completed': None,
               'date': '2024-10-30T19:37:01.970000+00:00',
-              'isDue': None,
-              'scoredDown': None,
-              'scoredUp': None,
               'value': -5.0,
             }),
             dict({
-              'completed': None,
               'date': '2024-10-31T23:33:14.972000+00:00',
-              'isDue': None,
-              'scoredDown': None,
-              'scoredUp': None,
               'value': -10.129783523135325,
             }),
             dict({
-              'completed': None,
               'date': '2024-11-05T18:25:04.681000+00:00',
-              'isDue': None,
-              'scoredDown': None,
-              'scoredUp': None,
               'value': -16.396221153338182,
             }),
             dict({
-              'completed': None,
               'date': '2024-11-21T15:09:07.501000+00:00',
-              'isDue': None,
-              'scoredDown': None,
-              'scoredUp': None,
               'value': -22.8326979965846,
             }),
             dict({
-              'completed': None,
               'date': '2024-11-22T00:41:21.137000+00:00',
-              'isDue': None,
-              'scoredDown': None,
-              'scoredUp': None,
               'value': -29.448636229365235,
             }),
             dict({
-              'completed': None,
               'date': '2024-11-27T19:34:28.887000+00:00',
-              'isDue': None,
-              'scoredDown': None,
-              'scoredUp': None,
               'value': -36.25425987861077,
             }),
           ]),
@@ -641,23 +447,13 @@
           'gear': dict({
             'costume': dict({
               'armor': 'armor_base_0',
-              'back': None,
-              'body': None,
-              'eyewear': None,
               'head': 'head_base_0',
-              'headAccessory': None,
               'shield': 'shield_base_0',
-              'weapon': None,
             }),
             'equipped': dict({
               'armor': 'armor_base_0',
-              'back': None,
-              'body': None,
-              'eyewear': None,
               'head': 'head_base_0',
-              'headAccessory': None,
               'shield': 'shield_base_0',
-              'weapon': None,
             }),
             'owned': dict({
               'armor_special_bardRobes': True,
@@ -734,7 +530,6 @@
         }),
         'lastCron': '2024-11-27T19:34:28.887000+00:00',
         'loginIncentives': 6,
-        'needsCron': None,
         'newMessages': dict({
         }),
         'notifications': list([
@@ -745,7 +540,6 @@
           'orderAscending': 'ascending',
           'quest': dict({
             'RSVPNeeded': True,
-            'completed': None,
             'key': 'dustbunnies',
             'progress': dict({
               'collect': dict({
@@ -757,37 +551,31 @@
           }),
         }),
         'permissions': dict({
-          'challengeAdmin': None,
-          'coupons': None,
-          'fullAccess': None,
-          'moderator': None,
-          'news': None,
-          'userSupport': None,
         }),
         'pinnedItems': list([
           dict({
-            'Type': 'marketGear',
             'path': 'gear.flat.weapon_warrior_0',
+            'type': 'marketGear',
           }),
           dict({
-            'Type': 'marketGear',
             'path': 'gear.flat.armor_warrior_1',
+            'type': 'marketGear',
           }),
           dict({
-            'Type': 'marketGear',
             'path': 'gear.flat.shield_warrior_1',
+            'type': 'marketGear',
           }),
           dict({
-            'Type': 'marketGear',
             'path': 'gear.flat.head_warrior_1',
+            'type': 'marketGear',
           }),
           dict({
-            'Type': 'potion',
             'path': 'potion',
+            'type': 'potion',
           }),
           dict({
-            'Type': 'armoire',
             'path': 'armoire',
+            'type': 'armoire',
           }),
         ]),
         'pinnedItemsOrder': list([
@@ -796,7 +584,6 @@
           'advancedCollapsed': False,
           'allocationMode': 'flat',
           'autoEquip': True,
-          'automaticAllocation': None,
           'background': 'violet',
           'chair': 'none',
           'costume': False,
@@ -886,9 +673,6 @@
           }),
         }),
         'profile': dict({
-          'blurb': None,
-          'imageUrl': None,
-          'name': None,
         }),
         'purchased': dict({
           'ads': False,
@@ -902,21 +686,11 @@
           }),
           'hair': dict({
           }),
-          'mobileChat': None,
           'plan': dict({
             'consecutive': dict({
-              'count': None,
-              'gemCapExtra': None,
-              'offset': None,
-              'trinkets': None,
             }),
-            'dateUpdated': None,
-            'extraMonths': None,
-            'gemsBought': None,
             'mysteryItems': list([
             ]),
-            'perkMonthCount': None,
-            'quantity': None,
           }),
           'shirt': dict({
           }),
@@ -926,81 +700,73 @@
         }),
         'pushDevices': list([
         ]),
-        'secret': None,
         'stats': dict({
-          'Class': 'warrior',
-          'Int': 0,
-          'Str': 0,
           'buffs': dict({
-            'Int': 0,
-            'Str': 0,
             'con': 0,
+            'int': 0,
             'per': 0,
             'seafoam': False,
             'shinySeed': False,
             'snowball': False,
             'spookySparkles': False,
             'stealth': 0,
+            'str': 0,
             'streaks': False,
           }),
+          'class': 'warrior',
           'con': 0,
           'exp': 41,
           'gp': 11.100978952781748,
           'hp': 25.40000000000002,
+          'int': 0,
           'lvl': 2,
           'maxHealth': 50,
           'maxMP': 32,
           'mp': 32.0,
           'per': 0,
           'points': 2,
+          'str': 0,
           'toNextLevel': 50,
           'training': dict({
-            'Int': 0,
-            'Str': 0.0,
             'con': 0,
+            'int': 0,
             'per': 0,
+            'str': 0.0,
           }),
         }),
         'tags': list([
           dict({
             'challenge': True,
-            'group': None,
             'id': 'c1a35186-9895-4ac0-9cd7-49e7bb875695',
             'name': 'tag',
           }),
           dict({
             'challenge': True,
-            'group': None,
             'id': '53d1deb8-ed2b-4f94-bbfc-955e9e92aa98',
             'name': 'tag',
           }),
           dict({
             'challenge': True,
-            'group': None,
             'id': '29bf6a99-536f-446b-838f-a81d41e1ed4d',
             'name': 'tag',
           }),
           dict({
             'challenge': True,
-            'group': None,
             'id': '1b1297e7-4fd8-460a-b148-e92d7bcfa9a5',
             'name': 'tag',
           }),
           dict({
             'challenge': True,
-            'group': None,
             'id': '05e6cf40-48ea-415a-9b8b-e2ecad258ef6',
             'name': 'tag',
           }),
           dict({
             'challenge': True,
-            'group': None,
             'id': 'fe53f179-59d8-4c28-9bf7-b9068ab552a4',
             'name': 'tag',
           }),
           dict({
             'challenge': True,
-            'group': None,
             'id': 'c44e9e8c-4bff-42df-98d5-1a1a7b69eada',
             'name': 'tag',
           }),
diff --git a/tests/components/habitica/snapshots/test_sensor.ambr b/tests/components/habitica/snapshots/test_sensor.ambr
index 9050db1946d..1fbc9eca595 100644
--- a/tests/components/habitica/snapshots/test_sensor.ambr
+++ b/tests/components/habitica/snapshots/test_sensor.ambr
@@ -13,6 +13,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -67,6 +68,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -122,6 +124,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -151,7 +154,12 @@
 # name: test_sensors[sensor.test_user_display_name-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
+      'blurb': 'My mind is a swirling miasma of scintillating thoughts and turgid ideas.',
+      'entity_picture': 'https://pbs.twimg.com/profile_images/378800000771780608/a32e71fe6a64eba6773c20d289eddc8e.png',
       'friendly_name': 'test-user Display name',
+      'joined': datetime.date(2013, 12, 2),
+      'last_login': datetime.date(2025, 2, 1),
+      'total_logins': 241,
     }),
     'context': <ANY>,
     'entity_id': 'sensor.test_user_display_name',
@@ -168,6 +176,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -219,6 +228,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -267,6 +277,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -318,6 +329,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -369,6 +381,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -575,6 +588,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -626,6 +640,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -677,6 +692,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -732,6 +748,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -778,6 +795,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -829,6 +847,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -876,6 +895,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -924,6 +944,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -975,6 +996,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1023,6 +1045,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1078,6 +1101,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1129,6 +1153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1181,6 +1206,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1245,6 +1271,10 @@
           'th': False,
           'w': True,
         }),
+        'tags': list([
+          '3450351f-1323-4c7e-9fd2-0cdff25b3ce0',
+          'b2780f82-b3b5-49a3-a677-48f2c8c7e3bb',
+        ]),
         'text': 'Belohne Dich selbst',
         'type': 'reward',
         'value': 10.0,
@@ -1267,6 +1297,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1315,6 +1346,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/habitica/snapshots/test_services.ambr b/tests/components/habitica/snapshots/test_services.ambr
index d0062212775..430cd379c0d 100644
--- a/tests/components/habitica/snapshots/test_services.ambr
+++ b/tests/components/habitica/snapshots/test_services.ambr
@@ -3,9 +3,8 @@
   dict({
     'tasks': list([
       dict({
-        'Type': <TaskType.HABIT: 'habit'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -20,13 +19,13 @@
         'completed': None,
         'counterDown': 0,
         'counterUp': 0,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 268000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.268000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': True,
         'everyX': None,
-        'frequency': <Frequency.DAILY: 'daily'>,
+        'frequency': 'daily',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -44,12 +43,12 @@
         }),
         'history': list([
         ]),
-        'id': UUID('f21fa608-cfc6-4413-9fc7-0eb1b48ca43a'),
+        'id': 'f21fa608-cfc6-4413-9fc7-0eb1b48ca43a',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': '',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -66,18 +65,18 @@
         'tags': list([
         ]),
         'text': 'Gesundes Essen/Junkfood',
+        'type': 'habit',
         'up': True,
-        'updatedAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 268000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-07T17:51:53.268000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.HABIT: 'habit'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -92,13 +91,13 @@
         'completed': None,
         'counterDown': 0,
         'counterUp': 0,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 266000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.266000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': False,
         'everyX': None,
-        'frequency': <Frequency.DAILY: 'daily'>,
+        'frequency': 'daily',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -117,19 +116,19 @@
         'history': list([
           dict({
             'completed': None,
-            'date': datetime.datetime(2024, 7, 7, 18, 26, 3, 324000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T18:26:03.324000+00:00',
             'isDue': None,
             'scoredDown': 0,
             'scoredUp': 1,
             'value': 1.0,
           }),
         ]),
-        'id': UUID('1d147de6-5c02-4740-8e2f-71d3015a37f4'),
+        'id': '1d147de6-5c02-4740-8e2f-71d3015a37f4',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': '',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -146,18 +145,18 @@
         'tags': list([
         ]),
         'text': 'Eine kurze Pause machen',
+        'type': 'habit',
         'up': True,
-        'updatedAt': datetime.datetime(2024, 7, 12, 9, 58, 45, 438000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-12T09:58:45.438000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.HABIT: 'habit'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -172,13 +171,13 @@
         'completed': None,
         'counterDown': 0,
         'counterUp': 0,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 265000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.265000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': True,
         'everyX': None,
-        'frequency': <Frequency.DAILY: 'daily'>,
+        'frequency': 'daily',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -196,12 +195,12 @@
         }),
         'history': list([
         ]),
-        'id': UUID('bc1d1855-b2b8-4663-98ff-62e7b763dfc4'),
+        'id': 'bc1d1855-b2b8-4663-98ff-62e7b763dfc4',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Oder lösche es über die Bearbeitungs-Ansicht',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -218,18 +217,18 @@
         'tags': list([
         ]),
         'text': 'Klicke hier um dies als schlechte Gewohnheit zu markieren, die Du gerne loswerden möchtest',
+        'type': 'habit',
         'up': False,
-        'updatedAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 265000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-07T17:51:53.265000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.HABIT: 'habit'>,
         'alias': 'create_a_task',
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -244,13 +243,13 @@
         'completed': None,
         'counterDown': 0,
         'counterUp': 0,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 264000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.264000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': False,
         'everyX': None,
-        'frequency': <Frequency.DAILY: 'daily'>,
+        'frequency': 'daily',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -269,19 +268,19 @@
         'history': list([
           dict({
             'completed': None,
-            'date': datetime.datetime(2024, 7, 7, 18, 26, 3, 140000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T18:26:03.140000+00:00',
             'isDue': None,
             'scoredDown': 0,
             'scoredUp': 1,
             'value': 1.0,
           }),
         ]),
-        'id': UUID('e97659e0-2c42-4599-a7bb-00282adc410d'),
+        'id': 'e97659e0-2c42-4599-a7bb-00282adc410d',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Eine Gewohnheit, eine Tagesaufgabe oder ein To-Do',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -298,18 +297,18 @@
         'tags': list([
         ]),
         'text': 'Füge eine Aufgabe zu Habitica hinzu',
+        'type': 'habit',
         'up': True,
-        'updatedAt': datetime.datetime(2024, 7, 12, 9, 58, 45, 438000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-12T09:58:45.438000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': 'alias_zahnseide_benutzen',
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -321,7 +320,7 @@
         'checklist': list([
           dict({
             'completed': False,
-            'id': UUID('c8662c16-8cd3-4104-a3b2-b1e54f61b8ca'),
+            'id': 'c8662c16-8cd3-4104-a3b2-b1e54f61b8ca',
             'text': 'Checklist-item1',
           }),
         ]),
@@ -329,13 +328,13 @@
         'completed': True,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 268000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.268000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.WEEKLY: 'weekly'>,
+        'frequency': 'weekly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -354,7 +353,7 @@
         'history': list([
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 7, 18, 26, 6, 749000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T18:26:06.749000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -362,7 +361,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 17, 15, 11, 292000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T17:15:11.292000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -370,7 +369,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 22, 31, 46, 719000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T22:31:46.719000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -378,7 +377,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 11, 9, 44, 56, 907000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-11T09:44:56.907000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -386,7 +385,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 12, 9, 58, 45, 243000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-12T09:58:45.243000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -394,7 +393,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 8, 20, 20, 19, 56, 447000, tzinfo=datetime.timezone.utc),
+            'date': '2024-08-20T20:19:56.447000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -402,7 +401,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 8, 21, 15, 55, 7, 692000, tzinfo=datetime.timezone.utc),
+            'date': '2024-08-21T15:55:07.692000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -410,7 +409,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 20, 15, 29, 23, 640000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-20T15:29:23.640000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -418,7 +417,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 21, 23, 7, 542000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T21:23:07.542000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -426,7 +425,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 22, 1, 55, 608000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T22:01:55.608000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -434,25 +433,25 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 9, 21, 22, 24, 20, 150000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T22:24:20.150000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
             'value': -2.9663035443712333,
           }),
         ]),
-        'id': UUID('564b9ac9-c53d-4638-9e7f-1cd96fe19baa'),
+        'id': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
         'isDue': True,
         'nextDue': list([
-          datetime.datetime(2024, 9, 23, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 24, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 25, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 26, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 27, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 28, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
+          '2024-09-23T00:00:00+02:00',
+          '2024-09-24T00:00:00+02:00',
+          '2024-09-25T00:00:00+02:00',
+          '2024-09-26T00:00:00+02:00',
+          '2024-09-27T00:00:00+02:00',
+          '2024-09-28T00:00:00+02:00',
         ]),
         'notes': 'Klicke um Änderungen zu machen!',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -464,23 +463,23 @@
           'th': True,
           'w': True,
         }),
-        'startDate': datetime.datetime(2024, 7, 6, 22, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-07-06T22:00:00+00:00',
         'streak': 1,
         'tags': list([
         ]),
         'text': 'Zahnseide benutzen',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 24, 20, 154000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:24:20.154000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': -2.9663035443712333,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': True,
       }),
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -495,13 +494,13 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 266000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.266000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.WEEKLY: 'weekly'>,
+        'frequency': 'weekly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -520,7 +519,7 @@
         'history': list([
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 7, 17, 55, 3, 74000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T17:55:03.074000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -528,7 +527,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 17, 15, 11, 291000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T17:15:11.291000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -536,7 +535,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 22, 31, 46, 717000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T22:31:46.717000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -544,7 +543,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 11, 7, 20, 59, 722000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-11T07:20:59.722000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -552,7 +551,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 12, 9, 58, 45, 246000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-12T09:58:45.246000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -560,7 +559,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 12, 10, 1, 32, 219000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-12T10:01:32.219000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -568,7 +567,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 8, 21, 15, 55, 7, 691000, tzinfo=datetime.timezone.utc),
+            'date': '2024-08-21T15:55:07.691000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -576,7 +575,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 20, 15, 29, 23, 638000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-20T15:29:23.638000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -584,7 +583,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 21, 23, 7, 540000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T21:23:07.540000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -592,30 +591,30 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 22, 1, 55, 607000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T22:01:55.607000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
             'value': -1.919611992979862,
           }),
         ]),
-        'id': UUID('f2c85972-1a19-4426-bc6d-ce3337b9d99f'),
+        'id': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
         'isDue': True,
         'nextDue': list([
-          datetime.datetime(2024, 9, 22, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 23, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 24, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 25, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 26, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 27, 22, 0, tzinfo=datetime.timezone.utc),
+          '2024-09-22T22:00:00+00:00',
+          '2024-09-23T22:00:00+00:00',
+          '2024-09-24T22:00:00+00:00',
+          '2024-09-25T22:00:00+00:00',
+          '2024-09-26T22:00:00+00:00',
+          '2024-09-27T22:00:00+00:00',
         ]),
         'notes': 'Klicke um Deinen Terminplan festzulegen!',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
           dict({
-            'id': UUID('1491d640-6b21-4d0c-8940-0b7aa61c8836'),
+            'id': '1491d640-6b21-4d0c-8940-0b7aa61c8836',
             'startDate': None,
-            'time': datetime.datetime(2024, 9, 22, 20, 0, tzinfo=datetime.timezone.utc),
+            'time': '2024-09-22T20:00:00+00:00',
           }),
         ]),
         'repeat': dict({
@@ -627,23 +626,23 @@
           'th': True,
           'w': True,
         }),
-        'startDate': datetime.datetime(2024, 7, 6, 22, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-07-06T22:00:00+00:00',
         'streak': 0,
         'tags': list([
         ]),
         'text': '5 Minuten ruhig durchatmen',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 51, 41, 756000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:51:41.756000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': -1.919611992979862,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': True,
       }),
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -655,7 +654,7 @@
         'checklist': list([
           dict({
             'completed': True,
-            'id': UUID('c8662c16-8cd3-4104-a3b2-b1e54f61b8ca'),
+            'id': 'c8662c16-8cd3-4104-a3b2-b1e54f61b8ca',
             'text': 'Checklist-item1',
           }),
         ]),
@@ -663,13 +662,13 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 22, 11, 44, 43, 774000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-22T11:44:43.774000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.WEEKLY: 'weekly'>,
+        'frequency': 'weekly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -687,18 +686,18 @@
         }),
         'history': list([
         ]),
-        'id': UUID('2c6d136c-a1c3-4bef-b7c4-fa980784b1e1'),
+        'id': '2c6d136c-a1c3-4bef-b7c4-fa980784b1e1',
         'isDue': True,
         'nextDue': list([
-          datetime.datetime(2024, 9, 24, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 27, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 28, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 10, 1, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 10, 4, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 10, 8, 22, 0, tzinfo=datetime.timezone.utc),
+          '2024-09-24T22:00:00+00:00',
+          '2024-09-27T22:00:00+00:00',
+          '2024-09-28T22:00:00+00:00',
+          '2024-10-01T22:00:00+00:00',
+          '2024-10-04T22:00:00+00:00',
+          '2024-10-08T22:00:00+00:00',
         ]),
         'notes': 'Ein einstündiges Workout im Fitnessstudio absolvieren.',
-        'priority': <TaskPriority.HARD: 2>,
+        'priority': 2,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -710,24 +709,24 @@
           'th': False,
           'w': True,
         }),
-        'startDate': datetime.datetime(2024, 9, 21, 22, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-09-21T22:00:00+00:00',
         'streak': 0,
         'tags': list([
-          UUID('6aa65cbb-dc08-4fdd-9a66-7dedb7ba4cab'),
+          '6aa65cbb-dc08-4fdd-9a66-7dedb7ba4cab',
         ]),
         'text': 'Fitnessstudio besuchen',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 22, 11, 44, 43, 774000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('1343a9af-d891-4027-841a-956d105ca408'),
+        'updatedAt': '2024-09-22T11:44:43.774000+00:00',
+        'userId': '1343a9af-d891-4027-841a-956d105ca408',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': True,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -737,13 +736,23 @@
           'winner': None,
         }),
         'checklist': list([
+          dict({
+            'completed': False,
+            'id': 'fccc26f2-1e2b-4bf8-9dd0-a405be261036',
+            'text': 'Checklist-item1',
+          }),
+          dict({
+            'completed': True,
+            'id': '5a897af4-ea94-456a-a2bd-f336bcd79509',
+            'text': 'Checklist-item2',
+          }),
         ]),
         'collapseChecklist': False,
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 17, 57, 816000, tzinfo=datetime.timezone.utc),
-        'date': datetime.datetime(2024, 9, 27, 22, 17, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:17:57.816000+00:00',
+        'date': '2024-09-27T22:17:00+00:00',
         'daysOfMonth': list([
         ]),
         'down': None,
@@ -764,13 +773,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('88de7cd9-af2b-49ce-9afd-bf941d87336b'),
+        'history': list([
+        ]),
+        'id': '88de7cd9-af2b-49ce-9afd-bf941d87336b',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Das Buch, das du angefangen hast, bis zum Wochenende fertig lesen.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -785,22 +795,22 @@
         'startDate': None,
         'streak': None,
         'tags': list([
-          UUID('20409521-c096-447f-9a90-23e8da615710'),
-          UUID('8515e4ae-2f4b-455a-b4a4-8939e04b1bfd'),
+          '20409521-c096-447f-9a90-23e8da615710',
+          '8515e4ae-2f4b-455a-b4a4-8939e04b1bfd',
         ]),
         'text': 'Buch zu Ende lesen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 17, 57, 816000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:17:57.816000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': 'pay_bills',
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -815,8 +825,8 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 17, 19, 513000, tzinfo=datetime.timezone.utc),
-        'date': datetime.datetime(2024, 8, 31, 22, 16, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:17:19.513000+00:00',
+        'date': '2024-08-31T22:16:00+00:00',
         'daysOfMonth': list([
         ]),
         'down': None,
@@ -837,18 +847,19 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('2f6fcabc-f670-4ec3-ba65-817e8deea490'),
+        'history': list([
+        ]),
+        'id': '2f6fcabc-f670-4ec3-ba65-817e8deea490',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Strom- und Internetrechnungen rechtzeitig überweisen.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
           dict({
-            'id': UUID('91c09432-10ac-4a49-bd20-823081ec29ed'),
+            'id': '91c09432-10ac-4a49-bd20-823081ec29ed',
             'startDate': None,
-            'time': datetime.datetime(2024, 9, 22, 2, 0, tzinfo=datetime.timezone.utc),
+            'time': '2024-09-22T02:00:00+00:00',
           }),
         ]),
         'repeat': dict({
@@ -865,18 +876,18 @@
         'tags': list([
         ]),
         'text': 'Rechnungen bezahlen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 19, 35, 576000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:19:35.576000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -891,7 +902,7 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 16, 38, 153000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:16:38.153000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
@@ -913,13 +924,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('1aa3137e-ef72-4d1f-91ee-41933602f438'),
+        'history': list([
+        ]),
+        'id': '1aa3137e-ef72-4d1f-91ee-41933602f438',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Rasen mähen und die Pflanzen gießen.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -936,18 +948,18 @@
         'tags': list([
         ]),
         'text': 'Garten pflegen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 16, 38, 153000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:16:38.153000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -962,8 +974,8 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 16, 16, 756000, tzinfo=datetime.timezone.utc),
-        'date': datetime.datetime(2024, 9, 21, 22, 0, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:16:16.756000+00:00',
+        'date': '2024-09-21T22:00:00+00:00',
         'daysOfMonth': list([
         ]),
         'down': None,
@@ -984,13 +996,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('86ea2475-d1b5-4020-bdcc-c188c7996afa'),
+        'history': list([
+        ]),
+        'id': '86ea2475-d1b5-4020-bdcc-c188c7996afa',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Den Ausflug für das kommende Wochenende organisieren.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -1005,21 +1018,21 @@
         'startDate': None,
         'streak': None,
         'tags': list([
-          UUID('51076966-2970-4b40-b6ba-d58c6a756dd7'),
+          '51076966-2970-4b40-b6ba-d58c6a756dd7',
         ]),
         'text': 'Wochenendausflug planen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 16, 16, 756000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:16:16.756000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.REWARD: 'reward'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -1034,7 +1047,7 @@
         'completed': None,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 266000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.266000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
@@ -1056,13 +1069,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b'),
+        'history': list([
+        ]),
+        'id': '5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Schaue fern, spiele ein Spiel, gönne Dir einen Leckerbissen, es liegt ganz bei Dir!',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -1077,20 +1091,22 @@
         'startDate': None,
         'streak': None,
         'tags': list([
+          '3450351f-1323-4c7e-9fd2-0cdff25b3ce0',
+          'b2780f82-b3b5-49a3-a677-48f2c8c7e3bb',
         ]),
         'text': 'Belohne Dich selbst',
+        'type': 'reward',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 266000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-07T17:51:53.266000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 10.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -1100,18 +1116,28 @@
           'winner': None,
         }),
         'checklist': list([
+          dict({
+            'completed': False,
+            'id': 'a2a6702d-58e1-46c2-a3ce-422d525cc0b6',
+            'text': 'Checklist-item1',
+          }),
+          dict({
+            'completed': True,
+            'id': '9f64e1cd-b0ab-4577-8344-c7a5e1827997',
+            'text': 'Checklist-item2',
+          }),
         ]),
         'collapseChecklist': False,
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 10, 10, 15, 57, 14, 304000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-10-10T15:57:14.304000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.MONTHLY: 'monthly'>,
+        'frequency': 'monthly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -1129,18 +1155,18 @@
         }),
         'history': list([
         ]),
-        'id': UUID('6e53f1f5-a315-4edd-984d-8d762e4a08ef'),
+        'id': '6e53f1f5-a315-4edd-984d-8d762e4a08ef',
         'isDue': False,
         'nextDue': list([
-          datetime.datetime(2024, 12, 14, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 1, 18, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 2, 15, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 3, 15, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 4, 19, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 5, 17, 23, 0, tzinfo=datetime.timezone.utc),
+          '2024-12-14T23:00:00+00:00',
+          '2025-01-18T23:00:00+00:00',
+          '2025-02-15T23:00:00+00:00',
+          '2025-03-15T23:00:00+00:00',
+          '2025-04-19T23:00:00+00:00',
+          '2025-05-17T23:00:00+00:00',
         ]),
         'notes': 'Klicke um den Namen Deines aktuellen Projekts anzugeben & setze einen Terminplan!',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -1152,14 +1178,15 @@
           'th': False,
           'w': False,
         }),
-        'startDate': datetime.datetime(2024, 9, 20, 23, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-09-20T23:00:00+00:00',
         'streak': 1,
         'tags': list([
         ]),
         'text': 'Arbeite an einem kreativen Projekt',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 11, 27, 23, 47, 29, 986000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-11-27T23:47:29.986000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': -0.9215181434950852,
         'weeksOfMonth': list([
           3,
@@ -1167,9 +1194,8 @@
         'yesterDaily': True,
       }),
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -1184,13 +1210,13 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 10, 10, 15, 57, 14, 304000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-10-10T15:57:14.304000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.WEEKLY: 'weekly'>,
+        'frequency': 'weekly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -1208,18 +1234,18 @@
         }),
         'history': list([
         ]),
-        'id': UUID('7d92278b-9361-4854-83b6-0a66b57dce20'),
+        'id': '7d92278b-9361-4854-83b6-0a66b57dce20',
         'isDue': False,
         'nextDue': list([
-          datetime.datetime(2024, 12, 14, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 1, 18, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 2, 15, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 3, 15, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 4, 19, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 5, 17, 23, 0, tzinfo=datetime.timezone.utc),
+          '2024-12-14T23:00:00+00:00',
+          '2025-01-18T23:00:00+00:00',
+          '2025-02-15T23:00:00+00:00',
+          '2025-03-15T23:00:00+00:00',
+          '2025-04-19T23:00:00+00:00',
+          '2025-05-17T23:00:00+00:00',
         ]),
         'notes': 'Wähle eine Programmiersprache aus, die du noch nicht kennst, und lerne die Grundlagen.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -1231,23 +1257,23 @@
           'th': False,
           'w': False,
         }),
-        'startDate': datetime.datetime(2024, 9, 20, 23, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-09-20T23:00:00+00:00',
         'streak': 1,
         'tags': list([
         ]),
         'text': 'Lerne eine neue Programmiersprache',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 11, 27, 23, 47, 29, 986000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-11-27T23:47:29.986000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': -0.9215181434950852,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': True,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -1262,7 +1288,7 @@
         'completed': True,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 19, 10, 919000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:19:10.919000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
@@ -1284,13 +1310,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('162f0bbe-a097-4a06-b4f4-8fbeed85d2ba'),
+        'history': list([
+        ]),
+        'id': '162f0bbe-a097-4a06-b4f4-8fbeed85d2ba',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Lebensmittel und Haushaltsbedarf für die Woche einkaufen.',
-        'priority': <TaskPriority.MEDIUM: 1.5>,
+        'priority': 1.5,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -1305,21 +1332,21 @@
         'startDate': None,
         'streak': None,
         'tags': list([
-          UUID('64235347-55d0-4ba1-a86a-3428dcfdf319'),
+          '64235347-55d0-4ba1-a86a-3428dcfdf319',
         ]),
         'text': 'Wocheneinkauf erledigen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 19, 15, 484000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:19:15.484000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 1.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -1334,7 +1361,7 @@
         'completed': True,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 18, 30, 646000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:18:30.646000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
@@ -1356,13 +1383,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('3fa06743-aa0f-472b-af1a-f27c755e329c'),
+        'history': list([
+        ]),
+        'id': '3fa06743-aa0f-472b-af1a-f27c755e329c',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Wohnzimmer und Küche gründlich aufräumen.',
-        'priority': <TaskPriority.HARD: 2>,
+        'priority': 2,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -1377,12 +1405,13 @@
         'startDate': None,
         'streak': None,
         'tags': list([
-          UUID('64235347-55d0-4ba1-a86a-3428dcfdf319'),
+          '64235347-55d0-4ba1-a86a-3428dcfdf319',
         ]),
         'text': 'Wohnung aufräumen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 18, 34, 663000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:18:34.663000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 1.0,
         'weeksOfMonth': list([
         ]),
@@ -1395,9 +1424,8 @@
   dict({
     'tasks': list([
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': 'alias_zahnseide_benutzen',
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -1409,7 +1437,7 @@
         'checklist': list([
           dict({
             'completed': False,
-            'id': UUID('c8662c16-8cd3-4104-a3b2-b1e54f61b8ca'),
+            'id': 'c8662c16-8cd3-4104-a3b2-b1e54f61b8ca',
             'text': 'Checklist-item1',
           }),
         ]),
@@ -1417,13 +1445,13 @@
         'completed': True,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 268000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.268000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.WEEKLY: 'weekly'>,
+        'frequency': 'weekly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -1442,7 +1470,7 @@
         'history': list([
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 7, 18, 26, 6, 749000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T18:26:06.749000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -1450,7 +1478,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 17, 15, 11, 292000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T17:15:11.292000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -1458,7 +1486,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 22, 31, 46, 719000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T22:31:46.719000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -1466,7 +1494,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 11, 9, 44, 56, 907000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-11T09:44:56.907000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -1474,7 +1502,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 12, 9, 58, 45, 243000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-12T09:58:45.243000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -1482,7 +1510,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 8, 20, 20, 19, 56, 447000, tzinfo=datetime.timezone.utc),
+            'date': '2024-08-20T20:19:56.447000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -1490,7 +1518,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 8, 21, 15, 55, 7, 692000, tzinfo=datetime.timezone.utc),
+            'date': '2024-08-21T15:55:07.692000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -1498,7 +1526,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 20, 15, 29, 23, 640000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-20T15:29:23.640000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -1506,7 +1534,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 21, 23, 7, 542000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T21:23:07.542000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -1514,7 +1542,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 22, 1, 55, 608000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T22:01:55.608000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -1522,25 +1550,25 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 9, 21, 22, 24, 20, 150000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T22:24:20.150000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
             'value': -2.9663035443712333,
           }),
         ]),
-        'id': UUID('564b9ac9-c53d-4638-9e7f-1cd96fe19baa'),
+        'id': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
         'isDue': True,
         'nextDue': list([
-          datetime.datetime(2024, 9, 23, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 24, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 25, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 26, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 27, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 28, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
+          '2024-09-23T00:00:00+02:00',
+          '2024-09-24T00:00:00+02:00',
+          '2024-09-25T00:00:00+02:00',
+          '2024-09-26T00:00:00+02:00',
+          '2024-09-27T00:00:00+02:00',
+          '2024-09-28T00:00:00+02:00',
         ]),
         'notes': 'Klicke um Änderungen zu machen!',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -1552,14 +1580,15 @@
           'th': True,
           'w': True,
         }),
-        'startDate': datetime.datetime(2024, 7, 6, 22, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-07-06T22:00:00+00:00',
         'streak': 1,
         'tags': list([
         ]),
         'text': 'Zahnseide benutzen',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 24, 20, 154000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:24:20.154000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': -2.9663035443712333,
         'weeksOfMonth': list([
         ]),
@@ -1572,9 +1601,8 @@
   dict({
     'tasks': list([
       dict({
-        'Type': <TaskType.HABIT: 'habit'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -1589,13 +1617,13 @@
         'completed': None,
         'counterDown': 0,
         'counterUp': 0,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 265000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.265000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': True,
         'everyX': None,
-        'frequency': <Frequency.DAILY: 'daily'>,
+        'frequency': 'daily',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -1613,12 +1641,12 @@
         }),
         'history': list([
         ]),
-        'id': UUID('bc1d1855-b2b8-4663-98ff-62e7b763dfc4'),
+        'id': 'bc1d1855-b2b8-4663-98ff-62e7b763dfc4',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Oder lösche es über die Bearbeitungs-Ansicht',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -1635,18 +1663,18 @@
         'tags': list([
         ]),
         'text': 'Klicke hier um dies als schlechte Gewohnheit zu markieren, die Du gerne loswerden möchtest',
+        'type': 'habit',
         'up': False,
-        'updatedAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 265000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-07T17:51:53.265000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.HABIT: 'habit'>,
         'alias': 'create_a_task',
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -1661,13 +1689,13 @@
         'completed': None,
         'counterDown': 0,
         'counterUp': 0,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 264000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.264000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': False,
         'everyX': None,
-        'frequency': <Frequency.DAILY: 'daily'>,
+        'frequency': 'daily',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -1686,19 +1714,19 @@
         'history': list([
           dict({
             'completed': None,
-            'date': datetime.datetime(2024, 7, 7, 18, 26, 3, 140000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T18:26:03.140000+00:00',
             'isDue': None,
             'scoredDown': 0,
             'scoredUp': 1,
             'value': 1.0,
           }),
         ]),
-        'id': UUID('e97659e0-2c42-4599-a7bb-00282adc410d'),
+        'id': 'e97659e0-2c42-4599-a7bb-00282adc410d',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Eine Gewohnheit, eine Tagesaufgabe oder ein To-Do',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -1715,9 +1743,10 @@
         'tags': list([
         ]),
         'text': 'Füge eine Aufgabe zu Habitica hinzu',
+        'type': 'habit',
         'up': True,
-        'updatedAt': datetime.datetime(2024, 7, 12, 9, 58, 45, 438000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-12T09:58:45.438000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
@@ -1730,9 +1759,8 @@
   dict({
     'tasks': list([
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -1744,7 +1772,7 @@
         'checklist': list([
           dict({
             'completed': True,
-            'id': UUID('c8662c16-8cd3-4104-a3b2-b1e54f61b8ca'),
+            'id': 'c8662c16-8cd3-4104-a3b2-b1e54f61b8ca',
             'text': 'Checklist-item1',
           }),
         ]),
@@ -1752,13 +1780,13 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 22, 11, 44, 43, 774000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-22T11:44:43.774000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.WEEKLY: 'weekly'>,
+        'frequency': 'weekly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -1776,18 +1804,18 @@
         }),
         'history': list([
         ]),
-        'id': UUID('2c6d136c-a1c3-4bef-b7c4-fa980784b1e1'),
+        'id': '2c6d136c-a1c3-4bef-b7c4-fa980784b1e1',
         'isDue': True,
         'nextDue': list([
-          datetime.datetime(2024, 9, 24, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 27, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 28, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 10, 1, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 10, 4, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 10, 8, 22, 0, tzinfo=datetime.timezone.utc),
+          '2024-09-24T22:00:00+00:00',
+          '2024-09-27T22:00:00+00:00',
+          '2024-09-28T22:00:00+00:00',
+          '2024-10-01T22:00:00+00:00',
+          '2024-10-04T22:00:00+00:00',
+          '2024-10-08T22:00:00+00:00',
         ]),
         'notes': 'Ein einstündiges Workout im Fitnessstudio absolvieren.',
-        'priority': <TaskPriority.HARD: 2>,
+        'priority': 2,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -1799,24 +1827,24 @@
           'th': False,
           'w': True,
         }),
-        'startDate': datetime.datetime(2024, 9, 21, 22, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-09-21T22:00:00+00:00',
         'streak': 0,
         'tags': list([
-          UUID('6aa65cbb-dc08-4fdd-9a66-7dedb7ba4cab'),
+          '6aa65cbb-dc08-4fdd-9a66-7dedb7ba4cab',
         ]),
         'text': 'Fitnessstudio besuchen',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 22, 11, 44, 43, 774000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('1343a9af-d891-4027-841a-956d105ca408'),
+        'updatedAt': '2024-09-22T11:44:43.774000+00:00',
+        'userId': '1343a9af-d891-4027-841a-956d105ca408',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': True,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -1826,13 +1854,23 @@
           'winner': None,
         }),
         'checklist': list([
+          dict({
+            'completed': False,
+            'id': 'fccc26f2-1e2b-4bf8-9dd0-a405be261036',
+            'text': 'Checklist-item1',
+          }),
+          dict({
+            'completed': True,
+            'id': '5a897af4-ea94-456a-a2bd-f336bcd79509',
+            'text': 'Checklist-item2',
+          }),
         ]),
         'collapseChecklist': False,
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 17, 57, 816000, tzinfo=datetime.timezone.utc),
-        'date': datetime.datetime(2024, 9, 27, 22, 17, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:17:57.816000+00:00',
+        'date': '2024-09-27T22:17:00+00:00',
         'daysOfMonth': list([
         ]),
         'down': None,
@@ -1853,13 +1891,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('88de7cd9-af2b-49ce-9afd-bf941d87336b'),
+        'history': list([
+        ]),
+        'id': '88de7cd9-af2b-49ce-9afd-bf941d87336b',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Das Buch, das du angefangen hast, bis zum Wochenende fertig lesen.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -1874,13 +1913,14 @@
         'startDate': None,
         'streak': None,
         'tags': list([
-          UUID('20409521-c096-447f-9a90-23e8da615710'),
-          UUID('8515e4ae-2f4b-455a-b4a4-8939e04b1bfd'),
+          '20409521-c096-447f-9a90-23e8da615710',
+          '8515e4ae-2f4b-455a-b4a4-8939e04b1bfd',
         ]),
         'text': 'Buch zu Ende lesen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 17, 57, 816000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:17:57.816000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
@@ -1893,9 +1933,8 @@
   dict({
     'tasks': list([
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -1910,13 +1949,13 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 266000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.266000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.WEEKLY: 'weekly'>,
+        'frequency': 'weekly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -1935,7 +1974,7 @@
         'history': list([
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 7, 17, 55, 3, 74000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T17:55:03.074000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -1943,7 +1982,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 17, 15, 11, 291000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T17:15:11.291000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -1951,7 +1990,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 22, 31, 46, 717000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T22:31:46.717000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -1959,7 +1998,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 11, 7, 20, 59, 722000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-11T07:20:59.722000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -1967,7 +2006,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 12, 9, 58, 45, 246000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-12T09:58:45.246000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -1975,7 +2014,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 12, 10, 1, 32, 219000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-12T10:01:32.219000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -1983,7 +2022,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 8, 21, 15, 55, 7, 691000, tzinfo=datetime.timezone.utc),
+            'date': '2024-08-21T15:55:07.691000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -1991,7 +2030,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 20, 15, 29, 23, 638000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-20T15:29:23.638000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -1999,7 +2038,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 21, 23, 7, 540000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T21:23:07.540000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2007,30 +2046,30 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 22, 1, 55, 607000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T22:01:55.607000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
             'value': -1.919611992979862,
           }),
         ]),
-        'id': UUID('f2c85972-1a19-4426-bc6d-ce3337b9d99f'),
+        'id': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
         'isDue': True,
         'nextDue': list([
-          datetime.datetime(2024, 9, 22, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 23, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 24, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 25, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 26, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 27, 22, 0, tzinfo=datetime.timezone.utc),
+          '2024-09-22T22:00:00+00:00',
+          '2024-09-23T22:00:00+00:00',
+          '2024-09-24T22:00:00+00:00',
+          '2024-09-25T22:00:00+00:00',
+          '2024-09-26T22:00:00+00:00',
+          '2024-09-27T22:00:00+00:00',
         ]),
         'notes': 'Klicke um Deinen Terminplan festzulegen!',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
           dict({
-            'id': UUID('1491d640-6b21-4d0c-8940-0b7aa61c8836'),
+            'id': '1491d640-6b21-4d0c-8940-0b7aa61c8836',
             'startDate': None,
-            'time': datetime.datetime(2024, 9, 22, 20, 0, tzinfo=datetime.timezone.utc),
+            'time': '2024-09-22T20:00:00+00:00',
           }),
         ]),
         'repeat': dict({
@@ -2042,14 +2081,15 @@
           'th': True,
           'w': True,
         }),
-        'startDate': datetime.datetime(2024, 7, 6, 22, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-07-06T22:00:00+00:00',
         'streak': 0,
         'tags': list([
         ]),
         'text': '5 Minuten ruhig durchatmen',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 51, 41, 756000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:51:41.756000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': -1.919611992979862,
         'weeksOfMonth': list([
         ]),
@@ -2062,9 +2102,8 @@
   dict({
     'tasks': list([
       dict({
-        'Type': <TaskType.HABIT: 'habit'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -2079,13 +2118,13 @@
         'completed': None,
         'counterDown': 0,
         'counterUp': 0,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 266000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.266000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': False,
         'everyX': None,
-        'frequency': <Frequency.DAILY: 'daily'>,
+        'frequency': 'daily',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -2104,19 +2143,19 @@
         'history': list([
           dict({
             'completed': None,
-            'date': datetime.datetime(2024, 7, 7, 18, 26, 3, 324000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T18:26:03.324000+00:00',
             'isDue': None,
             'scoredDown': 0,
             'scoredUp': 1,
             'value': 1.0,
           }),
         ]),
-        'id': UUID('1d147de6-5c02-4740-8e2f-71d3015a37f4'),
+        'id': '1d147de6-5c02-4740-8e2f-71d3015a37f4',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': '',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -2133,18 +2172,18 @@
         'tags': list([
         ]),
         'text': 'Eine kurze Pause machen',
+        'type': 'habit',
         'up': True,
-        'updatedAt': datetime.datetime(2024, 7, 12, 9, 58, 45, 438000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-12T09:58:45.438000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': 'alias_zahnseide_benutzen',
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -2156,7 +2195,7 @@
         'checklist': list([
           dict({
             'completed': False,
-            'id': UUID('c8662c16-8cd3-4104-a3b2-b1e54f61b8ca'),
+            'id': 'c8662c16-8cd3-4104-a3b2-b1e54f61b8ca',
             'text': 'Checklist-item1',
           }),
         ]),
@@ -2164,13 +2203,13 @@
         'completed': True,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 268000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.268000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.WEEKLY: 'weekly'>,
+        'frequency': 'weekly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -2189,7 +2228,7 @@
         'history': list([
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 7, 18, 26, 6, 749000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T18:26:06.749000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2197,7 +2236,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 17, 15, 11, 292000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T17:15:11.292000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2205,7 +2244,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 22, 31, 46, 719000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T22:31:46.719000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2213,7 +2252,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 11, 9, 44, 56, 907000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-11T09:44:56.907000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2221,7 +2260,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 12, 9, 58, 45, 243000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-12T09:58:45.243000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2229,7 +2268,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 8, 20, 20, 19, 56, 447000, tzinfo=datetime.timezone.utc),
+            'date': '2024-08-20T20:19:56.447000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2237,7 +2276,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 8, 21, 15, 55, 7, 692000, tzinfo=datetime.timezone.utc),
+            'date': '2024-08-21T15:55:07.692000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2245,7 +2284,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 20, 15, 29, 23, 640000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-20T15:29:23.640000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2253,7 +2292,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 21, 23, 7, 542000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T21:23:07.542000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2261,7 +2300,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 22, 1, 55, 608000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T22:01:55.608000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2269,25 +2308,25 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 9, 21, 22, 24, 20, 150000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T22:24:20.150000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
             'value': -2.9663035443712333,
           }),
         ]),
-        'id': UUID('564b9ac9-c53d-4638-9e7f-1cd96fe19baa'),
+        'id': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
         'isDue': True,
         'nextDue': list([
-          datetime.datetime(2024, 9, 23, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 24, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 25, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 26, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 27, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 28, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
+          '2024-09-23T00:00:00+02:00',
+          '2024-09-24T00:00:00+02:00',
+          '2024-09-25T00:00:00+02:00',
+          '2024-09-26T00:00:00+02:00',
+          '2024-09-27T00:00:00+02:00',
+          '2024-09-28T00:00:00+02:00',
         ]),
         'notes': 'Klicke um Änderungen zu machen!',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -2299,14 +2338,15 @@
           'th': True,
           'w': True,
         }),
-        'startDate': datetime.datetime(2024, 7, 6, 22, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-07-06T22:00:00+00:00',
         'streak': 1,
         'tags': list([
         ]),
         'text': 'Zahnseide benutzen',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 24, 20, 154000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:24:20.154000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': -2.9663035443712333,
         'weeksOfMonth': list([
         ]),
@@ -2319,9 +2359,8 @@
   dict({
     'tasks': list([
       dict({
-        'Type': <TaskType.HABIT: 'habit'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -2336,13 +2375,13 @@
         'completed': None,
         'counterDown': 0,
         'counterUp': 0,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 268000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.268000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': True,
         'everyX': None,
-        'frequency': <Frequency.DAILY: 'daily'>,
+        'frequency': 'daily',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -2360,12 +2399,12 @@
         }),
         'history': list([
         ]),
-        'id': UUID('f21fa608-cfc6-4413-9fc7-0eb1b48ca43a'),
+        'id': 'f21fa608-cfc6-4413-9fc7-0eb1b48ca43a',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': '',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -2382,18 +2421,18 @@
         'tags': list([
         ]),
         'text': 'Gesundes Essen/Junkfood',
+        'type': 'habit',
         'up': True,
-        'updatedAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 268000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-07T17:51:53.268000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.HABIT: 'habit'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -2408,13 +2447,13 @@
         'completed': None,
         'counterDown': 0,
         'counterUp': 0,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 266000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.266000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': False,
         'everyX': None,
-        'frequency': <Frequency.DAILY: 'daily'>,
+        'frequency': 'daily',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -2433,19 +2472,19 @@
         'history': list([
           dict({
             'completed': None,
-            'date': datetime.datetime(2024, 7, 7, 18, 26, 3, 324000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T18:26:03.324000+00:00',
             'isDue': None,
             'scoredDown': 0,
             'scoredUp': 1,
             'value': 1.0,
           }),
         ]),
-        'id': UUID('1d147de6-5c02-4740-8e2f-71d3015a37f4'),
+        'id': '1d147de6-5c02-4740-8e2f-71d3015a37f4',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': '',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -2462,18 +2501,18 @@
         'tags': list([
         ]),
         'text': 'Eine kurze Pause machen',
+        'type': 'habit',
         'up': True,
-        'updatedAt': datetime.datetime(2024, 7, 12, 9, 58, 45, 438000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-12T09:58:45.438000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.HABIT: 'habit'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -2488,13 +2527,13 @@
         'completed': None,
         'counterDown': 0,
         'counterUp': 0,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 265000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.265000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': True,
         'everyX': None,
-        'frequency': <Frequency.DAILY: 'daily'>,
+        'frequency': 'daily',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -2512,12 +2551,12 @@
         }),
         'history': list([
         ]),
-        'id': UUID('bc1d1855-b2b8-4663-98ff-62e7b763dfc4'),
+        'id': 'bc1d1855-b2b8-4663-98ff-62e7b763dfc4',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Oder lösche es über die Bearbeitungs-Ansicht',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -2534,18 +2573,18 @@
         'tags': list([
         ]),
         'text': 'Klicke hier um dies als schlechte Gewohnheit zu markieren, die Du gerne loswerden möchtest',
+        'type': 'habit',
         'up': False,
-        'updatedAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 265000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-07T17:51:53.265000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.HABIT: 'habit'>,
         'alias': 'create_a_task',
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -2560,13 +2599,13 @@
         'completed': None,
         'counterDown': 0,
         'counterUp': 0,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 264000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.264000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': False,
         'everyX': None,
-        'frequency': <Frequency.DAILY: 'daily'>,
+        'frequency': 'daily',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -2585,19 +2624,19 @@
         'history': list([
           dict({
             'completed': None,
-            'date': datetime.datetime(2024, 7, 7, 18, 26, 3, 140000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T18:26:03.140000+00:00',
             'isDue': None,
             'scoredDown': 0,
             'scoredUp': 1,
             'value': 1.0,
           }),
         ]),
-        'id': UUID('e97659e0-2c42-4599-a7bb-00282adc410d'),
+        'id': 'e97659e0-2c42-4599-a7bb-00282adc410d',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Eine Gewohnheit, eine Tagesaufgabe oder ein To-Do',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -2614,18 +2653,18 @@
         'tags': list([
         ]),
         'text': 'Füge eine Aufgabe zu Habitica hinzu',
+        'type': 'habit',
         'up': True,
-        'updatedAt': datetime.datetime(2024, 7, 12, 9, 58, 45, 438000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-12T09:58:45.438000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': 'alias_zahnseide_benutzen',
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -2637,7 +2676,7 @@
         'checklist': list([
           dict({
             'completed': False,
-            'id': UUID('c8662c16-8cd3-4104-a3b2-b1e54f61b8ca'),
+            'id': 'c8662c16-8cd3-4104-a3b2-b1e54f61b8ca',
             'text': 'Checklist-item1',
           }),
         ]),
@@ -2645,13 +2684,13 @@
         'completed': True,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 268000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.268000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.WEEKLY: 'weekly'>,
+        'frequency': 'weekly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -2670,7 +2709,7 @@
         'history': list([
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 7, 18, 26, 6, 749000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T18:26:06.749000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2678,7 +2717,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 17, 15, 11, 292000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T17:15:11.292000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2686,7 +2725,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 22, 31, 46, 719000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T22:31:46.719000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2694,7 +2733,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 11, 9, 44, 56, 907000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-11T09:44:56.907000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2702,7 +2741,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 12, 9, 58, 45, 243000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-12T09:58:45.243000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2710,7 +2749,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 8, 20, 20, 19, 56, 447000, tzinfo=datetime.timezone.utc),
+            'date': '2024-08-20T20:19:56.447000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2718,7 +2757,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 8, 21, 15, 55, 7, 692000, tzinfo=datetime.timezone.utc),
+            'date': '2024-08-21T15:55:07.692000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2726,7 +2765,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 20, 15, 29, 23, 640000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-20T15:29:23.640000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2734,7 +2773,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 21, 23, 7, 542000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T21:23:07.542000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2742,7 +2781,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 22, 1, 55, 608000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T22:01:55.608000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2750,25 +2789,25 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 9, 21, 22, 24, 20, 150000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T22:24:20.150000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
             'value': -2.9663035443712333,
           }),
         ]),
-        'id': UUID('564b9ac9-c53d-4638-9e7f-1cd96fe19baa'),
+        'id': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
         'isDue': True,
         'nextDue': list([
-          datetime.datetime(2024, 9, 23, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 24, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 25, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 26, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 27, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 28, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
+          '2024-09-23T00:00:00+02:00',
+          '2024-09-24T00:00:00+02:00',
+          '2024-09-25T00:00:00+02:00',
+          '2024-09-26T00:00:00+02:00',
+          '2024-09-27T00:00:00+02:00',
+          '2024-09-28T00:00:00+02:00',
         ]),
         'notes': 'Klicke um Änderungen zu machen!',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -2780,23 +2819,23 @@
           'th': True,
           'w': True,
         }),
-        'startDate': datetime.datetime(2024, 7, 6, 22, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-07-06T22:00:00+00:00',
         'streak': 1,
         'tags': list([
         ]),
         'text': 'Zahnseide benutzen',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 24, 20, 154000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:24:20.154000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': -2.9663035443712333,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': True,
       }),
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -2811,13 +2850,13 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 266000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.266000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.WEEKLY: 'weekly'>,
+        'frequency': 'weekly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -2836,7 +2875,7 @@
         'history': list([
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 7, 17, 55, 3, 74000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T17:55:03.074000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2844,7 +2883,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 17, 15, 11, 291000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T17:15:11.291000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2852,7 +2891,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 22, 31, 46, 717000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T22:31:46.717000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2860,7 +2899,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 11, 7, 20, 59, 722000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-11T07:20:59.722000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2868,7 +2907,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 12, 9, 58, 45, 246000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-12T09:58:45.246000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2876,7 +2915,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 12, 10, 1, 32, 219000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-12T10:01:32.219000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2884,7 +2923,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 8, 21, 15, 55, 7, 691000, tzinfo=datetime.timezone.utc),
+            'date': '2024-08-21T15:55:07.691000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2892,7 +2931,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 20, 15, 29, 23, 638000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-20T15:29:23.638000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2900,7 +2939,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 21, 23, 7, 540000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T21:23:07.540000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -2908,30 +2947,30 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 22, 1, 55, 607000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T22:01:55.607000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
             'value': -1.919611992979862,
           }),
         ]),
-        'id': UUID('f2c85972-1a19-4426-bc6d-ce3337b9d99f'),
+        'id': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
         'isDue': True,
         'nextDue': list([
-          datetime.datetime(2024, 9, 22, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 23, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 24, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 25, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 26, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 27, 22, 0, tzinfo=datetime.timezone.utc),
+          '2024-09-22T22:00:00+00:00',
+          '2024-09-23T22:00:00+00:00',
+          '2024-09-24T22:00:00+00:00',
+          '2024-09-25T22:00:00+00:00',
+          '2024-09-26T22:00:00+00:00',
+          '2024-09-27T22:00:00+00:00',
         ]),
         'notes': 'Klicke um Deinen Terminplan festzulegen!',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
           dict({
-            'id': UUID('1491d640-6b21-4d0c-8940-0b7aa61c8836'),
+            'id': '1491d640-6b21-4d0c-8940-0b7aa61c8836',
             'startDate': None,
-            'time': datetime.datetime(2024, 9, 22, 20, 0, tzinfo=datetime.timezone.utc),
+            'time': '2024-09-22T20:00:00+00:00',
           }),
         ]),
         'repeat': dict({
@@ -2943,23 +2982,23 @@
           'th': True,
           'w': True,
         }),
-        'startDate': datetime.datetime(2024, 7, 6, 22, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-07-06T22:00:00+00:00',
         'streak': 0,
         'tags': list([
         ]),
         'text': '5 Minuten ruhig durchatmen',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 51, 41, 756000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:51:41.756000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': -1.919611992979862,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': True,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -2969,13 +3008,23 @@
           'winner': None,
         }),
         'checklist': list([
+          dict({
+            'completed': False,
+            'id': 'fccc26f2-1e2b-4bf8-9dd0-a405be261036',
+            'text': 'Checklist-item1',
+          }),
+          dict({
+            'completed': True,
+            'id': '5a897af4-ea94-456a-a2bd-f336bcd79509',
+            'text': 'Checklist-item2',
+          }),
         ]),
         'collapseChecklist': False,
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 17, 57, 816000, tzinfo=datetime.timezone.utc),
-        'date': datetime.datetime(2024, 9, 27, 22, 17, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:17:57.816000+00:00',
+        'date': '2024-09-27T22:17:00+00:00',
         'daysOfMonth': list([
         ]),
         'down': None,
@@ -2996,13 +3045,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('88de7cd9-af2b-49ce-9afd-bf941d87336b'),
+        'history': list([
+        ]),
+        'id': '88de7cd9-af2b-49ce-9afd-bf941d87336b',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Das Buch, das du angefangen hast, bis zum Wochenende fertig lesen.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -3017,22 +3067,22 @@
         'startDate': None,
         'streak': None,
         'tags': list([
-          UUID('20409521-c096-447f-9a90-23e8da615710'),
-          UUID('8515e4ae-2f4b-455a-b4a4-8939e04b1bfd'),
+          '20409521-c096-447f-9a90-23e8da615710',
+          '8515e4ae-2f4b-455a-b4a4-8939e04b1bfd',
         ]),
         'text': 'Buch zu Ende lesen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 17, 57, 816000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:17:57.816000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': 'pay_bills',
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -3047,8 +3097,8 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 17, 19, 513000, tzinfo=datetime.timezone.utc),
-        'date': datetime.datetime(2024, 8, 31, 22, 16, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:17:19.513000+00:00',
+        'date': '2024-08-31T22:16:00+00:00',
         'daysOfMonth': list([
         ]),
         'down': None,
@@ -3069,18 +3119,19 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('2f6fcabc-f670-4ec3-ba65-817e8deea490'),
+        'history': list([
+        ]),
+        'id': '2f6fcabc-f670-4ec3-ba65-817e8deea490',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Strom- und Internetrechnungen rechtzeitig überweisen.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
           dict({
-            'id': UUID('91c09432-10ac-4a49-bd20-823081ec29ed'),
+            'id': '91c09432-10ac-4a49-bd20-823081ec29ed',
             'startDate': None,
-            'time': datetime.datetime(2024, 9, 22, 2, 0, tzinfo=datetime.timezone.utc),
+            'time': '2024-09-22T02:00:00+00:00',
           }),
         ]),
         'repeat': dict({
@@ -3097,18 +3148,18 @@
         'tags': list([
         ]),
         'text': 'Rechnungen bezahlen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 19, 35, 576000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:19:35.576000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -3123,7 +3174,7 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 16, 38, 153000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:16:38.153000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
@@ -3145,13 +3196,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('1aa3137e-ef72-4d1f-91ee-41933602f438'),
+        'history': list([
+        ]),
+        'id': '1aa3137e-ef72-4d1f-91ee-41933602f438',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Rasen mähen und die Pflanzen gießen.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -3168,18 +3220,18 @@
         'tags': list([
         ]),
         'text': 'Garten pflegen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 16, 38, 153000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:16:38.153000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -3194,8 +3246,8 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 16, 16, 756000, tzinfo=datetime.timezone.utc),
-        'date': datetime.datetime(2024, 9, 21, 22, 0, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:16:16.756000+00:00',
+        'date': '2024-09-21T22:00:00+00:00',
         'daysOfMonth': list([
         ]),
         'down': None,
@@ -3216,13 +3268,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('86ea2475-d1b5-4020-bdcc-c188c7996afa'),
+        'history': list([
+        ]),
+        'id': '86ea2475-d1b5-4020-bdcc-c188c7996afa',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Den Ausflug für das kommende Wochenende organisieren.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -3237,21 +3290,21 @@
         'startDate': None,
         'streak': None,
         'tags': list([
-          UUID('51076966-2970-4b40-b6ba-d58c6a756dd7'),
+          '51076966-2970-4b40-b6ba-d58c6a756dd7',
         ]),
         'text': 'Wochenendausflug planen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 16, 16, 756000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:16:16.756000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.REWARD: 'reward'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -3266,7 +3319,7 @@
         'completed': None,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 266000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.266000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
@@ -3288,13 +3341,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b'),
+        'history': list([
+        ]),
+        'id': '5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Schaue fern, spiele ein Spiel, gönne Dir einen Leckerbissen, es liegt ganz bei Dir!',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -3309,20 +3363,22 @@
         'startDate': None,
         'streak': None,
         'tags': list([
+          '3450351f-1323-4c7e-9fd2-0cdff25b3ce0',
+          'b2780f82-b3b5-49a3-a677-48f2c8c7e3bb',
         ]),
         'text': 'Belohne Dich selbst',
+        'type': 'reward',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 266000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-07T17:51:53.266000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 10.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -3332,18 +3388,28 @@
           'winner': None,
         }),
         'checklist': list([
+          dict({
+            'completed': False,
+            'id': 'a2a6702d-58e1-46c2-a3ce-422d525cc0b6',
+            'text': 'Checklist-item1',
+          }),
+          dict({
+            'completed': True,
+            'id': '9f64e1cd-b0ab-4577-8344-c7a5e1827997',
+            'text': 'Checklist-item2',
+          }),
         ]),
         'collapseChecklist': False,
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 10, 10, 15, 57, 14, 304000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-10-10T15:57:14.304000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.MONTHLY: 'monthly'>,
+        'frequency': 'monthly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -3361,18 +3427,18 @@
         }),
         'history': list([
         ]),
-        'id': UUID('6e53f1f5-a315-4edd-984d-8d762e4a08ef'),
+        'id': '6e53f1f5-a315-4edd-984d-8d762e4a08ef',
         'isDue': False,
         'nextDue': list([
-          datetime.datetime(2024, 12, 14, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 1, 18, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 2, 15, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 3, 15, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 4, 19, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 5, 17, 23, 0, tzinfo=datetime.timezone.utc),
+          '2024-12-14T23:00:00+00:00',
+          '2025-01-18T23:00:00+00:00',
+          '2025-02-15T23:00:00+00:00',
+          '2025-03-15T23:00:00+00:00',
+          '2025-04-19T23:00:00+00:00',
+          '2025-05-17T23:00:00+00:00',
         ]),
         'notes': 'Klicke um den Namen Deines aktuellen Projekts anzugeben & setze einen Terminplan!',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -3384,14 +3450,15 @@
           'th': False,
           'w': False,
         }),
-        'startDate': datetime.datetime(2024, 9, 20, 23, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-09-20T23:00:00+00:00',
         'streak': 1,
         'tags': list([
         ]),
         'text': 'Arbeite an einem kreativen Projekt',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 11, 27, 23, 47, 29, 986000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-11-27T23:47:29.986000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': -0.9215181434950852,
         'weeksOfMonth': list([
           3,
@@ -3399,9 +3466,8 @@
         'yesterDaily': True,
       }),
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -3416,13 +3482,13 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 10, 10, 15, 57, 14, 304000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-10-10T15:57:14.304000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.WEEKLY: 'weekly'>,
+        'frequency': 'weekly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -3440,18 +3506,18 @@
         }),
         'history': list([
         ]),
-        'id': UUID('7d92278b-9361-4854-83b6-0a66b57dce20'),
+        'id': '7d92278b-9361-4854-83b6-0a66b57dce20',
         'isDue': False,
         'nextDue': list([
-          datetime.datetime(2024, 12, 14, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 1, 18, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 2, 15, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 3, 15, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 4, 19, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 5, 17, 23, 0, tzinfo=datetime.timezone.utc),
+          '2024-12-14T23:00:00+00:00',
+          '2025-01-18T23:00:00+00:00',
+          '2025-02-15T23:00:00+00:00',
+          '2025-03-15T23:00:00+00:00',
+          '2025-04-19T23:00:00+00:00',
+          '2025-05-17T23:00:00+00:00',
         ]),
         'notes': 'Wähle eine Programmiersprache aus, die du noch nicht kennst, und lerne die Grundlagen.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -3463,14 +3529,15 @@
           'th': False,
           'w': False,
         }),
-        'startDate': datetime.datetime(2024, 9, 20, 23, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-09-20T23:00:00+00:00',
         'streak': 1,
         'tags': list([
         ]),
         'text': 'Lerne eine neue Programmiersprache',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 11, 27, 23, 47, 29, 986000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-11-27T23:47:29.986000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': -0.9215181434950852,
         'weeksOfMonth': list([
         ]),
@@ -3489,9 +3556,8 @@
   dict({
     'tasks': list([
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -3503,7 +3569,7 @@
         'checklist': list([
           dict({
             'completed': True,
-            'id': UUID('c8662c16-8cd3-4104-a3b2-b1e54f61b8ca'),
+            'id': 'c8662c16-8cd3-4104-a3b2-b1e54f61b8ca',
             'text': 'Checklist-item1',
           }),
         ]),
@@ -3511,13 +3577,13 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 22, 11, 44, 43, 774000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-22T11:44:43.774000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.WEEKLY: 'weekly'>,
+        'frequency': 'weekly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -3535,18 +3601,18 @@
         }),
         'history': list([
         ]),
-        'id': UUID('2c6d136c-a1c3-4bef-b7c4-fa980784b1e1'),
+        'id': '2c6d136c-a1c3-4bef-b7c4-fa980784b1e1',
         'isDue': True,
         'nextDue': list([
-          datetime.datetime(2024, 9, 24, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 27, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 28, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 10, 1, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 10, 4, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 10, 8, 22, 0, tzinfo=datetime.timezone.utc),
+          '2024-09-24T22:00:00+00:00',
+          '2024-09-27T22:00:00+00:00',
+          '2024-09-28T22:00:00+00:00',
+          '2024-10-01T22:00:00+00:00',
+          '2024-10-04T22:00:00+00:00',
+          '2024-10-08T22:00:00+00:00',
         ]),
         'notes': 'Ein einstündiges Workout im Fitnessstudio absolvieren.',
-        'priority': <TaskPriority.HARD: 2>,
+        'priority': 2,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -3558,24 +3624,24 @@
           'th': False,
           'w': True,
         }),
-        'startDate': datetime.datetime(2024, 9, 21, 22, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-09-21T22:00:00+00:00',
         'streak': 0,
         'tags': list([
-          UUID('6aa65cbb-dc08-4fdd-9a66-7dedb7ba4cab'),
+          '6aa65cbb-dc08-4fdd-9a66-7dedb7ba4cab',
         ]),
         'text': 'Fitnessstudio besuchen',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 22, 11, 44, 43, 774000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('1343a9af-d891-4027-841a-956d105ca408'),
+        'updatedAt': '2024-09-22T11:44:43.774000+00:00',
+        'userId': '1343a9af-d891-4027-841a-956d105ca408',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': True,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -3590,7 +3656,7 @@
         'completed': True,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 18, 30, 646000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:18:30.646000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
@@ -3612,13 +3678,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('3fa06743-aa0f-472b-af1a-f27c755e329c'),
+        'history': list([
+        ]),
+        'id': '3fa06743-aa0f-472b-af1a-f27c755e329c',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Wohnzimmer und Küche gründlich aufräumen.',
-        'priority': <TaskPriority.HARD: 2>,
+        'priority': 2,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -3633,12 +3700,13 @@
         'startDate': None,
         'streak': None,
         'tags': list([
-          UUID('64235347-55d0-4ba1-a86a-3428dcfdf319'),
+          '64235347-55d0-4ba1-a86a-3428dcfdf319',
         ]),
         'text': 'Wohnung aufräumen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 18, 34, 663000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:18:34.663000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 1.0,
         'weeksOfMonth': list([
         ]),
@@ -3651,9 +3719,8 @@
   dict({
     'tasks': list([
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -3668,7 +3735,7 @@
         'completed': True,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 19, 10, 919000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:19:10.919000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
@@ -3690,13 +3757,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('162f0bbe-a097-4a06-b4f4-8fbeed85d2ba'),
+        'history': list([
+        ]),
+        'id': '162f0bbe-a097-4a06-b4f4-8fbeed85d2ba',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Lebensmittel und Haushaltsbedarf für die Woche einkaufen.',
-        'priority': <TaskPriority.MEDIUM: 1.5>,
+        'priority': 1.5,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -3711,12 +3779,13 @@
         'startDate': None,
         'streak': None,
         'tags': list([
-          UUID('64235347-55d0-4ba1-a86a-3428dcfdf319'),
+          '64235347-55d0-4ba1-a86a-3428dcfdf319',
         ]),
         'text': 'Wocheneinkauf erledigen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 19, 15, 484000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:19:15.484000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 1.0,
         'weeksOfMonth': list([
         ]),
@@ -3729,9 +3798,8 @@
   dict({
     'tasks': list([
       dict({
-        'Type': <TaskType.HABIT: 'habit'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -3746,13 +3814,13 @@
         'completed': None,
         'counterDown': 0,
         'counterUp': 0,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 268000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.268000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': True,
         'everyX': None,
-        'frequency': <Frequency.DAILY: 'daily'>,
+        'frequency': 'daily',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -3770,12 +3838,12 @@
         }),
         'history': list([
         ]),
-        'id': UUID('f21fa608-cfc6-4413-9fc7-0eb1b48ca43a'),
+        'id': 'f21fa608-cfc6-4413-9fc7-0eb1b48ca43a',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': '',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -3792,18 +3860,18 @@
         'tags': list([
         ]),
         'text': 'Gesundes Essen/Junkfood',
+        'type': 'habit',
         'up': True,
-        'updatedAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 268000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-07T17:51:53.268000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.HABIT: 'habit'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -3818,13 +3886,13 @@
         'completed': None,
         'counterDown': 0,
         'counterUp': 0,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 266000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.266000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': False,
         'everyX': None,
-        'frequency': <Frequency.DAILY: 'daily'>,
+        'frequency': 'daily',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -3843,19 +3911,19 @@
         'history': list([
           dict({
             'completed': None,
-            'date': datetime.datetime(2024, 7, 7, 18, 26, 3, 324000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T18:26:03.324000+00:00',
             'isDue': None,
             'scoredDown': 0,
             'scoredUp': 1,
             'value': 1.0,
           }),
         ]),
-        'id': UUID('1d147de6-5c02-4740-8e2f-71d3015a37f4'),
+        'id': '1d147de6-5c02-4740-8e2f-71d3015a37f4',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': '',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -3872,18 +3940,18 @@
         'tags': list([
         ]),
         'text': 'Eine kurze Pause machen',
+        'type': 'habit',
         'up': True,
-        'updatedAt': datetime.datetime(2024, 7, 12, 9, 58, 45, 438000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-12T09:58:45.438000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.HABIT: 'habit'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -3898,13 +3966,13 @@
         'completed': None,
         'counterDown': 0,
         'counterUp': 0,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 265000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.265000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': True,
         'everyX': None,
-        'frequency': <Frequency.DAILY: 'daily'>,
+        'frequency': 'daily',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -3922,12 +3990,12 @@
         }),
         'history': list([
         ]),
-        'id': UUID('bc1d1855-b2b8-4663-98ff-62e7b763dfc4'),
+        'id': 'bc1d1855-b2b8-4663-98ff-62e7b763dfc4',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Oder lösche es über die Bearbeitungs-Ansicht',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -3944,18 +4012,18 @@
         'tags': list([
         ]),
         'text': 'Klicke hier um dies als schlechte Gewohnheit zu markieren, die Du gerne loswerden möchtest',
+        'type': 'habit',
         'up': False,
-        'updatedAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 265000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-07T17:51:53.265000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.HABIT: 'habit'>,
         'alias': 'create_a_task',
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -3970,13 +4038,13 @@
         'completed': None,
         'counterDown': 0,
         'counterUp': 0,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 264000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.264000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': False,
         'everyX': None,
-        'frequency': <Frequency.DAILY: 'daily'>,
+        'frequency': 'daily',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -3995,19 +4063,19 @@
         'history': list([
           dict({
             'completed': None,
-            'date': datetime.datetime(2024, 7, 7, 18, 26, 3, 140000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T18:26:03.140000+00:00',
             'isDue': None,
             'scoredDown': 0,
             'scoredUp': 1,
             'value': 1.0,
           }),
         ]),
-        'id': UUID('e97659e0-2c42-4599-a7bb-00282adc410d'),
+        'id': 'e97659e0-2c42-4599-a7bb-00282adc410d',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Eine Gewohnheit, eine Tagesaufgabe oder ein To-Do',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -4024,18 +4092,18 @@
         'tags': list([
         ]),
         'text': 'Füge eine Aufgabe zu Habitica hinzu',
+        'type': 'habit',
         'up': True,
-        'updatedAt': datetime.datetime(2024, 7, 12, 9, 58, 45, 438000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-12T09:58:45.438000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': 'alias_zahnseide_benutzen',
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -4047,7 +4115,7 @@
         'checklist': list([
           dict({
             'completed': False,
-            'id': UUID('c8662c16-8cd3-4104-a3b2-b1e54f61b8ca'),
+            'id': 'c8662c16-8cd3-4104-a3b2-b1e54f61b8ca',
             'text': 'Checklist-item1',
           }),
         ]),
@@ -4055,13 +4123,13 @@
         'completed': True,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 268000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.268000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.WEEKLY: 'weekly'>,
+        'frequency': 'weekly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -4080,7 +4148,7 @@
         'history': list([
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 7, 18, 26, 6, 749000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T18:26:06.749000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4088,7 +4156,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 17, 15, 11, 292000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T17:15:11.292000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4096,7 +4164,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 22, 31, 46, 719000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T22:31:46.719000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4104,7 +4172,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 11, 9, 44, 56, 907000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-11T09:44:56.907000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4112,7 +4180,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 12, 9, 58, 45, 243000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-12T09:58:45.243000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4120,7 +4188,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 8, 20, 20, 19, 56, 447000, tzinfo=datetime.timezone.utc),
+            'date': '2024-08-20T20:19:56.447000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4128,7 +4196,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 8, 21, 15, 55, 7, 692000, tzinfo=datetime.timezone.utc),
+            'date': '2024-08-21T15:55:07.692000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4136,7 +4204,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 20, 15, 29, 23, 640000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-20T15:29:23.640000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4144,7 +4212,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 21, 23, 7, 542000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T21:23:07.542000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4152,7 +4220,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 22, 1, 55, 608000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T22:01:55.608000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4160,25 +4228,25 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 9, 21, 22, 24, 20, 150000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T22:24:20.150000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
             'value': -2.9663035443712333,
           }),
         ]),
-        'id': UUID('564b9ac9-c53d-4638-9e7f-1cd96fe19baa'),
+        'id': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
         'isDue': True,
         'nextDue': list([
-          datetime.datetime(2024, 9, 23, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 24, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 25, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 26, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 27, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 28, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
+          '2024-09-23T00:00:00+02:00',
+          '2024-09-24T00:00:00+02:00',
+          '2024-09-25T00:00:00+02:00',
+          '2024-09-26T00:00:00+02:00',
+          '2024-09-27T00:00:00+02:00',
+          '2024-09-28T00:00:00+02:00',
         ]),
         'notes': 'Klicke um Änderungen zu machen!',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -4190,23 +4258,23 @@
           'th': True,
           'w': True,
         }),
-        'startDate': datetime.datetime(2024, 7, 6, 22, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-07-06T22:00:00+00:00',
         'streak': 1,
         'tags': list([
         ]),
         'text': 'Zahnseide benutzen',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 24, 20, 154000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:24:20.154000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': -2.9663035443712333,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': True,
       }),
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -4221,13 +4289,13 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 266000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.266000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.WEEKLY: 'weekly'>,
+        'frequency': 'weekly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -4246,7 +4314,7 @@
         'history': list([
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 7, 17, 55, 3, 74000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T17:55:03.074000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4254,7 +4322,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 17, 15, 11, 291000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T17:15:11.291000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4262,7 +4330,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 22, 31, 46, 717000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T22:31:46.717000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4270,7 +4338,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 11, 7, 20, 59, 722000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-11T07:20:59.722000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4278,7 +4346,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 12, 9, 58, 45, 246000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-12T09:58:45.246000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4286,7 +4354,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 12, 10, 1, 32, 219000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-12T10:01:32.219000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4294,7 +4362,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 8, 21, 15, 55, 7, 691000, tzinfo=datetime.timezone.utc),
+            'date': '2024-08-21T15:55:07.691000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4302,7 +4370,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 20, 15, 29, 23, 638000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-20T15:29:23.638000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4310,7 +4378,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 21, 23, 7, 540000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T21:23:07.540000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4318,30 +4386,30 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 22, 1, 55, 607000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T22:01:55.607000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
             'value': -1.919611992979862,
           }),
         ]),
-        'id': UUID('f2c85972-1a19-4426-bc6d-ce3337b9d99f'),
+        'id': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
         'isDue': True,
         'nextDue': list([
-          datetime.datetime(2024, 9, 22, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 23, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 24, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 25, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 26, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 27, 22, 0, tzinfo=datetime.timezone.utc),
+          '2024-09-22T22:00:00+00:00',
+          '2024-09-23T22:00:00+00:00',
+          '2024-09-24T22:00:00+00:00',
+          '2024-09-25T22:00:00+00:00',
+          '2024-09-26T22:00:00+00:00',
+          '2024-09-27T22:00:00+00:00',
         ]),
         'notes': 'Klicke um Deinen Terminplan festzulegen!',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
           dict({
-            'id': UUID('1491d640-6b21-4d0c-8940-0b7aa61c8836'),
+            'id': '1491d640-6b21-4d0c-8940-0b7aa61c8836',
             'startDate': None,
-            'time': datetime.datetime(2024, 9, 22, 20, 0, tzinfo=datetime.timezone.utc),
+            'time': '2024-09-22T20:00:00+00:00',
           }),
         ]),
         'repeat': dict({
@@ -4353,23 +4421,23 @@
           'th': True,
           'w': True,
         }),
-        'startDate': datetime.datetime(2024, 7, 6, 22, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-07-06T22:00:00+00:00',
         'streak': 0,
         'tags': list([
         ]),
         'text': '5 Minuten ruhig durchatmen',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 51, 41, 756000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:51:41.756000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': -1.919611992979862,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': True,
       }),
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -4381,7 +4449,7 @@
         'checklist': list([
           dict({
             'completed': True,
-            'id': UUID('c8662c16-8cd3-4104-a3b2-b1e54f61b8ca'),
+            'id': 'c8662c16-8cd3-4104-a3b2-b1e54f61b8ca',
             'text': 'Checklist-item1',
           }),
         ]),
@@ -4389,13 +4457,13 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 22, 11, 44, 43, 774000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-22T11:44:43.774000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.WEEKLY: 'weekly'>,
+        'frequency': 'weekly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -4413,18 +4481,18 @@
         }),
         'history': list([
         ]),
-        'id': UUID('2c6d136c-a1c3-4bef-b7c4-fa980784b1e1'),
+        'id': '2c6d136c-a1c3-4bef-b7c4-fa980784b1e1',
         'isDue': True,
         'nextDue': list([
-          datetime.datetime(2024, 9, 24, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 27, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 28, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 10, 1, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 10, 4, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 10, 8, 22, 0, tzinfo=datetime.timezone.utc),
+          '2024-09-24T22:00:00+00:00',
+          '2024-09-27T22:00:00+00:00',
+          '2024-09-28T22:00:00+00:00',
+          '2024-10-01T22:00:00+00:00',
+          '2024-10-04T22:00:00+00:00',
+          '2024-10-08T22:00:00+00:00',
         ]),
         'notes': 'Ein einstündiges Workout im Fitnessstudio absolvieren.',
-        'priority': <TaskPriority.HARD: 2>,
+        'priority': 2,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -4436,24 +4504,24 @@
           'th': False,
           'w': True,
         }),
-        'startDate': datetime.datetime(2024, 9, 21, 22, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-09-21T22:00:00+00:00',
         'streak': 0,
         'tags': list([
-          UUID('6aa65cbb-dc08-4fdd-9a66-7dedb7ba4cab'),
+          '6aa65cbb-dc08-4fdd-9a66-7dedb7ba4cab',
         ]),
         'text': 'Fitnessstudio besuchen',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 22, 11, 44, 43, 774000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('1343a9af-d891-4027-841a-956d105ca408'),
+        'updatedAt': '2024-09-22T11:44:43.774000+00:00',
+        'userId': '1343a9af-d891-4027-841a-956d105ca408',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': True,
       }),
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -4463,18 +4531,28 @@
           'winner': None,
         }),
         'checklist': list([
+          dict({
+            'completed': False,
+            'id': 'a2a6702d-58e1-46c2-a3ce-422d525cc0b6',
+            'text': 'Checklist-item1',
+          }),
+          dict({
+            'completed': True,
+            'id': '9f64e1cd-b0ab-4577-8344-c7a5e1827997',
+            'text': 'Checklist-item2',
+          }),
         ]),
         'collapseChecklist': False,
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 10, 10, 15, 57, 14, 304000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-10-10T15:57:14.304000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.MONTHLY: 'monthly'>,
+        'frequency': 'monthly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -4492,18 +4570,18 @@
         }),
         'history': list([
         ]),
-        'id': UUID('6e53f1f5-a315-4edd-984d-8d762e4a08ef'),
+        'id': '6e53f1f5-a315-4edd-984d-8d762e4a08ef',
         'isDue': False,
         'nextDue': list([
-          datetime.datetime(2024, 12, 14, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 1, 18, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 2, 15, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 3, 15, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 4, 19, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 5, 17, 23, 0, tzinfo=datetime.timezone.utc),
+          '2024-12-14T23:00:00+00:00',
+          '2025-01-18T23:00:00+00:00',
+          '2025-02-15T23:00:00+00:00',
+          '2025-03-15T23:00:00+00:00',
+          '2025-04-19T23:00:00+00:00',
+          '2025-05-17T23:00:00+00:00',
         ]),
         'notes': 'Klicke um den Namen Deines aktuellen Projekts anzugeben & setze einen Terminplan!',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -4515,14 +4593,15 @@
           'th': False,
           'w': False,
         }),
-        'startDate': datetime.datetime(2024, 9, 20, 23, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-09-20T23:00:00+00:00',
         'streak': 1,
         'tags': list([
         ]),
         'text': 'Arbeite an einem kreativen Projekt',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 11, 27, 23, 47, 29, 986000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-11-27T23:47:29.986000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': -0.9215181434950852,
         'weeksOfMonth': list([
           3,
@@ -4530,9 +4609,8 @@
         'yesterDaily': True,
       }),
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -4547,13 +4625,13 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 10, 10, 15, 57, 14, 304000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-10-10T15:57:14.304000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.WEEKLY: 'weekly'>,
+        'frequency': 'weekly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -4571,18 +4649,18 @@
         }),
         'history': list([
         ]),
-        'id': UUID('7d92278b-9361-4854-83b6-0a66b57dce20'),
+        'id': '7d92278b-9361-4854-83b6-0a66b57dce20',
         'isDue': False,
         'nextDue': list([
-          datetime.datetime(2024, 12, 14, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 1, 18, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 2, 15, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 3, 15, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 4, 19, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 5, 17, 23, 0, tzinfo=datetime.timezone.utc),
+          '2024-12-14T23:00:00+00:00',
+          '2025-01-18T23:00:00+00:00',
+          '2025-02-15T23:00:00+00:00',
+          '2025-03-15T23:00:00+00:00',
+          '2025-04-19T23:00:00+00:00',
+          '2025-05-17T23:00:00+00:00',
         ]),
         'notes': 'Wähle eine Programmiersprache aus, die du noch nicht kennst, und lerne die Grundlagen.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -4594,14 +4672,15 @@
           'th': False,
           'w': False,
         }),
-        'startDate': datetime.datetime(2024, 9, 20, 23, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-09-20T23:00:00+00:00',
         'streak': 1,
         'tags': list([
         ]),
         'text': 'Lerne eine neue Programmiersprache',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 11, 27, 23, 47, 29, 986000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-11-27T23:47:29.986000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': -0.9215181434950852,
         'weeksOfMonth': list([
         ]),
@@ -4614,9 +4693,8 @@
   dict({
     'tasks': list([
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': 'alias_zahnseide_benutzen',
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -4628,7 +4706,7 @@
         'checklist': list([
           dict({
             'completed': False,
-            'id': UUID('c8662c16-8cd3-4104-a3b2-b1e54f61b8ca'),
+            'id': 'c8662c16-8cd3-4104-a3b2-b1e54f61b8ca',
             'text': 'Checklist-item1',
           }),
         ]),
@@ -4636,13 +4714,13 @@
         'completed': True,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 268000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.268000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.WEEKLY: 'weekly'>,
+        'frequency': 'weekly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -4661,7 +4739,7 @@
         'history': list([
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 7, 18, 26, 6, 749000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T18:26:06.749000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4669,7 +4747,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 17, 15, 11, 292000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T17:15:11.292000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4677,7 +4755,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 22, 31, 46, 719000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T22:31:46.719000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4685,7 +4763,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 11, 9, 44, 56, 907000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-11T09:44:56.907000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4693,7 +4771,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 12, 9, 58, 45, 243000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-12T09:58:45.243000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4701,7 +4779,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 8, 20, 20, 19, 56, 447000, tzinfo=datetime.timezone.utc),
+            'date': '2024-08-20T20:19:56.447000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4709,7 +4787,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 8, 21, 15, 55, 7, 692000, tzinfo=datetime.timezone.utc),
+            'date': '2024-08-21T15:55:07.692000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4717,7 +4795,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 20, 15, 29, 23, 640000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-20T15:29:23.640000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4725,7 +4803,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 21, 23, 7, 542000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T21:23:07.542000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4733,7 +4811,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 22, 1, 55, 608000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T22:01:55.608000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4741,25 +4819,25 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 9, 21, 22, 24, 20, 150000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T22:24:20.150000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
             'value': -2.9663035443712333,
           }),
         ]),
-        'id': UUID('564b9ac9-c53d-4638-9e7f-1cd96fe19baa'),
+        'id': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
         'isDue': True,
         'nextDue': list([
-          datetime.datetime(2024, 9, 23, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 24, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 25, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 26, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 27, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
-          datetime.datetime(2024, 9, 28, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(seconds=7200), 'GMT')),
+          '2024-09-23T00:00:00+02:00',
+          '2024-09-24T00:00:00+02:00',
+          '2024-09-25T00:00:00+02:00',
+          '2024-09-26T00:00:00+02:00',
+          '2024-09-27T00:00:00+02:00',
+          '2024-09-28T00:00:00+02:00',
         ]),
         'notes': 'Klicke um Änderungen zu machen!',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -4771,23 +4849,23 @@
           'th': True,
           'w': True,
         }),
-        'startDate': datetime.datetime(2024, 7, 6, 22, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-07-06T22:00:00+00:00',
         'streak': 1,
         'tags': list([
         ]),
         'text': 'Zahnseide benutzen',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 24, 20, 154000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:24:20.154000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': -2.9663035443712333,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': True,
       }),
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -4802,13 +4880,13 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 266000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.266000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.WEEKLY: 'weekly'>,
+        'frequency': 'weekly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -4827,7 +4905,7 @@
         'history': list([
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 7, 17, 55, 3, 74000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T17:55:03.074000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4835,7 +4913,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 17, 15, 11, 291000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T17:15:11.291000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4843,7 +4921,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 7, 9, 22, 31, 46, 717000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-09T22:31:46.717000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4851,7 +4929,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 11, 7, 20, 59, 722000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-11T07:20:59.722000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4859,7 +4937,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 12, 9, 58, 45, 246000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-12T09:58:45.246000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4867,7 +4945,7 @@
           }),
           dict({
             'completed': True,
-            'date': datetime.datetime(2024, 7, 12, 10, 1, 32, 219000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-12T10:01:32.219000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4875,7 +4953,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 8, 21, 15, 55, 7, 691000, tzinfo=datetime.timezone.utc),
+            'date': '2024-08-21T15:55:07.691000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4883,7 +4961,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 20, 15, 29, 23, 638000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-20T15:29:23.638000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4891,7 +4969,7 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 21, 23, 7, 540000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T21:23:07.540000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
@@ -4899,30 +4977,30 @@
           }),
           dict({
             'completed': False,
-            'date': datetime.datetime(2024, 9, 21, 22, 1, 55, 607000, tzinfo=datetime.timezone.utc),
+            'date': '2024-09-21T22:01:55.607000+00:00',
             'isDue': True,
             'scoredDown': None,
             'scoredUp': None,
             'value': -1.919611992979862,
           }),
         ]),
-        'id': UUID('f2c85972-1a19-4426-bc6d-ce3337b9d99f'),
+        'id': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
         'isDue': True,
         'nextDue': list([
-          datetime.datetime(2024, 9, 22, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 23, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 24, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 25, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 26, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 27, 22, 0, tzinfo=datetime.timezone.utc),
+          '2024-09-22T22:00:00+00:00',
+          '2024-09-23T22:00:00+00:00',
+          '2024-09-24T22:00:00+00:00',
+          '2024-09-25T22:00:00+00:00',
+          '2024-09-26T22:00:00+00:00',
+          '2024-09-27T22:00:00+00:00',
         ]),
         'notes': 'Klicke um Deinen Terminplan festzulegen!',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
           dict({
-            'id': UUID('1491d640-6b21-4d0c-8940-0b7aa61c8836'),
+            'id': '1491d640-6b21-4d0c-8940-0b7aa61c8836',
             'startDate': None,
-            'time': datetime.datetime(2024, 9, 22, 20, 0, tzinfo=datetime.timezone.utc),
+            'time': '2024-09-22T20:00:00+00:00',
           }),
         ]),
         'repeat': dict({
@@ -4934,23 +5012,23 @@
           'th': True,
           'w': True,
         }),
-        'startDate': datetime.datetime(2024, 7, 6, 22, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-07-06T22:00:00+00:00',
         'streak': 0,
         'tags': list([
         ]),
         'text': '5 Minuten ruhig durchatmen',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 51, 41, 756000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:51:41.756000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': -1.919611992979862,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': True,
       }),
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -4962,7 +5040,7 @@
         'checklist': list([
           dict({
             'completed': True,
-            'id': UUID('c8662c16-8cd3-4104-a3b2-b1e54f61b8ca'),
+            'id': 'c8662c16-8cd3-4104-a3b2-b1e54f61b8ca',
             'text': 'Checklist-item1',
           }),
         ]),
@@ -4970,13 +5048,13 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 22, 11, 44, 43, 774000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-22T11:44:43.774000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.WEEKLY: 'weekly'>,
+        'frequency': 'weekly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -4994,18 +5072,18 @@
         }),
         'history': list([
         ]),
-        'id': UUID('2c6d136c-a1c3-4bef-b7c4-fa980784b1e1'),
+        'id': '2c6d136c-a1c3-4bef-b7c4-fa980784b1e1',
         'isDue': True,
         'nextDue': list([
-          datetime.datetime(2024, 9, 24, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 27, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 9, 28, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 10, 1, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 10, 4, 22, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2024, 10, 8, 22, 0, tzinfo=datetime.timezone.utc),
+          '2024-09-24T22:00:00+00:00',
+          '2024-09-27T22:00:00+00:00',
+          '2024-09-28T22:00:00+00:00',
+          '2024-10-01T22:00:00+00:00',
+          '2024-10-04T22:00:00+00:00',
+          '2024-10-08T22:00:00+00:00',
         ]),
         'notes': 'Ein einstündiges Workout im Fitnessstudio absolvieren.',
-        'priority': <TaskPriority.HARD: 2>,
+        'priority': 2,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -5017,24 +5095,24 @@
           'th': False,
           'w': True,
         }),
-        'startDate': datetime.datetime(2024, 9, 21, 22, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-09-21T22:00:00+00:00',
         'streak': 0,
         'tags': list([
-          UUID('6aa65cbb-dc08-4fdd-9a66-7dedb7ba4cab'),
+          '6aa65cbb-dc08-4fdd-9a66-7dedb7ba4cab',
         ]),
         'text': 'Fitnessstudio besuchen',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 22, 11, 44, 43, 774000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('1343a9af-d891-4027-841a-956d105ca408'),
+        'updatedAt': '2024-09-22T11:44:43.774000+00:00',
+        'userId': '1343a9af-d891-4027-841a-956d105ca408',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': True,
       }),
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -5044,18 +5122,28 @@
           'winner': None,
         }),
         'checklist': list([
+          dict({
+            'completed': False,
+            'id': 'a2a6702d-58e1-46c2-a3ce-422d525cc0b6',
+            'text': 'Checklist-item1',
+          }),
+          dict({
+            'completed': True,
+            'id': '9f64e1cd-b0ab-4577-8344-c7a5e1827997',
+            'text': 'Checklist-item2',
+          }),
         ]),
         'collapseChecklist': False,
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 10, 10, 15, 57, 14, 304000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-10-10T15:57:14.304000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.MONTHLY: 'monthly'>,
+        'frequency': 'monthly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -5073,18 +5161,18 @@
         }),
         'history': list([
         ]),
-        'id': UUID('6e53f1f5-a315-4edd-984d-8d762e4a08ef'),
+        'id': '6e53f1f5-a315-4edd-984d-8d762e4a08ef',
         'isDue': False,
         'nextDue': list([
-          datetime.datetime(2024, 12, 14, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 1, 18, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 2, 15, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 3, 15, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 4, 19, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 5, 17, 23, 0, tzinfo=datetime.timezone.utc),
+          '2024-12-14T23:00:00+00:00',
+          '2025-01-18T23:00:00+00:00',
+          '2025-02-15T23:00:00+00:00',
+          '2025-03-15T23:00:00+00:00',
+          '2025-04-19T23:00:00+00:00',
+          '2025-05-17T23:00:00+00:00',
         ]),
         'notes': 'Klicke um den Namen Deines aktuellen Projekts anzugeben & setze einen Terminplan!',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -5096,14 +5184,15 @@
           'th': False,
           'w': False,
         }),
-        'startDate': datetime.datetime(2024, 9, 20, 23, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-09-20T23:00:00+00:00',
         'streak': 1,
         'tags': list([
         ]),
         'text': 'Arbeite an einem kreativen Projekt',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 11, 27, 23, 47, 29, 986000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-11-27T23:47:29.986000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': -0.9215181434950852,
         'weeksOfMonth': list([
           3,
@@ -5111,9 +5200,8 @@
         'yesterDaily': True,
       }),
       dict({
-        'Type': <TaskType.DAILY: 'daily'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -5128,13 +5216,13 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 10, 10, 15, 57, 14, 304000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-10-10T15:57:14.304000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': None,
         'everyX': 1,
-        'frequency': <Frequency.WEEKLY: 'weekly'>,
+        'frequency': 'weekly',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -5152,18 +5240,18 @@
         }),
         'history': list([
         ]),
-        'id': UUID('7d92278b-9361-4854-83b6-0a66b57dce20'),
+        'id': '7d92278b-9361-4854-83b6-0a66b57dce20',
         'isDue': False,
         'nextDue': list([
-          datetime.datetime(2024, 12, 14, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 1, 18, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 2, 15, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 3, 15, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 4, 19, 23, 0, tzinfo=datetime.timezone.utc),
-          datetime.datetime(2025, 5, 17, 23, 0, tzinfo=datetime.timezone.utc),
+          '2024-12-14T23:00:00+00:00',
+          '2025-01-18T23:00:00+00:00',
+          '2025-02-15T23:00:00+00:00',
+          '2025-03-15T23:00:00+00:00',
+          '2025-04-19T23:00:00+00:00',
+          '2025-05-17T23:00:00+00:00',
         ]),
         'notes': 'Wähle eine Programmiersprache aus, die du noch nicht kennst, und lerne die Grundlagen.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -5175,14 +5263,15 @@
           'th': False,
           'w': False,
         }),
-        'startDate': datetime.datetime(2024, 9, 20, 23, 0, tzinfo=datetime.timezone.utc),
+        'startDate': '2024-09-20T23:00:00+00:00',
         'streak': 1,
         'tags': list([
         ]),
         'text': 'Lerne eine neue Programmiersprache',
+        'type': 'daily',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 11, 27, 23, 47, 29, 986000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-11-27T23:47:29.986000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': -0.9215181434950852,
         'weeksOfMonth': list([
         ]),
@@ -5195,9 +5284,8 @@
   dict({
     'tasks': list([
       dict({
-        'Type': <TaskType.HABIT: 'habit'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -5212,13 +5300,13 @@
         'completed': None,
         'counterDown': 0,
         'counterUp': 0,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 268000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.268000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': True,
         'everyX': None,
-        'frequency': <Frequency.DAILY: 'daily'>,
+        'frequency': 'daily',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -5236,12 +5324,12 @@
         }),
         'history': list([
         ]),
-        'id': UUID('f21fa608-cfc6-4413-9fc7-0eb1b48ca43a'),
+        'id': 'f21fa608-cfc6-4413-9fc7-0eb1b48ca43a',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': '',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -5258,18 +5346,18 @@
         'tags': list([
         ]),
         'text': 'Gesundes Essen/Junkfood',
+        'type': 'habit',
         'up': True,
-        'updatedAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 268000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-07T17:51:53.268000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.HABIT: 'habit'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -5284,13 +5372,13 @@
         'completed': None,
         'counterDown': 0,
         'counterUp': 0,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 266000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.266000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': False,
         'everyX': None,
-        'frequency': <Frequency.DAILY: 'daily'>,
+        'frequency': 'daily',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -5309,19 +5397,19 @@
         'history': list([
           dict({
             'completed': None,
-            'date': datetime.datetime(2024, 7, 7, 18, 26, 3, 324000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T18:26:03.324000+00:00',
             'isDue': None,
             'scoredDown': 0,
             'scoredUp': 1,
             'value': 1.0,
           }),
         ]),
-        'id': UUID('1d147de6-5c02-4740-8e2f-71d3015a37f4'),
+        'id': '1d147de6-5c02-4740-8e2f-71d3015a37f4',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': '',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -5338,18 +5426,18 @@
         'tags': list([
         ]),
         'text': 'Eine kurze Pause machen',
+        'type': 'habit',
         'up': True,
-        'updatedAt': datetime.datetime(2024, 7, 12, 9, 58, 45, 438000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-12T09:58:45.438000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.HABIT: 'habit'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -5364,13 +5452,13 @@
         'completed': None,
         'counterDown': 0,
         'counterUp': 0,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 265000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.265000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': True,
         'everyX': None,
-        'frequency': <Frequency.DAILY: 'daily'>,
+        'frequency': 'daily',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -5388,12 +5476,12 @@
         }),
         'history': list([
         ]),
-        'id': UUID('bc1d1855-b2b8-4663-98ff-62e7b763dfc4'),
+        'id': 'bc1d1855-b2b8-4663-98ff-62e7b763dfc4',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Oder lösche es über die Bearbeitungs-Ansicht',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -5410,18 +5498,18 @@
         'tags': list([
         ]),
         'text': 'Klicke hier um dies als schlechte Gewohnheit zu markieren, die Du gerne loswerden möchtest',
+        'type': 'habit',
         'up': False,
-        'updatedAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 265000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-07T17:51:53.265000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.HABIT: 'habit'>,
         'alias': 'create_a_task',
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -5436,13 +5524,13 @@
         'completed': None,
         'counterDown': 0,
         'counterUp': 0,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 264000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.264000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
         'down': False,
         'everyX': None,
-        'frequency': <Frequency.DAILY: 'daily'>,
+        'frequency': 'daily',
         'group': dict({
           'assignedDate': None,
           'assignedUsers': list([
@@ -5461,19 +5549,19 @@
         'history': list([
           dict({
             'completed': None,
-            'date': datetime.datetime(2024, 7, 7, 18, 26, 3, 140000, tzinfo=datetime.timezone.utc),
+            'date': '2024-07-07T18:26:03.140000+00:00',
             'isDue': None,
             'scoredDown': 0,
             'scoredUp': 1,
             'value': 1.0,
           }),
         ]),
-        'id': UUID('e97659e0-2c42-4599-a7bb-00282adc410d'),
+        'id': 'e97659e0-2c42-4599-a7bb-00282adc410d',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Eine Gewohnheit, eine Tagesaufgabe oder ein To-Do',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -5490,9 +5578,10 @@
         'tags': list([
         ]),
         'text': 'Füge eine Aufgabe zu Habitica hinzu',
+        'type': 'habit',
         'up': True,
-        'updatedAt': datetime.datetime(2024, 7, 12, 9, 58, 45, 438000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-12T09:58:45.438000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
@@ -5505,9 +5594,8 @@
   dict({
     'tasks': list([
       dict({
-        'Type': <TaskType.REWARD: 'reward'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -5522,7 +5610,7 @@
         'completed': None,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 266000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.266000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
@@ -5544,13 +5632,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b'),
+        'history': list([
+        ]),
+        'id': '5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Schaue fern, spiele ein Spiel, gönne Dir einen Leckerbissen, es liegt ganz bei Dir!',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -5565,11 +5654,14 @@
         'startDate': None,
         'streak': None,
         'tags': list([
+          '3450351f-1323-4c7e-9fd2-0cdff25b3ce0',
+          'b2780f82-b3b5-49a3-a677-48f2c8c7e3bb',
         ]),
         'text': 'Belohne Dich selbst',
+        'type': 'reward',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 266000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-07T17:51:53.266000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 10.0,
         'weeksOfMonth': list([
         ]),
@@ -5582,9 +5674,8 @@
   dict({
     'tasks': list([
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -5594,13 +5685,23 @@
           'winner': None,
         }),
         'checklist': list([
+          dict({
+            'completed': False,
+            'id': 'fccc26f2-1e2b-4bf8-9dd0-a405be261036',
+            'text': 'Checklist-item1',
+          }),
+          dict({
+            'completed': True,
+            'id': '5a897af4-ea94-456a-a2bd-f336bcd79509',
+            'text': 'Checklist-item2',
+          }),
         ]),
         'collapseChecklist': False,
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 17, 57, 816000, tzinfo=datetime.timezone.utc),
-        'date': datetime.datetime(2024, 9, 27, 22, 17, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:17:57.816000+00:00',
+        'date': '2024-09-27T22:17:00+00:00',
         'daysOfMonth': list([
         ]),
         'down': None,
@@ -5621,13 +5722,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('88de7cd9-af2b-49ce-9afd-bf941d87336b'),
+        'history': list([
+        ]),
+        'id': '88de7cd9-af2b-49ce-9afd-bf941d87336b',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Das Buch, das du angefangen hast, bis zum Wochenende fertig lesen.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -5642,22 +5744,22 @@
         'startDate': None,
         'streak': None,
         'tags': list([
-          UUID('20409521-c096-447f-9a90-23e8da615710'),
-          UUID('8515e4ae-2f4b-455a-b4a4-8939e04b1bfd'),
+          '20409521-c096-447f-9a90-23e8da615710',
+          '8515e4ae-2f4b-455a-b4a4-8939e04b1bfd',
         ]),
         'text': 'Buch zu Ende lesen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 17, 57, 816000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:17:57.816000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': 'pay_bills',
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -5672,8 +5774,8 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 17, 19, 513000, tzinfo=datetime.timezone.utc),
-        'date': datetime.datetime(2024, 8, 31, 22, 16, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:17:19.513000+00:00',
+        'date': '2024-08-31T22:16:00+00:00',
         'daysOfMonth': list([
         ]),
         'down': None,
@@ -5694,18 +5796,19 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('2f6fcabc-f670-4ec3-ba65-817e8deea490'),
+        'history': list([
+        ]),
+        'id': '2f6fcabc-f670-4ec3-ba65-817e8deea490',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Strom- und Internetrechnungen rechtzeitig überweisen.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
           dict({
-            'id': UUID('91c09432-10ac-4a49-bd20-823081ec29ed'),
+            'id': '91c09432-10ac-4a49-bd20-823081ec29ed',
             'startDate': None,
-            'time': datetime.datetime(2024, 9, 22, 2, 0, tzinfo=datetime.timezone.utc),
+            'time': '2024-09-22T02:00:00+00:00',
           }),
         ]),
         'repeat': dict({
@@ -5722,18 +5825,18 @@
         'tags': list([
         ]),
         'text': 'Rechnungen bezahlen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 19, 35, 576000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:19:35.576000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -5748,7 +5851,7 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 16, 38, 153000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:16:38.153000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
@@ -5770,13 +5873,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('1aa3137e-ef72-4d1f-91ee-41933602f438'),
+        'history': list([
+        ]),
+        'id': '1aa3137e-ef72-4d1f-91ee-41933602f438',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Rasen mähen und die Pflanzen gießen.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -5793,18 +5897,18 @@
         'tags': list([
         ]),
         'text': 'Garten pflegen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 16, 38, 153000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:16:38.153000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -5819,8 +5923,8 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 16, 16, 756000, tzinfo=datetime.timezone.utc),
-        'date': datetime.datetime(2024, 9, 21, 22, 0, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:16:16.756000+00:00',
+        'date': '2024-09-21T22:00:00+00:00',
         'daysOfMonth': list([
         ]),
         'down': None,
@@ -5841,13 +5945,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('86ea2475-d1b5-4020-bdcc-c188c7996afa'),
+        'history': list([
+        ]),
+        'id': '86ea2475-d1b5-4020-bdcc-c188c7996afa',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Den Ausflug für das kommende Wochenende organisieren.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -5862,21 +5967,21 @@
         'startDate': None,
         'streak': None,
         'tags': list([
-          UUID('51076966-2970-4b40-b6ba-d58c6a756dd7'),
+          '51076966-2970-4b40-b6ba-d58c6a756dd7',
         ]),
         'text': 'Wochenendausflug planen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 16, 16, 756000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:16:16.756000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.REWARD: 'reward'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -5891,7 +5996,7 @@
         'completed': None,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 266000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-07-07T17:51:53.266000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
@@ -5913,13 +6018,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b'),
+        'history': list([
+        ]),
+        'id': '5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Schaue fern, spiele ein Spiel, gönne Dir einen Leckerbissen, es liegt ganz bei Dir!',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -5934,20 +6040,22 @@
         'startDate': None,
         'streak': None,
         'tags': list([
+          '3450351f-1323-4c7e-9fd2-0cdff25b3ce0',
+          'b2780f82-b3b5-49a3-a677-48f2c8c7e3bb',
         ]),
         'text': 'Belohne Dich selbst',
+        'type': 'reward',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 7, 7, 17, 51, 53, 266000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-07-07T17:51:53.266000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 10.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -5962,7 +6070,7 @@
         'completed': True,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 19, 10, 919000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:19:10.919000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
@@ -5984,13 +6092,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('162f0bbe-a097-4a06-b4f4-8fbeed85d2ba'),
+        'history': list([
+        ]),
+        'id': '162f0bbe-a097-4a06-b4f4-8fbeed85d2ba',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Lebensmittel und Haushaltsbedarf für die Woche einkaufen.',
-        'priority': <TaskPriority.MEDIUM: 1.5>,
+        'priority': 1.5,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -6005,21 +6114,21 @@
         'startDate': None,
         'streak': None,
         'tags': list([
-          UUID('64235347-55d0-4ba1-a86a-3428dcfdf319'),
+          '64235347-55d0-4ba1-a86a-3428dcfdf319',
         ]),
         'text': 'Wocheneinkauf erledigen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 19, 15, 484000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:19:15.484000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 1.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -6034,7 +6143,7 @@
         'completed': True,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 18, 30, 646000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:18:30.646000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
@@ -6056,13 +6165,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('3fa06743-aa0f-472b-af1a-f27c755e329c'),
+        'history': list([
+        ]),
+        'id': '3fa06743-aa0f-472b-af1a-f27c755e329c',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Wohnzimmer und Küche gründlich aufräumen.',
-        'priority': <TaskPriority.HARD: 2>,
+        'priority': 2,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -6077,12 +6187,13 @@
         'startDate': None,
         'streak': None,
         'tags': list([
-          UUID('64235347-55d0-4ba1-a86a-3428dcfdf319'),
+          '64235347-55d0-4ba1-a86a-3428dcfdf319',
         ]),
         'text': 'Wohnung aufräumen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 18, 34, 663000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:18:34.663000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 1.0,
         'weeksOfMonth': list([
         ]),
@@ -6095,9 +6206,8 @@
   dict({
     'tasks': list([
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -6107,13 +6217,23 @@
           'winner': None,
         }),
         'checklist': list([
+          dict({
+            'completed': False,
+            'id': 'fccc26f2-1e2b-4bf8-9dd0-a405be261036',
+            'text': 'Checklist-item1',
+          }),
+          dict({
+            'completed': True,
+            'id': '5a897af4-ea94-456a-a2bd-f336bcd79509',
+            'text': 'Checklist-item2',
+          }),
         ]),
         'collapseChecklist': False,
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 17, 57, 816000, tzinfo=datetime.timezone.utc),
-        'date': datetime.datetime(2024, 9, 27, 22, 17, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:17:57.816000+00:00',
+        'date': '2024-09-27T22:17:00+00:00',
         'daysOfMonth': list([
         ]),
         'down': None,
@@ -6134,13 +6254,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('88de7cd9-af2b-49ce-9afd-bf941d87336b'),
+        'history': list([
+        ]),
+        'id': '88de7cd9-af2b-49ce-9afd-bf941d87336b',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Das Buch, das du angefangen hast, bis zum Wochenende fertig lesen.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -6155,22 +6276,22 @@
         'startDate': None,
         'streak': None,
         'tags': list([
-          UUID('20409521-c096-447f-9a90-23e8da615710'),
-          UUID('8515e4ae-2f4b-455a-b4a4-8939e04b1bfd'),
+          '20409521-c096-447f-9a90-23e8da615710',
+          '8515e4ae-2f4b-455a-b4a4-8939e04b1bfd',
         ]),
         'text': 'Buch zu Ende lesen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 17, 57, 816000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:17:57.816000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': 'pay_bills',
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -6185,8 +6306,8 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 17, 19, 513000, tzinfo=datetime.timezone.utc),
-        'date': datetime.datetime(2024, 8, 31, 22, 16, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:17:19.513000+00:00',
+        'date': '2024-08-31T22:16:00+00:00',
         'daysOfMonth': list([
         ]),
         'down': None,
@@ -6207,18 +6328,19 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('2f6fcabc-f670-4ec3-ba65-817e8deea490'),
+        'history': list([
+        ]),
+        'id': '2f6fcabc-f670-4ec3-ba65-817e8deea490',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Strom- und Internetrechnungen rechtzeitig überweisen.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
           dict({
-            'id': UUID('91c09432-10ac-4a49-bd20-823081ec29ed'),
+            'id': '91c09432-10ac-4a49-bd20-823081ec29ed',
             'startDate': None,
-            'time': datetime.datetime(2024, 9, 22, 2, 0, tzinfo=datetime.timezone.utc),
+            'time': '2024-09-22T02:00:00+00:00',
           }),
         ]),
         'repeat': dict({
@@ -6235,18 +6357,18 @@
         'tags': list([
         ]),
         'text': 'Rechnungen bezahlen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 19, 35, 576000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:19:35.576000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -6261,7 +6383,7 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 16, 38, 153000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:16:38.153000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
@@ -6283,13 +6405,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('1aa3137e-ef72-4d1f-91ee-41933602f438'),
+        'history': list([
+        ]),
+        'id': '1aa3137e-ef72-4d1f-91ee-41933602f438',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Rasen mähen und die Pflanzen gießen.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -6306,18 +6429,18 @@
         'tags': list([
         ]),
         'text': 'Garten pflegen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 16, 38, 153000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:16:38.153000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -6332,8 +6455,8 @@
         'completed': False,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 16, 16, 756000, tzinfo=datetime.timezone.utc),
-        'date': datetime.datetime(2024, 9, 21, 22, 0, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:16:16.756000+00:00',
+        'date': '2024-09-21T22:00:00+00:00',
         'daysOfMonth': list([
         ]),
         'down': None,
@@ -6354,13 +6477,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('86ea2475-d1b5-4020-bdcc-c188c7996afa'),
+        'history': list([
+        ]),
+        'id': '86ea2475-d1b5-4020-bdcc-c188c7996afa',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Den Ausflug für das kommende Wochenende organisieren.',
-        'priority': <TaskPriority.EASY: 1>,
+        'priority': 1,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -6375,21 +6499,21 @@
         'startDate': None,
         'streak': None,
         'tags': list([
-          UUID('51076966-2970-4b40-b6ba-d58c6a756dd7'),
+          '51076966-2970-4b40-b6ba-d58c6a756dd7',
         ]),
         'text': 'Wochenendausflug planen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 16, 16, 756000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:16:16.756000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 0.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -6404,7 +6528,7 @@
         'completed': True,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 19, 10, 919000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:19:10.919000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
@@ -6426,13 +6550,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('162f0bbe-a097-4a06-b4f4-8fbeed85d2ba'),
+        'history': list([
+        ]),
+        'id': '162f0bbe-a097-4a06-b4f4-8fbeed85d2ba',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Lebensmittel und Haushaltsbedarf für die Woche einkaufen.',
-        'priority': <TaskPriority.MEDIUM: 1.5>,
+        'priority': 1.5,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -6447,21 +6572,21 @@
         'startDate': None,
         'streak': None,
         'tags': list([
-          UUID('64235347-55d0-4ba1-a86a-3428dcfdf319'),
+          '64235347-55d0-4ba1-a86a-3428dcfdf319',
         ]),
         'text': 'Wocheneinkauf erledigen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 19, 15, 484000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:19:15.484000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 1.0,
         'weeksOfMonth': list([
         ]),
         'yesterDaily': None,
       }),
       dict({
-        'Type': <TaskType.TODO: 'todo'>,
         'alias': None,
-        'attribute': <Attributes.STR: 'str'>,
+        'attribute': 'str',
         'byHabitica': False,
         'challenge': dict({
           'broken': None,
@@ -6476,7 +6601,7 @@
         'completed': True,
         'counterDown': None,
         'counterUp': None,
-        'createdAt': datetime.datetime(2024, 9, 21, 22, 18, 30, 646000, tzinfo=datetime.timezone.utc),
+        'createdAt': '2024-09-21T22:18:30.646000+00:00',
         'date': None,
         'daysOfMonth': list([
         ]),
@@ -6498,13 +6623,14 @@
           'managerNotes': None,
           'taskId': None,
         }),
-        'history': None,
-        'id': UUID('3fa06743-aa0f-472b-af1a-f27c755e329c'),
+        'history': list([
+        ]),
+        'id': '3fa06743-aa0f-472b-af1a-f27c755e329c',
         'isDue': None,
         'nextDue': list([
         ]),
         'notes': 'Wohnzimmer und Küche gründlich aufräumen.',
-        'priority': <TaskPriority.HARD: 2>,
+        'priority': 2,
         'reminders': list([
         ]),
         'repeat': dict({
@@ -6519,12 +6645,13 @@
         'startDate': None,
         'streak': None,
         'tags': list([
-          UUID('64235347-55d0-4ba1-a86a-3428dcfdf319'),
+          '64235347-55d0-4ba1-a86a-3428dcfdf319',
         ]),
         'text': 'Wohnung aufräumen',
+        'type': 'todo',
         'up': None,
-        'updatedAt': datetime.datetime(2024, 9, 21, 22, 18, 34, 663000, tzinfo=datetime.timezone.utc),
-        'userId': UUID('5f359083-ef78-4af0-985a-0b2c6d05797c'),
+        'updatedAt': '2024-09-21T22:18:34.663000+00:00',
+        'userId': '5f359083-ef78-4af0-985a-0b2c6d05797c',
         'value': 1.0,
         'weeksOfMonth': list([
         ]),
diff --git a/tests/components/habitica/snapshots/test_switch.ambr b/tests/components/habitica/snapshots/test_switch.ambr
index a865df3a4f4..e8122f77c6e 100644
--- a/tests/components/habitica/snapshots/test_switch.ambr
+++ b/tests/components/habitica/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/habitica/snapshots/test_todo.ambr b/tests/components/habitica/snapshots/test_todo.ambr
index 9cd6d9a540f..88204d53ded 100644
--- a/tests/components/habitica/snapshots/test_todo.ambr
+++ b/tests/components/habitica/snapshots/test_todo.ambr
@@ -113,6 +113,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -160,6 +161,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/habitica/test_image.py b/tests/components/habitica/test_image.py
new file mode 100644
index 00000000000..17089f57bd7
--- /dev/null
+++ b/tests/components/habitica/test_image.py
@@ -0,0 +1,99 @@
+"""Tests for the Habitica image platform."""
+
+from collections.abc import Generator
+from datetime import timedelta
+from http import HTTPStatus
+from io import BytesIO
+import sys
+from unittest.mock import AsyncMock, patch
+
+from freezegun.api import FrozenDateTimeFactory
+from habiticalib import HabiticaUserResponse
+import pytest
+from syrupy.assertion import SnapshotAssertion
+from syrupy.extensions.image import PNGImageSnapshotExtension
+
+from homeassistant.components.habitica.const import DOMAIN
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry, async_fire_time_changed, load_fixture
+from tests.typing import ClientSessionGenerator
+
+
+@pytest.fixture(autouse=True)
+def image_only() -> Generator[None]:
+    """Enable only the image platform."""
+    with patch(
+        "homeassistant.components.habitica.PLATFORMS",
+        [Platform.IMAGE],
+    ):
+        yield
+
+
+@pytest.mark.skipif(
+    sys.platform != "linux", reason="linux only"
+)  # Pillow output on win/mac is different
+async def test_image_platform(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    snapshot: SnapshotAssertion,
+    hass_client: ClientSessionGenerator,
+    habitica: AsyncMock,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test image platform."""
+    freezer.move_to("2024-09-20T22:00:00.000")
+    with patch(
+        "homeassistant.components.habitica.coordinator.BytesIO",
+    ) as avatar:
+        avatar.side_effect = [
+            BytesIO(
+                b"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01\x08\x06\x00\x00\x00\x1f\x15\xc4\x89\x00\x00\x00\rIDATx\xdac\xfc\xcf\xc0\xf0\x1f\x00\x05\x05\x02\x00_\xc8\xf1\xd2\x00\x00\x00\x00IEND\xaeB`\x82"
+            ),
+            BytesIO(
+                b"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01\x08\x06\x00\x00\x00\x1f\x15\xc4\x89\x00\x00\x00\rIDATx\xdacd`\xf8\xff\x1f\x00\x03\x07\x02\x000&\xc7a\x00\x00\x00\x00IEND\xaeB`\x82"
+            ),
+        ]
+
+        config_entry.add_to_hass(hass)
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
+
+        assert config_entry.state is ConfigEntryState.LOADED
+
+        assert (state := hass.states.get("image.test_user_avatar"))
+        assert state.state == "2024-09-20T22:00:00+00:00"
+
+        access_token = state.attributes["access_token"]
+        assert (
+            state.attributes["entity_picture"]
+            == f"/api/image_proxy/image.test_user_avatar?token={access_token}"
+        )
+
+        client = await hass_client()
+        resp = await client.get(state.attributes["entity_picture"])
+        assert resp.status == HTTPStatus.OK
+
+        assert (await resp.read()) == snapshot(
+            extension_class=PNGImageSnapshotExtension
+        )
+
+        habitica.get_user.return_value = HabiticaUserResponse.from_json(
+            load_fixture("rogue_fixture.json", DOMAIN)
+        )
+
+        freezer.tick(timedelta(seconds=60))
+        async_fire_time_changed(hass)
+        await hass.async_block_till_done()
+
+        assert (state := hass.states.get("image.test_user_avatar"))
+        assert state.state == "2024-09-20T22:01:00+00:00"
+
+        resp = await client.get(state.attributes["entity_picture"])
+        assert resp.status == HTTPStatus.OK
+
+        assert (await resp.read()) == snapshot(
+            extension_class=PNGImageSnapshotExtension
+        )
diff --git a/tests/components/habitica/test_services.py b/tests/components/habitica/test_services.py
index 5fca1884bdf..774593fa0f6 100644
--- a/tests/components/habitica/test_services.py
+++ b/tests/components/habitica/test_services.py
@@ -1,31 +1,69 @@
 """Test Habitica actions."""
 
 from collections.abc import Generator
+from datetime import UTC, datetime
 from typing import Any
 from unittest.mock import AsyncMock, patch
 from uuid import UUID
 
 from aiohttp import ClientError
-from habiticalib import Direction, Skill
+from freezegun.api import freeze_time
+from habiticalib import (
+    Checklist,
+    Direction,
+    Frequency,
+    HabiticaTaskResponse,
+    Reminders,
+    Repeat,
+    Skill,
+    Task,
+    TaskPriority,
+    TaskType,
+)
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components.habitica.const import (
+    ATTR_ADD_CHECKLIST_ITEM,
+    ATTR_ALIAS,
+    ATTR_CLEAR_DATE,
+    ATTR_CLEAR_REMINDER,
     ATTR_CONFIG_ENTRY,
+    ATTR_COST,
+    ATTR_COUNTER_DOWN,
+    ATTR_COUNTER_UP,
     ATTR_DIRECTION,
+    ATTR_FREQUENCY,
+    ATTR_INTERVAL,
     ATTR_ITEM,
     ATTR_KEYWORD,
+    ATTR_NOTES,
     ATTR_PRIORITY,
+    ATTR_REMINDER,
+    ATTR_REMOVE_CHECKLIST_ITEM,
+    ATTR_REMOVE_REMINDER,
+    ATTR_REMOVE_TAG,
+    ATTR_REPEAT,
+    ATTR_REPEAT_MONTHLY,
+    ATTR_SCORE_CHECKLIST_ITEM,
     ATTR_SKILL,
+    ATTR_START_DATE,
+    ATTR_STREAK,
     ATTR_TAG,
     ATTR_TARGET,
     ATTR_TASK,
     ATTR_TYPE,
+    ATTR_UNSCORE_CHECKLIST_ITEM,
+    ATTR_UP_DOWN,
     DOMAIN,
     SERVICE_ABORT_QUEST,
     SERVICE_ACCEPT_QUEST,
     SERVICE_CANCEL_QUEST,
     SERVICE_CAST_SKILL,
+    SERVICE_CREATE_DAILY,
+    SERVICE_CREATE_HABIT,
+    SERVICE_CREATE_REWARD,
+    SERVICE_CREATE_TODO,
     SERVICE_GET_TASKS,
     SERVICE_LEAVE_QUEST,
     SERVICE_REJECT_QUEST,
@@ -33,8 +71,14 @@ from homeassistant.components.habitica.const import (
     SERVICE_SCORE_REWARD,
     SERVICE_START_QUEST,
     SERVICE_TRANSFORMATION,
+    SERVICE_UPDATE_DAILY,
+    SERVICE_UPDATE_HABIT,
+    SERVICE_UPDATE_REWARD,
+    SERVICE_UPDATE_TODO,
 )
+from homeassistant.components.todo import ATTR_RENAME
 from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import ATTR_DATE, ATTR_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 
@@ -45,7 +89,7 @@ from .conftest import (
     ERROR_TOO_MANY_REQUESTS,
 )
 
-from tests.common import MockConfigEntry
+from tests.common import MockConfigEntry, load_fixture
 
 REQUEST_EXCEPTION_MSG = "Unable to connect to Habitica: reason"
 RATE_LIMIT_EXCEPTION_MSG = "Rate limit exceeded, try again in 5 seconds"
@@ -889,3 +933,1260 @@ async def test_get_tasks(
     )
 
     assert response == snapshot
+
+
+@pytest.mark.parametrize(
+    ("exception", "expected_exception", "exception_msg"),
+    [
+        (
+            ERROR_TOO_MANY_REQUESTS,
+            HomeAssistantError,
+            RATE_LIMIT_EXCEPTION_MSG,
+        ),
+        (
+            ERROR_BAD_REQUEST,
+            HomeAssistantError,
+            REQUEST_EXCEPTION_MSG,
+        ),
+        (
+            ClientError,
+            HomeAssistantError,
+            "Unable to connect to Habitica: ",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    ("service", "task_id"),
+    [
+        (SERVICE_UPDATE_REWARD, "5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b"),
+        (SERVICE_UPDATE_HABIT, "f21fa608-cfc6-4413-9fc7-0eb1b48ca43a"),
+        (SERVICE_UPDATE_TODO, "88de7cd9-af2b-49ce-9afd-bf941d87336b"),
+        (SERVICE_UPDATE_DAILY, "6e53f1f5-a315-4edd-984d-8d762e4a08ef"),
+    ],
+)
+@pytest.mark.usefixtures("habitica")
+async def test_update_task_exceptions(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    habitica: AsyncMock,
+    exception: Exception,
+    expected_exception: Exception,
+    exception_msg: str,
+    service: str,
+    task_id: str,
+) -> None:
+    """Test Habitica task action exceptions."""
+
+    habitica.update_task.side_effect = exception
+    with pytest.raises(expected_exception, match=exception_msg):
+        await hass.services.async_call(
+            DOMAIN,
+            service,
+            service_data={
+                ATTR_CONFIG_ENTRY: config_entry.entry_id,
+                ATTR_TASK: task_id,
+            },
+            return_response=True,
+            blocking=True,
+        )
+
+
+@pytest.mark.parametrize(
+    ("exception", "expected_exception", "exception_msg"),
+    [
+        (
+            ERROR_TOO_MANY_REQUESTS,
+            HomeAssistantError,
+            RATE_LIMIT_EXCEPTION_MSG,
+        ),
+        (
+            ERROR_BAD_REQUEST,
+            HomeAssistantError,
+            REQUEST_EXCEPTION_MSG,
+        ),
+        (
+            ClientError,
+            HomeAssistantError,
+            "Unable to connect to Habitica: ",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    "service",
+    [
+        SERVICE_CREATE_DAILY,
+        SERVICE_CREATE_HABIT,
+        SERVICE_CREATE_REWARD,
+        SERVICE_CREATE_TODO,
+    ],
+)
+@pytest.mark.usefixtures("habitica")
+async def test_create_task_exceptions(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    habitica: AsyncMock,
+    exception: Exception,
+    expected_exception: Exception,
+    exception_msg: str,
+    service: str,
+) -> None:
+    """Test Habitica task create action exceptions."""
+
+    habitica.create_task.side_effect = exception
+    with pytest.raises(expected_exception, match=exception_msg):
+        await hass.services.async_call(
+            DOMAIN,
+            service,
+            service_data={
+                ATTR_CONFIG_ENTRY: config_entry.entry_id,
+                ATTR_NAME: "TITLE",
+            },
+            return_response=True,
+            blocking=True,
+        )
+
+
+@pytest.mark.usefixtures("habitica")
+async def test_task_not_found(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    habitica: AsyncMock,
+) -> None:
+    """Test Habitica task not found exceptions."""
+    task_id = "7f902bbc-eb3d-4a8f-82cf-4e2025d69af1"
+
+    with pytest.raises(
+        ServiceValidationError,
+        match="Unable to complete action, could not find the task '7f902bbc-eb3d-4a8f-82cf-4e2025d69af1'",
+    ):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_UPDATE_REWARD,
+            service_data={
+                ATTR_CONFIG_ENTRY: config_entry.entry_id,
+                ATTR_TASK: task_id,
+            },
+            return_response=True,
+            blocking=True,
+        )
+
+
+@pytest.mark.parametrize(
+    ("service_data", "call_args"),
+    [
+        (
+            {
+                ATTR_COST: 100,
+            },
+            Task(value=100),
+        ),
+        (
+            {
+                ATTR_RENAME: "RENAME",
+            },
+            Task(text="RENAME"),
+        ),
+        (
+            {
+                ATTR_NOTES: "NOTES",
+            },
+            Task(notes="NOTES"),
+        ),
+        (
+            {
+                ATTR_ALIAS: "ALIAS",
+            },
+            Task(alias="ALIAS"),
+        ),
+    ],
+)
+async def test_update_reward(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    habitica: AsyncMock,
+    service_data: dict[str, Any],
+    call_args: Task,
+) -> None:
+    """Test Habitica update_reward action."""
+    task_id = "5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b"
+
+    habitica.update_task.return_value = HabiticaTaskResponse.from_json(
+        load_fixture("task.json", DOMAIN)
+    )
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_UPDATE_REWARD,
+        service_data={
+            ATTR_CONFIG_ENTRY: config_entry.entry_id,
+            ATTR_TASK: task_id,
+            **service_data,
+        },
+        return_response=True,
+        blocking=True,
+    )
+    habitica.update_task.assert_awaited_with(UUID(task_id), call_args)
+
+
+@pytest.mark.parametrize(
+    ("service_data", "call_args"),
+    [
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_COST: 100,
+            },
+            Task(type=TaskType.REWARD, text="TITLE", value=100),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+            },
+            Task(type=TaskType.REWARD, text="TITLE"),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_NOTES: "NOTES",
+            },
+            Task(type=TaskType.REWARD, text="TITLE", notes="NOTES"),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_ALIAS: "ALIAS",
+            },
+            Task(type=TaskType.REWARD, text="TITLE", alias="ALIAS"),
+        ),
+    ],
+)
+async def test_create_reward(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    habitica: AsyncMock,
+    service_data: dict[str, Any],
+    call_args: Task,
+) -> None:
+    """Test Habitica create_reward action."""
+
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_CREATE_REWARD,
+        service_data={
+            ATTR_CONFIG_ENTRY: config_entry.entry_id,
+            **service_data,
+        },
+        return_response=True,
+        blocking=True,
+    )
+    habitica.create_task.assert_awaited_with(call_args)
+
+
+@pytest.mark.parametrize(
+    ("service_data", "call_args"),
+    [
+        (
+            {
+                ATTR_RENAME: "RENAME",
+            },
+            Task(text="RENAME"),
+        ),
+        (
+            {
+                ATTR_NOTES: "NOTES",
+            },
+            Task(notes="NOTES"),
+        ),
+        (
+            {
+                ATTR_UP_DOWN: [""],
+            },
+            Task(up=False, down=False),
+        ),
+        (
+            {
+                ATTR_UP_DOWN: ["up"],
+            },
+            Task(up=True, down=False),
+        ),
+        (
+            {
+                ATTR_UP_DOWN: ["down"],
+            },
+            Task(up=False, down=True),
+        ),
+        (
+            {
+                ATTR_PRIORITY: "trivial",
+            },
+            Task(priority=TaskPriority.TRIVIAL),
+        ),
+        (
+            {
+                ATTR_FREQUENCY: "daily",
+            },
+            Task(frequency=Frequency.DAILY),
+        ),
+        (
+            {
+                ATTR_COUNTER_UP: 1,
+                ATTR_COUNTER_DOWN: 2,
+            },
+            Task(counterUp=1, counterDown=2),
+        ),
+        (
+            {
+                ATTR_ALIAS: "ALIAS",
+            },
+            Task(alias="ALIAS"),
+        ),
+    ],
+)
+async def test_update_habit(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    habitica: AsyncMock,
+    service_data: dict[str, Any],
+    call_args: Task,
+) -> None:
+    """Test Habitica habit action."""
+    task_id = "f21fa608-cfc6-4413-9fc7-0eb1b48ca43a"
+
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_UPDATE_HABIT,
+        service_data={
+            ATTR_CONFIG_ENTRY: config_entry.entry_id,
+            ATTR_TASK: task_id,
+            **service_data,
+        },
+        return_response=True,
+        blocking=True,
+    )
+    habitica.update_task.assert_awaited_with(UUID(task_id), call_args)
+
+
+@pytest.mark.parametrize(
+    ("service_data", "call_args"),
+    [
+        (
+            {
+                ATTR_NAME: "TITLE",
+            },
+            Task(type=TaskType.HABIT, text="TITLE"),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_NOTES: "NOTES",
+            },
+            Task(type=TaskType.HABIT, text="TITLE", notes="NOTES"),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_UP_DOWN: [""],
+            },
+            Task(type=TaskType.HABIT, text="TITLE", up=False, down=False),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_UP_DOWN: ["up"],
+            },
+            Task(type=TaskType.HABIT, text="TITLE", up=True, down=False),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_UP_DOWN: ["down"],
+            },
+            Task(type=TaskType.HABIT, text="TITLE", up=False, down=True),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_PRIORITY: "trivial",
+            },
+            Task(type=TaskType.HABIT, text="TITLE", priority=TaskPriority.TRIVIAL),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_FREQUENCY: "daily",
+            },
+            Task(type=TaskType.HABIT, text="TITLE", frequency=Frequency.DAILY),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_ALIAS: "ALIAS",
+            },
+            Task(type=TaskType.HABIT, text="TITLE", alias="ALIAS"),
+        ),
+    ],
+)
+async def test_create_habit(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    habitica: AsyncMock,
+    service_data: dict[str, Any],
+    call_args: Task,
+) -> None:
+    """Test Habitica create_habit action."""
+
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_CREATE_HABIT,
+        service_data={
+            ATTR_CONFIG_ENTRY: config_entry.entry_id,
+            **service_data,
+        },
+        return_response=True,
+        blocking=True,
+    )
+    habitica.create_task.assert_awaited_with(call_args)
+
+
+@pytest.mark.parametrize(
+    ("service_data", "call_args"),
+    [
+        (
+            {
+                ATTR_RENAME: "RENAME",
+            },
+            Task(text="RENAME"),
+        ),
+        (
+            {
+                ATTR_NOTES: "NOTES",
+            },
+            Task(notes="NOTES"),
+        ),
+        (
+            {
+                ATTR_ADD_CHECKLIST_ITEM: "Checklist-item",
+            },
+            Task(
+                {
+                    "checklist": [
+                        Checklist(
+                            id=UUID("fccc26f2-1e2b-4bf8-9dd0-a405be261036"),
+                            text="Checklist-item1",
+                            completed=False,
+                        ),
+                        Checklist(
+                            id=UUID("5a897af4-ea94-456a-a2bd-f336bcd79509"),
+                            text="Checklist-item2",
+                            completed=True,
+                        ),
+                        Checklist(
+                            id=UUID("12345678-1234-5678-1234-567812345678"),
+                            text="Checklist-item",
+                            completed=False,
+                        ),
+                    ]
+                }
+            ),
+        ),
+        (
+            {
+                ATTR_REMOVE_CHECKLIST_ITEM: "Checklist-item1",
+            },
+            Task(
+                {
+                    "checklist": [
+                        Checklist(
+                            id=UUID("5a897af4-ea94-456a-a2bd-f336bcd79509"),
+                            text="Checklist-item2",
+                            completed=True,
+                        ),
+                    ]
+                }
+            ),
+        ),
+        (
+            {
+                ATTR_SCORE_CHECKLIST_ITEM: "Checklist-item1",
+            },
+            Task(
+                {
+                    "checklist": [
+                        Checklist(
+                            id=UUID("fccc26f2-1e2b-4bf8-9dd0-a405be261036"),
+                            text="Checklist-item1",
+                            completed=True,
+                        ),
+                        Checklist(
+                            id=UUID("5a897af4-ea94-456a-a2bd-f336bcd79509"),
+                            text="Checklist-item2",
+                            completed=True,
+                        ),
+                    ]
+                }
+            ),
+        ),
+        (
+            {
+                ATTR_UNSCORE_CHECKLIST_ITEM: "Checklist-item2",
+            },
+            Task(
+                {
+                    "checklist": [
+                        Checklist(
+                            id=UUID("fccc26f2-1e2b-4bf8-9dd0-a405be261036"),
+                            text="Checklist-item1",
+                            completed=False,
+                        ),
+                        Checklist(
+                            id=UUID("5a897af4-ea94-456a-a2bd-f336bcd79509"),
+                            text="Checklist-item2",
+                            completed=False,
+                        ),
+                    ]
+                }
+            ),
+        ),
+        (
+            {
+                ATTR_PRIORITY: "trivial",
+            },
+            Task(priority=TaskPriority.TRIVIAL),
+        ),
+        (
+            {
+                ATTR_DATE: "2025-03-05",
+            },
+            Task(date=datetime(2025, 3, 5)),
+        ),
+        (
+            {
+                ATTR_CLEAR_DATE: True,
+            },
+            Task(date=None),
+        ),
+        (
+            {
+                ATTR_REMINDER: ["2025-02-25T00:00"],
+            },
+            Task(
+                {
+                    "reminders": [
+                        Reminders(
+                            id=UUID("12345678-1234-5678-1234-567812345678"),
+                            time=datetime(2025, 2, 25, 0, 0),
+                            startDate=None,
+                        )
+                    ]
+                }
+            ),
+        ),
+        (
+            {
+                ATTR_REMOVE_REMINDER: ["2025-02-25T00:00"],
+            },
+            Task({"reminders": []}),
+        ),
+        (
+            {
+                ATTR_CLEAR_REMINDER: True,
+            },
+            Task({"reminders": []}),
+        ),
+        (
+            {
+                ATTR_ALIAS: "ALIAS",
+            },
+            Task(alias="ALIAS"),
+        ),
+    ],
+)
+@pytest.mark.usefixtures("mock_uuid4")
+async def test_update_todo(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    habitica: AsyncMock,
+    service_data: dict[str, Any],
+    call_args: Task,
+) -> None:
+    """Test Habitica update todo action."""
+    task_id = "88de7cd9-af2b-49ce-9afd-bf941d87336b"
+
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_UPDATE_TODO,
+        service_data={
+            ATTR_CONFIG_ENTRY: config_entry.entry_id,
+            ATTR_TASK: task_id,
+            **service_data,
+        },
+        return_response=True,
+        blocking=True,
+    )
+    habitica.update_task.assert_awaited_with(UUID(task_id), call_args)
+
+
+@pytest.mark.parametrize(
+    ("service_data", "call_args"),
+    [
+        (
+            {
+                ATTR_NAME: "TITLE",
+            },
+            Task(type=TaskType.TODO, text="TITLE"),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_NOTES: "NOTES",
+            },
+            Task(type=TaskType.TODO, text="TITLE", notes="NOTES"),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_ADD_CHECKLIST_ITEM: "Checklist-item",
+            },
+            Task(
+                type=TaskType.TODO,
+                text="TITLE",
+                checklist=[
+                    Checklist(
+                        id=UUID("12345678-1234-5678-1234-567812345678"),
+                        text="Checklist-item",
+                        completed=False,
+                    ),
+                ],
+            ),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_PRIORITY: "trivial",
+            },
+            Task(type=TaskType.TODO, text="TITLE", priority=TaskPriority.TRIVIAL),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_DATE: "2025-03-05",
+            },
+            Task(type=TaskType.TODO, text="TITLE", date=datetime(2025, 3, 5)),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_REMINDER: ["2025-02-25T00:00"],
+            },
+            Task(
+                type=TaskType.TODO,
+                text="TITLE",
+                reminders=[
+                    Reminders(
+                        id=UUID("12345678-1234-5678-1234-567812345678"),
+                        time=datetime(2025, 2, 25, 0, 0),
+                        startDate=None,
+                    )
+                ],
+            ),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_ALIAS: "ALIAS",
+            },
+            Task(type=TaskType.TODO, text="TITLE", alias="ALIAS"),
+        ),
+    ],
+)
+@pytest.mark.usefixtures("mock_uuid4")
+async def test_create_todo(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    habitica: AsyncMock,
+    service_data: dict[str, Any],
+    call_args: Task,
+) -> None:
+    """Test Habitica create todo action."""
+
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_CREATE_TODO,
+        service_data={
+            ATTR_CONFIG_ENTRY: config_entry.entry_id,
+            **service_data,
+        },
+        return_response=True,
+        blocking=True,
+    )
+    habitica.create_task.assert_awaited_with(call_args)
+
+
+@pytest.mark.parametrize(
+    ("service_data", "call_args"),
+    [
+        (
+            {
+                ATTR_RENAME: "RENAME",
+            },
+            Task(text="RENAME"),
+        ),
+        (
+            {
+                ATTR_NOTES: "NOTES",
+            },
+            Task(notes="NOTES"),
+        ),
+        (
+            {
+                ATTR_ADD_CHECKLIST_ITEM: "Checklist-item",
+            },
+            Task(
+                {
+                    "checklist": [
+                        Checklist(
+                            id=UUID("a2a6702d-58e1-46c2-a3ce-422d525cc0b6"),
+                            text="Checklist-item1",
+                            completed=False,
+                        ),
+                        Checklist(
+                            id=UUID("9f64e1cd-b0ab-4577-8344-c7a5e1827997"),
+                            text="Checklist-item2",
+                            completed=True,
+                        ),
+                        Checklist(
+                            id=UUID("12345678-1234-5678-1234-567812345678"),
+                            text="Checklist-item",
+                            completed=False,
+                        ),
+                    ]
+                }
+            ),
+        ),
+        (
+            {
+                ATTR_REMOVE_CHECKLIST_ITEM: "Checklist-item1",
+            },
+            Task(
+                {
+                    "checklist": [
+                        Checklist(
+                            id=UUID("9f64e1cd-b0ab-4577-8344-c7a5e1827997"),
+                            text="Checklist-item2",
+                            completed=True,
+                        ),
+                    ]
+                }
+            ),
+        ),
+        (
+            {
+                ATTR_SCORE_CHECKLIST_ITEM: "Checklist-item1",
+            },
+            Task(
+                {
+                    "checklist": [
+                        Checklist(
+                            id=UUID("a2a6702d-58e1-46c2-a3ce-422d525cc0b6"),
+                            text="Checklist-item1",
+                            completed=True,
+                        ),
+                        Checklist(
+                            id=UUID("9f64e1cd-b0ab-4577-8344-c7a5e1827997"),
+                            text="Checklist-item2",
+                            completed=True,
+                        ),
+                    ]
+                }
+            ),
+        ),
+        (
+            {
+                ATTR_UNSCORE_CHECKLIST_ITEM: "Checklist-item2",
+            },
+            Task(
+                {
+                    "checklist": [
+                        Checklist(
+                            id=UUID("a2a6702d-58e1-46c2-a3ce-422d525cc0b6"),
+                            text="Checklist-item1",
+                            completed=False,
+                        ),
+                        Checklist(
+                            id=UUID("9f64e1cd-b0ab-4577-8344-c7a5e1827997"),
+                            text="Checklist-item2",
+                            completed=False,
+                        ),
+                    ]
+                }
+            ),
+        ),
+        (
+            {
+                ATTR_PRIORITY: "trivial",
+            },
+            Task(priority=TaskPriority.TRIVIAL),
+        ),
+        (
+            {
+                ATTR_START_DATE: "2025-03-05",
+            },
+            Task(startDate=datetime(2025, 3, 5)),
+        ),
+        (
+            {
+                ATTR_FREQUENCY: "weekly",
+            },
+            Task(frequency=Frequency.WEEKLY),
+        ),
+        (
+            {
+                ATTR_INTERVAL: 5,
+            },
+            Task(everyX=5),
+        ),
+        (
+            {
+                ATTR_FREQUENCY: "weekly",
+                ATTR_REPEAT: ["m", "t", "w", "th"],
+            },
+            Task(
+                frequency=Frequency.WEEKLY,
+                repeat=Repeat(m=True, t=True, w=True, th=True),
+            ),
+        ),
+        (
+            {
+                ATTR_FREQUENCY: "monthly",
+                ATTR_REPEAT_MONTHLY: "day_of_month",
+            },
+            Task(frequency=Frequency.MONTHLY, daysOfMonth=[20], weeksOfMonth=[]),
+        ),
+        (
+            {
+                ATTR_FREQUENCY: "monthly",
+                ATTR_REPEAT_MONTHLY: "day_of_week",
+            },
+            Task(
+                frequency=Frequency.MONTHLY,
+                daysOfMonth=[],
+                weeksOfMonth=[2],
+                repeat=Repeat(
+                    m=False, t=False, w=False, th=False, f=True, s=False, su=False
+                ),
+            ),
+        ),
+        (
+            {
+                ATTR_REMINDER: ["10:00"],
+            },
+            Task(
+                {
+                    "reminders": [
+                        Reminders(
+                            id=UUID("12345678-1234-5678-1234-567812345678"),
+                            time=datetime(2025, 2, 25, 10, 0, tzinfo=UTC),
+                            startDate=None,
+                        )
+                    ]
+                }
+            ),
+        ),
+        (
+            {
+                ATTR_REMOVE_REMINDER: ["10:00"],
+            },
+            Task({"reminders": []}),
+        ),
+        (
+            {
+                ATTR_CLEAR_REMINDER: True,
+            },
+            Task({"reminders": []}),
+        ),
+        (
+            {
+                ATTR_STREAK: 10,
+            },
+            Task(streak=10),
+        ),
+        (
+            {
+                ATTR_ALIAS: "ALIAS",
+            },
+            Task(alias="ALIAS"),
+        ),
+    ],
+)
+@pytest.mark.usefixtures("mock_uuid4")
+@freeze_time("2025-02-25T22:00:00.000Z")
+async def test_update_daily(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    habitica: AsyncMock,
+    service_data: dict[str, Any],
+    call_args: Task,
+) -> None:
+    """Test Habitica update daily action."""
+    task_id = "6e53f1f5-a315-4edd-984d-8d762e4a08ef"
+
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_UPDATE_DAILY,
+        service_data={
+            ATTR_CONFIG_ENTRY: config_entry.entry_id,
+            ATTR_TASK: task_id,
+            **service_data,
+        },
+        return_response=True,
+        blocking=True,
+    )
+    habitica.update_task.assert_awaited_with(UUID(task_id), call_args)
+
+
+@pytest.mark.parametrize(
+    ("service_data", "call_args"),
+    [
+        (
+            {
+                ATTR_NAME: "TITLE",
+            },
+            Task(type=TaskType.DAILY, text="TITLE"),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_NOTES: "NOTES",
+            },
+            Task(type=TaskType.DAILY, text="TITLE", notes="NOTES"),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_ADD_CHECKLIST_ITEM: "Checklist-item",
+            },
+            Task(
+                type=TaskType.DAILY,
+                text="TITLE",
+                checklist=[
+                    Checklist(
+                        id=UUID("12345678-1234-5678-1234-567812345678"),
+                        text="Checklist-item",
+                        completed=False,
+                    ),
+                ],
+            ),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_PRIORITY: "trivial",
+            },
+            Task(type=TaskType.DAILY, text="TITLE", priority=TaskPriority.TRIVIAL),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_START_DATE: "2025-03-05",
+            },
+            Task(type=TaskType.DAILY, text="TITLE", startDate=datetime(2025, 3, 5)),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_FREQUENCY: "weekly",
+            },
+            Task(type=TaskType.DAILY, text="TITLE", frequency=Frequency.WEEKLY),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_INTERVAL: 5,
+            },
+            Task(type=TaskType.DAILY, text="TITLE", everyX=5),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_FREQUENCY: "weekly",
+                ATTR_REPEAT: ["m", "t", "w", "th"],
+            },
+            Task(
+                type=TaskType.DAILY,
+                text="TITLE",
+                frequency=Frequency.WEEKLY,
+                repeat=Repeat(m=True, t=True, w=True, th=True),
+            ),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_FREQUENCY: "monthly",
+                ATTR_REPEAT_MONTHLY: "day_of_month",
+            },
+            Task(
+                type=TaskType.DAILY,
+                text="TITLE",
+                frequency=Frequency.MONTHLY,
+                daysOfMonth=[25],
+                weeksOfMonth=[],
+            ),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_FREQUENCY: "monthly",
+                ATTR_REPEAT_MONTHLY: "day_of_week",
+            },
+            Task(
+                type=TaskType.DAILY,
+                text="TITLE",
+                frequency=Frequency.MONTHLY,
+                daysOfMonth=[],
+                weeksOfMonth=[3],
+                repeat=Repeat(
+                    m=False, t=True, w=False, th=False, f=False, s=False, su=False
+                ),
+            ),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_REMINDER: ["10:00"],
+            },
+            Task(
+                type=TaskType.DAILY,
+                text="TITLE",
+                reminders=[
+                    Reminders(
+                        id=UUID("12345678-1234-5678-1234-567812345678"),
+                        time=datetime(2025, 2, 25, 10, 0, tzinfo=UTC),
+                        startDate=None,
+                    )
+                ],
+            ),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_REMOVE_REMINDER: ["10:00"],
+            },
+            Task(type=TaskType.DAILY, text="TITLE", reminders=[]),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_CLEAR_REMINDER: True,
+            },
+            Task(type=TaskType.DAILY, text="TITLE", reminders=[]),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_STREAK: 10,
+            },
+            Task(type=TaskType.DAILY, text="TITLE", streak=10),
+        ),
+        (
+            {
+                ATTR_NAME: "TITLE",
+                ATTR_ALIAS: "ALIAS",
+            },
+            Task(type=TaskType.DAILY, text="TITLE", alias="ALIAS"),
+        ),
+    ],
+)
+@pytest.mark.usefixtures("mock_uuid4")
+@freeze_time("2025-02-25T22:00:00.000Z")
+async def test_create_daily(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    habitica: AsyncMock,
+    service_data: dict[str, Any],
+    call_args: Task,
+) -> None:
+    """Test Habitica create daily action."""
+
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_CREATE_DAILY,
+        service_data={
+            ATTR_CONFIG_ENTRY: config_entry.entry_id,
+            **service_data,
+        },
+        return_response=True,
+        blocking=True,
+    )
+    habitica.create_task.assert_awaited_with(call_args)
+
+
+@pytest.mark.parametrize(
+    "service_data",
+    [
+        {
+            ATTR_FREQUENCY: "daily",
+            ATTR_REPEAT: ["m", "t", "w", "th"],
+        },
+        {
+            ATTR_FREQUENCY: "weekly",
+            ATTR_REPEAT_MONTHLY: "day_of_month",
+        },
+        {
+            ATTR_FREQUENCY: "weekly",
+            ATTR_REPEAT_MONTHLY: "day_of_week",
+        },
+    ],
+)
+@pytest.mark.usefixtures("mock_uuid4")
+@freeze_time("2025-02-25T22:00:00.000Z")
+async def test_update_daily_service_validation_errors(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    habitica: AsyncMock,
+    service_data: dict[str, Any],
+) -> None:
+    """Test Habitica update daily action."""
+    task_id = "6e53f1f5-a315-4edd-984d-8d762e4a08ef"
+
+    with pytest.raises(ServiceValidationError):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_UPDATE_DAILY,
+            service_data={
+                ATTR_CONFIG_ENTRY: config_entry.entry_id,
+                ATTR_TASK: task_id,
+                **service_data,
+            },
+            return_response=True,
+            blocking=True,
+        )
+
+
+async def test_tags(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    habitica: AsyncMock,
+) -> None:
+    """Test adding tags to a task."""
+    task_id = "5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b"
+
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_UPDATE_REWARD,
+        service_data={
+            ATTR_CONFIG_ENTRY: config_entry.entry_id,
+            ATTR_TASK: task_id,
+            ATTR_TAG: ["Schule"],
+        },
+        return_response=True,
+        blocking=True,
+    )
+
+    call_args = habitica.update_task.call_args[0]
+    assert call_args[0] == UUID(task_id)
+    assert set(call_args[1]["tags"]) == {
+        UUID("2ac458af-0833-4f3f-bf04-98a0c33ef60b"),
+        UUID("3450351f-1323-4c7e-9fd2-0cdff25b3ce0"),
+        UUID("b2780f82-b3b5-49a3-a677-48f2c8c7e3bb"),
+    }
+
+
+async def test_create_new_tag(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    habitica: AsyncMock,
+) -> None:
+    """Test adding a non-existent tag and create it as new."""
+    task_id = "5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b"
+
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_UPDATE_REWARD,
+        service_data={
+            ATTR_CONFIG_ENTRY: config_entry.entry_id,
+            ATTR_TASK: task_id,
+            ATTR_TAG: ["Home Assistant"],
+        },
+        return_response=True,
+        blocking=True,
+    )
+
+    habitica.create_tag.assert_awaited_with("Home Assistant")
+
+    call_args = habitica.update_task.call_args[0]
+    assert call_args[0] == UUID(task_id)
+    assert set(call_args[1]["tags"]) == {
+        UUID("8bc0afbf-ab8e-49a4-982d-67a40557ed1a"),
+        UUID("3450351f-1323-4c7e-9fd2-0cdff25b3ce0"),
+        UUID("b2780f82-b3b5-49a3-a677-48f2c8c7e3bb"),
+    }
+
+
+@pytest.mark.parametrize(
+    ("exception", "expected_exception", "exception_msg"),
+    [
+        (
+            ERROR_TOO_MANY_REQUESTS,
+            HomeAssistantError,
+            RATE_LIMIT_EXCEPTION_MSG,
+        ),
+        (
+            ERROR_BAD_REQUEST,
+            HomeAssistantError,
+            REQUEST_EXCEPTION_MSG,
+        ),
+        (
+            ClientError,
+            HomeAssistantError,
+            "Unable to connect to Habitica: ",
+        ),
+    ],
+)
+async def test_create_new_tag_exception(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    habitica: AsyncMock,
+    exception: Exception,
+    expected_exception: Exception,
+    exception_msg: str,
+) -> None:
+    """Test create new tag exception."""
+    task_id = "5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b"
+
+    habitica.create_tag.side_effect = exception
+    with pytest.raises(expected_exception, match=exception_msg):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_UPDATE_REWARD,
+            service_data={
+                ATTR_CONFIG_ENTRY: config_entry.entry_id,
+                ATTR_TASK: task_id,
+                ATTR_TAG: ["Home Assistant"],
+            },
+            return_response=True,
+            blocking=True,
+        )
+
+
+async def test_remove_tags(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    habitica: AsyncMock,
+) -> None:
+    """Test removing tags from a task."""
+    task_id = "5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b"
+
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_UPDATE_REWARD,
+        service_data={
+            ATTR_CONFIG_ENTRY: config_entry.entry_id,
+            ATTR_TASK: task_id,
+            ATTR_REMOVE_TAG: ["Kreativität"],
+        },
+        return_response=True,
+        blocking=True,
+    )
+
+    call_args = habitica.update_task.call_args[0]
+    assert call_args[0] == UUID(task_id)
+    assert set(call_args[1]["tags"]) == {UUID("b2780f82-b3b5-49a3-a677-48f2c8c7e3bb")}
diff --git a/tests/components/habitica/test_todo.py b/tests/components/habitica/test_todo.py
index 8f20b3e685a..3457af78403 100644
--- a/tests/components/habitica/test_todo.py
+++ b/tests/components/habitica/test_todo.py
@@ -6,7 +6,13 @@ from typing import Any
 from unittest.mock import AsyncMock, patch
 from uuid import UUID
 
-from habiticalib import Direction, HabiticaTasksResponse, Task, TaskType
+from habiticalib import (
+    Direction,
+    HabiticaTaskOrderResponse,
+    HabiticaTasksResponse,
+    Task,
+    TaskType,
+)
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
@@ -601,17 +607,23 @@ async def test_delete_completed_todo_items_exception(
 
 
 @pytest.mark.parametrize(
-    ("entity_id", "uid", "previous_uid"),
+    ("entity_id", "uid", "second_pos", "third_pos", "fixture", "task_type"),
     [
         (
             "todo.test_user_to_do_s",
             "1aa3137e-ef72-4d1f-91ee-41933602f438",
             "88de7cd9-af2b-49ce-9afd-bf941d87336b",
+            "2f6fcabc-f670-4ec3-ba65-817e8deea490",
+            "reorder_todos_response.json",
+            "todos",
         ),
         (
             "todo.test_user_dailies",
             "2c6d136c-a1c3-4bef-b7c4-fa980784b1e1",
-            "564b9ac9-c53d-4638-9e7f-1cd96fe19baa",
+            "f21fa608-cfc6-4413-9fc7-0eb1b48ca43a",
+            "bc1d1855-b2b8-4663-98ff-62e7b763dfc4",
+            "reorder_dailies_response.json",
+            "dailys",
         ),
     ],
     ids=["todo", "daily"],
@@ -623,10 +635,16 @@ async def test_move_todo_item(
     hass_ws_client: WebSocketGenerator,
     entity_id: str,
     uid: str,
-    previous_uid: str,
+    second_pos: str,
+    third_pos: str,
+    fixture: str,
+    task_type: str,
 ) -> None:
     """Test move todo items."""
-
+    reorder_response = HabiticaTaskOrderResponse.from_json(
+        load_fixture(fixture, DOMAIN)
+    )
+    habitica.reorder_task.return_value = reorder_response
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
@@ -634,19 +652,36 @@ async def test_move_todo_item(
     assert config_entry.state is ConfigEntryState.LOADED
 
     client = await hass_ws_client()
-    # move to second position
+    # move up to second position
     data = {
         "id": id,
         "type": "todo/item/move",
         "entity_id": entity_id,
         "uid": uid,
-        "previous_uid": previous_uid,
+        "previous_uid": second_pos,
     }
     await client.send_json_auto_id(data)
     resp = await client.receive_json()
     assert resp.get("success")
 
     habitica.reorder_task.assert_awaited_once_with(UUID(uid), 1)
+
+    habitica.reorder_task.reset_mock()
+
+    # move down to third position
+    data = {
+        "id": id,
+        "type": "todo/item/move",
+        "entity_id": entity_id,
+        "uid": uid,
+        "previous_uid": third_pos,
+    }
+    await client.send_json_auto_id(data)
+    resp = await client.receive_json()
+    assert resp.get("success")
+
+    habitica.reorder_task.assert_awaited_once_with(UUID(uid), 2)
+
     habitica.reorder_task.reset_mock()
 
     # move to top position
@@ -661,6 +696,10 @@ async def test_move_todo_item(
     assert resp.get("success")
 
     habitica.reorder_task.assert_awaited_once_with(UUID(uid), 0)
+    assert (
+        getattr(config_entry.runtime_data.data.user.tasksOrder, task_type)
+        == reorder_response.data
+    )
 
 
 @pytest.mark.parametrize(
diff --git a/tests/components/hardware/test_websocket_api.py b/tests/components/hardware/test_websocket_api.py
index 1379bdba120..64fcda02df4 100644
--- a/tests/components/hardware/test_websocket_api.py
+++ b/tests/components/hardware/test_websocket_api.py
@@ -10,7 +10,7 @@ import psutil_home_assistant as ha_psutil
 from homeassistant.components.hardware.const import DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.typing import WebSocketGenerator
 
diff --git a/tests/components/harmony/test_subscriber.py b/tests/components/harmony/test_subscriber.py
index f1d1866a044..22957fc3f69 100644
--- a/tests/components/harmony/test_subscriber.py
+++ b/tests/components/harmony/test_subscriber.py
@@ -38,7 +38,7 @@ async def test_empty_callbacks(hass: HomeAssistant) -> None:
     """Ensure we handle a missing callback in a subscription."""
     subscriber = HarmonySubscriberMixin(hass)
 
-    callbacks = {k: None for k in _ALL_CALLBACK_NAMES}
+    callbacks = dict.fromkeys(_ALL_CALLBACK_NAMES)
     subscriber.async_subscribe(HarmonyCallback(**callbacks))
     _call_all_callbacks(subscriber)
     await hass.async_block_till_done()
diff --git a/tests/components/hassio/conftest.py b/tests/components/hassio/conftest.py
index 7075b9d6982..c9fbf1a7c56 100644
--- a/tests/components/hassio/conftest.py
+++ b/tests/components/hassio/conftest.py
@@ -11,7 +11,7 @@ import pytest
 
 from homeassistant.auth.models import RefreshToken
 from homeassistant.components.hassio.handler import HassIO, HassioAPIError
-from homeassistant.core import CoreState, HomeAssistant
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.setup import async_setup_component
 
@@ -75,7 +75,6 @@ def hassio_stubs(
             "homeassistant.components.hassio.issues.SupervisorIssues.setup",
         ),
     ):
-        hass.set_state(CoreState.starting)
         hass.loop.run_until_complete(async_setup_component(hass, "hassio", {}))
 
     return hass_api.call_args[0][1]
diff --git a/tests/components/hassio/snapshots/test_backup.ambr b/tests/components/hassio/snapshots/test_backup.ambr
new file mode 100644
index 00000000000..725239ee126
--- /dev/null
+++ b/tests/components/hassio/snapshots/test_backup.ambr
@@ -0,0 +1,133 @@
+# serializer version: 1
+# name: test_config_load_config_info[storage_data0]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': False,
+        'create_backup': dict({
+          'agent_ids': list([
+          ]),
+          'include_addons': None,
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': None,
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_load_config_info[storage_data1]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': True,
+        'create_backup': dict({
+          'agent_ids': list([
+            'test-agent1',
+            'hassio.local',
+            'test-agent2',
+          ]),
+          'include_addons': list([
+            'addon1',
+            'addon2',
+          ]),
+          'include_all_addons': True,
+          'include_database': True,
+          'include_folders': list([
+            'media',
+            'share',
+          ]),
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
+# name: test_config_load_config_info[storage_data2]
+  dict({
+    'id': 1,
+    'result': dict({
+      'config': dict({
+        'agents': dict({
+        }),
+        'automatic_backups_configured': True,
+        'create_backup': dict({
+          'agent_ids': list([
+            'test-agent1',
+            'hassio.local',
+            'test-agent2',
+          ]),
+          'include_addons': list([
+            'addon1',
+            'addon2',
+          ]),
+          'include_all_addons': False,
+          'include_database': True,
+          'include_folders': list([
+            'media',
+            'share',
+          ]),
+          'name': None,
+          'password': None,
+        }),
+        'last_attempted_automatic_backup': None,
+        'last_completed_automatic_backup': None,
+        'next_automatic_backup': None,
+        'next_automatic_backup_additional': False,
+        'retention': dict({
+          'copies': None,
+          'days': None,
+        }),
+        'schedule': dict({
+          'days': list([
+          ]),
+          'recurrence': 'never',
+          'time': None,
+        }),
+      }),
+    }),
+    'success': True,
+    'type': 'result',
+  })
+# ---
diff --git a/tests/components/hassio/test_backup.py b/tests/components/hassio/test_backup.py
index 40ab253b7e6..af951fe8aa1 100644
--- a/tests/components/hassio/test_backup.py
+++ b/tests/components/hassio/test_backup.py
@@ -3,16 +3,20 @@
 from collections.abc import (
     AsyncGenerator,
     AsyncIterator,
+    Buffer,
     Callable,
     Coroutine,
     Generator,
+    Iterable,
 )
 from dataclasses import replace
 from datetime import datetime
 from io import StringIO
 import os
-from typing import Any
+from pathlib import PurePath
+from typing import Any, cast
 from unittest.mock import ANY, AsyncMock, Mock, patch
+from uuid import UUID
 
 from aiohasupervisor.exceptions import (
     SupervisorBadRequestError,
@@ -21,10 +25,14 @@ from aiohasupervisor.exceptions import (
 )
 from aiohasupervisor.models import (
     backups as supervisor_backups,
+    jobs as supervisor_jobs,
     mounts as supervisor_mounts,
 )
+from aiohasupervisor.models.backups import LOCATION_CLOUD_BACKUP, LOCATION_LOCAL_STORAGE
 from aiohasupervisor.models.mounts import MountsInfo
+from freezegun.api import FrozenDateTimeFactory
 import pytest
+from syrupy import SnapshotAssertion
 
 from homeassistant.components.backup import (
     DOMAIN as BACKUP_DOMAIN,
@@ -32,10 +40,14 @@ from homeassistant.components.backup import (
     AgentBackup,
     BackupAgent,
     BackupAgentPlatformProtocol,
+    BackupNotFound,
     Folder,
+    store as backup_store,
 )
-from homeassistant.components.hassio.backup import LOCATION_CLOUD_BACKUP
+from homeassistant.components.hassio import DOMAIN
+from homeassistant.components.hassio.backup import RESTORE_JOB_ID_ENV
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.backup import async_initialize_backup
 from homeassistant.setup import async_setup_component
 
 from .test_init import MOCK_ENVIRON
@@ -51,12 +63,12 @@ TEST_BACKUP = supervisor_backups.Backup(
         homeassistant=True,
     ),
     date=datetime.fromisoformat("1970-01-01T00:00:00Z"),
-    location=None,
-    locations={None},
+    location_attributes={
+        LOCATION_LOCAL_STORAGE: supervisor_backups.BackupLocationAttributes(
+            protected=False, size_bytes=1048576
+        )
+    },
     name="Test",
-    protected=False,
-    size=1.0,
-    size_bytes=1048576,
     slug="abc123",
     type=supervisor_backups.BackupType.PARTIAL,
 )
@@ -75,13 +87,9 @@ TEST_BACKUP_DETAILS = supervisor_backups.BackupComplete(
     folders=[supervisor_backups.Folder.SHARE],
     homeassistant_exclude_database=False,
     homeassistant="2024.12.0",
-    location=TEST_BACKUP.location,
-    locations=TEST_BACKUP.locations,
+    location_attributes=TEST_BACKUP.location_attributes,
     name=TEST_BACKUP.name,
-    protected=TEST_BACKUP.protected,
     repositories=[],
-    size=TEST_BACKUP.size,
-    size_bytes=TEST_BACKUP.size_bytes,
     slug=TEST_BACKUP.slug,
     supervisor_version="2024.11.2",
     type=TEST_BACKUP.type,
@@ -91,16 +99,16 @@ TEST_BACKUP_2 = supervisor_backups.Backup(
     compressed=False,
     content=supervisor_backups.BackupContent(
         addons=["ssl"],
-        folders=["share"],
+        folders=[supervisor_backups.Folder.SHARE],
         homeassistant=False,
     ),
     date=datetime.fromisoformat("1970-01-01T00:00:00Z"),
-    location=None,
-    locations={None},
+    location_attributes={
+        LOCATION_LOCAL_STORAGE: supervisor_backups.BackupLocationAttributes(
+            protected=False, size_bytes=1048576
+        )
+    },
     name="Test",
-    protected=False,
-    size=1.0,
-    size_bytes=1048576,
     slug="abc123",
     type=supervisor_backups.BackupType.PARTIAL,
 )
@@ -116,16 +124,12 @@ TEST_BACKUP_DETAILS_2 = supervisor_backups.BackupComplete(
     compressed=TEST_BACKUP_2.compressed,
     date=TEST_BACKUP_2.date,
     extra=None,
-    folders=["share"],
+    folders=[supervisor_backups.Folder.SHARE],
     homeassistant_exclude_database=False,
     homeassistant=None,
-    location=TEST_BACKUP_2.location,
-    locations=TEST_BACKUP_2.locations,
+    location_attributes=TEST_BACKUP_2.location_attributes,
     name=TEST_BACKUP_2.name,
-    protected=TEST_BACKUP_2.protected,
     repositories=[],
-    size=TEST_BACKUP_2.size,
-    size_bytes=TEST_BACKUP_2.size_bytes,
     slug=TEST_BACKUP_2.slug,
     supervisor_version="2024.11.2",
     type=TEST_BACKUP_2.type,
@@ -135,16 +139,16 @@ TEST_BACKUP_3 = supervisor_backups.Backup(
     compressed=False,
     content=supervisor_backups.BackupContent(
         addons=["ssl"],
-        folders=["share"],
+        folders=[supervisor_backups.Folder.SHARE],
         homeassistant=True,
     ),
     date=datetime.fromisoformat("1970-01-01T00:00:00Z"),
-    location="share",
-    locations={"share"},
+    location_attributes={
+        LOCATION_LOCAL_STORAGE: supervisor_backups.BackupLocationAttributes(
+            protected=False, size_bytes=1048576
+        )
+    },
     name="Test",
-    protected=False,
-    size=1.0,
-    size_bytes=1048576,
     slug="abc123",
     type=supervisor_backups.BackupType.PARTIAL,
 )
@@ -160,16 +164,12 @@ TEST_BACKUP_DETAILS_3 = supervisor_backups.BackupComplete(
     compressed=TEST_BACKUP_3.compressed,
     date=TEST_BACKUP_3.date,
     extra=None,
-    folders=["share"],
+    folders=[supervisor_backups.Folder.SHARE],
     homeassistant_exclude_database=False,
     homeassistant=None,
-    location=TEST_BACKUP_3.location,
-    locations=TEST_BACKUP_3.locations,
+    location_attributes=TEST_BACKUP_3.location_attributes,
     name=TEST_BACKUP_3.name,
-    protected=TEST_BACKUP_3.protected,
     repositories=[],
-    size=TEST_BACKUP_3.size,
-    size_bytes=TEST_BACKUP_3.size_bytes,
     slug=TEST_BACKUP_3.slug,
     supervisor_version="2024.11.2",
     type=TEST_BACKUP_3.type,
@@ -180,16 +180,16 @@ TEST_BACKUP_4 = supervisor_backups.Backup(
     compressed=False,
     content=supervisor_backups.BackupContent(
         addons=["ssl"],
-        folders=["share"],
+        folders=[supervisor_backups.Folder.SHARE],
         homeassistant=True,
     ),
     date=datetime.fromisoformat("1970-01-01T00:00:00Z"),
-    location=None,
-    locations={None},
+    location_attributes={
+        LOCATION_LOCAL_STORAGE: supervisor_backups.BackupLocationAttributes(
+            protected=False, size_bytes=1048576
+        )
+    },
     name="Test",
-    protected=False,
-    size=1.0,
-    size_bytes=1048576,
     slug="abc123",
     type=supervisor_backups.BackupType.PARTIAL,
 )
@@ -202,22 +202,101 @@ TEST_BACKUP_DETAILS_4 = supervisor_backups.BackupComplete(
             version="9.14.0",
         )
     ],
-    compressed=TEST_BACKUP.compressed,
-    date=TEST_BACKUP.date,
+    compressed=TEST_BACKUP_4.compressed,
+    date=TEST_BACKUP_4.date,
     extra=None,
-    folders=["share"],
+    folders=[supervisor_backups.Folder.SHARE],
     homeassistant_exclude_database=True,
     homeassistant="2024.12.0",
-    location=TEST_BACKUP.location,
-    locations=TEST_BACKUP.locations,
-    name=TEST_BACKUP.name,
-    protected=TEST_BACKUP.protected,
+    location_attributes=TEST_BACKUP_4.location_attributes,
+    name=TEST_BACKUP_4.name,
     repositories=[],
-    size=TEST_BACKUP.size,
-    size_bytes=TEST_BACKUP.size_bytes,
-    slug=TEST_BACKUP.slug,
+    slug=TEST_BACKUP_4.slug,
     supervisor_version="2024.11.2",
-    type=TEST_BACKUP.type,
+    type=TEST_BACKUP_4.type,
+)
+
+TEST_BACKUP_5 = supervisor_backups.Backup(
+    compressed=False,
+    content=supervisor_backups.BackupContent(
+        addons=["ssl"],
+        folders=[supervisor_backups.Folder.SHARE],
+        homeassistant=True,
+    ),
+    date=datetime.fromisoformat("1970-01-01T00:00:00Z"),
+    location_attributes={
+        LOCATION_CLOUD_BACKUP: supervisor_backups.BackupLocationAttributes(
+            protected=False, size_bytes=1048576
+        )
+    },
+    name="Test",
+    slug="abc123",
+    type=supervisor_backups.BackupType.PARTIAL,
+)
+TEST_BACKUP_DETAILS_5 = supervisor_backups.BackupComplete(
+    addons=[
+        supervisor_backups.BackupAddon(
+            name="Terminal & SSH",
+            size=0.0,
+            slug="core_ssh",
+            version="9.14.0",
+        )
+    ],
+    compressed=TEST_BACKUP_5.compressed,
+    date=TEST_BACKUP_5.date,
+    extra=None,
+    folders=[supervisor_backups.Folder.SHARE],
+    homeassistant_exclude_database=False,
+    homeassistant="2024.12.0",
+    location_attributes=TEST_BACKUP_5.location_attributes,
+    name=TEST_BACKUP_5.name,
+    repositories=[],
+    slug=TEST_BACKUP_5.slug,
+    supervisor_version="2024.11.2",
+    type=TEST_BACKUP_5.type,
+)
+
+TEST_JOB_ID = "d17bd02be1f0437fa7264b16d38f700e"
+TEST_JOB_NOT_DONE = supervisor_jobs.Job(
+    name="backup_manager_partial_backup",
+    reference="1ef41507",
+    uuid=UUID(TEST_JOB_ID),
+    progress=0.0,
+    stage="copy_additional_locations",
+    done=False,
+    errors=[],
+    created=datetime.fromisoformat("1970-01-01T00:00:00Z"),
+    child_jobs=[],
+)
+TEST_JOB_DONE = supervisor_jobs.Job(
+    name="backup_manager_partial_backup",
+    reference="1ef41507",
+    uuid=UUID(TEST_JOB_ID),
+    progress=0.0,
+    stage="copy_additional_locations",
+    done=True,
+    errors=[],
+    created=datetime.fromisoformat("1970-01-01T00:00:00Z"),
+    child_jobs=[],
+)
+TEST_RESTORE_JOB_DONE_WITH_ERROR = supervisor_jobs.Job(
+    name="backup_manager_partial_restore",
+    reference="1ef41507",
+    uuid=UUID(TEST_JOB_ID),
+    progress=0.0,
+    stage="copy_additional_locations",
+    done=True,
+    errors=[
+        supervisor_jobs.JobError(
+            type="BackupInvalidError",
+            message=(
+                "Backup was made on supervisor version 2025.02.2.dev3105, "
+                "can't restore on 2025.01.2.dev3105"
+            ),
+        )
+    ],
+    created=datetime.fromisoformat("1970-01-01T00:00:00Z"),
+    child_jobs=[],
 )
 
 
@@ -241,51 +320,79 @@ async def hassio_enabled(
 
 
 @pytest.fixture
-async def setup_integration(
+async def setup_backup_integration(
     hass: HomeAssistant, hassio_enabled: None, supervisor_client: AsyncMock
 ) -> None:
     """Set up Backup integration."""
+    async_initialize_backup(hass)
     assert await async_setup_component(hass, BACKUP_DOMAIN, {BACKUP_DOMAIN: {}})
     await hass.async_block_till_done()
 
 
-class BackupAgentTest(BackupAgent):
-    """Test backup agent."""
+async def aiter_from_iter(iterable: Iterable) -> AsyncIterator:
+    """Convert an iterable to an async iterator."""
+    for i in iterable:
+        yield i
 
-    domain = "test"
 
-    def __init__(self, name: str) -> None:
-        """Initialize the backup agent."""
-        self.name = name
+def mock_backup_agent(
+    name: str, domain: str = "test", backups: list[AgentBackup] | None = None
+) -> Mock:
+    """Create a mock backup agent."""
 
-    async def async_download_backup(
-        self, backup_id: str, **kwargs: Any
-    ) -> AsyncIterator[bytes]:
-        """Download a backup file."""
-        return AsyncMock(spec_set=["__aiter__"])
+    async def delete_backup(backup_id: str, **kwargs: Any) -> None:
+        """Mock delete."""
+        await get_backup(backup_id)
 
-    async def async_upload_backup(
-        self,
+    async def download_backup(backup_id: str, **kwargs: Any) -> AsyncIterator[bytes]:
+        """Mock download."""
+        return aiter_from_iter((backups_data.get(backup_id, b"backup data"),))
+
+    async def get_backup(backup_id: str, **kwargs: Any) -> AgentBackup:
+        """Get a backup."""
+        backup = next((b for b in _backups if b.backup_id == backup_id), None)
+        if backup is None:
+            raise BackupNotFound
+        return backup
+
+    async def upload_backup(
         *,
         open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
         backup: AgentBackup,
         **kwargs: Any,
     ) -> None:
         """Upload a backup."""
-        await open_stream()
+        _backups.append(backup)
+        backup_stream = await open_stream()
+        backup_data = bytearray()
+        async for chunk in backup_stream:
+            backup_data += chunk
+        backups_data[backup.backup_id] = backup_data
 
-    async def async_list_backups(self, **kwargs: Any) -> list[AgentBackup]:
-        """List backups."""
-        return []
-
-    async def async_get_backup(
-        self, backup_id: str, **kwargs: Any
-    ) -> AgentBackup | None:
-        """Return a backup."""
-        return None
-
-    async def async_delete_backup(self, backup_id: str, **kwargs: Any) -> None:
-        """Delete a backup file."""
+    _backups = backups or []
+    backups_data: dict[str, Buffer] = {}
+    mock_agent = Mock(spec=BackupAgent)
+    mock_agent.domain = domain
+    mock_agent.name = name
+    mock_agent.unique_id = name
+    type(mock_agent).agent_id = BackupAgent.agent_id
+    mock_agent.async_delete_backup = AsyncMock(
+        side_effect=delete_backup, spec_set=[BackupAgent.async_delete_backup]
+    )
+    mock_agent.async_download_backup = AsyncMock(
+        side_effect=download_backup, spec_set=[BackupAgent.async_download_backup]
+    )
+    mock_agent.async_get_backup = AsyncMock(
+        side_effect=get_backup, spec_set=[BackupAgent.async_get_backup]
+    )
+    mock_agent.async_list_backups = AsyncMock(
+        return_value=backups, spec_set=[BackupAgent.async_list_backups]
+    )
+    mock_agent.async_upload_backup = AsyncMock(
+        side_effect=upload_backup,
+        spec_set=[BackupAgent.async_upload_backup],
+    )
+    return mock_agent
 
 
 async def _setup_backup_platform(
@@ -295,7 +402,7 @@ async def _setup_backup_platform(
     platform: BackupAgentPlatformProtocol,
 ) -> None:
     """Set up a mock domain."""
-    mock_platform(hass, f"{domain}.backup", platform)
+    mock_platform(hass, f"{domain}.backup", cast(Mock, platform))
     assert await async_setup_component(hass, domain, {})
     await hass.async_block_till_done()
 
@@ -304,24 +411,9 @@ async def _setup_backup_platform(
 @pytest.mark.parametrize(
     ("mounts", "expected_agents"),
     [
-        (MountsInfo(default_backup_mount=None, mounts=[]), ["hassio.local"]),
         (
-            MountsInfo(
-                default_backup_mount=None,
-                mounts=[
-                    supervisor_mounts.CIFSMountResponse(
-                        share="test",
-                        name="test",
-                        read_only=False,
-                        state=supervisor_mounts.MountState.ACTIVE,
-                        user_path="test",
-                        usage=supervisor_mounts.MountUsage.BACKUP,
-                        server="test",
-                        type=supervisor_mounts.MountType.CIFS,
-                    )
-                ],
-            ),
-            ["hassio.local", "hassio.test"],
+            MountsInfo(default_backup_mount=None, mounts=[]),
+            [mock_backup_agent("local", DOMAIN)],
         ),
         (
             MountsInfo(
@@ -332,14 +424,32 @@ async def _setup_backup_platform(
                         name="test",
                         read_only=False,
                         state=supervisor_mounts.MountState.ACTIVE,
-                        user_path="test",
+                        user_path=PurePath("test"),
+                        usage=supervisor_mounts.MountUsage.BACKUP,
+                        server="test",
+                        type=supervisor_mounts.MountType.CIFS,
+                    )
+                ],
+            ),
+            [mock_backup_agent("local", DOMAIN), mock_backup_agent("test", DOMAIN)],
+        ),
+        (
+            MountsInfo(
+                default_backup_mount=None,
+                mounts=[
+                    supervisor_mounts.CIFSMountResponse(
+                        share="test",
+                        name="test",
+                        read_only=False,
+                        state=supervisor_mounts.MountState.ACTIVE,
+                        user_path=PurePath("test"),
                         usage=supervisor_mounts.MountUsage.MEDIA,
                         server="test",
                         type=supervisor_mounts.MountType.CIFS,
                     )
                 ],
             ),
-            ["hassio.local"],
+            [mock_backup_agent("local", DOMAIN)],
         ),
     ],
 )
@@ -348,12 +458,13 @@ async def test_agent_info(
     hass_ws_client: WebSocketGenerator,
     supervisor_client: AsyncMock,
     mounts: MountsInfo,
-    expected_agents: list[str],
+    expected_agents: list[BackupAgent],
 ) -> None:
     """Test backup agent info."""
     client = await hass_ws_client(hass)
     supervisor_client.mounts.info.return_value = mounts
 
+    async_initialize_backup(hass)
     assert await async_setup_component(hass, BACKUP_DOMAIN, {BACKUP_DOMAIN: {}})
 
     await client.send_json_auto_id({"type": "backup/agents/info"})
@@ -361,11 +472,14 @@ async def test_agent_info(
 
     assert response["success"]
     assert response["result"] == {
-        "agents": [{"agent_id": agent_id} for agent_id in expected_agents],
+        "agents": [
+            {"agent_id": agent.agent_id, "name": agent.name}
+            for agent in expected_agents
+        ],
     }
 
 
-@pytest.mark.usefixtures("hassio_client", "setup_integration")
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
 @pytest.mark.parametrize(
     ("backup", "backup_details", "expected_response"),
     [
@@ -376,17 +490,16 @@ async def test_agent_info(
                 "addons": [
                     {"name": "Terminal & SSH", "slug": "core_ssh", "version": "9.14.0"}
                 ],
-                "agent_ids": ["hassio.local"],
+                "agents": {"hassio.local": {"protected": False, "size": 1048576}},
                 "backup_id": "abc123",
                 "database_included": True,
                 "date": "1970-01-01T00:00:00+00:00",
+                "extra_metadata": {},
                 "failed_agent_ids": [],
                 "folders": ["share"],
                 "homeassistant_included": True,
                 "homeassistant_version": "2024.12.0",
                 "name": "Test",
-                "protected": False,
-                "size": 1048576,
                 "with_automatic_settings": None,
             },
         ),
@@ -397,17 +510,16 @@ async def test_agent_info(
                 "addons": [
                     {"name": "Terminal & SSH", "slug": "core_ssh", "version": "9.14.0"}
                 ],
-                "agent_ids": ["hassio.local"],
+                "agents": {"hassio.local": {"protected": False, "size": 1048576}},
                 "backup_id": "abc123",
                 "database_included": False,
                 "date": "1970-01-01T00:00:00+00:00",
+                "extra_metadata": {},
                 "failed_agent_ids": [],
                 "folders": ["share"],
                 "homeassistant_included": False,
                 "homeassistant_version": None,
                 "name": "Test",
-                "protected": False,
-                "size": 1048576,
                 "with_automatic_settings": None,
             },
         ),
@@ -433,13 +545,13 @@ async def test_agent_list_backups(
     assert response["result"]["backups"] == [expected_response]
 
 
-@pytest.mark.usefixtures("hassio_client", "setup_integration")
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
 async def test_agent_download(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
     supervisor_client: AsyncMock,
 ) -> None:
-    """Test agent download backup, when cloud user is logged in."""
+    """Test agent download backup."""
     client = await hass_client()
     backup_id = "abc123"
     supervisor_client.backups.list.return_value = [TEST_BACKUP]
@@ -453,30 +565,40 @@ async def test_agent_download(
     assert await resp.content.read() == b"backup data"
 
     supervisor_client.backups.download_backup.assert_called_once_with(
-        "abc123", options=supervisor_backups.DownloadBackupOptions(location=None)
+        "abc123",
+        options=supervisor_backups.DownloadBackupOptions(
+            location=LOCATION_LOCAL_STORAGE
+        ),
     )
 
 
-@pytest.mark.usefixtures("hassio_client", "setup_integration")
+@pytest.mark.parametrize(
+    ("backup_info", "backup_id", "agent_id"),
+    [
+        (TEST_BACKUP_DETAILS_3, "unknown", "hassio.local"),
+        (TEST_BACKUP_DETAILS_3, TEST_BACKUP_DETAILS_3.slug, "hassio.local"),
+        (TEST_BACKUP_DETAILS, TEST_BACKUP_DETAILS_3.slug, "hassio.local"),
+    ],
+)
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
 async def test_agent_download_unavailable_backup(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
     supervisor_client: AsyncMock,
+    agent_id: str,
+    backup_id: str,
+    backup_info: supervisor_backups.BackupComplete,
 ) -> None:
-    """Test agent download backup, when cloud user is logged in."""
+    """Test agent download backup which does not exist."""
     client = await hass_client()
-    backup_id = "abc123"
-    supervisor_client.backups.list.return_value = [TEST_BACKUP_3]
-    supervisor_client.backups.backup_info.return_value = TEST_BACKUP_DETAILS_3
-    supervisor_client.backups.download_backup.return_value.__aiter__.return_value = (
-        iter((b"backup data",))
-    )
+    supervisor_client.backups.backup_info.return_value = backup_info
+    supervisor_client.backups.download_backup.side_effect = SupervisorNotFoundError
 
-    resp = await client.get(f"/api/backup/download/{backup_id}?agent_id=hassio.local")
+    resp = await client.get(f"/api/backup/download/{backup_id}?agent_id={agent_id}")
     assert resp.status == 404
 
 
-@pytest.mark.usefixtures("hassio_client", "setup_integration")
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
 async def test_agent_upload(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
@@ -484,40 +606,13 @@ async def test_agent_upload(
 ) -> None:
     """Test agent upload backup."""
     client = await hass_client()
-    backup_id = "test-backup"
     supervisor_client.backups.backup_info.return_value = TEST_BACKUP_DETAILS
-    test_backup = AgentBackup(
-        addons=[AddonInfo(name="Test", slug="test", version="1.0.0")],
-        backup_id=backup_id,
-        database_included=True,
-        date="1970-01-01T00:00:00.000Z",
-        extra_metadata={},
-        folders=[Folder.MEDIA, Folder.SHARE],
-        homeassistant_included=True,
-        homeassistant_version="2024.12.0",
-        name="Test",
-        protected=False,
-        size=0,
-    )
 
     supervisor_client.backups.reload.assert_not_called()
-    with (
-        patch("pathlib.Path.mkdir"),
-        patch("pathlib.Path.open"),
-        patch(
-            "homeassistant.components.backup.manager.BackupManager.async_get_backup",
-        ) as fetch_backup,
-        patch(
-            "homeassistant.components.backup.manager.read_backup",
-            return_value=test_backup,
-        ),
-        patch("shutil.copy"),
-    ):
-        fetch_backup.return_value = test_backup
-        resp = await client.post(
-            "/api/backup/upload?agent_id=hassio.local",
-            data={"file": StringIO("test")},
-        )
+    resp = await client.post(
+        "/api/backup/upload?agent_id=hassio.local",
+        data={"file": StringIO("test")},
+    )
 
     assert resp.status == 201
     supervisor_client.backups.reload.assert_not_called()
@@ -525,7 +620,93 @@ async def test_agent_upload(
     supervisor_client.backups.remove_backup.assert_not_called()
 
 
-@pytest.mark.usefixtures("hassio_client", "setup_integration")
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
+async def test_agent_get_backup(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    supervisor_client: AsyncMock,
+) -> None:
+    """Test agent get backup."""
+    client = await hass_ws_client(hass)
+    supervisor_client.backups.backup_info.return_value = TEST_BACKUP_DETAILS
+    backup_id = "abc123"
+
+    await client.send_json_auto_id(
+        {
+            "type": "backup/details",
+            "backup_id": backup_id,
+        }
+    )
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {
+        "agent_errors": {},
+        "backup": {
+            "addons": [
+                {"name": "Terminal & SSH", "slug": "core_ssh", "version": "9.14.0"}
+            ],
+            "agents": {"hassio.local": {"protected": False, "size": 1048576}},
+            "backup_id": "abc123",
+            "database_included": True,
+            "date": "1970-01-01T00:00:00+00:00",
+            "extra_metadata": {},
+            "failed_agent_ids": [],
+            "folders": ["share"],
+            "homeassistant_included": True,
+            "homeassistant_version": "2024.12.0",
+            "name": "Test",
+            "with_automatic_settings": None,
+        },
+    }
+    supervisor_client.backups.backup_info.assert_called_once_with(backup_id)
+
+
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
+@pytest.mark.parametrize(
+    ("backup_info_side_effect", "expected_response"),
+    [
+        (
+            SupervisorBadRequestError("blah"),
+            {
+                "success": True,
+                "result": {"agent_errors": {"hassio.local": "blah"}, "backup": None},
+            },
+        ),
+        (
+            SupervisorNotFoundError(),
+            {
+                "success": True,
+                "result": {"agent_errors": {}, "backup": None},
+            },
+        ),
+    ],
+)
+async def test_agent_get_backup_with_error(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    supervisor_client: AsyncMock,
+    backup_info_side_effect: Exception,
+    expected_response: dict[str, Any],
+) -> None:
+    """Test agent get backup."""
+    client = await hass_ws_client(hass)
+    backup_id = "abc123"
+
+    supervisor_client.backups.backup_info.side_effect = backup_info_side_effect
+    await client.send_json_auto_id(
+        {
+            "type": "backup/details",
+            "backup_id": backup_id,
+        }
+    )
+    response = await client.receive_json()
+
+    assert response == {"id": 1, "type": "result"} | expected_response
+    supervisor_client.backups.backup_info.assert_called_once_with(backup_id)
+
+
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
 async def test_agent_delete_backup(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
@@ -546,26 +727,22 @@ async def test_agent_delete_backup(
     assert response["success"]
     assert response["result"] == {"agent_errors": {}}
     supervisor_client.backups.remove_backup.assert_called_once_with(
-        backup_id, options=supervisor_backups.RemoveBackupOptions(location={None})
+        backup_id,
+        options=supervisor_backups.RemoveBackupOptions(
+            location={LOCATION_LOCAL_STORAGE}
+        ),
     )
 
 
-@pytest.mark.usefixtures("hassio_client", "setup_integration")
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
 @pytest.mark.parametrize(
     ("remove_side_effect", "expected_response"),
     [
         (
             SupervisorBadRequestError("blah"),
-            {
-                "success": False,
-                "error": {"code": "unknown_error", "message": "Unknown error"},
-            },
-        ),
-        (
-            SupervisorBadRequestError("Backup does not exist"),
             {
                 "success": True,
-                "result": {"agent_errors": {}},
+                "result": {"agent_errors": {"hassio.local": "blah"}},
             },
         ),
         (
@@ -599,11 +776,14 @@ async def test_agent_delete_with_error(
 
     assert response == {"id": 1, "type": "result"} | expected_response
     supervisor_client.backups.remove_backup.assert_called_once_with(
-        backup_id, options=supervisor_backups.RemoveBackupOptions(location={None})
+        backup_id,
+        options=supervisor_backups.RemoveBackupOptions(
+            location={LOCATION_LOCAL_STORAGE}
+        ),
     )
 
 
-@pytest.mark.usefixtures("hassio_client", "setup_integration")
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
 @pytest.mark.parametrize(
     ("event_data", "mount_info_calls"),
     [
@@ -671,18 +851,20 @@ DEFAULT_BACKUP_OPTIONS = supervisor_backups.PartialBackupOptions(
     compressed=True,
     extra={
         "instance_id": ANY,
+        "supervisor.backup_request_date": "2025-01-30T05:42:12.345678-08:00",
         "with_automatic_settings": False,
     },
-    folders={"ssl"},
+    filename=PurePath("Test_2025-01-30_05.42_12345678.tar"),
+    folders={supervisor_backups.Folder("ssl")},
     homeassistant_exclude_database=False,
     homeassistant=True,
-    location=[None],
+    location=[LOCATION_LOCAL_STORAGE],
     name="Test",
     password=None,
 )
 
 
-@pytest.mark.usefixtures("hassio_client", "setup_integration")
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
 @pytest.mark.parametrize(
     ("extra_generate_options", "expected_supervisor_options"),
     [
@@ -696,7 +878,7 @@ DEFAULT_BACKUP_OPTIONS = supervisor_backups.PartialBackupOptions(
         ),
         (
             {"include_all_addons": True},
-            replace(DEFAULT_BACKUP_OPTIONS, addons="ALL"),
+            replace(DEFAULT_BACKUP_OPTIONS, addons=supervisor_backups.AddonSet("ALL")),
         ),
         (
             {"include_database": False},
@@ -704,7 +886,14 @@ DEFAULT_BACKUP_OPTIONS = supervisor_backups.PartialBackupOptions(
         ),
         (
             {"include_folders": ["media", "share"]},
-            replace(DEFAULT_BACKUP_OPTIONS, folders={"media", "share", "ssl"}),
+            replace(
+                DEFAULT_BACKUP_OPTIONS,
+                folders={
+                    supervisor_backups.Folder("media"),
+                    supervisor_backups.Folder("share"),
+                    supervisor_backups.Folder("ssl"),
+                },
+            ),
         ),
         (
             {
@@ -714,7 +903,7 @@ DEFAULT_BACKUP_OPTIONS = supervisor_backups.PartialBackupOptions(
             },
             replace(
                 DEFAULT_BACKUP_OPTIONS,
-                folders={"media"},
+                folders={supervisor_backups.Folder("media")},
                 homeassistant=False,
                 homeassistant_exclude_database=True,
             ),
@@ -724,14 +913,17 @@ DEFAULT_BACKUP_OPTIONS = supervisor_backups.PartialBackupOptions(
 async def test_reader_writer_create(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
+    freezer: FrozenDateTimeFactory,
     supervisor_client: AsyncMock,
     extra_generate_options: dict[str, Any],
     expected_supervisor_options: supervisor_backups.PartialBackupOptions,
 ) -> None:
     """Test generating a backup."""
     client = await hass_ws_client(hass)
-    supervisor_client.backups.partial_backup.return_value.job_id = "abc123"
+    freezer.move_to("2025-01-30 13:42:12.345678")
+    supervisor_client.backups.partial_backup.return_value.job_id = UUID(TEST_JOB_ID)
     supervisor_client.backups.backup_info.return_value = TEST_BACKUP_DETAILS
+    supervisor_client.jobs.get_job.return_value = TEST_JOB_NOT_DONE
 
     await client.send_json_auto_id({"type": "backup/subscribe_events"})
     response = await client.receive_json()
@@ -746,13 +938,14 @@ async def test_reader_writer_create(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "create_backup",
+        "reason": None,
         "stage": None,
         "state": "in_progress",
     }
 
     response = await client.receive_json()
     assert response["success"]
-    assert response["result"] == {"backup_job_id": "abc123"}
+    assert response["result"] == {"backup_job_id": TEST_JOB_ID}
 
     supervisor_client.backups.partial_backup.assert_called_once_with(
         expected_supervisor_options
@@ -763,7 +956,7 @@ async def test_reader_writer_create(
             "type": "supervisor/event",
             "data": {
                 "event": "job",
-                "data": {"done": True, "uuid": "abc123", "reference": "test_slug"},
+                "data": {"done": True, "uuid": TEST_JOB_ID, "reference": "test_slug"},
             },
         }
     )
@@ -773,6 +966,7 @@ async def test_reader_writer_create(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "create_backup",
+        "reason": None,
         "stage": "upload_to_agents",
         "state": "in_progress",
     }
@@ -780,6 +974,7 @@ async def test_reader_writer_create(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "create_backup",
+        "reason": None,
         "stage": None,
         "state": "completed",
     }
@@ -791,16 +986,420 @@ async def test_reader_writer_create(
     assert response["event"] == {"manager_state": "idle"}
 
 
-@pytest.mark.usefixtures("hassio_client", "setup_integration")
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
+async def test_reader_writer_create_report_progress(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    freezer: FrozenDateTimeFactory,
+    supervisor_client: AsyncMock,
+) -> None:
+    """Test generating a backup."""
+    client = await hass_ws_client(hass)
+    freezer.move_to("2025-01-30 13:42:12.345678")
+    supervisor_client.backups.partial_backup.return_value.job_id = UUID(TEST_JOB_ID)
+    supervisor_client.backups.backup_info.return_value = TEST_BACKUP_DETAILS
+    supervisor_client.jobs.get_job.return_value = TEST_JOB_NOT_DONE
+
+    await client.send_json_auto_id({"type": "backup/subscribe_events"})
+    response = await client.receive_json()
+    assert response["event"] == {"manager_state": "idle"}
+    response = await client.receive_json()
+    assert response["success"]
+
+    await client.send_json_auto_id(
+        {"type": "backup/generate", "agent_ids": ["hassio.local"], "name": "Test"}
+    )
+    response = await client.receive_json()
+    assert response["event"] == {
+        "manager_state": "create_backup",
+        "reason": None,
+        "stage": None,
+        "state": "in_progress",
+    }
+
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {"backup_job_id": TEST_JOB_ID}
+
+    supervisor_client.backups.partial_backup.assert_called_once_with(
+        DEFAULT_BACKUP_OPTIONS
+    )
+
+    supervisor_event_base = {"uuid": TEST_JOB_ID, "reference": "test_slug"}
+    supervisor_events = [
+        supervisor_event_base | {"done": False, "stage": "addon_repositories"},
+        supervisor_event_base | {"done": False, "stage": None},  # Will be skipped
+        supervisor_event_base | {"done": False, "stage": "unknown"},  # Will be skipped
+        supervisor_event_base | {"done": False, "stage": "home_assistant"},
+        supervisor_event_base | {"done": False, "stage": "addons"},
+        supervisor_event_base | {"done": True, "stage": "finishing_file"},
+    ]
+    expected_manager_events = [
+        "addon_repositories",
+        "home_assistant",
+        "addons",
+        "finishing_file",
+    ]
+
+    for supervisor_event in supervisor_events:
+        await client.send_json_auto_id(
+            {
+                "type": "supervisor/event",
+                "data": {"event": "job", "data": supervisor_event},
+            }
+        )
+
+    acks = 0
+    events = []
+    for _ in range(len(supervisor_events) + len(expected_manager_events)):
+        response = await client.receive_json()
+        if "event" in response:
+            events.append(response)
+            continue
+        assert response["success"]
+        acks += 1
+
+    assert acks == len(supervisor_events)
+    assert len(events) == len(expected_manager_events)
+
+    for i, event in enumerate(events):
+        assert event["event"] == {
+            "manager_state": "create_backup",
+            "reason": None,
+            "stage": expected_manager_events[i],
+            "state": "in_progress",
+        }
+
+    response = await client.receive_json()
+    assert response["event"] == {
+        "manager_state": "create_backup",
+        "reason": None,
+        "stage": "upload_to_agents",
+        "state": "in_progress",
+    }
+
+    response = await client.receive_json()
+    assert response["event"] == {
+        "manager_state": "create_backup",
+        "reason": None,
+        "stage": None,
+        "state": "completed",
+    }
+
+    supervisor_client.backups.download_backup.assert_not_called()
+    supervisor_client.backups.remove_backup.assert_not_called()
+
+    response = await client.receive_json()
+    assert response["event"] == {"manager_state": "idle"}
+
+
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
+async def test_reader_writer_create_job_done(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    freezer: FrozenDateTimeFactory,
+    supervisor_client: AsyncMock,
+) -> None:
+    """Test generating a backup, and backup job finishes early."""
+    client = await hass_ws_client(hass)
+    freezer.move_to("2025-01-30 13:42:12.345678")
+    supervisor_client.backups.partial_backup.return_value.job_id = UUID(TEST_JOB_ID)
+    supervisor_client.backups.backup_info.return_value = TEST_BACKUP_DETAILS
+    supervisor_client.jobs.get_job.return_value = TEST_JOB_DONE
+
+    await client.send_json_auto_id({"type": "backup/subscribe_events"})
+    response = await client.receive_json()
+    assert response["event"] == {"manager_state": "idle"}
+    response = await client.receive_json()
+    assert response["success"]
+
+    await client.send_json_auto_id(
+        {"type": "backup/generate", "agent_ids": ["hassio.local"], "name": "Test"}
+    )
+    response = await client.receive_json()
+    assert response["event"] == {
+        "manager_state": "create_backup",
+        "reason": None,
+        "stage": None,
+        "state": "in_progress",
+    }
+
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {"backup_job_id": TEST_JOB_ID}
+
+    supervisor_client.backups.partial_backup.assert_called_once_with(
+        DEFAULT_BACKUP_OPTIONS
+    )
+
+    response = await client.receive_json()
+    assert response["event"] == {
+        "manager_state": "create_backup",
+        "reason": None,
+        "stage": "upload_to_agents",
+        "state": "in_progress",
+    }
+
+    response = await client.receive_json()
+    assert response["event"] == {
+        "manager_state": "create_backup",
+        "reason": None,
+        "stage": None,
+        "state": "completed",
+    }
+
+    supervisor_client.backups.download_backup.assert_not_called()
+    supervisor_client.backups.remove_backup.assert_not_called()
+
+    response = await client.receive_json()
+    assert response["event"] == {"manager_state": "idle"}
+
+
+@pytest.mark.usefixtures("hassio_client")
 @pytest.mark.parametrize(
-    ("side_effect", "error_code", "error_message"),
+    (
+        "commands",
+        "password",
+        "agent_ids",
+        "password_sent_to_supervisor",
+        "create_locations",
+        "create_protected",
+        "upload_locations",
+    ),
+    [
+        (
+            [],
+            None,
+            ["hassio.local", "hassio.share1", "hassio.share2", "hassio.share3"],
+            None,
+            [LOCATION_LOCAL_STORAGE, "share1", "share2", "share3"],
+            False,
+            [],
+        ),
+        (
+            [],
+            "hunter2",
+            ["hassio.local", "hassio.share1", "hassio.share2", "hassio.share3"],
+            "hunter2",
+            [LOCATION_LOCAL_STORAGE, "share1", "share2", "share3"],
+            True,
+            [],
+        ),
+        (
+            [
+                {
+                    "type": "backup/config/update",
+                    "agents": {
+                        "hassio.local": {"protected": False},
+                    },
+                }
+            ],
+            "hunter2",
+            ["hassio.local", "hassio.share1", "hassio.share2", "hassio.share3"],
+            "hunter2",
+            ["share1", "share2", "share3"],
+            True,
+            [LOCATION_LOCAL_STORAGE],
+        ),
+        (
+            [
+                {
+                    "type": "backup/config/update",
+                    "agents": {
+                        "hassio.local": {"protected": False},
+                        "hassio.share1": {"protected": False},
+                    },
+                }
+            ],
+            "hunter2",
+            ["hassio.local", "hassio.share1", "hassio.share2", "hassio.share3"],
+            "hunter2",
+            ["share2", "share3"],
+            True,
+            [LOCATION_LOCAL_STORAGE, "share1"],
+        ),
+        (
+            [
+                {
+                    "type": "backup/config/update",
+                    "agents": {
+                        "hassio.local": {"protected": False},
+                        "hassio.share1": {"protected": False},
+                        "hassio.share2": {"protected": False},
+                    },
+                }
+            ],
+            "hunter2",
+            ["hassio.local", "hassio.share1", "hassio.share2", "hassio.share3"],
+            None,
+            [LOCATION_LOCAL_STORAGE, "share1", "share2"],
+            True,
+            ["share3"],
+        ),
+        (
+            [
+                {
+                    "type": "backup/config/update",
+                    "agents": {
+                        "hassio.local": {"protected": False},
+                    },
+                }
+            ],
+            "hunter2",
+            ["hassio.local"],
+            None,
+            [LOCATION_LOCAL_STORAGE],
+            False,
+            [],
+        ),
+    ],
+)
+async def test_reader_writer_create_per_agent_encryption(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    freezer: FrozenDateTimeFactory,
+    supervisor_client: AsyncMock,
+    commands: list[dict[str, Any]],
+    password: str | None,
+    agent_ids: list[str],
+    password_sent_to_supervisor: str | None,
+    create_locations: list[str],
+    create_protected: bool,
+    upload_locations: list[str | None],
+) -> None:
+    """Test generating a backup."""
+    client = await hass_ws_client(hass)
+    freezer.move_to("2025-01-30 13:42:12.345678")
+    mounts = MountsInfo(
+        default_backup_mount=None,
+        mounts=[
+            supervisor_mounts.CIFSMountResponse(
+                share=f"share{i}",
+                name=f"share{i}",
+                read_only=False,
+                state=supervisor_mounts.MountState.ACTIVE,
+                user_path=PurePath(f"share{i}"),
+                usage=supervisor_mounts.MountUsage.BACKUP,
+                server=f"share{i}",
+                type=supervisor_mounts.MountType.CIFS,
+            )
+            for i in range(1, 4)
+        ],
+    )
+    supervisor_client.backups.partial_backup.return_value.job_id = UUID(TEST_JOB_ID)
+    supervisor_client.backups.backup_info.return_value = replace(
+        TEST_BACKUP_DETAILS,
+        extra=DEFAULT_BACKUP_OPTIONS.extra,
+        location_attributes={
+            location: supervisor_backups.BackupLocationAttributes(
+                protected=create_protected,
+                size_bytes=1048576,
+            )
+            for location in create_locations
+        },
+    )
+    supervisor_client.jobs.get_job.return_value = TEST_JOB_NOT_DONE
+    supervisor_client.mounts.info.return_value = mounts
+    async_initialize_backup(hass)
+    assert await async_setup_component(hass, BACKUP_DOMAIN, {BACKUP_DOMAIN: {}})
+
+    for command in commands:
+        await client.send_json_auto_id(command)
+        result = await client.receive_json()
+        assert result["success"] is True
+
+    await client.send_json_auto_id({"type": "backup/subscribe_events"})
+    response = await client.receive_json()
+    assert response["event"] == {"manager_state": "idle"}
+    response = await client.receive_json()
+    assert response["success"]
+
+    await client.send_json_auto_id(
+        {
+            "type": "backup/generate",
+            "agent_ids": agent_ids,
+            "name": "Test",
+            "password": password,
+        }
+    )
+    response = await client.receive_json()
+    assert response["event"] == {
+        "manager_state": "create_backup",
+        "reason": None,
+        "stage": None,
+        "state": "in_progress",
+    }
+
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {"backup_job_id": TEST_JOB_ID}
+
+    supervisor_client.backups.partial_backup.assert_called_once_with(
+        replace(
+            DEFAULT_BACKUP_OPTIONS,
+            password=password_sent_to_supervisor,
+            location=create_locations,
+        )
+    )
+
+    await client.send_json_auto_id(
+        {
+            "type": "supervisor/event",
+            "data": {
+                "event": "job",
+                "data": {"done": True, "uuid": TEST_JOB_ID, "reference": "test_slug"},
+            },
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+
+    response = await client.receive_json()
+    assert response["event"] == {
+        "manager_state": "create_backup",
+        "reason": None,
+        "stage": "upload_to_agents",
+        "state": "in_progress",
+    }
+
+    response = await client.receive_json()
+    assert response["event"] == {
+        "manager_state": "create_backup",
+        "reason": None,
+        "stage": None,
+        "state": "completed",
+    }
+
+    assert len(supervisor_client.backups.upload_backup.mock_calls) == len(
+        upload_locations
+    )
+    for call in supervisor_client.backups.upload_backup.mock_calls:
+        assert call.args[1].filename == PurePath("Test_2025-01-30_05.42_12345678.tar")
+        upload_call_locations: set = call.args[1].location
+        assert len(upload_call_locations) == 1
+        assert upload_call_locations.pop() in upload_locations
+    supervisor_client.backups.remove_backup.assert_not_called()
+
+    response = await client.receive_json()
+    assert response["event"] == {"manager_state": "idle"}
+
+
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
+@pytest.mark.parametrize(
+    ("side_effect", "error_code", "error_message", "expected_reason"),
     [
         (
             SupervisorError("Boom!"),
             "home_assistant_error",
             "Error creating backup: Boom!",
+            "backup_manager_error",
+        ),
+        (
+            Exception("Boom!"),
+            "unknown_error",
+            "Unknown error",
+            "unknown_error",
         ),
-        (Exception("Boom!"), "unknown_error", "Unknown error"),
     ],
 )
 async def test_reader_writer_create_partial_backup_error(
@@ -810,6 +1409,7 @@ async def test_reader_writer_create_partial_backup_error(
     side_effect: Exception,
     error_code: str,
     error_message: str,
+    expected_reason: str,
 ) -> None:
     """Test client partial backup error when generating a backup."""
     client = await hass_ws_client(hass)
@@ -827,6 +1427,7 @@ async def test_reader_writer_create_partial_backup_error(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "create_backup",
+        "reason": None,
         "stage": None,
         "state": "in_progress",
     }
@@ -834,6 +1435,7 @@ async def test_reader_writer_create_partial_backup_error(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "create_backup",
+        "reason": expected_reason,
         "stage": None,
         "state": "failed",
     }
@@ -849,15 +1451,45 @@ async def test_reader_writer_create_partial_backup_error(
     assert supervisor_client.backups.partial_backup.call_count == 1
 
 
-@pytest.mark.usefixtures("hassio_client", "setup_integration")
+@pytest.mark.parametrize(
+    "supervisor_event",
+    [
+        # Missing backup reference
+        {
+            "event": "job",
+            "data": {
+                "done": True,
+                "uuid": TEST_JOB_ID,
+            },
+        },
+        # Errors
+        {
+            "event": "job",
+            "data": {
+                "done": True,
+                "errors": [
+                    {
+                        "type": "BackupMountDownError",
+                        "message": "test_mount is down, cannot back-up to it",
+                    }
+                ],
+                "uuid": TEST_JOB_ID,
+                "reference": "test_slug",
+            },
+        },
+    ],
+)
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
 async def test_reader_writer_create_missing_reference_error(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
     supervisor_client: AsyncMock,
+    supervisor_event: dict[str, Any],
 ) -> None:
     """Test missing reference error when generating a backup."""
     client = await hass_ws_client(hass)
-    supervisor_client.backups.partial_backup.return_value.job_id = "abc123"
+    supervisor_client.backups.partial_backup.return_value.job_id = UUID(TEST_JOB_ID)
+    supervisor_client.jobs.get_job.return_value = TEST_JOB_NOT_DONE
 
     await client.send_json_auto_id({"type": "backup/subscribe_events"})
     response = await client.receive_json()
@@ -871,24 +1503,19 @@ async def test_reader_writer_create_missing_reference_error(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "create_backup",
+        "reason": None,
         "stage": None,
         "state": "in_progress",
     }
 
     response = await client.receive_json()
     assert response["success"]
-    assert response["result"] == {"backup_job_id": "abc123"}
+    assert response["result"] == {"backup_job_id": TEST_JOB_ID}
 
     assert supervisor_client.backups.partial_backup.call_count == 1
 
     await client.send_json_auto_id(
-        {
-            "type": "supervisor/event",
-            "data": {
-                "event": "job",
-                "data": {"done": True, "uuid": "abc123"},
-            },
-        }
+        {"type": "supervisor/event", "data": supervisor_event}
     )
     response = await client.receive_json()
     assert response["success"]
@@ -896,6 +1523,7 @@ async def test_reader_writer_create_missing_reference_error(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "create_backup",
+        "reason": "upload_failed",
         "stage": None,
         "state": "failed",
     }
@@ -910,7 +1538,7 @@ async def test_reader_writer_create_missing_reference_error(
     assert response["event"] == {"manager_state": "idle"}
 
 
-@pytest.mark.usefixtures("hassio_client", "setup_integration")
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
 @pytest.mark.parametrize("exception", [SupervisorError("Boom!"), Exception("Boom!")])
 @pytest.mark.parametrize(
     ("method", "download_call_count", "remove_call_count"),
@@ -927,12 +1555,13 @@ async def test_reader_writer_create_download_remove_error(
 ) -> None:
     """Test download and remove error when generating a backup."""
     client = await hass_ws_client(hass)
-    supervisor_client.backups.partial_backup.return_value.job_id = "abc123"
-    supervisor_client.backups.backup_info.return_value = TEST_BACKUP_DETAILS
+    supervisor_client.backups.partial_backup.return_value.job_id = UUID(TEST_JOB_ID)
+    supervisor_client.backups.backup_info.return_value = TEST_BACKUP_DETAILS_5
+    supervisor_client.jobs.get_job.return_value = TEST_JOB_NOT_DONE
     method_mock = getattr(supervisor_client.backups, method)
     method_mock.side_effect = exception
 
-    remote_agent = BackupAgentTest("remote")
+    remote_agent = mock_backup_agent("remote")
     await _setup_backup_platform(
         hass,
         domain="test",
@@ -954,13 +1583,14 @@ async def test_reader_writer_create_download_remove_error(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "create_backup",
+        "reason": None,
         "stage": None,
         "state": "in_progress",
     }
 
     response = await client.receive_json()
     assert response["success"]
-    assert response["result"] == {"backup_job_id": "abc123"}
+    assert response["result"] == {"backup_job_id": TEST_JOB_ID}
 
     assert supervisor_client.backups.partial_backup.call_count == 1
 
@@ -969,7 +1599,7 @@ async def test_reader_writer_create_download_remove_error(
             "type": "supervisor/event",
             "data": {
                 "event": "job",
-                "data": {"done": True, "uuid": "abc123", "reference": "test_slug"},
+                "data": {"done": True, "uuid": TEST_JOB_ID, "reference": "test_slug"},
             },
         }
     )
@@ -979,6 +1609,7 @@ async def test_reader_writer_create_download_remove_error(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "create_backup",
+        "reason": None,
         "stage": "upload_to_agents",
         "state": "in_progress",
     }
@@ -986,6 +1617,7 @@ async def test_reader_writer_create_download_remove_error(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "create_backup",
+        "reason": "upload_failed",
         "stage": None,
         "state": "failed",
     }
@@ -1000,7 +1632,7 @@ async def test_reader_writer_create_download_remove_error(
     assert response["event"] == {"manager_state": "idle"}
 
 
-@pytest.mark.usefixtures("hassio_client", "setup_integration")
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
 @pytest.mark.parametrize("exception", [SupervisorError("Boom!"), Exception("Boom!")])
 async def test_reader_writer_create_info_error(
     hass: HomeAssistant,
@@ -1010,10 +1642,11 @@ async def test_reader_writer_create_info_error(
 ) -> None:
     """Test backup info error when generating a backup."""
     client = await hass_ws_client(hass)
-    supervisor_client.backups.partial_backup.return_value.job_id = "abc123"
+    supervisor_client.backups.partial_backup.return_value.job_id = UUID(TEST_JOB_ID)
     supervisor_client.backups.backup_info.side_effect = exception
+    supervisor_client.jobs.get_job.return_value = TEST_JOB_NOT_DONE
 
-    remote_agent = BackupAgentTest("remote")
+    remote_agent = mock_backup_agent("remote")
     await _setup_backup_platform(
         hass,
         domain="test",
@@ -1035,13 +1668,14 @@ async def test_reader_writer_create_info_error(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "create_backup",
+        "reason": None,
         "stage": None,
         "state": "in_progress",
     }
 
     response = await client.receive_json()
     assert response["success"]
-    assert response["result"] == {"backup_job_id": "abc123"}
+    assert response["result"] == {"backup_job_id": TEST_JOB_ID}
 
     assert supervisor_client.backups.partial_backup.call_count == 1
 
@@ -1050,7 +1684,7 @@ async def test_reader_writer_create_info_error(
             "type": "supervisor/event",
             "data": {
                 "event": "job",
-                "data": {"done": True, "uuid": "abc123", "reference": "test_slug"},
+                "data": {"done": True, "uuid": TEST_JOB_ID, "reference": "test_slug"},
             },
         }
     )
@@ -1060,6 +1694,7 @@ async def test_reader_writer_create_info_error(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "create_backup",
+        "reason": "upload_failed",
         "stage": None,
         "state": "failed",
     }
@@ -1074,18 +1709,21 @@ async def test_reader_writer_create_info_error(
     assert response["event"] == {"manager_state": "idle"}
 
 
-@pytest.mark.usefixtures("hassio_client", "setup_integration")
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
 async def test_reader_writer_create_remote_backup(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
+    freezer: FrozenDateTimeFactory,
     supervisor_client: AsyncMock,
 ) -> None:
     """Test generating a backup which will be uploaded to a remote agent."""
     client = await hass_ws_client(hass)
-    supervisor_client.backups.partial_backup.return_value.job_id = "abc123"
-    supervisor_client.backups.backup_info.return_value = TEST_BACKUP_DETAILS
+    freezer.move_to("2025-01-30 13:42:12.345678")
+    supervisor_client.backups.partial_backup.return_value.job_id = UUID(TEST_JOB_ID)
+    supervisor_client.backups.backup_info.return_value = TEST_BACKUP_DETAILS_5
+    supervisor_client.jobs.get_job.return_value = TEST_JOB_NOT_DONE
 
-    remote_agent = BackupAgentTest("remote")
+    remote_agent = mock_backup_agent("remote")
     await _setup_backup_platform(
         hass,
         domain="test",
@@ -1107,16 +1745,17 @@ async def test_reader_writer_create_remote_backup(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "create_backup",
+        "reason": None,
         "stage": None,
         "state": "in_progress",
     }
 
     response = await client.receive_json()
     assert response["success"]
-    assert response["result"] == {"backup_job_id": "abc123"}
+    assert response["result"] == {"backup_job_id": TEST_JOB_ID}
 
     supervisor_client.backups.partial_backup.assert_called_once_with(
-        replace(DEFAULT_BACKUP_OPTIONS, location=LOCATION_CLOUD_BACKUP),
+        replace(DEFAULT_BACKUP_OPTIONS, location=[LOCATION_CLOUD_BACKUP]),
     )
 
     await client.send_json_auto_id(
@@ -1124,7 +1763,7 @@ async def test_reader_writer_create_remote_backup(
             "type": "supervisor/event",
             "data": {
                 "event": "job",
-                "data": {"done": True, "uuid": "abc123", "reference": "test_slug"},
+                "data": {"done": True, "uuid": TEST_JOB_ID, "reference": "test_slug"},
             },
         }
     )
@@ -1134,6 +1773,7 @@ async def test_reader_writer_create_remote_backup(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "create_backup",
+        "reason": None,
         "stage": "upload_to_agents",
         "state": "in_progress",
     }
@@ -1141,6 +1781,7 @@ async def test_reader_writer_create_remote_backup(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "create_backup",
+        "reason": None,
         "stage": None,
         "state": "completed",
     }
@@ -1152,7 +1793,7 @@ async def test_reader_writer_create_remote_backup(
     )
 
 
-@pytest.mark.usefixtures("hassio_client", "setup_integration")
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
 @pytest.mark.parametrize(
     ("extra_generate_options", "expected_error"),
     [
@@ -1181,7 +1822,7 @@ async def test_reader_writer_create_wrong_parameters(
 ) -> None:
     """Test generating a backup."""
     client = await hass_ws_client(hass)
-    supervisor_client.backups.partial_backup.return_value.job_id = "abc123"
+    supervisor_client.backups.partial_backup.return_value.job_id = UUID(TEST_JOB_ID)
     supervisor_client.backups.backup_info.return_value = TEST_BACKUP_DETAILS
 
     await client.send_json_auto_id({"type": "backup/subscribe_events"})
@@ -1197,6 +1838,7 @@ async def test_reader_writer_create_wrong_parameters(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "create_backup",
+        "reason": None,
         "stage": None,
         "state": "in_progress",
     }
@@ -1204,6 +1846,7 @@ async def test_reader_writer_create_wrong_parameters(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "create_backup",
+        "reason": "unknown_error",
         "stage": None,
         "state": "failed",
     }
@@ -1220,7 +1863,7 @@ async def test_reader_writer_create_wrong_parameters(
     supervisor_client.backups.partial_backup.assert_not_called()
 
 
-@pytest.mark.usefixtures("hassio_client", "setup_integration")
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
 async def test_agent_receive_remote_backup(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
@@ -1228,24 +1871,10 @@ async def test_agent_receive_remote_backup(
 ) -> None:
     """Test receiving a backup which will be uploaded to a remote agent."""
     client = await hass_client()
-    backup_id = "test-backup"
-    supervisor_client.backups.backup_info.return_value = TEST_BACKUP_DETAILS
+    supervisor_client.backups.backup_info.return_value = TEST_BACKUP_DETAILS_5
     supervisor_client.backups.upload_backup.return_value = "test_slug"
-    test_backup = AgentBackup(
-        addons=[AddonInfo(name="Test", slug="test", version="1.0.0")],
-        backup_id=backup_id,
-        database_included=True,
-        date="1970-01-01T00:00:00.000Z",
-        extra_metadata={},
-        folders=[Folder.MEDIA, Folder.SHARE],
-        homeassistant_included=True,
-        homeassistant_version="2024.12.0",
-        name="Test",
-        protected=False,
-        size=0.0,
-    )
 
-    remote_agent = BackupAgentTest("remote")
+    remote_agent = mock_backup_agent("remote")
     await _setup_backup_platform(
         hass,
         domain="test",
@@ -1256,23 +1885,10 @@ async def test_agent_receive_remote_backup(
     )
 
     supervisor_client.backups.reload.assert_not_called()
-    with (
-        patch("pathlib.Path.mkdir"),
-        patch("pathlib.Path.open"),
-        patch(
-            "homeassistant.components.backup.manager.BackupManager.async_get_backup",
-        ) as fetch_backup,
-        patch(
-            "homeassistant.components.backup.manager.read_backup",
-            return_value=test_backup,
-        ),
-        patch("shutil.copy"),
-    ):
-        fetch_backup.return_value = test_backup
-        resp = await client.post(
-            "/api/backup/upload?agent_id=test.remote",
-            data={"file": StringIO("test")},
-        )
+    resp = await client.post(
+        "/api/backup/upload?agent_id=test.remote",
+        data={"file": StringIO("test")},
+    )
 
     assert resp.status == 201
 
@@ -1283,17 +1899,33 @@ async def test_agent_receive_remote_backup(
     )
 
 
-@pytest.mark.usefixtures("hassio_client", "setup_integration")
+@pytest.mark.parametrize(
+    ("get_job_result", "supervisor_events"),
+    [
+        (
+            TEST_JOB_NOT_DONE,
+            [{"event": "job", "data": {"done": True, "uuid": TEST_JOB_ID}}],
+        ),
+        (
+            TEST_JOB_DONE,
+            [],
+        ),
+    ],
+)
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
 async def test_reader_writer_restore(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
     supervisor_client: AsyncMock,
+    get_job_result: supervisor_jobs.Job,
+    supervisor_events: list[dict[str, Any]],
 ) -> None:
     """Test restoring a backup."""
     client = await hass_ws_client(hass)
-    supervisor_client.backups.partial_restore.return_value.job_id = "abc123"
+    supervisor_client.backups.partial_restore.return_value.job_id = UUID(TEST_JOB_ID)
     supervisor_client.backups.list.return_value = [TEST_BACKUP]
     supervisor_client.backups.backup_info.return_value = TEST_BACKUP_DETAILS
+    supervisor_client.jobs.get_job.return_value = get_job_result
 
     await client.send_json_auto_id({"type": "backup/subscribe_events"})
     response = await client.receive_json()
@@ -1309,6 +1941,7 @@ async def test_reader_writer_restore(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "restore_backup",
+        "reason": None,
         "stage": None,
         "state": "in_progress",
     }
@@ -1320,7 +1953,100 @@ async def test_reader_writer_restore(
             background=True,
             folders=None,
             homeassistant=True,
-            location=None,
+            location=LOCATION_LOCAL_STORAGE,
+            password=None,
+        ),
+    )
+
+    for event in supervisor_events:
+        await client.send_json_auto_id({"type": "supervisor/event", "data": event})
+        response = await client.receive_json()
+        assert response["success"]
+
+    response = await client.receive_json()
+    assert response["event"] == {
+        "manager_state": "restore_backup",
+        "reason": None,
+        "stage": None,
+        "state": "completed",
+    }
+
+    response = await client.receive_json()
+    assert response["event"] == {"manager_state": "idle"}
+
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] is None
+
+
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
+async def test_reader_writer_restore_remote_backup(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    supervisor_client: AsyncMock,
+) -> None:
+    """Test restoring a backup from a remote agent."""
+    client = await hass_ws_client(hass)
+    supervisor_client.backups.partial_restore.return_value.job_id = UUID(TEST_JOB_ID)
+    supervisor_client.backups.list.return_value = [TEST_BACKUP_5]
+    supervisor_client.backups.backup_info.return_value = TEST_BACKUP_DETAILS_5
+    supervisor_client.jobs.get_job.return_value = TEST_JOB_NOT_DONE
+
+    backup_id = "abc123"
+    test_backup = AgentBackup(
+        addons=[AddonInfo(name="Test", slug="test", version="1.0.0")],
+        backup_id=backup_id,
+        database_included=True,
+        date="1970-01-01T00:00:00.000Z",
+        extra_metadata={},
+        folders=[Folder.MEDIA, Folder.SHARE],
+        homeassistant_included=True,
+        homeassistant_version="2024.12.0",
+        name="Test",
+        protected=False,
+        size=0,
+    )
+    remote_agent = mock_backup_agent("remote", backups=[test_backup])
+    await _setup_backup_platform(
+        hass,
+        domain="test",
+        platform=Mock(
+            async_get_backup_agents=AsyncMock(return_value=[remote_agent]),
+            spec_set=BackupAgentPlatformProtocol,
+        ),
+    )
+
+    await client.send_json_auto_id({"type": "backup/subscribe_events"})
+    response = await client.receive_json()
+    assert response["event"] == {
+        "manager_state": "idle",
+    }
+    response = await client.receive_json()
+    assert response["success"]
+
+    await client.send_json_auto_id(
+        {"type": "backup/restore", "agent_id": "test.remote", "backup_id": backup_id}
+    )
+    response = await client.receive_json()
+    assert response["event"] == {
+        "manager_state": "restore_backup",
+        "reason": None,
+        "stage": None,
+        "state": "in_progress",
+    }
+
+    remote_agent.async_download_backup.assert_called_once_with(backup_id)
+    assert len(remote_agent.async_get_backup.mock_calls) == 2
+    for call in remote_agent.async_get_backup.mock_calls:
+        assert call.args[0] == backup_id
+    supervisor_client.backups.partial_restore.assert_called_once_with(
+        backup_id,
+        supervisor_backups.PartialRestoreOptions(
+            addons=None,
+            background=True,
+            folders=None,
+            homeassistant=True,
+            location=LOCATION_CLOUD_BACKUP,
             password=None,
         ),
     )
@@ -1328,10 +2054,7 @@ async def test_reader_writer_restore(
     await client.send_json_auto_id(
         {
             "type": "supervisor/event",
-            "data": {
-                "event": "job",
-                "data": {"done": True, "uuid": "abc123"},
-            },
+            "data": {"event": "job", "data": {"done": True, "uuid": TEST_JOB_ID}},
         }
     )
     response = await client.receive_json()
@@ -1340,6 +2063,110 @@ async def test_reader_writer_restore(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "restore_backup",
+        "reason": None,
+        "stage": None,
+        "state": "completed",
+    }
+
+    response = await client.receive_json()
+    assert response["event"] == {"manager_state": "idle"}
+
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] is None
+
+
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
+async def test_reader_writer_restore_report_progress(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    supervisor_client: AsyncMock,
+) -> None:
+    """Test restoring a backup."""
+    client = await hass_ws_client(hass)
+    supervisor_client.backups.partial_restore.return_value.job_id = UUID(TEST_JOB_ID)
+    supervisor_client.backups.list.return_value = [TEST_BACKUP]
+    supervisor_client.backups.backup_info.return_value = TEST_BACKUP_DETAILS
+    supervisor_client.jobs.get_job.return_value = TEST_JOB_NOT_DONE
+
+    await client.send_json_auto_id({"type": "backup/subscribe_events"})
+    response = await client.receive_json()
+    assert response["event"] == {
+        "manager_state": "idle",
+    }
+    response = await client.receive_json()
+    assert response["success"]
+
+    await client.send_json_auto_id(
+        {"type": "backup/restore", "agent_id": "hassio.local", "backup_id": "abc123"}
+    )
+    response = await client.receive_json()
+    assert response["event"] == {
+        "manager_state": "restore_backup",
+        "reason": None,
+        "stage": None,
+        "state": "in_progress",
+    }
+
+    supervisor_client.backups.partial_restore.assert_called_once_with(
+        "abc123",
+        supervisor_backups.PartialRestoreOptions(
+            addons=None,
+            background=True,
+            folders=None,
+            homeassistant=True,
+            location=LOCATION_LOCAL_STORAGE,
+            password=None,
+        ),
+    )
+
+    supervisor_event_base = {"uuid": TEST_JOB_ID, "reference": "test_slug"}
+    supervisor_events = [
+        supervisor_event_base | {"done": False, "stage": "addon_repositories"},
+        supervisor_event_base | {"done": False, "stage": None},  # Will be skipped
+        supervisor_event_base | {"done": False, "stage": "unknown"},  # Will be skipped
+        supervisor_event_base | {"done": False, "stage": "home_assistant"},
+        supervisor_event_base | {"done": True, "stage": "addons"},
+    ]
+    expected_manager_events = [
+        "addon_repositories",
+        "home_assistant",
+        "addons",
+    ]
+
+    for supervisor_event in supervisor_events:
+        await client.send_json_auto_id(
+            {
+                "type": "supervisor/event",
+                "data": {"event": "job", "data": supervisor_event},
+            }
+        )
+
+    acks = 0
+    events = []
+    for _ in range(len(supervisor_events) + len(expected_manager_events)):
+        response = await client.receive_json()
+        if "event" in response:
+            events.append(response)
+            continue
+        assert response["success"]
+        acks += 1
+
+    assert acks == len(supervisor_events)
+    assert len(events) == len(expected_manager_events)
+
+    for i, event in enumerate(events):
+        assert event["event"] == {
+            "manager_state": "restore_backup",
+            "reason": None,
+            "stage": expected_manager_events[i],
+            "state": "in_progress",
+        }
+
+    response = await client.receive_json()
+    assert response["event"] == {
+        "manager_state": "restore_backup",
+        "reason": None,
         "stage": None,
         "state": "completed",
     }
@@ -1353,31 +2180,36 @@ async def test_reader_writer_restore(
 
 
 @pytest.mark.parametrize(
-    ("supervisor_error_string", "expected_error_code"),
+    ("supervisor_error", "expected_error_code", "expected_reason"),
     [
         (
-            "Invalid password for backup",
+            SupervisorBadRequestError("Invalid password for backup"),
+            "password_incorrect",
             "password_incorrect",
         ),
         (
-            "Backup was made on supervisor version 2025.12.0, can't restore on 2024.12.0. Must update supervisor first.",
+            SupervisorBadRequestError(
+                "Backup was made on supervisor version 2025.12.0, can't "
+                "restore on 2024.12.0. Must update supervisor first."
+            ),
             "home_assistant_error",
+            "unknown_error",
         ),
+        (SupervisorNotFoundError(), "backup_not_found", "backup_not_found"),
     ],
 )
-@pytest.mark.usefixtures("hassio_client", "setup_integration")
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
 async def test_reader_writer_restore_error(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
     supervisor_client: AsyncMock,
-    supervisor_error_string: str,
+    supervisor_error: Exception,
     expected_error_code: str,
+    expected_reason: str,
 ) -> None:
     """Test restoring a backup."""
     client = await hass_ws_client(hass)
-    supervisor_client.backups.partial_restore.side_effect = SupervisorBadRequestError(
-        supervisor_error_string
-    )
+    supervisor_client.backups.partial_restore.side_effect = supervisor_error
     supervisor_client.backups.list.return_value = [TEST_BACKUP]
     supervisor_client.backups.backup_info.return_value = TEST_BACKUP_DETAILS
 
@@ -1393,6 +2225,7 @@ async def test_reader_writer_restore_error(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "restore_backup",
+        "reason": None,
         "stage": None,
         "state": "in_progress",
     }
@@ -1404,7 +2237,7 @@ async def test_reader_writer_restore_error(
             background=True,
             folders=None,
             homeassistant=True,
-            location=None,
+            location=LOCATION_LOCAL_STORAGE,
             password=None,
         ),
     )
@@ -1412,6 +2245,7 @@ async def test_reader_writer_restore_error(
     response = await client.receive_json()
     assert response["event"] == {
         "manager_state": "restore_backup",
+        "reason": expected_reason,
         "stage": None,
         "state": "failed",
     }
@@ -1423,6 +2257,97 @@ async def test_reader_writer_restore_error(
     assert response["error"]["code"] == expected_error_code
 
 
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
+async def test_reader_writer_restore_late_error(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    supervisor_client: AsyncMock,
+) -> None:
+    """Test restoring a backup with error."""
+    client = await hass_ws_client(hass)
+    supervisor_client.backups.partial_restore.return_value.job_id = UUID(TEST_JOB_ID)
+    supervisor_client.backups.list.return_value = [TEST_BACKUP]
+    supervisor_client.backups.backup_info.return_value = TEST_BACKUP_DETAILS
+    supervisor_client.jobs.get_job.return_value = TEST_JOB_NOT_DONE
+
+    await client.send_json_auto_id({"type": "backup/subscribe_events"})
+    response = await client.receive_json()
+    assert response["event"] == {"manager_state": "idle"}
+    response = await client.receive_json()
+    assert response["success"]
+
+    await client.send_json_auto_id(
+        {"type": "backup/restore", "agent_id": "hassio.local", "backup_id": "abc123"}
+    )
+    response = await client.receive_json()
+    assert response["event"] == {
+        "manager_state": "restore_backup",
+        "reason": None,
+        "stage": None,
+        "state": "in_progress",
+    }
+
+    supervisor_client.backups.partial_restore.assert_called_once_with(
+        "abc123",
+        supervisor_backups.PartialRestoreOptions(
+            addons=None,
+            background=True,
+            folders=None,
+            homeassistant=True,
+            location=LOCATION_LOCAL_STORAGE,
+            password=None,
+        ),
+    )
+
+    event = {
+        "event": "job",
+        "data": {
+            "name": "backup_manager_partial_restore",
+            "reference": "7c54aeed",
+            "uuid": TEST_JOB_ID,
+            "progress": 0,
+            "stage": None,
+            "done": True,
+            "parent_id": None,
+            "errors": [
+                {
+                    "type": "BackupInvalidError",
+                    "message": (
+                        "Backup was made on supervisor version 2025.02.2.dev3105, can't"
+                        " restore on 2025.01.2.dev3105. Must update supervisor first."
+                    ),
+                }
+            ],
+            "created": "2025-02-03T08:27:49.297997+00:00",
+        },
+    }
+    await client.send_json_auto_id({"type": "supervisor/event", "data": event})
+    response = await client.receive_json()
+    assert response["success"]
+
+    response = await client.receive_json()
+    assert response["event"] == {
+        "manager_state": "restore_backup",
+        "reason": "backup_reader_writer_error",
+        "stage": None,
+        "state": "failed",
+    }
+
+    response = await client.receive_json()
+    assert response["event"] == {"manager_state": "idle"}
+
+    response = await client.receive_json()
+    assert not response["success"]
+    assert response["error"] == {
+        "code": "home_assistant_error",
+        "message": (
+            "Restore failed: [{'type': 'BackupInvalidError', 'message': \"Backup "
+            "was made on supervisor version 2025.02.2.dev3105, can't restore on "
+            '2025.01.2.dev3105. Must update supervisor first."}]'
+        ),
+    }
+
+
 @pytest.mark.parametrize(
     ("backup", "backup_details", "parameters", "expected_error"),
     [
@@ -1446,7 +2371,7 @@ async def test_reader_writer_restore_error(
         ),
     ],
 )
-@pytest.mark.usefixtures("hassio_client", "setup_integration")
+@pytest.mark.usefixtures("hassio_client", "setup_backup_integration")
 async def test_reader_writer_restore_wrong_parameters(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
@@ -1474,3 +2399,253 @@ async def test_reader_writer_restore_wrong_parameters(
         "code": "home_assistant_error",
         "message": expected_error,
     }
+
+
+@pytest.mark.parametrize(
+    ("get_job_result", "last_action_event"),
+    [
+        (
+            TEST_JOB_DONE,
+            {
+                "manager_state": "restore_backup",
+                "reason": None,
+                "stage": None,
+                "state": "completed",
+            },
+        ),
+        (
+            TEST_RESTORE_JOB_DONE_WITH_ERROR,
+            {
+                "manager_state": "restore_backup",
+                "reason": "unknown_error",
+                "stage": None,
+                "state": "failed",
+            },
+        ),
+    ],
+)
+@pytest.mark.usefixtures("hassio_client")
+async def test_restore_progress_after_restart(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    supervisor_client: AsyncMock,
+    get_job_result: supervisor_jobs.Job,
+    last_action_event: dict[str, Any],
+) -> None:
+    """Test restore backup progress after restart."""
+
+    supervisor_client.jobs.get_job.return_value = get_job_result
+
+    async_initialize_backup(hass)
+    with patch.dict(os.environ, MOCK_ENVIRON | {RESTORE_JOB_ID_ENV: TEST_JOB_ID}):
+        assert await async_setup_component(hass, BACKUP_DOMAIN, {BACKUP_DOMAIN: {}})
+
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id({"type": "backup/info"})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"]["last_action_event"] == last_action_event
+    assert response["result"]["state"] == "idle"
+
+
+@pytest.mark.usefixtures("hassio_client")
+async def test_restore_progress_after_restart_report_progress(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    supervisor_client: AsyncMock,
+) -> None:
+    """Test restore backup progress after restart."""
+
+    supervisor_client.jobs.get_job.return_value = TEST_JOB_NOT_DONE
+
+    async_initialize_backup(hass)
+    with patch.dict(os.environ, MOCK_ENVIRON | {RESTORE_JOB_ID_ENV: TEST_JOB_ID}):
+        assert await async_setup_component(hass, BACKUP_DOMAIN, {BACKUP_DOMAIN: {}})
+
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id({"type": "backup/subscribe_events"})
+    response = await client.receive_json()
+    assert response["event"] == {
+        "manager_state": "restore_backup",
+        "reason": None,
+        "stage": None,
+        "state": "in_progress",
+    }
+    response = await client.receive_json()
+    assert response["success"]
+
+    supervisor_event_base = {"uuid": TEST_JOB_ID, "reference": "test_slug"}
+    supervisor_events = [
+        supervisor_event_base | {"done": False, "stage": "addon_repositories"},
+        supervisor_event_base | {"done": False, "stage": None},  # Will be skipped
+        supervisor_event_base | {"done": False, "stage": "unknown"},  # Will be skipped
+        supervisor_event_base | {"done": False, "stage": "home_assistant"},
+        supervisor_event_base | {"done": True, "stage": "addons"},
+    ]
+    expected_manager_events = ["addon_repositories", "home_assistant", "addons"]
+    expected_manager_states = ["in_progress", "in_progress", "completed"]
+
+    for supervisor_event in supervisor_events:
+        await client.send_json_auto_id(
+            {
+                "type": "supervisor/event",
+                "data": {"event": "job", "data": supervisor_event},
+            }
+        )
+
+    acks = 0
+    events = []
+    for _ in range(len(supervisor_events) + len(expected_manager_events)):
+        response = await client.receive_json()
+        if "event" in response:
+            events.append(response)
+            continue
+        assert response["success"]
+        acks += 1
+
+    assert acks == len(supervisor_events)
+    assert len(events) == len(expected_manager_events)
+
+    for i, event in enumerate(events):
+        assert event["event"] == {
+            "manager_state": "restore_backup",
+            "reason": None,
+            "stage": expected_manager_events[i],
+            "state": expected_manager_states[i],
+        }
+
+    response = await client.receive_json()
+    assert response["event"] == {"manager_state": "idle"}
+
+    await client.send_json_auto_id({"type": "backup/info"})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"]["last_action_event"] == {
+        "manager_state": "restore_backup",
+        "reason": None,
+        "stage": "addons",
+        "state": "completed",
+    }
+    assert response["result"]["state"] == "idle"
+
+
+@pytest.mark.usefixtures("hassio_client")
+async def test_restore_progress_after_restart_unknown_job(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    supervisor_client: AsyncMock,
+) -> None:
+    """Test restore backup progress after restart."""
+
+    supervisor_client.jobs.get_job.side_effect = SupervisorError
+
+    async_initialize_backup(hass)
+    with patch.dict(os.environ, MOCK_ENVIRON | {RESTORE_JOB_ID_ENV: TEST_JOB_ID}):
+        assert await async_setup_component(hass, BACKUP_DOMAIN, {BACKUP_DOMAIN: {}})
+
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id({"type": "backup/info"})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"]["last_action_event"] is None
+    assert response["result"]["state"] == "idle"
+
+
+@pytest.mark.parametrize(
+    "storage_data",
+    [
+        {},
+        {
+            "backup": {
+                "data": {
+                    "backups": [],
+                    "config": {
+                        "agents": {},
+                        "automatic_backups_configured": True,
+                        "create_backup": {
+                            "agent_ids": ["test-agent1", "hassio.local", "test-agent2"],
+                            "include_addons": ["addon1", "addon2"],
+                            "include_all_addons": True,
+                            "include_database": True,
+                            "include_folders": ["media", "share"],
+                            "name": None,
+                            "password": None,
+                        },
+                        "retention": {"copies": None, "days": None},
+                        "last_attempted_automatic_backup": None,
+                        "last_completed_automatic_backup": None,
+                        "schedule": {
+                            "days": [],
+                            "recurrence": "never",
+                            "state": "never",
+                            "time": None,
+                        },
+                    },
+                },
+                "key": DOMAIN,
+                "version": backup_store.STORAGE_VERSION,
+                "minor_version": backup_store.STORAGE_VERSION_MINOR,
+            },
+        },
+        {
+            "backup": {
+                "data": {
+                    "backups": [],
+                    "config": {
+                        "agents": {},
+                        "automatic_backups_configured": True,
+                        "create_backup": {
+                            "agent_ids": ["test-agent1", "backup.local", "test-agent2"],
+                            "include_addons": ["addon1", "addon2"],
+                            "include_all_addons": False,
+                            "include_database": True,
+                            "include_folders": ["media", "share"],
+                            "name": None,
+                            "password": None,
+                        },
+                        "retention": {"copies": None, "days": None},
+                        "last_attempted_automatic_backup": None,
+                        "last_completed_automatic_backup": None,
+                        "schedule": {
+                            "days": [],
+                            "recurrence": "never",
+                            "state": "never",
+                            "time": None,
+                        },
+                    },
+                },
+                "key": DOMAIN,
+                "version": backup_store.STORAGE_VERSION,
+                "minor_version": backup_store.STORAGE_VERSION_MINOR,
+            },
+        },
+    ],
+)
+@pytest.mark.usefixtures("hassio_client")
+async def test_config_load_config_info(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    freezer: FrozenDateTimeFactory,
+    snapshot: SnapshotAssertion,
+    hass_storage: dict[str, Any],
+    storage_data: dict[str, Any],
+) -> None:
+    """Test loading stored backup config and reading it via config/info."""
+    client = await hass_ws_client(hass)
+    await hass.config.async_set_time_zone("Europe/Amsterdam")
+    freezer.move_to("2024-11-13T12:01:00+01:00")
+
+    hass_storage.update(storage_data)
+
+    async_initialize_backup(hass)
+    assert await async_setup_component(hass, BACKUP_DOMAIN, {BACKUP_DOMAIN: {}})
+    await hass.async_block_till_done()
+
+    await client.send_json_auto_id({"type": "backup/config/info"})
+    assert await client.receive_json() == snapshot
diff --git a/tests/components/hassio/test_repairs.py b/tests/components/hassio/test_repairs.py
index f8cac4e1a97..4c4f0e24dcc 100644
--- a/tests/components/hassio/test_repairs.py
+++ b/tests/components/hassio/test_repairs.py
@@ -17,7 +17,7 @@ from aiohasupervisor.models import (
 import pytest
 
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.issue_registry as ir
+from homeassistant.helpers import issue_registry as ir
 from homeassistant.setup import async_setup_component
 
 from .test_init import MOCK_ENVIRON
diff --git a/tests/components/hassio/test_sensor.py b/tests/components/hassio/test_sensor.py
index 7160a2cbf16..f4b01a85900 100644
--- a/tests/components/hassio/test_sensor.py
+++ b/tests/components/hassio/test_sensor.py
@@ -16,7 +16,7 @@ from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import MOCK_REPOSITORIES, MOCK_STORE_ADDONS
 
diff --git a/tests/components/hassio/test_update.py b/tests/components/hassio/test_update.py
index c1775d6e0b4..a3718454538 100644
--- a/tests/components/hassio/test_update.py
+++ b/tests/components/hassio/test_update.py
@@ -2,18 +2,25 @@
 
 from datetime import timedelta
 import os
-from unittest.mock import AsyncMock, patch
+from typing import Any
+from unittest.mock import AsyncMock, MagicMock, patch
 
 from aiohasupervisor import SupervisorBadRequestError, SupervisorError
-from aiohasupervisor.models import StoreAddonUpdate
+from aiohasupervisor.models import HomeAssistantUpdateOptions, StoreAddonUpdate
 import pytest
 
+from homeassistant.components.backup import BackupManagerError, ManagerBackup
+
+# pylint: disable-next=hass-component-root-import
+from homeassistant.components.backup.manager import AgentBackupStatus
 from homeassistant.components.hassio import DOMAIN
 from homeassistant.components.hassio.const import REQUEST_REFRESH_DELAY
+from homeassistant.const import __version__ as HAVERSION
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.backup import async_initialize_backup
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 from tests.test_util.aiohttp import AiohttpClientMocker
@@ -216,12 +223,240 @@ async def test_update_addon(hass: HomeAssistant, update_addon: AsyncMock) -> Non
         assert result
     await hass.async_block_till_done()
 
-    await hass.services.async_call(
-        "update",
-        "install",
-        {"entity_id": "update.test_update"},
-        blocking=True,
+    with patch(
+        "homeassistant.components.backup.manager.BackupManager.async_create_backup",
+    ) as mock_create_backup:
+        await hass.services.async_call(
+            "update",
+            "install",
+            {"entity_id": "update.test_update"},
+            blocking=True,
+        )
+    mock_create_backup.assert_not_called()
+    update_addon.assert_called_once_with("test", StoreAddonUpdate(backup=False))
+
+
+async def setup_backup_integration(hass: HomeAssistant) -> None:
+    """Set up the backup integration."""
+    async_initialize_backup(hass)
+    assert await async_setup_component(hass, "backup", {})
+    await hass.async_block_till_done()
+
+
+@pytest.mark.parametrize(
+    ("commands", "default_mount", "expected_kwargs"),
+    [
+        (
+            [],
+            None,
+            {
+                "agent_ids": ["hassio.local"],
+                "extra_metadata": {"supervisor.addon_update": "test"},
+                "include_addons": ["test"],
+                "include_all_addons": False,
+                "include_database": False,
+                "include_folders": None,
+                "include_homeassistant": False,
+                "name": "test 2.0.0",
+                "password": None,
+            },
+        ),
+        (
+            [],
+            "my_nas",
+            {
+                "agent_ids": ["hassio.my_nas"],
+                "extra_metadata": {"supervisor.addon_update": "test"},
+                "include_addons": ["test"],
+                "include_all_addons": False,
+                "include_database": False,
+                "include_folders": None,
+                "include_homeassistant": False,
+                "name": "test 2.0.0",
+                "password": None,
+            },
+        ),
+        (
+            [
+                {
+                    "type": "backup/config/update",
+                    "create_backup": {
+                        "agent_ids": ["test-agent"],
+                        "include_addons": ["my-addon"],
+                        "include_all_addons": True,
+                        "include_database": False,
+                        "include_folders": ["share"],
+                        "name": "cool_backup",
+                        "password": "hunter2",
+                    },
+                },
+            ],
+            None,
+            {
+                "agent_ids": ["hassio.local"],
+                "extra_metadata": {"supervisor.addon_update": "test"},
+                "include_addons": ["test"],
+                "include_all_addons": False,
+                "include_database": False,
+                "include_folders": None,
+                "include_homeassistant": False,
+                "name": "test 2.0.0",
+                "password": "hunter2",
+            },
+        ),
+    ],
+)
+async def test_update_addon_with_backup(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    supervisor_client: AsyncMock,
+    update_addon: AsyncMock,
+    commands: list[dict[str, Any]],
+    default_mount: str | None,
+    expected_kwargs: dict[str, Any],
+) -> None:
+    """Test updating addon update entity."""
+    config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
+    config_entry.add_to_hass(hass)
+
+    with patch.dict(os.environ, MOCK_ENVIRON):
+        result = await async_setup_component(
+            hass,
+            "hassio",
+            {"http": {"server_port": 9999, "server_host": "127.0.0.1"}, "hassio": {}},
+        )
+        assert result
+    await setup_backup_integration(hass)
+
+    client = await hass_ws_client(hass)
+    for command in commands:
+        await client.send_json_auto_id(command)
+        result = await client.receive_json()
+        assert result["success"]
+
+    supervisor_client.mounts.info.return_value.default_backup_mount = default_mount
+    with patch(
+        "homeassistant.components.backup.manager.BackupManager.async_create_backup",
+    ) as mock_create_backup:
+        await hass.services.async_call(
+            "update",
+            "install",
+            {"entity_id": "update.test_update", "backup": True},
+            blocking=True,
+        )
+    mock_create_backup.assert_called_once_with(**expected_kwargs)
+    update_addon.assert_called_once_with("test", StoreAddonUpdate(backup=False))
+
+
+@pytest.mark.parametrize(
+    ("backups", "removed_backups"),
+    [
+        (
+            {},
+            [],
+        ),
+        (
+            {
+                "backup-1": MagicMock(
+                    agents={"hassio.local": MagicMock(spec=AgentBackupStatus)},
+                    date="2024-11-10T04:45:00+01:00",
+                    with_automatic_settings=True,
+                    spec=ManagerBackup,
+                ),
+                "backup-2": MagicMock(
+                    agents={"hassio.local": MagicMock(spec=AgentBackupStatus)},
+                    date="2024-11-11T04:45:00+01:00",
+                    with_automatic_settings=False,
+                    spec=ManagerBackup,
+                ),
+                "backup-3": MagicMock(
+                    agents={"hassio.local": MagicMock(spec=AgentBackupStatus)},
+                    date="2024-11-11T04:45:00+01:00",
+                    extra_metadata={"supervisor.addon_update": "other"},
+                    with_automatic_settings=True,
+                    spec=ManagerBackup,
+                ),
+                "backup-4": MagicMock(
+                    agents={"hassio.local": MagicMock(spec=AgentBackupStatus)},
+                    date="2024-11-11T04:45:00+01:00",
+                    extra_metadata={"supervisor.addon_update": "other"},
+                    with_automatic_settings=True,
+                    spec=ManagerBackup,
+                ),
+                "backup-5": MagicMock(
+                    agents={"hassio.local": MagicMock(spec=AgentBackupStatus)},
+                    date="2024-11-11T04:45:00+01:00",
+                    extra_metadata={"supervisor.addon_update": "test"},
+                    with_automatic_settings=True,
+                    spec=ManagerBackup,
+                ),
+                "backup-6": MagicMock(
+                    agents={"hassio.local": MagicMock(spec=AgentBackupStatus)},
+                    date="2024-11-12T04:45:00+01:00",
+                    extra_metadata={"supervisor.addon_update": "test"},
+                    with_automatic_settings=True,
+                    spec=ManagerBackup,
+                ),
+            },
+            ["backup-5"],
+        ),
+    ],
+)
+async def test_update_addon_with_backup_removes_old_backups(
+    hass: HomeAssistant,
+    supervisor_client: AsyncMock,
+    update_addon: AsyncMock,
+    backups: dict[str, ManagerBackup],
+    removed_backups: list[str],
+) -> None:
+    """Test updating addon update entity."""
+    config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
+    config_entry.add_to_hass(hass)
+
+    with patch.dict(os.environ, MOCK_ENVIRON):
+        result = await async_setup_component(
+            hass,
+            "hassio",
+            {"http": {"server_port": 9999, "server_host": "127.0.0.1"}, "hassio": {}},
+        )
+        assert result
+    await setup_backup_integration(hass)
+
+    supervisor_client.mounts.info.return_value.default_backup_mount = None
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_create_backup",
+        ) as mock_create_backup,
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_delete_backup",
+            autospec=True,
+            return_value={},
+        ) as async_delete_backup,
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_get_backups",
+            return_value=(backups, {}),
+        ),
+    ):
+        await hass.services.async_call(
+            "update",
+            "install",
+            {"entity_id": "update.test_update", "backup": True},
+            blocking=True,
+        )
+    mock_create_backup.assert_called_once_with(
+        agent_ids=["hassio.local"],
+        extra_metadata={"supervisor.addon_update": "test"},
+        include_addons=["test"],
+        include_all_addons=False,
+        include_database=False,
+        include_folders=None,
+        include_homeassistant=False,
+        name="test 2.0.0",
+        password=None,
     )
+    assert len(async_delete_backup.mock_calls) == len(removed_backups)
+    for call in async_delete_backup.mock_calls:
+        assert call.args[1] in removed_backups
     update_addon.assert_called_once_with("test", StoreAddonUpdate(backup=False))
 
 
@@ -264,13 +499,124 @@ async def test_update_core(hass: HomeAssistant, supervisor_client: AsyncMock) ->
     await hass.async_block_till_done()
 
     supervisor_client.homeassistant.update.return_value = None
-    await hass.services.async_call(
-        "update",
-        "install",
-        {"entity_id": "update.home_assistant_core_update"},
-        blocking=True,
+    with patch(
+        "homeassistant.components.backup.manager.BackupManager.async_create_backup",
+    ) as mock_create_backup:
+        await hass.services.async_call(
+            "update",
+            "install",
+            {"entity_id": "update.home_assistant_core_update"},
+            blocking=True,
+        )
+    mock_create_backup.assert_not_called()
+    supervisor_client.homeassistant.update.assert_called_once_with(
+        HomeAssistantUpdateOptions(version=None, backup=False)
+    )
+
+
+@pytest.mark.parametrize(
+    ("commands", "default_mount", "expected_kwargs"),
+    [
+        (
+            [],
+            None,
+            {
+                "agent_ids": ["hassio.local"],
+                "include_addons": None,
+                "include_all_addons": False,
+                "include_database": True,
+                "include_folders": None,
+                "include_homeassistant": True,
+                "name": f"Home Assistant Core {HAVERSION}",
+                "password": None,
+            },
+        ),
+        (
+            [],
+            "my_nas",
+            {
+                "agent_ids": ["hassio.my_nas"],
+                "include_addons": None,
+                "include_all_addons": False,
+                "include_database": True,
+                "include_folders": None,
+                "include_homeassistant": True,
+                "name": f"Home Assistant Core {HAVERSION}",
+                "password": None,
+            },
+        ),
+        (
+            [
+                {
+                    "type": "backup/config/update",
+                    "create_backup": {
+                        "agent_ids": ["test-agent"],
+                        "include_addons": ["my-addon"],
+                        "include_all_addons": True,
+                        "include_database": False,
+                        "include_folders": ["share"],
+                        "name": "cool_backup",
+                        "password": "hunter2",
+                    },
+                },
+            ],
+            None,
+            {
+                "agent_ids": ["test-agent"],
+                "include_addons": ["my-addon"],
+                "include_all_addons": True,
+                "include_database": False,
+                "include_folders": ["share"],
+                "include_homeassistant": True,
+                "name": "cool_backup",
+                "password": "hunter2",
+                "with_automatic_settings": True,
+            },
+        ),
+    ],
+)
+async def test_update_core_with_backup(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    supervisor_client: AsyncMock,
+    commands: list[dict[str, Any]],
+    default_mount: str | None,
+    expected_kwargs: dict[str, Any],
+) -> None:
+    """Test updating core update entity."""
+    config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
+    config_entry.add_to_hass(hass)
+
+    with patch.dict(os.environ, MOCK_ENVIRON):
+        result = await async_setup_component(
+            hass,
+            "hassio",
+            {"http": {"server_port": 9999, "server_host": "127.0.0.1"}, "hassio": {}},
+        )
+        assert result
+    await setup_backup_integration(hass)
+
+    client = await hass_ws_client(hass)
+    for command in commands:
+        await client.send_json_auto_id(command)
+        result = await client.receive_json()
+        assert result["success"]
+
+    supervisor_client.homeassistant.update.return_value = None
+    supervisor_client.mounts.info.return_value.default_backup_mount = default_mount
+    with patch(
+        "homeassistant.components.backup.manager.BackupManager.async_create_backup",
+    ) as mock_create_backup:
+        await hass.services.async_call(
+            "update",
+            "install",
+            {"entity_id": "update.home_assistant_core_update", "backup": True},
+            blocking=True,
+        )
+    mock_create_backup.assert_called_once_with(**expected_kwargs)
+    supervisor_client.homeassistant.update.assert_called_once_with(
+        HomeAssistantUpdateOptions(version=None, backup=False)
     )
-    supervisor_client.homeassistant.update.assert_called_once()
 
 
 async def test_update_supervisor(
@@ -325,6 +671,54 @@ async def test_update_addon_with_error(
         )
 
 
+@pytest.mark.parametrize(
+    ("create_backup_error", "delete_filtered_backups_error", "message"),
+    [
+        (BackupManagerError, None, r"^Error creating backup: "),
+        (None, BackupManagerError, r"^Error deleting old backups: "),
+    ],
+)
+async def test_update_addon_with_backup_and_error(
+    hass: HomeAssistant,
+    supervisor_client: AsyncMock,
+    create_backup_error: Exception | None,
+    delete_filtered_backups_error: Exception | None,
+    message: str,
+) -> None:
+    """Test updating addon update entity with error."""
+    config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
+    config_entry.add_to_hass(hass)
+
+    with patch.dict(os.environ, MOCK_ENVIRON):
+        result = await async_setup_component(
+            hass,
+            "hassio",
+            {"http": {"server_port": 9999, "server_host": "127.0.0.1"}, "hassio": {}},
+        )
+        assert result
+    await setup_backup_integration(hass)
+
+    supervisor_client.homeassistant.update.return_value = None
+    supervisor_client.mounts.info.return_value.default_backup_mount = None
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_create_backup",
+            side_effect=create_backup_error,
+        ),
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_delete_filtered_backups",
+            side_effect=delete_filtered_backups_error,
+        ),
+        pytest.raises(HomeAssistantError, match=message),
+    ):
+        assert not await hass.services.async_call(
+            "update",
+            "install",
+            {"entity_id": "update.test_update", "backup": True},
+            blocking=True,
+        )
+
+
 async def test_update_os_with_error(
     hass: HomeAssistant, supervisor_client: AsyncMock
 ) -> None:
@@ -406,6 +800,40 @@ async def test_update_core_with_error(
         )
 
 
+async def test_update_core_with_backup_and_error(
+    hass: HomeAssistant,
+    supervisor_client: AsyncMock,
+) -> None:
+    """Test updating core update entity with error."""
+    config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
+    config_entry.add_to_hass(hass)
+
+    with patch.dict(os.environ, MOCK_ENVIRON):
+        result = await async_setup_component(
+            hass,
+            "hassio",
+            {"http": {"server_port": 9999, "server_host": "127.0.0.1"}, "hassio": {}},
+        )
+        assert result
+    await setup_backup_integration(hass)
+
+    supervisor_client.homeassistant.update.return_value = None
+    supervisor_client.mounts.info.return_value.default_backup_mount = None
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_create_backup",
+            side_effect=BackupManagerError,
+        ),
+        pytest.raises(HomeAssistantError, match=r"^Error creating backup:"),
+    ):
+        assert not await hass.services.async_call(
+            "update",
+            "install",
+            {"entity_id": "update.home_assistant_core_update", "backup": True},
+            blocking=True,
+        )
+
+
 async def test_release_notes_between_versions(
     hass: HomeAssistant,
     aioclient_mock: AiohttpClientMocker,
diff --git a/tests/components/hassio/test_websocket_api.py b/tests/components/hassio/test_websocket_api.py
index 21e6b03678b..b695cc1794a 100644
--- a/tests/components/hassio/test_websocket_api.py
+++ b/tests/components/hassio/test_websocket_api.py
@@ -1,9 +1,18 @@
 """Test websocket API."""
 
-from unittest.mock import AsyncMock
+import os
+from typing import Any
+from unittest.mock import AsyncMock, MagicMock, patch
 
+from aiohasupervisor import SupervisorError
+from aiohasupervisor.models import HomeAssistantUpdateOptions, StoreAddonUpdate
 import pytest
 
+from homeassistant.components.backup import BackupManagerError, ManagerBackup
+
+# pylint: disable-next=hass-component-root-import
+from homeassistant.components.backup.manager import AgentBackupStatus
+from homeassistant.components.hassio import DOMAIN
 from homeassistant.components.hassio.const import (
     ATTR_DATA,
     ATTR_ENDPOINT,
@@ -15,14 +24,18 @@ from homeassistant.components.hassio.const import (
     WS_TYPE_API,
     WS_TYPE_SUBSCRIBE,
 )
+from homeassistant.const import __version__ as HAVERSION
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.backup import async_initialize_backup
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.setup import async_setup_component
 
-from tests.common import MockUser, async_mock_signal
+from tests.common import MockConfigEntry, MockUser, async_mock_signal
 from tests.test_util.aiohttp import AiohttpClientMocker
 from tests.typing import WebSocketGenerator
 
+MOCK_ENVIRON = {"SUPERVISOR": "127.0.0.1", "SUPERVISOR_TOKEN": "abcdefgh"}
+
 
 @pytest.fixture(autouse=True)
 def mock_all(
@@ -56,7 +69,7 @@ def mock_all(
     )
     aioclient_mock.get(
         "http://127.0.0.1/core/info",
-        json={"result": "ok", "data": {"version_latest": "1.0.0"}},
+        json={"result": "ok", "data": {"version_latest": "1.0.0", "version": "1.0.0"}},
     )
     aioclient_mock.get(
         "http://127.0.0.1/os/info",
@@ -64,11 +77,42 @@ def mock_all(
     )
     aioclient_mock.get(
         "http://127.0.0.1/supervisor/info",
-        json={"result": "ok", "data": {"version_latest": "1.0.0"}},
+        json={
+            "result": "ok",
+            "data": {
+                "version": "1.0.0",
+                "version_latest": "1.0.0",
+                "auto_update": True,
+                "addons": [
+                    {
+                        "name": "test",
+                        "state": "started",
+                        "slug": "test",
+                        "installed": True,
+                        "update_available": True,
+                        "icon": False,
+                        "version": "2.0.0",
+                        "version_latest": "2.0.1",
+                        "repository": "core",
+                        "url": "https://github.com/home-assistant/addons/test",
+                    },
+                ],
+            },
+        },
     )
     aioclient_mock.get(
         "http://127.0.0.1/ingress/panels", json={"result": "ok", "data": {"panels": {}}}
     )
+    aioclient_mock.get(
+        "http://127.0.0.1/network/info",
+        json={
+            "result": "ok",
+            "data": {
+                "host_internet": True,
+                "supervisor_internet": True,
+            },
+        },
+    )
 
 
 @pytest.mark.usefixtures("hassio_env")
@@ -279,3 +323,537 @@ async def test_websocket_non_admin_user(
 
     msg = await websocket_client.receive_json()
     assert msg["error"]["message"] == "Unauthorized"
+
+
+async def test_update_addon(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    update_addon: AsyncMock,
+) -> None:
+    """Test updating addon."""
+    client = await hass_ws_client(hass)
+    config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
+    config_entry.add_to_hass(hass)
+
+    with patch.dict(os.environ, MOCK_ENVIRON):
+        result = await async_setup_component(
+            hass,
+            "hassio",
+            {"http": {"server_port": 9999, "server_host": "127.0.0.1"}, "hassio": {}},
+        )
+        assert result
+    await hass.async_block_till_done()
+
+    with patch(
+        "homeassistant.components.backup.manager.BackupManager.async_create_backup",
+    ) as mock_create_backup:
+        await client.send_json_auto_id(
+            {"type": "hassio/update/addon", "addon": "test", "backup": False}
+        )
+        result = await client.receive_json()
+        assert result["success"]
+    mock_create_backup.assert_not_called()
+    update_addon.assert_called_once_with("test", StoreAddonUpdate(backup=False))
+
+
+async def setup_backup_integration(hass: HomeAssistant) -> None:
+    """Set up the backup integration."""
+    async_initialize_backup(hass)
+    assert await async_setup_component(hass, "backup", {})
+    await hass.async_block_till_done()
+
+
+@pytest.mark.parametrize(
+    ("commands", "default_mount", "expected_kwargs"),
+    [
+        (
+            [],
+            None,
+            {
+                "agent_ids": ["hassio.local"],
+                "extra_metadata": {"supervisor.addon_update": "test"},
+                "include_addons": ["test"],
+                "include_all_addons": False,
+                "include_database": False,
+                "include_folders": None,
+                "include_homeassistant": False,
+                "name": "test 2.0.0",
+                "password": None,
+            },
+        ),
+        (
+            [],
+            "my_nas",
+            {
+                "agent_ids": ["hassio.my_nas"],
+                "extra_metadata": {"supervisor.addon_update": "test"},
+                "include_addons": ["test"],
+                "include_all_addons": False,
+                "include_database": False,
+                "include_folders": None,
+                "include_homeassistant": False,
+                "name": "test 2.0.0",
+                "password": None,
+            },
+        ),
+        (
+            [
+                {
+                    "type": "backup/config/update",
+                    "create_backup": {
+                        "agent_ids": ["test-agent"],
+                        "include_addons": ["my-addon"],
+                        "include_all_addons": True,
+                        "include_database": False,
+                        "include_folders": ["share"],
+                        "name": "cool_backup",
+                        "password": "hunter2",
+                    },
+                },
+            ],
+            None,
+            {
+                "agent_ids": ["hassio.local"],
+                "extra_metadata": {"supervisor.addon_update": "test"},
+                "include_addons": ["test"],
+                "include_all_addons": False,
+                "include_database": False,
+                "include_folders": None,
+                "include_homeassistant": False,
+                "name": "test 2.0.0",
+                "password": "hunter2",
+            },
+        ),
+    ],
+)
+async def test_update_addon_with_backup(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    supervisor_client: AsyncMock,
+    update_addon: AsyncMock,
+    commands: list[dict[str, Any]],
+    default_mount: str | None,
+    expected_kwargs: dict[str, Any],
+) -> None:
+    """Test updating addon with backup."""
+    config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
+    config_entry.add_to_hass(hass)
+
+    with patch.dict(os.environ, MOCK_ENVIRON):
+        result = await async_setup_component(
+            hass,
+            "hassio",
+            {"http": {"server_port": 9999, "server_host": "127.0.0.1"}, "hassio": {}},
+        )
+        assert result
+    await setup_backup_integration(hass)
+
+    client = await hass_ws_client(hass)
+    for command in commands:
+        await client.send_json_auto_id(command)
+        result = await client.receive_json()
+        assert result["success"]
+
+    supervisor_client.mounts.info.return_value.default_backup_mount = default_mount
+    with patch(
+        "homeassistant.components.backup.manager.BackupManager.async_create_backup",
+    ) as mock_create_backup:
+        await client.send_json_auto_id(
+            {"type": "hassio/update/addon", "addon": "test", "backup": True}
+        )
+        result = await client.receive_json()
+        assert result["success"]
+    mock_create_backup.assert_called_once_with(**expected_kwargs)
+    update_addon.assert_called_once_with("test", StoreAddonUpdate(backup=False))
+
+
+@pytest.mark.parametrize(
+    ("backups", "removed_backups"),
+    [
+        (
+            {},
+            [],
+        ),
+        (
+            {
+                "backup-1": MagicMock(
+                    agents={"hassio.local": MagicMock(spec=AgentBackupStatus)},
+                    date="2024-11-10T04:45:00+01:00",
+                    with_automatic_settings=True,
+                    spec=ManagerBackup,
+                ),
+                "backup-2": MagicMock(
+                    agents={"hassio.local": MagicMock(spec=AgentBackupStatus)},
+                    date="2024-11-11T04:45:00+01:00",
+                    with_automatic_settings=False,
+                    spec=ManagerBackup,
+                ),
+                "backup-3": MagicMock(
+                    agents={"hassio.local": MagicMock(spec=AgentBackupStatus)},
+                    date="2024-11-11T04:45:00+01:00",
+                    extra_metadata={"supervisor.addon_update": "other"},
+                    with_automatic_settings=True,
+                    spec=ManagerBackup,
+                ),
+                "backup-4": MagicMock(
+                    agents={"hassio.local": MagicMock(spec=AgentBackupStatus)},
+                    date="2024-11-11T04:45:00+01:00",
+                    extra_metadata={"supervisor.addon_update": "other"},
+                    with_automatic_settings=True,
+                    spec=ManagerBackup,
+                ),
+                "backup-5": MagicMock(
+                    agents={"hassio.local": MagicMock(spec=AgentBackupStatus)},
+                    date="2024-11-11T04:45:00+01:00",
+                    extra_metadata={"supervisor.addon_update": "test"},
+                    with_automatic_settings=True,
+                    spec=ManagerBackup,
+                ),
+                "backup-6": MagicMock(
+                    agents={"hassio.local": MagicMock(spec=AgentBackupStatus)},
+                    date="2024-11-12T04:45:00+01:00",
+                    extra_metadata={"supervisor.addon_update": "test"},
+                    with_automatic_settings=True,
+                    spec=ManagerBackup,
+                ),
+            },
+            ["backup-5"],
+        ),
+    ],
+)
+async def test_update_addon_with_backup_removes_old_backups(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    supervisor_client: AsyncMock,
+    update_addon: AsyncMock,
+    backups: dict[str, ManagerBackup],
+    removed_backups: list[str],
+) -> None:
+    """Test updating addon update entity."""
+    config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
+    config_entry.add_to_hass(hass)
+
+    with patch.dict(os.environ, MOCK_ENVIRON):
+        result = await async_setup_component(
+            hass,
+            "hassio",
+            {"http": {"server_port": 9999, "server_host": "127.0.0.1"}, "hassio": {}},
+        )
+        assert result
+    await setup_backup_integration(hass)
+
+    client = await hass_ws_client(hass)
+    supervisor_client.mounts.info.return_value.default_backup_mount = None
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_create_backup",
+        ) as mock_create_backup,
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_delete_backup",
+            autospec=True,
+            return_value={},
+        ) as async_delete_backup,
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_get_backups",
+            return_value=(backups, {}),
+        ),
+    ):
+        await client.send_json_auto_id(
+            {"type": "hassio/update/addon", "addon": "test", "backup": True}
+        )
+        result = await client.receive_json()
+        assert result["success"]
+    mock_create_backup.assert_called_once_with(
+        agent_ids=["hassio.local"],
+        extra_metadata={"supervisor.addon_update": "test"},
+        include_addons=["test"],
+        include_all_addons=False,
+        include_database=False,
+        include_folders=None,
+        include_homeassistant=False,
+        name="test 2.0.0",
+        password=None,
+    )
+    assert len(async_delete_backup.mock_calls) == len(removed_backups)
+    for call in async_delete_backup.mock_calls:
+        assert call.args[1] in removed_backups
+    update_addon.assert_called_once_with("test", StoreAddonUpdate(backup=False))
+
+
+async def test_update_core(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    supervisor_client: AsyncMock,
+) -> None:
+    """Test updating core."""
+    client = await hass_ws_client(hass)
+    config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
+    config_entry.add_to_hass(hass)
+
+    with patch.dict(os.environ, MOCK_ENVIRON):
+        result = await async_setup_component(
+            hass,
+            "hassio",
+            {"http": {"server_port": 9999, "server_host": "127.0.0.1"}, "hassio": {}},
+        )
+        assert result
+    await hass.async_block_till_done()
+
+    supervisor_client.homeassistant.update.return_value = None
+    with patch(
+        "homeassistant.components.backup.manager.BackupManager.async_create_backup",
+    ) as mock_create_backup:
+        await client.send_json_auto_id({"type": "hassio/update/core", "backup": False})
+        result = await client.receive_json()
+        assert result["success"]
+    mock_create_backup.assert_not_called()
+    supervisor_client.homeassistant.update.assert_called_once_with(
+        HomeAssistantUpdateOptions(version=None, backup=False)
+    )
+
+
+@pytest.mark.parametrize(
+    ("commands", "default_mount", "expected_kwargs"),
+    [
+        (
+            [],
+            None,
+            {
+                "agent_ids": ["hassio.local"],
+                "include_addons": None,
+                "include_all_addons": False,
+                "include_database": True,
+                "include_folders": None,
+                "include_homeassistant": True,
+                "name": f"Home Assistant Core {HAVERSION}",
+                "password": None,
+            },
+        ),
+        (
+            [],
+            "my_nas",
+            {
+                "agent_ids": ["hassio.my_nas"],
+                "include_addons": None,
+                "include_all_addons": False,
+                "include_database": True,
+                "include_folders": None,
+                "include_homeassistant": True,
+                "name": f"Home Assistant Core {HAVERSION}",
+                "password": None,
+            },
+        ),
+        (
+            [
+                {
+                    "type": "backup/config/update",
+                    "create_backup": {
+                        "agent_ids": ["test-agent"],
+                        "include_addons": ["my-addon"],
+                        "include_all_addons": True,
+                        "include_database": False,
+                        "include_folders": ["share"],
+                        "name": "cool_backup",
+                        "password": "hunter2",
+                    },
+                },
+            ],
+            None,
+            {
+                "agent_ids": ["test-agent"],
+                "include_addons": ["my-addon"],
+                "include_all_addons": True,
+                "include_database": False,
+                "include_folders": ["share"],
+                "include_homeassistant": True,
+                "name": "cool_backup",
+                "password": "hunter2",
+                "with_automatic_settings": True,
+            },
+        ),
+    ],
+)
+async def test_update_core_with_backup(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    supervisor_client: AsyncMock,
+    commands: list[dict[str, Any]],
+    default_mount: str | None,
+    expected_kwargs: dict[str, Any],
+) -> None:
+    """Test updating core with backup."""
+    config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
+    config_entry.add_to_hass(hass)
+
+    with patch.dict(os.environ, MOCK_ENVIRON):
+        result = await async_setup_component(
+            hass,
+            "hassio",
+            {"http": {"server_port": 9999, "server_host": "127.0.0.1"}, "hassio": {}},
+        )
+        assert result
+    await setup_backup_integration(hass)
+
+    client = await hass_ws_client(hass)
+    for command in commands:
+        await client.send_json_auto_id(command)
+        result = await client.receive_json()
+        assert result["success"]
+
+    supervisor_client.homeassistant.update.return_value = None
+    supervisor_client.mounts.info.return_value.default_backup_mount = default_mount
+    with patch(
+        "homeassistant.components.backup.manager.BackupManager.async_create_backup",
+    ) as mock_create_backup:
+        await client.send_json_auto_id({"type": "hassio/update/core", "backup": True})
+        result = await client.receive_json()
+        assert result["success"]
+    mock_create_backup.assert_called_once_with(**expected_kwargs)
+    supervisor_client.homeassistant.update.assert_called_once_with(
+        HomeAssistantUpdateOptions(version=None, backup=False)
+    )
+
+
+async def test_update_addon_with_error(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    update_addon: AsyncMock,
+) -> None:
+    """Test updating addon with error."""
+    client = await hass_ws_client(hass)
+    config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
+    config_entry.add_to_hass(hass)
+
+    with patch.dict(os.environ, MOCK_ENVIRON):
+        assert await async_setup_component(
+            hass,
+            "hassio",
+            {"http": {"server_port": 9999, "server_host": "127.0.0.1"}, "hassio": {}},
+        )
+    await hass.async_block_till_done()
+
+    update_addon.side_effect = SupervisorError
+    await client.send_json_auto_id(
+        {"type": "hassio/update/addon", "addon": "test", "backup": False}
+    )
+    result = await client.receive_json()
+    assert not result["success"]
+    assert result["error"] == {
+        "code": "home_assistant_error",
+        "message": "Error updating test: ",
+    }
+
+
+@pytest.mark.parametrize(
+    ("create_backup_error", "delete_filtered_backups_error", "message"),
+    [
+        (BackupManagerError, None, "Error creating backup: "),
+        (None, BackupManagerError, "Error deleting old backups: "),
+    ],
+)
+async def test_update_addon_with_backup_and_error(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    supervisor_client: AsyncMock,
+    create_backup_error: Exception | None,
+    delete_filtered_backups_error: Exception | None,
+    message: str,
+) -> None:
+    """Test updating addon with backup and error."""
+    client = await hass_ws_client(hass)
+    config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
+    config_entry.add_to_hass(hass)
+
+    with patch.dict(os.environ, MOCK_ENVIRON):
+        result = await async_setup_component(
+            hass,
+            "hassio",
+            {"http": {"server_port": 9999, "server_host": "127.0.0.1"}, "hassio": {}},
+        )
+        assert result
+    await setup_backup_integration(hass)
+
+    supervisor_client.homeassistant.update.return_value = None
+    supervisor_client.mounts.info.return_value.default_backup_mount = None
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_create_backup",
+            side_effect=create_backup_error,
+        ),
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_delete_filtered_backups",
+            side_effect=delete_filtered_backups_error,
+        ),
+    ):
+        await client.send_json_auto_id(
+            {"type": "hassio/update/addon", "addon": "test", "backup": True}
+        )
+        result = await client.receive_json()
+    assert not result["success"]
+    assert result["error"] == {"code": "home_assistant_error", "message": message}
+
+
+async def test_update_core_with_error(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    supervisor_client: AsyncMock,
+) -> None:
+    """Test updating core with error."""
+    client = await hass_ws_client(hass)
+    config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
+    config_entry.add_to_hass(hass)
+
+    with patch.dict(os.environ, MOCK_ENVIRON):
+        assert await async_setup_component(
+            hass,
+            "hassio",
+            {"http": {"server_port": 9999, "server_host": "127.0.0.1"}, "hassio": {}},
+        )
+    await hass.async_block_till_done()
+
+    supervisor_client.homeassistant.update.side_effect = SupervisorError
+    await client.send_json_auto_id({"type": "hassio/update/core", "backup": False})
+    result = await client.receive_json()
+    assert not result["success"]
+    assert result["error"] == {
+        "code": "home_assistant_error",
+        "message": "Error updating Home Assistant Core: ",
+    }
+
+
+async def test_update_core_with_backup_and_error(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    supervisor_client: AsyncMock,
+) -> None:
+    """Test updating core with backup and error."""
+    client = await hass_ws_client(hass)
+    config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
+    config_entry.add_to_hass(hass)
+
+    with patch.dict(os.environ, MOCK_ENVIRON):
+        result = await async_setup_component(
+            hass,
+            "hassio",
+            {"http": {"server_port": 9999, "server_host": "127.0.0.1"}, "hassio": {}},
+        )
+        assert result
+    await setup_backup_integration(hass)
+
+    supervisor_client.homeassistant.update.return_value = None
+    supervisor_client.mounts.info.return_value.default_backup_mount = None
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_create_backup",
+            side_effect=BackupManagerError,
+        ),
+    ):
+        await client.send_json_auto_id(
+            {"type": "hassio/update/addon", "addon": "test", "backup": True}
+        )
+        result = await client.receive_json()
+    assert not result["success"]
+    assert result["error"] == {
+        "code": "home_assistant_error",
+        "message": "Error creating backup: ",
+    }
diff --git a/tests/components/heos/__init__.py b/tests/components/heos/__init__.py
index 3a774529c69..1fb67bd114f 100644
--- a/tests/components/heos/__init__.py
+++ b/tests/components/heos/__init__.py
@@ -1 +1,91 @@
 """Tests for the Heos component."""
+
+from unittest.mock import AsyncMock
+
+from pyheos import (
+    ConnectionState,
+    Heos,
+    HeosGroup,
+    HeosOptions,
+    HeosPlayer,
+    MediaMusicSource,
+)
+
+
+class MockHeos(Heos):
+    """Defines a mocked HEOS API."""
+
+    def __init__(self, options: HeosOptions) -> None:
+        """Initialize the mock."""
+        super().__init__(options)
+        # Overwrite the methods with async mocks, changing type
+        self.add_to_queue: AsyncMock = AsyncMock()
+        self.browse_media: AsyncMock = AsyncMock()
+        self.connect: AsyncMock = AsyncMock()
+        self.disconnect: AsyncMock = AsyncMock()
+        self.get_favorites: AsyncMock = AsyncMock()
+        self.get_groups: AsyncMock = AsyncMock()
+        self.get_input_sources: AsyncMock = AsyncMock()
+        self.get_playlists: AsyncMock = AsyncMock()
+        self.get_players: AsyncMock = AsyncMock()
+        self.get_music_sources: AsyncMock = AsyncMock()
+        self.group_volume_down: AsyncMock = AsyncMock()
+        self.group_volume_up: AsyncMock = AsyncMock()
+        self.get_system_info: AsyncMock = AsyncMock()
+        self.load_players: AsyncMock = AsyncMock()
+        self.play_media: AsyncMock = AsyncMock()
+        self.play_preset_station: AsyncMock = AsyncMock()
+        self.play_url: AsyncMock = AsyncMock()
+        self.player_clear_queue: AsyncMock = AsyncMock()
+        self.player_get_queue: AsyncMock = AsyncMock()
+        self.player_get_quick_selects: AsyncMock = AsyncMock()
+        self.player_play_next: AsyncMock = AsyncMock()
+        self.player_play_previous: AsyncMock = AsyncMock()
+        self.player_play_queue: AsyncMock = AsyncMock()
+        self.player_play_quick_select: AsyncMock = AsyncMock()
+        self.player_set_mute: AsyncMock = AsyncMock()
+        self.player_set_play_mode: AsyncMock = AsyncMock()
+        self.player_set_play_state: AsyncMock = AsyncMock()
+        self.player_set_volume: AsyncMock = AsyncMock()
+        self.set_group: AsyncMock = AsyncMock()
+        self.set_group_volume: AsyncMock = AsyncMock()
+        self.sign_in: AsyncMock = AsyncMock()
+        self.sign_out: AsyncMock = AsyncMock()
+
+    def mock_set_players(self, players: dict[int, HeosPlayer]) -> None:
+        """Set the players on the mock instance."""
+        for player in players.values():
+            player.heos = self
+        self._players = players
+        self._players_loaded = bool(players)
+        self.get_players.return_value = players
+
+    def mock_set_groups(self, groups: dict[int, HeosGroup]) -> None:
+        """Set the groups on the mock instance."""
+        for group in groups.values():
+            group.heos = self
+        self._groups = groups
+        self._groups_loaded = bool(groups)
+        self.get_groups.return_value = groups
+
+    def mock_set_signed_in_username(self, signed_in_username: str | None) -> None:
+        """Set the signed in status on the mock instance."""
+        self._signed_in_username = signed_in_username
+
+    def mock_set_connection_state(self, connection_state: ConnectionState) -> None:
+        """Set the connection state on the mock instance."""
+        self._connection._state = connection_state
+
+    def mock_set_current_host(self, host: str) -> None:
+        """Set the current host on the mock instance."""
+        self._connection._host = host
+
+    def mock_set_music_sources(
+        self, music_sources: dict[int, MediaMusicSource]
+    ) -> None:
+        """Set the music sources on the mock instance."""
+        for music_source in music_sources.values():
+            music_source.heos = self
+        self._music_sources = music_sources
+        self._music_sources_loaded = bool(music_sources)
+        self.get_music_sources.return_value = music_sources
diff --git a/tests/components/heos/conftest.py b/tests/components/heos/conftest.py
index 122467c6b02..835e4436398 100644
--- a/tests/components/heos/conftest.py
+++ b/tests/components/heos/conftest.py
@@ -2,21 +2,25 @@
 
 from __future__ import annotations
 
-from collections.abc import AsyncIterator
-from unittest.mock import AsyncMock, Mock, patch
+from collections.abc import Callable, Iterator
+from unittest.mock import Mock, patch
 
 from pyheos import (
-    CONTROLS_ALL,
-    Heos,
+    BrowseResult,
     HeosGroup,
+    HeosHost,
+    HeosNowPlayingMedia,
     HeosOptions,
     HeosPlayer,
+    HeosSystem,
     LineOutLevelType,
     MediaItem,
+    MediaMusicSource,
     MediaType,
     NetworkType,
     PlayerUpdateResult,
     PlayState,
+    QueueItem,
     RepeatType,
     const,
 )
@@ -36,6 +40,8 @@ from homeassistant.helpers.service_info.ssdp import (
     SsdpServiceInfo,
 )
 
+from . import MockHeos
+
 from tests.common import MockConfigEntry
 
 
@@ -62,6 +68,17 @@ def config_entry_options_fixture() -> MockConfigEntry:
     )
 
 
+@pytest.fixture(name="new_mock", autouse=True)
+def new_heos_mock_fixture(controller: MockHeos) -> Iterator[Mock]:
+    """Patch the Heos class to return the mock instance."""
+    new_mock = Mock(return_value=controller)
+    with (
+        patch("homeassistant.components.heos.coordinator.Heos", new=new_mock),
+        patch("homeassistant.components.heos.config_flow.Heos", new=new_mock),
+    ):
+        yield new_mock
+
+
 @pytest_asyncio.fixture(name="controller", autouse=True)
 async def controller_fixture(
     players: dict[int, HeosPlayer],
@@ -70,91 +87,101 @@ async def controller_fixture(
     playlists: list[MediaItem],
     change_data: PlayerUpdateResult,
     group: dict[int, HeosGroup],
-) -> AsyncIterator[Heos]:
+    quick_selects: dict[int, str],
+) -> MockHeos:
     """Create a mock Heos controller fixture."""
-    mock_heos = Heos(HeosOptions(host="127.0.0.1"))
-    for player in players.values():
-        player.heos = mock_heos
-    mock_heos.connect = AsyncMock()
-    mock_heos.disconnect = AsyncMock()
-    mock_heos.sign_in = AsyncMock()
-    mock_heos.sign_out = AsyncMock()
-    mock_heos.get_players = AsyncMock(return_value=players)
-    mock_heos._players = players
-    mock_heos.get_favorites = AsyncMock(return_value=favorites)
-    mock_heos.get_input_sources = AsyncMock(return_value=input_sources)
-    mock_heos.get_playlists = AsyncMock(return_value=playlists)
-    mock_heos.load_players = AsyncMock(return_value=change_data)
-    mock_heos._signed_in_username = "user@user.com"
-    mock_heos.get_groups = AsyncMock(return_value=group)
-    mock_heos._groups = group
-    mock_heos.set_group = AsyncMock(return_value=None)
-    new_mock = Mock(return_value=mock_heos)
-    mock_heos.new_mock = new_mock
-    with (
-        patch("homeassistant.components.heos.coordinator.Heos", new=new_mock),
-        patch("homeassistant.components.heos.config_flow.Heos", new=new_mock),
-    ):
-        yield mock_heos
+
+    mock_heos = MockHeos(HeosOptions(host="127.0.0.1"))
+    mock_heos.mock_set_signed_in_username("user@user.com")
+    mock_heos.mock_set_players(players)
+    mock_heos.mock_set_groups(group)
+    mock_heos.get_favorites.return_value = favorites
+    mock_heos.get_input_sources.return_value = input_sources
+    mock_heos.get_playlists.return_value = playlists
+    mock_heos.load_players.return_value = change_data
+    mock_heos.player_get_quick_selects.return_value = quick_selects
+    return mock_heos
 
 
-@pytest.fixture(name="players")
-def players_fixture(quick_selects: dict[int, str]) -> dict[int, HeosPlayer]:
-    """Create two mock HeosPlayers."""
-    players = {}
-    for i in (1, 2):
-        player = HeosPlayer(
-            player_id=i,
+@pytest.fixture(name="system")
+def system_info_fixture() -> HeosSystem:
+    """Create a system info fixture."""
+    main_host = HeosHost(
+        "Test Player",
+        "HEOS Drive HS2",
+        "123456",
+        "1.0.0",
+        "127.0.0.1",
+        NetworkType.WIRED,
+        True,
+    )
+    return HeosSystem(
+        "user@user.com",
+        main_host,
+        hosts=[
+            main_host,
+            HeosHost(
+                "Test Player 2",
+                "Speaker",
+                "123456",
+                "1.0.0",
+                "127.0.0.2",
+                NetworkType.WIFI,
+                True,
+            ),
+        ],
+    )
+
+
+@pytest.fixture(name="player_factory")
+def player_factory_fixture() -> Callable[[int, str, str], HeosPlayer]:
+    """Return a method that creates players."""
+
+    def factory(player_id: int, name: str, model: str) -> HeosPlayer:
+        """Create a player."""
+        return HeosPlayer(
+            player_id=player_id,
             group_id=999,
-            name="Test Player" if i == 1 else f"Test Player {i}",
-            model="HEOS Drive HS2" if i == 1 else "Speaker",
+            name=name,
+            model=model,
             serial="123456",
             version="1.0.0",
+            supported_version=True,
             line_out=LineOutLevelType.VARIABLE,
             is_muted=False,
             available=True,
             state=PlayState.STOP,
-            ip_address=f"127.0.0.{i}",
+            ip_address=f"127.0.0.{player_id}",
             network=NetworkType.WIRED,
             shuffle=False,
             repeat=RepeatType.OFF,
             volume=25,
-            heos=None,
+            now_playing_media=HeosNowPlayingMedia(
+                type=MediaType.STATION,
+                song="Song",
+                station="Station Name",
+                album="Album",
+                artist="Artist",
+                image_url="http://",
+                album_id="1",
+                media_id="1",
+                queue_id=1,
+                source_id=10,
+            ),
         )
-        player.now_playing_media = Mock()
-        player.now_playing_media.supported_controls = CONTROLS_ALL
-        player.now_playing_media.album_id = 1
-        player.now_playing_media.queue_id = 1
-        player.now_playing_media.source_id = 1
-        player.now_playing_media.station = "Station Name"
-        player.now_playing_media.type = "Station"
-        player.now_playing_media.album = "Album"
-        player.now_playing_media.artist = "Artist"
-        player.now_playing_media.media_id = "1"
-        player.now_playing_media.duration = None
-        player.now_playing_media.current_position = None
-        player.now_playing_media.image_url = "http://"
-        player.now_playing_media.song = "Song"
-        player.add_to_queue = AsyncMock()
-        player.clear_queue = AsyncMock()
-        player.get_quick_selects = AsyncMock(return_value=quick_selects)
-        player.mute = AsyncMock()
-        player.pause = AsyncMock()
-        player.play = AsyncMock()
-        player.play_media = AsyncMock()
-        player.play_next = AsyncMock()
-        player.play_previous = AsyncMock()
-        player.play_preset_station = AsyncMock()
-        player.play_quick_select = AsyncMock()
-        player.play_url = AsyncMock()
-        player.set_mute = AsyncMock()
-        player.set_play_mode = AsyncMock()
-        player.set_quick_select = AsyncMock()
-        player.set_volume = AsyncMock()
-        player.stop = AsyncMock()
-        player.unmute = AsyncMock()
-        players[player.player_id] = player
-    return players
+
+    return factory
+
+
+@pytest.fixture(name="players")
+def players_fixture(
+    player_factory: Callable[[int, str, str], HeosPlayer],
+) -> dict[int, HeosPlayer]:
+    """Create two mock HeosPlayers."""
+    return {
+        1: player_factory(1, "Test Player", "HEOS Drive HS2"),
+        2: player_factory(2, "Test Player 2", "Speaker"),
+    }
 
 
 @pytest.fixture(name="group")
@@ -270,10 +297,10 @@ def quick_selects_fixture() -> dict[int, str]:
     }
 
 
-@pytest.fixture(name="playlists")
-def playlists_fixture() -> list[MediaItem]:
-    """Create favorites fixture."""
-    playlist = MediaItem(
+@pytest.fixture(name="playlist")
+def playlist_fixture() -> MediaItem:
+    """Create playlist fixture."""
+    return MediaItem(
         source_id=const.MUSIC_SOURCE_PLAYLISTS,
         name="Awesome Music",
         type=MediaType.PLAYLIST,
@@ -282,6 +309,44 @@ def playlists_fixture() -> list[MediaItem]:
         image_url="",
         heos=None,
     )
+
+
+@pytest.fixture(name="music_sources")
+def music_sources_fixture() -> dict[int, MediaMusicSource]:
+    """Create music sources fixture."""
+    return {
+        const.MUSIC_SOURCE_PANDORA: MediaMusicSource(
+            source_id=const.MUSIC_SOURCE_PANDORA,
+            name="Pandora",
+            type=MediaType.MUSIC_SERVICE,
+            available=True,
+            service_username="user",
+            image_url="",
+            heos=None,
+        ),
+        const.MUSIC_SOURCE_TUNEIN: MediaMusicSource(
+            source_id=const.MUSIC_SOURCE_TUNEIN,
+            name="TuneIn",
+            type=MediaType.MUSIC_SERVICE,
+            available=False,
+            service_username=None,
+            image_url="",
+            heos=None,
+        ),
+    }
+
+
+@pytest.fixture(name="pandora_browse_result")
+def pandora_browse_response_fixture(favorites: dict[int, MediaItem]) -> BrowseResult:
+    """Create a mock response for browsing Pandora."""
+    return BrowseResult(
+        1, 1, const.MUSIC_SOURCE_PANDORA, items=[favorites[1]], options=[]
+    )
+
+
+@pytest.fixture(name="playlists")
+def playlists_fixture(playlist: MediaItem) -> list[MediaItem]:
+    """Create playlists fixture."""
     return [playlist]
 
 
@@ -295,3 +360,28 @@ def change_data_fixture() -> PlayerUpdateResult:
 def change_data_mapped_ids_fixture() -> PlayerUpdateResult:
     """Create player change data for testing."""
     return PlayerUpdateResult(updated_player_ids={1: 101})
+
+
+@pytest.fixture(name="queue")
+def queue_fixture() -> list[QueueItem]:
+    """Create a queue fixture."""
+    return [
+        QueueItem(
+            queue_id=1,
+            song="Espresso",
+            album="Espresso",
+            artist="Sabrina Carpenter",
+            image_url="http://resources.wimpmusic.com/images/e4f2d75f/a69e/4b8a/b800/e18546b1ad4c/640x640.jpg",
+            media_id="356276483",
+            album_id="356276481",
+        ),
+        QueueItem(
+            queue_id=2,
+            song="A Bar Song (Tipsy)",
+            album="A Bar Song (Tipsy)",
+            artist="Shaboozey",
+            image_url="http://resources.wimpmusic.com/images/d05b8da3/4fae/45ff/ac1b/7ab7caab3523/640x640.jpg",
+            media_id="354365598",
+            album_id="354365596",
+        ),
+    ]
diff --git a/tests/components/heos/snapshots/test_diagnostics.ambr b/tests/components/heos/snapshots/test_diagnostics.ambr
new file mode 100644
index 00000000000..58685f5cf8f
--- /dev/null
+++ b/tests/components/heos/snapshots/test_diagnostics.ambr
@@ -0,0 +1,392 @@
+# serializer version: 1
+# name: test_config_entry_diagnostics
+  dict({
+    'config_entry': dict({
+      'data': dict({
+        'host': '127.0.0.1',
+      }),
+      'disabled_by': None,
+      'discovery_keys': dict({
+      }),
+      'domain': 'heos',
+      'minor_version': 1,
+      'options': dict({
+      }),
+      'pref_disable_new_entities': False,
+      'pref_disable_polling': False,
+      'source': 'user',
+      'subentries': list([
+      ]),
+      'title': 'HEOS System (via 127.0.0.1)',
+      'unique_id': 'heos',
+      'version': 1,
+    }),
+    'favorites': dict({
+      '1': dict({
+        'album': None,
+        'album_id': None,
+        'artist': None,
+        'browsable': False,
+        'container_id': None,
+        'image_url': '',
+        'media_id': '123456789',
+        'name': "Today's Hits Radio",
+        'playable': True,
+        'source_id': 1,
+        'type': 'station',
+      }),
+      '2': dict({
+        'album': None,
+        'album_id': None,
+        'artist': None,
+        'browsable': False,
+        'container_id': None,
+        'image_url': '',
+        'media_id': 's1234',
+        'name': 'Classical MPR (Classical Music)',
+        'playable': True,
+        'source_id': 3,
+        'type': 'station',
+      }),
+    }),
+    'groups': dict({
+      '999': dict({
+        'group_id': 999,
+        'is_muted': False,
+        'lead_player_id': 1,
+        'member_player_ids': list([
+          2,
+        ]),
+        'name': 'Group',
+        'volume': 0,
+      }),
+    }),
+    'heos': dict({
+      'connection_state': 'disconnected',
+      'current_credentials': None,
+    }),
+    'inputs': list([
+      dict({
+        'album': None,
+        'album_id': None,
+        'artist': None,
+        'browsable': False,
+        'container_id': None,
+        'image_url': '',
+        'media_id': 'inputs/aux_in_1',
+        'name': 'HEOS Drive - Line In 1',
+        'playable': True,
+        'source_id': 1027,
+        'type': 'station',
+      }),
+      dict({
+        'album': None,
+        'album_id': None,
+        'artist': None,
+        'browsable': False,
+        'container_id': None,
+        'image_url': '',
+        'media_id': 'inputs/aux_in_1',
+        'name': 'Speaker - Line In 1',
+        'playable': True,
+        'source_id': 1027,
+        'type': 'station',
+      }),
+    ]),
+    'source_list': list([
+      "Today's Hits Radio",
+      'Classical MPR (Classical Music)',
+      'HEOS Drive - Line In 1',
+      'Speaker - Line In 1',
+    ]),
+    'system': dict({
+      'connected_to_preferred_host': True,
+      'host': dict({
+        'ip_address': '127.0.0.1',
+        'model': 'HEOS Drive HS2',
+        'name': 'Test Player',
+        'network': 'wired',
+        'preferred_host': True,
+        'serial': '**REDACTED**',
+        'supported_version': True,
+        'version': '1.0.0',
+      }),
+      'hosts': list([
+        dict({
+          'ip_address': '127.0.0.1',
+          'model': 'HEOS Drive HS2',
+          'name': 'Test Player',
+          'network': 'wired',
+          'preferred_host': True,
+          'serial': '**REDACTED**',
+          'supported_version': True,
+          'version': '1.0.0',
+        }),
+        dict({
+          'ip_address': '127.0.0.2',
+          'model': 'Speaker',
+          'name': 'Test Player 2',
+          'network': 'wifi',
+          'preferred_host': False,
+          'serial': '**REDACTED**',
+          'supported_version': True,
+          'version': '1.0.0',
+        }),
+      ]),
+      'is_signed_in': True,
+      'preferred_hosts': list([
+        dict({
+          'ip_address': '127.0.0.1',
+          'model': 'HEOS Drive HS2',
+          'name': 'Test Player',
+          'network': 'wired',
+          'preferred_host': True,
+          'serial': '**REDACTED**',
+          'supported_version': True,
+          'version': '1.0.0',
+        }),
+      ]),
+      'signed_in_username': '**REDACTED**',
+    }),
+  })
+# ---
+# name: test_config_entry_diagnostics_error_getting_system
+  dict({
+    'config_entry': dict({
+      'data': dict({
+        'host': '127.0.0.1',
+      }),
+      'disabled_by': None,
+      'discovery_keys': dict({
+      }),
+      'domain': 'heos',
+      'minor_version': 1,
+      'options': dict({
+      }),
+      'pref_disable_new_entities': False,
+      'pref_disable_polling': False,
+      'source': 'user',
+      'subentries': list([
+      ]),
+      'title': 'HEOS System (via 127.0.0.1)',
+      'unique_id': 'heos',
+      'version': 1,
+    }),
+    'favorites': dict({
+      '1': dict({
+        'album': None,
+        'album_id': None,
+        'artist': None,
+        'browsable': False,
+        'container_id': None,
+        'image_url': '',
+        'media_id': '123456789',
+        'name': "Today's Hits Radio",
+        'playable': True,
+        'source_id': 1,
+        'type': 'station',
+      }),
+      '2': dict({
+        'album': None,
+        'album_id': None,
+        'artist': None,
+        'browsable': False,
+        'container_id': None,
+        'image_url': '',
+        'media_id': 's1234',
+        'name': 'Classical MPR (Classical Music)',
+        'playable': True,
+        'source_id': 3,
+        'type': 'station',
+      }),
+    }),
+    'groups': dict({
+      '999': dict({
+        'group_id': 999,
+        'is_muted': False,
+        'lead_player_id': 1,
+        'member_player_ids': list([
+          2,
+        ]),
+        'name': 'Group',
+        'volume': 0,
+      }),
+    }),
+    'heos': dict({
+      'connection_state': 'disconnected',
+      'current_credentials': None,
+    }),
+    'inputs': list([
+      dict({
+        'album': None,
+        'album_id': None,
+        'artist': None,
+        'browsable': False,
+        'container_id': None,
+        'image_url': '',
+        'media_id': 'inputs/aux_in_1',
+        'name': 'HEOS Drive - Line In 1',
+        'playable': True,
+        'source_id': 1027,
+        'type': 'station',
+      }),
+      dict({
+        'album': None,
+        'album_id': None,
+        'artist': None,
+        'browsable': False,
+        'container_id': None,
+        'image_url': '',
+        'media_id': 'inputs/aux_in_1',
+        'name': 'Speaker - Line In 1',
+        'playable': True,
+        'source_id': 1027,
+        'type': 'station',
+      }),
+    ]),
+    'source_list': list([
+      "Today's Hits Radio",
+      'Classical MPR (Classical Music)',
+      'HEOS Drive - Line In 1',
+      'Speaker - Line In 1',
+    ]),
+    'system': dict({
+      'error': 'Not connected to device',
+    }),
+  })
+# ---
+# name: test_device_diagnostics
+  dict({
+    'device': dict({
+      'area_id': None,
+      'configuration_url': None,
+      'connections': list([
+      ]),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'identifiers': list([
+        list([
+          'heos',
+          '1',
+        ]),
+      ]),
+      'labels': list([
+      ]),
+      'manufacturer': 'HEOS',
+      'model': 'Drive HS2',
+      'model_id': None,
+      'name': 'Test Player',
+      'name_by_user': None,
+      'serial_number': '**REDACTED**',
+      'sw_version': '1.0.0',
+      'via_device_id': None,
+    }),
+    'entities': list([
+      dict({
+        'entity': dict({
+          'area_id': None,
+          'categories': dict({
+          }),
+          'config_subentry_id': None,
+          'disabled_by': None,
+          'entity_category': None,
+          'entity_id': 'media_player.test_player',
+          'has_entity_name': True,
+          'hidden_by': None,
+          'icon': None,
+          'labels': list([
+          ]),
+          'name': None,
+          'options': dict({
+          }),
+          'original_name': None,
+          'platform': 'heos',
+          'translation_key': None,
+          'unique_id': '1',
+        }),
+        'state': dict({
+          'attributes': dict({
+            'entity_picture': 'http://',
+            'friendly_name': 'Test Player',
+            'group_members': list([
+              'media_player.test_player',
+              'media_player.test_player_2',
+            ]),
+            'is_volume_muted': False,
+            'media_album_id': '1',
+            'media_album_name': 'Album',
+            'media_artist': 'Artist',
+            'media_content_id': '1',
+            'media_content_type': 'music',
+            'media_queue_id': 1,
+            'media_source_id': 10,
+            'media_station': 'Station Name',
+            'media_title': 'Song',
+            'media_type': 'station',
+            'repeat': 'off',
+            'shuffle': False,
+            'source_list': list([
+              "Today's Hits Radio",
+              'Classical MPR (Classical Music)',
+              'HEOS Drive - Line In 1',
+              'Speaker - Line In 1',
+            ]),
+            'supported_features': 3079741,
+            'volume_level': 0.25,
+          }),
+          'context': dict({
+            'parent_id': None,
+            'user_id': None,
+          }),
+          'entity_id': 'media_player.test_player',
+          'state': 'idle',
+        }),
+      }),
+    ]),
+    'player': dict({
+      'available': True,
+      'control': 0,
+      'group_id': 999,
+      'ip_address': '127.0.0.1',
+      'is_muted': False,
+      'line_out': 1,
+      'model': 'HEOS Drive HS2',
+      'name': 'Test Player',
+      'network': 'wired',
+      'now_playing_media': dict({
+        'album': 'Album',
+        'album_id': '1',
+        'artist': 'Artist',
+        'current_position': None,
+        'current_position_updated': None,
+        'duration': None,
+        'image_url': 'http://',
+        'media_id': '1',
+        'options': list([
+        ]),
+        'queue_id': 1,
+        'song': 'Song',
+        'source_id': 10,
+        'station': 'Station Name',
+        'supported_controls': list([
+          'play',
+          'pause',
+          'stop',
+          'play_next',
+          'play_previous',
+        ]),
+        'type': 'station',
+      }),
+      'playback_error': None,
+      'player_id': 1,
+      'repeat': 'off',
+      'serial': '**REDACTED**',
+      'shuffle': False,
+      'state': 'stop',
+      'supported_version': True,
+      'version': '1.0.0',
+      'volume': 25,
+    }),
+  })
+# ---
diff --git a/tests/components/heos/snapshots/test_media_player.ambr b/tests/components/heos/snapshots/test_media_player.ambr
index 7bfdac232cb..d366a7f6317 100644
--- a/tests/components/heos/snapshots/test_media_player.ambr
+++ b/tests/components/heos/snapshots/test_media_player.ambr
@@ -1,4 +1,190 @@
 # serializer version: 1
+# name: test_browse_media_heos_media
+  dict({
+    'can_expand': True,
+    'can_play': False,
+    'children': list([
+      dict({
+        'can_expand': False,
+        'can_play': True,
+        'children_media_class': None,
+        'media_class': 'track',
+        'media_content_id': 'heos://media/1/station?name=Today%27s+Hits+Radio&image_url=&playable=True&browsable=False&media_id=123456789',
+        'media_content_type': '',
+        'thumbnail': '',
+        'title': "Today's Hits Radio",
+      }),
+    ]),
+    'children_media_class': 'track',
+    'media_class': 'directory',
+    'media_content_id': 'heos://media/1/music_service?name=Pandora&image_url=&available=True&service_username=user',
+    'media_content_type': '',
+    'not_shown': 0,
+    'thumbnail': '',
+    'title': 'Pandora',
+  })
+# ---
+# name: test_browse_media_heos_media_error_returns_empty
+  dict({
+    'can_expand': True,
+    'can_play': False,
+    'children': list([
+    ]),
+    'children_media_class': None,
+    'media_class': 'directory',
+    'media_content_id': 'heos://media/1/music_service?name=Pandora&image_url=&available=True&service_username=user',
+    'media_content_type': '',
+    'not_shown': 0,
+    'thumbnail': '',
+    'title': 'Pandora',
+  })
+# ---
+# name: test_browse_media_media_source
+  dict({
+    'can_expand': True,
+    'can_play': False,
+    'children': list([
+      dict({
+        'can_expand': False,
+        'can_play': True,
+        'children_media_class': None,
+        'media_class': 'music',
+        'media_content_id': 'media-source://media_source/local/test.mp3',
+        'media_content_type': 'audio/mpeg',
+        'thumbnail': None,
+        'title': 'test.mp3',
+      }),
+    ]),
+    'children_media_class': 'music',
+    'media_class': 'directory',
+    'media_content_id': 'media-source://media_source/local/.',
+    'media_content_type': '',
+    'not_shown': 1,
+    'thumbnail': None,
+    'title': 'media',
+  })
+# ---
+# name: test_browse_media_root
+  dict({
+    'can_expand': True,
+    'can_play': False,
+    'children': list([
+      dict({
+        'can_expand': True,
+        'can_play': False,
+        'children_media_class': None,
+        'media_class': 'directory',
+        'media_content_id': 'heos://media/1/music_service?name=Pandora&image_url=&available=True&service_username=user',
+        'media_content_type': '',
+        'thumbnail': '',
+        'title': 'Pandora',
+      }),
+      dict({
+        'can_expand': True,
+        'can_play': False,
+        'children_media_class': None,
+        'media_class': 'directory',
+        'media_content_id': 'heos://media/3/music_service?name=TuneIn&image_url=&available=False',
+        'media_content_type': '',
+        'thumbnail': '',
+        'title': 'TuneIn',
+      }),
+      dict({
+        'can_expand': True,
+        'can_play': False,
+        'children_media_class': 'music',
+        'media_class': 'directory',
+        'media_content_id': 'media-source://media_source/local/.',
+        'media_content_type': '',
+        'thumbnail': None,
+        'title': 'media',
+      }),
+    ]),
+    'children_media_class': 'directory',
+    'media_class': 'directory',
+    'media_content_id': 'heos://media',
+    'media_content_type': '',
+    'not_shown': 0,
+    'thumbnail': None,
+    'title': 'Music Sources',
+  })
+# ---
+# name: test_browse_media_root_no_media_source
+  dict({
+    'can_expand': True,
+    'can_play': False,
+    'children': list([
+      dict({
+        'can_expand': True,
+        'can_play': False,
+        'children_media_class': None,
+        'media_class': 'directory',
+        'media_content_id': 'heos://media/1/music_service?name=Pandora&image_url=&available=True&service_username=user',
+        'media_content_type': '',
+        'thumbnail': '',
+        'title': 'Pandora',
+      }),
+      dict({
+        'can_expand': True,
+        'can_play': False,
+        'children_media_class': None,
+        'media_class': 'directory',
+        'media_content_id': 'heos://media/3/music_service?name=TuneIn&image_url=&available=False',
+        'media_content_type': '',
+        'thumbnail': '',
+        'title': 'TuneIn',
+      }),
+    ]),
+    'children_media_class': 'directory',
+    'media_class': 'directory',
+    'media_content_id': 'heos://media',
+    'media_content_type': '',
+    'not_shown': 0,
+    'thumbnail': None,
+    'title': 'Music Sources',
+  })
+# ---
+# name: test_browse_media_root_source_error_continues
+  dict({
+    'can_expand': True,
+    'can_play': False,
+    'children': list([
+    ]),
+    'children_media_class': 'directory',
+    'media_class': 'directory',
+    'media_content_id': 'heos://media',
+    'media_content_type': '',
+    'not_shown': 0,
+    'thumbnail': None,
+    'title': 'Music Sources',
+  })
+# ---
+# name: test_get_queue
+  dict({
+    'media_player.test_player': dict({
+      'queue': list([
+        dict({
+          'album': 'Espresso',
+          'album_id': '356276481',
+          'artist': 'Sabrina Carpenter',
+          'image_url': 'http://resources.wimpmusic.com/images/e4f2d75f/a69e/4b8a/b800/e18546b1ad4c/640x640.jpg',
+          'media_id': '356276483',
+          'queue_id': 1,
+          'song': 'Espresso',
+        }),
+        dict({
+          'album': 'A Bar Song (Tipsy)',
+          'album_id': '354365596',
+          'artist': 'Shaboozey',
+          'image_url': 'http://resources.wimpmusic.com/images/d05b8da3/4fae/45ff/ac1b/7ab7caab3523/640x640.jpg',
+          'media_id': '354365598',
+          'queue_id': 2,
+          'song': 'A Bar Song (Tipsy)',
+        }),
+      ]),
+    }),
+  })
+# ---
 # name: test_state_attributes
   StateSnapshot({
     'attributes': ReadOnlyDict({
@@ -9,16 +195,16 @@
         'media_player.test_player_2',
       ]),
       'is_volume_muted': False,
-      'media_album_id': 1,
+      'media_album_id': '1',
       'media_album_name': 'Album',
       'media_artist': 'Artist',
       'media_content_id': '1',
       'media_content_type': <MediaType.MUSIC: 'music'>,
       'media_queue_id': 1,
-      'media_source_id': 1,
+      'media_source_id': 10,
       'media_station': 'Station Name',
       'media_title': 'Song',
-      'media_type': 'Station',
+      'media_type': <MediaType.STATION: 'station'>,
       'repeat': <RepeatMode.OFF: 'off'>,
       'shuffle': False,
       'source_list': list([
diff --git a/tests/components/heos/test_config_flow.py b/tests/components/heos/test_config_flow.py
index 39ede354496..69d9aa3a38e 100644
--- a/tests/components/heos/test_config_flow.py
+++ b/tests/components/heos/test_config_flow.py
@@ -1,15 +1,32 @@
 """Tests for the Heos config flow module."""
 
-from pyheos import CommandAuthenticationError, CommandFailedError, Heos, HeosError
+from typing import Any
+
+from pyheos import (
+    CommandAuthenticationError,
+    CommandFailedError,
+    ConnectionState,
+    HeosError,
+    HeosHost,
+    HeosSystem,
+    NetworkType,
+)
 import pytest
 
 from homeassistant.components.heos.const import DOMAIN
-from homeassistant.config_entries import SOURCE_SSDP, SOURCE_USER, ConfigEntryState
+from homeassistant.config_entries import (
+    SOURCE_IGNORE,
+    SOURCE_SSDP,
+    SOURCE_USER,
+    ConfigEntryState,
+)
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers.service_info.ssdp import SsdpServiceInfo
 
+from . import MockHeos
+
 from tests.common import MockConfigEntry
 
 
@@ -38,7 +55,7 @@ async def test_no_host_shows_form(hass: HomeAssistant) -> None:
 
 
 async def test_cannot_connect_shows_error_form(
-    hass: HomeAssistant, controller: Heos
+    hass: HomeAssistant, controller: MockHeos
 ) -> None:
     """Test form is shown with error when cannot connect."""
     controller.connect.side_effect = HeosError()
@@ -47,13 +64,15 @@ async def test_cannot_connect_shows_error_form(
     )
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "user"
-    assert result["errors"][CONF_HOST] == "cannot_connect"
+    errors = result["errors"]
+    assert errors is not None
+    assert errors[CONF_HOST] == "cannot_connect"
     assert controller.connect.call_count == 1
     assert controller.disconnect.call_count == 1
 
 
 async def test_create_entry_when_host_valid(
-    hass: HomeAssistant, controller: Heos
+    hass: HomeAssistant, controller: MockHeos
 ) -> None:
     """Test result type is create entry when host is valid."""
     data = {CONF_HOST: "127.0.0.1"}
@@ -63,75 +82,170 @@ async def test_create_entry_when_host_valid(
     )
     assert result["type"] is FlowResultType.CREATE_ENTRY
     assert result["result"].unique_id == DOMAIN
-    assert result["title"] == "HEOS System (via 127.0.0.1)"
+    assert result["title"] == "HEOS System"
     assert result["data"] == data
     assert controller.connect.call_count == 2  # Also called in async_setup_entry
     assert controller.disconnect.call_count == 1
 
 
-async def test_create_entry_when_friendly_name_valid(
-    hass: HomeAssistant, controller: Heos
+async def test_manual_setup_with_discovery_in_progress(
+    hass: HomeAssistant,
+    discovery_data: SsdpServiceInfo,
+    controller: MockHeos,
+    system: HeosSystem,
 ) -> None:
-    """Test result type is create entry when friendly name is valid."""
-    hass.data[DOMAIN] = {"Office (127.0.0.1)": "127.0.0.1"}
-    data = {CONF_HOST: "Office (127.0.0.1)"}
-
+    """Test user can manually set up when discovery is in progress."""
+    # Single discovered, selects preferred host, shows confirm
+    controller.get_system_info.return_value = system
     result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}, data=data
+        DOMAIN, context={"source": SOURCE_SSDP}, data=discovery_data
     )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "confirm_discovery"
 
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["result"].unique_id == DOMAIN
-    assert result["title"] == "HEOS System (via 127.0.0.1)"
-    assert result["data"] == {CONF_HOST: "127.0.0.1"}
-    assert controller.connect.call_count == 2  # Also called in async_setup_entry
-    assert controller.disconnect.call_count == 1
-    assert DOMAIN not in hass.data
+    # Setup manually
+    user_result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert user_result["type"] is FlowResultType.FORM
+    user_result = await hass.config_entries.flow.async_configure(
+        user_result["flow_id"], user_input={CONF_HOST: "127.0.0.1"}
+    )
+    assert user_result["type"] is FlowResultType.CREATE_ENTRY
+
+    # Discovery flow is removed
+    assert not hass.config_entries.flow.async_progress_by_handler(DOMAIN)
 
 
-async def test_discovery_shows_create_form(
+async def test_discovery(
     hass: HomeAssistant,
     discovery_data: SsdpServiceInfo,
     discovery_data_bedroom: SsdpServiceInfo,
+    controller: MockHeos,
+    system: HeosSystem,
 ) -> None:
-    """Test discovery shows form to confirm setup."""
-
-    # Single discovered host shows form for user to finish setup.
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_SSDP}, data=discovery_data
-    )
-    assert hass.data[DOMAIN] == {"Office (127.0.0.1)": "127.0.0.1"}
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-
-    # Subsequent discovered hosts append to discovered hosts and abort.
+    """Test discovery shows form to confirm, then creates entry."""
+    # Single discovered, selects preferred host, shows confirm
+    controller.get_system_info.return_value = system
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": SOURCE_SSDP}, data=discovery_data_bedroom
     )
-    assert hass.data[DOMAIN] == {
-        "Office (127.0.0.1)": "127.0.0.1",
-        "Bedroom (127.0.0.2)": "127.0.0.2",
-    }
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "already_in_progress"
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "confirm_discovery"
+    assert controller.connect.call_count == 1
+    assert controller.get_system_info.call_count == 1
+    assert controller.disconnect.call_count == 1
+
+    # Subsequent discovered hosts abort.
+    subsequent_result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_SSDP}, data=discovery_data
+    )
+    assert subsequent_result["type"] is FlowResultType.ABORT
+    assert subsequent_result["reason"] == "already_in_progress"
+
+    # Confirm set up
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input={}
+    )
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["result"].unique_id == DOMAIN
+    assert result["title"] == "HEOS System"
+    assert result["data"] == {CONF_HOST: "127.0.0.1"}
 
 
 async def test_discovery_flow_aborts_already_setup(
-    hass: HomeAssistant, discovery_data: SsdpServiceInfo, config_entry: MockConfigEntry
+    hass: HomeAssistant,
+    discovery_data_bedroom: SsdpServiceInfo,
+    config_entry: MockConfigEntry,
+    controller: MockHeos,
 ) -> None:
-    """Test discovery flow aborts when entry already setup."""
+    """Test discovery flow aborts when entry already setup and hosts didn't change."""
     config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    assert config_entry.data[CONF_HOST] == "127.0.0.1"
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_SSDP}, data=discovery_data_bedroom
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "single_instance_allowed"
+    assert controller.get_system_info.call_count == 0
+    assert config_entry.data[CONF_HOST] == "127.0.0.1"
+
+
+async def test_discovery_aborts_same_system(
+    hass: HomeAssistant,
+    discovery_data_bedroom: SsdpServiceInfo,
+    controller: MockHeos,
+    config_entry: MockConfigEntry,
+    system: HeosSystem,
+) -> None:
+    """Test discovery does not update when current host is part of discovered's system."""
+    config_entry.add_to_hass(hass)
+    assert config_entry.data[CONF_HOST] == "127.0.0.1"
+
+    controller.get_system_info.return_value = system
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_SSDP}, data=discovery_data_bedroom
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "single_instance_allowed"
+    assert controller.get_system_info.call_count == 1
+    assert config_entry.data[CONF_HOST] == "127.0.0.1"
+
+
+async def test_discovery_ignored_aborts(
+    hass: HomeAssistant,
+    discovery_data: SsdpServiceInfo,
+) -> None:
+    """Test discovery aborts when ignored."""
+    MockConfigEntry(domain=DOMAIN, unique_id=DOMAIN, source=SOURCE_IGNORE).add_to_hass(
+        hass
+    )
 
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": SOURCE_SSDP}, data=discovery_data
     )
-
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "single_instance_allowed"
 
 
+async def test_discovery_fails_to_connect_aborts(
+    hass: HomeAssistant, discovery_data: SsdpServiceInfo, controller: MockHeos
+) -> None:
+    """Test discovery aborts when trying to connect to host."""
+    controller.connect.side_effect = HeosError()
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_SSDP}, data=discovery_data
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "cannot_connect"
+    assert controller.connect.call_count == 1
+    assert controller.disconnect.call_count == 1
+
+
+async def test_discovery_updates(
+    hass: HomeAssistant,
+    discovery_data_bedroom: SsdpServiceInfo,
+    controller: MockHeos,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test discovery updates existing entry."""
+    config_entry.add_to_hass(hass)
+    assert config_entry.data[CONF_HOST] == "127.0.0.1"
+
+    host = HeosHost("Player", "Model", None, None, "127.0.0.2", NetworkType.WIRED, True)
+    controller.get_system_info.return_value = HeosSystem(None, host, [host])
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_SSDP}, data=discovery_data_bedroom
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reconfigure_successful"
+    assert config_entry.data[CONF_HOST] == "127.0.0.2"
+
+
 async def test_reconfigure_validates_and_updates_config(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test reconfigure validates host and successfully updates."""
     config_entry.add_to_hass(hass)
@@ -139,9 +253,9 @@ async def test_reconfigure_validates_and_updates_config(
     assert config_entry.data[CONF_HOST] == "127.0.0.1"
 
     # Test reconfigure initially shows form with current host value.
-    host = next(
-        key.default() for key in result["data_schema"].schema if key == CONF_HOST
-    )
+    schema = result["data_schema"]
+    assert schema is not None
+    host = next(key.default() for key in schema.schema if key == CONF_HOST)
     assert host == "127.0.0.1"
     assert result["errors"] == {}
     assert result["step_id"] == "reconfigure"
@@ -161,7 +275,7 @@ async def test_reconfigure_validates_and_updates_config(
 
 
 async def test_reconfigure_cannot_connect_recovers(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test reconfigure cannot connect and recovers."""
     controller.connect.side_effect = HeosError()
@@ -176,11 +290,13 @@ async def test_reconfigure_cannot_connect_recovers(
 
     assert controller.connect.call_count == 1
     assert controller.disconnect.call_count == 1
-    host = next(
-        key.default() for key in result["data_schema"].schema if key == CONF_HOST
-    )
+    schema = result["data_schema"]
+    assert schema is not None
+    host = next(key.default() for key in schema.schema if key == CONF_HOST)
     assert host == "127.0.0.2"
-    assert result["errors"][CONF_HOST] == "cannot_connect"
+    errors = result["errors"]
+    assert errors is not None
+    assert errors[CONF_HOST] == "cannot_connect"
     assert result["step_id"] == "reconfigure"
     assert result["type"] is FlowResultType.FORM
 
@@ -214,13 +330,14 @@ async def test_reconfigure_cannot_connect_recovers(
 async def test_options_flow_signs_in(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     error: HeosError,
     expected_error_key: str,
 ) -> None:
     """Test options flow signs-in with entered credentials."""
     config_entry.add_to_hass(hass)
     assert await hass.config_entries.async_setup(config_entry.entry_id)
+    controller.mock_set_connection_state(ConnectionState.CONNECTED)
 
     # Start the options flow. Entry has not current options.
     assert CONF_USERNAME not in config_entry.options
@@ -255,11 +372,12 @@ async def test_options_flow_signs_in(
 
 
 async def test_options_flow_signs_out(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test options flow signs-out when credentials cleared."""
     config_entry.add_to_hass(hass)
     assert await hass.config_entries.async_setup(config_entry.entry_id)
+    controller.mock_set_connection_state(ConnectionState.CONNECTED)
 
     # Start the options flow. Entry has not current options.
     result = await hass.config_entries.options.async_init(config_entry.entry_id)
@@ -268,7 +386,7 @@ async def test_options_flow_signs_out(
     assert result["type"] is FlowResultType.FORM
 
     # Fail to sign-out, show error
-    user_input = {}
+    user_input: dict[str, Any] = {}
     controller.sign_out.side_effect = HeosError()
     result = await hass.config_entries.options.async_configure(
         result["flow_id"], user_input
@@ -301,13 +419,14 @@ async def test_options_flow_signs_out(
 async def test_options_flow_missing_one_param_recovers(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     user_input: dict[str, str],
     expected_errors: dict[str, str],
 ) -> None:
     """Test options flow signs-in after recovering from only username or password being entered."""
     config_entry.add_to_hass(hass)
     assert await hass.config_entries.async_setup(config_entry.entry_id)
+    controller.mock_set_connection_state(ConnectionState.CONNECTED)
 
     # Start the options flow. Entry has not current options.
     assert CONF_USERNAME not in config_entry.options
@@ -336,6 +455,86 @@ async def test_options_flow_missing_one_param_recovers(
     assert result["type"] is FlowResultType.CREATE_ENTRY
 
 
+async def test_options_flow_sign_in_setup_error_saves(
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
+) -> None:
+    """Test options can still be updated when the integration failed to set up."""
+    config_entry.add_to_hass(hass)
+    controller.get_players.side_effect = ValueError("Unexpected error")
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    assert config_entry.state is ConfigEntryState.SETUP_ERROR
+
+    result = await hass.config_entries.options.async_init(config_entry.entry_id)
+    # Enter valid credentials
+    user_input = {CONF_USERNAME: "user", CONF_PASSWORD: "pass"}
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"], user_input
+    )
+    assert controller.sign_in.call_count == 0
+    assert controller.sign_out.call_count == 0
+    assert config_entry.options == user_input
+    assert result["data"] == user_input
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+
+
+async def test_options_flow_sign_out_setup_error_saves(
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
+) -> None:
+    """Test options can still be cleared when the integration failed to set up."""
+    config_entry.add_to_hass(hass)
+    controller.get_players.side_effect = ValueError("Unexpected error")
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    assert config_entry.state is ConfigEntryState.SETUP_ERROR
+
+    result = await hass.config_entries.options.async_init(config_entry.entry_id)
+    # Enter valid credentials
+    result = await hass.config_entries.options.async_configure(result["flow_id"], {})
+    assert controller.sign_in.call_count == 0
+    assert controller.sign_out.call_count == 0
+    assert config_entry.options == {}
+    assert result["data"] == {}
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+
+
+async def test_options_flow_sign_in_not_connected_saves(
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
+) -> None:
+    """Test options can still be updated when not connected to the HEOS device."""
+    config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    controller.mock_set_connection_state(ConnectionState.RECONNECTING)
+
+    result = await hass.config_entries.options.async_init(config_entry.entry_id)
+    # Enter valid credentials
+    user_input = {CONF_USERNAME: "user", CONF_PASSWORD: "pass"}
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"], user_input
+    )
+    assert controller.sign_in.call_count == 0
+    assert controller.sign_out.call_count == 0
+    assert config_entry.options == user_input
+    assert result["data"] == user_input
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+
+
+async def test_options_flow_sign_out_not_connected_saves(
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
+) -> None:
+    """Test options can still be cleared when not connected to the HEOS device."""
+    config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    controller.mock_set_connection_state(ConnectionState.RECONNECTING)
+
+    result = await hass.config_entries.options.async_init(config_entry.entry_id)
+    # Enter valid credentials
+    result = await hass.config_entries.options.async_configure(result["flow_id"], {})
+    assert controller.sign_in.call_count == 0
+    assert controller.sign_out.call_count == 0
+    assert config_entry.options == {}
+    assert result["data"] == {}
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+
+
 @pytest.mark.parametrize(
     ("error", "expected_error_key"),
     [
@@ -350,13 +549,14 @@ async def test_options_flow_missing_one_param_recovers(
 async def test_reauth_signs_in_aborts(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     error: HeosError,
     expected_error_key: str,
 ) -> None:
     """Test reauth flow signs-in with entered credentials and aborts."""
     config_entry.add_to_hass(hass)
     assert await hass.config_entries.async_setup(config_entry.entry_id)
+    controller.mock_set_connection_state(ConnectionState.CONNECTED)
     result = await config_entry.start_reauth_flow(hass)
     assert config_entry.state is ConfigEntryState.LOADED
 
@@ -391,11 +591,12 @@ async def test_reauth_signs_in_aborts(
 
 
 async def test_reauth_signs_out(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test reauth flow signs-out when credentials cleared and aborts."""
     config_entry.add_to_hass(hass)
     assert await hass.config_entries.async_setup(config_entry.entry_id)
+    controller.mock_set_connection_state(ConnectionState.CONNECTED)
     result = await config_entry.start_reauth_flow(hass)
     assert config_entry.state is ConfigEntryState.LOADED
 
@@ -404,7 +605,7 @@ async def test_reauth_signs_out(
     assert result["type"] is FlowResultType.FORM
 
     # Fail to sign-out, show error
-    user_input = {}
+    user_input: dict[str, Any] = {}
     controller.sign_out.side_effect = HeosError()
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"], user_input
@@ -439,13 +640,14 @@ async def test_reauth_signs_out(
 async def test_reauth_flow_missing_one_param_recovers(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     user_input: dict[str, str],
     expected_errors: dict[str, str],
 ) -> None:
     """Test reauth flow signs-in after recovering from only username or password being entered."""
     config_entry.add_to_hass(hass)
     assert await hass.config_entries.async_setup(config_entry.entry_id)
+    controller.mock_set_connection_state(ConnectionState.CONNECTED)
 
     # Start the options flow. Entry has not current options.
     result = await config_entry.start_reauth_flow(hass)
@@ -473,3 +675,51 @@ async def test_reauth_flow_missing_one_param_recovers(
     assert config_entry.options[CONF_PASSWORD] == user_input[CONF_PASSWORD]
     assert result["reason"] == "reauth_successful"
     assert result["type"] is FlowResultType.ABORT
+
+
+async def test_reauth_updates_when_not_connected(
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
+) -> None:
+    """Test reauth flow signs-in with entered credentials and aborts."""
+    config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    controller.mock_set_connection_state(ConnectionState.RECONNECTING)
+
+    result = await config_entry.start_reauth_flow(hass)
+    assert result["step_id"] == "reauth_confirm"
+    assert result["errors"] == {}
+    assert result["type"] is FlowResultType.FORM
+
+    # Valid credentials signs-in, updates options, and aborts
+    user_input = {CONF_USERNAME: "user", CONF_PASSWORD: "pass"}
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input
+    )
+    assert controller.sign_in.call_count == 0
+    assert controller.sign_out.call_count == 0
+    assert config_entry.options[CONF_USERNAME] == user_input[CONF_USERNAME]
+    assert config_entry.options[CONF_PASSWORD] == user_input[CONF_PASSWORD]
+    assert result["reason"] == "reauth_successful"
+    assert result["type"] is FlowResultType.ABORT
+
+
+async def test_reauth_clears_when_not_connected(
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
+) -> None:
+    """Test reauth flow signs-out with entered credentials and aborts."""
+    config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    controller.mock_set_connection_state(ConnectionState.RECONNECTING)
+
+    result = await config_entry.start_reauth_flow(hass)
+    assert result["step_id"] == "reauth_confirm"
+    assert result["errors"] == {}
+    assert result["type"] is FlowResultType.FORM
+
+    # Valid credentials signs-out, updates options, and aborts
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+    assert controller.sign_in.call_count == 0
+    assert controller.sign_out.call_count == 0
+    assert config_entry.options == {}
+    assert result["reason"] == "reauth_successful"
+    assert result["type"] is FlowResultType.ABORT
diff --git a/tests/components/heos/test_diagnostics.py b/tests/components/heos/test_diagnostics.py
new file mode 100644
index 00000000000..a5341ef8d83
--- /dev/null
+++ b/tests/components/heos/test_diagnostics.py
@@ -0,0 +1,98 @@
+"""Tests for the HEOS diagnostics module."""
+
+from pyheos import HeosError, HeosSystem
+import pytest
+from syrupy.assertion import SnapshotAssertion
+from syrupy.filters import props
+
+from homeassistant.components.heos.const import DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr
+
+from . import MockHeos
+
+from tests.common import MockConfigEntry
+from tests.components.diagnostics import (
+    get_diagnostics_for_config_entry,
+    get_diagnostics_for_device,
+)
+from tests.typing import ClientSessionGenerator
+
+
+async def test_config_entry_diagnostics(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    config_entry: MockConfigEntry,
+    controller: MockHeos,
+    system: HeosSystem,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test generating diagnostics for a config entry."""
+    config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+
+    controller.get_system_info.return_value = system
+    diagnostics = await get_diagnostics_for_config_entry(
+        hass, hass_client, config_entry
+    )
+
+    assert diagnostics == snapshot(
+        exclude=props("created_at", "modified_at", "entry_id")
+    )
+
+
+@pytest.mark.usefixtures("controller")
+async def test_config_entry_diagnostics_error_getting_system(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    config_entry: MockConfigEntry,
+    controller: MockHeos,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test generating diagnostics with error during getting system info."""
+    config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+
+    controller.get_system_info.side_effect = HeosError("Not connected to device")
+
+    diagnostics = await get_diagnostics_for_config_entry(
+        hass, hass_client, config_entry
+    )
+
+    assert diagnostics == snapshot(
+        exclude=props("created_at", "modified_at", "entry_id")
+    )
+
+
+@pytest.mark.usefixtures("controller")
+async def test_device_diagnostics(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    config_entry: MockConfigEntry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test generating diagnostics for a config entry."""
+    config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    device_registry = dr.async_get(hass)
+    device = device_registry.async_get_device({(DOMAIN, "1")})
+    assert device is not None
+    diagnostics = await get_diagnostics_for_device(
+        hass, hass_client, config_entry, device
+    )
+    assert diagnostics == snapshot(
+        exclude=props(
+            "created_at",
+            "modified_at",
+            "config_entries",
+            "config_entries_subentries",
+            "id",
+            "primary_config_entry",
+            "config_entry_id",
+            "device_id",
+            "entity_picture_local",
+            "last_changed",
+            "last_reported",
+            "last_updated",
+        )
+    )
diff --git a/tests/components/heos/test_init.py b/tests/components/heos/test_init.py
index 4c5eee67e2c..7bc232ad5a6 100644
--- a/tests/components/heos/test_init.py
+++ b/tests/components/heos/test_init.py
@@ -1,23 +1,38 @@
 """Tests for the init module."""
 
+from collections.abc import Callable
 from typing import cast
+from unittest.mock import Mock
 
-from pyheos import Heos, HeosError, HeosOptions, SignalHeosEvent, SignalType
+from pyheos import (
+    HeosError,
+    HeosOptions,
+    HeosPlayer,
+    PlayerUpdateResult,
+    SignalHeosEvent,
+    SignalType,
+    const,
+)
 import pytest
 
 from homeassistant.components.heos.const import DOMAIN
+from homeassistant.components.media_player import DOMAIN as MEDIA_PLAYER_DOMAIN
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntryState
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.setup import async_setup_component
+
+from . import MockHeos
 
 from tests.common import MockConfigEntry
+from tests.typing import WebSocketGenerator
 
 
 async def test_async_setup_entry_loads_platforms(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
 ) -> None:
     """Test load connects to heos, retrieves players, and loads platforms."""
     config_entry.add_to_hass(hass)
@@ -32,7 +47,10 @@ async def test_async_setup_entry_loads_platforms(
 
 
 async def test_async_setup_entry_with_options_loads_platforms(
-    hass: HomeAssistant, config_entry_options: MockConfigEntry, controller: Heos
+    hass: HomeAssistant,
+    config_entry_options: MockConfigEntry,
+    controller: MockHeos,
+    new_mock: Mock,
 ) -> None:
     """Test load connects to heos with options, retrieves players, and loads platforms."""
     config_entry_options.add_to_hass(hass)
@@ -40,8 +58,9 @@ async def test_async_setup_entry_with_options_loads_platforms(
 
     # Assert options passed and methods called
     assert config_entry_options.state is ConfigEntryState.LOADED
-    options = cast(HeosOptions, controller.new_mock.call_args[0][0])
+    options = cast(HeosOptions, new_mock.call_args[0][0])
     assert options.host == config_entry_options.data[CONF_HOST]
+    assert options.credentials is not None
     assert options.credentials.username == config_entry_options.options[CONF_USERNAME]
     assert options.credentials.password == config_entry_options.options[CONF_PASSWORD]
     assert controller.connect.call_count == 1
@@ -54,14 +73,14 @@ async def test_async_setup_entry_with_options_loads_platforms(
 async def test_async_setup_entry_auth_failure_starts_reauth(
     hass: HomeAssistant,
     config_entry_options: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
 ) -> None:
     """Test load with auth failure starts reauth, loads platforms."""
     config_entry_options.add_to_hass(hass)
 
     # Simulates what happens when the controller can't sign-in during connection
     async def connect_send_auth_failure() -> None:
-        controller._signed_in_username = None
+        controller.mock_set_signed_in_username(None)
         await controller.dispatcher.wait_send(
             SignalType.HEOS_EVENT, SignalHeosEvent.USER_CREDENTIALS_INVALID
         )
@@ -76,19 +95,19 @@ async def test_async_setup_entry_auth_failure_starts_reauth(
     controller.disconnect.assert_not_called()
     assert config_entry_options.state is ConfigEntryState.LOADED
     assert any(
-        config_entry_options.async_get_active_flows(hass, sources=[SOURCE_REAUTH])
+        config_entry_options.async_get_active_flows(hass, sources={SOURCE_REAUTH})
     )
 
 
 async def test_async_setup_entry_not_signed_in_loads_platforms(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test setup does not retrieve favorites when not logged in."""
     config_entry.add_to_hass(hass)
-    controller._signed_in_username = None
+    controller.mock_set_signed_in_username(None)
     assert await hass.config_entries.async_setup(config_entry.entry_id)
     assert controller.connect.call_count == 1
     assert controller.get_players.call_count == 1
@@ -102,7 +121,7 @@ async def test_async_setup_entry_not_signed_in_loads_platforms(
 
 
 async def test_async_setup_entry_connect_failure(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Connection failure raises ConfigEntryNotReady."""
     config_entry.add_to_hass(hass)
@@ -114,7 +133,7 @@ async def test_async_setup_entry_connect_failure(
 
 
 async def test_async_setup_entry_player_failure(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Failure to retrieve players raises ConfigEntryNotReady."""
     config_entry.add_to_hass(hass)
@@ -126,7 +145,7 @@ async def test_async_setup_entry_player_failure(
 
 
 async def test_async_setup_entry_favorites_failure(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Failure to retrieve favorites loads."""
     config_entry.add_to_hass(hass)
@@ -136,7 +155,7 @@ async def test_async_setup_entry_favorites_failure(
 
 
 async def test_async_setup_entry_inputs_failure(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Failure to retrieve inputs loads."""
     config_entry.add_to_hass(hass)
@@ -146,7 +165,7 @@ async def test_async_setup_entry_inputs_failure(
 
 
 async def test_unload_entry(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test entries are unloaded correctly."""
     config_entry.add_to_hass(hass)
@@ -164,12 +183,14 @@ async def test_device_info(
     config_entry.add_to_hass(hass)
     assert await hass.config_entries.async_setup(config_entry.entry_id)
     device = device_registry.async_get_device({(DOMAIN, "1")})
+    assert device is not None
     assert device.manufacturer == "HEOS"
     assert device.model == "Drive HS2"
     assert device.name == "Test Player"
     assert device.serial_number == "123456"
     assert device.sw_version == "1.0.0"
     device = device_registry.async_get_device({(DOMAIN, "2")})
+    assert device is not None
     assert device.manufacturer == "HEOS"
     assert device.model == "Speaker"
 
@@ -183,12 +204,144 @@ async def test_device_id_migration(
     config_entry.add_to_hass(hass)
     # Create a device with a legacy identifier
     device_registry.async_get_or_create(
-        config_entry_id=config_entry.entry_id, identifiers={(DOMAIN, 1)}
+        config_entry_id=config_entry.entry_id,
+        identifiers={(DOMAIN, 1), ("Other", "1")},  # type: ignore[arg-type]
     )
     device_registry.async_get_or_create(
-        config_entry_id=config_entry.entry_id, identifiers={("Other", 1)}
+        config_entry_id=config_entry.entry_id,
+        identifiers={("Other", 1)},  # type: ignore[arg-type]
     )
     assert await hass.config_entries.async_setup(config_entry.entry_id)
-    assert device_registry.async_get_device({("Other", 1)}) is not None
-    assert device_registry.async_get_device({(DOMAIN, 1)}) is None
+    await hass.async_block_till_done(wait_background_tasks=True)
+    assert device_registry.async_get_device({("Other", 1)}) is not None  # type: ignore[arg-type]
+    assert device_registry.async_get_device({(DOMAIN, 1)}) is None  # type: ignore[arg-type]
     assert device_registry.async_get_device({(DOMAIN, "1")}) is not None
+    assert device_registry.async_get_device({("Other", "1")}) is not None
+
+
+async def test_device_id_migration_both_present(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test that legacy non-string devices are removed when both devices present."""
+    config_entry.add_to_hass(hass)
+    # Create a device with a legacy identifier AND a new identifier
+    device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        identifiers={(DOMAIN, 1)},  # type: ignore[arg-type]
+    )
+    device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id, identifiers={(DOMAIN, "1")}
+    )
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done(wait_background_tasks=True)
+    assert device_registry.async_get_device({(DOMAIN, 1)}) is None  # type: ignore[arg-type]
+    assert device_registry.async_get_device({(DOMAIN, "1")}) is not None
+
+
+@pytest.mark.parametrize(
+    ("player_id", "expected_result"),
+    [("1", False), ("5", True)],
+    ids=("Present device", "Stale device"),
+)
+async def test_remove_config_entry_device(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    device_registry: dr.DeviceRegistry,
+    hass_ws_client: WebSocketGenerator,
+    player_id: str,
+    expected_result: bool,
+) -> None:
+    """Test manually removing an stale device."""
+    assert await async_setup_component(hass, "config", {})
+    config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id, identifiers={(DOMAIN, player_id)}
+    )
+
+    ws_client = await hass_ws_client(hass)
+    response = await ws_client.remove_device(device_entry.id, config_entry.entry_id)
+    assert response["success"] == expected_result
+
+
+async def test_reconnected_new_entities_created(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    config_entry: MockConfigEntry,
+    controller: MockHeos,
+    player_factory: Callable[[int, str, str], HeosPlayer],
+) -> None:
+    """Test new entities are created for new players after reconnecting."""
+    config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+
+    # Assert initial entity doesn't exist
+    assert not entity_registry.async_get_entity_id(MEDIA_PLAYER_DOMAIN, DOMAIN, "3")
+
+    # Create player
+    players = controller.players.copy()
+    players[3] = player_factory(3, "Test Player 3", "HEOS Link")
+    controller.mock_set_players(players)
+    update = PlayerUpdateResult([3], [], {})
+
+    # Simulate reconnection
+    await controller.dispatcher.wait_send(
+        SignalType.CONTROLLER_EVENT, const.EVENT_PLAYERS_CHANGED, update
+    )
+    await hass.async_block_till_done()
+
+    # Assert new entity created
+    assert entity_registry.async_get_entity_id(MEDIA_PLAYER_DOMAIN, DOMAIN, "3")
+
+
+async def test_reconnected_failover_updates_host(
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
+) -> None:
+    """Test the config entry host is updated after failover."""
+    config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    assert config_entry.data[CONF_HOST] == "127.0.0.1"
+
+    # Simulate reconnection
+    controller.mock_set_current_host("127.0.0.2")
+    await controller.dispatcher.wait_send(
+        SignalType.HEOS_EVENT, SignalHeosEvent.CONNECTED
+    )
+    await hass.async_block_till_done()
+
+    # Assert config entry host updated
+    assert config_entry.data[CONF_HOST] == "127.0.0.2"
+
+
+async def test_players_changed_new_entities_created(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    config_entry: MockConfigEntry,
+    controller: MockHeos,
+    player_factory: Callable[[int, str, str], HeosPlayer],
+) -> None:
+    """Test new entities are created for new players on change event."""
+    config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+
+    # Assert initial entity doesn't exist
+    assert not entity_registry.async_get_entity_id(MEDIA_PLAYER_DOMAIN, DOMAIN, "3")
+
+    # Create player
+    players = controller.players.copy()
+    players[3] = player_factory(3, "Test Player 3", "HEOS Link")
+    controller.mock_set_players(players)
+
+    # Simulate players changed event
+    await controller.dispatcher.wait_send(
+        SignalType.CONTROLLER_EVENT,
+        const.EVENT_PLAYERS_CHANGED,
+        PlayerUpdateResult([3], [], {}),
+    )
+    await hass.async_block_till_done()
+
+    # Assert new entity created
+    assert entity_registry.async_get_entity_id(MEDIA_PLAYER_DOMAIN, DOMAIN, "3")
diff --git a/tests/components/heos/test_media_player.py b/tests/components/heos/test_media_player.py
index 2d9f69d764d..5bc4f2bae30 100644
--- a/tests/components/heos/test_media_player.py
+++ b/tests/components/heos/test_media_player.py
@@ -7,23 +7,32 @@ from typing import Any
 from freezegun.api import FrozenDateTimeFactory
 from pyheos import (
     AddCriteriaType,
+    BrowseResult,
     CommandFailedError,
-    Heos,
     HeosError,
     MediaItem,
+    MediaMusicSource,
     MediaType as HeosMediaType,
     PlayerUpdateResult,
     PlayState,
+    QueueItem,
     RepeatType,
     SignalHeosEvent,
     SignalType,
     const,
 )
+from pyheos.util import mediauri
 import pytest
 from syrupy.assertion import SnapshotAssertion
 from syrupy.filters import props
 
-from homeassistant.components.heos.const import DOMAIN
+from homeassistant.components.heos.const import (
+    DOMAIN,
+    SERVICE_GET_QUEUE,
+    SERVICE_GROUP_VOLUME_DOWN,
+    SERVICE_GROUP_VOLUME_SET,
+    SERVICE_GROUP_VOLUME_UP,
+)
 from homeassistant.components.media_player import (
     ATTR_GROUP_MEMBERS,
     ATTR_INPUT_SOURCE,
@@ -47,6 +56,7 @@ from homeassistant.components.media_player import (
     MediaType,
     RepeatMode,
 )
+from homeassistant.components.media_source import DOMAIN as MS_DOMAIN
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     SERVICE_MEDIA_NEXT_TRACK,
@@ -66,7 +76,11 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 
+from . import MockHeos
+
 from tests.common import MockConfigEntry, async_fire_time_changed
+from tests.conftest import async_setup_component
+from tests.typing import WebSocketGenerator
 
 
 async def test_state_attributes(
@@ -88,7 +102,7 @@ async def test_state_attributes(
 
 
 async def test_updates_from_signals(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Tests dispatched signals update player."""
     config_entry.add_to_hass(hass)
@@ -97,33 +111,36 @@ async def test_updates_from_signals(
 
     # Test player does not update for other players
     player.state = PlayState.PLAY
-    await player.heos.dispatcher.wait_send(
+    await controller.dispatcher.wait_send(
         SignalType.PLAYER_EVENT, 2, const.EVENT_PLAYER_STATE_CHANGED
     )
     await hass.async_block_till_done()
     state = hass.states.get("media_player.test_player")
+    assert state is not None
     assert state.state == STATE_IDLE
 
     # Test player_update standard events
     player.state = PlayState.PLAY
-    await player.heos.dispatcher.wait_send(
+    await controller.dispatcher.wait_send(
         SignalType.PLAYER_EVENT, player.player_id, const.EVENT_PLAYER_STATE_CHANGED
     )
     await hass.async_block_till_done()
 
     state = hass.states.get("media_player.test_player")
+    assert state is not None
     assert state.state == STATE_PLAYING
 
     # Test player_update progress events
     player.now_playing_media.duration = 360000
     player.now_playing_media.current_position = 1000
-    await player.heos.dispatcher.wait_send(
+    await controller.dispatcher.wait_send(
         SignalType.PLAYER_EVENT,
         player.player_id,
         const.EVENT_PLAYER_NOW_PLAYING_PROGRESS,
     )
     await hass.async_block_till_done()
     state = hass.states.get("media_player.test_player")
+    assert state is not None
     assert state.attributes[ATTR_MEDIA_POSITION_UPDATED_AT] is not None
     assert state.attributes[ATTR_MEDIA_DURATION] == 360
     assert state.attributes[ATTR_MEDIA_POSITION] == 1
@@ -132,7 +149,7 @@ async def test_updates_from_signals(
 async def test_updates_from_connection_event(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Tests player updates from connection event after connection failure."""
@@ -142,82 +159,48 @@ async def test_updates_from_connection_event(
 
     # Connected
     player.available = True
-    await player.heos.dispatcher.wait_send(
-        SignalType.HEOS_EVENT, SignalHeosEvent.CONNECTED
-    )
-    await hass.async_block_till_done()
-    state = hass.states.get("media_player.test_player")
-    assert state.state == STATE_IDLE
-    assert controller.load_players.call_count == 1
-
-    # Disconnected
-    controller.load_players.reset_mock()
-    player.available = False
-    await player.heos.dispatcher.wait_send(
-        SignalType.HEOS_EVENT, SignalHeosEvent.DISCONNECTED
-    )
-    await hass.async_block_till_done()
-    state = hass.states.get("media_player.test_player")
-    assert state.state == STATE_UNAVAILABLE
-    assert controller.load_players.call_count == 0
-
-    # Connected handles refresh failure
-    controller.load_players.reset_mock()
-    controller.load_players.side_effect = CommandFailedError(None, "Failure", 1)
-    player.available = True
-    await player.heos.dispatcher.wait_send(
-        SignalType.HEOS_EVENT, SignalHeosEvent.CONNECTED
-    )
-    await hass.async_block_till_done()
-    state = hass.states.get("media_player.test_player")
-    assert state.state == STATE_IDLE
-    assert controller.load_players.call_count == 1
-    assert "Unable to refresh players" in caplog.text
-
-
-async def test_updates_from_connection_event_new_player_ids(
-    hass: HomeAssistant,
-    entity_registry: er.EntityRegistry,
-    device_registry: dr.DeviceRegistry,
-    config_entry: MockConfigEntry,
-    controller: Heos,
-    change_data_mapped_ids: PlayerUpdateResult,
-) -> None:
-    """Test player ids changed after reconnection updates ids."""
-    config_entry.add_to_hass(hass)
-    assert await hass.config_entries.async_setup(config_entry.entry_id)
-
-    # Assert current IDs
-    assert device_registry.async_get_device(identifiers={(DOMAIN, "1")})
-    assert entity_registry.async_get_entity_id(MEDIA_PLAYER_DOMAIN, DOMAIN, "1")
-
-    # Send event which will result in updated IDs.
-    controller.load_players.return_value = change_data_mapped_ids
     await controller.dispatcher.wait_send(
         SignalType.HEOS_EVENT, SignalHeosEvent.CONNECTED
     )
     await hass.async_block_till_done()
+    state = hass.states.get("media_player.test_player")
+    assert state is not None
+    assert state.state == STATE_IDLE
 
-    # Assert updated IDs and previous don't exist
-    assert not device_registry.async_get_device(identifiers={(DOMAIN, "1")})
-    assert device_registry.async_get_device(identifiers={(DOMAIN, "101")})
-    assert not entity_registry.async_get_entity_id(MEDIA_PLAYER_DOMAIN, DOMAIN, "1")
-    assert entity_registry.async_get_entity_id(MEDIA_PLAYER_DOMAIN, DOMAIN, "101")
+    # Disconnected
+    controller.load_players.reset_mock()
+    player.available = False
+    await controller.dispatcher.wait_send(
+        SignalType.HEOS_EVENT, SignalHeosEvent.DISCONNECTED
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("media_player.test_player")
+    assert state is not None
+    assert state.state == STATE_UNAVAILABLE
+
+    # Reconnect and state updates
+    player.available = True
+    await controller.dispatcher.wait_send(
+        SignalType.HEOS_EVENT, SignalHeosEvent.CONNECTED
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("media_player.test_player")
+    assert state is not None
+    assert state.state == STATE_IDLE
 
 
 async def test_updates_from_sources_updated(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     freezer: FrozenDateTimeFactory,
 ) -> None:
     """Tests player updates from changes in sources list."""
     config_entry.add_to_hass(hass)
     assert await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
 
     controller.get_input_sources.return_value = []
-    await player.heos.dispatcher.wait_send(
+    await controller.dispatcher.wait_send(
         SignalType.CONTROLLER_EVENT, const.EVENT_SOURCES_CHANGED, {}
     )
     freezer.tick(timedelta(seconds=1))
@@ -225,6 +208,7 @@ async def test_updates_from_sources_updated(
     await hass.async_block_till_done()
 
     state = hass.states.get("media_player.test_player")
+    assert state is not None
     assert state.attributes[ATTR_INPUT_SOURCE_LIST] == [
         "Today's Hits Radio",
         "Classical MPR (Classical Music)",
@@ -234,7 +218,7 @@ async def test_updates_from_sources_updated(
 async def test_updates_from_players_changed(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     change_data: PlayerUpdateResult,
 ) -> None:
     """Test player updates from changes to available players."""
@@ -242,13 +226,17 @@ async def test_updates_from_players_changed(
     assert await hass.config_entries.async_setup(config_entry.entry_id)
     player = controller.players[1]
 
-    assert hass.states.get("media_player.test_player").state == STATE_IDLE
+    state = hass.states.get("media_player.test_player")
+    assert state is not None
+    assert state.state == STATE_IDLE
     player.state = PlayState.PLAY
-    await player.heos.dispatcher.wait_send(
+    await controller.dispatcher.wait_send(
         SignalType.CONTROLLER_EVENT, const.EVENT_PLAYERS_CHANGED, change_data
     )
     await hass.async_block_till_done()
-    assert hass.states.get("media_player.test_player").state == STATE_PLAYING
+    state = hass.states.get("media_player.test_player")
+    assert state is not None
+    assert state.state == STATE_PLAYING
 
 
 async def test_updates_from_players_changed_new_ids(
@@ -256,13 +244,12 @@ async def test_updates_from_players_changed_new_ids(
     entity_registry: er.EntityRegistry,
     device_registry: dr.DeviceRegistry,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     change_data_mapped_ids: PlayerUpdateResult,
 ) -> None:
     """Test player updates from changes to available players."""
     config_entry.add_to_hass(hass)
     assert await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
 
     # Assert device registry matches current id
     assert device_registry.async_get_device(identifiers={(DOMAIN, "1")})
@@ -272,7 +259,7 @@ async def test_updates_from_players_changed_new_ids(
         == "media_player.test_player"
     )
 
-    await player.heos.dispatcher.wait_send(
+    await controller.dispatcher.wait_send(
         SignalType.CONTROLLER_EVENT,
         const.EVENT_PLAYERS_CHANGED,
         change_data_mapped_ids,
@@ -293,16 +280,15 @@ async def test_updates_from_players_changed_new_ids(
 async def test_updates_from_user_changed(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     freezer: FrozenDateTimeFactory,
 ) -> None:
     """Tests player updates from changes in user."""
     config_entry.add_to_hass(hass)
     assert await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
 
-    controller._signed_in_username = None
-    await player.heos.dispatcher.wait_send(
+    controller.mock_set_signed_in_username(None)
+    await controller.dispatcher.wait_send(
         SignalType.CONTROLLER_EVENT, const.EVENT_USER_CHANGED, None
     )
     freezer.tick(timedelta(seconds=1))
@@ -310,6 +296,7 @@ async def test_updates_from_user_changed(
     await hass.async_block_till_done()
 
     state = hass.states.get("media_player.test_player")
+    assert state is not None
     assert state.attributes[ATTR_INPUT_SOURCE_LIST] == [
         "HEOS Drive - Line In 1",
         "Speaker - Line In 1",
@@ -317,22 +304,28 @@ async def test_updates_from_user_changed(
 
 
 async def test_updates_from_groups_changed(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test player updates from changes to groups."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
     # Assert current state
-    assert hass.states.get("media_player.test_player").attributes[
-        ATTR_GROUP_MEMBERS
-    ] == ["media_player.test_player", "media_player.test_player_2"]
-    assert hass.states.get("media_player.test_player_2").attributes[
-        ATTR_GROUP_MEMBERS
-    ] == ["media_player.test_player", "media_player.test_player_2"]
+    state = hass.states.get("media_player.test_player")
+    assert state is not None
+    assert state.attributes[ATTR_GROUP_MEMBERS] == [
+        "media_player.test_player",
+        "media_player.test_player_2",
+    ]
+    state = hass.states.get("media_player.test_player_2")
+    assert state is not None
+    assert state.attributes[ATTR_GROUP_MEMBERS] == [
+        "media_player.test_player",
+        "media_player.test_player_2",
+    ]
 
     # Clear group information
-    controller._groups = {}
+    controller.mock_set_groups({})
     for player in controller.players.values():
         player.group_id = None
     await controller.dispatcher.wait_send(
@@ -341,40 +334,37 @@ async def test_updates_from_groups_changed(
     await hass.async_block_till_done()
 
     # Assert groups changed
-    assert (
-        hass.states.get("media_player.test_player").attributes[ATTR_GROUP_MEMBERS]
-        is None
-    )
-    assert (
-        hass.states.get("media_player.test_player_2").attributes[ATTR_GROUP_MEMBERS]
-        is None
-    )
+    state = hass.states.get("media_player.test_player")
+    assert state is not None
+    assert state.attributes[ATTR_GROUP_MEMBERS] is None
+
+    state = hass.states.get("media_player.test_player_2")
+    assert state is not None
+    assert state.attributes[ATTR_GROUP_MEMBERS] is None
 
 
 async def test_clear_playlist(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the clear playlist service."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
     await hass.services.async_call(
         MEDIA_PLAYER_DOMAIN,
         SERVICE_CLEAR_PLAYLIST,
         {ATTR_ENTITY_ID: "media_player.test_player"},
         blocking=True,
     )
-    assert player.clear_queue.call_count == 1
+    assert controller.player_clear_queue.call_count == 1
 
 
 async def test_clear_playlist_error(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test error raised when clear playlist fails."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
-    player.clear_queue.side_effect = CommandFailedError(None, "Failure", 1)
+    controller.player_clear_queue.side_effect = CommandFailedError("", "Failure", 1)
     with pytest.raises(
         HomeAssistantError, match=re.escape("Unable to clear playlist: Failure (1)")
     ):
@@ -384,33 +374,31 @@ async def test_clear_playlist_error(
             {ATTR_ENTITY_ID: "media_player.test_player"},
             blocking=True,
         )
-    assert player.clear_queue.call_count == 1
+    assert controller.player_clear_queue.call_count == 1
 
 
 async def test_pause(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the pause service."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
     await hass.services.async_call(
         MEDIA_PLAYER_DOMAIN,
         SERVICE_MEDIA_PAUSE,
         {ATTR_ENTITY_ID: "media_player.test_player"},
         blocking=True,
     )
-    assert player.pause.call_count == 1
+    assert controller.player_set_play_state.call_count == 1
 
 
 async def test_pause_error(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the pause service raises error."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
-    player.pause.side_effect = CommandFailedError(None, "Failure", 1)
+    controller.player_set_play_state.side_effect = CommandFailedError("", "Failure", 1)
     with pytest.raises(
         HomeAssistantError, match=re.escape("Unable to pause: Failure (1)")
     ):
@@ -420,33 +408,31 @@ async def test_pause_error(
             {ATTR_ENTITY_ID: "media_player.test_player"},
             blocking=True,
         )
-    assert player.pause.call_count == 1
+    assert controller.player_set_play_state.call_count == 1
 
 
 async def test_play(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the play service."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
     await hass.services.async_call(
         MEDIA_PLAYER_DOMAIN,
         SERVICE_MEDIA_PLAY,
         {ATTR_ENTITY_ID: "media_player.test_player"},
         blocking=True,
     )
-    assert player.play.call_count == 1
+    assert controller.player_set_play_state.call_count == 1
 
 
 async def test_play_error(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the play service raises error."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
-    player.play.side_effect = CommandFailedError(None, "Failure", 1)
+    controller.player_set_play_state.side_effect = CommandFailedError("", "Failure", 1)
     with pytest.raises(
         HomeAssistantError, match=re.escape("Unable to play: Failure (1)")
     ):
@@ -456,33 +442,31 @@ async def test_play_error(
             {ATTR_ENTITY_ID: "media_player.test_player"},
             blocking=True,
         )
-    assert player.play.call_count == 1
+    assert controller.player_set_play_state.call_count == 1
 
 
 async def test_previous_track(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the previous track service."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
     await hass.services.async_call(
         MEDIA_PLAYER_DOMAIN,
         SERVICE_MEDIA_PREVIOUS_TRACK,
         {ATTR_ENTITY_ID: "media_player.test_player"},
         blocking=True,
     )
-    assert player.play_previous.call_count == 1
+    assert controller.player_play_previous.call_count == 1
 
 
 async def test_previous_track_error(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the previous track service raises error."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
-    player.play_previous.side_effect = CommandFailedError(None, "Failure", 1)
+    controller.player_play_previous.side_effect = CommandFailedError("", "Failure", 1)
     with pytest.raises(
         HomeAssistantError,
         match=re.escape("Unable to move to previous track: Failure (1)"),
@@ -493,33 +477,31 @@ async def test_previous_track_error(
             {ATTR_ENTITY_ID: "media_player.test_player"},
             blocking=True,
         )
-    assert player.play_previous.call_count == 1
+    assert controller.player_play_previous.call_count == 1
 
 
 async def test_next_track(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the next track service."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
     await hass.services.async_call(
         MEDIA_PLAYER_DOMAIN,
         SERVICE_MEDIA_NEXT_TRACK,
         {ATTR_ENTITY_ID: "media_player.test_player"},
         blocking=True,
     )
-    assert player.play_next.call_count == 1
+    assert controller.player_play_next.call_count == 1
 
 
 async def test_next_track_error(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the next track service raises error."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
-    player.play_next.side_effect = CommandFailedError(None, "Failure", 1)
+    controller.player_play_next.side_effect = CommandFailedError("", "Failure", 1)
     with pytest.raises(
         HomeAssistantError,
         match=re.escape("Unable to move to next track: Failure (1)"),
@@ -530,33 +512,31 @@ async def test_next_track_error(
             {ATTR_ENTITY_ID: "media_player.test_player"},
             blocking=True,
         )
-    assert player.play_next.call_count == 1
+    assert controller.player_play_next.call_count == 1
 
 
 async def test_stop(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the stop service."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
     await hass.services.async_call(
         MEDIA_PLAYER_DOMAIN,
         SERVICE_MEDIA_STOP,
         {ATTR_ENTITY_ID: "media_player.test_player"},
         blocking=True,
     )
-    assert player.stop.call_count == 1
+    assert controller.player_set_play_state.call_count == 1
 
 
 async def test_stop_error(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the stop service raises error."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
-    player.stop.side_effect = CommandFailedError(None, "Failure", 1)
+    controller.player_set_play_state.side_effect = CommandFailedError("", "Failure", 1)
     with pytest.raises(
         HomeAssistantError,
         match=re.escape("Unable to stop: Failure (1)"),
@@ -567,33 +547,31 @@ async def test_stop_error(
             {ATTR_ENTITY_ID: "media_player.test_player"},
             blocking=True,
         )
-    assert player.stop.call_count == 1
+    assert controller.player_set_play_state.call_count == 1
 
 
 async def test_volume_mute(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the volume mute service."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
     await hass.services.async_call(
         MEDIA_PLAYER_DOMAIN,
         SERVICE_VOLUME_MUTE,
         {ATTR_ENTITY_ID: "media_player.test_player", ATTR_MEDIA_VOLUME_MUTED: True},
         blocking=True,
     )
-    assert player.set_mute.call_count == 1
+    assert controller.player_set_mute.call_count == 1
 
 
 async def test_volume_mute_error(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the volume mute service raises error."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
-    player.set_mute.side_effect = CommandFailedError(None, "Failure", 1)
+    controller.player_set_mute.side_effect = CommandFailedError("", "Failure", 1)
     with pytest.raises(
         HomeAssistantError,
         match=re.escape("Unable to set mute: Failure (1)"),
@@ -604,11 +582,11 @@ async def test_volume_mute_error(
             {ATTR_ENTITY_ID: "media_player.test_player", ATTR_MEDIA_VOLUME_MUTED: True},
             blocking=True,
         )
-    assert player.set_mute.call_count == 1
+    assert controller.player_set_mute.call_count == 1
 
 
 async def test_shuffle_set(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the shuffle set service."""
     config_entry.add_to_hass(hass)
@@ -620,17 +598,17 @@ async def test_shuffle_set(
         {ATTR_ENTITY_ID: "media_player.test_player", ATTR_MEDIA_SHUFFLE: True},
         blocking=True,
     )
-    player.set_play_mode.assert_called_once_with(player.repeat, True)
+    controller.player_set_play_mode.assert_called_once_with(1, player.repeat, True)
 
 
 async def test_shuffle_set_error(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the shuffle set service raises error."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
     player = controller.players[1]
-    player.set_play_mode.side_effect = CommandFailedError(None, "Failure", 1)
+    controller.player_set_play_mode.side_effect = CommandFailedError("", "Failure", 1)
     with pytest.raises(
         HomeAssistantError,
         match=re.escape("Unable to set shuffle: Failure (1)"),
@@ -641,11 +619,11 @@ async def test_shuffle_set_error(
             {ATTR_ENTITY_ID: "media_player.test_player", ATTR_MEDIA_SHUFFLE: True},
             blocking=True,
         )
-    player.set_play_mode.assert_called_once_with(player.repeat, True)
+    controller.player_set_play_mode.assert_called_once_with(1, player.repeat, True)
 
 
 async def test_repeat_set(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the repeat set service."""
     config_entry.add_to_hass(hass)
@@ -657,17 +635,19 @@ async def test_repeat_set(
         {ATTR_ENTITY_ID: "media_player.test_player", ATTR_MEDIA_REPEAT: RepeatMode.ONE},
         blocking=True,
     )
-    player.set_play_mode.assert_called_once_with(RepeatType.ON_ONE, player.shuffle)
+    controller.player_set_play_mode.assert_called_once_with(
+        1, RepeatType.ON_ONE, player.shuffle
+    )
 
 
 async def test_repeat_set_error(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the repeat set service raises error."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
     player = controller.players[1]
-    player.set_play_mode.side_effect = CommandFailedError(None, "Failure", 1)
+    controller.player_set_play_mode.side_effect = CommandFailedError("", "Failure", 1)
     with pytest.raises(
         HomeAssistantError,
         match=re.escape("Unable to set repeat: Failure (1)"),
@@ -681,33 +661,33 @@ async def test_repeat_set_error(
             },
             blocking=True,
         )
-    player.set_play_mode.assert_called_once_with(RepeatType.ON_ALL, player.shuffle)
+    controller.player_set_play_mode.assert_called_once_with(
+        1, RepeatType.ON_ALL, player.shuffle
+    )
 
 
 async def test_volume_set(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the volume set service."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
     await hass.services.async_call(
         MEDIA_PLAYER_DOMAIN,
         SERVICE_VOLUME_SET,
         {ATTR_ENTITY_ID: "media_player.test_player", ATTR_MEDIA_VOLUME_LEVEL: 1},
         blocking=True,
     )
-    player.set_volume.assert_called_once_with(100)
+    controller.player_set_volume.assert_called_once_with(1, 100)
 
 
 async def test_volume_set_error(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the volume set service raises error."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
-    player.set_volume.side_effect = CommandFailedError(None, "Failure", 1)
+    controller.player_set_volume.side_effect = CommandFailedError("", "Failure", 1)
     with pytest.raises(
         HomeAssistantError,
         match=re.escape("Unable to set volume level: Failure (1)"),
@@ -718,13 +698,127 @@ async def test_volume_set_error(
             {ATTR_ENTITY_ID: "media_player.test_player", ATTR_MEDIA_VOLUME_LEVEL: 1},
             blocking=True,
         )
-    player.set_volume.assert_called_once_with(100)
+    controller.player_set_volume.assert_called_once_with(1, 100)
+
+
+async def test_group_volume_set(
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
+) -> None:
+    """Test the group volume set service."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_GROUP_VOLUME_SET,
+        {ATTR_ENTITY_ID: "media_player.test_player", ATTR_MEDIA_VOLUME_LEVEL: 1},
+        blocking=True,
+    )
+    controller.set_group_volume.assert_called_once_with(999, 100)
+
+
+async def test_group_volume_set_error(
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
+) -> None:
+    """Test the group volume set service errors."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    controller.set_group_volume.side_effect = CommandFailedError("", "Failure", 1)
+    with pytest.raises(
+        HomeAssistantError,
+        match=re.escape("Unable to set group volume level: Failure (1)"),
+    ):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_GROUP_VOLUME_SET,
+            {ATTR_ENTITY_ID: "media_player.test_player", ATTR_MEDIA_VOLUME_LEVEL: 1},
+            blocking=True,
+        )
+    controller.set_group_volume.assert_called_once_with(999, 100)
+
+
+async def test_group_volume_set_not_grouped_error(
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
+) -> None:
+    """Test the group volume set service when not grouped raises error."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    player = controller.players[1]
+    player.group_id = None
+    with pytest.raises(
+        ServiceValidationError,
+        match=re.escape("Entity media_player.test_player is not joined to a group"),
+    ):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_GROUP_VOLUME_SET,
+            {ATTR_ENTITY_ID: "media_player.test_player", ATTR_MEDIA_VOLUME_LEVEL: 1},
+            blocking=True,
+        )
+    controller.set_group_volume.assert_not_called()
+
+
+async def test_group_volume_down(
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
+) -> None:
+    """Test the group volume down service."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_GROUP_VOLUME_DOWN,
+        {ATTR_ENTITY_ID: "media_player.test_player"},
+        blocking=True,
+    )
+    controller.group_volume_down.assert_called_with(999)
+
+
+async def test_group_volume_up(
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
+) -> None:
+    """Test the group volume up service."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_GROUP_VOLUME_UP,
+        {ATTR_ENTITY_ID: "media_player.test_player"},
+        blocking=True,
+    )
+    controller.group_volume_up.assert_called_with(999)
+
+
+@pytest.mark.parametrize(
+    "service", [SERVICE_GROUP_VOLUME_DOWN, SERVICE_GROUP_VOLUME_UP]
+)
+async def test_group_volume_down_up_ungrouped_raises(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    controller: MockHeos,
+    service: str,
+) -> None:
+    """Test the group volume down and up service raise if player ungrouped."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    player = controller.players[1]
+    player.group_id = None
+    with pytest.raises(
+        ServiceValidationError,
+        match=re.escape("Entity media_player.test_player is not joined to a group"),
+    ):
+        await hass.services.async_call(
+            DOMAIN,
+            service,
+            {ATTR_ENTITY_ID: "media_player.test_player"},
+            blocking=True,
+        )
+    controller.group_volume_down.assert_not_called()
+    controller.group_volume_up.assert_not_called()
 
 
 async def test_select_favorite(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     favorites: dict[int, MediaItem],
 ) -> None:
     """Tests selecting a music service favorite and state."""
@@ -739,22 +833,23 @@ async def test_select_favorite(
         {ATTR_ENTITY_ID: "media_player.test_player", ATTR_INPUT_SOURCE: favorite.name},
         blocking=True,
     )
-    player.play_preset_station.assert_called_once_with(1)
+    controller.play_preset_station.assert_called_once_with(1, 1)
     # Test state is matched by station name
     player.now_playing_media.type = HeosMediaType.STATION
     player.now_playing_media.station = favorite.name
-    await player.heos.dispatcher.wait_send(
+    await controller.dispatcher.wait_send(
         SignalType.PLAYER_EVENT, player.player_id, const.EVENT_PLAYER_STATE_CHANGED
     )
     await hass.async_block_till_done()
     state = hass.states.get("media_player.test_player")
+    assert state is not None
     assert state.attributes[ATTR_INPUT_SOURCE] == favorite.name
 
 
 async def test_select_radio_favorite(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     favorites: dict[int, MediaItem],
 ) -> None:
     """Tests selecting a radio favorite and state."""
@@ -769,32 +864,32 @@ async def test_select_radio_favorite(
         {ATTR_ENTITY_ID: "media_player.test_player", ATTR_INPUT_SOURCE: favorite.name},
         blocking=True,
     )
-    player.play_preset_station.assert_called_once_with(2)
+    controller.play_preset_station.assert_called_once_with(1, 2)
     # Test state is matched by album id
     player.now_playing_media.type = HeosMediaType.STATION
     player.now_playing_media.station = "Classical"
     player.now_playing_media.album_id = favorite.media_id
-    await player.heos.dispatcher.wait_send(
+    await controller.dispatcher.wait_send(
         SignalType.PLAYER_EVENT, player.player_id, const.EVENT_PLAYER_STATE_CHANGED
     )
     await hass.async_block_till_done()
     state = hass.states.get("media_player.test_player")
+    assert state is not None
     assert state.attributes[ATTR_INPUT_SOURCE] == favorite.name
 
 
 async def test_select_radio_favorite_command_error(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     favorites: dict[int, MediaItem],
 ) -> None:
     """Tests command error raises when playing favorite."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
     # Test set radio preset
     favorite = favorites[2]
-    player.play_preset_station.side_effect = CommandFailedError(None, "Failure", 1)
+    controller.play_preset_station.side_effect = CommandFailedError("", "Failure", 1)
     with pytest.raises(
         HomeAssistantError,
         match=re.escape("Unable to select source: Failure (1)"),
@@ -808,7 +903,7 @@ async def test_select_radio_favorite_command_error(
             },
             blocking=True,
         )
-    player.play_preset_station.assert_called_once_with(2)
+    controller.play_preset_station.assert_called_once_with(1, 2)
 
 
 @pytest.mark.parametrize(
@@ -821,7 +916,7 @@ async def test_select_radio_favorite_command_error(
 async def test_select_input_source(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     input_sources: list[MediaItem],
     source_name: str,
     station: str,
@@ -840,21 +935,24 @@ async def test_select_input_source(
         },
         blocking=True,
     )
-    input_sources = next(
+    input_source = next(
         input_sources
         for input_sources in input_sources
         if input_sources.name == source_name
     )
-    player.play_media.assert_called_once_with(input_sources)
+    controller.play_media.assert_called_once_with(
+        1, input_source, AddCriteriaType.PLAY_NOW
+    )
     # Update the now_playing_media to reflect play_media
     player.now_playing_media.source_id = const.MUSIC_SOURCE_AUX_INPUT
     player.now_playing_media.station = station
     player.now_playing_media.media_id = const.INPUT_AUX_IN_1
-    await player.heos.dispatcher.wait_send(
+    await controller.dispatcher.wait_send(
         SignalType.PLAYER_EVENT, player.player_id, const.EVENT_PLAYER_STATE_CHANGED
     )
     await hass.async_block_till_done()
     state = hass.states.get("media_player.test_player")
+    assert state is not None
     assert state.attributes[ATTR_INPUT_SOURCE] == source_name
 
 
@@ -879,15 +977,14 @@ async def test_select_input_unknown_raises(
 async def test_select_input_command_error(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     input_sources: list[MediaItem],
 ) -> None:
     """Tests selecting an unknown input."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
     input_source = input_sources[0]
-    player.play_media.side_effect = CommandFailedError(None, "Failure", 1)
+    controller.play_media.side_effect = CommandFailedError("", "Failure", 1)
     with pytest.raises(
         HomeAssistantError,
         match=re.escape("Unable to select source: Failure (1)"),
@@ -901,7 +998,9 @@ async def test_select_input_command_error(
             },
             blocking=True,
         )
-    player.play_media.assert_called_once_with(input_source)
+    controller.play_media.assert_called_once_with(
+        1, input_source, AddCriteriaType.PLAY_NOW
+    )
 
 
 async def test_unload_config_entry(
@@ -911,20 +1010,21 @@ async def test_unload_config_entry(
     config_entry.add_to_hass(hass)
     assert await hass.config_entries.async_setup(config_entry.entry_id)
     assert await hass.config_entries.async_unload(config_entry.entry_id)
-    assert hass.states.get("media_player.test_player").state == STATE_UNAVAILABLE
+    state = hass.states.get("media_player.test_player")
+    assert state is not None
+    assert state.state == STATE_UNAVAILABLE
 
 
 @pytest.mark.parametrize("media_type", [MediaType.URL, MediaType.MUSIC])
 async def test_play_media(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     media_type: MediaType,
 ) -> None:
     """Test the play media service with type url."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
     url = "http://news/podcast.mp3"
     await hass.services.async_call(
         MEDIA_PLAYER_DOMAIN,
@@ -936,21 +1036,20 @@ async def test_play_media(
         },
         blocking=True,
     )
-    player.play_url.assert_called_once_with(url)
+    controller.play_url.assert_called_once_with(1, url)
 
 
 @pytest.mark.parametrize("media_type", [MediaType.URL, MediaType.MUSIC])
 async def test_play_media_error(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     media_type: MediaType,
 ) -> None:
     """Test the play media service with type url error raises."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
-    player.play_url.side_effect = CommandFailedError(None, "Failure", 1)
+    controller.play_url.side_effect = CommandFailedError("", "Failure", 1)
     url = "http://news/podcast.mp3"
     with pytest.raises(
         HomeAssistantError,
@@ -966,7 +1065,7 @@ async def test_play_media_error(
             },
             blocking=True,
         )
-    player.play_url.assert_called_once_with(url)
+    controller.play_url.assert_called_once_with(1, url)
 
 
 @pytest.mark.parametrize(
@@ -975,14 +1074,13 @@ async def test_play_media_error(
 async def test_play_media_quick_select(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     content_id: str,
     expected_index: int,
 ) -> None:
     """Test the play media service with type quick_select."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
     await hass.services.async_call(
         MEDIA_PLAYER_DOMAIN,
         SERVICE_PLAY_MEDIA,
@@ -993,16 +1091,15 @@ async def test_play_media_quick_select(
         },
         blocking=True,
     )
-    player.play_quick_select.assert_called_once_with(expected_index)
+    controller.player_play_quick_select.assert_called_once_with(1, expected_index)
 
 
 async def test_play_media_quick_select_error(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the play media service with invalid quick_select raises."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
     with pytest.raises(
         HomeAssistantError,
         match=re.escape("Unable to play media: Invalid quick select 'Invalid'"),
@@ -1017,7 +1114,7 @@ async def test_play_media_quick_select_error(
             },
             blocking=True,
         )
-    assert player.play_quick_select.call_count == 0
+    assert controller.player_play_quick_select.call_count == 0
 
 
 @pytest.mark.parametrize(
@@ -1031,7 +1128,7 @@ async def test_play_media_quick_select_error(
 async def test_play_media_playlist(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     playlists: list[MediaItem],
     enqueue: Any,
     criteria: AddCriteriaType,
@@ -1039,7 +1136,6 @@ async def test_play_media_playlist(
     """Test the play media service with type playlist."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
     playlist = playlists[0]
     service_data = {
         ATTR_ENTITY_ID: "media_player.test_player",
@@ -1054,16 +1150,15 @@ async def test_play_media_playlist(
         service_data,
         blocking=True,
     )
-    player.add_to_queue.assert_called_once_with(playlist, criteria)
+    controller.play_media.assert_called_once_with(1, playlist, criteria)
 
 
 async def test_play_media_playlist_error(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the play media service with an invalid playlist name."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
     with pytest.raises(
         HomeAssistantError,
         match=re.escape("Unable to play media: Invalid playlist 'Invalid'"),
@@ -1078,7 +1173,7 @@ async def test_play_media_playlist_error(
             },
             blocking=True,
         )
-    assert player.add_to_queue.call_count == 0
+    assert controller.add_to_queue.call_count == 0
 
 
 @pytest.mark.parametrize(
@@ -1087,14 +1182,13 @@ async def test_play_media_playlist_error(
 async def test_play_media_favorite(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     content_id: str,
     expected_index: int,
 ) -> None:
     """Test the play media service with type favorite."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
     await hass.services.async_call(
         MEDIA_PLAYER_DOMAIN,
         SERVICE_PLAY_MEDIA,
@@ -1105,16 +1199,15 @@ async def test_play_media_favorite(
         },
         blocking=True,
     )
-    player.play_preset_station.assert_called_once_with(expected_index)
+    controller.play_preset_station.assert_called_once_with(1, expected_index)
 
 
 async def test_play_media_favorite_error(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the play media service with an invalid favorite raises."""
     config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(config_entry.entry_id)
-    player = controller.players[1]
     with pytest.raises(
         HomeAssistantError,
         match=re.escape("Unable to play media: Invalid favorite 'Invalid'"),
@@ -1129,7 +1222,7 @@ async def test_play_media_favorite_error(
             },
             blocking=True,
         )
-    assert player.play_preset_station.call_count == 0
+    assert controller.play_preset_station.call_count == 0
 
 
 async def test_play_media_invalid_type(
@@ -1154,6 +1247,312 @@ async def test_play_media_invalid_type(
         )
 
 
+async def test_play_media_media_uri(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    controller: MockHeos,
+    playlist: MediaItem,
+) -> None:
+    """Test the play media service with HEOS media uri."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    media_content_id = mediauri.to_media_uri(playlist)
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_PLAY_MEDIA,
+        {
+            ATTR_ENTITY_ID: "media_player.test_player",
+            ATTR_MEDIA_CONTENT_ID: media_content_id,
+            ATTR_MEDIA_CONTENT_TYPE: "",
+        },
+        blocking=True,
+    )
+    controller.play_media.assert_called_once()
+
+
+async def test_play_media_media_uri_invalid(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    controller: MockHeos,
+) -> None:
+    """Test the play media service with an invalid HEOS media uri raises."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    media_id = "heos://media/1/music_service?name=Pandora&available=False&image_url="
+
+    with pytest.raises(
+        HomeAssistantError,
+        match=re.escape(f"Unable to play media: Invalid media id '{media_id}'"),
+    ):
+        await hass.services.async_call(
+            MEDIA_PLAYER_DOMAIN,
+            SERVICE_PLAY_MEDIA,
+            {
+                ATTR_ENTITY_ID: "media_player.test_player",
+                ATTR_MEDIA_CONTENT_ID: media_id,
+                ATTR_MEDIA_CONTENT_TYPE: "",
+            },
+            blocking=True,
+        )
+    controller.play_media.assert_not_called()
+
+
+async def test_play_media_music_source_url(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    controller: MockHeos,
+) -> None:
+    """Test the play media service with a music source url."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await async_setup_component(hass, MS_DOMAIN, {MS_DOMAIN: {}})
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_PLAY_MEDIA,
+        {
+            ATTR_ENTITY_ID: "media_player.test_player",
+            ATTR_MEDIA_CONTENT_ID: "media-source://media_source/local/test.mp3",
+            ATTR_MEDIA_CONTENT_TYPE: "",
+        },
+        blocking=True,
+    )
+    controller.play_url.assert_called_once()
+
+
+async def test_play_media_queue(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    controller: MockHeos,
+) -> None:
+    """Test the play media service with type queue."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_PLAY_MEDIA,
+        {
+            ATTR_ENTITY_ID: "media_player.test_player",
+            ATTR_MEDIA_CONTENT_TYPE: "queue",
+            ATTR_MEDIA_CONTENT_ID: "2",
+        },
+        blocking=True,
+    )
+    controller.player_play_queue.assert_called_once_with(1, 2)
+
+
+async def test_play_media_queue_invalid(
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
+) -> None:
+    """Test the play media service with an invalid queue id."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    with pytest.raises(
+        HomeAssistantError,
+        match=re.escape("Unable to play media: Invalid queue id 'Invalid'"),
+    ):
+        await hass.services.async_call(
+            MEDIA_PLAYER_DOMAIN,
+            SERVICE_PLAY_MEDIA,
+            {
+                ATTR_ENTITY_ID: "media_player.test_player",
+                ATTR_MEDIA_CONTENT_TYPE: "queue",
+                ATTR_MEDIA_CONTENT_ID: "Invalid",
+            },
+            blocking=True,
+        )
+    assert controller.player_play_queue.call_count == 0
+
+
+async def test_browse_media_root(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    controller: MockHeos,
+    music_sources: dict[int, MediaMusicSource],
+    hass_ws_client: WebSocketGenerator,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test browsing the root."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await async_setup_component(hass, MS_DOMAIN, {MS_DOMAIN: {}})
+
+    controller.mock_set_music_sources(music_sources)
+
+    client = await hass_ws_client()
+    await client.send_json(
+        {
+            "id": 1,
+            "type": "media_player/browse_media",
+            "entity_id": "media_player.test_player",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == snapshot
+
+
+async def test_browse_media_root_no_media_source(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    controller: MockHeos,
+    music_sources: dict[int, MediaMusicSource],
+    hass_ws_client: WebSocketGenerator,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test browsing the root."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    controller.mock_set_music_sources(music_sources)
+
+    client = await hass_ws_client()
+    await client.send_json(
+        {
+            "id": 1,
+            "type": "media_player/browse_media",
+            "entity_id": "media_player.test_player",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == snapshot
+
+
+async def test_browse_media_root_source_error_continues(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    controller: MockHeos,
+    hass_ws_client: WebSocketGenerator,
+    caplog: pytest.LogCaptureFixture,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test browsing the root with an error getting sources continues."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    controller.get_music_sources.side_effect = HeosError("error")
+
+    client = await hass_ws_client()
+    await client.send_json(
+        {
+            "id": 1,
+            "type": "media_player/browse_media",
+            "entity_id": "media_player.test_player",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == snapshot
+    assert "Unable to load music sources" in caplog.text
+
+
+async def test_browse_media_heos_media(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    controller: MockHeos,
+    hass_ws_client: WebSocketGenerator,
+    pandora_browse_result: BrowseResult,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test browsing a heos media item."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    controller.browse_media.return_value = pandora_browse_result
+
+    client = await hass_ws_client()
+    await client.send_json(
+        {
+            "id": 1,
+            "type": "media_player/browse_media",
+            "entity_id": "media_player.test_player",
+            "media_content_id": "heos://media/1/music_service?name=Pandora&image_url=&available=True&service_username=user",
+            "media_content_type": "",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == snapshot
+
+
+async def test_browse_media_heos_media_error_returns_empty(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    controller: MockHeos,
+    hass_ws_client: WebSocketGenerator,
+    caplog: pytest.LogCaptureFixture,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test browsing a heos media item results in an error, returns empty children."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    controller.browse_media.side_effect = HeosError("error")
+
+    client = await hass_ws_client()
+    await client.send_json(
+        {
+            "id": 1,
+            "type": "media_player/browse_media",
+            "entity_id": "media_player.test_player",
+            "media_content_id": "heos://media/1/music_service?name=Pandora&image_url=&available=True&service_username=user",
+            "media_content_type": "",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == snapshot
+    assert "Unable to browse media" in caplog.text
+
+
+async def test_browse_media_media_source(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    hass_ws_client: WebSocketGenerator,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test browsing a media source."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await async_setup_component(hass, MS_DOMAIN, {MS_DOMAIN: {}})
+
+    client = await hass_ws_client()
+    await client.send_json(
+        {
+            "id": 1,
+            "type": "media_player/browse_media",
+            "entity_id": "media_player.test_player",
+            "media_content_id": "media-source://media_source/local/.",
+            "media_content_type": "",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == snapshot
+
+
+async def test_browse_media_invalid_content_id(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test browsing an invalid content id fails."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+
+    client = await hass_ws_client()
+    await client.send_json(
+        {
+            "id": 1,
+            "type": "media_player/browse_media",
+            "entity_id": "media_player.test_player",
+            "media_content_id": "invalid",
+            "media_content_type": "",
+        }
+    )
+    response = await client.receive_json()
+    assert not response["success"]
+
+
 @pytest.mark.parametrize(
     ("members", "expected"),
     [
@@ -1165,7 +1564,7 @@ async def test_play_media_invalid_type(
 async def test_media_player_join_group(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     members: list[str],
     expected: tuple[int, list[int]],
 ) -> None:
@@ -1185,7 +1584,7 @@ async def test_media_player_join_group(
 
 
 async def test_media_player_join_group_error(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test grouping of media players through the join service raises error."""
     config_entry.add_to_hass(hass)
@@ -1209,13 +1608,14 @@ async def test_media_player_join_group_error(
 async def test_media_player_group_members(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test group_members attribute."""
     config_entry.add_to_hass(hass)
     assert await hass.config_entries.async_setup(config_entry.entry_id)
     player_entity = hass.states.get("media_player.test_player")
+    assert player_entity is not None
     assert player_entity.attributes[ATTR_GROUP_MEMBERS] == [
         "media_player.test_player",
         "media_player.test_player_2",
@@ -1227,16 +1627,17 @@ async def test_media_player_group_members(
 async def test_media_player_group_members_error(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test error in HEOS API."""
+    controller.mock_set_groups({})
     controller.get_groups.side_effect = HeosError("error")
-    controller._groups = {}
     config_entry.add_to_hass(hass)
     assert await hass.config_entries.async_setup(config_entry.entry_id)
     assert "Unable to retrieve groups" in caplog.text
     player_entity = hass.states.get("media_player.test_player")
+    assert player_entity is not None
     assert player_entity.attributes[ATTR_GROUP_MEMBERS] is None
 
 
@@ -1247,7 +1648,7 @@ async def test_media_player_group_members_error(
 async def test_media_player_unjoin_group(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     entity_id: str,
     expected_args: list[int],
 ) -> None:
@@ -1266,7 +1667,7 @@ async def test_media_player_unjoin_group(
 
 
 async def test_media_player_unjoin_group_error(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test ungrouping of media players through the unjoin service error raises."""
     config_entry.add_to_hass(hass)
@@ -1289,7 +1690,7 @@ async def test_media_player_unjoin_group_error(
 async def test_media_player_group_fails_when_entity_removed(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     entity_registry: er.EntityRegistry,
 ) -> None:
     """Test grouping fails when entity removed."""
@@ -1316,7 +1717,7 @@ async def test_media_player_group_fails_when_entity_removed(
 async def test_media_player_group_fails_wrong_integration(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    controller: Heos,
+    controller: MockHeos,
     entity_registry: er.EntityRegistry,
 ) -> None:
     """Test grouping fails when trying to join from the wrong integration."""
@@ -1342,3 +1743,27 @@ async def test_media_player_group_fails_wrong_integration(
             blocking=True,
         )
     controller.set_group.assert_not_called()
+
+
+async def test_get_queue(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    controller: MockHeos,
+    queue: list[QueueItem],
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test the get queue service."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    controller.player_get_queue.return_value = queue
+    response = await hass.services.async_call(
+        DOMAIN,
+        SERVICE_GET_QUEUE,
+        {
+            ATTR_ENTITY_ID: "media_player.test_player",
+        },
+        blocking=True,
+        return_response=True,
+    )
+    controller.player_get_queue.assert_called_once_with(1, None, None)
+    assert response == snapshot
diff --git a/tests/components/heos/test_services.py b/tests/components/heos/test_services.py
index 8ca365497c6..151571ceb50 100644
--- a/tests/components/heos/test_services.py
+++ b/tests/components/heos/test_services.py
@@ -1,6 +1,6 @@
 """Tests for the services module."""
 
-from pyheos import CommandAuthenticationError, Heos, HeosError
+from pyheos import CommandAuthenticationError, HeosError
 import pytest
 
 from homeassistant.components.heos.const import (
@@ -11,13 +11,15 @@ from homeassistant.components.heos.const import (
     SERVICE_SIGN_OUT,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
+from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
+
+from . import MockHeos
 
 from tests.common import MockConfigEntry
 
 
 async def test_sign_in(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the sign-in service."""
     config_entry.add_to_hass(hass)
@@ -34,10 +36,7 @@ async def test_sign_in(
 
 
 async def test_sign_in_failed(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    controller: Heos,
-    caplog: pytest.LogCaptureFixture,
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test sign-in service logs error when not connected."""
     config_entry.add_to_hass(hass)
@@ -47,22 +46,19 @@ async def test_sign_in_failed(
         "", "Invalid credentials", 6
     )
 
-    await hass.services.async_call(
-        DOMAIN,
-        SERVICE_SIGN_IN,
-        {ATTR_USERNAME: "test@test.com", ATTR_PASSWORD: "password"},
-        blocking=True,
-    )
+    with pytest.raises(ServiceValidationError):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_SIGN_IN,
+            {ATTR_USERNAME: "test@test.com", ATTR_PASSWORD: "password"},
+            blocking=True,
+        )
 
     controller.sign_in.assert_called_once_with("test@test.com", "password")
-    assert "Sign in failed: Invalid credentials (6)" in caplog.text
 
 
 async def test_sign_in_unknown_error(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    controller: Heos,
-    caplog: pytest.LogCaptureFixture,
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test sign-in service logs error for failure."""
     config_entry.add_to_hass(hass)
@@ -70,15 +66,15 @@ async def test_sign_in_unknown_error(
 
     controller.sign_in.side_effect = HeosError()
 
-    await hass.services.async_call(
-        DOMAIN,
-        SERVICE_SIGN_IN,
-        {ATTR_USERNAME: "test@test.com", ATTR_PASSWORD: "password"},
-        blocking=True,
-    )
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_SIGN_IN,
+            {ATTR_USERNAME: "test@test.com", ATTR_PASSWORD: "password"},
+            blocking=True,
+        )
 
     controller.sign_in.assert_called_once_with("test@test.com", "password")
-    assert "Unable to sign in" in caplog.text
 
 
 async def test_sign_in_not_loaded_raises(
@@ -99,7 +95,7 @@ async def test_sign_in_not_loaded_raises(
 
 
 async def test_sign_out(
-    hass: HomeAssistant, config_entry: MockConfigEntry, controller: Heos
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the sign-out service."""
     config_entry.add_to_hass(hass)
@@ -123,17 +119,14 @@ async def test_sign_out_not_loaded_raises(
 
 
 async def test_sign_out_unknown_error(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    controller: Heos,
-    caplog: pytest.LogCaptureFixture,
+    hass: HomeAssistant, config_entry: MockConfigEntry, controller: MockHeos
 ) -> None:
     """Test the sign-out service."""
     config_entry.add_to_hass(hass)
     assert await hass.config_entries.async_setup(config_entry.entry_id)
     controller.sign_out.side_effect = HeosError()
 
-    await hass.services.async_call(DOMAIN, SERVICE_SIGN_OUT, {}, blocking=True)
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(DOMAIN, SERVICE_SIGN_OUT, {}, blocking=True)
 
     assert controller.sign_out.call_count == 1
-    assert "Unable to sign out" in caplog.text
diff --git a/tests/components/history/test_init.py b/tests/components/history/test_init.py
index 3b4b02a877e..f1890073567 100644
--- a/tests/components/history/test_init.py
+++ b/tests/components/history/test_init.py
@@ -16,7 +16,7 @@ from homeassistant.const import EVENT_HOMEASSISTANT_FINAL_WRITE
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers.json import JSONEncoder
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.components.recorder.common import (
     assert_dict_of_states_equal_without_context_and_last_changed,
diff --git a/tests/components/history/test_websocket_api.py b/tests/components/history/test_websocket_api.py
index 717840c6b05..01b49ad5575 100644
--- a/tests/components/history/test_websocket_api.py
+++ b/tests/components/history/test_websocket_api.py
@@ -14,7 +14,7 @@ from homeassistant.const import EVENT_HOMEASSISTANT_FINAL_WRITE, STATE_OFF, STAT
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 from tests.components.recorder.common import (
diff --git a/tests/components/history/test_websocket_api_schema_32.py b/tests/components/history/test_websocket_api_schema_32.py
index 301de387c80..c9577e20fcf 100644
--- a/tests/components/history/test_websocket_api_schema_32.py
+++ b/tests/components/history/test_websocket_api_schema_32.py
@@ -1,12 +1,14 @@
 """The tests the History component websocket_api."""
 
+from collections.abc import Generator
+
 import pytest
 
 from homeassistant.components import recorder
 from homeassistant.components.recorder import Recorder
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.components.recorder.common import (
     async_recorder_block_till_done,
@@ -17,9 +19,9 @@ from tests.typing import WebSocketGenerator
 
 
 @pytest.fixture(autouse=True)
-def db_schema_32():
+def db_schema_32(hass: HomeAssistant) -> Generator[None]:
     """Fixture to initialize the db with the old schema 32."""
-    with old_db_schema("32"):
+    with old_db_schema(hass, "32"):
         yield
 
 
diff --git a/tests/components/history_stats/test_sensor.py b/tests/components/history_stats/test_sensor.py
index 3039612d1a0..e2dba1b9355 100644
--- a/tests/components/history_stats/test_sensor.py
+++ b/tests/components/history_stats/test_sensor.py
@@ -7,7 +7,7 @@ from freezegun import freeze_time
 import pytest
 import voluptuous as vol
 
-from homeassistant import config as hass_config
+from homeassistant import config as hass_config, core as ha
 from homeassistant.components.history_stats.const import (
     CONF_END,
     CONF_START,
@@ -27,12 +27,11 @@ from homeassistant.const import (
     SERVICE_RELOAD,
     STATE_UNKNOWN,
 )
-import homeassistant.core as ha
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_component import async_update_entity
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed, get_fixture_path
 from tests.components.recorder.common import async_wait_recording_done
@@ -123,6 +122,7 @@ async def test_setup_multiple_states(
         },
     ],
 )
+@pytest.mark.usefixtures("hass")
 def test_setup_invalid_config(config) -> None:
     """Test the history statistics sensor setup with invalid config."""
 
diff --git a/tests/components/holiday/test_calendar.py b/tests/components/holiday/test_calendar.py
index db58b7b1f73..6733d38442b 100644
--- a/tests/components/holiday/test_calendar.py
+++ b/tests/components/holiday/test_calendar.py
@@ -49,7 +49,7 @@ async def test_holiday_calendar_entity(
         SERVICE_GET_EVENTS,
         {
             "entity_id": "calendar.united_states_ak",
-            "end_date_time": dt_util.now(),
+            "end_date_time": dt_util.now() + timedelta(hours=1),
         },
         blocking=True,
         return_response=True,
@@ -135,7 +135,7 @@ async def test_default_language(
         SERVICE_GET_EVENTS,
         {
             "entity_id": "calendar.france_bl",
-            "end_date_time": dt_util.now(),
+            "end_date_time": dt_util.now() + timedelta(hours=1),
         },
         blocking=True,
         return_response=True,
@@ -164,7 +164,7 @@ async def test_default_language(
         SERVICE_GET_EVENTS,
         {
             "entity_id": "calendar.france_bl",
-            "end_date_time": dt_util.now(),
+            "end_date_time": dt_util.now() + timedelta(hours=1),
         },
         blocking=True,
         return_response=True,
@@ -211,7 +211,7 @@ async def test_no_language(
         SERVICE_GET_EVENTS,
         {
             "entity_id": "calendar.albania",
-            "end_date_time": dt_util.now(),
+            "end_date_time": dt_util.now() + timedelta(hours=1),
         },
         blocking=True,
         return_response=True,
@@ -308,7 +308,7 @@ async def test_language_not_exist(
         SERVICE_GET_EVENTS,
         {
             "entity_id": "calendar.norge",
-            "end_date_time": dt_util.now(),
+            "end_date_time": dt_util.now() + timedelta(hours=1),
         },
         blocking=True,
         return_response=True,
@@ -336,7 +336,7 @@ async def test_language_not_exist(
         SERVICE_GET_EVENTS,
         {
             "entity_id": "calendar.norge",
-            "end_date_time": dt_util.now(),
+            "end_date_time": dt_util.now() + timedelta(hours=1),
         },
         blocking=True,
         return_response=True,
diff --git a/tests/components/home_connect/__init__.py b/tests/components/home_connect/__init__.py
index 2b61501c59a..8c256cb23f3 100644
--- a/tests/components/home_connect/__init__.py
+++ b/tests/components/home_connect/__init__.py
@@ -1 +1,16 @@
 """Tests for the Home Connect integration."""
+
+from typing import Any
+
+from aiohomeconnect.model import ArrayOfStatus
+
+from tests.common import load_json_object_fixture
+
+MOCK_PROGRAMS: dict[str, Any] = load_json_object_fixture("home_connect/programs.json")
+MOCK_SETTINGS: dict[str, Any] = load_json_object_fixture("home_connect/settings.json")
+MOCK_STATUS = ArrayOfStatus.from_dict(
+    load_json_object_fixture("home_connect/status.json")["data"]  # type: ignore[arg-type]
+)
+MOCK_AVAILABLE_COMMANDS: dict[str, Any] = load_json_object_fixture(
+    "home_connect/available_commands.json"
+)
diff --git a/tests/components/home_connect/conftest.py b/tests/components/home_connect/conftest.py
index 2ac8c851e1b..21cd236b1a8 100644
--- a/tests/components/home_connect/conftest.py
+++ b/tests/components/home_connect/conftest.py
@@ -1,31 +1,48 @@
 """Test fixtures for home_connect."""
 
-from collections.abc import Awaitable, Callable, Generator
+import asyncio
+from collections.abc import AsyncGenerator, Awaitable, Callable
+import copy
 import time
-from typing import Any
-from unittest.mock import MagicMock, Mock, PropertyMock, patch
+from typing import Any, cast
+from unittest.mock import AsyncMock, MagicMock, patch
 
-from homeconnect.api import HomeConnectAppliance, HomeConnectError
+from aiohomeconnect.client import Client as HomeConnectClient
+from aiohomeconnect.model import (
+    ArrayOfCommands,
+    ArrayOfEvents,
+    ArrayOfHomeAppliances,
+    ArrayOfOptions,
+    ArrayOfPrograms,
+    ArrayOfSettings,
+    Event,
+    EventKey,
+    EventMessage,
+    EventType,
+    GetSetting,
+    HomeAppliance,
+    Option,
+    Program,
+    ProgramDefinition,
+    ProgramKey,
+    SettingKey,
+)
+from aiohomeconnect.model.error import HomeConnectApiError, HomeConnectError
+from aiohomeconnect.model.program import EnumerateProgram
 import pytest
 
 from homeassistant.components.application_credentials import (
     ClientCredential,
     async_import_client_credential,
 )
-from homeassistant.components.home_connect import update_all_devices
 from homeassistant.components.home_connect.const import DOMAIN
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
-from tests.common import MockConfigEntry, load_json_object_fixture
+from . import MOCK_AVAILABLE_COMMANDS, MOCK_PROGRAMS, MOCK_SETTINGS, MOCK_STATUS
 
-MOCK_APPLIANCES_PROPERTIES = {
-    x["name"]: x
-    for x in load_json_object_fixture("home_connect/appliances.json")["data"][
-        "homeappliances"
-    ]
-}
+from tests.common import MockConfigEntry, load_fixture
 
 CLIENT_ID = "1234"
 CLIENT_SECRET = "5678"
@@ -102,32 +119,23 @@ def platforms() -> list[Platform]:
     return []
 
 
-async def bypass_throttle(hass: HomeAssistant, config_entry: MockConfigEntry):
-    """Add kwarg to disable throttle."""
-    await update_all_devices(hass, config_entry, no_throttle=True)
-
-
-@pytest.fixture(name="bypass_throttle")
-def mock_bypass_throttle() -> Generator[None]:
-    """Fixture to bypass the throttle decorator in __init__."""
-    with patch(
-        "homeassistant.components.home_connect.update_all_devices",
-        side_effect=bypass_throttle,
-    ):
-        yield
-
-
 @pytest.fixture(name="integration_setup")
 async def mock_integration_setup(
     hass: HomeAssistant,
     platforms: list[Platform],
     config_entry: MockConfigEntry,
-) -> Callable[[], Awaitable[bool]]:
+) -> Callable[[MagicMock], Awaitable[bool]]:
     """Fixture to set up the integration."""
     config_entry.add_to_hass(hass)
 
-    async def run() -> bool:
-        with patch("homeassistant.components.home_connect.PLATFORMS", platforms):
+    async def run(client: MagicMock) -> bool:
+        with (
+            patch("homeassistant.components.home_connect.PLATFORMS", platforms),
+            patch(
+                "homeassistant.components.home_connect.HomeConnectClient"
+            ) as client_mock,
+        ):
+            client_mock.return_value = client
             result = await hass.config_entries.async_setup(config_entry.entry_id)
             await hass.async_block_till_done()
         return result
@@ -135,125 +143,369 @@ async def mock_integration_setup(
     return run
 
 
-@pytest.fixture(name="get_appliances")
-def mock_get_appliances() -> Generator[MagicMock]:
-    """Mock ConfigEntryAuth parent (HomeAssistantAPI) method."""
-    with patch(
-        "homeassistant.components.home_connect.api.ConfigEntryAuth.get_appliances",
-    ) as mock:
-        yield mock
+def _get_set_program_side_effect(
+    event_queue: asyncio.Queue[list[EventMessage]], event_key: EventKey
+):
+    """Set program side effect."""
+
+    async def set_program_side_effect(ha_id: str, *_, **kwargs) -> None:
+        await event_queue.put(
+            [
+                EventMessage(
+                    ha_id,
+                    EventType.NOTIFY,
+                    ArrayOfEvents(
+                        [
+                            Event(
+                                key=event_key,
+                                raw_key=event_key.value,
+                                timestamp=0,
+                                level="",
+                                handling="",
+                                value=str(kwargs["program_key"]),
+                            ),
+                            *[
+                                Event(
+                                    key=(option_event := EventKey(option.key)),
+                                    raw_key=option_event.value,
+                                    timestamp=0,
+                                    level="",
+                                    handling="",
+                                    value=str(option.key),
+                                )
+                                for option in cast(
+                                    list[Option], kwargs.get("options", [])
+                                )
+                            ],
+                        ]
+                    ),
+                ),
+            ]
+        )
+
+    return set_program_side_effect
+
+
+def _get_set_setting_side_effect(
+    event_queue: asyncio.Queue[list[EventMessage]],
+):
+    """Set settings side effect."""
+
+    async def set_settings_side_effect(ha_id: str, *_, **kwargs) -> None:
+        event_key = EventKey(kwargs["setting_key"])
+        await event_queue.put(
+            [
+                EventMessage(
+                    ha_id,
+                    EventType.NOTIFY,
+                    ArrayOfEvents(
+                        [
+                            Event(
+                                key=event_key,
+                                raw_key=event_key.value,
+                                timestamp=0,
+                                level="",
+                                handling="",
+                                value=kwargs["value"],
+                            )
+                        ]
+                    ),
+                ),
+            ]
+        )
+
+    return set_settings_side_effect
+
+
+def _get_set_program_options_side_effect(
+    event_queue: asyncio.Queue[list[EventMessage]],
+):
+    """Set programs side effect."""
+
+    async def set_program_options_side_effect(ha_id: str, *_, **kwargs) -> None:
+        await event_queue.put(
+            [
+                EventMessage(
+                    ha_id,
+                    EventType.NOTIFY,
+                    ArrayOfEvents(
+                        [
+                            Event(
+                                key=EventKey(option.key),
+                                raw_key=option.key.value,
+                                timestamp=0,
+                                level="",
+                                handling="",
+                                value=option.value,
+                            )
+                            for option in (
+                                cast(ArrayOfOptions, kwargs["array_of_options"]).options
+                                if "array_of_options" in kwargs
+                                else [
+                                    Option(
+                                        kwargs["option_key"],
+                                        kwargs["value"],
+                                        unit=kwargs["unit"],
+                                    )
+                                ]
+                            )
+                        ]
+                    ),
+                ),
+            ]
+        )
+
+    return set_program_options_side_effect
+
+
+@pytest.fixture(name="client")
+def mock_client(
+    appliances: list[HomeAppliance],
+    appliance: HomeAppliance | None,
+    request: pytest.FixtureRequest,
+) -> MagicMock:
+    """Fixture to mock Client from HomeConnect."""
+
+    mock = MagicMock(
+        autospec=HomeConnectClient,
+    )
+
+    event_queue: asyncio.Queue[list[EventMessage]] = asyncio.Queue()
+
+    async def add_events(events: list[EventMessage]) -> None:
+        await event_queue.put(events)
+
+    mock.add_events = add_events
+
+    async def set_program_option_side_effect(ha_id: str, *_, **kwargs) -> None:
+        event_key = EventKey(kwargs["option_key"])
+        await event_queue.put(
+            [
+                EventMessage(
+                    ha_id,
+                    EventType.NOTIFY,
+                    ArrayOfEvents(
+                        [
+                            Event(
+                                key=event_key,
+                                raw_key=event_key.value,
+                                timestamp=0,
+                                level="",
+                                handling="",
+                                value=kwargs["value"],
+                            )
+                        ]
+                    ),
+                ),
+            ]
+        )
+
+    appliances = [appliance] if appliance else appliances
+
+    async def stream_all_events() -> AsyncGenerator[EventMessage]:
+        """Mock stream_all_events."""
+        while True:
+            for event in await event_queue.get():
+                yield event
+
+    mock.get_home_appliances = AsyncMock(return_value=ArrayOfHomeAppliances(appliances))
+
+    def _get_specific_appliance_side_effect(ha_id: str) -> HomeAppliance:
+        """Get specific appliance side effect."""
+        for appliance_ in appliances:
+            if appliance_.ha_id == ha_id:
+                return appliance_
+        raise HomeConnectApiError("error.key", "error description")
+
+    mock.get_specific_appliance = AsyncMock(
+        side_effect=_get_specific_appliance_side_effect
+    )
+    mock.stream_all_events = stream_all_events
+
+    async def _get_all_programs_side_effect(ha_id: str) -> ArrayOfPrograms:
+        """Get all programs."""
+        appliance_type = next(
+            appliance for appliance in appliances if appliance.ha_id == ha_id
+        ).type
+        if appliance_type not in MOCK_PROGRAMS:
+            raise HomeConnectApiError("error.key", "error description")
+
+        return ArrayOfPrograms(
+            [
+                EnumerateProgram.from_dict(program)
+                for program in MOCK_PROGRAMS[appliance_type]["data"]["programs"]
+            ],
+            Program.from_dict(MOCK_PROGRAMS[appliance_type]["data"]["programs"][0]),
+            Program.from_dict(MOCK_PROGRAMS[appliance_type]["data"]["programs"][0]),
+        )
+
+    async def _get_settings_side_effect(ha_id: str) -> ArrayOfSettings:
+        """Get settings."""
+        return ArrayOfSettings.from_dict(
+            MOCK_SETTINGS.get(
+                next(
+                    appliance for appliance in appliances if appliance.ha_id == ha_id
+                ).type,
+                {},
+            ).get("data", {"settings": []})
+        )
+
+    async def _get_setting_side_effect(ha_id: str, setting_key: SettingKey):
+        """Get setting."""
+        for appliance_ in appliances:
+            if appliance_.ha_id == ha_id:
+                settings = MOCK_SETTINGS.get(
+                    appliance_.type,
+                    {},
+                ).get("data", {"settings": []})
+                for setting_dict in cast(list[dict], settings["settings"]):
+                    if setting_dict["key"] == setting_key:
+                        return GetSetting.from_dict(setting_dict)
+        raise HomeConnectApiError("error.key", "error description")
+
+    async def _get_available_commands_side_effect(ha_id: str) -> ArrayOfCommands:
+        """Get available commands."""
+        for appliance_ in appliances:
+            if appliance_.ha_id == ha_id and appliance_.type in MOCK_AVAILABLE_COMMANDS:
+                return ArrayOfCommands.from_dict(
+                    MOCK_AVAILABLE_COMMANDS[appliance_.type]
+                )
+        raise HomeConnectApiError("error.key", "error description")
+
+    mock.start_program = AsyncMock(
+        side_effect=_get_set_program_side_effect(
+            event_queue, EventKey.BSH_COMMON_ROOT_ACTIVE_PROGRAM
+        )
+    )
+    mock.set_selected_program = AsyncMock(
+        side_effect=_get_set_program_side_effect(
+            event_queue, EventKey.BSH_COMMON_ROOT_SELECTED_PROGRAM
+        ),
+    )
+    mock.stop_program = AsyncMock()
+    mock.set_active_program_option = AsyncMock(
+        side_effect=_get_set_program_options_side_effect(event_queue),
+    )
+    mock.set_active_program_options = AsyncMock(
+        side_effect=_get_set_program_options_side_effect(event_queue),
+    )
+    mock.set_selected_program_option = AsyncMock(
+        side_effect=_get_set_program_options_side_effect(event_queue),
+    )
+    mock.set_selected_program_options = AsyncMock(
+        side_effect=_get_set_program_options_side_effect(event_queue),
+    )
+    mock.set_setting = AsyncMock(
+        side_effect=_get_set_setting_side_effect(event_queue),
+    )
+    mock.get_settings = AsyncMock(side_effect=_get_settings_side_effect)
+    mock.get_setting = AsyncMock(side_effect=_get_setting_side_effect)
+    mock.get_status = AsyncMock(return_value=copy.deepcopy(MOCK_STATUS))
+    mock.get_all_programs = AsyncMock(side_effect=_get_all_programs_side_effect)
+    mock.get_available_commands = AsyncMock(
+        side_effect=_get_available_commands_side_effect
+    )
+    mock.put_command = AsyncMock()
+    mock.get_available_program = AsyncMock(
+        return_value=ProgramDefinition(ProgramKey.UNKNOWN, options=[])
+    )
+    mock.get_active_program_options = AsyncMock(return_value=ArrayOfOptions([]))
+    mock.get_selected_program_options = AsyncMock(return_value=ArrayOfOptions([]))
+    mock.set_active_program_option = AsyncMock(
+        side_effect=set_program_option_side_effect
+    )
+    mock.set_selected_program_option = AsyncMock(
+        side_effect=set_program_option_side_effect
+    )
+
+    mock.side_effect = mock
+    return mock
+
+
+@pytest.fixture(name="client_with_exception")
+def mock_client_with_exception(
+    appliances: list[HomeAppliance],
+    appliance: HomeAppliance | None,
+    request: pytest.FixtureRequest,
+) -> MagicMock:
+    """Fixture to mock Client from HomeConnect that raise exceptions."""
+    mock = MagicMock(
+        autospec=HomeConnectClient,
+    )
+
+    exception = HomeConnectError()
+    if hasattr(request, "param") and request.param:
+        exception = request.param
+
+    event_queue: asyncio.Queue[list[EventMessage]] = asyncio.Queue()
+
+    async def stream_all_events() -> AsyncGenerator[EventMessage]:
+        """Mock stream_all_events."""
+        while True:
+            for event in await event_queue.get():
+                yield event
+
+    appliances = [appliance] if appliance else appliances
+    mock.get_home_appliances = AsyncMock(return_value=ArrayOfHomeAppliances(appliances))
+    mock.stream_all_events = stream_all_events
+
+    mock.start_program = AsyncMock(side_effect=exception)
+    mock.stop_program = AsyncMock(side_effect=exception)
+    mock.set_selected_program = AsyncMock(side_effect=exception)
+    mock.stop_program = AsyncMock(side_effect=exception)
+    mock.set_active_program_option = AsyncMock(side_effect=exception)
+    mock.set_active_program_options = AsyncMock(side_effect=exception)
+    mock.set_selected_program_option = AsyncMock(side_effect=exception)
+    mock.set_selected_program_options = AsyncMock(side_effect=exception)
+    mock.set_setting = AsyncMock(side_effect=exception)
+    mock.get_settings = AsyncMock(side_effect=exception)
+    mock.get_setting = AsyncMock(side_effect=exception)
+    mock.get_status = AsyncMock(side_effect=exception)
+    mock.get_all_programs = AsyncMock(side_effect=exception)
+    mock.get_available_commands = AsyncMock(side_effect=exception)
+    mock.put_command = AsyncMock(side_effect=exception)
+    mock.get_available_program = AsyncMock(side_effect=exception)
+    mock.get_active_program_options = AsyncMock(side_effect=exception)
+    mock.get_selected_program_options = AsyncMock(side_effect=exception)
+    mock.set_active_program_option = AsyncMock(side_effect=exception)
+    mock.set_selected_program_option = AsyncMock(side_effect=exception)
+
+    return mock
+
+
+@pytest.fixture(name="appliances")
+def mock_appliances(
+    appliances_data: str, request: pytest.FixtureRequest
+) -> list[HomeAppliance]:
+    """Fixture to mock the returned appliances."""
+    appliances = ArrayOfHomeAppliances.from_json(appliances_data).homeappliances
+    appliance_types = {appliance.type for appliance in appliances}
+    if hasattr(request, "param") and request.param:
+        appliance_types = request.param
+    return [appliance for appliance in appliances if appliance.type in appliance_types]
 
 
 @pytest.fixture(name="appliance")
-def mock_appliance(request: pytest.FixtureRequest) -> MagicMock:
-    """Fixture to mock Appliance."""
-    app = "Washer"
+def mock_appliance(
+    appliances_data: str, request: pytest.FixtureRequest
+) -> HomeAppliance | None:
+    """Fixture to mock a single specific appliance to return."""
+    appliance_type = None
     if hasattr(request, "param") and request.param:
-        app = request.param
-
-    mock = MagicMock(
-        autospec=HomeConnectAppliance,
-        **MOCK_APPLIANCES_PROPERTIES.get(app),
-    )
-    mock.name = app
-    type(mock).status = PropertyMock(return_value={})
-    mock.get.return_value = {}
-    mock.get_programs_available.return_value = []
-    mock.get_status.return_value = {}
-    mock.get_settings.return_value = {}
-
-    return mock
-
-
-@pytest.fixture(name="problematic_appliance")
-def mock_problematic_appliance(request: pytest.FixtureRequest) -> Mock:
-    """Fixture to mock a problematic Appliance."""
-    app = "Washer"
-    if hasattr(request, "param") and request.param:
-        app = request.param
-
-    mock = Mock(
-        autospec=HomeConnectAppliance,
-        **MOCK_APPLIANCES_PROPERTIES.get(app),
-    )
-    mock.name = app
-    type(mock).status = PropertyMock(return_value={})
-    mock.get.side_effect = HomeConnectError
-    mock.get_programs_active.side_effect = HomeConnectError
-    mock.get_programs_available.side_effect = HomeConnectError
-    mock.start_program.side_effect = HomeConnectError
-    mock.select_program.side_effect = HomeConnectError
-    mock.pause_program.side_effect = HomeConnectError
-    mock.stop_program.side_effect = HomeConnectError
-    mock.set_options_active_program.side_effect = HomeConnectError
-    mock.set_options_selected_program.side_effect = HomeConnectError
-    mock.get_status.side_effect = HomeConnectError
-    mock.get_settings.side_effect = HomeConnectError
-    mock.set_setting.side_effect = HomeConnectError
-    mock.set_setting.side_effect = HomeConnectError
-    mock.execute_command.side_effect = HomeConnectError
-
-    return mock
-
-
-def get_all_appliances():
-    """Return a list of `HomeConnectAppliance` instances for all appliances."""
-
-    appliances = {}
-
-    data = load_json_object_fixture("home_connect/appliances.json").get("data")
-    programs_active = load_json_object_fixture("home_connect/programs-active.json")
-    programs_available = load_json_object_fixture(
-        "home_connect/programs-available.json"
+        appliance_type = request.param
+    return next(
+        (
+            appliance
+            for appliance in ArrayOfHomeAppliances.from_json(
+                appliances_data
+            ).homeappliances
+            if appliance.type == appliance_type
+        ),
+        None,
     )
 
-    def listen_callback(mock, callback):
-        callback["callback"](mock)
 
-    for home_appliance in data["homeappliances"]:
-        api_status = load_json_object_fixture("home_connect/status.json")
-        api_settings = load_json_object_fixture("home_connect/settings.json")
-
-        ha_id = home_appliance["haId"]
-        ha_type = home_appliance["type"]
-
-        appliance = MagicMock(spec=HomeConnectAppliance, **home_appliance)
-        appliance.name = home_appliance["name"]
-        appliance.listen_events.side_effect = (
-            lambda app=appliance, **x: listen_callback(app, x)
-        )
-        appliance.get_programs_active.return_value = programs_active.get(
-            ha_type, {}
-        ).get("data", {})
-        appliance.get_programs_available.return_value = [
-            program["key"]
-            for program in programs_available.get(ha_type, {})
-            .get("data", {})
-            .get("programs", [])
-        ]
-        appliance.get_status.return_value = HomeConnectAppliance.json2dict(
-            api_status.get("data", {}).get("status", [])
-        )
-        appliance.get_settings.return_value = HomeConnectAppliance.json2dict(
-            api_settings.get(ha_type, {}).get("data", {}).get("settings", [])
-        )
-        setattr(appliance, "status", {})
-        appliance.status.update(appliance.get_status.return_value)
-        appliance.status.update(appliance.get_settings.return_value)
-        appliance.set_setting.side_effect = (
-            lambda x, y, appliance=appliance: appliance.status.update({x: {"value": y}})
-        )
-        appliance.start_program.side_effect = (
-            lambda x, appliance=appliance: appliance.status.update(
-                {"BSH.Common.Root.ActiveProgram": {"value": x}}
-            )
-        )
-        appliance.stop_program.side_effect = (
-            lambda appliance=appliance: appliance.status.update(
-                {"BSH.Common.Root.ActiveProgram": {}}
-            )
-        )
-
-        appliances[ha_id] = appliance
-
-    return list(appliances.values())
+@pytest.fixture(name="appliances_data")
+def appliances_data_fixture() -> str:
+    """Fixture to return a the string for an array of appliances."""
+    return load_fixture("appliances.json", integration=DOMAIN)
diff --git a/tests/components/home_connect/fixtures/appliances.json b/tests/components/home_connect/fixtures/appliances.json
index ada18b3482c..081dd44764f 100644
--- a/tests/components/home_connect/fixtures/appliances.json
+++ b/tests/components/home_connect/fixtures/appliances.json
@@ -1,123 +1,121 @@
 {
-  "data": {
-    "homeappliances": [
-      {
-        "name": "FridgeFreezer",
-        "brand": "SIEMENS",
-        "vib": "HCS05FRF1",
-        "connected": true,
-        "type": "FridgeFreezer",
-        "enumber": "HCS05FRF1/03",
-        "haId": "SIEMENS-HCS05FRF1-304F4F9E541D"
-      },
-      {
-        "name": "Dishwasher",
-        "brand": "SIEMENS",
-        "vib": "HCS02DWH1",
-        "connected": true,
-        "type": "Dishwasher",
-        "enumber": "HCS02DWH1/03",
-        "haId": "SIEMENS-HCS02DWH1-6BE58C26DCC1"
-      },
-      {
-        "name": "Oven",
-        "brand": "BOSCH",
-        "vib": "HCS01OVN1",
-        "connected": true,
-        "type": "Oven",
-        "enumber": "HCS01OVN1/03",
-        "haId": "BOSCH-HCS01OVN1-43E0065FE245"
-      },
-      {
-        "name": "Washer",
-        "brand": "SIEMENS",
-        "vib": "HCS03WCH1",
-        "connected": true,
-        "type": "Washer",
-        "enumber": "HCS03WCH1/03",
-        "haId": "SIEMENS-HCS03WCH1-7BC6383CF794"
-      },
-      {
-        "name": "Dryer",
-        "brand": "BOSCH",
-        "vib": "HCS04DYR1",
-        "connected": true,
-        "type": "Dryer",
-        "enumber": "HCS04DYR1/03",
-        "haId": "BOSCH-HCS04DYR1-831694AE3C5A"
-      },
-      {
-        "name": "CoffeeMaker",
-        "brand": "BOSCH",
-        "vib": "HCS06COM1",
-        "connected": true,
-        "type": "CoffeeMaker",
-        "enumber": "HCS06COM1/03",
-        "haId": "BOSCH-HCS06COM1-D70390681C2C"
-      },
-      {
-        "name": "WasherDryer",
-        "brand": "BOSCH",
-        "vib": "HCS000001",
-        "connected": true,
-        "type": "WasherDryer",
-        "enumber": "HCS000000/01",
-        "haId": "BOSCH-HCS000000-D00000000001"
-      },
-      {
-        "name": "Refrigerator",
-        "brand": "BOSCH",
-        "vib": "HCS000002",
-        "connected": true,
-        "type": "Refrigerator",
-        "enumber": "HCS000000/02",
-        "haId": "BOSCH-HCS000000-D00000000002"
-      },
-      {
-        "name": "Freezer",
-        "brand": "BOSCH",
-        "vib": "HCS000003",
-        "connected": true,
-        "type": "Freezer",
-        "enumber": "HCS000000/03",
-        "haId": "BOSCH-HCS000000-D00000000003"
-      },
-      {
-        "name": "Hood",
-        "brand": "BOSCH",
-        "vib": "HCS000004",
-        "connected": true,
-        "type": "Hood",
-        "enumber": "HCS000000/04",
-        "haId": "BOSCH-HCS000000-D00000000004"
-      },
-      {
-        "name": "Hob",
-        "brand": "BOSCH",
-        "vib": "HCS000005",
-        "connected": true,
-        "type": "Hob",
-        "enumber": "HCS000000/05",
-        "haId": "BOSCH-HCS000000-D00000000005"
-      },
-      {
-        "name": "CookProcessor",
-        "brand": "BOSCH",
-        "vib": "HCS000006",
-        "connected": true,
-        "type": "CookProcessor",
-        "enumber": "HCS000000/06",
-        "haId": "BOSCH-HCS000000-D00000000006"
-      },
-      {
-        "name": "DNE",
-        "brand": "BOSCH",
-        "vib": "HCS000000",
-        "connected": true,
-        "type": "DNE",
-        "enumber": "HCS000000/00",
-        "haId": "BOSCH-000000000-000000000000"
-      }
-    ]
-  }
+  "homeappliances": [
+    {
+      "name": "FridgeFreezer",
+      "brand": "SIEMENS",
+      "vib": "HCS05FRF1",
+      "connected": true,
+      "type": "FridgeFreezer",
+      "enumber": "HCS05FRF1/03",
+      "haId": "SIEMENS-HCS05FRF1-304F4F9E541D"
+    },
+    {
+      "name": "Dishwasher",
+      "brand": "SIEMENS",
+      "vib": "HCS02DWH1",
+      "connected": true,
+      "type": "Dishwasher",
+      "enumber": "HCS02DWH1/03",
+      "haId": "SIEMENS-HCS02DWH1-6BE58C26DCC1"
+    },
+    {
+      "name": "Oven",
+      "brand": "BOSCH",
+      "vib": "HCS01OVN1",
+      "connected": true,
+      "type": "Oven",
+      "enumber": "HCS01OVN1/03",
+      "haId": "BOSCH-HCS01OVN1-43E0065FE245"
+    },
+    {
+      "name": "Washer",
+      "brand": "SIEMENS",
+      "vib": "HCS03WCH1",
+      "connected": true,
+      "type": "Washer",
+      "enumber": "HCS03WCH1/03",
+      "haId": "SIEMENS-HCS03WCH1-7BC6383CF794"
+    },
+    {
+      "name": "Dryer",
+      "brand": "BOSCH",
+      "vib": "HCS04DYR1",
+      "connected": true,
+      "type": "Dryer",
+      "enumber": "HCS04DYR1/03",
+      "haId": "BOSCH-HCS04DYR1-831694AE3C5A"
+    },
+    {
+      "name": "CoffeeMaker",
+      "brand": "BOSCH",
+      "vib": "HCS06COM1",
+      "connected": true,
+      "type": "CoffeeMaker",
+      "enumber": "HCS06COM1/03",
+      "haId": "BOSCH-HCS06COM1-D70390681C2C"
+    },
+    {
+      "name": "WasherDryer",
+      "brand": "BOSCH",
+      "vib": "HCS000001",
+      "connected": true,
+      "type": "WasherDryer",
+      "enumber": "HCS000000/01",
+      "haId": "BOSCH-HCS000000-D00000000001"
+    },
+    {
+      "name": "Refrigerator",
+      "brand": "BOSCH",
+      "vib": "HCS000002",
+      "connected": true,
+      "type": "Refrigerator",
+      "enumber": "HCS000000/02",
+      "haId": "BOSCH-HCS000000-D00000000002"
+    },
+    {
+      "name": "Freezer",
+      "brand": "BOSCH",
+      "vib": "HCS000003",
+      "connected": true,
+      "type": "Freezer",
+      "enumber": "HCS000000/03",
+      "haId": "BOSCH-HCS000000-D00000000003"
+    },
+    {
+      "name": "Hood",
+      "brand": "BOSCH",
+      "vib": "HCS000004",
+      "connected": true,
+      "type": "Hood",
+      "enumber": "HCS000000/04",
+      "haId": "BOSCH-HCS000000-D00000000004"
+    },
+    {
+      "name": "Hob",
+      "brand": "BOSCH",
+      "vib": "HCS000005",
+      "connected": true,
+      "type": "Hob",
+      "enumber": "HCS000000/05",
+      "haId": "BOSCH-HCS000000-D00000000005"
+    },
+    {
+      "name": "CookProcessor",
+      "brand": "BOSCH",
+      "vib": "HCS000006",
+      "connected": true,
+      "type": "CookProcessor",
+      "enumber": "HCS000000/06",
+      "haId": "BOSCH-HCS000000-D00000000006"
+    },
+    {
+      "name": "DNE",
+      "brand": "BOSCH",
+      "vib": "HCS000000",
+      "connected": true,
+      "type": "DNE",
+      "enumber": "HCS000000/00",
+      "haId": "BOSCH-000000000-000000000000"
+    }
+  ]
 }
diff --git a/tests/components/home_connect/fixtures/available_commands.json b/tests/components/home_connect/fixtures/available_commands.json
new file mode 100644
index 00000000000..e4ed6c21b7c
--- /dev/null
+++ b/tests/components/home_connect/fixtures/available_commands.json
@@ -0,0 +1,142 @@
+{
+  "Cooktop": {
+    "commands": [
+      {
+        "key": "BSH.Common.Command.AcknowledgeEvent",
+        "name": "Acknowledge event"
+      }
+    ]
+  },
+  "Hood": {
+    "commands": [
+      {
+        "key": "BSH.Common.Command.AcknowledgeEvent",
+        "name": "Acknowledge event"
+      }
+    ]
+  },
+  "Oven": {
+    "commands": [
+      {
+        "key": "BSH.Common.Command.PauseProgram",
+        "name": "Stop program"
+      },
+      {
+        "key": "BSH.Common.Command.ResumeProgram",
+        "name": "Continue program"
+      },
+      {
+        "key": "BSH.Common.Command.OpenDoor",
+        "name": "Open door"
+      },
+      {
+        "key": "BSH.Common.Command.PartlyOpenDoor",
+        "name": "Partly open door"
+      },
+      {
+        "key": "BSH.Common.Command.AcknowledgeEvent",
+        "name": "Acknowledge event"
+      }
+    ]
+  },
+  "CleaningRobot": {
+    "commands": [
+      {
+        "key": "BSH.Common.Command.PauseProgram",
+        "name": "Stop program"
+      },
+      {
+        "key": "BSH.Common.Command.ResumeProgram",
+        "name": "Continue program"
+      },
+      {
+        "key": "BSH.Common.Command.AcknowledgeEvent",
+        "name": "Acknowledge event"
+      }
+    ]
+  },
+  "Dishwasher": {
+    "commands": [
+      {
+        "key": "BSH.Common.Command.ResumeProgram",
+        "name": "Continue program"
+      },
+      {
+        "key": "BSH.Common.Command.AcknowledgeEvent",
+        "name": "Acknowledge event"
+      }
+    ]
+  },
+  "Dryer": {
+    "commands": [
+      {
+        "key": "BSH.Common.Command.PauseProgram",
+        "name": "Stop program"
+      },
+      {
+        "key": "BSH.Common.Command.ResumeProgram",
+        "name": "Continue program"
+      },
+      {
+        "key": "BSH.Common.Command.AcknowledgeEvent",
+        "name": "Acknowledge event"
+      }
+    ]
+  },
+  "Washer": {
+    "commands": [
+      {
+        "key": "BSH.Common.Command.PauseProgram",
+        "name": "Stop program"
+      },
+      {
+        "key": "BSH.Common.Command.ResumeProgram",
+        "name": "Continue program"
+      },
+      {
+        "key": "BSH.Common.Command.AcknowledgeEvent",
+        "name": "Acknowledge event"
+      }
+    ]
+  },
+  "WasherDryer": {
+    "commands": [
+      {
+        "key": "BSH.Common.Command.PauseProgram",
+        "name": "Stop program"
+      },
+      {
+        "key": "BSH.Common.Command.ResumeProgram",
+        "name": "Continue program"
+      },
+      {
+        "key": "BSH.Common.Command.AcknowledgeEvent",
+        "name": "Acknowledge event"
+      }
+    ]
+  },
+  "Freezer": {
+    "commands": [
+      {
+        "key": "BSH.Common.Command.OpenDoor",
+        "name": "Open door"
+      }
+    ]
+  },
+  "FridgeFreezer": {
+    "commands": [
+      {
+        "key": "BSH.Common.Command.OpenDoor",
+        "name": "Open door"
+      }
+    ]
+  },
+  "Refrigerator": {
+    "commands": [
+      {
+        "key": "BSH.Common.Command.OpenDoor",
+        "name": "Open door"
+      }
+    ]
+  }
+}
diff --git a/tests/components/home_connect/fixtures/programs-available.json b/tests/components/home_connect/fixtures/programs.json
similarity index 100%
rename from tests/components/home_connect/fixtures/programs-available.json
rename to tests/components/home_connect/fixtures/programs.json
diff --git a/tests/components/home_connect/fixtures/settings.json b/tests/components/home_connect/fixtures/settings.json
index 1b9bec57276..bd1bea18365 100644
--- a/tests/components/home_connect/fixtures/settings.json
+++ b/tests/components/home_connect/fixtures/settings.json
@@ -2,6 +2,11 @@
   "Dishwasher": {
     "data": {
       "settings": [
+        {
+          "key": "BSH.Common.Setting.ChildLock",
+          "value": false,
+          "type": "Boolean"
+        },
         {
           "key": "BSH.Common.Setting.AmbientLightEnabled",
           "value": true,
@@ -26,7 +31,13 @@
         {
           "key": "BSH.Common.Setting.PowerState",
           "value": "BSH.Common.EnumType.PowerState.On",
-          "type": "BSH.Common.EnumType.PowerState"
+          "type": "BSH.Common.EnumType.PowerState",
+          "constraints": {
+            "allowedvalues": [
+              "BSH.Common.EnumType.PowerState.On",
+              "BSH.Common.EnumType.PowerState.Off"
+            ]
+          }
         },
         {
           "key": "BSH.Common.Setting.ChildLock",
@@ -57,9 +68,16 @@
           "type": "Double"
         },
         {
-          "key": "BSH.Common.Setting.ColorTemperature",
+          "key": "Cooking.Hood.Setting.ColorTemperature",
           "value": "Cooking.Hood.EnumType.ColorTemperature.warmToNeutral",
-          "type": "BSH.Common.EnumType.ColorTemperature"
+          "type": "BSH.Common.EnumType.ColorTemperature",
+          "constraints": {
+            "allowedvalues": [
+              "Cooking.Hood.EnumType.ColorTemperature.warm",
+              "Cooking.Hood.EnumType.ColorTemperature.neutral",
+              "Cooking.Hood.EnumType.ColorTemperature.cold"
+            ]
+          }
         },
         {
           "key": "BSH.Common.Setting.AmbientLightEnabled",
@@ -92,6 +110,11 @@
           "key": "BSH.Common.Setting.PowerState",
           "value": "BSH.Common.EnumType.PowerState.On",
           "type": "BSH.Common.EnumType.PowerState"
+        },
+        {
+          "key": "BSH.Common.Setting.AlarmClock",
+          "value": 0,
+          "type": "Integer"
         }
       ]
     }
@@ -108,6 +131,11 @@
           "key": "BSH.Common.Setting.ChildLock",
           "value": false,
           "type": "Boolean"
+        },
+        {
+          "key": "LaundryCare.Washer.Setting.IDos2BaseLevel",
+          "value": 0,
+          "type": "Integer"
         }
       ]
     }
@@ -154,6 +182,12 @@
             "max": 100,
             "access": "readWrite"
           }
+        },
+        {
+          "key": "Refrigeration.FridgeFreezer.Setting.SetpointTemperatureRefrigerator",
+          "value": 8,
+          "unit": "°C",
+          "type": "Double"
         }
       ]
     }
diff --git a/tests/components/home_connect/snapshots/test_diagnostics.ambr b/tests/components/home_connect/snapshots/test_diagnostics.ambr
index f3131eac52f..28f45ce97ba 100644
--- a/tests/components/home_connect/snapshots/test_diagnostics.ambr
+++ b/tests/components/home_connect/snapshots/test_diagnostics.ambr
@@ -2,255 +2,209 @@
 # name: test_async_get_config_entry_diagnostics
   dict({
     'BOSCH-000000000-000000000000': dict({
+      'brand': 'BOSCH',
       'connected': True,
+      'e_number': 'HCS000000/00',
+      'ha_id': 'BOSCH-000000000-000000000000',
+      'name': 'DNE',
       'programs': list([
       ]),
-      'status': dict({
-        'BSH.Common.Status.DoorState': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Closed',
-        }),
-        'BSH.Common.Status.OperationState': dict({
-          'value': 'BSH.Common.EnumType.OperationState.Ready',
-        }),
-        'BSH.Common.Status.RemoteControlActive': dict({
-          'value': True,
-        }),
-        'BSH.Common.Status.RemoteControlStartAllowed': dict({
-          'value': True,
-        }),
-        'Refrigeration.Common.Status.Door.Refrigerator': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Open',
-        }),
+      'settings': dict({
       }),
+      'status': dict({
+        'BSH.Common.Status.DoorState': 'BSH.Common.EnumType.DoorState.Closed',
+        'BSH.Common.Status.OperationState': 'BSH.Common.EnumType.OperationState.Ready',
+        'BSH.Common.Status.RemoteControlActive': True,
+        'BSH.Common.Status.RemoteControlStartAllowed': True,
+        'Refrigeration.Common.Status.Door.Refrigerator': 'BSH.Common.EnumType.DoorState.Open',
+      }),
+      'type': 'DNE',
+      'vib': 'HCS000000',
     }),
     'BOSCH-HCS000000-D00000000001': dict({
+      'brand': 'BOSCH',
       'connected': True,
+      'e_number': 'HCS000000/01',
+      'ha_id': 'BOSCH-HCS000000-D00000000001',
+      'name': 'WasherDryer',
       'programs': list([
         'LaundryCare.WasherDryer.Program.Mix',
         'LaundryCare.Washer.Option.Temperature',
       ]),
-      'status': dict({
-        'BSH.Common.Status.DoorState': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Closed',
-        }),
-        'BSH.Common.Status.OperationState': dict({
-          'value': 'BSH.Common.EnumType.OperationState.Ready',
-        }),
-        'BSH.Common.Status.RemoteControlActive': dict({
-          'value': True,
-        }),
-        'BSH.Common.Status.RemoteControlStartAllowed': dict({
-          'value': True,
-        }),
-        'Refrigeration.Common.Status.Door.Refrigerator': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Open',
-        }),
+      'settings': dict({
       }),
+      'status': dict({
+        'BSH.Common.Status.DoorState': 'BSH.Common.EnumType.DoorState.Closed',
+        'BSH.Common.Status.OperationState': 'BSH.Common.EnumType.OperationState.Ready',
+        'BSH.Common.Status.RemoteControlActive': True,
+        'BSH.Common.Status.RemoteControlStartAllowed': True,
+        'Refrigeration.Common.Status.Door.Refrigerator': 'BSH.Common.EnumType.DoorState.Open',
+      }),
+      'type': 'WasherDryer',
+      'vib': 'HCS000001',
     }),
     'BOSCH-HCS000000-D00000000002': dict({
+      'brand': 'BOSCH',
       'connected': True,
+      'e_number': 'HCS000000/02',
+      'ha_id': 'BOSCH-HCS000000-D00000000002',
+      'name': 'Refrigerator',
       'programs': list([
       ]),
-      'status': dict({
-        'BSH.Common.Status.DoorState': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Closed',
-        }),
-        'BSH.Common.Status.OperationState': dict({
-          'value': 'BSH.Common.EnumType.OperationState.Ready',
-        }),
-        'BSH.Common.Status.RemoteControlActive': dict({
-          'value': True,
-        }),
-        'BSH.Common.Status.RemoteControlStartAllowed': dict({
-          'value': True,
-        }),
-        'Refrigeration.Common.Status.Door.Refrigerator': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Open',
-        }),
+      'settings': dict({
       }),
+      'status': dict({
+        'BSH.Common.Status.DoorState': 'BSH.Common.EnumType.DoorState.Closed',
+        'BSH.Common.Status.OperationState': 'BSH.Common.EnumType.OperationState.Ready',
+        'BSH.Common.Status.RemoteControlActive': True,
+        'BSH.Common.Status.RemoteControlStartAllowed': True,
+        'Refrigeration.Common.Status.Door.Refrigerator': 'BSH.Common.EnumType.DoorState.Open',
+      }),
+      'type': 'Refrigerator',
+      'vib': 'HCS000002',
     }),
     'BOSCH-HCS000000-D00000000003': dict({
+      'brand': 'BOSCH',
       'connected': True,
+      'e_number': 'HCS000000/03',
+      'ha_id': 'BOSCH-HCS000000-D00000000003',
+      'name': 'Freezer',
       'programs': list([
       ]),
-      'status': dict({
-        'BSH.Common.Status.DoorState': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Closed',
-        }),
-        'BSH.Common.Status.OperationState': dict({
-          'value': 'BSH.Common.EnumType.OperationState.Ready',
-        }),
-        'BSH.Common.Status.RemoteControlActive': dict({
-          'value': True,
-        }),
-        'BSH.Common.Status.RemoteControlStartAllowed': dict({
-          'value': True,
-        }),
-        'Refrigeration.Common.Status.Door.Refrigerator': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Open',
-        }),
+      'settings': dict({
       }),
+      'status': dict({
+        'BSH.Common.Status.DoorState': 'BSH.Common.EnumType.DoorState.Closed',
+        'BSH.Common.Status.OperationState': 'BSH.Common.EnumType.OperationState.Ready',
+        'BSH.Common.Status.RemoteControlActive': True,
+        'BSH.Common.Status.RemoteControlStartAllowed': True,
+        'Refrigeration.Common.Status.Door.Refrigerator': 'BSH.Common.EnumType.DoorState.Open',
+      }),
+      'type': 'Freezer',
+      'vib': 'HCS000003',
     }),
     'BOSCH-HCS000000-D00000000004': dict({
+      'brand': 'BOSCH',
       'connected': True,
+      'e_number': 'HCS000000/04',
+      'ha_id': 'BOSCH-HCS000000-D00000000004',
+      'name': 'Hood',
       'programs': list([
       ]),
-      'status': dict({
-        'BSH.Common.Setting.AmbientLightBrightness': dict({
-          'type': 'Double',
-          'unit': '%',
-          'value': 70,
-        }),
-        'BSH.Common.Setting.AmbientLightColor': dict({
-          'type': 'BSH.Common.EnumType.AmbientLightColor',
-          'value': 'BSH.Common.EnumType.AmbientLightColor.Color43',
-        }),
-        'BSH.Common.Setting.AmbientLightCustomColor': dict({
-          'type': 'String',
-          'value': '#4a88f8',
-        }),
-        'BSH.Common.Setting.AmbientLightEnabled': dict({
-          'type': 'Boolean',
-          'value': True,
-        }),
-        'BSH.Common.Setting.ColorTemperature': dict({
-          'type': 'BSH.Common.EnumType.ColorTemperature',
-          'value': 'Cooking.Hood.EnumType.ColorTemperature.warmToNeutral',
-        }),
-        'BSH.Common.Status.DoorState': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Closed',
-        }),
-        'BSH.Common.Status.OperationState': dict({
-          'value': 'BSH.Common.EnumType.OperationState.Ready',
-        }),
-        'BSH.Common.Status.RemoteControlActive': dict({
-          'value': True,
-        }),
-        'BSH.Common.Status.RemoteControlStartAllowed': dict({
-          'value': True,
-        }),
-        'Cooking.Common.Setting.Lighting': dict({
-          'type': 'Boolean',
-          'value': True,
-        }),
-        'Cooking.Common.Setting.LightingBrightness': dict({
-          'type': 'Double',
-          'unit': '%',
-          'value': 70,
-        }),
-        'Cooking.Hood.Setting.ColorTemperaturePercent': dict({
-          'type': 'Double',
-          'unit': '%',
-          'value': 70,
-        }),
-        'Refrigeration.Common.Status.Door.Refrigerator': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Open',
-        }),
+      'settings': dict({
+        'BSH.Common.Setting.AmbientLightBrightness': 70,
+        'BSH.Common.Setting.AmbientLightColor': 'BSH.Common.EnumType.AmbientLightColor.Color43',
+        'BSH.Common.Setting.AmbientLightCustomColor': '#4a88f8',
+        'BSH.Common.Setting.AmbientLightEnabled': True,
+        'Cooking.Common.Setting.Lighting': True,
+        'Cooking.Common.Setting.LightingBrightness': 70,
+        'Cooking.Hood.Setting.ColorTemperature': 'Cooking.Hood.EnumType.ColorTemperature.warmToNeutral',
+        'Cooking.Hood.Setting.ColorTemperaturePercent': 70,
       }),
+      'status': dict({
+        'BSH.Common.Status.DoorState': 'BSH.Common.EnumType.DoorState.Closed',
+        'BSH.Common.Status.OperationState': 'BSH.Common.EnumType.OperationState.Ready',
+        'BSH.Common.Status.RemoteControlActive': True,
+        'BSH.Common.Status.RemoteControlStartAllowed': True,
+        'Refrigeration.Common.Status.Door.Refrigerator': 'BSH.Common.EnumType.DoorState.Open',
+      }),
+      'type': 'Hood',
+      'vib': 'HCS000004',
     }),
     'BOSCH-HCS000000-D00000000005': dict({
+      'brand': 'BOSCH',
       'connected': True,
+      'e_number': 'HCS000000/05',
+      'ha_id': 'BOSCH-HCS000000-D00000000005',
+      'name': 'Hob',
       'programs': list([
       ]),
-      'status': dict({
-        'BSH.Common.Status.DoorState': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Closed',
-        }),
-        'BSH.Common.Status.OperationState': dict({
-          'value': 'BSH.Common.EnumType.OperationState.Ready',
-        }),
-        'BSH.Common.Status.RemoteControlActive': dict({
-          'value': True,
-        }),
-        'BSH.Common.Status.RemoteControlStartAllowed': dict({
-          'value': True,
-        }),
-        'Refrigeration.Common.Status.Door.Refrigerator': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Open',
-        }),
+      'settings': dict({
       }),
+      'status': dict({
+        'BSH.Common.Status.DoorState': 'BSH.Common.EnumType.DoorState.Closed',
+        'BSH.Common.Status.OperationState': 'BSH.Common.EnumType.OperationState.Ready',
+        'BSH.Common.Status.RemoteControlActive': True,
+        'BSH.Common.Status.RemoteControlStartAllowed': True,
+        'Refrigeration.Common.Status.Door.Refrigerator': 'BSH.Common.EnumType.DoorState.Open',
+      }),
+      'type': 'Hob',
+      'vib': 'HCS000005',
     }),
     'BOSCH-HCS000000-D00000000006': dict({
+      'brand': 'BOSCH',
       'connected': True,
+      'e_number': 'HCS000000/06',
+      'ha_id': 'BOSCH-HCS000000-D00000000006',
+      'name': 'CookProcessor',
       'programs': list([
       ]),
-      'status': dict({
-        'BSH.Common.Status.DoorState': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Closed',
-        }),
-        'BSH.Common.Status.OperationState': dict({
-          'value': 'BSH.Common.EnumType.OperationState.Ready',
-        }),
-        'BSH.Common.Status.RemoteControlActive': dict({
-          'value': True,
-        }),
-        'BSH.Common.Status.RemoteControlStartAllowed': dict({
-          'value': True,
-        }),
-        'Refrigeration.Common.Status.Door.Refrigerator': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Open',
-        }),
+      'settings': dict({
       }),
+      'status': dict({
+        'BSH.Common.Status.DoorState': 'BSH.Common.EnumType.DoorState.Closed',
+        'BSH.Common.Status.OperationState': 'BSH.Common.EnumType.OperationState.Ready',
+        'BSH.Common.Status.RemoteControlActive': True,
+        'BSH.Common.Status.RemoteControlStartAllowed': True,
+        'Refrigeration.Common.Status.Door.Refrigerator': 'BSH.Common.EnumType.DoorState.Open',
+      }),
+      'type': 'CookProcessor',
+      'vib': 'HCS000006',
     }),
     'BOSCH-HCS01OVN1-43E0065FE245': dict({
+      'brand': 'BOSCH',
       'connected': True,
+      'e_number': 'HCS01OVN1/03',
+      'ha_id': 'BOSCH-HCS01OVN1-43E0065FE245',
+      'name': 'Oven',
       'programs': list([
         'Cooking.Oven.Program.HeatingMode.HotAir',
         'Cooking.Oven.Program.HeatingMode.TopBottomHeating',
         'Cooking.Oven.Program.HeatingMode.PizzaSetting',
       ]),
-      'status': dict({
-        'BSH.Common.Root.ActiveProgram': dict({
-          'value': 'Cooking.Oven.Program.HeatingMode.HotAir',
-        }),
-        'BSH.Common.Setting.PowerState': dict({
-          'type': 'BSH.Common.EnumType.PowerState',
-          'value': 'BSH.Common.EnumType.PowerState.On',
-        }),
-        'BSH.Common.Status.DoorState': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Closed',
-        }),
-        'BSH.Common.Status.OperationState': dict({
-          'value': 'BSH.Common.EnumType.OperationState.Ready',
-        }),
-        'BSH.Common.Status.RemoteControlActive': dict({
-          'value': True,
-        }),
-        'BSH.Common.Status.RemoteControlStartAllowed': dict({
-          'value': True,
-        }),
-        'Refrigeration.Common.Status.Door.Refrigerator': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Open',
-        }),
+      'settings': dict({
+        'BSH.Common.Setting.AlarmClock': 0,
+        'BSH.Common.Setting.PowerState': 'BSH.Common.EnumType.PowerState.On',
       }),
+      'status': dict({
+        'BSH.Common.Status.DoorState': 'BSH.Common.EnumType.DoorState.Closed',
+        'BSH.Common.Status.OperationState': 'BSH.Common.EnumType.OperationState.Ready',
+        'BSH.Common.Status.RemoteControlActive': True,
+        'BSH.Common.Status.RemoteControlStartAllowed': True,
+        'Refrigeration.Common.Status.Door.Refrigerator': 'BSH.Common.EnumType.DoorState.Open',
+      }),
+      'type': 'Oven',
+      'vib': 'HCS01OVN1',
     }),
     'BOSCH-HCS04DYR1-831694AE3C5A': dict({
+      'brand': 'BOSCH',
       'connected': True,
+      'e_number': 'HCS04DYR1/03',
+      'ha_id': 'BOSCH-HCS04DYR1-831694AE3C5A',
+      'name': 'Dryer',
       'programs': list([
         'LaundryCare.Dryer.Program.Cotton',
         'LaundryCare.Dryer.Program.Synthetic',
         'LaundryCare.Dryer.Program.Mix',
       ]),
-      'status': dict({
-        'BSH.Common.Status.DoorState': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Closed',
-        }),
-        'BSH.Common.Status.OperationState': dict({
-          'value': 'BSH.Common.EnumType.OperationState.Ready',
-        }),
-        'BSH.Common.Status.RemoteControlActive': dict({
-          'value': True,
-        }),
-        'BSH.Common.Status.RemoteControlStartAllowed': dict({
-          'value': True,
-        }),
-        'Refrigeration.Common.Status.Door.Refrigerator': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Open',
-        }),
+      'settings': dict({
       }),
+      'status': dict({
+        'BSH.Common.Status.DoorState': 'BSH.Common.EnumType.DoorState.Closed',
+        'BSH.Common.Status.OperationState': 'BSH.Common.EnumType.OperationState.Ready',
+        'BSH.Common.Status.RemoteControlActive': True,
+        'BSH.Common.Status.RemoteControlStartAllowed': True,
+        'Refrigeration.Common.Status.Door.Refrigerator': 'BSH.Common.EnumType.DoorState.Open',
+      }),
+      'type': 'Dryer',
+      'vib': 'HCS04DYR1',
     }),
     'BOSCH-HCS06COM1-D70390681C2C': dict({
+      'brand': 'BOSCH',
       'connected': True,
+      'e_number': 'HCS06COM1/03',
+      'ha_id': 'BOSCH-HCS06COM1-D70390681C2C',
+      'name': 'CoffeeMaker',
       'programs': list([
         'ConsumerProducts.CoffeeMaker.Program.Beverage.Espresso',
         'ConsumerProducts.CoffeeMaker.Program.Beverage.EspressoMacchiato',
@@ -259,26 +213,24 @@
         'ConsumerProducts.CoffeeMaker.Program.Beverage.LatteMacchiato',
         'ConsumerProducts.CoffeeMaker.Program.Beverage.CaffeLatte',
       ]),
-      'status': dict({
-        'BSH.Common.Status.DoorState': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Closed',
-        }),
-        'BSH.Common.Status.OperationState': dict({
-          'value': 'BSH.Common.EnumType.OperationState.Ready',
-        }),
-        'BSH.Common.Status.RemoteControlActive': dict({
-          'value': True,
-        }),
-        'BSH.Common.Status.RemoteControlStartAllowed': dict({
-          'value': True,
-        }),
-        'Refrigeration.Common.Status.Door.Refrigerator': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Open',
-        }),
+      'settings': dict({
       }),
+      'status': dict({
+        'BSH.Common.Status.DoorState': 'BSH.Common.EnumType.DoorState.Closed',
+        'BSH.Common.Status.OperationState': 'BSH.Common.EnumType.OperationState.Ready',
+        'BSH.Common.Status.RemoteControlActive': True,
+        'BSH.Common.Status.RemoteControlStartAllowed': True,
+        'Refrigeration.Common.Status.Door.Refrigerator': 'BSH.Common.EnumType.DoorState.Open',
+      }),
+      'type': 'CoffeeMaker',
+      'vib': 'HCS06COM1',
     }),
     'SIEMENS-HCS02DWH1-6BE58C26DCC1': dict({
+      'brand': 'SIEMENS',
       'connected': True,
+      'e_number': 'HCS02DWH1/03',
+      'ha_id': 'SIEMENS-HCS02DWH1-6BE58C26DCC1',
+      'name': 'Dishwasher',
       'programs': list([
         'Dishcare.Dishwasher.Program.Auto1',
         'Dishcare.Dishwasher.Program.Auto2',
@@ -286,51 +238,30 @@
         'Dishcare.Dishwasher.Program.Eco50',
         'Dishcare.Dishwasher.Program.Quick45',
       ]),
-      'status': dict({
-        'BSH.Common.Setting.AmbientLightBrightness': dict({
-          'type': 'Double',
-          'unit': '%',
-          'value': 70,
-        }),
-        'BSH.Common.Setting.AmbientLightColor': dict({
-          'type': 'BSH.Common.EnumType.AmbientLightColor',
-          'value': 'BSH.Common.EnumType.AmbientLightColor.Color43',
-        }),
-        'BSH.Common.Setting.AmbientLightCustomColor': dict({
-          'type': 'String',
-          'value': '#4a88f8',
-        }),
-        'BSH.Common.Setting.AmbientLightEnabled': dict({
-          'type': 'Boolean',
-          'value': True,
-        }),
-        'BSH.Common.Setting.ChildLock': dict({
-          'type': 'Boolean',
-          'value': False,
-        }),
-        'BSH.Common.Setting.PowerState': dict({
-          'type': 'BSH.Common.EnumType.PowerState',
-          'value': 'BSH.Common.EnumType.PowerState.On',
-        }),
-        'BSH.Common.Status.DoorState': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Closed',
-        }),
-        'BSH.Common.Status.OperationState': dict({
-          'value': 'BSH.Common.EnumType.OperationState.Ready',
-        }),
-        'BSH.Common.Status.RemoteControlActive': dict({
-          'value': True,
-        }),
-        'BSH.Common.Status.RemoteControlStartAllowed': dict({
-          'value': True,
-        }),
-        'Refrigeration.Common.Status.Door.Refrigerator': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Open',
-        }),
+      'settings': dict({
+        'BSH.Common.Setting.AmbientLightBrightness': 70,
+        'BSH.Common.Setting.AmbientLightColor': 'BSH.Common.EnumType.AmbientLightColor.Color43',
+        'BSH.Common.Setting.AmbientLightCustomColor': '#4a88f8',
+        'BSH.Common.Setting.AmbientLightEnabled': True,
+        'BSH.Common.Setting.ChildLock': False,
+        'BSH.Common.Setting.PowerState': 'BSH.Common.EnumType.PowerState.On',
       }),
+      'status': dict({
+        'BSH.Common.Status.DoorState': 'BSH.Common.EnumType.DoorState.Closed',
+        'BSH.Common.Status.OperationState': 'BSH.Common.EnumType.OperationState.Ready',
+        'BSH.Common.Status.RemoteControlActive': True,
+        'BSH.Common.Status.RemoteControlStartAllowed': True,
+        'Refrigeration.Common.Status.Door.Refrigerator': 'BSH.Common.EnumType.DoorState.Open',
+      }),
+      'type': 'Dishwasher',
+      'vib': 'HCS02DWH1',
     }),
     'SIEMENS-HCS03WCH1-7BC6383CF794': dict({
+      'brand': 'SIEMENS',
       'connected': True,
+      'e_number': 'HCS03WCH1/03',
+      'ha_id': 'SIEMENS-HCS03WCH1-7BC6383CF794',
+      'name': 'Washer',
       'programs': list([
         'LaundryCare.Washer.Program.Cotton',
         'LaundryCare.Washer.Program.EasyCare',
@@ -338,97 +269,56 @@
         'LaundryCare.Washer.Program.DelicatesSilk',
         'LaundryCare.Washer.Program.Wool',
       ]),
-      'status': dict({
-        'BSH.Common.Root.ActiveProgram': dict({
-          'value': 'BSH.Common.Root.ActiveProgram',
-        }),
-        'BSH.Common.Setting.ChildLock': dict({
-          'type': 'Boolean',
-          'value': False,
-        }),
-        'BSH.Common.Setting.PowerState': dict({
-          'type': 'BSH.Common.EnumType.PowerState',
-          'value': 'BSH.Common.EnumType.PowerState.On',
-        }),
-        'BSH.Common.Status.DoorState': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Closed',
-        }),
-        'BSH.Common.Status.OperationState': dict({
-          'value': 'BSH.Common.EnumType.OperationState.Ready',
-        }),
-        'BSH.Common.Status.RemoteControlActive': dict({
-          'value': True,
-        }),
-        'BSH.Common.Status.RemoteControlStartAllowed': dict({
-          'value': True,
-        }),
-        'Refrigeration.Common.Status.Door.Refrigerator': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Open',
-        }),
+      'settings': dict({
+        'BSH.Common.Setting.ChildLock': False,
+        'BSH.Common.Setting.PowerState': 'BSH.Common.EnumType.PowerState.On',
+        'LaundryCare.Washer.Setting.IDos2BaseLevel': 0,
       }),
+      'status': dict({
+        'BSH.Common.Status.DoorState': 'BSH.Common.EnumType.DoorState.Closed',
+        'BSH.Common.Status.OperationState': 'BSH.Common.EnumType.OperationState.Ready',
+        'BSH.Common.Status.RemoteControlActive': True,
+        'BSH.Common.Status.RemoteControlStartAllowed': True,
+        'Refrigeration.Common.Status.Door.Refrigerator': 'BSH.Common.EnumType.DoorState.Open',
+      }),
+      'type': 'Washer',
+      'vib': 'HCS03WCH1',
     }),
     'SIEMENS-HCS05FRF1-304F4F9E541D': dict({
+      'brand': 'SIEMENS',
       'connected': True,
+      'e_number': 'HCS05FRF1/03',
+      'ha_id': 'SIEMENS-HCS05FRF1-304F4F9E541D',
+      'name': 'FridgeFreezer',
       'programs': list([
       ]),
-      'status': dict({
-        'BSH.Common.Status.DoorState': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Closed',
-        }),
-        'BSH.Common.Status.OperationState': dict({
-          'value': 'BSH.Common.EnumType.OperationState.Ready',
-        }),
-        'BSH.Common.Status.RemoteControlActive': dict({
-          'value': True,
-        }),
-        'BSH.Common.Status.RemoteControlStartAllowed': dict({
-          'value': True,
-        }),
-        'Refrigeration.Common.Setting.Dispenser.Enabled': dict({
-          'constraints': dict({
-            'access': 'readWrite',
-          }),
-          'type': 'Boolean',
-          'value': False,
-        }),
-        'Refrigeration.Common.Setting.Light.External.Brightness': dict({
-          'constraints': dict({
-            'access': 'readWrite',
-            'max': 100,
-            'min': 0,
-          }),
-          'type': 'Double',
-          'unit': '%',
-          'value': 70,
-        }),
-        'Refrigeration.Common.Setting.Light.External.Power': dict({
-          'type': 'Boolean',
-          'value': True,
-        }),
-        'Refrigeration.Common.Status.Door.Refrigerator': dict({
-          'value': 'BSH.Common.EnumType.DoorState.Open',
-        }),
-        'Refrigeration.FridgeFreezer.Setting.SuperModeFreezer': dict({
-          'constraints': dict({
-            'access': 'readWrite',
-          }),
-          'type': 'Boolean',
-          'value': False,
-        }),
-        'Refrigeration.FridgeFreezer.Setting.SuperModeRefrigerator': dict({
-          'constraints': dict({
-            'access': 'readWrite',
-          }),
-          'type': 'Boolean',
-          'value': False,
-        }),
+      'settings': dict({
+        'Refrigeration.Common.Setting.Dispenser.Enabled': False,
+        'Refrigeration.Common.Setting.Light.External.Brightness': 70,
+        'Refrigeration.Common.Setting.Light.External.Power': True,
+        'Refrigeration.FridgeFreezer.Setting.SetpointTemperatureRefrigerator': 8,
+        'Refrigeration.FridgeFreezer.Setting.SuperModeFreezer': False,
+        'Refrigeration.FridgeFreezer.Setting.SuperModeRefrigerator': False,
       }),
+      'status': dict({
+        'BSH.Common.Status.DoorState': 'BSH.Common.EnumType.DoorState.Closed',
+        'BSH.Common.Status.OperationState': 'BSH.Common.EnumType.OperationState.Ready',
+        'BSH.Common.Status.RemoteControlActive': True,
+        'BSH.Common.Status.RemoteControlStartAllowed': True,
+        'Refrigeration.Common.Status.Door.Refrigerator': 'BSH.Common.EnumType.DoorState.Open',
+      }),
+      'type': 'FridgeFreezer',
+      'vib': 'HCS05FRF1',
     }),
   })
 # ---
 # name: test_async_get_device_diagnostics
   dict({
+    'brand': 'SIEMENS',
     'connected': True,
+    'e_number': 'HCS02DWH1/03',
+    'ha_id': 'SIEMENS-HCS02DWH1-6BE58C26DCC1',
+    'name': 'Dishwasher',
     'programs': list([
       'Dishcare.Dishwasher.Program.Auto1',
       'Dishcare.Dishwasher.Program.Auto2',
@@ -436,47 +326,22 @@
       'Dishcare.Dishwasher.Program.Eco50',
       'Dishcare.Dishwasher.Program.Quick45',
     ]),
-    'status': dict({
-      'BSH.Common.Setting.AmbientLightBrightness': dict({
-        'type': 'Double',
-        'unit': '%',
-        'value': 70,
-      }),
-      'BSH.Common.Setting.AmbientLightColor': dict({
-        'type': 'BSH.Common.EnumType.AmbientLightColor',
-        'value': 'BSH.Common.EnumType.AmbientLightColor.Color43',
-      }),
-      'BSH.Common.Setting.AmbientLightCustomColor': dict({
-        'type': 'String',
-        'value': '#4a88f8',
-      }),
-      'BSH.Common.Setting.AmbientLightEnabled': dict({
-        'type': 'Boolean',
-        'value': True,
-      }),
-      'BSH.Common.Setting.ChildLock': dict({
-        'type': 'Boolean',
-        'value': False,
-      }),
-      'BSH.Common.Setting.PowerState': dict({
-        'type': 'BSH.Common.EnumType.PowerState',
-        'value': 'BSH.Common.EnumType.PowerState.On',
-      }),
-      'BSH.Common.Status.DoorState': dict({
-        'value': 'BSH.Common.EnumType.DoorState.Closed',
-      }),
-      'BSH.Common.Status.OperationState': dict({
-        'value': 'BSH.Common.EnumType.OperationState.Ready',
-      }),
-      'BSH.Common.Status.RemoteControlActive': dict({
-        'value': True,
-      }),
-      'BSH.Common.Status.RemoteControlStartAllowed': dict({
-        'value': True,
-      }),
-      'Refrigeration.Common.Status.Door.Refrigerator': dict({
-        'value': 'BSH.Common.EnumType.DoorState.Open',
-      }),
+    'settings': dict({
+      'BSH.Common.Setting.AmbientLightBrightness': 70,
+      'BSH.Common.Setting.AmbientLightColor': 'BSH.Common.EnumType.AmbientLightColor.Color43',
+      'BSH.Common.Setting.AmbientLightCustomColor': '#4a88f8',
+      'BSH.Common.Setting.AmbientLightEnabled': True,
+      'BSH.Common.Setting.ChildLock': False,
+      'BSH.Common.Setting.PowerState': 'BSH.Common.EnumType.PowerState.On',
     }),
+    'status': dict({
+      'BSH.Common.Status.DoorState': 'BSH.Common.EnumType.DoorState.Closed',
+      'BSH.Common.Status.OperationState': 'BSH.Common.EnumType.OperationState.Ready',
+      'BSH.Common.Status.RemoteControlActive': True,
+      'BSH.Common.Status.RemoteControlStartAllowed': True,
+      'Refrigeration.Common.Status.Door.Refrigerator': 'BSH.Common.EnumType.DoorState.Open',
+    }),
+    'type': 'Dishwasher',
+    'vib': 'HCS02DWH1',
   })
 # ---
diff --git a/tests/components/home_connect/snapshots/test_services.ambr b/tests/components/home_connect/snapshots/test_services.ambr
new file mode 100644
index 00000000000..610e9fa1248
--- /dev/null
+++ b/tests/components/home_connect/snapshots/test_services.ambr
@@ -0,0 +1,79 @@
+# serializer version: 1
+# name: test_set_program_and_options[service_call0-set_selected_program-Washer]
+  _Call(
+    tuple(
+      'SIEMENS-HCS03WCH1-7BC6383CF794',
+    ),
+    dict({
+      'options': list([
+        dict({
+          'display_value': None,
+          'key': <OptionKey.BSH_COMMON_START_IN_RELATIVE: 'BSH.Common.Option.StartInRelative'>,
+          'name': None,
+          'unit': None,
+          'value': 1800,
+        }),
+      ]),
+      'program_key': <ProgramKey.DISHCARE_DISHWASHER_ECO_50: 'Dishcare.Dishwasher.Program.Eco50'>,
+    }),
+  )
+# ---
+# name: test_set_program_and_options[service_call1-start_program-Washer]
+  _Call(
+    tuple(
+      'SIEMENS-HCS03WCH1-7BC6383CF794',
+    ),
+    dict({
+      'options': list([
+        dict({
+          'display_value': None,
+          'key': <OptionKey.CONSUMER_PRODUCTS_COFFEE_MAKER_BEAN_AMOUNT: 'ConsumerProducts.CoffeeMaker.Option.BeanAmount'>,
+          'name': None,
+          'unit': None,
+          'value': 'ConsumerProducts.CoffeeMaker.EnumType.BeanAmount.Normal',
+        }),
+      ]),
+      'program_key': <ProgramKey.CONSUMER_PRODUCTS_COFFEE_MAKER_BEVERAGE_COFFEE: 'ConsumerProducts.CoffeeMaker.Program.Beverage.Coffee'>,
+    }),
+  )
+# ---
+# name: test_set_program_and_options[service_call2-set_active_program_options-Washer]
+  _Call(
+    tuple(
+      'SIEMENS-HCS03WCH1-7BC6383CF794',
+    ),
+    dict({
+      'array_of_options': dict({
+        'options': list([
+          dict({
+            'display_value': None,
+            'key': <OptionKey.CONSUMER_PRODUCTS_COFFEE_MAKER_COFFEE_MILK_RATIO: 'ConsumerProducts.CoffeeMaker.Option.CoffeeMilkRatio'>,
+            'name': None,
+            'unit': None,
+            'value': 'ConsumerProducts.CoffeeMaker.EnumType.CoffeeMilkRatio.50Percent',
+          }),
+        ]),
+      }),
+    }),
+  )
+# ---
+# name: test_set_program_and_options[service_call3-set_selected_program_options-Washer]
+  _Call(
+    tuple(
+      'SIEMENS-HCS03WCH1-7BC6383CF794',
+    ),
+    dict({
+      'array_of_options': dict({
+        'options': list([
+          dict({
+            'display_value': None,
+            'key': <OptionKey.CONSUMER_PRODUCTS_COFFEE_MAKER_FILL_QUANTITY: 'ConsumerProducts.CoffeeMaker.Option.FillQuantity'>,
+            'name': None,
+            'unit': None,
+            'value': 35,
+          }),
+        ]),
+      }),
+    }),
+  )
+# ---
diff --git a/tests/components/home_connect/test_binary_sensor.py b/tests/components/home_connect/test_binary_sensor.py
index b564b003af6..ce879a38de5 100644
--- a/tests/components/home_connect/test_binary_sensor.py
+++ b/tests/components/home_connect/test_binary_sensor.py
@@ -1,32 +1,46 @@
 """Tests for home_connect binary_sensor entities."""
 
 from collections.abc import Awaitable, Callable
-from unittest.mock import MagicMock, Mock
+from http import HTTPStatus
+from unittest.mock import AsyncMock, MagicMock
 
-from homeconnect.api import HomeConnectAPI
+from aiohomeconnect.model import (
+    ArrayOfEvents,
+    Event,
+    EventKey,
+    EventMessage,
+    EventType,
+    HomeAppliance,
+)
+from aiohomeconnect.model.error import HomeConnectApiError
 import pytest
 
 from homeassistant.components import automation, script
 from homeassistant.components.automation import automations_with_entity
 from homeassistant.components.home_connect.const import (
-    BSH_DOOR_STATE,
     BSH_DOOR_STATE_CLOSED,
     BSH_DOOR_STATE_LOCKED,
     BSH_DOOR_STATE_OPEN,
     DOMAIN,
     REFRIGERATION_STATUS_DOOR_CLOSED,
     REFRIGERATION_STATUS_DOOR_OPEN,
-    REFRIGERATION_STATUS_DOOR_REFRIGERATOR,
 )
 from homeassistant.components.script import scripts_with_entity
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE, Platform
+from homeassistant.const import (
+    STATE_OFF,
+    STATE_ON,
+    STATE_UNAVAILABLE,
+    STATE_UNKNOWN,
+    Platform,
+)
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_component import async_update_entity
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 import homeassistant.helpers.issue_registry as ir
 from homeassistant.setup import async_setup_component
 
-from tests.common import MockConfigEntry, load_json_object_fixture
+from tests.common import MockConfigEntry
+from tests.typing import ClientSessionGenerator
 
 
 @pytest.fixture
@@ -35,123 +49,373 @@ def platforms() -> list[str]:
     return [Platform.BINARY_SENSOR]
 
 
-@pytest.mark.usefixtures("bypass_throttle")
 async def test_binary_sensors(
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: MagicMock,
-    appliance: Mock,
+    client: MagicMock,
 ) -> None:
     """Test binary sensor entities."""
-    get_appliances.return_value = [appliance]
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
 
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+async def test_paired_depaired_devices_flow(
+    appliance: HomeAppliance,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that removed devices are correctly removed from and added to hass on API events."""
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+    assert entity_entries
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.DEPAIRED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert not device
+    for entity_entry in entity_entries:
+        assert not entity_registry.async_get(entity_entry.entity_id)
+
+    # Now that all everything related to the device is removed, pair it again
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.PAIRED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    assert device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    for entity_entry in entity_entries:
+        assert entity_registry.async_get(entity_entry.entity_id)
+
+
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+async def test_connected_devices(
+    appliance: HomeAppliance,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that devices reconnected.
+
+    Specifically those devices whose settings, status, etc. could
+    not be obtained while disconnected and once connected, the entities are added.
+    """
+    get_status_original_mock = client.get_status
+
+    def get_status_side_effect(ha_id: str):
+        if ha_id == appliance.ha_id:
+            raise HomeConnectApiError(
+                "SDK.Error.HomeAppliance.Connection.Initialization.Failed"
+            )
+        return get_status_original_mock.return_value
+
+    client.get_status = AsyncMock(side_effect=get_status_side_effect)
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+    client.get_status = get_status_original_mock
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.CONNECTED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    new_entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+    assert len(new_entity_entries) > len(entity_entries)
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+async def test_binary_sensors_entity_availability(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    appliance: HomeAppliance,
+) -> None:
+    """Test if binary sensor entities availability are based on the appliance connection state."""
+    entity_ids = [
+        "binary_sensor.washer_door",
+        "binary_sensor.washer_remote_control",
+    ]
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    for entity_id in entity_ids:
+        state = hass.states.get(entity_id)
+        assert state
+        assert state.state != STATE_UNAVAILABLE
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.DISCONNECTED,
+                ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    for entity_id in entity_ids:
+        assert hass.states.is_state(entity_id, STATE_UNAVAILABLE)
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.CONNECTED,
+                ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    for entity_id in entity_ids:
+        state = hass.states.get(entity_id)
+        assert state
+        assert state.state != STATE_UNAVAILABLE
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
 @pytest.mark.parametrize(
-    ("state", "expected"),
+    ("value", "expected"),
     [
         (BSH_DOOR_STATE_CLOSED, "off"),
         (BSH_DOOR_STATE_LOCKED, "off"),
         (BSH_DOOR_STATE_OPEN, "on"),
-        ("", "unavailable"),
+        ("", STATE_UNKNOWN),
     ],
 )
-@pytest.mark.usefixtures("bypass_throttle")
 async def test_binary_sensors_door_states(
+    appliance: HomeAppliance,
     expected: str,
-    state: str,
+    value: str,
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: MagicMock,
-    appliance: Mock,
+    client: MagicMock,
 ) -> None:
     """Tests for Appliance door states."""
     entity_id = "binary_sensor.washer_door"
-    get_appliances.return_value = [appliance]
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    appliance.status.update({BSH_DOOR_STATE: {"value": state}})
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
-    await async_update_entity(hass, entity_id)
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.STATUS,
+                ArrayOfEvents(
+                    [
+                        Event(
+                            key=EventKey.BSH_COMMON_STATUS_DOOR_STATE,
+                            raw_key=EventKey.BSH_COMMON_STATUS_DOOR_STATE.value,
+                            timestamp=0,
+                            level="",
+                            handling="",
+                            value=value,
+                        )
+                    ],
+                ),
+            )
+        ]
+    )
     await hass.async_block_till_done()
     assert hass.states.is_state(entity_id, expected)
 
 
 @pytest.mark.parametrize(
-    ("entity_id", "status_key", "event_value_update", "expected", "appliance"),
+    ("entity_id", "event_key", "event_value_update", "expected", "appliance"),
     [
+        (
+            "binary_sensor.washer_remote_control",
+            EventKey.BSH_COMMON_STATUS_REMOTE_CONTROL_ACTIVE,
+            False,
+            STATE_OFF,
+            "Washer",
+        ),
+        (
+            "binary_sensor.washer_remote_control",
+            EventKey.BSH_COMMON_STATUS_REMOTE_CONTROL_ACTIVE,
+            True,
+            STATE_ON,
+            "Washer",
+        ),
+        (
+            "binary_sensor.washer_remote_control",
+            EventKey.BSH_COMMON_STATUS_REMOTE_CONTROL_ACTIVE,
+            "",
+            STATE_UNKNOWN,
+            "Washer",
+        ),
         (
             "binary_sensor.fridgefreezer_refrigerator_door",
-            REFRIGERATION_STATUS_DOOR_REFRIGERATOR,
+            EventKey.REFRIGERATION_COMMON_STATUS_DOOR_REFRIGERATOR,
             REFRIGERATION_STATUS_DOOR_CLOSED,
             STATE_OFF,
             "FridgeFreezer",
         ),
         (
             "binary_sensor.fridgefreezer_refrigerator_door",
-            REFRIGERATION_STATUS_DOOR_REFRIGERATOR,
+            EventKey.REFRIGERATION_COMMON_STATUS_DOOR_REFRIGERATOR,
             REFRIGERATION_STATUS_DOOR_OPEN,
             STATE_ON,
             "FridgeFreezer",
         ),
         (
             "binary_sensor.fridgefreezer_refrigerator_door",
-            REFRIGERATION_STATUS_DOOR_REFRIGERATOR,
+            EventKey.REFRIGERATION_COMMON_STATUS_DOOR_REFRIGERATOR,
             "",
-            STATE_UNAVAILABLE,
+            STATE_UNKNOWN,
             "FridgeFreezer",
         ),
     ],
     indirect=["appliance"],
 )
-@pytest.mark.usefixtures("bypass_throttle")
-async def test_bianry_sensors_fridge_door_states(
+async def test_binary_sensors_functionality(
     entity_id: str,
-    status_key: str,
+    event_key: EventKey,
     event_value_update: str,
-    appliance: Mock,
+    appliance: HomeAppliance,
     expected: str,
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: MagicMock,
+    client: MagicMock,
 ) -> None:
     """Tests for Home Connect Fridge appliance door states."""
-    appliance.status.update(
-        HomeConnectAPI.json2dict(
-            load_json_object_fixture("home_connect/status.json")["data"]["status"]
-        )
-    )
-    get_appliances.return_value = [appliance]
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
-    appliance.status.update({status_key: {"value": event_value_update}})
-    await async_update_entity(hass, entity_id)
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.STATUS,
+                ArrayOfEvents(
+                    [
+                        Event(
+                            key=event_key,
+                            raw_key=event_key.value,
+                            timestamp=0,
+                            level="",
+                            handling="",
+                            value=event_value_update,
+                        )
+                    ],
+                ),
+            )
+        ]
+    )
     await hass.async_block_till_done()
     assert hass.states.is_state(entity_id, expected)
 
 
-@pytest.mark.usefixtures("entity_registry_enabled_by_default")
-@pytest.mark.usefixtures("bypass_throttle")
-async def test_create_issue(
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+async def test_connected_sensor_functionality(
     hass: HomeAssistant,
-    appliance: Mock,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: MagicMock,
+    client: MagicMock,
+    appliance: HomeAppliance,
+) -> None:
+    """Test if the connected binary sensor reports the right values."""
+    entity_id = "binary_sensor.washer_connectivity"
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    assert hass.states.is_state(entity_id, STATE_ON)
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.DISCONNECTED,
+                ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    assert hass.states.is_state(entity_id, STATE_OFF)
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.CONNECTED,
+                ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    assert hass.states.is_state(entity_id, STATE_ON)
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_create_door_binary_sensor_deprecation_issue(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
     issue_registry: ir.IssueRegistry,
 ) -> None:
-    """Test we create an issue when an automation or script is using a deprecated entity."""
+    """Test that we create an issue when an automation or script is using a door binary sensor entity."""
     entity_id = "binary_sensor.washer_door"
-    get_appliances.return_value = [appliance]
     issue_id = f"deprecated_binary_common_door_sensor_{entity_id}"
 
     assert await async_setup_component(
@@ -189,8 +453,7 @@ async def test_create_issue(
     )
 
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    appliance.status.update({BSH_DOOR_STATE: {"value": BSH_DOOR_STATE_OPEN}})
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
     assert automations_with_entity(hass, entity_id)[0] == "automation.test"
@@ -205,3 +468,76 @@ async def test_create_issue(
     # Assert the issue is no longer present
     assert not issue_registry.async_get_issue(DOMAIN, issue_id)
     assert len(issue_registry.issues) == 0
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_door_binary_sensor_deprecation_issue_fix(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    issue_registry: ir.IssueRegistry,
+    hass_client: ClientSessionGenerator,
+) -> None:
+    """Test that we create an issue when an automation or script is using a door binary sensor entity."""
+    entity_id = "binary_sensor.washer_door"
+    issue_id = f"deprecated_binary_common_door_sensor_{entity_id}"
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: {
+                "alias": "test",
+                "trigger": {"platform": "state", "entity_id": entity_id},
+                "action": {
+                    "action": "automation.turn_on",
+                    "target": {
+                        "entity_id": "automation.test",
+                    },
+                },
+            }
+        },
+    )
+    assert await async_setup_component(
+        hass,
+        script.DOMAIN,
+        {
+            script.DOMAIN: {
+                "test": {
+                    "sequence": [
+                        {
+                            "condition": "state",
+                            "entity_id": entity_id,
+                            "state": "on",
+                        },
+                    ],
+                }
+            }
+        },
+    )
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    assert automations_with_entity(hass, entity_id)[0] == "automation.test"
+    assert scripts_with_entity(hass, entity_id)[0] == "script.test"
+
+    assert len(issue_registry.issues) == 1
+    issue = issue_registry.async_get_issue(DOMAIN, issue_id)
+    assert issue
+
+    _client = await hass_client()
+    resp = await _client.post(
+        "/api/repairs/issues/fix",
+        json={"handler": DOMAIN, "issue_id": issue.issue_id},
+    )
+    assert resp.status == HTTPStatus.OK
+    flow_id = (await resp.json())["flow_id"]
+    resp = await _client.post(f"/api/repairs/issues/fix/{flow_id}")
+
+    # Assert the issue is no longer present
+    assert not issue_registry.async_get_issue(DOMAIN, issue_id)
+    assert len(issue_registry.issues) == 0
diff --git a/tests/components/home_connect/test_button.py b/tests/components/home_connect/test_button.py
new file mode 100644
index 00000000000..f894494792d
--- /dev/null
+++ b/tests/components/home_connect/test_button.py
@@ -0,0 +1,324 @@
+"""Tests for home_connect button entities."""
+
+from collections.abc import Awaitable, Callable
+from typing import Any
+from unittest.mock import AsyncMock, MagicMock
+
+from aiohomeconnect.model import (
+    ArrayOfCommands,
+    CommandKey,
+    EventMessage,
+    HomeAppliance,
+)
+from aiohomeconnect.model.command import Command
+from aiohomeconnect.model.error import HomeConnectApiError
+from aiohomeconnect.model.event import ArrayOfEvents, EventType
+import pytest
+
+from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
+from homeassistant.components.home_connect.const import DOMAIN
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import ATTR_ENTITY_ID, STATE_UNAVAILABLE, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import device_registry as dr, entity_registry as er
+
+from tests.common import MockConfigEntry
+
+
+@pytest.fixture
+def platforms() -> list[str]:
+    """Fixture to specify platforms to test."""
+    return [Platform.BUTTON]
+
+
+async def test_buttons(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test button entities."""
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+async def test_paired_depaired_devices_flow(
+    appliance: HomeAppliance,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that removed devices are correctly removed from and added to hass on API events."""
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+    assert entity_entries
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.DEPAIRED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert not device
+    for entity_entry in entity_entries:
+        assert not entity_registry.async_get(entity_entry.entity_id)
+
+    # Now that all everything related to the device is removed, pair it again
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.PAIRED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    assert device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    for entity_entry in entity_entries:
+        assert entity_registry.async_get(entity_entry.entity_id)
+
+
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+async def test_connected_devices(
+    appliance: HomeAppliance,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that devices reconnected.
+
+    Specifically those devices whose settings, status, etc. could
+    not be obtained while disconnected and once connected, the entities are added.
+    """
+    get_available_commands_original_mock = client.get_available_commands
+    get_available_programs_mock = client.get_available_programs
+
+    async def get_available_commands_side_effect(ha_id: str):
+        if ha_id == appliance.ha_id:
+            raise HomeConnectApiError(
+                "SDK.Error.HomeAppliance.Connection.Initialization.Failed"
+            )
+        return await get_available_commands_original_mock.side_effect(ha_id)
+
+    async def get_available_programs_side_effect(ha_id: str):
+        if ha_id == appliance.ha_id:
+            raise HomeConnectApiError(
+                "SDK.Error.HomeAppliance.Connection.Initialization.Failed"
+            )
+        return await get_available_programs_mock.side_effect(ha_id)
+
+    client.get_available_commands = AsyncMock(
+        side_effect=get_available_commands_side_effect
+    )
+    client.get_available_programs = AsyncMock(
+        side_effect=get_available_programs_side_effect
+    )
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+    client.get_available_commands = get_available_commands_original_mock
+    client.get_available_programs = get_available_programs_mock
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.CONNECTED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    new_entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+    assert len(new_entity_entries) > len(entity_entries)
+
+
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+async def test_button_entity_availability(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    appliance: HomeAppliance,
+) -> None:
+    """Test if button entities availability are based on the appliance connection state."""
+    entity_ids = [
+        "button.washer_pause_program",
+        "button.washer_stop_program",
+    ]
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    for entity_id in entity_ids:
+        state = hass.states.get(entity_id)
+        assert state
+        assert state.state != STATE_UNAVAILABLE
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.DISCONNECTED,
+                ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    for entity_id in entity_ids:
+        assert hass.states.is_state(entity_id, STATE_UNAVAILABLE)
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.CONNECTED,
+                ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    for entity_id in entity_ids:
+        state = hass.states.get(entity_id)
+        assert state
+        assert state.state != STATE_UNAVAILABLE
+
+
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+@pytest.mark.parametrize(
+    ("entity_id", "method_call", "expected_kwargs"),
+    [
+        (
+            "button.washer_pause_program",
+            "put_command",
+            {"command_key": CommandKey.BSH_COMMON_PAUSE_PROGRAM, "value": True},
+        ),
+        ("button.washer_stop_program", "stop_program", {}),
+    ],
+)
+async def test_button_functionality(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    entity_id: str,
+    method_call: str,
+    expected_kwargs: dict[str, Any],
+    appliance: HomeAppliance,
+) -> None:
+    """Test if button entities availability are based on the appliance connection state."""
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    entity = hass.states.get(entity_id)
+    assert entity
+    assert entity.state != STATE_UNAVAILABLE
+
+    await hass.services.async_call(
+        BUTTON_DOMAIN,
+        SERVICE_PRESS,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+    getattr(client, method_call).assert_called_with(appliance.ha_id, **expected_kwargs)
+
+
+async def test_command_button_exception(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client_with_exception: MagicMock,
+) -> None:
+    """Test if button entities availability are based on the appliance connection state."""
+    entity_id = "button.washer_pause_program"
+
+    client_with_exception.get_available_commands = AsyncMock(
+        return_value=ArrayOfCommands(
+            [
+                Command(
+                    CommandKey.BSH_COMMON_PAUSE_PROGRAM,
+                    "Pause Program",
+                )
+            ]
+        )
+    )
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client_with_exception)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    entity = hass.states.get(entity_id)
+    assert entity
+    assert entity.state != STATE_UNAVAILABLE
+
+    with pytest.raises(HomeAssistantError, match=r"Error.*executing.*command"):
+        await hass.services.async_call(
+            BUTTON_DOMAIN,
+            SERVICE_PRESS,
+            {ATTR_ENTITY_ID: entity_id},
+            blocking=True,
+        )
+
+
+async def test_stop_program_button_exception(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client_with_exception: MagicMock,
+) -> None:
+    """Test if button entities availability are based on the appliance connection state."""
+    entity_id = "button.washer_stop_program"
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client_with_exception)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    entity = hass.states.get(entity_id)
+    assert entity
+    assert entity.state != STATE_UNAVAILABLE
+
+    with pytest.raises(HomeAssistantError, match=r"Error.*stop.*program"):
+        await hass.services.async_call(
+            BUTTON_DOMAIN,
+            SERVICE_PRESS,
+            {ATTR_ENTITY_ID: entity_id},
+            blocking=True,
+        )
diff --git a/tests/components/home_connect/test_config_flow.py b/tests/components/home_connect/test_config_flow.py
index 80f53e20b39..c35678e4e5f 100644
--- a/tests/components/home_connect/test_config_flow.py
+++ b/tests/components/home_connect/test_config_flow.py
@@ -1,8 +1,10 @@
 """Test the Home Connect config flow."""
 
+from collections.abc import Awaitable, Callable
 from http import HTTPStatus
-from unittest.mock import patch
+from unittest.mock import MagicMock, patch
 
+from aiohomeconnect.const import OAUTH2_AUTHORIZE, OAUTH2_TOKEN
 import pytest
 
 from homeassistant import config_entries, setup
@@ -10,15 +12,12 @@ from homeassistant.components.application_credentials import (
     ClientCredential,
     async_import_client_credential,
 )
-from homeassistant.components.home_connect.const import (
-    DOMAIN,
-    OAUTH2_AUTHORIZE,
-    OAUTH2_TOKEN,
-)
+from homeassistant.components.home_connect.const import DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers import config_entry_oauth2_flow
 
+from tests.common import MockConfigEntry
 from tests.test_util.aiohttp import AiohttpClientMocker
 from tests.typing import ClientSessionGenerator
 
@@ -80,3 +79,72 @@ async def test_full_flow(
 
     assert len(hass.config_entries.async_entries(DOMAIN)) == 1
     assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_prevent_multiple_config_entries(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test we only allow one config entry."""
+    config_entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        "home_connect", context={"source": config_entries.SOURCE_USER}
+    )
+
+    assert result["type"] == "abort"
+    assert result["reason"] == "single_instance_allowed"
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+async def test_reauth_flow(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+) -> None:
+    """Test reauth flow."""
+    result = await config_entry.start_reauth_flow(hass)
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reauth_confirm"
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+
+    _client = await hass_client_no_auth()
+    resp = await _client.get(f"/auth/external/callback?code=abcd&state={state}")
+    assert resp.status == HTTPStatus.OK
+    assert resp.headers["content-type"] == "text/html; charset=utf-8"
+
+    aioclient_mock.post(
+        OAUTH2_TOKEN,
+        json={
+            "refresh_token": "mock-refresh-token",
+            "access_token": "mock-access-token",
+            "type": "Bearer",
+            "expires_in": 60,
+        },
+    )
+
+    with patch(
+        "homeassistant.components.home_connect.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        result = await hass.config_entries.flow.async_configure(result["flow_id"])
+        await hass.async_block_till_done()
+
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    assert len(mock_setup_entry.mock_calls) == 1
+
+    await hass.async_block_till_done()
+    assert result["type"] == FlowResultType.ABORT
+    assert result["reason"] == "reauth_successful"
diff --git a/tests/components/home_connect/test_coordinator.py b/tests/components/home_connect/test_coordinator.py
new file mode 100644
index 00000000000..050758a6568
--- /dev/null
+++ b/tests/components/home_connect/test_coordinator.py
@@ -0,0 +1,553 @@
+"""Test for Home Connect coordinator."""
+
+from collections.abc import Awaitable, Callable
+from datetime import timedelta
+from typing import Any, cast
+from unittest.mock import AsyncMock, MagicMock, patch
+
+from aiohomeconnect.model import (
+    ArrayOfEvents,
+    ArrayOfHomeAppliances,
+    ArrayOfSettings,
+    ArrayOfStatus,
+    Event,
+    EventKey,
+    EventMessage,
+    EventType,
+    HomeAppliance,
+)
+from aiohomeconnect.model.error import (
+    EventStreamInterruptedError,
+    HomeConnectApiError,
+    HomeConnectError,
+    HomeConnectRequestError,
+)
+from freezegun.api import FrozenDateTimeFactory
+import pytest
+
+from homeassistant.components.home_connect.const import (
+    BSH_DOOR_STATE_OPEN,
+    BSH_EVENT_PRESENT_STATE_PRESENT,
+    BSH_POWER_OFF,
+    DOMAIN,
+)
+from homeassistant.components.homeassistant import (
+    DOMAIN as HA_DOMAIN,
+    SERVICE_UPDATE_ENTITY,
+)
+from homeassistant.config_entries import ConfigEntries, ConfigEntryState
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    EVENT_STATE_REPORTED,
+    STATE_UNAVAILABLE,
+    Platform,
+)
+from homeassistant.core import (
+    Event as HassEvent,
+    EventStateReportedData,
+    HomeAssistant,
+    callback,
+)
+from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.setup import async_setup_component
+from homeassistant.util import dt as dt_util
+
+from tests.common import MockConfigEntry, async_fire_time_changed
+
+
+@pytest.fixture
+def platforms() -> list[str]:
+    """Fixture to specify platforms to test."""
+    return [Platform.SENSOR, Platform.SWITCH]
+
+
+async def test_coordinator_update(
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test that the coordinator can update."""
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+
+async def test_coordinator_update_failing_get_appliances(
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client_with_exception: MagicMock,
+) -> None:
+    """Test that the coordinator raises ConfigEntryNotReady when it fails to get appliances."""
+    client_with_exception.get_home_appliances.return_value = None
+    client_with_exception.get_home_appliances.side_effect = HomeConnectError()
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    await integration_setup(client_with_exception)
+    assert config_entry.state == ConfigEntryState.SETUP_RETRY
+
+
+@pytest.mark.usefixtures("setup_credentials")
+@pytest.mark.parametrize("platforms", [("binary_sensor",)])
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+async def test_coordinator_failure_refresh_and_stream(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    client: MagicMock,
+    freezer: FrozenDateTimeFactory,
+    appliance: HomeAppliance,
+) -> None:
+    """Test entity available state via coordinator refresh and event stream."""
+    appliance_data = (
+        cast(str, appliance.to_json())
+        .replace("ha_id", "haId")
+        .replace("e_number", "enumber")
+    )
+    entity_id_1 = "binary_sensor.washer_remote_control"
+    entity_id_2 = "binary_sensor.washer_remote_start"
+    await async_setup_component(hass, HA_DOMAIN, {})
+    await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+    state = hass.states.get(entity_id_1)
+    assert state
+    assert state.state != STATE_UNAVAILABLE
+    state = hass.states.get(entity_id_2)
+    assert state
+    assert state.state != STATE_UNAVAILABLE
+
+    client.get_home_appliances.side_effect = HomeConnectError()
+
+    # Force a coordinator refresh.
+    await hass.services.async_call(
+        HA_DOMAIN, SERVICE_UPDATE_ENTITY, {ATTR_ENTITY_ID: entity_id_1}, blocking=True
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get(entity_id_1)
+    assert state
+    assert state.state == STATE_UNAVAILABLE
+    state = hass.states.get(entity_id_2)
+    assert state
+    assert state.state == STATE_UNAVAILABLE
+
+    # Test that the entity becomes available again after a successful update.
+
+    client.get_home_appliances.side_effect = None
+    client.get_home_appliances.return_value = ArrayOfHomeAppliances(
+        [HomeAppliance.from_json(appliance_data)]
+    )
+
+    # Move time forward to pass the debounce time.
+    freezer.tick(timedelta(hours=1))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    # Force a coordinator refresh.
+    await hass.services.async_call(
+        HA_DOMAIN, SERVICE_UPDATE_ENTITY, {ATTR_ENTITY_ID: entity_id_1}, blocking=True
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get(entity_id_1)
+    assert state
+    assert state.state != STATE_UNAVAILABLE
+    state = hass.states.get(entity_id_2)
+    assert state
+    assert state.state != STATE_UNAVAILABLE
+
+    # Test that the event stream makes the entity go available too.
+
+    # First make the entity unavailable.
+    client.get_home_appliances.side_effect = HomeConnectError()
+
+    # Move time forward to pass the debounce time
+    freezer.tick(timedelta(hours=1))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    # Force a coordinator refresh
+    await hass.services.async_call(
+        HA_DOMAIN, SERVICE_UPDATE_ENTITY, {ATTR_ENTITY_ID: entity_id_1}, blocking=True
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get(entity_id_1)
+    assert state
+    assert state.state == STATE_UNAVAILABLE
+    state = hass.states.get(entity_id_2)
+    assert state
+    assert state.state == STATE_UNAVAILABLE
+
+    # Now make the entity available again.
+    client.get_home_appliances.side_effect = None
+    client.get_home_appliances.return_value = ArrayOfHomeAppliances(
+        [HomeAppliance.from_json(appliance_data)]
+    )
+
+    # One event should make all entities for this appliance available again.
+    event_message = EventMessage(
+        appliance.ha_id,
+        EventType.STATUS,
+        ArrayOfEvents(
+            [
+                Event(
+                    key=EventKey.BSH_COMMON_STATUS_REMOTE_CONTROL_ACTIVE,
+                    raw_key=EventKey.BSH_COMMON_STATUS_REMOTE_CONTROL_ACTIVE.value,
+                    timestamp=0,
+                    level="",
+                    handling="",
+                    value=False,
+                )
+            ],
+        ),
+    )
+    await client.add_events([event_message])
+    await hass.async_block_till_done()
+
+    state = hass.states.get(entity_id_1)
+    assert state
+    assert state.state != STATE_UNAVAILABLE
+    state = hass.states.get(entity_id_2)
+    assert state
+    assert state.state != STATE_UNAVAILABLE
+
+
+@pytest.mark.parametrize(
+    "mock_method",
+    [
+        "get_settings",
+        "get_status",
+        "get_all_programs",
+        "get_available_commands",
+        "get_available_program",
+    ],
+)
+async def test_coordinator_update_failing(
+    mock_method: str,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test that although is not possible to get settings and status, the config entry is loaded.
+
+    This is for cases where some appliances are reachable and some are not in the same configuration entry.
+    """
+    setattr(client, mock_method, AsyncMock(side_effect=HomeConnectError()))
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    getattr(client, mock_method).assert_called()
+
+
+@pytest.mark.parametrize("appliance", ["Dishwasher"], indirect=True)
+@pytest.mark.parametrize(
+    ("event_type", "event_key", "event_value", ATTR_ENTITY_ID),
+    [
+        (
+            EventType.STATUS,
+            EventKey.BSH_COMMON_STATUS_DOOR_STATE,
+            BSH_DOOR_STATE_OPEN,
+            "sensor.dishwasher_door",
+        ),
+        (
+            EventType.NOTIFY,
+            EventKey.BSH_COMMON_SETTING_POWER_STATE,
+            BSH_POWER_OFF,
+            "switch.dishwasher_power",
+        ),
+        (
+            EventType.EVENT,
+            EventKey.DISHCARE_DISHWASHER_EVENT_SALT_NEARLY_EMPTY,
+            BSH_EVENT_PRESENT_STATE_PRESENT,
+            "sensor.dishwasher_salt_nearly_empty",
+        ),
+    ],
+)
+async def test_event_listener(
+    event_type: EventType,
+    event_key: EventKey,
+    event_value: str,
+    entity_id: str,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    appliance: HomeAppliance,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that the event listener works."""
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    state = hass.states.get(entity_id)
+    assert state
+    event_message = EventMessage(
+        appliance.ha_id,
+        event_type,
+        ArrayOfEvents(
+            [
+                Event(
+                    key=event_key,
+                    raw_key=event_key.value,
+                    timestamp=0,
+                    level="",
+                    handling="",
+                    value=event_value,
+                )
+            ],
+        ),
+    )
+    await client.add_events([event_message])
+    await hass.async_block_till_done()
+
+    new_state = hass.states.get(entity_id)
+    assert new_state
+    assert new_state.state != state.state
+
+    # Following, we are gonna check that the listeners are clean up correctly
+    new_entity_id = entity_id + "_new"
+    listener = MagicMock()
+
+    @callback
+    def listener_callback(event: HassEvent[EventStateReportedData]) -> None:
+        listener(event.data["entity_id"])
+
+    @callback
+    def event_filter(_: EventStateReportedData) -> bool:
+        return True
+
+    hass.bus.async_listen(EVENT_STATE_REPORTED, listener_callback, event_filter)
+
+    entity_registry.async_update_entity(entity_id, new_entity_id=new_entity_id)
+    await hass.async_block_till_done()
+    await client.add_events([event_message])
+    await hass.async_block_till_done()
+
+    # Because the entity's id has been updated, the entity has been unloaded
+    # and the listener has been removed, and the new entity adds a new listener,
+    # so the only entity that should report states is the one with the new entity id
+    listener.assert_called_once_with(new_entity_id)
+
+
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+async def tests_receive_setting_and_status_for_first_time_at_events(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    appliance: HomeAppliance,
+) -> None:
+    """Test that the event listener is capable of receiving settings and status for the first time."""
+    client.get_setting = AsyncMock(return_value=ArrayOfSettings([]))
+    client.get_status = AsyncMock(return_value=ArrayOfStatus([]))
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.NOTIFY,
+                ArrayOfEvents(
+                    [
+                        Event(
+                            key=EventKey.LAUNDRY_CARE_WASHER_SETTING_I_DOS_1_BASE_LEVEL,
+                            raw_key=EventKey.LAUNDRY_CARE_WASHER_SETTING_I_DOS_1_BASE_LEVEL.value,
+                            timestamp=0,
+                            level="",
+                            handling="",
+                            value="some value",
+                        )
+                    ],
+                ),
+            ),
+            EventMessage(
+                appliance.ha_id,
+                EventType.STATUS,
+                ArrayOfEvents(
+                    [
+                        Event(
+                            key=EventKey.BSH_COMMON_STATUS_DOOR_STATE,
+                            raw_key=EventKey.BSH_COMMON_STATUS_DOOR_STATE.value,
+                            timestamp=0,
+                            level="",
+                            handling="",
+                            value="some value",
+                        )
+                    ],
+                ),
+            ),
+        ]
+    )
+    await hass.async_block_till_done()
+    assert len(config_entry._background_tasks) == 1
+    assert config_entry.state == ConfigEntryState.LOADED
+
+
+async def test_event_listener_error(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client_with_exception: MagicMock,
+) -> None:
+    """Test that the configuration entry is reloaded when the event stream raises an API error."""
+    client_with_exception.stream_all_events = MagicMock(
+        side_effect=HomeConnectApiError("error.key", "error description")
+    )
+
+    with patch.object(
+        ConfigEntries,
+        "async_schedule_reload",
+    ) as mock_schedule_reload:
+        await integration_setup(client_with_exception)
+        await hass.async_block_till_done()
+
+    client_with_exception.stream_all_events.assert_called_once()
+    mock_schedule_reload.assert_called_once_with(config_entry.entry_id)
+    assert not config_entry._background_tasks
+
+
+@pytest.mark.usefixtures("setup_credentials")
+@pytest.mark.parametrize("platforms", [("sensor",)])
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+@pytest.mark.parametrize(
+    "exception",
+    [HomeConnectRequestError(), EventStreamInterruptedError()],
+)
+@pytest.mark.parametrize(
+    (
+        "entity_id",
+        "initial_state",
+        "event_key",
+        "event_value",
+        "after_event_expected_state",
+    ),
+    [
+        (
+            "sensor.washer_door",
+            "closed",
+            EventKey.BSH_COMMON_STATUS_DOOR_STATE,
+            BSH_DOOR_STATE_OPEN,
+            "open",
+        ),
+    ],
+)
+async def test_event_listener_resilience(
+    entity_id: str,
+    initial_state: str,
+    event_key: EventKey,
+    event_value: Any,
+    after_event_expected_state: str,
+    exception: HomeConnectError,
+    hass: HomeAssistant,
+    appliance: HomeAppliance,
+    client: MagicMock,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+) -> None:
+    """Test that the event listener is resilient to interruptions."""
+    future = hass.loop.create_future()
+
+    async def stream_exception():
+        yield await future
+
+    client.stream_all_events = MagicMock(
+        side_effect=[stream_exception(), client.stream_all_events()]
+    )
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    await integration_setup(client)
+    await hass.async_block_till_done()
+
+    assert config_entry.state == ConfigEntryState.LOADED
+    assert len(config_entry._background_tasks) == 1
+
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == initial_state
+
+    future.set_exception(exception)
+    await hass.async_block_till_done()
+
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=30))
+    await hass.async_block_till_done()
+
+    assert client.stream_all_events.call_count == 2
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.STATUS,
+                ArrayOfEvents(
+                    [
+                        Event(
+                            key=event_key,
+                            raw_key=event_key.value,
+                            timestamp=0,
+                            level="",
+                            handling="",
+                            value=event_value,
+                        )
+                    ],
+                ),
+            ),
+        ]
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == after_event_expected_state
+
+
+async def test_devices_updated_on_refresh(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+) -> None:
+    """Test handling of devices added or deleted while event stream is down."""
+    appliances: list[HomeAppliance] = (
+        client.get_home_appliances.return_value.homeappliances
+    )
+    assert len(appliances) >= 3
+    client.get_home_appliances = AsyncMock(
+        return_value=ArrayOfHomeAppliances(appliances[:2]),
+    )
+
+    await async_setup_component(hass, HA_DOMAIN, {})
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    for appliance in appliances[:2]:
+        assert device_registry.async_get_device({(DOMAIN, appliance.ha_id)})
+    assert not device_registry.async_get_device({(DOMAIN, appliances[2].ha_id)})
+
+    client.get_home_appliances = AsyncMock(
+        return_value=ArrayOfHomeAppliances(appliances[1:3]),
+    )
+    await hass.services.async_call(
+        HA_DOMAIN,
+        SERVICE_UPDATE_ENTITY,
+        {ATTR_ENTITY_ID: "switch.dishwasher_power"},
+        blocking=True,
+    )
+
+    assert not device_registry.async_get_device({(DOMAIN, appliances[0].ha_id)})
+    for appliance in appliances[2:3]:
+        assert device_registry.async_get_device({(DOMAIN, appliance.ha_id)})
diff --git a/tests/components/home_connect/test_diagnostics.py b/tests/components/home_connect/test_diagnostics.py
index f2db6e2b67a..ab6823411dc 100644
--- a/tests/components/home_connect/test_diagnostics.py
+++ b/tests/components/home_connect/test_diagnostics.py
@@ -1,11 +1,9 @@
 """Test diagnostics for Home Connect."""
 
 from collections.abc import Awaitable, Callable
-from unittest.mock import MagicMock, Mock
+from unittest.mock import MagicMock
 
-from homeconnect.api import HomeConnectError
-import pytest
-from syrupy import SnapshotAssertion
+from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components.home_connect.const import DOMAIN
 from homeassistant.components.home_connect.diagnostics import (
@@ -16,43 +14,37 @@ from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 
-from .conftest import get_all_appliances
-
 from tests.common import MockConfigEntry
 
 
-@pytest.mark.usefixtures("bypass_throttle")
 async def test_async_get_config_entry_diagnostics(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: MagicMock,
+    client: MagicMock,
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test config entry diagnostics."""
-    get_appliances.side_effect = get_all_appliances
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
     assert await async_get_config_entry_diagnostics(hass, config_entry) == snapshot
 
 
-@pytest.mark.usefixtures("bypass_throttle")
 async def test_async_get_device_diagnostics(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: MagicMock,
+    client: MagicMock,
     device_registry: dr.DeviceRegistry,
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test device config entry diagnostics."""
-    get_appliances.side_effect = get_all_appliances
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
     device = device_registry.async_get_or_create(
@@ -61,69 +53,3 @@ async def test_async_get_device_diagnostics(
     )
 
     assert await async_get_device_diagnostics(hass, config_entry, device) == snapshot
-
-
-@pytest.mark.usefixtures("bypass_throttle")
-async def test_async_device_diagnostics_not_found(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
-    setup_credentials: None,
-    get_appliances: MagicMock,
-    device_registry: dr.DeviceRegistry,
-) -> None:
-    """Test device config entry diagnostics."""
-    get_appliances.side_effect = get_all_appliances
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
-    assert config_entry.state == ConfigEntryState.LOADED
-
-    device = device_registry.async_get_or_create(
-        config_entry_id=config_entry.entry_id,
-        identifiers={(DOMAIN, "Random-Device-ID")},
-    )
-
-    with pytest.raises(ValueError):
-        await async_get_device_diagnostics(hass, config_entry, device)
-
-
-@pytest.mark.parametrize(
-    ("api_error", "expected_connection_status"),
-    [
-        (HomeConnectError(), "unknown"),
-        (
-            HomeConnectError(
-                {
-                    "key": "SDK.Error.HomeAppliance.Connection.Initialization.Failed",
-                }
-            ),
-            "offline",
-        ),
-    ],
-)
-@pytest.mark.usefixtures("bypass_throttle")
-async def test_async_device_diagnostics_api_error(
-    api_error: HomeConnectError,
-    expected_connection_status: str,
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
-    setup_credentials: None,
-    get_appliances: MagicMock,
-    appliance: Mock,
-    device_registry: dr.DeviceRegistry,
-) -> None:
-    """Test device config entry diagnostics."""
-    appliance.get_programs_available.side_effect = api_error
-    get_appliances.return_value = [appliance]
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
-    assert config_entry.state == ConfigEntryState.LOADED
-
-    device = device_registry.async_get_or_create(
-        config_entry_id=config_entry.entry_id,
-        identifiers={(DOMAIN, appliance.haId)},
-    )
-
-    diagnostics = await async_get_device_diagnostics(hass, config_entry, device)
-    assert diagnostics["programs"] is None
diff --git a/tests/components/home_connect/test_entity.py b/tests/components/home_connect/test_entity.py
new file mode 100644
index 00000000000..e91a01a907a
--- /dev/null
+++ b/tests/components/home_connect/test_entity.py
@@ -0,0 +1,494 @@
+"""Tests for Home Connect entity base classes."""
+
+from collections.abc import Awaitable, Callable
+from unittest.mock import AsyncMock, MagicMock
+
+from aiohomeconnect.model import (
+    ArrayOfEvents,
+    ArrayOfHomeAppliances,
+    ArrayOfPrograms,
+    Event,
+    EventKey,
+    EventMessage,
+    EventType,
+    HomeAppliance,
+    Option,
+    OptionKey,
+    Program,
+    ProgramDefinition,
+    ProgramKey,
+)
+from aiohomeconnect.model.error import (
+    ActiveProgramNotSetError,
+    HomeConnectError,
+    SelectedProgramNotSetError,
+)
+from aiohomeconnect.model.program import (
+    EnumerateProgram,
+    ProgramDefinitionConstraints,
+    ProgramDefinitionOption,
+)
+import pytest
+
+from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    SERVICE_TURN_OFF,
+    STATE_OFF,
+    STATE_ON,
+    STATE_UNAVAILABLE,
+    STATE_UNKNOWN,
+    Platform,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+
+from tests.common import MockConfigEntry
+
+
+@pytest.fixture
+def platforms() -> list[str]:
+    """Fixture to specify platforms to test."""
+    return [Platform.SWITCH]
+
+
+@pytest.mark.parametrize(
+    ("array_of_programs_program_arg", "event_key"),
+    [
+        (
+            "active",
+            EventKey.BSH_COMMON_ROOT_ACTIVE_PROGRAM,
+        ),
+        (
+            "selected",
+            EventKey.BSH_COMMON_ROOT_SELECTED_PROGRAM,
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    (
+        "appliance",
+        "option_entity_id",
+        "options_state_stage_1",
+        "options_availability_stage_2",
+        "option_without_default",
+        "option_without_constraints",
+    ),
+    [
+        (
+            "Dishwasher",
+            {
+                OptionKey.DISHCARE_DISHWASHER_HALF_LOAD: "switch.dishwasher_half_load",
+                OptionKey.DISHCARE_DISHWASHER_SILENCE_ON_DEMAND: "switch.dishwasher_silence_on_demand",
+                OptionKey.DISHCARE_DISHWASHER_ECO_DRY: "switch.dishwasher_eco_dry",
+            },
+            [(STATE_ON, True), (STATE_OFF, False), (None, None)],
+            [False, True, True],
+            (
+                OptionKey.DISHCARE_DISHWASHER_HYGIENE_PLUS,
+                "switch.dishwasher_hygiene",
+            ),
+            (OptionKey.DISHCARE_DISHWASHER_EXTRA_DRY, "switch.dishwasher_extra_dry"),
+        )
+    ],
+    indirect=["appliance"],
+)
+async def test_program_options_retrieval(
+    array_of_programs_program_arg: str,
+    event_key: EventKey,
+    appliance: HomeAppliance,
+    option_entity_id: dict[OptionKey, str],
+    options_state_stage_1: list[tuple[str, bool | None]],
+    options_availability_stage_2: list[bool],
+    option_without_default: tuple[OptionKey, str],
+    option_without_constraints: tuple[OptionKey, str],
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test that the options are correctly retrieved at the start and updated on program updates."""
+    original_get_all_programs_mock = client.get_all_programs.side_effect
+    options_values = [
+        Option(
+            option_key,
+            value,
+        )
+        for option_key, (_, value) in zip(
+            option_entity_id.keys(), options_state_stage_1, strict=True
+        )
+        if value is not None
+    ]
+
+    async def get_all_programs_with_options_mock(ha_id: str) -> ArrayOfPrograms:
+        if ha_id != appliance.ha_id:
+            return await original_get_all_programs_mock(ha_id)
+
+        array_of_programs: ArrayOfPrograms = await original_get_all_programs_mock(ha_id)
+        return ArrayOfPrograms(
+            **(
+                {
+                    "programs": array_of_programs.programs,
+                    array_of_programs_program_arg: Program(
+                        array_of_programs.programs[0].key, options=options_values
+                    ),
+                }
+            )
+        )
+
+    client.get_all_programs = AsyncMock(side_effect=get_all_programs_with_options_mock)
+    client.get_available_program = AsyncMock(
+        return_value=ProgramDefinition(
+            ProgramKey.UNKNOWN,
+            options=[
+                ProgramDefinitionOption(
+                    option_key,
+                    "Boolean",
+                    constraints=ProgramDefinitionConstraints(
+                        default=False,
+                    ),
+                )
+                for option_key, (_, value) in zip(
+                    option_entity_id.keys(), options_state_stage_1, strict=True
+                )
+                if value is not None
+            ],
+        )
+    )
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    for entity_id, (state, _) in zip(
+        option_entity_id.values(), options_state_stage_1, strict=True
+    ):
+        if state is not None:
+            assert hass.states.is_state(entity_id, state)
+        else:
+            assert not hass.states.get(entity_id)
+
+    client.get_available_program = AsyncMock(
+        return_value=ProgramDefinition(
+            ProgramKey.UNKNOWN,
+            options=[
+                *[
+                    ProgramDefinitionOption(
+                        option_key,
+                        "Boolean",
+                        constraints=ProgramDefinitionConstraints(
+                            default=False,
+                        ),
+                    )
+                    for option_key, available in zip(
+                        option_entity_id.keys(),
+                        options_availability_stage_2,
+                        strict=True,
+                    )
+                    if available
+                ],
+                ProgramDefinitionOption(
+                    option_without_default[0],
+                    "Boolean",
+                    constraints=ProgramDefinitionConstraints(),
+                ),
+                ProgramDefinitionOption(
+                    option_without_constraints[0],
+                    "Boolean",
+                ),
+            ],
+        )
+    )
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.NOTIFY,
+                data=ArrayOfEvents(
+                    [
+                        Event(
+                            key=event_key,
+                            raw_key=event_key.value,
+                            timestamp=0,
+                            level="",
+                            handling="",
+                            value=ProgramKey.DISHCARE_DISHWASHER_AUTO_1,
+                        )
+                    ]
+                ),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    # Verify default values
+    # Every time the program is updated, the available options should use the default value if existing
+    for entity_id, available in zip(
+        option_entity_id.values(), options_availability_stage_2, strict=True
+    ):
+        assert hass.states.is_state(
+            entity_id, STATE_OFF if available else STATE_UNAVAILABLE
+        )
+    for _, entity_id in (option_without_default, option_without_constraints):
+        assert hass.states.is_state(entity_id, STATE_UNKNOWN)
+
+
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+@pytest.mark.parametrize(
+    ("array_of_programs_program_arg", "event_key"),
+    [
+        (
+            "active",
+            EventKey.BSH_COMMON_ROOT_ACTIVE_PROGRAM,
+        ),
+        (
+            "selected",
+            EventKey.BSH_COMMON_ROOT_SELECTED_PROGRAM,
+        ),
+    ],
+)
+async def test_no_options_retrieval_on_unknown_program(
+    array_of_programs_program_arg: str,
+    event_key: EventKey,
+    appliance: HomeAppliance,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test that no options are retrieved when the program is unknown."""
+
+    async def get_all_programs_with_options_mock(ha_id: str) -> ArrayOfPrograms:
+        return ArrayOfPrograms(
+            **(
+                {
+                    "programs": [
+                        EnumerateProgram(ProgramKey.UNKNOWN, "unknown program")
+                    ],
+                    array_of_programs_program_arg: Program(
+                        ProgramKey.UNKNOWN, options=[]
+                    ),
+                }
+            )
+        )
+
+    client.get_all_programs = AsyncMock(side_effect=get_all_programs_with_options_mock)
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    assert client.get_available_program.call_count == 0
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.NOTIFY,
+                data=ArrayOfEvents(
+                    [
+                        Event(
+                            key=event_key,
+                            raw_key=event_key.value,
+                            timestamp=0,
+                            level="",
+                            handling="",
+                            value=ProgramKey.UNKNOWN,
+                        )
+                    ]
+                ),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    assert client.get_available_program.call_count == 0
+
+
+@pytest.mark.parametrize(
+    "event_key",
+    [
+        EventKey.BSH_COMMON_ROOT_ACTIVE_PROGRAM,
+        EventKey.BSH_COMMON_ROOT_SELECTED_PROGRAM,
+    ],
+)
+@pytest.mark.parametrize(
+    ("appliance", "option_key", "option_entity_id"),
+    [
+        (
+            "Dishwasher",
+            OptionKey.DISHCARE_DISHWASHER_HALF_LOAD,
+            "switch.dishwasher_half_load",
+        )
+    ],
+    indirect=["appliance"],
+)
+async def test_program_options_retrieval_after_appliance_connection(
+    event_key: EventKey,
+    appliance: HomeAppliance,
+    option_key: OptionKey,
+    option_entity_id: str,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test that the options are correctly retrieved at the start and updated on program updates."""
+    array_of_home_appliances = client.get_home_appliances.return_value
+
+    async def get_home_appliances_with_options_mock() -> ArrayOfHomeAppliances:
+        return ArrayOfHomeAppliances(
+            [
+                appliance
+                for appliance in array_of_home_appliances.homeappliances
+                if appliance.ha_id != appliance.ha_id
+            ]
+        )
+
+    client.get_home_appliances = AsyncMock(
+        side_effect=get_home_appliances_with_options_mock
+    )
+    client.get_available_program = AsyncMock(
+        return_value=ProgramDefinition(
+            ProgramKey.UNKNOWN,
+            options=[],
+        )
+    )
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    assert not hass.states.get(option_entity_id)
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.CONNECTED,
+                data=ArrayOfEvents(
+                    [
+                        Event(
+                            key=EventKey.BSH_COMMON_APPLIANCE_CONNECTED,
+                            raw_key=EventKey.BSH_COMMON_APPLIANCE_CONNECTED.value,
+                            timestamp=0,
+                            level="",
+                            handling="",
+                            value="",
+                        )
+                    ]
+                ),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    assert not hass.states.get(option_entity_id)
+
+    client.get_available_program = AsyncMock(
+        return_value=ProgramDefinition(
+            ProgramKey.UNKNOWN,
+            options=[
+                ProgramDefinitionOption(
+                    option_key,
+                    "Boolean",
+                    constraints=ProgramDefinitionConstraints(
+                        default=False,
+                    ),
+                ),
+            ],
+        )
+    )
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.NOTIFY,
+                data=ArrayOfEvents(
+                    [
+                        Event(
+                            key=event_key,
+                            raw_key=event_key.value,
+                            timestamp=0,
+                            level="",
+                            handling="",
+                            value=ProgramKey.DISHCARE_DISHWASHER_AUTO_1,
+                        )
+                    ]
+                ),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    assert hass.states.get(option_entity_id)
+
+
+@pytest.mark.parametrize(
+    (
+        "set_active_program_option_side_effect",
+        "set_selected_program_option_side_effect",
+    ),
+    [
+        (
+            ActiveProgramNotSetError("error.key"),
+            SelectedProgramNotSetError("error.key"),
+        ),
+        (
+            HomeConnectError(),
+            None,
+        ),
+        (
+            ActiveProgramNotSetError("error.key"),
+            HomeConnectError(),
+        ),
+    ],
+)
+async def test_option_entity_functionality_exception(
+    set_active_program_option_side_effect: HomeConnectError | None,
+    set_selected_program_option_side_effect: HomeConnectError | None,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test that the option entity handles exceptions correctly."""
+    entity_id = "switch.washer_i_dos_1_active"
+
+    client.get_available_program = AsyncMock(
+        return_value=ProgramDefinition(
+            ProgramKey.UNKNOWN,
+            options=[
+                ProgramDefinitionOption(
+                    OptionKey.LAUNDRY_CARE_WASHER_I_DOS_1_ACTIVE,
+                    "Boolean",
+                )
+            ],
+        )
+    )
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    assert hass.states.get(entity_id)
+
+    if set_active_program_option_side_effect:
+        client.set_active_program_option = AsyncMock(
+            side_effect=set_active_program_option_side_effect
+        )
+    if set_selected_program_option_side_effect:
+        client.set_selected_program_option = AsyncMock(
+            side_effect=set_selected_program_option_side_effect
+        )
+
+    with pytest.raises(HomeAssistantError, match=r"Error.*setting.*option.*"):
+        await hass.services.async_call(
+            SWITCH_DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: entity_id}, blocking=True
+        )
diff --git a/tests/components/home_connect/test_init.py b/tests/components/home_connect/test_init.py
index 69601efb42d..21bb0291e1a 100644
--- a/tests/components/home_connect/test_init.py
+++ b/tests/components/home_connect/test_init.py
@@ -2,34 +2,28 @@
 
 from collections.abc import Awaitable, Callable
 from typing import Any
-from unittest.mock import MagicMock, Mock, patch
+from unittest.mock import AsyncMock, MagicMock, patch
 
-from freezegun.api import FrozenDateTimeFactory
+from aiohomeconnect.const import OAUTH2_TOKEN
+from aiohomeconnect.model import HomeAppliance, SettingKey, StatusKey
+from aiohomeconnect.model.error import (
+    HomeConnectError,
+    TooManyRequestsError,
+    UnauthorizedError,
+)
+import aiohttp
 import pytest
-from requests import HTTPError
-import requests_mock
 
 from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
-from homeassistant.components.home_connect import (
-    SCAN_INTERVAL,
-    bsh_key_to_translation_key,
-)
-from homeassistant.components.home_connect.const import (
-    BSH_CHILD_LOCK_STATE,
-    BSH_OPERATION_STATE,
-    BSH_POWER_STATE,
-    BSH_REMOTE_START_ALLOWANCE_STATE,
-    COOKING_LIGHTING,
-    DOMAIN,
-    OAUTH2_TOKEN,
-)
+from homeassistant.components.home_connect.const import DOMAIN
+from homeassistant.components.home_connect.utils import bsh_key_to_translation_key
 from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
+from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from script.hassfest.translations import RE_TRANSLATION_KEY
 
@@ -39,115 +33,22 @@ from .conftest import (
     FAKE_ACCESS_TOKEN,
     FAKE_REFRESH_TOKEN,
     SERVER_ACCESS_TOKEN,
-    get_all_appliances,
 )
 
 from tests.common import MockConfigEntry
 from tests.test_util.aiohttp import AiohttpClientMocker
 
-SERVICE_KV_CALL_PARAMS = [
-    {
-        "domain": DOMAIN,
-        "service": "set_option_active",
-        "service_data": {
-            "device_id": "DEVICE_ID",
-            "key": "",
-            "value": "",
-            "unit": "",
-        },
-        "blocking": True,
-    },
-    {
-        "domain": DOMAIN,
-        "service": "set_option_selected",
-        "service_data": {
-            "device_id": "DEVICE_ID",
-            "key": "",
-            "value": "",
-        },
-        "blocking": True,
-    },
-    {
-        "domain": DOMAIN,
-        "service": "change_setting",
-        "service_data": {
-            "device_id": "DEVICE_ID",
-            "key": "",
-            "value": "",
-        },
-        "blocking": True,
-    },
-]
 
-SERVICE_COMMAND_CALL_PARAMS = [
-    {
-        "domain": DOMAIN,
-        "service": "pause_program",
-        "service_data": {
-            "device_id": "DEVICE_ID",
-        },
-        "blocking": True,
-    },
-    {
-        "domain": DOMAIN,
-        "service": "resume_program",
-        "service_data": {
-            "device_id": "DEVICE_ID",
-        },
-        "blocking": True,
-    },
-]
-
-
-SERVICE_PROGRAM_CALL_PARAMS = [
-    {
-        "domain": DOMAIN,
-        "service": "select_program",
-        "service_data": {
-            "device_id": "DEVICE_ID",
-            "program": "",
-            "key": "",
-            "value": "",
-        },
-        "blocking": True,
-    },
-    {
-        "domain": DOMAIN,
-        "service": "start_program",
-        "service_data": {
-            "device_id": "DEVICE_ID",
-            "program": "",
-            "key": "",
-            "value": "",
-            "unit": "C",
-        },
-        "blocking": True,
-    },
-]
-
-SERVICE_APPLIANCE_METHOD_MAPPING = {
-    "set_option_active": "set_options_active_program",
-    "set_option_selected": "set_options_selected_program",
-    "change_setting": "set_setting",
-    "pause_program": "execute_command",
-    "resume_program": "execute_command",
-    "select_program": "select_program",
-    "start_program": "start_program",
-}
-
-
-@pytest.mark.usefixtures("bypass_throttle")
-async def test_api_setup(
+async def test_entry_setup(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: MagicMock,
+    client: MagicMock,
 ) -> None:
     """Test setup and unload."""
-    get_appliances.side_effect = get_all_appliances
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
     assert await hass.config_entries.async_unload(config_entry.entry_id)
@@ -156,72 +57,57 @@ async def test_api_setup(
     assert config_entry.state == ConfigEntryState.NOT_LOADED
 
 
-async def test_update_throttle(
-    appliance: Mock,
-    freezer: FrozenDateTimeFactory,
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
-    setup_credentials: None,
-    get_appliances: MagicMock,
-) -> None:
-    """Test to check Throttle functionality."""
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
-    assert config_entry.state == ConfigEntryState.LOADED
-    get_appliances_call_count = get_appliances.call_count
-
-    # First re-load after 1 minute is not blocked.
-    assert await hass.config_entries.async_unload(config_entry.entry_id)
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
-    freezer.tick(SCAN_INTERVAL.seconds + 0.1)
-    assert await hass.config_entries.async_setup(config_entry.entry_id)
-    assert get_appliances.call_count == get_appliances_call_count + 1
-
-    # Second re-load is blocked by Throttle.
-    assert await hass.config_entries.async_unload(config_entry.entry_id)
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
-    freezer.tick(SCAN_INTERVAL.seconds - 0.1)
-    assert await hass.config_entries.async_setup(config_entry.entry_id)
-    assert get_appliances.call_count == get_appliances_call_count + 1
-
-
-@pytest.mark.usefixtures("bypass_throttle")
 async def test_exception_handling(
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     config_entry: MockConfigEntry,
     setup_credentials: None,
-    get_appliances: MagicMock,
-    problematic_appliance: Mock,
+    client_with_exception: MagicMock,
 ) -> None:
     """Test exception handling."""
-    get_appliances.return_value = [problematic_appliance]
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client_with_exception)
     assert config_entry.state == ConfigEntryState.LOADED
 
 
 @pytest.mark.parametrize("token_expiration_time", [12345])
-@pytest.mark.usefixtures("bypass_throttle")
 async def test_token_refresh_success(
-    integration_setup: Callable[[], Awaitable[bool]],
+    hass: HomeAssistant,
+    platforms: list[Platform],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     config_entry: MockConfigEntry,
     aioclient_mock: AiohttpClientMocker,
-    requests_mock: requests_mock.Mocker,
     setup_credentials: None,
+    client: MagicMock,
 ) -> None:
     """Test where token is expired and the refresh attempt succeeds."""
 
     assert config_entry.data["token"]["access_token"] == FAKE_ACCESS_TOKEN
 
-    requests_mock.post(OAUTH2_TOKEN, json=SERVER_ACCESS_TOKEN)
-    requests_mock.get("/api/homeappliances", json={"data": {"homeappliances": []}})
-
     aioclient_mock.post(
         OAUTH2_TOKEN,
         json=SERVER_ACCESS_TOKEN,
     )
-    assert await integration_setup()
+    appliances = client.get_home_appliances.return_value
+
+    async def mock_get_home_appliances():
+        await client._auth.async_get_access_token()
+        return appliances
+
+    client.get_home_appliances.return_value = None
+    client.get_home_appliances.side_effect = mock_get_home_appliances
+
+    def init_side_effect(auth) -> MagicMock:
+        client._auth = auth
+        return client
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    with (
+        patch("homeassistant.components.home_connect.PLATFORMS", platforms),
+        patch("homeassistant.components.home_connect.HomeConnectClient") as client_mock,
+    ):
+        client_mock.side_effect = MagicMock(side_effect=init_side_effect)
+        assert await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
     assert config_entry.state == ConfigEntryState.LOADED
 
     # Verify token request
@@ -240,118 +126,169 @@ async def test_token_refresh_success(
     )
 
 
-@pytest.mark.usefixtures("bypass_throttle")
-async def test_http_error(
+@pytest.mark.parametrize("token_expiration_time", [12345])
+@pytest.mark.parametrize(
+    ("aioclient_mock_args", "expected_config_entry_state"),
+    [
+        (
+            {
+                "status": 400,
+                "json": {"error": "invalid_grant"},
+            },
+            ConfigEntryState.SETUP_ERROR,
+        ),
+        (
+            {
+                "status": 500,
+            },
+            ConfigEntryState.SETUP_RETRY,
+        ),
+        (
+            {
+                "exc": aiohttp.ClientError,
+            },
+            ConfigEntryState.SETUP_RETRY,
+        ),
+    ],
+)
+async def test_token_refresh_error(
+    aioclient_mock_args: dict[str, Any],
+    expected_config_entry_state: ConfigEntryState,
+    hass: HomeAssistant,
+    platforms: list[Platform],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    aioclient_mock: AiohttpClientMocker,
     setup_credentials: None,
-    get_appliances: MagicMock,
+    client: MagicMock,
 ) -> None:
-    """Test HTTP errors during setup integration."""
-    get_appliances.side_effect = HTTPError(response=MagicMock())
+    """Test where token is expired and the refresh attempt fails."""
+
+    config_entry.data["token"]["access_token"] = FAKE_ACCESS_TOKEN
+
+    aioclient_mock.post(
+        OAUTH2_TOKEN,
+        **aioclient_mock_args,
+    )
+
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
-    assert config_entry.state == ConfigEntryState.LOADED
-    assert get_appliances.call_count == 1
+    with patch(
+        "homeassistant.components.home_connect.HomeConnectClient", return_value=client
+    ):
+        assert not await integration_setup(client)
+        await hass.async_block_till_done()
+
+    assert config_entry.state == expected_config_entry_state
 
 
 @pytest.mark.parametrize(
-    "service_call",
-    SERVICE_KV_CALL_PARAMS + SERVICE_COMMAND_CALL_PARAMS + SERVICE_PROGRAM_CALL_PARAMS,
+    ("exception", "expected_state"),
+    [
+        (HomeConnectError(), ConfigEntryState.SETUP_RETRY),
+        (UnauthorizedError("error.key"), ConfigEntryState.SETUP_ERROR),
+    ],
 )
-@pytest.mark.usefixtures("bypass_throttle")
-async def test_services(
-    service_call: list[dict[str, Any]],
+async def test_client_error(
+    exception: HomeConnectError,
+    expected_state: ConfigEntryState,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client_with_exception: MagicMock,
+) -> None:
+    """Test client errors during setup integration."""
+    client_with_exception.get_home_appliances.return_value = None
+    client_with_exception.get_home_appliances.side_effect = exception
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert not await integration_setup(client_with_exception)
+    assert config_entry.state == expected_state
+    assert client_with_exception.get_home_appliances.call_count == 1
+
+
+@pytest.mark.parametrize(
+    "raising_exception_method",
+    [
+        "get_settings",
+        "get_status",
+        "get_all_programs",
+        "get_available_commands",
+        "get_available_program",
+    ],
+)
+async def test_client_rate_limit_error(
+    raising_exception_method: str,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test client errors during setup integration."""
+    retry_after = 42
+
+    original_mock = getattr(client, raising_exception_method)
+    mock = AsyncMock()
+
+    async def side_effect(*args, **kwargs):
+        if mock.call_count <= 1:
+            raise TooManyRequestsError("error.key", retry_after=retry_after)
+        return await original_mock(*args, **kwargs)
+
+    mock.side_effect = side_effect
+    setattr(client, raising_exception_method, mock)
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    with patch(
+        "homeassistant.components.home_connect.coordinator.asyncio_sleep",
+    ) as asyncio_sleep_mock:
+        assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+    assert mock.call_count >= 2
+    asyncio_sleep_mock.assert_called_once_with(retry_after)
+
+
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+async def test_required_program_or_at_least_an_option(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: MagicMock,
-    appliance: Mock,
+    client: MagicMock,
+    appliance: HomeAppliance,
 ) -> None:
-    """Create and test services."""
-    get_appliances.return_value = [appliance]
+    "Test that the set_program_and_options does raise an exception if no program nor options are set."
+
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
     device_entry = device_registry.async_get_or_create(
         config_entry_id=config_entry.entry_id,
-        identifiers={(DOMAIN, appliance.haId)},
+        identifiers={(DOMAIN, appliance.ha_id)},
     )
 
-    service_name = service_call["service"]
-    service_call["service_data"]["device_id"] = device_entry.id
-    await hass.services.async_call(**service_call)
-    await hass.async_block_till_done()
-    assert (
-        getattr(appliance, SERVICE_APPLIANCE_METHOD_MAPPING[service_name]).call_count
-        == 1
-    )
-
-
-@pytest.mark.parametrize(
-    "service_call",
-    SERVICE_KV_CALL_PARAMS + SERVICE_COMMAND_CALL_PARAMS + SERVICE_PROGRAM_CALL_PARAMS,
-)
-@pytest.mark.usefixtures("bypass_throttle")
-async def test_services_exception(
-    service_call: list[dict[str, Any]],
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
-    setup_credentials: None,
-    get_appliances: MagicMock,
-    problematic_appliance: Mock,
-    device_registry: dr.DeviceRegistry,
-) -> None:
-    """Raise a HomeAssistantError when there is an API error."""
-    get_appliances.return_value = [problematic_appliance]
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
-    assert config_entry.state == ConfigEntryState.LOADED
-
-    device_entry = device_registry.async_get_or_create(
-        config_entry_id=config_entry.entry_id,
-        identifiers={(DOMAIN, problematic_appliance.haId)},
-    )
-
-    service_call["service_data"]["device_id"] = device_entry.id
-
-    with pytest.raises(HomeAssistantError):
-        await hass.services.async_call(**service_call)
-
-
-@pytest.mark.usefixtures("bypass_throttle")
-async def test_services_appliance_not_found(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
-    setup_credentials: None,
-    get_appliances: MagicMock,
-    appliance: Mock,
-) -> None:
-    """Raise a ServiceValidationError when device id does not match."""
-    get_appliances.return_value = [appliance]
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
-    assert config_entry.state == ConfigEntryState.LOADED
-
-    service_call = SERVICE_KV_CALL_PARAMS[0]
-
-    service_call["service_data"]["device_id"] = "DOES_NOT_EXISTS"
-
-    with pytest.raises(ServiceValidationError, match=r"Appliance.*not found"):
-        await hass.services.async_call(**service_call)
+    with pytest.raises(
+        ServiceValidationError,
+    ):
+        await hass.services.async_call(
+            DOMAIN,
+            "set_program_and_options",
+            {
+                "device_id": device_entry.id,
+                "affects_to": "selected_program",
+            },
+            True,
+        )
 
 
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
 async def test_entity_migration(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
     entity_registry: er.EntityRegistry,
     config_entry_v1_1: MockConfigEntry,
-    appliance: Mock,
+    appliance: HomeAppliance,
     platforms: list[Platform],
 ) -> None:
     """Test entity migration."""
@@ -360,34 +297,39 @@ async def test_entity_migration(
 
     device_entry = device_registry.async_get_or_create(
         config_entry_id=config_entry_v1_1.entry_id,
-        identifiers={(DOMAIN, appliance.haId)},
+        identifiers={(DOMAIN, appliance.ha_id)},
     )
 
     test_entities = [
         (
             SENSOR_DOMAIN,
             "Operation State",
-            BSH_OPERATION_STATE,
+            StatusKey.BSH_COMMON_OPERATION_STATE,
         ),
         (
             SWITCH_DOMAIN,
             "ChildLock",
-            BSH_CHILD_LOCK_STATE,
+            SettingKey.BSH_COMMON_CHILD_LOCK,
         ),
         (
             SWITCH_DOMAIN,
             "Power",
-            BSH_POWER_STATE,
+            SettingKey.BSH_COMMON_POWER_STATE,
         ),
         (
             BINARY_SENSOR_DOMAIN,
             "Remote Start",
-            BSH_REMOTE_START_ALLOWANCE_STATE,
+            StatusKey.BSH_COMMON_REMOTE_CONTROL_START_ALLOWED,
         ),
         (
             LIGHT_DOMAIN,
             "Light",
-            COOKING_LIGHTING,
+            SettingKey.COOKING_COMMON_LIGHTING,
+        ),
+        (  # An already migrated entity
+            SWITCH_DOMAIN,
+            SettingKey.REFRIGERATION_COMMON_VACATION_MODE,
+            SettingKey.REFRIGERATION_COMMON_VACATION_MODE,
         ),
     ]
 
@@ -395,7 +337,7 @@ async def test_entity_migration(
         entity_registry.async_get_or_create(
             domain,
             DOMAIN,
-            f"{appliance.haId}-{old_unique_id_suffix}",
+            f"{appliance.ha_id}-{old_unique_id_suffix}",
             device_id=device_entry.id,
             config_entry=config_entry_v1_1,
         )
@@ -406,7 +348,7 @@ async def test_entity_migration(
 
     for domain, _, expected_unique_id_suffix in test_entities:
         assert entity_registry.async_get_entity_id(
-            domain, DOMAIN, f"{appliance.haId}-{expected_unique_id_suffix}"
+            domain, DOMAIN, f"{appliance.ha_id}-{expected_unique_id_suffix}"
         )
     assert config_entry_v1_1.minor_version == 2
 
diff --git a/tests/components/home_connect/test_light.py b/tests/components/home_connect/test_light.py
index 471ddf0ec54..50a1a1e374a 100644
--- a/tests/components/home_connect/test_light.py
+++ b/tests/components/home_connect/test_light.py
@@ -1,48 +1,51 @@
 """Tests for home_connect light entities."""
 
-from collections.abc import Awaitable, Callable, Generator
-from unittest.mock import MagicMock, Mock
+from collections.abc import Awaitable, Callable
+from typing import Any
+from unittest.mock import AsyncMock, MagicMock, call
 
-from homeconnect.api import HomeConnectAppliance, HomeConnectError
+from aiohomeconnect.model import (
+    ArrayOfEvents,
+    ArrayOfSettings,
+    Event,
+    EventKey,
+    EventMessage,
+    EventType,
+    GetSetting,
+    HomeAppliance,
+    SettingKey,
+)
+from aiohomeconnect.model.error import HomeConnectApiError, HomeConnectError
 import pytest
 
 from homeassistant.components.home_connect.const import (
-    BSH_AMBIENT_LIGHT_BRIGHTNESS,
-    BSH_AMBIENT_LIGHT_COLOR,
-    BSH_AMBIENT_LIGHT_CUSTOM_COLOR,
-    BSH_AMBIENT_LIGHT_ENABLED,
-    COOKING_LIGHTING,
-    COOKING_LIGHTING_BRIGHTNESS,
-    REFRIGERATION_EXTERNAL_LIGHT_BRIGHTNESS,
-    REFRIGERATION_EXTERNAL_LIGHT_POWER,
+    BSH_AMBIENT_LIGHT_COLOR_CUSTOM_COLOR,
+    DOMAIN,
+)
+from homeassistant.components.light import (
+    ATTR_BRIGHTNESS,
+    ATTR_HS_COLOR,
+    ATTR_RGB_COLOR,
+    DOMAIN as LIGHT_DOMAIN,
 )
-from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import (
+    ATTR_ENTITY_ID,
     SERVICE_TURN_OFF,
     SERVICE_TURN_ON,
     STATE_OFF,
     STATE_ON,
-    STATE_UNKNOWN,
+    STATE_UNAVAILABLE,
     Platform,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 
-from .conftest import get_all_appliances
-
-from tests.common import MockConfigEntry, load_json_object_fixture
+from tests.common import MockConfigEntry
 
 TEST_HC_APP = "Hood"
 
-SETTINGS_STATUS = {
-    setting.pop("key"): setting
-    for setting in load_json_object_fixture("home_connect/settings.json")
-    .get(TEST_HC_APP)
-    .get("data")
-    .get("settings")
-}
-
 
 @pytest.fixture
 def platforms() -> list[str]:
@@ -51,29 +54,202 @@ def platforms() -> list[str]:
 
 
 async def test_light(
-    bypass_throttle: Generator[None],
-    hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: Mock,
+    client: MagicMock,
 ) -> None:
     """Test switch entities."""
-    get_appliances.side_effect = get_all_appliances
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
 
+@pytest.mark.parametrize("appliance", ["Hood"], indirect=True)
+async def test_paired_depaired_devices_flow(
+    appliance: HomeAppliance,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that removed devices are correctly removed from and added to hass on API events."""
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+    assert entity_entries
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.DEPAIRED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert not device
+    for entity_entry in entity_entries:
+        assert not entity_registry.async_get(entity_entry.entity_id)
+
+    # Now that all everything related to the device is removed, pair it again
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.PAIRED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    assert device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    for entity_entry in entity_entries:
+        assert entity_registry.async_get(entity_entry.entity_id)
+
+
+@pytest.mark.parametrize("appliance", ["Hood"], indirect=True)
+async def test_connected_devices(
+    appliance: HomeAppliance,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that devices reconnected.
+
+    Specifically those devices whose settings, status, etc. could
+    not be obtained while disconnected and once connected, the entities are added.
+    """
+    get_settings_original_mock = client.get_settings
+    get_available_programs_mock = client.get_available_programs
+
+    async def get_settings_side_effect(ha_id: str):
+        if ha_id == appliance.ha_id:
+            raise HomeConnectApiError(
+                "SDK.Error.HomeAppliance.Connection.Initialization.Failed"
+            )
+        return await get_settings_original_mock.side_effect(ha_id)
+
+    async def get_available_programs_side_effect(ha_id: str):
+        if ha_id == appliance.ha_id:
+            raise HomeConnectApiError(
+                "SDK.Error.HomeAppliance.Connection.Initialization.Failed"
+            )
+        return await get_available_programs_mock.side_effect(ha_id)
+
+    client.get_settings = AsyncMock(side_effect=get_settings_side_effect)
+    client.get_available_programs = AsyncMock(
+        side_effect=get_available_programs_side_effect
+    )
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+    client.get_settings = get_settings_original_mock
+    client.get_available_programs = get_available_programs_mock
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.CONNECTED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    new_entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+    assert len(new_entity_entries) > len(entity_entries)
+
+
+@pytest.mark.parametrize("appliance", ["Hood"], indirect=True)
+async def test_light_availability(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    appliance: HomeAppliance,
+) -> None:
+    """Test if light entities availability are based on the appliance connection state."""
+    entity_ids = [
+        "light.hood_functional_light",
+    ]
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    for entity_id in entity_ids:
+        state = hass.states.get(entity_id)
+        assert state
+        assert state.state != STATE_UNAVAILABLE
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.DISCONNECTED,
+                ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    for entity_id in entity_ids:
+        assert hass.states.is_state(entity_id, STATE_UNAVAILABLE)
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.CONNECTED,
+                ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    for entity_id in entity_ids:
+        state = hass.states.get(entity_id)
+        assert state
+        assert state.state != STATE_UNAVAILABLE
+
+
 @pytest.mark.parametrize(
-    ("entity_id", "status", "service", "service_data", "state", "appliance"),
+    (
+        "entity_id",
+        "set_settings_args",
+        "service",
+        "exprected_attributes",
+        "state",
+        "appliance",
+    ),
     [
         (
             "light.hood_functional_light",
             {
-                COOKING_LIGHTING: {
-                    "value": True,
-                },
+                SettingKey.COOKING_COMMON_LIGHTING: True,
             },
             SERVICE_TURN_ON,
             {},
@@ -83,58 +259,18 @@ async def test_light(
         (
             "light.hood_functional_light",
             {
-                COOKING_LIGHTING: {
-                    "value": True,
-                },
-                COOKING_LIGHTING_BRIGHTNESS: {"value": 70},
+                SettingKey.COOKING_COMMON_LIGHTING: True,
+                SettingKey.COOKING_COMMON_LIGHTING_BRIGHTNESS: 80,
             },
             SERVICE_TURN_ON,
-            {"brightness": 200},
+            {ATTR_BRIGHTNESS: 199},
             STATE_ON,
             "Hood",
         ),
         (
             "light.hood_functional_light",
             {
-                COOKING_LIGHTING: {"value": False},
-                COOKING_LIGHTING_BRIGHTNESS: {"value": 70},
-            },
-            SERVICE_TURN_OFF,
-            {},
-            STATE_OFF,
-            "Hood",
-        ),
-        (
-            "light.hood_functional_light",
-            {
-                COOKING_LIGHTING: {
-                    "value": None,
-                },
-                COOKING_LIGHTING_BRIGHTNESS: None,
-            },
-            SERVICE_TURN_ON,
-            {},
-            STATE_UNKNOWN,
-            "Hood",
-        ),
-        (
-            "light.hood_ambient_light",
-            {
-                BSH_AMBIENT_LIGHT_ENABLED: {
-                    "value": True,
-                },
-                BSH_AMBIENT_LIGHT_BRIGHTNESS: {"value": 70},
-            },
-            SERVICE_TURN_ON,
-            {"brightness": 200},
-            STATE_ON,
-            "Hood",
-        ),
-        (
-            "light.hood_ambient_light",
-            {
-                BSH_AMBIENT_LIGHT_ENABLED: {"value": False},
-                BSH_AMBIENT_LIGHT_BRIGHTNESS: {"value": 70},
+                SettingKey.COOKING_COMMON_LIGHTING: False,
             },
             SERVICE_TURN_OFF,
             {},
@@ -144,8 +280,28 @@ async def test_light(
         (
             "light.hood_ambient_light",
             {
-                BSH_AMBIENT_LIGHT_ENABLED: {"value": True},
-                BSH_AMBIENT_LIGHT_CUSTOM_COLOR: {},
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_ENABLED: True,
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_BRIGHTNESS: 80,
+            },
+            SERVICE_TURN_ON,
+            {ATTR_BRIGHTNESS: 199},
+            STATE_ON,
+            "Hood",
+        ),
+        (
+            "light.hood_ambient_light",
+            {
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_ENABLED: False,
+            },
+            SERVICE_TURN_OFF,
+            {},
+            STATE_OFF,
+            "Hood",
+        ),
+        (
+            "light.hood_ambient_light",
+            {
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_ENABLED: True,
             },
             SERVICE_TURN_ON,
             {},
@@ -155,15 +311,28 @@ async def test_light(
         (
             "light.hood_ambient_light",
             {
-                BSH_AMBIENT_LIGHT_ENABLED: {"value": True},
-                BSH_AMBIENT_LIGHT_COLOR: {
-                    "value": "",
-                },
-                BSH_AMBIENT_LIGHT_CUSTOM_COLOR: {},
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_ENABLED: True,
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_COLOR: BSH_AMBIENT_LIGHT_COLOR_CUSTOM_COLOR,
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_CUSTOM_COLOR: "#ffff00",
             },
             SERVICE_TURN_ON,
             {
-                "rgb_color": [255, 255, 0],
+                ATTR_RGB_COLOR: (255, 255, 0),
+            },
+            STATE_ON,
+            "Hood",
+        ),
+        (
+            "light.hood_ambient_light",
+            {
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_ENABLED: True,
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_COLOR: BSH_AMBIENT_LIGHT_COLOR_CUSTOM_COLOR,
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_CUSTOM_COLOR: "#b5adcc",
+            },
+            SERVICE_TURN_ON,
+            {
+                ATTR_HS_COLOR: (255.484, 15.196),
+                ATTR_BRIGHTNESS: 199,
             },
             STATE_ON,
             "Hood",
@@ -171,10 +340,7 @@ async def test_light(
         (
             "light.fridgefreezer_external_light",
             {
-                REFRIGERATION_EXTERNAL_LIGHT_POWER: {
-                    "value": True,
-                },
-                REFRIGERATION_EXTERNAL_LIGHT_BRIGHTNESS: {"value": 75},
+                SettingKey.REFRIGERATION_COMMON_LIGHT_EXTERNAL_POWER: True,
             },
             SERVICE_TURN_ON,
             {},
@@ -186,163 +352,264 @@ async def test_light(
 )
 async def test_light_functionality(
     entity_id: str,
-    status: dict,
+    set_settings_args: dict[SettingKey, Any],
     service: str,
-    service_data: dict,
+    exprected_attributes: dict[str, Any],
     state: str,
-    appliance: Mock,
-    bypass_throttle: Generator[None],
+    appliance: HomeAppliance,
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: MagicMock,
+    client: MagicMock,
 ) -> None:
     """Test light functionality."""
-    appliance.status.update(
-        HomeConnectAppliance.json2dict(
-            load_json_object_fixture("home_connect/settings.json")
-            .get(appliance.name)
-            .get("data")
-            .get("settings")
-        )
-    )
-    get_appliances.return_value = [appliance]
-
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
-    appliance.status.update(status)
-    service_data["entity_id"] = entity_id
+    service_data = exprected_attributes.copy()
+    service_data[ATTR_ENTITY_ID] = entity_id
     await hass.services.async_call(
         LIGHT_DOMAIN,
         service,
-        service_data,
-        blocking=True,
+        {key: value for key, value in service_data.items() if value is not None},
     )
-    assert hass.states.is_state(entity_id, state)
+    await hass.async_block_till_done()
+    client.set_setting.assert_has_calls(
+        [
+            call(appliance.ha_id, setting_key=setting_key, value=value)
+            for setting_key, value in set_settings_args.items()
+        ]
+    )
+    entity_state = hass.states.get(entity_id)
+    assert entity_state is not None
+    assert entity_state.state == state
+    for key, value in exprected_attributes.items():
+        assert entity_state.attributes[key] == value
 
 
 @pytest.mark.parametrize(
     (
         "entity_id",
-        "status",
+        "events",
+        "appliance",
+    ),
+    [
+        (
+            "light.hood_ambient_light",
+            {
+                EventKey.BSH_COMMON_SETTING_AMBIENT_LIGHT_COLOR: "BSH.Common.EnumType.AmbientLightColor.Color1",
+            },
+            "Hood",
+        ),
+    ],
+    indirect=["appliance"],
+)
+async def test_light_color_different_than_custom(
+    entity_id: str,
+    events: dict[EventKey, Any],
+    appliance: HomeAppliance,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test that light color attributes are not set if color is different than custom."""
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {
+            ATTR_RGB_COLOR: (255, 255, 0),
+            ATTR_ENTITY_ID: entity_id,
+        },
+    )
+    await hass.async_block_till_done()
+    entity_state = hass.states.get(entity_id)
+    assert entity_state is not None
+    assert entity_state.state == STATE_ON
+    assert entity_state.attributes[ATTR_RGB_COLOR] is not None
+    assert entity_state.attributes[ATTR_HS_COLOR] is not None
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.NOTIFY,
+                ArrayOfEvents(
+                    [
+                        Event(
+                            key=event_key,
+                            raw_key=event_key.value,
+                            timestamp=0,
+                            level="",
+                            handling="",
+                            value=value,
+                        )
+                        for event_key, value in events.items()
+                    ]
+                ),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    entity_state = hass.states.get(entity_id)
+    assert entity_state is not None
+    assert entity_state.state == STATE_ON
+    assert entity_state.attributes[ATTR_RGB_COLOR] is None
+    assert entity_state.attributes[ATTR_HS_COLOR] is None
+
+
+@pytest.mark.parametrize(
+    (
+        "entity_id",
+        "setting",
         "service",
         "service_data",
-        "mock_attr",
         "attr_side_effect",
-        "problematic_appliance",
         "exception_match",
     ),
     [
         (
             "light.hood_functional_light",
             {
-                COOKING_LIGHTING: {
-                    "value": False,
-                },
+                SettingKey.COOKING_COMMON_LIGHTING: True,
             },
             SERVICE_TURN_ON,
             {},
-            "set_setting",
             [HomeConnectError, HomeConnectError],
-            "Hood",
             r"Error.*turn.*on.*",
         ),
         (
             "light.hood_functional_light",
             {
-                COOKING_LIGHTING: {
-                    "value": True,
-                },
-                COOKING_LIGHTING_BRIGHTNESS: {"value": 70},
+                SettingKey.COOKING_COMMON_LIGHTING: True,
+                SettingKey.COOKING_COMMON_LIGHTING_BRIGHTNESS: 70,
             },
             SERVICE_TURN_ON,
-            {"brightness": 200},
-            "set_setting",
+            {ATTR_BRIGHTNESS: 200},
             [HomeConnectError, HomeConnectError],
-            "Hood",
             r"Error.*turn.*on.*",
         ),
         (
             "light.hood_functional_light",
             {
-                COOKING_LIGHTING: {"value": False},
+                SettingKey.COOKING_COMMON_LIGHTING: False,
             },
             SERVICE_TURN_OFF,
             {},
-            "set_setting",
             [HomeConnectError, HomeConnectError],
-            "Hood",
             r"Error.*turn.*off.*",
         ),
         (
             "light.hood_ambient_light",
             {
-                BSH_AMBIENT_LIGHT_ENABLED: {
-                    "value": True,
-                },
-                BSH_AMBIENT_LIGHT_BRIGHTNESS: {"value": 70},
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_ENABLED: True,
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_BRIGHTNESS: 70,
             },
             SERVICE_TURN_ON,
             {},
-            "set_setting",
             [HomeConnectError, HomeConnectError],
-            "Hood",
             r"Error.*turn.*on.*",
         ),
         (
             "light.hood_ambient_light",
             {
-                BSH_AMBIENT_LIGHT_ENABLED: {
-                    "value": True,
-                },
-                BSH_AMBIENT_LIGHT_BRIGHTNESS: {"value": 70},
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_ENABLED: True,
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_BRIGHTNESS: 70,
             },
             SERVICE_TURN_ON,
-            {"brightness": 200},
-            "set_setting",
+            {ATTR_BRIGHTNESS: 200},
             [HomeConnectError, None, HomeConnectError],
-            "Hood",
+            r"Error.*set.*brightness.*",
+        ),
+        (
+            "light.hood_ambient_light",
+            {
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_ENABLED: True,
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_BRIGHTNESS: 70,
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_COLOR: 70,
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_CUSTOM_COLOR: "#ffff00",
+            },
+            SERVICE_TURN_ON,
+            {ATTR_RGB_COLOR: (255, 255, 0)},
+            [HomeConnectError, None, HomeConnectError],
+            r"Error.*select.*custom color.*",
+        ),
+        (
+            "light.hood_ambient_light",
+            {
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_ENABLED: True,
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_BRIGHTNESS: 70,
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_COLOR: BSH_AMBIENT_LIGHT_COLOR_CUSTOM_COLOR,
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_CUSTOM_COLOR: "#ffff00",
+            },
+            SERVICE_TURN_ON,
+            {ATTR_RGB_COLOR: (255, 255, 0)},
+            [HomeConnectError, None, None, HomeConnectError],
+            r"Error.*set.*color.*",
+        ),
+        (
+            "light.hood_ambient_light",
+            {
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_ENABLED: True,
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_COLOR: BSH_AMBIENT_LIGHT_COLOR_CUSTOM_COLOR,
+                SettingKey.BSH_COMMON_AMBIENT_LIGHT_CUSTOM_COLOR: "#b5adcc",
+            },
+            SERVICE_TURN_ON,
+            {
+                ATTR_HS_COLOR: (255.484, 15.196),
+                ATTR_BRIGHTNESS: 199,
+            },
+            [HomeConnectError, None, None, HomeConnectError],
             r"Error.*set.*color.*",
         ),
     ],
-    indirect=["problematic_appliance"],
 )
-async def test_switch_exception_handling(
+async def test_light_exception_handling(
     entity_id: str,
-    status: dict,
+    setting: dict[SettingKey, dict[str, Any]],
     service: str,
     service_data: dict,
-    mock_attr: str,
-    attr_side_effect: list,
-    problematic_appliance: Mock,
+    attr_side_effect: list[type[HomeConnectError] | None],
     exception_match: str,
-    bypass_throttle: Generator[None],
     hass: HomeAssistant,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     config_entry: MockConfigEntry,
     setup_credentials: None,
-    get_appliances: MagicMock,
+    client_with_exception: MagicMock,
 ) -> None:
     """Test light exception handling."""
-    problematic_appliance.status.update(SETTINGS_STATUS)
-    problematic_appliance.set_setting.side_effect = attr_side_effect
-    get_appliances.return_value = [problematic_appliance]
-
+    client_with_exception.get_settings.side_effect = None
+    client_with_exception.get_settings.return_value = ArrayOfSettings(
+        [
+            GetSetting(
+                key=setting_key,
+                raw_key=setting_key.value,
+                value=value,
+            )
+            for setting_key, value in setting.items()
+        ]
+    )
+    client_with_exception.set_setting.side_effect = [
+        exception() if exception else None for exception in attr_side_effect
+    ]
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client_with_exception)
     assert config_entry.state == ConfigEntryState.LOADED
 
     # Assert that an exception is called.
     with pytest.raises(HomeConnectError):
-        getattr(problematic_appliance, mock_attr)()
+        await client_with_exception.set_setting()
 
-    problematic_appliance.status.update(status)
-    service_data["entity_id"] = entity_id
+    service_data[ATTR_ENTITY_ID] = entity_id
     with pytest.raises(HomeAssistantError, match=exception_match):
         await hass.services.async_call(
             LIGHT_DOMAIN, service, service_data, blocking=True
         )
-    assert getattr(problematic_appliance, mock_attr).call_count == len(attr_side_effect)
+    assert client_with_exception.set_setting.call_count == len(attr_side_effect)
diff --git a/tests/components/home_connect/test_number.py b/tests/components/home_connect/test_number.py
index bce19161cf8..1de384303ce 100644
--- a/tests/components/home_connect/test_number.py
+++ b/tests/components/home_connect/test_number.py
@@ -1,34 +1,55 @@
 """Tests for home_connect number entities."""
 
-from collections.abc import Awaitable, Callable, Generator
+from collections.abc import Awaitable, Callable
 import random
-from unittest.mock import MagicMock, Mock
+from unittest.mock import AsyncMock, MagicMock, patch
 
-from homeconnect.api import HomeConnectError
+from aiohomeconnect.model import (
+    ArrayOfEvents,
+    ArrayOfSettings,
+    Event,
+    EventKey,
+    EventMessage,
+    EventType,
+    GetSetting,
+    HomeAppliance,
+    OptionKey,
+    ProgramDefinition,
+    ProgramKey,
+    SettingKey,
+)
+from aiohomeconnect.model.error import (
+    ActiveProgramNotSetError,
+    HomeConnectApiError,
+    HomeConnectError,
+    SelectedProgramNotSetError,
+    TooManyRequestsError,
+)
+from aiohomeconnect.model.program import (
+    ProgramDefinitionConstraints,
+    ProgramDefinitionOption,
+)
+from aiohomeconnect.model.setting import SettingConstraints
 import pytest
 
-from homeassistant.components.home_connect.const import (
-    ATTR_CONSTRAINTS,
-    ATTR_STEPSIZE,
-    ATTR_UNIT,
-    ATTR_VALUE,
-)
+from homeassistant.components.home_connect.const import DOMAIN
 from homeassistant.components.number import (
     ATTR_MAX,
     ATTR_MIN,
+    ATTR_STEP,
     ATTR_VALUE as SERVICE_ATTR_VALUE,
+    DEFAULT_MAX_VALUE,
     DEFAULT_MIN_VALUE,
     DOMAIN as NUMBER_DOMAIN,
     SERVICE_SET_VALUE,
 )
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import ATTR_ENTITY_ID, Platform
+from homeassistant.const import ATTR_ENTITY_ID, STATE_UNAVAILABLE, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 
-from .conftest import get_all_appliances
-
-from tests.common import MockConfigEntry
+from tests.common import MockConfigEntry, async_fire_time_changed
 
 
 @pytest.fixture
@@ -38,25 +59,199 @@ def platforms() -> list[str]:
 
 
 async def test_number(
-    bypass_throttle: Generator[None],
-    hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: Mock,
+    client: MagicMock,
 ) -> None:
     """Test number entity."""
-    get_appliances.side_effect = get_all_appliances
     assert config_entry.state is ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state is ConfigEntryState.LOADED
 
 
-@pytest.mark.parametrize("appliance", ["Refrigerator"], indirect=True)
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+async def test_paired_depaired_devices_flow(
+    appliance: HomeAppliance,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that removed devices are correctly removed from and added to hass on API events."""
+    client.get_available_program = AsyncMock(
+        return_value=ProgramDefinition(
+            ProgramKey.UNKNOWN,
+            options=[
+                ProgramDefinitionOption(
+                    OptionKey.BSH_COMMON_FINISH_IN_RELATIVE,
+                    "Integer",
+                )
+            ],
+        )
+    )
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+    assert entity_entries
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.DEPAIRED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert not device
+    for entity_entry in entity_entries:
+        assert not entity_registry.async_get(entity_entry.entity_id)
+
+    # Now that all everything related to the device is removed, pair it again
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.PAIRED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    assert device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    for entity_entry in entity_entries:
+        assert entity_registry.async_get(entity_entry.entity_id)
+
+
+@pytest.mark.parametrize("appliance", ["FridgeFreezer"], indirect=True)
+async def test_connected_devices(
+    appliance: HomeAppliance,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that devices reconnected.
+
+    Specifically those devices whose settings, status, etc. could
+    not be obtained while disconnected and once connected, the entities are added.
+    """
+    get_settings_original_mock = client.get_settings
+
+    def get_settings_side_effect(ha_id: str):
+        if ha_id == appliance.ha_id:
+            raise HomeConnectApiError(
+                "SDK.Error.HomeAppliance.Connection.Initialization.Failed"
+            )
+        return get_settings_original_mock.return_value
+
+    client.get_settings = AsyncMock(side_effect=get_settings_side_effect)
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+    client.get_settings = get_settings_original_mock
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.CONNECTED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    new_entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+    assert len(new_entity_entries) > len(entity_entries)
+
+
+@pytest.mark.parametrize("appliance", ["FridgeFreezer"], indirect=True)
+async def test_number_entity_availability(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    appliance: HomeAppliance,
+) -> None:
+    """Test if number entities availability are based on the appliance connection state."""
+    entity_ids = [
+        f"{NUMBER_DOMAIN.lower()}.fridgefreezer_refrigerator_temperature",
+    ]
+
+    client.get_setting.side_effect = None
+    # Setting constrains are not needed for this test
+    # so we rise an error to easily test the availability
+    client.get_setting = AsyncMock(side_effect=HomeConnectError())
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    for entity_id in entity_ids:
+        state = hass.states.get(entity_id)
+        assert state
+        assert state.state != STATE_UNAVAILABLE
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.DISCONNECTED,
+                ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    for entity_id in entity_ids:
+        assert hass.states.is_state(entity_id, STATE_UNAVAILABLE)
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.CONNECTED,
+                ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    for entity_id in entity_ids:
+        state = hass.states.get(entity_id)
+        assert state
+        assert state.state != STATE_UNAVAILABLE
+
+
+@pytest.mark.parametrize("appliance", ["FridgeFreezer"], indirect=True)
 @pytest.mark.parametrize(
     (
         "entity_id",
         "setting_key",
+        "type",
+        "expected_state",
         "min_value",
         "max_value",
         "step_size",
@@ -64,102 +259,224 @@ async def test_number(
     ),
     [
         (
-            f"{NUMBER_DOMAIN.lower()}.refrigerator_refrigerator_temperature",
-            "Refrigeration.FridgeFreezer.Setting.SetpointTemperatureRefrigerator",
+            f"{NUMBER_DOMAIN.lower()}.fridgefreezer_refrigerator_temperature",
+            SettingKey.REFRIGERATION_FRIDGE_FREEZER_SETPOINT_TEMPERATURE_REFRIGERATOR,
+            "Double",
+            8,
             7,
             15,
             0.1,
             "°C",
         ),
+        (
+            f"{NUMBER_DOMAIN.lower()}.fridgefreezer_refrigerator_temperature",
+            SettingKey.REFRIGERATION_FRIDGE_FREEZER_SETPOINT_TEMPERATURE_REFRIGERATOR,
+            "Double",
+            8,
+            7,
+            15,
+            5,
+            "°C",
+        ),
     ],
 )
-@pytest.mark.usefixtures("bypass_throttle")
 async def test_number_entity_functionality(
-    appliance: Mock,
+    appliance: HomeAppliance,
     entity_id: str,
-    setting_key: str,
-    bypass_throttle: Generator[None],
+    setting_key: SettingKey,
+    type: str,
+    expected_state: int,
     min_value: int,
     max_value: int,
     step_size: float,
     unit_of_measurement: str,
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: MagicMock,
+    client: MagicMock,
 ) -> None:
     """Test number entity functionality."""
-    appliance.get.side_effect = [
-        {
-            ATTR_CONSTRAINTS: {
-                ATTR_MIN: min_value,
-                ATTR_MAX: max_value,
-                ATTR_STEPSIZE: step_size,
-            },
-            ATTR_UNIT: unit_of_measurement,
-        }
-    ]
-    get_appliances.return_value = [appliance]
-    current_value = min_value
-    appliance.status.update({setting_key: {ATTR_VALUE: current_value}})
+    client.get_setting.side_effect = None
+    client.get_setting = AsyncMock(
+        return_value=GetSetting(
+            key=setting_key,
+            raw_key=setting_key.value,
+            value="",  # This should not change the value
+            unit=unit_of_measurement,
+            type=type,
+            constraints=SettingConstraints(
+                min=min_value,
+                max=max_value,
+                step_size=step_size if isinstance(step_size, int) else None,
+            ),
+        )
+    )
 
     assert config_entry.state is ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state is ConfigEntryState.LOADED
-    assert hass.states.is_state(entity_id, str(current_value))
-    state = hass.states.get(entity_id)
-    assert state.attributes["min"] == min_value
-    assert state.attributes["max"] == max_value
-    assert state.attributes["step"] == step_size
-    assert state.attributes["unit_of_measurement"] == unit_of_measurement
+    entity_state = hass.states.get(entity_id)
+    assert entity_state
+    assert entity_state.state == str(expected_state)
+    attributes = entity_state.attributes
+    assert attributes["min"] == min_value
+    assert attributes["max"] == max_value
+    assert attributes["step"] == step_size
+    assert attributes["unit_of_measurement"] == unit_of_measurement
 
-    new_value = random.randint(min_value + 1, max_value)
+    value = random.choice(
+        [num for num in range(min_value, max_value + 1) if num != expected_state]
+    )
     await hass.services.async_call(
         NUMBER_DOMAIN,
         SERVICE_SET_VALUE,
         {
             ATTR_ENTITY_ID: entity_id,
-            SERVICE_ATTR_VALUE: new_value,
+            SERVICE_ATTR_VALUE: value,
         },
-        blocking=True,
     )
-    appliance.set_setting.assert_called_once_with(setting_key, new_value)
+    await hass.async_block_till_done()
+    client.set_setting.assert_awaited_once_with(
+        appliance.ha_id, setting_key=setting_key, value=value
+    )
+    assert hass.states.is_state(entity_id, str(float(value)))
+
+
+@pytest.mark.parametrize("appliance", ["FridgeFreezer"], indirect=True)
+@pytest.mark.parametrize("retry_after", [0, None])
+@pytest.mark.parametrize(
+    (
+        "entity_id",
+        "setting_key",
+        "type",
+        "min_value",
+        "max_value",
+        "step_size",
+        "unit_of_measurement",
+    ),
+    [
+        (
+            f"{NUMBER_DOMAIN.lower()}.fridgefreezer_refrigerator_temperature",
+            SettingKey.REFRIGERATION_FRIDGE_FREEZER_SETPOINT_TEMPERATURE_REFRIGERATOR,
+            "Double",
+            7,
+            15,
+            5,
+            "°C",
+        ),
+    ],
+)
+@patch("homeassistant.components.home_connect.entity.API_DEFAULT_RETRY_AFTER", new=0)
+async def test_fetch_constraints_after_rate_limit_error(
+    retry_after: int | None,
+    appliance: HomeAppliance,
+    entity_id: str,
+    setting_key: SettingKey,
+    type: str,
+    min_value: int,
+    max_value: int,
+    step_size: int,
+    unit_of_measurement: str,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test that, if a API rate limit error is raised, the constraints are fetched later."""
+
+    def get_settings_side_effect(ha_id: str):
+        if ha_id != appliance.ha_id:
+            return ArrayOfSettings([])
+        return ArrayOfSettings(
+            [
+                GetSetting(
+                    key=setting_key,
+                    raw_key=setting_key.value,
+                    value=random.randint(min_value, max_value),
+                )
+            ]
+        )
+
+    client.get_settings = AsyncMock(side_effect=get_settings_side_effect)
+    client.get_setting = AsyncMock(
+        side_effect=[
+            TooManyRequestsError("error.key", retry_after=retry_after),
+            GetSetting(
+                key=setting_key,
+                raw_key=setting_key.value,
+                value=random.randint(min_value, max_value),
+                unit=unit_of_measurement,
+                type=type,
+                constraints=SettingConstraints(
+                    min=min_value,
+                    max=max_value,
+                    step_size=step_size,
+                ),
+            ),
+        ]
+    )
+
+    assert config_entry.state is ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    assert client.get_setting.call_count == 2
+
+    entity_state = hass.states.get(entity_id)
+    assert entity_state
+    attributes = entity_state.attributes
+    assert attributes["min"] == min_value
+    assert attributes["max"] == max_value
+    assert attributes["step"] == step_size
+    assert attributes["unit_of_measurement"] == unit_of_measurement
 
 
-@pytest.mark.parametrize("problematic_appliance", ["Refrigerator"], indirect=True)
 @pytest.mark.parametrize(
     ("entity_id", "setting_key", "mock_attr"),
     [
         (
-            f"{NUMBER_DOMAIN.lower()}.refrigerator_refrigerator_temperature",
-            "Refrigeration.FridgeFreezer.Setting.SetpointTemperatureRefrigerator",
+            f"{NUMBER_DOMAIN.lower()}.fridgefreezer_refrigerator_temperature",
+            SettingKey.REFRIGERATION_FRIDGE_FREEZER_SETPOINT_TEMPERATURE_REFRIGERATOR,
             "set_setting",
         ),
     ],
 )
-@pytest.mark.usefixtures("bypass_throttle")
 async def test_number_entity_error(
-    problematic_appliance: Mock,
     entity_id: str,
-    setting_key: str,
+    setting_key: SettingKey,
     mock_attr: str,
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: MagicMock,
+    client_with_exception: MagicMock,
 ) -> None:
     """Test number entity error."""
-    get_appliances.return_value = [problematic_appliance]
-
+    client_with_exception.get_settings.side_effect = None
+    client_with_exception.get_settings.return_value = ArrayOfSettings(
+        [
+            GetSetting(
+                key=setting_key,
+                raw_key=setting_key.value,
+                value=DEFAULT_MIN_VALUE,
+                constraints=SettingConstraints(
+                    min=int(DEFAULT_MIN_VALUE),
+                    max=int(DEFAULT_MAX_VALUE),
+                    step_size=1,
+                ),
+            )
+        ]
+    )
     assert config_entry.state is ConfigEntryState.NOT_LOADED
-    problematic_appliance.status.update({setting_key: {}})
-    assert await integration_setup()
+    assert await integration_setup(client_with_exception)
     assert config_entry.state is ConfigEntryState.LOADED
 
     with pytest.raises(HomeConnectError):
-        getattr(problematic_appliance, mock_attr)()
+        await getattr(client_with_exception, mock_attr)()
 
     with pytest.raises(
         HomeAssistantError, match=r"Error.*assign.*value.*to.*setting.*"
@@ -173,4 +490,136 @@ async def test_number_entity_error(
             },
             blocking=True,
         )
-    assert getattr(problematic_appliance, mock_attr).call_count == 2
+    assert getattr(client_with_exception, mock_attr).call_count == 2
+
+
+@pytest.mark.parametrize(
+    (
+        "set_active_program_options_side_effect",
+        "set_selected_program_options_side_effect",
+        "called_mock_method",
+    ),
+    [
+        (
+            None,
+            SelectedProgramNotSetError("error.key"),
+            "set_active_program_option",
+        ),
+        (
+            ActiveProgramNotSetError("error.key"),
+            None,
+            "set_selected_program_option",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    ("appliance", "entity_id", "option_key", "min", "max", "step_size", "unit"),
+    [
+        (
+            "Oven",
+            "number.oven_setpoint_temperature",
+            OptionKey.COOKING_OVEN_SETPOINT_TEMPERATURE,
+            50,
+            260,
+            1,
+            "°C",
+        ),
+    ],
+    indirect=["appliance"],
+)
+async def test_options_functionality(
+    entity_id: str,
+    option_key: OptionKey,
+    appliance: HomeAppliance,
+    min: int,
+    max: int,
+    step_size: int,
+    unit: str,
+    set_active_program_options_side_effect: ActiveProgramNotSetError | None,
+    set_selected_program_options_side_effect: SelectedProgramNotSetError | None,
+    called_mock_method: str,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test options functionality."""
+
+    async def set_program_option_side_effect(ha_id: str, *_, **kwargs) -> None:
+        event_key = EventKey(kwargs["option_key"])
+        await client.add_events(
+            [
+                EventMessage(
+                    ha_id,
+                    EventType.NOTIFY,
+                    ArrayOfEvents(
+                        [
+                            Event(
+                                key=event_key,
+                                raw_key=event_key.value,
+                                timestamp=0,
+                                level="",
+                                handling="",
+                                value=kwargs["value"],
+                                unit=unit,
+                            )
+                        ]
+                    ),
+                ),
+            ]
+        )
+
+    called_mock = AsyncMock(side_effect=set_program_option_side_effect)
+    if set_active_program_options_side_effect:
+        client.set_active_program_option.side_effect = (
+            set_active_program_options_side_effect
+        )
+    else:
+        assert set_selected_program_options_side_effect
+        client.set_selected_program_option.side_effect = (
+            set_selected_program_options_side_effect
+        )
+    setattr(client, called_mock_method, called_mock)
+    client.get_available_program = AsyncMock(
+        return_value=ProgramDefinition(
+            ProgramKey.UNKNOWN,
+            options=[
+                ProgramDefinitionOption(
+                    option_key,
+                    "Double",
+                    unit=unit,
+                    constraints=ProgramDefinitionConstraints(
+                        min=min,
+                        max=max,
+                        step_size=step_size,
+                    ),
+                )
+            ],
+        )
+    )
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+    entity_state = hass.states.get(entity_id)
+    assert entity_state
+    assert entity_state.attributes["unit_of_measurement"] == unit
+    assert entity_state.attributes[ATTR_MIN] == min
+    assert entity_state.attributes[ATTR_MAX] == max
+    assert entity_state.attributes[ATTR_STEP] == step_size
+
+    await hass.services.async_call(
+        NUMBER_DOMAIN,
+        SERVICE_SET_VALUE,
+        {ATTR_ENTITY_ID: entity_id, SERVICE_ATTR_VALUE: 80},
+    )
+    await hass.async_block_till_done()
+
+    assert called_mock.called
+    assert called_mock.call_args.args == (appliance.ha_id,)
+    assert called_mock.call_args.kwargs == {
+        "option_key": option_key,
+        "value": 80,
+    }
+    assert hass.states.is_state(entity_id, "80.0")
diff --git a/tests/components/home_connect/test_select.py b/tests/components/home_connect/test_select.py
index af975979196..f6009640f72 100644
--- a/tests/components/home_connect/test_select.py
+++ b/tests/components/home_connect/test_select.py
@@ -1,39 +1,58 @@
 """Tests for home_connect select entities."""
 
-from collections.abc import Awaitable, Callable, Generator
-from unittest.mock import MagicMock, Mock
+from collections.abc import Awaitable, Callable
+from unittest.mock import AsyncMock, MagicMock
 
-from homeconnect.api import HomeConnectError
+from aiohomeconnect.model import (
+    ArrayOfEvents,
+    ArrayOfPrograms,
+    ArrayOfSettings,
+    Event,
+    EventKey,
+    EventMessage,
+    EventType,
+    GetSetting,
+    HomeAppliance,
+    OptionKey,
+    ProgramDefinition,
+    ProgramKey,
+    SettingKey,
+)
+from aiohomeconnect.model.error import (
+    ActiveProgramNotSetError,
+    HomeConnectError,
+    SelectedProgramNotSetError,
+    TooManyRequestsError,
+)
+from aiohomeconnect.model.program import (
+    EnumerateProgram,
+    EnumerateProgramConstraints,
+    Execution,
+    ProgramDefinitionConstraints,
+    ProgramDefinitionOption,
+)
+from aiohomeconnect.model.setting import SettingConstraints
 import pytest
 
-from homeassistant.components.home_connect.const import (
-    BSH_ACTIVE_PROGRAM,
-    BSH_SELECTED_PROGRAM,
-)
+from homeassistant.components.home_connect.const import DOMAIN
 from homeassistant.components.select import (
     ATTR_OPTION,
     ATTR_OPTIONS,
     DOMAIN as SELECT_DOMAIN,
 )
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import ATTR_ENTITY_ID, SERVICE_SELECT_OPTION, Platform
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    SERVICE_SELECT_OPTION,
+    STATE_UNAVAILABLE,
+    STATE_UNKNOWN,
+    Platform,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 
-from .conftest import get_all_appliances
-
-from tests.common import MockConfigEntry, load_json_object_fixture
-
-SETTINGS_STATUS = {
-    setting.pop("key"): setting
-    for setting in load_json_object_fixture("home_connect/settings.json")
-    .get("Washer")
-    .get("data")
-    .get("settings")
-}
-
-PROGRAM = "Dishcare.Dishwasher.Program.Eco50"
+from tests.common import MockConfigEntry, async_fire_time_changed
 
 
 @pytest.fixture
@@ -43,119 +62,339 @@ def platforms() -> list[str]:
 
 
 async def test_select(
-    bypass_throttle: Generator[None],
-    hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: Mock,
+    client: MagicMock,
 ) -> None:
     """Test select entity."""
-    get_appliances.side_effect = get_all_appliances
     assert config_entry.state is ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state is ConfigEntryState.LOADED
 
 
-async def test_filter_unknown_programs(
-    bypass_throttle: Generator[None],
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+async def test_paired_depaired_devices_flow(
+    appliance: HomeAppliance,
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: Mock,
-    appliance: Mock,
+    client: MagicMock,
+    device_registry: dr.DeviceRegistry,
     entity_registry: er.EntityRegistry,
 ) -> None:
-    """Test select that programs that are not part of the official Home Connect API specification are filtered out.
+    """Test that removed devices are correctly removed from and added to hass on API events."""
+    client.get_available_program = AsyncMock(
+        return_value=ProgramDefinition(
+            ProgramKey.UNKNOWN,
+            options=[
+                ProgramDefinitionOption(
+                    OptionKey.LAUNDRY_CARE_WASHER_TEMPERATURE,
+                    "Enumeration",
+                )
+            ],
+        )
+    )
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
 
-    We use two programs to ensure that programs are iterated over a copy of the list,
-    and it does not raise problems when removing an element from the original list.
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+    assert entity_entries
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.DEPAIRED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert not device
+    for entity_entry in entity_entries:
+        assert not entity_registry.async_get(entity_entry.entity_id)
+
+    # Now that all everything related to the device is removed, pair it again
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.PAIRED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    assert device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    for entity_entry in entity_entries:
+        assert entity_registry.async_get(entity_entry.entity_id)
+
+
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+async def test_connected_devices(
+    appliance: HomeAppliance,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that devices reconnected.
+
+    Specifically those devices whose settings, status, etc. could
+    not be obtained while disconnected and once connected, the entities are added.
     """
-    appliance.status.update(SETTINGS_STATUS)
-    appliance.get_programs_available.return_value = [
-        PROGRAM,
-        "NonOfficialProgram",
-        "AntotherNonOfficialProgram",
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.CONNECTED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+    assert entity_entries
+
+
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+async def test_select_entity_availability(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    appliance: HomeAppliance,
+) -> None:
+    """Test if select entities availability are based on the appliance connection state."""
+    entity_ids = [
+        "select.washer_active_program",
     ]
-    get_appliances.return_value = [appliance]
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    for entity_id in entity_ids:
+        state = hass.states.get(entity_id)
+        assert state
+        assert state.state != STATE_UNAVAILABLE
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.DISCONNECTED,
+                ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    for entity_id in entity_ids:
+        assert hass.states.is_state(entity_id, STATE_UNAVAILABLE)
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.CONNECTED,
+                ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    for entity_id in entity_ids:
+        state = hass.states.get(entity_id)
+        assert state
+        assert state.state != STATE_UNAVAILABLE
+
+
+async def test_filter_programs(
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test select that only right programs are shown."""
+    client.get_all_programs.side_effect = None
+    client.get_all_programs.return_value = ArrayOfPrograms(
+        [
+            EnumerateProgram(
+                key=ProgramKey.DISHCARE_DISHWASHER_ECO_50,
+                raw_key=ProgramKey.DISHCARE_DISHWASHER_ECO_50.value,
+                constraints=EnumerateProgramConstraints(
+                    execution=Execution.SELECT_ONLY,
+                ),
+            ),
+            EnumerateProgram(
+                key=ProgramKey.UNKNOWN,
+                raw_key="an unknown program",
+            ),
+            EnumerateProgram(
+                key=ProgramKey.DISHCARE_DISHWASHER_QUICK_45,
+                raw_key=ProgramKey.DISHCARE_DISHWASHER_QUICK_45.value,
+                constraints=EnumerateProgramConstraints(
+                    execution=Execution.START_ONLY,
+                ),
+            ),
+            EnumerateProgram(
+                key=ProgramKey.DISHCARE_DISHWASHER_AUTO_1,
+                raw_key=ProgramKey.DISHCARE_DISHWASHER_AUTO_1.value,
+                constraints=EnumerateProgramConstraints(
+                    execution=Execution.SELECT_AND_START,
+                ),
+            ),
+        ]
+    )
 
     assert config_entry.state is ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state is ConfigEntryState.LOADED
 
-    entity = entity_registry.async_get("select.washer_selected_program")
+    entity = entity_registry.async_get("select.dishwasher_selected_program")
     assert entity
-    assert entity.capabilities.get(ATTR_OPTIONS) == [
-        "dishcare_dishwasher_program_eco_50"
+    assert entity.capabilities
+    assert entity.capabilities[ATTR_OPTIONS] == [
+        "dishcare_dishwasher_program_eco_50",
+        "dishcare_dishwasher_program_auto_1",
+    ]
+
+    entity = entity_registry.async_get("select.dishwasher_active_program")
+    assert entity
+    assert entity.capabilities
+    assert entity.capabilities[ATTR_OPTIONS] == [
+        "dishcare_dishwasher_program_quick_45",
+        "dishcare_dishwasher_program_auto_1",
     ]
 
 
 @pytest.mark.parametrize(
-    ("entity_id", "status", "program_to_set"),
+    (
+        "appliance",
+        "entity_id",
+        "expected_initial_state",
+        "mock_method",
+        "program_key",
+        "program_to_set",
+        "event_key",
+    ),
     [
         (
-            "select.washer_selected_program",
-            {BSH_SELECTED_PROGRAM: {"value": PROGRAM}},
+            "Dishwasher",
+            "select.dishwasher_selected_program",
+            "dishcare_dishwasher_program_auto_1",
+            "set_selected_program",
+            ProgramKey.DISHCARE_DISHWASHER_ECO_50,
             "dishcare_dishwasher_program_eco_50",
+            EventKey.BSH_COMMON_ROOT_SELECTED_PROGRAM,
         ),
         (
-            "select.washer_active_program",
-            {BSH_ACTIVE_PROGRAM: {"value": PROGRAM}},
+            "Dishwasher",
+            "select.dishwasher_active_program",
+            "dishcare_dishwasher_program_auto_1",
+            "start_program",
+            ProgramKey.DISHCARE_DISHWASHER_ECO_50,
             "dishcare_dishwasher_program_eco_50",
+            EventKey.BSH_COMMON_ROOT_ACTIVE_PROGRAM,
         ),
     ],
+    indirect=["appliance"],
 )
-async def test_select_functionality(
+async def test_select_program_functionality(
+    appliance: HomeAppliance,
     entity_id: str,
-    status: dict,
+    expected_initial_state: str,
+    mock_method: str,
+    program_key: ProgramKey,
     program_to_set: str,
-    bypass_throttle: Generator[None],
+    event_key: EventKey,
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    appliance: Mock,
-    get_appliances: MagicMock,
+    client: MagicMock,
 ) -> None:
     """Test select functionality."""
-    appliance.status.update(SETTINGS_STATUS)
-    appliance.get_programs_available.return_value = [PROGRAM]
-    get_appliances.return_value = [appliance]
-
     assert config_entry.state is ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state is ConfigEntryState.LOADED
 
-    appliance.status.update(status)
+    assert hass.states.is_state(entity_id, expected_initial_state)
     await hass.services.async_call(
         SELECT_DOMAIN,
         SERVICE_SELECT_OPTION,
         {ATTR_ENTITY_ID: entity_id, ATTR_OPTION: program_to_set},
-        blocking=True,
+    )
+    await hass.async_block_till_done()
+    getattr(client, mock_method).assert_awaited_once_with(
+        appliance.ha_id, program_key=program_key
     )
     assert hass.states.is_state(entity_id, program_to_set)
 
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.NOTIFY,
+                ArrayOfEvents(
+                    [
+                        Event(
+                            key=event_key,
+                            raw_key=event_key.value,
+                            timestamp=0,
+                            level="",
+                            handling="",
+                            value="A not known program",
+                        )
+                    ]
+                ),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+    assert hass.states.is_state(entity_id, STATE_UNKNOWN)
+
 
 @pytest.mark.parametrize(
     (
         "entity_id",
-        "status",
         "program_to_set",
         "mock_attr",
         "exception_match",
     ),
     [
         (
-            "select.washer_selected_program",
-            {BSH_SELECTED_PROGRAM: {"value": PROGRAM}},
+            "select.dishwasher_selected_program",
             "dishcare_dishwasher_program_eco_50",
-            "select_program",
+            "set_selected_program",
             r"Error.*select.*program.*",
         ),
         (
-            "select.washer_active_program",
-            {BSH_ACTIVE_PROGRAM: {"value": PROGRAM}},
+            "select.dishwasher_active_program",
             "dishcare_dishwasher_program_eco_50",
             "start_program",
             r"Error.*start.*program.*",
@@ -164,37 +403,507 @@ async def test_select_functionality(
 )
 async def test_select_exception_handling(
     entity_id: str,
-    status: dict,
     program_to_set: str,
     mock_attr: str,
     exception_match: str,
-    bypass_throttle: Generator[None],
     hass: HomeAssistant,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     config_entry: MockConfigEntry,
     setup_credentials: None,
-    problematic_appliance: Mock,
-    get_appliances: MagicMock,
+    client_with_exception: MagicMock,
 ) -> None:
     """Test exception handling."""
-    problematic_appliance.get_programs_available.side_effect = None
-    problematic_appliance.get_programs_available.return_value = [PROGRAM]
-    get_appliances.return_value = [problematic_appliance]
+    client_with_exception.get_all_programs.side_effect = None
+    client_with_exception.get_all_programs.return_value = ArrayOfPrograms(
+        [
+            EnumerateProgram(
+                key=ProgramKey.DISHCARE_DISHWASHER_ECO_50,
+                raw_key=ProgramKey.DISHCARE_DISHWASHER_ECO_50.value,
+            )
+        ]
+    )
 
     assert config_entry.state is ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client_with_exception)
     assert config_entry.state is ConfigEntryState.LOADED
 
+    assert hass.states.is_state(entity_id, STATE_UNKNOWN)
+
     # Assert that an exception is called.
     with pytest.raises(HomeConnectError):
-        getattr(problematic_appliance, mock_attr)()
+        await getattr(client_with_exception, mock_attr)()
 
-    problematic_appliance.status.update(status)
     with pytest.raises(HomeAssistantError, match=exception_match):
         await hass.services.async_call(
             SELECT_DOMAIN,
             SERVICE_SELECT_OPTION,
-            {"entity_id": entity_id, "option": program_to_set},
+            {ATTR_ENTITY_ID: entity_id, ATTR_OPTION: program_to_set},
             blocking=True,
         )
-    assert getattr(problematic_appliance, mock_attr).call_count == 2
+    assert getattr(client_with_exception, mock_attr).call_count == 2
+
+
+@pytest.mark.parametrize("appliance", ["Hood"], indirect=True)
+@pytest.mark.parametrize(
+    (
+        "entity_id",
+        "setting_key",
+        "expected_options",
+        "value_to_set",
+        "expected_value_call_arg",
+    ),
+    [
+        (
+            "select.hood_functional_light_color_temperature",
+            SettingKey.COOKING_HOOD_COLOR_TEMPERATURE,
+            {
+                "cooking_hood_enum_type_color_temperature_warm",
+                "cooking_hood_enum_type_color_temperature_neutral",
+                "cooking_hood_enum_type_color_temperature_cold",
+            },
+            "cooking_hood_enum_type_color_temperature_neutral",
+            "Cooking.Hood.EnumType.ColorTemperature.neutral",
+        ),
+        (
+            "select.hood_ambient_light_color",
+            SettingKey.BSH_COMMON_AMBIENT_LIGHT_COLOR,
+            {
+                "b_s_h_common_enum_type_ambient_light_color_custom_color",
+                *[str(i) for i in range(1, 100)],
+            },
+            "42",
+            "BSH.Common.EnumType.AmbientLightColor.Color42",
+        ),
+    ],
+)
+async def test_select_functionality(
+    appliance: HomeAppliance,
+    entity_id: str,
+    setting_key: SettingKey,
+    expected_options: set[str],
+    value_to_set: str,
+    expected_value_call_arg: str,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test select functionality."""
+    assert config_entry.state is ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    entity_state = hass.states.get(entity_id)
+    assert entity_state
+    assert set(entity_state.attributes[ATTR_OPTIONS]) == expected_options
+
+    await hass.services.async_call(
+        SELECT_DOMAIN,
+        SERVICE_SELECT_OPTION,
+        {ATTR_ENTITY_ID: entity_id, ATTR_OPTION: value_to_set},
+    )
+    await hass.async_block_till_done()
+
+    client.set_setting.assert_called_once()
+    assert client.set_setting.call_args.args == (appliance.ha_id,)
+    assert client.set_setting.call_args.kwargs == {
+        "setting_key": setting_key,
+        "value": expected_value_call_arg,
+    }
+    assert hass.states.is_state(entity_id, value_to_set)
+
+
+@pytest.mark.parametrize("appliance", ["Hood"], indirect=True)
+@pytest.mark.parametrize(
+    (
+        "entity_id",
+        "test_setting_key",
+        "allowed_values",
+        "expected_options",
+    ),
+    [
+        (
+            "select.hood_ambient_light_color",
+            SettingKey.BSH_COMMON_AMBIENT_LIGHT_COLOR,
+            [f"BSH.Common.EnumType.AmbientLightColor.Color{i}" for i in range(1, 50)],
+            {str(i) for i in range(1, 50)},
+        ),
+        (
+            "select.hood_ambient_light_color",
+            SettingKey.BSH_COMMON_AMBIENT_LIGHT_COLOR,
+            [
+                "A.Non.Documented.Option",
+                "BSH.Common.EnumType.AmbientLightColor.Color42",
+            ],
+            {"42"},
+        ),
+    ],
+)
+async def test_fetch_allowed_values(
+    appliance: HomeAppliance,
+    entity_id: str,
+    test_setting_key: SettingKey,
+    allowed_values: list[str | None],
+    expected_options: set[str],
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test fetch allowed values."""
+    original_get_setting_side_effect = client.get_setting
+
+    async def get_setting_side_effect(
+        ha_id: str, setting_key: SettingKey
+    ) -> GetSetting:
+        if ha_id != appliance.ha_id or setting_key != test_setting_key:
+            return await original_get_setting_side_effect(ha_id, setting_key)
+        return GetSetting(
+            key=test_setting_key,
+            raw_key=test_setting_key.value,
+            value="",  # Not important
+            constraints=SettingConstraints(
+                allowed_values=allowed_values,
+            ),
+        )
+
+    client.get_setting = AsyncMock(side_effect=get_setting_side_effect)
+
+    assert config_entry.state is ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    entity_state = hass.states.get(entity_id)
+    assert entity_state
+    assert set(entity_state.attributes[ATTR_OPTIONS]) == expected_options
+
+
+@pytest.mark.parametrize("appliance", ["Hood"], indirect=True)
+@pytest.mark.parametrize(
+    (
+        "entity_id",
+        "setting_key",
+        "allowed_values",
+        "expected_options",
+    ),
+    [
+        (
+            "select.hood_ambient_light_color",
+            SettingKey.BSH_COMMON_AMBIENT_LIGHT_COLOR,
+            [f"BSH.Common.EnumType.AmbientLightColor.Color{i}" for i in range(50)],
+            {str(i) for i in range(1, 50)},
+        ),
+    ],
+)
+async def test_fetch_allowed_values_after_rate_limit_error(
+    appliance: HomeAppliance,
+    entity_id: str,
+    setting_key: SettingKey,
+    allowed_values: list[str | None],
+    expected_options: set[str],
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test fetch allowed values."""
+
+    def get_settings_side_effect(ha_id: str):
+        if ha_id != appliance.ha_id:
+            return ArrayOfSettings([])
+        return ArrayOfSettings(
+            [
+                GetSetting(
+                    key=setting_key,
+                    raw_key=setting_key.value,
+                    value="",  # Not important
+                )
+            ]
+        )
+
+    client.get_settings = AsyncMock(side_effect=get_settings_side_effect)
+    client.get_setting = AsyncMock(
+        side_effect=[
+            TooManyRequestsError("error.key", retry_after=0),
+            GetSetting(
+                key=setting_key,
+                raw_key=setting_key.value,
+                value="",  # Not important
+                constraints=SettingConstraints(
+                    allowed_values=allowed_values,
+                ),
+            ),
+        ]
+    )
+
+    assert config_entry.state is ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    assert client.get_setting.call_count == 2
+
+    entity_state = hass.states.get(entity_id)
+    assert entity_state
+    assert set(entity_state.attributes[ATTR_OPTIONS]) == expected_options
+
+
+@pytest.mark.parametrize("appliance", ["Hood"], indirect=True)
+@pytest.mark.parametrize(
+    (
+        "entity_id",
+        "setting_key",
+        "exception",
+        "expected_options",
+    ),
+    [
+        (
+            "select.hood_ambient_light_color",
+            SettingKey.BSH_COMMON_AMBIENT_LIGHT_COLOR,
+            HomeConnectError(),
+            {
+                "b_s_h_common_enum_type_ambient_light_color_custom_color",
+                *{str(i) for i in range(1, 100)},
+            },
+        ),
+    ],
+)
+async def test_default_values_after_fetch_allowed_values_error(
+    appliance: HomeAppliance,
+    entity_id: str,
+    setting_key: SettingKey,
+    exception: Exception,
+    expected_options: set[str],
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test fetch allowed values."""
+
+    def get_settings_side_effect(ha_id: str):
+        if ha_id != appliance.ha_id:
+            return ArrayOfSettings([])
+        return ArrayOfSettings(
+            [
+                GetSetting(
+                    key=setting_key,
+                    raw_key=setting_key.value,
+                    value="",  # Not important
+                )
+            ]
+        )
+
+    client.get_settings = AsyncMock(side_effect=get_settings_side_effect)
+    client.get_setting = AsyncMock(side_effect=exception)
+
+    assert config_entry.state is ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    assert client.get_setting.call_count == 1
+
+    entity_state = hass.states.get(entity_id)
+    assert entity_state
+    assert set(entity_state.attributes[ATTR_OPTIONS]) == expected_options
+
+
+@pytest.mark.parametrize(
+    ("entity_id", "setting_key", "allowed_value", "value_to_set", "mock_attr"),
+    [
+        (
+            "select.hood_functional_light_color_temperature",
+            SettingKey.COOKING_HOOD_COLOR_TEMPERATURE,
+            "Cooking.Hood.EnumType.ColorTemperature.neutral",
+            "cooking_hood_enum_type_color_temperature_neutral",
+            "set_setting",
+        ),
+    ],
+)
+async def test_select_entity_error(
+    entity_id: str,
+    setting_key: SettingKey,
+    allowed_value: str,
+    value_to_set: str,
+    mock_attr: str,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client_with_exception: MagicMock,
+) -> None:
+    """Test select entity error."""
+    client_with_exception.get_settings.side_effect = None
+    client_with_exception.get_settings.return_value = ArrayOfSettings(
+        [
+            GetSetting(
+                key=setting_key,
+                raw_key=setting_key.value,
+                value=value_to_set,
+                constraints=SettingConstraints(allowed_values=[allowed_value]),
+            )
+        ]
+    )
+    assert config_entry.state is ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client_with_exception)
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    with pytest.raises(HomeConnectError):
+        await getattr(client_with_exception, mock_attr)()
+
+    with pytest.raises(
+        HomeAssistantError, match=r"Error.*assign.*value.*to.*setting.*"
+    ):
+        await hass.services.async_call(
+            SELECT_DOMAIN,
+            SERVICE_SELECT_OPTION,
+            {ATTR_ENTITY_ID: entity_id, ATTR_OPTION: value_to_set},
+            blocking=True,
+        )
+    assert getattr(client_with_exception, mock_attr).call_count == 2
+
+
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+@pytest.mark.parametrize(
+    (
+        "set_active_program_options_side_effect",
+        "set_selected_program_options_side_effect",
+        "called_mock_method",
+    ),
+    [
+        (
+            None,
+            SelectedProgramNotSetError("error.key"),
+            "set_active_program_option",
+        ),
+        (
+            ActiveProgramNotSetError("error.key"),
+            None,
+            "set_selected_program_option",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    ("entity_id", "option_key", "allowed_values", "expected_options"),
+    [
+        (
+            "select.washer_temperature",
+            OptionKey.LAUNDRY_CARE_WASHER_TEMPERATURE,
+            None,
+            {
+                "laundry_care_washer_enum_type_temperature_cold",
+                "laundry_care_washer_enum_type_temperature_g_c_20",
+                "laundry_care_washer_enum_type_temperature_g_c_30",
+                "laundry_care_washer_enum_type_temperature_g_c_40",
+                "laundry_care_washer_enum_type_temperature_g_c_50",
+                "laundry_care_washer_enum_type_temperature_g_c_60",
+                "laundry_care_washer_enum_type_temperature_g_c_70",
+                "laundry_care_washer_enum_type_temperature_g_c_80",
+                "laundry_care_washer_enum_type_temperature_g_c_90",
+                "laundry_care_washer_enum_type_temperature_ul_cold",
+                "laundry_care_washer_enum_type_temperature_ul_warm",
+                "laundry_care_washer_enum_type_temperature_ul_hot",
+                "laundry_care_washer_enum_type_temperature_ul_extra_hot",
+            },
+        ),
+        (
+            "select.washer_temperature",
+            OptionKey.LAUNDRY_CARE_WASHER_TEMPERATURE,
+            [
+                "LaundryCare.Washer.EnumType.Temperature.UlCold",
+                "LaundryCare.Washer.EnumType.Temperature.UlWarm",
+                "LaundryCare.Washer.EnumType.Temperature.UlHot",
+                "LaundryCare.Washer.EnumType.Temperature.UlExtraHot",
+            ],
+            {
+                "laundry_care_washer_enum_type_temperature_ul_cold",
+                "laundry_care_washer_enum_type_temperature_ul_warm",
+                "laundry_care_washer_enum_type_temperature_ul_hot",
+                "laundry_care_washer_enum_type_temperature_ul_extra_hot",
+            },
+        ),
+        (
+            "select.washer_temperature",
+            OptionKey.LAUNDRY_CARE_WASHER_TEMPERATURE,
+            [
+                "A.Non.Documented.Option",
+                "LaundryCare.Washer.EnumType.Temperature.UlWarm",
+            ],
+            {
+                "laundry_care_washer_enum_type_temperature_ul_warm",
+            },
+        ),
+    ],
+)
+async def test_options_functionality(
+    entity_id: str,
+    option_key: OptionKey,
+    allowed_values: list[str | None] | None,
+    expected_options: set[str],
+    appliance: HomeAppliance,
+    set_active_program_options_side_effect: ActiveProgramNotSetError | None,
+    set_selected_program_options_side_effect: SelectedProgramNotSetError | None,
+    called_mock_method: str,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test options functionality."""
+    if set_active_program_options_side_effect:
+        client.set_active_program_option.side_effect = (
+            set_active_program_options_side_effect
+        )
+    else:
+        assert set_selected_program_options_side_effect
+        client.set_selected_program_option.side_effect = (
+            set_selected_program_options_side_effect
+        )
+    called_mock: AsyncMock = getattr(client, called_mock_method)
+    client.get_available_program = AsyncMock(
+        return_value=ProgramDefinition(
+            ProgramKey.UNKNOWN,
+            options=[
+                ProgramDefinitionOption(
+                    option_key,
+                    "Enumeration",
+                    constraints=ProgramDefinitionConstraints(
+                        allowed_values=allowed_values
+                    ),
+                )
+            ],
+        )
+    )
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+    entity_state = hass.states.get(entity_id)
+    assert entity_state
+    assert set(entity_state.attributes[ATTR_OPTIONS]) == expected_options
+
+    await hass.services.async_call(
+        SELECT_DOMAIN,
+        SERVICE_SELECT_OPTION,
+        {
+            ATTR_ENTITY_ID: entity_id,
+            ATTR_OPTION: "laundry_care_washer_enum_type_temperature_ul_warm",
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert called_mock.called
+    assert called_mock.call_args.args == (appliance.ha_id,)
+    assert called_mock.call_args.kwargs == {
+        "option_key": option_key,
+        "value": "LaundryCare.Washer.EnumType.Temperature.UlWarm",
+    }
+    assert hass.states.is_state(
+        entity_id, "laundry_care_washer_enum_type_temperature_ul_warm"
+    )
diff --git a/tests/components/home_connect/test_sensor.py b/tests/components/home_connect/test_sensor.py
index f2ee3b13922..f30723af7fa 100644
--- a/tests/components/home_connect/test_sensor.py
+++ b/tests/components/home_connect/test_sensor.py
@@ -1,75 +1,83 @@
 """Tests for home_connect sensor entities."""
 
 from collections.abc import Awaitable, Callable
-from unittest.mock import MagicMock, Mock
+from unittest.mock import AsyncMock, MagicMock
 
+from aiohomeconnect.model import (
+    ArrayOfEvents,
+    ArrayOfStatus,
+    Event,
+    EventKey,
+    EventMessage,
+    EventType,
+    HomeAppliance,
+    Status,
+    StatusKey,
+)
+from aiohomeconnect.model.error import HomeConnectApiError, TooManyRequestsError
 from freezegun.api import FrozenDateTimeFactory
-from homeconnect.api import HomeConnectAPI
 import pytest
 
 from homeassistant.components.home_connect.const import (
-    BSH_DOOR_STATE,
     BSH_DOOR_STATE_CLOSED,
     BSH_DOOR_STATE_LOCKED,
     BSH_DOOR_STATE_OPEN,
     BSH_EVENT_PRESENT_STATE_CONFIRMED,
     BSH_EVENT_PRESENT_STATE_OFF,
     BSH_EVENT_PRESENT_STATE_PRESENT,
-    COFFEE_EVENT_BEAN_CONTAINER_EMPTY,
-    REFRIGERATION_EVENT_DOOR_ALARM_FREEZER,
+    DOMAIN,
 )
+from homeassistant.components.home_connect.coordinator import HomeConnectError
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import Platform
+from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_component import async_update_entity
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 
-from tests.common import MockConfigEntry, load_json_object_fixture
+from tests.common import MockConfigEntry, async_fire_time_changed
 
 TEST_HC_APP = "Dishwasher"
 
 
 EVENT_PROG_DELAYED_START = {
-    "BSH.Common.Status.OperationState": {
-        "value": "BSH.Common.EnumType.OperationState.DelayedStart"
-    },
-}
-
-EVENT_PROG_REMAIN_NO_VALUE = {
-    "BSH.Common.Option.RemainingProgramTime": {},
-    "BSH.Common.Status.OperationState": {
-        "value": "BSH.Common.EnumType.OperationState.DelayedStart"
+    EventType.STATUS: {
+        EventKey.BSH_COMMON_STATUS_OPERATION_STATE: "BSH.Common.EnumType.OperationState.DelayedStart",
     },
 }
 
 
 EVENT_PROG_RUN = {
-    "BSH.Common.Option.RemainingProgramTime": {"value": "0"},
-    "BSH.Common.Option.ProgramProgress": {"value": "60"},
-    "BSH.Common.Status.OperationState": {
-        "value": "BSH.Common.EnumType.OperationState.Run"
+    EventType.STATUS: {
+        EventKey.BSH_COMMON_STATUS_OPERATION_STATE: "BSH.Common.EnumType.OperationState.Run",
+    },
+    EventType.EVENT: {
+        EventKey.BSH_COMMON_OPTION_REMAINING_PROGRAM_TIME: 0,
+        EventKey.BSH_COMMON_OPTION_PROGRAM_PROGRESS: 60,
     },
 }
 
-
 EVENT_PROG_UPDATE_1 = {
-    "BSH.Common.Option.RemainingProgramTime": {"value": "0"},
-    "BSH.Common.Option.ProgramProgress": {"value": "80"},
-    "BSH.Common.Status.OperationState": {
-        "value": "BSH.Common.EnumType.OperationState.Run"
+    EventType.EVENT: {
+        EventKey.BSH_COMMON_OPTION_REMAINING_PROGRAM_TIME: 0,
+        EventKey.BSH_COMMON_OPTION_PROGRAM_PROGRESS: 80,
+    },
+    EventType.STATUS: {
+        EventKey.BSH_COMMON_STATUS_OPERATION_STATE: "BSH.Common.EnumType.OperationState.Run",
     },
 }
 
 EVENT_PROG_UPDATE_2 = {
-    "BSH.Common.Option.RemainingProgramTime": {"value": "20"},
-    "BSH.Common.Option.ProgramProgress": {"value": "99"},
-    "BSH.Common.Status.OperationState": {
-        "value": "BSH.Common.EnumType.OperationState.Run"
+    EventType.EVENT: {
+        EventKey.BSH_COMMON_OPTION_REMAINING_PROGRAM_TIME: 20,
+        EventKey.BSH_COMMON_OPTION_PROGRAM_PROGRESS: 99,
+    },
+    EventType.STATUS: {
+        EventKey.BSH_COMMON_STATUS_OPERATION_STATE: "BSH.Common.EnumType.OperationState.Run",
     },
 }
 
 EVENT_PROG_END = {
-    "BSH.Common.Status.OperationState": {
-        "value": "BSH.Common.EnumType.OperationState.Ready"
+    EventType.STATUS: {
+        EventKey.BSH_COMMON_STATUS_OPERATION_STATE: "BSH.Common.EnumType.OperationState.Ready",
     },
 }
 
@@ -80,21 +88,178 @@ def platforms() -> list[str]:
     return [Platform.SENSOR]
 
 
-@pytest.mark.usefixtures("bypass_throttle")
 async def test_sensors(
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: MagicMock,
-    appliance: Mock,
+    client: MagicMock,
 ) -> None:
     """Test sensor entities."""
-    get_appliances.return_value = [appliance]
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
 
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+async def test_paired_depaired_devices_flow(
+    appliance: HomeAppliance,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that removed devices are correctly removed from and added to hass on API events."""
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+    assert entity_entries
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.DEPAIRED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert not device
+    for entity_entry in entity_entries:
+        assert not entity_registry.async_get(entity_entry.entity_id)
+
+    # Now that all everything related to the device is removed, pair it again
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.PAIRED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    assert device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    for entity_entry in entity_entries:
+        assert entity_registry.async_get(entity_entry.entity_id)
+
+
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+async def test_connected_devices(
+    appliance: HomeAppliance,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that devices reconnected.
+
+    Specifically those devices whose settings, status, etc. could
+    not be obtained while disconnected and once connected, the entities are added.
+    """
+    get_status_original_mock = client.get_status
+
+    def get_status_side_effect(ha_id: str):
+        if ha_id == appliance.ha_id:
+            raise HomeConnectApiError(
+                "SDK.Error.HomeAppliance.Connection.Initialization.Failed"
+            )
+        return get_status_original_mock.return_value
+
+    client.get_status = AsyncMock(side_effect=get_status_side_effect)
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+    client.get_status = get_status_original_mock
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.CONNECTED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    new_entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+    assert len(new_entity_entries) > len(entity_entries)
+
+
+@pytest.mark.parametrize("appliance", [TEST_HC_APP], indirect=True)
+async def test_sensor_entity_availability(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    appliance: HomeAppliance,
+) -> None:
+    """Test if sensor entities availability are based on the appliance connection state."""
+    entity_ids = [
+        "sensor.dishwasher_operation_state",
+        "sensor.dishwasher_salt_nearly_empty",
+    ]
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    for entity_id in entity_ids:
+        state = hass.states.get(entity_id)
+        assert state
+        assert state.state != STATE_UNAVAILABLE
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.DISCONNECTED,
+                ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    for entity_id in entity_ids:
+        assert hass.states.is_state(entity_id, STATE_UNAVAILABLE)
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.CONNECTED,
+                ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    for entity_id in entity_ids:
+        state = hass.states.get(entity_id)
+        assert state
+        assert state.state != STATE_UNAVAILABLE
+
+
 # Appliance program sequence with a delayed start.
 PROGRAM_SEQUENCE_EVENTS = (
     EVENT_PROG_DELAYED_START,
@@ -141,42 +306,141 @@ ENTITY_ID_STATES = {
         )
     ),
 )
-@pytest.mark.usefixtures("bypass_throttle")
-async def test_event_sensors(
-    appliance: Mock,
+async def test_program_sensors(
+    client: MagicMock,
+    appliance: HomeAppliance,
     states: tuple,
-    event_run: dict,
+    event_run: dict[EventType, dict[EventKey, str | int]],
     freezer: FrozenDateTimeFactory,
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: MagicMock,
 ) -> None:
-    """Test sequence for sensors that are only available after an event happens."""
+    """Test sequence for sensors that expose information about a program."""
     entity_ids = ENTITY_ID_STATES.keys()
 
     time_to_freeze = "2021-01-09 12:00:00+00:00"
     freezer.move_to(time_to_freeze)
 
-    get_appliances.return_value = [appliance]
-
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    appliance.get_programs_available = MagicMock(return_value=["dummy_program"])
-    appliance.status.update(EVENT_PROG_DELAYED_START)
-    assert await integration_setup()
+    client.get_status.return_value.status.extend(
+        Status(
+            key=StatusKey(event_key.value),
+            raw_key=event_key.value,
+            value=value,
+        )
+        for event_key, value in EVENT_PROG_DELAYED_START[EventType.STATUS].items()
+    )
+    assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
-    appliance.status.update(event_run)
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                event_type,
+                ArrayOfEvents(
+                    [
+                        Event(
+                            key=event_key,
+                            raw_key=event_key.value,
+                            timestamp=0,
+                            level="",
+                            handling="",
+                            value=value,
+                        )
+                    ],
+                ),
+            )
+            for event_type, events in event_run.items()
+            for event_key, value in events.items()
+        ]
+    )
+    await hass.async_block_till_done()
     for entity_id, state in zip(entity_ids, states, strict=False):
-        await async_update_entity(hass, entity_id)
+        assert hass.states.is_state(entity_id, state)
+
+
+@pytest.mark.parametrize("appliance", [TEST_HC_APP], indirect=True)
+@pytest.mark.parametrize(
+    ("initial_operation_state", "initial_state", "event_order", "entity_states"),
+    [
+        (
+            "BSH.Common.EnumType.OperationState.Ready",
+            STATE_UNAVAILABLE,
+            (EventType.STATUS, EventType.EVENT),
+            (STATE_UNKNOWN, "60"),
+        ),
+        (
+            "BSH.Common.EnumType.OperationState.Run",
+            STATE_UNKNOWN,
+            (EventType.EVENT, EventType.STATUS),
+            ("60", "60"),
+        ),
+    ],
+)
+async def test_program_sensor_edge_case(
+    initial_operation_state: str,
+    initial_state: str,
+    event_order: tuple[EventType, EventType],
+    entity_states: tuple[str, str],
+    appliance: HomeAppliance,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test edge case for the program related entities."""
+    entity_id = "sensor.dishwasher_program_progress"
+    client.get_status = AsyncMock(
+        return_value=ArrayOfStatus(
+            [
+                Status(
+                    StatusKey.BSH_COMMON_OPERATION_STATE,
+                    StatusKey.BSH_COMMON_OPERATION_STATE.value,
+                    initial_operation_state,
+                )
+            ]
+        )
+    )
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    assert hass.states.is_state(entity_id, initial_state)
+
+    for event_type, state in zip(event_order, entity_states, strict=True):
+        await client.add_events(
+            [
+                EventMessage(
+                    appliance.ha_id,
+                    event_type,
+                    ArrayOfEvents(
+                        [
+                            Event(
+                                key=event_key,
+                                raw_key=event_key.value,
+                                timestamp=0,
+                                level="",
+                                handling="",
+                                value=value,
+                            )
+                        ],
+                    ),
+                )
+                for event_key, value in EVENT_PROG_RUN[event_type].items()
+            ]
+        )
         await hass.async_block_till_done()
         assert hass.states.is_state(entity_id, state)
 
 
 # Program sequence for SensorDeviceClass.TIMESTAMP edge cases.
 PROGRAM_SEQUENCE_EDGE_CASE = [
-    EVENT_PROG_REMAIN_NO_VALUE,
+    EVENT_PROG_DELAYED_START,
     EVENT_PROG_RUN,
     EVENT_PROG_END,
     EVENT_PROG_END,
@@ -192,59 +456,85 @@ ENTITY_ID_EDGE_CASE_STATES = [
 
 
 @pytest.mark.parametrize("appliance", [TEST_HC_APP], indirect=True)
-@pytest.mark.usefixtures("bypass_throttle")
 async def test_remaining_prog_time_edge_cases(
-    appliance: Mock,
+    appliance: HomeAppliance,
     freezer: FrozenDateTimeFactory,
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: MagicMock,
+    client: MagicMock,
 ) -> None:
     """Run program sequence to test edge cases for the remaining_prog_time entity."""
-    get_appliances.return_value = [appliance]
     entity_id = "sensor.dishwasher_program_finish_time"
     time_to_freeze = "2021-01-09 12:00:00+00:00"
     freezer.move_to(time_to_freeze)
 
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    appliance.get_programs_available = MagicMock(return_value=["dummy_program"])
-    appliance.status.update(EVENT_PROG_REMAIN_NO_VALUE)
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
     for (
         event,
         expected_state,
     ) in zip(PROGRAM_SEQUENCE_EDGE_CASE, ENTITY_ID_EDGE_CASE_STATES, strict=False):
-        appliance.status.update(event)
-        await async_update_entity(hass, entity_id)
+        await client.add_events(
+            [
+                EventMessage(
+                    appliance.ha_id,
+                    event_type,
+                    ArrayOfEvents(
+                        [
+                            Event(
+                                key=event_key,
+                                raw_key=event_key.value,
+                                timestamp=0,
+                                level="",
+                                handling="",
+                                value=value,
+                            )
+                        ],
+                    ),
+                )
+                for event_type, events in event.items()
+                for event_key, value in events.items()
+            ]
+        )
         await hass.async_block_till_done()
         freezer.tick()
         assert hass.states.is_state(entity_id, expected_state)
 
 
 @pytest.mark.parametrize(
-    ("entity_id", "status_key", "event_value_update", "expected", "appliance"),
+    (
+        "entity_id",
+        "event_key",
+        "event_type",
+        "event_value_update",
+        "expected",
+        "appliance",
+    ),
     [
         (
             "sensor.dishwasher_door",
-            BSH_DOOR_STATE,
+            EventKey.BSH_COMMON_STATUS_DOOR_STATE,
+            EventType.STATUS,
             BSH_DOOR_STATE_LOCKED,
             "locked",
             "Dishwasher",
         ),
         (
             "sensor.dishwasher_door",
-            BSH_DOOR_STATE,
+            EventKey.BSH_COMMON_STATUS_DOOR_STATE,
+            EventType.STATUS,
             BSH_DOOR_STATE_CLOSED,
             "closed",
             "Dishwasher",
         ),
         (
             "sensor.dishwasher_door",
-            BSH_DOOR_STATE,
+            EventKey.BSH_COMMON_STATUS_DOOR_STATE,
+            EventType.STATUS,
             BSH_DOOR_STATE_OPEN,
             "open",
             "Dishwasher",
@@ -252,33 +542,38 @@ async def test_remaining_prog_time_edge_cases(
         (
             "sensor.fridgefreezer_freezer_door_alarm",
             "EVENT_NOT_IN_STATUS_YET_SO_SET_TO_OFF",
+            EventType.EVENT,
             "",
             "off",
             "FridgeFreezer",
         ),
         (
             "sensor.fridgefreezer_freezer_door_alarm",
-            REFRIGERATION_EVENT_DOOR_ALARM_FREEZER,
+            EventKey.REFRIGERATION_FRIDGE_FREEZER_EVENT_DOOR_ALARM_FREEZER,
+            EventType.EVENT,
             BSH_EVENT_PRESENT_STATE_OFF,
             "off",
             "FridgeFreezer",
         ),
         (
             "sensor.fridgefreezer_freezer_door_alarm",
-            REFRIGERATION_EVENT_DOOR_ALARM_FREEZER,
+            EventKey.REFRIGERATION_FRIDGE_FREEZER_EVENT_DOOR_ALARM_FREEZER,
+            EventType.EVENT,
             BSH_EVENT_PRESENT_STATE_PRESENT,
             "present",
             "FridgeFreezer",
         ),
         (
             "sensor.fridgefreezer_freezer_door_alarm",
-            REFRIGERATION_EVENT_DOOR_ALARM_FREEZER,
+            EventKey.REFRIGERATION_FRIDGE_FREEZER_EVENT_DOOR_ALARM_FREEZER,
+            EventType.EVENT,
             BSH_EVENT_PRESENT_STATE_CONFIRMED,
             "confirmed",
             "FridgeFreezer",
         ),
         (
             "sensor.coffeemaker_bean_container_empty",
+            EventType.EVENT,
             "EVENT_NOT_IN_STATUS_YET_SO_SET_TO_OFF",
             "",
             "off",
@@ -286,21 +581,24 @@ async def test_remaining_prog_time_edge_cases(
         ),
         (
             "sensor.coffeemaker_bean_container_empty",
-            COFFEE_EVENT_BEAN_CONTAINER_EMPTY,
+            EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_BEAN_CONTAINER_EMPTY,
+            EventType.EVENT,
             BSH_EVENT_PRESENT_STATE_OFF,
             "off",
             "CoffeeMaker",
         ),
         (
             "sensor.coffeemaker_bean_container_empty",
-            COFFEE_EVENT_BEAN_CONTAINER_EMPTY,
+            EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_BEAN_CONTAINER_EMPTY,
+            EventType.EVENT,
             BSH_EVENT_PRESENT_STATE_PRESENT,
             "present",
             "CoffeeMaker",
         ),
         (
             "sensor.coffeemaker_bean_container_empty",
-            COFFEE_EVENT_BEAN_CONTAINER_EMPTY,
+            EventKey.CONSUMER_PRODUCTS_COFFEE_MAKER_EVENT_BEAN_CONTAINER_EMPTY,
+            EventType.EVENT,
             BSH_EVENT_PRESENT_STATE_CONFIRMED,
             "confirmed",
             "CoffeeMaker",
@@ -308,30 +606,244 @@ async def test_remaining_prog_time_edge_cases(
     ],
     indirect=["appliance"],
 )
-@pytest.mark.usefixtures("bypass_throttle")
 async def test_sensors_states(
     entity_id: str,
-    status_key: str,
+    event_key: EventKey,
+    event_type: EventType,
     event_value_update: str,
-    appliance: Mock,
+    appliance: HomeAppliance,
     expected: str,
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: MagicMock,
+    client: MagicMock,
 ) -> None:
-    """Tests for Appliance alarm sensors."""
-    appliance.status.update(
-        HomeConnectAPI.json2dict(
-            load_json_object_fixture("home_connect/status.json")["data"]["status"]
-        )
-    )
-    get_appliances.return_value = [appliance]
+    """Tests for appliance alarm sensors."""
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
-    appliance.status.update({status_key: {"value": event_value_update}})
-    await async_update_entity(hass, entity_id)
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                event_type,
+                ArrayOfEvents(
+                    [
+                        Event(
+                            key=event_key,
+                            raw_key=str(event_key),
+                            timestamp=0,
+                            level="",
+                            handling="",
+                            value=event_value_update,
+                        )
+                    ],
+                ),
+            ),
+        ]
+    )
     await hass.async_block_till_done()
     assert hass.states.is_state(entity_id, expected)
+
+
+@pytest.mark.parametrize(
+    (
+        "appliance",
+        "entity_id",
+        "status_key",
+        "unit_get_status",
+        "unit_get_status_value",
+        "get_status_value_call_count",
+    ),
+    [
+        (
+            "Oven",
+            "sensor.oven_current_oven_cavity_temperature",
+            StatusKey.COOKING_OVEN_CURRENT_CAVITY_TEMPERATURE,
+            "°C",
+            None,
+            0,
+        ),
+        (
+            "Oven",
+            "sensor.oven_current_oven_cavity_temperature",
+            StatusKey.COOKING_OVEN_CURRENT_CAVITY_TEMPERATURE,
+            None,
+            "°C",
+            1,
+        ),
+    ],
+    indirect=["appliance"],
+)
+async def test_sensor_unit_fetching(
+    appliance: HomeAppliance,
+    entity_id: str,
+    status_key: StatusKey,
+    unit_get_status: str | None,
+    unit_get_status_value: str | None,
+    get_status_value_call_count: int,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test that the sensor entities are capable of fetching units."""
+
+    async def get_status_mock(ha_id: str) -> ArrayOfStatus:
+        if ha_id != appliance.ha_id:
+            return ArrayOfStatus([])
+        return ArrayOfStatus(
+            [
+                Status(
+                    key=status_key,
+                    raw_key=status_key.value,
+                    value=0,
+                    unit=unit_get_status,
+                )
+            ]
+        )
+
+    client.get_status = AsyncMock(side_effect=get_status_mock)
+    client.get_status_value = AsyncMock(
+        return_value=Status(
+            key=status_key,
+            raw_key=status_key.value,
+            value=0,
+            unit=unit_get_status_value,
+        )
+    )
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    entity_state = hass.states.get(entity_id)
+    assert entity_state
+    assert (
+        entity_state.attributes["unit_of_measurement"] == unit_get_status
+        or unit_get_status_value
+    )
+
+    assert client.get_status_value.call_count == get_status_value_call_count
+
+
+@pytest.mark.parametrize(
+    (
+        "appliance",
+        "entity_id",
+        "status_key",
+    ),
+    [
+        (
+            "Oven",
+            "sensor.oven_current_oven_cavity_temperature",
+            StatusKey.COOKING_OVEN_CURRENT_CAVITY_TEMPERATURE,
+        ),
+    ],
+    indirect=["appliance"],
+)
+async def test_sensor_unit_fetching_error(
+    appliance: HomeAppliance,
+    entity_id: str,
+    status_key: StatusKey,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test that the sensor entities are capable of fetching units."""
+
+    async def get_status_mock(ha_id: str) -> ArrayOfStatus:
+        if ha_id != appliance.ha_id:
+            return ArrayOfStatus([])
+        return ArrayOfStatus(
+            [
+                Status(
+                    key=status_key,
+                    raw_key=status_key.value,
+                    value=0,
+                )
+            ]
+        )
+
+    client.get_status = AsyncMock(side_effect=get_status_mock)
+    client.get_status_value = AsyncMock(side_effect=HomeConnectError())
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    assert hass.states.get(entity_id)
+
+
+@pytest.mark.parametrize(
+    (
+        "appliance",
+        "entity_id",
+        "status_key",
+        "unit",
+    ),
+    [
+        (
+            "Oven",
+            "sensor.oven_current_oven_cavity_temperature",
+            StatusKey.COOKING_OVEN_CURRENT_CAVITY_TEMPERATURE,
+            "°C",
+        ),
+    ],
+    indirect=["appliance"],
+)
+async def test_sensor_unit_fetching_after_rate_limit_error(
+    appliance: HomeAppliance,
+    entity_id: str,
+    status_key: StatusKey,
+    unit: str,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test that the sensor entities are capable of fetching units."""
+
+    async def get_status_mock(ha_id: str) -> ArrayOfStatus:
+        if ha_id != appliance.ha_id:
+            return ArrayOfStatus([])
+        return ArrayOfStatus(
+            [
+                Status(
+                    key=status_key,
+                    raw_key=status_key.value,
+                    value=0,
+                )
+            ]
+        )
+
+    client.get_status = AsyncMock(side_effect=get_status_mock)
+    client.get_status_value = AsyncMock(
+        side_effect=[
+            TooManyRequestsError("error.key", retry_after=0),
+            Status(
+                key=status_key,
+                raw_key=status_key.value,
+                value=0,
+                unit=unit,
+            ),
+        ]
+    )
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    assert client.get_status_value.call_count == 2
+
+    entity_state = hass.states.get(entity_id)
+    assert entity_state
+    assert entity_state.attributes["unit_of_measurement"] == unit
diff --git a/tests/components/home_connect/test_services.py b/tests/components/home_connect/test_services.py
new file mode 100644
index 00000000000..2915cbe4f69
--- /dev/null
+++ b/tests/components/home_connect/test_services.py
@@ -0,0 +1,474 @@
+"""Tests for the Home Connect actions."""
+
+from collections.abc import Awaitable, Callable
+from http import HTTPStatus
+from typing import Any
+from unittest.mock import MagicMock
+
+from aiohomeconnect.model import HomeAppliance, OptionKey, ProgramKey, SettingKey
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.home_connect.const import DOMAIN
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
+from homeassistant.helpers import device_registry as dr
+import homeassistant.helpers.issue_registry as ir
+
+from tests.common import MockConfigEntry
+from tests.typing import ClientSessionGenerator
+
+DEPRECATED_SERVICE_KV_CALL_PARAMS = [
+    {
+        "domain": DOMAIN,
+        "service": "set_option_active",
+        "service_data": {
+            "device_id": "DEVICE_ID",
+            "key": OptionKey.BSH_COMMON_FINISH_IN_RELATIVE.value,
+            "value": 43200,
+            "unit": "seconds",
+        },
+        "blocking": True,
+    },
+    {
+        "domain": DOMAIN,
+        "service": "set_option_selected",
+        "service_data": {
+            "device_id": "DEVICE_ID",
+            "key": OptionKey.LAUNDRY_CARE_WASHER_TEMPERATURE.value,
+            "value": "LaundryCare.Washer.EnumType.Temperature.GC40",
+        },
+        "blocking": True,
+    },
+]
+
+SERVICE_KV_CALL_PARAMS = [
+    *DEPRECATED_SERVICE_KV_CALL_PARAMS,
+    {
+        "domain": DOMAIN,
+        "service": "change_setting",
+        "service_data": {
+            "device_id": "DEVICE_ID",
+            "key": SettingKey.BSH_COMMON_CHILD_LOCK.value,
+            "value": True,
+        },
+        "blocking": True,
+    },
+]
+
+SERVICE_COMMAND_CALL_PARAMS = [
+    {
+        "domain": DOMAIN,
+        "service": "pause_program",
+        "service_data": {
+            "device_id": "DEVICE_ID",
+        },
+        "blocking": True,
+    },
+    {
+        "domain": DOMAIN,
+        "service": "resume_program",
+        "service_data": {
+            "device_id": "DEVICE_ID",
+        },
+        "blocking": True,
+    },
+]
+
+
+SERVICE_PROGRAM_CALL_PARAMS = [
+    {
+        "domain": DOMAIN,
+        "service": "select_program",
+        "service_data": {
+            "device_id": "DEVICE_ID",
+            "program": ProgramKey.LAUNDRY_CARE_WASHER_COTTON.value,
+            "key": OptionKey.LAUNDRY_CARE_WASHER_TEMPERATURE.value,
+            "value": "LaundryCare.Washer.EnumType.Temperature.GC40",
+        },
+        "blocking": True,
+    },
+    {
+        "domain": DOMAIN,
+        "service": "start_program",
+        "service_data": {
+            "device_id": "DEVICE_ID",
+            "program": ProgramKey.LAUNDRY_CARE_WASHER_COTTON.value,
+            "key": OptionKey.BSH_COMMON_FINISH_IN_RELATIVE.value,
+            "value": 43200,
+            "unit": "seconds",
+        },
+        "blocking": True,
+    },
+]
+
+SERVICE_APPLIANCE_METHOD_MAPPING = {
+    "set_option_active": "set_active_program_option",
+    "set_option_selected": "set_selected_program_option",
+    "change_setting": "set_setting",
+    "pause_program": "put_command",
+    "resume_program": "put_command",
+    "select_program": "set_selected_program",
+    "start_program": "start_program",
+}
+
+SERVICE_VALIDATION_ERROR_MAPPING = {
+    "set_option_active": r"Error.*setting.*options.*active.*program.*",
+    "set_option_selected": r"Error.*setting.*options.*selected.*program.*",
+    "change_setting": r"Error.*assigning.*value.*setting.*",
+    "pause_program": r"Error.*executing.*command.*",
+    "resume_program": r"Error.*executing.*command.*",
+    "select_program": r"Error.*selecting.*program.*",
+    "start_program": r"Error.*starting.*program.*",
+}
+
+
+SERVICES_SET_PROGRAM_AND_OPTIONS = [
+    {
+        "domain": DOMAIN,
+        "service": "set_program_and_options",
+        "service_data": {
+            "device_id": "DEVICE_ID",
+            "affects_to": "selected_program",
+            "program": "dishcare_dishwasher_program_eco_50",
+            "b_s_h_common_option_start_in_relative": 1800,
+        },
+        "blocking": True,
+    },
+    {
+        "domain": DOMAIN,
+        "service": "set_program_and_options",
+        "service_data": {
+            "device_id": "DEVICE_ID",
+            "affects_to": "active_program",
+            "program": "consumer_products_coffee_maker_program_beverage_coffee",
+            "consumer_products_coffee_maker_option_bean_amount": "consumer_products_coffee_maker_enum_type_bean_amount_normal",
+        },
+        "blocking": True,
+    },
+    {
+        "domain": DOMAIN,
+        "service": "set_program_and_options",
+        "service_data": {
+            "device_id": "DEVICE_ID",
+            "affects_to": "active_program",
+            "consumer_products_coffee_maker_option_coffee_milk_ratio": "consumer_products_coffee_maker_enum_type_coffee_milk_ratio_50_percent",
+        },
+        "blocking": True,
+    },
+    {
+        "domain": DOMAIN,
+        "service": "set_program_and_options",
+        "service_data": {
+            "device_id": "DEVICE_ID",
+            "affects_to": "selected_program",
+            "consumer_products_coffee_maker_option_fill_quantity": 35,
+        },
+        "blocking": True,
+    },
+]
+
+
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+@pytest.mark.parametrize(
+    "service_call",
+    SERVICE_KV_CALL_PARAMS + SERVICE_COMMAND_CALL_PARAMS + SERVICE_PROGRAM_CALL_PARAMS,
+)
+async def test_key_value_services(
+    service_call: dict[str, Any],
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    appliance: HomeAppliance,
+) -> None:
+    """Create and test services."""
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        identifiers={(DOMAIN, appliance.ha_id)},
+    )
+
+    service_name = service_call["service"]
+    service_call["service_data"]["device_id"] = device_entry.id
+    await hass.services.async_call(**service_call)
+    await hass.async_block_till_done()
+    assert (
+        getattr(client, SERVICE_APPLIANCE_METHOD_MAPPING[service_name]).call_count == 1
+    )
+
+
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+@pytest.mark.parametrize(
+    ("service_call", "issue_id"),
+    [
+        *zip(
+            DEPRECATED_SERVICE_KV_CALL_PARAMS + SERVICE_PROGRAM_CALL_PARAMS,
+            ["deprecated_set_program_and_option_actions"]
+            * (
+                len(DEPRECATED_SERVICE_KV_CALL_PARAMS)
+                + len(SERVICE_PROGRAM_CALL_PARAMS)
+            ),
+            strict=True,
+        ),
+        *zip(
+            SERVICE_COMMAND_CALL_PARAMS,
+            ["deprecated_command_actions"] * len(SERVICE_COMMAND_CALL_PARAMS),
+            strict=True,
+        ),
+    ],
+)
+async def test_programs_and_options_actions_deprecation(
+    service_call: dict[str, Any],
+    issue_id: str,
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    appliance: HomeAppliance,
+    issue_registry: ir.IssueRegistry,
+    hass_client: ClientSessionGenerator,
+) -> None:
+    """Test deprecated service keys."""
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        identifiers={(DOMAIN, appliance.ha_id)},
+    )
+
+    service_call["service_data"]["device_id"] = device_entry.id
+    await hass.services.async_call(**service_call)
+    await hass.async_block_till_done()
+
+    assert len(issue_registry.issues) == 1
+    issue = issue_registry.async_get_issue(DOMAIN, issue_id)
+    assert issue
+
+    _client = await hass_client()
+    resp = await _client.post(
+        "/api/repairs/issues/fix",
+        json={"handler": DOMAIN, "issue_id": issue.issue_id},
+    )
+    assert resp.status == HTTPStatus.OK
+    flow_id = (await resp.json())["flow_id"]
+    resp = await _client.post(f"/api/repairs/issues/fix/{flow_id}")
+
+    assert not issue_registry.async_get_issue(DOMAIN, issue_id)
+    assert len(issue_registry.issues) == 0
+
+    await hass.services.async_call(**service_call)
+    await hass.async_block_till_done()
+
+    assert len(issue_registry.issues) == 1
+    assert issue_registry.async_get_issue(DOMAIN, issue_id)
+
+    await hass.config_entries.async_unload(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    # Assert the issue is no longer present
+    assert not issue_registry.async_get_issue(DOMAIN, issue_id)
+    assert len(issue_registry.issues) == 0
+
+
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+@pytest.mark.parametrize(
+    ("service_call", "called_method"),
+    zip(
+        SERVICES_SET_PROGRAM_AND_OPTIONS,
+        [
+            "set_selected_program",
+            "start_program",
+            "set_active_program_options",
+            "set_selected_program_options",
+        ],
+        strict=True,
+    ),
+)
+async def test_set_program_and_options(
+    service_call: dict[str, Any],
+    called_method: str,
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    appliance: HomeAppliance,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test recognized options."""
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        identifiers={(DOMAIN, appliance.ha_id)},
+    )
+
+    service_call["service_data"]["device_id"] = device_entry.id
+    await hass.services.async_call(**service_call)
+    await hass.async_block_till_done()
+    method_mock: MagicMock = getattr(client, called_method)
+    assert method_mock.call_count == 1
+    assert method_mock.call_args == snapshot
+
+
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+@pytest.mark.parametrize(
+    ("service_call", "error_regex"),
+    zip(
+        SERVICES_SET_PROGRAM_AND_OPTIONS,
+        [
+            r"Error.*selecting.*program.*",
+            r"Error.*starting.*program.*",
+            r"Error.*setting.*options.*active.*program.*",
+            r"Error.*setting.*options.*selected.*program.*",
+        ],
+        strict=True,
+    ),
+)
+async def test_set_program_and_options_exceptions(
+    service_call: dict[str, Any],
+    error_regex: str,
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client_with_exception: MagicMock,
+    appliance: HomeAppliance,
+) -> None:
+    """Test recognized options."""
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client_with_exception)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        identifiers={(DOMAIN, appliance.ha_id)},
+    )
+
+    service_call["service_data"]["device_id"] = device_entry.id
+    with pytest.raises(HomeAssistantError, match=error_regex):
+        await hass.services.async_call(**service_call)
+
+
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+@pytest.mark.parametrize(
+    "service_call",
+    SERVICE_KV_CALL_PARAMS + SERVICE_COMMAND_CALL_PARAMS + SERVICE_PROGRAM_CALL_PARAMS,
+)
+async def test_services_exception_device_id(
+    service_call: dict[str, Any],
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client_with_exception: MagicMock,
+    appliance: HomeAppliance,
+    device_registry: dr.DeviceRegistry,
+) -> None:
+    """Raise a HomeAssistantError when there is an API error."""
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client_with_exception)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        identifiers={(DOMAIN, appliance.ha_id)},
+    )
+
+    service_call["service_data"]["device_id"] = device_entry.id
+
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(**service_call)
+
+
+async def test_services_appliance_not_found(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+) -> None:
+    """Raise a ServiceValidationError when device id does not match."""
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    service_call = SERVICE_KV_CALL_PARAMS[0]
+
+    service_call["service_data"]["device_id"] = "DOES_NOT_EXISTS"
+
+    with pytest.raises(ServiceValidationError, match=r"Device entry.*not found"):
+        await hass.services.async_call(**service_call)
+
+    unrelated_config_entry = MockConfigEntry(
+        domain="TEST",
+    )
+    unrelated_config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=unrelated_config_entry.entry_id,
+        identifiers={("RANDOM", "ABCD")},
+    )
+    service_call["service_data"]["device_id"] = device_entry.id
+
+    with pytest.raises(ServiceValidationError, match=r"Config entry.*not found"):
+        await hass.services.async_call(**service_call)
+
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        identifiers={("RANDOM", "ABCD")},
+    )
+    service_call["service_data"]["device_id"] = device_entry.id
+
+    with pytest.raises(ServiceValidationError, match=r"Appliance.*not found"):
+        await hass.services.async_call(**service_call)
+
+
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+@pytest.mark.parametrize(
+    "service_call",
+    SERVICE_KV_CALL_PARAMS + SERVICE_COMMAND_CALL_PARAMS + SERVICE_PROGRAM_CALL_PARAMS,
+)
+async def test_services_exception(
+    service_call: dict[str, Any],
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client_with_exception: MagicMock,
+    appliance: HomeAppliance,
+    device_registry: dr.DeviceRegistry,
+) -> None:
+    """Raise a ValueError when device id does not match."""
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client_with_exception)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        identifiers={(DOMAIN, appliance.ha_id)},
+    )
+
+    service_call["service_data"]["device_id"] = device_entry.id
+
+    service_name = service_call["service"]
+    with pytest.raises(
+        HomeAssistantError,
+        match=SERVICE_VALIDATION_ERROR_MAPPING[service_name],
+    ):
+        await hass.services.async_call(**service_call)
diff --git a/tests/components/home_connect/test_switch.py b/tests/components/home_connect/test_switch.py
index 9d54feeaa54..01f9cad5d2e 100644
--- a/tests/components/home_connect/test_switch.py
+++ b/tests/components/home_connect/test_switch.py
@@ -1,24 +1,42 @@
 """Tests for home_connect sensor entities."""
 
-from collections.abc import Awaitable, Callable, Generator
-from unittest.mock import MagicMock, Mock
+from collections.abc import Awaitable, Callable
+from http import HTTPStatus
+from typing import Any
+from unittest.mock import AsyncMock, MagicMock
 
-from homeconnect.api import HomeConnectAppliance, HomeConnectError
+from aiohomeconnect.model import (
+    ArrayOfEvents,
+    ArrayOfPrograms,
+    ArrayOfSettings,
+    Event,
+    EventKey,
+    EventMessage,
+    EventType,
+    GetSetting,
+    HomeAppliance,
+    OptionKey,
+    ProgramDefinition,
+    ProgramKey,
+    SettingKey,
+)
+from aiohomeconnect.model.error import (
+    ActiveProgramNotSetError,
+    HomeConnectApiError,
+    HomeConnectError,
+    SelectedProgramNotSetError,
+)
+from aiohomeconnect.model.program import EnumerateProgram, ProgramDefinitionOption
+from aiohomeconnect.model.setting import SettingConstraints
 import pytest
 
 from homeassistant.components import automation, script
 from homeassistant.components.automation import automations_with_entity
 from homeassistant.components.home_connect.const import (
-    ATTR_ALLOWED_VALUES,
-    ATTR_CONSTRAINTS,
-    BSH_ACTIVE_PROGRAM,
-    BSH_CHILD_LOCK_STATE,
     BSH_POWER_OFF,
     BSH_POWER_ON,
     BSH_POWER_STANDBY,
-    BSH_POWER_STATE,
     DOMAIN,
-    REFRIGERATION_SUPERMODEFREEZER,
 )
 from homeassistant.components.script import scripts_with_entity
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
@@ -29,26 +47,20 @@ from homeassistant.const import (
     SERVICE_TURN_ON,
     STATE_OFF,
     STATE_ON,
+    STATE_UNAVAILABLE,
     Platform,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.issue_registry as ir
+from homeassistant.helpers import (
+    device_registry as dr,
+    entity_registry as er,
+    issue_registry as ir,
+)
 from homeassistant.setup import async_setup_component
 
-from .conftest import get_all_appliances
-
-from tests.common import MockConfigEntry, load_json_object_fixture
-
-SETTINGS_STATUS = {
-    setting.pop("key"): setting
-    for setting in load_json_object_fixture("home_connect/settings.json")
-    .get("Dishwasher")
-    .get("data")
-    .get("settings")
-}
-
-PROGRAM = "LaundryCare.Dryer.Program.Mix"
+from tests.common import MockConfigEntry
+from tests.typing import ClientSessionGenerator
 
 
 @pytest.fixture
@@ -58,48 +70,226 @@ def platforms() -> list[str]:
 
 
 async def test_switches(
-    bypass_throttle: Generator[None],
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: Mock,
+    client: MagicMock,
 ) -> None:
     """Test switch entities."""
-    get_appliances.side_effect = get_all_appliances
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
 
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+async def test_paired_depaired_devices_flow(
+    appliance: HomeAppliance,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that removed devices are correctly removed from and added to hass on API events."""
+    client.get_available_program = AsyncMock(
+        return_value=ProgramDefinition(
+            ProgramKey.UNKNOWN,
+            options=[
+                ProgramDefinitionOption(
+                    OptionKey.LAUNDRY_CARE_WASHER_I_DOS_1_ACTIVE,
+                    "Boolean",
+                )
+            ],
+        )
+    )
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+    assert entity_entries
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.DEPAIRED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert not device
+    for entity_entry in entity_entries:
+        assert not entity_registry.async_get(entity_entry.entity_id)
+
+    # Now that all everything related to the device is removed, pair it again
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.PAIRED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    assert device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    for entity_entry in entity_entries:
+        assert entity_registry.async_get(entity_entry.entity_id)
+
+
+@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
+async def test_connected_devices(
+    appliance: HomeAppliance,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that devices reconnected.
+
+    Specifically those devices whose settings, status, etc. could
+    not be obtained while disconnected and once connected, the entities are added.
+    """
+    get_settings_original_mock = client.get_settings
+    get_available_programs_mock = client.get_available_programs
+
+    async def get_settings_side_effect(ha_id: str):
+        if ha_id == appliance.ha_id:
+            raise HomeConnectApiError(
+                "SDK.Error.HomeAppliance.Connection.Initialization.Failed"
+            )
+        return await get_settings_original_mock.side_effect(ha_id)
+
+    async def get_available_programs_side_effect(ha_id: str):
+        if ha_id == appliance.ha_id:
+            raise HomeConnectApiError(
+                "SDK.Error.HomeAppliance.Connection.Initialization.Failed"
+            )
+        return await get_available_programs_mock.side_effect(ha_id)
+
+    client.get_settings = AsyncMock(side_effect=get_settings_side_effect)
+    client.get_available_programs = AsyncMock(
+        side_effect=get_available_programs_side_effect
+    )
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+    client.get_settings = get_settings_original_mock
+    client.get_available_programs = get_available_programs_mock
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.CONNECTED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    new_entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+    assert len(new_entity_entries) > len(entity_entries)
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+@pytest.mark.parametrize("appliance", ["Dishwasher"], indirect=True)
+async def test_switch_entity_availability(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    appliance: HomeAppliance,
+) -> None:
+    """Test if switch entities availability are based on the appliance connection state."""
+    entity_ids = [
+        "switch.dishwasher_power",
+        "switch.dishwasher_child_lock",
+        "switch.dishwasher_program_eco50",
+    ]
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    for entity_id in entity_ids:
+        state = hass.states.get(entity_id)
+        assert state
+        assert state.state != STATE_UNAVAILABLE
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.DISCONNECTED,
+                ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    for entity_id in entity_ids:
+        assert hass.states.is_state(entity_id, STATE_UNAVAILABLE)
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.CONNECTED,
+                ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    for entity_id in entity_ids:
+        state = hass.states.get(entity_id)
+        assert state
+        assert state.state != STATE_UNAVAILABLE
+
+
 @pytest.mark.parametrize(
-    ("entity_id", "status", "service", "state", "appliance"),
+    (
+        "entity_id",
+        "service",
+        "settings_key_arg",
+        "setting_value_arg",
+        "state",
+        "appliance",
+    ),
     [
-        (
-            "switch.dishwasher_program_mix",
-            {BSH_ACTIVE_PROGRAM: {"value": PROGRAM}},
-            SERVICE_TURN_ON,
-            STATE_ON,
-            "Dishwasher",
-        ),
-        (
-            "switch.dishwasher_program_mix",
-            {BSH_ACTIVE_PROGRAM: {"value": ""}},
-            SERVICE_TURN_OFF,
-            STATE_OFF,
-            "Dishwasher",
-        ),
         (
             "switch.dishwasher_child_lock",
-            {BSH_CHILD_LOCK_STATE: {"value": True}},
             SERVICE_TURN_ON,
+            SettingKey.BSH_COMMON_CHILD_LOCK,
+            True,
             STATE_ON,
             "Dishwasher",
         ),
         (
             "switch.dishwasher_child_lock",
-            {BSH_CHILD_LOCK_STATE: {"value": False}},
             SERVICE_TURN_OFF,
+            SettingKey.BSH_COMMON_CHILD_LOCK,
+            False,
             STATE_OFF,
             "Dishwasher",
         ),
@@ -108,127 +298,209 @@ async def test_switches(
 )
 async def test_switch_functionality(
     entity_id: str,
-    status: dict,
+    settings_key_arg: SettingKey,
+    setting_value_arg: Any,
     service: str,
     state: str,
-    bypass_throttle: Generator[None],
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    appliance: Mock,
-    get_appliances: MagicMock,
+    appliance: HomeAppliance,
+    client: MagicMock,
 ) -> None:
     """Test switch functionality."""
-    appliance.status.update(SETTINGS_STATUS)
-    appliance.get_programs_available.return_value = [PROGRAM]
-    get_appliances.return_value = [appliance]
 
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
-    appliance.status.update(status)
-    await hass.services.async_call(
-        SWITCH_DOMAIN, service, {"entity_id": entity_id}, blocking=True
+    await hass.services.async_call(SWITCH_DOMAIN, service, {ATTR_ENTITY_ID: entity_id})
+    await hass.async_block_till_done()
+    client.set_setting.assert_awaited_once_with(
+        appliance.ha_id, setting_key=settings_key_arg, value=setting_value_arg
     )
     assert hass.states.is_state(entity_id, state)
 
 
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+@pytest.mark.parametrize(
+    ("entity_id", "program_key", "initial_state", "appliance"),
+    [
+        (
+            "switch.dryer_program_mix",
+            ProgramKey.LAUNDRY_CARE_DRYER_MIX,
+            STATE_OFF,
+            "Dryer",
+        ),
+        (
+            "switch.dryer_program_cotton",
+            ProgramKey.LAUNDRY_CARE_DRYER_COTTON,
+            STATE_ON,
+            "Dryer",
+        ),
+    ],
+    indirect=["appliance"],
+)
+async def test_program_switch_functionality(
+    entity_id: str,
+    program_key: ProgramKey,
+    initial_state: str,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    appliance: HomeAppliance,
+    client: MagicMock,
+) -> None:
+    """Test switch functionality."""
+
+    async def mock_stop_program(ha_id: str) -> None:
+        """Mock stop program."""
+        await client.add_events(
+            [
+                EventMessage(
+                    ha_id,
+                    EventType.NOTIFY,
+                    ArrayOfEvents(
+                        [
+                            Event(
+                                key=EventKey.BSH_COMMON_ROOT_ACTIVE_PROGRAM,
+                                raw_key=EventKey.BSH_COMMON_ROOT_ACTIVE_PROGRAM.value,
+                                timestamp=0,
+                                level="",
+                                handling="",
+                                value=ProgramKey.UNKNOWN,
+                            )
+                        ]
+                    ),
+                ),
+            ]
+        )
+
+    client.stop_program = AsyncMock(side_effect=mock_stop_program)
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+    assert hass.states.is_state(entity_id, initial_state)
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: entity_id}
+    )
+    await hass.async_block_till_done()
+    assert hass.states.is_state(entity_id, STATE_ON)
+    client.start_program.assert_awaited_once_with(
+        appliance.ha_id, program_key=program_key
+    )
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: entity_id}
+    )
+    await hass.async_block_till_done()
+    assert hass.states.is_state(entity_id, STATE_OFF)
+    client.stop_program.assert_awaited_once_with(appliance.ha_id)
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
 @pytest.mark.parametrize(
     (
         "entity_id",
-        "status",
         "service",
         "mock_attr",
-        "problematic_appliance",
         "exception_match",
     ),
     [
         (
-            "switch.dishwasher_program_mix",
-            {BSH_ACTIVE_PROGRAM: {"value": PROGRAM}},
+            "switch.dishwasher_program_eco50",
             SERVICE_TURN_ON,
             "start_program",
-            "Dishwasher",
             r"Error.*start.*program.*",
         ),
         (
-            "switch.dishwasher_program_mix",
-            {BSH_ACTIVE_PROGRAM: {"value": PROGRAM}},
+            "switch.dishwasher_program_eco50",
             SERVICE_TURN_OFF,
             "stop_program",
-            "Dishwasher",
             r"Error.*stop.*program.*",
         ),
         (
             "switch.dishwasher_power",
-            {BSH_POWER_STATE: {"value": BSH_POWER_OFF}},
             SERVICE_TURN_OFF,
             "set_setting",
-            "Dishwasher",
             r"Error.*turn.*off.*",
         ),
         (
             "switch.dishwasher_power",
-            {BSH_POWER_STATE: {"value": ""}},
             SERVICE_TURN_ON,
             "set_setting",
-            "Dishwasher",
             r"Error.*turn.*on.*",
         ),
         (
             "switch.dishwasher_child_lock",
-            {BSH_CHILD_LOCK_STATE: {"value": ""}},
             SERVICE_TURN_ON,
             "set_setting",
-            "Dishwasher",
             r"Error.*turn.*on.*",
         ),
         (
             "switch.dishwasher_child_lock",
-            {BSH_CHILD_LOCK_STATE: {"value": ""}},
             SERVICE_TURN_OFF,
             "set_setting",
-            "Dishwasher",
             r"Error.*turn.*off.*",
         ),
     ],
-    indirect=["problematic_appliance"],
 )
 async def test_switch_exception_handling(
     entity_id: str,
-    status: dict,
     service: str,
     mock_attr: str,
     exception_match: str,
-    bypass_throttle: Generator[None],
     hass: HomeAssistant,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     config_entry: MockConfigEntry,
     setup_credentials: None,
-    problematic_appliance: Mock,
-    get_appliances: MagicMock,
+    client_with_exception: MagicMock,
 ) -> None:
     """Test exception handling."""
-    problematic_appliance.get_programs_available.side_effect = None
-    problematic_appliance.get_programs_available.return_value = [PROGRAM]
-    get_appliances.return_value = [problematic_appliance]
+    client_with_exception.get_all_programs.side_effect = None
+    client_with_exception.get_all_programs.return_value = ArrayOfPrograms(
+        [
+            EnumerateProgram(
+                key=ProgramKey.DISHCARE_DISHWASHER_ECO_50,
+                raw_key=ProgramKey.DISHCARE_DISHWASHER_ECO_50.value,
+            )
+        ]
+    )
+    client_with_exception.get_settings.side_effect = None
+    client_with_exception.get_settings.return_value = ArrayOfSettings(
+        [
+            GetSetting(
+                key=SettingKey.BSH_COMMON_CHILD_LOCK,
+                raw_key=SettingKey.BSH_COMMON_CHILD_LOCK.value,
+                value=False,
+            ),
+            GetSetting(
+                key=SettingKey.BSH_COMMON_POWER_STATE,
+                raw_key=SettingKey.BSH_COMMON_POWER_STATE.value,
+                value=BSH_POWER_ON,
+                constraints=SettingConstraints(
+                    allowed_values=[BSH_POWER_ON, BSH_POWER_OFF]
+                ),
+            ),
+        ]
+    )
 
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    problematic_appliance.status.update(status)
-    assert await integration_setup()
+    assert await integration_setup(client_with_exception)
     assert config_entry.state == ConfigEntryState.LOADED
 
     # Assert that an exception is called.
     with pytest.raises(HomeConnectError):
-        getattr(problematic_appliance, mock_attr)()
+        await getattr(client_with_exception, mock_attr)()
 
     with pytest.raises(HomeAssistantError, match=exception_match):
         await hass.services.async_call(
-            SWITCH_DOMAIN, service, {"entity_id": entity_id}, blocking=True
+            SWITCH_DOMAIN, service, {ATTR_ENTITY_ID: entity_id}, blocking=True
         )
-    assert getattr(problematic_appliance, mock_attr).call_count == 2
+    assert getattr(client_with_exception, mock_attr).call_count == 2
 
 
 @pytest.mark.parametrize(
@@ -236,14 +508,14 @@ async def test_switch_exception_handling(
     [
         (
             "switch.fridgefreezer_freezer_super_mode",
-            {REFRIGERATION_SUPERMODEFREEZER: {"value": True}},
+            {SettingKey.REFRIGERATION_FRIDGE_FREEZER_SUPER_MODE_FREEZER: True},
             SERVICE_TURN_ON,
             STATE_ON,
             "FridgeFreezer",
         ),
         (
             "switch.fridgefreezer_freezer_super_mode",
-            {REFRIGERATION_SUPERMODEFREEZER: {"value": False}},
+            {SettingKey.REFRIGERATION_FRIDGE_FREEZER_SUPER_MODE_FREEZER: False},
             SERVICE_TURN_OFF,
             STATE_OFF,
             "FridgeFreezer",
@@ -256,33 +528,21 @@ async def test_ent_desc_switch_functionality(
     status: dict,
     service: str,
     state: str,
-    bypass_throttle: Generator[None],
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    appliance: Mock,
-    get_appliances: MagicMock,
+    appliance: HomeAppliance,
+    client: MagicMock,
 ) -> None:
     """Test switch functionality - entity description setup."""
-    appliance.status.update(
-        HomeConnectAppliance.json2dict(
-            load_json_object_fixture("home_connect/settings.json")
-            .get(appliance.name)
-            .get("data")
-            .get("settings")
-        )
-    )
-    get_appliances.return_value = [appliance]
 
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
-    appliance.status.update(status)
-    await hass.services.async_call(
-        SWITCH_DOMAIN, service, {ATTR_ENTITY_ID: entity_id}, blocking=True
-    )
+    await hass.services.async_call(SWITCH_DOMAIN, service, {ATTR_ENTITY_ID: entity_id})
+    await hass.async_block_till_done()
     assert hass.states.is_state(entity_id, state)
 
 
@@ -292,13 +552,13 @@ async def test_ent_desc_switch_functionality(
         "status",
         "service",
         "mock_attr",
-        "problematic_appliance",
+        "appliance",
         "exception_match",
     ),
     [
         (
             "switch.fridgefreezer_freezer_super_mode",
-            {REFRIGERATION_SUPERMODEFREEZER: {"value": ""}},
+            {SettingKey.REFRIGERATION_FRIDGE_FREEZER_SUPER_MODE_FREEZER: ""},
             SERVICE_TURN_ON,
             "set_setting",
             "FridgeFreezer",
@@ -306,204 +566,264 @@ async def test_ent_desc_switch_functionality(
         ),
         (
             "switch.fridgefreezer_freezer_super_mode",
-            {REFRIGERATION_SUPERMODEFREEZER: {"value": ""}},
+            {SettingKey.REFRIGERATION_FRIDGE_FREEZER_SUPER_MODE_FREEZER: ""},
             SERVICE_TURN_OFF,
             "set_setting",
             "FridgeFreezer",
             r"Error.*turn.*off.*",
         ),
     ],
-    indirect=["problematic_appliance"],
+    indirect=["appliance"],
 )
 async def test_ent_desc_switch_exception_handling(
     entity_id: str,
-    status: dict,
+    status: dict[SettingKey, str],
     service: str,
     mock_attr: str,
     exception_match: str,
-    bypass_throttle: Generator[None],
     hass: HomeAssistant,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     config_entry: MockConfigEntry,
     setup_credentials: None,
-    problematic_appliance: Mock,
-    get_appliances: MagicMock,
+    appliance: HomeAppliance,
+    client_with_exception: MagicMock,
 ) -> None:
     """Test switch exception handling - entity description setup."""
-    problematic_appliance.status.update(
-        HomeConnectAppliance.json2dict(
-            load_json_object_fixture("home_connect/settings.json")
-            .get(problematic_appliance.name)
-            .get("data")
-            .get("settings")
-        )
+    client_with_exception.get_settings.side_effect = None
+    client_with_exception.get_settings.return_value = ArrayOfSettings(
+        [
+            GetSetting(
+                key=key,
+                raw_key=key.value,
+                value=value,
+            )
+            for key, value in status.items()
+        ]
     )
-    get_appliances.return_value = [problematic_appliance]
-
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client_with_exception)
     assert config_entry.state == ConfigEntryState.LOADED
 
     # Assert that an exception is called.
     with pytest.raises(HomeConnectError):
-        getattr(problematic_appliance, mock_attr)()
-
-    problematic_appliance.status.update(status)
+        await client_with_exception.set_setting()
     with pytest.raises(HomeAssistantError, match=exception_match):
         await hass.services.async_call(
             SWITCH_DOMAIN, service, {ATTR_ENTITY_ID: entity_id}, blocking=True
         )
-    assert getattr(problematic_appliance, mock_attr).call_count == 2
+    assert client_with_exception.set_setting.call_count == 2
 
 
 @pytest.mark.parametrize(
-    ("entity_id", "status", "allowed_values", "service", "power_state", "appliance"),
+    (
+        "entity_id",
+        "allowed_values",
+        "service",
+        "setting_value_arg",
+        "power_state",
+        "appliance",
+    ),
     [
         (
             "switch.dishwasher_power",
-            {BSH_POWER_STATE: {"value": BSH_POWER_ON}},
             [BSH_POWER_ON, BSH_POWER_OFF],
             SERVICE_TURN_ON,
+            BSH_POWER_ON,
             STATE_ON,
             "Dishwasher",
         ),
         (
             "switch.dishwasher_power",
-            {BSH_POWER_STATE: {"value": BSH_POWER_OFF}},
             [BSH_POWER_ON, BSH_POWER_OFF],
             SERVICE_TURN_OFF,
+            BSH_POWER_OFF,
             STATE_OFF,
             "Dishwasher",
         ),
         (
             "switch.dishwasher_power",
-            {BSH_POWER_STATE: {"value": BSH_POWER_ON}},
             [BSH_POWER_ON, BSH_POWER_STANDBY],
             SERVICE_TURN_ON,
+            BSH_POWER_ON,
             STATE_ON,
             "Dishwasher",
         ),
         (
             "switch.dishwasher_power",
-            {BSH_POWER_STATE: {"value": BSH_POWER_STANDBY}},
             [BSH_POWER_ON, BSH_POWER_STANDBY],
             SERVICE_TURN_OFF,
+            BSH_POWER_STANDBY,
             STATE_OFF,
             "Dishwasher",
         ),
     ],
     indirect=["appliance"],
 )
-@pytest.mark.usefixtures("bypass_throttle")
-async def test_power_swtich(
+async def test_power_switch(
     entity_id: str,
-    status: dict,
-    allowed_values: list[str],
+    allowed_values: list[str | None] | None,
     service: str,
+    setting_value_arg: str,
     power_state: str,
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    appliance: Mock,
-    get_appliances: MagicMock,
+    appliance: HomeAppliance,
+    client: MagicMock,
 ) -> None:
     """Test power switch functionality."""
-    appliance.get.side_effect = [
-        {
-            ATTR_CONSTRAINTS: {
-                ATTR_ALLOWED_VALUES: allowed_values,
-            },
-        }
-    ]
-    appliance.status.update(SETTINGS_STATUS)
-    appliance.status.update(status)
-    get_appliances.return_value = [appliance]
+    client.get_settings.side_effect = None
+    client.get_settings.return_value = ArrayOfSettings(
+        [
+            GetSetting(
+                key=SettingKey.BSH_COMMON_POWER_STATE,
+                raw_key=SettingKey.BSH_COMMON_POWER_STATE.value,
+                value="",
+                constraints=SettingConstraints(
+                    allowed_values=allowed_values,
+                ),
+            )
+        ]
+    )
 
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
-    await hass.services.async_call(
-        SWITCH_DOMAIN, service, {ATTR_ENTITY_ID: entity_id}, blocking=True
+    await hass.services.async_call(SWITCH_DOMAIN, service, {ATTR_ENTITY_ID: entity_id})
+    await hass.async_block_till_done()
+    client.set_setting.assert_awaited_once_with(
+        appliance.ha_id,
+        setting_key=SettingKey.BSH_COMMON_POWER_STATE,
+        value=setting_value_arg,
     )
     assert hass.states.is_state(entity_id, power_state)
 
 
 @pytest.mark.parametrize(
-    ("entity_id", "allowed_values", "service", "appliance", "exception_match"),
+    ("initial_value"),
+    [
+        (BSH_POWER_OFF),
+        (BSH_POWER_STANDBY),
+    ],
+)
+async def test_power_switch_fetch_off_state_from_current_value(
+    initial_value: str,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test power switch functionality to fetch the off state from the current value."""
+    client.get_settings.side_effect = None
+    client.get_settings.return_value = ArrayOfSettings(
+        [
+            GetSetting(
+                key=SettingKey.BSH_COMMON_POWER_STATE,
+                raw_key=SettingKey.BSH_COMMON_POWER_STATE.value,
+                value=initial_value,
+            )
+        ]
+    )
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    assert hass.states.is_state("switch.dishwasher_power", STATE_OFF)
+
+
+@pytest.mark.parametrize(
+    ("entity_id", "allowed_values", "service", "exception_match"),
     [
         (
             "switch.dishwasher_power",
             [BSH_POWER_ON],
             SERVICE_TURN_OFF,
-            "Dishwasher",
             r".*not support.*turn.*off.*",
         ),
         (
             "switch.dishwasher_power",
             None,
             SERVICE_TURN_OFF,
-            "Dishwasher",
+            r".*Unable.*turn.*off.*support.*not.*determined.*",
+        ),
+        (
+            "switch.dishwasher_power",
+            HomeConnectError(),
+            SERVICE_TURN_OFF,
             r".*Unable.*turn.*off.*support.*not.*determined.*",
         ),
     ],
-    indirect=["appliance"],
 )
-@pytest.mark.usefixtures("bypass_throttle")
 async def test_power_switch_service_validation_errors(
     entity_id: str,
-    allowed_values: list[str],
+    allowed_values: list[str | None] | None | HomeConnectError,
     service: str,
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    appliance: Mock,
     exception_match: str,
-    get_appliances: MagicMock,
+    client: MagicMock,
 ) -> None:
     """Test power switch functionality validation errors."""
-    if allowed_values:
-        appliance.get.side_effect = [
-            {
-                ATTR_CONSTRAINTS: {
-                    ATTR_ALLOWED_VALUES: allowed_values,
-                },
-            }
-        ]
-    appliance.status.update(SETTINGS_STATUS)
-    get_appliances.return_value = [appliance]
+    client.get_settings.side_effect = None
+    if isinstance(allowed_values, HomeConnectError):
+        exception = allowed_values
+        client.get_settings.return_value = ArrayOfSettings(
+            [
+                GetSetting(
+                    key=SettingKey.BSH_COMMON_POWER_STATE,
+                    raw_key=SettingKey.BSH_COMMON_POWER_STATE.value,
+                    value=BSH_POWER_ON,
+                )
+            ]
+        )
+        client.get_setting = AsyncMock(side_effect=exception)
+    else:
+        setting = GetSetting(
+            key=SettingKey.BSH_COMMON_POWER_STATE,
+            raw_key=SettingKey.BSH_COMMON_POWER_STATE.value,
+            value=BSH_POWER_ON,
+            constraints=SettingConstraints(
+                allowed_values=allowed_values,
+            ),
+        )
+        client.get_settings.return_value = ArrayOfSettings([setting])
+        client.get_setting = AsyncMock(return_value=setting)
 
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
-    appliance.status.update({BSH_POWER_STATE: {"value": BSH_POWER_ON}})
-
     with pytest.raises(HomeAssistantError, match=exception_match):
         await hass.services.async_call(
-            SWITCH_DOMAIN, service, {"entity_id": entity_id}, blocking=True
+            SWITCH_DOMAIN, service, {ATTR_ENTITY_ID: entity_id}, blocking=True
         )
 
 
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
-@pytest.mark.usefixtures("bypass_throttle")
-async def test_create_issue(
+@pytest.mark.parametrize(
+    "service",
+    [SERVICE_TURN_ON, SERVICE_TURN_OFF],
+)
+async def test_create_program_switch_deprecation_issue(
     hass: HomeAssistant,
-    appliance: Mock,
+    appliance: HomeAppliance,
+    service: str,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: MagicMock,
+    client: MagicMock,
     issue_registry: ir.IssueRegistry,
 ) -> None:
-    """Test we create an issue when an automation or script is using a deprecated entity."""
+    """Test that we create an issue when an automation or script is using a program switch entity or the entity is used by the user."""
     entity_id = "switch.washer_program_mix"
-    appliance.status.update(SETTINGS_STATUS)
-    appliance.get_programs_available.return_value = [PROGRAM]
-    get_appliances.return_value = [appliance]
-    issue_id = f"deprecated_program_switch_{entity_id}"
+    automation_script_issue_id = f"deprecated_program_switch_{entity_id}"
+    action_handler_issue_id = f"deprecated_program_switch_{entity_id}"
 
     assert await async_setup_component(
         hass,
@@ -539,18 +859,211 @@ async def test_create_issue(
     )
 
     assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        service,
+        {
+            ATTR_ENTITY_ID: entity_id,
+        },
+        blocking=True,
+    )
+
     assert automations_with_entity(hass, entity_id)[0] == "automation.test"
     assert scripts_with_entity(hass, entity_id)[0] == "script.test"
 
-    assert len(issue_registry.issues) == 1
-    assert issue_registry.async_get_issue(DOMAIN, issue_id)
+    assert len(issue_registry.issues) == 2
+    assert issue_registry.async_get_issue(DOMAIN, automation_script_issue_id)
+    assert issue_registry.async_get_issue(DOMAIN, action_handler_issue_id)
 
     await hass.config_entries.async_unload(config_entry.entry_id)
     await hass.async_block_till_done()
 
     # Assert the issue is no longer present
-    assert not issue_registry.async_get_issue(DOMAIN, issue_id)
+    assert not issue_registry.async_get_issue(DOMAIN, automation_script_issue_id)
+    assert not issue_registry.async_get_issue(DOMAIN, action_handler_issue_id)
     assert len(issue_registry.issues) == 0
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+@pytest.mark.parametrize(
+    "service",
+    [SERVICE_TURN_ON, SERVICE_TURN_OFF],
+)
+async def test_program_switch_deprecation_issue_fix(
+    hass: HomeAssistant,
+    appliance: HomeAppliance,
+    service: str,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    issue_registry: ir.IssueRegistry,
+    hass_client: ClientSessionGenerator,
+) -> None:
+    """Test we can fix the issues created when a program switch entity is in an automation or in a script or when is used."""
+    entity_id = "switch.washer_program_mix"
+    automation_script_issue_id = f"deprecated_program_switch_{entity_id}"
+    action_handler_issue_id = f"deprecated_program_switch_{entity_id}"
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: {
+                "alias": "test",
+                "trigger": {"platform": "state", "entity_id": entity_id},
+                "action": {
+                    "action": "automation.turn_on",
+                    "target": {
+                        "entity_id": "automation.test",
+                    },
+                },
+            }
+        },
+    )
+    assert await async_setup_component(
+        hass,
+        script.DOMAIN,
+        {
+            script.DOMAIN: {
+                "test": {
+                    "sequence": [
+                        {
+                            "action": "switch.turn_on",
+                            "entity_id": entity_id,
+                        },
+                    ],
+                }
+            }
+        },
+    )
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        service,
+        {
+            ATTR_ENTITY_ID: entity_id,
+        },
+        blocking=True,
+    )
+
+    assert automations_with_entity(hass, entity_id)[0] == "automation.test"
+    assert scripts_with_entity(hass, entity_id)[0] == "script.test"
+
+    assert len(issue_registry.issues) == 2
+    assert issue_registry.async_get_issue(DOMAIN, automation_script_issue_id)
+    assert issue_registry.async_get_issue(DOMAIN, action_handler_issue_id)
+
+    for issue in issue_registry.issues.copy().values():
+        _client = await hass_client()
+        resp = await _client.post(
+            "/api/repairs/issues/fix",
+            json={"handler": DOMAIN, "issue_id": issue.issue_id},
+        )
+        assert resp.status == HTTPStatus.OK
+        flow_id = (await resp.json())["flow_id"]
+        resp = await _client.post(f"/api/repairs/issues/fix/{flow_id}")
+
+    # Assert the issue is no longer present
+    assert not issue_registry.async_get_issue(DOMAIN, automation_script_issue_id)
+    assert not issue_registry.async_get_issue(DOMAIN, action_handler_issue_id)
+    assert len(issue_registry.issues) == 0
+
+
+@pytest.mark.parametrize(
+    (
+        "set_active_program_options_side_effect",
+        "set_selected_program_options_side_effect",
+        "called_mock_method",
+    ),
+    [
+        (
+            None,
+            SelectedProgramNotSetError("error.key"),
+            "set_active_program_option",
+        ),
+        (
+            ActiveProgramNotSetError("error.key"),
+            None,
+            "set_selected_program_option",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    ("entity_id", "option_key", "appliance"),
+    [
+        (
+            "switch.dishwasher_half_load",
+            OptionKey.DISHCARE_DISHWASHER_HALF_LOAD,
+            "Dishwasher",
+        )
+    ],
+    indirect=["appliance"],
+)
+async def test_options_functionality(
+    entity_id: str,
+    option_key: OptionKey,
+    appliance: HomeAppliance,
+    set_active_program_options_side_effect: ActiveProgramNotSetError | None,
+    set_selected_program_options_side_effect: SelectedProgramNotSetError | None,
+    called_mock_method: str,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+) -> None:
+    """Test options functionality."""
+    if set_active_program_options_side_effect:
+        client.set_active_program_option.side_effect = (
+            set_active_program_options_side_effect
+        )
+    else:
+        assert set_selected_program_options_side_effect
+        client.set_selected_program_option.side_effect = (
+            set_selected_program_options_side_effect
+        )
+    called_mock: AsyncMock = getattr(client, called_mock_method)
+    client.get_available_program = AsyncMock(
+        return_value=ProgramDefinition(
+            ProgramKey.UNKNOWN, options=[ProgramDefinitionOption(option_key, "Boolean")]
+        )
+    )
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+    assert hass.states.get(entity_id)
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: entity_id}
+    )
+    await hass.async_block_till_done()
+
+    assert called_mock.called
+    assert called_mock.call_args.args == (appliance.ha_id,)
+    assert called_mock.call_args.kwargs == {
+        "option_key": option_key,
+        "value": False,
+    }
+    assert hass.states.is_state(entity_id, STATE_OFF)
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: entity_id}
+    )
+    await hass.async_block_till_done()
+
+    assert called_mock.called
+    assert called_mock.call_args.args == (appliance.ha_id,)
+    assert called_mock.call_args.kwargs == {
+        "option_key": option_key,
+        "value": True,
+    }
+    assert hass.states.is_state(entity_id, STATE_ON)
diff --git a/tests/components/home_connect/test_time.py b/tests/components/home_connect/test_time.py
index 1401e07b05a..8c23a09053a 100644
--- a/tests/components/home_connect/test_time.py
+++ b/tests/components/home_connect/test_time.py
@@ -1,22 +1,42 @@
 """Tests for home_connect time entities."""
 
-from collections.abc import Awaitable, Callable, Generator
+from collections.abc import Awaitable, Callable
 from datetime import time
-from unittest.mock import MagicMock, Mock
+from http import HTTPStatus
+from unittest.mock import AsyncMock, MagicMock
 
-from homeconnect.api import HomeConnectError
+from aiohomeconnect.model import (
+    ArrayOfEvents,
+    ArrayOfSettings,
+    EventMessage,
+    EventType,
+    GetSetting,
+    HomeAppliance,
+    SettingKey,
+)
+from aiohomeconnect.model.error import HomeConnectApiError, HomeConnectError
 import pytest
 
-from homeassistant.components.home_connect.const import ATTR_VALUE
+from homeassistant.components.automation import (
+    DOMAIN as AUTOMATION_DOMAIN,
+    automations_with_entity,
+)
+from homeassistant.components.home_connect.const import DOMAIN
+from homeassistant.components.script import DOMAIN as SCRIPT_DOMAIN, scripts_with_entity
 from homeassistant.components.time import DOMAIN as TIME_DOMAIN, SERVICE_SET_VALUE
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import ATTR_ENTITY_ID, ATTR_TIME, Platform
+from homeassistant.const import ATTR_ENTITY_ID, ATTR_TIME, STATE_UNAVAILABLE, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-
-from .conftest import get_all_appliances
+from homeassistant.helpers import (
+    device_registry as dr,
+    entity_registry as er,
+    issue_registry as ir,
+)
+from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry
+from tests.typing import ClientSessionGenerator
 
 
 @pytest.fixture
@@ -26,114 +46,262 @@ def platforms() -> list[str]:
 
 
 async def test_time(
-    bypass_throttle: Generator[None],
-    hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: Mock,
+    client: MagicMock,
 ) -> None:
     """Test time entity."""
-    get_appliances.side_effect = get_all_appliances
     assert config_entry.state is ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state is ConfigEntryState.LOADED
 
 
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+@pytest.mark.parametrize("appliance", ["Oven"], indirect=True)
+async def test_paired_depaired_devices_flow(
+    appliance: HomeAppliance,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that removed devices are correctly removed from and added to hass on API events."""
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+    assert entity_entries
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.DEPAIRED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert not device
+    for entity_entry in entity_entries:
+        assert not entity_registry.async_get(entity_entry.entity_id)
+
+    # Now that all everything related to the device is removed, pair it again
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.PAIRED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    assert device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    for entity_entry in entity_entries:
+        assert entity_registry.async_get(entity_entry.entity_id)
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+@pytest.mark.parametrize("appliance", ["Oven"], indirect=True)
+async def test_connected_devices(
+    appliance: HomeAppliance,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that devices reconnected.
+
+    Specifically those devices whose settings, status, etc. could
+    not be obtained while disconnected and once connected, the entities are added.
+    """
+    get_settings_original_mock = client.get_settings
+
+    async def get_settings_side_effect(ha_id: str):
+        if ha_id == appliance.ha_id:
+            raise HomeConnectApiError(
+                "SDK.Error.HomeAppliance.Connection.Initialization.Failed"
+            )
+        return await get_settings_original_mock.side_effect(ha_id)
+
+    client.get_settings = AsyncMock(side_effect=get_settings_side_effect)
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+    client.get_settings = get_settings_original_mock
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.CONNECTED,
+                data=ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, appliance.ha_id)})
+    assert device
+    new_entity_entries = entity_registry.entities.get_entries_for_device_id(device.id)
+    assert len(new_entity_entries) > len(entity_entries)
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+@pytest.mark.parametrize("appliance", ["Oven"], indirect=True)
+async def test_time_entity_availability(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    appliance: HomeAppliance,
+) -> None:
+    """Test if time entities availability are based on the appliance connection state."""
+    entity_ids = [
+        "time.oven_alarm_clock",
+    ]
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    for entity_id in entity_ids:
+        state = hass.states.get(entity_id)
+        assert state
+        assert state.state != STATE_UNAVAILABLE
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.DISCONNECTED,
+                ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    for entity_id in entity_ids:
+        assert hass.states.is_state(entity_id, STATE_UNAVAILABLE)
+
+    await client.add_events(
+        [
+            EventMessage(
+                appliance.ha_id,
+                EventType.CONNECTED,
+                ArrayOfEvents([]),
+            )
+        ]
+    )
+    await hass.async_block_till_done()
+
+    for entity_id in entity_ids:
+        state = hass.states.get(entity_id)
+        assert state
+        assert state.state != STATE_UNAVAILABLE
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
 @pytest.mark.parametrize("appliance", ["Oven"], indirect=True)
 @pytest.mark.parametrize(
-    ("entity_id", "setting_key", "setting_value", "expected_state"),
+    ("entity_id", "setting_key"),
     [
         (
             f"{TIME_DOMAIN}.oven_alarm_clock",
-            "BSH.Common.Setting.AlarmClock",
-            {ATTR_VALUE: 59},
-            str(time(second=59)),
-        ),
-        (
-            f"{TIME_DOMAIN}.oven_alarm_clock",
-            "BSH.Common.Setting.AlarmClock",
-            {ATTR_VALUE: None},
-            "unknown",
-        ),
-        (
-            f"{TIME_DOMAIN}.oven_alarm_clock",
-            "BSH.Common.Setting.AlarmClock",
-            None,
-            "unknown",
+            SettingKey.BSH_COMMON_ALARM_CLOCK,
         ),
     ],
 )
-@pytest.mark.usefixtures("bypass_throttle")
 async def test_time_entity_functionality(
-    appliance: Mock,
+    appliance: HomeAppliance,
     entity_id: str,
-    setting_key: str,
-    setting_value: dict,
-    expected_state: str,
-    bypass_throttle: Generator[None],
+    setting_key: SettingKey,
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: MagicMock,
+    client: MagicMock,
 ) -> None:
     """Test time entity functionality."""
-    get_appliances.return_value = [appliance]
-    appliance.status.update({setting_key: setting_value})
-
     assert config_entry.state is ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
+    assert await integration_setup(client)
     assert config_entry.state is ConfigEntryState.LOADED
-    assert hass.states.is_state(entity_id, expected_state)
 
-    new_value = 30
-    assert hass.states.get(entity_id).state != new_value
+    value = 30
+    entity_state = hass.states.get(entity_id)
+    assert entity_state is not None
+    assert entity_state.state != value
     await hass.services.async_call(
         TIME_DOMAIN,
         SERVICE_SET_VALUE,
         {
             ATTR_ENTITY_ID: entity_id,
-            ATTR_TIME: time(second=new_value),
+            ATTR_TIME: time(second=value),
         },
-        blocking=True,
     )
-    appliance.set_setting.assert_called_once_with(setting_key, new_value)
+    await hass.async_block_till_done()
+    client.set_setting.assert_awaited_once_with(
+        appliance.ha_id, setting_key=setting_key, value=value
+    )
+    assert hass.states.is_state(entity_id, str(time(second=value)))
 
 
-@pytest.mark.parametrize("problematic_appliance", ["Oven"], indirect=True)
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
 @pytest.mark.parametrize(
     ("entity_id", "setting_key", "mock_attr"),
     [
         (
             f"{TIME_DOMAIN}.oven_alarm_clock",
-            "BSH.Common.Setting.AlarmClock",
+            SettingKey.BSH_COMMON_ALARM_CLOCK,
             "set_setting",
         ),
     ],
 )
-@pytest.mark.usefixtures("bypass_throttle")
 async def test_time_entity_error(
-    problematic_appliance: Mock,
     entity_id: str,
-    setting_key: str,
+    setting_key: SettingKey,
     mock_attr: str,
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
     setup_credentials: None,
-    get_appliances: MagicMock,
+    client_with_exception: MagicMock,
 ) -> None:
     """Test time entity error."""
-    get_appliances.return_value = [problematic_appliance]
-
+    client_with_exception.get_settings.side_effect = None
+    client_with_exception.get_settings.return_value = ArrayOfSettings(
+        [
+            GetSetting(
+                key=setting_key,
+                raw_key=setting_key.value,
+                value=30,
+            )
+        ]
+    )
     assert config_entry.state is ConfigEntryState.NOT_LOADED
-    problematic_appliance.status.update({setting_key: {}})
-    assert await integration_setup()
+    assert await integration_setup(client_with_exception)
     assert config_entry.state is ConfigEntryState.LOADED
 
     with pytest.raises(HomeConnectError):
-        getattr(problematic_appliance, mock_attr)()
+        await getattr(client_with_exception, mock_attr)()
 
     with pytest.raises(
         HomeAssistantError, match=r"Error.*assign.*value.*to.*setting.*"
@@ -147,4 +315,171 @@ async def test_time_entity_error(
             },
             blocking=True,
         )
-    assert getattr(problematic_appliance, mock_attr).call_count == 2
+    assert getattr(client_with_exception, mock_attr).call_count == 2
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+@pytest.mark.parametrize("appliance", ["Oven"], indirect=True)
+async def test_create_alarm_clock_deprecation_issue(
+    hass: HomeAssistant,
+    appliance: HomeAppliance,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    issue_registry: ir.IssueRegistry,
+) -> None:
+    """Test that we create an issue when an automation or script is using a alarm clock time entity or the entity is used by the user."""
+    entity_id = f"{TIME_DOMAIN}.oven_alarm_clock"
+    automation_script_issue_id = (
+        f"deprecated_time_alarm_clock_in_automations_scripts_{entity_id}"
+    )
+    action_handler_issue_id = f"deprecated_time_alarm_clock_{entity_id}"
+
+    assert await async_setup_component(
+        hass,
+        AUTOMATION_DOMAIN,
+        {
+            AUTOMATION_DOMAIN: {
+                "alias": "test",
+                "trigger": {"platform": "state", "entity_id": entity_id},
+                "action": {
+                    "action": "automation.turn_on",
+                    "target": {
+                        "entity_id": "automation.test",
+                    },
+                },
+            }
+        },
+    )
+    assert await async_setup_component(
+        hass,
+        SCRIPT_DOMAIN,
+        {
+            SCRIPT_DOMAIN: {
+                "test": {
+                    "sequence": [
+                        {
+                            "action": "switch.turn_on",
+                            "entity_id": entity_id,
+                        },
+                    ],
+                }
+            }
+        },
+    )
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    await hass.services.async_call(
+        TIME_DOMAIN,
+        SERVICE_SET_VALUE,
+        {
+            ATTR_ENTITY_ID: entity_id,
+            ATTR_TIME: time(minute=1),
+        },
+        blocking=True,
+    )
+
+    assert automations_with_entity(hass, entity_id)[0] == "automation.test"
+    assert scripts_with_entity(hass, entity_id)[0] == "script.test"
+
+    assert len(issue_registry.issues) == 2
+    assert issue_registry.async_get_issue(DOMAIN, automation_script_issue_id)
+    assert issue_registry.async_get_issue(DOMAIN, action_handler_issue_id)
+
+    await hass.config_entries.async_unload(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    # Assert the issue is no longer present
+    assert not issue_registry.async_get_issue(DOMAIN, automation_script_issue_id)
+    assert not issue_registry.async_get_issue(DOMAIN, action_handler_issue_id)
+    assert len(issue_registry.issues) == 0
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+@pytest.mark.parametrize("appliance", ["Oven"], indirect=True)
+async def test_alarm_clock_deprecation_issue_fix(
+    hass: HomeAssistant,
+    appliance: HomeAppliance,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    issue_registry: ir.IssueRegistry,
+    hass_client: ClientSessionGenerator,
+) -> None:
+    """Test we can fix the issues created when a alarm clock time entity is in an automation or in a script or when is used."""
+    entity_id = f"{TIME_DOMAIN}.oven_alarm_clock"
+    automation_script_issue_id = (
+        f"deprecated_time_alarm_clock_in_automations_scripts_{entity_id}"
+    )
+    action_handler_issue_id = f"deprecated_time_alarm_clock_{entity_id}"
+
+    assert await async_setup_component(
+        hass,
+        AUTOMATION_DOMAIN,
+        {
+            AUTOMATION_DOMAIN: {
+                "alias": "test",
+                "trigger": {"platform": "state", "entity_id": entity_id},
+                "action": {
+                    "action": "automation.turn_on",
+                    "target": {
+                        "entity_id": "automation.test",
+                    },
+                },
+            }
+        },
+    )
+    assert await async_setup_component(
+        hass,
+        SCRIPT_DOMAIN,
+        {
+            SCRIPT_DOMAIN: {
+                "test": {
+                    "sequence": [
+                        {
+                            "action": "switch.turn_on",
+                            "entity_id": entity_id,
+                        },
+                    ],
+                }
+            }
+        },
+    )
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    await hass.services.async_call(
+        TIME_DOMAIN,
+        SERVICE_SET_VALUE,
+        {
+            ATTR_ENTITY_ID: entity_id,
+            ATTR_TIME: time(minute=1),
+        },
+        blocking=True,
+    )
+
+    assert len(issue_registry.issues) == 2
+    assert issue_registry.async_get_issue(DOMAIN, automation_script_issue_id)
+    assert issue_registry.async_get_issue(DOMAIN, action_handler_issue_id)
+
+    for issue in issue_registry.issues.copy().values():
+        _client = await hass_client()
+        resp = await _client.post(
+            "/api/repairs/issues/fix",
+            json={"handler": DOMAIN, "issue_id": issue.issue_id},
+        )
+        assert resp.status == HTTPStatus.OK
+        flow_id = (await resp.json())["flow_id"]
+        resp = await _client.post(f"/api/repairs/issues/fix/{flow_id}")
+
+    # Assert the issue is no longer present
+    assert not issue_registry.async_get_issue(DOMAIN, automation_script_issue_id)
+    assert not issue_registry.async_get_issue(DOMAIN, action_handler_issue_id)
+    assert len(issue_registry.issues) == 0
diff --git a/tests/components/homeassistant/test_exposed_entities.py b/tests/components/homeassistant/test_exposed_entities.py
index 1f1955c2f82..ec87672e75c 100644
--- a/tests/components/homeassistant/test_exposed_entities.py
+++ b/tests/components/homeassistant/test_exposed_entities.py
@@ -497,28 +497,48 @@ async def test_list_exposed_entities(
 
     entry1 = entity_registry.async_get_or_create("test", "test", "unique1")
     entry2 = entity_registry.async_get_or_create("test", "test", "unique2")
+    entity_registry.async_get_or_create("test", "test", "unique3")
 
     # Set options for registered entities
     await ws_client.send_json_auto_id(
         {
             "type": "homeassistant/expose_entity",
             "assistants": ["cloud.alexa", "cloud.google_assistant"],
-            "entity_ids": [entry1.entity_id, entry2.entity_id],
+            "entity_ids": [entry1.entity_id],
             "should_expose": True,
         }
     )
     response = await ws_client.receive_json()
     assert response["success"]
 
+    await ws_client.send_json_auto_id(
+        {
+            "type": "homeassistant/expose_entity",
+            "assistants": ["cloud.alexa", "cloud.google_assistant"],
+            "entity_ids": [entry2.entity_id],
+            "should_expose": False,
+        }
+    )
+    response = await ws_client.receive_json()
+    assert response["success"]
+
     # Set options for entities not in the entity registry
     await ws_client.send_json_auto_id(
         {
             "type": "homeassistant/expose_entity",
             "assistants": ["cloud.alexa", "cloud.google_assistant"],
-            "entity_ids": [
-                "test.test",
-                "test.test2",
-            ],
+            "entity_ids": ["test.test"],
+            "should_expose": True,
+        }
+    )
+    response = await ws_client.receive_json()
+    assert response["success"]
+
+    await ws_client.send_json_auto_id(
+        {
+            "type": "homeassistant/expose_entity",
+            "assistants": ["cloud.alexa", "cloud.google_assistant"],
+            "entity_ids": ["test.test2"],
             "should_expose": False,
         }
     )
@@ -531,10 +551,8 @@ async def test_list_exposed_entities(
     assert response["success"]
     assert response["result"] == {
         "exposed_entities": {
-            "test.test": {"cloud.alexa": False, "cloud.google_assistant": False},
-            "test.test2": {"cloud.alexa": False, "cloud.google_assistant": False},
+            "test.test": {"cloud.alexa": True, "cloud.google_assistant": True},
             "test.test_unique1": {"cloud.alexa": True, "cloud.google_assistant": True},
-            "test.test_unique2": {"cloud.alexa": True, "cloud.google_assistant": True},
         },
     }
 
diff --git a/tests/components/homeassistant/test_init.py b/tests/components/homeassistant/test_init.py
index 0aed3dc929e..4facd1695c5 100644
--- a/tests/components/homeassistant/test_init.py
+++ b/tests/components/homeassistant/test_init.py
@@ -6,7 +6,7 @@ import pytest
 import voluptuous as vol
 import yaml
 
-from homeassistant import config
+from homeassistant import config, core as ha
 from homeassistant.components.homeassistant import (
     ATTR_ENTRY_ID,
     ATTR_SAFE_MODE,
@@ -30,7 +30,6 @@ from homeassistant.const import (
     STATE_OFF,
     STATE_ON,
 )
-import homeassistant.core as ha
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, Unauthorized
 from homeassistant.helpers import entity, entity_registry as er
diff --git a/tests/components/homeassistant/triggers/test_numeric_state.py b/tests/components/homeassistant/triggers/test_numeric_state.py
index fe4fb53962a..0d4294ca16f 100644
--- a/tests/components/homeassistant/triggers/test_numeric_state.py
+++ b/tests/components/homeassistant/triggers/test_numeric_state.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
 from homeassistant.core import Context, HomeAssistant, ServiceCall
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import assert_setup_component, async_fire_time_changed, mock_component
 
diff --git a/tests/components/homeassistant/triggers/test_state.py b/tests/components/homeassistant/triggers/test_state.py
index c3117bbb660..f6478e9dda0 100644
--- a/tests/components/homeassistant/triggers/test_state.py
+++ b/tests/components/homeassistant/triggers/test_state.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
 from homeassistant.core import Context, HomeAssistant, ServiceCall
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import assert_setup_component, async_fire_time_changed, mock_component
 
diff --git a/tests/components/homeassistant/triggers/test_time.py b/tests/components/homeassistant/triggers/test_time.py
index 40f62baa5e7..9a4f41d08e1 100644
--- a/tests/components/homeassistant/triggers/test_time.py
+++ b/tests/components/homeassistant/triggers/test_time.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import assert_setup_component, async_fire_time_changed, mock_component
 
diff --git a/tests/components/homeassistant/triggers/test_time_pattern.py b/tests/components/homeassistant/triggers/test_time_pattern.py
index 7138fd7dd02..ffce8cd476b 100644
--- a/tests/components/homeassistant/triggers/test_time_pattern.py
+++ b/tests/components/homeassistant/triggers/test_time_pattern.py
@@ -11,7 +11,7 @@ from homeassistant.components.homeassistant.triggers import time_pattern
 from homeassistant.const import ATTR_ENTITY_ID, ENTITY_MATCH_ALL, SERVICE_TURN_OFF
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed, mock_component
 
diff --git a/tests/components/homeassistant_hardware/test_config_flow.py b/tests/components/homeassistant_hardware/test_config_flow.py
index 145087073af..32c5a381233 100644
--- a/tests/components/homeassistant_hardware/test_config_flow.py
+++ b/tests/components/homeassistant_hardware/test_config_flow.py
@@ -17,12 +17,14 @@ from homeassistant.components.homeassistant_hardware.firmware_config_flow import
 )
 from homeassistant.components.homeassistant_hardware.util import (
     ApplicationType,
+    FirmwareInfo,
     get_otbr_addon_manager,
     get_zigbee_flasher_addon_manager,
 )
 from homeassistant.config_entries import ConfigEntry, ConfigFlowResult, OptionsFlow
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
@@ -64,13 +66,13 @@ class FakeFirmwareConfigFlow(BaseFirmwareConfigFlow, domain=TEST_DOMAIN):
         """Create the config entry."""
         assert self._device is not None
         assert self._hardware_name is not None
-        assert self._probed_firmware_type is not None
+        assert self._probed_firmware_info is not None
 
         return self.async_create_entry(
             title=self._hardware_name,
             data={
                 "device": self._device,
-                "firmware": self._probed_firmware_type.value,
+                "firmware": self._probed_firmware_info.firmware_type.value,
                 "hardware": self._hardware_name,
             },
         )
@@ -86,18 +88,26 @@ class FakeFirmwareOptionsFlowHandler(BaseFirmwareOptionsFlow):
         self._device = self.config_entry.data["device"]
         self._hardware_name = self.config_entry.data["hardware"]
 
+        self._probed_firmware_info = FirmwareInfo(
+            device=self._device,
+            firmware_type=ApplicationType(self.config_entry.data["firmware"]),
+            firmware_version=None,
+            source="guess",
+            owners=[],
+        )
+
         # Regenerate the translation placeholders
         self._get_translation_placeholders()
 
     def _async_flow_finished(self) -> ConfigFlowResult:
         """Create the config entry."""
-        assert self._probed_firmware_type is not None
+        assert self._probed_firmware_info is not None
 
         self.hass.config_entries.async_update_entry(
             entry=self.config_entry,
             data={
                 **self.config_entry.data,
-                "firmware": self._probed_firmware_type.value,
+                "firmware": self._probed_firmware_info.firmware_type.value,
             },
             options=self.config_entry.options,
         )
@@ -106,7 +116,7 @@ class FakeFirmwareOptionsFlowHandler(BaseFirmwareOptionsFlow):
 
 
 @pytest.fixture(autouse=True)
-def mock_test_firmware_platform(
+async def mock_test_firmware_platform(
     hass: HomeAssistant,
 ) -> Generator[None]:
     """Fixture for a test config flow."""
@@ -116,6 +126,8 @@ def mock_test_firmware_platform(
     mock_integration(hass, mock_module)
     mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
 
+    await async_setup_component(hass, "homeassistant_hardware", {})
+
     with mock_config_flow(TEST_DOMAIN, FakeFirmwareConfigFlow):
         yield
 
@@ -139,7 +151,7 @@ def mock_addon_info(
     hass: HomeAssistant,
     *,
     is_hassio: bool = True,
-    app_type: ApplicationType = ApplicationType.EZSP,
+    app_type: ApplicationType | None = ApplicationType.EZSP,
     otbr_addon_info: AddonInfo = AddonInfo(
         available=True,
         hostname=None,
@@ -184,11 +196,26 @@ def mock_addon_info(
     )
     mock_otbr_manager.async_get_addon_info.return_value = otbr_addon_info
 
+    if app_type is None:
+        firmware_info_result = None
+    else:
+        firmware_info_result = FirmwareInfo(
+            device="/dev/ttyUSB0",  # Not used
+            firmware_type=app_type,
+            firmware_version=None,
+            owners=[],
+            source="probe",
+        )
+
     with (
         patch(
             "homeassistant.components.homeassistant_hardware.firmware_config_flow.get_otbr_addon_manager",
             return_value=mock_otbr_manager,
         ),
+        patch(
+            "homeassistant.components.homeassistant_hardware.util.get_otbr_addon_manager",
+            return_value=mock_otbr_manager,
+        ),
         patch(
             "homeassistant.components.homeassistant_hardware.firmware_config_flow.get_zigbee_flasher_addon_manager",
             return_value=mock_flasher_manager,
@@ -198,8 +225,12 @@ def mock_addon_info(
             return_value=is_hassio,
         ),
         patch(
-            "homeassistant.components.homeassistant_hardware.firmware_config_flow.probe_silabs_firmware_type",
-            return_value=app_type,
+            "homeassistant.components.homeassistant_hardware.util.is_hassio",
+            return_value=is_hassio,
+        ),
+        patch(
+            "homeassistant.components.homeassistant_hardware.firmware_config_flow.probe_silabs_firmware_info",
+            return_value=firmware_info_result,
         ),
     ):
         yield mock_otbr_manager, mock_flasher_manager
@@ -263,10 +294,14 @@ async def test_config_flow_zigbee(hass: HomeAssistant) -> None:
         assert result["type"] is FlowResultType.FORM
         assert result["step_id"] == "confirm_zigbee"
 
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], user_input={}
-    )
-    assert result["type"] is FlowResultType.CREATE_ENTRY
+    with mock_addon_info(
+        hass,
+        app_type=ApplicationType.EZSP,
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input={}
+        )
+        assert result["type"] is FlowResultType.CREATE_ENTRY
 
     config_entry = result["result"]
     assert config_entry.data == {
@@ -336,10 +371,14 @@ async def test_config_flow_zigbee_skip_step_if_installed(hass: HomeAssistant) ->
         result = await hass.config_entries.flow.async_configure(result["flow_id"])
 
     # Done
-    await hass.async_block_till_done(wait_background_tasks=True)
-    result = await hass.config_entries.flow.async_configure(result["flow_id"])
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "confirm_zigbee"
+    with mock_addon_info(
+        hass,
+        app_type=ApplicationType.EZSP,
+    ):
+        await hass.async_block_till_done(wait_background_tasks=True)
+        result = await hass.config_entries.flow.async_configure(result["flow_id"])
+        assert result["type"] is FlowResultType.FORM
+        assert result["step_id"] == "confirm_zigbee"
 
 
 async def test_config_flow_thread(hass: HomeAssistant) -> None:
@@ -408,17 +447,21 @@ async def test_config_flow_thread(hass: HomeAssistant) -> None:
         assert result["type"] is FlowResultType.FORM
         assert result["step_id"] == "confirm_otbr"
 
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], user_input={}
-    )
-    assert result["type"] is FlowResultType.CREATE_ENTRY
+    with mock_addon_info(
+        hass,
+        app_type=ApplicationType.SPINEL,
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input={}
+        )
+        assert result["type"] is FlowResultType.CREATE_ENTRY
 
-    config_entry = result["result"]
-    assert config_entry.data == {
-        "firmware": "spinel",
-        "device": TEST_DEVICE,
-        "hardware": TEST_HARDWARE_NAME,
-    }
+        config_entry = result["result"]
+        assert config_entry.data == {
+            "firmware": "spinel",
+            "device": TEST_DEVICE,
+            "hardware": TEST_HARDWARE_NAME,
+        }
 
 
 async def test_config_flow_thread_addon_already_installed(hass: HomeAssistant) -> None:
@@ -466,10 +509,14 @@ async def test_config_flow_thread_addon_already_installed(hass: HomeAssistant) -
         assert result["type"] is FlowResultType.FORM
         assert result["step_id"] == "confirm_otbr"
 
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], user_input={}
-    )
-    assert result["type"] is FlowResultType.CREATE_ENTRY
+    with mock_addon_info(
+        hass,
+        app_type=ApplicationType.SPINEL,
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input={}
+        )
+        assert result["type"] is FlowResultType.CREATE_ENTRY
 
 
 async def test_config_flow_zigbee_not_hassio(hass: HomeAssistant) -> None:
@@ -490,10 +537,10 @@ async def test_config_flow_zigbee_not_hassio(hass: HomeAssistant) -> None:
         assert result["type"] is FlowResultType.FORM
         assert result["step_id"] == "confirm_zigbee"
 
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], user_input={}
-    )
-    assert result["type"] is FlowResultType.CREATE_ENTRY
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input={}
+        )
+        assert result["type"] is FlowResultType.CREATE_ENTRY
 
     config_entry = result["result"]
     assert config_entry.data == {
@@ -527,17 +574,17 @@ async def test_options_flow_zigbee_to_thread(hass: HomeAssistant) -> None:
 
     assert await hass.config_entries.async_setup(config_entry.entry_id)
 
-    # First step is confirmation
-    result = await hass.config_entries.options.async_init(config_entry.entry_id)
-    assert result["type"] is FlowResultType.MENU
-    assert result["step_id"] == "pick_firmware"
-    assert result["description_placeholders"]["firmware_type"] == "ezsp"
-    assert result["description_placeholders"]["model"] == TEST_HARDWARE_NAME
-
     with mock_addon_info(
         hass,
         app_type=ApplicationType.EZSP,
     ) as (mock_otbr_manager, mock_flasher_manager):
+        # First step is confirmation
+        result = await hass.config_entries.options.async_init(config_entry.entry_id)
+        assert result["type"] is FlowResultType.MENU
+        assert result["step_id"] == "pick_firmware"
+        assert result["description_placeholders"]["firmware_type"] == "ezsp"
+        assert result["description_placeholders"]["model"] == TEST_HARDWARE_NAME
+
         result = await hass.config_entries.options.async_configure(
             result["flow_id"],
             user_input={"next_step_id": STEP_PICK_FIRMWARE_THREAD},
@@ -588,14 +635,18 @@ async def test_options_flow_zigbee_to_thread(hass: HomeAssistant) -> None:
         assert result["type"] is FlowResultType.FORM
         assert result["step_id"] == "confirm_otbr"
 
-    # We are now done
-    result = await hass.config_entries.options.async_configure(
-        result["flow_id"], user_input={}
-    )
-    assert result["type"] is FlowResultType.CREATE_ENTRY
+    with mock_addon_info(
+        hass,
+        app_type=ApplicationType.SPINEL,
+    ):
+        # We are now done
+        result = await hass.config_entries.options.async_configure(
+            result["flow_id"], user_input={}
+        )
+        assert result["type"] is FlowResultType.CREATE_ENTRY
 
-    # The firmware type has been updated
-    assert config_entry.data["firmware"] == "spinel"
+        # The firmware type has been updated
+        assert config_entry.data["firmware"] == "spinel"
 
 
 async def test_options_flow_thread_to_zigbee(hass: HomeAssistant) -> None:
@@ -669,11 +720,15 @@ async def test_options_flow_thread_to_zigbee(hass: HomeAssistant) -> None:
         assert result["type"] is FlowResultType.FORM
         assert result["step_id"] == "confirm_zigbee"
 
-    # We are now done
-    result = await hass.config_entries.options.async_configure(
-        result["flow_id"], user_input={}
-    )
-    assert result["type"] is FlowResultType.CREATE_ENTRY
+    with mock_addon_info(
+        hass,
+        app_type=ApplicationType.EZSP,
+    ):
+        # We are now done
+        result = await hass.config_entries.options.async_configure(
+            result["flow_id"], user_input={}
+        )
+        assert result["type"] is FlowResultType.CREATE_ENTRY
 
-    # The firmware type has been updated
-    assert config_entry.data["firmware"] == "ezsp"
+        # The firmware type has been updated
+        assert config_entry.data["firmware"] == "ezsp"
diff --git a/tests/components/homeassistant_hardware/test_config_flow_failures.py b/tests/components/homeassistant_hardware/test_config_flow_failures.py
index f5375fb51dd..fb38704ae61 100644
--- a/tests/components/homeassistant_hardware/test_config_flow_failures.py
+++ b/tests/components/homeassistant_hardware/test_config_flow_failures.py
@@ -1,6 +1,6 @@
 """Test the Home Assistant hardware firmware config flow failure cases."""
 
-from unittest.mock import AsyncMock
+from unittest.mock import AsyncMock, patch
 
 import pytest
 
@@ -9,7 +9,11 @@ from homeassistant.components.homeassistant_hardware.firmware_config_flow import
     STEP_PICK_FIRMWARE_THREAD,
     STEP_PICK_FIRMWARE_ZIGBEE,
 )
-from homeassistant.components.homeassistant_hardware.util import ApplicationType
+from homeassistant.components.homeassistant_hardware.util import (
+    ApplicationType,
+    FirmwareInfo,
+    OwningIntegration,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
@@ -31,8 +35,8 @@ async def fixture_mock_supervisor_client(supervisor_client: AsyncMock):
 
 
 @pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test_firmware_domain.config.abort.unsupported_firmware"],
+    "ignore_translations_for_mock_domains",
+    ["test_firmware_domain"],
 )
 @pytest.mark.parametrize(
     "next_step",
@@ -65,8 +69,8 @@ async def test_config_flow_cannot_probe_firmware(
 
 
 @pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test_firmware_domain.config.abort.not_hassio"],
+    "ignore_translations_for_mock_domains",
+    ["test_firmware_domain"],
 )
 async def test_config_flow_zigbee_not_hassio_wrong_firmware(
     hass: HomeAssistant,
@@ -94,8 +98,8 @@ async def test_config_flow_zigbee_not_hassio_wrong_firmware(
 
 
 @pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test_firmware_domain.config.abort.addon_already_running"],
+    "ignore_translations_for_mock_domains",
+    ["test_firmware_domain"],
 )
 async def test_config_flow_zigbee_flasher_addon_already_running(
     hass: HomeAssistant,
@@ -132,8 +136,8 @@ async def test_config_flow_zigbee_flasher_addon_already_running(
 
 
 @pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test_firmware_domain.config.abort.addon_info_failed"],
+    "ignore_translations_for_mock_domains",
+    ["test_firmware_domain"],
 )
 async def test_config_flow_zigbee_flasher_addon_info_fails(hass: HomeAssistant) -> None:
     """Test failure case when flasher addon cannot be installed."""
@@ -169,8 +173,8 @@ async def test_config_flow_zigbee_flasher_addon_info_fails(hass: HomeAssistant)
 
 
 @pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test_firmware_domain.config.abort.addon_install_failed"],
+    "ignore_translations_for_mock_domains",
+    ["test_firmware_domain"],
 )
 async def test_config_flow_zigbee_flasher_addon_install_fails(
     hass: HomeAssistant,
@@ -203,8 +207,8 @@ async def test_config_flow_zigbee_flasher_addon_install_fails(
 
 
 @pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test_firmware_domain.config.abort.addon_set_config_failed"],
+    "ignore_translations_for_mock_domains",
+    ["test_firmware_domain"],
 )
 async def test_config_flow_zigbee_flasher_addon_set_config_fails(
     hass: HomeAssistant,
@@ -241,8 +245,8 @@ async def test_config_flow_zigbee_flasher_addon_set_config_fails(
 
 
 @pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test_firmware_domain.config.abort.addon_start_failed"],
+    "ignore_translations_for_mock_domains",
+    ["test_firmware_domain"],
 )
 async def test_config_flow_zigbee_flasher_run_fails(hass: HomeAssistant) -> None:
     """Test failure case when flasher addon fails to run."""
@@ -306,8 +310,44 @@ async def test_config_flow_zigbee_flasher_uninstall_fails(hass: HomeAssistant) -
 
 
 @pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test_firmware_domain.config.abort.not_hassio_thread"],
+    "ignore_translations_for_mock_domains",
+    ["test_firmware_domain"],
+)
+async def test_config_flow_zigbee_confirmation_fails(hass: HomeAssistant) -> None:
+    """Test the config flow failing due to Zigbee firmware not being detected."""
+    result = await hass.config_entries.flow.async_init(
+        TEST_DOMAIN, context={"source": "hardware"}
+    )
+
+    assert result["type"] is FlowResultType.MENU
+    assert result["step_id"] == "pick_firmware"
+
+    with mock_addon_info(
+        hass,
+        app_type=ApplicationType.EZSP,
+    ) as (mock_otbr_manager, mock_flasher_manager):
+        # Pick the menu option: we are now installing the addon
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input={"next_step_id": STEP_PICK_FIRMWARE_ZIGBEE},
+        )
+        assert result["type"] is FlowResultType.FORM
+        assert result["step_id"] == "confirm_zigbee"
+
+    with mock_addon_info(
+        hass,
+        app_type=None,  # Probing fails
+    ) as (mock_otbr_manager, mock_flasher_manager):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input={}
+        )
+        assert result["type"] is FlowResultType.ABORT
+        assert result["reason"] == "unsupported_firmware"
+
+
+@pytest.mark.parametrize(
+    "ignore_translations_for_mock_domains",
+    ["test_firmware_domain"],
 )
 async def test_config_flow_thread_not_hassio(hass: HomeAssistant) -> None:
     """Test when the stick is used with a non-hassio setup and Thread is selected."""
@@ -333,8 +373,8 @@ async def test_config_flow_thread_not_hassio(hass: HomeAssistant) -> None:
 
 
 @pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test_firmware_domain.config.abort.addon_info_failed"],
+    "ignore_translations_for_mock_domains",
+    ["test_firmware_domain"],
 )
 async def test_config_flow_thread_addon_info_fails(hass: HomeAssistant) -> None:
     """Test failure case when flasher addon cannot be installed."""
@@ -361,8 +401,8 @@ async def test_config_flow_thread_addon_info_fails(hass: HomeAssistant) -> None:
 
 
 @pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test_firmware_domain.config.abort.otbr_addon_already_running"],
+    "ignore_translations_for_mock_domains",
+    ["test_firmware_domain"],
 )
 async def test_config_flow_thread_addon_already_running(hass: HomeAssistant) -> None:
     """Test failure case when the Thread addon is already running."""
@@ -400,8 +440,8 @@ async def test_config_flow_thread_addon_already_running(hass: HomeAssistant) ->
 
 
 @pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test_firmware_domain.config.abort.addon_install_failed"],
+    "ignore_translations_for_mock_domains",
+    ["test_firmware_domain"],
 )
 async def test_config_flow_thread_addon_install_fails(hass: HomeAssistant) -> None:
     """Test failure case when flasher addon cannot be installed."""
@@ -431,8 +471,8 @@ async def test_config_flow_thread_addon_install_fails(hass: HomeAssistant) -> No
 
 
 @pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test_firmware_domain.config.abort.addon_set_config_failed"],
+    "ignore_translations_for_mock_domains",
+    ["test_firmware_domain"],
 )
 async def test_config_flow_thread_addon_set_config_fails(hass: HomeAssistant) -> None:
     """Test failure case when flasher addon cannot be configured."""
@@ -462,8 +502,8 @@ async def test_config_flow_thread_addon_set_config_fails(hass: HomeAssistant) ->
 
 
 @pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test_firmware_domain.config.abort.addon_start_failed"],
+    "ignore_translations_for_mock_domains",
+    ["test_firmware_domain"],
 )
 async def test_config_flow_thread_flasher_run_fails(hass: HomeAssistant) -> None:
     """Test failure case when flasher addon fails to run."""
@@ -527,8 +567,50 @@ async def test_config_flow_thread_flasher_uninstall_fails(hass: HomeAssistant) -
 
 
 @pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test_firmware_domain.options.abort.zha_still_using_stick"],
+    "ignore_translations_for_mock_domains",
+    ["test_firmware_domain"],
+)
+async def test_config_flow_thread_confirmation_fails(hass: HomeAssistant) -> None:
+    """Test the config flow failing due to OpenThread firmware not being detected."""
+    result = await hass.config_entries.flow.async_init(
+        TEST_DOMAIN, context={"source": "hardware"}
+    )
+
+    with mock_addon_info(
+        hass,
+        app_type=ApplicationType.EZSP,
+    ) as (mock_otbr_manager, mock_flasher_manager):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input={}
+        )
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input={"next_step_id": STEP_PICK_FIRMWARE_THREAD},
+        )
+        result = await hass.config_entries.flow.async_configure(result["flow_id"])
+        await hass.async_block_till_done(wait_background_tasks=True)
+
+        result = await hass.config_entries.flow.async_configure(result["flow_id"])
+        await hass.async_block_till_done(wait_background_tasks=True)
+
+        result = await hass.config_entries.flow.async_configure(result["flow_id"])
+        assert result["type"] is FlowResultType.FORM
+        assert result["step_id"] == "confirm_otbr"
+
+    with mock_addon_info(
+        hass,
+        app_type=None,  # Probing fails
+    ) as (mock_otbr_manager, mock_flasher_manager):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input={}
+        )
+        assert result["type"] is FlowResultType.ABORT
+        assert result["reason"] == "unsupported_firmware"
+
+
+@pytest.mark.parametrize(
+    "ignore_translations_for_mock_domains",
+    ["test_firmware_domain"],
 )
 async def test_options_flow_zigbee_to_thread_zha_configured(
     hass: HomeAssistant,
@@ -548,28 +630,35 @@ async def test_options_flow_zigbee_to_thread_zha_configured(
 
     assert await hass.config_entries.async_setup(config_entry.entry_id)
 
-    # Set up ZHA as well
-    zha_config_entry = MockConfigEntry(
-        domain="zha",
-        data={"device": {"path": TEST_DEVICE}},
-    )
-    zha_config_entry.add_to_hass(hass)
+    # Pretend ZHA is using the stick
+    with patch(
+        "homeassistant.components.homeassistant_hardware.firmware_config_flow.guess_hardware_owners",
+        return_value=[
+            FirmwareInfo(
+                device=TEST_DEVICE,
+                firmware_type=ApplicationType.EZSP,
+                firmware_version="1.2.3.4",
+                source="zha",
+                owners=[OwningIntegration(config_entry_id="some_config_entry_id")],
+            )
+        ],
+    ):
+        # Confirm options flow
+        result = await hass.config_entries.options.async_init(config_entry.entry_id)
 
-    # Confirm options flow
-    result = await hass.config_entries.options.async_init(config_entry.entry_id)
+        # Pick Thread
+        result = await hass.config_entries.options.async_configure(
+            result["flow_id"],
+            user_input={"next_step_id": STEP_PICK_FIRMWARE_THREAD},
+        )
 
-    # Pick Thread
-    result = await hass.config_entries.options.async_configure(
-        result["flow_id"],
-        user_input={"next_step_id": STEP_PICK_FIRMWARE_THREAD},
-    )
     assert result["type"] == FlowResultType.ABORT
     assert result["reason"] == "zha_still_using_stick"
 
 
 @pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test_firmware_domain.options.abort.otbr_still_using_stick"],
+    "ignore_translations_for_mock_domains",
+    ["test_firmware_domain"],
 )
 async def test_options_flow_thread_to_zigbee_otbr_configured(
     hass: HomeAssistant,
diff --git a/tests/components/homeassistant_hardware/test_coordinator.py b/tests/components/homeassistant_hardware/test_coordinator.py
new file mode 100644
index 00000000000..9c57aac6811
--- /dev/null
+++ b/tests/components/homeassistant_hardware/test_coordinator.py
@@ -0,0 +1,55 @@
+"""Test firmware update coordinator for Home Assistant Hardware."""
+
+from unittest.mock import AsyncMock, Mock, call, patch
+
+from ha_silabs_firmware_client import FirmwareManifest, ManifestMissing
+import pytest
+from yarl import URL
+
+from homeassistant.components.homeassistant_hardware.coordinator import (
+    FirmwareUpdateCoordinator,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.util import dt as dt_util
+
+
+async def test_firmware_update_coordinator_fetching(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test the firmware update coordinator loads manifests."""
+    session = async_get_clientsession(hass)
+
+    manifest = FirmwareManifest(
+        url=URL("https://example.org/firmware"),
+        html_url=URL("https://example.org/release_notes"),
+        created_at=dt_util.utcnow(),
+        firmwares=(),
+    )
+
+    mock_client = Mock()
+    mock_client.async_update_data = AsyncMock(side_effect=[ManifestMissing(), manifest])
+
+    with patch(
+        "homeassistant.components.homeassistant_hardware.coordinator.FirmwareUpdateClient",
+        return_value=mock_client,
+    ):
+        coordinator = FirmwareUpdateCoordinator(
+            hass, session, "https://example.org/firmware"
+        )
+
+    listener = Mock()
+    coordinator.async_add_listener(listener)
+
+    # The first update will fail
+    await coordinator.async_refresh()
+    assert listener.mock_calls == [call()]
+    assert coordinator.data is None
+    assert "GitHub release assets haven't been uploaded yet" in caplog.text
+
+    # The second will succeed
+    await coordinator.async_refresh()
+    assert listener.mock_calls == [call(), call()]
+    assert coordinator.data == manifest
+
+    await coordinator.async_shutdown()
diff --git a/tests/components/homeassistant_hardware/test_helpers.py b/tests/components/homeassistant_hardware/test_helpers.py
new file mode 100644
index 00000000000..183995be7ce
--- /dev/null
+++ b/tests/components/homeassistant_hardware/test_helpers.py
@@ -0,0 +1,185 @@
+"""Test hardware helpers."""
+
+import logging
+from unittest.mock import AsyncMock, MagicMock, Mock, call
+
+import pytest
+
+from homeassistant.components.homeassistant_hardware.const import DATA_COMPONENT
+from homeassistant.components.homeassistant_hardware.helpers import (
+    async_notify_firmware_info,
+    async_register_firmware_info_callback,
+    async_register_firmware_info_provider,
+)
+from homeassistant.components.homeassistant_hardware.util import (
+    ApplicationType,
+    FirmwareInfo,
+)
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.common import MockConfigEntry
+
+FIRMWARE_INFO_EZSP = FirmwareInfo(
+    device="/dev/serial/by-id/device1",
+    firmware_type=ApplicationType.EZSP,
+    firmware_version=None,
+    source="zha",
+    owners=[AsyncMock(is_running=AsyncMock(return_value=True))],
+)
+
+FIRMWARE_INFO_SPINEL = FirmwareInfo(
+    device="/dev/serial/by-id/device2",
+    firmware_type=ApplicationType.SPINEL,
+    firmware_version=None,
+    source="otbr",
+    owners=[AsyncMock(is_running=AsyncMock(return_value=True))],
+)
+
+
+async def test_dispatcher_registration(hass: HomeAssistant) -> None:
+    """Test HardwareInfoDispatcher registration."""
+
+    await async_setup_component(hass, "homeassistant_hardware", {})
+
+    # Mock provider 1 with a synchronous method to pull firmware info
+    provider1_config_entry = MockConfigEntry(
+        domain="zha",
+        unique_id="some_unique_id1",
+        data={},
+    )
+    provider1_config_entry.add_to_hass(hass)
+    provider1_config_entry.mock_state(hass, ConfigEntryState.LOADED)
+
+    provider1_firmware = MagicMock(spec=["get_firmware_info"])
+    provider1_firmware.get_firmware_info = MagicMock(return_value=FIRMWARE_INFO_EZSP)
+    async_register_firmware_info_provider(hass, "zha", provider1_firmware)
+
+    # Mock provider 2 with an asynchronous method to pull firmware info
+    provider2_config_entry = MockConfigEntry(
+        domain="otbr",
+        unique_id="some_unique_id2",
+        data={},
+    )
+    provider2_config_entry.add_to_hass(hass)
+    provider2_config_entry.mock_state(hass, ConfigEntryState.LOADED)
+
+    provider2_firmware = MagicMock(spec=["async_get_firmware_info"])
+    provider2_firmware.async_get_firmware_info = AsyncMock(
+        return_value=FIRMWARE_INFO_SPINEL
+    )
+    async_register_firmware_info_provider(hass, "otbr", provider2_firmware)
+
+    # Double registration won't work
+    with pytest.raises(ValueError, match="Domain zha is already registered"):
+        async_register_firmware_info_provider(hass, "zha", provider1_firmware)
+
+    # We can iterate over the results
+    info = [i async for i in hass.data[DATA_COMPONENT].iter_firmware_info()]
+    assert info == [
+        FIRMWARE_INFO_EZSP,
+        FIRMWARE_INFO_SPINEL,
+    ]
+
+    callback1 = Mock()
+    cancel1 = async_register_firmware_info_callback(
+        hass, "/dev/serial/by-id/device1", callback1
+    )
+
+    callback2 = Mock()
+    cancel2 = async_register_firmware_info_callback(
+        hass, "/dev/serial/by-id/device2", callback2
+    )
+
+    # And receive notification callbacks
+    await async_notify_firmware_info(hass, "zha", firmware_info=FIRMWARE_INFO_EZSP)
+    await async_notify_firmware_info(hass, "otbr", firmware_info=FIRMWARE_INFO_SPINEL)
+    await async_notify_firmware_info(hass, "zha", firmware_info=FIRMWARE_INFO_EZSP)
+    cancel1()
+    await async_notify_firmware_info(hass, "zha", firmware_info=FIRMWARE_INFO_EZSP)
+    await async_notify_firmware_info(hass, "otbr", firmware_info=FIRMWARE_INFO_SPINEL)
+    cancel2()
+
+    assert callback1.mock_calls == [
+        call(FIRMWARE_INFO_EZSP),
+        call(FIRMWARE_INFO_EZSP),
+    ]
+
+    assert callback2.mock_calls == [
+        call(FIRMWARE_INFO_SPINEL),
+        call(FIRMWARE_INFO_SPINEL),
+    ]
+
+
+async def test_dispatcher_iter_error_handling(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test HardwareInfoDispatcher ignoring errors from firmware info providers."""
+
+    await async_setup_component(hass, "homeassistant_hardware", {})
+
+    provider1_config_entry = MockConfigEntry(
+        domain="zha",
+        unique_id="some_unique_id1",
+        data={},
+    )
+    provider1_config_entry.add_to_hass(hass)
+    provider1_config_entry.mock_state(hass, ConfigEntryState.LOADED)
+
+    provider1_firmware = MagicMock(spec=["get_firmware_info"])
+    provider1_firmware.get_firmware_info = MagicMock(side_effect=Exception("Boom!"))
+    async_register_firmware_info_provider(hass, "zha", provider1_firmware)
+
+    provider2_config_entry = MockConfigEntry(
+        domain="otbr",
+        unique_id="some_unique_id2",
+        data={},
+    )
+    provider2_config_entry.add_to_hass(hass)
+    provider2_config_entry.mock_state(hass, ConfigEntryState.LOADED)
+
+    provider2_firmware = MagicMock(spec=["async_get_firmware_info"])
+    provider2_firmware.async_get_firmware_info = AsyncMock(
+        return_value=FIRMWARE_INFO_SPINEL
+    )
+    async_register_firmware_info_provider(hass, "otbr", provider2_firmware)
+
+    with caplog.at_level(logging.ERROR):
+        info = [i async for i in hass.data[DATA_COMPONENT].iter_firmware_info()]
+
+    assert info == [FIRMWARE_INFO_SPINEL]
+    assert "Error while getting firmware info from" in caplog.text
+
+
+async def test_dispatcher_callback_error_handling(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test HardwareInfoDispatcher ignoring errors from firmware info callbacks."""
+
+    await async_setup_component(hass, "homeassistant_hardware", {})
+    provider1_config_entry = MockConfigEntry(
+        domain="zha",
+        unique_id="some_unique_id1",
+        data={},
+    )
+    provider1_config_entry.add_to_hass(hass)
+    provider1_config_entry.mock_state(hass, ConfigEntryState.LOADED)
+
+    provider1_firmware = MagicMock(spec=["get_firmware_info"])
+    provider1_firmware.get_firmware_info = MagicMock(return_value=FIRMWARE_INFO_EZSP)
+    async_register_firmware_info_provider(hass, "zha", provider1_firmware)
+
+    callback1 = Mock(side_effect=Exception("Some error"))
+    async_register_firmware_info_callback(hass, "/dev/serial/by-id/device1", callback1)
+
+    callback2 = Mock()
+    async_register_firmware_info_callback(hass, "/dev/serial/by-id/device1", callback2)
+
+    with caplog.at_level(logging.ERROR):
+        await async_notify_firmware_info(hass, "zha", firmware_info=FIRMWARE_INFO_EZSP)
+
+    assert "Error while notifying firmware info listener" in caplog.text
+
+    assert callback1.mock_calls == [call(FIRMWARE_INFO_EZSP)]
+    assert callback2.mock_calls == [call(FIRMWARE_INFO_EZSP)]
diff --git a/tests/components/homeassistant_hardware/test_silabs_multiprotocol_addon.py b/tests/components/homeassistant_hardware/test_silabs_multiprotocol_addon.py
index 22e3e338986..fbba3d42bbe 100644
--- a/tests/components/homeassistant_hardware/test_silabs_multiprotocol_addon.py
+++ b/tests/components/homeassistant_hardware/test_silabs_multiprotocol_addon.py
@@ -450,10 +450,7 @@ async def test_option_flow_install_multi_pan_addon_zha_other_radio(
     }
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test.options.abort.not_hassio"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 async def test_option_flow_non_hassio(
     hass: HomeAssistant,
 ) -> None:
@@ -766,10 +763,7 @@ async def test_option_flow_addon_installed_same_device_do_not_uninstall_multi_pa
     assert result["type"] is FlowResultType.CREATE_ENTRY
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test.options.abort.addon_already_running"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 async def test_option_flow_flasher_already_running_failure(
     hass: HomeAssistant,
     addon_info,
@@ -881,10 +875,7 @@ async def test_option_flow_addon_installed_same_device_flasher_already_installed
     assert result["type"] is FlowResultType.CREATE_ENTRY
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test.options.abort.addon_install_failed"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 async def test_option_flow_flasher_install_failure(
     hass: HomeAssistant,
     addon_info,
@@ -951,10 +942,7 @@ async def test_option_flow_flasher_install_failure(
     assert result["reason"] == "addon_install_failed"
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test.options.abort.addon_start_failed"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 async def test_option_flow_flasher_addon_flash_failure(
     hass: HomeAssistant,
     addon_info,
@@ -1017,10 +1005,7 @@ async def test_option_flow_flasher_addon_flash_failure(
     assert result["description_placeholders"]["addon_name"] == "Silicon Labs Flasher"
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test.options.abort.zha_migration_failed"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 @patch(
     "homeassistant.components.zha.radio_manager.ZhaMultiPANMigrationHelper.async_initiate_migration",
     side_effect=Exception("Boom!"),
@@ -1082,10 +1067,7 @@ async def test_option_flow_uninstall_migration_initiate_failure(
     mock_initiate_migration.assert_called_once()
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test.options.abort.zha_migration_failed"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 @patch(
     "homeassistant.components.zha.radio_manager.ZhaMultiPANMigrationHelper.async_finish_migration",
     side_effect=Exception("Boom!"),
@@ -1187,10 +1169,7 @@ async def test_option_flow_do_not_install_multi_pan_addon(
     assert result["type"] is FlowResultType.CREATE_ENTRY
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test.options.abort.addon_install_failed"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 async def test_option_flow_install_multi_pan_addon_install_fails(
     hass: HomeAssistant,
     addon_store_info,
@@ -1234,10 +1213,7 @@ async def test_option_flow_install_multi_pan_addon_install_fails(
     assert result["reason"] == "addon_install_failed"
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test.options.abort.addon_start_failed"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 async def test_option_flow_install_multi_pan_addon_start_fails(
     hass: HomeAssistant,
     addon_store_info,
@@ -1299,10 +1275,7 @@ async def test_option_flow_install_multi_pan_addon_start_fails(
     assert result["reason"] == "addon_start_failed"
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test.options.abort.addon_set_config_failed"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 async def test_option_flow_install_multi_pan_addon_set_options_fails(
     hass: HomeAssistant,
     addon_store_info,
@@ -1346,10 +1319,7 @@ async def test_option_flow_install_multi_pan_addon_set_options_fails(
     assert result["reason"] == "addon_set_config_failed"
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test.options.abort.addon_info_failed"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 async def test_option_flow_addon_info_fails(
     hass: HomeAssistant,
     addon_store_info,
@@ -1373,10 +1343,7 @@ async def test_option_flow_addon_info_fails(
     assert result["reason"] == "addon_info_failed"
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test.options.abort.zha_migration_failed"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 @patch(
     "homeassistant.components.zha.radio_manager.ZhaMultiPANMigrationHelper.async_initiate_migration",
     side_effect=Exception("Boom!"),
@@ -1432,10 +1399,7 @@ async def test_option_flow_install_multi_pan_addon_zha_migration_fails_step_1(
     set_addon_options.assert_not_called()
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.test.options.abort.zha_migration_failed"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 @patch(
     "homeassistant.components.zha.radio_manager.ZhaMultiPANMigrationHelper.async_finish_migration",
     side_effect=Exception("Boom!"),
diff --git a/tests/components/homeassistant_hardware/test_update.py b/tests/components/homeassistant_hardware/test_update.py
new file mode 100644
index 00000000000..0c351141e12
--- /dev/null
+++ b/tests/components/homeassistant_hardware/test_update.py
@@ -0,0 +1,637 @@
+"""Test Home Assistant Hardware firmware update entity."""
+
+from __future__ import annotations
+
+import asyncio
+from collections.abc import AsyncGenerator
+import dataclasses
+import logging
+from unittest.mock import AsyncMock, Mock, patch
+
+import aiohttp
+from ha_silabs_firmware_client import FirmwareManifest, FirmwareMetadata
+import pytest
+from yarl import URL
+
+from homeassistant.components.homeassistant_hardware.coordinator import (
+    FirmwareUpdateCoordinator,
+)
+from homeassistant.components.homeassistant_hardware.helpers import (
+    async_notify_firmware_info,
+    async_register_firmware_info_provider,
+)
+from homeassistant.components.homeassistant_hardware.update import (
+    BaseFirmwareUpdateEntity,
+    FirmwareUpdateEntityDescription,
+    FirmwareUpdateExtraStoredData,
+)
+from homeassistant.components.homeassistant_hardware.util import (
+    ApplicationType,
+    FirmwareInfo,
+    OwningIntegration,
+)
+from homeassistant.components.update import UpdateDeviceClass
+from homeassistant.config_entries import ConfigEntry, ConfigEntryState, ConfigFlow
+from homeassistant.const import EVENT_STATE_CHANGED, EntityCategory
+from homeassistant.core import (
+    Event,
+    EventStateChangedData,
+    HomeAssistant,
+    HomeAssistantError,
+    State,
+    callback,
+)
+from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.setup import async_setup_component
+from homeassistant.util import dt as dt_util
+
+from tests.common import (
+    MockConfigEntry,
+    MockModule,
+    MockPlatform,
+    async_capture_events,
+    mock_config_flow,
+    mock_integration,
+    mock_platform,
+    mock_restore_cache_with_extra_data,
+)
+
+TEST_DOMAIN = "test"
+TEST_DEVICE = "/dev/serial/by-id/some-unique-serial-device-12345"
+TEST_FIRMWARE_RELEASES_URL = "https://example.org/firmware"
+TEST_UPDATE_ENTITY_ID = "update.test_firmware"
+TEST_MANIFEST = FirmwareManifest(
+    url=URL("https://example.org/firmware"),
+    html_url=URL("https://example.org/release_notes"),
+    created_at=dt_util.utcnow(),
+    firmwares=(
+        FirmwareMetadata(
+            filename="skyconnect_zigbee_ncp_test.gbl",
+            checksum="aaa",
+            size=123,
+            release_notes="Some release notes go here",
+            metadata={
+                "baudrate": 115200,
+                "ezsp_version": "7.4.4.0",
+                "fw_type": "zigbee_ncp",
+                "fw_variant": None,
+                "metadata_version": 2,
+                "sdk_version": "4.4.4",
+            },
+            url=URL("https://example.org/firmwares/skyconnect_zigbee_ncp_test.gbl"),
+        ),
+    ),
+)
+
+
+TEST_FIRMWARE_ENTITY_DESCRIPTIONS: dict[
+    ApplicationType | None, FirmwareUpdateEntityDescription
+] = {
+    ApplicationType.EZSP: FirmwareUpdateEntityDescription(
+        key="firmware",
+        display_precision=0,
+        device_class=UpdateDeviceClass.FIRMWARE,
+        entity_category=EntityCategory.CONFIG,
+        version_parser=lambda fw: fw.split(" ", 1)[0],
+        fw_type="skyconnect_zigbee_ncp",
+        version_key="ezsp_version",
+        expected_firmware_type=ApplicationType.EZSP,
+        firmware_name="EmberZNet",
+    ),
+    ApplicationType.SPINEL: FirmwareUpdateEntityDescription(
+        key="firmware",
+        display_precision=0,
+        device_class=UpdateDeviceClass.FIRMWARE,
+        entity_category=EntityCategory.CONFIG,
+        version_parser=lambda fw: fw.split("/", 1)[1].split("_", 1)[0],
+        fw_type="skyconnect_openthread_rcp",
+        version_key="ot_rcp_version",
+        expected_firmware_type=ApplicationType.SPINEL,
+        firmware_name="OpenThread RCP",
+    ),
+    None: FirmwareUpdateEntityDescription(
+        key="firmware",
+        display_precision=0,
+        device_class=UpdateDeviceClass.FIRMWARE,
+        entity_category=EntityCategory.CONFIG,
+        version_parser=lambda fw: fw,
+        fw_type=None,
+        version_key=None,
+        expected_firmware_type=None,
+        firmware_name=None,
+    ),
+}
+
+
+def _mock_async_create_update_entity(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    session: aiohttp.ClientSession,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> MockFirmwareUpdateEntity:
+    """Create an update entity that handles firmware type changes."""
+    firmware_type = config_entry.data["firmware"]
+    entity_description = TEST_FIRMWARE_ENTITY_DESCRIPTIONS[
+        ApplicationType(firmware_type) if firmware_type is not None else None
+    ]
+
+    entity = MockFirmwareUpdateEntity(
+        device=config_entry.data["device"],
+        config_entry=config_entry,
+        update_coordinator=FirmwareUpdateCoordinator(
+            hass,
+            session,
+            TEST_FIRMWARE_RELEASES_URL,
+        ),
+        entity_description=entity_description,
+    )
+
+    def firmware_type_changed(
+        old_type: ApplicationType | None, new_type: ApplicationType | None
+    ) -> None:
+        """Replace the current entity when the firmware type changes."""
+        er.async_get(hass).async_remove(entity.entity_id)
+        async_add_entities(
+            [
+                _mock_async_create_update_entity(
+                    hass, config_entry, session, async_add_entities
+                )
+            ]
+        )
+
+    entity.async_on_remove(
+        entity.add_firmware_type_changed_callback(firmware_type_changed)
+    )
+
+    return entity
+
+
+async def mock_async_setup_entry(
+    hass: HomeAssistant, config_entry: ConfigEntry
+) -> bool:
+    """Set up test config entry."""
+    await hass.config_entries.async_forward_entry_setups(config_entry, ["update"])
+    return True
+
+
+async def mock_async_setup_update_entities(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the firmware update config entry."""
+    session = async_get_clientsession(hass)
+    entity = _mock_async_create_update_entity(
+        hass, config_entry, session, async_add_entities
+    )
+
+    async_add_entities([entity])
+
+
+class MockFirmwareUpdateEntity(BaseFirmwareUpdateEntity):
+    """Mock SkyConnect firmware update entity."""
+
+    bootloader_reset_type = None
+
+    def __init__(
+        self,
+        device: str,
+        config_entry: ConfigEntry,
+        update_coordinator: FirmwareUpdateCoordinator,
+        entity_description: FirmwareUpdateEntityDescription,
+    ) -> None:
+        """Initialize the mock SkyConnect firmware update entity."""
+        super().__init__(device, config_entry, update_coordinator, entity_description)
+        self._attr_unique_id = self.entity_description.key
+
+        # Use the cached firmware info if it exists
+        if self._config_entry.data["firmware"] is not None:
+            self._current_firmware_info = FirmwareInfo(
+                device=device,
+                firmware_type=ApplicationType(self._config_entry.data["firmware"]),
+                firmware_version=self._config_entry.data["firmware_version"],
+                owners=[],
+                source=TEST_DOMAIN,
+            )
+
+    @callback
+    def _firmware_info_callback(self, firmware_info: FirmwareInfo) -> None:
+        """Handle updated firmware info being pushed by an integration."""
+        super()._firmware_info_callback(firmware_info)
+
+        self.hass.config_entries.async_update_entry(
+            self._config_entry,
+            data={
+                **self._config_entry.data,
+                "firmware": firmware_info.firmware_type,
+                "firmware_version": firmware_info.firmware_version,
+            },
+        )
+
+
+@pytest.fixture(name="update_config_entry")
+async def mock_update_config_entry(
+    hass: HomeAssistant,
+) -> AsyncGenerator[ConfigEntry]:
+    """Set up a mock Home Assistant Hardware firmware update entity."""
+    await async_setup_component(hass, "homeassistant", {})
+    await async_setup_component(hass, "homeassistant_hardware", {})
+
+    mock_integration(
+        hass,
+        MockModule(
+            TEST_DOMAIN,
+            async_setup_entry=mock_async_setup_entry,
+        ),
+        built_in=False,
+    )
+    mock_platform(hass, "test.config_flow")
+    mock_platform(
+        hass,
+        "test.update",
+        MockPlatform(async_setup_entry=mock_async_setup_update_entities),
+    )
+
+    # Set up a mock integration using the hardware update entity
+    config_entry = MockConfigEntry(
+        domain=TEST_DOMAIN,
+        data={
+            "device": TEST_DEVICE,
+            "firmware": "ezsp",
+            "firmware_version": "7.3.1.0 build 0",
+        },
+    )
+    config_entry.add_to_hass(hass)
+
+    with (
+        patch(
+            "homeassistant.components.homeassistant_hardware.coordinator.FirmwareUpdateClient",
+            autospec=True,
+        ) as mock_update_client,
+        mock_config_flow(TEST_DOMAIN, ConfigFlow),
+    ):
+        mock_update_client.return_value.async_update_data.return_value = TEST_MANIFEST
+        yield config_entry
+
+
+async def test_update_entity_installation(
+    hass: HomeAssistant, update_config_entry: ConfigEntry
+) -> None:
+    """Test the Hardware firmware update entity installation."""
+
+    assert await hass.config_entries.async_setup(update_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    # Set up another integration communicating with the device
+    owning_config_entry = MockConfigEntry(
+        domain="another_integration",
+        data={
+            "device": {
+                "path": TEST_DEVICE,
+                "flow_control": "hardware",
+                "baudrate": 115200,
+            },
+            "radio_type": "ezsp",
+        },
+        version=4,
+    )
+    owning_config_entry.add_to_hass(hass)
+    owning_config_entry.mock_state(hass, ConfigEntryState.LOADED)
+
+    # The integration provides firmware info
+    mock_hw_module = Mock()
+    mock_hw_module.get_firmware_info = lambda hass, config_entry: FirmwareInfo(
+        device=TEST_DEVICE,
+        firmware_type=ApplicationType.EZSP,
+        firmware_version="7.3.1.0 build 0",
+        owners=[OwningIntegration(config_entry_id=config_entry.entry_id)],
+        source="another_integration",
+    )
+
+    async_register_firmware_info_provider(hass, "another_integration", mock_hw_module)
+
+    # Pretend the other integration loaded and notified hardware of the running firmware
+    await async_notify_firmware_info(
+        hass,
+        "another_integration",
+        mock_hw_module.get_firmware_info(hass, owning_config_entry),
+    )
+
+    state_before_update = hass.states.get(TEST_UPDATE_ENTITY_ID)
+    assert state_before_update is not None
+    assert state_before_update.state == "unknown"
+    assert state_before_update.attributes["title"] == "EmberZNet"
+    assert state_before_update.attributes["installed_version"] == "7.3.1.0"
+    assert state_before_update.attributes["latest_version"] is None
+
+    # When we check for an update, one will be shown
+    await hass.services.async_call(
+        "homeassistant",
+        "update_entity",
+        {"entity_id": TEST_UPDATE_ENTITY_ID},
+        blocking=True,
+    )
+    state_after_update = hass.states.get(TEST_UPDATE_ENTITY_ID)
+    assert state_after_update is not None
+    assert state_after_update.state == "on"
+    assert state_after_update.attributes["title"] == "EmberZNet"
+    assert state_after_update.attributes["installed_version"] == "7.3.1.0"
+    assert state_after_update.attributes["latest_version"] == "7.4.4.0"
+    assert state_after_update.attributes["release_summary"] == (
+        "Some release notes go here"
+    )
+    assert state_after_update.attributes["release_url"] == (
+        "https://example.org/release_notes"
+    )
+
+    mock_firmware = Mock()
+    mock_flasher = AsyncMock()
+
+    async def mock_flash_firmware(fw_image, progress_callback):
+        await asyncio.sleep(0)
+        progress_callback(0, 100)
+        await asyncio.sleep(0)
+        progress_callback(50, 100)
+        await asyncio.sleep(0)
+        progress_callback(100, 100)
+
+    mock_flasher.flash_firmware = mock_flash_firmware
+
+    # When we install it, the other integration is reloaded
+    with (
+        patch(
+            "homeassistant.components.homeassistant_hardware.update.parse_firmware_image",
+            return_value=mock_firmware,
+        ),
+        patch(
+            "homeassistant.components.homeassistant_hardware.update.Flasher",
+            return_value=mock_flasher,
+        ),
+        patch(
+            "homeassistant.components.homeassistant_hardware.update.probe_silabs_firmware_info",
+            return_value=FirmwareInfo(
+                device=TEST_DEVICE,
+                firmware_type=ApplicationType.EZSP,
+                firmware_version="7.4.4.0 build 0",
+                owners=[],
+                source="probe",
+            ),
+        ),
+        patch.object(
+            owning_config_entry, "async_unload", wraps=owning_config_entry.async_unload
+        ) as owning_config_entry_unload,
+    ):
+        state_changes: list[Event[EventStateChangedData]] = async_capture_events(
+            hass, EVENT_STATE_CHANGED
+        )
+        await hass.services.async_call(
+            "update",
+            "install",
+            {"entity_id": TEST_UPDATE_ENTITY_ID},
+            blocking=True,
+        )
+
+    # Progress events are emitted during the installation
+    assert len(state_changes) == 7
+
+    # Indeterminate progress first
+    assert state_changes[0].data["new_state"].attributes["in_progress"] is True
+    assert state_changes[0].data["new_state"].attributes["update_percentage"] is None
+
+    # Then the update starts
+    assert state_changes[1].data["new_state"].attributes["update_percentage"] == 0
+    assert state_changes[2].data["new_state"].attributes["update_percentage"] == 50
+    assert state_changes[3].data["new_state"].attributes["update_percentage"] == 100
+
+    # Once it is done, we probe the firmware
+    assert state_changes[4].data["new_state"].attributes["in_progress"] is True
+    assert state_changes[4].data["new_state"].attributes["update_percentage"] is None
+
+    # Finally, the update finishes
+    assert state_changes[5].data["new_state"].attributes["update_percentage"] is None
+    assert state_changes[6].data["new_state"].attributes["update_percentage"] is None
+    assert state_changes[6].data["new_state"].attributes["in_progress"] is False
+
+    # The owning integration was unloaded and is again running
+    assert len(owning_config_entry_unload.mock_calls) == 1
+
+    # After the firmware update, the entity has the new version and the correct state
+    state_after_install = hass.states.get(TEST_UPDATE_ENTITY_ID)
+    assert state_after_install is not None
+    assert state_after_install.state == "off"
+    assert state_after_install.attributes["title"] == "EmberZNet"
+    assert state_after_install.attributes["installed_version"] == "7.4.4.0"
+    assert state_after_install.attributes["latest_version"] == "7.4.4.0"
+
+
+async def test_update_entity_installation_failure(
+    hass: HomeAssistant, update_config_entry: ConfigEntry
+) -> None:
+    """Test installation failing during flashing."""
+    assert await hass.config_entries.async_setup(update_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    await hass.services.async_call(
+        "homeassistant",
+        "update_entity",
+        {"entity_id": TEST_UPDATE_ENTITY_ID},
+        blocking=True,
+    )
+
+    state_before_install = hass.states.get(TEST_UPDATE_ENTITY_ID)
+    assert state_before_install is not None
+    assert state_before_install.state == "on"
+    assert state_before_install.attributes["title"] == "EmberZNet"
+    assert state_before_install.attributes["installed_version"] == "7.3.1.0"
+    assert state_before_install.attributes["latest_version"] == "7.4.4.0"
+
+    mock_flasher = AsyncMock()
+    mock_flasher.flash_firmware.side_effect = RuntimeError(
+        "Something broke during flashing!"
+    )
+
+    with (
+        patch(
+            "homeassistant.components.homeassistant_hardware.update.parse_firmware_image",
+            return_value=Mock(),
+        ),
+        patch(
+            "homeassistant.components.homeassistant_hardware.update.Flasher",
+            return_value=mock_flasher,
+        ),
+        pytest.raises(HomeAssistantError, match="Failed to flash firmware"),
+    ):
+        await hass.services.async_call(
+            "update",
+            "install",
+            {"entity_id": TEST_UPDATE_ENTITY_ID},
+            blocking=True,
+        )
+
+    # After the firmware update fails, we can still try again
+    state_after_install = hass.states.get(TEST_UPDATE_ENTITY_ID)
+    assert state_after_install is not None
+    assert state_after_install.state == "on"
+    assert state_after_install.attributes["title"] == "EmberZNet"
+    assert state_after_install.attributes["installed_version"] == "7.3.1.0"
+    assert state_after_install.attributes["latest_version"] == "7.4.4.0"
+
+
+async def test_update_entity_installation_probe_failure(
+    hass: HomeAssistant, update_config_entry: ConfigEntry
+) -> None:
+    """Test installation failing during post-flashing probing."""
+    assert await hass.config_entries.async_setup(update_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    await hass.services.async_call(
+        "homeassistant",
+        "update_entity",
+        {"entity_id": TEST_UPDATE_ENTITY_ID},
+        blocking=True,
+    )
+
+    state_before_install = hass.states.get(TEST_UPDATE_ENTITY_ID)
+    assert state_before_install is not None
+    assert state_before_install.state == "on"
+    assert state_before_install.attributes["title"] == "EmberZNet"
+    assert state_before_install.attributes["installed_version"] == "7.3.1.0"
+    assert state_before_install.attributes["latest_version"] == "7.4.4.0"
+
+    with (
+        patch(
+            "homeassistant.components.homeassistant_hardware.update.parse_firmware_image",
+            return_value=Mock(),
+        ),
+        patch(
+            "homeassistant.components.homeassistant_hardware.update.Flasher",
+            return_value=AsyncMock(),
+        ),
+        patch(
+            "homeassistant.components.homeassistant_hardware.update.probe_silabs_firmware_info",
+            return_value=None,
+        ),
+        pytest.raises(
+            HomeAssistantError, match="Failed to probe the firmware after flashing"
+        ),
+    ):
+        await hass.services.async_call(
+            "update",
+            "install",
+            {"entity_id": TEST_UPDATE_ENTITY_ID},
+            blocking=True,
+        )
+
+    # After the firmware update fails, we can still try again
+    state_after_install = hass.states.get(TEST_UPDATE_ENTITY_ID)
+    assert state_after_install is not None
+    assert state_after_install.state == "on"
+    assert state_after_install.attributes["title"] == "EmberZNet"
+    assert state_after_install.attributes["installed_version"] == "7.3.1.0"
+    assert state_after_install.attributes["latest_version"] == "7.4.4.0"
+
+
+async def test_update_entity_state_restoration(
+    hass: HomeAssistant, update_config_entry: ConfigEntry
+) -> None:
+    """Test the Hardware firmware update entity state restoration."""
+
+    mock_restore_cache_with_extra_data(
+        hass,
+        [
+            (
+                State(TEST_UPDATE_ENTITY_ID, "on"),
+                FirmwareUpdateExtraStoredData(
+                    firmware_manifest=TEST_MANIFEST
+                ).as_dict(),
+            )
+        ],
+    )
+
+    assert await hass.config_entries.async_setup(update_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    # The state is correctly restored
+    state = hass.states.get(TEST_UPDATE_ENTITY_ID)
+    assert state is not None
+    assert state.state == "on"
+    assert state.attributes["title"] == "EmberZNet"
+    assert state.attributes["installed_version"] == "7.3.1.0"
+    assert state.attributes["latest_version"] == "7.4.4.0"
+    assert state.attributes["release_summary"] == ("Some release notes go here")
+    assert state.attributes["release_url"] == ("https://example.org/release_notes")
+
+
+async def test_update_entity_firmware_missing_from_manifest(
+    hass: HomeAssistant, update_config_entry: ConfigEntry
+) -> None:
+    """Test the Hardware firmware update entity handles missing firmware."""
+
+    mock_restore_cache_with_extra_data(
+        hass,
+        [
+            (
+                State(TEST_UPDATE_ENTITY_ID, "on"),
+                # Ensure the manifest does not contain our expected firmware type
+                FirmwareUpdateExtraStoredData(
+                    firmware_manifest=dataclasses.replace(TEST_MANIFEST, firmwares=())
+                ).as_dict(),
+            )
+        ],
+    )
+
+    assert await hass.config_entries.async_setup(update_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    # The state is restored, accounting for the missing firmware
+    state = hass.states.get(TEST_UPDATE_ENTITY_ID)
+    assert state is not None
+    assert state.state == "unknown"
+    assert state.attributes["title"] == "EmberZNet"
+    assert state.attributes["installed_version"] == "7.3.1.0"
+    assert state.attributes["latest_version"] is None
+    assert state.attributes["release_summary"] is None
+    assert state.attributes["release_url"] is None
+
+
+async def test_update_entity_graceful_firmware_type_callback_errors(
+    hass: HomeAssistant,
+    update_config_entry: ConfigEntry,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test firmware update entity handling of firmware type callback errors."""
+
+    session = async_get_clientsession(hass)
+    update_entity = MockFirmwareUpdateEntity(
+        device=TEST_DEVICE,
+        config_entry=update_config_entry,
+        update_coordinator=FirmwareUpdateCoordinator(
+            hass,
+            session,
+            TEST_FIRMWARE_RELEASES_URL,
+        ),
+        entity_description=TEST_FIRMWARE_ENTITY_DESCRIPTIONS[ApplicationType.EZSP],
+    )
+    update_entity.hass = hass
+    await update_entity.async_added_to_hass()
+
+    callback = Mock(side_effect=RuntimeError("Callback failed"))
+    unregister_callback = update_entity.add_firmware_type_changed_callback(callback)
+
+    with caplog.at_level(logging.WARNING):
+        await async_notify_firmware_info(
+            hass,
+            "some_integration",
+            FirmwareInfo(
+                device=TEST_DEVICE,
+                firmware_type=ApplicationType.SPINEL,
+                firmware_version="SL-OPENTHREAD/2.4.4.0_GitHub-7074a43e4; EFR32; Oct 21 2024 14:40:57",
+                owners=[],
+                source="probe",
+            ),
+        )
+
+    unregister_callback()
+    assert "Failed to call firmware type changed callback" in caplog.text
diff --git a/tests/components/homeassistant_hardware/test_util.py b/tests/components/homeassistant_hardware/test_util.py
index 3f019a0409c..1b7bfe4a8ac 100644
--- a/tests/components/homeassistant_hardware/test_util.py
+++ b/tests/components/homeassistant_hardware/test_util.py
@@ -1,18 +1,33 @@
 """Test hardware utilities."""
 
-from unittest.mock import AsyncMock, patch
+from unittest.mock import AsyncMock, MagicMock, patch
 
-from homeassistant.components.hassio import AddonError, AddonInfo, AddonState
+import pytest
+from universal_silabs_flasher.common import Version as FlasherVersion
+from universal_silabs_flasher.const import ApplicationType as FlasherApplicationType
+
+from homeassistant.components.hassio import (
+    AddonError,
+    AddonInfo,
+    AddonManager,
+    AddonState,
+)
+from homeassistant.components.homeassistant_hardware.helpers import (
+    async_register_firmware_info_provider,
+)
 from homeassistant.components.homeassistant_hardware.util import (
     ApplicationType,
-    FirmwareGuess,
-    FlasherApplicationType,
-    get_zha_device_path,
-    guess_firmware_type,
+    FirmwareInfo,
+    OwningAddon,
+    OwningIntegration,
+    get_otbr_addon_firmware_info,
+    guess_firmware_info,
+    probe_silabs_firmware_info,
     probe_silabs_firmware_type,
 )
-from homeassistant.config_entries import ConfigEntryState
+from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry
 
@@ -21,7 +36,21 @@ ZHA_CONFIG_ENTRY = MockConfigEntry(
     unique_id="some_unique_id",
     data={
         "device": {
-            "path": "socket://1.2.3.4:5678",
+            "path": "/dev/ttyUSB1",
+            "baudrate": 115200,
+            "flow_control": None,
+        },
+        "radio_type": "ezsp",
+    },
+    version=4,
+)
+
+ZHA_CONFIG_ENTRY2 = MockConfigEntry(
+    domain="zha",
+    unique_id="some_other_unique_id",
+    data={
+        "device": {
+            "path": "/dev/ttyUSB2",
             "baudrate": 115200,
             "flow_control": None,
         },
@@ -31,153 +60,469 @@ ZHA_CONFIG_ENTRY = MockConfigEntry(
 )
 
 
-def test_get_zha_device_path() -> None:
-    """Test extracting the ZHA device path from its config entry."""
-    assert (
-        get_zha_device_path(ZHA_CONFIG_ENTRY) == ZHA_CONFIG_ENTRY.data["device"]["path"]
-    )
-
-
-def test_get_zha_device_path_ignored_discovery() -> None:
-    """Test extracting the ZHA device path from an ignored ZHA discovery."""
-    config_entry = MockConfigEntry(
-        domain="zha",
-        unique_id="some_unique_id",
-        data={},
-        version=4,
-    )
-
-    assert get_zha_device_path(config_entry) is None
-
-
-async def test_guess_firmware_type_unknown(hass: HomeAssistant) -> None:
+async def test_guess_firmware_info_unknown(hass: HomeAssistant) -> None:
     """Test guessing the firmware type."""
 
-    assert (await guess_firmware_type(hass, "/dev/missing")) == FirmwareGuess(
-        is_running=False, firmware_type=ApplicationType.EZSP, source="unknown"
+    await async_setup_component(hass, "homeassistant_hardware", {})
+
+    assert (await guess_firmware_info(hass, "/dev/missing")) == FirmwareInfo(
+        device="/dev/missing",
+        firmware_type=ApplicationType.EZSP,
+        firmware_version=None,
+        source="unknown",
+        owners=[],
     )
 
 
-async def test_guess_firmware_type(hass: HomeAssistant) -> None:
-    """Test guessing the firmware."""
-    path = ZHA_CONFIG_ENTRY.data["device"]["path"]
+async def test_guess_firmware_info_integrations(hass: HomeAssistant) -> None:
+    """Test guessing the firmware via OTBR and ZHA."""
 
-    ZHA_CONFIG_ENTRY.add_to_hass(hass)
+    await async_setup_component(hass, "homeassistant_hardware", {})
 
-    ZHA_CONFIG_ENTRY.mock_state(hass, ConfigEntryState.NOT_LOADED)
-    assert (await guess_firmware_type(hass, path)) == FirmwareGuess(
-        is_running=False, firmware_type=ApplicationType.EZSP, source="zha"
+    # One instance of ZHA and two OTBRs
+    zha = MockConfigEntry(domain="zha", unique_id="some_unique_id_1")
+    zha.add_to_hass(hass)
+
+    otbr1 = MockConfigEntry(domain="otbr", unique_id="some_unique_id_2")
+    otbr1.add_to_hass(hass)
+
+    otbr2 = MockConfigEntry(domain="otbr", unique_id="some_unique_id_3")
+    otbr2.add_to_hass(hass)
+
+    # First ZHA is running with the stick
+    zha_firmware_info = FirmwareInfo(
+        device="/dev/serial/by-id/device1",
+        firmware_type=ApplicationType.EZSP,
+        firmware_version=None,
+        source="zha",
+        owners=[AsyncMock(is_running=AsyncMock(return_value=True))],
     )
 
-    # When ZHA is running, we indicate as such when guessing
-    ZHA_CONFIG_ENTRY.mock_state(hass, ConfigEntryState.LOADED)
-    assert (await guess_firmware_type(hass, path)) == FirmwareGuess(
-        is_running=True, firmware_type=ApplicationType.EZSP, source="zha"
+    # First OTBR: neither the addon or the integration are loaded
+    otbr_firmware_info1 = FirmwareInfo(
+        device="/dev/serial/by-id/device1",
+        firmware_type=ApplicationType.SPINEL,
+        firmware_version=None,
+        source="otbr",
+        owners=[
+            AsyncMock(is_running=AsyncMock(return_value=False)),
+            AsyncMock(is_running=AsyncMock(return_value=False)),
+        ],
     )
 
-    mock_otbr_addon_manager = AsyncMock()
-    mock_multipan_addon_manager = AsyncMock()
+    # Second OTBR: fully running but is with an unrelated device
+    otbr_firmware_info2 = FirmwareInfo(
+        device="/dev/serial/by-id/device2",  # An unrelated device
+        firmware_type=ApplicationType.SPINEL,
+        firmware_version=None,
+        source="otbr",
+        owners=[
+            AsyncMock(is_running=AsyncMock(return_value=True)),
+            AsyncMock(is_running=AsyncMock(return_value=True)),
+        ],
+    )
 
+    mock_zha_hardware_info = MagicMock(spec=["get_firmware_info"])
+    mock_zha_hardware_info.get_firmware_info = MagicMock(return_value=zha_firmware_info)
+    async_register_firmware_info_provider(hass, "zha", mock_zha_hardware_info)
+
+    async def mock_otbr_async_get_firmware_info(
+        hass: HomeAssistant, config_entry: ConfigEntry
+    ) -> FirmwareInfo | None:
+        return {
+            otbr1.entry_id: otbr_firmware_info1,
+            otbr2.entry_id: otbr_firmware_info2,
+        }.get(config_entry.entry_id)
+
+    mock_otbr_hardware_info = MagicMock(spec=["async_get_firmware_info"])
+    mock_otbr_hardware_info.async_get_firmware_info = AsyncMock(
+        side_effect=mock_otbr_async_get_firmware_info
+    )
+    async_register_firmware_info_provider(hass, "otbr", mock_otbr_hardware_info)
+
+    # ZHA wins for the first stick, since it's actually running
+    assert (
+        await guess_firmware_info(hass, "/dev/serial/by-id/device1")
+    ) == zha_firmware_info
+
+    # Second stick is communicating exclusively with the second OTBR
+    assert (
+        await guess_firmware_info(hass, "/dev/serial/by-id/device2")
+    ) == otbr_firmware_info2
+
+    # If we stop ZHA, OTBR will take priority
+    zha_firmware_info.owners[0].is_running.return_value = False
+    otbr_firmware_info1.owners[0].is_running.return_value = True
+    assert (
+        await guess_firmware_info(hass, "/dev/serial/by-id/device1")
+    ) == otbr_firmware_info1
+
+
+async def test_owning_addon(hass: HomeAssistant) -> None:
+    """Test `OwningAddon`."""
+
+    owning_addon = OwningAddon(slug="some-addon-slug")
+
+    # Explicitly running
+    with patch(
+        "homeassistant.components.homeassistant_hardware.util.WaitingAddonManager"
+    ) as mock_manager:
+        mock_manager.return_value.async_get_addon_info = AsyncMock(
+            return_value=AddonInfo(
+                available=True,
+                hostname="core_some_addon_slug",
+                options={},
+                state=AddonState.RUNNING,
+                update_available=False,
+                version="1.0.0",
+            )
+        )
+        assert (await owning_addon.is_running(hass)) is True
+
+    # Explicitly not running
+    with patch(
+        "homeassistant.components.homeassistant_hardware.util.WaitingAddonManager"
+    ) as mock_manager:
+        mock_manager.return_value.async_get_addon_info = AsyncMock(
+            return_value=AddonInfo(
+                available=True,
+                hostname="core_some_addon_slug",
+                options={},
+                state=AddonState.NOT_RUNNING,
+                update_available=False,
+                version="1.0.0",
+            )
+        )
+        assert (await owning_addon.is_running(hass)) is False
+
+    # Failed to get status
+    with patch(
+        "homeassistant.components.homeassistant_hardware.util.WaitingAddonManager"
+    ) as mock_manager:
+        mock_manager.return_value.async_get_addon_info = AsyncMock(
+            side_effect=AddonError()
+        )
+        assert (await owning_addon.is_running(hass)) is False
+
+
+async def test_owning_addon_temporarily_stop_info_error(hass: HomeAssistant) -> None:
+    """Test `OwningAddon` temporarily stopping with an info error."""
+
+    owning_addon = OwningAddon(slug="some-addon-slug")
+    mock_manager = AsyncMock()
+    mock_manager.async_get_addon_info.side_effect = AddonError()
+
+    with patch(
+        "homeassistant.components.homeassistant_hardware.util.WaitingAddonManager",
+        return_value=mock_manager,
+    ):
+        async with owning_addon.temporarily_stop(hass):
+            pass
+
+    # We never restart it
+    assert len(mock_manager.async_get_addon_info.mock_calls) == 1
+    assert len(mock_manager.async_stop_addon.mock_calls) == 0
+    assert len(mock_manager.async_wait_until_addon_state.mock_calls) == 0
+    assert len(mock_manager.async_start_addon_waiting.mock_calls) == 0
+
+
+async def test_owning_addon_temporarily_stop_not_running(hass: HomeAssistant) -> None:
+    """Test `OwningAddon` temporarily stopping when the addon is not running."""
+
+    owning_addon = OwningAddon(slug="some-addon-slug")
+
+    mock_manager = AsyncMock()
+    mock_manager.async_get_addon_info.return_value = AddonInfo(
+        available=True,
+        hostname="core_some_addon_slug",
+        options={},
+        state=AddonState.NOT_RUNNING,
+        update_available=False,
+        version="1.0.0",
+    )
+
+    with patch(
+        "homeassistant.components.homeassistant_hardware.util.WaitingAddonManager",
+        return_value=mock_manager,
+    ):
+        async with owning_addon.temporarily_stop(hass):
+            pass
+
+    # We never restart it
+    assert len(mock_manager.async_get_addon_info.mock_calls) == 1
+    assert len(mock_manager.async_stop_addon.mock_calls) == 0
+    assert len(mock_manager.async_wait_until_addon_state.mock_calls) == 0
+    assert len(mock_manager.async_start_addon_waiting.mock_calls) == 0
+
+
+async def test_owning_addon_temporarily_stop(hass: HomeAssistant) -> None:
+    """Test `OwningAddon` temporarily stopping when the addon is running."""
+
+    owning_addon = OwningAddon(slug="some-addon-slug")
+
+    mock_manager = AsyncMock()
+    mock_manager.async_get_addon_info.return_value = AddonInfo(
+        available=True,
+        hostname="core_some_addon_slug",
+        options={},
+        state=AddonState.RUNNING,
+        update_available=False,
+        version="1.0.0",
+    )
+
+    mock_manager.async_stop_addon = AsyncMock()
+    mock_manager.async_wait_until_addon_state = AsyncMock()
+    mock_manager.async_start_addon_waiting = AsyncMock()
+
+    # The error is propagated but it doesn't affect restarting the addon
     with (
         patch(
-            "homeassistant.components.homeassistant_hardware.util.is_hassio",
-            return_value=True,
-        ),
-        patch(
-            "homeassistant.components.homeassistant_hardware.util.get_otbr_addon_manager",
-            return_value=mock_otbr_addon_manager,
-        ),
-        patch(
-            "homeassistant.components.homeassistant_hardware.util.get_multiprotocol_addon_manager",
-            return_value=mock_multipan_addon_manager,
+            "homeassistant.components.homeassistant_hardware.util.WaitingAddonManager",
+            return_value=mock_manager,
         ),
+        pytest.raises(RuntimeError),
     ):
-        mock_otbr_addon_manager.async_get_addon_info.side_effect = AddonError()
-        mock_multipan_addon_manager.async_get_addon_info.side_effect = AddonError()
+        async with owning_addon.temporarily_stop(hass):
+            raise RuntimeError("Some error")
 
-        # Hassio errors are ignored and we still go with ZHA
-        assert (await guess_firmware_type(hass, path)) == FirmwareGuess(
-            is_running=True, firmware_type=ApplicationType.EZSP, source="zha"
-        )
-
-        mock_otbr_addon_manager.async_get_addon_info.side_effect = None
-        mock_otbr_addon_manager.async_get_addon_info.return_value = AddonInfo(
-            available=True,
-            hostname=None,
-            options={"device": "/some/other/device"},
-            state=AddonState.RUNNING,
-            update_available=False,
-            version="1.0.0",
-        )
-
-        # We will prefer ZHA, as it is running (and actually pointing to the device)
-        assert (await guess_firmware_type(hass, path)) == FirmwareGuess(
-            is_running=True, firmware_type=ApplicationType.EZSP, source="zha"
-        )
-
-        mock_otbr_addon_manager.async_get_addon_info.return_value = AddonInfo(
-            available=True,
-            hostname=None,
-            options={"device": path},
-            state=AddonState.NOT_RUNNING,
-            update_available=False,
-            version="1.0.0",
-        )
-
-        # We will still prefer ZHA, as it is the one actually running
-        assert (await guess_firmware_type(hass, path)) == FirmwareGuess(
-            is_running=True, firmware_type=ApplicationType.EZSP, source="zha"
-        )
-
-        mock_otbr_addon_manager.async_get_addon_info.return_value = AddonInfo(
-            available=True,
-            hostname=None,
-            options={"device": path},
-            state=AddonState.RUNNING,
-            update_available=False,
-            version="1.0.0",
-        )
-
-        # Finally, ZHA loses out to OTBR
-        assert (await guess_firmware_type(hass, path)) == FirmwareGuess(
-            is_running=True, firmware_type=ApplicationType.SPINEL, source="otbr"
-        )
-
-        mock_multipan_addon_manager.async_get_addon_info.side_effect = None
-        mock_multipan_addon_manager.async_get_addon_info.return_value = AddonInfo(
-            available=True,
-            hostname=None,
-            options={"device": path},
-            state=AddonState.RUNNING,
-            update_available=False,
-            version="1.0.0",
-        )
-
-        # Which will lose out to multi-PAN
-        assert (await guess_firmware_type(hass, path)) == FirmwareGuess(
-            is_running=True, firmware_type=ApplicationType.CPC, source="multiprotocol"
-        )
+    # We restart it
+    assert len(mock_manager.async_get_addon_info.mock_calls) == 1
+    assert len(mock_manager.async_stop_addon.mock_calls) == 1
+    assert len(mock_manager.async_wait_until_addon_state.mock_calls) == 1
+    assert len(mock_manager.async_start_addon_waiting.mock_calls) == 1
 
 
-async def test_probe_silabs_firmware_type() -> None:
-    """Test probing Silabs firmware type."""
+async def test_owning_integration(hass: HomeAssistant) -> None:
+    """Test `OwningIntegration`."""
+    config_entry = MockConfigEntry(domain="mock_domain", unique_id="some_unique_id")
+    config_entry.add_to_hass(hass)
+
+    owning_integration = OwningIntegration(config_entry_id=config_entry.entry_id)
+
+    # Explicitly running
+    config_entry.mock_state(hass, ConfigEntryState.LOADED)
+    assert (await owning_integration.is_running(hass)) is True
+
+    # Explicitly not running
+    config_entry.mock_state(hass, ConfigEntryState.NOT_LOADED)
+    assert (await owning_integration.is_running(hass)) is False
+
+    # Missing config entry
+    owning_integration2 = OwningIntegration(config_entry_id="some_nonexistenct_id")
+    assert (await owning_integration2.is_running(hass)) is False
+
+
+async def test_owning_integration_temporarily_stop_missing_entry(
+    hass: HomeAssistant,
+) -> None:
+    """Test temporarily stopping the integration when the config entry doesn't exist."""
+    missing_integration = OwningIntegration(config_entry_id="missing_entry_id")
+
+    with (
+        patch.object(hass.config_entries, "async_unload") as mock_unload,
+        patch.object(hass.config_entries, "async_setup") as mock_setup,
+    ):
+        async with missing_integration.temporarily_stop(hass):
+            pass
+
+    # Because there's no matching entry, no unload or setup calls are made
+    assert len(mock_unload.mock_calls) == 0
+    assert len(mock_setup.mock_calls) == 0
+
+
+async def test_owning_integration_temporarily_stop_not_loaded(
+    hass: HomeAssistant,
+) -> None:
+    """Test temporarily stopping the integration when the config entry is not loaded."""
+    entry = MockConfigEntry(domain="test_domain")
+    entry.add_to_hass(hass)
+    entry.mock_state(hass, ConfigEntryState.NOT_LOADED)
+
+    integration = OwningIntegration(config_entry_id=entry.entry_id)
+
+    with (
+        patch.object(hass.config_entries, "async_unload") as mock_unload,
+        patch.object(hass.config_entries, "async_setup") as mock_setup,
+    ):
+        async with integration.temporarily_stop(hass):
+            pass
+
+    # Since the entry was not loaded, we never unload or re-setup
+    assert len(mock_unload.mock_calls) == 0
+    assert len(mock_setup.mock_calls) == 0
+
+
+async def test_owning_integration_temporarily_stop_loaded(hass: HomeAssistant) -> None:
+    """Test temporarily stopping the integration when the config entry is loaded."""
+    entry = MockConfigEntry(domain="test_domain")
+    entry.add_to_hass(hass)
+    entry.mock_state(hass, ConfigEntryState.LOADED)
+
+    integration = OwningIntegration(config_entry_id=entry.entry_id)
+
+    with (
+        patch.object(hass.config_entries, "async_unload") as mock_unload,
+        patch.object(hass.config_entries, "async_setup") as mock_setup,
+        pytest.raises(RuntimeError),
+    ):
+        async with integration.temporarily_stop(hass):
+            raise RuntimeError("Some error during the temporary stop")
+
+    # We expect one unload followed by one setup call
+    mock_unload.assert_called_once_with(entry.entry_id)
+    mock_setup.assert_called_once_with(entry.entry_id)
+
+
+async def test_firmware_info(hass: HomeAssistant) -> None:
+    """Test `FirmwareInfo`."""
+
+    owner1 = AsyncMock()
+    owner2 = AsyncMock()
+
+    firmware_info = FirmwareInfo(
+        device="/dev/ttyUSB1",
+        firmware_type=ApplicationType.EZSP,
+        firmware_version="1.0.0",
+        source="zha",
+        owners=[owner1, owner2],
+    )
+
+    # Both running
+    owner1.is_running.return_value = True
+    owner2.is_running.return_value = True
+    assert (await firmware_info.is_running(hass)) is True
+
+    # Only one running
+    owner1.is_running.return_value = True
+    owner2.is_running.return_value = False
+    assert (await firmware_info.is_running(hass)) is False
+
+    # No owners
+    firmware_info2 = FirmwareInfo(
+        device="/dev/ttyUSB1",
+        firmware_type=ApplicationType.EZSP,
+        firmware_version="1.0.0",
+        source="zha",
+        owners=[],
+    )
+
+    assert (await firmware_info2.is_running(hass)) is False
+
+
+async def test_get_otbr_addon_firmware_info_failure(hass: HomeAssistant) -> None:
+    """Test getting OTBR addon firmware info failure due to bad API call."""
+
+    otbr_addon_manager = AsyncMock(spec_set=AddonManager)
+    otbr_addon_manager.async_get_addon_info.side_effect = AddonError()
+
+    assert (await get_otbr_addon_firmware_info(hass, otbr_addon_manager)) is None
+
+
+async def test_get_otbr_addon_firmware_info_failure_bad_options(
+    hass: HomeAssistant,
+) -> None:
+    """Test getting OTBR addon firmware info failure due to bad addon options."""
+
+    otbr_addon_manager = AsyncMock(spec_set=AddonManager)
+    otbr_addon_manager.async_get_addon_info.return_value = AddonInfo(
+        available=True,
+        hostname="core_some_addon_slug",
+        options={},  # `device` is missing
+        state=AddonState.RUNNING,
+        update_available=False,
+        version="1.0.0",
+    )
+
+    assert (await get_otbr_addon_firmware_info(hass, otbr_addon_manager)) is None
+
+
+@pytest.mark.parametrize(
+    ("app_type", "firmware_version", "expected_fw_info"),
+    [
+        (
+            FlasherApplicationType.EZSP,
+            FlasherVersion("1.0.0"),
+            FirmwareInfo(
+                device="/dev/ttyUSB0",
+                firmware_type=ApplicationType.EZSP,
+                firmware_version="1.0.0",
+                source="probe",
+                owners=[],
+            ),
+        ),
+        (
+            FlasherApplicationType.EZSP,
+            None,
+            FirmwareInfo(
+                device="/dev/ttyUSB0",
+                firmware_type=ApplicationType.EZSP,
+                firmware_version=None,
+                source="probe",
+                owners=[],
+            ),
+        ),
+        (
+            FlasherApplicationType.SPINEL,
+            FlasherVersion("2.0.0"),
+            FirmwareInfo(
+                device="/dev/ttyUSB0",
+                firmware_type=ApplicationType.SPINEL,
+                firmware_version="2.0.0",
+                source="probe",
+                owners=[],
+            ),
+        ),
+        (None, None, None),
+    ],
+)
+async def test_probe_silabs_firmware_info(
+    app_type: FlasherApplicationType | None,
+    firmware_version: FlasherVersion | None,
+    expected_fw_info: FirmwareInfo | None,
+) -> None:
+    """Test getting the firmware info."""
+
+    def probe_app_type() -> None:
+        mock_flasher.app_type = app_type
+        mock_flasher.app_version = firmware_version
+
+    mock_flasher = MagicMock()
+    mock_flasher.app_type = None
+    mock_flasher.app_version = None
+    mock_flasher.probe_app_type = AsyncMock(side_effect=probe_app_type)
 
     with patch(
-        "homeassistant.components.homeassistant_hardware.util.Flasher.probe_app_type",
-        side_effect=RuntimeError,
+        "homeassistant.components.homeassistant_hardware.util.Flasher",
+        return_value=mock_flasher,
     ):
-        assert (await probe_silabs_firmware_type("/dev/ttyUSB0")) is None
+        result = await probe_silabs_firmware_info("/dev/ttyUSB0")
+        assert result == expected_fw_info
 
+
+@pytest.mark.parametrize(
+    ("probe_result", "expected"),
+    [
+        (
+            FirmwareInfo(
+                device="/dev/ttyUSB0",
+                firmware_type=ApplicationType.EZSP,
+                firmware_version=None,
+                source="unknown",
+                owners=[],
+            ),
+            ApplicationType.EZSP,
+        ),
+        (None, None),
+    ],
+)
+async def test_probe_silabs_firmware_type(
+    probe_result: FirmwareInfo | None, expected: ApplicationType | None
+) -> None:
+    """Test getting the firmware type from the probe result."""
     with patch(
-        "homeassistant.components.homeassistant_hardware.util.Flasher.probe_app_type",
-        side_effect=lambda self: setattr(self, "app_type", FlasherApplicationType.EZSP),
+        "homeassistant.components.homeassistant_hardware.util.probe_silabs_firmware_info",
         autospec=True,
-    ) as mock_probe_app_type:
-        # The application type constant is converted back and forth transparently
-        result = await probe_silabs_firmware_type(
-            "/dev/ttyUSB0", probe_methods=[ApplicationType.EZSP]
-        )
-        assert result is ApplicationType.EZSP
-
-        flasher = mock_probe_app_type.mock_calls[0].args[0]
-        assert flasher._probe_methods == [FlasherApplicationType.EZSP]
+        return_value=probe_result,
+    ):
+        result = await probe_silabs_firmware_type("/dev/ttyUSB0")
+        assert result == expected
diff --git a/tests/components/homeassistant_sky_connect/common.py b/tests/components/homeassistant_sky_connect/common.py
new file mode 100644
index 00000000000..335fd6d2e12
--- /dev/null
+++ b/tests/components/homeassistant_sky_connect/common.py
@@ -0,0 +1,21 @@
+"""Common constants for the SkyConnect integration tests."""
+
+from homeassistant.helpers.service_info.usb import UsbServiceInfo
+
+USB_DATA_SKY = UsbServiceInfo(
+    device="/dev/serial/by-id/usb-Nabu_Casa_SkyConnect_v1.0_9e2adbd75b8beb119fe564a0f320645d-if00-port0",
+    vid="10C4",
+    pid="EA60",
+    serial_number="9e2adbd75b8beb119fe564a0f320645d",
+    manufacturer="Nabu Casa",
+    description="SkyConnect v1.0",
+)
+
+USB_DATA_ZBT1 = UsbServiceInfo(
+    device="/dev/serial/by-id/usb-Nabu_Casa_Home_Assistant_Connect_ZBT-1_9e2adbd75b8beb119fe564a0f320645d-if00-port0",
+    vid="10C4",
+    pid="EA60",
+    serial_number="9e2adbd75b8beb119fe564a0f320645d",
+    manufacturer="Nabu Casa",
+    description="Home Assistant Connect ZBT-1",
+)
diff --git a/tests/components/homeassistant_sky_connect/test_config_flow.py b/tests/components/homeassistant_sky_connect/test_config_flow.py
index 904fcac321c..44a5e0029c3 100644
--- a/tests/components/homeassistant_sky_connect/test_config_flow.py
+++ b/tests/components/homeassistant_sky_connect/test_config_flow.py
@@ -13,31 +13,19 @@ from homeassistant.components.homeassistant_hardware.silabs_multiprotocol_addon
     get_flasher_addon_manager,
     get_multiprotocol_addon_manager,
 )
+from homeassistant.components.homeassistant_hardware.util import (
+    ApplicationType,
+    FirmwareInfo,
+)
 from homeassistant.components.homeassistant_sky_connect.const import DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers.service_info.usb import UsbServiceInfo
 
+from .common import USB_DATA_SKY, USB_DATA_ZBT1
+
 from tests.common import MockConfigEntry
 
-USB_DATA_SKY = UsbServiceInfo(
-    device="/dev/serial/by-id/usb-Nabu_Casa_SkyConnect_v1.0_9e2adbd75b8beb119fe564a0f320645d-if00-port0",
-    vid="10C4",
-    pid="EA60",
-    serial_number="9e2adbd75b8beb119fe564a0f320645d",
-    manufacturer="Nabu Casa",
-    description="SkyConnect v1.0",
-)
-
-USB_DATA_ZBT1 = UsbServiceInfo(
-    device="/dev/serial/by-id/usb-Nabu_Casa_Home_Assistant_Connect_ZBT-1_9e2adbd75b8beb119fe564a0f320645d-if00-port0",
-    vid="10C4",
-    pid="EA60",
-    serial_number="9e2adbd75b8beb119fe564a0f320645d",
-    manufacturer="Nabu Casa",
-    description="Home Assistant Connect ZBT-1",
-)
-
 
 @pytest.mark.parametrize(
     ("usb_data", "model"),
@@ -61,10 +49,22 @@ async def test_config_flow(
     async def mock_async_step_pick_firmware_zigbee(self, data):
         return await self.async_step_confirm_zigbee(user_input={})
 
-    with patch(
-        "homeassistant.components.homeassistant_hardware.firmware_config_flow.BaseFirmwareConfigFlow.async_step_pick_firmware_zigbee",
-        autospec=True,
-        side_effect=mock_async_step_pick_firmware_zigbee,
+    with (
+        patch(
+            "homeassistant.components.homeassistant_hardware.firmware_config_flow.BaseFirmwareConfigFlow.async_step_pick_firmware_zigbee",
+            autospec=True,
+            side_effect=mock_async_step_pick_firmware_zigbee,
+        ),
+        patch(
+            "homeassistant.components.homeassistant_hardware.firmware_config_flow.probe_silabs_firmware_info",
+            return_value=FirmwareInfo(
+                device=usb_data.device,
+                firmware_type=ApplicationType.EZSP,
+                firmware_version="7.4.4.0 build 0",
+                owners=[],
+                source="probe",
+            ),
+        ),
     ):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
@@ -76,6 +76,7 @@ async def test_config_flow(
     config_entry = result["result"]
     assert config_entry.data == {
         "firmware": "ezsp",
+        "firmware_version": "7.4.4.0 build 0",
         "device": usb_data.device,
         "manufacturer": usb_data.manufacturer,
         "pid": usb_data.pid,
@@ -134,10 +135,22 @@ async def test_options_flow(
     async def mock_async_step_pick_firmware_zigbee(self, data):
         return await self.async_step_confirm_zigbee(user_input={})
 
-    with patch(
-        "homeassistant.components.homeassistant_hardware.firmware_config_flow.BaseFirmwareOptionsFlow.async_step_pick_firmware_zigbee",
-        autospec=True,
-        side_effect=mock_async_step_pick_firmware_zigbee,
+    with (
+        patch(
+            "homeassistant.components.homeassistant_hardware.firmware_config_flow.BaseFirmwareOptionsFlow.async_step_pick_firmware_zigbee",
+            autospec=True,
+            side_effect=mock_async_step_pick_firmware_zigbee,
+        ),
+        patch(
+            "homeassistant.components.homeassistant_hardware.firmware_config_flow.probe_silabs_firmware_info",
+            return_value=FirmwareInfo(
+                device=usb_data.device,
+                firmware_type=ApplicationType.EZSP,
+                firmware_version="7.4.4.0 build 0",
+                owners=[],
+                source="probe",
+            ),
+        ),
     ):
         result = await hass.config_entries.options.async_configure(
             result["flow_id"],
@@ -149,6 +162,7 @@ async def test_options_flow(
 
     assert config_entry.data == {
         "firmware": "ezsp",
+        "firmware_version": "7.4.4.0 build 0",
         "device": usb_data.device,
         "manufacturer": usb_data.manufacturer,
         "pid": usb_data.pid,
diff --git a/tests/components/homeassistant_sky_connect/test_init.py b/tests/components/homeassistant_sky_connect/test_init.py
index 15eeb205537..c467a9e0d60 100644
--- a/tests/components/homeassistant_sky_connect/test_init.py
+++ b/tests/components/homeassistant_sky_connect/test_init.py
@@ -4,7 +4,7 @@ from unittest.mock import patch
 
 from homeassistant.components.homeassistant_hardware.util import (
     ApplicationType,
-    FirmwareGuess,
+    FirmwareInfo,
 )
 from homeassistant.components.homeassistant_sky_connect.const import DOMAIN
 from homeassistant.core import HomeAssistant
@@ -32,17 +32,19 @@ async def test_config_entry_migration_v2(hass: HomeAssistant) -> None:
     config_entry.add_to_hass(hass)
 
     with patch(
-        "homeassistant.components.homeassistant_sky_connect.guess_firmware_type",
-        return_value=FirmwareGuess(
-            is_running=True,
+        "homeassistant.components.homeassistant_sky_connect.guess_firmware_info",
+        return_value=FirmwareInfo(
+            device="/dev/serial/by-id/usb-Nabu_Casa_SkyConnect_v1.0_9e2adbd75b8beb119fe564a0f320645d-if00-port0",
+            firmware_version=None,
             firmware_type=ApplicationType.SPINEL,
             source="otbr",
+            owners=[],
         ),
     ):
         await hass.config_entries.async_setup(config_entry.entry_id)
 
     assert config_entry.version == 1
-    assert config_entry.minor_version == 2
+    assert config_entry.minor_version == 3
     assert config_entry.data == {
         "description": "SkyConnect v1.0",
         "device": "/dev/serial/by-id/usb-Nabu_Casa_SkyConnect_v1.0_9e2adbd75b8beb119fe564a0f320645d-if00-port0",
@@ -52,6 +54,7 @@ async def test_config_entry_migration_v2(hass: HomeAssistant) -> None:
         "manufacturer": "Nabu Casa",
         "product": "SkyConnect v1.0",  # `description` has been copied to `product`
         "firmware": "spinel",  # new key
+        "firmware_version": None,  # new key
     }
 
     await hass.config_entries.async_unload(config_entry.entry_id)
diff --git a/tests/components/homeassistant_sky_connect/test_update.py b/tests/components/homeassistant_sky_connect/test_update.py
new file mode 100644
index 00000000000..9fb7528987e
--- /dev/null
+++ b/tests/components/homeassistant_sky_connect/test_update.py
@@ -0,0 +1,86 @@
+"""Test SkyConnect firmware update entity."""
+
+from homeassistant.components.homeassistant_hardware.helpers import (
+    async_notify_firmware_info,
+)
+from homeassistant.components.homeassistant_hardware.util import (
+    ApplicationType,
+    FirmwareInfo,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from .common import USB_DATA_ZBT1
+
+from tests.common import MockConfigEntry
+
+UPDATE_ENTITY_ID = (
+    "update.homeassistant_sky_connect_9e2adbd75b8beb119fe564a0f320645d_firmware"
+)
+
+
+async def test_zbt1_update_entity(hass: HomeAssistant) -> None:
+    """Test the ZBT-1 firmware update entity."""
+    await async_setup_component(hass, "homeassistant", {})
+
+    # Set up the ZBT-1 integration
+    zbt1_config_entry = MockConfigEntry(
+        domain="homeassistant_sky_connect",
+        data={
+            "firmware": "ezsp",
+            "firmware_version": "7.3.1.0 build 0",
+            "device": USB_DATA_ZBT1.device,
+            "manufacturer": USB_DATA_ZBT1.manufacturer,
+            "pid": USB_DATA_ZBT1.pid,
+            "product": USB_DATA_ZBT1.description,
+            "serial_number": USB_DATA_ZBT1.serial_number,
+            "vid": USB_DATA_ZBT1.vid,
+        },
+        version=1,
+        minor_version=3,
+    )
+    zbt1_config_entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(zbt1_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    # Pretend ZHA loaded and notified hardware of the running firmware
+    await async_notify_firmware_info(
+        hass,
+        "zha",
+        FirmwareInfo(
+            device=USB_DATA_ZBT1.device,
+            firmware_type=ApplicationType.EZSP,
+            firmware_version="7.3.1.0 build 0",
+            owners=[],
+            source="zha",
+        ),
+    )
+    await hass.async_block_till_done()
+
+    state_ezsp = hass.states.get(UPDATE_ENTITY_ID)
+    assert state_ezsp.state == "unknown"
+    assert state_ezsp.attributes["title"] == "EmberZNet"
+    assert state_ezsp.attributes["installed_version"] == "7.3.1.0"
+    assert state_ezsp.attributes["latest_version"] is None
+
+    # Now, have OTBR push some info
+    await async_notify_firmware_info(
+        hass,
+        "otbr",
+        FirmwareInfo(
+            device=USB_DATA_ZBT1.device,
+            firmware_type=ApplicationType.SPINEL,
+            firmware_version="SL-OPENTHREAD/2.4.4.0_GitHub-7074a43e4; EFR32; Oct 21 2024 14:40:57",
+            owners=[],
+            source="otbr",
+        ),
+    )
+    await hass.async_block_till_done()
+
+    # After the firmware update, the entity has the new version and the correct state
+    state_spinel = hass.states.get(UPDATE_ENTITY_ID)
+    assert state_spinel.state == "unknown"
+    assert state_spinel.attributes["title"] == "OpenThread RCP"
+    assert state_spinel.attributes["installed_version"] == "2.4.4.0"
+    assert state_spinel.attributes["latest_version"] is None
diff --git a/tests/components/homeassistant_yellow/test_config_flow.py b/tests/components/homeassistant_yellow/test_config_flow.py
index 1067be7b56e..46fec0a1f30 100644
--- a/tests/components/homeassistant_yellow/test_config_flow.py
+++ b/tests/components/homeassistant_yellow/test_config_flow.py
@@ -18,7 +18,10 @@ from homeassistant.components.homeassistant_hardware.silabs_multiprotocol_addon
     get_flasher_addon_manager,
     get_multiprotocol_addon_manager,
 )
-from homeassistant.components.homeassistant_hardware.util import ApplicationType
+from homeassistant.components.homeassistant_hardware.util import (
+    ApplicationType,
+    FirmwareInfo,
+)
 from homeassistant.components.homeassistant_yellow.const import DOMAIN, RADIO_DEVICE
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
@@ -82,8 +85,14 @@ async def test_config_flow(hass: HomeAssistant) -> None:
             return_value=True,
         ) as mock_setup_entry,
         patch(
-            "homeassistant.components.homeassistant_hardware.firmware_config_flow.probe_silabs_firmware_type",
-            return_value=ApplicationType.EZSP,
+            "homeassistant.components.homeassistant_hardware.firmware_config_flow.probe_silabs_firmware_info",
+            return_value=FirmwareInfo(
+                device=RADIO_DEVICE,
+                firmware_type=ApplicationType.EZSP,
+                firmware_version=None,
+                owners=[],
+                source="probe",
+            ),
         ),
     ):
         result = await hass.config_entries.flow.async_init(
@@ -330,10 +339,22 @@ async def test_firmware_options_flow(hass: HomeAssistant) -> None:
     async def mock_async_step_pick_firmware_zigbee(self, data):
         return await self.async_step_confirm_zigbee(user_input={})
 
-    with patch(
-        "homeassistant.components.homeassistant_hardware.firmware_config_flow.BaseFirmwareOptionsFlow.async_step_pick_firmware_zigbee",
-        autospec=True,
-        side_effect=mock_async_step_pick_firmware_zigbee,
+    with (
+        patch(
+            "homeassistant.components.homeassistant_hardware.firmware_config_flow.BaseFirmwareOptionsFlow.async_step_pick_firmware_zigbee",
+            autospec=True,
+            side_effect=mock_async_step_pick_firmware_zigbee,
+        ),
+        patch(
+            "homeassistant.components.homeassistant_hardware.firmware_config_flow.probe_silabs_firmware_info",
+            return_value=FirmwareInfo(
+                device=RADIO_DEVICE,
+                firmware_type=ApplicationType.EZSP,
+                firmware_version="7.4.4.0 build 0",
+                owners=[],
+                source="probe",
+            ),
+        ),
     ):
         result = await hass.config_entries.options.async_configure(
             result["flow_id"],
@@ -345,6 +366,7 @@ async def test_firmware_options_flow(hass: HomeAssistant) -> None:
 
     assert config_entry.data == {
         "firmware": "ezsp",
+        "firmware_version": "7.4.4.0 build 0",
     }
 
 
diff --git a/tests/components/homeassistant_yellow/test_init.py b/tests/components/homeassistant_yellow/test_init.py
index 5d534dad1e7..57d63c7441e 100644
--- a/tests/components/homeassistant_yellow/test_init.py
+++ b/tests/components/homeassistant_yellow/test_init.py
@@ -8,7 +8,7 @@ from homeassistant.components import zha
 from homeassistant.components.hassio import DOMAIN as HASSIO_DOMAIN
 from homeassistant.components.homeassistant_hardware.util import (
     ApplicationType,
-    FirmwareGuess,
+    FirmwareInfo,
 )
 from homeassistant.components.homeassistant_yellow.const import DOMAIN
 from homeassistant.config_entries import ConfigEntryState
@@ -49,11 +49,13 @@ async def test_setup_entry(
             return_value=onboarded,
         ),
         patch(
-            "homeassistant.components.homeassistant_yellow.guess_firmware_type",
-            return_value=FirmwareGuess(  # Nothing is setup
-                is_running=False,
+            "homeassistant.components.homeassistant_yellow.guess_firmware_info",
+            return_value=FirmwareInfo(  # Nothing is setup
+                device="/dev/ttyAMA1",
+                firmware_version=None,
                 firmware_type=ApplicationType.EZSP,
                 source="unknown",
+                owners=[],
             ),
         ),
     ):
diff --git a/tests/components/homeassistant_yellow/test_update.py b/tests/components/homeassistant_yellow/test_update.py
new file mode 100644
index 00000000000..269ff2afc49
--- /dev/null
+++ b/tests/components/homeassistant_yellow/test_update.py
@@ -0,0 +1,89 @@
+"""Test Yellow firmware update entity."""
+
+from unittest.mock import patch
+
+from homeassistant.components.homeassistant_hardware.helpers import (
+    async_notify_firmware_info,
+)
+from homeassistant.components.homeassistant_hardware.util import (
+    ApplicationType,
+    FirmwareInfo,
+)
+from homeassistant.components.homeassistant_yellow.const import RADIO_DEVICE
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.common import MockConfigEntry
+
+UPDATE_ENTITY_ID = "update.homeassistant_yellow_firmware"
+
+
+async def test_yellow_update_entity(hass: HomeAssistant) -> None:
+    """Test the Yellow firmware update entity."""
+    await async_setup_component(hass, "homeassistant", {})
+
+    # Set up the Yellow integration
+    yellow_config_entry = MockConfigEntry(
+        domain="homeassistant_yellow",
+        data={
+            "firmware": "ezsp",
+            "firmware_version": "7.3.1.0 build 0",
+            "device": RADIO_DEVICE,
+        },
+        version=1,
+        minor_version=3,
+    )
+    yellow_config_entry.add_to_hass(hass)
+
+    with (
+        patch(
+            "homeassistant.components.homeassistant_yellow.is_hassio", return_value=True
+        ),
+        patch(
+            "homeassistant.components.homeassistant_yellow.get_os_info",
+            return_value={"board": "yellow"},
+        ),
+    ):
+        assert await hass.config_entries.async_setup(yellow_config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    # Pretend ZHA loaded and notified hardware of the running firmware
+    await async_notify_firmware_info(
+        hass,
+        "zha",
+        FirmwareInfo(
+            device=RADIO_DEVICE,
+            firmware_type=ApplicationType.EZSP,
+            firmware_version="7.3.1.0 build 0",
+            owners=[],
+            source="zha",
+        ),
+    )
+    await hass.async_block_till_done()
+
+    state_ezsp = hass.states.get(UPDATE_ENTITY_ID)
+    assert state_ezsp.state == "unknown"
+    assert state_ezsp.attributes["title"] == "EmberZNet"
+    assert state_ezsp.attributes["installed_version"] == "7.3.1.0"
+    assert state_ezsp.attributes["latest_version"] is None
+
+    # Now, have OTBR push some info
+    await async_notify_firmware_info(
+        hass,
+        "otbr",
+        FirmwareInfo(
+            device=RADIO_DEVICE,
+            firmware_type=ApplicationType.SPINEL,
+            firmware_version="SL-OPENTHREAD/2.4.4.0_GitHub-7074a43e4; EFR32; Oct 21 2024 14:40:57",
+            owners=[],
+            source="otbr",
+        ),
+    )
+    await hass.async_block_till_done()
+
+    # After the firmware update, the entity has the new version and the correct state
+    state_spinel = hass.states.get(UPDATE_ENTITY_ID)
+    assert state_spinel.state == "unknown"
+    assert state_spinel.attributes["title"] == "OpenThread RCP"
+    assert state_spinel.attributes["installed_version"] == "2.4.4.0"
+    assert state_spinel.attributes["latest_version"] is None
diff --git a/tests/components/homee/__init__.py b/tests/components/homee/__init__.py
index 03095aca7df..432e2d68516 100644
--- a/tests/components/homee/__init__.py
+++ b/tests/components/homee/__init__.py
@@ -1 +1,60 @@
 """Tests for the homee component."""
+
+from typing import Any
+from unittest.mock import AsyncMock
+
+from pyHomee.model import HomeeAttribute, HomeeNode
+
+from homeassistant.components.homee.const import DOMAIN
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry, load_json_object_fixture
+
+
+async def setup_integration(hass: HomeAssistant, config_entry: MockConfigEntry) -> None:
+    """Set up the component."""
+    config_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+
+def build_mock_node(file: str) -> AsyncMock:
+    """Build a mocked Homee node from a json representation."""
+    json_node = load_json_object_fixture(file, DOMAIN)
+    mock_node = AsyncMock(spec=HomeeNode)
+
+    def get_attributes(attributes: list[Any]) -> list[AsyncMock]:
+        mock_attributes: list[AsyncMock] = []
+        for attribute in attributes:
+            att = AsyncMock(spec=HomeeAttribute)
+            for key, value in attribute.items():
+                setattr(att, key, value)
+            att.is_reversed = False
+            att.get_value = (
+                lambda att=att: att.data if att.unit == "text" else att.current_value
+            )
+            mock_attributes.append(att)
+        return mock_attributes
+
+    for key, value in json_node.items():
+        if key != "attributes":
+            setattr(mock_node, key, value)
+
+    mock_node.attributes = get_attributes(json_node["attributes"])
+
+    def attribute_by_type(type, instance=0) -> HomeeAttribute | None:
+        return {attr.type: attr for attr in mock_node.attributes}.get(type)
+
+    mock_node.get_attribute_by_type = attribute_by_type
+
+    return mock_node
+
+
+async def async_update_attribute_value(
+    hass: HomeAssistant, attribute: AsyncMock, value: float
+) -> None:
+    """Set the current_value of an attribute and notify hass."""
+    attribute.current_value = value
+    attribute.add_on_changed_listener.call_args_list[0][0][0](attribute)
+    await hass.async_block_till_done()
diff --git a/tests/components/homee/conftest.py b/tests/components/homee/conftest.py
index a777f6b59a9..5a3234e896b 100644
--- a/tests/components/homee/conftest.py
+++ b/tests/components/homee/conftest.py
@@ -17,6 +17,15 @@ TESTUSER = "testuser"
 TESTPASS = "testpass"
 
 
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock]:
+    """Mock setting up a config entry."""
+    with patch(
+        "homeassistant.components.homee.async_setup_entry", return_value=True
+    ) as mock_setup:
+        yield mock_setup
+
+
 @pytest.fixture
 def mock_config_entry() -> MockConfigEntry:
     """Return the default mocked config entry."""
@@ -32,15 +41,6 @@ def mock_config_entry() -> MockConfigEntry:
     )
 
 
-@pytest.fixture
-def mock_setup_entry() -> Generator[AsyncMock]:
-    """Mock setting up a config entry."""
-    with patch(
-        "homeassistant.components.homee.async_setup_entry", return_value=True
-    ) as mock_setup:
-        yield mock_setup
-
-
 @pytest.fixture
 def mock_homee() -> Generator[AsyncMock]:
     """Return a mock Homee instance."""
@@ -50,7 +50,7 @@ def mock_homee() -> Generator[AsyncMock]:
         ) as mocked_homee,
         patch(
             "homeassistant.components.homee.Homee",
-            autospec=True,
+            new=mocked_homee,
         ),
     ):
         homee = mocked_homee.return_value
@@ -61,7 +61,10 @@ def mock_homee() -> Generator[AsyncMock]:
         homee.settings = MagicMock()
         homee.settings.uid = HOMEE_ID
         homee.settings.homee_name = HOMEE_NAME
+        homee.settings.version = "1.2.3"
+        homee.settings.mac_address = "00:05:55:11:ee:cc"
         homee.reconnect_interval = 10
+        homee.connected = True
 
         homee.get_access_token.return_value = "test_token"
 
diff --git a/tests/components/homee/fixtures/binary_sensors.json b/tests/components/homee/fixtures/binary_sensors.json
new file mode 100644
index 00000000000..5ced5dc51da
--- /dev/null
+++ b/tests/components/homee/fixtures/binary_sensors.json
@@ -0,0 +1,891 @@
+{
+  "id": 1,
+  "name": "Test Binary Sensor",
+  "profile": 4026,
+  "image": "default",
+  "favorite": 0,
+  "order": 20,
+  "protocol": 1,
+  "routing": 0,
+  "state": 1,
+  "state_changed": 1709379826,
+  "added": 1676199446,
+  "history": 1,
+  "cube_type": 1,
+  "note": "",
+  "services": 5,
+  "phonetic_name": "",
+  "owner": 2,
+  "security": 0,
+  "attributes": [
+    {
+      "id": 1,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 69,
+      "state": 1,
+      "last_changed": 1706461181,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 2,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 17,
+      "state": 1,
+      "last_changed": 1691668428,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 3,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 132,
+      "state": 1,
+      "last_changed": 1691668428,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 4,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 1.0,
+      "target_value": 1.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 228,
+      "state": 1,
+      "last_changed": 1691668428,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 5,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 1.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 12,
+      "state": 1,
+      "last_changed": 1699456267,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 6,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 52,
+      "state": 1,
+      "last_changed": 1694176210,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 7,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 68,
+      "state": 1,
+      "last_changed": 1694176210,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 8,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 1.0,
+      "target_value": 1.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 139,
+      "state": 1,
+      "last_changed": 1650402359,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 9,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 1.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 232,
+      "state": 1,
+      "last_changed": 1711897362,
+      "changed_by": 4,
+      "changed_by_id": 5,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 35,
+          "week": 5,
+          "month": 1,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 10,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 1.0,
+      "target_value": 1.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 54,
+      "state": 1,
+      "last_changed": 1650402359,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 11,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 70,
+      "state": 1,
+      "last_changed": 1738231378,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 4,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 12,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 78,
+      "state": 1,
+      "last_changed": 1738231378,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 4,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 13,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 77,
+      "state": 1,
+      "last_changed": 1735964135,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 14,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 1.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 25,
+      "state": 1,
+      "last_changed": 1709933563,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 35,
+          "week": 5,
+          "month": 1,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 15,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 1.0,
+      "target_value": 1.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 330,
+      "state": 1,
+      "last_changed": 1709933563,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 35,
+          "week": 5,
+          "month": 1,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 16,
+      "node_id": 1,
+      "instance": 2,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 1,
+      "state": 1,
+      "last_changed": 1694024544,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "can_observe": [300],
+        "automations": ["reset"],
+        "history": {
+          "day": 35,
+          "week": 5,
+          "month": 1,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 17,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 14,
+      "state": 1,
+      "last_changed": 1739320320,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "history": {
+          "day": 35,
+          "week": 5,
+          "month": 1,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 18,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 143,
+      "state": 1,
+      "last_changed": 1694992768,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 19,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 140,
+      "state": 1,
+      "last_changed": 1718900928,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 20,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 76,
+      "state": 1,
+      "last_changed": 1718900928,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 21,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 182,
+      "state": 1,
+      "last_changed": 1718900928,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 22,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 101,
+      "state": 1,
+      "last_changed": 1700056646,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "history": {
+          "day": 35,
+          "week": 5,
+          "month": 1,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 23,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "n%2Fa",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 289,
+      "state": 1,
+      "last_changed": 1736106312,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 24,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 2,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 1.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 16,
+      "state": 1,
+      "last_changed": 1616314530,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 25,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 2,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 1.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 181,
+      "state": 1,
+      "last_changed": 1616314530,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 26,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 138,
+      "state": 1,
+      "last_changed": 1700747644,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 27,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 30,
+      "state": 1,
+      "last_changed": 1709933563,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 28,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 141,
+      "state": 1,
+      "last_changed": 1700747644,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 29,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 80,
+      "state": 1,
+      "last_changed": 1700747644,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["reset"],
+        "history": {
+          "day": 182,
+          "week": 26,
+          "month": 6,
+          "stepped": true
+        }
+      }
+    }
+  ]
+}
diff --git a/tests/components/homee/fixtures/buttons.json b/tests/components/homee/fixtures/buttons.json
new file mode 100644
index 00000000000..306aed39f65
--- /dev/null
+++ b/tests/components/homee/fixtures/buttons.json
@@ -0,0 +1,274 @@
+{
+  "id": 1,
+  "name": "Test Button",
+  "profile": 2015,
+  "image": "default",
+  "favorite": 0,
+  "order": 1,
+  "protocol": 19,
+  "routing": 0,
+  "state": 1,
+  "state_changed": 1676561556,
+  "added": 1675835814,
+  "history": 1,
+  "cube_type": 17,
+  "note": "# Hörmann Garagentor Serie 3",
+  "services": 7,
+  "phonetic_name": "",
+  "owner": 2,
+  "security": 0,
+  "attributes": [
+    {
+      "id": 1,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 1.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 326,
+      "state": 1,
+      "last_changed": 1677692134,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 2,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 1.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 327,
+      "state": 1,
+      "last_changed": 1677692134,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 3,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 170,
+      "state": 1,
+      "last_changed": 1672148539,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 4,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 304,
+      "state": 1,
+      "last_changed": 1739125922,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 4,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 5,
+      "node_id": 1,
+      "instance": 1,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 304,
+      "state": 1,
+      "last_changed": 1739125922,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 4,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 6,
+      "node_id": 1,
+      "instance": 2,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 304,
+      "state": 1,
+      "last_changed": 1739125922,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 4,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 7,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 1.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 305,
+      "state": 1,
+      "last_changed": 1677692134,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 8,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 306,
+      "state": 1,
+      "last_changed": 1677692134,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 9,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 328,
+      "state": 1,
+      "last_changed": 1677692134,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 10,
+      "node_id": 1,
+      "instance": 1,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 347,
+      "state": 1,
+      "last_changed": 1682166450,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 11,
+      "node_id": 1,
+      "instance": 2,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 347,
+      "state": 1,
+      "last_changed": 1682166450,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 12,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 378,
+      "state": 1,
+      "last_changed": 1677692134,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    }
+  ]
+}
diff --git a/tests/components/homee/fixtures/cover_with_position_slats.json b/tests/components/homee/fixtures/cover_with_position_slats.json
new file mode 100644
index 00000000000..8fd0d6f44fe
--- /dev/null
+++ b/tests/components/homee/fixtures/cover_with_position_slats.json
@@ -0,0 +1,101 @@
+{
+  "id": 3,
+  "name": "Test Cover",
+  "profile": 2002,
+  "image": "default",
+  "favorite": 0,
+  "order": 4,
+  "protocol": 23,
+  "routing": 0,
+  "state": 1,
+  "state_changed": 1687175681,
+  "added": 1672086680,
+  "history": 1,
+  "cube_type": 14,
+  "note": "TestCoverDevice",
+  "services": 7,
+  "phonetic_name": "",
+  "owner": 2,
+  "security": 0,
+  "attributes": [
+    {
+      "id": 1,
+      "node_id": 3,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 4,
+      "current_value": 1.0,
+      "target_value": 1.0,
+      "last_value": 4.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 135,
+      "state": 1,
+      "last_changed": 1687175680,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "can_observe": [300],
+        "observes": [75],
+        "automations": ["toggle"]
+      }
+    },
+    {
+      "id": 2,
+      "node_id": 3,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 100,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "%",
+      "step_value": 0.5,
+      "editable": 1,
+      "type": 15,
+      "state": 1,
+      "last_changed": 1687175680,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["step"],
+        "history": {
+          "day": 35,
+          "week": 5,
+          "month": 1
+        }
+      }
+    },
+    {
+      "id": 3,
+      "node_id": 3,
+      "instance": 0,
+      "minimum": -45,
+      "maximum": 90,
+      "current_value": -45.0,
+      "target_value": 0.0,
+      "last_value": -45.0,
+      "unit": "°",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 113,
+      "state": 1,
+      "last_changed": 1678284920,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["step"]
+      }
+    }
+  ]
+}
diff --git a/tests/components/homee/fixtures/cover_with_slats_position.json b/tests/components/homee/fixtures/cover_with_slats_position.json
new file mode 100644
index 00000000000..4b6eb466a85
--- /dev/null
+++ b/tests/components/homee/fixtures/cover_with_slats_position.json
@@ -0,0 +1,71 @@
+{
+  "id": 1,
+  "name": "Test Slats",
+  "profile": 2002,
+  "image": "default",
+  "favorite": 0,
+  "order": 1,
+  "protocol": 23,
+  "routing": 0,
+  "state": 1,
+  "state_changed": 1676901608,
+  "added": 1672148537,
+  "history": 1,
+  "cube_type": 14,
+  "note": "",
+  "services": 70,
+  "phonetic_name": "",
+  "owner": 2,
+  "security": 0,
+  "attributes": [
+    {
+      "id": 1,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": -45,
+      "maximum": 90,
+      "current_value": 1.0,
+      "target_value": 1.0,
+      "last_value": -21.0,
+      "unit": "°",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 113,
+      "state": 1,
+      "last_changed": 1678284920,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["step"]
+      }
+    },
+    {
+      "id": 2,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 2,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 1.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 337,
+      "state": 1,
+      "last_changed": 1678284911,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "can_observe": [300],
+        "observes": [72]
+      }
+    }
+  ]
+}
diff --git a/tests/components/homee/fixtures/cover_without_position.json b/tests/components/homee/fixtures/cover_without_position.json
new file mode 100644
index 00000000000..e2bc6c7a38d
--- /dev/null
+++ b/tests/components/homee/fixtures/cover_without_position.json
@@ -0,0 +1,48 @@
+{
+  "id": 3,
+  "name": "Test Cover",
+  "profile": 2002,
+  "image": "default",
+  "favorite": 0,
+  "order": 4,
+  "protocol": 23,
+  "routing": 0,
+  "state": 1,
+  "state_changed": 1687175681,
+  "added": 1672086680,
+  "history": 1,
+  "cube_type": 14,
+  "note": "TestCoverDevice",
+  "services": 7,
+  "phonetic_name": "",
+  "owner": 2,
+  "security": 0,
+  "attributes": [
+    {
+      "id": 1,
+      "node_id": 3,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 4,
+      "current_value": 1.0,
+      "target_value": 1.0,
+      "last_value": 4.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 135,
+      "state": 1,
+      "last_changed": 1687175680,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "can_observe": [300],
+        "observes": [75],
+        "automations": ["toggle"]
+      }
+    }
+  ]
+}
diff --git a/tests/components/homee/fixtures/light_single.json b/tests/components/homee/fixtures/light_single.json
new file mode 100644
index 00000000000..30932da8679
--- /dev/null
+++ b/tests/components/homee/fixtures/light_single.json
@@ -0,0 +1,102 @@
+{
+  "id": 2,
+  "name": "Another Test Light",
+  "profile": 1002,
+  "image": "default",
+  "favorite": 0,
+  "order": 48,
+  "protocol": 21,
+  "sub_protocol": 3,
+  "routing": 0,
+  "state": 1,
+  "state_changed": 1694024544,
+  "added": 1679551927,
+  "history": 1,
+  "cube_type": 8,
+  "note": "",
+  "services": 7,
+  "phonetic_name": "",
+  "owner": 2,
+  "security": 0,
+  "attributes": [
+    {
+      "id": 12,
+      "node_id": 2,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 1.0,
+      "target_value": 1.0,
+      "last_value": 1.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 1,
+      "state": 1,
+      "last_changed": 1694024544,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "can_observe": [300],
+        "automations": ["toggle"],
+        "history": {
+          "day": 35,
+          "week": 5,
+          "month": 1,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 13,
+      "node_id": 2,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 100,
+      "current_value": 100.0,
+      "target_value": 100.0,
+      "last_value": 100.0,
+      "unit": "%",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 2,
+      "state": 1,
+      "last_changed": 1694024544,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["step"]
+      }
+    },
+    {
+      "id": 14,
+      "node_id": 2,
+      "instance": 0,
+      "minimum": 2000,
+      "maximum": 7000,
+      "current_value": 3700.0,
+      "target_value": 3700.0,
+      "last_value": 3700.0,
+      "unit": "K",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 42,
+      "state": 1,
+      "last_changed": 1694024544,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["step"]
+      }
+    }
+  ]
+}
diff --git a/tests/components/homee/fixtures/lights.json b/tests/components/homee/fixtures/lights.json
new file mode 100644
index 00000000000..3363b93fd77
--- /dev/null
+++ b/tests/components/homee/fixtures/lights.json
@@ -0,0 +1,333 @@
+{
+  "id": 1,
+  "name": "Test Light",
+  "profile": 1002,
+  "image": "default",
+  "favorite": 0,
+  "order": 48,
+  "protocol": 21,
+  "sub_protocol": 3,
+  "routing": 0,
+  "state": 1,
+  "state_changed": 1694024544,
+  "added": 1679551927,
+  "history": 1,
+  "cube_type": 8,
+  "note": "",
+  "services": 7,
+  "phonetic_name": "",
+  "owner": 2,
+  "security": 0,
+  "attributes": [
+    {
+      "id": 1,
+      "node_id": 1,
+      "instance": 1,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 1.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 1,
+      "state": 1,
+      "last_changed": 1694024544,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "can_observe": [300],
+        "automations": ["toggle"],
+        "history": {
+          "day": 35,
+          "week": 5,
+          "month": 1,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 2,
+      "node_id": 1,
+      "instance": 1,
+      "minimum": 0,
+      "maximum": 100,
+      "current_value": 100.0,
+      "target_value": 100.0,
+      "last_value": 100.0,
+      "unit": "%",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 2,
+      "state": 1,
+      "last_changed": 1694024544,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["step"]
+      }
+    },
+    {
+      "id": 3,
+      "node_id": 1,
+      "instance": 1,
+      "minimum": 0,
+      "maximum": 1073741824,
+      "current_value": 16763000,
+      "target_value": 16763000,
+      "last_value": 16763000,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 23,
+      "state": 1,
+      "last_changed": 1694024544,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "7001020;16419669;12026363;16525995",
+      "name": ""
+    },
+    {
+      "id": 4,
+      "node_id": 1,
+      "instance": 1,
+      "minimum": 153,
+      "maximum": 500,
+      "current_value": 366.0,
+      "target_value": 366.0,
+      "last_value": 366.0,
+      "unit": "K",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 42,
+      "state": 1,
+      "last_changed": 1694024544,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["step"]
+      }
+    },
+    {
+      "id": 5,
+      "node_id": 1,
+      "instance": 2,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 1,
+      "state": 1,
+      "last_changed": 1694024544,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "can_observe": [300],
+        "automations": ["toggle"],
+        "history": {
+          "day": 35,
+          "week": 5,
+          "month": 1,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 6,
+      "node_id": 1,
+      "instance": 2,
+      "minimum": 0,
+      "maximum": 100,
+      "current_value": 100.0,
+      "target_value": 100.0,
+      "last_value": 100.0,
+      "unit": "%",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 2,
+      "state": 1,
+      "last_changed": 1694024544,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["step"]
+      }
+    },
+    {
+      "id": 7,
+      "node_id": 1,
+      "instance": 2,
+      "minimum": 0,
+      "maximum": 1073741824,
+      "current_value": 16763000,
+      "target_value": 16763000,
+      "last_value": 16763000,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 23,
+      "state": 1,
+      "last_changed": 1694024544,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "7001020;16419669;12026363;16525995",
+      "name": ""
+    },
+    {
+      "id": 8,
+      "node_id": 1,
+      "instance": 2,
+      "minimum": 2202,
+      "maximum": 4000,
+      "current_value": 3000.0,
+      "target_value": 3000.0,
+      "last_value": 3000.0,
+      "unit": "K",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 42,
+      "state": 1,
+      "last_changed": 1694024544,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["step"]
+      }
+    },
+    {
+      "id": 9,
+      "node_id": 1,
+      "instance": 3,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 1.0,
+      "target_value": 1.0,
+      "last_value": 1.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 1,
+      "state": 1,
+      "last_changed": 1736743294,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "can_observe": [300],
+        "automations": ["toggle"],
+        "history": {
+          "day": 35,
+          "week": 5,
+          "month": 1,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 10,
+      "node_id": 1,
+      "instance": 3,
+      "minimum": 0,
+      "maximum": 100,
+      "current_value": 40.0,
+      "target_value": 40.0,
+      "last_value": 40.0,
+      "unit": "%",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 2,
+      "state": 1,
+      "last_changed": 1736743291,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["step"]
+      }
+    },
+    {
+      "id": 11,
+      "node_id": 1,
+      "instance": 4,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 1.0,
+      "target_value": 1.0,
+      "last_value": 1.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 1,
+      "state": 1,
+      "last_changed": 1694024544,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "can_observe": [300],
+        "automations": ["toggle"],
+        "history": {
+          "day": 35,
+          "week": 5,
+          "month": 1,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 12,
+      "node_id": 1,
+      "instance": 4,
+      "minimum": 2200,
+      "maximum": 4000,
+      "current_value": 3000.0,
+      "target_value": 3000.0,
+      "last_value": 3000.0,
+      "unit": "K",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 42,
+      "state": 1,
+      "last_changed": 1694024544,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["step"]
+      }
+    }
+  ]
+}
diff --git a/tests/components/homee/fixtures/lock.json b/tests/components/homee/fixtures/lock.json
new file mode 100644
index 00000000000..79fd53e0311
--- /dev/null
+++ b/tests/components/homee/fixtures/lock.json
@@ -0,0 +1,52 @@
+{
+  "id": 1,
+  "name": "Test Lock",
+  "profile": 2007,
+  "image": "default",
+  "favorite": 0,
+  "order": 31,
+  "protocol": 1,
+  "routing": 0,
+  "state": 1,
+  "state_changed": 1711799526,
+  "added": 1645036891,
+  "history": 1,
+  "cube_type": 1,
+  "note": "",
+  "services": 3,
+  "phonetic_name": "",
+  "owner": 2,
+  "security": 0,
+  "attributes": [
+    {
+      "id": 1,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 1.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 232,
+      "state": 1,
+      "last_changed": 1711897362,
+      "changed_by": 4,
+      "changed_by_id": 5,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["toggle"],
+        "history": {
+          "day": 35,
+          "week": 5,
+          "month": 1,
+          "stepped": true
+        }
+      }
+    }
+  ]
+}
diff --git a/tests/components/homee/fixtures/numbers.json b/tests/components/homee/fixtures/numbers.json
new file mode 100644
index 00000000000..c8773a89568
--- /dev/null
+++ b/tests/components/homee/fixtures/numbers.json
@@ -0,0 +1,337 @@
+{
+  "id": 1,
+  "name": "Test Number",
+  "profile": 2011,
+  "image": "default",
+  "favorite": 0,
+  "order": 1,
+  "protocol": 3,
+  "routing": 0,
+  "state": 1,
+  "state_changed": 1731020474,
+  "added": 1680027411,
+  "history": 1,
+  "cube_type": 3,
+  "note": "",
+  "services": 0,
+  "phonetic_name": "",
+  "owner": 2,
+  "security": 0,
+  "attributes": [
+    {
+      "id": 2,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 100,
+      "current_value": 100.0,
+      "target_value": 100.0,
+      "last_value": 100.0,
+      "unit": "%",
+      "step_value": 0.5,
+      "editable": 1,
+      "type": 349,
+      "state": 1,
+      "last_changed": 1624446307,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 3,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": -75,
+      "maximum": 75,
+      "current_value": 38.0,
+      "target_value": 38.0,
+      "last_value": 38.0,
+      "unit": "°",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 350,
+      "state": 1,
+      "last_changed": 1624446307,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 4,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 4,
+      "maximum": 240,
+      "current_value": 57.0,
+      "target_value": 57.0,
+      "last_value": 90.0,
+      "unit": "s",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 111,
+      "state": 1,
+      "last_changed": 1615396252,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 5,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 130,
+      "current_value": 129.0,
+      "target_value": 129.0,
+      "last_value": 1.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 325,
+      "state": 1,
+      "last_changed": 1672086680,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 6,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 1,
+      "maximum": 15300,
+      "current_value": 10.0,
+      "target_value": 1.0,
+      "last_value": 10.0,
+      "unit": "s",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 28,
+      "state": 1,
+      "last_changed": 1676204559,
+      "changed_by": 0,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 7,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 3,
+      "current_value": 3.0,
+      "target_value": 3.0,
+      "last_value": 2.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 261,
+      "state": 1,
+      "last_changed": 1666336770,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 8,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 5,
+      "maximum": 45,
+      "current_value": 30.0,
+      "target_value": 30.0,
+      "last_value": 0.0,
+      "unit": "min",
+      "step_value": 5.0,
+      "editable": 1,
+      "type": 88,
+      "state": 1,
+      "last_changed": 1672086680,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 9,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 24,
+      "current_value": 1.6,
+      "target_value": 1.6,
+      "last_value": 0.0,
+      "unit": "s",
+      "step_value": 0.1,
+      "editable": 1,
+      "type": 114,
+      "state": 1,
+      "last_changed": 1615396156,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 10,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": -127,
+      "maximum": 127,
+      "current_value": 75.0,
+      "target_value": 75.0,
+      "last_value": 0.0,
+      "unit": "°",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 323,
+      "state": 1,
+      "last_changed": 1615396156,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 11,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": -127,
+      "maximum": 127,
+      "current_value": -75.0,
+      "target_value": -75.0,
+      "last_value": 0.0,
+      "unit": "°",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 322,
+      "state": 1,
+      "last_changed": 1615396156,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 12,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 1,
+      "maximum": 20,
+      "current_value": 6.0,
+      "target_value": 6.0,
+      "last_value": 1.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 174,
+      "state": 1,
+      "last_changed": 1672149083,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 13,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": -5,
+      "maximum": 128,
+      "current_value": -3,
+      "target_value": -3,
+      "last_value": 128.0,
+      "unit": "°C",
+      "step_value": 0.1,
+      "editable": 1,
+      "type": 64,
+      "state": 6,
+      "last_changed": 1711799534,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 14,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 4,
+      "maximum": 240,
+      "current_value": 57.0,
+      "target_value": 57.0,
+      "last_value": 90.0,
+      "unit": "s",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 110,
+      "state": 1,
+      "last_changed": 1615396246,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 15,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 30,
+      "maximum": 7200,
+      "current_value": 600.0,
+      "target_value": 600.0,
+      "last_value": 600.0,
+      "unit": "min",
+      "step_value": 30.0,
+      "editable": 1,
+      "type": 29,
+      "state": 1,
+      "last_changed": 1739333970,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 16,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 240,
+      "current_value": 12.0,
+      "target_value": 12.0,
+      "last_value": 12.0,
+      "unit": "h",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 29,
+      "state": 1,
+      "last_changed": 1735964135,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "fixed_value",
+      "name": ""
+    }
+  ]
+}
diff --git a/tests/components/homee/fixtures/selects.json b/tests/components/homee/fixtures/selects.json
new file mode 100644
index 00000000000..27adcf07298
--- /dev/null
+++ b/tests/components/homee/fixtures/selects.json
@@ -0,0 +1,43 @@
+{
+  "id": 1,
+  "name": "Test Select",
+  "profile": 33,
+  "image": "nodeicon_dimmablebulb",
+  "favorite": 0,
+  "order": 27,
+  "protocol": 3,
+  "routing": 0,
+  "state": 1,
+  "state_changed": 1736188706,
+  "added": 1610308228,
+  "history": 1,
+  "cube_type": 3,
+  "note": "",
+  "services": 7,
+  "phonetic_name": "",
+  "owner": 2,
+  "security": 0,
+  "attributes": [
+    {
+      "id": 1,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 2,
+      "current_value": 1.0,
+      "target_value": 1.0,
+      "last_value": 1.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 226,
+      "state": 1,
+      "last_changed": 1680027880,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    }
+  ]
+}
diff --git a/tests/components/homee/fixtures/sensors.json b/tests/components/homee/fixtures/sensors.json
new file mode 100644
index 00000000000..bcc36a85ee7
--- /dev/null
+++ b/tests/components/homee/fixtures/sensors.json
@@ -0,0 +1,736 @@
+{
+  "id": 1,
+  "name": "Test MultiSensor",
+  "profile": 4010,
+  "image": "default",
+  "favorite": 0,
+  "order": 20,
+  "protocol": 1,
+  "routing": 0,
+  "state": 1,
+  "state_changed": 1709379826,
+  "added": 1676199446,
+  "history": 1,
+  "cube_type": 1,
+  "note": "",
+  "services": 5,
+  "phonetic_name": "",
+  "owner": 2,
+  "security": 0,
+  "attributes": [
+    {
+      "id": 1,
+      "node_id": 1,
+      "instance": 1,
+      "minimum": 0,
+      "maximum": 200000,
+      "current_value": 555.591,
+      "target_value": 555.591,
+      "last_value": 555.586,
+      "unit": "kWh",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 4,
+      "state": 1,
+      "last_changed": 1694175270,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 2,
+      "node_id": 1,
+      "instance": 2,
+      "minimum": 0,
+      "maximum": 200000,
+      "current_value": 1730.812,
+      "target_value": 1730.812,
+      "last_value": 1730.679,
+      "unit": "kWh",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 4,
+      "state": 1,
+      "last_changed": 1694175270,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 3,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 100,
+      "current_value": 100.0,
+      "target_value": 100.0,
+      "last_value": 100.0,
+      "unit": "%",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 8,
+      "state": 1,
+      "last_changed": 1709982926,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 34,
+      "node_id": 1,
+      "instance": 2,
+      "minimum": 0,
+      "maximum": 100,
+      "current_value": 100.0,
+      "target_value": 100.0,
+      "last_value": 100.0,
+      "unit": "%",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 8,
+      "state": 1,
+      "last_changed": 1709982926,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 4,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 100,
+      "current_value": 100.0,
+      "target_value": 100.0,
+      "last_value": 100.0,
+      "unit": "%",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 11,
+      "state": 1,
+      "last_changed": 1709982926,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 5,
+      "node_id": 1,
+      "instance": 1,
+      "minimum": 0,
+      "maximum": 65000,
+      "current_value": 175.0,
+      "target_value": 175.0,
+      "last_value": 66.0,
+      "unit": "lx",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 11,
+      "state": 1,
+      "last_changed": 1709982926,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 6,
+      "node_id": 1,
+      "instance": 2,
+      "minimum": 1,
+      "maximum": 100,
+      "current_value": 7.0,
+      "target_value": 7.0,
+      "last_value": 8.0,
+      "unit": "klx",
+      "step_value": 0.5,
+      "editable": 0,
+      "type": 11,
+      "state": 1,
+      "last_changed": 1700056686,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 7,
+      "node_id": 1,
+      "instance": 1,
+      "minimum": 0,
+      "maximum": 70,
+      "current_value": 0.249,
+      "target_value": 0.249,
+      "last_value": 0.249,
+      "unit": "A",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 193,
+      "state": 1,
+      "last_changed": 1694175269,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 8,
+      "node_id": 1,
+      "instance": 2,
+      "minimum": 0,
+      "maximum": 70,
+      "current_value": 0.812,
+      "target_value": 0.812,
+      "last_value": 0.252,
+      "unit": "A",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 193,
+      "state": 1,
+      "last_changed": 1694175269,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 9,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 100,
+      "current_value": 70.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "%",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 18,
+      "state": 1,
+      "last_changed": 1711796633,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 10,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 500,
+      "current_value": 500.0,
+      "target_value": 500.0,
+      "last_value": 500.0,
+      "unit": "lx",
+      "step_value": 2.0,
+      "editable": 0,
+      "type": 301,
+      "state": 1,
+      "last_changed": 1700056347,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 11,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": -40,
+      "maximum": 100,
+      "current_value": 44.12,
+      "target_value": 44.12,
+      "last_value": 44.27,
+      "unit": "°C",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 92,
+      "state": 1,
+      "last_changed": 1694176210,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 12,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 4095,
+      "current_value": 2000.0,
+      "target_value": 0.0,
+      "last_value": 1800.0,
+      "unit": "1/min",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 103,
+      "state": 1,
+      "last_changed": 1736106312,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 13,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 100,
+      "current_value": 47.0,
+      "target_value": 47.0,
+      "last_value": 47.0,
+      "unit": "%",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 96,
+      "state": 1,
+      "last_changed": 1736106312,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 14,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": -64,
+      "maximum": 63,
+      "current_value": 18.0,
+      "target_value": 18.0,
+      "last_value": 18.0,
+      "unit": "°C",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 98,
+      "state": 1,
+      "last_changed": 1736106312,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 15,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 4095,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "1/min",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 102,
+      "state": 1,
+      "last_changed": 1736106312,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 16,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 99999,
+      "current_value": 2490.0,
+      "target_value": 2490.0,
+      "last_value": 2516.0,
+      "unit": "L",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 22,
+      "state": 1,
+      "last_changed": 1735964135,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 17,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 4,
+      "current_value": 4.0,
+      "target_value": 4.0,
+      "last_value": 4.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 33,
+      "state": 1,
+      "last_changed": 1735964135,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 18,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 196605,
+      "current_value": 5478.0,
+      "target_value": 5478.0,
+      "last_value": 5478.0,
+      "unit": "h",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 104,
+      "state": 1,
+      "last_changed": 1736105231,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 19,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 100,
+      "current_value": 33.0,
+      "target_value": 33.0,
+      "last_value": 32.0,
+      "unit": "%",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 95,
+      "state": 1,
+      "last_changed": 1736106312,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 20,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": -64,
+      "maximum": 63,
+      "current_value": 17.0,
+      "target_value": 17.0,
+      "last_value": 17.0,
+      "unit": "°C",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 97,
+      "state": 1,
+      "last_changed": 1736106312,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 21,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 100,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "%",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 15,
+      "state": 1,
+      "last_changed": 1694176210,
+      "changed_by": 2,
+      "changed_by_id": 2,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 22,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 100,
+      "current_value": 51.0,
+      "target_value": 51.0,
+      "last_value": 51.0,
+      "unit": "%",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 7,
+      "state": 1,
+      "last_changed": 1709982925,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 23,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": -50,
+      "maximum": 125,
+      "current_value": 20.3,
+      "target_value": 20.3,
+      "last_value": 20.3,
+      "unit": "°C",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 5,
+      "state": 1,
+      "last_changed": 1709982925,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 24,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 600000,
+      "current_value": 3657.822,
+      "target_value": 3657.822,
+      "last_value": 3657.377,
+      "unit": "kWh",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 240,
+      "state": 1,
+      "last_changed": 1694175269,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 25,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 200,
+      "current_value": 2.223,
+      "target_value": 2.223,
+      "last_value": 2.21,
+      "unit": "A",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 272,
+      "state": 1,
+      "last_changed": 1694175269,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 26,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 80000,
+      "current_value": 195.384,
+      "target_value": 195.384,
+      "last_value": 248.412,
+      "unit": "W",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 239,
+      "state": 1,
+      "last_changed": 1694176076,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 27,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 420,
+      "current_value": 239.823,
+      "target_value": 239.823,
+      "last_value": 235.775,
+      "unit": "V",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 51,
+      "state": 1,
+      "last_changed": 1694175269,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 28,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 4,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 3.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 135,
+      "state": 1,
+      "last_changed": 1687175680,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 29,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 15,
+      "current_value": 6.0,
+      "target_value": 6.0,
+      "last_value": 6.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 173,
+      "state": 1,
+      "last_changed": 1709982926,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 30,
+      "node_id": 1,
+      "instance": 1,
+      "minimum": 0,
+      "maximum": 420,
+      "current_value": 239.823,
+      "target_value": 239.823,
+      "last_value": 239.559,
+      "unit": "V",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 195,
+      "state": 1,
+      "last_changed": 1694175269,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 31,
+      "node_id": 1,
+      "instance": 2,
+      "minimum": 0,
+      "maximum": 420,
+      "current_value": 236.867,
+      "target_value": 236.867,
+      "last_value": 237.634,
+      "unit": "V",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 195,
+      "state": 1,
+      "last_changed": 1694175269,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 32,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 25,
+      "current_value": 2.0,
+      "target_value": 2.0,
+      "last_value": 2.5,
+      "unit": "m/s",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 146,
+      "state": 1,
+      "last_changed": 1700056836,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 33,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 2,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 2.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 0,
+      "type": 10,
+      "state": 1,
+      "last_changed": 1687175680,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    }
+  ]
+}
diff --git a/tests/components/homee/fixtures/switch_single.json b/tests/components/homee/fixtures/switch_single.json
new file mode 100644
index 00000000000..74b7fae048d
--- /dev/null
+++ b/tests/components/homee/fixtures/switch_single.json
@@ -0,0 +1,74 @@
+{
+  "id": 2,
+  "name": "Test Switch Single",
+  "profile": 15,
+  "image": "nodeicon_bulb",
+  "favorite": 0,
+  "order": 27,
+  "protocol": 3,
+  "routing": 0,
+  "state": 1,
+  "state_changed": 1736188706,
+  "added": 1610308228,
+  "history": 1,
+  "cube_type": 3,
+  "note": "",
+  "services": 7,
+  "phonetic_name": "",
+  "owner": 2,
+  "security": 0,
+  "attributes": [
+    {
+      "id": 1,
+      "node_id": 2,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 1.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 1,
+      "state": 1,
+      "last_changed": 1736743294,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "can_observe": [300],
+        "automations": ["toggle"],
+        "history": {
+          "day": 35,
+          "week": 5,
+          "month": 1,
+          "stepped": true
+        }
+      }
+    },
+    {
+      "id": 2,
+      "node_id": 2,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 1.0,
+      "target_value": 1.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 385,
+      "state": 1,
+      "last_changed": 1735663169,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 0,
+      "data": "",
+      "name": ""
+    }
+  ]
+}
diff --git a/tests/components/homee/fixtures/switches.json b/tests/components/homee/fixtures/switches.json
new file mode 100644
index 00000000000..333717591a7
--- /dev/null
+++ b/tests/components/homee/fixtures/switches.json
@@ -0,0 +1,127 @@
+{
+  "id": 1,
+  "name": "Test Switch",
+  "profile": 10,
+  "image": "nodeicon_dimmablebulb",
+  "favorite": 0,
+  "order": 27,
+  "protocol": 3,
+  "routing": 0,
+  "state": 1,
+  "state_changed": 1736188706,
+  "added": 1610308228,
+  "history": 1,
+  "cube_type": 3,
+  "note": "All known switches",
+  "services": 7,
+  "phonetic_name": "",
+  "owner": 2,
+  "security": 0,
+  "attributes": [
+    {
+      "id": 1,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 309,
+      "state": 1,
+      "last_changed": 1677692134,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 2,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 91,
+      "state": 1,
+      "last_changed": 1711796633,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 3,
+      "node_id": 1,
+      "instance": 1,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 1,
+      "state": 1,
+      "last_changed": 1736743294,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 4,
+      "node_id": 1,
+      "instance": 2,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 1.0,
+      "target_value": 1.0,
+      "last_value": 1.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 1,
+      "state": 1,
+      "last_changed": 1736743294,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": ""
+    },
+    {
+      "id": 5,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "current_value": 1.0,
+      "target_value": 1.0,
+      "last_value": 0.0,
+      "unit": "n/a",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 385,
+      "state": 1,
+      "last_changed": 1735663169,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 0,
+      "data": "",
+      "name": ""
+    }
+  ]
+}
diff --git a/tests/components/homee/fixtures/valve.json b/tests/components/homee/fixtures/valve.json
new file mode 100644
index 00000000000..2b622cca6b1
--- /dev/null
+++ b/tests/components/homee/fixtures/valve.json
@@ -0,0 +1,51 @@
+{
+  "id": 1,
+  "name": "Test Valve",
+  "profile": 3011,
+  "image": "nodeicon_valve",
+  "favorite": 0,
+  "order": 27,
+  "protocol": 3,
+  "routing": 0,
+  "state": 1,
+  "state_changed": 1736188706,
+  "added": 1610308228,
+  "history": 1,
+  "cube_type": 3,
+  "note": "",
+  "services": 7,
+  "phonetic_name": "",
+  "owner": 2,
+  "security": 0,
+  "attributes": [
+    {
+      "id": 1,
+      "node_id": 1,
+      "instance": 0,
+      "minimum": 0,
+      "maximum": 100,
+      "current_value": 0.0,
+      "target_value": 0.0,
+      "last_value": 0.0,
+      "unit": "%",
+      "step_value": 1.0,
+      "editable": 1,
+      "type": 18,
+      "state": 1,
+      "last_changed": 1711796633,
+      "changed_by": 1,
+      "changed_by_id": 0,
+      "based_on": 1,
+      "data": "",
+      "name": "",
+      "options": {
+        "automations": ["step"],
+        "history": {
+          "day": 1,
+          "week": 26,
+          "month": 6
+        }
+      }
+    }
+  ]
+}
diff --git a/tests/components/homee/snapshots/test_binary_sensor.ambr b/tests/components/homee/snapshots/test_binary_sensor.ambr
new file mode 100644
index 00000000000..4926c048f5b
--- /dev/null
+++ b/tests/components/homee/snapshots/test_binary_sensor.ambr
@@ -0,0 +1,1392 @@
+# serializer version: 1
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_battery-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.test_binary_sensor_battery',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.BATTERY: 'battery'>,
+    'original_icon': None,
+    'original_name': 'Battery',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'battery',
+    'unique_id': '00055511EECC-1-1',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_battery-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'battery',
+      'friendly_name': 'Test Binary Sensor Battery',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_battery',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_blackout-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.test_binary_sensor_blackout',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Blackout',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'blackout_alarm',
+    'unique_id': '00055511EECC-1-2',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_blackout-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'Test Binary Sensor Blackout',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_blackout',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_carbon_dioxide-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.test_binary_sensor_carbon_dioxide',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Carbon dioxide',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'carbon_dioxide',
+    'unique_id': '00055511EECC-1-4',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_carbon_dioxide-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'Test Binary Sensor Carbon dioxide',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_carbon_dioxide',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_carbon_monoxide-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.test_binary_sensor_carbon_monoxide',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.CO: 'carbon_monoxide'>,
+    'original_icon': None,
+    'original_name': 'Carbon monoxide',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'carbon_monoxide',
+    'unique_id': '00055511EECC-1-3',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_carbon_monoxide-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'carbon_monoxide',
+      'friendly_name': 'Test Binary Sensor Carbon monoxide',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_carbon_monoxide',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_flood-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.test_binary_sensor_flood',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.MOISTURE: 'moisture'>,
+    'original_icon': None,
+    'original_name': 'Flood',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'flood',
+    'unique_id': '00055511EECC-1-5',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_flood-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'moisture',
+      'friendly_name': 'Test Binary Sensor Flood',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_flood',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_high_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.test_binary_sensor_high_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.HEAT: 'heat'>,
+    'original_icon': None,
+    'original_name': 'High temperature',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'high_temperature',
+    'unique_id': '00055511EECC-1-6',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_high_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'heat',
+      'friendly_name': 'Test Binary Sensor High temperature',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_high_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_leak-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.test_binary_sensor_leak',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Leak',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'leak_alarm',
+    'unique_id': '00055511EECC-1-7',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_leak-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'Test Binary Sensor Leak',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_leak',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_load-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.test_binary_sensor_load',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Load',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'load_alarm',
+    'unique_id': '00055511EECC-1-8',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_load-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Binary Sensor Load',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_load',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_lock-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.test_binary_sensor_lock',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.LOCK: 'lock'>,
+    'original_icon': None,
+    'original_name': 'Lock',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'lock',
+    'unique_id': '00055511EECC-1-9',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_lock-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'lock',
+      'friendly_name': 'Test Binary Sensor Lock',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_lock',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_low_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.test_binary_sensor_low_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.COLD: 'cold'>,
+    'original_icon': None,
+    'original_name': 'Low temperature',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'low_temperature',
+    'unique_id': '00055511EECC-1-10',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_low_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'cold',
+      'friendly_name': 'Test Binary Sensor Low temperature',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_low_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_malfunction-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.test_binary_sensor_malfunction',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Malfunction',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'malfunction',
+    'unique_id': '00055511EECC-1-11',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_malfunction-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'Test Binary Sensor Malfunction',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_malfunction',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_maximum_level-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.test_binary_sensor_maximum_level',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Maximum level',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'maximum',
+    'unique_id': '00055511EECC-1-12',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_maximum_level-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'Test Binary Sensor Maximum level',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_maximum_level',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_minimum_level-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.test_binary_sensor_minimum_level',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Minimum level',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'minimum',
+    'unique_id': '00055511EECC-1-13',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_minimum_level-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'Test Binary Sensor Minimum level',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_minimum_level',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_motion-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.test_binary_sensor_motion',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.MOTION: 'motion'>,
+    'original_icon': None,
+    'original_name': 'Motion',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'motion',
+    'unique_id': '00055511EECC-1-14',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_motion-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'motion',
+      'friendly_name': 'Test Binary Sensor Motion',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_motion',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_motor_blocked-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.test_binary_sensor_motor_blocked',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Motor blocked',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'motor_blocked',
+    'unique_id': '00055511EECC-1-15',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_motor_blocked-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'Test Binary Sensor Motor blocked',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_motor_blocked',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_opening-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.test_binary_sensor_opening',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.OPENING: 'opening'>,
+    'original_icon': None,
+    'original_name': 'Opening',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'opening',
+    'unique_id': '00055511EECC-1-17',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_opening-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'opening',
+      'friendly_name': 'Test Binary Sensor Opening',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_opening',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_overcurrent-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.test_binary_sensor_overcurrent',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Overcurrent',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'overcurrent',
+    'unique_id': '00055511EECC-1-18',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_overcurrent-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'Test Binary Sensor Overcurrent',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_overcurrent',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_overload-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.test_binary_sensor_overload',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Overload',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'overload',
+    'unique_id': '00055511EECC-1-19',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_overload-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'Test Binary Sensor Overload',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_overload',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_plug-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.test_binary_sensor_plug',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PLUG: 'plug'>,
+    'original_icon': None,
+    'original_name': 'Plug',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'plug',
+    'unique_id': '00055511EECC-1-16',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_plug-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'plug',
+      'friendly_name': 'Test Binary Sensor Plug',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_plug',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.test_binary_sensor_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'power',
+    'unique_id': '00055511EECC-1-21',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Test Binary Sensor Power',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_presence-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.test_binary_sensor_presence',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PRESENCE: 'presence'>,
+    'original_icon': None,
+    'original_name': 'Presence',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'presence',
+    'unique_id': '00055511EECC-1-20',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_presence-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'presence',
+      'friendly_name': 'Test Binary Sensor Presence',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_presence',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_rain-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.test_binary_sensor_rain',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.MOISTURE: 'moisture'>,
+    'original_icon': None,
+    'original_name': 'Rain',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'rain',
+    'unique_id': '00055511EECC-1-22',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_rain-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'moisture',
+      'friendly_name': 'Test Binary Sensor Rain',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_rain',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_replace_filter-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.test_binary_sensor_replace_filter',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Replace filter',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'replace_filter',
+    'unique_id': '00055511EECC-1-23',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_replace_filter-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'Test Binary Sensor Replace filter',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_replace_filter',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_smoke-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.test_binary_sensor_smoke',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.SMOKE: 'smoke'>,
+    'original_icon': None,
+    'original_name': 'Smoke',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'smoke',
+    'unique_id': '00055511EECC-1-24',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_smoke-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'smoke',
+      'friendly_name': 'Test Binary Sensor Smoke',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_smoke',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_storage-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.test_binary_sensor_storage',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Storage',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'storage',
+    'unique_id': '00055511EECC-1-25',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_storage-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'Test Binary Sensor Storage',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_storage',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_surge-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.test_binary_sensor_surge',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Surge',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'surge',
+    'unique_id': '00055511EECC-1-26',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_surge-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'Test Binary Sensor Surge',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_surge',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_tamper-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.test_binary_sensor_tamper',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.TAMPER: 'tamper'>,
+    'original_icon': None,
+    'original_name': 'Tamper',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'tamper',
+    'unique_id': '00055511EECC-1-27',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_tamper-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'tamper',
+      'friendly_name': 'Test Binary Sensor Tamper',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_tamper',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_voltage_drop-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.test_binary_sensor_voltage_drop',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Voltage drop',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'voltage_drop',
+    'unique_id': '00055511EECC-1-28',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_voltage_drop-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'Test Binary Sensor Voltage drop',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_voltage_drop',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_water-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.test_binary_sensor_water',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.MOISTURE: 'moisture'>,
+    'original_icon': None,
+    'original_name': 'Water',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'water',
+    'unique_id': '00055511EECC-1-29',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[binary_sensor.test_binary_sensor_water-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'moisture',
+      'friendly_name': 'Test Binary Sensor Water',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_binary_sensor_water',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
diff --git a/tests/components/homee/snapshots/test_button.ambr b/tests/components/homee/snapshots/test_button.ambr
new file mode 100644
index 00000000000..be2bbae539b
--- /dev/null
+++ b/tests/components/homee/snapshots/test_button.ambr
@@ -0,0 +1,566 @@
+# serializer version: 1
+# name: test_button_snapshot[button.test_button-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'button',
+    'entity_category': None,
+    'entity_id': 'button.test_button',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '00055511EECC-1-4',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_button_snapshot[button.test_button-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Button',
+    }),
+    'context': <ANY>,
+    'entity_id': 'button.test_button',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_button_snapshot[button.test_button_automatic_mode-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'button',
+    'entity_category': None,
+    'entity_id': 'button.test_button_automatic_mode',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Automatic mode',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'automatic_mode',
+    'unique_id': '00055511EECC-1-1',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_button_snapshot[button.test_button_automatic_mode-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Button Automatic mode',
+    }),
+    'context': <ANY>,
+    'entity_id': 'button.test_button_automatic_mode',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_button_snapshot[button.test_button_briefly_open-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'button',
+    'entity_category': None,
+    'entity_id': 'button.test_button_briefly_open',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Briefly open',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'briefly_open',
+    'unique_id': '00055511EECC-1-2',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_button_snapshot[button.test_button_briefly_open-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Button Briefly open',
+    }),
+    'context': <ANY>,
+    'entity_id': 'button.test_button_briefly_open',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_button_snapshot[button.test_button_identification_mode-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'button',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'button.test_button_identification_mode',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
+    'original_icon': None,
+    'original_name': 'Identification mode',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'identification_mode',
+    'unique_id': '00055511EECC-1-3',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_button_snapshot[button.test_button_identification_mode-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'identify',
+      'friendly_name': 'Test Button Identification mode',
+    }),
+    'context': <ANY>,
+    'entity_id': 'button.test_button_identification_mode',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_button_snapshot[button.test_button_impulse_1-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'button',
+    'entity_category': None,
+    'entity_id': 'button.test_button_impulse_1',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Impulse 1',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'impulse_instance',
+    'unique_id': '00055511EECC-1-5',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_button_snapshot[button.test_button_impulse_1-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Button Impulse 1',
+    }),
+    'context': <ANY>,
+    'entity_id': 'button.test_button_impulse_1',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_button_snapshot[button.test_button_impulse_2-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'button',
+    'entity_category': None,
+    'entity_id': 'button.test_button_impulse_2',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Impulse 2',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'impulse_instance',
+    'unique_id': '00055511EECC-1-6',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_button_snapshot[button.test_button_impulse_2-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Button Impulse 2',
+    }),
+    'context': <ANY>,
+    'entity_id': 'button.test_button_impulse_2',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_button_snapshot[button.test_button_light-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'button',
+    'entity_category': None,
+    'entity_id': 'button.test_button_light',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Light',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'light',
+    'unique_id': '00055511EECC-1-7',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_button_snapshot[button.test_button_light-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Button Light',
+    }),
+    'context': <ANY>,
+    'entity_id': 'button.test_button_light',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_button_snapshot[button.test_button_open_partially-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'button',
+    'entity_category': None,
+    'entity_id': 'button.test_button_open_partially',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Open partially',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'open_partial',
+    'unique_id': '00055511EECC-1-8',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_button_snapshot[button.test_button_open_partially-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Button Open partially',
+    }),
+    'context': <ANY>,
+    'entity_id': 'button.test_button_open_partially',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_button_snapshot[button.test_button_open_permanently-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'button',
+    'entity_category': None,
+    'entity_id': 'button.test_button_open_permanently',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Open permanently',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'permanently_open',
+    'unique_id': '00055511EECC-1-9',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_button_snapshot[button.test_button_open_permanently-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Button Open permanently',
+    }),
+    'context': <ANY>,
+    'entity_id': 'button.test_button_open_permanently',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_button_snapshot[button.test_button_reset_meter_1-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'button',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'button.test_button_reset_meter_1',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Reset meter 1',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'reset_meter_instance',
+    'unique_id': '00055511EECC-1-10',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_button_snapshot[button.test_button_reset_meter_1-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Button Reset meter 1',
+    }),
+    'context': <ANY>,
+    'entity_id': 'button.test_button_reset_meter_1',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_button_snapshot[button.test_button_reset_meter_2-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'button',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'button.test_button_reset_meter_2',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Reset meter 2',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'reset_meter_instance',
+    'unique_id': '00055511EECC-1-11',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_button_snapshot[button.test_button_reset_meter_2-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Button Reset meter 2',
+    }),
+    'context': <ANY>,
+    'entity_id': 'button.test_button_reset_meter_2',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_button_snapshot[button.test_button_ventilate-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'button',
+    'entity_category': None,
+    'entity_id': 'button.test_button_ventilate',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Ventilate',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'ventilate',
+    'unique_id': '00055511EECC-1-12',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_button_snapshot[button.test_button_ventilate-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Button Ventilate',
+    }),
+    'context': <ANY>,
+    'entity_id': 'button.test_button_ventilate',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
diff --git a/tests/components/homee/snapshots/test_light.ambr b/tests/components/homee/snapshots/test_light.ambr
new file mode 100644
index 00000000000..3c766552467
--- /dev/null
+++ b/tests/components/homee/snapshots/test_light.ambr
@@ -0,0 +1,348 @@
+# serializer version: 1
+# name: test_light_snapshot[light.another_test_light-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max_color_temp_kelvin': 7000,
+      'max_mireds': 500,
+      'min_color_temp_kelvin': 2000,
+      'min_mireds': 142,
+      'supported_color_modes': list([
+        <ColorMode.COLOR_TEMP: 'color_temp'>,
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'light',
+    'entity_category': None,
+    'entity_id': 'light.another_test_light',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '00055511EECC-2-12',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_light_snapshot[light.another_test_light-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'brightness': 255,
+      'color_mode': <ColorMode.COLOR_TEMP: 'color_temp'>,
+      'color_temp': 270,
+      'color_temp_kelvin': 3700,
+      'friendly_name': 'Another Test Light',
+      'hs_color': tuple(
+        26.996,
+        40.593,
+      ),
+      'max_color_temp_kelvin': 7000,
+      'max_mireds': 500,
+      'min_color_temp_kelvin': 2000,
+      'min_mireds': 142,
+      'rgb_color': tuple(
+        255,
+        198,
+        151,
+      ),
+      'supported_color_modes': list([
+        <ColorMode.COLOR_TEMP: 'color_temp'>,
+      ]),
+      'supported_features': <LightEntityFeature: 0>,
+      'xy_color': tuple(
+        0.44,
+        0.371,
+      ),
+    }),
+    'context': <ANY>,
+    'entity_id': 'light.another_test_light',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_light_snapshot[light.test_light_light_1-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max_color_temp_kelvin': 500,
+      'max_mireds': 6535,
+      'min_color_temp_kelvin': 153,
+      'min_mireds': 2000,
+      'supported_color_modes': list([
+        <ColorMode.COLOR_TEMP: 'color_temp'>,
+        <ColorMode.HS: 'hs'>,
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'light',
+    'entity_category': None,
+    'entity_id': 'light.test_light_light_1',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Light 1',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'light_instance',
+    'unique_id': '00055511EECC-1-1',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_light_snapshot[light.test_light_light_1-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'brightness': 255,
+      'color_mode': <ColorMode.HS: 'hs'>,
+      'color_temp': None,
+      'color_temp_kelvin': None,
+      'friendly_name': 'Test Light Light 1',
+      'hs_color': tuple(
+        35.556,
+        52.941,
+      ),
+      'max_color_temp_kelvin': 500,
+      'max_mireds': 6535,
+      'min_color_temp_kelvin': 153,
+      'min_mireds': 2000,
+      'rgb_color': tuple(
+        255,
+        200,
+        120,
+      ),
+      'supported_color_modes': list([
+        <ColorMode.COLOR_TEMP: 'color_temp'>,
+        <ColorMode.HS: 'hs'>,
+      ]),
+      'supported_features': <LightEntityFeature: 0>,
+      'xy_color': tuple(
+        0.464,
+        0.402,
+      ),
+    }),
+    'context': <ANY>,
+    'entity_id': 'light.test_light_light_1',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_light_snapshot[light.test_light_light_2-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max_color_temp_kelvin': 4000,
+      'max_mireds': 454,
+      'min_color_temp_kelvin': 2202,
+      'min_mireds': 250,
+      'supported_color_modes': list([
+        <ColorMode.COLOR_TEMP: 'color_temp'>,
+        <ColorMode.HS: 'hs'>,
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'light',
+    'entity_category': None,
+    'entity_id': 'light.test_light_light_2',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Light 2',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'light_instance',
+    'unique_id': '00055511EECC-1-5',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_light_snapshot[light.test_light_light_2-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'brightness': None,
+      'color_mode': None,
+      'color_temp': None,
+      'color_temp_kelvin': None,
+      'friendly_name': 'Test Light Light 2',
+      'hs_color': None,
+      'max_color_temp_kelvin': 4000,
+      'max_mireds': 454,
+      'min_color_temp_kelvin': 2202,
+      'min_mireds': 250,
+      'rgb_color': None,
+      'supported_color_modes': list([
+        <ColorMode.COLOR_TEMP: 'color_temp'>,
+        <ColorMode.HS: 'hs'>,
+      ]),
+      'supported_features': <LightEntityFeature: 0>,
+      'xy_color': None,
+    }),
+    'context': <ANY>,
+    'entity_id': 'light.test_light_light_2',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_light_snapshot[light.test_light_light_3-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'supported_color_modes': list([
+        <ColorMode.BRIGHTNESS: 'brightness'>,
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'light',
+    'entity_category': None,
+    'entity_id': 'light.test_light_light_3',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Light 3',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'light_instance',
+    'unique_id': '00055511EECC-1-9',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_light_snapshot[light.test_light_light_3-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'brightness': 102,
+      'color_mode': <ColorMode.BRIGHTNESS: 'brightness'>,
+      'friendly_name': 'Test Light Light 3',
+      'supported_color_modes': list([
+        <ColorMode.BRIGHTNESS: 'brightness'>,
+      ]),
+      'supported_features': <LightEntityFeature: 0>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'light.test_light_light_3',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_light_snapshot[light.test_light_light_4-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'supported_color_modes': list([
+        <ColorMode.ONOFF: 'onoff'>,
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'light',
+    'entity_category': None,
+    'entity_id': 'light.test_light_light_4',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Light 4',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'light_instance',
+    'unique_id': '00055511EECC-1-11',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_light_snapshot[light.test_light_light_4-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'color_mode': <ColorMode.ONOFF: 'onoff'>,
+      'friendly_name': 'Test Light Light 4',
+      'supported_color_modes': list([
+        <ColorMode.ONOFF: 'onoff'>,
+      ]),
+      'supported_features': <LightEntityFeature: 0>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'light.test_light_light_4',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
diff --git a/tests/components/homee/snapshots/test_lock.ambr b/tests/components/homee/snapshots/test_lock.ambr
new file mode 100644
index 00000000000..d055039cca4
--- /dev/null
+++ b/tests/components/homee/snapshots/test_lock.ambr
@@ -0,0 +1,50 @@
+# serializer version: 1
+# name: test_lock_snapshot[lock.test_lock-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'lock',
+    'entity_category': None,
+    'entity_id': 'lock.test_lock',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '00055511EECC-1-1',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_lock_snapshot[lock.test_lock-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'changed_by': 'unknown-5',
+      'friendly_name': 'Test Lock',
+      'supported_features': <LockEntityFeature: 0>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'lock.test_lock',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unlocked',
+  })
+# ---
diff --git a/tests/components/homee/snapshots/test_number.ambr b/tests/components/homee/snapshots/test_number.ambr
new file mode 100644
index 00000000000..04b1aefab00
--- /dev/null
+++ b/tests/components/homee/snapshots/test_number.ambr
@@ -0,0 +1,802 @@
+# serializer version: 1
+# name: test_number_snapshot[number.test_number_down_movement_duration-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 240,
+      'min': 4,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1.0,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'number.test_number_down_movement_duration',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <NumberDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Down-movement duration',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'down_time',
+    'unique_id': '00055511EECC-1-4',
+    'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+  })
+# ---
+# name: test_number_snapshot[number.test_number_down_movement_duration-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'duration',
+      'friendly_name': 'Test Number Down-movement duration',
+      'max': 240,
+      'min': 4,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1.0,
+      'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.test_number_down_movement_duration',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '57',
+  })
+# ---
+# name: test_number_snapshot[number.test_number_down_position-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 100,
+      'min': 0,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 0.5,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'number.test_number_down_position',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Down position',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'down_position',
+    'unique_id': '00055511EECC-1-2',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_number_snapshot[number.test_number_down_position-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Number Down position',
+      'max': 100,
+      'min': 0,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 0.5,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.test_number_down_position',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '100',
+  })
+# ---
+# name: test_number_snapshot[number.test_number_down_slat_position-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 75,
+      'min': -75,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1.0,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'number.test_number_down_slat_position',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Down slat position',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'down_slat_position',
+    'unique_id': '00055511EECC-1-3',
+    'unit_of_measurement': '°',
+  })
+# ---
+# name: test_number_snapshot[number.test_number_down_slat_position-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Number Down slat position',
+      'max': 75,
+      'min': -75,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1.0,
+      'unit_of_measurement': '°',
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.test_number_down_slat_position',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '38',
+  })
+# ---
+# name: test_number_snapshot[number.test_number_end_position-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 130,
+      'min': 0,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1.0,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'number.test_number_end_position',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'End position',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'endposition_configuration',
+    'unique_id': '00055511EECC-1-5',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_number_snapshot[number.test_number_end_position-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Number End position',
+      'max': 130,
+      'min': 0,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1.0,
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.test_number_end_position',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '129',
+  })
+# ---
+# name: test_number_snapshot[number.test_number_maximum_slat_angle-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 127,
+      'min': -127,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1.0,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'number.test_number_maximum_slat_angle',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Maximum slat angle',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'slat_max_angle',
+    'unique_id': '00055511EECC-1-10',
+    'unit_of_measurement': '°',
+  })
+# ---
+# name: test_number_snapshot[number.test_number_maximum_slat_angle-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Number Maximum slat angle',
+      'max': 127,
+      'min': -127,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1.0,
+      'unit_of_measurement': '°',
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.test_number_maximum_slat_angle',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '75',
+  })
+# ---
+# name: test_number_snapshot[number.test_number_minimum_slat_angle-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 127,
+      'min': -127,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1.0,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'number.test_number_minimum_slat_angle',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Minimum slat angle',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'slat_min_angle',
+    'unique_id': '00055511EECC-1-11',
+    'unit_of_measurement': '°',
+  })
+# ---
+# name: test_number_snapshot[number.test_number_minimum_slat_angle-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Number Minimum slat angle',
+      'max': 127,
+      'min': -127,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1.0,
+      'unit_of_measurement': '°',
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.test_number_minimum_slat_angle',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '-75',
+  })
+# ---
+# name: test_number_snapshot[number.test_number_motion_alarm_delay-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 15300,
+      'min': 1,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1.0,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'number.test_number_motion_alarm_delay',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <NumberDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Motion alarm delay',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'motion_alarm_cancelation_delay',
+    'unique_id': '00055511EECC-1-6',
+    'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+  })
+# ---
+# name: test_number_snapshot[number.test_number_motion_alarm_delay-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'duration',
+      'friendly_name': 'Test Number Motion alarm delay',
+      'max': 15300,
+      'min': 1,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1.0,
+      'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.test_number_motion_alarm_delay',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unavailable',
+  })
+# ---
+# name: test_number_snapshot[number.test_number_polling_interval-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 45,
+      'min': 5,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 5.0,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'number.test_number_polling_interval',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <NumberDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Polling interval',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'polling_interval',
+    'unique_id': '00055511EECC-1-8',
+    'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+  })
+# ---
+# name: test_number_snapshot[number.test_number_polling_interval-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'duration',
+      'friendly_name': 'Test Number Polling interval',
+      'max': 45,
+      'min': 5,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 5.0,
+      'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.test_number_polling_interval',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '30',
+  })
+# ---
+# name: test_number_snapshot[number.test_number_slat_steps-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 20,
+      'min': 1,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1.0,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'number.test_number_slat_steps',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Slat steps',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'slat_steps',
+    'unique_id': '00055511EECC-1-12',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_number_snapshot[number.test_number_slat_steps-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Number Slat steps',
+      'max': 20,
+      'min': 1,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1.0,
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.test_number_slat_steps',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '6',
+  })
+# ---
+# name: test_number_snapshot[number.test_number_slat_turn_duration-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 24,
+      'min': 0,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 0.1,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'number.test_number_slat_turn_duration',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <NumberDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Slat turn duration',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'shutter_slat_time',
+    'unique_id': '00055511EECC-1-9',
+    'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+  })
+# ---
+# name: test_number_snapshot[number.test_number_slat_turn_duration-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'duration',
+      'friendly_name': 'Test Number Slat turn duration',
+      'max': 24,
+      'min': 0,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 0.1,
+      'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.test_number_slat_turn_duration',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '1',
+  })
+# ---
+# name: test_number_snapshot[number.test_number_temperature_offset-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 128,
+      'min': -5,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 0.1,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'number.test_number_temperature_offset',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Temperature offset',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'temperature_offset',
+    'unique_id': '00055511EECC-1-13',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_number_snapshot[number.test_number_temperature_offset-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Number Temperature offset',
+      'max': 128,
+      'min': -5,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 0.1,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.test_number_temperature_offset',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unavailable',
+  })
+# ---
+# name: test_number_snapshot[number.test_number_up_movement_duration-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 240,
+      'min': 4,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1.0,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'number.test_number_up_movement_duration',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <NumberDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Up-movement duration',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'up_time',
+    'unique_id': '00055511EECC-1-14',
+    'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+  })
+# ---
+# name: test_number_snapshot[number.test_number_up_movement_duration-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'duration',
+      'friendly_name': 'Test Number Up-movement duration',
+      'max': 240,
+      'min': 4,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1.0,
+      'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.test_number_up_movement_duration',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '57',
+  })
+# ---
+# name: test_number_snapshot[number.test_number_wake_up_interval-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 7200,
+      'min': 30,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 30.0,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'number.test_number_wake_up_interval',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <NumberDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Wake-up interval',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'wake_up_interval',
+    'unique_id': '00055511EECC-1-15',
+    'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+  })
+# ---
+# name: test_number_snapshot[number.test_number_wake_up_interval-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'duration',
+      'friendly_name': 'Test Number Wake-up interval',
+      'max': 7200,
+      'min': 30,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 30.0,
+      'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.test_number_wake_up_interval',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '600',
+  })
+# ---
+# name: test_number_snapshot[number.test_number_window_open_sensibility-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 3,
+      'min': 0,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1.0,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'number.test_number_window_open_sensibility',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Window open sensibility',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'open_window_detection_sensibility',
+    'unique_id': '00055511EECC-1-7',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_number_snapshot[number.test_number_window_open_sensibility-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Number Window open sensibility',
+      'max': 3,
+      'min': 0,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1.0,
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.test_number_window_open_sensibility',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '3',
+  })
+# ---
diff --git a/tests/components/homee/snapshots/test_select.ambr b/tests/components/homee/snapshots/test_select.ambr
new file mode 100644
index 00000000000..9fa831230c2
--- /dev/null
+++ b/tests/components/homee/snapshots/test_select.ambr
@@ -0,0 +1,59 @@
+# serializer version: 1
+# name: test_select_snapshot[select.test_select_repeater_mode-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'off',
+        'level1',
+        'level2',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'select',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'select.test_select_repeater_mode',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Repeater mode',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'repeater_mode',
+    'unique_id': '00055511EECC-1-1',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_select_snapshot[select.test_select_repeater_mode-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Select Repeater mode',
+      'options': list([
+        'off',
+        'level1',
+        'level2',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'select.test_select_repeater_mode',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'level1',
+  })
+# ---
diff --git a/tests/components/homee/snapshots/test_sensor.ambr b/tests/components/homee/snapshots/test_sensor.ambr
new file mode 100644
index 00000000000..b35943630d5
--- /dev/null
+++ b/tests/components/homee/snapshots/test_sensor.ambr
@@ -0,0 +1,1862 @@
+# serializer version: 1
+# name: test_sensor_snapshot[sensor.test_multisensor_battery-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.test_multisensor_battery',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
+    'original_icon': None,
+    'original_name': 'Battery',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'battery',
+    'unique_id': '00055511EECC-1-3',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_battery-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'battery',
+      'friendly_name': 'Test MultiSensor Battery',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_battery',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '100.0',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_battery_2-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.test_multisensor_battery_2',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
+    'original_icon': None,
+    'original_name': 'Battery',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'battery_instance',
+    'unique_id': '00055511EECC-1-34',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_battery_2-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'battery',
+      'friendly_name': 'Test MultiSensor Battery',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_battery_2',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '100.0',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_current_1-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_current_1',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.CURRENT: 'current'>,
+    'original_icon': None,
+    'original_name': 'Current 1',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'current_instance',
+    'unique_id': '00055511EECC-1-7',
+    'unit_of_measurement': <UnitOfElectricCurrent.AMPERE: 'A'>,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_current_1-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'current',
+      'friendly_name': 'Test MultiSensor Current 1',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricCurrent.AMPERE: 'A'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_current_1',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.249',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_current_2-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_current_2',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.CURRENT: 'current'>,
+    'original_icon': None,
+    'original_name': 'Current 2',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'current_instance',
+    'unique_id': '00055511EECC-1-8',
+    'unit_of_measurement': <UnitOfElectricCurrent.AMPERE: 'A'>,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_current_2-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'current',
+      'friendly_name': 'Test MultiSensor Current 2',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricCurrent.AMPERE: 'A'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_current_2',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.812',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_dawn-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_dawn',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ILLUMINANCE: 'illuminance'>,
+    'original_icon': None,
+    'original_name': 'Dawn',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'dawn',
+    'unique_id': '00055511EECC-1-10',
+    'unit_of_measurement': 'lx',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_dawn-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'illuminance',
+      'friendly_name': 'Test MultiSensor Dawn',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'lx',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_dawn',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '500.0',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_device_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_device_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Device temperature',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'device_temperature',
+    'unique_id': '00055511EECC-1-11',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_device_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Test MultiSensor Device temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_device_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '44.12',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_energy_1-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_energy_1',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy 1',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_instance',
+    'unique_id': '00055511EECC-1-1',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_energy_1-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Test MultiSensor Energy 1',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_energy_1',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '555.591',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_energy_2-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_energy_2',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy 2',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_instance',
+    'unique_id': '00055511EECC-1-2',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_energy_2-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Test MultiSensor Energy 2',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_energy_2',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '1730.812',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_exhaust_motor_speed-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.test_multisensor_exhaust_motor_speed',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Exhaust motor speed',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'exhaust_motor_revs',
+    'unique_id': '00055511EECC-1-12',
+    'unit_of_measurement': 'rpm',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_exhaust_motor_speed-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test MultiSensor Exhaust motor speed',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'rpm',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_exhaust_motor_speed',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2000.0',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_humidity-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_humidity',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.HUMIDITY: 'humidity'>,
+    'original_icon': None,
+    'original_name': 'Humidity',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'humidity',
+    'unique_id': '00055511EECC-1-22',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_humidity-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'humidity',
+      'friendly_name': 'Test MultiSensor Humidity',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_humidity',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '51.0',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_illuminance-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_illuminance',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Illuminance',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'brightness',
+    'unique_id': '00055511EECC-1-4',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_illuminance-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test MultiSensor Illuminance',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_illuminance',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '100.0',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_illuminance_1-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_illuminance_1',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ILLUMINANCE: 'illuminance'>,
+    'original_icon': None,
+    'original_name': 'Illuminance 1',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'brightness_instance',
+    'unique_id': '00055511EECC-1-5',
+    'unit_of_measurement': 'lx',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_illuminance_1-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'illuminance',
+      'friendly_name': 'Test MultiSensor Illuminance 1',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'lx',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_illuminance_1',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '175.0',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_illuminance_2-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_illuminance_2',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ILLUMINANCE: 'illuminance'>,
+    'original_icon': None,
+    'original_name': 'Illuminance 2',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'brightness_instance',
+    'unique_id': '00055511EECC-1-6',
+    'unit_of_measurement': 'lx',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_illuminance_2-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'illuminance',
+      'friendly_name': 'Test MultiSensor Illuminance 2',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'lx',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_illuminance_2',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '7000.0',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_indoor_humidity-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_indoor_humidity',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.HUMIDITY: 'humidity'>,
+    'original_icon': None,
+    'original_name': 'Indoor humidity',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'indoor_humidity',
+    'unique_id': '00055511EECC-1-13',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_indoor_humidity-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'humidity',
+      'friendly_name': 'Test MultiSensor Indoor humidity',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_indoor_humidity',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '47.0',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_indoor_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_indoor_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Indoor temperature',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'indoor_temperature',
+    'unique_id': '00055511EECC-1-14',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_indoor_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Test MultiSensor Indoor temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_indoor_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '18.0',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_intake_motor_speed-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.test_multisensor_intake_motor_speed',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Intake motor speed',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'intake_motor_revs',
+    'unique_id': '00055511EECC-1-15',
+    'unit_of_measurement': 'rpm',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_intake_motor_speed-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test MultiSensor Intake motor speed',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'rpm',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_intake_motor_speed',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_level-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_level',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLUME_STORAGE: 'volume_storage'>,
+    'original_icon': None,
+    'original_name': 'Level',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'level',
+    'unique_id': '00055511EECC-1-16',
+    'unit_of_measurement': <UnitOfVolume.LITERS: 'L'>,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_level-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'volume_storage',
+      'friendly_name': 'Test MultiSensor Level',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfVolume.LITERS: 'L'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_level',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2490.0',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_link_quality-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.test_multisensor_link_quality',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Link quality',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'link_quality',
+    'unique_id': '00055511EECC-1-17',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_link_quality-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test MultiSensor Link quality',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_link_quality',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '4.0',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_node_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'available',
+        'unavailable',
+        'update_in_progress',
+        'waiting_for_attributes',
+        'initializing',
+        'user_interaction_required',
+        'password_required',
+        'host_unavailable',
+        'delete_in_progress',
+        'cosi_connected',
+        'blocked',
+        'waiting_for_wakeup',
+        'remote_node_deleted',
+        'firmware_update_in_progress',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.test_multisensor_node_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Node state',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'node_state',
+    'unique_id': '00055511EECC-1-state',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_node_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Test MultiSensor Node state',
+      'options': list([
+        'available',
+        'unavailable',
+        'update_in_progress',
+        'waiting_for_attributes',
+        'initializing',
+        'user_interaction_required',
+        'password_required',
+        'host_unavailable',
+        'delete_in_progress',
+        'cosi_connected',
+        'blocked',
+        'waiting_for_wakeup',
+        'remote_node_deleted',
+        'firmware_update_in_progress',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_node_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'available',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_operating_hours-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.test_multisensor_operating_hours',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Operating hours',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'operating_hours',
+    'unique_id': '00055511EECC-1-18',
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_operating_hours-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'duration',
+      'friendly_name': 'Test MultiSensor Operating hours',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_operating_hours',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '5478.0',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_outdoor_humidity-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_outdoor_humidity',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.HUMIDITY: 'humidity'>,
+    'original_icon': None,
+    'original_name': 'Outdoor humidity',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'outdoor_humidity',
+    'unique_id': '00055511EECC-1-19',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_outdoor_humidity-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'humidity',
+      'friendly_name': 'Test MultiSensor Outdoor humidity',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_outdoor_humidity',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '33.0',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_outdoor_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_outdoor_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Outdoor temperature',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'outdoor_temperature',
+    'unique_id': '00055511EECC-1-20',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_outdoor_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Test MultiSensor Outdoor temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_outdoor_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '17.0',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_position-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_position',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Position',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'position',
+    'unique_id': '00055511EECC-1-21',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_position-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test MultiSensor Position',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_position',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'open',
+        'closed',
+        'partial',
+        'opening',
+        'closing',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'State',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'up_down',
+    'unique_id': '00055511EECC-1-28',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Test MultiSensor State',
+      'options': list([
+        'open',
+        'closed',
+        'partial',
+        'opening',
+        'closing',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'open',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'temperature',
+    'unique_id': '00055511EECC-1-23',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Test MultiSensor Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '20.3',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_total_current-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_total_current',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.CURRENT: 'current'>,
+    'original_icon': None,
+    'original_name': 'Total current',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'total_current',
+    'unique_id': '00055511EECC-1-25',
+    'unit_of_measurement': <UnitOfElectricCurrent.AMPERE: 'A'>,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_total_current-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'current',
+      'friendly_name': 'Test MultiSensor Total current',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricCurrent.AMPERE: 'A'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_total_current',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2.223',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_total_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_total_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Total energy',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'total_energy',
+    'unique_id': '00055511EECC-1-24',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_total_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Test MultiSensor Total energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_total_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '3657.822',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_total_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_total_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Total power',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'total_power',
+    'unique_id': '00055511EECC-1-26',
+    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_total_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Test MultiSensor Total power',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_total_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '195.384',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_total_voltage-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_total_voltage',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Total voltage',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'total_voltage',
+    'unique_id': '00055511EECC-1-27',
+    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_total_voltage-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'friendly_name': 'Test MultiSensor Total voltage',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_total_voltage',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '239.823',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_ultraviolet-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_ultraviolet',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Ultraviolet',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'uv',
+    'unique_id': '00055511EECC-1-29',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_ultraviolet-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test MultiSensor Ultraviolet',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_ultraviolet',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '6.0',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_valve_position-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.test_multisensor_valve_position',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Valve position',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'valve_position',
+    'unique_id': '00055511EECC-1-9',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_valve_position-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test MultiSensor Valve position',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_valve_position',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '70.0',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_voltage_1-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_voltage_1',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Voltage 1',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'voltage_instance',
+    'unique_id': '00055511EECC-1-30',
+    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_voltage_1-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'friendly_name': 'Test MultiSensor Voltage 1',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_voltage_1',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '239.823',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_voltage_2-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_voltage_2',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Voltage 2',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'voltage_instance',
+    'unique_id': '00055511EECC-1-31',
+    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_voltage_2-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'friendly_name': 'Test MultiSensor Voltage 2',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_voltage_2',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '236.867',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_wind_speed-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_wind_speed',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfSpeed.KILOMETERS_PER_HOUR: 'km/h'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.WIND_SPEED: 'wind_speed'>,
+    'original_icon': None,
+    'original_name': 'Wind speed',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'wind_speed',
+    'unique_id': '00055511EECC-1-32',
+    'unit_of_measurement': <UnitOfSpeed.KILOMETERS_PER_HOUR: 'km/h'>,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_wind_speed-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'wind_speed',
+      'friendly_name': 'Test MultiSensor Wind speed',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfSpeed.KILOMETERS_PER_HOUR: 'km/h'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_wind_speed',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '7.2',
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_window_position-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'closed',
+        'open',
+        'tilted',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_multisensor_window_position',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Window position',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'window_position',
+    'unique_id': '00055511EECC-1-33',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_multisensor_window_position-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Test MultiSensor Window position',
+      'options': list([
+        'closed',
+        'open',
+        'tilted',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_multisensor_window_position',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'closed',
+  })
+# ---
diff --git a/tests/components/homee/snapshots/test_switch.ambr b/tests/components/homee/snapshots/test_switch.ambr
new file mode 100644
index 00000000000..43c1773cede
--- /dev/null
+++ b/tests/components/homee/snapshots/test_switch.ambr
@@ -0,0 +1,241 @@
+# serializer version: 1
+# name: test_switch_snapshot[switch.test_switch_child_lock-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'switch.test_switch_child_lock',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SwitchDeviceClass.SWITCH: 'switch'>,
+    'original_icon': None,
+    'original_name': 'Child lock',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'external_binary_input',
+    'unique_id': '00055511EECC-1-1',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_switch_snapshot[switch.test_switch_child_lock-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'switch',
+      'friendly_name': 'Test Switch Child lock',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.test_switch_child_lock',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_switch_snapshot[switch.test_switch_manual_operation-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.test_switch_manual_operation',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SwitchDeviceClass.SWITCH: 'switch'>,
+    'original_icon': None,
+    'original_name': 'Manual operation',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'manual_operation',
+    'unique_id': '00055511EECC-1-2',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_switch_snapshot[switch.test_switch_manual_operation-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'switch',
+      'friendly_name': 'Test Switch Manual operation',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.test_switch_manual_operation',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_switch_snapshot[switch.test_switch_switch_1-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.test_switch_switch_1',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SwitchDeviceClass.OUTLET: 'outlet'>,
+    'original_icon': None,
+    'original_name': 'Switch 1',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'on_off_instance',
+    'unique_id': '00055511EECC-1-3',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_switch_snapshot[switch.test_switch_switch_1-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'outlet',
+      'friendly_name': 'Test Switch Switch 1',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.test_switch_switch_1',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_switch_snapshot[switch.test_switch_switch_2-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.test_switch_switch_2',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SwitchDeviceClass.OUTLET: 'outlet'>,
+    'original_icon': None,
+    'original_name': 'Switch 2',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'on_off_instance',
+    'unique_id': '00055511EECC-1-4',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_switch_snapshot[switch.test_switch_switch_2-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'outlet',
+      'friendly_name': 'Test Switch Switch 2',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.test_switch_switch_2',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_switch_snapshot[switch.test_switch_watchdog-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'switch.test_switch_watchdog',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SwitchDeviceClass.SWITCH: 'switch'>,
+    'original_icon': None,
+    'original_name': 'Watchdog',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'watchdog',
+    'unique_id': '00055511EECC-1-5',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_switch_snapshot[switch.test_switch_watchdog-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'switch',
+      'friendly_name': 'Test Switch Watchdog',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.test_switch_watchdog',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
diff --git a/tests/components/homee/snapshots/test_valve.ambr b/tests/components/homee/snapshots/test_valve.ambr
new file mode 100644
index 00000000000..c76ecc6e780
--- /dev/null
+++ b/tests/components/homee/snapshots/test_valve.ambr
@@ -0,0 +1,51 @@
+# serializer version: 1
+# name: test_valve_snapshot[valve.test_valve_valve_position-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'valve',
+    'entity_category': None,
+    'entity_id': 'valve.test_valve_valve_position',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <ValveDeviceClass.WATER: 'water'>,
+    'original_icon': None,
+    'original_name': 'Valve position',
+    'platform': 'homee',
+    'previous_unique_id': None,
+    'supported_features': <ValveEntityFeature: 4>,
+    'translation_key': 'valve_position',
+    'unique_id': '00055511EECC-1-1',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_valve_snapshot[valve.test_valve_valve_position-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_position': 0,
+      'device_class': 'water',
+      'friendly_name': 'Test Valve Valve position',
+      'supported_features': <ValveEntityFeature: 4>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'valve.test_valve_valve_position',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'closed',
+  })
+# ---
diff --git a/tests/components/homee/test_binary_sensor.py b/tests/components/homee/test_binary_sensor.py
new file mode 100644
index 00000000000..50662616379
--- /dev/null
+++ b/tests/components/homee/test_binary_sensor.py
@@ -0,0 +1,29 @@
+"""Test homee binary sensors."""
+
+from unittest.mock import MagicMock, patch
+
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import build_mock_node, setup_integration
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+async def test_sensor_snapshot(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test the multisensor snapshot."""
+    mock_homee.nodes = [build_mock_node("binary_sensors.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    with patch("homeassistant.components.homee.PLATFORMS", [Platform.BINARY_SENSOR]):
+        await setup_integration(hass, mock_config_entry)
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/homee/test_button.py b/tests/components/homee/test_button.py
new file mode 100644
index 00000000000..fc7b018805f
--- /dev/null
+++ b/tests/components/homee/test_button.py
@@ -0,0 +1,50 @@
+"""Test Homee buttons."""
+
+from unittest.mock import MagicMock, patch
+
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
+from homeassistant.const import ATTR_ENTITY_ID, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import build_mock_node, setup_integration
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+async def test_button_press(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test press button service."""
+    mock_homee.nodes = [build_mock_node("buttons.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        BUTTON_DOMAIN,
+        SERVICE_PRESS,
+        {ATTR_ENTITY_ID: "button.test_button_impulse_1"},
+        blocking=True,
+    )
+
+    mock_homee.set_value.assert_called_once_with(1, 5, 1)
+
+
+async def test_button_snapshot(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test the multisensor snapshot."""
+    mock_homee.nodes = [build_mock_node("buttons.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    with patch("homeassistant.components.homee.PLATFORMS", [Platform.BUTTON]):
+        await setup_integration(hass, mock_config_entry)
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/homee/test_cover.py b/tests/components/homee/test_cover.py
new file mode 100644
index 00000000000..4f85b2dd7cc
--- /dev/null
+++ b/tests/components/homee/test_cover.py
@@ -0,0 +1,286 @@
+"""Test homee covers."""
+
+from unittest.mock import MagicMock
+
+import pytest
+from websockets import frames
+from websockets.exceptions import ConnectionClosed
+
+from homeassistant.components.cover import (
+    ATTR_POSITION,
+    ATTR_TILT_POSITION,
+    DOMAIN as COVER_DOMAIN,
+    CoverEntityFeature,
+    CoverState,
+)
+from homeassistant.components.homee.const import DOMAIN
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    SERVICE_CLOSE_COVER,
+    SERVICE_CLOSE_COVER_TILT,
+    SERVICE_OPEN_COVER,
+    SERVICE_OPEN_COVER_TILT,
+    SERVICE_SET_COVER_POSITION,
+    SERVICE_SET_COVER_TILT_POSITION,
+    SERVICE_STOP_COVER,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+
+from . import build_mock_node, setup_integration
+
+from tests.common import MockConfigEntry
+
+
+async def test_open_close_stop_cover(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test opening the cover."""
+    mock_homee.nodes = [build_mock_node("cover_with_position_slats.json")]
+
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_OPEN_COVER,
+        {ATTR_ENTITY_ID: "cover.test_cover"},
+        blocking=True,
+    )
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_CLOSE_COVER,
+        {ATTR_ENTITY_ID: "cover.test_cover"},
+        blocking=True,
+    )
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_STOP_COVER,
+        {ATTR_ENTITY_ID: "cover.test_cover"},
+        blocking=True,
+    )
+
+    calls = mock_homee.set_value.call_args_list
+    for index, call in enumerate(calls):
+        assert call[0] == (mock_homee.nodes[0].id, 1, index)
+
+
+async def test_set_cover_position(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test setting the cover position."""
+    mock_homee.nodes = [build_mock_node("cover_with_position_slats.json")]
+
+    await setup_integration(hass, mock_config_entry)
+
+    # Slats have a range of -45 to 90.
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_SET_COVER_POSITION,
+        {ATTR_ENTITY_ID: "cover.test_slats", ATTR_POSITION: 100},
+        blocking=True,
+    )
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_SET_COVER_POSITION,
+        {ATTR_ENTITY_ID: "cover.test_slats", ATTR_POSITION: 0},
+        blocking=True,
+    )
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_SET_COVER_POSITION,
+        {ATTR_ENTITY_ID: "cover.test_slats", ATTR_POSITION: 50},
+        blocking=True,
+    )
+
+    calls = mock_homee.set_value.call_args_list
+    positions = [0, 100, 50]
+    for call in calls:
+        assert call[0] == (1, 2, positions.pop(0))
+
+
+async def test_close_open_slats(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test closing and opening slats."""
+    mock_homee.nodes = [build_mock_node("cover_with_slats_position.json")]
+
+    await setup_integration(hass, mock_config_entry)
+
+    attributes = hass.states.get("cover.test_slats").attributes
+    assert attributes.get("supported_features") == (
+        CoverEntityFeature.OPEN_TILT
+        | CoverEntityFeature.CLOSE_TILT
+        | CoverEntityFeature.SET_TILT_POSITION
+    )
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_CLOSE_COVER_TILT,
+        {ATTR_ENTITY_ID: "cover.test_slats"},
+        blocking=True,
+    )
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_OPEN_COVER_TILT,
+        {ATTR_ENTITY_ID: "cover.test_slats"},
+        blocking=True,
+    )
+
+    calls = mock_homee.set_value.call_args_list
+    for index, call in enumerate(calls, start=1):
+        assert call[0] == (mock_homee.nodes[0].id, 2, index)
+
+
+async def test_set_slat_position(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test setting slats position."""
+    mock_homee.nodes = [build_mock_node("cover_with_slats_position.json")]
+
+    await setup_integration(hass, mock_config_entry)
+
+    # Slats have a range of -45 to 90 on this device.
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_SET_COVER_TILT_POSITION,
+        {ATTR_ENTITY_ID: "cover.test_slats", ATTR_TILT_POSITION: 100},
+        blocking=True,
+    )
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_SET_COVER_TILT_POSITION,
+        {ATTR_ENTITY_ID: "cover.test_slats", ATTR_TILT_POSITION: 0},
+        blocking=True,
+    )
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_SET_COVER_TILT_POSITION,
+        {ATTR_ENTITY_ID: "cover.test_slats", ATTR_TILT_POSITION: 50},
+        blocking=True,
+    )
+
+    calls = mock_homee.set_value.call_args_list
+    positions = [-45, 90, 22.5]
+    for call in calls:
+        assert call[0] == (1, 1, positions.pop(0))
+
+
+async def test_cover_positions(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test an open cover."""
+    # Cover open, tilt open.
+    # mock_homee.nodes = [cover]
+    mock_homee.nodes = [build_mock_node("cover_with_position_slats.json")]
+    cover = mock_homee.nodes[0]
+
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.states.get("cover.test_cover").state == CoverState.OPEN
+
+    attributes = hass.states.get("cover.test_cover").attributes
+    assert attributes.get("supported_features") == (
+        CoverEntityFeature.OPEN
+        | CoverEntityFeature.CLOSE
+        | CoverEntityFeature.SET_POSITION
+        | CoverEntityFeature.STOP
+        | CoverEntityFeature.SET_TILT_POSITION
+    )
+    assert attributes.get("current_position") == 100
+    assert attributes.get("current_tilt_position") == 100
+
+    cover.attributes[0].current_value = 1
+    cover.attributes[1].current_value = 100
+    cover.attributes[2].current_value = 90
+    cover.add_on_changed_listener.call_args_list[0][0][0](cover)
+    await hass.async_block_till_done()
+
+    attributes = hass.states.get("cover.test_cover").attributes
+    assert attributes.get("current_position") == 0
+    assert attributes.get("current_tilt_position") == 0
+    assert hass.states.get("cover.test_cover").state == CoverState.CLOSED
+
+    cover.attributes[0].current_value = 3
+    cover.attributes[1].current_value = 75
+    cover.attributes[2].current_value = 56
+    cover.add_on_changed_listener.call_args_list[0][0][0](cover)
+    await hass.async_block_till_done()
+
+    assert hass.states.get("cover.test_cover").state == CoverState.OPENING
+    attributes = hass.states.get("cover.test_cover").attributes
+    assert attributes.get("current_position") == 25
+    assert attributes.get("current_tilt_position") == 25
+
+    cover.attributes[0].current_value = 4
+    cover.attributes[1].current_value = 25
+    cover.attributes[2].current_value = -11
+    cover.add_on_changed_listener.call_args_list[0][0][0](cover)
+    await hass.async_block_till_done()
+
+    assert hass.states.get("cover.test_cover").state == CoverState.CLOSING
+    attributes = hass.states.get("cover.test_cover").attributes
+    assert attributes.get("current_position") == 75
+    assert attributes.get("current_tilt_position") == 74
+
+
+async def test_reversed_cover(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test a cover with inverted UP_DOWN attribute without position."""
+    mock_homee.nodes = [build_mock_node("cover_without_position.json")]
+    cover = mock_homee.nodes[0]
+
+    await setup_integration(hass, mock_config_entry)
+
+    cover.attributes[0].is_reversed = True
+    cover.add_on_changed_listener.call_args_list[0][0][0](cover)
+    await hass.async_block_till_done()
+
+    attributes = hass.states.get("cover.test_cover").attributes
+    assert attributes.get("supported_features") == (
+        CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE | CoverEntityFeature.STOP
+    )
+    assert hass.states.get("cover.test_cover").state == CoverState.OPEN
+
+    cover.attributes[0].current_value = 0
+    cover.add_on_changed_listener.call_args_list[0][0][0](cover)
+    await hass.async_block_till_done()
+
+    assert hass.states.get("cover.test_cover").state == CoverState.CLOSED
+
+
+async def test_send_error(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test failed set_value command."""
+    mock_homee.nodes = [build_mock_node("cover_without_position.json")]
+
+    await setup_integration(hass, mock_config_entry)
+
+    mock_homee.set_value.side_effect = ConnectionClosed(
+        rcvd=frames.Close(1002, "Protocol Error"), sent=None
+    )
+    with pytest.raises(HomeAssistantError) as exc_info:
+        await hass.services.async_call(
+            COVER_DOMAIN,
+            SERVICE_OPEN_COVER,
+            {ATTR_ENTITY_ID: "cover.test_cover"},
+            blocking=True,
+        )
+
+    assert exc_info.value.translation_domain == DOMAIN
+    assert exc_info.value.translation_key == "connection_closed"
diff --git a/tests/components/homee/test_light.py b/tests/components/homee/test_light.py
new file mode 100644
index 00000000000..c8af4f6b23d
--- /dev/null
+++ b/tests/components/homee/test_light.py
@@ -0,0 +1,158 @@
+"""Test homee lights."""
+
+from typing import Any
+from unittest.mock import MagicMock, call, patch
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.light import (
+    ATTR_BRIGHTNESS,
+    ATTR_COLOR_TEMP_KELVIN,
+    ATTR_HS_COLOR,
+    DOMAIN as LIGHT_DOMAIN,
+    SERVICE_TOGGLE,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+)
+from homeassistant.const import ATTR_ENTITY_ID, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import build_mock_node, setup_integration
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+def mock_attribute_map(attributes) -> dict:
+    """Mock the attribute map of a Homee node."""
+    attribute_map = {}
+    for a in attributes:
+        attribute_map[a.type] = a
+
+    return attribute_map
+
+
+async def setup_mock_light(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    file: str,
+) -> None:
+    """Setups the light node for the tests."""
+    mock_homee.nodes = [build_mock_node(file)]
+    mock_homee.nodes[0].attribute_map = mock_attribute_map(
+        mock_homee.nodes[0].attributes
+    )
+    await setup_integration(hass, mock_config_entry)
+
+
+@pytest.mark.parametrize(
+    ("data", "calls"),
+    [
+        ({}, [call(1, 1, 1)]),
+        ({ATTR_BRIGHTNESS: 255}, [call(1, 2, 100)]),
+        (
+            {
+                ATTR_BRIGHTNESS: 255,
+                ATTR_COLOR_TEMP_KELVIN: 4300,
+            },
+            [call(1, 2, 100), call(1, 4, 4300)],
+        ),
+        ({ATTR_HS_COLOR: (100, 100)}, [call(1, 1, 1), call(1, 3, 5635840)]),
+    ],
+)
+async def test_turn_on(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    data: dict[str, Any],
+    calls: list[call],
+) -> None:
+    """Test turning on the light."""
+    await setup_mock_light(hass, mock_homee, mock_config_entry, "lights.json")
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_light_light_1"} | data,
+        blocking=True,
+    )
+    assert mock_homee.set_value.call_args_list == calls
+
+
+async def test_turn_off(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test turning off a light."""
+    await setup_mock_light(hass, mock_homee, mock_config_entry, "lights.json")
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_OFF,
+        {
+            ATTR_ENTITY_ID: "light.test_light_light_1",
+        },
+        blocking=True,
+    )
+    mock_homee.set_value.assert_called_once_with(1, 1, 0)
+
+
+async def test_toggle(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test toggling a light."""
+    await setup_mock_light(hass, mock_homee, mock_config_entry, "lights.json")
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TOGGLE,
+        {
+            ATTR_ENTITY_ID: "light.test_light_light_1",
+        },
+        blocking=True,
+    )
+    mock_homee.set_value.assert_called_once_with(1, 1, 0)
+
+    mock_homee.nodes[0].attributes[0].current_value = 0.0
+    mock_homee.nodes[0].add_on_changed_listener.call_args_list[0][0][0](
+        mock_homee.nodes[0]
+    )
+    await hass.async_block_till_done()
+    mock_homee.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TOGGLE,
+        {
+            ATTR_ENTITY_ID: "light.test_light_light_1",
+        },
+        blocking=True,
+    )
+    mock_homee.set_value.assert_called_once_with(1, 1, 1)
+
+
+async def test_light_snapshot(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test snapshot of lights."""
+    mock_homee.nodes = [
+        build_mock_node("lights.json"),
+        build_mock_node("light_single.json"),
+    ]
+    for i in range(2):
+        mock_homee.nodes[i].attribute_map = mock_attribute_map(
+            mock_homee.nodes[i].attributes
+        )
+    with patch("homeassistant.components.homee.PLATFORMS", [Platform.LIGHT]):
+        await setup_integration(hass, mock_config_entry)
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/homee/test_lock.py b/tests/components/homee/test_lock.py
new file mode 100644
index 00000000000..3e6ff3f8ec6
--- /dev/null
+++ b/tests/components/homee/test_lock.py
@@ -0,0 +1,125 @@
+"""Test Homee locks."""
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.lock import (
+    DOMAIN as LOCK_DOMAIN,
+    SERVICE_LOCK,
+    SERVICE_UNLOCK,
+    LockState,
+)
+from homeassistant.const import ATTR_ENTITY_ID, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import build_mock_node, setup_integration
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+async def setup_lock(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry, mock_homee: MagicMock
+) -> None:
+    """Setups the integration lock tests."""
+    mock_homee.nodes = [build_mock_node("lock.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    await setup_integration(hass, mock_config_entry)
+
+
+@pytest.mark.parametrize(
+    ("service", "target_value"),
+    [
+        (SERVICE_LOCK, 1),
+        (SERVICE_UNLOCK, 0),
+    ],
+)
+async def test_lock_services(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_homee: MagicMock,
+    service: str,
+    target_value: int,
+) -> None:
+    """Test lock services."""
+    await setup_lock(hass, mock_config_entry, mock_homee)
+
+    await hass.services.async_call(
+        LOCK_DOMAIN,
+        service,
+        {ATTR_ENTITY_ID: "lock.test_lock"},
+    )
+    mock_homee.set_value.assert_called_once_with(1, 1, target_value)
+
+
+@pytest.mark.parametrize(
+    ("target_value", "current_value", "expected"),
+    [
+        (1.0, 1.0, LockState.LOCKED),
+        (0.0, 0.0, LockState.UNLOCKED),
+        (1.0, 0.0, LockState.LOCKING),
+        (0.0, 1.0, LockState.UNLOCKING),
+    ],
+)
+async def test_lock_state(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_homee: MagicMock,
+    target_value: float,
+    current_value: float,
+    expected: LockState,
+) -> None:
+    """Test lock state."""
+    mock_homee.nodes = [build_mock_node("lock.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    attribute = mock_homee.nodes[0].attributes[0]
+    attribute.target_value = target_value
+    attribute.current_value = current_value
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.states.get("lock.test_lock").state == expected
+
+
+@pytest.mark.parametrize(
+    ("attr_changed_by", "changed_by_id", "expected"),
+    [
+        (1, 0, "itself-0"),
+        (2, 1, "user-testuser"),
+        (3, 54, "homeegram-54"),
+        (6, 0, "ai-0"),
+    ],
+)
+async def test_lock_changed_by(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_homee: MagicMock,
+    attr_changed_by: int,
+    changed_by_id: int,
+    expected: str,
+) -> None:
+    """Test lock changed by entries."""
+    mock_homee.nodes = [build_mock_node("lock.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    mock_homee.get_user_by_id.return_value = MagicMock(username="testuser")
+    attribute = mock_homee.nodes[0].attributes[0]
+    attribute.changed_by = attr_changed_by
+    attribute.changed_by_id = changed_by_id
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.states.get("lock.test_lock").attributes["changed_by"] == expected
+
+
+async def test_lock_snapshot(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_homee: MagicMock,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test the lock snapshots."""
+    with patch("homeassistant.components.homee.PLATFORMS", [Platform.LOCK]):
+        await setup_lock(hass, mock_config_entry, mock_homee)
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/homee/test_number.py b/tests/components/homee/test_number.py
new file mode 100644
index 00000000000..73ca707c2d5
--- /dev/null
+++ b/tests/components/homee/test_number.py
@@ -0,0 +1,74 @@
+"""Test Homee nmumbers."""
+
+from unittest.mock import MagicMock, patch
+
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.number import (
+    ATTR_VALUE,
+    DOMAIN as NUMBER_DOMAIN,
+    SERVICE_SET_VALUE,
+)
+from homeassistant.const import ATTR_ENTITY_ID, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import build_mock_node, setup_integration
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+async def test_set_value(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test set_value service."""
+    mock_homee.nodes = [build_mock_node("numbers.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        NUMBER_DOMAIN,
+        SERVICE_SET_VALUE,
+        {ATTR_ENTITY_ID: "number.test_number_down_position", ATTR_VALUE: 90},
+        blocking=True,
+    )
+    number = mock_homee.nodes[0].attributes[0]
+    mock_homee.set_value.assert_called_once_with(number.node_id, number.id, 90)
+
+
+async def test_set_value_not_editable(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test set_value if attribute is not editable."""
+    mock_homee.nodes = [build_mock_node("numbers.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        NUMBER_DOMAIN,
+        SERVICE_SET_VALUE,
+        {ATTR_ENTITY_ID: "number.test_number_motion_alarm_delay", ATTR_VALUE: 10000},
+        blocking=True,
+    )
+    assert not mock_homee.set_value.called
+    assert not hass.states.async_available("number.test_number_motion_alarm_delay")
+
+
+async def test_number_snapshot(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test the multisensor snapshot."""
+    mock_homee.nodes = [build_mock_node("numbers.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    with patch("homeassistant.components.homee.PLATFORMS", [Platform.NUMBER]):
+        await setup_integration(hass, mock_config_entry)
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/homee/test_select.py b/tests/components/homee/test_select.py
new file mode 100644
index 00000000000..c0dec2234d6
--- /dev/null
+++ b/tests/components/homee/test_select.py
@@ -0,0 +1,106 @@
+"""Test homee selects."""
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.select import (
+    DOMAIN as SELECT_DOMAIN,
+    SERVICE_SELECT_FIRST,
+    SERVICE_SELECT_LAST,
+    SERVICE_SELECT_NEXT,
+    SERVICE_SELECT_OPTION,
+    SERVICE_SELECT_PREVIOUS,
+)
+from homeassistant.const import ATTR_ENTITY_ID, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ServiceValidationError
+from homeassistant.helpers import entity_registry as er
+
+from . import build_mock_node, setup_integration
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+async def setup_select(
+    hass: HomeAssistant, mock_homee: MagicMock, mock_config_entry: MockConfigEntry
+) -> None:
+    """Setups the integration for select tests."""
+    mock_homee.nodes = [build_mock_node("selects.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    await setup_integration(hass, mock_config_entry)
+
+
+@pytest.mark.parametrize(
+    ("service", "extra_options", "expected"),
+    [
+        (SERVICE_SELECT_FIRST, {}, 0),
+        (SERVICE_SELECT_LAST, {}, 2),
+        (SERVICE_SELECT_NEXT, {}, 2),
+        (SERVICE_SELECT_PREVIOUS, {}, 0),
+        (
+            SERVICE_SELECT_OPTION,
+            {
+                "option": "level2",
+            },
+            2,
+        ),
+    ],
+)
+async def test_select_services(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    service: str,
+    extra_options: dict[str, str],
+    expected: int,
+) -> None:
+    """Test the select services."""
+    await setup_select(hass, mock_homee, mock_config_entry)
+
+    OPTIONS = {ATTR_ENTITY_ID: "select.test_select_repeater_mode"}
+    OPTIONS.update(extra_options)
+
+    await hass.services.async_call(
+        SELECT_DOMAIN,
+        service,
+        OPTIONS,
+        blocking=True,
+    )
+
+    mock_homee.set_value.assert_called_once_with(1, 1, expected)
+
+
+async def test_select_option_service_error(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test the select_option service called with invalid option."""
+    await setup_select(hass, mock_homee, mock_config_entry)
+
+    with pytest.raises(ServiceValidationError):
+        await hass.services.async_call(
+            SELECT_DOMAIN,
+            SERVICE_SELECT_OPTION,
+            {
+                ATTR_ENTITY_ID: "select.test_select_repeater_mode",
+                "option": "invalid",
+            },
+            blocking=True,
+        )
+
+
+async def test_select_snapshot(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test the select entity snapshot."""
+    with patch("homeassistant.components.homee.PLATFORMS", [Platform.SELECT]):
+        await setup_select(hass, mock_homee, mock_config_entry)
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/homee/test_sensor.py b/tests/components/homee/test_sensor.py
new file mode 100644
index 00000000000..bbdad4c4469
--- /dev/null
+++ b/tests/components/homee/test_sensor.py
@@ -0,0 +1,103 @@
+"""Test homee sensors."""
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.homee.const import (
+    OPEN_CLOSE_MAP,
+    OPEN_CLOSE_MAP_REVERSED,
+    WINDOW_MAP,
+    WINDOW_MAP_REVERSED,
+)
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import async_update_attribute_value, build_mock_node, setup_integration
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+@pytest.fixture(autouse=True)
+def enable_all_entities(entity_registry_enabled_by_default: None) -> None:
+    """Make sure all entities are enabled."""
+
+
+async def test_up_down_values(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test values for up/down sensor."""
+    mock_homee.nodes = [build_mock_node("sensors.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.states.get("sensor.test_multisensor_state").state == OPEN_CLOSE_MAP[0]
+
+    attribute = mock_homee.nodes[0].attributes[28]
+    for i in range(1, 5):
+        await async_update_attribute_value(hass, attribute, i)
+        assert (
+            hass.states.get("sensor.test_multisensor_state").state == OPEN_CLOSE_MAP[i]
+        )
+
+    # Test reversed up/down sensor
+    attribute.is_reversed = True
+    for i in range(5):
+        await async_update_attribute_value(hass, attribute, i)
+        assert (
+            hass.states.get("sensor.test_multisensor_state").state
+            == OPEN_CLOSE_MAP_REVERSED[i]
+        )
+
+
+async def test_window_position(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test values for window handle position."""
+    mock_homee.nodes = [build_mock_node("sensors.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    await setup_integration(hass, mock_config_entry)
+
+    assert (
+        hass.states.get("sensor.test_multisensor_window_position").state
+        == WINDOW_MAP[0]
+    )
+
+    attribute = mock_homee.nodes[0].attributes[33]
+    for i in range(1, 3):
+        await async_update_attribute_value(hass, attribute, i)
+        assert (
+            hass.states.get("sensor.test_multisensor_window_position").state
+            == WINDOW_MAP[i]
+        )
+
+    # Test reversed window handle.
+    attribute.is_reversed = True
+    for i in range(3):
+        await async_update_attribute_value(hass, attribute, i)
+        assert (
+            hass.states.get("sensor.test_multisensor_window_position").state
+            == WINDOW_MAP_REVERSED[i]
+        )
+
+
+async def test_sensor_snapshot(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test the multisensor snapshot."""
+    mock_homee.nodes = [build_mock_node("sensors.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    with patch("homeassistant.components.homee.PLATFORMS", [Platform.SENSOR]):
+        await setup_integration(hass, mock_config_entry)
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/homee/test_switch.py b/tests/components/homee/test_switch.py
new file mode 100644
index 00000000000..bb14313f487
--- /dev/null
+++ b/tests/components/homee/test_switch.py
@@ -0,0 +1,179 @@
+"""Test Homee switches."""
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+from websockets import frames
+from websockets.exceptions import ConnectionClosed
+
+from homeassistant.components.homee.const import DOMAIN
+from homeassistant.components.switch import (
+    DOMAIN as SWITCH_DOMAIN,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+    STATE_ON,
+    SwitchDeviceClass,
+)
+from homeassistant.const import ATTR_ENTITY_ID, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import entity_registry as er
+
+from . import build_mock_node, setup_integration
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+async def test_switch_state(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test if the correct state is returned."""
+    mock_homee.nodes = [build_mock_node("switches.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.states.get("switch.test_switch_switch_1").state is not STATE_ON
+    switch = mock_homee.nodes[0].attributes[2]
+    switch.current_value = 1
+    switch.add_on_changed_listener.call_args_list[0][0][0](switch)
+    await hass.async_block_till_done()
+    assert hass.states.get("switch.test_switch_switch_1").state is STATE_ON
+
+
+async def test_switch_turn_on(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test turn-on service."""
+    mock_homee.nodes = [build_mock_node("switches.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.states.get("switch.test_switch_switch_1").state is not STATE_ON
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "switch.test_switch_switch_1"},
+        blocking=True,
+    )
+
+    mock_homee.set_value.assert_called_once_with(1, 3, 1)
+
+
+async def test_switch_turn_off(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test turn-off service."""
+    mock_homee.nodes = [build_mock_node("switches.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.states.get("switch.test_switch_watchdog").state is STATE_ON
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "switch.test_switch_watchdog"},
+        blocking=True,
+    )
+    mock_homee.set_value.assert_called_once_with(1, 5, 0)
+
+
+async def test_switch_device_class(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test if device class gets set correctly."""
+    mock_homee.nodes = [build_mock_node("switches.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    await setup_integration(hass, mock_config_entry)
+
+    assert (
+        hass.states.get("switch.test_switch_switch_1").attributes["device_class"]
+        == SwitchDeviceClass.OUTLET
+    )
+    assert (
+        hass.states.get("switch.test_switch_watchdog").attributes["device_class"]
+        == SwitchDeviceClass.SWITCH
+    )
+
+
+async def test_switch_no_name(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test switch gets no name when it is the main feature of the device."""
+    mock_homee.nodes = [build_mock_node("switch_single.json")]
+    mock_homee.nodes[0].profile = 2002
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    await setup_integration(hass, mock_config_entry)
+
+    assert (
+        hass.states.get("switch.test_switch_single").attributes["friendly_name"]
+        == "Test Switch Single"
+    )
+
+
+async def test_switch_device_class_no_outlet(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test if on_off device class gets set correctly if node-profile is not a plug."""
+    mock_homee.nodes = [build_mock_node("switches.json")]
+    mock_homee.nodes[0].profile = 2002
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    await setup_integration(hass, mock_config_entry)
+
+    assert (
+        hass.states.get("switch.test_switch_switch_1").attributes["device_class"]
+        == SwitchDeviceClass.SWITCH
+    )
+
+
+async def test_send_error(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test failed set_value command."""
+    mock_homee.nodes = [build_mock_node("switches.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    await setup_integration(hass, mock_config_entry)
+
+    mock_homee.set_value.side_effect = ConnectionClosed(
+        rcvd=frames.Close(1002, "Protocol Error"), sent=None
+    )
+    with pytest.raises(HomeAssistantError) as exc_info:
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: "switch.test_switch_switch_1"},
+            blocking=True,
+        )
+
+    assert exc_info.value.translation_domain == DOMAIN
+    assert exc_info.value.translation_key == "connection_closed"
+
+
+async def test_switch_snapshot(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test the multisensor snapshot."""
+    mock_homee.nodes = [build_mock_node("switches.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    with patch("homeassistant.components.homee.PLATFORMS", [Platform.SWITCH]):
+        await setup_integration(hass, mock_config_entry)
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/homee/test_valve.py b/tests/components/homee/test_valve.py
new file mode 100644
index 00000000000..166b52cc07b
--- /dev/null
+++ b/tests/components/homee/test_valve.py
@@ -0,0 +1,110 @@
+"""Test Homee valves."""
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.valve import (
+    DOMAIN as VALVE_DOMAIN,
+    SERVICE_SET_VALVE_POSITION,
+    STATE_CLOSED,
+    STATE_CLOSING,
+    STATE_OPEN,
+    STATE_OPENING,
+    ValveEntityFeature,
+)
+from homeassistant.const import ATTR_ENTITY_ID, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import build_mock_node, setup_integration
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+async def test_valve_set_position(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test set valve position service."""
+    mock_homee.nodes = [build_mock_node("valve.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        VALVE_DOMAIN,
+        SERVICE_SET_VALVE_POSITION,
+        {ATTR_ENTITY_ID: "valve.test_valve_valve_position", "position": 100},
+    )
+    mock_homee.set_value.assert_called_once_with(1, 1, 100)
+
+
+@pytest.mark.parametrize(
+    ("current_value", "target_value", "state"),
+    [
+        (0.0, 0.0, STATE_CLOSED),
+        (0.0, 100.0, STATE_OPENING),
+        (100.0, 0.0, STATE_CLOSING),
+        (100.0, 100.0, STATE_OPEN),
+    ],
+)
+async def test_opening_closing(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    current_value: float,
+    target_value: float,
+    state: str,
+) -> None:
+    """Test if opening/closing is detected correctly."""
+    mock_homee.nodes = [build_mock_node("valve.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    await setup_integration(hass, mock_config_entry)
+
+    valve = mock_homee.nodes[0].attributes[0]
+    valve.current_value = current_value
+    valve.target_value = target_value
+    valve.add_on_changed_listener.call_args_list[0][0][0](valve)
+    await hass.async_block_till_done()
+
+    assert hass.states.get("valve.test_valve_valve_position").state == state
+
+
+async def test_supported_features(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test supported features."""
+    mock_homee.nodes = [build_mock_node("valve.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    await setup_integration(hass, mock_config_entry)
+
+    valve = mock_homee.nodes[0].attributes[0]
+    attributes = hass.states.get("valve.test_valve_valve_position").attributes
+    assert attributes["supported_features"] == ValveEntityFeature.SET_POSITION
+
+    valve.editable = 0
+    valve.add_on_changed_listener.call_args_list[0][0][0](valve)
+    await hass.async_block_till_done()
+
+    attributes = hass.states.get("valve.test_valve_valve_position").attributes
+    assert attributes["supported_features"] == ValveEntityFeature(0)
+
+
+async def test_valve_snapshot(
+    hass: HomeAssistant,
+    mock_homee: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test the valve snapshots."""
+    mock_homee.nodes = [build_mock_node("valve.json")]
+    mock_homee.get_node_by_id.return_value = mock_homee.nodes[0]
+    with patch("homeassistant.components.homee.PLATFORMS", [Platform.VALVE]):
+        await setup_integration(hass, mock_config_entry)
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/homekit/test_type_lights.py b/tests/components/homekit/test_type_lights.py
index c1870cecd9c..5bad7aa8f39 100644
--- a/tests/components/homekit/test_type_lights.py
+++ b/tests/components/homekit/test_type_lights.py
@@ -42,7 +42,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import CoreState, Event, HomeAssistant
 from homeassistant.helpers import entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed, async_mock_service
 
diff --git a/tests/components/homekit/test_type_switches.py b/tests/components/homekit/test_type_switches.py
index 0d19763e4c7..6a30877a795 100644
--- a/tests/components/homekit/test_type_switches.py
+++ b/tests/components/homekit/test_type_switches.py
@@ -12,6 +12,7 @@ from homeassistant.components.homekit.const import (
     TYPE_VALVE,
 )
 from homeassistant.components.homekit.type_switches import (
+    LawnMower,
     Outlet,
     SelectSwitch,
     Switch,
@@ -19,6 +20,13 @@ from homeassistant.components.homekit.type_switches import (
     Valve,
     ValveSwitch,
 )
+from homeassistant.components.lawn_mower import (
+    DOMAIN as LAWN_MOWER_DOMAIN,
+    SERVICE_DOCK,
+    SERVICE_START_MOWING,
+    LawnMowerActivity,
+    LawnMowerEntityFeature,
+)
 from homeassistant.components.select import ATTR_OPTIONS
 from homeassistant.components.vacuum import (
     DOMAIN as VACUUM_DOMAIN,
@@ -42,7 +50,7 @@ from homeassistant.const import (
     STATE_OPEN,
 )
 from homeassistant.core import Event, HomeAssistant, split_entity_id
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed, async_mock_service
 
@@ -383,6 +391,73 @@ async def test_vacuum_set_state_without_returnhome_and_start_support(
     assert events[-1].data[ATTR_VALUE] is None
 
 
+async def test_lawn_mower_set_state(
+    hass: HomeAssistant, hk_driver, events: list[Event]
+) -> None:
+    """Test if Lawn mower accessory and HA are updated accordingly."""
+    entity_id = "lawn_mower.mower"
+
+    hass.states.async_set(
+        entity_id,
+        None,
+        {
+            ATTR_SUPPORTED_FEATURES: LawnMowerEntityFeature.DOCK
+            | LawnMowerEntityFeature.START_MOWING
+        },
+    )
+    await hass.async_block_till_done()
+
+    acc = LawnMower(hass, hk_driver, "LawnMower", entity_id, 2, None)
+    acc.run()
+    await hass.async_block_till_done()
+    assert acc.aid == 2
+    assert acc.category == 8  # Switch
+
+    assert acc.char_on.value == 0
+
+    hass.states.async_set(
+        entity_id,
+        LawnMowerActivity.MOWING,
+        {
+            ATTR_SUPPORTED_FEATURES: LawnMowerEntityFeature.DOCK
+            | LawnMowerEntityFeature.START_MOWING
+        },
+    )
+    await hass.async_block_till_done()
+    assert acc.char_on.value == 1
+
+    hass.states.async_set(
+        entity_id,
+        LawnMowerActivity.DOCKED,
+        {
+            ATTR_SUPPORTED_FEATURES: LawnMowerEntityFeature.DOCK
+            | LawnMowerEntityFeature.START_MOWING
+        },
+    )
+    await hass.async_block_till_done()
+    assert acc.char_on.value == 0
+
+    # Set from HomeKit
+    call_turn_on = async_mock_service(hass, LAWN_MOWER_DOMAIN, SERVICE_START_MOWING)
+    call_turn_off = async_mock_service(hass, LAWN_MOWER_DOMAIN, SERVICE_DOCK)
+
+    acc.char_on.client_update_value(1)
+    await hass.async_block_till_done()
+    assert acc.char_on.value == 1
+    assert call_turn_on
+    assert call_turn_on[0].data[ATTR_ENTITY_ID] == entity_id
+    assert len(events) == 1
+    assert events[-1].data[ATTR_VALUE] is None
+
+    acc.char_on.client_update_value(0)
+    await hass.async_block_till_done()
+    assert acc.char_on.value == 0
+    assert call_turn_off
+    assert call_turn_off[0].data[ATTR_ENTITY_ID] == entity_id
+    assert len(events) == 2
+    assert events[-1].data[ATTR_VALUE] is None
+
+
 async def test_reset_switch(
     hass: HomeAssistant, hk_driver, events: list[Event]
 ) -> None:
diff --git a/tests/components/homekit/test_type_thermostats.py b/tests/components/homekit/test_type_thermostats.py
index fc4cfa78ca4..69c347ef55a 100644
--- a/tests/components/homekit/test_type_thermostats.py
+++ b/tests/components/homekit/test_type_thermostats.py
@@ -69,7 +69,6 @@ from homeassistant.const import (
     ATTR_FRIENDLY_NAME,
     ATTR_SUPPORTED_FEATURES,
     ATTR_TEMPERATURE,
-    CONF_TEMPERATURE_UNIT,
     EVENT_HOMEASSISTANT_START,
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
@@ -77,6 +76,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import CoreState, Event, HomeAssistant
 from homeassistant.helpers import entity_registry as er
+from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM
 
 from tests.common import async_mock_service
 
@@ -858,6 +858,7 @@ async def test_thermostat_fahrenheit(
 ) -> None:
     """Test if accessory and HA are updated accordingly."""
     entity_id = "climate.test"
+    hass.config.units = US_CUSTOMARY_SYSTEM
 
     # support_ = True
     hass.states.async_set(
@@ -869,10 +870,7 @@ async def test_thermostat_fahrenheit(
         },
     )
     await hass.async_block_till_done()
-    with patch.object(
-        hass.config.units, CONF_TEMPERATURE_UNIT, new=UnitOfTemperature.FAHRENHEIT
-    ):
-        acc = Thermostat(hass, hk_driver, "Climate", entity_id, 1, None)
+    acc = Thermostat(hass, hk_driver, "Climate", entity_id, 1, None)
     hk_driver.add_accessory(acc)
     acc.run()
     await hass.async_block_till_done()
@@ -1786,13 +1784,11 @@ async def test_water_heater_fahrenheit(
 ) -> None:
     """Test if accessory and HA are update accordingly."""
     entity_id = "water_heater.test"
+    hass.config.units = US_CUSTOMARY_SYSTEM
 
     hass.states.async_set(entity_id, HVACMode.HEAT)
     await hass.async_block_till_done()
-    with patch.object(
-        hass.config.units, CONF_TEMPERATURE_UNIT, new=UnitOfTemperature.FAHRENHEIT
-    ):
-        acc = WaterHeater(hass, hk_driver, "WaterHeater", entity_id, 2, None)
+    acc = WaterHeater(hass, hk_driver, "WaterHeater", entity_id, 2, None)
     acc.run()
     await hass.async_block_till_done()
 
diff --git a/tests/components/homekit/test_util.py b/tests/components/homekit/test_util.py
index 853db54b992..1da12402a56 100644
--- a/tests/components/homekit/test_util.py
+++ b/tests/components/homekit/test_util.py
@@ -26,6 +26,7 @@ from homeassistant.components.homekit.const import (
     CONF_VIDEO_CODEC,
     CONF_VIDEO_MAP,
     CONF_VIDEO_PACKET_SIZE,
+    CONF_VIDEO_PROFILE_NAMES,
     DEFAULT_AUDIO_CODEC,
     DEFAULT_AUDIO_MAP,
     DEFAULT_AUDIO_PACKET_SIZE,
@@ -39,6 +40,7 @@ from homeassistant.components.homekit.const import (
     DEFAULT_VIDEO_CODEC,
     DEFAULT_VIDEO_MAP,
     DEFAULT_VIDEO_PACKET_SIZE,
+    DEFAULT_VIDEO_PROFILE_NAMES,
     DOMAIN,
     FEATURE_ON_OFF,
     FEATURE_PLAY_PAUSE,
@@ -235,6 +237,7 @@ def test_validate_entity_config() -> None:
             CONF_VIDEO_MAP: DEFAULT_VIDEO_MAP,
             CONF_STREAM_COUNT: DEFAULT_STREAM_COUNT,
             CONF_VIDEO_CODEC: DEFAULT_VIDEO_CODEC,
+            CONF_VIDEO_PROFILE_NAMES: DEFAULT_VIDEO_PROFILE_NAMES,
             CONF_AUDIO_PACKET_SIZE: DEFAULT_AUDIO_PACKET_SIZE,
             CONF_VIDEO_PACKET_SIZE: DEFAULT_VIDEO_PACKET_SIZE,
             CONF_LOW_BATTERY_THRESHOLD: DEFAULT_LOW_BATTERY_THRESHOLD,
diff --git a/tests/components/homekit_controller/common.py b/tests/components/homekit_controller/common.py
index b94a267104b..e2aaf58d63e 100644
--- a/tests/components/homekit_controller/common.py
+++ b/tests/components/homekit_controller/common.py
@@ -32,7 +32,7 @@ from homeassistant.core import HomeAssistant, State, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.service_info.bluetooth import BluetoothServiceInfo
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/homekit_controller/conftest.py b/tests/components/homekit_controller/conftest.py
index eea3f4b67f2..4e787f305b6 100644
--- a/tests/components/homekit_controller/conftest.py
+++ b/tests/components/homekit_controller/conftest.py
@@ -9,7 +9,7 @@ from freezegun import freeze_time
 from freezegun.api import FrozenDateTimeFactory
 import pytest
 
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.components.light.conftest import mock_light_profiles  # noqa: F401
 
diff --git a/tests/components/homekit_controller/snapshots/test_init.ambr b/tests/components/homekit_controller/snapshots/test_init.ambr
index 2bd5e7faf75..62b53df33f2 100644
--- a/tests/components/homekit_controller/snapshots/test_init.ambr
+++ b/tests/components/homekit_controller/snapshots/test_init.ambr
@@ -7,6 +7,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -42,6 +47,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -85,6 +91,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'fan',
@@ -135,6 +142,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'select',
@@ -185,6 +193,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -233,6 +242,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -277,6 +287,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -321,6 +332,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -373,6 +385,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -432,6 +445,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -482,6 +496,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -522,6 +537,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -562,6 +578,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -605,6 +622,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -640,6 +662,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -680,6 +703,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -715,6 +743,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -756,6 +785,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -797,6 +827,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'camera',
@@ -840,6 +871,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -884,6 +916,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -923,6 +956,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -958,6 +996,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -999,6 +1038,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -1040,6 +1080,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'camera',
@@ -1083,6 +1124,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -1127,6 +1169,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -1166,6 +1209,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -1201,6 +1249,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -1242,6 +1291,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -1283,6 +1333,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'camera',
@@ -1326,6 +1377,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -1370,6 +1422,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -1413,6 +1466,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -1448,6 +1506,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'alarm_control_panel',
@@ -1492,6 +1551,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -1538,6 +1598,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'number',
@@ -1582,6 +1643,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -1621,6 +1683,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -1656,6 +1723,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -1697,6 +1765,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -1740,6 +1809,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -1787,6 +1857,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -1822,6 +1897,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'alarm_control_panel',
@@ -1866,6 +1942,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -1916,6 +1993,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -1977,6 +2055,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'number',
@@ -2021,6 +2100,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -2064,6 +2144,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -2099,6 +2184,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -2142,6 +2228,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -2189,6 +2276,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -2224,6 +2316,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -2265,6 +2358,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -2306,6 +2400,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'camera',
@@ -2356,6 +2451,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -2414,6 +2510,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -2458,6 +2555,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -2504,6 +2602,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -2549,6 +2648,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -2592,6 +2692,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -2632,6 +2733,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -2675,6 +2777,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -2710,6 +2817,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -2753,6 +2861,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -2798,6 +2907,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -2843,6 +2953,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -2888,6 +2999,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -2933,6 +3045,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -2978,6 +3091,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -3021,6 +3135,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -3062,6 +3177,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -3106,6 +3222,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -3141,6 +3262,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -3182,6 +3304,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -3225,6 +3348,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -3267,6 +3391,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -3302,6 +3431,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -3343,6 +3473,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -3384,6 +3515,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -3424,6 +3556,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -3476,6 +3609,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'climate',
@@ -3540,6 +3674,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'select',
@@ -3590,6 +3725,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'select',
@@ -3636,6 +3772,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -3681,6 +3818,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -3723,6 +3861,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -3758,6 +3901,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -3799,6 +3943,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -3842,6 +3987,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -3884,6 +4030,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -3919,6 +4070,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -3960,6 +4112,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -4003,6 +4156,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -4049,6 +4203,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -4084,6 +4243,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -4125,6 +4285,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -4166,6 +4327,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -4206,6 +4368,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -4258,6 +4421,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'climate',
@@ -4322,6 +4486,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'select',
@@ -4372,6 +4537,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'select',
@@ -4418,6 +4584,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -4463,6 +4630,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -4509,6 +4677,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -4544,6 +4717,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -4585,6 +4759,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -4625,6 +4800,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -4660,6 +4840,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -4712,6 +4893,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'climate',
@@ -4775,6 +4957,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'select',
@@ -4821,6 +5004,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -4866,6 +5050,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -4908,6 +5093,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -4943,6 +5133,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -4984,6 +5175,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -5027,6 +5219,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -5069,6 +5262,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -5104,6 +5302,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -5145,6 +5344,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -5188,6 +5388,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -5234,6 +5435,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -5269,6 +5475,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -5310,6 +5517,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -5351,6 +5559,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -5391,6 +5600,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -5447,6 +5657,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'climate',
@@ -5516,6 +5727,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'select',
@@ -5566,6 +5778,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'select',
@@ -5612,6 +5825,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -5657,6 +5871,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -5703,6 +5918,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -5738,6 +5958,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -5779,6 +6000,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -5820,6 +6042,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -5863,6 +6086,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -5908,6 +6132,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -5951,6 +6176,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -5994,6 +6220,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -6029,6 +6260,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -6075,6 +6307,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'number',
@@ -6124,6 +6357,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'select',
@@ -6170,6 +6404,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -6215,6 +6450,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -6261,6 +6497,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -6306,6 +6543,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -6352,6 +6590,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -6387,6 +6630,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -6430,6 +6674,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -6475,6 +6720,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -6520,6 +6766,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -6565,6 +6812,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -6608,6 +6856,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -6649,6 +6898,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -6692,6 +6942,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -6727,6 +6982,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -6768,6 +7024,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -6808,6 +7065,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -6851,6 +7109,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'fan',
@@ -6899,6 +7158,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -6934,6 +7198,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -6975,6 +7240,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -7018,6 +7284,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -7053,6 +7324,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -7094,6 +7366,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'cover',
@@ -7138,6 +7411,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -7181,6 +7455,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -7216,6 +7495,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -7256,6 +7536,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -7291,6 +7576,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -7332,6 +7618,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'cover',
@@ -7376,6 +7663,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -7423,6 +7711,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -7458,6 +7751,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -7501,6 +7795,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'fan',
@@ -7545,6 +7840,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -7580,6 +7880,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -7620,6 +7921,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -7655,6 +7961,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -7698,6 +8005,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'fan',
@@ -7747,6 +8055,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -7782,6 +8095,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -7833,6 +8147,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'climate',
@@ -7887,6 +8202,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'fan',
@@ -7938,6 +8254,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'select',
@@ -7984,6 +8301,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -8029,6 +8347,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -8071,6 +8390,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -8106,6 +8430,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -8150,6 +8475,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -8185,6 +8515,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -8225,6 +8556,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -8260,6 +8596,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -8305,6 +8642,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -8353,6 +8691,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -8400,6 +8739,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -8435,6 +8779,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -8476,6 +8821,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'cover',
@@ -8520,6 +8866,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -8563,6 +8910,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -8598,6 +8950,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -8638,6 +8991,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -8673,6 +9031,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -8714,6 +9073,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'cover',
@@ -8758,6 +9118,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -8805,6 +9166,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -8840,6 +9206,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -8883,6 +9250,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'fan',
@@ -8927,6 +9295,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -8962,6 +9335,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -9002,6 +9376,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -9037,6 +9416,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -9080,6 +9460,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'fan',
@@ -9130,6 +9511,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -9165,6 +9551,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -9205,6 +9592,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -9240,6 +9632,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -9283,6 +9676,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'fan',
@@ -9333,6 +9727,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -9368,6 +9767,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -9423,6 +9823,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'climate',
@@ -9482,6 +9883,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'fan',
@@ -9533,6 +9935,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'select',
@@ -9579,6 +9982,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -9624,6 +10028,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -9666,6 +10071,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -9701,6 +10111,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -9745,6 +10156,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -9780,6 +10196,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -9820,6 +10237,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -9855,6 +10277,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -9903,6 +10326,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'humidifier',
@@ -9956,6 +10380,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -10002,6 +10427,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -10037,6 +10467,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -10077,6 +10508,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -10112,6 +10548,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -10160,6 +10597,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'humidifier',
@@ -10213,6 +10651,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -10259,6 +10698,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -10294,6 +10738,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -10334,6 +10779,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -10369,6 +10819,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -10419,6 +10870,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -10477,6 +10929,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -10524,6 +10977,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -10559,6 +11017,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -10616,6 +11075,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'climate',
@@ -10678,6 +11138,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -10724,6 +11185,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -10759,6 +11225,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -10808,6 +11275,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -10862,6 +11330,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -10897,6 +11370,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -10946,6 +11420,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -11000,6 +11475,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -11035,6 +11515,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -11084,6 +11565,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -11138,6 +11620,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -11173,6 +11660,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -11222,6 +11710,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -11276,6 +11765,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -11311,6 +11805,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -11360,6 +11855,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -11424,6 +11920,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -11459,6 +11960,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -11508,6 +12010,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -11572,6 +12075,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -11607,6 +12115,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -11652,6 +12161,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'event',
@@ -11701,6 +12211,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'event',
@@ -11750,6 +12261,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'event',
@@ -11799,6 +12311,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'event',
@@ -11846,6 +12359,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -11889,6 +12403,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -11924,6 +12443,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -11969,6 +12489,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -12014,6 +12535,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -12049,6 +12575,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -12094,6 +12621,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -12139,6 +12667,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -12174,6 +12707,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -12219,6 +12753,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -12264,6 +12799,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -12299,6 +12839,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -12344,6 +12885,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -12389,6 +12931,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -12424,6 +12971,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -12469,6 +13017,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -12514,6 +13063,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -12549,6 +13103,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -12594,6 +13149,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -12639,6 +13195,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -12674,6 +13235,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -12719,6 +13281,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -12764,6 +13327,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -12799,6 +13367,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -12843,6 +13412,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -12878,6 +13452,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -12928,6 +13503,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -12987,6 +13563,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -13022,6 +13603,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -13065,6 +13647,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -13108,6 +13691,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -13152,6 +13736,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -13187,6 +13776,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -13230,6 +13820,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -13273,6 +13864,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -13313,6 +13905,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -13356,6 +13949,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -13391,6 +13989,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -13441,6 +14040,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'climate',
@@ -13501,6 +14101,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'select',
@@ -13547,6 +14148,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -13592,6 +14194,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -13638,6 +14241,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -13673,6 +14281,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -13724,6 +14333,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'media_player',
@@ -13742,7 +14352,7 @@
             'original_name': 'LG webOS TV AF80',
             'platform': 'homekit_controller',
             'previous_unique_id': None,
-            'supported_features': <MediaPlayerEntityFeature: 18433>,
+            'supported_features': <MediaPlayerEntityFeature: 18817>,
             'translation_key': None,
             'unique_id': '00:00:00:00:00:00_1_48',
             'unit_of_measurement': None,
@@ -13761,7 +14371,7 @@
                 'AV',
                 'HDMI 4',
               ]),
-              'supported_features': <MediaPlayerEntityFeature: 18433>,
+              'supported_features': <MediaPlayerEntityFeature: 18817>,
             }),
             'entity_id': 'media_player.lg_webos_tv_af80',
             'state': 'on',
@@ -13776,6 +14386,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -13819,6 +14430,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -13854,6 +14470,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -13897,6 +14514,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'fan',
@@ -13941,6 +14559,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -13976,6 +14599,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -14020,6 +14644,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -14055,6 +14684,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -14096,6 +14726,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -14136,6 +14767,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -14176,6 +14808,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -14216,6 +14849,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -14256,6 +14890,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -14299,6 +14934,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -14334,6 +14974,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -14379,6 +15020,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -14428,6 +15070,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -14463,6 +15110,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -14513,6 +15161,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'climate',
@@ -14570,6 +15219,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -14621,6 +15271,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'select',
@@ -14667,6 +15318,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -14712,6 +15364,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -14758,6 +15411,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -14793,6 +15451,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -14843,6 +15502,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -14918,6 +15578,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -14977,6 +15638,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -15030,6 +15692,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -15065,6 +15732,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -15106,6 +15774,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -15147,6 +15816,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'camera',
@@ -15194,6 +15864,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'event',
@@ -15241,6 +15912,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -15281,6 +15953,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -15324,6 +15997,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -15359,6 +16037,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -15400,6 +16079,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'binary_sensor',
@@ -15441,6 +16121,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -15485,6 +16166,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -15520,6 +16206,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -15563,6 +16250,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -15607,6 +16295,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -15652,6 +16341,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -15697,6 +16387,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -15742,6 +16433,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -15788,6 +16480,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -15823,6 +16520,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -15864,6 +16562,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -15907,6 +16606,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -15950,6 +16650,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -15993,6 +16694,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -16036,6 +16738,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -16079,6 +16782,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -16122,6 +16826,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -16165,6 +16870,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -16211,6 +16917,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -16246,6 +16957,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -16287,6 +16999,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'cover',
@@ -16331,6 +17044,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -16374,6 +17088,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -16409,6 +17128,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -16449,6 +17169,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -16484,6 +17209,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -16525,6 +17251,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'cover',
@@ -16569,6 +17296,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -16616,6 +17344,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -16651,6 +17384,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -16692,6 +17426,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'cover',
@@ -16736,6 +17471,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -16779,6 +17515,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -16814,6 +17555,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -16855,6 +17597,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'cover',
@@ -16899,6 +17642,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -16942,6 +17686,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -16977,6 +17726,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -17018,6 +17768,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'cover',
@@ -17062,6 +17813,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -17105,6 +17857,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -17140,6 +17897,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -17180,6 +17938,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -17215,6 +17978,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -17256,6 +18020,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'cover',
@@ -17300,6 +18065,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -17347,6 +18113,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -17382,6 +18153,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -17423,6 +18195,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'lock',
@@ -17467,6 +18240,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -17502,6 +18280,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -17545,6 +18324,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'fan',
@@ -17595,6 +18375,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -17644,6 +18425,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -17679,6 +18465,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -17720,6 +18507,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'cover',
@@ -17766,6 +18554,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -17801,6 +18594,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -17852,6 +18646,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'climate',
@@ -17907,6 +18702,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -17950,6 +18746,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -17990,6 +18787,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -18031,6 +18829,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -18072,6 +18871,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -18113,6 +18913,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
@@ -18157,6 +18958,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -18192,6 +18998,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -18235,6 +19042,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -18280,6 +19088,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -18325,6 +19134,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -18371,6 +19181,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -18406,6 +19221,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -18446,6 +19262,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -18481,6 +19302,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -18524,6 +19346,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -18569,6 +19392,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -18614,6 +19438,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -18656,6 +19481,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -18691,6 +19521,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -18732,6 +19563,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'cover',
@@ -18778,6 +19610,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -18813,6 +19650,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -18854,6 +19692,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'cover',
@@ -18900,6 +19739,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -18935,6 +19779,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -18976,6 +19821,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'cover',
@@ -19021,6 +19867,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -19056,6 +19907,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -19104,6 +19956,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'humidifier',
@@ -19164,6 +20017,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'light',
@@ -19235,6 +20089,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'number',
@@ -19281,6 +20136,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -19327,6 +20183,11 @@
         'config_entries': list([
           'TestData',
         ]),
+        'config_entries_subentries': dict({
+          'TestData': list([
+            None,
+          ]),
+        }),
         'configuration_url': None,
         'connections': list([
         ]),
@@ -19362,6 +20223,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'button',
@@ -19405,6 +20267,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'sensor',
@@ -19448,6 +20311,7 @@
             'categories': dict({
             }),
             'config_entry_id': 'TestData',
+            'config_subentry_id': None,
             'device_class': None,
             'disabled_by': None,
             'domain': 'switch',
diff --git a/tests/components/homekit_controller/specific_devices/test_koogeek_ls1.py b/tests/components/homekit_controller/specific_devices/test_koogeek_ls1.py
index a16cd052c87..a71465716c4 100644
--- a/tests/components/homekit_controller/specific_devices/test_koogeek_ls1.py
+++ b/tests/components/homekit_controller/specific_devices/test_koogeek_ls1.py
@@ -12,7 +12,7 @@ from homeassistant.components.homekit_controller.connection import (
     MAX_POLL_FAILURES_TO_DECLARE_UNAVAILABLE,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from ..common import Helper, setup_accessories_from_file, setup_test_accessories
 
diff --git a/tests/components/homekit_controller/specific_devices/test_lg_tv.py b/tests/components/homekit_controller/specific_devices/test_lg_tv.py
new file mode 100644
index 00000000000..48d1fc3ebdc
--- /dev/null
+++ b/tests/components/homekit_controller/specific_devices/test_lg_tv.py
@@ -0,0 +1,56 @@
+"""Test against characteristics captured from an LG TV."""
+
+from homeassistant.components.media_player import (
+    ATTR_INPUT_SOURCE_LIST,
+    MediaPlayerEntityFeature,
+)
+from homeassistant.const import ATTR_SUPPORTED_FEATURES, STATE_ON
+from homeassistant.core import HomeAssistant
+
+from ..common import (
+    HUB_TEST_ACCESSORY_ID,
+    DeviceTestInfo,
+    assert_devices_and_entities_created,
+    setup_accessories_from_file,
+    setup_test_accessories,
+)
+
+
+async def test_lg_tv_setup(hass: HomeAssistant) -> None:
+    """Test that a LG TV can be correctly setup in HA."""
+    accessories = await setup_accessories_from_file(hass, "lg_tv.json")
+    await setup_test_accessories(hass, accessories)
+
+    await assert_devices_and_entities_created(
+        hass,
+        DeviceTestInfo(
+            unique_id=HUB_TEST_ACCESSORY_ID,
+            name="LG webOS TV AF80",
+            model="OLED55B9PUA",
+            manufacturer="LG Electronics",
+            sw_version="04.71.04",
+            hw_version="1",
+            serial_number="A0000A000000000A",
+            devices=[],
+            entities=[],
+        ),
+    )
+
+    state = hass.states.get("media_player.lg_webos_tv_af80")
+    assert state is not None
+    assert state.state == STATE_ON
+    assert state.attributes[ATTR_INPUT_SOURCE_LIST] == [
+        "AirPlay",
+        "Live TV",
+        "HDMI 1",
+        "Sony",
+        "Apple",
+        "AV",
+        "HDMI 4",
+    ]
+    features = state.attributes[ATTR_SUPPORTED_FEATURES]
+    assert features & MediaPlayerEntityFeature.TURN_ON
+    assert features & MediaPlayerEntityFeature.TURN_OFF
+    assert features & MediaPlayerEntityFeature.SELECT_SOURCE
+    assert features & MediaPlayerEntityFeature.PLAY
+    assert features & MediaPlayerEntityFeature.PAUSE
diff --git a/tests/components/homekit_controller/test_connection.py b/tests/components/homekit_controller/test_connection.py
index 7ea791f9a1e..00c7bb16259 100644
--- a/tests/components/homekit_controller/test_connection.py
+++ b/tests/components/homekit_controller/test_connection.py
@@ -375,9 +375,9 @@ async def test_poll_firmware_version_only_all_watchable_accessory_mode(
         state = await helper.poll_and_get_state()
         assert state.state == STATE_OFF
         assert mock_get_characteristics.call_count == 2
-        # Verify only firmware version is polled
-        assert mock_get_characteristics.call_args_list[0][0][0] == {(1, 7)}
-        assert mock_get_characteristics.call_args_list[1][0][0] == {(1, 7)}
+        # Verify everything is polled
+        assert mock_get_characteristics.call_args_list[0][0][0] == {(1, 10), (1, 11)}
+        assert mock_get_characteristics.call_args_list[1][0][0] == {(1, 10), (1, 11)}
 
         # Test device goes offline
         helper.pairing.available = False
@@ -429,8 +429,8 @@ async def test_manual_poll_all_chars(
     ) as mock_get_characteristics:
         # Initial state is that the light is off
         await helper.poll_and_get_state()
-        # Verify only firmware version is polled
-        assert mock_get_characteristics.call_args_list[0][0][0] == {(1, 7)}
+        # Verify poll polls all chars
+        assert len(mock_get_characteristics.call_args_list[0][0][0]) > 1
 
         # Now do a manual poll to ensure all chars are polled
         mock_get_characteristics.reset_mock()
diff --git a/tests/components/homekit_controller/test_media_player.py b/tests/components/homekit_controller/test_media_player.py
index d1d280ef265..e00dde92a81 100644
--- a/tests/components/homekit_controller/test_media_player.py
+++ b/tests/components/homekit_controller/test_media_player.py
@@ -10,6 +10,11 @@ from aiohomekit.model.characteristics import (
 from aiohomekit.model.services import Service, ServicesTypes
 import pytest
 
+from homeassistant.components.media_player import (
+    DOMAIN as MEDIA_PLAYER_DOMAIN,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
@@ -408,3 +413,57 @@ async def test_migrate_unique_id(
         entity_registry.async_get(media_player_entry.entity_id).unique_id
         == f"00:00:00:00:00:00_{aid}_8"
     )
+
+
+async def test_turn_on(hass: HomeAssistant, get_next_aid: Callable[[], int]) -> None:
+    """Test that we can turn on a media player."""
+    helper = await setup_test_component(
+        hass, get_next_aid(), create_tv_service_with_target_media_state
+    )
+
+    await helper.async_update(
+        ServicesTypes.TELEVISION,
+        {
+            CharacteristicsTypes.CURRENT_MEDIA_STATE: 0,
+        },
+    )
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_TURN_ON,
+        {"entity_id": "media_player.testdevice"},
+        blocking=True,
+    )
+    helper.async_assert_service_values(
+        ServicesTypes.TELEVISION,
+        {
+            CharacteristicsTypes.ACTIVE: 1,
+        },
+    )
+
+
+async def test_turn_off(hass: HomeAssistant, get_next_aid: Callable[[], int]) -> None:
+    """Test that we can turn off a media player."""
+    helper = await setup_test_component(
+        hass, get_next_aid(), create_tv_service_with_target_media_state
+    )
+
+    await helper.async_update(
+        ServicesTypes.TELEVISION,
+        {
+            CharacteristicsTypes.CURRENT_MEDIA_STATE: 0,
+        },
+    )
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_TURN_OFF,
+        {"entity_id": "media_player.testdevice"},
+        blocking=True,
+    )
+    helper.async_assert_service_values(
+        ServicesTypes.TELEVISION,
+        {
+            CharacteristicsTypes.ACTIVE: 0,
+        },
+    )
diff --git a/tests/components/homewizard/conftest.py b/tests/components/homewizard/conftest.py
index b540ebac91a..b8367f87e57 100644
--- a/tests/components/homewizard/conftest.py
+++ b/tests/components/homewizard/conftest.py
@@ -3,11 +3,18 @@
 from collections.abc import Generator
 from unittest.mock import AsyncMock, MagicMock, patch
 
-from homewizard_energy.models import CombinedModels, Device, Measurement, State, System
+from homewizard_energy.models import (
+    CombinedModels,
+    Device,
+    Measurement,
+    State,
+    System,
+    Token,
+)
 import pytest
 
 from homeassistant.components.homewizard.const import DOMAIN
-from homeassistant.const import CONF_IP_ADDRESS
+from homeassistant.const import CONF_IP_ADDRESS, CONF_TOKEN
 from homeassistant.core import HomeAssistant
 
 from tests.common import MockConfigEntry, get_fixture_path, load_json_object_fixture
@@ -65,6 +72,59 @@ def mock_homewizardenergy(
         yield client
 
 
+@pytest.fixture
+def mock_homewizardenergy_v2(
+    device_fixture: str,
+) -> MagicMock:
+    """Return a mock bridge."""
+    with (
+        patch(
+            "homeassistant.components.homewizard.HomeWizardEnergyV2",
+            autospec=True,
+        ) as homewizard,
+        patch(
+            "homeassistant.components.homewizard.config_flow.HomeWizardEnergyV2",
+            new=homewizard,
+        ),
+    ):
+        client = homewizard.return_value
+
+        client.combined.return_value = CombinedModels(
+            device=Device.from_dict(
+                load_json_object_fixture(f"v2/{device_fixture}/device.json", DOMAIN)
+            ),
+            measurement=Measurement.from_dict(
+                load_json_object_fixture(
+                    f"v2/{device_fixture}/measurement.json", DOMAIN
+                )
+            ),
+            state=(
+                State.from_dict(
+                    load_json_object_fixture(f"v2/{device_fixture}/state.json", DOMAIN)
+                )
+                if get_fixture_path(f"v2/{device_fixture}/state.json", DOMAIN).exists()
+                else None
+            ),
+            system=(
+                System.from_dict(
+                    load_json_object_fixture(f"v2/{device_fixture}/system.json", DOMAIN)
+                )
+                if get_fixture_path(f"v2/{device_fixture}/system.json", DOMAIN).exists()
+                else None
+            ),
+        )
+
+        # device() call is used during configuration flow
+        client.device.return_value = client.combined.return_value.device
+
+        # Authorization flow is used during configuration flow
+        client.get_token.return_value = Token.from_dict(
+            load_json_object_fixture("v2/generic/token.json", DOMAIN)
+        ).token
+
+        yield client
+
+
 @pytest.fixture
 def mock_setup_entry() -> Generator[AsyncMock]:
     """Mock setting up a config entry."""
@@ -90,6 +150,20 @@ def mock_config_entry() -> MockConfigEntry:
     )
 
 
+@pytest.fixture
+def mock_config_entry_v2() -> MockConfigEntry:
+    """Return the default mocked config entry."""
+    return MockConfigEntry(
+        title="Device",
+        domain=DOMAIN,
+        data={
+            CONF_IP_ADDRESS: "127.0.0.1",
+            CONF_TOKEN: "00112233445566778899ABCDEFABCDEF",
+        },
+        unique_id="HWE-BAT_5c2fafabcdef",
+    )
+
+
 @pytest.fixture
 async def init_integration(
     hass: HomeAssistant,
diff --git a/tests/components/homewizard/fixtures/HWE-BAT/data.json b/tests/components/homewizard/fixtures/HWE-BAT/data.json
new file mode 100644
index 00000000000..490120e7ffd
--- /dev/null
+++ b/tests/components/homewizard/fixtures/HWE-BAT/data.json
@@ -0,0 +1,12 @@
+{
+  "wifi_ssid": "simulating v1 support",
+  "wifi_strength": 100,
+  "total_power_import_kwh": 123.456,
+  "total_power_export_kwh": 123.456,
+  "active_power_w": 123,
+  "active_voltage_v": 230,
+  "active_current_a": 1.5,
+  "active_frequency_hz": 50,
+  "state_of_charge_pct": 50,
+  "cycles": 123
+}
diff --git a/tests/components/homewizard/fixtures/HWE-BAT/device.json b/tests/components/homewizard/fixtures/HWE-BAT/device.json
new file mode 100644
index 00000000000..c551dc34c91
--- /dev/null
+++ b/tests/components/homewizard/fixtures/HWE-BAT/device.json
@@ -0,0 +1,7 @@
+{
+  "product_type": "HWE-BAT",
+  "product_name": "Plug-In Battery",
+  "serial": "5c2fafabcdef",
+  "firmware_version": "1.00",
+  "api_version": "v1"
+}
diff --git a/tests/components/homewizard/fixtures/HWE-BAT/system.json b/tests/components/homewizard/fixtures/HWE-BAT/system.json
new file mode 100644
index 00000000000..b4094f497cb
--- /dev/null
+++ b/tests/components/homewizard/fixtures/HWE-BAT/system.json
@@ -0,0 +1,7 @@
+{
+  "wifi_ssid": "My Wi-Fi",
+  "wifi_rssi_db": -77,
+  "cloud_enabled": false,
+  "uptime_s": 356,
+  "status_led_brightness_pct": 100
+}
diff --git a/tests/components/homewizard/fixtures/v2/HWE-P1/device.json b/tests/components/homewizard/fixtures/v2/HWE-P1/device.json
new file mode 100644
index 00000000000..2dc3f0692a2
--- /dev/null
+++ b/tests/components/homewizard/fixtures/v2/HWE-P1/device.json
@@ -0,0 +1,7 @@
+{
+  "product_type": "HWE-P1",
+  "product_name": "P1 meter",
+  "serial": "5c2fafabcdef",
+  "firmware_version": "4.19",
+  "api_version": "2.0.0"
+}
diff --git a/tests/components/homewizard/fixtures/v2/HWE-P1/measurement.json b/tests/components/homewizard/fixtures/v2/HWE-P1/measurement.json
new file mode 100644
index 00000000000..2004b0cd37f
--- /dev/null
+++ b/tests/components/homewizard/fixtures/v2/HWE-P1/measurement.json
@@ -0,0 +1,48 @@
+{
+  "protocol_version": 50,
+  "meter_model": "ISKRA  2M550T-101",
+  "unique_id": "4E6576657220476F6E6E61204C657420596F7520446F776E",
+  "timestamp": "2024-06-28T14:12:34",
+  "tariff": 2,
+  "energy_import_kwh": 13779.338,
+  "energy_import_t1_kwh": 10830.511,
+  "energy_import_t2_kwh": 2948.827,
+  "energy_export_kwh": 1234.567,
+  "energy_export_t1_kwh": 234.567,
+  "energy_export_t2_kwh": 1000,
+  "power_w": -543,
+  "power_l1_w": -676,
+  "power_l2_w": 133,
+  "power_l3_w": 0,
+  "current_a": 6,
+  "current_l1_a": -4,
+  "current_l2_a": 2,
+  "current_l3_a": 0,
+  "voltage_sag_l1_count": 1,
+  "voltage_sag_l2_count": 1,
+  "voltage_sag_l3_count": 0,
+  "voltage_swell_l1_count": 0,
+  "voltage_swell_l2_count": 0,
+  "voltage_swell_l3_count": 0,
+  "any_power_fail_count": 4,
+  "long_power_fail_count": 5,
+  "average_power_15m_w": 123.0,
+  "monthly_power_peak_w": 1111.0,
+  "monthly_power_peak_timestamp": "2024-06-04T10:11:22",
+  "external": [
+    {
+      "unique_id": "4E6576657220676F6E6E612072756E2061726F756E64",
+      "type": "gas_meter",
+      "timestamp": "2024-06-28T14:00:00",
+      "value": 2569.646,
+      "unit": "m3"
+    },
+    {
+      "unique_id": "616E642064657365727420796F75",
+      "type": "water_meter",
+      "timestamp": "2024-06-28T14:05:00",
+      "value": 123.456,
+      "unit": "m3"
+    }
+  ]
+}
diff --git a/tests/components/homewizard/fixtures/v2/HWE-P1/system.json b/tests/components/homewizard/fixtures/v2/HWE-P1/system.json
new file mode 100644
index 00000000000..38bcaeeb584
--- /dev/null
+++ b/tests/components/homewizard/fixtures/v2/HWE-P1/system.json
@@ -0,0 +1,8 @@
+{
+  "wifi_ssid": "My Wi-Fi",
+  "wifi_rssi_db": -77,
+  "cloud_enabled": false,
+  "uptime_s": 356,
+  "status_led_brightness_pct": 100,
+  "api_v1_enabled": true
+}
diff --git a/tests/components/homewizard/fixtures/v2/generic/token.json b/tests/components/homewizard/fixtures/v2/generic/token.json
new file mode 100644
index 00000000000..8fa1e9cb8d1
--- /dev/null
+++ b/tests/components/homewizard/fixtures/v2/generic/token.json
@@ -0,0 +1,4 @@
+{
+  "token": "00112233445566778899aabbccddeeff",
+  "name": "local/new_user"
+}
diff --git a/tests/components/homewizard/snapshots/test_button.ambr b/tests/components/homewizard/snapshots/test_button.ambr
index 6dd7fcc45d2..16cc62ad726 100644
--- a/tests/components/homewizard/snapshots/test_button.ambr
+++ b/tests/components/homewizard/snapshots/test_button.ambr
@@ -20,6 +20,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -50,6 +51,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
diff --git a/tests/components/homewizard/snapshots/test_config_flow.ambr b/tests/components/homewizard/snapshots/test_config_flow.ambr
index 0a301fc3941..71e70f3a153 100644
--- a/tests/components/homewizard/snapshots/test_config_flow.ambr
+++ b/tests/components/homewizard/snapshots/test_config_flow.ambr
@@ -30,10 +30,14 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'zeroconf',
+      'subentries': list([
+      ]),
       'title': 'P1 meter',
       'unique_id': 'HWE-P1_5c2fafabcdef',
       'version': 1,
     }),
+    'subentries': tuple(
+    ),
     'title': 'P1 meter',
     'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
     'version': 1,
@@ -74,10 +78,14 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'zeroconf',
+      'subentries': list([
+      ]),
       'title': 'P1 meter',
       'unique_id': 'HWE-P1_5c2fafabcdef',
       'version': 1,
     }),
+    'subentries': tuple(
+    ),
     'title': 'P1 meter',
     'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
     'version': 1,
@@ -118,10 +126,14 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'zeroconf',
+      'subentries': list([
+      ]),
       'title': 'Energy Socket',
       'unique_id': 'HWE-SKT_5c2fafabcdef',
       'version': 1,
     }),
+    'subentries': tuple(
+    ),
     'title': 'Energy Socket',
     'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
     'version': 1,
@@ -158,10 +170,14 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'P1 meter',
       'unique_id': 'HWE-P1_5c2fafabcdef',
       'version': 1,
     }),
+    'subentries': tuple(
+    ),
     'title': 'P1 meter',
     'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
     'version': 1,
diff --git a/tests/components/homewizard/snapshots/test_diagnostics.ambr b/tests/components/homewizard/snapshots/test_diagnostics.ambr
index b8cf98d9211..2545f674bbd 100644
--- a/tests/components/homewizard/snapshots/test_diagnostics.ambr
+++ b/tests/components/homewizard/snapshots/test_diagnostics.ambr
@@ -1,9 +1,100 @@
 # serializer version: 1
+# name: test_diagnostics[HWE-BAT]
+  dict({
+    'data': dict({
+      'device': dict({
+        'api_version': '1.0.0',
+        'firmware_version': '1.00',
+        'id': '**REDACTED**',
+        'model_name': 'Plug-In Battery',
+        'product_name': 'Plug-In Battery',
+        'product_type': 'HWE-BAT',
+        'serial': '**REDACTED**',
+      }),
+      'measurement': dict({
+        'active_liter_lpm': None,
+        'any_power_fail_count': None,
+        'apparent_power_l1_va': None,
+        'apparent_power_l2_va': None,
+        'apparent_power_l3_va': None,
+        'apparent_power_va': None,
+        'average_power_15m_w': None,
+        'current_a': 1.5,
+        'current_l1_a': None,
+        'current_l2_a': None,
+        'current_l3_a': None,
+        'cycles': 123,
+        'energy_export_kwh': 123.456,
+        'energy_export_t1_kwh': None,
+        'energy_export_t2_kwh': None,
+        'energy_export_t3_kwh': None,
+        'energy_export_t4_kwh': None,
+        'energy_import_kwh': 123.456,
+        'energy_import_t1_kwh': None,
+        'energy_import_t2_kwh': None,
+        'energy_import_t3_kwh': None,
+        'energy_import_t4_kwh': None,
+        'external_devices': None,
+        'frequency_hz': 50.0,
+        'long_power_fail_count': None,
+        'meter_model': None,
+        'monthly_power_peak_timestamp': None,
+        'monthly_power_peak_w': None,
+        'power_factor': None,
+        'power_factor_l1': None,
+        'power_factor_l2': None,
+        'power_factor_l3': None,
+        'power_l1_w': None,
+        'power_l2_w': None,
+        'power_l3_w': None,
+        'power_w': 123.0,
+        'protocol_version': None,
+        'reactive_power_l1_var': None,
+        'reactive_power_l2_var': None,
+        'reactive_power_l3_var': None,
+        'reactive_power_var': None,
+        'state_of_charge_pct': 50.0,
+        'tariff': None,
+        'timestamp': None,
+        'total_liter_m3': None,
+        'unique_id': None,
+        'voltage_l1_v': None,
+        'voltage_l2_v': None,
+        'voltage_l3_v': None,
+        'voltage_sag_l1_count': None,
+        'voltage_sag_l2_count': None,
+        'voltage_sag_l3_count': None,
+        'voltage_swell_l1_count': None,
+        'voltage_swell_l2_count': None,
+        'voltage_swell_l3_count': None,
+        'voltage_v': 230.0,
+        'wifi_ssid': '**REDACTED**',
+        'wifi_strength': 100,
+      }),
+      'state': None,
+      'system': dict({
+        'api_v1_enabled': None,
+        'cloud_enabled': False,
+        'status_led_brightness_pct': 100,
+        'uptime_s': 356,
+        'wifi_rssi_db': -77,
+        'wifi_ssid': '**REDACTED**',
+        'wifi_strength_pct': 100,
+      }),
+    }),
+    'entry': dict({
+      'ip_address': '**REDACTED**',
+      'product_name': 'P1 Meter',
+      'product_type': 'HWE-P1',
+      'serial': '**REDACTED**',
+    }),
+  })
+# ---
 # name: test_diagnostics[HWE-KWH1]
   dict({
     'data': dict({
       'device': dict({
-        'api_version': 'v1',
+        'api_version': '1.0.0',
         'firmware_version': '3.06',
         'id': '**REDACTED**',
         'model_name': 'Wi-Fi kWh Meter 1-phase',
@@ -79,6 +170,7 @@
         'uptime_s': None,
         'wifi_rssi_db': None,
         'wifi_ssid': '**REDACTED**',
+        'wifi_strength_pct': 92,
       }),
     }),
     'entry': dict({
@@ -93,7 +185,7 @@
   dict({
     'data': dict({
       'device': dict({
-        'api_version': 'v1',
+        'api_version': '1.0.0',
         'firmware_version': '3.06',
         'id': '**REDACTED**',
         'model_name': 'Wi-Fi kWh Meter 3-phase',
@@ -169,6 +261,7 @@
         'uptime_s': None,
         'wifi_rssi_db': None,
         'wifi_ssid': '**REDACTED**',
+        'wifi_strength_pct': 92,
       }),
     }),
     'entry': dict({
@@ -183,7 +276,7 @@
   dict({
     'data': dict({
       'device': dict({
-        'api_version': 'v1',
+        'api_version': '1.0.0',
         'firmware_version': '4.19',
         'id': '**REDACTED**',
         'model_name': 'Wi-Fi P1 Meter',
@@ -295,6 +388,7 @@
         'uptime_s': None,
         'wifi_rssi_db': None,
         'wifi_ssid': '**REDACTED**',
+        'wifi_strength_pct': 100,
       }),
     }),
     'entry': dict({
@@ -309,7 +403,7 @@
   dict({
     'data': dict({
       'device': dict({
-        'api_version': 'v1',
+        'api_version': '1.0.0',
         'firmware_version': '3.03',
         'id': '**REDACTED**',
         'model_name': 'Wi-Fi Energy Socket',
@@ -389,6 +483,7 @@
         'uptime_s': None,
         'wifi_rssi_db': None,
         'wifi_ssid': '**REDACTED**',
+        'wifi_strength_pct': 94,
       }),
     }),
     'entry': dict({
@@ -403,7 +498,7 @@
   dict({
     'data': dict({
       'device': dict({
-        'api_version': 'v1',
+        'api_version': '1.0.0',
         'firmware_version': '4.07',
         'id': '**REDACTED**',
         'model_name': 'Wi-Fi Energy Socket',
@@ -483,6 +578,7 @@
         'uptime_s': None,
         'wifi_rssi_db': None,
         'wifi_ssid': '**REDACTED**',
+        'wifi_strength_pct': 100,
       }),
     }),
     'entry': dict({
@@ -497,7 +593,7 @@
   dict({
     'data': dict({
       'device': dict({
-        'api_version': 'v1',
+        'api_version': '1.0.0',
         'firmware_version': '2.03',
         'id': '**REDACTED**',
         'model_name': 'Wi-Fi Watermeter',
@@ -573,6 +669,7 @@
         'uptime_s': None,
         'wifi_rssi_db': None,
         'wifi_ssid': '**REDACTED**',
+        'wifi_strength_pct': 84,
       }),
     }),
     'entry': dict({
@@ -587,7 +684,7 @@
   dict({
     'data': dict({
       'device': dict({
-        'api_version': 'v1',
+        'api_version': '1.0.0',
         'firmware_version': '3.06',
         'id': '**REDACTED**',
         'model_name': 'Wi-Fi kWh Meter 1-phase',
@@ -663,6 +760,7 @@
         'uptime_s': None,
         'wifi_rssi_db': None,
         'wifi_ssid': '**REDACTED**',
+        'wifi_strength_pct': 92,
       }),
     }),
     'entry': dict({
@@ -677,7 +775,7 @@
   dict({
     'data': dict({
       'device': dict({
-        'api_version': 'v1',
+        'api_version': '1.0.0',
         'firmware_version': '3.06',
         'id': '**REDACTED**',
         'model_name': 'Wi-Fi kWh Meter 3-phase',
@@ -753,6 +851,7 @@
         'uptime_s': None,
         'wifi_rssi_db': None,
         'wifi_ssid': '**REDACTED**',
+        'wifi_strength_pct': 92,
       }),
     }),
     'entry': dict({
diff --git a/tests/components/homewizard/snapshots/test_number.ambr b/tests/components/homewizard/snapshots/test_number.ambr
index b14028cd97c..1c901bda6f6 100644
--- a/tests/components/homewizard/snapshots/test_number.ambr
+++ b/tests/components/homewizard/snapshots/test_number.ambr
@@ -29,6 +29,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -121,6 +123,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -151,6 +154,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
diff --git a/tests/components/homewizard/snapshots/test_sensor.ambr b/tests/components/homewizard/snapshots/test_sensor.ambr
index 31a949ca7bd..f68b5a57d2e 100644
--- a/tests/components/homewizard/snapshots/test_sensor.ambr
+++ b/tests/components/homewizard/snapshots/test_sensor.ambr
@@ -1,8 +1,982 @@
 # serializer version: 1
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_battery_cycles:device-registry]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+      tuple(
+        'mac',
+        '5c:2f:af:ab:cd:ef',
+      ),
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'homewizard',
+        '5c2fafabcdef',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'HomeWizard',
+    'model': 'Plug-In Battery',
+    'model_id': 'HWE-BAT',
+    'name': 'Device',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '1.00',
+    'via_device_id': None,
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_battery_cycles:entity-registry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.device_battery_cycles',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Battery cycles',
+    'platform': 'homewizard',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'cycles',
+    'unique_id': 'HWE-P1_5c2fafabcdef_cycles',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_battery_cycles:state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Device Battery cycles',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.device_battery_cycles',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '123',
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_current:device-registry]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+      tuple(
+        'mac',
+        '5c:2f:af:ab:cd:ef',
+      ),
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'homewizard',
+        '5c2fafabcdef',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'HomeWizard',
+    'model': 'Plug-In Battery',
+    'model_id': 'HWE-BAT',
+    'name': 'Device',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '1.00',
+    'via_device_id': None,
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_current:entity-registry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.device_current',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.CURRENT: 'current'>,
+    'original_icon': None,
+    'original_name': 'Current',
+    'platform': 'homewizard',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'HWE-P1_5c2fafabcdef_active_current_a',
+    'unit_of_measurement': <UnitOfElectricCurrent.AMPERE: 'A'>,
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_current:state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'current',
+      'friendly_name': 'Device Current',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricCurrent.AMPERE: 'A'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.device_current',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '1.5',
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_energy_export:device-registry]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+      tuple(
+        'mac',
+        '5c:2f:af:ab:cd:ef',
+      ),
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'homewizard',
+        '5c2fafabcdef',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'HomeWizard',
+    'model': 'Plug-In Battery',
+    'model_id': 'HWE-BAT',
+    'name': 'Device',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '1.00',
+    'via_device_id': None,
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_energy_export:entity-registry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.device_energy_export',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy export',
+    'platform': 'homewizard',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'total_energy_export_kwh',
+    'unique_id': 'HWE-P1_5c2fafabcdef_total_power_export_kwh',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_energy_export:state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Device Energy export',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.device_energy_export',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '123.456',
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_energy_import:device-registry]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+      tuple(
+        'mac',
+        '5c:2f:af:ab:cd:ef',
+      ),
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'homewizard',
+        '5c2fafabcdef',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'HomeWizard',
+    'model': 'Plug-In Battery',
+    'model_id': 'HWE-BAT',
+    'name': 'Device',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '1.00',
+    'via_device_id': None,
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_energy_import:entity-registry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.device_energy_import',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy import',
+    'platform': 'homewizard',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'total_energy_import_kwh',
+    'unique_id': 'HWE-P1_5c2fafabcdef_total_power_import_kwh',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_energy_import:state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Device Energy import',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.device_energy_import',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '123.456',
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_frequency:device-registry]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+      tuple(
+        'mac',
+        '5c:2f:af:ab:cd:ef',
+      ),
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'homewizard',
+        '5c2fafabcdef',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'HomeWizard',
+    'model': 'Plug-In Battery',
+    'model_id': 'HWE-BAT',
+    'name': 'Device',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '1.00',
+    'via_device_id': None,
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_frequency:entity-registry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.device_frequency',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.FREQUENCY: 'frequency'>,
+    'original_icon': None,
+    'original_name': 'Frequency',
+    'platform': 'homewizard',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'HWE-P1_5c2fafabcdef_active_frequency_hz',
+    'unit_of_measurement': <UnitOfFrequency.HERTZ: 'Hz'>,
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_frequency:state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'frequency',
+      'friendly_name': 'Device Frequency',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfFrequency.HERTZ: 'Hz'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.device_frequency',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '50.0',
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_power:device-registry]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+      tuple(
+        'mac',
+        '5c:2f:af:ab:cd:ef',
+      ),
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'homewizard',
+        '5c2fafabcdef',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'HomeWizard',
+    'model': 'Plug-In Battery',
+    'model_id': 'HWE-BAT',
+    'name': 'Device',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '1.00',
+    'via_device_id': None,
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_power:entity-registry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.device_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 0,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'homewizard',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'HWE-P1_5c2fafabcdef_active_power_w',
+    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_power:state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Device Power',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.device_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '123.0',
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_state_of_charge:device-registry]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+      tuple(
+        'mac',
+        '5c:2f:af:ab:cd:ef',
+      ),
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'homewizard',
+        '5c2fafabcdef',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'HomeWizard',
+    'model': 'Plug-In Battery',
+    'model_id': 'HWE-BAT',
+    'name': 'Device',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '1.00',
+    'via_device_id': None,
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_state_of_charge:entity-registry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.device_state_of_charge',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 0,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
+    'original_icon': None,
+    'original_name': 'State of charge',
+    'platform': 'homewizard',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'state_of_charge_pct',
+    'unique_id': 'HWE-P1_5c2fafabcdef_state_of_charge_pct',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_state_of_charge:state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'battery',
+      'friendly_name': 'Device State of charge',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.device_state_of_charge',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '50.0',
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_uptime:device-registry]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+      tuple(
+        'mac',
+        '5c:2f:af:ab:cd:ef',
+      ),
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'homewizard',
+        '5c2fafabcdef',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'HomeWizard',
+    'model': 'Plug-In Battery',
+    'model_id': 'HWE-BAT',
+    'name': 'Device',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '1.00',
+    'via_device_id': None,
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_uptime:entity-registry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.device_uptime',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Uptime',
+    'platform': 'homewizard',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'uptime',
+    'unique_id': 'HWE-P1_5c2fafabcdef_uptime',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_uptime:state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'timestamp',
+      'friendly_name': 'Device Uptime',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.device_uptime',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2025-01-28T21:39:04+00:00',
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_voltage:device-registry]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+      tuple(
+        'mac',
+        '5c:2f:af:ab:cd:ef',
+      ),
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'homewizard',
+        '5c2fafabcdef',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'HomeWizard',
+    'model': 'Plug-In Battery',
+    'model_id': 'HWE-BAT',
+    'name': 'Device',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '1.00',
+    'via_device_id': None,
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_voltage:entity-registry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.device_voltage',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Voltage',
+    'platform': 'homewizard',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'HWE-P1_5c2fafabcdef_active_voltage_v',
+    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_voltage:state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'friendly_name': 'Device Voltage',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.device_voltage',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '230.0',
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_wi_fi_rssi:device-registry]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+      tuple(
+        'mac',
+        '5c:2f:af:ab:cd:ef',
+      ),
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'homewizard',
+        '5c2fafabcdef',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'HomeWizard',
+    'model': 'Plug-In Battery',
+    'model_id': 'HWE-BAT',
+    'name': 'Device',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '1.00',
+    'via_device_id': None,
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_wi_fi_rssi:entity-registry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.device_wi_fi_rssi',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Wi-Fi RSSI',
+    'platform': 'homewizard',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'wifi_rssi',
+    'unique_id': 'HWE-P1_5c2fafabcdef_wifi_rssi',
+    'unit_of_measurement': 'dB',
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_wi_fi_rssi:state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Device Wi-Fi RSSI',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'dB',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.device_wi_fi_rssi',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '-77',
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_wi_fi_ssid:device-registry]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+      tuple(
+        'mac',
+        '5c:2f:af:ab:cd:ef',
+      ),
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'homewizard',
+        '5c2fafabcdef',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'HomeWizard',
+    'model': 'Plug-In Battery',
+    'model_id': 'HWE-BAT',
+    'name': 'Device',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '1.00',
+    'via_device_id': None,
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_wi_fi_ssid:entity-registry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.device_wi_fi_ssid',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Wi-Fi SSID',
+    'platform': 'homewizard',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'wifi_ssid',
+    'unique_id': 'HWE-P1_5c2fafabcdef_wifi_ssid',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensors[HWE-BAT-entity_ids10][sensor.device_wi_fi_ssid:state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Device Wi-Fi SSID',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.device_wi_fi_ssid',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'simulating v1 support',
+  })
+# ---
 # name: test_sensors[HWE-KWH1-entity_ids7][sensor.device_apparent_power:device-registry]
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -44,6 +1018,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -90,6 +1065,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -131,6 +1107,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -177,6 +1154,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -218,6 +1196,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -264,6 +1243,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -305,6 +1285,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -351,6 +1332,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -392,6 +1374,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -438,6 +1421,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -479,6 +1463,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -528,6 +1513,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -569,6 +1555,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -615,6 +1602,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -656,6 +1644,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -702,6 +1691,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -743,6 +1733,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -789,6 +1780,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -828,6 +1820,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -871,6 +1864,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -912,6 +1906,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -957,6 +1952,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -998,6 +1994,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1044,6 +2041,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -1085,6 +2083,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1131,6 +2130,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -1172,6 +2172,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1218,6 +2219,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -1259,6 +2261,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1305,6 +2308,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -1346,6 +2350,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1392,6 +2397,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -1433,6 +2439,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1479,6 +2486,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -1520,6 +2528,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1566,6 +2575,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -1607,6 +2617,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1653,6 +2664,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -1694,6 +2706,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1740,6 +2753,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -1781,6 +2795,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1827,6 +2842,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -1868,6 +2884,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1914,6 +2931,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -1955,6 +2973,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2004,6 +3023,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -2045,6 +3065,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2091,6 +3112,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -2132,6 +3154,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2178,6 +3201,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -2219,6 +3243,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2265,6 +3290,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -2306,6 +3332,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2355,6 +3382,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -2396,6 +3424,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2445,6 +3474,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -2486,6 +3516,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2535,6 +3566,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -2576,6 +3608,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2622,6 +3655,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -2663,6 +3697,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2709,6 +3744,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -2750,6 +3786,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2796,6 +3833,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -2837,6 +3875,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2883,6 +3922,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -2924,6 +3964,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2970,6 +4011,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -3011,6 +4053,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3057,6 +4100,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -3098,6 +4142,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3144,6 +4189,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -3183,6 +4229,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3226,6 +4273,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -3267,6 +4315,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3312,6 +4361,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -3351,6 +4401,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3396,6 +4447,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -3437,6 +4489,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3483,6 +4536,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -3524,6 +4578,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3570,6 +4625,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -3611,6 +4667,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3657,6 +4714,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -3696,6 +4754,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3739,6 +4798,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -3780,6 +4840,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3826,6 +4887,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -3867,6 +4929,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3913,6 +4976,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -3954,6 +5018,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4000,6 +5065,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -4041,6 +5107,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4087,6 +5154,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -4128,6 +5196,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4174,6 +5243,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -4215,6 +5285,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4261,6 +5332,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -4302,6 +5374,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4348,6 +5421,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -4389,6 +5463,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4435,6 +5510,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -4476,6 +5552,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4522,6 +5599,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -4563,6 +5641,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4609,6 +5688,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -4650,6 +5730,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4696,6 +5777,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -4735,6 +5817,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4778,6 +5861,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -4817,6 +5901,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4862,6 +5947,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -4903,6 +5989,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4952,6 +6039,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -4991,6 +6079,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5034,6 +6123,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -5075,6 +6165,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5124,6 +6215,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -5165,6 +6257,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5214,6 +6307,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -5255,6 +6349,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5304,6 +6399,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -5343,6 +6439,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5386,6 +6483,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -5425,6 +6523,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5468,6 +6567,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -5514,6 +6614,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5564,6 +6665,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -5605,6 +6707,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5651,6 +6754,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -5692,6 +6796,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5738,6 +6843,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -5779,6 +6885,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5825,6 +6932,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -5866,6 +6974,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5912,6 +7021,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -5951,6 +7061,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5994,6 +7105,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -6033,6 +7145,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6076,6 +7189,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -6115,6 +7229,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6158,6 +7273,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -6197,6 +7313,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6240,6 +7357,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -6279,6 +7397,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6322,6 +7441,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -6361,6 +7481,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6404,6 +7525,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -6445,6 +7567,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6490,6 +7613,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -6529,6 +7653,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6572,6 +7697,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -6613,6 +7739,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6658,6 +7785,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -6695,6 +7823,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6741,6 +7870,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -6778,6 +7908,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6824,6 +7955,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -6861,6 +7993,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6906,6 +8039,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -6943,6 +8077,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6989,6 +8124,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -7026,6 +8162,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7072,6 +8209,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -7111,6 +8249,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7156,6 +8295,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -7197,6 +8337,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7243,6 +8384,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -7284,6 +8426,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7330,6 +8473,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -7371,6 +8515,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7417,6 +8562,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -7456,6 +8602,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7499,6 +8646,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -7540,6 +8688,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7586,6 +8735,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -7627,6 +8777,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7673,6 +8824,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -7714,6 +8866,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7760,6 +8913,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -7801,6 +8955,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7847,6 +9002,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -7888,6 +9044,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7934,6 +9091,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -7975,6 +9133,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8021,6 +9180,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -8062,6 +9222,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8108,6 +9269,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -8149,6 +9311,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8195,6 +9358,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -8236,6 +9400,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8282,6 +9447,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -8323,6 +9489,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8369,6 +9536,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -8410,6 +9578,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8456,6 +9625,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -8495,6 +9665,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8538,6 +9709,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -8577,6 +9749,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8622,6 +9795,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -8663,6 +9837,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8712,6 +9887,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -8751,6 +9927,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8794,6 +9971,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -8835,6 +10013,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8884,6 +10063,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -8925,6 +10105,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -8974,6 +10155,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -9015,6 +10197,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9064,6 +10247,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -9103,6 +10287,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9146,6 +10331,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -9185,6 +10371,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9228,6 +10415,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -9274,6 +10462,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9324,6 +10513,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -9365,6 +10555,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9411,6 +10602,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -9452,6 +10644,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9498,6 +10691,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -9539,6 +10733,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9585,6 +10780,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -9626,6 +10822,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9672,6 +10869,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -9711,6 +10909,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9754,6 +10953,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -9793,6 +10993,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9836,6 +11037,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -9875,6 +11077,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -9918,6 +11121,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -9957,6 +11161,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10000,6 +11205,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -10039,6 +11245,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10082,6 +11289,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -10121,6 +11329,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10164,6 +11373,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -10205,6 +11415,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10250,6 +11461,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -10289,6 +11501,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10332,6 +11545,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -10373,6 +11587,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10418,6 +11633,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -10455,6 +11671,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10501,6 +11718,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -10538,6 +11756,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10584,6 +11803,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -10621,6 +11841,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10666,6 +11887,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -10703,6 +11925,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10749,6 +11972,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -10786,6 +12010,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10832,6 +12057,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -10871,6 +12097,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -10916,6 +12143,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -10957,6 +12185,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11003,6 +12232,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -11044,6 +12274,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11090,6 +12321,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -11131,6 +12363,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11177,6 +12410,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -11218,6 +12452,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11264,6 +12499,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -11305,6 +12541,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11351,6 +12588,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -11392,6 +12630,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11438,6 +12677,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -11479,6 +12719,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11525,6 +12766,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -11566,6 +12808,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11612,6 +12855,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -11653,6 +12897,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11699,6 +12944,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -11740,6 +12986,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11786,6 +13033,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -11827,6 +13075,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11873,6 +13122,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -11914,6 +13164,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -11960,6 +13211,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -12001,6 +13253,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12047,6 +13300,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -12088,6 +13342,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12134,6 +13389,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -12173,6 +13429,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12216,6 +13473,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -12257,6 +13515,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12306,6 +13565,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -12345,6 +13605,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12388,6 +13649,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -12429,6 +13691,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12478,6 +13741,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -12519,6 +13783,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12568,6 +13833,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -12609,6 +13875,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12658,6 +13925,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -12699,6 +13967,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12745,6 +14014,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -12786,6 +14056,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12832,6 +14103,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -12873,6 +14145,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -12919,6 +14192,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -12960,6 +14234,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13006,6 +14281,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -13045,6 +14321,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13088,6 +14365,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -13127,6 +14405,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13170,6 +14449,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -13209,6 +14489,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13252,6 +14533,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -13291,6 +14573,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13334,6 +14617,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -13373,6 +14657,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13416,6 +14701,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -13455,6 +14741,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13498,6 +14785,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -13539,6 +14827,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13580,10 +14869,183 @@
     'state': '0.0',
   })
 # ---
+# name: test_sensors[HWE-P1-zero-values-entity_ids1][sensor.device_wi_fi_ssid:device-registry]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+      tuple(
+        'mac',
+        '5c:2f:af:ab:cd:ef',
+      ),
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'homewizard',
+        '5c2fafabcdef',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'HomeWizard',
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
+    'name': 'Device',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '4.19',
+    'via_device_id': None,
+  })
+# ---
+# name: test_sensors[HWE-P1-zero-values-entity_ids1][sensor.device_wi_fi_ssid:entity-registry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.device_wi_fi_ssid',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Wi-Fi SSID',
+    'platform': 'homewizard',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'wifi_ssid',
+    'unique_id': 'HWE-P1_5c2fafabcdef_wifi_ssid',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensors[HWE-P1-zero-values-entity_ids1][sensor.device_wi_fi_ssid:state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Device Wi-Fi SSID',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.device_wi_fi_ssid',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'My Wi-Fi',
+  })
+# ---
+# name: test_sensors[HWE-P1-zero-values-entity_ids1][sensor.device_wi_fi_strength:device-registry]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+      tuple(
+        'mac',
+        '5c:2f:af:ab:cd:ef',
+      ),
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'homewizard',
+        '5c2fafabcdef',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'HomeWizard',
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
+    'name': 'Device',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '4.19',
+    'via_device_id': None,
+  })
+# ---
+# name: test_sensors[HWE-P1-zero-values-entity_ids1][sensor.device_wi_fi_strength:entity-registry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.device_wi_fi_strength',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Wi-Fi strength',
+    'platform': 'homewizard',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'wifi_strength',
+    'unique_id': 'HWE-P1_5c2fafabcdef_wifi_strength',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_sensors[HWE-P1-zero-values-entity_ids1][sensor.device_wi_fi_strength:state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Device Wi-Fi strength',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.device_wi_fi_strength',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '100',
+  })
+# ---
 # name: test_sensors[HWE-SKT-11-entity_ids2][sensor.device_energy_export:device-registry]
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -13625,6 +15087,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13671,6 +15134,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -13712,6 +15176,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13758,6 +15223,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -13799,6 +15265,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13848,6 +15315,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -13889,6 +15357,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -13938,6 +15407,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -13977,6 +15447,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14020,6 +15491,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -14061,6 +15533,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14106,6 +15579,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -14147,6 +15621,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14193,6 +15668,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -14234,6 +15710,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14280,6 +15757,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -14321,6 +15799,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14367,6 +15846,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -14408,6 +15888,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14454,6 +15935,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -14495,6 +15977,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14541,6 +16024,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -14582,6 +16066,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14631,6 +16116,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -14672,6 +16158,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14718,6 +16205,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -14759,6 +16247,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14808,6 +16297,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -14849,6 +16339,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14895,6 +16386,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -14936,6 +16428,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -14982,6 +16475,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -15021,6 +16515,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15064,6 +16559,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -15105,6 +16601,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15150,6 +16647,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -15191,6 +16689,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15237,6 +16736,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -15278,6 +16778,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15323,6 +16824,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -15362,6 +16864,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15405,6 +16908,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -15446,6 +16950,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15491,6 +16996,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -15532,6 +17038,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15578,6 +17085,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -15619,6 +17127,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15665,6 +17174,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -15706,6 +17216,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15752,6 +17263,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -15793,6 +17305,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15839,6 +17352,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -15880,6 +17394,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -15926,6 +17441,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -15967,6 +17483,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16016,6 +17533,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -16057,6 +17575,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16103,6 +17622,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -16144,6 +17664,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16190,6 +17711,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -16231,6 +17753,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16277,6 +17800,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -16316,6 +17840,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16359,6 +17884,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -16400,6 +17926,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16445,6 +17972,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -16486,6 +18014,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16532,6 +18061,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -16573,6 +18103,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16619,6 +18150,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -16660,6 +18192,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16706,6 +18239,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -16747,6 +18281,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16793,6 +18328,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -16834,6 +18370,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16880,6 +18417,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -16921,6 +18459,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -16967,6 +18506,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -17008,6 +18548,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -17054,6 +18595,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -17095,6 +18637,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -17141,6 +18684,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -17182,6 +18726,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -17228,6 +18773,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -17269,6 +18815,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -17315,6 +18862,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -17356,6 +18904,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -17402,6 +18951,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -17443,6 +18993,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -17492,6 +19043,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -17533,6 +19085,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -17579,6 +19132,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -17620,6 +19174,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -17666,6 +19221,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -17707,6 +19263,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -17753,6 +19310,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -17794,6 +19352,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -17843,6 +19402,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -17884,6 +19444,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -17933,6 +19494,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -17974,6 +19536,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18023,6 +19586,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -18064,6 +19628,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18110,6 +19675,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -18151,6 +19717,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18197,6 +19764,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -18238,6 +19806,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18284,6 +19853,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -18325,6 +19895,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18371,6 +19942,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -18412,6 +19984,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18458,6 +20031,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -18499,6 +20073,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18545,6 +20120,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -18586,6 +20162,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18632,6 +20209,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -18671,6 +20249,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -18714,6 +20293,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -18755,6 +20335,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/homewizard/snapshots/test_switch.ambr b/tests/components/homewizard/snapshots/test_switch.ambr
index 8f6af16068d..cd21cb92819 100644
--- a/tests/components/homewizard/snapshots/test_switch.ambr
+++ b/tests/components/homewizard/snapshots/test_switch.ambr
@@ -19,6 +19,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -49,6 +50,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -101,6 +103,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -131,6 +134,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -184,6 +188,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -214,6 +219,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -266,6 +272,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -296,6 +303,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -348,6 +356,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -378,6 +387,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -431,6 +441,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -461,6 +472,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -513,6 +525,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -543,6 +556,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -595,6 +609,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -625,6 +640,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -677,6 +693,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -707,6 +724,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -759,6 +777,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -789,6 +808,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -841,6 +861,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -871,6 +892,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
diff --git a/tests/components/homewizard/test_config_flow.py b/tests/components/homewizard/test_config_flow.py
index b2ae7bd45e0..c39853c3f9a 100644
--- a/tests/components/homewizard/test_config_flow.py
+++ b/tests/components/homewizard/test_config_flow.py
@@ -1,15 +1,20 @@
 """Test the homewizard config flow."""
 
 from ipaddress import ip_address
-from unittest.mock import AsyncMock, MagicMock
+from unittest.mock import AsyncMock, MagicMock, patch
 
-from homewizard_energy.errors import DisabledError, RequestError, UnsupportedError
+from homewizard_energy.errors import (
+    DisabledError,
+    RequestError,
+    UnauthorizedError,
+    UnsupportedError,
+)
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
 from homeassistant import config_entries
 from homeassistant.components.homewizard.const import DOMAIN
-from homeassistant.const import CONF_IP_ADDRESS
+from homeassistant.const import CONF_IP_ADDRESS, CONF_TOKEN
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
@@ -225,10 +230,10 @@ async def test_discovery_missing_data_in_service_info(hass: HomeAssistant) -> No
             type="",
             name="",
             properties={
-                # "api_enabled": "1", --> removed
+                "api_enabled": "1",
                 "path": "/api/v1",
                 "product_name": "P1 meter",
-                "product_type": "HWE-P1",
+                # "product_type": "HWE-P1", --> removed
                 "serial": "5c2fafabcdef",
             },
         ),
@@ -238,32 +243,6 @@ async def test_discovery_missing_data_in_service_info(hass: HomeAssistant) -> No
     assert result["reason"] == "invalid_discovery_parameters"
 
 
-async def test_discovery_invalid_api(hass: HomeAssistant) -> None:
-    """Test discovery detecting invalid_api."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": config_entries.SOURCE_ZEROCONF},
-        data=ZeroconfServiceInfo(
-            ip_address=ip_address("127.0.0.1"),
-            ip_addresses=[ip_address("127.0.0.1")],
-            port=80,
-            hostname="p1meter-ddeeff.local.",
-            type="",
-            name="",
-            properties={
-                "api_enabled": "1",
-                "path": "/api/not_v1",
-                "product_name": "P1 meter",
-                "product_type": "HWE-P1",
-                "serial": "5c2fafabcdef",
-            },
-        ),
-    )
-
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "unsupported_api_version"
-
-
 async def test_dhcp_discovery_updates_entry(
     hass: HomeAssistant,
     mock_homewizardenergy: MagicMock,
@@ -338,6 +317,32 @@ async def test_dhcp_discovery_ignores_unknown(
     assert result.get("reason") == "unknown"
 
 
+async def test_dhcp_discovery_aborts_for_v2_api(
+    hass: HomeAssistant,
+    mock_homewizardenergy: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test DHCP discovery aborts when v2 API is detected.
+
+    DHCP discovery requires authorization which is not yet implemented
+    """
+    mock_homewizardenergy.device.side_effect = UnauthorizedError
+    mock_config_entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_DHCP},
+        data=DhcpServiceInfo(
+            ip="1.0.0.127",
+            hostname="HW-p1meter-aabbcc",
+            macaddress="5c2fafabcdef",
+        ),
+    )
+
+    assert result.get("type") is FlowResultType.ABORT
+    assert result.get("reason") == "unsupported_api_version"
+
+
 async def test_discovery_flow_updates_new_ip(
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,
@@ -455,12 +460,12 @@ async def test_reauth_flow(
     result = await mock_config_entry.start_reauth_flow(hass)
 
     assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "reauth_confirm"
+    assert result["step_id"] == "reauth_enable_api"
 
     result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
 
     assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "reauth_successful"
+    assert result["reason"] == "reauth_enable_api_successful"
 
 
 async def test_reauth_error(
@@ -475,7 +480,7 @@ async def test_reauth_error(
     result = await mock_config_entry.start_reauth_flow(hass)
 
     assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "reauth_confirm"
+    assert result["step_id"] == "reauth_enable_api"
 
     result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
 
@@ -609,3 +614,222 @@ async def test_reconfigure_cannot_connect(
 
     # changed entry
     assert mock_config_entry.data[CONF_IP_ADDRESS] == "1.0.0.127"
+
+
+### TESTS FOR V2 IMPLEMENTATION ###
+
+
+@pytest.mark.usefixtures("mock_setup_entry")
+async def test_manual_flow_works_with_v2_api_support(
+    hass: HomeAssistant,
+    mock_homewizardenergy_v2: MagicMock,
+    mock_setup_entry: AsyncMock,
+) -> None:
+    """Test config flow accepts user configuration and triggers authorization when detected v2 support."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+
+    # Simulate v2 support but not authorized
+    mock_homewizardenergy_v2.device.side_effect = UnauthorizedError
+    mock_homewizardenergy_v2.get_token.side_effect = DisabledError
+
+    with patch(
+        "homeassistant.components.homewizard.config_flow.has_v2_api", return_value=True
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], {CONF_IP_ADDRESS: "2.2.2.2"}
+        )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "authorize"
+
+    # Simulate user authorizing
+    mock_homewizardenergy_v2.device.side_effect = None
+    mock_homewizardenergy_v2.get_token.side_effect = None
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+@pytest.mark.usefixtures("mock_setup_entry")
+async def test_manual_flow_detects_failed_user_authorization(
+    hass: HomeAssistant,
+    mock_homewizardenergy_v2: MagicMock,
+    mock_setup_entry: AsyncMock,
+) -> None:
+    """Test config flow accepts user configuration and detects failed button press by user."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+
+    # Simulate v2 support but not authorized
+    mock_homewizardenergy_v2.device.side_effect = UnauthorizedError
+    mock_homewizardenergy_v2.get_token.side_effect = DisabledError
+
+    with patch(
+        "homeassistant.components.homewizard.config_flow.has_v2_api", return_value=True
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], {CONF_IP_ADDRESS: "2.2.2.2"}
+        )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "authorize"
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "authorize"
+    assert result["errors"] == {"base": "authorization_failed"}
+
+    # Restore normal functionality
+    mock_homewizardenergy_v2.device.side_effect = None
+    mock_homewizardenergy_v2.get_token.side_effect = None
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+@pytest.mark.usefixtures("mock_setup_entry")
+async def test_reauth_flow_updates_token(
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry_v2: MockConfigEntry,
+    mock_homewizardenergy_v2: MagicMock,
+) -> None:
+    """Test reauth flow token is updated."""
+
+    mock_config_entry_v2.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_config_entry_v2.entry_id)
+    await hass.async_block_till_done()
+
+    result = await mock_config_entry_v2.start_reauth_flow(hass)
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reauth_confirm_update_token"
+
+    # Simulate user pressing the button and getting a new token
+    mock_homewizardenergy_v2.get_token.return_value = "cool_new_token"
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reauth_successful"
+
+    # Verify that the token was updated
+    await hass.async_block_till_done()
+    assert (
+        hass.config_entries.async_entries(DOMAIN)[0].data.get(CONF_TOKEN)
+        == "cool_new_token"
+    )
+    assert len(mock_setup_entry.mock_calls) == 2
+
+
+@pytest.mark.usefixtures("mock_setup_entry")
+async def test_reauth_flow_handles_user_not_pressing_button(
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry_v2: MockConfigEntry,
+    mock_homewizardenergy_v2: MagicMock,
+) -> None:
+    """Test reauth flow token is updated."""
+
+    mock_config_entry_v2.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_config_entry_v2.entry_id)
+    await hass.async_block_till_done()
+
+    result = await mock_config_entry_v2.start_reauth_flow(hass)
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reauth_confirm_update_token"
+    assert result["errors"] is None
+
+    # Simulate button not being pressed
+    mock_homewizardenergy_v2.get_token.side_effect = DisabledError
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {"base": "authorization_failed"}
+
+    # Simulate user pressing the button and getting a new token
+    mock_homewizardenergy_v2.get_token.side_effect = None
+    mock_homewizardenergy_v2.get_token.return_value = "cool_new_token"
+
+    # Successful reauth
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reauth_successful"
+
+    # Verify that the token was updated
+    await hass.async_block_till_done()
+    assert (
+        hass.config_entries.async_entries(DOMAIN)[0].data.get(CONF_TOKEN)
+        == "cool_new_token"
+    )
+    assert len(mock_setup_entry.mock_calls) == 2
+
+
+@pytest.mark.usefixtures("mock_setup_entry")
+async def test_discovery_with_v2_api_ask_authorization(
+    hass: HomeAssistant,
+    # mock_setup_entry: AsyncMock,
+    mock_homewizardenergy_v2: MagicMock,
+) -> None:
+    """Test discovery detecting missing discovery info."""
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_ZEROCONF},
+        data=ZeroconfServiceInfo(
+            ip_address=ip_address("127.0.0.1"),
+            ip_addresses=[ip_address("127.0.0.1")],
+            port=443,
+            hostname="p1meter-abcdef.local.",
+            type="",
+            name="",
+            properties={
+                "api_version": "2.0.0",
+                "id": "appliance/p1dongle/5c2fafabcdef",
+                "product_name": "P1 meter",
+                "product_type": "HWE-P1",
+                "serial": "5c2fafabcdef",
+            },
+        ),
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "discovery_confirm"
+
+    mock_homewizardenergy_v2.device.side_effect = UnauthorizedError
+    mock_homewizardenergy_v2.get_token.side_effect = DisabledError
+
+    with patch(
+        "homeassistant.components.homewizard.config_flow.has_v2_api", return_value=True
+    ):
+        result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "authorize"
+
+    mock_homewizardenergy_v2.get_token.side_effect = None
+    mock_homewizardenergy_v2.get_token.return_value = "cool_token"
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["data"][CONF_TOKEN] == "cool_token"
diff --git a/tests/components/homewizard/test_diagnostics.py b/tests/components/homewizard/test_diagnostics.py
index e3d7f4e6da9..c7063d497c3 100644
--- a/tests/components/homewizard/test_diagnostics.py
+++ b/tests/components/homewizard/test_diagnostics.py
@@ -21,6 +21,7 @@ from tests.typing import ClientSessionGenerator
         "SDM630",
         "HWE-KWH1",
         "HWE-KWH3",
+        "HWE-BAT",
     ],
 )
 async def test_diagnostics(
diff --git a/tests/components/homewizard/test_init.py b/tests/components/homewizard/test_init.py
index ed4bad8b2e8..9139ef80d12 100644
--- a/tests/components/homewizard/test_init.py
+++ b/tests/components/homewizard/test_init.py
@@ -2,24 +2,79 @@
 
 from datetime import timedelta
 from unittest.mock import MagicMock
+import weakref
 
 from freezegun.api import FrozenDateTimeFactory
-from homewizard_energy.errors import DisabledError
+from homewizard_energy.errors import DisabledError, UnauthorizedError
 import pytest
 
 from homeassistant.components.homewizard.const import DOMAIN
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntryState
+from homeassistant.const import CONF_IP_ADDRESS, CONF_TOKEN
 from homeassistant.core import HomeAssistant
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
 
-async def test_load_unload(
+async def test_load_unload_v1(
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,
     mock_homewizardenergy: MagicMock,
 ) -> None:
-    """Test loading and unloading of integration."""
+    """Test loading and unloading of integration with v1 config."""
+    mock_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    weak_ref = weakref.ref(mock_config_entry.runtime_data)
+    assert weak_ref() is not None
+
+    assert mock_config_entry.state is ConfigEntryState.LOADED
+    assert len(mock_homewizardenergy.combined.mock_calls) == 1
+
+    await hass.config_entries.async_unload(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert mock_config_entry.state is ConfigEntryState.NOT_LOADED
+    assert weak_ref() is None
+
+
+async def test_load_unload_v2(
+    hass: HomeAssistant,
+    mock_config_entry_v2: MockConfigEntry,
+    mock_homewizardenergy_v2: MagicMock,
+) -> None:
+    """Test loading and unloading of integration with v2 config."""
+    mock_config_entry_v2.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry_v2.entry_id)
+    await hass.async_block_till_done()
+
+    assert mock_config_entry_v2.state is ConfigEntryState.LOADED
+    assert len(mock_homewizardenergy_v2.combined.mock_calls) == 1
+
+    await hass.config_entries.async_unload(mock_config_entry_v2.entry_id)
+    await hass.async_block_till_done()
+
+    assert mock_config_entry_v2.state is ConfigEntryState.NOT_LOADED
+
+
+async def test_load_unload_v2_as_v1(
+    hass: HomeAssistant,
+    mock_homewizardenergy: MagicMock,
+) -> None:
+    """Test loading and unloading of integration with v2 config, but without using it."""
+
+    # Simulate v2 config but as a P1 Meter
+    mock_config_entry = MockConfigEntry(
+        title="Device",
+        domain=DOMAIN,
+        data={
+            CONF_IP_ADDRESS: "127.0.0.1",
+            CONF_TOKEN: "00112233445566778899ABCDEFABCDEF",
+        },
+        unique_id="HWE-P1_5c2fafabcdef",
+    )
+
     mock_config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     await hass.async_block_till_done()
@@ -64,7 +119,7 @@ async def test_load_detect_api_disabled(
     assert len(flows) == 1
 
     flow = flows[0]
-    assert flow.get("step_id") == "reauth_confirm"
+    assert flow.get("step_id") == "reauth_enable_api"
     assert flow.get("handler") == DOMAIN
 
     assert "context" in flow
@@ -72,6 +127,31 @@ async def test_load_detect_api_disabled(
     assert flow["context"].get("entry_id") == mock_config_entry.entry_id
 
 
+async def test_load_detect_invalid_token(
+    hass: HomeAssistant,
+    mock_config_entry_v2: MockConfigEntry,
+    mock_homewizardenergy_v2: MagicMock,
+) -> None:
+    """Test setup detects invalid token."""
+    mock_homewizardenergy_v2.combined.side_effect = UnauthorizedError()
+    mock_config_entry_v2.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry_v2.entry_id)
+    await hass.async_block_till_done()
+
+    assert mock_config_entry_v2.state is ConfigEntryState.SETUP_ERROR
+
+    flows = hass.config_entries.flow.async_progress()
+    assert len(flows) == 1
+
+    flow = flows[0]
+    assert flow.get("step_id") == "reauth_confirm_update_token"
+    assert flow.get("handler") == DOMAIN
+
+    assert "context" in flow
+    assert flow["context"].get("source") == SOURCE_REAUTH
+    assert flow["context"].get("entry_id") == mock_config_entry_v2.entry_id
+
+
 @pytest.mark.usefixtures("mock_homewizardenergy")
 async def test_load_removes_reauth_flow(
     hass: HomeAssistant,
@@ -128,5 +208,5 @@ async def test_disablederror_reloads_integration(
     assert len(flows) == 1
 
     flow = flows[0]
-    assert flow.get("step_id") == "reauth_confirm"
+    assert flow.get("step_id") == "reauth_enable_api"
     assert flow.get("handler") == DOMAIN
diff --git a/tests/components/homewizard/test_number.py b/tests/components/homewizard/test_number.py
index b668043608c..67e51cbafe2 100644
--- a/tests/components/homewizard/test_number.py
+++ b/tests/components/homewizard/test_number.py
@@ -14,7 +14,7 @@ from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
diff --git a/tests/components/homewizard/test_repair.py b/tests/components/homewizard/test_repair.py
new file mode 100644
index 00000000000..763af48b1a2
--- /dev/null
+++ b/tests/components/homewizard/test_repair.py
@@ -0,0 +1,86 @@
+"""Test the homewizard config flow."""
+
+from unittest.mock import MagicMock, patch
+
+from homewizard_energy.errors import DisabledError
+
+from homeassistant.components.homewizard.const import DOMAIN
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import CONF_TOKEN
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.helpers import issue_registry as ir
+from homeassistant.setup import async_setup_component
+
+from tests.common import MockConfigEntry
+from tests.components.repairs import (
+    async_process_repairs_platforms,
+    process_repair_fix_flow,
+    start_repair_fix_flow,
+)
+from tests.typing import ClientSessionGenerator
+
+
+async def test_repair_acquires_token(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_homewizardenergy: MagicMock,
+    mock_homewizardenergy_v2: MagicMock,
+    hass_client: ClientSessionGenerator,
+    issue_registry: ir.IssueRegistry,
+) -> None:
+    """Test repair flow is able to obtain and use token."""
+
+    assert await async_setup_component(hass, "repairs", {})
+    await async_process_repairs_platforms(hass)
+    client = await hass_client()
+
+    mock_config_entry.add_to_hass(hass)
+    hass.config_entries.async_update_entry(
+        mock_config_entry, unique_id="HWE-BAT_5c2fafabcdef"
+    )
+    await hass.async_block_till_done()
+
+    with patch("homeassistant.components.homewizard.has_v2_api", return_value=True):
+        await hass.config_entries.async_setup(mock_config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    assert mock_config_entry.state is ConfigEntryState.LOADED
+
+    # Get active repair flow
+    issue_id = f"migrate_to_v2_api_{mock_config_entry.entry_id}"
+    issue = issue_registry.async_get_issue(DOMAIN, issue_id)
+    assert issue is not None
+
+    assert issue.data.get("entry_id") == mock_config_entry.entry_id
+
+    mock_homewizardenergy_v2.get_token.side_effect = DisabledError
+
+    result = await start_repair_fix_flow(client, DOMAIN, issue_id)
+
+    flow_id = result["flow_id"]
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "confirm"
+
+    result = await process_repair_fix_flow(client, flow_id)
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "authorize"
+
+    # Simulate user not pressing the button
+    result = await process_repair_fix_flow(client, flow_id, json={})
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "authorize"
+    assert result["errors"] == {"base": "authorization_failed"}
+
+    # Simulate user pressing the button and getting a new token
+    mock_homewizardenergy_v2.get_token.side_effect = None
+    mock_homewizardenergy_v2.get_token.return_value = "cool_token"
+    result = await process_repair_fix_flow(client, flow_id, json={})
+
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert mock_config_entry.data[CONF_TOKEN] == "cool_token"
+    assert mock_config_entry.state is ConfigEntryState.LOADED
+
+    assert issue_registry.async_get_issue(DOMAIN, issue_id) is None
diff --git a/tests/components/homewizard/test_sensor.py b/tests/components/homewizard/test_sensor.py
index 128a3de2ebf..fe709570239 100644
--- a/tests/components/homewizard/test_sensor.py
+++ b/tests/components/homewizard/test_sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.homewizard.const import UPDATE_INTERVAL
 from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
@@ -19,6 +19,7 @@ pytestmark = [
 ]
 
 
+@pytest.mark.freeze_time("2025-01-28 21:45:00")
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
 @pytest.mark.parametrize(
     ("device_fixture", "entity_ids"),
@@ -107,6 +108,8 @@ pytestmark = [
                 "sensor.device_voltage_swells_detected_phase_2",
                 "sensor.device_voltage_swells_detected_phase_3",
                 "sensor.device_water_usage",
+                "sensor.device_wi_fi_ssid",
+                "sensor.device_wi_fi_strength",
             ],
         ),
         (
@@ -291,6 +294,22 @@ pytestmark = [
                 "sensor.water_meter_water",
             ],
         ),
+        (
+            "HWE-BAT",
+            [
+                "sensor.device_battery_cycles",
+                "sensor.device_current",
+                "sensor.device_energy_export",
+                "sensor.device_energy_import",
+                "sensor.device_frequency",
+                "sensor.device_power",
+                "sensor.device_state_of_charge",
+                "sensor.device_uptime",
+                "sensor.device_voltage",
+                "sensor.device_wi_fi_rssi",
+                "sensor.device_wi_fi_ssid",
+            ],
+        ),
     ],
 )
 async def test_sensors(
@@ -431,6 +450,16 @@ async def test_sensors(
                 "sensor.device_wi_fi_strength",
             ],
         ),
+        (
+            "HWE-BAT",
+            [
+                "sensor.device_current",
+                "sensor.device_frequency",
+                "sensor.device_uptime",
+                "sensor.device_voltage",
+                "sensor.device_wi_fi_rssi",
+            ],
+        ),
     ],
 )
 async def test_disabled_by_default_sensors(
@@ -492,6 +521,7 @@ async def test_external_sensors_unreachable(
                 "sensor.device_apparent_power_phase_3",
                 "sensor.device_apparent_power",
                 "sensor.device_average_demand",
+                "sensor.device_battery_cycles",
                 "sensor.device_current_phase_1",
                 "sensor.device_current_phase_2",
                 "sensor.device_current_phase_3",
@@ -521,8 +551,10 @@ async def test_external_sensors_unreachable(
                 "sensor.device_reactive_power",
                 "sensor.device_smart_meter_identifier",
                 "sensor.device_smart_meter_model",
+                "sensor.device_state_of_charge",
                 "sensor.device_tariff",
                 "sensor.device_total_water_usage",
+                "sensor.device_uptime",
                 "sensor.device_voltage_phase_1",
                 "sensor.device_voltage_phase_2",
                 "sensor.device_voltage_phase_3",
@@ -534,6 +566,7 @@ async def test_external_sensors_unreachable(
                 "sensor.device_voltage_swells_detected_phase_3",
                 "sensor.device_voltage",
                 "sensor.device_water_usage",
+                "sensor.device_wi_fi_rssi",
             ],
         ),
         (
@@ -543,6 +576,7 @@ async def test_external_sensors_unreachable(
                 "sensor.device_apparent_power_phase_2",
                 "sensor.device_apparent_power_phase_3",
                 "sensor.device_average_demand",
+                "sensor.device_battery_cycles",
                 "sensor.device_current_phase_1",
                 "sensor.device_current_phase_2",
                 "sensor.device_current_phase_3",
@@ -568,8 +602,10 @@ async def test_external_sensors_unreachable(
                 "sensor.device_reactive_power_phase_3",
                 "sensor.device_smart_meter_identifier",
                 "sensor.device_smart_meter_model",
+                "sensor.device_state_of_charge",
                 "sensor.device_tariff",
                 "sensor.device_total_water_usage",
+                "sensor.device_uptime",
                 "sensor.device_voltage_phase_1",
                 "sensor.device_voltage_phase_2",
                 "sensor.device_voltage_phase_3",
@@ -580,6 +616,7 @@ async def test_external_sensors_unreachable(
                 "sensor.device_voltage_swells_detected_phase_2",
                 "sensor.device_voltage_swells_detected_phase_3",
                 "sensor.device_water_usage",
+                "sensor.device_wi_fi_rssi",
             ],
         ),
         (
@@ -590,6 +627,7 @@ async def test_external_sensors_unreachable(
                 "sensor.device_apparent_power_phase_3",
                 "sensor.device_apparent_power",
                 "sensor.device_average_demand",
+                "sensor.device_battery_cycles",
                 "sensor.device_current_phase_1",
                 "sensor.device_current_phase_2",
                 "sensor.device_current_phase_3",
@@ -623,7 +661,9 @@ async def test_external_sensors_unreachable(
                 "sensor.device_reactive_power",
                 "sensor.device_smart_meter_identifier",
                 "sensor.device_smart_meter_model",
+                "sensor.device_state_of_charge",
                 "sensor.device_tariff",
+                "sensor.device_uptime",
                 "sensor.device_voltage_phase_1",
                 "sensor.device_voltage_phase_2",
                 "sensor.device_voltage_phase_3",
@@ -634,6 +674,7 @@ async def test_external_sensors_unreachable(
                 "sensor.device_voltage_swells_detected_phase_2",
                 "sensor.device_voltage_swells_detected_phase_3",
                 "sensor.device_voltage",
+                "sensor.device_wi_fi_rssi",
             ],
         ),
         (
@@ -644,6 +685,7 @@ async def test_external_sensors_unreachable(
                 "sensor.device_apparent_power_phase_3",
                 "sensor.device_average_demand",
                 "sensor.device_average_demand",
+                "sensor.device_battery_cycles",
                 "sensor.device_current_phase_1",
                 "sensor.device_current_phase_2",
                 "sensor.device_current_phase_3",
@@ -670,8 +712,10 @@ async def test_external_sensors_unreachable(
                 "sensor.device_reactive_power_phase_3",
                 "sensor.device_smart_meter_identifier",
                 "sensor.device_smart_meter_model",
+                "sensor.device_state_of_charge",
                 "sensor.device_tariff",
                 "sensor.device_total_water_usage",
+                "sensor.device_uptime",
                 "sensor.device_voltage_phase_1",
                 "sensor.device_voltage_phase_2",
                 "sensor.device_voltage_phase_3",
@@ -682,12 +726,14 @@ async def test_external_sensors_unreachable(
                 "sensor.device_voltage_swells_detected_phase_2",
                 "sensor.device_voltage_swells_detected_phase_3",
                 "sensor.device_water_usage",
+                "sensor.device_wi_fi_rssi",
             ],
         ),
         (
             "SDM630",
             [
                 "sensor.device_average_demand",
+                "sensor.device_battery_cycles",
                 "sensor.device_current_phase_1",
                 "sensor.device_current_phase_2",
                 "sensor.device_current_phase_3",
@@ -706,8 +752,10 @@ async def test_external_sensors_unreachable(
                 "sensor.device_power_failures_detected",
                 "sensor.device_smart_meter_identifier",
                 "sensor.device_smart_meter_model",
+                "sensor.device_state_of_charge",
                 "sensor.device_tariff",
                 "sensor.device_total_water_usage",
+                "sensor.device_uptime",
                 "sensor.device_voltage_phase_1",
                 "sensor.device_voltage_phase_2",
                 "sensor.device_voltage_phase_3",
@@ -719,6 +767,7 @@ async def test_external_sensors_unreachable(
                 "sensor.device_voltage_swells_detected_phase_3",
                 "sensor.device_voltage",
                 "sensor.device_water_usage",
+                "sensor.device_wi_fi_rssi",
             ],
         ),
         (
@@ -729,6 +778,7 @@ async def test_external_sensors_unreachable(
                 "sensor.device_apparent_power_phase_3",
                 "sensor.device_average_demand",
                 "sensor.device_average_demand",
+                "sensor.device_battery_cycles",
                 "sensor.device_current_phase_1",
                 "sensor.device_current_phase_2",
                 "sensor.device_current_phase_3",
@@ -755,8 +805,10 @@ async def test_external_sensors_unreachable(
                 "sensor.device_reactive_power_phase_3",
                 "sensor.device_smart_meter_identifier",
                 "sensor.device_smart_meter_model",
+                "sensor.device_state_of_charge",
                 "sensor.device_tariff",
                 "sensor.device_total_water_usage",
+                "sensor.device_uptime",
                 "sensor.device_voltage_phase_1",
                 "sensor.device_voltage_phase_2",
                 "sensor.device_voltage_phase_3",
@@ -767,12 +819,14 @@ async def test_external_sensors_unreachable(
                 "sensor.device_voltage_swells_detected_phase_2",
                 "sensor.device_voltage_swells_detected_phase_3",
                 "sensor.device_water_usage",
+                "sensor.device_wi_fi_rssi",
             ],
         ),
         (
             "HWE-KWH3",
             [
                 "sensor.device_average_demand",
+                "sensor.device_battery_cycles",
                 "sensor.device_current_phase_1",
                 "sensor.device_current_phase_2",
                 "sensor.device_current_phase_3",
@@ -791,8 +845,10 @@ async def test_external_sensors_unreachable(
                 "sensor.device_power_failures_detected",
                 "sensor.device_smart_meter_identifier",
                 "sensor.device_smart_meter_model",
+                "sensor.device_state_of_charge",
                 "sensor.device_tariff",
                 "sensor.device_total_water_usage",
+                "sensor.device_uptime",
                 "sensor.device_voltage_phase_1",
                 "sensor.device_voltage_phase_2",
                 "sensor.device_voltage_phase_3",
@@ -804,6 +860,56 @@ async def test_external_sensors_unreachable(
                 "sensor.device_voltage_swells_detected_phase_3",
                 "sensor.device_voltage",
                 "sensor.device_water_usage",
+                "sensor.device_wi_fi_rssi",
+            ],
+        ),
+        (
+            "HWE-BAT",
+            [
+                "sensor.device_apparent_power_phase_1",
+                "sensor.device_apparent_power_phase_2",
+                "sensor.device_apparent_power_phase_3",
+                "sensor.device_apparent_power",
+                "sensor.device_average_demand",
+                "sensor.device_current_phase_1",
+                "sensor.device_current_phase_2",
+                "sensor.device_current_phase_3",
+                "sensor.device_dsmr_version",
+                "sensor.device_energy_export_tariff_1",
+                "sensor.device_energy_export_tariff_2",
+                "sensor.device_energy_export_tariff_4",
+                "sensor.device_energy_import_tariff_1",
+                "sensor.device_energy_import_tariff_2",
+                "sensor.device_energy_import_tariff_3",
+                "sensor.device_energy_import_tariff_4",
+                "sensor.device_long_power_failures_detected",
+                "sensor.device_peak_demand_current_month",
+                "sensor.device_power_factor_phase_1",
+                "sensor.device_power_factor_phase_2",
+                "sensor.device_power_factor_phase_3",
+                "sensor.device_power_factor",
+                "sensor.device_power_failures_detected",
+                "sensor.device_power_phase_1",
+                "sensor.device_power_phase_3",
+                "sensor.device_reactive_power_phase_1",
+                "sensor.device_reactive_power_phase_2",
+                "sensor.device_reactive_power_phase_3",
+                "sensor.device_reactive_power",
+                "sensor.device_smart_meter_identifier",
+                "sensor.device_smart_meter_model",
+                "sensor.device_tariff",
+                "sensor.device_total_water_usage",
+                "sensor.device_voltage_phase_1",
+                "sensor.device_voltage_phase_2",
+                "sensor.device_voltage_phase_3",
+                "sensor.device_voltage_sags_detected_phase_1",
+                "sensor.device_voltage_sags_detected_phase_2",
+                "sensor.device_voltage_sags_detected_phase_3",
+                "sensor.device_voltage_swells_detected_phase_1",
+                "sensor.device_voltage_swells_detected_phase_2",
+                "sensor.device_voltage_swells_detected_phase_3",
+                "sensor.device_water_usage",
+                "sensor.device_wi_fi_strength",
             ],
         ),
     ],
diff --git a/tests/components/homewizard/test_switch.py b/tests/components/homewizard/test_switch.py
index ccf99ee27fa..ae9b7653b6d 100644
--- a/tests/components/homewizard/test_switch.py
+++ b/tests/components/homewizard/test_switch.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
diff --git a/tests/components/html5/test_config_flow.py b/tests/components/html5/test_config_flow.py
index ca0b3da0389..3cde435771e 100644
--- a/tests/components/html5/test_config_flow.py
+++ b/tests/components/html5/test_config_flow.py
@@ -17,7 +17,7 @@ from homeassistant.components.html5.issues import (
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
-import homeassistant.helpers.issue_registry as ir
+from homeassistant.helpers import issue_registry as ir
 
 MOCK_CONF = {
     ATTR_VAPID_EMAIL: "test@example.com",
diff --git a/tests/components/html5/test_init.py b/tests/components/html5/test_init.py
index 290cb381296..840890f18d1 100644
--- a/tests/components/html5/test_init.py
+++ b/tests/components/html5/test_init.py
@@ -1,7 +1,7 @@
 """Test the HTML5 setup."""
 
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.issue_registry as ir
+from homeassistant.helpers import issue_registry as ir
 from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry
diff --git a/tests/components/html5/test_notify.py b/tests/components/html5/test_notify.py
index 0d9388907a9..f602a8f3807 100644
--- a/tests/components/html5/test_notify.py
+++ b/tests/components/html5/test_notify.py
@@ -8,7 +8,7 @@ from unittest.mock import mock_open, patch
 from aiohttp.hdrs import AUTHORIZATION
 from aiohttp.test_utils import TestClient
 
-import homeassistant.components.html5.notify as html5
+from homeassistant.components.html5 import notify as html5
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.setup import async_setup_component
diff --git a/tests/components/hue/test_light_v2.py b/tests/components/hue/test_light_v2.py
index 2b978ffc33f..3d323d4d31c 100644
--- a/tests/components/hue/test_light_v2.py
+++ b/tests/components/hue/test_light_v2.py
@@ -42,8 +42,8 @@ async def test_lights(
     assert light_1.attributes["min_mireds"] == 153
     assert light_1.attributes["max_mireds"] == 500
     assert light_1.attributes["dynamics"] == "dynamic_palette"
-    assert light_1.attributes["effect_list"] == ["None", "candle", "fire"]
-    assert light_1.attributes["effect"] == "None"
+    assert light_1.attributes["effect_list"] == ["off", "candle", "fire"]
+    assert light_1.attributes["effect"] == "off"
 
     # test light which supports color temperature only
     light_2 = hass.states.get("light.hue_light_with_color_temperature_only")
@@ -57,7 +57,7 @@ async def test_lights(
     assert light_2.attributes["min_mireds"] == 153
     assert light_2.attributes["max_mireds"] == 454
     assert light_2.attributes["dynamics"] == "none"
-    assert light_2.attributes["effect_list"] == ["None", "candle", "sunrise"]
+    assert light_2.attributes["effect_list"] == ["off", "candle", "sunrise"]
 
     # test light which supports color only
     light_3 = hass.states.get("light.hue_light_with_color_only")
@@ -201,7 +201,7 @@ async def test_light_turn_on_service(
     await hass.services.async_call(
         "light",
         "turn_on",
-        {"entity_id": test_light_id, "effect": "None"},
+        {"entity_id": test_light_id, "effect": "off"},
         blocking=True,
     )
     assert len(mock_bridge_v2.mock_requests) == 8
@@ -216,14 +216,14 @@ async def test_light_turn_on_service(
     await hass.async_block_till_done()
     test_light = hass.states.get(test_light_id)
     assert test_light is not None
-    assert test_light.attributes["effect"] == "None"
+    assert test_light.attributes["effect"] == "off"
 
     # test turn on with useless effect
     # it should send a effect in the request if the device has no effect active
     await hass.services.async_call(
         "light",
         "turn_on",
-        {"entity_id": test_light_id, "effect": "None"},
+        {"entity_id": test_light_id, "effect": "off"},
         blocking=True,
     )
     assert len(mock_bridge_v2.mock_requests) == 9
@@ -392,7 +392,7 @@ async def test_light_availability(
     assert test_light is not None
     assert test_light.state == "on"
 
-    # Change availability by modififying the zigbee_connectivity status
+    # Change availability by modifying the zigbee_connectivity status
     for status in ("connectivity_issue", "disconnected", "connected"):
         mock_bridge_v2.api.emit_event(
             "update",
diff --git a/tests/components/humidifier/test_device_trigger.py b/tests/components/humidifier/test_device_trigger.py
index 3bb1f8c2551..e1b2b2bff61 100644
--- a/tests/components/humidifier/test_device_trigger.py
+++ b/tests/components/humidifier/test_device_trigger.py
@@ -24,7 +24,7 @@ from homeassistant.helpers import (
 )
 from homeassistant.helpers.entity_registry import RegistryEntryHider
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/hunterdouglas_powerview/test_config_flow.py b/tests/components/hunterdouglas_powerview/test_config_flow.py
index cf159c23bae..5a48e08e5db 100644
--- a/tests/components/hunterdouglas_powerview/test_config_flow.py
+++ b/tests/components/hunterdouglas_powerview/test_config_flow.py
@@ -9,7 +9,7 @@ from homeassistant.components.hunterdouglas_powerview.const import DOMAIN
 from homeassistant.const import CONF_API_VERSION, CONF_HOST, CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
diff --git a/tests/components/husqvarna_automower/fixtures/mower.json b/tests/components/husqvarna_automower/fixtures/mower.json
index 8ab2f96e42f..06e11ec1252 100644
--- a/tests/components/husqvarna_automower/fixtures/mower.json
+++ b/tests/components/husqvarna_automower/fixtures/mower.json
@@ -176,13 +176,15 @@
         ],
         "statistics": {
           "cuttingBladeUsageTime": 123,
+          "downTime": 3600,
           "numberOfChargingCycles": 1380,
           "numberOfCollisions": 11396,
           "totalChargingTime": 4334400,
           "totalCuttingTime": 4194000,
           "totalDriveDistance": 1780272,
           "totalRunningTime": 4564800,
-          "totalSearchingTime": 370800
+          "totalSearchingTime": 370800,
+          "upTime": 7200
         },
         "stayOutZones": {
           "dirty": false,
diff --git a/tests/components/husqvarna_automower/snapshots/test_binary_sensor.ambr b/tests/components/husqvarna_automower/snapshots/test_binary_sensor.ambr
index 16d9452e847..a077eb134d4 100644
--- a/tests/components/husqvarna_automower/snapshots/test_binary_sensor.ambr
+++ b/tests/components/husqvarna_automower/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -99,6 +101,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -145,6 +148,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -192,6 +196,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -238,6 +243,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/husqvarna_automower/snapshots/test_button.ambr b/tests/components/husqvarna_automower/snapshots/test_button.ambr
index 2ce3aae3065..088850c1e07 100644
--- a/tests/components/husqvarna_automower/snapshots/test_button.ambr
+++ b/tests/components/husqvarna_automower/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/husqvarna_automower/snapshots/test_device_tracker.ambr b/tests/components/husqvarna_automower/snapshots/test_device_tracker.ambr
index 156eee9b8df..e94eea4087c 100644
--- a/tests/components/husqvarna_automower/snapshots/test_device_tracker.ambr
+++ b/tests/components/husqvarna_automower/snapshots/test_device_tracker.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/husqvarna_automower/snapshots/test_diagnostics.ambr b/tests/components/husqvarna_automower/snapshots/test_diagnostics.ambr
index a4dc986c2f9..d5546b0d2af 100644
--- a/tests/components/husqvarna_automower/snapshots/test_diagnostics.ambr
+++ b/tests/components/husqvarna_automower/snapshots/test_diagnostics.ambr
@@ -95,6 +95,7 @@
     }),
     'statistics': dict({
       'cutting_blade_usage_time': 123,
+      'downtime': 3600,
       'number_of_charging_cycles': 1380,
       'number_of_collisions': 11396,
       'total_charging_time': 4334400,
@@ -102,6 +103,7 @@
       'total_drive_distance': 1780272,
       'total_running_time': 4564800,
       'total_searching_time': 370800,
+      'uptime': 7200,
     }),
     'stay_out_zones': dict({
       'dirty': False,
@@ -183,6 +185,8 @@
     'pref_disable_new_entities': False,
     'pref_disable_polling': False,
     'source': 'user',
+    'subentries': list([
+    ]),
     'title': 'Husqvarna Automower of Erika Mustermann',
     'unique_id': '123',
     'version': 1,
diff --git a/tests/components/husqvarna_automower/snapshots/test_init.ambr b/tests/components/husqvarna_automower/snapshots/test_init.ambr
index 036783dd6d0..1428a75d7b4 100644
--- a/tests/components/husqvarna_automower/snapshots/test_init.ambr
+++ b/tests/components/husqvarna_automower/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': 'garden',
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/husqvarna_automower/snapshots/test_number.ambr b/tests/components/husqvarna_automower/snapshots/test_number.ambr
index b0ccce5800a..291aef83dbf 100644
--- a/tests/components/husqvarna_automower/snapshots/test_number.ambr
+++ b/tests/components/husqvarna_automower/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -67,6 +68,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -122,6 +124,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -178,6 +181,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/husqvarna_automower/snapshots/test_sensor.ambr b/tests/components/husqvarna_automower/snapshots/test_sensor.ambr
index d57a829a997..92320de6fdb 100644
--- a/tests/components/husqvarna_automower/snapshots/test_sensor.ambr
+++ b/tests/components/husqvarna_automower/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -104,6 +106,64 @@
     'state': '0.034',
   })
 # ---
+# name: test_sensor_snapshot[sensor.test_mower_1_downtime-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_mower_1_downtime',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 0,
+      }),
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Downtime',
+    'platform': 'husqvarna_automower',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'downtime',
+    'unique_id': 'c7233734-b219-4287-a173-08e3643f89f0_downtime',
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_mower_1_downtime-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'duration',
+      'friendly_name': 'Test Mower 1 Downtime',
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+      'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_mower_1_downtime',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '1.0',
+  })
+# ---
 # name: test_sensor_snapshot[sensor.test_mower_1_error-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -260,6 +320,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -455,6 +516,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -504,6 +566,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -560,6 +623,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -614,6 +678,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -663,6 +728,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -711,6 +777,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -760,6 +827,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -809,6 +877,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -869,6 +938,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -930,6 +1000,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -984,6 +1055,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1038,6 +1110,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1092,6 +1165,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1146,6 +1220,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1191,6 +1266,64 @@
     'state': '103.000',
   })
 # ---
+# name: test_sensor_snapshot[sensor.test_mower_1_uptime-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_mower_1_uptime',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 0,
+      }),
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Uptime',
+    'platform': 'husqvarna_automower',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'uptime',
+    'unique_id': 'c7233734-b219-4287-a173-08e3643f89f0_uptime',
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+  })
+# ---
+# name: test_sensor_snapshot[sensor.test_mower_1_uptime-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'duration',
+      'friendly_name': 'Test Mower 1 Uptime',
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+      'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_mower_1_uptime',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2.0',
+  })
+# ---
 # name: test_sensor_snapshot[sensor.test_mower_1_work_area-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -1205,6 +1338,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1265,6 +1399,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1463,6 +1598,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1666,6 +1802,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1720,6 +1857,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1780,6 +1918,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/husqvarna_automower/snapshots/test_switch.ambr b/tests/components/husqvarna_automower/snapshots/test_switch.ambr
index 8f8f6b367c0..5e01694e924 100644
--- a/tests/components/husqvarna_automower/snapshots/test_switch.ambr
+++ b/tests/components/husqvarna_automower/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -190,6 +194,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +241,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -282,6 +288,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/husqvarna_automower/test_number.py b/tests/components/husqvarna_automower/test_number.py
index 55bf5dda7eb..814846ae1c6 100644
--- a/tests/components/husqvarna_automower/test_number.py
+++ b/tests/components/husqvarna_automower/test_number.py
@@ -79,7 +79,7 @@ async def test_number_workarea_commands(
     freezer.tick(timedelta(seconds=EXECUTION_TIME_DELAY))
     async_fire_time_changed(hass)
     await hass.async_block_till_done()
-    mocked_method.assert_called_once_with(TEST_MOWER_ID, 75, 123456)
+    mocked_method.assert_called_once_with(TEST_MOWER_ID, 123456, cutting_height=75)
     state = hass.states.get(entity_id)
     assert state.state is not None
     assert state.state == "75"
diff --git a/tests/components/husqvarna_automower/test_sensor.py b/tests/components/husqvarna_automower/test_sensor.py
index 08ed5251344..85d20178e73 100644
--- a/tests/components/husqvarna_automower/test_sensor.py
+++ b/tests/components/husqvarna_automower/test_sensor.py
@@ -110,6 +110,18 @@ async def test_work_area_sensor(
     state = hass.states.get("sensor.test_mower_1_work_area")
     assert state.state == "my_lawn"
 
+    # Test EPOS mower, which returns work_area_id = 0, when no
+    # work area is active and has no default work_area_id=0
+    values[TEST_MOWER_ID].mower.work_area_id = 0
+    del values[TEST_MOWER_ID].work_areas[0]
+    del values[TEST_MOWER_ID].work_area_dict[0]
+    mock_automower_client.get_status.return_value = values
+    freezer.tick(SCAN_INTERVAL)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+    state = hass.states.get("sensor.test_mower_1_work_area")
+    assert state.state == "no_work_area_active"
+
 
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
 @pytest.mark.parametrize(
diff --git a/tests/components/husqvarna_automower_ble/snapshots/test_init.ambr b/tests/components/husqvarna_automower_ble/snapshots/test_init.ambr
index 1cc54020195..b7aa14ef0bf 100644
--- a/tests/components/husqvarna_automower_ble/snapshots/test_init.ambr
+++ b/tests/components/husqvarna_automower_ble/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/hydrawise/conftest.py b/tests/components/hydrawise/conftest.py
index 2de7fb1da9a..ad3a97fa6e0 100644
--- a/tests/components/hydrawise/conftest.py
+++ b/tests/components/hydrawise/conftest.py
@@ -63,7 +63,7 @@ def mock_pydrawise(
     controller_water_use_summary: ControllerWaterUseSummary,
 ) -> Generator[AsyncMock]:
     """Mock Hydrawise."""
-    with patch("pydrawise.client.Hydrawise", autospec=True) as mock_pydrawise:
+    with patch("pydrawise.hybrid.HybridClient", autospec=True) as mock_pydrawise:
         user.controllers = [controller]
         controller.sensors = sensors
         mock_pydrawise.return_value.get_user.return_value = user
@@ -76,8 +76,8 @@ def mock_pydrawise(
 
 @pytest.fixture
 def mock_auth() -> Generator[AsyncMock]:
-    """Mock pydrawise Auth."""
-    with patch("pydrawise.auth.Auth", autospec=True) as mock_auth:
+    """Mock pydrawise HybridAuth."""
+    with patch("pydrawise.auth.HybridAuth", autospec=True) as mock_auth:
         yield mock_auth.return_value
 
 
@@ -215,6 +215,7 @@ def mock_config_entry() -> MockConfigEntry:
         data={
             CONF_USERNAME: "asfd@asdf.com",
             CONF_PASSWORD: "__password__",
+            CONF_API_KEY: "abc123",
         },
         unique_id="hydrawise-customerid",
         version=1,
diff --git a/tests/components/hydrawise/snapshots/test_binary_sensor.ambr b/tests/components/hydrawise/snapshots/test_binary_sensor.ambr
index 9886345595d..84e52a7f966 100644
--- a/tests/components/hydrawise/snapshots/test_binary_sensor.ambr
+++ b/tests/components/hydrawise/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -102,6 +104,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/hydrawise/snapshots/test_sensor.ambr b/tests/components/hydrawise/snapshots/test_sensor.ambr
index dadf3c44789..3e475b1eeb1 100644
--- a/tests/components/hydrawise/snapshots/test_sensor.ambr
+++ b/tests/components/hydrawise/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -61,6 +62,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -110,6 +112,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -165,6 +168,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -220,6 +224,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -275,6 +280,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -324,6 +330,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -372,6 +379,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -420,6 +428,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -476,6 +485,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -525,6 +535,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -573,6 +584,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/hydrawise/snapshots/test_switch.ambr b/tests/components/hydrawise/snapshots/test_switch.ambr
index 977bd15f004..9ad37ddbfbf 100644
--- a/tests/components/hydrawise/snapshots/test_switch.ambr
+++ b/tests/components/hydrawise/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -102,6 +104,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/hydrawise/snapshots/test_valve.ambr b/tests/components/hydrawise/snapshots/test_valve.ambr
index cac08893324..197e7796a07 100644
--- a/tests/components/hydrawise/snapshots/test_valve.ambr
+++ b/tests/components/hydrawise/snapshots/test_valve.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -55,6 +56,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/hydrawise/test_config_flow.py b/tests/components/hydrawise/test_config_flow.py
index cf723d885e1..594286b7f01 100644
--- a/tests/components/hydrawise/test_config_flow.py
+++ b/tests/components/hydrawise/test_config_flow.py
@@ -9,7 +9,7 @@ import pytest
 
 from homeassistant import config_entries
 from homeassistant.components.hydrawise.const import DOMAIN
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import CONF_API_KEY, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
@@ -35,7 +35,11 @@ async def test_form(
 
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"],
-        {CONF_USERNAME: "asdf@asdf.com", CONF_PASSWORD: "__password__"},
+        {
+            CONF_USERNAME: "asdf@asdf.com",
+            CONF_PASSWORD: "__password__",
+            CONF_API_KEY: "__api-key__",
+        },
     )
     mock_pydrawise.get_user.return_value = user
     await hass.async_block_till_done()
@@ -45,9 +49,10 @@ async def test_form(
     assert result["data"] == {
         CONF_USERNAME: "asdf@asdf.com",
         CONF_PASSWORD: "__password__",
+        CONF_API_KEY: "__api-key__",
     }
     assert len(mock_setup_entry.mock_calls) == 1
-    mock_auth.token.assert_awaited_once_with()
+    mock_auth.check.assert_awaited_once_with()
     mock_pydrawise.get_user.assert_awaited_once_with(fetch_zones=False)
 
 
@@ -60,7 +65,11 @@ async def test_form_api_error(
     init_result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
-    data = {CONF_USERNAME: "asdf@asdf.com", CONF_PASSWORD: "__password__"}
+    data = {
+        CONF_USERNAME: "asdf@asdf.com",
+        CONF_PASSWORD: "__password__",
+        CONF_API_KEY: "__api-key__",
+    }
     result = await hass.config_entries.flow.async_configure(
         init_result["flow_id"], data
     )
@@ -77,11 +86,18 @@ async def test_form_auth_connect_timeout(
     hass: HomeAssistant, mock_auth: AsyncMock, mock_pydrawise: AsyncMock
 ) -> None:
     """Test we handle connection timeout errors."""
-    mock_auth.token.side_effect = TimeoutError
+    mock_auth.check.side_effect = TimeoutError
     init_result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
+        DOMAIN,
+        context={
+            "source": config_entries.SOURCE_USER,
+        },
     )
-    data = {CONF_USERNAME: "asdf@asdf.com", CONF_PASSWORD: "__password__"}
+    data = {
+        CONF_USERNAME: "asdf@asdf.com",
+        CONF_PASSWORD: "__password__",
+        CONF_API_KEY: "__api-key__",
+    }
     result = await hass.config_entries.flow.async_configure(
         init_result["flow_id"], data
     )
@@ -89,7 +105,7 @@ async def test_form_auth_connect_timeout(
     assert result["type"] is FlowResultType.FORM
     assert result["errors"] == {"base": "timeout_connect"}
 
-    mock_auth.token.reset_mock(side_effect=True)
+    mock_auth.check.reset_mock(side_effect=True)
     result = await hass.config_entries.flow.async_configure(result["flow_id"], data)
     assert result["type"] is FlowResultType.CREATE_ENTRY
 
@@ -102,7 +118,11 @@ async def test_form_client_connect_timeout(
     init_result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
-    data = {CONF_USERNAME: "asdf@asdf.com", CONF_PASSWORD: "__password__"}
+    data = {
+        CONF_USERNAME: "asdf@asdf.com",
+        CONF_PASSWORD: "__password__",
+        CONF_API_KEY: "__api-key__",
+    }
     result = await hass.config_entries.flow.async_configure(
         init_result["flow_id"], data
     )
@@ -120,19 +140,23 @@ async def test_form_not_authorized_error(
     hass: HomeAssistant, mock_auth: AsyncMock, mock_pydrawise: AsyncMock
 ) -> None:
     """Test we handle API errors."""
-    mock_auth.token.side_effect = NotAuthorizedError
+    mock_auth.check.side_effect = NotAuthorizedError
 
     init_result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
-    data = {CONF_USERNAME: "asdf@asdf.com", CONF_PASSWORD: "__password__"}
+    data = {
+        CONF_USERNAME: "asdf@asdf.com",
+        CONF_PASSWORD: "__password__",
+        CONF_API_KEY: "__api-key__",
+    }
     result = await hass.config_entries.flow.async_configure(
         init_result["flow_id"], data
     )
     assert result["type"] is FlowResultType.FORM
     assert result["errors"] == {"base": "invalid_auth"}
 
-    mock_auth.token.reset_mock(side_effect=True)
+    mock_auth.check.reset_mock(side_effect=True)
     result = await hass.config_entries.flow.async_configure(result["flow_id"], data)
     assert result["type"] is FlowResultType.CREATE_ENTRY
 
@@ -150,6 +174,7 @@ async def test_reauth(
         data={
             CONF_USERNAME: "asdf@asdf.com",
             CONF_PASSWORD: "bad-password",
+            CONF_API_KEY: "__api-key__",
         },
         unique_id="hydrawise-12345",
     )
@@ -165,7 +190,11 @@ async def test_reauth(
 
     mock_pydrawise.get_user.return_value = user
     result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_PASSWORD: "__password__"}
+        result["flow_id"],
+        {
+            CONF_PASSWORD: "__password__",
+            CONF_API_KEY: "__api-key__",
+        },
     )
     await hass.async_block_till_done()
 
@@ -183,6 +212,7 @@ async def test_reauth_fails(
         data={
             CONF_USERNAME: "asdf@asdf.com",
             CONF_PASSWORD: "bad-password",
+            CONF_API_KEY: "__api-key__",
         },
         unique_id="hydrawise-12345",
     )
@@ -191,18 +221,26 @@ async def test_reauth_fails(
     result = await mock_config_entry.start_reauth_flow(hass)
     assert result["step_id"] == "reauth_confirm"
 
-    mock_auth.token.side_effect = NotAuthorizedError
+    mock_auth.check.side_effect = NotAuthorizedError
     result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_PASSWORD: "__password__"}
+        result["flow_id"],
+        {
+            CONF_PASSWORD: "__password__",
+            CONF_API_KEY: "__api-key__",
+        },
     )
 
     assert result["type"] is FlowResultType.FORM
     assert result["errors"] == {"base": "invalid_auth"}
 
-    mock_auth.token.reset_mock(side_effect=True)
+    mock_auth.check.reset_mock(side_effect=True)
     mock_pydrawise.get_user.return_value = user
     result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_PASSWORD: "__password__"}
+        result["flow_id"],
+        {
+            CONF_PASSWORD: "__password__",
+            CONF_API_KEY: "__api-key__",
+        },
     )
 
     assert result["type"] is FlowResultType.ABORT
diff --git a/tests/components/idasen_desk/test_config_flow.py b/tests/components/idasen_desk/test_config_flow.py
index baeed6be1ab..15baac1b055 100644
--- a/tests/components/idasen_desk/test_config_flow.py
+++ b/tests/components/idasen_desk/test_config_flow.py
@@ -50,6 +50,49 @@ async def test_user_step_success(hass: HomeAssistant, mock_desk_api: MagicMock)
     assert len(mock_setup_entry.mock_calls) == 1
 
 
+async def test_user_step_replaces_ignored_device(
+    hass: HomeAssistant, mock_desk_api: MagicMock
+) -> None:
+    """Test user step replaces ignored devices."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=IDASEN_DISCOVERY_INFO.address,
+        source=config_entries.SOURCE_IGNORE,
+        data={CONF_ADDRESS: IDASEN_DISCOVERY_INFO.address},
+    )
+    entry.add_to_hass(hass)
+
+    with patch(
+        "homeassistant.components.idasen_desk.config_flow.async_discovered_service_info",
+        return_value=[NOT_IDASEN_DISCOVERY_INFO, IDASEN_DISCOVERY_INFO],
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": config_entries.SOURCE_USER}
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    with patch(
+        "homeassistant.components.idasen_desk.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                CONF_ADDRESS: IDASEN_DISCOVERY_INFO.address,
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == IDASEN_DISCOVERY_INFO.name
+    assert result2["data"] == {
+        CONF_ADDRESS: IDASEN_DISCOVERY_INFO.address,
+    }
+    assert result2["result"].unique_id == IDASEN_DISCOVERY_INFO.address
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
 async def test_user_step_no_devices_found(hass: HomeAssistant) -> None:
     """Test user step with no devices found."""
     with patch(
diff --git a/tests/components/igloohome/conftest.py b/tests/components/igloohome/conftest.py
index d630f5af7cb..6c4eb4904ae 100644
--- a/tests/components/igloohome/conftest.py
+++ b/tests/components/igloohome/conftest.py
@@ -3,7 +3,7 @@
 from collections.abc import Generator
 from unittest.mock import AsyncMock, patch
 
-from igloohome_api import GetDeviceInfoResponse, GetDevicesResponse
+from igloohome_api import GetDeviceInfoResponse, GetDevicesResponse, LinkedDevice
 import pytest
 
 from homeassistant.components.igloohome.const import DOMAIN
@@ -23,6 +23,28 @@ GET_DEVICE_INFO_RESPONSE_LOCK = GetDeviceInfoResponse(
     batteryLevel=100,
 )
 
+GET_DEVICE_INFO_RESPONSE_BRIDGE_LINKED_LOCK = GetDeviceInfoResponse(
+    id="001",
+    type="Bridge",
+    deviceId="EB1X04eeeeee",
+    deviceName="Home Bridge",
+    pairedAt="2024-11-09T12:19:25+00:00",
+    homeId=[],
+    linkedDevices=[LinkedDevice(type="Lock", deviceId="OE1X123cbb11")],
+    batteryLevel=None,
+)
+
+GET_DEVICE_INFO_RESPONSE_BRIDGE_NO_LINKED_DEVICE = GetDeviceInfoResponse(
+    id="001",
+    type="Bridge",
+    deviceId="EB1X04eeeeee",
+    deviceName="Home Bridge",
+    pairedAt="2024-11-09T12:19:25+00:00",
+    homeId=[],
+    linkedDevices=[],
+    batteryLevel=None,
+)
+
 
 @pytest.fixture
 def mock_setup_entry() -> Generator[AsyncMock]:
@@ -66,7 +88,10 @@ def mock_api() -> Generator[AsyncMock]:
         api = api_mock.return_value
         api.get_devices.return_value = GetDevicesResponse(
             nextCursor="",
-            payload=[GET_DEVICE_INFO_RESPONSE_LOCK],
+            payload=[
+                GET_DEVICE_INFO_RESPONSE_LOCK,
+                GET_DEVICE_INFO_RESPONSE_BRIDGE_LINKED_LOCK,
+            ],
         )
         api.get_device_info.return_value = GET_DEVICE_INFO_RESPONSE_LOCK
         yield api
diff --git a/tests/components/igloohome/snapshots/test_lock.ambr b/tests/components/igloohome/snapshots/test_lock.ambr
new file mode 100644
index 00000000000..5d94cf27c6b
--- /dev/null
+++ b/tests/components/igloohome/snapshots/test_lock.ambr
@@ -0,0 +1,50 @@
+# serializer version: 1
+# name: test_lock[lock.front_door-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'lock',
+    'entity_category': None,
+    'entity_id': 'lock.front_door',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'igloohome',
+    'previous_unique_id': None,
+    'supported_features': <LockEntityFeature: 1>,
+    'translation_key': None,
+    'unique_id': 'lock_OE1X123cbb11',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_lock[lock.front_door-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'assumed_state': True,
+      'friendly_name': 'Front Door',
+      'supported_features': <LockEntityFeature: 1>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'lock.front_door',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
diff --git a/tests/components/igloohome/snapshots/test_sensor.ambr b/tests/components/igloohome/snapshots/test_sensor.ambr
index f65baa484a0..9e17343d4fa 100644
--- a/tests/components/igloohome/snapshots/test_sensor.ambr
+++ b/tests/components/igloohome/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/igloohome/test_lock.py b/tests/components/igloohome/test_lock.py
new file mode 100644
index 00000000000..324a4ab231a
--- /dev/null
+++ b/tests/components/igloohome/test_lock.py
@@ -0,0 +1,26 @@
+"""Test lock module for igloohome integration."""
+
+from unittest.mock import patch
+
+from syrupy import SnapshotAssertion
+
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+async def test_lock(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test lock entity created."""
+    with patch("homeassistant.components.igloohome.PLATFORMS", [Platform.LOCK]):
+        await setup_integration(hass, mock_config_entry)
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/igloohome/test_utils.py b/tests/components/igloohome/test_utils.py
new file mode 100644
index 00000000000..a6262076eed
--- /dev/null
+++ b/tests/components/igloohome/test_utils.py
@@ -0,0 +1,31 @@
+"""Test functions in utils module."""
+
+from homeassistant.components.igloohome.utils import get_linked_bridge
+
+from .conftest import (
+    GET_DEVICE_INFO_RESPONSE_BRIDGE_LINKED_LOCK,
+    GET_DEVICE_INFO_RESPONSE_BRIDGE_NO_LINKED_DEVICE,
+    GET_DEVICE_INFO_RESPONSE_LOCK,
+)
+
+
+def test_get_linked_bridge_expect_bridge_id_returned() -> None:
+    """Test that get_linked_bridge returns the bridge ID."""
+    assert (
+        get_linked_bridge(
+            GET_DEVICE_INFO_RESPONSE_LOCK.deviceId,
+            [GET_DEVICE_INFO_RESPONSE_BRIDGE_LINKED_LOCK],
+        )
+        == GET_DEVICE_INFO_RESPONSE_BRIDGE_LINKED_LOCK.deviceId
+    )
+
+
+def test_get_linked_bridge_expect_none_returned() -> None:
+    """Test that get_linked_bridge returns None."""
+    assert (
+        get_linked_bridge(
+            GET_DEVICE_INFO_RESPONSE_LOCK.deviceId,
+            [GET_DEVICE_INFO_RESPONSE_BRIDGE_NO_LINKED_DEVICE],
+        )
+        is None
+    )
diff --git a/tests/components/ign_sismologia/test_geo_location.py b/tests/components/ign_sismologia/test_geo_location.py
index c26eae28086..2f946459bfe 100644
--- a/tests/components/ign_sismologia/test_geo_location.py
+++ b/tests/components/ign_sismologia/test_geo_location.py
@@ -32,7 +32,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import assert_setup_component, async_fire_time_changed
 
diff --git a/tests/components/image/conftest.py b/tests/components/image/conftest.py
index 06ef7db9f49..6879bc793bb 100644
--- a/tests/components/image/conftest.py
+++ b/tests/components/image/conftest.py
@@ -7,7 +7,10 @@ import pytest
 from homeassistant.components import image
 from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -123,7 +126,7 @@ class MockImageConfigEntry:
         self,
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test image platform via config entry."""
         async_add_entities([self._entities])
diff --git a/tests/components/image_processing/test_init.py b/tests/components/image_processing/test_init.py
index 3e7c8f2fb91..6ff6d925d7e 100644
--- a/tests/components/image_processing/test_init.py
+++ b/tests/components/image_processing/test_init.py
@@ -6,8 +6,7 @@ from unittest.mock import PropertyMock, patch
 
 import pytest
 
-from homeassistant.components import http
-import homeassistant.components.image_processing as ip
+from homeassistant.components import http, image_processing as ip
 from homeassistant.const import ATTR_ENTITY_PICTURE
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
diff --git a/tests/components/imap/test_init.py b/tests/components/imap/test_init.py
index b86855bd78f..bdd29f7442b 100644
--- a/tests/components/imap/test_init.py
+++ b/tests/components/imap/test_init.py
@@ -726,9 +726,10 @@ async def test_message_data(
     [
         ("{{ subject }}", "Test subject", None),
         ('{{ "@example.com" in sender }}', True, None),
+        ('{{ "body" in text }}', True, None),
         ("{% bad template }}", None, "Error rendering IMAP custom template"),
     ],
-    ids=["subject_test", "sender_filter", "template_error"],
+    ids=["subject_test", "sender_filter", "body_filter", "template_error"],
 )
 async def test_custom_template(
     hass: HomeAssistant,
diff --git a/tests/components/imgw_pib/snapshots/test_diagnostics.ambr b/tests/components/imgw_pib/snapshots/test_diagnostics.ambr
index a98f60a2b3e..97453930c1e 100644
--- a/tests/components/imgw_pib/snapshots/test_diagnostics.ambr
+++ b/tests/components/imgw_pib/snapshots/test_diagnostics.ambr
@@ -15,6 +15,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'River Name (Station Name)',
       'unique_id': '123',
       'version': 1,
diff --git a/tests/components/imgw_pib/snapshots/test_sensor.ambr b/tests/components/imgw_pib/snapshots/test_sensor.ambr
index c7779f5d850..ccc6e46befa 100644
--- a/tests/components/imgw_pib/snapshots/test_sensor.ambr
+++ b/tests/components/imgw_pib/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -63,6 +64,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/improv_ble/test_config_flow.py b/tests/components/improv_ble/test_config_flow.py
index 4536c64349c..9d883502d28 100644
--- a/tests/components/improv_ble/test_config_flow.py
+++ b/tests/components/improv_ble/test_config_flow.py
@@ -10,6 +10,7 @@ import pytest
 from homeassistant import config_entries
 from homeassistant.components.bluetooth import BluetoothChange
 from homeassistant.components.improv_ble.const import DOMAIN
+from homeassistant.config_entries import SOURCE_IGNORE
 from homeassistant.const import CONF_ADDRESS
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResult, FlowResultType
@@ -21,6 +22,8 @@ from . import (
     PROVISIONED_IMPROV_BLE_DISCOVERY_INFO,
 )
 
+from tests.common import MockConfigEntry
+
 IMPROV_BLE = "homeassistant.components.improv_ble"
 
 
@@ -118,6 +121,32 @@ async def test_async_step_user_takes_precedence_over_discovery(
     assert not hass.config_entries.flow.async_progress(DOMAIN)
 
 
+async def test_user_setup_removes_ignored_entry(hass: HomeAssistant) -> None:
+    """Test the user initiated form can replace an ignored device."""
+    ignored_entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=IMPROV_BLE_DISCOVERY_INFO.address,
+        source=SOURCE_IGNORE,
+    )
+    ignored_entry.add_to_hass(hass)
+    with patch(
+        f"{IMPROV_BLE}.config_flow.bluetooth.async_discovered_service_info",
+        return_value=[NOT_IMPROV_BLE_DISCOVERY_INFO, IMPROV_BLE_DISCOVERY_INFO],
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": config_entries.SOURCE_USER}
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    await _test_common_success_wo_identify(
+        hass, result, IMPROV_BLE_DISCOVERY_INFO.address
+    )
+    # Check the ignored entry is removed
+    assert not hass.config_entries.async_entries(DOMAIN)
+
+
 async def test_bluetooth_step_provisioned_device(hass: HomeAssistant) -> None:
     """Test bluetooth step when device is already provisioned."""
     result = await hass.config_entries.flow.async_init(
diff --git a/tests/components/incomfort/snapshots/test_binary_sensor.ambr b/tests/components/incomfort/snapshots/test_binary_sensor.ambr
index fe0d8edd0f0..518ea230705 100644
--- a/tests/components/incomfort/snapshots/test_binary_sensor.ambr
+++ b/tests/components/incomfort/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -101,6 +103,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -148,6 +151,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -195,6 +199,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -242,6 +247,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -290,6 +296,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -337,6 +344,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -384,6 +392,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -431,6 +440,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -479,6 +489,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -526,6 +537,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -573,6 +585,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -620,6 +633,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -668,6 +682,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -715,6 +730,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -762,6 +778,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -809,6 +826,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -857,6 +875,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -904,6 +923,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/incomfort/snapshots/test_climate.ambr b/tests/components/incomfort/snapshots/test_climate.ambr
index e0e8b9562dd..df3fe3f710b 100644
--- a/tests/components/incomfort/snapshots/test_climate.ambr
+++ b/tests/components/incomfort/snapshots/test_climate.ambr
@@ -12,6 +12,7 @@
       'min_temp': 5.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -78,6 +79,7 @@
       'min_temp': 5.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +146,7 @@
       'min_temp': 5.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -210,6 +213,7 @@
       'min_temp': 5.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/incomfort/snapshots/test_sensor.ambr b/tests/components/incomfort/snapshots/test_sensor.ambr
index a69a64d964e..294a6094164 100644
--- a/tests/components/incomfort/snapshots/test_sensor.ambr
+++ b/tests/components/incomfort/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -111,6 +113,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/incomfort/snapshots/test_water_heater.ambr b/tests/components/incomfort/snapshots/test_water_heater.ambr
index d2cd955a9fc..d3fc2b057fc 100644
--- a/tests/components/incomfort/snapshots/test_water_heater.ambr
+++ b/tests/components/incomfort/snapshots/test_water_heater.ambr
@@ -9,6 +9,7 @@
       'min_temp': 30.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/incomfort/test_init.py b/tests/components/incomfort/test_init.py
index a9b3a8e4e3a..92ce0afa448 100644
--- a/tests/components/incomfort/test_init.py
+++ b/tests/components/incomfort/test_init.py
@@ -1,6 +1,7 @@
 """Tests for Intergas InComfort integration."""
 
 from datetime import timedelta
+from typing import Any
 from unittest.mock import AsyncMock, MagicMock, patch
 
 from aiohttp import ClientResponseError, RequestInfo
@@ -8,13 +9,17 @@ from freezegun.api import FrozenDateTimeFactory
 from incomfortclient import InvalidGateway, InvalidHeaterList
 import pytest
 
+from homeassistant.components.incomfort import DOMAIN
 from homeassistant.components.incomfort.coordinator import UPDATE_INTERVAL
 from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.device_registry import DeviceRegistry
 
-from tests.common import async_fire_time_changed
+from .conftest import MOCK_HEATER_STATUS
+
+from tests.common import MockConfigEntry, async_fire_time_changed
 
 
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
@@ -22,13 +27,62 @@ async def test_setup_platforms(
     hass: HomeAssistant,
     mock_incomfort: MagicMock,
     entity_registry: er.EntityRegistry,
-    mock_config_entry: ConfigEntry,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
     """Test the incomfort integration is set up correctly."""
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     assert mock_config_entry.state is ConfigEntryState.LOADED
 
 
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+@pytest.mark.parametrize(
+    "mock_heater_status", [MOCK_HEATER_STATUS | {"serial_no": "c01d00c0ffee"}]
+)
+async def test_stale_devices_cleanup(
+    hass: HomeAssistant,
+    device_registry: DeviceRegistry,
+    mock_incomfort: MagicMock,
+    entity_registry: er.EntityRegistry,
+    mock_config_entry: MockConfigEntry,
+    mock_heater_status: dict[str, Any],
+) -> None:
+    """Test the incomfort integration is cleaning up stale devices."""
+    # Setup an old heater with serial_no c01d00c0ffee
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    assert mock_config_entry.state is ConfigEntryState.LOADED
+    await hass.config_entries.async_unload(mock_config_entry.entry_id)
+    old_entries = device_registry.devices.get_devices_for_config_entry_id(
+        mock_config_entry.entry_id
+    )
+    assert len(old_entries) == 3
+    old_heater = device_registry.async_get_device({(DOMAIN, "c01d00c0ffee")})
+    assert old_heater is not None
+    assert old_heater.serial_number == "c01d00c0ffee"
+    old_climate = device_registry.async_get_device({(DOMAIN, "c01d00c0ffee_1")})
+    assert old_heater is not None
+    old_climate = device_registry.async_get_device({(DOMAIN, "c01d00c0ffee_1")})
+    assert old_climate is not None
+
+    mock_heater_status["serial_no"] = "c0ffeec0ffee"
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    assert mock_config_entry.state is ConfigEntryState.LOADED
+
+    new_entries = device_registry.devices.get_devices_for_config_entry_id(
+        mock_config_entry.entry_id
+    )
+    assert len(new_entries) == 3
+    new_heater = device_registry.async_get_device({(DOMAIN, "c0ffeec0ffee")})
+    assert new_heater is not None
+    assert new_heater.serial_number == "c0ffeec0ffee"
+    new_climate = device_registry.async_get_device({(DOMAIN, "c0ffeec0ffee_1")})
+    assert new_climate is not None
+
+    old_heater = device_registry.async_get_device({(DOMAIN, "c01d00c0ffee")})
+    assert old_heater is None
+    old_climate = device_registry.async_get_device({(DOMAIN, "c01d00c0ffee_1")})
+    assert old_climate is None
+
+
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
 async def test_coordinator_updates(
     hass: HomeAssistant,
diff --git a/tests/components/inkbird/__init__.py b/tests/components/inkbird/__init__.py
index 30ca369672c..01ae0bf8efc 100644
--- a/tests/components/inkbird/__init__.py
+++ b/tests/components/inkbird/__init__.py
@@ -22,6 +22,17 @@ SPS_SERVICE_INFO = BluetoothServiceInfo(
     source="local",
 )
 
+SPS_WITH_CORRUPT_NAME_SERVICE_INFO = BluetoothServiceInfo(
+    name="XXXXcorruptXXXX",
+    address="AA:BB:CC:DD:EE:FF",
+    rssi=-63,
+    service_data={},
+    manufacturer_data={2096: b"\x0f\x12\x00Z\xc7W\x06"},
+    service_uuids=["0000fff0-0000-1000-8000-00805f9b34fb"],
+    source="local",
+)
+
+
 IBBQ_SERVICE_INFO = BluetoothServiceInfo(
     name="iBBQ",
     address="4125DDBA-2774-4851-9889-6AADDD4CAC3D",
diff --git a/tests/components/inkbird/test_config_flow.py b/tests/components/inkbird/test_config_flow.py
index 154132c34fc..796f57da55b 100644
--- a/tests/components/inkbird/test_config_flow.py
+++ b/tests/components/inkbird/test_config_flow.py
@@ -75,6 +75,36 @@ async def test_async_step_user_with_found_devices(hass: HomeAssistant) -> None:
     assert result2["result"].unique_id == "61DE521B-F0BF-9F44-64D4-75BBE1738105"
 
 
+async def test_async_step_user_replace_ignored(hass: HomeAssistant) -> None:
+    """Test setup from service info can replace an ignored entry."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=SPS_SERVICE_INFO.address,
+        data={},
+        source=config_entries.SOURCE_IGNORE,
+    )
+    entry.add_to_hass(hass)
+    with patch(
+        "homeassistant.components.inkbird.config_flow.async_discovered_service_info",
+        return_value=[SPS_SERVICE_INFO],
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_USER},
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    with patch("homeassistant.components.inkbird.async_setup_entry", return_value=True):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input={"address": "61DE521B-F0BF-9F44-64D4-75BBE1738105"},
+        )
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "IBS-TH 8105"
+    assert result2["data"] == {}
+    assert result2["result"].unique_id == "61DE521B-F0BF-9F44-64D4-75BBE1738105"
+
+
 async def test_async_step_user_device_added_between_steps(hass: HomeAssistant) -> None:
     """Test the device gets added via another flow between steps."""
     with patch(
diff --git a/tests/components/inkbird/test_sensor.py b/tests/components/inkbird/test_sensor.py
index 822136b9021..0f3d6497c2b 100644
--- a/tests/components/inkbird/test_sensor.py
+++ b/tests/components/inkbird/test_sensor.py
@@ -1,11 +1,11 @@
 """Test the INKBIRD config flow."""
 
-from homeassistant.components.inkbird.const import DOMAIN
+from homeassistant.components.inkbird.const import CONF_DEVICE_TYPE, DOMAIN
 from homeassistant.components.sensor import ATTR_STATE_CLASS
 from homeassistant.const import ATTR_FRIENDLY_NAME, ATTR_UNIT_OF_MEASUREMENT
 from homeassistant.core import HomeAssistant
 
-from . import SPS_SERVICE_INFO
+from . import SPS_SERVICE_INFO, SPS_WITH_CORRUPT_NAME_SERVICE_INFO
 
 from tests.common import MockConfigEntry
 from tests.components.bluetooth import inject_bluetooth_service_info
@@ -34,5 +34,37 @@ async def test_sensors(hass: HomeAssistant) -> None:
     assert temp_sensor_attribtes[ATTR_UNIT_OF_MEASUREMENT] == "%"
     assert temp_sensor_attribtes[ATTR_STATE_CLASS] == "measurement"
 
+    # Make sure we remember the device type
+    # in case the name is corrupted later
+    assert entry.data[CONF_DEVICE_TYPE] == "IBS-TH"
+    assert await hass.config_entries.async_unload(entry.entry_id)
+    await hass.async_block_till_done()
+
+
+async def test_device_with_corrupt_name(hass: HomeAssistant) -> None:
+    """Test setting up a known device type with a corrupt name."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id="AA:BB:CC:DD:EE:FF",
+        data={CONF_DEVICE_TYPE: "IBS-TH"},
+    )
+    entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert len(hass.states.async_all()) == 0
+    inject_bluetooth_service_info(hass, SPS_WITH_CORRUPT_NAME_SERVICE_INFO)
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 3
+
+    temp_sensor = hass.states.get("sensor.ibs_th_eeff_battery")
+    temp_sensor_attribtes = temp_sensor.attributes
+    assert temp_sensor.state == "87"
+    assert temp_sensor_attribtes[ATTR_FRIENDLY_NAME] == "IBS-TH EEFF Battery"
+    assert temp_sensor_attribtes[ATTR_UNIT_OF_MEASUREMENT] == "%"
+    assert temp_sensor_attribtes[ATTR_STATE_CLASS] == "measurement"
+
+    assert entry.data[CONF_DEVICE_TYPE] == "IBS-TH"
     assert await hass.config_entries.async_unload(entry.entry_id)
     await hass.async_block_till_done()
diff --git a/tests/components/integration/test_sensor.py b/tests/components/integration/test_sensor.py
index 07390cd9571..ba4a6bdf198 100644
--- a/tests/components/integration/test_sensor.py
+++ b/tests/components/integration/test_sensor.py
@@ -28,7 +28,7 @@ from homeassistant.helpers import (
     entity_registry as er,
 )
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/intellifire/snapshots/test_binary_sensor.ambr b/tests/components/intellifire/snapshots/test_binary_sensor.ambr
index 1b85db51d68..afa3c1fa8a9 100644
--- a/tests/components/intellifire/snapshots/test_binary_sensor.ambr
+++ b/tests/components/intellifire/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -102,6 +104,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -198,6 +202,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -246,6 +251,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -294,6 +300,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -341,6 +348,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -389,6 +397,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -437,6 +446,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -485,6 +495,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -533,6 +544,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -581,6 +593,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -629,6 +642,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -676,6 +690,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -724,6 +739,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -771,6 +787,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/intellifire/snapshots/test_climate.ambr b/tests/components/intellifire/snapshots/test_climate.ambr
index 36f719d2264..d0744424cff 100644
--- a/tests/components/intellifire/snapshots/test_climate.ambr
+++ b/tests/components/intellifire/snapshots/test_climate.ambr
@@ -14,6 +14,7 @@
       'target_temp_step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/intellifire/snapshots/test_sensor.ambr b/tests/components/intellifire/snapshots/test_sensor.ambr
index d749da216ac..548c8d5a8aa 100644
--- a/tests/components/intellifire/snapshots/test_sensor.ambr
+++ b/tests/components/intellifire/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -101,6 +103,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -200,6 +204,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -248,6 +253,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -297,6 +303,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -349,6 +356,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -401,6 +409,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -450,6 +459,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/intent/test_temperature.py b/tests/components/intent/test_temperature.py
new file mode 100644
index 00000000000..622e55fe24a
--- /dev/null
+++ b/tests/components/intent/test_temperature.py
@@ -0,0 +1,609 @@
+"""Test temperature intents."""
+
+from collections.abc import Generator
+from typing import Any
+
+import pytest
+
+from homeassistant.components import conversation
+from homeassistant.components.climate import (
+    ATTR_TEMPERATURE,
+    DOMAIN as CLIMATE_DOMAIN,
+    ClimateEntity,
+    ClimateEntityFeature,
+    HVACMode,
+)
+from homeassistant.components.homeassistant.exposed_entities import async_expose_entity
+from homeassistant.components.sensor import SensorDeviceClass
+from homeassistant.config_entries import ConfigEntry, ConfigFlow
+from homeassistant.const import ATTR_DEVICE_CLASS, Platform, UnitOfTemperature
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import (
+    area_registry as ar,
+    entity_registry as er,
+    floor_registry as fr,
+    intent,
+)
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.setup import async_setup_component
+
+from tests.common import (
+    MockConfigEntry,
+    MockModule,
+    MockPlatform,
+    mock_config_flow,
+    mock_integration,
+    mock_platform,
+)
+
+TEST_DOMAIN = "test"
+
+
+class MockFlow(ConfigFlow):
+    """Test flow."""
+
+
+@pytest.fixture(autouse=True)
+def config_flow_fixture(hass: HomeAssistant) -> Generator[None]:
+    """Mock config flow."""
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
+
+    with mock_config_flow(TEST_DOMAIN, MockFlow):
+        yield
+
+
+@pytest.fixture(autouse=True)
+def mock_setup_integration(hass: HomeAssistant) -> None:
+    """Fixture to set up a mock integration."""
+
+    async def async_setup_entry_init(
+        hass: HomeAssistant, config_entry: ConfigEntry
+    ) -> bool:
+        """Set up test config entry."""
+        await hass.config_entries.async_forward_entry_setups(
+            config_entry, [CLIMATE_DOMAIN]
+        )
+        return True
+
+    async def async_unload_entry_init(
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+    ) -> bool:
+        await hass.config_entries.async_unload_platforms(config_entry, [Platform.TODO])
+        return True
+
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
+    mock_integration(
+        hass,
+        MockModule(
+            TEST_DOMAIN,
+            async_setup_entry=async_setup_entry_init,
+            async_unload_entry=async_unload_entry_init,
+        ),
+    )
+
+
+async def create_mock_platform(
+    hass: HomeAssistant,
+    entities: list[ClimateEntity],
+) -> MockConfigEntry:
+    """Create a todo platform with the specified entities."""
+
+    async def async_setup_entry_platform(
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        async_add_entities: AddConfigEntryEntitiesCallback,
+    ) -> None:
+        """Set up test event platform via config entry."""
+        async_add_entities(entities)
+
+    mock_platform(
+        hass,
+        f"{TEST_DOMAIN}.{CLIMATE_DOMAIN}",
+        MockPlatform(async_setup_entry=async_setup_entry_platform),
+    )
+
+    config_entry = MockConfigEntry(domain=TEST_DOMAIN)
+    config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    return config_entry
+
+
+class MockClimateEntity(ClimateEntity):
+    """Mock Climate device to use in tests."""
+
+    _attr_temperature_unit = UnitOfTemperature.CELSIUS
+    _attr_hvac_mode = HVACMode.OFF
+    _attr_hvac_modes = [HVACMode.OFF, HVACMode.HEAT]
+    _attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
+
+    async def async_set_temperature(self, **kwargs: Any) -> None:
+        """Set the thermostat temperature."""
+        value = kwargs[ATTR_TEMPERATURE]
+        self._attr_target_temperature = value
+
+
+class MockClimateEntityNoSetTemperature(ClimateEntity):
+    """Mock Climate device to use in tests."""
+
+    _attr_temperature_unit = UnitOfTemperature.CELSIUS
+    _attr_hvac_mode = HVACMode.OFF
+    _attr_hvac_modes = [HVACMode.OFF, HVACMode.HEAT]
+
+
+async def test_get_temperature(
+    hass: HomeAssistant,
+    area_registry: ar.AreaRegistry,
+    entity_registry: er.EntityRegistry,
+    floor_registry: fr.FloorRegistry,
+) -> None:
+    """Test HassClimateGetTemperature intent."""
+    assert await async_setup_component(hass, "homeassistant", {})
+    assert await async_setup_component(hass, "intent", {})
+
+    climate_1 = MockClimateEntity()
+    climate_1._attr_name = "Climate 1"
+    climate_1._attr_unique_id = "1234"
+    climate_1._attr_current_temperature = 10.0
+    entity_registry.async_get_or_create(
+        CLIMATE_DOMAIN, "test", "1234", suggested_object_id="climate_1"
+    )
+
+    climate_2 = MockClimateEntity()
+    climate_2._attr_name = "Climate 2"
+    climate_2._attr_unique_id = "5678"
+    climate_2._attr_current_temperature = 22.0
+    entity_registry.async_get_or_create(
+        CLIMATE_DOMAIN, "test", "5678", suggested_object_id="climate_2"
+    )
+
+    await create_mock_platform(hass, [climate_1, climate_2])
+
+    # Add climate entities to different areas:
+    # climate_1 => living room
+    # climate_2 => bedroom
+    # nothing in bathroom
+    # nothing in office yet
+    # nothing in attic yet
+    living_room_area = area_registry.async_create(name="Living Room")
+    bedroom_area = area_registry.async_create(name="Bedroom")
+    office_area = area_registry.async_create(name="Office")
+    attic_area = area_registry.async_create(name="Attic")
+    bathroom_area = area_registry.async_create(name="Bathroom")
+
+    entity_registry.async_update_entity(
+        climate_1.entity_id, area_id=living_room_area.id
+    )
+    entity_registry.async_update_entity(climate_2.entity_id, area_id=bedroom_area.id)
+
+    # Put areas on different floors:
+    # first floor => living room and office
+    # 2nd floor => bedroom
+    # 3rd floor => attic
+    floor_registry = fr.async_get(hass)
+    first_floor = floor_registry.async_create("First floor")
+    living_room_area = area_registry.async_update(
+        living_room_area.id, floor_id=first_floor.floor_id
+    )
+    office_area = area_registry.async_update(
+        office_area.id, floor_id=first_floor.floor_id
+    )
+
+    second_floor = floor_registry.async_create("Second floor")
+    bedroom_area = area_registry.async_update(
+        bedroom_area.id, floor_id=second_floor.floor_id
+    )
+    bathroom_area = area_registry.async_update(
+        bathroom_area.id, floor_id=second_floor.floor_id
+    )
+
+    third_floor = floor_registry.async_create("Third floor")
+    attic_area = area_registry.async_update(
+        attic_area.id, floor_id=third_floor.floor_id
+    )
+
+    # Add temperature sensors to each area that should *not* be selected
+    for area in (living_room_area, office_area, bedroom_area, attic_area):
+        wrong_temperature_entry = entity_registry.async_get_or_create(
+            "sensor", "test", f"wrong_temperature_{area.id}"
+        )
+        hass.states.async_set(
+            wrong_temperature_entry.entity_id,
+            "10.0",
+            {
+                ATTR_TEMPERATURE: "Temperature",
+                ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE,
+            },
+        )
+        entity_registry.async_update_entity(
+            wrong_temperature_entry.entity_id, area_id=area.id
+        )
+
+    # Create temperature sensor and assign them to the office/attic
+    office_temperature_id = "sensor.office_temperature"
+    attic_temperature_id = "sensor.attic_temperature"
+    hass.states.async_set(
+        office_temperature_id,
+        "15.5",
+        {
+            ATTR_TEMPERATURE: "Temperature",
+            ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE,
+        },
+    )
+    office_area = area_registry.async_update(
+        office_area.id, temperature_entity_id=office_temperature_id
+    )
+
+    hass.states.async_set(
+        attic_temperature_id,
+        "18.1",
+        {
+            ATTR_TEMPERATURE: "Temperature",
+            ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE,
+        },
+    )
+    attic_area = area_registry.async_update(
+        attic_area.id, temperature_entity_id=attic_temperature_id
+    )
+
+    # Multiple climate entities match (error)
+    with pytest.raises(intent.MatchFailedError) as error:
+        await intent.async_handle(
+            hass,
+            "test",
+            intent.INTENT_GET_TEMPERATURE,
+            {},
+            assistant=conversation.DOMAIN,
+        )
+
+    # Exception should contain details of what we tried to match
+    assert isinstance(error.value, intent.MatchFailedError)
+    assert (
+        error.value.result.no_match_reason == intent.MatchFailedReason.MULTIPLE_TARGETS
+    )
+
+    # Select by area (office_temperature)
+    response = await intent.async_handle(
+        hass,
+        "test",
+        intent.INTENT_GET_TEMPERATURE,
+        {"area": {"value": office_area.name}},
+        assistant=conversation.DOMAIN,
+    )
+    assert response.response_type == intent.IntentResponseType.QUERY_ANSWER
+    assert len(response.matched_states) == 1
+    assert response.matched_states[0].entity_id == office_temperature_id
+    state = response.matched_states[0]
+    assert state.state == "15.5"
+
+    # Select by preferred area (attic_temperature)
+    response = await intent.async_handle(
+        hass,
+        "test",
+        intent.INTENT_GET_TEMPERATURE,
+        {"preferred_area_id": {"value": attic_area.id}},
+        assistant=conversation.DOMAIN,
+    )
+    assert response.response_type == intent.IntentResponseType.QUERY_ANSWER
+    assert len(response.matched_states) == 1
+    assert response.matched_states[0].entity_id == attic_temperature_id
+    state = response.matched_states[0]
+    assert state.state == "18.1"
+
+    # Select by area (climate_2)
+    response = await intent.async_handle(
+        hass,
+        "test",
+        intent.INTENT_GET_TEMPERATURE,
+        {"area": {"value": bedroom_area.name}},
+        assistant=conversation.DOMAIN,
+    )
+    assert response.response_type == intent.IntentResponseType.QUERY_ANSWER
+    assert len(response.matched_states) == 1
+    assert response.matched_states[0].entity_id == climate_2.entity_id
+    state = response.matched_states[0]
+    assert state.attributes["current_temperature"] == 22.0
+
+    # Select by name (climate_2)
+    response = await intent.async_handle(
+        hass,
+        "test",
+        intent.INTENT_GET_TEMPERATURE,
+        {"name": {"value": "Climate 2"}},
+        assistant=conversation.DOMAIN,
+    )
+    assert response.response_type == intent.IntentResponseType.QUERY_ANSWER
+    assert len(response.matched_states) == 1
+    assert response.matched_states[0].entity_id == climate_2.entity_id
+    state = response.matched_states[0]
+    assert state.attributes["current_temperature"] == 22.0
+
+    # Check area with no climate entities
+    with pytest.raises(intent.MatchFailedError) as error:
+        response = await intent.async_handle(
+            hass,
+            "test",
+            intent.INTENT_GET_TEMPERATURE,
+            {"area": {"value": bathroom_area.name}},
+            assistant=conversation.DOMAIN,
+        )
+
+    # Exception should contain details of what we tried to match
+    assert isinstance(error.value, intent.MatchFailedError)
+    assert error.value.result.no_match_reason == intent.MatchFailedReason.AREA
+    constraints = error.value.constraints
+    assert constraints.name is None
+    assert constraints.area_name == bathroom_area.name
+    assert constraints.domains and (set(constraints.domains) == {CLIMATE_DOMAIN})
+    assert constraints.device_classes is None
+
+    # Check wrong name
+    with pytest.raises(intent.MatchFailedError) as error:
+        response = await intent.async_handle(
+            hass,
+            "test",
+            intent.INTENT_GET_TEMPERATURE,
+            {"name": {"value": "Does not exist"}},
+        )
+
+    assert isinstance(error.value, intent.MatchFailedError)
+    assert error.value.result.no_match_reason == intent.MatchFailedReason.NAME
+    constraints = error.value.constraints
+    assert constraints.name == "Does not exist"
+    assert constraints.area_name is None
+    assert constraints.domains and (set(constraints.domains) == {CLIMATE_DOMAIN})
+    assert constraints.device_classes is None
+
+    # Check wrong name with area
+    with pytest.raises(intent.MatchFailedError) as error:
+        response = await intent.async_handle(
+            hass,
+            "test",
+            intent.INTENT_GET_TEMPERATURE,
+            {"name": {"value": "Climate 1"}, "area": {"value": bedroom_area.name}},
+        )
+
+    assert isinstance(error.value, intent.MatchFailedError)
+    assert error.value.result.no_match_reason == intent.MatchFailedReason.AREA
+    constraints = error.value.constraints
+    assert constraints.name == "Climate 1"
+    assert constraints.area_name == bedroom_area.name
+    assert constraints.domains and (set(constraints.domains) == {CLIMATE_DOMAIN})
+    assert constraints.device_classes is None
+
+    # Select by floor (climate_1)
+    response = await intent.async_handle(
+        hass,
+        "test",
+        intent.INTENT_GET_TEMPERATURE,
+        {"floor": {"value": first_floor.name}},
+        assistant=conversation.DOMAIN,
+    )
+    assert response.response_type == intent.IntentResponseType.QUERY_ANSWER
+    assert len(response.matched_states) == 1
+    assert response.matched_states[0].entity_id == climate_1.entity_id
+    state = response.matched_states[0]
+    assert state.attributes["current_temperature"] == 10.0
+
+    # Select by preferred area (climate_2)
+    response = await intent.async_handle(
+        hass,
+        "test",
+        intent.INTENT_GET_TEMPERATURE,
+        {"preferred_area_id": {"value": bedroom_area.id}},
+        assistant=conversation.DOMAIN,
+    )
+    assert response.response_type == intent.IntentResponseType.QUERY_ANSWER
+    assert len(response.matched_states) == 1
+    assert response.matched_states[0].entity_id == climate_2.entity_id
+    state = response.matched_states[0]
+    assert state.attributes["current_temperature"] == 22.0
+
+    # Select by preferred floor (climate_1)
+    response = await intent.async_handle(
+        hass,
+        "test",
+        intent.INTENT_GET_TEMPERATURE,
+        {"preferred_floor_id": {"value": first_floor.floor_id}},
+        assistant=conversation.DOMAIN,
+    )
+    assert response.response_type == intent.IntentResponseType.QUERY_ANSWER
+    assert len(response.matched_states) == 1
+    assert response.matched_states[0].entity_id == climate_1.entity_id
+    state = response.matched_states[0]
+    assert state.attributes["current_temperature"] == 10.0
+
+
+async def test_get_temperature_no_entities(
+    hass: HomeAssistant,
+) -> None:
+    """Test HassClimateGetTemperature intent with no climate entities."""
+    assert await async_setup_component(hass, "homeassistant", {})
+    assert await async_setup_component(hass, "intent", {})
+
+    await create_mock_platform(hass, [])
+
+    with pytest.raises(intent.MatchFailedError) as err:
+        await intent.async_handle(
+            hass,
+            "test",
+            intent.INTENT_GET_TEMPERATURE,
+            {},
+            assistant=conversation.DOMAIN,
+        )
+    assert err.value.result.no_match_reason == intent.MatchFailedReason.DOMAIN
+
+
+async def test_not_exposed(
+    hass: HomeAssistant,
+    area_registry: ar.AreaRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test HassClimateGetTemperature intent when entities aren't exposed."""
+    assert await async_setup_component(hass, "homeassistant", {})
+    assert await async_setup_component(hass, "intent", {})
+
+    climate_1 = MockClimateEntity()
+    climate_1._attr_name = "Climate 1"
+    climate_1._attr_unique_id = "1234"
+    climate_1._attr_current_temperature = 10.0
+    entity_registry.async_get_or_create(
+        CLIMATE_DOMAIN, "test", "1234", suggested_object_id="climate_1"
+    )
+
+    climate_2 = MockClimateEntity()
+    climate_2._attr_name = "Climate 2"
+    climate_2._attr_unique_id = "5678"
+    climate_2._attr_current_temperature = 22.0
+    entity_registry.async_get_or_create(
+        CLIMATE_DOMAIN, "test", "5678", suggested_object_id="climate_2"
+    )
+
+    await create_mock_platform(hass, [climate_1, climate_2])
+
+    # Add climate entities to same area
+    living_room_area = area_registry.async_create(name="Living Room")
+    bedroom_area = area_registry.async_create(name="Bedroom")
+    entity_registry.async_update_entity(
+        climate_1.entity_id, area_id=living_room_area.id
+    )
+    entity_registry.async_update_entity(
+        climate_2.entity_id, area_id=living_room_area.id
+    )
+
+    # Should fail with empty name
+    with pytest.raises(intent.InvalidSlotInfo):
+        await intent.async_handle(
+            hass,
+            "test",
+            intent.INTENT_GET_TEMPERATURE,
+            {"name": {"value": ""}},
+            assistant=conversation.DOMAIN,
+        )
+
+    # Should fail with empty area
+    with pytest.raises(intent.InvalidSlotInfo):
+        await intent.async_handle(
+            hass,
+            "test",
+            intent.INTENT_GET_TEMPERATURE,
+            {"area": {"value": ""}},
+            assistant=conversation.DOMAIN,
+        )
+
+    # Expose second, hide first
+    async_expose_entity(hass, conversation.DOMAIN, climate_1.entity_id, False)
+    async_expose_entity(hass, conversation.DOMAIN, climate_2.entity_id, True)
+
+    # Second climate entity is exposed
+    response = await intent.async_handle(
+        hass,
+        "test",
+        intent.INTENT_GET_TEMPERATURE,
+        {},
+        assistant=conversation.DOMAIN,
+    )
+    assert response.response_type == intent.IntentResponseType.QUERY_ANSWER
+    assert len(response.matched_states) == 1
+    assert response.matched_states[0].entity_id == climate_2.entity_id
+
+    # Using the area should work
+    response = await intent.async_handle(
+        hass,
+        "test",
+        intent.INTENT_GET_TEMPERATURE,
+        {"area": {"value": living_room_area.name}},
+        assistant=conversation.DOMAIN,
+    )
+    assert response.response_type == intent.IntentResponseType.QUERY_ANSWER
+    assert len(response.matched_states) == 1
+    assert response.matched_states[0].entity_id == climate_2.entity_id
+
+    # Using the name of the exposed entity should work
+    response = await intent.async_handle(
+        hass,
+        "test",
+        intent.INTENT_GET_TEMPERATURE,
+        {"name": {"value": climate_2.name}},
+        assistant=conversation.DOMAIN,
+    )
+    assert response.response_type == intent.IntentResponseType.QUERY_ANSWER
+    assert len(response.matched_states) == 1
+    assert response.matched_states[0].entity_id == climate_2.entity_id
+
+    # Using the name of the *unexposed* entity should fail
+    with pytest.raises(intent.MatchFailedError) as err:
+        await intent.async_handle(
+            hass,
+            "test",
+            intent.INTENT_GET_TEMPERATURE,
+            {"name": {"value": climate_1.name}},
+            assistant=conversation.DOMAIN,
+        )
+    assert err.value.result.no_match_reason == intent.MatchFailedReason.ASSISTANT
+
+    # Expose first, hide second
+    async_expose_entity(hass, conversation.DOMAIN, climate_1.entity_id, True)
+    async_expose_entity(hass, conversation.DOMAIN, climate_2.entity_id, False)
+
+    # Second climate entity is exposed
+    response = await intent.async_handle(
+        hass,
+        "test",
+        intent.INTENT_GET_TEMPERATURE,
+        {},
+        assistant=conversation.DOMAIN,
+    )
+    assert response.response_type == intent.IntentResponseType.QUERY_ANSWER
+    assert len(response.matched_states) == 1
+    assert response.matched_states[0].entity_id == climate_1.entity_id
+
+    # Wrong area name
+    with pytest.raises(intent.MatchFailedError) as err:
+        await intent.async_handle(
+            hass,
+            "test",
+            intent.INTENT_GET_TEMPERATURE,
+            {"area": {"value": bedroom_area.name}},
+            assistant=conversation.DOMAIN,
+        )
+    assert err.value.result.no_match_reason == intent.MatchFailedReason.AREA
+
+    # Neither are exposed
+    async_expose_entity(hass, conversation.DOMAIN, climate_1.entity_id, False)
+    async_expose_entity(hass, conversation.DOMAIN, climate_2.entity_id, False)
+
+    with pytest.raises(intent.MatchFailedError) as err:
+        await intent.async_handle(
+            hass,
+            "test",
+            intent.INTENT_GET_TEMPERATURE,
+            {},
+            assistant=conversation.DOMAIN,
+        )
+    assert err.value.result.no_match_reason == intent.MatchFailedReason.ASSISTANT
+
+    # Should fail with area
+    with pytest.raises(intent.MatchFailedError) as err:
+        await intent.async_handle(
+            hass,
+            "test",
+            intent.INTENT_GET_TEMPERATURE,
+            {"area": {"value": living_room_area.name}},
+            assistant=conversation.DOMAIN,
+        )
+    assert err.value.result.no_match_reason == intent.MatchFailedReason.ASSISTANT
+
+    # Should fail with both names
+    for name in (climate_1.name, climate_2.name):
+        with pytest.raises(intent.MatchFailedError) as err:
+            await intent.async_handle(
+                hass,
+                "test",
+                intent.INTENT_GET_TEMPERATURE,
+                {"name": {"value": name}},
+                assistant=conversation.DOMAIN,
+            )
+        assert err.value.result.no_match_reason == intent.MatchFailedReason.ASSISTANT
diff --git a/tests/components/iometer/__init__.py b/tests/components/iometer/__init__.py
new file mode 100644
index 00000000000..19fe2124f1f
--- /dev/null
+++ b/tests/components/iometer/__init__.py
@@ -0,0 +1,19 @@
+"""Tests for the IOmeter integration."""
+
+from unittest.mock import patch
+
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+async def setup_platform(
+    hass: HomeAssistant, config_entry: MockConfigEntry, platforms: list[Platform]
+) -> MockConfigEntry:
+    """Fixture for setting up the IOmeter platform."""
+    config_entry.add_to_hass(hass)
+
+    with patch("homeassistant.components.iometer.PLATFORMS", platforms):
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
diff --git a/tests/components/iometer/conftest.py b/tests/components/iometer/conftest.py
new file mode 100644
index 00000000000..f8139c7c64c
--- /dev/null
+++ b/tests/components/iometer/conftest.py
@@ -0,0 +1,58 @@
+"""Common fixtures for the IOmeter tests."""
+
+from collections.abc import Generator
+from unittest.mock import AsyncMock, patch
+
+from iometer import Reading, Status
+import pytest
+
+from homeassistant.components.iometer.const import DOMAIN
+from homeassistant.const import CONF_HOST
+
+from tests.common import MockConfigEntry, load_fixture
+
+
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.iometer.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
+@pytest.fixture
+def mock_iometer_client() -> Generator[AsyncMock]:
+    """Mock a new IOmeter client."""
+    with (
+        patch(
+            "homeassistant.components.iometer.IOmeterClient",
+            autospec=True,
+        ) as mock_client,
+        patch(
+            "homeassistant.components.iometer.config_flow.IOmeterClient",
+            new=mock_client,
+        ),
+    ):
+        client = mock_client.return_value
+        client.host = "10.0.0.2"
+        client.get_current_reading.return_value = Reading.from_json(
+            load_fixture("reading.json", DOMAIN)
+        )
+        client.get_current_status.return_value = Status.from_json(
+            load_fixture("status.json", DOMAIN)
+        )
+        yield client
+
+
+@pytest.fixture
+def mock_config_entry() -> MockConfigEntry:
+    """Mock a IOmeter config entry."""
+    return MockConfigEntry(
+        domain=DOMAIN,
+        title="IOmeter-1ISK0000000000",
+        data={CONF_HOST: "10.0.0.2"},
+        unique_id="658c2b34-2017-45f2-a12b-731235f8bb97",
+        entry_id="01JQ6G5395176MAAWKAAPEZHV6",
+    )
diff --git a/tests/components/iometer/fixtures/reading.json b/tests/components/iometer/fixtures/reading.json
new file mode 100644
index 00000000000..82190c88883
--- /dev/null
+++ b/tests/components/iometer/fixtures/reading.json
@@ -0,0 +1,14 @@
+{
+  "__typename": "iometer.reading.v1",
+  "meter": {
+    "number": "1ISK0000000000",
+    "reading": {
+      "time": "2024-11-11T11:11:11Z",
+      "registers": [
+        { "obis": "01-00:01.08.00*ff", "value": 1234.5, "unit": "Wh" },
+        { "obis": "01-00:02.08.00*ff", "value": 5432.1, "unit": "Wh" },
+        { "obis": "01-00:10.07.00*ff", "value": 100, "unit": "W" }
+      ]
+    }
+  }
+}
diff --git a/tests/components/iometer/fixtures/status.json b/tests/components/iometer/fixtures/status.json
new file mode 100644
index 00000000000..4d3001d8454
--- /dev/null
+++ b/tests/components/iometer/fixtures/status.json
@@ -0,0 +1,19 @@
+{
+  "__typename": "iometer.status.v1",
+  "meter": {
+    "number": "1ISK0000000000"
+  },
+  "device": {
+    "bridge": { "rssi": -30, "version": "build-65" },
+    "id": "658c2b34-2017-45f2-a12b-731235f8bb97",
+    "core": {
+      "connectionStatus": "connected",
+      "rssi": -30,
+      "version": "build-58",
+      "powerStatus": "battery",
+      "batteryLevel": 100,
+      "attachmentStatus": "attached",
+      "pinStatus": "entered"
+    }
+  }
+}
diff --git a/tests/components/iometer/snapshots/test_binary_sensor.ambr b/tests/components/iometer/snapshots/test_binary_sensor.ambr
new file mode 100644
index 00000000000..38aab735a14
--- /dev/null
+++ b/tests/components/iometer/snapshots/test_binary_sensor.ambr
@@ -0,0 +1,97 @@
+# serializer version: 1
+# name: test_binary_sensors[binary_sensor.iometer_1isk0000000000_core_attachment_status-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.iometer_1isk0000000000_core_attachment_status',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.CONNECTIVITY: 'connectivity'>,
+    'original_icon': None,
+    'original_name': 'Core attachment status',
+    'platform': 'iometer',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'attachment_status',
+    'unique_id': '01JQ6G5395176MAAWKAAPEZHV6_attachment_status',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_binary_sensors[binary_sensor.iometer_1isk0000000000_core_attachment_status-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'connectivity',
+      'friendly_name': 'IOmeter-1ISK0000000000 Core attachment status',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.iometer_1isk0000000000_core_attachment_status',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_binary_sensors[binary_sensor.iometer_1isk0000000000_core_bridge_connection_status-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.iometer_1isk0000000000_core_bridge_connection_status',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.CONNECTIVITY: 'connectivity'>,
+    'original_icon': None,
+    'original_name': 'Core/Bridge connection status',
+    'platform': 'iometer',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'connection_status',
+    'unique_id': '01JQ6G5395176MAAWKAAPEZHV6_connection_status',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_binary_sensors[binary_sensor.iometer_1isk0000000000_core_bridge_connection_status-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'connectivity',
+      'friendly_name': 'IOmeter-1ISK0000000000 Core/Bridge connection status',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.iometer_1isk0000000000_core_bridge_connection_status',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
diff --git a/tests/components/iometer/test_binary_sensor.py b/tests/components/iometer/test_binary_sensor.py
new file mode 100644
index 00000000000..e007084567e
--- /dev/null
+++ b/tests/components/iometer/test_binary_sensor.py
@@ -0,0 +1,135 @@
+"""Test the IOmeter binary sensors."""
+
+from datetime import timedelta
+from unittest.mock import AsyncMock
+
+from freezegun.api import FrozenDateTimeFactory
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNKNOWN, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import setup_platform
+
+from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_binary_sensors(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    mock_iometer_client: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test binary sensors."""
+    await setup_platform(hass, mock_config_entry, [Platform.BINARY_SENSOR])
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_connection_status_sensors(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_iometer_client: AsyncMock,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test connection status sensor."""
+    await setup_platform(hass, mock_config_entry, [Platform.BINARY_SENSOR])
+
+    assert (
+        hass.states.get(
+            "binary_sensor.iometer_1isk0000000000_core_bridge_connection_status"
+        ).state
+        == STATE_ON
+    )
+
+    freezer.tick(delta=timedelta(minutes=1))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    mock_iometer_client.get_current_status.return_value.device.core.connection_status = "disconnected"
+
+    freezer.tick(delta=timedelta(minutes=1))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    assert (
+        hass.states.get(
+            "binary_sensor.iometer_1isk0000000000_core_bridge_connection_status"
+        ).state
+        == STATE_OFF
+    )
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_attachment_status_sensors(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_iometer_client: AsyncMock,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test connection status sensor."""
+    await setup_platform(hass, mock_config_entry, [Platform.BINARY_SENSOR])
+
+    assert (
+        hass.states.get(
+            "binary_sensor.iometer_1isk0000000000_core_attachment_status"
+        ).state
+        == STATE_ON
+    )
+
+    freezer.tick(delta=timedelta(minutes=1))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    mock_iometer_client.get_current_status.return_value.device.core.attachment_status = "detached"
+
+    freezer.tick(delta=timedelta(minutes=1))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    assert (
+        hass.states.get(
+            "binary_sensor.iometer_1isk0000000000_core_attachment_status"
+        ).state
+        == STATE_OFF
+    )
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_attachment_status_sensors_unkown(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_iometer_client: AsyncMock,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test connection status sensor."""
+    await setup_platform(hass, mock_config_entry, [Platform.BINARY_SENSOR])
+
+    assert (
+        hass.states.get(
+            "binary_sensor.iometer_1isk0000000000_core_attachment_status"
+        ).state
+        == STATE_ON
+    )
+
+    freezer.tick(delta=timedelta(minutes=1))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    mock_iometer_client.get_current_status.return_value.device.core.attachment_status = None
+
+    freezer.tick(delta=timedelta(minutes=1))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    assert (
+        hass.states.get(
+            "binary_sensor.iometer_1isk0000000000_core_attachment_status"
+        ).state
+        == STATE_UNKNOWN
+    )
diff --git a/tests/components/iometer/test_config_flow.py b/tests/components/iometer/test_config_flow.py
new file mode 100644
index 00000000000..49fce459282
--- /dev/null
+++ b/tests/components/iometer/test_config_flow.py
@@ -0,0 +1,171 @@
+"""Test the IOmeter config flow."""
+
+from ipaddress import ip_address
+from unittest.mock import AsyncMock
+
+from iometer import IOmeterConnectionError
+
+from homeassistant.components import zeroconf
+from homeassistant.components.iometer.const import DOMAIN
+from homeassistant.config_entries import SOURCE_USER, SOURCE_ZEROCONF
+from homeassistant.const import CONF_HOST
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from tests.common import MockConfigEntry
+
+IP_ADDRESS = "10.0.0.2"
+IOMETER_DEVICE_ID = "658c2b34-2017-45f2-a12b-731235f8bb97"
+
+ZEROCONF_DISCOVERY = zeroconf.ZeroconfServiceInfo(
+    ip_address=ip_address(IP_ADDRESS),
+    ip_addresses=[ip_address(IP_ADDRESS)],
+    hostname="IOmeter-EC63E8.local.",
+    name="IOmeter-EC63E8",
+    port=80,
+    type="_iometer._tcp.",
+    properties={},
+)
+
+
+async def test_user_flow(
+    hass: HomeAssistant,
+    mock_iometer_client: AsyncMock,
+) -> None:
+    """Test full user configuration flow."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_USER},
+    )
+    await hass.async_block_till_done()
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={CONF_HOST: IP_ADDRESS},
+    )
+
+    await hass.async_block_till_done()
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "IOmeter 1ISK0000000000"
+    assert result["data"] == {CONF_HOST: IP_ADDRESS}
+    assert result["result"].unique_id == IOMETER_DEVICE_ID
+
+
+async def test_zeroconf_flow(
+    hass: HomeAssistant,
+    mock_iometer_client: AsyncMock,
+) -> None:
+    """Test zeroconf flow."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_ZEROCONF},
+        data=ZEROCONF_DISCOVERY,
+    )
+    await hass.async_block_till_done()
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "zeroconf_confirm"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {},
+    )
+    await hass.async_block_till_done()
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "IOmeter 1ISK0000000000"
+    assert result["data"] == {CONF_HOST: IP_ADDRESS}
+    assert result["result"].unique_id == IOMETER_DEVICE_ID
+
+
+async def test_zeroconf_flow_abort_duplicate(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test zeroconf flow aborts with duplicate."""
+    mock_config_entry.add_to_hass(hass)
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_ZEROCONF},
+        data=ZEROCONF_DISCOVERY,
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+
+
+async def test_zeroconf_flow_connection_error(
+    hass: HomeAssistant,
+    mock_iometer_client: AsyncMock,
+) -> None:
+    """Test zeroconf flow."""
+    mock_iometer_client.get_current_status.side_effect = IOmeterConnectionError()
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_ZEROCONF},
+        data=ZEROCONF_DISCOVERY,
+    )
+    await hass.async_block_till_done()
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "cannot_connect"
+
+
+async def test_user_flow_connection_error(
+    hass: HomeAssistant,
+    mock_iometer_client: AsyncMock,
+    mock_setup_entry: AsyncMock,
+) -> None:
+    """Test flow error."""
+    mock_iometer_client.get_current_status.side_effect = IOmeterConnectionError()
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_USER},
+    )
+    await hass.async_block_till_done()
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_HOST: IP_ADDRESS},
+    )
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {"base": "cannot_connect"}
+
+    mock_iometer_client.get_current_status.side_effect = None
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_HOST: IP_ADDRESS},
+    )
+    await hass.async_block_till_done()
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+
+
+async def test_flow_abort_duplicate(
+    hass: HomeAssistant,
+    mock_iometer_client: AsyncMock,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test duplicate flow."""
+    mock_config_entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_USER},
+    )
+    await hass.async_block_till_done()
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_HOST: IP_ADDRESS},
+    )
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
diff --git a/tests/components/iometer/test_init.py b/tests/components/iometer/test_init.py
new file mode 100644
index 00000000000..9d8eadc5079
--- /dev/null
+++ b/tests/components/iometer/test_init.py
@@ -0,0 +1,44 @@
+"""Tests for the AirGradient integration."""
+
+from datetime import timedelta
+from unittest.mock import AsyncMock
+
+from freezegun.api import FrozenDateTimeFactory
+
+from homeassistant.components.iometer.const import DOMAIN
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr
+
+from . import setup_platform
+
+from tests.common import MockConfigEntry, async_fire_time_changed
+
+
+async def test_new_firmware_version(
+    hass: HomeAssistant,
+    mock_iometer_client: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    device_registry: dr.DeviceRegistry,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test device registry integration."""
+    # await setup_integration(hass, mock_config_entry)
+    await setup_platform(hass, mock_config_entry, [Platform.SENSOR])
+    device_entry = device_registry.async_get_device(
+        identifiers={(DOMAIN, mock_config_entry.unique_id)}
+    )
+    assert device_entry is not None
+    assert device_entry.sw_version == "build-58/build-65"
+    mock_iometer_client.get_current_status.return_value.device.core.version = "build-62"
+    mock_iometer_client.get_current_status.return_value.device.bridge.version = (
+        "build-69"
+    )
+    freezer.tick(timedelta(minutes=1))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+    device_entry = device_registry.async_get_device(
+        identifiers={(DOMAIN, mock_config_entry.unique_id)}
+    )
+    assert device_entry is not None
+    assert device_entry.sw_version == "build-62/build-69"
diff --git a/tests/components/iotty/conftest.py b/tests/components/iotty/conftest.py
index 51a23bf18c7..1ce645b402e 100644
--- a/tests/components/iotty/conftest.py
+++ b/tests/components/iotty/conftest.py
@@ -169,7 +169,7 @@ def mock_iotty() -> Generator[MagicMock]:
 def mock_coordinator() -> Generator[MagicMock]:
     """Mock IottyDataUpdateCoordinator."""
     with patch(
-        "homeassistant.components.iotty.coordinator.IottyDataUpdateCoordinator",
+        "homeassistant.components.iotty.IottyDataUpdateCoordinator",
         autospec=True,
     ) as coordinator_mock:
         yield coordinator_mock
diff --git a/tests/components/iotty/snapshots/test_switch.ambr b/tests/components/iotty/snapshots/test_switch.ambr
index c6e8764cf37..16913d340f0 100644
--- a/tests/components/iotty/snapshots/test_switch.ambr
+++ b/tests/components/iotty/snapshots/test_switch.ambr
@@ -15,6 +15,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -56,6 +57,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ipp/snapshots/test_sensor.ambr b/tests/components/ipp/snapshots/test_sensor.ambr
index 3f910399ad8..f8e0578a6b9 100644
--- a/tests/components/ipp/snapshots/test_sensor.ambr
+++ b/tests/components/ipp/snapshots/test_sensor.ambr
@@ -12,6 +12,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -73,6 +74,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -126,6 +128,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -179,6 +182,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -232,6 +236,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -283,6 +288,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -332,6 +338,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/iqvia/snapshots/test_diagnostics.ambr b/tests/components/iqvia/snapshots/test_diagnostics.ambr
index f2fa656cb0f..41cfedb0e29 100644
--- a/tests/components/iqvia/snapshots/test_diagnostics.ambr
+++ b/tests/components/iqvia/snapshots/test_diagnostics.ambr
@@ -358,6 +358,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': '**REDACTED**',
       'unique_id': '**REDACTED**',
       'version': 1,
diff --git a/tests/components/iron_os/conftest.py b/tests/components/iron_os/conftest.py
index f14043c096e..bf8c756ebee 100644
--- a/tests/components/iron_os/conftest.py
+++ b/tests/components/iron_os/conftest.py
@@ -20,10 +20,12 @@ from pynecil import (
     ScrollSpeed,
     SettingsDataResponse,
     TempUnit,
+    TipType,
 )
 import pytest
 
 from homeassistant.components.iron_os import DOMAIN
+from homeassistant.config_entries import SOURCE_IGNORE
 from homeassistant.const import CONF_ADDRESS
 
 from tests.common import MockConfigEntry
@@ -110,6 +112,19 @@ def mock_config_entry() -> MockConfigEntry:
     )
 
 
+@pytest.fixture(name="config_entry_ignored")
+def mock_config_entry_ignored() -> MockConfigEntry:
+    """Mock Pinecil configuration entry for ignored device."""
+    return MockConfigEntry(
+        domain=DOMAIN,
+        title=DEFAULT_NAME,
+        data={},
+        unique_id="c0:ff:ee:c0:ff:ee",
+        entry_id="1234567890",
+        source=SOURCE_IGNORE,
+    )
+
+
 @pytest.fixture(name="ble_device")
 def mock_ble_device() -> Generator[MagicMock]:
     """Mock BLEDevice."""
@@ -150,7 +165,7 @@ def mock_pynecil() -> Generator[AsyncMock]:
         client = mock_client.return_value
 
         client.get_device_info.return_value = DeviceInfoResponse(
-            build="v2.22",
+            build="v2.23",
             device_id="c0ffeeC0",
             address="c0:ff:ee:c0:ff:ee",
             device_sn="0000c0ffeec0ffee",
@@ -191,6 +206,8 @@ def mock_pynecil() -> Generator[AsyncMock]:
             display_invert=True,
             calibrate_cjc=True,
             usb_pd_mode=True,
+            hall_sleep_time=5,
+            tip_type=TipType.PINE_SHORT,
         )
         client.get_live_data.return_value = LiveDataResponse(
             live_temp=298,
diff --git a/tests/components/iron_os/snapshots/test_binary_sensor.ambr b/tests/components/iron_os/snapshots/test_binary_sensor.ambr
index 17b49c1d687..c36c1cc42ff 100644
--- a/tests/components/iron_os/snapshots/test_binary_sensor.ambr
+++ b/tests/components/iron_os/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/iron_os/snapshots/test_button.ambr b/tests/components/iron_os/snapshots/test_button.ambr
index 64a71f5e424..c9ff9181515 100644
--- a/tests/components/iron_os/snapshots/test_button.ambr
+++ b/tests/components/iron_os/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/iron_os/snapshots/test_diagnostics.ambr b/tests/components/iron_os/snapshots/test_diagnostics.ambr
index f8db1262254..49cb3878b87 100644
--- a/tests/components/iron_os/snapshots/test_diagnostics.ambr
+++ b/tests/components/iron_os/snapshots/test_diagnostics.ambr
@@ -6,7 +6,7 @@
     }),
     'device_info': dict({
       '__type': "<class 'pynecil.types.DeviceInfoResponse'>",
-      'repr': "DeviceInfoResponse(build='v2.22', device_id='c0ffeeC0', address='c0:ff:ee:c0:ff:ee', device_sn='0000c0ffeec0ffee', name='Pinecil-C0FFEEE', is_synced=False)",
+      'repr': "DeviceInfoResponse(build='v2.23', device_id='c0ffeeC0', address='c0:ff:ee:c0:ff:ee', device_sn='0000c0ffeec0ffee', name='Pinecil-C0FFEEE', is_synced=False)",
     }),
     'live_data': dict({
       '__type': "<class 'pynecil.types.LiveDataResponse'>",
diff --git a/tests/components/iron_os/snapshots/test_number.ambr b/tests/components/iron_os/snapshots/test_number.ambr
index fc4fe96d746..b2ec7a70a92 100644
--- a/tests/components/iron_os/snapshots/test_number.ambr
+++ b/tests/components/iron_os/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 10,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -68,6 +69,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -124,6 +126,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -179,6 +182,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -222,6 +226,63 @@
     'state': '7',
   })
 # ---
+# name: test_state[number.pinecil_hall_sensor_sleep_timeout-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 60,
+      'min': 0,
+      'mode': <NumberMode.BOX: 'box'>,
+      'step': 5,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'number.pinecil_hall_sensor_sleep_timeout',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Hall sensor sleep timeout',
+    'platform': 'iron_os',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': <PinecilNumber.HALL_EFFECT_SLEEP_TIME: 'hall_effect_sleep_time'>,
+    'unique_id': 'c0:ff:ee:c0:ff:ee_hall_effect_sleep_time',
+    'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+  })
+# ---
+# name: test_state[number.pinecil_hall_sensor_sleep_timeout-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Pinecil Hall sensor sleep timeout',
+      'max': 60,
+      'min': 0,
+      'mode': <NumberMode.BOX: 'box'>,
+      'step': 5,
+      'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.pinecil_hall_sensor_sleep_timeout',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '5',
+  })
+# ---
 # name: test_state[number.pinecil_keep_awake_pulse_delay-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -234,6 +295,7 @@
       'step': 2.5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -290,6 +352,7 @@
       'step': 250,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -346,6 +409,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -402,6 +466,7 @@
       'step': 5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -458,6 +523,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -514,6 +580,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -569,6 +636,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -626,6 +694,7 @@
       'step': 5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -682,6 +751,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -739,6 +809,7 @@
       'step': 5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -796,6 +867,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -852,6 +924,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -909,6 +982,7 @@
       'step': 10,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -966,6 +1040,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1022,6 +1097,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/iron_os/snapshots/test_select.ambr b/tests/components/iron_os/snapshots/test_select.ambr
index e3989fbf863..540cab234a5 100644
--- a/tests/components/iron_os/snapshots/test_select.ambr
+++ b/tests/components/iron_os/snapshots/test_select.ambr
@@ -13,6 +13,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -75,6 +76,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -136,6 +138,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -193,6 +196,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -246,9 +250,11 @@
       'options': list([
         'off',
         'on',
+        'safe',
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -282,6 +288,7 @@
       'options': list([
         'off',
         'on',
+        'safe',
       ]),
     }),
     'context': <ANY>,
@@ -307,6 +314,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -365,6 +373,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -408,6 +417,66 @@
     'state': 'fast',
   })
 # ---
+# name: test_state[select.pinecil_soldering_tip_type-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'auto',
+        'ts100_long',
+        'pine_short',
+        'pts200',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'select',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'select.pinecil_soldering_tip_type',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Soldering tip type',
+    'platform': 'iron_os',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': <PinecilSelect.TIP_TYPE: 'tip_type'>,
+    'unique_id': 'c0:ff:ee:c0:ff:ee_tip_type',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_state[select.pinecil_soldering_tip_type-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Pinecil Soldering tip type',
+      'options': list([
+        'auto',
+        'ts100_long',
+        'pine_short',
+        'pts200',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'select.pinecil_soldering_tip_type',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'pine_short',
+  })
+# ---
 # name: test_state[select.pinecil_start_up_behavior-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -422,6 +491,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -479,6 +549,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/iron_os/snapshots/test_sensor.ambr b/tests/components/iron_os/snapshots/test_sensor.ambr
index 0eb8e81fb4f..6a30aa6632b 100644
--- a/tests/components/iron_os/snapshots/test_sensor.ambr
+++ b/tests/components/iron_os/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -110,6 +112,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -159,6 +162,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -210,6 +214,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -259,6 +264,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -325,6 +331,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -391,6 +398,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -450,6 +458,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -505,6 +514,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -559,6 +569,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -609,6 +620,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -660,6 +672,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/iron_os/snapshots/test_switch.ambr b/tests/components/iron_os/snapshots/test_switch.ambr
index f13cdcfe666..a3d28e58d63 100644
--- a/tests/components/iron_os/snapshots/test_switch.ambr
+++ b/tests/components/iron_os/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -190,6 +194,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +241,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -282,6 +288,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/iron_os/snapshots/test_update.ambr b/tests/components/iron_os/snapshots/test_update.ambr
index e0872d032ec..fcd7196a70c 100644
--- a/tests/components/iron_os/snapshots/test_update.ambr
+++ b/tests/components/iron_os/snapshots/test_update.ambr
@@ -9,6 +9,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -44,7 +45,7 @@
       'entity_picture': 'https://brands.home-assistant.io/_/iron_os/icon.png',
       'friendly_name': 'Pinecil Firmware',
       'in_progress': False,
-      'installed_version': 'v2.22',
+      'installed_version': 'v2.23',
       'latest_version': 'v2.22',
       'release_summary': None,
       'release_url': 'https://github.com/Ralim/IronOS/releases/tag/v2.22',
diff --git a/tests/components/iron_os/test_config_flow.py b/tests/components/iron_os/test_config_flow.py
index e1ac8fb9f00..88bef117c26 100644
--- a/tests/components/iron_os/test_config_flow.py
+++ b/tests/components/iron_os/test_config_flow.py
@@ -106,3 +106,28 @@ async def test_async_step_bluetooth_devices_already_setup(
     )
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "already_configured"
+
+
+@pytest.mark.usefixtures("discovery")
+async def test_async_step_user_setup_replaces_igonored_device(
+    hass: HomeAssistant, config_entry_ignored: AsyncMock
+) -> None:
+    """Test the user initiated form can replace an ignored device."""
+
+    config_entry_ignored.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        USER_INPUT,
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == DEFAULT_NAME
+    assert result["data"] == {}
+    assert result["result"].unique_id == "c0:ff:ee:c0:ff:ee"
diff --git a/tests/components/iron_os/test_init.py b/tests/components/iron_os/test_init.py
index 4749e1b6199..d1c596f4de5 100644
--- a/tests/components/iron_os/test_init.py
+++ b/tests/components/iron_os/test_init.py
@@ -4,13 +4,15 @@ from datetime import timedelta
 from unittest.mock import AsyncMock
 
 from freezegun.api import FrozenDateTimeFactory
-from pynecil import CommunicationError
+from pynecil import CommunicationError, DeviceInfoResponse
 import pytest
 
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 
+from .conftest import DEFAULT_NAME
+
 from tests.common import MockConfigEntry, async_fire_time_changed
 
 
@@ -89,3 +91,35 @@ async def test_settings_exception(
 
     assert (state := hass.states.get("number.pinecil_boost_temperature"))
     assert state.state == STATE_UNKNOWN
+
+
+@pytest.mark.usefixtures(
+    "entity_registry_enabled_by_default", "mock_pynecil", "ble_device"
+)
+async def test_v223_entities_not_loaded(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    mock_pynecil: AsyncMock,
+) -> None:
+    """Test the new entities in IronOS v2.23 are not loaded on smaller versions."""
+
+    mock_pynecil.get_device_info.return_value = DeviceInfoResponse(
+        build="v2.22",
+        device_id="c0ffeeC0",
+        address="c0:ff:ee:c0:ff:ee",
+        device_sn="0000c0ffeec0ffee",
+        name=DEFAULT_NAME,
+    )
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    assert hass.states.get("number.pinecil_hall_sensor_sleep_timeout") is None
+    assert hass.states.get("select.pinecil_soldering_tip_type") is None
+    assert (
+        state := hass.states.get("select.pinecil_power_delivery_3_1_epr")
+    ) is not None
+
+    assert len(state.attributes["options"]) == 2
diff --git a/tests/components/iron_os/test_number.py b/tests/components/iron_os/test_number.py
index bdec922a88c..9a4ba53f338 100644
--- a/tests/components/iron_os/test_number.py
+++ b/tests/components/iron_os/test_number.py
@@ -138,6 +138,12 @@ async def test_state(
         ("number.pinecil_sleep_temperature", CharSetting.SLEEP_TEMP, 150, 150),
         ("number.pinecil_sleep_timeout", CharSetting.SLEEP_TIMEOUT, 5, 5),
         ("number.pinecil_voltage_divider", CharSetting.VOLTAGE_DIV, 600, 600),
+        (
+            "number.pinecil_hall_sensor_sleep_timeout",
+            CharSetting.HALL_SLEEP_TIME,
+            60,
+            60,
+        ),
     ],
 )
 @pytest.mark.usefixtures("entity_registry_enabled_by_default", "ble_device")
diff --git a/tests/components/iron_os/test_select.py b/tests/components/iron_os/test_select.py
index 8cc848dd4cb..5590bfc2ba6 100644
--- a/tests/components/iron_os/test_select.py
+++ b/tests/components/iron_os/test_select.py
@@ -16,6 +16,7 @@ from pynecil import (
     ScreenOrientationMode,
     ScrollSpeed,
     TempUnit,
+    TipType,
     USBPDMode,
 )
 import pytest
@@ -111,6 +112,11 @@ async def test_state(
             "on",
             (CharSetting.USB_PD_MODE, USBPDMode.ON),
         ),
+        (
+            "select.pinecil_soldering_tip_type",
+            "auto",
+            (CharSetting.TIP_TYPE, TipType.AUTO),
+        ),
     ],
 )
 @pytest.mark.usefixtures("entity_registry_enabled_by_default", "ble_device")
diff --git a/tests/components/islamic_prayer_times/__init__.py b/tests/components/islamic_prayer_times/__init__.py
index 522006b0847..90a3a90c451 100644
--- a/tests/components/islamic_prayer_times/__init__.py
+++ b/tests/components/islamic_prayer_times/__init__.py
@@ -3,7 +3,7 @@
 from datetime import datetime
 
 from homeassistant.const import CONF_LATITUDE, CONF_LOCATION, CONF_LONGITUDE, CONF_NAME
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 MOCK_USER_INPUT = {
     CONF_NAME: "Home",
diff --git a/tests/components/islamic_prayer_times/test_init.py b/tests/components/islamic_prayer_times/test_init.py
index 7961b79676b..5ae11d8f850 100644
--- a/tests/components/islamic_prayer_times/test_init.py
+++ b/tests/components/islamic_prayer_times/test_init.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import NOW, PRAYER_TIMES
 
diff --git a/tests/components/israel_rail/snapshots/test_sensor.ambr b/tests/components/israel_rail/snapshots/test_sensor.ambr
index f851f1cd726..610c2c53e22 100644
--- a/tests/components/israel_rail/snapshots/test_sensor.ambr
+++ b/tests/components/israel_rail/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -102,6 +104,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -197,6 +201,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -244,6 +249,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ista_ecotrend/snapshots/test_init.ambr b/tests/components/ista_ecotrend/snapshots/test_init.ambr
index c84d55c059c..7329eec7f70 100644
--- a/tests/components/ista_ecotrend/snapshots/test_init.ambr
+++ b/tests/components/ista_ecotrend/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://ecotrend.ista.de/',
     'connections': set({
     }),
@@ -35,6 +36,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://ecotrend.ista.de/',
     'connections': set({
     }),
diff --git a/tests/components/ista_ecotrend/snapshots/test_sensor.ambr b/tests/components/ista_ecotrend/snapshots/test_sensor.ambr
index b5056019c74..296ce26c7f2 100644
--- a/tests/components/ista_ecotrend/snapshots/test_sensor.ambr
+++ b/tests/components/ista_ecotrend/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -61,6 +62,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -115,6 +117,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -169,6 +172,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -223,6 +227,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -277,6 +282,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -331,6 +337,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -385,6 +392,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -439,6 +447,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -492,6 +501,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -546,6 +556,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -600,6 +611,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -654,6 +666,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -708,6 +721,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -762,6 +776,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -816,6 +831,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ituran/snapshots/test_device_tracker.ambr b/tests/components/ituran/snapshots/test_device_tracker.ambr
index 3b650f7927f..e73f0cfee24 100644
--- a/tests/components/ituran/snapshots/test_device_tracker.ambr
+++ b/tests/components/ituran/snapshots/test_device_tracker.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ituran/snapshots/test_init.ambr b/tests/components/ituran/snapshots/test_init.ambr
index 1e64ef9e850..b97aef6027b 100644
--- a/tests/components/ituran/snapshots/test_init.ambr
+++ b/tests/components/ituran/snapshots/test_init.ambr
@@ -4,6 +4,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
diff --git a/tests/components/ituran/snapshots/test_sensor.ambr b/tests/components/ituran/snapshots/test_sensor.ambr
index c1512de912f..f96190fdbc2 100644
--- a/tests/components/ituran/snapshots/test_sensor.ambr
+++ b/tests/components/ituran/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -103,6 +105,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -153,6 +156,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -200,6 +204,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -251,6 +256,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/jellyfin/fixtures/get-media-folders.json b/tests/components/jellyfin/fixtures/get-media-folders.json
index ff87751a9da..f6b5c1e8d78 100644
--- a/tests/components/jellyfin/fixtures/get-media-folders.json
+++ b/tests/components/jellyfin/fixtures/get-media-folders.json
@@ -302,8 +302,6 @@
       "Album": "string",
       "CollectionType": "tvshows",
       "DisplayOrder": "string",
-      "AlbumId": "21af9851-8e39-43a9-9c47-513d3b9e99fc",
-      "AlbumPrimaryImageTag": "string",
       "SeriesPrimaryImageTag": "string",
       "AlbumArtist": "string",
       "AlbumArtists": [
diff --git a/tests/components/jellyfin/fixtures/sessions.json b/tests/components/jellyfin/fixtures/sessions.json
index 00a1f5265db..db2b691dff0 100644
--- a/tests/components/jellyfin/fixtures/sessions.json
+++ b/tests/components/jellyfin/fixtures/sessions.json
@@ -4346,6 +4346,7 @@
       ],
       "Album": "ALBUM",
       "AlbumId": "ALBUM-UUID",
+      "AlbumPrimaryImageTag": "ALBUM-PRIMARY-IMAGE-TAG",
       "AlbumArtist": "Album Artist",
       "AlbumArtists": [
         { "Name": "Album Artist", "Id": "9a65b2c222ddb34e51f5cae360fad3a1" }
diff --git a/tests/components/jellyfin/fixtures/user-items-parent-id.json b/tests/components/jellyfin/fixtures/user-items-parent-id.json
index 2e06c30894c..cd0232894bc 100644
--- a/tests/components/jellyfin/fixtures/user-items-parent-id.json
+++ b/tests/components/jellyfin/fixtures/user-items-parent-id.json
@@ -302,8 +302,6 @@
       "Album": "string",
       "CollectionType": "string",
       "DisplayOrder": "string",
-      "AlbumId": "21af9851-8e39-43a9-9c47-513d3b9e99fc",
-      "AlbumPrimaryImageTag": "string",
       "SeriesPrimaryImageTag": "string",
       "AlbumArtist": "string",
       "AlbumArtists": [
diff --git a/tests/components/jellyfin/snapshots/test_diagnostics.ambr b/tests/components/jellyfin/snapshots/test_diagnostics.ambr
index c992628f034..9d73ee6397c 100644
--- a/tests/components/jellyfin/snapshots/test_diagnostics.ambr
+++ b/tests/components/jellyfin/snapshots/test_diagnostics.ambr
@@ -1707,6 +1707,7 @@
             }),
           ]),
           'AlbumId': 'ALBUM-UUID',
+          'AlbumPrimaryImageTag': 'ALBUM-PRIMARY-IMAGE-TAG',
           'ArtistItems': list([
             dict({
               'Id': '1d864900526d9a9513b489f1cc28f8ca',
diff --git a/tests/components/jellyfin/test_media_player.py b/tests/components/jellyfin/test_media_player.py
index 3263639a32f..c6f015e9bb4 100644
--- a/tests/components/jellyfin/test_media_player.py
+++ b/tests/components/jellyfin/test_media_player.py
@@ -27,6 +27,7 @@ from homeassistant.components.media_player import (
 from homeassistant.const import (
     ATTR_DEVICE_CLASS,
     ATTR_ENTITY_ID,
+    ATTR_ENTITY_PICTURE,
     ATTR_FRIENDLY_NAME,
     ATTR_ICON,
 )
@@ -124,6 +125,10 @@ async def test_media_player_music(
     assert state.attributes.get(ATTR_MEDIA_SERIES_TITLE) is None
     assert state.attributes.get(ATTR_MEDIA_SEASON) is None
     assert state.attributes.get(ATTR_MEDIA_EPISODE) is None
+    assert (
+        state.attributes.get(ATTR_ENTITY_PICTURE)
+        == "http://localhost/Items/ALBUM-UUID/Images/Primary.jpg"
+    )
 
     entry = entity_registry.async_get(state.entity_id)
     assert entry
diff --git a/tests/components/jewish_calendar/__init__.py b/tests/components/jewish_calendar/__init__.py
index 440bffc2256..dc66c1e0d7d 100644
--- a/tests/components/jewish_calendar/__init__.py
+++ b/tests/components/jewish_calendar/__init__.py
@@ -3,10 +3,8 @@
 from collections import namedtuple
 from datetime import datetime
 
-from freezegun import freeze_time as alter_time  # noqa: F401
-
 from homeassistant.components import jewish_calendar
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 _LatLng = namedtuple("_LatLng", ["lat", "lng"])  # noqa: PYI024
 
@@ -49,7 +47,7 @@ def make_jerusalem_test_params(dtime, results, havdalah_offset=0):
         }
     return (
         dtime,
-        jewish_calendar.DEFAULT_CANDLE_LIGHT,
+        40,
         havdalah_offset,
         False,
         "Asia/Jerusalem",
diff --git a/tests/components/jewish_calendar/test_binary_sensor.py b/tests/components/jewish_calendar/test_binary_sensor.py
index 8abaaecb77d..194e6fe9d01 100644
--- a/tests/components/jewish_calendar/test_binary_sensor.py
+++ b/tests/components/jewish_calendar/test_binary_sensor.py
@@ -3,6 +3,7 @@
 from datetime import datetime as dt, timedelta
 import logging
 
+from freezegun import freeze_time
 import pytest
 
 from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
@@ -16,9 +17,9 @@ from homeassistant.components.jewish_calendar.const import (
 from homeassistant.const import CONF_LANGUAGE, CONF_PLATFORM, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
-from . import alter_time, make_jerusalem_test_params, make_nyc_test_params
+from . import make_jerusalem_test_params, make_nyc_test_params
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
@@ -191,7 +192,7 @@ async def test_issur_melacha_sensor(
     hass.config.latitude = latitude
     hass.config.longitude = longitude
 
-    with alter_time(test_time):
+    with freeze_time(test_time):
         entry = MockConfigEntry(
             title=DEFAULT_NAME,
             domain=DOMAIN,
@@ -213,7 +214,7 @@ async def test_issur_melacha_sensor(
             == result["state"]
         )
 
-        with alter_time(result["update"]):
+        with freeze_time(result["update"]):
             async_fire_time_changed(hass, result["update"])
             await hass.async_block_till_done()
             assert (
@@ -264,7 +265,7 @@ async def test_issur_melacha_sensor_update(
     hass.config.latitude = latitude
     hass.config.longitude = longitude
 
-    with alter_time(test_time):
+    with freeze_time(test_time):
         entry = MockConfigEntry(
             title=DEFAULT_NAME,
             domain=DOMAIN,
@@ -286,7 +287,7 @@ async def test_issur_melacha_sensor_update(
         )
 
     test_time += timedelta(microseconds=1)
-    with alter_time(test_time):
+    with freeze_time(test_time):
         async_fire_time_changed(hass, test_time)
         await hass.async_block_till_done()
         assert (
diff --git a/tests/components/jewish_calendar/test_init.py b/tests/components/jewish_calendar/test_init.py
index cb982afec0f..6a4f57513fa 100644
--- a/tests/components/jewish_calendar/test_init.py
+++ b/tests/components/jewish_calendar/test_init.py
@@ -1 +1,44 @@
 """Tests for the Jewish Calendar component's init."""
+
+import pytest
+
+from homeassistant.components.jewish_calendar.const import DOMAIN
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from tests.common import MockConfigEntry
+
+
+@pytest.mark.parametrize(
+    ("old_key", "new_key"),
+    [
+        ("first_light", "alot_hashachar"),
+        ("sunset", "shkia"),
+        ("havdalah", "havdalah"),  # Test no change
+    ],
+)
+async def test_migrate_unique_id(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    old_key: str,
+    new_key: str,
+) -> None:
+    """Test unique id migration."""
+    entry = MockConfigEntry(domain=DOMAIN, data={})
+    entry.add_to_hass(hass)
+
+    entity: er.RegistryEntry = entity_registry.async_get_or_create(
+        domain=SENSOR_DOMAIN,
+        platform=DOMAIN,
+        unique_id=f"{entry.entry_id}-{old_key}",
+        config_entry=entry,
+    )
+    assert entity.unique_id.endswith(f"-{old_key}")
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    entity_migrated = entity_registry.async_get(entity.entity_id)
+    assert entity_migrated
+    assert entity_migrated.unique_id == f"{entry.entry_id}-{new_key}"
diff --git a/tests/components/jewish_calendar/test_sensor.py b/tests/components/jewish_calendar/test_sensor.py
index 4897ef7749b..bc9e69a9717 100644
--- a/tests/components/jewish_calendar/test_sensor.py
+++ b/tests/components/jewish_calendar/test_sensor.py
@@ -2,10 +2,11 @@
 
 from datetime import datetime as dt, timedelta
 
-from hdate import htables
+from freezegun import freeze_time
+from hdate.holidays import HolidayDatabase
+from hdate.parasha import Parasha
 import pytest
 
-from homeassistant.components.binary_sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.components.jewish_calendar.const import (
     CONF_CANDLE_LIGHT_MINUTES,
     CONF_DIASPORA,
@@ -13,12 +14,13 @@ from homeassistant.components.jewish_calendar.const import (
     DEFAULT_NAME,
     DOMAIN,
 )
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.const import CONF_LANGUAGE, CONF_PLATFORM
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
-from . import alter_time, make_jerusalem_test_params, make_nyc_test_params
+from . import make_jerusalem_test_params, make_nyc_test_params
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
@@ -92,8 +94,7 @@ TEST_PARAMS = [
             "icon": "mdi:calendar-star",
             "id": "rosh_hashana_i",
             "type": "YOM_TOV",
-            "type_id": 1,
-            "options": htables.get_all_holidays("english"),
+            "options": HolidayDatabase(False).get_all_names("english"),
         },
     ),
     (
@@ -111,8 +112,7 @@ TEST_PARAMS = [
             "icon": "mdi:calendar-star",
             "id": "chanukah, rosh_chodesh",
             "type": "MELACHA_PERMITTED_HOLIDAY, ROSH_CHODESH",
-            "type_id": "4, 10",
-            "options": htables.get_all_holidays("english"),
+            "options": HolidayDatabase(False).get_all_names("english"),
         },
     ),
     (
@@ -128,7 +128,7 @@ TEST_PARAMS = [
             "device_class": "enum",
             "friendly_name": "Jewish Calendar Parshat Hashavua",
             "icon": "mdi:book-open-variant",
-            "options": [p.hebrew for p in htables.PARASHAOT],
+            "options": list(Parasha),
         },
     ),
     (
@@ -139,7 +139,7 @@ TEST_PARAMS = [
         "hebrew",
         "t_set_hakochavim",
         True,
-        dt(2018, 9, 8, 19, 45),
+        dt(2018, 9, 8, 19, 47),
         None,
     ),
     (
@@ -150,7 +150,7 @@ TEST_PARAMS = [
         "hebrew",
         "t_set_hakochavim",
         False,
-        dt(2018, 9, 8, 19, 19),
+        dt(2018, 9, 8, 19, 21),
         None,
     ),
     (
@@ -185,9 +185,9 @@ TEST_PARAMS = [
         False,
         "ו' מרחשוון ה' תשע\"ט",
         {
-            "hebrew_year": 5779,
+            "hebrew_year": "5779",
             "hebrew_month_name": "מרחשוון",
-            "hebrew_day": 6,
+            "hebrew_day": "6",
             "icon": "mdi:star-david",
             "friendly_name": "Jewish Calendar Date",
         },
@@ -245,7 +245,7 @@ async def test_jewish_calendar_sensor(
     hass.config.latitude = latitude
     hass.config.longitude = longitude
 
-    with alter_time(test_time):
+    with freeze_time(test_time):
         entry = MockConfigEntry(
             title=DEFAULT_NAME,
             domain=DOMAIN,
@@ -258,7 +258,7 @@ async def test_jewish_calendar_sensor(
         await hass.config_entries.async_setup(entry.entry_id)
         await hass.async_block_till_done()
 
-        future = dt_util.utcnow() + timedelta(seconds=30)
+        future = test_time + timedelta(seconds=30)
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
@@ -424,9 +424,9 @@ SHABBAT_PARAMS = [
     make_jerusalem_test_params(
         dt(2018, 9, 29, 21, 25),
         {
-            "english_upcoming_candle_lighting": dt(2018, 9, 30, 18, 7),
+            "english_upcoming_candle_lighting": dt(2018, 9, 30, 17, 45),
             "english_upcoming_havdalah": dt(2018, 10, 1, 19, 1),
-            "english_upcoming_shabbat_candle_lighting": dt(2018, 10, 5, 18, 1),
+            "english_upcoming_shabbat_candle_lighting": dt(2018, 10, 5, 17, 39),
             "english_upcoming_shabbat_havdalah": dt(2018, 10, 6, 18, 54),
             "english_parshat_hashavua": "Bereshit",
             "hebrew_parshat_hashavua": "בראשית",
@@ -437,22 +437,22 @@ SHABBAT_PARAMS = [
     make_jerusalem_test_params(
         dt(2018, 9, 30, 21, 25),
         {
-            "english_upcoming_candle_lighting": dt(2018, 9, 30, 18, 7),
+            "english_upcoming_candle_lighting": dt(2018, 9, 30, 17, 45),
             "english_upcoming_havdalah": dt(2018, 10, 1, 19, 1),
-            "english_upcoming_shabbat_candle_lighting": dt(2018, 10, 5, 18, 1),
+            "english_upcoming_shabbat_candle_lighting": dt(2018, 10, 5, 17, 39),
             "english_upcoming_shabbat_havdalah": dt(2018, 10, 6, 18, 54),
             "english_parshat_hashavua": "Bereshit",
             "hebrew_parshat_hashavua": "בראשית",
-            "english_holiday": "Shmini Atzeret",
-            "hebrew_holiday": "שמיני עצרת",
+            "english_holiday": "Shmini Atzeret, Simchat Torah",
+            "hebrew_holiday": "שמיני עצרת, שמחת תורה",
         },
     ),
     make_jerusalem_test_params(
         dt(2018, 10, 1, 21, 25),
         {
-            "english_upcoming_candle_lighting": dt(2018, 10, 5, 18, 1),
+            "english_upcoming_candle_lighting": dt(2018, 10, 5, 17, 39),
             "english_upcoming_havdalah": dt(2018, 10, 6, 18, 54),
-            "english_upcoming_shabbat_candle_lighting": dt(2018, 10, 5, 18, 1),
+            "english_upcoming_shabbat_candle_lighting": dt(2018, 10, 5, 17, 39),
             "english_upcoming_shabbat_havdalah": dt(2018, 10, 6, 18, 54),
             "english_parshat_hashavua": "Bereshit",
             "hebrew_parshat_hashavua": "בראשית",
@@ -487,9 +487,9 @@ SHABBAT_PARAMS = [
     make_jerusalem_test_params(
         dt(2017, 9, 21, 8, 25),
         {
-            "english_upcoming_candle_lighting": dt(2017, 9, 20, 18, 20),
+            "english_upcoming_candle_lighting": dt(2017, 9, 20, 17, 58),
             "english_upcoming_havdalah": dt(2017, 9, 23, 19, 11),
-            "english_upcoming_shabbat_candle_lighting": dt(2017, 9, 22, 19, 12),
+            "english_upcoming_shabbat_candle_lighting": dt(2017, 9, 22, 17, 56),
             "english_upcoming_shabbat_havdalah": dt(2017, 9, 23, 19, 11),
             "english_parshat_hashavua": "Ha'Azinu",
             "hebrew_parshat_hashavua": "האזינו",
@@ -500,9 +500,9 @@ SHABBAT_PARAMS = [
     make_jerusalem_test_params(
         dt(2017, 9, 22, 8, 25),
         {
-            "english_upcoming_candle_lighting": dt(2017, 9, 20, 18, 20),
+            "english_upcoming_candle_lighting": dt(2017, 9, 20, 17, 58),
             "english_upcoming_havdalah": dt(2017, 9, 23, 19, 11),
-            "english_upcoming_shabbat_candle_lighting": dt(2017, 9, 22, 19, 12),
+            "english_upcoming_shabbat_candle_lighting": dt(2017, 9, 22, 17, 56),
             "english_upcoming_shabbat_havdalah": dt(2017, 9, 23, 19, 11),
             "english_parshat_hashavua": "Ha'Azinu",
             "hebrew_parshat_hashavua": "האזינו",
@@ -513,9 +513,9 @@ SHABBAT_PARAMS = [
     make_jerusalem_test_params(
         dt(2017, 9, 23, 8, 25),
         {
-            "english_upcoming_candle_lighting": dt(2017, 9, 20, 18, 20),
+            "english_upcoming_candle_lighting": dt(2017, 9, 20, 17, 58),
             "english_upcoming_havdalah": dt(2017, 9, 23, 19, 11),
-            "english_upcoming_shabbat_candle_lighting": dt(2017, 9, 22, 19, 12),
+            "english_upcoming_shabbat_candle_lighting": dt(2017, 9, 22, 17, 56),
             "english_upcoming_shabbat_havdalah": dt(2017, 9, 23, 19, 11),
             "english_parshat_hashavua": "Ha'Azinu",
             "hebrew_parshat_hashavua": "האזינו",
@@ -587,7 +587,7 @@ async def test_shabbat_times_sensor(
     hass.config.latitude = latitude
     hass.config.longitude = longitude
 
-    with alter_time(test_time):
+    with freeze_time(test_time):
         entry = MockConfigEntry(
             title=DEFAULT_NAME,
             domain=DOMAIN,
@@ -604,7 +604,7 @@ async def test_shabbat_times_sensor(
         await hass.config_entries.async_setup(entry.entry_id)
         await hass.async_block_till_done()
 
-        future = dt_util.utcnow() + timedelta(seconds=30)
+        future = test_time + timedelta(seconds=30)
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
@@ -649,13 +649,13 @@ async def test_omer_sensor(hass: HomeAssistant, test_time, result) -> None:
     """Test Omer Count sensor output."""
     test_time = test_time.replace(tzinfo=dt_util.get_time_zone(hass.config.time_zone))
 
-    with alter_time(test_time):
+    with freeze_time(test_time):
         entry = MockConfigEntry(title=DEFAULT_NAME, domain=DOMAIN)
         entry.add_to_hass(hass)
         await hass.config_entries.async_setup(entry.entry_id)
         await hass.async_block_till_done()
 
-        future = dt_util.utcnow() + timedelta(seconds=30)
+        future = test_time + timedelta(seconds=30)
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
@@ -684,13 +684,13 @@ async def test_dafyomi_sensor(hass: HomeAssistant, test_time, result) -> None:
     """Test Daf Yomi sensor output."""
     test_time = test_time.replace(tzinfo=dt_util.get_time_zone(hass.config.time_zone))
 
-    with alter_time(test_time):
+    with freeze_time(test_time):
         entry = MockConfigEntry(title=DEFAULT_NAME, domain=DOMAIN)
         entry.add_to_hass(hass)
         await hass.config_entries.async_setup(entry.entry_id)
         await hass.async_block_till_done()
 
-        future = dt_util.utcnow() + timedelta(seconds=30)
+        future = test_time + timedelta(seconds=30)
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
diff --git a/tests/components/jewish_calendar/test_service.py b/tests/components/jewish_calendar/test_service.py
new file mode 100644
index 00000000000..9eb80e5e7f0
--- /dev/null
+++ b/tests/components/jewish_calendar/test_service.py
@@ -0,0 +1,55 @@
+"""Test jewish calendar service."""
+
+import datetime as dt
+
+from hdate.translator import Language
+import pytest
+
+from homeassistant.components.jewish_calendar.const import DOMAIN
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+@pytest.mark.parametrize(
+    ("test_date", "nusach", "language", "expected"),
+    [
+        pytest.param(dt.date(2025, 3, 20), "sfarad", "he", "", id="no_blessing"),
+        pytest.param(
+            dt.date(2025, 5, 20),
+            "ashkenaz",
+            "he",
+            "היום שבעה ושלושים יום שהם חמישה שבועות ושני ימים בעומר",
+            id="ahskenaz-hebrew",
+        ),
+        pytest.param(
+            dt.date(2025, 5, 20),
+            "sfarad",
+            "en",
+            "Today is the thirty-seventh day, which are five weeks and two days of the Omer",
+            id="sefarad-english",
+        ),
+    ],
+)
+async def test_get_omer_blessing(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    test_date: dt.date,
+    nusach: str,
+    language: Language,
+    expected: str,
+) -> None:
+    """Test get omer blessing."""
+    mock_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    result = await hass.services.async_call(
+        DOMAIN,
+        "count_omer",
+        {"date": test_date, "nusach": nusach, "language": language},
+        blocking=True,
+        return_response=True,
+    )
+
+    assert result["message"] == expected
diff --git a/tests/components/kitchen_sink/snapshots/test_init.ambr b/tests/components/kitchen_sink/snapshots/test_init.ambr
new file mode 100644
index 00000000000..fe22f19fb7a
--- /dev/null
+++ b/tests/components/kitchen_sink/snapshots/test_init.ambr
@@ -0,0 +1,62 @@
+# serializer version: 1
+# name: test_statistics_issues
+  dict({
+    'sensor.statistics_issues_issue_1': list([
+      dict({
+        'data': dict({
+          'metadata_unit': 'm³',
+          'state_unit': 'W',
+          'statistic_id': 'sensor.statistics_issues_issue_1',
+          'supported_unit': 'CCF, L, fl. oz., ft³, gal, mL, m³',
+        }),
+        'type': 'units_changed',
+      }),
+    ]),
+    'sensor.statistics_issues_issue_2': list([
+      dict({
+        'data': dict({
+          'metadata_unit': 'cats',
+          'state_unit': 'dogs',
+          'statistic_id': 'sensor.statistics_issues_issue_2',
+          'supported_unit': 'cats',
+        }),
+        'type': 'units_changed',
+      }),
+    ]),
+    'sensor.statistics_issues_issue_3': list([
+      dict({
+        'data': dict({
+          'statistic_id': 'sensor.statistics_issues_issue_3',
+        }),
+        'type': 'state_class_removed',
+      }),
+      dict({
+        'data': dict({
+          'metadata_unit': 'm³',
+          'state_unit': 'W',
+          'statistic_id': 'sensor.statistics_issues_issue_3',
+          'supported_unit': 'CCF, L, fl. oz., ft³, gal, mL, m³',
+        }),
+        'type': 'units_changed',
+      }),
+    ]),
+    'sensor.statistics_issues_issue_4': list([
+      dict({
+        'data': dict({
+          'statistic_id': 'sensor.statistics_issues_issue_4',
+        }),
+        'type': 'no_state',
+      }),
+    ]),
+    'sensor.statistics_issues_issue_5': list([
+      dict({
+        'data': dict({
+          'metadata_mean_type': 1,
+          'state_mean_type': 2,
+          'statistic_id': 'sensor.statistics_issues_issue_5',
+        }),
+        'type': 'mean_type_changed',
+      }),
+    ]),
+  })
+# ---
diff --git a/tests/components/kitchen_sink/snapshots/test_sensor.ambr b/tests/components/kitchen_sink/snapshots/test_sensor.ambr
index bbf88c84eca..6cd9aa2e855 100644
--- a/tests/components/kitchen_sink/snapshots/test_sensor.ambr
+++ b/tests/components/kitchen_sink/snapshots/test_sensor.ambr
@@ -29,6 +29,115 @@
       'last_updated': <ANY>,
       'state': '1500',
     }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'wind_direction',
+        'friendly_name': 'Statistics issues Issue 5',
+        'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
+        'unit_of_measurement': '°',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.statistics_issues_issue_5',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': '100',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'Statistics issues Issue 1',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.statistics_issues_issue_1',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': '100',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'Statistics issues Issue 2',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': 'dogs',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.statistics_issues_issue_2',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': '100',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'Statistics issues Issue 3',
+        'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.statistics_issues_issue_3',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': '100',
+    }),
+  })
+# ---
+# name: test_states_with_subentry
+  set({
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'power',
+        'friendly_name': 'Outlet 1 Power',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.outlet_1_power',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': '50',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'power',
+        'friendly_name': 'Outlet 2 Power',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.outlet_2_power',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': '1500',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'wind_direction',
+        'friendly_name': 'Statistics issues Issue 5',
+        'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
+        'unit_of_measurement': '°',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.statistics_issues_issue_5',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': '100',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'Sensor test',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.sensor_test',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': '15',
+    }),
     StateSnapshot({
       'attributes': ReadOnlyDict({
         'friendly_name': 'Statistics issues Issue 1',
diff --git a/tests/components/kitchen_sink/snapshots/test_switch.ambr b/tests/components/kitchen_sink/snapshots/test_switch.ambr
index fe4311ad711..5535554017f 100644
--- a/tests/components/kitchen_sink/snapshots/test_switch.ambr
+++ b/tests/components/kitchen_sink/snapshots/test_switch.ambr
@@ -19,6 +19,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -49,6 +50,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -81,6 +83,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -129,6 +132,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -159,6 +163,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -191,6 +196,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/kitchen_sink/test_backup.py b/tests/components/kitchen_sink/test_backup.py
index 9e46845e1cb..933979ee913 100644
--- a/tests/components/kitchen_sink/test_backup.py
+++ b/tests/components/kitchen_sink/test_backup.py
@@ -2,7 +2,7 @@
 
 from collections.abc import AsyncGenerator
 from io import StringIO
-from unittest.mock import patch
+from unittest.mock import ANY, patch
 
 import pytest
 
@@ -15,6 +15,7 @@ from homeassistant.components.backup import (
 from homeassistant.components.kitchen_sink import DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import instance_id
+from homeassistant.helpers.backup import async_initialize_backup
 from homeassistant.setup import async_setup_component
 
 from tests.typing import ClientSessionGenerator, WebSocketGenerator
@@ -35,7 +36,8 @@ async def backup_only() -> AsyncGenerator[None]:
 
 @pytest.fixture(autouse=True)
 async def setup_integration(hass: HomeAssistant) -> AsyncGenerator[None]:
-    """Set up Kitchen Sink integration."""
+    """Set up Kitchen Sink and backup integrations."""
+    async_initialize_backup(hass)
     with patch("homeassistant.components.backup.is_hassio", return_value=False):
         assert await async_setup_component(hass, BACKUP_DOMAIN, {BACKUP_DOMAIN: {}})
         assert await async_setup_component(hass, DOMAIN, {DOMAIN: {}})
@@ -55,7 +57,10 @@ async def test_agents_info(
 
     assert response["success"]
     assert response["result"] == {
-        "agents": [{"agent_id": "backup.local"}, {"agent_id": "kitchen_sink.syncer"}],
+        "agents": [
+            {"agent_id": "backup.local", "name": "local"},
+            {"agent_id": "kitchen_sink.syncer", "name": "syncer"},
+        ],
     }
 
     config_entry = hass.config_entries.async_entries(DOMAIN)[0]
@@ -66,7 +71,9 @@ async def test_agents_info(
     response = await client.receive_json()
 
     assert response["success"]
-    assert response["result"] == {"agents": [{"agent_id": "backup.local"}]}
+    assert response["result"] == {
+        "agents": [{"agent_id": "backup.local", "name": "local"}]
+    }
 
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
@@ -76,7 +83,10 @@ async def test_agents_info(
 
     assert response["success"]
     assert response["result"] == {
-        "agents": [{"agent_id": "backup.local"}, {"agent_id": "kitchen_sink.syncer"}],
+        "agents": [
+            {"agent_id": "backup.local", "name": "local"},
+            {"agent_id": "kitchen_sink.syncer", "name": "syncer"},
+        ],
     }
 
 
@@ -94,17 +104,16 @@ async def test_agents_list_backups(
     assert response["result"]["backups"] == [
         {
             "addons": [{"name": "Test", "slug": "test", "version": "1.0.0"}],
-            "agent_ids": ["kitchen_sink.syncer"],
+            "agents": {"kitchen_sink.syncer": {"protected": False, "size": 1234}},
             "backup_id": "abc123",
             "database_included": False,
             "date": "1970-01-01T00:00:00Z",
+            "extra_metadata": {},
             "failed_agent_ids": [],
             "folders": ["media", "share"],
             "homeassistant_included": True,
             "homeassistant_version": "2024.12.0",
             "name": "Kitchen sink syncer",
-            "protected": False,
-            "size": 1234,
             "with_automatic_settings": None,
         }
     ]
@@ -177,17 +186,16 @@ async def test_agents_upload(
     assert len(backup_list) == 2
     assert backup_list[1] == {
         "addons": [{"name": "Test", "slug": "test", "version": "1.0.0"}],
-        "agent_ids": ["kitchen_sink.syncer"],
+        "agents": {"kitchen_sink.syncer": {"protected": False, "size": 0.0}},
         "backup_id": "test-backup",
         "database_included": True,
         "date": "1970-01-01T00:00:00.000Z",
+        "extra_metadata": {"instance_id": ANY, "with_automatic_settings": False},
         "failed_agent_ids": [],
         "folders": ["media", "share"],
         "homeassistant_included": True,
         "homeassistant_version": "2024.12.0",
         "name": "Test",
-        "protected": False,
-        "size": 0.0,
         "with_automatic_settings": False,
     }
 
diff --git a/tests/components/kitchen_sink/test_config_flow.py b/tests/components/kitchen_sink/test_config_flow.py
index 5f163d1342e..88bacc2cb0b 100644
--- a/tests/components/kitchen_sink/test_config_flow.py
+++ b/tests/components/kitchen_sink/test_config_flow.py
@@ -96,6 +96,15 @@ async def test_options_flow(hass: HomeAssistant) -> None:
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "options_1"
 
+    section_marker, section_schema = list(result["data_schema"].schema.items())[0]
+    assert section_marker == "section_1"
+    section_schema_markers = list(section_schema.schema.schema)
+    assert len(section_schema_markers) == 2
+    assert section_schema_markers[0] == "bool"
+    assert section_schema_markers[0].description is None
+    assert section_schema_markers[1] == "int"
+    assert section_schema_markers[1].description == {"suggested_value": 10}
+
     result = await hass.config_entries.options.async_configure(
         result["flow_id"],
         user_input={"section_1": {"bool": True, "int": 15}},
@@ -104,3 +113,85 @@ async def test_options_flow(hass: HomeAssistant) -> None:
     assert config_entry.options == {"section_1": {"bool": True, "int": 15}}
 
     await hass.async_block_till_done()
+
+
+@pytest.mark.usefixtures("no_platforms")
+async def test_subentry_flow(hass: HomeAssistant) -> None:
+    """Test config flow options."""
+    config_entry = MockConfigEntry(domain=DOMAIN)
+    config_entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    result = await hass.config_entries.subentries.async_init(
+        (config_entry.entry_id, "entity"),
+        context={"source": config_entries.SOURCE_USER},
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "add_sensor"
+
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input={"name": "Sensor 1", "state": 15},
+    )
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    subentry_id = list(config_entry.subentries)[0]
+    assert config_entry.subentries == {
+        subentry_id: config_entries.ConfigSubentry(
+            data={"state": 15},
+            subentry_id=subentry_id,
+            subentry_type="entity",
+            title="Sensor 1",
+            unique_id=None,
+        )
+    }
+
+    await hass.async_block_till_done()
+
+
+@pytest.mark.usefixtures("no_platforms")
+async def test_subentry_reconfigure_flow(hass: HomeAssistant) -> None:
+    """Test config flow options."""
+    subentry_id = "mock_id"
+    config_entry = MockConfigEntry(
+        domain=DOMAIN,
+        subentries_data=[
+            config_entries.ConfigSubentryData(
+                data={"state": 15},
+                subentry_id="mock_id",
+                subentry_type="entity",
+                title="Sensor 1",
+                unique_id=None,
+            )
+        ],
+    )
+    config_entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    result = await config_entry.start_subentry_reconfigure_flow(
+        hass, "entity", subentry_id
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reconfigure_sensor"
+
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input={"name": "Renamed sensor 1", "state": 5},
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reconfigure_successful"
+
+    assert config_entry.subentries == {
+        subentry_id: config_entries.ConfigSubentry(
+            data={"state": 5},
+            subentry_id=subentry_id,
+            subentry_type="entity",
+            title="Renamed sensor 1",
+            unique_id=None,
+        )
+    }
+
+    await hass.async_block_till_done()
diff --git a/tests/components/kitchen_sink/test_init.py b/tests/components/kitchen_sink/test_init.py
index b832577a48a..526801aecfa 100644
--- a/tests/components/kitchen_sink/test_init.py
+++ b/tests/components/kitchen_sink/test_init.py
@@ -5,11 +5,13 @@ from http import HTTPStatus
 from unittest.mock import ANY
 
 import pytest
+from syrupy.assertion import SnapshotAssertion
 import voluptuous as vol
 
 from homeassistant.components.kitchen_sink import DOMAIN
 from homeassistant.components.recorder import get_instance
 from homeassistant.components.recorder.statistics import (
+    StatisticMeanType,
     async_add_external_statistics,
     get_last_statistics,
     list_statistic_ids,
@@ -17,7 +19,7 @@ from homeassistant.components.recorder.statistics import (
 from homeassistant.components.repairs import DOMAIN as REPAIRS_DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM
 
 from tests.components.recorder.common import async_wait_recording_done
@@ -44,6 +46,7 @@ async def test_demo_statistics(hass: HomeAssistant) -> None:
     assert {
         "display_unit_of_measurement": "°C",
         "has_mean": True,
+        "mean_type": StatisticMeanType.ARITHMETIC,
         "has_sum": False,
         "name": "Outdoor temperature",
         "source": DOMAIN,
@@ -54,6 +57,7 @@ async def test_demo_statistics(hass: HomeAssistant) -> None:
     assert {
         "display_unit_of_measurement": "kWh",
         "has_mean": False,
+        "mean_type": StatisticMeanType.NONE,
         "has_sum": True,
         "name": "Energy consumption 1",
         "source": DOMAIN,
@@ -102,6 +106,25 @@ async def test_demo_statistics_growth(hass: HomeAssistant) -> None:
     assert statistics[statistic_id][0]["sum"] <= (2**20 + 24)
 
 
+@pytest.mark.usefixtures("recorder_mock", "mock_history")
+async def test_statistics_issues(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test that the kitchen sink sum statistics causes statistics issues."""
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {}})
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await async_wait_recording_done(hass)
+
+    ws_client = await hass_ws_client(hass)
+    await ws_client.send_json_auto_id({"type": "recorder/validate_statistics"})
+    response = await ws_client.receive_json()
+    assert response["success"]
+    assert response["result"] == snapshot
+
+
 @pytest.mark.freeze_time("2023-10-21")
 @pytest.mark.usefixtures("mock_history")
 async def test_issues_created(
diff --git a/tests/components/kitchen_sink/test_sensor.py b/tests/components/kitchen_sink/test_sensor.py
index c4b5f03499e..f980e39f652 100644
--- a/tests/components/kitchen_sink/test_sensor.py
+++ b/tests/components/kitchen_sink/test_sensor.py
@@ -5,11 +5,14 @@ from unittest.mock import patch
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
+from homeassistant import config_entries
 from homeassistant.components.kitchen_sink import DOMAIN
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
+from tests.common import MockConfigEntry
+
 
 @pytest.fixture
 async def sensor_only() -> None:
@@ -21,14 +24,41 @@ async def sensor_only() -> None:
         yield
 
 
-@pytest.fixture(autouse=True)
+@pytest.fixture
 async def setup_comp(hass: HomeAssistant, sensor_only):
     """Set up demo component."""
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {}})
     await hass.async_block_till_done()
 
 
+@pytest.mark.usefixtures("setup_comp")
 async def test_states(hass: HomeAssistant, snapshot: SnapshotAssertion) -> None:
     """Test the expected sensor entities are added."""
     states = hass.states.async_all()
     assert set(states) == snapshot
+
+
+@pytest.mark.usefixtures("sensor_only")
+async def test_states_with_subentry(
+    hass: HomeAssistant, snapshot: SnapshotAssertion
+) -> None:
+    """Test the expected sensor entities are added."""
+    config_entry = MockConfigEntry(
+        domain=DOMAIN,
+        subentries_data=[
+            config_entries.ConfigSubentryData(
+                data={"state": 15},
+                subentry_id="blabla",
+                subentry_type="entity",
+                title="Sensor test",
+                unique_id=None,
+            )
+        ],
+    )
+    config_entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    states = hass.states.async_all()
+    assert set(states) == snapshot
diff --git a/tests/components/knocki/snapshots/test_event.ambr b/tests/components/knocki/snapshots/test_event.ambr
index fba1c90b45d..65fecd59739 100644
--- a/tests/components/knocki/snapshots/test_event.ambr
+++ b/tests/components/knocki/snapshots/test_event.ambr
@@ -10,6 +10,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/knx/README.md b/tests/components/knx/README.md
index ef8398b3d17..71218010b45 100644
--- a/tests/components/knx/README.md
+++ b/tests/components/knx/README.md
@@ -3,17 +3,22 @@
 A KNXTestKit instance can be requested from a fixture. It provides convenience methods
 to test outgoing KNX telegrams and inject incoming telegrams.
 To test something add a test function requesting the `hass` and `knx` fixture and
-set up the KNX integration by passing a KNX config dict to `knx.setup_integration`.
+set up the KNX integration with `knx.setup_integration`.
+You can pass a KNX YAML-config dict or a ConfigStore fixture filename to the setup method. The fixture should be placed in the `tests/components/knx/fixtures` directory.
 
 ```python
-async def test_something(hass, knx):
-    await knx.setup_integration({
+async def test_some_yaml(hass: HomeAssistant, knx: KNXTestKit):
+    await knx.setup_integration(
+        yaml_config={
             "switch": {
                 "name": "test_switch",
                 "address": "1/2/3",
             }
         }
     )
+
+async def test_some_config_store(hass: HomeAssistant, knx: KNXTestKit):
+    await knx.setup_integration(config_store_fixture="config_store_filename.json")
 ```
 
 ## Asserting outgoing telegrams
diff --git a/tests/components/knx/conftest.py b/tests/components/knx/conftest.py
index 4e50836bb79..c9092a1774f 100644
--- a/tests/components/knx/conftest.py
+++ b/tests/components/knx/conftest.py
@@ -44,7 +44,6 @@ from tests.common import MockConfigEntry, load_json_object_fixture
 from tests.typing import WebSocketGenerator
 
 FIXTURE_PROJECT_DATA = load_json_object_fixture("project.json", KNX_DOMAIN)
-FIXTURE_CONFIG_STORAGE_DATA = load_json_object_fixture("config_store.json", KNX_DOMAIN)
 
 
 class KNXTestKit:
@@ -52,10 +51,16 @@ class KNXTestKit:
 
     INDIVIDUAL_ADDRESS = "1.2.3"
 
-    def __init__(self, hass: HomeAssistant, mock_config_entry: MockConfigEntry) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        mock_config_entry: MockConfigEntry,
+        hass_storage: dict[str, Any],
+    ) -> None:
         """Init KNX test helper class."""
         self.hass: HomeAssistant = hass
         self.mock_config_entry: MockConfigEntry = mock_config_entry
+        self.hass_storage: dict[str, Any] = hass_storage
         self.xknx: XKNX
         # outgoing telegrams will be put in the List instead of sent to the interface
         # telegrams to an InternalGroupAddress won't be queued here
@@ -69,7 +74,10 @@ class KNXTestKit:
             assert test_state.attributes.get(attribute) == value
 
     async def setup_integration(
-        self, config: ConfigType, add_entry_to_hass: bool = True
+        self,
+        yaml_config: ConfigType | None = None,
+        config_store_fixture: str | None = None,
+        add_entry_to_hass: bool = True,
     ) -> None:
         """Create the KNX integration."""
 
@@ -101,15 +109,21 @@ class KNXTestKit:
             self.xknx = args[0]
             return DEFAULT
 
+        if config_store_fixture:
+            self.hass_storage[KNX_CONFIG_STORAGE_KEY] = load_json_object_fixture(
+                config_store_fixture, KNX_DOMAIN
+            )
+
         if add_entry_to_hass:
             self.mock_config_entry.add_to_hass(self.hass)
 
+        knx_config = {KNX_DOMAIN: yaml_config or {}}
         with patch(
             "xknx.xknx.knx_interface_factory",
             return_value=knx_ip_interface_mock(),
             side_effect=fish_xknx,
         ):
-            await async_setup_component(self.hass, KNX_DOMAIN, {KNX_DOMAIN: config})
+            await async_setup_component(self.hass, KNX_DOMAIN, knx_config)
             await self.hass.async_block_till_done()
 
     ########################
@@ -306,9 +320,13 @@ def mock_config_entry() -> MockConfigEntry:
 
 
 @pytest.fixture
-async def knx(hass: HomeAssistant, mock_config_entry: MockConfigEntry):
+async def knx(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    hass_storage: dict[str, Any],
+):
     """Create a KNX TestKit instance."""
-    knx_test_kit = KNXTestKit(hass, mock_config_entry)
+    knx_test_kit = KNXTestKit(hass, mock_config_entry, hass_storage)
     yield knx_test_kit
     await knx_test_kit.assert_no_telegram()
 
@@ -322,12 +340,6 @@ def load_knxproj(hass_storage: dict[str, Any]) -> None:
     }
 
 
-@pytest.fixture
-def load_config_store(hass_storage: dict[str, Any]) -> None:
-    """Mock KNX config store data."""
-    hass_storage[KNX_CONFIG_STORAGE_KEY] = FIXTURE_CONFIG_STORAGE_DATA
-
-
 @pytest.fixture
 async def create_ui_entity(
     hass: HomeAssistant,
diff --git a/tests/components/knx/fixtures/config_store_binarysensor.json b/tests/components/knx/fixtures/config_store_binarysensor.json
new file mode 100644
index 00000000000..427867cff8c
--- /dev/null
+++ b/tests/components/knx/fixtures/config_store_binarysensor.json
@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "minor_version": 1,
+  "key": "knx/config_store.json",
+  "data": {
+    "entities": {
+      "light": {},
+      "binary_sensor": {
+        "knx_es_01JJP1XDQRXB0W6YYGXW6Y1X10": {
+          "entity": {
+            "name": "test",
+            "device_info": null,
+            "entity_category": null
+          },
+          "knx": {
+            "ga_sensor": {
+              "state": "3/2/21",
+              "passive": []
+            },
+            "respond_to_read": false,
+            "sync_state": true
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/knx/fixtures/config_store.json b/tests/components/knx/fixtures/config_store_light_switch.json
similarity index 100%
rename from tests/components/knx/fixtures/config_store.json
rename to tests/components/knx/fixtures/config_store_light_switch.json
diff --git a/tests/components/knx/test_binary_sensor.py b/tests/components/knx/test_binary_sensor.py
index dbb8d2ee832..b93b7e965df 100644
--- a/tests/components/knx/test_binary_sensor.py
+++ b/tests/components/knx/test_binary_sensor.py
@@ -1,10 +1,19 @@
 """Test KNX binary sensor."""
 
 from datetime import timedelta
+from typing import Any
 
 from freezegun.api import FrozenDateTimeFactory
+import pytest
 
-from homeassistant.components.knx.const import CONF_STATE_ADDRESS, CONF_SYNC_STATE
+from homeassistant.components.knx.const import (
+    CONF_CONTEXT_TIMEOUT,
+    CONF_IGNORE_INTERNAL_STATE,
+    CONF_INVERT,
+    CONF_RESET_AFTER,
+    CONF_STATE_ADDRESS,
+    CONF_SYNC_STATE,
+)
 from homeassistant.components.knx.schema import BinarySensorSchema
 from homeassistant.const import (
     CONF_ENTITY_CATEGORY,
@@ -12,10 +21,12 @@ from homeassistant.const import (
     STATE_OFF,
     STATE_ON,
     EntityCategory,
+    Platform,
 )
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers import entity_registry as er
 
+from . import KnxEntityGenerator
 from .conftest import KNXTestKit
 
 from tests.common import (
@@ -60,7 +71,7 @@ async def test_binary_sensor(hass: HomeAssistant, knx: KNXTestKit) -> None:
                 {
                     CONF_NAME: "test_invert",
                     CONF_STATE_ADDRESS: "2/2/2",
-                    BinarySensorSchema.CONF_INVERT: True,
+                    CONF_INVERT: True,
                 },
             ]
         }
@@ -113,7 +124,7 @@ async def test_binary_sensor_ignore_internal_state(
                 {
                     CONF_NAME: "test_ignore",
                     CONF_STATE_ADDRESS: "2/2/2",
-                    BinarySensorSchema.CONF_IGNORE_INTERNAL_STATE: True,
+                    CONF_IGNORE_INTERNAL_STATE: True,
                     CONF_SYNC_STATE: False,
                 },
             ]
@@ -156,7 +167,7 @@ async def test_binary_sensor_counter(
                 {
                     CONF_NAME: "test",
                     CONF_STATE_ADDRESS: "2/2/2",
-                    BinarySensorSchema.CONF_CONTEXT_TIMEOUT: context_timeout,
+                    CONF_CONTEXT_TIMEOUT: context_timeout,
                     CONF_SYNC_STATE: False,
                 },
             ]
@@ -220,7 +231,7 @@ async def test_binary_sensor_reset(
                 {
                     CONF_NAME: "test",
                     CONF_STATE_ADDRESS: "2/2/2",
-                    BinarySensorSchema.CONF_RESET_AFTER: 1,
+                    CONF_RESET_AFTER: 1,
                     CONF_SYNC_STATE: False,
                 },
             ]
@@ -279,7 +290,7 @@ async def test_binary_sensor_restore_invert(hass: HomeAssistant, knx) -> None:
                 {
                     CONF_NAME: "test",
                     CONF_STATE_ADDRESS: _ADDRESS,
-                    BinarySensorSchema.CONF_INVERT: True,
+                    CONF_INVERT: True,
                     CONF_SYNC_STATE: False,
                 },
             ]
@@ -295,3 +306,44 @@ async def test_binary_sensor_restore_invert(hass: HomeAssistant, knx) -> None:
     await knx.receive_write(_ADDRESS, True)
     state = hass.states.get("binary_sensor.test")
     assert state.state is STATE_OFF
+
+
+@pytest.mark.parametrize(
+    ("knx_data"),
+    [
+        {
+            "ga_sensor": {"state": "2/2/2"},
+            "sync_state": True,
+        },
+        {
+            "ga_sensor": {"state": "2/2/2"},
+            "sync_state": True,
+            "invert": True,
+        },
+    ],
+)
+async def test_binary_sensor_ui_create(
+    hass: HomeAssistant,
+    knx: KNXTestKit,
+    create_ui_entity: KnxEntityGenerator,
+    knx_data: dict[str, Any],
+) -> None:
+    """Test creating a binary sensor."""
+    await knx.setup_integration()
+    await create_ui_entity(
+        platform=Platform.BINARY_SENSOR,
+        entity_data={"name": "test"},
+        knx_data=knx_data,
+    )
+    # created entity sends read-request to KNX bus
+    await knx.assert_read("2/2/2")
+    await knx.receive_response("2/2/2", not knx_data.get("invert"))
+    state = hass.states.get("binary_sensor.test")
+    assert state.state is STATE_ON
+
+
+async def test_binary_sensor_ui_load(knx: KNXTestKit) -> None:
+    """Test loading a binary sensor from storage."""
+    await knx.setup_integration(config_store_fixture="config_store_binarysensor.json")
+    await knx.assert_read("3/2/21", response=True, ignore_order=True)
+    knx.assert_state("binary_sensor.test", STATE_ON)
diff --git a/tests/components/knx/test_climate.py b/tests/components/knx/test_climate.py
index 8fb348f1724..b5a90428ef2 100644
--- a/tests/components/knx/test_climate.py
+++ b/tests/components/knx/test_climate.py
@@ -850,3 +850,91 @@ async def test_climate_humidity(hass: HomeAssistant, knx: KNXTestKit) -> None:
         HVACMode.HEAT,
         current_humidity=45.6,
     )
+
+
+async def test_swing(hass: HomeAssistant, knx: KNXTestKit) -> None:
+    """Test KNX climate swing."""
+    await knx.setup_integration(
+        {
+            ClimateSchema.PLATFORM: {
+                CONF_NAME: "test",
+                ClimateSchema.CONF_TEMPERATURE_ADDRESS: "1/2/3",
+                ClimateSchema.CONF_TARGET_TEMPERATURE_ADDRESS: "1/2/4",
+                ClimateSchema.CONF_TARGET_TEMPERATURE_STATE_ADDRESS: "1/2/5",
+                ClimateSchema.CONF_SWING_ADDRESS: "1/2/6",
+                ClimateSchema.CONF_SWING_STATE_ADDRESS: "1/2/7",
+            }
+        }
+    )
+
+    # read states state updater
+    await knx.assert_read("1/2/3")
+    await knx.assert_read("1/2/5")
+
+    # StateUpdater initialize state
+    await knx.receive_response("1/2/5", RAW_FLOAT_22_0)
+    await knx.receive_response("1/2/3", RAW_FLOAT_21_0)
+
+    # Query status
+    await knx.assert_read("1/2/7")
+    await knx.receive_response("1/2/7", True)
+    knx.assert_state(
+        "climate.test",
+        HVACMode.HEAT,
+        swing_mode="on",
+        swing_modes=["on", "off"],
+    )
+
+    # turn off
+    await hass.services.async_call(
+        "climate",
+        "set_swing_mode",
+        {"entity_id": "climate.test", "swing_mode": "off"},
+        blocking=True,
+    )
+    await knx.assert_write("1/2/6", False)
+    knx.assert_state("climate.test", HVACMode.HEAT, swing_mode="off")
+
+
+async def test_horizontal_swing(hass: HomeAssistant, knx: KNXTestKit) -> None:
+    """Test KNX climate horizontal swing."""
+    await knx.setup_integration(
+        {
+            ClimateSchema.PLATFORM: {
+                CONF_NAME: "test",
+                ClimateSchema.CONF_TEMPERATURE_ADDRESS: "1/2/3",
+                ClimateSchema.CONF_TARGET_TEMPERATURE_ADDRESS: "1/2/4",
+                ClimateSchema.CONF_TARGET_TEMPERATURE_STATE_ADDRESS: "1/2/5",
+                ClimateSchema.CONF_SWING_HORIZONTAL_ADDRESS: "1/2/6",
+                ClimateSchema.CONF_SWING_HORIZONTAL_STATE_ADDRESS: "1/2/7",
+            }
+        }
+    )
+
+    # read states state updater
+    await knx.assert_read("1/2/3")
+    await knx.assert_read("1/2/5")
+
+    # StateUpdater initialize state
+    await knx.receive_response("1/2/5", RAW_FLOAT_22_0)
+    await knx.receive_response("1/2/3", RAW_FLOAT_21_0)
+
+    # Query status
+    await knx.assert_read("1/2/7")
+    await knx.receive_response("1/2/7", True)
+    knx.assert_state(
+        "climate.test",
+        HVACMode.HEAT,
+        swing_horizontal_mode="on",
+        swing_horizontal_modes=["on", "off"],
+    )
+
+    # turn off
+    await hass.services.async_call(
+        "climate",
+        "set_swing_horizontal_mode",
+        {"entity_id": "climate.test", "swing_horizontal_mode": "off"},
+        blocking=True,
+    )
+    await knx.assert_write("1/2/6", False)
+    knx.assert_state("climate.test", HVACMode.HEAT, swing_horizontal_mode="off")
diff --git a/tests/components/knx/test_config_flow.py b/tests/components/knx/test_config_flow.py
index 8ed79f837bb..3e4c9408542 100644
--- a/tests/components/knx/test_config_flow.py
+++ b/tests/components/knx/test_config_flow.py
@@ -1278,7 +1278,7 @@ async def test_options_flow_connection_type(
     # usage of the already running XKNX instance for gateway scanner
     gateway = _gateway_descriptor("192.168.0.1", 3675)
 
-    await knx.setup_integration({})
+    await knx.setup_integration()
     menu_step = await hass.config_entries.options.async_init(mock_config_entry.entry_id)
 
     with patch(
diff --git a/tests/components/knx/test_config_store.py b/tests/components/knx/test_config_store.py
index 116f4b5d839..aee0a4036ff 100644
--- a/tests/components/knx/test_config_store.py
+++ b/tests/components/knx/test_config_store.py
@@ -25,7 +25,7 @@ async def test_create_entity(
     create_ui_entity: KnxEntityGenerator,
 ) -> None:
     """Test entity creation."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     client = await hass_ws_client(hass)
 
     test_name = "Test no device"
@@ -69,7 +69,7 @@ async def test_create_entity_error(
     hass_ws_client: WebSocketGenerator,
 ) -> None:
     """Test unsuccessful entity creation."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     client = await hass_ws_client(hass)
 
     # create entity with invalid platform
@@ -116,7 +116,7 @@ async def test_update_entity(
     create_ui_entity: KnxEntityGenerator,
 ) -> None:
     """Test entity update."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     client = await hass_ws_client(hass)
 
     test_entity = await create_ui_entity(
@@ -163,7 +163,7 @@ async def test_update_entity_error(
     create_ui_entity: KnxEntityGenerator,
 ) -> None:
     """Test entity update."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     client = await hass_ws_client(hass)
 
     test_entity = await create_ui_entity(
@@ -238,7 +238,7 @@ async def test_delete_entity(
     create_ui_entity: KnxEntityGenerator,
 ) -> None:
     """Test entity deletion."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     client = await hass_ws_client(hass)
 
     test_entity = await create_ui_entity(
@@ -270,7 +270,7 @@ async def test_delete_entity_error(
     hass_storage: dict[str, Any],
 ) -> None:
     """Test unsuccessful entity deletion."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     client = await hass_ws_client(hass)
 
     # delete unknown entity
@@ -307,7 +307,7 @@ async def test_get_entity_config(
     create_ui_entity: KnxEntityGenerator,
 ) -> None:
     """Test entity config retrieval."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     client = await hass_ws_client(hass)
 
     test_entity = await create_ui_entity(
@@ -355,7 +355,7 @@ async def test_get_entity_config_error(
     error_message_start: str,
 ) -> None:
     """Test entity config retrieval errors."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     client = await hass_ws_client(hass)
 
     await client.send_json_auto_id(
@@ -376,7 +376,7 @@ async def test_validate_entity(
     hass_ws_client: WebSocketGenerator,
 ) -> None:
     """Test entity validation."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     client = await hass_ws_client(hass)
 
     await client.send_json_auto_id(
diff --git a/tests/components/knx/test_device.py b/tests/components/knx/test_device.py
index 04ff02f0611..356640dd8d0 100644
--- a/tests/components/knx/test_device.py
+++ b/tests/components/knx/test_device.py
@@ -22,7 +22,7 @@ async def test_create_device(
     hass_ws_client: WebSocketGenerator,
 ) -> None:
     """Test device creation."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     client = await hass_ws_client(hass)
 
     await client.send_json_auto_id(
@@ -50,12 +50,11 @@ async def test_remove_device(
     device_registry: dr.DeviceRegistry,
     entity_registry: er.EntityRegistry,
     hass_ws_client: WebSocketGenerator,
-    load_config_store: None,
     hass_storage: dict[str, Any],
 ) -> None:
     """Test device removal."""
     assert await async_setup_component(hass, "config", {})
-    await knx.setup_integration({})
+    await knx.setup_integration(config_store_fixture="config_store_light_switch.json")
     client = await hass_ws_client(hass)
 
     await knx.assert_read("1/0/21", response=True, ignore_order=True)  # test light
diff --git a/tests/components/knx/test_device_trigger.py b/tests/components/knx/test_device_trigger.py
index e5f776a9404..e4a208906c6 100644
--- a/tests/components/knx/test_device_trigger.py
+++ b/tests/components/knx/test_device_trigger.py
@@ -28,7 +28,7 @@ async def test_if_fires_on_telegram(
     knx: KNXTestKit,
 ) -> None:
     """Test telegram device triggers firing."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     device_entry = device_registry.async_get_device(
         identifiers={(DOMAIN, f"_{knx.mock_config_entry.entry_id}_interface")}
     )
@@ -124,7 +124,7 @@ async def test_default_if_fires_on_telegram(
     # by default (without a user changing any) extra_fields are not added to the trigger and
     # pre 2024.2 device triggers did only support "destination" field so they didn't have
     # "group_value_write", "group_value_response", "group_value_read", "incoming", "outgoing"
-    await knx.setup_integration({})
+    await knx.setup_integration()
     device_entry = device_registry.async_get_device(
         identifiers={(DOMAIN, f"_{knx.mock_config_entry.entry_id}_interface")}
     )
@@ -206,7 +206,7 @@ async def test_remove_device_trigger(
 ) -> None:
     """Test for removed callback when device trigger not used."""
     automation_name = "telegram_trigger_automation"
-    await knx.setup_integration({})
+    await knx.setup_integration()
     device_entry = device_registry.async_get_device(
         identifiers={(DOMAIN, f"_{knx.mock_config_entry.entry_id}_interface")}
     )
@@ -256,7 +256,7 @@ async def test_get_triggers(
     knx: KNXTestKit,
 ) -> None:
     """Test we get the expected device triggers from knx."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     device_entry = device_registry.async_get_device(
         identifiers={(DOMAIN, f"_{knx.mock_config_entry.entry_id}_interface")}
     )
@@ -279,7 +279,7 @@ async def test_get_trigger_capabilities(
     knx: KNXTestKit,
 ) -> None:
     """Test we get the expected capabilities telegram device trigger."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     device_entry = device_registry.async_get_device(
         identifiers={(DOMAIN, f"_{knx.mock_config_entry.entry_id}_interface")}
     )
@@ -361,7 +361,7 @@ async def test_invalid_device_trigger(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test invalid telegram device trigger configuration."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     device_entry = device_registry.async_get_device(
         identifiers={(DOMAIN, f"_{knx.mock_config_entry.entry_id}_interface")}
     )
@@ -404,7 +404,7 @@ async def test_invalid_trigger_configuration(
     knx: KNXTestKit,
 ) -> None:
     """Test invalid telegram device trigger configuration at attach_trigger."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     device_entry = device_registry.async_get_device(
         identifiers={(DOMAIN, f"_{knx.mock_config_entry.entry_id}_interface")}
     )
diff --git a/tests/components/knx/test_diagnostic.py b/tests/components/knx/test_diagnostic.py
index bb60e66f7e7..6d4bf7e6007 100644
--- a/tests/components/knx/test_diagnostic.py
+++ b/tests/components/knx/test_diagnostic.py
@@ -1,5 +1,7 @@
 """Tests for the diagnostics data provided by the KNX integration."""
 
+from typing import Any
+
 import pytest
 from syrupy import SnapshotAssertion
 from xknx.io import DEFAULT_MCAST_GRP, DEFAULT_MCAST_PORT
@@ -40,7 +42,7 @@ async def test_diagnostics(
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test diagnostics."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
 
     # Overwrite the version for this test since we don't want to change this with every library bump
     knx.xknx.version = "0.0.0"
@@ -60,7 +62,7 @@ async def test_diagnostic_config_error(
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test diagnostics."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
 
     # Overwrite the version for this test since we don't want to change this with every library bump
     knx.xknx.version = "0.0.0"
@@ -76,6 +78,7 @@ async def test_diagnostic_config_error(
 async def test_diagnostic_redact(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
+    hass_storage: dict[str, Any],
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test diagnostics redacting data."""
@@ -95,8 +98,8 @@ async def test_diagnostic_redact(
             CONF_KNX_ROUTING_BACKBONE_KEY: "bbaacc44bbaacc44bbaacc44bbaacc44",
         },
     )
-    knx: KNXTestKit = KNXTestKit(hass, mock_config_entry)
-    await knx.setup_integration({})
+    knx: KNXTestKit = KNXTestKit(hass, mock_config_entry, hass_storage)
+    await knx.setup_integration()
 
     # Overwrite the version for this test since we don't want to change this with every library bump
     knx.xknx.version = "0.0.0"
@@ -117,7 +120,7 @@ async def test_diagnostics_project(
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test diagnostics."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     knx.xknx.version = "0.0.0"
     # snapshot will contain project specific fields in `project_info`
     assert (
diff --git a/tests/components/knx/test_expose.py b/tests/components/knx/test_expose.py
index 0fd790a3e33..f7a3f4e94f2 100644
--- a/tests/components/knx/test_expose.py
+++ b/tests/components/knx/test_expose.py
@@ -348,19 +348,20 @@ async def test_expose_conversion_exception(
     )
 
 
-@freeze_time("2022-1-7 9:13:14")
+@freeze_time("2022-1-7 9:13:14")  # UTC -> +1h = Vienna in winter (9 -> 0xA)
 @pytest.mark.parametrize(
     ("time_type", "raw"),
     [
-        ("time", (0xA9, 0x0D, 0x0E)),  # localtime includes day of week
+        ("time", (0xAA, 0x0D, 0x0E)),  # localtime includes day of week
         ("date", (0x07, 0x01, 0x16)),
-        ("datetime", (0x7A, 0x1, 0x7, 0xA9, 0xD, 0xE, 0x20, 0xC0)),
+        ("datetime", (0x7A, 0x1, 0x7, 0xAA, 0xD, 0xE, 0x20, 0xC0)),
     ],
 )
 async def test_expose_with_date(
     hass: HomeAssistant, knx: KNXTestKit, time_type: str, raw: tuple[int, ...]
 ) -> None:
     """Test an expose with a date."""
+    await hass.config.async_set_time_zone("Europe/Vienna")
     await knx.setup_integration(
         {
             CONF_KNX_EXPOSE: {
diff --git a/tests/components/knx/test_init.py b/tests/components/knx/test_init.py
index 75cd5d1eb21..579f9b143a2 100644
--- a/tests/components/knx/test_init.py
+++ b/tests/components/knx/test_init.py
@@ -226,7 +226,7 @@ async def test_init_connection_handling(
         data=config_entry_data,
     )
     knx.mock_config_entry = config_entry
-    await knx.setup_integration({})
+    await knx.setup_integration()
 
     assert hass.data.get(KNX_DOMAIN) is not None
 
@@ -280,7 +280,7 @@ async def _init_switch_and_wait_for_first_state_updater_run(
         title="KNX", domain=KNX_DOMAIN, data=config_entry_data
     )
     knx.mock_config_entry = config_entry
-    await knx.setup_integration({})
+    await knx.setup_integration()
     await create_ui_entity(
         platform=Platform.SWITCH,
         knx_data={
@@ -354,7 +354,7 @@ async def test_async_remove_entry(
         },
     )
     knx.mock_config_entry = config_entry
-    await knx.setup_integration({})
+    await knx.setup_integration()
 
     with (
         patch("pathlib.Path.unlink") as unlink_mock,
diff --git a/tests/components/knx/test_interface_device.py b/tests/components/knx/test_interface_device.py
index 79114d4ffd5..4de366c69f0 100644
--- a/tests/components/knx/test_interface_device.py
+++ b/tests/components/knx/test_interface_device.py
@@ -25,7 +25,7 @@ async def test_diagnostic_entities(
     freezer: FrozenDateTimeFactory,
 ) -> None:
     """Test diagnostic entities."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
 
     for entity_id in (
         "sensor.knx_interface_individual_address",
@@ -103,7 +103,7 @@ async def test_removed_entity(
     with patch(
         "xknx.core.connection_manager.ConnectionManager.unregister_connection_state_changed_cb"
     ) as unregister_mock:
-        await knx.setup_integration({})
+        await knx.setup_integration()
 
         entity_registry.async_update_entity(
             "sensor.knx_interface_connection_established",
@@ -120,7 +120,7 @@ async def test_remove_interface_device(
 ) -> None:
     """Test device removal."""
     assert await async_setup_component(hass, "config", {})
-    await knx.setup_integration({})
+    await knx.setup_integration()
     client = await hass_ws_client(hass)
     knx_devices = device_registry.devices.get_devices_for_config_entry_id(
         knx.mock_config_entry.entry_id
diff --git a/tests/components/knx/test_light.py b/tests/components/knx/test_light.py
index 6ba6090d60d..fb0246763a4 100644
--- a/tests/components/knx/test_light.py
+++ b/tests/components/knx/test_light.py
@@ -1176,7 +1176,7 @@ async def test_light_ui_create(
     create_ui_entity: KnxEntityGenerator,
 ) -> None:
     """Test creating a light."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     await create_ui_entity(
         platform=Platform.LIGHT,
         entity_data={"name": "test"},
@@ -1213,7 +1213,7 @@ async def test_light_ui_color_temp(
     raw_ct: tuple[int, ...],
 ) -> None:
     """Test creating a color-temp light."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     await create_ui_entity(
         platform=Platform.LIGHT,
         entity_data={"name": "test"},
@@ -1250,7 +1250,7 @@ async def test_light_ui_multi_mode(
     create_ui_entity: KnxEntityGenerator,
 ) -> None:
     """Test creating a light with multiple color modes."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     await create_ui_entity(
         platform=Platform.LIGHT,
         entity_data={"name": "test"},
@@ -1335,13 +1335,11 @@ async def test_light_ui_multi_mode(
 
 
 async def test_light_ui_load(
-    hass: HomeAssistant,
     knx: KNXTestKit,
-    load_config_store: None,
     entity_registry: er.EntityRegistry,
 ) -> None:
     """Test loading a light from storage."""
-    await knx.setup_integration({})
+    await knx.setup_integration(config_store_fixture="config_store_light_switch.json")
 
     await knx.assert_read("1/0/21", response=True, ignore_order=True)
     # unrelated switch in config store
diff --git a/tests/components/knx/test_services.py b/tests/components/knx/test_services.py
index f70389dbc92..c4b48b5e81d 100644
--- a/tests/components/knx/test_services.py
+++ b/tests/components/knx/test_services.py
@@ -111,7 +111,7 @@ async def test_send(
     expected_apci,
 ) -> None:
     """Test `knx.send` service."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
 
     await hass.services.async_call(
         "knx",
@@ -127,7 +127,7 @@ async def test_send(
 
 async def test_read(hass: HomeAssistant, knx: KNXTestKit) -> None:
     """Test `knx.read` service."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
 
     # send read telegram
     await hass.services.async_call("knx", "read", {"address": "1/1/1"}, blocking=True)
@@ -150,7 +150,7 @@ async def test_event_register(hass: HomeAssistant, knx: KNXTestKit) -> None:
     events = async_capture_events(hass, "knx_event")
     test_address = "1/2/3"
 
-    await knx.setup_integration({})
+    await knx.setup_integration()
 
     # no event registered
     await knx.receive_write(test_address, True)
@@ -200,7 +200,7 @@ async def test_exposure_register(hass: HomeAssistant, knx: KNXTestKit) -> None:
     test_entity = "fake.entity"
     test_attribute = "fake_attribute"
 
-    await knx.setup_integration({})
+    await knx.setup_integration()
 
     # no exposure registered
     hass.states.async_set(test_entity, STATE_ON, {})
@@ -265,7 +265,7 @@ async def test_reload_service(
     knx: KNXTestKit,
 ) -> None:
     """Test reload service."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
 
     with (
         patch(
@@ -285,7 +285,7 @@ async def test_reload_service(
 
 async def test_service_setup_failed(hass: HomeAssistant, knx: KNXTestKit) -> None:
     """Test service setup failed."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     await hass.config_entries.async_unload(knx.mock_config_entry.entry_id)
 
     with pytest.raises(HomeAssistantError) as exc_info:
diff --git a/tests/components/knx/test_switch.py b/tests/components/knx/test_switch.py
index bc0a6b27675..969c11b8e1a 100644
--- a/tests/components/knx/test_switch.py
+++ b/tests/components/knx/test_switch.py
@@ -155,7 +155,7 @@ async def test_switch_ui_create(
     create_ui_entity: KnxEntityGenerator,
 ) -> None:
     """Test creating a switch."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     await create_ui_entity(
         platform=Platform.SWITCH,
         entity_data={"name": "test"},
@@ -171,3 +171,16 @@ async def test_switch_ui_create(
     await knx.receive_response("2/2/2", True)
     state = hass.states.get("switch.test")
     assert state.state is STATE_ON
+
+
+async def test_switch_ui_load(knx: KNXTestKit) -> None:
+    """Test loading a switch from storage."""
+    await knx.setup_integration(config_store_fixture="config_store_light_switch.json")
+
+    await knx.assert_read("1/0/45", response=True, ignore_order=True)
+    # unrelated light in config store
+    await knx.assert_read("1/0/21", response=True, ignore_order=True)
+    knx.assert_state(
+        "switch.none_test",  # has_entity_name with unregistered device -> none_test
+        STATE_ON,
+    )
diff --git a/tests/components/knx/test_telegrams.py b/tests/components/knx/test_telegrams.py
index 883e8ccbb2d..840959bb6c5 100644
--- a/tests/components/knx/test_telegrams.py
+++ b/tests/components/knx/test_telegrams.py
@@ -70,7 +70,7 @@ async def test_store_telegam_history(
     hass_storage: dict[str, Any],
 ) -> None:
     """Test storing telegram history."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
 
     await knx.receive_write("1/3/4", True)
     await hass.services.async_call(
@@ -94,7 +94,7 @@ async def test_load_telegam_history(
 ) -> None:
     """Test telegram history restoration."""
     hass_storage["knx/telegrams_history.json"] = {"version": 1, "data": MOCK_TELEGRAMS}
-    await knx.setup_integration({})
+    await knx.setup_integration()
     loaded_telegrams = hass.data[KNX_MODULE_KEY].telegrams.recent_telegrams
     assert assert_telegram_history(loaded_telegrams)
     # TelegramDict "payload" is a tuple, this shall be restored when loading from JSON
@@ -113,7 +113,7 @@ async def test_remove_telegam_history(
         knx.mock_config_entry,
         data=knx.mock_config_entry.data | {CONF_KNX_TELEGRAM_LOG_SIZE: 0},
     )
-    await knx.setup_integration({}, add_entry_to_hass=False)
+    await knx.setup_integration(add_entry_to_hass=False)
     # Store.async_remove() is mocked by hass_storage - check that data was removed.
     assert "knx/telegrams_history.json" not in hass_storage
     assert not hass.data[KNX_MODULE_KEY].telegrams.recent_telegrams
diff --git a/tests/components/knx/test_trigger.py b/tests/components/knx/test_trigger.py
index 73e8b10840e..1ce42a23482 100644
--- a/tests/components/knx/test_trigger.py
+++ b/tests/components/knx/test_trigger.py
@@ -18,7 +18,7 @@ async def test_telegram_trigger(
     knx: KNXTestKit,
 ) -> None:
     """Test telegram triggers firing."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
 
     # "id" field added to action to test if `trigger_data` passed correctly in `async_attach_trigger`
     assert await async_setup_component(
@@ -105,7 +105,7 @@ async def test_telegram_trigger_dpt_option(
     expected_unit: str | None,
 ) -> None:
     """Test telegram trigger type option."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -190,7 +190,7 @@ async def test_telegram_trigger_options(
     direction_options: dict[str, bool],
 ) -> None:
     """Test telegram trigger options."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -266,7 +266,7 @@ async def test_remove_telegram_trigger(
 ) -> None:
     """Test for removed callback when telegram trigger not used."""
     automation_name = "telegram_trigger_automation"
-    await knx.setup_integration({})
+    await knx.setup_integration()
 
     assert await async_setup_component(
         hass,
@@ -311,7 +311,7 @@ async def test_invalid_trigger(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test invalid telegram trigger configuration."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     caplog.clear()
     with caplog.at_level(logging.ERROR):
         assert await async_setup_component(
diff --git a/tests/components/knx/test_websocket.py b/tests/components/knx/test_websocket.py
index a34f126e4f4..7054d415ee9 100644
--- a/tests/components/knx/test_websocket.py
+++ b/tests/components/knx/test_websocket.py
@@ -20,7 +20,7 @@ async def test_knx_info_command(
     hass: HomeAssistant, knx: KNXTestKit, hass_ws_client: WebSocketGenerator
 ) -> None:
     """Test knx/info command."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     client = await hass_ws_client(hass)
     await client.send_json({"id": 6, "type": "knx/info"})
 
@@ -39,7 +39,7 @@ async def test_knx_info_command_with_project(
     load_knxproj: None,
 ) -> None:
     """Test knx/info command with loaded project."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     client = await hass_ws_client(hass)
     await client.send_json({"id": 6, "type": "knx/info"})
 
@@ -65,7 +65,7 @@ async def test_knx_project_file_process(
     _password = "pw-test"
     _parse_result = FIXTURE_PROJECT_DATA
 
-    await knx.setup_integration({})
+    await knx.setup_integration()
     client = await hass_ws_client(hass)
     assert not hass.data[KNX_MODULE_KEY].project.loaded
 
@@ -100,7 +100,7 @@ async def test_knx_project_file_process_error(
     hass_ws_client: WebSocketGenerator,
 ) -> None:
     """Test knx/project_file_process exception handling."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     client = await hass_ws_client(hass)
     assert not hass.data[KNX_MODULE_KEY].project.loaded
 
@@ -134,7 +134,7 @@ async def test_knx_project_file_remove(
     hass_storage: dict[str, Any],
 ) -> None:
     """Test knx/project_file_remove command."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     assert hass_storage[KNX_PROJECT_STORAGE_KEY]
     client = await hass_ws_client(hass)
     assert hass.data[KNX_MODULE_KEY].project.loaded
@@ -154,7 +154,7 @@ async def test_knx_get_project(
     load_knxproj: None,
 ) -> None:
     """Test retrieval of kxnproject from store."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     client = await hass_ws_client(hass)
     assert hass.data[KNX_MODULE_KEY].project.loaded
 
@@ -169,7 +169,7 @@ async def test_knx_group_monitor_info_command(
     hass: HomeAssistant, knx: KNXTestKit, hass_ws_client: WebSocketGenerator
 ) -> None:
     """Test knx/group_monitor_info command."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     client = await hass_ws_client(hass)
 
     await client.send_json({"id": 6, "type": "knx/group_monitor_info"})
@@ -184,7 +184,7 @@ async def test_knx_group_telegrams_command(
     hass: HomeAssistant, knx: KNXTestKit, hass_ws_client: WebSocketGenerator
 ) -> None:
     """Test knx/group_telegrams command."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     client = await hass_ws_client(hass)
 
     await client.send_json_auto_id({"type": "knx/group_telegrams"})
@@ -338,7 +338,7 @@ async def test_knx_subscribe_telegrams_command_project(
     load_knxproj: None,
 ) -> None:
     """Test knx/subscribe_telegrams command with project data."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     client = await hass_ws_client(hass)
     await client.send_json({"id": 6, "type": "knx/subscribe_telegrams"})
     res = await client.receive_json()
@@ -405,7 +405,7 @@ async def test_websocket_when_config_entry_unloaded(
     endpoint: str,
 ) -> None:
     """Test websocket connection when config entry is unloaded."""
-    await knx.setup_integration({})
+    await knx.setup_integration()
     await hass.config_entries.async_unload(knx.mock_config_entry.entry_id)
     client = await hass_ws_client(hass)
 
diff --git a/tests/components/kostal_plenticore/test_diagnostics.py b/tests/components/kostal_plenticore/test_diagnostics.py
index 08f06684d9a..3a99a7f681d 100644
--- a/tests/components/kostal_plenticore/test_diagnostics.py
+++ b/tests/components/kostal_plenticore/test_diagnostics.py
@@ -57,6 +57,7 @@ async def test_entry_diagnostics(
             "created_at": ANY,
             "modified_at": ANY,
             "discovery_keys": {},
+            "subentries": [],
         },
         "client": {
             "version": "api_version='0.2.0' hostname='scb' name='PUCK RESTful API' sw_version='01.16.05025'",
diff --git a/tests/components/kulersky/test_light.py b/tests/components/kulersky/test_light.py
index a2245e721c5..230a2562282 100644
--- a/tests/components/kulersky/test_light.py
+++ b/tests/components/kulersky/test_light.py
@@ -32,7 +32,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_component import async_update_entity
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/lacrosse_view/__init__.py b/tests/components/lacrosse_view/__init__.py
index 913f6c72f24..7221fa4c071 100644
--- a/tests/components/lacrosse_view/__init__.py
+++ b/tests/components/lacrosse_view/__init__.py
@@ -15,7 +15,13 @@ TEST_SENSOR = Sensor(
     sensor_id="2",
     sensor_field_names=["Temperature"],
     location=Location(id="1", name="Test"),
-    data={"Temperature": {"values": [{"s": "2"}], "unit": "degrees_celsius"}},
+    data={
+        "data": {
+            "current": {
+                "Temperature": {"spot": {"value": "2"}, "unit": "degrees_celsius"}
+            }
+        }
+    },
     permissions={"read": True},
     model="Test",
 )
@@ -26,7 +32,13 @@ TEST_NO_PERMISSION_SENSOR = Sensor(
     sensor_id="2",
     sensor_field_names=["Temperature"],
     location=Location(id="1", name="Test"),
-    data={"Temperature": {"values": [{"s": "2"}], "unit": "degrees_celsius"}},
+    data={
+        "data": {
+            "current": {
+                "Temperature": {"spot": {"value": "2"}, "unit": "degrees_celsius"}
+            }
+        }
+    },
     permissions={"read": False},
     model="Test",
 )
@@ -37,7 +49,16 @@ TEST_UNSUPPORTED_SENSOR = Sensor(
     sensor_id="2",
     sensor_field_names=["SomeUnsupportedField"],
     location=Location(id="1", name="Test"),
-    data={"SomeUnsupportedField": {"values": [{"s": "2"}], "unit": "degrees_celsius"}},
+    data={
+        "data": {
+            "current": {
+                "SomeUnsupportedField": {
+                    "spot": {"value": "2"},
+                    "unit": "degrees_celsius",
+                }
+            }
+        }
+    },
     permissions={"read": True},
     model="Test",
 )
@@ -48,7 +69,13 @@ TEST_FLOAT_SENSOR = Sensor(
     sensor_id="2",
     sensor_field_names=["Temperature"],
     location=Location(id="1", name="Test"),
-    data={"Temperature": {"values": [{"s": "2.3"}], "unit": "degrees_celsius"}},
+    data={
+        "data": {
+            "current": {
+                "Temperature": {"spot": {"value": "2.3"}, "unit": "degrees_celsius"}
+            }
+        }
+    },
     permissions={"read": True},
     model="Test",
 )
@@ -59,7 +86,9 @@ TEST_STRING_SENSOR = Sensor(
     sensor_id="2",
     sensor_field_names=["WetDry"],
     location=Location(id="1", name="Test"),
-    data={"WetDry": {"values": [{"s": "dry"}], "unit": "wet_dry"}},
+    data={
+        "data": {"current": {"WetDry": {"spot": {"value": "dry"}, "unit": "wet_dry"}}}
+    },
     permissions={"read": True},
     model="Test",
 )
@@ -70,7 +99,13 @@ TEST_ALREADY_FLOAT_SENSOR = Sensor(
     sensor_id="2",
     sensor_field_names=["HeatIndex"],
     location=Location(id="1", name="Test"),
-    data={"HeatIndex": {"values": [{"s": 2.3}], "unit": "degrees_fahrenheit"}},
+    data={
+        "data": {
+            "current": {
+                "HeatIndex": {"spot": {"value": 2.3}, "unit": "degrees_fahrenheit"}
+            }
+        }
+    },
     permissions={"read": True},
     model="Test",
 )
@@ -81,7 +116,13 @@ TEST_ALREADY_INT_SENSOR = Sensor(
     sensor_id="2",
     sensor_field_names=["WindSpeed"],
     location=Location(id="1", name="Test"),
-    data={"WindSpeed": {"values": [{"s": 2}], "unit": "kilometers_per_hour"}},
+    data={
+        "data": {
+            "current": {
+                "WindSpeed": {"spot": {"value": 2}, "unit": "kilometers_per_hour"}
+            }
+        }
+    },
     permissions={"read": True},
     model="Test",
 )
@@ -92,7 +133,7 @@ TEST_NO_FIELD_SENSOR = Sensor(
     sensor_id="2",
     sensor_field_names=["Temperature"],
     location=Location(id="1", name="Test"),
-    data={},
+    data={"data": {"current": {}}},
     permissions={"read": True},
     model="Test",
 )
@@ -103,7 +144,7 @@ TEST_MISSING_FIELD_DATA_SENSOR = Sensor(
     sensor_id="2",
     sensor_field_names=["Temperature"],
     location=Location(id="1", name="Test"),
-    data={"Temperature": None},
+    data={"data": {"current": {"Temperature": None}}},
     permissions={"read": True},
     model="Test",
 )
@@ -114,7 +155,35 @@ TEST_UNITS_OVERRIDE_SENSOR = Sensor(
     sensor_id="2",
     sensor_field_names=["Temperature"],
     location=Location(id="1", name="Test"),
-    data={"Temperature": {"values": [{"s": "2.1"}], "unit": "degrees_fahrenheit"}},
+    data={
+        "data": {
+            "current": {
+                "Temperature": {"spot": {"value": "2.1"}, "unit": "degrees_fahrenheit"}
+            }
+        }
+    },
+    permissions={"read": True},
+    model="Test",
+)
+TEST_NO_READINGS_SENSOR = Sensor(
+    name="Test",
+    device_id="1",
+    type="Test",
+    sensor_id="2",
+    sensor_field_names=["Temperature"],
+    location=Location(id="1", name="Test"),
+    data={"error": "no_readings"},
+    permissions={"read": True},
+    model="Test",
+)
+TEST_OTHER_ERROR_SENSOR = Sensor(
+    name="Test",
+    device_id="1",
+    type="Test",
+    sensor_id="2",
+    sensor_field_names=["Temperature"],
+    location=Location(id="1", name="Test"),
+    data={"error": "some_other_error"},
     permissions={"read": True},
     model="Test",
 )
diff --git a/tests/components/lacrosse_view/snapshots/test_diagnostics.ambr b/tests/components/lacrosse_view/snapshots/test_diagnostics.ambr
index 201bbbc971e..0975704b680 100644
--- a/tests/components/lacrosse_view/snapshots/test_diagnostics.ambr
+++ b/tests/components/lacrosse_view/snapshots/test_diagnostics.ambr
@@ -4,7 +4,7 @@
     'coordinator_data': list([
       dict({
         '__type': "<class 'lacrosse_view.Sensor'>",
-        'repr': "Sensor(name='Test', device_id='1', type='Test', sensor_id='2', sensor_field_names=['Temperature'], location=Location(id='1', name='Test'), permissions={'read': True}, model='Test', data={'Temperature': {'values': [{'s': '2'}], 'unit': 'degrees_celsius'}})",
+        'repr': "Sensor(name='Test', device_id='1', type='Test', sensor_id='2', sensor_field_names=['Temperature'], location=Location(id='1', name='Test'), permissions={'read': True}, model='Test', data={'Temperature': {'spot': {'value': '2'}, 'unit': 'degrees_celsius'}})",
       }),
     ]),
     'entry': dict({
@@ -25,6 +25,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': None,
       'version': 1,
diff --git a/tests/components/lacrosse_view/test_diagnostics.py b/tests/components/lacrosse_view/test_diagnostics.py
index dc48f160113..4306173c6b3 100644
--- a/tests/components/lacrosse_view/test_diagnostics.py
+++ b/tests/components/lacrosse_view/test_diagnostics.py
@@ -26,9 +26,14 @@ async def test_entry_diagnostics(
     )
     config_entry.add_to_hass(hass)
 
+    sensor = TEST_SENSOR.model_copy()
+    status = sensor.data
+    sensor.data = None
+
     with (
         patch("lacrosse_view.LaCrosse.login", return_value=True),
-        patch("lacrosse_view.LaCrosse.get_sensors", return_value=[TEST_SENSOR]),
+        patch("lacrosse_view.LaCrosse.get_devices", return_value=[sensor]),
+        patch("lacrosse_view.LaCrosse.get_sensor_status", return_value=status),
     ):
         assert await hass.config_entries.async_setup(config_entry.entry_id)
         await hass.async_block_till_done()
diff --git a/tests/components/lacrosse_view/test_init.py b/tests/components/lacrosse_view/test_init.py
index 51fa7e5abf4..0533dd2abee 100644
--- a/tests/components/lacrosse_view/test_init.py
+++ b/tests/components/lacrosse_view/test_init.py
@@ -20,12 +20,17 @@ async def test_unload_entry(hass: HomeAssistant) -> None:
     config_entry = MockConfigEntry(domain=DOMAIN, data=MOCK_ENTRY_DATA)
     config_entry.add_to_hass(hass)
 
+    sensor = TEST_SENSOR.model_copy()
+    status = sensor.data
+    sensor.data = None
+
     with (
         patch("lacrosse_view.LaCrosse.login", return_value=True),
         patch(
-            "lacrosse_view.LaCrosse.get_sensors",
-            return_value=[TEST_SENSOR],
+            "lacrosse_view.LaCrosse.get_devices",
+            return_value=[sensor],
         ),
+        patch("lacrosse_view.LaCrosse.get_sensor_status", return_value=status),
     ):
         assert await hass.config_entries.async_setup(config_entry.entry_id)
         await hass.async_block_till_done()
@@ -68,7 +73,7 @@ async def test_http_error(hass: HomeAssistant) -> None:
 
     with (
         patch("lacrosse_view.LaCrosse.login", return_value=True),
-        patch("lacrosse_view.LaCrosse.get_sensors", side_effect=HTTPError),
+        patch("lacrosse_view.LaCrosse.get_devices", side_effect=HTTPError),
     ):
         assert not await hass.config_entries.async_setup(config_entry.entry_id)
         await hass.async_block_till_done()
@@ -78,18 +83,40 @@ async def test_http_error(hass: HomeAssistant) -> None:
     assert len(entries) == 1
     assert entries[0].state is ConfigEntryState.SETUP_RETRY
 
+    config_entry_2 = MockConfigEntry(domain=DOMAIN, data=MOCK_ENTRY_DATA)
+    config_entry_2.add_to_hass(hass)
+
+    # Start over, let get_devices succeed but get_sensor_status fail
+    with (
+        patch("lacrosse_view.LaCrosse.login", return_value=True),
+        patch("lacrosse_view.LaCrosse.get_devices", return_value=[TEST_SENSOR]),
+        patch("lacrosse_view.LaCrosse.get_sensor_status", side_effect=HTTPError),
+    ):
+        assert not await hass.config_entries.async_setup(config_entry_2.entry_id)
+        await hass.async_block_till_done()
+
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert entries
+    assert len(entries) == 2
+    assert entries[1].state is ConfigEntryState.SETUP_RETRY
+
 
 async def test_new_token(hass: HomeAssistant, freezer: FrozenDateTimeFactory) -> None:
     """Test new token."""
     config_entry = MockConfigEntry(domain=DOMAIN, data=MOCK_ENTRY_DATA)
     config_entry.add_to_hass(hass)
 
+    sensor = TEST_SENSOR.model_copy()
+    status = sensor.data
+    sensor.data = None
+
     with (
         patch("lacrosse_view.LaCrosse.login", return_value=True) as login,
         patch(
-            "lacrosse_view.LaCrosse.get_sensors",
-            return_value=[TEST_SENSOR],
+            "lacrosse_view.LaCrosse.get_devices",
+            return_value=[sensor],
         ),
+        patch("lacrosse_view.LaCrosse.get_sensor_status", return_value=status),
     ):
         assert await hass.config_entries.async_setup(config_entry.entry_id)
         await hass.async_block_till_done()
@@ -103,7 +130,7 @@ async def test_new_token(hass: HomeAssistant, freezer: FrozenDateTimeFactory) ->
     with (
         patch("lacrosse_view.LaCrosse.login", return_value=True) as login,
         patch(
-            "lacrosse_view.LaCrosse.get_sensors",
+            "lacrosse_view.LaCrosse.get_devices",
             return_value=[TEST_SENSOR],
         ),
     ):
@@ -121,12 +148,17 @@ async def test_failed_token(
     config_entry = MockConfigEntry(domain=DOMAIN, data=MOCK_ENTRY_DATA)
     config_entry.add_to_hass(hass)
 
+    sensor = TEST_SENSOR.model_copy()
+    status = sensor.data
+    sensor.data = None
+
     with (
         patch("lacrosse_view.LaCrosse.login", return_value=True) as login,
         patch(
-            "lacrosse_view.LaCrosse.get_sensors",
-            return_value=[TEST_SENSOR],
+            "lacrosse_view.LaCrosse.get_devices",
+            return_value=[sensor],
         ),
+        patch("lacrosse_view.LaCrosse.get_sensor_status", return_value=status),
     ):
         assert await hass.config_entries.async_setup(config_entry.entry_id)
         await hass.async_block_till_done()
diff --git a/tests/components/lacrosse_view/test_sensor.py b/tests/components/lacrosse_view/test_sensor.py
index 11faaf8877e..e0dc1e5f35f 100644
--- a/tests/components/lacrosse_view/test_sensor.py
+++ b/tests/components/lacrosse_view/test_sensor.py
@@ -18,6 +18,8 @@ from . import (
     TEST_MISSING_FIELD_DATA_SENSOR,
     TEST_NO_FIELD_SENSOR,
     TEST_NO_PERMISSION_SENSOR,
+    TEST_NO_READINGS_SENSOR,
+    TEST_OTHER_ERROR_SENSOR,
     TEST_SENSOR,
     TEST_STRING_SENSOR,
     TEST_UNITS_OVERRIDE_SENSOR,
@@ -32,9 +34,14 @@ async def test_entities_added(hass: HomeAssistant) -> None:
     config_entry = MockConfigEntry(domain=DOMAIN, data=MOCK_ENTRY_DATA)
     config_entry.add_to_hass(hass)
 
+    sensor = TEST_SENSOR.model_copy()
+    status = sensor.data
+    sensor.data = None
+
     with (
         patch("lacrosse_view.LaCrosse.login", return_value=True),
-        patch("lacrosse_view.LaCrosse.get_sensors", return_value=[TEST_SENSOR]),
+        patch("lacrosse_view.LaCrosse.get_devices", return_value=[sensor]),
+        patch("lacrosse_view.LaCrosse.get_sensor_status", return_value=status),
     ):
         assert await hass.config_entries.async_setup(config_entry.entry_id)
         await hass.async_block_till_done()
@@ -54,12 +61,17 @@ async def test_sensor_permission(
     config_entry = MockConfigEntry(domain=DOMAIN, data=MOCK_ENTRY_DATA)
     config_entry.add_to_hass(hass)
 
+    sensor = TEST_NO_PERMISSION_SENSOR.model_copy()
+    status = sensor.data
+    sensor.data = None
+
     with (
         patch("lacrosse_view.LaCrosse.login", return_value=True),
         patch(
-            "lacrosse_view.LaCrosse.get_sensors",
-            return_value=[TEST_NO_PERMISSION_SENSOR],
+            "lacrosse_view.LaCrosse.get_devices",
+            return_value=[sensor],
         ),
+        patch("lacrosse_view.LaCrosse.get_sensor_status", return_value=status),
     ):
         assert not await hass.config_entries.async_setup(config_entry.entry_id)
         await hass.async_block_till_done()
@@ -79,11 +91,14 @@ async def test_field_not_supported(
     config_entry = MockConfigEntry(domain=DOMAIN, data=MOCK_ENTRY_DATA)
     config_entry.add_to_hass(hass)
 
+    sensor = TEST_UNSUPPORTED_SENSOR.model_copy()
+    status = sensor.data
+    sensor.data = None
+
     with (
         patch("lacrosse_view.LaCrosse.login", return_value=True),
-        patch(
-            "lacrosse_view.LaCrosse.get_sensors", return_value=[TEST_UNSUPPORTED_SENSOR]
-        ),
+        patch("lacrosse_view.LaCrosse.get_devices", return_value=[sensor]),
+        patch("lacrosse_view.LaCrosse.get_sensor_status", return_value=status),
     ):
         assert await hass.config_entries.async_setup(config_entry.entry_id)
         await hass.async_block_till_done()
@@ -104,7 +119,7 @@ async def test_field_not_supported(
         (TEST_STRING_SENSOR, "dry", "wet_dry"),
         (TEST_ALREADY_FLOAT_SENSOR, "-16.5", "heat_index"),
         (TEST_ALREADY_INT_SENSOR, "2", "wind_speed"),
-        (TEST_UNITS_OVERRIDE_SENSOR, "-16.6", "temperature"),
+        (TEST_UNITS_OVERRIDE_SENSOR, "-16.6111111111111", "temperature"),
     ],
 )
 async def test_field_types(
@@ -114,12 +129,17 @@ async def test_field_types(
     config_entry = MockConfigEntry(domain=DOMAIN, data=MOCK_ENTRY_DATA)
     config_entry.add_to_hass(hass)
 
+    sensor = test_input.model_copy()
+    status = sensor.data
+    sensor.data = None
+
     with (
         patch("lacrosse_view.LaCrosse.login", return_value=True),
         patch(
-            "lacrosse_view.LaCrosse.get_sensors",
+            "lacrosse_view.LaCrosse.get_devices",
             return_value=[test_input],
         ),
+        patch("lacrosse_view.LaCrosse.get_sensor_status", return_value=status),
     ):
         assert await hass.config_entries.async_setup(config_entry.entry_id)
         await hass.async_block_till_done()
@@ -137,12 +157,17 @@ async def test_no_field(hass: HomeAssistant, caplog: pytest.LogCaptureFixture) -
     config_entry = MockConfigEntry(domain=DOMAIN, data=MOCK_ENTRY_DATA)
     config_entry.add_to_hass(hass)
 
+    sensor = TEST_NO_FIELD_SENSOR.model_copy()
+    status = sensor.data
+    sensor.data = None
+
     with (
         patch("lacrosse_view.LaCrosse.login", return_value=True),
         patch(
-            "lacrosse_view.LaCrosse.get_sensors",
-            return_value=[TEST_NO_FIELD_SENSOR],
+            "lacrosse_view.LaCrosse.get_devices",
+            return_value=[sensor],
         ),
+        patch("lacrosse_view.LaCrosse.get_sensor_status", return_value=status),
     ):
         assert await hass.config_entries.async_setup(config_entry.entry_id)
         await hass.async_block_till_done()
@@ -160,12 +185,17 @@ async def test_field_data_missing(hass: HomeAssistant) -> None:
     config_entry = MockConfigEntry(domain=DOMAIN, data=MOCK_ENTRY_DATA)
     config_entry.add_to_hass(hass)
 
+    sensor = TEST_MISSING_FIELD_DATA_SENSOR.model_copy()
+    status = sensor.data
+    sensor.data = None
+
     with (
         patch("lacrosse_view.LaCrosse.login", return_value=True),
         patch(
-            "lacrosse_view.LaCrosse.get_sensors",
-            return_value=[TEST_MISSING_FIELD_DATA_SENSOR],
+            "lacrosse_view.LaCrosse.get_devices",
+            return_value=[sensor],
         ),
+        patch("lacrosse_view.LaCrosse.get_sensor_status", return_value=status),
     ):
         assert await hass.config_entries.async_setup(config_entry.entry_id)
         await hass.async_block_till_done()
@@ -176,3 +206,57 @@ async def test_field_data_missing(hass: HomeAssistant) -> None:
     assert len(entries) == 1
     assert entries[0].state is ConfigEntryState.LOADED
     assert hass.states.get("sensor.test_temperature").state == "unknown"
+
+
+async def test_no_readings(hass: HomeAssistant) -> None:
+    """Test behavior when there are no readings."""
+    config_entry = MockConfigEntry(domain=DOMAIN, data=MOCK_ENTRY_DATA)
+    config_entry.add_to_hass(hass)
+
+    sensor = TEST_NO_READINGS_SENSOR.model_copy()
+    status = sensor.data
+    sensor.data = None
+
+    with (
+        patch("lacrosse_view.LaCrosse.login", return_value=True),
+        patch(
+            "lacrosse_view.LaCrosse.get_devices",
+            return_value=[sensor],
+        ),
+        patch("lacrosse_view.LaCrosse.get_sensor_status", return_value=status),
+    ):
+        assert await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    assert hass.data[DOMAIN]
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert entries
+    assert len(entries) == 1
+    assert entries[0].state is ConfigEntryState.LOADED
+    assert hass.states.get("sensor.test_temperature").state == "unavailable"
+
+
+async def test_other_error(hass: HomeAssistant) -> None:
+    """Test behavior when there is an error."""
+    config_entry = MockConfigEntry(domain=DOMAIN, data=MOCK_ENTRY_DATA)
+    config_entry.add_to_hass(hass)
+
+    sensor = TEST_OTHER_ERROR_SENSOR.model_copy()
+    status = sensor.data
+    sensor.data = None
+
+    with (
+        patch("lacrosse_view.LaCrosse.login", return_value=True),
+        patch(
+            "lacrosse_view.LaCrosse.get_devices",
+            return_value=[sensor],
+        ),
+        patch("lacrosse_view.LaCrosse.get_sensor_status", return_value=status),
+    ):
+        assert not await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert entries
+    assert len(entries) == 1
+    assert entries[0].state is ConfigEntryState.SETUP_RETRY
diff --git a/tests/components/lamarzocco/fixtures/config.json b/tests/components/lamarzocco/fixtures/config.json
index ea6e2ee76b8..5aac86dde97 100644
--- a/tests/components/lamarzocco/fixtures/config.json
+++ b/tests/components/lamarzocco/fixtures/config.json
@@ -101,28 +101,60 @@
     "mode": "TypeB",
     "Group1": [
       {
+        "mode": "TypeA",
         "groupNumber": "Group1",
         "doseType": "DoseA",
         "preWetTime": 0.5,
         "preWetHoldTime": 1
       },
       {
+        "mode": "TypeB",
+        "groupNumber": "Group1",
+        "doseType": "DoseA",
+        "preWetTime": 0,
+        "preWetHoldTime": 4
+      },
+      {
+        "mode": "TypeA",
         "groupNumber": "Group1",
         "doseType": "DoseB",
         "preWetTime": 0.5,
         "preWetHoldTime": 1
       },
       {
+        "mode": "TypeB",
         "groupNumber": "Group1",
-        "doseType": "DoseC",
-        "preWetTime": 3.2999999523162842,
-        "preWetHoldTime": 3.2999999523162842
+        "doseType": "DoseB",
+        "preWetTime": 0,
+        "preWetHoldTime": 4
       },
       {
+        "mode": "TypeA",
+        "groupNumber": "Group1",
+        "doseType": "DoseC",
+        "preWetTime": 3.3,
+        "preWetHoldTime": 3.3
+      },
+      {
+        "mode": "TypeB",
+        "groupNumber": "Group1",
+        "doseType": "DoseC",
+        "preWetTime": 0,
+        "preWetHoldTime": 4
+      },
+      {
+        "mode": "TypeA",
         "groupNumber": "Group1",
         "doseType": "DoseD",
         "preWetTime": 2,
         "preWetHoldTime": 2
+      },
+      {
+        "mode": "TypeB",
+        "groupNumber": "Group1",
+        "doseType": "DoseD",
+        "preWetTime": 0,
+        "preWetHoldTime": 4
       }
     ]
   },
diff --git a/tests/components/lamarzocco/fixtures/config_mini.json b/tests/components/lamarzocco/fixtures/config_mini.json
index 22533a94872..a726d715a6f 100644
--- a/tests/components/lamarzocco/fixtures/config_mini.json
+++ b/tests/components/lamarzocco/fixtures/config_mini.json
@@ -82,10 +82,18 @@
     "mode": "TypeB",
     "Group1": [
       {
+        "mode": "TypeA",
         "groupNumber": "Group1",
-        "doseType": "DoseA",
+        "doseType": "Continuous",
         "preWetTime": 2,
         "preWetHoldTime": 3
+      },
+      {
+        "mode": "TypeB",
+        "groupNumber": "Group1",
+        "doseType": "Continuous",
+        "preWetTime": 0,
+        "preWetHoldTime": 3
       }
     ]
   },
diff --git a/tests/components/lamarzocco/snapshots/test_binary_sensor.ambr b/tests/components/lamarzocco/snapshots/test_binary_sensor.ambr
index 47bca8dcb63..6cd4e8cd5ae 100644
--- a/tests/components/lamarzocco/snapshots/test_binary_sensor.ambr
+++ b/tests/components/lamarzocco/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -161,6 +164,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/lamarzocco/snapshots/test_button.ambr b/tests/components/lamarzocco/snapshots/test_button.ambr
index 64d47a11072..33aace5f97a 100644
--- a/tests/components/lamarzocco/snapshots/test_button.ambr
+++ b/tests/components/lamarzocco/snapshots/test_button.ambr
@@ -19,6 +19,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/lamarzocco/snapshots/test_calendar.ambr b/tests/components/lamarzocco/snapshots/test_calendar.ambr
index 729eed5879a..74847892cfa 100644
--- a/tests/components/lamarzocco/snapshots/test_calendar.ambr
+++ b/tests/components/lamarzocco/snapshots/test_calendar.ambr
@@ -90,6 +90,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -123,6 +124,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/lamarzocco/snapshots/test_diagnostics.ambr b/tests/components/lamarzocco/snapshots/test_diagnostics.ambr
index b1d8140b2ce..018449f7c9a 100644
--- a/tests/components/lamarzocco/snapshots/test_diagnostics.ambr
+++ b/tests/components/lamarzocco/snapshots/test_diagnostics.ambr
@@ -27,22 +27,46 @@
       }),
       'plumbed_in': True,
       'prebrew_configuration': dict({
-        '1': dict({
-          'off_time': 1,
-          'on_time': 0.5,
-        }),
-        '2': dict({
-          'off_time': 1,
-          'on_time': 0.5,
-        }),
-        '3': dict({
-          'off_time': 3.299999952316284,
-          'on_time': 3.299999952316284,
-        }),
-        '4': dict({
-          'off_time': 2,
-          'on_time': 2,
-        }),
+        '1': list([
+          dict({
+            'off_time': 1,
+            'on_time': 0.5,
+          }),
+          dict({
+            'off_time': 4,
+            'on_time': 0,
+          }),
+        ]),
+        '2': list([
+          dict({
+            'off_time': 1,
+            'on_time': 0.5,
+          }),
+          dict({
+            'off_time': 4,
+            'on_time': 0,
+          }),
+        ]),
+        '3': list([
+          dict({
+            'off_time': 3.3,
+            'on_time': 3.3,
+          }),
+          dict({
+            'off_time': 4,
+            'on_time': 0,
+          }),
+        ]),
+        '4': list([
+          dict({
+            'off_time': 2,
+            'on_time': 2,
+          }),
+          dict({
+            'off_time': 4,
+            'on_time': 0,
+          }),
+        ]),
       }),
       'prebrew_mode': 'TypeB',
       'scale': None,
diff --git a/tests/components/lamarzocco/snapshots/test_init.ambr b/tests/components/lamarzocco/snapshots/test_init.ambr
index 67aa0b8bea8..4c210136bd2 100644
--- a/tests/components/lamarzocco/snapshots/test_init.ambr
+++ b/tests/components/lamarzocco/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -43,6 +44,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/lamarzocco/snapshots/test_number.ambr b/tests/components/lamarzocco/snapshots/test_number.ambr
index 49e4713aab1..de1f11b14eb 100644
--- a/tests/components/lamarzocco/snapshots/test_number.ambr
+++ b/tests/components/lamarzocco/snapshots/test_number.ambr
@@ -30,6 +30,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -87,6 +88,7 @@
       'step': 10,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +146,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -201,6 +204,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -258,6 +262,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -315,6 +320,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -413,7 +419,7 @@
     'state': '121',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[prebrew_off_time-6-Enabled-set_prebrew_time-kwargs0-GS3 AV][GS012345_prebrew_off_time_key_1-state]
+# name: test_pre_brew_infusion_key_numbers[prebrew_off_time-6-TypeA-set_prebrew_time-kwargs0-GS3 AV][GS012345_prebrew_off_time_key_1-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
@@ -432,7 +438,7 @@
     'state': '1',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[prebrew_off_time-6-Enabled-set_prebrew_time-kwargs0-GS3 AV][GS012345_prebrew_off_time_key_2-state]
+# name: test_pre_brew_infusion_key_numbers[prebrew_off_time-6-TypeA-set_prebrew_time-kwargs0-GS3 AV][GS012345_prebrew_off_time_key_2-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
@@ -451,7 +457,7 @@
     'state': '1',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[prebrew_off_time-6-Enabled-set_prebrew_time-kwargs0-GS3 AV][GS012345_prebrew_off_time_key_3-state]
+# name: test_pre_brew_infusion_key_numbers[prebrew_off_time-6-TypeA-set_prebrew_time-kwargs0-GS3 AV][GS012345_prebrew_off_time_key_3-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
@@ -467,10 +473,10 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '3.29999995231628',
+    'state': '3.3',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[prebrew_off_time-6-Enabled-set_prebrew_time-kwargs0-GS3 AV][GS012345_prebrew_off_time_key_4-state]
+# name: test_pre_brew_infusion_key_numbers[prebrew_off_time-6-TypeA-set_prebrew_time-kwargs0-GS3 AV][GS012345_prebrew_off_time_key_4-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
@@ -489,7 +495,7 @@
     'state': '2',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[prebrew_on_time-6-Enabled-set_prebrew_time-kwargs1-GS3 AV][GS012345_prebrew_on_time_key_1-state]
+# name: test_pre_brew_infusion_key_numbers[prebrew_on_time-6-TypeA-set_prebrew_time-kwargs1-GS3 AV][GS012345_prebrew_on_time_key_1-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
@@ -508,7 +514,7 @@
     'state': '1',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[prebrew_on_time-6-Enabled-set_prebrew_time-kwargs1-GS3 AV][GS012345_prebrew_on_time_key_2-state]
+# name: test_pre_brew_infusion_key_numbers[prebrew_on_time-6-TypeA-set_prebrew_time-kwargs1-GS3 AV][GS012345_prebrew_on_time_key_2-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
@@ -527,7 +533,7 @@
     'state': '1',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[prebrew_on_time-6-Enabled-set_prebrew_time-kwargs1-GS3 AV][GS012345_prebrew_on_time_key_3-state]
+# name: test_pre_brew_infusion_key_numbers[prebrew_on_time-6-TypeA-set_prebrew_time-kwargs1-GS3 AV][GS012345_prebrew_on_time_key_3-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
@@ -543,10 +549,10 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '3.29999995231628',
+    'state': '3.3',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[prebrew_on_time-6-Enabled-set_prebrew_time-kwargs1-GS3 AV][GS012345_prebrew_on_time_key_4-state]
+# name: test_pre_brew_infusion_key_numbers[prebrew_on_time-6-TypeA-set_prebrew_time-kwargs1-GS3 AV][GS012345_prebrew_on_time_key_4-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
@@ -581,7 +587,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '1',
+    'state': '4',
   })
 # ---
 # name: test_pre_brew_infusion_key_numbers[preinfusion_time-7-TypeB-set_preinfusion_time-kwargs2-GS3 AV][GS012345_preinfusion_time_key_2-state]
@@ -600,7 +606,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '1',
+    'state': '4',
   })
 # ---
 # name: test_pre_brew_infusion_key_numbers[preinfusion_time-7-TypeB-set_preinfusion_time-kwargs2-GS3 AV][GS012345_preinfusion_time_key_3-state]
@@ -619,7 +625,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '3.29999995231628',
+    'state': '4',
   })
 # ---
 # name: test_pre_brew_infusion_key_numbers[preinfusion_time-7-TypeB-set_preinfusion_time-kwargs2-GS3 AV][GS012345_preinfusion_time_key_4-state]
@@ -638,10 +644,10 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '2',
+    'state': '4',
   })
 # ---
-# name: test_pre_brew_infusion_numbers[prebrew_off_time-set_prebrew_time-Enabled-6-kwargs0-Linea Mini]
+# name: test_pre_brew_infusion_numbers[prebrew_off_time-set_prebrew_time-TypeA-6-kwargs0-Linea Mini]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
@@ -660,7 +666,7 @@
     'state': '3',
   })
 # ---
-# name: test_pre_brew_infusion_numbers[prebrew_off_time-set_prebrew_time-Enabled-6-kwargs0-Linea Mini].1
+# name: test_pre_brew_infusion_numbers[prebrew_off_time-set_prebrew_time-TypeA-6-kwargs0-Linea Mini].1
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -672,6 +678,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -698,7 +705,7 @@
     'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
   })
 # ---
-# name: test_pre_brew_infusion_numbers[prebrew_off_time-set_prebrew_time-Enabled-6-kwargs0-Micra]
+# name: test_pre_brew_infusion_numbers[prebrew_off_time-set_prebrew_time-TypeA-6-kwargs0-Micra]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
@@ -717,7 +724,7 @@
     'state': '1',
   })
 # ---
-# name: test_pre_brew_infusion_numbers[prebrew_off_time-set_prebrew_time-Enabled-6-kwargs0-Micra].1
+# name: test_pre_brew_infusion_numbers[prebrew_off_time-set_prebrew_time-TypeA-6-kwargs0-Micra].1
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -729,6 +736,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -755,7 +763,7 @@
     'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
   })
 # ---
-# name: test_pre_brew_infusion_numbers[prebrew_on_time-set_prebrew_time-Enabled-6-kwargs1-Linea Mini]
+# name: test_pre_brew_infusion_numbers[prebrew_on_time-set_prebrew_time-TypeA-6-kwargs1-Linea Mini]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
@@ -774,7 +782,7 @@
     'state': '3',
   })
 # ---
-# name: test_pre_brew_infusion_numbers[prebrew_on_time-set_prebrew_time-Enabled-6-kwargs1-Linea Mini].1
+# name: test_pre_brew_infusion_numbers[prebrew_on_time-set_prebrew_time-TypeA-6-kwargs1-Linea Mini].1
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -786,6 +794,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -812,7 +821,7 @@
     'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
   })
 # ---
-# name: test_pre_brew_infusion_numbers[prebrew_on_time-set_prebrew_time-Enabled-6-kwargs1-Micra]
+# name: test_pre_brew_infusion_numbers[prebrew_on_time-set_prebrew_time-TypeA-6-kwargs1-Micra]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
@@ -831,7 +840,7 @@
     'state': '1',
   })
 # ---
-# name: test_pre_brew_infusion_numbers[prebrew_on_time-set_prebrew_time-Enabled-6-kwargs1-Micra].1
+# name: test_pre_brew_infusion_numbers[prebrew_on_time-set_prebrew_time-TypeA-6-kwargs1-Micra].1
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -843,6 +852,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -900,6 +910,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -942,7 +953,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '1',
+    'state': '4',
   })
 # ---
 # name: test_pre_brew_infusion_numbers[preinfusion_time-set_preinfusion_time-TypeB-7-kwargs2-Micra].1
@@ -957,6 +968,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1012,6 +1024,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1067,6 +1080,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/lamarzocco/snapshots/test_select.ambr b/tests/components/lamarzocco/snapshots/test_select.ambr
index 325409a0b7f..2e88688652a 100644
--- a/tests/components/lamarzocco/snapshots/test_select.ambr
+++ b/tests/components/lamarzocco/snapshots/test_select.ambr
@@ -28,6 +28,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -85,6 +86,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -142,6 +144,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -199,6 +202,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -254,6 +258,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -311,6 +316,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/lamarzocco/snapshots/test_sensor.ambr b/tests/components/lamarzocco/snapshots/test_sensor.ambr
index 723f9738e1c..996dff93433 100644
--- a/tests/components/lamarzocco/snapshots/test_sensor.ambr
+++ b/tests/components/lamarzocco/snapshots/test_sensor.ambr
@@ -24,6 +24,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -50,6 +51,210 @@
     'unit_of_measurement': '%',
   })
 # ---
+# name: test_sensors[sensor.gs012345_coffees_made_key_1-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.gs012345_coffees_made_key_1',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Coffees made Key 1',
+    'platform': 'lamarzocco',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'drink_stats_coffee_key',
+    'unique_id': 'GS012345_drink_stats_coffee_key_key1',
+    'unit_of_measurement': 'coffees',
+  })
+# ---
+# name: test_sensors[sensor.gs012345_coffees_made_key_1-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'GS012345 Coffees made Key 1',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': 'coffees',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.gs012345_coffees_made_key_1',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '1047',
+  })
+# ---
+# name: test_sensors[sensor.gs012345_coffees_made_key_2-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.gs012345_coffees_made_key_2',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Coffees made Key 2',
+    'platform': 'lamarzocco',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'drink_stats_coffee_key',
+    'unique_id': 'GS012345_drink_stats_coffee_key_key2',
+    'unit_of_measurement': 'coffees',
+  })
+# ---
+# name: test_sensors[sensor.gs012345_coffees_made_key_2-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'GS012345 Coffees made Key 2',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': 'coffees',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.gs012345_coffees_made_key_2',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '560',
+  })
+# ---
+# name: test_sensors[sensor.gs012345_coffees_made_key_3-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.gs012345_coffees_made_key_3',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Coffees made Key 3',
+    'platform': 'lamarzocco',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'drink_stats_coffee_key',
+    'unique_id': 'GS012345_drink_stats_coffee_key_key3',
+    'unit_of_measurement': 'coffees',
+  })
+# ---
+# name: test_sensors[sensor.gs012345_coffees_made_key_3-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'GS012345 Coffees made Key 3',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': 'coffees',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.gs012345_coffees_made_key_3',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '468',
+  })
+# ---
+# name: test_sensors[sensor.gs012345_coffees_made_key_4-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.gs012345_coffees_made_key_4',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Coffees made Key 4',
+    'platform': 'lamarzocco',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'drink_stats_coffee_key',
+    'unique_id': 'GS012345_drink_stats_coffee_key_key4',
+    'unit_of_measurement': 'coffees',
+  })
+# ---
+# name: test_sensors[sensor.gs012345_coffees_made_key_4-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'GS012345 Coffees made Key 4',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': 'coffees',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.gs012345_coffees_made_key_4',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '312',
+  })
+# ---
 # name: test_sensors[sensor.gs012345_current_coffee_temperature-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -59,6 +264,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -113,6 +319,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -167,6 +374,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -218,6 +426,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -241,7 +450,7 @@
     'supported_features': 0,
     'translation_key': 'drink_stats_coffee',
     'unique_id': 'GS012345_drink_stats_coffee',
-    'unit_of_measurement': 'drinks',
+    'unit_of_measurement': 'coffees',
   })
 # ---
 # name: test_sensors[sensor.gs012345_total_coffees_made-state]
@@ -249,14 +458,14 @@
     'attributes': ReadOnlyDict({
       'friendly_name': 'GS012345 Total coffees made',
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-      'unit_of_measurement': 'drinks',
+      'unit_of_measurement': 'coffees',
     }),
     'context': <ANY>,
     'entity_id': 'sensor.gs012345_total_coffees_made',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '1047',
+    'state': '2387',
   })
 # ---
 # name: test_sensors[sensor.gs012345_total_flushes_made-entry]
@@ -268,6 +477,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -291,7 +501,7 @@
     'supported_features': 0,
     'translation_key': 'drink_stats_flushing',
     'unique_id': 'GS012345_drink_stats_flushing',
-    'unit_of_measurement': 'drinks',
+    'unit_of_measurement': 'flushes',
   })
 # ---
 # name: test_sensors[sensor.gs012345_total_flushes_made-state]
@@ -299,7 +509,7 @@
     'attributes': ReadOnlyDict({
       'friendly_name': 'GS012345 Total flushes made',
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-      'unit_of_measurement': 'drinks',
+      'unit_of_measurement': 'flushes',
     }),
     'context': <ANY>,
     'entity_id': 'sensor.gs012345_total_flushes_made',
diff --git a/tests/components/lamarzocco/snapshots/test_switch.ambr b/tests/components/lamarzocco/snapshots/test_switch.ambr
index 72fe41c1392..085d9a16125 100644
--- a/tests/components/lamarzocco/snapshots/test_switch.ambr
+++ b/tests/components/lamarzocco/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -39,6 +40,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -190,6 +194,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +241,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -282,6 +288,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/lamarzocco/snapshots/test_update.ambr b/tests/components/lamarzocco/snapshots/test_update.ambr
index 40f47a783d7..17d0528c3d8 100644
--- a/tests/components/lamarzocco/snapshots/test_update.ambr
+++ b/tests/components/lamarzocco/snapshots/test_update.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -65,6 +66,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/lamarzocco/test_init.py b/tests/components/lamarzocco/test_init.py
index 09ebc462952..a9a3b9f23e1 100644
--- a/tests/components/lamarzocco/test_init.py
+++ b/tests/components/lamarzocco/test_init.py
@@ -170,12 +170,18 @@ async def test_bluetooth_is_set_from_discovery(
             "homeassistant.components.lamarzocco.async_discovered_service_info",
             return_value=[service_info],
         ) as discovery,
-        patch("homeassistant.components.lamarzocco.LaMarzoccoMachine") as init_device,
+        patch(
+            "homeassistant.components.lamarzocco.LaMarzoccoMachine"
+        ) as mock_machine_class,
     ):
+        mock_machine = MagicMock()
+        mock_machine.get_firmware = AsyncMock()
+        mock_machine.firmware = mock_lamarzocco.firmware
+        mock_machine_class.return_value = mock_machine
         await async_init_integration(hass, mock_config_entry)
     discovery.assert_called_once()
-    init_device.assert_called_once()
-    _, kwargs = init_device.call_args
+    assert mock_machine_class.call_count == 2
+    _, kwargs = mock_machine_class.call_args
     assert kwargs["bluetooth_client"] is not None
     assert mock_config_entry.data[CONF_NAME] == service_info.name
     assert mock_config_entry.data[CONF_MAC] == service_info.address
@@ -223,6 +229,19 @@ async def test_gateway_version_issue(
     assert (issue is not None) == issue_exists
 
 
+async def test_conf_host_removed_for_new_gateway(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_lamarzocco: MagicMock,
+) -> None:
+    """Make sure we get the issue for certain gateway firmware versions."""
+    mock_lamarzocco.firmware[FirmwareType.GATEWAY].current_version = "v5.0.9"
+
+    await async_init_integration(hass, mock_config_entry)
+
+    assert CONF_HOST not in mock_config_entry.data
+
+
 async def test_device(
     hass: HomeAssistant,
     mock_lamarzocco: MagicMock,
diff --git a/tests/components/lamarzocco/test_sensor.py b/tests/components/lamarzocco/test_sensor.py
index 3385e2b3891..43a0826d551 100644
--- a/tests/components/lamarzocco/test_sensor.py
+++ b/tests/components/lamarzocco/test_sensor.py
@@ -18,6 +18,7 @@ from . import async_init_integration
 from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
 
 
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
 async def test_sensors(
     hass: HomeAssistant,
     mock_lamarzocco: MagicMock,
diff --git a/tests/components/lametric/test_switch.py b/tests/components/lametric/test_switch.py
index 64ebe22e98b..3e73b710942 100644
--- a/tests/components/lametric/test_switch.py
+++ b/tests/components/lametric/test_switch.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
diff --git a/tests/components/lawn_mower/test_init.py b/tests/components/lawn_mower/test_init.py
index 0735d4541ff..be588b86e80 100644
--- a/tests/components/lawn_mower/test_init.py
+++ b/tests/components/lawn_mower/test_init.py
@@ -14,7 +14,7 @@ from homeassistant.components.lawn_mower import (
 from homeassistant.config_entries import ConfigEntry, ConfigEntryState, ConfigFlow
 from homeassistant.const import STATE_UNAVAILABLE, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from tests.common import (
     MockConfigEntry,
@@ -97,7 +97,7 @@ async def test_lawn_mower_setup(hass: HomeAssistant) -> None:
     async def async_setup_entry_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test platform via config entry."""
         async_add_entities([entity1])
diff --git a/tests/components/lcn/fixtures/config_entry_pchk_v1_1.json b/tests/components/lcn/fixtures/config_entry_pchk_v1_1.json
index e1893c30b42..7dea4405fc5 100644
--- a/tests/components/lcn/fixtures/config_entry_pchk_v1_1.json
+++ b/tests/components/lcn/fixtures/config_entry_pchk_v1_1.json
@@ -13,13 +13,6 @@
       "hardware_serial": -1,
       "software_serial": -1,
       "hardware_type": -1
-    },
-    {
-      "address": [0, 5, true],
-      "name": "TestGroup",
-      "hardware_serial": -1,
-      "software_serial": -1,
-      "hardware_type": -1
     }
   ],
   "entities": [
@@ -33,216 +26,6 @@
         "dimmable": true,
         "transition": 5000.0
       }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Light_Output2",
-      "resource": "output2",
-      "domain": "light",
-      "domain_data": {
-        "output": "OUTPUT2",
-        "dimmable": false,
-        "transition": 0
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Light_Relay1",
-      "resource": "relay1",
-      "domain": "light",
-      "domain_data": {
-        "output": "RELAY1",
-        "dimmable": false,
-        "transition": 0.0
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_Output1",
-      "resource": "output1",
-      "domain": "switch",
-      "domain_data": {
-        "output": "OUTPUT1"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_Output2",
-      "resource": "output2",
-      "domain": "switch",
-      "domain_data": {
-        "output": "OUTPUT2"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_Relay1",
-      "resource": "relay1",
-      "domain": "switch",
-      "domain_data": {
-        "output": "RELAY1"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_Relay2",
-      "resource": "relay2",
-      "domain": "switch",
-      "domain_data": {
-        "output": "RELAY2"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_Regulator1",
-      "resource": "r1varsetpoint",
-      "domain": "switch",
-      "domain_data": {
-        "output": "R1VARSETPOINT"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_KeyLock1",
-      "resource": "a1",
-      "domain": "switch",
-      "domain_data": {
-        "output": "A1"
-      }
-    },
-    {
-      "address": [0, 5, true],
-      "name": "Switch_Group5",
-      "resource": "relay1",
-      "domain": "switch",
-      "domain_data": {
-        "output": "RELAY1"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Cover_Outputs",
-      "resource": "outputs",
-      "domain": "cover",
-      "domain_data": {
-        "motor": "OUTPUTS",
-        "reverse_time": "RT1200"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Cover_Relays",
-      "resource": "motor1",
-      "domain": "cover",
-      "domain_data": {
-        "motor": "MOTOR1",
-        "reverse_time": "RT1200"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Climate1",
-      "resource": "var1.r1varsetpoint",
-      "domain": "climate",
-      "domain_data": {
-        "source": "VAR1",
-        "setpoint": "R1VARSETPOINT",
-        "lockable": true,
-        "min_temp": 0.0,
-        "max_temp": 40.0,
-        "unit_of_measurement": "°C"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Romantic",
-      "resource": "0.0",
-      "domain": "scene",
-      "domain_data": {
-        "register": 0,
-        "scene": 0,
-        "outputs": ["OUTPUT1", "OUTPUT2", "RELAY1"],
-        "transition": null
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Romantic Transition",
-      "resource": "0.1",
-      "domain": "scene",
-      "domain_data": {
-        "register": 0,
-        "scene": 1,
-        "outputs": ["OUTPUT1", "OUTPUT2", "RELAY1"],
-        "transition": 10000
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Sensor_LockRegulator1",
-      "resource": "r1varsetpoint",
-      "domain": "binary_sensor",
-      "domain_data": {
-        "source": "R1VARSETPOINT"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Binary_Sensor1",
-      "resource": "binsensor1",
-      "domain": "binary_sensor",
-      "domain_data": {
-        "source": "BINSENSOR1"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Sensor_KeyLock",
-      "resource": "a5",
-      "domain": "binary_sensor",
-      "domain_data": {
-        "source": "A5"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Sensor_Var1",
-      "resource": "var1",
-      "domain": "sensor",
-      "domain_data": {
-        "source": "VAR1",
-        "unit_of_measurement": "°C"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Sensor_Setpoint1",
-      "resource": "r1varsetpoint",
-      "domain": "sensor",
-      "domain_data": {
-        "source": "R1VARSETPOINT",
-        "unit_of_measurement": "°C"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Sensor_Led6",
-      "resource": "led6",
-      "domain": "sensor",
-      "domain_data": {
-        "source": "LED6",
-        "unit_of_measurement": "NATIVE"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Sensor_LogicOp1",
-      "resource": "logicop1",
-      "domain": "sensor",
-      "domain_data": {
-        "source": "LOGICOP1",
-        "unit_of_measurement": "NATIVE"
-      }
     }
   ]
 }
diff --git a/tests/components/lcn/fixtures/config_entry_pchk_v1_2.json b/tests/components/lcn/fixtures/config_entry_pchk_v1_2.json
index 7389079dca9..4cade6b64d0 100644
--- a/tests/components/lcn/fixtures/config_entry_pchk_v1_2.json
+++ b/tests/components/lcn/fixtures/config_entry_pchk_v1_2.json
@@ -14,13 +14,6 @@
       "hardware_serial": -1,
       "software_serial": -1,
       "hardware_type": -1
-    },
-    {
-      "address": [0, 5, true],
-      "name": "TestGroup",
-      "hardware_serial": -1,
-      "software_serial": -1,
-      "hardware_type": -1
     }
   ],
   "entities": [
@@ -43,115 +36,7 @@
       "domain_data": {
         "output": "OUTPUT2",
         "dimmable": false,
-        "transition": 0
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Light_Relay1",
-      "resource": "relay1",
-      "domain": "light",
-      "domain_data": {
-        "output": "RELAY1",
-        "dimmable": false,
-        "transition": 0.0
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_Output1",
-      "resource": "output1",
-      "domain": "switch",
-      "domain_data": {
-        "output": "OUTPUT1"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_Output2",
-      "resource": "output2",
-      "domain": "switch",
-      "domain_data": {
-        "output": "OUTPUT2"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_Relay1",
-      "resource": "relay1",
-      "domain": "switch",
-      "domain_data": {
-        "output": "RELAY1"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_Relay2",
-      "resource": "relay2",
-      "domain": "switch",
-      "domain_data": {
-        "output": "RELAY2"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_Regulator1",
-      "resource": "r1varsetpoint",
-      "domain": "switch",
-      "domain_data": {
-        "output": "R1VARSETPOINT"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_KeyLock1",
-      "resource": "a1",
-      "domain": "switch",
-      "domain_data": {
-        "output": "A1"
-      }
-    },
-    {
-      "address": [0, 5, true],
-      "name": "Switch_Group5",
-      "resource": "relay1",
-      "domain": "switch",
-      "domain_data": {
-        "output": "RELAY1"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Cover_Outputs",
-      "resource": "outputs",
-      "domain": "cover",
-      "domain_data": {
-        "motor": "OUTPUTS",
-        "reverse_time": "RT1200"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Cover_Relays",
-      "resource": "motor1",
-      "domain": "cover",
-      "domain_data": {
-        "motor": "MOTOR1",
-        "reverse_time": "RT1200"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Climate1",
-      "resource": "var1.r1varsetpoint",
-      "domain": "climate",
-      "domain_data": {
-        "source": "VAR1",
-        "setpoint": "R1VARSETPOINT",
-        "lockable": true,
-        "min_temp": 0.0,
-        "max_temp": 40.0,
-        "unit_of_measurement": "°C"
+        "transition": null
       }
     },
     {
@@ -177,73 +62,6 @@
         "outputs": ["OUTPUT1", "OUTPUT2", "RELAY1"],
         "transition": 10000
       }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Sensor_LockRegulator1",
-      "resource": "r1varsetpoint",
-      "domain": "binary_sensor",
-      "domain_data": {
-        "source": "R1VARSETPOINT"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Binary_Sensor1",
-      "resource": "binsensor1",
-      "domain": "binary_sensor",
-      "domain_data": {
-        "source": "BINSENSOR1"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Sensor_KeyLock",
-      "resource": "a5",
-      "domain": "binary_sensor",
-      "domain_data": {
-        "source": "A5"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Sensor_Var1",
-      "resource": "var1",
-      "domain": "sensor",
-      "domain_data": {
-        "source": "VAR1",
-        "unit_of_measurement": "°C"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Sensor_Setpoint1",
-      "resource": "r1varsetpoint",
-      "domain": "sensor",
-      "domain_data": {
-        "source": "R1VARSETPOINT",
-        "unit_of_measurement": "°C"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Sensor_Led6",
-      "resource": "led6",
-      "domain": "sensor",
-      "domain_data": {
-        "source": "LED6",
-        "unit_of_measurement": "NATIVE"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Sensor_LogicOp1",
-      "resource": "logicop1",
-      "domain": "sensor",
-      "domain_data": {
-        "source": "LOGICOP1",
-        "unit_of_measurement": "NATIVE"
-      }
     }
   ]
 }
diff --git a/tests/components/lcn/snapshots/test_binary_sensor.ambr b/tests/components/lcn/snapshots/test_binary_sensor.ambr
index 0ad31437dd1..d2d697569d1 100644
--- a/tests/components/lcn/snapshots/test_binary_sensor.ambr
+++ b/tests/components/lcn/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/lcn/snapshots/test_climate.ambr b/tests/components/lcn/snapshots/test_climate.ambr
index 443b13312d1..81745ca8515 100644
--- a/tests/components/lcn/snapshots/test_climate.ambr
+++ b/tests/components/lcn/snapshots/test_climate.ambr
@@ -13,6 +13,7 @@
       'min_temp': 0.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/lcn/snapshots/test_cover.ambr b/tests/components/lcn/snapshots/test_cover.ambr
index 82a19060d73..d399626537d 100644
--- a/tests/components/lcn/snapshots/test_cover.ambr
+++ b/tests/components/lcn/snapshots/test_cover.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/lcn/snapshots/test_init.ambr b/tests/components/lcn/snapshots/test_init.ambr
new file mode 100644
index 00000000000..ea6267aaa0b
--- /dev/null
+++ b/tests/components/lcn/snapshots/test_init.ambr
@@ -0,0 +1,140 @@
+# serializer version: 1
+# name: test_migrate_1_1
+  dict({
+    'acknowledge': False,
+    'devices': list([
+      dict({
+        'address': tuple(
+          0,
+          7,
+          False,
+        ),
+        'hardware_serial': -1,
+        'hardware_type': -1,
+        'name': 'TestModule',
+        'software_serial': -1,
+      }),
+    ]),
+    'dim_mode': 'STEPS200',
+    'entities': list([
+      dict({
+        'address': tuple(
+          0,
+          7,
+          False,
+        ),
+        'domain': 'light',
+        'domain_data': dict({
+          'dimmable': True,
+          'output': 'OUTPUT1',
+          'transition': 5.0,
+        }),
+        'name': 'Light_Output1',
+        'resource': 'output1',
+      }),
+    ]),
+    'host': 'pchk',
+    'ip_address': '192.168.2.41',
+    'password': 'lcn',
+    'port': 4114,
+    'sk_num_tries': 0,
+    'username': 'lcn',
+  })
+# ---
+# name: test_migrate_1_2
+  dict({
+    'acknowledge': False,
+    'devices': list([
+      dict({
+        'address': tuple(
+          0,
+          7,
+          False,
+        ),
+        'hardware_serial': -1,
+        'hardware_type': -1,
+        'name': 'TestModule',
+        'software_serial': -1,
+      }),
+    ]),
+    'dim_mode': 'STEPS200',
+    'entities': list([
+      dict({
+        'address': tuple(
+          0,
+          7,
+          False,
+        ),
+        'domain': 'light',
+        'domain_data': dict({
+          'dimmable': True,
+          'output': 'OUTPUT1',
+          'transition': 5.0,
+        }),
+        'name': 'Light_Output1',
+        'resource': 'output1',
+      }),
+      dict({
+        'address': tuple(
+          0,
+          7,
+          False,
+        ),
+        'domain': 'light',
+        'domain_data': dict({
+          'dimmable': False,
+          'output': 'OUTPUT2',
+          'transition': 0.0,
+        }),
+        'name': 'Light_Output2',
+        'resource': 'output2',
+      }),
+      dict({
+        'address': tuple(
+          0,
+          7,
+          False,
+        ),
+        'domain': 'scene',
+        'domain_data': dict({
+          'outputs': list([
+            'OUTPUT1',
+            'OUTPUT2',
+            'RELAY1',
+          ]),
+          'register': 0,
+          'scene': 0,
+          'transition': 0.0,
+        }),
+        'name': 'Romantic',
+        'resource': '0.0',
+      }),
+      dict({
+        'address': tuple(
+          0,
+          7,
+          False,
+        ),
+        'domain': 'scene',
+        'domain_data': dict({
+          'outputs': list([
+            'OUTPUT1',
+            'OUTPUT2',
+            'RELAY1',
+          ]),
+          'register': 0,
+          'scene': 1,
+          'transition': 10.0,
+        }),
+        'name': 'Romantic Transition',
+        'resource': '0.1',
+      }),
+    ]),
+    'host': 'pchk',
+    'ip_address': '192.168.2.41',
+    'password': 'lcn',
+    'port': 4114,
+    'sk_num_tries': 0,
+    'username': 'lcn',
+  })
+# ---
diff --git a/tests/components/lcn/snapshots/test_light.ambr b/tests/components/lcn/snapshots/test_light.ambr
index f53d1fdf2dc..638cddc15cd 100644
--- a/tests/components/lcn/snapshots/test_light.ambr
+++ b/tests/components/lcn/snapshots/test_light.ambr
@@ -10,6 +10,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -66,6 +67,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -121,6 +123,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/lcn/snapshots/test_scene.ambr b/tests/components/lcn/snapshots/test_scene.ambr
index c039c4ef951..a5576158621 100644
--- a/tests/components/lcn/snapshots/test_scene.ambr
+++ b/tests/components/lcn/snapshots/test_scene.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/lcn/snapshots/test_sensor.ambr b/tests/components/lcn/snapshots/test_sensor.ambr
index 56776e3e0f6..f8d57ed8904 100644
--- a/tests/components/lcn/snapshots/test_sensor.ambr
+++ b/tests/components/lcn/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -146,6 +149,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/lcn/snapshots/test_switch.ambr b/tests/components/lcn/snapshots/test_switch.ambr
index 36145b8d4fd..bc69b0ed483 100644
--- a/tests/components/lcn/snapshots/test_switch.ambr
+++ b/tests/components/lcn/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -190,6 +194,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +241,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -282,6 +288,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/lcn/test_binary_sensor.py b/tests/components/lcn/test_binary_sensor.py
index 2f64f421b93..7d636f546c4 100644
--- a/tests/components/lcn/test_binary_sensor.py
+++ b/tests/components/lcn/test_binary_sensor.py
@@ -15,8 +15,7 @@ from homeassistant.components.lcn.helpers import get_device_connection
 from homeassistant.components.script import scripts_with_entity
 from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE, Platform
 from homeassistant.core import HomeAssistant, ServiceCall
-from homeassistant.helpers import entity_registry as er
-import homeassistant.helpers.issue_registry as ir
+from homeassistant.helpers import entity_registry as er, issue_registry as ir
 from homeassistant.setup import async_setup_component
 
 from .conftest import MockConfigEntry, init_integration
diff --git a/tests/components/lcn/test_device_trigger.py b/tests/components/lcn/test_device_trigger.py
index 6537c108981..94eb96591e2 100644
--- a/tests/components/lcn/test_device_trigger.py
+++ b/tests/components/lcn/test_device_trigger.py
@@ -45,9 +45,14 @@ async def test_get_triggers_module_device(
         )
     ]
 
-    triggers = await async_get_device_automations(
-        hass, DeviceAutomationType.TRIGGER, device.id
-    )
+    triggers = [
+        trigger
+        for trigger in await async_get_device_automations(
+            hass, DeviceAutomationType.TRIGGER, device.id
+        )
+        if trigger[CONF_DOMAIN] == DOMAIN
+    ]
+
     assert triggers == unordered(expected_triggers)
 
 
@@ -63,11 +68,8 @@ async def test_get_triggers_non_module_device(
         identifiers={(DOMAIN, entry.entry_id)}
     )
     group_device = get_device(hass, entry, (0, 5, True))
-    resource_device = device_registry.async_get_device(
-        identifiers={(DOMAIN, f"{entry.entry_id}-m000007-output1")}
-    )
 
-    for device in (host_device, group_device, resource_device):
+    for device in (host_device, group_device):
         triggers = await async_get_device_automations(
             hass, DeviceAutomationType.TRIGGER, device.id
         )
diff --git a/tests/components/lcn/test_init.py b/tests/components/lcn/test_init.py
index 4bb8d023d3f..ef3c2d3cb66 100644
--- a/tests/components/lcn/test_init.py
+++ b/tests/components/lcn/test_init.py
@@ -11,6 +11,7 @@ from pypck.connection import (
 )
 from pypck.lcn_defs import LcnEvent
 import pytest
+from syrupy.assertion import SnapshotAssertion
 
 from homeassistant import config_entries
 from homeassistant.components.lcn.const import DOMAIN
@@ -134,7 +135,7 @@ async def test_async_entry_reload_on_host_event_received(
 
 
 @patch("homeassistant.components.lcn.PchkConnectionManager", MockPchkConnectionManager)
-async def test_migrate_1_1(hass: HomeAssistant, entry) -> None:
+async def test_migrate_1_1(hass: HomeAssistant, snapshot: SnapshotAssertion) -> None:
     """Test migration config entry."""
     entry_v1_1 = create_config_entry("pchk_v1_1", version=(1, 1))
     entry_v1_1.add_to_hass(hass)
@@ -143,14 +144,15 @@ async def test_migrate_1_1(hass: HomeAssistant, entry) -> None:
     await hass.async_block_till_done()
 
     entry_migrated = hass.config_entries.async_get_entry(entry_v1_1.entry_id)
+
     assert entry_migrated.state is ConfigEntryState.LOADED
     assert entry_migrated.version == 2
     assert entry_migrated.minor_version == 1
-    assert entry_migrated.data == entry.data
+    assert entry_migrated.data == snapshot
 
 
 @patch("homeassistant.components.lcn.PchkConnectionManager", MockPchkConnectionManager)
-async def test_migrate_1_2(hass: HomeAssistant, entry) -> None:
+async def test_migrate_1_2(hass: HomeAssistant, snapshot: SnapshotAssertion) -> None:
     """Test migration config entry."""
     entry_v1_2 = create_config_entry("pchk_v1_2", version=(1, 2))
     entry_v1_2.add_to_hass(hass)
@@ -159,7 +161,8 @@ async def test_migrate_1_2(hass: HomeAssistant, entry) -> None:
     await hass.async_block_till_done()
 
     entry_migrated = hass.config_entries.async_get_entry(entry_v1_2.entry_id)
+
     assert entry_migrated.state is ConfigEntryState.LOADED
     assert entry_migrated.version == 2
     assert entry_migrated.minor_version == 1
-    assert entry_migrated.data == entry.data
+    assert entry_migrated.data == snapshot
diff --git a/tests/components/lcn/test_services.py b/tests/components/lcn/test_services.py
index cd97e3484e3..c9eda40fdba 100644
--- a/tests/components/lcn/test_services.py
+++ b/tests/components/lcn/test_services.py
@@ -31,7 +31,7 @@ from homeassistant.const import (
     CONF_UNIT_OF_MEASUREMENT,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.issue_registry as ir
+from homeassistant.helpers import issue_registry as ir
 from homeassistant.setup import async_setup_component
 
 from .conftest import (
diff --git a/tests/components/lektrico/snapshots/test_binary_sensor.ambr b/tests/components/lektrico/snapshots/test_binary_sensor.ambr
index 6a28e7c60de..7d812c0fc67 100644
--- a/tests/components/lektrico/snapshots/test_binary_sensor.ambr
+++ b/tests/components/lektrico/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -23,7 +24,7 @@
     }),
     'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
     'original_icon': None,
-    'original_name': 'Ev diode short',
+    'original_name': 'EV diode short',
     'platform': 'lektrico',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -36,7 +37,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'problem',
-      'friendly_name': '1p7k_500006 Ev diode short',
+      'friendly_name': '1p7k_500006 EV diode short',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.1p7k_500006_ev_diode_short',
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -70,7 +72,7 @@
     }),
     'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
     'original_icon': None,
-    'original_name': 'Ev error',
+    'original_name': 'EV error',
     'platform': 'lektrico',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -83,7 +85,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'problem',
-      'friendly_name': '1p7k_500006 Ev error',
+      'friendly_name': '1p7k_500006 EV error',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.1p7k_500006_ev_error',
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -194,6 +198,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -241,6 +246,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -288,6 +294,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -305,7 +312,7 @@
     }),
     'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
     'original_icon': None,
-    'original_name': 'Rcd error',
+    'original_name': 'RCD error',
     'platform': 'lektrico',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -318,7 +325,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'problem',
-      'friendly_name': '1p7k_500006 Rcd error',
+      'friendly_name': '1p7k_500006 RCD error',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.1p7k_500006_rcd_error',
@@ -335,6 +342,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -382,6 +390,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -429,6 +438,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/lektrico/snapshots/test_button.ambr b/tests/components/lektrico/snapshots/test_button.ambr
index 5070cd484c4..f9cb7189237 100644
--- a/tests/components/lektrico/snapshots/test_button.ambr
+++ b/tests/components/lektrico/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/lektrico/snapshots/test_init.ambr b/tests/components/lektrico/snapshots/test_init.ambr
index 63739e1c9d8..35183bf5d75 100644
--- a/tests/components/lektrico/snapshots/test_init.ambr
+++ b/tests/components/lektrico/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/lektrico/snapshots/test_number.ambr b/tests/components/lektrico/snapshots/test_number.ambr
index 30a37a25a09..368479cdd06 100644
--- a/tests/components/lektrico/snapshots/test_number.ambr
+++ b/tests/components/lektrico/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -67,6 +68,7 @@
       'step': 5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -84,7 +86,7 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': 'Led brightness',
+    'original_name': 'LED brightness',
     'platform': 'lektrico',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -96,7 +98,7 @@
 # name: test_all_entities[number.1p7k_500006_led_brightness-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': '1p7k_500006 Led brightness',
+      'friendly_name': '1p7k_500006 LED brightness',
       'max': 100,
       'min': 0,
       'mode': <NumberMode.AUTO: 'auto'>,
diff --git a/tests/components/lektrico/snapshots/test_select.ambr b/tests/components/lektrico/snapshots/test_select.ambr
index 5a964f52ada..0f564abb146 100644
--- a/tests/components/lektrico/snapshots/test_select.ambr
+++ b/tests/components/lektrico/snapshots/test_select.ambr
@@ -13,6 +13,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/lektrico/snapshots/test_sensor.ambr b/tests/components/lektrico/snapshots/test_sensor.ambr
index 73ec88e6fa1..aa146f55776 100644
--- a/tests/components/lektrico/snapshots/test_sensor.ambr
+++ b/tests/components/lektrico/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -56,6 +57,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -105,6 +107,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -153,6 +156,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -203,6 +207,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -266,6 +271,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -328,6 +334,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -392,6 +399,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -452,6 +460,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -501,6 +510,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/lektrico/snapshots/test_switch.ambr b/tests/components/lektrico/snapshots/test_switch.ambr
index 3f4a1693315..c55e96ac9a9 100644
--- a/tests/components/lektrico/snapshots/test_switch.ambr
+++ b/tests/components/lektrico/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/letpot/__init__.py b/tests/components/letpot/__init__.py
index f7686f815fe..6e73bb430cf 100644
--- a/tests/components/letpot/__init__.py
+++ b/tests/components/letpot/__init__.py
@@ -1,12 +1,67 @@
 """Tests for the LetPot integration."""
 
-from letpot.models import AuthenticationInfo
+import datetime
+
+from letpot.models import (
+    AuthenticationInfo,
+    LetPotDeviceErrors,
+    LetPotDeviceStatus,
+    TemperatureUnit,
+)
+
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+async def setup_integration(hass: HomeAssistant, config_entry: MockConfigEntry) -> None:
+    """Fixture for setting up the component."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
 
 AUTHENTICATION = AuthenticationInfo(
     access_token="access_token",
-    access_token_expires=0,
+    access_token_expires=1738368000,  # 2025-02-01 00:00:00 GMT
     refresh_token="refresh_token",
-    refresh_token_expires=0,
+    refresh_token_expires=1740441600,  # 2025-02-25 00:00:00 GMT
     user_id="a1b2c3d4e5f6a1b2c3d4e5f6",
     email="email@example.com",
 )
+
+MAX_STATUS = LetPotDeviceStatus(
+    errors=LetPotDeviceErrors(low_water=True, low_nutrients=False, refill_error=False),
+    light_brightness=500,
+    light_mode=1,
+    light_schedule_end=datetime.time(18, 0),
+    light_schedule_start=datetime.time(8, 0),
+    online=True,
+    plant_days=1,
+    pump_mode=1,
+    pump_nutrient=None,
+    pump_status=0,
+    raw=[],  # Not used by integration, and it requires a real device to get
+    system_on=True,
+    system_sound=False,
+    temperature_unit=TemperatureUnit.CELSIUS,
+    temperature_value=18,
+    water_mode=1,
+    water_level=100,
+)
+
+SE_STATUS = LetPotDeviceStatus(
+    errors=LetPotDeviceErrors(low_water=True, pump_malfunction=True),
+    light_brightness=500,
+    light_mode=1,
+    light_schedule_end=datetime.time(18, 0),
+    light_schedule_start=datetime.time(8, 0),
+    online=True,
+    plant_days=1,
+    pump_mode=1,
+    pump_nutrient=None,
+    pump_status=0,
+    raw=[],  # Not used by integration, and it requires a real device to get
+    system_on=True,
+    system_sound=False,
+)
diff --git a/tests/components/letpot/conftest.py b/tests/components/letpot/conftest.py
index 4cd7ef442a6..25974b2d78a 100644
--- a/tests/components/letpot/conftest.py
+++ b/tests/components/letpot/conftest.py
@@ -1,8 +1,9 @@
 """Common fixtures for the LetPot tests."""
 
-from collections.abc import Generator
+from collections.abc import Callable, Generator
 from unittest.mock import AsyncMock, patch
 
+from letpot.models import DeviceFeature, LetPotDevice, LetPotDeviceStatus
 import pytest
 
 from homeassistant.components.letpot.const import (
@@ -14,11 +15,42 @@ from homeassistant.components.letpot.const import (
 )
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_EMAIL
 
-from . import AUTHENTICATION
+from . import AUTHENTICATION, MAX_STATUS, SE_STATUS
 
 from tests.common import MockConfigEntry
 
 
+@pytest.fixture
+def device_type() -> str:
+    """Return the device type to use for mock data."""
+    return "LPH63"
+
+
+def _mock_device_features(device_type: str) -> DeviceFeature:
+    """Return mock device feature support for the given type."""
+    if device_type == "LPH31":
+        return DeviceFeature.LIGHT_BRIGHTNESS_LOW_HIGH | DeviceFeature.PUMP_STATUS
+    if device_type == "LPH63":
+        return (
+            DeviceFeature.LIGHT_BRIGHTNESS_LEVELS
+            | DeviceFeature.NUTRIENT_BUTTON
+            | DeviceFeature.PUMP_AUTO
+            | DeviceFeature.PUMP_STATUS
+            | DeviceFeature.TEMPERATURE
+            | DeviceFeature.WATER_LEVEL
+        )
+    raise ValueError(f"No mock data for device type {device_type}")
+
+
+def _mock_device_status(device_type: str) -> LetPotDeviceStatus:
+    """Return mock device status for the given type."""
+    if device_type == "LPH31":
+        return SE_STATUS
+    if device_type == "LPH63":
+        return MAX_STATUS
+    raise ValueError(f"No mock data for device type {device_type}")
+
+
 @pytest.fixture
 def mock_setup_entry() -> Generator[AsyncMock]:
     """Override async_setup_entry."""
@@ -28,6 +60,66 @@ def mock_setup_entry() -> Generator[AsyncMock]:
         yield mock_setup_entry
 
 
+@pytest.fixture
+def mock_client(device_type: str) -> Generator[AsyncMock]:
+    """Mock a LetPotClient."""
+    with (
+        patch(
+            "homeassistant.components.letpot.LetPotClient",
+            autospec=True,
+        ) as mock_client,
+        patch(
+            "homeassistant.components.letpot.config_flow.LetPotClient",
+            new=mock_client,
+        ),
+    ):
+        client = mock_client.return_value
+        client.login.return_value = AUTHENTICATION
+        client.refresh_token.return_value = AUTHENTICATION
+        client.get_devices.return_value = [
+            LetPotDevice(
+                serial_number=f"{device_type}ABCD",
+                name="Garden",
+                device_type=device_type,
+                is_online=True,
+                is_remote=False,
+            )
+        ]
+        yield client
+
+
+@pytest.fixture
+def mock_device_client(device_type: str) -> Generator[AsyncMock]:
+    """Mock a LetPotDeviceClient."""
+    with patch(
+        "homeassistant.components.letpot.coordinator.LetPotDeviceClient",
+        autospec=True,
+    ) as mock_device_client:
+        device_client = mock_device_client.return_value
+        device_client.device_features = _mock_device_features(device_type)
+        device_client.device_model_code = device_type
+        device_client.device_model_name = f"LetPot {device_type}"
+        device_status = _mock_device_status(device_type)
+
+        subscribe_callbacks: list[Callable] = []
+
+        def subscribe_side_effect(callback: Callable) -> None:
+            subscribe_callbacks.append(callback)
+
+        def status_side_effect() -> None:
+            # Deliver a status update to any subscribers, like the real client
+            for callback in subscribe_callbacks:
+                callback(device_status)
+
+        device_client.get_current_status.side_effect = status_side_effect
+        device_client.get_current_status.return_value = device_status
+        device_client.last_status.return_value = device_status
+        device_client.request_status_update.side_effect = status_side_effect
+        device_client.subscribe.side_effect = subscribe_side_effect
+
+        yield device_client
+
+
 @pytest.fixture
 def mock_config_entry() -> MockConfigEntry:
     """Mock a config entry."""
diff --git a/tests/components/letpot/snapshots/test_binary_sensor.ambr b/tests/components/letpot/snapshots/test_binary_sensor.ambr
new file mode 100644
index 00000000000..121cf4e3f82
--- /dev/null
+++ b/tests/components/letpot/snapshots/test_binary_sensor.ambr
@@ -0,0 +1,337 @@
+# serializer version: 1
+# name: test_all_entities[LPH31][binary_sensor.garden_low_water-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.garden_low_water',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Low water',
+    'platform': 'letpot',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'low_water',
+    'unique_id': 'a1b2c3d4e5f6a1b2c3d4e5f6_LPH31ABCD_low_water',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[LPH31][binary_sensor.garden_low_water-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'Garden Low water',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.garden_low_water',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_all_entities[LPH31][binary_sensor.garden_pump-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.garden_pump',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.RUNNING: 'running'>,
+    'original_icon': None,
+    'original_name': 'Pump',
+    'platform': 'letpot',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'pump',
+    'unique_id': 'a1b2c3d4e5f6a1b2c3d4e5f6_LPH31ABCD_pump',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[LPH31][binary_sensor.garden_pump-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'running',
+      'friendly_name': 'Garden Pump',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.garden_pump',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[LPH31][binary_sensor.garden_pump_error-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.garden_pump_error',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Pump error',
+    'platform': 'letpot',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'pump_error',
+    'unique_id': 'a1b2c3d4e5f6a1b2c3d4e5f6_LPH31ABCD_pump_error',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[LPH31][binary_sensor.garden_pump_error-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'Garden Pump error',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.garden_pump_error',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_all_entities[LPH63][binary_sensor.garden_low_nutrients-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.garden_low_nutrients',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Low nutrients',
+    'platform': 'letpot',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'low_nutrients',
+    'unique_id': 'a1b2c3d4e5f6a1b2c3d4e5f6_LPH63ABCD_low_nutrients',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[LPH63][binary_sensor.garden_low_nutrients-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'Garden Low nutrients',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.garden_low_nutrients',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[LPH63][binary_sensor.garden_low_water-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.garden_low_water',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Low water',
+    'platform': 'letpot',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'low_water',
+    'unique_id': 'a1b2c3d4e5f6a1b2c3d4e5f6_LPH63ABCD_low_water',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[LPH63][binary_sensor.garden_low_water-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'Garden Low water',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.garden_low_water',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_all_entities[LPH63][binary_sensor.garden_pump-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.garden_pump',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.RUNNING: 'running'>,
+    'original_icon': None,
+    'original_name': 'Pump',
+    'platform': 'letpot',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'pump',
+    'unique_id': 'a1b2c3d4e5f6a1b2c3d4e5f6_LPH63ABCD_pump',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[LPH63][binary_sensor.garden_pump-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'running',
+      'friendly_name': 'Garden Pump',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.garden_pump',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[LPH63][binary_sensor.garden_refill_error-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.garden_refill_error',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Refill error',
+    'platform': 'letpot',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'refill_error',
+    'unique_id': 'a1b2c3d4e5f6a1b2c3d4e5f6_LPH63ABCD_refill_error',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[LPH63][binary_sensor.garden_refill_error-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'Garden Refill error',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.garden_refill_error',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
diff --git a/tests/components/letpot/snapshots/test_sensor.ambr b/tests/components/letpot/snapshots/test_sensor.ambr
new file mode 100644
index 00000000000..5d123cf6ce0
--- /dev/null
+++ b/tests/components/letpot/snapshots/test_sensor.ambr
@@ -0,0 +1,104 @@
+# serializer version: 1
+# name: test_all_entities[sensor.garden_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.garden_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'letpot',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'a1b2c3d4e5f6a1b2c3d4e5f6_LPH63ABCD_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[sensor.garden_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Garden Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.garden_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '18',
+  })
+# ---
+# name: test_all_entities[sensor.garden_water_level-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.garden_water_level',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Water level',
+    'platform': 'letpot',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'water_level',
+    'unique_id': 'a1b2c3d4e5f6a1b2c3d4e5f6_LPH63ABCD_water_level',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[sensor.garden_water_level-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Garden Water level',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.garden_water_level',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '100',
+  })
+# ---
diff --git a/tests/components/letpot/snapshots/test_switch.ambr b/tests/components/letpot/snapshots/test_switch.ambr
new file mode 100644
index 00000000000..1a36e555dd1
--- /dev/null
+++ b/tests/components/letpot/snapshots/test_switch.ambr
@@ -0,0 +1,189 @@
+# serializer version: 1
+# name: test_all_entities[switch.garden_alarm_sound-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'switch.garden_alarm_sound',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Alarm sound',
+    'platform': 'letpot',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'alarm_sound',
+    'unique_id': 'a1b2c3d4e5f6a1b2c3d4e5f6_LPH63ABCD_alarm_sound',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[switch.garden_alarm_sound-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Garden Alarm sound',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.garden_alarm_sound',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[switch.garden_auto_mode-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'switch.garden_auto_mode',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Auto mode',
+    'platform': 'letpot',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'auto_mode',
+    'unique_id': 'a1b2c3d4e5f6a1b2c3d4e5f6_LPH63ABCD_auto_mode',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[switch.garden_auto_mode-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Garden Auto mode',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.garden_auto_mode',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_all_entities[switch.garden_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'switch.garden_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'letpot',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'power',
+    'unique_id': 'a1b2c3d4e5f6a1b2c3d4e5f6_LPH63ABCD_power',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[switch.garden_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Garden Power',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.garden_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_all_entities[switch.garden_pump_cycling-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'switch.garden_pump_cycling',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Pump cycling',
+    'platform': 'letpot',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'pump_cycling',
+    'unique_id': 'a1b2c3d4e5f6a1b2c3d4e5f6_LPH63ABCD_pump_cycling',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[switch.garden_pump_cycling-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Garden Pump cycling',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.garden_pump_cycling',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
diff --git a/tests/components/letpot/snapshots/test_time.ambr b/tests/components/letpot/snapshots/test_time.ambr
new file mode 100644
index 00000000000..9ca75003e56
--- /dev/null
+++ b/tests/components/letpot/snapshots/test_time.ambr
@@ -0,0 +1,95 @@
+# serializer version: 1
+# name: test_all_entities[time.garden_light_off-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'time',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'time.garden_light_off',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Light off',
+    'platform': 'letpot',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'light_schedule_end',
+    'unique_id': 'a1b2c3d4e5f6a1b2c3d4e5f6_LPH63ABCD_light_schedule_end',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[time.garden_light_off-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Garden Light off',
+    }),
+    'context': <ANY>,
+    'entity_id': 'time.garden_light_off',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '18:00:00',
+  })
+# ---
+# name: test_all_entities[time.garden_light_on-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'time',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'time.garden_light_on',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Light on',
+    'platform': 'letpot',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'light_schedule_start',
+    'unique_id': 'a1b2c3d4e5f6a1b2c3d4e5f6_LPH63ABCD_light_schedule_start',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[time.garden_light_on-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Garden Light on',
+    }),
+    'context': <ANY>,
+    'entity_id': 'time.garden_light_on',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '08:00:00',
+  })
+# ---
diff --git a/tests/components/letpot/test_binary_sensor.py b/tests/components/letpot/test_binary_sensor.py
new file mode 100644
index 00000000000..03ce1bee1a5
--- /dev/null
+++ b/tests/components/letpot/test_binary_sensor.py
@@ -0,0 +1,32 @@
+"""Test binary sensor entities for the LetPot integration."""
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+from syrupy import SnapshotAssertion
+
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+@pytest.mark.parametrize("device_type", ["LPH63", "LPH31"])
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_all_entities(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    mock_client: MagicMock,
+    mock_device_client: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+    device_type: str,
+) -> None:
+    """Test binary sensor entities."""
+    with patch("homeassistant.components.letpot.PLATFORMS", [Platform.BINARY_SENSOR]):
+        await setup_integration(hass, mock_config_entry)
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/letpot/test_config_flow.py b/tests/components/letpot/test_config_flow.py
index 0ec1bd95d91..a659b235213 100644
--- a/tests/components/letpot/test_config_flow.py
+++ b/tests/components/letpot/test_config_flow.py
@@ -2,7 +2,7 @@
 
 import dataclasses
 from typing import Any
-from unittest.mock import AsyncMock, patch
+from unittest.mock import AsyncMock
 
 from letpot.exceptions import LetPotAuthenticationException, LetPotConnectionException
 import pytest
@@ -39,7 +39,9 @@ def _assert_result_success(result: Any) -> None:
     assert result["result"].unique_id == AUTHENTICATION.user_id
 
 
-async def test_full_flow(hass: HomeAssistant, mock_setup_entry: AsyncMock) -> None:
+async def test_full_flow(
+    hass: HomeAssistant, mock_client: AsyncMock, mock_setup_entry: AsyncMock
+) -> None:
     """Test full flow with success."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": SOURCE_USER}
@@ -47,18 +49,13 @@ async def test_full_flow(hass: HomeAssistant, mock_setup_entry: AsyncMock) -> No
     assert result["type"] is FlowResultType.FORM
     assert result["errors"] == {}
 
-    with patch(
-        "homeassistant.components.letpot.config_flow.LetPotClient.login",
-        return_value=AUTHENTICATION,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                CONF_EMAIL: "email@example.com",
-                CONF_PASSWORD: "test-password",
-            },
-        )
-        await hass.async_block_till_done()
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_EMAIL: "email@example.com",
+            CONF_PASSWORD: "test-password",
+        },
+    )
 
     _assert_result_success(result)
     assert len(mock_setup_entry.mock_calls) == 1
@@ -74,6 +71,7 @@ async def test_full_flow(hass: HomeAssistant, mock_setup_entry: AsyncMock) -> No
 )
 async def test_flow_exceptions(
     hass: HomeAssistant,
+    mock_client: AsyncMock,
     mock_setup_entry: AsyncMock,
     exception: Exception,
     error: str,
@@ -83,41 +81,37 @@ async def test_flow_exceptions(
         DOMAIN, context={"source": SOURCE_USER}
     )
 
-    with patch(
-        "homeassistant.components.letpot.config_flow.LetPotClient.login",
-        side_effect=exception,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                CONF_EMAIL: "email@example.com",
-                CONF_PASSWORD: "test-password",
-            },
-        )
+    mock_client.login.side_effect = exception
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_EMAIL: "email@example.com",
+            CONF_PASSWORD: "test-password",
+        },
+    )
 
     assert result["type"] is FlowResultType.FORM
     assert result["errors"] == {"base": error}
 
     # Retry to show recovery.
-    with patch(
-        "homeassistant.components.letpot.config_flow.LetPotClient.login",
-        return_value=AUTHENTICATION,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                CONF_EMAIL: "email@example.com",
-                CONF_PASSWORD: "test-password",
-            },
-        )
-        await hass.async_block_till_done()
+    mock_client.login.side_effect = None
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_EMAIL: "email@example.com",
+            CONF_PASSWORD: "test-password",
+        },
+    )
 
     _assert_result_success(result)
     assert len(mock_setup_entry.mock_calls) == 1
 
 
 async def test_flow_duplicate(
-    hass: HomeAssistant, mock_setup_entry: AsyncMock, mock_config_entry: MockConfigEntry
+    hass: HomeAssistant,
+    mock_client: AsyncMock,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
     """Test flow aborts when trying to add a previously added account."""
     mock_config_entry.add_to_hass(hass)
@@ -130,18 +124,13 @@ async def test_flow_duplicate(
     assert result["step_id"] == "user"
     assert result["errors"] == {}
 
-    with patch(
-        "homeassistant.components.letpot.config_flow.LetPotClient.login",
-        return_value=AUTHENTICATION,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                CONF_EMAIL: "email@example.com",
-                CONF_PASSWORD: "test-password",
-            },
-        )
-        await hass.async_block_till_done()
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_EMAIL: "email@example.com",
+            CONF_PASSWORD: "test-password",
+        },
+    )
 
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "already_configured"
@@ -149,7 +138,10 @@ async def test_flow_duplicate(
 
 
 async def test_reauth_flow(
-    hass: HomeAssistant, mock_config_entry: MockConfigEntry
+    hass: HomeAssistant,
+    mock_client: AsyncMock,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
     """Test reauth flow with success."""
     mock_config_entry.add_to_hass(hass)
@@ -163,15 +155,11 @@ async def test_reauth_flow(
         access_token="new_access_token",
         refresh_token="new_refresh_token",
     )
-    with patch(
-        "homeassistant.components.letpot.config_flow.LetPotClient.login",
-        return_value=updated_auth,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {CONF_PASSWORD: "new-password"},
-        )
-        await hass.async_block_till_done()
+    mock_client.login.return_value = updated_auth
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_PASSWORD: "new-password"},
+    )
 
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "reauth_successful"
@@ -196,6 +184,8 @@ async def test_reauth_flow(
 )
 async def test_reauth_exceptions(
     hass: HomeAssistant,
+    mock_client: AsyncMock,
+    mock_setup_entry: AsyncMock,
     mock_config_entry: MockConfigEntry,
     exception: Exception,
     error: str,
@@ -207,14 +197,11 @@ async def test_reauth_exceptions(
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "reauth_confirm"
 
-    with patch(
-        "homeassistant.components.letpot.config_flow.LetPotClient.login",
-        side_effect=exception,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {CONF_PASSWORD: "new-password"},
-        )
+    mock_client.login.side_effect = exception
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_PASSWORD: "new-password"},
+    )
 
     assert result["type"] is FlowResultType.FORM
     assert result["errors"] == {"base": error}
@@ -225,15 +212,12 @@ async def test_reauth_exceptions(
         access_token="new_access_token",
         refresh_token="new_refresh_token",
     )
-    with patch(
-        "homeassistant.components.letpot.config_flow.LetPotClient.login",
-        return_value=updated_auth,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {CONF_PASSWORD: "new-password"},
-        )
-        await hass.async_block_till_done()
+    mock_client.login.return_value = updated_auth
+    mock_client.login.side_effect = None
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_PASSWORD: "new-password"},
+    )
 
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "reauth_successful"
@@ -249,7 +233,10 @@ async def test_reauth_exceptions(
 
 
 async def test_reauth_different_user_id_new(
-    hass: HomeAssistant, mock_config_entry: MockConfigEntry
+    hass: HomeAssistant,
+    mock_client: AsyncMock,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
     """Test reauth flow with different, new user ID updating the existing entry."""
     mock_config_entry.add_to_hass(hass)
@@ -262,15 +249,11 @@ async def test_reauth_different_user_id_new(
     assert result["step_id"] == "reauth_confirm"
 
     updated_auth = dataclasses.replace(AUTHENTICATION, user_id="new_user_id")
-    with patch(
-        "homeassistant.components.letpot.config_flow.LetPotClient.login",
-        return_value=updated_auth,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {CONF_PASSWORD: "new-password"},
-        )
-        await hass.async_block_till_done()
+    mock_client.login.return_value = updated_auth
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_PASSWORD: "new-password"},
+    )
 
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "reauth_successful"
@@ -288,7 +271,10 @@ async def test_reauth_different_user_id_new(
 
 
 async def test_reauth_different_user_id_existing(
-    hass: HomeAssistant, mock_config_entry: MockConfigEntry
+    hass: HomeAssistant,
+    mock_client: AsyncMock,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
     """Test reauth flow with different, existing user ID aborting."""
     mock_config_entry.add_to_hass(hass)
@@ -302,15 +288,11 @@ async def test_reauth_different_user_id_existing(
     assert result["step_id"] == "reauth_confirm"
 
     updated_auth = dataclasses.replace(AUTHENTICATION, user_id="other_user_id")
-    with patch(
-        "homeassistant.components.letpot.config_flow.LetPotClient.login",
-        return_value=updated_auth,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {CONF_PASSWORD: "new-password"},
-        )
-        await hass.async_block_till_done()
+    mock_client.login.return_value = updated_auth
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_PASSWORD: "new-password"},
+    )
 
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "already_configured"
diff --git a/tests/components/letpot/test_init.py b/tests/components/letpot/test_init.py
new file mode 100644
index 00000000000..e3f78d87dc1
--- /dev/null
+++ b/tests/components/letpot/test_init.py
@@ -0,0 +1,131 @@
+"""Test the LetPot integration initialization and setup."""
+
+from unittest.mock import MagicMock
+
+from letpot.exceptions import (
+    LetPotAuthenticationException,
+    LetPotConnectionException,
+    LetPotException,
+)
+import pytest
+
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry
+
+
+@pytest.mark.freeze_time("2025-01-31 00:00:00")
+async def test_load_unload_config_entry(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_client: MagicMock,
+    mock_device_client: MagicMock,
+) -> None:
+    """Test config entry loading/unloading."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert mock_config_entry.state is ConfigEntryState.LOADED
+    mock_client.refresh_token.assert_not_called()  # Didn't refresh valid token
+    mock_client.get_devices.assert_called_once()
+    mock_device_client.subscribe.assert_called_once()
+    mock_device_client.get_current_status.assert_called_once()
+
+    await hass.config_entries.async_unload(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert mock_config_entry.state is ConfigEntryState.NOT_LOADED
+    mock_device_client.disconnect.assert_called_once()
+
+
+@pytest.mark.freeze_time("2025-02-15 00:00:00")
+async def test_refresh_authentication_on_load(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_client: MagicMock,
+    mock_device_client: MagicMock,
+) -> None:
+    """Test expired access token refreshed when needed to load config entry."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert mock_config_entry.state is ConfigEntryState.LOADED
+    mock_client.refresh_token.assert_called_once()
+
+    # Check loading continued as expected after refreshing token
+    mock_client.get_devices.assert_called_once()
+    mock_device_client.subscribe.assert_called_once()
+    mock_device_client.get_current_status.assert_called_once()
+
+
+@pytest.mark.freeze_time("2025-03-01 00:00:00")
+async def test_refresh_token_error_aborts(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_client: MagicMock,
+) -> None:
+    """Test expired refresh token aborting config entry loading."""
+    mock_client.refresh_token.side_effect = LetPotAuthenticationException
+
+    await setup_integration(hass, mock_config_entry)
+
+    assert mock_config_entry.state is ConfigEntryState.SETUP_ERROR
+    mock_client.refresh_token.assert_called_once()
+    mock_client.get_devices.assert_not_called()
+
+
+@pytest.mark.parametrize(
+    ("exception", "config_entry_state"),
+    [
+        (LetPotAuthenticationException, ConfigEntryState.SETUP_ERROR),
+        (LetPotConnectionException, ConfigEntryState.SETUP_RETRY),
+    ],
+)
+async def test_get_devices_exceptions(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_client: MagicMock,
+    mock_device_client: MagicMock,
+    exception: Exception,
+    config_entry_state: ConfigEntryState,
+) -> None:
+    """Test config entry errors if an exception is raised when getting devices."""
+    mock_client.get_devices.side_effect = exception
+
+    await setup_integration(hass, mock_config_entry)
+
+    assert mock_config_entry.state is config_entry_state
+    mock_client.get_devices.assert_called_once()
+    mock_device_client.subscribe.assert_not_called()
+
+
+async def test_device_subscribe_authentication_exception(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_client: MagicMock,
+    mock_device_client: MagicMock,
+) -> None:
+    """Test config entry errors if it is not allowed to subscribe to device updates."""
+    mock_device_client.subscribe.side_effect = LetPotAuthenticationException
+
+    await setup_integration(hass, mock_config_entry)
+
+    assert mock_config_entry.state is ConfigEntryState.SETUP_ERROR
+    mock_device_client.subscribe.assert_called_once()
+    mock_device_client.get_current_status.assert_not_called()
+
+
+async def test_device_refresh_exception(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_client: MagicMock,
+    mock_device_client: MagicMock,
+) -> None:
+    """Test config entry errors with retry if getting a device state update fails."""
+    mock_device_client.get_current_status.side_effect = LetPotException
+
+    await setup_integration(hass, mock_config_entry)
+
+    assert mock_config_entry.state is ConfigEntryState.SETUP_RETRY
+    mock_device_client.get_current_status.assert_called_once()
diff --git a/tests/components/letpot/test_sensor.py b/tests/components/letpot/test_sensor.py
new file mode 100644
index 00000000000..a527d062ca7
--- /dev/null
+++ b/tests/components/letpot/test_sensor.py
@@ -0,0 +1,28 @@
+"""Test sensor entities for the LetPot integration."""
+
+from unittest.mock import MagicMock, patch
+
+from syrupy import SnapshotAssertion
+
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+async def test_all_entities(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    mock_client: MagicMock,
+    mock_device_client: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test sensor entities."""
+    with patch("homeassistant.components.letpot.PLATFORMS", [Platform.SENSOR]):
+        await setup_integration(hass, mock_config_entry)
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/letpot/test_switch.py b/tests/components/letpot/test_switch.py
new file mode 100644
index 00000000000..0ba1f556bc9
--- /dev/null
+++ b/tests/components/letpot/test_switch.py
@@ -0,0 +1,113 @@
+"""Test switch entities for the LetPot integration."""
+
+from unittest.mock import MagicMock, patch
+
+from letpot.exceptions import LetPotConnectionException, LetPotException
+import pytest
+from syrupy import SnapshotAssertion
+
+from homeassistant.components.switch import (
+    SERVICE_TOGGLE,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+)
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import entity_registry as er
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+async def test_all_entities(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    mock_client: MagicMock,
+    mock_device_client: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test switch entities."""
+    with patch("homeassistant.components.letpot.PLATFORMS", [Platform.SWITCH]):
+        await setup_integration(hass, mock_config_entry)
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
+
+
+@pytest.mark.parametrize(
+    ("service", "parameter_value"),
+    [
+        (
+            SERVICE_TURN_ON,
+            True,
+        ),
+        (
+            SERVICE_TURN_OFF,
+            False,
+        ),
+        (
+            SERVICE_TOGGLE,
+            False,  # Mock switch is on after setup, toggle will turn off
+        ),
+    ],
+)
+async def test_set_switch(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_client: MagicMock,
+    mock_device_client: MagicMock,
+    service: str,
+    parameter_value: bool,
+) -> None:
+    """Test switch entity turned on/turned off/toggled."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        "switch",
+        service,
+        blocking=True,
+        target={"entity_id": "switch.garden_power"},
+    )
+
+    mock_device_client.set_power.assert_awaited_once_with(parameter_value)
+
+
+@pytest.mark.parametrize(
+    ("service", "exception", "user_error"),
+    [
+        (
+            SERVICE_TURN_ON,
+            LetPotConnectionException("Connection failed"),
+            "An error occurred while communicating with the LetPot device: Connection failed",
+        ),
+        (
+            SERVICE_TURN_OFF,
+            LetPotException("Random thing failed"),
+            "An unknown error occurred while communicating with the LetPot device: Random thing failed",
+        ),
+    ],
+)
+async def test_switch_error(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_client: MagicMock,
+    mock_device_client: MagicMock,
+    service: str,
+    exception: Exception,
+    user_error: str,
+) -> None:
+    """Test switch entity exception handling."""
+    await setup_integration(hass, mock_config_entry)
+
+    mock_device_client.set_power.side_effect = exception
+
+    assert hass.states.get("switch.garden_power") is not None
+    with pytest.raises(HomeAssistantError, match=user_error):
+        await hass.services.async_call(
+            "switch",
+            service,
+            blocking=True,
+            target={"entity_id": "switch.garden_power"},
+        )
diff --git a/tests/components/letpot/test_time.py b/tests/components/letpot/test_time.py
new file mode 100644
index 00000000000..e65ea4532e1
--- /dev/null
+++ b/tests/components/letpot/test_time.py
@@ -0,0 +1,90 @@
+"""Test time entities for the LetPot integration."""
+
+from datetime import time
+from unittest.mock import MagicMock, patch
+
+from letpot.exceptions import LetPotConnectionException, LetPotException
+import pytest
+from syrupy import SnapshotAssertion
+
+from homeassistant.components.time import SERVICE_SET_VALUE
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import entity_registry as er
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+async def test_all_entities(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    mock_client: MagicMock,
+    mock_device_client: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test time entities."""
+    with patch("homeassistant.components.letpot.PLATFORMS", [Platform.TIME]):
+        await setup_integration(hass, mock_config_entry)
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
+
+
+async def test_set_time(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_client: MagicMock,
+    mock_device_client: MagicMock,
+) -> None:
+    """Test setting the time entity."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        "time",
+        SERVICE_SET_VALUE,
+        service_data={"time": time(hour=7, minute=0)},
+        blocking=True,
+        target={"entity_id": "time.garden_light_on"},
+    )
+
+    mock_device_client.set_light_schedule.assert_awaited_once_with(time(7, 0), None)
+
+
+@pytest.mark.parametrize(
+    ("exception", "user_error"),
+    [
+        (
+            LetPotConnectionException("Connection failed"),
+            "An error occurred while communicating with the LetPot device: Connection failed",
+        ),
+        (
+            LetPotException("Random thing failed"),
+            "An unknown error occurred while communicating with the LetPot device: Random thing failed",
+        ),
+    ],
+)
+async def test_time_error(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_client: MagicMock,
+    mock_device_client: MagicMock,
+    exception: Exception,
+    user_error: str,
+) -> None:
+    """Test time entity exception handling."""
+    await setup_integration(hass, mock_config_entry)
+
+    mock_device_client.set_light_schedule.side_effect = exception
+
+    assert hass.states.get("time.garden_light_on") is not None
+    with pytest.raises(HomeAssistantError, match=user_error):
+        await hass.services.async_call(
+            "time",
+            SERVICE_SET_VALUE,
+            service_data={"time": time(hour=7, minute=0)},
+            blocking=True,
+            target={"entity_id": "time.garden_light_on"},
+        )
diff --git a/tests/components/lg_thinq/fixtures/air_conditioner/profile.json b/tests/components/lg_thinq/fixtures/air_conditioner/profile.json
index 0d45dc5c9f4..85ce95da0ed 100644
--- a/tests/components/lg_thinq/fixtures/air_conditioner/profile.json
+++ b/tests/components/lg_thinq/fixtures/air_conditioner/profile.json
@@ -57,6 +57,16 @@
         "type": "number"
       }
     },
+    "filterInfo": {
+      "filterLifetime": {
+        "mode": ["r"],
+        "type": "number"
+      },
+      "usedTime": {
+        "mode": ["r"],
+        "type": "number"
+      }
+    },
     "operation": {
       "airCleanOperationMode": {
         "mode": ["w"],
@@ -124,6 +134,52 @@
         }
       }
     },
+    "temperatureInUnits": [
+      {
+        "currentTemperature": {
+          "type": "number",
+          "mode": ["r"]
+        },
+        "targetTemperature": {
+          "type": "number",
+          "mode": ["r"]
+        },
+        "coolTargetTemperature": {
+          "type": "range",
+          "mode": ["w"],
+          "value": {
+            "w": {
+              "max": 30,
+              "min": 18,
+              "step": 1
+            }
+          }
+        },
+        "unit": "C"
+      },
+      {
+        "currentTemperature": {
+          "type": "number",
+          "mode": ["r"]
+        },
+        "targetTemperature": {
+          "type": "number",
+          "mode": ["r"]
+        },
+        "coolTargetTemperature": {
+          "type": "range",
+          "mode": ["w"],
+          "value": {
+            "w": {
+              "max": 86,
+              "min": 64,
+              "step": 2
+            }
+          }
+        },
+        "unit": "F"
+      }
+    ],
     "timer": {
       "relativeHourToStart": {
         "mode": ["r", "w"],
@@ -149,6 +205,24 @@
         "mode": ["r", "w"],
         "type": "number"
       }
+    },
+    "windDirection": {
+      "rotateUpDown": {
+        "type": "boolean",
+        "mode": ["r", "w"],
+        "value": {
+          "r": [true, false],
+          "w": [true, false]
+        }
+      },
+      "rotateLeftRight": {
+        "type": "boolean",
+        "mode": ["r", "w"],
+        "value": {
+          "r": [true, false],
+          "w": [true, false]
+        }
+      }
     }
   }
 }
diff --git a/tests/components/lg_thinq/fixtures/air_conditioner/status.json b/tests/components/lg_thinq/fixtures/air_conditioner/status.json
index 90d15d1ae16..8440e7da28c 100644
--- a/tests/components/lg_thinq/fixtures/air_conditioner/status.json
+++ b/tests/components/lg_thinq/fixtures/air_conditioner/status.json
@@ -32,6 +32,19 @@
     "targetTemperature": 19,
     "unit": "C"
   },
+  "temperatureInUnits": [
+    {
+      "currentTemperature": 25,
+      "targetTemperature": 19,
+      "unit": "C"
+    },
+    {
+      "currentTemperature": 77,
+      "targetTemperature": 66,
+      "unit": "F"
+    }
+  ],
+
   "timer": {
     "relativeStartTimer": "UNSET",
     "relativeStopTimer": "UNSET",
@@ -39,5 +52,9 @@
     "absoluteStopTimer": "UNSET",
     "absoluteHourToStart": 13,
     "absoluteMinuteToStart": 14
+  },
+  "windDirection": {
+    "rotateUpDown": false,
+    "rotateLeftRight": false
   }
 }
diff --git a/tests/components/lg_thinq/snapshots/test_climate.ambr b/tests/components/lg_thinq/snapshots/test_climate.ambr
index e9470c3de03..111d49a2ef3 100644
--- a/tests/components/lg_thinq/snapshots/test_climate.ambr
+++ b/tests/components/lg_thinq/snapshots/test_climate.ambr
@@ -15,14 +15,23 @@
         <HVACMode.COOL: 'cool'>,
         <HVACMode.DRY: 'dry'>,
       ]),
-      'max_temp': 30,
-      'min_temp': 18,
+      'max_temp': 86,
+      'min_temp': 64,
       'preset_modes': list([
         'air_clean',
       ]),
-      'target_temp_step': 1,
+      'swing_horizontal_modes': list([
+        'on',
+        'off',
+      ]),
+      'swing_modes': list([
+        'on',
+        'off',
+      ]),
+      'target_temp_step': 2,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -43,7 +52,7 @@
     'original_name': None,
     'platform': 'lg_thinq',
     'previous_unique_id': None,
-    'supported_features': <ClimateEntityFeature: 409>,
+    'supported_features': <ClimateEntityFeature: 955>,
     'translation_key': <ExtendedProperty.CLIMATE_AIR_CONDITIONER: 'climate_air_conditioner'>,
     'unique_id': 'MW2-2E247F93-B570-46A6-B827-920E9E10F966_climate_air_conditioner',
     'unit_of_measurement': None,
@@ -53,7 +62,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'current_humidity': 40,
-      'current_temperature': 25,
+      'current_temperature': 77,
       'fan_mode': 'mid',
       'fan_modes': list([
         'low',
@@ -66,15 +75,27 @@
         <HVACMode.COOL: 'cool'>,
         <HVACMode.DRY: 'dry'>,
       ]),
-      'max_temp': 30,
-      'min_temp': 18,
+      'max_temp': 86,
+      'min_temp': 64,
       'preset_mode': None,
       'preset_modes': list([
         'air_clean',
       ]),
-      'supported_features': <ClimateEntityFeature: 409>,
-      'target_temp_step': 1,
-      'temperature': 19,
+      'supported_features': <ClimateEntityFeature: 955>,
+      'swing_horizontal_mode': 'off',
+      'swing_horizontal_modes': list([
+        'on',
+        'off',
+      ]),
+      'swing_mode': 'off',
+      'swing_modes': list([
+        'on',
+        'off',
+      ]),
+      'target_temp_high': None,
+      'target_temp_low': None,
+      'target_temp_step': 2,
+      'temperature': 66,
     }),
     'context': <ANY>,
     'entity_id': 'climate.test_air_conditioner',
diff --git a/tests/components/lg_thinq/snapshots/test_event.ambr b/tests/components/lg_thinq/snapshots/test_event.ambr
index 025f4496aeb..dbb43ce0bb9 100644
--- a/tests/components/lg_thinq/snapshots/test_event.ambr
+++ b/tests/components/lg_thinq/snapshots/test_event.ambr
@@ -10,6 +10,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/lg_thinq/snapshots/test_number.ambr b/tests/components/lg_thinq/snapshots/test_number.ambr
index 68f01854501..ef4d9a21b86 100644
--- a/tests/components/lg_thinq/snapshots/test_number.ambr
+++ b/tests/components/lg_thinq/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -67,6 +68,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/lg_thinq/snapshots/test_sensor.ambr b/tests/components/lg_thinq/snapshots/test_sensor.ambr
index 2c58b109e61..5e6eb98ac42 100644
--- a/tests/components/lg_thinq/snapshots/test_sensor.ambr
+++ b/tests/components/lg_thinq/snapshots/test_sensor.ambr
@@ -1,4 +1,52 @@
 # serializer version: 1
+# name: test_all_entities[sensor.test_air_conditioner_filter_remaining-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_air_conditioner_filter_remaining',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Filter remaining',
+    'platform': 'lg_thinq',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': <Property.FILTER_LIFETIME: 'filter_lifetime'>,
+    'unique_id': 'MW2-2E247F93-B570-46A6-B827-920E9E10F966_filter_lifetime',
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+  })
+# ---
+# name: test_all_entities[sensor.test_air_conditioner_filter_remaining-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test air conditioner Filter remaining',
+      'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_air_conditioner_filter_remaining',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '540',
+  })
+# ---
 # name: test_all_entities[sensor.test_air_conditioner_humidity-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -8,6 +56,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +108,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -110,6 +160,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -161,6 +212,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -210,6 +262,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -258,6 +311,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -306,6 +360,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -345,4 +400,4 @@
     'last_updated': <ANY>,
     'state': '2024-10-10T13:14:00+00:00',
   })
-# ---
\ No newline at end of file
+# ---
diff --git a/tests/components/lg_thinq/test_climate.py b/tests/components/lg_thinq/test_climate.py
index 24ed3ad230d..e53b1c5ff39 100644
--- a/tests/components/lg_thinq/test_climate.py
+++ b/tests/components/lg_thinq/test_climate.py
@@ -8,6 +8,7 @@ from syrupy import SnapshotAssertion
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
+from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM
 
 from . import setup_integration
 
@@ -23,6 +24,7 @@ async def test_all_entities(
     entity_registry: er.EntityRegistry,
 ) -> None:
     """Test all entities."""
+    hass.config.units = US_CUSTOMARY_SYSTEM
     with patch("homeassistant.components.lg_thinq.PLATFORMS", [Platform.CLIMATE]):
         await setup_integration(hass, mock_config_entry)
 
diff --git a/tests/components/life360/test_init.py b/tests/components/life360/test_init.py
index 0a781f6f2b2..6bdea177e61 100644
--- a/tests/components/life360/test_init.py
+++ b/tests/components/life360/test_init.py
@@ -1,7 +1,11 @@
 """Tests for the MyQ Connected Services integration."""
 
 from homeassistant.components.life360 import DOMAIN
-from homeassistant.config_entries import ConfigEntryState
+from homeassistant.config_entries import (
+    SOURCE_IGNORE,
+    ConfigEntryDisabler,
+    ConfigEntryState,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import issue_registry as ir
 
@@ -33,6 +37,28 @@ async def test_life360_repair_issue(
     assert config_entry_2.state is ConfigEntryState.LOADED
     assert issue_registry.async_get_issue(DOMAIN, DOMAIN)
 
+    # Add an ignored entry
+    config_entry_3 = MockConfigEntry(
+        source=SOURCE_IGNORE,
+        domain=DOMAIN,
+    )
+    config_entry_3.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry_3.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry_3.state is ConfigEntryState.NOT_LOADED
+
+    # Add a disabled entry
+    config_entry_4 = MockConfigEntry(
+        disabled_by=ConfigEntryDisabler.USER,
+        domain=DOMAIN,
+    )
+    config_entry_4.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry_4.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry_4.state is ConfigEntryState.NOT_LOADED
+
     # Remove the first one
     await hass.config_entries.async_remove(config_entry_1.entry_id)
     await hass.async_block_till_done()
@@ -48,3 +74,6 @@ async def test_life360_repair_issue(
     assert config_entry_1.state is ConfigEntryState.NOT_LOADED
     assert config_entry_2.state is ConfigEntryState.NOT_LOADED
     assert issue_registry.async_get_issue(DOMAIN, DOMAIN) is None
+
+    # Check the ignored and disabled entries are removed
+    assert not hass.config_entries.async_entries(DOMAIN)
diff --git a/tests/components/light/test_device_condition.py b/tests/components/light/test_device_condition.py
index 94e12ffbfa5..2a5c9f0bb18 100644
--- a/tests/components/light/test_device_condition.py
+++ b/tests/components/light/test_device_condition.py
@@ -14,7 +14,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import MockLight
 
diff --git a/tests/components/light/test_device_trigger.py b/tests/components/light/test_device_trigger.py
index 4e8414edabc..ae54bbd2512 100644
--- a/tests/components/light/test_device_trigger.py
+++ b/tests/components/light/test_device_trigger.py
@@ -13,7 +13,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/light/test_init.py b/tests/components/light/test_init.py
index 6d0337f37a5..29604ce7595 100644
--- a/tests/components/light/test_init.py
+++ b/tests/components/light/test_init.py
@@ -21,9 +21,8 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, Unauthorized
-from homeassistant.helpers import frame
 from homeassistant.setup import async_setup_component
-import homeassistant.util.color as color_util
+from homeassistant.util import color as color_util
 
 from .common import MockLight
 
@@ -2846,7 +2845,6 @@ def test_report_invalid_color_modes(
     ],
     ids=["with_kelvin", "with_mired_values", "with_mired_defaults"],
 )
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
 def test_missing_kelvin_property_warnings(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
diff --git a/tests/components/linear_garage_door/snapshots/test_cover.ambr b/tests/components/linear_garage_door/snapshots/test_cover.ambr
index 96745e1d92a..a09156c53e0 100644
--- a/tests/components/linear_garage_door/snapshots/test_cover.ambr
+++ b/tests/components/linear_garage_door/snapshots/test_cover.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -102,6 +104,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/linear_garage_door/snapshots/test_diagnostics.ambr b/tests/components/linear_garage_door/snapshots/test_diagnostics.ambr
index c689d04949a..db82f41eb73 100644
--- a/tests/components/linear_garage_door/snapshots/test_diagnostics.ambr
+++ b/tests/components/linear_garage_door/snapshots/test_diagnostics.ambr
@@ -73,6 +73,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'test-site-name',
       'unique_id': None,
       'version': 1,
diff --git a/tests/components/linear_garage_door/snapshots/test_light.ambr b/tests/components/linear_garage_door/snapshots/test_light.ambr
index ba64a2b0a04..9e27efc02ec 100644
--- a/tests/components/linear_garage_door/snapshots/test_light.ambr
+++ b/tests/components/linear_garage_door/snapshots/test_light.ambr
@@ -10,6 +10,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -66,6 +67,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -122,6 +124,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -178,6 +181,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/linear_garage_door/test_init.py b/tests/components/linear_garage_door/test_init.py
index 640264eb207..2693eda60bb 100644
--- a/tests/components/linear_garage_door/test_init.py
+++ b/tests/components/linear_garage_door/test_init.py
@@ -5,8 +5,15 @@ from unittest.mock import AsyncMock
 from linear_garage_door import InvalidLoginError
 import pytest
 
-from homeassistant.config_entries import ConfigEntryState
+from homeassistant.components.linear_garage_door.const import DOMAIN
+from homeassistant.config_entries import (
+    SOURCE_IGNORE,
+    ConfigEntryDisabler,
+    ConfigEntryState,
+)
+from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import issue_registry as ir
 
 from . import setup_integration
 
@@ -51,3 +58,78 @@ async def test_setup_failure(
 
     await setup_integration(hass, mock_config_entry, [])
     assert mock_config_entry.state == entry_state
+
+
+async def test_repair_issue(
+    hass: HomeAssistant,
+    mock_linear: AsyncMock,
+    issue_registry: ir.IssueRegistry,
+) -> None:
+    """Test the Linear Garage Door configuration entry loading/unloading handles the repair."""
+    config_entry_1 = MockConfigEntry(
+        domain=DOMAIN,
+        entry_id="acefdd4b3a4a0911067d1cf51414201e",
+        title="test-site-name",
+        data={
+            CONF_EMAIL: "test-email",
+            CONF_PASSWORD: "test-password",
+            "site_id": "test-site-id",
+            "device_id": "test-uuid",
+        },
+    )
+    await setup_integration(hass, config_entry_1, [])
+    assert config_entry_1.state is ConfigEntryState.LOADED
+
+    # Add a second one
+    config_entry_2 = MockConfigEntry(
+        domain=DOMAIN,
+        entry_id="acefdd4b3a4a0911067d1cf51414201f",
+        title="test-site-name",
+        data={
+            CONF_EMAIL: "test-email",
+            CONF_PASSWORD: "test-password",
+            "site_id": "test-site-id",
+            "device_id": "test-uuid",
+        },
+    )
+    await setup_integration(hass, config_entry_2, [])
+    assert config_entry_2.state is ConfigEntryState.LOADED
+    assert issue_registry.async_get_issue(DOMAIN, DOMAIN)
+
+    # Add an ignored entry
+    config_entry_3 = MockConfigEntry(
+        source=SOURCE_IGNORE,
+        domain=DOMAIN,
+    )
+    config_entry_3.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry_3.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry_3.state is ConfigEntryState.NOT_LOADED
+
+    # Add a disabled entry
+    config_entry_4 = MockConfigEntry(
+        disabled_by=ConfigEntryDisabler.USER,
+        domain=DOMAIN,
+    )
+    config_entry_4.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry_4.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry_4.state is ConfigEntryState.NOT_LOADED
+
+    # Remove the first one
+    await hass.config_entries.async_remove(config_entry_1.entry_id)
+    await hass.async_block_till_done()
+    assert config_entry_1.state is ConfigEntryState.NOT_LOADED
+    assert config_entry_2.state is ConfigEntryState.LOADED
+    assert issue_registry.async_get_issue(DOMAIN, DOMAIN)
+    # Remove the second one
+    await hass.config_entries.async_remove(config_entry_2.entry_id)
+    await hass.async_block_till_done()
+    assert config_entry_1.state is ConfigEntryState.NOT_LOADED
+    assert config_entry_2.state is ConfigEntryState.NOT_LOADED
+    assert issue_registry.async_get_issue(DOMAIN, DOMAIN) is None
+
+    # Check the ignored and disabled entries are removed
+    assert not hass.config_entries.async_entries(DOMAIN)
diff --git a/tests/components/litejet/conftest.py b/tests/components/litejet/conftest.py
index 41517acf1e9..975f943d2fa 100644
--- a/tests/components/litejet/conftest.py
+++ b/tests/components/litejet/conftest.py
@@ -5,7 +5,7 @@ from unittest.mock import AsyncMock, Mock, patch
 
 import pytest
 
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 
 @pytest.fixture
diff --git a/tests/components/litejet/test_trigger.py b/tests/components/litejet/test_trigger.py
index c13fda9068c..de99d701926 100644
--- a/tests/components/litejet/test_trigger.py
+++ b/tests/components/litejet/test_trigger.py
@@ -11,7 +11,7 @@ import pytest
 from homeassistant import setup
 from homeassistant.components import automation
 from homeassistant.core import HomeAssistant, ServiceCall
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import async_init_integration
 
diff --git a/tests/components/litterrobot/common.py b/tests/components/litterrobot/common.py
index b29fa753801..d96ce06ca59 100644
--- a/tests/components/litterrobot/common.py
+++ b/tests/components/litterrobot/common.py
@@ -150,5 +150,15 @@ FEEDER_ROBOT_DATA = {
         },
     ],
 }
+PET_DATA = {
+    "petId": "PET-123",
+    "userId": "1234567",
+    "createdAt": "2023-04-27T23:26:49.813Z",
+    "name": "Kitty",
+    "type": "CAT",
+    "gender": "FEMALE",
+    "lastWeightReading": 9.1,
+    "breeds": ["sphynx"],
+}
 
 VACUUM_ENTITY_ID = "vacuum.test_litter_box"
diff --git a/tests/components/litterrobot/conftest.py b/tests/components/litterrobot/conftest.py
index 5cd97e5937d..d22c4b2ec49 100644
--- a/tests/components/litterrobot/conftest.py
+++ b/tests/components/litterrobot/conftest.py
@@ -5,13 +5,20 @@ from __future__ import annotations
 from typing import Any
 from unittest.mock import AsyncMock, MagicMock, patch
 
-from pylitterbot import Account, FeederRobot, LitterRobot3, LitterRobot4, Robot
+from pylitterbot import Account, FeederRobot, LitterRobot3, LitterRobot4, Pet, Robot
 from pylitterbot.exceptions import InvalidCommandException
 import pytest
 
 from homeassistant.core import HomeAssistant
 
-from .common import CONFIG, DOMAIN, FEEDER_ROBOT_DATA, ROBOT_4_DATA, ROBOT_DATA
+from .common import (
+    CONFIG,
+    DOMAIN,
+    FEEDER_ROBOT_DATA,
+    PET_DATA,
+    ROBOT_4_DATA,
+    ROBOT_DATA,
+)
 
 from tests.common import MockConfigEntry
 
@@ -50,6 +57,7 @@ def create_mock_account(
     skip_robots: bool = False,
     v4: bool = False,
     feeder: bool = False,
+    pet: bool = False,
 ) -> MagicMock:
     """Create a mock Litter-Robot account."""
     account = MagicMock(spec=Account)
@@ -60,6 +68,7 @@ def create_mock_account(
         if skip_robots
         else [create_mock_robot(robot_data, account, v4, feeder, side_effect)]
     )
+    account.pets = [Pet(PET_DATA, account.session)] if pet else []
     return account
 
 
@@ -81,6 +90,12 @@ def mock_account_with_feederrobot() -> MagicMock:
     return create_mock_account(feeder=True)
 
 
+@pytest.fixture
+def mock_account_with_pet() -> MagicMock:
+    """Mock account with Feeder-Robot."""
+    return create_mock_account(pet=True)
+
+
 @pytest.fixture
 def mock_account_with_no_robots() -> MagicMock:
     """Mock a Litter-Robot account."""
@@ -123,15 +138,9 @@ async def setup_integration(
     )
     entry.add_to_hass(hass)
 
-    with (
-        patch(
-            "homeassistant.components.litterrobot.coordinator.Account",
-            return_value=mock_account,
-        ),
-        patch(
-            "homeassistant.components.litterrobot.PLATFORMS_BY_TYPE",
-            {Robot: (platform_domain,)} if platform_domain else {},
-        ),
+    with patch(
+        "homeassistant.components.litterrobot.coordinator.Account",
+        return_value=mock_account,
     ):
         await hass.config_entries.async_setup(entry.entry_id)
         await hass.async_block_till_done()
diff --git a/tests/components/litterrobot/test_config_flow.py b/tests/components/litterrobot/test_config_flow.py
index 2eadafb0d0c..caaf832b780 100644
--- a/tests/components/litterrobot/test_config_flow.py
+++ b/tests/components/litterrobot/test_config_flow.py
@@ -4,6 +4,7 @@ from unittest.mock import patch
 
 from pylitterbot import Account
 from pylitterbot.exceptions import LitterRobotException, LitterRobotLoginException
+import pytest
 
 from homeassistant import config_entries
 from homeassistant.const import CONF_PASSWORD
@@ -15,9 +16,8 @@ from .common import CONF_USERNAME, CONFIG, DOMAIN
 from tests.common import MockConfigEntry
 
 
-async def test_form(hass: HomeAssistant, mock_account) -> None:
-    """Test we get the form."""
-
+async def test_full_flow(hass: HomeAssistant, mock_account) -> None:
+    """Test full flow."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
@@ -34,19 +34,18 @@ async def test_form(hass: HomeAssistant, mock_account) -> None:
             return_value=True,
         ) as mock_setup_entry,
     ):
-        result2 = await hass.config_entries.flow.async_configure(
+        result = await hass.config_entries.flow.async_configure(
             result["flow_id"], CONFIG[DOMAIN]
         )
-        await hass.async_block_till_done()
 
-    assert result2["type"] is FlowResultType.CREATE_ENTRY
-    assert result2["title"] == CONFIG[DOMAIN][CONF_USERNAME]
-    assert result2["data"] == CONFIG[DOMAIN]
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == CONFIG[DOMAIN][CONF_USERNAME]
+    assert result["data"] == CONFIG[DOMAIN]
     assert len(mock_setup_entry.mock_calls) == 1
 
 
 async def test_already_configured(hass: HomeAssistant) -> None:
-    """Test we handle already configured."""
+    """Test already configured case."""
     MockConfigEntry(
         domain=DOMAIN,
         data=CONFIG[DOMAIN],
@@ -62,71 +61,32 @@ async def test_already_configured(hass: HomeAssistant) -> None:
     assert result["reason"] == "already_configured"
 
 
-async def test_form_invalid_auth(hass: HomeAssistant) -> None:
-    """Test we handle invalid auth."""
+@pytest.mark.parametrize(
+    ("side_effect", "connect_errors"),
+    [
+        (Exception, {"base": "unknown"}),
+        (LitterRobotLoginException, {"base": "invalid_auth"}),
+        (LitterRobotException, {"base": "cannot_connect"}),
+    ],
+)
+async def test_create_entry(
+    hass: HomeAssistant, mock_account, side_effect, connect_errors
+) -> None:
+    """Test creating an entry."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
 
     with patch(
         "homeassistant.components.litterrobot.config_flow.Account.connect",
-        side_effect=LitterRobotLoginException,
+        side_effect=side_effect,
     ):
-        result2 = await hass.config_entries.flow.async_configure(
+        result = await hass.config_entries.flow.async_configure(
             result["flow_id"], CONFIG[DOMAIN]
         )
 
-    assert result2["type"] is FlowResultType.FORM
-    assert result2["errors"] == {"base": "invalid_auth"}
-
-
-async def test_form_cannot_connect(hass: HomeAssistant) -> None:
-    """Test we handle cannot connect error."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-
-    with patch(
-        "homeassistant.components.litterrobot.config_flow.Account.connect",
-        side_effect=LitterRobotException,
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"], CONFIG[DOMAIN]
-        )
-
-    assert result2["type"] is FlowResultType.FORM
-    assert result2["errors"] == {"base": "cannot_connect"}
-
-
-async def test_form_unknown_error(hass: HomeAssistant) -> None:
-    """Test we handle unknown error."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    with patch(
-        "homeassistant.components.litterrobot.config_flow.Account.connect",
-        side_effect=Exception,
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"], CONFIG[DOMAIN]
-        )
-
-    assert result2["type"] is FlowResultType.FORM
-    assert result2["errors"] == {"base": "unknown"}
-
-
-async def test_step_reauth(hass: HomeAssistant, mock_account: Account) -> None:
-    """Test the reauth flow."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data=CONFIG[DOMAIN],
-    )
-    entry.add_to_hass(hass)
-
-    result = await entry.start_reauth_flow(hass)
-
     assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "reauth_confirm"
+    assert result["errors"] == connect_errors
 
     with (
         patch(
@@ -136,19 +96,19 @@ async def test_step_reauth(hass: HomeAssistant, mock_account: Account) -> None:
         patch(
             "homeassistant.components.litterrobot.async_setup_entry",
             return_value=True,
-        ) as mock_setup_entry,
+        ),
     ):
         result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input={CONF_PASSWORD: CONFIG[DOMAIN][CONF_PASSWORD]},
+            result["flow_id"], CONFIG[DOMAIN]
         )
-        assert result["type"] is FlowResultType.ABORT
-        assert result["reason"] == "reauth_successful"
-        assert len(mock_setup_entry.mock_calls) == 1
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == CONFIG[DOMAIN][CONF_USERNAME]
+    assert result["data"] == CONFIG[DOMAIN]
 
 
-async def test_step_reauth_failed(hass: HomeAssistant, mock_account: Account) -> None:
-    """Test the reauth flow fails and recovers."""
+async def test_reauth(hass: HomeAssistant, mock_account: Account) -> None:
+    """Test reauth flow (with fail and recover)."""
     entry = MockConfigEntry(
         domain=DOMAIN,
         data=CONFIG[DOMAIN],
diff --git a/tests/components/litterrobot/test_sensor.py b/tests/components/litterrobot/test_sensor.py
index 360d13096a7..e290d96fcf4 100644
--- a/tests/components/litterrobot/test_sensor.py
+++ b/tests/components/litterrobot/test_sensor.py
@@ -104,3 +104,13 @@ async def test_feeder_robot_sensor(
     sensor = hass.states.get("sensor.test_food_level")
     assert sensor.state == "10"
     assert sensor.attributes["unit_of_measurement"] == PERCENTAGE
+
+
+async def test_pet_weight_sensor(
+    hass: HomeAssistant, mock_account_with_pet: MagicMock
+) -> None:
+    """Tests pet weight sensors."""
+    await setup_integration(hass, mock_account_with_pet, PLATFORM_DOMAIN)
+    sensor = hass.states.get("sensor.kitty_weight")
+    assert sensor.state == "9.1"
+    assert sensor.attributes["unit_of_measurement"] == UnitOfMass.POUNDS
diff --git a/tests/components/litterrobot/test_vacuum.py b/tests/components/litterrobot/test_vacuum.py
index 0255e0e6a8a..911dfb3b880 100644
--- a/tests/components/litterrobot/test_vacuum.py
+++ b/tests/components/litterrobot/test_vacuum.py
@@ -33,7 +33,6 @@ async def test_vacuum(
     hass: HomeAssistant, entity_registry: er.EntityRegistry, mock_account: MagicMock
 ) -> None:
     """Tests the vacuum entity was set up."""
-
     entity_registry.async_get_or_create(
         VACUUM_DOMAIN,
         DOMAIN,
@@ -44,7 +43,6 @@ async def test_vacuum(
     assert ent_reg_entry.unique_id == VACUUM_UNIQUE_ID
 
     await setup_integration(hass, mock_account, VACUUM_DOMAIN)
-    assert len(entity_registry.entities) == 1
     assert hass.services.has_service(DOMAIN, SERVICE_SET_SLEEP_MODE)
 
     vacuum = hass.states.get(VACUUM_ENTITY_ID)
@@ -63,8 +61,6 @@ async def test_no_robots(
     """Tests the vacuum entity was set up."""
     entry = await setup_integration(hass, mock_account_with_no_robots, VACUUM_DOMAIN)
 
-    assert not hass.services.has_service(DOMAIN, SERVICE_SET_SLEEP_MODE)
-
     assert len(entity_registry.entities) == 0
 
     assert await hass.config_entries.async_unload(entry.entry_id)
diff --git a/tests/components/local_calendar/test_calendar.py b/tests/components/local_calendar/test_calendar.py
index 61908faeca6..0720e6d7ded 100644
--- a/tests/components/local_calendar/test_calendar.py
+++ b/tests/components/local_calendar/test_calendar.py
@@ -8,7 +8,7 @@ import pytest
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.template import DATE_STR_FORMAT
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import (
     FRIENDLY_NAME,
diff --git a/tests/components/lock/conftest.py b/tests/components/lock/conftest.py
index fd569b162bc..254a59cae0d 100644
--- a/tests/components/lock/conftest.py
+++ b/tests/components/lock/conftest.py
@@ -14,7 +14,7 @@ from homeassistant.components.lock import (
 from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from tests.common import (
     MockConfigEntry,
@@ -120,7 +120,7 @@ async def setup_lock_platform_test_entity(
     async def async_setup_entry_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test lock platform via config entry."""
         async_add_entities([entity])
diff --git a/tests/components/lock/test_device_trigger.py b/tests/components/lock/test_device_trigger.py
index 3ecdf2a9bca..7d1c39d10f0 100644
--- a/tests/components/lock/test_device_trigger.py
+++ b/tests/components/lock/test_device_trigger.py
@@ -13,7 +13,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/lock/test_init.py b/tests/components/lock/test_init.py
index 68af8c7d482..510034a2172 100644
--- a/tests/components/lock/test_init.py
+++ b/tests/components/lock/test_init.py
@@ -21,7 +21,7 @@ from homeassistant.components.lock import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.typing import UNDEFINED, UndefinedType
 
 from .conftest import MockLock
diff --git a/tests/components/logbook/common.py b/tests/components/logbook/common.py
index abb118467f4..b303a34e151 100644
--- a/tests/components/logbook/common.py
+++ b/tests/components/logbook/common.py
@@ -16,7 +16,7 @@ from homeassistant.components.recorder.models import (
 from homeassistant.core import Context
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.json import JSONEncoder
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 IDX_TO_NAME = dict(enumerate(EventAsRow._fields))
 
diff --git a/tests/components/logbook/test_init.py b/tests/components/logbook/test_init.py
index 841c8ed1247..c62bdcaa824 100644
--- a/tests/components/logbook/test_init.py
+++ b/tests/components/logbook/test_init.py
@@ -10,6 +10,7 @@ from freezegun import freeze_time
 import pytest
 import voluptuous as vol
 
+from homeassistant import core as ha
 from homeassistant.components import logbook, recorder
 
 # pylint: disable-next=hass-component-root-import
@@ -40,12 +41,11 @@ from homeassistant.const import (
     STATE_OFF,
     STATE_ON,
 )
-import homeassistant.core as ha
 from homeassistant.core import Event, HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entityfilter import CONF_ENTITY_GLOBS
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import MockRow, mock_humanify
 
diff --git a/tests/components/logbook/test_websocket_api.py b/tests/components/logbook/test_websocket_api.py
index 50139d0f4f7..7b2550ccc82 100644
--- a/tests/components/logbook/test_websocket_api.py
+++ b/tests/components/logbook/test_websocket_api.py
@@ -37,7 +37,7 @@ from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entityfilter import CONF_ENTITY_GLOBS
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 from tests.components.recorder.common import (
diff --git a/tests/components/lovelace/test_init.py b/tests/components/lovelace/test_init.py
index f56ff4371e6..f35f7369f93 100644
--- a/tests/components/lovelace/test_init.py
+++ b/tests/components/lovelace/test_init.py
@@ -7,6 +7,7 @@ from unittest.mock import MagicMock, patch
 import pytest
 
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import frame
 from homeassistant.setup import async_setup_component
 
 from tests.typing import WebSocketGenerator
@@ -38,3 +39,38 @@ async def test_create_dashboards_when_onboarded(
     response = await client.receive_json()
     assert response["success"]
     assert response["result"] == []
+
+
+@pytest.mark.parametrize("integration_frame_path", ["custom_components/my_integration"])
+@pytest.mark.usefixtures("mock_integration_frame")
+async def test_hass_data_compatibility(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test compatibility for external access.
+
+    See:
+    https://github.com/hacs/integration/blob/4a820e8b1b066bc54a1c9c61102038af6c030603
+    /custom_components/hacs/repositories/plugin.py#L173
+    """
+    expected_prefix = (
+        "Detected that custom integration 'my_integration' accessed lovelace_data"
+    )
+
+    assert await async_setup_component(hass, "lovelace", {})
+
+    assert (lovelace_data := hass.data.get("lovelace")) is not None
+
+    # Direct access to resources is fine
+    assert lovelace_data.resources is not None
+    assert expected_prefix not in caplog.text
+
+    # Dict compatibility logs warning
+    with patch.object(frame, "_REPORTED_INTEGRATIONS", set()):
+        assert lovelace_data["resources"] is not None
+    assert f"{expected_prefix}['resources']" in caplog.text
+
+    # Dict get compatibility logs warning
+    with patch.object(frame, "_REPORTED_INTEGRATIONS", set()):
+        assert lovelace_data.get("resources") is not None
+    assert f"{expected_prefix}.get('resources')" in caplog.text
diff --git a/tests/components/lutron/test_config_flow.py b/tests/components/lutron/test_config_flow.py
index 47b2a4891cf..df861fafffe 100644
--- a/tests/components/lutron/test_config_flow.py
+++ b/tests/components/lutron/test_config_flow.py
@@ -6,11 +6,11 @@ from urllib.error import HTTPError
 
 import pytest
 
-from homeassistant.components.lutron.const import DOMAIN
+from homeassistant.components.lutron.const import CONF_DEFAULT_DIMMER_LEVEL, DOMAIN
 from homeassistant.config_entries import SOURCE_USER
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.data_entry_flow import FlowResultType, InvalidData
 
 from tests.common import MockConfigEntry
 
@@ -146,3 +146,41 @@ MOCK_DATA_IMPORT = {
     CONF_USERNAME: "lutron",
     CONF_PASSWORD: "integration",
 }
+
+
+async def test_options_flow(hass: HomeAssistant) -> None:
+    """Test options flow."""
+
+    config_entry = MockConfigEntry(
+        domain=DOMAIN,
+        data=MOCK_DATA_STEP,
+        unique_id="12345678901",
+    )
+    config_entry.add_to_hass(hass)
+
+    result = await hass.config_entries.options.async_init(config_entry.entry_id)
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "init"
+
+    # Try to set an out of range dimmer level (260)
+    out_of_range_level = 260
+
+    # The voluptuous validation will raise an exception before the handler processes it
+    with pytest.raises(InvalidData):
+        await hass.config_entries.options.async_configure(
+            result["flow_id"],
+            user_input={CONF_DEFAULT_DIMMER_LEVEL: out_of_range_level},
+        )
+
+    # Now try with a valid value
+    valid_level = 100
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={CONF_DEFAULT_DIMMER_LEVEL: valid_level},
+    )
+
+    # Verify that the flow finishes successfully with the valid value
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["data"] == {CONF_DEFAULT_DIMMER_LEVEL: valid_level}
diff --git a/tests/components/lutron_caseta/__init__.py b/tests/components/lutron_caseta/__init__.py
index b27d30ac31f..5f146cd988a 100644
--- a/tests/components/lutron_caseta/__init__.py
+++ b/tests/components/lutron_caseta/__init__.py
@@ -1,5 +1,8 @@
 """Tests for the Lutron Caseta integration."""
 
+import asyncio
+from collections.abc import Callable
+from typing import Any
 from unittest.mock import patch
 
 from homeassistant.components.lutron_caseta import DOMAIN
@@ -84,25 +87,12 @@ _LEAP_DEVICE_TYPES = {
 }
 
 
-async def async_setup_integration(hass: HomeAssistant, mock_bridge) -> MockConfigEntry:
-    """Set up a mock bridge."""
-    mock_entry = MockConfigEntry(domain=DOMAIN, data=ENTRY_MOCK_DATA)
-    mock_entry.add_to_hass(hass)
-
-    with patch(
-        "homeassistant.components.lutron_caseta.Smartbridge.create_tls"
-    ) as create_tls:
-        create_tls.return_value = mock_bridge(can_connect=True)
-        await hass.config_entries.async_setup(mock_entry.entry_id)
-        await hass.async_block_till_done()
-    return mock_entry
-
-
 class MockBridge:
     """Mock Lutron bridge that emulates configured connected status."""
 
-    def __init__(self, can_connect=True) -> None:
+    def __init__(self, can_connect=True, timeout_on_connect=False) -> None:
         """Initialize MockBridge instance with configured mock connectivity."""
+        self.timeout_on_connect = timeout_on_connect
         self.can_connect = can_connect
         self.is_currently_connected = False
         self.areas = self.load_areas()
@@ -113,6 +103,8 @@ class MockBridge:
 
     async def connect(self):
         """Connect the mock bridge."""
+        if self.timeout_on_connect:
+            await asyncio.Event().wait()  # wait forever
         if self.can_connect:
             self.is_currently_connected = True
 
@@ -320,3 +312,43 @@ class MockBridge:
     async def close(self):
         """Close the mock bridge connection."""
         self.is_currently_connected = False
+
+
+def make_mock_entry() -> MockConfigEntry:
+    """Create a mock config entry."""
+    return MockConfigEntry(domain=DOMAIN, data=ENTRY_MOCK_DATA)
+
+
+async def async_setup_integration(
+    hass: HomeAssistant,
+    mock_bridge: MockBridge,
+    config_entry_id: str | None = None,
+    can_connect: bool = True,
+    timeout_during_connect: bool = False,
+    timeout_during_configure: bool = False,
+) -> MockConfigEntry:
+    """Set up a mock bridge."""
+    if config_entry_id is None:
+        mock_entry = make_mock_entry()
+        mock_entry.add_to_hass(hass)
+        config_entry_id = mock_entry.entry_id
+    else:
+        mock_entry = hass.config_entries.async_get_entry(config_entry_id)
+
+    def create_tls_factory(
+        *args: Any, on_connect_callback: Callable[[], None], **kwargs: Any
+    ) -> None:
+        """Return a mock bridge."""
+        if not timeout_during_connect:
+            on_connect_callback()
+        return mock_bridge(
+            can_connect=can_connect, timeout_on_connect=timeout_during_configure
+        )
+
+    with patch(
+        "homeassistant.components.lutron_caseta.Smartbridge.create_tls",
+        create_tls_factory,
+    ):
+        await hass.config_entries.async_setup(config_entry_id)
+        await hass.async_block_till_done()
+    return mock_entry
diff --git a/tests/components/lutron_caseta/test_config_flow.py b/tests/components/lutron_caseta/test_config_flow.py
index cc80bc08817..bdbe6501470 100644
--- a/tests/components/lutron_caseta/test_config_flow.py
+++ b/tests/components/lutron_caseta/test_config_flow.py
@@ -10,8 +10,10 @@ from pylutron_caseta.smartbridge import Smartbridge
 import pytest
 
 from homeassistant import config_entries
-from homeassistant.components.lutron_caseta import DOMAIN
-import homeassistant.components.lutron_caseta.config_flow as CasetaConfigFlow
+from homeassistant.components.lutron_caseta import (
+    DOMAIN,
+    config_flow as CasetaConfigFlow,
+)
 from homeassistant.components.lutron_caseta.const import (
     CONF_CA_CERTS,
     CONF_CERTFILE,
diff --git a/tests/components/lutron_caseta/test_device_trigger.py b/tests/components/lutron_caseta/test_device_trigger.py
index 1ab45bf7582..001bf86ad54 100644
--- a/tests/components/lutron_caseta/test_device_trigger.py
+++ b/tests/components/lutron_caseta/test_device_trigger.py
@@ -1,7 +1,5 @@
 """The tests for Lutron Caséta device triggers."""
 
-from unittest.mock import patch
-
 import pytest
 from pytest_unordered import unordered
 
@@ -37,7 +35,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr
 from homeassistant.setup import async_setup_component
 
-from . import MockBridge
+from . import MockBridge, async_setup_integration
 
 from tests.common import MockConfigEntry, async_get_device_automations
 
@@ -112,12 +110,7 @@ async def _async_setup_lutron_with_picos(hass: HomeAssistant) -> str:
     )
     config_entry.add_to_hass(hass)
 
-    with patch(
-        "homeassistant.components.lutron_caseta.Smartbridge.create_tls",
-        return_value=MockBridge(can_connect=True),
-    ):
-        await hass.config_entries.async_setup(config_entry.entry_id)
-        await hass.async_block_till_done()
+    await async_setup_integration(hass, MockBridge, config_entry.entry_id)
 
     return config_entry.entry_id
 
@@ -487,9 +480,7 @@ async def test_if_fires_on_button_event_late_setup(
         },
     )
 
-    with patch("homeassistant.components.lutron_caseta.Smartbridge.create_tls"):
-        await hass.config_entries.async_setup(config_entry_id)
-        await hass.async_block_till_done()
+    await async_setup_integration(hass, MockBridge, config_entry_id)
 
     message = {
         ATTR_SERIAL: device.get("serial"),
diff --git a/tests/components/lutron_caseta/test_diagnostics.py b/tests/components/lutron_caseta/test_diagnostics.py
index 5c7d20da208..45229918578 100644
--- a/tests/components/lutron_caseta/test_diagnostics.py
+++ b/tests/components/lutron_caseta/test_diagnostics.py
@@ -1,6 +1,6 @@
 """Test the Lutron Caseta diagnostics."""
 
-from unittest.mock import ANY, patch
+from unittest.mock import ANY
 
 from homeassistant.components.lutron_caseta import DOMAIN
 from homeassistant.components.lutron_caseta.const import (
@@ -11,7 +11,7 @@ from homeassistant.components.lutron_caseta.const import (
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
 
-from . import MockBridge
+from . import MockBridge, async_setup_integration
 
 from tests.common import MockConfigEntry
 from tests.components.diagnostics import get_diagnostics_for_config_entry
@@ -34,12 +34,7 @@ async def test_diagnostics(
     )
     config_entry.add_to_hass(hass)
 
-    with patch(
-        "homeassistant.components.lutron_caseta.Smartbridge.create_tls",
-        return_value=MockBridge(can_connect=True),
-    ):
-        await hass.config_entries.async_setup(config_entry.entry_id)
-        await hass.async_block_till_done()
+    await async_setup_integration(hass, MockBridge, config_entry.entry_id)
 
     diag = await get_diagnostics_for_config_entry(hass, hass_client, config_entry)
     assert diag == {
diff --git a/tests/components/lutron_caseta/test_init.py b/tests/components/lutron_caseta/test_init.py
new file mode 100644
index 00000000000..7e509acbf62
--- /dev/null
+++ b/tests/components/lutron_caseta/test_init.py
@@ -0,0 +1,54 @@
+"""Tests for the Lutron Caseta integration."""
+
+from unittest.mock import patch
+
+import pytest
+
+from homeassistant.components import lutron_caseta
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+
+from . import MockBridge, async_setup_integration, make_mock_entry
+
+
+@pytest.mark.parametrize(
+    ("constant", "message", "timeout_during_connect", "timeout_during_configure"),
+    [
+        ("CONNECT_TIMEOUT", "Timed out on connect", True, False),
+        ("CONFIGURE_TIMEOUT", "Timed out on configure", False, True),
+    ],
+)
+async def test_timeout_during_setup(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    constant: str,
+    message: str,
+    timeout_during_connect: bool,
+    timeout_during_configure: bool,
+) -> None:
+    """Test a timeout during setup."""
+    mock_entry = make_mock_entry()
+    mock_entry.add_to_hass(hass)
+    with patch.object(lutron_caseta, constant, 0.001):
+        await async_setup_integration(
+            hass,
+            MockBridge,
+            config_entry_id=mock_entry.entry_id,
+            timeout_during_connect=timeout_during_connect,
+            timeout_during_configure=timeout_during_configure,
+        )
+    assert mock_entry.state is ConfigEntryState.SETUP_RETRY
+    assert f"{message} for 1.1.1.1" in caplog.text
+
+
+async def test_cannot_connect(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test failing to connect."""
+    mock_entry = make_mock_entry()
+    mock_entry.add_to_hass(hass)
+    await async_setup_integration(
+        hass, MockBridge, config_entry_id=mock_entry.entry_id, can_connect=False
+    )
+    assert mock_entry.state is ConfigEntryState.SETUP_RETRY
+    assert "Connection failed to 1.1.1.1" in caplog.text
diff --git a/tests/components/lutron_caseta/test_logbook.py b/tests/components/lutron_caseta/test_logbook.py
index 9a58838d65c..8b4a3e00fa9 100644
--- a/tests/components/lutron_caseta/test_logbook.py
+++ b/tests/components/lutron_caseta/test_logbook.py
@@ -1,7 +1,5 @@
 """The tests for lutron caseta logbook."""
 
-from unittest.mock import patch
-
 from homeassistant.components.lutron_caseta.const import (
     ATTR_ACTION,
     ATTR_AREA_NAME,
@@ -43,13 +41,7 @@ async def test_humanify_lutron_caseta_button_event(hass: HomeAssistant) -> None:
         unique_id="abc",
     )
     config_entry.add_to_hass(hass)
-
-    with patch(
-        "homeassistant.components.lutron_caseta.Smartbridge.create_tls",
-        return_value=MockBridge(can_connect=True),
-    ):
-        await hass.config_entries.async_setup(config_entry.entry_id)
-        await hass.async_block_till_done()
+    await async_setup_integration(hass, MockBridge, config_entry.entry_id)
 
     await hass.async_block_till_done()
 
@@ -104,15 +96,10 @@ async def test_humanify_lutron_caseta_button_event_integration_not_loaded(
     )
     config_entry.add_to_hass(hass)
 
-    with patch(
-        "homeassistant.components.lutron_caseta.Smartbridge.create_tls",
-        return_value=MockBridge(can_connect=True),
-    ):
-        await hass.config_entries.async_setup(config_entry.entry_id)
-        await hass.async_block_till_done()
+    await async_setup_integration(hass, MockBridge, config_entry.entry_id)
 
-        await hass.config_entries.async_unload(config_entry.entry_id)
-        await hass.async_block_till_done()
+    await hass.config_entries.async_unload(config_entry.entry_id)
+    await hass.async_block_till_done()
 
     for device in device_registry.devices.values():
         if device.config_entries == {config_entry.entry_id}:
diff --git a/tests/components/madvr/snapshots/test_binary_sensor.ambr b/tests/components/madvr/snapshots/test_binary_sensor.ambr
index 7fd54a7c240..7d665210a6f 100644
--- a/tests/components/madvr/snapshots/test_binary_sensor.ambr
+++ b/tests/components/madvr/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/madvr/snapshots/test_diagnostics.ambr b/tests/components/madvr/snapshots/test_diagnostics.ambr
index 3a281391860..92d0578dba8 100644
--- a/tests/components/madvr/snapshots/test_diagnostics.ambr
+++ b/tests/components/madvr/snapshots/test_diagnostics.ambr
@@ -17,6 +17,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'envy',
       'unique_id': '00:11:22:33:44:55',
       'version': 1,
diff --git a/tests/components/madvr/snapshots/test_remote.ambr b/tests/components/madvr/snapshots/test_remote.ambr
index 1157496a93e..c90270674c8 100644
--- a/tests/components/madvr/snapshots/test_remote.ambr
+++ b/tests/components/madvr/snapshots/test_remote.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/madvr/snapshots/test_sensor.ambr b/tests/components/madvr/snapshots/test_sensor.ambr
index 7b0dd254f77..115f6a3f5d7 100644
--- a/tests/components/madvr/snapshots/test_sensor.ambr
+++ b/tests/components/madvr/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -192,6 +196,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -243,6 +248,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -294,6 +300,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -348,6 +355,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -405,6 +413,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -462,6 +471,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -520,6 +530,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -583,6 +594,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -639,6 +651,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -685,6 +698,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -736,6 +750,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -789,6 +804,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -838,6 +854,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -884,6 +901,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -930,6 +948,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -982,6 +1001,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1039,6 +1059,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1097,6 +1118,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1160,6 +1182,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1216,6 +1239,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1262,6 +1286,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1313,6 +1338,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/madvr/test_binary_sensor.py b/tests/components/madvr/test_binary_sensor.py
index 469a3225ca0..9ddbc7b3afe 100644
--- a/tests/components/madvr/test_binary_sensor.py
+++ b/tests/components/madvr/test_binary_sensor.py
@@ -9,7 +9,7 @@ from syrupy import SnapshotAssertion
 
 from homeassistant.const import STATE_OFF, STATE_ON, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from . import setup_integration
 from .conftest import get_update_callback
diff --git a/tests/components/madvr/test_remote.py b/tests/components/madvr/test_remote.py
index 6fc507534d6..1ddbacdb6e9 100644
--- a/tests/components/madvr/test_remote.py
+++ b/tests/components/madvr/test_remote.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from . import setup_integration
 from .const import (
diff --git a/tests/components/madvr/test_sensor.py b/tests/components/madvr/test_sensor.py
index ddc01fc737a..dd1722913f2 100644
--- a/tests/components/madvr/test_sensor.py
+++ b/tests/components/madvr/test_sensor.py
@@ -10,7 +10,7 @@ from syrupy import SnapshotAssertion
 from homeassistant.components.madvr.sensor import get_temperature
 from homeassistant.const import STATE_UNKNOWN, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from . import setup_integration
 from .conftest import get_update_callback
diff --git a/tests/components/manual/test_alarm_control_panel.py b/tests/components/manual/test_alarm_control_panel.py
index 9fc92cd5458..941d7523220 100644
--- a/tests/components/manual/test_alarm_control_panel.py
+++ b/tests/components/manual/test_alarm_control_panel.py
@@ -28,7 +28,7 @@ from homeassistant.const import (
 from homeassistant.core import CoreState, HomeAssistant, State
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed, mock_component, mock_restore_cache
 from tests.components.alarm_control_panel import common
diff --git a/tests/components/manual_mqtt/test_alarm_control_panel.py b/tests/components/manual_mqtt/test_alarm_control_panel.py
index 2b401cb10a0..9bb506b935a 100644
--- a/tests/components/manual_mqtt/test_alarm_control_panel.py
+++ b/tests/components/manual_mqtt/test_alarm_control_panel.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     assert_setup_component,
diff --git a/tests/components/marytts/test_tts.py b/tests/components/marytts/test_tts.py
index 0ad27cde29b..25231c15a32 100644
--- a/tests/components/marytts/test_tts.py
+++ b/tests/components/marytts/test_tts.py
@@ -155,7 +155,7 @@ async def test_service_say_http_error(
             await retrieve_media(
                 hass, hass_client, calls[0].data[ATTR_MEDIA_CONTENT_ID]
             )
-            == HTTPStatus.NOT_FOUND
+            == HTTPStatus.INTERNAL_SERVER_ERROR
         )
 
     mock_speak.assert_called_once()
diff --git a/tests/components/mastodon/conftest.py b/tests/components/mastodon/conftest.py
index ac23141be55..d8979083de9 100644
--- a/tests/components/mastodon/conftest.py
+++ b/tests/components/mastodon/conftest.py
@@ -3,12 +3,13 @@
 from collections.abc import Generator
 from unittest.mock import AsyncMock, patch
 
+from mastodon.Mastodon import Account, InstanceV2
 import pytest
 
 from homeassistant.components.mastodon.const import CONF_BASE_URL, DOMAIN
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_CLIENT_ID, CONF_CLIENT_SECRET
 
-from tests.common import MockConfigEntry, load_json_object_fixture
+from tests.common import MockConfigEntry, load_fixture
 
 
 @pytest.fixture
@@ -31,9 +32,11 @@ def mock_mastodon_client() -> Generator[AsyncMock]:
         ) as mock_client,
     ):
         client = mock_client.return_value
-        client.instance.return_value = load_json_object_fixture("instance.json", DOMAIN)
-        client.account_verify_credentials.return_value = load_json_object_fixture(
-            "account_verify_credentials.json", DOMAIN
+        client.instance.return_value = InstanceV2.from_json(
+            load_fixture("instance.json", DOMAIN)
+        )
+        client.account_verify_credentials.return_value = Account.from_json(
+            load_fixture("account_verify_credentials.json", DOMAIN)
         )
         client.status_post.return_value = None
         yield client
diff --git a/tests/components/mastodon/fixtures/account_verify_credentials.json b/tests/components/mastodon/fixtures/account_verify_credentials.json
index 401caa121ae..7806d280ab9 100644
--- a/tests/components/mastodon/fixtures/account_verify_credentials.json
+++ b/tests/components/mastodon/fixtures/account_verify_credentials.json
@@ -1,78 +1,60 @@
 {
-  "id": "14715",
-  "username": "trwnh",
-  "acct": "trwnh",
-  "display_name": "infinite love ⴳ",
-  "locked": false,
-  "bot": false,
-  "created_at": "2016-11-24T10:02:12.085Z",
-  "note": "<p>i have approximate knowledge of many things. perpetual student. (nb/ace/they)</p><p>xmpp/email: a@trwnh.com<br /><a href=\"https://trwnh.com\" rel=\"nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">trwnh.com</span><span class=\"invisible\"></span></a><br />help me live: <a href=\"https://liberapay.com/at\" rel=\"nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">liberapay.com/at</span><span class=\"invisible\"></span></a> or <a href=\"https://paypal.me/trwnh\" rel=\"nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">paypal.me/trwnh</span><span class=\"invisible\"></span></a></p><p>- my triggers are moths and glitter<br />- i have all notifs except mentions turned off, so please interact if you wanna be friends! i literally will not notice otherwise<br />- dm me if i did something wrong, so i can improve<br />- purest person on fedi, do not lewd in my presence<br />- #1 ami cole fan account</p><p>:fatyoshi:</p>",
-  "url": "https://mastodon.social/@trwnh",
-  "avatar": "https://files.mastodon.social/accounts/avatars/000/014/715/original/34aa222f4ae2e0a9.png",
-  "avatar_static": "https://files.mastodon.social/accounts/avatars/000/014/715/original/34aa222f4ae2e0a9.png",
-  "header": "https://files.mastodon.social/accounts/headers/000/014/715/original/5c6fc24edb3bb873.jpg",
-  "header_static": "https://files.mastodon.social/accounts/headers/000/014/715/original/5c6fc24edb3bb873.jpg",
-  "followers_count": 821,
-  "following_count": 178,
-  "statuses_count": 33120,
-  "last_status_at": "2019-11-24T15:49:42.251Z",
-  "source": {
-    "privacy": "public",
-    "sensitive": false,
-    "language": "",
-    "note": "i have approximate knowledge of many things. perpetual student. (nb/ace/they)\r\n\r\nxmpp/email: a@trwnh.com\r\nhttps://trwnh.com\r\nhelp me live: https://liberapay.com/at or https://paypal.me/trwnh\r\n\r\n- my triggers are moths and glitter\r\n- i have all notifs except mentions turned off, so please interact if you wanna be friends! i literally will not notice otherwise\r\n- dm me if i did something wrong, so i can improve\r\n- purest person on fedi, do not lewd in my presence\r\n- #1 ami cole fan account\r\n\r\n:fatyoshi:",
+  "_mastopy_version": "2.0.0",
+  "_mastopy_type": "Account",
+  "_mastopy_data": {
+    "id": "14715",
+    "username": "trwnh",
+    "acct": "trwnh",
+    "display_name": "infinite love \u2d33",
+    "discoverable": true,
+    "group": false,
+    "locked": false,
+    "created_at": "2016-11-24T00:00:00+00:00",
+    "following_count": 328,
+    "followers_count": 3169,
+    "statuses_count": 69523,
+    "note": "<p>i have approximate knowledge of many things. perpetual student. (nb/ace/they)</p><p>xmpp/email: a@trwnh.com<br /><a href=\"https://trwnh.com\" target=\"_blank\" rel=\"nofollow noopener\" translate=\"no\"><span class=\"invisible\">https://</span><span class=\"\">trwnh.com</span><span class=\"invisible\"></span></a><br />help me live:<br />- <a href=\"https://donate.stripe.com/4gwcPCaMpcQ19RC4gg\" target=\"_blank\" rel=\"nofollow noopener\" translate=\"no\"><span class=\"invisible\">https://</span><span class=\"ellipsis\">donate.stripe.com/4gwcPCaMpcQ1</span><span class=\"invisible\">9RC4gg</span></a><br />- <a href=\"https://liberapay.com/trwnh\" target=\"_blank\" rel=\"nofollow noopener\" translate=\"no\"><span class=\"invisible\">https://</span><span class=\"\">liberapay.com/trwnh</span><span class=\"invisible\"></span></a></p><p>notes:<br />- my triggers are moths and glitter<br />- i have all notifs except mentions turned off, so please interact if you wanna be friends! i literally will not notice otherwise<br />- dm me if i did something wrong, so i can improve<br />- purest person on fedi, do not lewd in my presence</p>",
+    "url": "https://mastodon.social/@trwnh",
+    "uri": "https://mastodon.social/users/trwnh",
+    "avatar": "https://files.mastodon.social/accounts/avatars/000/014/715/original/051c958388818705.png",
+    "header": "https://files.mastodon.social/accounts/headers/000/014/715/original/5c6fc24edb3bb873.jpg",
+    "avatar_static": "https://files.mastodon.social/accounts/avatars/000/014/715/original/051c958388818705.png",
+    "header_static": "https://files.mastodon.social/accounts/headers/000/014/715/original/5c6fc24edb3bb873.jpg",
+    "moved_to_account": null,
+    "suspended": null,
+    "limited": null,
+    "bot": true,
     "fields": [
       {
         "name": "Website",
-        "value": "https://trwnh.com",
+        "value": "<a href=\"https://trwnh.com\" target=\"_blank\" rel=\"nofollow noopener me\" translate=\"no\"><span class=\"invisible\">https://</span><span class=\"\">trwnh.com</span><span class=\"invisible\"></span></a>",
         "verified_at": "2019-08-29T04:14:55.571+00:00"
       },
       {
-        "name": "Sponsor",
-        "value": "https://liberapay.com/at",
-        "verified_at": "2019-11-15T10:06:15.557+00:00"
+        "name": "Portfolio",
+        "value": "<a href=\"https://abdullahtarawneh.com\" target=\"_blank\" rel=\"nofollow noopener me\" translate=\"no\"><span class=\"invisible\">https://</span><span class=\"\">abdullahtarawneh.com</span><span class=\"invisible\"></span></a>",
+        "verified_at": "2021-02-11T20:34:13.574+00:00"
       },
       {
         "name": "Fan of:",
-        "value": "Punk-rock and post-hardcore (Circa Survive, letlive., La Dispute, THE FEVER 333)Manga (Yu-Gi-Oh!, One Piece, JoJo's Bizarre Adventure, Death Note, Shaman King)Platformers and RPGs (Banjo-Kazooie, Boktai, Final Fantasy Crystal Chronicles)",
+        "value": "Punk-rock and post-hardcore (Circa Survive, letlive., La Dispute, THE FEVER 333)Manga (Yu-Gi-Oh!, One Piece, JoJo&#39;s Bizarre Adventure, Death Note, Shaman King)Platformers and RPGs (Banjo-Kazooie, Boktai, Final Fantasy Crystal Chronicles)",
         "verified_at": null
       },
       {
-        "name": "Main topics:",
-        "value": "systemic analysis, design patterns, anticapitalism, info/tech freedom, theory and philosophy, and otherwise being a genuine and decent wholesome poster. i'm just here to hang out and talk to cool people!",
+        "name": "What to expect:",
+        "value": "talking about various things i find interesting, and otherwise being a genuine and decent wholesome poster. i&#39;m just here to hang out and talk to cool people! and to spill my thoughts.",
         "verified_at": null
       }
     ],
-    "follow_requests_count": 0
-  },
-  "emojis": [
-    {
-      "shortcode": "fatyoshi",
-      "url": "https://files.mastodon.social/custom_emojis/images/000/023/920/original/e57ecb623faa0dc9.png",
-      "static_url": "https://files.mastodon.social/custom_emojis/images/000/023/920/static/e57ecb623faa0dc9.png",
-      "visible_in_picker": true
-    }
-  ],
-  "fields": [
-    {
-      "name": "Website",
-      "value": "<a href=\"https://trwnh.com\" rel=\"me nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">trwnh.com</span><span class=\"invisible\"></span></a>",
-      "verified_at": "2019-08-29T04:14:55.571+00:00"
-    },
-    {
-      "name": "Sponsor",
-      "value": "<a href=\"https://liberapay.com/at\" rel=\"me nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">liberapay.com/at</span><span class=\"invisible\"></span></a>",
-      "verified_at": "2019-11-15T10:06:15.557+00:00"
-    },
-    {
-      "name": "Fan of:",
-      "value": "Punk-rock and post-hardcore (Circa Survive, letlive., La Dispute, THE FEVER 333)Manga (Yu-Gi-Oh!, One Piece, JoJo&apos;s Bizarre Adventure, Death Note, Shaman King)Platformers and RPGs (Banjo-Kazooie, Boktai, Final Fantasy Crystal Chronicles)",
-      "verified_at": null
-    },
-    {
-      "name": "Main topics:",
-      "value": "systemic analysis, design patterns, anticapitalism, info/tech freedom, theory and philosophy, and otherwise being a genuine and decent wholesome poster. i&apos;m just here to hang out and talk to cool people!",
-      "verified_at": null
-    }
-  ]
+    "emojis": [],
+    "last_status_at": "2025-03-04T00:00:00",
+    "noindex": false,
+    "roles": [],
+    "role": null,
+    "source": null,
+    "mute_expires_at": null,
+    "indexable": false,
+    "hide_collections": true,
+    "memorial": null
+  }
 }
diff --git a/tests/components/mastodon/fixtures/instance.json b/tests/components/mastodon/fixtures/instance.json
index b0e904e80ef..2e3dfe2d46d 100644
--- a/tests/components/mastodon/fixtures/instance.json
+++ b/tests/components/mastodon/fixtures/instance.json
@@ -1,147 +1,18 @@
 {
-  "domain": "mastodon.social",
-  "title": "Mastodon",
-  "version": "4.0.0rc1",
-  "source_url": "https://github.com/mastodon/mastodon",
-  "description": "The original server operated by the Mastodon gGmbH non-profit",
-  "usage": {
-    "users": {
-      "active_month": 123122
+  "_mastopy_version": "2.0.0",
+  "_mastopy_type": "InstanceV2",
+  "_mastopy_data": {
+    "uri": "mastodon.social",
+    "domain": "mastodon.social",
+    "title": "Mastodon",
+    "version": "4.4.0-nightly.2025-02-07",
+    "source_url": "https://github.com/mastodon/mastodon",
+
+    "description": "The original server operated by the Mastodon gGmbH non-profit",
+    "usage": {
+      "users": {
+        "active_month": 380143
+      }
     }
-  },
-  "thumbnail": {
-    "url": "https://files.mastodon.social/site_uploads/files/000/000/001/@1x/57c12f441d083cde.png",
-    "blurhash": "UeKUpFxuo~R%0nW;WCnhF6RjaJt757oJodS$",
-    "versions": {
-      "@1x": "https://files.mastodon.social/site_uploads/files/000/000/001/@1x/57c12f441d083cde.png",
-      "@2x": "https://files.mastodon.social/site_uploads/files/000/000/001/@2x/57c12f441d083cde.png"
-    }
-  },
-  "languages": ["en"],
-  "configuration": {
-    "urls": {
-      "streaming": "wss://mastodon.social"
-    },
-    "vapid": {
-      "public_key": "BCkMmVdKDnKYwzVCDC99Iuc9GvId-x7-kKtuHnLgfF98ENiZp_aj-UNthbCdI70DqN1zUVis-x0Wrot2sBagkMc="
-    },
-    "accounts": {
-      "max_featured_tags": 10,
-      "max_pinned_statuses": 4
-    },
-    "statuses": {
-      "max_characters": 500,
-      "max_media_attachments": 4,
-      "characters_reserved_per_url": 23
-    },
-    "media_attachments": {
-      "supported_mime_types": [
-        "image/jpeg",
-        "image/png",
-        "image/gif",
-        "image/heic",
-        "image/heif",
-        "image/webp",
-        "video/webm",
-        "video/mp4",
-        "video/quicktime",
-        "video/ogg",
-        "audio/wave",
-        "audio/wav",
-        "audio/x-wav",
-        "audio/x-pn-wave",
-        "audio/vnd.wave",
-        "audio/ogg",
-        "audio/vorbis",
-        "audio/mpeg",
-        "audio/mp3",
-        "audio/webm",
-        "audio/flac",
-        "audio/aac",
-        "audio/m4a",
-        "audio/x-m4a",
-        "audio/mp4",
-        "audio/3gpp",
-        "video/x-ms-asf"
-      ],
-      "image_size_limit": 10485760,
-      "image_matrix_limit": 16777216,
-      "video_size_limit": 41943040,
-      "video_frame_rate_limit": 60,
-      "video_matrix_limit": 2304000
-    },
-    "polls": {
-      "max_options": 4,
-      "max_characters_per_option": 50,
-      "min_expiration": 300,
-      "max_expiration": 2629746
-    },
-    "translation": {
-      "enabled": true
-    }
-  },
-  "registrations": {
-    "enabled": false,
-    "approval_required": false,
-    "message": null
-  },
-  "contact": {
-    "email": "staff@mastodon.social",
-    "account": {
-      "id": "1",
-      "username": "Gargron",
-      "acct": "Gargron",
-      "display_name": "Eugen 💀",
-      "locked": false,
-      "bot": false,
-      "discoverable": true,
-      "group": false,
-      "created_at": "2016-03-16T00:00:00.000Z",
-      "note": "<p>Founder, CEO and lead developer <span class=\"h-card\"><a href=\"https://mastodon.social/@Mastodon\" class=\"u-url mention\">@<span>Mastodon</span></a></span>, Germany.</p>",
-      "url": "https://mastodon.social/@Gargron",
-      "avatar": "https://files.mastodon.social/accounts/avatars/000/000/001/original/dc4286ceb8fab734.jpg",
-      "avatar_static": "https://files.mastodon.social/accounts/avatars/000/000/001/original/dc4286ceb8fab734.jpg",
-      "header": "https://files.mastodon.social/accounts/headers/000/000/001/original/3b91c9965d00888b.jpeg",
-      "header_static": "https://files.mastodon.social/accounts/headers/000/000/001/original/3b91c9965d00888b.jpeg",
-      "followers_count": 133026,
-      "following_count": 311,
-      "statuses_count": 72605,
-      "last_status_at": "2022-10-31",
-      "noindex": false,
-      "emojis": [],
-      "fields": [
-        {
-          "name": "Patreon",
-          "value": "<a href=\"https://www.patreon.com/mastodon\" target=\"_blank\" rel=\"nofollow noopener noreferrer me\"><span class=\"invisible\">https://www.</span><span class=\"\">patreon.com/mastodon</span><span class=\"invisible\"></span></a>",
-          "verified_at": null
-        }
-      ]
-    }
-  },
-  "rules": [
-    {
-      "id": "1",
-      "text": "Sexually explicit or violent media must be marked as sensitive when posting"
-    },
-    {
-      "id": "2",
-      "text": "No racism, sexism, homophobia, transphobia, xenophobia, or casteism"
-    },
-    {
-      "id": "3",
-      "text": "No incitement of violence or promotion of violent ideologies"
-    },
-    {
-      "id": "4",
-      "text": "No harassment, dogpiling or doxxing of other users"
-    },
-    {
-      "id": "5",
-      "text": "No content illegal in Germany"
-    },
-    {
-      "id": "7",
-      "text": "Do not share intentionally false or misleading information"
-    }
-  ]
+  }
 }
diff --git a/tests/components/mastodon/snapshots/test_diagnostics.ambr b/tests/components/mastodon/snapshots/test_diagnostics.ambr
index 982ecee7ee2..9198410f066 100644
--- a/tests/components/mastodon/snapshots/test_diagnostics.ambr
+++ b/tests/components/mastodon/snapshots/test_diagnostics.ambr
@@ -3,245 +3,82 @@
   dict({
     'account': dict({
       'acct': 'trwnh',
-      'avatar': 'https://files.mastodon.social/accounts/avatars/000/014/715/original/34aa222f4ae2e0a9.png',
-      'avatar_static': 'https://files.mastodon.social/accounts/avatars/000/014/715/original/34aa222f4ae2e0a9.png',
-      'bot': False,
-      'created_at': '2016-11-24T10:02:12.085Z',
+      'avatar': 'https://files.mastodon.social/accounts/avatars/000/014/715/original/051c958388818705.png',
+      'avatar_static': 'https://files.mastodon.social/accounts/avatars/000/014/715/original/051c958388818705.png',
+      'bot': True,
+      'created_at': '2016-11-24T00:00:00+00:00',
+      'discoverable': True,
       'display_name': 'infinite love ⴳ',
       'emojis': list([
-        dict({
-          'shortcode': 'fatyoshi',
-          'static_url': 'https://files.mastodon.social/custom_emojis/images/000/023/920/static/e57ecb623faa0dc9.png',
-          'url': 'https://files.mastodon.social/custom_emojis/images/000/023/920/original/e57ecb623faa0dc9.png',
-          'visible_in_picker': True,
-        }),
       ]),
       'fields': list([
         dict({
           'name': 'Website',
-          'value': '<a href="https://trwnh.com" rel="me nofollow noopener noreferrer" target="_blank"><span class="invisible">https://</span><span class="">trwnh.com</span><span class="invisible"></span></a>',
+          'value': '<a href="https://trwnh.com" target="_blank" rel="nofollow noopener me" translate="no"><span class="invisible">https://</span><span class="">trwnh.com</span><span class="invisible"></span></a>',
           'verified_at': '2019-08-29T04:14:55.571+00:00',
         }),
         dict({
-          'name': 'Sponsor',
-          'value': '<a href="https://liberapay.com/at" rel="me nofollow noopener noreferrer" target="_blank"><span class="invisible">https://</span><span class="">liberapay.com/at</span><span class="invisible"></span></a>',
-          'verified_at': '2019-11-15T10:06:15.557+00:00',
+          'name': 'Portfolio',
+          'value': '<a href="https://abdullahtarawneh.com" target="_blank" rel="nofollow noopener me" translate="no"><span class="invisible">https://</span><span class="">abdullahtarawneh.com</span><span class="invisible"></span></a>',
+          'verified_at': '2021-02-11T20:34:13.574+00:00',
         }),
         dict({
           'name': 'Fan of:',
-          'value': 'Punk-rock and post-hardcore (Circa Survive, letlive., La Dispute, THE FEVER 333)Manga (Yu-Gi-Oh!, One Piece, JoJo&apos;s Bizarre Adventure, Death Note, Shaman King)Platformers and RPGs (Banjo-Kazooie, Boktai, Final Fantasy Crystal Chronicles)',
+          'value': 'Punk-rock and post-hardcore (Circa Survive, letlive., La Dispute, THE FEVER 333)Manga (Yu-Gi-Oh!, One Piece, JoJo&#39;s Bizarre Adventure, Death Note, Shaman King)Platformers and RPGs (Banjo-Kazooie, Boktai, Final Fantasy Crystal Chronicles)',
           'verified_at': None,
         }),
         dict({
-          'name': 'Main topics:',
-          'value': 'systemic analysis, design patterns, anticapitalism, info/tech freedom, theory and philosophy, and otherwise being a genuine and decent wholesome poster. i&apos;m just here to hang out and talk to cool people!',
+          'name': 'What to expect:',
+          'value': 'talking about various things i find interesting, and otherwise being a genuine and decent wholesome poster. i&#39;m just here to hang out and talk to cool people! and to spill my thoughts.',
           'verified_at': None,
         }),
       ]),
-      'followers_count': 821,
-      'following_count': 178,
+      'followers_count': 3169,
+      'following_count': 328,
+      'group': False,
       'header': 'https://files.mastodon.social/accounts/headers/000/014/715/original/5c6fc24edb3bb873.jpg',
       'header_static': 'https://files.mastodon.social/accounts/headers/000/014/715/original/5c6fc24edb3bb873.jpg',
+      'hide_collections': True,
       'id': '14715',
-      'last_status_at': '2019-11-24T15:49:42.251Z',
+      'indexable': False,
+      'last_status_at': '2025-03-04T00:00:00',
+      'limited': None,
       'locked': False,
-      'note': '<p>i have approximate knowledge of many things. perpetual student. (nb/ace/they)</p><p>xmpp/email: a@trwnh.com<br /><a href="https://trwnh.com" rel="nofollow noopener noreferrer" target="_blank"><span class="invisible">https://</span><span class="">trwnh.com</span><span class="invisible"></span></a><br />help me live: <a href="https://liberapay.com/at" rel="nofollow noopener noreferrer" target="_blank"><span class="invisible">https://</span><span class="">liberapay.com/at</span><span class="invisible"></span></a> or <a href="https://paypal.me/trwnh" rel="nofollow noopener noreferrer" target="_blank"><span class="invisible">https://</span><span class="">paypal.me/trwnh</span><span class="invisible"></span></a></p><p>- my triggers are moths and glitter<br />- i have all notifs except mentions turned off, so please interact if you wanna be friends! i literally will not notice otherwise<br />- dm me if i did something wrong, so i can improve<br />- purest person on fedi, do not lewd in my presence<br />- #1 ami cole fan account</p><p>:fatyoshi:</p>',
-      'source': dict({
-        'fields': list([
-          dict({
-            'name': 'Website',
-            'value': 'https://trwnh.com',
-            'verified_at': '2019-08-29T04:14:55.571+00:00',
-          }),
-          dict({
-            'name': 'Sponsor',
-            'value': 'https://liberapay.com/at',
-            'verified_at': '2019-11-15T10:06:15.557+00:00',
-          }),
-          dict({
-            'name': 'Fan of:',
-            'value': "Punk-rock and post-hardcore (Circa Survive, letlive., La Dispute, THE FEVER 333)Manga (Yu-Gi-Oh!, One Piece, JoJo's Bizarre Adventure, Death Note, Shaman King)Platformers and RPGs (Banjo-Kazooie, Boktai, Final Fantasy Crystal Chronicles)",
-            'verified_at': None,
-          }),
-          dict({
-            'name': 'Main topics:',
-            'value': "systemic analysis, design patterns, anticapitalism, info/tech freedom, theory and philosophy, and otherwise being a genuine and decent wholesome poster. i'm just here to hang out and talk to cool people!",
-            'verified_at': None,
-          }),
-        ]),
-        'follow_requests_count': 0,
-        'language': '',
-        'note': '''
-          i have approximate knowledge of many things. perpetual student. (nb/ace/they)
-          
-          xmpp/email: a@trwnh.com
-          https://trwnh.com
-          help me live: https://liberapay.com/at or https://paypal.me/trwnh
-          
-          - my triggers are moths and glitter
-          - i have all notifs except mentions turned off, so please interact if you wanna be friends! i literally will not notice otherwise
-          - dm me if i did something wrong, so i can improve
-          - purest person on fedi, do not lewd in my presence
-          - #1 ami cole fan account
-          
-          :fatyoshi:
-        ''',
-        'privacy': 'public',
-        'sensitive': False,
-      }),
-      'statuses_count': 33120,
+      'memorial': None,
+      'moved_to_account': None,
+      'mute_expires_at': None,
+      'noindex': False,
+      'note': '<p>i have approximate knowledge of many things. perpetual student. (nb/ace/they)</p><p>xmpp/email: a@trwnh.com<br /><a href="https://trwnh.com" target="_blank" rel="nofollow noopener" translate="no"><span class="invisible">https://</span><span class="">trwnh.com</span><span class="invisible"></span></a><br />help me live:<br />- <a href="https://donate.stripe.com/4gwcPCaMpcQ19RC4gg" target="_blank" rel="nofollow noopener" translate="no"><span class="invisible">https://</span><span class="ellipsis">donate.stripe.com/4gwcPCaMpcQ1</span><span class="invisible">9RC4gg</span></a><br />- <a href="https://liberapay.com/trwnh" target="_blank" rel="nofollow noopener" translate="no"><span class="invisible">https://</span><span class="">liberapay.com/trwnh</span><span class="invisible"></span></a></p><p>notes:<br />- my triggers are moths and glitter<br />- i have all notifs except mentions turned off, so please interact if you wanna be friends! i literally will not notice otherwise<br />- dm me if i did something wrong, so i can improve<br />- purest person on fedi, do not lewd in my presence</p>',
+      'role': None,
+      'roles': list([
+      ]),
+      'source': None,
+      'statuses_count': 69523,
+      'suspended': None,
+      'uri': 'https://mastodon.social/users/trwnh',
       'url': 'https://mastodon.social/@trwnh',
       'username': 'trwnh',
     }),
     'instance': dict({
-      'configuration': dict({
-        'accounts': dict({
-          'max_featured_tags': 10,
-          'max_pinned_statuses': 4,
-        }),
-        'media_attachments': dict({
-          'image_matrix_limit': 16777216,
-          'image_size_limit': 10485760,
-          'supported_mime_types': list([
-            'image/jpeg',
-            'image/png',
-            'image/gif',
-            'image/heic',
-            'image/heif',
-            'image/webp',
-            'video/webm',
-            'video/mp4',
-            'video/quicktime',
-            'video/ogg',
-            'audio/wave',
-            'audio/wav',
-            'audio/x-wav',
-            'audio/x-pn-wave',
-            'audio/vnd.wave',
-            'audio/ogg',
-            'audio/vorbis',
-            'audio/mpeg',
-            'audio/mp3',
-            'audio/webm',
-            'audio/flac',
-            'audio/aac',
-            'audio/m4a',
-            'audio/x-m4a',
-            'audio/mp4',
-            'audio/3gpp',
-            'video/x-ms-asf',
-          ]),
-          'video_frame_rate_limit': 60,
-          'video_matrix_limit': 2304000,
-          'video_size_limit': 41943040,
-        }),
-        'polls': dict({
-          'max_characters_per_option': 50,
-          'max_expiration': 2629746,
-          'max_options': 4,
-          'min_expiration': 300,
-        }),
-        'statuses': dict({
-          'characters_reserved_per_url': 23,
-          'max_characters': 500,
-          'max_media_attachments': 4,
-        }),
-        'translation': dict({
-          'enabled': True,
-        }),
-        'urls': dict({
-          'streaming': 'wss://mastodon.social',
-        }),
-        'vapid': dict({
-          'public_key': 'BCkMmVdKDnKYwzVCDC99Iuc9GvId-x7-kKtuHnLgfF98ENiZp_aj-UNthbCdI70DqN1zUVis-x0Wrot2sBagkMc=',
-        }),
-      }),
-      'contact': dict({
-        'account': dict({
-          'acct': 'Gargron',
-          'avatar': 'https://files.mastodon.social/accounts/avatars/000/000/001/original/dc4286ceb8fab734.jpg',
-          'avatar_static': 'https://files.mastodon.social/accounts/avatars/000/000/001/original/dc4286ceb8fab734.jpg',
-          'bot': False,
-          'created_at': '2016-03-16T00:00:00.000Z',
-          'discoverable': True,
-          'display_name': 'Eugen 💀',
-          'emojis': list([
-          ]),
-          'fields': list([
-            dict({
-              'name': 'Patreon',
-              'value': '<a href="https://www.patreon.com/mastodon" target="_blank" rel="nofollow noopener noreferrer me"><span class="invisible">https://www.</span><span class="">patreon.com/mastodon</span><span class="invisible"></span></a>',
-              'verified_at': None,
-            }),
-          ]),
-          'followers_count': 133026,
-          'following_count': 311,
-          'group': False,
-          'header': 'https://files.mastodon.social/accounts/headers/000/000/001/original/3b91c9965d00888b.jpeg',
-          'header_static': 'https://files.mastodon.social/accounts/headers/000/000/001/original/3b91c9965d00888b.jpeg',
-          'id': '1',
-          'last_status_at': '2022-10-31',
-          'locked': False,
-          'noindex': False,
-          'note': '<p>Founder, CEO and lead developer <span class="h-card"><a href="https://mastodon.social/@Mastodon" class="u-url mention">@<span>Mastodon</span></a></span>, Germany.</p>',
-          'statuses_count': 72605,
-          'url': 'https://mastodon.social/@Gargron',
-          'username': 'Gargron',
-        }),
-        'email': 'staff@mastodon.social',
-      }),
+      'api_versions': None,
+      'configuration': None,
+      'contact': None,
       'description': 'The original server operated by the Mastodon gGmbH non-profit',
       'domain': 'mastodon.social',
-      'languages': list([
-        'en',
-      ]),
-      'registrations': dict({
-        'approval_required': False,
-        'enabled': False,
-        'message': None,
-      }),
-      'rules': list([
-        dict({
-          'id': '1',
-          'text': 'Sexually explicit or violent media must be marked as sensitive when posting',
-        }),
-        dict({
-          'id': '2',
-          'text': 'No racism, sexism, homophobia, transphobia, xenophobia, or casteism',
-        }),
-        dict({
-          'id': '3',
-          'text': 'No incitement of violence or promotion of violent ideologies',
-        }),
-        dict({
-          'id': '4',
-          'text': 'No harassment, dogpiling or doxxing of other users',
-        }),
-        dict({
-          'id': '5',
-          'text': 'No content illegal in Germany',
-        }),
-        dict({
-          'id': '7',
-          'text': 'Do not share intentionally false or misleading information',
-        }),
-      ]),
+      'icon': None,
+      'languages': None,
+      'registrations': None,
+      'rules': None,
       'source_url': 'https://github.com/mastodon/mastodon',
-      'thumbnail': dict({
-        'blurhash': 'UeKUpFxuo~R%0nW;WCnhF6RjaJt757oJodS$',
-        'url': 'https://files.mastodon.social/site_uploads/files/000/000/001/@1x/57c12f441d083cde.png',
-        'versions': dict({
-          '@1x': 'https://files.mastodon.social/site_uploads/files/000/000/001/@1x/57c12f441d083cde.png',
-          '@2x': 'https://files.mastodon.social/site_uploads/files/000/000/001/@2x/57c12f441d083cde.png',
-        }),
-      }),
+      'thumbnail': None,
       'title': 'Mastodon',
+      'uri': 'mastodon.social',
       'usage': dict({
         'users': dict({
-          'active_month': 123122,
+          'active_month': 380143,
         }),
       }),
-      'version': '4.0.0rc1',
+      'version': '4.4.0-nightly.2025-02-07',
     }),
   })
 # ---
diff --git a/tests/components/mastodon/snapshots/test_init.ambr b/tests/components/mastodon/snapshots/test_init.ambr
index 37fa765acea..46fb4c1d4e0 100644
--- a/tests/components/mastodon/snapshots/test_init.ambr
+++ b/tests/components/mastodon/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -27,7 +28,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': None,
     'suggested_area': None,
-    'sw_version': '4.0.0rc1',
+    'sw_version': '4.4.0-nightly.2025-02-07',
     'via_device_id': None,
   })
 # ---
diff --git a/tests/components/mastodon/snapshots/test_sensor.ambr b/tests/components/mastodon/snapshots/test_sensor.ambr
index c8df8cdab19..40986210454 100644
--- a/tests/components/mastodon/snapshots/test_sensor.ambr
+++ b/tests/components/mastodon/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -46,7 +47,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '821',
+    'state': '3169',
   })
 # ---
 # name: test_sensors[sensor.mastodon_trwnh_mastodon_social_following-entry]
@@ -58,6 +59,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -96,7 +98,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '178',
+    'state': '328',
   })
 # ---
 # name: test_sensors[sensor.mastodon_trwnh_mastodon_social_posts-entry]
@@ -108,6 +110,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -146,6 +149,6 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '33120',
+    'state': '69523',
   })
 # ---
diff --git a/tests/components/mastodon/test_notify.py b/tests/components/mastodon/test_notify.py
index ab2d7456baf..4242f88d34a 100644
--- a/tests/components/mastodon/test_notify.py
+++ b/tests/components/mastodon/test_notify.py
@@ -2,10 +2,13 @@
 
 from unittest.mock import AsyncMock
 
+from mastodon.Mastodon import MastodonAPIError
+import pytest
 from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components.notify import DOMAIN as NOTIFY_DOMAIN
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
 
 from . import setup_integration
@@ -36,3 +39,27 @@ async def test_notify(
     )
 
     assert mock_mastodon_client.status_post.assert_called_once
+
+
+async def test_notify_failed(
+    hass: HomeAssistant,
+    mock_mastodon_client: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test the notify raising an error."""
+    mock_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    mock_mastodon_client.status_post.side_effect = MastodonAPIError
+
+    with pytest.raises(HomeAssistantError, match="Unable to send message"):
+        await hass.services.async_call(
+            NOTIFY_DOMAIN,
+            "trwnh_mastodon_social",
+            {
+                "message": "test toot",
+            },
+            blocking=True,
+            return_response=False,
+        )
diff --git a/tests/components/mastodon/test_services.py b/tests/components/mastodon/test_services.py
new file mode 100644
index 00000000000..f51d39f8687
--- /dev/null
+++ b/tests/components/mastodon/test_services.py
@@ -0,0 +1,265 @@
+"""Tests for the Mastodon services."""
+
+from unittest.mock import AsyncMock, Mock, patch
+
+from mastodon.Mastodon import MastodonAPIError, MediaAttachment
+import pytest
+
+from homeassistant.components.mastodon.const import (
+    ATTR_CONFIG_ENTRY_ID,
+    ATTR_CONTENT_WARNING,
+    ATTR_MEDIA,
+    ATTR_MEDIA_DESCRIPTION,
+    ATTR_STATUS,
+    ATTR_VISIBILITY,
+    DOMAIN,
+)
+from homeassistant.components.mastodon.services import SERVICE_POST
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry
+
+
+@pytest.mark.parametrize(
+    ("payload", "kwargs"),
+    [
+        (
+            {
+                ATTR_STATUS: "test toot",
+            },
+            {
+                "status": "test toot",
+                "spoiler_text": None,
+                "visibility": None,
+                "media_ids": None,
+                "sensitive": None,
+            },
+        ),
+        (
+            {ATTR_STATUS: "test toot", ATTR_VISIBILITY: "private"},
+            {
+                "status": "test toot",
+                "spoiler_text": None,
+                "visibility": "private",
+                "media_ids": None,
+                "sensitive": None,
+            },
+        ),
+        (
+            {
+                ATTR_STATUS: "test toot",
+                ATTR_CONTENT_WARNING: "Spoiler",
+                ATTR_VISIBILITY: "private",
+            },
+            {
+                "status": "test toot",
+                "spoiler_text": "Spoiler",
+                "visibility": "private",
+                "media_ids": None,
+                "sensitive": None,
+            },
+        ),
+        (
+            {
+                ATTR_STATUS: "test toot",
+                ATTR_CONTENT_WARNING: "Spoiler",
+                ATTR_MEDIA: "/image.jpg",
+            },
+            {
+                "status": "test toot",
+                "spoiler_text": "Spoiler",
+                "visibility": None,
+                "media_ids": "1",
+                "sensitive": None,
+            },
+        ),
+        (
+            {
+                ATTR_STATUS: "test toot",
+                ATTR_CONTENT_WARNING: "Spoiler",
+                ATTR_MEDIA: "/image.jpg",
+                ATTR_MEDIA_DESCRIPTION: "A test image",
+            },
+            {
+                "status": "test toot",
+                "spoiler_text": "Spoiler",
+                "visibility": None,
+                "media_ids": "1",
+                "sensitive": None,
+            },
+        ),
+    ],
+)
+async def test_service_post(
+    hass: HomeAssistant,
+    mock_mastodon_client: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    payload: dict[str, str],
+    kwargs: dict[str, str | None],
+) -> None:
+    """Test the post service."""
+
+    await setup_integration(hass, mock_config_entry)
+
+    with (
+        patch.object(hass.config, "is_allowed_path", return_value=True),
+        patch.object(
+            mock_mastodon_client, "media_post", return_value=MediaAttachment(id="1")
+        ),
+    ):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_POST,
+            {
+                ATTR_CONFIG_ENTRY_ID: mock_config_entry.entry_id,
+            }
+            | payload,
+            blocking=True,
+            return_response=False,
+        )
+
+    mock_mastodon_client.status_post.assert_called_with(**kwargs)
+
+    mock_mastodon_client.status_post.reset_mock()
+
+
+@pytest.mark.parametrize(
+    ("payload", "kwargs"),
+    [
+        (
+            {
+                ATTR_STATUS: "test toot",
+            },
+            {"status": "test toot", "spoiler_text": None, "visibility": None},
+        ),
+        (
+            {
+                ATTR_STATUS: "test toot",
+                ATTR_CONTENT_WARNING: "Spoiler",
+                ATTR_MEDIA: "/image.jpg",
+            },
+            {
+                "status": "test toot",
+                "spoiler_text": "Spoiler",
+                "visibility": None,
+                "media_ids": "1",
+                "media_description": None,
+                "sensitive": None,
+            },
+        ),
+    ],
+)
+async def test_post_service_failed(
+    hass: HomeAssistant,
+    mock_mastodon_client: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    payload: dict[str, str],
+    kwargs: dict[str, str | None],
+) -> None:
+    """Test the post service raising an error."""
+    mock_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    hass.config.is_allowed_path = Mock(return_value=True)
+    mock_mastodon_client.media_post.return_value = MediaAttachment(id="1")
+
+    mock_mastodon_client.status_post.side_effect = MastodonAPIError
+
+    with pytest.raises(HomeAssistantError, match="Unable to send message"):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_POST,
+            {ATTR_CONFIG_ENTRY_ID: mock_config_entry.entry_id} | payload,
+            blocking=True,
+            return_response=False,
+        )
+
+
+async def test_post_media_upload_failed(
+    hass: HomeAssistant,
+    mock_mastodon_client: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test the post service raising an error because media upload fails."""
+    mock_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    payload = {"status": "test toot", "media": "/fail.jpg"}
+
+    mock_mastodon_client.media_post.side_effect = MastodonAPIError
+
+    with (
+        patch.object(hass.config, "is_allowed_path", return_value=True),
+        pytest.raises(HomeAssistantError, match="Unable to upload image /fail.jpg"),
+    ):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_POST,
+            {ATTR_CONFIG_ENTRY_ID: mock_config_entry.entry_id} | payload,
+            blocking=True,
+            return_response=False,
+        )
+
+
+async def test_post_path_not_whitelisted(
+    hass: HomeAssistant,
+    mock_mastodon_client: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test the post service raising an error because the file path is not whitelisted."""
+    mock_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    payload = {"status": "test toot", "media": "/fail.jpg"}
+
+    with pytest.raises(
+        HomeAssistantError, match="/fail.jpg is not a whitelisted directory"
+    ):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_POST,
+            {ATTR_CONFIG_ENTRY_ID: mock_config_entry.entry_id} | payload,
+            blocking=True,
+            return_response=False,
+        )
+
+
+async def test_service_entry_availability(
+    hass: HomeAssistant,
+    mock_mastodon_client: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test the services without valid entry."""
+    mock_config_entry.add_to_hass(hass)
+    mock_config_entry2 = MockConfigEntry(domain=DOMAIN)
+    mock_config_entry2.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    payload = {"status": "test toot"}
+
+    with pytest.raises(ServiceValidationError, match="Mock Title is not loaded"):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_POST,
+            {ATTR_CONFIG_ENTRY_ID: mock_config_entry2.entry_id} | payload,
+            blocking=True,
+            return_response=False,
+        )
+
+    with pytest.raises(
+        ServiceValidationError, match='Integration "mastodon" not found in registry'
+    ):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_POST,
+            {ATTR_CONFIG_ENTRY_ID: "bad-config_id"} | payload,
+            blocking=True,
+            return_response=False,
+        )
diff --git a/tests/components/matter/conftest.py b/tests/components/matter/conftest.py
index 4e078f86939..d7429f6087d 100644
--- a/tests/components/matter/conftest.py
+++ b/tests/components/matter/conftest.py
@@ -116,6 +116,7 @@ async def integration_fixture(
         "window_covering_pa_lift",
         "window_covering_pa_tilt",
         "window_covering_tilt",
+        "yandex_smart_socket",
     ]
 )
 async def matter_devices(
diff --git a/tests/components/matter/fixtures/nodes/silabs_laundrywasher.json b/tests/components/matter/fixtures/nodes/silabs_laundrywasher.json
index 4d26dfb03aa..3b1ed0043de 100644
--- a/tests/components/matter/fixtures/nodes/silabs_laundrywasher.json
+++ b/tests/components/matter/fixtures/nodes/silabs_laundrywasher.json
@@ -656,7 +656,7 @@
     "1/83/0": ["Off", "Low", "Medium", "High"],
     "1/83/1": 0,
     "1/83/2": 0,
-    "1/83/3": [1, 2],
+    "1/83/3": [0, 1],
     "1/83/65532": 3,
     "1/83/65533": 1,
     "1/83/65528": [],
@@ -673,8 +673,8 @@
     "1/86/65528": [],
     "1/86/65529": [0],
     "1/86/65531": [4, 5, 65528, 65529, 65531, 65532, 65533],
-    "1/96/0": null,
-    "1/96/1": null,
+    "1/96/0": ["pre-soak", "rinse", "spin"],
+    "1/96/1": 0,
     "1/96/3": [
       {
         "0": 0
diff --git a/tests/components/matter/fixtures/nodes/yandex_smart_socket.json b/tests/components/matter/fixtures/nodes/yandex_smart_socket.json
new file mode 100644
index 00000000000..26cdf38414f
--- /dev/null
+++ b/tests/components/matter/fixtures/nodes/yandex_smart_socket.json
@@ -0,0 +1,278 @@
+{
+  "node_id": 4,
+  "date_commissioned": "2024-12-05T10:54:31.635203",
+  "last_interview": "2024-12-05T12:16:52.038776",
+  "interview_version": 6,
+  "available": true,
+  "is_bridge": false,
+  "attributes": {
+    "0/29/0": [
+      {
+        "0": 22,
+        "1": 1
+      }
+    ],
+    "0/29/1": [29, 31, 40, 42, 48, 49, 51, 52, 54, 60, 62, 63],
+    "0/29/2": [41],
+    "0/29/3": [1],
+    "0/29/65532": 0,
+    "0/29/65533": 2,
+    "0/29/65528": [],
+    "0/29/65529": [],
+    "0/29/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "0/31/0": [
+      {
+        "1": 5,
+        "2": 2,
+        "3": [112233],
+        "4": null,
+        "254": 3
+      }
+    ],
+    "0/31/1": [],
+    "0/31/2": 4,
+    "0/31/3": 3,
+    "0/31/4": 4,
+    "0/31/65532": 0,
+    "0/31/65533": 1,
+    "0/31/65528": [],
+    "0/31/65529": [],
+    "0/31/65531": [0, 1, 2, 3, 4, 65528, 65529, 65531, 65532, 65533],
+    "0/40/0": 17,
+    "0/40/1": "Yandex",
+    "0/40/2": 5130,
+    "0/40/3": "YNDX-00540",
+    "0/40/4": 540,
+    "0/40/5": "",
+    "0/40/6": "XX",
+    "0/40/7": 0,
+    "0/40/8": "v0.4",
+    "0/40/9": 18,
+    "0/40/10": "8.0.r13402545-18",
+    "0/40/15": "HP000RM000V4RW",
+    "0/40/17": true,
+    "0/40/18": "E4480D32A5480B29",
+    "0/40/19": {
+      "0": 3,
+      "1": 3
+    },
+    "0/40/65532": 0,
+    "0/40/65533": 1,
+    "0/40/65528": [],
+    "0/40/65529": [],
+    "0/40/65531": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 17, 18, 19, 65528, 65529, 65531,
+      65532, 65533
+    ],
+    "0/42/0": [],
+    "0/42/1": true,
+    "0/42/2": 1,
+    "0/42/3": null,
+    "0/42/65532": 0,
+    "0/42/65533": 1,
+    "0/42/65528": [],
+    "0/42/65529": [0],
+    "0/42/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "0/48/0": 0,
+    "0/48/1": {
+      "0": 60,
+      "1": 900
+    },
+    "0/48/2": 0,
+    "0/48/3": 0,
+    "0/48/4": true,
+    "0/48/65532": 0,
+    "0/48/65533": 1,
+    "0/48/65528": [1, 3, 5],
+    "0/48/65529": [0, 2, 4],
+    "0/48/65531": [0, 1, 2, 3, 4, 65528, 65529, 65531, 65532, 65533],
+    "0/49/0": 1,
+    "0/49/1": [
+      {
+        "0": "**REDACTED**",
+        "1": true
+      }
+    ],
+    "0/49/2": 10,
+    "0/49/3": 30,
+    "0/49/4": true,
+    "0/49/5": 0,
+    "0/49/6": "**REDACTED**",
+    "0/49/7": null,
+    "0/49/65532": 1,
+    "0/49/65533": 1,
+    "0/49/65528": [1, 5, 7],
+    "0/49/65529": [0, 2, 4, 6, 8],
+    "0/49/65531": [0, 1, 2, 3, 4, 5, 6, 7, 65528, 65529, 65531, 65532, 65533],
+    "0/51/0": [
+      {
+        "0": "WIFI_STA_DEF",
+        "1": true,
+        "2": null,
+        "3": null,
+        "4": "PAtP8Nse",
+        "5": ["wKgAEw=="],
+        "6": ["/oAAAAAAAAA+C0///vDbHg==", "/YrmoeskHZU+C0///vDbHg=="],
+        "7": 1
+      }
+    ],
+    "0/51/1": 4,
+    "0/51/2": 124,
+    "0/51/3": 0,
+    "0/51/4": 1,
+    "0/51/5": [],
+    "0/51/6": [],
+    "0/51/7": [],
+    "0/51/8": false,
+    "0/51/65532": 0,
+    "0/51/65533": 1,
+    "0/51/65528": [],
+    "0/51/65529": [0],
+    "0/51/65531": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 65528, 65529, 65531, 65532, 65533
+    ],
+    "0/52/1": 79260,
+    "0/52/2": 171268,
+    "0/52/65532": 0,
+    "0/52/65533": 1,
+    "0/52/65528": [],
+    "0/52/65529": [],
+    "0/52/65531": [1, 2, 65528, 65529, 65531, 65532, 65533],
+    "0/54/0": "eJoYDvok",
+    "0/54/1": 4,
+    "0/54/2": 3,
+    "0/54/3": 11,
+    "0/54/4": -53,
+    "0/54/65532": 0,
+    "0/54/65533": 1,
+    "0/54/65528": [],
+    "0/54/65529": [],
+    "0/54/65531": [0, 1, 2, 3, 4, 65528, 65529, 65531, 65532, 65533],
+    "0/60/0": 0,
+    "0/60/1": null,
+    "0/60/2": null,
+    "0/60/65532": 0,
+    "0/60/65533": 1,
+    "0/60/65528": [],
+    "0/60/65529": [0, 1, 2],
+    "0/60/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533],
+    "0/62/0": [
+      {
+        "1": "FTABAQEkAgE3AyQTAhgmBIAigScmBYAlTTo3BiQVASQRBBgkBwEkCAEwCUEEvOt9COzrjgf+b8q6FcKeKfbtqJybToVtEF0jiidbqg8FPmTIPTm1kU9hEiE6sd2N/GWSQHRoMi3YNl19h1PM3zcKNQEoARgkAgE2AwQCBAEYMAQUSu0+nQ/nOzrUNECyeBAqGPVu33YwBRS2PEiS/N109emRL3DTMaiWoWrEShgwC0DoGPCGt0HeGYnTS4TS2R7vbNhiFuuIrUQuxY5phP/UXBZosBDQTsnRTbMof18OkeO68MEcLXdIXjBJvBDaP/TsGA==",
+        "2": "FTABAQEkAgE3AyQUARgmBIAigScmBYAlTTo3BiQTAhgkBwEkCAEwCUEEz8nO5tz0gMFM5TW4YjYXGxkhr/UKHZg1rCa21StYqGd0wGaP7a5eMR+2BY20D1b11R7i6teWKnAaW+WqY0vQTjcKNQEpARgkAmAwBBS2PEiS/N109emRL3DTMaiWoWrESjAFFG//dFS5V0Y6/QdSQcC+z7idKKeJGDALQGFBsf7Ecq44e7NN8dCZIoJMUG16rmwD4ZtHtD4JPTxYabEreeblNF2ZDSgbo+A8sfz7Ci37WjznxbEj96vR8MgY",
+        "254": 3
+      }
+    ],
+    "0/62/1": [
+      {
+        "1": "BLB0QnDldRPfV2xt6Nd/34ja8uaWwvsLYZsF3yCdIwyB/krYZ0u1uBS0FTo7E3iqvN0cDZ7fbhw0OUsKTVZ9Y10=",
+        "2": 65521,
+        "3": 1,
+        "4": 4,
+        "5": "",
+        "254": 3
+      }
+    ],
+    "0/62/2": 5,
+    "0/62/3": 4,
+    "0/62/4": [
+      "FTABAQAkAgE3AyYU3a/iASYVn7wdXBgmBKaW1SwkBQA3BiYU3a/iASYVn7wdXBgkBwEkCAEwCUEE/OyhHiUZDgJ7iUVCKouxsZgI0DGBcK8E+vbDIHD5gfeFPNuT5sXN8aHlsEl7fZhfjbdEbIFudeJKIr5uf7+PLTcKNQEpARgkAmAwBBQtr6wAOFJ7UJLwYUKvomZh5wPaszAFFC2vrAA4UntQkvBhQq+iZmHnA9qzGDALQM5/1ziQdNcMURJqGH+j9wt7w/wPyeq8zf+u3FGgmmfhBSouJw4f+TIJLk7m/eQD0p2Q5rSDEuuwI2VBTxxeuWgY",
+      "FTABAQAkAgE3AycUe5hjm9Wdt4YmFewk8wUYJgTGN00tJAUANwYnFHuYY5vVnbeGJhXsJPMFGCQHASQIATAJQQR56PnGPW5p1dXhHDSVnjoah8C2+JYHzPAm5tvYgup9gf7DukH2TxxLdDEaBdD4hgQj/R8hrMYSmj8XmHQ8HhdZNwo1ASkBGCQCYDAEFN8wYcjYskj9OSQoEXkOn0QmWDrkMAUU3zBhyNiySP05JCgReQ6fRCZYOuQYMAtA+j7ir4H1KYIxAe49jhZr/Gg7pDUKtIcYyUVJD0g9egIYHShM1y1j3BsOQTBX6mnLPp4FS4AtNsUgaM+XPKSFSxg=",
+      "FTABAQEkAgE3AyQUARgmBIAigScmBYAlTTo3BiQUARgkBwEkCAEwCUEEsHRCcOV1E99XbG3o13/fiNry5pbC+wthmwXfIJ0jDIH+SthnS7W4FLQVOjsTeKq83RwNnt9uHDQ5SwpNVn1jXTcKNQEpARgkAmAwBBRv/3RUuVdGOv0HUkHAvs+4nSiniTAFFG//dFS5V0Y6/QdSQcC+z7idKKeJGDALQKrvVhoinxo07C2nI/zakt4xUZKgab6DVI4mBXYoPQXaZM8jmEqWboPnLBUGbr9UAnqEc9yARHwlC77eXN1BCdUY",
+      "FTABAQEkAgE3AyQUARgmBIAigScmBYAlTTo3BiQUARgkBwEkCAEwCUEEMmvMdDf/h+u7fawdjIe6gXEeWuszCShR8ulsHMLnJYTMHVrkztOcj4cHw6haH/q909aVmL3xLlbEC2lZtmZClDcKNQEpARgkAmAwBBRoZjEcSXeh6IFBtW0A2OilJBdeYjAFFGhmMRxJd6HogUG1bQDY6KUkF15iGDALQJm5+/SkVrR4iBpGVqZZGOH+DpS+cQYqceN1+JSnDFwxJe+khYxFifMohSQ5NLlTiJQTZWYpqMKMZHT36pWWADUY"
+    ],
+    "0/62/5": 3,
+    "0/62/65532": 0,
+    "0/62/65533": 1,
+    "0/62/65528": [1, 3, 5, 8],
+    "0/62/65529": [0, 2, 4, 6, 7, 9, 10, 11],
+    "0/62/65531": [0, 1, 2, 3, 4, 5, 65528, 65529, 65531, 65532, 65533],
+    "0/63/0": [],
+    "0/63/1": [],
+    "0/63/2": 4,
+    "0/63/3": 3,
+    "0/63/65532": 0,
+    "0/63/65533": 2,
+    "0/63/65528": [2, 5],
+    "0/63/65529": [0, 1, 3, 4],
+    "0/63/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "1/3/0": 0,
+    "1/3/1": 2,
+    "1/3/65532": 0,
+    "1/3/65533": 4,
+    "1/3/65528": [],
+    "1/3/65529": [0, 64],
+    "1/3/65531": [0, 1, 65528, 65529, 65531, 65532, 65533],
+    "1/4/0": 128,
+    "1/4/65532": 1,
+    "1/4/65533": 4,
+    "1/4/65528": [0, 1, 2, 3],
+    "1/4/65529": [0, 1, 2, 3, 4, 5],
+    "1/4/65531": [0, 65528, 65529, 65531, 65532, 65533],
+    "1/6/0": true,
+    "1/6/16384": true,
+    "1/6/16385": 0,
+    "1/6/16386": 0,
+    "1/6/16387": 0,
+    "1/6/65532": 1,
+    "1/6/65533": 4,
+    "1/6/65528": [],
+    "1/6/65529": [0, 1, 2, 64, 65, 66],
+    "1/6/65531": [
+      0, 16384, 16385, 16386, 16387, 65528, 65529, 65531, 65532, 65533
+    ],
+    "1/29/0": [
+      {
+        "0": 266,
+        "1": 2
+      }
+    ],
+    "1/29/1": [3, 4, 6, 29, 2820, 336264194, 336264195],
+    "1/29/2": [],
+    "1/29/3": [],
+    "1/29/65532": 0,
+    "1/29/65533": 2,
+    "1/29/65528": [],
+    "1/29/65529": [],
+    "1/29/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "1/2820/0": 9,
+    "1/2820/1285": 2170,
+    "1/2820/1288": 592,
+    "1/2820/1291": 560,
+    "1/2820/1536": 1,
+    "1/2820/1537": 10,
+    "1/2820/1538": 1,
+    "1/2820/1539": 1000,
+    "1/2820/1540": 1,
+    "1/2820/1541": 8,
+    "1/2820/2049": 2530,
+    "1/2820/2050": 16300,
+    "1/2820/65532": 0,
+    "1/2820/65533": 3,
+    "1/2820/65528": [],
+    "1/2820/65529": [],
+    "1/2820/65531": [
+      0, 1285, 1288, 1291, 1536, 1537, 1538, 1539, 1540, 1541, 2049, 2050,
+      65528, 65529, 65531, 65532, 65533
+    ],
+    "1/336264194/336199680": 44,
+    "1/336264194/336199681": 0,
+    "1/336264194/336199682": 0,
+    "1/336264194/336199698": 70,
+    "1/336264194/65532": 0,
+    "1/336264194/65533": 1,
+    "1/336264194/65528": [],
+    "1/336264194/65529": [],
+    "1/336264194/65531": [
+      65528, 65529, 65531, 336199680, 336199681, 336199682, 336199698, 65532,
+      65533
+    ],
+    "1/336264195/336199680": 0,
+    "1/336264195/65532": 0,
+    "1/336264195/65533": 1,
+    "1/336264195/65528": [],
+    "1/336264195/65529": [],
+    "1/336264195/65531": [65528, 65529, 65531, 336199680, 65532, 65533]
+  },
+  "attribute_subscriptions": []
+}
diff --git a/tests/components/matter/snapshots/test_binary_sensor.ambr b/tests/components/matter/snapshots/test_binary_sensor.ambr
index 82dcc166f13..c8de905d03f 100644
--- a/tests/components/matter/snapshots/test_binary_sensor.ambr
+++ b/tests/components/matter/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -194,6 +198,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -241,6 +246,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -288,6 +294,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -335,6 +342,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -382,6 +390,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -429,6 +438,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -476,6 +486,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -523,6 +534,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -569,6 +581,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -616,6 +629,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/matter/snapshots/test_button.ambr b/tests/components/matter/snapshots/test_button.ambr
index bcba0da808e..448136eeed2 100644
--- a/tests/components/matter/snapshots/test_button.ambr
+++ b/tests/components/matter/snapshots/test_button.ambr
@@ -1,239 +1,4 @@
 # serializer version: 1
-# name: test_buttons[air_purifier][button.air_purifier_identify_1-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.air_purifier_identify_1',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify (1)',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-000000000000008F-MatterNodeDevice-1-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[air_purifier][button.air_purifier_identify_1-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Air Purifier Identify (1)',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.air_purifier_identify_1',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[air_purifier][button.air_purifier_identify_2-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.air_purifier_identify_2',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify (2)',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-000000000000008F-MatterNodeDevice-2-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[air_purifier][button.air_purifier_identify_2-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Air Purifier Identify (2)',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.air_purifier_identify_2',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[air_purifier][button.air_purifier_identify_3-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.air_purifier_identify_3',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify (3)',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-000000000000008F-MatterNodeDevice-3-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[air_purifier][button.air_purifier_identify_3-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Air Purifier Identify (3)',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.air_purifier_identify_3',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[air_purifier][button.air_purifier_identify_4-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.air_purifier_identify_4',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify (4)',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-000000000000008F-MatterNodeDevice-4-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[air_purifier][button.air_purifier_identify_4-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Air Purifier Identify (4)',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.air_purifier_identify_4',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[air_purifier][button.air_purifier_identify_5-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.air_purifier_identify_5',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify (5)',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-000000000000008F-MatterNodeDevice-5-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[air_purifier][button.air_purifier_identify_5-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Air Purifier Identify (5)',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.air_purifier_identify_5',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
 # name: test_buttons[air_purifier][button.air_purifier_reset_filter_condition-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -241,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -287,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -326,53 +93,6 @@
     'state': 'unknown',
   })
 # ---
-# name: test_buttons[air_quality_sensor][button.lightfi_aq1_air_quality_sensor_identify-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.lightfi_aq1_air_quality_sensor_identify',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[air_quality_sensor][button.lightfi_aq1_air_quality_sensor_identify-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'lightfi-aq1-air-quality-sensor Identify',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.lightfi_aq1_air_quality_sensor_identify',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
 # name: test_buttons[color_temperature_light][button.mock_color_temperature_light_identify-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -380,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -402,7 +123,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -427,6 +148,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -449,7 +171,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000024-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-0000000000000024-MatterNodeDevice-1-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -467,100 +189,6 @@
     'state': 'unknown',
   })
 # ---
-# name: test_buttons[door_lock][button.mock_door_lock_identify-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.mock_door_lock_identify',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[door_lock][button.mock_door_lock_identify-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Mock Door Lock Identify',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.mock_door_lock_identify',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[door_lock_with_unbolt][button.mock_door_lock_identify-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.mock_door_lock_identify',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[door_lock_with_unbolt][button.mock_door_lock_identify-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Mock Door Lock Identify',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.mock_door_lock_identify',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
 # name: test_buttons[eve_contact_sensor][button.eve_door_identify-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -568,6 +196,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -590,7 +219,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -615,6 +244,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -637,7 +267,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000053-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-0000000000000053-MatterNodeDevice-1-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -662,6 +292,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -684,7 +315,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-00000000000000B7-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-00000000000000B7-MatterNodeDevice-1-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -709,6 +340,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -731,7 +363,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000021-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-0000000000000021-MatterNodeDevice-1-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -756,6 +388,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -778,7 +411,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -803,6 +436,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -825,7 +459,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-2-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-2-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -850,6 +484,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -872,7 +507,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -897,6 +532,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -919,7 +555,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -937,335 +573,6 @@
     'state': 'unknown',
   })
 # ---
-# name: test_buttons[flow_sensor][button.mock_flow_sensor_identify-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.mock_flow_sensor_identify',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[flow_sensor][button.mock_flow_sensor_identify-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Mock Flow Sensor Identify',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.mock_flow_sensor_identify',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[generic_switch][button.mock_generic_switch_identify-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.mock_generic_switch_identify',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[generic_switch][button.mock_generic_switch_identify-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Mock Generic Switch Identify',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.mock_generic_switch_identify',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[generic_switch_multi][button.mock_generic_switch_fancy_button-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.mock_generic_switch_fancy_button',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Fancy Button',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-2-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[generic_switch_multi][button.mock_generic_switch_fancy_button-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Mock Generic Switch Fancy Button',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.mock_generic_switch_fancy_button',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[generic_switch_multi][button.mock_generic_switch_identify_1-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.mock_generic_switch_identify_1',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify (1)',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[generic_switch_multi][button.mock_generic_switch_identify_1-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Mock Generic Switch Identify (1)',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.mock_generic_switch_identify_1',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[humidity_sensor][button.mock_humidity_sensor_identify-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.mock_humidity_sensor_identify',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[humidity_sensor][button.mock_humidity_sensor_identify-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Mock Humidity Sensor Identify',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.mock_humidity_sensor_identify',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[light_sensor][button.mock_light_sensor_identify-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.mock_light_sensor_identify',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[light_sensor][button.mock_light_sensor_identify-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Mock Light Sensor Identify',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.mock_light_sensor_identify',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[microwave_oven][button.microwave_oven_identify-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.microwave_oven_identify',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-000000000000009D-MatterNodeDevice-1-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[microwave_oven][button.microwave_oven_identify-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Microwave Oven Identify',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.microwave_oven_identify',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
 # name: test_buttons[microwave_oven][button.microwave_oven_pause-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -1273,6 +580,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1319,6 +627,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1365,6 +674,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1411,6 +721,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1457,6 +768,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1479,7 +791,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-00000000000000C5-MatterNodeDevice-5-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-00000000000000C5-MatterNodeDevice-5-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -1504,6 +816,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1526,7 +839,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-00000000000000C5-MatterNodeDevice-4-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-00000000000000C5-MatterNodeDevice-4-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -1551,6 +864,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1573,7 +887,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-00000000000000C5-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-00000000000000C5-MatterNodeDevice-1-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -1598,6 +912,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1620,7 +935,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-00000000000000C5-MatterNodeDevice-2-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-00000000000000C5-MatterNodeDevice-2-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -1645,6 +960,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1667,7 +983,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-00000000000000C5-MatterNodeDevice-6-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-00000000000000C5-MatterNodeDevice-6-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -1692,6 +1008,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1714,7 +1031,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-00000000000000C5-MatterNodeDevice-3-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-00000000000000C5-MatterNodeDevice-3-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -1739,6 +1056,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1761,7 +1079,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -1786,6 +1104,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1808,7 +1127,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -1826,147 +1145,6 @@
     'state': 'unknown',
   })
 # ---
-# name: test_buttons[onoff_light][button.mock_onoff_light_identify-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.mock_onoff_light_identify',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[onoff_light][button.mock_onoff_light_identify-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Mock OnOff Light Identify',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.mock_onoff_light_identify',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[onoff_light_alt_name][button.mock_onoff_light_identify-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.mock_onoff_light_identify',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[onoff_light_alt_name][button.mock_onoff_light_identify-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Mock OnOff Light Identify',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.mock_onoff_light_identify',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[onoff_light_no_name][button.mock_light_identify-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.mock_light_identify',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[onoff_light_no_name][button.mock_light_identify-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Mock Light Identify',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.mock_light_identify',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
 # name: test_buttons[onoff_light_with_levelcontrol_present][button.d215s_identify-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -1974,6 +1152,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1996,7 +1175,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000008-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-0000000000000008-MatterNodeDevice-1-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -2014,147 +1193,6 @@
     'state': 'unknown',
   })
 # ---
-# name: test_buttons[pressure_sensor][button.mock_pressure_sensor_identify-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.mock_pressure_sensor_identify',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[pressure_sensor][button.mock_pressure_sensor_identify-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Mock Pressure Sensor Identify',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.mock_pressure_sensor_identify',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[room_airconditioner][button.room_airconditioner_identify_1-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.room_airconditioner_identify_1',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify (1)',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000024-MatterNodeDevice-1-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[room_airconditioner][button.room_airconditioner_identify_1-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Room AirConditioner Identify (1)',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.room_airconditioner_identify_1',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[room_airconditioner][button.room_airconditioner_identify_2-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.room_airconditioner_identify_2',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify (2)',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000024-MatterNodeDevice-2-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[room_airconditioner][button.room_airconditioner_identify_2-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Room AirConditioner Identify (2)',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.room_airconditioner_identify_2',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
 # name: test_buttons[silabs_dishwasher][button.dishwasher_identify-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -2162,6 +1200,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2184,7 +1223,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000036-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-0000000000000036-MatterNodeDevice-1-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -2209,6 +1248,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2255,6 +1295,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2301,6 +1342,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2347,6 +1389,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2369,7 +1412,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -2394,6 +1437,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2440,6 +1484,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2486,6 +1531,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2532,6 +1578,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2578,6 +1625,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2600,7 +1648,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -2625,6 +1673,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2647,7 +1696,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -2672,6 +1721,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2694,7 +1744,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-0-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -2719,6 +1769,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2741,7 +1792,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -2759,147 +1810,6 @@
     'state': 'unknown',
   })
 # ---
-# name: test_buttons[valve][button.valve_identify-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.valve_identify',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-000000000000004B-MatterNodeDevice-1-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[valve][button.valve_identify-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Valve Identify',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.valve_identify',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[window_covering_full][button.mock_full_window_covering_identify-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.mock_full_window_covering_identify',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000032-MatterNodeDevice-1-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[window_covering_full][button.mock_full_window_covering_identify-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Mock Full Window Covering Identify',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.mock_full_window_covering_identify',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[window_covering_lift][button.mock_lift_window_covering_identify-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.mock_lift_window_covering_identify',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000032-MatterNodeDevice-1-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[window_covering_lift][button.mock_lift_window_covering_identify-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Mock Lift Window Covering Identify',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.mock_lift_window_covering_identify',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
 # name: test_buttons[window_covering_pa_lift][button.longan_link_wncv_da01_identify-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -2907,6 +1817,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2929,7 +1840,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
@@ -2947,19 +1858,20 @@
     'state': 'unknown',
   })
 # ---
-# name: test_buttons[window_covering_pa_tilt][button.mock_pa_tilt_window_covering_identify-entry]
+# name: test_buttons[yandex_smart_socket][button.yndx_00540_identify-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'button',
     'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.mock_pa_tilt_window_covering_identify',
+    'entity_id': 'button.yndx_00540_identify',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -2976,65 +1888,18 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000032-MatterNodeDevice-1-IdentifyButton-3-65529',
+    'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-IdentifyButton-3-1',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_buttons[window_covering_pa_tilt][button.mock_pa_tilt_window_covering_identify-state]
+# name: test_buttons[yandex_smart_socket][button.yndx_00540_identify-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'identify',
-      'friendly_name': 'Mock PA Tilt Window Covering Identify',
+      'friendly_name': 'YNDX-00540 Identify',
     }),
     'context': <ANY>,
-    'entity_id': 'button.mock_pa_tilt_window_covering_identify',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[window_covering_tilt][button.mock_tilt_window_covering_identify-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'button.mock_tilt_window_covering_identify',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-    'original_icon': None,
-    'original_name': 'Identify',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000032-MatterNodeDevice-1-IdentifyButton-3-65529',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[window_covering_tilt][button.mock_tilt_window_covering_identify-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'identify',
-      'friendly_name': 'Mock Tilt Window Covering Identify',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.mock_tilt_window_covering_identify',
+    'entity_id': 'button.yndx_00540_identify',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
diff --git a/tests/components/matter/snapshots/test_climate.ambr b/tests/components/matter/snapshots/test_climate.ambr
index 25f5ca06f62..8aeb1aaafdd 100644
--- a/tests/components/matter/snapshots/test_climate.ambr
+++ b/tests/components/matter/snapshots/test_climate.ambr
@@ -13,6 +13,7 @@
       'min_temp': 5.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -75,6 +76,7 @@
       'min_temp': 10.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -141,6 +143,7 @@
       'min_temp': 16.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -209,6 +212,7 @@
       'min_temp': 7,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/matter/snapshots/test_cover.ambr b/tests/components/matter/snapshots/test_cover.ambr
index 7d036d35983..c83dcf63c6b 100644
--- a/tests/components/matter/snapshots/test_cover.ambr
+++ b/tests/components/matter/snapshots/test_cover.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -56,6 +57,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -104,6 +106,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -153,6 +156,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -202,6 +206,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/matter/snapshots/test_event.ambr b/tests/components/matter/snapshots/test_event.ambr
index 031e8e9d24f..b0ddfaed8bf 100644
--- a/tests/components/matter/snapshots/test_event.ambr
+++ b/tests/components/matter/snapshots/test_event.ambr
@@ -13,6 +13,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -74,6 +75,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -135,6 +137,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -199,6 +202,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -266,6 +270,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -333,6 +338,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/matter/snapshots/test_fan.ambr b/tests/components/matter/snapshots/test_fan.ambr
index 7f1fe7d42db..e4dc14967e5 100644
--- a/tests/components/matter/snapshots/test_fan.ambr
+++ b/tests/components/matter/snapshots/test_fan.ambr
@@ -15,6 +15,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -84,6 +85,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +152,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -214,6 +217,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/matter/snapshots/test_light.ambr b/tests/components/matter/snapshots/test_light.ambr
index eff5820d27d..a56f8f891e9 100644
--- a/tests/components/matter/snapshots/test_light.ambr
+++ b/tests/components/matter/snapshots/test_light.ambr
@@ -14,6 +14,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -89,6 +90,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -145,6 +147,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -207,6 +210,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -284,6 +288,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -346,6 +351,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -413,6 +419,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -474,6 +481,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -547,6 +555,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -614,6 +623,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/matter/snapshots/test_lock.ambr b/tests/components/matter/snapshots/test_lock.ambr
index bf34ac267d7..10ba84dd49b 100644
--- a/tests/components/matter/snapshots/test_lock.ambr
+++ b/tests/components/matter/snapshots/test_lock.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/matter/snapshots/test_number.ambr b/tests/components/matter/snapshots/test_number.ambr
index 7e06b6f501d..d777b9d48d0 100644
--- a/tests/components/matter/snapshots/test_number.ambr
+++ b/tests/components/matter/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -66,6 +67,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -122,6 +124,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -177,6 +180,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -233,6 +237,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -289,6 +294,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -344,6 +350,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -394,12 +401,13 @@
     }),
     'area_id': None,
     'capabilities': dict({
-      'max': 25,
-      'min': -25,
+      'max': 50,
+      'min': -50,
       'mode': <NumberMode.BOX: 'box'>,
       'step': 0.5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -431,8 +439,8 @@
     'attributes': ReadOnlyDict({
       'device_class': 'temperature',
       'friendly_name': 'Eve Thermo Temperature offset',
-      'max': 25,
-      'min': -25,
+      'max': 50,
+      'min': -50,
       'mode': <NumberMode.BOX: 'box'>,
       'step': 0.5,
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
@@ -457,6 +465,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -514,6 +523,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -569,6 +579,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -625,6 +636,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -680,6 +692,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -735,6 +748,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -791,6 +805,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -847,6 +862,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -903,6 +919,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -958,6 +975,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1014,6 +1032,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1070,6 +1089,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1126,6 +1146,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1181,6 +1202,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1237,6 +1259,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1293,6 +1316,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1349,6 +1373,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1404,6 +1429,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1460,6 +1486,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1516,6 +1543,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1571,6 +1599,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/matter/snapshots/test_select.ambr b/tests/components/matter/snapshots/test_select.ambr
index 19a90503086..772ee297e13 100644
--- a/tests/components/matter/snapshots/test_select.ambr
+++ b/tests/components/matter/snapshots/test_select.ambr
@@ -12,6 +12,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -70,6 +71,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -138,6 +140,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -206,6 +209,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -265,6 +269,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -324,6 +329,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -383,6 +389,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -442,6 +449,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -501,6 +509,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -558,6 +567,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -614,6 +624,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -672,6 +683,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -729,6 +741,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -797,6 +810,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -876,6 +890,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -944,6 +959,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1003,6 +1019,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1060,6 +1077,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1115,6 +1133,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1175,6 +1194,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1237,6 +1257,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1296,6 +1317,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1355,6 +1377,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1414,6 +1437,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1473,6 +1497,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1518,22 +1543,25 @@
     'state': 'previous',
   })
 # ---
-# name: test_selects[silabs_dishwasher][select.dishwasher_mode-entry]
+# name: test_selects[silabs_laundrywasher][select.laundrywasher_number_of_rinses-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
     'area_id': None,
     'capabilities': dict({
       'options': list([
+        'off',
+        'normal',
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'select',
     'entity_category': None,
-    'entity_id': 'select.dishwasher_mode',
+    'entity_id': 'select.laundrywasher_number_of_rinses',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -1545,46 +1573,53 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': 'Mode',
+    'original_name': 'Number of rinses',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': 'mode',
-    'unique_id': '00000000000004D2-0000000000000036-MatterNodeDevice-1-MatterDishwasherMode-89-1',
+    'translation_key': 'laundry_washer_number_of_rinses',
+    'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-MatterLaundryWasherNumberOfRinses-83-2',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_selects[silabs_dishwasher][select.dishwasher_mode-state]
+# name: test_selects[silabs_laundrywasher][select.laundrywasher_number_of_rinses-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Dishwasher Mode',
+      'friendly_name': 'LaundryWasher Number of rinses',
       'options': list([
+        'off',
+        'normal',
       ]),
     }),
     'context': <ANY>,
-    'entity_id': 'select.dishwasher_mode',
+    'entity_id': 'select.laundrywasher_number_of_rinses',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'unknown',
+    'state': 'off',
   })
 # ---
-# name: test_selects[silabs_laundrywasher][select.laundrywasher_mode-entry]
+# name: test_selects[silabs_laundrywasher][select.laundrywasher_spin_speed-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
     'area_id': None,
     'capabilities': dict({
       'options': list([
+        'Off',
+        'Low',
+        'Medium',
+        'High',
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'select',
     'entity_category': None,
-    'entity_id': 'select.laundrywasher_mode',
+    'entity_id': 'select.laundrywasher_spin_speed',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -1596,28 +1631,32 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': 'Mode',
+    'original_name': 'Spin speed',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': 'mode',
-    'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-MatterLaundryWasherMode-81-1',
+    'translation_key': 'laundry_washer_spin_speed',
+    'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-LaundryWasherControlsSpinSpeed-83-1',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_selects[silabs_laundrywasher][select.laundrywasher_mode-state]
+# name: test_selects[silabs_laundrywasher][select.laundrywasher_spin_speed-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'LaundryWasher Mode',
+      'friendly_name': 'LaundryWasher Spin speed',
       'options': list([
+        'Off',
+        'Low',
+        'Medium',
+        'High',
       ]),
     }),
     'context': <ANY>,
-    'entity_id': 'select.laundrywasher_mode',
+    'entity_id': 'select.laundrywasher_spin_speed',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'unknown',
+    'state': 'Off',
   })
 # ---
 # name: test_selects[silabs_laundrywasher][select.laundrywasher_temperature_level-entry]
@@ -1633,6 +1672,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1691,6 +1731,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1748,6 +1789,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1806,6 +1848,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1852,3 +1895,63 @@
     'state': 'Quick',
   })
 # ---
+# name: test_selects[yandex_smart_socket][select.yndx_00540_power_on_behavior_on_startup-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'on',
+        'off',
+        'toggle',
+        'previous',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'select',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'select.yndx_00540_power_on_behavior_on_startup',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Power-on behavior on startup',
+    'platform': 'matter',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'startup_on_off',
+    'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-MatterStartUpOnOff-6-16387',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_selects[yandex_smart_socket][select.yndx_00540_power_on_behavior_on_startup-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'YNDX-00540 Power-on behavior on startup',
+      'options': list([
+        'on',
+        'off',
+        'toggle',
+        'previous',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'select.yndx_00540_power_on_behavior_on_startup',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
diff --git a/tests/components/matter/snapshots/test_sensor.ambr b/tests/components/matter/snapshots/test_sensor.ambr
index 205cba68d7c..9caa84bbf96 100644
--- a/tests/components/matter/snapshots/test_sensor.ambr
+++ b/tests/components/matter/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -65,6 +66,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -122,6 +124,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -173,6 +176,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -224,6 +228,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -274,6 +279,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -325,6 +331,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -376,6 +383,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -427,6 +435,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -478,6 +487,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -529,6 +539,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -580,6 +591,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -622,6 +634,58 @@
     'state': '20.0',
   })
 # ---
+# name: test_sensors[air_purifier][sensor.air_purifier_temperature_2-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.air_purifier_temperature_2',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'matter',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '00000000000004D2-000000000000008F-MatterNodeDevice-5-ThermostatLocalTemperature-513-0',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_sensors[air_purifier][sensor.air_purifier_temperature_2-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Air Purifier Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.air_purifier_temperature_2',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '20.0',
+  })
+# ---
 # name: test_sensors[air_purifier][sensor.air_purifier_vocs-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -631,6 +695,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -689,6 +754,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -746,6 +812,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -797,6 +864,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -848,6 +916,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -899,6 +968,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -950,6 +1020,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1001,6 +1072,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1052,6 +1124,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1103,6 +1176,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1154,6 +1228,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1205,6 +1280,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1259,6 +1335,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1313,6 +1390,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1367,6 +1445,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1421,6 +1500,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1475,6 +1555,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1532,6 +1613,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1589,6 +1671,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1646,6 +1729,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1703,6 +1787,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1745,6 +1830,58 @@
     'state': '100',
   })
 # ---
+# name: test_sensors[eve_thermo][sensor.eve_thermo_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.eve_thermo_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'matter',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '00000000000004D2-0000000000000021-MatterNodeDevice-1-ThermostatLocalTemperature-513-0',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_sensors[eve_thermo][sensor.eve_thermo_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Eve Thermo Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.eve_thermo_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '21.0',
+  })
+# ---
 # name: test_sensors[eve_thermo][sensor.eve_thermo_valve_position-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -1752,6 +1889,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1801,6 +1939,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1855,6 +1994,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1906,6 +2046,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1957,6 +2098,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2011,6 +2153,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2062,6 +2205,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2116,6 +2260,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2166,6 +2311,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2217,6 +2363,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2273,6 +2420,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2328,6 +2476,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2379,6 +2528,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2430,6 +2580,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2487,6 +2638,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2550,6 +2702,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2606,6 +2759,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2663,6 +2817,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2720,6 +2875,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2768,6 +2924,65 @@
     'state': '0.0',
   })
 # ---
+# name: test_sensors[silabs_laundrywasher][sensor.laundrywasher_current_phase-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'pre-soak',
+        'rinse',
+        'spin',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.laundrywasher_current_phase',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Current phase',
+    'platform': 'matter',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'current_phase',
+    'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-OperationalStateCurrentPhase-96-1',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensors[silabs_laundrywasher][sensor.laundrywasher_current_phase-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'LaundryWasher Current phase',
+      'options': list([
+        'pre-soak',
+        'rinse',
+        'spin',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.laundrywasher_current_phase',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'pre-soak',
+  })
+# ---
 # name: test_sensors[silabs_laundrywasher][sensor.laundrywasher_energy-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -2777,6 +2992,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2839,6 +3055,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2894,6 +3111,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2951,6 +3169,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3008,6 +3227,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3057,6 +3277,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3105,6 +3326,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3159,6 +3381,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3201,3 +3424,287 @@
     'state': '21.0',
   })
 # ---
+# name: test_sensors[thermostat][sensor.longan_link_hvac_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.longan_link_hvac_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'matter',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-ThermostatLocalTemperature-513-0',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_sensors[thermostat][sensor.longan_link_hvac_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Longan link HVAC Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.longan_link_hvac_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '28.3',
+  })
+# ---
+# name: test_sensors[vacuum_cleaner][sensor.mock_vacuum_operational_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'stopped',
+        'running',
+        'paused',
+        'error',
+        'seeking_charger',
+        'charging',
+        'docked',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.mock_vacuum_operational_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Operational state',
+    'platform': 'matter',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'operational_state',
+    'unique_id': '00000000000004D2-0000000000000042-MatterNodeDevice-1-RvcOperationalState-97-4',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensors[vacuum_cleaner][sensor.mock_vacuum_operational_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Mock Vacuum Operational state',
+      'options': list([
+        'stopped',
+        'running',
+        'paused',
+        'error',
+        'seeking_charger',
+        'charging',
+        'docked',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.mock_vacuum_operational_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_sensors[yandex_smart_socket][sensor.yndx_00540_current-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.yndx_00540_current',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.CURRENT: 'current'>,
+    'original_icon': None,
+    'original_name': 'Current',
+    'platform': 'matter',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-ElectricalMeasurementRmsCurrent-2820-1288',
+    'unit_of_measurement': <UnitOfElectricCurrent.AMPERE: 'A'>,
+  })
+# ---
+# name: test_sensors[yandex_smart_socket][sensor.yndx_00540_current-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'current',
+      'friendly_name': 'YNDX-00540 Current',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricCurrent.AMPERE: 'A'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.yndx_00540_current',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.59',
+  })
+# ---
+# name: test_sensors[yandex_smart_socket][sensor.yndx_00540_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.yndx_00540_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'matter',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-ElectricalMeasurementActivePower-2820-1291',
+    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+  })
+# ---
+# name: test_sensors[yandex_smart_socket][sensor.yndx_00540_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'YNDX-00540 Power',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.yndx_00540_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '70.0',
+  })
+# ---
+# name: test_sensors[yandex_smart_socket][sensor.yndx_00540_voltage-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.yndx_00540_voltage',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 0,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Voltage',
+    'platform': 'matter',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-ElectricalMeasurementRmsVoltage-2820-1285',
+    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+  })
+# ---
+# name: test_sensors[yandex_smart_socket][sensor.yndx_00540_voltage-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'friendly_name': 'YNDX-00540 Voltage',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.yndx_00540_voltage',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '217.0',
+  })
+# ---
diff --git a/tests/components/matter/snapshots/test_switch.ambr b/tests/components/matter/snapshots/test_switch.ambr
index 612e81580a5..ebf43117846 100644
--- a/tests/components/matter/snapshots/test_switch.ambr
+++ b/tests/components/matter/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -194,6 +198,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -240,6 +245,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -287,6 +293,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -334,6 +341,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -381,6 +389,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -421,3 +430,51 @@
     'state': 'on',
   })
 # ---
+# name: test_switches[yandex_smart_socket][switch.yndx_00540-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.yndx_00540',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SwitchDeviceClass.OUTLET: 'outlet'>,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'matter',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-MatterPlug-6-0',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_switches[yandex_smart_socket][switch.yndx_00540-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'outlet',
+      'friendly_name': 'YNDX-00540',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.yndx_00540',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
diff --git a/tests/components/matter/snapshots/test_vacuum.ambr b/tests/components/matter/snapshots/test_vacuum.ambr
index 9e6b52ed572..0703a1af4c7 100644
--- a/tests/components/matter/snapshots/test_vacuum.ambr
+++ b/tests/components/matter/snapshots/test_vacuum.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/matter/snapshots/test_valve.ambr b/tests/components/matter/snapshots/test_valve.ambr
index 98634635476..99da4c2d0f6 100644
--- a/tests/components/matter/snapshots/test_valve.ambr
+++ b/tests/components/matter/snapshots/test_valve.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/matter/test_init.py b/tests/components/matter/test_init.py
index f6576689413..553358f12e3 100644
--- a/tests/components/matter/test_init.py
+++ b/tests/components/matter/test_init.py
@@ -502,7 +502,7 @@ async def test_issue_registry_invalid_version(
     ("stop_addon_side_effect", "entry_state"),
     [
         (None, ConfigEntryState.NOT_LOADED),
-        (SupervisorError("Boom"), ConfigEntryState.LOADED),
+        (SupervisorError("Boom"), ConfigEntryState.FAILED_UNLOAD),
     ],
 )
 async def test_stop_addon(
diff --git a/tests/components/matter/test_lock.py b/tests/components/matter/test_lock.py
index 7bcfd381d6c..bb03b296fc6 100644
--- a/tests/components/matter/test_lock.py
+++ b/tests/components/matter/test_lock.py
@@ -11,7 +11,7 @@ from homeassistant.components.lock import LockEntityFeature, LockState
 from homeassistant.const import ATTR_CODE, STATE_UNKNOWN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from .common import (
     set_node_attribute,
diff --git a/tests/components/matter/test_number.py b/tests/components/matter/test_number.py
index 86e1fbbf419..2a4eea1c324 100644
--- a/tests/components/matter/test_number.py
+++ b/tests/components/matter/test_number.py
@@ -4,12 +4,14 @@ from unittest.mock import MagicMock, call
 
 from matter_server.client.models.node import MatterNode
 from matter_server.common import custom_clusters
+from matter_server.common.errors import MatterError
 from matter_server.common.helpers.util import create_attribute_path_from_attribute
 import pytest
 from syrupy import SnapshotAssertion
 
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
 
 from .common import (
@@ -97,3 +99,25 @@ async def test_eve_weather_sensor_altitude(
         ),
         value=500,
     )
+
+
+@pytest.mark.parametrize("node_fixture", ["dimmable_light"])
+async def test_matter_exception_on_write_attribute(
+    hass: HomeAssistant,
+    matter_client: MagicMock,
+    matter_node: MatterNode,
+) -> None:
+    """Test if a MatterError gets converted to HomeAssistantError by using a dimmable_light fixture."""
+    state = hass.states.get("number.mock_dimmable_light_on_level")
+    assert state
+    matter_client.write_attribute.side_effect = MatterError("Boom")
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            "number",
+            "set_value",
+            {
+                "entity_id": "number.mock_dimmable_light_on_level",
+                "value": 500,
+            },
+            blocking=True,
+        )
diff --git a/tests/components/matter/test_select.py b/tests/components/matter/test_select.py
index 3643aa83fca..2403b4b1623 100644
--- a/tests/components/matter/test_select.py
+++ b/tests/components/matter/test_select.py
@@ -4,6 +4,7 @@ from unittest.mock import MagicMock, call
 
 from chip.clusters import Objects as clusters
 from matter_server.client.models.node import MatterNode
+from matter_server.common.helpers.util import create_attribute_path_from_attribute
 import pytest
 from syrupy import SnapshotAssertion
 
@@ -144,3 +145,56 @@ async def test_list_select_entities(
     await trigger_subscription_callback(hass, matter_client)
     state = hass.states.get("select.laundrywasher_temperature_level")
     assert state.state == "unknown"
+
+    # SpinSpeedCurrent
+    matter_client.write_attribute.reset_mock()
+    state = hass.states.get("select.laundrywasher_spin_speed")
+    assert state
+    assert state.state == "Off"
+    assert state.attributes["options"] == ["Off", "Low", "Medium", "High"]
+    set_node_attribute(matter_node, 1, 83, 1, 3)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("select.laundrywasher_spin_speed")
+    assert state.state == "High"
+    # test select option
+    await hass.services.async_call(
+        "select",
+        "select_option",
+        {
+            "entity_id": "select.laundrywasher_spin_speed",
+            "option": "High",
+        },
+        blocking=True,
+    )
+    assert matter_client.write_attribute.call_count == 1
+    assert matter_client.write_attribute.call_args == call(
+        node_id=matter_node.node_id,
+        attribute_path=create_attribute_path_from_attribute(
+            endpoint_id=1,
+            attribute=clusters.LaundryWasherControls.Attributes.SpinSpeedCurrent,
+        ),
+        value=3,
+    )
+    # test that an invalid value (e.g. 253) leads to an unknown state
+    set_node_attribute(matter_node, 1, 83, 1, 253)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("select.laundrywasher_spin_speed")
+    assert state.state == "unknown"
+
+
+@pytest.mark.parametrize("node_fixture", ["silabs_laundrywasher"])
+async def test_map_select_entities(
+    hass: HomeAssistant,
+    matter_client: MagicMock,
+    matter_node: MatterNode,
+) -> None:
+    """Test MatterMapSelectEntity entities are discovered and working from a laundrywasher fixture."""
+    # NumberOfRinses
+    state = hass.states.get("select.laundrywasher_number_of_rinses")
+    assert state
+    assert state.state == "off"
+    assert state.attributes["options"] == ["off", "normal"]
+    set_node_attribute(matter_node, 1, 83, 2, 1)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("select.laundrywasher_number_of_rinses")
+    assert state.state == "normal"
diff --git a/tests/components/matter/test_sensor.py b/tests/components/matter/test_sensor.py
index 630809a957d..251aab73e3b 100644
--- a/tests/components/matter/test_sensor.py
+++ b/tests/components/matter/test_sensor.py
@@ -219,6 +219,18 @@ async def test_eve_thermo_sensor(
     assert state
     assert state.state == "0"
 
+    # LocalTemperature
+    state = hass.states.get("sensor.eve_thermo_temperature")
+    assert state
+    assert state.state == "21.0"
+
+    set_node_attribute(matter_node, 1, 513, 0, 1800)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get("sensor.eve_thermo_temperature")
+    assert state
+    assert state.state == "18.0"
+
 
 @pytest.mark.parametrize("node_fixture", ["pressure_sensor"])
 async def test_pressure_sensor(
@@ -320,7 +332,7 @@ async def test_operational_state_sensor(
     matter_client: MagicMock,
     matter_node: MatterNode,
 ) -> None:
-    """Test dishwasher sensor."""
+    """Test Operational State sensor, using a dishwasher fixture."""
     # OperationalState Cluster / OperationalState attribute (1/96/4)
     state = hass.states.get("sensor.dishwasher_operational_state")
     assert state
@@ -339,3 +351,51 @@ async def test_operational_state_sensor(
     state = hass.states.get("sensor.dishwasher_operational_state")
     assert state
     assert state.state == "extra_state"
+
+
+@pytest.mark.parametrize("node_fixture", ["yandex_smart_socket"])
+async def test_draft_electrical_measurement_sensor(
+    hass: HomeAssistant,
+    matter_client: MagicMock,
+    matter_node: MatterNode,
+) -> None:
+    """Test Draft Electrical Measurement cluster sensors, using Yandex Smart Socket fixture."""
+    state = hass.states.get("sensor.yndx_00540_power")
+    assert state
+    assert state.state == "70.0"
+
+    # AcPowerDivisor
+    set_node_attribute(matter_node, 1, 2820, 1541, 0)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get("sensor.yndx_00540_power")
+    assert state
+    assert state.state == "unknown"
+
+    # ActivePower
+    set_node_attribute(matter_node, 1, 2820, 1291, None)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get("sensor.yndx_00540_power")
+    assert state
+    assert state.state == "unknown"
+
+
+@pytest.mark.parametrize("node_fixture", ["silabs_laundrywasher"])
+async def test_list_sensor(
+    hass: HomeAssistant,
+    matter_client: MagicMock,
+    matter_node: MatterNode,
+) -> None:
+    """Test Matter List sensor."""
+    # OperationalState Cluster / CurrentPhase attribute (1/96/1)
+    state = hass.states.get("sensor.laundrywasher_current_phase")
+    assert state
+    assert state.state == "pre-soak"
+
+    set_node_attribute(matter_node, 1, 96, 1, 1)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get("sensor.laundrywasher_current_phase")
+    assert state
+    assert state.state == "rinse"
diff --git a/tests/components/matter/test_switch.py b/tests/components/matter/test_switch.py
index 11451c715c3..e82848fcc3a 100644
--- a/tests/components/matter/test_switch.py
+++ b/tests/components/matter/test_switch.py
@@ -4,12 +4,14 @@ from unittest.mock import MagicMock, call
 
 from chip.clusters import Objects as clusters
 from matter_server.client.models.node import MatterNode
+from matter_server.common.errors import MatterError
 from matter_server.common.helpers.util import create_attribute_path_from_attribute
 import pytest
 from syrupy import SnapshotAssertion
 
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
 
 from .common import (
@@ -165,3 +167,24 @@ async def test_numeric_switch(
         ),
         value=0,
     )
+
+
+@pytest.mark.parametrize("node_fixture", ["on_off_plugin_unit"])
+async def test_matter_exception_on_command(
+    hass: HomeAssistant,
+    matter_client: MagicMock,
+    matter_node: MatterNode,
+) -> None:
+    """Test if a MatterError gets converted to HomeAssistantError by using a switch fixture."""
+    state = hass.states.get("switch.mock_onoffpluginunit")
+    assert state
+    matter_client.send_device_command.side_effect = MatterError("Boom")
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            "switch",
+            "turn_on",
+            {
+                "entity_id": "switch.mock_onoffpluginunit",
+            },
+            blocking=True,
+        )
diff --git a/tests/components/mazda/test_init.py b/tests/components/mazda/test_init.py
index 5d15f01389b..b024c214888 100644
--- a/tests/components/mazda/test_init.py
+++ b/tests/components/mazda/test_init.py
@@ -1,7 +1,11 @@
 """Tests for the Mazda Connected Services integration."""
 
 from homeassistant.components.mazda import DOMAIN
-from homeassistant.config_entries import ConfigEntryState
+from homeassistant.config_entries import (
+    SOURCE_IGNORE,
+    ConfigEntryDisabler,
+    ConfigEntryState,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import issue_registry as ir
 
@@ -33,6 +37,28 @@ async def test_mazda_repair_issue(
     assert config_entry_2.state is ConfigEntryState.LOADED
     assert issue_registry.async_get_issue(DOMAIN, DOMAIN)
 
+    # Add an ignored entry
+    config_entry_3 = MockConfigEntry(
+        source=SOURCE_IGNORE,
+        domain=DOMAIN,
+    )
+    config_entry_3.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry_3.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry_3.state is ConfigEntryState.NOT_LOADED
+
+    # Add a disabled entry
+    config_entry_4 = MockConfigEntry(
+        disabled_by=ConfigEntryDisabler.USER,
+        domain=DOMAIN,
+    )
+    config_entry_4.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry_4.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry_4.state is ConfigEntryState.NOT_LOADED
+
     # Remove the first one
     await hass.config_entries.async_remove(config_entry_1.entry_id)
     await hass.async_block_till_done()
@@ -48,3 +74,6 @@ async def test_mazda_repair_issue(
     assert config_entry_1.state is ConfigEntryState.NOT_LOADED
     assert config_entry_2.state is ConfigEntryState.NOT_LOADED
     assert issue_registry.async_get_issue(DOMAIN, DOMAIN) is None
+
+    # Check the ignored and disabled entries are removed
+    assert not hass.config_entries.async_entries(DOMAIN)
diff --git a/tests/components/mcp/__init__.py b/tests/components/mcp/__init__.py
new file mode 100644
index 00000000000..e8e8635ab36
--- /dev/null
+++ b/tests/components/mcp/__init__.py
@@ -0,0 +1 @@
+"""Tests for the Model Context Protocol integration."""
diff --git a/tests/components/mcp/conftest.py b/tests/components/mcp/conftest.py
new file mode 100644
index 00000000000..d86603a12ed
--- /dev/null
+++ b/tests/components/mcp/conftest.py
@@ -0,0 +1,45 @@
+"""Common fixtures for the Model Context Protocol tests."""
+
+from collections.abc import Generator
+from unittest.mock import AsyncMock, patch
+
+import pytest
+
+from homeassistant.components.mcp.const import DOMAIN
+from homeassistant.const import CONF_URL
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+TEST_API_NAME = "Memory Server"
+
+
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.mcp.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
+@pytest.fixture
+def mock_mcp_client() -> Generator[AsyncMock]:
+    """Fixture to mock the MCP client."""
+    with (
+        patch("homeassistant.components.mcp.coordinator.sse_client"),
+        patch("homeassistant.components.mcp.coordinator.ClientSession") as mock_session,
+    ):
+        yield mock_session.return_value.__aenter__
+
+
+@pytest.fixture(name="config_entry")
+def mock_config_entry(hass: HomeAssistant) -> MockConfigEntry:
+    """Fixture to load the integration."""
+    config_entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={CONF_URL: "http://1.1.1.1/sse"},
+        title=TEST_API_NAME,
+    )
+    config_entry.add_to_hass(hass)
+    return config_entry
diff --git a/tests/components/mcp/test_config_flow.py b/tests/components/mcp/test_config_flow.py
new file mode 100644
index 00000000000..29733e653a6
--- /dev/null
+++ b/tests/components/mcp/test_config_flow.py
@@ -0,0 +1,234 @@
+"""Test the Model Context Protocol config flow."""
+
+from typing import Any
+from unittest.mock import AsyncMock, Mock
+
+import httpx
+import pytest
+
+from homeassistant import config_entries
+from homeassistant.components.mcp.const import DOMAIN
+from homeassistant.const import CONF_URL
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from .conftest import TEST_API_NAME
+
+from tests.common import MockConfigEntry
+
+
+async def test_form(
+    hass: HomeAssistant, mock_setup_entry: AsyncMock, mock_mcp_client: Mock
+) -> None:
+    """Test the complete configuration flow."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {}
+
+    response = Mock()
+    response.serverInfo.name = TEST_API_NAME
+    mock_mcp_client.return_value.initialize.return_value = response
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_URL: "http://1.1.1.1/sse",
+        },
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == TEST_API_NAME
+    assert result["data"] == {
+        CONF_URL: "http://1.1.1.1/sse",
+    }
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+@pytest.mark.parametrize(
+    ("side_effect", "expected_error"),
+    [
+        (httpx.TimeoutException("Some timeout"), "timeout_connect"),
+        (
+            httpx.HTTPStatusError("", request=None, response=httpx.Response(500)),
+            "cannot_connect",
+        ),
+        (httpx.HTTPError("Some HTTP error"), "cannot_connect"),
+        (Exception, "unknown"),
+    ],
+)
+async def test_form_mcp_client_error(
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_mcp_client: Mock,
+    side_effect: Exception,
+    expected_error: str,
+) -> None:
+    """Test we handle different client library errors."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    mock_mcp_client.side_effect = side_effect
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_URL: "http://1.1.1.1/sse",
+        },
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {"base": expected_error}
+
+    # Reset the error and make sure the config flow can resume successfully.
+    mock_mcp_client.side_effect = None
+    response = Mock()
+    response.serverInfo.name = TEST_API_NAME
+    mock_mcp_client.return_value.initialize.return_value = response
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_URL: "http://1.1.1.1/sse",
+        },
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == TEST_API_NAME
+    assert result["data"] == {
+        CONF_URL: "http://1.1.1.1/sse",
+    }
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+@pytest.mark.parametrize(
+    ("side_effect", "expected_error"),
+    [
+        (
+            httpx.HTTPStatusError("", request=None, response=httpx.Response(401)),
+            "invalid_auth",
+        ),
+    ],
+)
+async def test_form_mcp_client_error_abort(
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_mcp_client: Mock,
+    side_effect: Exception,
+    expected_error: str,
+) -> None:
+    """Test we handle different client library errors that end with an abort."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    mock_mcp_client.side_effect = side_effect
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_URL: "http://1.1.1.1/sse",
+        },
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == expected_error
+
+
+@pytest.mark.parametrize(
+    "user_input",
+    [
+        ({CONF_URL: "not a url"}),
+        ({CONF_URL: "rtsp://1.1.1.1"}),
+    ],
+)
+async def test_input_form_validation_error(
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_mcp_client: Mock,
+    user_input: dict[str, Any],
+) -> None:
+    """Test we handle invalid auth."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input,
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {CONF_URL: "invalid_url"}
+
+    # Reset the error and make sure the config flow can resume successfully.
+    response = Mock()
+    response.serverInfo.name = TEST_API_NAME
+    mock_mcp_client.return_value.initialize.return_value = response
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_URL: "http://1.1.1.1/sse",
+        },
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == TEST_API_NAME
+    assert result["data"] == {
+        CONF_URL: "http://1.1.1.1/sse",
+    }
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_unique_url(
+    hass: HomeAssistant, mock_setup_entry: AsyncMock, mock_mcp_client: Mock
+) -> None:
+    """Test that the same url cannot be configured twice."""
+    config_entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={CONF_URL: "http://1.1.1.1/sse"},
+        title=TEST_API_NAME,
+    )
+    config_entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {}
+
+    response = Mock()
+    response.serverInfo.name = TEST_API_NAME
+    mock_mcp_client.return_value.initialize.return_value = response
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_URL: "http://1.1.1.1/sse",
+        },
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+
+
+async def test_server_missing_capbilities(
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_mcp_client: Mock,
+) -> None:
+    """Test we handle different client library errors."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    response = Mock()
+    response.serverInfo.name = TEST_API_NAME
+    response.capabilities.tools = None
+    mock_mcp_client.return_value.initialize.return_value = response
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_URL: "http://1.1.1.1/sse",
+        },
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "missing_capabilities"
diff --git a/tests/components/mcp/test_init.py b/tests/components/mcp/test_init.py
new file mode 100644
index 00000000000..460df2c5785
--- /dev/null
+++ b/tests/components/mcp/test_init.py
@@ -0,0 +1,225 @@
+"""Tests for the Model Context Protocol component."""
+
+import re
+from unittest.mock import Mock, patch
+
+import httpx
+from mcp.types import CallToolResult, ListToolsResult, TextContent, Tool
+import pytest
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import Context, HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import llm
+
+from .conftest import TEST_API_NAME
+
+from tests.common import MockConfigEntry
+
+SEARCH_MEMORY_TOOL = Tool(
+    name="search_memory",
+    description="Search memory for relevant context based on a query.",
+    inputSchema={
+        "type": "object",
+        "required": ["query"],
+        "properties": {
+            "query": {
+                "type": "string",
+                "description": "A free text query to search context for.",
+            }
+        },
+    },
+)
+SAVE_MEMORY_TOOL = Tool(
+    name="save_memory",
+    description="Save a memory context.",
+    inputSchema={
+        "type": "object",
+        "required": ["context"],
+        "properties": {
+            "context": {
+                "type": "object",
+                "description": "The context to save.",
+                "properties": {
+                    "fact": {
+                        "type": "string",
+                        "description": "The key for the context.",
+                    },
+                },
+            },
+        },
+    },
+)
+
+
+def create_llm_context() -> llm.LLMContext:
+    """Create a test LLM context."""
+    return llm.LLMContext(
+        platform="test_platform",
+        context=Context(),
+        user_prompt="test_text",
+        language="*",
+        assistant="conversation",
+        device_id=None,
+    )
+
+
+async def test_init(
+    hass: HomeAssistant, config_entry: MockConfigEntry, mock_mcp_client: Mock
+) -> None:
+    """Test the integration is initialized and can be unloaded cleanly."""
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    await hass.config_entries.async_unload(config_entry.entry_id)
+    assert config_entry.state is ConfigEntryState.NOT_LOADED
+
+
+async def test_mcp_server_failure(
+    hass: HomeAssistant, config_entry: MockConfigEntry, mock_mcp_client: Mock
+) -> None:
+    """Test the integration fails to setup if the server fails initialization."""
+    mock_mcp_client.side_effect = httpx.HTTPStatusError(
+        "", request=None, response=httpx.Response(500)
+    )
+
+    with patch("homeassistant.components.mcp.coordinator.TIMEOUT", 1):
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        assert config_entry.state is ConfigEntryState.SETUP_RETRY
+
+
+async def test_list_tools_failure(
+    hass: HomeAssistant, config_entry: MockConfigEntry, mock_mcp_client: Mock
+) -> None:
+    """Test the integration fails to load if the first data fetch returns an error."""
+    mock_mcp_client.return_value.list_tools.side_effect = httpx.HTTPStatusError(
+        "", request=None, response=httpx.Response(500)
+    )
+
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    assert config_entry.state is ConfigEntryState.SETUP_RETRY
+
+
+async def test_llm_get_api_tools(
+    hass: HomeAssistant, config_entry: MockConfigEntry, mock_mcp_client: Mock
+) -> None:
+    """Test MCP tools are returned as LLM API tools."""
+    mock_mcp_client.return_value.list_tools.return_value = ListToolsResult(
+        tools=[SEARCH_MEMORY_TOOL, SAVE_MEMORY_TOOL],
+    )
+
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    apis = llm.async_get_apis(hass)
+    api = next(iter([api for api in apis if api.name == TEST_API_NAME]))
+    assert api
+
+    api_instance = await api.async_get_api_instance(create_llm_context())
+    assert len(api_instance.tools) == 2
+    tool = api_instance.tools[0]
+    assert tool.name == "search_memory"
+    assert tool.description == "Search memory for relevant context based on a query."
+    with pytest.raises(
+        vol.Invalid, match=re.escape("required key not provided @ data['query']")
+    ):
+        tool.parameters({})
+    assert tool.parameters({"query": "frogs"}) == {"query": "frogs"}
+
+    tool = api_instance.tools[1]
+    assert tool.name == "save_memory"
+    assert tool.description == "Save a memory context."
+    with pytest.raises(
+        vol.Invalid, match=re.escape("required key not provided @ data['context']")
+    ):
+        tool.parameters({})
+    assert tool.parameters({"context": {"fact": "User was born in February"}}) == {
+        "context": {"fact": "User was born in February"}
+    }
+
+
+async def test_call_tool(
+    hass: HomeAssistant, config_entry: MockConfigEntry, mock_mcp_client: Mock
+) -> None:
+    """Test calling an MCP Tool through the LLM API."""
+    mock_mcp_client.return_value.list_tools.return_value = ListToolsResult(
+        tools=[SEARCH_MEMORY_TOOL]
+    )
+
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    apis = llm.async_get_apis(hass)
+    api = next(iter([api for api in apis if api.name == TEST_API_NAME]))
+    assert api
+
+    api_instance = await api.async_get_api_instance(create_llm_context())
+    assert len(api_instance.tools) == 1
+    tool = api_instance.tools[0]
+    assert tool.name == "search_memory"
+
+    mock_mcp_client.return_value.call_tool.return_value = CallToolResult(
+        content=[TextContent(type="text", text="User was born in February")]
+    )
+    result = await tool.async_call(
+        hass,
+        llm.ToolInput(
+            tool_name="search_memory", tool_args={"query": "User's birth month"}
+        ),
+        create_llm_context(),
+    )
+    assert result == {
+        "content": [{"text": "User was born in February", "type": "text"}]
+    }
+
+
+async def test_call_tool_fails(
+    hass: HomeAssistant, config_entry: MockConfigEntry, mock_mcp_client: Mock
+) -> None:
+    """Test handling an MCP Tool call failure."""
+    mock_mcp_client.return_value.list_tools.return_value = ListToolsResult(
+        tools=[SEARCH_MEMORY_TOOL]
+    )
+
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    apis = llm.async_get_apis(hass)
+    api = next(iter([api for api in apis if api.name == TEST_API_NAME]))
+    assert api
+
+    api_instance = await api.async_get_api_instance(create_llm_context())
+    assert len(api_instance.tools) == 1
+    tool = api_instance.tools[0]
+    assert tool.name == "search_memory"
+
+    mock_mcp_client.return_value.call_tool.side_effect = httpx.HTTPStatusError(
+        "Server error", request=None, response=httpx.Response(500)
+    )
+    with pytest.raises(
+        HomeAssistantError, match="Error when calling tool: Server error"
+    ):
+        await tool.async_call(
+            hass,
+            llm.ToolInput(
+                tool_name="search_memory", tool_args={"query": "User's birth month"}
+            ),
+            create_llm_context(),
+        )
+
+
+async def test_convert_tool_schema_fails(
+    hass: HomeAssistant, config_entry: MockConfigEntry, mock_mcp_client: Mock
+) -> None:
+    """Test a failure converting an MCP tool schema to a Home Assistant schema."""
+    mock_mcp_client.return_value.list_tools.return_value = ListToolsResult(
+        tools=[SEARCH_MEMORY_TOOL]
+    )
+
+    with patch(
+        "homeassistant.components.mcp.coordinator.convert_to_voluptuous",
+        side_effect=ValueError,
+    ):
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        assert config_entry.state is ConfigEntryState.SETUP_RETRY
diff --git a/tests/components/mcp_server/conftest.py b/tests/components/mcp_server/conftest.py
index 149073f3645..b5e25d9fe50 100644
--- a/tests/components/mcp_server/conftest.py
+++ b/tests/components/mcp_server/conftest.py
@@ -22,13 +22,19 @@ def mock_setup_entry() -> Generator[AsyncMock]:
         yield mock_setup_entry
 
 
+@pytest.fixture(name="llm_hass_api")
+def llm_hass_api_fixture() -> str:
+    """Fixture for the config entry llm_hass_api."""
+    return llm.LLM_API_ASSIST
+
+
 @pytest.fixture(name="config_entry")
-def mock_config_entry(hass: HomeAssistant) -> MockConfigEntry:
+def mock_config_entry(hass: HomeAssistant, llm_hass_api: str) -> MockConfigEntry:
     """Fixture to load the integration."""
     config_entry = MockConfigEntry(
         domain=DOMAIN,
         data={
-            CONF_LLM_HASS_API: llm.LLM_API_ASSIST,
+            CONF_LLM_HASS_API: llm_hass_api,
         },
     )
     config_entry.add_to_hass(hass)
diff --git a/tests/components/mcp_server/test_http.py b/tests/components/mcp_server/test_http.py
index a71bf42acc8..70efd211b57 100644
--- a/tests/components/mcp_server/test_http.py
+++ b/tests/components/mcp_server/test_http.py
@@ -16,11 +16,17 @@ import pytest
 from homeassistant.components.conversation import DOMAIN as CONVERSATION_DOMAIN
 from homeassistant.components.homeassistant.exposed_entities import async_expose_entity
 from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN
+from homeassistant.components.mcp_server.const import STATELESS_LLM_API
 from homeassistant.components.mcp_server.http import MESSAGES_API, SSE_API
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import CONF_LLM_HASS_API, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.helpers import (
+    area_registry as ar,
+    device_registry as dr,
+    entity_registry as er,
+    llm,
+)
 from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry, setup_test_component_platform
@@ -45,6 +51,11 @@ INITIALIZE_MESSAGE = {
 }
 EVENT_PREFIX = "event: "
 DATA_PREFIX = "data: "
+EXPECTED_PROMPT_SUFFIX = """
+- names: Kitchen Light
+  domain: light
+  areas: Kitchen
+"""
 
 
 @pytest.fixture
@@ -59,11 +70,13 @@ async def mock_entities(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
     entity_registry: er.EntityRegistry,
+    area_registry: ar.AreaRegistry,
     setup_integration: None,
 ) -> None:
     """Fixture to expose entities to the conversation agent."""
-    entity = MockLight("kitchen", STATE_OFF)
+    entity = MockLight("Kitchen Light", STATE_OFF)
     entity.entity_id = TEST_ENTITY
+    entity.unique_id = "test-light-unique-id"
     setup_test_component_platform(hass, LIGHT_DOMAIN, [entity])
 
     assert await async_setup_component(
@@ -71,6 +84,9 @@ async def mock_entities(
         LIGHT_DOMAIN,
         {LIGHT_DOMAIN: [{"platform": "test"}]},
     )
+    await hass.async_block_till_done()
+    kitchen = area_registry.async_get_or_create("Kitchen")
+    entity_registry.async_update_entity(TEST_ENTITY, area_id=kitchen.id)
 
     async_expose_entity(hass, CONVERSATION_DOMAIN, TEST_ENTITY, True)
 
@@ -283,6 +299,7 @@ async def mcp_session(
         yield session
 
 
+@pytest.mark.parametrize("llm_hass_api", [llm.LLM_API_ASSIST, STATELESS_LLM_API])
 async def test_mcp_tools_list(
     hass: HomeAssistant,
     setup_integration: None,
@@ -305,6 +322,7 @@ async def test_mcp_tools_list(
     assert properties.get("name") == {"type": "string"}
 
 
+@pytest.mark.parametrize("llm_hass_api", [llm.LLM_API_ASSIST, STATELESS_LLM_API])
 async def test_mcp_tool_call(
     hass: HomeAssistant,
     setup_integration: None,
@@ -320,7 +338,7 @@ async def test_mcp_tool_call(
     async with mcp_session(mcp_sse_url, hass_supervisor_access_token) as session:
         result = await session.call_tool(
             name="HassTurnOn",
-            arguments={"name": "kitchen"},
+            arguments={"name": "kitchen light"},
         )
 
     assert not result.isError
@@ -357,6 +375,7 @@ async def test_mcp_tool_call_failed(
     assert "Error calling tool" in result.content[0].text
 
 
+@pytest.mark.parametrize("llm_hass_api", [llm.LLM_API_ASSIST, STATELESS_LLM_API])
 async def test_prompt_list(
     hass: HomeAssistant,
     setup_integration: None,
@@ -371,9 +390,10 @@ async def test_prompt_list(
     assert len(result.prompts) == 1
     prompt = result.prompts[0]
     assert prompt.name == "Assist"
-    assert prompt.description == "Default prompt for the Home Assistant LLM API Assist"
+    assert prompt.description == "Default prompt for Home Assistant Assist API"
 
 
+@pytest.mark.parametrize("llm_hass_api", [llm.LLM_API_ASSIST, STATELESS_LLM_API])
 async def test_prompt_get(
     hass: HomeAssistant,
     setup_integration: None,
@@ -385,11 +405,12 @@ async def test_prompt_get(
     async with mcp_session(mcp_sse_url, hass_supervisor_access_token) as session:
         result = await session.get_prompt(name="Assist")
 
-    assert result.description == "Default prompt for the Home Assistant LLM API Assist"
+    assert result.description == "Default prompt for Home Assistant Assist API"
     assert len(result.messages) == 1
     assert result.messages[0].role == "assistant"
     assert result.messages[0].content.type == "text"
     assert "When controlling Home Assistant" in result.messages[0].content.text
+    assert result.messages[0].content.text.endswith(EXPECTED_PROMPT_SUFFIX)
 
 
 async def test_get_unknwon_prompt(
diff --git a/tests/components/mealie/snapshots/test_calendar.ambr b/tests/components/mealie/snapshots/test_calendar.ambr
index e5a0a697157..7587a7a55b7 100644
--- a/tests/components/mealie/snapshots/test_calendar.ambr
+++ b/tests/components/mealie/snapshots/test_calendar.ambr
@@ -170,6 +170,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -222,6 +223,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -274,6 +276,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -326,6 +329,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/mealie/snapshots/test_init.ambr b/tests/components/mealie/snapshots/test_init.ambr
index 98ca52dd15e..aada173ffc3 100644
--- a/tests/components/mealie/snapshots/test_init.ambr
+++ b/tests/components/mealie/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/mealie/snapshots/test_sensor.ambr b/tests/components/mealie/snapshots/test_sensor.ambr
index e645cf4c45f..19219c01c1c 100644
--- a/tests/components/mealie/snapshots/test_sensor.ambr
+++ b/tests/components/mealie/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -58,6 +59,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -108,6 +110,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -158,6 +161,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -208,6 +212,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/mealie/snapshots/test_todo.ambr b/tests/components/mealie/snapshots/test_todo.ambr
index 4c58a839f57..88c677de581 100644
--- a/tests/components/mealie/snapshots/test_todo.ambr
+++ b/tests/components/mealie/snapshots/test_todo.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/media_player/test_async_helpers.py b/tests/components/media_player/test_async_helpers.py
index 750d2861f21..3ab79db73e1 100644
--- a/tests/components/media_player/test_async_helpers.py
+++ b/tests/components/media_player/test_async_helpers.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-import homeassistant.components.media_player as mp
+from homeassistant.components import media_player as mp
 from homeassistant.const import (
     STATE_IDLE,
     STATE_OFF,
@@ -69,6 +69,10 @@ class SimpleMediaPlayer(mp.MediaPlayerEntity):
         """Put device in standby."""
         self._state = STATE_STANDBY
 
+    def idle(self):
+        """Put device in idle."""
+        self._state = STATE_IDLE
+
 
 class ExtendedMediaPlayer(SimpleMediaPlayer):
     """Media player test class."""
@@ -92,7 +96,7 @@ class ExtendedMediaPlayer(SimpleMediaPlayer):
 
     def toggle(self):
         """Toggle the power on the media player."""
-        if self._state in [STATE_OFF, STATE_IDLE, STATE_STANDBY]:
+        if self._state in [STATE_OFF, STATE_STANDBY]:
             self._state = STATE_ON
         else:
             self._state = STATE_OFF
@@ -187,3 +191,7 @@ async def test_toggle(player) -> None:
     assert player.state == STATE_STANDBY
     await player.async_toggle()
     assert player.state == STATE_ON
+    player.idle()
+    assert player.state == STATE_IDLE
+    await player.async_toggle()
+    assert player.state == STATE_OFF
diff --git a/tests/components/media_player/test_device_trigger.py b/tests/components/media_player/test_device_trigger.py
index 4bb27b73f24..ae3a84e66a0 100644
--- a/tests/components/media_player/test_device_trigger.py
+++ b/tests/components/media_player/test_device_trigger.py
@@ -21,7 +21,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/media_player/test_init.py b/tests/components/media_player/test_init.py
index 9db2621f84f..1878d7372f6 100644
--- a/tests/components/media_player/test_init.py
+++ b/tests/components/media_player/test_init.py
@@ -10,12 +10,15 @@ import voluptuous as vol
 
 from homeassistant.components import media_player
 from homeassistant.components.media_player import (
+    ATTR_MEDIA_CONTENT_ID,
+    ATTR_MEDIA_CONTENT_TYPE,
     BrowseMedia,
     MediaClass,
     MediaPlayerEnqueue,
     MediaPlayerEntity,
     MediaPlayerEntityFeature,
 )
+from homeassistant.components.media_player.const import SERVICE_BROWSE_MEDIA
 from homeassistant.components.websocket_api import TYPE_RESULT
 from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF
 from homeassistant.core import HomeAssistant
@@ -280,7 +283,7 @@ async def test_media_browse(
     client = await hass_ws_client(hass)
 
     with patch(
-        "homeassistant.components.media_player.MediaPlayerEntity.async_browse_media",
+        "homeassistant.components.demo.media_player.DemoBrowsePlayer.async_browse_media",
         return_value=BrowseMedia(
             media_class=MediaClass.DIRECTORY,
             media_content_id="mock-id",
@@ -320,7 +323,7 @@ async def test_media_browse(
     assert mock_browse_media.mock_calls[0][1] == ("album", "abcd")
 
     with patch(
-        "homeassistant.components.media_player.MediaPlayerEntity.async_browse_media",
+        "homeassistant.components.demo.media_player.DemoBrowsePlayer.async_browse_media",
         return_value={"bla": "yo"},
     ):
         await client.send_json(
@@ -339,6 +342,75 @@ async def test_media_browse(
     assert msg["result"] == {"bla": "yo"}
 
 
+async def test_media_browse_service(hass: HomeAssistant) -> None:
+    """Test browsing media using service call."""
+    await async_setup_component(
+        hass, "media_player", {"media_player": {"platform": "demo"}}
+    )
+    await hass.async_block_till_done()
+
+    with patch(
+        "homeassistant.components.demo.media_player.DemoBrowsePlayer.async_browse_media",
+        return_value=BrowseMedia(
+            media_class=MediaClass.DIRECTORY,
+            media_content_id="mock-id",
+            media_content_type="mock-type",
+            title="Mock Title",
+            can_play=False,
+            can_expand=True,
+            children=[
+                BrowseMedia(
+                    media_class=MediaClass.ALBUM,
+                    media_content_id="album1 content id",
+                    media_content_type="album",
+                    title="Album 1",
+                    can_play=True,
+                    can_expand=True,
+                ),
+                BrowseMedia(
+                    media_class=MediaClass.ALBUM,
+                    media_content_id="album2 content id",
+                    media_content_type="album",
+                    title="Album 2",
+                    can_play=True,
+                    can_expand=True,
+                ),
+            ],
+        ),
+    ) as mock_browse_media:
+        result = await hass.services.async_call(
+            "media_player",
+            SERVICE_BROWSE_MEDIA,
+            {
+                ATTR_ENTITY_ID: "media_player.browse",
+                ATTR_MEDIA_CONTENT_TYPE: "album",
+                ATTR_MEDIA_CONTENT_ID: "title=Album*",
+            },
+            blocking=True,
+            return_response=True,
+        )
+
+        mock_browse_media.assert_called_with(
+            media_content_type="album", media_content_id="title=Album*"
+        )
+        browse_res: BrowseMedia = result["media_player.browse"]
+        assert browse_res.title == "Mock Title"
+        assert browse_res.media_class == "directory"
+        assert browse_res.media_content_type == "mock-type"
+        assert browse_res.media_content_id == "mock-id"
+        assert browse_res.can_play is False
+        assert browse_res.can_expand is True
+        assert len(browse_res.children) == 2
+        assert browse_res.children[0].title == "Album 1"
+        assert browse_res.children[0].media_class == "album"
+        assert browse_res.children[0].media_content_id == "album1 content id"
+        assert browse_res.children[0].media_content_type == "album"
+        assert browse_res.children[1].title == "Album 2"
+        assert browse_res.children[1].media_class == "album"
+        assert browse_res.children[1].media_content_id == "album2 content id"
+        assert browse_res.children[1].media_content_type == "album"
+
+
 async def test_group_members_available_when_off(hass: HomeAssistant) -> None:
     """Test that group_members are still available when media_player is off."""
     await async_setup_component(
diff --git a/tests/components/media_source/test_init.py b/tests/components/media_source/test_init.py
index c37e418020b..2c2952068ee 100644
--- a/tests/components/media_source/test_init.py
+++ b/tests/components/media_source/test_init.py
@@ -114,7 +114,6 @@ async def test_async_resolve_media(hass: HomeAssistant) -> None:
     assert media.mime_type == "audio/mpeg"
 
 
-@patch("homeassistant.helpers.frame._REPORTED_INTEGRATIONS", set())
 async def test_async_resolve_media_no_entity(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
diff --git a/tests/components/melcloud/snapshots/test_diagnostics.ambr b/tests/components/melcloud/snapshots/test_diagnostics.ambr
index e6a432de07e..671f5afcc52 100644
--- a/tests/components/melcloud/snapshots/test_diagnostics.ambr
+++ b/tests/components/melcloud/snapshots/test_diagnostics.ambr
@@ -17,6 +17,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'melcloud',
       'unique_id': 'UNIQUE_TEST_ID',
       'version': 1,
diff --git a/tests/components/melissa/test_climate.py b/tests/components/melissa/test_climate.py
index ceb14faf8fb..b305d629a91 100644
--- a/tests/components/melissa/test_climate.py
+++ b/tests/components/melissa/test_climate.py
@@ -10,7 +10,7 @@ from homeassistant.components.climate import (
 )
 from homeassistant.const import ATTR_ENTITY_ID, ATTR_TEMPERATURE
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from . import setup_integration
 
diff --git a/tests/components/melnor/test_sensor.py b/tests/components/melnor/test_sensor.py
index a2ba23d9e61..23902a4b780 100644
--- a/tests/components/melnor/test_sensor.py
+++ b/tests/components/melnor/test_sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.sensor import SensorDeviceClass, SensorStateClass
 from homeassistant.const import PERCENTAGE, SIGNAL_STRENGTH_DECIBELS_MILLIWATT
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import (
     mock_config_entry,
diff --git a/tests/components/melnor/test_time.py b/tests/components/melnor/test_time.py
index 50b51d31ff8..f8a3adcf3d0 100644
--- a/tests/components/melnor/test_time.py
+++ b/tests/components/melnor/test_time.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from datetime import time, timedelta
 
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import (
     mock_config_entry,
diff --git a/tests/components/meteo_france/conftest.py b/tests/components/meteo_france/conftest.py
index 123fc00e42a..82b220e331e 100644
--- a/tests/components/meteo_france/conftest.py
+++ b/tests/components/meteo_france/conftest.py
@@ -2,13 +2,48 @@
 
 from unittest.mock import patch
 
+from meteofrance_api.model import CurrentPhenomenons, Forecast, Rain
 import pytest
 
+from homeassistant.components.meteo_france.const import CONF_CITY, DOMAIN
+from homeassistant.config_entries import SOURCE_USER
+from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry, load_json_object_fixture
+
 
 @pytest.fixture(autouse=True)
 def patch_requests():
     """Stub out services that makes requests."""
-    patch_client = patch("homeassistant.components.meteo_france.MeteoFranceClient")
+    with patch("homeassistant.components.meteo_france.MeteoFranceClient") as mock_data:
+        mock_data = mock_data.return_value
+        mock_data.get_forecast.return_value = Forecast(
+            load_json_object_fixture("raw_forecast.json", DOMAIN)
+        )
+        mock_data.get_rain.return_value = Rain(
+            load_json_object_fixture("raw_rain.json", DOMAIN)
+        )
+        mock_data.get_warning_current_phenomenons.return_value = CurrentPhenomenons(
+            load_json_object_fixture("raw_warning_current_phenomenons.json", DOMAIN)
+        )
+        yield mock_data
 
-    with patch_client:
-        yield
+
+@pytest.fixture(name="config_entry")
+def get_config_entry(hass: HomeAssistant) -> MockConfigEntry:
+    """Create and register mock config entry."""
+    entry_data = {
+        CONF_CITY: "La Clusaz",
+        CONF_LATITUDE: 45.90417,
+        CONF_LONGITUDE: 6.42306,
+    }
+    config_entry = MockConfigEntry(
+        domain=DOMAIN,
+        source=SOURCE_USER,
+        unique_id=f"{entry_data[CONF_LATITUDE], entry_data[CONF_LONGITUDE]}",
+        title=entry_data[CONF_CITY],
+        data=entry_data,
+    )
+    config_entry.add_to_hass(hass)
+    return config_entry
diff --git a/tests/components/meteo_france/fixtures/raw_forecast.json b/tests/components/meteo_france/fixtures/raw_forecast.json
new file mode 100644
index 00000000000..3c0552136d2
--- /dev/null
+++ b/tests/components/meteo_france/fixtures/raw_forecast.json
@@ -0,0 +1,53 @@
+{
+  "updated_on": 1737995400,
+  "position": {
+    "country": "FR - France",
+    "dept": "74",
+    "insee": "74080",
+    "lat": 45.90417,
+    "lon": 6.42306,
+    "name": "La Clusaz",
+    "rain_product_available": 1,
+    "timezone": "Europe/Paris"
+  },
+  "daily_forecast": [
+    {
+      "T": { "max": 10.4, "min": 6.9, "sea": null },
+      "dt": 1737936000,
+      "humidity": { "max": 90, "min": 65 },
+      "precipitation": { "24h": 1.3 },
+      "sun": { "rise": 1737963392, "set": 1737996163 },
+      "uv": 1,
+      "weather12H": { "desc": "Eclaircies", "icon": "p2j" }
+    }
+  ],
+  "forecast": [
+    {
+      "T": { "value": 9.1, "windchill": 5.4 },
+      "clouds": 70,
+      "dt": 1737990000,
+      "humidity": 75,
+      "iso0": 1250,
+      "rain": { "1h": 0 },
+      "rain snow limit": "Non pertinent",
+      "sea_level": 988.7,
+      "snow": { "1h": 0 },
+      "uv": 1,
+      "weather": { "desc": "Eclaircies", "icon": "p2j" },
+      "wind": {
+        "direction": 200,
+        "gust": 18,
+        "icon": "SSO",
+        "speed": 8
+      }
+    }
+  ],
+  "probability_forecast": [
+    {
+      "dt": 1737990000,
+      "freezing": 0,
+      "rain": { "3h": null, "6h": null },
+      "snow": { "3h": null, "6h": null }
+    }
+  ]
+}
diff --git a/tests/components/meteo_france/fixtures/raw_rain.json b/tests/components/meteo_france/fixtures/raw_rain.json
new file mode 100644
index 00000000000..a9f17b8a98e
--- /dev/null
+++ b/tests/components/meteo_france/fixtures/raw_rain.json
@@ -0,0 +1,24 @@
+{
+  "position": {
+    "lat": 48.807166,
+    "lon": 2.239895,
+    "alti": 76,
+    "name": "Meudon",
+    "country": "FR - France",
+    "dept": "92",
+    "timezone": "Europe/Paris"
+  },
+  "updated_on": 1589995200,
+  "quality": 0,
+  "forecast": [
+    { "dt": 1589996100, "rain": 1, "desc": "Temps sec" },
+    { "dt": 1589996400, "rain": 1, "desc": "Temps sec" },
+    { "dt": 1589996700, "rain": 1, "desc": "Temps sec" },
+    { "dt": 1589997000, "rain": 2, "desc": "Pluie faible" },
+    { "dt": 1589997300, "rain": 3, "desc": "Pluie modérée" },
+    { "dt": 1589997600, "rain": 2, "desc": "Pluie faible" },
+    { "dt": 1589998200, "rain": 1, "desc": "Temps sec" },
+    { "dt": 1589998800, "rain": 1, "desc": "Temps sec" },
+    { "dt": 1589999400, "rain": 1, "desc": "Temps sec" }
+  ]
+}
diff --git a/tests/components/meteo_france/fixtures/raw_warning_current_phenomenons.json b/tests/components/meteo_france/fixtures/raw_warning_current_phenomenons.json
new file mode 100644
index 00000000000..8d84e512fb6
--- /dev/null
+++ b/tests/components/meteo_france/fixtures/raw_warning_current_phenomenons.json
@@ -0,0 +1,13 @@
+{
+  "update_time": 1591279200,
+  "end_validity_time": 1591365600,
+  "domain_id": "32",
+  "phenomenons_max_colors": [
+    { "phenomenon_id": "6", "phenomenon_max_color_id": 1 },
+    { "phenomenon_id": "4", "phenomenon_max_color_id": 1 },
+    { "phenomenon_id": "5", "phenomenon_max_color_id": 3 },
+    { "phenomenon_id": "2", "phenomenon_max_color_id": 1 },
+    { "phenomenon_id": "1", "phenomenon_max_color_id": 1 },
+    { "phenomenon_id": "3", "phenomenon_max_color_id": 2 }
+  ]
+}
diff --git a/tests/components/meteo_france/snapshots/test_sensor.ambr b/tests/components/meteo_france/snapshots/test_sensor.ambr
new file mode 100644
index 00000000000..35b6a9d19f7
--- /dev/null
+++ b/tests/components/meteo_france/snapshots/test_sensor.ambr
@@ -0,0 +1,779 @@
+# serializer version: 1
+# name: test_sensor[sensor.32_weather_alert-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.32_weather_alert',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': 'mdi:weather-cloudy-alert',
+    'original_name': '32 Weather alert',
+    'platform': 'meteo_france',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '32 Weather alert',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor[sensor.32_weather_alert-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'Canicule': 'Vert',
+      'Inondation': 'Vert',
+      'Neige-verglas': 'Orange',
+      'Orages': 'Jaune',
+      'Pluie-inondation': 'Vert',
+      'Vent violent': 'Vert',
+      'attribution': 'Data provided by Météo-France',
+      'friendly_name': '32 Weather alert',
+      'icon': 'mdi:weather-cloudy-alert',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.32_weather_alert',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'Orange',
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_cloud_cover-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.la_clusaz_cloud_cover',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': 'mdi:weather-partly-cloudy',
+    'original_name': 'La Clusaz Cloud cover',
+    'platform': 'meteo_france',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '45.90417,6.42306_cloud',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_cloud_cover-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Météo-France',
+      'friendly_name': 'La Clusaz Cloud cover',
+      'icon': 'mdi:weather-partly-cloudy',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.la_clusaz_cloud_cover',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '70',
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_daily_original_condition-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.la_clusaz_daily_original_condition',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'La Clusaz Daily original condition',
+    'platform': 'meteo_france',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '45.90417,6.42306_daily_original_condition',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_daily_original_condition-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Météo-France',
+      'friendly_name': 'La Clusaz Daily original condition',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.la_clusaz_daily_original_condition',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'Eclaircies',
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_daily_precipitation-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.la_clusaz_daily_precipitation',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.PRECIPITATION: 'precipitation'>,
+    'original_icon': None,
+    'original_name': 'La Clusaz Daily precipitation',
+    'platform': 'meteo_france',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '45.90417,6.42306_precipitation',
+    'unit_of_measurement': <UnitOfPrecipitationDepth.MILLIMETERS: 'mm'>,
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_daily_precipitation-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Météo-France',
+      'device_class': 'precipitation',
+      'friendly_name': 'La Clusaz Daily precipitation',
+      'unit_of_measurement': <UnitOfPrecipitationDepth.MILLIMETERS: 'mm'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.la_clusaz_daily_precipitation',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '1.3',
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_freeze_chance-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.la_clusaz_freeze_chance',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': 'mdi:snowflake',
+    'original_name': 'La Clusaz Freeze chance',
+    'platform': 'meteo_france',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '45.90417,6.42306_freeze_chance',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_freeze_chance-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Météo-France',
+      'friendly_name': 'La Clusaz Freeze chance',
+      'icon': 'mdi:snowflake',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.la_clusaz_freeze_chance',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0',
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_humidity-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.la_clusaz_humidity',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.HUMIDITY: 'humidity'>,
+    'original_icon': None,
+    'original_name': 'La Clusaz Humidity',
+    'platform': 'meteo_france',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '45.90417,6.42306_humidity',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_humidity-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Météo-France',
+      'device_class': 'humidity',
+      'friendly_name': 'La Clusaz Humidity',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.la_clusaz_humidity',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '75',
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_original_condition-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.la_clusaz_original_condition',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'La Clusaz Original condition',
+    'platform': 'meteo_france',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '45.90417,6.42306_original_condition',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_original_condition-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Météo-France',
+      'friendly_name': 'La Clusaz Original condition',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.la_clusaz_original_condition',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'Eclaircies',
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_pressure-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.la_clusaz_pressure',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.PRESSURE: 'pressure'>,
+    'original_icon': None,
+    'original_name': 'La Clusaz Pressure',
+    'platform': 'meteo_france',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '45.90417,6.42306_pressure',
+    'unit_of_measurement': <UnitOfPressure.HPA: 'hPa'>,
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_pressure-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Météo-France',
+      'device_class': 'pressure',
+      'friendly_name': 'La Clusaz Pressure',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPressure.HPA: 'hPa'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.la_clusaz_pressure',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '988.7',
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_rain_chance-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.la_clusaz_rain_chance',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': 'mdi:weather-rainy',
+    'original_name': 'La Clusaz Rain chance',
+    'platform': 'meteo_france',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '45.90417,6.42306_rain_chance',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_rain_chance-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Météo-France',
+      'friendly_name': 'La Clusaz Rain chance',
+      'icon': 'mdi:weather-rainy',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.la_clusaz_rain_chance',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_snow_chance-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.la_clusaz_snow_chance',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': 'mdi:weather-snowy',
+    'original_name': 'La Clusaz Snow chance',
+    'platform': 'meteo_france',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '45.90417,6.42306_snow_chance',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_snow_chance-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Météo-France',
+      'friendly_name': 'La Clusaz Snow chance',
+      'icon': 'mdi:weather-snowy',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.la_clusaz_snow_chance',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.la_clusaz_temperature',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'La Clusaz Temperature',
+    'platform': 'meteo_france',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '45.90417,6.42306_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Météo-France',
+      'device_class': 'temperature',
+      'friendly_name': 'La Clusaz Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.la_clusaz_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '9.1',
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_uv-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.la_clusaz_uv',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': 'mdi:sunglasses',
+    'original_name': 'La Clusaz UV',
+    'platform': 'meteo_france',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '45.90417,6.42306_uv',
+    'unit_of_measurement': 'UV index',
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_uv-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Météo-France',
+      'friendly_name': 'La Clusaz UV',
+      'icon': 'mdi:sunglasses',
+      'unit_of_measurement': 'UV index',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.la_clusaz_uv',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '1',
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_wind_gust-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.la_clusaz_wind_gust',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.WIND_SPEED: 'wind_speed'>,
+    'original_icon': 'mdi:weather-windy-variant',
+    'original_name': 'La Clusaz Wind gust',
+    'platform': 'meteo_france',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '45.90417,6.42306_wind_gust',
+    'unit_of_measurement': <UnitOfSpeed.KILOMETERS_PER_HOUR: 'km/h'>,
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_wind_gust-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Météo-France',
+      'device_class': 'wind_speed',
+      'friendly_name': 'La Clusaz Wind gust',
+      'icon': 'mdi:weather-windy-variant',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfSpeed.KILOMETERS_PER_HOUR: 'km/h'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.la_clusaz_wind_gust',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '65',
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_wind_speed-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.la_clusaz_wind_speed',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.WIND_SPEED: 'wind_speed'>,
+    'original_icon': None,
+    'original_name': 'La Clusaz Wind speed',
+    'platform': 'meteo_france',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '45.90417,6.42306_wind_speed',
+    'unit_of_measurement': <UnitOfSpeed.KILOMETERS_PER_HOUR: 'km/h'>,
+  })
+# ---
+# name: test_sensor[sensor.la_clusaz_wind_speed-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Météo-France',
+      'device_class': 'wind_speed',
+      'friendly_name': 'La Clusaz Wind speed',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfSpeed.KILOMETERS_PER_HOUR: 'km/h'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.la_clusaz_wind_speed',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '29',
+  })
+# ---
+# name: test_sensor[sensor.meudon_next_rain-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.meudon_next_rain',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Meudon Next rain',
+    'platform': 'meteo_france',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '48.807166,2.239895_next_rain',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensor[sensor.meudon_next_rain-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      '1_hour_forecast': dict({
+        '0 min': 'Temps sec',
+        '10 min': 'Temps sec',
+        '15 min': 'Pluie faible',
+        '20 min': 'Pluie modérée',
+        '25 min': 'Pluie faible',
+        '35 min': 'Temps sec',
+        '45 min': 'Temps sec',
+        '5 min': 'Temps sec',
+        '55 min': 'Temps sec',
+      }),
+      'attribution': 'Data provided by Météo-France',
+      'device_class': 'timestamp',
+      'forecast_time_ref': '2020-05-20T17:35:00+00:00',
+      'friendly_name': 'Meudon Next rain',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.meudon_next_rain',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2020-05-20T17:50:00+00:00',
+  })
+# ---
diff --git a/tests/components/meteo_france/snapshots/test_weather.ambr b/tests/components/meteo_france/snapshots/test_weather.ambr
new file mode 100644
index 00000000000..7c64ee86671
--- /dev/null
+++ b/tests/components/meteo_france/snapshots/test_weather.ambr
@@ -0,0 +1,60 @@
+# serializer version: 1
+# name: test_weather[weather.la_clusaz-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'weather',
+    'entity_category': None,
+    'entity_id': 'weather.la_clusaz',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'La Clusaz',
+    'platform': 'meteo_france',
+    'previous_unique_id': None,
+    'supported_features': <WeatherEntityFeature: 3>,
+    'translation_key': None,
+    'unique_id': '45.90417,6.42306',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_weather[weather.la_clusaz-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Météo-France',
+      'friendly_name': 'La Clusaz',
+      'humidity': 75,
+      'precipitation_unit': <UnitOfPrecipitationDepth.MILLIMETERS: 'mm'>,
+      'pressure': 988.7,
+      'pressure_unit': <UnitOfPressure.HPA: 'hPa'>,
+      'supported_features': <WeatherEntityFeature: 3>,
+      'temperature': 9.1,
+      'temperature_unit': <UnitOfTemperature.CELSIUS: '°C'>,
+      'visibility_unit': <UnitOfLength.KILOMETERS: 'km'>,
+      'wind_bearing': 200,
+      'wind_speed': 28.8,
+      'wind_speed_unit': <UnitOfSpeed.KILOMETERS_PER_HOUR: 'km/h'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'weather.la_clusaz',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'partlycloudy',
+  })
+# ---
diff --git a/tests/components/meteo_france/test_sensor.py b/tests/components/meteo_france/test_sensor.py
new file mode 100644
index 00000000000..be77de0008b
--- /dev/null
+++ b/tests/components/meteo_france/test_sensor.py
@@ -0,0 +1,32 @@
+"""Test Météo France weather entity."""
+
+from collections.abc import Generator
+from unittest.mock import patch
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+@pytest.fixture(autouse=True)
+def override_platforms() -> Generator[None]:
+    """Override PLATFORMS."""
+    with patch("homeassistant.components.meteo_france.PLATFORMS", [Platform.SENSOR]):
+        yield
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_sensor(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test the sensor entity."""
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await snapshot_platform(hass, entity_registry, snapshot, config_entry.entry_id)
diff --git a/tests/components/meteo_france/test_weather.py b/tests/components/meteo_france/test_weather.py
new file mode 100644
index 00000000000..cd55ac31b27
--- /dev/null
+++ b/tests/components/meteo_france/test_weather.py
@@ -0,0 +1,31 @@
+"""Test Météo France weather entity."""
+
+from collections.abc import Generator
+from unittest.mock import patch
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+@pytest.fixture(autouse=True)
+def override_platforms() -> Generator[None]:
+    """Override PLATFORMS."""
+    with patch("homeassistant.components.meteo_france.PLATFORMS", [Platform.WEATHER]):
+        yield
+
+
+async def test_weather(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test the weather entity."""
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await snapshot_platform(hass, entity_registry, snapshot, config_entry.entry_id)
diff --git a/tests/components/mfi/test_sensor.py b/tests/components/mfi/test_sensor.py
index 37512ca78f8..8c21fa9cb36 100644
--- a/tests/components/mfi/test_sensor.py
+++ b/tests/components/mfi/test_sensor.py
@@ -7,8 +7,8 @@ from mficlient.client import FailedToLogin
 import pytest
 import requests
 
-import homeassistant.components.mfi.sensor as mfi
-import homeassistant.components.sensor as sensor_component
+from homeassistant.components import sensor as sensor_component
+from homeassistant.components.mfi import sensor as mfi
 from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant
diff --git a/tests/components/mfi/test_switch.py b/tests/components/mfi/test_switch.py
index 03b5d5f2c0a..fb586073a3d 100644
--- a/tests/components/mfi/test_switch.py
+++ b/tests/components/mfi/test_switch.py
@@ -4,8 +4,8 @@ from unittest import mock
 
 import pytest
 
-import homeassistant.components.mfi.switch as mfi
-import homeassistant.components.switch as switch_component
+from homeassistant.components import switch as switch_component
+from homeassistant.components.mfi import switch as mfi
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
diff --git a/tests/components/microsoft/test_tts.py b/tests/components/microsoft/test_tts.py
index e10ec589113..38f1318a683 100644
--- a/tests/components/microsoft/test_tts.py
+++ b/tests/components/microsoft/test_tts.py
@@ -366,7 +366,7 @@ async def test_service_say_error(
         await retrieve_media(
             hass, hass_client, service_calls[1].data[ATTR_MEDIA_CONTENT_ID]
         )
-        == HTTPStatus.NOT_FOUND
+        == HTTPStatus.INTERNAL_SERVER_ERROR
     )
 
     assert len(mock_tts.mock_calls) == 2
diff --git a/tests/components/min_max/test_sensor.py b/tests/components/min_max/test_sensor.py
index c875697bf2f..a7a70043d94 100644
--- a/tests/components/min_max/test_sensor.py
+++ b/tests/components/min_max/test_sensor.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
 
 from tests.common import get_fixture_path
diff --git a/tests/components/minecraft_server/conftest.py b/tests/components/minecraft_server/conftest.py
index d34db5114cc..67b8bd17b3a 100644
--- a/tests/components/minecraft_server/conftest.py
+++ b/tests/components/minecraft_server/conftest.py
@@ -3,8 +3,8 @@
 import pytest
 
 from homeassistant.components.minecraft_server.api import MinecraftServerType
-from homeassistant.components.minecraft_server.const import DEFAULT_NAME, DOMAIN
-from homeassistant.const import CONF_ADDRESS, CONF_NAME, CONF_TYPE
+from homeassistant.components.minecraft_server.const import DOMAIN
+from homeassistant.const import CONF_ADDRESS, CONF_TYPE
 
 from .const import TEST_ADDRESS, TEST_CONFIG_ENTRY_ID
 
@@ -18,8 +18,8 @@ def java_mock_config_entry() -> MockConfigEntry:
         domain=DOMAIN,
         unique_id=None,
         entry_id=TEST_CONFIG_ENTRY_ID,
+        title=TEST_ADDRESS,
         data={
-            CONF_NAME: DEFAULT_NAME,
             CONF_ADDRESS: TEST_ADDRESS,
             CONF_TYPE: MinecraftServerType.JAVA_EDITION,
         },
@@ -34,8 +34,8 @@ def bedrock_mock_config_entry() -> MockConfigEntry:
         domain=DOMAIN,
         unique_id=None,
         entry_id=TEST_CONFIG_ENTRY_ID,
+        title=TEST_ADDRESS,
         data={
-            CONF_NAME: DEFAULT_NAME,
             CONF_ADDRESS: TEST_ADDRESS,
             CONF_TYPE: MinecraftServerType.BEDROCK_EDITION,
         },
diff --git a/tests/components/minecraft_server/snapshots/test_binary_sensor.ambr b/tests/components/minecraft_server/snapshots/test_binary_sensor.ambr
index 2e4bf49089c..c93a87d70d8 100644
--- a/tests/components/minecraft_server/snapshots/test_binary_sensor.ambr
+++ b/tests/components/minecraft_server/snapshots/test_binary_sensor.ambr
@@ -3,10 +3,10 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'connectivity',
-      'friendly_name': 'Minecraft Server Status',
+      'friendly_name': 'mc.dummyserver.com:25566 Status',
     }),
     'context': <ANY>,
-    'entity_id': 'binary_sensor.minecraft_server_status',
+    'entity_id': 'binary_sensor.mc_dummyserver_com_25566_status',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -17,10 +17,10 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'connectivity',
-      'friendly_name': 'Minecraft Server Status',
+      'friendly_name': 'mc.dummyserver.com:25566 Status',
     }),
     'context': <ANY>,
-    'entity_id': 'binary_sensor.minecraft_server_status',
+    'entity_id': 'binary_sensor.mc_dummyserver_com_25566_status',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -31,10 +31,10 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'connectivity',
-      'friendly_name': 'Minecraft Server Status',
+      'friendly_name': 'mc.dummyserver.com:25566 Status',
     }),
     'context': <ANY>,
-    'entity_id': 'binary_sensor.minecraft_server_status',
+    'entity_id': 'binary_sensor.mc_dummyserver_com_25566_status',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -45,10 +45,10 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'connectivity',
-      'friendly_name': 'Minecraft Server Status',
+      'friendly_name': 'mc.dummyserver.com:25566 Status',
     }),
     'context': <ANY>,
-    'entity_id': 'binary_sensor.minecraft_server_status',
+    'entity_id': 'binary_sensor.mc_dummyserver_com_25566_status',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
diff --git a/tests/components/minecraft_server/snapshots/test_diagnostics.ambr b/tests/components/minecraft_server/snapshots/test_diagnostics.ambr
index 72d79795c6a..b722f4122f3 100644
--- a/tests/components/minecraft_server/snapshots/test_diagnostics.ambr
+++ b/tests/components/minecraft_server/snapshots/test_diagnostics.ambr
@@ -8,7 +8,6 @@
     }),
     'config_entry_data': dict({
       'address': '**REDACTED**',
-      'name': '**REDACTED**',
       'type': 'Bedrock Edition',
     }),
     'config_entry_options': dict({
@@ -36,7 +35,6 @@
     }),
     'config_entry_data': dict({
       'address': '**REDACTED**',
-      'name': '**REDACTED**',
       'type': 'Java Edition',
     }),
     'config_entry_options': dict({
diff --git a/tests/components/minecraft_server/snapshots/test_sensor.ambr b/tests/components/minecraft_server/snapshots/test_sensor.ambr
index 47d638adf79..d2b044c06f5 100644
--- a/tests/components/minecraft_server/snapshots/test_sensor.ambr
+++ b/tests/components/minecraft_server/snapshots/test_sensor.ambr
@@ -2,11 +2,11 @@
 # name: test_sensor[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Latency',
+      'friendly_name': 'mc.dummyserver.com:25566 Latency',
       'unit_of_measurement': <UnitOfTime.MILLISECONDS: 'ms'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_latency',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_latency',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -16,11 +16,11 @@
 # name: test_sensor[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].1
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Players online',
+      'friendly_name': 'mc.dummyserver.com:25566 Players online',
       'unit_of_measurement': 'players',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_players_online',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_players_online',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -30,11 +30,11 @@
 # name: test_sensor[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].2
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Players max',
+      'friendly_name': 'mc.dummyserver.com:25566 Players max',
       'unit_of_measurement': 'players',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_players_max',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_players_max',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -44,10 +44,10 @@
 # name: test_sensor[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].3
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server World message',
+      'friendly_name': 'mc.dummyserver.com:25566 World message',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_world_message',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_world_message',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -57,10 +57,10 @@
 # name: test_sensor[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].4
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Version',
+      'friendly_name': 'mc.dummyserver.com:25566 Version',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_version',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_version',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -70,10 +70,10 @@
 # name: test_sensor[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].5
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Protocol version',
+      'friendly_name': 'mc.dummyserver.com:25566 Protocol version',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_protocol_version',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_protocol_version',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -83,10 +83,10 @@
 # name: test_sensor[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].6
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Map name',
+      'friendly_name': 'mc.dummyserver.com:25566 Map name',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_map_name',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_map_name',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -96,10 +96,10 @@
 # name: test_sensor[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].7
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Game mode',
+      'friendly_name': 'mc.dummyserver.com:25566 Game mode',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_game_mode',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_game_mode',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -109,10 +109,10 @@
 # name: test_sensor[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].8
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Edition',
+      'friendly_name': 'mc.dummyserver.com:25566 Edition',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_edition',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_edition',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -122,11 +122,11 @@
 # name: test_sensor[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Latency',
+      'friendly_name': 'mc.dummyserver.com:25566 Latency',
       'unit_of_measurement': <UnitOfTime.MILLISECONDS: 'ms'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_latency',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_latency',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -136,7 +136,7 @@
 # name: test_sensor[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0].1
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Players online',
+      'friendly_name': 'mc.dummyserver.com:25566 Players online',
       'players_list': list([
         'Player 1',
         'Player 2',
@@ -145,7 +145,7 @@
       'unit_of_measurement': 'players',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_players_online',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_players_online',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -155,11 +155,11 @@
 # name: test_sensor[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0].2
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Players max',
+      'friendly_name': 'mc.dummyserver.com:25566 Players max',
       'unit_of_measurement': 'players',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_players_max',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_players_max',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -169,10 +169,10 @@
 # name: test_sensor[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0].3
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server World message',
+      'friendly_name': 'mc.dummyserver.com:25566 World message',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_world_message',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_world_message',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -182,10 +182,10 @@
 # name: test_sensor[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0].4
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Version',
+      'friendly_name': 'mc.dummyserver.com:25566 Version',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_version',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_version',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -195,10 +195,10 @@
 # name: test_sensor[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0].5
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Protocol version',
+      'friendly_name': 'mc.dummyserver.com:25566 Protocol version',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_protocol_version',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_protocol_version',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -208,11 +208,11 @@
 # name: test_sensor_update[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Latency',
+      'friendly_name': 'mc.dummyserver.com:25566 Latency',
       'unit_of_measurement': <UnitOfTime.MILLISECONDS: 'ms'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_latency',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_latency',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -222,11 +222,11 @@
 # name: test_sensor_update[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].1
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Players online',
+      'friendly_name': 'mc.dummyserver.com:25566 Players online',
       'unit_of_measurement': 'players',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_players_online',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_players_online',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -236,11 +236,11 @@
 # name: test_sensor_update[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].2
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Players max',
+      'friendly_name': 'mc.dummyserver.com:25566 Players max',
       'unit_of_measurement': 'players',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_players_max',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_players_max',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -250,10 +250,10 @@
 # name: test_sensor_update[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].3
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server World message',
+      'friendly_name': 'mc.dummyserver.com:25566 World message',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_world_message',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_world_message',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -263,10 +263,10 @@
 # name: test_sensor_update[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].4
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Version',
+      'friendly_name': 'mc.dummyserver.com:25566 Version',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_version',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_version',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -276,10 +276,10 @@
 # name: test_sensor_update[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].5
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Protocol version',
+      'friendly_name': 'mc.dummyserver.com:25566 Protocol version',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_protocol_version',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_protocol_version',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -289,10 +289,10 @@
 # name: test_sensor_update[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].6
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Map name',
+      'friendly_name': 'mc.dummyserver.com:25566 Map name',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_map_name',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_map_name',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -302,10 +302,10 @@
 # name: test_sensor_update[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].7
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Game mode',
+      'friendly_name': 'mc.dummyserver.com:25566 Game mode',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_game_mode',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_game_mode',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -315,10 +315,10 @@
 # name: test_sensor_update[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].8
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Edition',
+      'friendly_name': 'mc.dummyserver.com:25566 Edition',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_edition',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_edition',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -328,11 +328,11 @@
 # name: test_sensor_update[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Latency',
+      'friendly_name': 'mc.dummyserver.com:25566 Latency',
       'unit_of_measurement': <UnitOfTime.MILLISECONDS: 'ms'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_latency',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_latency',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -342,7 +342,7 @@
 # name: test_sensor_update[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0].1
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Players online',
+      'friendly_name': 'mc.dummyserver.com:25566 Players online',
       'players_list': list([
         'Player 1',
         'Player 2',
@@ -351,7 +351,7 @@
       'unit_of_measurement': 'players',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_players_online',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_players_online',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -361,11 +361,11 @@
 # name: test_sensor_update[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0].2
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Players max',
+      'friendly_name': 'mc.dummyserver.com:25566 Players max',
       'unit_of_measurement': 'players',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_players_max',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_players_max',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -375,10 +375,10 @@
 # name: test_sensor_update[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0].3
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server World message',
+      'friendly_name': 'mc.dummyserver.com:25566 World message',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_world_message',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_world_message',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -388,10 +388,10 @@
 # name: test_sensor_update[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0].4
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Version',
+      'friendly_name': 'mc.dummyserver.com:25566 Version',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_version',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_version',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -401,10 +401,10 @@
 # name: test_sensor_update[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0].5
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Minecraft Server Protocol version',
+      'friendly_name': 'mc.dummyserver.com:25566 Protocol version',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.minecraft_server_protocol_version',
+    'entity_id': 'sensor.mc_dummyserver_com_25566_protocol_version',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
diff --git a/tests/components/minecraft_server/test_binary_sensor.py b/tests/components/minecraft_server/test_binary_sensor.py
index 6321c91d74a..77537a5e8e4 100644
--- a/tests/components/minecraft_server/test_binary_sensor.py
+++ b/tests/components/minecraft_server/test_binary_sensor.py
@@ -64,7 +64,9 @@ async def test_binary_sensor(
     ):
         assert await hass.config_entries.async_setup(mock_config_entry.entry_id)
         await hass.async_block_till_done()
-        assert hass.states.get("binary_sensor.minecraft_server_status") == snapshot
+        assert (
+            hass.states.get("binary_sensor.mc_dummyserver_com_25566_status") == snapshot
+        )
 
 
 @pytest.mark.parametrize(
@@ -113,7 +115,9 @@ async def test_binary_sensor_update(
         freezer.tick(timedelta(minutes=1))
         async_fire_time_changed(hass)
         await hass.async_block_till_done()
-        assert hass.states.get("binary_sensor.minecraft_server_status") == snapshot
+        assert (
+            hass.states.get("binary_sensor.mc_dummyserver_com_25566_status") == snapshot
+        )
 
 
 @pytest.mark.parametrize(
@@ -167,5 +171,6 @@ async def test_binary_sensor_update_failure(
         async_fire_time_changed(hass)
         await hass.async_block_till_done()
         assert (
-            hass.states.get("binary_sensor.minecraft_server_status").state == STATE_OFF
+            hass.states.get("binary_sensor.mc_dummyserver_com_25566_status").state
+            == STATE_OFF
         )
diff --git a/tests/components/minecraft_server/test_config_flow.py b/tests/components/minecraft_server/test_config_flow.py
index 41817986bcf..c57b74c6a65 100644
--- a/tests/components/minecraft_server/test_config_flow.py
+++ b/tests/components/minecraft_server/test_config_flow.py
@@ -5,9 +5,9 @@ from unittest.mock import patch
 from mcstatus import BedrockServer, JavaServer
 
 from homeassistant.components.minecraft_server.api import MinecraftServerType
-from homeassistant.components.minecraft_server.const import DEFAULT_NAME, DOMAIN
+from homeassistant.components.minecraft_server.const import DOMAIN
 from homeassistant.config_entries import SOURCE_USER
-from homeassistant.const import CONF_ADDRESS, CONF_NAME, CONF_TYPE
+from homeassistant.const import CONF_ADDRESS, CONF_TYPE
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
@@ -22,13 +22,12 @@ from .const import (
 from tests.common import MockConfigEntry
 
 USER_INPUT = {
-    CONF_NAME: DEFAULT_NAME,
     CONF_ADDRESS: TEST_ADDRESS,
 }
 
 
-async def test_show_config_form(hass: HomeAssistant) -> None:
-    """Test if initial configuration form is shown."""
+async def test_full_flow_java(hass: HomeAssistant) -> None:
+    """Test config entry in case of a successful connection to a Java Edition server."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": SOURCE_USER}
     )
@@ -36,96 +35,6 @@ async def test_show_config_form(hass: HomeAssistant) -> None:
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "user"
 
-
-async def test_service_already_configured(
-    hass: HomeAssistant, bedrock_mock_config_entry: MockConfigEntry
-) -> None:
-    """Test config flow abort if service is already configured."""
-    bedrock_mock_config_entry.add_to_hass(hass)
-
-    with (
-        patch(
-            "homeassistant.components.minecraft_server.api.BedrockServer.lookup",
-            return_value=BedrockServer(host=TEST_HOST, port=TEST_PORT),
-        ),
-        patch(
-            "homeassistant.components.minecraft_server.api.BedrockServer.async_status",
-            return_value=TEST_BEDROCK_STATUS_RESPONSE,
-        ),
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": SOURCE_USER}, data=USER_INPUT
-        )
-        assert result["type"] is FlowResultType.ABORT
-        assert result["reason"] == "already_configured"
-
-
-async def test_address_validation_failure(hass: HomeAssistant) -> None:
-    """Test error in case of a failed connection."""
-    with (
-        patch(
-            "homeassistant.components.minecraft_server.api.BedrockServer.lookup",
-            side_effect=ValueError,
-        ),
-        patch(
-            "homeassistant.components.minecraft_server.api.JavaServer.async_lookup",
-            side_effect=ValueError,
-        ),
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": SOURCE_USER}, data=USER_INPUT
-        )
-
-        assert result["type"] is FlowResultType.FORM
-        assert result["errors"] == {"base": "cannot_connect"}
-
-
-async def test_java_connection_failure(hass: HomeAssistant) -> None:
-    """Test error in case of a failed connection to a Java Edition server."""
-    with (
-        patch(
-            "homeassistant.components.minecraft_server.api.BedrockServer.lookup",
-            side_effect=ValueError,
-        ),
-        patch(
-            "homeassistant.components.minecraft_server.api.JavaServer.async_lookup",
-            return_value=JavaServer(host=TEST_HOST, port=TEST_PORT),
-        ),
-        patch(
-            "homeassistant.components.minecraft_server.api.JavaServer.async_status",
-            side_effect=OSError,
-        ),
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": SOURCE_USER}, data=USER_INPUT
-        )
-
-        assert result["type"] is FlowResultType.FORM
-        assert result["errors"] == {"base": "cannot_connect"}
-
-
-async def test_bedrock_connection_failure(hass: HomeAssistant) -> None:
-    """Test error in case of a failed connection to a Bedrock Edition server."""
-    with (
-        patch(
-            "homeassistant.components.minecraft_server.api.BedrockServer.lookup",
-            return_value=BedrockServer(host=TEST_HOST, port=TEST_PORT),
-        ),
-        patch(
-            "homeassistant.components.minecraft_server.api.BedrockServer.async_status",
-            side_effect=OSError,
-        ),
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": SOURCE_USER}, data=USER_INPUT
-        )
-
-        assert result["type"] is FlowResultType.FORM
-        assert result["errors"] == {"base": "cannot_connect"}
-
-
-async def test_java_connection(hass: HomeAssistant) -> None:
-    """Test config entry in case of a successful connection to a Java Edition server."""
     with (
         patch(
             "homeassistant.components.minecraft_server.api.BedrockServer.lookup",
@@ -146,13 +55,19 @@ async def test_java_connection(hass: HomeAssistant) -> None:
 
         assert result["type"] is FlowResultType.CREATE_ENTRY
         assert result["title"] == USER_INPUT[CONF_ADDRESS]
-        assert result["data"][CONF_NAME] == USER_INPUT[CONF_NAME]
         assert result["data"][CONF_ADDRESS] == TEST_ADDRESS
         assert result["data"][CONF_TYPE] == MinecraftServerType.JAVA_EDITION
 
 
-async def test_bedrock_connection(hass: HomeAssistant) -> None:
+async def test_full_flow_bedrock(hass: HomeAssistant) -> None:
     """Test config entry in case of a successful connection to a Bedrock Edition server."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+
     with (
         patch(
             "homeassistant.components.minecraft_server.api.BedrockServer.lookup",
@@ -169,13 +84,16 @@ async def test_bedrock_connection(hass: HomeAssistant) -> None:
 
         assert result["type"] is FlowResultType.CREATE_ENTRY
         assert result["title"] == USER_INPUT[CONF_ADDRESS]
-        assert result["data"][CONF_NAME] == USER_INPUT[CONF_NAME]
         assert result["data"][CONF_ADDRESS] == TEST_ADDRESS
         assert result["data"][CONF_TYPE] == MinecraftServerType.BEDROCK_EDITION
 
 
-async def test_recovery(hass: HomeAssistant) -> None:
-    """Test config flow recovery (successful connection after a failed connection)."""
+async def test_service_already_configured_java(
+    hass: HomeAssistant, java_mock_config_entry: MockConfigEntry
+) -> None:
+    """Test config flow abort if a Java Edition server is already configured."""
+    java_mock_config_entry.add_to_hass(hass)
+
     with (
         patch(
             "homeassistant.components.minecraft_server.api.BedrockServer.lookup",
@@ -183,8 +101,99 @@ async def test_recovery(hass: HomeAssistant) -> None:
         ),
         patch(
             "homeassistant.components.minecraft_server.api.JavaServer.async_lookup",
+            return_value=JavaServer(host=TEST_HOST, port=TEST_PORT),
+        ),
+        patch(
+            "homeassistant.components.minecraft_server.api.JavaServer.async_status",
+            return_value=TEST_JAVA_STATUS_RESPONSE,
+        ),
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_USER}, data=USER_INPUT
+        )
+        assert result["type"] is FlowResultType.ABORT
+        assert result["reason"] == "already_configured"
+
+
+async def test_service_already_configured_bedrock(
+    hass: HomeAssistant, bedrock_mock_config_entry: MockConfigEntry
+) -> None:
+    """Test config flow abort if a Bedrock Edition server is already configured."""
+    bedrock_mock_config_entry.add_to_hass(hass)
+
+    with (
+        patch(
+            "homeassistant.components.minecraft_server.api.BedrockServer.lookup",
+            return_value=BedrockServer(host=TEST_HOST, port=TEST_PORT),
+        ),
+        patch(
+            "homeassistant.components.minecraft_server.api.BedrockServer.async_status",
+            return_value=TEST_BEDROCK_STATUS_RESPONSE,
+        ),
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_USER}, data=USER_INPUT
+        )
+        assert result["type"] is FlowResultType.ABORT
+        assert result["reason"] == "already_configured"
+
+
+async def test_recovery_java(hass: HomeAssistant) -> None:
+    """Test config flow recovery with a Java Edition server (successful connection after a failed connection)."""
+    with (
+        patch(
+            "homeassistant.components.minecraft_server.api.BedrockServer.lookup",
             side_effect=ValueError,
         ),
+        patch(
+            "homeassistant.components.minecraft_server.api.JavaServer.async_lookup",
+            return_value=JavaServer(host=TEST_HOST, port=TEST_PORT),
+        ),
+        patch(
+            "homeassistant.components.minecraft_server.api.JavaServer.async_status",
+            side_effect=OSError,
+        ),
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_USER}, data=USER_INPUT
+        )
+        assert result["type"] is FlowResultType.FORM
+        assert result["errors"] == {"base": "cannot_connect"}
+
+    with (
+        patch(
+            "homeassistant.components.minecraft_server.api.BedrockServer.lookup",
+            side_effect=ValueError,
+        ),
+        patch(
+            "homeassistant.components.minecraft_server.api.JavaServer.async_lookup",
+            return_value=JavaServer(host=TEST_HOST, port=TEST_PORT),
+        ),
+        patch(
+            "homeassistant.components.minecraft_server.api.JavaServer.async_status",
+            return_value=TEST_JAVA_STATUS_RESPONSE,
+        ),
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            flow_id=result["flow_id"], user_input=USER_INPUT
+        )
+        assert result2["type"] is FlowResultType.CREATE_ENTRY
+        assert result2["title"] == USER_INPUT[CONF_ADDRESS]
+        assert result2["data"][CONF_ADDRESS] == TEST_ADDRESS
+        assert result2["data"][CONF_TYPE] == MinecraftServerType.JAVA_EDITION
+
+
+async def test_recovery_bedrock(hass: HomeAssistant) -> None:
+    """Test config flow recovery with a Bedrock Edition server (successful connection after a failed connection)."""
+    with (
+        patch(
+            "homeassistant.components.minecraft_server.api.BedrockServer.lookup",
+            return_value=BedrockServer(host=TEST_HOST, port=TEST_PORT),
+        ),
+        patch(
+            "homeassistant.components.minecraft_server.api.BedrockServer.async_status",
+            side_effect=OSError,
+        ),
     ):
         result = await hass.config_entries.flow.async_init(
             DOMAIN, context={"source": SOURCE_USER}, data=USER_INPUT
@@ -207,6 +216,5 @@ async def test_recovery(hass: HomeAssistant) -> None:
         )
         assert result2["type"] is FlowResultType.CREATE_ENTRY
         assert result2["title"] == USER_INPUT[CONF_ADDRESS]
-        assert result2["data"][CONF_NAME] == USER_INPUT[CONF_NAME]
         assert result2["data"][CONF_ADDRESS] == TEST_ADDRESS
         assert result2["data"][CONF_TYPE] == MinecraftServerType.BEDROCK_EDITION
diff --git a/tests/components/minecraft_server/test_init.py b/tests/components/minecraft_server/test_init.py
index 6f7a49a190c..c00c5ec80cd 100644
--- a/tests/components/minecraft_server/test_init.py
+++ b/tests/components/minecraft_server/test_init.py
@@ -6,7 +6,7 @@ from mcstatus import JavaServer
 import pytest
 
 from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
-from homeassistant.components.minecraft_server.const import DEFAULT_NAME, DOMAIN
+from homeassistant.components.minecraft_server.const import DOMAIN
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import CONF_ADDRESS, CONF_HOST, CONF_NAME, CONF_PORT
@@ -23,6 +23,8 @@ from .const import (
 
 from tests.common import MockConfigEntry
 
+DEFAULT_NAME = "Minecraft Server"
+
 TEST_UNIQUE_ID = f"{TEST_HOST}-{TEST_PORT}"
 
 SENSOR_KEYS = [
diff --git a/tests/components/minecraft_server/test_sensor.py b/tests/components/minecraft_server/test_sensor.py
index ff62f8ddf36..a4cea239f7a 100644
--- a/tests/components/minecraft_server/test_sensor.py
+++ b/tests/components/minecraft_server/test_sensor.py
@@ -22,35 +22,35 @@ from .const import (
 from tests.common import async_fire_time_changed
 
 JAVA_SENSOR_ENTITIES: list[str] = [
-    "sensor.minecraft_server_latency",
-    "sensor.minecraft_server_players_online",
-    "sensor.minecraft_server_players_max",
-    "sensor.minecraft_server_world_message",
-    "sensor.minecraft_server_version",
-    "sensor.minecraft_server_protocol_version",
+    "sensor.mc_dummyserver_com_25566_latency",
+    "sensor.mc_dummyserver_com_25566_players_online",
+    "sensor.mc_dummyserver_com_25566_players_max",
+    "sensor.mc_dummyserver_com_25566_world_message",
+    "sensor.mc_dummyserver_com_25566_version",
+    "sensor.mc_dummyserver_com_25566_protocol_version",
 ]
 
 JAVA_SENSOR_ENTITIES_DISABLED_BY_DEFAULT: list[str] = [
-    "sensor.minecraft_server_players_max",
-    "sensor.minecraft_server_protocol_version",
+    "sensor.mc_dummyserver_com_25566_players_max",
+    "sensor.mc_dummyserver_com_25566_protocol_version",
 ]
 
 BEDROCK_SENSOR_ENTITIES: list[str] = [
-    "sensor.minecraft_server_latency",
-    "sensor.minecraft_server_players_online",
-    "sensor.minecraft_server_players_max",
-    "sensor.minecraft_server_world_message",
-    "sensor.minecraft_server_version",
-    "sensor.minecraft_server_protocol_version",
-    "sensor.minecraft_server_map_name",
-    "sensor.minecraft_server_game_mode",
-    "sensor.minecraft_server_edition",
+    "sensor.mc_dummyserver_com_25566_latency",
+    "sensor.mc_dummyserver_com_25566_players_online",
+    "sensor.mc_dummyserver_com_25566_players_max",
+    "sensor.mc_dummyserver_com_25566_world_message",
+    "sensor.mc_dummyserver_com_25566_version",
+    "sensor.mc_dummyserver_com_25566_protocol_version",
+    "sensor.mc_dummyserver_com_25566_map_name",
+    "sensor.mc_dummyserver_com_25566_game_mode",
+    "sensor.mc_dummyserver_com_25566_edition",
 ]
 
 BEDROCK_SENSOR_ENTITIES_DISABLED_BY_DEFAULT: list[str] = [
-    "sensor.minecraft_server_players_max",
-    "sensor.minecraft_server_protocol_version",
-    "sensor.minecraft_server_edition",
+    "sensor.mc_dummyserver_com_25566_players_max",
+    "sensor.mc_dummyserver_com_25566_protocol_version",
+    "sensor.mc_dummyserver_com_25566_edition",
 ]
 
 
diff --git a/tests/components/mobile_app/test_webhook.py b/tests/components/mobile_app/test_webhook.py
index dda5f369ad5..b071caebd16 100644
--- a/tests/components/mobile_app/test_webhook.py
+++ b/tests/components/mobile_app/test_webhook.py
@@ -1081,6 +1081,7 @@ async def test_webhook_handle_conversation_process(
             },
         },
         "conversation_id": None,
+        "continue_conversation": False,
     }
 
 
diff --git a/tests/components/modbus/conftest.py b/tests/components/modbus/conftest.py
index cdea046ceea..a35cc95605d 100644
--- a/tests/components/modbus/conftest.py
+++ b/tests/components/modbus/conftest.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed, mock_restore_cache
 
@@ -42,6 +42,7 @@ class ReadResult:
         self.registers = register_words
         self.bits = register_words
         self.value = register_words
+        self.count = len(register_words) if register_words is not None else 0
 
     def isError(self):
         """Set error state."""
diff --git a/tests/components/modbus/test_climate.py b/tests/components/modbus/test_climate.py
index b5bc9b02808..54d4c5f6666 100644
--- a/tests/components/modbus/test_climate.py
+++ b/tests/components/modbus/test_climate.py
@@ -5,6 +5,7 @@ import pytest
 from homeassistant.components.climate import (
     ATTR_FAN_MODE,
     ATTR_FAN_MODES,
+    ATTR_HVAC_ACTION,
     ATTR_HVAC_MODE,
     ATTR_HVAC_MODES,
     ATTR_SWING_MODE,
@@ -31,6 +32,7 @@ from homeassistant.components.climate import (
     SWING_OFF,
     SWING_ON,
     SWING_VERTICAL,
+    HVACAction,
     HVACMode,
 )
 from homeassistant.components.homeassistant import SERVICE_UPDATE_ENTITY
@@ -47,6 +49,16 @@ from homeassistant.components.modbus.const import (
     CONF_FAN_MODE_REGISTER,
     CONF_FAN_MODE_TOP,
     CONF_FAN_MODE_VALUES,
+    CONF_HVAC_ACTION_COOLING,
+    CONF_HVAC_ACTION_DEFROSTING,
+    CONF_HVAC_ACTION_DRYING,
+    CONF_HVAC_ACTION_FAN,
+    CONF_HVAC_ACTION_HEATING,
+    CONF_HVAC_ACTION_IDLE,
+    CONF_HVAC_ACTION_OFF,
+    CONF_HVAC_ACTION_PREHEATING,
+    CONF_HVAC_ACTION_REGISTER,
+    CONF_HVAC_ACTION_VALUES,
     CONF_HVAC_MODE_AUTO,
     CONF_HVAC_MODE_COOL,
     CONF_HVAC_MODE_DRY,
@@ -58,6 +70,7 @@ from homeassistant.components.modbus.const import (
     CONF_HVAC_MODE_VALUES,
     CONF_HVAC_OFF_VALUE,
     CONF_HVAC_ON_VALUE,
+    CONF_HVAC_ONOFF_COIL,
     CONF_HVAC_ONOFF_REGISTER,
     CONF_MAX_TEMP,
     CONF_MIN_TEMP,
@@ -223,6 +236,43 @@ ENTITY_ID = f"{CLIMATE_DOMAIN}.{TEST_ENTITY_NAME}".replace(" ", "_")
                 }
             ],
         },
+        {
+            CONF_CLIMATES: [
+                {
+                    CONF_NAME: TEST_ENTITY_NAME,
+                    CONF_TARGET_TEMP: 117,
+                    CONF_ADDRESS: 117,
+                    CONF_SLAVE: 10,
+                    CONF_HVAC_ONOFF_REGISTER: 12,
+                    CONF_HVAC_MODE_REGISTER: {
+                        CONF_ADDRESS: 11,
+                        CONF_WRITE_REGISTERS: True,
+                        CONF_HVAC_MODE_VALUES: {
+                            CONF_HVAC_MODE_OFF: 0,
+                            CONF_HVAC_MODE_HEAT: 1,
+                            CONF_HVAC_MODE_COOL: 2,
+                            CONF_HVAC_MODE_HEAT_COOL: 3,
+                            CONF_HVAC_MODE_DRY: 4,
+                            CONF_HVAC_MODE_FAN_ONLY: 5,
+                            CONF_HVAC_MODE_AUTO: 6,
+                        },
+                    },
+                    CONF_HVAC_ACTION_REGISTER: {
+                        CONF_ADDRESS: 14,
+                        CONF_HVAC_ACTION_VALUES: {
+                            CONF_HVAC_ACTION_COOLING: 0,
+                            CONF_HVAC_ACTION_DEFROSTING: 1,
+                            CONF_HVAC_ACTION_DRYING: 2,
+                            CONF_HVAC_ACTION_FAN: 3,
+                            CONF_HVAC_ACTION_HEATING: 4,
+                            CONF_HVAC_ACTION_IDLE: 5,
+                            CONF_HVAC_ACTION_OFF: 6,
+                            CONF_HVAC_ACTION_PREHEATING: 7,
+                        },
+                    },
+                }
+            ],
+        },
     ],
 )
 async def test_config_climate(hass: HomeAssistant, mock_modbus) -> None:
@@ -366,6 +416,29 @@ async def test_config_hvac_onoff_register(hass: HomeAssistant, mock_modbus) -> N
     assert HVACMode.AUTO in state.attributes[ATTR_HVAC_MODES]
 
 
+@pytest.mark.parametrize(
+    "do_config",
+    [
+        {
+            CONF_CLIMATES: [
+                {
+                    CONF_NAME: TEST_ENTITY_NAME,
+                    CONF_TARGET_TEMP: 117,
+                    CONF_ADDRESS: 117,
+                    CONF_SLAVE: 10,
+                    CONF_HVAC_ONOFF_REGISTER: 11,
+                }
+            ],
+        },
+    ],
+)
+async def test_config_hvac_onoff_coil(hass: HomeAssistant, mock_modbus) -> None:
+    """Run configuration test for On/Off coil."""
+    state = hass.states.get(ENTITY_ID)
+    assert HVACMode.OFF in state.attributes[ATTR_HVAC_MODES]
+    assert HVACMode.AUTO in state.attributes[ATTR_HVAC_MODES]
+
+
 @pytest.mark.parametrize(
     "do_config",
     [
@@ -407,6 +480,45 @@ async def test_hvac_onoff_values(hass: HomeAssistant, mock_modbus) -> None:
     mock_modbus.write_register.assert_called_with(11, value=0xFF, slave=10)
 
 
+@pytest.mark.parametrize(
+    "do_config",
+    [
+        {
+            CONF_CLIMATES: [
+                {
+                    CONF_NAME: TEST_ENTITY_NAME,
+                    CONF_TARGET_TEMP: 117,
+                    CONF_ADDRESS: 117,
+                    CONF_SLAVE: 10,
+                    CONF_HVAC_ONOFF_COIL: 11,
+                }
+            ],
+        },
+    ],
+)
+async def test_hvac_onoff_coil(hass: HomeAssistant, mock_modbus) -> None:
+    """Run configuration test for On/Off coil values."""
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: ENTITY_ID},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    mock_modbus.write_coil.assert_called_with(11, value=1, slave=10)
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: ENTITY_ID},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    mock_modbus.write_coil.assert_called_with(11, value=0, slave=10)
+
+
 @pytest.mark.parametrize(
     "do_config",
     [
@@ -562,6 +674,215 @@ async def test_service_climate_update(
     assert hass.states.get(ENTITY_ID).state == result
 
 
+@pytest.mark.parametrize(
+    ("do_config", "result", "register_words", "coil_value"),
+    [
+        (
+            {
+                CONF_CLIMATES: [
+                    {
+                        CONF_NAME: TEST_ENTITY_NAME,
+                        CONF_TARGET_TEMP: [130, 131, 132, 133, 134, 135, 136],
+                        CONF_ADDRESS: 117,
+                        CONF_SLAVE: 10,
+                        CONF_SCAN_INTERVAL: 0,
+                        CONF_DATA_TYPE: DataType.INT32,
+                        CONF_HVAC_MODE_REGISTER: {
+                            CONF_ADDRESS: 118,
+                            CONF_HVAC_MODE_VALUES: {
+                                CONF_HVAC_MODE_COOL: 0,
+                                CONF_HVAC_MODE_HEAT: 1,
+                                CONF_HVAC_MODE_DRY: 2,
+                            },
+                        },
+                        CONF_HVAC_ONOFF_COIL: 11,
+                    },
+                ]
+            },
+            HVACMode.COOL,
+            [0x00],
+            [0x01],
+        ),
+        (
+            {
+                CONF_CLIMATES: [
+                    {
+                        CONF_NAME: TEST_ENTITY_NAME,
+                        CONF_TARGET_TEMP: 119,
+                        CONF_ADDRESS: 117,
+                        CONF_SLAVE: 10,
+                        CONF_SCAN_INTERVAL: 0,
+                        CONF_DATA_TYPE: DataType.INT32,
+                        CONF_HVAC_MODE_REGISTER: {
+                            CONF_ADDRESS: 118,
+                            CONF_HVAC_MODE_VALUES: {
+                                CONF_HVAC_MODE_COOL: 0,
+                                CONF_HVAC_MODE_HEAT: 1,
+                                CONF_HVAC_MODE_DRY: 2,
+                            },
+                        },
+                        CONF_HVAC_ONOFF_COIL: 11,
+                    },
+                ]
+            },
+            HVACMode.HEAT,
+            [0x01],
+            [0x01],
+        ),
+        (
+            {
+                CONF_CLIMATES: [
+                    {
+                        CONF_NAME: TEST_ENTITY_NAME,
+                        CONF_TARGET_TEMP: 120,
+                        CONF_ADDRESS: 117,
+                        CONF_SLAVE: 10,
+                        CONF_SCAN_INTERVAL: 0,
+                        CONF_DATA_TYPE: DataType.INT32,
+                        CONF_HVAC_MODE_REGISTER: {
+                            CONF_ADDRESS: 118,
+                            CONF_HVAC_MODE_VALUES: {
+                                CONF_HVAC_MODE_COOL: 0,
+                                CONF_HVAC_MODE_HEAT: 2,
+                                CONF_HVAC_MODE_DRY: 3,
+                            },
+                        },
+                        CONF_HVAC_ONOFF_COIL: 11,
+                    },
+                ]
+            },
+            HVACMode.OFF,
+            [0x00],
+            [0x00],
+        ),
+        (
+            {
+                CONF_CLIMATES: [
+                    {
+                        CONF_NAME: TEST_ENTITY_NAME,
+                        CONF_TARGET_TEMP: 120,
+                        CONF_ADDRESS: 117,
+                        CONF_SLAVE: 10,
+                        CONF_SCAN_INTERVAL: 0,
+                        CONF_DATA_TYPE: DataType.INT32,
+                        CONF_HVAC_ONOFF_COIL: 11,
+                    },
+                ]
+            },
+            "unavailable",
+            [0x00],
+            None,
+        ),
+    ],
+)
+async def test_hvac_onoff_coil_update(
+    hass: HomeAssistant, mock_modbus_ha, result, register_words, coil_value
+) -> None:
+    """Test climate update based on On/Off coil values."""
+    mock_modbus_ha.read_holding_registers.return_value = ReadResult(register_words)
+    mock_modbus_ha.read_coils.return_value = ReadResult(coil_value)
+
+    await hass.services.async_call(
+        HOMEASSISTANT_DOMAIN,
+        SERVICE_UPDATE_ENTITY,
+        {ATTR_ENTITY_ID: ENTITY_ID},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY_ID)
+    assert state.state == result
+
+
+@pytest.mark.parametrize(
+    ("do_config", "result", "register_words"),
+    [
+        (
+            {
+                CONF_CLIMATES: [
+                    {
+                        CONF_NAME: TEST_ENTITY_NAME,
+                        CONF_TARGET_TEMP: 116,
+                        CONF_ADDRESS: 117,
+                        CONF_SLAVE: 10,
+                        CONF_SCAN_INTERVAL: 0,
+                        CONF_DATA_TYPE: DataType.INT32,
+                        CONF_HVAC_ACTION_REGISTER: {
+                            CONF_ADDRESS: 118,
+                            CONF_HVAC_ACTION_VALUES: {
+                                CONF_HVAC_ACTION_IDLE: 0,
+                                CONF_HVAC_ACTION_HEATING: 1,
+                            },
+                        },
+                    },
+                ]
+            },
+            HVACAction.HEATING,
+            [0x01],
+        ),
+        (
+            {
+                CONF_CLIMATES: [
+                    {
+                        CONF_NAME: TEST_ENTITY_NAME,
+                        CONF_TARGET_TEMP: 116,
+                        CONF_ADDRESS: 117,
+                        CONF_SLAVE: 10,
+                        CONF_SCAN_INTERVAL: 0,
+                        CONF_DATA_TYPE: DataType.INT32,
+                        CONF_HVAC_ACTION_REGISTER: {
+                            CONF_ADDRESS: 118,
+                            CONF_HVAC_ACTION_VALUES: {
+                                CONF_HVAC_ACTION_COOLING: 0,
+                                CONF_HVAC_ACTION_HEATING: 1,
+                            },
+                        },
+                    },
+                ]
+            },
+            HVACAction.COOLING,
+            [0x00],
+        ),
+        (
+            {
+                CONF_CLIMATES: [
+                    {
+                        CONF_NAME: TEST_ENTITY_NAME,
+                        CONF_TARGET_TEMP: 116,
+                        CONF_ADDRESS: 117,
+                        CONF_SLAVE: 10,
+                        CONF_SCAN_INTERVAL: 0,
+                        CONF_DATA_TYPE: DataType.INT32,
+                        CONF_HVAC_ACTION_REGISTER: {
+                            CONF_ADDRESS: 118,
+                            CONF_HVAC_ACTION_VALUES: {
+                                CONF_HVAC_ACTION_OFF: 0,
+                                CONF_HVAC_ACTION_DRYING: 1,
+                            },
+                        },
+                    },
+                ]
+            },
+            HVACAction.DRYING,
+            [0x01],
+        ),
+    ],
+)
+async def test_service_climate_action_update(
+    hass: HomeAssistant, mock_modbus_ha, result, register_words
+) -> None:
+    """Test HVAC action updates."""
+    mock_modbus_ha.read_holding_registers.return_value = ReadResult(register_words)
+    await hass.services.async_call(
+        HOMEASSISTANT_DOMAIN,
+        SERVICE_UPDATE_ENTITY,
+        {ATTR_ENTITY_ID: ENTITY_ID},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+    assert hass.states.get(ENTITY_ID).attributes[ATTR_HVAC_ACTION] == result
+
+
 @pytest.mark.parametrize(
     ("do_config", "result", "register_words"),
     [
diff --git a/tests/components/modbus/test_init.py b/tests/components/modbus/test_init.py
index e105818d193..7b76dbc3528 100644
--- a/tests/components/modbus/test_init.py
+++ b/tests/components/modbus/test_init.py
@@ -107,7 +107,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import (
     TEST_ENTITY_NAME,
diff --git a/tests/components/modbus/test_switch.py b/tests/components/modbus/test_switch.py
index 4e0ad0841ea..fc994c70d49 100644
--- a/tests/components/modbus/test_switch.py
+++ b/tests/components/modbus/test_switch.py
@@ -12,6 +12,7 @@ from homeassistant.components.modbus.const import (
     CALL_TYPE_DISCRETE,
     CALL_TYPE_REGISTER_HOLDING,
     CALL_TYPE_REGISTER_INPUT,
+    CALL_TYPE_X_REGISTER_HOLDINGS,
     CONF_DEVICE_ADDRESS,
     CONF_INPUT_TYPE,
     CONF_STATE_OFF,
@@ -41,7 +42,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, State
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import TEST_ENTITY_NAME, ReadResult
 
@@ -50,6 +51,7 @@ from tests.common import async_fire_time_changed
 ENTITY_ID = f"{SWITCH_DOMAIN}.{TEST_ENTITY_NAME}".replace(" ", "_")
 ENTITY_ID2 = f"{ENTITY_ID}_2"
 ENTITY_ID3 = f"{ENTITY_ID}_3"
+ENTITY_ID4 = f"{ENTITY_ID}_4"
 
 
 @pytest.mark.parametrize(
@@ -330,6 +332,13 @@ async def test_restore_state_switch(
                     CONF_SCAN_INTERVAL: 0,
                     CONF_VERIFY: {CONF_STATE_ON: [1, 3]},
                 },
+                {
+                    CONF_NAME: f"{TEST_ENTITY_NAME} 4",
+                    CONF_ADDRESS: 19,
+                    CONF_WRITE_TYPE: CALL_TYPE_X_REGISTER_HOLDINGS,
+                    CONF_SCAN_INTERVAL: 0,
+                    CONF_VERIFY: {CONF_STATE_ON: [1, 3]},
+                },
             ],
         },
     ],
@@ -381,6 +390,20 @@ async def test_switch_service_turn(
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID3).state == STATE_OFF
 
+    mock_modbus.read_holding_registers.return_value = ReadResult([0x03])
+    assert hass.states.get(ENTITY_ID4).state == STATE_OFF
+    await hass.services.async_call(
+        SWITCH_DOMAIN, SERVICE_TURN_ON, service_data={ATTR_ENTITY_ID: ENTITY_ID4}
+    )
+    await hass.async_block_till_done()
+    assert hass.states.get(ENTITY_ID4).state == STATE_ON
+    mock_modbus.read_holding_registers.return_value = ReadResult([0x00])
+    await hass.services.async_call(
+        SWITCH_DOMAIN, SERVICE_TURN_OFF, service_data={ATTR_ENTITY_ID: ENTITY_ID4}
+    )
+    await hass.async_block_till_done()
+    assert hass.states.get(ENTITY_ID4).state == STATE_OFF
+
     mock_modbus.write_register.side_effect = ModbusException("fail write_")
     await hass.services.async_call(
         SWITCH_DOMAIN, SERVICE_TURN_ON, service_data={ATTR_ENTITY_ID: ENTITY_ID2}
diff --git a/tests/components/modern_forms/snapshots/test_diagnostics.ambr b/tests/components/modern_forms/snapshots/test_diagnostics.ambr
index f8897a4a47f..1b4090ca5a4 100644
--- a/tests/components/modern_forms/snapshots/test_diagnostics.ambr
+++ b/tests/components/modern_forms/snapshots/test_diagnostics.ambr
@@ -16,6 +16,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': 'AA:BB:CC:DD:EE:FF',
       'version': 1,
diff --git a/tests/components/moehlenhoff_alpha2/__init__.py b/tests/components/moehlenhoff_alpha2/__init__.py
index 50087794560..90d6d88fedc 100644
--- a/tests/components/moehlenhoff_alpha2/__init__.py
+++ b/tests/components/moehlenhoff_alpha2/__init__.py
@@ -19,7 +19,7 @@ async def mock_update_data(self):
     for _type in ("HEATAREA", "HEATCTRL", "IODEVICE"):
         if not isinstance(data["Devices"]["Device"][_type], list):
             data["Devices"]["Device"][_type] = [data["Devices"]["Device"][_type]]
-    self.static_data = data
+    self._static_data = data
 
 
 async def init_integration(hass: HomeAssistant) -> MockConfigEntry:
diff --git a/tests/components/moehlenhoff_alpha2/snapshots/test_binary_sensor.ambr b/tests/components/moehlenhoff_alpha2/snapshots/test_binary_sensor.ambr
index dc6680ff99a..461cb33d776 100644
--- a/tests/components/moehlenhoff_alpha2/snapshots/test_binary_sensor.ambr
+++ b/tests/components/moehlenhoff_alpha2/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/moehlenhoff_alpha2/snapshots/test_button.ambr b/tests/components/moehlenhoff_alpha2/snapshots/test_button.ambr
index 7dfb9edb2e8..27244d781df 100644
--- a/tests/components/moehlenhoff_alpha2/snapshots/test_button.ambr
+++ b/tests/components/moehlenhoff_alpha2/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/moehlenhoff_alpha2/snapshots/test_climate.ambr b/tests/components/moehlenhoff_alpha2/snapshots/test_climate.ambr
index c1a63271a33..0708137e1cf 100644
--- a/tests/components/moehlenhoff_alpha2/snapshots/test_climate.ambr
+++ b/tests/components/moehlenhoff_alpha2/snapshots/test_climate.ambr
@@ -19,6 +19,7 @@
       'target_temp_step': 0.2,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/moehlenhoff_alpha2/snapshots/test_sensor.ambr b/tests/components/moehlenhoff_alpha2/snapshots/test_sensor.ambr
index 3fee26a6ed5..4b1c702591d 100644
--- a/tests/components/moehlenhoff_alpha2/snapshots/test_sensor.ambr
+++ b/tests/components/moehlenhoff_alpha2/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/monarch_money/snapshots/test_sensor.ambr b/tests/components/monarch_money/snapshots/test_sensor.ambr
index cf7e0cb7b2f..b70302188ed 100644
--- a/tests/components/monarch_money/snapshots/test_sensor.ambr
+++ b/tests/components/monarch_money/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -108,6 +110,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -160,6 +163,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -211,6 +215,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -261,6 +266,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -311,6 +317,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -362,6 +369,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -412,6 +420,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -463,6 +472,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -513,6 +523,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -564,6 +575,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -614,6 +626,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -665,6 +678,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -715,6 +729,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -766,6 +781,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -816,6 +832,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -867,6 +884,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -915,6 +933,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -965,6 +984,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1018,6 +1038,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1069,6 +1090,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/monzo/snapshots/test_sensor.ambr b/tests/components/monzo/snapshots/test_sensor.ambr
index 9be5943d35c..8d3f83ed4f1 100644
--- a/tests/components/monzo/snapshots/test_sensor.ambr
+++ b/tests/components/monzo/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -58,6 +59,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -110,6 +112,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -162,6 +165,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -214,6 +218,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/mopeka/test_config_flow.py b/tests/components/mopeka/test_config_flow.py
index 7a341052f22..d2887451629 100644
--- a/tests/components/mopeka/test_config_flow.py
+++ b/tests/components/mopeka/test_config_flow.py
@@ -81,6 +81,39 @@ async def test_async_step_user_with_found_devices(hass: HomeAssistant) -> None:
     assert result2["result"].unique_id == "aa:bb:cc:dd:ee:ff"
 
 
+async def test_async_step_user_replace_ignored(hass: HomeAssistant) -> None:
+    """Test setup from service info can replace an ignored entry."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=PRO_SERVICE_INFO.address,
+        data={},
+        source=config_entries.SOURCE_IGNORE,
+    )
+    entry.add_to_hass(hass)
+    with patch(
+        "homeassistant.components.mopeka.config_flow.async_discovered_service_info",
+        return_value=[PRO_SERVICE_INFO],
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_USER},
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    with patch("homeassistant.components.mopeka.async_setup_entry", return_value=True):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input={"address": "aa:bb:cc:dd:ee:ff"},
+        )
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "Pro Plus EEFF"
+    assert CONF_MEDIUM_TYPE in result2["data"]
+    assert result2["data"][CONF_MEDIUM_TYPE] in [
+        medium_type.value for medium_type in MediumType
+    ]
+    assert result2["result"].unique_id == "aa:bb:cc:dd:ee:ff"
+
+
 async def test_async_step_user_device_added_between_steps(hass: HomeAssistant) -> None:
     """Test the device gets added via another flow between steps."""
     with patch(
diff --git a/tests/components/motionblinds_ble/snapshots/test_diagnostics.ambr b/tests/components/motionblinds_ble/snapshots/test_diagnostics.ambr
index 5b4b169c0fe..d042dc02ac3 100644
--- a/tests/components/motionblinds_ble/snapshots/test_diagnostics.ambr
+++ b/tests/components/motionblinds_ble/snapshots/test_diagnostics.ambr
@@ -28,6 +28,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': '**REDACTED**',
       'unique_id': '**REDACTED**',
       'version': 1,
diff --git a/tests/components/motioneye/test_camera.py b/tests/components/motioneye/test_camera.py
index 8ef58cc968d..d9a9a847b63 100644
--- a/tests/components/motioneye/test_camera.py
+++ b/tests/components/motioneye/test_camera.py
@@ -45,8 +45,8 @@ from homeassistant.const import ATTR_DEVICE_ID, ATTR_ENTITY_ID, CONF_URL
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.util import dt as dt_util
 from homeassistant.util.aiohttp import MockRequest
-import homeassistant.util.dt as dt_util
 
 from . import (
     TEST_CAMERA,
diff --git a/tests/components/motioneye/test_web_hooks.py b/tests/components/motioneye/test_web_hooks.py
index fae7fccbb6d..bc345c0b66f 100644
--- a/tests/components/motioneye/test_web_hooks.py
+++ b/tests/components/motioneye/test_web_hooks.py
@@ -31,7 +31,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.network import NoURLAvailableError
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import (
     TEST_CAMERA,
diff --git a/tests/components/motionmount/__init__.py b/tests/components/motionmount/__init__.py
index ed7dae26663..3b97c8aa7fe 100644
--- a/tests/components/motionmount/__init__.py
+++ b/tests/components/motionmount/__init__.py
@@ -2,7 +2,7 @@
 
 from ipaddress import ip_address
 
-from homeassistant.const import CONF_HOST, CONF_PORT
+from homeassistant.const import CONF_HOST, CONF_PIN, CONF_PORT
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
 HOST = "192.168.1.31"
@@ -21,6 +21,8 @@ MOCK_USER_INPUT = {
     CONF_PORT: PORT,
 }
 
+MOCK_PIN_INPUT = {CONF_PIN: 1234}
+
 MOCK_ZEROCONF_TVM_SERVICE_INFO_V1 = ZeroconfServiceInfo(
     type=TVM_ZEROCONF_SERVICE_TYPE,
     name=f"{ZEROCONF_NAME}.{TVM_ZEROCONF_SERVICE_TYPE}",
diff --git a/tests/components/motionmount/test_config_flow.py b/tests/components/motionmount/test_config_flow.py
index 4de23de63c9..1fa2715595d 100644
--- a/tests/components/motionmount/test_config_flow.py
+++ b/tests/components/motionmount/test_config_flow.py
@@ -1,20 +1,23 @@
 """Tests for the Vogel's MotionMount config flow."""
 
 import dataclasses
+from datetime import timedelta
 import socket
 from unittest.mock import MagicMock, PropertyMock
 
+from freezegun.api import FrozenDateTimeFactory
 import motionmount
 import pytest
 
 from homeassistant.components.motionmount.const import DOMAIN
-from homeassistant.config_entries import SOURCE_USER, SOURCE_ZEROCONF
-from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT
+from homeassistant.config_entries import SOURCE_REAUTH, SOURCE_USER, SOURCE_ZEROCONF
+from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PIN, CONF_PORT
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
 from . import (
     HOST,
+    MOCK_PIN_INPUT,
     MOCK_USER_INPUT,
     MOCK_ZEROCONF_TVM_SERVICE_INFO_V1,
     MOCK_ZEROCONF_TVM_SERVICE_INFO_V2,
@@ -24,23 +27,12 @@ from . import (
     ZEROCONF_NAME,
 )
 
-from tests.common import MockConfigEntry
+from tests.common import MockConfigEntry, async_fire_time_changed
 
 MAC = bytes.fromhex("c4dd57f8a55f")
 pytestmark = pytest.mark.usefixtures("mock_setup_entry")
 
 
-async def test_show_user_form(hass: HomeAssistant) -> None:
-    """Test that the user set up form is served."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-    )
-
-    assert result["step_id"] == "user"
-    assert result["type"] is FlowResultType.FORM
-
-
 async def test_user_connection_error(
     hass: HomeAssistant,
     mock_motionmount_config_flow: MagicMock,
@@ -117,33 +109,6 @@ async def test_user_not_connected_error(
     assert result["reason"] == "not_connected"
 
 
-async def test_user_response_error_single_device_old_ce_old_new_pro(
-    hass: HomeAssistant,
-    mock_motionmount_config_flow: MagicMock,
-) -> None:
-    """Test that the flow creates an entry when there is a response error."""
-    mock_motionmount_config_flow.connect.side_effect = (
-        motionmount.MotionMountResponseError(motionmount.MotionMountResponse.NotFound)
-    )
-
-    user_input = MOCK_USER_INPUT.copy()
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-        data=user_input,
-    )
-
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == HOST
-
-    assert result["data"]
-    assert result["data"][CONF_HOST] == HOST
-    assert result["data"][CONF_PORT] == PORT
-
-    assert result["result"]
-
-
 async def test_user_response_error_single_device_new_ce_old_pro(
     hass: HomeAssistant,
     mock_motionmount_config_flow: MagicMock,
@@ -199,30 +164,6 @@ async def test_user_response_error_single_device_new_ce_new_pro(
     assert result["result"].unique_id == ZEROCONF_MAC
 
 
-async def test_user_response_error_multi_device_old_ce_old_new_pro(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_motionmount_config_flow: MagicMock,
-) -> None:
-    """Test that the flow is aborted when there are multiple devices."""
-    mock_config_entry.add_to_hass(hass)
-
-    mock_motionmount_config_flow.connect.side_effect = (
-        motionmount.MotionMountResponseError(motionmount.MotionMountResponse.NotFound)
-    )
-
-    user_input = MOCK_USER_INPUT.copy()
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-        data=user_input,
-    )
-
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "already_configured"
-
-
 async def test_user_response_error_multi_device_new_ce_new_pro(
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,
@@ -246,6 +187,53 @@ async def test_user_response_error_multi_device_new_ce_new_pro(
     assert result["reason"] == "already_configured"
 
 
+async def test_user_response_authentication_needed(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_motionmount_config_flow: MagicMock,
+) -> None:
+    """Test that authentication is requested when needed."""
+    type(mock_motionmount_config_flow).name = PropertyMock(return_value=ZEROCONF_NAME)
+    type(mock_motionmount_config_flow).mac = PropertyMock(return_value=MAC)
+    type(mock_motionmount_config_flow).is_authenticated = PropertyMock(
+        return_value=False
+    )
+
+    user_input = MOCK_USER_INPUT.copy()
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_USER},
+        data=user_input,
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "auth"
+
+    # Now simulate the user entered the correct pin to finalize the test
+    type(mock_motionmount_config_flow).is_authenticated = PropertyMock(
+        return_value=True
+    )
+    type(mock_motionmount_config_flow).can_authenticate = PropertyMock(
+        return_value=True
+    )
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input=MOCK_PIN_INPUT.copy(),
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == ZEROCONF_NAME
+
+    assert result["data"]
+    assert result["data"][CONF_HOST] == HOST
+    assert result["data"][CONF_PORT] == PORT
+
+    assert result["result"]
+    assert result["result"].unique_id == ZEROCONF_MAC
+
+
 async def test_zeroconf_connection_error(
     hass: HomeAssistant,
     mock_motionmount_config_flow: MagicMock,
@@ -322,48 +310,6 @@ async def test_zeroconf_not_connected_error(
     assert result["reason"] == "not_connected"
 
 
-async def test_show_zeroconf_form_old_ce_old_pro(
-    hass: HomeAssistant,
-    mock_motionmount_config_flow: MagicMock,
-) -> None:
-    """Test that the zeroconf confirmation form is served."""
-    mock_motionmount_config_flow.connect.side_effect = (
-        motionmount.MotionMountResponseError(motionmount.MotionMountResponse.NotFound)
-    )
-
-    discovery_info = dataclasses.replace(MOCK_ZEROCONF_TVM_SERVICE_INFO_V1)
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_ZEROCONF},
-        data=discovery_info,
-    )
-
-    assert result["step_id"] == "zeroconf_confirm"
-    assert result["type"] is FlowResultType.FORM
-    assert result["description_placeholders"] == {CONF_NAME: "My MotionMount"}
-
-
-async def test_show_zeroconf_form_old_ce_new_pro(
-    hass: HomeAssistant,
-    mock_motionmount_config_flow: MagicMock,
-) -> None:
-    """Test that the zeroconf confirmation form is served."""
-    mock_motionmount_config_flow.connect.side_effect = (
-        motionmount.MotionMountResponseError(motionmount.MotionMountResponse.NotFound)
-    )
-
-    discovery_info = dataclasses.replace(MOCK_ZEROCONF_TVM_SERVICE_INFO_V2)
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_ZEROCONF},
-        data=discovery_info,
-    )
-
-    assert result["step_id"] == "zeroconf_confirm"
-    assert result["type"] is FlowResultType.FORM
-    assert result["description_placeholders"] == {CONF_NAME: "My MotionMount"}
-
-
 async def test_show_zeroconf_form_new_ce_old_pro(
     hass: HomeAssistant,
     mock_motionmount_config_flow: MagicMock,
@@ -384,6 +330,21 @@ async def test_show_zeroconf_form_new_ce_old_pro(
     assert result["type"] is FlowResultType.FORM
     assert result["description_placeholders"] == {CONF_NAME: "My MotionMount"}
 
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input={}
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == ZEROCONF_NAME
+
+    assert result["data"]
+    assert result["data"][CONF_HOST] == ZEROCONF_HOSTNAME
+    assert result["data"][CONF_PORT] == PORT
+    assert result["data"][CONF_NAME] == ZEROCONF_NAME
+
+    assert result["result"]
+    assert result["result"].unique_id is None
+
 
 async def test_show_zeroconf_form_new_ce_new_pro(
     hass: HomeAssistant,
@@ -403,6 +364,21 @@ async def test_show_zeroconf_form_new_ce_new_pro(
     assert result["type"] is FlowResultType.FORM
     assert result["description_placeholders"] == {CONF_NAME: "My MotionMount"}
 
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input={}
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == ZEROCONF_NAME
+
+    assert result["data"]
+    assert result["data"][CONF_HOST] == ZEROCONF_HOSTNAME
+    assert result["data"][CONF_PORT] == PORT
+    assert result["data"][CONF_NAME] == ZEROCONF_NAME
+
+    assert result["result"]
+    assert result["result"].unique_id == ZEROCONF_MAC
+
 
 async def test_zeroconf_device_exists_abort(
     hass: HomeAssistant,
@@ -423,6 +399,346 @@ async def test_zeroconf_device_exists_abort(
     assert result["reason"] == "already_configured"
 
 
+async def test_zeroconf_authentication_needed(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_motionmount_config_flow: MagicMock,
+) -> None:
+    """Test that authentication is requested when needed."""
+    type(mock_motionmount_config_flow).mac = PropertyMock(return_value=MAC)
+    type(mock_motionmount_config_flow).is_authenticated = PropertyMock(
+        return_value=False
+    )
+
+    discovery_info = dataclasses.replace(MOCK_ZEROCONF_TVM_SERVICE_INFO_V2)
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_ZEROCONF},
+        data=discovery_info,
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "auth"
+
+    # Now simulate the user entered the correct pin to finalize the test
+    type(mock_motionmount_config_flow).is_authenticated = PropertyMock(
+        return_value=True
+    )
+    type(mock_motionmount_config_flow).can_authenticate = PropertyMock(
+        return_value=True
+    )
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input=MOCK_PIN_INPUT.copy(),
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == ZEROCONF_NAME
+
+    assert result["data"]
+    assert result["data"][CONF_HOST] == ZEROCONF_HOSTNAME
+    assert result["data"][CONF_PORT] == PORT
+    assert result["data"][CONF_NAME] == ZEROCONF_NAME
+
+    assert result["result"]
+    assert result["result"].unique_id == ZEROCONF_MAC
+
+
+async def test_authentication_incorrect_then_correct_pin(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_motionmount_config_flow: MagicMock,
+) -> None:
+    """Test that authentication is requested when needed."""
+    type(mock_motionmount_config_flow).name = PropertyMock(return_value=ZEROCONF_NAME)
+    type(mock_motionmount_config_flow).mac = PropertyMock(return_value=MAC)
+    type(mock_motionmount_config_flow).is_authenticated = PropertyMock(
+        return_value=False
+    )
+    type(mock_motionmount_config_flow).can_authenticate = PropertyMock(
+        return_value=True
+    )
+
+    user_input = MOCK_USER_INPUT.copy()
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_USER},
+        data=user_input,
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "auth"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input=MOCK_PIN_INPUT.copy(),
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "auth"
+
+    assert result["errors"]
+    assert result["errors"][CONF_PIN] == CONF_PIN
+
+    # Now simulate the user entered the correct pin to finalize the test
+    type(mock_motionmount_config_flow).is_authenticated = PropertyMock(
+        return_value=True
+    )
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input=MOCK_PIN_INPUT.copy(),
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == ZEROCONF_NAME
+
+    assert result["data"]
+    assert result["data"][CONF_HOST] == HOST
+    assert result["data"][CONF_PORT] == PORT
+
+    assert result["result"]
+    assert result["result"].unique_id == ZEROCONF_MAC
+
+
+async def test_authentication_first_incorrect_pin_to_backoff(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_motionmount_config_flow: MagicMock,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test that authentication is requested when needed."""
+    type(mock_motionmount_config_flow).name = PropertyMock(return_value=ZEROCONF_NAME)
+    type(mock_motionmount_config_flow).mac = PropertyMock(return_value=MAC)
+    type(mock_motionmount_config_flow).is_authenticated = PropertyMock(
+        return_value=False
+    )
+    type(mock_motionmount_config_flow).can_authenticate = PropertyMock(
+        side_effect=[True, 1]
+    )
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_USER},
+        data=MOCK_USER_INPUT.copy(),
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "auth"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input=MOCK_PIN_INPUT.copy(),
+    )
+
+    assert mock_motionmount_config_flow.authenticate.called
+    assert result["type"] is FlowResultType.SHOW_PROGRESS
+    assert result["step_id"] == "backoff"
+
+    freezer.tick(timedelta(seconds=2))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    # Now simulate the user entered the correct pin to finalize the test
+    type(mock_motionmount_config_flow).is_authenticated = PropertyMock(
+        return_value=True
+    )
+    type(mock_motionmount_config_flow).can_authenticate = PropertyMock(
+        return_value=True
+    )
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input=MOCK_PIN_INPUT.copy(),
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == ZEROCONF_NAME
+
+    assert result["data"]
+    assert result["data"][CONF_HOST] == HOST
+    assert result["data"][CONF_PORT] == PORT
+
+    assert result["result"]
+    assert result["result"].unique_id == ZEROCONF_MAC
+
+
+async def test_authentication_multiple_incorrect_pins(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_motionmount_config_flow: MagicMock,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test that authentication is requested when needed."""
+    type(mock_motionmount_config_flow).name = PropertyMock(return_value=ZEROCONF_NAME)
+    type(mock_motionmount_config_flow).mac = PropertyMock(return_value=MAC)
+    type(mock_motionmount_config_flow).is_authenticated = PropertyMock(
+        return_value=False
+    )
+    type(mock_motionmount_config_flow).can_authenticate = PropertyMock(return_value=1)
+
+    user_input = MOCK_USER_INPUT.copy()
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_USER},
+        data=user_input,
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "auth"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input=MOCK_PIN_INPUT.copy(),
+    )
+
+    assert result["type"] is FlowResultType.SHOW_PROGRESS
+    assert result["step_id"] == "backoff"
+
+    freezer.tick(timedelta(seconds=2))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    # Now simulate the user entered the correct pin to finalize the test
+    type(mock_motionmount_config_flow).is_authenticated = PropertyMock(
+        return_value=True
+    )
+    type(mock_motionmount_config_flow).can_authenticate = PropertyMock(
+        return_value=True
+    )
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input=MOCK_PIN_INPUT.copy(),
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == ZEROCONF_NAME
+
+    assert result["data"]
+    assert result["data"][CONF_HOST] == HOST
+    assert result["data"][CONF_PORT] == PORT
+
+    assert result["result"]
+    assert result["result"].unique_id == ZEROCONF_MAC
+
+
+async def test_authentication_show_backoff_when_still_running(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_motionmount_config_flow: MagicMock,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test that authentication is requested when needed."""
+    type(mock_motionmount_config_flow).name = PropertyMock(return_value=ZEROCONF_NAME)
+    type(mock_motionmount_config_flow).mac = PropertyMock(return_value=MAC)
+    type(mock_motionmount_config_flow).is_authenticated = PropertyMock(
+        return_value=False
+    )
+    type(mock_motionmount_config_flow).can_authenticate = PropertyMock(return_value=1)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_USER},
+        data=MOCK_USER_INPUT.copy(),
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "auth"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input=MOCK_PIN_INPUT.copy(),
+    )
+
+    assert result["type"] is FlowResultType.SHOW_PROGRESS
+    assert result["step_id"] == "backoff"
+
+    # This situation happens when the user cancels the progress dialog and tries to
+    # configure the MotionMount again
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input=None,
+    )
+
+    assert result["type"] is FlowResultType.SHOW_PROGRESS
+    assert result["step_id"] == "backoff"
+
+    freezer.tick(timedelta(seconds=2))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    # Now simulate the user entered the correct pin to finalize the test
+    type(mock_motionmount_config_flow).is_authenticated = PropertyMock(
+        return_value=True
+    )
+    type(mock_motionmount_config_flow).can_authenticate = PropertyMock(
+        return_value=True
+    )
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input=MOCK_PIN_INPUT.copy(),
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == ZEROCONF_NAME
+
+    assert result["data"]
+    assert result["data"][CONF_HOST] == HOST
+    assert result["data"][CONF_PORT] == PORT
+
+    assert result["result"]
+    assert result["result"].unique_id == ZEROCONF_MAC
+
+
+async def test_authentication_correct_pin(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_motionmount_config_flow: MagicMock,
+) -> None:
+    """Test that authentication is requested when needed."""
+    type(mock_motionmount_config_flow).name = PropertyMock(return_value=ZEROCONF_NAME)
+    type(mock_motionmount_config_flow).mac = PropertyMock(return_value=MAC)
+    type(mock_motionmount_config_flow).is_authenticated = PropertyMock(
+        return_value=False
+    )
+    type(mock_motionmount_config_flow).can_authenticate = PropertyMock(
+        return_value=True
+    )
+
+    user_input = MOCK_USER_INPUT.copy()
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_USER},
+        data=user_input,
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "auth"
+
+    type(mock_motionmount_config_flow).is_authenticated = PropertyMock(
+        return_value=True
+    )
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input=MOCK_PIN_INPUT.copy(),
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == ZEROCONF_NAME
+
+    assert result["data"]
+    assert result["data"][CONF_HOST] == HOST
+    assert result["data"][CONF_PORT] == PORT
+
+    assert result["result"]
+    assert result["result"].unique_id == ZEROCONF_MAC
+
+
 async def test_full_user_flow_implementation(
     hass: HomeAssistant,
     mock_motionmount_config_flow: MagicMock,
@@ -459,7 +775,7 @@ async def test_full_zeroconf_flow_implementation(
     hass: HomeAssistant,
     mock_motionmount_config_flow: MagicMock,
 ) -> None:
-    """Test the full manual user flow from start to finish."""
+    """Test the full zeroconf flow from start to finish."""
     type(mock_motionmount_config_flow).name = PropertyMock(return_value=ZEROCONF_NAME)
     type(mock_motionmount_config_flow).mac = PropertyMock(return_value=MAC)
 
@@ -487,3 +803,37 @@ async def test_full_zeroconf_flow_implementation(
 
     assert result["result"]
     assert result["result"].unique_id == ZEROCONF_MAC
+
+
+async def test_full_reauth_flow_implementation(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_motionmount_config_flow: MagicMock,
+) -> None:
+    """Test reauthentication."""
+    mock_config_entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={
+            "source": SOURCE_REAUTH,
+            "entry_id": mock_config_entry.entry_id,
+        },
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "auth"
+
+    type(mock_motionmount_config_flow).can_authenticate = PropertyMock(
+        return_value=True
+    )
+    type(mock_motionmount_config_flow).is_authenticated = PropertyMock(
+        return_value=True
+    )
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input=MOCK_PIN_INPUT.copy(),
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reauth_successful"
diff --git a/tests/components/motionmount/test_sensor.py b/tests/components/motionmount/test_sensor.py
new file mode 100644
index 00000000000..0320e62d640
--- /dev/null
+++ b/tests/components/motionmount/test_sensor.py
@@ -0,0 +1,49 @@
+"""Tests for the MotionMount Sensor platform."""
+
+from unittest.mock import patch
+
+from motionmount import MotionMountSystemError
+import pytest
+
+from homeassistant.core import HomeAssistant
+
+from . import ZEROCONF_NAME
+
+from tests.common import MockConfigEntry
+
+MAC = bytes.fromhex("c4dd57f8a55f")
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+@pytest.mark.parametrize(
+    ("system_status", "state"),
+    [
+        (None, "none"),
+        (MotionMountSystemError.MotorError, "motor"),
+        (MotionMountSystemError.ObstructionDetected, "obstruction"),
+        (MotionMountSystemError.TVWidthConstraintError, "tv_width_constraint"),
+        (MotionMountSystemError.HDMICECError, "hdmi_cec"),
+        (MotionMountSystemError.InternalError, "internal"),
+    ],
+)
+async def test_error_status_sensor_states(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    system_status: MotionMountSystemError,
+    state: str,
+) -> None:
+    """Tests the state attributes."""
+    with patch(
+        "homeassistant.components.motionmount.motionmount.MotionMount",
+        autospec=True,
+    ) as motionmount_mock:
+        motionmount_mock.return_value.name = ZEROCONF_NAME
+        motionmount_mock.return_value.mac = MAC
+        motionmount_mock.return_value.is_authenticated = True
+        motionmount_mock.return_value.system_status = [system_status]
+
+        mock_config_entry.add_to_hass(hass)
+
+        assert await hass.config_entries.async_setup(mock_config_entry.entry_id)
+
+        assert hass.states.get("sensor.my_motionmount_error_status").state == state
diff --git a/tests/components/mqtt/test_common.py b/tests/components/mqtt/common.py
similarity index 91%
rename from tests/components/mqtt/test_common.py
rename to tests/components/mqtt/common.py
index a34907adbaf..e4a368f0d71 100644
--- a/tests/components/mqtt/test_common.py
+++ b/tests/components/mqtt/common.py
@@ -66,6 +66,212 @@ DEFAULT_CONFIG_DEVICE_INFO_MAC = {
     "configuration_url": "http://example.com",
 }
 
+MOCK_SUBENTRY_NOTIFY_COMPONENT1 = {
+    "363a7ecad6be4a19b939a016ea93e994": {
+        "platform": "notify",
+        "name": "Milkman alert",
+        "command_topic": "test-topic",
+        "command_template": "{{ value }}",
+        "entity_picture": "https://example.com/363a7ecad6be4a19b939a016ea93e994",
+        "retain": False,
+    },
+}
+MOCK_SUBENTRY_NOTIFY_COMPONENT2 = {
+    "6494827dac294fa0827c54b02459d309": {
+        "platform": "notify",
+        "name": "The second notifier",
+        "command_topic": "test-topic2",
+        "entity_picture": "https://example.com/6494827dac294fa0827c54b02459d309",
+    },
+}
+MOCK_SUBENTRY_NOTIFY_COMPONENT_NO_NAME = {
+    "5269352dd9534c908d22812ea5d714cd": {
+        "platform": "notify",
+        "command_topic": "test-topic",
+        "command_template": "{{ value }}",
+        "entity_picture": "https://example.com/5269352dd9534c908d22812ea5d714cd",
+        "retain": False,
+    },
+}
+
+MOCK_SUBENTRY_SENSOR_COMPONENT = {
+    "e9261f6feed443e7b7d5f3fbe2a47412": {
+        "platform": "sensor",
+        "name": "Energy",
+        "device_class": "enum",
+        "state_topic": "test-topic",
+        "options": ["low", "medium", "high"],
+        "expire_after": 30,
+        "value_template": "{{ value_json.value }}",
+        "entity_picture": "https://example.com/e9261f6feed443e7b7d5f3fbe2a47412",
+    },
+}
+MOCK_SUBENTRY_SENSOR_COMPONENT_STATE_CLASS = {
+    "a0f85790a95d4889924602effff06b6e": {
+        "platform": "sensor",
+        "name": "Energy",
+        "state_class": "measurement",
+        "state_topic": "test-topic",
+        "entity_picture": "https://example.com/a0f85790a95d4889924602effff06b6e",
+    },
+}
+MOCK_SUBENTRY_SENSOR_COMPONENT_LAST_RESET = {
+    "e9261f6feed443e7b7d5f3fbe2a47412": {
+        "platform": "sensor",
+        "name": "Energy",
+        "state_class": "total",
+        "last_reset_value_template": "{{ value_json.value }}",
+        "state_topic": "test-topic",
+        "entity_picture": "https://example.com/e9261f6feed443e7b7d5f3fbe2a47412",
+    },
+}
+MOCK_SUBENTRY_SWITCH_COMPONENT = {
+    "3faf1318016c46c5aea26707eeb6f12e": {
+        "platform": "switch",
+        "name": "Outlet",
+        "device_class": "outlet",
+        "command_topic": "test-topic",
+        "state_topic": "test-topic",
+        "command_template": "{{ value }}",
+        "value_template": "{{ value_json.value }}",
+        "entity_picture": "https://example.com/3faf1318016c46c5aea26707eeb6f12e",
+        "optimistic": True,
+    },
+}
+
+# Bogus light component just for code coverage
+# Note that light cannot be setup through the UI yet
+# The test is for code coverage
+MOCK_SUBENTRY_LIGHT_COMPONENT = {
+    "8131babc5e8d4f44b82e0761d39091a2": {
+        "platform": "light",
+        "name": "Test light",
+        "command_topic": "test-topic4",
+        "schema": "basic",
+        "entity_picture": "https://example.com/8131babc5e8d4f44b82e0761d39091a2",
+    },
+}
+MOCK_SUBENTRY_NOTIFY_BAD_SCHEMA = {
+    "b10b531e15244425a74bb0abb1e9d2c6": {
+        "platform": "notify",
+        "name": "Test",
+        "command_topic": "bad#topic",
+    },
+}
+
+MOCK_SUBENTRY_AVAILABILITY_DATA = {
+    "availability": {
+        "availability_topic": "test/availability",
+        "availability_template": "{{ value_json.availability }}",
+        "payload_available": "online",
+        "payload_not_available": "offline",
+    }
+}
+
+MOCK_NOTIFY_SUBENTRY_DATA_MULTI = {
+    "device": {
+        "name": "Milk notifier",
+        "sw_version": "1.0",
+        "hw_version": "2.1 rev a",
+        "model": "Model XL",
+        "model_id": "mn002",
+        "configuration_url": "https://example.com",
+    },
+    "components": MOCK_SUBENTRY_NOTIFY_COMPONENT1 | MOCK_SUBENTRY_NOTIFY_COMPONENT2,
+} | MOCK_SUBENTRY_AVAILABILITY_DATA
+
+MOCK_NOTIFY_SUBENTRY_DATA_SINGLE = {
+    "device": {
+        "name": "Milk notifier",
+        "sw_version": "1.0",
+        "hw_version": "2.1 rev a",
+        "model": "Model XL",
+        "model_id": "mn002",
+        "configuration_url": "https://example.com",
+        "mqtt_settings": {"qos": 1},
+    },
+    "components": MOCK_SUBENTRY_NOTIFY_COMPONENT1,
+}
+MOCK_NOTIFY_SUBENTRY_DATA_NO_NAME = {
+    "device": {
+        "name": "Milk notifier",
+        "sw_version": "1.0",
+        "hw_version": "2.1 rev a",
+        "model": "Model XL",
+        "model_id": "mn002",
+        "configuration_url": "https://example.com",
+    },
+    "components": MOCK_SUBENTRY_NOTIFY_COMPONENT_NO_NAME,
+}
+MOCK_SENSOR_SUBENTRY_DATA_SINGLE = {
+    "device": {
+        "name": "Test sensor",
+        "sw_version": "1.0",
+        "hw_version": "2.1 rev a",
+        "model": "Model XL",
+        "model_id": "mn002",
+        "configuration_url": "https://example.com",
+    },
+    "components": MOCK_SUBENTRY_SENSOR_COMPONENT,
+}
+MOCK_SENSOR_SUBENTRY_DATA_SINGLE_STATE_CLASS = {
+    "device": {
+        "name": "Test sensor",
+        "sw_version": "1.0",
+        "hw_version": "2.1 rev a",
+        "model": "Model XL",
+        "model_id": "mn002",
+        "configuration_url": "https://example.com",
+    },
+    "components": MOCK_SUBENTRY_SENSOR_COMPONENT_STATE_CLASS,
+}
+MOCK_SENSOR_SUBENTRY_DATA_SINGLE_LAST_RESET_TEMPLATE = {
+    "device": {
+        "name": "Test sensor",
+        "sw_version": "1.0",
+        "hw_version": "2.1 rev a",
+        "model": "Model XL",
+        "model_id": "mn002",
+        "configuration_url": "https://example.com",
+    },
+    "components": MOCK_SUBENTRY_SENSOR_COMPONENT_LAST_RESET,
+}
+MOCK_SWITCH_SUBENTRY_DATA_SINGLE_STATE_CLASS = {
+    "device": {
+        "name": "Test switch",
+        "sw_version": "1.0",
+        "hw_version": "2.1 rev a",
+        "model": "Model XL",
+        "model_id": "mn002",
+        "configuration_url": "https://example.com",
+    },
+    "components": MOCK_SUBENTRY_SWITCH_COMPONENT,
+}
+MOCK_SUBENTRY_DATA_BAD_COMPONENT_SCHEMA = {
+    "device": {
+        "name": "Milk notifier",
+        "sw_version": "1.0",
+        "hw_version": "2.1 rev a",
+        "model": "Model XL",
+        "model_id": "mn002",
+        "configuration_url": "https://example.com",
+    },
+    "components": MOCK_SUBENTRY_NOTIFY_BAD_SCHEMA,
+}
+MOCK_SUBENTRY_DATA_SET_MIX = {
+    "device": {
+        "name": "Milk notifier",
+        "sw_version": "1.0",
+        "hw_version": "2.1 rev a",
+        "model": "Model XL",
+        "model_id": "mn002",
+        "configuration_url": "https://example.com",
+    },
+    "components": MOCK_SUBENTRY_NOTIFY_COMPONENT1
+    | MOCK_SUBENTRY_NOTIFY_COMPONENT2
+    | MOCK_SUBENTRY_LIGHT_COMPONENT
+    | MOCK_SUBENTRY_SWITCH_COMPONENT,
+} | MOCK_SUBENTRY_AVAILABILITY_DATA
 _SENTINEL = object()
 
 DISCOVERY_COUNT = sum(len(discovery_topic) for discovery_topic in MQTT.values())
@@ -1854,9 +2060,14 @@ async def help_test_reload_with_config(
 ) -> None:
     """Test reloading with supplied config."""
     new_yaml_config_file = tmp_path / "configuration.yaml"
-    new_yaml_config = yaml.dump(config)
-    new_yaml_config_file.write_text(new_yaml_config)
-    assert new_yaml_config_file.read_text() == new_yaml_config
+
+    def _write_yaml_config() -> None:
+        new_yaml_config = yaml.dump(config)
+        new_yaml_config_file.write_text(new_yaml_config)
+        assert new_yaml_config_file.read_text() == new_yaml_config
+        return new_yaml_config
+
+    await hass.async_add_executor_job(_write_yaml_config)
 
     with patch.object(module_hass_config, "YAML_CONFIG_FILE", new_yaml_config_file):
         await hass.services.async_call(
diff --git a/tests/components/mqtt/conftest.py b/tests/components/mqtt/conftest.py
index 2a1e4012f51..efe5d0f1a4e 100644
--- a/tests/components/mqtt/conftest.py
+++ b/tests/components/mqtt/conftest.py
@@ -2,6 +2,7 @@
 
 import asyncio
 from collections.abc import AsyncGenerator, Generator
+from pathlib import Path
 from random import getrandbits
 from typing import Any
 from unittest.mock import AsyncMock, patch
@@ -38,14 +39,23 @@ def temp_dir_prefix() -> str:
     return "test"
 
 
-@pytest.fixture
-def mock_temp_dir(temp_dir_prefix: str) -> Generator[str]:
+@pytest.fixture(autouse=True)
+async def mock_temp_dir(
+    hass: HomeAssistant, tmp_path: Path, temp_dir_prefix: str
+) -> AsyncGenerator[str]:
     """Mock the certificate temp directory."""
-    with patch(
-        # Patch temp dir name to avoid tests fail running in parallel
-        "homeassistant.components.mqtt.util.TEMP_DIR_NAME",
-        f"home-assistant-mqtt-{temp_dir_prefix}-{getrandbits(10):03x}",
-    ) as mocked_temp_dir:
+    mqtt_temp_dir = f"home-assistant-mqtt-{temp_dir_prefix}-{getrandbits(10):03x}"
+    with (
+        patch(
+            "homeassistant.components.mqtt.util.tempfile.gettempdir",
+            return_value=tmp_path,
+        ),
+        patch(
+            # Patch temp dir name to avoid tests fail running in parallel
+            "homeassistant.components.mqtt.util.TEMP_DIR_NAME",
+            mqtt_temp_dir,
+        ) as mocked_temp_dir,
+    ):
         yield mocked_temp_dir
 
 
diff --git a/tests/components/mqtt/test_alarm_control_panel.py b/tests/components/mqtt/test_alarm_control_panel.py
index b46829650f6..9241106496b 100644
--- a/tests/components/mqtt/test_alarm_control_panel.py
+++ b/tests/components/mqtt/test_alarm_control_panel.py
@@ -33,7 +33,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
diff --git a/tests/components/mqtt/test_binary_sensor.py b/tests/components/mqtt/test_binary_sensor.py
index d27163c3423..169e1ab4c6b 100644
--- a/tests/components/mqtt/test_binary_sensor.py
+++ b/tests/components/mqtt/test_binary_sensor.py
@@ -21,9 +21,9 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, State, callback
 from homeassistant.helpers.typing import ConfigType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
@@ -1034,6 +1034,7 @@ async def test_reloadable(
     await help_test_reloadable(hass, mqtt_client_mock, domain, config)
 
 
+@pytest.mark.usefixtures("mock_temp_dir")
 @pytest.mark.parametrize(
     ("hass_config", "payload1", "state1", "payload2", "state2"),
     [
diff --git a/tests/components/mqtt/test_button.py b/tests/components/mqtt/test_button.py
index f147b33c88b..f99c48a440f 100644
--- a/tests/components/mqtt/test_button.py
+++ b/tests/components/mqtt/test_button.py
@@ -10,7 +10,7 @@ from homeassistant.components import button, mqtt
 from homeassistant.const import ATTR_ENTITY_ID, ATTR_FRIENDLY_NAME, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 
-from .test_common import (
+from .common import (
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
     help_test_custom_availability_payload,
diff --git a/tests/components/mqtt/test_camera.py b/tests/components/mqtt/test_camera.py
index cda536dc19e..b5971adcb92 100644
--- a/tests/components/mqtt/test_camera.py
+++ b/tests/components/mqtt/test_camera.py
@@ -11,7 +11,7 @@ from homeassistant.components import camera, mqtt
 from homeassistant.components.mqtt.camera import MQTT_CAMERA_ATTRIBUTES_BLOCKED
 from homeassistant.core import HomeAssistant
 
-from .test_common import (
+from .common import (
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
     help_test_custom_availability_payload,
diff --git a/tests/components/mqtt/test_client.py b/tests/components/mqtt/test_client.py
index ad64b39a480..c2cce3d1344 100644
--- a/tests/components/mqtt/test_client.py
+++ b/tests/components/mqtt/test_client.py
@@ -27,11 +27,12 @@ from homeassistant.core import CALLBACK_TYPE, CoreState, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.util.dt import utcnow
 
+from .common import help_all_subscribe_calls
 from .conftest import ENTRY_DEFAULT_BIRTH_MESSAGE
-from .test_common import help_all_subscribe_calls
 
 from tests.common import (
     MockConfigEntry,
+    MockMqttReasonCode,
     async_fire_mqtt_message,
     async_fire_time_changed,
 )
@@ -94,7 +95,7 @@ async def test_mqtt_await_ack_at_disconnect(hass: HomeAssistant) -> None:
         mqtt_client.connect = MagicMock(
             return_value=0,
             side_effect=lambda *args, **kwargs: hass.loop.call_soon_threadsafe(
-                mqtt_client.on_connect, mqtt_client, None, 0, 0, 0
+                mqtt_client.on_connect, mqtt_client, None, 0, MockMqttReasonCode()
             ),
         )
         mqtt_client.publish = MagicMock(return_value=FakeInfo())
@@ -119,7 +120,7 @@ async def test_mqtt_await_ack_at_disconnect(hass: HomeAssistant) -> None:
         )
         await asyncio.sleep(0)
         # Simulate late ACK callback from client with mid 100
-        mqtt_client.on_publish(0, 0, 100)
+        mqtt_client.on_publish(0, 0, 100, MockMqttReasonCode(), None)
         # disconnect the MQTT client
         await hass.async_stop()
         await hass.async_block_till_done()
@@ -778,10 +779,10 @@ async def test_replaying_payload_same_topic(
     calls_a = []
     calls_b = []
     mqtt_client_mock.reset_mock()
-    mqtt_client_mock.on_disconnect(None, None, 0)
+    mqtt_client_mock.on_disconnect(None, None, 0, MockMqttReasonCode())
 
     mock_debouncer.clear()
-    mqtt_client_mock.on_connect(None, None, None, 0)
+    mqtt_client_mock.on_connect(None, None, None, MockMqttReasonCode())
     await mock_debouncer.wait()
     mqtt_client_mock.subscribe.assert_called()
     # Simulate a (retained) message played back after reconnecting
@@ -908,10 +909,10 @@ async def test_replaying_payload_wildcard_topic(
     calls_a = []
     calls_b = []
     mqtt_client_mock.reset_mock()
-    mqtt_client_mock.on_disconnect(None, None, 0)
+    mqtt_client_mock.on_disconnect(None, None, 0, MockMqttReasonCode())
 
     mock_debouncer.clear()
-    mqtt_client_mock.on_connect(None, None, None, 0)
+    mqtt_client_mock.on_connect(None, None, None, MockMqttReasonCode())
     await mock_debouncer.wait()
 
     mqtt_client_mock.subscribe.assert_called()
@@ -1045,7 +1046,7 @@ async def test_restore_subscriptions_on_reconnect(
     assert ("test/state", 0) in help_all_subscribe_calls(mqtt_client_mock)
 
     mqtt_client_mock.reset_mock()
-    mqtt_client_mock.on_disconnect(None, None, 0)
+    mqtt_client_mock.on_disconnect(None, None, 0, MockMqttReasonCode())
 
     # Test to subscribe orther topic while the client is not connected
     await mqtt.async_subscribe(hass, "test/other", record_calls)
@@ -1053,7 +1054,7 @@ async def test_restore_subscriptions_on_reconnect(
     assert ("test/other", 0) not in help_all_subscribe_calls(mqtt_client_mock)
 
     mock_debouncer.clear()
-    mqtt_client_mock.on_connect(None, None, None, 0)
+    mqtt_client_mock.on_connect(None, None, None, MockMqttReasonCode())
     await mock_debouncer.wait()
     # Assert all subscriptions are performed at the broker
     assert ("test/state", 0) in help_all_subscribe_calls(mqtt_client_mock)
@@ -1089,10 +1090,10 @@ async def test_restore_all_active_subscriptions_on_reconnect(
     unsub()
     assert mqtt_client_mock.unsubscribe.call_count == 0
 
-    mqtt_client_mock.on_disconnect(None, None, 0)
+    mqtt_client_mock.on_disconnect(None, None, 0, MockMqttReasonCode())
 
     mock_debouncer.clear()
-    mqtt_client_mock.on_connect(None, None, None, 0)
+    mqtt_client_mock.on_connect(None, None, None, MockMqttReasonCode())
     # wait for cooldown
     await mock_debouncer.wait()
 
@@ -1160,27 +1161,37 @@ async def test_logs_error_if_no_connect_broker(
 ) -> None:
     """Test for setup failure if connection to broker is missing."""
     mqtt_client_mock = setup_with_birth_msg_client_mock
-    # test with rc = 3 -> broker unavailable
-    mqtt_client_mock.on_disconnect(Mock(), None, 0)
-    mqtt_client_mock.on_connect(Mock(), None, None, 3)
-    await hass.async_block_till_done()
-    assert (
-        "Unable to connect to the MQTT broker: Connection Refused: broker unavailable."
-        in caplog.text
+    # test with reason code = 136 -> server unavailable
+    mqtt_client_mock.on_disconnect(Mock(), None, None, MockMqttReasonCode())
+    mqtt_client_mock.on_connect(
+        Mock(),
+        None,
+        None,
+        MockMqttReasonCode(value=136, is_failure=True, name="Server unavailable"),
     )
+    await hass.async_block_till_done()
+    assert "Unable to connect to the MQTT broker: Server unavailable" in caplog.text
 
 
-@pytest.mark.parametrize("return_code", [4, 5])
+@pytest.mark.parametrize(
+    "reason_code",
+    [
+        MockMqttReasonCode(
+            value=134, is_failure=True, name="Bad user name or password"
+        ),
+        MockMqttReasonCode(value=135, is_failure=True, name="Not authorized"),
+    ],
+)
 async def test_triggers_reauth_flow_if_auth_fails(
     hass: HomeAssistant,
     setup_with_birth_msg_client_mock: MqttMockPahoClient,
-    return_code: int,
+    reason_code: MockMqttReasonCode,
 ) -> None:
     """Test re-auth is triggered if authentication is failing."""
     mqtt_client_mock = setup_with_birth_msg_client_mock
     # test with rc = 4 -> CONNACK_REFUSED_NOT_AUTHORIZED and 5 -> CONNACK_REFUSED_BAD_USERNAME_PASSWORD
-    mqtt_client_mock.on_disconnect(Mock(), None, 0)
-    mqtt_client_mock.on_connect(Mock(), None, None, return_code)
+    mqtt_client_mock.on_disconnect(Mock(), None, 0, MockMqttReasonCode(), None)
+    mqtt_client_mock.on_connect(Mock(), None, None, reason_code)
     await hass.async_block_till_done()
     flows = hass.config_entries.flow.async_progress()
     assert len(flows) == 1
@@ -1197,7 +1208,9 @@ async def test_handle_mqtt_on_callback(
     mqtt_client_mock = setup_with_birth_msg_client_mock
     with patch.object(mqtt_client_mock, "get_mid", return_value=100):
         # Simulate an ACK for mid == 100, this will call mqtt_mock._async_get_mid_future(mid)
-        mqtt_client_mock.on_publish(mqtt_client_mock, None, 100)
+        mqtt_client_mock.on_publish(
+            mqtt_client_mock, None, 100, MockMqttReasonCode(), None
+        )
         await hass.async_block_till_done()
         # Make sure the ACK has been received
         await hass.async_block_till_done()
@@ -1219,7 +1232,7 @@ async def test_handle_mqtt_on_callback_after_cancellation(
     # Simulate the mid future getting a cancellation
     mqtt_mock()._async_get_mid_future(101).cancel()
     # Simulate an ACK for mid == 101, being received after the cancellation
-    mqtt_client_mock.on_publish(mqtt_client_mock, None, 101)
+    mqtt_client_mock.on_publish(mqtt_client_mock, None, 101, MockMqttReasonCode(), None)
     await hass.async_block_till_done()
     assert "No ACK from MQTT server" not in caplog.text
     assert "InvalidStateError" not in caplog.text
@@ -1236,7 +1249,7 @@ async def test_handle_mqtt_on_callback_after_timeout(
     # Simulate the mid future getting a timeout
     mqtt_mock()._async_get_mid_future(101).set_exception(asyncio.TimeoutError)
     # Simulate an ACK for mid == 101, being received after the timeout
-    mqtt_client_mock.on_publish(mqtt_client_mock, None, 101)
+    mqtt_client_mock.on_publish(mqtt_client_mock, None, 101, MockMqttReasonCode(), None)
     await hass.async_block_till_done()
     assert "No ACK from MQTT server" not in caplog.text
     assert "InvalidStateError" not in caplog.text
@@ -1258,7 +1271,7 @@ async def test_publish_error(
     with patch(
         "homeassistant.components.mqtt.async_client.AsyncMQTTClient"
     ) as mock_client:
-        mock_client().connect = lambda *args: 1
+        mock_client().connect = lambda **kwargs: 1
         mock_client().publish().rc = 1
         assert await hass.config_entries.async_setup(entry.entry_id)
         with pytest.raises(HomeAssistantError):
@@ -1317,7 +1330,7 @@ async def test_handle_message_callback(
 
 
 @pytest.mark.parametrize(
-    ("mqtt_config_entry_data", "protocol"),
+    ("mqtt_config_entry_data", "protocol", "clean_session"),
     [
         (
             {
@@ -1325,6 +1338,7 @@ async def test_handle_message_callback(
                 CONF_PROTOCOL: "3.1",
             },
             3,
+            True,
         ),
         (
             {
@@ -1332,6 +1346,7 @@ async def test_handle_message_callback(
                 CONF_PROTOCOL: "3.1.1",
             },
             4,
+            True,
         ),
         (
             {
@@ -1339,22 +1354,72 @@ async def test_handle_message_callback(
                 CONF_PROTOCOL: "5",
             },
             5,
+            None,
         ),
     ],
+    ids=["v3.1", "v3.1.1", "v5"],
 )
-async def test_setup_mqtt_client_protocol(
-    mqtt_mock_entry: MqttMockHAClientGenerator, protocol: int
+async def test_setup_mqtt_client_clean_session_and_protocol(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    mqtt_client_mock: MqttMockPahoClient,
+    protocol: int,
+    clean_session: bool | None,
 ) -> None:
-    """Test MQTT client protocol setup."""
+    """Test MQTT client clean_session and protocol setup."""
     with patch(
         "homeassistant.components.mqtt.async_client.AsyncMQTTClient"
     ) as mock_client:
         await mqtt_mock_entry()
 
+    # check if clean_session was correctly
+    assert mock_client.call_args[1]["clean_session"] == clean_session
+
     # check if protocol setup was correctly
     assert mock_client.call_args[1]["protocol"] == protocol
 
 
+@pytest.mark.parametrize(
+    ("mqtt_config_entry_data", "connect_args"),
+    [
+        (
+            {
+                mqtt.CONF_BROKER: "mock-broker",
+                CONF_PROTOCOL: "3.1",
+            },
+            call(host="mock-broker", port=1883, keepalive=60, clean_start=3),
+        ),
+        (
+            {
+                mqtt.CONF_BROKER: "mock-broker",
+                CONF_PROTOCOL: "3.1.1",
+            },
+            call(host="mock-broker", port=1883, keepalive=60, clean_start=3),
+        ),
+        (
+            {
+                mqtt.CONF_BROKER: "mock-broker",
+                CONF_PROTOCOL: "5",
+            },
+            call(host="mock-broker", port=1883, keepalive=60, clean_start=True),
+        ),
+    ],
+    ids=["v3.1", "v3.1.1", "v5"],
+)
+async def test_setup_mqtt_client_clean_start(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    mqtt_client_mock: MqttMockPahoClient,
+    connect_args: tuple[Any],
+) -> None:
+    """Test MQTT client protocol connects with `clean_start` set correctly."""
+    await mqtt_mock_entry()
+
+    # check if clean_start was set correctly
+    assert len(mqtt_client_mock.connect.mock_calls) == 1
+    assert mqtt_client_mock.connect.mock_calls[0] == connect_args
+
+
 @patch("homeassistant.components.mqtt.client.TIMEOUT_ACK", 0.2)
 async def test_handle_mqtt_timeout_on_callback(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture, mock_debouncer: asyncio.Event
@@ -1388,7 +1453,7 @@ async def test_handle_mqtt_timeout_on_callback(
         mock_client.connect = MagicMock(
             return_value=0,
             side_effect=lambda *args, **kwargs: hass.loop.call_soon_threadsafe(
-                mock_client.on_connect, mock_client, None, 0, 0, 0
+                mock_client.on_connect, mock_client, None, 0, MockMqttReasonCode()
             ),
         )
 
@@ -1491,6 +1556,42 @@ async def test_setup_uses_certificate_on_certificate_set_to_auto_and_insecure(
     assert insecure_check["insecure"] == insecure_param
 
 
+@pytest.mark.parametrize(
+    ("mqtt_config_entry_data", "client_id"),
+    [
+        (
+            {
+                mqtt.CONF_BROKER: "mock-broker",
+                "client_id": "random01234random0124",
+            },
+            "random01234random0124",
+        ),
+        (
+            {
+                mqtt.CONF_BROKER: "mock-broker",
+            },
+            None,
+        ),
+    ],
+)
+async def test_client_id_is_set(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    client_id: str | None,
+) -> None:
+    """Test setup defaults for tls."""
+    with patch(
+        "homeassistant.components.mqtt.async_client.AsyncMQTTClient"
+    ) as async_client_mock:
+        await mqtt_mock_entry()
+        await hass.async_block_till_done()
+    assert async_client_mock.call_count == 1
+    call_params: dict[str, Any] = async_client_mock.call_args[1]
+    assert "client_id" in call_params
+    assert client_id is None or client_id == call_params["client_id"]
+    assert call_params["client_id"] is not None
+
+
 @pytest.mark.parametrize(
     "mqtt_config_entry_data",
     [
@@ -1777,12 +1878,12 @@ async def test_mqtt_subscribes_topics_on_connect(
     await mqtt.async_subscribe(hass, "still/pending", record_calls, 1)
     await mock_debouncer.wait()
 
-    mqtt_client_mock.on_disconnect(Mock(), None, 0)
+    mqtt_client_mock.on_disconnect(Mock(), None, 0, MockMqttReasonCode())
 
     mqtt_client_mock.reset_mock()
 
     mock_debouncer.clear()
-    mqtt_client_mock.on_connect(Mock(), None, 0, 0)
+    mqtt_client_mock.on_connect(Mock(), None, 0, MockMqttReasonCode())
     await mock_debouncer.wait()
 
     subscribe_calls = help_all_subscribe_calls(mqtt_client_mock)
@@ -1837,12 +1938,12 @@ async def test_mqtt_subscribes_wildcard_topics_in_correct_order(
     # Assert the initial wildcard topic subscription order
     _assert_subscription_order()
 
-    mqtt_client_mock.on_disconnect(Mock(), None, 0)
+    mqtt_client_mock.on_disconnect(Mock(), None, 0, MockMqttReasonCode())
 
     mqtt_client_mock.reset_mock()
 
     mock_debouncer.clear()
-    mqtt_client_mock.on_connect(Mock(), None, 0, 0)
+    mqtt_client_mock.on_connect(Mock(), None, 0, MockMqttReasonCode())
     await mock_debouncer.wait()
 
     # Assert the wildcard topic subscription order after a reconnect
@@ -1868,12 +1969,12 @@ async def test_mqtt_discovery_not_subscribes_when_disabled(
         assert (f"homeassistant/{component}/+/config", 0) not in subscribe_calls
         assert (f"homeassistant/{component}/+/+/config", 0) not in subscribe_calls
 
-    mqtt_client_mock.on_disconnect(Mock(), None, 0)
+    mqtt_client_mock.on_disconnect(Mock(), None, 0, MockMqttReasonCode())
 
     mqtt_client_mock.reset_mock()
 
     mock_debouncer.clear()
-    mqtt_client_mock.on_connect(Mock(), None, 0, 0)
+    mqtt_client_mock.on_connect(Mock(), None, 0, MockMqttReasonCode())
     await mock_debouncer.wait()
 
     subscribe_calls = help_all_subscribe_calls(mqtt_client_mock)
@@ -1968,7 +2069,7 @@ async def test_auto_reconnect(
     mqtt_client_mock.reconnect.reset_mock()
 
     mqtt_client_mock.disconnect()
-    mqtt_client_mock.on_disconnect(None, None, 0)
+    mqtt_client_mock.on_disconnect(None, None, 0, MockMqttReasonCode())
     await hass.async_block_till_done()
 
     mqtt_client_mock.reconnect.side_effect = exception("foo")
@@ -1989,7 +2090,7 @@ async def test_auto_reconnect(
     hass.bus.async_fire(EVENT_HOMEASSISTANT_STOP)
 
     mqtt_client_mock.disconnect()
-    mqtt_client_mock.on_disconnect(None, None, 0)
+    mqtt_client_mock.on_disconnect(None, None, 0, MockMqttReasonCode())
     await hass.async_block_till_done()
 
     async_fire_time_changed(
@@ -2031,7 +2132,7 @@ async def test_server_sock_connect_and_disconnect(
     mqtt_client_mock.loop_misc.return_value = paho_mqtt.MQTT_ERR_CONN_LOST
     mqtt_client_mock.on_socket_unregister_write(mqtt_client_mock, None, client)
     mqtt_client_mock.on_socket_close(mqtt_client_mock, None, client)
-    mqtt_client_mock.on_disconnect(mqtt_client_mock, None, client)
+    mqtt_client_mock.on_disconnect(mqtt_client_mock, None, None, MockMqttReasonCode())
     await hass.async_block_till_done()
     mock_debouncer.clear()
     unsub()
@@ -2082,7 +2183,7 @@ async def test_server_sock_buffer_size_with_websocket(
     client.setblocking(False)
     server.setblocking(False)
 
-    class FakeWebsocket(paho_mqtt.WebsocketWrapper):
+    class FakeWebsocket(paho_mqtt._WebsocketWrapper):
         def _do_handshake(self, *args, **kwargs):
             pass
 
@@ -2169,4 +2270,4 @@ async def test_loop_write_failure(
     # Final for the disconnect callback
     await hass.async_block_till_done()
 
-    assert "Disconnected from MQTT server test-broker:1883" in caplog.text
+    assert "Error returned from MQTT server: The connection was lost." in caplog.text
diff --git a/tests/components/mqtt/test_climate.py b/tests/components/mqtt/test_climate.py
index 5edd73e3f5a..fd0b95f2b13 100644
--- a/tests/components/mqtt/test_climate.py
+++ b/tests/components/mqtt/test_climate.py
@@ -15,6 +15,7 @@ from homeassistant.components.climate import (
     ATTR_FAN_MODE,
     ATTR_HUMIDITY,
     ATTR_HVAC_ACTION,
+    ATTR_SWING_HORIZONTAL_MODE,
     ATTR_SWING_MODE,
     ATTR_TARGET_TEMP_HIGH,
     ATTR_TARGET_TEMP_LOW,
@@ -32,11 +33,16 @@ from homeassistant.components.mqtt.climate import (
     MQTT_CLIMATE_ATTRIBUTES_BLOCKED,
     VALUE_TEMPLATE_KEYS,
 )
-from homeassistant.const import ATTR_TEMPERATURE, STATE_UNKNOWN, UnitOfTemperature
+from homeassistant.const import ATTR_TEMPERATURE, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
+from homeassistant.util.unit_system import (
+    METRIC_SYSTEM,
+    US_CUSTOMARY_SYSTEM,
+    UnitSystem,
+)
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
@@ -85,6 +91,7 @@ DEFAULT_CONFIG = {
             "temperature_high_command_topic": "temperature-high-topic",
             "fan_mode_command_topic": "fan-mode-topic",
             "swing_mode_command_topic": "swing-mode-topic",
+            "swing_horizontal_mode_command_topic": "swing-horizontal-mode-topic",
             "preset_mode_command_topic": "preset-mode-topic",
             "preset_modes": [
                 "eco",
@@ -111,6 +118,7 @@ async def test_setup_params(
     assert state.attributes.get("temperature") == 21
     assert state.attributes.get("fan_mode") == "low"
     assert state.attributes.get("swing_mode") == "off"
+    assert state.attributes.get("swing_horizontal_mode") == "off"
     assert state.state == "off"
     assert state.attributes.get("min_temp") == DEFAULT_MIN_TEMP
     assert state.attributes.get("max_temp") == DEFAULT_MAX_TEMP
@@ -123,6 +131,7 @@ async def test_setup_params(
         | ClimateEntityFeature.TARGET_HUMIDITY
         | ClimateEntityFeature.FAN_MODE
         | ClimateEntityFeature.PRESET_MODE
+        | ClimateEntityFeature.SWING_HORIZONTAL_MODE
         | ClimateEntityFeature.SWING_MODE
         | ClimateEntityFeature.TURN_OFF
         | ClimateEntityFeature.TURN_ON
@@ -159,6 +168,7 @@ async def test_supported_features(
     state = hass.states.get(ENTITY_CLIMATE)
     support = (
         ClimateEntityFeature.TARGET_TEMPERATURE
+        | ClimateEntityFeature.SWING_HORIZONTAL_MODE
         | ClimateEntityFeature.SWING_MODE
         | ClimateEntityFeature.FAN_MODE
         | ClimateEntityFeature.PRESET_MODE
@@ -562,12 +572,29 @@ async def test_set_swing_mode_bad_attr(
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get("swing_mode") == "off"
 
+    assert state.attributes.get("swing_horizontal_mode") == "off"
+    with pytest.raises(vol.Invalid) as excinfo:
+        await common.async_set_swing_horizontal_mode(hass, None, ENTITY_CLIMATE)  # type:ignore[arg-type]
+    assert (
+        "string value is None for dictionary value @ data['swing_horizontal_mode']"
+        in str(excinfo.value)
+    )
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.attributes.get("swing_horizontal_mode") == "off"
+
 
 @pytest.mark.parametrize(
     "hass_config",
     [
         help_custom_config(
-            climate.DOMAIN, DEFAULT_CONFIG, ({"swing_mode_state_topic": "swing-state"},)
+            climate.DOMAIN,
+            DEFAULT_CONFIG,
+            (
+                {
+                    "swing_mode_state_topic": "swing-state",
+                    "swing_horizontal_mode_state_topic": "swing-horizontal-state",
+                },
+            ),
         )
     ],
 )
@@ -579,19 +606,32 @@ async def test_set_swing_pessimistic(
 
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get("swing_mode") is None
+    assert state.attributes.get("swing_horizontal_mode") is None
 
     await common.async_set_swing_mode(hass, "on", ENTITY_CLIMATE)
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get("swing_mode") is None
 
+    await common.async_set_swing_horizontal_mode(hass, "on", ENTITY_CLIMATE)
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.attributes.get("swing_horizontal_mode") is None
+
     async_fire_mqtt_message(hass, "swing-state", "on")
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get("swing_mode") == "on"
 
+    async_fire_mqtt_message(hass, "swing-horizontal-state", "on")
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.attributes.get("swing_horizontal_mode") == "on"
+
     async_fire_mqtt_message(hass, "swing-state", "bogus state")
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get("swing_mode") == "on"
 
+    async_fire_mqtt_message(hass, "swing-horizontal-state", "bogus state")
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.attributes.get("swing_horizontal_mode") == "on"
+
 
 @pytest.mark.parametrize(
     "hass_config",
@@ -599,7 +639,13 @@ async def test_set_swing_pessimistic(
         help_custom_config(
             climate.DOMAIN,
             DEFAULT_CONFIG,
-            ({"swing_mode_state_topic": "swing-state", "optimistic": True},),
+            (
+                {
+                    "swing_mode_state_topic": "swing-state",
+                    "swing_horizontal_mode_state_topic": "swing-horizontal-state",
+                    "optimistic": True,
+                },
+            ),
         )
     ],
 )
@@ -611,19 +657,32 @@ async def test_set_swing_optimistic(
 
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get("swing_mode") == "off"
+    assert state.attributes.get("swing_horizontal_mode") == "off"
 
     await common.async_set_swing_mode(hass, "on", ENTITY_CLIMATE)
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get("swing_mode") == "on"
 
+    await common.async_set_swing_horizontal_mode(hass, "on", ENTITY_CLIMATE)
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.attributes.get("swing_horizontal_mode") == "on"
+
     async_fire_mqtt_message(hass, "swing-state", "off")
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get("swing_mode") == "off"
 
+    async_fire_mqtt_message(hass, "swing-horizontal-state", "off")
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.attributes.get("swing_horizontal_mode") == "off"
+
     async_fire_mqtt_message(hass, "swing-state", "bogus state")
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get("swing_mode") == "off"
 
+    async_fire_mqtt_message(hass, "swing-horizontal-state", "bogus state")
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.attributes.get("swing_horizontal_mode") == "off"
+
 
 @pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
 async def test_set_swing(
@@ -638,6 +697,15 @@ async def test_set_swing(
     mqtt_mock.async_publish.assert_called_once_with("swing-mode-topic", "on", 0, False)
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get("swing_mode") == "on"
+    mqtt_mock.reset_mock()
+
+    assert state.attributes.get("swing_horizontal_mode") == "off"
+    await common.async_set_swing_horizontal_mode(hass, "on", ENTITY_CLIMATE)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "swing-horizontal-mode-topic", "on", 0, False
+    )
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.attributes.get("swing_horizontal_mode") == "on"
 
 
 @pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
@@ -1337,6 +1405,7 @@ async def test_get_target_temperature_low_high_with_templates(
                     "temperature_low_command_topic": "temperature-low-topic",
                     "temperature_high_command_topic": "temperature-high-topic",
                     "fan_mode_command_topic": "fan-mode-topic",
+                    "swing_horizontal_mode_command_topic": "swing-horizontal-mode-topic",
                     "swing_mode_command_topic": "swing-mode-topic",
                     "preset_mode_command_topic": "preset-mode-topic",
                     "preset_modes": [
@@ -1359,6 +1428,7 @@ async def test_get_target_temperature_low_high_with_templates(
                     "action_topic": "action",
                     "mode_state_topic": "mode-state",
                     "fan_mode_state_topic": "fan-state",
+                    "swing_horizontal_mode_state_topic": "swing-horizontal-state",
                     "swing_mode_state_topic": "swing-state",
                     "temperature_state_topic": "temperature-state",
                     "target_humidity_state_topic": "humidity-state",
@@ -1396,6 +1466,12 @@ async def test_get_with_templates(
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get("swing_mode") == "on"
 
+    # Swing Horizontal Mode
+    assert state.attributes.get("swing_horizontal_mode") is None
+    async_fire_mqtt_message(hass, "swing-horizontal-state", '"on"')
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.attributes.get("swing_horizontal_mode") == "on"
+
     # Temperature - with valid value
     assert state.attributes.get("temperature") is None
     async_fire_mqtt_message(hass, "temperature-state", '"1031"')
@@ -1495,6 +1571,7 @@ async def test_get_with_templates(
                     "temperature_low_command_topic": "temperature-low-topic",
                     "temperature_high_command_topic": "temperature-high-topic",
                     "fan_mode_command_topic": "fan-mode-topic",
+                    "swing_horizontal_mode_command_topic": "swing-horizontal-mode-topic",
                     "swing_mode_command_topic": "swing-mode-topic",
                     "preset_mode_command_topic": "preset-mode-topic",
                     "preset_modes": [
@@ -1511,6 +1588,7 @@ async def test_get_with_templates(
                     "power_command_template": "power: {{ value }}",
                     "preset_mode_command_template": "preset_mode: {{ value }}",
                     "mode_command_template": "mode: {{ value }}",
+                    "swing_horizontal_mode_command_template": "swing_horizontal_mode: {{ value }}",
                     "swing_mode_command_template": "swing_mode: {{ value }}",
                     "temperature_command_template": "temp: {{ value }}",
                     "temperature_high_command_template": "temp_hi: {{ value }}",
@@ -1580,6 +1658,15 @@ async def test_set_and_templates(
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.state == "off"
 
+    # Swing Horizontal Mode
+    await common.async_set_swing_horizontal_mode(hass, "on", ENTITY_CLIMATE)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "swing-horizontal-mode-topic", "swing_horizontal_mode: on", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.attributes.get("swing_horizontal_mode") == "on"
+
     # Swing Mode
     await common.async_set_swing_mode(hass, "on", ENTITY_CLIMATE)
     mqtt_mock.async_publish.assert_called_once_with(
@@ -1741,7 +1828,7 @@ async def test_temperature_unit(
 
 
 @pytest.mark.parametrize(
-    ("hass_config", "temperature_unit", "initial", "min", "max", "current"),
+    ("hass_config", "units", "initial", "min", "max", "current"),
     [
         (
             help_custom_config(
@@ -1754,7 +1841,7 @@ async def test_temperature_unit(
                     },
                 ),
             ),
-            UnitOfTemperature.CELSIUS,
+            METRIC_SYSTEM,
             DEFAULT_INITIAL_TEMPERATURE,
             DEFAULT_MIN_TEMP,
             DEFAULT_MAX_TEMP,
@@ -1772,7 +1859,7 @@ async def test_temperature_unit(
                     },
                 ),
             ),
-            UnitOfTemperature.CELSIUS,
+            METRIC_SYSTEM,
             20.5,
             DEFAULT_MIN_TEMP,
             DEFAULT_MAX_TEMP,
@@ -1789,24 +1876,7 @@ async def test_temperature_unit(
                     },
                 ),
             ),
-            UnitOfTemperature.KELVIN,
-            294,
-            280,
-            308,
-            298,
-        ),
-        (
-            help_custom_config(
-                climate.DOMAIN,
-                DEFAULT_CONFIG,
-                (
-                    {
-                        "temperature_unit": "F",
-                        "current_temperature_topic": "current_temperature",
-                    },
-                ),
-            ),
-            UnitOfTemperature.FAHRENHEIT,
+            US_CUSTOMARY_SYSTEM,
             70,
             45,
             95,
@@ -1817,25 +1887,25 @@ async def test_temperature_unit(
 async def test_alt_temperature_unit(
     hass: HomeAssistant,
     mqtt_mock_entry: MqttMockHAClientGenerator,
-    temperature_unit: UnitOfTemperature,
+    units: UnitSystem,
     initial: float,
     min: float,
     max: float,
     current: float,
 ) -> None:
     """Test deriving the systems temperature unit."""
-    with patch.object(hass.config.units, "temperature_unit", temperature_unit):
-        await mqtt_mock_entry()
+    hass.config.units = units
+    await mqtt_mock_entry()
 
-        state = hass.states.get(ENTITY_CLIMATE)
-        assert state.attributes.get("temperature") == initial
-        assert state.attributes.get("min_temp") == min
-        assert state.attributes.get("max_temp") == max
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.attributes.get("temperature") == initial
+    assert state.attributes.get("min_temp") == min
+    assert state.attributes.get("max_temp") == max
 
-        async_fire_mqtt_message(hass, "current_temperature", "77")
+    async_fire_mqtt_message(hass, "current_temperature", "77")
 
-        state = hass.states.get(ENTITY_CLIMATE)
-        assert state.attributes.get("current_temperature") == current
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.attributes.get("current_temperature") == current
 
 
 async def test_setting_attribute_via_mqtt_json_message(
@@ -1940,6 +2010,7 @@ async def test_unique_id(
         ("fan_mode_state_topic", "low", ATTR_FAN_MODE, "low"),
         ("mode_state_topic", "cool", None, None),
         ("mode_state_topic", "fan_only", None, None),
+        ("swing_horizontal_mode_state_topic", "on", ATTR_SWING_HORIZONTAL_MODE, "on"),
         ("swing_mode_state_topic", "on", ATTR_SWING_MODE, "on"),
         ("temperature_low_state_topic", "19.1", ATTR_TARGET_TEMP_LOW, 19.1),
         ("temperature_high_state_topic", "22.9", ATTR_TARGET_TEMP_HIGH, 22.9),
@@ -2178,6 +2249,13 @@ async def test_precision_whole(
             "medium",
             "fan_mode_command_template",
         ),
+        (
+            climate.SERVICE_SET_SWING_HORIZONTAL_MODE,
+            "swing_horizontal_mode_command_topic",
+            {"swing_horizontal_mode": "on"},
+            "on",
+            "swing_horizontal_mode_command_template",
+        ),
         (
             climate.SERVICE_SET_SWING_MODE,
             "swing_mode_command_topic",
@@ -2378,6 +2456,7 @@ async def test_unload_entry(
                     "current_temperature_topic": "current-temperature-topic",
                     "preset_mode_state_topic": "preset-mode-state-topic",
                     "preset_modes": ["eco", "away"],
+                    "swing_horizontal_mode_state_topic": "swing-horizontal-mode-state-topic",
                     "swing_mode_state_topic": "swing-mode-state-topic",
                     "target_humidity_state_topic": "target-humidity-state-topic",
                     "temperature_high_state_topic": "temperature-high-state-topic",
@@ -2399,6 +2478,7 @@ async def test_unload_entry(
         ("current-humidity-topic", "45", "46"),
         ("current-temperature-topic", "18.0", "18.1"),
         ("preset-mode-state-topic", "eco", "away"),
+        ("swing-horizontal-mode-state-topic", "on", "off"),
         ("swing-mode-state-topic", "on", "off"),
         ("target-humidity-state-topic", "45", "50"),
         ("temperature-state-topic", "18", "19"),
diff --git a/tests/components/mqtt/test_config_flow.py b/tests/components/mqtt/test_config_flow.py
index 072998f9b8d..c94d692b374 100644
--- a/tests/components/mqtt/test_config_flow.py
+++ b/tests/components/mqtt/test_config_flow.py
@@ -2,6 +2,7 @@
 
 from collections.abc import Generator, Iterator
 from contextlib import contextmanager
+from copy import deepcopy
 from pathlib import Path
 from ssl import SSLError
 from typing import Any
@@ -17,6 +18,8 @@ from homeassistant import config_entries
 from homeassistant.components import mqtt
 from homeassistant.components.hassio import AddonError
 from homeassistant.components.mqtt.config_flow import PWD_NOT_CHANGED
+from homeassistant.components.mqtt.util import learn_more_url
+from homeassistant.config_entries import ConfigSubentry, ConfigSubentryData
 from homeassistant.const import (
     CONF_CLIENT_ID,
     CONF_PASSWORD,
@@ -26,9 +29,20 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 
-from tests.common import MockConfigEntry
+from .common import (
+    MOCK_NOTIFY_SUBENTRY_DATA_MULTI,
+    MOCK_NOTIFY_SUBENTRY_DATA_NO_NAME,
+    MOCK_NOTIFY_SUBENTRY_DATA_SINGLE,
+    MOCK_SENSOR_SUBENTRY_DATA_SINGLE,
+    MOCK_SENSOR_SUBENTRY_DATA_SINGLE_LAST_RESET_TEMPLATE,
+    MOCK_SENSOR_SUBENTRY_DATA_SINGLE_STATE_CLASS,
+    MOCK_SWITCH_SUBENTRY_DATA_SINGLE_STATE_CLASS,
+)
+
+from tests.common import MockConfigEntry, MockMqttReasonCode
 from tests.typing import MqttMockHAClientGenerator, MqttMockPahoClient
 
 ADD_ON_DISCOVERY_INFO = {
@@ -40,8 +54,37 @@ ADD_ON_DISCOVERY_INFO = {
     "protocol": "3.1.1",
     "ssl": False,
 }
-MOCK_CLIENT_CERT = b"## mock client certificate file ##"
-MOCK_CLIENT_KEY = b"## mock key file ##"
+
+MOCK_CA_CERT = (
+    b"-----BEGIN CERTIFICATE-----\n"
+    b"## mock CA certificate file ##"
+    b"\n-----END CERTIFICATE-----\n"
+)
+MOCK_GENERIC_CERT = (
+    b"-----BEGIN CERTIFICATE-----\n"
+    b"## mock generic certificate file ##"
+    b"\n-----END CERTIFICATE-----\n"
+)
+MOCK_CA_CERT_DER = b"## mock DER formatted CA certificate file ##\n"
+MOCK_CLIENT_CERT = (
+    b"-----BEGIN CERTIFICATE-----\n"
+    b"## mock client certificate file ##"
+    b"\n-----END CERTIFICATE-----\n"
+)
+MOCK_CLIENT_CERT_DER = b"## mock DER formatted client certificate file ##\n"
+MOCK_CLIENT_KEY = (
+    b"-----BEGIN PRIVATE KEY-----\n"
+    b"## mock client key file ##"
+    b"\n-----END PRIVATE KEY-----"
+)
+MOCK_ENCRYPTED_CLIENT_KEY = (
+    b"-----BEGIN ENCRYPTED PRIVATE KEY-----\n"
+    b"## mock client key file ##\n"
+    b"-----END ENCRYPTED PRIVATE KEY-----"
+)
+MOCK_CLIENT_KEY_DER = b"## mock DER formatted key file ##\n"
+MOCK_ENCRYPTED_CLIENT_KEY_DER = b"## mock DER formatted encrypted key file ##\n"
+
 
 MOCK_ENTRY_DATA = {
     mqtt.CONF_BROKER: "test-broker",
@@ -102,15 +145,27 @@ def mock_ssl_context() -> Generator[dict[str, MagicMock]]:
         patch("homeassistant.components.mqtt.config_flow.SSLContext") as mock_context,
         patch(
             "homeassistant.components.mqtt.config_flow.load_pem_private_key"
-        ) as mock_key_check,
+        ) as mock_pem_key_check,
+        patch(
+            "homeassistant.components.mqtt.config_flow.load_der_private_key"
+        ) as mock_der_key_check,
         patch(
             "homeassistant.components.mqtt.config_flow.load_pem_x509_certificate"
-        ) as mock_cert_check,
+        ) as mock_pem_cert_check,
+        patch(
+            "homeassistant.components.mqtt.config_flow.load_der_x509_certificate"
+        ) as mock_der_cert_check,
     ):
+        mock_pem_key_check().private_bytes.return_value = MOCK_CLIENT_KEY
+        mock_pem_cert_check().public_bytes.return_value = MOCK_GENERIC_CERT
+        mock_der_key_check().private_bytes.return_value = MOCK_CLIENT_KEY
+        mock_der_cert_check().public_bytes.return_value = MOCK_GENERIC_CERT
         yield {
             "context": mock_context,
-            "load_pem_x509_certificate": mock_cert_check,
-            "load_pem_private_key": mock_key_check,
+            "load_der_private_key": mock_der_key_check,
+            "load_der_x509_certificate": mock_der_cert_check,
+            "load_pem_private_key": mock_pem_key_check,
+            "load_pem_x509_certificate": mock_pem_cert_check,
         }
 
 
@@ -143,16 +198,16 @@ def mock_try_connection_success() -> Generator[MqttMockPahoClient]:
 
     def loop_start():
         """Simulate connect on loop start."""
-        mock_client().on_connect(mock_client, None, None, 0)
+        mock_client().on_connect(mock_client, None, None, MockMqttReasonCode(), None)
 
     def _subscribe(topic, qos=0):
         mid = get_mid()
-        mock_client().on_subscribe(mock_client, 0, mid)
+        mock_client().on_subscribe(mock_client, 0, mid, [MockMqttReasonCode()], None)
         return (0, mid)
 
     def _unsubscribe(topic):
         mid = get_mid()
-        mock_client().on_unsubscribe(mock_client, 0, mid)
+        mock_client().on_unsubscribe(mock_client, 0, mid, [MockMqttReasonCode()], None)
         return (0, mid)
 
     with patch(
@@ -180,9 +235,31 @@ def mock_try_connection_time_out() -> Generator[MagicMock]:
         yield mock_client()
 
 
+@pytest.fixture
+def mock_ca_cert() -> bytes:
+    """Mock the CA certificate."""
+    return MOCK_CA_CERT
+
+
+@pytest.fixture
+def mock_client_cert() -> bytes:
+    """Mock the client certificate."""
+    return MOCK_CLIENT_CERT
+
+
+@pytest.fixture
+def mock_client_key() -> bytes:
+    """Mock the client key."""
+    return MOCK_CLIENT_KEY
+
+
 @pytest.fixture
 def mock_process_uploaded_file(
-    tmp_path: Path, mock_temp_dir: str
+    tmp_path: Path,
+    mock_ca_cert: bytes,
+    mock_client_cert: bytes,
+    mock_client_key: bytes,
+    mock_temp_dir: str,
 ) -> Generator[MagicMock]:
     """Mock upload certificate files."""
     file_id_ca = str(uuid4())
@@ -195,15 +272,15 @@ def mock_process_uploaded_file(
     ) -> Iterator[Path | None]:
         if file_id == file_id_ca:
             with open(tmp_path / "ca.crt", "wb") as cafile:
-                cafile.write(b"## mock CA certificate file ##")
+                cafile.write(mock_ca_cert)
             yield tmp_path / "ca.crt"
         elif file_id == file_id_cert:
             with open(tmp_path / "client.crt", "wb") as certfile:
-                certfile.write(b"## mock client certificate file ##")
+                certfile.write(mock_client_cert)
             yield tmp_path / "client.crt"
         elif file_id == file_id_key:
             with open(tmp_path / "client.key", "wb") as keyfile:
-                keyfile.write(b"## mock key file ##")
+                keyfile.write(mock_client_key)
             yield tmp_path / "client.key"
         else:
             pytest.fail(f"Unexpected file_id: {file_id}")
@@ -1024,12 +1101,37 @@ async def test_option_flow(
     assert yaml_mock.await_count
 
 
+@pytest.mark.parametrize(
+    ("mock_ca_cert", "mock_client_cert", "mock_client_key", "client_key_password"),
+    [
+        (MOCK_GENERIC_CERT, MOCK_GENERIC_CERT, MOCK_CLIENT_KEY, ""),
+        (
+            MOCK_GENERIC_CERT,
+            MOCK_GENERIC_CERT,
+            MOCK_ENCRYPTED_CLIENT_KEY,
+            "very*secret",
+        ),
+        (MOCK_CA_CERT_DER, MOCK_CLIENT_CERT_DER, MOCK_CLIENT_KEY_DER, ""),
+        (
+            MOCK_CA_CERT_DER,
+            MOCK_CLIENT_CERT_DER,
+            MOCK_ENCRYPTED_CLIENT_KEY_DER,
+            "very*secret",
+        ),
+    ],
+    ids=[
+        "pem_certs_private_key_no_password",
+        "pem_certs_private_key_with_password",
+        "der_certs_private_key_no_password",
+        "der_certs_private_key_with_password",
+    ],
+)
 @pytest.mark.parametrize(
     "test_error",
     [
         "bad_certificate",
         "bad_client_cert",
-        "bad_client_key",
+        "client_key_error",
         "bad_client_cert_key",
         "invalid_inclusion",
         None,
@@ -1042,31 +1144,54 @@ async def test_bad_certificate(
     mock_ssl_context: dict[str, MagicMock],
     mock_process_uploaded_file: MagicMock,
     test_error: str | None,
+    client_key_password: str,
+    mock_ca_cert: bytes,
 ) -> None:
     """Test bad certificate tests."""
+
+    def _side_effect_on_client_cert(data: bytes) -> MagicMock:
+        """Raise on client cert only.
+
+        The function is called twice, once for the CA chain
+        and once for the client cert. We only want to raise on a client cert.
+        """
+        if data == MOCK_CLIENT_CERT_DER:
+            raise ValueError
+        mock_certificate_side_effect = MagicMock()
+        mock_certificate_side_effect().public_bytes.return_value = MOCK_GENERIC_CERT
+        return mock_certificate_side_effect
+
     # Mock certificate files
     file_id = mock_process_uploaded_file.file_id
+    set_ca_cert = "custom"
+    set_client_cert = True
+    tls_insecure = False
     test_input = {
         mqtt.CONF_BROKER: "another-broker",
         CONF_PORT: 2345,
         mqtt.CONF_CERTIFICATE: file_id[mqtt.CONF_CERTIFICATE],
         mqtt.CONF_CLIENT_CERT: file_id[mqtt.CONF_CLIENT_CERT],
         mqtt.CONF_CLIENT_KEY: file_id[mqtt.CONF_CLIENT_KEY],
-        "set_ca_cert": True,
+        "client_key_password": client_key_password,
+        "set_ca_cert": set_ca_cert,
         "set_client_cert": True,
     }
-    set_client_cert = True
-    set_ca_cert = "custom"
-    tls_insecure = False
     if test_error == "bad_certificate":
         # CA chain is not loading
         mock_ssl_context["context"]().load_verify_locations.side_effect = SSLError
+        # Fail on the CA cert if DER encoded
+        mock_ssl_context["load_der_x509_certificate"].side_effect = ValueError
     elif test_error == "bad_client_cert":
         # Client certificate is invalid
         mock_ssl_context["load_pem_x509_certificate"].side_effect = ValueError
-    elif test_error == "bad_client_key":
+        # Fail on the client cert if DER encoded
+        mock_ssl_context[
+            "load_der_x509_certificate"
+        ].side_effect = _side_effect_on_client_cert
+    elif test_error == "client_key_error":
         # Client key file is invalid
         mock_ssl_context["load_pem_private_key"].side_effect = ValueError
+        mock_ssl_context["load_der_private_key"].side_effect = ValueError
     elif test_error == "bad_client_cert_key":
         # Client key file file and certificate do not pair
         mock_ssl_context["context"]().load_cert_chain.side_effect = SSLError
@@ -2078,8 +2203,8 @@ async def test_setup_with_advanced_settings(
         CONF_USERNAME: "user",
         CONF_PASSWORD: "secret",
         mqtt.CONF_KEEPALIVE: 30,
-        mqtt.CONF_CLIENT_CERT: "## mock client certificate file ##",
-        mqtt.CONF_CLIENT_KEY: "## mock key file ##",
+        mqtt.CONF_CLIENT_CERT: MOCK_CLIENT_CERT.decode(encoding="utf-8"),
+        mqtt.CONF_CLIENT_KEY: MOCK_CLIENT_KEY.decode(encoding="utf-8"),
         "tls_insecure": True,
         mqtt.CONF_TRANSPORT: "websockets",
         mqtt.CONF_WS_PATH: "/custom_path/",
@@ -2091,6 +2216,155 @@ async def test_setup_with_advanced_settings(
     }
 
 
+@pytest.mark.usefixtures("mock_ssl_context")
+@pytest.mark.parametrize(
+    ("mock_ca_cert", "mock_client_cert", "mock_client_key", "client_key_password"),
+    [
+        (MOCK_GENERIC_CERT, MOCK_GENERIC_CERT, MOCK_CLIENT_KEY, ""),
+        (
+            MOCK_GENERIC_CERT,
+            MOCK_GENERIC_CERT,
+            MOCK_ENCRYPTED_CLIENT_KEY,
+            "very*secret",
+        ),
+        (MOCK_CA_CERT_DER, MOCK_CLIENT_CERT_DER, MOCK_CLIENT_KEY_DER, ""),
+        (
+            MOCK_CA_CERT_DER,
+            MOCK_CLIENT_CERT_DER,
+            MOCK_ENCRYPTED_CLIENT_KEY_DER,
+            "very*secret",
+        ),
+    ],
+    ids=[
+        "pem_certs_private_key_no_password",
+        "pem_certs_private_key_with_password",
+        "der_certs_private_key_no_password",
+        "der_certs_private_key_with_password",
+    ],
+)
+async def test_setup_with_certificates(
+    hass: HomeAssistant,
+    mock_try_connection: MagicMock,
+    mock_process_uploaded_file: MagicMock,
+    client_key_password: str,
+) -> None:
+    """Test config flow setup with PEM and DER encoded certificates."""
+    file_id = mock_process_uploaded_file.file_id
+
+    config_entry = MockConfigEntry(
+        domain=mqtt.DOMAIN,
+        version=mqtt.CONFIG_ENTRY_VERSION,
+        minor_version=mqtt.CONFIG_ENTRY_MINOR_VERSION,
+    )
+    config_entry.add_to_hass(hass)
+    hass.config_entries.async_update_entry(
+        config_entry,
+        data={
+            mqtt.CONF_BROKER: "test-broker",
+            CONF_PORT: 1234,
+        },
+    )
+
+    mock_try_connection.return_value = True
+
+    result = await config_entry.start_reconfigure_flow(hass, show_advanced_options=True)
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "broker"
+    assert result["data_schema"].schema["advanced_options"]
+
+    # first iteration, basic settings
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={
+            mqtt.CONF_BROKER: "test-broker",
+            CONF_PORT: 2345,
+            CONF_USERNAME: "user",
+            CONF_PASSWORD: "secret",
+            "advanced_options": True,
+        },
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "broker"
+    assert "advanced_options" not in result["data_schema"].schema
+    assert result["data_schema"].schema[CONF_CLIENT_ID]
+    assert result["data_schema"].schema[mqtt.CONF_KEEPALIVE]
+    assert result["data_schema"].schema["set_client_cert"]
+    assert result["data_schema"].schema["set_ca_cert"]
+    assert result["data_schema"].schema[mqtt.CONF_TLS_INSECURE]
+    assert result["data_schema"].schema[CONF_PROTOCOL]
+    assert result["data_schema"].schema[mqtt.CONF_TRANSPORT]
+    assert mqtt.CONF_CLIENT_CERT not in result["data_schema"].schema
+    assert mqtt.CONF_CLIENT_KEY not in result["data_schema"].schema
+
+    # second iteration, advanced settings with request for client cert
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={
+            mqtt.CONF_BROKER: "test-broker",
+            CONF_PORT: 2345,
+            CONF_USERNAME: "user",
+            CONF_PASSWORD: "secret",
+            mqtt.CONF_KEEPALIVE: 30,
+            "set_ca_cert": "custom",
+            "set_client_cert": True,
+            mqtt.CONF_TLS_INSECURE: False,
+            CONF_PROTOCOL: "3.1.1",
+            mqtt.CONF_TRANSPORT: "tcp",
+        },
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "broker"
+    assert "advanced_options" not in result["data_schema"].schema
+    assert result["data_schema"].schema[CONF_CLIENT_ID]
+    assert result["data_schema"].schema[mqtt.CONF_KEEPALIVE]
+    assert result["data_schema"].schema["set_client_cert"]
+    assert result["data_schema"].schema["set_ca_cert"]
+    assert result["data_schema"].schema["client_key_password"]
+    assert result["data_schema"].schema[mqtt.CONF_TLS_INSECURE]
+    assert result["data_schema"].schema[CONF_PROTOCOL]
+    assert result["data_schema"].schema[mqtt.CONF_CERTIFICATE]
+    assert result["data_schema"].schema[mqtt.CONF_CLIENT_CERT]
+    assert result["data_schema"].schema[mqtt.CONF_CLIENT_KEY]
+    assert result["data_schema"].schema[mqtt.CONF_TRANSPORT]
+
+    # third iteration, advanced settings with client cert and key and CA certificate
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={
+            mqtt.CONF_BROKER: "test-broker",
+            CONF_PORT: 2345,
+            CONF_USERNAME: "user",
+            CONF_PASSWORD: "secret",
+            mqtt.CONF_KEEPALIVE: 30,
+            "set_ca_cert": "custom",
+            "set_client_cert": True,
+            "client_key_password": client_key_password,
+            mqtt.CONF_CERTIFICATE: file_id[mqtt.CONF_CERTIFICATE],
+            mqtt.CONF_CLIENT_CERT: file_id[mqtt.CONF_CLIENT_CERT],
+            mqtt.CONF_CLIENT_KEY: file_id[mqtt.CONF_CLIENT_KEY],
+            mqtt.CONF_TLS_INSECURE: False,
+            mqtt.CONF_TRANSPORT: "tcp",
+        },
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reconfigure_successful"
+
+    # Check config entry result
+    assert config_entry.data == {
+        mqtt.CONF_BROKER: "test-broker",
+        CONF_PORT: 2345,
+        CONF_USERNAME: "user",
+        CONF_PASSWORD: "secret",
+        mqtt.CONF_KEEPALIVE: 30,
+        mqtt.CONF_CLIENT_CERT: MOCK_GENERIC_CERT.decode(encoding="utf-8"),
+        mqtt.CONF_CLIENT_KEY: MOCK_CLIENT_KEY.decode(encoding="utf-8"),
+        "tls_insecure": False,
+        mqtt.CONF_TRANSPORT: "tcp",
+        mqtt.CONF_CERTIFICATE: MOCK_GENERIC_CERT.decode(encoding="utf-8"),
+    }
+
+
 @pytest.mark.usefixtures("mock_ssl_context", "mock_process_uploaded_file")
 async def test_change_websockets_transport_to_tcp(
     hass: HomeAssistant, mock_try_connection: MagicMock
@@ -2193,6 +2467,61 @@ async def test_reconfigure_flow_form(
     await hass.async_block_till_done(wait_background_tasks=True)
 
 
+@pytest.mark.usefixtures("mock_ssl_context", "mock_process_uploaded_file")
+@pytest.mark.parametrize(
+    "mqtt_config_entry_data",
+    [
+        {
+            mqtt.CONF_BROKER: "test-broker",
+            CONF_USERNAME: "mqtt-user",
+            CONF_PASSWORD: "mqtt-password",
+            CONF_PORT: 1234,
+            mqtt.CONF_TRANSPORT: "websockets",
+            mqtt.CONF_WS_HEADERS: {"header_1": "custom_header1"},
+            mqtt.CONF_WS_PATH: "/some_path",
+        }
+    ],
+)
+async def test_reconfigure_no_changed_password(
+    hass: HomeAssistant,
+    mock_try_connection: MagicMock,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+) -> None:
+    """Test reconfigure flow."""
+    await mqtt_mock_entry()
+    entry: MockConfigEntry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
+    result = await entry.start_reconfigure_flow(hass, show_advanced_options=True)
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "broker"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={
+            mqtt.CONF_BROKER: "10.10.10,10",
+            CONF_USERNAME: "mqtt-user",
+            CONF_PASSWORD: PWD_NOT_CHANGED,
+            CONF_PORT: 1234,
+            mqtt.CONF_TRANSPORT: "websockets",
+            mqtt.CONF_WS_HEADERS: '{"header_1": "custom_header1"}',
+            mqtt.CONF_WS_PATH: "/some_new_path",
+        },
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reconfigure_successful"
+    assert entry.data == {
+        mqtt.CONF_BROKER: "10.10.10,10",
+        CONF_USERNAME: "mqtt-user",
+        CONF_PASSWORD: "mqtt-password",
+        CONF_PORT: 1234,
+        mqtt.CONF_TRANSPORT: "websockets",
+        mqtt.CONF_WS_HEADERS: {"header_1": "custom_header1"},
+        mqtt.CONF_WS_PATH: "/some_new_path",
+    }
+    await hass.async_block_till_done(wait_background_tasks=True)
+
+
 @pytest.mark.parametrize(
     (
         "version",
@@ -2283,3 +2612,1194 @@ async def test_migrate_of_incompatible_config_entry(
         await mqtt_mock_entry()
 
     assert config_entry.state is config_entries.ConfigEntryState.MIGRATION_ERROR
+
+
+@pytest.mark.parametrize(
+    (
+        "config_subentries_data",
+        "mock_device_user_input",
+        "mock_entity_user_input",
+        "mock_entity_details_user_input",
+        "mock_entity_details_failed_user_input",
+        "mock_mqtt_user_input",
+        "mock_failed_mqtt_user_input",
+        "entity_name",
+    ),
+    [
+        (
+            MOCK_NOTIFY_SUBENTRY_DATA_SINGLE,
+            {"name": "Milk notifier", "mqtt_settings": {"qos": 1}},
+            {"name": "Milkman alert"},
+            None,
+            None,
+            {
+                "command_topic": "test-topic",
+                "command_template": "{{ value }}",
+                "retain": False,
+            },
+            (
+                (
+                    {"command_topic": "test-topic#invalid"},
+                    {"command_topic": "invalid_publish_topic"},
+                ),
+            ),
+            "Milk notifier Milkman alert",
+        ),
+        (
+            MOCK_NOTIFY_SUBENTRY_DATA_NO_NAME,
+            {"name": "Milk notifier", "mqtt_settings": {"qos": 0}},
+            {},
+            None,
+            None,
+            {
+                "command_topic": "test-topic",
+                "command_template": "{{ value }}",
+                "retain": False,
+            },
+            (
+                (
+                    {"command_topic": "test-topic#invalid"},
+                    {"command_topic": "invalid_publish_topic"},
+                ),
+            ),
+            "Milk notifier",
+        ),
+        (
+            MOCK_SENSOR_SUBENTRY_DATA_SINGLE,
+            {"name": "Test sensor", "mqtt_settings": {"qos": 0}},
+            {"name": "Energy"},
+            {"device_class": "enum", "options": ["low", "medium", "high"]},
+            (
+                (
+                    {
+                        "device_class": "energy",
+                        "unit_of_measurement": "ppm",
+                    },
+                    {"unit_of_measurement": "invalid_uom"},
+                ),
+                # Trigger options to be shown on the form
+                (
+                    {"device_class": "enum"},
+                    {"options": "options_with_enum_device_class"},
+                ),
+                # Test options are only allowed with device_class enum
+                (
+                    {
+                        "device_class": "energy",
+                        "options": ["less", "more"],
+                    },
+                    {
+                        "device_class": "options_device_class_enum",
+                        "unit_of_measurement": "uom_required_for_device_class",
+                    },
+                ),
+                # Include options again to allow flow with valid data
+                (
+                    {"device_class": "enum"},
+                    {"options": "options_with_enum_device_class"},
+                ),
+                (
+                    {
+                        "device_class": "enum",
+                        "state_class": "measurement",
+                        "options": ["less", "more"],
+                    },
+                    {"options": "options_not_allowed_with_state_class_or_uom"},
+                ),
+            ),
+            {
+                "state_topic": "test-topic",
+                "value_template": "{{ value_json.value }}",
+                "advanced_settings": {"expire_after": 30},
+            },
+            (
+                (
+                    {"state_topic": "test-topic#invalid"},
+                    {"state_topic": "invalid_subscribe_topic"},
+                ),
+            ),
+            "Test sensor Energy",
+        ),
+        (
+            MOCK_SENSOR_SUBENTRY_DATA_SINGLE_STATE_CLASS,
+            {"name": "Test sensor", "mqtt_settings": {"qos": 0}},
+            {"name": "Energy"},
+            {
+                "state_class": "measurement",
+            },
+            (),
+            {
+                "state_topic": "test-topic",
+            },
+            (),
+            "Test sensor Energy",
+        ),
+        (
+            MOCK_SWITCH_SUBENTRY_DATA_SINGLE_STATE_CLASS,
+            {"name": "Test switch", "mqtt_settings": {"qos": 0}},
+            {"name": "Outlet"},
+            {"device_class": "outlet"},
+            (),
+            {
+                "command_topic": "test-topic",
+                "command_template": "{{ value }}",
+                "state_topic": "test-topic",
+                "value_template": "{{ value_json.value }}",
+                "optimistic": True,
+            },
+            (
+                (
+                    {"command_topic": "test-topic#invalid"},
+                    {"command_topic": "invalid_publish_topic"},
+                ),
+                (
+                    {
+                        "command_topic": "test-topic",
+                        "state_topic": "test-topic#invalid",
+                    },
+                    {"state_topic": "invalid_subscribe_topic"},
+                ),
+            ),
+            "Test switch Outlet",
+        ),
+    ],
+    ids=[
+        "notify_with_entity_name",
+        "notify_no_entity_name",
+        "sensor_options",
+        "sensor_total",
+        "switch",
+    ],
+)
+async def test_subentry_configflow(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    config_subentries_data: dict[str, Any],
+    mock_device_user_input: dict[str, Any],
+    mock_entity_user_input: dict[str, Any],
+    mock_entity_details_user_input: dict[str, Any],
+    mock_entity_details_failed_user_input: tuple[
+        tuple[dict[str, Any], dict[str, str]],
+    ],
+    mock_mqtt_user_input: dict[str, Any],
+    mock_failed_mqtt_user_input: tuple[tuple[dict[str, Any], dict[str, str]],],
+    entity_name: str,
+) -> None:
+    """Test the subentry ConfigFlow."""
+    device_name = mock_device_user_input["name"]
+    component = next(iter(config_subentries_data["components"].values()))
+
+    await mqtt_mock_entry()
+    config_entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
+
+    result = await hass.config_entries.subentries.async_init(
+        (config_entry.entry_id, "device"),
+        context={"source": config_entries.SOURCE_USER},
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "device"
+
+    # Test the URL validation
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input={
+            "name": device_name,
+            "configuration_url": "http:/badurl.example.com",
+        },
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "device"
+    assert result["errors"]["configuration_url"] == "invalid_url"
+
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input=mock_device_user_input,
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "entity"
+    assert result["errors"] == {}
+
+    # Process entity flow (initial step)
+
+    # Test the entity picture URL validation
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input={
+            "platform": component["platform"],
+            "entity_picture": "invalid url",
+        }
+        | mock_entity_user_input,
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "entity"
+
+    # Try again with valid data
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input={
+            "platform": component["platform"],
+            "entity_picture": component["entity_picture"],
+        }
+        | mock_entity_user_input,
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {}
+    assert result["description_placeholders"] == {
+        "mqtt_device": device_name,
+        "platform": component["platform"],
+        "entity": entity_name,
+        "url": learn_more_url(component["platform"]),
+    }
+
+    # Process extra step if the platform supports it
+    if mock_entity_details_user_input is not None:
+        # Extra entity details flow step
+        assert result["step_id"] == "entity_platform_config"
+
+        # First test validators if set of test
+        for failed_user_input, failed_errors in mock_entity_details_failed_user_input:
+            # Test an invalid entity details user input case
+            result = await hass.config_entries.subentries.async_configure(
+                result["flow_id"],
+                user_input=failed_user_input,
+            )
+            assert result["type"] is FlowResultType.FORM
+            assert result["errors"] == failed_errors
+
+        # Now try again with valid data
+        result = await hass.config_entries.subentries.async_configure(
+            result["flow_id"],
+            user_input=mock_entity_details_user_input,
+        )
+        assert result["type"] is FlowResultType.FORM
+        assert result["errors"] == {}
+        assert result["description_placeholders"] == {
+            "mqtt_device": device_name,
+            "platform": component["platform"],
+            "entity": entity_name,
+            "url": learn_more_url(component["platform"]),
+        }
+    else:
+        # No details form step
+        assert result["step_id"] == "mqtt_platform_config"
+
+    # Process mqtt platform config flow
+    # Test an invalid mqtt user input case
+    for failed_user_input, failed_errors in mock_failed_mqtt_user_input:
+        result = await hass.config_entries.subentries.async_configure(
+            result["flow_id"],
+            user_input=failed_user_input,
+        )
+        assert result["type"] is FlowResultType.FORM
+        assert result["errors"] == failed_errors
+
+    # Try again with a valid configuration
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"], user_input=mock_mqtt_user_input
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == device_name
+
+    subentry_component = next(
+        iter(next(iter(config_entry.subentries.values())).data["components"].values())
+    )
+    assert subentry_component == next(
+        iter(config_subentries_data["components"].values())
+    )
+
+    subentry_device_data = next(iter(config_entry.subentries.values())).data["device"]
+    for option, value in mock_device_user_input.items():
+        assert subentry_device_data[option] == value
+
+    await hass.async_block_till_done()
+
+
+@pytest.mark.parametrize(
+    "mqtt_config_subentries_data",
+    [
+        (
+            ConfigSubentryData(
+                data=MOCK_NOTIFY_SUBENTRY_DATA_MULTI,
+                subentry_type="device",
+                title="Mock subentry",
+            ),
+        )
+    ],
+    ids=["notify"],
+)
+async def test_subentry_reconfigure_remove_entity(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test the subentry ConfigFlow reconfigure removing an entity."""
+    await mqtt_mock_entry()
+    config_entry: MockConfigEntry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
+    subentry_id: str
+    subentry: ConfigSubentry
+    subentry_id, subentry = next(iter(config_entry.subentries.items()))
+    result = await config_entry.start_subentry_reconfigure_flow(
+        hass, "device", subentry_id
+    )
+    assert result["type"] is FlowResultType.MENU
+    assert result["step_id"] == "summary_menu"
+
+    # assert we have a device for the subentry
+    device = device_registry.async_get_device(identifiers={(mqtt.DOMAIN, subentry_id)})
+    assert device is not None
+
+    # assert we have an entity for all subentry components
+    components = deepcopy(dict(subentry.data))["components"]
+    assert len(components) == 2
+    object_list = list(components)
+    component_list = list(components.values())
+    entity_name_0 = (
+        f"{device.name} {component_list[0]['name']} ({component_list[0]['platform']})"
+    )
+    entity_name_1 = (
+        f"{device.name} {component_list[1]['name']} ({component_list[1]['platform']})"
+    )
+
+    for key, component in components.items():
+        unique_entity_id = f"{subentry_id}_{key}"
+        entity_id = entity_registry.async_get_entity_id(
+            domain=component["platform"],
+            platform=mqtt.DOMAIN,
+            unique_id=unique_entity_id,
+        )
+        assert entity_id is not None
+        entity_entry = entity_registry.async_get(entity_id)
+        assert entity_entry is not None
+        assert entity_entry.config_subentry_id == subentry_id
+
+    # assert menu options, we have the option to delete one entity
+    # we have no option to save and finish yet
+    assert result["menu_options"] == [
+        "entity",
+        "update_entity",
+        "delete_entity",
+        "device",
+        "availability",
+    ]
+
+    # assert we can delete an entity
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        {"next_step_id": "delete_entity"},
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "delete_entity"
+    assert result["data_schema"].schema["component"].config["options"] == [
+        {"value": object_list[0], "label": entity_name_0},
+        {"value": object_list[1], "label": entity_name_1},
+    ]
+    # remove notify_the_second_notifier
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input={
+            "component": object_list[1],
+        },
+    )
+
+    # assert menu options, we have only one item left, we cannot delete it
+    assert result["type"] is FlowResultType.MENU
+    assert result["step_id"] == "summary_menu"
+    assert result["menu_options"] == [
+        "entity",
+        "update_entity",
+        "device",
+        "availability",
+        "save_changes",
+    ]
+
+    # finish reconfigure flow
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        {"next_step_id": "save_changes"},
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reconfigure_successful"
+
+    # check if the second entity was removed from the subentry and entity registry
+    unique_entity_id = f"{subentry_id}_{object_list[1]}"
+    entity_id = entity_registry.async_get_entity_id(
+        domain=components[object_list[1]]["platform"],
+        platform=mqtt.DOMAIN,
+        unique_id=unique_entity_id,
+    )
+    assert entity_id is None
+    new_components = deepcopy(dict(subentry.data))["components"]
+    assert object_list[0] in new_components
+    assert object_list[1] not in new_components
+
+
+@pytest.mark.parametrize(
+    ("mqtt_config_subentries_data", "user_input_mqtt"),
+    [
+        (
+            (
+                ConfigSubentryData(
+                    data=MOCK_NOTIFY_SUBENTRY_DATA_MULTI,
+                    subentry_type="device",
+                    title="Mock subentry",
+                ),
+            ),
+            {"command_topic": "test-topic2-updated"},
+        )
+    ],
+    ids=["notify"],
+)
+async def test_subentry_reconfigure_edit_entity_multi_entitites(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    user_input_mqtt: dict[str, Any],
+) -> None:
+    """Test the subentry ConfigFlow reconfigure with multi entities."""
+    await mqtt_mock_entry()
+    config_entry: MockConfigEntry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
+    subentry_id: str
+    subentry: ConfigSubentry
+    subentry_id, subentry = next(iter(config_entry.subentries.items()))
+    result = await config_entry.start_subentry_reconfigure_flow(
+        hass, "device", subentry_id
+    )
+
+    assert result["type"] is FlowResultType.MENU
+    assert result["step_id"] == "summary_menu"
+
+    # assert we have a device for the subentry
+    device = device_registry.async_get_device(identifiers={(mqtt.DOMAIN, subentry_id)})
+    assert device is not None
+
+    # assert we have an entity for all subentry components
+    components = deepcopy(dict(subentry.data))["components"]
+    assert len(components) == 2
+    object_list = list(components)
+    component_list = list(components.values())
+    entity_name_0 = (
+        f"{device.name} {component_list[0]['name']} ({component_list[0]['platform']})"
+    )
+    entity_name_1 = (
+        f"{device.name} {component_list[1]['name']} ({component_list[1]['platform']})"
+    )
+
+    for key in components:
+        unique_entity_id = f"{subentry_id}_{key}"
+        entity_id = entity_registry.async_get_entity_id(
+            domain="notify", platform=mqtt.DOMAIN, unique_id=unique_entity_id
+        )
+        assert entity_id is not None
+        entity_entry = entity_registry.async_get(entity_id)
+        assert entity_entry is not None
+        assert entity_entry.config_subentry_id == subentry_id
+
+    # assert menu options, we have the option to delete one entity
+    # we have no option to save and finish yet
+    assert result["menu_options"] == [
+        "entity",
+        "update_entity",
+        "delete_entity",
+        "device",
+        "availability",
+    ]
+
+    # assert we can update an entity
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        {"next_step_id": "update_entity"},
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "update_entity"
+    assert result["data_schema"].schema["component"].config["options"] == [
+        {"value": object_list[0], "label": entity_name_0},
+        {"value": object_list[1], "label": entity_name_1},
+    ]
+    # select second entity
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input={
+            "component": object_list[1],
+        },
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "entity"
+
+    # submit the common entity data with changed entity_picture
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input={
+            "entity_picture": "https://example.com",
+        },
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "mqtt_platform_config"
+
+    # submit the new platform specific entity data
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input=user_input_mqtt,
+    )
+    assert result["type"] is FlowResultType.MENU
+    assert result["step_id"] == "summary_menu"
+
+    # finish reconfigure flow
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        {"next_step_id": "save_changes"},
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reconfigure_successful"
+
+    # Check we still have our components
+    new_components = deepcopy(dict(subentry.data))["components"]
+
+    # Check the second component was updated
+    assert new_components[object_list[0]] == components[object_list[0]]
+    for key, value in user_input_mqtt.items():
+        assert new_components[object_list[1]][key] == value
+
+
+@pytest.mark.parametrize(
+    (
+        "mqtt_config_subentries_data",
+        "user_input_platform_config_validation",
+        "user_input_platform_config",
+        "user_input_mqtt",
+        "removed_options",
+    ),
+    [
+        (
+            (
+                ConfigSubentryData(
+                    data=MOCK_NOTIFY_SUBENTRY_DATA_SINGLE,
+                    subentry_type="device",
+                    title="Mock subentry",
+                ),
+            ),
+            (),
+            None,
+            {
+                "command_topic": "test-topic1-updated",
+                "command_template": "{{ value }}",
+                "retain": True,
+            },
+            {"entity_picture"},
+        ),
+        (
+            (
+                ConfigSubentryData(
+                    data=MOCK_SENSOR_SUBENTRY_DATA_SINGLE,
+                    subentry_type="device",
+                    title="Mock subentry",
+                ),
+            ),
+            (
+                (
+                    {
+                        "device_class": "battery",
+                        "options": [],
+                        "state_class": "measurement",
+                        "unit_of_measurement": "invalid",
+                    },
+                    # Allow to accept options are being removed
+                    {
+                        "device_class": "options_device_class_enum",
+                        "options": "options_not_allowed_with_state_class_or_uom",
+                        "unit_of_measurement": "invalid_uom",
+                    },
+                ),
+            ),
+            {
+                "device_class": "battery",
+                "state_class": "measurement",
+                "unit_of_measurement": "%",
+                "advanced_settings": {"suggested_display_precision": 1},
+            },
+            {
+                "state_topic": "test-topic1-updated",
+                "value_template": "{{ value_json.value }}",
+            },
+            {"options", "expire_after", "entity_picture"},
+        ),
+    ],
+    ids=["notify", "sensor"],
+)
+async def test_subentry_reconfigure_edit_entity_single_entity(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    user_input_platform_config_validation: tuple[
+        tuple[dict[str, Any], dict[str, str] | None], ...
+    ]
+    | None,
+    user_input_platform_config: dict[str, Any] | None,
+    user_input_mqtt: dict[str, Any],
+    removed_options: tuple[str, ...],
+) -> None:
+    """Test the subentry ConfigFlow reconfigure with single entity."""
+    await mqtt_mock_entry()
+    config_entry: MockConfigEntry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
+    subentry_id: str
+    subentry: ConfigSubentry
+    subentry_id, subentry = next(iter(config_entry.subentries.items()))
+    result = await config_entry.start_subentry_reconfigure_flow(
+        hass, "device", subentry_id
+    )
+    assert result["type"] is FlowResultType.MENU
+    assert result["step_id"] == "summary_menu"
+
+    # assert we have a device for the subentry
+    device = device_registry.async_get_device(identifiers={(mqtt.DOMAIN, subentry_id)})
+    assert device is not None
+
+    # assert we have an entity for the subentry component
+    # Check we have "notify_milkman_alert" in our mock data
+    components = deepcopy(dict(subentry.data))["components"]
+    assert len(components) == 1
+
+    component_id, component = next(iter(components.items()))
+
+    unique_entity_id = f"{subentry_id}_{component_id}"
+    entity_id = entity_registry.async_get_entity_id(
+        domain=component["platform"], platform=mqtt.DOMAIN, unique_id=unique_entity_id
+    )
+    assert entity_id is not None
+    entity_entry = entity_registry.async_get(entity_id)
+    assert entity_entry is not None
+    assert entity_entry.config_subentry_id == subentry_id
+
+    # assert menu options, we do not have the option to delete an entity
+    # we have no option to save and finish yet
+    assert result["menu_options"] == [
+        "entity",
+        "update_entity",
+        "device",
+        "availability",
+    ]
+
+    # assert we can update the entity, there is no select step
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        {"next_step_id": "update_entity"},
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "entity"
+
+    # submit the new common entity data, reset entity_picture
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input={},
+    )
+    assert result["type"] is FlowResultType.FORM
+
+    if user_input_platform_config is None:
+        # Skip entity flow step
+        assert result["step_id"] == "mqtt_platform_config"
+    else:
+        # Additional entity flow step
+        assert result["step_id"] == "entity_platform_config"
+        for entity_validation_config, errors in user_input_platform_config_validation:
+            result = await hass.config_entries.subentries.async_configure(
+                result["flow_id"],
+                user_input=entity_validation_config,
+            )
+            assert result["step_id"] == "entity_platform_config"
+            assert result.get("errors") == errors
+            assert result["type"] is FlowResultType.FORM
+
+        result = await hass.config_entries.subentries.async_configure(
+            result["flow_id"],
+            user_input=user_input_platform_config,
+        )
+        assert result["type"] is FlowResultType.FORM
+        assert result["step_id"] == "mqtt_platform_config"
+
+    # submit the new platform specific entity data,
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input=user_input_mqtt,
+    )
+    assert result["type"] is FlowResultType.MENU
+    assert result["step_id"] == "summary_menu"
+
+    # finish reconfigure flow
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        {"next_step_id": "save_changes"},
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reconfigure_successful"
+
+    # Check we still have out components
+    new_components = deepcopy(dict(subentry.data))["components"]
+    assert len(new_components) == 1
+
+    # Check our update was successful
+    assert "entity_picture" not in new_components[component_id]
+
+    # Check the second component was updated
+    for key, value in user_input_mqtt.items():
+        assert new_components[component_id][key] == value
+
+    assert set(component) - set(new_components[component_id]) == removed_options
+
+
+@pytest.mark.parametrize(
+    (
+        "mqtt_config_subentries_data",
+        "user_input_entity_details",
+        "user_input_mqtt",
+        "filtered_out_fields",
+    ),
+    [
+        (
+            (
+                ConfigSubentryData(
+                    data=MOCK_SENSOR_SUBENTRY_DATA_SINGLE_LAST_RESET_TEMPLATE,
+                    subentry_type="device",
+                    title="Mock subentry",
+                ),
+            ),
+            {
+                "state_class": "measurement",
+            },
+            {
+                "state_topic": "test-topic",
+            },
+            ("last_reset_value_template",),
+        ),
+    ],
+    ids=["sensor_last_reset_template"],
+)
+async def test_subentry_reconfigure_edit_entity_reset_fields(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    user_input_entity_details: dict[str, Any],
+    user_input_mqtt: dict[str, Any],
+    filtered_out_fields: tuple[str, ...],
+) -> None:
+    """Test the subentry ConfigFlow reconfigure resets filtered out fields."""
+    await mqtt_mock_entry()
+    config_entry: MockConfigEntry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
+    subentry_id: str
+    subentry: ConfigSubentry
+    subentry_id, subentry = next(iter(config_entry.subentries.items()))
+    result = await config_entry.start_subentry_reconfigure_flow(
+        hass, "device", subentry_id
+    )
+    assert result["type"] is FlowResultType.MENU
+    assert result["step_id"] == "summary_menu"
+
+    # assert we have a device for the subentry
+    device = device_registry.async_get_device(identifiers={(mqtt.DOMAIN, subentry_id)})
+    assert device is not None
+
+    # assert we have an entity for the subentry component
+    components = deepcopy(dict(subentry.data))["components"]
+    assert len(components) == 1
+
+    component_id, component = next(iter(components.items()))
+    for field in filtered_out_fields:
+        assert field in component
+
+    unique_entity_id = f"{subentry_id}_{component_id}"
+    entity_id = entity_registry.async_get_entity_id(
+        domain=component["platform"], platform=mqtt.DOMAIN, unique_id=unique_entity_id
+    )
+    assert entity_id is not None
+    entity_entry = entity_registry.async_get(entity_id)
+    assert entity_entry is not None
+    assert entity_entry.config_subentry_id == subentry_id
+
+    # assert menu options, we do not have the option to delete an entity
+    # we have no option to save and finish yet
+    assert result["menu_options"] == [
+        "entity",
+        "update_entity",
+        "device",
+        "availability",
+    ]
+
+    # assert we can update the entity, there is no select step
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        {"next_step_id": "update_entity"},
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "entity"
+
+    # submit the new common entity data, reset entity_picture
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input={},
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "entity_platform_config"
+
+    # submit the new entity platform config
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input=user_input_entity_details,
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "mqtt_platform_config"
+
+    # submit the new platform specific mqtt data,
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input=user_input_mqtt,
+    )
+    assert result["type"] is FlowResultType.MENU
+    assert result["step_id"] == "summary_menu"
+
+    # finish reconfigure flow
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        {"next_step_id": "save_changes"},
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reconfigure_successful"
+
+    # Check we still have out components
+    new_components = deepcopy(dict(subentry.data))["components"]
+    assert len(new_components) == 1
+
+    # Check our update was successful
+    assert "entity_picture" not in new_components[component_id]
+
+    # Check the second component was updated
+    for key, value in user_input_mqtt.items():
+        assert new_components[component_id][key] == value
+
+    # Check field are filtered out correctly
+    for field in filtered_out_fields:
+        assert field not in new_components[component_id]
+
+
+@pytest.mark.parametrize(
+    ("mqtt_config_subentries_data", "user_input_entity", "user_input_mqtt"),
+    [
+        (
+            (
+                ConfigSubentryData(
+                    data=MOCK_NOTIFY_SUBENTRY_DATA_SINGLE,
+                    subentry_type="device",
+                    title="Mock subentry",
+                ),
+            ),
+            {
+                "platform": "notify",
+                "name": "The second notifier",
+                "entity_picture": "https://example.com",
+            },
+            {
+                "command_topic": "test-topic2",
+            },
+        )
+    ],
+    ids=["notify_notify"],
+)
+async def test_subentry_reconfigure_add_entity(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    user_input_entity: dict[str, Any],
+    user_input_mqtt: dict[str, Any],
+) -> None:
+    """Test the subentry ConfigFlow reconfigure and add an entity."""
+    await mqtt_mock_entry()
+    config_entry: MockConfigEntry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
+    subentry_id: str
+    subentry: ConfigSubentry
+    subentry_id, subentry = next(iter(config_entry.subentries.items()))
+    result = await config_entry.start_subentry_reconfigure_flow(
+        hass, "device", subentry_id
+    )
+    assert result["type"] is FlowResultType.MENU
+    assert result["step_id"] == "summary_menu"
+
+    # assert we have a device for the subentry
+    device = device_registry.async_get_device(identifiers={(mqtt.DOMAIN, subentry_id)})
+    assert device is not None
+
+    # assert we have an entity for the subentry component
+    components = deepcopy(dict(subentry.data))["components"]
+    assert len(components) == 1
+    component_id_1, component1 = next(iter(components.items()))
+    unique_entity_id = f"{subentry_id}_{component_id_1}"
+    entity_id = entity_registry.async_get_entity_id(
+        domain=component1["platform"], platform=mqtt.DOMAIN, unique_id=unique_entity_id
+    )
+    assert entity_id is not None
+    entity_entry = entity_registry.async_get(entity_id)
+    assert entity_entry is not None
+    assert entity_entry.config_subentry_id == subentry_id
+
+    # assert menu options, we do not have the option to delete an entity
+    # we have no option to save and finish yet
+    assert result["menu_options"] == [
+        "entity",
+        "update_entity",
+        "device",
+        "availability",
+    ]
+
+    # assert we can update the entity, there is no select step
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        {"next_step_id": "entity"},
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "entity"
+
+    # submit the new common entity data
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input=user_input_entity,
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "mqtt_platform_config"
+
+    # submit the new platform specific entity data
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input=user_input_mqtt,
+    )
+    assert result["type"] is FlowResultType.MENU
+    assert result["step_id"] == "summary_menu"
+
+    # Finish reconfigure flow
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        {"next_step_id": "save_changes"},
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reconfigure_successful"
+
+    # Check we still have out components
+    new_components = deepcopy(dict(subentry.data))["components"]
+    assert len(new_components) == 2
+
+    component_id_2 = next(iter(set(new_components) - {component_id_1}))
+
+    # Check our new entity was added correctly
+    expected_component_config = user_input_entity | user_input_mqtt
+    for key, value in expected_component_config.items():
+        assert new_components[component_id_2][key] == value
+
+
+@pytest.mark.parametrize(
+    "mqtt_config_subentries_data",
+    [
+        (
+            ConfigSubentryData(
+                data=MOCK_NOTIFY_SUBENTRY_DATA_MULTI,
+                subentry_type="device",
+                title="Mock subentry",
+            ),
+        )
+    ],
+)
+async def test_subentry_reconfigure_update_device_properties(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    device_registry: dr.DeviceRegistry,
+) -> None:
+    """Test the subentry ConfigFlow reconfigure and update device properties."""
+    await mqtt_mock_entry()
+    config_entry: MockConfigEntry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
+    subentry_id: str
+    subentry: ConfigSubentry
+    subentry_id, subentry = next(iter(config_entry.subentries.items()))
+    result = await config_entry.start_subentry_reconfigure_flow(
+        hass, "device", subentry_id
+    )
+    assert result["type"] is FlowResultType.MENU
+    assert result["step_id"] == "summary_menu"
+
+    # assert we have a device for the subentry
+    device = device_registry.async_get_device(identifiers={(mqtt.DOMAIN, subentry_id)})
+    assert device is not None
+
+    # assert we have an entity for all subentry components
+    components = deepcopy(dict(subentry.data))["components"]
+    assert len(components) == 2
+
+    # Assert initial data
+    device = deepcopy(dict(subentry.data))["device"]
+    assert device["name"] == "Milk notifier"
+    assert device["sw_version"] == "1.0"
+    assert device["hw_version"] == "2.1 rev a"
+    assert device["model"] == "Model XL"
+    assert device["model_id"] == "mn002"
+
+    # assert menu options, we have the option to delete one entity
+    # we have no option to save and finish yet
+    assert result["menu_options"] == [
+        "entity",
+        "update_entity",
+        "delete_entity",
+        "device",
+        "availability",
+    ]
+
+    # assert we can update the device properties
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        {"next_step_id": "device"},
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "device"
+
+    # Update the device details
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input={
+            "name": "Beer notifier",
+            "sw_version": "1.1",
+            "model": "Beer bottle XL",
+            "model_id": "bn003",
+            "configuration_url": "https://example.com",
+        },
+    )
+    assert result["type"] is FlowResultType.MENU
+    assert result["step_id"] == "summary_menu"
+
+    # finish reconfigure flow
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        {"next_step_id": "save_changes"},
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reconfigure_successful"
+
+    # Check our device was updated
+    device = deepcopy(dict(subentry.data))["device"]
+    assert device["name"] == "Beer notifier"
+    assert "hw_version" not in device
+    assert device["model"] == "Beer bottle XL"
+    assert device["model_id"] == "bn003"
+
+
+@pytest.mark.parametrize(
+    "mqtt_config_subentries_data",
+    [
+        (
+            ConfigSubentryData(
+                data=MOCK_NOTIFY_SUBENTRY_DATA_MULTI,
+                subentry_type="device",
+                title="Mock subentry",
+            ),
+        )
+    ],
+)
+async def test_subentry_reconfigure_availablity(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+) -> None:
+    """Test the subentry ConfigFlow reconfigure and update device properties."""
+    await mqtt_mock_entry()
+    config_entry: MockConfigEntry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
+    subentry_id: str
+    subentry: ConfigSubentry
+    subentry_id, subentry = next(iter(config_entry.subentries.items()))
+
+    expected_availability = {
+        "availability_topic": "test/availability",
+        "availability_template": "{{ value_json.availability }}",
+        "payload_available": "online",
+        "payload_not_available": "offline",
+    }
+    assert subentry.data.get("availability") == expected_availability
+
+    result = await config_entry.start_subentry_reconfigure_flow(
+        hass, "device", subentry_id
+    )
+    assert result["type"] is FlowResultType.MENU
+    assert result["step_id"] == "summary_menu"
+
+    # assert we can set the availability config
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        {"next_step_id": "availability"},
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "availability"
+
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input={
+            "availability_topic": "test/new_availability#invalid_topic",
+            "payload_available": "1",
+            "payload_not_available": "0",
+        },
+    )
+    assert result["errors"] == {"availability_topic": "invalid_subscribe_topic"}
+
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input={
+            "availability_topic": "test/new_availability",
+            "payload_available": "1",
+            "payload_not_available": "0",
+        },
+    )
+
+    # finish reconfigure flow
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        {"next_step_id": "save_changes"},
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reconfigure_successful"
+
+    # Check the availability was updated
+    expected_availability = {
+        "availability_topic": "test/new_availability",
+        "payload_available": "1",
+        "payload_not_available": "0",
+    }
+    assert subentry.data.get("availability") == expected_availability
+
+    # Assert we can reset the availability config
+    result = await config_entry.start_subentry_reconfigure_flow(
+        hass, "device", subentry_id
+    )
+    assert result["type"] is FlowResultType.MENU
+    assert result["step_id"] == "summary_menu"
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        {"next_step_id": "availability"},
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "availability"
+
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        user_input={
+            "payload_available": "1",
+            "payload_not_available": "0",
+        },
+    )
+
+    # Finish reconfigure flow
+    result = await hass.config_entries.subentries.async_configure(
+        result["flow_id"],
+        {"next_step_id": "save_changes"},
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reconfigure_successful"
+
+    # Check the availability was updated
+    assert subentry.data.get("availability") == {
+        "payload_available": "1",
+        "payload_not_available": "0",
+    }
diff --git a/tests/components/mqtt/test_cover.py b/tests/components/mqtt/test_cover.py
index ee74b78be81..81530758de7 100644
--- a/tests/components/mqtt/test_cover.py
+++ b/tests/components/mqtt/test_cover.py
@@ -37,6 +37,7 @@ from homeassistant.const import (
     SERVICE_SET_COVER_POSITION,
     SERVICE_SET_COVER_TILT_POSITION,
     SERVICE_STOP_COVER,
+    SERVICE_STOP_COVER_TILT,
     SERVICE_TOGGLE,
     SERVICE_TOGGLE_COVER_TILT,
     STATE_CLOSED,
@@ -45,7 +46,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
@@ -936,6 +937,63 @@ async def test_send_stop_cover_command(
     assert state.state == STATE_UNKNOWN
 
 
+@pytest.mark.parametrize(
+    ("hass_config", "payload_stop"),
+    [
+        (
+            {
+                mqtt.DOMAIN: {
+                    cover.DOMAIN: {
+                        "name": "test",
+                        "state_topic": "state-topic",
+                        "tilt_command_topic": "tilt-command-topic",
+                        "payload_stop_tilt": "TILT_STOP",
+                        "qos": 2,
+                    }
+                }
+            },
+            "TILT_STOP",
+        ),
+        (
+            {
+                mqtt.DOMAIN: {
+                    cover.DOMAIN: {
+                        "name": "test",
+                        "state_topic": "state-topic",
+                        "tilt_command_topic": "tilt-command-topic",
+                        "qos": 2,
+                    }
+                }
+            },
+            "STOP",
+        ),
+    ],
+)
+async def test_send_stop_tilt_command(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    payload_stop: str,
+) -> None:
+    """Test the sending of stop_cover_tilt."""
+    mqtt_mock = await mqtt_mock_entry()
+
+    state = hass.states.get("cover.test")
+    assert state.state == STATE_UNKNOWN
+
+    await hass.services.async_call(
+        cover.DOMAIN,
+        SERVICE_STOP_COVER_TILT,
+        {ATTR_ENTITY_ID: "cover.test"},
+        blocking=True,
+    )
+
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tilt-command-topic", payload_stop, 2, False
+    )
+    state = hass.states.get("cover.test")
+    assert state.state == STATE_UNKNOWN
+
+
 @pytest.mark.parametrize(
     "hass_config",
     [
diff --git a/tests/components/mqtt/test_device_tracker.py b/tests/components/mqtt/test_device_tracker.py
index 00e88860299..02289c8e476 100644
--- a/tests/components/mqtt/test_device_tracker.py
+++ b/tests/components/mqtt/test_device_tracker.py
@@ -12,7 +12,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_reloadable,
     help_test_setting_blocked_attribute_via_mqtt_json_message,
diff --git a/tests/components/mqtt/test_device_trigger.py b/tests/components/mqtt/test_device_trigger.py
index 5cdfb14a5cf..ecf922e54a1 100644
--- a/tests/components/mqtt/test_device_trigger.py
+++ b/tests/components/mqtt/test_device_trigger.py
@@ -16,7 +16,7 @@ from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.trigger import async_initialize_triggers
 from homeassistant.setup import async_setup_component
 
-from .test_common import help_test_unload_config_entry
+from .common import help_test_unload_config_entry
 
 from tests.common import async_fire_mqtt_message, async_get_device_automations
 from tests.typing import MqttMockHAClientGenerator, WebSocketGenerator
diff --git a/tests/components/mqtt/test_discovery.py b/tests/components/mqtt/test_discovery.py
index 982167feee1..ee33cbcbaa1 100644
--- a/tests/components/mqtt/test_discovery.py
+++ b/tests/components/mqtt/test_discovery.py
@@ -46,8 +46,8 @@ from homeassistant.helpers.service_info.mqtt import MqttServiceInfo
 from homeassistant.setup import async_setup_component
 from homeassistant.util.signal_type import SignalTypeFormat
 
+from .common import help_all_subscribe_calls, help_test_unload_config_entry
 from .conftest import ENTRY_DEFAULT_BIRTH_MESSAGE
-from .test_common import help_all_subscribe_calls, help_test_unload_config_entry
 from .test_tag import DEFAULT_TAG_ID, DEFAULT_TAG_SCAN
 
 from tests.common import (
@@ -2380,7 +2380,6 @@ ABBREVIATIONS_WHITE_LIST = [
     "CONF_PRECISION",
     "CONF_QOS",
     "CONF_SCHEMA",
-    "CONF_SWING_MODE_LIST",
     "CONF_TEMP_STEP",
     # Removed
     "CONF_WHITE_VALUE",
diff --git a/tests/components/mqtt/test_event.py b/tests/components/mqtt/test_event.py
index 41049ed0887..a7f00a1d1a8 100644
--- a/tests/components/mqtt/test_event.py
+++ b/tests/components/mqtt/test_event.py
@@ -13,7 +13,7 @@ from homeassistant.const import STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
diff --git a/tests/components/mqtt/test_fan.py b/tests/components/mqtt/test_fan.py
index 6c8afe8c1b4..36b5032e282 100644
--- a/tests/components/mqtt/test_fan.py
+++ b/tests/components/mqtt/test_fan.py
@@ -36,7 +36,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
diff --git a/tests/components/mqtt/test_humidifier.py b/tests/components/mqtt/test_humidifier.py
index 20ca89181eb..435531182ed 100644
--- a/tests/components/mqtt/test_humidifier.py
+++ b/tests/components/mqtt/test_humidifier.py
@@ -36,7 +36,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
diff --git a/tests/components/mqtt/test_image.py b/tests/components/mqtt/test_image.py
index 6f0eb8edf49..9b64a8836a0 100644
--- a/tests/components/mqtt/test_image.py
+++ b/tests/components/mqtt/test_image.py
@@ -14,7 +14,7 @@ from homeassistant.components import image, mqtt
 from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
diff --git a/tests/components/mqtt/test_init.py b/tests/components/mqtt/test_init.py
index 4e0873c6e1b..af9975de1ea 100644
--- a/tests/components/mqtt/test_init.py
+++ b/tests/components/mqtt/test_init.py
@@ -13,6 +13,7 @@ from freezegun.api import FrozenDateTimeFactory
 import pytest
 import voluptuous as vol
 
+from homeassistant import core as ha
 from homeassistant.components import mqtt
 from homeassistant.components.mqtt import debug_info
 from homeassistant.components.mqtt.models import (
@@ -30,7 +31,6 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
 )
-import homeassistant.core as ha
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import device_registry as dr, entity_registry as er, template
@@ -45,6 +45,7 @@ from tests.common import (
     MockConfigEntry,
     MockEntity,
     MockEntityPlatform,
+    MockMqttReasonCode,
     async_fire_mqtt_message,
     async_fire_time_changed,
     mock_restore_cache,
@@ -391,6 +392,25 @@ async def test_service_call_with_ascii_qos_retain_flags(
         blocking=True,
     )
     assert mqtt_mock.async_publish.called
+    assert mqtt_mock.async_publish.call_args[0][1] == ""
+    assert mqtt_mock.async_publish.call_args[0][2] == 2
+    assert not mqtt_mock.async_publish.call_args[0][3]
+
+    mqtt_mock.reset_mock()
+
+    # Test service call without payload
+    await hass.services.async_call(
+        mqtt.DOMAIN,
+        mqtt.SERVICE_PUBLISH,
+        {
+            mqtt.ATTR_TOPIC: "test/topic",
+            mqtt.ATTR_QOS: "2",
+            mqtt.ATTR_RETAIN: "no",
+        },
+        blocking=True,
+    )
+    assert mqtt_mock.async_publish.called
+    assert mqtt_mock.async_publish.call_args[0][1] is None
     assert mqtt_mock.async_publish.call_args[0][2] == 2
     assert not mqtt_mock.async_publish.call_args[0][3]
 
@@ -1553,6 +1573,7 @@ async def test_subscribe_connection_status(
     setup_with_birth_msg_client_mock: MqttMockPahoClient,
 ) -> None:
     """Test connextion status subscription."""
+
     mqtt_client_mock = setup_with_birth_msg_client_mock
     mqtt_connected_calls_callback: list[bool] = []
     mqtt_connected_calls_async: list[bool] = []
@@ -1570,7 +1591,7 @@ async def test_subscribe_connection_status(
     assert mqtt.is_connected(hass) is True
 
     # Mock disconnect status
-    mqtt_client_mock.on_disconnect(None, None, 0)
+    mqtt_client_mock.on_disconnect(None, None, 0, MockMqttReasonCode())
     await hass.async_block_till_done()
     assert mqtt.is_connected(hass) is False
 
@@ -1584,12 +1605,12 @@ async def test_subscribe_connection_status(
 
     # Mock connect status
     mock_debouncer.clear()
-    mqtt_client_mock.on_connect(None, None, 0, 0)
+    mqtt_client_mock.on_connect(None, None, 0, MockMqttReasonCode())
     await mock_debouncer.wait()
     assert mqtt.is_connected(hass) is True
 
     # Mock disconnect status
-    mqtt_client_mock.on_disconnect(None, None, 0)
+    mqtt_client_mock.on_disconnect(None, None, 0, MockMqttReasonCode())
     await hass.async_block_till_done()
     assert mqtt.is_connected(hass) is False
 
@@ -1599,7 +1620,7 @@ async def test_subscribe_connection_status(
 
     # Mock connect status
     mock_debouncer.clear()
-    mqtt_client_mock.on_connect(None, None, 0, 0)
+    mqtt_client_mock.on_connect(None, None, 0, MockMqttReasonCode())
     await mock_debouncer.wait()
     assert mqtt.is_connected(hass) is True
 
diff --git a/tests/components/mqtt/test_lawn_mower.py b/tests/components/mqtt/test_lawn_mower.py
index 0bef4196ef2..c58402c4f5c 100644
--- a/tests/components/mqtt/test_lawn_mower.py
+++ b/tests/components/mqtt/test_lawn_mower.py
@@ -19,7 +19,7 @@ from homeassistant.components.mqtt.lawn_mower import MQTT_LAWN_MOWER_ATTRIBUTES_
 from homeassistant.const import ATTR_ASSUMED_STATE, ATTR_ENTITY_ID, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant, State
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
diff --git a/tests/components/mqtt/test_light.py b/tests/components/mqtt/test_light.py
index f8c66a3de1d..a8be259c1c9 100644
--- a/tests/components/mqtt/test_light.py
+++ b/tests/components/mqtt/test_light.py
@@ -210,7 +210,7 @@ from homeassistant.components.mqtt.models import PublishPayloadType
 from homeassistant.const import ATTR_ASSUMED_STATE, STATE_OFF, STATE_ON, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant, State
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
diff --git a/tests/components/mqtt/test_light_json.py b/tests/components/mqtt/test_light_json.py
index 512e4091438..f3264858095 100644
--- a/tests/components/mqtt/test_light_json.py
+++ b/tests/components/mqtt/test_light_json.py
@@ -100,10 +100,9 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import HomeAssistant, State
-from homeassistant.helpers.json import json_dumps
 from homeassistant.util.json import json_loads
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
@@ -195,172 +194,6 @@ async def test_fail_setup_if_no_command_topic(
     assert "required key not provided" in caplog.text
 
 
-@pytest.mark.parametrize(
-    "hass_config",
-    [
-        help_custom_config(light.DOMAIN, COLOR_MODES_CONFIG, ({"color_temp": True},)),
-        help_custom_config(light.DOMAIN, COLOR_MODES_CONFIG, ({"hs": True},)),
-        help_custom_config(light.DOMAIN, COLOR_MODES_CONFIG, ({"rgb": True},)),
-        help_custom_config(light.DOMAIN, COLOR_MODES_CONFIG, ({"xy": True},)),
-    ],
-)
-async def test_fail_setup_if_color_mode_deprecated(
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test if setup fails if color mode is combined with deprecated config keys."""
-    assert await mqtt_mock_entry()
-    assert "supported_color_modes must not be combined with any of" in caplog.text
-
-
-@pytest.mark.parametrize(
-    ("hass_config", "color_modes"),
-    [
-        (
-            help_custom_config(light.DOMAIN, DEFAULT_CONFIG, ({"color_temp": True},)),
-            ("color_temp",),
-        ),
-        (help_custom_config(light.DOMAIN, DEFAULT_CONFIG, ({"hs": True},)), ("hs",)),
-        (help_custom_config(light.DOMAIN, DEFAULT_CONFIG, ({"rgb": True},)), ("rgb",)),
-        (help_custom_config(light.DOMAIN, DEFAULT_CONFIG, ({"xy": True},)), ("xy",)),
-        (
-            help_custom_config(
-                light.DOMAIN, DEFAULT_CONFIG, ({"color_temp": True, "rgb": True},)
-            ),
-            ("color_temp, rgb", "rgb, color_temp"),
-        ),
-    ],
-    ids=["color_temp", "hs", "rgb", "xy", "color_temp, rgb"],
-)
-async def test_warning_if_color_mode_flags_are_used(
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-    caplog: pytest.LogCaptureFixture,
-    color_modes: tuple[str, ...],
-) -> None:
-    """Test warnings deprecated config keys without supported color modes defined."""
-    with patch(
-        "homeassistant.components.mqtt.light.schema_json.async_create_issue"
-    ) as mock_async_create_issue:
-        assert await mqtt_mock_entry()
-    assert any(
-        (
-            f"Deprecated flags [{color_modes_case}] used in MQTT JSON light config "
-            "for handling color mode, please use `supported_color_modes` instead."
-            in caplog.text
-        )
-        for color_modes_case in color_modes
-    )
-    mock_async_create_issue.assert_called_once()
-
-
-@pytest.mark.parametrize(
-    ("config", "color_modes"),
-    [
-        (
-            help_custom_config(light.DOMAIN, DEFAULT_CONFIG, ({"color_temp": True},)),
-            ("color_temp",),
-        ),
-        (help_custom_config(light.DOMAIN, DEFAULT_CONFIG, ({"hs": True},)), ("hs",)),
-        (help_custom_config(light.DOMAIN, DEFAULT_CONFIG, ({"rgb": True},)), ("rgb",)),
-        (help_custom_config(light.DOMAIN, DEFAULT_CONFIG, ({"xy": True},)), ("xy",)),
-        (
-            help_custom_config(
-                light.DOMAIN, DEFAULT_CONFIG, ({"color_temp": True, "rgb": True},)
-            ),
-            ("color_temp, rgb", "rgb, color_temp"),
-        ),
-    ],
-    ids=["color_temp", "hs", "rgb", "xy", "color_temp, rgb"],
-)
-async def test_warning_on_discovery_if_color_mode_flags_are_used(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-    caplog: pytest.LogCaptureFixture,
-    config: dict[str, Any],
-    color_modes: tuple[str, ...],
-) -> None:
-    """Test warnings deprecated config keys with discovery."""
-    with patch(
-        "homeassistant.components.mqtt.light.schema_json.async_create_issue"
-    ) as mock_async_create_issue:
-        assert await mqtt_mock_entry()
-
-        config_payload = json_dumps(config[mqtt.DOMAIN][light.DOMAIN][0])
-        async_fire_mqtt_message(
-            hass,
-            "homeassistant/light/bla/config",
-            config_payload,
-        )
-        await hass.async_block_till_done()
-    assert any(
-        (
-            f"Deprecated flags [{color_modes_case}] used in MQTT JSON light config "
-            "for handling color mode, please "
-            "use `supported_color_modes` instead" in caplog.text
-        )
-        for color_modes_case in color_modes
-    )
-    mock_async_create_issue.assert_not_called()
-
-
-@pytest.mark.parametrize(
-    "hass_config",
-    [
-        help_custom_config(
-            light.DOMAIN,
-            DEFAULT_CONFIG,
-            ({"color_mode": True, "supported_color_modes": ["color_temp"]},),
-        ),
-    ],
-    ids=["color_temp"],
-)
-async def test_warning_if_color_mode_option_flag_is_used(
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test warning deprecated color_mode option flag is used."""
-    with patch(
-        "homeassistant.components.mqtt.light.schema_json.async_create_issue"
-    ) as mock_async_create_issue:
-        assert await mqtt_mock_entry()
-    assert "Deprecated flag `color_mode` used in MQTT JSON light config" in caplog.text
-    mock_async_create_issue.assert_called_once()
-
-
-@pytest.mark.parametrize(
-    "config",
-    [
-        help_custom_config(
-            light.DOMAIN,
-            DEFAULT_CONFIG,
-            ({"color_mode": True, "supported_color_modes": ["color_temp"]},),
-        ),
-    ],
-    ids=["color_temp"],
-)
-async def test_warning_on_discovery_if_color_mode_option_flag_is_used(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-    caplog: pytest.LogCaptureFixture,
-    config: dict[str, Any],
-) -> None:
-    """Test warning deprecated color_mode option flag is used."""
-    with patch(
-        "homeassistant.components.mqtt.light.schema_json.async_create_issue"
-    ) as mock_async_create_issue:
-        assert await mqtt_mock_entry()
-
-        config_payload = json_dumps(config[mqtt.DOMAIN][light.DOMAIN][0])
-        async_fire_mqtt_message(
-            hass,
-            "homeassistant/light/bla/config",
-            config_payload,
-        )
-        await hass.async_block_till_done()
-    assert "Deprecated flag `color_mode` used in MQTT JSON light config" in caplog.text
-    mock_async_create_issue.assert_not_called()
-
-
 @pytest.mark.parametrize(
     ("hass_config", "error"),
     [
@@ -400,82 +233,6 @@ async def test_fail_setup_if_color_modes_invalid(
     assert error in caplog.text
 
 
-@pytest.mark.parametrize(
-    ("hass_config", "kelvin", "color_temp_payload_value"),
-    [
-        (
-            {
-                mqtt.DOMAIN: {
-                    light.DOMAIN: {
-                        "schema": "json",
-                        "name": "test",
-                        "command_topic": "test_light/set",
-                        "state_topic": "test_light",
-                        "color_mode": True,
-                        "color_temp_kelvin": False,
-                        "supported_color_modes": "color_temp",
-                    }
-                }
-            },
-            5208,
-            192,
-        ),
-        (
-            {
-                mqtt.DOMAIN: {
-                    light.DOMAIN: {
-                        "schema": "json",
-                        "name": "test",
-                        "command_topic": "test_light/set",
-                        "state_topic": "test_light",
-                        "color_mode": True,
-                        "color_temp_kelvin": True,
-                        "supported_color_modes": "color_temp",
-                    }
-                }
-            },
-            5208,
-            5208,
-        ),
-    ],
-    ids=["mireds", "kelvin"],
-)
-async def test_single_color_mode(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-    kelvin: int,
-    color_temp_payload_value: int,
-) -> None:
-    """Test setup with single color_mode."""
-    await mqtt_mock_entry()
-    state = hass.states.get("light.test")
-    assert state.state == STATE_UNKNOWN
-
-    await common.async_turn_on(
-        hass, "light.test", brightness=50, color_temp_kelvin=kelvin
-    )
-
-    payload = {
-        "state": "ON",
-        "brightness": 50,
-        "color_mode": "color_temp",
-        "color_temp": color_temp_payload_value,
-    }
-    async_fire_mqtt_message(
-        hass,
-        "test_light",
-        json_dumps(payload),
-    )
-    color_modes = [light.ColorMode.COLOR_TEMP]
-    state = hass.states.get("light.test")
-    assert state.state == STATE_ON
-
-    assert state.attributes.get(light.ATTR_SUPPORTED_COLOR_MODES) == color_modes
-    assert state.attributes.get(light.ATTR_COLOR_TEMP_KELVIN) == 5208
-    assert state.attributes.get(light.ATTR_BRIGHTNESS) == 50
-    assert state.attributes.get(light.ATTR_COLOR_MODE) == color_modes[0]
-
-
 @pytest.mark.parametrize("hass_config", [COLOR_MODES_CONFIG])
 async def test_turn_on_with_unknown_color_mode_optimistic(
     hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
@@ -550,34 +307,6 @@ async def test_controlling_state_with_unknown_color_mode(
     assert state.attributes.get(light.ATTR_COLOR_MODE) == light.ColorMode.COLOR_TEMP
 
 
-@pytest.mark.parametrize(
-    "hass_config",
-    [
-        {
-            mqtt.DOMAIN: {
-                light.DOMAIN: {
-                    "schema": "json",
-                    "name": "test",
-                    "command_topic": "test_light_rgb/set",
-                    "rgb": True,
-                }
-            }
-        }
-    ],
-)
-async def test_legacy_rgb_light(
-    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
-) -> None:
-    """Test legacy RGB light flags expected features and color modes."""
-    await mqtt_mock_entry()
-
-    state = hass.states.get("light.test")
-    color_modes = [light.ColorMode.HS]
-    assert state.attributes.get(light.ATTR_SUPPORTED_COLOR_MODES) == color_modes
-    expected_features = light.SUPPORT_FLASH | light.SUPPORT_TRANSITION
-    assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == expected_features
-
-
 @pytest.mark.parametrize(
     "hass_config",
     [
@@ -642,30 +371,41 @@ async def test_no_color_brightness_color_temp_if_no_topics(
                     "name": "test",
                     "state_topic": "test_light_rgb",
                     "command_topic": "test_light_rgb/set",
-                    "brightness": True,
-                    "color_temp": True,
-                    "effect": True,
-                    "rgb": True,
-                    "xy": True,
-                    "hs": True,
-                    "qos": "0",
+                    "supported_color_modes": ["brightness"],
                 }
             }
-        }
+        },
+        {
+            mqtt.DOMAIN: {
+                light.DOMAIN: {
+                    "schema": "json",
+                    "name": "test",
+                    "state_topic": "test_light_rgb",
+                    "command_topic": "test_light_rgb/set",
+                    "brightness": True,
+                }
+            }
+        },
     ],
 )
-async def test_controlling_state_via_topic(
+async def test_brightness_only(
     hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
 ) -> None:
-    """Test the controlling of the state via topic."""
+    """Test brightness only light.
+
+    There are two possible configurations for brightness only light:
+    1) Set up "brightness" as supported color mode.
+    2) Set "brightness" flag to true.
+    """
     await mqtt_mock_entry()
 
     state = hass.states.get("light.test")
     assert state.state == STATE_UNKNOWN
-    color_modes = [light.ColorMode.COLOR_TEMP, light.ColorMode.HS]
-    assert state.attributes.get(light.ATTR_SUPPORTED_COLOR_MODES) == color_modes
+    assert state.attributes.get(light.ATTR_SUPPORTED_COLOR_MODES) == [
+        light.ColorMode.BRIGHTNESS
+    ]
     expected_features = (
-        light.SUPPORT_EFFECT | light.SUPPORT_FLASH | light.SUPPORT_TRANSITION
+        light.LightEntityFeature.FLASH | light.LightEntityFeature.TRANSITION
     )
     assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == expected_features
     assert state.attributes.get("rgb_color") is None
@@ -674,153 +414,82 @@ async def test_controlling_state_via_topic(
     assert state.attributes.get("effect") is None
     assert state.attributes.get("xy_color") is None
     assert state.attributes.get("hs_color") is None
-    assert not state.attributes.get(ATTR_ASSUMED_STATE)
 
-    # Turn on the light
-    async_fire_mqtt_message(
-        hass,
-        "test_light_rgb",
-        '{"state":"ON",'
-        '"color":{"r":255,"g":255,"b":255},'
-        '"brightness":255,'
-        '"color_temp":155,'
-        '"effect":"colorloop"}',
-    )
+    async_fire_mqtt_message(hass, "test_light_rgb", '{"state":"ON", "brightness": 50}')
 
     state = hass.states.get("light.test")
     assert state.state == STATE_ON
-    assert state.attributes.get("rgb_color") == (255, 255, 255)
-    assert state.attributes.get("brightness") == 255
-    assert state.attributes.get("color_temp_kelvin") is None  # rgb color has priority
-    assert state.attributes.get("effect") == "colorloop"
-    assert state.attributes.get("xy_color") == (0.323, 0.329)
-    assert state.attributes.get("hs_color") == (0.0, 0.0)
+    assert state.attributes.get("rgb_color") is None
+    assert state.attributes.get("brightness") == 50
+    assert state.attributes.get("color_temp_kelvin") is None
+    assert state.attributes.get("effect") is None
+    assert state.attributes.get("xy_color") is None
+    assert state.attributes.get("hs_color") is None
+
+    async_fire_mqtt_message(hass, "test_light_rgb", '{"state":"OFF"}')
+
+    state = hass.states.get("light.test")
+    assert state.state == STATE_OFF
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                light.DOMAIN: {
+                    "schema": "json",
+                    "name": "test",
+                    "state_topic": "test_light_rgb",
+                    "command_topic": "test_light_rgb/set",
+                    "supported_color_modes": ["color_temp"],
+                }
+            }
+        },
+    ],
+)
+async def test_color_temp_only(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test a light that only support color_temp as supported color mode."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get("light.test")
+    assert state.state == STATE_UNKNOWN
+    assert state.attributes.get(light.ATTR_SUPPORTED_COLOR_MODES) == [
+        light.ColorMode.COLOR_TEMP
+    ]
+    expected_features = (
+        light.LightEntityFeature.FLASH | light.LightEntityFeature.TRANSITION
+    )
+    assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == expected_features
+    assert state.attributes.get("rgb_color") is None
+    assert state.attributes.get("brightness") is None
+    assert state.attributes.get("color_temp_kelvin") is None
+    assert state.attributes.get("effect") is None
+    assert state.attributes.get("xy_color") is None
+    assert state.attributes.get("hs_color") is None
+
+    async_fire_mqtt_message(
+        hass,
+        "test_light_rgb",
+        '{"state":"ON", "color_mode": "color_temp", "color_temp": 250, "brightness": 50}',
+    )
+
+    state = hass.states.get("light.test")
+    assert state.state == STATE_ON
+    assert state.attributes.get("rgb_color") == (255, 206, 166)
+    assert state.attributes.get("brightness") == 50
+    assert state.attributes.get("color_temp_kelvin") == 4000
+    assert state.attributes.get("effect") is None
+    assert state.attributes.get("xy_color") == (0.42, 0.365)
+    assert state.attributes.get("hs_color") == (26.812, 34.87)
 
-    # Turn on the light
-    async_fire_mqtt_message(
-        hass,
-        "test_light_rgb",
-        '{"state":"ON",'
-        '"brightness":255,'
-        '"color":null,'
-        '"color_temp":155,'
-        '"effect":"colorloop"}',
-    )
-
-    state = hass.states.get("light.test")
-    assert state.state == STATE_ON
-    assert state.attributes.get("rgb_color") == (
-        255,
-        253,
-        249,
-    )  # temp converted to color
-    assert state.attributes.get("brightness") == 255
-    assert state.attributes.get("color_temp_kelvin") == 6451
-    assert state.attributes.get("effect") == "colorloop"
-    assert state.attributes.get("xy_color") == (0.328, 0.333)  # temp converted to color
-    assert state.attributes.get("hs_color") == (44.098, 2.43)  # temp converted to color
-
-    # Turn the light off
     async_fire_mqtt_message(hass, "test_light_rgb", '{"state":"OFF"}')
 
     state = hass.states.get("light.test")
     assert state.state == STATE_OFF
 
-    async_fire_mqtt_message(hass, "test_light_rgb", '{"state":"ON", "brightness":100}')
-
-    light_state = hass.states.get("light.test")
-
-    assert light_state.attributes["brightness"] == 100
-
-    async_fire_mqtt_message(
-        hass, "test_light_rgb", '{"state":"ON", "color":{"r":125,"g":125,"b":125}}'
-    )
-
-    light_state = hass.states.get("light.test")
-    assert light_state.attributes.get("rgb_color") == (255, 255, 255)
-
-    async_fire_mqtt_message(
-        hass, "test_light_rgb", '{"state":"ON", "color":{"x":0.135,"y":0.135}}'
-    )
-
-    light_state = hass.states.get("light.test")
-    assert light_state.attributes.get("xy_color") == (0.141, 0.141)
-
-    async_fire_mqtt_message(
-        hass, "test_light_rgb", '{"state":"ON", "color":{"h":180,"s":50}}'
-    )
-
-    light_state = hass.states.get("light.test")
-    assert light_state.attributes.get("hs_color") == (180.0, 50.0)
-
-    async_fire_mqtt_message(hass, "test_light_rgb", '{"state":"ON", "color":null}')
-
-    light_state = hass.states.get("light.test")
-    assert "hs_color" in light_state.attributes  # Color temp approximation
-
-    async_fire_mqtt_message(hass, "test_light_rgb", '{"state":"ON", "color_temp":155}')
-
-    light_state = hass.states.get("light.test")
-    assert light_state.attributes.get("color_temp_kelvin") == 6451  # 155 mired
-
-    async_fire_mqtt_message(hass, "test_light_rgb", '{"state":"ON", "color_temp":null}')
-
-    light_state = hass.states.get("light.test")
-    assert light_state.attributes.get("color_temp_kelvin") is None
-
-    async_fire_mqtt_message(
-        hass, "test_light_rgb", '{"state":"ON", "effect":"colorloop"}'
-    )
-
-    light_state = hass.states.get("light.test")
-    assert light_state.attributes.get("effect") == "colorloop"
-
-    async_fire_mqtt_message(
-        hass,
-        "test_light_rgb",
-        '{"state":"ON",'
-        '"color":{"r":255,"g":255,"b":255},'
-        '"brightness":128,'
-        '"color_temp":155,'
-        '"effect":"colorloop"}',
-    )
-    light_state = hass.states.get("light.test")
-    assert light_state.state == STATE_ON
-    assert light_state.attributes.get("brightness") == 128
-
-    async_fire_mqtt_message(
-        hass,
-        "test_light_rgb",
-        '{"state":"OFF","brightness":0}',
-    )
-    light_state = hass.states.get("light.test")
-    assert light_state.state == STATE_OFF
-    assert light_state.attributes.get("brightness") is None
-
-    # Simulate the lights color temp has been changed
-    # while it was switched off
-    async_fire_mqtt_message(
-        hass,
-        "test_light_rgb",
-        '{"state":"OFF","color_temp":201}',
-    )
-    light_state = hass.states.get("light.test")
-    assert light_state.state == STATE_OFF
-    # Color temp attribute is not exposed while the lamp is off
-    assert light_state.attributes.get("color_temp_kelvin") is None
-
-    # test previous zero brightness received was ignored and brightness is restored
-    # see if the latest color_temp value received is restored
-    async_fire_mqtt_message(hass, "test_light_rgb", '{"state":"ON"}')
-    light_state = hass.states.get("light.test")
-    assert light_state.attributes.get("brightness") == 128
-    assert light_state.attributes.get("color_temp_kelvin") == 4975  # 201 mired
-
-    # A `0` brightness value is ignored when a light is turned on
-    async_fire_mqtt_message(hass, "test_light_rgb", '{"state":"ON","brightness":0}')
-    light_state = hass.states.get("light.test")
-    assert light_state.attributes.get("brightness") == 128
-
 
 @pytest.mark.parametrize(
     "hass_config",
@@ -832,13 +501,9 @@ async def test_controlling_state_via_topic(
                     "name": "test",
                     "state_topic": "test_light_rgb",
                     "command_topic": "test_light_rgb/set",
-                    "brightness": True,
-                    "color_temp": True,
                     "color_temp_kelvin": True,
                     "effect": True,
-                    "rgb": True,
-                    "xy": True,
-                    "hs": True,
+                    "supported_color_modes": ["color_temp", "hs"],
                     "qos": "0",
                 }
             }
@@ -856,9 +521,11 @@ async def test_controlling_state_color_temp_kelvin(
     color_modes = [light.ColorMode.COLOR_TEMP, light.ColorMode.HS]
     assert state.attributes.get(light.ATTR_SUPPORTED_COLOR_MODES) == color_modes
     expected_features = (
-        light.SUPPORT_EFFECT | light.SUPPORT_FLASH | light.SUPPORT_TRANSITION
+        light.LightEntityFeature.EFFECT
+        | light.LightEntityFeature.FLASH
+        | light.LightEntityFeature.TRANSITION
     )
-    assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == expected_features
+    assert state.attributes.get(ATTR_SUPPORTED_FEATURES) is expected_features
     assert state.attributes.get("rgb_color") is None
     assert state.attributes.get("brightness") is None
     assert state.attributes.get("color_temp_kelvin") is None
@@ -872,7 +539,8 @@ async def test_controlling_state_color_temp_kelvin(
         hass,
         "test_light_rgb",
         '{"state":"ON",'
-        '"color":{"r":255,"g":255,"b":255},'
+        '"color":{"h": 44.098, "s": 2.43},'
+        '"color_mode": "hs",'
         '"brightness":255,'
         '"color_temp":155,'
         '"effect":"colorloop"}',
@@ -880,12 +548,12 @@ async def test_controlling_state_color_temp_kelvin(
 
     state = hass.states.get("light.test")
     assert state.state == STATE_ON
-    assert state.attributes.get("rgb_color") == (255, 255, 255)
+    assert state.attributes.get("rgb_color") == (255, 253, 249)
     assert state.attributes.get("brightness") == 255
     assert state.attributes.get("color_temp_kelvin") is None  # rgb color has priority
     assert state.attributes.get("effect") == "colorloop"
-    assert state.attributes.get("xy_color") == (0.323, 0.329)
-    assert state.attributes.get("hs_color") == (0.0, 0.0)
+    assert state.attributes.get("xy_color") == (0.328, 0.333)
+    assert state.attributes.get("hs_color") == (44.098, 2.43)
 
     # Turn on the light
     async_fire_mqtt_message(
@@ -894,6 +562,7 @@ async def test_controlling_state_color_temp_kelvin(
         '{"state":"ON",'
         '"brightness":255,'
         '"color":null,'
+        '"color_mode":"color_temp",'
         '"color_temp":6451,'  # Kelvin
         '"effect":"colorloop"}',
     )
@@ -920,7 +589,7 @@ async def test_controlling_state_color_temp_kelvin(
         )
     ],
 )
-async def test_controlling_state_via_topic2(
+async def test_controlling_state_via_topic(
     hass: HomeAssistant,
     mqtt_mock_entry: MqttMockHAClientGenerator,
     caplog: pytest.LogCaptureFixture,
@@ -981,6 +650,11 @@ async def test_controlling_state_via_topic2(
     state = hass.states.get("light.test")
     assert state.attributes["brightness"] == 100
 
+    # Zero brightness value is ignored
+    async_fire_mqtt_message(hass, "test_light_rgb", '{"state":"ON", "brightness":0}')
+    state = hass.states.get("light.test")
+    assert state.attributes["brightness"] == 100
+
     # RGB color
     async_fire_mqtt_message(
         hass,
@@ -1083,242 +757,6 @@ async def test_controlling_state_via_topic2(
         {
             mqtt.DOMAIN: {
                 light.DOMAIN: {
-                    "schema": "json",
-                    "name": "test",
-                    "command_topic": "test_light_rgb/set",
-                    "state_topic": "test_light_rgb/set",
-                    "rgb": True,
-                    "color_temp": True,
-                    "brightness": True,
-                }
-            }
-        }
-    ],
-)
-async def test_controlling_the_state_with_legacy_color_handling(
-    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
-) -> None:
-    """Test state updates for lights with a legacy color handling."""
-    supported_color_modes = ["color_temp", "hs"]
-    await mqtt_mock_entry()
-
-    state = hass.states.get("light.test")
-    assert state.state == STATE_UNKNOWN
-    expected_features = light.SUPPORT_FLASH | light.SUPPORT_TRANSITION
-    assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == expected_features
-    assert state.attributes.get("brightness") is None
-    assert state.attributes.get("color_mode") is None
-    assert state.attributes.get("color_temp_kelvin") is None
-    assert state.attributes.get("effect") is None
-    assert state.attributes.get("hs_color") is None
-    assert state.attributes.get("rgb_color") is None
-    assert state.attributes.get("rgbw_color") is None
-    assert state.attributes.get("rgbww_color") is None
-    assert state.attributes.get("supported_color_modes") == supported_color_modes
-    assert state.attributes.get("xy_color") is None
-    assert not state.attributes.get(ATTR_ASSUMED_STATE)
-
-    for _ in range(2):
-        # Returned state after the light was turned on
-        # Receiving legacy color mode: rgb.
-        async_fire_mqtt_message(
-            hass,
-            "test_light_rgb/set",
-            '{ "state": "ON", "brightness": 255, "level": 100, "hue": 16,'
-            '"saturation": 100, "color": { "r": 255, "g": 67, "b": 0 }, '
-            '"bulb_mode": "color", "color_mode": "rgb" }',
-        )
-
-        state = hass.states.get("light.test")
-        assert state.state == STATE_ON
-        assert state.attributes.get("brightness") == 255
-        assert state.attributes.get("color_mode") == "hs"
-        assert state.attributes.get("color_temp_kelvin") is None
-        assert state.attributes.get("effect") is None
-        assert state.attributes.get("hs_color") == (15.765, 100.0)
-        assert state.attributes.get("rgb_color") == (255, 67, 0)
-        assert state.attributes.get("rgbw_color") is None
-        assert state.attributes.get("rgbww_color") is None
-        assert state.attributes.get("xy_color") == (0.674, 0.322)
-
-        # Returned state after the lights color mode was changed
-        # Receiving legacy color mode: color_temp
-        async_fire_mqtt_message(
-            hass,
-            "test_light_rgb/set",
-            '{ "state": "ON", "brightness": 255, "level": 100, '
-            '"kelvin": 92, "color_temp": 353, "bulb_mode": "white", '
-            '"color_mode": "color_temp" }',
-        )
-
-        state = hass.states.get("light.test")
-        assert state.state == STATE_ON
-        assert state.attributes.get("brightness") == 255
-        assert state.attributes.get("color_mode") == "color_temp"
-        assert state.attributes.get("color_temp_kelvin") == 2832
-        assert state.attributes.get("effect") is None
-        assert state.attributes.get("hs_color") == (28.125, 61.661)
-        assert state.attributes.get("rgb_color") == (255, 171, 98)
-        assert state.attributes.get("rgbw_color") is None
-        assert state.attributes.get("rgbww_color") is None
-        assert state.attributes.get("xy_color") == (0.512, 0.385)
-
-
-@pytest.mark.parametrize(
-    "hass_config",
-    [
-        {
-            mqtt.DOMAIN: {
-                light.DOMAIN: {
-                    "schema": "json",
-                    "name": "test",
-                    "command_topic": "test_light_rgb/set",
-                    "brightness": True,
-                    "color_temp": True,
-                    "effect": True,
-                    "hs": True,
-                    "rgb": True,
-                    "xy": True,
-                    "qos": 2,
-                }
-            }
-        }
-    ],
-)
-async def test_sending_mqtt_commands_and_optimistic(
-    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
-) -> None:
-    """Test the sending of command in optimistic mode."""
-    fake_state = State(
-        "light.test",
-        "on",
-        {
-            "brightness": 95,
-            "hs_color": [100, 100],
-            "effect": "random",
-            "color_temp_kelvin": 10000,
-        },
-    )
-    mock_restore_cache(hass, (fake_state,))
-
-    mqtt_mock = await mqtt_mock_entry()
-
-    state = hass.states.get("light.test")
-    assert state.state == STATE_ON
-    assert state.attributes.get("brightness") == 95
-    assert state.attributes.get("hs_color") == (100, 100)
-    assert state.attributes.get("effect") == "random"
-    assert state.attributes.get("color_temp_kelvin") is None  # hs_color has priority
-    color_modes = [light.ColorMode.COLOR_TEMP, light.ColorMode.HS]
-    assert state.attributes.get(light.ATTR_SUPPORTED_COLOR_MODES) == color_modes
-    expected_features = (
-        light.SUPPORT_EFFECT | light.SUPPORT_FLASH | light.SUPPORT_TRANSITION
-    )
-    assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == expected_features
-    assert state.attributes.get(ATTR_ASSUMED_STATE)
-
-    await common.async_turn_on(hass, "light.test")
-
-    mqtt_mock.async_publish.assert_called_once_with(
-        "test_light_rgb/set", '{"state":"ON"}', 2, False
-    )
-    mqtt_mock.async_publish.reset_mock()
-    state = hass.states.get("light.test")
-    assert state.state == STATE_ON
-
-    await common.async_turn_on(hass, "light.test", color_temp_kelvin=11111)
-
-    mqtt_mock.async_publish.assert_called_once_with(
-        "test_light_rgb/set",
-        JsonValidator('{"state": "ON", "color_temp": 90}'),
-        2,
-        False,
-    )
-    mqtt_mock.async_publish.reset_mock()
-    state = hass.states.get("light.test")
-    assert state.state == STATE_ON
-    assert state.attributes.get("color_mode") == light.ColorMode.COLOR_TEMP
-    assert state.attributes.get("color_temp_kelvin") == 11111
-
-    await common.async_turn_off(hass, "light.test")
-
-    mqtt_mock.async_publish.assert_called_once_with(
-        "test_light_rgb/set", '{"state":"OFF"}', 2, False
-    )
-    mqtt_mock.async_publish.reset_mock()
-    state = hass.states.get("light.test")
-    assert state.state == STATE_OFF
-
-    mqtt_mock.reset_mock()
-    await common.async_turn_on(
-        hass, "light.test", brightness=50, xy_color=(0.123, 0.123)
-    )
-    mqtt_mock.async_publish.assert_called_once_with(
-        "test_light_rgb/set",
-        JsonValidator(
-            '{"state": "ON", "color": {"r": 0, "g": 124, "b": 255,'
-            ' "x": 0.14, "y": 0.133, "h": 210.824, "s": 100.0},'
-            ' "brightness": 50}'
-        ),
-        2,
-        False,
-    )
-    mqtt_mock.async_publish.reset_mock()
-    state = hass.states.get("light.test")
-    assert state.attributes.get("color_mode") == light.ColorMode.HS
-    assert state.attributes["brightness"] == 50
-    assert state.attributes["hs_color"] == (210.824, 100.0)
-    assert state.attributes["rgb_color"] == (0, 124, 255)
-    assert state.attributes["xy_color"] == (0.14, 0.133)
-
-    await common.async_turn_on(hass, "light.test", brightness=50, hs_color=(359, 78))
-    mqtt_mock.async_publish.assert_called_once_with(
-        "test_light_rgb/set",
-        JsonValidator(
-            '{"state": "ON", "color": {"r": 255, "g": 56, "b": 59,'
-            ' "x": 0.654, "y": 0.301, "h": 359.0, "s": 78.0},'
-            ' "brightness": 50}'
-        ),
-        2,
-        False,
-    )
-    mqtt_mock.async_publish.reset_mock()
-    state = hass.states.get("light.test")
-    assert state.state == STATE_ON
-    assert state.attributes.get("color_mode") == light.ColorMode.HS
-    assert state.attributes["brightness"] == 50
-    assert state.attributes["hs_color"] == (359.0, 78.0)
-    assert state.attributes["rgb_color"] == (255, 56, 59)
-    assert state.attributes["xy_color"] == (0.654, 0.301)
-
-    await common.async_turn_on(hass, "light.test", rgb_color=(255, 128, 0))
-    mqtt_mock.async_publish.assert_called_once_with(
-        "test_light_rgb/set",
-        JsonValidator(
-            '{"state": "ON", "color": {"r": 255, "g": 128, "b": 0,'
-            ' "x": 0.611, "y": 0.375, "h": 30.118, "s": 100.0}}'
-        ),
-        2,
-        False,
-    )
-    mqtt_mock.async_publish.reset_mock()
-    state = hass.states.get("light.test")
-    assert state.state == STATE_ON
-    assert state.attributes.get("color_mode") == light.ColorMode.HS
-    assert state.attributes["brightness"] == 50
-    assert state.attributes["hs_color"] == (30.118, 100)
-    assert state.attributes["rgb_color"] == (255, 128, 0)
-    assert state.attributes["xy_color"] == (0.611, 0.375)
-
-
-@pytest.mark.parametrize(
-    "hass_config",
-    [
-        {
-            mqtt.DOMAIN: {
-                light.DOMAIN: {
-                    "brightness": True,
-                    "color_mode": True,
                     "command_topic": "test_light_rgb/set",
                     "effect": True,
                     "name": "test",
@@ -1338,7 +776,7 @@ async def test_sending_mqtt_commands_and_optimistic(
         }
     ],
 )
-async def test_sending_mqtt_commands_and_optimistic2(
+async def test_sending_mqtt_commands_and_optimistic(
     hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
 ) -> None:
     """Test the sending of command in optimistic mode for a light supporting color mode."""
@@ -1560,8 +998,7 @@ async def test_sending_mqtt_commands_and_optimistic2(
                     "schema": "json",
                     "name": "test",
                     "command_topic": "test_light_rgb/set",
-                    "brightness": True,
-                    "hs": True,
+                    "supported_color_modes": ["hs"],
                 }
             }
         }
@@ -1623,7 +1060,7 @@ async def test_sending_hs_color(
                     "schema": "json",
                     "name": "test",
                     "command_topic": "test_light_rgb/set",
-                    "rgb": True,
+                    "supported_color_modes": ["rgb"],
                 }
             }
         }
@@ -1678,7 +1115,6 @@ async def test_sending_rgb_color_no_brightness(
         {
             mqtt.DOMAIN: {
                 light.DOMAIN: {
-                    "color_mode": True,
                     "command_topic": "test_light_rgb/set",
                     "name": "test",
                     "schema": "json",
@@ -1761,8 +1197,8 @@ async def test_sending_rgb_color_no_brightness2(
                     "schema": "json",
                     "name": "test",
                     "command_topic": "test_light_rgb/set",
+                    "supported_color_modes": ["rgb"],
                     "brightness": True,
-                    "rgb": True,
                 }
             }
         }
@@ -1829,9 +1265,9 @@ async def test_sending_rgb_color_with_brightness(
                     "schema": "json",
                     "name": "test",
                     "command_topic": "test_light_rgb/set",
+                    "supported_color_modes": ["rgb"],
                     "brightness": True,
                     "brightness_scale": 100,
-                    "rgb": True,
                 }
             }
         }
@@ -1899,9 +1335,7 @@ async def test_sending_rgb_color_with_scaled_brightness(
                     "schema": "json",
                     "name": "test",
                     "command_topic": "test_light_rgb/set",
-                    "brightness": True,
                     "brightness_scale": 100,
-                    "color_mode": True,
                     "supported_color_modes": ["hs", "white"],
                     "white_scale": 50,
                 }
@@ -1946,8 +1380,7 @@ async def test_sending_scaled_white(
                     "schema": "json",
                     "name": "test",
                     "command_topic": "test_light_rgb/set",
-                    "brightness": True,
-                    "xy": True,
+                    "supported_color_modes": ["xy"],
                 }
             }
         }
@@ -1973,7 +1406,7 @@ async def test_sending_xy_color(
             call(
                 "test_light_rgb/set",
                 JsonValidator(
-                    '{"state": "ON", "color": {"x": 0.14, "y": 0.133},'
+                    '{"state": "ON", "color": {"x": 0.123, "y": 0.123},'
                     ' "brightness": 50}'
                 ),
                 0,
@@ -2190,7 +1623,7 @@ async def test_transition(
                     "name": "test",
                     "state_topic": "test_light_bright_scale",
                     "command_topic": "test_light_bright_scale/set",
-                    "brightness": True,
+                    "supported_color_modes": ["brightness"],
                     "brightness_scale": 99,
                 }
             }
@@ -2255,7 +1688,6 @@ async def test_brightness_scale(
                     "command_topic": "test_light_bright_scale/set",
                     "brightness": True,
                     "brightness_scale": 99,
-                    "color_mode": True,
                     "supported_color_modes": ["hs", "white"],
                     "white_scale": 50,
                 }
@@ -2315,8 +1747,7 @@ async def test_white_scale(
                     "state_topic": "test_light_rgb",
                     "command_topic": "test_light_rgb/set",
                     "brightness": True,
-                    "color_temp": True,
-                    "rgb": True,
+                    "supported_color_modes": ["hs", "color_temp"],
                     "qos": "0",
                 }
             }
@@ -2349,62 +1780,64 @@ async def test_invalid_values(
         '{"state":"ON",'
         '"color":{"r":255,"g":255,"b":255},'
         '"brightness": 255,'
+        '"color_mode": "color_temp",'
         '"color_temp": 100,'
         '"effect": "rainbow"}',
     )
 
     state = hass.states.get("light.test")
     assert state.state == STATE_ON
-    assert state.attributes.get("rgb_color") == (255, 255, 255)
+    # Color converttrd from color_temp to rgb
+    assert state.attributes.get("rgb_color") == (202, 218, 255)
     assert state.attributes.get("brightness") == 255
-    assert state.attributes.get("color_temp_kelvin") is None
+    assert state.attributes.get("color_temp_kelvin") == 10000
     # Empty color value
     async_fire_mqtt_message(
         hass,
         "test_light_rgb",
-        '{"state":"ON", "color":{}}',
+        '{"state":"ON", "color":{}, "color_mode": "rgb"}',
     )
 
     # Color should not have changed
     state = hass.states.get("light.test")
     assert state.state == STATE_ON
-    assert state.attributes.get("rgb_color") == (255, 255, 255)
+    assert state.attributes.get("rgb_color") == (202, 218, 255)
 
     # Bad HS color values
     async_fire_mqtt_message(
         hass,
         "test_light_rgb",
-        '{"state":"ON", "color":{"h":"bad","s":"val"}}',
+        '{"state":"ON", "color":{"h":"bad","s":"val"}, "color_mode": "hs"}',
     )
 
     # Color should not have changed
     state = hass.states.get("light.test")
     assert state.state == STATE_ON
-    assert state.attributes.get("rgb_color") == (255, 255, 255)
+    assert state.attributes.get("rgb_color") == (202, 218, 255)
 
     # Bad RGB color values
     async_fire_mqtt_message(
         hass,
         "test_light_rgb",
-        '{"state":"ON", "color":{"r":"bad","g":"val","b":"test"}}',
+        '{"state":"ON", "color":{"r":"bad","g":"val","b":"test"}, "color_mode": "rgb"}',
     )
 
     # Color should not have changed
     state = hass.states.get("light.test")
     assert state.state == STATE_ON
-    assert state.attributes.get("rgb_color") == (255, 255, 255)
+    assert state.attributes.get("rgb_color") == (202, 218, 255)
 
     # Bad XY color values
     async_fire_mqtt_message(
         hass,
         "test_light_rgb",
-        '{"state":"ON", "color":{"x":"bad","y":"val"}}',
+        '{"state":"ON", "color":{"x":"bad","y":"val"}, "color_mode": "xy"}',
     )
 
     # Color should not have changed
     state = hass.states.get("light.test")
     assert state.state == STATE_ON
-    assert state.attributes.get("rgb_color") == (255, 255, 255)
+    assert state.attributes.get("rgb_color") == (202, 218, 255)
 
     # Bad brightness values
     async_fire_mqtt_message(
@@ -2418,7 +1851,9 @@ async def test_invalid_values(
 
     # Unset color and set a valid color temperature
     async_fire_mqtt_message(
-        hass, "test_light_rgb", '{"state":"ON", "color": null, "color_temp": 100}'
+        hass,
+        "test_light_rgb",
+        '{"state":"ON", "color": null, "color_temp": 100, "color_mode": "color_temp"}',
     )
     state = hass.states.get("light.test")
     assert state.state == STATE_ON
@@ -2426,11 +1861,14 @@ async def test_invalid_values(
 
     # Bad color temperature
     async_fire_mqtt_message(
-        hass, "test_light_rgb", '{"state":"ON", "color_temp": "badValue"}'
+        hass,
+        "test_light_rgb",
+        '{"state":"ON", "color_temp": "badValue", "color_mode": "color_temp"}',
     )
     assert (
-        "Invalid color temp value 'badValue' received for entity light.test"
-        in caplog.text
+        "Invalid or incomplete color value '{'state': 'ON', 'color_temp': "
+        "'badValue', 'color_mode': 'color_temp'}' "
+        "received for entity light.test" in caplog.text
     )
 
     # Color temperature should not have changed
@@ -2927,7 +2365,6 @@ async def test_setup_manual_entity_from_yaml(
             DEFAULT_CONFIG,
             (
                 {
-                    "color_mode": True,
                     "effect": True,
                     "supported_color_modes": [
                         "color_temp",
diff --git a/tests/components/mqtt/test_light_template.py b/tests/components/mqtt/test_light_template.py
index 568d86f8bd9..b3a1c11c2b6 100644
--- a/tests/components/mqtt/test_light_template.py
+++ b/tests/components/mqtt/test_light_template.py
@@ -45,7 +45,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, State
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
diff --git a/tests/components/mqtt/test_lock.py b/tests/components/mqtt/test_lock.py
index 034f9b5ff6e..4aa6ecd03ef 100644
--- a/tests/components/mqtt/test_lock.py
+++ b/tests/components/mqtt/test_lock.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
diff --git a/tests/components/mqtt/test_mixins.py b/tests/components/mqtt/test_mixins.py
index d65f1a4d661..fa30283962b 100644
--- a/tests/components/mqtt/test_mixins.py
+++ b/tests/components/mqtt/test_mixins.py
@@ -1,18 +1,31 @@
 """The tests for shared code of the MQTT platform."""
 
-from unittest.mock import patch
+from typing import Any
+from unittest.mock import call, patch
 
 import pytest
 
 from homeassistant.components import mqtt, sensor
 from homeassistant.components.mqtt.sensor import DEFAULT_NAME as DEFAULT_SENSOR_NAME
+from homeassistant.config_entries import ConfigSubentryData
 from homeassistant.const import (
     ATTR_FRIENDLY_NAME,
     EVENT_HOMEASSISTANT_STARTED,
     EVENT_STATE_CHANGED,
 )
 from homeassistant.core import CoreState, HomeAssistant, callback
-from homeassistant.helpers import device_registry as dr, issue_registry as ir
+from homeassistant.helpers import (
+    device_registry as dr,
+    entity_registry as er,
+    issue_registry as ir,
+)
+from homeassistant.util import slugify
+
+from .common import (
+    MOCK_NOTIFY_SUBENTRY_DATA_SINGLE,
+    MOCK_SUBENTRY_DATA_BAD_COMPONENT_SCHEMA,
+    MOCK_SUBENTRY_DATA_SET_MIX,
+)
 
 from tests.common import MockConfigEntry, async_capture_events, async_fire_mqtt_message
 from tests.typing import MqttMockHAClientGenerator
@@ -453,3 +466,124 @@ async def test_value_template_fails(
         "TypeError: unsupported operand type(s) for *: 'NoneType' and 'int' rendering template"
         in caplog.text
     )
+
+
+@pytest.mark.parametrize(
+    "mqtt_config_subentries_data",
+    [
+        (
+            ConfigSubentryData(
+                data=MOCK_SUBENTRY_DATA_SET_MIX,
+                subentry_type="device",
+                title="Mock subentry",
+            ),
+        )
+    ],
+)
+async def test_loading_subentries(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    mqtt_config_subentries_data: tuple[dict[str, Any]],
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test loading subentries."""
+    await mqtt_mock_entry()
+    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
+    subentry_id = next(iter(entry.subentries))
+    # Each subentry has one device
+    device = device_registry.async_get_device({("mqtt", subentry_id)})
+    assert device is not None
+    for object_id, component in mqtt_config_subentries_data[0]["data"][
+        "components"
+    ].items():
+        platform = component["platform"]
+        entity_id = f"{platform}.{slugify(device.name)}_{slugify(component['name'])}"
+        entity_entry_entity_id = entity_registry.async_get_entity_id(
+            platform, mqtt.DOMAIN, f"{subentry_id}_{object_id}"
+        )
+        assert entity_entry_entity_id == entity_id
+        state = hass.states.get(entity_id)
+        assert state is not None
+        assert (
+            state.attributes.get("entity_picture") == f"https://example.com/{object_id}"
+        )
+        # Availability was configured, so entities are unavailable
+        assert state.state == "unavailable"
+
+    # Make entities available
+    async_fire_mqtt_message(hass, "test/availability", '{"availability": "online"}')
+    for component in mqtt_config_subentries_data[0]["data"]["components"].values():
+        platform = component["platform"]
+        entity_id = f"{platform}.{slugify(device.name)}_{slugify(component['name'])}"
+        state = hass.states.get(entity_id)
+        assert state is not None
+        assert state.state == "unknown"
+
+
+@pytest.mark.parametrize(
+    "mqtt_config_subentries_data",
+    [
+        (
+            ConfigSubentryData(
+                data=MOCK_SUBENTRY_DATA_BAD_COMPONENT_SCHEMA,
+                subentry_type="device",
+                title="Mock subentry",
+            ),
+        )
+    ],
+)
+async def test_loading_subentry_with_bad_component_schema(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    mqtt_config_subentries_data: tuple[dict[str, Any]],
+    device_registry: dr.DeviceRegistry,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test loading subentries."""
+    await mqtt_mock_entry()
+    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
+    subentry_id = next(iter(entry.subentries))
+    # Each subentry has one device
+    device = device_registry.async_get_device({("mqtt", subentry_id)})
+    assert device is None
+    assert (
+        "Schema violation occurred when trying to set up entity from subentry"
+        in caplog.text
+    )
+
+
+@pytest.mark.parametrize(
+    "mqtt_config_subentries_data",
+    [
+        (
+            ConfigSubentryData(
+                data=MOCK_NOTIFY_SUBENTRY_DATA_SINGLE,
+                subentry_type="device",
+                title="Mock subentry",
+            ),
+        )
+    ],
+)
+async def test_qos_on_mqt_device_from_subentry(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    mqtt_config_subentries_data: tuple[dict[str, Any]],
+    device_registry: dr.DeviceRegistry,
+) -> None:
+    """Test QoS is set correctly on entities from MQTT device."""
+    mqtt_mock = await mqtt_mock_entry()
+    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
+    subentry_id = next(iter(entry.subentries))
+    # Each subentry has one device
+    device = device_registry.async_get_device({("mqtt", subentry_id)})
+    assert device is not None
+    assert hass.states.get("notify.milk_notifier_milkman_alert") is not None
+    await hass.services.async_call(
+        "notify",
+        "send_message",
+        {"entity_id": "notify.milk_notifier_milkman_alert", "message": "Test message"},
+    )
+    await hass.async_block_till_done()
+    assert len(mqtt_mock.async_publish.mock_calls) == 1
+    mqtt_mock.async_publish.mock_calls[0] = call("test-topic", "Test message", 1, False)
diff --git a/tests/components/mqtt/test_notify.py b/tests/components/mqtt/test_notify.py
index 4837ee214c4..56da809d1b6 100644
--- a/tests/components/mqtt/test_notify.py
+++ b/tests/components/mqtt/test_notify.py
@@ -11,7 +11,7 @@ from homeassistant.components.notify import ATTR_MESSAGE
 from homeassistant.const import ATTR_ENTITY_ID, ATTR_FRIENDLY_NAME, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 
-from .test_common import (
+from .common import (
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
     help_test_custom_availability_payload,
diff --git a/tests/components/mqtt/test_number.py b/tests/components/mqtt/test_number.py
index 7bdd39e81a7..f391236aca4 100644
--- a/tests/components/mqtt/test_number.py
+++ b/tests/components/mqtt/test_number.py
@@ -31,7 +31,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, State
 from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
diff --git a/tests/components/mqtt/test_scene.py b/tests/components/mqtt/test_scene.py
index d78dbe5c003..1650fe74601 100644
--- a/tests/components/mqtt/test_scene.py
+++ b/tests/components/mqtt/test_scene.py
@@ -10,7 +10,7 @@ from homeassistant.components import mqtt, scene
 from homeassistant.const import ATTR_ENTITY_ID, SERVICE_TURN_ON, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant, State
 
-from .test_common import (
+from .common import (
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
     help_test_custom_availability_payload,
diff --git a/tests/components/mqtt/test_select.py b/tests/components/mqtt/test_select.py
index 8d79a3ce609..a880368fa51 100644
--- a/tests/components/mqtt/test_select.py
+++ b/tests/components/mqtt/test_select.py
@@ -21,7 +21,7 @@ from homeassistant.const import ATTR_ASSUMED_STATE, ATTR_ENTITY_ID, STATE_UNKNOW
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers.typing import ConfigType
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
diff --git a/tests/components/mqtt/test_sensor.py b/tests/components/mqtt/test_sensor.py
index 7f418864872..74dc94de21e 100644
--- a/tests/components/mqtt/test_sensor.py
+++ b/tests/components/mqtt/test_sensor.py
@@ -21,11 +21,11 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import Event, HomeAssistant, State, callback
-from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers import device_registry as dr, issue_registry as ir
 from homeassistant.helpers.typing import ConfigType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
@@ -71,6 +71,7 @@ from .test_common import (
 
 from tests.common import (
     MockConfigEntry,
+    async_capture_events,
     async_fire_mqtt_message,
     async_fire_time_changed,
     mock_restore_cache_with_extra_data,
@@ -870,6 +871,71 @@ async def test_invalid_device_class(
     assert "expected SensorDeviceClass or one of" in caplog.text
 
 
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                sensor.DOMAIN: {
+                    "name": "test",
+                    "state_topic": "test-topic",
+                    "device_class": "energy",
+                    "unit_of_measurement": "ppm",
+                }
+            }
+        }
+    ],
+)
+async def test_invalid_unit_of_measurement(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test device_class with invalid unit of measurement."""
+    events = async_capture_events(hass, ir.EVENT_REPAIRS_ISSUE_REGISTRY_UPDATED)
+    assert await mqtt_mock_entry()
+    assert (
+        "The unit of measurement `ppm` is not valid together with device class `energy`"
+        in caplog.text
+    )
+    # A repair issue was logged
+    assert len(events) == 1
+    assert events[0].data["issue_id"] == "sensor.test"
+    # Assert the sensor works
+    async_fire_mqtt_message(hass, "test-topic", "100")
+    await hass.async_block_till_done()
+    state = hass.states.get("sensor.test")
+    assert state is not None
+    assert state.state == "100"
+
+    caplog.clear()
+
+    discovery_payload = {
+        "name": "bla",
+        "state_topic": "test-topic2",
+        "device_class": "temperature",
+        "unit_of_measurement": "C",
+    }
+    # Now discover an other invalid sensor
+    async_fire_mqtt_message(
+        hass, "homeassistant/sensor/bla/config", json.dumps(discovery_payload)
+    )
+    await hass.async_block_till_done()
+    assert (
+        "The unit of measurement `C` is not valid together with device class `temperature`"
+        in caplog.text
+    )
+    # Assert the sensor works
+    async_fire_mqtt_message(hass, "test-topic2", "21")
+    await hass.async_block_till_done()
+    state = hass.states.get("sensor.bla")
+    assert state is not None
+    assert state.state == "21"
+
+    # No new issue was registered for the discovered entity
+    assert len(events) == 1
+
+
 @pytest.mark.parametrize(
     "hass_config",
     [
@@ -1409,6 +1475,7 @@ async def test_reloadable(
     await help_test_reloadable(hass, mqtt_client_mock, domain, config)
 
 
+@pytest.mark.usefixtures("mock_temp_dir")
 @pytest.mark.parametrize(
     "hass_config",
     [
diff --git a/tests/components/mqtt/test_siren.py b/tests/components/mqtt/test_siren.py
index 58a5cb735f9..5d82708e242 100644
--- a/tests/components/mqtt/test_siren.py
+++ b/tests/components/mqtt/test_siren.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
diff --git a/tests/components/mqtt/test_switch.py b/tests/components/mqtt/test_switch.py
index dceeff07377..d834595afe0 100644
--- a/tests/components/mqtt/test_switch.py
+++ b/tests/components/mqtt/test_switch.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, State
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
diff --git a/tests/components/mqtt/test_tag.py b/tests/components/mqtt/test_tag.py
index 41c417fe3e9..95326382dcc 100644
--- a/tests/components/mqtt/test_tag.py
+++ b/tests/components/mqtt/test_tag.py
@@ -13,7 +13,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 from homeassistant.setup import async_setup_component
 
-from .test_common import help_test_unload_config_entry
+from .common import help_test_unload_config_entry
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/mqtt/test_text.py b/tests/components/mqtt/test_text.py
index 96924030279..050b2b59590 100644
--- a/tests/components/mqtt/test_text.py
+++ b/tests/components/mqtt/test_text.py
@@ -11,7 +11,7 @@ from homeassistant.components import mqtt, text
 from homeassistant.const import ATTR_ASSUMED_STATE, ATTR_ENTITY_ID, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
diff --git a/tests/components/mqtt/test_update.py b/tests/components/mqtt/test_update.py
index 4ca10cbe8b2..d70d7dd792b 100644
--- a/tests/components/mqtt/test_update.py
+++ b/tests/components/mqtt/test_update.py
@@ -10,7 +10,7 @@ from homeassistant.components.update import DOMAIN as UPDATE_DOMAIN, SERVICE_INS
 from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
diff --git a/tests/components/mqtt/test_util.py b/tests/components/mqtt/test_util.py
index dd72902056d..f751096bca2 100644
--- a/tests/components/mqtt/test_util.py
+++ b/tests/components/mqtt/test_util.py
@@ -4,7 +4,6 @@ import asyncio
 from collections.abc import Callable
 from datetime import timedelta
 from pathlib import Path
-from random import getrandbits
 import shutil
 import tempfile
 from unittest.mock import MagicMock, patch
@@ -53,7 +52,7 @@ async def test_canceling_debouncer_on_shutdown(
         assert not mock_debouncer.is_set()
         mqtt_client_mock.subscribe.assert_not_called()
 
-        # Note thet the broker connection will not be disconnected gracefully
+        # Note that the broker connection will not be disconnected gracefully
         await hass.async_block_till_done()
         async_fire_time_changed(hass, utcnow() + timedelta(seconds=5))
         await asyncio.sleep(0)
@@ -199,7 +198,6 @@ async def test_reading_non_exitisting_certificate_file() -> None:
     )
 
 
-@pytest.mark.parametrize("temp_dir_prefix", "unknown")
 async def test_return_default_get_file_path(
     hass: HomeAssistant, mock_temp_dir: str
 ) -> None:
@@ -211,12 +209,8 @@ async def test_return_default_get_file_path(
             and mqtt.util.get_file_path("some_option", "mydefault") == "mydefault"
         )
 
-    with patch(
-        "homeassistant.components.mqtt.util.TEMP_DIR_NAME",
-        f"home-assistant-mqtt-other-{getrandbits(10):03x}",
-    ) as temp_dir_name:
-        tempdir = Path(tempfile.gettempdir()) / temp_dir_name
-        assert await hass.async_add_executor_job(_get_file_path, tempdir)
+    temp_dir = Path(tempfile.gettempdir()) / mock_temp_dir
+    assert await hass.async_add_executor_job(_get_file_path, temp_dir)
 
 
 async def test_waiting_for_client_not_loaded(
diff --git a/tests/components/mqtt/test_vacuum.py b/tests/components/mqtt/test_vacuum.py
index c1c662048d7..ba404e2dff0 100644
--- a/tests/components/mqtt/test_vacuum.py
+++ b/tests/components/mqtt/test_vacuum.py
@@ -33,7 +33,7 @@ from homeassistant.const import CONF_NAME, ENTITY_MATCH_ALL, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
diff --git a/tests/components/mqtt/test_valve.py b/tests/components/mqtt/test_valve.py
index 6dd0102b8a3..10387a5b19e 100644
--- a/tests/components/mqtt/test_valve.py
+++ b/tests/components/mqtt/test_valve.py
@@ -27,7 +27,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
diff --git a/tests/components/mqtt/test_water_heater.py b/tests/components/mqtt/test_water_heater.py
index 02ae54c1a85..21969ad7788 100644
--- a/tests/components/mqtt/test_water_heater.py
+++ b/tests/components/mqtt/test_water_heater.py
@@ -33,8 +33,13 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.util.unit_conversion import TemperatureConverter
+from homeassistant.util.unit_system import (
+    METRIC_SYSTEM,
+    US_CUSTOMARY_SYSTEM,
+    UnitSystem,
+)
 
-from .test_common import (
+from .common import (
     help_custom_config,
     help_test_availability_when_connection_lost,
     help_test_availability_without_topic,
@@ -714,7 +719,7 @@ async def test_temperature_unit(
 
 
 @pytest.mark.parametrize(
-    ("hass_config", "temperature_unit", "initial", "min_temp", "max_temp", "current"),
+    ("hass_config", "units", "initial", "min_temp", "max_temp", "current"),
     [
         (
             help_custom_config(
@@ -727,7 +732,7 @@ async def test_temperature_unit(
                     },
                 ),
             ),
-            UnitOfTemperature.CELSIUS,
+            METRIC_SYSTEM,
             _DEFAULT_MIN_TEMP_CELSIUS,
             _DEFAULT_MIN_TEMP_CELSIUS,
             _DEFAULT_MAX_TEMP_CELSIUS,
@@ -744,24 +749,7 @@ async def test_temperature_unit(
                     },
                 ),
             ),
-            UnitOfTemperature.KELVIN,
-            316,
-            316,
-            333,
-            322,
-        ),
-        (
-            help_custom_config(
-                water_heater.DOMAIN,
-                DEFAULT_CONFIG,
-                (
-                    {
-                        "temperature_unit": "F",
-                        "current_temperature_topic": "current_temperature",
-                    },
-                ),
-            ),
-            UnitOfTemperature.FAHRENHEIT,
+            US_CUSTOMARY_SYSTEM,
             DEFAULT_MIN_TEMP,
             DEFAULT_MIN_TEMP,
             DEFAULT_MAX_TEMP,
@@ -772,25 +760,25 @@ async def test_temperature_unit(
 async def test_alt_temperature_unit(
     hass: HomeAssistant,
     mqtt_mock_entry: MqttMockHAClientGenerator,
-    temperature_unit: UnitOfTemperature,
+    units: UnitSystem,
     initial: float,
     min_temp: float,
     max_temp: float,
     current: float,
 ) -> None:
     """Test deriving the systems temperature unit."""
-    with patch.object(hass.config.units, "temperature_unit", temperature_unit):
-        await mqtt_mock_entry()
+    hass.config.units = units
+    await mqtt_mock_entry()
 
-        state = hass.states.get(ENTITY_WATER_HEATER)
-        assert state.attributes.get("temperature") == initial
-        assert state.attributes.get("min_temp") == min_temp
-        assert state.attributes.get("max_temp") == max_temp
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == initial
+    assert state.attributes.get("min_temp") == min_temp
+    assert state.attributes.get("max_temp") == max_temp
 
-        async_fire_mqtt_message(hass, "current_temperature", "120")
+    async_fire_mqtt_message(hass, "current_temperature", "120")
 
-        state = hass.states.get(ENTITY_WATER_HEATER)
-        assert state.attributes.get("current_temperature") == current
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("current_temperature") == current
 
 
 async def test_setting_attribute_via_mqtt_json_message(
diff --git a/tests/components/mqtt_eventstream/test_init.py b/tests/components/mqtt_eventstream/test_init.py
index b6c1940b149..cbf02299b09 100644
--- a/tests/components/mqtt_eventstream/test_init.py
+++ b/tests/components/mqtt_eventstream/test_init.py
@@ -5,12 +5,12 @@ from unittest.mock import ANY, patch
 
 import pytest
 
-import homeassistant.components.mqtt_eventstream as eventstream
+from homeassistant.components import mqtt_eventstream as eventstream
 from homeassistant.const import EVENT_STATE_CHANGED, MATCH_ALL
 from homeassistant.core import HomeAssistant, State, callback
 from homeassistant.helpers.json import JSONEncoder
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     async_fire_mqtt_message,
diff --git a/tests/components/mqtt_statestream/test_init.py b/tests/components/mqtt_statestream/test_init.py
index 9798477945c..63c3ea14e44 100644
--- a/tests/components/mqtt_statestream/test_init.py
+++ b/tests/components/mqtt_statestream/test_init.py
@@ -4,7 +4,7 @@ from unittest.mock import ANY, call
 
 import pytest
 
-import homeassistant.components.mqtt_statestream as statestream
+from homeassistant.components import mqtt_statestream as statestream
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import CoreState, HomeAssistant, State
 from homeassistant.setup import async_setup_component
diff --git a/tests/components/music_assistant/common.py b/tests/components/music_assistant/common.py
index 7c0f9df751a..6d7ef927c6e 100644
--- a/tests/components/music_assistant/common.py
+++ b/tests/components/music_assistant/common.py
@@ -2,11 +2,21 @@
 
 from __future__ import annotations
 
+import asyncio
 from typing import Any
 from unittest.mock import AsyncMock, MagicMock
 
+from music_assistant_models.api import MassEvent
 from music_assistant_models.enums import EventType
-from music_assistant_models.media_items import Album, Artist, Playlist, Radio, Track
+from music_assistant_models.media_items import (
+    Album,
+    Artist,
+    Audiobook,
+    Playlist,
+    Podcast,
+    Radio,
+    Track,
+)
 from music_assistant_models.player import Player
 from music_assistant_models.player_queue import PlayerQueue
 from syrupy import SnapshotAssertion
@@ -60,6 +70,10 @@ async def setup_integration_from_fixtures(
     music.get_playlist_tracks = AsyncMock(return_value=library_playlist_tracks)
     library_radios = create_library_radios_from_fixture()
     music.get_library_radios = AsyncMock(return_value=library_radios)
+    library_audiobooks = create_library_audiobooks_from_fixture()
+    music.get_library_audiobooks = AsyncMock(return_value=library_audiobooks)
+    library_podcasts = create_library_podcasts_from_fixture()
+    music.get_library_podcasts = AsyncMock(return_value=library_podcasts)
     music.get_item_by_uri = AsyncMock()
 
     config_entry.add_to_hass(hass)
@@ -130,19 +144,58 @@ def create_library_radios_from_fixture() -> list[Radio]:
     return [Radio.from_dict(radio_data) for radio_data in fixture_data]
 
 
+def create_library_audiobooks_from_fixture() -> list[Audiobook]:
+    """Create MA Audiobooks from fixture."""
+    fixture_data = load_and_parse_fixture("library_audiobooks")
+    return [Audiobook.from_dict(radio_data) for radio_data in fixture_data]
+
+
+def create_library_podcasts_from_fixture() -> list[Podcast]:
+    """Create MA Podcasts from fixture."""
+    fixture_data = load_and_parse_fixture("library_podcasts")
+    return [Podcast.from_dict(radio_data) for radio_data in fixture_data]
+
+
 async def trigger_subscription_callback(
     hass: HomeAssistant,
     client: MagicMock,
     event: EventType = EventType.PLAYER_UPDATED,
+    object_id: str | None = None,
     data: Any = None,
 ) -> None:
     """Trigger a subscription callback."""
     # trigger callback on all subscribers
-    for sub in client.subscribe_events.call_args_list:
-        callback = sub.kwargs["callback"]
-        event_filter = sub.kwargs.get("event_filter")
-        if event_filter in (None, event):
-            callback(event, data)
+    for sub in client.subscribe.call_args_list:
+        cb_func = sub.kwargs.get("cb_func", sub.args[0])
+        event_filter = sub.kwargs.get(
+            "event_filter", sub.args[1] if len(sub.args) > 1 else None
+        )
+        id_filter = sub.kwargs.get(
+            "id_filter", sub.args[2] if len(sub.args) > 2 else None
+        )
+        if not (
+            event_filter is None
+            or event == event_filter
+            or (isinstance(event_filter, list) and event in event_filter)
+        ):
+            continue
+        if not (
+            id_filter is None
+            or object_id == id_filter
+            or (isinstance(id_filter, list) and object_id in id_filter)
+        ):
+            continue
+
+        event = MassEvent(
+            event=event,
+            object_id=object_id,
+            data=data,
+        )
+        if asyncio.iscoroutinefunction(cb_func):
+            await cb_func(event)
+        else:
+            cb_func(event)
+
     await hass.async_block_till_done()
 
 
diff --git a/tests/components/music_assistant/conftest.py b/tests/components/music_assistant/conftest.py
index 2df43defe62..2b397891d6f 100644
--- a/tests/components/music_assistant/conftest.py
+++ b/tests/components/music_assistant/conftest.py
@@ -8,6 +8,7 @@ from music_assistant_client.music import Music
 from music_assistant_client.player_queues import PlayerQueues
 from music_assistant_client.players import Players
 from music_assistant_models.api import ServerInfoMessage
+from music_assistant_models.config_entries import PlayerConfig
 import pytest
 
 from homeassistant.components.music_assistant.config_flow import CONF_URL
@@ -68,6 +69,21 @@ async def music_assistant_client_fixture() -> AsyncGenerator[MagicMock]:
         client.music = Music(client)
         client.server_url = client.server_info.base_url
         client.get_media_item_image_url = MagicMock(return_value=None)
+        client.config = MagicMock()
+
+        async def get_player_configs() -> list[PlayerConfig]:
+            """Mock get player configs."""
+            # simply return a mock config for each player
+            return [
+                PlayerConfig(
+                    values={},
+                    provider=player.provider,
+                    player_id=player.player_id,
+                )
+                for player in client.players
+            ]
+
+        client.config.get_player_configs = get_player_configs
 
         yield client
 
diff --git a/tests/components/music_assistant/fixtures/library_audiobooks.json b/tests/components/music_assistant/fixtures/library_audiobooks.json
new file mode 100644
index 00000000000..1994ee68e14
--- /dev/null
+++ b/tests/components/music_assistant/fixtures/library_audiobooks.json
@@ -0,0 +1,489 @@
+{
+  "library_audiobooks": [
+    {
+      "item_id": "1",
+      "provider": "library",
+      "name": "Test Audiobook",
+      "version": "",
+      "sort_name": "test audiobook",
+      "uri": "library://audiobook/1",
+      "external_ids": [],
+      "is_playable": true,
+      "media_type": "audiobook",
+      "provider_mappings": [
+        {
+          "item_id": "test-audiobook.mp3",
+          "provider_domain": "filesystem_smb",
+          "provider_instance": "filesystem_smb--7Kf8QySu",
+          "available": true,
+          "audio_format": {
+            "content_type": "mp3",
+            "codec_type": "?",
+            "sample_rate": 48000,
+            "bit_depth": 16,
+            "channels": 1,
+            "output_format_str": "mp3",
+            "bit_rate": 90304
+          },
+          "url": null,
+          "details": "1738502411"
+        }
+      ],
+      "metadata": {
+        "description": "Cover (front)",
+        "review": null,
+        "explicit": null,
+        "images": [
+          {
+            "type": "thumb",
+            "path": "test-audiobook.mp3",
+            "provider": "filesystem_smb--7Kf8QySu",
+            "remotely_accessible": false
+          }
+        ],
+        "genres": [],
+        "mood": null,
+        "style": null,
+        "copyright": null,
+        "lyrics": "",
+        "label": null,
+        "links": null,
+        "performers": null,
+        "preview": null,
+        "popularity": null,
+        "release_date": null,
+        "languages": null,
+        "chapters": [],
+        "last_refresh": null
+      },
+      "favorite": false,
+      "position": null,
+      "publisher": null,
+      "authors": ["TestWriter"],
+      "narrators": [],
+      "duration": 9,
+      "fully_played": true,
+      "resume_position_ms": 9000
+    },
+    {
+      "item_id": "11",
+      "provider": "library",
+      "name": "Test Audiobook 0",
+      "version": "",
+      "sort_name": "test audiobook 0",
+      "uri": "library://audiobook/11",
+      "external_ids": [],
+      "is_playable": true,
+      "media_type": "audiobook",
+      "provider_mappings": [
+        {
+          "item_id": "0",
+          "provider_domain": "test",
+          "provider_instance": "test",
+          "available": true,
+          "audio_format": {
+            "content_type": "?",
+            "codec_type": "?",
+            "sample_rate": 44100,
+            "bit_depth": 16,
+            "channels": 2,
+            "output_format_str": "?",
+            "bit_rate": 0
+          },
+          "url": null,
+          "details": null
+        }
+      ],
+      "metadata": {
+        "description": "This is a description for Test Audiobook",
+        "review": null,
+        "explicit": null,
+        "images": [
+          {
+            "type": "thumb",
+            "path": "logo.png",
+            "provider": "builtin",
+            "remotely_accessible": false
+          }
+        ],
+        "genres": null,
+        "mood": null,
+        "style": null,
+        "copyright": null,
+        "lyrics": null,
+        "label": null,
+        "links": null,
+        "performers": null,
+        "preview": null,
+        "popularity": null,
+        "release_date": null,
+        "languages": null,
+        "chapters": [
+          {
+            "position": 1,
+            "name": "Chapter 1",
+            "start": 10.0,
+            "end": 20.0
+          },
+          {
+            "position": 2,
+            "name": "Chapter 2",
+            "start": 20.0,
+            "end": 40.0
+          },
+          {
+            "position": 2,
+            "name": "Chapter 3",
+            "start": 40.0,
+            "end": null
+          }
+        ],
+        "last_refresh": null
+      },
+      "favorite": false,
+      "position": null,
+      "publisher": "Test Publisher",
+      "authors": ["AudioBook Author"],
+      "narrators": ["AudioBook Narrator"],
+      "duration": 60,
+      "fully_played": null,
+      "resume_position_ms": null
+    },
+    {
+      "item_id": "12",
+      "provider": "library",
+      "name": "Test Audiobook 1",
+      "version": "",
+      "sort_name": "test audiobook 1",
+      "uri": "library://audiobook/12",
+      "external_ids": [],
+      "is_playable": true,
+      "media_type": "audiobook",
+      "provider_mappings": [
+        {
+          "item_id": "1",
+          "provider_domain": "test",
+          "provider_instance": "test",
+          "available": true,
+          "audio_format": {
+            "content_type": "?",
+            "codec_type": "?",
+            "sample_rate": 44100,
+            "bit_depth": 16,
+            "channels": 2,
+            "output_format_str": "?",
+            "bit_rate": 0
+          },
+          "url": null,
+          "details": null
+        }
+      ],
+      "metadata": {
+        "description": "This is a description for Test Audiobook",
+        "review": null,
+        "explicit": null,
+        "images": [
+          {
+            "type": "thumb",
+            "path": "logo.png",
+            "provider": "builtin",
+            "remotely_accessible": false
+          }
+        ],
+        "genres": null,
+        "mood": null,
+        "style": null,
+        "copyright": null,
+        "lyrics": null,
+        "label": null,
+        "links": null,
+        "performers": null,
+        "preview": null,
+        "popularity": null,
+        "release_date": null,
+        "languages": null,
+        "chapters": [
+          {
+            "position": 1,
+            "name": "Chapter 1",
+            "start": 10.0,
+            "end": 20.0
+          },
+          {
+            "position": 2,
+            "name": "Chapter 2",
+            "start": 20.0,
+            "end": 40.0
+          },
+          {
+            "position": 2,
+            "name": "Chapter 3",
+            "start": 40.0,
+            "end": null
+          }
+        ],
+        "last_refresh": null
+      },
+      "favorite": false,
+      "position": null,
+      "publisher": "Test Publisher",
+      "authors": ["AudioBook Author"],
+      "narrators": ["AudioBook Narrator"],
+      "duration": 60,
+      "fully_played": null,
+      "resume_position_ms": null
+    },
+    {
+      "item_id": "13",
+      "provider": "library",
+      "name": "Test Audiobook 2",
+      "version": "",
+      "sort_name": "test audiobook 2",
+      "uri": "library://audiobook/13",
+      "external_ids": [],
+      "is_playable": true,
+      "media_type": "audiobook",
+      "provider_mappings": [
+        {
+          "item_id": "2",
+          "provider_domain": "test",
+          "provider_instance": "test",
+          "available": true,
+          "audio_format": {
+            "content_type": "?",
+            "codec_type": "?",
+            "sample_rate": 44100,
+            "bit_depth": 16,
+            "channels": 2,
+            "output_format_str": "?",
+            "bit_rate": 0
+          },
+          "url": null,
+          "details": null
+        }
+      ],
+      "metadata": {
+        "description": "This is a description for Test Audiobook",
+        "review": null,
+        "explicit": null,
+        "images": [
+          {
+            "type": "thumb",
+            "path": "logo.png",
+            "provider": "builtin",
+            "remotely_accessible": false
+          }
+        ],
+        "genres": null,
+        "mood": null,
+        "style": null,
+        "copyright": null,
+        "lyrics": null,
+        "label": null,
+        "links": null,
+        "performers": null,
+        "preview": null,
+        "popularity": null,
+        "release_date": null,
+        "languages": null,
+        "chapters": [
+          {
+            "position": 1,
+            "name": "Chapter 1",
+            "start": 10.0,
+            "end": 20.0
+          },
+          {
+            "position": 2,
+            "name": "Chapter 2",
+            "start": 20.0,
+            "end": 40.0
+          },
+          {
+            "position": 2,
+            "name": "Chapter 3",
+            "start": 40.0,
+            "end": null
+          }
+        ],
+        "last_refresh": null
+      },
+      "favorite": false,
+      "position": null,
+      "publisher": "Test Publisher",
+      "authors": ["AudioBook Author"],
+      "narrators": ["AudioBook Narrator"],
+      "duration": 60,
+      "fully_played": null,
+      "resume_position_ms": null
+    },
+    {
+      "item_id": "14",
+      "provider": "library",
+      "name": "Test Audiobook 3",
+      "version": "",
+      "sort_name": "test audiobook 3",
+      "uri": "library://audiobook/14",
+      "external_ids": [],
+      "is_playable": true,
+      "media_type": "audiobook",
+      "provider_mappings": [
+        {
+          "item_id": "3",
+          "provider_domain": "test",
+          "provider_instance": "test",
+          "available": true,
+          "audio_format": {
+            "content_type": "?",
+            "codec_type": "?",
+            "sample_rate": 44100,
+            "bit_depth": 16,
+            "channels": 2,
+            "output_format_str": "?",
+            "bit_rate": 0
+          },
+          "url": null,
+          "details": null
+        }
+      ],
+      "metadata": {
+        "description": "This is a description for Test Audiobook",
+        "review": null,
+        "explicit": null,
+        "images": [
+          {
+            "type": "thumb",
+            "path": "logo.png",
+            "provider": "builtin",
+            "remotely_accessible": false
+          }
+        ],
+        "genres": null,
+        "mood": null,
+        "style": null,
+        "copyright": null,
+        "lyrics": null,
+        "label": null,
+        "links": null,
+        "performers": null,
+        "preview": null,
+        "popularity": null,
+        "release_date": null,
+        "languages": null,
+        "chapters": [
+          {
+            "position": 1,
+            "name": "Chapter 1",
+            "start": 10.0,
+            "end": 20.0
+          },
+          {
+            "position": 2,
+            "name": "Chapter 2",
+            "start": 20.0,
+            "end": 40.0
+          },
+          {
+            "position": 2,
+            "name": "Chapter 3",
+            "start": 40.0,
+            "end": null
+          }
+        ],
+        "last_refresh": null
+      },
+      "favorite": false,
+      "position": null,
+      "publisher": "Test Publisher",
+      "authors": ["AudioBook Author"],
+      "narrators": ["AudioBook Narrator"],
+      "duration": 60,
+      "fully_played": null,
+      "resume_position_ms": null
+    },
+    {
+      "item_id": "15",
+      "provider": "library",
+      "name": "Test Audiobook 4",
+      "version": "",
+      "sort_name": "test audiobook 4",
+      "uri": "library://audiobook/15",
+      "external_ids": [],
+      "is_playable": true,
+      "media_type": "audiobook",
+      "provider_mappings": [
+        {
+          "item_id": "4",
+          "provider_domain": "test",
+          "provider_instance": "test",
+          "available": true,
+          "audio_format": {
+            "content_type": "?",
+            "codec_type": "?",
+            "sample_rate": 44100,
+            "bit_depth": 16,
+            "channels": 2,
+            "output_format_str": "?",
+            "bit_rate": 0
+          },
+          "url": null,
+          "details": null
+        }
+      ],
+      "metadata": {
+        "description": "This is a description for Test Audiobook",
+        "review": null,
+        "explicit": null,
+        "images": [
+          {
+            "type": "thumb",
+            "path": "logo.png",
+            "provider": "builtin",
+            "remotely_accessible": false
+          }
+        ],
+        "genres": null,
+        "mood": null,
+        "style": null,
+        "copyright": null,
+        "lyrics": null,
+        "label": null,
+        "links": null,
+        "performers": null,
+        "preview": null,
+        "popularity": null,
+        "release_date": null,
+        "languages": null,
+        "chapters": [
+          {
+            "position": 1,
+            "name": "Chapter 1",
+            "start": 10.0,
+            "end": 20.0
+          },
+          {
+            "position": 2,
+            "name": "Chapter 2",
+            "start": 20.0,
+            "end": 40.0
+          },
+          {
+            "position": 2,
+            "name": "Chapter 3",
+            "start": 40.0,
+            "end": null
+          }
+        ],
+        "last_refresh": null
+      },
+      "favorite": false,
+      "position": null,
+      "publisher": "Test Publisher",
+      "authors": ["AudioBook Author"],
+      "narrators": ["AudioBook Narrator"],
+      "duration": 60,
+      "fully_played": null,
+      "resume_position_ms": null
+    }
+  ]
+}
diff --git a/tests/components/music_assistant/fixtures/library_podcasts.json b/tests/components/music_assistant/fixtures/library_podcasts.json
new file mode 100644
index 00000000000..2c6a9c62f65
--- /dev/null
+++ b/tests/components/music_assistant/fixtures/library_podcasts.json
@@ -0,0 +1,309 @@
+{
+  "library_podcasts": [
+    {
+      "item_id": "6",
+      "provider": "library",
+      "name": "Test Podcast 0",
+      "version": "",
+      "sort_name": "test podcast 0",
+      "uri": "library://podcast/6",
+      "external_ids": [],
+      "is_playable": true,
+      "media_type": "podcast",
+      "provider_mappings": [
+        {
+          "item_id": "0",
+          "provider_domain": "test",
+          "provider_instance": "test",
+          "available": true,
+          "audio_format": {
+            "content_type": "?",
+            "codec_type": "?",
+            "sample_rate": 44100,
+            "bit_depth": 16,
+            "channels": 2,
+            "output_format_str": "?",
+            "bit_rate": 0
+          },
+          "url": null,
+          "details": null
+        }
+      ],
+      "metadata": {
+        "description": null,
+        "review": null,
+        "explicit": null,
+        "images": [
+          {
+            "type": "thumb",
+            "path": "logo.png",
+            "provider": "builtin",
+            "remotely_accessible": false
+          }
+        ],
+        "genres": null,
+        "mood": null,
+        "style": null,
+        "copyright": null,
+        "lyrics": null,
+        "label": null,
+        "links": null,
+        "performers": null,
+        "preview": null,
+        "popularity": null,
+        "release_date": null,
+        "languages": null,
+        "chapters": null,
+        "last_refresh": null
+      },
+      "favorite": false,
+      "position": null,
+      "publisher": "Test Publisher",
+      "total_episodes": null
+    },
+    {
+      "item_id": "7",
+      "provider": "library",
+      "name": "Test Podcast 1",
+      "version": "",
+      "sort_name": "test podcast 1",
+      "uri": "library://podcast/7",
+      "external_ids": [],
+      "is_playable": true,
+      "media_type": "podcast",
+      "provider_mappings": [
+        {
+          "item_id": "1",
+          "provider_domain": "test",
+          "provider_instance": "test",
+          "available": true,
+          "audio_format": {
+            "content_type": "?",
+            "codec_type": "?",
+            "sample_rate": 44100,
+            "bit_depth": 16,
+            "channels": 2,
+            "output_format_str": "?",
+            "bit_rate": 0
+          },
+          "url": null,
+          "details": null
+        }
+      ],
+      "metadata": {
+        "description": null,
+        "review": null,
+        "explicit": null,
+        "images": [
+          {
+            "type": "thumb",
+            "path": "logo.png",
+            "provider": "builtin",
+            "remotely_accessible": false
+          }
+        ],
+        "genres": null,
+        "mood": null,
+        "style": null,
+        "copyright": null,
+        "lyrics": null,
+        "label": null,
+        "links": null,
+        "performers": null,
+        "preview": null,
+        "popularity": null,
+        "release_date": null,
+        "languages": null,
+        "chapters": null,
+        "last_refresh": null
+      },
+      "favorite": false,
+      "position": null,
+      "publisher": "Test Publisher",
+      "total_episodes": null
+    },
+    {
+      "item_id": "8",
+      "provider": "library",
+      "name": "Test Podcast 2",
+      "version": "",
+      "sort_name": "test podcast 2",
+      "uri": "library://podcast/8",
+      "external_ids": [],
+      "is_playable": true,
+      "media_type": "podcast",
+      "provider_mappings": [
+        {
+          "item_id": "2",
+          "provider_domain": "test",
+          "provider_instance": "test",
+          "available": true,
+          "audio_format": {
+            "content_type": "?",
+            "codec_type": "?",
+            "sample_rate": 44100,
+            "bit_depth": 16,
+            "channels": 2,
+            "output_format_str": "?",
+            "bit_rate": 0
+          },
+          "url": null,
+          "details": null
+        }
+      ],
+      "metadata": {
+        "description": null,
+        "review": null,
+        "explicit": null,
+        "images": [
+          {
+            "type": "thumb",
+            "path": "logo.png",
+            "provider": "builtin",
+            "remotely_accessible": false
+          }
+        ],
+        "genres": null,
+        "mood": null,
+        "style": null,
+        "copyright": null,
+        "lyrics": null,
+        "label": null,
+        "links": null,
+        "performers": null,
+        "preview": null,
+        "popularity": null,
+        "release_date": null,
+        "languages": null,
+        "chapters": null,
+        "last_refresh": null
+      },
+      "favorite": false,
+      "position": null,
+      "publisher": "Test Publisher",
+      "total_episodes": null
+    },
+    {
+      "item_id": "9",
+      "provider": "library",
+      "name": "Test Podcast 3",
+      "version": "",
+      "sort_name": "test podcast 3",
+      "uri": "library://podcast/9",
+      "external_ids": [],
+      "is_playable": true,
+      "media_type": "podcast",
+      "provider_mappings": [
+        {
+          "item_id": "3",
+          "provider_domain": "test",
+          "provider_instance": "test",
+          "available": true,
+          "audio_format": {
+            "content_type": "?",
+            "codec_type": "?",
+            "sample_rate": 44100,
+            "bit_depth": 16,
+            "channels": 2,
+            "output_format_str": "?",
+            "bit_rate": 0
+          },
+          "url": null,
+          "details": null
+        }
+      ],
+      "metadata": {
+        "description": null,
+        "review": null,
+        "explicit": null,
+        "images": [
+          {
+            "type": "thumb",
+            "path": "logo.png",
+            "provider": "builtin",
+            "remotely_accessible": false
+          }
+        ],
+        "genres": null,
+        "mood": null,
+        "style": null,
+        "copyright": null,
+        "lyrics": null,
+        "label": null,
+        "links": null,
+        "performers": null,
+        "preview": null,
+        "popularity": null,
+        "release_date": null,
+        "languages": null,
+        "chapters": null,
+        "last_refresh": null
+      },
+      "favorite": false,
+      "position": null,
+      "publisher": "Test Publisher",
+      "total_episodes": null
+    },
+    {
+      "item_id": "10",
+      "provider": "library",
+      "name": "Test Podcast 4",
+      "version": "",
+      "sort_name": "test podcast 4",
+      "uri": "library://podcast/10",
+      "external_ids": [],
+      "is_playable": true,
+      "media_type": "podcast",
+      "provider_mappings": [
+        {
+          "item_id": "4",
+          "provider_domain": "test",
+          "provider_instance": "test",
+          "available": true,
+          "audio_format": {
+            "content_type": "?",
+            "codec_type": "?",
+            "sample_rate": 44100,
+            "bit_depth": 16,
+            "channels": 2,
+            "output_format_str": "?",
+            "bit_rate": 0
+          },
+          "url": null,
+          "details": null
+        }
+      ],
+      "metadata": {
+        "description": null,
+        "review": null,
+        "explicit": null,
+        "images": [
+          {
+            "type": "thumb",
+            "path": "logo.png",
+            "provider": "builtin",
+            "remotely_accessible": false
+          }
+        ],
+        "genres": null,
+        "mood": null,
+        "style": null,
+        "copyright": null,
+        "lyrics": null,
+        "label": null,
+        "links": null,
+        "performers": null,
+        "preview": null,
+        "popularity": null,
+        "release_date": null,
+        "languages": null,
+        "chapters": null,
+        "last_refresh": null
+      },
+      "favorite": false,
+      "position": null,
+      "publisher": "Test Publisher",
+      "total_episodes": null
+    }
+  ]
+}
diff --git a/tests/components/music_assistant/snapshots/test_actions.ambr b/tests/components/music_assistant/snapshots/test_actions.ambr
index 6c30ffc512c..32c8776c953 100644
--- a/tests/components/music_assistant/snapshots/test_actions.ambr
+++ b/tests/components/music_assistant/snapshots/test_actions.ambr
@@ -1,5 +1,195 @@
 # serializer version: 1
-# name: test_get_library_action
+# name: test_get_library_action[album]
+  dict({
+    'items': list([
+      dict({
+        'artists': list([
+          dict({
+            'image': None,
+            'media_type': <MediaType.ARTIST: 'artist'>,
+            'name': 'A Space Love Adventure',
+            'uri': 'library://artist/289',
+            'version': '',
+          }),
+        ]),
+        'image': None,
+        'media_type': <MediaType.ALBUM: 'album'>,
+        'name': 'Synth Punk EP',
+        'uri': 'library://album/396',
+        'version': '',
+      }),
+      dict({
+        'artists': list([
+          dict({
+            'image': None,
+            'media_type': <MediaType.ARTIST: 'artist'>,
+            'name': 'Various Artists',
+            'uri': 'library://artist/96',
+            'version': '',
+          }),
+        ]),
+        'image': None,
+        'media_type': <MediaType.ALBUM: 'album'>,
+        'name': 'Synthwave (The 80S Revival)',
+        'uri': 'library://album/95',
+        'version': 'The 80S Revival',
+      }),
+    ]),
+    'limit': 25,
+    'media_type': <MediaType.ALBUM: 'album'>,
+    'offset': 0,
+    'order_by': 'name',
+  })
+# ---
+# name: test_get_library_action[artist]
+  dict({
+    'items': list([
+      dict({
+        'image': None,
+        'media_type': <MediaType.ARTIST: 'artist'>,
+        'name': 'W O L F C L U B',
+        'uri': 'library://artist/127',
+        'version': '',
+      }),
+    ]),
+    'limit': 25,
+    'media_type': <MediaType.ARTIST: 'artist'>,
+    'offset': 0,
+    'order_by': 'name',
+  })
+# ---
+# name: test_get_library_action[audiobook]
+  dict({
+    'items': list([
+      dict({
+        'image': None,
+        'media_type': <MediaType.AUDIOBOOK: 'audiobook'>,
+        'name': 'Test Audiobook',
+        'uri': 'library://audiobook/1',
+        'version': '',
+      }),
+      dict({
+        'image': None,
+        'media_type': <MediaType.AUDIOBOOK: 'audiobook'>,
+        'name': 'Test Audiobook 0',
+        'uri': 'library://audiobook/11',
+        'version': '',
+      }),
+      dict({
+        'image': None,
+        'media_type': <MediaType.AUDIOBOOK: 'audiobook'>,
+        'name': 'Test Audiobook 1',
+        'uri': 'library://audiobook/12',
+        'version': '',
+      }),
+      dict({
+        'image': None,
+        'media_type': <MediaType.AUDIOBOOK: 'audiobook'>,
+        'name': 'Test Audiobook 2',
+        'uri': 'library://audiobook/13',
+        'version': '',
+      }),
+      dict({
+        'image': None,
+        'media_type': <MediaType.AUDIOBOOK: 'audiobook'>,
+        'name': 'Test Audiobook 3',
+        'uri': 'library://audiobook/14',
+        'version': '',
+      }),
+      dict({
+        'image': None,
+        'media_type': <MediaType.AUDIOBOOK: 'audiobook'>,
+        'name': 'Test Audiobook 4',
+        'uri': 'library://audiobook/15',
+        'version': '',
+      }),
+    ]),
+    'limit': 25,
+    'media_type': <MediaType.AUDIOBOOK: 'audiobook'>,
+    'offset': 0,
+    'order_by': 'name',
+  })
+# ---
+# name: test_get_library_action[playlist]
+  dict({
+    'items': list([
+      dict({
+        'image': None,
+        'media_type': <MediaType.PLAYLIST: 'playlist'>,
+        'name': '1970s Rock Hits',
+        'uri': 'library://playlist/40',
+        'version': '',
+      }),
+    ]),
+    'limit': 25,
+    'media_type': <MediaType.PLAYLIST: 'playlist'>,
+    'offset': 0,
+    'order_by': 'name',
+  })
+# ---
+# name: test_get_library_action[podcast]
+  dict({
+    'items': list([
+      dict({
+        'image': None,
+        'media_type': <MediaType.PODCAST: 'podcast'>,
+        'name': 'Test Podcast 0',
+        'uri': 'library://podcast/6',
+        'version': '',
+      }),
+      dict({
+        'image': None,
+        'media_type': <MediaType.PODCAST: 'podcast'>,
+        'name': 'Test Podcast 1',
+        'uri': 'library://podcast/7',
+        'version': '',
+      }),
+      dict({
+        'image': None,
+        'media_type': <MediaType.PODCAST: 'podcast'>,
+        'name': 'Test Podcast 2',
+        'uri': 'library://podcast/8',
+        'version': '',
+      }),
+      dict({
+        'image': None,
+        'media_type': <MediaType.PODCAST: 'podcast'>,
+        'name': 'Test Podcast 3',
+        'uri': 'library://podcast/9',
+        'version': '',
+      }),
+      dict({
+        'image': None,
+        'media_type': <MediaType.PODCAST: 'podcast'>,
+        'name': 'Test Podcast 4',
+        'uri': 'library://podcast/10',
+        'version': '',
+      }),
+    ]),
+    'limit': 25,
+    'media_type': <MediaType.PODCAST: 'podcast'>,
+    'offset': 0,
+    'order_by': 'name',
+  })
+# ---
+# name: test_get_library_action[radio]
+  dict({
+    'items': list([
+      dict({
+        'image': None,
+        'media_type': <MediaType.RADIO: 'radio'>,
+        'name': 'fm4 | ORF | HQ',
+        'uri': 'library://radio/1',
+        'version': '',
+      }),
+    ]),
+    'limit': 25,
+    'media_type': <MediaType.RADIO: 'radio'>,
+    'offset': 0,
+    'order_by': 'name',
+  })
+# ---
+# name: test_get_library_action[track]
   dict({
     'items': list([
       dict({
@@ -192,8 +382,12 @@
     ]),
     'artists': list([
     ]),
+    'audiobooks': list([
+    ]),
     'playlists': list([
     ]),
+    'podcasts': list([
+    ]),
     'radio': list([
     ]),
     'tracks': list([
diff --git a/tests/components/music_assistant/snapshots/test_media_player.ambr b/tests/components/music_assistant/snapshots/test_media_player.ambr
index 6c5389dbd6a..50223ddf623 100644
--- a/tests/components/music_assistant/snapshots/test_media_player.ambr
+++ b/tests/components/music_assistant/snapshots/test_media_player.ambr
@@ -7,6 +7,7 @@
     'capabilities': dict({
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -72,6 +73,7 @@
     'capabilities': dict({
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -107,8 +109,8 @@
       'entity_picture_local': None,
       'friendly_name': 'Test Group Player 1',
       'group_members': list([
-        'media_player.my_super_test_player_2',
         'media_player.test_player_1',
+        'media_player.my_super_test_player_2',
       ]),
       'icon': 'mdi:speaker-multiple',
       'is_volume_muted': False,
@@ -142,6 +144,7 @@
     'capabilities': dict({
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/music_assistant/test_actions.py b/tests/components/music_assistant/test_actions.py
index 4d3917091c1..ba8b1acdeac 100644
--- a/tests/components/music_assistant/test_actions.py
+++ b/tests/components/music_assistant/test_actions.py
@@ -3,6 +3,7 @@
 from unittest.mock import AsyncMock, MagicMock
 
 from music_assistant_models.media_items import SearchResults
+import pytest
 from syrupy import SnapshotAssertion
 
 from homeassistant.components.music_assistant.actions import (
@@ -47,9 +48,22 @@ async def test_search_action(
     assert response == snapshot
 
 
+@pytest.mark.parametrize(
+    "media_type",
+    [
+        "artist",
+        "album",
+        "track",
+        "playlist",
+        "audiobook",
+        "podcast",
+        "radio",
+    ],
+)
 async def test_get_library_action(
     hass: HomeAssistant,
     music_assistant_client: MagicMock,
+    media_type: str,
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test music assistant get_library action."""
@@ -60,7 +74,7 @@ async def test_get_library_action(
         {
             ATTR_CONFIG_ENTRY_ID: entry.entry_id,
             ATTR_FAVORITE: False,
-            ATTR_MEDIA_TYPE: "track",
+            ATTR_MEDIA_TYPE: media_type,
         },
         blocking=True,
         return_response=True,
diff --git a/tests/components/music_assistant/test_init.py b/tests/components/music_assistant/test_init.py
new file mode 100644
index 00000000000..4cfefb50bd2
--- /dev/null
+++ b/tests/components/music_assistant/test_init.py
@@ -0,0 +1,70 @@
+"""Test the Music Assistant integration init."""
+
+from __future__ import annotations
+
+from unittest.mock import AsyncMock, MagicMock
+
+from music_assistant_models.errors import ActionUnavailable
+
+from homeassistant.components.music_assistant.const import DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.setup import async_setup_component
+
+from .common import setup_integration_from_fixtures
+
+from tests.typing import WebSocketGenerator
+
+
+async def test_remove_config_entry_device(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    music_assistant_client: MagicMock,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test device removal."""
+    assert await async_setup_component(hass, "config", {})
+    await setup_integration_from_fixtures(hass, music_assistant_client)
+    await hass.async_block_till_done()
+    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
+    client = await hass_ws_client(hass)
+
+    # test if the removal should be denied if the device is still in use
+    device_entry = dr.async_entries_for_config_entry(
+        device_registry, config_entry.entry_id
+    )[0]
+    entity_id = "media_player.test_player_1"
+    assert device_entry
+    assert entity_registry.async_get(entity_id)
+    assert hass.states.get(entity_id)
+    music_assistant_client.config.remove_player_config = AsyncMock(
+        side_effect=ActionUnavailable
+    )
+    response = await client.remove_device(device_entry.id, config_entry.entry_id)
+    assert music_assistant_client.config.remove_player_config.call_count == 1
+    assert response["success"] is False
+
+    # test if the removal should be allowed if the device is not in use
+    music_assistant_client.config.remove_player_config = AsyncMock()
+    response = await client.remove_device(device_entry.id, config_entry.entry_id)
+    assert response["success"] is True
+    await hass.async_block_till_done()
+    assert not device_registry.async_get(device_entry.id)
+    assert not entity_registry.async_get(entity_id)
+    assert not hass.states.get(entity_id)
+
+    # test if the removal succeeds if its no longer provided by the server
+    mass_player_id = "00:00:00:00:00:02"
+    music_assistant_client.players._players.pop(mass_player_id)
+    device_entry = dr.async_entries_for_config_entry(
+        device_registry, config_entry.entry_id
+    )[0]
+    entity_id = "media_player.my_super_test_player_2"
+    assert device_entry
+    assert entity_registry.async_get(entity_id)
+    assert hass.states.get(entity_id)
+    music_assistant_client.config.remove_player_config = AsyncMock()
+    response = await client.remove_device(device_entry.id, config_entry.entry_id)
+    assert music_assistant_client.config.remove_player_config.call_count == 0
+    assert response["success"] is True
diff --git a/tests/components/music_assistant/test_media_player.py b/tests/components/music_assistant/test_media_player.py
index 25dfcd22c72..44317d4977a 100644
--- a/tests/components/music_assistant/test_media_player.py
+++ b/tests/components/music_assistant/test_media_player.py
@@ -2,7 +2,13 @@
 
 from unittest.mock import MagicMock, call
 
-from music_assistant_models.enums import MediaType, QueueOption
+from music_assistant_models.constants import PLAYER_CONTROL_NONE
+from music_assistant_models.enums import (
+    EventType,
+    MediaType,
+    PlayerFeature,
+    QueueOption,
+)
 from music_assistant_models.media_items import Track
 import pytest
 from syrupy import SnapshotAssertion
@@ -20,6 +26,7 @@ from homeassistant.components.media_player import (
     SERVICE_CLEAR_PLAYLIST,
     SERVICE_JOIN,
     SERVICE_UNJOIN,
+    MediaPlayerEntityFeature,
 )
 from homeassistant.components.music_assistant.const import DOMAIN as MASS_DOMAIN
 from homeassistant.components.music_assistant.media_player import (
@@ -59,7 +66,11 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
-from .common import setup_integration_from_fixtures, snapshot_music_assistant_entities
+from .common import (
+    setup_integration_from_fixtures,
+    snapshot_music_assistant_entities,
+    trigger_subscription_callback,
+)
 
 from tests.common import AsyncMock
 
@@ -607,3 +618,104 @@ async def test_media_player_get_queue_action(
     # no call is made, this info comes from the cached queue data
     assert music_assistant_client.send_command.call_count == 0
     assert response == snapshot(exclude=paths(f"{entity_id}.elapsed_time"))
+
+
+async def test_media_player_supported_features(
+    hass: HomeAssistant,
+    music_assistant_client: MagicMock,
+) -> None:
+    """Test if media_player entity supported features are cortrectly (re)mapped."""
+    await setup_integration_from_fixtures(hass, music_assistant_client)
+    entity_id = "media_player.test_player_1"
+    mass_player_id = "00:00:00:00:00:01"
+    state = hass.states.get(entity_id)
+    assert state
+    expected_features = (
+        MediaPlayerEntityFeature.STOP
+        | MediaPlayerEntityFeature.PREVIOUS_TRACK
+        | MediaPlayerEntityFeature.NEXT_TRACK
+        | MediaPlayerEntityFeature.SHUFFLE_SET
+        | MediaPlayerEntityFeature.REPEAT_SET
+        | MediaPlayerEntityFeature.PLAY
+        | MediaPlayerEntityFeature.PLAY_MEDIA
+        | MediaPlayerEntityFeature.VOLUME_STEP
+        | MediaPlayerEntityFeature.CLEAR_PLAYLIST
+        | MediaPlayerEntityFeature.BROWSE_MEDIA
+        | MediaPlayerEntityFeature.MEDIA_ENQUEUE
+        | MediaPlayerEntityFeature.MEDIA_ANNOUNCE
+        | MediaPlayerEntityFeature.SEEK
+        | MediaPlayerEntityFeature.PAUSE
+        | MediaPlayerEntityFeature.GROUPING
+        | MediaPlayerEntityFeature.VOLUME_SET
+        | MediaPlayerEntityFeature.VOLUME_STEP
+        | MediaPlayerEntityFeature.VOLUME_MUTE
+        | MediaPlayerEntityFeature.TURN_ON
+        | MediaPlayerEntityFeature.TURN_OFF
+    )
+    assert state.attributes["supported_features"] == expected_features
+    # remove power control capability from player, trigger subscription callback
+    # and check if the supported features got updated
+    music_assistant_client.players._players[
+        mass_player_id
+    ].power_control = PLAYER_CONTROL_NONE
+    await trigger_subscription_callback(
+        hass, music_assistant_client, EventType.PLAYER_CONFIG_UPDATED, mass_player_id
+    )
+    expected_features &= ~MediaPlayerEntityFeature.TURN_ON
+    expected_features &= ~MediaPlayerEntityFeature.TURN_OFF
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.attributes["supported_features"] == expected_features
+
+    # remove volume control capability from player, trigger subscription callback
+    # and check if the supported features got updated
+    music_assistant_client.players._players[
+        mass_player_id
+    ].volume_control = PLAYER_CONTROL_NONE
+    await trigger_subscription_callback(
+        hass, music_assistant_client, EventType.PLAYER_CONFIG_UPDATED, mass_player_id
+    )
+    expected_features &= ~MediaPlayerEntityFeature.VOLUME_SET
+    expected_features &= ~MediaPlayerEntityFeature.VOLUME_STEP
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.attributes["supported_features"] == expected_features
+
+    # remove mute control capability from player, trigger subscription callback
+    # and check if the supported features got updated
+    music_assistant_client.players._players[
+        mass_player_id
+    ].mute_control = PLAYER_CONTROL_NONE
+    await trigger_subscription_callback(
+        hass, music_assistant_client, EventType.PLAYER_CONFIG_UPDATED, mass_player_id
+    )
+    expected_features &= ~MediaPlayerEntityFeature.VOLUME_MUTE
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.attributes["supported_features"] == expected_features
+
+    # remove pause capability from player, trigger subscription callback
+    # and check if the supported features got updated
+    music_assistant_client.players._players[mass_player_id].supported_features.remove(
+        PlayerFeature.PAUSE
+    )
+    await trigger_subscription_callback(
+        hass, music_assistant_client, EventType.PLAYER_CONFIG_UPDATED, mass_player_id
+    )
+    expected_features &= ~MediaPlayerEntityFeature.PAUSE
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.attributes["supported_features"] == expected_features
+
+    # remove grouping capability from player, trigger subscription callback
+    # and check if the supported features got updated
+    music_assistant_client.players._players[mass_player_id].supported_features.remove(
+        PlayerFeature.SET_MEMBERS
+    )
+    await trigger_subscription_callback(
+        hass, music_assistant_client, EventType.PLAYER_CONFIG_UPDATED, mass_player_id
+    )
+    expected_features &= ~MediaPlayerEntityFeature.GROUPING
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.attributes["supported_features"] == expected_features
diff --git a/tests/components/myq/test_init.py b/tests/components/myq/test_init.py
index 24e03f56075..61ec0273f76 100644
--- a/tests/components/myq/test_init.py
+++ b/tests/components/myq/test_init.py
@@ -1,7 +1,11 @@
 """Tests for the MyQ Connected Services integration."""
 
 from homeassistant.components.myq import DOMAIN
-from homeassistant.config_entries import ConfigEntryState
+from homeassistant.config_entries import (
+    SOURCE_IGNORE,
+    ConfigEntryDisabler,
+    ConfigEntryState,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import issue_registry as ir
 
@@ -33,6 +37,28 @@ async def test_myq_repair_issue(
     assert config_entry_2.state is ConfigEntryState.LOADED
     assert issue_registry.async_get_issue(DOMAIN, DOMAIN)
 
+    # Add an ignored entry
+    config_entry_3 = MockConfigEntry(
+        source=SOURCE_IGNORE,
+        domain=DOMAIN,
+    )
+    config_entry_3.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry_3.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry_3.state is ConfigEntryState.NOT_LOADED
+
+    # Add a disabled entry
+    config_entry_4 = MockConfigEntry(
+        disabled_by=ConfigEntryDisabler.USER,
+        domain=DOMAIN,
+    )
+    config_entry_4.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry_4.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry_4.state is ConfigEntryState.NOT_LOADED
+
     # Remove the first one
     await hass.config_entries.async_remove(config_entry_1.entry_id)
     await hass.async_block_till_done()
@@ -48,3 +74,6 @@ async def test_myq_repair_issue(
     assert config_entry_1.state is ConfigEntryState.NOT_LOADED
     assert config_entry_2.state is ConfigEntryState.NOT_LOADED
     assert issue_registry.async_get_issue(DOMAIN, DOMAIN) is None
+
+    # Check the ignored and disabled entries are removed
+    assert not hass.config_entries.async_entries(DOMAIN)
diff --git a/tests/components/mysensors/conftest.py b/tests/components/mysensors/conftest.py
index 1d407815db0..c2c110466e6 100644
--- a/tests/components/mysensors/conftest.py
+++ b/tests/components/mysensors/conftest.py
@@ -53,7 +53,7 @@ def gateway_nodes_fixture() -> dict[int, Sensor]:
 async def serial_transport_fixture(
     gateway_nodes: dict[int, Sensor],
     is_serial_port: MagicMock,
-) -> AsyncGenerator[dict[int, Sensor]]:
+) -> AsyncGenerator[MagicMock]:
     """Mock a serial transport."""
     with (
         patch(
@@ -320,6 +320,21 @@ def hvac_node_heat(
     return nodes[1]
 
 
+@pytest.fixture(name="hvac_node_only_hvac_state", scope="package")
+def hvac_node_only_hvac_state_fixture() -> dict:
+    """Load the hvac node only hvac state."""
+    return load_nodes_state("hvac_node_only_hvac_state.json")
+
+
+@pytest.fixture
+def hvac_node_only_hvac(
+    gateway_nodes: dict[int, Sensor], hvac_node_only_hvac_state: dict
+) -> Sensor:
+    """Load the hvac only hvac child node."""
+    nodes = update_gateway_nodes(gateway_nodes, deepcopy(hvac_node_only_hvac_state))
+    return nodes[1]
+
+
 @pytest.fixture(name="power_sensor_state", scope="package")
 def power_sensor_state_fixture() -> dict:
     """Load the power sensor state."""
diff --git a/tests/components/mysensors/fixtures/hvac_node_only_hvac_state.json b/tests/components/mysensors/fixtures/hvac_node_only_hvac_state.json
new file mode 100644
index 00000000000..b41470e6076
--- /dev/null
+++ b/tests/components/mysensors/fixtures/hvac_node_only_hvac_state.json
@@ -0,0 +1,22 @@
+{
+  "1": {
+    "sensor_id": 1,
+    "children": {
+      "1": {
+        "id": 1,
+        "type": 29,
+        "description": "",
+        "values": {
+          "0": "20.0",
+          "21": "Off"
+        }
+      }
+    },
+    "type": 17,
+    "sketch_name": "HVAC Node",
+    "sketch_version": "1.0",
+    "battery_level": 0,
+    "protocol_version": "2.3.2",
+    "heartbeat": 0
+  }
+}
diff --git a/tests/components/mysensors/test_climate.py b/tests/components/mysensors/test_climate.py
index 959f92ff512..b919287e046 100644
--- a/tests/components/mysensors/test_climate.py
+++ b/tests/components/mysensors/test_climate.py
@@ -38,6 +38,8 @@ async def test_hvac_node_auto(
     assert state
     assert state.state == HVACMode.OFF
     assert state.attributes[ATTR_BATTERY_LEVEL] == 0
+    assert state.attributes[ATTR_CURRENT_TEMPERATURE] == 20.0
+    assert state.attributes["supported_features"] == 394
 
     # Test set hvac mode auto
     await hass.services.async_call(
@@ -153,6 +155,8 @@ async def test_hvac_node_heat(
     assert state
     assert state.state == HVACMode.OFF
     assert state.attributes[ATTR_BATTERY_LEVEL] == 0
+    assert state.attributes[ATTR_CURRENT_TEMPERATURE] == 20.0
+    assert state.attributes["supported_features"] == 393
 
     # Test set hvac mode heat
     await hass.services.async_call(
@@ -263,8 +267,10 @@ async def test_hvac_node_cool(
     assert state
     assert state.state == HVACMode.OFF
     assert state.attributes[ATTR_BATTERY_LEVEL] == 0
+    assert state.attributes[ATTR_CURRENT_TEMPERATURE] == 20.0
+    assert state.attributes["supported_features"] == 393
 
-    # Test set hvac mode heat
+    # Test set hvac mode cool
     await hass.services.async_call(
         CLIMATE_DOMAIN,
         SERVICE_SET_HVAC_MODE,
@@ -357,3 +363,83 @@ async def test_hvac_node_cool(
 
     assert state
     assert state.state == HVACMode.OFF
+
+
+async def test_hvac_node_only_hvac(
+    hass: HomeAssistant,
+    hvac_node_only_hvac: Sensor,
+    receive_message: Callable[[str], None],
+    transport_write: MagicMock,
+) -> None:
+    """Test a hvac only hvac node."""
+    entity_id = "climate.hvac_node_1_1"
+
+    state = hass.states.get(entity_id)
+
+    assert state
+    assert state.state == HVACMode.OFF
+    assert state.attributes[ATTR_CURRENT_TEMPERATURE] == 20.0
+    assert state.attributes["supported_features"] == 384
+
+    # Test set hvac mode heat
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {ATTR_ENTITY_ID: entity_id, ATTR_HVAC_MODE: HVACMode.HEAT},
+        blocking=True,
+    )
+
+    assert transport_write.call_count == 1
+    assert transport_write.call_args == call("1;1;1;1;21;HeatOn\n")
+
+    receive_message("1;1;1;0;21;HeatOn\n")
+    await hass.async_block_till_done()
+
+    state = hass.states.get(entity_id)
+
+    assert state
+    assert state.state == HVACMode.HEAT
+    assert state.attributes[ATTR_CURRENT_TEMPERATURE] == 20.0
+
+    transport_write.reset_mock()
+
+    # Test set hvac mode cool
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {ATTR_ENTITY_ID: entity_id, ATTR_HVAC_MODE: HVACMode.COOL},
+        blocking=True,
+    )
+
+    assert transport_write.call_count == 1
+    assert transport_write.call_args == call("1;1;1;1;21;CoolOn\n")
+
+    receive_message("1;1;1;0;21;CoolOn\n")
+    await hass.async_block_till_done()
+
+    state = hass.states.get(entity_id)
+
+    assert state
+    assert state.state == HVACMode.COOL
+    assert state.attributes[ATTR_CURRENT_TEMPERATURE] == 20.0
+
+    transport_write.reset_mock()
+
+    # Test set hvac mode off
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {ATTR_ENTITY_ID: entity_id, ATTR_HVAC_MODE: HVACMode.OFF},
+        blocking=True,
+    )
+
+    assert transport_write.call_count == 1
+    assert transport_write.call_args == call("1;1;1;1;21;Off\n")
+
+    receive_message("1;1;1;0;21;Off\n")
+    await hass.async_block_till_done()
+
+    state = hass.states.get(entity_id)
+
+    assert state
+    assert state.state == HVACMode.OFF
diff --git a/tests/components/mysensors/test_init.py b/tests/components/mysensors/test_init.py
index 7f6ea76d3e1..108f2d7e592 100644
--- a/tests/components/mysensors/test_init.py
+++ b/tests/components/mysensors/test_init.py
@@ -2,10 +2,15 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable
+from unittest.mock import MagicMock
+
 from mysensors import BaseSyncGateway
 from mysensors.sensor import Sensor
 
 from homeassistant.components.mysensors import DOMAIN
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
@@ -14,6 +19,50 @@ from tests.common import MockConfigEntry
 from tests.typing import WebSocketGenerator
 
 
+async def test_load_unload(
+    hass: HomeAssistant,
+    door_sensor: Sensor,
+    transport: MagicMock,
+    integration: MockConfigEntry,
+    receive_message: Callable[[str], None],
+) -> None:
+    """Test loading and unloading the MySensors config entry."""
+    config_entry = integration
+
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    entity_id = "binary_sensor.door_sensor_1_1"
+    state = hass.states.get(entity_id)
+
+    assert state
+    assert state.state != STATE_UNAVAILABLE
+
+    receive_message("1;1;1;0;16;1\n")
+    await hass.async_block_till_done()
+
+    state = hass.states.get(entity_id)
+
+    assert state
+    assert state.state != STATE_UNAVAILABLE
+
+    assert await hass.config_entries.async_unload(config_entry.entry_id)
+
+    assert transport.return_value.disconnect.call_count == 1
+
+    state = hass.states.get(entity_id)
+
+    assert state
+    assert state.state == STATE_UNAVAILABLE
+
+    receive_message("1;1;1;0;16;1\n")
+    await hass.async_block_till_done()
+
+    state = hass.states.get(entity_id)
+
+    assert state
+    assert state.state == STATE_UNAVAILABLE
+
+
 async def test_remove_config_entry_device(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
diff --git a/tests/components/myuplink/fixtures/device-alfred.json b/tests/components/myuplink/fixtures/device-alfred.json
new file mode 100644
index 00000000000..ca6f91459f6
--- /dev/null
+++ b/tests/components/myuplink/fixtures/device-alfred.json
@@ -0,0 +1,40 @@
+{
+  "id": "alfred-r-1234-20240201-123456-aa-bb-cc-dd-ee-ff",
+  "connectionState": "Connected",
+  "firmware": {
+    "currentFwVersion": "9682R7A",
+    "desiredFwVersion": "9682R7A"
+  },
+  "product": {
+    "serialNumber": "10001",
+    "name": "Tehowatti Air"
+  },
+  "availableFeatures": {
+    "settings": true,
+    "reboot": true,
+    "forcesync": true,
+    "forceUpdate": false,
+    "requestUpdate": false,
+    "resetAlarm": true,
+    "triggerEvent": true,
+    "getMenu": false,
+    "getMenuChain": false,
+    "getGuideQuestion": false,
+    "sendHaystack": true,
+    "setSmartMode": false,
+    "setAidMode": true,
+    "getZones": false,
+    "processIntent": false,
+    "boostHotWater": true,
+    "boostVentilation": true,
+    "getScheduleConfig": false,
+    "getScheduleModes": false,
+    "getScheduleWeekly": false,
+    "getScheduleVacation": false,
+    "setScheduleModes": false,
+    "setScheduleWeekly": false,
+    "setScheduleOverride": false,
+    "setScheduleVacation": false,
+    "setVentilationMode": false
+  }
+}
diff --git a/tests/components/myuplink/fixtures/device-batman.json b/tests/components/myuplink/fixtures/device-batman.json
new file mode 100644
index 00000000000..f7c079be5dd
--- /dev/null
+++ b/tests/components/myuplink/fixtures/device-batman.json
@@ -0,0 +1,40 @@
+{
+  "id": "batman-r-1234-20240201-123456-aa-bb-cc-dd-ee-ff",
+  "connectionState": "Connected",
+  "firmware": {
+    "currentFwVersion": "9682R7B",
+    "desiredFwVersion": "9682R7B"
+  },
+  "product": {
+    "serialNumber": "10002",
+    "name": "F730 CU 3x400V"
+  },
+  "availableFeatures": {
+    "settings": true,
+    "reboot": true,
+    "forcesync": true,
+    "forceUpdate": false,
+    "requestUpdate": false,
+    "resetAlarm": true,
+    "triggerEvent": true,
+    "getMenu": false,
+    "getMenuChain": false,
+    "getGuideQuestion": false,
+    "sendHaystack": true,
+    "setSmartMode": false,
+    "setAidMode": true,
+    "getZones": false,
+    "processIntent": false,
+    "boostHotWater": true,
+    "boostVentilation": true,
+    "getScheduleConfig": false,
+    "getScheduleModes": false,
+    "getScheduleWeekly": false,
+    "getScheduleVacation": false,
+    "setScheduleModes": false,
+    "setScheduleWeekly": false,
+    "setScheduleOverride": false,
+    "setScheduleVacation": false,
+    "setVentilationMode": false
+  }
+}
diff --git a/tests/components/myuplink/fixtures/device-robin.json b/tests/components/myuplink/fixtures/device-robin.json
new file mode 100644
index 00000000000..3155d6e3f70
--- /dev/null
+++ b/tests/components/myuplink/fixtures/device-robin.json
@@ -0,0 +1,40 @@
+{
+  "id": "robin-r-1234-20240201-123456-aa-bb-cc-dd-ee-ff",
+  "connectionState": "Connected",
+  "firmware": {
+    "currentFwVersion": "9682R7C",
+    "desiredFwVersion": "9682R7C"
+  },
+  "product": {
+    "serialNumber": "10003",
+    "name": "SMO 20"
+  },
+  "availableFeatures": {
+    "settings": true,
+    "reboot": true,
+    "forcesync": true,
+    "forceUpdate": false,
+    "requestUpdate": false,
+    "resetAlarm": true,
+    "triggerEvent": true,
+    "getMenu": false,
+    "getMenuChain": false,
+    "getGuideQuestion": false,
+    "sendHaystack": true,
+    "setSmartMode": false,
+    "setAidMode": true,
+    "getZones": false,
+    "processIntent": false,
+    "boostHotWater": true,
+    "boostVentilation": true,
+    "getScheduleConfig": false,
+    "getScheduleModes": false,
+    "getScheduleWeekly": false,
+    "getScheduleVacation": false,
+    "setScheduleModes": false,
+    "setScheduleWeekly": false,
+    "setScheduleOverride": false,
+    "setScheduleVacation": false,
+    "setVentilationMode": false
+  }
+}
diff --git a/tests/components/myuplink/fixtures/systems-multi.json b/tests/components/myuplink/fixtures/systems-multi.json
new file mode 100644
index 00000000000..a587900d23c
--- /dev/null
+++ b/tests/components/myuplink/fixtures/systems-multi.json
@@ -0,0 +1,61 @@
+{
+  "page": 1,
+  "itemsPerPage": 10,
+  "numItems": 3,
+  "systems": [
+    {
+      "systemId": "123456-7890-1234",
+      "name": "Gotham City",
+      "securityLevel": "admin",
+      "hasAlarm": false,
+      "country": "Sweden",
+      "devices": [
+        {
+          "id": "alfred-r-1234-20240201-123456-aa-bb-cc-dd-ee-ff",
+          "connectionState": "Connected",
+          "currentFwVersion": "9682R7A",
+          "product": {
+            "serialNumber": "10001",
+            "name": "Tehowatti Air"
+          }
+        }
+      ]
+    },
+    {
+      "systemId": "123456-7890-1234",
+      "name": "Batcave",
+      "securityLevel": "admin",
+      "hasAlarm": false,
+      "country": "Sweden",
+      "devices": [
+        {
+          "id": "batman-r-1234-20240201-123456-aa-bb-cc-dd-ee-ff",
+          "connectionState": "Connected",
+          "currentFwVersion": "9682R7B",
+          "product": {
+            "serialNumber": "10002",
+            "name": "F730 CU 3x400V"
+          }
+        }
+      ]
+    },
+    {
+      "systemId": "123456-7890-1234",
+      "name": "Duckburg",
+      "securityLevel": "admin",
+      "hasAlarm": false,
+      "country": "Sweden",
+      "devices": [
+        {
+          "id": "robin-r-1234-20240201-123456-aa-bb-cc-dd-ee-ff",
+          "connectionState": "Connected",
+          "currentFwVersion": "9682R7C",
+          "product": {
+            "serialNumber": "10003",
+            "name": "SM0 20"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/components/myuplink/snapshots/test_binary_sensor.ambr b/tests/components/myuplink/snapshots/test_binary_sensor.ambr
index 755cae3c623..478c5a55b80 100644
--- a/tests/components/myuplink/snapshots/test_binary_sensor.ambr
+++ b/tests/components/myuplink/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -193,6 +197,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -239,6 +244,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -285,6 +291,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/myuplink/snapshots/test_init.ambr b/tests/components/myuplink/snapshots/test_init.ambr
new file mode 100644
index 00000000000..14be11c36ec
--- /dev/null
+++ b/tests/components/myuplink/snapshots/test_init.ambr
@@ -0,0 +1,100 @@
+# serializer version: 1
+# name: test_device_info[alfred-multi]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'myuplink',
+        'alfred-r-1234-20240201-123456-aa-bb-cc-dd-ee-ff',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Jäspi',
+    'model': 'Tehowatti Air',
+    'model_id': None,
+    'name': 'Gotham City',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': '10001',
+    'suggested_area': None,
+    'sw_version': '9682R7A',
+    'via_device_id': None,
+  })
+# ---
+# name: test_device_info[batman-multi]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'myuplink',
+        'batman-r-1234-20240201-123456-aa-bb-cc-dd-ee-ff',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Nibe',
+    'model': 'F730',
+    'model_id': None,
+    'name': 'Batcave',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': '10002',
+    'suggested_area': None,
+    'sw_version': '9682R7B',
+    'via_device_id': None,
+  })
+# ---
+# name: test_device_info[robin-multi]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'myuplink',
+        'robin-r-1234-20240201-123456-aa-bb-cc-dd-ee-ff',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Nibe',
+    'model': 'SMO 20',
+    'model_id': None,
+    'name': 'Duckburg',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': '10003',
+    'suggested_area': None,
+    'sw_version': '9682R7C',
+    'via_device_id': None,
+  })
+# ---
diff --git a/tests/components/myuplink/snapshots/test_number.ambr b/tests/components/myuplink/snapshots/test_number.ambr
index c47d3c60295..f2c89663879 100644
--- a/tests/components/myuplink/snapshots/test_number.ambr
+++ b/tests/components/myuplink/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -67,6 +68,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -123,6 +125,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -178,6 +181,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -233,6 +237,7 @@
       'step': 0.5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -288,6 +293,7 @@
       'step': 0.5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -343,6 +349,7 @@
       'step': 10.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -399,6 +406,7 @@
       'step': 10.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/myuplink/snapshots/test_select.ambr b/tests/components/myuplink/snapshots/test_select.ambr
index eff06bc7f2d..032fd2ef455 100644
--- a/tests/components/myuplink/snapshots/test_select.ambr
+++ b/tests/components/myuplink/snapshots/test_select.ambr
@@ -13,6 +13,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -72,6 +73,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/myuplink/snapshots/test_sensor.ambr b/tests/components/myuplink/snapshots/test_sensor.ambr
index 34acbbb8785..f9249651208 100644
--- a/tests/components/myuplink/snapshots/test_sensor.ambr
+++ b/tests/components/myuplink/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -110,6 +112,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -161,6 +164,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -212,6 +216,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -263,6 +268,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -314,6 +320,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -365,6 +372,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -416,6 +424,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -467,6 +476,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -518,6 +528,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -569,6 +580,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -620,6 +632,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -671,6 +684,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -720,6 +734,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -766,6 +781,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -812,6 +828,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -859,6 +876,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -908,6 +926,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -959,6 +978,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1008,6 +1028,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1055,6 +1076,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1104,6 +1126,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1158,6 +1181,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1210,6 +1234,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1257,6 +1282,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1304,6 +1330,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1351,6 +1378,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1398,6 +1426,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1445,6 +1474,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1494,6 +1524,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1545,6 +1576,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1596,6 +1628,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1647,6 +1680,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1698,6 +1732,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1749,6 +1784,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1800,6 +1836,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1851,6 +1888,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1902,6 +1940,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1953,6 +1992,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2002,6 +2042,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2049,6 +2090,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2098,6 +2140,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2149,6 +2192,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2200,6 +2244,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2251,6 +2296,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2302,6 +2348,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2353,6 +2400,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2404,6 +2452,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2455,6 +2504,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2514,6 +2564,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2580,6 +2631,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2636,6 +2688,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2682,6 +2735,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2730,6 +2784,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2781,6 +2836,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2832,6 +2888,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2883,6 +2940,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2934,6 +2992,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2985,6 +3044,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3036,6 +3096,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3087,6 +3148,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3138,6 +3200,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3189,6 +3252,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3240,6 +3304,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3291,6 +3356,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3350,6 +3416,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3416,6 +3483,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3472,6 +3540,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3518,6 +3587,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3564,6 +3634,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3611,6 +3682,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3660,6 +3732,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3711,6 +3784,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3762,6 +3836,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3813,6 +3888,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3864,6 +3940,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3915,6 +3992,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3966,6 +4044,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4017,6 +4096,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4073,6 +4153,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4133,6 +4214,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4186,6 +4268,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4232,6 +4315,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4280,6 +4364,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4331,6 +4416,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4382,6 +4468,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4433,6 +4520,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4484,6 +4572,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4535,6 +4624,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4584,6 +4674,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4631,6 +4722,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4678,6 +4770,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4725,6 +4818,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/myuplink/snapshots/test_switch.ambr b/tests/components/myuplink/snapshots/test_switch.ambr
index 5d621e661ee..142d4caa455 100644
--- a/tests/components/myuplink/snapshots/test_switch.ambr
+++ b/tests/components/myuplink/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/myuplink/test_init.py b/tests/components/myuplink/test_init.py
index fda0d3526f9..320bf202024 100644
--- a/tests/components/myuplink/test_init.py
+++ b/tests/components/myuplink/test_init.py
@@ -6,6 +6,7 @@ from unittest.mock import MagicMock
 
 from aiohttp import ClientConnectionError
 import pytest
+from syrupy import SnapshotAssertion
 
 from homeassistant.components.myuplink.const import DOMAIN, OAUTH2_TOKEN
 from homeassistant.config_entries import ConfigEntryState
@@ -214,3 +215,47 @@ async def test_device_remove_devices(
         old_device_entry.id, mock_config_entry.entry_id
     )
     assert response["success"]
+
+
+@pytest.mark.parametrize(
+    "load_systems_file",
+    [load_fixture("systems-multi.json", DOMAIN)],
+    ids=[
+        "multi",
+    ],
+)
+@pytest.mark.parametrize(
+    ("load_device_file", "device_id"),
+    [
+        (
+            load_fixture("device-alfred.json", DOMAIN),
+            "alfred-r-1234-20240201-123456-aa-bb-cc-dd-ee-ff",
+        ),
+        (
+            load_fixture("device-batman.json", DOMAIN),
+            "batman-r-1234-20240201-123456-aa-bb-cc-dd-ee-ff",
+        ),
+        (
+            load_fixture("device-robin.json", DOMAIN),
+            "robin-r-1234-20240201-123456-aa-bb-cc-dd-ee-ff",
+        ),
+    ],
+    ids=[
+        "alfred",
+        "batman",
+        "robin",
+    ],
+)
+async def test_device_info(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    mock_myuplink_client: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    device_registry: dr.DeviceRegistry,
+    device_id: str,
+) -> None:
+    """Test device registry integration."""
+    await setup_integration(hass, mock_config_entry)
+    device_entry = device_registry.async_get_device(identifiers={(DOMAIN, device_id)})
+    assert device_entry is not None
+    assert device_entry == snapshot
diff --git a/tests/components/nam/fixtures/nam_data.json b/tests/components/nam/fixtures/nam_data.json
index 82dacbefb34..47ebe099dc7 100644
--- a/tests/components/nam/fixtures/nam_data.json
+++ b/tests/components/nam/fixtures/nam_data.json
@@ -26,6 +26,7 @@
     { "value_type": "temperature", "value": "6.26" },
     { "value_type": "HECA_temperature", "value": "7.95" },
     { "value_type": "HECA_humidity", "value": "49.97" },
+    { "value_type": "ambient_light", "value": "298.45" },
     { "value_type": "signal", "value": "-72" }
   ]
 }
diff --git a/tests/components/nam/snapshots/test_diagnostics.ambr b/tests/components/nam/snapshots/test_diagnostics.ambr
index e92e02fa1d8..c0009899d16 100644
--- a/tests/components/nam/snapshots/test_diagnostics.ambr
+++ b/tests/components/nam/snapshots/test_diagnostics.ambr
@@ -2,6 +2,7 @@
 # name: test_entry_diagnostics
   dict({
     'data': dict({
+      'bh1750_illuminance': 298.45,
       'bme280_humidity': 45.69,
       'bme280_pressure': 1011.0117,
       'bme280_temperature': 7.56,
diff --git a/tests/components/nam/snapshots/test_sensor.ambr b/tests/components/nam/snapshots/test_sensor.ambr
index 16129c5d7ce..c6c32737a31 100644
--- a/tests/components/nam/snapshots/test_sensor.ambr
+++ b/tests/components/nam/snapshots/test_sensor.ambr
@@ -1,4 +1,59 @@
 # serializer version: 1
+# name: test_sensor[sensor.nettigo_air_monitor_bh1750_illuminance-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.nettigo_air_monitor_bh1750_illuminance',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 0,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ILLUMINANCE: 'illuminance'>,
+    'original_icon': None,
+    'original_name': 'BH1750 illuminance',
+    'platform': 'nam',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'bh1750_illuminance',
+    'unique_id': 'aa:bb:cc:dd:ee:ff-bh1750_illuminance',
+    'unit_of_measurement': 'lx',
+  })
+# ---
+# name: test_sensor[sensor.nettigo_air_monitor_bh1750_illuminance-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'illuminance',
+      'friendly_name': 'Nettigo Air Monitor BH1750 illuminance',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'lx',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.nettigo_air_monitor_bh1750_illuminance',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '298.45',
+  })
+# ---
 # name: test_sensor[sensor.nettigo_air_monitor_bme280_humidity-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -8,6 +63,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -62,6 +118,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -116,6 +173,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -170,6 +228,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -224,6 +283,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -278,6 +338,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -332,6 +393,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -386,6 +448,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -440,6 +503,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -494,6 +558,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -548,6 +613,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -602,6 +668,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -654,6 +721,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -703,6 +771,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -755,6 +824,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -809,6 +879,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -865,6 +936,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -919,6 +991,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -973,6 +1046,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1025,6 +1099,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1079,6 +1154,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1135,6 +1211,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1189,6 +1266,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1243,6 +1321,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1297,6 +1376,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1351,6 +1431,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1403,6 +1484,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1457,6 +1539,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1513,6 +1596,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1567,6 +1651,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1621,6 +1706,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1675,6 +1761,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/nam/test_button.py b/tests/components/nam/test_button.py
index 39c37d57f89..b410665911a 100644
--- a/tests/components/nam/test_button.py
+++ b/tests/components/nam/test_button.py
@@ -2,9 +2,20 @@
 
 from unittest.mock import patch
 
-from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, ButtonDeviceClass
+from aiohttp.client_exceptions import ClientError
+from nettigo_air_monitor import ApiError, AuthFailedError
+import pytest
+
+from homeassistant.components.button import (
+    DOMAIN as BUTTON_DOMAIN,
+    SERVICE_PRESS,
+    ButtonDeviceClass,
+)
+from homeassistant.components.nam import DOMAIN
+from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntryState
 from homeassistant.const import ATTR_DEVICE_CLASS, ATTR_ENTITY_ID, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
 from homeassistant.util import dt as dt_util
 
@@ -38,7 +49,7 @@ async def test_button_press(hass: HomeAssistant) -> None:
     ):
         await hass.services.async_call(
             BUTTON_DOMAIN,
-            "press",
+            SERVICE_PRESS,
             {ATTR_ENTITY_ID: "button.nettigo_air_monitor_restart"},
             blocking=True,
         )
@@ -49,3 +60,55 @@ async def test_button_press(hass: HomeAssistant) -> None:
     state = hass.states.get("button.nettigo_air_monitor_restart")
     assert state
     assert state.state == now.isoformat()
+
+
+@pytest.mark.parametrize(("exc"), [ApiError("API Error"), ClientError])
+async def test_button_press_exc(hass: HomeAssistant, exc: Exception) -> None:
+    """Test button press when exception occurs."""
+    await init_integration(hass)
+
+    with (
+        patch(
+            "homeassistant.components.nam.NettigoAirMonitor.async_restart",
+            side_effect=exc,
+        ),
+        pytest.raises(
+            HomeAssistantError,
+            match="An error occurred while calling action for button.nettigo_air_monitor_restart",
+        ),
+    ):
+        await hass.services.async_call(
+            BUTTON_DOMAIN,
+            SERVICE_PRESS,
+            {ATTR_ENTITY_ID: "button.nettigo_air_monitor_restart"},
+            blocking=True,
+        )
+
+
+async def test_button_press_auth_error(hass: HomeAssistant) -> None:
+    """Test button press when auth error occurs."""
+    entry = await init_integration(hass)
+
+    with patch(
+        "homeassistant.components.nam.NettigoAirMonitor.async_restart",
+        side_effect=AuthFailedError("auth error"),
+    ):
+        await hass.services.async_call(
+            BUTTON_DOMAIN,
+            SERVICE_PRESS,
+            {ATTR_ENTITY_ID: "button.nettigo_air_monitor_restart"},
+            blocking=True,
+        )
+
+    assert entry.state is ConfigEntryState.LOADED
+
+    flows = hass.config_entries.flow.async_progress()
+    assert len(flows) == 1
+
+    flow = flows[0]
+    assert flow.get("step_id") == "reauth_confirm"
+    assert flow.get("handler") == DOMAIN
+
+    assert "context" in flow
+    assert flow["context"].get("source") == SOURCE_REAUTH
+    assert flow["context"].get("entry_id") == entry.entry_id
diff --git a/tests/components/nest/conftest.py b/tests/components/nest/conftest.py
index b5e3cd2b91c..b4b94efce5b 100644
--- a/tests/components/nest/conftest.py
+++ b/tests/components/nest/conftest.py
@@ -74,20 +74,25 @@ class FakeAuth:
         self.json = None
         self.headers = None
         self.captured_requests = []
+        self._project_id = project_id
+        self._aioclient_mock = aioclient_mock
+        self.register_mock_requests()
 
+    def register_mock_requests(self) -> None:
+        """Register the mocks."""
         # API makes a call to request structures to initiate pubsub feed, but the
         # integration does not use this.
-        aioclient_mock.get(
-            f"{API_URL}/enterprises/{project_id}/structures",
+        self._aioclient_mock.get(
+            f"{API_URL}/enterprises/{self._project_id}/structures",
             side_effect=self.request_structures,
         )
-        aioclient_mock.get(
-            f"{API_URL}/enterprises/{project_id}/devices",
+        self._aioclient_mock.get(
+            f"{API_URL}/enterprises/{self._project_id}/devices",
             side_effect=self.request_devices,
         )
-        aioclient_mock.post(DEVICE_URL_MATCH, side_effect=self.request)
-        aioclient_mock.get(TEST_IMAGE_URL, side_effect=self.request)
-        aioclient_mock.get(TEST_CLIP_URL, side_effect=self.request)
+        self._aioclient_mock.post(DEVICE_URL_MATCH, side_effect=self.request)
+        self._aioclient_mock.get(TEST_IMAGE_URL, side_effect=self.request)
+        self._aioclient_mock.get(TEST_CLIP_URL, side_effect=self.request)
 
     async def request_structures(
         self, method: str, url: str, data: dict[str, Any]
@@ -139,13 +144,14 @@ async def auth(
     return FakeAuth(aioclient_mock, create_device, device_access_project_id)
 
 
-@pytest.fixture(autouse=True)
-def cleanup_media_storage(hass: HomeAssistant) -> Generator[None]:
+@pytest.fixture(autouse=True, name="media_path")
+def cleanup_media_storage(hass: HomeAssistant) -> Generator[str]:
     """Test cleanup, remove any media storage persisted during the test."""
     tmp_path = str(uuid.uuid4())
     with patch("homeassistant.components.nest.media_source.MEDIA_PATH", new=tmp_path):
-        yield
-        shutil.rmtree(hass.config.path(tmp_path), ignore_errors=True)
+        full_path = hass.config.path(tmp_path)
+        yield full_path
+        shutil.rmtree(full_path, ignore_errors=True)
 
 
 @pytest.fixture
diff --git a/tests/components/nest/test_api.py b/tests/components/nest/test_api.py
index 98c3e06cfb8..1a5c4d63dba 100644
--- a/tests/components/nest/test_api.py
+++ b/tests/components/nest/test_api.py
@@ -89,80 +89,3 @@ async def test_auth(
     assert creds.client_id == CLIENT_ID
     assert creds.client_secret == CLIENT_SECRET
     assert creds.scopes == SDM_SCOPES
-
-
-# This tests needs to be adjusted to remove lingering tasks
-@pytest.mark.parametrize("expected_lingering_tasks", [True])
-@pytest.mark.parametrize(
-    "token_expiration_time",
-    [time.time() - 7 * 86400],
-    ids=["expires-in-past"],
-)
-async def test_auth_expired_token(
-    hass: HomeAssistant,
-    aioclient_mock: AiohttpClientMocker,
-    setup_platform: PlatformSetup,
-    token_expiration_time: float,
-) -> None:
-    """Verify behavior of an expired token."""
-    # Prepare a token refresh response
-    aioclient_mock.post(
-        OAUTH2_TOKEN,
-        json={
-            "access_token": FAKE_UPDATED_TOKEN,
-            "expires_at": time.time() + 86400,
-            "expires_in": 86400,
-        },
-    )
-    # Prepare to capture credentials in API request.  Empty payloads just mean
-    # no devices or structures are loaded.
-    aioclient_mock.get(f"{API_URL}/enterprises/{PROJECT_ID}/structures", json={})
-    aioclient_mock.get(f"{API_URL}/enterprises/{PROJECT_ID}/devices", json={})
-
-    # Prepare to capture credentials for Subscriber
-    captured_creds = None
-
-    def async_new_subscriber(
-        credentials: Credentials,
-    ) -> Mock:
-        """Capture credentials for tests."""
-        nonlocal captured_creds
-        captured_creds = credentials
-        return AsyncMock()
-
-    with patch(
-        "google_nest_sdm.subscriber_client.pubsub_v1.SubscriberAsyncClient",
-        side_effect=async_new_subscriber,
-    ) as new_subscriber_mock:
-        await setup_platform()
-
-    calls = aioclient_mock.mock_calls
-    assert len(calls) == 3
-    # Verify refresh token call to get an updated token
-    (method, url, data, headers) = calls[0]
-    assert data == {
-        "client_id": CLIENT_ID,
-        "client_secret": CLIENT_SECRET,
-        "grant_type": "refresh_token",
-        "refresh_token": FAKE_REFRESH_TOKEN,
-    }
-    # Verify API requests are made with the new token
-    (method, url, data, headers) = calls[1]
-    assert headers == {"Authorization": f"Bearer {FAKE_UPDATED_TOKEN}"}
-    (method, url, data, headers) = calls[2]
-    assert headers == {"Authorization": f"Bearer {FAKE_UPDATED_TOKEN}"}
-
-    # The subscriber is created with a token that is expired.  Verify that the
-    # credential is expired so the subscriber knows it needs to refresh it.
-    assert len(new_subscriber_mock.mock_calls) == 1
-    assert captured_creds
-    creds = captured_creds
-    assert creds.token == FAKE_TOKEN
-    assert creds.refresh_token == FAKE_REFRESH_TOKEN
-    assert int(dt_util.as_timestamp(creds.expiry)) == int(token_expiration_time)
-    assert not creds.valid
-    assert creds.expired
-    assert creds.token_uri == OAUTH2_TOKEN
-    assert creds.client_id == CLIENT_ID
-    assert creds.client_secret == CLIENT_SECRET
-    assert creds.scopes == SDM_SCOPES
diff --git a/tests/components/nest/test_config_flow.py b/tests/components/nest/test_config_flow.py
index f08eeb82a1d..0e6ec290841 100644
--- a/tests/components/nest/test_config_flow.py
+++ b/tests/components/nest/test_config_flow.py
@@ -34,7 +34,7 @@ from tests.typing import ClientSessionGenerator
 
 WEB_REDIRECT_URL = "https://example.com/auth/external/callback"
 APP_REDIRECT_URL = "urn:ietf:wg:oauth:2.0:oob"
-RAND_SUBSCRIBER_SUFFIX = "ABCDEF"
+RAND_SUFFIX = "ABCDEF"
 
 FAKE_DHCP_DATA = DhcpServiceInfo(
     ip="127.0.0.2", macaddress="001122334455", hostname="fake_hostname"
@@ -52,7 +52,7 @@ def mock_rand_topic_name_fixture() -> None:
     """Set the topic name random string to a constant."""
     with patch(
         "homeassistant.components.nest.config_flow.get_random_string",
-        return_value=RAND_SUBSCRIBER_SUFFIX,
+        return_value=RAND_SUFFIX,
     ):
         yield
 
@@ -173,6 +173,7 @@ class OAuthFixture:
         selected_topic: str,
         selected_subscription: str = "create_new_subscription",
         user_input: dict | None = None,
+        existing_errors: dict | None = None,
     ) -> ConfigEntry:
         """Fixture to walk through the Pub/Sub topic and subscription steps.
 
@@ -193,6 +194,12 @@ class OAuthFixture:
             },
         )
         assert result.get("type") is FlowResultType.FORM
+        assert result.get("step_id") == "pubsub_topic_confirm"
+        assert not result.get("errors")
+
+        # ACK the topic selection. User is instructed to do some manual
+        result = await self.async_configure(result, {})
+        assert result.get("type") is FlowResultType.FORM
         assert result.get("step_id") == "pubsub_subscription"
         assert not result.get("errors")
 
@@ -267,6 +274,12 @@ def mock_cloud_project_id() -> str:
     return CLOUD_PROJECT_ID
 
 
+@pytest.fixture(name="create_topic_status")
+def mock_create_topic_status() -> str:
+    """Fixture to configure the return code when creating the topic."""
+    return HTTPStatus.OK
+
+
 @pytest.fixture(name="create_subscription_status")
 def mock_create_subscription_status() -> str:
     """Fixture to configure the return code when creating the subscription."""
@@ -285,6 +298,64 @@ def mock_list_subscriptions_status() -> str:
     return HTTPStatus.OK
 
 
+def setup_mock_list_subscriptions_responses(
+    aioclient_mock: AiohttpClientMocker,
+    cloud_project_id: str,
+    subscriptions: list[tuple[str, str]],
+    list_subscriptions_status: HTTPStatus = HTTPStatus.OK,
+) -> None:
+    """Configure the mock responses for listing Pub/Sub subscriptions."""
+    aioclient_mock.get(
+        f"https://pubsub.googleapis.com/v1/projects/{cloud_project_id}/subscriptions",
+        json={
+            "subscriptions": [
+                {
+                    "name": subscription_name,
+                    "topic": topic,
+                    "pushConfig": {},
+                    "ackDeadlineSeconds": 10,
+                    "messageRetentionDuration": "604800s",
+                    "expirationPolicy": {"ttl": "2678400s"},
+                    "state": "ACTIVE",
+                }
+                for (subscription_name, topic) in subscriptions or ()
+            ]
+        },
+        status=list_subscriptions_status,
+    )
+
+
+def setup_mock_create_topic_responses(
+    aioclient_mock: AiohttpClientMocker,
+    cloud_project_id: str,
+    create_topic_status: HTTPStatus = HTTPStatus.OK,
+) -> None:
+    """Configure the mock responses for creating a Pub/Sub topic."""
+    aioclient_mock.put(
+        f"https://pubsub.googleapis.com/v1/projects/{cloud_project_id}/topics/home-assistant-{RAND_SUFFIX}",
+        json={},
+        status=create_topic_status,
+    )
+    aioclient_mock.post(
+        f"https://pubsub.googleapis.com/v1/projects/{cloud_project_id}/topics/home-assistant-{RAND_SUFFIX}:setIamPolicy",
+        json={},
+        status=create_topic_status,
+    )
+
+
+def setup_mock_create_subscription_responses(
+    aioclient_mock: AiohttpClientMocker,
+    cloud_project_id: str,
+    create_subscription_status: HTTPStatus = HTTPStatus.OK,
+) -> None:
+    """Configure the mock responses for creating a Pub/Sub subscription."""
+    aioclient_mock.put(
+        f"https://pubsub.googleapis.com/v1/projects/{cloud_project_id}/subscriptions/home-assistant-{RAND_SUFFIX}",
+        json={},
+        status=create_subscription_status,
+    )
+
+
 @pytest.fixture(autouse=True)
 def mock_pubsub_api_responses(
     aioclient_mock: AiohttpClientMocker,
@@ -293,6 +364,7 @@ def mock_pubsub_api_responses(
     subscriptions: list[tuple[str, str]],
     device_access_project_id: str,
     cloud_project_id: str,
+    create_topic_status: HTTPStatus,
     create_subscription_status: HTTPStatus,
     list_topics_status: HTTPStatus,
     list_subscriptions_status: HTTPStatus,
@@ -320,28 +392,14 @@ def mock_pubsub_api_responses(
     )
     # We check for a topic created by the SDM Device Access Console (but note we don't have permission to read it)
     # or the user has created one themselves in the Google Cloud Project.
-    aioclient_mock.get(
-        f"https://pubsub.googleapis.com/v1/projects/{cloud_project_id}/subscriptions",
-        json={
-            "subscriptions": [
-                {
-                    "name": subscription_name,
-                    "topic": topic,
-                    "pushConfig": {},
-                    "ackDeadlineSeconds": 10,
-                    "messageRetentionDuration": "604800s",
-                    "expirationPolicy": {"ttl": "2678400s"},
-                    "state": "ACTIVE",
-                }
-                for (subscription_name, topic) in subscriptions or ()
-            ]
-        },
-        status=list_subscriptions_status,
+    setup_mock_list_subscriptions_responses(
+        aioclient_mock, cloud_project_id, subscriptions, list_subscriptions_status
     )
-    aioclient_mock.put(
-        f"https://pubsub.googleapis.com/v1/projects/{cloud_project_id}/subscriptions/home-assistant-{RAND_SUBSCRIBER_SUFFIX}",
-        json={},
-        status=create_subscription_status,
+    setup_mock_create_topic_responses(
+        aioclient_mock, cloud_project_id, create_topic_status
+    )
+    setup_mock_create_subscription_responses(
+        aioclient_mock, cloud_project_id, create_subscription_status
     )
 
 
@@ -371,7 +429,7 @@ async def test_app_credentials(
         "auth_implementation": "imported-cred",
         "cloud_project_id": CLOUD_PROJECT_ID,
         "project_id": PROJECT_ID,
-        "subscription_name": f"projects/{CLOUD_PROJECT_ID}/subscriptions/home-assistant-{RAND_SUBSCRIBER_SUFFIX}",
+        "subscription_name": f"projects/{CLOUD_PROJECT_ID}/subscriptions/home-assistant-{RAND_SUFFIX}",
         "topic_name": f"projects/sdm-prod/topics/enterprise-{PROJECT_ID}",
         "token": {
             "refresh_token": "mock-refresh-token",
@@ -520,6 +578,11 @@ async def test_config_flow_pubsub_configuration_error(
         },
     )
     assert result.get("type") is FlowResultType.FORM
+    assert result.get("step_id") == "pubsub_topic_confirm"
+    assert not result.get("errors")
+
+    result = await oauth.async_configure(result, {})
+    assert result.get("type") is FlowResultType.FORM
     assert result.get("step_id") == "pubsub_subscription"
     assert result.get("data_schema")({}) == {
         "subscription_name": "create_new_subscription",
@@ -565,6 +628,11 @@ async def test_config_flow_pubsub_subscriber_error(
         },
     )
     assert result.get("type") is FlowResultType.FORM
+    assert result.get("step_id") == "pubsub_topic_confirm"
+    assert not result.get("errors")
+
+    result = await oauth.async_configure(result, {})
+    assert result.get("type") is FlowResultType.FORM
     assert result.get("step_id") == "pubsub_subscription"
     assert result.get("data_schema")({}) == {
         "subscription_name": "create_new_subscription",
@@ -691,37 +759,6 @@ async def test_reauth_multiple_config_entries(
     assert entry.data.get("extra_data")
 
 
-@pytest.mark.parametrize(("sdm_managed_topic"), [(True)])
-async def test_pubsub_subscription_strip_whitespace(
-    hass: HomeAssistant,
-    oauth: OAuthFixture,
-) -> None:
-    """Check that project id has whitespace stripped on entry."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    await oauth.async_app_creds_flow(
-        result, cloud_project_id=" " + CLOUD_PROJECT_ID + " "
-    )
-    oauth.async_mock_refresh()
-    result = await oauth.async_configure(result, {"code": "1234"})
-    entry = await oauth.async_complete_pubsub_flow(
-        result, selected_topic="projects/sdm-prod/topics/enterprise-some-project-id"
-    )
-    assert entry.title == "Import from configuration.yaml"
-    assert "token" in entry.data
-    entry.data["token"].pop("expires_at")
-    assert entry.unique_id == PROJECT_ID
-    assert entry.data["token"] == {
-        "refresh_token": "mock-refresh-token",
-        "access_token": "mock-access-token",
-        "type": "Bearer",
-        "expires_in": 60,
-    }
-    assert "subscription_name" in entry.data
-    assert entry.data["cloud_project_id"] == CLOUD_PROJECT_ID
-
-
 @pytest.mark.parametrize(
     ("sdm_managed_topic", "create_subscription_status"),
     [(True, HTTPStatus.UNAUTHORIZED)],
@@ -751,6 +788,11 @@ async def test_pubsub_subscription_auth_failure(
         },
     )
     assert result.get("type") is FlowResultType.FORM
+    assert result.get("step_id") == "pubsub_topic_confirm"
+    assert not result.get("errors")
+
+    result = await oauth.async_configure(result, {})
+    assert result.get("type") is FlowResultType.FORM
     assert result.get("step_id") == "pubsub_subscription"
     assert result.get("data_schema")({}) == {
         "subscription_name": "create_new_subscription",
@@ -833,7 +875,7 @@ async def test_config_entry_title_from_home(
     assert entry.data.get("cloud_project_id") == CLOUD_PROJECT_ID
     assert (
         entry.data.get("subscription_name")
-        == f"projects/{CLOUD_PROJECT_ID}/subscriptions/home-assistant-{RAND_SUBSCRIBER_SUFFIX}"
+        == f"projects/{CLOUD_PROJECT_ID}/subscriptions/home-assistant-{RAND_SUFFIX}"
     )
     assert (
         entry.data.get("topic_name")
@@ -905,7 +947,7 @@ async def test_title_failure_fallback(
     assert entry.data.get("cloud_project_id") == CLOUD_PROJECT_ID
     assert (
         entry.data.get("subscription_name")
-        == f"projects/{CLOUD_PROJECT_ID}/subscriptions/home-assistant-{RAND_SUBSCRIBER_SUFFIX}"
+        == f"projects/{CLOUD_PROJECT_ID}/subscriptions/home-assistant-{RAND_SUFFIX}"
     )
     assert (
         entry.data.get("topic_name")
@@ -997,7 +1039,7 @@ async def test_dhcp_discovery_with_creds(
         "auth_implementation": "imported-cred",
         "cloud_project_id": CLOUD_PROJECT_ID,
         "project_id": PROJECT_ID,
-        "subscription_name": f"projects/{CLOUD_PROJECT_ID}/subscriptions/home-assistant-{RAND_SUBSCRIBER_SUFFIX}",
+        "subscription_name": f"projects/{CLOUD_PROJECT_ID}/subscriptions/home-assistant-{RAND_SUFFIX}",
         "topic_name": f"projects/sdm-prod/topics/enterprise-{PROJECT_ID}",
         "token": {
             "refresh_token": "mock-refresh-token",
@@ -1092,7 +1134,7 @@ async def test_no_eligible_topics(
     hass: HomeAssistant,
     oauth: OAuthFixture,
 ) -> None:
-    """Test the case where there are no eligible pub/sub topics."""
+    """Test the case where there are no eligible pub/sub topics and the topic is created."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
@@ -1101,8 +1143,36 @@ async def test_no_eligible_topics(
 
     result = await oauth.async_configure(result, None)
     assert result.get("type") is FlowResultType.FORM
-    assert result.get("step_id") == "pubsub"
-    assert result.get("errors") == {"base": "no_pubsub_topics"}
+    assert result.get("step_id") == "pubsub_topic"
+    assert not result.get("errors")
+    # Option shown to create a new topic
+    assert result.get("data_schema")({}) == {
+        "topic_name": "create_new_topic",
+    }
+
+    entry = await oauth.async_complete_pubsub_flow(
+        result,
+        selected_topic="create_new_topic",
+        selected_subscription="create_new_subscription",
+    )
+
+    data = dict(entry.data)
+    assert "token" in data
+    data["token"].pop("expires_in")
+    data["token"].pop("expires_at")
+    assert data == {
+        "sdm": {},
+        "auth_implementation": "imported-cred",
+        "cloud_project_id": CLOUD_PROJECT_ID,
+        "project_id": PROJECT_ID,
+        "subscription_name": f"projects/{CLOUD_PROJECT_ID}/subscriptions/home-assistant-{RAND_SUFFIX}",
+        "topic_name": f"projects/{CLOUD_PROJECT_ID}/topics/home-assistant-{RAND_SUFFIX}",
+        "token": {
+            "refresh_token": "mock-refresh-token",
+            "access_token": "mock-access-token",
+            "type": "Bearer",
+        },
+    }
 
 
 @pytest.mark.parametrize(
@@ -1122,11 +1192,90 @@ async def test_list_topics_failure(
     await oauth.async_app_creds_flow(result)
     oauth.async_mock_refresh()
 
+    result = await oauth.async_configure(result, None)
+    assert result.get("type") is FlowResultType.ABORT
+    assert result.get("reason") == "pubsub_api_error"
+
+
+@pytest.mark.parametrize(
+    ("create_topic_status"),
+    [(HTTPStatus.INTERNAL_SERVER_ERROR)],
+)
+async def test_create_topic_failed(
+    hass: HomeAssistant,
+    oauth: OAuthFixture,
+    aioclient_mock: AiohttpClientMocker,
+    cloud_project_id: str,
+    subscriptions: list[tuple[str, str]],
+    auth: FakeAuth,
+) -> None:
+    """Test the case where there are no eligible pub/sub topics and the topic is created."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    await oauth.async_app_creds_flow(result)
+    oauth.async_mock_refresh()
+
     result = await oauth.async_configure(result, None)
     assert result.get("type") is FlowResultType.FORM
-    assert result.get("step_id") == "pubsub"
+    assert result.get("step_id") == "pubsub_topic"
+    assert not result.get("errors")
+    # Option shown to create a new topic
+    assert result.get("data_schema")({}) == {
+        "topic_name": "create_new_topic",
+    }
+
+    result = await oauth.async_configure(result, {"topic_name": "create_new_topic"})
+    assert result.get("type") is FlowResultType.FORM
+    assert result.get("step_id") == "pubsub_topic"
     assert result.get("errors") == {"base": "pubsub_api_error"}
 
+    # Re-register mock requests needed for the rest of the test. The topic
+    # request will now succeed.
+    aioclient_mock.clear_requests()
+    setup_mock_create_topic_responses(aioclient_mock, cloud_project_id)
+    # Fix up other mock responses cleared above
+    auth.register_mock_requests()
+    setup_mock_list_subscriptions_responses(
+        aioclient_mock,
+        cloud_project_id,
+        subscriptions,
+    )
+    setup_mock_create_subscription_responses(aioclient_mock, cloud_project_id)
+
+    result = await oauth.async_configure(result, {"topic_name": "create_new_topic"})
+    assert result.get("type") is FlowResultType.FORM
+    assert result.get("step_id") == "pubsub_topic_confirm"
+    assert not result.get("errors")
+
+    result = await oauth.async_configure(result, {})
+    assert result.get("type") is FlowResultType.FORM
+    assert result.get("step_id") == "pubsub_subscription"
+    assert not result.get("errors")
+
+    # Create a subscription for the topic and end the flow
+    entry = await oauth.async_finish_setup(
+        result,
+        {"subscription_name": "create_new_subscription"},
+    )
+    data = dict(entry.data)
+    assert "token" in data
+    data["token"].pop("expires_in")
+    data["token"].pop("expires_at")
+    assert data == {
+        "sdm": {},
+        "auth_implementation": "imported-cred",
+        "cloud_project_id": CLOUD_PROJECT_ID,
+        "project_id": PROJECT_ID,
+        "subscription_name": f"projects/{CLOUD_PROJECT_ID}/subscriptions/home-assistant-{RAND_SUFFIX}",
+        "topic_name": f"projects/{CLOUD_PROJECT_ID}/topics/home-assistant-{RAND_SUFFIX}",
+        "token": {
+            "refresh_token": "mock-refresh-token",
+            "access_token": "mock-access-token",
+            "type": "Bearer",
+        },
+    }
+
 
 @pytest.mark.parametrize(
     ("sdm_managed_topic", "list_subscriptions_status"),
@@ -1158,5 +1307,10 @@ async def test_list_subscriptions_failure(
         },
     )
     assert result.get("type") is FlowResultType.FORM
+    assert result.get("step_id") == "pubsub_topic_confirm"
+    assert not result.get("errors")
+
+    result = await oauth.async_configure(result, {})
+    assert result.get("type") is FlowResultType.FORM
     assert result.get("step_id") == "pubsub_subscription"
     assert result.get("errors") == {"base": "pubsub_api_error"}
diff --git a/tests/components/nest/test_init.py b/tests/components/nest/test_init.py
index 7d04624dcc8..c7ac5875403 100644
--- a/tests/components/nest/test_init.py
+++ b/tests/components/nest/test_init.py
@@ -9,10 +9,12 @@ relevant modes.
 """
 
 from collections.abc import Generator
+import datetime
 from http import HTTPStatus
 import logging
 from unittest.mock import AsyncMock, patch
 
+import aiohttp
 from google_nest_sdm.exceptions import (
     ApiException,
     AuthException,
@@ -22,6 +24,7 @@ from google_nest_sdm.exceptions import (
 import pytest
 
 from homeassistant.components.nest import DOMAIN
+from homeassistant.components.nest.const import OAUTH2_TOKEN
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 
@@ -36,6 +39,8 @@ from tests.test_util.aiohttp import AiohttpClientMocker
 
 PLATFORM = "sensor"
 
+EXPIRED_TOKEN_TIMESTAMP = datetime.datetime(2022, 4, 8).timestamp()
+
 
 @pytest.fixture
 def platforms() -> list[str]:
@@ -139,6 +144,55 @@ async def test_setup_device_manager_failure(
     assert entries[0].state is ConfigEntryState.SETUP_RETRY
 
 
+@pytest.mark.parametrize("token_expiration_time", [EXPIRED_TOKEN_TIMESTAMP])
+@pytest.mark.parametrize(
+    ("token_response_args", "expected_state", "expected_steps"),
+    [
+        # Cases that retry integration setup
+        (
+            {"status": HTTPStatus.INTERNAL_SERVER_ERROR},
+            ConfigEntryState.SETUP_RETRY,
+            [],
+        ),
+        ({"exc": aiohttp.ClientError("No internet")}, ConfigEntryState.SETUP_RETRY, []),
+        # Cases that require the user to reauthenticate in a config flow
+        (
+            {"status": HTTPStatus.BAD_REQUEST},
+            ConfigEntryState.SETUP_ERROR,
+            ["reauth_confirm"],
+        ),
+        (
+            {"status": HTTPStatus.FORBIDDEN},
+            ConfigEntryState.SETUP_ERROR,
+            ["reauth_confirm"],
+        ),
+    ],
+)
+async def test_expired_token_refresh_error(
+    hass: HomeAssistant,
+    setup_base_platform: PlatformSetup,
+    aioclient_mock: AiohttpClientMocker,
+    token_response_args: dict,
+    expected_state: ConfigEntryState,
+    expected_steps: list[str],
+) -> None:
+    """Test errors when attempting to refresh the auth token."""
+
+    aioclient_mock.post(
+        OAUTH2_TOKEN,
+        **token_response_args,
+    )
+
+    await setup_base_platform()
+
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert len(entries) == 1
+    assert entries[0].state is expected_state
+
+    flows = hass.config_entries.flow.async_progress()
+    assert expected_steps == [flow["step_id"] for flow in flows]
+
+
 @pytest.mark.parametrize("subscriber_side_effect", [AuthException()])
 async def test_subscriber_auth_failure(
     hass: HomeAssistant,
diff --git a/tests/components/nest/test_media_source.py b/tests/components/nest/test_media_source.py
index 051f7bb87e4..0b0654fc69c 100644
--- a/tests/components/nest/test_media_source.py
+++ b/tests/components/nest/test_media_source.py
@@ -8,11 +8,13 @@ from collections.abc import Generator
 import datetime
 from http import HTTPStatus
 import io
+import pathlib
 from typing import Any
 from unittest.mock import patch
 
 import aiohttp
 import av
+from freezegun import freeze_time
 import numpy as np
 import pytest
 
@@ -28,7 +30,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.template import DATE_STR_FORMAT
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import (
     DEVICE_ID,
@@ -39,7 +41,7 @@ from .common import (
 )
 from .conftest import FakeAuth
 
-from tests.common import MockUser, async_capture_events
+from tests.common import MockUser, async_capture_events, async_fire_time_changed
 from tests.typing import ClientSessionGenerator
 
 DOMAIN = "nest"
@@ -1574,3 +1576,80 @@ async def test_event_clip_media_attachment(
         response = await client.get(content_path)
         assert response.status == HTTPStatus.OK, f"Response not matched: {response}"
         await response.read()
+
+
+@pytest.mark.parametrize(("device_traits", "cache_size"), [(BATTERY_CAMERA_TRAITS, 5)])
+async def test_remove_stale_media(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    auth,
+    mp4,
+    hass_client: ClientSessionGenerator,
+    subscriber,
+    setup_platform,
+    media_path: str,
+) -> None:
+    """Test media files getting evicted from the cache."""
+    await setup_platform()
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, DEVICE_ID)})
+    assert device
+    assert device.name == DEVICE_NAME
+
+    # Publish a media event
+    auth.responses = [
+        aiohttp.web.Response(body=mp4.getvalue()),
+    ]
+    event_timestamp = dt_util.now()
+    await subscriber.async_receive_event(
+        create_event_message(
+            create_battery_event_data(MOTION_EVENT),
+            timestamp=event_timestamp,
+        )
+    )
+    await hass.async_block_till_done()
+
+    # The first subdirectory is the device id. Media for events are stored in the
+    # device subdirectory. First verify that the media was persisted. We will
+    # then add additional media files, then invoke the garbage collector, and
+    # then verify orphaned files are removed.
+    storage_path = pathlib.Path(media_path)
+    device_path = storage_path / device.id
+    media_files = list(device_path.glob("*"))
+    assert len(media_files) == 1
+    event_media = media_files[0]
+    assert event_media.name.endswith(".mp4")
+
+    event_time1 = datetime.datetime.now(datetime.UTC) - datetime.timedelta(days=8)
+    extra_media1 = (
+        device_path / f"{int(event_time1.timestamp())}-camera_motion-test.mp4"
+    )
+    extra_media1.write_bytes(mp4.getvalue())
+    event_time2 = event_time1 + datetime.timedelta(hours=20)
+    extra_media2 = (
+        device_path / f"{int(event_time2.timestamp())}-camera_motion-test.jpg"
+    )
+    extra_media2.write_bytes(mp4.getvalue())
+    # This event will not be garbage collected because it is too recent
+    event_time3 = datetime.datetime.now(datetime.UTC) - datetime.timedelta(days=3)
+    extra_media3 = (
+        device_path / f"{int(event_time3.timestamp())}-camera_motion-test.mp4"
+    )
+    extra_media3.write_bytes(mp4.getvalue())
+
+    assert len(list(device_path.glob("*"))) == 4
+
+    # Advance the clock to invoke the garbage collector. This will remove extra
+    # files that are not valid events that are old enough.
+    point_in_time = datetime.datetime.now(datetime.UTC) + datetime.timedelta(days=1)
+    with freeze_time(point_in_time):
+        async_fire_time_changed(hass, point_in_time)
+        await hass.async_block_till_done()
+        await hass.async_block_till_done()
+
+    # Verify that the event media is still present and that the extra files
+    # are removed. Newer media is not removed.
+    assert event_media.exists()
+    assert not extra_media1.exists()
+    assert not extra_media2.exists()
+    assert extra_media3.exists()
diff --git a/tests/components/netatmo/common.py b/tests/components/netatmo/common.py
index 730cb0cb117..9110f8c724f 100644
--- a/tests/components/netatmo/common.py
+++ b/tests/components/netatmo/common.py
@@ -11,7 +11,7 @@ from syrupy import SnapshotAssertion
 from homeassistant.components.webhook import async_handle_webhook
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 from homeassistant.util.aiohttp import MockRequest
 
 from tests.common import MockConfigEntry, load_fixture
diff --git a/tests/components/netatmo/snapshots/test_binary_sensor.ambr b/tests/components/netatmo/snapshots/test_binary_sensor.ambr
index 6a90b4dd77a..3066c999655 100644
--- a/tests/components/netatmo/snapshots/test_binary_sensor.ambr
+++ b/tests/components/netatmo/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -56,6 +57,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -106,6 +108,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -156,6 +159,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -206,6 +210,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -256,6 +261,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -304,6 +310,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -352,6 +359,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -402,6 +410,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -450,6 +459,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -498,6 +508,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/netatmo/snapshots/test_button.ambr b/tests/components/netatmo/snapshots/test_button.ambr
index 6ad1b9e78ba..086403c3b69 100644
--- a/tests/components/netatmo/snapshots/test_button.ambr
+++ b/tests/components/netatmo/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/netatmo/snapshots/test_camera.ambr b/tests/components/netatmo/snapshots/test_camera.ambr
index 94a5ded5031..9bd10ed9b5f 100644
--- a/tests/components/netatmo/snapshots/test_camera.ambr
+++ b/tests/components/netatmo/snapshots/test_camera.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -67,6 +68,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -128,6 +130,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/netatmo/snapshots/test_climate.ambr b/tests/components/netatmo/snapshots/test_climate.ambr
index aeae1fd71c7..506e0fb5590 100644
--- a/tests/components/netatmo/snapshots/test_climate.ambr
+++ b/tests/components/netatmo/snapshots/test_climate.ambr
@@ -20,6 +20,7 @@
       'target_temp_step': 0.5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -95,6 +96,7 @@
       'target_temp_step': 0.5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -176,6 +178,7 @@
       'target_temp_step': 0.5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -256,6 +259,7 @@
       'target_temp_step': 0.5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -338,6 +342,7 @@
       'target_temp_step': 0.5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/netatmo/snapshots/test_cover.ambr b/tests/components/netatmo/snapshots/test_cover.ambr
index 7ea016f5ae8..46aafb32e8e 100644
--- a/tests/components/netatmo/snapshots/test_cover.ambr
+++ b/tests/components/netatmo/snapshots/test_cover.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -56,6 +57,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/netatmo/snapshots/test_diagnostics.ambr b/tests/components/netatmo/snapshots/test_diagnostics.ambr
index 463556ec657..4ea7e30bcf9 100644
--- a/tests/components/netatmo/snapshots/test_diagnostics.ambr
+++ b/tests/components/netatmo/snapshots/test_diagnostics.ambr
@@ -646,6 +646,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': 'netatmo',
       'version': 1,
diff --git a/tests/components/netatmo/snapshots/test_fan.ambr b/tests/components/netatmo/snapshots/test_fan.ambr
index ba882d68e50..f850f7ada3b 100644
--- a/tests/components/netatmo/snapshots/test_fan.ambr
+++ b/tests/components/netatmo/snapshots/test_fan.ambr
@@ -11,6 +11,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/netatmo/snapshots/test_init.ambr b/tests/components/netatmo/snapshots/test_init.ambr
index 60cb22d74f2..35e7f7efc29 100644
--- a/tests/components/netatmo/snapshots/test_init.ambr
+++ b/tests/components/netatmo/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://home.netatmo.com/control',
     'connections': set({
     }),
@@ -35,6 +36,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://home.netatmo.com/control',
     'connections': set({
     }),
@@ -67,6 +69,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://home.netatmo.com/control',
     'connections': set({
     }),
@@ -99,6 +102,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': 'corridor',
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/energy',
     'connections': set({
     }),
@@ -131,6 +135,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/energy',
     'connections': set({
     }),
@@ -163,6 +168,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://home.netatmo.com/control',
     'connections': set({
     }),
@@ -195,6 +201,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/energy',
     'connections': set({
     }),
@@ -227,6 +234,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/energy',
     'connections': set({
     }),
@@ -259,6 +267,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/energy',
     'connections': set({
     }),
@@ -291,6 +300,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/energy',
     'connections': set({
     }),
@@ -323,6 +333,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/energy',
     'connections': set({
     }),
@@ -355,6 +366,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/energy',
     'connections': set({
     }),
@@ -387,6 +399,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/energy',
     'connections': set({
     }),
@@ -419,6 +432,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/energy',
     'connections': set({
     }),
@@ -451,6 +465,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/energy',
     'connections': set({
     }),
@@ -483,6 +498,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/energy',
     'connections': set({
     }),
@@ -515,6 +531,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://home.netatmo.com/security',
     'connections': set({
     }),
@@ -547,6 +564,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/weather',
     'connections': set({
     }),
@@ -579,6 +597,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://home.netatmo.com/security',
     'connections': set({
     }),
@@ -611,6 +630,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://home.netatmo.com/security',
     'connections': set({
     }),
@@ -643,6 +663,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/weather',
     'connections': set({
     }),
@@ -675,6 +696,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/weather',
     'connections': set({
     }),
@@ -707,6 +729,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/weather',
     'connections': set({
     }),
@@ -739,6 +762,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/weather',
     'connections': set({
     }),
@@ -771,6 +795,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/weather',
     'connections': set({
     }),
@@ -803,6 +828,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/energy',
     'connections': set({
     }),
@@ -835,6 +861,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/weather',
     'connections': set({
     }),
@@ -867,6 +894,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/weather',
     'connections': set({
     }),
@@ -899,6 +927,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/weather',
     'connections': set({
     }),
@@ -931,6 +960,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/weather',
     'connections': set({
     }),
@@ -963,6 +993,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/weather',
     'connections': set({
     }),
@@ -995,6 +1026,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': 'bureau',
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/energy',
     'connections': set({
     }),
@@ -1027,6 +1059,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': 'livingroom',
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/energy',
     'connections': set({
     }),
@@ -1059,6 +1092,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': 'entrada',
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/energy',
     'connections': set({
     }),
@@ -1091,6 +1125,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': 'cocina',
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/energy',
     'connections': set({
     }),
@@ -1123,6 +1158,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://my.netatmo.com/app/energy',
     'connections': set({
     }),
@@ -1155,6 +1191,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://weathermap.netatmo.com/',
     'connections': set({
     }),
@@ -1187,6 +1224,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://weathermap.netatmo.com/',
     'connections': set({
     }),
@@ -1219,6 +1257,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://weathermap.netatmo.com/',
     'connections': set({
     }),
diff --git a/tests/components/netatmo/snapshots/test_light.ambr b/tests/components/netatmo/snapshots/test_light.ambr
index fe5a8aac7d0..cc7da6e8712 100644
--- a/tests/components/netatmo/snapshots/test_light.ambr
+++ b/tests/components/netatmo/snapshots/test_light.ambr
@@ -10,6 +10,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -66,6 +67,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -121,6 +123,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/netatmo/snapshots/test_select.ambr b/tests/components/netatmo/snapshots/test_select.ambr
index ff68fc71c09..d98d9adb87f 100644
--- a/tests/components/netatmo/snapshots/test_select.ambr
+++ b/tests/components/netatmo/snapshots/test_select.ambr
@@ -11,6 +11,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/netatmo/snapshots/test_sensor.ambr b/tests/components/netatmo/snapshots/test_sensor.ambr
index ba18c2ca21a..00285f565a6 100644
--- a/tests/components/netatmo/snapshots/test_sensor.ambr
+++ b/tests/components/netatmo/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -68,6 +69,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -128,6 +130,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -187,6 +190,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -241,6 +245,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -293,6 +298,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -342,6 +348,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -393,6 +400,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -448,6 +456,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -497,6 +506,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -548,6 +558,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -606,6 +617,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -664,6 +676,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -721,6 +734,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -773,6 +787,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -823,6 +838,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -870,6 +886,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -921,6 +938,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -974,6 +992,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1021,6 +1040,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1072,6 +1092,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1122,6 +1143,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1169,6 +1191,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1218,6 +1241,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1270,6 +1294,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1320,6 +1345,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1367,6 +1393,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1416,6 +1443,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1473,9 +1501,10 @@
     }),
     'area_id': None,
     'capabilities': dict({
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1491,7 +1520,7 @@
     'name': None,
     'options': dict({
     }),
-    'original_device_class': None,
+    'original_device_class': <SensorDeviceClass.WIND_DIRECTION: 'wind_direction'>,
     'original_icon': None,
     'original_name': 'Gust angle',
     'platform': 'netatmo',
@@ -1506,10 +1535,11 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'attribution': 'Data provided by Netatmo',
+      'device_class': 'wind_direction',
       'friendly_name': 'Home avg Gust angle',
       'latitude': 32.17901225,
       'longitude': -117.17901225,
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
       'unit_of_measurement': '°',
     }),
     'context': <ANY>,
@@ -1529,6 +1559,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1583,6 +1614,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1628,59 +1660,6 @@
     'state': '63.2',
   })
 # ---
-# name: test_entity[sensor.home_avg_none-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': None,
-    'entity_id': 'sensor.home_avg_none',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': None,
-    'platform': 'netatmo',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'Home-avg-windangle_value',
-    'unit_of_measurement': '°',
-  })
-# ---
-# name: test_entity[sensor.home_avg_none-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Netatmo',
-      'friendly_name': 'Home avg None',
-      'latitude': 32.17901225,
-      'longitude': -117.17901225,
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': '°',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.home_avg_none',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '17.0',
-  })
-# ---
 # name: test_entity[sensor.home_avg_precipitation-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -1690,6 +1669,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1744,6 +1724,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1801,6 +1782,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1855,6 +1837,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1903,6 +1886,61 @@
     'state': '22.7',
   })
 # ---
+# name: test_entity[sensor.home_avg_wind_direction-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.home_avg_wind_direction',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.WIND_DIRECTION: 'wind_direction'>,
+    'original_icon': None,
+    'original_name': 'Wind direction',
+    'platform': 'netatmo',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'Home-avg-windangle_value',
+    'unit_of_measurement': '°',
+  })
+# ---
+# name: test_entity[sensor.home_avg_wind_direction-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Netatmo',
+      'device_class': 'wind_direction',
+      'friendly_name': 'Home avg Wind direction',
+      'latitude': 32.17901225,
+      'longitude': -117.17901225,
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
+      'unit_of_measurement': '°',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.home_avg_wind_direction',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '17.0',
+  })
+# ---
 # name: test_entity[sensor.home_avg_wind_speed-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -1912,6 +1950,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1966,6 +2005,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2023,9 +2063,10 @@
     }),
     'area_id': None,
     'capabilities': dict({
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2041,7 +2082,7 @@
     'name': None,
     'options': dict({
     }),
-    'original_device_class': None,
+    'original_device_class': <SensorDeviceClass.WIND_DIRECTION: 'wind_direction'>,
     'original_icon': None,
     'original_name': 'Gust angle',
     'platform': 'netatmo',
@@ -2056,10 +2097,11 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'attribution': 'Data provided by Netatmo',
+      'device_class': 'wind_direction',
       'friendly_name': 'Home max Gust angle',
       'latitude': 32.17901225,
       'longitude': -117.17901225,
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
       'unit_of_measurement': '°',
     }),
     'context': <ANY>,
@@ -2079,6 +2121,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2133,6 +2176,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2178,59 +2222,6 @@
     'state': '76',
   })
 # ---
-# name: test_entity[sensor.home_max_none-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': None,
-    'entity_id': 'sensor.home_max_none',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': None,
-    'platform': 'netatmo',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'Home-max-windangle_value',
-    'unit_of_measurement': '°',
-  })
-# ---
-# name: test_entity[sensor.home_max_none-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Netatmo',
-      'friendly_name': 'Home max None',
-      'latitude': 32.17901225,
-      'longitude': -117.17901225,
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': '°',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.home_max_none',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '17',
-  })
-# ---
 # name: test_entity[sensor.home_max_precipitation-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -2240,6 +2231,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2294,6 +2286,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2351,6 +2344,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2405,6 +2399,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2453,6 +2448,61 @@
     'state': '27.4',
   })
 # ---
+# name: test_entity[sensor.home_max_wind_direction-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.home_max_wind_direction',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.WIND_DIRECTION: 'wind_direction'>,
+    'original_icon': None,
+    'original_name': 'Wind direction',
+    'platform': 'netatmo',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'Home-max-windangle_value',
+    'unit_of_measurement': '°',
+  })
+# ---
+# name: test_entity[sensor.home_max_wind_direction-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Netatmo',
+      'device_class': 'wind_direction',
+      'friendly_name': 'Home max Wind direction',
+      'latitude': 32.17901225,
+      'longitude': -117.17901225,
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
+      'unit_of_measurement': '°',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.home_max_wind_direction',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '17',
+  })
+# ---
 # name: test_entity[sensor.home_max_wind_speed-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -2462,6 +2512,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2516,6 +2567,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2573,9 +2625,10 @@
     }),
     'area_id': None,
     'capabilities': dict({
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2591,7 +2644,7 @@
     'name': None,
     'options': dict({
     }),
-    'original_device_class': None,
+    'original_device_class': <SensorDeviceClass.WIND_DIRECTION: 'wind_direction'>,
     'original_icon': None,
     'original_name': 'Gust angle',
     'platform': 'netatmo',
@@ -2606,10 +2659,11 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'attribution': 'Data provided by Netatmo',
+      'device_class': 'wind_direction',
       'friendly_name': 'Home min Gust angle',
       'latitude': 32.17901225,
       'longitude': -117.17901225,
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
       'unit_of_measurement': '°',
     }),
     'context': <ANY>,
@@ -2629,6 +2683,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2683,6 +2738,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2728,59 +2784,6 @@
     'state': '56',
   })
 # ---
-# name: test_entity[sensor.home_min_none-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': None,
-    'entity_id': 'sensor.home_min_none',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': None,
-    'platform': 'netatmo',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'Home-min-windangle_value',
-    'unit_of_measurement': '°',
-  })
-# ---
-# name: test_entity[sensor.home_min_none-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Netatmo',
-      'friendly_name': 'Home min None',
-      'latitude': 32.17901225,
-      'longitude': -117.17901225,
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': '°',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.home_min_none',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '17',
-  })
-# ---
 # name: test_entity[sensor.home_min_precipitation-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -2790,6 +2793,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2844,6 +2848,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2901,6 +2906,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2955,6 +2961,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3003,6 +3010,61 @@
     'state': '19.8',
   })
 # ---
+# name: test_entity[sensor.home_min_wind_direction-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.home_min_wind_direction',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.WIND_DIRECTION: 'wind_direction'>,
+    'original_icon': None,
+    'original_name': 'Wind direction',
+    'platform': 'netatmo',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'Home-min-windangle_value',
+    'unit_of_measurement': '°',
+  })
+# ---
+# name: test_entity[sensor.home_min_wind_direction-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Netatmo',
+      'device_class': 'wind_direction',
+      'friendly_name': 'Home min Wind direction',
+      'latitude': 32.17901225,
+      'longitude': -117.17901225,
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
+      'unit_of_measurement': '°',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.home_min_wind_direction',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '17',
+  })
+# ---
 # name: test_entity[sensor.home_min_wind_speed-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -3012,6 +3074,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3064,6 +3127,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3113,6 +3177,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3173,6 +3238,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3233,6 +3299,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3292,6 +3359,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3346,6 +3414,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3398,6 +3467,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3447,6 +3517,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3498,6 +3569,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3553,6 +3625,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3602,6 +3675,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3651,6 +3725,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3698,6 +3773,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3745,6 +3821,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3792,6 +3869,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3839,6 +3917,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3888,6 +3967,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3948,6 +4028,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4000,6 +4081,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4060,6 +4142,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4119,6 +4202,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4173,6 +4257,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4225,6 +4310,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4274,6 +4360,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4325,6 +4412,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4380,6 +4468,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4429,6 +4518,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4480,6 +4570,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4540,6 +4631,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4600,6 +4692,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4659,6 +4752,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4713,6 +4807,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4765,6 +4860,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4814,6 +4910,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4865,6 +4962,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4920,6 +5018,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4969,6 +5068,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5018,6 +5118,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5067,6 +5168,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5117,6 +5219,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5166,6 +5269,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5218,6 +5322,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5270,6 +5375,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5330,6 +5436,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5382,6 +5489,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5434,6 +5542,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5484,6 +5593,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5531,6 +5641,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5580,6 +5691,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5633,6 +5745,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5682,6 +5795,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5734,6 +5848,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5786,6 +5901,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5836,6 +5952,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5883,6 +6000,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5932,6 +6050,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -5985,6 +6104,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6034,6 +6154,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6088,6 +6209,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6137,9 +6259,10 @@
     }),
     'area_id': None,
     'capabilities': dict({
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6155,7 +6278,7 @@
     'name': None,
     'options': dict({
     }),
-    'original_device_class': None,
+    'original_device_class': <SensorDeviceClass.WIND_DIRECTION: 'wind_direction'>,
     'original_icon': None,
     'original_name': 'Gust angle',
     'platform': 'netatmo',
@@ -6170,8 +6293,9 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'attribution': 'Data provided by Netatmo',
+      'device_class': 'wind_direction',
       'friendly_name': 'Villa Garden Gust angle',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
       'unit_of_measurement': '°',
     }),
     'context': <ANY>,
@@ -6200,6 +6324,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6260,6 +6385,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6310,6 +6436,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6357,6 +6484,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6403,9 +6531,10 @@
     }),
     'area_id': None,
     'capabilities': dict({
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6421,7 +6550,7 @@
     'name': None,
     'options': dict({
     }),
-    'original_device_class': None,
+    'original_device_class': <SensorDeviceClass.WIND_DIRECTION: 'wind_direction'>,
     'original_icon': None,
     'original_name': 'Wind angle',
     'platform': 'netatmo',
@@ -6436,8 +6565,9 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'attribution': 'Data provided by Netatmo',
+      'device_class': 'wind_direction',
       'friendly_name': 'Villa Garden Wind angle',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'state_class': <SensorStateClass.MEASUREMENT_ANGLE: 'measurement_angle'>,
       'unit_of_measurement': '°',
     }),
     'context': <ANY>,
@@ -6466,6 +6596,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6526,6 +6657,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6578,6 +6710,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6632,6 +6765,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6686,6 +6820,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6738,6 +6873,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6788,6 +6924,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6835,6 +6972,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6884,6 +7022,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6937,6 +7076,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -6984,6 +7124,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7035,6 +7176,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7087,6 +7229,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7139,6 +7282,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7194,6 +7338,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7244,6 +7389,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7291,6 +7437,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7338,6 +7485,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7389,6 +7537,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7444,6 +7593,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -7493,6 +7643,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/netatmo/snapshots/test_switch.ambr b/tests/components/netatmo/snapshots/test_switch.ambr
index 4244917d86f..f44cbcd22a5 100644
--- a/tests/components/netatmo/snapshots/test_switch.ambr
+++ b/tests/components/netatmo/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/netatmo/test_button.py b/tests/components/netatmo/test_button.py
index 681e42af051..bffecf7d83a 100644
--- a/tests/components/netatmo/test_button.py
+++ b/tests/components/netatmo/test_button.py
@@ -8,7 +8,7 @@ from syrupy import SnapshotAssertion
 from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
 from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from .common import selected_platforms, snapshot_platform_entities
 
diff --git a/tests/components/netatmo/test_camera.py b/tests/components/netatmo/test_camera.py
index 43904ed8f71..32f20544043 100644
--- a/tests/components/netatmo/test_camera.py
+++ b/tests/components/netatmo/test_camera.py
@@ -19,7 +19,7 @@ from homeassistant.components.netatmo.const import (
 from homeassistant.const import CONF_WEBHOOK_ID, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 from homeassistant.util import dt as dt_util
 
 from .common import (
diff --git a/tests/components/netatmo/test_climate.py b/tests/components/netatmo/test_climate.py
index dc0312f7acd..18c811fd76b 100644
--- a/tests/components/netatmo/test_climate.py
+++ b/tests/components/netatmo/test_climate.py
@@ -41,7 +41,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 from homeassistant.util import dt as dt_util
 
 from .common import selected_platforms, simulate_webhook, snapshot_platform_entities
diff --git a/tests/components/netatmo/test_cover.py b/tests/components/netatmo/test_cover.py
index 509c1de736e..9368a564afb 100644
--- a/tests/components/netatmo/test_cover.py
+++ b/tests/components/netatmo/test_cover.py
@@ -14,7 +14,7 @@ from homeassistant.components.cover import (
 )
 from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from .common import selected_platforms, snapshot_platform_entities
 
diff --git a/tests/components/netatmo/test_fan.py b/tests/components/netatmo/test_fan.py
index 989ea1ac364..3dbc8b3a6f5 100644
--- a/tests/components/netatmo/test_fan.py
+++ b/tests/components/netatmo/test_fan.py
@@ -11,7 +11,7 @@ from homeassistant.components.fan import (
 )
 from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from .common import selected_platforms, snapshot_platform_entities
 
diff --git a/tests/components/netatmo/test_init.py b/tests/components/netatmo/test_init.py
index 5fdf4f8ea35..c1a687c6fa8 100644
--- a/tests/components/netatmo/test_init.py
+++ b/tests/components/netatmo/test_init.py
@@ -25,11 +25,7 @@ from .common import (
     simulate_webhook,
 )
 
-from tests.common import (
-    MockConfigEntry,
-    async_fire_time_changed,
-    async_get_persistent_notifications,
-)
+from tests.common import MockConfigEntry, async_fire_time_changed
 from tests.components.cloud import mock_cloud
 from tests.typing import WebSocketGenerator
 
@@ -423,9 +419,8 @@ async def test_setup_component_invalid_token_scope(hass: HomeAssistant) -> None:
     assert config_entry.state is ConfigEntryState.SETUP_ERROR
     assert hass.config_entries.async_entries(DOMAIN)
 
-    notifications = async_get_persistent_notifications(hass)
-
-    assert len(notifications) > 0
+    # Test a reauth flow is initiated
+    assert len(list(config_entry.async_get_active_flows(hass, {"reauth"}))) == 1
 
     for config_entry in hass.config_entries.async_entries("netatmo"):
         await hass.config_entries.async_remove(config_entry.entry_id)
@@ -476,8 +471,9 @@ async def test_setup_component_invalid_token(
 
     assert config_entry.state is ConfigEntryState.SETUP_ERROR
     assert hass.config_entries.async_entries(DOMAIN)
-    notifications = async_get_persistent_notifications(hass)
-    assert len(notifications) > 0
+
+    # Test a reauth flow is initiated
+    assert len(list(config_entry.async_get_active_flows(hass, {"reauth"}))) == 1
 
     for entry in hass.config_entries.async_entries("netatmo"):
         await hass.config_entries.async_remove(entry.entry_id)
diff --git a/tests/components/netatmo/test_light.py b/tests/components/netatmo/test_light.py
index c90d67e7630..0932395b8ec 100644
--- a/tests/components/netatmo/test_light.py
+++ b/tests/components/netatmo/test_light.py
@@ -12,7 +12,7 @@ from homeassistant.components.light import (
 from homeassistant.components.netatmo import DOMAIN
 from homeassistant.const import ATTR_ENTITY_ID, CONF_WEBHOOK_ID, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from .common import (
     FAKE_WEBHOOK_ACTIVATION,
diff --git a/tests/components/netatmo/test_select.py b/tests/components/netatmo/test_select.py
index 274113405f6..458115f8f5c 100644
--- a/tests/components/netatmo/test_select.py
+++ b/tests/components/netatmo/test_select.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from .common import selected_platforms, simulate_webhook, snapshot_platform_entities
 
diff --git a/tests/components/netatmo/test_switch.py b/tests/components/netatmo/test_switch.py
index dd82fad3d08..837f6201b1e 100644
--- a/tests/components/netatmo/test_switch.py
+++ b/tests/components/netatmo/test_switch.py
@@ -11,7 +11,7 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from .common import selected_platforms, snapshot_platform_entities
 
diff --git a/tests/components/netgear_lte/snapshots/test_init.ambr b/tests/components/netgear_lte/snapshots/test_init.ambr
index ca65c17cc8e..2a806be8ae1 100644
--- a/tests/components/netgear_lte/snapshots/test_init.ambr
+++ b/tests/components/netgear_lte/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://192.168.5.1',
     'connections': set({
     }),
diff --git a/tests/components/netgear_lte/test_init.py b/tests/components/netgear_lte/test_init.py
index 1bd3dff1eff..e853109e33e 100644
--- a/tests/components/netgear_lte/test_init.py
+++ b/tests/components/netgear_lte/test_init.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import CONF_DATA
 
diff --git a/tests/components/nextcloud/snapshots/test_binary_sensor.ambr b/tests/components/nextcloud/snapshots/test_binary_sensor.ambr
index 1831419af52..578659d411d 100644
--- a/tests/components/nextcloud/snapshots/test_binary_sensor.ambr
+++ b/tests/components/nextcloud/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -190,6 +194,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +241,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/nextcloud/snapshots/test_sensor.ambr b/tests/components/nextcloud/snapshots/test_sensor.ambr
index c49ba3496da..e6154841a28 100644
--- a/tests/components/nextcloud/snapshots/test_sensor.ambr
+++ b/tests/components/nextcloud/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -57,6 +58,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -106,6 +108,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -155,6 +158,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -204,6 +208,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -253,6 +258,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -302,6 +308,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -351,6 +358,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -400,6 +408,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -449,6 +458,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -498,6 +508,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -547,6 +558,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -596,6 +608,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -645,6 +658,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -694,6 +708,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -743,6 +758,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -792,6 +808,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -841,6 +858,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -890,6 +908,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -939,6 +958,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -986,6 +1006,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1032,6 +1053,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1079,7 +1101,7 @@
     'state': '0.175296',
   })
 # ---
-# name: test_async_setup_entry[sensor.my_nc_url_local_cache_number_of_entires-entry]
+# name: test_async_setup_entry[sensor.my_nc_url_local_cache_number_of_entries-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -1088,12 +1110,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-    'entity_id': 'sensor.my_nc_url_local_cache_number_of_entires',
+    'entity_id': 'sensor.my_nc_url_local_cache_number_of_entries',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -1105,7 +1128,7 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': 'Cache number of entires',
+    'original_name': 'Cache number of entries',
     'platform': 'nextcloud',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -1114,14 +1137,14 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_async_setup_entry[sensor.my_nc_url_local_cache_number_of_entires-state]
+# name: test_async_setup_entry[sensor.my_nc_url_local_cache_number_of_entries-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'my.nc_url.local Cache number of entires',
+      'friendly_name': 'my.nc_url.local Cache number of entries',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.my_nc_url_local_cache_number_of_entires',
+    'entity_id': 'sensor.my_nc_url_local_cache_number_of_entries',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -1137,6 +1160,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1186,6 +1210,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1235,6 +1260,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1284,6 +1310,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1331,6 +1358,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1378,6 +1406,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1395,7 +1424,7 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': 'Cache ttl',
+    'original_name': 'Cache TTL',
     'platform': 'nextcloud',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -1407,7 +1436,7 @@
 # name: test_async_setup_entry[sensor.my_nc_url_local_cache_ttl-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'my.nc_url.local Cache ttl',
+      'friendly_name': 'my.nc_url.local Cache TTL',
     }),
     'context': <ANY>,
     'entity_id': 'sensor.my_nc_url_local_cache_ttl',
@@ -1424,6 +1453,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1444,7 +1474,7 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': 'CPU Load last 15 minutes',
+    'original_name': 'CPU load last 15 minutes',
     'platform': 'nextcloud',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -1456,7 +1486,7 @@
 # name: test_async_setup_entry[sensor.my_nc_url_local_cpu_load_last_15_minutes-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'my.nc_url.local CPU Load last 15 minutes',
+      'friendly_name': 'my.nc_url.local CPU load last 15 minutes',
       'unit_of_measurement': 'load',
     }),
     'context': <ANY>,
@@ -1474,6 +1504,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1494,7 +1525,7 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': 'CPU Load last 1 minute',
+    'original_name': 'CPU load last 1 minute',
     'platform': 'nextcloud',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -1506,7 +1537,7 @@
 # name: test_async_setup_entry[sensor.my_nc_url_local_cpu_load_last_1_minute-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'my.nc_url.local CPU Load last 1 minute',
+      'friendly_name': 'my.nc_url.local CPU load last 1 minute',
       'unit_of_measurement': 'load',
     }),
     'context': <ANY>,
@@ -1524,6 +1555,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1544,7 +1576,7 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': 'CPU Load last 5 minutes',
+    'original_name': 'CPU load last 5 minutes',
     'platform': 'nextcloud',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -1556,7 +1588,7 @@
 # name: test_async_setup_entry[sensor.my_nc_url_local_cpu_load_last_5_minutes-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'my.nc_url.local CPU Load last 5 minutes',
+      'friendly_name': 'my.nc_url.local CPU load last 5 minutes',
       'unit_of_measurement': 'load',
     }),
     'context': <ANY>,
@@ -1574,6 +1606,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1628,6 +1661,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1674,6 +1708,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1720,6 +1755,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1774,6 +1810,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1828,6 +1865,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1882,6 +1920,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1936,6 +1975,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1992,6 +2032,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2039,6 +2080,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2093,6 +2135,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2147,6 +2190,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2201,6 +2245,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2247,6 +2292,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2293,6 +2339,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2341,6 +2388,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2391,6 +2439,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2440,6 +2489,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2489,6 +2539,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2536,6 +2587,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2586,6 +2638,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2642,6 +2695,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2689,6 +2743,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2741,6 +2796,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2788,6 +2844,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2837,6 +2894,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2886,6 +2944,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2935,6 +2994,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2984,6 +3044,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3031,6 +3092,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3078,6 +3140,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3132,6 +3195,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3186,6 +3250,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3234,6 +3299,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3288,6 +3354,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3342,6 +3409,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3388,6 +3456,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3444,6 +3513,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3491,6 +3561,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3545,6 +3616,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3591,6 +3663,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3637,6 +3710,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3683,6 +3757,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3729,6 +3804,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3775,6 +3851,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3829,6 +3906,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3885,6 +3963,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3932,6 +4011,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/nextcloud/snapshots/test_update.ambr b/tests/components/nextcloud/snapshots/test_update.ambr
index 484106580b1..a8acd2f5294 100644
--- a/tests/components/nextcloud/snapshots/test_update.ambr
+++ b/tests/components/nextcloud/snapshots/test_update.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/nextdns/snapshots/test_binary_sensor.ambr b/tests/components/nextdns/snapshots/test_binary_sensor.ambr
index 814b4c1ac16..65a477f50f3 100644
--- a/tests/components/nextdns/snapshots/test_binary_sensor.ambr
+++ b/tests/components/nextdns/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/nextdns/snapshots/test_button.ambr b/tests/components/nextdns/snapshots/test_button.ambr
index 32dc31eea19..3f1f75d1783 100644
--- a/tests/components/nextdns/snapshots/test_button.ambr
+++ b/tests/components/nextdns/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/nextdns/snapshots/test_diagnostics.ambr b/tests/components/nextdns/snapshots/test_diagnostics.ambr
index 827d6aeb6e5..23f42fee077 100644
--- a/tests/components/nextdns/snapshots/test_diagnostics.ambr
+++ b/tests/components/nextdns/snapshots/test_diagnostics.ambr
@@ -17,6 +17,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Fake Profile',
       'unique_id': '**REDACTED**',
       'version': 1,
diff --git a/tests/components/nextdns/snapshots/test_sensor.ambr b/tests/components/nextdns/snapshots/test_sensor.ambr
index 14bebea53f8..48c3b0894db 100644
--- a/tests/components/nextdns/snapshots/test_sensor.ambr
+++ b/tests/components/nextdns/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -58,6 +59,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -108,6 +110,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -158,6 +161,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -208,6 +212,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -258,6 +263,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -308,6 +314,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -358,6 +365,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -408,6 +416,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -458,6 +467,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -508,6 +518,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -558,6 +569,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -608,6 +620,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -658,6 +671,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -708,6 +722,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -758,6 +773,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -808,6 +824,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -858,6 +875,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -908,6 +926,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -958,6 +977,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1008,6 +1028,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1058,6 +1079,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1108,6 +1130,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1158,6 +1181,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1208,6 +1232,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/nextdns/snapshots/test_switch.ambr b/tests/components/nextdns/snapshots/test_switch.ambr
index 3328e341a2e..e6d63b7f542 100644
--- a/tests/components/nextdns/snapshots/test_switch.ambr
+++ b/tests/components/nextdns/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -190,6 +194,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +241,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -282,6 +288,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -328,6 +335,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -374,6 +382,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -420,6 +429,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -466,6 +476,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -512,6 +523,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -558,6 +570,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -604,6 +617,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -650,6 +664,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -696,6 +711,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -742,6 +758,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -788,6 +805,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -834,6 +852,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -880,6 +899,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -926,6 +946,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -972,6 +993,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1018,6 +1040,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1064,6 +1087,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1110,6 +1134,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1156,6 +1181,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1202,6 +1228,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1248,6 +1275,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1294,6 +1322,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1340,6 +1369,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1386,6 +1416,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1432,6 +1463,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1478,6 +1510,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1524,6 +1557,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1570,6 +1604,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1616,6 +1651,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1662,6 +1698,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1708,6 +1745,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1754,6 +1792,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1800,6 +1839,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1846,6 +1886,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1892,6 +1933,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1938,6 +1980,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1984,6 +2027,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2030,6 +2074,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2076,6 +2121,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2122,6 +2168,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2168,6 +2215,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2214,6 +2262,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2260,6 +2309,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2306,6 +2356,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2352,6 +2403,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2398,6 +2450,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2444,6 +2497,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2490,6 +2544,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2536,6 +2591,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2582,6 +2638,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2628,6 +2685,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2674,6 +2732,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2720,6 +2779,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2766,6 +2826,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2812,6 +2873,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2858,6 +2920,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2904,6 +2967,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2950,6 +3014,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2996,6 +3061,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3042,6 +3108,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3088,6 +3155,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3134,6 +3202,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3180,6 +3249,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3226,6 +3296,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3272,6 +3343,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3318,6 +3390,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/nextdns/test_button.py b/tests/components/nextdns/test_button.py
index 51970b9bb48..3d2422c34a7 100644
--- a/tests/components/nextdns/test_button.py
+++ b/tests/components/nextdns/test_button.py
@@ -1,12 +1,19 @@
 """Test button of NextDNS integration."""
 
-from unittest.mock import patch
+from unittest.mock import Mock, patch
 
+from aiohttp import ClientError
+from aiohttp.client_exceptions import ClientConnectorError
+from nextdns import ApiError, InvalidApiKeyError
+import pytest
 from syrupy import SnapshotAssertion
 
-from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN
+from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
+from homeassistant.components.nextdns.const import DOMAIN
+from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntryState
 from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
 from homeassistant.util import dt as dt_util
 
@@ -36,7 +43,7 @@ async def test_button_press(hass: HomeAssistant) -> None:
     ):
         await hass.services.async_call(
             BUTTON_DOMAIN,
-            "press",
+            SERVICE_PRESS,
             {ATTR_ENTITY_ID: "button.fake_profile_clear_logs"},
             blocking=True,
         )
@@ -47,3 +54,60 @@ async def test_button_press(hass: HomeAssistant) -> None:
     state = hass.states.get("button.fake_profile_clear_logs")
     assert state
     assert state.state == now.isoformat()
+
+
+@pytest.mark.parametrize(
+    "exc",
+    [
+        ApiError(Mock()),
+        TimeoutError,
+        ClientConnectorError(Mock(), Mock()),
+        ClientError,
+    ],
+)
+async def test_button_failure(hass: HomeAssistant, exc: Exception) -> None:
+    """Tests that the press action throws HomeAssistantError."""
+    await init_integration(hass)
+
+    with (
+        patch("homeassistant.components.nextdns.NextDns.clear_logs", side_effect=exc),
+        pytest.raises(
+            HomeAssistantError,
+            match="An error occurred while calling the NextDNS API method for button.fake_profile_clear_logs",
+        ),
+    ):
+        await hass.services.async_call(
+            BUTTON_DOMAIN,
+            SERVICE_PRESS,
+            {ATTR_ENTITY_ID: "button.fake_profile_clear_logs"},
+            blocking=True,
+        )
+
+
+async def test_button_auth_error(hass: HomeAssistant) -> None:
+    """Tests that the press action starts re-auth flow."""
+    entry = await init_integration(hass)
+
+    with patch(
+        "homeassistant.components.nextdns.NextDns.clear_logs",
+        side_effect=InvalidApiKeyError,
+    ):
+        await hass.services.async_call(
+            BUTTON_DOMAIN,
+            SERVICE_PRESS,
+            {ATTR_ENTITY_ID: "button.fake_profile_clear_logs"},
+            blocking=True,
+        )
+
+    assert entry.state is ConfigEntryState.LOADED
+
+    flows = hass.config_entries.flow.async_progress()
+    assert len(flows) == 1
+
+    flow = flows[0]
+    assert flow.get("step_id") == "reauth_confirm"
+    assert flow.get("handler") == DOMAIN
+
+    assert "context" in flow
+    assert flow["context"].get("source") == SOURCE_REAUTH
+    assert flow["context"].get("entry_id") == entry.entry_id
diff --git a/tests/components/nextdns/test_switch.py b/tests/components/nextdns/test_switch.py
index 6e344e34336..c85525ac457 100644
--- a/tests/components/nextdns/test_switch.py
+++ b/tests/components/nextdns/test_switch.py
@@ -5,12 +5,14 @@ from unittest.mock import Mock, patch
 
 from aiohttp import ClientError
 from aiohttp.client_exceptions import ClientConnectorError
-from nextdns import ApiError
+from nextdns import ApiError, InvalidApiKeyError
 import pytest
 from syrupy import SnapshotAssertion
 from tenacity import RetryError
 
+from homeassistant.components.nextdns.const import DOMAIN
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
+from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntryState
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     SERVICE_TURN_OFF,
@@ -158,3 +160,32 @@ async def test_switch_failure(hass: HomeAssistant, exc: Exception) -> None:
             {ATTR_ENTITY_ID: "switch.fake_profile_block_page"},
             blocking=True,
         )
+
+
+async def test_switch_auth_error(hass: HomeAssistant) -> None:
+    """Tests that the turn on/off action starts re-auth flow."""
+    entry = await init_integration(hass)
+
+    with patch(
+        "homeassistant.components.nextdns.NextDns.set_setting",
+        side_effect=InvalidApiKeyError,
+    ):
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: "switch.fake_profile_block_page"},
+            blocking=True,
+        )
+
+    assert entry.state is ConfigEntryState.LOADED
+
+    flows = hass.config_entries.flow.async_progress()
+    assert len(flows) == 1
+
+    flow = flows[0]
+    assert flow.get("step_id") == "reauth_confirm"
+    assert flow.get("handler") == DOMAIN
+
+    assert "context" in flow
+    assert flow["context"].get("source") == SOURCE_REAUTH
+    assert flow["context"].get("entry_id") == entry.entry_id
diff --git a/tests/components/nice_go/snapshots/test_cover.ambr b/tests/components/nice_go/snapshots/test_cover.ambr
index 49b5267df56..0e1f9013a94 100644
--- a/tests/components/nice_go/snapshots/test_cover.ambr
+++ b/tests/components/nice_go/snapshots/test_cover.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -102,6 +104,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/nice_go/snapshots/test_diagnostics.ambr b/tests/components/nice_go/snapshots/test_diagnostics.ambr
index f4ba363a421..b33726d2b72 100644
--- a/tests/components/nice_go/snapshots/test_diagnostics.ambr
+++ b/tests/components/nice_go/snapshots/test_diagnostics.ambr
@@ -60,6 +60,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': '**REDACTED**',
       'unique_id': '**REDACTED**',
       'version': 1,
diff --git a/tests/components/nice_go/snapshots/test_light.ambr b/tests/components/nice_go/snapshots/test_light.ambr
index 529df95a570..2b88b7d8d74 100644
--- a/tests/components/nice_go/snapshots/test_light.ambr
+++ b/tests/components/nice_go/snapshots/test_light.ambr
@@ -10,6 +10,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -65,6 +66,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/nice_go/test_cover.py b/tests/components/nice_go/test_cover.py
index f90c2d438b0..542b1717d88 100644
--- a/tests/components/nice_go/test_cover.py
+++ b/tests/components/nice_go/test_cover.py
@@ -4,7 +4,7 @@ from unittest.mock import AsyncMock
 
 from aiohttp import ClientError
 from freezegun.api import FrozenDateTimeFactory
-from nice_go import ApiError
+from nice_go import ApiError, AuthFailedError
 import pytest
 from syrupy import SnapshotAssertion
 
@@ -154,3 +154,86 @@ async def test_cover_exceptions(
             {ATTR_ENTITY_ID: entity_id},
             blocking=True,
         )
+
+
+async def test_auth_failed_error(
+    hass: HomeAssistant,
+    mock_nice_go: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test that if an auth failed error occurs, the integration attempts a token refresh and a retry before throwing an error."""
+
+    await setup_integration(hass, mock_config_entry, [Platform.COVER])
+
+    def _open_side_effect(*args, **kwargs):
+        if mock_nice_go.open_barrier.call_count <= 3:
+            raise AuthFailedError
+        if mock_nice_go.open_barrier.call_count == 5:
+            raise AuthFailedError
+        if mock_nice_go.open_barrier.call_count == 6:
+            raise ApiError
+
+    def _close_side_effect(*args, **kwargs):
+        if mock_nice_go.close_barrier.call_count <= 3:
+            raise AuthFailedError
+        if mock_nice_go.close_barrier.call_count == 4:
+            raise ApiError
+
+    mock_nice_go.open_barrier.side_effect = _open_side_effect
+    mock_nice_go.close_barrier.side_effect = _close_side_effect
+
+    with pytest.raises(HomeAssistantError, match="Error opening the barrier"):
+        await hass.services.async_call(
+            COVER_DOMAIN,
+            SERVICE_OPEN_COVER,
+            {ATTR_ENTITY_ID: "cover.test_garage_1"},
+            blocking=True,
+        )
+
+    assert mock_nice_go.authenticate.call_count == 1
+    assert mock_nice_go.open_barrier.call_count == 2
+
+    with pytest.raises(HomeAssistantError, match="Error closing the barrier"):
+        await hass.services.async_call(
+            COVER_DOMAIN,
+            SERVICE_CLOSE_COVER,
+            {ATTR_ENTITY_ID: "cover.test_garage_2"},
+            blocking=True,
+        )
+
+    assert mock_nice_go.authenticate.call_count == 2
+    assert mock_nice_go.close_barrier.call_count == 2
+
+    # Try again, but this time the auth failed error should not be raised
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_OPEN_COVER,
+        {ATTR_ENTITY_ID: "cover.test_garage_1"},
+        blocking=True,
+    )
+
+    assert mock_nice_go.authenticate.call_count == 3
+    assert mock_nice_go.open_barrier.call_count == 4
+
+    # One more time but with an ApiError instead of AuthFailed
+
+    with pytest.raises(HomeAssistantError, match="Error opening the barrier"):
+        await hass.services.async_call(
+            COVER_DOMAIN,
+            SERVICE_OPEN_COVER,
+            {ATTR_ENTITY_ID: "cover.test_garage_1"},
+            blocking=True,
+        )
+
+    with pytest.raises(HomeAssistantError, match="Error closing the barrier"):
+        await hass.services.async_call(
+            COVER_DOMAIN,
+            SERVICE_CLOSE_COVER,
+            {ATTR_ENTITY_ID: "cover.test_garage_2"},
+            blocking=True,
+        )
+
+    assert mock_nice_go.authenticate.call_count == 5
+    assert mock_nice_go.open_barrier.call_count == 6
+    assert mock_nice_go.close_barrier.call_count == 4
diff --git a/tests/components/nice_go/test_light.py b/tests/components/nice_go/test_light.py
index b170a0ee3ab..2bc9de59b2b 100644
--- a/tests/components/nice_go/test_light.py
+++ b/tests/components/nice_go/test_light.py
@@ -3,7 +3,7 @@
 from unittest.mock import AsyncMock
 
 from aiohttp import ClientError
-from nice_go import ApiError
+from nice_go import ApiError, AuthFailedError
 import pytest
 from syrupy import SnapshotAssertion
 
@@ -160,3 +160,86 @@ async def test_unsupported_device_type(
         "Please create an issue with your device model in additional info"
         in caplog.text
     )
+
+
+async def test_auth_failed_error(
+    hass: HomeAssistant,
+    mock_nice_go: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test that if an auth failed error occurs, the integration attempts a token refresh and a retry before throwing an error."""
+
+    await setup_integration(hass, mock_config_entry, [Platform.LIGHT])
+
+    def _on_side_effect(*args, **kwargs):
+        if mock_nice_go.light_on.call_count <= 3:
+            raise AuthFailedError
+        if mock_nice_go.light_on.call_count == 5:
+            raise AuthFailedError
+        if mock_nice_go.light_on.call_count == 6:
+            raise ApiError
+
+    def _off_side_effect(*args, **kwargs):
+        if mock_nice_go.light_off.call_count <= 3:
+            raise AuthFailedError
+        if mock_nice_go.light_off.call_count == 4:
+            raise ApiError
+
+    mock_nice_go.light_on.side_effect = _on_side_effect
+    mock_nice_go.light_off.side_effect = _off_side_effect
+
+    with pytest.raises(HomeAssistantError, match="Error while turning on the light"):
+        await hass.services.async_call(
+            LIGHT_DOMAIN,
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: "light.test_garage_1_light"},
+            blocking=True,
+        )
+
+    assert mock_nice_go.authenticate.call_count == 1
+    assert mock_nice_go.light_on.call_count == 2
+
+    with pytest.raises(HomeAssistantError, match="Error while turning off the light"):
+        await hass.services.async_call(
+            LIGHT_DOMAIN,
+            SERVICE_TURN_OFF,
+            {ATTR_ENTITY_ID: "light.test_garage_2_light"},
+            blocking=True,
+        )
+
+    assert mock_nice_go.authenticate.call_count == 2
+    assert mock_nice_go.light_off.call_count == 2
+
+    # Try again, but this time the auth failed error should not be raised
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_garage_1_light"},
+        blocking=True,
+    )
+
+    assert mock_nice_go.authenticate.call_count == 3
+    assert mock_nice_go.light_on.call_count == 4
+
+    # One more time but with an ApiError instead of AuthFailed
+
+    with pytest.raises(HomeAssistantError, match="Error while turning on the light"):
+        await hass.services.async_call(
+            LIGHT_DOMAIN,
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: "light.test_garage_1_light"},
+            blocking=True,
+        )
+
+    with pytest.raises(HomeAssistantError, match="Error while turning off the light"):
+        await hass.services.async_call(
+            LIGHT_DOMAIN,
+            SERVICE_TURN_OFF,
+            {ATTR_ENTITY_ID: "light.test_garage_2_light"},
+            blocking=True,
+        )
+
+    assert mock_nice_go.authenticate.call_count == 5
+    assert mock_nice_go.light_on.call_count == 6
+    assert mock_nice_go.light_off.call_count == 4
diff --git a/tests/components/nice_go/test_switch.py b/tests/components/nice_go/test_switch.py
index d3a2141eb2b..cab009c5b94 100644
--- a/tests/components/nice_go/test_switch.py
+++ b/tests/components/nice_go/test_switch.py
@@ -3,7 +3,7 @@
 from unittest.mock import AsyncMock
 
 from aiohttp import ClientError
-from nice_go import ApiError
+from nice_go import ApiError, AuthFailedError
 import pytest
 
 from homeassistant.components.switch import (
@@ -88,3 +88,86 @@ async def test_error(
             {ATTR_ENTITY_ID: entity_id},
             blocking=True,
         )
+
+
+async def test_auth_failed_error(
+    hass: HomeAssistant,
+    mock_nice_go: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test that if an auth failed error occurs, the integration attempts a token refresh and a retry before throwing an error."""
+
+    await setup_integration(hass, mock_config_entry, [Platform.SWITCH])
+
+    def _on_side_effect(*args, **kwargs):
+        if mock_nice_go.vacation_mode_on.call_count <= 3:
+            raise AuthFailedError
+        if mock_nice_go.vacation_mode_on.call_count == 5:
+            raise AuthFailedError
+        if mock_nice_go.vacation_mode_on.call_count == 6:
+            raise ApiError
+
+    def _off_side_effect(*args, **kwargs):
+        if mock_nice_go.vacation_mode_off.call_count <= 3:
+            raise AuthFailedError
+        if mock_nice_go.vacation_mode_off.call_count == 4:
+            raise ApiError
+
+    mock_nice_go.vacation_mode_on.side_effect = _on_side_effect
+    mock_nice_go.vacation_mode_off.side_effect = _off_side_effect
+
+    with pytest.raises(HomeAssistantError, match="Error while turning on the switch"):
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: "switch.test_garage_1_vacation_mode"},
+            blocking=True,
+        )
+
+    assert mock_nice_go.authenticate.call_count == 1
+    assert mock_nice_go.vacation_mode_on.call_count == 2
+
+    with pytest.raises(HomeAssistantError, match="Error while turning off the switch"):
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_OFF,
+            {ATTR_ENTITY_ID: "switch.test_garage_2_vacation_mode"},
+            blocking=True,
+        )
+
+    assert mock_nice_go.authenticate.call_count == 2
+    assert mock_nice_go.vacation_mode_off.call_count == 2
+
+    # Try again, but this time the auth failed error should not be raised
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "switch.test_garage_1_vacation_mode"},
+        blocking=True,
+    )
+
+    assert mock_nice_go.authenticate.call_count == 3
+    assert mock_nice_go.vacation_mode_on.call_count == 4
+
+    # One more time but with an ApiError instead of AuthFailed
+
+    with pytest.raises(HomeAssistantError, match="Error while turning on the switch"):
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: "switch.test_garage_1_vacation_mode"},
+            blocking=True,
+        )
+
+    with pytest.raises(HomeAssistantError, match="Error while turning off the switch"):
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_OFF,
+            {ATTR_ENTITY_ID: "switch.test_garage_2_vacation_mode"},
+            blocking=True,
+        )
+
+    assert mock_nice_go.authenticate.call_count == 5
+    assert mock_nice_go.vacation_mode_on.call_count == 6
+    assert mock_nice_go.vacation_mode_off.call_count == 4
diff --git a/tests/components/niko_home_control/snapshots/test_cover.ambr b/tests/components/niko_home_control/snapshots/test_cover.ambr
index 6f99c1adb8c..5fe89497298 100644
--- a/tests/components/niko_home_control/snapshots/test_cover.ambr
+++ b/tests/components/niko_home_control/snapshots/test_cover.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/niko_home_control/snapshots/test_light.ambr b/tests/components/niko_home_control/snapshots/test_light.ambr
index 702b7326ee2..adb0e743786 100644
--- a/tests/components/niko_home_control/snapshots/test_light.ambr
+++ b/tests/components/niko_home_control/snapshots/test_light.ambr
@@ -10,6 +10,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -66,6 +67,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/nmbs/__init__.py b/tests/components/nmbs/__init__.py
index 91226950aba..3d284e5bb77 100644
--- a/tests/components/nmbs/__init__.py
+++ b/tests/components/nmbs/__init__.py
@@ -1,20 +1 @@
 """Tests for the NMBS integration."""
-
-import json
-from typing import Any
-
-from tests.common import load_fixture
-
-
-def mock_api_unavailable() -> dict[str, Any]:
-    """Mock for unavailable api."""
-    return -1
-
-
-def mock_station_response() -> dict[str, Any]:
-    """Mock for valid station response."""
-    dummy_stations_response: dict[str, Any] = json.loads(
-        load_fixture("stations.json", "nmbs")
-    )
-
-    return dummy_stations_response
diff --git a/tests/components/nmbs/conftest.py b/tests/components/nmbs/conftest.py
index 69200fc4c98..a39334ba62c 100644
--- a/tests/components/nmbs/conftest.py
+++ b/tests/components/nmbs/conftest.py
@@ -3,6 +3,7 @@
 from collections.abc import Generator
 from unittest.mock import AsyncMock, patch
 
+from pyrail.models import StationsApiResponse
 import pytest
 
 from homeassistant.components.nmbs.const import (
@@ -38,8 +39,8 @@ def mock_nmbs_client() -> Generator[AsyncMock]:
         ),
     ):
         client = mock_client.return_value
-        client.get_stations.return_value = load_json_object_fixture(
-            "stations.json", DOMAIN
+        client.get_stations.return_value = StationsApiResponse.from_dict(
+            load_json_object_fixture("stations.json", DOMAIN)
         )
         yield client
 
diff --git a/tests/components/nmbs/test_config_flow.py b/tests/components/nmbs/test_config_flow.py
index 6e55f89e54a..7e0f087607b 100644
--- a/tests/components/nmbs/test_config_flow.py
+++ b/tests/components/nmbs/test_config_flow.py
@@ -6,6 +6,7 @@ from unittest.mock import AsyncMock
 import pytest
 
 from homeassistant import config_entries
+from homeassistant.components.nmbs.config_flow import CONF_EXCLUDE_VIAS
 from homeassistant.components.nmbs.const import (
     CONF_STATION_FROM,
     CONF_STATION_LIVE,
@@ -120,11 +121,28 @@ async def test_abort_if_exists(
     assert result["reason"] == "already_configured"
 
 
+async def test_dont_abort_if_exists_when_vias_differs(
+    hass: HomeAssistant, mock_nmbs_client: AsyncMock, mock_config_entry: MockConfigEntry
+) -> None:
+    """Test aborting the flow if the entry already exists."""
+    mock_config_entry.add_to_hass(hass)
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_USER},
+        data={
+            CONF_STATION_FROM: DUMMY_DATA["STAT_BRUSSELS_NORTH"],
+            CONF_STATION_TO: DUMMY_DATA["STAT_BRUSSELS_SOUTH"],
+            CONF_EXCLUDE_VIAS: True,
+        },
+    )
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+
+
 async def test_unavailable_api(
     hass: HomeAssistant, mock_nmbs_client: AsyncMock
 ) -> None:
     """Test starting a flow by user and api is unavailable."""
-    mock_nmbs_client.get_stations.return_value = -1
+    mock_nmbs_client.get_stations.return_value = None
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
         context={"source": config_entries.SOURCE_USER},
@@ -158,7 +176,10 @@ async def test_import(
         CONF_STATION_LIVE: "BE.NMBS.008813003",
         CONF_STATION_TO: "BE.NMBS.008814001",
     }
-    assert result["result"].unique_id == "BE.NMBS.008812005_BE.NMBS.008814001"
+    assert (
+        result["result"].unique_id
+        == f"{DUMMY_DATA['STAT_BRUSSELS_NORTH']}_{DUMMY_DATA['STAT_BRUSSELS_SOUTH']}"
+    )
 
 
 async def test_step_import_abort_if_already_setup(
@@ -182,7 +203,7 @@ async def test_unavailable_api_import(
     hass: HomeAssistant, mock_nmbs_client: AsyncMock
 ) -> None:
     """Test starting a flow by import and api is unavailable."""
-    mock_nmbs_client.get_stations.return_value = -1
+    mock_nmbs_client.get_stations.return_value = None
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
         context={"source": SOURCE_IMPORT},
diff --git a/tests/components/nordpool/snapshots/test_sensor.ambr b/tests/components/nordpool/snapshots/test_sensor.ambr
index 9b328c3a71d..86aa49357c5 100644
--- a/tests/components/nordpool/snapshots/test_sensor.ambr
+++ b/tests/components/nordpool/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -107,6 +109,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -160,6 +163,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -207,6 +211,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -259,6 +264,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -306,6 +312,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -358,6 +365,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -410,6 +418,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -463,6 +472,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -516,6 +526,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -567,6 +578,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -614,6 +626,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -663,6 +676,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -716,6 +730,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -769,6 +784,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -820,6 +836,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -867,6 +884,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -916,6 +934,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -969,6 +988,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1022,6 +1042,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1073,6 +1094,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1120,6 +1142,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1167,6 +1190,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1217,6 +1241,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1265,6 +1290,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1318,6 +1344,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1371,6 +1398,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1418,6 +1446,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1470,6 +1499,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1517,6 +1547,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1569,6 +1600,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1621,6 +1653,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1674,6 +1707,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1727,6 +1761,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1778,6 +1813,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1825,6 +1861,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1874,6 +1911,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1927,6 +1965,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1980,6 +2019,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2031,6 +2071,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2078,6 +2119,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2127,6 +2169,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2180,6 +2223,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2233,6 +2277,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2284,6 +2329,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2331,6 +2377,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2378,6 +2425,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/notion/test_diagnostics.py b/tests/components/notion/test_diagnostics.py
index 890ce2dfc4a..c1d1bd1bb2e 100644
--- a/tests/components/notion/test_diagnostics.py
+++ b/tests/components/notion/test_diagnostics.py
@@ -37,6 +37,7 @@ async def test_entry_diagnostics(
             "created_at": ANY,
             "modified_at": ANY,
             "discovery_keys": {},
+            "subentries": [],
         },
         "data": {
             "bridges": [
diff --git a/tests/components/nsw_rural_fire_service_feed/test_geo_location.py b/tests/components/nsw_rural_fire_service_feed/test_geo_location.py
index ad987325b97..96d5e815ff0 100644
--- a/tests/components/nsw_rural_fire_service_feed/test_geo_location.py
+++ b/tests/components/nsw_rural_fire_service_feed/test_geo_location.py
@@ -37,7 +37,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import assert_setup_component, async_fire_time_changed
 
diff --git a/tests/components/nuheat/test_climate.py b/tests/components/nuheat/test_climate.py
index bc00df126e5..5e3ba384b2d 100644
--- a/tests/components/nuheat/test_climate.py
+++ b/tests/components/nuheat/test_climate.py
@@ -6,7 +6,7 @@ from unittest.mock import patch
 from homeassistant.components.nuheat.const import DOMAIN
 from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .mocks import (
     MOCK_CONFIG_ENTRY,
diff --git a/tests/components/nuki/snapshots/test_binary_sensor.ambr b/tests/components/nuki/snapshots/test_binary_sensor.ambr
index 55976bcb433..e48cc55bfb3 100644
--- a/tests/components/nuki/snapshots/test_binary_sensor.ambr
+++ b/tests/components/nuki/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -99,6 +101,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -146,6 +149,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -193,6 +197,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/nuki/snapshots/test_lock.ambr b/tests/components/nuki/snapshots/test_lock.ambr
index 24c80e7b487..2d80110a5cc 100644
--- a/tests/components/nuki/snapshots/test_lock.ambr
+++ b/tests/components/nuki/snapshots/test_lock.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/nuki/snapshots/test_sensor.ambr b/tests/components/nuki/snapshots/test_sensor.ambr
index a319104fbc3..5be025727be 100644
--- a/tests/components/nuki/snapshots/test_sensor.ambr
+++ b/tests/components/nuki/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/number/test_init.py b/tests/components/number/test_init.py
index 31d99dc55d7..7b19879d873 100644
--- a/tests/components/number/test_init.py
+++ b/tests/components/number/test_init.py
@@ -38,7 +38,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, State
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import STORAGE_KEY as RESTORE_STATE_KEY
 from homeassistant.setup import async_setup_component
 from homeassistant.util.unit_system import METRIC_SYSTEM, US_CUSTOMARY_SYSTEM
@@ -974,7 +974,7 @@ async def test_name(hass: HomeAssistant) -> None:
     async def async_setup_entry_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test number platform via config entry."""
         async_add_entities([entity1, entity2, entity3, entity4])
diff --git a/tests/components/nut/conftest.py b/tests/components/nut/conftest.py
new file mode 100644
index 00000000000..bcf1cb4a99f
--- /dev/null
+++ b/tests/components/nut/conftest.py
@@ -0,0 +1,5 @@
+"""NUT session fixtures."""
+
+import pytest
+
+pytest.register_assert_rewrite("tests.components.nut.util")
diff --git a/tests/components/nut/fixtures/EATON-EPDU-G3-AMBIENT-NOT-PRESENT.json b/tests/components/nut/fixtures/EATON-EPDU-G3-AMBIENT-NOT-PRESENT.json
new file mode 100644
index 00000000000..96394e618c9
--- /dev/null
+++ b/tests/components/nut/fixtures/EATON-EPDU-G3-AMBIENT-NOT-PRESENT.json
@@ -0,0 +1,539 @@
+{
+  "ambient.contacts.1.status": "opened",
+  "ambient.contacts.2.status": "opened",
+  "ambient.count": "0",
+  "ambient.humidity": "29.90",
+  "ambient.humidity.high": "90",
+  "ambient.humidity.high.critical": "90",
+  "ambient.humidity.high.warning": "65",
+  "ambient.humidity.low": "10",
+  "ambient.humidity.low.critical": "10",
+  "ambient.humidity.low.warning": "20",
+  "ambient.humidity.status": "good",
+  "ambient.present": "no",
+  "ambient.temperature": "28.9",
+  "ambient.temperature.high": "43.30",
+  "ambient.temperature.high.critical": "43.30",
+  "ambient.temperature.high.warning": "37.70",
+  "ambient.temperature.low": "5",
+  "ambient.temperature.low.critical": "5",
+  "ambient.temperature.low.warning": "10",
+  "ambient.temperature.status": "good",
+  "device.contact": "Contact Name",
+  "device.count": "1",
+  "device.description": "ePDU MA 00U-C IN: TYPE 00A 0P OUT: 00xTYPE",
+  "device.location": "Device Location",
+  "device.macaddr": "00 00 00 FF FF FF ",
+  "device.mfr": "EATON",
+  "device.model": "ePDU MA 00U-C IN: TYPE 00A 0P OUT: 00xTYPE",
+  "device.part": "EMA000-00",
+  "device.serial": "A000A00000",
+  "device.type": "pdu",
+  "driver.debug": "0",
+  "driver.flag.allow_killpower": "0",
+  "driver.name": "snmp-ups",
+  "driver.parameter.pollinterval": "2",
+  "driver.parameter.port": "eaton-pdu",
+  "driver.parameter.synchronous": "auto",
+  "driver.state": "dumping",
+  "driver.version": "2.8.2.882-882-g63d90ebcb",
+  "driver.version.data": "eaton_epdu MIB 0.69",
+  "driver.version.internal": "1.31",
+  "input.current": "4.30",
+  "input.current.high.critical": "16",
+  "input.current.high.warning": "12.80",
+  "input.current.low.warning": "0",
+  "input.current.nominal": "16",
+  "input.current.status": "good",
+  "input.feed.color": "0",
+  "input.feed.desc": "Feed A",
+  "input.frequency": "60",
+  "input.frequency.status": "good",
+  "input.L1.current": "4.30",
+  "input.L1.current.high.critical": "16",
+  "input.L1.current.high.warning": "12.80",
+  "input.L1.current.low.warning": "0",
+  "input.L1.current.nominal": "16",
+  "input.L1.current.status": "good",
+  "input.L1.load": "26",
+  "input.L1.power": "529",
+  "input.L1.realpower": "482",
+  "input.L1.voltage": "122.91",
+  "input.L1.voltage.high.critical": "140",
+  "input.L1.voltage.high.warning": "130",
+  "input.L1.voltage.low.critical": "90",
+  "input.L1.voltage.low.warning": "95",
+  "input.L1.voltage.status": "good",
+  "input.load": "26",
+  "input.phases": "1",
+  "input.power": "532",
+  "input.realpower": "482",
+  "input.realpower.nominal": "1920",
+  "input.voltage": "122.91",
+  "input.voltage.high.critical": "140",
+  "input.voltage.high.warning": "130",
+  "input.voltage.low.critical": "90",
+  "input.voltage.low.warning": "95",
+  "input.voltage.status": "good",
+  "outlet.1.current": "0",
+  "outlet.1.current.high.critical": "16",
+  "outlet.1.current.high.warning": "12.80",
+  "outlet.1.current.low.warning": "0",
+  "outlet.1.current.status": "good",
+  "outlet.1.delay.shutdown": "120",
+  "outlet.1.delay.start": "1",
+  "outlet.1.desc": "Outlet A1",
+  "outlet.1.groupid": "1",
+  "outlet.1.id": "1",
+  "outlet.1.name": "A1",
+  "outlet.1.power": "0",
+  "outlet.1.realpower": "0",
+  "outlet.1.status": "on",
+  "outlet.1.switchable": "yes",
+  "outlet.1.timer.shutdown": "-1",
+  "outlet.1.timer.start": "-1",
+  "outlet.1.type": "nema520",
+  "outlet.10.current": "0.26",
+  "outlet.10.current.high.critical": "16",
+  "outlet.10.current.high.warning": "12.80",
+  "outlet.10.current.low.warning": "0",
+  "outlet.10.current.status": "good",
+  "outlet.10.delay.shutdown": "120",
+  "outlet.10.delay.start": "10",
+  "outlet.10.desc": "Outlet A10",
+  "outlet.10.groupid": "1",
+  "outlet.10.id": "10",
+  "outlet.10.name": "A10",
+  "outlet.10.power": "32",
+  "outlet.10.realpower": "15",
+  "outlet.10.status": "on",
+  "outlet.10.switchable": "yes",
+  "outlet.10.timer.shutdown": "-1",
+  "outlet.10.timer.start": "-1",
+  "outlet.10.type": "nema520",
+  "outlet.11.current": "0.24",
+  "outlet.11.current.high.critical": "16",
+  "outlet.11.current.high.warning": "12.80",
+  "outlet.11.current.low.warning": "0",
+  "outlet.11.current.status": "good",
+  "outlet.11.delay.shutdown": "120",
+  "outlet.11.delay.start": "11",
+  "outlet.11.desc": "Outlet A11",
+  "outlet.11.groupid": "1",
+  "outlet.11.id": "11",
+  "outlet.11.name": "A11",
+  "outlet.11.power": "29",
+  "outlet.11.realpower": "22",
+  "outlet.11.status": "on",
+  "outlet.11.switchable": "yes",
+  "outlet.11.timer.shutdown": "-1",
+  "outlet.11.timer.start": "-1",
+  "outlet.11.type": "nema520",
+  "outlet.12.current": "0",
+  "outlet.12.current.high.critical": "16",
+  "outlet.12.current.high.warning": "12.80",
+  "outlet.12.current.low.warning": "0",
+  "outlet.12.current.status": "good",
+  "outlet.12.delay.shutdown": "120",
+  "outlet.12.delay.start": "12",
+  "outlet.12.desc": "Outlet A12",
+  "outlet.12.groupid": "1",
+  "outlet.12.id": "12",
+  "outlet.12.name": "A12",
+  "outlet.12.power": "0",
+  "outlet.12.realpower": "0",
+  "outlet.12.status": "on",
+  "outlet.12.switchable": "yes",
+  "outlet.12.timer.shutdown": "-1",
+  "outlet.12.timer.start": "-1",
+  "outlet.12.type": "nema520",
+  "outlet.13.current": "0.23",
+  "outlet.13.current.high.critical": "16",
+  "outlet.13.current.high.warning": "12.80",
+  "outlet.13.current.low.warning": "0",
+  "outlet.13.current.status": "good",
+  "outlet.13.delay.shutdown": "0",
+  "outlet.13.delay.start": "0",
+  "outlet.13.desc": "Outlet A13",
+  "outlet.13.groupid": "1",
+  "outlet.13.id": "0",
+  "outlet.13.name": "A13",
+  "outlet.13.power": "27",
+  "outlet.13.realpower": "9",
+  "outlet.13.status": "on",
+  "outlet.13.switchable": "yes",
+  "outlet.13.timer.shutdown": "-1",
+  "outlet.13.timer.start": "-1",
+  "outlet.13.type": "nema520",
+  "outlet.14.current": "0.10",
+  "outlet.14.current.high.critical": "16",
+  "outlet.14.current.high.warning": "12.80",
+  "outlet.14.current.low.warning": "0",
+  "outlet.14.current.status": "good",
+  "outlet.14.delay.shutdown": "120",
+  "outlet.14.delay.start": "14",
+  "outlet.14.desc": "Outlet A14",
+  "outlet.14.groupid": "1",
+  "outlet.14.id": "14",
+  "outlet.14.name": "A14",
+  "outlet.14.power": "12",
+  "outlet.14.realpower": "7",
+  "outlet.14.status": "on",
+  "outlet.14.switchable": "yes",
+  "outlet.14.timer.shutdown": "-1",
+  "outlet.14.timer.start": "-1",
+  "outlet.14.type": "nema520",
+  "outlet.15.current": "0.03",
+  "outlet.15.current.high.critical": "16",
+  "outlet.15.current.high.warning": "12.80",
+  "outlet.15.current.low.warning": "0",
+  "outlet.15.current.status": "good",
+  "outlet.15.delay.shutdown": "120",
+  "outlet.15.delay.start": "15",
+  "outlet.15.desc": "Outlet A15",
+  "outlet.15.groupid": "1",
+  "outlet.15.id": "15",
+  "outlet.15.name": "A15",
+  "outlet.15.power": "3",
+  "outlet.15.realpower": "1",
+  "outlet.15.status": "on",
+  "outlet.15.switchable": "yes",
+  "outlet.15.timer.shutdown": "-1",
+  "outlet.15.timer.start": "-1",
+  "outlet.15.type": "nema520",
+  "outlet.16.current": "0.04",
+  "outlet.16.current.high.critical": "16",
+  "outlet.16.current.high.warning": "12.80",
+  "outlet.16.current.low.warning": "0",
+  "outlet.16.current.status": "good",
+  "outlet.16.delay.shutdown": "120",
+  "outlet.16.delay.start": "16",
+  "outlet.16.desc": "Outlet A16",
+  "outlet.16.groupid": "1",
+  "outlet.16.id": "16",
+  "outlet.16.name": "A16",
+  "outlet.16.power": "4",
+  "outlet.16.realpower": "1",
+  "outlet.16.status": "on",
+  "outlet.16.switchable": "yes",
+  "outlet.16.timer.shutdown": "-1",
+  "outlet.16.timer.start": "-1",
+  "outlet.16.type": "nema520",
+  "outlet.17.current": "0.19",
+  "outlet.17.current.high.critical": "16",
+  "outlet.17.current.high.warning": "12.80",
+  "outlet.17.current.low.warning": "0",
+  "outlet.17.current.status": "good",
+  "outlet.17.delay.shutdown": "0",
+  "outlet.17.delay.start": "0",
+  "outlet.17.desc": "Outlet A17",
+  "outlet.17.groupid": "1",
+  "outlet.17.id": "0",
+  "outlet.17.name": "A17",
+  "outlet.17.power": "23",
+  "outlet.17.realpower": "5",
+  "outlet.17.status": "on",
+  "outlet.17.switchable": "yes",
+  "outlet.17.timer.shutdown": "-1",
+  "outlet.17.timer.start": "-1",
+  "outlet.17.type": "nema520",
+  "outlet.18.current": "0.35",
+  "outlet.18.current.high.critical": "16",
+  "outlet.18.current.high.warning": "12.80",
+  "outlet.18.current.low.warning": "0",
+  "outlet.18.current.status": "good",
+  "outlet.18.delay.shutdown": "0",
+  "outlet.18.delay.start": "0",
+  "outlet.18.desc": "Outlet A18",
+  "outlet.18.groupid": "1",
+  "outlet.18.id": "0",
+  "outlet.18.name": "A18",
+  "outlet.18.power": "42",
+  "outlet.18.realpower": "34",
+  "outlet.18.status": "on",
+  "outlet.18.switchable": "yes",
+  "outlet.18.timer.shutdown": "-1",
+  "outlet.18.timer.start": "-1",
+  "outlet.18.type": "nema520",
+  "outlet.19.current": "0.12",
+  "outlet.19.current.high.critical": "16",
+  "outlet.19.current.high.warning": "12.80",
+  "outlet.19.current.low.warning": "0",
+  "outlet.19.current.status": "good",
+  "outlet.19.delay.shutdown": "0",
+  "outlet.19.delay.start": "0",
+  "outlet.19.desc": "Outlet A19",
+  "outlet.19.groupid": "1",
+  "outlet.19.id": "0",
+  "outlet.19.name": "A19",
+  "outlet.19.power": "15",
+  "outlet.19.realpower": "6",
+  "outlet.19.status": "on",
+  "outlet.19.switchable": "yes",
+  "outlet.19.timer.shutdown": "-1",
+  "outlet.19.timer.start": "-1",
+  "outlet.19.type": "nema520",
+  "outlet.2.current": "0.39",
+  "outlet.2.current.high.critical": "16",
+  "outlet.2.current.high.warning": "12.80",
+  "outlet.2.current.low.warning": "0",
+  "outlet.2.current.status": "good",
+  "outlet.2.delay.shutdown": "120",
+  "outlet.2.delay.start": "2",
+  "outlet.2.desc": "Outlet A2",
+  "outlet.2.groupid": "1",
+  "outlet.2.id": "2",
+  "outlet.2.name": "A2",
+  "outlet.2.power": "47",
+  "outlet.2.realpower": "43",
+  "outlet.2.status": "on",
+  "outlet.2.switchable": "yes",
+  "outlet.2.timer.shutdown": "-1",
+  "outlet.2.timer.start": "-1",
+  "outlet.2.type": "nema520",
+  "outlet.20.current": "0",
+  "outlet.20.current.high.critical": "16",
+  "outlet.20.current.high.warning": "12.80",
+  "outlet.20.current.low.warning": "0",
+  "outlet.20.current.status": "good",
+  "outlet.20.delay.shutdown": "120",
+  "outlet.20.delay.start": "20",
+  "outlet.20.desc": "Outlet A20",
+  "outlet.20.groupid": "1",
+  "outlet.20.id": "20",
+  "outlet.20.name": "A20",
+  "outlet.20.power": "0",
+  "outlet.20.realpower": "0",
+  "outlet.20.status": "on",
+  "outlet.20.switchable": "yes",
+  "outlet.20.timer.shutdown": "-1",
+  "outlet.20.timer.start": "-1",
+  "outlet.20.type": "nema520",
+  "outlet.21.current": "0",
+  "outlet.21.current.high.critical": "16",
+  "outlet.21.current.high.warning": "12.80",
+  "outlet.21.current.low.warning": "0",
+  "outlet.21.current.status": "good",
+  "outlet.21.delay.shutdown": "120",
+  "outlet.21.delay.start": "21",
+  "outlet.21.desc": "Outlet A21",
+  "outlet.21.groupid": "1",
+  "outlet.21.id": "21",
+  "outlet.21.name": "A21",
+  "outlet.21.power": "0",
+  "outlet.21.realpower": "0",
+  "outlet.21.status": "on",
+  "outlet.21.switchable": "yes",
+  "outlet.21.timer.shutdown": "-1",
+  "outlet.21.timer.start": "-1",
+  "outlet.21.type": "nema520",
+  "outlet.22.current": "0",
+  "outlet.22.current.high.critical": "16",
+  "outlet.22.current.high.warning": "12.80",
+  "outlet.22.current.low.warning": "0",
+  "outlet.22.current.status": "good",
+  "outlet.22.delay.shutdown": "0",
+  "outlet.22.delay.start": "0",
+  "outlet.22.desc": "Outlet A22",
+  "outlet.22.groupid": "1",
+  "outlet.22.id": "0",
+  "outlet.22.name": "A22",
+  "outlet.22.power": "0",
+  "outlet.22.realpower": "0",
+  "outlet.22.status": "on",
+  "outlet.22.switchable": "yes",
+  "outlet.22.timer.shutdown": "-1",
+  "outlet.22.timer.start": "-1",
+  "outlet.22.type": "nema520",
+  "outlet.23.current": "0.34",
+  "outlet.23.current.high.critical": "16",
+  "outlet.23.current.high.warning": "12.80",
+  "outlet.23.current.low.warning": "0",
+  "outlet.23.current.status": "good",
+  "outlet.23.delay.shutdown": "120",
+  "outlet.23.delay.start": "23",
+  "outlet.23.desc": "Outlet A23",
+  "outlet.23.groupid": "1",
+  "outlet.23.id": "23",
+  "outlet.23.name": "A23",
+  "outlet.23.power": "41",
+  "outlet.23.realpower": "39",
+  "outlet.23.status": "on",
+  "outlet.23.switchable": "yes",
+  "outlet.23.timer.shutdown": "-1",
+  "outlet.23.timer.start": "-1",
+  "outlet.23.type": "nema520",
+  "outlet.24.current": "0.19",
+  "outlet.24.current.high.critical": "16",
+  "outlet.24.current.high.warning": "12.80",
+  "outlet.24.current.low.warning": "0",
+  "outlet.24.current.status": "good",
+  "outlet.24.delay.shutdown": "0",
+  "outlet.24.delay.start": "0",
+  "outlet.24.desc": "Outlet A24",
+  "outlet.24.groupid": "1",
+  "outlet.24.id": "0",
+  "outlet.24.name": "A24",
+  "outlet.24.power": "23",
+  "outlet.24.realpower": "11",
+  "outlet.24.status": "on",
+  "outlet.24.switchable": "yes",
+  "outlet.24.timer.shutdown": "-1",
+  "outlet.24.timer.start": "-1",
+  "outlet.24.type": "nema520",
+  "outlet.3.current": "0.46",
+  "outlet.3.current.high.critical": "16",
+  "outlet.3.current.high.warning": "12.80",
+  "outlet.3.current.low.warning": "0",
+  "outlet.3.current.status": "good",
+  "outlet.3.delay.shutdown": "120",
+  "outlet.3.delay.start": "3",
+  "outlet.3.desc": "Outlet A3",
+  "outlet.3.groupid": "1",
+  "outlet.3.id": "3",
+  "outlet.3.name": "A3",
+  "outlet.3.power": "56",
+  "outlet.3.realpower": "53",
+  "outlet.3.status": "on",
+  "outlet.3.switchable": "yes",
+  "outlet.3.timer.shutdown": "-1",
+  "outlet.3.timer.start": "-1",
+  "outlet.3.type": "nema520",
+  "outlet.4.current": "0.44",
+  "outlet.4.current.high.critical": "16",
+  "outlet.4.current.high.warning": "12.80",
+  "outlet.4.current.low.warning": "0",
+  "outlet.4.current.status": "good",
+  "outlet.4.delay.shutdown": "120",
+  "outlet.4.delay.start": "4",
+  "outlet.4.desc": "Outlet A4",
+  "outlet.4.groupid": "1",
+  "outlet.4.id": "4",
+  "outlet.4.name": "A4",
+  "outlet.4.power": "53",
+  "outlet.4.realpower": "48",
+  "outlet.4.status": "on",
+  "outlet.4.switchable": "yes",
+  "outlet.4.timer.shutdown": "-1",
+  "outlet.4.timer.start": "-1",
+  "outlet.4.type": "nema520",
+  "outlet.5.current": "0.43",
+  "outlet.5.current.high.critical": "16",
+  "outlet.5.current.high.warning": "12.80",
+  "outlet.5.current.low.warning": "0",
+  "outlet.5.current.status": "good",
+  "outlet.5.delay.shutdown": "120",
+  "outlet.5.delay.start": "5",
+  "outlet.5.desc": "Outlet A5",
+  "outlet.5.groupid": "1",
+  "outlet.5.id": "5",
+  "outlet.5.name": "A5",
+  "outlet.5.power": "52",
+  "outlet.5.realpower": "48",
+  "outlet.5.status": "on",
+  "outlet.5.switchable": "yes",
+  "outlet.5.timer.shutdown": "-1",
+  "outlet.5.timer.start": "-1",
+  "outlet.5.type": "nema520",
+  "outlet.6.current": "1.07",
+  "outlet.6.current.high.critical": "16",
+  "outlet.6.current.high.warning": "12.80",
+  "outlet.6.current.low.warning": "0",
+  "outlet.6.current.status": "good",
+  "outlet.6.delay.shutdown": "120",
+  "outlet.6.delay.start": "6",
+  "outlet.6.desc": "Outlet A6",
+  "outlet.6.groupid": "1",
+  "outlet.6.id": "6",
+  "outlet.6.name": "A6",
+  "outlet.6.power": "131",
+  "outlet.6.realpower": "118",
+  "outlet.6.status": "on",
+  "outlet.6.switchable": "yes",
+  "outlet.6.timer.shutdown": "-1",
+  "outlet.6.timer.start": "-1",
+  "outlet.6.type": "nema520",
+  "outlet.7.current": "0",
+  "outlet.7.current.high.critical": "16",
+  "outlet.7.current.high.warning": "12.80",
+  "outlet.7.current.low.warning": "0",
+  "outlet.7.current.status": "good",
+  "outlet.7.delay.shutdown": "120",
+  "outlet.7.delay.start": "7",
+  "outlet.7.desc": "Outlet A7",
+  "outlet.7.groupid": "1",
+  "outlet.7.id": "7",
+  "outlet.7.name": "A7",
+  "outlet.7.power": "0",
+  "outlet.7.realpower": "0",
+  "outlet.7.status": "on",
+  "outlet.7.switchable": "yes",
+  "outlet.7.timer.shutdown": "-1",
+  "outlet.7.timer.start": "-1",
+  "outlet.7.type": "nema520",
+  "outlet.8.current": "0",
+  "outlet.8.current.high.critical": "16",
+  "outlet.8.current.high.warning": "12.80",
+  "outlet.8.current.low.warning": "0",
+  "outlet.8.current.status": "good",
+  "outlet.8.delay.shutdown": "120",
+  "outlet.8.delay.start": "8",
+  "outlet.8.desc": "Outlet A8",
+  "outlet.8.groupid": "1",
+  "outlet.8.id": "8",
+  "outlet.8.name": "A8",
+  "outlet.8.power": "0",
+  "outlet.8.realpower": "0",
+  "outlet.8.status": "on",
+  "outlet.8.switchable": "yes",
+  "outlet.8.timer.shutdown": "-1",
+  "outlet.8.timer.start": "-1",
+  "outlet.8.type": "nema520",
+  "outlet.9.current": "0",
+  "outlet.9.current.high.critical": "16",
+  "outlet.9.current.high.warning": "12.80",
+  "outlet.9.current.low.warning": "0",
+  "outlet.9.current.status": "good",
+  "outlet.9.delay.shutdown": "120",
+  "outlet.9.delay.start": "9",
+  "outlet.9.desc": "Outlet A9",
+  "outlet.9.groupid": "1",
+  "outlet.9.id": "9",
+  "outlet.9.name": "A9",
+  "outlet.9.power": "0",
+  "outlet.9.realpower": "0",
+  "outlet.9.status": "on",
+  "outlet.9.switchable": "yes",
+  "outlet.9.timer.shutdown": "-1",
+  "outlet.9.timer.start": "-1",
+  "outlet.9.type": "nema520",
+  "outlet.count": "24",
+  "outlet.current": "43.05",
+  "outlet.desc": "All outlets",
+  "outlet.frequency": "60",
+  "outlet.group.1.color": "16051527",
+  "outlet.group.1.count": "24",
+  "outlet.group.1.desc": "Section A",
+  "outlet.group.1.id": "1",
+  "outlet.group.1.input": "1",
+  "outlet.group.1.name": "A",
+  "outlet.group.1.phase": "1",
+  "outlet.group.1.status": "on",
+  "outlet.group.1.type": "outlet-section",
+  "outlet.group.1.voltage": "122.83",
+  "outlet.group.1.voltage.high.critical": "140",
+  "outlet.group.1.voltage.high.warning": "130",
+  "outlet.group.1.voltage.low.critical": "90",
+  "outlet.group.1.voltage.low.warning": "95",
+  "outlet.group.1.voltage.status": "good",
+  "outlet.group.count": "1",
+  "outlet.id": "0",
+  "outlet.switchable": "yes",
+  "outlet.voltage": "122.91",
+  "ups.firmware": "05.01.0002",
+  "ups.mfr": "EATON",
+  "ups.model": "ePDU MA 00U-C IN: TYPE 00A 0P OUT: 00xTYPE",
+  "ups.serial": "A000A00000",
+  "ups.status": "",
+  "ups.type": "pdu"
+}
diff --git a/tests/components/nut/fixtures/EATON-EPDU-G3.json b/tests/components/nut/fixtures/EATON-EPDU-G3.json
new file mode 100644
index 00000000000..cd6aeb4fd92
--- /dev/null
+++ b/tests/components/nut/fixtures/EATON-EPDU-G3.json
@@ -0,0 +1,539 @@
+{
+  "ambient.contacts.1.status": "opened",
+  "ambient.contacts.2.status": "opened",
+  "ambient.count": "0",
+  "ambient.humidity": "29.90",
+  "ambient.humidity.high": "90",
+  "ambient.humidity.high.critical": "90",
+  "ambient.humidity.high.warning": "65",
+  "ambient.humidity.low": "10",
+  "ambient.humidity.low.critical": "10",
+  "ambient.humidity.low.warning": "20",
+  "ambient.humidity.status": "good",
+  "ambient.present": "yes",
+  "ambient.temperature": "28.9",
+  "ambient.temperature.high": "43.30",
+  "ambient.temperature.high.critical": "43.30",
+  "ambient.temperature.high.warning": "37.70",
+  "ambient.temperature.low": "5",
+  "ambient.temperature.low.critical": "5",
+  "ambient.temperature.low.warning": "10",
+  "ambient.temperature.status": "good",
+  "device.contact": "Contact Name",
+  "device.count": "1",
+  "device.description": "ePDU MA 00U-C IN: TYPE 00A 0P OUT: 00xTYPE",
+  "device.location": "Device Location",
+  "device.macaddr": "00 00 00 FF FF FF ",
+  "device.mfr": "EATON",
+  "device.model": "ePDU MA 00U-C IN: TYPE 00A 0P OUT: 00xTYPE",
+  "device.part": "EMA000-00",
+  "device.serial": "A000A00000",
+  "device.type": "pdu",
+  "driver.debug": "0",
+  "driver.flag.allow_killpower": "0",
+  "driver.name": "snmp-ups",
+  "driver.parameter.pollinterval": "2",
+  "driver.parameter.port": "eaton-pdu",
+  "driver.parameter.synchronous": "auto",
+  "driver.state": "dumping",
+  "driver.version": "2.8.2.882-882-g63d90ebcb",
+  "driver.version.data": "eaton_epdu MIB 0.69",
+  "driver.version.internal": "1.31",
+  "input.current": "4.30",
+  "input.current.high.critical": "16",
+  "input.current.high.warning": "12.80",
+  "input.current.low.warning": "0",
+  "input.current.nominal": "16",
+  "input.current.status": "good",
+  "input.feed.color": "0",
+  "input.feed.desc": "Feed A",
+  "input.frequency": "60",
+  "input.frequency.status": "good",
+  "input.L1.current": "4.30",
+  "input.L1.current.high.critical": "16",
+  "input.L1.current.high.warning": "12.80",
+  "input.L1.current.low.warning": "0",
+  "input.L1.current.nominal": "16",
+  "input.L1.current.status": "good",
+  "input.L1.load": "26",
+  "input.L1.power": "529",
+  "input.L1.realpower": "482",
+  "input.L1.voltage": "122.91",
+  "input.L1.voltage.high.critical": "140",
+  "input.L1.voltage.high.warning": "130",
+  "input.L1.voltage.low.critical": "90",
+  "input.L1.voltage.low.warning": "95",
+  "input.L1.voltage.status": "good",
+  "input.load": "26",
+  "input.phases": "1",
+  "input.power": "532",
+  "input.realpower": "482",
+  "input.realpower.nominal": "1920",
+  "input.voltage": "122.91",
+  "input.voltage.high.critical": "140",
+  "input.voltage.high.warning": "130",
+  "input.voltage.low.critical": "90",
+  "input.voltage.low.warning": "95",
+  "input.voltage.status": "good",
+  "outlet.1.current": "0",
+  "outlet.1.current.high.critical": "16",
+  "outlet.1.current.high.warning": "12.80",
+  "outlet.1.current.low.warning": "0",
+  "outlet.1.current.status": "good",
+  "outlet.1.delay.shutdown": "120",
+  "outlet.1.delay.start": "1",
+  "outlet.1.desc": "Outlet A1",
+  "outlet.1.groupid": "1",
+  "outlet.1.id": "1",
+  "outlet.1.name": "A1",
+  "outlet.1.power": "0",
+  "outlet.1.realpower": "0",
+  "outlet.1.status": "on",
+  "outlet.1.switchable": "yes",
+  "outlet.1.timer.shutdown": "-1",
+  "outlet.1.timer.start": "-1",
+  "outlet.1.type": "nema520",
+  "outlet.10.current": "0.26",
+  "outlet.10.current.high.critical": "16",
+  "outlet.10.current.high.warning": "12.80",
+  "outlet.10.current.low.warning": "0",
+  "outlet.10.current.status": "good",
+  "outlet.10.delay.shutdown": "120",
+  "outlet.10.delay.start": "10",
+  "outlet.10.desc": "Outlet A10",
+  "outlet.10.groupid": "1",
+  "outlet.10.id": "10",
+  "outlet.10.name": "A10",
+  "outlet.10.power": "32",
+  "outlet.10.realpower": "15",
+  "outlet.10.status": "on",
+  "outlet.10.switchable": "yes",
+  "outlet.10.timer.shutdown": "-1",
+  "outlet.10.timer.start": "-1",
+  "outlet.10.type": "nema520",
+  "outlet.11.current": "0.24",
+  "outlet.11.current.high.critical": "16",
+  "outlet.11.current.high.warning": "12.80",
+  "outlet.11.current.low.warning": "0",
+  "outlet.11.current.status": "good",
+  "outlet.11.delay.shutdown": "120",
+  "outlet.11.delay.start": "11",
+  "outlet.11.desc": "Outlet A11",
+  "outlet.11.groupid": "1",
+  "outlet.11.id": "11",
+  "outlet.11.name": "A11",
+  "outlet.11.power": "29",
+  "outlet.11.realpower": "22",
+  "outlet.11.status": "on",
+  "outlet.11.switchable": "yes",
+  "outlet.11.timer.shutdown": "-1",
+  "outlet.11.timer.start": "-1",
+  "outlet.11.type": "nema520",
+  "outlet.12.current": "0",
+  "outlet.12.current.high.critical": "16",
+  "outlet.12.current.high.warning": "12.80",
+  "outlet.12.current.low.warning": "0",
+  "outlet.12.current.status": "good",
+  "outlet.12.delay.shutdown": "120",
+  "outlet.12.delay.start": "12",
+  "outlet.12.desc": "Outlet A12",
+  "outlet.12.groupid": "1",
+  "outlet.12.id": "12",
+  "outlet.12.name": "A12",
+  "outlet.12.power": "0",
+  "outlet.12.realpower": "0",
+  "outlet.12.status": "on",
+  "outlet.12.switchable": "yes",
+  "outlet.12.timer.shutdown": "-1",
+  "outlet.12.timer.start": "-1",
+  "outlet.12.type": "nema520",
+  "outlet.13.current": "0.23",
+  "outlet.13.current.high.critical": "16",
+  "outlet.13.current.high.warning": "12.80",
+  "outlet.13.current.low.warning": "0",
+  "outlet.13.current.status": "good",
+  "outlet.13.delay.shutdown": "0",
+  "outlet.13.delay.start": "0",
+  "outlet.13.desc": "Outlet A13",
+  "outlet.13.groupid": "1",
+  "outlet.13.id": "0",
+  "outlet.13.name": "A13",
+  "outlet.13.power": "27",
+  "outlet.13.realpower": "9",
+  "outlet.13.status": "on",
+  "outlet.13.switchable": "yes",
+  "outlet.13.timer.shutdown": "-1",
+  "outlet.13.timer.start": "-1",
+  "outlet.13.type": "nema520",
+  "outlet.14.current": "0.10",
+  "outlet.14.current.high.critical": "16",
+  "outlet.14.current.high.warning": "12.80",
+  "outlet.14.current.low.warning": "0",
+  "outlet.14.current.status": "good",
+  "outlet.14.delay.shutdown": "120",
+  "outlet.14.delay.start": "14",
+  "outlet.14.desc": "Outlet A14",
+  "outlet.14.groupid": "1",
+  "outlet.14.id": "14",
+  "outlet.14.name": "A14",
+  "outlet.14.power": "12",
+  "outlet.14.realpower": "7",
+  "outlet.14.status": "on",
+  "outlet.14.switchable": "yes",
+  "outlet.14.timer.shutdown": "-1",
+  "outlet.14.timer.start": "-1",
+  "outlet.14.type": "nema520",
+  "outlet.15.current": "0.03",
+  "outlet.15.current.high.critical": "16",
+  "outlet.15.current.high.warning": "12.80",
+  "outlet.15.current.low.warning": "0",
+  "outlet.15.current.status": "good",
+  "outlet.15.delay.shutdown": "120",
+  "outlet.15.delay.start": "15",
+  "outlet.15.desc": "Outlet A15",
+  "outlet.15.groupid": "1",
+  "outlet.15.id": "15",
+  "outlet.15.name": "A15",
+  "outlet.15.power": "3",
+  "outlet.15.realpower": "1",
+  "outlet.15.status": "on",
+  "outlet.15.switchable": "yes",
+  "outlet.15.timer.shutdown": "-1",
+  "outlet.15.timer.start": "-1",
+  "outlet.15.type": "nema520",
+  "outlet.16.current": "0.04",
+  "outlet.16.current.high.critical": "16",
+  "outlet.16.current.high.warning": "12.80",
+  "outlet.16.current.low.warning": "0",
+  "outlet.16.current.status": "good",
+  "outlet.16.delay.shutdown": "120",
+  "outlet.16.delay.start": "16",
+  "outlet.16.desc": "Outlet A16",
+  "outlet.16.groupid": "1",
+  "outlet.16.id": "16",
+  "outlet.16.name": "A16",
+  "outlet.16.power": "4",
+  "outlet.16.realpower": "1",
+  "outlet.16.status": "on",
+  "outlet.16.switchable": "yes",
+  "outlet.16.timer.shutdown": "-1",
+  "outlet.16.timer.start": "-1",
+  "outlet.16.type": "nema520",
+  "outlet.17.current": "0.19",
+  "outlet.17.current.high.critical": "16",
+  "outlet.17.current.high.warning": "12.80",
+  "outlet.17.current.low.warning": "0",
+  "outlet.17.current.status": "good",
+  "outlet.17.delay.shutdown": "0",
+  "outlet.17.delay.start": "0",
+  "outlet.17.desc": "Outlet A17",
+  "outlet.17.groupid": "1",
+  "outlet.17.id": "0",
+  "outlet.17.name": "A17",
+  "outlet.17.power": "23",
+  "outlet.17.realpower": "5",
+  "outlet.17.status": "on",
+  "outlet.17.switchable": "yes",
+  "outlet.17.timer.shutdown": "-1",
+  "outlet.17.timer.start": "-1",
+  "outlet.17.type": "nema520",
+  "outlet.18.current": "0.35",
+  "outlet.18.current.high.critical": "16",
+  "outlet.18.current.high.warning": "12.80",
+  "outlet.18.current.low.warning": "0",
+  "outlet.18.current.status": "good",
+  "outlet.18.delay.shutdown": "0",
+  "outlet.18.delay.start": "0",
+  "outlet.18.desc": "Outlet A18",
+  "outlet.18.groupid": "1",
+  "outlet.18.id": "0",
+  "outlet.18.name": "A18",
+  "outlet.18.power": "42",
+  "outlet.18.realpower": "34",
+  "outlet.18.status": "on",
+  "outlet.18.switchable": "yes",
+  "outlet.18.timer.shutdown": "-1",
+  "outlet.18.timer.start": "-1",
+  "outlet.18.type": "nema520",
+  "outlet.19.current": "0.12",
+  "outlet.19.current.high.critical": "16",
+  "outlet.19.current.high.warning": "12.80",
+  "outlet.19.current.low.warning": "0",
+  "outlet.19.current.status": "good",
+  "outlet.19.delay.shutdown": "0",
+  "outlet.19.delay.start": "0",
+  "outlet.19.desc": "Outlet A19",
+  "outlet.19.groupid": "1",
+  "outlet.19.id": "0",
+  "outlet.19.name": "A19",
+  "outlet.19.power": "15",
+  "outlet.19.realpower": "6",
+  "outlet.19.status": "on",
+  "outlet.19.switchable": "yes",
+  "outlet.19.timer.shutdown": "-1",
+  "outlet.19.timer.start": "-1",
+  "outlet.19.type": "nema520",
+  "outlet.2.current": "0.39",
+  "outlet.2.current.high.critical": "16",
+  "outlet.2.current.high.warning": "12.80",
+  "outlet.2.current.low.warning": "0",
+  "outlet.2.current.status": "good",
+  "outlet.2.delay.shutdown": "120",
+  "outlet.2.delay.start": "2",
+  "outlet.2.desc": "Outlet A2",
+  "outlet.2.groupid": "1",
+  "outlet.2.id": "2",
+  "outlet.2.name": "A2",
+  "outlet.2.power": "47",
+  "outlet.2.realpower": "43",
+  "outlet.2.status": "on",
+  "outlet.2.switchable": "yes",
+  "outlet.2.timer.shutdown": "-1",
+  "outlet.2.timer.start": "-1",
+  "outlet.2.type": "nema520",
+  "outlet.20.current": "0",
+  "outlet.20.current.high.critical": "16",
+  "outlet.20.current.high.warning": "12.80",
+  "outlet.20.current.low.warning": "0",
+  "outlet.20.current.status": "good",
+  "outlet.20.delay.shutdown": "120",
+  "outlet.20.delay.start": "20",
+  "outlet.20.desc": "Outlet A20",
+  "outlet.20.groupid": "1",
+  "outlet.20.id": "20",
+  "outlet.20.name": "A20",
+  "outlet.20.power": "0",
+  "outlet.20.realpower": "0",
+  "outlet.20.status": "on",
+  "outlet.20.switchable": "yes",
+  "outlet.20.timer.shutdown": "-1",
+  "outlet.20.timer.start": "-1",
+  "outlet.20.type": "nema520",
+  "outlet.21.current": "0",
+  "outlet.21.current.high.critical": "16",
+  "outlet.21.current.high.warning": "12.80",
+  "outlet.21.current.low.warning": "0",
+  "outlet.21.current.status": "good",
+  "outlet.21.delay.shutdown": "120",
+  "outlet.21.delay.start": "21",
+  "outlet.21.desc": "Outlet A21",
+  "outlet.21.groupid": "1",
+  "outlet.21.id": "21",
+  "outlet.21.name": "A21",
+  "outlet.21.power": "0",
+  "outlet.21.realpower": "0",
+  "outlet.21.status": "on",
+  "outlet.21.switchable": "yes",
+  "outlet.21.timer.shutdown": "-1",
+  "outlet.21.timer.start": "-1",
+  "outlet.21.type": "nema520",
+  "outlet.22.current": "0",
+  "outlet.22.current.high.critical": "16",
+  "outlet.22.current.high.warning": "12.80",
+  "outlet.22.current.low.warning": "0",
+  "outlet.22.current.status": "good",
+  "outlet.22.delay.shutdown": "0",
+  "outlet.22.delay.start": "0",
+  "outlet.22.desc": "Outlet A22",
+  "outlet.22.groupid": "1",
+  "outlet.22.id": "0",
+  "outlet.22.name": "A22",
+  "outlet.22.power": "0",
+  "outlet.22.realpower": "0",
+  "outlet.22.status": "on",
+  "outlet.22.switchable": "yes",
+  "outlet.22.timer.shutdown": "-1",
+  "outlet.22.timer.start": "-1",
+  "outlet.22.type": "nema520",
+  "outlet.23.current": "0.34",
+  "outlet.23.current.high.critical": "16",
+  "outlet.23.current.high.warning": "12.80",
+  "outlet.23.current.low.warning": "0",
+  "outlet.23.current.status": "good",
+  "outlet.23.delay.shutdown": "120",
+  "outlet.23.delay.start": "23",
+  "outlet.23.desc": "Outlet A23",
+  "outlet.23.groupid": "1",
+  "outlet.23.id": "23",
+  "outlet.23.name": "A23",
+  "outlet.23.power": "41",
+  "outlet.23.realpower": "39",
+  "outlet.23.status": "on",
+  "outlet.23.switchable": "yes",
+  "outlet.23.timer.shutdown": "-1",
+  "outlet.23.timer.start": "-1",
+  "outlet.23.type": "nema520",
+  "outlet.24.current": "0.19",
+  "outlet.24.current.high.critical": "16",
+  "outlet.24.current.high.warning": "12.80",
+  "outlet.24.current.low.warning": "0",
+  "outlet.24.current.status": "good",
+  "outlet.24.delay.shutdown": "0",
+  "outlet.24.delay.start": "0",
+  "outlet.24.desc": "Outlet A24",
+  "outlet.24.groupid": "1",
+  "outlet.24.id": "0",
+  "outlet.24.name": "A24",
+  "outlet.24.power": "23",
+  "outlet.24.realpower": "11",
+  "outlet.24.status": "on",
+  "outlet.24.switchable": "yes",
+  "outlet.24.timer.shutdown": "-1",
+  "outlet.24.timer.start": "-1",
+  "outlet.24.type": "nema520",
+  "outlet.3.current": "0.46",
+  "outlet.3.current.high.critical": "16",
+  "outlet.3.current.high.warning": "12.80",
+  "outlet.3.current.low.warning": "0",
+  "outlet.3.current.status": "good",
+  "outlet.3.delay.shutdown": "120",
+  "outlet.3.delay.start": "3",
+  "outlet.3.desc": "Outlet A3",
+  "outlet.3.groupid": "1",
+  "outlet.3.id": "3",
+  "outlet.3.name": "A3",
+  "outlet.3.power": "56",
+  "outlet.3.realpower": "53",
+  "outlet.3.status": "on",
+  "outlet.3.switchable": "yes",
+  "outlet.3.timer.shutdown": "-1",
+  "outlet.3.timer.start": "-1",
+  "outlet.3.type": "nema520",
+  "outlet.4.current": "0.44",
+  "outlet.4.current.high.critical": "16",
+  "outlet.4.current.high.warning": "12.80",
+  "outlet.4.current.low.warning": "0",
+  "outlet.4.current.status": "good",
+  "outlet.4.delay.shutdown": "120",
+  "outlet.4.delay.start": "4",
+  "outlet.4.desc": "Outlet A4",
+  "outlet.4.groupid": "1",
+  "outlet.4.id": "4",
+  "outlet.4.name": "A4",
+  "outlet.4.power": "53",
+  "outlet.4.realpower": "48",
+  "outlet.4.status": "on",
+  "outlet.4.switchable": "yes",
+  "outlet.4.timer.shutdown": "-1",
+  "outlet.4.timer.start": "-1",
+  "outlet.4.type": "nema520",
+  "outlet.5.current": "0.43",
+  "outlet.5.current.high.critical": "16",
+  "outlet.5.current.high.warning": "12.80",
+  "outlet.5.current.low.warning": "0",
+  "outlet.5.current.status": "good",
+  "outlet.5.delay.shutdown": "120",
+  "outlet.5.delay.start": "5",
+  "outlet.5.desc": "Outlet A5",
+  "outlet.5.groupid": "1",
+  "outlet.5.id": "5",
+  "outlet.5.name": "A5",
+  "outlet.5.power": "52",
+  "outlet.5.realpower": "48",
+  "outlet.5.status": "on",
+  "outlet.5.switchable": "yes",
+  "outlet.5.timer.shutdown": "-1",
+  "outlet.5.timer.start": "-1",
+  "outlet.5.type": "nema520",
+  "outlet.6.current": "1.07",
+  "outlet.6.current.high.critical": "16",
+  "outlet.6.current.high.warning": "12.80",
+  "outlet.6.current.low.warning": "0",
+  "outlet.6.current.status": "good",
+  "outlet.6.delay.shutdown": "120",
+  "outlet.6.delay.start": "6",
+  "outlet.6.desc": "Outlet A6",
+  "outlet.6.groupid": "1",
+  "outlet.6.id": "6",
+  "outlet.6.name": "A6",
+  "outlet.6.power": "131",
+  "outlet.6.realpower": "118",
+  "outlet.6.status": "on",
+  "outlet.6.switchable": "yes",
+  "outlet.6.timer.shutdown": "-1",
+  "outlet.6.timer.start": "-1",
+  "outlet.6.type": "nema520",
+  "outlet.7.current": "0",
+  "outlet.7.current.high.critical": "16",
+  "outlet.7.current.high.warning": "12.80",
+  "outlet.7.current.low.warning": "0",
+  "outlet.7.current.status": "good",
+  "outlet.7.delay.shutdown": "120",
+  "outlet.7.delay.start": "7",
+  "outlet.7.desc": "Outlet A7",
+  "outlet.7.groupid": "1",
+  "outlet.7.id": "7",
+  "outlet.7.name": "A7",
+  "outlet.7.power": "0",
+  "outlet.7.realpower": "0",
+  "outlet.7.status": "on",
+  "outlet.7.switchable": "yes",
+  "outlet.7.timer.shutdown": "-1",
+  "outlet.7.timer.start": "-1",
+  "outlet.7.type": "nema520",
+  "outlet.8.current": "0",
+  "outlet.8.current.high.critical": "16",
+  "outlet.8.current.high.warning": "12.80",
+  "outlet.8.current.low.warning": "0",
+  "outlet.8.current.status": "good",
+  "outlet.8.delay.shutdown": "120",
+  "outlet.8.delay.start": "8",
+  "outlet.8.desc": "Outlet A8",
+  "outlet.8.groupid": "1",
+  "outlet.8.id": "8",
+  "outlet.8.name": "A8",
+  "outlet.8.power": "0",
+  "outlet.8.realpower": "0",
+  "outlet.8.status": "on",
+  "outlet.8.switchable": "yes",
+  "outlet.8.timer.shutdown": "-1",
+  "outlet.8.timer.start": "-1",
+  "outlet.8.type": "nema520",
+  "outlet.9.current": "0",
+  "outlet.9.current.high.critical": "16",
+  "outlet.9.current.high.warning": "12.80",
+  "outlet.9.current.low.warning": "0",
+  "outlet.9.current.status": "good",
+  "outlet.9.delay.shutdown": "120",
+  "outlet.9.delay.start": "9",
+  "outlet.9.desc": "Outlet A9",
+  "outlet.9.groupid": "1",
+  "outlet.9.id": "9",
+  "outlet.9.name": "A9",
+  "outlet.9.power": "0",
+  "outlet.9.realpower": "0",
+  "outlet.9.status": "on",
+  "outlet.9.switchable": "yes",
+  "outlet.9.timer.shutdown": "-1",
+  "outlet.9.timer.start": "-1",
+  "outlet.9.type": "nema520",
+  "outlet.count": "24",
+  "outlet.current": "43.05",
+  "outlet.desc": "All outlets",
+  "outlet.frequency": "60",
+  "outlet.group.1.color": "16051527",
+  "outlet.group.1.count": "24",
+  "outlet.group.1.desc": "Section A",
+  "outlet.group.1.id": "1",
+  "outlet.group.1.input": "1",
+  "outlet.group.1.name": "A",
+  "outlet.group.1.phase": "1",
+  "outlet.group.1.status": "on",
+  "outlet.group.1.type": "outlet-section",
+  "outlet.group.1.voltage": "122.83",
+  "outlet.group.1.voltage.high.critical": "140",
+  "outlet.group.1.voltage.high.warning": "130",
+  "outlet.group.1.voltage.low.critical": "90",
+  "outlet.group.1.voltage.low.warning": "95",
+  "outlet.group.1.voltage.status": "good",
+  "outlet.group.count": "1",
+  "outlet.id": "0",
+  "outlet.switchable": "yes",
+  "outlet.voltage": "122.91",
+  "ups.firmware": "05.01.0002",
+  "ups.mfr": "EATON",
+  "ups.model": "ePDU MA 00U-C IN: TYPE 00A 0P OUT: 00xTYPE",
+  "ups.serial": "A000A00000",
+  "ups.status": "",
+  "ups.type": "pdu"
+}
diff --git a/tests/components/nut/test_button.py b/tests/components/nut/test_button.py
new file mode 100644
index 00000000000..bbcc521b7f3
--- /dev/null
+++ b/tests/components/nut/test_button.py
@@ -0,0 +1,102 @@
+"""Test the NUT button platform."""
+
+import pytest
+
+from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
+from homeassistant.components.nut.const import INTEGRATION_SUPPORTED_COMMANDS
+from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from .util import async_init_integration
+
+
+@pytest.mark.parametrize(
+    "model",
+    [
+        "CP1350C",
+        "5E650I",
+        "5E850I",
+        "CP1500PFCLCD",
+        "DL650ELCD",
+        "EATON5P1550",
+        "blazer_usb",
+    ],
+)
+async def test_buttons_ups(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, model: str
+) -> None:
+    """Tests that there are no standard buttons."""
+
+    list_commands_return_value = {
+        supported_command: supported_command
+        for supported_command in INTEGRATION_SUPPORTED_COMMANDS
+    }
+
+    await async_init_integration(
+        hass,
+        model,
+        list_commands_return_value=list_commands_return_value,
+    )
+
+    button = hass.states.get("button.ups1_power_cycle_outlet_1")
+    assert not button
+
+
+@pytest.mark.parametrize(
+    ("model", "unique_id_base"),
+    [
+        (
+            "EATON-EPDU-G3",
+            "EATON_ePDU MA 00U-C IN: TYPE 00A 0P OUT: 00xTYPE_A000A00000_",
+        ),
+    ],
+)
+async def test_buttons_pdu_dynamic_outlets(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    model: str,
+    unique_id_base: str,
+) -> None:
+    """Tests that the button entities are correct."""
+
+    list_commands_return_value = {
+        supported_command: supported_command
+        for supported_command in INTEGRATION_SUPPORTED_COMMANDS
+    }
+
+    for num in range(1, 25):
+        command = f"outlet.{num!s}.load.cycle"
+        list_commands_return_value[command] = command
+
+    await async_init_integration(
+        hass,
+        model,
+        list_commands_return_value=list_commands_return_value,
+    )
+
+    entity_id = "button.ups1_power_cycle_outlet_a1"
+    entry = entity_registry.async_get(entity_id)
+    assert entry
+    assert entry.unique_id == f"{unique_id_base}outlet.1.load.cycle"
+
+    button = hass.states.get(entity_id)
+    assert button
+    assert button.state == STATE_UNKNOWN
+
+    await hass.services.async_call(
+        BUTTON_DOMAIN,
+        SERVICE_PRESS,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    button = hass.states.get(entity_id)
+    assert button.state != STATE_UNKNOWN
+
+    button = hass.states.get("button.ups1_power_cycle_outlet_25")
+    assert not button
+
+    button = hass.states.get("button.ups1_power_cycle_outlet_a25")
+    assert not button
diff --git a/tests/components/nut/test_init.py b/tests/components/nut/test_init.py
index d5d85daa336..0585696cef2 100644
--- a/tests/components/nut/test_init.py
+++ b/tests/components/nut/test_init.py
@@ -1,12 +1,19 @@
 """Test init of Nut integration."""
 
+from copy import deepcopy
 from unittest.mock import patch
 
 from aionut import NUTError, NUTLoginError
 
 from homeassistant.components.nut.const import DOMAIN
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import CONF_HOST, CONF_PORT, STATE_UNAVAILABLE
+from homeassistant.const import (
+    CONF_HOST,
+    CONF_PASSWORD,
+    CONF_PORT,
+    CONF_USERNAME,
+    STATE_UNAVAILABLE,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 
@@ -147,3 +154,44 @@ async def test_device_location(hass: HomeAssistant) -> None:
 
     assert device_entry is not None
     assert device_entry.suggested_area == mock_device_location
+
+
+async def test_update_options(hass: HomeAssistant) -> None:
+    """Test update options triggers reload."""
+    mock_pynut = _get_mock_nutclient(
+        list_ups={"ups1": "UPS 1"}, list_vars={"ups.status": "OL"}
+    )
+
+    with patch(
+        "homeassistant.components.nut.AIONUTClient",
+        return_value=mock_pynut,
+    ):
+        mock_config_entry = MockConfigEntry(
+            domain=DOMAIN,
+            data={
+                CONF_HOST: "mock",
+                CONF_PASSWORD: "somepassword",
+                CONF_PORT: "mock",
+                CONF_USERNAME: "someuser",
+            },
+            options={
+                "device_options": {
+                    "fake_option": "fake_option_value",
+                },
+            },
+        )
+        mock_config_entry.add_to_hass(hass)
+
+        await hass.config_entries.async_setup(mock_config_entry.entry_id)
+        await hass.async_block_till_done()
+
+        assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+        assert mock_config_entry.state is ConfigEntryState.LOADED
+
+        new_options = deepcopy(dict(mock_config_entry.options))
+        new_options["device_options"].clear()
+        hass.config_entries.async_update_entry(mock_config_entry, options=new_options)
+        await hass.async_block_till_done()
+
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    assert mock_config_entry.state is ConfigEntryState.LOADED
diff --git a/tests/components/nut/test_sensor.py b/tests/components/nut/test_sensor.py
index afe57631910..cdec6c5083b 100644
--- a/tests/components/nut/test_sensor.py
+++ b/tests/components/nut/test_sensor.py
@@ -5,17 +5,24 @@ from unittest.mock import patch
 import pytest
 
 from homeassistant.components.nut.const import DOMAIN
+from homeassistant.components.sensor import SensorDeviceClass, SensorStateClass
 from homeassistant.const import (
     CONF_HOST,
     CONF_PORT,
     CONF_RESOURCES,
     PERCENTAGE,
     STATE_UNKNOWN,
+    UnitOfElectricCurrent,
+    UnitOfElectricPotential,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
-from .util import _get_mock_nutclient, async_init_integration
+from .util import (
+    _get_mock_nutclient,
+    _test_sensor_and_attributes,
+    async_init_integration,
+)
 
 from tests.common import MockConfigEntry
 
@@ -32,7 +39,7 @@ from tests.common import MockConfigEntry
         "blazer_usb",
     ],
 )
-async def test_devices(
+async def test_ups_devices(
     hass: HomeAssistant, entity_registry: er.EntityRegistry, model: str
 ) -> None:
     """Test creation of device sensors."""
@@ -67,7 +74,7 @@ async def test_devices(
         ),
     ],
 )
-async def test_devices_with_unique_ids(
+async def test_ups_devices_with_unique_ids(
     hass: HomeAssistant, entity_registry: er.EntityRegistry, model: str, unique_id: str
 ) -> None:
     """Test creation of device sensors with unique ids."""
@@ -92,6 +99,67 @@ async def test_devices_with_unique_ids(
     )
 
 
+@pytest.mark.parametrize(
+    ("model", "unique_id_base"),
+    [
+        (
+            "EATON-EPDU-G3",
+            "EATON_ePDU MA 00U-C IN: TYPE 00A 0P OUT: 00xTYPE_A000A00000",
+        ),
+    ],
+)
+async def test_pdu_devices_with_unique_ids(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    model: str,
+    unique_id_base: str,
+) -> None:
+    """Test creation of device sensors with unique ids."""
+
+    await async_init_integration(hass, model)
+
+    _test_sensor_and_attributes(
+        hass,
+        entity_registry,
+        model,
+        unique_id=f"{unique_id_base}_input.voltage",
+        device_id="sensor.ups1_input_voltage",
+        state_value="122.91",
+        expected_attributes={
+            "device_class": SensorDeviceClass.VOLTAGE,
+            "state_class": SensorStateClass.MEASUREMENT,
+            "friendly_name": "Ups1 Input voltage",
+            "unit_of_measurement": UnitOfElectricPotential.VOLT,
+        },
+    )
+
+    _test_sensor_and_attributes(
+        hass,
+        entity_registry,
+        model,
+        unique_id=f"{unique_id_base}_ambient.humidity.status",
+        device_id="sensor.ups1_ambient_humidity_status",
+        state_value="good",
+        expected_attributes={
+            "device_class": SensorDeviceClass.ENUM,
+            "friendly_name": "Ups1 Ambient humidity status",
+        },
+    )
+
+    _test_sensor_and_attributes(
+        hass,
+        entity_registry,
+        model,
+        unique_id=f"{unique_id_base}_ambient.temperature.status",
+        device_id="sensor.ups1_ambient_temperature_status",
+        state_value="good",
+        expected_attributes={
+            "device_class": SensorDeviceClass.ENUM,
+            "friendly_name": "Ups1 Ambient temperature status",
+        },
+    )
+
+
 async def test_state_sensors(hass: HomeAssistant) -> None:
     """Test creation of status display sensors."""
     entry = MockConfigEntry(
@@ -176,3 +244,89 @@ async def test_stale_options(
 
         state = hass.states.get("sensor.ups1_battery_charge")
         assert state.state == "10"
+
+
+@pytest.mark.parametrize(
+    ("model", "unique_id_base"),
+    [
+        (
+            "EATON-EPDU-G3-AMBIENT-NOT-PRESENT",
+            "EATON_ePDU MA 00U-C IN: TYPE 00A 0P OUT: 00xTYPE_A000A00000",
+        ),
+    ],
+)
+async def test_pdu_devices_ambient_not_present(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    model: str,
+    unique_id_base: str,
+) -> None:
+    """Test that ambient sensors not created."""
+
+    await async_init_integration(hass, model)
+
+    entry = entity_registry.async_get("sensor.ups1_ambient_humidity")
+    assert not entry
+
+    entry = entity_registry.async_get("sensor.ups1_ambient_humidity_status")
+    assert not entry
+
+    entry = entity_registry.async_get("sensor.ups1_ambient_temperature")
+    assert not entry
+
+    entry = entity_registry.async_get("sensor.ups1_ambient_temperature_status")
+    assert not entry
+
+
+@pytest.mark.parametrize(
+    ("model", "unique_id_base"),
+    [
+        (
+            "EATON-EPDU-G3",
+            "EATON_ePDU MA 00U-C IN: TYPE 00A 0P OUT: 00xTYPE_A000A00000",
+        ),
+    ],
+)
+async def test_pdu_dynamic_outlets(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    model: str,
+    unique_id_base: str,
+) -> None:
+    """Test for dynamically created outlet sensors."""
+
+    await async_init_integration(hass, model)
+
+    _test_sensor_and_attributes(
+        hass,
+        entity_registry,
+        model,
+        unique_id=f"{unique_id_base}_outlet.1.current",
+        device_id="sensor.ups1_outlet_a1_current",
+        state_value="0",
+        expected_attributes={
+            "device_class": SensorDeviceClass.CURRENT,
+            "friendly_name": "Ups1 Outlet A1 current",
+            "unit_of_measurement": UnitOfElectricCurrent.AMPERE,
+        },
+    )
+
+    _test_sensor_and_attributes(
+        hass,
+        entity_registry,
+        model,
+        unique_id=f"{unique_id_base}_outlet.24.current",
+        device_id="sensor.ups1_outlet_a24_current",
+        state_value="0.19",
+        expected_attributes={
+            "device_class": SensorDeviceClass.CURRENT,
+            "friendly_name": "Ups1 Outlet A24 current",
+            "unit_of_measurement": UnitOfElectricCurrent.AMPERE,
+        },
+    )
+
+    entry = entity_registry.async_get("sensor.ups1_outlet_25_current")
+    assert not entry
+
+    entry = entity_registry.async_get("sensor.ups1_outlet_a25_current")
+    assert not entry
diff --git a/tests/components/nut/test_switch.py b/tests/components/nut/test_switch.py
new file mode 100644
index 00000000000..f2de5eeb5e6
--- /dev/null
+++ b/tests/components/nut/test_switch.py
@@ -0,0 +1,159 @@
+"""Test the NUT switch platform."""
+
+import json
+from unittest.mock import AsyncMock
+
+import pytest
+
+from homeassistant.components.nut.const import INTEGRATION_SUPPORTED_COMMANDS
+from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+    STATE_ON,
+    STATE_UNKNOWN,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from .util import async_init_integration
+
+from tests.common import load_fixture
+
+
+@pytest.mark.parametrize(
+    "model",
+    [
+        "CP1350C",
+        "5E650I",
+        "5E850I",
+        "CP1500PFCLCD",
+        "DL650ELCD",
+        "EATON5P1550",
+        "blazer_usb",
+    ],
+)
+async def test_switch_ups(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, model: str
+) -> None:
+    """Tests that there are no standard switches."""
+
+    list_commands_return_value = {
+        supported_command: supported_command
+        for supported_command in INTEGRATION_SUPPORTED_COMMANDS
+    }
+
+    await async_init_integration(
+        hass,
+        model,
+        list_commands_return_value=list_commands_return_value,
+    )
+
+    switch = hass.states.get("switch.ups1_power_outlet_1")
+    assert not switch
+
+
+@pytest.mark.parametrize(
+    ("model", "unique_id_base"),
+    [
+        (
+            "EATON-EPDU-G3",
+            "EATON_ePDU MA 00U-C IN: TYPE 00A 0P OUT: 00xTYPE_A000A00000",
+        ),
+    ],
+)
+async def test_switch_pdu_dynamic_outlets(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    model: str,
+    unique_id_base: str,
+) -> None:
+    """Tests that the switch entities are correct."""
+
+    list_commands_return_value = {
+        supported_command: supported_command
+        for supported_command in INTEGRATION_SUPPORTED_COMMANDS
+    }
+
+    for num in range(1, 25):
+        command = f"outlet.{num!s}.load.on"
+        list_commands_return_value[command] = command
+        command = f"outlet.{num!s}.load.off"
+        list_commands_return_value[command] = command
+
+    ups_fixture = f"nut/{model}.json"
+    list_vars = json.loads(load_fixture(ups_fixture))
+
+    run_command = AsyncMock()
+
+    await async_init_integration(
+        hass,
+        model,
+        list_vars=list_vars,
+        list_commands_return_value=list_commands_return_value,
+        run_command=run_command,
+    )
+
+    entity_id = "switch.ups1_power_outlet_a1"
+    entry = entity_registry.async_get(entity_id)
+    assert entry
+    assert entry.unique_id == f"{unique_id_base}_outlet.1.load.poweronoff"
+
+    switch = hass.states.get(entity_id)
+    assert switch
+    assert switch.state == STATE_ON
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+
+    run_command.assert_called_with("ups1", "outlet.1.load.off")
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+
+    run_command.assert_called_with("ups1", "outlet.1.load.on")
+
+    switch = hass.states.get("switch.ups1_power_outlet_25")
+    assert not switch
+
+    switch = hass.states.get("switch.ups1_power_outlet_a25")
+    assert not switch
+
+
+async def test_switch_pdu_dynamic_outlets_state_unknown(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test switch entity with missing status is reported as unknown."""
+
+    config_entry = await async_init_integration(
+        hass,
+        list_ups={"ups1": "UPS 1"},
+        list_vars={
+            "outlet.count": "1",
+            "outlet.1.switchable": "yes",
+            "outlet.1.name": "A1",
+        },
+        list_commands_return_value={
+            "outlet.1.load.on": None,
+            "outlet.1.load.off": None,
+        },
+    )
+
+    entity_id = "switch.ups1_power_outlet_a1"
+    entry = entity_registry.async_get(entity_id)
+    assert entry
+    assert entry.unique_id == f"{config_entry.entry_id}_outlet.1.load.poweronoff"
+
+    switch = hass.states.get(entity_id)
+    assert switch
+    assert switch.state == STATE_UNKNOWN
diff --git a/tests/components/nut/util.py b/tests/components/nut/util.py
index b6c9cffd390..07c073f0286 100644
--- a/tests/components/nut/util.py
+++ b/tests/components/nut/util.py
@@ -6,6 +6,7 @@ from unittest.mock import AsyncMock, MagicMock, patch
 from homeassistant.components.nut.const import DOMAIN
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
 
 from tests.common import MockConfigEntry, load_fixture
 
@@ -79,3 +80,28 @@ async def async_init_integration(
         await hass.async_block_till_done()
 
     return entry
+
+
+def _test_sensor_and_attributes(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    model: str,
+    unique_id: str,
+    device_id: str,
+    state_value: str,
+    expected_attributes: dict,
+) -> None:
+    """Test all of the sensor entry attributes."""
+
+    entry = entity_registry.async_get(device_id)
+    assert entry
+    assert entry.unique_id == unique_id
+
+    state = hass.states.get(device_id)
+    assert state.state == state_value
+
+    # Only test for a subset of attributes in case
+    # HA changes the implementation and a new one appears
+    assert all(
+        state.attributes[key] == attr for key, attr in expected_attributes.items()
+    )
diff --git a/tests/components/nws/const.py b/tests/components/nws/const.py
index 39e954af15a..1de8f67fbdb 100644
--- a/tests/components/nws/const.py
+++ b/tests/components/nws/const.py
@@ -176,7 +176,7 @@ WEATHER_EXPECTED_OBSERVATION_METRIC = {
     ATTR_WEATHER_HUMIDITY: 10,
 }
 
-NONE_OBSERVATION = {key: None for key in DEFAULT_OBSERVATION}
+NONE_OBSERVATION = dict.fromkeys(DEFAULT_OBSERVATION)
 
 DEFAULT_FORECAST = [
     {
@@ -235,4 +235,4 @@ EXPECTED_FORECAST_METRIC = {
     ATTR_FORECAST_HUMIDITY: 75,
 }
 
-NONE_FORECAST = [{key: None for key in DEFAULT_FORECAST[0]}]
+NONE_FORECAST = [dict.fromkeys(DEFAULT_FORECAST[0])]
diff --git a/tests/components/nyt_games/snapshots/test_init.ambr b/tests/components/nyt_games/snapshots/test_init.ambr
index 383bed0e106..d9ce6f15a4d 100644
--- a/tests/components/nyt_games/snapshots/test_init.ambr
+++ b/tests/components/nyt_games/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -35,6 +36,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -67,6 +69,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/nyt_games/snapshots/test_sensor.ambr b/tests/components/nyt_games/snapshots/test_sensor.ambr
index 84b74a26f0d..8201c26739c 100644
--- a/tests/components/nyt_games/snapshots/test_sensor.ambr
+++ b/tests/components/nyt_games/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -108,6 +110,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -157,6 +160,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -207,6 +211,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -257,6 +262,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -307,6 +313,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -357,6 +364,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -407,6 +415,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -458,6 +467,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -509,6 +519,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -559,6 +570,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ohme/conftest.py b/tests/components/ohme/conftest.py
index 3d3db730d08..e8a7d27b2c3 100644
--- a/tests/components/ohme/conftest.py
+++ b/tests/components/ohme/conftest.py
@@ -57,12 +57,17 @@ def mock_client():
         client.target_soc = 50
         client.target_time = (8, 0)
         client.battery = 80
+        client.preconditioning = 15
         client.serial = "chargerid"
         client.ct_connected = True
+        client.cap_available = True
+        client.cap_enabled = True
         client.energy = 1000
         client.device_info = {
             "name": "Ohme Home Pro",
             "model": "Home Pro",
             "sw_version": "v2.65",
         }
+        client.vehicles = ["Nissan Leaf", "Tesla Model 3"]
+        client.current_vehicle = "Nissan Leaf"
         yield client
diff --git a/tests/components/ohme/snapshots/test_button.ambr b/tests/components/ohme/snapshots/test_button.ambr
index 32de16208f4..b276e8c3c42 100644
--- a/tests/components/ohme/snapshots/test_button.ambr
+++ b/tests/components/ohme/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ohme/snapshots/test_diagnostics.ambr b/tests/components/ohme/snapshots/test_diagnostics.ambr
new file mode 100644
index 00000000000..f51c701b71b
--- /dev/null
+++ b/tests/components/ohme/snapshots/test_diagnostics.ambr
@@ -0,0 +1,16 @@
+# serializer version: 1
+# name: test_diagnostics
+  dict({
+    'cap_available': True,
+    'ct_connected': True,
+    'device_info': dict({
+      'model': 'Home Pro',
+      'name': 'Ohme Home Pro',
+      'sw_version': 'v2.65',
+    }),
+    'vehicles': list([
+      'Nissan Leaf',
+      'Tesla Model 3',
+    ]),
+  })
+# ---
diff --git a/tests/components/ohme/snapshots/test_init.ambr b/tests/components/ohme/snapshots/test_init.ambr
index e3ed339b78a..ccf09f546cf 100644
--- a/tests/components/ohme/snapshots/test_init.ambr
+++ b/tests/components/ohme/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/ohme/snapshots/test_number.ambr b/tests/components/ohme/snapshots/test_number.ambr
index 580082635df..69e18d0b2a7 100644
--- a/tests/components/ohme/snapshots/test_number.ambr
+++ b/tests/components/ohme/snapshots/test_number.ambr
@@ -1,4 +1,61 @@
 # serializer version: 1
+# name: test_numbers[number.ohme_home_pro_preconditioning_duration-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 60,
+      'min': 0,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 5,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': None,
+    'entity_id': 'number.ohme_home_pro_preconditioning_duration',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Preconditioning duration',
+    'platform': 'ohme',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'preconditioning_duration',
+    'unique_id': 'chargerid_preconditioning_duration',
+    'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+  })
+# ---
+# name: test_numbers[number.ohme_home_pro_preconditioning_duration-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Ohme Home Pro Preconditioning duration',
+      'max': 60,
+      'min': 0,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 5,
+      'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.ohme_home_pro_preconditioning_duration',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '15',
+  })
+# ---
 # name: test_numbers[number.ohme_home_pro_target_percentage-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -11,6 +68,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ohme/snapshots/test_select.ambr b/tests/components/ohme/snapshots/test_select.ambr
new file mode 100644
index 00000000000..063a9616588
--- /dev/null
+++ b/tests/components/ohme/snapshots/test_select.ambr
@@ -0,0 +1,115 @@
+# serializer version: 1
+# name: test_selects[select.ohme_home_pro_charge_mode-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'smart_charge',
+        'max_charge',
+        'paused',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'select',
+    'entity_category': None,
+    'entity_id': 'select.ohme_home_pro_charge_mode',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Charge mode',
+    'platform': 'ohme',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'charge_mode',
+    'unique_id': 'chargerid_charge_mode',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_selects[select.ohme_home_pro_charge_mode-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Ohme Home Pro Charge mode',
+      'options': list([
+        'smart_charge',
+        'max_charge',
+        'paused',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'select.ohme_home_pro_charge_mode',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_selects[select.ohme_home_pro_vehicle-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'Nissan Leaf',
+        'Tesla Model 3',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'select',
+    'entity_category': None,
+    'entity_id': 'select.ohme_home_pro_vehicle',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Vehicle',
+    'platform': 'ohme',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'vehicle',
+    'unique_id': 'chargerid_vehicle',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_selects[select.ohme_home_pro_vehicle-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Ohme Home Pro Vehicle',
+      'options': list([
+        'Nissan Leaf',
+        'Tesla Model 3',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'select.ohme_home_pro_vehicle',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'Nissan Leaf',
+  })
+# ---
diff --git a/tests/components/ohme/snapshots/test_sensor.ambr b/tests/components/ohme/snapshots/test_sensor.ambr
index 6415d720419..9cef4bfffd9 100644
--- a/tests/components/ohme/snapshots/test_sensor.ambr
+++ b/tests/components/ohme/snapshots/test_sensor.ambr
@@ -1,4 +1,51 @@
 # serializer version: 1
+# name: test_sensors[sensor.ohme_home_pro_charge_slots-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.ohme_home_pro_charge_slots',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Charge slots',
+    'platform': 'ohme',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'slot_list',
+    'unique_id': 'chargerid_slot_list',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensors[sensor.ohme_home_pro_charge_slots-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Ohme Home Pro Charge slots',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.ohme_home_pro_charge_slots',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
 # name: test_sensors[sensor.ohme_home_pro_ct_current-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -6,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -104,6 +153,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -159,6 +209,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -218,9 +269,11 @@
         'charging',
         'plugged_in',
         'paused',
+        'finished',
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -258,6 +311,7 @@
         'charging',
         'plugged_in',
         'paused',
+        'finished',
       ]),
     }),
     'context': <ANY>,
@@ -275,6 +329,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -319,3 +374,55 @@
     'state': '80',
   })
 # ---
+# name: test_sensors[sensor.ohme_home_pro_voltage-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.ohme_home_pro_voltage',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Voltage',
+    'platform': 'ohme',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'chargerid_voltage',
+    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+  })
+# ---
+# name: test_sensors[sensor.ohme_home_pro_voltage-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'friendly_name': 'Ohme Home Pro Voltage',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.ohme_home_pro_voltage',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0',
+  })
+# ---
diff --git a/tests/components/ohme/snapshots/test_switch.ambr b/tests/components/ohme/snapshots/test_switch.ambr
index 76066b6e658..4790d96c551 100644
--- a/tests/components/ohme/snapshots/test_switch.ambr
+++ b/tests/components/ohme/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -45,6 +46,53 @@
     'state': 'on',
   })
 # ---
+# name: test_switches[switch.ohme_home_pro_price_cap-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.ohme_home_pro_price_cap',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Price cap',
+    'platform': 'ohme',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'price_cap',
+    'unique_id': 'chargerid_price_cap',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_switches[switch.ohme_home_pro_price_cap-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Ohme Home Pro Price cap',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.ohme_home_pro_price_cap',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
 # name: test_switches[switch.ohme_home_pro_require_approval-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -52,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ohme/snapshots/test_time.ambr b/tests/components/ohme/snapshots/test_time.ambr
index 4d9fab20e0b..8c85fc2298e 100644
--- a/tests/components/ohme/snapshots/test_time.ambr
+++ b/tests/components/ohme/snapshots/test_time.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ohme/test_config_flow.py b/tests/components/ohme/test_config_flow.py
index bb7ecc00bdc..b8754711d76 100644
--- a/tests/components/ohme/test_config_flow.py
+++ b/tests/components/ohme/test_config_flow.py
@@ -182,3 +182,84 @@ async def test_reauth_fail(
     await hass.async_block_till_done()
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "reauth_successful"
+
+
+async def test_reconfigure_form(hass: HomeAssistant, mock_client: MagicMock) -> None:
+    """Test reconfigure form."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            CONF_EMAIL: "test@example.com",
+            CONF_PASSWORD: "hunter1",
+        },
+    )
+    entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": "reconfigure", "entry_id": entry.entry_id}
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reconfigure"
+    assert not result["errors"]
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_PASSWORD: "hunter2"},
+    )
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reconfigure_successful"
+
+
+@pytest.mark.parametrize(
+    ("test_exception", "expected_error"),
+    [(AuthException, "invalid_auth"), (ApiException, "unknown")],
+)
+async def test_reconfigure_fail(
+    hass: HomeAssistant,
+    mock_client: MagicMock,
+    test_exception: Exception,
+    expected_error: str,
+) -> None:
+    """Test reconfigure errors."""
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            CONF_EMAIL: "test@example.com",
+            CONF_PASSWORD: "hunter1",
+        },
+    )
+    entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": "reconfigure", "entry_id": entry.entry_id}
+    )
+
+    assert result["step_id"] == "reconfigure"
+    assert result["type"] is FlowResultType.FORM
+    assert not result["errors"]
+
+    # Simulate failed login attempt
+    mock_client.async_login.side_effect = test_exception
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_PASSWORD: "hunter1"},
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {"base": expected_error}
+
+    # Retry with a successful login
+    mock_client.async_login.side_effect = None
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_PASSWORD: "hunter2"},
+    )
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reconfigure_successful"
diff --git a/tests/components/ohme/test_diagnostics.py b/tests/components/ohme/test_diagnostics.py
new file mode 100644
index 00000000000..6aab1262189
--- /dev/null
+++ b/tests/components/ohme/test_diagnostics.py
@@ -0,0 +1,28 @@
+"""Tests for the diagnostics data provided by the Ohme integration."""
+
+from unittest.mock import MagicMock
+
+from syrupy import SnapshotAssertion
+
+from homeassistant.core import HomeAssistant
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry
+from tests.components.diagnostics import get_diagnostics_for_config_entry
+from tests.typing import ClientSessionGenerator
+
+
+async def test_diagnostics(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    mock_config_entry: MockConfigEntry,
+    mock_client: MagicMock,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test diagnostics."""
+    await setup_integration(hass, mock_config_entry)
+    assert (
+        await get_diagnostics_for_config_entry(hass, hass_client, mock_config_entry)
+        == snapshot
+    )
diff --git a/tests/components/ohme/test_select.py b/tests/components/ohme/test_select.py
new file mode 100644
index 00000000000..5aeebc1f477
--- /dev/null
+++ b/tests/components/ohme/test_select.py
@@ -0,0 +1,72 @@
+"""Tests for selects."""
+
+from unittest.mock import AsyncMock, MagicMock, patch
+
+from ohme import ChargerMode
+from syrupy import SnapshotAssertion
+
+from homeassistant.const import STATE_UNAVAILABLE, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+async def test_selects(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+    mock_config_entry: MockConfigEntry,
+    mock_client: MagicMock,
+) -> None:
+    """Test the Ohme selects."""
+    with patch("homeassistant.components.ohme.PLATFORMS", [Platform.SELECT]):
+        await setup_integration(hass, mock_config_entry)
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
+
+
+async def test_select_option(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_client: MagicMock,
+) -> None:
+    """Test selecting an option in the Ohme select entity."""
+    mock_client.mode = ChargerMode.SMART_CHARGE
+    mock_client.async_set_mode = AsyncMock()
+
+    await setup_integration(hass, mock_config_entry)
+
+    state = hass.states.get("select.ohme_home_pro_charge_mode")
+    assert state is not None
+    assert state.state == "smart_charge"
+
+    await hass.services.async_call(
+        "select",
+        "select_option",
+        {
+            "entity_id": "select.ohme_home_pro_charge_mode",
+            "option": "max_charge",
+        },
+        blocking=True,
+    )
+
+    mock_client.async_set_mode.assert_called_once_with("max_charge")
+    assert state.state == "smart_charge"
+
+
+async def test_select_unavailable(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_client: MagicMock,
+) -> None:
+    """Test that the select entity shows as unavailable when no mode is set."""
+    mock_client.mode = None
+
+    await setup_integration(hass, mock_config_entry)
+
+    state = hass.states.get("select.ohme_home_pro_charge_mode")
+    assert state is not None
+    assert state.state == STATE_UNAVAILABLE
diff --git a/tests/components/ohme/test_services.py b/tests/components/ohme/test_services.py
index 76c7ce94b57..2513635c1c2 100644
--- a/tests/components/ohme/test_services.py
+++ b/tests/components/ohme/test_services.py
@@ -1,6 +1,6 @@
 """Tests for services."""
 
-from unittest.mock import MagicMock
+from unittest.mock import AsyncMock, MagicMock
 
 import pytest
 from syrupy.assertion import SnapshotAssertion
@@ -8,6 +8,7 @@ from syrupy.assertion import SnapshotAssertion
 from homeassistant.components.ohme.const import DOMAIN
 from homeassistant.components.ohme.services import (
     ATTR_CONFIG_ENTRY,
+    ATTR_PRICE_CAP,
     SERVICE_LIST_CHARGE_SLOTS,
 )
 from homeassistant.core import HomeAssistant
@@ -47,6 +48,30 @@ async def test_list_charge_slots(
     )
 
 
+async def test_set_price_cap(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_client: MagicMock,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test set price cap service."""
+
+    await setup_integration(hass, mock_config_entry)
+    mock_client.async_change_price_cap = AsyncMock()
+
+    await hass.services.async_call(
+        DOMAIN,
+        "set_price_cap",
+        {
+            ATTR_CONFIG_ENTRY: mock_config_entry.entry_id,
+            ATTR_PRICE_CAP: 10.0,
+        },
+        blocking=True,
+    )
+
+    mock_client.async_change_price_cap.assert_called_once_with(cap=10.0)
+
+
 async def test_list_charge_slots_exception(
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,
diff --git a/tests/components/ohme/test_switch.py b/tests/components/ohme/test_switch.py
index b16b70d67f8..8d82a5a3ea4 100644
--- a/tests/components/ohme/test_switch.py
+++ b/tests/components/ohme/test_switch.py
@@ -1,6 +1,6 @@
 """Tests for switches."""
 
-from unittest.mock import MagicMock, patch
+from unittest.mock import AsyncMock, MagicMock, patch
 
 from syrupy import SnapshotAssertion
 
@@ -32,7 +32,49 @@ async def test_switches(
     await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
 
 
-async def test_switch_on(
+async def test_cap_switch_on(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_client: MagicMock,
+) -> None:
+    """Test the switch turn_on action."""
+    await setup_integration(hass, mock_config_entry)
+    mock_client.async_change_price_cap = AsyncMock()
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_ON,
+        {
+            ATTR_ENTITY_ID: "switch.ohme_home_pro_price_cap",
+        },
+        blocking=True,
+    )
+
+    mock_client.async_change_price_cap.assert_called_once_with(True)
+
+
+async def test_cap_switch_off(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_client: MagicMock,
+) -> None:
+    """Test the switch turn_off action."""
+    await setup_integration(hass, mock_config_entry)
+    mock_client.async_change_price_cap = AsyncMock()
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_OFF,
+        {
+            ATTR_ENTITY_ID: "switch.ohme_home_pro_price_cap",
+        },
+        blocking=True,
+    )
+
+    mock_client.async_change_price_cap.assert_called_once_with(False)
+
+
+async def test_config_switch_on(
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,
     mock_client: MagicMock,
@@ -52,7 +94,7 @@ async def test_switch_on(
     assert len(mock_client.async_set_configuration_value.mock_calls) == 1
 
 
-async def test_switch_off(
+async def test_config_switch_off(
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,
     mock_client: MagicMock,
diff --git a/tests/components/ollama/snapshots/test_conversation.ambr b/tests/components/ollama/snapshots/test_conversation.ambr
index e4dd7cd00bb..de414019317 100644
--- a/tests/components/ollama/snapshots/test_conversation.ambr
+++ b/tests/components/ollama/snapshots/test_conversation.ambr
@@ -1,7 +1,8 @@
 # serializer version: 1
 # name: test_unknown_hass_api
   dict({
-    'conversation_id': None,
+    'continue_conversation': False,
+    'conversation_id': '1234',
     'response': IntentResponse(
       card=dict({
       }),
@@ -20,7 +21,7 @@
       speech=dict({
         'plain': dict({
           'extra_data': None,
-          'speech': 'Error preparing LLM API: API non-existing not found',
+          'speech': 'Error preparing LLM API',
         }),
       }),
       speech_slots=dict({
diff --git a/tests/components/ollama/test_conversation.py b/tests/components/ollama/test_conversation.py
index 202f7385697..c718aab1e81 100644
--- a/tests/components/ollama/test_conversation.py
+++ b/tests/components/ollama/test_conversation.py
@@ -1,8 +1,10 @@
 """Tests for the Ollama integration."""
 
+from collections.abc import AsyncGenerator
 from typing import Any
 from unittest.mock import AsyncMock, Mock, patch
 
+from freezegun.api import FrozenDateTimeFactory
 from ollama import Message, ResponseError
 import pytest
 from syrupy.assertion import SnapshotAssertion
@@ -18,6 +20,21 @@ from homeassistant.helpers import intent, llm
 from tests.common import MockConfigEntry
 
 
+@pytest.fixture(autouse=True)
+def mock_ulid_tools():
+    """Mock generated ULIDs for tool calls."""
+    with patch("homeassistant.helpers.llm.ulid_now", return_value="mock-tool-call"):
+        yield
+
+
+async def stream_generator(response: dict | list[dict]) -> AsyncGenerator[dict]:
+    """Generate a response from the assistant."""
+    if not isinstance(response, list):
+        response = [response]
+    for msg in response:
+        yield msg
+
+
 @pytest.mark.parametrize("agent_id", [None, "conversation.mock_title"])
 async def test_chat(
     hass: HomeAssistant,
@@ -35,7 +52,9 @@ async def test_chat(
 
     with patch(
         "ollama.AsyncClient.chat",
-        return_value={"message": {"role": "assistant", "content": "test response"}},
+        return_value=stream_generator(
+            {"message": {"role": "assistant", "content": "test response"}}
+        ),
     ) as mock_chat:
         result = await conversation.async_converse(
             hass,
@@ -74,6 +93,53 @@ async def test_chat(
     assert "Current time is" in detail_event["data"]["messages"][0]["content"]
 
 
+async def test_chat_stream(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_init_component,
+) -> None:
+    """Test chat messages are assembled across streamed responses."""
+
+    entry = MockConfigEntry()
+    entry.add_to_hass(hass)
+
+    with patch(
+        "ollama.AsyncClient.chat",
+        return_value=stream_generator(
+            [
+                {"message": {"role": "assistant", "content": "test "}},
+                {
+                    "message": {"role": "assistant", "content": "response"},
+                    "done": True,
+                    "done_reason": "stop",
+                },
+            ],
+        ),
+    ) as mock_chat:
+        result = await conversation.async_converse(
+            hass,
+            "test message",
+            None,
+            Context(),
+            agent_id=mock_config_entry.entry_id,
+        )
+
+        assert mock_chat.call_count == 1
+        args = mock_chat.call_args.kwargs
+        prompt = args["messages"][0]["content"]
+
+        assert args["model"] == "test model"
+        assert args["messages"] == [
+            Message(role="system", content=prompt),
+            Message(role="user", content="test message"),
+        ]
+
+        assert result.response.response_type == intent.IntentResponseType.ACTION_DONE, (
+            result
+        )
+        assert result.response.speech["plain"]["speech"] == "test response"
+
+
 async def test_template_variables(
     hass: HomeAssistant, mock_config_entry: MockConfigEntry
 ) -> None:
@@ -96,7 +162,9 @@ async def test_template_variables(
         patch("ollama.AsyncClient.list"),
         patch(
             "ollama.AsyncClient.chat",
-            return_value={"message": {"role": "assistant", "content": "test response"}},
+            return_value=stream_generator(
+                {"message": {"role": "assistant", "content": "test response"}}
+            ),
         ) as mock_chat,
         patch("homeassistant.auth.AuthManager.async_get_user", return_value=mock_user),
     ):
@@ -163,26 +231,30 @@ async def test_function_call(
     def completion_result(*args, messages, **kwargs):
         for message in messages:
             if message["role"] == "tool":
-                return {
-                    "message": {
-                        "role": "assistant",
-                        "content": "I have successfully called the function",
-                    }
-                }
-
-        return {
-            "message": {
-                "role": "assistant",
-                "tool_calls": [
+                return stream_generator(
                     {
-                        "function": {
-                            "name": "test_tool",
-                            "arguments": tool_args,
+                        "message": {
+                            "role": "assistant",
+                            "content": "I have successfully called the function",
                         }
                     }
-                ],
+                )
+
+        return stream_generator(
+            {
+                "message": {
+                    "role": "assistant",
+                    "tool_calls": [
+                        {
+                            "function": {
+                                "name": "test_tool",
+                                "arguments": tool_args,
+                            }
+                        }
+                    ],
+                }
             }
-        }
+        )
 
     with patch(
         "ollama.AsyncClient.chat",
@@ -205,6 +277,7 @@ async def test_function_call(
     mock_tool.async_call.assert_awaited_once_with(
         hass,
         llm.ToolInput(
+            id="mock-tool-call",
             tool_name="test_tool",
             tool_args=expected_tool_args,
         ),
@@ -243,26 +316,30 @@ async def test_function_exception(
     def completion_result(*args, messages, **kwargs):
         for message in messages:
             if message["role"] == "tool":
-                return {
-                    "message": {
-                        "role": "assistant",
-                        "content": "There was an error calling the function",
-                    }
-                }
-
-        return {
-            "message": {
-                "role": "assistant",
-                "tool_calls": [
+                return stream_generator(
                     {
-                        "function": {
-                            "name": "test_tool",
-                            "arguments": {"param1": "test_value"},
+                        "message": {
+                            "role": "assistant",
+                            "content": "There was an error calling the function",
                         }
                     }
-                ],
+                )
+
+        return stream_generator(
+            {
+                "message": {
+                    "role": "assistant",
+                    "tool_calls": [
+                        {
+                            "function": {
+                                "name": "test_tool",
+                                "arguments": {"param1": "test_value"},
+                            }
+                        }
+                    ],
+                }
             }
-        }
+        )
 
     with patch(
         "ollama.AsyncClient.chat",
@@ -285,6 +362,7 @@ async def test_function_exception(
     mock_tool.async_call.assert_awaited_once_with(
         hass,
         llm.ToolInput(
+            id="mock-tool-call",
             tool_name="test_tool",
             tool_args={"param1": "test_value"},
         ),
@@ -316,14 +394,21 @@ async def test_unknown_hass_api(
     await hass.async_block_till_done()
 
     result = await conversation.async_converse(
-        hass, "hello", None, Context(), agent_id=mock_config_entry.entry_id
+        hass,
+        "hello",
+        "1234",
+        Context(),
+        agent_id=mock_config_entry.entry_id,
     )
 
     assert result == snapshot
 
 
 async def test_message_history_trimming(
-    hass: HomeAssistant, mock_config_entry: MockConfigEntry, mock_init_component
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_init_component,
+    freezer: FrozenDateTimeFactory,
 ) -> None:
     """Test that a single message history is trimmed according to the config."""
     response_idx = 0
@@ -331,7 +416,9 @@ async def test_message_history_trimming(
     def response(*args, **kwargs) -> dict:
         nonlocal response_idx
         response_idx += 1
-        return {"message": {"role": "assistant", "content": f"response {response_idx}"}}
+        return stream_generator(
+            {"message": {"role": "assistant", "content": f"response {response_idx}"}}
+        )
 
     with patch(
         "ollama.AsyncClient.chat",
@@ -419,70 +506,19 @@ async def test_message_history_trimming(
         assert args[4].kwargs["messages"][5]["content"] == "message 5"
 
 
-async def test_message_history_pruning(
-    hass: HomeAssistant, mock_config_entry: MockConfigEntry, mock_init_component
-) -> None:
-    """Test that old message histories are pruned."""
-    with patch(
-        "ollama.AsyncClient.chat",
-        return_value={"message": {"role": "assistant", "content": "test response"}},
-    ):
-        # Create 3 different message histories
-        conversation_ids: list[str] = []
-        for i in range(3):
-            result = await conversation.async_converse(
-                hass,
-                f"message {i + 1}",
-                conversation_id=None,
-                context=Context(),
-                agent_id=mock_config_entry.entry_id,
-            )
-            assert (
-                result.response.response_type == intent.IntentResponseType.ACTION_DONE
-            ), result
-            assert isinstance(result.conversation_id, str)
-            conversation_ids.append(result.conversation_id)
-
-        agent = conversation.get_agent_manager(hass).async_get_agent(
-            mock_config_entry.entry_id
-        )
-        assert len(agent._history) == 3
-        assert agent._history.keys() == set(conversation_ids)
-
-        # Modify the timestamps of the first 2 histories so they will be pruned
-        # on the next cycle.
-        for conversation_id in conversation_ids[:2]:
-            # Move back 2 hours
-            agent._history[conversation_id].timestamp -= 2 * 60 * 60
-
-        # Next cycle
-        result = await conversation.async_converse(
-            hass,
-            "test message",
-            conversation_id=None,
-            context=Context(),
-            agent_id=mock_config_entry.entry_id,
-        )
-        assert result.response.response_type == intent.IntentResponseType.ACTION_DONE, (
-            result
-        )
-
-        # Only the most recent histories should remain
-        assert len(agent._history) == 2
-        assert conversation_ids[-1] in agent._history
-        assert result.conversation_id in agent._history
-
-
 async def test_message_history_unlimited(
     hass: HomeAssistant, mock_config_entry: MockConfigEntry, mock_init_component
 ) -> None:
     """Test that message history is not trimmed when max_history = 0."""
     conversation_id = "1234"
+
+    def stream(*args, **kwargs) -> AsyncGenerator[dict]:
+        return stream_generator(
+            {"message": {"role": "assistant", "content": "test response"}}
+        )
+
     with (
-        patch(
-            "ollama.AsyncClient.chat",
-            return_value={"message": {"role": "assistant", "content": "test response"}},
-        ),
+        patch("ollama.AsyncClient.chat", side_effect=stream) as mock_chat,
     ):
         hass.config_entries.async_update_entry(
             mock_config_entry, options={ollama.CONF_MAX_HISTORY: 0}
@@ -499,13 +535,13 @@ async def test_message_history_unlimited(
                 result.response.response_type == intent.IntentResponseType.ACTION_DONE
             ), result
 
-        agent = conversation.get_agent_manager(hass).async_get_agent(
-            mock_config_entry.entry_id
+        args = mock_chat.call_args_list
+        assert len(args) == 100
+        recorded_messages = args[-1].kwargs["messages"]
+        message_count = sum(
+            (message["role"] == "user") for message in recorded_messages
         )
-
-        assert len(agent._history) == 1
-        assert conversation_id in agent._history
-        assert agent._history[conversation_id].num_user_messages == 100
+        assert message_count == 100
 
 
 async def test_error_handling(
@@ -599,7 +635,9 @@ async def test_options(
     """Test that options are passed correctly to ollama client."""
     with patch(
         "ollama.AsyncClient.chat",
-        return_value={"message": {"role": "assistant", "content": "test response"}},
+        return_value=stream_generator(
+            {"message": {"role": "assistant", "content": "test response"}}
+        ),
     ) as mock_chat:
         await conversation.async_converse(
             hass,
diff --git a/tests/components/omnilogic/snapshots/test_sensor.ambr b/tests/components/omnilogic/snapshots/test_sensor.ambr
index a4ea7f02a03..b6eb07dbe26 100644
--- a/tests/components/omnilogic/snapshots/test_sensor.ambr
+++ b/tests/components/omnilogic/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -56,6 +57,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/omnilogic/snapshots/test_switch.ambr b/tests/components/omnilogic/snapshots/test_switch.ambr
index a5d77f1adcf..cc1a2e226fc 100644
--- a/tests/components/omnilogic/snapshots/test_switch.ambr
+++ b/tests/components/omnilogic/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/onboarding/snapshots/test_views.ambr b/tests/components/onboarding/snapshots/test_views.ambr
new file mode 100644
index 00000000000..48ddf30d1f2
--- /dev/null
+++ b/tests/components/onboarding/snapshots/test_views.ambr
@@ -0,0 +1,68 @@
+# serializer version: 1
+# name: test_onboarding_backup_info
+  dict({
+    'backups': list([
+      dict({
+        'addons': list([
+          dict({
+            'name': 'Test',
+            'slug': 'test',
+            'version': '1.0.0',
+          }),
+        ]),
+        'agents': dict({
+          'backup.local': dict({
+            'protected': True,
+            'size': 0,
+          }),
+        }),
+        'backup_id': 'abc123',
+        'database_included': True,
+        'date': '1970-01-01T00:00:00.000Z',
+        'extra_metadata': dict({
+          'instance_id': 'abc123',
+          'with_automatic_settings': True,
+        }),
+        'failed_agent_ids': list([
+        ]),
+        'folders': list([
+          'media',
+          'share',
+        ]),
+        'homeassistant_included': True,
+        'homeassistant_version': '2024.12.0',
+        'name': 'Test',
+        'with_automatic_settings': True,
+      }),
+      dict({
+        'addons': list([
+        ]),
+        'agents': dict({
+          'test.remote': dict({
+            'protected': True,
+            'size': 0,
+          }),
+        }),
+        'backup_id': 'def456',
+        'database_included': False,
+        'date': '1980-01-01T00:00:00.000Z',
+        'extra_metadata': dict({
+          'instance_id': 'unknown_uuid',
+          'with_automatic_settings': True,
+        }),
+        'failed_agent_ids': list([
+        ]),
+        'folders': list([
+          'media',
+          'share',
+        ]),
+        'homeassistant_included': True,
+        'homeassistant_version': '2024.12.0',
+        'name': 'Test 2',
+        'with_automatic_settings': None,
+      }),
+    ]),
+    'last_action_event': None,
+    'state': 'idle',
+  })
+# ---
diff --git a/tests/components/onboarding/test_views.py b/tests/components/onboarding/test_views.py
index 35f6b7d739c..509dece7dd0 100644
--- a/tests/components/onboarding/test_views.py
+++ b/tests/components/onboarding/test_views.py
@@ -3,16 +3,24 @@
 import asyncio
 from collections.abc import AsyncGenerator
 from http import HTTPStatus
+from io import StringIO
 import os
 from typing import Any
-from unittest.mock import AsyncMock, Mock, patch
+from unittest.mock import ANY, DEFAULT, AsyncMock, MagicMock, Mock, patch
 
+from hass_nabucasa.auth import CognitoAuth
+from hass_nabucasa.const import STATE_CONNECTED
+from hass_nabucasa.iot import CloudIoT
 import pytest
+from syrupy import SnapshotAssertion
 
-from homeassistant.components import onboarding
+from homeassistant.components import backup, onboarding
+from homeassistant.components.cloud import DOMAIN as CLOUD_DOMAIN, CloudClient
 from homeassistant.components.onboarding import const, views
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import area_registry as ar
+from homeassistant.helpers.backup import async_initialize_backup
 from homeassistant.setup import async_setup_component
 
 from . import mock_storage
@@ -526,32 +534,6 @@ async def test_onboarding_core_sets_up_radio_browser(
     assert len(hass.config_entries.async_entries("radio_browser")) == 1
 
 
-async def test_onboarding_core_sets_up_rpi_power(
-    hass: HomeAssistant,
-    hass_storage: dict[str, Any],
-    hass_client: ClientSessionGenerator,
-    aioclient_mock: AiohttpClientMocker,
-    rpi,
-    mock_default_integrations,
-) -> None:
-    """Test that the core step sets up rpi_power on RPi."""
-    mock_storage(hass_storage, {"done": [const.STEP_USER]})
-
-    assert await async_setup_component(hass, "onboarding", {})
-    await hass.async_block_till_done()
-
-    client = await hass_client()
-
-    resp = await client.post("/api/onboarding/core_config")
-
-    assert resp.status == 200
-
-    await hass.async_block_till_done()
-
-    rpi_power_state = hass.states.get("binary_sensor.rpi_power_status")
-    assert rpi_power_state
-
-
 async def test_onboarding_core_no_rpi_power(
     hass: HomeAssistant,
     hass_storage: dict[str, Any],
@@ -649,12 +631,28 @@ async def test_onboarding_installation_type(
         assert resp_content["installation_type"] == "Home Assistant Core"
 
 
-async def test_onboarding_installation_type_after_done(
+@pytest.mark.parametrize(
+    ("method", "view", "kwargs"),
+    [
+        ("get", "installation_type", {}),
+        ("get", "backup/info", {}),
+        (
+            "post",
+            "backup/restore",
+            {"json": {"backup_id": "abc123", "agent_id": "test"}},
+        ),
+        ("post", "backup/upload", {}),
+    ],
+)
+async def test_onboarding_view_after_done(
     hass: HomeAssistant,
     hass_storage: dict[str, Any],
     hass_client: ClientSessionGenerator,
+    method: str,
+    view: str,
+    kwargs: dict[str, Any],
 ) -> None:
-    """Test raising for installation type after onboarding."""
+    """Test raising after onboarding."""
     mock_storage(hass_storage, {"done": [const.STEP_USER]})
 
     assert await async_setup_component(hass, "onboarding", {})
@@ -662,7 +660,7 @@ async def test_onboarding_installation_type_after_done(
 
     client = await hass_client()
 
-    resp = await client.get("/api/onboarding/installation_type")
+    resp = await client.request(method, f"/api/onboarding/{view}", **kwargs)
 
     assert resp.status == 401
 
@@ -726,3 +724,486 @@ async def test_complete_onboarding(
     listener_3 = Mock()
     onboarding.async_add_listener(hass, listener_3)
     listener_3.assert_called_once_with()
+
+
+@pytest.mark.parametrize(
+    ("method", "view", "kwargs"),
+    [
+        ("get", "backup/info", {}),
+        (
+            "post",
+            "backup/restore",
+            {"json": {"backup_id": "abc123", "agent_id": "test"}},
+        ),
+        ("post", "backup/upload", {}),
+    ],
+)
+async def test_onboarding_backup_view_without_backup(
+    hass: HomeAssistant,
+    hass_storage: dict[str, Any],
+    hass_client: ClientSessionGenerator,
+    method: str,
+    view: str,
+    kwargs: dict[str, Any],
+) -> None:
+    """Test interacting with backup wievs when backup integration is missing."""
+    mock_storage(hass_storage, {"done": []})
+
+    assert await async_setup_component(hass, "onboarding", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+
+    resp = await client.request(method, f"/api/onboarding/{view}", **kwargs)
+
+    assert resp.status == 500
+    assert await resp.json() == {"code": "backup_disabled"}
+
+
+async def test_onboarding_backup_info(
+    hass: HomeAssistant,
+    hass_storage: dict[str, Any],
+    hass_client: ClientSessionGenerator,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test backup info."""
+    mock_storage(hass_storage, {"done": []})
+
+    assert await async_setup_component(hass, "onboarding", {})
+    async_initialize_backup(hass)
+    assert await async_setup_component(hass, "backup", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+
+    backups = {
+        "abc123": backup.ManagerBackup(
+            addons=[backup.AddonInfo(name="Test", slug="test", version="1.0.0")],
+            agents={
+                "backup.local": backup.manager.AgentBackupStatus(protected=True, size=0)
+            },
+            backup_id="abc123",
+            date="1970-01-01T00:00:00.000Z",
+            database_included=True,
+            extra_metadata={"instance_id": "abc123", "with_automatic_settings": True},
+            folders=[backup.Folder.MEDIA, backup.Folder.SHARE],
+            homeassistant_included=True,
+            homeassistant_version="2024.12.0",
+            name="Test",
+            failed_agent_ids=[],
+            with_automatic_settings=True,
+        ),
+        "def456": backup.ManagerBackup(
+            addons=[],
+            agents={
+                "test.remote": backup.manager.AgentBackupStatus(protected=True, size=0)
+            },
+            backup_id="def456",
+            date="1980-01-01T00:00:00.000Z",
+            database_included=False,
+            extra_metadata={
+                "instance_id": "unknown_uuid",
+                "with_automatic_settings": True,
+            },
+            folders=[backup.Folder.MEDIA, backup.Folder.SHARE],
+            homeassistant_included=True,
+            homeassistant_version="2024.12.0",
+            name="Test 2",
+            failed_agent_ids=[],
+            with_automatic_settings=None,
+        ),
+    }
+
+    with patch(
+        "homeassistant.components.backup.manager.BackupManager.async_get_backups",
+        return_value=(backups, {}),
+    ):
+        resp = await client.get("/api/onboarding/backup/info")
+
+        assert resp.status == 200
+        assert await resp.json() == snapshot
+
+
+@pytest.mark.parametrize(
+    ("params", "expected_kwargs"),
+    [
+        (
+            {"backup_id": "abc123", "agent_id": "backup.local"},
+            {
+                "agent_id": "backup.local",
+                "password": None,
+                "restore_addons": None,
+                "restore_database": True,
+                "restore_folders": None,
+                "restore_homeassistant": True,
+            },
+        ),
+        (
+            {
+                "backup_id": "abc123",
+                "agent_id": "backup.local",
+                "password": "hunter2",
+                "restore_addons": ["addon_1"],
+                "restore_database": True,
+                "restore_folders": ["media"],
+            },
+            {
+                "agent_id": "backup.local",
+                "password": "hunter2",
+                "restore_addons": ["addon_1"],
+                "restore_database": True,
+                "restore_folders": [backup.Folder.MEDIA],
+                "restore_homeassistant": True,
+            },
+        ),
+        (
+            {
+                "backup_id": "abc123",
+                "agent_id": "backup.local",
+                "password": "hunter2",
+                "restore_addons": ["addon_1", "addon_2"],
+                "restore_database": False,
+                "restore_folders": ["media", "share"],
+            },
+            {
+                "agent_id": "backup.local",
+                "password": "hunter2",
+                "restore_addons": ["addon_1", "addon_2"],
+                "restore_database": False,
+                "restore_folders": [backup.Folder.MEDIA, backup.Folder.SHARE],
+                "restore_homeassistant": True,
+            },
+        ),
+    ],
+)
+async def test_onboarding_backup_restore(
+    hass: HomeAssistant,
+    hass_storage: dict[str, Any],
+    hass_client: ClientSessionGenerator,
+    params: dict[str, Any],
+    expected_kwargs: dict[str, Any],
+) -> None:
+    """Test restore backup."""
+    mock_storage(hass_storage, {"done": []})
+
+    assert await async_setup_component(hass, "onboarding", {})
+    async_initialize_backup(hass)
+    assert await async_setup_component(hass, "backup", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+
+    with patch(
+        "homeassistant.components.backup.manager.BackupManager.async_restore_backup",
+    ) as mock_restore:
+        resp = await client.post("/api/onboarding/backup/restore", json=params)
+    assert resp.status == 200
+    mock_restore.assert_called_once_with("abc123", **expected_kwargs)
+
+
+@pytest.mark.parametrize(
+    ("params", "restore_error", "expected_status", "expected_json", "restore_calls"),
+    [
+        # Missing agent_id
+        (
+            {"backup_id": "abc123"},
+            None,
+            400,
+            {
+                "message": "Message format incorrect: required key not provided @ data['agent_id']"
+            },
+            0,
+        ),
+        # Missing backup_id
+        (
+            {"agent_id": "backup.local"},
+            None,
+            400,
+            {
+                "message": "Message format incorrect: required key not provided @ data['backup_id']"
+            },
+            0,
+        ),
+        # Invalid restore_database
+        (
+            {
+                "backup_id": "abc123",
+                "agent_id": "backup.local",
+                "restore_database": "yes_please",
+            },
+            None,
+            400,
+            {
+                "message": "Message format incorrect: expected bool for dictionary value @ data['restore_database']"
+            },
+            0,
+        ),
+        # Invalid folder
+        (
+            {
+                "backup_id": "abc123",
+                "agent_id": "backup.local",
+                "restore_folders": ["invalid"],
+            },
+            None,
+            400,
+            {
+                "message": "Message format incorrect: expected Folder or one of 'share', 'addons/local', 'ssl', 'media' @ data['restore_folders'][0]"
+            },
+            0,
+        ),
+        # Wrong password
+        (
+            {"backup_id": "abc123", "agent_id": "backup.local"},
+            backup.IncorrectPasswordError,
+            400,
+            {"code": "incorrect_password"},
+            1,
+        ),
+        # Home Assistant error
+        (
+            {"backup_id": "abc123", "agent_id": "backup.local"},
+            HomeAssistantError("Boom!"),
+            400,
+            {"code": "restore_failed", "message": "Boom!"},
+            1,
+        ),
+    ],
+)
+async def test_onboarding_backup_restore_error(
+    hass: HomeAssistant,
+    hass_storage: dict[str, Any],
+    hass_client: ClientSessionGenerator,
+    params: dict[str, Any],
+    restore_error: Exception | None,
+    expected_status: int,
+    expected_json: str,
+    restore_calls: int,
+) -> None:
+    """Test restore backup fails."""
+    mock_storage(hass_storage, {"done": []})
+
+    assert await async_setup_component(hass, "onboarding", {})
+    async_initialize_backup(hass)
+    assert await async_setup_component(hass, "backup", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+
+    with patch(
+        "homeassistant.components.backup.manager.BackupManager.async_restore_backup",
+        side_effect=restore_error,
+    ) as mock_restore:
+        resp = await client.post("/api/onboarding/backup/restore", json=params)
+
+    assert resp.status == expected_status
+    assert await resp.json() == expected_json
+    assert len(mock_restore.mock_calls) == restore_calls
+
+
+@pytest.mark.parametrize(
+    ("params", "restore_error", "expected_status", "expected_message", "restore_calls"),
+    [
+        # Unexpected error
+        (
+            {"backup_id": "abc123", "agent_id": "backup.local"},
+            Exception("Boom!"),
+            500,
+            "500 Internal Server Error",
+            1,
+        ),
+    ],
+)
+async def test_onboarding_backup_restore_unexpected_error(
+    hass: HomeAssistant,
+    hass_storage: dict[str, Any],
+    hass_client: ClientSessionGenerator,
+    params: dict[str, Any],
+    restore_error: Exception | None,
+    expected_status: int,
+    expected_message: str,
+    restore_calls: int,
+) -> None:
+    """Test restore backup fails."""
+    mock_storage(hass_storage, {"done": []})
+
+    assert await async_setup_component(hass, "onboarding", {})
+    async_initialize_backup(hass)
+    assert await async_setup_component(hass, "backup", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+
+    with patch(
+        "homeassistant.components.backup.manager.BackupManager.async_restore_backup",
+        side_effect=restore_error,
+    ) as mock_restore:
+        resp = await client.post("/api/onboarding/backup/restore", json=params)
+
+    assert resp.status == expected_status
+    assert (await resp.content.read()).decode().startswith(expected_message)
+    assert len(mock_restore.mock_calls) == restore_calls
+
+
+async def test_onboarding_backup_upload(
+    hass: HomeAssistant,
+    hass_storage: dict[str, Any],
+    hass_client: ClientSessionGenerator,
+) -> None:
+    """Test upload backup."""
+    mock_storage(hass_storage, {"done": []})
+
+    assert await async_setup_component(hass, "onboarding", {})
+    async_initialize_backup(hass)
+    assert await async_setup_component(hass, "backup", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+
+    with patch(
+        "homeassistant.components.backup.manager.BackupManager.async_receive_backup",
+        return_value="abc123",
+    ) as mock_receive:
+        resp = await client.post(
+            "/api/onboarding/backup/upload?agent_id=backup.local",
+            data={"file": StringIO("test")},
+        )
+    assert resp.status == 201
+    assert await resp.json() == {"backup_id": "abc123"}
+    mock_receive.assert_called_once_with(agent_ids=["backup.local"], contents=ANY)
+
+
+@pytest.fixture(name="cloud")
+async def cloud_fixture() -> AsyncGenerator[MagicMock]:
+    """Mock the cloud object.
+
+    See the real hass_nabucasa.Cloud class for how to configure the mock.
+    """
+    with patch(
+        "homeassistant.components.cloud.Cloud", autospec=True
+    ) as mock_cloud_class:
+        mock_cloud = mock_cloud_class.return_value
+
+        mock_cloud.auth = MagicMock(spec=CognitoAuth)
+        mock_cloud.iot = MagicMock(
+            spec=CloudIoT, last_disconnect_reason=None, state=STATE_CONNECTED
+        )
+
+        def set_up_mock_cloud(
+            cloud_client: CloudClient, mode: str, **kwargs: Any
+        ) -> DEFAULT:
+            """Set up mock cloud with a mock constructor."""
+
+            # Attributes set in the constructor with parameters.
+            mock_cloud.client = cloud_client
+
+            return DEFAULT
+
+        mock_cloud_class.side_effect = set_up_mock_cloud
+
+        # Attributes that we mock with default values.
+        mock_cloud.id_token = None
+        mock_cloud.is_logged_in = False
+
+        yield mock_cloud
+
+
+@pytest.fixture(name="setup_cloud")
+async def setup_cloud_fixture(hass: HomeAssistant, cloud: MagicMock) -> None:
+    """Fixture that sets up cloud."""
+    assert await async_setup_component(hass, "homeassistant", {})
+    assert await async_setup_component(hass, CLOUD_DOMAIN, {})
+    await hass.async_block_till_done()
+
+
+@pytest.mark.usefixtures("setup_cloud")
+async def test_onboarding_cloud_forgot_password(
+    hass: HomeAssistant,
+    hass_storage: dict[str, Any],
+    hass_client: ClientSessionGenerator,
+    cloud: MagicMock,
+) -> None:
+    """Test cloud forgot password."""
+    mock_storage(hass_storage, {"done": []})
+
+    assert await async_setup_component(hass, "onboarding", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+
+    mock_cognito = cloud.auth
+
+    req = await client.post(
+        "/api/onboarding/cloud/forgot_password", json={"email": "hello@bla.com"}
+    )
+
+    assert req.status == HTTPStatus.OK
+    assert mock_cognito.async_forgot_password.call_count == 1
+
+
+@pytest.mark.usefixtures("setup_cloud")
+async def test_onboarding_cloud_login(
+    hass: HomeAssistant,
+    hass_storage: dict[str, Any],
+    hass_client: ClientSessionGenerator,
+    cloud: MagicMock,
+) -> None:
+    """Test logging out from cloud."""
+    mock_storage(hass_storage, {"done": []})
+
+    assert await async_setup_component(hass, "onboarding", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+    req = await client.post(
+        "/api/onboarding/cloud/login",
+        json={"email": "my_username", "password": "my_password"},
+    )
+
+    assert req.status == HTTPStatus.OK
+    data = await req.json()
+    assert data == {"cloud_pipeline": None, "success": True}
+    assert cloud.login.call_count == 1
+
+
+@pytest.mark.usefixtures("setup_cloud")
+async def test_onboarding_cloud_logout(
+    hass: HomeAssistant,
+    hass_storage: dict[str, Any],
+    hass_client: ClientSessionGenerator,
+    cloud: MagicMock,
+) -> None:
+    """Test logging out from cloud."""
+    mock_storage(hass_storage, {"done": []})
+
+    assert await async_setup_component(hass, "onboarding", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+    req = await client.post("/api/onboarding/cloud/logout")
+
+    assert req.status == HTTPStatus.OK
+    data = await req.json()
+    assert data == {"message": "ok"}
+    assert cloud.logout.call_count == 1
+
+
+@pytest.mark.usefixtures("setup_cloud")
+async def test_onboarding_cloud_status(
+    hass: HomeAssistant,
+    hass_storage: dict[str, Any],
+    hass_client: ClientSessionGenerator,
+    cloud: MagicMock,
+) -> None:
+    """Test logging out from cloud."""
+    mock_storage(hass_storage, {"done": []})
+
+    assert await async_setup_component(hass, "onboarding", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+    req = await client.get("/api/onboarding/cloud/status")
+
+    assert req.status == HTTPStatus.OK
+    data = await req.json()
+    assert data == {"logged_in": False}
diff --git a/tests/components/ondilo_ico/conftest.py b/tests/components/ondilo_ico/conftest.py
index d35e5ac0003..891f60eb549 100644
--- a/tests/components/ondilo_ico/conftest.py
+++ b/tests/components/ondilo_ico/conftest.py
@@ -7,6 +7,7 @@ from unittest.mock import MagicMock, patch
 import pytest
 
 from homeassistant.components.ondilo_ico.const import DOMAIN
+from homeassistant.util.json import JsonArrayType
 
 from tests.common import (
     MockConfigEntry,
@@ -71,7 +72,7 @@ def ico_details2() -> dict[str, Any]:
 
 
 @pytest.fixture(scope="package")
-def last_measures() -> list[dict[str, Any]]:
+def last_measures() -> JsonArrayType:
     """Pool measurements."""
     return load_json_array_fixture("last_measures.json", DOMAIN)
 
diff --git a/tests/components/ondilo_ico/fixtures/pool2.json b/tests/components/ondilo_ico/fixtures/pool2.json
index da0cb62d484..24e72b469f0 100644
--- a/tests/components/ondilo_ico/fixtures/pool2.json
+++ b/tests/components/ondilo_ico/fixtures/pool2.json
@@ -15,5 +15,5 @@
     "latitude": 48.861783,
     "longitude": 2.337421
   },
-  "updated_at": "2024-01-01T01:00:00+0000"
+  "updated_at": "2024-01-01T01:05:00+0000"
 }
diff --git a/tests/components/ondilo_ico/snapshots/test_init.ambr b/tests/components/ondilo_ico/snapshots/test_init.ambr
index 44008ac907e..07e56a78fae 100644
--- a/tests/components/ondilo_ico/snapshots/test_init.ambr
+++ b/tests/components/ondilo_ico/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -35,6 +36,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/ondilo_ico/snapshots/test_sensor.ambr b/tests/components/ondilo_ico/snapshots/test_sensor.ambr
index 56e30cd904a..7df2bfc22ce 100644
--- a/tests/components/ondilo_ico/snapshots/test_sensor.ambr
+++ b/tests/components/ondilo_ico/snapshots/test_sensor.ambr
@@ -8,11 +8,12 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
-    'entity_category': None,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'sensor.pool_1_battery',
     'has_entity_name': True,
     'hidden_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -109,6 +111,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -159,11 +162,12 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
-    'entity_category': None,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'sensor.pool_1_rssi',
     'has_entity_name': True,
     'hidden_by': None,
@@ -209,6 +213,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -259,6 +264,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -309,6 +315,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -360,11 +367,12 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
-    'entity_category': None,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'sensor.pool_2_battery',
     'has_entity_name': True,
     'hidden_by': None,
@@ -411,6 +419,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -461,6 +470,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -511,11 +521,12 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
-    'entity_category': None,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
     'entity_id': 'sensor.pool_2_rssi',
     'has_entity_name': True,
     'hidden_by': None,
@@ -561,6 +572,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -611,6 +623,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -661,6 +674,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ondilo_ico/test_config_flow.py b/tests/components/ondilo_ico/test_config_flow.py
index deab2a8e0b9..19407cecb9d 100644
--- a/tests/components/ondilo_ico/test_config_flow.py
+++ b/tests/components/ondilo_ico/test_config_flow.py
@@ -4,15 +4,13 @@ from unittest.mock import patch
 
 import pytest
 
-from homeassistant import config_entries, setup
+from homeassistant import config_entries
 from homeassistant.components.ondilo_ico.const import (
     DOMAIN,
     OAUTH2_AUTHORIZE,
-    OAUTH2_CLIENTID,
-    OAUTH2_CLIENTSECRET,
+    OAUTH2_CLIENT_ID as CLIENT_ID,
     OAUTH2_TOKEN,
 )
-from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers import config_entry_oauth2_flow
@@ -21,13 +19,12 @@ from tests.common import MockConfigEntry
 from tests.test_util.aiohttp import AiohttpClientMocker
 from tests.typing import ClientSessionGenerator
 
-CLIENT_ID = OAUTH2_CLIENTID
-CLIENT_SECRET = OAUTH2_CLIENTSECRET
 
-
-async def test_abort_if_existing_entry(hass: HomeAssistant) -> None:
+async def test_abort_if_existing_entry(
+    hass: HomeAssistant, config_entry: MockConfigEntry
+) -> None:
     """Check flow abort when an entry already exist."""
-    MockConfigEntry(domain=DOMAIN).add_to_hass(hass)
+    config_entry.add_to_hass(hass)
 
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
@@ -43,15 +40,6 @@ async def test_full_flow(
     aioclient_mock: AiohttpClientMocker,
 ) -> None:
     """Check full flow."""
-    assert await setup.async_setup_component(
-        hass,
-        DOMAIN,
-        {
-            DOMAIN: {CONF_CLIENT_ID: CLIENT_ID, CONF_CLIENT_SECRET: CLIENT_SECRET},
-            "http": {"base_url": "https://example.com"},
-        },
-    )
-
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
diff --git a/tests/components/ondilo_ico/test_init.py b/tests/components/ondilo_ico/test_init.py
index 67f68f27b3e..58b1e27987d 100644
--- a/tests/components/ondilo_ico/test_init.py
+++ b/tests/components/ondilo_ico/test_init.py
@@ -1,8 +1,10 @@
 """Test Ondilo ICO initialization."""
 
+from datetime import datetime, timedelta
 from typing import Any
 from unittest.mock import MagicMock
 
+from freezegun.api import FrozenDateTimeFactory
 from ondilo import OndiloError
 import pytest
 from syrupy import SnapshotAssertion
@@ -13,7 +15,7 @@ from homeassistant.helpers import device_registry as dr
 
 from . import setup_integration
 
-from tests.common import MockConfigEntry
+from tests.common import MockConfigEntry, async_fire_time_changed
 
 
 async def test_devices(
@@ -63,6 +65,7 @@ async def test_get_pools_error(
 async def test_init_with_no_ico_attached(
     hass: HomeAssistant,
     mock_ondilo_client: MagicMock,
+    device_registry: dr.DeviceRegistry,
     config_entry: MockConfigEntry,
     pool1: dict[str, Any],
 ) -> None:
@@ -73,14 +76,104 @@ async def test_init_with_no_ico_attached(
     mock_ondilo_client.get_ICO_details.return_value = None
     await setup_integration(hass, config_entry, mock_ondilo_client)
 
+    device_entries = dr.async_entries_for_config_entry(
+        device_registry, config_entry.entry_id
+    )
+    # No devices should be created
+    assert len(device_entries) == 0
     # No sensor should be created
     assert len(hass.states.async_all()) == 0
     # We should not have tried to retrieve pool measures
     mock_ondilo_client.get_last_pool_measures.assert_not_called()
-    assert config_entry.state is ConfigEntryState.SETUP_RETRY
+    assert config_entry.state is ConfigEntryState.LOADED
 
 
-@pytest.mark.parametrize("api", ["get_ICO_details", "get_last_pool_measures"])
+async def test_adding_pool_after_setup(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    mock_ondilo_client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+    config_entry: MockConfigEntry,
+    pool1: dict[str, Any],
+    two_pools: list[dict[str, Any]],
+    ico_details1: dict[str, Any],
+    ico_details2: dict[str, Any],
+) -> None:
+    """Test adding one pool after integration setup."""
+    mock_ondilo_client.get_pools.return_value = pool1
+    mock_ondilo_client.get_ICO_details.return_value = ico_details1
+
+    await setup_integration(hass, config_entry, mock_ondilo_client)
+
+    device_entries = dr.async_entries_for_config_entry(
+        device_registry, config_entry.entry_id
+    )
+
+    # One pool is created with 7 entities.
+    assert len(device_entries) == 1
+    assert len(hass.states.async_all()) == 7
+
+    mock_ondilo_client.get_pools.return_value = two_pools
+    mock_ondilo_client.get_ICO_details.return_value = ico_details2
+
+    # Trigger a refresh of the pools coordinator.
+    freezer.tick(timedelta(minutes=20))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done(wait_background_tasks=True)
+
+    device_entries = dr.async_entries_for_config_entry(
+        device_registry, config_entry.entry_id
+    )
+
+    # Two pool have been created with 7 entities each.
+    assert len(device_entries) == 2
+    assert len(hass.states.async_all()) == 14
+
+
+async def test_removing_pool_after_setup(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    mock_ondilo_client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+    config_entry: MockConfigEntry,
+    pool1: dict[str, Any],
+    ico_details1: dict[str, Any],
+) -> None:
+    """Test removing one pool after integration setup."""
+    await setup_integration(hass, config_entry, mock_ondilo_client)
+
+    device_entries = dr.async_entries_for_config_entry(
+        device_registry, config_entry.entry_id
+    )
+
+    # Two pools are created with 7 entities each.
+    assert len(device_entries) == 2
+    assert len(hass.states.async_all()) == 14
+
+    mock_ondilo_client.get_pools.return_value = pool1
+    mock_ondilo_client.get_ICO_details.return_value = ico_details1
+
+    # Trigger a refresh of the pools coordinator.
+    freezer.tick(timedelta(minutes=20))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done(wait_background_tasks=True)
+
+    device_entries = dr.async_entries_for_config_entry(
+        device_registry, config_entry.entry_id
+    )
+
+    # One pool is left with 7 entities.
+    assert len(device_entries) == 1
+    assert len(hass.states.async_all()) == 7
+
+
+@pytest.mark.parametrize(
+    ("api", "devices", "config_entry_state"),
+    [
+        ("get_ICO_details", 0, ConfigEntryState.SETUP_RETRY),
+        ("get_last_pool_measures", 1, ConfigEntryState.LOADED),
+    ],
+)
 async def test_details_error_all_pools(
     hass: HomeAssistant,
     mock_ondilo_client: MagicMock,
@@ -88,6 +181,8 @@ async def test_details_error_all_pools(
     config_entry: MockConfigEntry,
     pool1: dict[str, Any],
     api: str,
+    devices: int,
+    config_entry_state: ConfigEntryState,
 ) -> None:
     """Test details and measures error for all pools."""
     mock_ondilo_client.get_pools.return_value = pool1
@@ -100,8 +195,8 @@ async def test_details_error_all_pools(
         device_registry, config_entry.entry_id
     )
 
-    assert not device_entries
-    assert config_entry.state is ConfigEntryState.SETUP_RETRY
+    assert len(device_entries) == devices
+    assert config_entry.state is config_entry_state
 
 
 async def test_details_error_one_pool(
@@ -131,12 +226,15 @@ async def test_details_error_one_pool(
 
 async def test_measures_error_one_pool(
     hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
     mock_ondilo_client: MagicMock,
     device_registry: dr.DeviceRegistry,
     config_entry: MockConfigEntry,
     last_measures: list[dict[str, Any]],
 ) -> None:
     """Test measures error for one pool and success for the other."""
+    entity_id_1 = "sensor.pool_1_temperature"
+    entity_id_2 = "sensor.pool_2_temperature"
     mock_ondilo_client.get_last_pool_measures.side_effect = [
         OndiloError(
             404,
@@ -151,4 +249,170 @@ async def test_measures_error_one_pool(
         device_registry, config_entry.entry_id
     )
 
-    assert len(device_entries) == 1
+    assert len(device_entries) == 2
+    # One pool returned an error, the other is ok.
+    # 7 entities are created for the second pool.
+    assert len(hass.states.async_all()) == 7
+    assert hass.states.get(entity_id_1) is None
+    assert hass.states.get(entity_id_2) is not None
+
+    # All pools now return measures.
+    mock_ondilo_client.get_last_pool_measures.side_effect = None
+
+    # Move time to next pools coordinator refresh.
+    freezer.tick(timedelta(minutes=20))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done(wait_background_tasks=True)
+
+    device_entries = dr.async_entries_for_config_entry(
+        device_registry, config_entry.entry_id
+    )
+
+    assert len(device_entries) == 2
+    # 14 entities in total, 7 entities per pool.
+    assert len(hass.states.async_all()) == 14
+    assert hass.states.get(entity_id_1) is not None
+    assert hass.states.get(entity_id_2) is not None
+
+
+async def test_measures_scheduling(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    mock_ondilo_client: MagicMock,
+    device_registry: dr.DeviceRegistry,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test refresh scheduling of measures coordinator."""
+    # Move time to 10 min after pool 1 was updated and 5 min after pool 2 was updated.
+    freezer.move_to("2024-01-01T01:10:00+00:00")
+    entity_id_1 = "sensor.pool_1_temperature"
+    entity_id_2 = "sensor.pool_2_temperature"
+    await setup_integration(hass, config_entry, mock_ondilo_client)
+
+    device_entries = dr.async_entries_for_config_entry(
+        device_registry, config_entry.entry_id
+    )
+
+    # Two pools are created with 7 entities each.
+    assert len(device_entries) == 2
+    assert len(hass.states.async_all()) == 14
+
+    state = hass.states.get(entity_id_1)
+    assert state is not None
+    assert state.last_reported == datetime.fromisoformat("2024-01-01T01:10:00+00:00")
+    state = hass.states.get(entity_id_2)
+    assert state is not None
+    assert state.last_reported == datetime.fromisoformat("2024-01-01T01:10:00+00:00")
+
+    # Tick time by 20 min.
+    # The measures coordinators for both pools should not have been refreshed again.
+    freezer.tick(timedelta(minutes=20))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done(wait_background_tasks=True)
+
+    state = hass.states.get(entity_id_1)
+    assert state is not None
+    assert state.last_reported == datetime.fromisoformat("2024-01-01T01:10:00+00:00")
+    state = hass.states.get(entity_id_2)
+    assert state is not None
+    assert state.last_reported == datetime.fromisoformat("2024-01-01T01:10:00+00:00")
+
+    # Move time to 65 min after pool 1 was last updated.
+    # This is 5 min after we expect pool 1 to be updated again.
+    # The measures coordinator for pool 1 should refresh at this time.
+    # The measures coordinator for pool 2 should not have been refreshed again.
+    # The pools coordinator has updated the last update time
+    # of the pools to a stale time that is already passed.
+    freezer.move_to("2024-01-01T02:05:00+00:00")
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done(wait_background_tasks=True)
+
+    state = hass.states.get(entity_id_1)
+    assert state is not None
+    assert state.last_reported == datetime.fromisoformat("2024-01-01T02:05:00+00:00")
+    state = hass.states.get(entity_id_2)
+    assert state is not None
+    assert state.last_reported == datetime.fromisoformat("2024-01-01T01:10:00+00:00")
+
+    # Tick time by 5 min.
+    # The measures coordinator for pool 1 should not have been refreshed again.
+    # The measures coordinator for pool 2 should refresh at this time.
+    # The pools coordinator has updated the last update time
+    # of the pools to a stale time that is already passed.
+    freezer.tick(timedelta(minutes=5))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done(wait_background_tasks=True)
+
+    state = hass.states.get(entity_id_1)
+    assert state is not None
+    assert state.last_reported == datetime.fromisoformat("2024-01-01T02:05:00+00:00")
+    state = hass.states.get(entity_id_2)
+    assert state is not None
+    assert state.last_reported == datetime.fromisoformat("2024-01-01T02:10:00+00:00")
+
+    # Tick time by 55 min.
+    # The measures coordinator for pool 1 should refresh at this time.
+    # This is 1 hour after the last refresh of the measures coordinator for pool 1.
+    freezer.tick(timedelta(minutes=55))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done(wait_background_tasks=True)
+
+    state = hass.states.get(entity_id_1)
+    assert state is not None
+    assert state.last_reported == datetime.fromisoformat("2024-01-01T03:05:00+00:00")
+    state = hass.states.get(entity_id_2)
+    assert state is not None
+    assert state.last_reported == datetime.fromisoformat("2024-01-01T02:10:00+00:00")
+
+    # Tick time by 5 min.
+    # The measures coordinator for pool 2 should refresh at this time.
+    # This is 1 hour after the last refresh of the measures coordinator for pool 2.
+    freezer.tick(timedelta(minutes=5))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done(wait_background_tasks=True)
+
+    state = hass.states.get(entity_id_1)
+    assert state is not None
+    assert state.last_reported == datetime.fromisoformat("2024-01-01T03:05:00+00:00")
+    state = hass.states.get(entity_id_2)
+    assert state is not None
+    assert state.last_reported == datetime.fromisoformat("2024-01-01T03:10:00+00:00")
+
+    # Set an error on the pools coordinator endpoint.
+    # This will cause the pools coordinator to not update the next refresh.
+    # This should cause the measures coordinators to keep the 1 hour cadence.
+    mock_ondilo_client.get_pools.side_effect = OndiloError(
+        502,
+        (
+            "<html> <head><title>502 Bad Gateway</title></head> "
+            "<body> <center><h1>502 Bad Gateway</h1></center> </body> </html>"
+        ),
+    )
+
+    # Tick time by 55 min.
+    # The measures coordinator for pool 1 should refresh at this time.
+    # This is 1 hour after the last refresh of the measures coordinator for pool 1.
+    freezer.tick(timedelta(minutes=55))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done(wait_background_tasks=True)
+
+    state = hass.states.get(entity_id_1)
+    assert state is not None
+    assert state.last_reported == datetime.fromisoformat("2024-01-01T04:05:00+00:00")
+    state = hass.states.get(entity_id_2)
+    assert state is not None
+    assert state.last_reported == datetime.fromisoformat("2024-01-01T03:10:00+00:00")
+
+    # Tick time by 5 min.
+    # The measures coordinator for pool 2 should refresh at this time.
+    # This is 1 hour after the last refresh of the measures coordinator for pool 2.
+    freezer.tick(timedelta(minutes=5))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done(wait_background_tasks=True)
+
+    state = hass.states.get(entity_id_1)
+    assert state is not None
+    assert state.last_reported == datetime.fromisoformat("2024-01-01T04:05:00+00:00")
+    state = hass.states.get(entity_id_2)
+    assert state is not None
+    assert state.last_reported == datetime.fromisoformat("2024-01-01T04:10:00+00:00")
diff --git a/tests/components/ondilo_ico/test_sensor.py b/tests/components/ondilo_ico/test_sensor.py
index 0043d22f6c0..c944353724e 100644
--- a/tests/components/ondilo_ico/test_sensor.py
+++ b/tests/components/ondilo_ico/test_sensor.py
@@ -45,7 +45,9 @@ async def test_no_ico_for_one_pool(
     # Only the second pool is created
     assert len(hass.states.async_all()) == 7
     assert hass.states.get("sensor.pool_1_temperature") is None
-    assert hass.states.get("sensor.pool_2_rssi").state == next(
+    state = hass.states.get("sensor.pool_2_rssi")
+    assert state is not None
+    assert state.state == next(
         str(item["value"]) for item in last_measures if item["data_type"] == "rssi"
     )
 
diff --git a/tests/components/onedrive/__init__.py b/tests/components/onedrive/__init__.py
new file mode 100644
index 00000000000..0bafe37775b
--- /dev/null
+++ b/tests/components/onedrive/__init__.py
@@ -0,0 +1,14 @@
+"""Tests for the OneDrive integration."""
+
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+async def setup_integration(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry
+) -> None:
+    """Set up the OneDrive integration for testing."""
+    mock_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
diff --git a/tests/components/onedrive/conftest.py b/tests/components/onedrive/conftest.py
new file mode 100644
index 00000000000..74232f2cc39
--- /dev/null
+++ b/tests/components/onedrive/conftest.py
@@ -0,0 +1,269 @@
+"""Fixtures for OneDrive tests."""
+
+from collections.abc import AsyncIterator, Generator
+from html import escape
+from json import dumps
+import time
+from unittest.mock import AsyncMock, MagicMock, patch
+
+from onedrive_personal_sdk.const import DriveState, DriveType
+from onedrive_personal_sdk.models.items import (
+    AppRoot,
+    Drive,
+    DriveQuota,
+    File,
+    Folder,
+    Hashes,
+    IdentitySet,
+    ItemParentReference,
+    User,
+)
+import pytest
+
+from homeassistant.components.application_credentials import (
+    ClientCredential,
+    async_import_client_credential,
+)
+from homeassistant.components.onedrive.const import (
+    CONF_FOLDER_ID,
+    CONF_FOLDER_NAME,
+    DOMAIN,
+    OAUTH_SCOPES,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from .const import BACKUP_METADATA, CLIENT_ID, CLIENT_SECRET, IDENTITY_SET, INSTANCE_ID
+
+from tests.common import MockConfigEntry
+
+
+@pytest.fixture(name="scopes")
+def mock_scopes() -> list[str]:
+    """Fixture to set the scopes present in the OAuth token."""
+    return OAUTH_SCOPES
+
+
+@pytest.fixture(autouse=True)
+async def setup_credentials(hass: HomeAssistant) -> None:
+    """Fixture to setup credentials."""
+    assert await async_setup_component(hass, "application_credentials", {})
+    await async_import_client_credential(
+        hass,
+        DOMAIN,
+        ClientCredential(CLIENT_ID, CLIENT_SECRET),
+    )
+
+
+@pytest.fixture(name="expires_at")
+def mock_expires_at() -> int:
+    """Fixture to set the oauth token expiration time."""
+    return time.time() + 3600
+
+
+@pytest.fixture
+def mock_config_entry(expires_at: int, scopes: list[str]) -> MockConfigEntry:
+    """Return the default mocked config entry."""
+    return MockConfigEntry(
+        title="John Doe's OneDrive",
+        domain=DOMAIN,
+        data={
+            "auth_implementation": DOMAIN,
+            "token": {
+                "access_token": "mock-access-token",
+                "refresh_token": "mock-refresh-token",
+                "expires_at": expires_at,
+                "scope": " ".join(scopes),
+            },
+            CONF_FOLDER_NAME: "backups_123",
+            CONF_FOLDER_ID: "my_folder_id",
+        },
+        unique_id="mock_drive_id",
+        minor_version=2,
+    )
+
+
+@pytest.fixture
+def mock_onedrive_client_init() -> Generator[MagicMock]:
+    """Return a mocked GraphServiceClient."""
+    with (
+        patch(
+            "homeassistant.components.onedrive.config_flow.OneDriveClient",
+            autospec=True,
+        ) as onedrive_client,
+        patch(
+            "homeassistant.components.onedrive.OneDriveClient",
+            new=onedrive_client,
+        ),
+    ):
+        yield onedrive_client
+
+
+@pytest.fixture
+def mock_approot() -> AppRoot:
+    """Return a mocked approot."""
+    return AppRoot(
+        id="id",
+        child_count=0,
+        size=0,
+        name="name",
+        parent_reference=ItemParentReference(
+            drive_id="mock_drive_id", id="id", path="path"
+        ),
+        created_by=IdentitySet(
+            user=User(
+                display_name="John Doe",
+                id="id",
+                email="john@doe.com",
+            )
+        ),
+    )
+
+
+@pytest.fixture
+def mock_drive() -> Drive:
+    """Return a mocked drive."""
+    return Drive(
+        id="mock_drive_id",
+        name="My Drive",
+        drive_type=DriveType.PERSONAL,
+        owner=IDENTITY_SET,
+        quota=DriveQuota(
+            deleted=5,
+            remaining=805306368,
+            state=DriveState.NEARING,
+            total=5368709120,
+            used=4250000000,
+        ),
+    )
+
+
+@pytest.fixture
+def mock_folder() -> Folder:
+    """Return a mocked backup folder."""
+    return Folder(
+        id="my_folder_id",
+        name="name",
+        size=0,
+        child_count=0,
+        description="9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0",
+        parent_reference=ItemParentReference(
+            drive_id="mock_drive_id", id="id", path="path"
+        ),
+        created_by=IdentitySet(
+            user=User(
+                display_name="John Doe",
+                id="id",
+                email="john@doe.com",
+            ),
+        ),
+    )
+
+
+@pytest.fixture
+def mock_backup_file() -> File:
+    """Return a mocked backup file."""
+    return File(
+        id="id",
+        name="23e64aec.tar",
+        size=34519040,
+        parent_reference=ItemParentReference(
+            drive_id="mock_drive_id", id="id", path="path"
+        ),
+        hashes=Hashes(
+            quick_xor_hash="hash",
+        ),
+        mime_type="application/x-tar",
+        created_by=IDENTITY_SET,
+    )
+
+
+@pytest.fixture
+def mock_metadata_file() -> File:
+    """Return a mocked metadata file."""
+    return File(
+        id="id",
+        name="23e64aec.tar",
+        size=34519040,
+        parent_reference=ItemParentReference(
+            drive_id="mock_drive_id", id="id", path="path"
+        ),
+        hashes=Hashes(
+            quick_xor_hash="hash",
+        ),
+        mime_type="application/x-tar",
+        description=escape(
+            dumps(
+                {
+                    "metadata_version": 2,
+                    "backup_id": "23e64aec",
+                    "backup_file_id": "id",
+                }
+            )
+        ),
+        created_by=IDENTITY_SET,
+    )
+
+
+@pytest.fixture(autouse=True)
+def mock_onedrive_client(
+    mock_onedrive_client_init: MagicMock,
+    mock_approot: AppRoot,
+    mock_drive: Drive,
+    mock_folder: Folder,
+    mock_backup_file: File,
+    mock_metadata_file: File,
+) -> Generator[MagicMock]:
+    """Return a mocked GraphServiceClient."""
+    client = mock_onedrive_client_init.return_value
+    client.get_approot.return_value = mock_approot
+    client.create_folder.return_value = mock_folder
+    client.list_drive_items.return_value = [mock_backup_file, mock_metadata_file]
+    client.get_drive_item.return_value = mock_folder
+    client.upload_file.return_value = mock_metadata_file
+
+    class MockStreamReader:
+        async def iter_chunked(self, chunk_size: int) -> AsyncIterator[bytes]:
+            yield b"backup data"
+
+        async def read(self) -> bytes:
+            return dumps(BACKUP_METADATA).encode()
+
+    client.download_drive_item.return_value = MockStreamReader()
+    client.get_drive.return_value = mock_drive
+    return client
+
+
+@pytest.fixture
+def mock_large_file_upload_client(mock_backup_file: File) -> Generator[AsyncMock]:
+    """Return a mocked LargeFileUploadClient upload."""
+    with patch(
+        "homeassistant.components.onedrive.backup.LargeFileUploadClient.upload"
+    ) as mock_upload:
+        mock_upload.return_value = mock_backup_file
+        yield mock_upload
+
+
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.onedrive.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
+@pytest.fixture(autouse=True)
+def mock_instance_id() -> Generator[AsyncMock]:
+    """Mock the instance ID."""
+    with (
+        patch(
+            "homeassistant.components.onedrive.async_get_instance_id",
+            return_value=INSTANCE_ID,
+        ) as mock_instance_id,
+        patch(
+            "homeassistant.components.onedrive.config_flow.async_get_instance_id",
+            new=mock_instance_id,
+        ),
+    ):
+        yield
diff --git a/tests/components/onedrive/const.py b/tests/components/onedrive/const.py
new file mode 100644
index 00000000000..4e67c358179
--- /dev/null
+++ b/tests/components/onedrive/const.py
@@ -0,0 +1,31 @@
+"""Consts for OneDrive tests."""
+
+from onedrive_personal_sdk.models.items import IdentitySet, User
+
+CLIENT_ID = "1234"
+CLIENT_SECRET = "5678"
+
+
+BACKUP_METADATA = {
+    "addons": [],
+    "backup_id": "23e64aec",
+    "date": "2024-11-22T11:48:48.727189+01:00",
+    "database_included": True,
+    "extra_metadata": {},
+    "folders": [],
+    "homeassistant_included": True,
+    "homeassistant_version": "2024.12.0.dev0",
+    "name": "Core 2024.12.0.dev0",
+    "protected": False,
+    "size": 34519040,
+}
+
+INSTANCE_ID = "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0"
+
+IDENTITY_SET = IdentitySet(
+    user=User(
+        display_name="John Doe",
+        id="id",
+        email="john@doe.com",
+    )
+)
diff --git a/tests/components/onedrive/snapshots/test_diagnostics.ambr b/tests/components/onedrive/snapshots/test_diagnostics.ambr
new file mode 100644
index 00000000000..827b9397313
--- /dev/null
+++ b/tests/components/onedrive/snapshots/test_diagnostics.ambr
@@ -0,0 +1,31 @@
+# serializer version: 1
+# name: test_diagnostics
+  dict({
+    'config': dict({
+      'auth_implementation': 'onedrive',
+      'folder_id': 'my_folder_id',
+      'folder_name': 'name',
+      'token': '**REDACTED**',
+    }),
+    'drive': dict({
+      'drive_type': 'personal',
+      'id': 'mock_drive_id',
+      'name': 'My Drive',
+      'owner': dict({
+        'application': None,
+        'user': dict({
+          'display_name': '**REDACTED**',
+          'email': '**REDACTED**',
+          'id': 'id',
+        }),
+      }),
+      'quota': dict({
+        'deleted': 5,
+        'remaining': 805306368,
+        'state': 'nearing',
+        'total': 5368709120,
+        'used': 4250000000,
+      }),
+    }),
+  })
+# ---
diff --git a/tests/components/onedrive/snapshots/test_init.ambr b/tests/components/onedrive/snapshots/test_init.ambr
new file mode 100644
index 00000000000..9b2ed7e4d94
--- /dev/null
+++ b/tests/components/onedrive/snapshots/test_init.ambr
@@ -0,0 +1,34 @@
+# serializer version: 1
+# name: test_device
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://onedrive.live.com/?id=root&cid=mock_drive_id',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': <DeviceEntryType.SERVICE: 'service'>,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'onedrive',
+        'mock_drive_id',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Microsoft',
+    'model': 'OneDrive Personal',
+    'model_id': None,
+    'name': 'My Drive',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
diff --git a/tests/components/onedrive/snapshots/test_sensor.ambr b/tests/components/onedrive/snapshots/test_sensor.ambr
new file mode 100644
index 00000000000..742c069f206
--- /dev/null
+++ b/tests/components/onedrive/snapshots/test_sensor.ambr
@@ -0,0 +1,227 @@
+# serializer version: 1
+# name: test_sensors[sensor.my_drive_drive_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'normal',
+        'nearing',
+        'critical',
+        'exceeded',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_drive_drive_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Drive state',
+    'platform': 'onedrive',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'drive_state',
+    'unique_id': 'mock_drive_id_drive_state',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensors[sensor.my_drive_drive_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'My Drive Drive state',
+      'options': list([
+        'normal',
+        'nearing',
+        'critical',
+        'exceeded',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.my_drive_drive_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'nearing',
+  })
+# ---
+# name: test_sensors[sensor.my_drive_remaining_storage-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_drive_remaining_storage',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DATA_SIZE: 'data_size'>,
+    'original_icon': None,
+    'original_name': 'Remaining storage',
+    'platform': 'onedrive',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'remaining_size',
+    'unique_id': 'mock_drive_id_remaining_size',
+    'unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>,
+  })
+# ---
+# name: test_sensors[sensor.my_drive_remaining_storage-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'data_size',
+      'friendly_name': 'My Drive Remaining storage',
+      'unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.my_drive_remaining_storage',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.75',
+  })
+# ---
+# name: test_sensors[sensor.my_drive_total_available_storage-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_drive_total_available_storage',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 0,
+      }),
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DATA_SIZE: 'data_size'>,
+    'original_icon': None,
+    'original_name': 'Total available storage',
+    'platform': 'onedrive',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'total_size',
+    'unique_id': 'mock_drive_id_total_size',
+    'unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>,
+  })
+# ---
+# name: test_sensors[sensor.my_drive_total_available_storage-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'data_size',
+      'friendly_name': 'My Drive Total available storage',
+      'unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.my_drive_total_available_storage',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '5.0',
+  })
+# ---
+# name: test_sensors[sensor.my_drive_used_storage-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_drive_used_storage',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DATA_SIZE: 'data_size'>,
+    'original_icon': None,
+    'original_name': 'Used storage',
+    'platform': 'onedrive',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'used_size',
+    'unique_id': 'mock_drive_id_used_size',
+    'unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>,
+  })
+# ---
+# name: test_sensors[sensor.my_drive_used_storage-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'data_size',
+      'friendly_name': 'My Drive Used storage',
+      'unit_of_measurement': <UnitOfInformation.GIBIBYTES: 'GiB'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.my_drive_used_storage',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '3.95812094211578',
+  })
+# ---
diff --git a/tests/components/onedrive/test_backup.py b/tests/components/onedrive/test_backup.py
new file mode 100644
index 00000000000..a81eb03a51c
--- /dev/null
+++ b/tests/components/onedrive/test_backup.py
@@ -0,0 +1,391 @@
+"""Test the backups for OneDrive."""
+
+from __future__ import annotations
+
+from collections.abc import AsyncGenerator
+from io import StringIO
+from unittest.mock import Mock, patch
+
+from onedrive_personal_sdk.exceptions import (
+    AuthenticationError,
+    HashMismatchError,
+    OneDriveException,
+)
+from onedrive_personal_sdk.models.items import File
+import pytest
+
+from homeassistant.components.backup import DOMAIN as BACKUP_DOMAIN, AgentBackup
+from homeassistant.components.onedrive.backup import (
+    async_register_backup_agents_listener,
+)
+from homeassistant.components.onedrive.const import DATA_BACKUP_AGENT_LISTENERS, DOMAIN
+from homeassistant.config_entries import SOURCE_REAUTH
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.backup import async_initialize_backup
+from homeassistant.setup import async_setup_component
+
+from . import setup_integration
+from .const import BACKUP_METADATA
+
+from tests.common import AsyncMock, MockConfigEntry
+from tests.typing import ClientSessionGenerator, MagicMock, WebSocketGenerator
+
+
+@pytest.fixture(autouse=True)
+async def setup_backup_integration(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+) -> AsyncGenerator[None]:
+    """Set up onedrive and backup integrations."""
+    async_initialize_backup(hass)
+    with (
+        patch("homeassistant.components.backup.is_hassio", return_value=False),
+        patch("homeassistant.components.backup.store.STORE_DELAY_SAVE", 0),
+    ):
+        assert await async_setup_component(hass, BACKUP_DOMAIN, {BACKUP_DOMAIN: {}})
+        await setup_integration(hass, mock_config_entry)
+
+        await hass.async_block_till_done()
+        yield
+
+
+async def test_agents_info(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test backup agent info."""
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id({"type": "backup/agents/info"})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {
+        "agents": [
+            {"agent_id": "backup.local", "name": "local"},
+            {
+                "agent_id": f"{DOMAIN}.{mock_config_entry.unique_id}",
+                "name": mock_config_entry.title,
+            },
+        ],
+    }
+
+
+async def test_agents_list_backups(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test agent list backups."""
+
+    client = await hass_ws_client(hass)
+    await client.send_json_auto_id({"type": "backup/info"})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"]["agent_errors"] == {}
+    assert response["result"]["backups"] == [
+        {
+            "addons": [],
+            "agents": {
+                "onedrive.mock_drive_id": {"protected": False, "size": 34519040}
+            },
+            "backup_id": "23e64aec",
+            "date": "2024-11-22T11:48:48.727189+01:00",
+            "database_included": True,
+            "extra_metadata": {},
+            "folders": [],
+            "homeassistant_included": True,
+            "homeassistant_version": "2024.12.0.dev0",
+            "name": "Core 2024.12.0.dev0",
+            "failed_agent_ids": [],
+            "with_automatic_settings": None,
+        }
+    ]
+
+
+async def test_agents_get_backup(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test agent get backup."""
+
+    backup_id = BACKUP_METADATA["backup_id"]
+    client = await hass_ws_client(hass)
+    await client.send_json_auto_id({"type": "backup/details", "backup_id": backup_id})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"]["agent_errors"] == {}
+    assert response["result"]["backup"] == {
+        "addons": [],
+        "agents": {
+            f"{DOMAIN}.{mock_config_entry.unique_id}": {
+                "protected": False,
+                "size": 34519040,
+            }
+        },
+        "backup_id": "23e64aec",
+        "date": "2024-11-22T11:48:48.727189+01:00",
+        "database_included": True,
+        "extra_metadata": {},
+        "folders": [],
+        "homeassistant_included": True,
+        "homeassistant_version": "2024.12.0.dev0",
+        "name": "Core 2024.12.0.dev0",
+        "failed_agent_ids": [],
+        "with_automatic_settings": None,
+    }
+
+
+async def test_agents_delete(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_onedrive_client: MagicMock,
+) -> None:
+    """Test agent delete backup."""
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id(
+        {
+            "type": "backup/delete",
+            "backup_id": BACKUP_METADATA["backup_id"],
+        }
+    )
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {"agent_errors": {}}
+    assert mock_onedrive_client.delete_drive_item.call_count == 2
+
+
+async def test_agents_upload(
+    hass_client: ClientSessionGenerator,
+    caplog: pytest.LogCaptureFixture,
+    mock_onedrive_client: MagicMock,
+    mock_large_file_upload_client: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test agent upload backup."""
+    client = await hass_client()
+    test_backup = AgentBackup.from_dict(BACKUP_METADATA)
+
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_get_backup",
+        ) as fetch_backup,
+        patch(
+            "homeassistant.components.backup.manager.read_backup",
+            return_value=test_backup,
+        ),
+        patch("pathlib.Path.open") as mocked_open,
+    ):
+        mocked_open.return_value.read = Mock(side_effect=[b"test", b""])
+        fetch_backup.return_value = test_backup
+        resp = await client.post(
+            f"/api/backup/upload?agent_id={DOMAIN}.{mock_config_entry.unique_id}",
+            data={"file": StringIO("test")},
+        )
+
+    assert resp.status == 201
+    assert f"Uploading backup {test_backup.backup_id}" in caplog.text
+    mock_large_file_upload_client.assert_called_once()
+    mock_onedrive_client.update_drive_item.assert_called_once()
+
+
+async def test_agents_upload_corrupt_upload(
+    hass_client: ClientSessionGenerator,
+    caplog: pytest.LogCaptureFixture,
+    mock_onedrive_client: MagicMock,
+    mock_large_file_upload_client: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test hash validation fails."""
+    mock_large_file_upload_client.side_effect = HashMismatchError("test")
+    client = await hass_client()
+    test_backup = AgentBackup.from_dict(BACKUP_METADATA)
+
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_get_backup",
+        ) as fetch_backup,
+        patch(
+            "homeassistant.components.backup.manager.read_backup",
+            return_value=test_backup,
+        ),
+        patch("pathlib.Path.open") as mocked_open,
+    ):
+        mocked_open.return_value.read = Mock(side_effect=[b"test", b""])
+        fetch_backup.return_value = test_backup
+        resp = await client.post(
+            f"/api/backup/upload?agent_id={DOMAIN}.{mock_config_entry.unique_id}",
+            data={"file": StringIO("test")},
+        )
+
+    assert resp.status == 201
+    assert f"Uploading backup {test_backup.backup_id}" in caplog.text
+    mock_large_file_upload_client.assert_called_once()
+    assert mock_onedrive_client.update_drive_item.call_count == 0
+    assert "Hash validation failed, backup file might be corrupt" in caplog.text
+
+
+async def test_agents_download(
+    hass_client: ClientSessionGenerator,
+    mock_onedrive_client: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test agent download backup."""
+    client = await hass_client()
+    backup_id = BACKUP_METADATA["backup_id"]
+
+    resp = await client.get(
+        f"/api/backup/download/{backup_id}?agent_id={DOMAIN}.{mock_config_entry.unique_id}"
+    )
+    assert resp.status == 200
+    assert await resp.content.read() == b"backup data"
+
+
+async def test_error_on_agents_download(
+    hass_client: ClientSessionGenerator,
+    mock_onedrive_client: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    mock_backup_file: File,
+    mock_metadata_file: File,
+) -> None:
+    """Test we get not found on an not existing backup on download."""
+    client = await hass_client()
+    backup_id = BACKUP_METADATA["backup_id"]
+    mock_onedrive_client.list_drive_items.side_effect = [
+        [mock_backup_file, mock_metadata_file],
+        [],
+    ]
+
+    with patch("homeassistant.components.onedrive.backup.CACHE_TTL", -1):
+        resp = await client.get(
+            f"/api/backup/download/{backup_id}?agent_id={DOMAIN}.{mock_config_entry.unique_id}"
+        )
+    assert resp.status == 404
+
+
+@pytest.mark.parametrize(
+    ("side_effect", "error"),
+    [
+        (
+            OneDriveException(),
+            "Backup operation failed",
+        ),
+        (TimeoutError(), "Backup operation timed out"),
+    ],
+)
+async def test_delete_error(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_onedrive_client: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    side_effect: Exception,
+    error: str,
+) -> None:
+    """Test error during delete."""
+    mock_onedrive_client.delete_drive_item.side_effect = AsyncMock(
+        side_effect=side_effect
+    )
+
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id(
+        {
+            "type": "backup/delete",
+            "backup_id": BACKUP_METADATA["backup_id"],
+        }
+    )
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {
+        "agent_errors": {f"{DOMAIN}.{mock_config_entry.unique_id}": error}
+    }
+
+
+async def test_agents_delete_not_found_does_not_throw(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_onedrive_client: MagicMock,
+) -> None:
+    """Test agent delete backup."""
+    mock_onedrive_client.list_drive_items.return_value = []
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id(
+        {
+            "type": "backup/delete",
+            "backup_id": BACKUP_METADATA["backup_id"],
+        }
+    )
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {"agent_errors": {}}
+
+
+async def test_agents_backup_not_found(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_onedrive_client: MagicMock,
+) -> None:
+    """Test backup not found."""
+
+    mock_onedrive_client.list_drive_items.return_value = []
+    backup_id = BACKUP_METADATA["backup_id"]
+    client = await hass_ws_client(hass)
+    await client.send_json_auto_id({"type": "backup/details", "backup_id": backup_id})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"]["backup"] is None
+
+
+async def test_reauth_on_403(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_onedrive_client: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test we re-authenticate on 403."""
+
+    mock_onedrive_client.list_drive_items.side_effect = AuthenticationError(
+        403, "Auth failed"
+    )
+    backup_id = BACKUP_METADATA["backup_id"]
+    client = await hass_ws_client(hass)
+    await client.send_json_auto_id({"type": "backup/details", "backup_id": backup_id})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"]["agent_errors"] == {
+        f"{DOMAIN}.{mock_config_entry.unique_id}": "Authentication error"
+    }
+
+    await hass.async_block_till_done()
+    flows = hass.config_entries.flow.async_progress()
+    assert len(flows) == 1
+
+    flow = flows[0]
+    assert flow["step_id"] == "reauth_confirm"
+    assert flow["handler"] == DOMAIN
+    assert "context" in flow
+    assert flow["context"]["source"] == SOURCE_REAUTH
+    assert flow["context"]["entry_id"] == mock_config_entry.entry_id
+
+
+async def test_listeners_get_cleaned_up(hass: HomeAssistant) -> None:
+    """Test listener gets cleaned up."""
+    listener = MagicMock()
+    remove_listener = async_register_backup_agents_listener(hass, listener=listener)
+
+    # make sure it's the last listener
+    hass.data[DATA_BACKUP_AGENT_LISTENERS] = [listener]
+    remove_listener()
+
+    assert hass.data.get(DATA_BACKUP_AGENT_LISTENERS) is None
diff --git a/tests/components/onedrive/test_config_flow.py b/tests/components/onedrive/test_config_flow.py
new file mode 100644
index 00000000000..81cd44bd041
--- /dev/null
+++ b/tests/components/onedrive/test_config_flow.py
@@ -0,0 +1,454 @@
+"""Test the OneDrive config flow."""
+
+from http import HTTPStatus
+from unittest.mock import AsyncMock, MagicMock
+
+from onedrive_personal_sdk.exceptions import OneDriveException
+from onedrive_personal_sdk.models.items import AppRoot, Folder, ItemUpdate
+import pytest
+
+from homeassistant import config_entries
+from homeassistant.components.onedrive.const import (
+    CONF_DELETE_PERMANENTLY,
+    CONF_FOLDER_ID,
+    CONF_FOLDER_NAME,
+    DOMAIN,
+    OAUTH2_AUTHORIZE,
+    OAUTH2_TOKEN,
+)
+from homeassistant.config_entries import ConfigFlowResult
+from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.helpers import config_entry_oauth2_flow
+
+from . import setup_integration
+from .const import CLIENT_ID
+
+from tests.common import MockConfigEntry
+from tests.test_util.aiohttp import AiohttpClientMocker
+from tests.typing import ClientSessionGenerator
+
+
+async def _do_get_token(
+    hass: HomeAssistant,
+    result: ConfigFlowResult,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+) -> None:
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+
+    scope = "Files.ReadWrite.AppFolder+offline_access+openid"
+
+    assert result["url"] == (
+        f"{OAUTH2_AUTHORIZE}?response_type=code&client_id={CLIENT_ID}"
+        "&redirect_uri=https://example.com/auth/external/callback"
+        f"&state={state}&scope={scope}"
+    )
+
+    client = await hass_client_no_auth()
+    resp = await client.get(f"/auth/external/callback?code=abcd&state={state}")
+    assert resp.status == HTTPStatus.OK
+    assert resp.headers["content-type"] == "text/html; charset=utf-8"
+
+    aioclient_mock.post(
+        OAUTH2_TOKEN,
+        json={
+            "refresh_token": "mock-refresh-token",
+            "access_token": "mock-access-token",
+            "type": "Bearer",
+            "expires_in": 60,
+        },
+    )
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+async def test_full_flow(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_setup_entry: AsyncMock,
+    mock_onedrive_client_init: MagicMock,
+) -> None:
+    """Check full flow."""
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    await _do_get_token(hass, result, hass_client_no_auth, aioclient_mock)
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    # Ensure the token callback is set up correctly
+    token_callback = mock_onedrive_client_init.call_args[0][0]
+    assert await token_callback() == "mock-access-token"
+
+    assert result["type"] is FlowResultType.FORM
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {CONF_FOLDER_NAME: "myFolder"}
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    assert len(mock_setup_entry.mock_calls) == 1
+    assert result["title"] == "John Doe's OneDrive"
+    assert result["result"].unique_id == "mock_drive_id"
+    assert result["data"][CONF_TOKEN][CONF_ACCESS_TOKEN] == "mock-access-token"
+    assert result["data"][CONF_TOKEN]["refresh_token"] == "mock-refresh-token"
+    assert result["data"][CONF_FOLDER_NAME] == "myFolder"
+    assert result["data"][CONF_FOLDER_ID] == "my_folder_id"
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+async def test_full_flow_with_owner_not_found(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_setup_entry: AsyncMock,
+    mock_onedrive_client: MagicMock,
+    mock_approot: MagicMock,
+) -> None:
+    """Ensure we get a default title if the drive's owner can't be read."""
+
+    mock_approot.created_by.user = None
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    await _do_get_token(hass, result, hass_client_no_auth, aioclient_mock)
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert result["type"] is FlowResultType.FORM
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {CONF_FOLDER_NAME: "myFolder"}
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    assert len(mock_setup_entry.mock_calls) == 1
+    assert result["title"] == "OneDrive"
+    assert result["result"].unique_id == "mock_drive_id"
+    assert result["data"][CONF_TOKEN][CONF_ACCESS_TOKEN] == "mock-access-token"
+    assert result["data"][CONF_TOKEN]["refresh_token"] == "mock-refresh-token"
+    assert result["data"][CONF_FOLDER_NAME] == "myFolder"
+    assert result["data"][CONF_FOLDER_ID] == "my_folder_id"
+
+    mock_onedrive_client.reset_mock()
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+async def test_folder_already_in_use(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_setup_entry: AsyncMock,
+    mock_onedrive_client: MagicMock,
+    mock_instance_id: AsyncMock,
+    mock_folder: Folder,
+) -> None:
+    """Ensure a folder that is already in use is not allowed."""
+
+    mock_folder.description = "1234"
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    await _do_get_token(hass, result, hass_client_no_auth, aioclient_mock)
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert result["type"] is FlowResultType.FORM
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {CONF_FOLDER_NAME: "myFolder"}
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {CONF_FOLDER_NAME: "folder_already_in_use"}
+
+    # clear error and try again
+    mock_onedrive_client.create_folder.return_value.description = mock_instance_id
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {CONF_FOLDER_NAME: "myFolder"}
+    )
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "John Doe's OneDrive"
+    assert result["result"].unique_id == "mock_drive_id"
+    assert result["data"][CONF_TOKEN][CONF_ACCESS_TOKEN] == "mock-access-token"
+    assert result["data"][CONF_TOKEN]["refresh_token"] == "mock-refresh-token"
+    assert result["data"][CONF_FOLDER_NAME] == "myFolder"
+    assert result["data"][CONF_FOLDER_ID] == "my_folder_id"
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+async def test_error_during_folder_creation(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_setup_entry: AsyncMock,
+    mock_onedrive_client: MagicMock,
+) -> None:
+    """Ensure we can create the backup folder."""
+
+    mock_onedrive_client.create_folder.side_effect = OneDriveException()
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    await _do_get_token(hass, result, hass_client_no_auth, aioclient_mock)
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert result["type"] is FlowResultType.FORM
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {CONF_FOLDER_NAME: "myFolder"}
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {"base": "folder_creation_error"}
+
+    mock_onedrive_client.create_folder.side_effect = None
+
+    # clear error and try again
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {CONF_FOLDER_NAME: "myFolder"}
+    )
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "John Doe's OneDrive"
+    assert result["result"].unique_id == "mock_drive_id"
+    assert result["data"][CONF_TOKEN][CONF_ACCESS_TOKEN] == "mock-access-token"
+    assert result["data"][CONF_TOKEN]["refresh_token"] == "mock-refresh-token"
+    assert result["data"][CONF_FOLDER_NAME] == "myFolder"
+    assert result["data"][CONF_FOLDER_ID] == "my_folder_id"
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+@pytest.mark.parametrize(
+    ("exception", "error"),
+    [
+        (Exception, "unknown"),
+        (OneDriveException, "connection_error"),
+    ],
+)
+async def test_flow_errors(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_onedrive_client: MagicMock,
+    exception: Exception,
+    error: str,
+) -> None:
+    """Test errors during flow."""
+
+    mock_onedrive_client.get_approot.side_effect = exception
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    await _do_get_token(hass, result, hass_client_no_auth, aioclient_mock)
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == error
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+async def test_already_configured(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test already configured account."""
+    await setup_integration(hass, mock_config_entry)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    await _do_get_token(hass, result, hass_client_no_auth, aioclient_mock)
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+async def test_reauth_flow(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test that the reauth flow works."""
+
+    await setup_integration(hass, mock_config_entry)
+
+    result = await mock_config_entry.start_reauth_flow(hass)
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reauth_confirm"
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+    await _do_get_token(hass, result, hass_client_no_auth, aioclient_mock)
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reauth_successful"
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+async def test_reauth_flow_id_changed(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    mock_onedrive_client: MagicMock,
+    mock_approot: AppRoot,
+) -> None:
+    """Test that the reauth flow fails on a different drive id."""
+
+    mock_approot.parent_reference.drive_id = "other_drive_id"
+
+    await setup_integration(hass, mock_config_entry)
+
+    result = await mock_config_entry.start_reauth_flow(hass)
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reauth_confirm"
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+    await _do_get_token(hass, result, hass_client_no_auth, aioclient_mock)
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "wrong_drive"
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+async def test_reconfigure_flow(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_onedrive_client: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    mock_setup_entry: AsyncMock,
+) -> None:
+    """Testing reconfgure flow."""
+    await setup_integration(hass, mock_config_entry)
+
+    result = await mock_config_entry.start_reconfigure_flow(hass)
+    await _do_get_token(hass, result, hass_client_no_auth, aioclient_mock)
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reconfigure_folder"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {CONF_FOLDER_NAME: "newFolder"}
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    mock_onedrive_client.update_drive_item.assert_called_once_with(
+        mock_config_entry.data[CONF_FOLDER_ID], ItemUpdate(name="newFolder")
+    )
+    assert mock_config_entry.data[CONF_FOLDER_NAME] == "newFolder"
+    assert mock_config_entry.data[CONF_TOKEN][CONF_ACCESS_TOKEN] == "mock-access-token"
+    assert mock_config_entry.data[CONF_TOKEN]["refresh_token"] == "mock-refresh-token"
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+async def test_reconfigure_flow_error(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_onedrive_client: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    mock_setup_entry: AsyncMock,
+) -> None:
+    """Testing reconfgure flow errors."""
+    mock_config_entry.add_to_hass(hass)
+    await hass.async_block_till_done()
+
+    result = await mock_config_entry.start_reconfigure_flow(hass)
+    await _do_get_token(hass, result, hass_client_no_auth, aioclient_mock)
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reconfigure_folder"
+
+    mock_onedrive_client.update_drive_item.side_effect = OneDriveException()
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {CONF_FOLDER_NAME: "newFolder"}
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reconfigure_folder"
+    assert result["errors"] == {"base": "folder_rename_error"}
+
+    # clear side effect
+    mock_onedrive_client.update_drive_item.side_effect = None
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {CONF_FOLDER_NAME: "newFolder"}
+    )
+
+    assert mock_config_entry.data[CONF_FOLDER_NAME] == "newFolder"
+    assert mock_config_entry.data[CONF_TOKEN][CONF_ACCESS_TOKEN] == "mock-access-token"
+    assert mock_config_entry.data[CONF_TOKEN]["refresh_token"] == "mock-refresh-token"
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+async def test_reconfigure_flow_id_changed(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    mock_onedrive_client: MagicMock,
+    mock_approot: AppRoot,
+) -> None:
+    """Test that the reconfigure flow fails on a different drive id."""
+
+    mock_approot.parent_reference.drive_id = "other_drive_id"
+
+    mock_config_entry.add_to_hass(hass)
+    await hass.async_block_till_done()
+
+    result = await mock_config_entry.start_reconfigure_flow(hass)
+    await _do_get_token(hass, result, hass_client_no_auth, aioclient_mock)
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "wrong_drive"
+
+
+async def test_options_flow(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test options flow."""
+    await setup_integration(hass, mock_config_entry)
+
+    result = await hass.config_entries.options.async_init(mock_config_entry.entry_id)
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "init"
+
+    result2 = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            CONF_DELETE_PERMANENTLY: True,
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["data"] == {
+        CONF_DELETE_PERMANENTLY: True,
+    }
diff --git a/tests/components/onedrive/test_diagnostics.py b/tests/components/onedrive/test_diagnostics.py
new file mode 100644
index 00000000000..f82d9925ee6
--- /dev/null
+++ b/tests/components/onedrive/test_diagnostics.py
@@ -0,0 +1,26 @@
+"""Tests for the diagnostics data provided by the OneDrive integration."""
+
+from syrupy import SnapshotAssertion
+
+from homeassistant.core import HomeAssistant
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry
+from tests.components.diagnostics import get_diagnostics_for_config_entry
+from tests.typing import ClientSessionGenerator
+
+
+async def test_diagnostics(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    mock_config_entry: MockConfigEntry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test diagnostics."""
+
+    await setup_integration(hass, mock_config_entry)
+    assert (
+        await get_diagnostics_for_config_entry(hass, hass_client, mock_config_entry)
+        == snapshot
+    )
diff --git a/tests/components/onedrive/test_init.py b/tests/components/onedrive/test_init.py
new file mode 100644
index 00000000000..952ca01e1cb
--- /dev/null
+++ b/tests/components/onedrive/test_init.py
@@ -0,0 +1,300 @@
+"""Test the OneDrive setup."""
+
+from copy import copy
+from html import escape
+from json import dumps
+from unittest.mock import MagicMock
+
+from onedrive_personal_sdk.const import DriveState
+from onedrive_personal_sdk.exceptions import (
+    AuthenticationError,
+    NotFoundError,
+    OneDriveException,
+)
+from onedrive_personal_sdk.models.items import AppRoot, Drive, File, Folder, ItemUpdate
+import pytest
+from syrupy import SnapshotAssertion
+
+from homeassistant.components.onedrive.const import (
+    CONF_FOLDER_ID,
+    CONF_FOLDER_NAME,
+    DOMAIN,
+)
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr, issue_registry as ir
+
+from . import setup_integration
+from .const import BACKUP_METADATA, INSTANCE_ID
+
+from tests.common import MockConfigEntry
+
+
+async def test_load_unload_config_entry(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_onedrive_client_init: MagicMock,
+    mock_onedrive_client: MagicMock,
+) -> None:
+    """Test loading and unloading the integration."""
+    await setup_integration(hass, mock_config_entry)
+
+    # Ensure the token callback is set up correctly
+    token_callback = mock_onedrive_client_init.call_args[0][0]
+    assert await token_callback() == "mock-access-token"
+
+    # make sure metadata migration is not called
+    assert mock_onedrive_client.upload_file.call_count == 0
+    assert mock_onedrive_client.update_drive_item.call_count == 0
+
+    assert mock_config_entry.state is ConfigEntryState.LOADED
+
+    await hass.config_entries.async_unload(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert mock_config_entry.state is ConfigEntryState.NOT_LOADED
+
+
+@pytest.mark.parametrize(
+    ("side_effect", "state"),
+    [
+        (AuthenticationError(403, "Auth failed"), ConfigEntryState.SETUP_ERROR),
+        (OneDriveException(), ConfigEntryState.SETUP_RETRY),
+    ],
+)
+async def test_approot_errors(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_onedrive_client: MagicMock,
+    side_effect: Exception,
+    state: ConfigEntryState,
+) -> None:
+    """Test errors during approot retrieval."""
+    mock_onedrive_client.get_approot.side_effect = side_effect
+    await setup_integration(hass, mock_config_entry)
+    assert mock_config_entry.state is state
+
+
+async def test_get_integration_folder_error(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_onedrive_client: MagicMock,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test faulty integration folder retrieval."""
+    mock_onedrive_client.get_drive_item.side_effect = OneDriveException()
+    await setup_integration(hass, mock_config_entry)
+    assert mock_config_entry.state is ConfigEntryState.SETUP_RETRY
+    assert "Failed to get backups_123 folder" in caplog.text
+
+
+async def test_get_integration_folder_creation(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_onedrive_client: MagicMock,
+    mock_approot: AppRoot,
+    mock_folder: Folder,
+) -> None:
+    """Test faulty integration folder creation."""
+    folder_name = copy(mock_config_entry.data[CONF_FOLDER_NAME])
+    mock_onedrive_client.get_drive_item.side_effect = NotFoundError(404, "Not found")
+    await setup_integration(hass, mock_config_entry)
+
+    assert mock_config_entry.state is ConfigEntryState.LOADED
+    mock_onedrive_client.create_folder.assert_called_once_with(
+        parent_id=mock_approot.id,
+        name=folder_name,
+    )
+    # ensure the folder id and name are updated
+    assert mock_config_entry.data[CONF_FOLDER_ID] == mock_folder.id
+    assert mock_config_entry.data[CONF_FOLDER_NAME] == mock_folder.name
+
+
+async def test_get_integration_folder_creation_error(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_onedrive_client: MagicMock,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test faulty integration folder creation error."""
+    mock_onedrive_client.get_drive_item.side_effect = NotFoundError(404, "Not found")
+    mock_onedrive_client.create_folder.side_effect = OneDriveException()
+    await setup_integration(hass, mock_config_entry)
+
+    assert mock_config_entry.state is ConfigEntryState.SETUP_RETRY
+    assert "Failed to get backups_123 folder" in caplog.text
+
+
+async def test_update_instance_id_description(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_onedrive_client: MagicMock,
+    mock_folder: Folder,
+) -> None:
+    """Test we write the instance id to the folder."""
+    mock_folder.description = ""
+    await setup_integration(hass, mock_config_entry)
+    await hass.async_block_till_done()
+
+    mock_onedrive_client.update_drive_item.assert_called_with(
+        mock_folder.id, ItemUpdate(description=INSTANCE_ID)
+    )
+
+
+async def test_migrate_metadata_files(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_onedrive_client: MagicMock,
+    mock_backup_file: File,
+) -> None:
+    """Test migration of metadata files."""
+    mock_backup_file.description = escape(
+        dumps({**BACKUP_METADATA, "metadata_version": 1})
+    )
+    await setup_integration(hass, mock_config_entry)
+    await hass.async_block_till_done()
+
+    mock_onedrive_client.upload_file.assert_called_once()
+    assert mock_onedrive_client.update_drive_item.call_count == 2
+    assert mock_onedrive_client.update_drive_item.call_args[1]["data"].description == ""
+
+
+async def test_migrate_metadata_files_errors(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_onedrive_client: MagicMock,
+) -> None:
+    """Test migration of metadata files errors."""
+    mock_onedrive_client.list_drive_items.side_effect = OneDriveException()
+    await setup_integration(hass, mock_config_entry)
+
+    assert mock_config_entry.state is ConfigEntryState.SETUP_RETRY
+
+
+async def test_auth_error_during_update(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_onedrive_client: MagicMock,
+) -> None:
+    """Test auth error during update."""
+    mock_onedrive_client.get_drive.side_effect = AuthenticationError(403, "Auth failed")
+    await setup_integration(hass, mock_config_entry)
+
+    assert mock_config_entry.state is ConfigEntryState.SETUP_ERROR
+
+
+async def test_device(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    device_registry: dr.DeviceRegistry,
+    snapshot: SnapshotAssertion,
+    mock_drive: Drive,
+) -> None:
+    """Test the device."""
+
+    await setup_integration(hass, mock_config_entry)
+
+    device = device_registry.async_get_device({(DOMAIN, mock_drive.id)})
+    assert device
+    assert device == snapshot
+
+
+@pytest.mark.parametrize(
+    (
+        "drive_state",
+        "issue_key",
+        "issue_exists",
+    ),
+    [
+        (DriveState.NORMAL, "drive_full", False),
+        (DriveState.NORMAL, "drive_almost_full", False),
+        (DriveState.CRITICAL, "drive_almost_full", True),
+        (DriveState.CRITICAL, "drive_full", False),
+        (DriveState.EXCEEDED, "drive_almost_full", False),
+        (DriveState.EXCEEDED, "drive_full", True),
+    ],
+)
+async def test_data_cap_issues(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_onedrive_client: MagicMock,
+    mock_drive: Drive,
+    drive_state: DriveState,
+    issue_key: str,
+    issue_exists: bool,
+) -> None:
+    """Make sure we get issues for high data usage."""
+    assert mock_drive.quota
+    mock_drive.quota.state = drive_state
+
+    await setup_integration(hass, mock_config_entry)
+
+    issue_registry = ir.async_get(hass)
+    issue = issue_registry.async_get_issue(DOMAIN, issue_key)
+    assert (issue is not None) == issue_exists
+
+
+async def test_1_1_to_1_2_migration(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_folder: Folder,
+) -> None:
+    """Test migration from 1.1 to 1.2."""
+    old_config_entry = MockConfigEntry(
+        unique_id="mock_drive_id",
+        title="John Doe's OneDrive",
+        domain=DOMAIN,
+        data={
+            "auth_implementation": mock_config_entry.data["auth_implementation"],
+            "token": mock_config_entry.data["token"],
+        },
+    )
+
+    await setup_integration(hass, old_config_entry)
+    assert old_config_entry.data[CONF_FOLDER_ID] == mock_folder.id
+    assert old_config_entry.data[CONF_FOLDER_NAME] == mock_folder.name
+    assert old_config_entry.minor_version == 2
+
+
+async def test_1_1_to_1_2_migration_failure(
+    hass: HomeAssistant,
+    mock_onedrive_client: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test migration from 1.1 to 1.2 failure."""
+    old_config_entry = MockConfigEntry(
+        unique_id="mock_drive_id",
+        title="John Doe's OneDrive",
+        domain=DOMAIN,
+        data={
+            "auth_implementation": mock_config_entry.data["auth_implementation"],
+            "token": mock_config_entry.data["token"],
+        },
+    )
+
+    # will always 404 after migration, because of dummy id
+    mock_onedrive_client.get_drive_item.side_effect = NotFoundError(404, "Not found")
+
+    await setup_integration(hass, old_config_entry)
+    assert old_config_entry.state is ConfigEntryState.MIGRATION_ERROR
+    assert old_config_entry.minor_version == 1
+
+
+async def test_migration_guard_against_major_downgrade(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test migration guards against major downgrades."""
+    old_config_entry = MockConfigEntry(
+        unique_id="mock_drive_id",
+        title="John Doe's OneDrive",
+        domain=DOMAIN,
+        data={
+            "auth_implementation": mock_config_entry.data["auth_implementation"],
+            "token": mock_config_entry.data["token"],
+        },
+        version=2,
+    )
+
+    await setup_integration(hass, old_config_entry)
+    assert old_config_entry.state is ConfigEntryState.MIGRATION_ERROR
diff --git a/tests/components/onedrive/test_sensor.py b/tests/components/onedrive/test_sensor.py
new file mode 100644
index 00000000000..ea9d93a9a7b
--- /dev/null
+++ b/tests/components/onedrive/test_sensor.py
@@ -0,0 +1,64 @@
+"""Tests for OneDrive sensors."""
+
+from datetime import timedelta
+from typing import Any
+from unittest.mock import MagicMock
+
+from freezegun.api import FrozenDateTimeFactory
+from onedrive_personal_sdk.const import DriveType
+from onedrive_personal_sdk.exceptions import HttpRequestException
+from onedrive_personal_sdk.models.items import Drive
+import pytest
+from syrupy import SnapshotAssertion
+
+from homeassistant.const import STATE_UNAVAILABLE
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_sensors(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    mock_config_entry: MockConfigEntry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test the OneDrive sensors."""
+
+    await setup_integration(hass, mock_config_entry)
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
+
+
+@pytest.mark.parametrize(
+    ("attr", "side_effect"),
+    [
+        ("side_effect", HttpRequestException(503, "Service Unavailable")),
+        ("return_value", Drive(id="id", name="name", drive_type=DriveType.PERSONAL)),
+    ],
+)
+async def test_update_failure(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_onedrive_client: MagicMock,
+    freezer: FrozenDateTimeFactory,
+    attr: str,
+    side_effect: Any,
+) -> None:
+    """Ensure sensors are going unavailable on update failure."""
+    await setup_integration(hass, mock_config_entry)
+
+    state = hass.states.get("sensor.my_drive_remaining_storage")
+    assert state.state == "0.75"
+
+    setattr(mock_onedrive_client.get_drive, attr, side_effect)
+
+    freezer.tick(timedelta(minutes=10))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.my_drive_remaining_storage")
+    assert state.state == STATE_UNAVAILABLE
diff --git a/tests/components/onedrive/test_services.py b/tests/components/onedrive/test_services.py
new file mode 100644
index 00000000000..31d2d932cd0
--- /dev/null
+++ b/tests/components/onedrive/test_services.py
@@ -0,0 +1,280 @@
+"""Tests for OneDrive services."""
+
+from collections.abc import Generator
+from dataclasses import dataclass
+import re
+from typing import Any, cast
+from unittest.mock import MagicMock, Mock, patch
+
+from onedrive_personal_sdk.exceptions import OneDriveException
+import pytest
+
+from homeassistant.components.onedrive.const import DOMAIN
+from homeassistant.components.onedrive.services import (
+    CONF_CONFIG_ENTRY_ID,
+    CONF_DESTINATION_FOLDER,
+    UPLOAD_SERVICE,
+)
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import CONF_FILENAME
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry
+
+TEST_FILENAME = "doorbell_snapshot.jpg"
+DESINATION_FOLDER = "TestFolder"
+
+
+@dataclass
+class MockUploadFile:
+    """Dataclass used to configure the test with a fake file behavior."""
+
+    content: bytes = b"image bytes"
+    exists: bool = True
+    is_allowed_path: bool = True
+    size: int | None = None
+
+
+@pytest.fixture(name="upload_file")
+def upload_file_fixture() -> MockUploadFile:
+    """Fixture to set up test configuration with a fake file."""
+    return MockUploadFile()
+
+
+@pytest.fixture(autouse=True)
+def mock_upload_file(
+    hass: HomeAssistant, upload_file: MockUploadFile
+) -> Generator[None]:
+    """Fixture that mocks out the file calls using the FakeFile fixture."""
+    with (
+        patch(
+            "homeassistant.components.onedrive.services.Path.read_bytes",
+            return_value=upload_file.content,
+        ),
+        patch(
+            "homeassistant.components.onedrive.services.Path.exists",
+            return_value=upload_file.exists,
+        ),
+        patch.object(
+            hass.config, "is_allowed_path", return_value=upload_file.is_allowed_path
+        ),
+        patch("pathlib.Path.stat") as mock_stat,
+    ):
+        mock_stat.return_value = Mock()
+        mock_stat.return_value.st_size = (
+            upload_file.size if upload_file.size else len(upload_file.content)
+        )
+        yield
+
+
+async def test_upload_service(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test service call to upload content."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.services.has_service(DOMAIN, "upload")
+
+    response = await hass.services.async_call(
+        DOMAIN,
+        UPLOAD_SERVICE,
+        {
+            CONF_CONFIG_ENTRY_ID: mock_config_entry.entry_id,
+            CONF_FILENAME: TEST_FILENAME,
+            CONF_DESTINATION_FOLDER: DESINATION_FOLDER,
+        },
+        blocking=True,
+        return_response=True,
+    )
+
+    assert response
+    assert response["files"]
+    assert cast(list[dict[str, Any]], response["files"])[0]["id"] == "id"
+
+
+async def test_upload_service_no_response(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test service call to upload content without response."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.services.has_service(DOMAIN, "upload")
+
+    response = await hass.services.async_call(
+        DOMAIN,
+        UPLOAD_SERVICE,
+        {
+            CONF_CONFIG_ENTRY_ID: mock_config_entry.entry_id,
+            CONF_FILENAME: TEST_FILENAME,
+            CONF_DESTINATION_FOLDER: DESINATION_FOLDER,
+        },
+        blocking=True,
+    )
+
+    assert response is None
+
+
+async def test_upload_service_config_entry_not_found(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test upload service call with a config entry that does not exist."""
+    await setup_integration(hass, mock_config_entry)
+    with pytest.raises(HomeAssistantError, match="not found in registry"):
+        await hass.services.async_call(
+            DOMAIN,
+            UPLOAD_SERVICE,
+            {
+                CONF_CONFIG_ENTRY_ID: "invalid-config-entry-id",
+                CONF_FILENAME: TEST_FILENAME,
+                CONF_DESTINATION_FOLDER: DESINATION_FOLDER,
+            },
+            blocking=True,
+            return_response=True,
+        )
+
+
+async def test_config_entry_not_loaded(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test upload service call with a config entry that is not loaded."""
+    await setup_integration(hass, mock_config_entry)
+    await hass.config_entries.async_unload(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert mock_config_entry.state is ConfigEntryState.NOT_LOADED
+
+    with pytest.raises(HomeAssistantError, match="not found in registry"):
+        await hass.services.async_call(
+            DOMAIN,
+            UPLOAD_SERVICE,
+            {
+                CONF_CONFIG_ENTRY_ID: mock_config_entry.unique_id,
+                CONF_FILENAME: TEST_FILENAME,
+                CONF_DESTINATION_FOLDER: DESINATION_FOLDER,
+            },
+            blocking=True,
+            return_response=True,
+        )
+
+
+@pytest.mark.parametrize("upload_file", [MockUploadFile(is_allowed_path=False)])
+async def test_path_is_not_allowed(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test upload service call with a filename path that is not allowed."""
+    await setup_integration(hass, mock_config_entry)
+    with (
+        pytest.raises(HomeAssistantError, match="no access to path"),
+    ):
+        await hass.services.async_call(
+            DOMAIN,
+            UPLOAD_SERVICE,
+            {
+                CONF_CONFIG_ENTRY_ID: mock_config_entry.entry_id,
+                CONF_FILENAME: TEST_FILENAME,
+                CONF_DESTINATION_FOLDER: DESINATION_FOLDER,
+            },
+            blocking=True,
+            return_response=True,
+        )
+
+
+@pytest.mark.parametrize("upload_file", [MockUploadFile(exists=False)])
+async def test_filename_does_not_exist(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test upload service call with a filename path that does not exist."""
+    await setup_integration(hass, mock_config_entry)
+    with pytest.raises(HomeAssistantError, match="does not exist"):
+        await hass.services.async_call(
+            DOMAIN,
+            UPLOAD_SERVICE,
+            {
+                CONF_CONFIG_ENTRY_ID: mock_config_entry.entry_id,
+                CONF_FILENAME: TEST_FILENAME,
+                CONF_DESTINATION_FOLDER: DESINATION_FOLDER,
+            },
+            blocking=True,
+            return_response=True,
+        )
+
+
+async def test_upload_service_fails_upload(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_onedrive_client: MagicMock,
+) -> None:
+    """Test service call to upload content."""
+    await setup_integration(hass, mock_config_entry)
+    mock_onedrive_client.upload_file.side_effect = OneDriveException("error")
+
+    with pytest.raises(HomeAssistantError, match="Failed to upload"):
+        await hass.services.async_call(
+            DOMAIN,
+            UPLOAD_SERVICE,
+            {
+                CONF_CONFIG_ENTRY_ID: mock_config_entry.entry_id,
+                CONF_FILENAME: TEST_FILENAME,
+                CONF_DESTINATION_FOLDER: DESINATION_FOLDER,
+            },
+            blocking=True,
+            return_response=True,
+        )
+
+
+@pytest.mark.parametrize("upload_file", [MockUploadFile(size=260 * 1024 * 1024)])
+async def test_upload_size_limit(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test upload service call with a filename path that does not exist."""
+    await setup_integration(hass, mock_config_entry)
+    with pytest.raises(
+        HomeAssistantError,
+        match=re.escape(f"`{TEST_FILENAME}` is too large (272629760 > 262144000)"),
+    ):
+        await hass.services.async_call(
+            DOMAIN,
+            UPLOAD_SERVICE,
+            {
+                CONF_CONFIG_ENTRY_ID: mock_config_entry.entry_id,
+                CONF_FILENAME: TEST_FILENAME,
+                CONF_DESTINATION_FOLDER: DESINATION_FOLDER,
+            },
+            blocking=True,
+            return_response=True,
+        )
+
+
+async def test_create_album_failed(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_onedrive_client: MagicMock,
+) -> None:
+    """Test service call when folder creation fails."""
+    await setup_integration(hass, mock_config_entry)
+    assert hass.services.has_service(DOMAIN, "upload")
+
+    mock_onedrive_client.create_folder.side_effect = OneDriveException()
+
+    with pytest.raises(HomeAssistantError, match="Failed to create folder"):
+        await hass.services.async_call(
+            DOMAIN,
+            UPLOAD_SERVICE,
+            {
+                CONF_CONFIG_ENTRY_ID: mock_config_entry.entry_id,
+                CONF_FILENAME: TEST_FILENAME,
+                CONF_DESTINATION_FOLDER: DESINATION_FOLDER,
+            },
+            blocking=True,
+            return_response=True,
+        )
diff --git a/tests/components/onewire/__init__.py b/tests/components/onewire/__init__.py
index 9c025fe33af..595b660b722 100644
--- a/tests/components/onewire/__init__.py
+++ b/tests/components/onewire/__init__.py
@@ -13,7 +13,9 @@ from .const import ATTR_INJECT_READS, MOCK_OWPROXY_DEVICES
 def setup_owproxy_mock_devices(owproxy: MagicMock, device_ids: list[str]) -> None:
     """Set up mock for owproxy."""
     dir_side_effect: dict[str, list] = {}
-    read_side_effect: dict[str, list] = {}
+    read_side_effect: dict[str, list] = {
+        "/system/configuration/version": [b"3.2"],
+    }
 
     # Setup directory listing
     dir_side_effect["/"] = [[f"/{device_id}/" for device_id in device_ids]]
diff --git a/tests/components/onewire/const.py b/tests/components/onewire/const.py
index 4c05442eadc..370bcc871c6 100644
--- a/tests/components/onewire/const.py
+++ b/tests/components/onewire/const.py
@@ -65,6 +65,19 @@ MOCK_OWPROXY_DEVICES = {
             },
         },
     },
+    "20.111111111111": {
+        ATTR_INJECT_READS: {
+            "/type": [b"DS2450"],
+            "/volt.A": [b"     1.1"],
+            "/volt.B": [b"     2.2"],
+            "/volt.C": [b"     3.3"],
+            "/volt.D": [b"     4.4"],
+            "/latestvolt.A": [b"     1.11"],
+            "/latestvolt.B": [b"     2.22"],
+            "/latestvolt.C": [b"     3.33"],
+            "/latestvolt.D": [b"     4.44"],
+        }
+    },
     "22.111111111111": {
         ATTR_INJECT_READS: {
             "/type": [b"DS1822"],
diff --git a/tests/components/onewire/snapshots/test_binary_sensor.ambr b/tests/components/onewire/snapshots/test_binary_sensor.ambr
index d94eda5b7c3..10122ba8685 100644
--- a/tests/components/onewire/snapshots/test_binary_sensor.ambr
+++ b/tests/components/onewire/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -102,6 +104,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -198,6 +202,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -246,6 +251,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -294,6 +300,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -342,6 +349,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -390,6 +398,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -438,6 +447,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -486,6 +496,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -534,6 +545,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -582,6 +594,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -631,6 +644,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -680,6 +694,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -729,6 +744,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/onewire/snapshots/test_diagnostics.ambr b/tests/components/onewire/snapshots/test_diagnostics.ambr
index 6c5631331ca..c60d0a9748b 100644
--- a/tests/components/onewire/snapshots/test_diagnostics.ambr
+++ b/tests/components/onewire/snapshots/test_diagnostics.ambr
@@ -15,6 +15,7 @@
           'model_id': 'HB_HUB',
           'name': 'EF.111111111113',
           'serial_number': '111111111113',
+          'sw_version': '3.2',
         }),
         'family': 'EF',
         'id': 'EF.111111111113',
diff --git a/tests/components/onewire/snapshots/test_init.ambr b/tests/components/onewire/snapshots/test_init.ambr
index 159f3acea42..9b2a0e00a62 100644
--- a/tests/components/onewire/snapshots/test_init.ambr
+++ b/tests/components/onewire/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -27,7 +28,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': '111111111111',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
     'via_device_id': None,
   })
 # ---
@@ -35,6 +36,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -59,7 +61,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': '111111111111',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
     'via_device_id': None,
   })
 # ---
@@ -67,6 +69,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -91,7 +94,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': '111111111111',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
     'via_device_id': None,
   })
 # ---
@@ -99,6 +102,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -123,7 +127,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': '111111111111',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
     'via_device_id': <ANY>,
   })
 # ---
@@ -131,6 +135,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -155,7 +160,40 @@
     'primary_config_entry': <ANY>,
     'serial_number': '111111111111',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
+    'via_device_id': None,
+  })
+# ---
+# name: test_registry[20.111111111111-entry]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'onewire',
+        '20.111111111111',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Maxim Integrated',
+    'model': 'DS2450',
+    'model_id': 'DS2450',
+    'name': '20.111111111111',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': '111111111111',
+    'suggested_area': None,
+    'sw_version': '3.2',
     'via_device_id': None,
   })
 # ---
@@ -163,6 +201,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -187,7 +226,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': '111111111111',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
     'via_device_id': None,
   })
 # ---
@@ -195,6 +234,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -219,7 +259,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': '111111111111',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
     'via_device_id': None,
   })
 # ---
@@ -227,6 +267,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -251,7 +292,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': '111111111111',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
     'via_device_id': None,
   })
 # ---
@@ -259,6 +300,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -283,7 +325,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': '222222222222',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
     'via_device_id': None,
   })
 # ---
@@ -291,6 +333,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -315,7 +358,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': '222222222223',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
     'via_device_id': None,
   })
 # ---
@@ -323,6 +366,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -347,7 +391,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': '111111111111',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
     'via_device_id': None,
   })
 # ---
@@ -355,6 +399,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -379,7 +424,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': '111111111111',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
     'via_device_id': None,
   })
 # ---
@@ -387,6 +432,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -411,7 +457,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': '111111111111',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
     'via_device_id': None,
   })
 # ---
@@ -419,6 +465,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -443,7 +490,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': '111111111111',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
     'via_device_id': None,
   })
 # ---
@@ -451,6 +498,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -475,7 +523,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': '111111111111',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
     'via_device_id': None,
   })
 # ---
@@ -483,6 +531,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -507,7 +556,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': '111111111111',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
     'via_device_id': None,
   })
 # ---
@@ -515,6 +564,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -539,7 +589,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': '222222222222',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
     'via_device_id': None,
   })
 # ---
@@ -547,6 +597,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -571,7 +622,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': '111111111111',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
     'via_device_id': None,
   })
 # ---
@@ -579,6 +630,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -603,7 +655,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': '111111111111',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
     'via_device_id': None,
   })
 # ---
@@ -611,6 +663,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -635,7 +688,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': '111111111112',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
     'via_device_id': None,
   })
 # ---
@@ -643,6 +696,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -667,7 +721,7 @@
     'primary_config_entry': <ANY>,
     'serial_number': '111111111113',
     'suggested_area': None,
-    'sw_version': None,
+    'sw_version': '3.2',
     'via_device_id': None,
   })
 # ---
diff --git a/tests/components/onewire/snapshots/test_select.ambr b/tests/components/onewire/snapshots/test_select.ambr
index 7c4027cd046..a896d946841 100644
--- a/tests/components/onewire/snapshots/test_select.ambr
+++ b/tests/components/onewire/snapshots/test_select.ambr
@@ -13,6 +13,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/onewire/snapshots/test_sensor.ambr b/tests/components/onewire/snapshots/test_sensor.ambr
index 1b8484b27a4..eca459b4c57 100644
--- a/tests/components/onewire/snapshots/test_sensor.ambr
+++ b/tests/components/onewire/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -61,6 +62,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -114,6 +116,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -167,6 +170,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -218,6 +222,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -260,6 +265,438 @@
     'state': '248125',
   })
 # ---
+# name: test_sensors[sensor.20_111111111111_latest_voltage_a-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.20_111111111111_latest_voltage_a',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Latest voltage A',
+    'platform': 'onewire',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'latest_voltage_id',
+    'unique_id': '/20.111111111111/latestvolt.A',
+    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+  })
+# ---
+# name: test_sensors[sensor.20_111111111111_latest_voltage_a-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'device_file': '/20.111111111111/latestvolt.A',
+      'friendly_name': '20.111111111111 Latest voltage A',
+      'raw_value': 1.11,
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.20_111111111111_latest_voltage_a',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '1.11',
+  })
+# ---
+# name: test_sensors[sensor.20_111111111111_latest_voltage_b-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.20_111111111111_latest_voltage_b',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Latest voltage B',
+    'platform': 'onewire',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'latest_voltage_id',
+    'unique_id': '/20.111111111111/latestvolt.B',
+    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+  })
+# ---
+# name: test_sensors[sensor.20_111111111111_latest_voltage_b-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'device_file': '/20.111111111111/latestvolt.B',
+      'friendly_name': '20.111111111111 Latest voltage B',
+      'raw_value': 2.22,
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.20_111111111111_latest_voltage_b',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2.22',
+  })
+# ---
+# name: test_sensors[sensor.20_111111111111_latest_voltage_c-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.20_111111111111_latest_voltage_c',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Latest voltage C',
+    'platform': 'onewire',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'latest_voltage_id',
+    'unique_id': '/20.111111111111/latestvolt.C',
+    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+  })
+# ---
+# name: test_sensors[sensor.20_111111111111_latest_voltage_c-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'device_file': '/20.111111111111/latestvolt.C',
+      'friendly_name': '20.111111111111 Latest voltage C',
+      'raw_value': 3.33,
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.20_111111111111_latest_voltage_c',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '3.33',
+  })
+# ---
+# name: test_sensors[sensor.20_111111111111_latest_voltage_d-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.20_111111111111_latest_voltage_d',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Latest voltage D',
+    'platform': 'onewire',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'latest_voltage_id',
+    'unique_id': '/20.111111111111/latestvolt.D',
+    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+  })
+# ---
+# name: test_sensors[sensor.20_111111111111_latest_voltage_d-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'device_file': '/20.111111111111/latestvolt.D',
+      'friendly_name': '20.111111111111 Latest voltage D',
+      'raw_value': 4.44,
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.20_111111111111_latest_voltage_d',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '4.44',
+  })
+# ---
+# name: test_sensors[sensor.20_111111111111_voltage_a-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.20_111111111111_voltage_a',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Voltage A',
+    'platform': 'onewire',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'voltage_id',
+    'unique_id': '/20.111111111111/volt.A',
+    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+  })
+# ---
+# name: test_sensors[sensor.20_111111111111_voltage_a-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'device_file': '/20.111111111111/volt.A',
+      'friendly_name': '20.111111111111 Voltage A',
+      'raw_value': 1.1,
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.20_111111111111_voltage_a',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '1.1',
+  })
+# ---
+# name: test_sensors[sensor.20_111111111111_voltage_b-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.20_111111111111_voltage_b',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Voltage B',
+    'platform': 'onewire',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'voltage_id',
+    'unique_id': '/20.111111111111/volt.B',
+    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+  })
+# ---
+# name: test_sensors[sensor.20_111111111111_voltage_b-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'device_file': '/20.111111111111/volt.B',
+      'friendly_name': '20.111111111111 Voltage B',
+      'raw_value': 2.2,
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.20_111111111111_voltage_b',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2.2',
+  })
+# ---
+# name: test_sensors[sensor.20_111111111111_voltage_c-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.20_111111111111_voltage_c',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Voltage C',
+    'platform': 'onewire',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'voltage_id',
+    'unique_id': '/20.111111111111/volt.C',
+    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+  })
+# ---
+# name: test_sensors[sensor.20_111111111111_voltage_c-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'device_file': '/20.111111111111/volt.C',
+      'friendly_name': '20.111111111111 Voltage C',
+      'raw_value': 3.3,
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.20_111111111111_voltage_c',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '3.3',
+  })
+# ---
+# name: test_sensors[sensor.20_111111111111_voltage_d-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.20_111111111111_voltage_d',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Voltage D',
+    'platform': 'onewire',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'voltage_id',
+    'unique_id': '/20.111111111111/volt.D',
+    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+  })
+# ---
+# name: test_sensors[sensor.20_111111111111_voltage_d-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'device_file': '/20.111111111111/volt.D',
+      'friendly_name': '20.111111111111 Voltage D',
+      'raw_value': 4.4,
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.20_111111111111_voltage_d',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '4.4',
+  })
+# ---
 # name: test_sensors[sensor.22_111111111111_temperature-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -269,6 +706,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -322,6 +760,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -375,6 +814,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -428,6 +868,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -481,6 +922,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -534,6 +976,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -587,6 +1030,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -640,6 +1084,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -693,6 +1138,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -746,6 +1192,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -799,6 +1246,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -852,6 +1300,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -905,6 +1354,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -958,6 +1408,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1011,6 +1462,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1064,6 +1516,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1117,6 +1570,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1170,6 +1624,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1223,6 +1678,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1276,6 +1732,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1329,6 +1786,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1382,6 +1840,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1435,6 +1894,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1488,6 +1948,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1541,6 +2002,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1594,6 +2056,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1647,6 +2110,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1700,6 +2164,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1753,6 +2218,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1806,6 +2272,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1859,6 +2326,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1912,6 +2380,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1965,6 +2434,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2018,6 +2488,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2071,6 +2542,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2124,6 +2596,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2177,6 +2650,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2230,6 +2704,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2283,6 +2758,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2336,6 +2812,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2389,6 +2866,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2442,6 +2920,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2495,6 +2974,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2548,6 +3028,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2601,6 +3082,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/onewire/snapshots/test_switch.ambr b/tests/components/onewire/snapshots/test_switch.ambr
index cb752982bec..8be414c7c1e 100644
--- a/tests/components/onewire/snapshots/test_switch.ambr
+++ b/tests/components/onewire/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -102,6 +104,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -198,6 +202,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -246,6 +251,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -294,6 +300,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -342,6 +349,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -390,6 +398,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -438,6 +447,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -486,6 +496,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -534,6 +545,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -582,6 +594,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -630,6 +643,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -678,6 +692,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -726,6 +741,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -774,6 +790,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -822,6 +839,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -870,6 +888,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -918,6 +937,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -966,6 +986,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1014,6 +1035,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1062,6 +1084,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1110,6 +1133,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1158,6 +1182,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1206,6 +1231,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1254,6 +1280,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1302,6 +1329,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1350,6 +1378,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1398,6 +1427,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1446,6 +1476,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1494,6 +1525,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1542,6 +1574,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1590,6 +1623,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1638,6 +1672,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1686,6 +1721,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1734,6 +1770,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/onkyo/__init__.py b/tests/components/onkyo/__init__.py
index 064075d109e..689711888d8 100644
--- a/tests/components/onkyo/__init__.py
+++ b/tests/components/onkyo/__init__.py
@@ -34,8 +34,9 @@ def create_config_entry_from_info(info: ReceiverInfo) -> MockConfigEntry:
     data = {CONF_HOST: info.host}
     options = {
         "volume_resolution": 80,
-        "input_sources": {"12": "tv"},
         "max_volume": 100,
+        "input_sources": {"12": "tv"},
+        "listening_modes": {"00": "stereo"},
     }
 
     return MockConfigEntry(
@@ -52,8 +53,9 @@ def create_empty_config_entry() -> MockConfigEntry:
     data = {CONF_HOST: ""}
     options = {
         "volume_resolution": 80,
-        "input_sources": {"12": "tv"},
         "max_volume": 100,
+        "input_sources": {"12": "tv"},
+        "listening_modes": {"00": "stereo"},
     }
 
     return MockConfigEntry(
diff --git a/tests/components/onkyo/test_config_flow.py b/tests/components/onkyo/test_config_flow.py
index 203cc22cf95..28186503ead 100644
--- a/tests/components/onkyo/test_config_flow.py
+++ b/tests/components/onkyo/test_config_flow.py
@@ -11,7 +11,9 @@ from homeassistant.components.onkyo.config_flow import OnkyoConfigFlow
 from homeassistant.components.onkyo.const import (
     DOMAIN,
     OPTION_INPUT_SOURCES,
+    OPTION_LISTENING_MODES,
     OPTION_MAX_VOLUME,
+    OPTION_MAX_VOLUME_DEFAULT,
     OPTION_VOLUME_RESOLUTION,
 )
 from homeassistant.config_entries import SOURCE_USER
@@ -226,7 +228,11 @@ async def test_ssdp_discovery_success(
 
     select_result = await hass.config_entries.flow.async_configure(
         result["flow_id"],
-        user_input={"volume_resolution": 200, "input_sources": ["TV"]},
+        user_input={
+            "volume_resolution": 200,
+            "input_sources": ["TV"],
+            "listening_modes": ["THX"],
+        },
     )
 
     assert select_result["type"] is FlowResultType.CREATE_ENTRY
@@ -349,34 +355,6 @@ async def test_ssdp_discovery_no_host(
     assert result["reason"] == "unknown"
 
 
-async def test_configure_empty_source_list(
-    hass: HomeAssistant, default_mock_discovery
-) -> None:
-    """Test receiver configuration with no sources set."""
-
-    init_result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-    )
-
-    form_result = await hass.config_entries.flow.async_configure(
-        init_result["flow_id"],
-        {"next_step_id": "manual"},
-    )
-
-    select_result = await hass.config_entries.flow.async_configure(
-        form_result["flow_id"],
-        user_input={CONF_HOST: "sample-host-name"},
-    )
-
-    configure_result = await hass.config_entries.flow.async_configure(
-        select_result["flow_id"],
-        user_input={"volume_resolution": 200, "input_sources": []},
-    )
-
-    assert configure_result["errors"] == {"input_sources": "empty_input_source_list"}
-
-
 async def test_configure_no_resolution(
     hass: HomeAssistant, default_mock_discovery
 ) -> None:
@@ -404,33 +382,61 @@ async def test_configure_no_resolution(
         )
 
 
-async def test_configure_resolution_set(
-    hass: HomeAssistant, default_mock_discovery
-) -> None:
-    """Test receiver configure with specified resolution."""
+async def test_configure(hass: HomeAssistant, default_mock_discovery) -> None:
+    """Test receiver configure."""
 
-    init_result = await hass.config_entries.flow.async_init(
+    result = await hass.config_entries.flow.async_init(
         DOMAIN,
         context={"source": SOURCE_USER},
     )
 
-    form_result = await hass.config_entries.flow.async_configure(
-        init_result["flow_id"],
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
         {"next_step_id": "manual"},
     )
 
-    select_result = await hass.config_entries.flow.async_configure(
-        form_result["flow_id"],
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
         user_input={CONF_HOST: "sample-host-name"},
     )
 
-    configure_result = await hass.config_entries.flow.async_configure(
-        select_result["flow_id"],
-        user_input={"volume_resolution": 200, "input_sources": ["TV"]},
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={
+            OPTION_VOLUME_RESOLUTION: 200,
+            OPTION_INPUT_SOURCES: [],
+            OPTION_LISTENING_MODES: ["THX"],
+        },
     )
+    assert result["step_id"] == "configure_receiver"
+    assert result["errors"] == {OPTION_INPUT_SOURCES: "empty_input_source_list"}
 
-    assert configure_result["type"] is FlowResultType.CREATE_ENTRY
-    assert configure_result["options"]["volume_resolution"] == 200
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={
+            OPTION_VOLUME_RESOLUTION: 200,
+            OPTION_INPUT_SOURCES: ["TV"],
+            OPTION_LISTENING_MODES: [],
+        },
+    )
+    assert result["step_id"] == "configure_receiver"
+    assert result["errors"] == {OPTION_LISTENING_MODES: "empty_listening_mode_list"}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={
+            OPTION_VOLUME_RESOLUTION: 200,
+            OPTION_INPUT_SOURCES: ["TV"],
+            OPTION_LISTENING_MODES: ["THX"],
+        },
+    )
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["options"] == {
+        OPTION_VOLUME_RESOLUTION: 200,
+        OPTION_MAX_VOLUME: OPTION_MAX_VOLUME_DEFAULT,
+        OPTION_INPUT_SOURCES: {"12": "TV"},
+        OPTION_LISTENING_MODES: {"04": "THX"},
+    }
 
 
 async def test_configure_invalid_resolution_set(
@@ -601,21 +607,26 @@ async def test_import_success(
     await hass.async_block_till_done()
 
     assert import_result["type"] is FlowResultType.CREATE_ENTRY
-    assert import_result["data"]["host"] == "host 1"
-    assert import_result["options"]["volume_resolution"] == 80
-    assert import_result["options"]["max_volume"] == 100
-    assert import_result["options"]["input_sources"] == {
-        "00": "Auxiliary",
-        "01": "Video",
+    assert import_result["data"] == {"host": "host 1"}
+    assert import_result["options"] == {
+        "volume_resolution": 80,
+        "max_volume": 100,
+        "input_sources": {
+            "00": "Auxiliary",
+            "01": "Video",
+        },
+        "listening_modes": {},
     }
 
 
 @pytest.mark.parametrize(
-    "ignore_translations",
+    "ignore_missing_translations",
     [
-        [  # The schema is dynamically created from input sources
+        [  # The schema is dynamically created from input sources and listening modes
             "component.onkyo.options.step.names.sections.input_sources.data.TV",
             "component.onkyo.options.step.names.sections.input_sources.data_description.TV",
+            "component.onkyo.options.step.names.sections.listening_modes.data.STEREO",
+            "component.onkyo.options.step.names.sections.listening_modes.data_description.STEREO",
         ]
     ],
 )
@@ -635,6 +646,7 @@ async def test_options_flow(hass: HomeAssistant, config_entry: MockConfigEntry)
         user_input={
             OPTION_MAX_VOLUME: 42,
             OPTION_INPUT_SOURCES: [],
+            OPTION_LISTENING_MODES: ["STEREO"],
         },
     )
 
@@ -647,6 +659,20 @@ async def test_options_flow(hass: HomeAssistant, config_entry: MockConfigEntry)
         user_input={
             OPTION_MAX_VOLUME: 42,
             OPTION_INPUT_SOURCES: ["TV"],
+            OPTION_LISTENING_MODES: [],
+        },
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "init"
+    assert result["errors"] == {OPTION_LISTENING_MODES: "empty_listening_mode_list"}
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            OPTION_MAX_VOLUME: 42,
+            OPTION_INPUT_SOURCES: ["TV"],
+            OPTION_LISTENING_MODES: ["STEREO"],
         },
     )
 
@@ -657,6 +683,7 @@ async def test_options_flow(hass: HomeAssistant, config_entry: MockConfigEntry)
         result["flow_id"],
         user_input={
             OPTION_INPUT_SOURCES: {"TV": "television"},
+            OPTION_LISTENING_MODES: {"STEREO": "Duophonia"},
         },
     )
 
@@ -665,4 +692,5 @@ async def test_options_flow(hass: HomeAssistant, config_entry: MockConfigEntry)
         OPTION_VOLUME_RESOLUTION: old_volume_resolution,
         OPTION_MAX_VOLUME: 42.0,
         OPTION_INPUT_SOURCES: {"12": "television"},
+        OPTION_LISTENING_MODES: {"00": "Duophonia"},
     }
diff --git a/tests/components/onvif/__init__.py b/tests/components/onvif/__init__.py
index 8a86538b977..868624fb2e4 100644
--- a/tests/components/onvif/__init__.py
+++ b/tests/components/onvif/__init__.py
@@ -123,7 +123,7 @@ def setup_mock_onvif_camera(
     mock_onvif_camera.side_effect = mock_constructor
 
 
-def setup_mock_device(mock_device, capabilities=None):
+def setup_mock_device(mock_device, capabilities=None, profiles=None):
     """Prepare mock ONVIFDevice."""
     mock_device.async_setup = AsyncMock(return_value=True)
     mock_device.port = 80
@@ -145,7 +145,7 @@ def setup_mock_device(mock_device, capabilities=None):
         ptz=None,
         video_source_token=None,
     )
-    mock_device.profiles = [profile1]
+    mock_device.profiles = profiles or [profile1]
     mock_device.events = MagicMock(
         webhook_manager=MagicMock(state=WebHookManagerState.STARTED),
         pullpoint_manager=MagicMock(state=PullPointManagerState.PAUSED),
diff --git a/tests/components/onvif/snapshots/test_diagnostics.ambr b/tests/components/onvif/snapshots/test_diagnostics.ambr
index c8a9ff75d62..c3938efcbb6 100644
--- a/tests/components/onvif/snapshots/test_diagnostics.ambr
+++ b/tests/components/onvif/snapshots/test_diagnostics.ambr
@@ -24,6 +24,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': 'aa:bb:cc:dd:ee:ff',
       'version': 1,
diff --git a/tests/components/onvif/test_init.py b/tests/components/onvif/test_init.py
new file mode 100644
index 00000000000..c176bdcc112
--- /dev/null
+++ b/tests/components/onvif/test_init.py
@@ -0,0 +1,102 @@
+"""Tests for the ONVIF integration __init__ module."""
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import MAC, setup_mock_device
+
+from tests.common import MockConfigEntry
+
+
+@pytest.mark.asyncio
+async def test_migrate_camera_entities_unique_ids(hass: HomeAssistant) -> None:
+    """Test that camera entities unique ids get migrated properly."""
+    config_entry = MockConfigEntry(domain="onvif", unique_id=MAC)
+    config_entry.add_to_hass(hass)
+
+    entity_registry = er.async_get(hass)
+
+    entity_with_only_mac = entity_registry.async_get_or_create(
+        domain="camera",
+        platform="onvif",
+        unique_id=MAC,
+        config_entry=config_entry,
+    )
+    entity_with_index = entity_registry.async_get_or_create(
+        domain="camera",
+        platform="onvif",
+        unique_id=f"{MAC}_1",
+        config_entry=config_entry,
+    )
+    # This one should not be migrated (different domain)
+    entity_sensor = entity_registry.async_get_or_create(
+        domain="sensor",
+        platform="onvif",
+        unique_id=MAC,
+        config_entry=config_entry,
+    )
+    # This one should not be migrated (already migrated)
+    entity_migrated = entity_registry.async_get_or_create(
+        domain="camera",
+        platform="onvif",
+        unique_id=f"{MAC}#profile_token_2",
+        config_entry=config_entry,
+    )
+    # Unparsable index
+    entity_unparsable_index = entity_registry.async_get_or_create(
+        domain="camera",
+        platform="onvif",
+        unique_id=f"{MAC}_a",
+        config_entry=config_entry,
+    )
+    # Unexisting index
+    entity_unexisting_index = entity_registry.async_get_or_create(
+        domain="camera",
+        platform="onvif",
+        unique_id=f"{MAC}_9",
+        config_entry=config_entry,
+    )
+
+    with patch("homeassistant.components.onvif.ONVIFDevice") as mock_device:
+        setup_mock_device(
+            mock_device,
+            capabilities=None,
+            profiles=[
+                MagicMock(token="profile_token_0"),
+                MagicMock(token="profile_token_1"),
+                MagicMock(token="profile_token_2"),
+            ],
+        )
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    entity_with_only_mac = entity_registry.async_get(entity_with_only_mac.entity_id)
+    entity_with_index = entity_registry.async_get(entity_with_index.entity_id)
+    entity_sensor = entity_registry.async_get(entity_sensor.entity_id)
+    entity_migrated = entity_registry.async_get(entity_migrated.entity_id)
+
+    assert entity_with_only_mac is not None
+    assert entity_with_only_mac.unique_id == f"{MAC}#profile_token_0"
+
+    assert entity_with_index is not None
+    assert entity_with_index.unique_id == f"{MAC}#profile_token_1"
+
+    # Make sure the sensor entity is unchanged
+    assert entity_sensor is not None
+    assert entity_sensor.unique_id == MAC
+
+    # Make sure the already migrated entity is unchanged
+    assert entity_migrated is not None
+    assert entity_migrated.unique_id == f"{MAC}#profile_token_2"
+
+    # Make sure the unparsable index entity is unchanged
+    assert entity_unparsable_index is not None
+    assert entity_unparsable_index.unique_id == f"{MAC}_a"
+
+    # Make sure the unexisting index entity is unchanged
+    assert entity_unexisting_index is not None
+    assert entity_unexisting_index.unique_id == f"{MAC}_9"
diff --git a/tests/components/onvif/test_parsers.py b/tests/components/onvif/test_parsers.py
index 4f7e10abae6..8448a6e8195 100644
--- a/tests/components/onvif/test_parsers.py
+++ b/tests/components/onvif/test_parsers.py
@@ -5,6 +5,7 @@ import os
 
 import onvif
 import onvif.settings
+import pytest
 from zeep import Client
 from zeep.transports import Transport
 
@@ -732,25 +733,24 @@ async def test_tapo_intrusion(hass: HomeAssistant) -> None:
 
 async def test_tapo_missing_attributes(hass: HomeAssistant) -> None:
     """Tests async_parse_tplink_detector with missing fields."""
-    event = await get_event(
-        {
-            "Message": {
-                "_value_1": {
-                    "Data": {
-                        "ElementItem": [],
-                        "Extension": None,
-                        "SimpleItem": [{"Name": "IsPeople", "Value": "true"}],
-                        "_attr_1": None,
-                    },
-                }
-            },
-            "Topic": {
-                "_value_1": "tns1:RuleEngine/PeopleDetector/People",
-            },
-        }
-    )
-
-    assert event is None
+    with pytest.raises(AttributeError, match="SimpleItem"):
+        await get_event(
+            {
+                "Message": {
+                    "_value_1": {
+                        "Data": {
+                            "ElementItem": [],
+                            "Extension": None,
+                            "SimpleItem": [{"Name": "IsPeople", "Value": "true"}],
+                            "_attr_1": None,
+                        },
+                    }
+                },
+                "Topic": {
+                    "_value_1": "tns1:RuleEngine/PeopleDetector/People",
+                },
+            }
+        )
 
 
 async def test_tapo_unknown_type(hass: HomeAssistant) -> None:
@@ -789,3 +789,93 @@ async def test_tapo_unknown_type(hass: HomeAssistant) -> None:
     )
 
     assert event is None
+
+
+async def test_reolink_package(hass: HomeAssistant) -> None:
+    """Tests reolink package event."""
+    event = await get_event(
+        {
+            "SubscriptionReference": None,
+            "Topic": {
+                "_value_1": "tns1:RuleEngine/MyRuleDetector/Package",
+                "Dialect": "http://www.onvif.org/ver10/tev/topicExpression/ConcreteSet",
+                "_attr_1": {},
+            },
+            "ProducerReference": None,
+            "Message": {
+                "_value_1": {
+                    "Source": {
+                        "SimpleItem": [{"Name": "Source", "Value": "000"}],
+                        "ElementItem": [],
+                        "Extension": None,
+                        "_attr_1": None,
+                    },
+                    "Key": None,
+                    "Data": {
+                        "SimpleItem": [{"Name": "State", "Value": "true"}],
+                        "ElementItem": [],
+                        "Extension": None,
+                        "_attr_1": None,
+                    },
+                    "Extension": None,
+                    "UtcTime": datetime.datetime(
+                        2025, 3, 12, 9, 54, 27, tzinfo=datetime.UTC
+                    ),
+                    "PropertyOperation": "Initialized",
+                    "_attr_1": {},
+                }
+            },
+        }
+    )
+
+    assert event is not None
+    assert event.name == "Package Detection"
+    assert event.platform == "binary_sensor"
+    assert event.device_class == "occupancy"
+    assert event.value
+    assert event.uid == (f"{TEST_UID}_tns1:RuleEngine/MyRuleDetector/Package_000")
+
+
+async def test_hikvision_alarm(hass: HomeAssistant) -> None:
+    """Tests hikvision camera alarm event."""
+    event = await get_event(
+        {
+            "SubscriptionReference": None,
+            "Topic": {
+                "_value_1": "tns1:Device/Trigger/tnshik:AlarmIn",
+                "Dialect": "http://www.onvif.org/ver10/tev/topicExpression/ConcreteSet",
+                "_attr_1": {},
+            },
+            "ProducerReference": None,
+            "Message": {
+                "_value_1": {
+                    "Source": {
+                        "SimpleItem": [{"Name": "AlarmInToken", "Value": "AlarmIn_1"}],
+                        "ElementItem": [],
+                        "Extension": None,
+                        "_attr_1": None,
+                    },
+                    "Key": None,
+                    "Data": {
+                        "SimpleItem": [{"Name": "State", "Value": "true"}],
+                        "ElementItem": [],
+                        "Extension": None,
+                        "_attr_1": None,
+                    },
+                    "Extension": None,
+                    "UtcTime": datetime.datetime(
+                        2025, 3, 13, 22, 57, 26, tzinfo=datetime.UTC
+                    ),
+                    "PropertyOperation": "Initialized",
+                    "_attr_1": {},
+                }
+            },
+        }
+    )
+
+    assert event is not None
+    assert event.name == "Motion Alarm"
+    assert event.platform == "binary_sensor"
+    assert event.device_class == "motion"
+    assert event.value
+    assert event.uid == (f"{TEST_UID}_tns1:Device/Trigger/tnshik:AlarmIn_AlarmIn_1")
diff --git a/tests/components/openai_conversation/snapshots/test_conversation.ambr b/tests/components/openai_conversation/snapshots/test_conversation.ambr
index 4ef8b8655ee..77c28de2773 100644
--- a/tests/components/openai_conversation/snapshots/test_conversation.ambr
+++ b/tests/components/openai_conversation/snapshots/test_conversation.ambr
@@ -1,34 +1,50 @@
 # serializer version: 1
-# name: test_unknown_hass_api
-  dict({
-    'conversation_id': 'my-conversation-id',
-    'response': IntentResponse(
-      card=dict({
-      }),
-      error_code=<IntentResponseErrorCode.UNKNOWN: 'unknown'>,
-      failed_results=list([
-      ]),
-      intent=None,
-      intent_targets=list([
-      ]),
-      language='en',
-      matched_states=list([
-      ]),
-      reprompt=dict({
-      }),
-      response_type=<IntentResponseType.ERROR: 'error'>,
-      speech=dict({
-        'plain': dict({
-          'extra_data': None,
-          'speech': 'Error preparing LLM API',
+# name: test_function_call
+  list([
+    dict({
+      'content': 'Please call the test function',
+      'role': 'user',
+    }),
+    dict({
+      'agent_id': 'conversation.openai',
+      'content': None,
+      'role': 'assistant',
+      'tool_calls': list([
+        dict({
+          'id': 'call_call_1',
+          'tool_args': dict({
+            'param1': 'call1',
+          }),
+          'tool_name': 'test_tool',
+        }),
+        dict({
+          'id': 'call_call_2',
+          'tool_args': dict({
+            'param1': 'call2',
+          }),
+          'tool_name': 'test_tool',
         }),
-      }),
-      speech_slots=dict({
-      }),
-      success_results=list([
       ]),
-      unmatched_states=list([
-      ]),
-    ),
-  })
+    }),
+    dict({
+      'agent_id': 'conversation.openai',
+      'role': 'tool_result',
+      'tool_call_id': 'call_call_1',
+      'tool_name': 'test_tool',
+      'tool_result': 'value1',
+    }),
+    dict({
+      'agent_id': 'conversation.openai',
+      'role': 'tool_result',
+      'tool_call_id': 'call_call_2',
+      'tool_name': 'test_tool',
+      'tool_result': 'value2',
+    }),
+    dict({
+      'agent_id': 'conversation.openai',
+      'content': 'Cool',
+      'role': 'assistant',
+      'tool_calls': None,
+    }),
+  ])
 # ---
diff --git a/tests/components/openai_conversation/test_config_flow.py b/tests/components/openai_conversation/test_config_flow.py
index f5017c124b1..17a5aad6478 100644
--- a/tests/components/openai_conversation/test_config_flow.py
+++ b/tests/components/openai_conversation/test_config_flow.py
@@ -1,9 +1,10 @@
 """Test the OpenAI Conversation config flow."""
 
-from unittest.mock import patch
+from unittest.mock import AsyncMock, patch
 
-from httpx import Response
+import httpx
 from openai import APIConnectionError, AuthenticationError, BadRequestError
+from openai.types.responses import Response, ResponseOutputMessage, ResponseOutputText
 import pytest
 
 from homeassistant import config_entries
@@ -12,12 +13,21 @@ from homeassistant.components.openai_conversation.const import (
     CONF_CHAT_MODEL,
     CONF_MAX_TOKENS,
     CONF_PROMPT,
+    CONF_REASONING_EFFORT,
     CONF_RECOMMENDED,
     CONF_TEMPERATURE,
     CONF_TOP_P,
+    CONF_WEB_SEARCH,
+    CONF_WEB_SEARCH_CITY,
+    CONF_WEB_SEARCH_CONTEXT_SIZE,
+    CONF_WEB_SEARCH_COUNTRY,
+    CONF_WEB_SEARCH_REGION,
+    CONF_WEB_SEARCH_TIMEZONE,
+    CONF_WEB_SEARCH_USER_LOCATION,
     DOMAIN,
     RECOMMENDED_CHAT_MODEL,
     RECOMMENDED_MAX_TOKENS,
+    RECOMMENDED_REASONING_EFFORT,
     RECOMMENDED_TOP_P,
 )
 from homeassistant.const import CONF_LLM_HASS_API
@@ -88,19 +98,44 @@ async def test_options(
     assert options["data"][CONF_CHAT_MODEL] == RECOMMENDED_CHAT_MODEL
 
 
+async def test_options_unsupported_model(
+    hass: HomeAssistant, mock_config_entry, mock_init_component
+) -> None:
+    """Test the options form giving error about models not supported."""
+    options_flow = await hass.config_entries.options.async_init(
+        mock_config_entry.entry_id
+    )
+    result = await hass.config_entries.options.async_configure(
+        options_flow["flow_id"],
+        {
+            CONF_RECOMMENDED: False,
+            CONF_PROMPT: "Speak like a pirate",
+            CONF_CHAT_MODEL: "o1-mini",
+            CONF_LLM_HASS_API: "assist",
+        },
+    )
+    await hass.async_block_till_done()
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {"chat_model": "model_not_supported"}
+
+
 @pytest.mark.parametrize(
     ("side_effect", "error"),
     [
         (APIConnectionError(request=None), "cannot_connect"),
         (
             AuthenticationError(
-                response=Response(status_code=None, request=""), body=None, message=None
+                response=httpx.Response(status_code=None, request=""),
+                body=None,
+                message=None,
             ),
             "invalid_auth",
         ),
         (
             BadRequestError(
-                response=Response(status_code=None, request=""), body=None, message=None
+                response=httpx.Response(status_code=None, request=""),
+                body=None,
+                message=None,
             ),
             "unknown",
         ),
@@ -148,6 +183,10 @@ async def test_form_invalid_auth(hass: HomeAssistant, side_effect, error) -> Non
                 CONF_CHAT_MODEL: RECOMMENDED_CHAT_MODEL,
                 CONF_TOP_P: RECOMMENDED_TOP_P,
                 CONF_MAX_TOKENS: RECOMMENDED_MAX_TOKENS,
+                CONF_REASONING_EFFORT: RECOMMENDED_REASONING_EFFORT,
+                CONF_WEB_SEARCH: False,
+                CONF_WEB_SEARCH_CONTEXT_SIZE: "medium",
+                CONF_WEB_SEARCH_USER_LOCATION: False,
             },
         ),
         (
@@ -158,6 +197,10 @@ async def test_form_invalid_auth(hass: HomeAssistant, side_effect, error) -> Non
                 CONF_CHAT_MODEL: RECOMMENDED_CHAT_MODEL,
                 CONF_TOP_P: RECOMMENDED_TOP_P,
                 CONF_MAX_TOKENS: RECOMMENDED_MAX_TOKENS,
+                CONF_REASONING_EFFORT: RECOMMENDED_REASONING_EFFORT,
+                CONF_WEB_SEARCH: False,
+                CONF_WEB_SEARCH_CONTEXT_SIZE: "medium",
+                CONF_WEB_SEARCH_USER_LOCATION: False,
             },
             {
                 CONF_RECOMMENDED: True,
@@ -200,3 +243,105 @@ async def test_options_switching(
     await hass.async_block_till_done()
     assert options["type"] is FlowResultType.CREATE_ENTRY
     assert options["data"] == expected_options
+
+
+async def test_options_web_search_user_location(
+    hass: HomeAssistant, mock_config_entry, mock_init_component
+) -> None:
+    """Test fetching user location."""
+    options_flow = await hass.config_entries.options.async_init(
+        mock_config_entry.entry_id
+    )
+    hass.config.country = "US"
+    hass.config.time_zone = "America/Los_Angeles"
+    hass.states.async_set(
+        "zone.home", "0", {"latitude": 37.7749, "longitude": -122.4194}
+    )
+    with patch(
+        "openai.resources.responses.AsyncResponses.create",
+        new_callable=AsyncMock,
+    ) as mock_create:
+        mock_create.return_value = Response(
+            object="response",
+            id="resp_A",
+            created_at=1700000000,
+            model="gpt-4o-mini",
+            parallel_tool_calls=True,
+            tool_choice="auto",
+            tools=[],
+            output=[
+                ResponseOutputMessage(
+                    type="message",
+                    id="msg_A",
+                    content=[
+                        ResponseOutputText(
+                            type="output_text",
+                            text='{"city": "San Francisco", "region": "California"}',
+                            annotations=[],
+                        )
+                    ],
+                    role="assistant",
+                    status="completed",
+                )
+            ],
+        )
+
+        options = await hass.config_entries.options.async_configure(
+            options_flow["flow_id"],
+            {
+                CONF_RECOMMENDED: False,
+                CONF_PROMPT: "Speak like a pirate",
+                CONF_TEMPERATURE: 1.0,
+                CONF_CHAT_MODEL: RECOMMENDED_CHAT_MODEL,
+                CONF_TOP_P: RECOMMENDED_TOP_P,
+                CONF_MAX_TOKENS: RECOMMENDED_MAX_TOKENS,
+                CONF_REASONING_EFFORT: RECOMMENDED_REASONING_EFFORT,
+                CONF_WEB_SEARCH: True,
+                CONF_WEB_SEARCH_CONTEXT_SIZE: "medium",
+                CONF_WEB_SEARCH_USER_LOCATION: True,
+            },
+        )
+        await hass.async_block_till_done()
+    assert (
+        mock_create.call_args.kwargs["input"][0]["content"] == "Where are the following"
+        " coordinates located: (37.7749, -122.4194)?"
+    )
+    assert options["type"] is FlowResultType.CREATE_ENTRY
+    assert options["data"] == {
+        CONF_RECOMMENDED: False,
+        CONF_PROMPT: "Speak like a pirate",
+        CONF_TEMPERATURE: 1.0,
+        CONF_CHAT_MODEL: RECOMMENDED_CHAT_MODEL,
+        CONF_TOP_P: RECOMMENDED_TOP_P,
+        CONF_MAX_TOKENS: RECOMMENDED_MAX_TOKENS,
+        CONF_REASONING_EFFORT: RECOMMENDED_REASONING_EFFORT,
+        CONF_WEB_SEARCH: True,
+        CONF_WEB_SEARCH_CONTEXT_SIZE: "medium",
+        CONF_WEB_SEARCH_USER_LOCATION: True,
+        CONF_WEB_SEARCH_CITY: "San Francisco",
+        CONF_WEB_SEARCH_REGION: "California",
+        CONF_WEB_SEARCH_COUNTRY: "US",
+        CONF_WEB_SEARCH_TIMEZONE: "America/Los_Angeles",
+    }
+
+
+async def test_options_web_search_unsupported_model(
+    hass: HomeAssistant, mock_config_entry, mock_init_component
+) -> None:
+    """Test the options form giving error about web search not being available."""
+    options_flow = await hass.config_entries.options.async_init(
+        mock_config_entry.entry_id
+    )
+    result = await hass.config_entries.options.async_configure(
+        options_flow["flow_id"],
+        {
+            CONF_RECOMMENDED: False,
+            CONF_PROMPT: "Speak like a pirate",
+            CONF_CHAT_MODEL: "o1-pro",
+            CONF_LLM_HASS_API: "assist",
+            CONF_WEB_SEARCH: True,
+        },
+    )
+    await hass.async_block_till_done()
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {"web_search": "web_search_not_supported"}
diff --git a/tests/components/openai_conversation/test_conversation.py b/tests/components/openai_conversation/test_conversation.py
index 9ee19cd330c..d6f09e0f30e 100644
--- a/tests/components/openai_conversation/test_conversation.py
+++ b/tests/components/openai_conversation/test_conversation.py
@@ -1,28 +1,150 @@
 """Tests for the OpenAI integration."""
 
+from collections.abc import Generator
 from unittest.mock import AsyncMock, patch
 
-from freezegun import freeze_time
-from httpx import Response
-from openai import RateLimitError
-from openai.types.chat.chat_completion import ChatCompletion, Choice
-from openai.types.chat.chat_completion_message import ChatCompletionMessage
-from openai.types.chat.chat_completion_message_tool_call import (
-    ChatCompletionMessageToolCall,
-    Function,
+import httpx
+from openai import AuthenticationError, RateLimitError
+from openai.types import ResponseFormatText
+from openai.types.responses import (
+    Response,
+    ResponseCompletedEvent,
+    ResponseContentPartAddedEvent,
+    ResponseContentPartDoneEvent,
+    ResponseCreatedEvent,
+    ResponseError,
+    ResponseErrorEvent,
+    ResponseFailedEvent,
+    ResponseFunctionCallArgumentsDeltaEvent,
+    ResponseFunctionCallArgumentsDoneEvent,
+    ResponseFunctionToolCall,
+    ResponseFunctionWebSearch,
+    ResponseIncompleteEvent,
+    ResponseInProgressEvent,
+    ResponseOutputItemAddedEvent,
+    ResponseOutputItemDoneEvent,
+    ResponseOutputMessage,
+    ResponseOutputText,
+    ResponseReasoningItem,
+    ResponseStreamEvent,
+    ResponseTextConfig,
+    ResponseTextDeltaEvent,
+    ResponseTextDoneEvent,
+    ResponseWebSearchCallCompletedEvent,
+    ResponseWebSearchCallInProgressEvent,
+    ResponseWebSearchCallSearchingEvent,
 )
-from openai.types.completion_usage import CompletionUsage
-import voluptuous as vol
+from openai.types.responses.response import IncompleteDetails
+import pytest
+from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components import conversation
-from homeassistant.components.conversation import trace
+from homeassistant.components.homeassistant.exposed_entities import async_expose_entity
+from homeassistant.components.openai_conversation.const import (
+    CONF_WEB_SEARCH,
+    CONF_WEB_SEARCH_CITY,
+    CONF_WEB_SEARCH_CONTEXT_SIZE,
+    CONF_WEB_SEARCH_COUNTRY,
+    CONF_WEB_SEARCH_REGION,
+    CONF_WEB_SEARCH_TIMEZONE,
+    CONF_WEB_SEARCH_USER_LOCATION,
+)
 from homeassistant.const import CONF_LLM_HASS_API
 from homeassistant.core import Context, HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import intent, llm
+from homeassistant.helpers import intent
 from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry
+from tests.components.conversation import (
+    MockChatLog,
+    mock_chat_log,  # noqa: F401
+)
+
+
+@pytest.fixture
+def mock_create_stream() -> Generator[AsyncMock]:
+    """Mock stream response."""
+
+    async def mock_generator(events, **kwargs):
+        response = Response(
+            id="resp_A",
+            created_at=1700000000,
+            error=None,
+            incomplete_details=None,
+            instructions=kwargs.get("instructions"),
+            metadata=kwargs.get("metadata", {}),
+            model=kwargs.get("model", "gpt-4o-mini"),
+            object="response",
+            output=[],
+            parallel_tool_calls=kwargs.get("parallel_tool_calls", True),
+            temperature=kwargs.get("temperature", 1.0),
+            tool_choice=kwargs.get("tool_choice", "auto"),
+            tools=kwargs.get("tools"),
+            top_p=kwargs.get("top_p", 1.0),
+            max_output_tokens=kwargs.get("max_output_tokens", 100000),
+            previous_response_id=kwargs.get("previous_response_id"),
+            reasoning=kwargs.get("reasoning"),
+            status="in_progress",
+            text=kwargs.get(
+                "text", ResponseTextConfig(format=ResponseFormatText(type="text"))
+            ),
+            truncation=kwargs.get("truncation", "disabled"),
+            usage=None,
+            user=kwargs.get("user"),
+            store=kwargs.get("store", True),
+        )
+        yield ResponseCreatedEvent(
+            response=response,
+            type="response.created",
+        )
+        yield ResponseInProgressEvent(
+            response=response,
+            type="response.in_progress",
+        )
+        response.status = "completed"
+
+        for value in events:
+            if isinstance(value, ResponseOutputItemDoneEvent):
+                response.output.append(value.item)
+            elif isinstance(value, IncompleteDetails):
+                response.status = "incomplete"
+                response.incomplete_details = value
+                break
+            if isinstance(value, ResponseError):
+                response.status = "failed"
+                response.error = value
+                break
+
+            yield value
+
+            if isinstance(value, ResponseErrorEvent):
+                return
+
+        if response.status == "incomplete":
+            yield ResponseIncompleteEvent(
+                response=response,
+                type="response.incomplete",
+            )
+        elif response.status == "failed":
+            yield ResponseFailedEvent(
+                response=response,
+                type="response.failed",
+            )
+        else:
+            yield ResponseCompletedEvent(
+                response=response,
+                type="response.completed",
+            )
+
+    with patch(
+        "openai.resources.responses.AsyncResponses.create",
+        AsyncMock(),
+    ) as mock_create:
+        mock_create.side_effect = lambda **kwargs: mock_generator(
+            mock_create.return_value.pop(0), **kwargs
+        )
+
+        yield mock_create
 
 
 async def test_entity(
@@ -52,23 +174,161 @@ async def test_entity(
     )
 
 
+@pytest.mark.parametrize(
+    ("exception", "message"),
+    [
+        (
+            RateLimitError(
+                response=httpx.Response(status_code=429, request=""),
+                body=None,
+                message=None,
+            ),
+            "Rate limited or insufficient funds",
+        ),
+        (
+            AuthenticationError(
+                response=httpx.Response(status_code=401, request=""),
+                body=None,
+                message=None,
+            ),
+            "Error talking to OpenAI",
+        ),
+    ],
+)
 async def test_error_handling(
-    hass: HomeAssistant, mock_config_entry: MockConfigEntry, mock_init_component
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_init_component,
+    exception,
+    message,
 ) -> None:
     """Test that we handle errors when calling completion API."""
     with patch(
-        "openai.resources.chat.completions.AsyncCompletions.create",
+        "openai.resources.responses.AsyncResponses.create",
         new_callable=AsyncMock,
-        side_effect=RateLimitError(
-            response=Response(status_code=None, request=""), body=None, message=None
-        ),
+        side_effect=exception,
     ):
         result = await conversation.async_converse(
             hass, "hello", None, Context(), agent_id=mock_config_entry.entry_id
         )
 
     assert result.response.response_type == intent.IntentResponseType.ERROR, result
-    assert result.response.error_code == "unknown", result
+    assert result.response.speech["plain"]["speech"] == message, result.response.speech
+
+
+@pytest.mark.parametrize(
+    ("reason", "message"),
+    [
+        (
+            "max_output_tokens",
+            "max output tokens reached",
+        ),
+        (
+            "content_filter",
+            "content filter triggered",
+        ),
+        (
+            None,
+            "unknown reason",
+        ),
+    ],
+)
+async def test_incomplete_response(
+    hass: HomeAssistant,
+    mock_config_entry_with_assist: MockConfigEntry,
+    mock_init_component,
+    mock_create_stream: AsyncMock,
+    reason: str,
+    message: str,
+) -> None:
+    """Test handling early model stop."""
+    # Incomplete details received after some content is generated
+    mock_create_stream.return_value = [
+        (
+            # Start message
+            *create_message_item(
+                id="msg_A",
+                text=["Once upon", " a time, ", "there was "],
+                output_index=0,
+            ),
+            # Length limit or content filter
+            IncompleteDetails(reason=reason),
+        )
+    ]
+
+    result = await conversation.async_converse(
+        hass,
+        "Please tell me a big story",
+        "mock-conversation-id",
+        Context(),
+        agent_id="conversation.openai",
+    )
+
+    assert result.response.response_type == intent.IntentResponseType.ERROR, result
+    assert (
+        result.response.speech["plain"]["speech"]
+        == f"OpenAI response incomplete: {message}"
+    ), result.response.speech
+
+    # Incomplete details received before any content is generated
+    mock_create_stream.return_value = [
+        (
+            # Start generating response
+            *create_reasoning_item(id="rs_A", output_index=0),
+            # Length limit or content filter
+            IncompleteDetails(reason=reason),
+        )
+    ]
+
+    result = await conversation.async_converse(
+        hass,
+        "please tell me a big story",
+        "mock-conversation-id",
+        Context(),
+        agent_id="conversation.openai",
+    )
+
+    assert result.response.response_type == intent.IntentResponseType.ERROR, result
+    assert (
+        result.response.speech["plain"]["speech"]
+        == f"OpenAI response incomplete: {message}"
+    ), result.response.speech
+
+
+@pytest.mark.parametrize(
+    ("error", "message"),
+    [
+        (
+            ResponseError(code="rate_limit_exceeded", message="Rate limit exceeded"),
+            "OpenAI response failed: Rate limit exceeded",
+        ),
+        (
+            ResponseErrorEvent(type="error", message="Some error"),
+            "OpenAI response error: Some error",
+        ),
+    ],
+)
+async def test_failed_response(
+    hass: HomeAssistant,
+    mock_config_entry_with_assist: MockConfigEntry,
+    mock_init_component,
+    mock_create_stream: AsyncMock,
+    error: ResponseError | ResponseErrorEvent,
+    message: str,
+) -> None:
+    """Test handling failed and error responses."""
+    mock_create_stream.return_value = [(error,)]
+
+    result = await conversation.async_converse(
+        hass,
+        "next natural number please",
+        "mock-conversation-id",
+        Context(),
+        agent_id="conversation.openai",
+    )
+
+    assert result.response.response_type == intent.IntentResponseType.ERROR, result
+    assert result.response.speech["plain"]["speech"] == message, result.response.speech
 
 
 async def test_conversation_agent(
@@ -83,346 +343,395 @@ async def test_conversation_agent(
     assert agent.supported_languages == "*"
 
 
-@patch(
-    "homeassistant.components.openai_conversation.conversation.llm.AssistAPI._async_get_tools"
-)
+def create_message_item(
+    id: str, text: str | list[str], output_index: int
+) -> list[ResponseStreamEvent]:
+    """Create a message item."""
+    if isinstance(text, str):
+        text = [text]
+
+    content = ResponseOutputText(annotations=[], text="", type="output_text")
+    events = [
+        ResponseOutputItemAddedEvent(
+            item=ResponseOutputMessage(
+                id=id,
+                content=[],
+                type="message",
+                role="assistant",
+                status="in_progress",
+            ),
+            output_index=output_index,
+            type="response.output_item.added",
+        ),
+        ResponseContentPartAddedEvent(
+            content_index=0,
+            item_id=id,
+            output_index=output_index,
+            part=content,
+            type="response.content_part.added",
+        ),
+    ]
+
+    content.text = "".join(text)
+    events.extend(
+        ResponseTextDeltaEvent(
+            content_index=0,
+            delta=delta,
+            item_id=id,
+            output_index=output_index,
+            type="response.output_text.delta",
+        )
+        for delta in text
+    )
+
+    events.extend(
+        [
+            ResponseTextDoneEvent(
+                content_index=0,
+                item_id=id,
+                output_index=output_index,
+                text="".join(text),
+                type="response.output_text.done",
+            ),
+            ResponseContentPartDoneEvent(
+                content_index=0,
+                item_id=id,
+                output_index=output_index,
+                part=content,
+                type="response.content_part.done",
+            ),
+            ResponseOutputItemDoneEvent(
+                item=ResponseOutputMessage(
+                    id=id,
+                    content=[content],
+                    role="assistant",
+                    status="completed",
+                    type="message",
+                ),
+                output_index=output_index,
+                type="response.output_item.done",
+            ),
+        ]
+    )
+
+    return events
+
+
+def create_function_tool_call_item(
+    id: str, arguments: str | list[str], call_id: str, name: str, output_index: int
+) -> list[ResponseStreamEvent]:
+    """Create a function tool call item."""
+    if isinstance(arguments, str):
+        arguments = [arguments]
+
+    events = [
+        ResponseOutputItemAddedEvent(
+            item=ResponseFunctionToolCall(
+                id=id,
+                arguments="",
+                call_id=call_id,
+                name=name,
+                type="function_call",
+                status="in_progress",
+            ),
+            output_index=output_index,
+            type="response.output_item.added",
+        )
+    ]
+
+    events.extend(
+        ResponseFunctionCallArgumentsDeltaEvent(
+            delta=delta,
+            item_id=id,
+            output_index=output_index,
+            type="response.function_call_arguments.delta",
+        )
+        for delta in arguments
+    )
+
+    events.append(
+        ResponseFunctionCallArgumentsDoneEvent(
+            arguments="".join(arguments),
+            item_id=id,
+            output_index=output_index,
+            type="response.function_call_arguments.done",
+        )
+    )
+
+    events.append(
+        ResponseOutputItemDoneEvent(
+            item=ResponseFunctionToolCall(
+                id=id,
+                arguments="".join(arguments),
+                call_id=call_id,
+                name=name,
+                type="function_call",
+                status="completed",
+            ),
+            output_index=output_index,
+            type="response.output_item.done",
+        )
+    )
+
+    return events
+
+
+def create_reasoning_item(id: str, output_index: int) -> list[ResponseStreamEvent]:
+    """Create a reasoning item."""
+    return [
+        ResponseOutputItemAddedEvent(
+            item=ResponseReasoningItem(
+                id=id,
+                summary=[],
+                type="reasoning",
+                status=None,
+            ),
+            output_index=output_index,
+            type="response.output_item.added",
+        ),
+        ResponseOutputItemDoneEvent(
+            item=ResponseReasoningItem(
+                id=id,
+                summary=[],
+                type="reasoning",
+                status=None,
+            ),
+            output_index=output_index,
+            type="response.output_item.done",
+        ),
+    ]
+
+
+def create_web_search_item(id: str, output_index: int) -> list[ResponseStreamEvent]:
+    """Create a web search call item."""
+    return [
+        ResponseOutputItemAddedEvent(
+            item=ResponseFunctionWebSearch(
+                id=id, status="in_progress", type="web_search_call"
+            ),
+            output_index=output_index,
+            type="response.output_item.added",
+        ),
+        ResponseWebSearchCallInProgressEvent(
+            item_id=id,
+            output_index=output_index,
+            type="response.web_search_call.in_progress",
+        ),
+        ResponseWebSearchCallSearchingEvent(
+            item_id=id,
+            output_index=output_index,
+            type="response.web_search_call.searching",
+        ),
+        ResponseWebSearchCallCompletedEvent(
+            item_id=id,
+            output_index=output_index,
+            type="response.web_search_call.completed",
+        ),
+        ResponseOutputItemDoneEvent(
+            item=ResponseFunctionWebSearch(
+                id=id, status="completed", type="web_search_call"
+            ),
+            output_index=output_index,
+            type="response.output_item.done",
+        ),
+    ]
+
+
 async def test_function_call(
-    mock_get_tools,
     hass: HomeAssistant,
     mock_config_entry_with_assist: MockConfigEntry,
     mock_init_component,
+    mock_create_stream: AsyncMock,
+    mock_chat_log: MockChatLog,  # noqa: F811
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test function call from the assistant."""
-    agent_id = mock_config_entry_with_assist.entry_id
-    context = Context()
-
-    mock_tool = AsyncMock()
-    mock_tool.name = "test_tool"
-    mock_tool.description = "Test function"
-    mock_tool.parameters = vol.Schema(
-        {vol.Optional("param1", description="Test parameters"): str}
-    )
-    mock_tool.async_call.return_value = "Test response"
-
-    mock_get_tools.return_value = [mock_tool]
-
-    def completion_result(*args, messages, **kwargs):
-        for message in messages:
-            role = message["role"] if isinstance(message, dict) else message.role
-            if role == "tool":
-                return ChatCompletion(
-                    id="chatcmpl-1234567890ZYXWVUTSRQPONMLKJIH",
-                    choices=[
-                        Choice(
-                            finish_reason="stop",
-                            index=0,
-                            message=ChatCompletionMessage(
-                                content="I have successfully called the function",
-                                role="assistant",
-                                function_call=None,
-                                tool_calls=None,
-                            ),
-                        )
-                    ],
-                    created=1700000000,
-                    model="gpt-4-1106-preview",
-                    object="chat.completion",
-                    system_fingerprint=None,
-                    usage=CompletionUsage(
-                        completion_tokens=9, prompt_tokens=8, total_tokens=17
-                    ),
-                )
-
-        return ChatCompletion(
-            id="chatcmpl-1234567890ABCDEFGHIJKLMNOPQRS",
-            choices=[
-                Choice(
-                    finish_reason="tool_calls",
-                    index=0,
-                    message=ChatCompletionMessage(
-                        content=None,
-                        role="assistant",
-                        function_call=None,
-                        tool_calls=[
-                            ChatCompletionMessageToolCall(
-                                id="call_AbCdEfGhIjKlMnOpQrStUvWx",
-                                function=Function(
-                                    arguments='{"param1":"test_value"}',
-                                    name="test_tool",
-                                ),
-                                type="function",
-                            )
-                        ],
-                    ),
-                )
-            ],
-            created=1700000000,
-            model="gpt-4-1106-preview",
-            object="chat.completion",
-            system_fingerprint=None,
-            usage=CompletionUsage(
-                completion_tokens=9, prompt_tokens=8, total_tokens=17
+    mock_create_stream.return_value = [
+        # Initial conversation
+        (
+            # Wait for the model to think
+            *create_reasoning_item(id="rs_A", output_index=0),
+            # First tool call
+            *create_function_tool_call_item(
+                id="fc_1",
+                arguments=['{"para', 'm1":"call1"}'],
+                call_id="call_call_1",
+                name="test_tool",
+                output_index=1,
             ),
-        )
+            # Second tool call
+            *create_function_tool_call_item(
+                id="fc_2",
+                arguments='{"param1":"call2"}',
+                call_id="call_call_2",
+                name="test_tool",
+                output_index=2,
+            ),
+        ),
+        # Response after tool responses
+        create_message_item(id="msg_A", text="Cool", output_index=0),
+    ]
+    mock_chat_log.mock_tool_results(
+        {
+            "call_call_1": "value1",
+            "call_call_2": "value2",
+        }
+    )
 
-    with (
-        patch(
-            "openai.resources.chat.completions.AsyncCompletions.create",
-            new_callable=AsyncMock,
-            side_effect=completion_result,
-        ) as mock_create,
-        freeze_time("2024-06-03 23:00:00"),
-    ):
-        result = await conversation.async_converse(
-            hass,
-            "Please call the test function",
-            None,
-            context,
-            agent_id=agent_id,
-        )
-
-    assert (
-        "Today's date is 2024-06-03."
-        in mock_create.mock_calls[1][2]["messages"][0]["content"]
+    result = await conversation.async_converse(
+        hass,
+        "Please call the test function",
+        mock_chat_log.conversation_id,
+        Context(),
+        agent_id="conversation.openai",
     )
 
     assert result.response.response_type == intent.IntentResponseType.ACTION_DONE
-    assert mock_create.mock_calls[1][2]["messages"][3] == {
-        "role": "tool",
-        "tool_call_id": "call_AbCdEfGhIjKlMnOpQrStUvWx",
-        "content": '"Test response"',
-    }
-    mock_tool.async_call.assert_awaited_once_with(
-        hass,
-        llm.ToolInput(
-            tool_name="test_tool",
-            tool_args={"param1": "test_value"},
+    # Don't test the prompt, as it's not deterministic
+    assert mock_chat_log.content[1:] == snapshot
+
+
+@pytest.mark.parametrize(
+    ("description", "messages"),
+    [
+        (
+            "Test function call started with missing arguments",
+            (
+                *create_function_tool_call_item(
+                    id="fc_1",
+                    arguments=[],
+                    call_id="call_call_1",
+                    name="test_tool",
+                    output_index=0,
+                ),
+                *create_message_item(id="msg_A", text="Cool", output_index=1),
+            ),
         ),
-        llm.LLMContext(
-            platform="openai_conversation",
-            context=context,
-            user_prompt="Please call the test function",
-            language="en",
-            assistant="conversation",
-            device_id=None,
+        (
+            "Test invalid JSON",
+            (
+                *create_function_tool_call_item(
+                    id="fc_1",
+                    arguments=['{"para'],
+                    call_id="call_call_1",
+                    name="test_tool",
+                    output_index=0,
+                ),
+                *create_message_item(id="msg_A", text="Cool", output_index=1),
+            ),
         ),
-    )
-
-    # Test Conversation tracing
-    traces = trace.async_get_traces()
-    assert traces
-    last_trace = traces[-1].as_dict()
-    trace_events = last_trace.get("events", [])
-    assert [event["event_type"] for event in trace_events] == [
-        trace.ConversationTraceEventType.ASYNC_PROCESS,
-        trace.ConversationTraceEventType.AGENT_DETAIL,
-        trace.ConversationTraceEventType.TOOL_CALL,
-    ]
-    # AGENT_DETAIL event contains the raw prompt passed to the model
-    detail_event = trace_events[1]
-    assert "Answer in plain text" in detail_event["data"]["messages"][0]["content"]
-    assert (
-        "Today's date is 2024-06-03."
-        in trace_events[1]["data"]["messages"][0]["content"]
-    )
-    assert [t.name for t in detail_event["data"]["tools"]] == ["test_tool"]
-
-    # Call it again, make sure we have updated prompt
-    with (
-        patch(
-            "openai.resources.chat.completions.AsyncCompletions.create",
-            new_callable=AsyncMock,
-            side_effect=completion_result,
-        ) as mock_create,
-        freeze_time("2024-06-04 23:00:00"),
-    ):
-        result = await conversation.async_converse(
-            hass,
-            "Please call the test function",
-            None,
-            context,
-            agent_id=agent_id,
-        )
-
-    assert (
-        "Today's date is 2024-06-04."
-        in mock_create.mock_calls[1][2]["messages"][0]["content"]
-    )
-    # Test old assert message not updated
-    assert (
-        "Today's date is 2024-06-03."
-        in trace_events[1]["data"]["messages"][0]["content"]
-    )
-
-
-@patch(
-    "homeassistant.components.openai_conversation.conversation.llm.AssistAPI._async_get_tools"
+    ],
 )
-async def test_function_exception(
-    mock_get_tools,
+async def test_function_call_invalid(
     hass: HomeAssistant,
     mock_config_entry_with_assist: MockConfigEntry,
     mock_init_component,
+    mock_create_stream: AsyncMock,
+    description: str,
+    messages: tuple[ResponseStreamEvent],
 ) -> None:
-    """Test function call with exception."""
-    agent_id = mock_config_entry_with_assist.entry_id
-    context = Context()
+    """Test function call containing invalid data."""
+    mock_create_stream.return_value = [messages]
 
-    mock_tool = AsyncMock()
-    mock_tool.name = "test_tool"
-    mock_tool.description = "Test function"
-    mock_tool.parameters = vol.Schema(
-        {vol.Optional("param1", description="Test parameters"): str}
-    )
-    mock_tool.async_call.side_effect = HomeAssistantError("Test tool exception")
-
-    mock_get_tools.return_value = [mock_tool]
-
-    def completion_result(*args, messages, **kwargs):
-        for message in messages:
-            role = message["role"] if isinstance(message, dict) else message.role
-            if role == "tool":
-                return ChatCompletion(
-                    id="chatcmpl-1234567890ZYXWVUTSRQPONMLKJIH",
-                    choices=[
-                        Choice(
-                            finish_reason="stop",
-                            index=0,
-                            message=ChatCompletionMessage(
-                                content="There was an error calling the function",
-                                role="assistant",
-                                function_call=None,
-                                tool_calls=None,
-                            ),
-                        )
-                    ],
-                    created=1700000000,
-                    model="gpt-4-1106-preview",
-                    object="chat.completion",
-                    system_fingerprint=None,
-                    usage=CompletionUsage(
-                        completion_tokens=9, prompt_tokens=8, total_tokens=17
-                    ),
-                )
-
-        return ChatCompletion(
-            id="chatcmpl-1234567890ABCDEFGHIJKLMNOPQRS",
-            choices=[
-                Choice(
-                    finish_reason="tool_calls",
-                    index=0,
-                    message=ChatCompletionMessage(
-                        content=None,
-                        role="assistant",
-                        function_call=None,
-                        tool_calls=[
-                            ChatCompletionMessageToolCall(
-                                id="call_AbCdEfGhIjKlMnOpQrStUvWx",
-                                function=Function(
-                                    arguments='{"param1":"test_value"}',
-                                    name="test_tool",
-                                ),
-                                type="function",
-                            )
-                        ],
-                    ),
-                )
-            ],
-            created=1700000000,
-            model="gpt-4-1106-preview",
-            object="chat.completion",
-            system_fingerprint=None,
-            usage=CompletionUsage(
-                completion_tokens=9, prompt_tokens=8, total_tokens=17
-            ),
-        )
-
-    with patch(
-        "openai.resources.chat.completions.AsyncCompletions.create",
-        new_callable=AsyncMock,
-        side_effect=completion_result,
-    ) as mock_create:
-        result = await conversation.async_converse(
+    with pytest.raises(ValueError):
+        await conversation.async_converse(
             hass,
             "Please call the test function",
-            None,
-            context,
-            agent_id=agent_id,
+            "mock-conversation-id",
+            Context(),
+            agent_id="conversation.openai",
         )
 
-    assert result.response.response_type == intent.IntentResponseType.ACTION_DONE
-    assert mock_create.mock_calls[1][2]["messages"][3] == {
-        "role": "tool",
-        "tool_call_id": "call_AbCdEfGhIjKlMnOpQrStUvWx",
-        "content": '{"error": "HomeAssistantError", "error_text": "Test tool exception"}',
-    }
-    mock_tool.async_call.assert_awaited_once_with(
-        hass,
-        llm.ToolInput(
-            tool_name="test_tool",
-            tool_args={"param1": "test_value"},
-        ),
-        llm.LLMContext(
-            platform="openai_conversation",
-            context=context,
-            user_prompt="Please call the test function",
-            language="en",
-            assistant="conversation",
-            device_id=None,
-        ),
-    )
-
 
 async def test_assist_api_tools_conversion(
     hass: HomeAssistant,
     mock_config_entry_with_assist: MockConfigEntry,
     mock_init_component,
+    mock_create_stream,
 ) -> None:
     """Test that we are able to convert actual tools from Assist API."""
     for component in (
-        "intent",
-        "todo",
-        "light",
-        "shopping_list",
-        "humidifier",
+        "calendar",
         "climate",
-        "media_player",
-        "vacuum",
         "cover",
+        "humidifier",
+        "intent",
+        "light",
+        "media_player",
+        "script",
+        "shopping_list",
+        "todo",
+        "vacuum",
         "weather",
     ):
         assert await async_setup_component(hass, component, {})
+        hass.states.async_set(f"{component}.test", "on")
+        async_expose_entity(hass, "conversation", f"{component}.test", True)
 
-    agent_id = mock_config_entry_with_assist.entry_id
-    with patch(
-        "openai.resources.chat.completions.AsyncCompletions.create",
-        new_callable=AsyncMock,
-        return_value=ChatCompletion(
-            id="chatcmpl-1234567890ABCDEFGHIJKLMNOPQRS",
-            choices=[
-                Choice(
-                    finish_reason="stop",
-                    index=0,
-                    message=ChatCompletionMessage(
-                        content="Hello, how can I help you?",
-                        role="assistant",
-                        function_call=None,
-                        tool_calls=None,
-                    ),
-                )
-            ],
-            created=1700000000,
-            model="gpt-3.5-turbo-0613",
-            object="chat.completion",
-            system_fingerprint=None,
-            usage=CompletionUsage(
-                completion_tokens=9, prompt_tokens=8, total_tokens=17
-            ),
-        ),
-    ) as mock_create:
-        await conversation.async_converse(
-            hass, "hello", None, Context(), agent_id=agent_id
-        )
+    mock_create_stream.return_value = [
+        create_message_item(id="msg_A", text="Cool", output_index=0)
+    ]
 
-    tools = mock_create.mock_calls[0][2]["tools"]
+    await conversation.async_converse(
+        hass, "hello", None, Context(), agent_id="conversation.openai"
+    )
+
+    tools = mock_create_stream.mock_calls[0][2]["tools"]
     assert tools
+
+
+async def test_web_search(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_init_component,
+    mock_create_stream,
+    mock_chat_log: MockChatLog,  # noqa: F811
+) -> None:
+    """Test web_search_tool."""
+    hass.config_entries.async_update_entry(
+        mock_config_entry,
+        options={
+            **mock_config_entry.options,
+            CONF_WEB_SEARCH: True,
+            CONF_WEB_SEARCH_CONTEXT_SIZE: "low",
+            CONF_WEB_SEARCH_USER_LOCATION: True,
+            CONF_WEB_SEARCH_CITY: "San Francisco",
+            CONF_WEB_SEARCH_COUNTRY: "US",
+            CONF_WEB_SEARCH_REGION: "California",
+            CONF_WEB_SEARCH_TIMEZONE: "America/Los_Angeles",
+        },
+    )
+    await hass.config_entries.async_reload(mock_config_entry.entry_id)
+
+    message = "Home Assistant now supports ChatGPT Search in Assist"
+    mock_create_stream.return_value = [
+        # Initial conversation
+        (
+            *create_web_search_item(id="ws_A", output_index=0),
+            *create_message_item(id="msg_A", text=message, output_index=1),
+        )
+    ]
+
+    result = await conversation.async_converse(
+        hass,
+        "What's on the latest news?",
+        mock_chat_log.conversation_id,
+        Context(),
+        agent_id="conversation.openai",
+    )
+
+    assert mock_create_stream.mock_calls[0][2]["tools"] == [
+        {
+            "type": "web_search_preview",
+            "search_context_size": "low",
+            "user_location": {
+                "type": "approximate",
+                "city": "San Francisco",
+                "region": "California",
+                "country": "US",
+                "timezone": "America/Los_Angeles",
+            },
+        }
+    ]
+    assert result.response.response_type == intent.IntentResponseType.ACTION_DONE
+    assert result.response.speech["plain"]["speech"] == message, result.response.speech
diff --git a/tests/components/openai_conversation/test_init.py b/tests/components/openai_conversation/test_init.py
index d78ce398c92..5aef68841ee 100644
--- a/tests/components/openai_conversation/test_init.py
+++ b/tests/components/openai_conversation/test_init.py
@@ -1,8 +1,8 @@
 """Tests for the OpenAI integration."""
 
-from unittest.mock import patch
+from unittest.mock import AsyncMock, mock_open, patch
 
-from httpx import Response
+import httpx
 from openai import (
     APIConnectionError,
     AuthenticationError,
@@ -11,8 +11,10 @@ from openai import (
 )
 from openai.types.image import Image
 from openai.types.images_response import ImagesResponse
+from openai.types.responses import Response, ResponseOutputMessage, ResponseOutputText
 import pytest
 
+from homeassistant.components.openai_conversation import CONF_FILENAMES
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.setup import async_setup_component
@@ -114,7 +116,9 @@ async def test_generate_image_service_error(
         patch(
             "openai.resources.images.AsyncImages.generate",
             side_effect=RateLimitError(
-                response=Response(status_code=None, request=""),
+                response=httpx.Response(
+                    status_code=500, request=httpx.Request(method="GET", url="")
+                ),
                 body=None,
                 message="Reason",
             ),
@@ -133,22 +137,60 @@ async def test_generate_image_service_error(
         )
 
 
+@pytest.mark.usefixtures("mock_init_component")
+async def test_generate_content_service_with_image_not_allowed_path(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test generate content service with an image in a not allowed path."""
+    with (
+        patch("pathlib.Path.exists", return_value=True),
+        patch.object(hass.config, "is_allowed_path", return_value=False),
+        pytest.raises(
+            HomeAssistantError,
+            match=(
+                "Cannot read `doorbell_snapshot.jpg`, no access to path; "
+                "`allowlist_external_dirs` may need to be adjusted in "
+                "`configuration.yaml`"
+            ),
+        ),
+    ):
+        await hass.services.async_call(
+            "openai_conversation",
+            "generate_content",
+            {
+                "config_entry": mock_config_entry.entry_id,
+                "prompt": "Describe this image from my doorbell camera",
+                "filenames": "doorbell_snapshot.jpg",
+            },
+            blocking=True,
+            return_response=True,
+        )
+
+
+@pytest.mark.parametrize(
+    ("service_name", "error"),
+    [
+        ("generate_image", "Invalid config entry provided. Got invalid_entry"),
+        ("generate_content", "Invalid config entry provided. Got invalid_entry"),
+    ],
+)
 async def test_invalid_config_entry(
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,
     mock_init_component,
+    service_name: str,
+    error: str,
 ) -> None:
     """Assert exception when invalid config entry is provided."""
     service_data = {
         "prompt": "Picture of a dog",
         "config_entry": "invalid_entry",
     }
-    with pytest.raises(
-        ServiceValidationError, match="Invalid config entry provided. Got invalid_entry"
-    ):
+    with pytest.raises(ServiceValidationError, match=error):
         await hass.services.async_call(
             "openai_conversation",
-            "generate_image",
+            service_name,
             service_data,
             blocking=True,
             return_response=True,
@@ -158,18 +200,29 @@ async def test_invalid_config_entry(
 @pytest.mark.parametrize(
     ("side_effect", "error"),
     [
-        (APIConnectionError(request=None), "Connection error"),
+        (
+            APIConnectionError(request=httpx.Request(method="GET", url="test")),
+            "Connection error",
+        ),
         (
             AuthenticationError(
-                response=Response(status_code=None, request=""), body=None, message=None
+                response=httpx.Response(
+                    status_code=500, request=httpx.Request(method="GET", url="test")
+                ),
+                body=None,
+                message="",
             ),
             "Invalid API key",
         ),
         (
             BadRequestError(
-                response=Response(status_code=None, request=""), body=None, message=None
+                response=httpx.Response(
+                    status_code=500, request=httpx.Request(method="GET", url="test")
+                ),
+                body=None,
+                message="",
             ),
-            "openai_conversation integration not ready yet: None",
+            "openai_conversation integration not ready yet",
         ),
     ],
 )
@@ -188,3 +241,253 @@ async def test_init_error(
         assert await async_setup_component(hass, "openai_conversation", {})
         await hass.async_block_till_done()
         assert error in caplog.text
+
+
+@pytest.mark.parametrize(
+    ("service_data", "expected_args", "number_of_files"),
+    [
+        (
+            {"prompt": "Picture of a dog", "filenames": []},
+            {
+                "input": [
+                    {
+                        "content": [
+                            {
+                                "type": "input_text",
+                                "text": "Picture of a dog",
+                            },
+                        ],
+                    },
+                ],
+            },
+            0,
+        ),
+        (
+            {"prompt": "Picture of a dog", "filenames": ["/a/b/c.jpg"]},
+            {
+                "input": [
+                    {
+                        "content": [
+                            {
+                                "type": "input_text",
+                                "text": "Picture of a dog",
+                            },
+                            {
+                                "type": "input_image",
+                                "image_url": "data:image/jpeg;base64,BASE64IMAGE1",
+                                "detail": "auto",
+                                "file_id": "/a/b/c.jpg",
+                            },
+                        ],
+                    },
+                ],
+            },
+            1,
+        ),
+        (
+            {
+                "prompt": "Picture of a dog",
+                "filenames": ["/a/b/c.jpg", "d/e/f.jpg"],
+            },
+            {
+                "input": [
+                    {
+                        "content": [
+                            {
+                                "type": "input_text",
+                                "text": "Picture of a dog",
+                            },
+                            {
+                                "type": "input_image",
+                                "image_url": "data:image/jpeg;base64,BASE64IMAGE1",
+                                "detail": "auto",
+                                "file_id": "/a/b/c.jpg",
+                            },
+                            {
+                                "type": "input_image",
+                                "image_url": "data:image/jpeg;base64,BASE64IMAGE2",
+                                "detail": "auto",
+                                "file_id": "d/e/f.jpg",
+                            },
+                        ],
+                    },
+                ],
+            },
+            2,
+        ),
+    ],
+)
+async def test_generate_content_service(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_init_component,
+    service_data,
+    expected_args,
+    number_of_files,
+) -> None:
+    """Test generate content service."""
+    service_data["config_entry"] = mock_config_entry.entry_id
+    expected_args["model"] = "gpt-4o-mini"
+    expected_args["max_output_tokens"] = 150
+    expected_args["top_p"] = 1.0
+    expected_args["temperature"] = 1.0
+    expected_args["user"] = None
+    expected_args["store"] = False
+    expected_args["input"][0]["type"] = "message"
+    expected_args["input"][0]["role"] = "user"
+
+    with (
+        patch(
+            "openai.resources.responses.AsyncResponses.create",
+            new_callable=AsyncMock,
+        ) as mock_create,
+        patch(
+            "base64.b64encode", side_effect=[b"BASE64IMAGE1", b"BASE64IMAGE2"]
+        ) as mock_b64encode,
+        patch("builtins.open", mock_open(read_data="ABC")) as mock_file,
+        patch("pathlib.Path.exists", return_value=True),
+        patch.object(hass.config, "is_allowed_path", return_value=True),
+    ):
+        mock_create.return_value = Response(
+            object="response",
+            id="resp_A",
+            created_at=1700000000,
+            model="gpt-4o-mini",
+            parallel_tool_calls=True,
+            tool_choice="auto",
+            tools=[],
+            output=[
+                ResponseOutputMessage(
+                    type="message",
+                    id="msg_A",
+                    content=[
+                        ResponseOutputText(
+                            type="output_text",
+                            text="This is the response",
+                            annotations=[],
+                        )
+                    ],
+                    role="assistant",
+                    status="completed",
+                )
+            ],
+        )
+
+        response = await hass.services.async_call(
+            "openai_conversation",
+            "generate_content",
+            service_data,
+            blocking=True,
+            return_response=True,
+        )
+        assert response == {"text": "This is the response"}
+        assert len(mock_create.mock_calls) == 1
+        assert mock_create.mock_calls[0][2] == expected_args
+        assert mock_b64encode.call_count == number_of_files
+        for idx, file in enumerate(service_data[CONF_FILENAMES]):
+            assert mock_file.call_args_list[idx][0][0] == file
+
+
+@pytest.mark.parametrize(
+    (
+        "service_data",
+        "error",
+        "number_of_files",
+        "exists_side_effect",
+        "is_allowed_side_effect",
+    ),
+    [
+        (
+            {"prompt": "Picture of a dog", "filenames": ["/a/b/c.jpg"]},
+            "`/a/b/c.jpg` does not exist",
+            0,
+            [False],
+            [True],
+        ),
+        (
+            {
+                "prompt": "Picture of a dog",
+                "filenames": ["/a/b/c.jpg", "d/e/f.png"],
+            },
+            "Cannot read `d/e/f.png`, no access to path; `allowlist_external_dirs` may need to be adjusted in `configuration.yaml`",
+            1,
+            [True, True],
+            [True, False],
+        ),
+        (
+            {"prompt": "Not a picture of a dog", "filenames": ["/a/b/c.pdf"]},
+            "Only images are supported by the OpenAI API,`/a/b/c.pdf` is not an image file",
+            1,
+            [True],
+            [True],
+        ),
+    ],
+)
+async def test_generate_content_service_invalid(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_init_component,
+    service_data,
+    error,
+    number_of_files,
+    exists_side_effect,
+    is_allowed_side_effect,
+) -> None:
+    """Test generate content service."""
+    service_data["config_entry"] = mock_config_entry.entry_id
+
+    with (
+        patch(
+            "openai.resources.responses.AsyncResponses.create",
+            new_callable=AsyncMock,
+        ) as mock_create,
+        patch(
+            "base64.b64encode", side_effect=[b"BASE64IMAGE1", b"BASE64IMAGE2"]
+        ) as mock_b64encode,
+        patch("builtins.open", mock_open(read_data="ABC")),
+        patch("pathlib.Path.exists", side_effect=exists_side_effect),
+        patch.object(
+            hass.config, "is_allowed_path", side_effect=is_allowed_side_effect
+        ),
+    ):
+        with pytest.raises(HomeAssistantError, match=error):
+            await hass.services.async_call(
+                "openai_conversation",
+                "generate_content",
+                service_data,
+                blocking=True,
+                return_response=True,
+            )
+        assert len(mock_create.mock_calls) == 0
+        assert mock_b64encode.call_count == number_of_files
+
+
+@pytest.mark.usefixtures("mock_init_component")
+async def test_generate_content_service_error(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test generate content service handles errors."""
+    with (
+        patch(
+            "openai.resources.responses.AsyncResponses.create",
+            side_effect=RateLimitError(
+                response=httpx.Response(
+                    status_code=417, request=httpx.Request(method="GET", url="")
+                ),
+                body=None,
+                message="Reason",
+            ),
+        ),
+        pytest.raises(HomeAssistantError, match="Error generating content: Reason"),
+    ):
+        await hass.services.async_call(
+            "openai_conversation",
+            "generate_content",
+            {
+                "config_entry": mock_config_entry.entry_id,
+                "prompt": "Image of an epic fail",
+            },
+            blocking=True,
+            return_response=True,
+        )
diff --git a/tests/components/opentherm_gw/test_config_flow.py b/tests/components/opentherm_gw/test_config_flow.py
index 57bea4e55dc..99a2dde4acc 100644
--- a/tests/components/opentherm_gw/test_config_flow.py
+++ b/tests/components/opentherm_gw/test_config_flow.py
@@ -54,30 +54,6 @@ async def test_form_user(
     assert mock_pyotgw.return_value.disconnect.await_count == 1
 
 
-# Deprecated import from configuration.yaml, can be removed in 2025.4.0
-async def test_form_import(
-    hass: HomeAssistant,
-    mock_pyotgw: MagicMock,
-    mock_setup_entry: AsyncMock,
-) -> None:
-    """Test import from existing config."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": config_entries.SOURCE_IMPORT},
-        data={CONF_ID: "legacy_gateway", CONF_DEVICE: "/dev/ttyUSB1"},
-    )
-
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == "legacy_gateway"
-    assert result["data"] == {
-        CONF_NAME: "legacy_gateway",
-        CONF_DEVICE: "/dev/ttyUSB1",
-        CONF_ID: "legacy_gateway",
-    }
-    assert mock_pyotgw.return_value.connect.await_count == 1
-    assert mock_pyotgw.return_value.disconnect.await_count == 1
-
-
 async def test_form_duplicate_entries(
     hass: HomeAssistant,
     mock_pyotgw: MagicMock,
diff --git a/tests/components/opentherm_gw/test_init.py b/tests/components/opentherm_gw/test_init.py
index 3e85afbf782..84629137ce1 100644
--- a/tests/components/opentherm_gw/test_init.py
+++ b/tests/components/opentherm_gw/test_init.py
@@ -4,18 +4,12 @@ from unittest.mock import MagicMock
 
 from pyotgw.vars import OTGW, OTGW_ABOUT
 
-from homeassistant import setup
 from homeassistant.components.opentherm_gw.const import (
     DOMAIN,
     OpenThermDeviceIdentifier,
 )
-from homeassistant.const import CONF_ID
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import (
-    device_registry as dr,
-    entity_registry as er,
-    issue_registry as ir,
-)
+from homeassistant.helpers import device_registry as dr
 
 from .conftest import MOCK_GATEWAY_ID, VERSION_TEST
 
@@ -74,104 +68,3 @@ async def test_device_registry_update(
     )
     assert gw_dev is not None
     assert gw_dev.sw_version == VERSION_NEW
-
-
-# Device migration test can be removed in 2025.4.0
-async def test_device_migration(
-    hass: HomeAssistant,
-    device_registry: dr.DeviceRegistry,
-    mock_config_entry: MockConfigEntry,
-    mock_pyotgw: MagicMock,
-) -> None:
-    """Test that the device registry is updated correctly."""
-    mock_config_entry.add_to_hass(hass)
-
-    device_registry.async_get_or_create(
-        config_entry_id=mock_config_entry.entry_id,
-        identifiers={
-            (DOMAIN, MOCK_GATEWAY_ID),
-        },
-        name="Mock Gateway",
-        manufacturer="Schelte Bron",
-        model="OpenTherm Gateway",
-        sw_version=VERSION_TEST,
-    )
-
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert (
-        device_registry.async_get_device(identifiers={(DOMAIN, MOCK_GATEWAY_ID)})
-        is None
-    )
-
-    gw_dev = device_registry.async_get_device(
-        identifiers={(DOMAIN, f"{MOCK_GATEWAY_ID}-{OpenThermDeviceIdentifier.GATEWAY}")}
-    )
-    assert gw_dev is not None
-
-    assert (
-        device_registry.async_get_device(
-            identifiers={
-                (DOMAIN, f"{MOCK_GATEWAY_ID}-{OpenThermDeviceIdentifier.BOILER}")
-            }
-        )
-        is not None
-    )
-
-    assert (
-        device_registry.async_get_device(
-            identifiers={
-                (DOMAIN, f"{MOCK_GATEWAY_ID}-{OpenThermDeviceIdentifier.THERMOSTAT}")
-            }
-        )
-        is not None
-    )
-
-
-# Entity migration test can be removed in 2025.4.0
-async def test_climate_entity_migration(
-    hass: HomeAssistant,
-    entity_registry: er.EntityRegistry,
-    mock_config_entry: MockConfigEntry,
-    mock_pyotgw: MagicMock,
-) -> None:
-    """Test that the climate entity unique_id gets migrated correctly."""
-    mock_config_entry.add_to_hass(hass)
-    entry = entity_registry.async_get_or_create(
-        domain="climate",
-        platform="opentherm_gw",
-        unique_id=mock_config_entry.data[CONF_ID],
-    )
-
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    updated_entry = entity_registry.async_get(entry.entity_id)
-    assert updated_entry is not None
-    assert (
-        updated_entry.unique_id
-        == f"{mock_config_entry.data[CONF_ID]}-{OpenThermDeviceIdentifier.THERMOSTAT}-thermostat_entity"
-    )
-
-
-# Deprecation test, can be removed in 2025.4.0
-async def test_configuration_yaml_deprecation(
-    hass: HomeAssistant,
-    issue_registry: ir.IssueRegistry,
-    mock_config_entry: MockConfigEntry,
-    mock_pyotgw: MagicMock,
-) -> None:
-    """Test that existing configuration in configuration.yaml creates an issue."""
-
-    await setup.async_setup_component(
-        hass, DOMAIN, {DOMAIN: {"legacy_gateway": {"device": "/dev/null"}}}
-    )
-
-    await hass.async_block_till_done()
-    assert (
-        issue_registry.async_get_issue(
-            DOMAIN, "deprecated_import_from_configuration_yaml"
-        )
-        is not None
-    )
diff --git a/tests/components/openuv/test_diagnostics.py b/tests/components/openuv/test_diagnostics.py
index 61b68b5ad90..03b392b3e7b 100644
--- a/tests/components/openuv/test_diagnostics.py
+++ b/tests/components/openuv/test_diagnostics.py
@@ -39,6 +39,7 @@ async def test_entry_diagnostics(
             "created_at": ANY,
             "modified_at": ANY,
             "discovery_keys": {},
+            "subentries": [],
         },
         "data": {
             "protection_window": {
diff --git a/tests/components/openweathermap/snapshots/test_weather.ambr b/tests/components/openweathermap/snapshots/test_weather.ambr
new file mode 100644
index 00000000000..c89dcb96a9c
--- /dev/null
+++ b/tests/components/openweathermap/snapshots/test_weather.ambr
@@ -0,0 +1,25 @@
+# serializer version: 1
+# name: test_get_minute_forecast[mock_service_response]
+  dict({
+    'weather.openweathermap': dict({
+      'forecast': list([
+        dict({
+          'datetime': 1728672360,
+          'precipitation': 0,
+        }),
+        dict({
+          'datetime': 1728672420,
+          'precipitation': 1.23,
+        }),
+        dict({
+          'datetime': 1728672480,
+          'precipitation': 4.5,
+        }),
+        dict({
+          'datetime': 1728672540,
+          'precipitation': 0,
+        }),
+      ]),
+    }),
+  })
+# ---
diff --git a/tests/components/openweathermap/test_config_flow.py b/tests/components/openweathermap/test_config_flow.py
index aec34360754..d5e01677dd8 100644
--- a/tests/components/openweathermap/test_config_flow.py
+++ b/tests/components/openweathermap/test_config_flow.py
@@ -18,7 +18,7 @@ from homeassistant.components.openweathermap.const import (
     DEFAULT_LANGUAGE,
     DEFAULT_OWM_MODE,
     DOMAIN,
-    OWM_MODE_V25,
+    OWM_MODE_V30,
 )
 from homeassistant.config_entries import SOURCE_USER, ConfigEntryState
 from homeassistant.const import (
@@ -40,13 +40,15 @@ CONFIG = {
     CONF_LATITUDE: 50,
     CONF_LONGITUDE: 40,
     CONF_LANGUAGE: DEFAULT_LANGUAGE,
-    CONF_MODE: OWM_MODE_V25,
+    CONF_MODE: OWM_MODE_V30,
 }
 
 VALID_YAML_CONFIG = {CONF_API_KEY: "foo"}
 
 
-def _create_mocked_owm_factory(is_valid: bool):
+def _create_static_weather_report() -> WeatherReport:
+    """Create a static WeatherReport."""
+
     current_weather = CurrentWeather(
         date_time=datetime.fromtimestamp(1714063536, tz=UTC),
         temperature=6.84,
@@ -60,8 +62,8 @@ def _create_mocked_owm_factory(is_valid: bool):
         wind_speed=9.83,
         wind_bearing=199,
         wind_gust=None,
-        rain={},
-        snow={},
+        rain={"1h": 1.21},
+        snow=None,
         condition=WeatherCondition(
             id=803,
             main="Clouds",
@@ -106,13 +108,21 @@ def _create_mocked_owm_factory(is_valid: bool):
         rain=0,
         snow=0,
     )
-    minutely_weather_forecast = MinutelyWeatherForecast(
-        date_time=1728672360, precipitation=2.54
-    )
-    weather_report = WeatherReport(
-        current_weather, [minutely_weather_forecast], [], [daily_weather_forecast]
+    minutely_weather_forecast = [
+        MinutelyWeatherForecast(date_time=1728672360, precipitation=0),
+        MinutelyWeatherForecast(date_time=1728672420, precipitation=1.23),
+        MinutelyWeatherForecast(date_time=1728672480, precipitation=4.5),
+        MinutelyWeatherForecast(date_time=1728672540, precipitation=0),
+    ]
+    return WeatherReport(
+        current_weather, minutely_weather_forecast, [], [daily_weather_forecast]
     )
 
+
+def _create_mocked_owm_factory(is_valid: bool):
+    """Create a mocked OWM client."""
+
+    weather_report = _create_static_weather_report()
     mocked_owm_client = MagicMock()
     mocked_owm_client.validate_key = AsyncMock(return_value=is_valid)
     mocked_owm_client.get_weather = AsyncMock(return_value=weather_report)
diff --git a/tests/components/openweathermap/test_weather.py b/tests/components/openweathermap/test_weather.py
new file mode 100644
index 00000000000..e9817e739ac
--- /dev/null
+++ b/tests/components/openweathermap/test_weather.py
@@ -0,0 +1,121 @@
+"""Test the OpenWeatherMap weather entity."""
+
+import pytest
+from syrupy import SnapshotAssertion
+
+from homeassistant.components.openweathermap.const import (
+    DEFAULT_LANGUAGE,
+    DOMAIN,
+    OWM_MODE_FREE_CURRENT,
+    OWM_MODE_V30,
+)
+from homeassistant.components.openweathermap.weather import SERVICE_GET_MINUTE_FORECAST
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import (
+    CONF_API_KEY,
+    CONF_LANGUAGE,
+    CONF_LATITUDE,
+    CONF_LONGITUDE,
+    CONF_MODE,
+    CONF_NAME,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ServiceValidationError
+
+from .test_config_flow import _create_static_weather_report
+
+from tests.common import AsyncMock, MockConfigEntry, patch
+
+ENTITY_ID = "weather.openweathermap"
+API_KEY = "test_api_key"
+LATITUDE = 12.34
+LONGITUDE = 56.78
+NAME = "openweathermap"
+
+# Define test data for mocked weather report
+static_weather_report = _create_static_weather_report()
+
+
+def mock_config_entry(mode: str) -> MockConfigEntry:
+    """Create a mock OpenWeatherMap config entry."""
+    return MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            CONF_API_KEY: API_KEY,
+            CONF_LATITUDE: LATITUDE,
+            CONF_LONGITUDE: LONGITUDE,
+            CONF_NAME: NAME,
+        },
+        options={CONF_MODE: mode, CONF_LANGUAGE: DEFAULT_LANGUAGE},
+        version=5,
+    )
+
+
+@pytest.fixture
+def mock_config_entry_free_current() -> MockConfigEntry:
+    """Create a mock OpenWeatherMap FREE_CURRENT config entry."""
+    return mock_config_entry(OWM_MODE_FREE_CURRENT)
+
+
+@pytest.fixture
+def mock_config_entry_v30() -> MockConfigEntry:
+    """Create a mock OpenWeatherMap v3.0 config entry."""
+    return mock_config_entry(OWM_MODE_V30)
+
+
+async def setup_mock_config_entry(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry
+):
+    """Set up the MockConfigEntry and assert it is loaded correctly."""
+    mock_config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+    assert hass.states.get(ENTITY_ID)
+    assert mock_config_entry.state is ConfigEntryState.LOADED
+
+
+@patch(
+    "pyopenweathermap.client.onecall_client.OWMOneCallClient.get_weather",
+    AsyncMock(return_value=static_weather_report),
+)
+async def test_get_minute_forecast(
+    hass: HomeAssistant,
+    mock_config_entry_v30: MockConfigEntry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test the get_minute_forecast Service call."""
+    await setup_mock_config_entry(hass, mock_config_entry_v30)
+
+    result = await hass.services.async_call(
+        DOMAIN,
+        SERVICE_GET_MINUTE_FORECAST,
+        {"entity_id": ENTITY_ID},
+        blocking=True,
+        return_response=True,
+    )
+    assert result == snapshot(name="mock_service_response")
+
+
+@patch(
+    "pyopenweathermap.client.free_client.OWMFreeClient.get_weather",
+    AsyncMock(return_value=static_weather_report),
+)
+async def test_mode_fail(
+    hass: HomeAssistant,
+    mock_config_entry_free_current: MockConfigEntry,
+) -> None:
+    """Test that Minute forecasting fails when mode is not v3.0."""
+    await setup_mock_config_entry(hass, mock_config_entry_free_current)
+
+    # Expect a ServiceValidationError when mode is not OWM_MODE_V30
+    with pytest.raises(
+        ServiceValidationError,
+        match="Minute forecast is available only when OpenWeatherMap mode is set to v3.0",
+    ):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_GET_MINUTE_FORECAST,
+            {"entity_id": ENTITY_ID},
+            blocking=True,
+            return_response=True,
+        )
diff --git a/tests/components/oralb/test_config_flow.py b/tests/components/oralb/test_config_flow.py
index dee16cd0632..c4cc830b89c 100644
--- a/tests/components/oralb/test_config_flow.py
+++ b/tests/components/oralb/test_config_flow.py
@@ -96,6 +96,36 @@ async def test_async_step_user_with_found_devices(hass: HomeAssistant) -> None:
     assert result2["result"].unique_id == "78:DB:2F:C2:48:BE"
 
 
+async def test_async_step_user_replace_ignored(hass: HomeAssistant) -> None:
+    """Test setup from service info can replace an ignored entry."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=ORALB_SERVICE_INFO.address,
+        source=config_entries.SOURCE_IGNORE,
+        data={},
+    )
+    entry.add_to_hass(hass)
+    with patch(
+        "homeassistant.components.oralb.config_flow.async_discovered_service_info",
+        return_value=[ORALB_SERVICE_INFO],
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_USER},
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    with patch("homeassistant.components.oralb.async_setup_entry", return_value=True):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input={"address": "78:DB:2F:C2:48:BE"},
+        )
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "Smart Series 7000 48BE"
+    assert result2["data"] == {}
+    assert result2["result"].unique_id == "78:DB:2F:C2:48:BE"
+
+
 async def test_async_step_user_device_added_between_steps(hass: HomeAssistant) -> None:
     """Test the device gets added via another flow between steps."""
     with patch(
diff --git a/tests/components/osoenergy/snapshots/test_water_heater.ambr b/tests/components/osoenergy/snapshots/test_water_heater.ambr
index 5ebac405144..92b3a7aa099 100644
--- a/tests/components/osoenergy/snapshots/test_water_heater.ambr
+++ b/tests/components/osoenergy/snapshots/test_water_heater.ambr
@@ -9,6 +9,7 @@
       'min_temp': 10,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/otbr/__init__.py b/tests/components/otbr/__init__.py
index 7d52318b477..5f778169e55 100644
--- a/tests/components/otbr/__init__.py
+++ b/tests/components/otbr/__init__.py
@@ -33,6 +33,8 @@ TEST_BORDER_AGENT_EXTENDED_ADDRESS = bytes.fromhex("AEEB2F594B570BBF")
 TEST_BORDER_AGENT_ID = bytes.fromhex("230C6A1AC57F6F4BE262ACF32E5EF52C")
 TEST_BORDER_AGENT_ID_2 = bytes.fromhex("230C6A1AC57F6F4BE262ACF32E5EF52D")
 
+COPROCESSOR_VERSION = "OPENTHREAD/thread-reference-20200818-1740-g33cc75ed3; NRF52840; Jun 2 2022 14:25:49"
+
 ROUTER_DISCOVERY_HASS = {
     "type_": "_meshcop._udp.local.",
     "name": "HomeAssistant OpenThreadBorderRouter #0BBF._meshcop._udp.local.",
@@ -60,3 +62,7 @@ ROUTER_DISCOVERY_HASS = {
     },
     "interface_index": None,
 }
+
+TEST_COPROCESSOR_VERSION = (
+    "SL-OPENTHREAD/2.4.4.0_GitHub-7074a43e4; EFR32; Oct 21 2024 14:40:57"
+)
diff --git a/tests/components/otbr/conftest.py b/tests/components/otbr/conftest.py
index 5ab3e442183..9140fcf6847 100644
--- a/tests/components/otbr/conftest.py
+++ b/tests/components/otbr/conftest.py
@@ -15,6 +15,7 @@ from . import (
     DATASET_CH16,
     TEST_BORDER_AGENT_EXTENDED_ADDRESS,
     TEST_BORDER_AGENT_ID,
+    TEST_COPROCESSOR_VERSION,
 )
 
 from tests.common import MockConfigEntry
@@ -71,12 +72,23 @@ def get_extended_address_fixture() -> Generator[AsyncMock]:
         yield get_extended_address
 
 
+@pytest.fixture(name="get_coprocessor_version")
+def get_coprocessor_version_fixture() -> Generator[AsyncMock]:
+    """Mock get_coprocessor_version."""
+    with patch(
+        "python_otbr_api.OTBR.get_coprocessor_version",
+        return_value=TEST_COPROCESSOR_VERSION,
+    ) as get_coprocessor_version:
+        yield get_coprocessor_version
+
+
 @pytest.fixture(name="otbr_config_entry_multipan")
 async def otbr_config_entry_multipan_fixture(
     hass: HomeAssistant,
     get_active_dataset_tlvs: AsyncMock,
     get_border_agent_id: AsyncMock,
     get_extended_address: AsyncMock,
+    get_coprocessor_version: AsyncMock,
 ) -> str:
     """Mock Open Thread Border Router config entry."""
     config_entry = MockConfigEntry(
@@ -97,6 +109,7 @@ async def otbr_config_entry_thread_fixture(
     get_active_dataset_tlvs: AsyncMock,
     get_border_agent_id: AsyncMock,
     get_extended_address: AsyncMock,
+    get_coprocessor_version: AsyncMock,
 ) -> None:
     """Mock Open Thread Border Router config entry."""
     config_entry = MockConfigEntry(
diff --git a/tests/components/otbr/test_config_flow.py b/tests/components/otbr/test_config_flow.py
index d14fbc5cbd1..8384b905b9c 100644
--- a/tests/components/otbr/test_config_flow.py
+++ b/tests/components/otbr/test_config_flow.py
@@ -10,9 +10,18 @@ import pytest
 import python_otbr_api
 
 from homeassistant.components import otbr
+from homeassistant.components.homeassistant_hardware.helpers import (
+    async_register_firmware_info_callback,
+)
+from homeassistant.components.homeassistant_hardware.util import (
+    ApplicationType,
+    FirmwareInfo,
+    OwningAddon,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers.service_info.hassio import HassioServiceInfo
+from homeassistant.setup import async_setup_component
 
 from . import DATASET_CH15, DATASET_CH16, TEST_BORDER_AGENT_ID, TEST_BORDER_AGENT_ID_2
 
@@ -32,6 +41,19 @@ HASSIO_DATA_2 = HassioServiceInfo(
     uuid="23456",
 )
 
+HASSIO_DATA_OTBR = HassioServiceInfo(
+    config={
+        "host": "core-openthread-border-router",
+        "port": 8081,
+        "device": "/dev/ttyUSB1",
+        "firmware": "SL-OPENTHREAD/2.4.4.0_GitHub-7074a43e4; EFR32; Oct 21 2024 14:40:57\r",
+        "addon": "OpenThread Border Router",
+    },
+    name="OpenThread Border Router",
+    slug="core_openthread_border_router",
+    uuid="c58ba80fc88548008776bf8da903ef21",
+)
+
 
 @pytest.fixture(name="otbr_addon_info")
 def otbr_addon_info_fixture(addon_info: AsyncMock, addon_installed) -> AsyncMock:
@@ -97,6 +119,7 @@ async def test_user_flow_additional_entry(
 @pytest.mark.usefixtures(
     "get_active_dataset_tlvs",
     "get_extended_address",
+    "get_coprocessor_version",
 )
 async def test_user_flow_additional_entry_fail_get_address(
     hass: HomeAssistant,
@@ -174,6 +197,7 @@ async def _finish_user_flow(
     "get_active_dataset_tlvs",
     "get_border_agent_id",
     "get_extended_address",
+    "get_coprocessor_version",
 )
 async def test_user_flow_additional_entry_same_address(
     hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
@@ -563,7 +587,11 @@ async def test_hassio_discovery_flow_2x_addons(
     assert config_entry.unique_id == HASSIO_DATA_2.uuid
 
 
-@pytest.mark.usefixtures("get_active_dataset_tlvs", "get_extended_address")
+@pytest.mark.usefixtures(
+    "get_active_dataset_tlvs",
+    "get_extended_address",
+    "get_coprocessor_version",
+)
 async def test_hassio_discovery_flow_2x_addons_same_ext_address(
     hass: HomeAssistant, aioclient_mock: AiohttpClientMocker, otbr_addon_info
 ) -> None:
@@ -963,3 +991,55 @@ async def test_config_flow_additional_entry(
         )
 
     assert result["type"] is expected_result
+
+
+@pytest.mark.usefixtures(
+    "get_border_agent_id", "get_extended_address", "get_coprocessor_version"
+)
+async def test_hassio_discovery_reload(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker, otbr_addon_info
+) -> None:
+    """Test the hassio discovery flow."""
+    await async_setup_component(hass, "homeassistant_hardware", {})
+
+    aioclient_mock.get(
+        "http://core-openthread-border-router:8081/node/dataset/active", text=""
+    )
+
+    callback = Mock()
+    async_register_firmware_info_callback(hass, "/dev/ttyUSB1", callback)
+
+    with (
+        patch(
+            "homeassistant.components.otbr.homeassistant_hardware.is_hassio",
+            return_value=True,
+        ),
+        patch(
+            "homeassistant.components.otbr.homeassistant_hardware.get_otbr_addon_firmware_info",
+            return_value=FirmwareInfo(
+                device="/dev/ttyUSB1",
+                firmware_type=ApplicationType.SPINEL,
+                firmware_version=None,
+                source="otbr",
+                owners=[
+                    OwningAddon(slug="core_openthread_border_router"),
+                ],
+            ),
+        ),
+    ):
+        await hass.config_entries.flow.async_init(
+            otbr.DOMAIN, context={"source": "hassio"}, data=HASSIO_DATA_OTBR
+        )
+
+        # OTBR is set up and calls the firmware info notification callback
+        assert len(callback.mock_calls) == 1
+        assert len(hass.config_entries.async_entries(otbr.DOMAIN)) == 1
+
+        # If we change discovery info and emit again, the integration will be reloaded
+        # and firmware information will be broadcast again
+        await hass.config_entries.flow.async_init(
+            otbr.DOMAIN, context={"source": "hassio"}, data=HASSIO_DATA_OTBR
+        )
+
+        assert len(callback.mock_calls) == 2
+        assert len(hass.config_entries.async_entries(otbr.DOMAIN)) == 1
diff --git a/tests/components/otbr/test_homeassistant_hardware.py b/tests/components/otbr/test_homeassistant_hardware.py
new file mode 100644
index 00000000000..7f831656d06
--- /dev/null
+++ b/tests/components/otbr/test_homeassistant_hardware.py
@@ -0,0 +1,254 @@
+"""Test Home Assistant Hardware platform for OTBR."""
+
+from unittest.mock import AsyncMock, Mock, call, patch
+
+import pytest
+
+from homeassistant.components.homeassistant_hardware.helpers import (
+    async_register_firmware_info_callback,
+)
+from homeassistant.components.homeassistant_hardware.util import (
+    ApplicationType,
+    FirmwareInfo,
+    OwningAddon,
+    OwningIntegration,
+)
+from homeassistant.components.otbr.homeassistant_hardware import async_get_firmware_info
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.setup import async_setup_component
+
+from . import TEST_COPROCESSOR_VERSION
+
+from tests.common import MockConfigEntry
+from tests.test_util.aiohttp import AiohttpClientMocker
+
+DEVICE_PATH = "/dev/serial/by-id/usb-Nabu_Casa_Home_Assistant_Connect_ZBT-1_9ab1da1ea4b3ed11956f4eaca7669f5d-if00-port0"
+
+
+async def test_get_firmware_info(hass: HomeAssistant) -> None:
+    """Test `async_get_firmware_info`."""
+
+    otbr = MockConfigEntry(
+        domain="otbr",
+        unique_id="some_unique_id",
+        data={
+            "url": "http://core_openthread_border_router:8888",
+        },
+        version=1,
+    )
+    otbr.add_to_hass(hass)
+    otbr.mock_state(hass, ConfigEntryState.LOADED)
+
+    otbr.runtime_data = AsyncMock()
+    otbr.runtime_data.get_coprocessor_version.return_value = TEST_COPROCESSOR_VERSION
+
+    with (
+        patch(
+            "homeassistant.components.otbr.homeassistant_hardware.is_hassio",
+            return_value=True,
+        ),
+        patch(
+            "homeassistant.components.otbr.homeassistant_hardware.AddonManager",
+        ),
+        patch(
+            "homeassistant.components.otbr.homeassistant_hardware.get_otbr_addon_firmware_info",
+            return_value=FirmwareInfo(
+                device=DEVICE_PATH,
+                firmware_type=ApplicationType.SPINEL,
+                firmware_version=None,
+                source="otbr",
+                owners=[
+                    OwningAddon(slug="core_openthread_border_router"),
+                ],
+            ),
+        ),
+    ):
+        fw_info = await async_get_firmware_info(hass, otbr)
+
+    assert fw_info == FirmwareInfo(
+        device=DEVICE_PATH,
+        firmware_type=ApplicationType.SPINEL,
+        firmware_version=TEST_COPROCESSOR_VERSION,
+        source="otbr",
+        owners=[
+            OwningIntegration(config_entry_id=otbr.entry_id),
+            OwningAddon(slug="core_openthread_border_router"),
+        ],
+    )
+
+
+async def test_get_firmware_info_ignored(hass: HomeAssistant) -> None:
+    """Test `async_get_firmware_info` with ignored entry."""
+
+    otbr = MockConfigEntry(
+        domain="otbr",
+        unique_id="some_unique_id",
+        data={},
+        version=1,
+    )
+    otbr.add_to_hass(hass)
+
+    fw_info = await async_get_firmware_info(hass, otbr)
+    assert fw_info is None
+
+
+async def test_get_firmware_info_no_coprocessor_version(hass: HomeAssistant) -> None:
+    """Test `async_get_firmware_info` with no coprocessor version support."""
+
+    otbr = MockConfigEntry(
+        domain="otbr",
+        unique_id="some_unique_id",
+        data={
+            "url": "http://core_openthread_border_router:8888",
+        },
+        version=1,
+    )
+    otbr.add_to_hass(hass)
+    otbr.mock_state(hass, ConfigEntryState.LOADED)
+
+    otbr.runtime_data = AsyncMock()
+    otbr.runtime_data.get_coprocessor_version.side_effect = HomeAssistantError()
+
+    with (
+        patch(
+            "homeassistant.components.otbr.homeassistant_hardware.is_hassio",
+            return_value=True,
+        ),
+        patch(
+            "homeassistant.components.otbr.homeassistant_hardware.AddonManager",
+        ),
+        patch(
+            "homeassistant.components.otbr.homeassistant_hardware.get_otbr_addon_firmware_info",
+            return_value=FirmwareInfo(
+                device=DEVICE_PATH,
+                firmware_type=ApplicationType.SPINEL,
+                firmware_version=None,
+                source="otbr",
+                owners=[
+                    OwningAddon(slug="core_openthread_border_router"),
+                ],
+            ),
+        ),
+    ):
+        fw_info = await async_get_firmware_info(hass, otbr)
+
+    assert fw_info == FirmwareInfo(
+        device=DEVICE_PATH,
+        firmware_type=ApplicationType.SPINEL,
+        firmware_version=None,
+        source="otbr",
+        owners=[
+            OwningIntegration(config_entry_id=otbr.entry_id),
+            OwningAddon(slug="core_openthread_border_router"),
+        ],
+    )
+
+
+@pytest.mark.parametrize(
+    ("version", "expected_version"),
+    [
+        ((TEST_COPROCESSOR_VERSION,), TEST_COPROCESSOR_VERSION),
+        (HomeAssistantError(), None),
+    ],
+)
+async def test_hardware_firmware_info_provider_notification(
+    hass: HomeAssistant,
+    version: str | Exception,
+    expected_version: str | None,
+    get_active_dataset_tlvs: AsyncMock,
+    get_border_agent_id: AsyncMock,
+    get_extended_address: AsyncMock,
+    get_coprocessor_version: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
+) -> None:
+    """Test that the OTBR provides hardware and firmware information."""
+    otbr = MockConfigEntry(
+        domain="otbr",
+        unique_id="some_unique_id",
+        data={
+            "url": "http://core_openthread_border_router:8888",
+        },
+        version=1,
+    )
+    otbr.add_to_hass(hass)
+
+    await async_setup_component(hass, "homeassistant_hardware", {})
+
+    callback = Mock()
+    async_register_firmware_info_callback(hass, DEVICE_PATH, callback)
+
+    with (
+        patch(
+            "homeassistant.components.otbr.homeassistant_hardware.is_hassio",
+            return_value=True,
+        ),
+        patch(
+            "homeassistant.components.otbr.homeassistant_hardware.AddonManager",
+        ),
+        patch(
+            "homeassistant.components.otbr.homeassistant_hardware.get_otbr_addon_firmware_info",
+            return_value=FirmwareInfo(
+                device=DEVICE_PATH,
+                firmware_type=ApplicationType.SPINEL,
+                firmware_version=None,
+                source="otbr",
+                owners=[
+                    OwningAddon(slug="core_openthread_border_router"),
+                ],
+            ),
+        ),
+    ):
+        get_coprocessor_version.side_effect = version
+        await hass.config_entries.async_setup(otbr.entry_id)
+
+    assert callback.mock_calls == [
+        call(
+            FirmwareInfo(
+                device=DEVICE_PATH,
+                firmware_type=ApplicationType.SPINEL,
+                firmware_version=expected_version,
+                source="otbr",
+                owners=[
+                    OwningIntegration(config_entry_id=otbr.entry_id),
+                    OwningAddon(slug="core_openthread_border_router"),
+                ],
+            )
+        )
+    ]
+
+
+async def test_get_firmware_info_remote_otbr(hass: HomeAssistant) -> None:
+    """Test `async_get_firmware_info` with no coprocessor version support."""
+
+    otbr = MockConfigEntry(
+        domain="otbr",
+        unique_id="some_unique_id",
+        data={
+            "url": "http://192.168.1.10:8888",
+        },
+        version=1,
+    )
+    otbr.add_to_hass(hass)
+    otbr.mock_state(hass, ConfigEntryState.LOADED)
+
+    otbr.runtime_data = AsyncMock()
+    otbr.runtime_data.get_coprocessor_version.return_value = TEST_COPROCESSOR_VERSION
+
+    with (
+        patch(
+            "homeassistant.components.otbr.homeassistant_hardware.is_hassio",
+            return_value=True,
+        ),
+        patch(
+            "homeassistant.components.otbr.homeassistant_hardware.AddonManager",
+        ),
+        patch(
+            "homeassistant.components.otbr.homeassistant_hardware.get_otbr_addon_firmware_info",
+            return_value=None,
+        ),
+    ):
+        fw_info = await async_get_firmware_info(hass, otbr)
+
+    assert fw_info is None
diff --git a/tests/components/otbr/test_init.py b/tests/components/otbr/test_init.py
index faf13786107..b14527165e6 100644
--- a/tests/components/otbr/test_init.py
+++ b/tests/components/otbr/test_init.py
@@ -26,6 +26,7 @@ from . import (
     ROUTER_DISCOVERY_HASS,
     TEST_BORDER_AGENT_EXTENDED_ADDRESS,
     TEST_BORDER_AGENT_ID,
+    TEST_COPROCESSOR_VERSION,
 )
 
 from tests.common import MockConfigEntry
@@ -43,6 +44,7 @@ def enable_mocks_fixture(
     get_active_dataset_tlvs: AsyncMock,
     get_border_agent_id: AsyncMock,
     get_extended_address: AsyncMock,
+    get_coprocessor_version: AsyncMock,
 ) -> None:
     """Enable API mocks."""
 
@@ -298,6 +300,7 @@ async def test_config_entry_update(hass: HomeAssistant) -> None:
     mock_api.get_extended_address = AsyncMock(
         return_value=TEST_BORDER_AGENT_EXTENDED_ADDRESS
     )
+    mock_api.get_coprocessor_version = AsyncMock(return_value=TEST_COPROCESSOR_VERSION)
     with patch("python_otbr_api.OTBR", return_value=mock_api) as mock_otrb_api:
         assert await hass.config_entries.async_setup(config_entry.entry_id)
 
diff --git a/tests/components/overseerr/fixtures/webhook_config.json b/tests/components/overseerr/fixtures/webhook_config.json
index 40028e1f80f..2b3388444d2 100644
--- a/tests/components/overseerr/fixtures/webhook_config.json
+++ b/tests/components/overseerr/fixtures/webhook_config.json
@@ -2,7 +2,7 @@
   "enabled": true,
   "types": 222,
   "options": {
-    "jsonPayload": "{\"notification_type\":\"{{notification_type}}\",\"subject\":\"{{subject}}\",\"message\":\"{{message}}\",\"image\":\"{{image}}\",\"{{media}}\":{\"media_type\":\"{{media_type}}\",\"tmdb_idd\":\"{{media_tmdbid}}\",\"tvdb_id\":\"{{media_tvdbid}}\",\"status\":\"{{media_status}}\",\"status4k\":\"{{media_status4k}}\"},\"{{request}}\":{\"request_id\":\"{{request_id}}\",\"requested_by_email\":\"{{requestedBy_email}}\",\"requested_by_username\":\"{{requestedBy_username}}\",\"requested_by_avatar\":\"{{requestedBy_avatar}}\",\"requested_by_settings_discord_id\":\"{{requestedBy_settings_discordId}}\",\"requested_by_settings_telegram_chat_id\":\"{{requestedBy_settings_telegramChatId}}\"},\"{{issue}}\":{\"issue_id\":\"{{issue_id}}\",\"issue_type\":\"{{issue_type}}\",\"issue_status\":\"{{issue_status}}\",\"reported_by_email\":\"{{reportedBy_email}}\",\"reported_by_username\":\"{{reportedBy_username}}\",\"reported_by_avatar\":\"{{reportedBy_avatar}}\",\"reported_by_settings_discord_id\":\"{{reportedBy_settings_discordId}}\",\"reported_by_settings_telegram_chat_id\":\"{{reportedBy_settings_telegramChatId}}\"},\"{{comment}}\":{\"comment_message\":\"{{comment_message}}\",\"commented_by_email\":\"{{commentedBy_email}}\",\"commented_by_username\":\"{{commentedBy_username}}\",\"commented_by_avatar\":\"{{commentedBy_avatar}}\",\"commented_by_settings_discord_id\":\"{{commentedBy_settings_discordId}}\",\"commented_by_settings_telegram_chat_id\":\"{{commentedBy_settings_telegramChatId}}\"}}",
+    "jsonPayload": "{\"notification_type\":\"{{notification_type}}\",\"subject\":\"{{subject}}\",\"message\":\"{{message}}\",\"image\":\"{{image}}\",\"{{media}}\":{\"media_type\":\"{{media_type}}\",\"tmdb_id\":\"{{media_tmdbid}}\",\"tvdb_id\":\"{{media_tvdbid}}\",\"status\":\"{{media_status}}\",\"status4k\":\"{{media_status4k}}\"},\"{{request}}\":{\"request_id\":\"{{request_id}}\",\"requested_by_email\":\"{{requestedBy_email}}\",\"requested_by_username\":\"{{requestedBy_username}}\",\"requested_by_avatar\":\"{{requestedBy_avatar}}\",\"requested_by_settings_discord_id\":\"{{requestedBy_settings_discordId}}\",\"requested_by_settings_telegram_chat_id\":\"{{requestedBy_settings_telegramChatId}}\"},\"{{issue}}\":{\"issue_id\":\"{{issue_id}}\",\"issue_type\":\"{{issue_type}}\",\"issue_status\":\"{{issue_status}}\",\"reported_by_email\":\"{{reportedBy_email}}\",\"reported_by_username\":\"{{reportedBy_username}}\",\"reported_by_avatar\":\"{{reportedBy_avatar}}\",\"reported_by_settings_discord_id\":\"{{reportedBy_settings_discordId}}\",\"reported_by_settings_telegram_chat_id\":\"{{reportedBy_settings_telegramChatId}}\"},\"{{comment}}\":{\"comment_message\":\"{{comment_message}}\",\"commented_by_email\":\"{{commentedBy_email}}\",\"commented_by_username\":\"{{commentedBy_username}}\",\"commented_by_avatar\":\"{{commentedBy_avatar}}\",\"commented_by_settings_discord_id\":\"{{commentedBy_settings_discordId}}\",\"commented_by_settings_telegram_chat_id\":\"{{commentedBy_settings_telegramChatId}}\"}}",
     "webhookUrl": "http://10.10.10.10:8123/api/webhook/test-webhook-id"
   }
 }
diff --git a/tests/components/overseerr/snapshots/test_event.ambr b/tests/components/overseerr/snapshots/test_event.ambr
index 1002bc4cdad..8a7be6c463d 100644
--- a/tests/components/overseerr/snapshots/test_event.ambr
+++ b/tests/components/overseerr/snapshots/test_event.ambr
@@ -15,6 +15,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/overseerr/snapshots/test_init.ambr b/tests/components/overseerr/snapshots/test_init.ambr
index 21b4b215ac5..2709f532ef6 100644
--- a/tests/components/overseerr/snapshots/test_init.ambr
+++ b/tests/components/overseerr/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://overseerr.test',
     'connections': set({
     }),
diff --git a/tests/components/overseerr/snapshots/test_sensor.ambr b/tests/components/overseerr/snapshots/test_sensor.ambr
index 53a9b3dd82a..bbee260b782 100644
--- a/tests/components/overseerr/snapshots/test_sensor.ambr
+++ b/tests/components/overseerr/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -58,6 +59,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -108,6 +110,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -158,6 +161,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -208,6 +212,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -258,6 +263,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -308,6 +314,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/p1_monitor/snapshots/test_init.ambr b/tests/components/p1_monitor/snapshots/test_init.ambr
index d0a676fce1b..83684e153c9 100644
--- a/tests/components/p1_monitor/snapshots/test_init.ambr
+++ b/tests/components/p1_monitor/snapshots/test_init.ambr
@@ -16,6 +16,8 @@
     'pref_disable_new_entities': False,
     'pref_disable_polling': False,
     'source': 'user',
+    'subentries': list([
+    ]),
     'title': 'Mock Title',
     'unique_id': 'unique_thingy',
     'version': 2,
@@ -38,6 +40,8 @@
     'pref_disable_new_entities': False,
     'pref_disable_polling': False,
     'source': 'user',
+    'subentries': list([
+    ]),
     'title': 'Mock Title',
     'unique_id': 'unique_thingy',
     'version': 2,
diff --git a/tests/components/palazzetti/snapshots/test_button.ambr b/tests/components/palazzetti/snapshots/test_button.ambr
index 6827c9a1f22..8130f0a0ec7 100644
--- a/tests/components/palazzetti/snapshots/test_button.ambr
+++ b/tests/components/palazzetti/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/palazzetti/snapshots/test_climate.ambr b/tests/components/palazzetti/snapshots/test_climate.ambr
index aa637039df9..cf23cb87ccb 100644
--- a/tests/components/palazzetti/snapshots/test_climate.ambr
+++ b/tests/components/palazzetti/snapshots/test_climate.ambr
@@ -23,6 +23,7 @@
       'target_temp_step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/palazzetti/snapshots/test_init.ambr b/tests/components/palazzetti/snapshots/test_init.ambr
index abdee6b7f6f..fc96cab4fad 100644
--- a/tests/components/palazzetti/snapshots/test_init.ambr
+++ b/tests/components/palazzetti/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
diff --git a/tests/components/palazzetti/snapshots/test_number.ambr b/tests/components/palazzetti/snapshots/test_number.ambr
index 7ace1149e0a..1d40e9e4b6b 100644
--- a/tests/components/palazzetti/snapshots/test_number.ambr
+++ b/tests/components/palazzetti/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -67,6 +68,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -123,6 +125,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/palazzetti/snapshots/test_sensor.ambr b/tests/components/palazzetti/snapshots/test_sensor.ambr
index aa98f3a4f59..6bf4f68c1fa 100644
--- a/tests/components/palazzetti/snapshots/test_sensor.ambr
+++ b/tests/components/palazzetti/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -110,6 +112,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -161,6 +164,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -212,6 +216,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -263,6 +268,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -362,6 +368,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -460,6 +467,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -511,6 +519,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/peblar/snapshots/test_binary_sensor.ambr b/tests/components/peblar/snapshots/test_binary_sensor.ambr
index 72c3ac78a12..9ad9c877ed2 100644
--- a/tests/components/peblar/snapshots/test_binary_sensor.ambr
+++ b/tests/components/peblar/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/peblar/snapshots/test_button.ambr b/tests/components/peblar/snapshots/test_button.ambr
index 96aab5c93ef..6d31da0ae52 100644
--- a/tests/components/peblar/snapshots/test_button.ambr
+++ b/tests/components/peblar/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/peblar/snapshots/test_init.ambr b/tests/components/peblar/snapshots/test_init.ambr
index ba79093b3ec..8a7cefc523d 100644
--- a/tests/components/peblar/snapshots/test_init.ambr
+++ b/tests/components/peblar/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://127.0.0.127',
     'connections': set({
       tuple(
diff --git a/tests/components/peblar/snapshots/test_number.ambr b/tests/components/peblar/snapshots/test_number.ambr
index d78067849f3..d8e9c756c50 100644
--- a/tests/components/peblar/snapshots/test_number.ambr
+++ b/tests/components/peblar/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/peblar/snapshots/test_select.ambr b/tests/components/peblar/snapshots/test_select.ambr
index 62e09325601..3a600653a84 100644
--- a/tests/components/peblar/snapshots/test_select.ambr
+++ b/tests/components/peblar/snapshots/test_select.ambr
@@ -14,6 +14,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/peblar/snapshots/test_sensor.ambr b/tests/components/peblar/snapshots/test_sensor.ambr
index bb1a3eb34d6..5a1d1663ba2 100644
--- a/tests/components/peblar/snapshots/test_sensor.ambr
+++ b/tests/components/peblar/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -65,6 +66,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -122,6 +124,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -179,6 +182,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +240,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -311,6 +316,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -379,6 +385,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -430,6 +437,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -481,6 +489,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -532,6 +541,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -583,6 +593,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -648,6 +659,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -704,6 +716,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -753,6 +766,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -804,6 +818,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -855,6 +870,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/peblar/snapshots/test_switch.ambr b/tests/components/peblar/snapshots/test_switch.ambr
index 53829278593..46051974339 100644
--- a/tests/components/peblar/snapshots/test_switch.ambr
+++ b/tests/components/peblar/snapshots/test_switch.ambr
@@ -1,4 +1,51 @@
 # serializer version: 1
+# name: test_entities[switch][switch.peblar_ev_charger_charge-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'switch.peblar_ev_charger_charge',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Charge',
+    'platform': 'peblar',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'charge',
+    'unique_id': '23-45-A4O-MOF_charge',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_entities[switch][switch.peblar_ev_charger_charge-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Peblar EV Charger Charge',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.peblar_ev_charger_charge',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
 # name: test_entities[switch][switch.peblar_ev_charger_force_single_phase-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -6,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/peblar/snapshots/test_update.ambr b/tests/components/peblar/snapshots/test_update.ambr
index de8bb63150d..0a6b2bf069f 100644
--- a/tests/components/peblar/snapshots/test_update.ambr
+++ b/tests/components/peblar/snapshots/test_update.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -64,6 +65,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/peblar/test_number.py b/tests/components/peblar/test_number.py
index 57469fecbc6..fa49b6ab116 100644
--- a/tests/components/peblar/test_number.py
+++ b/tests/components/peblar/test_number.py
@@ -14,18 +14,19 @@ from homeassistant.components.number import (
 from homeassistant.components.peblar.const import DOMAIN
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntryState
 from homeassistant.const import ATTR_ENTITY_ID, Platform
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, State
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 
-from tests.common import MockConfigEntry, snapshot_platform
-
-pytestmark = [
-    pytest.mark.parametrize("init_integration", [Platform.NUMBER], indirect=True),
-    pytest.mark.usefixtures("init_integration"),
-]
+from tests.common import (
+    MockConfigEntry,
+    mock_restore_cache_with_extra_data,
+    snapshot_platform,
+)
 
 
+@pytest.mark.parametrize("init_integration", [Platform.NUMBER], indirect=True)
+@pytest.mark.usefixtures("init_integration")
 async def test_entities(
     hass: HomeAssistant,
     snapshot: SnapshotAssertion,
@@ -48,7 +49,8 @@ async def test_entities(
         assert entity_entry.device_id == device_entry.id
 
 
-@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+@pytest.mark.parametrize("init_integration", [Platform.NUMBER], indirect=True)
+@pytest.mark.usefixtures("init_integration", "entity_registry_enabled_by_default")
 async def test_number_set_value(
     hass: HomeAssistant,
     mock_peblar: MagicMock,
@@ -73,6 +75,43 @@ async def test_number_set_value(
     mocked_method.mock_calls[0].assert_called_with({"charge_current_limit": 10})
 
 
+async def test_number_set_value_when_charging_is_suspended(
+    hass: HomeAssistant,
+    mock_peblar: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test handling of setting the charging limit while charging is suspended."""
+    entity_id = "number.peblar_ev_charger_charge_limit"
+
+    # Suspend charging
+    mock_peblar.rest_api.return_value.ev_interface.return_value.charge_current_limit = 0
+
+    # Setup the config entry
+    mock_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    mocked_method = mock_peblar.rest_api.return_value.ev_interface
+    mocked_method.reset_mock()
+
+    # Test normal happy path number value change
+    await hass.services.async_call(
+        NUMBER_DOMAIN,
+        SERVICE_SET_VALUE,
+        {
+            ATTR_ENTITY_ID: entity_id,
+            ATTR_VALUE: 10,
+        },
+        blocking=True,
+    )
+
+    assert len(mocked_method.mock_calls) == 0
+
+    # Check the state is reflected
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "10"
+
+
 @pytest.mark.parametrize(
     ("error", "error_match", "translation_key", "translation_placeholders"),
     [
@@ -96,7 +135,8 @@ async def test_number_set_value(
         ),
     ],
 )
-@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+@pytest.mark.parametrize("init_integration", [Platform.NUMBER], indirect=True)
+@pytest.mark.usefixtures("init_integration", "entity_registry_enabled_by_default")
 async def test_number_set_value_communication_error(
     hass: HomeAssistant,
     mock_peblar: MagicMock,
@@ -128,6 +168,8 @@ async def test_number_set_value_communication_error(
     assert excinfo.value.translation_placeholders == translation_placeholders
 
 
+@pytest.mark.parametrize("init_integration", [Platform.NUMBER], indirect=True)
+@pytest.mark.usefixtures("init_integration")
 async def test_number_set_value_authentication_error(
     hass: HomeAssistant,
     mock_peblar: MagicMock,
@@ -175,3 +217,51 @@ async def test_number_set_value_authentication_error(
     assert "context" in flow
     assert flow["context"].get("source") == SOURCE_REAUTH
     assert flow["context"].get("entry_id") == mock_config_entry.entry_id
+
+
+@pytest.mark.parametrize(
+    ("restore_state", "restore_native_value", "expected_state"),
+    [
+        ("10", 10, "10"),
+        ("unknown", 10, "unknown"),
+        ("unavailable", 10, "unknown"),
+        ("10", None, "unknown"),
+    ],
+)
+async def test_restore_state(
+    hass: HomeAssistant,
+    mock_peblar: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    restore_state: str,
+    restore_native_value: int,
+    expected_state: str,
+) -> None:
+    """Test restoring the number state."""
+    EXTRA_STORED_DATA = {
+        "native_max_value": 16,
+        "native_min_value": 6,
+        "native_step": 1,
+        "native_unit_of_measurement": "A",
+        "native_value": restore_native_value,
+    }
+    mock_restore_cache_with_extra_data(
+        hass,
+        (
+            (
+                State("number.peblar_ev_charger_charge_limit", restore_state),
+                EXTRA_STORED_DATA,
+            ),
+        ),
+    )
+
+    # Adjust Peblar client to have an ignored value for the charging limit
+    mock_peblar.rest_api.return_value.ev_interface.return_value.charge_current_limit = 0
+
+    # Setup the config entry
+    mock_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    # Check if state is restored and value is set correctly
+    assert (state := hass.states.get("number.peblar_ev_charger_charge_limit"))
+    assert state.state == expected_state
diff --git a/tests/components/peblar/test_switch.py b/tests/components/peblar/test_switch.py
index 75deeb2d5d3..a7dab51eb3a 100644
--- a/tests/components/peblar/test_switch.py
+++ b/tests/components/peblar/test_switch.py
@@ -49,10 +49,32 @@ async def test_entities(
 
 
 @pytest.mark.parametrize(
-    ("service", "force_single_phase"),
+    ("service", "entity_id", "parameter", "parameter_value"),
     [
-        (SERVICE_TURN_ON, True),
-        (SERVICE_TURN_OFF, False),
+        (
+            SERVICE_TURN_ON,
+            "switch.peblar_ev_charger_force_single_phase",
+            "force_single_phase",
+            True,
+        ),
+        (
+            SERVICE_TURN_OFF,
+            "switch.peblar_ev_charger_force_single_phase",
+            "force_single_phase",
+            False,
+        ),
+        (
+            SERVICE_TURN_ON,
+            "switch.peblar_ev_charger_charge",
+            "charge_current_limit",
+            16,
+        ),
+        (
+            SERVICE_TURN_OFF,
+            "switch.peblar_ev_charger_charge",
+            "charge_current_limit",
+            0,
+        ),
     ],
 )
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
@@ -60,10 +82,11 @@ async def test_switch(
     hass: HomeAssistant,
     mock_peblar: MagicMock,
     service: str,
-    force_single_phase: bool,
+    entity_id: str,
+    parameter: str,
+    parameter_value: bool | int,
 ) -> None:
     """Test the Peblar EV charger switches."""
-    entity_id = "switch.peblar_ev_charger_force_single_phase"
     mocked_method = mock_peblar.rest_api.return_value.ev_interface
     mocked_method.reset_mock()
 
@@ -76,9 +99,7 @@ async def test_switch(
     )
 
     assert len(mocked_method.mock_calls) == 2
-    mocked_method.mock_calls[0].assert_called_with(
-        {"force_single_phase": force_single_phase}
-    )
+    mocked_method.mock_calls[0].assert_called_with({parameter: parameter_value})
 
 
 @pytest.mark.parametrize(
diff --git a/tests/components/pegel_online/snapshots/test_diagnostics.ambr b/tests/components/pegel_online/snapshots/test_diagnostics.ambr
index 1e55805f867..d0fdc81acb4 100644
--- a/tests/components/pegel_online/snapshots/test_diagnostics.ambr
+++ b/tests/components/pegel_online/snapshots/test_diagnostics.ambr
@@ -31,6 +31,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': '70272185-xxxx-xxxx-xxxx-43bea330dcae',
       'version': 1,
diff --git a/tests/components/persistent_notification/conftest.py b/tests/components/persistent_notification/conftest.py
index 29ba5a6008a..76fdc70ea7b 100644
--- a/tests/components/persistent_notification/conftest.py
+++ b/tests/components/persistent_notification/conftest.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-import homeassistant.components.persistent_notification as pn
+from homeassistant.components import persistent_notification as pn
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
diff --git a/tests/components/persistent_notification/test_init.py b/tests/components/persistent_notification/test_init.py
index 956183d8420..89559d45dc4 100644
--- a/tests/components/persistent_notification/test_init.py
+++ b/tests/components/persistent_notification/test_init.py
@@ -1,6 +1,6 @@
 """The tests for the persistent notification component."""
 
-import homeassistant.components.persistent_notification as pn
+from homeassistant.components import persistent_notification as pn
 from homeassistant.components.websocket_api import TYPE_RESULT
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
diff --git a/tests/components/persistent_notification/test_trigger.py b/tests/components/persistent_notification/test_trigger.py
index 16208143447..5e03fbf5f19 100644
--- a/tests/components/persistent_notification/test_trigger.py
+++ b/tests/components/persistent_notification/test_trigger.py
@@ -2,7 +2,7 @@
 
 from typing import Any
 
-import homeassistant.components.persistent_notification as pn
+from homeassistant.components import persistent_notification as pn
 from homeassistant.components.persistent_notification import trigger
 from homeassistant.core import Context, HomeAssistant, callback
 
diff --git a/tests/components/pglab/__init__.py b/tests/components/pglab/__init__.py
new file mode 100644
index 00000000000..0ee9b203524
--- /dev/null
+++ b/tests/components/pglab/__init__.py
@@ -0,0 +1 @@
+"""Tests for the PG LAB Electronics integration."""
diff --git a/tests/components/pglab/conftest.py b/tests/components/pglab/conftest.py
new file mode 100644
index 00000000000..b148cb08a15
--- /dev/null
+++ b/tests/components/pglab/conftest.py
@@ -0,0 +1,41 @@
+"""Common fixtures for the PG LAB Electronics tests."""
+
+import pytest
+
+from homeassistant.components.pglab.const import DISCOVERY_TOPIC, DOMAIN
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry, mock_device_registry, mock_registry
+
+CONF_DISCOVERY_PREFIX = "discovery_prefix"
+
+
+@pytest.fixture
+def device_reg(hass: HomeAssistant):
+    """Return an empty, loaded, registry."""
+    return mock_device_registry(hass)
+
+
+@pytest.fixture
+def entity_reg(hass: HomeAssistant):
+    """Return an empty, loaded, registry."""
+    return mock_registry(hass)
+
+
+@pytest.fixture
+async def setup_pglab(hass: HomeAssistant):
+    """Set up PG LAB Electronics."""
+    hass.config.components.add("pglab")
+
+    entry = MockConfigEntry(
+        data={CONF_DISCOVERY_PREFIX: DISCOVERY_TOPIC},
+        domain=DOMAIN,
+        title="PG LAB Electronics",
+    )
+
+    entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert "pglab" in hass.config.components
diff --git a/tests/components/pglab/snapshots/test_sensor.ambr b/tests/components/pglab/snapshots/test_sensor.ambr
new file mode 100644
index 00000000000..71889b65183
--- /dev/null
+++ b/tests/components/pglab/snapshots/test_sensor.ambr
@@ -0,0 +1,95 @@
+# serializer version: 1
+# name: test_sensors[mpu_voltage][initial_sensor_mpu_voltage]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'friendly_name': 'test MPU voltage',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_mpu_voltage',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unavailable',
+  })
+# ---
+# name: test_sensors[mpu_voltage][updated_sensor_mpu_voltage]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'friendly_name': 'test MPU voltage',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_mpu_voltage',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '3.31',
+  })
+# ---
+# name: test_sensors[run_time][initial_sensor_run_time]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'timestamp',
+      'friendly_name': 'test Run time',
+      'icon': 'mdi:progress-clock',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_run_time',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unavailable',
+  })
+# ---
+# name: test_sensors[run_time][updated_sensor_run_time]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'timestamp',
+      'friendly_name': 'test Run time',
+      'icon': 'mdi:progress-clock',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_run_time',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2024-02-26T01:04:54+00:00',
+  })
+# ---
+# name: test_sensors[temperature][initial_sensor_temperature]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'test Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unavailable',
+  })
+# ---
+# name: test_sensors[temperature][updated_sensor_temperature]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'test Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '33.4',
+  })
+# ---
diff --git a/tests/components/pglab/test_config_flow.py b/tests/components/pglab/test_config_flow.py
new file mode 100644
index 00000000000..81ed010920e
--- /dev/null
+++ b/tests/components/pglab/test_config_flow.py
@@ -0,0 +1,133 @@
+"""Test the PG LAB Electronics config flow."""
+
+from homeassistant.components.mqtt import MQTT_CONNECTION_STATE
+from homeassistant.components.pglab.const import DOMAIN
+from homeassistant.config_entries import SOURCE_MQTT, SOURCE_USER
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers.service_info.mqtt import MqttServiceInfo
+
+from tests.common import MockConfigEntry
+from tests.typing import MqttMockHAClient
+
+
+async def test_mqtt_config_single_instance(
+    hass: HomeAssistant, mqtt_mock: MqttMockHAClient
+) -> None:
+    """Test MQTT flow aborts when an entry already exist."""
+
+    MockConfigEntry(domain=DOMAIN).add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_MQTT}
+    )
+
+    # Be sure that result is abort. Only single instance is allowed.
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "single_instance_allowed"
+
+
+async def test_mqtt_setup(hass: HomeAssistant, mqtt_mock: MqttMockHAClient) -> None:
+    """Test we can finish a config flow through MQTT with custom prefix."""
+    discovery_info = MqttServiceInfo(
+        topic="pglab/discovery/E-Board-DD53AC85/config",
+        payload=(
+            '{"ip":"192.168.1.16", "mac":"80:34:28:1B:18:5A", "name":"e-board-office",'
+            '"hw":"255.255.255", "fw":"255.255.255", "type":"E-Board", "id":"E-Board-DD53AC85",'
+            '"manufacturer":"PG LAB Electronics", "params":{"shutters":0, "boards":"10000000" } }'
+        ),
+        qos=0,
+        retain=False,
+        subscribed_topic="pglab/discovery/#",
+        timestamp=None,
+    )
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_MQTT}, data=discovery_info
+    )
+    assert result["type"] is FlowResultType.FORM
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["result"].data == {"discovery_prefix": "pglab/discovery"}
+
+
+async def test_mqtt_abort_invalid_topic(
+    hass: HomeAssistant, mqtt_mock: MqttMockHAClient
+) -> None:
+    """Check MQTT flow aborts if discovery topic is invalid."""
+    discovery_info = MqttServiceInfo(
+        topic="pglab/discovery/E-Board-DD53AC85/wrong_topic",
+        payload=(
+            '{"ip":"192.168.1.16", "mac":"80:34:28:1B:18:5A", "name":"e-board-office",'
+            '"hw":"255.255.255", "fw":"255.255.255", "type":"E-Board", "id":"E-Board-DD53AC85",'
+            '"manufacturer":"PG LAB Electronics", "params":{"shutters":0, "boards":"10000000" } }'
+        ),
+        qos=0,
+        retain=False,
+        subscribed_topic="pglab/discovery/#",
+        timestamp=None,
+    )
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_MQTT}, data=discovery_info
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "invalid_discovery_info"
+
+    discovery_info = MqttServiceInfo(
+        topic="pglab/discovery/E-Board-DD53AC85/config",
+        payload="",
+        qos=0,
+        retain=False,
+        subscribed_topic="pglab/discovery/#",
+        timestamp=None,
+    )
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_MQTT}, data=discovery_info
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "invalid_discovery_info"
+
+
+async def test_user_setup(hass: HomeAssistant, mqtt_mock: MqttMockHAClient) -> None:
+    """Test if the user can finish a config flow."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["result"].data == {
+        "discovery_prefix": "pglab/discovery",
+    }
+
+
+async def test_user_setup_mqtt_not_connected(
+    hass: HomeAssistant, mqtt_mock: MqttMockHAClient
+) -> None:
+    """Test that the user setup is aborted when MQTT is not connected."""
+
+    mqtt_mock.connected = False
+    async_dispatcher_send(hass, MQTT_CONNECTION_STATE, False)
+    await hass.async_block_till_done()
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "mqtt_not_connected"
+
+
+async def test_user_setup_mqtt_not_configured(hass: HomeAssistant) -> None:
+    """Test that the user setup is aborted when MQTT is not configured."""
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "mqtt_not_configured"
diff --git a/tests/components/pglab/test_cover.py b/tests/components/pglab/test_cover.py
new file mode 100644
index 00000000000..ea4c7a7213e
--- /dev/null
+++ b/tests/components/pglab/test_cover.py
@@ -0,0 +1,210 @@
+"""The tests for the PG LAB Electronics cover."""
+
+import json
+
+from homeassistant.components import cover
+from homeassistant.components.cover import (
+    DOMAIN as COVER_DOMAIN,
+    SERVICE_CLOSE_COVER,
+    SERVICE_OPEN_COVER,
+    SERVICE_STOP_COVER,
+)
+from homeassistant.const import (
+    ATTR_ASSUMED_STATE,
+    STATE_CLOSED,
+    STATE_CLOSING,
+    STATE_OPEN,
+    STATE_OPENING,
+    STATE_UNKNOWN,
+)
+from homeassistant.core import HomeAssistant
+
+from tests.common import async_fire_mqtt_message
+from tests.typing import MqttMockHAClient
+
+COVER_FEATURES = (
+    cover.CoverEntityFeature.OPEN
+    | cover.CoverEntityFeature.CLOSE
+    | cover.CoverEntityFeature.STOP
+)
+
+
+async def call_service(hass: HomeAssistant, entity_id, service, **kwargs):
+    """Call a service."""
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        service,
+        {"entity_id": entity_id, **kwargs},
+        blocking=True,
+    )
+
+
+async def test_cover_features(
+    hass: HomeAssistant, mqtt_mock: MqttMockHAClient, setup_pglab
+) -> None:
+    """Test cover features."""
+    topic = "pglab/discovery/E-Board-DD53AC85/config"
+    payload = {
+        "ip": "192.168.1.16",
+        "mac": "80:34:28:1B:18:5A",
+        "name": "test",
+        "hw": "1.0.7",
+        "fw": "1.0.0",
+        "type": "E-Board",
+        "id": "E-Board-DD53AC85",
+        "manufacturer": "PG LAB Electronics",
+        "params": {"shutters": 4, "boards": "10000000"},
+    }
+
+    async_fire_mqtt_message(
+        hass,
+        topic,
+        json.dumps(payload),
+    )
+    await hass.async_block_till_done()
+
+    assert len(hass.states.async_all("cover")) == 4
+
+    for i in range(4):
+        cover = hass.states.get(f"cover.test_shutter_{i}")
+        assert cover
+        assert cover.attributes["supported_features"] == COVER_FEATURES
+
+
+async def test_cover_availability(
+    hass: HomeAssistant, mqtt_mock: MqttMockHAClient, setup_pglab
+) -> None:
+    """Check if covers are properly created."""
+    topic = "pglab/discovery/E-Board-DD53AC85/config"
+    payload = {
+        "ip": "192.168.1.16",
+        "mac": "80:34:28:1B:18:5A",
+        "name": "test",
+        "hw": "1.0.7",
+        "fw": "1.0.0",
+        "type": "E-Board",
+        "id": "E-Board-DD53AC85",
+        "manufacturer": "PG LAB Electronics",
+        "params": {"shutters": 6, "boards": "11000000"},
+    }
+
+    async_fire_mqtt_message(
+        hass,
+        topic,
+        json.dumps(payload),
+    )
+    await hass.async_block_till_done()
+
+    # We are creating 6 covers using two E-RELAY devices connected to E-BOARD.
+    # Now we are going to check if all covers are created and their state is unknown.
+    for i in range(5):
+        cover = hass.states.get(f"cover.test_shutter_{i}")
+        assert cover.state == STATE_UNKNOWN
+        assert not cover.attributes.get(ATTR_ASSUMED_STATE)
+
+    # The cover with id 7 should not be created.
+    cover = hass.states.get("cover.test_shutter_7")
+    assert not cover
+
+
+async def test_cover_change_state_via_mqtt(
+    hass: HomeAssistant, mqtt_mock: MqttMockHAClient, setup_pglab
+) -> None:
+    """Test state update via MQTT."""
+    topic = "pglab/discovery/E-Board-DD53AC85/config"
+    payload = {
+        "ip": "192.168.1.16",
+        "mac": "80:34:28:1B:18:5A",
+        "name": "test",
+        "hw": "1.0.7",
+        "fw": "1.0.0",
+        "type": "E-Board",
+        "id": "E-Board-DD53AC85",
+        "manufacturer": "PG LAB Electronics",
+        "params": {"shutters": 2, "boards": "10000000"},
+    }
+
+    async_fire_mqtt_message(
+        hass,
+        topic,
+        json.dumps(payload),
+    )
+    await hass.async_block_till_done()
+
+    # Check initial state is unknown
+    cover = hass.states.get("cover.test_shutter_0")
+    assert cover.state == STATE_UNKNOWN
+    assert not cover.attributes.get(ATTR_ASSUMED_STATE)
+
+    # Simulate the device responds sending mqtt messages and check if the cover state
+    # change appropriately.
+
+    async_fire_mqtt_message(hass, "pglab/test/shutter/0/state", "OPEN")
+    await hass.async_block_till_done()
+    cover = hass.states.get("cover.test_shutter_0")
+    assert not cover.attributes.get(ATTR_ASSUMED_STATE)
+    assert cover.state == STATE_OPEN
+
+    async_fire_mqtt_message(hass, "pglab/test/shutter/0/state", "OPENING")
+    await hass.async_block_till_done()
+    cover = hass.states.get("cover.test_shutter_0")
+    assert cover.state == STATE_OPENING
+
+    async_fire_mqtt_message(hass, "pglab/test/shutter/0/state", "CLOSING")
+    await hass.async_block_till_done()
+    cover = hass.states.get("cover.test_shutter_0")
+    assert cover.state == STATE_CLOSING
+
+    async_fire_mqtt_message(hass, "pglab/test/shutter/0/state", "CLOSED")
+    await hass.async_block_till_done()
+    cover = hass.states.get("cover.test_shutter_0")
+    assert cover.state == STATE_CLOSED
+
+
+async def test_cover_mqtt_state_by_calling_service(
+    hass: HomeAssistant, mqtt_mock: MqttMockHAClient, setup_pglab
+) -> None:
+    """Calling service to OPEN/CLOSE cover and check mqtt state."""
+    topic = "pglab/discovery/E-Board-DD53AC85/config"
+    payload = {
+        "ip": "192.168.1.16",
+        "mac": "80:34:28:1B:18:5A",
+        "name": "test",
+        "hw": "1.0.7",
+        "fw": "1.0.0",
+        "type": "E-Board",
+        "id": "E-Board-DD53AC85",
+        "manufacturer": "PG LAB Electronics",
+        "params": {"shutters": 2, "boards": "10000000"},
+    }
+
+    async_fire_mqtt_message(
+        hass,
+        topic,
+        json.dumps(payload),
+    )
+    await hass.async_block_till_done()
+
+    cover = hass.states.get("cover.test_shutter_0")
+    assert cover.state == STATE_UNKNOWN
+    assert not cover.attributes.get(ATTR_ASSUMED_STATE)
+
+    # Call HA covers services and verify that the MQTT messages are sent correctly
+
+    await call_service(hass, "cover.test_shutter_0", SERVICE_OPEN_COVER)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "pglab/test/shutter/0/set", "OPEN", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+    await call_service(hass, "cover.test_shutter_0", SERVICE_STOP_COVER)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "pglab/test/shutter/0/set", "STOP", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+    await call_service(hass, "cover.test_shutter_0", SERVICE_CLOSE_COVER)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "pglab/test/shutter/0/set", "CLOSE", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
diff --git a/tests/components/pglab/test_discovery.py b/tests/components/pglab/test_discovery.py
new file mode 100644
index 00000000000..65716236277
--- /dev/null
+++ b/tests/components/pglab/test_discovery.py
@@ -0,0 +1,154 @@
+"""The tests for the PG LAB Electronics  discovery device."""
+
+import json
+
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr
+
+from tests.common import async_fire_mqtt_message
+from tests.typing import MqttMockHAClient
+
+
+async def test_device_discover(
+    hass: HomeAssistant,
+    mqtt_mock: MqttMockHAClient,
+    device_reg,
+    entity_reg,
+    setup_pglab,
+) -> None:
+    """Test setting up a device."""
+    topic = "pglab/discovery/E-Board-DD53AC85/config"
+    payload = {
+        "ip": "192.168.1.16",
+        "mac": "80:34:28:1B:18:5A",
+        "name": "test",
+        "hw": "1.0.7",
+        "fw": "1.0.0",
+        "type": "E-Board",
+        "id": "E-Board-DD53AC85",
+        "manufacturer": "PG LAB Electronics",
+        "params": {"shutters": 0, "boards": "11000000"},
+    }
+
+    async_fire_mqtt_message(
+        hass,
+        topic,
+        json.dumps(payload),
+    )
+    await hass.async_block_till_done()
+
+    # Verify device and registry entries are created
+    device_entry = device_reg.async_get_device(
+        connections={(dr.CONNECTION_NETWORK_MAC, payload["mac"])}
+    )
+    assert device_entry is not None
+    assert device_entry.configuration_url == f"http://{payload['ip']}/"
+    assert device_entry.manufacturer == "PG LAB Electronics"
+    assert device_entry.model == payload["type"]
+    assert device_entry.name == payload["name"]
+    assert device_entry.sw_version == payload["fw"]
+
+
+async def test_device_update(
+    hass: HomeAssistant,
+    mqtt_mock: MqttMockHAClient,
+    device_reg,
+    entity_reg,
+    setup_pglab,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test update a device."""
+    topic = "pglab/discovery/E-Board-DD53AC85/config"
+    payload = {
+        "ip": "192.168.1.16",
+        "mac": "80:34:28:1B:18:5A",
+        "name": "test",
+        "hw": "1.0.7",
+        "fw": "1.0.0",
+        "type": "E-Board",
+        "id": "E-Board-DD53AC85",
+        "manufacturer": "PG LAB Electronics",
+        "params": {"shutters": 0, "boards": "11000000"},
+    }
+
+    async_fire_mqtt_message(
+        hass,
+        topic,
+        json.dumps(payload),
+    )
+    await hass.async_block_till_done()
+
+    # Verify device is created
+    device_entry = device_reg.async_get_device(
+        connections={(dr.CONNECTION_NETWORK_MAC, payload["mac"])}
+    )
+    assert device_entry is not None
+
+    # update device
+    payload["fw"] = "1.0.1"
+    payload["hw"] = "1.0.8"
+
+    async_fire_mqtt_message(
+        hass,
+        topic,
+        json.dumps(payload),
+    )
+    await hass.async_block_till_done()
+
+    # Verify device is created
+    device_entry = device_reg.async_get_device(
+        connections={(dr.CONNECTION_NETWORK_MAC, payload["mac"])}
+    )
+    assert device_entry is not None
+    assert device_entry.sw_version == "1.0.1"
+    assert device_entry.hw_version == "1.0.8"
+
+
+async def test_device_remove(
+    hass: HomeAssistant,
+    mqtt_mock: MqttMockHAClient,
+    device_reg,
+    entity_reg,
+    setup_pglab,
+) -> None:
+    """Test remove a device."""
+    topic = "pglab/discovery/E-Board-DD53AC85/config"
+    payload = {
+        "ip": "192.168.1.16",
+        "mac": "80:34:28:1B:18:5A",
+        "name": "test",
+        "hw": "1.0.7",
+        "fw": "1.0.0",
+        "type": "E-Board",
+        "id": "E-Board-DD53AC85",
+        "manufacturer": "PG LAB Electronics",
+        "params": {"shutters": 0, "boards": "11000000"},
+    }
+
+    async_fire_mqtt_message(
+        hass,
+        topic,
+        json.dumps(payload),
+    )
+    await hass.async_block_till_done()
+
+    # Verify device is created
+    device_entry = device_reg.async_get_device(
+        connections={(dr.CONNECTION_NETWORK_MAC, payload["mac"])}
+    )
+    assert device_entry is not None
+
+    async_fire_mqtt_message(
+        hass,
+        topic,
+        "",
+    )
+    await hass.async_block_till_done()
+
+    # Verify device entry is removed
+    device_entry = device_reg.async_get_device(
+        connections={(dr.CONNECTION_NETWORK_MAC, payload["mac"])}
+    )
+    assert device_entry is None
diff --git a/tests/components/pglab/test_init.py b/tests/components/pglab/test_init.py
new file mode 100644
index 00000000000..a6353054e8c
--- /dev/null
+++ b/tests/components/pglab/test_init.py
@@ -0,0 +1 @@
+"""Test the PG LAB Electronics integration."""
diff --git a/tests/components/pglab/test_sensor.py b/tests/components/pglab/test_sensor.py
new file mode 100644
index 00000000000..ff20d1452a4
--- /dev/null
+++ b/tests/components/pglab/test_sensor.py
@@ -0,0 +1,71 @@
+"""The tests for the PG LAB Electronics sensor."""
+
+import json
+
+from freezegun import freeze_time
+import pytest
+from syrupy import SnapshotAssertion
+
+from homeassistant.core import HomeAssistant
+
+from tests.common import async_fire_mqtt_message
+from tests.typing import MqttMockHAClient
+
+
+async def send_discovery_message(hass: HomeAssistant) -> None:
+    """Send mqtt discovery message."""
+
+    topic = "pglab/discovery/E-Board-DD53AC85/config"
+    payload = {
+        "ip": "192.168.1.16",
+        "mac": "80:34:28:1B:18:5A",
+        "name": "test",
+        "hw": "1.0.7",
+        "fw": "1.0.0",
+        "type": "E-Board",
+        "id": "E-Board-DD53AC85",
+        "manufacturer": "PG LAB Electronics",
+        "params": {"shutters": 0, "boards": "00000000"},
+    }
+
+    async_fire_mqtt_message(
+        hass,
+        topic,
+        json.dumps(payload),
+    )
+    await hass.async_block_till_done()
+
+
+@freeze_time("2024-02-26 01:21:34")
+@pytest.mark.parametrize(
+    "sensor_suffix",
+    [
+        "temperature",
+        "mpu_voltage",
+        "run_time",
+    ],
+)
+async def test_sensors(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    mqtt_mock: MqttMockHAClient,
+    setup_pglab,
+    sensor_suffix: str,
+) -> None:
+    """Check if sensors are properly created and updated."""
+
+    # send the discovery message to make E-BOARD device discoverable
+    await send_discovery_message(hass)
+
+    # check initial sensors state
+    state = hass.states.get(f"sensor.test_{sensor_suffix}")
+    assert state == snapshot(name=f"initial_sensor_{sensor_suffix}")
+
+    # update sensors value via mqtt
+    update_payload = {"temp": 33.4, "volt": 3.31, "rtime": 1000}
+    async_fire_mqtt_message(hass, "pglab/test/sensor/value", json.dumps(update_payload))
+    await hass.async_block_till_done()
+
+    # check updated sensors state
+    state = hass.states.get(f"sensor.test_{sensor_suffix}")
+    assert state == snapshot(name=f"updated_sensor_{sensor_suffix}")
diff --git a/tests/components/pglab/test_switch.py b/tests/components/pglab/test_switch.py
new file mode 100644
index 00000000000..fef445f80f3
--- /dev/null
+++ b/tests/components/pglab/test_switch.py
@@ -0,0 +1,318 @@
+"""The tests for the PG LAB Electronics switch."""
+
+from datetime import timedelta
+import json
+
+from homeassistant import config_entries
+from homeassistant.components.switch import (
+    DOMAIN as SWITCH_DOMAIN,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+)
+from homeassistant.const import (
+    ATTR_ASSUMED_STATE,
+    ATTR_ENTITY_ID,
+    STATE_OFF,
+    STATE_ON,
+    STATE_UNKNOWN,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+from homeassistant.util import dt as dt_util
+
+from tests.common import async_fire_mqtt_message, async_fire_time_changed
+from tests.typing import MqttMockHAClient
+
+
+async def call_service(hass: HomeAssistant, entity_id, service, **kwargs):
+    """Call a service."""
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        service,
+        {ATTR_ENTITY_ID: entity_id, **kwargs},
+        blocking=True,
+    )
+
+
+async def test_available_relay(
+    hass: HomeAssistant, mqtt_mock: MqttMockHAClient, setup_pglab
+) -> None:
+    """Check if relay are properly created when two E-Relay boards are connected."""
+    topic = "pglab/discovery/E-Board-DD53AC85/config"
+    payload = {
+        "ip": "192.168.1.16",
+        "mac": "80:34:28:1B:18:5A",
+        "name": "test",
+        "hw": "1.0.7",
+        "fw": "1.0.0",
+        "type": "E-Board",
+        "id": "E-Board-DD53AC85",
+        "manufacturer": "PG LAB Electronics",
+        "params": {"shutters": 0, "boards": "11000000"},
+    }
+
+    async_fire_mqtt_message(
+        hass,
+        topic,
+        json.dumps(payload),
+    )
+    await hass.async_block_till_done()
+
+    for i in range(16):
+        state = hass.states.get(f"switch.test_relay_{i}")
+        assert state.state == STATE_UNKNOWN
+        assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+
+async def test_change_state_via_mqtt(
+    hass: HomeAssistant, mqtt_mock: MqttMockHAClient, setup_pglab
+) -> None:
+    """Test state update via MQTT."""
+    topic = "pglab/discovery/E-Board-DD53AC85/config"
+    payload = {
+        "ip": "192.168.1.16",
+        "mac": "80:34:28:1B:18:5A",
+        "name": "test",
+        "hw": "1.0.7",
+        "fw": "1.0.0",
+        "type": "E-Board",
+        "id": "E-Board-DD53AC85",
+        "manufacturer": "PG LAB Electronics",
+        "params": {"shutters": 0, "boards": "10000000"},
+    }
+
+    async_fire_mqtt_message(
+        hass,
+        topic,
+        json.dumps(payload),
+    )
+    await hass.async_block_till_done()
+
+    # Simulate response from the device
+    state = hass.states.get("switch.test_relay_0")
+    assert state.state == STATE_UNKNOWN
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    # Turn relay OFF
+    async_fire_mqtt_message(hass, "pglab/test/relay/0/state", "OFF")
+    await hass.async_block_till_done()
+    state = hass.states.get("switch.test_relay_0")
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+    assert state.state == STATE_OFF
+
+    # Turn relay ON
+    async_fire_mqtt_message(hass, "pglab/test/relay/0/state", "ON")
+    await hass.async_block_till_done()
+    state = hass.states.get("switch.test_relay_0")
+    assert state.state == STATE_ON
+
+    # Turn relay OFF
+    async_fire_mqtt_message(hass, "pglab/test/relay/0/state", "OFF")
+    await hass.async_block_till_done()
+    state = hass.states.get("switch.test_relay_0")
+    assert state.state == STATE_OFF
+
+    # Turn relay ON
+    async_fire_mqtt_message(hass, "pglab/test/relay/0/state", "ON")
+    await hass.async_block_till_done()
+    state = hass.states.get("switch.test_relay_0")
+    assert state.state == STATE_ON
+
+
+async def test_mqtt_state_by_calling_service(
+    hass: HomeAssistant, mqtt_mock: MqttMockHAClient, setup_pglab
+) -> None:
+    """Calling service to turn ON/OFF relay and check mqtt state."""
+    topic = "pglab/discovery/E-Board-DD53AC85/config"
+    payload = {
+        "ip": "192.168.1.16",
+        "mac": "80:34:28:1B:18:5A",
+        "name": "test",
+        "hw": "1.0.7",
+        "fw": "1.0.0",
+        "type": "E-Board",
+        "id": "E-Board-DD53AC85",
+        "manufacturer": "PG LAB Electronics",
+        "params": {"shutters": 0, "boards": "10000000"},
+    }
+
+    async_fire_mqtt_message(
+        hass,
+        topic,
+        json.dumps(payload),
+    )
+    await hass.async_block_till_done()
+
+    # Turn relay ON
+    await call_service(hass, "switch.test_relay_0", SERVICE_TURN_ON)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "pglab/test/relay/0/set", "ON", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+    # Turn relay OFF
+    await call_service(hass, "switch.test_relay_0", SERVICE_TURN_OFF)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "pglab/test/relay/0/set", "OFF", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+    # Turn relay ON
+    await call_service(hass, "switch.test_relay_3", SERVICE_TURN_ON)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "pglab/test/relay/3/set", "ON", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+    # Turn relay OFF
+    await call_service(hass, "switch.test_relay_3", SERVICE_TURN_OFF)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "pglab/test/relay/3/set", "OFF", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+
+async def test_discovery_update(
+    hass: HomeAssistant, mqtt_mock: MqttMockHAClient, setup_pglab
+) -> None:
+    """Update discovery message and  check if relay are property updated."""
+
+    # publish the first discovery message
+    topic = "pglab/discovery/E-Board-DD53AC85/config"
+    payload = {
+        "ip": "192.168.1.16",
+        "mac": "80:34:28:1B:18:5A",
+        "name": "first_test",
+        "hw": "1.0.7",
+        "fw": "1.0.0",
+        "type": "E-Board",
+        "id": "E-Board-DD53AC85",
+        "manufacturer": "PG LAB Electronics",
+        "params": {"shutters": 0, "boards": "10000000"},
+    }
+
+    async_fire_mqtt_message(
+        hass,
+        topic,
+        json.dumps(payload),
+    )
+    await hass.async_block_till_done()
+
+    # test the available relay in the first configuration
+    for i in range(8):
+        state = hass.states.get(f"switch.first_test_relay_{i}")
+        assert state.state == STATE_UNKNOWN
+        assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    # prepare a new message ... the same device but renamed
+    # and with different relay configuration
+    topic = "pglab/discovery/E-Board-DD53AC85/config"
+    payload = {
+        "ip": "192.168.1.16",
+        "mac": "80:34:28:1B:18:5A",
+        "name": "second_test",
+        "hw": "1.0.7",
+        "fw": "1.0.0",
+        "type": "E-Board",
+        "id": "E-Board-DD53AC85",
+        "manufacturer": "PG LAB Electronics",
+        "params": {"shutters": 0, "boards": "11000000"},
+    }
+
+    async_fire_mqtt_message(
+        hass,
+        topic,
+        json.dumps(payload),
+    )
+    await hass.async_block_till_done()
+
+    # be sure that old relay are been removed
+    for i in range(8):
+        assert not hass.states.get(f"switch.first_test_relay_{i}")
+
+    # check new relay
+    for i in range(16):
+        state = hass.states.get(f"switch.second_test_relay_{i}")
+        assert state.state == STATE_UNKNOWN
+        assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+
+async def test_disable_entity_state_change_via_mqtt(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    mqtt_mock: MqttMockHAClient,
+    setup_pglab,
+) -> None:
+    """Test state update via MQTT of disable entity."""
+
+    topic = "pglab/discovery/E-Board-DD53AC85/config"
+    payload = {
+        "ip": "192.168.1.16",
+        "mac": "80:34:28:1B:18:5A",
+        "name": "test",
+        "hw": "1.0.7",
+        "fw": "1.0.0",
+        "type": "E-Board",
+        "id": "E-Board-DD53AC85",
+        "manufacturer": "PG LAB Electronics",
+        "params": {"shutters": 0, "boards": "10000000"},
+    }
+
+    async_fire_mqtt_message(
+        hass,
+        topic,
+        json.dumps(payload),
+    )
+    await hass.async_block_till_done()
+
+    # Be sure that the entity relay_0 is available
+    state = hass.states.get("switch.test_relay_0")
+    assert state.state == STATE_UNKNOWN
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    # Disable entity relay_0
+    new_status = entity_registry.async_update_entity(
+        "switch.test_relay_0", disabled_by=er.RegistryEntryDisabler.USER
+    )
+
+    # Be sure that the entity is disabled
+    assert new_status.disabled is True
+
+    # Try to change the state of the disabled relay_0
+    async_fire_mqtt_message(hass, "pglab/test/relay/0/state", "ON")
+    await hass.async_block_till_done()
+
+    # Enable entity relay_0
+    new_status = entity_registry.async_update_entity(
+        "switch.test_relay_0", disabled_by=None
+    )
+
+    # Be sure that the entity is enabled
+    assert new_status.disabled is False
+
+    async_fire_time_changed(
+        hass,
+        dt_util.utcnow()
+        + timedelta(seconds=config_entries.RELOAD_AFTER_UPDATE_DELAY + 1),
+    )
+    await hass.async_block_till_done()
+
+    # Re-send the discovery message
+    async_fire_mqtt_message(
+        hass,
+        topic,
+        json.dumps(payload),
+    )
+    await hass.async_block_till_done()
+
+    # Be sure that the state is not changed
+    state = hass.states.get("switch.test_relay_0")
+    assert state.state == STATE_UNKNOWN
+
+    # Try again to change the state of the disabled relay_0
+    async_fire_mqtt_message(hass, "pglab/test/relay/0/state", "ON")
+    await hass.async_block_till_done()
+
+    # Be sure that the state is been updated
+    state = hass.states.get("switch.test_relay_0")
+    assert state.state == STATE_ON
diff --git a/tests/components/philips_js/snapshots/test_diagnostics.ambr b/tests/components/philips_js/snapshots/test_diagnostics.ambr
index 4f7a6176634..53db95f0534 100644
--- a/tests/components/philips_js/snapshots/test_diagnostics.ambr
+++ b/tests/components/philips_js/snapshots/test_diagnostics.ambr
@@ -94,6 +94,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': '**REDACTED**',
       'unique_id': '**REDACTED**',
       'version': 1,
diff --git a/tests/components/philips_js/test_config_flow.py b/tests/components/philips_js/test_config_flow.py
index 80d05961813..4b8048a8ebe 100644
--- a/tests/components/philips_js/test_config_flow.py
+++ b/tests/components/philips_js/test_config_flow.py
@@ -155,6 +155,7 @@ async def test_pairing(hass: HomeAssistant, mock_tv_pairable, mock_setup_entry)
         "version": 1,
         "options": {},
         "minor_version": 1,
+        "subentries": (),
     }
 
     await hass.async_block_till_done()
diff --git a/tests/components/pi_hole/snapshots/test_diagnostics.ambr b/tests/components/pi_hole/snapshots/test_diagnostics.ambr
index 3094fcef24b..2d6f6687d04 100644
--- a/tests/components/pi_hole/snapshots/test_diagnostics.ambr
+++ b/tests/components/pi_hole/snapshots/test_diagnostics.ambr
@@ -33,6 +33,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': None,
       'version': 1,
diff --git a/tests/components/picnic/test_config_flow.py b/tests/components/picnic/test_config_flow.py
index 8d668b28c16..ba4c36682e1 100644
--- a/tests/components/picnic/test_config_flow.py
+++ b/tests/components/picnic/test_config_flow.py
@@ -3,7 +3,7 @@
 from unittest.mock import patch
 
 import pytest
-from python_picnic_api.session import PicnicAuthError
+from python_picnic_api2.session import PicnicAuthError
 import requests
 
 from homeassistant import config_entries
diff --git a/tests/components/ping/snapshots/test_binary_sensor.ambr b/tests/components/ping/snapshots/test_binary_sensor.ambr
index 0196c2cbbfb..bb28432841f 100644
--- a/tests/components/ping/snapshots/test_binary_sensor.ambr
+++ b/tests/components/ping/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ping/snapshots/test_sensor.ambr b/tests/components/ping/snapshots/test_sensor.ambr
index d1548f7559c..6b86c327863 100644
--- a/tests/components/ping/snapshots/test_sensor.ambr
+++ b/tests/components/ping/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -25,7 +26,7 @@
     }),
     'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
     'original_icon': None,
-    'original_name': 'Round Trip Time Average',
+    'original_name': 'Round-trip time average',
     'platform': 'ping',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -37,7 +38,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': '10.10.10.10 Round Trip Time Average',
+      'friendly_name': '10.10.10.10 Round-trip time average',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfTime.MILLISECONDS: 'ms'>,
     }),
@@ -58,6 +59,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -75,7 +77,7 @@
     }),
     'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
     'original_icon': None,
-    'original_name': 'Round Trip Time Maximum',
+    'original_name': 'Round-trip time maximum',
     'platform': 'ping',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -87,7 +89,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': '10.10.10.10 Round Trip Time Maximum',
+      'friendly_name': '10.10.10.10 Round-trip time maximum',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfTime.MILLISECONDS: 'ms'>,
     }),
@@ -114,6 +116,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -131,7 +134,7 @@
     }),
     'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
     'original_icon': None,
-    'original_name': 'Round Trip Time Minimum',
+    'original_name': 'Round-trip time minimum',
     'platform': 'ping',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -143,7 +146,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': '10.10.10.10 Round Trip Time Minimum',
+      'friendly_name': '10.10.10.10 Round-trip time minimum',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfTime.MILLISECONDS: 'ms'>,
     }),
diff --git a/tests/components/plaato/snapshots/test_binary_sensor.ambr b/tests/components/plaato/snapshots/test_binary_sensor.ambr
index e8db3bf32d8..76c0a299c5e 100644
--- a/tests/components/plaato/snapshots/test_binary_sensor.ambr
+++ b/tests/components/plaato/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -56,6 +57,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/plaato/snapshots/test_sensor.ambr b/tests/components/plaato/snapshots/test_sensor.ambr
index 110ffb04ba9..24ba62e28ca 100644
--- a/tests/components/plaato/snapshots/test_sensor.ambr
+++ b/tests/components/plaato/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -99,6 +101,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -146,6 +149,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -193,6 +197,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -239,6 +244,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -286,6 +292,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -333,6 +340,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -379,6 +387,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -428,6 +437,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -478,6 +488,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -528,6 +539,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/plex/helpers.py b/tests/components/plex/helpers.py
index 434c31996e4..4dc80d3e7aa 100644
--- a/tests/components/plex/helpers.py
+++ b/tests/components/plex/helpers.py
@@ -7,7 +7,7 @@ from plexwebsocket import SIGNAL_CONNECTION_STATE, STATE_CONNECTED
 
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.typing import UNDEFINED, UndefinedType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
diff --git a/tests/components/plex/test_init.py b/tests/components/plex/test_init.py
index 490091998ff..036b2d87f3f 100644
--- a/tests/components/plex/test_init.py
+++ b/tests/components/plex/test_init.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
     STATE_PLAYING,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import DEFAULT_DATA, DEFAULT_OPTIONS, PLEX_DIRECT_URL
 from .helpers import trigger_plex_update, wait_for_debouncer
diff --git a/tests/components/plugwise/conftest.py b/tests/components/plugwise/conftest.py
index 92ed42aa03a..e0a61106101 100644
--- a/tests/components/plugwise/conftest.py
+++ b/tests/components/plugwise/conftest.py
@@ -8,7 +8,6 @@ from typing import Any
 from unittest.mock import AsyncMock, MagicMock, patch
 
 from packaging.version import Version
-from plugwise import PlugwiseData
 import pytest
 
 from homeassistant.components.plugwise.const import DOMAIN
@@ -30,6 +29,15 @@ def _read_json(environment: str, call: str) -> dict[str, Any]:
     return json.loads(fixture)
 
 
+@pytest.fixture
+def cooling_present(request: pytest.FixtureRequest) -> str:
+    """Pass the cooling_present boolean.
+
+    Used with fixtures that require parametrization of the cooling capability.
+    """
+    return request.param
+
+
 @pytest.fixture
 def chosen_env(request: pytest.FixtureRequest) -> str:
     """Pass the chosen_env string.
@@ -48,6 +56,24 @@ def gateway_id(request: pytest.FixtureRequest) -> str:
     return request.param
 
 
+@pytest.fixture
+def heater_id(request: pytest.FixtureRequest) -> str:
+    """Pass the heater_idstring.
+
+    Used with fixtures that require parametrization of the heater_id.
+    """
+    return request.param
+
+
+@pytest.fixture
+def reboot(request: pytest.FixtureRequest) -> str:
+    """Pass the reboot boolean.
+
+    Used with fixtures that require parametrization of the reboot capability.
+    """
+    return request.param
+
+
 @pytest.fixture
 def mock_config_entry() -> MockConfigEntry:
     """Return the default mocked config entry."""
@@ -82,11 +108,14 @@ def mock_smile_config_flow() -> Generator[MagicMock]:
         autospec=True,
     ) as smile_mock:
         smile = smile_mock.return_value
+
+        smile.connect.return_value = Version("4.3.2")
         smile.smile_hostname = "smile12345"
         smile.smile_model = "Test Model"
         smile.smile_model_id = "Test Model ID"
         smile.smile_name = "Test Smile Name"
-        smile.connect.return_value = Version("4.3.2")
+        smile.smile_version = "4.3.2"
+
         yield smile
 
 
@@ -94,7 +123,7 @@ def mock_smile_config_flow() -> Generator[MagicMock]:
 def mock_smile_adam() -> Generator[MagicMock]:
     """Create a Mock Adam environment for testing exceptions."""
     chosen_env = "m_adam_multiple_devices_per_zone"
-    all_data = _read_json(chosen_env, "all_data")
+    data = _read_json(chosen_env, "data")
     with (
         patch(
             "homeassistant.components.plugwise.coordinator.Smile", autospec=True
@@ -106,43 +135,45 @@ def mock_smile_adam() -> Generator[MagicMock]:
     ):
         smile = smile_mock.return_value
 
+        smile.async_update.return_value = data
+        smile.cooling_present = False
+        smile.connect.return_value = Version("3.0.15")
         smile.gateway_id = "fe799307f1624099878210aa0b9f1475"
         smile.heater_id = "90986d591dcd426cae3ec3e8111ff730"
-        smile.smile_version = "3.0.15"
-        smile.smile_type = "thermostat"
+        smile.reboot = True
         smile.smile_hostname = "smile98765"
         smile.smile_model = "Gateway"
         smile.smile_model_id = "smile_open_therm"
         smile.smile_name = "Adam"
-        smile.connect.return_value = Version("3.0.15")
-        smile.async_update.return_value = PlugwiseData(
-            all_data["devices"], all_data["gateway"]
-        )
+        smile.smile_type = "thermostat"
+        smile.smile_version = "3.0.15"
 
         yield smile
 
 
 @pytest.fixture
-def mock_smile_adam_heat_cool(chosen_env: str) -> Generator[MagicMock]:
+def mock_smile_adam_heat_cool(
+    chosen_env: str, cooling_present: bool
+) -> Generator[MagicMock]:
     """Create a special base Mock Adam type for testing with different datasets."""
-    all_data = _read_json(chosen_env, "all_data")
+    data = _read_json(chosen_env, "data")
     with patch(
         "homeassistant.components.plugwise.coordinator.Smile", autospec=True
     ) as smile_mock:
         smile = smile_mock.return_value
 
-        smile.async_update.return_value = PlugwiseData(
-            all_data["devices"], all_data["gateway"]
-        )
+        smile.async_update.return_value = data
         smile.connect.return_value = Version("3.6.4")
+        smile.cooling_present = cooling_present
         smile.gateway_id = "da224107914542988a88561b4452b0f6"
         smile.heater_id = "056ee145a816487eaa69243c3280f8bf"
-        smile.smile_version = "3.6.4"
-        smile.smile_type = "thermostat"
+        smile.reboot = True
         smile.smile_hostname = "smile98765"
         smile.smile_model = "Gateway"
         smile.smile_model_id = "smile_open_therm"
         smile.smile_name = "Adam"
+        smile.smile_type = "thermostat"
+        smile.smile_version = "3.6.4"
 
         yield smile
 
@@ -151,49 +182,49 @@ def mock_smile_adam_heat_cool(chosen_env: str) -> Generator[MagicMock]:
 def mock_smile_adam_jip() -> Generator[MagicMock]:
     """Create a Mock adam-jip type for testing exceptions."""
     chosen_env = "m_adam_jip"
-    all_data = _read_json(chosen_env, "all_data")
+    data = _read_json(chosen_env, "data")
     with patch(
         "homeassistant.components.plugwise.coordinator.Smile", autospec=True
     ) as smile_mock:
         smile = smile_mock.return_value
 
+        smile.async_update.return_value = data
+        smile.connect.return_value = Version("3.2.8")
+        smile.cooling_present = False
         smile.gateway_id = "b5c2386c6f6342669e50fe49dd05b188"
         smile.heater_id = "e4684553153b44afbef2200885f379dc"
-        smile.smile_version = "3.2.8"
-        smile.smile_type = "thermostat"
+        smile.reboot = True
         smile.smile_hostname = "smile98765"
         smile.smile_model = "Gateway"
         smile.smile_model_id = "smile_open_therm"
         smile.smile_name = "Adam"
-        smile.connect.return_value = Version("3.2.8")
-        smile.async_update.return_value = PlugwiseData(
-            all_data["devices"], all_data["gateway"]
-        )
+        smile.smile_type = "thermostat"
+        smile.smile_version = "3.2.8"
 
         yield smile
 
 
 @pytest.fixture
-def mock_smile_anna(chosen_env: str) -> Generator[MagicMock]:
+def mock_smile_anna(chosen_env: str, cooling_present: bool) -> Generator[MagicMock]:
     """Create a Mock Anna type for testing."""
-    all_data = _read_json(chosen_env, "all_data")
+    data = _read_json(chosen_env, "data")
     with patch(
         "homeassistant.components.plugwise.coordinator.Smile", autospec=True
     ) as smile_mock:
         smile = smile_mock.return_value
 
-        smile.async_update.return_value = PlugwiseData(
-            all_data["devices"], all_data["gateway"]
-        )
+        smile.async_update.return_value = data
         smile.connect.return_value = Version("4.0.15")
+        smile.cooling_present = cooling_present
         smile.gateway_id = "015ae9ea3f964e668e490fa39da3870b"
         smile.heater_id = "1cbf783bb11e4a7c8a6843dee3a86927"
-        smile.smile_version = "4.0.15"
-        smile.smile_type = "thermostat"
+        smile.reboot = True
         smile.smile_hostname = "smile98765"
         smile.smile_model = "Gateway"
         smile.smile_model_id = "smile_thermo"
         smile.smile_name = "Smile Anna"
+        smile.smile_type = "thermostat"
+        smile.smile_version = "4.0.15"
 
         yield smile
 
@@ -201,18 +232,17 @@ def mock_smile_anna(chosen_env: str) -> Generator[MagicMock]:
 @pytest.fixture
 def mock_smile_p1(chosen_env: str, gateway_id: str) -> Generator[MagicMock]:
     """Create a base Mock P1 type for testing with different datasets and gateway-ids."""
-    all_data = _read_json(chosen_env, "all_data")
+    data = _read_json(chosen_env, "data")
     with patch(
         "homeassistant.components.plugwise.coordinator.Smile", autospec=True
     ) as smile_mock:
         smile = smile_mock.return_value
 
-        smile.async_update.return_value = PlugwiseData(
-            all_data["devices"], all_data["gateway"]
-        )
+        smile.async_update.return_value = data
         smile.connect.return_value = Version("4.4.2")
         smile.gateway_id = gateway_id
         smile.heater_id = None
+        smile.reboot = True
         smile.smile_hostname = "smile98765"
         smile.smile_model = "Gateway"
         smile.smile_model_id = "smile"
@@ -227,24 +257,23 @@ def mock_smile_p1(chosen_env: str, gateway_id: str) -> Generator[MagicMock]:
 def mock_smile_legacy_anna() -> Generator[MagicMock]:
     """Create a Mock legacy Anna environment for testing exceptions."""
     chosen_env = "legacy_anna"
-    all_data = _read_json(chosen_env, "all_data")
+    data = _read_json(chosen_env, "data")
     with patch(
         "homeassistant.components.plugwise.coordinator.Smile", autospec=True
     ) as smile_mock:
         smile = smile_mock.return_value
 
+        smile.async_update.return_value = data
+        smile.connect.return_value = Version("1.8.22")
         smile.gateway_id = "0000aaaa0000aaaa0000aaaa0000aa00"
         smile.heater_id = "04e4cbfe7f4340f090f85ec3b9e6a950"
-        smile.smile_version = "1.8.22"
-        smile.smile_type = "thermostat"
+        smile.reboot = False
         smile.smile_hostname = "smile98765"
         smile.smile_model = "Gateway"
         smile.smile_model_id = None
         smile.smile_name = "Smile Anna"
-        smile.connect.return_value = Version("1.8.22")
-        smile.async_update.return_value = PlugwiseData(
-            all_data["devices"], all_data["gateway"]
-        )
+        smile.smile_type = "thermostat"
+        smile.smile_version = "1.8.22"
 
         yield smile
 
@@ -253,24 +282,23 @@ def mock_smile_legacy_anna() -> Generator[MagicMock]:
 def mock_stretch() -> Generator[MagicMock]:
     """Create a Mock Stretch environment for testing exceptions."""
     chosen_env = "stretch_v31"
-    all_data = _read_json(chosen_env, "all_data")
+    data = _read_json(chosen_env, "data")
     with patch(
         "homeassistant.components.plugwise.coordinator.Smile", autospec=True
     ) as smile_mock:
         smile = smile_mock.return_value
 
+        smile.async_update.return_value = data
+        smile.connect.return_value = Version("3.1.11")
         smile.gateway_id = "259882df3c05415b99c2d962534ce820"
         smile.heater_id = None
-        smile.smile_version = "3.1.11"
-        smile.smile_type = "stretch"
+        smile.reboot = False
         smile.smile_hostname = "stretch98765"
         smile.smile_model = "Gateway"
         smile.smile_model_id = None
         smile.smile_name = "Stretch"
-        smile.connect.return_value = Version("3.1.11")
-        smile.async_update.return_value = PlugwiseData(
-            all_data["devices"], all_data["gateway"]
-        )
+        smile.smile_type = "stretch"
+        smile.smile_version = "3.1.11"
 
         yield smile
 
diff --git a/tests/components/plugwise/fixtures/anna_heatpump_heating/data.json b/tests/components/plugwise/fixtures/anna_heatpump_heating/data.json
new file mode 100644
index 00000000000..ab6bdf08e95
--- /dev/null
+++ b/tests/components/plugwise/fixtures/anna_heatpump_heating/data.json
@@ -0,0 +1,97 @@
+{
+  "015ae9ea3f964e668e490fa39da3870b": {
+    "binary_sensors": {
+      "plugwise_notification": false
+    },
+    "dev_class": "gateway",
+    "firmware": "4.0.15",
+    "hardware": "AME Smile 2.0 board",
+    "location": "a57efe5f145f498c9be62a9b63626fbf",
+    "mac_address": "012345670001",
+    "model": "Gateway",
+    "model_id": "smile_thermo",
+    "name": "Smile Anna",
+    "notifications": {},
+    "sensors": {
+      "outdoor_temperature": 20.2
+    },
+    "vendor": "Plugwise"
+  },
+  "1cbf783bb11e4a7c8a6843dee3a86927": {
+    "available": true,
+    "binary_sensors": {
+      "compressor_state": true,
+      "cooling_enabled": false,
+      "cooling_state": false,
+      "dhw_state": false,
+      "flame_state": false,
+      "heating_state": true,
+      "secondary_boiler_state": false
+    },
+    "dev_class": "heater_central",
+    "location": "a57efe5f145f498c9be62a9b63626fbf",
+    "max_dhw_temperature": {
+      "lower_bound": 35.0,
+      "resolution": 0.01,
+      "setpoint": 53.0,
+      "upper_bound": 60.0
+    },
+    "maximum_boiler_temperature": {
+      "lower_bound": 0.0,
+      "resolution": 1.0,
+      "setpoint": 60.0,
+      "upper_bound": 100.0
+    },
+    "model": "Generic heater/cooler",
+    "name": "OpenTherm",
+    "sensors": {
+      "dhw_temperature": 46.3,
+      "intended_boiler_temperature": 35.0,
+      "modulation_level": 52,
+      "outdoor_air_temperature": 3.0,
+      "return_temperature": 25.1,
+      "water_pressure": 1.57,
+      "water_temperature": 29.1
+    },
+    "switches": {
+      "dhw_cm_switch": false
+    },
+    "vendor": "Techneco"
+  },
+  "3cb70739631c4d17a86b8b12e8a5161b": {
+    "active_preset": "home",
+    "available_schedules": ["standaard", "off"],
+    "climate_mode": "auto",
+    "control_state": "heating",
+    "dev_class": "thermostat",
+    "firmware": "2018-02-08T11:15:53+01:00",
+    "hardware": "6539-1301-5002",
+    "location": "c784ee9fdab44e1395b8dee7d7a497d5",
+    "model": "ThermoTouch",
+    "name": "Anna",
+    "preset_modes": ["no_frost", "home", "away", "asleep", "vacation"],
+    "select_schedule": "standaard",
+    "sensors": {
+      "cooling_activation_outdoor_temperature": 21.0,
+      "cooling_deactivation_threshold": 4.0,
+      "illuminance": 86.0,
+      "setpoint_high": 30.0,
+      "setpoint_low": 20.5,
+      "temperature": 19.3
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": -0.5,
+      "upper_bound": 2.0
+    },
+    "thermostat": {
+      "lower_bound": 4.0,
+      "resolution": 0.1,
+      "setpoint_high": 30.0,
+      "setpoint_low": 20.5,
+      "upper_bound": 30.0
+    },
+    "vendor": "Plugwise"
+  }
+}
diff --git a/tests/components/plugwise/fixtures/legacy_anna/data.json b/tests/components/plugwise/fixtures/legacy_anna/data.json
new file mode 100644
index 00000000000..cc7e66fb174
--- /dev/null
+++ b/tests/components/plugwise/fixtures/legacy_anna/data.json
@@ -0,0 +1,60 @@
+{
+  "0000aaaa0000aaaa0000aaaa0000aa00": {
+    "dev_class": "gateway",
+    "firmware": "1.8.22",
+    "location": "0000aaaa0000aaaa0000aaaa0000aa00",
+    "mac_address": "01:23:45:67:89:AB",
+    "model": "Gateway",
+    "name": "Smile Anna",
+    "vendor": "Plugwise"
+  },
+  "04e4cbfe7f4340f090f85ec3b9e6a950": {
+    "binary_sensors": {
+      "flame_state": true,
+      "heating_state": true
+    },
+    "dev_class": "heater_central",
+    "location": "0000aaaa0000aaaa0000aaaa0000aa00",
+    "maximum_boiler_temperature": {
+      "lower_bound": 50.0,
+      "resolution": 1.0,
+      "setpoint": 50.0,
+      "upper_bound": 90.0
+    },
+    "model": "Generic heater",
+    "name": "OpenTherm",
+    "sensors": {
+      "dhw_temperature": 51.2,
+      "intended_boiler_temperature": 17.0,
+      "modulation_level": 0.0,
+      "return_temperature": 21.7,
+      "water_pressure": 1.2,
+      "water_temperature": 23.6
+    },
+    "vendor": "Bosch Thermotechniek B.V."
+  },
+  "0d266432d64443e283b5d708ae98b455": {
+    "active_preset": "home",
+    "climate_mode": "heat",
+    "control_state": "heating",
+    "dev_class": "thermostat",
+    "firmware": "2017-03-13T11:54:58+01:00",
+    "hardware": "6539-1301-500",
+    "location": "0000aaaa0000aaaa0000aaaa0000aa00",
+    "model": "ThermoTouch",
+    "name": "Anna",
+    "preset_modes": ["away", "vacation", "asleep", "home", "no_frost"],
+    "sensors": {
+      "illuminance": 150.8,
+      "setpoint": 20.5,
+      "temperature": 20.4
+    },
+    "thermostat": {
+      "lower_bound": 4.0,
+      "resolution": 0.1,
+      "setpoint": 20.5,
+      "upper_bound": 30.0
+    },
+    "vendor": "Plugwise"
+  }
+}
diff --git a/tests/components/plugwise/fixtures/m_adam_cooling/data.json b/tests/components/plugwise/fixtures/m_adam_cooling/data.json
new file mode 100644
index 00000000000..51f19ca3c03
--- /dev/null
+++ b/tests/components/plugwise/fixtures/m_adam_cooling/data.json
@@ -0,0 +1,203 @@
+{
+  "056ee145a816487eaa69243c3280f8bf": {
+    "available": true,
+    "binary_sensors": {
+      "cooling_state": true,
+      "dhw_state": false,
+      "flame_state": false,
+      "heating_state": false
+    },
+    "dev_class": "heater_central",
+    "location": "bc93488efab249e5bc54fd7e175a6f91",
+    "maximum_boiler_temperature": {
+      "lower_bound": 25.0,
+      "resolution": 0.01,
+      "setpoint": 50.0,
+      "upper_bound": 95.0
+    },
+    "model": "Generic heater",
+    "name": "OpenTherm",
+    "sensors": {
+      "intended_boiler_temperature": 17.5,
+      "water_temperature": 19.0
+    },
+    "switches": {
+      "dhw_cm_switch": false
+    }
+  },
+  "1772a4ea304041adb83f357b751341ff": {
+    "available": true,
+    "binary_sensors": {
+      "low_battery": false
+    },
+    "dev_class": "thermostatic_radiator_valve",
+    "firmware": "2020-11-04T01:00:00+01:00",
+    "hardware": "1",
+    "location": "f871b8c4d63549319221e294e4f88074",
+    "model": "Tom/Floor",
+    "model_id": "106-03",
+    "name": "Tom Badkamer",
+    "sensors": {
+      "battery": 99,
+      "setpoint": 18.0,
+      "temperature": 21.6,
+      "temperature_difference": -0.2,
+      "valve_position": 100
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.1,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "000D6F000C8FF5EE"
+  },
+  "ad4838d7d35c4d6ea796ee12ae5aedf8": {
+    "available": true,
+    "dev_class": "thermostat",
+    "location": "f2bf9048bef64cc5b6d5110154e33c81",
+    "model": "ThermoTouch",
+    "model_id": "143.1",
+    "name": "Anna",
+    "sensors": {
+      "setpoint": 23.5,
+      "temperature": 25.8
+    },
+    "vendor": "Plugwise"
+  },
+  "da224107914542988a88561b4452b0f6": {
+    "binary_sensors": {
+      "plugwise_notification": false
+    },
+    "dev_class": "gateway",
+    "firmware": "3.7.8",
+    "gateway_modes": ["away", "full", "vacation"],
+    "hardware": "AME Smile 2.0 board",
+    "location": "bc93488efab249e5bc54fd7e175a6f91",
+    "mac_address": "012345679891",
+    "model": "Gateway",
+    "model_id": "smile_open_therm",
+    "name": "Adam",
+    "notifications": {},
+    "regulation_modes": [
+      "bleeding_hot",
+      "bleeding_cold",
+      "off",
+      "heating",
+      "cooling"
+    ],
+    "select_gateway_mode": "full",
+    "select_regulation_mode": "cooling",
+    "sensors": {
+      "outdoor_temperature": 29.65
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "000D6F000D5A168D"
+  },
+  "e2f4322d57924fa090fbbc48b3a140dc": {
+    "available": true,
+    "binary_sensors": {
+      "low_battery": true
+    },
+    "dev_class": "zone_thermostat",
+    "firmware": "2016-10-10T02:00:00+02:00",
+    "hardware": "255",
+    "location": "f871b8c4d63549319221e294e4f88074",
+    "model": "Lisa",
+    "model_id": "158-01",
+    "name": "Lisa Badkamer",
+    "sensors": {
+      "battery": 14,
+      "setpoint": 23.5,
+      "temperature": 23.9
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.0,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "000D6F000C869B61"
+  },
+  "e8ef2a01ed3b4139a53bf749204fe6b4": {
+    "dev_class": "switching",
+    "members": [
+      "2568cc4b9c1e401495d4741a5f89bee1",
+      "29542b2b6a6a4169acecc15c72a599b8"
+    ],
+    "model": "Switchgroup",
+    "name": "Test",
+    "switches": {
+      "relay": true
+    },
+    "vendor": "Plugwise"
+  },
+  "f2bf9048bef64cc5b6d5110154e33c81": {
+    "active_preset": "home",
+    "available_schedules": [
+      "Badkamer",
+      "Test",
+      "Vakantie",
+      "Weekschema",
+      "off"
+    ],
+    "climate_mode": "cool",
+    "control_state": "cooling",
+    "dev_class": "climate",
+    "model": "ThermoZone",
+    "name": "Living room",
+    "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
+    "select_schedule": "off",
+    "sensors": {
+      "electricity_consumed": 149.9,
+      "electricity_produced": 0.0,
+      "temperature": 25.8
+    },
+    "thermostat": {
+      "lower_bound": 1.0,
+      "resolution": 0.01,
+      "setpoint": 23.5,
+      "upper_bound": 35.0
+    },
+    "thermostats": {
+      "primary": ["ad4838d7d35c4d6ea796ee12ae5aedf8"],
+      "secondary": []
+    },
+    "vendor": "Plugwise"
+  },
+  "f871b8c4d63549319221e294e4f88074": {
+    "active_preset": "home",
+    "available_schedules": [
+      "Badkamer",
+      "Test",
+      "Vakantie",
+      "Weekschema",
+      "off"
+    ],
+    "climate_mode": "auto",
+    "control_state": "cooling",
+    "dev_class": "climate",
+    "model": "ThermoZone",
+    "name": "Bathroom",
+    "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
+    "select_schedule": "Badkamer",
+    "sensors": {
+      "electricity_consumed": 0.0,
+      "electricity_produced": 0.0,
+      "temperature": 23.9
+    },
+    "thermostat": {
+      "lower_bound": 0.0,
+      "resolution": 0.01,
+      "setpoint": 25.0,
+      "upper_bound": 99.9
+    },
+    "thermostats": {
+      "primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
+      "secondary": ["1772a4ea304041adb83f357b751341ff"]
+    },
+    "vendor": "Plugwise"
+  }
+}
diff --git a/tests/components/plugwise/fixtures/m_adam_heating/data.json b/tests/components/plugwise/fixtures/m_adam_heating/data.json
new file mode 100644
index 00000000000..b10ff8ec2a8
--- /dev/null
+++ b/tests/components/plugwise/fixtures/m_adam_heating/data.json
@@ -0,0 +1,202 @@
+{
+  "056ee145a816487eaa69243c3280f8bf": {
+    "available": true,
+    "binary_sensors": {
+      "dhw_state": false,
+      "flame_state": false,
+      "heating_state": true
+    },
+    "dev_class": "heater_central",
+    "location": "bc93488efab249e5bc54fd7e175a6f91",
+    "max_dhw_temperature": {
+      "lower_bound": 40.0,
+      "resolution": 0.01,
+      "setpoint": 60.0,
+      "upper_bound": 60.0
+    },
+    "maximum_boiler_temperature": {
+      "lower_bound": 25.0,
+      "resolution": 0.01,
+      "setpoint": 50.0,
+      "upper_bound": 95.0
+    },
+    "model": "Generic heater",
+    "name": "OpenTherm",
+    "sensors": {
+      "intended_boiler_temperature": 38.1,
+      "water_temperature": 37.0
+    },
+    "switches": {
+      "dhw_cm_switch": false
+    }
+  },
+  "1772a4ea304041adb83f357b751341ff": {
+    "available": true,
+    "binary_sensors": {
+      "low_battery": false
+    },
+    "dev_class": "thermostatic_radiator_valve",
+    "firmware": "2020-11-04T01:00:00+01:00",
+    "hardware": "1",
+    "location": "f871b8c4d63549319221e294e4f88074",
+    "model": "Tom/Floor",
+    "model_id": "106-03",
+    "name": "Tom Badkamer",
+    "sensors": {
+      "battery": 99,
+      "setpoint": 18.0,
+      "temperature": 18.6,
+      "temperature_difference": -0.2,
+      "valve_position": 100
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.1,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "000D6F000C8FF5EE"
+  },
+  "ad4838d7d35c4d6ea796ee12ae5aedf8": {
+    "available": true,
+    "dev_class": "thermostat",
+    "location": "f2bf9048bef64cc5b6d5110154e33c81",
+    "model": "ThermoTouch",
+    "model_id": "143.1",
+    "name": "Anna",
+    "sensors": {
+      "setpoint": 20.0,
+      "temperature": 19.1
+    },
+    "vendor": "Plugwise"
+  },
+  "da224107914542988a88561b4452b0f6": {
+    "binary_sensors": {
+      "plugwise_notification": false
+    },
+    "dev_class": "gateway",
+    "firmware": "3.7.8",
+    "gateway_modes": ["away", "full", "vacation"],
+    "hardware": "AME Smile 2.0 board",
+    "location": "bc93488efab249e5bc54fd7e175a6f91",
+    "mac_address": "012345679891",
+    "model": "Gateway",
+    "model_id": "smile_open_therm",
+    "name": "Adam",
+    "notifications": {},
+    "regulation_modes": ["bleeding_hot", "bleeding_cold", "off", "heating"],
+    "select_gateway_mode": "full",
+    "select_regulation_mode": "heating",
+    "sensors": {
+      "outdoor_temperature": -1.25
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "000D6F000D5A168D"
+  },
+  "e2f4322d57924fa090fbbc48b3a140dc": {
+    "available": true,
+    "binary_sensors": {
+      "low_battery": true
+    },
+    "dev_class": "zone_thermostat",
+    "firmware": "2016-10-10T02:00:00+02:00",
+    "hardware": "255",
+    "location": "f871b8c4d63549319221e294e4f88074",
+    "model": "Lisa",
+    "model_id": "158-01",
+    "name": "Lisa Badkamer",
+    "sensors": {
+      "battery": 14,
+      "setpoint": 15.0,
+      "temperature": 17.9
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.0,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "000D6F000C869B61"
+  },
+  "e8ef2a01ed3b4139a53bf749204fe6b4": {
+    "dev_class": "switching",
+    "members": [
+      "2568cc4b9c1e401495d4741a5f89bee1",
+      "29542b2b6a6a4169acecc15c72a599b8"
+    ],
+    "model": "Switchgroup",
+    "name": "Test",
+    "switches": {
+      "relay": true
+    },
+    "vendor": "Plugwise"
+  },
+  "f2bf9048bef64cc5b6d5110154e33c81": {
+    "active_preset": "home",
+    "available_schedules": [
+      "Badkamer",
+      "Test",
+      "Vakantie",
+      "Weekschema",
+      "off"
+    ],
+    "climate_mode": "heat",
+    "control_state": "preheating",
+    "dev_class": "climate",
+    "model": "ThermoZone",
+    "name": "Living room",
+    "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
+    "select_schedule": "off",
+    "sensors": {
+      "electricity_consumed": 149.9,
+      "electricity_produced": 0.0,
+      "temperature": 19.1
+    },
+    "thermostat": {
+      "lower_bound": 1.0,
+      "resolution": 0.01,
+      "setpoint": 20.0,
+      "upper_bound": 35.0
+    },
+    "thermostats": {
+      "primary": ["ad4838d7d35c4d6ea796ee12ae5aedf8"],
+      "secondary": []
+    },
+    "vendor": "Plugwise"
+  },
+  "f871b8c4d63549319221e294e4f88074": {
+    "active_preset": "home",
+    "available_schedules": [
+      "Badkamer",
+      "Test",
+      "Vakantie",
+      "Weekschema",
+      "off"
+    ],
+    "climate_mode": "auto",
+    "control_state": "idle",
+    "dev_class": "climate",
+    "model": "ThermoZone",
+    "name": "Bathroom",
+    "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
+    "select_schedule": "Badkamer",
+    "sensors": {
+      "electricity_consumed": 0.0,
+      "electricity_produced": 0.0,
+      "temperature": 17.9
+    },
+    "thermostat": {
+      "lower_bound": 0.0,
+      "resolution": 0.01,
+      "setpoint": 15.0,
+      "upper_bound": 99.9
+    },
+    "thermostats": {
+      "primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
+      "secondary": ["1772a4ea304041adb83f357b751341ff"]
+    },
+    "vendor": "Plugwise"
+  }
+}
diff --git a/tests/components/plugwise/fixtures/m_adam_jip/data.json b/tests/components/plugwise/fixtures/m_adam_jip/data.json
new file mode 100644
index 00000000000..8de57910f66
--- /dev/null
+++ b/tests/components/plugwise/fixtures/m_adam_jip/data.json
@@ -0,0 +1,370 @@
+{
+  "06aecb3d00354375924f50c47af36bd2": {
+    "active_preset": "no_frost",
+    "climate_mode": "off",
+    "dev_class": "climate",
+    "model": "ThermoZone",
+    "name": "Slaapkamer",
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "sensors": {
+      "temperature": 24.2
+    },
+    "thermostat": {
+      "lower_bound": 0.0,
+      "resolution": 0.01,
+      "setpoint": 13.0,
+      "upper_bound": 99.9
+    },
+    "thermostats": {
+      "primary": ["1346fbd8498d4dbcab7e18d51b771f3d"],
+      "secondary": ["356b65335e274d769c338223e7af9c33"]
+    },
+    "vendor": "Plugwise"
+  },
+  "13228dab8ce04617af318a2888b3c548": {
+    "active_preset": "home",
+    "climate_mode": "heat",
+    "control_state": "idle",
+    "dev_class": "climate",
+    "model": "ThermoZone",
+    "name": "Woonkamer",
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "sensors": {
+      "temperature": 27.4
+    },
+    "thermostat": {
+      "lower_bound": 4.0,
+      "resolution": 0.01,
+      "setpoint": 9.0,
+      "upper_bound": 30.0
+    },
+    "thermostats": {
+      "primary": ["f61f1a2535f54f52ad006a3d18e459ca"],
+      "secondary": ["833de10f269c4deab58fb9df69901b4e"]
+    },
+    "vendor": "Plugwise"
+  },
+  "1346fbd8498d4dbcab7e18d51b771f3d": {
+    "available": true,
+    "binary_sensors": {
+      "low_battery": false
+    },
+    "dev_class": "zone_thermostat",
+    "firmware": "2016-10-27T02:00:00+02:00",
+    "hardware": "255",
+    "location": "06aecb3d00354375924f50c47af36bd2",
+    "model": "Lisa",
+    "model_id": "158-01",
+    "name": "Slaapkamer",
+    "sensors": {
+      "battery": 92,
+      "setpoint": 13.0,
+      "temperature": 24.2
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.0,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A03"
+  },
+  "1da4d325838e4ad8aac12177214505c9": {
+    "available": true,
+    "dev_class": "thermostatic_radiator_valve",
+    "firmware": "2020-11-04T01:00:00+01:00",
+    "hardware": "1",
+    "location": "d58fec52899f4f1c92e4f8fad6d8c48c",
+    "model": "Tom/Floor",
+    "model_id": "106-03",
+    "name": "Tom Logeerkamer",
+    "sensors": {
+      "setpoint": 13.0,
+      "temperature": 28.8,
+      "temperature_difference": 2.0,
+      "valve_position": 0.0
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.1,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A07"
+  },
+  "356b65335e274d769c338223e7af9c33": {
+    "available": true,
+    "dev_class": "thermostatic_radiator_valve",
+    "firmware": "2020-11-04T01:00:00+01:00",
+    "hardware": "1",
+    "location": "06aecb3d00354375924f50c47af36bd2",
+    "model": "Tom/Floor",
+    "model_id": "106-03",
+    "name": "Tom Slaapkamer",
+    "sensors": {
+      "setpoint": 13.0,
+      "temperature": 24.2,
+      "temperature_difference": 1.7,
+      "valve_position": 0.0
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.1,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A05"
+  },
+  "457ce8414de24596a2d5e7dbc9c7682f": {
+    "available": true,
+    "dev_class": "zz_misc_plug",
+    "location": "9e4433a9d69f40b3aefd15e74395eaec",
+    "model": "Aqara Smart Plug",
+    "model_id": "lumi.plug.maeu01",
+    "name": "Plug",
+    "sensors": {
+      "electricity_consumed_interval": 0.0
+    },
+    "switches": {
+      "lock": true,
+      "relay": false
+    },
+    "vendor": "LUMI",
+    "zigbee_mac_address": "ABCD012345670A06"
+  },
+  "6f3e9d7084214c21b9dfa46f6eeb8700": {
+    "available": true,
+    "binary_sensors": {
+      "low_battery": false
+    },
+    "dev_class": "zone_thermostat",
+    "firmware": "2016-10-27T02:00:00+02:00",
+    "hardware": "255",
+    "location": "d27aede973b54be484f6842d1b2802ad",
+    "model": "Lisa",
+    "model_id": "158-01",
+    "name": "Kinderkamer",
+    "sensors": {
+      "battery": 79,
+      "setpoint": 13.0,
+      "temperature": 30.0
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.0,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A02"
+  },
+  "833de10f269c4deab58fb9df69901b4e": {
+    "available": true,
+    "dev_class": "thermostatic_radiator_valve",
+    "firmware": "2020-11-04T01:00:00+01:00",
+    "hardware": "1",
+    "location": "13228dab8ce04617af318a2888b3c548",
+    "model": "Tom/Floor",
+    "model_id": "106-03",
+    "name": "Tom Woonkamer",
+    "sensors": {
+      "setpoint": 9.0,
+      "temperature": 24.0,
+      "temperature_difference": 1.8,
+      "valve_position": 100
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.1,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A09"
+  },
+  "a6abc6a129ee499c88a4d420cc413b47": {
+    "available": true,
+    "binary_sensors": {
+      "low_battery": false
+    },
+    "dev_class": "zone_thermostat",
+    "firmware": "2016-10-27T02:00:00+02:00",
+    "hardware": "255",
+    "location": "d58fec52899f4f1c92e4f8fad6d8c48c",
+    "model": "Lisa",
+    "model_id": "158-01",
+    "name": "Logeerkamer",
+    "sensors": {
+      "battery": 80,
+      "setpoint": 13.0,
+      "temperature": 30.0
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.0,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A01"
+  },
+  "b5c2386c6f6342669e50fe49dd05b188": {
+    "binary_sensors": {
+      "plugwise_notification": false
+    },
+    "dev_class": "gateway",
+    "firmware": "3.2.8",
+    "gateway_modes": ["away", "full", "vacation"],
+    "hardware": "AME Smile 2.0 board",
+    "location": "9e4433a9d69f40b3aefd15e74395eaec",
+    "mac_address": "012345670001",
+    "model": "Gateway",
+    "model_id": "smile_open_therm",
+    "name": "Adam",
+    "notifications": {},
+    "regulation_modes": ["heating", "off", "bleeding_cold", "bleeding_hot"],
+    "select_gateway_mode": "full",
+    "select_regulation_mode": "heating",
+    "sensors": {
+      "outdoor_temperature": 24.9
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670101"
+  },
+  "d27aede973b54be484f6842d1b2802ad": {
+    "active_preset": "home",
+    "climate_mode": "heat",
+    "control_state": "idle",
+    "dev_class": "climate",
+    "model": "ThermoZone",
+    "name": "Kinderkamer",
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "sensors": {
+      "temperature": 30.0
+    },
+    "thermostat": {
+      "lower_bound": 0.0,
+      "resolution": 0.01,
+      "setpoint": 13.0,
+      "upper_bound": 99.9
+    },
+    "thermostats": {
+      "primary": ["6f3e9d7084214c21b9dfa46f6eeb8700"],
+      "secondary": ["d4496250d0e942cfa7aea3476e9070d5"]
+    },
+    "vendor": "Plugwise"
+  },
+  "d4496250d0e942cfa7aea3476e9070d5": {
+    "available": true,
+    "dev_class": "thermostatic_radiator_valve",
+    "firmware": "2020-11-04T01:00:00+01:00",
+    "hardware": "1",
+    "location": "d27aede973b54be484f6842d1b2802ad",
+    "model": "Tom/Floor",
+    "model_id": "106-03",
+    "name": "Tom Kinderkamer",
+    "sensors": {
+      "setpoint": 13.0,
+      "temperature": 28.7,
+      "temperature_difference": 1.9,
+      "valve_position": 0.0
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.1,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A04"
+  },
+  "d58fec52899f4f1c92e4f8fad6d8c48c": {
+    "active_preset": "home",
+    "climate_mode": "heat",
+    "control_state": "idle",
+    "dev_class": "climate",
+    "model": "ThermoZone",
+    "name": "Logeerkamer",
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "sensors": {
+      "temperature": 30.0
+    },
+    "thermostat": {
+      "lower_bound": 0.0,
+      "resolution": 0.01,
+      "setpoint": 13.0,
+      "upper_bound": 99.9
+    },
+    "thermostats": {
+      "primary": ["a6abc6a129ee499c88a4d420cc413b47"],
+      "secondary": ["1da4d325838e4ad8aac12177214505c9"]
+    },
+    "vendor": "Plugwise"
+  },
+  "e4684553153b44afbef2200885f379dc": {
+    "available": true,
+    "binary_sensors": {
+      "dhw_state": false,
+      "flame_state": false,
+      "heating_state": false
+    },
+    "dev_class": "heater_central",
+    "location": "9e4433a9d69f40b3aefd15e74395eaec",
+    "max_dhw_temperature": {
+      "lower_bound": 40.0,
+      "resolution": 0.01,
+      "setpoint": 60.0,
+      "upper_bound": 60.0
+    },
+    "maximum_boiler_temperature": {
+      "lower_bound": 20.0,
+      "resolution": 0.01,
+      "setpoint": 90.0,
+      "upper_bound": 90.0
+    },
+    "model": "Generic heater",
+    "model_id": "10.20",
+    "name": "OpenTherm",
+    "sensors": {
+      "intended_boiler_temperature": 0.0,
+      "modulation_level": 0.0,
+      "return_temperature": 37.1,
+      "water_pressure": 1.4,
+      "water_temperature": 37.3
+    },
+    "switches": {
+      "dhw_cm_switch": false
+    },
+    "vendor": "Remeha B.V."
+  },
+  "f61f1a2535f54f52ad006a3d18e459ca": {
+    "available": true,
+    "binary_sensors": {
+      "low_battery": false
+    },
+    "dev_class": "zone_thermometer",
+    "firmware": "2020-09-01T02:00:00+02:00",
+    "hardware": "1",
+    "location": "13228dab8ce04617af318a2888b3c548",
+    "model": "Jip",
+    "model_id": "168-01",
+    "name": "Woonkamer",
+    "sensors": {
+      "battery": 100,
+      "humidity": 56.2,
+      "setpoint": 9.0,
+      "temperature": 27.4
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.0,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A08"
+  }
+}
diff --git a/tests/components/plugwise/fixtures/m_adam_multiple_devices_per_zone/data.json b/tests/components/plugwise/fixtures/m_adam_multiple_devices_per_zone/data.json
new file mode 100644
index 00000000000..7c38b1b2197
--- /dev/null
+++ b/tests/components/plugwise/fixtures/m_adam_multiple_devices_per_zone/data.json
@@ -0,0 +1,584 @@
+{
+  "02cf28bfec924855854c544690a609ef": {
+    "available": true,
+    "dev_class": "vcr_plug",
+    "firmware": "2019-06-21T02:00:00+02:00",
+    "location": "cd143c07248f491493cea0533bc3d669",
+    "model": "Plug",
+    "model_id": "160-01",
+    "name": "NVR",
+    "sensors": {
+      "electricity_consumed": 34.0,
+      "electricity_consumed_interval": 9.15,
+      "electricity_produced": 0.0,
+      "electricity_produced_interval": 0.0
+    },
+    "switches": {
+      "lock": true,
+      "relay": true
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A15"
+  },
+  "08963fec7c53423ca5680aa4cb502c63": {
+    "active_preset": "away",
+    "available_schedules": [
+      "CV Roan",
+      "Bios Schema met Film Avond",
+      "GF7  Woonkamer",
+      "Badkamer Schema",
+      "CV Jessie",
+      "off"
+    ],
+    "climate_mode": "auto",
+    "control_state": "idle",
+    "dev_class": "climate",
+    "model": "ThermoZone",
+    "name": "Badkamer",
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "select_schedule": "Badkamer Schema",
+    "sensors": {
+      "temperature": 18.9
+    },
+    "thermostat": {
+      "lower_bound": 0.0,
+      "resolution": 0.01,
+      "setpoint": 14.0,
+      "upper_bound": 100.0
+    },
+    "thermostats": {
+      "primary": [
+        "f1fee6043d3642a9b0a65297455f008e",
+        "680423ff840043738f42cc7f1ff97a36"
+      ],
+      "secondary": []
+    },
+    "vendor": "Plugwise"
+  },
+  "12493538af164a409c6a1c79e38afe1c": {
+    "active_preset": "away",
+    "available_schedules": [
+      "CV Roan",
+      "Bios Schema met Film Avond",
+      "GF7  Woonkamer",
+      "Badkamer Schema",
+      "CV Jessie",
+      "off"
+    ],
+    "climate_mode": "heat",
+    "control_state": "idle",
+    "dev_class": "climate",
+    "model": "ThermoZone",
+    "name": "Bios",
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "select_schedule": "off",
+    "sensors": {
+      "electricity_consumed": 0.0,
+      "electricity_produced": 0.0,
+      "temperature": 16.5
+    },
+    "thermostat": {
+      "lower_bound": 0.0,
+      "resolution": 0.01,
+      "setpoint": 13.0,
+      "upper_bound": 100.0
+    },
+    "thermostats": {
+      "primary": ["df4a4a8169904cdb9c03d61a21f42140"],
+      "secondary": ["a2c3583e0a6349358998b760cea82d2a"]
+    },
+    "vendor": "Plugwise"
+  },
+  "21f2b542c49845e6bb416884c55778d6": {
+    "available": true,
+    "dev_class": "game_console_plug",
+    "firmware": "2019-06-21T02:00:00+02:00",
+    "location": "cd143c07248f491493cea0533bc3d669",
+    "model": "Plug",
+    "model_id": "160-01",
+    "name": "Playstation Smart Plug",
+    "sensors": {
+      "electricity_consumed": 84.1,
+      "electricity_consumed_interval": 8.6,
+      "electricity_produced": 0.0,
+      "electricity_produced_interval": 0.0
+    },
+    "switches": {
+      "lock": false,
+      "relay": true
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A12"
+  },
+  "446ac08dd04d4eff8ac57489757b7314": {
+    "active_preset": "no_frost",
+    "climate_mode": "heat",
+    "control_state": "idle",
+    "dev_class": "climate",
+    "model": "ThermoZone",
+    "name": "Garage",
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "sensors": {
+      "temperature": 15.6
+    },
+    "thermostat": {
+      "lower_bound": 0.0,
+      "resolution": 0.01,
+      "setpoint": 5.5,
+      "upper_bound": 100.0
+    },
+    "thermostats": {
+      "primary": ["e7693eb9582644e5b865dba8d4447cf1"],
+      "secondary": []
+    },
+    "vendor": "Plugwise"
+  },
+  "4a810418d5394b3f82727340b91ba740": {
+    "available": true,
+    "dev_class": "router_plug",
+    "firmware": "2019-06-21T02:00:00+02:00",
+    "location": "cd143c07248f491493cea0533bc3d669",
+    "model": "Plug",
+    "model_id": "160-01",
+    "name": "USG Smart Plug",
+    "sensors": {
+      "electricity_consumed": 8.5,
+      "electricity_consumed_interval": 0.0,
+      "electricity_produced": 0.0,
+      "electricity_produced_interval": 0.0
+    },
+    "switches": {
+      "lock": true,
+      "relay": true
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A16"
+  },
+  "675416a629f343c495449970e2ca37b5": {
+    "available": true,
+    "dev_class": "router_plug",
+    "firmware": "2019-06-21T02:00:00+02:00",
+    "location": "cd143c07248f491493cea0533bc3d669",
+    "model": "Plug",
+    "model_id": "160-01",
+    "name": "Ziggo Modem",
+    "sensors": {
+      "electricity_consumed": 12.2,
+      "electricity_consumed_interval": 2.97,
+      "electricity_produced": 0.0,
+      "electricity_produced_interval": 0.0
+    },
+    "switches": {
+      "lock": true,
+      "relay": true
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A01"
+  },
+  "680423ff840043738f42cc7f1ff97a36": {
+    "available": true,
+    "binary_sensors": {
+      "low_battery": false
+    },
+    "dev_class": "thermostatic_radiator_valve",
+    "firmware": "2019-03-27T01:00:00+01:00",
+    "hardware": "1",
+    "location": "08963fec7c53423ca5680aa4cb502c63",
+    "model": "Tom/Floor",
+    "model_id": "106-03",
+    "name": "Thermostatic Radiator Badkamer 1",
+    "sensors": {
+      "battery": 51,
+      "setpoint": 14.0,
+      "temperature": 19.1,
+      "temperature_difference": -0.4,
+      "valve_position": 0.0
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.0,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A17"
+  },
+  "6a3bf693d05e48e0b460c815a4fdd09d": {
+    "available": true,
+    "binary_sensors": {
+      "low_battery": false
+    },
+    "dev_class": "zone_thermostat",
+    "firmware": "2016-10-27T02:00:00+02:00",
+    "hardware": "255",
+    "location": "82fa13f017d240daa0d0ea1775420f24",
+    "model": "Lisa",
+    "model_id": "158-01",
+    "name": "Zone Thermostat Jessie",
+    "sensors": {
+      "battery": 37,
+      "setpoint": 15.0,
+      "temperature": 17.2
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.0,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A03"
+  },
+  "78d1126fc4c743db81b61c20e88342a7": {
+    "available": true,
+    "dev_class": "central_heating_pump_plug",
+    "firmware": "2019-06-21T02:00:00+02:00",
+    "location": "c50f167537524366a5af7aa3942feb1e",
+    "model": "Plug",
+    "model_id": "160-01",
+    "name": "CV Pomp",
+    "sensors": {
+      "electricity_consumed": 35.6,
+      "electricity_consumed_interval": 7.37,
+      "electricity_produced": 0.0,
+      "electricity_produced_interval": 0.0
+    },
+    "switches": {
+      "relay": true
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A05"
+  },
+  "82fa13f017d240daa0d0ea1775420f24": {
+    "active_preset": "asleep",
+    "available_schedules": [
+      "CV Roan",
+      "Bios Schema met Film Avond",
+      "GF7  Woonkamer",
+      "Badkamer Schema",
+      "CV Jessie",
+      "off"
+    ],
+    "climate_mode": "auto",
+    "control_state": "idle",
+    "dev_class": "climate",
+    "model": "ThermoZone",
+    "name": "Jessie",
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "select_schedule": "CV Jessie",
+    "sensors": {
+      "temperature": 17.2
+    },
+    "thermostat": {
+      "lower_bound": 0.0,
+      "resolution": 0.01,
+      "setpoint": 15.0,
+      "upper_bound": 100.0
+    },
+    "thermostats": {
+      "primary": ["6a3bf693d05e48e0b460c815a4fdd09d"],
+      "secondary": ["d3da73bde12a47d5a6b8f9dad971f2ec"]
+    },
+    "vendor": "Plugwise"
+  },
+  "90986d591dcd426cae3ec3e8111ff730": {
+    "binary_sensors": {
+      "heating_state": true
+    },
+    "dev_class": "heater_central",
+    "location": "1f9dcf83fd4e4b66b72ff787957bfe5d",
+    "model": "Unknown",
+    "name": "OnOff",
+    "sensors": {
+      "intended_boiler_temperature": 70.0,
+      "modulation_level": 1,
+      "water_temperature": 70.0
+    }
+  },
+  "a28f588dc4a049a483fd03a30361ad3a": {
+    "available": true,
+    "dev_class": "settop_plug",
+    "firmware": "2019-06-21T02:00:00+02:00",
+    "location": "cd143c07248f491493cea0533bc3d669",
+    "model": "Plug",
+    "model_id": "160-01",
+    "name": "Fibaro HC2",
+    "sensors": {
+      "electricity_consumed": 12.5,
+      "electricity_consumed_interval": 3.8,
+      "electricity_produced": 0.0,
+      "electricity_produced_interval": 0.0
+    },
+    "switches": {
+      "lock": true,
+      "relay": true
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A13"
+  },
+  "a2c3583e0a6349358998b760cea82d2a": {
+    "available": true,
+    "binary_sensors": {
+      "low_battery": false
+    },
+    "dev_class": "thermostatic_radiator_valve",
+    "firmware": "2019-03-27T01:00:00+01:00",
+    "hardware": "1",
+    "location": "12493538af164a409c6a1c79e38afe1c",
+    "model": "Tom/Floor",
+    "model_id": "106-03",
+    "name": "Bios Cv Thermostatic Radiator ",
+    "sensors": {
+      "battery": 62,
+      "setpoint": 13.0,
+      "temperature": 17.2,
+      "temperature_difference": -0.2,
+      "valve_position": 0.0
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.0,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A09"
+  },
+  "b310b72a0e354bfab43089919b9a88bf": {
+    "available": true,
+    "dev_class": "thermostatic_radiator_valve",
+    "firmware": "2019-03-27T01:00:00+01:00",
+    "hardware": "1",
+    "location": "c50f167537524366a5af7aa3942feb1e",
+    "model": "Tom/Floor",
+    "model_id": "106-03",
+    "name": "Floor kraan",
+    "sensors": {
+      "setpoint": 21.5,
+      "temperature": 26.0,
+      "temperature_difference": 3.5,
+      "valve_position": 100
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.0,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A02"
+  },
+  "b59bcebaf94b499ea7d46e4a66fb62d8": {
+    "available": true,
+    "binary_sensors": {
+      "low_battery": false
+    },
+    "dev_class": "zone_thermostat",
+    "firmware": "2016-08-02T02:00:00+02:00",
+    "hardware": "255",
+    "location": "c50f167537524366a5af7aa3942feb1e",
+    "model": "Lisa",
+    "model_id": "158-01",
+    "name": "Zone Lisa WK",
+    "sensors": {
+      "battery": 34,
+      "setpoint": 21.5,
+      "temperature": 20.9
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.0,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A07"
+  },
+  "c50f167537524366a5af7aa3942feb1e": {
+    "active_preset": "home",
+    "available_schedules": [
+      "CV Roan",
+      "Bios Schema met Film Avond",
+      "GF7  Woonkamer",
+      "Badkamer Schema",
+      "CV Jessie",
+      "off"
+    ],
+    "climate_mode": "auto",
+    "control_state": "heating",
+    "dev_class": "climate",
+    "model": "ThermoZone",
+    "name": "Woonkamer",
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "select_schedule": "GF7  Woonkamer",
+    "sensors": {
+      "electricity_consumed": 35.6,
+      "electricity_produced": 0.0,
+      "temperature": 20.9
+    },
+    "thermostat": {
+      "lower_bound": 0.0,
+      "resolution": 0.01,
+      "setpoint": 21.5,
+      "upper_bound": 100.0
+    },
+    "thermostats": {
+      "primary": ["b59bcebaf94b499ea7d46e4a66fb62d8"],
+      "secondary": ["b310b72a0e354bfab43089919b9a88bf"]
+    },
+    "vendor": "Plugwise"
+  },
+  "cd0ddb54ef694e11ac18ed1cbce5dbbd": {
+    "available": true,
+    "dev_class": "vcr_plug",
+    "firmware": "2019-06-21T02:00:00+02:00",
+    "location": "cd143c07248f491493cea0533bc3d669",
+    "model": "Plug",
+    "model_id": "160-01",
+    "name": "NAS",
+    "sensors": {
+      "electricity_consumed": 16.5,
+      "electricity_consumed_interval": 0.5,
+      "electricity_produced": 0.0,
+      "electricity_produced_interval": 0.0
+    },
+    "switches": {
+      "lock": true,
+      "relay": true
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A14"
+  },
+  "d3da73bde12a47d5a6b8f9dad971f2ec": {
+    "available": true,
+    "binary_sensors": {
+      "low_battery": false
+    },
+    "dev_class": "thermostatic_radiator_valve",
+    "firmware": "2019-03-27T01:00:00+01:00",
+    "hardware": "1",
+    "location": "82fa13f017d240daa0d0ea1775420f24",
+    "model": "Tom/Floor",
+    "model_id": "106-03",
+    "name": "Thermostatic Radiator Jessie",
+    "sensors": {
+      "battery": 62,
+      "setpoint": 15.0,
+      "temperature": 17.1,
+      "temperature_difference": 0.1,
+      "valve_position": 0.0
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.0,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A10"
+  },
+  "df4a4a8169904cdb9c03d61a21f42140": {
+    "available": true,
+    "binary_sensors": {
+      "low_battery": false
+    },
+    "dev_class": "zone_thermostat",
+    "firmware": "2016-10-27T02:00:00+02:00",
+    "hardware": "255",
+    "location": "12493538af164a409c6a1c79e38afe1c",
+    "model": "Lisa",
+    "model_id": "158-01",
+    "name": "Zone Lisa Bios",
+    "sensors": {
+      "battery": 67,
+      "setpoint": 13.0,
+      "temperature": 16.5
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.0,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A06"
+  },
+  "e7693eb9582644e5b865dba8d4447cf1": {
+    "available": true,
+    "binary_sensors": {
+      "low_battery": false
+    },
+    "dev_class": "thermostatic_radiator_valve",
+    "firmware": "2019-03-27T01:00:00+01:00",
+    "hardware": "1",
+    "location": "446ac08dd04d4eff8ac57489757b7314",
+    "model": "Tom/Floor",
+    "model_id": "106-03",
+    "name": "CV Kraan Garage",
+    "sensors": {
+      "battery": 68,
+      "setpoint": 5.5,
+      "temperature": 15.6,
+      "temperature_difference": 0.0,
+      "valve_position": 0.0
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.0,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A11"
+  },
+  "f1fee6043d3642a9b0a65297455f008e": {
+    "available": true,
+    "binary_sensors": {
+      "low_battery": false
+    },
+    "dev_class": "thermostatic_radiator_valve",
+    "firmware": "2016-10-27T02:00:00+02:00",
+    "hardware": "255",
+    "location": "08963fec7c53423ca5680aa4cb502c63",
+    "model": "Lisa",
+    "model_id": "158-01",
+    "name": "Thermostatic Radiator Badkamer 2",
+    "sensors": {
+      "battery": 92,
+      "setpoint": 14.0,
+      "temperature": 18.9
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.0,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A08"
+  },
+  "fe799307f1624099878210aa0b9f1475": {
+    "binary_sensors": {
+      "plugwise_notification": true
+    },
+    "dev_class": "gateway",
+    "firmware": "3.0.15",
+    "hardware": "AME Smile 2.0 board",
+    "location": "1f9dcf83fd4e4b66b72ff787957bfe5d",
+    "mac_address": "012345670001",
+    "model": "Gateway",
+    "model_id": "smile_open_therm",
+    "name": "Adam",
+    "notifications": {
+      "af82e4ccf9c548528166d38e560662a4": {
+        "warning": "Node Plug (with MAC address 000D6F000D13CB01, in room 'n.a.') has been unreachable since 23:03 2020-01-18. Please check the connection and restart the device."
+      }
+    },
+    "select_regulation_mode": "heating",
+    "sensors": {
+      "outdoor_temperature": 7.81
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670101"
+  }
+}
diff --git a/tests/components/plugwise/fixtures/m_anna_heatpump_cooling/data.json b/tests/components/plugwise/fixtures/m_anna_heatpump_cooling/data.json
new file mode 100644
index 00000000000..ccfd816ff63
--- /dev/null
+++ b/tests/components/plugwise/fixtures/m_anna_heatpump_cooling/data.json
@@ -0,0 +1,97 @@
+{
+  "015ae9ea3f964e668e490fa39da3870b": {
+    "binary_sensors": {
+      "plugwise_notification": false
+    },
+    "dev_class": "gateway",
+    "firmware": "4.0.15",
+    "hardware": "AME Smile 2.0 board",
+    "location": "a57efe5f145f498c9be62a9b63626fbf",
+    "mac_address": "012345670001",
+    "model": "Gateway",
+    "model_id": "smile_thermo",
+    "name": "Smile Anna",
+    "notifications": {},
+    "sensors": {
+      "outdoor_temperature": 28.2
+    },
+    "vendor": "Plugwise"
+  },
+  "1cbf783bb11e4a7c8a6843dee3a86927": {
+    "available": true,
+    "binary_sensors": {
+      "compressor_state": true,
+      "cooling_enabled": true,
+      "cooling_state": true,
+      "dhw_state": false,
+      "flame_state": false,
+      "heating_state": false,
+      "secondary_boiler_state": false
+    },
+    "dev_class": "heater_central",
+    "location": "a57efe5f145f498c9be62a9b63626fbf",
+    "max_dhw_temperature": {
+      "lower_bound": 35.0,
+      "resolution": 0.01,
+      "setpoint": 53.0,
+      "upper_bound": 60.0
+    },
+    "maximum_boiler_temperature": {
+      "lower_bound": 0.0,
+      "resolution": 1.0,
+      "setpoint": 60.0,
+      "upper_bound": 100.0
+    },
+    "model": "Generic heater/cooler",
+    "name": "OpenTherm",
+    "sensors": {
+      "dhw_temperature": 41.5,
+      "intended_boiler_temperature": 0.0,
+      "modulation_level": 40,
+      "outdoor_air_temperature": 28.0,
+      "return_temperature": 23.8,
+      "water_pressure": 1.57,
+      "water_temperature": 22.7
+    },
+    "switches": {
+      "dhw_cm_switch": false
+    },
+    "vendor": "Techneco"
+  },
+  "3cb70739631c4d17a86b8b12e8a5161b": {
+    "active_preset": "home",
+    "available_schedules": ["standaard", "off"],
+    "climate_mode": "auto",
+    "control_state": "cooling",
+    "dev_class": "thermostat",
+    "firmware": "2018-02-08T11:15:53+01:00",
+    "hardware": "6539-1301-5002",
+    "location": "c784ee9fdab44e1395b8dee7d7a497d5",
+    "model": "ThermoTouch",
+    "name": "Anna",
+    "preset_modes": ["no_frost", "home", "away", "asleep", "vacation"],
+    "select_schedule": "standaard",
+    "sensors": {
+      "cooling_activation_outdoor_temperature": 21.0,
+      "cooling_deactivation_threshold": 4.0,
+      "illuminance": 86.0,
+      "setpoint_high": 30.0,
+      "setpoint_low": 20.5,
+      "temperature": 26.3
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": -0.5,
+      "upper_bound": 2.0
+    },
+    "thermostat": {
+      "lower_bound": 4.0,
+      "resolution": 0.1,
+      "setpoint_high": 30.0,
+      "setpoint_low": 20.5,
+      "upper_bound": 30.0
+    },
+    "vendor": "Plugwise"
+  }
+}
diff --git a/tests/components/plugwise/fixtures/m_anna_heatpump_idle/data.json b/tests/components/plugwise/fixtures/m_anna_heatpump_idle/data.json
new file mode 100644
index 00000000000..5a1cdebd380
--- /dev/null
+++ b/tests/components/plugwise/fixtures/m_anna_heatpump_idle/data.json
@@ -0,0 +1,97 @@
+{
+  "015ae9ea3f964e668e490fa39da3870b": {
+    "binary_sensors": {
+      "plugwise_notification": false
+    },
+    "dev_class": "gateway",
+    "firmware": "4.0.15",
+    "hardware": "AME Smile 2.0 board",
+    "location": "a57efe5f145f498c9be62a9b63626fbf",
+    "mac_address": "012345670001",
+    "model": "Gateway",
+    "model_id": "smile_thermo",
+    "name": "Smile Anna",
+    "notifications": {},
+    "sensors": {
+      "outdoor_temperature": 28.2
+    },
+    "vendor": "Plugwise"
+  },
+  "1cbf783bb11e4a7c8a6843dee3a86927": {
+    "available": true,
+    "binary_sensors": {
+      "compressor_state": false,
+      "cooling_enabled": true,
+      "cooling_state": false,
+      "dhw_state": false,
+      "flame_state": false,
+      "heating_state": false,
+      "secondary_boiler_state": false
+    },
+    "dev_class": "heater_central",
+    "location": "a57efe5f145f498c9be62a9b63626fbf",
+    "max_dhw_temperature": {
+      "lower_bound": 35.0,
+      "resolution": 0.01,
+      "setpoint": 53.0,
+      "upper_bound": 60.0
+    },
+    "maximum_boiler_temperature": {
+      "lower_bound": 0.0,
+      "resolution": 1.0,
+      "setpoint": 60.0,
+      "upper_bound": 100.0
+    },
+    "model": "Generic heater/cooler",
+    "name": "OpenTherm",
+    "sensors": {
+      "dhw_temperature": 46.3,
+      "intended_boiler_temperature": 18.0,
+      "modulation_level": 0,
+      "outdoor_air_temperature": 28.2,
+      "return_temperature": 22.0,
+      "water_pressure": 1.57,
+      "water_temperature": 19.1
+    },
+    "switches": {
+      "dhw_cm_switch": false
+    },
+    "vendor": "Techneco"
+  },
+  "3cb70739631c4d17a86b8b12e8a5161b": {
+    "active_preset": "home",
+    "available_schedules": ["standaard", "off"],
+    "climate_mode": "auto",
+    "control_state": "idle",
+    "dev_class": "thermostat",
+    "firmware": "2018-02-08T11:15:53+01:00",
+    "hardware": "6539-1301-5002",
+    "location": "c784ee9fdab44e1395b8dee7d7a497d5",
+    "model": "ThermoTouch",
+    "name": "Anna",
+    "preset_modes": ["no_frost", "home", "away", "asleep", "vacation"],
+    "select_schedule": "standaard",
+    "sensors": {
+      "cooling_activation_outdoor_temperature": 25.0,
+      "cooling_deactivation_threshold": 4.0,
+      "illuminance": 86.0,
+      "setpoint_high": 30.0,
+      "setpoint_low": 20.5,
+      "temperature": 23.0
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": -0.5,
+      "upper_bound": 2.0
+    },
+    "thermostat": {
+      "lower_bound": 4.0,
+      "resolution": 0.1,
+      "setpoint_high": 30.0,
+      "setpoint_low": 20.5,
+      "upper_bound": 30.0
+    },
+    "vendor": "Plugwise"
+  }
+}
diff --git a/tests/components/plugwise/fixtures/p1v4_442_single/data.json b/tests/components/plugwise/fixtures/p1v4_442_single/data.json
new file mode 100644
index 00000000000..6dfcd7ee033
--- /dev/null
+++ b/tests/components/plugwise/fixtures/p1v4_442_single/data.json
@@ -0,0 +1,43 @@
+{
+  "a455b61e52394b2db5081ce025a430f3": {
+    "binary_sensors": {
+      "plugwise_notification": false
+    },
+    "dev_class": "gateway",
+    "firmware": "4.4.2",
+    "hardware": "AME Smile 2.0 board",
+    "location": "a455b61e52394b2db5081ce025a430f3",
+    "mac_address": "012345670001",
+    "model": "Gateway",
+    "model_id": "smile",
+    "name": "Smile P1",
+    "notifications": {},
+    "vendor": "Plugwise"
+  },
+  "ba4de7613517478da82dd9b6abea36af": {
+    "available": true,
+    "dev_class": "smartmeter",
+    "location": "a455b61e52394b2db5081ce025a430f3",
+    "model": "KFM5KAIFA-METER",
+    "name": "P1",
+    "sensors": {
+      "electricity_consumed_off_peak_cumulative": 17643.423,
+      "electricity_consumed_off_peak_interval": 15,
+      "electricity_consumed_off_peak_point": 486,
+      "electricity_consumed_peak_cumulative": 13966.608,
+      "electricity_consumed_peak_interval": 0,
+      "electricity_consumed_peak_point": 0,
+      "electricity_phase_one_consumed": 486,
+      "electricity_phase_one_produced": 0,
+      "electricity_produced_off_peak_cumulative": 0.0,
+      "electricity_produced_off_peak_interval": 0,
+      "electricity_produced_off_peak_point": 0,
+      "electricity_produced_peak_cumulative": 0.0,
+      "electricity_produced_peak_interval": 0,
+      "electricity_produced_peak_point": 0,
+      "net_electricity_cumulative": 31610.031,
+      "net_electricity_point": 486
+    },
+    "vendor": "SHENZHEN KAIFA TECHNOLOGY \uff08CHENGDU\uff09 CO., LTD."
+  }
+}
diff --git a/tests/components/plugwise/fixtures/p1v4_442_triple/data.json b/tests/components/plugwise/fixtures/p1v4_442_triple/data.json
new file mode 100644
index 00000000000..943325d1415
--- /dev/null
+++ b/tests/components/plugwise/fixtures/p1v4_442_triple/data.json
@@ -0,0 +1,56 @@
+{
+  "03e65b16e4b247a29ae0d75a78cb492e": {
+    "binary_sensors": {
+      "plugwise_notification": true
+    },
+    "dev_class": "gateway",
+    "firmware": "4.4.2",
+    "hardware": "AME Smile 2.0 board",
+    "location": "03e65b16e4b247a29ae0d75a78cb492e",
+    "mac_address": "012345670001",
+    "model": "Gateway",
+    "model_id": "smile",
+    "name": "Smile P1",
+    "notifications": {
+      "97a04c0c263049b29350a660b4cdd01e": {
+        "warning": "The Smile P1 is not connected to a smart meter."
+      }
+    },
+    "vendor": "Plugwise"
+  },
+  "b82b6b3322484f2ea4e25e0bd5f3d61f": {
+    "available": true,
+    "dev_class": "smartmeter",
+    "location": "03e65b16e4b247a29ae0d75a78cb492e",
+    "model": "XMX5LGF0010453051839",
+    "name": "P1",
+    "sensors": {
+      "electricity_consumed_off_peak_cumulative": 70537.898,
+      "electricity_consumed_off_peak_interval": 314,
+      "electricity_consumed_off_peak_point": 5553,
+      "electricity_consumed_peak_cumulative": 161328.641,
+      "electricity_consumed_peak_interval": 0,
+      "electricity_consumed_peak_point": 0,
+      "electricity_phase_one_consumed": 1763,
+      "electricity_phase_one_produced": 0,
+      "electricity_phase_three_consumed": 2080,
+      "electricity_phase_three_produced": 0,
+      "electricity_phase_two_consumed": 1703,
+      "electricity_phase_two_produced": 0,
+      "electricity_produced_off_peak_cumulative": 0.0,
+      "electricity_produced_off_peak_interval": 0,
+      "electricity_produced_off_peak_point": 0,
+      "electricity_produced_peak_cumulative": 0.0,
+      "electricity_produced_peak_interval": 0,
+      "electricity_produced_peak_point": 0,
+      "gas_consumed_cumulative": 16811.37,
+      "gas_consumed_interval": 0.06,
+      "net_electricity_cumulative": 231866.539,
+      "net_electricity_point": 5553,
+      "voltage_phase_one": 233.2,
+      "voltage_phase_three": 234.7,
+      "voltage_phase_two": 234.4
+    },
+    "vendor": "XEMEX NV"
+  }
+}
diff --git a/tests/components/plugwise/fixtures/smile_p1_v2/data.json b/tests/components/plugwise/fixtures/smile_p1_v2/data.json
new file mode 100644
index 00000000000..768dd2c2334
--- /dev/null
+++ b/tests/components/plugwise/fixtures/smile_p1_v2/data.json
@@ -0,0 +1,34 @@
+{
+  "938696c4bcdb4b8a9a595cb38ed43913": {
+    "dev_class": "smartmeter",
+    "location": "938696c4bcdb4b8a9a595cb38ed43913",
+    "model": "Ene5\\T210-DESMR5.0",
+    "name": "P1",
+    "sensors": {
+      "electricity_consumed_off_peak_cumulative": 1642.74,
+      "electricity_consumed_off_peak_interval": 0,
+      "electricity_consumed_peak_cumulative": 1155.195,
+      "electricity_consumed_peak_interval": 250,
+      "electricity_consumed_point": 458,
+      "electricity_produced_off_peak_cumulative": 482.598,
+      "electricity_produced_off_peak_interval": 0,
+      "electricity_produced_peak_cumulative": 1296.136,
+      "electricity_produced_peak_interval": 0,
+      "electricity_produced_point": 0,
+      "gas_consumed_cumulative": 584.433,
+      "gas_consumed_interval": 0.016,
+      "net_electricity_cumulative": 1019.201,
+      "net_electricity_point": 458
+    },
+    "vendor": "Ene5\\T210-DESMR5.0"
+  },
+  "aaaa0000aaaa0000aaaa0000aaaa00aa": {
+    "dev_class": "gateway",
+    "firmware": "2.5.9",
+    "location": "938696c4bcdb4b8a9a595cb38ed43913",
+    "mac_address": "012345670001",
+    "model": "Gateway",
+    "name": "Smile P1",
+    "vendor": "Plugwise"
+  }
+}
diff --git a/tests/components/plugwise/fixtures/stretch_v31/data.json b/tests/components/plugwise/fixtures/stretch_v31/data.json
new file mode 100644
index 00000000000..250839d08a8
--- /dev/null
+++ b/tests/components/plugwise/fixtures/stretch_v31/data.json
@@ -0,0 +1,136 @@
+{
+  "0000aaaa0000aaaa0000aaaa0000aa00": {
+    "dev_class": "gateway",
+    "firmware": "3.1.11",
+    "location": "0000aaaa0000aaaa0000aaaa0000aa00",
+    "mac_address": "01:23:45:67:89:AB",
+    "model": "Gateway",
+    "name": "Stretch",
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670101"
+  },
+  "059e4d03c7a34d278add5c7a4a781d19": {
+    "dev_class": "washingmachine",
+    "firmware": "2011-06-27T10:52:18+02:00",
+    "hardware": "0000-0440-0107",
+    "location": "0000aaaa0000aaaa0000aaaa0000aa00",
+    "model": "Circle type F",
+    "name": "Wasmachine (52AC1)",
+    "sensors": {
+      "electricity_consumed": 0.0,
+      "electricity_consumed_interval": 0.0,
+      "electricity_produced": 0.0
+    },
+    "switches": {
+      "lock": true,
+      "relay": true
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A01"
+  },
+  "5871317346d045bc9f6b987ef25ee638": {
+    "dev_class": "water_heater_vessel",
+    "firmware": "2011-06-27T10:52:18+02:00",
+    "hardware": "6539-0701-4028",
+    "location": "0000aaaa0000aaaa0000aaaa0000aa00",
+    "model": "Circle type F",
+    "name": "Boiler (1EB31)",
+    "sensors": {
+      "electricity_consumed": 1.19,
+      "electricity_consumed_interval": 0.0,
+      "electricity_produced": 0.0
+    },
+    "switches": {
+      "lock": false,
+      "relay": true
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A07"
+  },
+  "aac7b735042c4832ac9ff33aae4f453b": {
+    "dev_class": "dishwasher",
+    "firmware": "2011-06-27T10:52:18+02:00",
+    "hardware": "6539-0701-4022",
+    "location": "0000aaaa0000aaaa0000aaaa0000aa00",
+    "model": "Circle type F",
+    "name": "Vaatwasser (2a1ab)",
+    "sensors": {
+      "electricity_consumed": 0.0,
+      "electricity_consumed_interval": 0.71,
+      "electricity_produced": 0.0
+    },
+    "switches": {
+      "lock": false,
+      "relay": true
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A02"
+  },
+  "cfe95cf3de1948c0b8955125bf754614": {
+    "dev_class": "dryer",
+    "firmware": "2011-06-27T10:52:18+02:00",
+    "hardware": "0000-0440-0107",
+    "location": "0000aaaa0000aaaa0000aaaa0000aa00",
+    "model": "Circle type F",
+    "name": "Droger (52559)",
+    "sensors": {
+      "electricity_consumed": 0.0,
+      "electricity_consumed_interval": 0.0,
+      "electricity_produced": 0.0
+    },
+    "switches": {
+      "lock": false,
+      "relay": true
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "ABCD012345670A04"
+  },
+  "d03738edfcc947f7b8f4573571d90d2d": {
+    "dev_class": "switching",
+    "members": [
+      "059e4d03c7a34d278add5c7a4a781d19",
+      "cfe95cf3de1948c0b8955125bf754614"
+    ],
+    "model": "Switchgroup",
+    "name": "Schakel",
+    "switches": {
+      "relay": true
+    },
+    "vendor": "Plugwise"
+  },
+  "d950b314e9d8499f968e6db8d82ef78c": {
+    "dev_class": "report",
+    "members": [
+      "059e4d03c7a34d278add5c7a4a781d19",
+      "5871317346d045bc9f6b987ef25ee638",
+      "aac7b735042c4832ac9ff33aae4f453b",
+      "cfe95cf3de1948c0b8955125bf754614",
+      "e1c884e7dede431dadee09506ec4f859"
+    ],
+    "model": "Switchgroup",
+    "name": "Stroomvreters",
+    "switches": {
+      "relay": true
+    },
+    "vendor": "Plugwise"
+  },
+  "e1c884e7dede431dadee09506ec4f859": {
+    "dev_class": "refrigerator",
+    "firmware": "2011-06-27T10:47:37+02:00",
+    "hardware": "6539-0700-7330",
+    "location": "0000aaaa0000aaaa0000aaaa0000aa00",
+    "model": "Circle+ type F",
+    "name": "Koelkast (92C4A)",
+    "sensors": {
+      "electricity_consumed": 50.5,
+      "electricity_consumed_interval": 0.08,
+      "electricity_produced": 0.0
+    },
+    "switches": {
+      "lock": false,
+      "relay": true
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "0123456789AB"
+  }
+}
diff --git a/tests/components/plugwise/snapshots/test_diagnostics.ambr b/tests/components/plugwise/snapshots/test_diagnostics.ambr
index 806c92fe7cb..92ed327b841 100644
--- a/tests/components/plugwise/snapshots/test_diagnostics.ambr
+++ b/tests/components/plugwise/snapshots/test_diagnostics.ambr
@@ -1,643 +1,633 @@
 # serializer version: 1
 # name: test_diagnostics
   dict({
-    'devices': dict({
-      '02cf28bfec924855854c544690a609ef': dict({
-        'available': True,
-        'dev_class': 'vcr_plug',
-        'firmware': '2019-06-21T02:00:00+02:00',
-        'location': 'cd143c07248f491493cea0533bc3d669',
-        'model': 'Plug',
-        'model_id': '160-01',
-        'name': 'NVR',
-        'sensors': dict({
-          'electricity_consumed': 34.0,
-          'electricity_consumed_interval': 9.15,
-          'electricity_produced': 0.0,
-          'electricity_produced_interval': 0.0,
-        }),
-        'switches': dict({
-          'lock': True,
-          'relay': True,
-        }),
-        'vendor': 'Plugwise',
-        'zigbee_mac_address': 'ABCD012345670A15',
+    '02cf28bfec924855854c544690a609ef': dict({
+      'available': True,
+      'dev_class': 'vcr_plug',
+      'firmware': '2019-06-21T02:00:00+02:00',
+      'location': 'cd143c07248f491493cea0533bc3d669',
+      'model': 'Plug',
+      'model_id': '160-01',
+      'name': 'NVR',
+      'sensors': dict({
+        'electricity_consumed': 34.0,
+        'electricity_consumed_interval': 9.15,
+        'electricity_produced': 0.0,
+        'electricity_produced_interval': 0.0,
       }),
-      '08963fec7c53423ca5680aa4cb502c63': dict({
-        'active_preset': 'away',
-        'available_schedules': list([
-          'CV Roan',
-          'Bios Schema met Film Avond',
-          'GF7  Woonkamer',
-          'Badkamer Schema',
-          'CV Jessie',
-          'off',
+      'switches': dict({
+        'lock': True,
+        'relay': True,
+      }),
+      'vendor': 'Plugwise',
+      'zigbee_mac_address': 'ABCD012345670A15',
+    }),
+    '08963fec7c53423ca5680aa4cb502c63': dict({
+      'active_preset': 'away',
+      'available_schedules': list([
+        'CV Roan',
+        'Bios Schema met Film Avond',
+        'GF7  Woonkamer',
+        'Badkamer Schema',
+        'CV Jessie',
+        'off',
+      ]),
+      'climate_mode': 'auto',
+      'control_state': 'idle',
+      'dev_class': 'climate',
+      'model': 'ThermoZone',
+      'name': 'Badkamer',
+      'preset_modes': list([
+        'home',
+        'asleep',
+        'away',
+        'vacation',
+        'no_frost',
+      ]),
+      'select_schedule': 'Badkamer Schema',
+      'sensors': dict({
+        'temperature': 18.9,
+      }),
+      'thermostat': dict({
+        'lower_bound': 0.0,
+        'resolution': 0.01,
+        'setpoint': 14.0,
+        'upper_bound': 100.0,
+      }),
+      'thermostats': dict({
+        'primary': list([
+          'f1fee6043d3642a9b0a65297455f008e',
+          '680423ff840043738f42cc7f1ff97a36',
         ]),
-        'climate_mode': 'auto',
-        'control_state': 'idle',
-        'dev_class': 'climate',
-        'model': 'ThermoZone',
-        'name': 'Badkamer',
-        'preset_modes': list([
-          'home',
-          'asleep',
-          'away',
-          'vacation',
-          'no_frost',
+        'secondary': list([
         ]),
-        'select_schedule': 'Badkamer Schema',
-        'sensors': dict({
-          'temperature': 18.9,
-        }),
-        'thermostat': dict({
-          'lower_bound': 0.0,
-          'resolution': 0.01,
-          'setpoint': 14.0,
-          'upper_bound': 100.0,
-        }),
-        'thermostats': dict({
-          'primary': list([
-            'f1fee6043d3642a9b0a65297455f008e',
-            '680423ff840043738f42cc7f1ff97a36',
-          ]),
-          'secondary': list([
-          ]),
-        }),
-        'vendor': 'Plugwise',
       }),
-      '12493538af164a409c6a1c79e38afe1c': dict({
-        'active_preset': 'away',
-        'available_schedules': list([
-          'CV Roan',
-          'Bios Schema met Film Avond',
-          'GF7  Woonkamer',
-          'Badkamer Schema',
-          'CV Jessie',
-          'off',
+      'vendor': 'Plugwise',
+    }),
+    '12493538af164a409c6a1c79e38afe1c': dict({
+      'active_preset': 'away',
+      'available_schedules': list([
+        'CV Roan',
+        'Bios Schema met Film Avond',
+        'GF7  Woonkamer',
+        'Badkamer Schema',
+        'CV Jessie',
+        'off',
+      ]),
+      'climate_mode': 'heat',
+      'control_state': 'idle',
+      'dev_class': 'climate',
+      'model': 'ThermoZone',
+      'name': 'Bios',
+      'preset_modes': list([
+        'home',
+        'asleep',
+        'away',
+        'vacation',
+        'no_frost',
+      ]),
+      'select_schedule': 'off',
+      'sensors': dict({
+        'electricity_consumed': 0.0,
+        'electricity_produced': 0.0,
+        'temperature': 16.5,
+      }),
+      'thermostat': dict({
+        'lower_bound': 0.0,
+        'resolution': 0.01,
+        'setpoint': 13.0,
+        'upper_bound': 100.0,
+      }),
+      'thermostats': dict({
+        'primary': list([
+          'df4a4a8169904cdb9c03d61a21f42140',
         ]),
-        'climate_mode': 'heat',
-        'control_state': 'idle',
-        'dev_class': 'climate',
-        'model': 'ThermoZone',
-        'name': 'Bios',
-        'preset_modes': list([
-          'home',
-          'asleep',
-          'away',
-          'vacation',
-          'no_frost',
+        'secondary': list([
+          'a2c3583e0a6349358998b760cea82d2a',
         ]),
-        'select_schedule': 'off',
-        'sensors': dict({
-          'electricity_consumed': 0.0,
-          'electricity_produced': 0.0,
-          'temperature': 16.5,
-        }),
-        'thermostat': dict({
-          'lower_bound': 0.0,
-          'resolution': 0.01,
-          'setpoint': 13.0,
-          'upper_bound': 100.0,
-        }),
-        'thermostats': dict({
-          'primary': list([
-            'df4a4a8169904cdb9c03d61a21f42140',
-          ]),
-          'secondary': list([
-            'a2c3583e0a6349358998b760cea82d2a',
-          ]),
-        }),
-        'vendor': 'Plugwise',
       }),
-      '21f2b542c49845e6bb416884c55778d6': dict({
-        'available': True,
-        'dev_class': 'game_console_plug',
-        'firmware': '2019-06-21T02:00:00+02:00',
-        'location': 'cd143c07248f491493cea0533bc3d669',
-        'model': 'Plug',
-        'model_id': '160-01',
-        'name': 'Playstation Smart Plug',
-        'sensors': dict({
-          'electricity_consumed': 84.1,
-          'electricity_consumed_interval': 8.6,
-          'electricity_produced': 0.0,
-          'electricity_produced_interval': 0.0,
-        }),
-        'switches': dict({
-          'lock': False,
-          'relay': True,
-        }),
-        'vendor': 'Plugwise',
-        'zigbee_mac_address': 'ABCD012345670A12',
+      'vendor': 'Plugwise',
+    }),
+    '21f2b542c49845e6bb416884c55778d6': dict({
+      'available': True,
+      'dev_class': 'game_console_plug',
+      'firmware': '2019-06-21T02:00:00+02:00',
+      'location': 'cd143c07248f491493cea0533bc3d669',
+      'model': 'Plug',
+      'model_id': '160-01',
+      'name': 'Playstation Smart Plug',
+      'sensors': dict({
+        'electricity_consumed': 84.1,
+        'electricity_consumed_interval': 8.6,
+        'electricity_produced': 0.0,
+        'electricity_produced_interval': 0.0,
       }),
-      '446ac08dd04d4eff8ac57489757b7314': dict({
-        'active_preset': 'no_frost',
-        'climate_mode': 'heat',
-        'control_state': 'idle',
-        'dev_class': 'climate',
-        'model': 'ThermoZone',
-        'name': 'Garage',
-        'preset_modes': list([
-          'home',
-          'asleep',
-          'away',
-          'vacation',
-          'no_frost',
+      'switches': dict({
+        'lock': False,
+        'relay': True,
+      }),
+      'vendor': 'Plugwise',
+      'zigbee_mac_address': 'ABCD012345670A12',
+    }),
+    '446ac08dd04d4eff8ac57489757b7314': dict({
+      'active_preset': 'no_frost',
+      'climate_mode': 'heat',
+      'control_state': 'idle',
+      'dev_class': 'climate',
+      'model': 'ThermoZone',
+      'name': 'Garage',
+      'preset_modes': list([
+        'home',
+        'asleep',
+        'away',
+        'vacation',
+        'no_frost',
+      ]),
+      'sensors': dict({
+        'temperature': 15.6,
+      }),
+      'thermostat': dict({
+        'lower_bound': 0.0,
+        'resolution': 0.01,
+        'setpoint': 5.5,
+        'upper_bound': 100.0,
+      }),
+      'thermostats': dict({
+        'primary': list([
+          'e7693eb9582644e5b865dba8d4447cf1',
         ]),
-        'sensors': dict({
-          'temperature': 15.6,
-        }),
-        'thermostat': dict({
-          'lower_bound': 0.0,
-          'resolution': 0.01,
-          'setpoint': 5.5,
-          'upper_bound': 100.0,
-        }),
-        'thermostats': dict({
-          'primary': list([
-            'e7693eb9582644e5b865dba8d4447cf1',
-          ]),
-          'secondary': list([
-          ]),
-        }),
-        'vendor': 'Plugwise',
-      }),
-      '4a810418d5394b3f82727340b91ba740': dict({
-        'available': True,
-        'dev_class': 'router_plug',
-        'firmware': '2019-06-21T02:00:00+02:00',
-        'location': 'cd143c07248f491493cea0533bc3d669',
-        'model': 'Plug',
-        'model_id': '160-01',
-        'name': 'USG Smart Plug',
-        'sensors': dict({
-          'electricity_consumed': 8.5,
-          'electricity_consumed_interval': 0.0,
-          'electricity_produced': 0.0,
-          'electricity_produced_interval': 0.0,
-        }),
-        'switches': dict({
-          'lock': True,
-          'relay': True,
-        }),
-        'vendor': 'Plugwise',
-        'zigbee_mac_address': 'ABCD012345670A16',
-      }),
-      '675416a629f343c495449970e2ca37b5': dict({
-        'available': True,
-        'dev_class': 'router_plug',
-        'firmware': '2019-06-21T02:00:00+02:00',
-        'location': 'cd143c07248f491493cea0533bc3d669',
-        'model': 'Plug',
-        'model_id': '160-01',
-        'name': 'Ziggo Modem',
-        'sensors': dict({
-          'electricity_consumed': 12.2,
-          'electricity_consumed_interval': 2.97,
-          'electricity_produced': 0.0,
-          'electricity_produced_interval': 0.0,
-        }),
-        'switches': dict({
-          'lock': True,
-          'relay': True,
-        }),
-        'vendor': 'Plugwise',
-        'zigbee_mac_address': 'ABCD012345670A01',
-      }),
-      '680423ff840043738f42cc7f1ff97a36': dict({
-        'available': True,
-        'binary_sensors': dict({
-          'low_battery': False,
-        }),
-        'dev_class': 'thermostatic_radiator_valve',
-        'firmware': '2019-03-27T01:00:00+01:00',
-        'hardware': '1',
-        'location': '08963fec7c53423ca5680aa4cb502c63',
-        'model': 'Tom/Floor',
-        'model_id': '106-03',
-        'name': 'Thermostatic Radiator Badkamer 1',
-        'sensors': dict({
-          'battery': 51,
-          'setpoint': 14.0,
-          'temperature': 19.1,
-          'temperature_difference': -0.4,
-          'valve_position': 0.0,
-        }),
-        'temperature_offset': dict({
-          'lower_bound': -2.0,
-          'resolution': 0.1,
-          'setpoint': 0.0,
-          'upper_bound': 2.0,
-        }),
-        'vendor': 'Plugwise',
-        'zigbee_mac_address': 'ABCD012345670A17',
-      }),
-      '6a3bf693d05e48e0b460c815a4fdd09d': dict({
-        'available': True,
-        'binary_sensors': dict({
-          'low_battery': False,
-        }),
-        'dev_class': 'zone_thermostat',
-        'firmware': '2016-10-27T02:00:00+02:00',
-        'hardware': '255',
-        'location': '82fa13f017d240daa0d0ea1775420f24',
-        'model': 'Lisa',
-        'model_id': '158-01',
-        'name': 'Zone Thermostat Jessie',
-        'sensors': dict({
-          'battery': 37,
-          'setpoint': 15.0,
-          'temperature': 17.2,
-        }),
-        'temperature_offset': dict({
-          'lower_bound': -2.0,
-          'resolution': 0.1,
-          'setpoint': 0.0,
-          'upper_bound': 2.0,
-        }),
-        'vendor': 'Plugwise',
-        'zigbee_mac_address': 'ABCD012345670A03',
-      }),
-      '78d1126fc4c743db81b61c20e88342a7': dict({
-        'available': True,
-        'dev_class': 'central_heating_pump_plug',
-        'firmware': '2019-06-21T02:00:00+02:00',
-        'location': 'c50f167537524366a5af7aa3942feb1e',
-        'model': 'Plug',
-        'model_id': '160-01',
-        'name': 'CV Pomp',
-        'sensors': dict({
-          'electricity_consumed': 35.6,
-          'electricity_consumed_interval': 7.37,
-          'electricity_produced': 0.0,
-          'electricity_produced_interval': 0.0,
-        }),
-        'switches': dict({
-          'relay': True,
-        }),
-        'vendor': 'Plugwise',
-        'zigbee_mac_address': 'ABCD012345670A05',
-      }),
-      '82fa13f017d240daa0d0ea1775420f24': dict({
-        'active_preset': 'asleep',
-        'available_schedules': list([
-          'CV Roan',
-          'Bios Schema met Film Avond',
-          'GF7  Woonkamer',
-          'Badkamer Schema',
-          'CV Jessie',
-          'off',
+        'secondary': list([
         ]),
-        'climate_mode': 'auto',
-        'control_state': 'idle',
-        'dev_class': 'climate',
-        'model': 'ThermoZone',
-        'name': 'Jessie',
-        'preset_modes': list([
-          'home',
-          'asleep',
-          'away',
-          'vacation',
-          'no_frost',
+      }),
+      'vendor': 'Plugwise',
+    }),
+    '4a810418d5394b3f82727340b91ba740': dict({
+      'available': True,
+      'dev_class': 'router_plug',
+      'firmware': '2019-06-21T02:00:00+02:00',
+      'location': 'cd143c07248f491493cea0533bc3d669',
+      'model': 'Plug',
+      'model_id': '160-01',
+      'name': 'USG Smart Plug',
+      'sensors': dict({
+        'electricity_consumed': 8.5,
+        'electricity_consumed_interval': 0.0,
+        'electricity_produced': 0.0,
+        'electricity_produced_interval': 0.0,
+      }),
+      'switches': dict({
+        'lock': True,
+        'relay': True,
+      }),
+      'vendor': 'Plugwise',
+      'zigbee_mac_address': 'ABCD012345670A16',
+    }),
+    '675416a629f343c495449970e2ca37b5': dict({
+      'available': True,
+      'dev_class': 'router_plug',
+      'firmware': '2019-06-21T02:00:00+02:00',
+      'location': 'cd143c07248f491493cea0533bc3d669',
+      'model': 'Plug',
+      'model_id': '160-01',
+      'name': 'Ziggo Modem',
+      'sensors': dict({
+        'electricity_consumed': 12.2,
+        'electricity_consumed_interval': 2.97,
+        'electricity_produced': 0.0,
+        'electricity_produced_interval': 0.0,
+      }),
+      'switches': dict({
+        'lock': True,
+        'relay': True,
+      }),
+      'vendor': 'Plugwise',
+      'zigbee_mac_address': 'ABCD012345670A01',
+    }),
+    '680423ff840043738f42cc7f1ff97a36': dict({
+      'available': True,
+      'binary_sensors': dict({
+        'low_battery': False,
+      }),
+      'dev_class': 'thermostatic_radiator_valve',
+      'firmware': '2019-03-27T01:00:00+01:00',
+      'hardware': '1',
+      'location': '08963fec7c53423ca5680aa4cb502c63',
+      'model': 'Tom/Floor',
+      'model_id': '106-03',
+      'name': 'Thermostatic Radiator Badkamer 1',
+      'sensors': dict({
+        'battery': 51,
+        'setpoint': 14.0,
+        'temperature': 19.1,
+        'temperature_difference': -0.4,
+        'valve_position': 0.0,
+      }),
+      'temperature_offset': dict({
+        'lower_bound': -2.0,
+        'resolution': 0.1,
+        'setpoint': 0.0,
+        'upper_bound': 2.0,
+      }),
+      'vendor': 'Plugwise',
+      'zigbee_mac_address': 'ABCD012345670A17',
+    }),
+    '6a3bf693d05e48e0b460c815a4fdd09d': dict({
+      'available': True,
+      'binary_sensors': dict({
+        'low_battery': False,
+      }),
+      'dev_class': 'zone_thermostat',
+      'firmware': '2016-10-27T02:00:00+02:00',
+      'hardware': '255',
+      'location': '82fa13f017d240daa0d0ea1775420f24',
+      'model': 'Lisa',
+      'model_id': '158-01',
+      'name': 'Zone Thermostat Jessie',
+      'sensors': dict({
+        'battery': 37,
+        'setpoint': 15.0,
+        'temperature': 17.2,
+      }),
+      'temperature_offset': dict({
+        'lower_bound': -2.0,
+        'resolution': 0.1,
+        'setpoint': 0.0,
+        'upper_bound': 2.0,
+      }),
+      'vendor': 'Plugwise',
+      'zigbee_mac_address': 'ABCD012345670A03',
+    }),
+    '78d1126fc4c743db81b61c20e88342a7': dict({
+      'available': True,
+      'dev_class': 'central_heating_pump_plug',
+      'firmware': '2019-06-21T02:00:00+02:00',
+      'location': 'c50f167537524366a5af7aa3942feb1e',
+      'model': 'Plug',
+      'model_id': '160-01',
+      'name': 'CV Pomp',
+      'sensors': dict({
+        'electricity_consumed': 35.6,
+        'electricity_consumed_interval': 7.37,
+        'electricity_produced': 0.0,
+        'electricity_produced_interval': 0.0,
+      }),
+      'switches': dict({
+        'relay': True,
+      }),
+      'vendor': 'Plugwise',
+      'zigbee_mac_address': 'ABCD012345670A05',
+    }),
+    '82fa13f017d240daa0d0ea1775420f24': dict({
+      'active_preset': 'asleep',
+      'available_schedules': list([
+        'CV Roan',
+        'Bios Schema met Film Avond',
+        'GF7  Woonkamer',
+        'Badkamer Schema',
+        'CV Jessie',
+        'off',
+      ]),
+      'climate_mode': 'auto',
+      'control_state': 'idle',
+      'dev_class': 'climate',
+      'model': 'ThermoZone',
+      'name': 'Jessie',
+      'preset_modes': list([
+        'home',
+        'asleep',
+        'away',
+        'vacation',
+        'no_frost',
+      ]),
+      'select_schedule': 'CV Jessie',
+      'sensors': dict({
+        'temperature': 17.2,
+      }),
+      'thermostat': dict({
+        'lower_bound': 0.0,
+        'resolution': 0.01,
+        'setpoint': 15.0,
+        'upper_bound': 100.0,
+      }),
+      'thermostats': dict({
+        'primary': list([
+          '6a3bf693d05e48e0b460c815a4fdd09d',
         ]),
-        'select_schedule': 'CV Jessie',
-        'sensors': dict({
-          'temperature': 17.2,
-        }),
-        'thermostat': dict({
-          'lower_bound': 0.0,
-          'resolution': 0.01,
-          'setpoint': 15.0,
-          'upper_bound': 100.0,
-        }),
-        'thermostats': dict({
-          'primary': list([
-            '6a3bf693d05e48e0b460c815a4fdd09d',
-          ]),
-          'secondary': list([
-            'd3da73bde12a47d5a6b8f9dad971f2ec',
-          ]),
-        }),
-        'vendor': 'Plugwise',
-      }),
-      '90986d591dcd426cae3ec3e8111ff730': dict({
-        'binary_sensors': dict({
-          'heating_state': True,
-        }),
-        'dev_class': 'heater_central',
-        'location': '1f9dcf83fd4e4b66b72ff787957bfe5d',
-        'model': 'Unknown',
-        'name': 'OnOff',
-        'sensors': dict({
-          'intended_boiler_temperature': 70.0,
-          'modulation_level': 1,
-          'water_temperature': 70.0,
-        }),
-      }),
-      'a28f588dc4a049a483fd03a30361ad3a': dict({
-        'available': True,
-        'dev_class': 'settop_plug',
-        'firmware': '2019-06-21T02:00:00+02:00',
-        'location': 'cd143c07248f491493cea0533bc3d669',
-        'model': 'Plug',
-        'model_id': '160-01',
-        'name': 'Fibaro HC2',
-        'sensors': dict({
-          'electricity_consumed': 12.5,
-          'electricity_consumed_interval': 3.8,
-          'electricity_produced': 0.0,
-          'electricity_produced_interval': 0.0,
-        }),
-        'switches': dict({
-          'lock': True,
-          'relay': True,
-        }),
-        'vendor': 'Plugwise',
-        'zigbee_mac_address': 'ABCD012345670A13',
-      }),
-      'a2c3583e0a6349358998b760cea82d2a': dict({
-        'available': True,
-        'binary_sensors': dict({
-          'low_battery': False,
-        }),
-        'dev_class': 'thermostatic_radiator_valve',
-        'firmware': '2019-03-27T01:00:00+01:00',
-        'hardware': '1',
-        'location': '12493538af164a409c6a1c79e38afe1c',
-        'model': 'Tom/Floor',
-        'model_id': '106-03',
-        'name': 'Bios Cv Thermostatic Radiator ',
-        'sensors': dict({
-          'battery': 62,
-          'setpoint': 13.0,
-          'temperature': 17.2,
-          'temperature_difference': -0.2,
-          'valve_position': 0.0,
-        }),
-        'temperature_offset': dict({
-          'lower_bound': -2.0,
-          'resolution': 0.1,
-          'setpoint': 0.0,
-          'upper_bound': 2.0,
-        }),
-        'vendor': 'Plugwise',
-        'zigbee_mac_address': 'ABCD012345670A09',
-      }),
-      'b310b72a0e354bfab43089919b9a88bf': dict({
-        'available': True,
-        'dev_class': 'thermostatic_radiator_valve',
-        'firmware': '2019-03-27T01:00:00+01:00',
-        'hardware': '1',
-        'location': 'c50f167537524366a5af7aa3942feb1e',
-        'model': 'Tom/Floor',
-        'model_id': '106-03',
-        'name': 'Floor kraan',
-        'sensors': dict({
-          'setpoint': 21.5,
-          'temperature': 26.0,
-          'temperature_difference': 3.5,
-          'valve_position': 100,
-        }),
-        'temperature_offset': dict({
-          'lower_bound': -2.0,
-          'resolution': 0.1,
-          'setpoint': 0.0,
-          'upper_bound': 2.0,
-        }),
-        'vendor': 'Plugwise',
-        'zigbee_mac_address': 'ABCD012345670A02',
-      }),
-      'b59bcebaf94b499ea7d46e4a66fb62d8': dict({
-        'available': True,
-        'binary_sensors': dict({
-          'low_battery': False,
-        }),
-        'dev_class': 'zone_thermostat',
-        'firmware': '2016-08-02T02:00:00+02:00',
-        'hardware': '255',
-        'location': 'c50f167537524366a5af7aa3942feb1e',
-        'model': 'Lisa',
-        'model_id': '158-01',
-        'name': 'Zone Lisa WK',
-        'sensors': dict({
-          'battery': 34,
-          'setpoint': 21.5,
-          'temperature': 20.9,
-        }),
-        'temperature_offset': dict({
-          'lower_bound': -2.0,
-          'resolution': 0.1,
-          'setpoint': 0.0,
-          'upper_bound': 2.0,
-        }),
-        'vendor': 'Plugwise',
-        'zigbee_mac_address': 'ABCD012345670A07',
-      }),
-      'c50f167537524366a5af7aa3942feb1e': dict({
-        'active_preset': 'home',
-        'available_schedules': list([
-          'CV Roan',
-          'Bios Schema met Film Avond',
-          'GF7  Woonkamer',
-          'Badkamer Schema',
-          'CV Jessie',
-          'off',
+        'secondary': list([
+          'd3da73bde12a47d5a6b8f9dad971f2ec',
         ]),
-        'climate_mode': 'auto',
-        'control_state': 'heating',
-        'dev_class': 'climate',
-        'model': 'ThermoZone',
-        'name': 'Woonkamer',
-        'preset_modes': list([
-          'home',
-          'asleep',
-          'away',
-          'vacation',
-          'no_frost',
-        ]),
-        'select_schedule': 'GF7  Woonkamer',
-        'sensors': dict({
-          'electricity_consumed': 35.6,
-          'electricity_produced': 0.0,
-          'temperature': 20.9,
-        }),
-        'thermostat': dict({
-          'lower_bound': 0.0,
-          'resolution': 0.01,
-          'setpoint': 21.5,
-          'upper_bound': 100.0,
-        }),
-        'thermostats': dict({
-          'primary': list([
-            'b59bcebaf94b499ea7d46e4a66fb62d8',
-          ]),
-          'secondary': list([
-            'b310b72a0e354bfab43089919b9a88bf',
-          ]),
-        }),
-        'vendor': 'Plugwise',
       }),
-      'cd0ddb54ef694e11ac18ed1cbce5dbbd': dict({
-        'available': True,
-        'dev_class': 'vcr_plug',
-        'firmware': '2019-06-21T02:00:00+02:00',
-        'location': 'cd143c07248f491493cea0533bc3d669',
-        'model': 'Plug',
-        'model_id': '160-01',
-        'name': 'NAS',
-        'sensors': dict({
-          'electricity_consumed': 16.5,
-          'electricity_consumed_interval': 0.5,
-          'electricity_produced': 0.0,
-          'electricity_produced_interval': 0.0,
-        }),
-        'switches': dict({
-          'lock': True,
-          'relay': True,
-        }),
-        'vendor': 'Plugwise',
-        'zigbee_mac_address': 'ABCD012345670A14',
+      'vendor': 'Plugwise',
+    }),
+    '90986d591dcd426cae3ec3e8111ff730': dict({
+      'binary_sensors': dict({
+        'heating_state': True,
       }),
-      'd3da73bde12a47d5a6b8f9dad971f2ec': dict({
-        'available': True,
-        'binary_sensors': dict({
-          'low_battery': False,
-        }),
-        'dev_class': 'thermostatic_radiator_valve',
-        'firmware': '2019-03-27T01:00:00+01:00',
-        'hardware': '1',
-        'location': '82fa13f017d240daa0d0ea1775420f24',
-        'model': 'Tom/Floor',
-        'model_id': '106-03',
-        'name': 'Thermostatic Radiator Jessie',
-        'sensors': dict({
-          'battery': 62,
-          'setpoint': 15.0,
-          'temperature': 17.1,
-          'temperature_difference': 0.1,
-          'valve_position': 0.0,
-        }),
-        'temperature_offset': dict({
-          'lower_bound': -2.0,
-          'resolution': 0.1,
-          'setpoint': 0.0,
-          'upper_bound': 2.0,
-        }),
-        'vendor': 'Plugwise',
-        'zigbee_mac_address': 'ABCD012345670A10',
-      }),
-      'df4a4a8169904cdb9c03d61a21f42140': dict({
-        'available': True,
-        'binary_sensors': dict({
-          'low_battery': False,
-        }),
-        'dev_class': 'zone_thermostat',
-        'firmware': '2016-10-27T02:00:00+02:00',
-        'hardware': '255',
-        'location': '12493538af164a409c6a1c79e38afe1c',
-        'model': 'Lisa',
-        'model_id': '158-01',
-        'name': 'Zone Lisa Bios',
-        'sensors': dict({
-          'battery': 67,
-          'setpoint': 13.0,
-          'temperature': 16.5,
-        }),
-        'temperature_offset': dict({
-          'lower_bound': -2.0,
-          'resolution': 0.1,
-          'setpoint': 0.0,
-          'upper_bound': 2.0,
-        }),
-        'vendor': 'Plugwise',
-        'zigbee_mac_address': 'ABCD012345670A06',
-      }),
-      'e7693eb9582644e5b865dba8d4447cf1': dict({
-        'available': True,
-        'binary_sensors': dict({
-          'low_battery': False,
-        }),
-        'dev_class': 'thermostatic_radiator_valve',
-        'firmware': '2019-03-27T01:00:00+01:00',
-        'hardware': '1',
-        'location': '446ac08dd04d4eff8ac57489757b7314',
-        'model': 'Tom/Floor',
-        'model_id': '106-03',
-        'name': 'CV Kraan Garage',
-        'sensors': dict({
-          'battery': 68,
-          'setpoint': 5.5,
-          'temperature': 15.6,
-          'temperature_difference': 0.0,
-          'valve_position': 0.0,
-        }),
-        'temperature_offset': dict({
-          'lower_bound': -2.0,
-          'resolution': 0.1,
-          'setpoint': 0.0,
-          'upper_bound': 2.0,
-        }),
-        'vendor': 'Plugwise',
-        'zigbee_mac_address': 'ABCD012345670A11',
-      }),
-      'f1fee6043d3642a9b0a65297455f008e': dict({
-        'available': True,
-        'binary_sensors': dict({
-          'low_battery': False,
-        }),
-        'dev_class': 'thermostatic_radiator_valve',
-        'firmware': '2016-10-27T02:00:00+02:00',
-        'hardware': '255',
-        'location': '08963fec7c53423ca5680aa4cb502c63',
-        'model': 'Lisa',
-        'model_id': '158-01',
-        'name': 'Thermostatic Radiator Badkamer 2',
-        'sensors': dict({
-          'battery': 92,
-          'setpoint': 14.0,
-          'temperature': 18.9,
-        }),
-        'temperature_offset': dict({
-          'lower_bound': -2.0,
-          'resolution': 0.1,
-          'setpoint': 0.0,
-          'upper_bound': 2.0,
-        }),
-        'vendor': 'Plugwise',
-        'zigbee_mac_address': 'ABCD012345670A08',
-      }),
-      'fe799307f1624099878210aa0b9f1475': dict({
-        'binary_sensors': dict({
-          'plugwise_notification': True,
-        }),
-        'dev_class': 'gateway',
-        'firmware': '3.0.15',
-        'hardware': 'AME Smile 2.0 board',
-        'location': '1f9dcf83fd4e4b66b72ff787957bfe5d',
-        'mac_address': '012345670001',
-        'model': 'Gateway',
-        'model_id': 'smile_open_therm',
-        'name': 'Adam',
-        'select_regulation_mode': 'heating',
-        'sensors': dict({
-          'outdoor_temperature': 7.81,
-        }),
-        'vendor': 'Plugwise',
-        'zigbee_mac_address': 'ABCD012345670101',
+      'dev_class': 'heater_central',
+      'location': '1f9dcf83fd4e4b66b72ff787957bfe5d',
+      'model': 'Unknown',
+      'name': 'OnOff',
+      'sensors': dict({
+        'intended_boiler_temperature': 70.0,
+        'modulation_level': 1,
+        'water_temperature': 70.0,
       }),
     }),
-    'gateway': dict({
-      'cooling_present': False,
-      'gateway_id': 'fe799307f1624099878210aa0b9f1475',
-      'heater_id': '90986d591dcd426cae3ec3e8111ff730',
-      'item_count': 369,
+    'a28f588dc4a049a483fd03a30361ad3a': dict({
+      'available': True,
+      'dev_class': 'settop_plug',
+      'firmware': '2019-06-21T02:00:00+02:00',
+      'location': 'cd143c07248f491493cea0533bc3d669',
+      'model': 'Plug',
+      'model_id': '160-01',
+      'name': 'Fibaro HC2',
+      'sensors': dict({
+        'electricity_consumed': 12.5,
+        'electricity_consumed_interval': 3.8,
+        'electricity_produced': 0.0,
+        'electricity_produced_interval': 0.0,
+      }),
+      'switches': dict({
+        'lock': True,
+        'relay': True,
+      }),
+      'vendor': 'Plugwise',
+      'zigbee_mac_address': 'ABCD012345670A13',
+    }),
+    'a2c3583e0a6349358998b760cea82d2a': dict({
+      'available': True,
+      'binary_sensors': dict({
+        'low_battery': False,
+      }),
+      'dev_class': 'thermostatic_radiator_valve',
+      'firmware': '2019-03-27T01:00:00+01:00',
+      'hardware': '1',
+      'location': '12493538af164a409c6a1c79e38afe1c',
+      'model': 'Tom/Floor',
+      'model_id': '106-03',
+      'name': 'Bios Cv Thermostatic Radiator ',
+      'sensors': dict({
+        'battery': 62,
+        'setpoint': 13.0,
+        'temperature': 17.2,
+        'temperature_difference': -0.2,
+        'valve_position': 0.0,
+      }),
+      'temperature_offset': dict({
+        'lower_bound': -2.0,
+        'resolution': 0.1,
+        'setpoint': 0.0,
+        'upper_bound': 2.0,
+      }),
+      'vendor': 'Plugwise',
+      'zigbee_mac_address': 'ABCD012345670A09',
+    }),
+    'b310b72a0e354bfab43089919b9a88bf': dict({
+      'available': True,
+      'dev_class': 'thermostatic_radiator_valve',
+      'firmware': '2019-03-27T01:00:00+01:00',
+      'hardware': '1',
+      'location': 'c50f167537524366a5af7aa3942feb1e',
+      'model': 'Tom/Floor',
+      'model_id': '106-03',
+      'name': 'Floor kraan',
+      'sensors': dict({
+        'setpoint': 21.5,
+        'temperature': 26.0,
+        'temperature_difference': 3.5,
+        'valve_position': 100,
+      }),
+      'temperature_offset': dict({
+        'lower_bound': -2.0,
+        'resolution': 0.1,
+        'setpoint': 0.0,
+        'upper_bound': 2.0,
+      }),
+      'vendor': 'Plugwise',
+      'zigbee_mac_address': 'ABCD012345670A02',
+    }),
+    'b59bcebaf94b499ea7d46e4a66fb62d8': dict({
+      'available': True,
+      'binary_sensors': dict({
+        'low_battery': False,
+      }),
+      'dev_class': 'zone_thermostat',
+      'firmware': '2016-08-02T02:00:00+02:00',
+      'hardware': '255',
+      'location': 'c50f167537524366a5af7aa3942feb1e',
+      'model': 'Lisa',
+      'model_id': '158-01',
+      'name': 'Zone Lisa WK',
+      'sensors': dict({
+        'battery': 34,
+        'setpoint': 21.5,
+        'temperature': 20.9,
+      }),
+      'temperature_offset': dict({
+        'lower_bound': -2.0,
+        'resolution': 0.1,
+        'setpoint': 0.0,
+        'upper_bound': 2.0,
+      }),
+      'vendor': 'Plugwise',
+      'zigbee_mac_address': 'ABCD012345670A07',
+    }),
+    'c50f167537524366a5af7aa3942feb1e': dict({
+      'active_preset': 'home',
+      'available_schedules': list([
+        'CV Roan',
+        'Bios Schema met Film Avond',
+        'GF7  Woonkamer',
+        'Badkamer Schema',
+        'CV Jessie',
+        'off',
+      ]),
+      'climate_mode': 'auto',
+      'control_state': 'heating',
+      'dev_class': 'climate',
+      'model': 'ThermoZone',
+      'name': 'Woonkamer',
+      'preset_modes': list([
+        'home',
+        'asleep',
+        'away',
+        'vacation',
+        'no_frost',
+      ]),
+      'select_schedule': 'GF7  Woonkamer',
+      'sensors': dict({
+        'electricity_consumed': 35.6,
+        'electricity_produced': 0.0,
+        'temperature': 20.9,
+      }),
+      'thermostat': dict({
+        'lower_bound': 0.0,
+        'resolution': 0.01,
+        'setpoint': 21.5,
+        'upper_bound': 100.0,
+      }),
+      'thermostats': dict({
+        'primary': list([
+          'b59bcebaf94b499ea7d46e4a66fb62d8',
+        ]),
+        'secondary': list([
+          'b310b72a0e354bfab43089919b9a88bf',
+        ]),
+      }),
+      'vendor': 'Plugwise',
+    }),
+    'cd0ddb54ef694e11ac18ed1cbce5dbbd': dict({
+      'available': True,
+      'dev_class': 'vcr_plug',
+      'firmware': '2019-06-21T02:00:00+02:00',
+      'location': 'cd143c07248f491493cea0533bc3d669',
+      'model': 'Plug',
+      'model_id': '160-01',
+      'name': 'NAS',
+      'sensors': dict({
+        'electricity_consumed': 16.5,
+        'electricity_consumed_interval': 0.5,
+        'electricity_produced': 0.0,
+        'electricity_produced_interval': 0.0,
+      }),
+      'switches': dict({
+        'lock': True,
+        'relay': True,
+      }),
+      'vendor': 'Plugwise',
+      'zigbee_mac_address': 'ABCD012345670A14',
+    }),
+    'd3da73bde12a47d5a6b8f9dad971f2ec': dict({
+      'available': True,
+      'binary_sensors': dict({
+        'low_battery': False,
+      }),
+      'dev_class': 'thermostatic_radiator_valve',
+      'firmware': '2019-03-27T01:00:00+01:00',
+      'hardware': '1',
+      'location': '82fa13f017d240daa0d0ea1775420f24',
+      'model': 'Tom/Floor',
+      'model_id': '106-03',
+      'name': 'Thermostatic Radiator Jessie',
+      'sensors': dict({
+        'battery': 62,
+        'setpoint': 15.0,
+        'temperature': 17.1,
+        'temperature_difference': 0.1,
+        'valve_position': 0.0,
+      }),
+      'temperature_offset': dict({
+        'lower_bound': -2.0,
+        'resolution': 0.1,
+        'setpoint': 0.0,
+        'upper_bound': 2.0,
+      }),
+      'vendor': 'Plugwise',
+      'zigbee_mac_address': 'ABCD012345670A10',
+    }),
+    'df4a4a8169904cdb9c03d61a21f42140': dict({
+      'available': True,
+      'binary_sensors': dict({
+        'low_battery': False,
+      }),
+      'dev_class': 'zone_thermostat',
+      'firmware': '2016-10-27T02:00:00+02:00',
+      'hardware': '255',
+      'location': '12493538af164a409c6a1c79e38afe1c',
+      'model': 'Lisa',
+      'model_id': '158-01',
+      'name': 'Zone Lisa Bios',
+      'sensors': dict({
+        'battery': 67,
+        'setpoint': 13.0,
+        'temperature': 16.5,
+      }),
+      'temperature_offset': dict({
+        'lower_bound': -2.0,
+        'resolution': 0.1,
+        'setpoint': 0.0,
+        'upper_bound': 2.0,
+      }),
+      'vendor': 'Plugwise',
+      'zigbee_mac_address': 'ABCD012345670A06',
+    }),
+    'e7693eb9582644e5b865dba8d4447cf1': dict({
+      'available': True,
+      'binary_sensors': dict({
+        'low_battery': False,
+      }),
+      'dev_class': 'thermostatic_radiator_valve',
+      'firmware': '2019-03-27T01:00:00+01:00',
+      'hardware': '1',
+      'location': '446ac08dd04d4eff8ac57489757b7314',
+      'model': 'Tom/Floor',
+      'model_id': '106-03',
+      'name': 'CV Kraan Garage',
+      'sensors': dict({
+        'battery': 68,
+        'setpoint': 5.5,
+        'temperature': 15.6,
+        'temperature_difference': 0.0,
+        'valve_position': 0.0,
+      }),
+      'temperature_offset': dict({
+        'lower_bound': -2.0,
+        'resolution': 0.1,
+        'setpoint': 0.0,
+        'upper_bound': 2.0,
+      }),
+      'vendor': 'Plugwise',
+      'zigbee_mac_address': 'ABCD012345670A11',
+    }),
+    'f1fee6043d3642a9b0a65297455f008e': dict({
+      'available': True,
+      'binary_sensors': dict({
+        'low_battery': False,
+      }),
+      'dev_class': 'thermostatic_radiator_valve',
+      'firmware': '2016-10-27T02:00:00+02:00',
+      'hardware': '255',
+      'location': '08963fec7c53423ca5680aa4cb502c63',
+      'model': 'Lisa',
+      'model_id': '158-01',
+      'name': 'Thermostatic Radiator Badkamer 2',
+      'sensors': dict({
+        'battery': 92,
+        'setpoint': 14.0,
+        'temperature': 18.9,
+      }),
+      'temperature_offset': dict({
+        'lower_bound': -2.0,
+        'resolution': 0.1,
+        'setpoint': 0.0,
+        'upper_bound': 2.0,
+      }),
+      'vendor': 'Plugwise',
+      'zigbee_mac_address': 'ABCD012345670A08',
+    }),
+    'fe799307f1624099878210aa0b9f1475': dict({
+      'binary_sensors': dict({
+        'plugwise_notification': True,
+      }),
+      'dev_class': 'gateway',
+      'firmware': '3.0.15',
+      'hardware': 'AME Smile 2.0 board',
+      'location': '1f9dcf83fd4e4b66b72ff787957bfe5d',
+      'mac_address': '012345670001',
+      'model': 'Gateway',
+      'model_id': 'smile_open_therm',
+      'name': 'Adam',
       'notifications': dict({
         'af82e4ccf9c548528166d38e560662a4': dict({
           'warning': "Node Plug (with MAC address 000D6F000D13CB01, in room 'n.a.') has been unreachable since 23:03 2020-01-18. Please check the connection and restart the device.",
         }),
       }),
-      'reboot': True,
-      'smile_name': 'Adam',
+      'select_regulation_mode': 'heating',
+      'sensors': dict({
+        'outdoor_temperature': 7.81,
+      }),
+      'vendor': 'Plugwise',
+      'zigbee_mac_address': 'ABCD012345670101',
     }),
   })
 # ---
diff --git a/tests/components/plugwise/test_binary_sensor.py b/tests/components/plugwise/test_binary_sensor.py
index 554326a72b1..7bf475086af 100644
--- a/tests/components/plugwise/test_binary_sensor.py
+++ b/tests/components/plugwise/test_binary_sensor.py
@@ -12,6 +12,7 @@ from tests.common import MockConfigEntry
 
 
 @pytest.mark.parametrize("chosen_env", ["anna_heatpump_heating"], indirect=True)
+@pytest.mark.parametrize("cooling_present", [True], indirect=True)
 @pytest.mark.parametrize(
     ("entity_id", "expected_state"),
     [
@@ -35,6 +36,7 @@ async def test_anna_climate_binary_sensor_entities(
 
 
 @pytest.mark.parametrize("chosen_env", ["anna_heatpump_heating"], indirect=True)
+@pytest.mark.parametrize("cooling_present", [True], indirect=True)
 async def test_anna_climate_binary_sensor_change(
     hass: HomeAssistant, mock_smile_anna: MagicMock, init_integration: MockConfigEntry
 ) -> None:
diff --git a/tests/components/plugwise/test_climate.py b/tests/components/plugwise/test_climate.py
index ab6bd3d4f29..7a481285be0 100644
--- a/tests/components/plugwise/test_climate.py
+++ b/tests/components/plugwise/test_climate.py
@@ -80,6 +80,7 @@ async def test_adam_climate_entity_attributes(
 
 
 @pytest.mark.parametrize("chosen_env", ["m_adam_heating"], indirect=True)
+@pytest.mark.parametrize("cooling_present", [False], indirect=True)
 async def test_adam_2_climate_entity_attributes(
     hass: HomeAssistant,
     mock_smile_adam_heat_cool: MagicMock,
@@ -108,6 +109,7 @@ async def test_adam_2_climate_entity_attributes(
 
 
 @pytest.mark.parametrize("chosen_env", ["m_adam_cooling"], indirect=True)
+@pytest.mark.parametrize("cooling_present", [True], indirect=True)
 async def test_adam_3_climate_entity_attributes(
     hass: HomeAssistant,
     mock_smile_adam_heat_cool: MagicMock,
@@ -125,18 +127,10 @@ async def test_adam_3_climate_entity_attributes(
         HVACMode.COOL,
     ]
     data = mock_smile_adam_heat_cool.async_update.return_value
-    data.devices["da224107914542988a88561b4452b0f6"]["select_regulation_mode"] = (
-        "heating"
-    )
-    data.devices["f2bf9048bef64cc5b6d5110154e33c81"]["control_state"] = (
-        HVACAction.HEATING
-    )
-    data.devices["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"][
-        "cooling_state"
-    ] = False
-    data.devices["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"][
-        "heating_state"
-    ] = True
+    data["da224107914542988a88561b4452b0f6"]["select_regulation_mode"] = "heating"
+    data["f2bf9048bef64cc5b6d5110154e33c81"]["control_state"] = HVACAction.HEATING
+    data["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"]["cooling_state"] = False
+    data["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"]["heating_state"] = True
     with patch(HA_PLUGWISE_SMILE_ASYNC_UPDATE, return_value=data):
         freezer.tick(timedelta(minutes=1))
         async_fire_time_changed(hass)
@@ -153,18 +147,10 @@ async def test_adam_3_climate_entity_attributes(
         ]
 
     data = mock_smile_adam_heat_cool.async_update.return_value
-    data.devices["da224107914542988a88561b4452b0f6"]["select_regulation_mode"] = (
-        "cooling"
-    )
-    data.devices["f2bf9048bef64cc5b6d5110154e33c81"]["control_state"] = (
-        HVACAction.COOLING
-    )
-    data.devices["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"][
-        "cooling_state"
-    ] = True
-    data.devices["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"][
-        "heating_state"
-    ] = False
+    data["da224107914542988a88561b4452b0f6"]["select_regulation_mode"] = "cooling"
+    data["f2bf9048bef64cc5b6d5110154e33c81"]["control_state"] = HVACAction.COOLING
+    data["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"]["cooling_state"] = True
+    data["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"]["heating_state"] = False
     with patch(HA_PLUGWISE_SMILE_ASYNC_UPDATE, return_value=data):
         freezer.tick(timedelta(minutes=1))
         async_fire_time_changed(hass)
@@ -323,6 +309,7 @@ async def test_adam_climate_off_mode_change(
 
 
 @pytest.mark.parametrize("chosen_env", ["anna_heatpump_heating"], indirect=True)
+@pytest.mark.parametrize("cooling_present", [True], indirect=True)
 async def test_anna_climate_entity_attributes(
     hass: HomeAssistant,
     mock_smile_anna: MagicMock,
@@ -349,6 +336,7 @@ async def test_anna_climate_entity_attributes(
 
 
 @pytest.mark.parametrize("chosen_env", ["m_anna_heatpump_cooling"], indirect=True)
+@pytest.mark.parametrize("cooling_present", [True], indirect=True)
 async def test_anna_2_climate_entity_attributes(
     hass: HomeAssistant,
     mock_smile_anna: MagicMock,
@@ -369,6 +357,7 @@ async def test_anna_2_climate_entity_attributes(
 
 
 @pytest.mark.parametrize("chosen_env", ["m_anna_heatpump_idle"], indirect=True)
+@pytest.mark.parametrize("cooling_present", [True], indirect=True)
 async def test_anna_3_climate_entity_attributes(
     hass: HomeAssistant,
     mock_smile_anna: MagicMock,
@@ -386,6 +375,7 @@ async def test_anna_3_climate_entity_attributes(
 
 
 @pytest.mark.parametrize("chosen_env", ["anna_heatpump_heating"], indirect=True)
+@pytest.mark.parametrize("cooling_present", [True], indirect=True)
 async def test_anna_climate_entity_climate_changes(
     hass: HomeAssistant,
     mock_smile_anna: MagicMock,
@@ -441,7 +431,7 @@ async def test_anna_climate_entity_climate_changes(
     )
 
     data = mock_smile_anna.async_update.return_value
-    data.devices["3cb70739631c4d17a86b8b12e8a5161b"].pop("available_schedules")
+    data["3cb70739631c4d17a86b8b12e8a5161b"].pop("available_schedules")
     with patch(HA_PLUGWISE_SMILE_ASYNC_UPDATE, return_value=data):
         freezer.tick(timedelta(minutes=1))
         async_fire_time_changed(hass)
diff --git a/tests/components/plugwise/test_init.py b/tests/components/plugwise/test_init.py
index 874c4b61a47..5f1f065fa90 100644
--- a/tests/components/plugwise/test_init.py
+++ b/tests/components/plugwise/test_init.py
@@ -62,6 +62,7 @@ TOM = {
 
 
 @pytest.mark.parametrize("chosen_env", ["anna_heatpump_heating"], indirect=True)
+@pytest.mark.parametrize("cooling_present", [True], indirect=True)
 async def test_load_unload_config_entry(
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,
@@ -82,6 +83,7 @@ async def test_load_unload_config_entry(
 
 
 @pytest.mark.parametrize("chosen_env", ["anna_heatpump_heating"], indirect=True)
+@pytest.mark.parametrize("cooling_present", [True], indirect=True)
 @pytest.mark.parametrize(
     ("side_effect", "entry_state"),
     [
@@ -138,6 +140,7 @@ async def test_device_in_dr(
 
 
 @pytest.mark.parametrize("chosen_env", ["anna_heatpump_heating"], indirect=True)
+@pytest.mark.parametrize("cooling_present", [True], indirect=True)
 @pytest.mark.parametrize(
     ("entitydata", "old_unique_id", "new_unique_id"),
     [
@@ -232,6 +235,7 @@ async def test_migrate_unique_id_relay(
 
 
 @pytest.mark.parametrize("chosen_env", ["m_adam_heating"], indirect=True)
+@pytest.mark.parametrize("cooling_present", [True], indirect=True)
 async def test_update_device(
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,
@@ -265,8 +269,8 @@ async def test_update_device(
     )
 
     # Add a 2nd Tom/Floor
-    data.devices.update(TOM)
-    data.devices["f871b8c4d63549319221e294e4f88074"]["thermostats"].update(
+    data.update(TOM)
+    data["f871b8c4d63549319221e294e4f88074"]["thermostats"].update(
         {
             "secondary": [
                 "01234567890abcdefghijklmnopqrstu",
@@ -301,10 +305,10 @@ async def test_update_device(
         assert "01234567890abcdefghijklmnopqrstu" in item_list
 
     # Remove the existing Tom/Floor
-    data.devices["f871b8c4d63549319221e294e4f88074"]["thermostats"].update(
+    data["f871b8c4d63549319221e294e4f88074"]["thermostats"].update(
         {"secondary": ["01234567890abcdefghijklmnopqrstu"]}
     )
-    data.devices.pop("1772a4ea304041adb83f357b751341ff")
+    data.pop("1772a4ea304041adb83f357b751341ff")
     with patch(HA_PLUGWISE_SMILE_ASYNC_UPDATE, return_value=data):
         freezer.tick(timedelta(minutes=1))
         async_fire_time_changed(hass)
diff --git a/tests/components/plugwise/test_number.py b/tests/components/plugwise/test_number.py
index c5361433388..4ae461d96c8 100644
--- a/tests/components/plugwise/test_number.py
+++ b/tests/components/plugwise/test_number.py
@@ -17,6 +17,7 @@ from tests.common import MockConfigEntry
 
 
 @pytest.mark.parametrize("chosen_env", ["anna_heatpump_heating"], indirect=True)
+@pytest.mark.parametrize("cooling_present", [True], indirect=True)
 async def test_anna_number_entities(
     hass: HomeAssistant, mock_smile_anna: MagicMock, init_integration: MockConfigEntry
 ) -> None:
@@ -27,6 +28,7 @@ async def test_anna_number_entities(
 
 
 @pytest.mark.parametrize("chosen_env", ["anna_heatpump_heating"], indirect=True)
+@pytest.mark.parametrize("cooling_present", [True], indirect=True)
 async def test_anna_max_boiler_temp_change(
     hass: HomeAssistant, mock_smile_anna: MagicMock, init_integration: MockConfigEntry
 ) -> None:
@@ -48,6 +50,7 @@ async def test_anna_max_boiler_temp_change(
 
 
 @pytest.mark.parametrize("chosen_env", ["m_adam_heating"], indirect=True)
+@pytest.mark.parametrize("cooling_present", [False], indirect=True)
 async def test_adam_dhw_setpoint_change(
     hass: HomeAssistant,
     mock_smile_adam_heat_cool: MagicMock,
diff --git a/tests/components/plugwise/test_select.py b/tests/components/plugwise/test_select.py
index f06d07767f3..f6c4205b756 100644
--- a/tests/components/plugwise/test_select.py
+++ b/tests/components/plugwise/test_select.py
@@ -51,6 +51,7 @@ async def test_adam_change_select_entity(
 
 
 @pytest.mark.parametrize("chosen_env", ["m_adam_cooling"], indirect=True)
+@pytest.mark.parametrize("cooling_present", [True], indirect=True)
 async def test_adam_select_regulation_mode(
     hass: HomeAssistant,
     mock_smile_adam_heat_cool: MagicMock,
@@ -95,6 +96,7 @@ async def test_legacy_anna_select_entities(
 
 
 @pytest.mark.parametrize("chosen_env", ["anna_heatpump_heating"], indirect=True)
+@pytest.mark.parametrize("cooling_present", [True], indirect=True)
 async def test_adam_select_unavailable_regulation_mode(
     hass: HomeAssistant, mock_smile_anna: MagicMock, init_integration: MockConfigEntry
 ) -> None:
diff --git a/tests/components/plugwise/test_sensor.py b/tests/components/plugwise/test_sensor.py
index b3243d6b127..c6c6c6cc284 100644
--- a/tests/components/plugwise/test_sensor.py
+++ b/tests/components/plugwise/test_sensor.py
@@ -7,8 +7,8 @@ import pytest
 from homeassistant.components.plugwise.const import DOMAIN
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_component import async_update_entity
-import homeassistant.helpers.entity_registry as er
 
 from tests.common import MockConfigEntry
 
@@ -95,6 +95,7 @@ async def test_unique_id_migration_humidity(
 
 
 @pytest.mark.parametrize("chosen_env", ["anna_heatpump_heating"], indirect=True)
+@pytest.mark.parametrize("cooling_present", [True], indirect=True)
 async def test_anna_as_smt_climate_sensor_entities(
     hass: HomeAssistant, mock_smile_anna: MagicMock, init_integration: MockConfigEntry
 ) -> None:
diff --git a/tests/components/plugwise/test_switch.py b/tests/components/plugwise/test_switch.py
index fa8a8a434e7..003c47ed1f4 100644
--- a/tests/components/plugwise/test_switch.py
+++ b/tests/components/plugwise/test_switch.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from tests.common import MockConfigEntry
 
diff --git a/tests/components/poolsense/snapshots/test_binary_sensor.ambr b/tests/components/poolsense/snapshots/test_binary_sensor.ambr
index 8a6d39332d4..b3d99b95308 100644
--- a/tests/components/poolsense/snapshots/test_binary_sensor.ambr
+++ b/tests/components/poolsense/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/poolsense/snapshots/test_sensor.ambr b/tests/components/poolsense/snapshots/test_sensor.ambr
index 9029f1f24aa..c0066ba9396 100644
--- a/tests/components/poolsense/snapshots/test_sensor.ambr
+++ b/tests/components/poolsense/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -55,6 +56,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -103,6 +105,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -151,6 +154,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -199,6 +203,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -247,6 +252,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -295,6 +301,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -342,6 +349,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -389,6 +397,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/powerfox/snapshots/test_sensor.ambr b/tests/components/powerfox/snapshots/test_sensor.ambr
index a2aa8a9c72c..bae306ccabc 100644
--- a/tests/components/powerfox/snapshots/test_sensor.ambr
+++ b/tests/components/powerfox/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -107,6 +109,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -158,6 +161,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -209,6 +213,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -260,6 +265,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -311,6 +317,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -362,6 +369,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -413,6 +421,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -464,6 +473,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -515,6 +525,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/powerwall/test_config_flow.py b/tests/components/powerwall/test_config_flow.py
index cd4f1250aa4..ab5034de637 100644
--- a/tests/components/powerwall/test_config_flow.py
+++ b/tests/components/powerwall/test_config_flow.py
@@ -17,7 +17,7 @@ from homeassistant.const import CONF_IP_ADDRESS, CONF_PASSWORD
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .mocks import (
     MOCK_GATEWAY_DIN,
diff --git a/tests/components/powerwall/test_sensor.py b/tests/components/powerwall/test_sensor.py
index fa2d986d12a..9b533304fbc 100644
--- a/tests/components/powerwall/test_sensor.py
+++ b/tests/components/powerwall/test_sensor.py
@@ -19,7 +19,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .mocks import MOCK_GATEWAY_DIN, _mock_powerwall_with_fixtures
 
diff --git a/tests/components/profiler/test_init.py b/tests/components/profiler/test_init.py
index 540e644aca4..e724a9e5cab 100644
--- a/tests/components/profiler/test_init.py
+++ b/tests/components/profiler/test_init.py
@@ -34,7 +34,7 @@ from homeassistant.components.profiler.const import DOMAIN
 from homeassistant.const import CONF_SCAN_INTERVAL, CONF_TYPE
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/proximity/snapshots/test_diagnostics.ambr b/tests/components/proximity/snapshots/test_diagnostics.ambr
index 3d9673ffd90..f6cd4393511 100644
--- a/tests/components/proximity/snapshots/test_diagnostics.ambr
+++ b/tests/components/proximity/snapshots/test_diagnostics.ambr
@@ -5,19 +5,19 @@
       'entities': dict({
         'device_tracker.test1': dict({
           'dir_of_travel': None,
-          'dist_to_zone': 2218752,
+          'dist_to_zone': 2218742,
           'is_in_ignored_zone': False,
           'name': 'test1',
         }),
         'device_tracker.test2': dict({
           'dir_of_travel': None,
-          'dist_to_zone': 4077309,
+          'dist_to_zone': 4077299,
           'is_in_ignored_zone': False,
           'name': 'test2',
         }),
         'device_tracker.test3': dict({
           'dir_of_travel': None,
-          'dist_to_zone': 4077309,
+          'dist_to_zone': 4077299,
           'is_in_ignored_zone': False,
           'name': 'test3',
         }),
@@ -42,7 +42,7 @@
       }),
       'proximity': dict({
         'dir_of_travel': None,
-        'dist_to_zone': 2218752,
+        'dist_to_zone': 2218742,
         'nearest': 'test1',
       }),
       'tracked_states': dict({
@@ -102,6 +102,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'home',
       'unique_id': 'proximity_home',
       'version': 1,
diff --git a/tests/components/proximity/test_init.py b/tests/components/proximity/test_init.py
index eeb181e0670..e9340014207 100644
--- a/tests/components/proximity/test_init.py
+++ b/tests/components/proximity/test_init.py
@@ -15,8 +15,7 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-import homeassistant.helpers.issue_registry as ir
+from homeassistant.helpers import entity_registry as er, issue_registry as ir
 from homeassistant.util import slugify
 
 from tests.common import MockConfigEntry
@@ -129,7 +128,7 @@ async def test_device_tracker_test1_away(hass: HomeAssistant) -> None:
 
     entity_base_name = "sensor.home_test1"
     state = hass.states.get(f"{entity_base_name}_distance")
-    assert state.state == "2218752"
+    assert state.state == "2218742"
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == STATE_UNKNOWN
 
@@ -153,7 +152,7 @@ async def test_device_tracker_test1_awayfurther(
 
     entity_base_name = "sensor.home_test1"
     state = hass.states.get(f"{entity_base_name}_distance")
-    assert state.state == "2218752"
+    assert state.state == "2218742"
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == STATE_UNKNOWN
 
@@ -170,7 +169,7 @@ async def test_device_tracker_test1_awayfurther(
 
     entity_base_name = "sensor.home_test1"
     state = hass.states.get(f"{entity_base_name}_distance")
-    assert state.state == "4625264"
+    assert state.state == "4625254"
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == "away_from"
 
@@ -194,7 +193,7 @@ async def test_device_tracker_test1_awaycloser(
 
     entity_base_name = "sensor.home_test1"
     state = hass.states.get(f"{entity_base_name}_distance")
-    assert state.state == "4625264"
+    assert state.state == "4625254"
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == STATE_UNKNOWN
 
@@ -211,7 +210,7 @@ async def test_device_tracker_test1_awaycloser(
 
     entity_base_name = "sensor.home_test1"
     state = hass.states.get(f"{entity_base_name}_distance")
-    assert state.state == "2218752"
+    assert state.state == "2218742"
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == "towards"
 
@@ -273,7 +272,7 @@ async def test_device_tracker_test1_awayfurther_a_bit(hass: HomeAssistant) -> No
 
     entity_base_name = "sensor.home_test1"
     state = hass.states.get(f"{entity_base_name}_distance")
-    assert state.state == "2218752"
+    assert state.state == "2218742"
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == STATE_UNKNOWN
 
@@ -290,7 +289,7 @@ async def test_device_tracker_test1_awayfurther_a_bit(hass: HomeAssistant) -> No
 
     entity_base_name = "sensor.home_test1"
     state = hass.states.get(f"{entity_base_name}_distance")
-    assert state.state == "2218752"
+    assert state.state == "2218742"
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == "stationary"
 
@@ -361,7 +360,7 @@ async def test_device_tracker_test1_awayfurther_than_test2_first_test1(
 
     entity_base_name = "sensor.home_test1"
     state = hass.states.get(f"{entity_base_name}_distance")
-    assert state.state == "2218752"
+    assert state.state == "2218742"
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == STATE_UNKNOWN
 
@@ -384,13 +383,13 @@ async def test_device_tracker_test1_awayfurther_than_test2_first_test1(
 
     entity_base_name = "sensor.home_test1"
     state = hass.states.get(f"{entity_base_name}_distance")
-    assert state.state == "2218752"
+    assert state.state == "2218742"
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == STATE_UNKNOWN
 
     entity_base_name = "sensor.home_test2"
     state = hass.states.get(f"{entity_base_name}_distance")
-    assert state.state == "4625264"
+    assert state.state == "4625254"
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == STATE_UNKNOWN
 
@@ -433,7 +432,7 @@ async def test_device_tracker_test1_awayfurther_than_test2_first_test2(
 
     entity_base_name = "sensor.home_test2"
     state = hass.states.get(f"{entity_base_name}_distance")
-    assert state.state == "4625264"
+    assert state.state == "4625254"
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == STATE_UNKNOWN
 
@@ -450,13 +449,13 @@ async def test_device_tracker_test1_awayfurther_than_test2_first_test2(
 
     entity_base_name = "sensor.home_test1"
     state = hass.states.get(f"{entity_base_name}_distance")
-    assert state.state == "2218752"
+    assert state.state == "2218742"
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == STATE_UNKNOWN
 
     entity_base_name = "sensor.home_test2"
     state = hass.states.get(f"{entity_base_name}_distance")
-    assert state.state == "4625264"
+    assert state.state == "4625254"
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == STATE_UNKNOWN
 
@@ -490,7 +489,7 @@ async def test_device_tracker_test1_awayfurther_test2_in_ignored_zone(
 
     entity_base_name = "sensor.home_test1"
     state = hass.states.get(f"{entity_base_name}_distance")
-    assert state.state == "2218752"
+    assert state.state == "2218742"
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == STATE_UNKNOWN
 
@@ -563,7 +562,7 @@ async def test_device_tracker_test1_awayfurther_test2_first(
 
     entity_base_name = "sensor.home_test2"
     state = hass.states.get(f"{entity_base_name}_distance")
-    assert state.state == "2218752"
+    assert state.state == "2218742"
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == STATE_UNKNOWN
 
@@ -603,7 +602,7 @@ async def test_device_tracker_test1_nearest_after_test2_in_ignored_zone(
 
     entity_base_name = "sensor.home_test1"
     state = hass.states.get(f"{entity_base_name}_distance")
-    assert state.state == "2218752"
+    assert state.state == "2218742"
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == STATE_UNKNOWN
 
@@ -626,13 +625,13 @@ async def test_device_tracker_test1_nearest_after_test2_in_ignored_zone(
 
     entity_base_name = "sensor.home_test1"
     state = hass.states.get(f"{entity_base_name}_distance")
-    assert state.state == "2218752"
+    assert state.state == "2218742"
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == STATE_UNKNOWN
 
     entity_base_name = "sensor.home_test2"
     state = hass.states.get(f"{entity_base_name}_distance")
-    assert state.state == "989156"
+    assert state.state == "989146"
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == STATE_UNKNOWN
 
@@ -649,13 +648,13 @@ async def test_device_tracker_test1_nearest_after_test2_in_ignored_zone(
 
     entity_base_name = "sensor.home_test1"
     state = hass.states.get(f"{entity_base_name}_distance")
-    assert state.state == "2218752"
+    assert state.state == "2218742"
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == STATE_UNKNOWN
 
     entity_base_name = "sensor.home_test2"
     state = hass.states.get(f"{entity_base_name}_distance")
-    assert state.state == "1364567"
+    assert state.state == "1364557"
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == "away_from"
 
@@ -694,15 +693,15 @@ async def test_nearest_sensors(hass: HomeAssistant, config_zones) -> None:
     state = hass.states.get("sensor.home_nearest_device")
     assert state.state == "test1"
     state = hass.states.get("sensor.home_nearest_distance")
-    assert state.state == "1615590"
+    assert state.state == "1615580"
     state = hass.states.get("sensor.home_test1_direction_of_travel")
     assert state.state == "towards"
     state = hass.states.get("sensor.home_test1_distance")
-    assert state.state == "1615590"
+    assert state.state == "1615580"
     state = hass.states.get("sensor.home_test1_direction_of_travel")
     assert state.state == "towards"
     state = hass.states.get("sensor.home_test2_distance")
-    assert state.state == "5176058"
+    assert state.state == "5176048"
     state = hass.states.get("sensor.home_test2_direction_of_travel")
     assert state.state == "away_from"
 
@@ -716,15 +715,15 @@ async def test_nearest_sensors(hass: HomeAssistant, config_zones) -> None:
     state = hass.states.get("sensor.home_nearest_device")
     assert state.state == "test1"
     state = hass.states.get("sensor.home_nearest_distance")
-    assert state.state == "1615590"
+    assert state.state == "1615580"
     state = hass.states.get("sensor.home_nearest_direction_of_travel")
     assert state.state == "towards"
     state = hass.states.get("sensor.home_test1_distance")
-    assert state.state == "1615590"
+    assert state.state == "1615580"
     state = hass.states.get("sensor.home_test1_direction_of_travel")
     assert state.state == "towards"
     state = hass.states.get("sensor.home_test2_distance")
-    assert state.state == "4611404"
+    assert state.state == "4611394"
     state = hass.states.get("sensor.home_test2_direction_of_travel")
     assert state.state == "towards"
 
@@ -738,15 +737,15 @@ async def test_nearest_sensors(hass: HomeAssistant, config_zones) -> None:
     state = hass.states.get("sensor.home_nearest_device")
     assert state.state == "test1"
     state = hass.states.get("sensor.home_nearest_distance")
-    assert state.state == "2204122"
+    assert state.state == "2204112"
     state = hass.states.get("sensor.home_nearest_direction_of_travel")
     assert state.state == "away_from"
     state = hass.states.get("sensor.home_test1_distance")
-    assert state.state == "2204122"
+    assert state.state == "2204112"
     state = hass.states.get("sensor.home_test1_direction_of_travel")
     assert state.state == "away_from"
     state = hass.states.get("sensor.home_test2_distance")
-    assert state.state == "4611404"
+    assert state.state == "4611394"
     state = hass.states.get("sensor.home_test2_direction_of_travel")
     assert state.state == "towards"
 
@@ -920,3 +919,95 @@ async def test_tracked_zone_is_removed(hass: HomeAssistant) -> None:
     assert state.state == STATE_UNAVAILABLE
     state = hass.states.get(f"{entity_base_name}_direction_of_travel")
     assert state.state == STATE_UNAVAILABLE
+
+
+async def test_tracked_zone_radius_is_changed(hass: HomeAssistant) -> None:
+    """Test that radius of the tracked zone is changed."""
+    entry = await async_setup_single_entry(
+        hass, "zone.home", ["device_tracker.test1"], [], 1
+    )
+
+    hass.states.async_set(
+        "device_tracker.test1",
+        "not_home",
+        {"friendly_name": "test1", "latitude": 20.10000001, "longitude": 10.1},
+    )
+    await hass.async_block_till_done()
+
+    # check sensor entities before radius change
+    state = hass.states.get("sensor.home_nearest_device")
+    assert state.state == "test1"
+
+    entity_base_name = "sensor.home_test1"
+    state = hass.states.get(f"{entity_base_name}_distance")
+    assert state.state == "2218742"
+    state = hass.states.get(f"{entity_base_name}_direction_of_travel")
+    assert state.state == STATE_UNKNOWN
+
+    # change radius of tracked zone
+    hass.states.async_set(
+        "zone.home",
+        "zoning",
+        {"name": "Home", "latitude": 2.1, "longitude": 1.1, "radius": 110},
+    )
+    await hass.config_entries.async_reload(entry.entry_id)
+    await hass.async_block_till_done()
+    radius = hass.states.get("zone.home").attributes["radius"]
+    assert radius == 110
+
+    # check sensor entities after radius change
+    state = hass.states.get("sensor.home_nearest_device")
+    assert state.state == "test1"
+
+    entity_base_name = "sensor.home_test1"
+    state = hass.states.get(f"{entity_base_name}_distance")
+    assert state.state == "2218642"
+    state = hass.states.get(f"{entity_base_name}_direction_of_travel")
+    assert state.state == STATE_UNKNOWN
+
+
+async def test_tracked_zone_location_is_changed(hass: HomeAssistant) -> None:
+    """Test that gps location of the tracked zone is changed."""
+    entry = await async_setup_single_entry(
+        hass, "zone.home", ["device_tracker.test1"], [], 1
+    )
+
+    hass.states.async_set(
+        "device_tracker.test1",
+        "not_home",
+        {"friendly_name": "test1", "latitude": 20.1, "longitude": 10.1},
+    )
+    await hass.async_block_till_done()
+
+    # check sensor entities before location change
+    state = hass.states.get("sensor.home_nearest_device")
+    assert state.state == "test1"
+
+    entity_base_name = "sensor.home_test1"
+    state = hass.states.get(f"{entity_base_name}_distance")
+    assert state.state == "2218742"
+    state = hass.states.get(f"{entity_base_name}_direction_of_travel")
+    assert state.state == STATE_UNKNOWN
+
+    # change location of tracked zone
+    hass.states.async_set(
+        "zone.home",
+        "zoning",
+        {"name": "Home", "latitude": 10, "longitude": 5, "radius": 10},
+    )
+    await hass.config_entries.async_reload(entry.entry_id)
+    await hass.async_block_till_done()
+    latitude = hass.states.get("zone.home").attributes["latitude"]
+    assert latitude == 10
+    longitude = hass.states.get("zone.home").attributes["longitude"]
+    assert longitude == 5
+
+    # check sensor entities after location change
+    state = hass.states.get("sensor.home_nearest_device")
+    assert state.state == "test1"
+
+    entity_base_name = "sensor.home_test1"
+    state = hass.states.get(f"{entity_base_name}_distance")
+    assert state.state == "1244478"
+    state = hass.states.get(f"{entity_base_name}_direction_of_travel")
+    assert state.state == STATE_UNKNOWN
diff --git a/tests/components/ps4/test_init.py b/tests/components/ps4/test_init.py
index ede6b3b5147..4cde723a28f 100644
--- a/tests/components/ps4/test_init.py
+++ b/tests/components/ps4/test_init.py
@@ -52,6 +52,7 @@ MOCK_FLOW_RESULT = {
     "title": "test_ps4",
     "data": MOCK_DATA,
     "options": {},
+    "subentries": (),
 }
 
 MOCK_ENTRY_ID = "SomeID"
diff --git a/tests/components/pterodactyl/__init__.py b/tests/components/pterodactyl/__init__.py
new file mode 100644
index 00000000000..a5b28d67ae3
--- /dev/null
+++ b/tests/components/pterodactyl/__init__.py
@@ -0,0 +1 @@
+"""Tests for the Pterodactyl integration."""
diff --git a/tests/components/pterodactyl/conftest.py b/tests/components/pterodactyl/conftest.py
new file mode 100644
index 00000000000..62326e79207
--- /dev/null
+++ b/tests/components/pterodactyl/conftest.py
@@ -0,0 +1,155 @@
+"""Common fixtures for the Pterodactyl tests."""
+
+from collections.abc import Generator
+from unittest.mock import AsyncMock, patch
+
+from pydactyl.responses import PaginatedResponse
+import pytest
+
+from homeassistant.components.pterodactyl.const import DOMAIN
+from homeassistant.const import CONF_API_KEY, CONF_URL
+
+from tests.common import MockConfigEntry
+
+TEST_URL = "https://192.168.0.1:8080/"
+TEST_API_KEY = "TestClientApiKey"
+TEST_USER_INPUT = {
+    CONF_URL: TEST_URL,
+    CONF_API_KEY: TEST_API_KEY,
+}
+TEST_SERVER_LIST_DATA = {
+    "meta": {"pagination": {"total": 2, "count": 2, "per_page": 50, "current_page": 1}},
+    "data": [
+        {
+            "object": "server",
+            "attributes": {
+                "server_owner": True,
+                "identifier": "1",
+                "internal_id": 1,
+                "uuid": "1-1-1-1-1",
+                "name": "Test Server 1",
+                "node": "default_node",
+                "description": "Description of Test Server 1",
+                "limits": {
+                    "memory": 2048,
+                    "swap": 1024,
+                    "disk": 10240,
+                    "io": 500,
+                    "cpu": 100,
+                    "threads": None,
+                    "oom_disabled": True,
+                },
+                "invocation": "java -jar test_server1.jar",
+                "docker_image": "test_docker_image_1",
+                "egg_features": ["java_version"],
+            },
+        },
+        {
+            "object": "server",
+            "attributes": {
+                "server_owner": True,
+                "identifier": "2",
+                "internal_id": 2,
+                "uuid": "2-2-2-2-2",
+                "name": "Test Server 2",
+                "node": "default_node",
+                "description": "Description of Test Server 2",
+                "limits": {
+                    "memory": 2048,
+                    "swap": 1024,
+                    "disk": 10240,
+                    "io": 500,
+                    "cpu": 100,
+                    "threads": None,
+                    "oom_disabled": True,
+                },
+                "invocation": "java -jar test_server_2.jar",
+                "docker_image": "test_docker_image2",
+                "egg_features": ["java_version"],
+            },
+        },
+    ],
+}
+TEST_SERVER = {
+    "server_owner": True,
+    "identifier": "1",
+    "internal_id": 1,
+    "uuid": "1-1-1-1-1",
+    "name": "Test Server 1",
+    "node": "default_node",
+    "is_node_under_maintenance": False,
+    "sftp_details": {"ip": "192.168.0.1", "port": 2022},
+    "description": "",
+    "limits": {
+        "memory": 2048,
+        "swap": 1024,
+        "disk": 10240,
+        "io": 500,
+        "cpu": 100,
+        "threads": None,
+        "oom_disabled": True,
+    },
+    "invocation": "java -jar test.jar",
+    "docker_image": "test_docker_image",
+    "egg_features": ["eula", "java_version", "pid_limit"],
+    "feature_limits": {"databases": 0, "allocations": 0, "backups": 3},
+    "status": None,
+    "is_suspended": False,
+    "is_installing": False,
+    "is_transferring": False,
+    "relationships": {"allocations": {...}, "variables": {...}},
+}
+TEST_SERVER_UTILIZATION = {
+    "current_state": "running",
+    "is_suspended": False,
+    "resources": {
+        "memory_bytes": 1111,
+        "cpu_absolute": 22,
+        "disk_bytes": 3333,
+        "network_rx_bytes": 44,
+        "network_tx_bytes": 55,
+        "uptime": 6666,
+    },
+}
+
+
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.pterodactyl.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
+@pytest.fixture
+def mock_config_entry() -> MockConfigEntry:
+    """Create Pterodactyl mock config entry."""
+    return MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=None,
+        entry_id="01234567890123456789012345678901",
+        title=TEST_URL,
+        data={
+            CONF_URL: TEST_URL,
+            CONF_API_KEY: TEST_API_KEY,
+        },
+        version=1,
+    )
+
+
+@pytest.fixture
+def mock_pterodactyl():
+    """Mock the Pterodactyl API."""
+    with patch(
+        "homeassistant.components.pterodactyl.api.PterodactylClient", autospec=True
+    ) as mock:
+        mock.return_value.client.servers.list_servers.return_value = PaginatedResponse(
+            mock.return_value, "client", TEST_SERVER_LIST_DATA
+        )
+        mock.return_value.client.servers.get_server.return_value = TEST_SERVER
+        mock.return_value.client.servers.get_server_utilization.return_value = (
+            TEST_SERVER_UTILIZATION
+        )
+
+        yield mock.return_value
diff --git a/tests/components/pterodactyl/test_config_flow.py b/tests/components/pterodactyl/test_config_flow.py
new file mode 100644
index 00000000000..14bb2d2f69f
--- /dev/null
+++ b/tests/components/pterodactyl/test_config_flow.py
@@ -0,0 +1,129 @@
+"""Test the Pterodactyl config flow."""
+
+from pydactyl import PterodactylClient
+from pydactyl.exceptions import ClientConfigError, PterodactylApiError
+import pytest
+
+from homeassistant.components.pterodactyl.const import DOMAIN
+from homeassistant.config_entries import SOURCE_USER
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from .conftest import TEST_URL, TEST_USER_INPUT
+
+from tests.common import MockConfigEntry
+
+
+@pytest.mark.usefixtures("mock_pterodactyl", "mock_setup_entry")
+async def test_full_flow(hass: HomeAssistant) -> None:
+    """Test full flow without errors."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        flow_id=result["flow_id"],
+        user_input=TEST_USER_INPUT,
+    )
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == TEST_URL
+    assert result["data"] == TEST_USER_INPUT
+
+
+@pytest.mark.usefixtures("mock_setup_entry")
+@pytest.mark.parametrize(
+    "exception_type",
+    [
+        ClientConfigError,
+        PterodactylApiError,
+    ],
+)
+async def test_recovery_after_api_error(
+    hass: HomeAssistant,
+    exception_type,
+    mock_pterodactyl: PterodactylClient,
+) -> None:
+    """Test recovery after an API error."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {}
+
+    mock_pterodactyl.client.servers.list_servers.side_effect = exception_type
+
+    result = await hass.config_entries.flow.async_configure(
+        flow_id=result["flow_id"],
+        user_input=TEST_USER_INPUT,
+    )
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {"base": "cannot_connect"}
+
+    mock_pterodactyl.reset_mock(side_effect=True)
+
+    result = await hass.config_entries.flow.async_configure(
+        flow_id=result["flow_id"], user_input=TEST_USER_INPUT
+    )
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == TEST_URL
+    assert result["data"] == TEST_USER_INPUT
+
+
+@pytest.mark.usefixtures("mock_setup_entry")
+async def test_recovery_after_unknown_error(
+    hass: HomeAssistant,
+    mock_pterodactyl: PterodactylClient,
+) -> None:
+    """Test recovery after an API error."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {}
+
+    mock_pterodactyl.client.servers.list_servers.side_effect = Exception
+
+    result = await hass.config_entries.flow.async_configure(
+        flow_id=result["flow_id"],
+        user_input=TEST_USER_INPUT,
+    )
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {"base": "unknown"}
+
+    mock_pterodactyl.reset_mock(side_effect=True)
+
+    result = await hass.config_entries.flow.async_configure(
+        flow_id=result["flow_id"], user_input=TEST_USER_INPUT
+    )
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == TEST_URL
+    assert result["data"] == TEST_USER_INPUT
+
+
+@pytest.mark.usefixtures("mock_setup_entry")
+async def test_service_already_configured(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_pterodactyl: PterodactylClient,
+) -> None:
+    """Test config flow abort if the Pterodactyl server is already configured."""
+    mock_config_entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}, data=TEST_USER_INPUT
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
diff --git a/tests/components/purpleair/conftest.py b/tests/components/purpleair/conftest.py
index 1809b16bd75..a9a51c22b7c 100644
--- a/tests/components/purpleair/conftest.py
+++ b/tests/components/purpleair/conftest.py
@@ -8,7 +8,7 @@ from aiopurpleair.endpoints.sensors import NearbySensorResult
 from aiopurpleair.models.sensors import GetSensorsResponse
 import pytest
 
-from homeassistant.components.purpleair import DOMAIN
+from homeassistant.components.purpleair.const import DOMAIN
 from homeassistant.core import HomeAssistant
 
 from tests.common import MockConfigEntry, load_fixture
@@ -20,7 +20,7 @@ TEST_SENSOR_INDEX2 = 567890
 
 @pytest.fixture(name="api")
 def api_fixture(get_sensors_response: GetSensorsResponse) -> Mock:
-    """Define a fixture to return a mocked aiopurple API object."""
+    """Define a fixture to return a mocked aiopurpleair API object."""
     return Mock(
         async_check_api_key=AsyncMock(),
         get_map_url=Mock(return_value="http://example.com"),
diff --git a/tests/components/purpleair/test_config_flow.py b/tests/components/purpleair/test_config_flow.py
index 998cb2b7878..5ee15de4e6b 100644
--- a/tests/components/purpleair/test_config_flow.py
+++ b/tests/components/purpleair/test_config_flow.py
@@ -5,7 +5,7 @@ from unittest.mock import AsyncMock, patch
 from aiopurpleair.errors import InvalidApiKeyError, PurpleAirError
 import pytest
 
-from homeassistant.components.purpleair import DOMAIN
+from homeassistant.components.purpleair.const import DOMAIN
 from homeassistant.config_entries import SOURCE_USER
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
@@ -288,6 +288,7 @@ async def test_options_remove_sensor(
     device_entry = device_registry.async_get_device(
         identifiers={(DOMAIN, str(TEST_SENSOR_INDEX1))}
     )
+    assert device_entry is not None
     result = await hass.config_entries.options.async_configure(
         result["flow_id"],
         user_input={"sensor_device_id": device_entry.id},
diff --git a/tests/components/purpleair/test_diagnostics.py b/tests/components/purpleair/test_diagnostics.py
index ae4b28567be..6271a63d652 100644
--- a/tests/components/purpleair/test_diagnostics.py
+++ b/tests/components/purpleair/test_diagnostics.py
@@ -38,6 +38,7 @@ async def test_entry_diagnostics(
             "created_at": ANY,
             "modified_at": ANY,
             "discovery_keys": {},
+            "subentries": [],
         },
         "data": {
             "fields": [
diff --git a/tests/components/pyload/conftest.py b/tests/components/pyload/conftest.py
index 46144771cc1..9b410a5fdd6 100644
--- a/tests/components/pyload/conftest.py
+++ b/tests/components/pyload/conftest.py
@@ -12,6 +12,7 @@ from homeassistant.const import (
     CONF_PASSWORD,
     CONF_PORT,
     CONF_SSL,
+    CONF_URL,
     CONF_USERNAME,
     CONF_VERIFY_SSL,
 )
@@ -19,10 +20,8 @@ from homeassistant.const import (
 from tests.common import MockConfigEntry
 
 USER_INPUT = {
-    CONF_HOST: "pyload.local",
+    CONF_URL: "https://pyload.local:8000/prefix",
     CONF_PASSWORD: "test-password",
-    CONF_PORT: 8000,
-    CONF_SSL: True,
     CONF_USERNAME: "test-username",
     CONF_VERIFY_SSL: False,
 }
@@ -33,10 +32,8 @@ REAUTH_INPUT = {
 }
 
 NEW_INPUT = {
-    CONF_HOST: "pyload.local",
+    CONF_URL: "https://pyload.local:8000/prefix",
     CONF_PASSWORD: "new-password",
-    CONF_PORT: 8000,
-    CONF_SSL: True,
     CONF_USERNAME: "new-username",
     CONF_VERIFY_SSL: False,
 }
@@ -97,5 +94,28 @@ def mock_pyloadapi() -> Generator[MagicMock]:
 def mock_config_entry() -> MockConfigEntry:
     """Mock pyLoad configuration entry."""
     return MockConfigEntry(
-        domain=DOMAIN, title=DEFAULT_NAME, data=USER_INPUT, entry_id="XXXXXXXXXXXXXX"
+        domain=DOMAIN,
+        title=DEFAULT_NAME,
+        data=USER_INPUT,
+        entry_id="XXXXXXXXXXXXXX",
+    )
+
+
+@pytest.fixture(name="config_entry_migrate")
+def mock_config_entry_migrate() -> MockConfigEntry:
+    """Mock pyLoad configuration entry for migration."""
+    return MockConfigEntry(
+        domain=DOMAIN,
+        title=DEFAULT_NAME,
+        data={
+            CONF_HOST: "pyload.local",
+            CONF_PASSWORD: "test-password",
+            CONF_PORT: 8000,
+            CONF_SSL: True,
+            CONF_USERNAME: "test-username",
+            CONF_VERIFY_SSL: False,
+        },
+        version=1,
+        minor_version=0,
+        entry_id="XXXXXXXXXXXXXX",
     )
diff --git a/tests/components/pyload/snapshots/test_button.ambr b/tests/components/pyload/snapshots/test_button.ambr
index bf1e1f59c98..57a0358da42 100644
--- a/tests/components/pyload/snapshots/test_button.ambr
+++ b/tests/components/pyload/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/pyload/snapshots/test_diagnostics.ambr b/tests/components/pyload/snapshots/test_diagnostics.ambr
index e2b51ad184a..d773804bf73 100644
--- a/tests/components/pyload/snapshots/test_diagnostics.ambr
+++ b/tests/components/pyload/snapshots/test_diagnostics.ambr
@@ -2,10 +2,8 @@
 # name: test_diagnostics
   dict({
     'config_entry_data': dict({
-      'host': '**REDACTED**',
       'password': '**REDACTED**',
-      'port': 8000,
-      'ssl': True,
+      'url': 'https://**redacted**:8000/prefix',
       'username': '**REDACTED**',
       'verify_ssl': False,
     }),
@@ -15,6 +13,7 @@
       'download': True,
       'free_space': 99999999999,
       'pause': False,
+      'proxy': None,
       'queue': 6,
       'reconnect': False,
       'speed': 5405963.0,
diff --git a/tests/components/pyload/snapshots/test_sensor.ambr b/tests/components/pyload/snapshots/test_sensor.ambr
index 69d0387fc8f..d9948f4273a 100644
--- a/tests/components/pyload/snapshots/test_sensor.ambr
+++ b/tests/components/pyload/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -58,6 +59,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -106,6 +108,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -160,6 +163,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -216,6 +220,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -266,6 +271,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -304,7 +310,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'unavailable',
+    'state': '1',
   })
 # ---
 # name: test_sensor_update_exceptions[InvalidAuth][sensor.pyload_downloads_in_queue-entry]
@@ -316,6 +322,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -354,7 +361,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'unavailable',
+    'state': '6',
   })
 # ---
 # name: test_sensor_update_exceptions[InvalidAuth][sensor.pyload_free_space-entry]
@@ -364,6 +371,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -408,7 +416,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'unavailable',
+    'state': '93.1322574606165',
   })
 # ---
 # name: test_sensor_update_exceptions[InvalidAuth][sensor.pyload_speed-entry]
@@ -418,6 +426,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -462,7 +471,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'unavailable',
+    'state': '43.247704',
   })
 # ---
 # name: test_sensor_update_exceptions[InvalidAuth][sensor.pyload_total_downloads-entry]
@@ -474,6 +483,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -512,7 +522,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'unavailable',
+    'state': '37',
   })
 # ---
 # name: test_sensor_update_exceptions[ParserError][sensor.pyload_active_downloads-entry]
@@ -524,6 +534,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -574,6 +585,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -622,6 +634,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -676,6 +689,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -732,6 +746,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -782,6 +797,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -832,6 +848,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -880,6 +897,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -934,6 +952,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -990,6 +1009,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/pyload/snapshots/test_switch.ambr b/tests/components/pyload/snapshots/test_switch.ambr
index 0fcc45f8586..479013b09e4 100644
--- a/tests/components/pyload/snapshots/test_switch.ambr
+++ b/tests/components/pyload/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/pyload/test_init.py b/tests/components/pyload/test_init.py
index 12713ef2e54..5c85979b9df 100644
--- a/tests/components/pyload/test_init.py
+++ b/tests/components/pyload/test_init.py
@@ -1,14 +1,17 @@
 """Test pyLoad init."""
 
+from datetime import timedelta
 from unittest.mock import MagicMock
 
+from freezegun.api import FrozenDateTimeFactory
 from pyloadapi.exceptions import CannotConnect, InvalidAuth, ParserError
 import pytest
 
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntryState
+from homeassistant.const import CONF_PATH, CONF_URL
 from homeassistant.core import HomeAssistant
 
-from tests.common import MockConfigEntry
+from tests.common import MockConfigEntry, async_fire_time_changed
 
 
 async def test_entry_setup_unload(
@@ -63,3 +66,45 @@ async def test_config_entry_setup_invalid_auth(
     assert config_entry.state is ConfigEntryState.SETUP_ERROR
 
     assert any(config_entry.async_get_active_flows(hass, {SOURCE_REAUTH}))
+
+
+async def test_coordinator_update_invalid_auth(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    mock_pyloadapi: MagicMock,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test coordinator authentication."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    mock_pyloadapi.login.side_effect = InvalidAuth
+    mock_pyloadapi.get_status.side_effect = InvalidAuth
+
+    freezer.tick(timedelta(seconds=20))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    assert any(config_entry.async_get_active_flows(hass, {SOURCE_REAUTH}))
+
+
+@pytest.mark.usefixtures("mock_pyloadapi")
+async def test_migration(
+    hass: HomeAssistant,
+    config_entry_migrate: MockConfigEntry,
+) -> None:
+    """Test config entry migration."""
+
+    config_entry_migrate.add_to_hass(hass)
+    assert config_entry_migrate.data.get(CONF_PATH) is None
+
+    await hass.config_entries.async_setup(config_entry_migrate.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry_migrate.state is ConfigEntryState.LOADED
+    assert config_entry_migrate.version == 1
+    assert config_entry_migrate.minor_version == 1
+    assert config_entry_migrate.data[CONF_URL] == "https://pyload.local:8000/"
diff --git a/tests/components/qbus/conftest.py b/tests/components/qbus/conftest.py
index 8268d091bda..f1fd96c321b 100644
--- a/tests/components/qbus/conftest.py
+++ b/tests/components/qbus/conftest.py
@@ -1,5 +1,7 @@
 """Test fixtures for qbus."""
 
+import json
+
 import pytest
 
 from homeassistant.components.qbus.const import CONF_SERIAL_NUMBER, DOMAIN
@@ -7,9 +9,13 @@ from homeassistant.const import CONF_ID
 from homeassistant.core import HomeAssistant
 from homeassistant.util.json import JsonObjectType
 
-from .const import FIXTURE_PAYLOAD_CONFIG
+from .const import FIXTURE_PAYLOAD_CONFIG, TOPIC_CONFIG
 
-from tests.common import MockConfigEntry, load_json_object_fixture
+from tests.common import (
+    MockConfigEntry,
+    async_fire_mqtt_message,
+    load_json_object_fixture,
+)
 
 
 @pytest.fixture
@@ -31,3 +37,18 @@ def mock_config_entry(hass: HomeAssistant) -> MockConfigEntry:
 def payload_config() -> JsonObjectType:
     """Return the config topic payload."""
     return load_json_object_fixture(FIXTURE_PAYLOAD_CONFIG, DOMAIN)
+
+
+@pytest.fixture
+async def setup_integration(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    payload_config: JsonObjectType,
+) -> None:
+    """Set up the integration."""
+
+    assert await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    async_fire_mqtt_message(hass, TOPIC_CONFIG, json.dumps(payload_config))
+    await hass.async_block_till_done()
diff --git a/tests/components/qbus/fixtures/payload_config.json b/tests/components/qbus/fixtures/payload_config.json
index 2ee38a9927e..fc204c975ad 100644
--- a/tests/components/qbus/fixtures/payload_config.json
+++ b/tests/components/qbus/fixtures/payload_config.json
@@ -42,6 +42,63 @@
               "write": true
             }
           }
+        },
+        {
+          "id": "UL15",
+          "location": "Media room",
+          "locationId": 1,
+          "name": "MEDIA ROOM",
+          "originalName": "MEDIA ROOM",
+          "refId": "000001/28",
+          "type": "analog",
+          "actions": {
+            "off": null,
+            "on": null
+          },
+          "properties": {
+            "value": {
+              "max": 100,
+              "min": 5,
+              "read": true,
+              "step": 0.1,
+              "type": "number",
+              "write": true
+            }
+          }
+        },
+        {
+          "id": "UL20",
+          "location": "Living",
+          "locationId": 0,
+          "name": "LIVING TH",
+          "originalName": "LIVING TH",
+          "refId": "000001/120",
+          "type": "thermo",
+          "actions": {},
+          "properties": {
+            "currRegime": {
+              "enumValues": ["MANUEEL", "VORST", "ECONOMY", "COMFORT", "NACHT"],
+              "read": true,
+              "type": "enumString",
+              "write": true
+            },
+            "currTemp": {
+              "max": 35,
+              "min": 0,
+              "read": true,
+              "step": 0.5,
+              "type": "number",
+              "write": false
+            },
+            "setTemp": {
+              "max": 35,
+              "min": 0,
+              "read": true,
+              "step": 0.5,
+              "type": "number",
+              "write": true
+            }
+          }
         }
       ]
     }
diff --git a/tests/components/qbus/test_climate.py b/tests/components/qbus/test_climate.py
new file mode 100644
index 00000000000..d521e310984
--- /dev/null
+++ b/tests/components/qbus/test_climate.py
@@ -0,0 +1,228 @@
+"""Test Qbus light entities."""
+
+from datetime import timedelta
+from unittest.mock import MagicMock, call
+
+import pytest
+
+from homeassistant.components.climate import (
+    ATTR_CURRENT_TEMPERATURE,
+    ATTR_HVAC_ACTION,
+    ATTR_PRESET_MODE,
+    DOMAIN as CLIMATE_DOMAIN,
+    SERVICE_SET_PRESET_MODE,
+    SERVICE_SET_TEMPERATURE,
+    ClimateEntity,
+    HVACAction,
+    HVACMode,
+)
+from homeassistant.components.qbus.climate import STATE_REQUEST_DELAY
+from homeassistant.const import ATTR_ENTITY_ID, ATTR_TEMPERATURE
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ServiceValidationError
+from homeassistant.helpers.entity_platform import EntityPlatform
+from homeassistant.util import dt as dt_util
+
+from tests.common import async_fire_mqtt_message, async_fire_time_changed
+from tests.typing import MqttMockHAClient
+
+_CURRENT_TEMPERATURE = 21.5
+_SET_TEMPERATURE = 20.5
+_REGIME = "COMFORT"
+
+_PAYLOAD_CLIMATE_STATE_TEMP = (
+    f'{{"id":"UL20","properties":{{"setTemp":{_SET_TEMPERATURE}}},"type":"event"}}'
+)
+_PAYLOAD_CLIMATE_STATE_TEMP_FULL = f'{{"id":"UL20","properties":{{"currRegime":"MANUEEL","currTemp":{_CURRENT_TEMPERATURE},"setTemp":{_SET_TEMPERATURE}}},"type":"state"}}'
+
+_PAYLOAD_CLIMATE_STATE_PRESET = (
+    f'{{"id":"UL20","properties":{{"currRegime":"{_REGIME}"}},"type":"event"}}'
+)
+_PAYLOAD_CLIMATE_STATE_PRESET_FULL = f'{{"id":"UL20","properties":{{"currRegime":"{_REGIME}","currTemp":{_CURRENT_TEMPERATURE},"setTemp":22.0}},"type":"state"}}'
+
+_PAYLOAD_CLIMATE_SET_TEMP = f'{{"id": "UL20", "type": "state", "properties": {{"setTemp": {_SET_TEMPERATURE}}}}}'
+_PAYLOAD_CLIMATE_SET_PRESET = (
+    '{"id": "UL20", "type": "state", "properties": {"currRegime": "COMFORT"}}'
+)
+
+_TOPIC_CLIMATE_STATE = "cloudapp/QBUSMQTTGW/UL1/UL20/state"
+_TOPIC_CLIMATE_SET_STATE = "cloudapp/QBUSMQTTGW/UL1/UL20/setState"
+_TOPIC_GET_STATE = "cloudapp/QBUSMQTTGW/getState"
+
+_CLIMATE_ENTITY_ID = "climate.living_th"
+
+
+async def test_climate(
+    hass: HomeAssistant,
+    mqtt_mock: MqttMockHAClient,
+    setup_integration: None,
+) -> None:
+    """Test climate temperature & preset."""
+
+    # Set temperature
+    mqtt_mock.reset_mock()
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {
+            ATTR_ENTITY_ID: _CLIMATE_ENTITY_ID,
+            ATTR_TEMPERATURE: _SET_TEMPERATURE,
+        },
+        blocking=True,
+    )
+
+    mqtt_mock.async_publish.assert_called_once_with(
+        _TOPIC_CLIMATE_SET_STATE, _PAYLOAD_CLIMATE_SET_TEMP, 0, False
+    )
+
+    # Simulate a partial state response
+    async_fire_mqtt_message(hass, _TOPIC_CLIMATE_STATE, _PAYLOAD_CLIMATE_STATE_TEMP)
+    await hass.async_block_till_done()
+
+    # Check state
+    entity = hass.states.get(_CLIMATE_ENTITY_ID)
+    assert entity
+    assert entity.attributes[ATTR_TEMPERATURE] == _SET_TEMPERATURE
+    assert entity.attributes[ATTR_CURRENT_TEMPERATURE] is None
+    assert entity.attributes[ATTR_PRESET_MODE] == "MANUEEL"
+    assert entity.attributes[ATTR_HVAC_ACTION] == HVACAction.IDLE
+    assert entity.state == HVACMode.HEAT
+
+    # After a delay, a full state request should've been sent
+    _wait_and_assert_state_request(hass, mqtt_mock)
+
+    # Simulate a full state response
+    async_fire_mqtt_message(
+        hass, _TOPIC_CLIMATE_STATE, _PAYLOAD_CLIMATE_STATE_TEMP_FULL
+    )
+    await hass.async_block_till_done()
+
+    # Check state after full state response
+    entity = hass.states.get(_CLIMATE_ENTITY_ID)
+    assert entity
+    assert entity.attributes[ATTR_TEMPERATURE] == _SET_TEMPERATURE
+    assert entity.attributes[ATTR_CURRENT_TEMPERATURE] == _CURRENT_TEMPERATURE
+    assert entity.attributes[ATTR_PRESET_MODE] == "MANUEEL"
+    assert entity.attributes[ATTR_HVAC_ACTION] == HVACAction.IDLE
+    assert entity.state == HVACMode.HEAT
+
+    # Set preset
+    mqtt_mock.reset_mock()
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_PRESET_MODE,
+        {
+            ATTR_ENTITY_ID: _CLIMATE_ENTITY_ID,
+            ATTR_PRESET_MODE: _REGIME,
+        },
+        blocking=True,
+    )
+
+    mqtt_mock.async_publish.assert_called_once_with(
+        _TOPIC_CLIMATE_SET_STATE, _PAYLOAD_CLIMATE_SET_PRESET, 0, False
+    )
+
+    # Simulate a partial state response
+    async_fire_mqtt_message(hass, _TOPIC_CLIMATE_STATE, _PAYLOAD_CLIMATE_STATE_PRESET)
+    await hass.async_block_till_done()
+
+    # Check state
+    entity = hass.states.get(_CLIMATE_ENTITY_ID)
+    assert entity
+    assert entity.attributes[ATTR_TEMPERATURE] == _SET_TEMPERATURE
+    assert entity.attributes[ATTR_CURRENT_TEMPERATURE] == _CURRENT_TEMPERATURE
+    assert entity.attributes[ATTR_PRESET_MODE] == _REGIME
+    assert entity.attributes[ATTR_HVAC_ACTION] == HVACAction.IDLE
+    assert entity.state == HVACMode.HEAT
+
+    # After a delay, a full state request should've been sent
+    _wait_and_assert_state_request(hass, mqtt_mock)
+
+    # Simulate a full state response
+    async_fire_mqtt_message(
+        hass, _TOPIC_CLIMATE_STATE, _PAYLOAD_CLIMATE_STATE_PRESET_FULL
+    )
+    await hass.async_block_till_done()
+
+    # Check state after full state response
+    entity = hass.states.get(_CLIMATE_ENTITY_ID)
+    assert entity
+    assert entity.attributes[ATTR_TEMPERATURE] == 22.0
+    assert entity.attributes[ATTR_CURRENT_TEMPERATURE] == _CURRENT_TEMPERATURE
+    assert entity.attributes[ATTR_PRESET_MODE] == _REGIME
+    assert entity.attributes[ATTR_HVAC_ACTION] == HVACAction.HEATING
+    assert entity.state == HVACMode.HEAT
+
+
+async def test_climate_when_invalid_state_received(
+    hass: HomeAssistant,
+    mqtt_mock: MqttMockHAClient,
+    setup_integration: None,
+) -> None:
+    """Test climate when no valid state is received."""
+
+    platform: EntityPlatform = hass.data["entity_components"][CLIMATE_DOMAIN]
+    entity: ClimateEntity = next(
+        (
+            entity
+            for entity in platform.entities
+            if entity.entity_id == _CLIMATE_ENTITY_ID
+        ),
+        None,
+    )
+
+    assert entity
+    entity.async_schedule_update_ha_state = MagicMock()
+
+    # Simulate state response
+    async_fire_mqtt_message(hass, _TOPIC_CLIMATE_STATE, "")
+    await hass.async_block_till_done()
+
+    entity.async_schedule_update_ha_state.assert_not_called()
+
+
+async def test_climate_with_fast_subsequent_changes(
+    hass: HomeAssistant,
+    mqtt_mock: MqttMockHAClient,
+    setup_integration: None,
+) -> None:
+    """Test climate with fast subsequent changes."""
+
+    # Simulate two subsequent partial state responses
+    async_fire_mqtt_message(hass, _TOPIC_CLIMATE_STATE, _PAYLOAD_CLIMATE_STATE_TEMP)
+    await hass.async_block_till_done()
+    async_fire_mqtt_message(hass, _TOPIC_CLIMATE_STATE, _PAYLOAD_CLIMATE_STATE_TEMP)
+    await hass.async_block_till_done()
+
+    # State request should be requested only once
+    _wait_and_assert_state_request(hass, mqtt_mock)
+
+
+async def test_climate_with_unknown_preset(
+    hass: HomeAssistant,
+    mqtt_mock: MqttMockHAClient,
+    setup_integration: None,
+) -> None:
+    """Test climate with passing an unknown preset value."""
+
+    with pytest.raises(ServiceValidationError):
+        await hass.services.async_call(
+            CLIMATE_DOMAIN,
+            SERVICE_SET_PRESET_MODE,
+            {
+                ATTR_ENTITY_ID: _CLIMATE_ENTITY_ID,
+                ATTR_PRESET_MODE: "What is cooler than being cool?",
+            },
+            blocking=True,
+        )
+
+
+def _wait_and_assert_state_request(
+    hass: HomeAssistant, mqtt_mock: MqttMockHAClient
+) -> None:
+    mqtt_mock.reset_mock()
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(STATE_REQUEST_DELAY))
+    mqtt_mock.async_publish.assert_has_calls(
+        [call(_TOPIC_GET_STATE, '["UL20"]', 0, False)],
+        any_order=True,
+    )
diff --git a/tests/components/qbus/test_light.py b/tests/components/qbus/test_light.py
new file mode 100644
index 00000000000..2db2c622289
--- /dev/null
+++ b/tests/components/qbus/test_light.py
@@ -0,0 +1,106 @@
+"""Test Qbus light entities."""
+
+from homeassistant.components.light import (
+    ATTR_BRIGHTNESS,
+    DOMAIN as LIGHT_DOMAIN,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+)
+from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON
+from homeassistant.core import HomeAssistant
+
+from tests.common import async_fire_mqtt_message
+from tests.typing import MqttMockHAClient
+
+# 186 = 73% (rounded)
+_BRIGHTNESS = 186
+_BRIGHTNESS_PCT = 73
+
+_PAYLOAD_LIGHT_STATE_ON = '{"id":"UL15","properties":{"value":60},"type":"state"}'
+_PAYLOAD_LIGHT_STATE_BRIGHTNESS = (
+    '{"id":"UL15","properties":{"value":' + str(_BRIGHTNESS_PCT) + '},"type":"state"}'
+)
+_PAYLOAD_LIGHT_STATE_OFF = '{"id":"UL15","properties":{"value":0},"type":"state"}'
+
+_PAYLOAD_LIGHT_SET_STATE_ON = '{"id": "UL15", "type": "action", "action": "on"}'
+_PAYLOAD_LIGHT_SET_STATE_BRIGHTNESS = (
+    '{"id": "UL15", "type": "state", "properties": {"value": '
+    + str(_BRIGHTNESS_PCT)
+    + "}}"
+)
+_PAYLOAD_LIGHT_SET_STATE_OFF = '{"id": "UL15", "type": "action", "action": "off"}'
+
+_TOPIC_LIGHT_STATE = "cloudapp/QBUSMQTTGW/UL1/UL15/state"
+_TOPIC_LIGHT_SET_STATE = "cloudapp/QBUSMQTTGW/UL1/UL15/setState"
+
+_LIGHT_ENTITY_ID = "light.media_room"
+
+
+async def test_light(
+    hass: HomeAssistant,
+    mqtt_mock: MqttMockHAClient,
+    setup_integration: None,
+) -> None:
+    """Test turning on and off."""
+
+    # Switch ON
+    mqtt_mock.reset_mock()
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: _LIGHT_ENTITY_ID},
+        blocking=True,
+    )
+
+    mqtt_mock.async_publish.assert_called_once_with(
+        _TOPIC_LIGHT_SET_STATE, _PAYLOAD_LIGHT_SET_STATE_ON, 0, False
+    )
+
+    # Simulate response
+    async_fire_mqtt_message(hass, _TOPIC_LIGHT_STATE, _PAYLOAD_LIGHT_STATE_ON)
+    await hass.async_block_till_done()
+
+    assert hass.states.get(_LIGHT_ENTITY_ID).state == STATE_ON
+
+    # Set brightness
+    mqtt_mock.reset_mock()
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {
+            ATTR_ENTITY_ID: _LIGHT_ENTITY_ID,
+            ATTR_BRIGHTNESS: _BRIGHTNESS,
+        },
+        blocking=True,
+    )
+
+    mqtt_mock.async_publish.assert_called_once_with(
+        _TOPIC_LIGHT_SET_STATE, _PAYLOAD_LIGHT_SET_STATE_BRIGHTNESS, 0, False
+    )
+
+    # Simulate response
+    async_fire_mqtt_message(hass, _TOPIC_LIGHT_STATE, _PAYLOAD_LIGHT_STATE_BRIGHTNESS)
+    await hass.async_block_till_done()
+
+    entity = hass.states.get(_LIGHT_ENTITY_ID)
+    assert entity.state == STATE_ON
+    assert entity.attributes.get(ATTR_BRIGHTNESS) == _BRIGHTNESS
+
+    # Switch OFF
+    mqtt_mock.reset_mock()
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: _LIGHT_ENTITY_ID},
+        blocking=True,
+    )
+
+    mqtt_mock.async_publish.assert_called_once_with(
+        _TOPIC_LIGHT_SET_STATE, _PAYLOAD_LIGHT_SET_STATE_OFF, 0, False
+    )
+
+    # Simulate response
+    async_fire_mqtt_message(hass, _TOPIC_LIGHT_STATE, _PAYLOAD_LIGHT_STATE_OFF)
+    await hass.async_block_till_done()
+
+    assert hass.states.get(_LIGHT_ENTITY_ID).state == STATE_OFF
diff --git a/tests/components/qbus/test_switch.py b/tests/components/qbus/test_switch.py
index 83bb667e4eb..ddb63e933da 100644
--- a/tests/components/qbus/test_switch.py
+++ b/tests/components/qbus/test_switch.py
@@ -1,7 +1,5 @@
 """Test Qbus switch entities."""
 
-import json
-
 from homeassistant.components.switch import (
     DOMAIN as SWITCH_DOMAIN,
     SERVICE_TURN_OFF,
@@ -9,11 +7,8 @@ from homeassistant.components.switch import (
 )
 from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
-from homeassistant.util.json import JsonObjectType
 
-from .const import TOPIC_CONFIG
-
-from tests.common import MockConfigEntry, async_fire_mqtt_message
+from tests.common import async_fire_mqtt_message
 from tests.typing import MqttMockHAClient
 
 _PAYLOAD_SWITCH_STATE_ON = '{"id":"UL10","properties":{"value":true},"type":"state"}'
@@ -34,17 +29,10 @@ _SWITCH_ENTITY_ID = "switch.living"
 async def test_switch_turn_on_off(
     hass: HomeAssistant,
     mqtt_mock: MqttMockHAClient,
-    mock_config_entry: MockConfigEntry,
-    payload_config: JsonObjectType,
+    setup_integration: None,
 ) -> None:
     """Test turning on and off."""
 
-    assert await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    async_fire_mqtt_message(hass, TOPIC_CONFIG, json.dumps(payload_config))
-    await hass.async_block_till_done()
-
     # Switch ON
     mqtt_mock.reset_mock()
     await hass.services.async_call(
diff --git a/tests/components/qingping/test_config_flow.py b/tests/components/qingping/test_config_flow.py
index 7bcd9c09e68..9d3d2a49e26 100644
--- a/tests/components/qingping/test_config_flow.py
+++ b/tests/components/qingping/test_config_flow.py
@@ -114,6 +114,38 @@ async def test_async_step_user_with_found_devices(hass: HomeAssistant) -> None:
     assert result2["result"].unique_id == "aa:bb:cc:dd:ee:ff"
 
 
+async def test_async_step_user_replace_ignored(hass: HomeAssistant) -> None:
+    """Test setup from service info can replace an ignored entry."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=LIGHT_AND_SIGNAL_SERVICE_INFO.address,
+        source=config_entries.SOURCE_IGNORE,
+        data={},
+    )
+    entry.add_to_hass(hass)
+    with patch(
+        "homeassistant.components.qingping.config_flow.async_discovered_service_info",
+        return_value=[LIGHT_AND_SIGNAL_SERVICE_INFO],
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_USER},
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    with patch(
+        "homeassistant.components.qingping.async_setup_entry", return_value=True
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input={"address": "aa:bb:cc:dd:ee:ff"},
+        )
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "Motion & Light EEFF"
+    assert result2["data"] == {}
+    assert result2["result"].unique_id == "aa:bb:cc:dd:ee:ff"
+
+
 async def test_async_step_user_device_added_between_steps(hass: HomeAssistant) -> None:
     """Test the device gets added via another flow between steps."""
     with patch(
diff --git a/tests/components/qld_bushfire/test_geo_location.py b/tests/components/qld_bushfire/test_geo_location.py
index 20659182726..aefee4113cc 100644
--- a/tests/components/qld_bushfire/test_geo_location.py
+++ b/tests/components/qld_bushfire/test_geo_location.py
@@ -31,7 +31,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import assert_setup_component, async_fire_time_changed
 
diff --git a/tests/components/radarr/test_sensor.py b/tests/components/radarr/test_sensor.py
index 563ac504057..f6b14bffa80 100644
--- a/tests/components/radarr/test_sensor.py
+++ b/tests/components/radarr/test_sensor.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import setup_integration
 
@@ -68,13 +68,13 @@ async def test_sensors(
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "GB"
     state = hass.states.get("sensor.mock_title_movies")
     assert state.state == "1"
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "Movies"
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "movies"
     state = hass.states.get("sensor.mock_title_start_time")
     assert state.state == "2020-09-01T23:50:20+00:00"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TIMESTAMP
     state = hass.states.get("sensor.mock_title_queue")
     assert state.state == "2"
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "Movies"
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "movies"
     assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.TOTAL
 
 
diff --git a/tests/components/rainforest_raven/snapshots/test_diagnostics.ambr b/tests/components/rainforest_raven/snapshots/test_diagnostics.ambr
index e131bf3d952..abf8e380916 100644
--- a/tests/components/rainforest_raven/snapshots/test_diagnostics.ambr
+++ b/tests/components/rainforest_raven/snapshots/test_diagnostics.ambr
@@ -17,6 +17,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': None,
       'version': 1,
@@ -84,6 +86,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': None,
       'version': 1,
diff --git a/tests/components/rainforest_raven/snapshots/test_init.ambr b/tests/components/rainforest_raven/snapshots/test_init.ambr
index 768bbc729d4..8a143f9963f 100644
--- a/tests/components/rainforest_raven/snapshots/test_init.ambr
+++ b/tests/components/rainforest_raven/snapshots/test_init.ambr
@@ -8,6 +8,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
diff --git a/tests/components/rainforest_raven/snapshots/test_sensor.ambr b/tests/components/rainforest_raven/snapshots/test_sensor.ambr
index 34a5e031885..618766c1613 100644
--- a/tests/components/rainforest_raven/snapshots/test_sensor.ambr
+++ b/tests/components/rainforest_raven/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -111,6 +113,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -162,6 +165,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -213,6 +217,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/rainmachine/snapshots/test_binary_sensor.ambr b/tests/components/rainmachine/snapshots/test_binary_sensor.ambr
index 9c930736fe3..c4d6f2eeae1 100644
--- a/tests/components/rainmachine/snapshots/test_binary_sensor.ambr
+++ b/tests/components/rainmachine/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -190,6 +194,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +241,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/rainmachine/snapshots/test_button.ambr b/tests/components/rainmachine/snapshots/test_button.ambr
index 609079bb0d8..68f83d9286a 100644
--- a/tests/components/rainmachine/snapshots/test_button.ambr
+++ b/tests/components/rainmachine/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/rainmachine/snapshots/test_diagnostics.ambr b/tests/components/rainmachine/snapshots/test_diagnostics.ambr
index acd5fd165b4..681805996f1 100644
--- a/tests/components/rainmachine/snapshots/test_diagnostics.ambr
+++ b/tests/components/rainmachine/snapshots/test_diagnostics.ambr
@@ -1144,6 +1144,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': '**REDACTED**',
       'version': 2,
@@ -2275,6 +2277,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': '**REDACTED**',
       'version': 2,
diff --git a/tests/components/rainmachine/snapshots/test_select.ambr b/tests/components/rainmachine/snapshots/test_select.ambr
index 651a709d2fa..d150f8c31b5 100644
--- a/tests/components/rainmachine/snapshots/test_select.ambr
+++ b/tests/components/rainmachine/snapshots/test_select.ambr
@@ -13,6 +13,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/rainmachine/snapshots/test_sensor.ambr b/tests/components/rainmachine/snapshots/test_sensor.ambr
index e93d0645030..2475abecb51 100644
--- a/tests/components/rainmachine/snapshots/test_sensor.ambr
+++ b/tests/components/rainmachine/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -194,6 +198,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -242,6 +247,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -289,6 +295,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -336,6 +343,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -383,6 +391,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -430,6 +439,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -477,6 +487,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -524,6 +535,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -571,6 +583,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -618,6 +631,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -665,6 +679,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/rainmachine/snapshots/test_switch.ambr b/tests/components/rainmachine/snapshots/test_switch.ambr
index b803ff994d4..d40913a7eb0 100644
--- a/tests/components/rainmachine/snapshots/test_switch.ambr
+++ b/tests/components/rainmachine/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -78,6 +79,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -126,6 +128,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -173,6 +176,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -234,6 +238,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -282,6 +287,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -329,6 +335,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -390,6 +397,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -438,6 +446,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -510,6 +519,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -558,6 +568,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -619,6 +630,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -667,6 +679,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -728,6 +741,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -776,6 +790,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -837,6 +852,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -885,6 +901,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -946,6 +963,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -994,6 +1012,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1055,6 +1074,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1103,6 +1123,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1164,6 +1185,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1212,6 +1234,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1273,6 +1296,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1321,6 +1345,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1382,6 +1407,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1430,6 +1456,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1491,6 +1518,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1539,6 +1567,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1600,6 +1629,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/recollect_waste/test_diagnostics.py b/tests/components/recollect_waste/test_diagnostics.py
index 24c690bcb37..a57e289ec04 100644
--- a/tests/components/recollect_waste/test_diagnostics.py
+++ b/tests/components/recollect_waste/test_diagnostics.py
@@ -34,6 +34,7 @@ async def test_entry_diagnostics(
             "created_at": ANY,
             "modified_at": ANY,
             "discovery_keys": {},
+            "subentries": [],
         },
         "data": [
             {
diff --git a/tests/components/recorder/auto_repairs/statistics/test_duplicates.py b/tests/components/recorder/auto_repairs/statistics/test_duplicates.py
index 78a7ddaa300..2466a761364 100644
--- a/tests/components/recorder/auto_repairs/statistics/test_duplicates.py
+++ b/tests/components/recorder/auto_repairs/statistics/test_duplicates.py
@@ -17,7 +17,7 @@ from homeassistant.components.recorder.auto_repairs.statistics.duplicates import
 from homeassistant.components.recorder.statistics import async_add_external_statistics
 from homeassistant.components.recorder.util import session_scope
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from ...common import async_wait_recording_done
 
diff --git a/tests/components/recorder/auto_repairs/statistics/test_schema.py b/tests/components/recorder/auto_repairs/statistics/test_schema.py
index 352a2345052..99d6705e4a4 100644
--- a/tests/components/recorder/auto_repairs/statistics/test_schema.py
+++ b/tests/components/recorder/auto_repairs/statistics/test_schema.py
@@ -87,6 +87,7 @@ async def test_validate_db_schema_fix_float_issue(
         "created_ts DOUBLE PRECISION",
         "start_ts DOUBLE PRECISION",
         "mean DOUBLE PRECISION",
+        "mean_weight DOUBLE PRECISION",
         "min DOUBLE PRECISION",
         "max DOUBLE PRECISION",
         "last_reset_ts DOUBLE PRECISION",
diff --git a/tests/components/recorder/common.py b/tests/components/recorder/common.py
index fbb0991c960..d381c225275 100644
--- a/tests/components/recorder/common.py
+++ b/tests/components/recorder/common.py
@@ -15,7 +15,7 @@ from typing import Any, Literal, cast
 from unittest.mock import MagicMock, patch, sentinel
 
 from freezegun import freeze_time
-from sqlalchemy import create_engine
+from sqlalchemy import create_engine, event as sqlalchemy_event
 from sqlalchemy.orm.session import Session
 
 from homeassistant import core as ha
@@ -35,9 +35,11 @@ from homeassistant.components.recorder.db_schema import (
     StatesMeta,
 )
 from homeassistant.components.recorder.tasks import RecorderTask, StatisticsTask
-from homeassistant.const import UnitOfTemperature
+from homeassistant.components.sensor import SensorDeviceClass, SensorStateClass
+from homeassistant.const import DEGREE, UnitOfTemperature
 from homeassistant.core import Event, HomeAssistant, State
-import homeassistant.util.dt as dt_util
+from homeassistant.helpers import recorder as recorder_helper
+from homeassistant.util import dt as dt_util
 
 from . import db_schema_0
 
@@ -79,6 +81,11 @@ async def async_block_recorder(hass: HomeAssistant, seconds: float) -> None:
     await event.wait()
 
 
+async def async_wait_recorder(hass: HomeAssistant) -> bool:
+    """Wait for recorder to initialize and return connection status."""
+    return await hass.data[recorder_helper.DATA_RECORDER].db_connected
+
+
 def get_start_time(start: datetime) -> datetime:
     """Calculate a valid start time for statistics."""
     start_minutes = start.minute - start.minute % 5
@@ -284,6 +291,7 @@ def record_states(
     sns2 = "sensor.test2"
     sns3 = "sensor.test3"
     sns4 = "sensor.test4"
+    sns5 = "sensor.wind_direction"
     sns1_attr = {
         "device_class": "temperature",
         "state_class": "measurement",
@@ -296,6 +304,11 @@ def record_states(
     }
     sns3_attr = {"device_class": "temperature"}
     sns4_attr = {}
+    sns5_attr = {
+        "device_class": SensorDeviceClass.WIND_DIRECTION,
+        "state_class": SensorStateClass.MEASUREMENT_ANGLE,
+        "unit_of_measurement": DEGREE,
+    }
 
     def set_state(entity_id, state, **kwargs):
         """Set the state."""
@@ -309,7 +322,7 @@ def record_states(
     three = two + timedelta(seconds=30 * 5)
     four = three + timedelta(seconds=14 * 5)
 
-    states = {mp: [], sns1: [], sns2: [], sns3: [], sns4: []}
+    states = {mp: [], sns1: [], sns2: [], sns3: [], sns4: [], sns5: []}
     with freeze_time(one) as freezer:
         states[mp].append(
             set_state(mp, "idle", attributes={"media_title": str(sentinel.mt1)})
@@ -318,6 +331,7 @@ def record_states(
         states[sns2].append(set_state(sns2, "10", attributes=sns2_attr))
         states[sns3].append(set_state(sns3, "10", attributes=sns3_attr))
         states[sns4].append(set_state(sns4, "10", attributes=sns4_attr))
+        states[sns5].append(set_state(sns5, "10", attributes=sns5_attr))
 
         freezer.move_to(one + timedelta(microseconds=1))
         states[mp].append(
@@ -329,12 +343,14 @@ def record_states(
         states[sns2].append(set_state(sns2, "15", attributes=sns2_attr))
         states[sns3].append(set_state(sns3, "15", attributes=sns3_attr))
         states[sns4].append(set_state(sns4, "15", attributes=sns4_attr))
+        states[sns5].append(set_state(sns5, "350", attributes=sns5_attr))
 
         freezer.move_to(three)
         states[sns1].append(set_state(sns1, "20", attributes=sns1_attr))
         states[sns2].append(set_state(sns2, "20", attributes=sns2_attr))
         states[sns3].append(set_state(sns3, "20", attributes=sns3_attr))
         states[sns4].append(set_state(sns4, "20", attributes=sns4_attr))
+        states[sns5].append(set_state(sns5, "5", attributes=sns5_attr))
 
     return zero, four, states
 
@@ -408,7 +424,15 @@ def create_engine_test_for_schema_version_postfix(
     schema_module = get_schema_module_path(schema_version_postfix)
     importlib.import_module(schema_module)
     old_db_schema = sys.modules[schema_module]
+    instance: Recorder | None = None
+    if "hass" in kwargs:
+        hass: HomeAssistant = kwargs.pop("hass")
+        instance = recorder.get_instance(hass)
     engine = create_engine(*args, **kwargs)
+    if instance is not None:
+        instance = recorder.get_instance(hass)
+        instance.engine = engine
+        sqlalchemy_event.listen(engine, "connect", instance._setup_recorder_connection)
     old_db_schema.Base.metadata.create_all(engine)
     with Session(engine) as session:
         session.add(
@@ -429,7 +453,7 @@ def get_schema_module_path(schema_version_postfix: str) -> str:
 
 
 @contextmanager
-def old_db_schema(schema_version_postfix: str) -> Iterator[None]:
+def old_db_schema(hass: HomeAssistant, schema_version_postfix: str) -> Iterator[None]:
     """Fixture to initialize the db with the old schema."""
     schema_module = get_schema_module_path(schema_version_postfix)
     importlib.import_module(schema_module)
@@ -449,6 +473,7 @@ def old_db_schema(schema_version_postfix: str) -> Iterator[None]:
             CREATE_ENGINE_TARGET,
             new=partial(
                 create_engine_test_for_schema_version_postfix,
+                hass=hass,
                 schema_version_postfix=schema_version_postfix,
             ),
         ),
diff --git a/tests/components/recorder/conftest.py b/tests/components/recorder/conftest.py
index 9cdf9dbb372..681205126af 100644
--- a/tests/components/recorder/conftest.py
+++ b/tests/components/recorder/conftest.py
@@ -13,6 +13,7 @@ from sqlalchemy.orm.session import Session
 
 from homeassistant.components import recorder
 from homeassistant.components.recorder import db_schema
+from homeassistant.components.recorder.const import MAX_IDS_FOR_INDEXED_GROUP_BY
 from homeassistant.components.recorder.util import session_scope
 from homeassistant.core import HomeAssistant
 
@@ -190,3 +191,9 @@ def instrument_migration(
         instrumented_migration.live_migration_done_stall.set()
         instrumented_migration.non_live_migration_done_stall.set()
         yield instrumented_migration
+
+
+@pytest.fixture(params=[1, 2, MAX_IDS_FOR_INDEXED_GROUP_BY])
+def ids_for_start_time_chunk_sizes(request: pytest.FixtureRequest) -> int:
+    """Fixture to test different chunk sizes for start time query."""
+    return request.param
diff --git a/tests/components/recorder/db_schema_0.py b/tests/components/recorder/db_schema_0.py
index 12336dcc96a..12228e99211 100644
--- a/tests/components/recorder/db_schema_0.py
+++ b/tests/components/recorder/db_schema_0.py
@@ -23,7 +23,7 @@ from sqlalchemy.orm.session import Session
 
 from homeassistant.core import Event, EventOrigin, State, split_entity_id
 from homeassistant.helpers.json import JSONEncoder
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 # SQLAlchemy Schema
 Base = declarative_base()
diff --git a/tests/components/recorder/db_schema_16.py b/tests/components/recorder/db_schema_16.py
index 522bd6ea367..3455af1d019 100644
--- a/tests/components/recorder/db_schema_16.py
+++ b/tests/components/recorder/db_schema_16.py
@@ -36,7 +36,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Context, Event, EventOrigin, State, split_entity_id
 from homeassistant.helpers.json import JSONEncoder
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 # SQLAlchemy Schema
 Base = declarative_base()
diff --git a/tests/components/recorder/db_schema_18.py b/tests/components/recorder/db_schema_18.py
index 026227f68a0..9e9dc786580 100644
--- a/tests/components/recorder/db_schema_18.py
+++ b/tests/components/recorder/db_schema_18.py
@@ -36,7 +36,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Context, Event, EventOrigin, State, split_entity_id
 from homeassistant.helpers.json import JSONEncoder
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 # SQLAlchemy Schema
 Base = declarative_base()
diff --git a/tests/components/recorder/db_schema_22.py b/tests/components/recorder/db_schema_22.py
index 770d25c9cf2..766ff88ff72 100644
--- a/tests/components/recorder/db_schema_22.py
+++ b/tests/components/recorder/db_schema_22.py
@@ -42,7 +42,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Context, Event, EventOrigin, State, split_entity_id
 from homeassistant.helpers.json import JSONEncoder
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 # SQLAlchemy Schema
 Base = declarative_base()
diff --git a/tests/components/recorder/db_schema_23.py b/tests/components/recorder/db_schema_23.py
index 8cf3e16e5a8..fe36029b61f 100644
--- a/tests/components/recorder/db_schema_23.py
+++ b/tests/components/recorder/db_schema_23.py
@@ -41,7 +41,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Context, Event, EventOrigin, State, split_entity_id
 from homeassistant.helpers.json import JSONEncoder
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 # SQLAlchemy Schema
 Base = declarative_base()
diff --git a/tests/components/recorder/db_schema_23_with_newer_columns.py b/tests/components/recorder/db_schema_23_with_newer_columns.py
index 2ba62ba78f5..a77bc1fcbd5 100644
--- a/tests/components/recorder/db_schema_23_with_newer_columns.py
+++ b/tests/components/recorder/db_schema_23_with_newer_columns.py
@@ -49,7 +49,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Context, Event, EventOrigin, State, split_entity_id
 from homeassistant.helpers.json import JSONEncoder
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 # SQLAlchemy Schema
 Base = declarative_base()
diff --git a/tests/components/recorder/db_schema_25.py b/tests/components/recorder/db_schema_25.py
index 3b7c4a300c2..bd3cb23bd07 100644
--- a/tests/components/recorder/db_schema_25.py
+++ b/tests/components/recorder/db_schema_25.py
@@ -37,7 +37,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Context, Event, EventOrigin, State, split_entity_id
 from homeassistant.helpers.typing import UNDEFINED, UndefinedType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 # SQLAlchemy Schema
 Base = declarative_base()
diff --git a/tests/components/recorder/db_schema_28.py b/tests/components/recorder/db_schema_28.py
index 4d7f893de25..7f34343d995 100644
--- a/tests/components/recorder/db_schema_28.py
+++ b/tests/components/recorder/db_schema_28.py
@@ -43,7 +43,7 @@ from homeassistant.const import (
     MAX_LENGTH_STATE_STATE,
 )
 from homeassistant.core import Context, Event, EventOrigin, State, split_entity_id
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 # SQLAlchemy Schema
 Base = declarative_base()
diff --git a/tests/components/recorder/db_schema_30.py b/tests/components/recorder/db_schema_30.py
index 97c33334111..185dce786de 100644
--- a/tests/components/recorder/db_schema_30.py
+++ b/tests/components/recorder/db_schema_30.py
@@ -50,7 +50,7 @@ from homeassistant.const import (
 from homeassistant.core import Context, Event, EventOrigin, State, split_entity_id
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.json import JSON_DUMP, json_bytes
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.json import JSON_DECODE_EXCEPTIONS, json_loads
 
 ALL_DOMAIN_EXCLUDE_ATTRS = {ATTR_ATTRIBUTION, ATTR_RESTORED, ATTR_SUPPORTED_FEATURES}
diff --git a/tests/components/recorder/db_schema_32.py b/tests/components/recorder/db_schema_32.py
index 39ddb8e3148..9c19a1c7405 100644
--- a/tests/components/recorder/db_schema_32.py
+++ b/tests/components/recorder/db_schema_32.py
@@ -51,7 +51,7 @@ from homeassistant.const import (
 from homeassistant.core import Context, Event, EventOrigin, State, split_entity_id
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.json import JSON_DUMP, json_bytes
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.json import JSON_DECODE_EXCEPTIONS, json_loads
 
 ALL_DOMAIN_EXCLUDE_ATTRS = {ATTR_ATTRIBUTION, ATTR_RESTORED, ATTR_SUPPORTED_FEATURES}
@@ -583,6 +583,8 @@ class StatisticsBase:
     last_reset_ts = Column(TIMESTAMP_TYPE)
     state = Column(DOUBLE_TYPE)
     sum = Column(DOUBLE_TYPE)
+    # *** Not originally in v32, only added for tests. Added in v49
+    mean_weight = Column(DOUBLE_TYPE)
 
     @classmethod
     def from_stats(cls, metadata_id: int, stats: StatisticData) -> Self:
diff --git a/tests/components/recorder/db_schema_42.py b/tests/components/recorder/db_schema_42.py
index efeade46562..a5381d633cb 100644
--- a/tests/components/recorder/db_schema_42.py
+++ b/tests/components/recorder/db_schema_42.py
@@ -66,7 +66,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Context, Event, EventOrigin, State
 from homeassistant.helpers.json import JSON_DUMP, json_bytes, json_bytes_strip_null
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.json import (
     JSON_DECODE_EXCEPTIONS,
     json_loads,
diff --git a/tests/components/recorder/db_schema_43.py b/tests/components/recorder/db_schema_43.py
index 8e77e8782ee..379e6fbd416 100644
--- a/tests/components/recorder/db_schema_43.py
+++ b/tests/components/recorder/db_schema_43.py
@@ -66,7 +66,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Context, Event, EventOrigin, EventStateChangedData, State
 from homeassistant.helpers.json import JSON_DUMP, json_bytes, json_bytes_strip_null
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.json import (
     JSON_DECODE_EXCEPTIONS,
     json_loads,
diff --git a/tests/components/recorder/db_schema_9.py b/tests/components/recorder/db_schema_9.py
index f9a8c2d2cad..6cf7085e279 100644
--- a/tests/components/recorder/db_schema_9.py
+++ b/tests/components/recorder/db_schema_9.py
@@ -19,13 +19,12 @@ from sqlalchemy import (
     Text,
     distinct,
 )
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import relationship
+from sqlalchemy.orm import declarative_base, relationship
 from sqlalchemy.orm.session import Session
 
 from homeassistant.core import Context, Event, EventOrigin, State, split_entity_id
 from homeassistant.helpers.json import JSONEncoder
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 # SQLAlchemy Schema
 Base = declarative_base()
diff --git a/tests/components/recorder/table_managers/test_statistics_meta.py b/tests/components/recorder/table_managers/test_statistics_meta.py
index 66edb84c3ef..1af60b71ed5 100644
--- a/tests/components/recorder/table_managers/test_statistics_meta.py
+++ b/tests/components/recorder/table_managers/test_statistics_meta.py
@@ -2,10 +2,19 @@
 
 from __future__ import annotations
 
+import logging
+import threading
+
 import pytest
 
 from homeassistant.components import recorder
+from homeassistant.components.recorder.db_schema import StatisticsMeta
+from homeassistant.components.recorder.models import (
+    StatisticMeanType,
+    StatisticMetaData,
+)
 from homeassistant.components.recorder.util import session_scope
+from homeassistant.const import DEGREE
 from homeassistant.core import HomeAssistant
 
 from tests.typing import RecorderInstanceGenerator
@@ -55,3 +64,78 @@ async def test_unsafe_calls_to_statistics_meta_manager(
             session,
             statistic_ids=["light.kitchen"],
         )
+
+
+async def test_invalid_mean_types(
+    async_setup_recorder_instance: RecorderInstanceGenerator,
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test passing invalid mean types will be skipped and logged."""
+    instance = await async_setup_recorder_instance(
+        hass, {recorder.CONF_COMMIT_INTERVAL: 0}
+    )
+    instance.recorder_and_worker_thread_ids.add(threading.get_ident())
+
+    valid_metadata: dict[str, tuple[int, StatisticMetaData]] = {
+        "sensor.energy": (
+            1,
+            {
+                "mean_type": StatisticMeanType.NONE,
+                "has_mean": False,
+                "has_sum": True,
+                "name": "Total imported energy",
+                "source": "recorder",
+                "statistic_id": "sensor.energy",
+                "unit_of_measurement": "kWh",
+            },
+        ),
+        "sensor.wind_direction": (
+            2,
+            {
+                "mean_type": StatisticMeanType.CIRCULAR,
+                "has_mean": False,
+                "has_sum": False,
+                "name": "Wind direction",
+                "source": "recorder",
+                "statistic_id": "sensor.wind_direction",
+                "unit_of_measurement": DEGREE,
+            },
+        ),
+        "sensor.wind_speed": (
+            3,
+            {
+                "mean_type": StatisticMeanType.ARITHMETIC,
+                "has_mean": True,
+                "has_sum": False,
+                "name": "Wind speed",
+                "source": "recorder",
+                "statistic_id": "sensor.wind_speed",
+                "unit_of_measurement": "km/h",
+            },
+        ),
+    }
+    manager = instance.statistics_meta_manager
+    with instance.get_session() as session:
+        for _, metadata in valid_metadata.values():
+            session.add(StatisticsMeta.from_meta(metadata))
+
+        # Add invalid mean type
+        session.add(
+            StatisticsMeta(
+                statistic_id="sensor.invalid",
+                source="recorder",
+                has_sum=False,
+                name="Invalid",
+                mean_type=12345,
+            )
+        )
+        session.commit()
+
+        # Check that the invalid mean type was skipped
+        assert manager.get_many(session) == valid_metadata
+        assert (
+            "homeassistant.components.recorder.table_managers.statistics_meta",
+            logging.WARNING,
+            "Invalid mean type found for statistic_id: sensor.invalid, mean_type: 12345. Skipping",
+        ) in caplog.record_tuples
diff --git a/tests/components/recorder/test_backup.py b/tests/components/recorder/test_backup.py
index 08fbef01bdd..a4362b1fa4c 100644
--- a/tests/components/recorder/test_backup.py
+++ b/tests/components/recorder/test_backup.py
@@ -1,12 +1,13 @@
 """Test backup platform for the Recorder integration."""
 
+from contextlib import AbstractContextManager, nullcontext as does_not_raise
 from unittest.mock import patch
 
 import pytest
 
 from homeassistant.components.recorder import Recorder
 from homeassistant.components.recorder.backup import async_post_backup, async_pre_backup
-from homeassistant.core import HomeAssistant
+from homeassistant.core import CoreState, HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 
 
@@ -16,7 +17,42 @@ async def test_async_pre_backup(recorder_mock: Recorder, hass: HomeAssistant) ->
         "homeassistant.components.recorder.core.Recorder.lock_database"
     ) as lock_mock:
         await async_pre_backup(hass)
-        assert lock_mock.called
+    assert lock_mock.called
+
+
+RAISES_HASS_NOT_RUNNING = pytest.raises(
+    HomeAssistantError, match="Home Assistant is not running"
+)
+
+
+@pytest.mark.parametrize(
+    ("core_state", "expected_result", "lock_calls"),
+    [
+        (CoreState.final_write, RAISES_HASS_NOT_RUNNING, 0),
+        (CoreState.not_running, RAISES_HASS_NOT_RUNNING, 0),
+        (CoreState.running, does_not_raise(), 1),
+        (CoreState.starting, RAISES_HASS_NOT_RUNNING, 0),
+        (CoreState.stopped, RAISES_HASS_NOT_RUNNING, 0),
+        (CoreState.stopping, RAISES_HASS_NOT_RUNNING, 0),
+    ],
+)
+async def test_async_pre_backup_core_state(
+    recorder_mock: Recorder,
+    hass: HomeAssistant,
+    core_state: CoreState,
+    expected_result: AbstractContextManager,
+    lock_calls: int,
+) -> None:
+    """Test pre backup in different core states."""
+    hass.set_state(core_state)
+    with (  # pylint: disable=confusing-with-statement
+        patch(
+            "homeassistant.components.recorder.core.Recorder.lock_database"
+        ) as lock_mock,
+        expected_result,
+    ):
+        await async_pre_backup(hass)
+    assert len(lock_mock.mock_calls) == lock_calls
 
 
 async def test_async_pre_backup_with_timeout(
@@ -39,13 +75,17 @@ async def test_async_pre_backup_with_migration(
 ) -> None:
     """Test pre backup with migration."""
     with (
+        patch(
+            "homeassistant.components.recorder.core.Recorder.lock_database"
+        ) as lock_mock,
         patch(
             "homeassistant.components.recorder.backup.async_migration_in_progress",
             return_value=True,
         ),
-        pytest.raises(HomeAssistantError),
+        pytest.raises(HomeAssistantError, match="Database migration in progress"),
     ):
         await async_pre_backup(hass)
+    assert not lock_mock.called
 
 
 async def test_async_post_backup(recorder_mock: Recorder, hass: HomeAssistant) -> None:
@@ -54,7 +94,7 @@ async def test_async_post_backup(recorder_mock: Recorder, hass: HomeAssistant) -
         "homeassistant.components.recorder.core.Recorder.unlock_database"
     ) as unlock_mock:
         await async_post_backup(hass)
-        assert unlock_mock.called
+    assert unlock_mock.called
 
 
 async def test_async_post_backup_failure(
@@ -66,7 +106,9 @@ async def test_async_post_backup_failure(
             "homeassistant.components.recorder.core.Recorder.unlock_database",
             return_value=False,
         ) as unlock_mock,
-        pytest.raises(HomeAssistantError),
+        pytest.raises(
+            HomeAssistantError, match="Could not release database write lock"
+        ),
     ):
         await async_post_backup(hass)
     assert unlock_mock.called
diff --git a/tests/components/recorder/test_filters_with_entityfilter_schema_37.py b/tests/components/recorder/test_filters_with_entityfilter_schema_37.py
index d3024df4ed6..2e9883aaf53 100644
--- a/tests/components/recorder/test_filters_with_entityfilter_schema_37.py
+++ b/tests/components/recorder/test_filters_with_entityfilter_schema_37.py
@@ -1,6 +1,6 @@
 """The tests for the recorder filter matching the EntityFilter component."""
 
-from collections.abc import AsyncGenerator
+from collections.abc import AsyncGenerator, Generator
 import json
 from unittest.mock import patch
 
@@ -32,12 +32,21 @@ from homeassistant.helpers.entityfilter import (
 
 from .common import async_wait_recording_done, old_db_schema
 
+from tests.typing import RecorderInstanceContextManager
+
+
+@pytest.fixture
+async def mock_recorder_before_hass(
+    async_test_recorder: RecorderInstanceContextManager,
+) -> None:
+    """Set up recorder."""
+
 
 # This test is for schema 37 and below (32 is new enough to test)
 @pytest.fixture(autouse=True)
-def db_schema_32():
+def db_schema_32(hass: HomeAssistant) -> Generator[None]:
     """Fixture to initialize the db with the old schema 32."""
-    with old_db_schema("32"):
+    with old_db_schema(hass, "32"):
         yield
 
 
diff --git a/tests/components/recorder/test_history.py b/tests/components/recorder/test_history.py
index d9dbbf191f6..d6223eb55b3 100644
--- a/tests/components/recorder/test_history.py
+++ b/tests/components/recorder/test_history.py
@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 
+from collections.abc import Generator
 from copy import copy
 from datetime import datetime, timedelta
 import json
-from unittest.mock import sentinel
+from unittest.mock import patch, sentinel
 
 from freezegun import freeze_time
 import pytest
@@ -22,7 +23,7 @@ from homeassistant.components.recorder.models import process_timestamp
 from homeassistant.components.recorder.util import session_scope
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers.json import JSONEncoder
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import (
     assert_dict_of_states_equal_without_context_and_last_changed,
@@ -36,6 +37,24 @@ from .common import (
 from tests.typing import RecorderInstanceContextManager
 
 
+@pytest.fixture
+def multiple_start_time_chunk_sizes(
+    ids_for_start_time_chunk_sizes: int,
+) -> Generator[None]:
+    """Fixture to test different chunk sizes for start time query.
+
+    Force the recorder to use different chunk sizes for start time query.
+
+    In effect this forces get_significant_states_with_session
+    to call _generate_significant_states_with_session_stmt multiple times.
+    """
+    with patch(
+        "homeassistant.components.recorder.history.modern.MAX_IDS_FOR_INDEXED_GROUP_BY",
+        ids_for_start_time_chunk_sizes,
+    ):
+        yield
+
+
 @pytest.fixture
 async def mock_recorder_before_hass(
     async_test_recorder: RecorderInstanceContextManager,
@@ -429,6 +448,7 @@ async def test_ensure_state_can_be_copied(
     assert_states_equal_without_context(copy(hist[entity_id][1]), hist[entity_id][1])
 
 
+@pytest.mark.usefixtures("multiple_start_time_chunk_sizes")
 async def test_get_significant_states(hass: HomeAssistant) -> None:
     """Test that only significant states are returned.
 
@@ -443,6 +463,7 @@ async def test_get_significant_states(hass: HomeAssistant) -> None:
     assert_dict_of_states_equal_without_context_and_last_changed(states, hist)
 
 
+@pytest.mark.usefixtures("multiple_start_time_chunk_sizes")
 async def test_get_significant_states_minimal_response(
     hass: HomeAssistant,
 ) -> None:
@@ -512,6 +533,7 @@ async def test_get_significant_states_minimal_response(
     )
 
 
+@pytest.mark.usefixtures("multiple_start_time_chunk_sizes")
 @pytest.mark.parametrize("time_zone", ["Europe/Berlin", "US/Hawaii", "UTC"])
 async def test_get_significant_states_with_initial(
     time_zone, hass: HomeAssistant
@@ -544,6 +566,7 @@ async def test_get_significant_states_with_initial(
     assert_dict_of_states_equal_without_context_and_last_changed(states, hist)
 
 
+@pytest.mark.usefixtures("multiple_start_time_chunk_sizes")
 async def test_get_significant_states_without_initial(
     hass: HomeAssistant,
 ) -> None:
@@ -578,6 +601,7 @@ async def test_get_significant_states_without_initial(
     assert_dict_of_states_equal_without_context_and_last_changed(states, hist)
 
 
+@pytest.mark.usefixtures("multiple_start_time_chunk_sizes")
 async def test_get_significant_states_entity_id(
     hass: HomeAssistant,
 ) -> None:
@@ -596,6 +620,7 @@ async def test_get_significant_states_entity_id(
     assert_dict_of_states_equal_without_context_and_last_changed(states, hist)
 
 
+@pytest.mark.usefixtures("multiple_start_time_chunk_sizes")
 async def test_get_significant_states_multiple_entity_ids(
     hass: HomeAssistant,
 ) -> None:
diff --git a/tests/components/recorder/test_history_db_schema_32.py b/tests/components/recorder/test_history_db_schema_32.py
index bfe5c852ca6..908a67cd635 100644
--- a/tests/components/recorder/test_history_db_schema_32.py
+++ b/tests/components/recorder/test_history_db_schema_32.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from collections.abc import Generator
 from copy import copy
 from datetime import datetime, timedelta
 import json
@@ -17,7 +18,7 @@ from homeassistant.components.recorder.models import process_timestamp
 from homeassistant.components.recorder.util import session_scope
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers.json import JSONEncoder
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import (
     assert_dict_of_states_equal_without_context_and_last_changed,
@@ -50,9 +51,9 @@ def disable_states_meta_manager():
 
 
 @pytest.fixture(autouse=True)
-def db_schema_32():
+def db_schema_32(hass: HomeAssistant) -> Generator[None]:
     """Fixture to initialize the db with the old schema 32."""
-    with old_db_schema("32"):
+    with old_db_schema(hass, "32"):
         yield
 
 
diff --git a/tests/components/recorder/test_history_db_schema_42.py b/tests/components/recorder/test_history_db_schema_42.py
index 23ac6f9fb8a..20d0c162d35 100644
--- a/tests/components/recorder/test_history_db_schema_42.py
+++ b/tests/components/recorder/test_history_db_schema_42.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from collections.abc import Generator
 from copy import copy
 from datetime import datetime, timedelta
 import json
@@ -10,15 +11,15 @@ from unittest.mock import sentinel
 from freezegun import freeze_time
 import pytest
 
+from homeassistant import core as ha
 from homeassistant.components import recorder
 from homeassistant.components.recorder import Recorder, history
 from homeassistant.components.recorder.filters import Filters
 from homeassistant.components.recorder.models import process_timestamp
 from homeassistant.components.recorder.util import session_scope
-import homeassistant.core as ha
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers.json import JSONEncoder
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import (
     assert_dict_of_states_equal_without_context_and_last_changed,
@@ -42,9 +43,9 @@ async def mock_recorder_before_hass(
 
 
 @pytest.fixture(autouse=True)
-def db_schema_42():
+def db_schema_42(hass: HomeAssistant) -> Generator[None]:
     """Fixture to initialize the db with the old schema 42."""
-    with old_db_schema("42"):
+    with old_db_schema(hass, "42"):
         yield
 
 
diff --git a/tests/components/recorder/test_init.py b/tests/components/recorder/test_init.py
index f8d1ac4af57..95cd959db3b 100644
--- a/tests/components/recorder/test_init.py
+++ b/tests/components/recorder/test_init.py
@@ -85,6 +85,7 @@ from homeassistant.util.json import json_loads
 from .common import (
     async_block_recorder,
     async_recorder_block_till_done,
+    async_wait_recorder,
     async_wait_recording_done,
     convert_pending_states_to_meta,
     corrupt_db_file,
@@ -155,7 +156,7 @@ async def test_shutdown_before_startup_finishes(
 
     recorder_helper.async_initialize_recorder(hass)
     hass.async_create_task(async_setup_recorder_instance(hass, config))
-    await recorder_helper.async_wait_recorder(hass)
+    await async_wait_recorder(hass)
     instance = get_instance(hass)
 
     session = await instance.async_add_executor_job(instance.get_session)
@@ -188,7 +189,7 @@ async def test_canceled_before_startup_finishes(
     hass.set_state(CoreState.not_running)
     recorder_helper.async_initialize_recorder(hass)
     hass.async_create_task(async_setup_recorder_instance(hass))
-    await recorder_helper.async_wait_recorder(hass)
+    await async_wait_recorder(hass)
 
     instance = get_instance(hass)
     instance._hass_started.cancel()
@@ -240,7 +241,7 @@ async def test_state_gets_saved_when_set_before_start_event(
 
     recorder_helper.async_initialize_recorder(hass)
     hass.async_create_task(async_setup_recorder_instance(hass))
-    await recorder_helper.async_wait_recorder(hass)
+    await async_wait_recorder(hass)
 
     entity_id = "test.recorder"
     state = "restoring_from_db"
@@ -2724,7 +2725,7 @@ async def test_commit_before_commits_pending_writes(
 
     recorder_helper.async_initialize_recorder(hass)
     hass.async_create_task(async_setup_recorder_instance(hass, config))
-    await recorder_helper.async_wait_recorder(hass)
+    await async_wait_recorder(hass)
     instance = get_instance(hass)
     assert instance.commit_interval == 60
     verify_states_in_queue_future = hass.loop.create_future()
diff --git a/tests/components/recorder/test_migrate.py b/tests/components/recorder/test_migrate.py
index e60a4705ac8..035fd9b4440 100644
--- a/tests/components/recorder/test_migrate.py
+++ b/tests/components/recorder/test_migrate.py
@@ -30,10 +30,9 @@ from homeassistant.components.recorder.db_schema import (
 )
 from homeassistant.components.recorder.util import session_scope
 from homeassistant.core import HomeAssistant, State
-from homeassistant.helpers import recorder as recorder_helper
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
-from .common import async_wait_recording_done, create_engine_test
+from .common import async_wait_recorder, async_wait_recording_done, create_engine_test
 from .conftest import InstrumentedMigration
 
 from tests.common import async_fire_time_changed
@@ -641,7 +640,7 @@ async def test_schema_migrate(
         )
         await hass.async_add_executor_job(instrument_migration.migration_started.wait)
         assert recorder.util.async_migration_in_progress(hass) is True
-        await recorder_helper.async_wait_recorder(hass)
+        await async_wait_recorder(hass)
 
         assert recorder.util.async_migration_in_progress(hass) is True
         assert recorder.util.async_migration_is_live(hass) == live
diff --git a/tests/components/recorder/test_migration_from_schema_32.py b/tests/components/recorder/test_migration_from_schema_32.py
index 94b7518edb7..7fd73aaf735 100644
--- a/tests/components/recorder/test_migration_from_schema_32.py
+++ b/tests/components/recorder/test_migration_from_schema_32.py
@@ -41,7 +41,7 @@ from homeassistant.components.recorder.util import (
     session_scope,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.ulid import bytes_to_ulid, ulid_at_time, ulid_to_bytes
 
 from .common import (
@@ -225,6 +225,7 @@ async def test_migrate_events_context_ids(
         patch.object(recorder, "db_schema", old_db_schema),
         patch.object(migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION),
         patch.object(migration.EventsContextIDMigration, "migrate_data"),
+        patch.object(migration.EventIDPostMigration, "migrate_data"),
         patch(CREATE_ENGINE_TARGET, new=_create_engine_test),
     ):
         async with (
@@ -282,6 +283,7 @@ async def test_migrate_events_context_ids(
             patch(
                 "sqlalchemy.schema.Index.create", autospec=True, wraps=Index.create
             ) as wrapped_idx_create,
+            patch.object(migration.EventIDPostMigration, "migrate_data"),
         ):
             async with async_test_recorder(
                 hass, wait_recorder=False, wait_recorder_setup=False
@@ -588,6 +590,7 @@ async def test_migrate_states_context_ids(
         patch.object(recorder, "db_schema", old_db_schema),
         patch.object(migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION),
         patch.object(migration.StatesContextIDMigration, "migrate_data"),
+        patch.object(migration.EventIDPostMigration, "migrate_data"),
         patch(CREATE_ENGINE_TARGET, new=_create_engine_test),
     ):
         async with (
@@ -640,6 +643,7 @@ async def test_migrate_states_context_ids(
             patch(
                 "sqlalchemy.schema.Index.create", autospec=True, wraps=Index.create
             ) as wrapped_idx_create,
+            patch.object(migration.EventIDPostMigration, "migrate_data"),
         ):
             async with async_test_recorder(
                 hass, wait_recorder=False, wait_recorder_setup=False
@@ -1127,6 +1131,7 @@ async def test_post_migrate_entity_ids(
         patch.object(migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION),
         patch.object(migration.EntityIDMigration, "migrate_data"),
         patch.object(migration.EntityIDPostMigration, "migrate_data"),
+        patch.object(migration.EventIDPostMigration, "migrate_data"),
         patch(CREATE_ENGINE_TARGET, new=_create_engine_test),
     ):
         async with (
@@ -1158,9 +1163,12 @@ async def test_post_migrate_entity_ids(
             return {state.state: state.entity_id for state in states}
 
     # Run again with new schema, let migration run
-    with patch(
-        "sqlalchemy.schema.Index.create", autospec=True, wraps=Index.create
-    ) as wrapped_idx_create:
+    with (
+        patch(
+            "sqlalchemy.schema.Index.create", autospec=True, wraps=Index.create
+        ) as wrapped_idx_create,
+        patch.object(migration.EventIDPostMigration, "migrate_data"),
+    ):
         async with (
             async_test_home_assistant() as hass,
             async_test_recorder(hass) as instance,
@@ -1169,7 +1177,6 @@ async def test_post_migrate_entity_ids(
 
             await hass.async_block_till_done()
             await async_wait_recording_done(hass)
-            await async_wait_recording_done(hass)
 
             states_by_state = await instance.async_add_executor_job(
                 _fetch_migrated_states
@@ -1531,6 +1538,7 @@ async def test_stats_timestamp_conversion_is_reentrant(
             "last_reset_ts": one_year_ago.timestamp(),
             "max": None,
             "mean": None,
+            "mean_weight": None,
             "metadata_id": 1000,
             "min": None,
             "start": process_timestamp(one_year_ago).replace(tzinfo=None),
@@ -1546,6 +1554,7 @@ async def test_stats_timestamp_conversion_is_reentrant(
             "last_reset_ts": six_months_ago.timestamp(),
             "max": None,
             "mean": None,
+            "mean_weight": None,
             "metadata_id": 1000,
             "min": None,
             "start": None,
@@ -1561,6 +1570,7 @@ async def test_stats_timestamp_conversion_is_reentrant(
             "last_reset_ts": one_month_ago.timestamp(),
             "max": None,
             "mean": None,
+            "mean_weight": None,
             "metadata_id": 1000,
             "min": None,
             "start": process_timestamp(one_month_ago).replace(tzinfo=None),
@@ -1698,6 +1708,7 @@ async def test_stats_timestamp_with_one_by_one(
             "last_reset_ts": one_year_ago.timestamp(),
             "max": None,
             "mean": None,
+            "mean_weight": None,
             "metadata_id": 1000,
             "min": None,
             "start": None,
@@ -1713,6 +1724,7 @@ async def test_stats_timestamp_with_one_by_one(
             "last_reset_ts": six_months_ago.timestamp(),
             "max": None,
             "mean": None,
+            "mean_weight": None,
             "metadata_id": 1000,
             "min": None,
             "start": None,
@@ -1728,6 +1740,7 @@ async def test_stats_timestamp_with_one_by_one(
             "last_reset_ts": one_month_ago.timestamp(),
             "max": None,
             "mean": None,
+            "mean_weight": None,
             "metadata_id": 1000,
             "min": None,
             "start": None,
@@ -1751,6 +1764,7 @@ async def test_stats_timestamp_with_one_by_one(
             "last_reset_ts": one_year_ago.timestamp(),
             "max": None,
             "mean": None,
+            "mean_weight": None,
             "metadata_id": 1000,
             "min": None,
             "start": None,
@@ -1766,6 +1780,7 @@ async def test_stats_timestamp_with_one_by_one(
             "last_reset_ts": six_months_ago.timestamp(),
             "max": None,
             "mean": None,
+            "mean_weight": None,
             "metadata_id": 1000,
             "min": None,
             "start": None,
@@ -1781,6 +1796,7 @@ async def test_stats_timestamp_with_one_by_one(
             "last_reset_ts": one_month_ago.timestamp(),
             "max": None,
             "mean": None,
+            "mean_weight": None,
             "metadata_id": 1000,
             "min": None,
             "start": None,
@@ -1925,6 +1941,7 @@ async def test_stats_timestamp_with_one_by_one_removes_duplicates(
             "last_reset_ts": one_year_ago.timestamp(),
             "max": None,
             "mean": None,
+            "mean_weight": None,
             "metadata_id": 1000,
             "min": None,
             "start": None,
@@ -1940,6 +1957,7 @@ async def test_stats_timestamp_with_one_by_one_removes_duplicates(
             "last_reset_ts": six_months_ago.timestamp(),
             "max": None,
             "mean": None,
+            "mean_weight": None,
             "metadata_id": 1000,
             "min": None,
             "start": None,
@@ -1955,6 +1973,7 @@ async def test_stats_timestamp_with_one_by_one_removes_duplicates(
             "last_reset_ts": one_month_ago.timestamp(),
             "max": None,
             "mean": None,
+            "mean_weight": None,
             "metadata_id": 1000,
             "min": None,
             "start": None,
@@ -1978,6 +1997,7 @@ async def test_stats_timestamp_with_one_by_one_removes_duplicates(
             "last_reset_ts": six_months_ago.timestamp(),
             "max": None,
             "mean": None,
+            "mean_weight": None,
             "metadata_id": 1000,
             "min": None,
             "start": None,
diff --git a/tests/components/recorder/test_migration_run_time_migrations_remember.py b/tests/components/recorder/test_migration_run_time_migrations_remember.py
index 43a1b028348..350126b4c72 100644
--- a/tests/components/recorder/test_migration_run_time_migrations_remember.py
+++ b/tests/components/recorder/test_migration_run_time_migrations_remember.py
@@ -115,7 +115,7 @@ def _create_engine_test(
                 "event_context_id_as_binary": (0, 1),
                 "event_type_id_migration": (2, 1),
                 "entity_id_migration": (2, 1),
-                "event_id_post_migration": (0, 0),
+                "event_id_post_migration": (1, 1),
                 "entity_id_post_migration": (0, 1),
             },
             [
@@ -131,7 +131,7 @@ def _create_engine_test(
                 "event_context_id_as_binary": (0, 0),
                 "event_type_id_migration": (2, 1),
                 "entity_id_migration": (2, 1),
-                "event_id_post_migration": (0, 0),
+                "event_id_post_migration": (1, 1),
                 "entity_id_post_migration": (0, 1),
             },
             ["ix_states_entity_id_last_updated_ts"],
@@ -143,13 +143,43 @@ def _create_engine_test(
                 "event_context_id_as_binary": (0, 0),
                 "event_type_id_migration": (0, 0),
                 "entity_id_migration": (2, 1),
-                "event_id_post_migration": (0, 0),
+                "event_id_post_migration": (1, 1),
                 "entity_id_post_migration": (0, 1),
             },
             ["ix_states_entity_id_last_updated_ts"],
         ),
         (
             38,
+            {
+                "state_context_id_as_binary": (0, 0),
+                "event_context_id_as_binary": (0, 0),
+                "event_type_id_migration": (0, 0),
+                "entity_id_migration": (0, 0),
+                "event_id_post_migration": (1, 1),
+                "entity_id_post_migration": (0, 0),
+            },
+            [],
+        ),
+        (
+            43,
+            {
+                "state_context_id_as_binary": (0, 0),
+                "event_context_id_as_binary": (0, 0),
+                "event_type_id_migration": (0, 0),
+                "entity_id_migration": (0, 0),
+                # Schema was not bumped when the SQLite
+                # table rebuild was implemented so we need
+                # run event_id_post_migration up until
+                # schema 44 since its the first one we can
+                # be sure has the foreign key constraint was removed
+                # via https://github.com/home-assistant/core/pull/120779
+                "event_id_post_migration": (1, 1),
+                "entity_id_post_migration": (0, 0),
+            },
+            [],
+        ),
+        (
+            44,
             {
                 "state_context_id_as_binary": (0, 0),
                 "event_context_id_as_binary": (0, 0),
@@ -266,8 +296,14 @@ async def test_data_migrator_logic(
     # the expected number of times.
     for migrator, mock in migrator_mocks.items():
         needs_migrate_calls, migrate_data_calls = expected_migrator_calls[migrator]
-        assert len(mock["needs_migrate"].mock_calls) == needs_migrate_calls
-        assert len(mock["migrate_data"].mock_calls) == migrate_data_calls
+        assert len(mock["needs_migrate"].mock_calls) == needs_migrate_calls, (
+            f"Expected {migrator} needs_migrate to be called {needs_migrate_calls} times,"
+            f" got {len(mock['needs_migrate'].mock_calls)}"
+        )
+        assert len(mock["migrate_data"].mock_calls) == migrate_data_calls, (
+            f"Expected {migrator} migrate_data to be called {migrate_data_calls} times, "
+            f"got {len(mock['migrate_data'].mock_calls)}"
+        )
 
 
 @pytest.mark.parametrize("enable_migrate_state_context_ids", [True])
diff --git a/tests/components/recorder/test_models.py b/tests/components/recorder/test_models.py
index b2894883ff2..689441260c7 100644
--- a/tests/components/recorder/test_models.py
+++ b/tests/components/recorder/test_models.py
@@ -5,6 +5,7 @@ from unittest.mock import PropertyMock
 
 import pytest
 
+from homeassistant import core as ha
 from homeassistant.components.recorder.const import SupportedDialect
 from homeassistant.components.recorder.db_schema import (
     EventData,
@@ -18,7 +19,6 @@ from homeassistant.components.recorder.models import (
     process_timestamp_to_utc_isoformat,
 )
 from homeassistant.const import EVENT_STATE_CHANGED
-import homeassistant.core as ha
 from homeassistant.exceptions import InvalidEntityFormatError
 from homeassistant.util import dt as dt_util
 from homeassistant.util.json import json_loads
diff --git a/tests/components/recorder/test_pool.py b/tests/components/recorder/test_pool.py
index 3cca095399b..e391161c1ec 100644
--- a/tests/components/recorder/test_pool.py
+++ b/tests/components/recorder/test_pool.py
@@ -1,5 +1,6 @@
 """Test pool."""
 
+import asyncio
 import threading
 
 import pytest
@@ -8,6 +9,7 @@ from sqlalchemy.orm import sessionmaker
 
 from homeassistant.components.recorder.const import DB_WORKER_PREFIX
 from homeassistant.components.recorder.pool import RecorderPool
+from homeassistant.core import HomeAssistant
 
 
 async def test_recorder_pool_called_from_event_loop() -> None:
@@ -22,7 +24,9 @@ async def test_recorder_pool_called_from_event_loop() -> None:
         sessionmaker(bind=engine)().connection()
 
 
-def test_recorder_pool(caplog: pytest.LogCaptureFixture) -> None:
+async def test_recorder_pool(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
     """Test RecorderPool gives the same connection in the creating thread."""
     recorder_and_worker_thread_ids: set[int] = set()
     engine = create_engine(
@@ -35,6 +39,8 @@ def test_recorder_pool(caplog: pytest.LogCaptureFixture) -> None:
     connections = []
     add_thread = False
 
+    event = asyncio.Event()
+
     def _get_connection_twice():
         if add_thread:
             recorder_and_worker_thread_ids.add(threading.get_ident())
@@ -48,33 +54,42 @@ def test_recorder_pool(caplog: pytest.LogCaptureFixture) -> None:
         session = get_session()
         connections.append(session.connection().connection.driver_connection)
         session.close()
+        hass.loop.call_soon_threadsafe(event.set)
 
     caplog.clear()
+    event.clear()
     new_thread = threading.Thread(target=_get_connection_twice)
     new_thread.start()
+    await event.wait()
     new_thread.join()
     assert "accesses the database without the database executor" in caplog.text
     assert connections[0] != connections[1]
 
     add_thread = True
     caplog.clear()
+    event.clear()
     new_thread = threading.Thread(target=_get_connection_twice, name=DB_WORKER_PREFIX)
     new_thread.start()
+    await event.wait()
     new_thread.join()
     assert "accesses the database without the database executor" not in caplog.text
     assert connections[2] == connections[3]
 
     caplog.clear()
+    event.clear()
     new_thread = threading.Thread(target=_get_connection_twice, name="Recorder")
     new_thread.start()
+    await event.wait()
     new_thread.join()
     assert "accesses the database without the database executor" not in caplog.text
     assert connections[4] == connections[5]
 
     shutdown = True
     caplog.clear()
+    event.clear()
     new_thread = threading.Thread(target=_get_connection_twice, name=DB_WORKER_PREFIX)
     new_thread.start()
+    await event.wait()
     new_thread.join()
     assert "accesses the database without the database executor" not in caplog.text
     assert connections[6] != connections[7]
diff --git a/tests/components/recorder/test_purge_v32_schema.py b/tests/components/recorder/test_purge_v32_schema.py
index 45bef68dabd..0212e4b012e 100644
--- a/tests/components/recorder/test_purge_v32_schema.py
+++ b/tests/components/recorder/test_purge_v32_schema.py
@@ -58,9 +58,9 @@ async def mock_recorder_before_hass(
 
 
 @pytest.fixture(autouse=True)
-def db_schema_32():
+def db_schema_32(hass: HomeAssistant) -> Generator[None]:
     """Fixture to initialize the db with the old schema 32."""
-    with old_db_schema("32"):
+    with old_db_schema(hass, "32"):
         yield
 
 
diff --git a/tests/components/recorder/test_statistics.py b/tests/components/recorder/test_statistics.py
index 2baf7f2bcbc..ed754723426 100644
--- a/tests/components/recorder/test_statistics.py
+++ b/tests/components/recorder/test_statistics.py
@@ -1,5 +1,6 @@
 """The tests for sensor recorder platform."""
 
+from collections.abc import Generator
 from datetime import timedelta
 from typing import Any
 from unittest.mock import ANY, Mock, patch
@@ -11,6 +12,7 @@ from homeassistant.components import recorder
 from homeassistant.components.recorder import Recorder, history, statistics
 from homeassistant.components.recorder.db_schema import StatisticsShortTerm
 from homeassistant.components.recorder.models import (
+    StatisticMeanType,
     datetime_to_timestamp_or_none,
     process_timestamp,
 )
@@ -18,7 +20,8 @@ from homeassistant.components.recorder.statistics import (
     STATISTIC_UNIT_TO_UNIT_CONVERTER,
     PlatformCompiledStatistics,
     _generate_max_mean_min_statistic_in_sub_period_stmt,
-    _generate_statistics_at_time_stmt,
+    _generate_statistics_at_time_stmt_dependent_sub_query,
+    _generate_statistics_at_time_stmt_group_by,
     _generate_statistics_during_period_stmt,
     async_add_external_statistics,
     async_import_statistics,
@@ -41,7 +44,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import (
     assert_dict_of_states_equal_without_context_and_last_changed,
@@ -57,6 +60,24 @@ from tests.common import MockPlatform, mock_platform
 from tests.typing import RecorderInstanceContextManager, WebSocketGenerator
 
 
+@pytest.fixture
+def multiple_start_time_chunk_sizes(
+    ids_for_start_time_chunk_sizes: int,
+) -> Generator[None]:
+    """Fixture to test different chunk sizes for start time query.
+
+    Force the statistics query to use different chunk sizes for start time query.
+
+    In effect this forces _statistics_at_time
+    to call _generate_statistics_at_time_stmt_group_by multiple times.
+    """
+    with patch(
+        "homeassistant.components.recorder.statistics.MAX_IDS_FOR_INDEXED_GROUP_BY",
+        ids_for_start_time_chunk_sizes,
+    ):
+        yield
+
+
 @pytest.fixture
 async def mock_recorder_before_hass(
     async_test_recorder: RecorderInstanceContextManager,
@@ -103,32 +124,38 @@ async def test_compile_hourly_statistics(
         stats = get_latest_short_term_statistics_with_session(
             hass,
             session,
-            {"sensor.test1"},
+            {"sensor.test1", "sensor.wind_direction"},
             {"last_reset", "max", "mean", "min", "state", "sum"},
         )
     assert stats == {}
 
-    for kwargs in ({}, {"statistic_ids": ["sensor.test1"]}):
+    for kwargs in ({}, {"statistic_ids": ["sensor.test1", "sensor.wind_direction"]}):
         stats = statistics_during_period(hass, zero, period="5minute", **kwargs)
         assert stats == {}
-    stats = get_last_short_term_statistics(
-        hass,
-        0,
-        "sensor.test1",
-        True,
-        {"last_reset", "max", "mean", "min", "state", "sum"},
-    )
-    assert stats == {}
+    for sensor in ("sensor.test1", "sensor.wind_direction"):
+        stats = get_last_short_term_statistics(
+            hass,
+            0,
+            sensor,
+            True,
+            {"last_reset", "max", "mean", "min", "state", "sum"},
+        )
+        assert stats == {}
 
     do_adhoc_statistics(hass, start=zero)
     do_adhoc_statistics(hass, start=four)
     await async_wait_recording_done(hass)
 
-    metadata = get_metadata(hass, statistic_ids={"sensor.test1", "sensor.test2"})
-    assert metadata["sensor.test1"][1]["has_mean"] is True
-    assert metadata["sensor.test1"][1]["has_sum"] is False
-    assert metadata["sensor.test2"][1]["has_mean"] is True
-    assert metadata["sensor.test2"][1]["has_sum"] is False
+    metadata = get_metadata(
+        hass, statistic_ids={"sensor.test1", "sensor.test2", "sensor.wind_direction"}
+    )
+    for sensor, mean_type in (
+        ("sensor.test1", StatisticMeanType.ARITHMETIC),
+        ("sensor.test2", StatisticMeanType.ARITHMETIC),
+        ("sensor.wind_direction", StatisticMeanType.CIRCULAR),
+    ):
+        assert metadata[sensor][1]["mean_type"] is mean_type
+        assert metadata[sensor][1]["has_sum"] is False
     expected_1 = {
         "start": process_timestamp(zero).timestamp(),
         "end": process_timestamp(zero + timedelta(minutes=5)).timestamp(),
@@ -148,11 +175,39 @@ async def test_compile_hourly_statistics(
     expected_stats1 = [expected_1, expected_2]
     expected_stats2 = [expected_1, expected_2]
 
+    expected_stats_wind_direction1 = {
+        "start": process_timestamp(zero).timestamp(),
+        "end": process_timestamp(zero + timedelta(minutes=5)).timestamp(),
+        "mean": pytest.approx(358.6387003873801),
+        "min": None,
+        "max": None,
+        "last_reset": None,
+    }
+    expected_stats_wind_direction2 = {
+        "start": process_timestamp(four).timestamp(),
+        "end": process_timestamp(four + timedelta(minutes=5)).timestamp(),
+        "mean": pytest.approx(5),
+        "min": None,
+        "max": None,
+        "last_reset": None,
+    }
+    expected_stats_wind_direction = [
+        expected_stats_wind_direction1,
+        expected_stats_wind_direction2,
+    ]
+
     # Test statistics_during_period
     stats = statistics_during_period(
-        hass, zero, period="5minute", statistic_ids={"sensor.test1", "sensor.test2"}
+        hass,
+        zero,
+        period="5minute",
+        statistic_ids={"sensor.test1", "sensor.test2", "sensor.wind_direction"},
     )
-    assert stats == {"sensor.test1": expected_stats1, "sensor.test2": expected_stats2}
+    assert stats == {
+        "sensor.test1": expected_stats1,
+        "sensor.test2": expected_stats2,
+        "sensor.wind_direction": expected_stats_wind_direction,
+    }
 
     # Test statistics_during_period with a far future start and end date
     future = dt_util.as_utc(dt_util.parse_datetime("2221-11-01 00:00:00"))
@@ -161,7 +216,7 @@ async def test_compile_hourly_statistics(
         future,
         end_time=future,
         period="5minute",
-        statistic_ids={"sensor.test1", "sensor.test2"},
+        statistic_ids={"sensor.test1", "sensor.test2", "sensor.wind_direction"},
     )
     assert stats == {}
 
@@ -171,9 +226,13 @@ async def test_compile_hourly_statistics(
         zero,
         end_time=future,
         period="5minute",
-        statistic_ids={"sensor.test1", "sensor.test2"},
+        statistic_ids={"sensor.test1", "sensor.test2", "sensor.wind_direction"},
     )
-    assert stats == {"sensor.test1": expected_stats1, "sensor.test2": expected_stats2}
+    assert stats == {
+        "sensor.test1": expected_stats1,
+        "sensor.test2": expected_stats2,
+        "sensor.wind_direction": expected_stats_wind_direction,
+    }
 
     stats = statistics_during_period(
         hass, zero, statistic_ids={"sensor.test2"}, period="5minute"
@@ -186,32 +245,39 @@ async def test_compile_hourly_statistics(
     assert stats == {}
 
     # Test get_last_short_term_statistics and get_latest_short_term_statistics
-    stats = get_last_short_term_statistics(
-        hass,
-        0,
-        "sensor.test1",
-        True,
-        {"last_reset", "max", "mean", "min", "state", "sum"},
-    )
-    assert stats == {}
+    for sensor, expected in (
+        ("sensor.test1", expected_2),
+        ("sensor.wind_direction", expected_stats_wind_direction2),
+    ):
+        stats = get_last_short_term_statistics(
+            hass,
+            0,
+            sensor,
+            True,
+            {"last_reset", "max", "mean", "min", "state", "sum"},
+        )
+        assert stats == {}
 
-    stats = get_last_short_term_statistics(
-        hass,
-        1,
-        "sensor.test1",
-        True,
-        {"last_reset", "max", "mean", "min", "state", "sum"},
-    )
-    assert stats == {"sensor.test1": [expected_2]}
+        stats = get_last_short_term_statistics(
+            hass,
+            1,
+            sensor,
+            True,
+            {"last_reset", "max", "mean", "min", "state", "sum"},
+        )
+        assert stats == {sensor: [expected]}
 
     with session_scope(hass=hass, read_only=True) as session:
         stats = get_latest_short_term_statistics_with_session(
             hass,
             session,
-            {"sensor.test1"},
+            {"sensor.test1", "sensor.wind_direction"},
             {"last_reset", "max", "mean", "min", "state", "sum"},
         )
-    assert stats == {"sensor.test1": [expected_2]}
+    assert stats == {
+        "sensor.test1": [expected_2],
+        "sensor.wind_direction": [expected_stats_wind_direction2],
+    }
 
     # Now wipe the latest_short_term_statistics_ids table and test again
     # to make sure we can rebuild the missing data
@@ -221,13 +287,15 @@ async def test_compile_hourly_statistics(
         stats = get_latest_short_term_statistics_with_session(
             hass,
             session,
-            {"sensor.test1"},
+            {"sensor.test1", "sensor.wind_direction"},
             {"last_reset", "max", "mean", "min", "state", "sum"},
         )
-    assert stats == {"sensor.test1": [expected_2]}
+    assert stats == {
+        "sensor.test1": [expected_2],
+        "sensor.wind_direction": [expected_stats_wind_direction2],
+    }
 
     metadata = get_metadata(hass, statistic_ids={"sensor.test1"})
-
     with session_scope(hass=hass, read_only=True) as session:
         stats = get_latest_short_term_statistics_with_session(
             hass,
@@ -238,23 +306,44 @@ async def test_compile_hourly_statistics(
         )
     assert stats == {"sensor.test1": [expected_2]}
 
-    stats = get_last_short_term_statistics(
-        hass,
-        2,
-        "sensor.test1",
-        True,
-        {"last_reset", "max", "mean", "min", "state", "sum"},
+    # Test with multiple metadata ids
+    metadata = get_metadata(
+        hass, statistic_ids={"sensor.test1", "sensor.wind_direction"}
     )
-    assert stats == {"sensor.test1": expected_stats1[::-1]}
+    with session_scope(hass=hass, read_only=True) as session:
+        stats = get_latest_short_term_statistics_with_session(
+            hass,
+            session,
+            {"sensor.test1", "sensor.wind_direction"},
+            {"last_reset", "max", "mean", "min", "state", "sum"},
+            metadata=metadata,
+        )
+    assert stats == {
+        "sensor.test1": [expected_2],
+        "sensor.wind_direction": [expected_stats_wind_direction2],
+    }
 
-    stats = get_last_short_term_statistics(
-        hass,
-        3,
-        "sensor.test1",
-        True,
-        {"last_reset", "max", "mean", "min", "state", "sum"},
-    )
-    assert stats == {"sensor.test1": expected_stats1[::-1]}
+    for sensor, expected in (
+        ("sensor.test1", expected_stats1[::-1]),
+        ("sensor.wind_direction", expected_stats_wind_direction[::-1]),
+    ):
+        stats = get_last_short_term_statistics(
+            hass,
+            2,
+            sensor,
+            True,
+            {"last_reset", "max", "mean", "min", "state", "sum"},
+        )
+        assert stats == {sensor: expected}
+
+        stats = get_last_short_term_statistics(
+            hass,
+            3,
+            sensor,
+            True,
+            {"last_reset", "max", "mean", "min", "state", "sum"},
+        )
+        assert stats == {sensor: expected}
 
     stats = get_last_short_term_statistics(
         hass,
@@ -271,7 +360,7 @@ async def test_compile_hourly_statistics(
         stats = get_latest_short_term_statistics_with_session(
             hass,
             session,
-            {"sensor.test1"},
+            {"sensor.test1", "sensor.wind_direction"},
             {"last_reset", "max", "mean", "min", "state", "sum"},
         )
         assert stats == {}
@@ -286,7 +375,7 @@ async def test_compile_hourly_statistics(
         stats = get_latest_short_term_statistics_with_session(
             hass,
             session,
-            {"sensor.test1"},
+            {"sensor.test1", "sensor.wind_direction"},
             {"last_reset", "max", "mean", "min", "state", "sum"},
         )
     assert stats == {}
@@ -440,15 +529,35 @@ async def test_rename_entity(
     expected_stats1 = [expected_1]
     expected_stats2 = [expected_1]
     expected_stats99 = [expected_1]
+    expected_stats_wind_direction = [
+        {
+            "start": process_timestamp(zero).timestamp(),
+            "end": process_timestamp(zero + timedelta(minutes=5)).timestamp(),
+            "mean": pytest.approx(358.6387003873801),
+            "min": None,
+            "max": None,
+            "last_reset": None,
+            "state": None,
+            "sum": None,
+        }
+    ]
 
     stats = statistics_during_period(hass, zero, period="5minute")
-    assert stats == {"sensor.test1": expected_stats1, "sensor.test2": expected_stats2}
+    assert stats == {
+        "sensor.test1": expected_stats1,
+        "sensor.test2": expected_stats2,
+        "sensor.wind_direction": expected_stats_wind_direction,
+    }
 
     entity_registry.async_update_entity("sensor.test1", new_entity_id="sensor.test99")
     await async_wait_recording_done(hass)
 
     stats = statistics_during_period(hass, zero, period="5minute")
-    assert stats == {"sensor.test99": expected_stats99, "sensor.test2": expected_stats2}
+    assert stats == {
+        "sensor.test99": expected_stats99,
+        "sensor.test2": expected_stats2,
+        "sensor.wind_direction": expected_stats_wind_direction,
+    }
 
 
 async def test_statistics_during_period_set_back_compat(
@@ -524,9 +633,25 @@ async def test_rename_entity_collision(
     }
     expected_stats1 = [expected_1]
     expected_stats2 = [expected_1]
+    expected_stats_wind_direction = [
+        {
+            "start": process_timestamp(zero).timestamp(),
+            "end": process_timestamp(zero + timedelta(minutes=5)).timestamp(),
+            "mean": pytest.approx(358.6387003873801),
+            "min": None,
+            "max": None,
+            "last_reset": None,
+            "state": None,
+            "sum": None,
+        }
+    ]
 
     stats = statistics_during_period(hass, zero, period="5minute")
-    assert stats == {"sensor.test1": expected_stats1, "sensor.test2": expected_stats2}
+    assert stats == {
+        "sensor.test1": expected_stats1,
+        "sensor.test2": expected_stats2,
+        "sensor.wind_direction": expected_stats_wind_direction,
+    }
 
     # Insert metadata for sensor.test99
     metadata_1 = {
@@ -547,7 +672,11 @@ async def test_rename_entity_collision(
 
     # Statistics failed to migrate due to the collision
     stats = statistics_during_period(hass, zero, period="5minute")
-    assert stats == {"sensor.test1": expected_stats1, "sensor.test2": expected_stats2}
+    assert stats == {
+        "sensor.test1": expected_stats1,
+        "sensor.test2": expected_stats2,
+        "sensor.wind_direction": expected_stats_wind_direction,
+    }
 
     # Verify the safeguard in the states meta manager was hit
     assert (
@@ -611,9 +740,25 @@ async def test_rename_entity_collision_states_meta_check_disabled(
     }
     expected_stats1 = [expected_1]
     expected_stats2 = [expected_1]
+    expected_stats_wind_direction = [
+        {
+            "start": process_timestamp(zero).timestamp(),
+            "end": process_timestamp(zero + timedelta(minutes=5)).timestamp(),
+            "mean": pytest.approx(358.6387003873801),
+            "min": None,
+            "max": None,
+            "last_reset": None,
+            "state": None,
+            "sum": None,
+        }
+    ]
 
     stats = statistics_during_period(hass, zero, period="5minute")
-    assert stats == {"sensor.test1": expected_stats1, "sensor.test2": expected_stats2}
+    assert stats == {
+        "sensor.test1": expected_stats1,
+        "sensor.test2": expected_stats2,
+        "sensor.wind_direction": expected_stats_wind_direction,
+    }
 
     # Insert metadata for sensor.test99
     metadata_1 = {
@@ -640,7 +785,11 @@ async def test_rename_entity_collision_states_meta_check_disabled(
 
     # Statistics failed to migrate due to the collision
     stats = statistics_during_period(hass, zero, period="5minute")
-    assert stats == {"sensor.test1": expected_stats1, "sensor.test2": expected_stats2}
+    assert stats == {
+        "sensor.test1": expected_stats1,
+        "sensor.test2": expected_stats2,
+        "sensor.wind_direction": expected_stats_wind_direction,
+    }
 
     # Verify the filter_unique_constraint_integrity_error safeguard was hit
     assert "Blocked attempt to insert duplicated statistic rows" in caplog.text
@@ -766,6 +915,7 @@ async def test_import_statistics(
         {
             "display_unit_of_measurement": "kWh",
             "has_mean": False,
+            "mean_type": StatisticMeanType.NONE,
             "has_sum": True,
             "statistic_id": statistic_id,
             "name": "Total imported energy",
@@ -780,6 +930,7 @@ async def test_import_statistics(
             1,
             {
                 "has_mean": False,
+                "mean_type": StatisticMeanType.NONE,
                 "has_sum": True,
                 "name": "Total imported energy",
                 "source": source,
@@ -856,6 +1007,7 @@ async def test_import_statistics(
         {
             "display_unit_of_measurement": "kWh",
             "has_mean": False,
+            "mean_type": StatisticMeanType.NONE,
             "has_sum": True,
             "statistic_id": statistic_id,
             "name": "Total imported energy renamed",
@@ -870,6 +1022,7 @@ async def test_import_statistics(
             1,
             {
                 "has_mean": False,
+                "mean_type": StatisticMeanType.NONE,
                 "has_sum": True,
                 "name": "Total imported energy renamed",
                 "source": source,
@@ -1113,6 +1266,7 @@ async def test_import_statistics_errors(
     assert get_metadata(hass, statistic_ids={"sensor.total_energy_import"}) == {}
 
 
+@pytest.mark.usefixtures("multiple_start_time_chunk_sizes")
 @pytest.mark.parametrize("timezone", ["America/Regina", "Europe/Vienna", "UTC"])
 @pytest.mark.freeze_time("2022-10-01 00:00:00+00:00")
 async def test_daily_statistics_sum(
@@ -1293,6 +1447,215 @@ async def test_daily_statistics_sum(
     assert stats == {}
 
 
+@pytest.mark.usefixtures("multiple_start_time_chunk_sizes")
+@pytest.mark.parametrize("timezone", ["America/Regina", "Europe/Vienna", "UTC"])
+@pytest.mark.freeze_time("2022-10-01 00:00:00+00:00")
+async def test_multiple_daily_statistics_sum(
+    hass: HomeAssistant,
+    setup_recorder: None,
+    caplog: pytest.LogCaptureFixture,
+    timezone,
+) -> None:
+    """Test daily statistics."""
+    await hass.config.async_set_time_zone(timezone)
+    await async_wait_recording_done(hass)
+    assert "Compiling statistics for" not in caplog.text
+    assert "Statistics already compiled" not in caplog.text
+
+    zero = dt_util.utcnow()
+    period1 = dt_util.as_utc(dt_util.parse_datetime("2022-10-03 00:00:00"))
+    period2 = dt_util.as_utc(dt_util.parse_datetime("2022-10-03 23:00:00"))
+    period3 = dt_util.as_utc(dt_util.parse_datetime("2022-10-04 00:00:00"))
+    period4 = dt_util.as_utc(dt_util.parse_datetime("2022-10-04 23:00:00"))
+    period5 = dt_util.as_utc(dt_util.parse_datetime("2022-10-05 00:00:00"))
+    period6 = dt_util.as_utc(dt_util.parse_datetime("2022-10-05 23:00:00"))
+
+    external_statistics = (
+        {
+            "start": period1,
+            "last_reset": None,
+            "state": 0,
+            "sum": 2,
+        },
+        {
+            "start": period2,
+            "last_reset": None,
+            "state": 1,
+            "sum": 3,
+        },
+        {
+            "start": period3,
+            "last_reset": None,
+            "state": 2,
+            "sum": 4,
+        },
+        {
+            "start": period4,
+            "last_reset": None,
+            "state": 3,
+            "sum": 5,
+        },
+        {
+            "start": period5,
+            "last_reset": None,
+            "state": 4,
+            "sum": 6,
+        },
+        {
+            "start": period6,
+            "last_reset": None,
+            "state": 5,
+            "sum": 7,
+        },
+    )
+    external_metadata1 = {
+        "has_mean": False,
+        "has_sum": True,
+        "name": "Total imported energy 1",
+        "source": "test",
+        "statistic_id": "test:total_energy_import2",
+        "unit_of_measurement": "kWh",
+    }
+    external_metadata2 = {
+        "has_mean": False,
+        "has_sum": True,
+        "name": "Total imported energy 2",
+        "source": "test",
+        "statistic_id": "test:total_energy_import1",
+        "unit_of_measurement": "kWh",
+    }
+
+    async_add_external_statistics(hass, external_metadata1, external_statistics)
+    async_add_external_statistics(hass, external_metadata2, external_statistics)
+
+    await async_wait_recording_done(hass)
+    stats = statistics_during_period(
+        hass,
+        zero,
+        period="day",
+        statistic_ids={"test:total_energy_import1", "test:total_energy_import2"},
+    )
+    day1_start = dt_util.as_utc(dt_util.parse_datetime("2022-10-03 00:00:00"))
+    day1_end = dt_util.as_utc(dt_util.parse_datetime("2022-10-04 00:00:00"))
+    day2_start = dt_util.as_utc(dt_util.parse_datetime("2022-10-04 00:00:00"))
+    day2_end = dt_util.as_utc(dt_util.parse_datetime("2022-10-05 00:00:00"))
+    day3_start = dt_util.as_utc(dt_util.parse_datetime("2022-10-05 00:00:00"))
+    day3_end = dt_util.as_utc(dt_util.parse_datetime("2022-10-06 00:00:00"))
+    expected_stats_inner = [
+        {
+            "start": day1_start.timestamp(),
+            "end": day1_end.timestamp(),
+            "last_reset": None,
+            "state": 1.0,
+            "sum": 3.0,
+        },
+        {
+            "start": day2_start.timestamp(),
+            "end": day2_end.timestamp(),
+            "last_reset": None,
+            "state": 3.0,
+            "sum": 5.0,
+        },
+        {
+            "start": day3_start.timestamp(),
+            "end": day3_end.timestamp(),
+            "last_reset": None,
+            "state": 5.0,
+            "sum": 7.0,
+        },
+    ]
+    expected_stats = {
+        "test:total_energy_import1": expected_stats_inner,
+        "test:total_energy_import2": expected_stats_inner,
+    }
+    assert stats == expected_stats
+
+    # Get change
+    stats = statistics_during_period(
+        hass,
+        start_time=period1,
+        statistic_ids={"test:total_energy_import1", "test:total_energy_import2"},
+        period="day",
+        types={"change"},
+    )
+    expected_inner = [
+        {
+            "start": day1_start.timestamp(),
+            "end": day1_end.timestamp(),
+            "change": 3.0,
+        },
+        {
+            "start": day2_start.timestamp(),
+            "end": day2_end.timestamp(),
+            "change": 2.0,
+        },
+        {
+            "start": day3_start.timestamp(),
+            "end": day3_end.timestamp(),
+            "change": 2.0,
+        },
+    ]
+    assert stats == {
+        "test:total_energy_import1": expected_inner,
+        "test:total_energy_import2": expected_inner,
+    }
+
+    # Get data with start during the first period
+    stats = statistics_during_period(
+        hass,
+        start_time=period1 + timedelta(hours=1),
+        statistic_ids={"test:total_energy_import1", "test:total_energy_import2"},
+        period="day",
+    )
+    assert stats == expected_stats
+
+    # Get data with end during the third period
+    stats = statistics_during_period(
+        hass,
+        start_time=zero,
+        end_time=period6 - timedelta(hours=1),
+        statistic_ids={"test:total_energy_import1", "test:total_energy_import2"},
+        period="day",
+    )
+    assert stats == expected_stats
+
+    # Try to get data for entities which do not exist
+    stats = statistics_during_period(
+        hass,
+        start_time=zero,
+        statistic_ids={
+            "not",
+            "the",
+            "same",
+            "test:total_energy_import1",
+            "test:total_energy_import2",
+        },
+        period="day",
+    )
+    assert stats == expected_stats
+
+    # Use 5minute to ensure table switch works
+    stats = statistics_during_period(
+        hass,
+        start_time=zero,
+        statistic_ids=[
+            "test:total_energy_import1",
+            "with_other",
+            "test:total_energy_import2",
+        ],
+        period="5minute",
+    )
+    assert stats == {}
+
+    # Ensure future date has not data
+    future = dt_util.as_utc(dt_util.parse_datetime("2221-11-01 00:00:00"))
+    stats = statistics_during_period(
+        hass, start_time=future, end_time=future, period="day"
+    )
+    assert stats == {}
+
+
+@pytest.mark.usefixtures("multiple_start_time_chunk_sizes")
 @pytest.mark.parametrize("timezone", ["America/Regina", "Europe/Vienna", "UTC"])
 @pytest.mark.freeze_time("2022-10-01 00:00:00+00:00")
 async def test_weekly_statistics_mean(
@@ -1428,6 +1791,7 @@ async def test_weekly_statistics_mean(
     assert stats == {}
 
 
+@pytest.mark.usefixtures("multiple_start_time_chunk_sizes")
 @pytest.mark.parametrize("timezone", ["America/Regina", "Europe/Vienna", "UTC"])
 @pytest.mark.freeze_time("2022-10-01 00:00:00+00:00")
 async def test_weekly_statistics_sum(
@@ -1608,6 +1972,7 @@ async def test_weekly_statistics_sum(
     assert stats == {}
 
 
+@pytest.mark.usefixtures("multiple_start_time_chunk_sizes")
 @pytest.mark.parametrize("timezone", ["America/Regina", "Europe/Vienna", "UTC"])
 @pytest.mark.freeze_time("2021-08-01 00:00:00+00:00")
 async def test_monthly_statistics_sum(
@@ -1914,20 +2279,43 @@ def test_cache_key_for_generate_max_mean_min_statistic_in_sub_period_stmt() -> N
     assert cache_key_1 != cache_key_3
 
 
-def test_cache_key_for_generate_statistics_at_time_stmt() -> None:
-    """Test cache key for _generate_statistics_at_time_stmt."""
-    stmt = _generate_statistics_at_time_stmt(StatisticsShortTerm, {0}, 0.0, set())
+def test_cache_key_for_generate_statistics_at_time_stmt_group_by() -> None:
+    """Test cache key for _generate_statistics_at_time_stmt_group_by."""
+    stmt = _generate_statistics_at_time_stmt_group_by(
+        StatisticsShortTerm, {0}, 0.0, set()
+    )
     cache_key_1 = stmt._generate_cache_key()
-    stmt2 = _generate_statistics_at_time_stmt(StatisticsShortTerm, {0}, 0.0, set())
+    stmt2 = _generate_statistics_at_time_stmt_group_by(
+        StatisticsShortTerm, {0}, 0.0, set()
+    )
     cache_key_2 = stmt2._generate_cache_key()
     assert cache_key_1 == cache_key_2
-    stmt3 = _generate_statistics_at_time_stmt(
+    stmt3 = _generate_statistics_at_time_stmt_group_by(
         StatisticsShortTerm, {0}, 0.0, {"sum", "mean"}
     )
     cache_key_3 = stmt3._generate_cache_key()
     assert cache_key_1 != cache_key_3
 
 
+def test_cache_key_for_generate_statistics_at_time_stmt_dependent_sub_query() -> None:
+    """Test cache key for _generate_statistics_at_time_stmt_dependent_sub_query."""
+    stmt = _generate_statistics_at_time_stmt_dependent_sub_query(
+        StatisticsShortTerm, {0}, 0.0, set()
+    )
+    cache_key_1 = stmt._generate_cache_key()
+    stmt2 = _generate_statistics_at_time_stmt_dependent_sub_query(
+        StatisticsShortTerm, {0}, 0.0, set()
+    )
+    cache_key_2 = stmt2._generate_cache_key()
+    assert cache_key_1 == cache_key_2
+    stmt3 = _generate_statistics_at_time_stmt_dependent_sub_query(
+        StatisticsShortTerm, {0}, 0.0, {"sum", "mean"}
+    )
+    cache_key_3 = stmt3._generate_cache_key()
+    assert cache_key_1 != cache_key_3
+
+
+@pytest.mark.usefixtures("multiple_start_time_chunk_sizes")
 @pytest.mark.parametrize("timezone", ["America/Regina", "Europe/Vienna", "UTC"])
 @pytest.mark.freeze_time("2022-10-01 00:00:00+00:00")
 async def test_change(
@@ -2263,6 +2651,392 @@ async def test_change(
     assert stats == {}
 
 
+@pytest.mark.usefixtures("multiple_start_time_chunk_sizes")
+@pytest.mark.parametrize("timezone", ["America/Regina", "Europe/Vienna", "UTC"])
+@pytest.mark.freeze_time("2022-10-01 00:00:00+00:00")
+async def test_change_multiple(
+    hass: HomeAssistant,
+    setup_recorder: None,
+    caplog: pytest.LogCaptureFixture,
+    timezone,
+) -> None:
+    """Test deriving change from sum statistic."""
+    await hass.config.async_set_time_zone(timezone)
+    await async_wait_recording_done(hass)
+    assert "Compiling statistics for" not in caplog.text
+    assert "Statistics already compiled" not in caplog.text
+
+    zero = dt_util.utcnow()
+    period1 = dt_util.as_utc(dt_util.parse_datetime("2023-05-08 00:00:00"))
+    period2 = dt_util.as_utc(dt_util.parse_datetime("2023-05-08 01:00:00"))
+    period3 = dt_util.as_utc(dt_util.parse_datetime("2023-05-08 02:00:00"))
+    period4 = dt_util.as_utc(dt_util.parse_datetime("2023-05-08 03:00:00"))
+
+    external_statistics = (
+        {
+            "start": period1,
+            "last_reset": None,
+            "state": 0,
+            "sum": 2,
+        },
+        {
+            "start": period2,
+            "last_reset": None,
+            "state": 1,
+            "sum": 3,
+        },
+        {
+            "start": period3,
+            "last_reset": None,
+            "state": 2,
+            "sum": 5,
+        },
+        {
+            "start": period4,
+            "last_reset": None,
+            "state": 3,
+            "sum": 8,
+        },
+    )
+    external_metadata1 = {
+        "has_mean": False,
+        "has_sum": True,
+        "name": "Total imported energy",
+        "source": "recorder",
+        "statistic_id": "sensor.total_energy_import1",
+        "unit_of_measurement": "kWh",
+    }
+    external_metadata2 = {
+        "has_mean": False,
+        "has_sum": True,
+        "name": "Total imported energy",
+        "source": "recorder",
+        "statistic_id": "sensor.total_energy_import2",
+        "unit_of_measurement": "kWh",
+    }
+    async_import_statistics(hass, external_metadata1, external_statistics)
+    async_import_statistics(hass, external_metadata2, external_statistics)
+    await async_wait_recording_done(hass)
+    # Get change from far in the past
+    stats = statistics_during_period(
+        hass,
+        zero,
+        period="hour",
+        statistic_ids={"sensor.total_energy_import1", "sensor.total_energy_import2"},
+        types={"change"},
+    )
+    hour1_start = dt_util.as_utc(dt_util.parse_datetime("2023-05-08 00:00:00"))
+    hour1_end = dt_util.as_utc(dt_util.parse_datetime("2023-05-08 01:00:00"))
+    hour2_start = hour1_end
+    hour2_end = dt_util.as_utc(dt_util.parse_datetime("2023-05-08 02:00:00"))
+    hour3_start = hour2_end
+    hour3_end = dt_util.as_utc(dt_util.parse_datetime("2023-05-08 03:00:00"))
+    hour4_start = hour3_end
+    hour4_end = dt_util.as_utc(dt_util.parse_datetime("2023-05-08 04:00:00"))
+    expected_inner = [
+        {
+            "start": hour1_start.timestamp(),
+            "end": hour1_end.timestamp(),
+            "change": 2.0,
+        },
+        {
+            "start": hour2_start.timestamp(),
+            "end": hour2_end.timestamp(),
+            "change": 1.0,
+        },
+        {
+            "start": hour3_start.timestamp(),
+            "end": hour3_end.timestamp(),
+            "change": 2.0,
+        },
+        {
+            "start": hour4_start.timestamp(),
+            "end": hour4_end.timestamp(),
+            "change": 3.0,
+        },
+    ]
+    expected_stats = {
+        "sensor.total_energy_import1": expected_inner,
+        "sensor.total_energy_import2": expected_inner,
+    }
+    assert stats == expected_stats
+
+    # Get change + sum from far in the past
+    stats = statistics_during_period(
+        hass,
+        zero,
+        period="hour",
+        statistic_ids={"sensor.total_energy_import1", "sensor.total_energy_import2"},
+        types={"change", "sum"},
+    )
+    hour1_start = dt_util.as_utc(dt_util.parse_datetime("2023-05-08 00:00:00"))
+    hour1_end = dt_util.as_utc(dt_util.parse_datetime("2023-05-08 01:00:00"))
+    hour2_start = hour1_end
+    hour2_end = dt_util.as_utc(dt_util.parse_datetime("2023-05-08 02:00:00"))
+    hour3_start = hour2_end
+    hour3_end = dt_util.as_utc(dt_util.parse_datetime("2023-05-08 03:00:00"))
+    hour4_start = hour3_end
+    hour4_end = dt_util.as_utc(dt_util.parse_datetime("2023-05-08 04:00:00"))
+    expected_inner = [
+        {
+            "start": hour1_start.timestamp(),
+            "end": hour1_end.timestamp(),
+            "change": 2.0,
+            "sum": 2.0,
+        },
+        {
+            "start": hour2_start.timestamp(),
+            "end": hour2_end.timestamp(),
+            "change": 1.0,
+            "sum": 3.0,
+        },
+        {
+            "start": hour3_start.timestamp(),
+            "end": hour3_end.timestamp(),
+            "change": 2.0,
+            "sum": 5.0,
+        },
+        {
+            "start": hour4_start.timestamp(),
+            "end": hour4_end.timestamp(),
+            "change": 3.0,
+            "sum": 8.0,
+        },
+    ]
+    expected_stats_change_sum = {
+        "sensor.total_energy_import1": expected_inner,
+        "sensor.total_energy_import2": expected_inner,
+    }
+    assert stats == expected_stats_change_sum
+
+    # Get change from far in the past with unit conversion
+    stats = statistics_during_period(
+        hass,
+        start_time=hour1_start,
+        statistic_ids={"sensor.total_energy_import1", "sensor.total_energy_import2"},
+        period="hour",
+        types={"change"},
+        units={"energy": "Wh"},
+    )
+    expected_inner = [
+        {
+            "start": hour1_start.timestamp(),
+            "end": hour1_end.timestamp(),
+            "change": 2.0 * 1000,
+        },
+        {
+            "start": hour2_start.timestamp(),
+            "end": hour2_end.timestamp(),
+            "change": 1.0 * 1000,
+        },
+        {
+            "start": hour3_start.timestamp(),
+            "end": hour3_end.timestamp(),
+            "change": 2.0 * 1000,
+        },
+        {
+            "start": hour4_start.timestamp(),
+            "end": hour4_end.timestamp(),
+            "change": 3.0 * 1000,
+        },
+    ]
+    expected_stats_wh = {
+        "sensor.total_energy_import1": expected_inner,
+        "sensor.total_energy_import2": expected_inner,
+    }
+    assert stats == expected_stats_wh
+
+    # Get change from far in the past with implicit unit conversion
+    hass.states.async_set(
+        "sensor.total_energy_import1", "unknown", {"unit_of_measurement": "MWh"}
+    )
+    hass.states.async_set(
+        "sensor.total_energy_import2", "unknown", {"unit_of_measurement": "MWh"}
+    )
+    stats = statistics_during_period(
+        hass,
+        start_time=hour1_start,
+        statistic_ids={"sensor.total_energy_import1", "sensor.total_energy_import2"},
+        period="hour",
+        types={"change"},
+    )
+    expected_inner = [
+        {
+            "start": hour1_start.timestamp(),
+            "end": hour1_end.timestamp(),
+            "change": 2.0 / 1000,
+        },
+        {
+            "start": hour2_start.timestamp(),
+            "end": hour2_end.timestamp(),
+            "change": 1.0 / 1000,
+        },
+        {
+            "start": hour3_start.timestamp(),
+            "end": hour3_end.timestamp(),
+            "change": 2.0 / 1000,
+        },
+        {
+            "start": hour4_start.timestamp(),
+            "end": hour4_end.timestamp(),
+            "change": 3.0 / 1000,
+        },
+    ]
+    expected_stats_mwh = {
+        "sensor.total_energy_import1": expected_inner,
+        "sensor.total_energy_import2": expected_inner,
+    }
+    assert stats == expected_stats_mwh
+    hass.states.async_remove("sensor.total_energy_import1")
+    hass.states.async_remove("sensor.total_energy_import2")
+
+    # Get change from the first recorded hour
+    stats = statistics_during_period(
+        hass,
+        start_time=hour1_start,
+        statistic_ids={"sensor.total_energy_import1", "sensor.total_energy_import2"},
+        period="hour",
+        types={"change"},
+    )
+    assert stats == expected_stats
+
+    # Get change from the first recorded hour with unit conversion
+    stats = statistics_during_period(
+        hass,
+        start_time=hour1_start,
+        statistic_ids={"sensor.total_energy_import1", "sensor.total_energy_import2"},
+        period="hour",
+        types={"change"},
+        units={"energy": "Wh"},
+    )
+    assert stats == expected_stats_wh
+
+    # Get change from the first recorded hour with implicit unit conversion
+    hass.states.async_set(
+        "sensor.total_energy_import1", "unknown", {"unit_of_measurement": "MWh"}
+    )
+    hass.states.async_set(
+        "sensor.total_energy_import2", "unknown", {"unit_of_measurement": "MWh"}
+    )
+    stats = statistics_during_period(
+        hass,
+        start_time=hour1_start,
+        statistic_ids={"sensor.total_energy_import1", "sensor.total_energy_import2"},
+        period="hour",
+        types={"change"},
+    )
+    assert stats == expected_stats_mwh
+    hass.states.async_remove("sensor.total_energy_import1")
+    hass.states.async_remove("sensor.total_energy_import2")
+
+    # Get change from the second recorded hour
+    stats = statistics_during_period(
+        hass,
+        start_time=hour2_start,
+        statistic_ids={"sensor.total_energy_import1", "sensor.total_energy_import2"},
+        period="hour",
+        types={"change"},
+    )
+    assert stats == {
+        "sensor.total_energy_import1": expected_stats["sensor.total_energy_import1"][
+            1:4
+        ],
+        "sensor.total_energy_import2": expected_stats["sensor.total_energy_import2"][
+            1:4
+        ],
+    }
+
+    # Get change from the second recorded hour with unit conversion
+    stats = statistics_during_period(
+        hass,
+        start_time=hour2_start,
+        statistic_ids={"sensor.total_energy_import1", "sensor.total_energy_import2"},
+        period="hour",
+        types={"change"},
+        units={"energy": "Wh"},
+    )
+    assert stats == {
+        "sensor.total_energy_import1": expected_stats_wh["sensor.total_energy_import1"][
+            1:4
+        ],
+        "sensor.total_energy_import2": expected_stats_wh["sensor.total_energy_import2"][
+            1:4
+        ],
+    }
+
+    # Get change from the second recorded hour with implicit unit conversion
+    hass.states.async_set(
+        "sensor.total_energy_import1", "unknown", {"unit_of_measurement": "MWh"}
+    )
+    hass.states.async_set(
+        "sensor.total_energy_import2", "unknown", {"unit_of_measurement": "MWh"}
+    )
+    stats = statistics_during_period(
+        hass,
+        start_time=hour2_start,
+        statistic_ids={"sensor.total_energy_import1", "sensor.total_energy_import2"},
+        period="hour",
+        types={"change"},
+    )
+    assert stats == {
+        "sensor.total_energy_import1": expected_stats_mwh[
+            "sensor.total_energy_import1"
+        ][1:4],
+        "sensor.total_energy_import2": expected_stats_mwh[
+            "sensor.total_energy_import2"
+        ][1:4],
+    }
+    hass.states.async_remove("sensor.total_energy_import1")
+    hass.states.async_remove("sensor.total_energy_import2")
+
+    # Get change from the second until the third recorded hour
+    stats = statistics_during_period(
+        hass,
+        start_time=hour2_start,
+        end_time=hour4_start,
+        statistic_ids={"sensor.total_energy_import1", "sensor.total_energy_import2"},
+        period="hour",
+        types={"change"},
+    )
+    assert stats == {
+        "sensor.total_energy_import1": expected_stats["sensor.total_energy_import1"][
+            1:3
+        ],
+        "sensor.total_energy_import2": expected_stats["sensor.total_energy_import2"][
+            1:3
+        ],
+    }
+
+    # Get change from the fourth recorded hour
+    stats = statistics_during_period(
+        hass,
+        start_time=hour4_start,
+        statistic_ids={"sensor.total_energy_import1", "sensor.total_energy_import2"},
+        period="hour",
+        types={"change"},
+    )
+    assert stats == {
+        "sensor.total_energy_import1": expected_stats["sensor.total_energy_import1"][
+            3:4
+        ],
+        "sensor.total_energy_import2": expected_stats["sensor.total_energy_import2"][
+            3:4
+        ],
+    }
+
+    # Test change with a far future start date
+    future = dt_util.as_utc(dt_util.parse_datetime("2221-11-01 00:00:00"))
+    stats = statistics_during_period(
+        hass,
+        start_time=future,
+        statistic_ids={"sensor.total_energy_import1", "sensor.total_energy_import2"},
+        period="hour",
+        types={"change"},
+    )
+    assert stats == {}
+
+
+@pytest.mark.usefixtures("multiple_start_time_chunk_sizes")
 @pytest.mark.parametrize("timezone", ["America/Regina", "Europe/Vienna", "UTC"])
 @pytest.mark.freeze_time("2022-10-01 00:00:00+00:00")
 async def test_change_with_none(
diff --git a/tests/components/recorder/test_statistics_v23_migration.py b/tests/components/recorder/test_statistics_v23_migration.py
index dafa4da81ee..49b8836af70 100644
--- a/tests/components/recorder/test_statistics_v23_migration.py
+++ b/tests/components/recorder/test_statistics_v23_migration.py
@@ -17,7 +17,7 @@ import pytest
 from homeassistant.components import recorder
 from homeassistant.components.recorder import get_instance
 from homeassistant.components.recorder.util import session_scope
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import (
     CREATE_ENGINE_TARGET,
diff --git a/tests/components/recorder/test_util.py b/tests/components/recorder/test_util.py
index c9020762d4b..6c324f4b01a 100644
--- a/tests/components/recorder/test_util.py
+++ b/tests/components/recorder/test_util.py
@@ -417,7 +417,12 @@ def test_supported_mysql(caplog: pytest.LogCaptureFixture, mysql_version) -> Non
 
     dbapi_connection = MagicMock(cursor=_make_cursor_mock)
 
-    util.setup_connection_for_dialect(instance_mock, "mysql", dbapi_connection, True)
+    database_engine = util.setup_connection_for_dialect(
+        instance_mock, "mysql", dbapi_connection, True
+    )
+    assert database_engine is not None
+    assert database_engine.optimizer.slow_range_in_select is False
+    assert database_engine.optimizer.slow_dependent_subquery is True
 
     assert "minimum supported version" not in caplog.text
 
@@ -502,6 +507,7 @@ def test_supported_pgsql(caplog: pytest.LogCaptureFixture, pgsql_version) -> Non
     assert "minimum supported version" not in caplog.text
     assert database_engine is not None
     assert database_engine.optimizer.slow_range_in_select is True
+    assert database_engine.optimizer.slow_dependent_subquery is False
 
 
 @pytest.mark.parametrize(
@@ -583,6 +589,7 @@ def test_supported_sqlite(caplog: pytest.LogCaptureFixture, sqlite_version) -> N
     assert "minimum supported version" not in caplog.text
     assert database_engine is not None
     assert database_engine.optimizer.slow_range_in_select is False
+    assert database_engine.optimizer.slow_dependent_subquery is False
 
 
 @pytest.mark.parametrize(
@@ -675,6 +682,7 @@ async def test_issue_for_mariadb_with_MDEV_25020(
 
     assert database_engine is not None
     assert database_engine.optimizer.slow_range_in_select is True
+    assert database_engine.optimizer.slow_dependent_subquery is False
 
 
 @pytest.mark.parametrize(
@@ -731,6 +739,7 @@ async def test_no_issue_for_mariadb_with_MDEV_25020(
 
     assert database_engine is not None
     assert database_engine.optimizer.slow_range_in_select is False
+    assert database_engine.optimizer.slow_dependent_subquery is False
 
 
 @pytest.mark.skip_on_db_engine(["mysql", "postgresql"])
diff --git a/tests/components/recorder/test_v32_migration.py b/tests/components/recorder/test_v32_migration.py
index 58be23bdc85..c4c1285990d 100644
--- a/tests/components/recorder/test_v32_migration.py
+++ b/tests/components/recorder/test_v32_migration.py
@@ -17,7 +17,7 @@ from homeassistant.components.recorder.queries import select_event_type_ids
 from homeassistant.components.recorder.util import session_scope
 from homeassistant.const import EVENT_STATE_CHANGED
 from homeassistant.core import Event, EventOrigin, State
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import async_wait_recording_done
 from .conftest import instrument_migration
diff --git a/tests/components/recorder/test_websocket_api.py b/tests/components/recorder/test_websocket_api.py
index 94ed8da1b92..a4e4fe45db1 100644
--- a/tests/components/recorder/test_websocket_api.py
+++ b/tests/components/recorder/test_websocket_api.py
@@ -1,11 +1,14 @@
 """The tests for sensor recorder platform."""
 
+from collections.abc import Iterable
 import datetime
 from datetime import timedelta
+import math
 from statistics import fmean
 import sys
 from unittest.mock import ANY, patch
 
+from _pytest.python_api import ApproxBase
 from freezegun import freeze_time
 from freezegun.api import FrozenDateTimeFactory
 import pytest
@@ -13,7 +16,14 @@ import pytest
 from homeassistant.components import recorder
 from homeassistant.components.recorder import Recorder
 from homeassistant.components.recorder.db_schema import Statistics, StatisticsShortTerm
+from homeassistant.components.recorder.models import (
+    StatisticData,
+    StatisticMeanType,
+    StatisticMetaData,
+)
 from homeassistant.components.recorder.statistics import (
+    DEG_TO_RAD,
+    RAD_TO_DEG,
     async_add_external_statistics,
     get_last_statistics,
     get_latest_short_term_statistics_with_session,
@@ -24,14 +34,16 @@ from homeassistant.components.recorder.statistics import (
 from homeassistant.components.recorder.util import session_scope
 from homeassistant.components.recorder.websocket_api import UNIT_SCHEMA
 from homeassistant.components.sensor import UNIT_CONVERTERS
+from homeassistant.const import DEGREE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import recorder as recorder_helper
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.unit_system import METRIC_SYSTEM, US_CUSTOMARY_SYSTEM
 
 from .common import (
     async_recorder_block_till_done,
+    async_wait_recorder,
     async_wait_recording_done,
     create_engine_test,
     do_adhoc_statistics,
@@ -246,12 +258,12 @@ async def test_statistics_during_period(
 
 
 @pytest.mark.freeze_time(datetime.datetime(2022, 10, 21, 7, 25, tzinfo=datetime.UTC))
+@pytest.mark.usefixtures("recorder_mock")
 @pytest.mark.parametrize("offset", [0, 1, 2])
 async def test_statistic_during_period(
-    recorder_mock: Recorder,
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
-    offset,
+    offset: int,
 ) -> None:
     """Test statistic_during_period."""
     now = dt_util.utcnow()
@@ -306,7 +318,7 @@ async def test_statistic_during_period(
         )
 
     imported_metadata = {
-        "has_mean": False,
+        "has_mean": True,
         "has_sum": True,
         "name": "Total imported energy",
         "source": "recorder",
@@ -654,7 +666,7 @@ async def test_statistic_during_period(
             hass,
             session,
             {"sensor.test"},
-            {"last_reset", "max", "mean", "min", "state", "sum"},
+            {"last_reset", "state", "sum"},
         )
     start = imported_stats_5min[-1]["start"].timestamp()
     end = start + (5 * 60)
@@ -671,18 +683,376 @@ async def test_statistic_during_period(
     }
 
 
+def _circular_mean(values: Iterable[StatisticData]) -> dict[str, float]:
+    sin_sum = 0
+    cos_sum = 0
+    for x in values:
+        mean = x.get("mean")
+        assert mean is not None
+        sin_sum += math.sin(mean * DEG_TO_RAD)
+        cos_sum += math.cos(mean * DEG_TO_RAD)
+
+    return {
+        "mean": (RAD_TO_DEG * math.atan2(sin_sum, cos_sum)) % 360,
+        "mean_weight": math.sqrt(sin_sum**2 + cos_sum**2),
+    }
+
+
+def _circular_mean_approx(values: Iterable[StatisticData]) -> ApproxBase:
+    return pytest.approx(_circular_mean(values)["mean"])
+
+
+@pytest.mark.freeze_time(datetime.datetime(2022, 10, 21, 7, 25, tzinfo=datetime.UTC))
+@pytest.mark.usefixtures("recorder_mock")
+@pytest.mark.parametrize("offset", [0, 1, 2])
+async def test_statistic_during_period_circular_mean(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    offset: int,
+) -> None:
+    """Test statistic_during_period."""
+    now = dt_util.utcnow()
+
+    await async_recorder_block_till_done(hass)
+    client = await hass_ws_client()
+
+    zero = now
+    start = zero.replace(minute=offset * 5, second=0, microsecond=0) + timedelta(
+        hours=-3
+    )
+
+    imported_stats_5min: list[StatisticData] = [
+        {
+            "start": (start + timedelta(minutes=5 * i)),
+            "mean": (123.456 * i) % 360,
+            "mean_weight": 1,
+        }
+        for i in range(39)
+    ]
+
+    imported_stats = []
+    slice_end = 12 - offset
+    imported_stats.append(
+        {
+            "start": imported_stats_5min[0]["start"].replace(minute=0),
+            **_circular_mean(imported_stats_5min[0:slice_end]),
+        }
+    )
+    for i in range(2):
+        slice_start = i * 12 + (12 - offset)
+        slice_end = (i + 1) * 12 + (12 - offset)
+        assert imported_stats_5min[slice_start]["start"].minute == 0
+        imported_stats.append(
+            {
+                "start": imported_stats_5min[slice_start]["start"],
+                **_circular_mean(imported_stats_5min[slice_start:slice_end]),
+            }
+        )
+
+    imported_metadata: StatisticMetaData = {
+        "mean_type": StatisticMeanType.CIRCULAR,
+        "has_sum": False,
+        "name": "Wind direction",
+        "source": "recorder",
+        "statistic_id": "sensor.test",
+        "unit_of_measurement": DEGREE,
+    }
+
+    recorder.get_instance(hass).async_import_statistics(
+        imported_metadata,
+        imported_stats,
+        Statistics,
+    )
+    recorder.get_instance(hass).async_import_statistics(
+        imported_metadata,
+        imported_stats_5min,
+        StatisticsShortTerm,
+    )
+    await async_wait_recording_done(hass)
+
+    metadata = get_metadata(hass, statistic_ids={"sensor.test"})
+    metadata_id = metadata["sensor.test"][0]
+    run_cache = get_short_term_statistics_run_cache(hass)
+    # Verify the import of the short term statistics
+    # also updates the run cache
+    assert run_cache.get_latest_ids({metadata_id}) is not None
+
+    # No data for this period yet
+    await client.send_json_auto_id(
+        {
+            "type": "recorder/statistic_during_period",
+            "fixed_period": {
+                "start_time": now.isoformat(),
+                "end_time": now.isoformat(),
+            },
+            "statistic_id": "sensor.test",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {
+        "max": None,
+        "mean": None,
+        "min": None,
+        "change": None,
+    }
+
+    # This should include imported_statistics_5min[:]
+    await client.send_json_auto_id(
+        {
+            "type": "recorder/statistic_during_period",
+            "statistic_id": "sensor.test",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {
+        "mean": _circular_mean_approx(imported_stats_5min),
+        "max": None,
+        "min": None,
+        "change": None,
+    }
+
+    # This should also include imported_statistics_5min[:]
+    start_time = (
+        dt_util.parse_datetime("2022-10-21T04:00:00+00:00")
+        + timedelta(minutes=5 * offset)
+    ).isoformat()
+    end_time = (
+        dt_util.parse_datetime("2022-10-21T07:15:00+00:00")
+        + timedelta(minutes=5 * offset)
+    ).isoformat()
+    await client.send_json_auto_id(
+        {
+            "type": "recorder/statistic_during_period",
+            "statistic_id": "sensor.test",
+            "fixed_period": {
+                "start_time": start_time,
+                "end_time": end_time,
+            },
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {
+        "mean": _circular_mean_approx(imported_stats_5min),
+        "max": None,
+        "min": None,
+        "change": None,
+    }
+
+    # This should also include imported_statistics_5min[:]
+    start_time = (
+        dt_util.parse_datetime("2022-10-21T04:00:00+00:00")
+        + timedelta(minutes=5 * offset)
+    ).isoformat()
+    end_time = (
+        dt_util.parse_datetime("2022-10-21T08:20:00+00:00")
+        + timedelta(minutes=5 * offset)
+    ).isoformat()
+    await client.send_json_auto_id(
+        {
+            "type": "recorder/statistic_during_period",
+            "statistic_id": "sensor.test",
+            "fixed_period": {
+                "start_time": start_time,
+                "end_time": end_time,
+            },
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {
+        "mean": _circular_mean_approx(imported_stats_5min),
+        "max": None,
+        "min": None,
+        "change": None,
+    }
+
+    # This should include imported_statistics_5min[26:]
+    start_time = (
+        dt_util.parse_datetime("2022-10-21T06:10:00+00:00")
+        + timedelta(minutes=5 * offset)
+    ).isoformat()
+    assert imported_stats_5min[26]["start"].isoformat() == start_time
+    await client.send_json_auto_id(
+        {
+            "type": "recorder/statistic_during_period",
+            "fixed_period": {
+                "start_time": start_time,
+            },
+            "statistic_id": "sensor.test",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {
+        "mean": _circular_mean_approx(imported_stats_5min[26:]),
+        "max": None,
+        "min": None,
+        "change": None,
+    }
+
+    # This should also include imported_statistics_5min[26:]
+    start_time = (
+        dt_util.parse_datetime("2022-10-21T06:09:00+00:00")
+        + timedelta(minutes=5 * offset)
+    ).isoformat()
+    await client.send_json_auto_id(
+        {
+            "type": "recorder/statistic_during_period",
+            "fixed_period": {
+                "start_time": start_time,
+            },
+            "statistic_id": "sensor.test",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {
+        "mean": _circular_mean_approx(imported_stats_5min[26:]),
+        "max": None,
+        "min": None,
+        "change": None,
+    }
+
+    # This should include imported_statistics_5min[:26]
+    end_time = (
+        dt_util.parse_datetime("2022-10-21T06:10:00+00:00")
+        + timedelta(minutes=5 * offset)
+    ).isoformat()
+    assert imported_stats_5min[26]["start"].isoformat() == end_time
+    await client.send_json_auto_id(
+        {
+            "type": "recorder/statistic_during_period",
+            "fixed_period": {
+                "end_time": end_time,
+            },
+            "statistic_id": "sensor.test",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {
+        "mean": _circular_mean_approx(imported_stats_5min[:26]),
+        "max": None,
+        "min": None,
+        "change": None,
+    }
+
+    # This should include imported_statistics_5min[26:32] (less than a full hour)
+    start_time = (
+        dt_util.parse_datetime("2022-10-21T06:10:00+00:00")
+        + timedelta(minutes=5 * offset)
+    ).isoformat()
+    assert imported_stats_5min[26]["start"].isoformat() == start_time
+    end_time = (
+        dt_util.parse_datetime("2022-10-21T06:40:00+00:00")
+        + timedelta(minutes=5 * offset)
+    ).isoformat()
+    assert imported_stats_5min[32]["start"].isoformat() == end_time
+    await client.send_json_auto_id(
+        {
+            "type": "recorder/statistic_during_period",
+            "fixed_period": {
+                "start_time": start_time,
+                "end_time": end_time,
+            },
+            "statistic_id": "sensor.test",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {
+        "mean": _circular_mean_approx(imported_stats_5min[26:32]),
+        "max": None,
+        "min": None,
+        "change": None,
+    }
+
+    # This should include imported_statistics[2:] + imported_statistics_5min[36:]
+    start_time = "2022-10-21T06:00:00+00:00"
+    assert imported_stats_5min[24 - offset]["start"].isoformat() == start_time
+    assert imported_stats[2]["start"].isoformat() == start_time
+    await client.send_json_auto_id(
+        {
+            "type": "recorder/statistic_during_period",
+            "fixed_period": {
+                "start_time": start_time,
+            },
+            "statistic_id": "sensor.test",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {
+        "mean": _circular_mean_approx(imported_stats_5min[24 - offset :]),
+        "max": None,
+        "min": None,
+        "change": None,
+    }
+
+    # This should also include imported_statistics[2:] + imported_statistics_5min[36:]
+    await client.send_json_auto_id(
+        {
+            "type": "recorder/statistic_during_period",
+            "rolling_window": {
+                "duration": {"hours": 1, "minutes": 25},
+            },
+            "statistic_id": "sensor.test",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {
+        "mean": _circular_mean_approx(imported_stats_5min[24 - offset :]),
+        "max": None,
+        "min": None,
+        "change": None,
+    }
+
+    # This should include imported_statistics[2:3]
+    await client.send_json_auto_id(
+        {
+            "type": "recorder/statistic_during_period",
+            "rolling_window": {
+                "duration": {"hours": 1},
+                "offset": {"minutes": -25},
+            },
+            "statistic_id": "sensor.test",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    slice_start = 24 - offset
+    slice_end = 36 - offset
+    assert response["result"] == {
+        "mean": _circular_mean_approx(imported_stats_5min[slice_start:slice_end]),
+        "max": None,
+        "min": None,
+        "change": None,
+    }
+
+    # Test we can get only selected types
+    await client.send_json_auto_id(
+        {
+            "type": "recorder/statistic_during_period",
+            "statistic_id": "sensor.test",
+            "types": ["mean"],
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {
+        "mean": _circular_mean_approx(imported_stats_5min),
+    }
+
+
 @pytest.mark.freeze_time(datetime.datetime(2022, 10, 21, 7, 25, tzinfo=datetime.UTC))
 async def test_statistic_during_period_hole(
     recorder_mock: Recorder, hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
     """Test statistic_during_period when there are holes in the data."""
-    stat_id = 1
-
-    def next_id():
-        nonlocal stat_id
-        stat_id += 1
-        return stat_id
-
     now = dt_util.utcnow()
 
     await async_recorder_block_till_done(hass)
@@ -703,7 +1073,7 @@ async def test_statistic_during_period_hole(
     ]
 
     imported_metadata = {
-        "has_mean": False,
+        "has_mean": True,
         "has_sum": True,
         "name": "Total imported energy",
         "source": "recorder",
@@ -829,6 +1199,156 @@ async def test_statistic_during_period_hole(
     }
 
 
+@pytest.mark.freeze_time(datetime.datetime(2022, 10, 21, 7, 25, tzinfo=datetime.UTC))
+@pytest.mark.usefixtures("recorder_mock")
+async def test_statistic_during_period_hole_circular_mean(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test statistic_during_period when there are holes in the data."""
+    now = dt_util.utcnow()
+
+    await async_recorder_block_till_done(hass)
+    client = await hass_ws_client()
+
+    zero = now
+    start = zero.replace(minute=0, second=0, microsecond=0) + timedelta(hours=-18)
+
+    imported_stats: list[StatisticData] = [
+        {
+            "start": (start + timedelta(hours=3 * i)),
+            "mean": (123.456 * i) % 360,
+            "mean_weight": 1,
+        }
+        for i in range(6)
+    ]
+
+    imported_metadata: StatisticMetaData = {
+        "mean_type": StatisticMeanType.CIRCULAR,
+        "has_sum": False,
+        "name": "Wind direction",
+        "source": "recorder",
+        "statistic_id": "sensor.test",
+        "unit_of_measurement": DEGREE,
+    }
+
+    recorder.get_instance(hass).async_import_statistics(
+        imported_metadata,
+        imported_stats,
+        Statistics,
+    )
+    await async_wait_recording_done(hass)
+
+    # This should include imported_stats[:]
+    await client.send_json_auto_id(
+        {
+            "type": "recorder/statistic_during_period",
+            "statistic_id": "sensor.test",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {
+        "mean": _circular_mean_approx(imported_stats[:]),
+        "max": None,
+        "min": None,
+        "change": None,
+    }
+
+    # This should also include imported_stats[:]
+    start_time = "2022-10-20T13:00:00+00:00"
+    end_time = "2022-10-21T05:00:00+00:00"
+    assert imported_stats[0]["start"].isoformat() == start_time
+    assert imported_stats[-1]["start"].isoformat() < end_time
+    await client.send_json_auto_id(
+        {
+            "type": "recorder/statistic_during_period",
+            "statistic_id": "sensor.test",
+            "fixed_period": {
+                "start_time": start_time,
+                "end_time": end_time,
+            },
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {
+        "mean": _circular_mean_approx(imported_stats[:]),
+        "max": None,
+        "min": None,
+        "change": None,
+    }
+
+    # This should also include imported_stats[:]
+    start_time = "2022-10-20T13:00:00+00:00"
+    end_time = "2022-10-21T08:20:00+00:00"
+    await client.send_json_auto_id(
+        {
+            "type": "recorder/statistic_during_period",
+            "statistic_id": "sensor.test",
+            "fixed_period": {
+                "start_time": start_time,
+                "end_time": end_time,
+            },
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {
+        "mean": _circular_mean_approx(imported_stats[:]),
+        "max": None,
+        "min": None,
+        "change": None,
+    }
+
+    # This should include imported_stats[1:4]
+    start_time = "2022-10-20T16:00:00+00:00"
+    end_time = "2022-10-20T23:00:00+00:00"
+    assert imported_stats[1]["start"].isoformat() == start_time
+    assert imported_stats[3]["start"].isoformat() < end_time
+    await client.send_json_auto_id(
+        {
+            "type": "recorder/statistic_during_period",
+            "statistic_id": "sensor.test",
+            "fixed_period": {
+                "start_time": start_time,
+                "end_time": end_time,
+            },
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {
+        "mean": _circular_mean_approx(imported_stats[1:4]),
+        "max": None,
+        "min": None,
+        "change": None,
+    }
+
+    # This should also include imported_stats[1:4]
+    start_time = "2022-10-20T15:00:00+00:00"
+    end_time = "2022-10-21T00:00:00+00:00"
+    assert imported_stats[1]["start"].isoformat() > start_time
+    assert imported_stats[3]["start"].isoformat() < end_time
+    await client.send_json_auto_id(
+        {
+            "type": "recorder/statistic_during_period",
+            "statistic_id": "sensor.test",
+            "fixed_period": {
+                "start_time": start_time,
+                "end_time": end_time,
+            },
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {
+        "mean": _circular_mean_approx(imported_stats[1:4]),
+        "max": None,
+        "min": None,
+        "change": None,
+    }
+
+
 @pytest.mark.parametrize(
     "frozen_time",
     [
@@ -896,7 +1416,7 @@ async def test_statistic_during_period_partial_overlap(
 
     statId = "sensor.test_overlapping"
     imported_metadata = {
-        "has_mean": False,
+        "has_mean": True,
         "has_sum": True,
         "name": "Total imported energy overlapping",
         "source": "recorder",
@@ -1765,6 +2285,7 @@ async def test_list_statistic_ids(
     """Test list_statistic_ids."""
     now = get_start_time(dt_util.utcnow())
     has_mean = attributes["state_class"] == "measurement"
+    mean_type = StatisticMeanType.ARITHMETIC if has_mean else StatisticMeanType.NONE
     has_sum = not has_mean
 
     hass.config.units = units
@@ -1790,6 +2311,7 @@ async def test_list_statistic_ids(
             "statistic_id": "sensor.test",
             "display_unit_of_measurement": display_unit,
             "has_mean": has_mean,
+            "mean_type": mean_type,
             "has_sum": has_sum,
             "name": None,
             "source": "recorder",
@@ -1812,6 +2334,7 @@ async def test_list_statistic_ids(
             "statistic_id": "sensor.test",
             "display_unit_of_measurement": display_unit,
             "has_mean": has_mean,
+            "mean_type": mean_type,
             "has_sum": has_sum,
             "name": None,
             "source": "recorder",
@@ -1837,6 +2360,7 @@ async def test_list_statistic_ids(
                 "statistic_id": "sensor.test",
                 "display_unit_of_measurement": display_unit,
                 "has_mean": has_mean,
+                "mean_type": mean_type,
                 "has_sum": has_sum,
                 "name": None,
                 "source": "recorder",
@@ -1858,6 +2382,7 @@ async def test_list_statistic_ids(
                 "statistic_id": "sensor.test",
                 "display_unit_of_measurement": display_unit,
                 "has_mean": has_mean,
+                "mean_type": mean_type,
                 "has_sum": has_sum,
                 "name": None,
                 "source": "recorder",
@@ -1938,6 +2463,7 @@ async def test_list_statistic_ids_unit_change(
     """Test list_statistic_ids."""
     now = get_start_time(dt_util.utcnow())
     has_mean = attributes["state_class"] == "measurement"
+    mean_type = StatisticMeanType.ARITHMETIC if has_mean else StatisticMeanType.NONE
     has_sum = not has_mean
 
     await async_setup_component(hass, "sensor", {})
@@ -1965,6 +2491,7 @@ async def test_list_statistic_ids_unit_change(
             "statistic_id": "sensor.test",
             "display_unit_of_measurement": statistics_unit,
             "has_mean": has_mean,
+            "mean_type": mean_type,
             "has_sum": has_sum,
             "name": None,
             "source": "recorder",
@@ -1986,6 +2513,7 @@ async def test_list_statistic_ids_unit_change(
             "statistic_id": "sensor.test",
             "display_unit_of_measurement": display_unit,
             "has_mean": has_mean,
+            "mean_type": mean_type,
             "has_sum": has_sum,
             "name": None,
             "source": "recorder",
@@ -2207,6 +2735,7 @@ async def test_update_statistics_metadata(
             "statistic_id": "sensor.test",
             "display_unit_of_measurement": "kW",
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -2234,6 +2763,7 @@ async def test_update_statistics_metadata(
             "statistic_id": "sensor.test",
             "display_unit_of_measurement": new_display_unit,
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -2323,6 +2853,7 @@ async def test_change_statistics_unit(
             "statistic_id": "sensor.test",
             "display_unit_of_measurement": "kW",
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -2374,6 +2905,7 @@ async def test_change_statistics_unit(
             "statistic_id": "sensor.test",
             "display_unit_of_measurement": "kW",
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -2427,6 +2959,7 @@ async def test_change_statistics_unit(
             "statistic_id": "sensor.test",
             "display_unit_of_measurement": "kW",
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -2454,6 +2987,7 @@ async def test_change_statistics_unit_errors(
             "statistic_id": "sensor.test",
             "display_unit_of_measurement": "kW",
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -2561,6 +3095,7 @@ async def test_recorder_info(
     assert response["success"]
     assert response["result"] == {
         "backlog": 0,
+        "db_in_default_location": False,  # We never use the default URL in tests
         "max_backlog": 65000,
         "migration_in_progress": False,
         "migration_is_live": False,
@@ -2569,6 +3104,44 @@ async def test_recorder_info(
     }
 
 
+@pytest.mark.parametrize(
+    ("db_url", "db_in_default_location"),
+    [
+        ("sqlite:///{config_dir}/home-assistant_v2.db", True),
+        ("sqlite:///{config_dir}/custom.db", False),
+        ("mysql://root:root_password@127.0.0.1:3316/homeassistant-test", False),
+    ],
+)
+async def test_recorder_info_default_url(
+    recorder_mock: Recorder,
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    db_url: str,
+    db_in_default_location: bool,
+) -> None:
+    """Test getting recorder status."""
+    client = await hass_ws_client()
+
+    # Ensure there are no queued events
+    await async_wait_recording_done(hass)
+
+    with patch.object(
+        recorder_mock, "db_url", db_url.format(config_dir=hass.config.config_dir)
+    ):
+        await client.send_json_auto_id({"type": "recorder/info"})
+        response = await client.receive_json()
+        assert response["success"]
+        assert response["result"] == {
+            "backlog": 0,
+            "db_in_default_location": db_in_default_location,
+            "max_backlog": 65000,
+            "migration_in_progress": False,
+            "migration_is_live": False,
+            "recording": True,
+            "thread_running": True,
+        }
+
+
 async def test_recorder_info_no_recorder(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -2607,21 +3180,29 @@ async def test_recorder_info_bad_recorder_config(
     assert response["result"]["thread_running"] is False
 
 
-async def test_recorder_info_no_instance(
-    recorder_mock: Recorder, hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+async def test_recorder_info_wait_database_connect(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    async_test_recorder: RecorderInstanceContextManager,
 ) -> None:
-    """Test getting recorder when there is no instance."""
+    """Test getting recorder info waits for recorder database connection."""
     client = await hass_ws_client()
 
-    with patch(
-        "homeassistant.components.recorder.basic_websocket_api.get_instance",
-        return_value=None,
-    ):
-        await client.send_json_auto_id({"type": "recorder/info"})
+    recorder_helper.async_initialize_recorder(hass)
+    await client.send_json_auto_id({"type": "recorder/info"})
+
+    async with async_test_recorder(hass):
         response = await client.receive_json()
         assert response["success"]
-        assert response["result"]["recording"] is False
-        assert response["result"]["thread_running"] is False
+        assert response["result"] == {
+            "backlog": ANY,
+            "db_in_default_location": False,
+            "max_backlog": 65000,
+            "migration_in_progress": False,
+            "migration_is_live": False,
+            "recording": True,
+            "thread_running": True,
+        }
 
 
 async def test_recorder_info_migration_queue_exhausted(
@@ -2650,7 +3231,7 @@ async def test_recorder_info_migration_queue_exhausted(
                 instrument_migration.migration_started.wait
             )
             assert recorder.util.async_migration_in_progress(hass) is True
-            await recorder_helper.async_wait_recorder(hass)
+            await async_wait_recorder(hass)
             hass.states.async_set("my.entity", "on", {})
             await hass.async_block_till_done()
 
@@ -2726,6 +3307,7 @@ async def test_get_statistics_metadata(
     """Test get_statistics_metadata."""
     now = get_start_time(dt_util.utcnow())
     has_mean = attributes["state_class"] == "measurement"
+    mean_type = StatisticMeanType.ARITHMETIC if has_mean else StatisticMeanType.NONE
     has_sum = not has_mean
 
     hass.config.units = units
@@ -2795,6 +3377,7 @@ async def test_get_statistics_metadata(
             "statistic_id": "test:total_gas",
             "display_unit_of_measurement": unit,
             "has_mean": has_mean,
+            "mean_type": mean_type,
             "has_sum": has_sum,
             "name": "Total imported energy",
             "source": "test",
@@ -2826,6 +3409,7 @@ async def test_get_statistics_metadata(
             "statistic_id": "sensor.test",
             "display_unit_of_measurement": attributes["unit_of_measurement"],
             "has_mean": has_mean,
+            "mean_type": mean_type,
             "has_sum": has_sum,
             "name": None,
             "source": "recorder",
@@ -2853,6 +3437,7 @@ async def test_get_statistics_metadata(
             "statistic_id": "sensor.test",
             "display_unit_of_measurement": attributes["unit_of_measurement"],
             "has_mean": has_mean,
+            "mean_type": mean_type,
             "has_sum": has_sum,
             "name": None,
             "source": "recorder",
@@ -2947,6 +3532,7 @@ async def test_import_statistics(
         {
             "display_unit_of_measurement": "kWh",
             "has_mean": False,
+            "mean_type": StatisticMeanType.NONE,
             "has_sum": True,
             "statistic_id": statistic_id,
             "name": "Total imported energy",
@@ -2961,6 +3547,7 @@ async def test_import_statistics(
             1,
             {
                 "has_mean": False,
+                "mean_type": StatisticMeanType.NONE,
                 "has_sum": True,
                 "name": "Total imported energy",
                 "source": source,
@@ -3165,6 +3752,7 @@ async def test_adjust_sum_statistics_energy(
         {
             "display_unit_of_measurement": "kWh",
             "has_mean": False,
+            "mean_type": StatisticMeanType.NONE,
             "has_sum": True,
             "statistic_id": statistic_id,
             "name": "Total imported energy",
@@ -3179,6 +3767,7 @@ async def test_adjust_sum_statistics_energy(
             1,
             {
                 "has_mean": False,
+                "mean_type": StatisticMeanType.NONE,
                 "has_sum": True,
                 "name": "Total imported energy",
                 "source": source,
@@ -3358,6 +3947,7 @@ async def test_adjust_sum_statistics_gas(
         {
             "display_unit_of_measurement": "m³",
             "has_mean": False,
+            "mean_type": StatisticMeanType.NONE,
             "has_sum": True,
             "statistic_id": statistic_id,
             "name": "Total imported energy",
@@ -3372,6 +3962,7 @@ async def test_adjust_sum_statistics_gas(
             1,
             {
                 "has_mean": False,
+                "mean_type": StatisticMeanType.NONE,
                 "has_sum": True,
                 "name": "Total imported energy",
                 "source": source,
@@ -3569,6 +4160,7 @@ async def test_adjust_sum_statistics_errors(
         {
             "display_unit_of_measurement": state_unit,
             "has_mean": False,
+            "mean_type": StatisticMeanType.NONE,
             "has_sum": True,
             "statistic_id": statistic_id,
             "name": "Total imported energy",
@@ -3583,6 +4175,7 @@ async def test_adjust_sum_statistics_errors(
             1,
             {
                 "has_mean": False,
+                "mean_type": StatisticMeanType.NONE,
                 "has_sum": True,
                 "name": "Total imported energy",
                 "source": source,
diff --git a/tests/components/remember_the_milk/conftest.py b/tests/components/remember_the_milk/conftest.py
new file mode 100644
index 00000000000..ac80cf2972b
--- /dev/null
+++ b/tests/components/remember_the_milk/conftest.py
@@ -0,0 +1,48 @@
+"""Provide common pytest fixtures."""
+
+from collections.abc import AsyncGenerator, Generator
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from homeassistant.core import HomeAssistant
+
+from .const import TOKEN
+
+
+@pytest.fixture(name="client")
+def client_fixture() -> Generator[MagicMock]:
+    """Create a mock client."""
+    client = MagicMock()
+    with (
+        patch(
+            "homeassistant.components.remember_the_milk.entity.Rtm"
+        ) as entity_client_class,
+        patch("homeassistant.components.remember_the_milk.Rtm") as client_class,
+    ):
+        entity_client_class.return_value = client
+        client_class.return_value = client
+        client.token = TOKEN
+        client.token_valid.return_value = True
+        timelines = MagicMock()
+        timelines.timeline.value = "1234"
+        client.rtm.timelines.create.return_value = timelines
+        add_response = MagicMock()
+        add_response.list.id = "1"
+        add_response.list.taskseries.id = "2"
+        add_response.list.taskseries.task.id = "3"
+        client.rtm.tasks.add.return_value = add_response
+
+        yield client
+
+
+@pytest.fixture
+async def storage(hass: HomeAssistant, client) -> AsyncGenerator[MagicMock]:
+    """Mock the config storage."""
+    with patch(
+        "homeassistant.components.remember_the_milk.RememberTheMilkConfiguration"
+    ) as storage_class:
+        storage = storage_class.return_value
+        storage.get_token.return_value = TOKEN
+        storage.get_rtm_id.return_value = None
+        yield storage
diff --git a/tests/components/remember_the_milk/const.py b/tests/components/remember_the_milk/const.py
index 8423c7f4651..bed39eec5f8 100644
--- a/tests/components/remember_the_milk/const.py
+++ b/tests/components/remember_the_milk/const.py
@@ -3,12 +3,17 @@
 import json
 
 PROFILE = "myprofile"
+CONFIG = {
+    "name": f"{PROFILE}",
+    "api_key": "test-api-key",
+    "shared_secret": "test-shared-secret",
+}
 TOKEN = "mytoken"
 JSON_STRING = json.dumps(
     {
         "myprofile": {
             "token": "mytoken",
-            "id_map": {"1234": {"list_id": "0", "timeseries_id": "1", "task_id": "2"}},
+            "id_map": {"123": {"list_id": "1", "timeseries_id": "2", "task_id": "3"}},
         }
     }
 )
diff --git a/tests/components/remember_the_milk/test_entity.py b/tests/components/remember_the_milk/test_entity.py
new file mode 100644
index 00000000000..bdd4189e394
--- /dev/null
+++ b/tests/components/remember_the_milk/test_entity.py
@@ -0,0 +1,276 @@
+"""Test the Remember The Milk entity."""
+
+from typing import Any
+from unittest.mock import MagicMock, call
+
+import pytest
+from rtmapi import RtmRequestFailedException
+
+from homeassistant.components.remember_the_milk import DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from .const import CONFIG, PROFILE
+
+
+@pytest.mark.parametrize(
+    ("valid_token", "entity_state"), [(True, "ok"), (False, "API token invalid")]
+)
+async def test_entity_state(
+    hass: HomeAssistant,
+    client: MagicMock,
+    storage: MagicMock,
+    valid_token: bool,
+    entity_state: str,
+) -> None:
+    """Test the entity state."""
+    client.token_valid.return_value = valid_token
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: CONFIG})
+    entity_id = f"{DOMAIN}.{PROFILE}"
+    state = hass.states.get(entity_id)
+
+    assert state
+    assert state.state == entity_state
+
+
+@pytest.mark.parametrize(
+    (
+        "get_rtm_id_return_value",
+        "service",
+        "service_data",
+        "get_rtm_id_call_count",
+        "get_rtm_id_call_args",
+        "timelines_call_count",
+        "api_method",
+        "api_method_call_count",
+        "api_method_call_args",
+        "storage_method",
+        "storage_method_call_count",
+        "storage_method_call_args",
+    ),
+    [
+        (
+            ("1", "2", "3"),
+            f"{PROFILE}_create_task",
+            {"name": "Test 1"},
+            0,
+            None,
+            1,
+            "rtm.tasks.add",
+            1,
+            call(
+                timeline="1234",
+                name="Test 1",
+                parse="1",
+            ),
+            "set_rtm_id",
+            0,
+            None,
+        ),
+        (
+            None,
+            f"{PROFILE}_create_task",
+            {"name": "Test 1", "id": "test_1"},
+            1,
+            call(PROFILE, "test_1"),
+            1,
+            "rtm.tasks.add",
+            1,
+            call(
+                timeline="1234",
+                name="Test 1",
+                parse="1",
+            ),
+            "set_rtm_id",
+            1,
+            call(PROFILE, "test_1", "1", "2", "3"),
+        ),
+        (
+            ("1", "2", "3"),
+            f"{PROFILE}_create_task",
+            {"name": "Test 1", "id": "test_1"},
+            1,
+            call(PROFILE, "test_1"),
+            1,
+            "rtm.tasks.setName",
+            1,
+            call(
+                name="Test 1",
+                list_id="1",
+                taskseries_id="2",
+                task_id="3",
+                timeline="1234",
+            ),
+            "set_rtm_id",
+            0,
+            None,
+        ),
+        (
+            ("1", "2", "3"),
+            f"{PROFILE}_complete_task",
+            {"id": "test_1"},
+            1,
+            call(PROFILE, "test_1"),
+            1,
+            "rtm.tasks.complete",
+            1,
+            call(
+                list_id="1",
+                taskseries_id="2",
+                task_id="3",
+                timeline="1234",
+            ),
+            "delete_rtm_id",
+            1,
+            call(PROFILE, "test_1"),
+        ),
+    ],
+)
+async def test_services(
+    hass: HomeAssistant,
+    client: MagicMock,
+    storage: MagicMock,
+    get_rtm_id_return_value: Any,
+    service: str,
+    service_data: dict[str, Any],
+    get_rtm_id_call_count: int,
+    get_rtm_id_call_args: tuple[tuple, dict] | None,
+    timelines_call_count: int,
+    api_method: str,
+    api_method_call_count: int,
+    api_method_call_args: tuple[tuple, dict],
+    storage_method: str,
+    storage_method_call_count: int,
+    storage_method_call_args: tuple[tuple, dict] | None,
+) -> None:
+    """Test create and complete task service."""
+    storage.get_rtm_id.return_value = get_rtm_id_return_value
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: CONFIG})
+
+    await hass.services.async_call(DOMAIN, service, service_data, blocking=True)
+
+    assert storage.get_rtm_id.call_count == get_rtm_id_call_count
+    assert storage.get_rtm_id.call_args == get_rtm_id_call_args
+    assert client.rtm.timelines.create.call_count == timelines_call_count
+    client_method = client
+    for name in api_method.split("."):
+        client_method = getattr(client_method, name)
+    assert client_method.call_count == api_method_call_count
+    assert client_method.call_args == api_method_call_args
+    storage_method_attribute = getattr(storage, storage_method)
+    assert storage_method_attribute.call_count == storage_method_call_count
+    assert storage_method_attribute.call_args == storage_method_call_args
+
+
+@pytest.mark.parametrize(
+    (
+        "get_rtm_id_return_value",
+        "service",
+        "service_data",
+        "method",
+        "exception",
+        "error_message",
+    ),
+    [
+        (
+            ("1", "2", "3"),
+            f"{PROFILE}_create_task",
+            {"name": "Test 1"},
+            "rtm.timelines.create",
+            RtmRequestFailedException("rtm.timelines.create", "400", "Bad request"),
+            "Request rtm.timelines.create failed. Status: 400, reason: Bad request.",
+        ),
+        (
+            ("1", "2", "3"),
+            f"{PROFILE}_create_task",
+            {"name": "Test 1"},
+            "rtm.tasks.add",
+            RtmRequestFailedException("rtm.tasks.add", "400", "Bad request"),
+            "Request rtm.tasks.add failed. Status: 400, reason: Bad request.",
+        ),
+        (
+            None,
+            f"{PROFILE}_create_task",
+            {"name": "Test 1", "id": "test_1"},
+            "rtm.timelines.create",
+            RtmRequestFailedException("rtm.timelines.create", "400", "Bad request"),
+            "Request rtm.timelines.create failed. Status: 400, reason: Bad request.",
+        ),
+        (
+            None,
+            f"{PROFILE}_create_task",
+            {"name": "Test 1", "id": "test_1"},
+            "rtm.tasks.add",
+            RtmRequestFailedException("rtm.tasks.add", "400", "Bad request"),
+            "Request rtm.tasks.add failed. Status: 400, reason: Bad request.",
+        ),
+        (
+            ("1", "2", "3"),
+            f"{PROFILE}_create_task",
+            {"name": "Test 1", "id": "test_1"},
+            "rtm.timelines.create",
+            RtmRequestFailedException("rtm.timelines.create", "400", "Bad request"),
+            "Request rtm.timelines.create failed. Status: 400, reason: Bad request.",
+        ),
+        (
+            ("1", "2", "3"),
+            f"{PROFILE}_create_task",
+            {"name": "Test 1", "id": "test_1"},
+            "rtm.tasks.setName",
+            RtmRequestFailedException("rtm.tasks.setName", "400", "Bad request"),
+            "Request rtm.tasks.setName failed. Status: 400, reason: Bad request.",
+        ),
+        (
+            None,
+            f"{PROFILE}_complete_task",
+            {"id": "test_1"},
+            "rtm.timelines.create",
+            None,
+            (
+                f"Could not find task with ID test_1 in account {PROFILE}. "
+                "So task could not be closed"
+            ),
+        ),
+        (
+            ("1", "2", "3"),
+            f"{PROFILE}_complete_task",
+            {"id": "test_1"},
+            "rtm.timelines.create",
+            RtmRequestFailedException("rtm.timelines.create", "400", "Bad request"),
+            "Request rtm.timelines.create failed. Status: 400, reason: Bad request.",
+        ),
+        (
+            ("1", "2", "3"),
+            f"{PROFILE}_complete_task",
+            {"id": "test_1"},
+            "rtm.tasks.complete",
+            RtmRequestFailedException("rtm.tasks.complete", "400", "Bad request"),
+            "Request rtm.tasks.complete failed. Status: 400, reason: Bad request.",
+        ),
+    ],
+)
+async def test_services_errors(
+    hass: HomeAssistant,
+    client: MagicMock,
+    storage: MagicMock,
+    caplog: pytest.LogCaptureFixture,
+    get_rtm_id_return_value: Any,
+    service: str,
+    service_data: dict[str, Any],
+    method: str,
+    exception: Exception,
+    error_message: str,
+) -> None:
+    """Test create and complete task service errors."""
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: CONFIG})
+    storage.get_rtm_id.return_value = get_rtm_id_return_value
+
+    client_method = client
+    for name in method.split("."):
+        client_method = getattr(client_method, name)
+
+    client_method.side_effect = exception
+
+    await hass.services.async_call(DOMAIN, service, service_data, blocking=True)
+
+    assert error_message in caplog.text
diff --git a/tests/components/remember_the_milk/test_init.py b/tests/components/remember_the_milk/test_init.py
index c68fe14430a..feed2894d86 100644
--- a/tests/components/remember_the_milk/test_init.py
+++ b/tests/components/remember_the_milk/test_init.py
@@ -1,70 +1,65 @@
-"""Tests for the Remember The Milk component."""
+"""Test the Remember The Milk integration."""
 
-from unittest.mock import Mock, mock_open, patch
+from collections.abc import Generator
+from unittest.mock import MagicMock, patch
 
-import homeassistant.components.remember_the_milk as rtm
+import pytest
+
+from homeassistant.components.remember_the_milk import DOMAIN
 from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
 
-from .const import JSON_STRING, PROFILE, TOKEN
+from .const import CONFIG, PROFILE, TOKEN
 
 
-def test_create_new(hass: HomeAssistant) -> None:
-    """Test creating a new config file."""
-    with (
-        patch("builtins.open", mock_open()),
-        patch("os.path.isfile", Mock(return_value=False)),
-        patch.object(rtm.RememberTheMilkConfiguration, "save_config"),
-    ):
-        config = rtm.RememberTheMilkConfiguration(hass)
-        config.set_token(PROFILE, TOKEN)
-    assert config.get_token(PROFILE) == TOKEN
+@pytest.fixture(autouse=True)
+def configure_id() -> Generator[str]:
+    """Fixture to return a configure_id."""
+    mock_id = "1-1"
+    with patch(
+        "homeassistant.components.configurator.Configurator._generate_unique_id"
+    ) as generate_id:
+        generate_id.return_value = mock_id
+        yield mock_id
 
 
-def test_load_config(hass: HomeAssistant) -> None:
-    """Test loading an existing token from the file."""
-    with (
-        patch("builtins.open", mock_open(read_data=JSON_STRING)),
-        patch("os.path.isfile", Mock(return_value=True)),
-    ):
-        config = rtm.RememberTheMilkConfiguration(hass)
-    assert config.get_token(PROFILE) == TOKEN
+@pytest.mark.parametrize(
+    ("token", "rtm_entity_exists", "configurator_end_state"),
+    [(TOKEN, True, "configured"), (None, False, "configure")],
+)
+async def test_configurator(
+    hass: HomeAssistant,
+    client: MagicMock,
+    storage: MagicMock,
+    configure_id: str,
+    token: str | None,
+    rtm_entity_exists: bool,
+    configurator_end_state: str,
+) -> None:
+    """Test configurator."""
+    storage.get_token.return_value = None
+    client.authenticate_desktop.return_value = ("test-url", "test-frob")
+    client.token = token
+    rtm_entity_id = f"{DOMAIN}.{PROFILE}"
+    configure_entity_id = f"configurator.{DOMAIN}_{PROFILE}"
 
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: CONFIG})
+    await hass.async_block_till_done()
 
-def test_invalid_data(hass: HomeAssistant) -> None:
-    """Test starts with invalid data and should not raise an exception."""
-    with (
-        patch("builtins.open", mock_open(read_data="random characters")),
-        patch("os.path.isfile", Mock(return_value=True)),
-    ):
-        config = rtm.RememberTheMilkConfiguration(hass)
-    assert config is not None
+    assert hass.states.get(rtm_entity_id) is None
+    state = hass.states.get(configure_entity_id)
+    assert state
+    assert state.state == "configure"
 
+    await hass.services.async_call(
+        "configurator",
+        "configure",
+        {"configure_id": configure_id},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
 
-def test_id_map(hass: HomeAssistant) -> None:
-    """Test the hass to rtm task is mapping."""
-    hass_id = "hass-id-1234"
-    list_id = "mylist"
-    timeseries_id = "my_timeseries"
-    rtm_id = "rtm-id-4567"
-    with (
-        patch("builtins.open", mock_open()),
-        patch("os.path.isfile", Mock(return_value=False)),
-        patch.object(rtm.RememberTheMilkConfiguration, "save_config"),
-    ):
-        config = rtm.RememberTheMilkConfiguration(hass)
-
-        assert config.get_rtm_id(PROFILE, hass_id) is None
-        config.set_rtm_id(PROFILE, hass_id, list_id, timeseries_id, rtm_id)
-        assert (list_id, timeseries_id, rtm_id) == config.get_rtm_id(PROFILE, hass_id)
-        config.delete_rtm_id(PROFILE, hass_id)
-        assert config.get_rtm_id(PROFILE, hass_id) is None
-
-
-def test_load_key_map(hass: HomeAssistant) -> None:
-    """Test loading an existing key map from the file."""
-    with (
-        patch("builtins.open", mock_open(read_data=JSON_STRING)),
-        patch("os.path.isfile", Mock(return_value=True)),
-    ):
-        config = rtm.RememberTheMilkConfiguration(hass)
-    assert config.get_rtm_id(PROFILE, "1234") == ("0", "1", "2")
+    assert bool(hass.states.get(rtm_entity_id)) == rtm_entity_exists
+    state = hass.states.get(configure_entity_id)
+    assert state
+    assert state.state == configurator_end_state
diff --git a/tests/components/remember_the_milk/test_storage.py b/tests/components/remember_the_milk/test_storage.py
new file mode 100644
index 00000000000..6ae774a3d0d
--- /dev/null
+++ b/tests/components/remember_the_milk/test_storage.py
@@ -0,0 +1,131 @@
+"""Tests for the Remember The Milk integration."""
+
+import json
+from unittest.mock import mock_open, patch
+
+import pytest
+
+from homeassistant.components import remember_the_milk as rtm
+from homeassistant.core import HomeAssistant
+
+from .const import JSON_STRING, PROFILE, TOKEN
+
+
+def test_set_get_delete_token(hass: HomeAssistant) -> None:
+    """Test set, get and delete token."""
+    open_mock = mock_open()
+    with patch(
+        "homeassistant.components.remember_the_milk.storage.Path.open", open_mock
+    ):
+        config = rtm.RememberTheMilkConfiguration(hass)
+        assert open_mock.return_value.write.call_count == 0
+        assert config.get_token(PROFILE) is None
+        assert open_mock.return_value.write.call_count == 0
+        config.set_token(PROFILE, TOKEN)
+        assert open_mock.return_value.write.call_count == 1
+        assert open_mock.return_value.write.call_args[0][0] == json.dumps(
+            {
+                "myprofile": {
+                    "id_map": {},
+                    "token": "mytoken",
+                }
+            }
+        )
+        assert config.get_token(PROFILE) == TOKEN
+        assert open_mock.return_value.write.call_count == 1
+        config.delete_token(PROFILE)
+        assert open_mock.return_value.write.call_count == 2
+        assert open_mock.return_value.write.call_args[0][0] == json.dumps({})
+        assert config.get_token(PROFILE) is None
+        assert open_mock.return_value.write.call_count == 2
+
+
+def test_config_load(hass: HomeAssistant) -> None:
+    """Test loading from the file."""
+    with (
+        patch(
+            "homeassistant.components.remember_the_milk.storage.Path.open",
+            mock_open(read_data=JSON_STRING),
+        ),
+    ):
+        config = rtm.RememberTheMilkConfiguration(hass)
+
+    rtm_id = config.get_rtm_id(PROFILE, "123")
+    assert rtm_id is not None
+    assert rtm_id == ("1", "2", "3")
+
+
+@pytest.mark.parametrize(
+    "side_effect", [FileNotFoundError("Missing file"), OSError("IO error")]
+)
+def test_config_load_file_error(hass: HomeAssistant, side_effect: Exception) -> None:
+    """Test loading with file error."""
+    config = rtm.RememberTheMilkConfiguration(hass)
+    with (
+        patch(
+            "homeassistant.components.remember_the_milk.storage.Path.open",
+            side_effect=side_effect,
+        ),
+    ):
+        config = rtm.RememberTheMilkConfiguration(hass)
+
+    # The config should be empty and we should not have any errors
+    # when trying to access it.
+    rtm_id = config.get_rtm_id(PROFILE, "123")
+    assert rtm_id is None
+
+
+def test_config_load_invalid_data(hass: HomeAssistant) -> None:
+    """Test loading invalid data."""
+    config = rtm.RememberTheMilkConfiguration(hass)
+    with (
+        patch(
+            "homeassistant.components.remember_the_milk.storage.Path.open",
+            mock_open(read_data="random characters"),
+        ),
+    ):
+        config = rtm.RememberTheMilkConfiguration(hass)
+
+    # The config should be empty and we should not have any errors
+    # when trying to access it.
+    rtm_id = config.get_rtm_id(PROFILE, "123")
+    assert rtm_id is None
+
+
+def test_config_set_delete_id(hass: HomeAssistant) -> None:
+    """Test setting and deleting an id from the config."""
+    hass_id = "123"
+    list_id = "1"
+    timeseries_id = "2"
+    rtm_id = "3"
+    open_mock = mock_open()
+    config = rtm.RememberTheMilkConfiguration(hass)
+    with patch(
+        "homeassistant.components.remember_the_milk.storage.Path.open", open_mock
+    ):
+        config = rtm.RememberTheMilkConfiguration(hass)
+        assert open_mock.return_value.write.call_count == 0
+        assert config.get_rtm_id(PROFILE, hass_id) is None
+        assert open_mock.return_value.write.call_count == 0
+        config.set_rtm_id(PROFILE, hass_id, list_id, timeseries_id, rtm_id)
+        assert (list_id, timeseries_id, rtm_id) == config.get_rtm_id(PROFILE, hass_id)
+        assert open_mock.return_value.write.call_count == 1
+        assert open_mock.return_value.write.call_args[0][0] == json.dumps(
+            {
+                "myprofile": {
+                    "id_map": {
+                        "123": {"list_id": "1", "timeseries_id": "2", "task_id": "3"}
+                    }
+                }
+            }
+        )
+        config.delete_rtm_id(PROFILE, hass_id)
+        assert config.get_rtm_id(PROFILE, hass_id) is None
+        assert open_mock.return_value.write.call_count == 2
+        assert open_mock.return_value.write.call_args[0][0] == json.dumps(
+            {
+                "myprofile": {
+                    "id_map": {},
+                }
+            }
+        )
diff --git a/tests/components/remote/test_device_condition.py b/tests/components/remote/test_device_condition.py
index 6c9334aeac4..b4dd513c317 100644
--- a/tests/components/remote/test_device_condition.py
+++ b/tests/components/remote/test_device_condition.py
@@ -14,7 +14,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/remote/test_device_trigger.py b/tests/components/remote/test_device_trigger.py
index c647faba2c1..800d090fd7b 100644
--- a/tests/components/remote/test_device_trigger.py
+++ b/tests/components/remote/test_device_trigger.py
@@ -13,7 +13,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/remote_calendar/__init__.py b/tests/components/remote_calendar/__init__.py
new file mode 100644
index 00000000000..2ffb157f072
--- /dev/null
+++ b/tests/components/remote_calendar/__init__.py
@@ -0,0 +1,11 @@
+"""Tests for the Remote Calendar integration."""
+
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+async def setup_integration(hass: HomeAssistant, config_entry: MockConfigEntry) -> None:
+    """Fixture for setting up the component."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
diff --git a/tests/components/remote_calendar/conftest.py b/tests/components/remote_calendar/conftest.py
new file mode 100644
index 00000000000..bf5184bbf54
--- /dev/null
+++ b/tests/components/remote_calendar/conftest.py
@@ -0,0 +1,89 @@
+"""Fixtures for Remote Calendar."""
+
+from collections.abc import Awaitable, Callable
+from http import HTTPStatus
+import textwrap
+from typing import Any
+import urllib
+
+import pytest
+
+from homeassistant.components.remote_calendar.const import CONF_CALENDAR_NAME, DOMAIN
+from homeassistant.const import CONF_URL
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+from tests.typing import ClientSessionGenerator
+
+CALENDAR_NAME = "Home Assistant Events"
+TEST_ENTITY = "calendar.home_assistant_events"
+CALENDER_URL = "https://some.calendar.com/calendar.ics"
+FRIENDLY_NAME = "Home Assistant Events"
+
+
+@pytest.fixture(name="time_zone")
+def mock_time_zone() -> str:
+    """Fixture for time zone to use in tests."""
+    # Set our timezone to CST/Regina so we can check calculations
+    # This keeps UTC-6 all year round
+    return "America/Regina"
+
+
+@pytest.fixture(autouse=True)
+async def set_time_zone(hass: HomeAssistant, time_zone: str):
+    """Set the time zone for the tests."""
+    # Set our timezone to CST/Regina so we can check calculations
+    # This keeps UTC-6 all year round
+    await hass.config.async_set_time_zone(time_zone)
+
+
+@pytest.fixture(name="config_entry")
+def mock_config_entry() -> MockConfigEntry:
+    """Fixture for mock configuration entry."""
+    return MockConfigEntry(
+        domain=DOMAIN, data={CONF_CALENDAR_NAME: CALENDAR_NAME, CONF_URL: CALENDER_URL}
+    )
+
+
+type GetEventsFn = Callable[[str, str], Awaitable[list[dict[str, Any]]]]
+
+
+@pytest.fixture(name="get_events")
+def get_events_fixture(hass_client: ClientSessionGenerator) -> GetEventsFn:
+    """Fetch calendar events from the HTTP API."""
+
+    async def _fetch(start: str, end: str) -> list[dict[str, Any]]:
+        client = await hass_client()
+        response = await client.get(
+            f"/api/calendars/{TEST_ENTITY}?start={urllib.parse.quote(start)}&end={urllib.parse.quote(end)}"
+        )
+        assert response.status == HTTPStatus.OK
+        return await response.json()
+
+    return _fetch
+
+
+def event_fields(data: dict[str, str]) -> dict[str, str]:
+    """Filter event API response to minimum fields."""
+    return {
+        k: data[k]
+        for k in ("summary", "start", "end", "recurrence_id", "location")
+        if data.get(k)
+    }
+
+
+@pytest.fixture(name="ics_content")
+def mock_ics_content(request: pytest.FixtureRequest) -> str:
+    """Fixture to allow tests to set initial ics content for the calendar store."""
+    default_content = textwrap.dedent(
+        """\
+        BEGIN:VCALENDAR
+        BEGIN:VEVENT
+        SUMMARY:Bastille Day Party
+        DTSTART:19970714T170000Z
+        DTEND:19970715T040000Z
+        END:VEVENT
+        END:VCALENDAR
+        """
+    )
+    return request.param if hasattr(request, "param") else default_content
diff --git a/tests/components/remote_calendar/snapshots/test_diagnostics.ambr b/tests/components/remote_calendar/snapshots/test_diagnostics.ambr
new file mode 100644
index 00000000000..de955f8a2aa
--- /dev/null
+++ b/tests/components/remote_calendar/snapshots/test_diagnostics.ambr
@@ -0,0 +1,17 @@
+# serializer version: 1
+# name: test_entry_diagnostics
+  dict({
+    'ics': '''
+      BEGIN:VCALENDAR
+      BEGIN:VEVENT
+      SUMMARY:***
+      DTSTART:19970714T170000Z
+      DTEND:19970715T040000Z
+      END:VEVENT
+      END:VCALENDAR
+    ''',
+    'now': '2023-06-04T18:00:00-06:00',
+    'system_timezone': 'tzlocal()',
+    'timezone': 'America/Regina',
+  })
+# ---
diff --git a/tests/components/remote_calendar/test_calendar.py b/tests/components/remote_calendar/test_calendar.py
new file mode 100644
index 00000000000..6ae817321c3
--- /dev/null
+++ b/tests/components/remote_calendar/test_calendar.py
@@ -0,0 +1,394 @@
+"""Tests for calendar platform of Remote Calendar."""
+
+from datetime import datetime
+import textwrap
+
+from httpx import Response
+import pytest
+import respx
+
+from homeassistant.const import STATE_OFF, STATE_ON
+from homeassistant.core import HomeAssistant
+
+from . import setup_integration
+from .conftest import (
+    CALENDER_URL,
+    FRIENDLY_NAME,
+    TEST_ENTITY,
+    GetEventsFn,
+    event_fields,
+)
+
+from tests.common import MockConfigEntry
+
+
+@respx.mock
+async def test_empty_calendar(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    get_events: GetEventsFn,
+) -> None:
+    """Test querying the API and fetching events."""
+    respx.get(CALENDER_URL).mock(
+        return_value=Response(
+            status_code=200,
+            text=textwrap.dedent(
+                """BEGIN:VCALENDAR
+                VERSION:2.0
+                PRODID:-//hacksw/handcal//NONSGML v1.0//EN
+                END:VCALENDAR
+            """
+            ),
+        )
+    )
+    await setup_integration(hass, config_entry)
+    events = await get_events("1997-07-14T00:00:00", "1997-07-16T00:00:00")
+    assert len(events) == 0
+
+    state = hass.states.get(TEST_ENTITY)
+    assert state
+    assert state.name == FRIENDLY_NAME
+    assert state.state == STATE_OFF
+    assert dict(state.attributes) == {
+        "friendly_name": FRIENDLY_NAME,
+    }
+
+
+@pytest.mark.parametrize(
+    "ics_content",
+    [
+        textwrap.dedent(
+            """\
+            BEGIN:VCALENDAR
+            VERSION:2.0
+            BEGIN:VEVENT
+            SUMMARY:Bastille Day Party
+            DTSTART;TZID=Europe/Berlin:19970714T190000
+            DTEND;TZID=Europe/Berlin:19970715T060000
+            END:VEVENT
+            END:VCALENDAR
+            """
+        ),
+        textwrap.dedent(
+            """\
+            BEGIN:VCALENDAR
+            BEGIN:VEVENT
+            SUMMARY:Bastille Day Party
+            DTSTART:19970714T170000Z
+            DTEND:19970715T040000Z
+            END:VEVENT
+            END:VCALENDAR
+            """
+        ),
+        textwrap.dedent(
+            """\
+            BEGIN:VCALENDAR
+            VERSION:2.0
+            BEGIN:VEVENT
+            SUMMARY:Bastille Day Party
+            DTSTART;TZID=America/Regina:19970714T110000
+            DTEND;TZID=America/Regina:19970714T220000
+            END:VEVENT
+            END:VCALENDAR
+            """
+        ),
+        textwrap.dedent(
+            """\
+            BEGIN:VCALENDAR
+            VERSION:2.0
+            BEGIN:VEVENT
+            SUMMARY:Bastille Day Party
+            DTSTART;TZID=America/Los_Angeles:19970714T100000
+            DTEND;TZID=America/Los_Angeles:19970714T210000
+            END:VEVENT
+            END:VCALENDAR
+            """
+        ),
+    ],
+)
+@respx.mock
+async def test_api_date_time_event(
+    get_events: GetEventsFn,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    ics_content: str,
+) -> None:
+    """Test an event with a start/end date time."""
+    respx.get(CALENDER_URL).mock(
+        return_value=Response(
+            status_code=200,
+            text=ics_content,
+        )
+    )
+    await setup_integration(hass, config_entry)
+    events = await get_events("1997-07-14T00:00:00Z", "1997-07-16T00:00:00Z")
+    assert list(map(event_fields, events)) == [
+        {
+            "summary": "Bastille Day Party",
+            "start": {"dateTime": "1997-07-14T11:00:00-06:00"},
+            "end": {"dateTime": "1997-07-14T22:00:00-06:00"},
+        }
+    ]
+
+    # Query events in UTC
+
+    # Time range before event
+    events = await get_events("1997-07-13T00:00:00Z", "1997-07-14T16:00:00Z")
+    assert len(events) == 0
+    # Time range after event
+    events = await get_events("1997-07-15T05:00:00Z", "1997-07-15T06:00:00Z")
+    assert len(events) == 0
+
+    # Overlap with event start
+    events = await get_events("1997-07-13T00:00:00Z", "1997-07-14T18:00:00Z")
+    assert len(events) == 1
+    # Overlap with event end
+    events = await get_events("1997-07-15T03:00:00Z", "1997-07-15T06:00:00Z")
+    assert len(events) == 1
+
+    # Query events overlapping with start and end but in another timezone
+    events = await get_events("1997-07-12T23:00:00-01:00", "1997-07-14T17:00:00-01:00")
+    assert len(events) == 1
+    events = await get_events("1997-07-15T02:00:00-01:00", "1997-07-15T05:00:00-01:00")
+    assert len(events) == 1
+
+
+@respx.mock
+async def test_api_date_event(
+    get_events: GetEventsFn,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test an event with a start/end date all day event."""
+    respx.get(CALENDER_URL).mock(
+        return_value=Response(
+            status_code=200,
+            text=textwrap.dedent(
+                """\
+            BEGIN:VCALENDAR
+            VERSION:2.0
+            BEGIN:VEVENT
+            SUMMARY:Festival International de Jazz de Montreal
+            DTSTART:20070628
+            DTEND:20070709
+            END:VEVENT
+            END:VCALENDAR
+            """
+            ),
+        )
+    )
+    await setup_integration(hass, config_entry)
+    events = await get_events("2007-06-20T00:00:00", "2007-07-20T00:00:00")
+    assert list(map(event_fields, events)) == [
+        {
+            "summary": "Festival International de Jazz de Montreal",
+            "start": {"date": "2007-06-28"},
+            "end": {"date": "2007-07-09"},
+        }
+    ]
+
+    # Time range before event (timezone is -6)
+    events = await get_events("2007-06-26T00:00:00Z", "2007-06-28T01:00:00Z")
+    assert len(events) == 0
+    # Time range after event
+    events = await get_events("2007-07-10T00:00:00Z", "2007-07-11T00:00:00Z")
+    assert len(events) == 0
+
+    # Overlap with event start (timezone is -6)
+    events = await get_events("2007-06-26T00:00:00Z", "2007-06-28T08:00:00Z")
+    assert len(events) == 1
+    # Overlap with event end
+    events = await get_events("2007-07-09T00:00:00Z", "2007-07-11T00:00:00Z")
+    assert len(events) == 1
+
+
+@pytest.mark.freeze_time(datetime(2007, 6, 28, 12))
+@respx.mock
+async def test_active_event(
+    get_events: GetEventsFn,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test an event with a start/end date time."""
+    respx.get(CALENDER_URL).mock(
+        return_value=Response(
+            status_code=200,
+            text=textwrap.dedent(
+                """\
+            BEGIN:VCALENDAR
+            VERSION:2.0
+            BEGIN:VEVENT
+            SUMMARY:Festival International de Jazz de Montreal
+            LOCATION:Montreal
+            DTSTART:20070628
+            DTEND:20070709
+            END:VEVENT
+            END:VCALENDAR
+            """
+            ),
+        )
+    )
+    await setup_integration(hass, config_entry)
+    state = hass.states.get(TEST_ENTITY)
+    assert state
+    assert state.name == FRIENDLY_NAME
+    assert state.state == STATE_ON
+    assert dict(state.attributes) == {
+        "friendly_name": FRIENDLY_NAME,
+        "message": "Festival International de Jazz de Montreal",
+        "all_day": True,
+        "description": "",
+        "location": "Montreal",
+        "start_time": "2007-06-28 00:00:00",
+        "end_time": "2007-07-09 00:00:00",
+    }
+
+
+@pytest.mark.freeze_time(datetime(2007, 6, 27, 12))
+@respx.mock
+async def test_upcoming_event(
+    get_events: GetEventsFn,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test an event with a start/end date time."""
+    respx.get(CALENDER_URL).mock(
+        return_value=Response(
+            status_code=200,
+            text=textwrap.dedent(
+                """\
+            BEGIN:VCALENDAR
+            VERSION:2.0
+            BEGIN:VEVENT
+            SUMMARY:Festival International de Jazz de Montreal
+            LOCATION:Montreal
+            DTSTART:20070628
+            DTEND:20070709
+            END:VEVENT
+            END:VCALENDAR
+            """
+            ),
+        )
+    )
+    await setup_integration(hass, config_entry)
+    state = hass.states.get(TEST_ENTITY)
+    assert state
+    assert state.name == FRIENDLY_NAME
+    assert state.state == STATE_OFF
+    assert dict(state.attributes) == {
+        "friendly_name": FRIENDLY_NAME,
+        "message": "Festival International de Jazz de Montreal",
+        "all_day": True,
+        "description": "",
+        "location": "Montreal",
+        "start_time": "2007-06-28 00:00:00",
+        "end_time": "2007-07-09 00:00:00",
+    }
+
+
+@respx.mock
+async def test_recurring_event(
+    get_events: GetEventsFn,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test an event with a recurrence rule."""
+    respx.get(CALENDER_URL).mock(
+        return_value=Response(
+            status_code=200,
+            text=textwrap.dedent(
+                """\
+            BEGIN:VCALENDAR
+            BEGIN:VEVENT
+            DTSTART:20220829T090000
+            DTEND:20220829T100000
+            SUMMARY:Monday meeting
+            RRULE:FREQ=WEEKLY;BYDAY=MO
+            END:VEVENT
+            END:VCALENDAR
+            """
+            ),
+        )
+    )
+    await setup_integration(hass, config_entry)
+
+    events = await get_events("2022-08-20T00:00:00", "2022-09-20T00:00:00")
+    assert list(map(event_fields, events)) == [
+        {
+            "summary": "Monday meeting",
+            "start": {"dateTime": "2022-08-29T09:00:00-06:00"},
+            "end": {"dateTime": "2022-08-29T10:00:00-06:00"},
+            "recurrence_id": "20220829T090000",
+        },
+        {
+            "summary": "Monday meeting",
+            "start": {"dateTime": "2022-09-05T09:00:00-06:00"},
+            "end": {"dateTime": "2022-09-05T10:00:00-06:00"},
+            "recurrence_id": "20220905T090000",
+        },
+        {
+            "summary": "Monday meeting",
+            "start": {"dateTime": "2022-09-12T09:00:00-06:00"},
+            "end": {"dateTime": "2022-09-12T10:00:00-06:00"},
+            "recurrence_id": "20220912T090000",
+        },
+        {
+            "summary": "Monday meeting",
+            "start": {"dateTime": "2022-09-19T09:00:00-06:00"},
+            "end": {"dateTime": "2022-09-19T10:00:00-06:00"},
+            "recurrence_id": "20220919T090000",
+        },
+    ]
+
+
+@respx.mock
+@pytest.mark.parametrize(
+    ("time_zone", "event_order"),
+    [
+        ("America/Los_Angeles", ["One", "Two", "All Day Event"]),
+        ("America/Regina", ["One", "Two", "All Day Event"]),
+        ("UTC", ["One", "All Day Event", "Two"]),
+        ("Asia/Tokyo", ["All Day Event", "One", "Two"]),
+    ],
+)
+async def test_all_day_iter_order(
+    get_events: GetEventsFn,
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    event_order: list[str],
+) -> None:
+    """Test the sort order of an all day events depending on the time zone."""
+    respx.get(CALENDER_URL).mock(
+        return_value=Response(
+            status_code=200,
+            text=textwrap.dedent(
+                """\
+            BEGIN:VCALENDAR
+
+            BEGIN:VEVENT
+            DTSTART:20221008
+            DTEND:20221009
+            SUMMARY:All Day Event
+            END:VEVENT
+
+            BEGIN:VEVENT
+            DTSTART:20221007T230000Z
+            DTEND:20221008T233000Z
+            SUMMARY:One
+            END:VEVENT
+
+            BEGIN:VEVENT
+            DTSTART:20221008T010000Z
+            DTEND:20221008T020000Z
+            SUMMARY:Two
+            END:VEVENT
+
+            END:VCALENDAR
+            """
+            ),
+        )
+    )
+    await setup_integration(hass, config_entry)
+
+    events = await get_events("2022-10-06T00:00:00Z", "2022-10-09T00:00:00Z")
+    assert [event["summary"] for event in events] == event_order
diff --git a/tests/components/remote_calendar/test_config_flow.py b/tests/components/remote_calendar/test_config_flow.py
new file mode 100644
index 00000000000..9eb9cb40134
--- /dev/null
+++ b/tests/components/remote_calendar/test_config_flow.py
@@ -0,0 +1,305 @@
+"""Test the Remote Calendar config flow."""
+
+from httpx import ConnectError, Response, UnsupportedProtocol
+import pytest
+import respx
+
+from homeassistant.components.remote_calendar.const import CONF_CALENDAR_NAME, DOMAIN
+from homeassistant.config_entries import SOURCE_USER
+from homeassistant.const import CONF_URL
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from . import setup_integration
+from .conftest import CALENDAR_NAME, CALENDER_URL
+
+from tests.common import MockConfigEntry
+
+
+@respx.mock
+async def test_form_import_ics(hass: HomeAssistant, ics_content: str) -> None:
+    """Test we get the import form."""
+    respx.get(CALENDER_URL).mock(
+        return_value=Response(
+            status_code=200,
+            text=ics_content,
+        )
+    )
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={
+            CONF_CALENDAR_NAME: CALENDAR_NAME,
+            CONF_URL: CALENDER_URL,
+        },
+    )
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == CALENDAR_NAME
+    assert result2["data"] == {
+        CONF_CALENDAR_NAME: CALENDAR_NAME,
+        CONF_URL: CALENDER_URL,
+    }
+
+
+@respx.mock
+async def test_form_import_webcal(hass: HomeAssistant, ics_content: str) -> None:
+    """Test we get the import form."""
+    respx.get(CALENDER_URL).mock(
+        return_value=Response(
+            status_code=200,
+            text=ics_content,
+        )
+    )
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={
+            CONF_CALENDAR_NAME: CALENDAR_NAME,
+            CONF_URL: "webcal://some.calendar.com/calendar.ics",
+        },
+    )
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == CALENDAR_NAME
+    assert result2["data"] == {
+        CONF_CALENDAR_NAME: CALENDAR_NAME,
+        CONF_URL: CALENDER_URL,
+    }
+
+
+@pytest.mark.parametrize(
+    ("side_effect"),
+    [
+        ConnectError("Connection failed"),
+        UnsupportedProtocol("Unsupported protocol"),
+    ],
+)
+@respx.mock
+async def test_form_inavild_url(
+    hass: HomeAssistant,
+    side_effect: Exception,
+    ics_content: str,
+) -> None:
+    """Test we get the import form."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    respx.get("invalid-url.com").mock(side_effect=side_effect)
+
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_CALENDAR_NAME: CALENDAR_NAME,
+            CONF_URL: "invalid-url.com",
+        },
+    )
+    assert result2["type"] is FlowResultType.FORM
+    assert result2["errors"] == {"base": "cannot_connect"}
+    respx.get(CALENDER_URL).mock(
+        return_value=Response(
+            status_code=200,
+            text=ics_content,
+        )
+    )
+    result3 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_CALENDAR_NAME: CALENDAR_NAME,
+            CONF_URL: CALENDER_URL,
+        },
+    )
+    assert result3["type"] is FlowResultType.CREATE_ENTRY
+    assert result3["title"] == CALENDAR_NAME
+    assert result3["data"] == {
+        CONF_CALENDAR_NAME: CALENDAR_NAME,
+        CONF_URL: CALENDER_URL,
+    }
+
+
+@pytest.mark.parametrize(
+    ("url", "log_message"),
+    [
+        (
+            "unsupported://protocol.com",  # Test for httpx.UnsupportedProtocol
+            "Request URL has an unsupported protocol 'unsupported://'",
+        ),
+        (
+            "invalid-url",  # Test for httpx.ProtocolError
+            "Request URL is missing an 'http://' or 'https://' protocol",
+        ),
+        (
+            "https://example.com:abc/",  # Test for httpx.InvalidURL
+            "Invalid port: 'abc'",
+        ),
+    ],
+)
+async def test_unsupported_inputs(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture, url: str, log_message: str
+) -> None:
+    """Test that an unsupported inputs results in a form error."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_CALENDAR_NAME: CALENDAR_NAME,
+            CONF_URL: url,
+        },
+    )
+
+    assert result2["type"] is FlowResultType.FORM
+    assert result2["errors"] == {"base": "cannot_connect"}
+    assert log_message in caplog.text
+    ## It's not possible to test a successful config flow because, we need to mock httpx.get here
+    ## and then the exception isn't raised anymore.
+
+
+@respx.mock
+async def test_form_http_status_error(hass: HomeAssistant, ics_content: str) -> None:
+    """Test we http status."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    respx.get(CALENDER_URL).mock(
+        return_value=Response(
+            status_code=403,
+        )
+    )
+
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_CALENDAR_NAME: CALENDAR_NAME,
+            CONF_URL: CALENDER_URL,
+        },
+    )
+    assert result2["type"] is FlowResultType.FORM
+    assert result2["errors"] == {"base": "cannot_connect"}
+    respx.get(CALENDER_URL).mock(
+        return_value=Response(
+            status_code=200,
+            text=ics_content,
+        )
+    )
+    result3 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_CALENDAR_NAME: CALENDAR_NAME,
+            CONF_URL: CALENDER_URL,
+        },
+    )
+    assert result3["type"] is FlowResultType.CREATE_ENTRY
+    assert result3["title"] == CALENDAR_NAME
+    assert result3["data"] == {
+        CONF_CALENDAR_NAME: CALENDAR_NAME,
+        CONF_URL: CALENDER_URL,
+    }
+
+
+@respx.mock
+async def test_no_valid_calendar(hass: HomeAssistant, ics_content: str) -> None:
+    """Test invalid ics content."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    respx.get(CALENDER_URL).mock(
+        return_value=Response(
+            status_code=200,
+            text="blabla",
+        )
+    )
+
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={
+            CONF_CALENDAR_NAME: CALENDAR_NAME,
+            CONF_URL: CALENDER_URL,
+        },
+    )
+
+    assert result2["type"] is FlowResultType.FORM
+    assert result2["errors"] == {"base": "invalid_ics_file"}
+    respx.get(CALENDER_URL).mock(
+        return_value=Response(
+            status_code=200,
+            text=ics_content,
+        )
+    )
+    result3 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_CALENDAR_NAME: CALENDAR_NAME,
+            CONF_URL: CALENDER_URL,
+        },
+    )
+    assert result3["type"] is FlowResultType.CREATE_ENTRY
+    assert result3["title"] == CALENDAR_NAME
+    assert result3["data"] == {
+        CONF_CALENDAR_NAME: CALENDAR_NAME,
+        CONF_URL: CALENDER_URL,
+    }
+
+
+async def test_duplicate_name(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test two calendars cannot be added with the same name."""
+
+    await setup_integration(hass, config_entry)
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert not result.get("errors")
+
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_CALENDAR_NAME: CALENDAR_NAME,
+            CONF_URL: "http://other-calendar.com",
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert result2["type"] is FlowResultType.ABORT
+    assert result2["reason"] == "already_configured"
+
+
+async def test_duplicate_url(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test two calendars cannot be added with the same url."""
+
+    await setup_integration(hass, config_entry)
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert not result.get("errors")
+
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_CALENDAR_NAME: "new name",
+            CONF_URL: CALENDER_URL,
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert result2["type"] is FlowResultType.ABORT
+    assert result2["reason"] == "already_configured"
diff --git a/tests/components/remote_calendar/test_diagnostics.py b/tests/components/remote_calendar/test_diagnostics.py
new file mode 100644
index 00000000000..428369b1180
--- /dev/null
+++ b/tests/components/remote_calendar/test_diagnostics.py
@@ -0,0 +1,39 @@
+"""Test the remote calendar diagnostics."""
+
+import datetime
+
+from httpx import Response
+import pytest
+import respx
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.core import HomeAssistant
+
+from . import setup_integration
+from .conftest import CALENDER_URL
+
+from tests.common import MockConfigEntry
+from tests.components.diagnostics import get_diagnostics_for_config_entry
+from tests.typing import ClientSessionGenerator
+
+
+@respx.mock
+@pytest.mark.freeze_time(datetime.datetime(2023, 6, 5))
+async def test_entry_diagnostics(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    snapshot: SnapshotAssertion,
+    config_entry: MockConfigEntry,
+    ics_content: str,
+) -> None:
+    """Test config entry diagnostics."""
+    respx.get(CALENDER_URL).mock(
+        return_value=Response(
+            status_code=200,
+            text=ics_content,
+        )
+    )
+    await setup_integration(hass, config_entry)
+    await hass.async_block_till_done()
+    result = await get_diagnostics_for_config_entry(hass, hass_client, config_entry)
+    assert result == snapshot
diff --git a/tests/components/remote_calendar/test_init.py b/tests/components/remote_calendar/test_init.py
new file mode 100644
index 00000000000..f4ca500b2e1
--- /dev/null
+++ b/tests/components/remote_calendar/test_init.py
@@ -0,0 +1,86 @@
+"""Tests for init platform of Remote Calendar."""
+
+from httpx import ConnectError, Response, UnsupportedProtocol
+import pytest
+import respx
+
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import STATE_OFF
+from homeassistant.core import HomeAssistant
+
+from . import setup_integration
+from .conftest import CALENDER_URL, TEST_ENTITY
+
+from tests.common import MockConfigEntry
+
+
+@respx.mock
+async def test_load_unload(
+    hass: HomeAssistant, config_entry: MockConfigEntry, ics_content: str
+) -> None:
+    """Test loading and unloading a config entry."""
+    respx.get(CALENDER_URL).mock(
+        return_value=Response(
+            status_code=200,
+            text=ics_content,
+        )
+    )
+    await setup_integration(hass, config_entry)
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    state = hass.states.get(TEST_ENTITY)
+    assert state
+    assert state.state == STATE_OFF
+
+    await hass.config_entries.async_unload(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry.state is ConfigEntryState.NOT_LOADED
+
+
+@respx.mock
+async def test_raise_for_status(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test update failed using respx to simulate HTTP exceptions."""
+    respx.get(CALENDER_URL).mock(
+        return_value=Response(
+            status_code=403,
+        )
+    )
+    await setup_integration(hass, config_entry)
+    assert config_entry.state is ConfigEntryState.SETUP_RETRY
+
+
+@pytest.mark.parametrize(
+    "side_effect",
+    [
+        ConnectError("Connection failed"),
+        UnsupportedProtocol("Unsupported protocol"),
+        ValueError("Invalid response"),
+    ],
+)
+@respx.mock
+async def test_update_failed(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    side_effect: Exception,
+) -> None:
+    """Test update failed using respx to simulate different exceptions."""
+    respx.get(CALENDER_URL).mock(side_effect=side_effect)
+    await setup_integration(hass, config_entry)
+    assert config_entry.state is ConfigEntryState.SETUP_RETRY
+
+
+@respx.mock
+async def test_calendar_parse_error(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test CalendarParseError using respx."""
+    respx.get(CALENDER_URL).mock(
+        return_value=Response(status_code=200, text="not a calendar")
+    )
+    await setup_integration(hass, config_entry)
+    assert config_entry.state is ConfigEntryState.SETUP_RETRY
diff --git a/tests/components/renault/snapshots/test_binary_sensor.ambr b/tests/components/renault/snapshots/test_binary_sensor.ambr
index 7142608b977..b62cfb4d1b1 100644
--- a/tests/components/renault/snapshots/test_binary_sensor.ambr
+++ b/tests/components/renault/snapshots/test_binary_sensor.ambr
@@ -4,6 +4,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -41,6 +42,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -72,6 +74,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -103,6 +106,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -134,6 +138,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -165,6 +170,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -196,6 +202,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -304,6 +311,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -341,6 +349,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -372,6 +381,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -403,6 +413,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -434,6 +445,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -465,6 +477,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -496,6 +509,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -527,6 +541,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -558,6 +573,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -690,6 +706,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -727,6 +744,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -758,6 +776,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -789,6 +808,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -860,6 +880,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -897,6 +918,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -928,6 +950,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -959,6 +982,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -990,6 +1014,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1021,6 +1046,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1052,6 +1078,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1083,6 +1110,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1114,6 +1142,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1145,6 +1174,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1288,6 +1318,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -1325,6 +1356,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1356,6 +1388,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1387,6 +1420,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1418,6 +1452,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1449,6 +1484,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1480,6 +1516,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1588,6 +1625,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -1625,6 +1663,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1656,6 +1695,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1687,6 +1727,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1718,6 +1759,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1749,6 +1791,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1780,6 +1823,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1811,6 +1855,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1842,6 +1887,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1974,6 +2020,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -2011,6 +2058,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2042,6 +2090,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2073,6 +2122,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2144,6 +2194,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -2181,6 +2232,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2212,6 +2264,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2243,6 +2296,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2274,6 +2328,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2305,6 +2360,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2336,6 +2392,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2367,6 +2424,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2398,6 +2456,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2429,6 +2488,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
diff --git a/tests/components/renault/snapshots/test_button.ambr b/tests/components/renault/snapshots/test_button.ambr
index e61255372c1..58789c7aa47 100644
--- a/tests/components/renault/snapshots/test_button.ambr
+++ b/tests/components/renault/snapshots/test_button.ambr
@@ -4,6 +4,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -41,6 +42,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -88,6 +90,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -125,6 +128,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -156,6 +160,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -187,6 +192,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -256,6 +262,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -293,6 +300,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -324,6 +332,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -355,6 +364,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -424,6 +434,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -461,6 +472,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -492,6 +504,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -523,6 +536,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -592,6 +606,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -629,6 +644,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -676,6 +692,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -713,6 +730,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -744,6 +762,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -775,6 +794,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -844,6 +864,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -881,6 +902,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -912,6 +934,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -943,6 +966,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1012,6 +1036,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -1049,6 +1074,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1080,6 +1106,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1111,6 +1138,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
diff --git a/tests/components/renault/snapshots/test_device_tracker.ambr b/tests/components/renault/snapshots/test_device_tracker.ambr
index f90cb92cc63..119defca4ac 100644
--- a/tests/components/renault/snapshots/test_device_tracker.ambr
+++ b/tests/components/renault/snapshots/test_device_tracker.ambr
@@ -4,6 +4,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -41,6 +42,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -89,6 +91,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -126,6 +129,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -174,6 +178,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -216,6 +221,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -253,6 +259,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -301,6 +308,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -338,6 +346,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -389,6 +398,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -426,6 +436,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -477,6 +488,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -519,6 +531,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -556,6 +569,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
diff --git a/tests/components/renault/snapshots/test_select.ambr b/tests/components/renault/snapshots/test_select.ambr
index 9974e21be75..526c8af5bc4 100644
--- a/tests/components/renault/snapshots/test_select.ambr
+++ b/tests/components/renault/snapshots/test_select.ambr
@@ -4,6 +4,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -46,6 +47,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -90,6 +92,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -143,6 +146,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -187,6 +191,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -240,6 +245,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -284,6 +290,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -337,6 +344,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -379,6 +387,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -423,6 +432,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -476,6 +486,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -520,6 +531,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -573,6 +585,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -617,6 +630,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
diff --git a/tests/components/renault/snapshots/test_sensor.ambr b/tests/components/renault/snapshots/test_sensor.ambr
index b092222c9f3..175ad2422ed 100644
--- a/tests/components/renault/snapshots/test_sensor.ambr
+++ b/tests/components/renault/snapshots/test_sensor.ambr
@@ -4,6 +4,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -43,6 +44,7 @@
         'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -76,6 +78,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -109,6 +112,7 @@
         'state_class': <SensorStateClass.TOTAL: 'total'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -140,6 +144,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -171,6 +176,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -202,6 +208,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -314,6 +321,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -353,6 +361,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -395,6 +404,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -428,6 +438,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -461,6 +472,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -500,6 +512,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -533,6 +546,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -566,6 +580,7 @@
         'state_class': <SensorStateClass.TOTAL: 'total'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -599,6 +614,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -630,6 +646,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -663,6 +680,7 @@
         'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -696,6 +714,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -729,6 +748,7 @@
         'state_class': <SensorStateClass.TOTAL: 'total'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -760,6 +780,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -791,6 +812,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -822,6 +844,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1071,6 +1094,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -1110,6 +1134,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1152,6 +1177,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1185,6 +1211,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1218,6 +1245,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1257,6 +1285,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1290,6 +1319,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1323,6 +1353,7 @@
         'state_class': <SensorStateClass.TOTAL: 'total'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1356,6 +1387,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1387,6 +1419,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1420,6 +1453,7 @@
         'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1453,6 +1487,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1484,6 +1519,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1515,6 +1551,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1546,6 +1583,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1577,6 +1615,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1824,6 +1863,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -1863,6 +1903,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1905,6 +1946,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1938,6 +1980,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1971,6 +2014,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2010,6 +2054,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2043,6 +2088,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2076,6 +2122,7 @@
         'state_class': <SensorStateClass.TOTAL: 'total'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2109,6 +2156,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2140,6 +2188,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2173,6 +2222,7 @@
         'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2206,6 +2256,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2237,6 +2288,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2268,6 +2320,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2299,6 +2352,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2330,6 +2384,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2361,6 +2416,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2620,6 +2676,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -2659,6 +2716,7 @@
         'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2692,6 +2750,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2725,6 +2784,7 @@
         'state_class': <SensorStateClass.TOTAL: 'total'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2756,6 +2816,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -2787,6 +2848,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -2818,6 +2880,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -2930,6 +2993,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -2969,6 +3033,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -3011,6 +3076,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -3044,6 +3110,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -3077,6 +3144,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -3116,6 +3184,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -3149,6 +3218,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -3182,6 +3252,7 @@
         'state_class': <SensorStateClass.TOTAL: 'total'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -3215,6 +3286,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -3246,6 +3318,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -3279,6 +3352,7 @@
         'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -3312,6 +3386,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -3345,6 +3420,7 @@
         'state_class': <SensorStateClass.TOTAL: 'total'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -3376,6 +3452,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -3407,6 +3484,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -3438,6 +3516,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -3687,6 +3766,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -3726,6 +3806,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -3768,6 +3849,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -3801,6 +3883,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -3834,6 +3917,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -3873,6 +3957,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -3906,6 +3991,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -3939,6 +4025,7 @@
         'state_class': <SensorStateClass.TOTAL: 'total'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -3972,6 +4059,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -4003,6 +4091,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -4036,6 +4125,7 @@
         'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -4069,6 +4159,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -4100,6 +4191,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -4131,6 +4223,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -4162,6 +4255,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -4193,6 +4287,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -4440,6 +4535,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -4479,6 +4575,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -4521,6 +4618,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -4554,6 +4652,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -4587,6 +4686,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -4626,6 +4726,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -4659,6 +4760,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -4692,6 +4794,7 @@
         'state_class': <SensorStateClass.TOTAL: 'total'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -4725,6 +4828,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -4756,6 +4860,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -4789,6 +4894,7 @@
         'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -4822,6 +4928,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -4853,6 +4960,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -4884,6 +4992,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -4915,6 +5024,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -4946,6 +5056,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -4977,6 +5088,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
diff --git a/tests/components/reolink/conftest.py b/tests/components/reolink/conftest.py
index 81865d98801..21acced3d1d 100644
--- a/tests/components/reolink/conftest.py
+++ b/tests/components/reolink/conftest.py
@@ -9,7 +9,12 @@ from reolink_aio.baichuan import Baichuan
 from reolink_aio.exceptions import ReolinkError
 
 from homeassistant.components.reolink.config_flow import DEFAULT_PROTOCOL
-from homeassistant.components.reolink.const import CONF_USE_HTTPS, DOMAIN
+from homeassistant.components.reolink.const import (
+    CONF_BC_PORT,
+    CONF_SUPPORTS_PRIVACY_MODE,
+    CONF_USE_HTTPS,
+    DOMAIN,
+)
 from homeassistant.const import (
     CONF_HOST,
     CONF_PASSWORD,
@@ -30,6 +35,7 @@ TEST_PASSWORD = "password"
 TEST_PASSWORD2 = "new_password"
 TEST_MAC = "aa:bb:cc:dd:ee:ff"
 TEST_MAC2 = "ff:ee:dd:cc:bb:aa"
+TEST_MAC_CAM = "11:22:33:44:55:66"
 DHCP_FORMATTED_MAC = "aabbccddeeff"
 TEST_UID = "ABC1234567D89EFG"
 TEST_UID_CAM = "DEF7654321D89GHT"
@@ -43,6 +49,8 @@ TEST_HOST_MODEL = "RLN8-410"
 TEST_ITEM_NUMBER = "P000"
 TEST_CAM_MODEL = "RLC-123"
 TEST_DUO_MODEL = "Reolink Duo PoE"
+TEST_PRIVACY = True
+TEST_BC_PORT = 5678
 
 
 @pytest.fixture
@@ -65,6 +73,7 @@ def reolink_connect_class() -> Generator[MagicMock]:
         host_mock = host_mock_class.return_value
         host_mock.get_host_data.return_value = None
         host_mock.get_states.return_value = None
+        host_mock.supported.return_value = True
         host_mock.check_new_firmware.return_value = False
         host_mock.unsubscribe.return_value = True
         host_mock.logout.return_value = True
@@ -113,6 +122,11 @@ def reolink_connect_class() -> Generator[MagicMock]:
         host_mock.capabilities = {"Host": ["RTSP"], "0": ["motion_detection"]}
         host_mock.checked_api_versions = {"GetEvents": 1}
         host_mock.abilities = {"abilityChn": [{"aiTrack": {"permit": 0, "ver": 0}}]}
+        host_mock.get_raw_host_data.return_value = (
+            "{'host':'TEST_RESPONSE','channel':'TEST_RESPONSE'}"
+        )
+
+        reolink_connect.chime_list = []
 
         # enums
         host_mock.whiteled_mode.return_value = 1
@@ -121,12 +135,29 @@ def reolink_connect_class() -> Generator[MagicMock]:
         host_mock.doorbell_led_list.return_value = ["stayoff", "auto"]
         host_mock.auto_track_method.return_value = 3
         host_mock.daynight_state.return_value = "Black&White"
+        host_mock.hub_alarm_tone_id.return_value = 1
+        host_mock.hub_visitor_tone_id.return_value = 1
 
         # Baichuan
         host_mock.baichuan = create_autospec(Baichuan)
         # Disable tcp push by default for tests
+        host_mock.baichuan.port = TEST_BC_PORT
         host_mock.baichuan.events_active = False
+        host_mock.baichuan.mac_address.return_value = TEST_MAC_CAM
+        host_mock.baichuan.privacy_mode.return_value = False
+        host_mock.baichuan.day_night_state.return_value = "day"
         host_mock.baichuan.subscribe_events.side_effect = ReolinkError("Test error")
+        host_mock.baichuan.active_scene = "off"
+        host_mock.baichuan.scene_names = ["off", "home"]
+        host_mock.baichuan.abilities = {
+            0: {"chnID": 0, "aitype": 34615},
+            "Host": {"pushAlarm": 7},
+        }
+        host_mock.baichuan.smart_location_list.return_value = [0]
+        host_mock.baichuan.smart_ai_type_list.return_value = ["people"]
+        host_mock.baichuan.smart_ai_index.return_value = 1
+        host_mock.baichuan.smart_ai_name.return_value = "zone1"
+
         yield host_mock_class
 
 
@@ -157,6 +188,8 @@ def config_entry(hass: HomeAssistant) -> MockConfigEntry:
             CONF_PASSWORD: TEST_PASSWORD,
             CONF_PORT: TEST_PORT,
             CONF_USE_HTTPS: TEST_USE_HTTPS,
+            CONF_SUPPORTS_PRIVACY_MODE: TEST_PRIVACY,
+            CONF_BC_PORT: TEST_BC_PORT,
         },
         options={
             CONF_PROTOCOL: DEFAULT_PROTOCOL,
diff --git a/tests/components/reolink/snapshots/test_diagnostics.ambr b/tests/components/reolink/snapshots/test_diagnostics.ambr
index 71c5397fbd1..5eb80d16356 100644
--- a/tests/components/reolink/snapshots/test_diagnostics.ambr
+++ b/tests/components/reolink/snapshots/test_diagnostics.ambr
@@ -1,6 +1,27 @@
 # serializer version: 1
 # name: test_entry_diagnostics
   dict({
+    'BC_abilities': dict({
+      '0': dict({
+        'aitype': 34615,
+        'chnID': 0,
+      }),
+      'Host': dict({
+        'pushAlarm': 7,
+      }),
+    }),
+    'Chimes': dict({
+      '12345678': dict({
+        'channel': 0,
+        'event_types': list([
+          'md',
+          'people',
+          'visitor',
+        ]),
+        'name': 'Test chime',
+        'online': True,
+      }),
+    }),
     'HTTP(S) port': 1234,
     'HTTPS': True,
     'IPC cams': dict({
@@ -41,6 +62,14 @@
       0,
     ]),
     'cmd list': dict({
+      '296': dict({
+        '0': 1,
+        'null': 1,
+      }),
+      'DingDongOpt': dict({
+        '0': 2,
+        'null': 2,
+      }),
       'GetAiAlarm': dict({
         '0': 5,
         'null': 5,
@@ -81,6 +110,10 @@
         '0': 2,
         'null': 4,
       }),
+      'GetDingDongCfg': dict({
+        '0': 3,
+        'null': 3,
+      }),
       'GetEmail': dict({
         '0': 1,
         'null': 2,
@@ -137,6 +170,9 @@
         '0': 1,
         'null': 2,
       }),
+      'GetScene': dict({
+        'null': 1,
+      }),
       'GetStateLight': dict({
         'null': 1,
       }),
diff --git a/tests/components/reolink/test_binary_sensor.py b/tests/components/reolink/test_binary_sensor.py
index 71318c27b25..99c9efba002 100644
--- a/tests/components/reolink/test_binary_sensor.py
+++ b/tests/components/reolink/test_binary_sensor.py
@@ -51,6 +51,32 @@ async def test_motion_sensor(
     assert hass.states.get(entity_id).state == STATE_ON
 
 
+async def test_smart_ai_sensor(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    freezer: FrozenDateTimeFactory,
+    config_entry: MockConfigEntry,
+    reolink_connect: MagicMock,
+) -> None:
+    """Test smart ai binary sensor entity."""
+    reolink_connect.model = TEST_HOST_MODEL
+    reolink_connect.baichuan.smart_ai_state.return_value = True
+    with patch("homeassistant.components.reolink.PLATFORMS", [Platform.BINARY_SENSOR]):
+        assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    entity_id = f"{Platform.BINARY_SENSOR}.{TEST_NVR_NAME}_crossline_zone1_person"
+    assert hass.states.get(entity_id).state == STATE_ON
+
+    reolink_connect.baichuan.smart_ai_state.return_value = False
+    freezer.tick(DEVICE_UPDATE_INTERVAL)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    assert hass.states.get(entity_id).state == STATE_OFF
+
+
 async def test_tcp_callback(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
diff --git a/tests/components/reolink/test_config_flow.py b/tests/components/reolink/test_config_flow.py
index 5950fc49966..e706af0d067 100644
--- a/tests/components/reolink/test_config_flow.py
+++ b/tests/components/reolink/test_config_flow.py
@@ -2,7 +2,7 @@
 
 import json
 from typing import Any
-from unittest.mock import ANY, AsyncMock, MagicMock, call
+from unittest.mock import ANY, AsyncMock, MagicMock, call, patch
 
 from aiohttp import ClientSession
 from freezegun.api import FrozenDateTimeFactory
@@ -11,13 +11,19 @@ from reolink_aio.exceptions import (
     ApiError,
     CredentialsInvalidError,
     LoginFirmwareError,
+    LoginPrivacyModeError,
     ReolinkError,
 )
 
 from homeassistant import config_entries
 from homeassistant.components.reolink import DEVICE_UPDATE_INTERVAL
 from homeassistant.components.reolink.config_flow import DEFAULT_PROTOCOL
-from homeassistant.components.reolink.const import CONF_USE_HTTPS, DOMAIN
+from homeassistant.components.reolink.const import (
+    CONF_BC_PORT,
+    CONF_SUPPORTS_PRIVACY_MODE,
+    CONF_USE_HTTPS,
+    DOMAIN,
+)
 from homeassistant.components.reolink.exceptions import ReolinkWebhookException
 from homeassistant.components.reolink.host import DEFAULT_TIMEOUT
 from homeassistant.config_entries import ConfigEntryState
@@ -35,6 +41,7 @@ from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 
 from .conftest import (
     DHCP_FORMATTED_MAC,
+    TEST_BC_PORT,
     TEST_HOST,
     TEST_HOST2,
     TEST_MAC,
@@ -42,6 +49,7 @@ from .conftest import (
     TEST_PASSWORD,
     TEST_PASSWORD2,
     TEST_PORT,
+    TEST_PRIVACY,
     TEST_USE_HTTPS,
     TEST_USERNAME,
     TEST_USERNAME2,
@@ -81,6 +89,8 @@ async def test_config_flow_manual_success(
         CONF_PASSWORD: TEST_PASSWORD,
         CONF_PORT: TEST_PORT,
         CONF_USE_HTTPS: TEST_USE_HTTPS,
+        CONF_SUPPORTS_PRIVACY_MODE: TEST_PRIVACY,
+        CONF_BC_PORT: TEST_BC_PORT,
     }
     assert result["options"] == {
         CONF_PROTOCOL: DEFAULT_PROTOCOL,
@@ -88,6 +98,61 @@ async def test_config_flow_manual_success(
     assert result["result"].unique_id == TEST_MAC
 
 
+async def test_config_flow_privacy_success(
+    hass: HomeAssistant, reolink_connect: MagicMock, mock_setup_entry: MagicMock
+) -> None:
+    """Successful flow when privacy mode is turned on."""
+    reolink_connect.baichuan.privacy_mode.return_value = True
+    reolink_connect.get_host_data.side_effect = LoginPrivacyModeError("Test error")
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_USERNAME: TEST_USERNAME,
+            CONF_PASSWORD: TEST_PASSWORD,
+            CONF_HOST: TEST_HOST,
+        },
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "privacy"
+    assert result["errors"] is None
+
+    assert reolink_connect.baichuan.set_privacy_mode.call_count == 0
+    reolink_connect.get_host_data.reset_mock(side_effect=True)
+
+    with patch("homeassistant.components.reolink.config_flow.API_STARTUP_TIME", new=0):
+        result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    assert reolink_connect.baichuan.set_privacy_mode.call_count == 1
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == TEST_NVR_NAME
+    assert result["data"] == {
+        CONF_HOST: TEST_HOST,
+        CONF_USERNAME: TEST_USERNAME,
+        CONF_PASSWORD: TEST_PASSWORD,
+        CONF_PORT: TEST_PORT,
+        CONF_USE_HTTPS: TEST_USE_HTTPS,
+        CONF_SUPPORTS_PRIVACY_MODE: TEST_PRIVACY,
+        CONF_BC_PORT: TEST_BC_PORT,
+    }
+    assert result["options"] == {
+        CONF_PROTOCOL: DEFAULT_PROTOCOL,
+    }
+    assert result["result"].unique_id == TEST_MAC
+
+    reolink_connect.baichuan.privacy_mode.return_value = False
+
+
 async def test_config_flow_errors(
     hass: HomeAssistant, reolink_connect: MagicMock, mock_setup_entry: MagicMock
 ) -> None:
@@ -229,6 +294,7 @@ async def test_config_flow_errors(
             CONF_HOST: TEST_HOST,
             CONF_PORT: TEST_PORT,
             CONF_USE_HTTPS: TEST_USE_HTTPS,
+            CONF_BC_PORT: TEST_BC_PORT,
         },
     )
 
@@ -240,6 +306,8 @@ async def test_config_flow_errors(
         CONF_PASSWORD: TEST_PASSWORD,
         CONF_PORT: TEST_PORT,
         CONF_USE_HTTPS: TEST_USE_HTTPS,
+        CONF_SUPPORTS_PRIVACY_MODE: TEST_PRIVACY,
+        CONF_BC_PORT: TEST_BC_PORT,
     }
     assert result["options"] == {
         CONF_PROTOCOL: DEFAULT_PROTOCOL,
@@ -260,6 +328,7 @@ async def test_options_flow(hass: HomeAssistant, mock_setup_entry: MagicMock) ->
             CONF_PASSWORD: TEST_PASSWORD,
             CONF_PORT: TEST_PORT,
             CONF_USE_HTTPS: TEST_USE_HTTPS,
+            CONF_BC_PORT: TEST_BC_PORT,
         },
         options={
             CONF_PROTOCOL: "rtsp",
@@ -298,6 +367,7 @@ async def test_reauth(hass: HomeAssistant, mock_setup_entry: MagicMock) -> None:
             CONF_PASSWORD: TEST_PASSWORD,
             CONF_PORT: TEST_PORT,
             CONF_USE_HTTPS: TEST_USE_HTTPS,
+            CONF_BC_PORT: TEST_BC_PORT,
         },
         options={
             CONF_PROTOCOL: DEFAULT_PROTOCOL,
@@ -343,6 +413,7 @@ async def test_reauth_abort_unique_id_mismatch(
             CONF_PASSWORD: TEST_PASSWORD,
             CONF_PORT: TEST_PORT,
             CONF_USE_HTTPS: TEST_USE_HTTPS,
+            CONF_BC_PORT: TEST_BC_PORT,
         },
         options={
             CONF_PROTOCOL: DEFAULT_PROTOCOL,
@@ -411,6 +482,8 @@ async def test_dhcp_flow(hass: HomeAssistant, mock_setup_entry: MagicMock) -> No
         CONF_PASSWORD: TEST_PASSWORD,
         CONF_PORT: TEST_PORT,
         CONF_USE_HTTPS: TEST_USE_HTTPS,
+        CONF_SUPPORTS_PRIVACY_MODE: TEST_PRIVACY,
+        CONF_BC_PORT: TEST_BC_PORT,
     }
     assert result["options"] == {
         CONF_PROTOCOL: DEFAULT_PROTOCOL,
@@ -433,6 +506,7 @@ async def test_dhcp_ip_update_aborted_if_wrong_mac(
             CONF_PASSWORD: TEST_PASSWORD,
             CONF_PORT: TEST_PORT,
             CONF_USE_HTTPS: TEST_USE_HTTPS,
+            CONF_BC_PORT: TEST_BC_PORT,
         },
         options={
             CONF_PROTOCOL: DEFAULT_PROTOCOL,
@@ -473,6 +547,7 @@ async def test_dhcp_ip_update_aborted_if_wrong_mac(
             protocol=DEFAULT_PROTOCOL,
             timeout=DEFAULT_TIMEOUT,
             aiohttp_get_session_callback=ANY,
+            bc_port=TEST_BC_PORT,
         )
         assert expected_call in reolink_connect_class.call_args_list
 
@@ -530,6 +605,7 @@ async def test_dhcp_ip_update(
             CONF_PASSWORD: TEST_PASSWORD,
             CONF_PORT: TEST_PORT,
             CONF_USE_HTTPS: TEST_USE_HTTPS,
+            CONF_BC_PORT: TEST_BC_PORT,
         },
         options={
             CONF_PROTOCOL: DEFAULT_PROTOCOL,
@@ -572,6 +648,7 @@ async def test_dhcp_ip_update(
             protocol=DEFAULT_PROTOCOL,
             timeout=DEFAULT_TIMEOUT,
             aiohttp_get_session_callback=ANY,
+            bc_port=TEST_BC_PORT,
         )
         assert expected_call in reolink_connect_class.call_args_list
 
@@ -608,6 +685,7 @@ async def test_dhcp_ip_update_ingnored_if_still_connected(
             CONF_PASSWORD: TEST_PASSWORD,
             CONF_PORT: TEST_PORT,
             CONF_USE_HTTPS: TEST_USE_HTTPS,
+            CONF_BC_PORT: TEST_BC_PORT,
         },
         options={
             CONF_PROTOCOL: DEFAULT_PROTOCOL,
@@ -639,6 +717,7 @@ async def test_dhcp_ip_update_ingnored_if_still_connected(
         protocol=DEFAULT_PROTOCOL,
         timeout=DEFAULT_TIMEOUT,
         aiohttp_get_session_callback=ANY,
+        bc_port=TEST_BC_PORT,
     )
     assert expected_call in reolink_connect_class.call_args_list
 
@@ -668,6 +747,7 @@ async def test_reconfig(hass: HomeAssistant, mock_setup_entry: MagicMock) -> Non
             CONF_PASSWORD: TEST_PASSWORD,
             CONF_PORT: TEST_PORT,
             CONF_USE_HTTPS: TEST_USE_HTTPS,
+            CONF_BC_PORT: TEST_BC_PORT,
         },
         options={
             CONF_PROTOCOL: DEFAULT_PROTOCOL,
@@ -714,6 +794,7 @@ async def test_reconfig_abort_unique_id_mismatch(
             CONF_PASSWORD: TEST_PASSWORD,
             CONF_PORT: TEST_PORT,
             CONF_USE_HTTPS: TEST_USE_HTTPS,
+            CONF_BC_PORT: TEST_BC_PORT,
         },
         options={
             CONF_PROTOCOL: DEFAULT_PROTOCOL,
diff --git a/tests/components/reolink/test_diagnostics.py b/tests/components/reolink/test_diagnostics.py
index 57b474c13ad..d45163d3cf0 100644
--- a/tests/components/reolink/test_diagnostics.py
+++ b/tests/components/reolink/test_diagnostics.py
@@ -2,6 +2,7 @@
 
 from unittest.mock import MagicMock
 
+from reolink_aio.api import Chime
 from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.core import HomeAssistant
@@ -15,6 +16,7 @@ async def test_entry_diagnostics(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
     reolink_connect: MagicMock,
+    test_chime: Chime,
     config_entry: MockConfigEntry,
     snapshot: SnapshotAssertion,
 ) -> None:
diff --git a/tests/components/reolink/test_init.py b/tests/components/reolink/test_init.py
index f851e13c91d..4c4908dca6f 100644
--- a/tests/components/reolink/test_init.py
+++ b/tests/components/reolink/test_init.py
@@ -1,22 +1,37 @@
 """Test the Reolink init."""
 
 import asyncio
+from collections.abc import Callable
 from typing import Any
 from unittest.mock import AsyncMock, MagicMock, Mock, patch
 
 from freezegun.api import FrozenDateTimeFactory
 import pytest
 from reolink_aio.api import Chime
-from reolink_aio.exceptions import CredentialsInvalidError, ReolinkError
+from reolink_aio.exceptions import (
+    CredentialsInvalidError,
+    LoginPrivacyModeError,
+    ReolinkError,
+)
 
 from homeassistant.components.reolink import (
     DEVICE_UPDATE_INTERVAL,
     FIRMWARE_UPDATE_INTERVAL,
     NUM_CRED_ERRORS,
 )
-from homeassistant.components.reolink.const import DOMAIN
+from homeassistant.components.reolink.const import CONF_BC_PORT, DOMAIN
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import CONF_PORT, STATE_OFF, STATE_UNAVAILABLE, Platform
+from homeassistant.const import (
+    CONF_HOST,
+    CONF_PASSWORD,
+    CONF_PORT,
+    CONF_PROTOCOL,
+    CONF_USERNAME,
+    STATE_OFF,
+    STATE_ON,
+    STATE_UNAVAILABLE,
+    Platform,
+)
 from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
 from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.helpers import (
@@ -24,16 +39,25 @@ from homeassistant.helpers import (
     entity_registry as er,
     issue_registry as ir,
 )
+from homeassistant.helpers.device_registry import format_mac
 from homeassistant.setup import async_setup_component
 
 from .conftest import (
+    CONF_SUPPORTS_PRIVACY_MODE,
+    CONF_USE_HTTPS,
+    DEFAULT_PROTOCOL,
+    TEST_BC_PORT,
     TEST_CAM_MODEL,
+    TEST_HOST,
     TEST_HOST_MODEL,
     TEST_MAC,
     TEST_NVR_NAME,
     TEST_PORT,
+    TEST_PRIVACY,
     TEST_UID,
     TEST_UID_CAM,
+    TEST_USE_HTTPS,
+    TEST_USERNAME,
 )
 
 from tests.common import MockConfigEntry, async_fire_time_changed
@@ -711,6 +735,41 @@ async def test_firmware_repair_issue(
     await hass.async_block_till_done()
 
     assert (DOMAIN, "firmware_update_host") in issue_registry.issues
+    reolink_connect.camera_sw_version_update_required.return_value = False
+
+
+async def test_password_too_long_repair_issue(
+    hass: HomeAssistant,
+    reolink_connect: MagicMock,
+    issue_registry: ir.IssueRegistry,
+) -> None:
+    """Test password too long issue is raised."""
+    reolink_connect.valid_password.return_value = False
+    config_entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=format_mac(TEST_MAC),
+        data={
+            CONF_HOST: TEST_HOST,
+            CONF_USERNAME: TEST_USERNAME,
+            CONF_PASSWORD: "too_longgggggggggggggggggggggggggggggggggggggggggggggggggg",
+            CONF_PORT: TEST_PORT,
+            CONF_USE_HTTPS: TEST_USE_HTTPS,
+            CONF_SUPPORTS_PRIVACY_MODE: TEST_PRIVACY,
+        },
+        options={
+            CONF_PROTOCOL: DEFAULT_PROTOCOL,
+        },
+        title=TEST_NVR_NAME,
+    )
+    config_entry.add_to_hass(hass)
+    assert not await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert (
+        DOMAIN,
+        f"password_too_long_{config_entry.entry_id}",
+    ) in issue_registry.issues
+    reolink_connect.valid_password.return_value = True
 
 
 async def test_new_device_discovered(
@@ -749,3 +808,144 @@ async def test_port_changed(
     await hass.async_block_till_done()
 
     assert config_entry.data[CONF_PORT] == 4567
+
+
+async def test_baichuan_port_changed(
+    hass: HomeAssistant,
+    reolink_connect: MagicMock,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test config_entry baichuan port update when it has changed during initial login."""
+    assert config_entry.data[CONF_BC_PORT] == TEST_BC_PORT
+    reolink_connect.baichuan.port = 8901
+
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry.data[CONF_BC_PORT] == 8901
+
+
+async def test_privacy_mode_on(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    reolink_connect: MagicMock,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test successful setup even when privacy mode is turned on."""
+    reolink_connect.baichuan.privacy_mode.return_value = True
+    reolink_connect.get_states = AsyncMock(
+        side_effect=LoginPrivacyModeError("Test error")
+    )
+
+    with patch("homeassistant.components.reolink.PLATFORMS", [Platform.SWITCH]):
+        assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    reolink_connect.baichuan.privacy_mode.return_value = False
+
+
+async def test_LoginPrivacyModeError(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    reolink_connect: MagicMock,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test normal update when get_states returns a LoginPrivacyModeError."""
+    reolink_connect.baichuan.privacy_mode.return_value = False
+    reolink_connect.get_states = AsyncMock(
+        side_effect=LoginPrivacyModeError("Test error")
+    )
+
+    with patch("homeassistant.components.reolink.PLATFORMS", [Platform.SWITCH]):
+        assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    reolink_connect.baichuan.check_subscribe_events.reset_mock()
+    assert reolink_connect.baichuan.check_subscribe_events.call_count == 0
+
+    freezer.tick(DEVICE_UPDATE_INTERVAL)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    assert reolink_connect.baichuan.check_subscribe_events.call_count >= 1
+
+
+async def test_privacy_mode_change_callback(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    config_entry: MockConfigEntry,
+    reolink_connect: MagicMock,
+) -> None:
+    """Test privacy mode changed callback."""
+
+    class callback_mock_class:
+        callback_func = None
+
+        def register_callback(
+            self, callback_id: str, callback: Callable[[], None], *args, **key_args
+        ) -> None:
+            if callback_id == "privacy_mode_change":
+                self.callback_func = callback
+
+    callback_mock = callback_mock_class()
+
+    reolink_connect.model = TEST_HOST_MODEL
+    reolink_connect.baichuan.events_active = True
+    reolink_connect.baichuan.subscribe_events.reset_mock(side_effect=True)
+    reolink_connect.baichuan.register_callback = callback_mock.register_callback
+    reolink_connect.baichuan.privacy_mode.return_value = True
+    reolink_connect.audio_record.return_value = True
+    reolink_connect.get_states = AsyncMock()
+
+    with patch("homeassistant.components.reolink.PLATFORMS", [Platform.SWITCH]):
+        assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    entity_id = f"{Platform.SWITCH}.{TEST_NVR_NAME}_record_audio"
+    assert hass.states.get(entity_id).state == STATE_UNAVAILABLE
+
+    # simulate a TCP push callback signaling a privacy mode change
+    reolink_connect.baichuan.privacy_mode.return_value = False
+    assert callback_mock.callback_func is not None
+    callback_mock.callback_func()
+
+    # check that a coordinator update was scheduled.
+    reolink_connect.get_states.reset_mock()
+    assert reolink_connect.get_states.call_count == 0
+
+    freezer.tick(5)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    assert reolink_connect.get_states.call_count >= 1
+    assert hass.states.get(entity_id).state == STATE_ON
+
+    # test cleanup during unloading, first reset to privacy mode ON
+    reolink_connect.baichuan.privacy_mode.return_value = True
+    callback_mock.callback_func()
+    freezer.tick(5)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+    # now fire the callback again, but unload before refresh took place
+    reolink_connect.baichuan.privacy_mode.return_value = False
+    callback_mock.callback_func()
+    await hass.async_block_till_done()
+
+    await hass.config_entries.async_unload(config_entry.entry_id)
+    await hass.async_block_till_done()
+    assert config_entry.state is ConfigEntryState.NOT_LOADED
+
+
+async def test_remove(
+    hass: HomeAssistant,
+    reolink_connect: MagicMock,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test removing of the reolink integration."""
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert await hass.config_entries.async_remove(config_entry.entry_id)
diff --git a/tests/components/reolink/test_media_source.py b/tests/components/reolink/test_media_source.py
index 9c5be08e9b6..7044ea53671 100644
--- a/tests/components/reolink/test_media_source.py
+++ b/tests/components/reolink/test_media_source.py
@@ -15,7 +15,7 @@ from homeassistant.components.media_source import (
     async_resolve_media,
 )
 from homeassistant.components.reolink.config_flow import DEFAULT_PROTOCOL
-from homeassistant.components.reolink.const import CONF_USE_HTTPS, DOMAIN
+from homeassistant.components.reolink.const import CONF_BC_PORT, CONF_USE_HTTPS, DOMAIN
 from homeassistant.components.stream import DOMAIN as MEDIA_STREAM_DOMAIN
 from homeassistant.const import (
     CONF_HOST,
@@ -31,6 +31,7 @@ from homeassistant.helpers.device_registry import format_mac
 from homeassistant.setup import async_setup_component
 
 from .conftest import (
+    TEST_BC_PORT,
     TEST_HOST2,
     TEST_HOST_MODEL,
     TEST_MAC2,
@@ -235,12 +236,12 @@ async def test_browsing(
     reolink_connect.model = TEST_HOST_MODEL
 
 
-async def test_browsing_unsupported_encoding(
+async def test_browsing_h265_encoding(
     hass: HomeAssistant,
     reolink_connect: MagicMock,
     config_entry: MockConfigEntry,
 ) -> None:
-    """Test browsing a Reolink camera with unsupported stream encoding."""
+    """Test browsing a Reolink camera with h265 stream encoding."""
     entry_id = config_entry.entry_id
 
     with patch("homeassistant.components.reolink.PLATFORMS", [Platform.CAMERA]):
@@ -249,7 +250,6 @@ async def test_browsing_unsupported_encoding(
 
     browse_root_id = f"CAM|{entry_id}|{TEST_CHANNEL}"
 
-    # browse resolution select/camera recording days when main encoding unsupported
     mock_status = MagicMock()
     mock_status.year = TEST_YEAR
     mock_status.month = TEST_MONTH
@@ -261,6 +261,18 @@ async def test_browsing_unsupported_encoding(
 
     browse = await async_browse_media(hass, f"{URI_SCHEME}{DOMAIN}/{browse_root_id}")
 
+    browse_resolution_id = f"RESs|{entry_id}|{TEST_CHANNEL}"
+    browse_res_sub_id = f"RES|{entry_id}|{TEST_CHANNEL}|sub"
+    browse_res_main_id = f"RES|{entry_id}|{TEST_CHANNEL}|main"
+
+    assert browse.domain == DOMAIN
+    assert browse.title == f"{TEST_NVR_NAME}"
+    assert browse.identifier == browse_resolution_id
+    assert browse.children[0].identifier == browse_res_sub_id
+    assert browse.children[1].identifier == browse_res_main_id
+
+    browse = await async_browse_media(hass, f"{URI_SCHEME}{DOMAIN}/{browse_res_sub_id}")
+
     browse_days_id = f"DAYS|{entry_id}|{TEST_CHANNEL}|sub"
     browse_day_0_id = (
         f"DAY|{entry_id}|{TEST_CHANNEL}|sub|{TEST_YEAR}|{TEST_MONTH}|{TEST_DAY}"
@@ -337,6 +349,7 @@ async def test_browsing_not_loaded(
             CONF_PASSWORD: TEST_PASSWORD2,
             CONF_PORT: TEST_PORT,
             CONF_USE_HTTPS: TEST_USE_HTTPS,
+            CONF_BC_PORT: TEST_BC_PORT,
         },
         options={
             CONF_PROTOCOL: DEFAULT_PROTOCOL,
diff --git a/tests/components/reolink/test_number.py b/tests/components/reolink/test_number.py
index c6507fa36c1..dd70376d658 100644
--- a/tests/components/reolink/test_number.py
+++ b/tests/components/reolink/test_number.py
@@ -67,6 +67,48 @@ async def test_number(
     reolink_connect.set_volume.reset_mock(side_effect=True)
 
 
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_smart_ai_number(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    reolink_connect: MagicMock,
+) -> None:
+    """Test number entity with smart ai sensitivity."""
+    reolink_connect.baichuan.smart_ai_sensitivity.return_value = 80
+
+    with patch("homeassistant.components.reolink.PLATFORMS", [Platform.NUMBER]):
+        assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    entity_id = f"{Platform.NUMBER}.{TEST_NVR_NAME}_AI_crossline_zone1_sensitivity"
+
+    assert hass.states.get(entity_id).state == "80"
+
+    await hass.services.async_call(
+        NUMBER_DOMAIN,
+        SERVICE_SET_VALUE,
+        {ATTR_ENTITY_ID: entity_id, ATTR_VALUE: 50},
+        blocking=True,
+    )
+    reolink_connect.baichuan.set_smart_ai.assert_called_with(
+        0, "crossline", 0, sensitivity=50
+    )
+
+    reolink_connect.baichuan.set_smart_ai.side_effect = InvalidParameterError(
+        "Test error"
+    )
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            NUMBER_DOMAIN,
+            SERVICE_SET_VALUE,
+            {ATTR_ENTITY_ID: entity_id, ATTR_VALUE: 50},
+            blocking=True,
+        )
+
+    reolink_connect.baichuan.set_smart_ai.reset_mock(side_effect=True)
+
+
 async def test_host_number(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
diff --git a/tests/components/reolink/test_select.py b/tests/components/reolink/test_select.py
index 7910174380a..32bc5e4435e 100644
--- a/tests/components/reolink/test_select.py
+++ b/tests/components/reolink/test_select.py
@@ -104,6 +104,58 @@ async def test_play_quick_reply_message(
     reolink_connect.quick_reply_dict = MagicMock()
 
 
+async def test_host_scene_select(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    config_entry: MockConfigEntry,
+    reolink_connect: MagicMock,
+) -> None:
+    """Test host select entity with scene mode."""
+    with patch("homeassistant.components.reolink.PLATFORMS", [Platform.SELECT]):
+        assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    entity_id = f"{Platform.SELECT}.{TEST_NVR_NAME}_scene_mode"
+    assert hass.states.get(entity_id).state == "off"
+
+    await hass.services.async_call(
+        SELECT_DOMAIN,
+        SERVICE_SELECT_OPTION,
+        {ATTR_ENTITY_ID: entity_id, "option": "home"},
+        blocking=True,
+    )
+    reolink_connect.baichuan.set_scene.assert_called_once()
+
+    reolink_connect.baichuan.set_scene.side_effect = ReolinkError("Test error")
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            SELECT_DOMAIN,
+            SERVICE_SELECT_OPTION,
+            {ATTR_ENTITY_ID: entity_id, "option": "home"},
+            blocking=True,
+        )
+
+    reolink_connect.baichuan.set_scene.side_effect = InvalidParameterError("Test error")
+    with pytest.raises(ServiceValidationError):
+        await hass.services.async_call(
+            SELECT_DOMAIN,
+            SERVICE_SELECT_OPTION,
+            {ATTR_ENTITY_ID: entity_id, "option": "home"},
+            blocking=True,
+        )
+
+    reolink_connect.baichuan.active_scene = "Invalid value"
+    freezer.tick(DEVICE_UPDATE_INTERVAL)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    assert hass.states.get(entity_id).state == STATE_UNKNOWN
+
+    reolink_connect.baichuan.set_scene.reset_mock(side_effect=True)
+    reolink_connect.baichuan.active_scene = "off"
+
+
 async def test_chime_select(
     hass: HomeAssistant,
     freezer: FrozenDateTimeFactory,
diff --git a/tests/components/reolink/test_switch.py b/tests/components/reolink/test_switch.py
index 2e7c1556201..2b2c33f0e8f 100644
--- a/tests/components/reolink/test_switch.py
+++ b/tests/components/reolink/test_switch.py
@@ -29,6 +29,211 @@ from .conftest import TEST_CAM_NAME, TEST_NVR_NAME, TEST_UID
 from tests.common import MockConfigEntry, async_fire_time_changed
 
 
+async def test_switch(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    freezer: FrozenDateTimeFactory,
+    reolink_connect: MagicMock,
+) -> None:
+    """Test switch entity."""
+    reolink_connect.camera_name.return_value = TEST_CAM_NAME
+    reolink_connect.audio_record.return_value = True
+
+    with patch("homeassistant.components.reolink.PLATFORMS", [Platform.SWITCH]):
+        assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    entity_id = f"{Platform.SWITCH}.{TEST_CAM_NAME}_record_audio"
+    assert hass.states.get(entity_id).state == STATE_ON
+
+    reolink_connect.audio_record.return_value = False
+    freezer.tick(DEVICE_UPDATE_INTERVAL)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    assert hass.states.get(entity_id).state == STATE_OFF
+
+    # test switch turn on
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+    reolink_connect.set_audio.assert_called_with(0, True)
+
+    reolink_connect.set_audio.side_effect = ReolinkError("Test error")
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: entity_id},
+            blocking=True,
+        )
+
+    # test switch turn off
+    reolink_connect.set_audio.reset_mock(side_effect=True)
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+    reolink_connect.set_audio.assert_called_with(0, False)
+
+    reolink_connect.set_audio.side_effect = ReolinkError("Test error")
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_OFF,
+            {ATTR_ENTITY_ID: entity_id},
+            blocking=True,
+        )
+
+    reolink_connect.set_audio.reset_mock(side_effect=True)
+
+    reolink_connect.camera_online.return_value = False
+    freezer.tick(DEVICE_UPDATE_INTERVAL)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    assert hass.states.get(entity_id).state == STATE_UNAVAILABLE
+
+    reolink_connect.camera_online.return_value = True
+
+
+async def test_host_switch(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    freezer: FrozenDateTimeFactory,
+    reolink_connect: MagicMock,
+) -> None:
+    """Test host switch entity."""
+    reolink_connect.camera_name.return_value = TEST_CAM_NAME
+    reolink_connect.email_enabled.return_value = True
+    reolink_connect.is_hub = False
+    reolink_connect.supported.return_value = True
+
+    with patch("homeassistant.components.reolink.PLATFORMS", [Platform.SWITCH]):
+        assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    entity_id = f"{Platform.SWITCH}.{TEST_NVR_NAME}_email_on_event"
+    assert hass.states.get(entity_id).state == STATE_ON
+
+    reolink_connect.email_enabled.return_value = False
+    freezer.tick(DEVICE_UPDATE_INTERVAL)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    assert hass.states.get(entity_id).state == STATE_OFF
+
+    # test switch turn on
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+    reolink_connect.set_email.assert_called_with(None, True)
+
+    reolink_connect.set_email.side_effect = ReolinkError("Test error")
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: entity_id},
+            blocking=True,
+        )
+
+    # test switch turn off
+    reolink_connect.set_email.reset_mock(side_effect=True)
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+    reolink_connect.set_email.assert_called_with(None, False)
+
+    reolink_connect.set_email.side_effect = ReolinkError("Test error")
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_OFF,
+            {ATTR_ENTITY_ID: entity_id},
+            blocking=True,
+        )
+
+    reolink_connect.set_email.reset_mock(side_effect=True)
+
+
+async def test_chime_switch(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    freezer: FrozenDateTimeFactory,
+    reolink_connect: MagicMock,
+    test_chime: Chime,
+) -> None:
+    """Test host switch entity."""
+    with patch("homeassistant.components.reolink.PLATFORMS", [Platform.SWITCH]):
+        assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    entity_id = f"{Platform.SWITCH}.test_chime_led"
+    assert hass.states.get(entity_id).state == STATE_ON
+
+    test_chime.led_state = False
+    freezer.tick(DEVICE_UPDATE_INTERVAL)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    assert hass.states.get(entity_id).state == STATE_OFF
+
+    # test switch turn on
+    test_chime.set_option = AsyncMock()
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+    test_chime.set_option.assert_called_with(led=True)
+
+    test_chime.set_option.side_effect = ReolinkError("Test error")
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: entity_id},
+            blocking=True,
+        )
+
+    # test switch turn off
+    test_chime.set_option.reset_mock(side_effect=True)
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+    test_chime.set_option.assert_called_with(led=False)
+
+    test_chime.set_option.side_effect = ReolinkError("Test error")
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_OFF,
+            {ATTR_ENTITY_ID: entity_id},
+            blocking=True,
+        )
+
+    test_chime.set_option.reset_mock(side_effect=True)
+
+
 @pytest.mark.parametrize(
     (
         "original_id",
@@ -171,206 +376,3 @@ async def test_hub_switches_repair_issue(
 
     reolink_connect.is_hub = False
     reolink_connect.supported.return_value = True
-
-
-async def test_switch(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    freezer: FrozenDateTimeFactory,
-    reolink_connect: MagicMock,
-) -> None:
-    """Test switch entity."""
-    reolink_connect.camera_name.return_value = TEST_CAM_NAME
-    reolink_connect.audio_record.return_value = True
-
-    with patch("homeassistant.components.reolink.PLATFORMS", [Platform.SWITCH]):
-        assert await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    entity_id = f"{Platform.SWITCH}.{TEST_CAM_NAME}_record_audio"
-    assert hass.states.get(entity_id).state == STATE_ON
-
-    reolink_connect.audio_record.return_value = False
-    freezer.tick(DEVICE_UPDATE_INTERVAL)
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-
-    assert hass.states.get(entity_id).state == STATE_OFF
-
-    # test switch turn on
-    await hass.services.async_call(
-        SWITCH_DOMAIN,
-        SERVICE_TURN_ON,
-        {ATTR_ENTITY_ID: entity_id},
-        blocking=True,
-    )
-    reolink_connect.set_audio.assert_called_with(0, True)
-
-    reolink_connect.set_audio.side_effect = ReolinkError("Test error")
-    with pytest.raises(HomeAssistantError):
-        await hass.services.async_call(
-            SWITCH_DOMAIN,
-            SERVICE_TURN_ON,
-            {ATTR_ENTITY_ID: entity_id},
-            blocking=True,
-        )
-
-    # test switch turn off
-    reolink_connect.set_audio.reset_mock(side_effect=True)
-    await hass.services.async_call(
-        SWITCH_DOMAIN,
-        SERVICE_TURN_OFF,
-        {ATTR_ENTITY_ID: entity_id},
-        blocking=True,
-    )
-    reolink_connect.set_audio.assert_called_with(0, False)
-
-    reolink_connect.set_audio.side_effect = ReolinkError("Test error")
-    with pytest.raises(HomeAssistantError):
-        await hass.services.async_call(
-            SWITCH_DOMAIN,
-            SERVICE_TURN_OFF,
-            {ATTR_ENTITY_ID: entity_id},
-            blocking=True,
-        )
-
-    reolink_connect.set_audio.reset_mock(side_effect=True)
-
-    reolink_connect.camera_online.return_value = False
-    freezer.tick(DEVICE_UPDATE_INTERVAL)
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-
-    assert hass.states.get(entity_id).state == STATE_UNAVAILABLE
-
-    reolink_connect.camera_online.return_value = True
-
-
-async def test_host_switch(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    freezer: FrozenDateTimeFactory,
-    reolink_connect: MagicMock,
-) -> None:
-    """Test host switch entity."""
-    reolink_connect.camera_name.return_value = TEST_CAM_NAME
-    reolink_connect.email_enabled.return_value = True
-
-    with patch("homeassistant.components.reolink.PLATFORMS", [Platform.SWITCH]):
-        assert await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    entity_id = f"{Platform.SWITCH}.{TEST_NVR_NAME}_email_on_event"
-    assert hass.states.get(entity_id).state == STATE_ON
-
-    reolink_connect.email_enabled.return_value = False
-    freezer.tick(DEVICE_UPDATE_INTERVAL)
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-
-    assert hass.states.get(entity_id).state == STATE_OFF
-
-    # test switch turn on
-    await hass.services.async_call(
-        SWITCH_DOMAIN,
-        SERVICE_TURN_ON,
-        {ATTR_ENTITY_ID: entity_id},
-        blocking=True,
-    )
-    reolink_connect.set_email.assert_called_with(None, True)
-
-    reolink_connect.set_email.side_effect = ReolinkError("Test error")
-    with pytest.raises(HomeAssistantError):
-        await hass.services.async_call(
-            SWITCH_DOMAIN,
-            SERVICE_TURN_ON,
-            {ATTR_ENTITY_ID: entity_id},
-            blocking=True,
-        )
-
-    # test switch turn off
-    reolink_connect.set_email.reset_mock(side_effect=True)
-    await hass.services.async_call(
-        SWITCH_DOMAIN,
-        SERVICE_TURN_OFF,
-        {ATTR_ENTITY_ID: entity_id},
-        blocking=True,
-    )
-    reolink_connect.set_email.assert_called_with(None, False)
-
-    reolink_connect.set_email.side_effect = ReolinkError("Test error")
-    with pytest.raises(HomeAssistantError):
-        await hass.services.async_call(
-            SWITCH_DOMAIN,
-            SERVICE_TURN_OFF,
-            {ATTR_ENTITY_ID: entity_id},
-            blocking=True,
-        )
-
-    reolink_connect.set_email.reset_mock(side_effect=True)
-
-
-async def test_chime_switch(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    freezer: FrozenDateTimeFactory,
-    reolink_connect: MagicMock,
-    test_chime: Chime,
-) -> None:
-    """Test host switch entity."""
-    with patch("homeassistant.components.reolink.PLATFORMS", [Platform.SWITCH]):
-        assert await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    entity_id = f"{Platform.SWITCH}.test_chime_led"
-    assert hass.states.get(entity_id).state == STATE_ON
-
-    test_chime.led_state = False
-    freezer.tick(DEVICE_UPDATE_INTERVAL)
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-
-    assert hass.states.get(entity_id).state == STATE_OFF
-
-    # test switch turn on
-    test_chime.set_option = AsyncMock()
-    await hass.services.async_call(
-        SWITCH_DOMAIN,
-        SERVICE_TURN_ON,
-        {ATTR_ENTITY_ID: entity_id},
-        blocking=True,
-    )
-    test_chime.set_option.assert_called_with(led=True)
-
-    test_chime.set_option.side_effect = ReolinkError("Test error")
-    with pytest.raises(HomeAssistantError):
-        await hass.services.async_call(
-            SWITCH_DOMAIN,
-            SERVICE_TURN_ON,
-            {ATTR_ENTITY_ID: entity_id},
-            blocking=True,
-        )
-
-    # test switch turn off
-    test_chime.set_option.reset_mock(side_effect=True)
-    await hass.services.async_call(
-        SWITCH_DOMAIN,
-        SERVICE_TURN_OFF,
-        {ATTR_ENTITY_ID: entity_id},
-        blocking=True,
-    )
-    test_chime.set_option.assert_called_with(led=False)
-
-    test_chime.set_option.side_effect = ReolinkError("Test error")
-    with pytest.raises(HomeAssistantError):
-        await hass.services.async_call(
-            SWITCH_DOMAIN,
-            SERVICE_TURN_OFF,
-            {ATTR_ENTITY_ID: entity_id},
-            blocking=True,
-        )
-
-    test_chime.set_option.reset_mock(side_effect=True)
diff --git a/tests/components/reolink/test_update.py b/tests/components/reolink/test_update.py
index a6cfe862963..d48362516b8 100644
--- a/tests/components/reolink/test_update.py
+++ b/tests/components/reolink/test_update.py
@@ -6,7 +6,7 @@ from unittest.mock import MagicMock, patch
 
 from freezegun.api import FrozenDateTimeFactory
 import pytest
-from reolink_aio.exceptions import ReolinkError
+from reolink_aio.exceptions import ApiError, ReolinkError
 from reolink_aio.software_version import NewSoftwareVersion
 
 from homeassistant.components.reolink.update import POLL_AFTER_INSTALL, POLL_PROGRESS
@@ -144,6 +144,17 @@ async def test_update_firm(
             blocking=True,
         )
 
+    reolink_connect.update_firmware.side_effect = ApiError(
+        "Test error", translation_key="firmware_rate_limit"
+    )
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            UPDATE_DOMAIN,
+            SERVICE_INSTALL,
+            {ATTR_ENTITY_ID: entity_id},
+            blocking=True,
+        )
+
     # test _async_update_future
     reolink_connect.camera_sw_version.return_value = "v3.3.0.226_23031644"
     reolink_connect.firmware_update_available.return_value = False
diff --git a/tests/components/reolink/test_util.py b/tests/components/reolink/test_util.py
index f66f4682b98..ef66d471801 100644
--- a/tests/components/reolink/test_util.py
+++ b/tests/components/reolink/test_util.py
@@ -38,51 +38,59 @@ from tests.common import MockConfigEntry
     [
         (
             ApiError("Test error"),
-            HomeAssistantError,
+            HomeAssistantError(translation_key="api_error"),
+        ),
+        (
+            ApiError("Test error", translation_key="firmware_rate_limit"),
+            HomeAssistantError(translation_key="firmware_rate_limit"),
+        ),
+        (
+            ApiError("Test error", translation_key="not_in_strings.json"),
+            HomeAssistantError(translation_key="api_error"),
         ),
         (
             CredentialsInvalidError("Test error"),
-            HomeAssistantError,
+            HomeAssistantError(translation_key="invalid_credentials"),
         ),
         (
             InvalidContentTypeError("Test error"),
-            HomeAssistantError,
+            HomeAssistantError(translation_key="invalid_content_type"),
         ),
         (
             InvalidParameterError("Test error"),
-            ServiceValidationError,
+            ServiceValidationError(translation_key="invalid_parameter"),
         ),
         (
             LoginError("Test error"),
-            HomeAssistantError,
+            HomeAssistantError(translation_key="login_error"),
         ),
         (
             NoDataError("Test error"),
-            HomeAssistantError,
+            HomeAssistantError(translation_key="no_data"),
         ),
         (
             NotSupportedError("Test error"),
-            HomeAssistantError,
+            HomeAssistantError(translation_key="not_supported"),
         ),
         (
             ReolinkConnectionError("Test error"),
-            HomeAssistantError,
+            HomeAssistantError(translation_key="connection_error"),
         ),
         (
             ReolinkError("Test error"),
-            HomeAssistantError,
+            HomeAssistantError(translation_key="unexpected"),
         ),
         (
             ReolinkTimeoutError("Test error"),
-            HomeAssistantError,
+            HomeAssistantError(translation_key="timeout"),
         ),
         (
             SubscriptionError("Test error"),
-            HomeAssistantError,
+            HomeAssistantError(translation_key="subscription_error"),
         ),
         (
             UnexpectedDataError("Test error"),
-            HomeAssistantError,
+            HomeAssistantError(translation_key="unexpected_data"),
         ),
     ],
 )
@@ -91,7 +99,7 @@ async def test_try_function(
     config_entry: MockConfigEntry,
     reolink_connect: MagicMock,
     side_effect: ReolinkError,
-    expected: Exception,
+    expected: HomeAssistantError,
 ) -> None:
     """Test try_function error translations using number entity."""
     reolink_connect.volume.return_value = 80
@@ -104,7 +112,7 @@ async def test_try_function(
     entity_id = f"{Platform.NUMBER}.{TEST_NVR_NAME}_volume"
 
     reolink_connect.set_volume.side_effect = side_effect
-    with pytest.raises(expected):
+    with pytest.raises(expected.__class__) as err:
         await hass.services.async_call(
             NUMBER_DOMAIN,
             SERVICE_SET_VALUE,
@@ -112,4 +120,6 @@ async def test_try_function(
             blocking=True,
         )
 
+    assert err.value.translation_key == expected.translation_key
+
     reolink_connect.set_volume.reset_mock(side_effect=True)
diff --git a/tests/components/reolink/test_views.py b/tests/components/reolink/test_views.py
index c994cc59c5d..3521de072b6 100644
--- a/tests/components/reolink/test_views.py
+++ b/tests/components/reolink/test_views.py
@@ -46,8 +46,12 @@ def get_mock_session(
 
     mock_response = Mock()
     mock_response.content_length = content_length
+    mock_response.headers = {}
+    mock_response.status = 200
+    mock_response.reason = "OK"
     mock_response.content_type = content_type
     mock_response.content.iter_chunked = Mock(return_value=content)
+    mock_response.text = AsyncMock(return_value="test")
 
     mock_session = Mock()
     mock_session.get = AsyncMock(return_value=mock_response)
@@ -178,16 +182,18 @@ async def test_playback_proxy_timeout(
     assert response.status == 200
 
 
+@pytest.mark.parametrize(("content_type"), [("video/x-flv"), ("text/html")])
 async def test_playback_wrong_content(
     hass: HomeAssistant,
     reolink_connect: MagicMock,
     config_entry: MockConfigEntry,
     hass_client: ClientSessionGenerator,
+    content_type: str,
 ) -> None:
     """Test playback proxy URL with a wrong content type in the response."""
     reolink_connect.get_vod_source.return_value = (TEST_MIME_TYPE_MP4, TEST_URL)
 
-    mock_session = get_mock_session(content_type="video/x-flv")
+    mock_session = get_mock_session(content_type=content_type)
 
     with patch(
         "homeassistant.components.reolink.views.async_get_clientsession",
diff --git a/tests/components/repairs/test_init.py b/tests/components/repairs/test_init.py
index e78563503f1..9c4a0dfbd2a 100644
--- a/tests/components/repairs/test_init.py
+++ b/tests/components/repairs/test_init.py
@@ -21,16 +21,7 @@ from tests.common import mock_platform
 from tests.typing import WebSocketGenerator
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    [
-        [
-            "component.test.issues.even_worse.title",
-            "component.test.issues.even_worse.description",
-            "component.test.issues.abc_123.title",
-        ]
-    ],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 @pytest.mark.freeze_time("2022-07-19 07:53:05")
 async def test_create_update_issue(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
@@ -170,14 +161,7 @@ async def test_create_issue_invalid_version(
     assert msg["result"] == {"issues": []}
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    [
-        [
-            "component.test.issues.abc_123.title",
-        ]
-    ],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 @pytest.mark.freeze_time("2022-07-19 07:53:05")
 async def test_ignore_issue(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
@@ -347,10 +331,7 @@ async def test_ignore_issue(
     }
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.fake_integration.issues.abc_123.title"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["fake_integration"])
 @pytest.mark.freeze_time("2022-07-19 07:53:05")
 async def test_delete_issue(
     hass: HomeAssistant,
@@ -505,10 +486,7 @@ async def test_non_compliant_platform(
     assert list(hass.data[DOMAIN]["platforms"].keys()) == ["fake_integration"]
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.fake_integration.issues.abc_123.title"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["fake_integration"])
 @pytest.mark.freeze_time("2022-07-21 08:22:00")
 async def test_sync_methods(
     hass: HomeAssistant,
diff --git a/tests/components/repairs/test_websocket_api.py b/tests/components/repairs/test_websocket_api.py
index 399292fb83f..bbaf70e0a9b 100644
--- a/tests/components/repairs/test_websocket_api.py
+++ b/tests/components/repairs/test_websocket_api.py
@@ -151,10 +151,7 @@ async def mock_repairs_integration(hass: HomeAssistant) -> None:
     )
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.fake_integration.issues.abc_123.title"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["fake_integration"])
 async def test_dismiss_issue(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -238,10 +235,7 @@ async def test_dismiss_issue(
     }
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.fake_integration.issues.abc_123.title"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["fake_integration"])
 async def test_fix_non_existing_issue(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
@@ -289,19 +283,19 @@ async def test_fix_non_existing_issue(
 
 
 @pytest.mark.parametrize(
-    ("domain", "step", "description_placeholders", "ignore_translations"),
+    (
+        "domain",
+        "step",
+        "description_placeholders",
+        "ignore_translations_for_mock_domains",
+    ),
     [
-        (
-            "fake_integration",
-            "custom_step",
-            None,
-            ["component.fake_integration.issues.abc_123.title"],
-        ),
+        ("fake_integration", "custom_step", None, ["fake_integration"]),
         (
             "fake_integration_default_handler",
             "confirm",
             {"abc": "123"},
-            ["component.fake_integration_default_handler.issues.abc_123.title"],
+            ["fake_integration_default_handler"],
         ),
     ],
 )
@@ -398,10 +392,7 @@ async def test_fix_issue_unauth(
     assert resp.status == HTTPStatus.UNAUTHORIZED
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.fake_integration.issues.abc_123.title"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["fake_integration"])
 async def test_get_progress_unauth(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
@@ -433,10 +424,7 @@ async def test_get_progress_unauth(
     assert resp.status == HTTPStatus.UNAUTHORIZED
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    ["component.fake_integration.issues.abc_123.title"],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["fake_integration"])
 async def test_step_unauth(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
@@ -468,16 +456,7 @@ async def test_step_unauth(
     assert resp.status == HTTPStatus.UNAUTHORIZED
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    [
-        [
-            "component.test.issues.even_worse.title",
-            "component.test.issues.even_worse.description",
-            "component.test.issues.abc_123.title",
-        ]
-    ],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 @pytest.mark.freeze_time("2022-07-19 07:53:05")
 async def test_list_issues(
     hass: HomeAssistant,
@@ -569,15 +548,7 @@ async def test_list_issues(
     }
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    [
-        [
-            "component.fake_integration.issues.abc_123.title",
-            "component.fake_integration.issues.abc_123.fix_flow.abort.not_given",
-        ]
-    ],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["fake_integration"])
 async def test_fix_issue_aborted(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
@@ -639,16 +610,7 @@ async def test_fix_issue_aborted(
     assert msg["result"]["issues"][0] == first_issue
 
 
-@pytest.mark.parametrize(
-    "ignore_translations",
-    [
-        [
-            "component.test.issues.abc_123.title",
-            "component.test.issues.even_worse.title",
-            "component.test.issues.even_worse.description",
-        ]
-    ],
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 @pytest.mark.freeze_time("2022-07-19 07:53:05")
 async def test_get_issue_data(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
diff --git a/tests/components/rflink/test_binary_sensor.py b/tests/components/rflink/test_binary_sensor.py
index 9329edb3a00..fd113bceaa0 100644
--- a/tests/components/rflink/test_binary_sensor.py
+++ b/tests/components/rflink/test_binary_sensor.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import CoreState, HomeAssistant, State, callback
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .test_init import mock_rflink
 
diff --git a/tests/components/ridwell/snapshots/test_diagnostics.ambr b/tests/components/ridwell/snapshots/test_diagnostics.ambr
index b03d87c7a89..4b4dda7227d 100644
--- a/tests/components/ridwell/snapshots/test_diagnostics.ambr
+++ b/tests/components/ridwell/snapshots/test_diagnostics.ambr
@@ -44,6 +44,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': '**REDACTED**',
       'unique_id': '**REDACTED**',
       'version': 2,
diff --git a/tests/components/ring/common.py b/tests/components/ring/common.py
index 22fa1c2bf32..e7af1d94855 100644
--- a/tests/components/ring/common.py
+++ b/tests/components/ring/common.py
@@ -6,6 +6,7 @@ from homeassistant.components.automation import DOMAIN as AUTOMATION_DOMAIN
 from homeassistant.components.ring import DOMAIN
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er, translation
 from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry
@@ -35,3 +36,62 @@ async def setup_automation(hass: HomeAssistant, alias: str, entity_id: str) -> N
             }
         },
     )
+
+
+async def async_check_entity_translations(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    config_entry_id: str,
+    platform_domain: str,
+) -> None:
+    """Check that entity translations are used correctly.
+
+    Check no unused translations in strings.
+    Check no translation_key defined when translation not in strings.
+    Check no translation defined when device class translation can be used.
+    """
+    entity_entries = er.async_entries_for_config_entry(entity_registry, config_entry_id)
+
+    assert entity_entries
+    assert len({entity_entry.domain for entity_entry in entity_entries}) == 1, (
+        "Limit the loaded platforms to 1 platform."
+    )
+
+    translations = await translation.async_get_translations(
+        hass, "en", "entity", [DOMAIN]
+    )
+    device_class_translations = await translation.async_get_translations(
+        hass, "en", "entity_component", [platform_domain]
+    )
+    unique_device_classes = set()
+    used_translation_keys = set()
+    for entity_entry in entity_entries:
+        dc_translation = None
+        if entity_entry.original_device_class:
+            dc_translation_key = f"component.{platform_domain}.entity_component.{entity_entry.original_device_class.value}.name"
+            dc_translation = device_class_translations.get(dc_translation_key)
+
+        if entity_entry.translation_key:
+            key = f"component.{DOMAIN}.entity.{entity_entry.domain}.{entity_entry.translation_key}.name"
+            entity_translation = translations.get(key)
+            assert entity_translation, (
+                f"Translation key {entity_entry.translation_key} defined for {entity_entry.entity_id} not in strings.json"
+            )
+            assert dc_translation != entity_translation, (
+                f"Translation {key} is defined the same as the device class translation."
+            )
+            used_translation_keys.add(key)
+
+        else:
+            unique_key = (entity_entry.device_id, entity_entry.original_device_class)
+            assert unique_key not in unique_device_classes, (
+                f"No translation key and multiple entities using {entity_entry.original_device_class}"
+            )
+            unique_device_classes.add(entity_entry.original_device_class)
+
+    for defined_key in translations:
+        if defined_key.split(".")[3] != platform_domain:
+            continue
+        assert defined_key in used_translation_keys, (
+            f"Translation key {defined_key} unused."
+        )
diff --git a/tests/components/ring/snapshots/test_binary_sensor.ambr b/tests/components/ring/snapshots/test_binary_sensor.ambr
index 2f8e4d8a219..09dab9b0ecc 100644
--- a/tests/components/ring/snapshots/test_binary_sensor.ambr
+++ b/tests/components/ring/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -75,7 +77,7 @@
     'platform': 'ring',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': 'motion',
+    'translation_key': None,
     'unique_id': '987654-motion',
     'unit_of_measurement': None,
   })
@@ -102,6 +104,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -123,7 +126,7 @@
     'platform': 'ring',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': 'motion',
+    'translation_key': None,
     'unique_id': '765432-motion',
     'unit_of_measurement': None,
   })
@@ -150,6 +153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -198,6 +202,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -219,7 +224,7 @@
     'platform': 'ring',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': 'motion',
+    'translation_key': None,
     'unique_id': '345678-motion',
     'unit_of_measurement': None,
   })
diff --git a/tests/components/ring/snapshots/test_button.ambr b/tests/components/ring/snapshots/test_button.ambr
index 01f6525450b..7da11d66194 100644
--- a/tests/components/ring/snapshots/test_button.ambr
+++ b/tests/components/ring/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ring/snapshots/test_camera.ambr b/tests/components/ring/snapshots/test_camera.ambr
index ec285b438b3..8c3b8a083b0 100644
--- a/tests/components/ring/snapshots/test_camera.ambr
+++ b/tests/components/ring/snapshots/test_camera.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -112,6 +114,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -164,6 +167,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -217,6 +221,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -270,6 +275,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ring/snapshots/test_event.ambr b/tests/components/ring/snapshots/test_event.ambr
index e97a01516bb..9c0fee906a0 100644
--- a/tests/components/ring/snapshots/test_event.ambr
+++ b/tests/components/ring/snapshots/test_event.ambr
@@ -10,6 +10,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -66,6 +67,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -122,6 +124,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -178,6 +181,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -234,6 +238,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -290,6 +295,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ring/snapshots/test_light.ambr b/tests/components/ring/snapshots/test_light.ambr
index 73874fda259..6c6effb93c1 100644
--- a/tests/components/ring/snapshots/test_light.ambr
+++ b/tests/components/ring/snapshots/test_light.ambr
@@ -10,6 +10,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -66,6 +67,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ring/snapshots/test_number.ambr b/tests/components/ring/snapshots/test_number.ambr
index 0873319b837..abc63051f6a 100644
--- a/tests/components/ring/snapshots/test_number.ambr
+++ b/tests/components/ring/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -67,6 +68,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -123,6 +125,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -179,6 +182,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -235,6 +239,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -291,6 +296,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -347,6 +353,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ring/snapshots/test_sensor.ambr b/tests/components/ring/snapshots/test_sensor.ambr
index 9fd1ac7ba84..615bd1df018 100644
--- a/tests/components/ring/snapshots/test_sensor.ambr
+++ b/tests/components/ring/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -117,11 +120,11 @@
     }),
     'original_device_class': <SensorDeviceClass.SIGNAL_STRENGTH: 'signal_strength'>,
     'original_icon': None,
-    'original_name': 'Wi-Fi signal strength',
+    'original_name': 'Signal strength',
     'platform': 'ring',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': 'wifi_signal_strength',
+    'translation_key': None,
     'unique_id': '123456-wifi_signal_strength',
     'unit_of_measurement': 'dBm',
   })
@@ -131,7 +134,7 @@
     'attributes': ReadOnlyDict({
       'attribution': 'Data provided by Ring.com',
       'device_class': 'signal_strength',
-      'friendly_name': 'Downstairs Wi-Fi signal strength',
+      'friendly_name': 'Downstairs Signal strength',
       'unit_of_measurement': 'dBm',
     }),
     'context': <ANY>,
@@ -151,6 +154,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -203,6 +207,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -253,6 +258,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -294,6 +300,104 @@
     'state': 'unknown',
   })
 # ---
+# name: test_states[sensor.front_door_last_ding-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.front_door_last_ding',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Last ding',
+    'platform': 'ring',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'last_ding',
+    'unique_id': '987654-last_ding',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_states[sensor.front_door_last_ding-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Ring.com',
+      'device_class': 'timestamp',
+      'friendly_name': 'Front Door Last ding',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.front_door_last_ding',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_states[sensor.front_door_last_motion-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.front_door_last_motion',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Last motion',
+    'platform': 'ring',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'last_motion',
+    'unique_id': '987654-last_motion',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_states[sensor.front_door_last_motion-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Ring.com',
+      'device_class': 'timestamp',
+      'friendly_name': 'Front Door Last motion',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.front_door_last_motion',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
 # name: test_states[sensor.front_door_volume-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -301,6 +405,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -348,6 +453,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -395,6 +501,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -412,11 +519,11 @@
     }),
     'original_device_class': <SensorDeviceClass.SIGNAL_STRENGTH: 'signal_strength'>,
     'original_icon': None,
-    'original_name': 'Wi-Fi signal strength',
+    'original_name': 'Signal strength',
     'platform': 'ring',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': 'wifi_signal_strength',
+    'translation_key': None,
     'unique_id': '987654-wifi_signal_strength',
     'unit_of_measurement': 'dBm',
   })
@@ -426,7 +533,7 @@
     'attributes': ReadOnlyDict({
       'attribution': 'Data provided by Ring.com',
       'device_class': 'signal_strength',
-      'friendly_name': 'Front Door Wi-Fi signal strength',
+      'friendly_name': 'Front Door Signal strength',
       'unit_of_measurement': 'dBm',
     }),
     'context': <ANY>,
@@ -444,6 +551,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -485,6 +593,104 @@
     'state': 'unknown',
   })
 # ---
+# name: test_states[sensor.front_last_ding-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.front_last_ding',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Last ding',
+    'platform': 'ring',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'last_ding',
+    'unique_id': '765432-last_ding',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_states[sensor.front_last_ding-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Ring.com',
+      'device_class': 'timestamp',
+      'friendly_name': 'Front Last ding',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.front_last_ding',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_states[sensor.front_last_motion-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.front_last_motion',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Last motion',
+    'platform': 'ring',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'last_motion',
+    'unique_id': '765432-last_motion',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_states[sensor.front_last_motion-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Ring.com',
+      'device_class': 'timestamp',
+      'friendly_name': 'Front Last motion',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.front_last_motion',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
 # name: test_states[sensor.front_wifi_signal_category-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -492,6 +698,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -539,6 +746,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -556,11 +764,11 @@
     }),
     'original_device_class': <SensorDeviceClass.SIGNAL_STRENGTH: 'signal_strength'>,
     'original_icon': None,
-    'original_name': 'Wi-Fi signal strength',
+    'original_name': 'Signal strength',
     'platform': 'ring',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': 'wifi_signal_strength',
+    'translation_key': None,
     'unique_id': '765432-wifi_signal_strength',
     'unit_of_measurement': 'dBm',
   })
@@ -570,7 +778,7 @@
     'attributes': ReadOnlyDict({
       'attribution': 'Data provided by Ring.com',
       'device_class': 'signal_strength',
-      'friendly_name': 'Front Wi-Fi signal strength',
+      'friendly_name': 'Front Signal strength',
       'unit_of_measurement': 'dBm',
     }),
     'context': <ANY>,
@@ -590,6 +798,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -640,6 +849,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -687,6 +897,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -735,6 +946,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -782,6 +994,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -829,6 +1042,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -876,6 +1090,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -893,11 +1108,11 @@
     }),
     'original_device_class': <SensorDeviceClass.SIGNAL_STRENGTH: 'signal_strength'>,
     'original_icon': None,
-    'original_name': 'Wi-Fi signal strength',
+    'original_name': 'Signal strength',
     'platform': 'ring',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': 'wifi_signal_strength',
+    'translation_key': None,
     'unique_id': '185036587-wifi_signal_strength',
     'unit_of_measurement': 'dBm',
   })
@@ -907,7 +1122,7 @@
     'attributes': ReadOnlyDict({
       'attribution': 'Data provided by Ring.com',
       'device_class': 'signal_strength',
-      'friendly_name': 'Ingress Wi-Fi signal strength',
+      'friendly_name': 'Ingress Signal strength',
       'unit_of_measurement': 'dBm',
     }),
     'context': <ANY>,
@@ -927,6 +1142,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -977,6 +1193,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1018,6 +1235,104 @@
     'state': 'unknown',
   })
 # ---
+# name: test_states[sensor.internal_last_ding-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.internal_last_ding',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Last ding',
+    'platform': 'ring',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'last_ding',
+    'unique_id': '345678-last_ding',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_states[sensor.internal_last_ding-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Ring.com',
+      'device_class': 'timestamp',
+      'friendly_name': 'Internal Last ding',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.internal_last_ding',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_states[sensor.internal_last_motion-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.internal_last_motion',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Last motion',
+    'platform': 'ring',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'last_motion',
+    'unique_id': '345678-last_motion',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_states[sensor.internal_last_motion-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by Ring.com',
+      'device_class': 'timestamp',
+      'friendly_name': 'Internal Last motion',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.internal_last_motion',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
 # name: test_states[sensor.internal_wifi_signal_category-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -1025,6 +1340,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1072,6 +1388,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1089,11 +1406,11 @@
     }),
     'original_device_class': <SensorDeviceClass.SIGNAL_STRENGTH: 'signal_strength'>,
     'original_icon': None,
-    'original_name': 'Wi-Fi signal strength',
+    'original_name': 'Signal strength',
     'platform': 'ring',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': 'wifi_signal_strength',
+    'translation_key': None,
     'unique_id': '345678-wifi_signal_strength',
     'unit_of_measurement': 'dBm',
   })
@@ -1103,7 +1420,7 @@
     'attributes': ReadOnlyDict({
       'attribution': 'Data provided by Ring.com',
       'device_class': 'signal_strength',
-      'friendly_name': 'Internal Wi-Fi signal strength',
+      'friendly_name': 'Internal Signal strength',
       'unit_of_measurement': 'dBm',
     }),
     'context': <ANY>,
diff --git a/tests/components/ring/snapshots/test_siren.ambr b/tests/components/ring/snapshots/test_siren.ambr
index c49ab2cb30f..8ef08815a1e 100644
--- a/tests/components/ring/snapshots/test_siren.ambr
+++ b/tests/components/ring/snapshots/test_siren.ambr
@@ -11,6 +11,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -63,6 +64,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -111,6 +113,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ring/snapshots/test_switch.ambr b/tests/components/ring/snapshots/test_switch.ambr
index 57c27cfedfa..8c7c55d5169 100644
--- a/tests/components/ring/snapshots/test_switch.ambr
+++ b/tests/components/ring/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -194,6 +198,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -241,6 +246,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/ring/test_binary_sensor.py b/tests/components/ring/test_binary_sensor.py
index 81d7d6e6687..c588b022265 100644
--- a/tests/components/ring/test_binary_sensor.py
+++ b/tests/components/ring/test_binary_sensor.py
@@ -18,7 +18,12 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er, issue_registry as ir
 from homeassistant.setup import async_setup_component
 
-from .common import MockConfigEntry, setup_automation, setup_platform
+from .common import (
+    MockConfigEntry,
+    async_check_entity_translations,
+    setup_automation,
+    setup_platform,
+)
 from .device_mocks import (
     FRONT_DEVICE_ID,
     FRONT_DOOR_DEVICE_ID,
@@ -67,6 +72,9 @@ async def test_states(
 ) -> None:
     """Test states."""
     await setup_platform(hass, Platform.BINARY_SENSOR)
+    await async_check_entity_translations(
+        hass, entity_registry, mock_config_entry.entry_id, BINARY_SENSOR_DOMAIN
+    )
     await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
 
 
diff --git a/tests/components/ring/test_camera.py b/tests/components/ring/test_camera.py
index 4b4f019fdf7..54638df9a46 100644
--- a/tests/components/ring/test_camera.py
+++ b/tests/components/ring/test_camera.py
@@ -436,9 +436,9 @@ async def test_camera_webrtc(
     assert response
     assert response.get("success") is False
     assert response["error"]["code"] == "home_assistant_error"
-    msg = "The sdp_m_line_index is required for ring webrtc streaming"
-    assert msg in response["error"].get("message")
-    assert msg in caplog.text
+    error_msg = f"Error negotiating stream for {front_camera_mock.name}"
+    assert error_msg in response["error"].get("message")
+    assert error_msg in caplog.text
     front_camera_mock.on_webrtc_candidate.assert_called_once()
 
     # Answer message
diff --git a/tests/components/ring/test_init.py b/tests/components/ring/test_init.py
index 7c3b93e5114..66decb5ce15 100644
--- a/tests/components/ring/test_init.py
+++ b/tests/components/ring/test_init.py
@@ -16,7 +16,7 @@ from homeassistant.components.ring.const import (
     CONF_LISTEN_CREDENTIALS,
     SCAN_INTERVAL,
 )
-from homeassistant.components.ring.coordinator import RingEventListener
+from homeassistant.components.ring.coordinator import RingConfigEntry, RingEventListener
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntryState
 from homeassistant.const import CONF_DEVICE_ID, CONF_TOKEN, CONF_USERNAME
 from homeassistant.core import HomeAssistant
@@ -80,12 +80,12 @@ async def test_auth_failed_on_setup(
     ("error_type", "log_msg"),
     [
         (
-            RingTimeout,
-            "Timeout communicating with API: ",
+            RingTimeout("Some internal error info"),
+            "Timeout communicating with Ring API",
         ),
         (
-            RingError,
-            "Error communicating with API: ",
+            RingError("Some internal error info"),
+            "Error communicating with Ring API",
         ),
     ],
     ids=["timeout-error", "other-error"],
@@ -95,6 +95,7 @@ async def test_error_on_setup(
     mock_ring_client,
     mock_config_entry: MockConfigEntry,
     caplog: pytest.LogCaptureFixture,
+    freezer: FrozenDateTimeFactory,
     error_type,
     log_msg,
 ) -> None:
@@ -166,11 +167,11 @@ async def test_auth_failure_on_device_update(
     [
         (
             RingTimeout,
-            "Error fetching devices data: Timeout communicating with API: ",
+            "Error fetching devices data: Timeout communicating with Ring API",
         ),
         (
             RingError,
-            "Error fetching devices data: Error communicating with API: ",
+            "Error fetching devices data: Error communicating with Ring API",
         ),
     ],
     ids=["timeout-error", "other-error"],
@@ -178,7 +179,7 @@ async def test_auth_failure_on_device_update(
 async def test_error_on_global_update(
     hass: HomeAssistant,
     mock_ring_client,
-    mock_config_entry: MockConfigEntry,
+    mock_config_entry: RingConfigEntry,
     freezer: FrozenDateTimeFactory,
     caplog: pytest.LogCaptureFixture,
     error_type,
@@ -189,15 +190,35 @@ async def test_error_on_global_update(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     await hass.async_block_till_done()
 
-    mock_ring_client.async_update_devices.side_effect = error_type
+    coordinator = mock_config_entry.runtime_data.devices_coordinator
+    assert coordinator
 
-    freezer.tick(SCAN_INTERVAL)
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done(wait_background_tasks=True)
+    with patch.object(
+        coordinator, "_async_update_data", wraps=coordinator._async_update_data
+    ) as refresh_spy:
+        error = error_type("Some internal error info 1")
+        mock_ring_client.async_update_devices.side_effect = error
 
-    assert log_msg in caplog.text
+        freezer.tick(SCAN_INTERVAL * 2)
+        async_fire_time_changed(hass)
+        await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert hass.config_entries.async_get_entry(mock_config_entry.entry_id)
+        refresh_spy.assert_called()
+        assert coordinator.last_exception.__cause__ == error
+        assert log_msg in caplog.text
+
+        # Check log is not being spammed.
+        refresh_spy.reset_mock()
+        error2 = error_type("Some internal error info 2")
+        caplog.clear()
+        mock_ring_client.async_update_devices.side_effect = error2
+        freezer.tick(SCAN_INTERVAL * 2)
+        async_fire_time_changed(hass)
+        await hass.async_block_till_done(wait_background_tasks=True)
+
+        refresh_spy.assert_called()
+        assert coordinator.last_exception.__cause__ == error2
+        assert log_msg not in caplog.text
 
 
 @pytest.mark.parametrize(
@@ -205,11 +226,11 @@ async def test_error_on_global_update(
     [
         (
             RingTimeout,
-            "Error fetching devices data: Timeout communicating with API for device Front: ",
+            "Error fetching devices data: Timeout communicating with Ring API",
         ),
         (
             RingError,
-            "Error fetching devices data: Error communicating with API for device Front: ",
+            "Error fetching devices data: Error communicating with Ring API",
         ),
     ],
     ids=["timeout-error", "other-error"],
@@ -218,7 +239,7 @@ async def test_error_on_device_update(
     hass: HomeAssistant,
     mock_ring_client,
     mock_ring_devices,
-    mock_config_entry: MockConfigEntry,
+    mock_config_entry: RingConfigEntry,
     freezer: FrozenDateTimeFactory,
     caplog: pytest.LogCaptureFixture,
     error_type,
@@ -229,15 +250,36 @@ async def test_error_on_device_update(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     await hass.async_block_till_done()
 
-    front_door_doorbell = mock_ring_devices.get_device(765432)
-    front_door_doorbell.async_history.side_effect = error_type
+    coordinator = mock_config_entry.runtime_data.devices_coordinator
+    assert coordinator
 
-    freezer.tick(SCAN_INTERVAL)
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done(wait_background_tasks=True)
+    with patch.object(
+        coordinator, "_async_update_data", wraps=coordinator._async_update_data
+    ) as refresh_spy:
+        error = error_type("Some internal error info 1")
+        front_door_doorbell = mock_ring_devices.get_device(765432)
+        front_door_doorbell.async_history.side_effect = error
 
-    assert log_msg in caplog.text
-    assert hass.config_entries.async_get_entry(mock_config_entry.entry_id)
+        freezer.tick(SCAN_INTERVAL * 2)
+        async_fire_time_changed(hass)
+        await hass.async_block_till_done(wait_background_tasks=True)
+
+        refresh_spy.assert_called()
+        assert coordinator.last_exception.__cause__ == error
+        assert log_msg in caplog.text
+
+        # Check log is not being spammed.
+        error2 = error_type("Some internal error info 2")
+        front_door_doorbell.async_history.side_effect = error2
+        refresh_spy.reset_mock()
+        caplog.clear()
+        freezer.tick(SCAN_INTERVAL * 2)
+        async_fire_time_changed(hass)
+        await hass.async_block_till_done(wait_background_tasks=True)
+
+        refresh_spy.assert_called()
+        assert coordinator.last_exception.__cause__ == error2
+        assert log_msg not in caplog.text
 
 
 @pytest.mark.parametrize(
diff --git a/tests/components/ring/test_number.py b/tests/components/ring/test_number.py
index aa484c6a7b2..9f1581742f2 100644
--- a/tests/components/ring/test_number.py
+++ b/tests/components/ring/test_number.py
@@ -14,7 +14,7 @@ from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
-from .common import MockConfigEntry, setup_platform
+from .common import MockConfigEntry, async_check_entity_translations, setup_platform
 
 from tests.common import snapshot_platform
 
@@ -54,6 +54,9 @@ async def test_states(
 
     mock_config_entry.add_to_hass(hass)
     await setup_platform(hass, Platform.NUMBER)
+    await async_check_entity_translations(
+        hass, entity_registry, mock_config_entry.entry_id, NUMBER_DOMAIN
+    )
     await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
 
 
diff --git a/tests/components/ring/test_sensor.py b/tests/components/ring/test_sensor.py
index 48f679c4524..dcd3d5bddd6 100644
--- a/tests/components/ring/test_sensor.py
+++ b/tests/components/ring/test_sensor.py
@@ -16,7 +16,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
 
-from .common import MockConfigEntry, setup_platform
+from .common import MockConfigEntry, async_check_entity_translations, setup_platform
 from .device_mocks import (
     DOWNSTAIRS_DEVICE_ID,
     FRONT_DEVICE_ID,
@@ -57,6 +57,10 @@ def create_deprecated_and_disabled_sensor_entities(
     create_entry("ingress", "doorbell_volume", INGRESS_DEVICE_ID)
     create_entry("ingress", "mic_volume", INGRESS_DEVICE_ID)
     create_entry("ingress", "voice_volume", INGRESS_DEVICE_ID)
+    for desc in ("last_motion", "last_ding"):
+        create_entry("front", desc, FRONT_DEVICE_ID)
+        create_entry("front_door", desc, FRONT_DOOR_DEVICE_ID)
+        create_entry("internal", desc, INTERNAL_DEVICE_ID)
 
     # Disabled
     for desc in ("wifi_signal_category", "wifi_signal_strength"):
@@ -78,6 +82,9 @@ async def test_states(
     """Test states."""
     mock_config_entry.add_to_hass(hass)
     await setup_platform(hass, Platform.SENSOR)
+    await async_check_entity_translations(
+        hass, entity_registry, mock_config_entry.entry_id, SENSOR_DOMAIN
+    )
     await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
 
 
diff --git a/tests/components/roborock/conftest.py b/tests/components/roborock/conftest.py
index d65bf7c61d7..1ec2b00263f 100644
--- a/tests/components/roborock/conftest.py
+++ b/tests/components/roborock/conftest.py
@@ -2,7 +2,10 @@
 
 from collections.abc import Generator
 from copy import deepcopy
-from unittest.mock import patch
+import pathlib
+import tempfile
+from typing import Any
+from unittest.mock import Mock, patch
 
 import pytest
 from roborock import RoborockCategory, RoomMapping
@@ -17,7 +20,6 @@ from homeassistant.components.roborock.const import (
 )
 from homeassistant.const import CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.setup import async_setup_component
 
 from .mock_data import (
     BASE_URL,
@@ -26,6 +28,7 @@ from .mock_data import (
     MULTI_MAP_LIST,
     NETWORK_INFO,
     PROP,
+    SCENES,
     USER_DATA,
     USER_EMAIL,
 )
@@ -63,15 +66,33 @@ class A01Mock(RoborockMqttClientA01):
         return {prot: self.protocol_responses[prot] for prot in dyad_data_protocols}
 
 
+@pytest.fixture(name="bypass_api_client_fixture")
+def bypass_api_client_fixture() -> None:
+    """Skip calls to the API client."""
+    with (
+        patch(
+            "homeassistant.components.roborock.RoborockApiClient.get_home_data_v2",
+            return_value=HOME_DATA,
+        ),
+        patch(
+            "homeassistant.components.roborock.RoborockApiClient.get_scenes",
+            return_value=SCENES,
+        ),
+        patch(
+            "homeassistant.components.roborock.coordinator.RoborockLocalClientV1.load_multi_map"
+        ),
+    ):
+        yield
+
+
 @pytest.fixture(name="bypass_api_fixture")
-def bypass_api_fixture() -> None:
+def bypass_api_fixture(bypass_api_client_fixture: Any) -> None:
     """Skip calls to the API."""
     with (
         patch("homeassistant.components.roborock.RoborockMqttClientV1.async_connect"),
         patch("homeassistant.components.roborock.RoborockMqttClientV1._send_command"),
         patch(
-            "homeassistant.components.roborock.RoborockApiClient.get_home_data_v2",
-            return_value=HOME_DATA,
+            "homeassistant.components.roborock.coordinator.RoborockMqttClientV1._send_command"
         ),
         patch(
             "homeassistant.components.roborock.RoborockMqttClientV1.get_networking",
@@ -90,7 +111,7 @@ def bypass_api_fixture() -> None:
             return_value=MULTI_MAP_LIST,
         ),
         patch(
-            "homeassistant.components.roborock.image.RoborockMapDataParser.parse",
+            "homeassistant.components.roborock.coordinator.RoborockMapDataParser.parse",
             return_value=MAP_DATA,
         ),
         patch(
@@ -107,7 +128,7 @@ def bypass_api_fixture() -> None:
             "roborock.version_1_apis.AttributeCache.value",
         ),
         patch(
-            "homeassistant.components.roborock.image.MAP_SLEEP",
+            "homeassistant.components.roborock.coordinator.MAP_SLEEP",
             0,
         ),
         patch(
@@ -139,6 +160,22 @@ def bypass_api_fixture() -> None:
         yield
 
 
+@pytest.fixture(name="send_message_side_effect")
+def send_message_side_effect_fixture() -> Any:
+    """Fixture to return a side effect for the send_message method."""
+    return None
+
+
+@pytest.fixture(name="mock_send_message")
+def mock_send_message_fixture(send_message_side_effect: Any) -> Mock:
+    """Fixture to mock the send_message method."""
+    with patch(
+        "homeassistant.components.roborock.coordinator.RoborockLocalClientV1._send_command",
+        side_effect=send_message_side_effect,
+    ) as mock_send_message:
+        yield mock_send_message
+
+
 @pytest.fixture
 def bypass_api_fixture_v1_only(bypass_api_fixture) -> None:
     """Bypass api for tests that require only having v1 devices."""
@@ -183,6 +220,23 @@ async def setup_entry(
 ) -> Generator[MockConfigEntry]:
     """Set up the Roborock platform."""
     with patch("homeassistant.components.roborock.PLATFORMS", platforms):
-        assert await async_setup_component(hass, DOMAIN, {})
+        await hass.config_entries.async_setup(mock_roborock_entry.entry_id)
         await hass.async_block_till_done()
         yield mock_roborock_entry
+
+
+@pytest.fixture(autouse=True, name="storage_path")
+async def storage_path_fixture(
+    hass: HomeAssistant,
+) -> Generator[pathlib.Path]:
+    """Test cleanup, remove any map storage persisted during the test."""
+    with tempfile.TemporaryDirectory() as tmp_path:
+
+        def get_storage_path(_: HomeAssistant, entry_id: str) -> pathlib.Path:
+            return pathlib.Path(tmp_path) / entry_id
+
+        with patch(
+            "homeassistant.components.roborock.roborock_storage._storage_path_prefix",
+            new=get_storage_path,
+        ):
+            yield pathlib.Path(tmp_path)
diff --git a/tests/components/roborock/mock_data.py b/tests/components/roborock/mock_data.py
index 6e3fb229aa9..82b51e67f8d 100644
--- a/tests/components/roborock/mock_data.py
+++ b/tests/components/roborock/mock_data.py
@@ -9,6 +9,7 @@ from roborock.containers import (
     Consumable,
     DnDTimer,
     HomeData,
+    HomeDataScene,
     MultiMapsList,
     NetworkInfo,
     S7Status,
@@ -1119,7 +1120,10 @@ PROP = DeviceProp(
 )
 
 NETWORK_INFO = NetworkInfo(
-    ip="123.232.12.1", ssid="wifi", mac="ac:cc:cc:cc:cc", bssid="bssid", rssi=90
+    ip="123.232.12.1", ssid="wifi", mac="ac:cc:cc:cc:cc:cc", bssid="bssid", rssi=90
+)
+NETWORK_INFO_2 = NetworkInfo(
+    ip="123.232.12.2", ssid="wifi", mac="ac:cc:cc:cc:cd:cc", bssid="bssid", rssi=90
 )
 
 MULTI_MAP_LIST = MultiMapsList.from_dict(
@@ -1150,3 +1154,20 @@ MAP_DATA = MapData(0, 0)
 MAP_DATA.image = ImageData(
     100, 10, 10, 10, 10, ImageConfig(), Image.new("RGB", (1, 1)), lambda p: p
 )
+MAP_DATA.vacuum_room = 17
+
+
+SCENES = [
+    HomeDataScene.from_dict(
+        {
+            "name": "sc1",
+            "id": 12,
+        },
+    ),
+    HomeDataScene.from_dict(
+        {
+            "name": "sc2",
+            "id": 24,
+        },
+    ),
+]
diff --git a/tests/components/roborock/test_binary_sensor.py b/tests/components/roborock/test_binary_sensor.py
index 0e4b338f469..6a234d735e5 100644
--- a/tests/components/roborock/test_binary_sensor.py
+++ b/tests/components/roborock/test_binary_sensor.py
@@ -18,7 +18,7 @@ async def test_binary_sensors(
     hass: HomeAssistant, setup_entry: MockConfigEntry
 ) -> None:
     """Test binary sensors and check test values are correctly set."""
-    assert len(hass.states.async_all("binary_sensor")) == 8
+    assert len(hass.states.async_all("binary_sensor")) == 10
     assert hass.states.get("binary_sensor.roborock_s7_maxv_mop_attached").state == "on"
     assert (
         hass.states.get("binary_sensor.roborock_s7_maxv_water_box_attached").state
@@ -28,3 +28,4 @@ async def test_binary_sensors(
         hass.states.get("binary_sensor.roborock_s7_maxv_water_shortage").state == "off"
     )
     assert hass.states.get("binary_sensor.roborock_s7_maxv_cleaning").state == "off"
+    assert hass.states.get("binary_sensor.roborock_s7_maxv_charging").state == "on"
diff --git a/tests/components/roborock/test_button.py b/tests/components/roborock/test_button.py
index 0a7efe83513..77c5d4d7cb0 100644
--- a/tests/components/roborock/test_button.py
+++ b/tests/components/roborock/test_button.py
@@ -1,9 +1,10 @@
 """Test Roborock Button platform."""
 
-from unittest.mock import patch
+from unittest.mock import ANY, patch
 
 import pytest
 import roborock
+from roborock import RoborockException
 
 from homeassistant.components.button import SERVICE_PRESS
 from homeassistant.const import Platform
@@ -13,6 +14,18 @@ from homeassistant.exceptions import HomeAssistantError
 from tests.common import MockConfigEntry
 
 
+@pytest.fixture
+def bypass_api_client_get_scenes_fixture(bypass_api_fixture) -> None:
+    """Fixture to raise when getting scenes."""
+    with (
+        patch(
+            "homeassistant.components.roborock.RoborockApiClient.get_scenes",
+            side_effect=RoborockException(),
+        ),
+    ):
+        yield
+
+
 @pytest.fixture
 def platforms() -> list[Platform]:
     """Fixture to set platforms used in the test."""
@@ -84,3 +97,85 @@ async def test_update_failure(
         )
     assert mock_send_message.assert_called_once
     assert hass.states.get(entity_id).state == "2023-10-30T08:50:00+00:00"
+
+
+@pytest.mark.parametrize(
+    ("entity_id"),
+    [
+        ("button.roborock_s7_maxv_sc1"),
+        ("button.roborock_s7_maxv_sc2"),
+    ],
+)
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_get_button_routines_failure(
+    hass: HomeAssistant,
+    bypass_api_client_get_scenes_fixture,
+    setup_entry: MockConfigEntry,
+    entity_id: str,
+) -> None:
+    """Test that if routine retrieval fails, no entity is being created."""
+    # Ensure that the entity does not exist
+    assert hass.states.get(entity_id) is None
+
+
+@pytest.mark.parametrize(
+    ("entity_id", "routine_id"),
+    [
+        ("button.roborock_s7_maxv_sc1", 12),
+        ("button.roborock_s7_maxv_sc2", 24),
+    ],
+)
+@pytest.mark.freeze_time("2023-10-30 08:50:00")
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_press_routine_button_success(
+    hass: HomeAssistant,
+    bypass_api_fixture,
+    setup_entry: MockConfigEntry,
+    entity_id: str,
+    routine_id: int,
+) -> None:
+    """Test pressing the button entities."""
+    with patch(
+        "homeassistant.components.roborock.RoborockApiClient.execute_scene"
+    ) as mock_execute_scene:
+        await hass.services.async_call(
+            "button",
+            SERVICE_PRESS,
+            blocking=True,
+            target={"entity_id": entity_id},
+        )
+    mock_execute_scene.assert_called_once_with(ANY, routine_id)
+    assert hass.states.get(entity_id).state == "2023-10-30T08:50:00+00:00"
+
+
+@pytest.mark.parametrize(
+    ("entity_id", "routine_id"),
+    [
+        ("button.roborock_s7_maxv_sc1", 12),
+    ],
+)
+@pytest.mark.freeze_time("2023-10-30 08:50:00")
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_press_routine_button_failure(
+    hass: HomeAssistant,
+    bypass_api_fixture,
+    setup_entry: MockConfigEntry,
+    entity_id: str,
+    routine_id: int,
+) -> None:
+    """Test failure while pressing the button entity."""
+    with (
+        patch(
+            "homeassistant.components.roborock.RoborockApiClient.execute_scene",
+            side_effect=RoborockException,
+        ) as mock_execute_scene,
+        pytest.raises(HomeAssistantError, match="Error while calling execute_scene"),
+    ):
+        await hass.services.async_call(
+            "button",
+            SERVICE_PRESS,
+            blocking=True,
+            target={"entity_id": entity_id},
+        )
+    mock_execute_scene.assert_called_once_with(ANY, routine_id)
+    assert hass.states.get(entity_id).state == "2023-10-30T08:50:00+00:00"
diff --git a/tests/components/roborock/test_config_flow.py b/tests/components/roborock/test_config_flow.py
index 13bc23e6e2b..441974dc15d 100644
--- a/tests/components/roborock/test_config_flow.py
+++ b/tests/components/roborock/test_config_flow.py
@@ -19,12 +19,19 @@ from homeassistant.components.roborock.const import CONF_ENTRY_CODE, DOMAIN, DRA
 from homeassistant.const import CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 
-from .mock_data import MOCK_CONFIG, USER_DATA, USER_EMAIL
+from .mock_data import MOCK_CONFIG, NETWORK_INFO, USER_DATA, USER_EMAIL
 
 from tests.common import MockConfigEntry
 
 
+@pytest.fixture
+def cleanup_map_storage():
+    """Override the map storage fixture as it is not relevant here."""
+    return
+
+
 async def test_config_flow_success(
     hass: HomeAssistant,
     bypass_api_fixture,
@@ -189,25 +196,31 @@ async def test_config_flow_failures_code_login(
 
 
 async def test_options_flow_drawables(
-    hass: HomeAssistant, setup_entry: MockConfigEntry
+    hass: HomeAssistant, mock_roborock_entry: MockConfigEntry
 ) -> None:
     """Test that the options flow works."""
-    result = await hass.config_entries.options.async_init(setup_entry.entry_id)
-
-    assert result["type"] == FlowResultType.FORM
-    assert result["step_id"] == DRAWABLES
-    with patch(
-        "homeassistant.components.roborock.async_setup_entry", return_value=True
-    ) as mock_setup:
-        result = await hass.config_entries.options.async_configure(
-            result["flow_id"],
-            user_input={Drawable.PREDICTED_PATH: True},
-        )
+    with patch("homeassistant.components.roborock.roborock_storage"):
+        await hass.config_entries.async_setup(mock_roborock_entry.entry_id)
         await hass.async_block_till_done()
 
-    assert result["type"] == FlowResultType.CREATE_ENTRY
-    assert setup_entry.options[DRAWABLES][Drawable.PREDICTED_PATH] is True
-    assert len(mock_setup.mock_calls) == 1
+        result = await hass.config_entries.options.async_init(
+            mock_roborock_entry.entry_id
+        )
+
+        assert result["type"] == FlowResultType.FORM
+        assert result["step_id"] == DRAWABLES
+        with patch(
+            "homeassistant.components.roborock.async_setup_entry", return_value=True
+        ) as mock_setup:
+            result = await hass.config_entries.options.async_configure(
+                result["flow_id"],
+                user_input={Drawable.PREDICTED_PATH: True},
+            )
+            await hass.async_block_till_done()
+
+        assert result["type"] == FlowResultType.CREATE_ENTRY
+        assert mock_roborock_entry.options[DRAWABLES][Drawable.PREDICTED_PATH] is True
+        assert len(mock_setup.mock_calls) == 1
 
 
 async def test_reauth_flow(
@@ -269,3 +282,67 @@ async def test_account_already_configured(
 
             assert result["type"] is FlowResultType.ABORT
             assert result["reason"] == "already_configured_account"
+
+
+async def test_discovery_not_setup(
+    hass: HomeAssistant,
+    bypass_api_fixture,
+) -> None:
+    """Handle the config flow and make sure it succeeds."""
+    with (
+        patch("homeassistant.components.roborock.async_setup_entry", return_value=True),
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_DHCP},
+            data=DhcpServiceInfo(
+                ip=NETWORK_INFO.ip,
+                macaddress=NETWORK_INFO.mac.replace(":", ""),
+                hostname="roborock-vacuum-a72",
+            ),
+        )
+        assert result["type"] is FlowResultType.FORM
+        assert result["step_id"] == "user"
+        with patch(
+            "homeassistant.components.roborock.config_flow.RoborockApiClient.request_code"
+        ):
+            result = await hass.config_entries.flow.async_configure(
+                result["flow_id"], {CONF_USERNAME: USER_EMAIL}
+            )
+
+            assert result["type"] is FlowResultType.FORM
+            assert result["step_id"] == "code"
+            assert result["errors"] == {}
+        with patch(
+            "homeassistant.components.roborock.config_flow.RoborockApiClient.code_login",
+            return_value=USER_DATA,
+        ):
+            result = await hass.config_entries.flow.async_configure(
+                result["flow_id"], user_input={CONF_ENTRY_CODE: "123456"}
+            )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == USER_EMAIL
+    assert result["data"] == MOCK_CONFIG
+    assert result["result"]
+
+
+async def test_discovery_already_setup(
+    hass: HomeAssistant,
+    bypass_api_fixture,
+    mock_roborock_entry: MockConfigEntry,
+) -> None:
+    """Handle aborting if the device is already setup."""
+    await hass.config_entries.async_setup(mock_roborock_entry.entry_id)
+    await hass.async_block_till_done()
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_DHCP},
+        data=DhcpServiceInfo(
+            ip=NETWORK_INFO.ip,
+            macaddress=NETWORK_INFO.mac.replace(":", ""),
+            hostname="roborock-vacuum-a72",
+        ),
+    )
+
+    assert result["type"] is FlowResultType.ABORT
diff --git a/tests/components/roborock/test_coordinator.py b/tests/components/roborock/test_coordinator.py
new file mode 100644
index 00000000000..94976ba92f5
--- /dev/null
+++ b/tests/components/roborock/test_coordinator.py
@@ -0,0 +1,107 @@
+"""Test Roborock Coordinator specific logic."""
+
+import copy
+from datetime import timedelta
+from unittest.mock import patch
+
+import pytest
+from roborock.exceptions import RoborockException
+
+from homeassistant.components.roborock.const import (
+    V1_CLOUD_IN_CLEANING_INTERVAL,
+    V1_CLOUD_NOT_CLEANING_INTERVAL,
+    V1_LOCAL_IN_CLEANING_INTERVAL,
+    V1_LOCAL_NOT_CLEANING_INTERVAL,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.util import dt as dt_util
+
+from .mock_data import PROP
+
+from tests.common import MockConfigEntry, async_fire_time_changed
+
+
+@pytest.mark.parametrize(
+    ("interval", "in_cleaning"),
+    [
+        (V1_CLOUD_IN_CLEANING_INTERVAL, 1),
+        (V1_CLOUD_NOT_CLEANING_INTERVAL, 0),
+    ],
+)
+async def test_dynamic_cloud_scan_interval(
+    hass: HomeAssistant,
+    mock_roborock_entry: MockConfigEntry,
+    bypass_api_fixture_v1_only,
+    interval: timedelta,
+    in_cleaning: int,
+) -> None:
+    """Test dynamic scan interval."""
+    prop = copy.deepcopy(PROP)
+    prop.status.in_cleaning = in_cleaning
+    with (
+        # Force the system to use the cloud api.
+        patch(
+            "homeassistant.components.roborock.coordinator.RoborockLocalClientV1.ping",
+            side_effect=RoborockException(),
+        ),
+        patch(
+            "homeassistant.components.roborock.RoborockMqttClientV1.get_prop",
+            return_value=prop,
+        ),
+    ):
+        await hass.config_entries.async_setup(mock_roborock_entry.entry_id)
+    assert hass.states.get("sensor.roborock_s7_maxv_battery").state == "100"
+    prop = copy.deepcopy(prop)
+    prop.status.battery = 20
+    with patch(
+        "homeassistant.components.roborock.RoborockMqttClientV1.get_prop",
+        return_value=prop,
+    ):
+        async_fire_time_changed(
+            hass, dt_util.utcnow() + interval - timedelta(seconds=5)
+        )
+        assert hass.states.get("sensor.roborock_s7_maxv_battery").state == "100"
+        async_fire_time_changed(hass, dt_util.utcnow() + interval)
+
+    assert hass.states.get("sensor.roborock_s7_maxv_battery").state == "20"
+
+
+@pytest.mark.parametrize(
+    ("interval", "in_cleaning"),
+    [
+        (V1_LOCAL_IN_CLEANING_INTERVAL, 1),
+        (V1_LOCAL_NOT_CLEANING_INTERVAL, 0),
+    ],
+)
+async def test_dynamic_local_scan_interval(
+    hass: HomeAssistant,
+    mock_roborock_entry: MockConfigEntry,
+    bypass_api_fixture_v1_only,
+    interval: timedelta,
+    in_cleaning: int,
+) -> None:
+    """Test dynamic scan interval."""
+    prop = copy.deepcopy(PROP)
+    prop.status.in_cleaning = in_cleaning
+    with (
+        patch(
+            "homeassistant.components.roborock.coordinator.RoborockLocalClientV1.get_prop",
+            return_value=prop,
+        ),
+    ):
+        await hass.config_entries.async_setup(mock_roborock_entry.entry_id)
+    assert hass.states.get("sensor.roborock_s7_maxv_battery").state == "100"
+    prop = copy.deepcopy(prop)
+    prop.status.battery = 20
+    with patch(
+        "homeassistant.components.roborock.coordinator.RoborockLocalClientV1.get_prop",
+        return_value=prop,
+    ):
+        async_fire_time_changed(
+            hass, dt_util.utcnow() + interval - timedelta(seconds=5)
+        )
+        assert hass.states.get("sensor.roborock_s7_maxv_battery").state == "100"
+
+        async_fire_time_changed(hass, dt_util.utcnow() + interval)
+
+    assert hass.states.get("sensor.roborock_s7_maxv_battery").state == "20"
diff --git a/tests/components/roborock/test_image.py b/tests/components/roborock/test_image.py
index e240dccf7eb..b7c811e0ce2 100644
--- a/tests/components/roborock/test_image.py
+++ b/tests/components/roborock/test_image.py
@@ -5,11 +5,15 @@ from datetime import timedelta
 from http import HTTPStatus
 from unittest.mock import patch
 
+from PIL import Image
 import pytest
 from roborock import RoborockException
+from vacuum_map_parser_base.map_data import ImageConfig, ImageData
 
 from homeassistant.components.roborock import DOMAIN
-from homeassistant.const import STATE_UNAVAILABLE, Platform
+from homeassistant.components.roborock.const import V1_LOCAL_NOT_CLEANING_INTERVAL
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -32,38 +36,54 @@ async def test_floorplan_image(
     hass_client: ClientSessionGenerator,
 ) -> None:
     """Test floor plan map image is correctly set up."""
-    # Setup calls the image parsing the first time and caches it.
     assert len(hass.states.async_all("image")) == 4
 
     assert hass.states.get("image.roborock_s7_maxv_upstairs") is not None
-    # call a second time -should return cached data
+    # Load the image on demand
     client = await hass_client()
     resp = await client.get("/api/image_proxy/image.roborock_s7_maxv_upstairs")
     assert resp.status == HTTPStatus.OK
     body = await resp.read()
     assert body is not None
-    # Call a third time - this time forcing it to update
-    now = dt_util.utcnow() + timedelta(seconds=91)
+    assert body[0:4] == b"\x89PNG"
+
+    # Call a second time - this time forcing it to update - and save new image
+    now = dt_util.utcnow() + timedelta(minutes=61)
 
     # Copy the device prop so we don't override it
     prop = copy.deepcopy(PROP)
     prop.status.in_cleaning = 1
+    new_map_data = copy.deepcopy(MAP_DATA)
+    new_map_data.image = ImageData(
+        100, 10, 10, 10, 10, ImageConfig(), Image.new("RGB", (2, 2)), lambda p: p
+    )
     with (
         patch(
             "homeassistant.components.roborock.coordinator.RoborockLocalClientV1.get_prop",
             return_value=prop,
         ),
         patch(
-            "homeassistant.components.roborock.image.dt_util.utcnow", return_value=now
+            "homeassistant.components.roborock.coordinator.dt_util.utcnow",
+            return_value=now,
         ),
+        patch(
+            "homeassistant.components.roborock.coordinator.RoborockMapDataParser.parse",
+            return_value=MAP_DATA,
+        ) as parse_map,
     ):
+        # This should call parse_map twice as the both devices are in cleaning.
         async_fire_time_changed(hass, now)
-        await hass.async_block_till_done()
         resp = await client.get("/api/image_proxy/image.roborock_s7_maxv_upstairs")
+        assert resp.status == HTTPStatus.OK
+        resp = await client.get("/api/image_proxy/image.roborock_s7_2_upstairs")
+        assert resp.status == HTTPStatus.OK
+        resp = await client.get("/api/image_proxy/image.roborock_s7_maxv_downstairs")
     assert resp.status == HTTPStatus.OK
     body = await resp.read()
     assert body is not None
 
+    assert parse_map.call_count == 2
+
 
 async def test_floorplan_image_failed_parse(
     hass: HomeAssistant,
@@ -78,10 +98,11 @@ async def test_floorplan_image_failed_parse(
     # Copy the device prop so we don't override it
     prop = copy.deepcopy(PROP)
     prop.status.in_cleaning = 1
+    previous_state = hass.states.get("image.roborock_s7_maxv_upstairs").state
     # Update image, but get none for parse image.
     with (
         patch(
-            "homeassistant.components.roborock.image.RoborockMapDataParser.parse",
+            "homeassistant.components.roborock.coordinator.RoborockMapDataParser.parse",
             return_value=map_data,
         ),
         patch(
@@ -89,12 +110,72 @@ async def test_floorplan_image_failed_parse(
             return_value=prop,
         ),
         patch(
-            "homeassistant.components.roborock.image.dt_util.utcnow", return_value=now
+            "homeassistant.components.roborock.coordinator.dt_util.utcnow",
+            return_value=now,
         ),
     ):
         async_fire_time_changed(hass, now)
         resp = await client.get("/api/image_proxy/image.roborock_s7_maxv_upstairs")
-    assert not resp.ok
+    # The map should load fine from the coordinator, but it should not update the
+    # last_updated timestamp.
+    assert resp.ok
+    assert previous_state == hass.states.get("image.roborock_s7_maxv_upstairs").state
+
+
+async def test_fail_to_save_image(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    mock_roborock_entry: MockConfigEntry,
+    bypass_api_fixture,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test that we gracefully handle a oserror on saving an image."""
+    await async_setup_component(hass, DOMAIN, {})
+    await hass.async_block_till_done()
+
+    # Ensure that map is still working properly.
+    assert hass.states.get("image.roborock_s7_maxv_upstairs") is not None
+    client = await hass_client()
+    resp = await client.get("/api/image_proxy/image.roborock_s7_maxv_upstairs")
+    # Test that we can get the image and it correctly serialized and unserialized.
+    assert resp.status == HTTPStatus.OK
+
+    with patch(
+        "homeassistant.components.roborock.roborock_storage.Path.write_bytes",
+        side_effect=OSError,
+    ):
+        await hass.config_entries.async_unload(mock_roborock_entry.entry_id)
+        assert "Unable to write map file" in caplog.text
+
+        # Config entry is unloaded successfully
+        assert mock_roborock_entry.state is ConfigEntryState.NOT_LOADED
+
+
+async def test_fail_to_load_image(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    setup_entry: MockConfigEntry,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test that we gracefully handle failing to load an image."""
+    with (
+        patch(
+            "homeassistant.components.roborock.roborock_storage.Path.exists",
+            return_value=True,
+        ),
+        patch(
+            "homeassistant.components.roborock.roborock_storage.Path.read_bytes",
+            side_effect=OSError,
+        ) as read_bytes,
+        patch(
+            "homeassistant.components.roborock.coordinator.RoborockDataUpdateCoordinator.refresh_coordinator_map"
+        ),
+    ):
+        # Reload the config entry so that the map is saved in storage and entities exist.
+        await hass.config_entries.async_reload(setup_entry.entry_id)
+        await hass.async_block_till_done()
+        assert read_bytes.call_count == 4
+    assert "Unable to read map file" in caplog.text
 
 
 async def test_fail_parse_on_startup(
@@ -103,11 +184,11 @@ async def test_fail_parse_on_startup(
     mock_roborock_entry: MockConfigEntry,
     bypass_api_fixture,
 ) -> None:
-    """Test that if we fail parsing on startup, we create the entity but set it as unavailable."""
+    """Test that if we fail parsing on startup, we still create the entity."""
     map_data = copy.deepcopy(MAP_DATA)
     map_data.image = None
     with patch(
-        "homeassistant.components.roborock.image.RoborockMapDataParser.parse",
+        "homeassistant.components.roborock.coordinator.RoborockMapDataParser.parse",
         return_value=map_data,
     ):
         await async_setup_component(hass, DOMAIN, {})
@@ -115,7 +196,28 @@ async def test_fail_parse_on_startup(
     assert (
         image_entity := hass.states.get("image.roborock_s7_maxv_upstairs")
     ) is not None
-    assert image_entity.state == STATE_UNAVAILABLE
+    assert image_entity.state
+
+
+async def test_fail_get_map_on_startup(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    mock_roborock_entry: MockConfigEntry,
+    bypass_api_fixture,
+) -> None:
+    """Test that if we fail getting map on startup, we can still create the entity."""
+    with (
+        patch(
+            "homeassistant.components.roborock.coordinator.RoborockMqttClientV1.get_map_v1",
+            return_value=None,
+        ),
+    ):
+        await async_setup_component(hass, DOMAIN, {})
+        await hass.async_block_till_done()
+    assert (
+        image_entity := hass.states.get("image.roborock_s7_maxv_upstairs")
+    ) is not None
+    assert image_entity.state
 
 
 async def test_fail_updating_image(
@@ -132,9 +234,10 @@ async def test_fail_updating_image(
     prop = copy.deepcopy(PROP)
     prop.status.in_cleaning = 1
     # Update image, but get none for parse image.
+    previous_state = hass.states.get("image.roborock_s7_maxv_upstairs").state
     with (
         patch(
-            "homeassistant.components.roborock.image.RoborockMapDataParser.parse",
+            "homeassistant.components.roborock.coordinator.RoborockMapDataParser.parse",
             return_value=map_data,
         ),
         patch(
@@ -142,7 +245,8 @@ async def test_fail_updating_image(
             return_value=prop,
         ),
         patch(
-            "homeassistant.components.roborock.image.dt_util.utcnow", return_value=now
+            "homeassistant.components.roborock.coordinator.dt_util.utcnow",
+            return_value=now,
         ),
         patch(
             "homeassistant.components.roborock.coordinator.RoborockMqttClientV1.get_map_v1",
@@ -151,4 +255,91 @@ async def test_fail_updating_image(
     ):
         async_fire_time_changed(hass, now)
         resp = await client.get("/api/image_proxy/image.roborock_s7_maxv_upstairs")
-    assert not resp.ok
+    # The map should load fine from the coordinator, but it should not update the
+    # last_updated timestamp.
+    assert resp.ok
+    assert previous_state == hass.states.get("image.roborock_s7_maxv_upstairs").state
+
+
+async def test_index_error_map(
+    hass: HomeAssistant,
+    setup_entry: MockConfigEntry,
+    hass_client: ClientSessionGenerator,
+) -> None:
+    """Test that we handle failing getting the image after it has already been setup with a indexerror."""
+    client = await hass_client()
+    now = dt_util.utcnow() + timedelta(seconds=91)
+    # Copy the device prop so we don't override it
+    prop = copy.deepcopy(PROP)
+    prop.status.in_cleaning = 1
+    previous_state = hass.states.get("image.roborock_s7_maxv_upstairs").state
+    # Update image, but get IndexError for image.
+    with (
+        patch(
+            "homeassistant.components.roborock.coordinator.RoborockMapDataParser.parse",
+            side_effect=IndexError,
+        ),
+        patch(
+            "homeassistant.components.roborock.coordinator.RoborockLocalClientV1.get_prop",
+            return_value=prop,
+        ),
+        patch(
+            "homeassistant.components.roborock.coordinator.dt_util.utcnow",
+            return_value=now,
+        ),
+    ):
+        async_fire_time_changed(hass, now)
+        resp = await client.get("/api/image_proxy/image.roborock_s7_maxv_upstairs")
+    # The map should load fine from the coordinator, but it should not update the
+    # last_updated timestamp.
+    assert resp.ok
+    assert previous_state == hass.states.get("image.roborock_s7_maxv_upstairs").state
+
+
+async def test_map_status_change(
+    hass: HomeAssistant,
+    setup_entry: MockConfigEntry,
+    hass_client: ClientSessionGenerator,
+) -> None:
+    """Test floor plan map image is correctly updated on status change."""
+    assert len(hass.states.async_all("image")) == 4
+
+    assert hass.states.get("image.roborock_s7_maxv_upstairs") is not None
+    client = await hass_client()
+    resp = await client.get("/api/image_proxy/image.roborock_s7_maxv_upstairs")
+    assert resp.status == HTTPStatus.OK
+    old_body = await resp.read()
+    assert old_body[0:4] == b"\x89PNG"
+
+    # Call a second time. This interval does not directly trigger a map update, but does
+    # trigger a status update which detects the state has changed and uddates the map
+    now = dt_util.utcnow() + V1_LOCAL_NOT_CLEANING_INTERVAL
+
+    # Copy the device prop so we don't override it
+    prop = copy.deepcopy(PROP)
+    prop.status.state_name = "testing"
+    new_map_data = copy.deepcopy(MAP_DATA)
+    new_map_data.image = ImageData(
+        100, 10, 10, 10, 10, ImageConfig(), Image.new("RGB", (2, 2)), lambda p: p
+    )
+    with (
+        patch(
+            "homeassistant.components.roborock.coordinator.RoborockLocalClientV1.get_prop",
+            return_value=prop,
+        ),
+        patch(
+            "homeassistant.components.roborock.coordinator.dt_util.utcnow",
+            return_value=now,
+        ),
+        patch(
+            "homeassistant.components.roborock.coordinator.RoborockMapDataParser.parse",
+            return_value=new_map_data,
+        ),
+    ):
+        async_fire_time_changed(hass, now)
+        resp = await client.get("/api/image_proxy/image.roborock_s7_maxv_upstairs")
+        assert resp.status == HTTPStatus.OK
+    assert resp.status == HTTPStatus.OK
+    body = await resp.read()
+    assert body is not None
+    assert body != old_body
diff --git a/tests/components/roborock/test_init.py b/tests/components/roborock/test_init.py
index f4f490e68d9..983e3d083f4 100644
--- a/tests/components/roborock/test_init.py
+++ b/tests/components/roborock/test_init.py
@@ -1,6 +1,8 @@
 """Test for Roborock init."""
 
 from copy import deepcopy
+from http import HTTPStatus
+import pathlib
 from unittest.mock import patch
 
 import pytest
@@ -13,12 +15,15 @@ from roborock import (
 
 from homeassistant.components.roborock.const import DOMAIN
 from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import DeviceRegistry
 from homeassistant.setup import async_setup_component
 
-from .mock_data import HOME_DATA
+from .mock_data import HOME_DATA, NETWORK_INFO, NETWORK_INFO_2
 
 from tests.common import MockConfigEntry
+from tests.typing import ClientSessionGenerator
 
 
 async def test_unload_entry(
@@ -163,6 +168,70 @@ async def test_reauth_started(
     assert flows[0]["step_id"] == "reauth_confirm"
 
 
+@pytest.mark.parametrize("platforms", [[Platform.IMAGE]])
+async def test_remove_from_hass(
+    hass: HomeAssistant,
+    bypass_api_fixture,
+    setup_entry: MockConfigEntry,
+    hass_client: ClientSessionGenerator,
+    storage_path: pathlib.Path,
+) -> None:
+    """Test that removing from hass removes any existing images."""
+
+    # Ensure some image content is cached
+    assert hass.states.get("image.roborock_s7_maxv_upstairs") is not None
+    client = await hass_client()
+    resp = await client.get("/api/image_proxy/image.roborock_s7_maxv_upstairs")
+    assert resp.status == HTTPStatus.OK
+
+    config_entry_storage = storage_path / setup_entry.entry_id
+    assert not config_entry_storage.exists()
+
+    # Flush to disk
+    await hass.config_entries.async_unload(setup_entry.entry_id)
+    assert config_entry_storage.exists()
+    paths = list(config_entry_storage.walk())
+    assert len(paths) == 4  # Two map image and two directories
+
+    await hass.config_entries.async_remove(setup_entry.entry_id)
+    # After removal, directories should be empty.
+    assert not config_entry_storage.exists()
+
+
+@pytest.mark.parametrize("platforms", [[Platform.IMAGE]])
+async def test_oserror_remove_image(
+    hass: HomeAssistant,
+    bypass_api_fixture,
+    setup_entry: MockConfigEntry,
+    storage_path: pathlib.Path,
+    hass_client: ClientSessionGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test that we gracefully handle failing to remove an image."""
+
+    # Ensure some image content is cached
+    assert hass.states.get("image.roborock_s7_maxv_upstairs") is not None
+    client = await hass_client()
+    resp = await client.get("/api/image_proxy/image.roborock_s7_maxv_upstairs")
+    assert resp.status == HTTPStatus.OK
+
+    # Image content is saved when unloading
+    config_entry_storage = storage_path / setup_entry.entry_id
+    assert not config_entry_storage.exists()
+    await hass.config_entries.async_unload(setup_entry.entry_id)
+
+    assert config_entry_storage.exists()
+    paths = list(config_entry_storage.walk())
+    assert len(paths) == 4  # Two map image and two directories
+
+    with patch(
+        "homeassistant.components.roborock.roborock_storage.shutil.rmtree",
+        side_effect=OSError,
+    ):
+        await hass.config_entries.async_remove(setup_entry.entry_id)
+    assert "Unable to remove map files" in caplog.text
+
+
 async def test_not_supported_protocol(
     hass: HomeAssistant,
     bypass_api_fixture,
@@ -176,7 +245,7 @@ async def test_not_supported_protocol(
         "homeassistant.components.roborock.RoborockApiClient.get_home_data_v2",
         return_value=home_data_copy,
     ):
-        await async_setup_component(hass, DOMAIN, {})
+        await hass.config_entries.async_setup(mock_roborock_entry.entry_id)
         await hass.async_block_till_done()
     assert "because its protocol version random" in caplog.text
 
@@ -229,3 +298,74 @@ async def test_no_user_agreement(
         await hass.config_entries.async_setup(mock_roborock_entry.entry_id)
         assert mock_roborock_entry.state is ConfigEntryState.SETUP_RETRY
         assert mock_roborock_entry.error_reason_translation_key == "no_user_agreement"
+
+
+async def test_stale_device(
+    hass: HomeAssistant,
+    bypass_api_fixture,
+    mock_roborock_entry: MockConfigEntry,
+    device_registry: DeviceRegistry,
+) -> None:
+    """Test that we remove a device if it no longer is given by home_data."""
+    with patch(
+        "homeassistant.components.roborock.RoborockMqttClientV1.get_networking",
+        side_effect=[NETWORK_INFO, NETWORK_INFO_2],
+    ):
+        await hass.config_entries.async_setup(mock_roborock_entry.entry_id)
+    assert mock_roborock_entry.state is ConfigEntryState.LOADED
+    existing_devices = device_registry.devices.get_devices_for_config_entry_id(
+        mock_roborock_entry.entry_id
+    )
+    assert len(existing_devices) == 6  # 2 for each robot, 1 for A01, 1 for Zeo
+    hd = deepcopy(HOME_DATA)
+    hd.devices = [hd.devices[0]]
+
+    with (
+        patch(
+            "homeassistant.components.roborock.RoborockApiClient.get_home_data_v2",
+            return_value=hd,
+        ),
+        patch(
+            "homeassistant.components.roborock.RoborockMqttClientV1.get_networking",
+            side_effect=[NETWORK_INFO, NETWORK_INFO_2],
+        ),
+    ):
+        await hass.config_entries.async_reload(mock_roborock_entry.entry_id)
+        await hass.async_block_till_done()
+    new_devices = device_registry.devices.get_devices_for_config_entry_id(
+        mock_roborock_entry.entry_id
+    )
+    assert (
+        len(new_devices) == 4
+    )  # 2 for the one remaining robot. 1 for both the A01s which are shared and
+    # therefore not deleted.
+
+
+async def test_no_stale_device(
+    hass: HomeAssistant,
+    bypass_api_fixture,
+    mock_roborock_entry: MockConfigEntry,
+    device_registry: DeviceRegistry,
+) -> None:
+    """Test that we don't remove a device if fails to setup."""
+    with patch(
+        "homeassistant.components.roborock.RoborockMqttClientV1.get_networking",
+        side_effect=[NETWORK_INFO, NETWORK_INFO_2],
+    ):
+        await hass.config_entries.async_setup(mock_roborock_entry.entry_id)
+    assert mock_roborock_entry.state is ConfigEntryState.LOADED
+    existing_devices = device_registry.devices.get_devices_for_config_entry_id(
+        mock_roborock_entry.entry_id
+    )
+    assert len(existing_devices) == 6  # 2 for each robot, 1 for A01, 1 for Zeo
+
+    with patch(
+        "homeassistant.components.roborock.RoborockMqttClientV1.get_networking",
+        side_effect=[NETWORK_INFO, RoborockException],
+    ):
+        await hass.config_entries.async_reload(mock_roborock_entry.entry_id)
+        await hass.async_block_till_done()
+    new_devices = device_registry.devices.get_devices_for_config_entry_id(
+        mock_roborock_entry.entry_id
+    )
+    assert len(new_devices) == 6  # 2 for each robot, 1 for A01, 1 for Zeo
diff --git a/tests/components/roborock/test_sensor.py b/tests/components/roborock/test_sensor.py
index e33d3aa78d5..719b398de94 100644
--- a/tests/components/roborock/test_sensor.py
+++ b/tests/components/roborock/test_sensor.py
@@ -29,7 +29,7 @@ def platforms() -> list[Platform]:
 
 async def test_sensors(hass: HomeAssistant, setup_entry: MockConfigEntry) -> None:
     """Test sensors and check test values are correctly set."""
-    assert len(hass.states.async_all("sensor")) == 40
+    assert len(hass.states.async_all("sensor")) == 42
     assert hass.states.get("sensor.roborock_s7_maxv_main_brush_time_left").state == str(
         MAIN_BRUSH_REPLACE_TIME - 74382
     )
@@ -53,7 +53,7 @@ async def test_sensors(hass: HomeAssistant, setup_entry: MockConfigEntry) -> Non
     assert hass.states.get("sensor.roborock_s7_maxv_cleaning_area").state == "21.0"
     assert hass.states.get("sensor.roborock_s7_maxv_vacuum_error").state == "none"
     assert hass.states.get("sensor.roborock_s7_maxv_battery").state == "100"
-    assert hass.states.get("sensor.roborock_s7_maxv_dock_error").state == "ok"
+    assert hass.states.get("sensor.roborock_s7_maxv_dock_dock_error").state == "ok"
     assert hass.states.get("sensor.roborock_s7_maxv_total_cleaning_count").state == "31"
     assert (
         hass.states.get("sensor.roborock_s7_maxv_last_clean_begin").state
@@ -63,6 +63,10 @@ async def test_sensors(hass: HomeAssistant, setup_entry: MockConfigEntry) -> Non
         hass.states.get("sensor.roborock_s7_maxv_last_clean_end").state
         == "2023-01-01T03:43:58+00:00"
     )
+    assert (
+        hass.states.get("sensor.roborock_s7_maxv_current_room").state
+        == "Example room 2"
+    )
     assert hass.states.get("sensor.dyad_pro_status").state == "drying"
     assert hass.states.get("sensor.dyad_pro_battery").state == "100"
     assert hass.states.get("sensor.dyad_pro_filter_time_left").state == "111"
diff --git a/tests/components/roborock/test_switch.py b/tests/components/roborock/test_switch.py
index 2476bfe497c..120c4fc4860 100644
--- a/tests/components/roborock/test_switch.py
+++ b/tests/components/roborock/test_switch.py
@@ -1,6 +1,6 @@
 """Test Roborock Switch platform."""
 
-from unittest.mock import patch
+from unittest.mock import Mock
 
 import pytest
 import roborock
@@ -22,13 +22,14 @@ def platforms() -> list[Platform]:
 @pytest.mark.parametrize(
     ("entity_id"),
     [
-        ("switch.roborock_s7_maxv_child_lock"),
-        ("switch.roborock_s7_maxv_status_indicator_light"),
+        ("switch.roborock_s7_maxv_dock_child_lock"),
+        ("switch.roborock_s7_maxv_dock_status_indicator_light"),
         ("switch.roborock_s7_maxv_do_not_disturb"),
     ],
 )
 async def test_update_success(
     hass: HomeAssistant,
+    mock_send_message: Mock,
     bypass_api_fixture,
     setup_entry: MockConfigEntry,
     entity_id: str,
@@ -36,39 +37,38 @@ async def test_update_success(
     """Test turning switch entities on and off."""
     # Ensure that the entity exist, as these test can pass even if there is no entity.
     assert hass.states.get(entity_id) is not None
-    with patch(
-        "homeassistant.components.roborock.coordinator.RoborockLocalClientV1._send_command"
-    ) as mock_send_message:
-        await hass.services.async_call(
-            "switch",
-            SERVICE_TURN_ON,
-            service_data=None,
-            blocking=True,
-            target={"entity_id": entity_id},
-        )
+    await hass.services.async_call(
+        "switch",
+        SERVICE_TURN_ON,
+        service_data=None,
+        blocking=True,
+        target={"entity_id": entity_id},
+    )
     assert mock_send_message.assert_called_once
-    with patch(
-        "homeassistant.components.roborock.coordinator.RoborockLocalClientV1.send_message"
-    ) as mock_send_message:
-        await hass.services.async_call(
-            "switch",
-            SERVICE_TURN_OFF,
-            service_data=None,
-            blocking=True,
-            target={"entity_id": entity_id},
-        )
+    mock_send_message.reset_mock()
+    await hass.services.async_call(
+        "switch",
+        SERVICE_TURN_OFF,
+        service_data=None,
+        blocking=True,
+        target={"entity_id": entity_id},
+    )
     assert mock_send_message.assert_called_once
 
 
 @pytest.mark.parametrize(
     ("entity_id", "service"),
     [
-        ("switch.roborock_s7_maxv_status_indicator_light", SERVICE_TURN_ON),
-        ("switch.roborock_s7_maxv_status_indicator_light", SERVICE_TURN_OFF),
+        ("switch.roborock_s7_maxv_dock_status_indicator_light", SERVICE_TURN_ON),
+        ("switch.roborock_s7_maxv_dock_status_indicator_light", SERVICE_TURN_OFF),
     ],
 )
+@pytest.mark.parametrize(
+    "send_message_side_effect", [roborock.exceptions.RoborockTimeout]
+)
 async def test_update_failed(
     hass: HomeAssistant,
+    mock_send_message: Mock,
     bypass_api_fixture,
     setup_entry: MockConfigEntry,
     entity_id: str,
@@ -78,10 +78,6 @@ async def test_update_failed(
     # Ensure that the entity exist, as these test can pass even if there is no entity.
     assert hass.states.get(entity_id) is not None
     with (
-        patch(
-            "homeassistant.components.roborock.coordinator.RoborockLocalClientV1._send_command",
-            side_effect=roborock.exceptions.RoborockTimeout,
-        ) as mock_send_message,
         pytest.raises(HomeAssistantError, match="Failed to update Roborock options"),
     ):
         await hass.services.async_call(
diff --git a/tests/components/roborock/test_time.py b/tests/components/roborock/test_time.py
index eb48e8e537f..9c0a53893ed 100644
--- a/tests/components/roborock/test_time.py
+++ b/tests/components/roborock/test_time.py
@@ -1,7 +1,7 @@
 """Test Roborock Time platform."""
 
 from datetime import time
-from unittest.mock import patch
+from unittest.mock import Mock
 
 import pytest
 import roborock
@@ -29,6 +29,7 @@ def platforms() -> list[Platform]:
 )
 async def test_update_success(
     hass: HomeAssistant,
+    mock_send_message: Mock,
     bypass_api_fixture,
     setup_entry: MockConfigEntry,
     entity_id: str,
@@ -36,16 +37,13 @@ async def test_update_success(
     """Test turning switch entities on and off."""
     # Ensure that the entity exist, as these test can pass even if there is no entity.
     assert hass.states.get(entity_id) is not None
-    with patch(
-        "homeassistant.components.roborock.coordinator.RoborockLocalClientV1._send_command"
-    ) as mock_send_message:
-        await hass.services.async_call(
-            "time",
-            SERVICE_SET_VALUE,
-            service_data={"time": time(hour=1, minute=1)},
-            blocking=True,
-            target={"entity_id": entity_id},
-        )
+    await hass.services.async_call(
+        "time",
+        SERVICE_SET_VALUE,
+        service_data={"time": time(hour=1, minute=1)},
+        blocking=True,
+        target={"entity_id": entity_id},
+    )
     assert mock_send_message.assert_called_once
 
 
@@ -55,8 +53,12 @@ async def test_update_success(
         ("time.roborock_s7_maxv_do_not_disturb_begin"),
     ],
 )
+@pytest.mark.parametrize(
+    "send_message_side_effect", [roborock.exceptions.RoborockTimeout]
+)
 async def test_update_failure(
     hass: HomeAssistant,
+    mock_send_message: Mock,
     bypass_api_fixture,
     setup_entry: MockConfigEntry,
     entity_id: str,
@@ -64,13 +66,7 @@ async def test_update_failure(
     """Test turning switch entities on and off."""
     # Ensure that the entity exist, as these test can pass even if there is no entity.
     assert hass.states.get(entity_id) is not None
-    with (
-        patch(
-            "homeassistant.components.roborock.coordinator.RoborockLocalClientV1._send_command",
-            side_effect=roborock.exceptions.RoborockTimeout,
-        ) as mock_send_message,
-        pytest.raises(HomeAssistantError, match="Failed to update Roborock options"),
-    ):
+    with pytest.raises(HomeAssistantError, match="Failed to update Roborock options"):
         await hass.services.async_call(
             "time",
             SERVICE_SET_VALUE,
diff --git a/tests/components/roborock/test_vacuum.py b/tests/components/roborock/test_vacuum.py
index d9d4340ec83..5d6e7a599bd 100644
--- a/tests/components/roborock/test_vacuum.py
+++ b/tests/components/roborock/test_vacuum.py
@@ -117,6 +117,30 @@ async def test_commands(
         assert mock_send_command.call_args[0][1] == called_params
 
 
+async def test_cloud_command(
+    hass: HomeAssistant,
+    bypass_api_fixture,
+    setup_entry: MockConfigEntry,
+) -> None:
+    """Test sending commands to the vacuum."""
+
+    vacuum = hass.states.get(ENTITY_ID)
+    assert vacuum
+
+    data = {ATTR_ENTITY_ID: ENTITY_ID, "command": "get_map_v1"}
+    with patch(
+        "homeassistant.components.roborock.coordinator.RoborockMqttClientV1.send_command"
+    ) as mock_send_command:
+        await hass.services.async_call(
+            Platform.VACUUM,
+            SERVICE_SEND_COMMAND,
+            data,
+            blocking=True,
+        )
+        assert mock_send_command.call_count == 1
+        assert mock_send_command.call_args[0][0] == RoborockCommand.GET_MAP_V1
+
+
 @pytest.mark.parametrize(
     ("in_cleaning_int", "expected_command"),
     [
@@ -237,7 +261,7 @@ async def test_get_current_position(
             return_value=b"",
         ),
         patch(
-            "homeassistant.components.roborock.image.RoborockMapDataParser.parse",
+            "homeassistant.components.roborock.coordinator.RoborockMapDataParser.parse",
             return_value=map_data,
         ),
     ):
@@ -267,7 +291,9 @@ async def test_get_current_position_no_map_data(
             "homeassistant.components.roborock.coordinator.RoborockMqttClientV1.get_map_v1",
             return_value=None,
         ),
-        pytest.raises(HomeAssistantError, match="Failed to retrieve map data."),
+        pytest.raises(
+            HomeAssistantError, match="Something went wrong creating the map"
+        ),
     ):
         await hass.services.async_call(
             DOMAIN,
@@ -292,7 +318,7 @@ async def test_get_current_position_no_robot_position(
             return_value=b"",
         ),
         patch(
-            "homeassistant.components.roborock.image.RoborockMapDataParser.parse",
+            "homeassistant.components.roborock.coordinator.RoborockMapDataParser.parse",
             return_value=map_data,
         ),
         pytest.raises(HomeAssistantError, match="Robot position not found"),
diff --git a/tests/components/roku/test_binary_sensor.py b/tests/components/roku/test_binary_sensor.py
index ad27a857101..c3aec4f0968 100644
--- a/tests/components/roku/test_binary_sensor.py
+++ b/tests/components/roku/test_binary_sensor.py
@@ -50,7 +50,7 @@ async def test_roku_binary_sensors(
     assert entry.unique_id == f"{UPNP_SERIAL}_supports_ethernet"
     assert entry.entity_category == EntityCategory.DIAGNOSTIC
     assert state.state == STATE_ON
-    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "My Roku 3 Supports ethernet"
+    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "My Roku 3 Supports Ethernet"
     assert ATTR_DEVICE_CLASS not in state.attributes
 
     state = hass.states.get("binary_sensor.my_roku_3_supports_find_remote")
@@ -125,7 +125,7 @@ async def test_rokutv_binary_sensors(
     assert entry.entity_category == EntityCategory.DIAGNOSTIC
     assert state.state == STATE_ON
     assert (
-        state.attributes.get(ATTR_FRIENDLY_NAME) == '58" Onn Roku TV Supports ethernet'
+        state.attributes.get(ATTR_FRIENDLY_NAME) == '58" Onn Roku TV Supports Ethernet'
     )
     assert ATTR_DEVICE_CLASS not in state.attributes
 
diff --git a/tests/components/roku/test_select.py b/tests/components/roku/test_select.py
index 78cd65250f8..a79a23782ce 100644
--- a/tests/components/roku/test_select.py
+++ b/tests/components/roku/test_select.py
@@ -22,7 +22,7 @@ from homeassistant.const import ATTR_ENTITY_ID, SERVICE_SELECT_OPTION
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/rova/snapshots/test_init.ambr b/tests/components/rova/snapshots/test_init.ambr
index 5e607e6a8df..8eb77006061 100644
--- a/tests/components/rova/snapshots/test_init.ambr
+++ b/tests/components/rova/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/rova/snapshots/test_sensor.ambr b/tests/components/rova/snapshots/test_sensor.ambr
index 866f1c735c1..90cf29a1b89 100644
--- a/tests/components/rova/snapshots/test_sensor.ambr
+++ b/tests/components/rova/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/russound_rio/snapshots/test_init.ambr b/tests/components/russound_rio/snapshots/test_init.ambr
index c92f06c4bc0..e3185a06b24 100644
--- a/tests/components/russound_rio/snapshots/test_init.ambr
+++ b/tests/components/russound_rio/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://192.168.20.75',
     'connections': set({
       tuple(
diff --git a/tests/components/sabnzbd/snapshots/test_binary_sensor.ambr b/tests/components/sabnzbd/snapshots/test_binary_sensor.ambr
index 9f3087df3d1..1feaece1c3e 100644
--- a/tests/components/sabnzbd/snapshots/test_binary_sensor.ambr
+++ b/tests/components/sabnzbd/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/sabnzbd/snapshots/test_button.ambr b/tests/components/sabnzbd/snapshots/test_button.ambr
index 9b965e10518..f09bb44e8e4 100644
--- a/tests/components/sabnzbd/snapshots/test_button.ambr
+++ b/tests/components/sabnzbd/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/sabnzbd/snapshots/test_number.ambr b/tests/components/sabnzbd/snapshots/test_number.ambr
index 6a370797264..623002470b7 100644
--- a/tests/components/sabnzbd/snapshots/test_number.ambr
+++ b/tests/components/sabnzbd/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/sabnzbd/snapshots/test_sensor.ambr b/tests/components/sabnzbd/snapshots/test_sensor.ambr
index 8b977e69aa6..893d270a569 100644
--- a/tests/components/sabnzbd/snapshots/test_sensor.ambr
+++ b/tests/components/sabnzbd/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -62,6 +63,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -113,6 +115,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -164,6 +167,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -218,6 +222,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -272,6 +277,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -323,6 +329,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -375,6 +382,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -430,6 +438,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -478,6 +487,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -529,6 +539,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/samsungtv/conftest.py b/tests/components/samsungtv/conftest.py
index ec12031ef96..105ef0f25ad 100644
--- a/tests/components/samsungtv/conftest.py
+++ b/tests/components/samsungtv/conftest.py
@@ -21,7 +21,7 @@ from samsungtvws.exceptions import ResponseError
 from samsungtvws.remote import ChannelEmitCommand
 
 from homeassistant.components.samsungtv.const import WEBSOCKET_SSL_PORT
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import SAMPLE_DEVICE_INFO_UE48JU6400, SAMPLE_DEVICE_INFO_WIFI
 
diff --git a/tests/components/samsungtv/snapshots/test_init.ambr b/tests/components/samsungtv/snapshots/test_init.ambr
index 017a2bc3e60..ad01b5454ff 100644
--- a/tests/components/samsungtv/snapshots/test_init.ambr
+++ b/tests/components/samsungtv/snapshots/test_init.ambr
@@ -4,6 +4,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
         tuple(
@@ -46,6 +47,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
         tuple(
@@ -115,6 +117,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/samsungtv/test_diagnostics.py b/tests/components/samsungtv/test_diagnostics.py
index 0319d5dd8dd..e8e0b699a7e 100644
--- a/tests/components/samsungtv/test_diagnostics.py
+++ b/tests/components/samsungtv/test_diagnostics.py
@@ -51,6 +51,7 @@ async def test_entry_diagnostics(
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "source": "user",
+            "subentries": [],
             "title": "Mock Title",
             "unique_id": "any",
             "version": 2,
@@ -91,6 +92,7 @@ async def test_entry_diagnostics_encrypted(
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "source": "user",
+            "subentries": [],
             "title": "Mock Title",
             "unique_id": "any",
             "version": 2,
@@ -130,6 +132,7 @@ async def test_entry_diagnostics_encrypte_offline(
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "source": "user",
+            "subentries": [],
             "title": "Mock Title",
             "unique_id": "any",
             "version": 2,
diff --git a/tests/components/samsungtv/test_media_player.py b/tests/components/samsungtv/test_media_player.py
index 1a7c8713b17..3d9633bbf96 100644
--- a/tests/components/samsungtv/test_media_player.py
+++ b/tests/components/samsungtv/test_media_player.py
@@ -78,7 +78,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceNotSupported
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import async_wait_config_entry_reload, setup_samsungtv_entry
 from .const import (
diff --git a/tests/components/sanix/snapshots/test_sensor.ambr b/tests/components/sanix/snapshots/test_sensor.ambr
index 84c97ce68b1..6cf0254b66b 100644
--- a/tests/components/sanix/snapshots/test_sensor.ambr
+++ b/tests/components/sanix/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -57,6 +58,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -105,6 +107,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -156,6 +159,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -204,6 +208,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -251,6 +256,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/schedule/snapshots/test_init.ambr b/tests/components/schedule/snapshots/test_init.ambr
new file mode 100644
index 00000000000..93cde4f5733
--- /dev/null
+++ b/tests/components/schedule/snapshots/test_init.ambr
@@ -0,0 +1,59 @@
+# serializer version: 1
+# name: test_service_get[schedule.from_storage-get-after-update]
+  dict({
+    'friday': list([
+    ]),
+    'monday': list([
+    ]),
+    'saturday': list([
+    ]),
+    'sunday': list([
+    ]),
+    'thursday': list([
+    ]),
+    'tuesday': list([
+    ]),
+    'wednesday': list([
+      dict({
+        'from': datetime.time(17, 0),
+        'to': datetime.time(19, 0),
+      }),
+    ]),
+  })
+# ---
+# name: test_service_get[schedule.from_storage-get]
+  dict({
+    'friday': list([
+      dict({
+        'data': dict({
+          'party_level': 'epic',
+        }),
+        'from': datetime.time(17, 0),
+        'to': datetime.time(23, 59, 59),
+      }),
+    ]),
+    'monday': list([
+    ]),
+    'saturday': list([
+      dict({
+        'from': datetime.time(0, 0),
+        'to': datetime.time(23, 59, 59),
+      }),
+    ]),
+    'sunday': list([
+      dict({
+        'data': dict({
+          'entry': 'VIPs only',
+        }),
+        'from': datetime.time(0, 0),
+        'to': datetime.time(23, 59, 59, 999999),
+      }),
+    ]),
+    'thursday': list([
+    ]),
+    'tuesday': list([
+    ]),
+    'wednesday': list([
+    ]),
+  })
+# ---
diff --git a/tests/components/schedule/test_init.py b/tests/components/schedule/test_init.py
index 18346122bfd..fef2ff745cd 100644
--- a/tests/components/schedule/test_init.py
+++ b/tests/components/schedule/test_init.py
@@ -8,10 +8,12 @@ from unittest.mock import patch
 
 from freezegun.api import FrozenDateTimeFactory
 import pytest
+from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components.schedule import STORAGE_VERSION, STORAGE_VERSION_MINOR
 from homeassistant.components.schedule.const import (
     ATTR_NEXT_EVENT,
+    CONF_ALL_DAYS,
     CONF_DATA,
     CONF_FRIDAY,
     CONF_FROM,
@@ -23,12 +25,14 @@ from homeassistant.components.schedule.const import (
     CONF_TUESDAY,
     CONF_WEDNESDAY,
     DOMAIN,
+    SERVICE_GET,
 )
 from homeassistant.const import (
     ATTR_EDITABLE,
     ATTR_FRIENDLY_NAME,
     ATTR_ICON,
     ATTR_NAME,
+    CONF_ENTITY_ID,
     CONF_ICON,
     CONF_ID,
     CONF_NAME,
@@ -754,3 +758,66 @@ async def test_ws_create(
     assert result["party_mode"][CONF_MONDAY] == [
         {CONF_FROM: "12:00:00", CONF_TO: saved_to}
     ]
+
+
+async def test_service_get(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    snapshot: SnapshotAssertion,
+    schedule_setup: Callable[..., Coroutine[Any, Any, bool]],
+) -> None:
+    """Test getting a single schedule via service."""
+    assert await schedule_setup()
+
+    entity_id = "schedule.from_storage"
+
+    # Test retrieving a single schedule via service call
+    service_result = await hass.services.async_call(
+        DOMAIN,
+        SERVICE_GET,
+        {
+            CONF_ENTITY_ID: entity_id,
+        },
+        blocking=True,
+        return_response=True,
+    )
+    result = service_result.get(entity_id)
+
+    assert set(result) == CONF_ALL_DAYS
+    assert result == snapshot(name=f"{entity_id}-get")
+
+    # Now we update the schedule via WS
+    client = await hass_ws_client(hass)
+    await client.send_json(
+        {
+            "id": 1,
+            "type": f"{DOMAIN}/update",
+            f"{DOMAIN}_id": entity_id.rsplit(".", maxsplit=1)[-1],
+            CONF_NAME: "Party pooper",
+            CONF_ICON: "mdi:party-pooper",
+            CONF_MONDAY: [],
+            CONF_TUESDAY: [],
+            CONF_WEDNESDAY: [{CONF_FROM: "17:00:00", CONF_TO: "19:00:00"}],
+            CONF_THURSDAY: [],
+            CONF_FRIDAY: [],
+            CONF_SATURDAY: [],
+            CONF_SUNDAY: [],
+        }
+    )
+    resp = await client.receive_json()
+    assert resp["success"]
+
+    # Test retrieving the schedule via service call after WS update
+    service_result = await hass.services.async_call(
+        DOMAIN,
+        SERVICE_GET,
+        {
+            CONF_ENTITY_ID: entity_id,
+        },
+        blocking=True,
+        return_response=True,
+    )
+    result = service_result.get(entity_id)
+
+    assert set(result) == CONF_ALL_DAYS
+    assert result == snapshot(name=f"{entity_id}-get-after-update")
diff --git a/tests/components/schlage/snapshots/test_init.ambr b/tests/components/schlage/snapshots/test_init.ambr
index c7049443ab7..a7f94b80038 100644
--- a/tests/components/schlage/snapshots/test_init.ambr
+++ b/tests/components/schlage/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/schlage/test_init.py b/tests/components/schlage/test_init.py
index 57a139e582e..97da66c7e93 100644
--- a/tests/components/schlage/test_init.py
+++ b/tests/components/schlage/test_init.py
@@ -12,7 +12,7 @@ from syrupy.assertion import SnapshotAssertion
 from homeassistant.components.schlage.const import DOMAIN, UPDATE_INTERVAL
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceRegistry
 
 from . import MockSchlageConfigEntry
diff --git a/tests/components/screenlogic/snapshots/test_diagnostics.ambr b/tests/components/screenlogic/snapshots/test_diagnostics.ambr
index 237d3eab257..c7db7a33959 100644
--- a/tests/components/screenlogic/snapshots/test_diagnostics.ambr
+++ b/tests/components/screenlogic/snapshots/test_diagnostics.ambr
@@ -18,6 +18,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Pentair: DD-EE-FF',
       'unique_id': 'aa:bb:cc:dd:ee:ff',
       'version': 1,
diff --git a/tests/components/screenlogic/test_config_flow.py b/tests/components/screenlogic/test_config_flow.py
index 5ce777a47fa..ad8ef125dac 100644
--- a/tests/components/screenlogic/test_config_flow.py
+++ b/tests/components/screenlogic/test_config_flow.py
@@ -86,6 +86,53 @@ async def test_flow_discover_none(hass: HomeAssistant) -> None:
     assert result["step_id"] == "gateway_entry"
 
 
+async def test_flow_replace_ignored(hass: HomeAssistant) -> None:
+    """Test we can replace ignored entries."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id="00:c0:33:01:01:01",
+        source=config_entries.SOURCE_IGNORE,
+    )
+    entry.add_to_hass(hass)
+
+    with patch(
+        "homeassistant.components.screenlogic.config_flow.discovery.async_discover",
+        return_value=[
+            {
+                SL_GATEWAY_IP: "1.1.1.1",
+                SL_GATEWAY_PORT: 80,
+                SL_GATEWAY_TYPE: 12,
+                SL_GATEWAY_SUBTYPE: 2,
+                SL_GATEWAY_NAME: "Pentair: 01-01-01",
+            },
+        ],
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": config_entries.SOURCE_USER}
+        )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {}
+    assert result["step_id"] == "gateway_select"
+
+    with patch(
+        "homeassistant.components.screenlogic.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input={GATEWAY_SELECT_KEY: "00:c0:33:01:01:01"}
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "Pentair: 01-01-01"
+    assert result2["data"] == {
+        CONF_IP_ADDRESS: "1.1.1.1",
+        CONF_PORT: 80,
+    }
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
 async def test_flow_discover_error(hass: HomeAssistant) -> None:
     """Test when discovery errors."""
 
diff --git a/tests/components/script/test_init.py b/tests/components/script/test_init.py
index 248ada605cc..3b0bff7e82e 100644
--- a/tests/components/script/test_init.py
+++ b/tests/components/script/test_init.py
@@ -42,8 +42,7 @@ from homeassistant.helpers.script import (
 )
 from homeassistant.helpers.service import async_get_all_descriptions
 from homeassistant.setup import async_setup_component
-from homeassistant.util import yaml as yaml_util
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util, yaml as yaml_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/sense/snapshots/test_binary_sensor.ambr b/tests/components/sense/snapshots/test_binary_sensor.ambr
index 339830b16d3..7221a0bc518 100644
--- a/tests/components/sense/snapshots/test_binary_sensor.ambr
+++ b/tests/components/sense/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -55,6 +56,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/sense/snapshots/test_sensor.ambr b/tests/components/sense/snapshots/test_sensor.ambr
index 4a3507880a1..0a68553cf04 100644
--- a/tests/components/sense/snapshots/test_sensor.ambr
+++ b/tests/components/sense/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -64,6 +65,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -120,6 +122,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -176,6 +179,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -229,6 +233,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -285,6 +290,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -341,6 +347,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -397,6 +404,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -453,6 +461,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -509,6 +518,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -562,6 +572,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -618,6 +629,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -674,6 +686,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -727,6 +740,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -780,6 +794,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -831,6 +846,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -881,6 +897,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -932,6 +949,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -982,6 +1000,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1035,6 +1054,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1088,6 +1108,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1141,6 +1162,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1192,6 +1214,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1242,6 +1265,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1293,6 +1317,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1343,6 +1368,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1396,6 +1422,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1448,6 +1475,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1500,6 +1528,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1552,6 +1581,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1605,6 +1635,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1658,6 +1689,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1709,6 +1741,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1759,6 +1792,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1810,6 +1844,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1860,6 +1895,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1913,6 +1949,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1965,6 +2002,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2018,6 +2056,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2071,6 +2110,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2122,6 +2162,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2172,6 +2213,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2223,6 +2265,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2273,6 +2316,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2326,6 +2370,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2379,6 +2424,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2432,6 +2478,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2483,6 +2530,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2533,6 +2581,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2584,6 +2633,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2634,6 +2684,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/sensibo/snapshots/test_binary_sensor.ambr b/tests/components/sensibo/snapshots/test_binary_sensor.ambr
index 110a6ae8174..2e62c73acb4 100644
--- a/tests/components/sensibo/snapshots/test_binary_sensor.ambr
+++ b/tests/components/sensibo/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -194,6 +198,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -241,6 +246,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -288,6 +294,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -335,6 +342,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -381,6 +389,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -428,6 +437,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -475,6 +485,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -522,6 +533,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -569,6 +581,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -616,6 +629,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -663,6 +677,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/sensibo/snapshots/test_button.ambr b/tests/components/sensibo/snapshots/test_button.ambr
index 7ef6d56c714..6bfc4a5a44f 100644
--- a/tests/components/sensibo/snapshots/test_button.ambr
+++ b/tests/components/sensibo/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/sensibo/snapshots/test_climate.ambr b/tests/components/sensibo/snapshots/test_climate.ambr
index 5bcfae0917e..e3bd456ad23 100644
--- a/tests/components/sensibo/snapshots/test_climate.ambr
+++ b/tests/components/sensibo/snapshots/test_climate.ambr
@@ -13,6 +13,7 @@
       'target_temp_step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -94,6 +95,7 @@
       'target_temp_step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -185,6 +187,7 @@
       'target_temp_step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/sensibo/snapshots/test_entity.ambr b/tests/components/sensibo/snapshots/test_entity.ambr
index 23ead2f6d96..80ee847cb55 100644
--- a/tests/components/sensibo/snapshots/test_entity.ambr
+++ b/tests/components/sensibo/snapshots/test_entity.ambr
@@ -4,6 +4,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': 'hallway',
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': 'https://home.sensibo.com/',
       'connections': set({
         tuple(
@@ -38,6 +39,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': 'kitchen',
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': 'https://home.sensibo.com/',
       'connections': set({
         tuple(
@@ -72,6 +74,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': 'bedroom',
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': 'https://home.sensibo.com/',
       'connections': set({
         tuple(
@@ -106,6 +109,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': 'https://home.sensibo.com/',
       'connections': set({
       }),
diff --git a/tests/components/sensibo/snapshots/test_number.ambr b/tests/components/sensibo/snapshots/test_number.ambr
index b632b95f1be..458c7ca7183 100644
--- a/tests/components/sensibo/snapshots/test_number.ambr
+++ b/tests/components/sensibo/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -68,6 +69,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -125,6 +127,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -182,6 +185,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -239,6 +243,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -296,6 +301,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/sensibo/snapshots/test_select.ambr b/tests/components/sensibo/snapshots/test_select.ambr
index 7438fb70140..05582a1ea16 100644
--- a/tests/components/sensibo/snapshots/test_select.ambr
+++ b/tests/components/sensibo/snapshots/test_select.ambr
@@ -11,6 +11,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -67,6 +68,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/sensibo/snapshots/test_sensor.ambr b/tests/components/sensibo/snapshots/test_sensor.ambr
index 31e579d9929..bfd5f2d3e9a 100644
--- a/tests/components/sensibo/snapshots/test_sensor.ambr
+++ b/tests/components/sensibo/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -111,6 +113,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -159,6 +162,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -218,6 +222,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -275,6 +280,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -321,6 +327,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -370,6 +377,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -421,6 +429,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -472,6 +481,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -523,6 +533,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -574,6 +585,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -623,6 +635,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -672,6 +685,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -725,6 +739,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -777,6 +792,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/sensibo/snapshots/test_switch.ambr b/tests/components/sensibo/snapshots/test_switch.ambr
index 13cb73cef7a..e0ea140eb37 100644
--- a/tests/components/sensibo/snapshots/test_switch.ambr
+++ b/tests/components/sensibo/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -101,6 +103,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/sensibo/snapshots/test_update.ambr b/tests/components/sensibo/snapshots/test_update.ambr
index 3eb69c9a812..c113d5615b1 100644
--- a/tests/components/sensibo/snapshots/test_update.ambr
+++ b/tests/components/sensibo/snapshots/test_update.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -65,6 +66,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -124,6 +126,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/sensibo/test_coordinator.py b/tests/components/sensibo/test_coordinator.py
index 6cb8e6fe923..2d56fc4c51c 100644
--- a/tests/components/sensibo/test_coordinator.py
+++ b/tests/components/sensibo/test_coordinator.py
@@ -9,6 +9,7 @@ from unittest.mock import MagicMock
 from freezegun.api import FrozenDateTimeFactory
 from pysensibo.exceptions import AuthenticationError, SensiboError
 from pysensibo.model import SensiboData
+import pytest
 
 from homeassistant.components.climate import HVACMode
 from homeassistant.components.sensibo.const import DOMAIN
@@ -25,6 +26,7 @@ async def test_coordinator(
     mock_client: MagicMock,
     get_data: tuple[SensiboData, dict[str, Any], dict[str, Any]],
     freezer: FrozenDateTimeFactory,
+    caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test the Sensibo coordinator with errors."""
     config_entry = MockConfigEntry(
@@ -87,3 +89,5 @@ async def test_coordinator(
     mock_data.assert_called_once()
     state = hass.states.get("climate.hallway")
     assert state.state == STATE_UNAVAILABLE
+
+    assert "Platform sensibo does not generate unique IDs" not in caplog.text
diff --git a/tests/components/sensor/test_device_trigger.py b/tests/components/sensor/test_device_trigger.py
index f50e92bc9df..f35c9520f71 100644
--- a/tests/components/sensor/test_device_trigger.py
+++ b/tests/components/sensor/test_device_trigger.py
@@ -21,7 +21,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.json import load_json
 
 from .common import UNITS_OF_MEASUREMENT, MockSensor
diff --git a/tests/components/sensor/test_init.py b/tests/components/sensor/test_init.py
index 604cd91770e..9666e29579b 100644
--- a/tests/components/sensor/test_init.py
+++ b/tests/components/sensor/test_init.py
@@ -24,6 +24,7 @@ from homeassistant.components.sensor import (
     async_rounded_state,
     async_update_suggested_units,
 )
+from homeassistant.components.sensor.const import STATE_CLASS_UNITS
 from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.const import (
     ATTR_UNIT_OF_MEASUREMENT,
@@ -45,7 +46,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import STORAGE_KEY as RESTORE_STATE_KEY
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -2005,6 +2006,7 @@ async def test_non_numeric_device_class_with_unit_of_measurement(
         SensorDeviceClass.VOLUME,
         SensorDeviceClass.WATER,
         SensorDeviceClass.WEIGHT,
+        SensorDeviceClass.WIND_DIRECTION,
         SensorDeviceClass.WIND_SPEED,
     ],
 )
@@ -2035,6 +2037,37 @@ async def test_device_classes_with_invalid_unit_of_measurement(
     ) in caplog.text
 
 
+@pytest.mark.parametrize(
+    "state_class",
+    [SensorStateClass.MEASUREMENT_ANGLE],
+)
+async def test_state_classes_with_invalid_unit_of_measurement(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    state_class: SensorStateClass,
+) -> None:
+    """Test error when unit of measurement is not valid for used state class."""
+    entity0 = MockSensor(
+        name="Test",
+        native_value="1.0",
+        state_class=state_class,
+        native_unit_of_measurement="INVALID!",
+    )
+    setup_test_component_platform(hass, sensor.DOMAIN, [entity0])
+    units = {
+        str(unit) if unit else "no unit of measurement"
+        for unit in STATE_CLASS_UNITS.get(state_class, set())
+    }
+    assert await async_setup_component(hass, "sensor", {"sensor": {"platform": "test"}})
+    await hass.async_block_till_done()
+
+    assert (
+        f"Sensor sensor.test ({entity0.__class__}) is using native unit of "
+        "measurement 'INVALID!' which is not a valid unit "
+        f"for the state class ('{state_class}') it is using; expected one of {units};"
+    ) in caplog.text
+
+
 @pytest.mark.parametrize(
     ("device_class", "state_class", "unit"),
     [
@@ -2584,7 +2617,7 @@ async def test_name(hass: HomeAssistant) -> None:
     async def async_setup_entry_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test sensor platform via config entry."""
         async_add_entities([entity1, entity2, entity3, entity4])
diff --git a/tests/components/sensor/test_recorder.py b/tests/components/sensor/test_recorder.py
index fcf5a711c46..962c0a0ef8f 100644
--- a/tests/components/sensor/test_recorder.py
+++ b/tests/components/sensor/test_recorder.py
@@ -1,7 +1,8 @@
 """The tests for sensor recorder platform."""
 
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from datetime import datetime, timedelta
+import logging
 import math
 from statistics import mean
 from typing import Any, Literal
@@ -26,21 +27,34 @@ from homeassistant.components.recorder.db_schema import (
 )
 from homeassistant.components.recorder.models import (
     StatisticData,
+    StatisticMeanType,
     StatisticMetaData,
     process_timestamp,
 )
 from homeassistant.components.recorder.statistics import (
+    DEG_TO_RAD,
+    RAD_TO_DEG,
     async_import_statistics,
     get_metadata,
     list_statistic_ids,
 )
 from homeassistant.components.recorder.util import get_instance, session_scope
-from homeassistant.components.sensor import ATTR_OPTIONS, DOMAIN, SensorDeviceClass
-from homeassistant.const import ATTR_FRIENDLY_NAME, STATE_UNAVAILABLE
+from homeassistant.components.sensor import (
+    ATTR_OPTIONS,
+    DOMAIN,
+    SensorDeviceClass,
+    SensorStateClass,
+)
+from homeassistant.components.sensor.recorder import (
+    MEAN_TYPE_CHANGED_ISSUE,
+    STATE_CLASS_REMOVED_ISSUE,
+    UNITS_CHANGED_ISSUE,
+)
+from homeassistant.const import ATTR_FRIENDLY_NAME, DEGREE, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers import issue_registry as ir
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 from homeassistant.util.unit_system import METRIC_SYSTEM, US_CUSTOMARY_SYSTEM
 
 from .common import MockSensor
@@ -98,6 +112,13 @@ KW_SENSOR_ATTRIBUTES = {
     "state_class": "measurement",
     "unit_of_measurement": "kW",
 }
+WIND_DIRECTION_ATTRIBUTES = {
+    "device_class": SensorDeviceClass.WIND_DIRECTION,
+    "state_class": SensorStateClass.MEASUREMENT_ANGLE,
+    "unit_of_measurement": DEGREE,
+}
+WIND_DIRECTION_STATES_SEQ = [350, 0, 15]
+TEMP_STATES_SEQ = [-10, 15, 30, 60]
 
 
 @pytest.fixture
@@ -281,6 +302,7 @@ async def test_compile_hourly_statistics(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": display_unit,
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -306,6 +328,64 @@ async def test_compile_hourly_statistics(
     assert "Error while processing event StatisticsTask" not in caplog.text
 
 
+async def test_compile_hourly_statistics_angle(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test compiling hourly statistics for measurement_angle."""
+    zero = get_start_time(dt_util.utcnow())
+    await async_setup_component(hass, "sensor", {})
+    # Wait for the sensor recorder platform to be added
+    await async_recorder_block_till_done(hass)
+    with freeze_time(zero) as freezer:
+        four, states = await async_record_states(
+            hass,
+            freezer,
+            zero,
+            "sensor.test1",
+            WIND_DIRECTION_ATTRIBUTES,
+            seq=WIND_DIRECTION_STATES_SEQ,
+        )
+    await async_wait_recording_done(hass)
+    hist = history.get_significant_states(
+        hass, zero, four, hass.states.async_entity_ids()
+    )
+    assert_dict_of_states_equal_without_context_and_last_changed(states, hist)
+
+    do_adhoc_statistics(hass, start=zero)
+    await async_wait_recording_done(hass)
+    statistic_ids = await async_list_statistic_ids(hass)
+    assert statistic_ids == [
+        {
+            "statistic_id": "sensor.test1",
+            "display_unit_of_measurement": DEGREE,
+            "has_mean": False,
+            "mean_type": StatisticMeanType.CIRCULAR,
+            "has_sum": False,
+            "name": None,
+            "source": "recorder",
+            "statistics_unit_of_measurement": DEGREE,
+            "unit_class": None,
+        }
+    ]
+    stats = statistics_during_period(hass, zero, period="5minute")
+    assert stats == {
+        "sensor.test1": [
+            {
+                "start": process_timestamp(zero).timestamp(),
+                "end": process_timestamp(zero + timedelta(minutes=5)).timestamp(),
+                "mean": pytest.approx(0.5802544),
+                "min": None,
+                "max": None,
+                "last_reset": None,
+                "state": None,
+                "sum": None,
+            }
+        ]
+    }
+    assert "Error while processing event StatisticsTask" not in caplog.text
+
+
 @pytest.mark.parametrize(
     (
         "device_class",
@@ -349,7 +429,7 @@ async def test_compile_hourly_statistics_with_some_same_last_updated(
         "unit_of_measurement": state_unit,
     }
     attributes = dict(attributes)
-    seq = [-10, 15, 30, 60]
+    seq = TEMP_STATES_SEQ
 
     async def set_state(entity_id, state, **kwargs):
         """Set the state."""
@@ -395,6 +475,7 @@ async def test_compile_hourly_statistics_with_some_same_last_updated(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": display_unit,
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -420,33 +501,167 @@ async def test_compile_hourly_statistics_with_some_same_last_updated(
     assert "Error while processing event StatisticsTask" not in caplog.text
 
 
+async def test_compile_hourly_statistics_with_some_same_last_updated_angle(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test compiling hourly statistics with the some of the same last updated value for measurement_angle.
+
+    If the last updated value is the same we will have a zero duration.
+    """
+    zero = get_start_time(dt_util.utcnow())
+    await async_setup_component(hass, "sensor", {})
+    # Wait for the sensor recorder platform to be added
+    await async_recorder_block_till_done(hass)
+    entity_id = "sensor.test1"
+    seq = [350, 2, 15, 345]
+
+    async def set_state(entity_id, state, **kwargs):
+        """Set the state."""
+        hass.states.async_set(entity_id, state, **kwargs)
+        await async_wait_recording_done(hass)
+        return hass.states.get(entity_id)
+
+    one = zero + timedelta(seconds=1 * 5)
+    two = one + timedelta(seconds=10 * 5)
+    three = two + timedelta(seconds=40 * 5)
+    four = three + timedelta(seconds=10 * 5)
+
+    states = {entity_id: []}
+    with freeze_time(one) as freezer:
+        states[entity_id].append(
+            await set_state(
+                entity_id, str(seq[0]), attributes=WIND_DIRECTION_ATTRIBUTES
+            )
+        )
+
+        # Record two states at the exact same time
+        freezer.move_to(two)
+        states[entity_id].append(
+            await set_state(
+                entity_id, str(seq[1]), attributes=WIND_DIRECTION_ATTRIBUTES
+            )
+        )
+        states[entity_id].append(
+            await set_state(
+                entity_id, str(seq[2]), attributes=WIND_DIRECTION_ATTRIBUTES
+            )
+        )
+
+        freezer.move_to(three)
+        states[entity_id].append(
+            await set_state(
+                entity_id, str(seq[3]), attributes=WIND_DIRECTION_ATTRIBUTES
+            )
+        )
+
+    hist = history.get_significant_states(
+        hass, zero, four, hass.states.async_entity_ids()
+    )
+    assert_dict_of_states_equal_without_context_and_last_changed(states, hist)
+
+    do_adhoc_statistics(hass, start=zero)
+    await async_wait_recording_done(hass)
+    statistic_ids = await async_list_statistic_ids(hass)
+    assert statistic_ids == [
+        {
+            "statistic_id": "sensor.test1",
+            "display_unit_of_measurement": DEGREE,
+            "has_mean": False,
+            "mean_type": StatisticMeanType.CIRCULAR,
+            "has_sum": False,
+            "name": None,
+            "source": "recorder",
+            "statistics_unit_of_measurement": DEGREE,
+            "unit_class": None,
+        }
+    ]
+    stats = statistics_during_period(hass, zero, period="5minute")
+    assert stats == {
+        "sensor.test1": [
+            {
+                "start": process_timestamp(zero).timestamp(),
+                "end": process_timestamp(zero + timedelta(minutes=5)).timestamp(),
+                "mean": pytest.approx(6.274605),
+                "min": None,
+                "max": None,
+                "last_reset": None,
+                "state": None,
+                "sum": None,
+            }
+        ]
+    }
+    assert "Error while processing event StatisticsTask" not in caplog.text
+
+
 @pytest.mark.parametrize(
     (
-        "device_class",
-        "state_unit",
+        "attributes",
         "display_unit",
         "statistics_unit",
         "unit_class",
         "mean",
         "min",
         "max",
+        "mean_type",
+        "seq",
     ),
     [
-        ("temperature", "°C", "°C", "°C", "temperature", 60, -10, 60),
-        ("temperature", "°F", "°F", "°F", "temperature", 60, -10, 60),
+        (
+            {
+                "device_class": "temperature",
+                "state_class": "measurement",
+                "unit_of_measurement": "°C",
+            },
+            "°C",
+            "°C",
+            "temperature",
+            60,
+            -10,
+            60,
+            StatisticMeanType.ARITHMETIC,
+            TEMP_STATES_SEQ,
+        ),
+        (
+            {
+                "device_class": "temperature",
+                "state_class": "measurement",
+                "unit_of_measurement": "°F",
+            },
+            "°F",
+            "°F",
+            "temperature",
+            60,
+            -10,
+            60,
+            StatisticMeanType.ARITHMETIC,
+            TEMP_STATES_SEQ,
+        ),
+        (
+            WIND_DIRECTION_ATTRIBUTES,
+            DEGREE,
+            DEGREE,
+            None,
+            15,
+            None,
+            None,
+            StatisticMeanType.CIRCULAR,
+            [350, 0, 355, 15],
+        ),
     ],
 )
 async def test_compile_hourly_statistics_with_all_same_last_updated(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
-    device_class,
-    state_unit,
-    display_unit,
-    statistics_unit,
-    unit_class,
-    mean,
-    min,
-    max,
+    attributes: dict[str, Any],
+    display_unit: str,
+    statistics_unit: str,
+    unit_class: str | None,
+    mean: float | None,
+    min: float | None,
+    max: float | None,
+    mean_type: StatisticMeanType,
+    seq: list[float],
 ) -> None:
     """Test compiling hourly statistics with the all of the same last updated value.
 
@@ -457,13 +672,6 @@ async def test_compile_hourly_statistics_with_all_same_last_updated(
     # Wait for the sensor recorder platform to be added
     await async_recorder_block_till_done(hass)
     entity_id = "sensor.test1"
-    attributes = {
-        "device_class": device_class,
-        "state_class": "measurement",
-        "unit_of_measurement": state_unit,
-    }
-    attributes = dict(attributes)
-    seq = [-10, 15, 30, 60]
 
     async def set_state(entity_id, state, **kwargs):
         """Set the state."""
@@ -503,7 +711,8 @@ async def test_compile_hourly_statistics_with_all_same_last_updated(
         {
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": display_unit,
-            "has_mean": True,
+            "has_mean": mean_type is StatisticMeanType.ARITHMETIC,
+            "mean_type": mean_type,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -531,45 +740,79 @@ async def test_compile_hourly_statistics_with_all_same_last_updated(
 
 @pytest.mark.parametrize(
     (
-        "device_class",
-        "state_unit",
+        "attributes",
         "display_unit",
         "statistics_unit",
         "unit_class",
         "mean",
         "min",
         "max",
+        "mean_type",
+        "seq",
     ),
     [
-        ("temperature", "°C", "°C", "°C", "temperature", 0, 60, 60),
-        ("temperature", "°F", "°F", "°F", "temperature", 0, 60, 60),
+        (
+            {
+                "device_class": "temperature",
+                "state_class": "measurement",
+                "unit_of_measurement": "°C",
+            },
+            "°C",
+            "°C",
+            "temperature",
+            60,
+            -10,
+            60,
+            StatisticMeanType.ARITHMETIC,
+            TEMP_STATES_SEQ,
+        ),
+        (
+            {
+                "device_class": "temperature",
+                "state_class": "measurement",
+                "unit_of_measurement": "°F",
+            },
+            "°F",
+            "°F",
+            "temperature",
+            60,
+            -10,
+            60,
+            StatisticMeanType.ARITHMETIC,
+            TEMP_STATES_SEQ,
+        ),
+        (
+            WIND_DIRECTION_ATTRIBUTES,
+            DEGREE,
+            DEGREE,
+            None,
+            15,
+            None,
+            None,
+            StatisticMeanType.CIRCULAR,
+            [350, 0, 355, 15],
+        ),
     ],
 )
-async def test_compile_hourly_statistics_only_state_is_and_end_of_period(
+async def test_compile_hourly_statistics_only_state_is_at_end_of_period(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
-    device_class,
-    state_unit,
-    display_unit,
-    statistics_unit,
-    unit_class,
-    mean,
-    min,
-    max,
+    attributes: dict[str, Any],
+    display_unit: str,
+    statistics_unit: str,
+    unit_class: str | None,
+    mean: float | None,
+    min: float | None,
+    max: float | None,
+    mean_type: StatisticMeanType,
+    seq: list[float],
 ) -> None:
-    """Test compiling hourly statistics when the only state at end of period."""
+    """Test compiling hourly statistics when the only states are at end of period."""
     zero = get_start_time(dt_util.utcnow())
     await async_setup_component(hass, "sensor", {})
     # Wait for the sensor recorder platform to be added
     await async_recorder_block_till_done(hass)
     entity_id = "sensor.test1"
-    attributes = {
-        "device_class": device_class,
-        "state_class": "measurement",
-        "unit_of_measurement": state_unit,
-    }
-    attributes = dict(attributes)
-    seq = [-10, 15, 30, 60]
 
     async def set_state(entity_id, state, **kwargs):
         """Set the state."""
@@ -604,13 +847,15 @@ async def test_compile_hourly_statistics_only_state_is_and_end_of_period(
     assert_dict_of_states_equal_without_context_and_last_changed(states, hist)
 
     do_adhoc_statistics(hass, start=zero)
+    do_adhoc_statistics(hass, start=zero + timedelta(minutes=5))
     await async_wait_recording_done(hass)
     statistic_ids = await async_list_statistic_ids(hass)
     assert statistic_ids == [
         {
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": display_unit,
-            "has_mean": True,
+            "has_mean": mean_type is StatisticMeanType.ARITHMETIC,
+            "mean_type": mean_type,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -622,8 +867,8 @@ async def test_compile_hourly_statistics_only_state_is_and_end_of_period(
     assert stats == {
         "sensor.test1": [
             {
-                "start": process_timestamp(zero).timestamp(),
-                "end": process_timestamp(zero + timedelta(minutes=5)).timestamp(),
+                "start": process_timestamp(zero + timedelta(minutes=5)).timestamp(),
+                "end": process_timestamp(zero + timedelta(minutes=10)).timestamp(),
                 "mean": pytest.approx(mean),
                 "min": pytest.approx(min),
                 "max": pytest.approx(max),
@@ -651,7 +896,10 @@ async def test_compile_hourly_statistics_purged_state_changes(
     statistics_unit,
     unit_class,
 ) -> None:
-    """Test compiling hourly statistics."""
+    """Test compiling hourly statistics.
+
+    This tests statistics falls back to the state machine when states are purged.
+    """
     zero = get_start_time(dt_util.utcnow())
     await async_setup_component(hass, "sensor", {})
     # Wait for the sensor recorder platform to be added
@@ -691,6 +939,7 @@ async def test_compile_hourly_statistics_purged_state_changes(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": display_unit,
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -716,6 +965,94 @@ async def test_compile_hourly_statistics_purged_state_changes(
     assert "Error while processing event StatisticsTask" not in caplog.text
 
 
+@pytest.mark.parametrize(
+    (
+        "device_class",
+        "state_unit",
+        "display_unit",
+        "statistics_unit",
+        "unit_class",
+        "mean",
+        "min",
+        "max",
+    ),
+    [
+        (None, "%", "%", "%", "unitless", 13.050847, -10, 30),
+    ],
+)
+async def test_compile_hourly_statistics_ignore_future_state(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    device_class,
+    state_unit,
+    display_unit,
+    statistics_unit,
+    unit_class,
+    mean,
+    min,
+    max,
+) -> None:
+    """Test compiling hourly statistics.
+
+    This tests statistics does not fall back to the state machine if the state
+    in the state machine is newer than the end of the statistics period.
+    """
+    zero = get_start_time(dt_util.utcnow() + timedelta(minutes=5))
+    previous_period = zero - timedelta(minutes=5)
+    await async_setup_component(hass, "sensor", {})
+    # Wait for the sensor recorder platform to be added
+    await async_recorder_block_till_done(hass)
+    attributes = {
+        "device_class": device_class,
+        "state_class": "measurement",
+        "unit_of_measurement": state_unit,
+    }
+    with freeze_time(zero) as freezer:
+        four, states = await async_record_states(
+            hass, freezer, zero, "sensor.test1", attributes
+        )
+    await async_wait_recording_done(hass)
+    hist = history.get_significant_states(
+        hass, zero, four, hass.states.async_entity_ids()
+    )
+    assert_dict_of_states_equal_without_context_and_last_changed(states, hist)
+
+    do_adhoc_statistics(hass, start=previous_period)
+    do_adhoc_statistics(hass, start=zero)
+    await async_wait_recording_done(hass)
+    statistic_ids = await async_list_statistic_ids(hass)
+    assert statistic_ids == [
+        {
+            "statistic_id": "sensor.test1",
+            "display_unit_of_measurement": display_unit,
+            "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
+            "has_sum": False,
+            "name": None,
+            "source": "recorder",
+            "statistics_unit_of_measurement": statistics_unit,
+            "unit_class": unit_class,
+        }
+    ]
+    stats = statistics_during_period(hass, previous_period, period="5minute")
+    # Check we get no stats from the previous period
+    assert stats == {
+        "sensor.test1": [
+            {
+                "start": process_timestamp(zero).timestamp(),
+                "end": process_timestamp(zero + timedelta(minutes=5)).timestamp(),
+                "mean": pytest.approx(mean),
+                "min": pytest.approx(min),
+                "max": pytest.approx(max),
+                "last_reset": None,
+                "state": None,
+                "sum": None,
+            }
+        ]
+    }
+    assert "Error while processing event StatisticsTask" not in caplog.text
+
+
 @pytest.mark.parametrize("attributes", [TEMPERATURE_SENSOR_ATTRIBUTES])
 async def test_compile_hourly_statistics_wrong_unit(
     hass: HomeAssistant,
@@ -782,6 +1119,7 @@ async def test_compile_hourly_statistics_wrong_unit(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": "°C",
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -791,6 +1129,7 @@ async def test_compile_hourly_statistics_wrong_unit(
         {
             "display_unit_of_measurement": "invalid",
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -801,6 +1140,7 @@ async def test_compile_hourly_statistics_wrong_unit(
         {
             "display_unit_of_measurement": None,
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -812,6 +1152,7 @@ async def test_compile_hourly_statistics_wrong_unit(
             "statistic_id": "sensor.test6",
             "display_unit_of_measurement": "°C",
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -822,6 +1163,7 @@ async def test_compile_hourly_statistics_wrong_unit(
             "statistic_id": "sensor.test7",
             "display_unit_of_measurement": "°C",
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -993,6 +1335,7 @@ async def test_compile_hourly_sum_statistics_amount(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": statistics_unit,
             "has_mean": False,
+            "mean_type": StatisticMeanType.NONE,
             "has_sum": True,
             "name": None,
             "source": "recorder",
@@ -1197,6 +1540,7 @@ async def test_compile_hourly_sum_statistics_amount_reset_every_state_change(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": display_unit,
             "has_mean": False,
+            "mean_type": StatisticMeanType.NONE,
             "has_sum": True,
             "name": None,
             "source": "recorder",
@@ -1306,6 +1650,7 @@ async def test_compile_hourly_sum_statistics_amount_invalid_last_reset(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": display_unit,
             "has_mean": False,
+            "mean_type": StatisticMeanType.NONE,
             "has_sum": True,
             "name": None,
             "source": "recorder",
@@ -1402,6 +1747,7 @@ async def test_compile_hourly_sum_statistics_nan_inf_state(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": display_unit,
             "has_mean": False,
+            "mean_type": StatisticMeanType.NONE,
             "has_sum": True,
             "name": None,
             "source": "recorder",
@@ -1545,6 +1891,7 @@ async def test_compile_hourly_sum_statistics_negative_state(
     assert {
         "display_unit_of_measurement": display_unit,
         "has_mean": False,
+        "mean_type": StatisticMeanType.NONE,
         "has_sum": True,
         "name": None,
         "source": "recorder",
@@ -1646,6 +1993,7 @@ async def test_compile_hourly_sum_statistics_total_no_reset(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": display_unit,
             "has_mean": False,
+            "mean_type": StatisticMeanType.NONE,
             "has_sum": True,
             "name": None,
             "source": "recorder",
@@ -1759,6 +2107,7 @@ async def test_compile_hourly_sum_statistics_total_increasing(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": display_unit,
             "has_mean": False,
+            "mean_type": StatisticMeanType.NONE,
             "has_sum": True,
             "name": None,
             "source": "recorder",
@@ -1885,6 +2234,7 @@ async def test_compile_hourly_sum_statistics_total_increasing_small_dip(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": display_unit,
             "has_mean": False,
+            "mean_type": StatisticMeanType.NONE,
             "has_sum": True,
             "name": None,
             "source": "recorder",
@@ -1989,6 +2339,7 @@ async def test_compile_hourly_energy_statistics_unsupported(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": "kWh",
             "has_mean": False,
+            "mean_type": StatisticMeanType.NONE,
             "has_sum": True,
             "name": None,
             "source": "recorder",
@@ -2091,6 +2442,7 @@ async def test_compile_hourly_energy_statistics_multiple(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": "kWh",
             "has_mean": False,
+            "mean_type": StatisticMeanType.NONE,
             "has_sum": True,
             "name": None,
             "source": "recorder",
@@ -2101,6 +2453,7 @@ async def test_compile_hourly_energy_statistics_multiple(
             "statistic_id": "sensor.test2",
             "display_unit_of_measurement": "kWh",
             "has_mean": False,
+            "mean_type": StatisticMeanType.NONE,
             "has_sum": True,
             "name": None,
             "source": "recorder",
@@ -2111,6 +2464,7 @@ async def test_compile_hourly_energy_statistics_multiple(
             "statistic_id": "sensor.test3",
             "display_unit_of_measurement": "Wh",
             "has_mean": False,
+            "mean_type": StatisticMeanType.NONE,
             "has_sum": True,
             "name": None,
             "source": "recorder",
@@ -2293,8 +2647,64 @@ async def test_compile_hourly_statistics_unchanged(
     assert "Error while processing event StatisticsTask" not in caplog.text
 
 
+async def test_compile_hourly_statistics_unchanged_angle(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test compiling hourly statistics, with no changes during the hour for measurement_angle."""
+    zero = get_start_time(dt_util.utcnow())
+    await async_setup_component(hass, "sensor", {})
+    # Wait for the sensor recorder platform to be added
+    await async_recorder_block_till_done(hass)
+    with freeze_time(zero) as freezer:
+        four, states = await async_record_states(
+            hass,
+            freezer,
+            zero,
+            "sensor.test1",
+            WIND_DIRECTION_ATTRIBUTES,
+            seq=WIND_DIRECTION_STATES_SEQ,
+        )
+    await async_wait_recording_done(hass)
+    hist = history.get_significant_states(
+        hass, zero, four, hass.states.async_entity_ids()
+    )
+    assert_dict_of_states_equal_without_context_and_last_changed(states, hist)
+
+    do_adhoc_statistics(hass, start=four)
+    await async_wait_recording_done(hass)
+    stats = statistics_during_period(hass, four, period="5minute")
+    assert stats == {
+        "sensor.test1": [
+            {
+                "start": process_timestamp(four).timestamp(),
+                "end": process_timestamp(four + timedelta(minutes=5)).timestamp(),
+                "mean": pytest.approx(15),
+                "min": None,
+                "max": None,
+                "last_reset": None,
+                "state": None,
+                "sum": None,
+            }
+        ]
+    }
+    assert "Error while processing event StatisticsTask" not in caplog.text
+
+
+@pytest.mark.parametrize(
+    ("attributes", "expected_mean", "expected_min", "expected_max"),
+    [
+        (TEMPERATURE_SENSOR_ATTRIBUTES, 21.1864406779661, 10.0, 25.0),
+        (WIND_DIRECTION_ATTRIBUTES, 21.202479155239875, None, None),
+    ],
+)
 async def test_compile_hourly_statistics_partially_unavailable(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    attributes: dict,
+    expected_mean: float,
+    expected_min: float | None,
+    expected_max: float | None,
 ) -> None:
     """Test compiling hourly statistics, with the sensor being partially unavailable."""
     zero = get_start_time(dt_util.utcnow())
@@ -2302,7 +2712,7 @@ async def test_compile_hourly_statistics_partially_unavailable(
     # Wait for the sensor recorder platform to be added
     await async_recorder_block_till_done(hass)
     four, states = await async_record_states_partially_unavailable(
-        hass, zero, "sensor.test1", TEMPERATURE_SENSOR_ATTRIBUTES
+        hass, zero, "sensor.test1", attributes
     )
     await async_wait_recording_done(hass)
     hist = history.get_significant_states(
@@ -2318,9 +2728,9 @@ async def test_compile_hourly_statistics_partially_unavailable(
             {
                 "start": process_timestamp(zero).timestamp(),
                 "end": process_timestamp(zero + timedelta(minutes=5)).timestamp(),
-                "mean": pytest.approx(21.1864406779661),
-                "min": pytest.approx(10.0),
-                "max": pytest.approx(25.0),
+                "mean": pytest.approx(expected_mean),
+                "min": pytest.approx(expected_min),
+                "max": pytest.approx(expected_max),
                 "last_reset": None,
                 "state": None,
                 "sum": None,
@@ -2411,6 +2821,58 @@ async def test_compile_hourly_statistics_unavailable(
     assert "Error while processing event StatisticsTask" not in caplog.text
 
 
+async def test_compile_hourly_statistics_unavailable_angle(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test compiling hourly statistics, with one sensor being unavailable for measurement_angle.
+
+    sensor.test1 is unavailable and should not have statistics generated
+    sensor.test2 should have statistics generated
+    """
+    zero = get_start_time(dt_util.utcnow())
+    await async_setup_component(hass, "sensor", {})
+    # Wait for the sensor recorder platform to be added
+    await async_recorder_block_till_done(hass)
+    four, states = await async_record_states_partially_unavailable(
+        hass, zero, "sensor.test1", WIND_DIRECTION_ATTRIBUTES
+    )
+    with freeze_time(zero) as freezer:
+        _, _states = await async_record_states(
+            hass,
+            freezer,
+            zero,
+            "sensor.test2",
+            WIND_DIRECTION_ATTRIBUTES,
+            seq=WIND_DIRECTION_STATES_SEQ,
+        )
+    await async_wait_recording_done(hass)
+    states = {**states, **_states}
+    hist = history.get_significant_states(
+        hass, zero, four, hass.states.async_entity_ids()
+    )
+    assert_dict_of_states_equal_without_context_and_last_changed(states, hist)
+
+    do_adhoc_statistics(hass, start=four)
+    await async_wait_recording_done(hass)
+    stats = statistics_during_period(hass, four, period="5minute")
+    assert stats == {
+        "sensor.test2": [
+            {
+                "start": process_timestamp(four).timestamp(),
+                "end": process_timestamp(four + timedelta(minutes=5)).timestamp(),
+                "mean": pytest.approx(15),
+                "min": None,
+                "max": None,
+                "last_reset": None,
+                "state": None,
+                "sum": None,
+            }
+        ]
+    }
+    assert "Error while processing event StatisticsTask" not in caplog.text
+
+
 async def test_compile_hourly_statistics_fails(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
@@ -2439,59 +2901,267 @@ async def test_compile_hourly_statistics_fails(
         "statistic_type",
     ),
     [
-        ("measurement", "area", "m²", "m²", "m²", "area", "mean"),
-        ("measurement", "area", "mi²", "mi²", "mi²", "area", "mean"),
+        ("measurement", "area", "m²", "m²", "m²", "area", StatisticMeanType.ARITHMETIC),
+        (
+            "measurement",
+            "area",
+            "mi²",
+            "mi²",
+            "mi²",
+            "area",
+            StatisticMeanType.ARITHMETIC,
+        ),
         ("total", "area", "m²", "m²", "m²", "area", "sum"),
         ("total", "area", "mi²", "mi²", "mi²", "area", "sum"),
-        ("measurement", "battery", "%", "%", "%", "unitless", "mean"),
-        ("measurement", "battery", None, None, None, "unitless", "mean"),
-        ("measurement", "distance", "m", "m", "m", "distance", "mean"),
-        ("measurement", "distance", "mi", "mi", "mi", "distance", "mean"),
+        (
+            "measurement",
+            "battery",
+            "%",
+            "%",
+            "%",
+            "unitless",
+            StatisticMeanType.ARITHMETIC,
+        ),
+        (
+            "measurement",
+            "battery",
+            None,
+            None,
+            None,
+            "unitless",
+            StatisticMeanType.ARITHMETIC,
+        ),
+        (
+            "measurement",
+            "distance",
+            "m",
+            "m",
+            "m",
+            "distance",
+            StatisticMeanType.ARITHMETIC,
+        ),
+        (
+            "measurement",
+            "distance",
+            "mi",
+            "mi",
+            "mi",
+            "distance",
+            StatisticMeanType.ARITHMETIC,
+        ),
         ("total", "distance", "m", "m", "m", "distance", "sum"),
         ("total", "distance", "mi", "mi", "mi", "distance", "sum"),
         ("total", "energy", "Wh", "Wh", "Wh", "energy", "sum"),
         ("total", "energy", "kWh", "kWh", "kWh", "energy", "sum"),
-        ("measurement", "energy", "Wh", "Wh", "Wh", "energy", "mean"),
-        ("measurement", "energy", "kWh", "kWh", "kWh", "energy", "mean"),
-        ("measurement", "humidity", "%", "%", "%", "unitless", "mean"),
-        ("measurement", "humidity", None, None, None, "unitless", "mean"),
+        (
+            "measurement",
+            "energy",
+            "Wh",
+            "Wh",
+            "Wh",
+            "energy",
+            StatisticMeanType.ARITHMETIC,
+        ),
+        (
+            "measurement",
+            "energy",
+            "kWh",
+            "kWh",
+            "kWh",
+            "energy",
+            StatisticMeanType.ARITHMETIC,
+        ),
+        (
+            "measurement",
+            "humidity",
+            "%",
+            "%",
+            "%",
+            "unitless",
+            StatisticMeanType.ARITHMETIC,
+        ),
+        (
+            "measurement",
+            "humidity",
+            None,
+            None,
+            None,
+            "unitless",
+            StatisticMeanType.ARITHMETIC,
+        ),
         ("total", "monetary", "USD", "USD", "USD", None, "sum"),
         ("total", "monetary", "None", "None", "None", None, "sum"),
         ("total", "gas", "m³", "m³", "m³", "volume", "sum"),
         ("total", "gas", "ft³", "ft³", "ft³", "volume", "sum"),
-        ("measurement", "monetary", "USD", "USD", "USD", None, "mean"),
-        ("measurement", "monetary", "None", "None", "None", None, "mean"),
-        ("measurement", "gas", "m³", "m³", "m³", "volume", "mean"),
-        ("measurement", "gas", "ft³", "ft³", "ft³", "volume", "mean"),
-        ("measurement", "pressure", "Pa", "Pa", "Pa", "pressure", "mean"),
-        ("measurement", "pressure", "hPa", "hPa", "hPa", "pressure", "mean"),
-        ("measurement", "pressure", "mbar", "mbar", "mbar", "pressure", "mean"),
-        ("measurement", "pressure", "inHg", "inHg", "inHg", "pressure", "mean"),
-        ("measurement", "pressure", "psi", "psi", "psi", "pressure", "mean"),
-        ("measurement", "speed", "m/s", "m/s", "m/s", "speed", "mean"),
-        ("measurement", "speed", "mph", "mph", "mph", "speed", "mean"),
-        ("measurement", "temperature", "°C", "°C", "°C", "temperature", "mean"),
-        ("measurement", "temperature", "°F", "°F", "°F", "temperature", "mean"),
-        ("measurement", "volume", "m³", "m³", "m³", "volume", "mean"),
-        ("measurement", "volume", "ft³", "ft³", "ft³", "volume", "mean"),
+        (
+            "measurement",
+            "monetary",
+            "USD",
+            "USD",
+            "USD",
+            None,
+            StatisticMeanType.ARITHMETIC,
+        ),
+        (
+            "measurement",
+            "monetary",
+            "None",
+            "None",
+            "None",
+            None,
+            StatisticMeanType.ARITHMETIC,
+        ),
+        (
+            "measurement",
+            "gas",
+            "m³",
+            "m³",
+            "m³",
+            "volume",
+            StatisticMeanType.ARITHMETIC,
+        ),
+        (
+            "measurement",
+            "gas",
+            "ft³",
+            "ft³",
+            "ft³",
+            "volume",
+            StatisticMeanType.ARITHMETIC,
+        ),
+        (
+            "measurement",
+            "pressure",
+            "Pa",
+            "Pa",
+            "Pa",
+            "pressure",
+            StatisticMeanType.ARITHMETIC,
+        ),
+        (
+            "measurement",
+            "pressure",
+            "hPa",
+            "hPa",
+            "hPa",
+            "pressure",
+            StatisticMeanType.ARITHMETIC,
+        ),
+        (
+            "measurement",
+            "pressure",
+            "mbar",
+            "mbar",
+            "mbar",
+            "pressure",
+            StatisticMeanType.ARITHMETIC,
+        ),
+        (
+            "measurement",
+            "pressure",
+            "inHg",
+            "inHg",
+            "inHg",
+            "pressure",
+            StatisticMeanType.ARITHMETIC,
+        ),
+        (
+            "measurement",
+            "pressure",
+            "psi",
+            "psi",
+            "psi",
+            "pressure",
+            StatisticMeanType.ARITHMETIC,
+        ),
+        (
+            "measurement",
+            "speed",
+            "m/s",
+            "m/s",
+            "m/s",
+            "speed",
+            StatisticMeanType.ARITHMETIC,
+        ),
+        (
+            "measurement",
+            "speed",
+            "mph",
+            "mph",
+            "mph",
+            "speed",
+            StatisticMeanType.ARITHMETIC,
+        ),
+        (
+            "measurement",
+            "temperature",
+            "°C",
+            "°C",
+            "°C",
+            "temperature",
+            StatisticMeanType.ARITHMETIC,
+        ),
+        (
+            "measurement",
+            "temperature",
+            "°F",
+            "°F",
+            "°F",
+            "temperature",
+            StatisticMeanType.ARITHMETIC,
+        ),
+        (
+            "measurement",
+            "volume",
+            "m³",
+            "m³",
+            "m³",
+            "volume",
+            StatisticMeanType.ARITHMETIC,
+        ),
+        (
+            "measurement",
+            "volume",
+            "ft³",
+            "ft³",
+            "ft³",
+            "volume",
+            StatisticMeanType.ARITHMETIC,
+        ),
         ("total", "volume", "m³", "m³", "m³", "volume", "sum"),
         ("total", "volume", "ft³", "ft³", "ft³", "volume", "sum"),
-        ("measurement", "weight", "g", "g", "g", "mass", "mean"),
-        ("measurement", "weight", "oz", "oz", "oz", "mass", "mean"),
+        ("measurement", "weight", "g", "g", "g", "mass", StatisticMeanType.ARITHMETIC),
+        (
+            "measurement",
+            "weight",
+            "oz",
+            "oz",
+            "oz",
+            "mass",
+            StatisticMeanType.ARITHMETIC,
+        ),
         ("total", "weight", "g", "g", "g", "mass", "sum"),
         ("total", "weight", "oz", "oz", "oz", "mass", "sum"),
+        (
+            SensorStateClass.MEASUREMENT_ANGLE,
+            SensorDeviceClass.WIND_DIRECTION,
+            DEGREE,
+            DEGREE,
+            DEGREE,
+            None,
+            StatisticMeanType.CIRCULAR,
+        ),
     ],
 )
 async def test_list_statistic_ids(
     hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-    state_class,
-    device_class,
-    state_unit,
-    display_unit,
-    statistics_unit,
-    unit_class,
-    statistic_type,
+    state_class: str | SensorStateClass,
+    device_class: str | SensorDeviceClass,
+    state_unit: str,
+    display_unit: str,
+    statistics_unit: str,
+    unit_class: str | None,
+    statistic_type: str | StatisticMeanType,
 ) -> None:
     """Test listing future statistic ids."""
     await async_setup_component(hass, "sensor", {})
@@ -2505,11 +3175,20 @@ async def test_list_statistic_ids(
     }
     hass.states.async_set("sensor.test1", 0, attributes=attributes)
     statistic_ids = await async_list_statistic_ids(hass)
+    mean_type = (
+        statistic_type
+        if isinstance(statistic_type, StatisticMeanType)
+        else StatisticMeanType.NONE
+    )
+    statistic_type = (
+        statistic_type if not isinstance(statistic_type, StatisticMeanType) else "mean"
+    )
     assert statistic_ids == [
         {
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": display_unit,
-            "has_mean": statistic_type == "mean",
+            "has_mean": mean_type is StatisticMeanType.ARITHMETIC,
+            "mean_type": mean_type,
             "has_sum": statistic_type == "sum",
             "name": None,
             "source": "recorder",
@@ -2517,6 +3196,7 @@ async def test_list_statistic_ids(
             "unit_class": unit_class,
         },
     ]
+
     for stat_type in ("mean", "sum", "dogs"):
         statistic_ids = await async_list_statistic_ids(hass, statistic_type=stat_type)
         if statistic_type == stat_type:
@@ -2524,7 +3204,8 @@ async def test_list_statistic_ids(
                 {
                     "statistic_id": "sensor.test1",
                     "display_unit_of_measurement": display_unit,
-                    "has_mean": statistic_type == "mean",
+                    "has_mean": mean_type is StatisticMeanType.ARITHMETIC,
+                    "mean_type": mean_type,
                     "has_sum": statistic_type == "sum",
                     "name": None,
                     "source": "recorder",
@@ -2632,6 +3313,7 @@ async def test_compile_hourly_statistics_changing_units_1(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": state_unit,
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -2667,6 +3349,7 @@ async def test_compile_hourly_statistics_changing_units_1(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": state_unit,
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -2758,6 +3441,7 @@ async def test_compile_hourly_statistics_changing_units_2(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": "cats",
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -2840,6 +3524,7 @@ async def test_compile_hourly_statistics_changing_units_3(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": display_unit,
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -2875,6 +3560,7 @@ async def test_compile_hourly_statistics_changing_units_3(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": display_unit,
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -2957,6 +3643,7 @@ async def test_compile_hourly_statistics_convert_units_1(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": state_unit_1,
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -3004,6 +3691,7 @@ async def test_compile_hourly_statistics_convert_units_1(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": state_unit_2,
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -3120,6 +3808,7 @@ async def test_compile_hourly_statistics_equivalent_units_1(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": state_unit,
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -3151,6 +3840,7 @@ async def test_compile_hourly_statistics_equivalent_units_1(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": state_unit2,
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -3242,6 +3932,7 @@ async def test_compile_hourly_statistics_equivalent_units_2(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": state_unit,
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -3326,6 +4017,7 @@ async def test_compile_hourly_statistics_changing_device_class_1(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": state_unit,
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -3375,6 +4067,7 @@ async def test_compile_hourly_statistics_changing_device_class_1(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": state_unit,
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -3434,6 +4127,7 @@ async def test_compile_hourly_statistics_changing_device_class_1(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": state_unit,
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -3538,6 +4232,7 @@ async def test_compile_hourly_statistics_changing_device_class_2(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": display_unit,
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -3587,6 +4282,7 @@ async def test_compile_hourly_statistics_changing_device_class_2(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": display_unit,
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -3626,15 +4322,13 @@ async def test_compile_hourly_statistics_changing_device_class_2(
     (
         "device_class",
         "state_unit",
-        "display_unit",
-        "statistics_unit",
         "unit_class",
         "mean",
         "min",
         "max",
     ),
     [
-        (None, None, None, None, "unitless", 13.050847, -10, 30),
+        (None, None, "unitless", 13.050847, -10, 30),
     ],
 )
 async def test_compile_hourly_statistics_changing_state_class(
@@ -3642,8 +4336,6 @@ async def test_compile_hourly_statistics_changing_state_class(
     caplog: pytest.LogCaptureFixture,
     device_class,
     state_unit,
-    display_unit,
-    statistics_unit,
     unit_class,
     mean,
     min,
@@ -3679,6 +4371,7 @@ async def test_compile_hourly_statistics_changing_state_class(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": None,
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -3692,6 +4385,7 @@ async def test_compile_hourly_statistics_changing_state_class(
             1,
             {
                 "has_mean": True,
+                "mean_type": StatisticMeanType.ARITHMETIC,
                 "has_sum": False,
                 "name": None,
                 "source": "recorder",
@@ -3721,6 +4415,7 @@ async def test_compile_hourly_statistics_changing_state_class(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": None,
             "has_mean": False,
+            "mean_type": StatisticMeanType.NONE,
             "has_sum": True,
             "name": None,
             "source": "recorder",
@@ -3734,6 +4429,7 @@ async def test_compile_hourly_statistics_changing_state_class(
             1,
             {
                 "has_mean": False,
+                "mean_type": StatisticMeanType.NONE,
                 "has_sum": True,
                 "name": None,
                 "source": "recorder",
@@ -3799,10 +4495,11 @@ async def test_compile_statistics_hourly_daily_monthly_summary(
         "unit_of_measurement": "EUR",
     }
 
+    durations = [50, 200, 45]
+
     def _weighted_average(seq, i, last_state):
         total = 0
         duration = 0
-        durations = [50, 200, 45]
         if i > 0:
             total += last_state * 5
             duration += 5
@@ -3811,6 +4508,24 @@ async def test_compile_statistics_hourly_daily_monthly_summary(
             duration += dur
         return total / duration
 
+    def _time_weighted_circular_mean(values: list[tuple[float, int]]):
+        sin_sum = 0
+        cos_sum = 0
+        for x, dur in values:
+            sin_sum += math.sin(x * DEG_TO_RAD) * dur
+            cos_sum += math.cos(x * DEG_TO_RAD) * dur
+
+        return (RAD_TO_DEG * math.atan2(sin_sum, cos_sum)) % 360
+
+    def _circular_mean(values: list[float]) -> float:
+        sin_sum = 0
+        cos_sum = 0
+        for x in values:
+            sin_sum += math.sin(x * DEG_TO_RAD)
+            cos_sum += math.cos(x * DEG_TO_RAD)
+
+        return (RAD_TO_DEG * math.atan2(sin_sum, cos_sum)) % 360
+
     def _min(seq, last_state):
         if last_state is None:
             return min(seq)
@@ -3832,17 +4547,24 @@ async def test_compile_statistics_hourly_daily_monthly_summary(
         "sensor.test2": [],
         "sensor.test3": [],
         "sensor.test4": [],
+        "sensor.test5": [],
     }
     expected_minima = {"sensor.test1": [], "sensor.test2": [], "sensor.test3": []}
     expected_maxima = {"sensor.test1": [], "sensor.test2": [], "sensor.test3": []}
-    expected_averages = {"sensor.test1": [], "sensor.test2": [], "sensor.test3": []}
+    expected_means = {
+        "sensor.test1": [],
+        "sensor.test2": [],
+        "sensor.test3": [],
+        "sensor.test5": [],
+    }
     expected_states = {"sensor.test4": []}
     expected_sums = {"sensor.test4": []}
-    last_states = {
+    last_states: dict[str, float | None] = {
         "sensor.test1": None,
         "sensor.test2": None,
         "sensor.test3": None,
         "sensor.test4": None,
+        "sensor.test5": None,
     }
     start = zero
     for i in range(24):
@@ -3855,7 +4577,7 @@ async def test_compile_statistics_hourly_daily_monthly_summary(
         last_state = last_states["sensor.test1"]
         expected_minima["sensor.test1"].append(_min(seq, last_state))
         expected_maxima["sensor.test1"].append(_max(seq, last_state))
-        expected_averages["sensor.test1"].append(_weighted_average(seq, i, last_state))
+        expected_means["sensor.test1"].append(_weighted_average(seq, i, last_state))
         last_states["sensor.test1"] = seq[-1]
         # test2 values change: min/max at the last state
         seq = [-10 * (i + 1), 15 * (i + 1), 30 * (i + 1)]
@@ -3866,7 +4588,7 @@ async def test_compile_statistics_hourly_daily_monthly_summary(
         last_state = last_states["sensor.test2"]
         expected_minima["sensor.test2"].append(_min(seq, last_state))
         expected_maxima["sensor.test2"].append(_max(seq, last_state))
-        expected_averages["sensor.test2"].append(_weighted_average(seq, i, last_state))
+        expected_means["sensor.test2"].append(_weighted_average(seq, i, last_state))
         last_states["sensor.test2"] = seq[-1]
         # test3 values change: min/max at the first state
         seq = [-10 * (23 - i + 1), 15 * (23 - i + 1), 30 * (23 - i + 1)]
@@ -3877,7 +4599,7 @@ async def test_compile_statistics_hourly_daily_monthly_summary(
         last_state = last_states["sensor.test3"]
         expected_minima["sensor.test3"].append(_min(seq, last_state))
         expected_maxima["sensor.test3"].append(_max(seq, last_state))
-        expected_averages["sensor.test3"].append(_weighted_average(seq, i, last_state))
+        expected_means["sensor.test3"].append(_weighted_average(seq, i, last_state))
         last_states["sensor.test3"] = seq[-1]
         # test4 values grow
         seq = [i, i + 0.5, i + 0.75]
@@ -3900,6 +4622,18 @@ async def test_compile_statistics_hourly_daily_monthly_summary(
         )
         last_states["sensor.test4"] = seq[-1]
 
+        # test5 circular mean
+        seq = [350 - i, 0 + (i / 2.0), 15 + i]
+        four, _states = await async_record_states(
+            hass, freezer, start, "sensor.test5", WIND_DIRECTION_ATTRIBUTES, seq
+        )
+        states["sensor.test5"] += _states["sensor.test5"]
+        values = [(seq, durations[j]) for j, seq in enumerate(seq)]
+        if (state := last_states["sensor.test5"]) is not None:
+            values.append((state, 5))
+        expected_means["sensor.test5"].append(_time_weighted_circular_mean(values))
+        last_states["sensor.test5"] = seq[-1]
+
         start += timedelta(minutes=5)
     await async_wait_recording_done(hass)
     hist = history.get_significant_states(
@@ -3925,6 +4659,7 @@ async def test_compile_statistics_hourly_daily_monthly_summary(
             "statistic_id": "sensor.test1",
             "display_unit_of_measurement": "%",
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -3935,6 +4670,7 @@ async def test_compile_statistics_hourly_daily_monthly_summary(
             "statistic_id": "sensor.test2",
             "display_unit_of_measurement": "%",
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -3945,6 +4681,7 @@ async def test_compile_statistics_hourly_daily_monthly_summary(
             "statistic_id": "sensor.test3",
             "display_unit_of_measurement": "%",
             "has_mean": True,
+            "mean_type": StatisticMeanType.ARITHMETIC,
             "has_sum": False,
             "name": None,
             "source": "recorder",
@@ -3955,12 +4692,24 @@ async def test_compile_statistics_hourly_daily_monthly_summary(
             "statistic_id": "sensor.test4",
             "display_unit_of_measurement": "EUR",
             "has_mean": False,
+            "mean_type": StatisticMeanType.NONE,
             "has_sum": True,
             "name": None,
             "source": "recorder",
             "statistics_unit_of_measurement": "EUR",
             "unit_class": None,
         },
+        {
+            "statistic_id": "sensor.test5",
+            "display_unit_of_measurement": DEGREE,
+            "has_mean": False,
+            "mean_type": StatisticMeanType.CIRCULAR,
+            "has_sum": False,
+            "name": None,
+            "source": "recorder",
+            "statistics_unit_of_measurement": DEGREE,
+            "unit_class": None,
+        },
     ]
 
     # Adjust the inserted statistics
@@ -3979,6 +4728,7 @@ async def test_compile_statistics_hourly_daily_monthly_summary(
         "sensor.test2": [],
         "sensor.test3": [],
         "sensor.test4": [],
+        "sensor.test5": [],
     }
     start = zero
     end = zero + timedelta(minutes=5)
@@ -3988,11 +4738,10 @@ async def test_compile_statistics_hourly_daily_monthly_summary(
             "sensor.test2",
             "sensor.test3",
             "sensor.test4",
+            "sensor.test5",
         ):
             expected_average = (
-                expected_averages[entity_id][i]
-                if entity_id in expected_averages
-                else None
+                expected_means[entity_id][i] if entity_id in expected_means else None
             )
             expected_minimum = (
                 expected_minima[entity_id][i] if entity_id in expected_minima else None
@@ -4022,176 +4771,78 @@ async def test_compile_statistics_hourly_daily_monthly_summary(
         end += timedelta(minutes=5)
     assert stats == expected_stats
 
-    stats = statistics_during_period(hass, zero, period="hour")
-    expected_stats = {
-        "sensor.test1": [],
-        "sensor.test2": [],
-        "sensor.test3": [],
-        "sensor.test4": [],
-    }
-    start = zero
-    end = zero + timedelta(hours=1)
-    for i in range(2):
-        for entity_id in (
-            "sensor.test1",
-            "sensor.test2",
-            "sensor.test3",
-            "sensor.test4",
-        ):
-            expected_average = (
-                mean(expected_averages[entity_id][i * 12 : (i + 1) * 12])
-                if entity_id in expected_averages
-                else None
-            )
-            expected_minimum = (
-                min(expected_minima[entity_id][i * 12 : (i + 1) * 12])
-                if entity_id in expected_minima
-                else None
-            )
-            expected_maximum = (
-                max(expected_maxima[entity_id][i * 12 : (i + 1) * 12])
-                if entity_id in expected_maxima
-                else None
-            )
-            expected_state = (
-                expected_states[entity_id][(i + 1) * 12 - 1]
-                if entity_id in expected_states
-                else None
-            )
-            expected_sum = (
-                expected_sums[entity_id][(i + 1) * 12 - 1]
-                if entity_id in expected_sums
-                else None
-            )
-            expected_stats[entity_id].append(
-                {
-                    "start": process_timestamp(start).timestamp(),
-                    "end": process_timestamp(end).timestamp(),
-                    "mean": pytest.approx(expected_average),
-                    "min": pytest.approx(expected_minimum),
-                    "max": pytest.approx(expected_maximum),
-                    "last_reset": None,
-                    "state": expected_state,
-                    "sum": expected_sum,
-                }
-            )
-        start += timedelta(hours=1)
-        end += timedelta(hours=1)
-    assert stats == expected_stats
+    def verify_stats(
+        period: Literal["5minute", "day", "hour", "week", "month"],
+        start: datetime,
+        next_datetime: Callable[[datetime], datetime],
+    ) -> None:
+        stats = statistics_during_period(hass, zero, period=period)
+        expected_stats = {
+            "sensor.test1": [],
+            "sensor.test2": [],
+            "sensor.test3": [],
+            "sensor.test4": [],
+            "sensor.test5": [],
+        }
+        end = next_datetime(start)
+        for i in range(2):
+            for entity_id, mean_fn in (
+                ("sensor.test1", mean),
+                ("sensor.test2", mean),
+                ("sensor.test3", mean),
+                ("sensor.test4", mean),
+                ("sensor.test5", _circular_mean),
+            ):
+                expected_average = (
+                    mean_fn(expected_means[entity_id][i * 12 : (i + 1) * 12])
+                    if entity_id in expected_means
+                    else None
+                )
+                expected_minimum = (
+                    min(expected_minima[entity_id][i * 12 : (i + 1) * 12])
+                    if entity_id in expected_minima
+                    else None
+                )
+                expected_maximum = (
+                    max(expected_maxima[entity_id][i * 12 : (i + 1) * 12])
+                    if entity_id in expected_maxima
+                    else None
+                )
+                expected_state = (
+                    expected_states[entity_id][(i + 1) * 12 - 1]
+                    if entity_id in expected_states
+                    else None
+                )
+                expected_sum = (
+                    expected_sums[entity_id][(i + 1) * 12 - 1]
+                    if entity_id in expected_sums
+                    else None
+                )
+                expected_stats[entity_id].append(
+                    {
+                        "start": process_timestamp(start).timestamp(),
+                        "end": process_timestamp(end).timestamp(),
+                        "mean": pytest.approx(expected_average),
+                        "min": pytest.approx(expected_minimum),
+                        "max": pytest.approx(expected_maximum),
+                        "last_reset": None,
+                        "state": expected_state,
+                        "sum": expected_sum,
+                    }
+                )
+            start = next_datetime(start)
+            end = next_datetime(end)
+        assert stats == expected_stats
+
+    verify_stats("hour", zero, lambda v: v + timedelta(hours=1))
 
-    stats = statistics_during_period(hass, zero, period="day")
-    expected_stats = {
-        "sensor.test1": [],
-        "sensor.test2": [],
-        "sensor.test3": [],
-        "sensor.test4": [],
-    }
     start = dt_util.parse_datetime("2021-08-31T06:00:00+00:00")
-    end = start + timedelta(days=1)
-    for i in range(2):
-        for entity_id in (
-            "sensor.test1",
-            "sensor.test2",
-            "sensor.test3",
-            "sensor.test4",
-        ):
-            expected_average = (
-                mean(expected_averages[entity_id][i * 12 : (i + 1) * 12])
-                if entity_id in expected_averages
-                else None
-            )
-            expected_minimum = (
-                min(expected_minima[entity_id][i * 12 : (i + 1) * 12])
-                if entity_id in expected_minima
-                else None
-            )
-            expected_maximum = (
-                max(expected_maxima[entity_id][i * 12 : (i + 1) * 12])
-                if entity_id in expected_maxima
-                else None
-            )
-            expected_state = (
-                expected_states[entity_id][(i + 1) * 12 - 1]
-                if entity_id in expected_states
-                else None
-            )
-            expected_sum = (
-                expected_sums[entity_id][(i + 1) * 12 - 1]
-                if entity_id in expected_sums
-                else None
-            )
-            expected_stats[entity_id].append(
-                {
-                    "start": process_timestamp(start).timestamp(),
-                    "end": process_timestamp(end).timestamp(),
-                    "mean": pytest.approx(expected_average),
-                    "min": pytest.approx(expected_minimum),
-                    "max": pytest.approx(expected_maximum),
-                    "last_reset": None,
-                    "state": expected_state,
-                    "sum": expected_sum,
-                }
-            )
-        start += timedelta(days=1)
-        end += timedelta(days=1)
-    assert stats == expected_stats
+    assert start
+    verify_stats("day", start, lambda v: v + timedelta(days=1))
 
-    stats = statistics_during_period(hass, zero, period="month")
-    expected_stats = {
-        "sensor.test1": [],
-        "sensor.test2": [],
-        "sensor.test3": [],
-        "sensor.test4": [],
-    }
     start = dt_util.parse_datetime("2021-08-01T06:00:00+00:00")
-    end = dt_util.parse_datetime("2021-09-01T06:00:00+00:00")
-    for i in range(2):
-        for entity_id in (
-            "sensor.test1",
-            "sensor.test2",
-            "sensor.test3",
-            "sensor.test4",
-        ):
-            expected_average = (
-                mean(expected_averages[entity_id][i * 12 : (i + 1) * 12])
-                if entity_id in expected_averages
-                else None
-            )
-            expected_minimum = (
-                min(expected_minima[entity_id][i * 12 : (i + 1) * 12])
-                if entity_id in expected_minima
-                else None
-            )
-            expected_maximum = (
-                max(expected_maxima[entity_id][i * 12 : (i + 1) * 12])
-                if entity_id in expected_maxima
-                else None
-            )
-            expected_state = (
-                expected_states[entity_id][(i + 1) * 12 - 1]
-                if entity_id in expected_states
-                else None
-            )
-            expected_sum = (
-                expected_sums[entity_id][(i + 1) * 12 - 1]
-                if entity_id in expected_sums
-                else None
-            )
-            expected_stats[entity_id].append(
-                {
-                    "start": process_timestamp(start).timestamp(),
-                    "end": process_timestamp(end).timestamp(),
-                    "mean": pytest.approx(expected_average),
-                    "min": pytest.approx(expected_minimum),
-                    "max": pytest.approx(expected_maximum),
-                    "last_reset": None,
-                    "state": expected_state,
-                    "sum": expected_sum,
-                }
-            )
-        start = (start + timedelta(days=31)).replace(day=1)
-        end = (end + timedelta(days=31)).replace(day=1)
-    assert stats == expected_stats
+    assert start
+    verify_stats("month", start, lambda v: (v + timedelta(days=31)).replace(day=1))
 
     assert "Error while processing event StatisticsTask" not in caplog.text
 
@@ -4337,11 +4988,11 @@ async def test_validate_unit_change_convertible(
                     "statistic_id": "sensor.test",
                     "supported_unit": supported_unit,
                 },
-                "type": "units_changed",
+                "type": UNITS_CHANGED_ISSUE,
             }
         ],
     }
-    await assert_validation_result(hass, client, expected, {"units_changed"})
+    await assert_validation_result(hass, client, expected, {UNITS_CHANGED_ISSUE})
 
     # Unavailable state - empty response
     hass.states.async_set(
@@ -4562,11 +5213,11 @@ async def test_validate_statistics_unit_change_no_device_class(
                     "statistic_id": "sensor.test",
                     "supported_unit": supported_unit,
                 },
-                "type": "units_changed",
+                "type": UNITS_CHANGED_ISSUE,
             }
         ],
     }
-    await assert_validation_result(hass, client, expected, {"units_changed"})
+    await assert_validation_result(hass, client, expected, {UNITS_CHANGED_ISSUE})
 
     # Unavailable state - empty response
     hass.states.async_set(
@@ -4678,11 +5329,11 @@ async def test_validate_statistics_state_class_removed(
         "sensor.test": [
             {
                 "data": {"statistic_id": "sensor.test"},
-                "type": "state_class_removed",
+                "type": STATE_CLASS_REMOVED_ISSUE,
             }
         ],
     }
-    await assert_validation_result(hass, client, expected, {"state_class_removed"})
+    await assert_validation_result(hass, client, expected, {STATE_CLASS_REMOVED_ISSUE})
 
     # Unavailable state - empty response
     hass.states.async_set(
@@ -4746,11 +5397,11 @@ async def test_validate_statistics_state_class_removed_issue_cleaned_up(
         "sensor.test": [
             {
                 "data": {"statistic_id": "sensor.test"},
-                "type": "state_class_removed",
+                "type": STATE_CLASS_REMOVED_ISSUE,
             }
         ],
     }
-    await assert_validation_result(hass, client, expected, {"state_class_removed"})
+    await assert_validation_result(hass, client, expected, {STATE_CLASS_REMOVED_ISSUE})
 
     # Remove the statistics - empty response
     get_instance(hass).async_clear_statistics(["sensor.test"])
@@ -4995,11 +5646,11 @@ async def test_validate_statistics_unit_change_no_conversion(
                     "statistic_id": "sensor.test",
                     "supported_unit": unit1,
                 },
-                "type": "units_changed",
+                "type": UNITS_CHANGED_ISSUE,
             }
         ],
     }
-    await assert_validation_result(hass, client, expected, {"units_changed"})
+    await assert_validation_result(hass, client, expected, {UNITS_CHANGED_ISSUE})
 
     # Unavailable state - empty response
     hass.states.async_set(
@@ -5176,11 +5827,11 @@ async def test_validate_statistics_unit_change_equivalent_units_2(
                     "statistic_id": "sensor.test",
                     "supported_unit": supported_unit,
                 },
-                "type": "units_changed",
+                "type": UNITS_CHANGED_ISSUE,
             }
         ],
     }
-    await assert_validation_result(hass, client, expected, {"units_changed"})
+    await assert_validation_result(hass, client, expected, {UNITS_CHANGED_ISSUE})
 
     # Run statistics one hour later, metadata will not be updated
     await async_recorder_block_till_done(hass)
@@ -5189,7 +5840,7 @@ async def test_validate_statistics_unit_change_equivalent_units_2(
     await assert_statistic_ids(
         hass, [{"statistic_id": "sensor.test", "unit_of_measurement": unit1}]
     )
-    await assert_validation_result(hass, client, expected, {"units_changed"})
+    await assert_validation_result(hass, client, expected, {UNITS_CHANGED_ISSUE})
 
 
 async def test_validate_statistics_other_domain(
@@ -5278,7 +5929,7 @@ async def test_update_statistics_issues(
     now = await one_hour_stats(now)
     expected = {
         "state_class_removed_sensor.test": {
-            "issue_type": "state_class_removed",
+            "issue_type": STATE_CLASS_REMOVED_ISSUE,
             "statistic_id": "sensor.test",
         }
     }
@@ -5449,12 +6100,11 @@ async def test_exclude_attributes(hass: HomeAssistant) -> None:
     assert ATTR_FRIENDLY_NAME in states[0].attributes
 
 
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 @pytest.mark.parametrize(
-    "ignore_translations",
+    "ignore_missing_translations",
     [
         [
-            "component.test.issues..title",
-            "component.test.issues..description",
             "component.sensor.issues..title",
             "component.sensor.issues..description",
         ]
@@ -5483,8 +6133,9 @@ async def test_clean_up_repairs(
     create_issue("test", "test_issue", None)
     create_issue(DOMAIN, "test_issue_1", None)
     create_issue(DOMAIN, "test_issue_2", {"issue_type": "another_issue"})
-    create_issue(DOMAIN, "test_issue_3", {"issue_type": "state_class_removed"})
-    create_issue(DOMAIN, "test_issue_4", {"issue_type": "units_changed"})
+    create_issue(DOMAIN, "test_issue_3", {"issue_type": STATE_CLASS_REMOVED_ISSUE})
+    create_issue(DOMAIN, "test_issue_4", {"issue_type": UNITS_CHANGED_ISSUE})
+    create_issue(DOMAIN, "test_issue_5", {"issue_type": MEAN_TYPE_CHANGED_ISSUE})
 
     # Check the issues
     assert set(issue_registry.issues) == {
@@ -5493,6 +6144,7 @@ async def test_clean_up_repairs(
         ("sensor", "test_issue_2"),
         ("sensor", "test_issue_3"),
         ("sensor", "test_issue_4"),
+        ("sensor", "test_issue_5"),
     }
 
     # Request update of issues
@@ -5506,3 +6158,140 @@ async def test_clean_up_repairs(
         ("sensor", "test_issue_1"),
         ("sensor", "test_issue_2"),
     }
+
+
+async def test_validate_statistics_mean_type_changed(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test validate_statistics.
+
+    This tests a validation issue is created when a the mean type is changed.
+    """
+    now = get_start_time(dt_util.utcnow())
+
+    await async_setup_component(hass, "sensor", {})
+    await async_recorder_block_till_done(hass)
+    client = await hass_ws_client()
+
+    # No statistics, no state - empty response
+    await assert_validation_result(hass, client, {}, {})
+
+    # No statistics, original unit - empty response
+    hass.states.async_set(
+        "sensor.wind_direction",
+        10,
+        attributes=WIND_DIRECTION_ATTRIBUTES,
+        timestamp=now.timestamp(),
+    )
+    await assert_validation_result(hass, client, {}, {})
+
+    # Run statistics
+    await async_recorder_block_till_done(hass)
+    do_adhoc_statistics(hass, start=now)
+    await async_recorder_block_till_done(hass)
+    statistic_ids = await async_list_statistic_ids(hass)
+    assert statistic_ids == [
+        {
+            "statistic_id": "sensor.wind_direction",
+            "display_unit_of_measurement": DEGREE,
+            "has_mean": False,
+            "mean_type": StatisticMeanType.CIRCULAR,
+            "has_sum": False,
+            "name": None,
+            "source": "recorder",
+            "statistics_unit_of_measurement": DEGREE,
+            "unit_class": None,
+        }
+    ]
+
+    expected_log_entry = (
+        "homeassistant.components.sensor.recorder",
+        logging.WARNING,
+        (
+            "The statistics mean algorithm for sensor.wind_direction have changed from"
+            " CIRCULAR to ARITHMETIC. Generation of long term statistics will be "
+            "suppressed unless it changes back or go to "
+            "https://my.home-assistant.io/redirect/developer_statistics "
+            "to delete the old statistics"
+        ),
+    )
+    # Valid stats, no log entry
+    assert expected_log_entry not in caplog.record_tuples
+
+    # State class changed
+    hass.states.async_set(
+        "sensor.wind_direction",
+        5,
+        attributes={
+            **WIND_DIRECTION_ATTRIBUTES,
+            "state_class": SensorStateClass.MEASUREMENT,
+        },
+        timestamp=now.timestamp(),
+    )
+    expected = {
+        "sensor.wind_direction": [
+            {
+                "data": {
+                    "statistic_id": "sensor.wind_direction",
+                    "metadata_mean_type": StatisticMeanType.CIRCULAR,
+                    "state_mean_type": StatisticMeanType.ARITHMETIC,
+                },
+                "type": MEAN_TYPE_CHANGED_ISSUE,
+            }
+        ],
+    }
+    await assert_validation_result(hass, client, expected, {MEAN_TYPE_CHANGED_ISSUE})
+
+    # Run statistics one hour later, metadata will not be updated
+    await async_recorder_block_till_done(hass)
+    do_adhoc_statistics(hass, start=now + timedelta(hours=1))
+    await async_recorder_block_till_done(hass)
+    statistic_ids = await async_list_statistic_ids(hass)
+    assert statistic_ids == [
+        {
+            "statistic_id": "sensor.wind_direction",
+            "display_unit_of_measurement": DEGREE,
+            "has_mean": False,
+            "mean_type": StatisticMeanType.CIRCULAR,
+            "has_sum": False,
+            "name": None,
+            "source": "recorder",
+            "statistics_unit_of_measurement": DEGREE,
+            "unit_class": None,
+        }
+    ]
+    await assert_validation_result(hass, client, expected, {MEAN_TYPE_CHANGED_ISSUE})
+    assert expected_log_entry in caplog.record_tuples
+
+    # State class changed back
+    hass.states.async_set(
+        "sensor.wind_direction",
+        350,
+        attributes=WIND_DIRECTION_ATTRIBUTES,
+        timestamp=now.timestamp(),
+    )
+    await assert_validation_result(hass, client, {}, {})
+
+    # Run statistics
+    await async_recorder_block_till_done(hass)
+    do_adhoc_statistics(hass, start=now)
+    await async_recorder_block_till_done(hass)
+    statistic_ids = await async_list_statistic_ids(hass)
+    assert statistic_ids == [
+        {
+            "statistic_id": "sensor.wind_direction",
+            "display_unit_of_measurement": DEGREE,
+            "has_mean": False,
+            "mean_type": StatisticMeanType.CIRCULAR,
+            "has_sum": False,
+            "name": None,
+            "source": "recorder",
+            "statistics_unit_of_measurement": DEGREE,
+            "unit_class": None,
+        }
+    ]
+
+    # Issue should be resolved
+    await assert_validation_result(hass, client, {}, {})
diff --git a/tests/components/sensor/test_recorder_missing_stats.py b/tests/components/sensor/test_recorder_missing_stats.py
index 449ffd55727..fd28a7052a5 100644
--- a/tests/components/sensor/test_recorder_missing_stats.py
+++ b/tests/components/sensor/test_recorder_missing_stats.py
@@ -17,7 +17,7 @@ from homeassistant.components.recorder.util import session_scope
 from homeassistant.core import CoreState
 from homeassistant.helpers import recorder as recorder_helper
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_test_home_assistant
 from tests.components.recorder.common import (
diff --git a/tests/components/sensorpush/test_config_flow.py b/tests/components/sensorpush/test_config_flow.py
index 7e87dd1c6b8..194f4fc4a78 100644
--- a/tests/components/sensorpush/test_config_flow.py
+++ b/tests/components/sensorpush/test_config_flow.py
@@ -79,6 +79,38 @@ async def test_async_step_user_with_found_devices(hass: HomeAssistant) -> None:
     assert result2["result"].unique_id == "61DE521B-F0BF-9F44-64D4-75BBE1738105"
 
 
+async def test_async_step_user_replace_ignored(hass: HomeAssistant) -> None:
+    """Test setup from service info can replace an ignored entry."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=HTW_SERVICE_INFO.address,
+        source=config_entries.SOURCE_IGNORE,
+        data={},
+    )
+    entry.add_to_hass(hass)
+    with patch(
+        "homeassistant.components.sensorpush.config_flow.async_discovered_service_info",
+        return_value=[HTW_SERVICE_INFO],
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_USER},
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    with patch(
+        "homeassistant.components.sensorpush.async_setup_entry", return_value=True
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input={"address": "61DE521B-F0BF-9F44-64D4-75BBE1738105"},
+        )
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "HT.w 0CA1"
+    assert result2["data"] == {}
+    assert result2["result"].unique_id == "61DE521B-F0BF-9F44-64D4-75BBE1738105"
+
+
 async def test_async_step_user_device_added_between_steps(hass: HomeAssistant) -> None:
     """Test the device gets added via another flow between steps."""
     with patch(
diff --git a/tests/components/sensorpush_cloud/__init__.py b/tests/components/sensorpush_cloud/__init__.py
new file mode 100644
index 00000000000..2a5d148692c
--- /dev/null
+++ b/tests/components/sensorpush_cloud/__init__.py
@@ -0,0 +1 @@
+"""Tests for the SensorPush Cloud integration."""
diff --git a/tests/components/sensorpush_cloud/conftest.py b/tests/components/sensorpush_cloud/conftest.py
new file mode 100644
index 00000000000..ac434b04353
--- /dev/null
+++ b/tests/components/sensorpush_cloud/conftest.py
@@ -0,0 +1,60 @@
+"""Common fixtures for the SensorPush Cloud tests."""
+
+from __future__ import annotations
+
+from collections.abc import Generator
+from unittest.mock import AsyncMock, patch
+
+import pytest
+from sensorpush_ha import SensorPushCloudApi
+
+from homeassistant.components.sensorpush_cloud.const import DOMAIN
+from homeassistant.const import CONF_EMAIL
+
+from .const import CONF_DATA, MOCK_DATA
+
+from tests.common import MockConfigEntry
+
+
+@pytest.fixture
+def mock_api() -> Generator[AsyncMock]:
+    """Override SensorPushCloudApi."""
+    mock_api = AsyncMock(SensorPushCloudApi)
+    with (
+        patch(
+            "homeassistant.components.sensorpush_cloud.config_flow.SensorPushCloudApi",
+            return_value=mock_api,
+        ),
+    ):
+        yield mock_api
+
+
+@pytest.fixture
+def mock_helper() -> Generator[AsyncMock]:
+    """Override SensorPushCloudHelper."""
+    with (
+        patch(
+            "homeassistant.components.sensorpush_cloud.coordinator.SensorPushCloudHelper",
+            autospec=True,
+        ) as mock_helper,
+    ):
+        helper = mock_helper.return_value
+        helper.async_get_data.return_value = MOCK_DATA
+        yield helper
+
+
+@pytest.fixture
+def mock_config_entry() -> MockConfigEntry:
+    """ConfigEntry mock."""
+    return MockConfigEntry(
+        domain=DOMAIN, data=CONF_DATA, unique_id=CONF_DATA[CONF_EMAIL]
+    )
+
+
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.sensorpush_cloud.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
diff --git a/tests/components/sensorpush_cloud/const.py b/tests/components/sensorpush_cloud/const.py
new file mode 100644
index 00000000000..1efc4ea445a
--- /dev/null
+++ b/tests/components/sensorpush_cloud/const.py
@@ -0,0 +1,32 @@
+"""Constants for the SensorPush Cloud tests."""
+
+from sensorpush_ha import SensorPushCloudData
+
+from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
+from homeassistant.util import dt as dt_util
+
+CONF_DATA = {
+    CONF_EMAIL: "test@example.com",
+    CONF_PASSWORD: "test-password",
+}
+
+NUM_MOCK_DEVICES = 3
+
+MOCK_DATA = {
+    f"test-sensor-device-id-{i}": SensorPushCloudData(
+        device_id=f"test-sensor-device-id-{i}",
+        manufacturer=f"test-sensor-manufacturer-{i}",
+        model=f"test-sensor-model-{i}",
+        name=f"test-sensor-name-{i}",
+        altitude=0.0,
+        atmospheric_pressure=0.0,
+        battery_voltage=0.0,
+        dewpoint=0.0,
+        humidity=0.0,
+        last_update=dt_util.utcnow(),
+        signal_strength=0.0,
+        temperature=0.0,
+        vapor_pressure=0.0,
+    )
+    for i in range(NUM_MOCK_DEVICES)
+}
diff --git a/tests/components/sensorpush_cloud/snapshots/test_sensor.ambr b/tests/components/sensorpush_cloud/snapshots/test_sensor.ambr
new file mode 100644
index 00000000000..a78b012ac02
--- /dev/null
+++ b/tests/components/sensorpush_cloud/snapshots/test_sensor.ambr
@@ -0,0 +1,1267 @@
+# serializer version: 1
+# name: test_sensors[sensor.test_sensor_name_0_altitude-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_0_altitude',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfLength.METERS: 'm'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DISTANCE: 'distance'>,
+    'original_icon': None,
+    'original_name': 'Altitude',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'altitude',
+    'unique_id': 'test-sensor-device-id-0_altitude',
+    'unit_of_measurement': <UnitOfLength.METERS: 'm'>,
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_0_altitude-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'distance',
+      'friendly_name': 'test-sensor-name-0 Altitude',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfLength.METERS: 'm'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_0_altitude',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_0_atmospheric_pressure-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_0_atmospheric_pressure',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfPressure.HPA: 'hPa'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ATMOSPHERIC_PRESSURE: 'atmospheric_pressure'>,
+    'original_icon': None,
+    'original_name': 'Atmospheric pressure',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'test-sensor-device-id-0_atmospheric_pressure',
+    'unit_of_measurement': <UnitOfPressure.HPA: 'hPa'>,
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_0_atmospheric_pressure-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'atmospheric_pressure',
+      'friendly_name': 'test-sensor-name-0 Atmospheric pressure',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPressure.HPA: 'hPa'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_0_atmospheric_pressure',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_0_battery_voltage-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_0_battery_voltage',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Battery voltage',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'battery_voltage',
+    'unique_id': 'test-sensor-device-id-0_battery_voltage',
+    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_0_battery_voltage-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'friendly_name': 'test-sensor-name-0 Battery voltage',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_0_battery_voltage',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_0_dew_point-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_0_dew_point',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Dew point',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'dewpoint',
+    'unique_id': 'test-sensor-device-id-0_dewpoint',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_0_dew_point-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'test-sensor-name-0 Dew point',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_0_dew_point',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '-17.8',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_0_humidity-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_0_humidity',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.HUMIDITY: 'humidity'>,
+    'original_icon': None,
+    'original_name': 'Humidity',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'test-sensor-device-id-0_humidity',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_0_humidity-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'humidity',
+      'friendly_name': 'test-sensor-name-0 Humidity',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_0_humidity',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_0_signal_strength-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_0_signal_strength',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.SIGNAL_STRENGTH: 'signal_strength'>,
+    'original_icon': None,
+    'original_name': 'Signal strength',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'test-sensor-device-id-0_signal_strength',
+    'unit_of_measurement': 'dBm',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_0_signal_strength-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'signal_strength',
+      'friendly_name': 'test-sensor-name-0 Signal strength',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'dBm',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_0_signal_strength',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_0_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_0_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'test-sensor-device-id-0_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_0_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'test-sensor-name-0 Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_0_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '-17.8',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_0_vapor_pressure-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_0_vapor_pressure',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.PRESSURE: 'pressure'>,
+    'original_icon': None,
+    'original_name': 'Vapor pressure',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'vapor_pressure',
+    'unique_id': 'test-sensor-device-id-0_vapor_pressure',
+    'unit_of_measurement': <UnitOfPressure.KPA: 'kPa'>,
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_0_vapor_pressure-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'pressure',
+      'friendly_name': 'test-sensor-name-0 Vapor pressure',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPressure.KPA: 'kPa'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_0_vapor_pressure',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_1_altitude-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_1_altitude',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfLength.METERS: 'm'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DISTANCE: 'distance'>,
+    'original_icon': None,
+    'original_name': 'Altitude',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'altitude',
+    'unique_id': 'test-sensor-device-id-1_altitude',
+    'unit_of_measurement': <UnitOfLength.METERS: 'm'>,
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_1_altitude-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'distance',
+      'friendly_name': 'test-sensor-name-1 Altitude',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfLength.METERS: 'm'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_1_altitude',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_1_atmospheric_pressure-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_1_atmospheric_pressure',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfPressure.HPA: 'hPa'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ATMOSPHERIC_PRESSURE: 'atmospheric_pressure'>,
+    'original_icon': None,
+    'original_name': 'Atmospheric pressure',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'test-sensor-device-id-1_atmospheric_pressure',
+    'unit_of_measurement': <UnitOfPressure.HPA: 'hPa'>,
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_1_atmospheric_pressure-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'atmospheric_pressure',
+      'friendly_name': 'test-sensor-name-1 Atmospheric pressure',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPressure.HPA: 'hPa'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_1_atmospheric_pressure',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_1_battery_voltage-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_1_battery_voltage',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Battery voltage',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'battery_voltage',
+    'unique_id': 'test-sensor-device-id-1_battery_voltage',
+    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_1_battery_voltage-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'friendly_name': 'test-sensor-name-1 Battery voltage',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_1_battery_voltage',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_1_dew_point-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_1_dew_point',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Dew point',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'dewpoint',
+    'unique_id': 'test-sensor-device-id-1_dewpoint',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_1_dew_point-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'test-sensor-name-1 Dew point',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_1_dew_point',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '-17.8',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_1_humidity-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_1_humidity',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.HUMIDITY: 'humidity'>,
+    'original_icon': None,
+    'original_name': 'Humidity',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'test-sensor-device-id-1_humidity',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_1_humidity-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'humidity',
+      'friendly_name': 'test-sensor-name-1 Humidity',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_1_humidity',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_1_signal_strength-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_1_signal_strength',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.SIGNAL_STRENGTH: 'signal_strength'>,
+    'original_icon': None,
+    'original_name': 'Signal strength',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'test-sensor-device-id-1_signal_strength',
+    'unit_of_measurement': 'dBm',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_1_signal_strength-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'signal_strength',
+      'friendly_name': 'test-sensor-name-1 Signal strength',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'dBm',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_1_signal_strength',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_1_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_1_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'test-sensor-device-id-1_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_1_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'test-sensor-name-1 Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_1_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '-17.8',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_1_vapor_pressure-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_1_vapor_pressure',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.PRESSURE: 'pressure'>,
+    'original_icon': None,
+    'original_name': 'Vapor pressure',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'vapor_pressure',
+    'unique_id': 'test-sensor-device-id-1_vapor_pressure',
+    'unit_of_measurement': <UnitOfPressure.KPA: 'kPa'>,
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_1_vapor_pressure-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'pressure',
+      'friendly_name': 'test-sensor-name-1 Vapor pressure',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPressure.KPA: 'kPa'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_1_vapor_pressure',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_2_altitude-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_2_altitude',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfLength.METERS: 'm'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DISTANCE: 'distance'>,
+    'original_icon': None,
+    'original_name': 'Altitude',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'altitude',
+    'unique_id': 'test-sensor-device-id-2_altitude',
+    'unit_of_measurement': <UnitOfLength.METERS: 'm'>,
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_2_altitude-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'distance',
+      'friendly_name': 'test-sensor-name-2 Altitude',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfLength.METERS: 'm'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_2_altitude',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_2_atmospheric_pressure-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_2_atmospheric_pressure',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfPressure.HPA: 'hPa'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ATMOSPHERIC_PRESSURE: 'atmospheric_pressure'>,
+    'original_icon': None,
+    'original_name': 'Atmospheric pressure',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'test-sensor-device-id-2_atmospheric_pressure',
+    'unit_of_measurement': <UnitOfPressure.HPA: 'hPa'>,
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_2_atmospheric_pressure-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'atmospheric_pressure',
+      'friendly_name': 'test-sensor-name-2 Atmospheric pressure',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPressure.HPA: 'hPa'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_2_atmospheric_pressure',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_2_battery_voltage-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_2_battery_voltage',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Battery voltage',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'battery_voltage',
+    'unique_id': 'test-sensor-device-id-2_battery_voltage',
+    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_2_battery_voltage-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'friendly_name': 'test-sensor-name-2 Battery voltage',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_2_battery_voltage',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_2_dew_point-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_2_dew_point',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Dew point',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'dewpoint',
+    'unique_id': 'test-sensor-device-id-2_dewpoint',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_2_dew_point-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'test-sensor-name-2 Dew point',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_2_dew_point',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '-17.8',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_2_humidity-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_2_humidity',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.HUMIDITY: 'humidity'>,
+    'original_icon': None,
+    'original_name': 'Humidity',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'test-sensor-device-id-2_humidity',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_2_humidity-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'humidity',
+      'friendly_name': 'test-sensor-name-2 Humidity',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_2_humidity',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_2_signal_strength-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_2_signal_strength',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.SIGNAL_STRENGTH: 'signal_strength'>,
+    'original_icon': None,
+    'original_name': 'Signal strength',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'test-sensor-device-id-2_signal_strength',
+    'unit_of_measurement': 'dBm',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_2_signal_strength-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'signal_strength',
+      'friendly_name': 'test-sensor-name-2 Signal strength',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'dBm',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_2_signal_strength',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_2_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_2_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'test-sensor-device-id-2_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_2_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'test-sensor-name-2 Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_2_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '-17.8',
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_2_vapor_pressure-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_sensor_name_2_vapor_pressure',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.PRESSURE: 'pressure'>,
+    'original_icon': None,
+    'original_name': 'Vapor pressure',
+    'platform': 'sensorpush_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'vapor_pressure',
+    'unique_id': 'test-sensor-device-id-2_vapor_pressure',
+    'unit_of_measurement': <UnitOfPressure.KPA: 'kPa'>,
+  })
+# ---
+# name: test_sensors[sensor.test_sensor_name_2_vapor_pressure-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'pressure',
+      'friendly_name': 'test-sensor-name-2 Vapor pressure',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPressure.KPA: 'kPa'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_sensor_name_2_vapor_pressure',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
diff --git a/tests/components/sensorpush_cloud/test_config_flow.py b/tests/components/sensorpush_cloud/test_config_flow.py
new file mode 100644
index 00000000000..dc88c638b9b
--- /dev/null
+++ b/tests/components/sensorpush_cloud/test_config_flow.py
@@ -0,0 +1,95 @@
+"""Test the SensorPush Cloud config flow."""
+
+from __future__ import annotations
+
+from unittest.mock import AsyncMock
+
+import pytest
+from sensorpush_ha import SensorPushCloudAuthError
+
+from homeassistant.components.sensorpush_cloud.const import DOMAIN
+from homeassistant.config_entries import SOURCE_USER
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from .const import CONF_DATA, CONF_EMAIL
+
+from tests.common import MockConfigEntry
+
+
+async def test_user(
+    hass: HomeAssistant,
+    mock_api: AsyncMock,
+    mock_helper: AsyncMock,
+    mock_setup_entry: AsyncMock,
+) -> None:
+    """Test user initialized flow."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        CONF_DATA,
+    )
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "test@example.com"
+    assert result["data"] == CONF_DATA
+    assert result["result"].unique_id == CONF_DATA[CONF_EMAIL]
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_user_already_configured(
+    hass: HomeAssistant,
+    mock_api: AsyncMock,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test we fail on a duplicate entry in the user flow."""
+    mock_config_entry.add_to_hass(hass)
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}, data=CONF_DATA
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+
+
+@pytest.mark.parametrize(
+    ("error", "expected"),
+    [(SensorPushCloudAuthError, "invalid_auth"), (Exception, "unknown")],
+)
+async def test_user_error(
+    hass: HomeAssistant,
+    mock_api: AsyncMock,
+    mock_setup_entry: AsyncMock,
+    error: Exception,
+    expected: str,
+) -> None:
+    """Test we display errors in the user flow."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    mock_api.async_authorize.side_effect = error
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], CONF_DATA
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {"base": expected}
+
+    # Show we can recover from errors:
+    mock_api.async_authorize.side_effect = None
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], CONF_DATA
+    )
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "test@example.com"
+    assert result["data"] == CONF_DATA
+    assert len(mock_setup_entry.mock_calls) == 1
diff --git a/tests/components/sensorpush_cloud/test_sensor.py b/tests/components/sensorpush_cloud/test_sensor.py
new file mode 100644
index 00000000000..c35d40f1bc2
--- /dev/null
+++ b/tests/components/sensorpush_cloud/test_sensor.py
@@ -0,0 +1,29 @@
+"""Test SensorPush Cloud sensors."""
+
+from __future__ import annotations
+
+from unittest.mock import AsyncMock
+
+import pytest
+from syrupy import SnapshotAssertion
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_registry import EntityRegistry
+
+from tests.common import MockConfigEntry, snapshot_platform
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_sensors(
+    hass: HomeAssistant,
+    entity_registry: EntityRegistry,
+    mock_config_entry: MockConfigEntry,
+    mock_helper: AsyncMock,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test we can read sensors."""
+    mock_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/sfr_box/snapshots/test_binary_sensor.ambr b/tests/components/sfr_box/snapshots/test_binary_sensor.ambr
index 15308fad91f..4718abc02b5 100644
--- a/tests/components/sfr_box/snapshots/test_binary_sensor.ambr
+++ b/tests/components/sfr_box/snapshots/test_binary_sensor.ambr
@@ -4,6 +4,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': 'http://192.168.0.1',
       'connections': set({
       }),
@@ -41,6 +42,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -72,6 +74,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -132,6 +135,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': 'http://192.168.0.1',
       'connections': set({
       }),
@@ -169,6 +173,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -200,6 +205,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
diff --git a/tests/components/sfr_box/snapshots/test_button.ambr b/tests/components/sfr_box/snapshots/test_button.ambr
index 67b2198fd2b..68a1e7f7227 100644
--- a/tests/components/sfr_box/snapshots/test_button.ambr
+++ b/tests/components/sfr_box/snapshots/test_button.ambr
@@ -4,6 +4,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': 'http://192.168.0.1',
       'connections': set({
       }),
@@ -41,6 +42,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
diff --git a/tests/components/sfr_box/snapshots/test_sensor.ambr b/tests/components/sfr_box/snapshots/test_sensor.ambr
index 7645a4ad8bf..56745c8be8e 100644
--- a/tests/components/sfr_box/snapshots/test_sensor.ambr
+++ b/tests/components/sfr_box/snapshots/test_sensor.ambr
@@ -4,6 +4,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': 'http://192.168.0.1',
       'connections': set({
       }),
@@ -48,6 +49,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -79,6 +81,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -110,6 +113,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -149,6 +153,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -180,6 +185,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -211,6 +217,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -242,6 +249,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -275,6 +283,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -308,6 +317,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -341,6 +351,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -374,6 +385,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -407,6 +419,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -440,6 +453,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -472,7 +486,7 @@
       'capabilities': dict({
         'options': list([
           'no_defect',
-          'of_frame',
+          'loss_of_frame',
           'loss_of_signal',
           'loss_of_power',
           'loss_of_signal_quality',
@@ -480,6 +494,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -524,6 +539,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -739,7 +755,7 @@
         'friendly_name': 'SFR Box DSL line status',
         'options': list([
           'no_defect',
-          'of_frame',
+          'loss_of_frame',
           'loss_of_signal',
           'loss_of_power',
           'loss_of_signal_quality',
diff --git a/tests/components/shelly/__init__.py b/tests/components/shelly/__init__.py
index 7a20560e25f..ec2d3d2c829 100644
--- a/tests/components/shelly/__init__.py
+++ b/tests/components/shelly/__init__.py
@@ -18,7 +18,7 @@ from homeassistant.components.shelly.const import (
     RPC_SENSORS_POLLING_INTERVAL,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_HOST
+from homeassistant.const import CONF_HOST, CONF_MODEL
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.device_registry import (
@@ -40,13 +40,15 @@ async def init_integration(
     sleep_period=0,
     options: dict[str, Any] | None = None,
     skip_setup: bool = False,
+    data: dict[str, Any] | None = None,
 ) -> MockConfigEntry:
     """Set up the Shelly integration in Home Assistant."""
-    data = {
-        CONF_HOST: "192.168.1.37",
-        CONF_SLEEP_PERIOD: sleep_period,
-        "model": model,
-    }
+    if data is None:
+        data = {
+            CONF_HOST: "192.168.1.37",
+            CONF_SLEEP_PERIOD: sleep_period,
+            CONF_MODEL: model,
+        }
     if gen is not None:
         data[CONF_GEN] = gen
 
@@ -141,20 +143,6 @@ def get_entity(
     )
 
 
-def get_entity_state(hass: HomeAssistant, entity_id: str) -> str:
-    """Return entity state."""
-    entity = hass.states.get(entity_id)
-    assert entity
-    return entity.state
-
-
-def get_entity_attribute(hass: HomeAssistant, entity_id: str, attribute: str) -> str:
-    """Return entity attribute."""
-    entity = hass.states.get(entity_id)
-    assert entity
-    return entity.attributes[attribute]
-
-
 def register_device(
     device_registry: DeviceRegistry, config_entry: ConfigEntry
 ) -> DeviceEntry:
diff --git a/tests/components/shelly/conftest.py b/tests/components/shelly/conftest.py
index 85cd558e918..8f8255235be 100644
--- a/tests/components/shelly/conftest.py
+++ b/tests/components/shelly/conftest.py
@@ -1,9 +1,20 @@
 """Test configuration for Shelly."""
 
+from copy import deepcopy
 from unittest.mock import AsyncMock, Mock, PropertyMock, patch
 
+from aioshelly.ble.const import (
+    BLE_CODE,
+    BLE_SCAN_RESULT_EVENT,
+    BLE_SCAN_RESULT_VERSION,
+    BLE_SCRIPT_NAME,
+    VAR_ACTIVE,
+    VAR_EVENT_TYPE,
+    VAR_VERSION,
+)
 from aioshelly.block_device import BlockDevice, BlockUpdateType
 from aioshelly.const import MODEL_1, MODEL_25, MODEL_PLUS_2PM
+from aioshelly.exceptions import NotInitialized
 from aioshelly.rpc_device import RpcDevice, RpcUpdateType
 import pytest
 
@@ -90,12 +101,15 @@ MOCK_BLOCKS = [
             "overpower": 0,
             "power": 53.4,
             "energy": 1234567.89,
+            "output": True,
+            "totalWorkTime": 3600,
         },
         channel="0",
         type="relay",
         overpower=0,
         power=53.4,
         energy=1234567.89,
+        totalWorkTime=3600,
         description="relay_0",
         set_state=AsyncMock(side_effect=lambda turn: {"ison": turn == "on"}),
     ),
@@ -122,11 +136,20 @@ MOCK_BLOCKS = [
         set_state=AsyncMock(side_effect=mock_light_set_state),
     ),
     Mock(
-        sensor_ids={"motion": 0, "temp": 22.1, "gas": "mild", "motionActive": 1},
+        sensor_ids={
+            "motion": 0,
+            "temp": 22.1,
+            "gas": "mild",
+            "motionActive": 1,
+            "sensorOp": "normal",
+            "selfTest": "pending",
+        },
         channel="0",
         motion=0,
         temp=22.1,
         gas="mild",
+        sensorOp="normal",
+        selfTest="pending",
         targetTemp=4,
         description="sensor_0",
         type="sensor",
@@ -180,6 +203,7 @@ MOCK_CONFIG = {
         "xcounts": {"expr": None, "unit": None},
         "xfreq": {"expr": None, "unit": None},
     },
+    "flood:0": {"id": 0, "name": "Test name"},
     "light:0": {"name": "test light_0"},
     "light:1": {"name": "test light_1"},
     "light:2": {"name": "test light_2"},
@@ -195,11 +219,14 @@ MOCK_CONFIG = {
     },
     "sys": {
         "ui_data": {},
-        "device": {"name": "Test name"},
+        "device": {"name": "Test name", "mac": MOCK_MAC},
     },
     "wifi": {"sta": {"enable": True}, "sta1": {"enable": False}},
     "ws": {"enable": False, "server": None},
     "voltmeter:100": {"xvoltage": {"unit": "ppm"}},
+    "script:1": {"id": 1, "name": "test_script.js", "enable": True},
+    "script:2": {"id": 2, "name": "test_script_2.js", "enable": False},
+    "script:3": {"id": 3, "name": BLE_SCRIPT_NAME, "enable": False},
 }
 
 
@@ -297,7 +324,11 @@ MOCK_STATUS_COAP = {
 
 
 MOCK_STATUS_RPC = {
-    "switch:0": {"output": True},
+    "switch:0": {
+        "id": 0,
+        "output": True,
+        "apower": 85.3,
+    },
     "input:0": {"id": 0, "state": None},
     "input:1": {"id": 1, "percent": 89, "xpercent": 8.9},
     "input:2": {
@@ -326,6 +357,7 @@ MOCK_STATUS_RPC = {
     "em1:1": {"act_power": 123.3},
     "em1data:0": {"total_act_energy": 123456.4},
     "em1data:1": {"total_act_energy": 987654.3},
+    "flood:0": {"id": 0, "alarm": False, "mute": False},
     "thermostat:0": {
         "id": 0,
         "enable": True,
@@ -333,6 +365,15 @@ MOCK_STATUS_RPC = {
         "current_C": 12.3,
         "output": True,
     },
+    "script:1": {
+        "id": 1,
+        "running": True,
+        "mem_used": 826,
+        "mem_peak": 1666,
+        "mem_free": 24360,
+    },
+    "script:2": {"id": 2, "running": False},
+    "script:3": {"id": 3, "running": False},
     "humidity:0": {"rh": 44.4},
     "sys": {
         "available_updates": {
@@ -345,6 +386,28 @@ MOCK_STATUS_RPC = {
     "wifi": {"rssi": -63},
 }
 
+MOCK_SCRIPTS = [
+    """"
+function eventHandler(event, userdata) {
+  if (typeof event.component !== "string")
+    return;
+
+  let component = event.component.substring(0, 5);
+  if (component === "input") {
+    let id = Number(event.component.substring(6));
+    Shelly.emitEvent("input_event", { id: id });
+  }
+}
+
+Shelly.addEventHandler(eventHandler);
+Shelly.emitEvent("script_start");
+""",
+    'console.log("Hello World!")',
+    BLE_CODE.replace(VAR_ACTIVE, "true")
+    .replace(VAR_EVENT_TYPE, BLE_SCAN_RESULT_EVENT)
+    .replace(VAR_VERSION, str(BLE_SCAN_RESULT_VERSION)),
+]
+
 
 @pytest.fixture(autouse=True)
 def mock_coap():
@@ -428,6 +491,10 @@ def _mock_rpc_device(version: str | None = None):
         firmware_version="some fw string",
         initialized=True,
         connected=True,
+        script_getcode=AsyncMock(
+            side_effect=lambda script_id: {"data": MOCK_SCRIPTS[script_id - 1]}
+        ),
+        xmod_info={},
     )
     type(device).name = PropertyMock(return_value="Test name")
     return device
@@ -446,6 +513,10 @@ def _mock_blu_rtv_device(version: str | None = None):
         firmware_version="some fw string",
         initialized=True,
         connected=True,
+        script_getcode=AsyncMock(
+            side_effect=lambda script_id: {"data": MOCK_SCRIPTS[script_id - 1]}
+        ),
+        xmod_info={},
     )
     type(device).name = PropertyMock(return_value="Test name")
     return device
@@ -519,3 +590,99 @@ async def mock_blu_trv():
         blu_trv_device_mock.return_value.mock_update = Mock(side_effect=update)
 
         yield blu_trv_device_mock.return_value
+
+
+def _mock_sleepy_not_initialized_rpc_device():
+    """Mock sleepy NotInitialized rpc (Gen2+, Websocket) device."""
+    device = Mock(spec=RpcDevice, initialized=False, connected=False)
+    type(device).requires_auth = PropertyMock(side_effect=NotInitialized)
+    type(device).status = PropertyMock(side_effect=NotInitialized)
+    type(device).event = PropertyMock(side_effect=NotInitialized)
+    type(device).config = PropertyMock(side_effect=NotInitialized)
+    type(device).shelly = PropertyMock(side_effect=NotInitialized)
+    type(device).gen = PropertyMock(side_effect=NotInitialized)
+    type(device).firmware_version = PropertyMock(side_effect=NotInitialized)
+    type(device).version = PropertyMock(side_effect=NotInitialized)
+    type(device).model = PropertyMock(side_effect=NotInitialized)
+    type(device).xmod_info = PropertyMock(side_effect=NotInitialized)
+    type(device).hostname = PropertyMock(side_effect=NotInitialized)
+    type(device).name = PropertyMock(side_effect=NotInitialized)
+    type(device).firmware_supported = PropertyMock(side_effect=NotInitialized)
+    return device
+
+
+def initialize_sleepy_rpc_device(device):
+    """Initialize a sleepy RPC (Gen2+, Websocket) device."""
+    status = deepcopy(MOCK_STATUS_RPC)
+    status["sys"]["wakeup_period"] = 1000
+
+    type(device).requires_auth = PropertyMock(return_value=False)
+    type(device).status = PropertyMock(return_value=status)
+    type(device).event = PropertyMock(return_value={})
+    type(device).config = PropertyMock(return_value=MOCK_CONFIG)
+    type(device).shelly = PropertyMock(return_value=MOCK_SHELLY_RPC)
+    type(device).gen = PropertyMock(return_value=2)
+    type(device).firmware_version = PropertyMock(
+        return_value="20240425-141520/1.3.0-ga3fdd3d"
+    )
+    type(device).version = PropertyMock(return_value="1.3.0")
+    type(device).model = PropertyMock(return_value="SPSW-201PE16EU")
+    type(device).xmod_info = PropertyMock(return_value={})
+    type(device).hostname = PropertyMock(return_value="hostname")
+    type(device).name = PropertyMock(return_value="Test Name")
+    type(device).firmware_supported = PropertyMock(return_value=True)
+
+    device.connected = True
+    device.initialized = True
+
+
+@pytest.fixture
+async def mock_sleepy_rpc_device():
+    """Mock sleepy RPC (Gen2+, Websocket) device.
+
+    Mock a RPC device that is not initialized and raises NotInitialized
+    when aioshelly properties are accessed.
+
+    Initialize the device when initialize() method is called.
+    """
+    with patch("aioshelly.rpc_device.RpcDevice.create") as rpc_device_mock:
+
+        def update():
+            rpc_device_mock.return_value.subscribe_updates.call_args[0][0](
+                {}, RpcUpdateType.STATUS
+            )
+
+        def event():
+            rpc_device_mock.return_value.subscribe_updates.call_args[0][0](
+                {}, RpcUpdateType.EVENT
+            )
+
+        def online():
+            rpc_device_mock.return_value.subscribe_updates.call_args[0][0](
+                {}, RpcUpdateType.ONLINE
+            )
+
+        def disconnected():
+            rpc_device_mock.return_value.subscribe_updates.call_args[0][0](
+                {}, RpcUpdateType.DISCONNECTED
+            )
+
+        def initialized():
+            rpc_device_mock.return_value.subscribe_updates.call_args[0][0](
+                {}, RpcUpdateType.INITIALIZED
+            )
+
+        def _initialize():
+            initialize_sleepy_rpc_device(device)
+
+        device = _mock_sleepy_not_initialized_rpc_device()
+        device.initialize = AsyncMock(side_effect=_initialize)
+        rpc_device_mock.return_value = device
+
+        rpc_device_mock.return_value.mock_disconnected = Mock(side_effect=disconnected)
+        rpc_device_mock.return_value.mock_update = Mock(side_effect=update)
+        rpc_device_mock.return_value.mock_event = Mock(side_effect=event)
+        rpc_device_mock.return_value.mock_online = Mock(side_effect=online)
+        rpc_device_mock.return_value.mock_initialized = Mock(side_effect=initialized)
+
+        yield rpc_device_mock.return_value
diff --git a/tests/components/shelly/snapshots/test_binary_sensor.ambr b/tests/components/shelly/snapshots/test_binary_sensor.ambr
index 8dcb7b00a42..fcc6377837e 100644
--- a/tests/components/shelly/snapshots/test_binary_sensor.ambr
+++ b/tests/components/shelly/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -46,3 +47,98 @@
     'state': 'off',
   })
 # ---
+# name: test_rpc_flood_entities[binary_sensor.test_name_flood-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.test_name_flood',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.MOISTURE: 'moisture'>,
+    'original_icon': None,
+    'original_name': 'Test name flood',
+    'platform': 'shelly',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '123456789ABC-flood:0-flood',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_rpc_flood_entities[binary_sensor.test_name_flood-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'moisture',
+      'friendly_name': 'Test name flood',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_name_flood',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_rpc_flood_entities[binary_sensor.test_name_mute-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.test_name_mute',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Test name mute',
+    'platform': 'shelly',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '123456789ABC-flood:0-mute',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_rpc_flood_entities[binary_sensor.test_name_mute-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test name mute',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_name_mute',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
diff --git a/tests/components/shelly/snapshots/test_button.ambr b/tests/components/shelly/snapshots/test_button.ambr
new file mode 100644
index 00000000000..f5a38f1b847
--- /dev/null
+++ b/tests/components/shelly/snapshots/test_button.ambr
@@ -0,0 +1,96 @@
+# serializer version: 1
+# name: test_rpc_blu_trv_button[button.trv_name_calibrate-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'button',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'button.trv_name_calibrate',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'TRV-Name Calibrate',
+    'platform': 'shelly',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'calibrate',
+    'unique_id': 'f8:44:77:25:f0:dd_calibrate',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_rpc_blu_trv_button[button.trv_name_calibrate-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'TRV-Name Calibrate',
+    }),
+    'context': <ANY>,
+    'entity_id': 'button.trv_name_calibrate',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_rpc_button[button.test_name_reboot-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'button',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'button.test_name_reboot',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <ButtonDeviceClass.RESTART: 'restart'>,
+    'original_icon': None,
+    'original_name': 'Test name Reboot',
+    'platform': 'shelly',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '123456789ABC_reboot',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_rpc_button[button.test_name_reboot-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'restart',
+      'friendly_name': 'Test name Reboot',
+    }),
+    'context': <ANY>,
+    'entity_id': 'button.test_name_reboot',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
diff --git a/tests/components/shelly/snapshots/test_climate.ambr b/tests/components/shelly/snapshots/test_climate.ambr
new file mode 100644
index 00000000000..991c570172e
--- /dev/null
+++ b/tests/components/shelly/snapshots/test_climate.ambr
@@ -0,0 +1,276 @@
+# serializer version: 1
+# name: test_blu_trv_climate_set_temperature[climate.trv_name-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'hvac_modes': list([
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'max_temp': 30,
+      'min_temp': 4,
+      'target_temp_step': 0.1,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'climate',
+    'entity_category': None,
+    'entity_id': 'climate.trv_name',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'shelly',
+    'previous_unique_id': None,
+    'supported_features': <ClimateEntityFeature: 257>,
+    'translation_key': None,
+    'unique_id': 'f8:44:77:25:f0:dd-blutrv:200',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_blu_trv_climate_set_temperature[climate.trv_name-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_temperature': 15.2,
+      'friendly_name': 'TRV-Name',
+      'hvac_action': <HVACAction.IDLE: 'idle'>,
+      'hvac_modes': list([
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'max_temp': 30,
+      'min_temp': 4,
+      'supported_features': <ClimateEntityFeature: 257>,
+      'target_temp_step': 0.1,
+      'temperature': 17.1,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.trv_name',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'heat',
+  })
+# ---
+# name: test_climate_hvac_mode[climate.test_name-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'max_temp': 31,
+      'min_temp': 4,
+      'preset_modes': list([
+        'none',
+        'Profile1',
+        'Profile2',
+      ]),
+      'target_temp_step': 0.5,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'climate',
+    'entity_category': None,
+    'entity_id': 'climate.test_name',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Test name',
+    'platform': 'shelly',
+    'previous_unique_id': None,
+    'supported_features': <ClimateEntityFeature: 401>,
+    'translation_key': None,
+    'unique_id': '123456789ABC-sensor_0',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_climate_hvac_mode[climate.test_name-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_temperature': 22.1,
+      'friendly_name': 'Test name',
+      'hvac_action': <HVACAction.OFF: 'off'>,
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'max_temp': 31,
+      'min_temp': 4,
+      'preset_mode': 'none',
+      'preset_modes': list([
+        'none',
+        'Profile1',
+        'Profile2',
+      ]),
+      'supported_features': <ClimateEntityFeature: 401>,
+      'target_temp_step': 0.5,
+      'temperature': 4,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.test_name',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_rpc_climate_hvac_mode[climate.test_name_thermostat_0-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'max_temp': 35,
+      'min_temp': 5,
+      'target_temp_step': 0.5,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'climate',
+    'entity_category': None,
+    'entity_id': 'climate.test_name_thermostat_0',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Test name Thermostat 0',
+    'platform': 'shelly',
+    'previous_unique_id': None,
+    'supported_features': <ClimateEntityFeature: 385>,
+    'translation_key': None,
+    'unique_id': '123456789ABC-thermostat:0',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_rpc_climate_hvac_mode[climate.test_name_thermostat_0-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_humidity': 44.4,
+      'current_temperature': 12.3,
+      'friendly_name': 'Test name Thermostat 0',
+      'hvac_action': <HVACAction.HEATING: 'heating'>,
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'max_temp': 35,
+      'min_temp': 5,
+      'supported_features': <ClimateEntityFeature: 385>,
+      'target_temp_step': 0.5,
+      'temperature': 23,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.test_name_thermostat_0',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'heat',
+  })
+# ---
+# name: test_wall_display_thermostat_mode[climate.test_name_thermostat_0-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'max_temp': 35,
+      'min_temp': 5,
+      'target_temp_step': 0.5,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'climate',
+    'entity_category': None,
+    'entity_id': 'climate.test_name_thermostat_0',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Test name Thermostat 0',
+    'platform': 'shelly',
+    'previous_unique_id': None,
+    'supported_features': <ClimateEntityFeature: 385>,
+    'translation_key': None,
+    'unique_id': '123456789ABC-thermostat:0',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_wall_display_thermostat_mode[climate.test_name_thermostat_0-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_humidity': 44.4,
+      'current_temperature': 12.3,
+      'friendly_name': 'Test name Thermostat 0',
+      'hvac_action': <HVACAction.HEATING: 'heating'>,
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'max_temp': 35,
+      'min_temp': 5,
+      'supported_features': <ClimateEntityFeature: 385>,
+      'target_temp_step': 0.5,
+      'temperature': 23,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.test_name_thermostat_0',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'heat',
+  })
+# ---
diff --git a/tests/components/shelly/snapshots/test_event.ambr b/tests/components/shelly/snapshots/test_event.ambr
new file mode 100644
index 00000000000..ae719774aee
--- /dev/null
+++ b/tests/components/shelly/snapshots/test_event.ambr
@@ -0,0 +1,70 @@
+# serializer version: 1
+# name: test_rpc_script_1_event[event.test_name_test_script_js-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'event_types': list([
+        'input_event',
+        'script_start',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'event',
+    'entity_category': None,
+    'entity_id': 'event.test_name_test_script_js',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'test_script.js',
+    'platform': 'shelly',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'script',
+    'unique_id': '123456789ABC-script:1',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_rpc_script_1_event[event.test_name_test_script_js-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'event_type': None,
+      'event_types': list([
+        'input_event',
+        'script_start',
+      ]),
+      'friendly_name': 'Test name test_script.js',
+    }),
+    'context': <ANY>,
+    'entity_id': 'event.test_name_test_script_js',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_rpc_script_2_event[event.test_name_test_script_2_js-entry]
+  None
+# ---
+# name: test_rpc_script_2_event[event.test_name_test_script_2_js-state]
+  None
+# ---
+# name: test_rpc_script_ble_event[event.test_name_aioshelly_ble_integration-entry]
+  None
+# ---
+# name: test_rpc_script_ble_event[event.test_name_aioshelly_ble_integration-state]
+  None
+# ---
diff --git a/tests/components/shelly/snapshots/test_number.ambr b/tests/components/shelly/snapshots/test_number.ambr
index 965d44698c2..07fda999556 100644
--- a/tests/components/shelly/snapshots/test_number.ambr
+++ b/tests/components/shelly/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,7 +53,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '15.2',
+    'state': 'unknown',
   })
 # ---
 # name: test_blu_trv_number_entity[number.trv_name_valve_position-entry]
@@ -67,6 +68,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/shelly/snapshots/test_sensor.ambr b/tests/components/shelly/snapshots/test_sensor.ambr
index 8ab767ca889..cb39b148c8a 100644
--- a/tests/components/shelly/snapshots/test_sensor.ambr
+++ b/tests/components/shelly/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -110,6 +112,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/shelly/test_binary_sensor.py b/tests/components/shelly/test_binary_sensor.py
index bff6d199d0e..ea3a7d5f3d2 100644
--- a/tests/components/shelly/test_binary_sensor.py
+++ b/tests/components/shelly/test_binary_sensor.py
@@ -3,7 +3,7 @@
 from copy import deepcopy
 from unittest.mock import Mock
 
-from aioshelly.const import MODEL_BLU_GATEWAY_GEN3, MODEL_MOTION
+from aioshelly.const import MODEL_BLU_GATEWAY_G3, MODEL_MOTION
 from freezegun.api import FrozenDateTimeFactory
 import pytest
 from syrupy import SnapshotAssertion
@@ -39,15 +39,16 @@ async def test_block_binary_sensor(
     entity_id = f"{BINARY_SENSOR_DOMAIN}.test_name_channel_1_overpowering"
     await init_integration(hass, 1)
 
-    assert hass.states.get(entity_id).state == STATE_OFF
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_OFF
 
     monkeypatch.setattr(mock_block_device.blocks[RELAY_BLOCK_ID], "overpower", 1)
     mock_block_device.mock_update()
 
-    assert hass.states.get(entity_id).state == STATE_ON
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-relay_0-overpower"
 
 
@@ -61,19 +62,18 @@ async def test_block_binary_sensor_extra_state_attr(
     entity_id = f"{BINARY_SENSOR_DOMAIN}.test_name_gas"
     await init_integration(hass, 1)
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
     assert state.attributes.get("detected") == "mild"
 
     monkeypatch.setattr(mock_block_device.blocks[SENSOR_BLOCK_ID], "gas", "none")
     mock_block_device.mock_update()
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_OFF
     assert state.attributes.get("detected") == "none"
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-sensor_0-gas"
 
 
@@ -89,15 +89,16 @@ async def test_block_rest_binary_sensor(
     monkeypatch.setitem(mock_block_device.status, "cloud", {"connected": False})
     await init_integration(hass, 1)
 
-    assert hass.states.get(entity_id).state == STATE_OFF
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_OFF
 
     monkeypatch.setitem(mock_block_device.status["cloud"], "connected", True)
     await mock_rest_update(hass, freezer)
 
-    assert hass.states.get(entity_id).state == STATE_ON
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-cloud"
 
 
@@ -115,20 +116,22 @@ async def test_block_rest_binary_sensor_connected_battery_devices(
     monkeypatch.setitem(mock_block_device.settings["coiot"], "update_period", 3600)
     await init_integration(hass, 1, model=MODEL_MOTION)
 
-    assert hass.states.get(entity_id).state == STATE_OFF
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_OFF
 
     monkeypatch.setitem(mock_block_device.status["cloud"], "connected", True)
 
     # Verify no update on fast intervals
     await mock_rest_update(hass, freezer)
-    assert hass.states.get(entity_id).state == STATE_OFF
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_OFF
 
     # Verify update on slow intervals
     await mock_rest_update(hass, freezer, seconds=UPDATE_PERIOD_MULTIPLIER * 3600)
-    assert hass.states.get(entity_id).state == STATE_ON
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-cloud"
 
 
@@ -149,15 +152,16 @@ async def test_block_sleeping_binary_sensor(
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert hass.states.get(entity_id).state == STATE_OFF
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_OFF
 
     monkeypatch.setattr(mock_block_device.blocks[SENSOR_BLOCK_ID], "motion", 1)
     mock_block_device.mock_update()
 
-    assert hass.states.get(entity_id).state == STATE_ON
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-sensor_0-motion"
 
 
@@ -183,14 +187,16 @@ async def test_block_restored_sleeping_binary_sensor(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == STATE_ON
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
     # Make device online
     monkeypatch.setattr(mock_block_device, "initialized", True)
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert hass.states.get(entity_id).state == STATE_OFF
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_OFF
 
 
 async def test_block_restored_sleeping_binary_sensor_no_last_state(
@@ -214,14 +220,16 @@ async def test_block_restored_sleeping_binary_sensor_no_last_state(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == STATE_UNKNOWN
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_UNKNOWN
 
     # Make device online
     monkeypatch.setattr(mock_block_device, "initialized", True)
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert hass.states.get(entity_id).state == STATE_OFF
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_OFF
 
 
 async def test_rpc_binary_sensor(
@@ -234,17 +242,18 @@ async def test_rpc_binary_sensor(
     entity_id = f"{BINARY_SENSOR_DOMAIN}.test_cover_0_overpowering"
     await init_integration(hass, 2)
 
-    assert hass.states.get(entity_id).state == STATE_OFF
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_OFF
 
     mutate_rpc_device_status(
         monkeypatch, mock_rpc_device, "cover:0", "errors", "overpower"
     )
     mock_rpc_device.mock_update()
 
-    assert hass.states.get(entity_id).state == STATE_ON
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-cover:0-overpower"
 
 
@@ -290,20 +299,22 @@ async def test_rpc_sleeping_binary_sensor(
     mock_rpc_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert hass.states.get(entity_id).state == STATE_OFF
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_OFF
 
     mutate_rpc_device_status(monkeypatch, mock_rpc_device, "cloud", "connected", True)
     mock_rpc_device.mock_update()
 
-    assert hass.states.get(entity_id).state == STATE_ON
-
-    # test external power sensor
-    state = hass.states.get("binary_sensor.test_name_external_power")
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
 
-    entry = entity_registry.async_get("binary_sensor.test_name_external_power")
-    assert entry
+    # test external power sensor
+    assert (state := hass.states.get("binary_sensor.test_name_external_power"))
+    assert state.state == STATE_ON
+
+    assert (
+        entry := entity_registry.async_get("binary_sensor.test_name_external_power")
+    )
     assert entry.unique_id == "123456789ABC-devicepower:0-external_power"
 
 
@@ -331,14 +342,16 @@ async def test_rpc_restored_sleeping_binary_sensor(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == STATE_ON
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
     # Make device online
     monkeypatch.setattr(mock_rpc_device, "initialized", True)
     mock_rpc_device.mock_update()
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == STATE_OFF
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_OFF
 
 
 async def test_rpc_restored_sleeping_binary_sensor_no_last_state(
@@ -364,7 +377,8 @@ async def test_rpc_restored_sleeping_binary_sensor_no_last_state(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == STATE_UNKNOWN
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_UNKNOWN
 
     # Make device online
     monkeypatch.setattr(mock_rpc_device, "initialized", True)
@@ -375,7 +389,8 @@ async def test_rpc_restored_sleeping_binary_sensor_no_last_state(
     mock_rpc_device.mock_update()
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == STATE_OFF
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_OFF
 
 
 @pytest.mark.parametrize(
@@ -407,17 +422,17 @@ async def test_rpc_device_virtual_binary_sensor(
 
     await init_integration(hass, 3)
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-boolean:203-boolean"
 
     monkeypatch.setitem(mock_rpc_device.status["boolean:203"], "value", False)
     mock_rpc_device.mock_update()
-    assert hass.states.get(entity_id).state == STATE_OFF
+
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_OFF
 
 
 async def test_rpc_remove_virtual_binary_sensor_when_mode_toggle(
@@ -450,8 +465,7 @@ async def test_rpc_remove_virtual_binary_sensor_when_mode_toggle(
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    entry = entity_registry.async_get(entity_id)
-    assert not entry
+    assert entity_registry.async_get(entity_id) is None
 
 
 async def test_rpc_remove_virtual_binary_sensor_when_orphaned(
@@ -475,8 +489,7 @@ async def test_rpc_remove_virtual_binary_sensor_when_orphaned(
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    entry = entity_registry.async_get(entity_id)
-    assert not entry
+    assert entity_registry.async_get(entity_id) is None
 
 
 async def test_blu_trv_binary_sensor_entity(
@@ -486,7 +499,7 @@ async def test_blu_trv_binary_sensor_entity(
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test BLU TRV binary sensor entity."""
-    await init_integration(hass, 3, model=MODEL_BLU_GATEWAY_GEN3)
+    await init_integration(hass, 3, model=MODEL_BLU_GATEWAY_G3)
 
     for entity in ("calibration",):
         entity_id = f"{BINARY_SENSOR_DOMAIN}.trv_name_{entity}"
@@ -496,3 +509,22 @@ async def test_blu_trv_binary_sensor_entity(
 
         entry = entity_registry.async_get(entity_id)
         assert entry == snapshot(name=f"{entity_id}-entry")
+
+
+async def test_rpc_flood_entities(
+    hass: HomeAssistant,
+    mock_rpc_device: Mock,
+    entity_registry: EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test RPC flood sensor entities."""
+    await init_integration(hass, 4)
+
+    for entity in ("flood", "mute"):
+        entity_id = f"{BINARY_SENSOR_DOMAIN}.test_name_{entity}"
+
+        state = hass.states.get(entity_id)
+        assert state == snapshot(name=f"{entity_id}-state")
+
+        entry = entity_registry.async_get(entity_id)
+        assert entry == snapshot(name=f"{entity_id}-entry")
diff --git a/tests/components/shelly/test_button.py b/tests/components/shelly/test_button.py
index 14349411670..2057076d18b 100644
--- a/tests/components/shelly/test_button.py
+++ b/tests/components/shelly/test_button.py
@@ -2,12 +2,17 @@
 
 from unittest.mock import Mock
 
+from aioshelly.const import MODEL_BLU_GATEWAY_G3
+from aioshelly.exceptions import DeviceConnectionError, InvalidAuthError, RpcCallError
 import pytest
+from syrupy import SnapshotAssertion
 
 from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
 from homeassistant.components.shelly.const import DOMAIN
+from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntryState
 from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_registry import EntityRegistry
 
 from . import init_integration
@@ -22,10 +27,10 @@ async def test_block_button(
     entity_id = "button.test_name_reboot"
 
     # reboot button
-    assert hass.states.get(entity_id).state == STATE_UNKNOWN
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_UNKNOWN
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC_reboot"
 
     await hass.services.async_call(
@@ -38,7 +43,10 @@ async def test_block_button(
 
 
 async def test_rpc_button(
-    hass: HomeAssistant, mock_rpc_device: Mock, entity_registry: EntityRegistry
+    hass: HomeAssistant,
+    mock_rpc_device: Mock,
+    entity_registry: EntityRegistry,
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test rpc device OTA button."""
     await init_integration(hass, 2)
@@ -46,11 +54,11 @@ async def test_rpc_button(
     entity_id = "button.test_name_reboot"
 
     # reboot button
-    assert hass.states.get(entity_id).state == STATE_UNKNOWN
+    assert (state := hass.states.get(entity_id))
+    assert state == snapshot(name=f"{entity_id}-state")
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
-    assert entry.unique_id == "123456789ABC_reboot"
+    assert (entry := entity_registry.async_get(entity_id))
+    assert entry == snapshot(name=f"{entity_id}-entry")
 
     await hass.services.async_call(
         BUTTON_DOMAIN,
@@ -61,6 +69,68 @@ async def test_rpc_button(
     assert mock_rpc_device.trigger_reboot.call_count == 1
 
 
+@pytest.mark.parametrize(
+    ("exception", "error"),
+    [
+        (
+            DeviceConnectionError,
+            "Device communication error occurred while calling action for button.test_name_reboot of Test name",
+        ),
+        (
+            RpcCallError(999),
+            "RPC call error occurred while calling action for button.test_name_reboot of Test name",
+        ),
+    ],
+)
+async def test_rpc_button_exc(
+    hass: HomeAssistant,
+    mock_rpc_device: Mock,
+    exception: Exception,
+    error: str,
+) -> None:
+    """Test RPC button with exception."""
+    await init_integration(hass, 2)
+
+    mock_rpc_device.trigger_reboot.side_effect = exception
+
+    with pytest.raises(HomeAssistantError, match=error):
+        await hass.services.async_call(
+            BUTTON_DOMAIN,
+            SERVICE_PRESS,
+            {ATTR_ENTITY_ID: "button.test_name_reboot"},
+            blocking=True,
+        )
+
+
+async def test_rpc_button_reauth_error(
+    hass: HomeAssistant, mock_rpc_device: Mock
+) -> None:
+    """Test rpc device OTA button with authentication error."""
+    entry = await init_integration(hass, 2)
+
+    mock_rpc_device.trigger_reboot.side_effect = InvalidAuthError
+
+    await hass.services.async_call(
+        BUTTON_DOMAIN,
+        SERVICE_PRESS,
+        {ATTR_ENTITY_ID: "button.test_name_reboot"},
+        blocking=True,
+    )
+
+    assert entry.state is ConfigEntryState.LOADED
+
+    flows = hass.config_entries.flow.async_progress()
+    assert len(flows) == 1
+
+    flow = flows[0]
+    assert flow.get("step_id") == "reauth_confirm"
+    assert flow.get("handler") == DOMAIN
+
+    assert "context" in flow
+    assert flow["context"].get("source") == SOURCE_REAUTH
+    assert flow["context"].get("entry_id") == entry.entry_id
+
+
 @pytest.mark.parametrize(
     ("gen", "old_unique_id", "new_unique_id", "migration"),
     [
@@ -104,3 +174,107 @@ async def test_migrate_unique_id(
         bool("Migrating unique_id for button.test_name_reboot" in caplog.text)
         == migration
     )
+
+
+async def test_rpc_blu_trv_button(
+    hass: HomeAssistant,
+    mock_blu_trv: Mock,
+    entity_registry: EntityRegistry,
+    monkeypatch: pytest.MonkeyPatch,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test RPC BLU TRV button."""
+    monkeypatch.delitem(mock_blu_trv.status, "script:1")
+    monkeypatch.delitem(mock_blu_trv.status, "script:2")
+    monkeypatch.delitem(mock_blu_trv.status, "script:3")
+
+    await init_integration(hass, 3, model=MODEL_BLU_GATEWAY_G3)
+
+    entity_id = "button.trv_name_calibrate"
+
+    state = hass.states.get(entity_id)
+    assert state == snapshot(name=f"{entity_id}-state")
+
+    entry = entity_registry.async_get(entity_id)
+    assert entry == snapshot(name=f"{entity_id}-entry")
+
+    await hass.services.async_call(
+        BUTTON_DOMAIN,
+        SERVICE_PRESS,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+    assert mock_blu_trv.trigger_blu_trv_calibration.call_count == 1
+
+
+@pytest.mark.parametrize(
+    ("exception", "error"),
+    [
+        (
+            DeviceConnectionError,
+            "Device communication error occurred while calling action for button.trv_name_calibrate of Test name",
+        ),
+        (
+            RpcCallError(999),
+            "RPC call error occurred while calling action for button.trv_name_calibrate of Test name",
+        ),
+    ],
+)
+async def test_rpc_blu_trv_button_exc(
+    hass: HomeAssistant,
+    mock_blu_trv: Mock,
+    monkeypatch: pytest.MonkeyPatch,
+    exception: Exception,
+    error: str,
+) -> None:
+    """Test RPC BLU TRV button with exception."""
+    monkeypatch.delitem(mock_blu_trv.status, "script:1")
+    monkeypatch.delitem(mock_blu_trv.status, "script:2")
+    monkeypatch.delitem(mock_blu_trv.status, "script:3")
+
+    await init_integration(hass, 3, model=MODEL_BLU_GATEWAY_G3)
+
+    mock_blu_trv.trigger_blu_trv_calibration.side_effect = exception
+
+    with pytest.raises(HomeAssistantError, match=error):
+        await hass.services.async_call(
+            BUTTON_DOMAIN,
+            SERVICE_PRESS,
+            {ATTR_ENTITY_ID: "button.trv_name_calibrate"},
+            blocking=True,
+        )
+
+
+async def test_rpc_blu_trv_button_auth_error(
+    hass: HomeAssistant,
+    mock_blu_trv: Mock,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Test RPC BLU TRV button with authentication error."""
+    monkeypatch.delitem(mock_blu_trv.status, "script:1")
+    monkeypatch.delitem(mock_blu_trv.status, "script:2")
+    monkeypatch.delitem(mock_blu_trv.status, "script:3")
+
+    entry = await init_integration(hass, 3, model=MODEL_BLU_GATEWAY_G3)
+
+    mock_blu_trv.trigger_blu_trv_calibration.side_effect = InvalidAuthError
+
+    await hass.services.async_call(
+        BUTTON_DOMAIN,
+        SERVICE_PRESS,
+        {ATTR_ENTITY_ID: "button.trv_name_calibrate"},
+        blocking=True,
+    )
+
+    assert entry.state is ConfigEntryState.LOADED
+
+    flows = hass.config_entries.flow.async_progress()
+    assert len(flows) == 1
+
+    flow = flows[0]
+    assert flow.get("step_id") == "reauth_confirm"
+    assert flow.get("handler") == DOMAIN
+
+    assert "context" in flow
+    assert flow["context"].get("source") == SOURCE_REAUTH
+    assert flow["context"].get("entry_id") == entry.entry_id
diff --git a/tests/components/shelly/test_climate.py b/tests/components/shelly/test_climate.py
index 352bdcb0a7d..b2135fb38af 100644
--- a/tests/components/shelly/test_climate.py
+++ b/tests/components/shelly/test_climate.py
@@ -5,12 +5,14 @@ from unittest.mock import AsyncMock, Mock, PropertyMock
 
 from aioshelly.const import (
     BLU_TRV_IDENTIFIER,
-    MODEL_BLU_GATEWAY_GEN3,
+    BLU_TRV_TIMEOUT,
+    MODEL_BLU_GATEWAY_G3,
     MODEL_VALVE,
     MODEL_WALL_DISPLAY,
 )
 from aioshelly.exceptions import DeviceConnectionError, InvalidAuthError
 import pytest
+from syrupy import SnapshotAssertion
 
 from homeassistant.components.climate import (
     ATTR_CURRENT_HUMIDITY,
@@ -42,13 +44,7 @@ from homeassistant.helpers.device_registry import DeviceRegistry
 from homeassistant.helpers.entity_registry import EntityRegistry
 from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM
 
-from . import (
-    MOCK_MAC,
-    get_entity_attribute,
-    init_integration,
-    register_device,
-    register_entity,
-)
+from . import MOCK_MAC, init_integration, register_device, register_entity
 from .conftest import MOCK_STATUS_COAP
 
 from tests.common import mock_restore_cache, mock_restore_cache_with_extra_data
@@ -65,6 +61,7 @@ async def test_climate_hvac_mode(
     mock_block_device: Mock,
     monkeypatch: pytest.MonkeyPatch,
     entity_registry: EntityRegistry,
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test climate hvac mode service."""
     monkeypatch.delattr(mock_block_device.blocks[DEVICE_BLOCK_ID], "targetTemp")
@@ -83,12 +80,9 @@ async def test_climate_hvac_mode(
     await hass.async_block_till_done(wait_background_tasks=True)
 
     # Test initial hvac mode - off
-    state = hass.states.get(ENTITY_ID)
-    assert state.state == HVACMode.OFF
+    assert hass.states.get(ENTITY_ID) == snapshot(name=f"{ENTITY_ID}-state")
 
-    entry = entity_registry.async_get(ENTITY_ID)
-    assert entry
-    assert entry.unique_id == "123456789ABC-sensor_0"
+    assert entity_registry.async_get(ENTITY_ID) == snapshot(name=f"{ENTITY_ID}-entry")
 
     # Test set hvac mode heat
     await hass.services.async_call(
@@ -103,7 +97,8 @@ async def test_climate_hvac_mode(
 
     monkeypatch.setattr(mock_block_device.blocks[SENSOR_BLOCK_ID], "targetTemp", 20.0)
     mock_block_device.mock_update()
-    state = hass.states.get(ENTITY_ID)
+
+    assert (state := hass.states.get(ENTITY_ID))
     assert state.state == HVACMode.HEAT
 
     # Test set hvac mode off
@@ -120,13 +115,13 @@ async def test_climate_hvac_mode(
 
     monkeypatch.setattr(mock_block_device.blocks[SENSOR_BLOCK_ID], "targetTemp", 4.0)
     mock_block_device.mock_update()
-    state = hass.states.get(ENTITY_ID)
+    assert (state := hass.states.get(ENTITY_ID))
     assert state.state == HVACMode.OFF
 
     # Test unavailable on error
     monkeypatch.setattr(mock_block_device.blocks[DEVICE_BLOCK_ID], "valveError", 1)
     mock_block_device.mock_update()
-    state = hass.states.get(ENTITY_ID)
+    assert (state := hass.states.get(ENTITY_ID))
     assert state.state == STATE_UNAVAILABLE
 
 
@@ -143,7 +138,7 @@ async def test_climate_set_temperature(
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    state = hass.states.get(ENTITY_ID)
+    assert (state := hass.states.get(ENTITY_ID))
     assert state.state == HVACMode.OFF
     assert state.attributes[ATTR_TEMPERATURE] == 4
 
@@ -197,7 +192,7 @@ async def test_climate_set_preset_mode(
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    state = hass.states.get(ENTITY_ID)
+    assert (state := hass.states.get(ENTITY_ID))
     assert state.attributes[ATTR_PRESET_MODE] == PRESET_NONE
 
     # Test set Profile2
@@ -215,7 +210,7 @@ async def test_climate_set_preset_mode(
     monkeypatch.setattr(mock_block_device.blocks[DEVICE_BLOCK_ID], "mode", 2)
     mock_block_device.mock_update()
 
-    state = hass.states.get(ENTITY_ID)
+    assert (state := hass.states.get(ENTITY_ID))
     assert state.attributes[ATTR_PRESET_MODE] == "Profile2"
 
     # Set preset to none
@@ -234,7 +229,7 @@ async def test_climate_set_preset_mode(
     monkeypatch.setattr(mock_block_device.blocks[DEVICE_BLOCK_ID], "mode", 0)
     mock_block_device.mock_update()
 
-    state = hass.states.get(ENTITY_ID)
+    assert (state := hass.states.get(ENTITY_ID))
     assert state.attributes[ATTR_PRESET_MODE] == PRESET_NONE
 
 
@@ -269,23 +264,26 @@ async def test_block_restored_climate(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == HVACMode.OFF
-    assert hass.states.get(entity_id).attributes.get("temperature") == 4.0
+    assert (state := hass.states.get(entity_id))
+    assert state.state == HVACMode.OFF
+    assert state.attributes.get(ATTR_TEMPERATURE) == 4.0
 
     # Partial update, should not change state
     mock_block_device.mock_update()
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == HVACMode.OFF
-    assert hass.states.get(entity_id).attributes.get("temperature") == 4.0
+    assert (state := hass.states.get(entity_id))
+    assert state.state == HVACMode.OFF
+    assert state.attributes.get(ATTR_TEMPERATURE) == 4.0
 
     # Make device online
     monkeypatch.setattr(mock_block_device, "initialized", True)
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert hass.states.get(entity_id).state == HVACMode.OFF
-    assert hass.states.get(entity_id).attributes.get("temperature") == 4.0
+    assert (state := hass.states.get(entity_id))
+    assert state.state == HVACMode.OFF
+    assert state.attributes.get(ATTR_TEMPERATURE) == 4.0
 
     # Test set hvac mode heat, target temp should be set to last target temp (22)
     await hass.services.async_call(
@@ -300,9 +298,10 @@ async def test_block_restored_climate(
 
     monkeypatch.setattr(mock_block_device.blocks[SENSOR_BLOCK_ID], "targetTemp", 22.0)
     mock_block_device.mock_update()
-    state = hass.states.get(ENTITY_ID)
+
+    assert (state := hass.states.get(entity_id))
     assert state.state == HVACMode.HEAT
-    assert hass.states.get(entity_id).attributes.get("temperature") == 22.0
+    assert state.attributes.get(ATTR_TEMPERATURE) == 22.0
 
 
 async def test_block_restored_climate_us_customary(
@@ -337,17 +336,19 @@ async def test_block_restored_climate_us_customary(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == HVACMode.OFF
-    assert hass.states.get(entity_id).attributes.get("temperature") == 39
-    assert hass.states.get(entity_id).attributes.get("current_temperature") == 67
+    assert (state := hass.states.get(entity_id))
+    assert state.state == HVACMode.OFF
+    assert state.attributes.get(ATTR_TEMPERATURE) == 39
+    assert state.attributes.get(ATTR_CURRENT_TEMPERATURE) == 67
 
     # Partial update, should not change state
     mock_block_device.mock_update()
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == HVACMode.OFF
-    assert hass.states.get(entity_id).attributes.get("temperature") == 39
-    assert hass.states.get(entity_id).attributes.get("current_temperature") == 67
+    assert (state := hass.states.get(entity_id))
+    assert state.state == HVACMode.OFF
+    assert state.attributes.get(ATTR_TEMPERATURE) == 39
+    assert state.attributes.get(ATTR_CURRENT_TEMPERATURE) == 67
 
     # Make device online
     monkeypatch.setattr(mock_block_device, "initialized", True)
@@ -356,9 +357,10 @@ async def test_block_restored_climate_us_customary(
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert hass.states.get(entity_id).state == HVACMode.OFF
-    assert hass.states.get(entity_id).attributes.get("temperature") == 39
-    assert hass.states.get(entity_id).attributes.get("current_temperature") == 65
+    assert (state := hass.states.get(entity_id))
+    assert state.state == HVACMode.OFF
+    assert state.attributes.get(ATTR_TEMPERATURE) == 39
+    assert state.attributes.get(ATTR_CURRENT_TEMPERATURE) == 65
 
     # Test set hvac mode heat, target temp should be set to last target temp (10.0/50)
     await hass.services.async_call(
@@ -373,9 +375,10 @@ async def test_block_restored_climate_us_customary(
 
     monkeypatch.setattr(mock_block_device.blocks[SENSOR_BLOCK_ID], "targetTemp", 10.0)
     mock_block_device.mock_update()
-    state = hass.states.get(ENTITY_ID)
+
+    assert (state := hass.states.get(entity_id))
     assert state.state == HVACMode.HEAT
-    assert hass.states.get(entity_id).attributes.get("temperature") == 50
+    assert state.attributes.get(ATTR_TEMPERATURE) == 50
 
 
 async def test_block_restored_climate_unavailable(
@@ -403,7 +406,8 @@ async def test_block_restored_climate_unavailable(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == HVACMode.OFF
+    assert (state := hass.states.get(entity_id))
+    assert state.state == HVACMode.OFF
 
 
 async def test_block_restored_climate_set_preset_before_online(
@@ -431,7 +435,8 @@ async def test_block_restored_climate_set_preset_before_online(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == HVACMode.HEAT
+    assert (state := hass.states.get(entity_id))
+    assert state.state == HVACMode.HEAT
 
     with pytest.raises(ServiceValidationError):
         await hass.services.async_call(
@@ -460,7 +465,10 @@ async def test_block_set_mode_connection_error(
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    with pytest.raises(HomeAssistantError):
+    with pytest.raises(
+        HomeAssistantError,
+        match="Device communication error occurred while calling action for climate.test_name of Test name",
+    ):
         await hass.services.async_call(
             CLIMATE_DOMAIN,
             SERVICE_SET_HVAC_MODE,
@@ -603,27 +611,21 @@ async def test_rpc_climate_hvac_mode(
     entity_registry: EntityRegistry,
     mock_rpc_device: Mock,
     monkeypatch: pytest.MonkeyPatch,
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test climate hvac mode service."""
     entity_id = "climate.test_name_thermostat_0"
 
     await init_integration(hass, 2, model=MODEL_WALL_DISPLAY)
 
-    state = hass.states.get(entity_id)
-    assert state.state == HVACMode.HEAT
-    assert state.attributes[ATTR_TEMPERATURE] == 23
-    assert state.attributes[ATTR_CURRENT_TEMPERATURE] == 12.3
-    assert state.attributes[ATTR_HVAC_ACTION] == HVACAction.HEATING
-    assert state.attributes[ATTR_CURRENT_HUMIDITY] == 44.4
+    assert (state := hass.states.get(entity_id)) == snapshot(name=f"{entity_id}-state")
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
-    assert entry.unique_id == "123456789ABC-thermostat:0"
+    assert entity_registry.async_get(entity_id) == snapshot(name=f"{entity_id}-entry")
 
     monkeypatch.setitem(mock_rpc_device.status["thermostat:0"], "output", False)
     mock_rpc_device.mock_update()
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.attributes[ATTR_HVAC_ACTION] == HVACAction.IDLE
     assert state.attributes[ATTR_CURRENT_HUMIDITY] == 44.4
 
@@ -639,7 +641,7 @@ async def test_rpc_climate_hvac_mode(
     mock_rpc_device.call_rpc.assert_called_once_with(
         "Thermostat.SetConfig", {"config": {"id": 0, "enable": False}}
     )
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == HVACMode.OFF
 
 
@@ -657,15 +659,14 @@ async def test_rpc_climate_without_humidity(
 
     await init_integration(hass, 2, model=MODEL_WALL_DISPLAY)
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == HVACMode.HEAT
     assert state.attributes[ATTR_TEMPERATURE] == 23
     assert state.attributes[ATTR_CURRENT_TEMPERATURE] == 12.3
     assert state.attributes[ATTR_HVAC_ACTION] == HVACAction.HEATING
     assert ATTR_CURRENT_HUMIDITY not in state.attributes
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-thermostat:0"
 
 
@@ -677,7 +678,7 @@ async def test_rpc_climate_set_temperature(
 
     await init_integration(hass, 2, model=MODEL_WALL_DISPLAY)
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.attributes[ATTR_TEMPERATURE] == 23
 
     monkeypatch.setitem(mock_rpc_device.status["thermostat:0"], "target_C", 28)
@@ -692,7 +693,7 @@ async def test_rpc_climate_set_temperature(
     mock_rpc_device.call_rpc.assert_called_once_with(
         "Thermostat.SetConfig", {"config": {"id": 0, "target_C": 28}}
     )
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.attributes[ATTR_TEMPERATURE] == 28
 
 
@@ -707,7 +708,7 @@ async def test_rpc_climate_hvac_mode_cool(
 
     await init_integration(hass, 2, model=MODEL_WALL_DISPLAY)
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == HVACMode.COOL
     assert state.attributes[ATTR_HVAC_ACTION] == HVACAction.COOLING
 
@@ -717,6 +718,7 @@ async def test_wall_display_thermostat_mode(
     mock_rpc_device: Mock,
     entity_registry: EntityRegistry,
     monkeypatch: pytest.MonkeyPatch,
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test Wall Display in thermostat mode."""
     climate_entity_id = "climate.test_name_thermostat_0"
@@ -730,13 +732,11 @@ async def test_wall_display_thermostat_mode(
 
     # the climate entity should be created
     state = hass.states.get(climate_entity_id)
-    assert state
-    assert state.state == HVACMode.HEAT
+    assert state == snapshot(name=f"{climate_entity_id}-state")
     assert len(hass.states.async_entity_ids(CLIMATE_DOMAIN)) == 1
 
     entry = entity_registry.async_get(climate_entity_id)
-    assert entry
-    assert entry.unique_id == "123456789ABC-thermostat:0"
+    assert entry == snapshot(name=f"{climate_entity_id}-entry")
 
 
 async def test_wall_display_thermostat_mode_external_actuator(
@@ -751,40 +751,42 @@ async def test_wall_display_thermostat_mode_external_actuator(
 
     new_status = deepcopy(mock_rpc_device.status)
     new_status["sys"]["relay_in_thermostat"] = False
+    new_status.pop("cover:0")
     monkeypatch.setattr(mock_rpc_device, "status", new_status)
 
     await init_integration(hass, 2, model=MODEL_WALL_DISPLAY)
 
     # the switch entity should be created
-    state = hass.states.get(switch_entity_id)
-    assert state
+    assert (state := hass.states.get(switch_entity_id))
     assert state.state == STATE_ON
     assert len(hass.states.async_entity_ids(SWITCH_DOMAIN)) == 1
 
     # the climate entity should be created
-    state = hass.states.get(climate_entity_id)
-    assert state
+    assert (state := hass.states.get(climate_entity_id))
     assert state.state == HVACMode.HEAT
     assert len(hass.states.async_entity_ids(CLIMATE_DOMAIN)) == 1
 
-    entry = entity_registry.async_get(climate_entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(climate_entity_id))
     assert entry.unique_id == "123456789ABC-thermostat:0"
 
 
 async def test_blu_trv_climate_set_temperature(
     hass: HomeAssistant,
     mock_blu_trv: Mock,
+    entity_registry: EntityRegistry,
     monkeypatch: pytest.MonkeyPatch,
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test BLU TRV set target temperature."""
 
     entity_id = "climate.trv_name"
     monkeypatch.delitem(mock_blu_trv.status, "thermostat:0")
 
-    await init_integration(hass, 3, model=MODEL_BLU_GATEWAY_GEN3)
+    await init_integration(hass, 3, model=MODEL_BLU_GATEWAY_G3)
 
-    assert get_entity_attribute(hass, entity_id, ATTR_TEMPERATURE) == 17.1
+    assert (state := hass.states.get(entity_id)) == snapshot(name=f"{entity_id}-state")
+
+    assert entity_registry.async_get(entity_id) == snapshot(name=f"{entity_id}-entry")
 
     monkeypatch.setitem(
         mock_blu_trv.status[f"{BLU_TRV_IDENTIFIER}:200"], "target_C", 28
@@ -804,9 +806,11 @@ async def test_blu_trv_climate_set_temperature(
             "method": "Trv.SetTarget",
             "params": {"id": 0, "target_C": 28.0},
         },
+        BLU_TRV_TIMEOUT,
     )
 
-    assert get_entity_attribute(hass, entity_id, ATTR_TEMPERATURE) == 28
+    assert (state := hass.states.get(entity_id))
+    assert state.attributes[ATTR_TEMPERATURE] == 28
 
 
 async def test_blu_trv_climate_disabled(
@@ -819,16 +823,18 @@ async def test_blu_trv_climate_disabled(
     entity_id = "climate.trv_name"
     monkeypatch.delitem(mock_blu_trv.status, "thermostat:0")
 
-    await init_integration(hass, 3, model=MODEL_BLU_GATEWAY_GEN3)
+    await init_integration(hass, 3, model=MODEL_BLU_GATEWAY_G3)
 
-    assert get_entity_attribute(hass, entity_id, ATTR_TEMPERATURE) == 17.1
+    assert (state := hass.states.get(entity_id))
+    assert state.attributes[ATTR_TEMPERATURE] == 17.1
 
     monkeypatch.setitem(
         mock_blu_trv.config[f"{BLU_TRV_IDENTIFIER}:200"], "enable", False
     )
     mock_blu_trv.mock_update()
 
-    assert get_entity_attribute(hass, entity_id, ATTR_TEMPERATURE) is None
+    assert (state := hass.states.get(entity_id))
+    assert state.attributes[ATTR_TEMPERATURE] is None
 
 
 async def test_blu_trv_climate_hvac_action(
@@ -841,11 +847,13 @@ async def test_blu_trv_climate_hvac_action(
     entity_id = "climate.trv_name"
     monkeypatch.delitem(mock_blu_trv.status, "thermostat:0")
 
-    await init_integration(hass, 3, model=MODEL_BLU_GATEWAY_GEN3)
+    await init_integration(hass, 3, model=MODEL_BLU_GATEWAY_G3)
 
-    assert get_entity_attribute(hass, entity_id, ATTR_HVAC_ACTION) == HVACAction.IDLE
+    assert (state := hass.states.get(entity_id))
+    assert state.attributes[ATTR_HVAC_ACTION] == HVACAction.IDLE
 
     monkeypatch.setitem(mock_blu_trv.status[f"{BLU_TRV_IDENTIFIER}:200"], "pos", 10)
     mock_blu_trv.mock_update()
 
-    assert get_entity_attribute(hass, entity_id, ATTR_HVAC_ACTION) == HVACAction.HEATING
+    assert (state := hass.states.get(entity_id))
+    assert state.attributes[ATTR_HVAC_ACTION] == HVACAction.HEATING
diff --git a/tests/components/shelly/test_config_flow.py b/tests/components/shelly/test_config_flow.py
index b5f87a874c3..fffffc21cae 100644
--- a/tests/components/shelly/test_config_flow.py
+++ b/tests/components/shelly/test_config_flow.py
@@ -18,10 +18,20 @@ from homeassistant import config_entries
 from homeassistant.components.shelly import MacAddressMismatchError, config_flow
 from homeassistant.components.shelly.const import (
     CONF_BLE_SCANNER_MODE,
+    CONF_GEN,
+    CONF_SLEEP_PERIOD,
     DOMAIN,
     BLEScannerMode,
 )
 from homeassistant.components.shelly.coordinator import ENTRY_RELOAD_COOLDOWN
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import (
+    CONF_HOST,
+    CONF_MODEL,
+    CONF_PASSWORD,
+    CONF_PORT,
+    CONF_USERNAME,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers.service_info.zeroconf import (
@@ -100,23 +110,90 @@ async def test_form(
     ):
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],
-            {"host": "1.1.1.1", "port": port},
+            {CONF_HOST: "1.1.1.1", CONF_PORT: port},
         )
         await hass.async_block_till_done()
 
     assert result2["type"] is FlowResultType.CREATE_ENTRY
     assert result2["title"] == "Test name"
     assert result2["data"] == {
-        "host": "1.1.1.1",
-        "port": port,
-        "model": model,
-        "sleep_period": 0,
-        "gen": gen,
+        CONF_HOST: "1.1.1.1",
+        CONF_PORT: port,
+        CONF_MODEL: model,
+        CONF_SLEEP_PERIOD: 0,
+        CONF_GEN: gen,
     }
     assert len(mock_setup.mock_calls) == 1
     assert len(mock_setup_entry.mock_calls) == 1
 
 
+async def test_user_flow_overrides_existing_discovery(
+    hass: HomeAssistant,
+    mock_rpc_device: Mock,
+) -> None:
+    """Test setting up from the user flow when the devices is already discovered."""
+    with (
+        patch(
+            "homeassistant.components.shelly.config_flow.get_info",
+            return_value={
+                "mac": "AABBCCDDEEFF",
+                "model": MODEL_PLUS_2PM,
+                "auth": False,
+                "gen": 2,
+                "port": 80,
+            },
+        ),
+        patch(
+            "homeassistant.components.shelly.async_setup", return_value=True
+        ) as mock_setup,
+        patch(
+            "homeassistant.components.shelly.async_setup_entry",
+            return_value=True,
+        ) as mock_setup_entry,
+    ):
+        discovery_result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            data=ZeroconfServiceInfo(
+                ip_address=ip_address("1.1.1.1"),
+                ip_addresses=[ip_address("1.1.1.1")],
+                hostname="mock_hostname",
+                name="shelly2pm-aabbccddeeff",
+                port=None,
+                properties={ATTR_PROPERTIES_ID: "shelly2pm-aabbccddeeff"},
+                type="mock_type",
+            ),
+            context={"source": config_entries.SOURCE_ZEROCONF},
+        )
+        assert discovery_result["type"] is FlowResultType.FORM
+
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": config_entries.SOURCE_USER}
+        )
+        assert result["type"] is FlowResultType.FORM
+        assert result["errors"] == {}
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_HOST: "1.1.1.1", CONF_PORT: 80},
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "Test name"
+    assert result2["data"] == {
+        CONF_HOST: "1.1.1.1",
+        CONF_PORT: 80,
+        CONF_MODEL: MODEL_PLUS_2PM,
+        CONF_SLEEP_PERIOD: 0,
+        CONF_GEN: 2,
+    }
+    assert result2["context"]["unique_id"] == "AABBCCDDEEFF"
+    assert len(mock_setup.mock_calls) == 1
+    assert len(mock_setup_entry.mock_calls) == 1
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    # discovery flow should have been aborted
+    assert not hass.config_entries.flow.async_progress(DOMAIN)
+
+
 async def test_form_gen1_custom_port(
     hass: HomeAssistant,
     mock_block_device: Mock,
@@ -153,19 +230,19 @@ async def test_form_gen1_custom_port(
         (
             1,
             MODEL_1,
-            {"username": "test user", "password": "test1 password"},
+            {CONF_USERNAME: "test user", CONF_PASSWORD: "test1 password"},
             "test user",
         ),
         (
             2,
             MODEL_PLUS_2PM,
-            {"password": "test2 password"},
+            {CONF_PASSWORD: "test2 password"},
             "admin",
         ),
         (
             3,
             MODEL_PLUS_2PM,
-            {"password": "test2 password"},
+            {CONF_PASSWORD: "test2 password"},
             "admin",
         ),
     ],
@@ -192,7 +269,7 @@ async def test_form_auth(
     ):
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],
-            {"host": "1.1.1.1"},
+            {CONF_HOST: "1.1.1.1"},
         )
 
     assert result2["type"] is FlowResultType.FORM
@@ -215,13 +292,13 @@ async def test_form_auth(
     assert result3["type"] is FlowResultType.CREATE_ENTRY
     assert result3["title"] == "Test name"
     assert result3["data"] == {
-        "host": "1.1.1.1",
-        "port": DEFAULT_HTTP_PORT,
-        "model": model,
-        "sleep_period": 0,
-        "gen": gen,
-        "username": username,
-        "password": user_input["password"],
+        CONF_HOST: "1.1.1.1",
+        CONF_PORT: DEFAULT_HTTP_PORT,
+        CONF_MODEL: model,
+        CONF_SLEEP_PERIOD: 0,
+        CONF_GEN: gen,
+        CONF_USERNAME: username,
+        CONF_PASSWORD: user_input[CONF_PASSWORD],
     }
     assert len(mock_setup.mock_calls) == 1
     assert len(mock_setup_entry.mock_calls) == 1
@@ -245,7 +322,7 @@ async def test_form_errors_get_info(
     with patch("homeassistant.components.shelly.config_flow.get_info", side_effect=exc):
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],
-            {"host": "1.1.1.1"},
+            {CONF_HOST: "1.1.1.1"},
         )
 
     assert result2["type"] is FlowResultType.FORM
@@ -266,7 +343,7 @@ async def test_form_missing_model_key(
     ):
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],
-            {"host": "1.1.1.1"},
+            {CONF_HOST: "1.1.1.1"},
         )
 
     assert result2["type"] is FlowResultType.FORM
@@ -289,7 +366,7 @@ async def test_form_missing_model_key_auth_enabled(
     ):
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],
-            {"host": "1.1.1.1"},
+            {CONF_HOST: "1.1.1.1"},
         )
 
     assert result2["type"] is FlowResultType.FORM
@@ -297,7 +374,7 @@ async def test_form_missing_model_key_auth_enabled(
 
     monkeypatch.setattr(mock_rpc_device, "shelly", {"gen": 2})
     result3 = await hass.config_entries.flow.async_configure(
-        result2["flow_id"], {"password": "1234"}
+        result2["flow_id"], {CONF_PASSWORD: "1234"}
     )
     assert result3["type"] is FlowResultType.FORM
     assert result3["errors"] == {"base": "firmware_not_fully_provisioned"}
@@ -357,7 +434,7 @@ async def test_form_errors_test_connection(
     ):
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],
-            {"host": "1.1.1.1"},
+            {CONF_HOST: "1.1.1.1"},
         )
 
     assert result2["type"] is FlowResultType.FORM
@@ -368,7 +445,7 @@ async def test_form_already_configured(hass: HomeAssistant) -> None:
     """Test we get the form."""
 
     entry = MockConfigEntry(
-        domain="shelly", unique_id="test-mac", data={"host": "0.0.0.0"}
+        domain="shelly", unique_id="test-mac", data={CONF_HOST: "0.0.0.0"}
     )
     entry.add_to_hass(hass)
 
@@ -382,14 +459,14 @@ async def test_form_already_configured(hass: HomeAssistant) -> None:
     ):
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],
-            {"host": "1.1.1.1"},
+            {CONF_HOST: "1.1.1.1"},
         )
 
         assert result2["type"] is FlowResultType.ABORT
         assert result2["reason"] == "already_configured"
 
     # Test config entry got updated with latest IP
-    assert entry.data["host"] == "1.1.1.1"
+    assert entry.data[CONF_HOST] == "1.1.1.1"
 
 
 async def test_user_setup_ignored_device(
@@ -400,7 +477,7 @@ async def test_user_setup_ignored_device(
     entry = MockConfigEntry(
         domain="shelly",
         unique_id="test-mac",
-        data={"host": "0.0.0.0"},
+        data={CONF_HOST: "0.0.0.0"},
         source=config_entries.SOURCE_IGNORE,
     )
     entry.add_to_hass(hass)
@@ -424,13 +501,13 @@ async def test_user_setup_ignored_device(
     ):
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],
-            {"host": "1.1.1.1"},
+            {CONF_HOST: "1.1.1.1"},
         )
 
         assert result2["type"] is FlowResultType.CREATE_ENTRY
 
     # Test config entry got updated with latest IP
-    assert entry.data["host"] == "1.1.1.1"
+    assert entry.data[CONF_HOST] == "1.1.1.1"
     assert len(mock_setup.mock_calls) == 1
     assert len(mock_setup_entry.mock_calls) == 1
 
@@ -458,7 +535,7 @@ async def test_form_auth_errors_test_connection_gen1(
     ):
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],
-            {"host": "1.1.1.1"},
+            {CONF_HOST: "1.1.1.1"},
         )
 
     with patch(
@@ -467,7 +544,7 @@ async def test_form_auth_errors_test_connection_gen1(
     ):
         result3 = await hass.config_entries.flow.async_configure(
             result2["flow_id"],
-            {"username": "test username", "password": "test password"},
+            {CONF_USERNAME: "test username", CONF_PASSWORD: "test password"},
         )
     assert result3["type"] is FlowResultType.FORM
     assert result3["errors"] == {"base": base_error}
@@ -496,7 +573,7 @@ async def test_form_auth_errors_test_connection_gen2(
     ):
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],
-            {"host": "1.1.1.1"},
+            {CONF_HOST: "1.1.1.1"},
         )
 
     with patch(
@@ -504,7 +581,7 @@ async def test_form_auth_errors_test_connection_gen2(
         new=AsyncMock(side_effect=exc),
     ):
         result3 = await hass.config_entries.flow.async_configure(
-            result2["flow_id"], {"password": "test password"}
+            result2["flow_id"], {CONF_PASSWORD: "test password"}
         )
     assert result3["type"] is FlowResultType.FORM
     assert result3["errors"] == {"base": base_error}
@@ -575,10 +652,10 @@ async def test_zeroconf(
     assert result2["type"] is FlowResultType.CREATE_ENTRY
     assert result2["title"] == "Test name"
     assert result2["data"] == {
-        "host": "1.1.1.1",
-        "model": model,
-        "sleep_period": 0,
-        "gen": gen,
+        CONF_HOST: "1.1.1.1",
+        CONF_MODEL: model,
+        CONF_SLEEP_PERIOD: 0,
+        CONF_GEN: gen,
     }
     assert len(mock_setup.mock_calls) == 1
     assert len(mock_setup_entry.mock_calls) == 1
@@ -633,10 +710,10 @@ async def test_zeroconf_sleeping_device(
     assert result2["type"] is FlowResultType.CREATE_ENTRY
     assert result2["title"] == "Test name"
     assert result2["data"] == {
-        "host": "1.1.1.1",
-        "model": MODEL_1,
-        "sleep_period": 600,
-        "gen": 1,
+        CONF_HOST: "1.1.1.1",
+        CONF_MODEL: MODEL_1,
+        CONF_SLEEP_PERIOD: 600,
+        CONF_GEN: 1,
     }
     assert len(mock_setup.mock_calls) == 1
     assert len(mock_setup_entry.mock_calls) == 1
@@ -668,11 +745,43 @@ async def test_zeroconf_sleeping_device_error(hass: HomeAssistant) -> None:
         assert result["reason"] == "cannot_connect"
 
 
+async def test_options_flow_abort_setup_retry(
+    hass: HomeAssistant, mock_rpc_device: Mock, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    """Test ble options abort if device is in setup retry."""
+    monkeypatch.setattr(
+        mock_rpc_device, "initialize", AsyncMock(side_effect=DeviceConnectionError)
+    )
+    entry = await init_integration(hass, 2)
+
+    assert entry.state is ConfigEntryState.SETUP_RETRY
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "cannot_connect"
+
+
+async def test_options_flow_abort_no_scripts_support(
+    hass: HomeAssistant, mock_rpc_device: Mock, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    """Test ble options abort if device does not support scripts."""
+    monkeypatch.setattr(
+        mock_rpc_device, "supports_scripts", AsyncMock(return_value=False)
+    )
+    entry = await init_integration(hass, 2)
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "no_scripts_support"
+
+
 async def test_zeroconf_already_configured(hass: HomeAssistant) -> None:
     """Test we get the form."""
 
     entry = MockConfigEntry(
-        domain="shelly", unique_id="test-mac", data={"host": "0.0.0.0"}
+        domain="shelly", unique_id="test-mac", data={CONF_HOST: "0.0.0.0"}
     )
     entry.add_to_hass(hass)
 
@@ -689,7 +798,7 @@ async def test_zeroconf_already_configured(hass: HomeAssistant) -> None:
         assert result["reason"] == "already_configured"
 
     # Test config entry got updated with latest IP
-    assert entry.data["host"] == "1.1.1.1"
+    assert entry.data[CONF_HOST] == "1.1.1.1"
 
 
 async def test_zeroconf_ignored(hass: HomeAssistant) -> None:
@@ -720,7 +829,7 @@ async def test_zeroconf_with_wifi_ap_ip(hass: HomeAssistant) -> None:
     """Test we ignore the Wi-FI AP IP."""
 
     entry = MockConfigEntry(
-        domain="shelly", unique_id="test-mac", data={"host": "2.2.2.2"}
+        domain="shelly", unique_id="test-mac", data={CONF_HOST: "2.2.2.2"}
     )
     entry.add_to_hass(hass)
 
@@ -739,7 +848,7 @@ async def test_zeroconf_with_wifi_ap_ip(hass: HomeAssistant) -> None:
         assert result["reason"] == "already_configured"
 
     # Test config entry was not updated with the wifi ap ip
-    assert entry.data["host"] == "2.2.2.2"
+    assert entry.data[CONF_HOST] == "2.2.2.2"
 
 
 async def test_zeroconf_cannot_connect(hass: HomeAssistant) -> None:
@@ -785,20 +894,20 @@ async def test_zeroconf_require_auth(
     ):
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],
-            {"username": "test username", "password": "test password"},
+            {CONF_USERNAME: "test username", CONF_PASSWORD: "test password"},
         )
         await hass.async_block_till_done()
 
     assert result2["type"] is FlowResultType.CREATE_ENTRY
     assert result2["title"] == "Test name"
     assert result2["data"] == {
-        "host": "1.1.1.1",
-        "port": DEFAULT_HTTP_PORT,
-        "model": MODEL_1,
-        "sleep_period": 0,
-        "gen": 1,
-        "username": "test username",
-        "password": "test password",
+        CONF_HOST: "1.1.1.1",
+        CONF_PORT: DEFAULT_HTTP_PORT,
+        CONF_MODEL: MODEL_1,
+        CONF_SLEEP_PERIOD: 0,
+        CONF_GEN: 1,
+        CONF_USERNAME: "test username",
+        CONF_PASSWORD: "test password",
     }
     assert len(mock_setup.mock_calls) == 1
     assert len(mock_setup_entry.mock_calls) == 1
@@ -807,9 +916,9 @@ async def test_zeroconf_require_auth(
 @pytest.mark.parametrize(
     ("gen", "user_input"),
     [
-        (1, {"username": "test user", "password": "test1 password"}),
-        (2, {"password": "test2 password"}),
-        (3, {"password": "test2 password"}),
+        (1, {CONF_USERNAME: "test user", CONF_PASSWORD: "test1 password"}),
+        (2, {CONF_PASSWORD: "test2 password"}),
+        (3, {CONF_PASSWORD: "test2 password"}),
     ],
 )
 async def test_reauth_successful(
@@ -821,7 +930,9 @@ async def test_reauth_successful(
 ) -> None:
     """Test starting a reauthentication flow."""
     entry = MockConfigEntry(
-        domain="shelly", unique_id="test-mac", data={"host": "0.0.0.0", "gen": gen}
+        domain="shelly",
+        unique_id="test-mac",
+        data={CONF_HOST: "0.0.0.0", CONF_GEN: gen},
     )
     entry.add_to_hass(hass)
     result = await entry.start_reauth_flow(hass)
@@ -845,9 +956,9 @@ async def test_reauth_successful(
 @pytest.mark.parametrize(
     ("gen", "user_input"),
     [
-        (1, {"username": "test user", "password": "test1 password"}),
-        (2, {"password": "test2 password"}),
-        (3, {"password": "test2 password"}),
+        (1, {CONF_USERNAME: "test user", CONF_PASSWORD: "test1 password"}),
+        (2, {CONF_PASSWORD: "test2 password"}),
+        (3, {CONF_PASSWORD: "test2 password"}),
     ],
 )
 @pytest.mark.parametrize(
@@ -866,7 +977,9 @@ async def test_reauth_unsuccessful(
 ) -> None:
     """Test reauthentication flow failed."""
     entry = MockConfigEntry(
-        domain="shelly", unique_id="test-mac", data={"host": "0.0.0.0", "gen": gen}
+        domain="shelly",
+        unique_id="test-mac",
+        data={CONF_HOST: "0.0.0.0", CONF_GEN: gen},
     )
     entry.add_to_hass(hass)
     result = await entry.start_reauth_flow(hass)
@@ -876,7 +989,12 @@ async def test_reauth_unsuccessful(
     with (
         patch(
             "homeassistant.components.shelly.config_flow.get_info",
-            return_value={"mac": "test-mac", "type": MODEL_1, "auth": True, "gen": gen},
+            return_value={
+                "mac": "test-mac",
+                "type": MODEL_1,
+                "auth": True,
+                "gen": gen,
+            },
         ),
         patch(
             "aioshelly.block_device.BlockDevice.create", new=AsyncMock(side_effect=exc)
@@ -895,7 +1013,7 @@ async def test_reauth_unsuccessful(
 async def test_reauth_get_info_error(hass: HomeAssistant) -> None:
     """Test reauthentication flow failed with error in get_info()."""
     entry = MockConfigEntry(
-        domain="shelly", unique_id="test-mac", data={"host": "0.0.0.0", "gen": 2}
+        domain="shelly", unique_id="test-mac", data={CONF_HOST: "0.0.0.0", CONF_GEN: 2}
     )
     entry.add_to_hass(hass)
     result = await entry.start_reauth_flow(hass)
@@ -908,7 +1026,7 @@ async def test_reauth_get_info_error(hass: HomeAssistant) -> None:
     ):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
-            user_input={"password": "test2 password"},
+            user_input={CONF_PASSWORD: "test2 password"},
         )
 
         assert result["type"] is FlowResultType.ABORT
@@ -995,7 +1113,7 @@ async def test_options_flow_ble(hass: HomeAssistant, mock_rpc_device: Mock) -> N
     await hass.async_block_till_done()
 
     assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["data"][CONF_BLE_SCANNER_MODE] == BLEScannerMode.DISABLED
+    assert result["data"][CONF_BLE_SCANNER_MODE] is BLEScannerMode.DISABLED
 
     result = await hass.config_entries.options.async_init(entry.entry_id)
     assert result["type"] is FlowResultType.FORM
@@ -1011,7 +1129,7 @@ async def test_options_flow_ble(hass: HomeAssistant, mock_rpc_device: Mock) -> N
     await hass.async_block_till_done()
 
     assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["data"][CONF_BLE_SCANNER_MODE] == BLEScannerMode.ACTIVE
+    assert result["data"][CONF_BLE_SCANNER_MODE] is BLEScannerMode.ACTIVE
 
     result = await hass.config_entries.options.async_init(entry.entry_id)
     assert result["type"] is FlowResultType.FORM
@@ -1027,7 +1145,7 @@ async def test_options_flow_ble(hass: HomeAssistant, mock_rpc_device: Mock) -> N
     await hass.async_block_till_done()
 
     assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["data"][CONF_BLE_SCANNER_MODE] == BLEScannerMode.PASSIVE
+    assert result["data"][CONF_BLE_SCANNER_MODE] is BLEScannerMode.PASSIVE
 
     await hass.config_entries.async_unload(entry.entry_id)
 
@@ -1039,7 +1157,12 @@ async def test_zeroconf_already_configured_triggers_refresh_mac_in_name(
     entry = MockConfigEntry(
         domain="shelly",
         unique_id="AABBCCDDEEFF",
-        data={"host": "1.1.1.1", "gen": 2, "sleep_period": 0, "model": MODEL_1},
+        data={
+            CONF_HOST: "1.1.1.1",
+            CONF_GEN: 2,
+            CONF_SLEEP_PERIOD: 0,
+            CONF_MODEL: MODEL_1,
+        },
     )
     entry.add_to_hass(hass)
     await hass.config_entries.async_setup(entry.entry_id)
@@ -1074,7 +1197,12 @@ async def test_zeroconf_already_configured_triggers_refresh(
     entry = MockConfigEntry(
         domain="shelly",
         unique_id="AABBCCDDEEFF",
-        data={"host": "1.1.1.1", "gen": 2, "sleep_period": 0, "model": MODEL_1},
+        data={
+            CONF_HOST: "1.1.1.1",
+            CONF_GEN: 2,
+            CONF_SLEEP_PERIOD: 0,
+            CONF_MODEL: MODEL_1,
+        },
     )
     entry.add_to_hass(hass)
     await hass.config_entries.async_setup(entry.entry_id)
@@ -1114,7 +1242,12 @@ async def test_zeroconf_sleeping_device_not_triggers_refresh(
     entry = MockConfigEntry(
         domain="shelly",
         unique_id="AABBCCDDEEFF",
-        data={"host": "1.1.1.1", "gen": 2, "sleep_period": 1000, "model": MODEL_1},
+        data={
+            CONF_HOST: "1.1.1.1",
+            CONF_GEN: 2,
+            CONF_SLEEP_PERIOD: 1000,
+            CONF_MODEL: MODEL_1,
+        },
     )
     entry.add_to_hass(hass)
     await hass.config_entries.async_setup(entry.entry_id)
@@ -1161,7 +1294,12 @@ async def test_zeroconf_sleeping_device_attempts_configure(
     entry = MockConfigEntry(
         domain="shelly",
         unique_id="AABBCCDDEEFF",
-        data={"host": "1.1.1.1", "gen": 2, "sleep_period": 1000, "model": MODEL_1},
+        data={
+            CONF_HOST: "1.1.1.1",
+            CONF_GEN: 2,
+            CONF_SLEEP_PERIOD: 1000,
+            CONF_MODEL: MODEL_1,
+        },
     )
     entry.add_to_hass(hass)
     await hass.config_entries.async_setup(entry.entry_id)
@@ -1221,7 +1359,12 @@ async def test_zeroconf_sleeping_device_attempts_configure_ws_disabled(
     entry = MockConfigEntry(
         domain="shelly",
         unique_id="AABBCCDDEEFF",
-        data={"host": "1.1.1.1", "gen": 2, "sleep_period": 1000, "model": MODEL_1},
+        data={
+            CONF_HOST: "1.1.1.1",
+            CONF_GEN: 2,
+            CONF_SLEEP_PERIOD: 1000,
+            CONF_MODEL: MODEL_1,
+        },
     )
     entry.add_to_hass(hass)
     await hass.config_entries.async_setup(entry.entry_id)
@@ -1281,7 +1424,12 @@ async def test_zeroconf_sleeping_device_attempts_configure_no_url_available(
     entry = MockConfigEntry(
         domain="shelly",
         unique_id="AABBCCDDEEFF",
-        data={"host": "1.1.1.1", "gen": 2, "sleep_period": 1000, "model": MODEL_1},
+        data={
+            CONF_HOST: "1.1.1.1",
+            CONF_GEN: 2,
+            CONF_SLEEP_PERIOD: 1000,
+            CONF_MODEL: MODEL_1,
+        },
     )
     entry.add_to_hass(hass)
     await hass.config_entries.async_setup(entry.entry_id)
@@ -1348,20 +1496,20 @@ async def test_sleeping_device_gen2_with_new_firmware(
     ):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
-            {"host": "1.1.1.1"},
+            {CONF_HOST: "1.1.1.1"},
         )
         await hass.async_block_till_done()
 
     assert result["data"] == {
-        "host": "1.1.1.1",
-        "port": DEFAULT_HTTP_PORT,
-        "model": MODEL_PLUS_2PM,
-        "sleep_period": 666,
-        "gen": 2,
+        CONF_HOST: "1.1.1.1",
+        CONF_PORT: DEFAULT_HTTP_PORT,
+        CONF_MODEL: MODEL_PLUS_2PM,
+        CONF_SLEEP_PERIOD: 666,
+        CONF_GEN: 2,
     }
 
 
-@pytest.mark.parametrize("gen", [1, 2, 3])
+@pytest.mark.parametrize(CONF_GEN, [1, 2, 3])
 async def test_reconfigure_successful(
     hass: HomeAssistant,
     gen: int,
@@ -1370,7 +1518,9 @@ async def test_reconfigure_successful(
 ) -> None:
     """Test starting a reconfiguration flow."""
     entry = MockConfigEntry(
-        domain="shelly", unique_id="test-mac", data={"host": "0.0.0.0", "gen": gen}
+        domain="shelly",
+        unique_id="test-mac",
+        data={CONF_HOST: "0.0.0.0", CONF_GEN: gen},
     )
     entry.add_to_hass(hass)
 
@@ -1385,12 +1535,12 @@ async def test_reconfigure_successful(
     ):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
-            user_input={"host": "10.10.10.10", "port": 99},
+            user_input={CONF_HOST: "10.10.10.10", CONF_PORT: 99},
         )
 
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "reconfigure_successful"
-    assert entry.data == {"host": "10.10.10.10", "port": 99, "gen": gen}
+    assert entry.data == {CONF_HOST: "10.10.10.10", CONF_PORT: 99, CONF_GEN: gen}
 
 
 @pytest.mark.parametrize("gen", [1, 2, 3])
@@ -1402,7 +1552,9 @@ async def test_reconfigure_unsuccessful(
 ) -> None:
     """Test reconfiguration flow failed."""
     entry = MockConfigEntry(
-        domain="shelly", unique_id="test-mac", data={"host": "0.0.0.0", "gen": gen}
+        domain="shelly",
+        unique_id="test-mac",
+        data={CONF_HOST: "0.0.0.0", CONF_GEN: gen},
     )
     entry.add_to_hass(hass)
 
@@ -1413,11 +1565,16 @@ async def test_reconfigure_unsuccessful(
 
     with patch(
         "homeassistant.components.shelly.config_flow.get_info",
-        return_value={"mac": "another-mac", "type": MODEL_1, "auth": False, "gen": gen},
+        return_value={
+            "mac": "another-mac",
+            "type": MODEL_1,
+            "auth": False,
+            "gen": gen,
+        },
     ):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
-            user_input={"host": "10.10.10.10", "port": 99},
+            user_input={CONF_HOST: "10.10.10.10", CONF_PORT: 99},
         )
 
     assert result["type"] is FlowResultType.ABORT
@@ -1439,7 +1596,7 @@ async def test_reconfigure_with_exception(
 ) -> None:
     """Test reconfiguration flow when an exception is raised."""
     entry = MockConfigEntry(
-        domain="shelly", unique_id="test-mac", data={"host": "0.0.0.0", "gen": 2}
+        domain="shelly", unique_id="test-mac", data={CONF_HOST: "0.0.0.0", CONF_GEN: 2}
     )
     entry.add_to_hass(hass)
 
@@ -1451,7 +1608,7 @@ async def test_reconfigure_with_exception(
     with patch("homeassistant.components.shelly.config_flow.get_info", side_effect=exc):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
-            user_input={"host": "10.10.10.10", "port": 99},
+            user_input={CONF_HOST: "10.10.10.10", CONF_PORT: 99},
         )
 
     assert result["errors"] == {"base": base_error}
diff --git a/tests/components/shelly/test_coordinator.py b/tests/components/shelly/test_coordinator.py
index 090c5e7207f..f89bec8853a 100644
--- a/tests/components/shelly/test_coordinator.py
+++ b/tests/components/shelly/test_coordinator.py
@@ -32,7 +32,6 @@ from homeassistant.helpers import device_registry as dr, issue_registry as ir
 
 from . import (
     MOCK_MAC,
-    get_entity_state,
     init_integration,
     inject_rpc_device_event,
     mock_polling_rpc_update,
@@ -72,7 +71,7 @@ async def test_block_reload_on_cfg_change(
     async_fire_time_changed(hass)
     await hass.async_block_till_done()
 
-    assert hass.states.get("switch.test_name_channel_1") is not None
+    assert hass.states.get("switch.test_name_channel_1")
 
     # Generate config change from switch to light
     monkeypatch.setitem(
@@ -82,7 +81,7 @@ async def test_block_reload_on_cfg_change(
     mock_block_device.mock_update()
     await hass.async_block_till_done()
 
-    assert hass.states.get("switch.test_name_channel_1") is not None
+    assert hass.states.get("switch.test_name_channel_1")
 
     # Wait for debouncer
     freezer.tick(timedelta(seconds=ENTRY_RELOAD_COOLDOWN))
@@ -114,14 +113,14 @@ async def test_block_no_reload_on_bulb_changes(
     mock_block_device.mock_update()
     await hass.async_block_till_done()
 
-    assert hass.states.get("switch.test_name_channel_1") is not None
+    assert hass.states.get("switch.test_name_channel_1")
 
     # Wait for debouncer
     freezer.tick(timedelta(seconds=ENTRY_RELOAD_COOLDOWN))
     async_fire_time_changed(hass)
     await hass.async_block_till_done()
 
-    assert hass.states.get("switch.test_name_channel_1") is not None
+    assert hass.states.get("switch.test_name_channel_1")
 
     # Test no reload  on effect change
     monkeypatch.setattr(mock_block_device.blocks[LIGHT_BLOCK_ID], "effect", 1)
@@ -129,14 +128,14 @@ async def test_block_no_reload_on_bulb_changes(
     mock_block_device.mock_update()
     await hass.async_block_till_done()
 
-    assert hass.states.get("switch.test_name_channel_1") is not None
+    assert hass.states.get("switch.test_name_channel_1")
 
     # Wait for debouncer
     freezer.tick(timedelta(seconds=ENTRY_RELOAD_COOLDOWN))
     async_fire_time_changed(hass)
     await hass.async_block_till_done()
 
-    assert hass.states.get("switch.test_name_channel_1") is not None
+    assert hass.states.get("switch.test_name_channel_1")
 
 
 async def test_block_polling_auth_error(
@@ -245,14 +244,16 @@ async def test_block_polling_connection_error(
     )
     await init_integration(hass, 1)
 
-    assert get_entity_state(hass, "switch.test_name_channel_1") == STATE_ON
+    assert (state := hass.states.get("switch.test_name_channel_1"))
+    assert state.state == STATE_ON
 
     # Move time to generate polling
     freezer.tick(timedelta(seconds=UPDATE_PERIOD_MULTIPLIER * 15))
     async_fire_time_changed(hass)
     await hass.async_block_till_done()
 
-    assert get_entity_state(hass, "switch.test_name_channel_1") == STATE_UNAVAILABLE
+    assert (state := hass.states.get("switch.test_name_channel_1"))
+    assert state.state == STATE_UNAVAILABLE
 
 
 @pytest.mark.parametrize("exc", [DeviceConnectionError, MacAddressMismatchError])
@@ -270,12 +271,14 @@ async def test_block_rest_update_connection_error(
     await init_integration(hass, 1)
 
     await mock_rest_update(hass, freezer)
-    assert get_entity_state(hass, entity_id) == STATE_ON
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
     monkeypatch.setattr(mock_block_device, "update_shelly", AsyncMock(side_effect=exc))
     await mock_rest_update(hass, freezer)
 
-    assert get_entity_state(hass, entity_id) == STATE_UNAVAILABLE
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_UNAVAILABLE
 
 
 async def test_block_sleeping_device_no_periodic_updates(
@@ -297,14 +300,16 @@ async def test_block_sleeping_device_no_periodic_updates(
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert get_entity_state(hass, entity_id) == "22.1"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "22.1"
 
     # Move time to generate polling
     freezer.tick(timedelta(seconds=UPDATE_PERIOD_MULTIPLIER * 3600))
     async_fire_time_changed(hass)
     await hass.async_block_till_done()
 
-    assert get_entity_state(hass, entity_id) == STATE_UNAVAILABLE
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_UNAVAILABLE
 
 
 async def test_block_device_push_updates_failure(
@@ -386,6 +391,8 @@ async def test_rpc_reload_on_cfg_change(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     """Test RPC reload on config change."""
+    monkeypatch.delitem(mock_rpc_device.status, "cover:0")
+    monkeypatch.setitem(mock_rpc_device.status["sys"], "relay_in_thermostat", False)
     await init_integration(hass, 2)
 
     # Generate config change from switch to light
@@ -414,7 +421,7 @@ async def test_rpc_reload_on_cfg_change(
     )
     await hass.async_block_till_done()
 
-    assert hass.states.get("switch.test_switch_0") is not None
+    assert hass.states.get("switch.test_switch_0")
 
     # Wait for debouncer
     freezer.tick(timedelta(seconds=ENTRY_RELOAD_COOLDOWN))
@@ -560,7 +567,7 @@ async def test_rpc_update_entry_sleep_period(
     mock_rpc_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert entry.data["sleep_period"] == 600
+    assert entry.data[CONF_SLEEP_PERIOD] == 600
 
     # Move time to generate sleep period update
     monkeypatch.setitem(mock_rpc_device.status["sys"], "wakeup_period", 3600)
@@ -568,7 +575,7 @@ async def test_rpc_update_entry_sleep_period(
     async_fire_time_changed(hass)
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert entry.data["sleep_period"] == 3600
+    assert entry.data[CONF_SLEEP_PERIOD] == 3600
 
 
 async def test_rpc_sleeping_device_no_periodic_updates(
@@ -594,14 +601,16 @@ async def test_rpc_sleeping_device_no_periodic_updates(
     mock_rpc_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert get_entity_state(hass, entity_id) == "22.9"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "22.9"
 
     # Move time to generate polling
     freezer.tick(timedelta(seconds=UPDATE_PERIOD_MULTIPLIER * 1000))
     async_fire_time_changed(hass)
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert get_entity_state(hass, entity_id) is STATE_UNAVAILABLE
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_UNAVAILABLE
 
 
 async def test_rpc_sleeping_device_firmware_unsupported(
@@ -710,9 +719,12 @@ async def test_rpc_reconnect_error(
     exc: Exception,
 ) -> None:
     """Test RPC reconnect error."""
+    monkeypatch.delitem(mock_rpc_device.status, "cover:0")
+    monkeypatch.setitem(mock_rpc_device.status["sys"], "relay_in_thermostat", False)
     await init_integration(hass, 2)
 
-    assert get_entity_state(hass, "switch.test_switch_0") == STATE_ON
+    assert (state := hass.states.get("switch.test_switch_0"))
+    assert state.state == STATE_ON
 
     monkeypatch.setattr(mock_rpc_device, "connected", False)
     monkeypatch.setattr(mock_rpc_device, "initialize", AsyncMock(side_effect=exc))
@@ -722,16 +734,20 @@ async def test_rpc_reconnect_error(
     async_fire_time_changed(hass)
     await hass.async_block_till_done()
 
-    assert get_entity_state(hass, "switch.test_switch_0") == STATE_UNAVAILABLE
+    assert (state := hass.states.get("switch.test_switch_0"))
+    assert state.state == STATE_UNAVAILABLE
 
 
 async def test_rpc_error_running_connected_events(
     hass: HomeAssistant,
     freezer: FrozenDateTimeFactory,
     mock_rpc_device: Mock,
+    monkeypatch: pytest.MonkeyPatch,
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test RPC error while running connected events."""
+    monkeypatch.delitem(mock_rpc_device.status, "cover:0")
+    monkeypatch.setitem(mock_rpc_device.status["sys"], "relay_in_thermostat", False)
     with patch(
         "homeassistant.components.shelly.coordinator.async_ensure_ble_enabled",
         side_effect=DeviceConnectionError,
@@ -741,14 +757,17 @@ async def test_rpc_error_running_connected_events(
         )
 
     assert "Error running connected events for device" in caplog.text
-    assert get_entity_state(hass, "switch.test_switch_0") == STATE_UNAVAILABLE
+
+    assert (state := hass.states.get("switch.test_switch_0"))
+    assert state.state == STATE_UNAVAILABLE
 
     # Move time to generate reconnect without error
     freezer.tick(timedelta(seconds=RPC_RECONNECT_INTERVAL))
     async_fire_time_changed(hass)
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert get_entity_state(hass, "switch.test_switch_0") == STATE_ON
+    assert (state := hass.states.get("switch.test_switch_0"))
+    assert state.state == STATE_ON
 
 
 async def test_rpc_polling_connection_error(
@@ -769,11 +788,13 @@ async def test_rpc_polling_connection_error(
         ),
     )
 
-    assert get_entity_state(hass, entity_id) == "-63"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "-63"
 
     await mock_polling_rpc_update(hass, freezer)
 
-    assert get_entity_state(hass, entity_id) == STATE_UNAVAILABLE
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_UNAVAILABLE
 
 
 async def test_rpc_polling_disconnected(
@@ -788,11 +809,13 @@ async def test_rpc_polling_disconnected(
 
     monkeypatch.setattr(mock_rpc_device, "connected", False)
 
-    assert get_entity_state(hass, entity_id) == "-63"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "-63"
 
     await mock_polling_rpc_update(hass, freezer)
 
-    assert get_entity_state(hass, entity_id) == STATE_UNAVAILABLE
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_UNAVAILABLE
 
 
 async def test_rpc_update_entry_fw_ver(
@@ -830,12 +853,17 @@ async def test_rpc_update_entry_fw_ver(
     assert device.sw_version == "99.0.0"
 
 
+@pytest.mark.parametrize(("supports_scripts"), [True, False])
 async def test_rpc_runs_connected_events_when_initialized(
     hass: HomeAssistant,
     mock_rpc_device: Mock,
     monkeypatch: pytest.MonkeyPatch,
+    supports_scripts: bool,
 ) -> None:
     """Test RPC runs connected events when initialized."""
+    monkeypatch.setattr(
+        mock_rpc_device, "supports_scripts", AsyncMock(return_value=supports_scripts)
+    )
     monkeypatch.setattr(mock_rpc_device, "initialized", False)
     await init_integration(hass, 2)
 
@@ -846,8 +874,9 @@ async def test_rpc_runs_connected_events_when_initialized(
     mock_rpc_device.mock_initialized()
     await hass.async_block_till_done()
 
-    # BLE script list is called during connected events
-    assert call.script_list() in mock_rpc_device.mock_calls
+    assert call.supports_scripts() in mock_rpc_device.mock_calls
+    # BLE script list is called during connected events if device supports scripts
+    assert bool(call.script_list() in mock_rpc_device.mock_calls) == supports_scripts
 
 
 async def test_rpc_sleeping_device_unload_ignore_ble_scanner(
@@ -896,7 +925,8 @@ async def test_block_sleeping_device_connection_error(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert get_entity_state(hass, entity_id) == STATE_ON
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
     # Make device online event with connection error
     monkeypatch.setattr(
@@ -910,7 +940,8 @@ async def test_block_sleeping_device_connection_error(
     await hass.async_block_till_done(wait_background_tasks=True)
 
     assert "Error connecting to Shelly device" in caplog.text
-    assert get_entity_state(hass, entity_id) == STATE_ON
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
     # Move time to generate sleep period update
     freezer.tick(timedelta(seconds=sleep_period * UPDATE_PERIOD_MULTIPLIER))
@@ -918,7 +949,8 @@ async def test_block_sleeping_device_connection_error(
     await hass.async_block_till_done(wait_background_tasks=True)
 
     assert "Sleeping device did not update" in caplog.text
-    assert get_entity_state(hass, entity_id) == STATE_UNAVAILABLE
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_UNAVAILABLE
 
 
 async def test_rpc_sleeping_device_connection_error(
@@ -947,7 +979,8 @@ async def test_rpc_sleeping_device_connection_error(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert get_entity_state(hass, entity_id) == STATE_ON
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
     # Make device online event with connection error
     monkeypatch.setattr(
@@ -961,7 +994,8 @@ async def test_rpc_sleeping_device_connection_error(
     await hass.async_block_till_done(wait_background_tasks=True)
 
     assert "Error connecting to Shelly device" in caplog.text
-    assert get_entity_state(hass, entity_id) == STATE_ON
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
     # Move time to generate sleep period update
     freezer.tick(timedelta(seconds=sleep_period * UPDATE_PERIOD_MULTIPLIER))
@@ -969,7 +1003,8 @@ async def test_rpc_sleeping_device_connection_error(
     await hass.async_block_till_done(wait_background_tasks=True)
 
     assert "Sleeping device did not update" in caplog.text
-    assert get_entity_state(hass, entity_id) == STATE_UNAVAILABLE
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_UNAVAILABLE
 
 
 async def test_rpc_sleeping_device_late_setup(
@@ -994,7 +1029,8 @@ async def test_rpc_sleeping_device_late_setup(
     monkeypatch.setattr(mock_rpc_device, "connected", True)
     mock_rpc_device.mock_initialized()
     await hass.async_block_till_done(wait_background_tasks=True)
-    assert hass.states.get("sensor.test_name_temperature") is not None
+
+    assert hass.states.get("sensor.test_name_temperature")
 
 
 async def test_rpc_already_connected(
@@ -1011,3 +1047,22 @@ async def test_rpc_already_connected(
 
     assert "already connected" in caplog.text
     mock_rpc_device.initialize.assert_called_once()
+
+
+async def test_xmod_model_lookup(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    mock_rpc_device: Mock,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Test XMOD model look-up."""
+    xmod_model = "Test XMOD model name"
+    monkeypatch.setattr(mock_rpc_device, "xmod_info", {"n": xmod_model})
+    entry = await init_integration(hass, 2)
+
+    device = device_registry.async_get_device(
+        identifiers={(DOMAIN, entry.entry_id)},
+        connections={(dr.CONNECTION_NETWORK_MAC, dr.format_mac(entry.unique_id))},
+    )
+    assert device
+    assert device.model == xmod_model
diff --git a/tests/components/shelly/test_cover.py b/tests/components/shelly/test_cover.py
index 40a364fd435..df3ab4f288d 100644
--- a/tests/components/shelly/test_cover.py
+++ b/tests/components/shelly/test_cover.py
@@ -47,7 +47,7 @@ async def test_block_device_services(
         {ATTR_ENTITY_ID: entity_id, ATTR_POSITION: 50},
         blocking=True,
     )
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.attributes[ATTR_CURRENT_POSITION] == 50
 
     await hass.services.async_call(
@@ -56,7 +56,8 @@ async def test_block_device_services(
         {ATTR_ENTITY_ID: entity_id},
         blocking=True,
     )
-    assert hass.states.get(entity_id).state == CoverState.OPENING
+    assert (state := hass.states.get(entity_id))
+    assert state.state == CoverState.OPENING
 
     await hass.services.async_call(
         COVER_DOMAIN,
@@ -64,7 +65,8 @@ async def test_block_device_services(
         {ATTR_ENTITY_ID: entity_id},
         blocking=True,
     )
-    assert hass.states.get(entity_id).state == CoverState.CLOSING
+    assert (state := hass.states.get(entity_id))
+    assert state.state == CoverState.CLOSING
 
     await hass.services.async_call(
         COVER_DOMAIN,
@@ -72,10 +74,10 @@ async def test_block_device_services(
         {ATTR_ENTITY_ID: entity_id},
         blocking=True,
     )
-    assert hass.states.get(entity_id).state == CoverState.CLOSED
+    assert (state := hass.states.get(entity_id))
+    assert state.state == CoverState.CLOSED
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-roller_0"
 
 
@@ -86,11 +88,15 @@ async def test_block_device_update(
     monkeypatch.setattr(mock_block_device.blocks[ROLLER_BLOCK_ID], "rollerPos", 0)
     await init_integration(hass, 1)
 
-    assert hass.states.get("cover.test_name").state == CoverState.CLOSED
+    state = hass.states.get("cover.test_name")
+    assert state
+    assert state.state == CoverState.CLOSED
 
     monkeypatch.setattr(mock_block_device.blocks[ROLLER_BLOCK_ID], "rollerPos", 100)
     mock_block_device.mock_update()
-    assert hass.states.get("cover.test_name").state == CoverState.OPEN
+    state = hass.states.get("cover.test_name")
+    assert state
+    assert state.state == CoverState.OPEN
 
 
 async def test_block_device_no_roller_blocks(
@@ -99,6 +105,7 @@ async def test_block_device_no_roller_blocks(
     """Test block device without roller blocks."""
     monkeypatch.setattr(mock_block_device.blocks[ROLLER_BLOCK_ID], "type", None)
     await init_integration(hass, 1)
+
     assert hass.states.get("cover.test_name") is None
 
 
@@ -118,7 +125,7 @@ async def test_rpc_device_services(
         {ATTR_ENTITY_ID: entity_id, ATTR_POSITION: 50},
         blocking=True,
     )
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.attributes[ATTR_CURRENT_POSITION] == 50
 
     mutate_rpc_device_status(
@@ -131,7 +138,9 @@ async def test_rpc_device_services(
         blocking=True,
     )
     mock_rpc_device.mock_update()
-    assert hass.states.get(entity_id).state == CoverState.OPENING
+
+    assert (state := hass.states.get(entity_id))
+    assert state.state == CoverState.OPENING
 
     mutate_rpc_device_status(
         monkeypatch, mock_rpc_device, "cover:0", "state", "closing"
@@ -143,7 +152,9 @@ async def test_rpc_device_services(
         blocking=True,
     )
     mock_rpc_device.mock_update()
-    assert hass.states.get(entity_id).state == CoverState.CLOSING
+
+    assert (state := hass.states.get(entity_id))
+    assert state.state == CoverState.CLOSING
 
     mutate_rpc_device_status(monkeypatch, mock_rpc_device, "cover:0", "state", "closed")
     await hass.services.async_call(
@@ -153,10 +164,10 @@ async def test_rpc_device_services(
         blocking=True,
     )
     mock_rpc_device.mock_update()
-    assert hass.states.get(entity_id).state == CoverState.CLOSED
+    assert (state := hass.states.get(entity_id))
+    assert state.state == CoverState.CLOSED
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-cover:0"
 
 
@@ -166,6 +177,7 @@ async def test_rpc_device_no_cover_keys(
     """Test RPC device without cover keys."""
     monkeypatch.delitem(mock_rpc_device.status, "cover:0")
     await init_integration(hass, 2)
+
     assert hass.states.get("cover.test_cover_0") is None
 
 
@@ -175,11 +187,16 @@ async def test_rpc_device_update(
     """Test RPC device update."""
     mutate_rpc_device_status(monkeypatch, mock_rpc_device, "cover:0", "state", "closed")
     await init_integration(hass, 2)
-    assert hass.states.get("cover.test_cover_0").state == CoverState.CLOSED
+
+    state = hass.states.get("cover.test_cover_0")
+    assert state
+    assert state.state == CoverState.CLOSED
 
     mutate_rpc_device_status(monkeypatch, mock_rpc_device, "cover:0", "state", "open")
     mock_rpc_device.mock_update()
-    assert hass.states.get("cover.test_cover_0").state == CoverState.OPEN
+    state = hass.states.get("cover.test_cover_0")
+    assert state
+    assert state.state == CoverState.OPEN
 
 
 async def test_rpc_device_no_position_control(
@@ -190,7 +207,10 @@ async def test_rpc_device_no_position_control(
         monkeypatch, mock_rpc_device, "cover:0", "pos_control", False
     )
     await init_integration(hass, 2)
-    assert hass.states.get("cover.test_cover_0").state == CoverState.OPEN
+
+    state = hass.states.get("cover.test_cover_0")
+    assert state
+    assert state.state == CoverState.OPEN
 
 
 async def test_rpc_cover_tilt(
@@ -212,11 +232,10 @@ async def test_rpc_cover_tilt(
 
     await init_integration(hass, 3)
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.attributes[ATTR_CURRENT_TILT_POSITION] == 0
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-cover:0"
 
     await hass.services.async_call(
@@ -228,7 +247,7 @@ async def test_rpc_cover_tilt(
     mutate_rpc_device_status(monkeypatch, mock_rpc_device, "cover:0", "slat_pos", 50)
     mock_rpc_device.mock_update()
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.attributes[ATTR_CURRENT_TILT_POSITION] == 50
 
     await hass.services.async_call(
@@ -240,7 +259,7 @@ async def test_rpc_cover_tilt(
     mutate_rpc_device_status(monkeypatch, mock_rpc_device, "cover:0", "slat_pos", 100)
     mock_rpc_device.mock_update()
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.attributes[ATTR_CURRENT_TILT_POSITION] == 100
 
     await hass.services.async_call(
@@ -258,5 +277,5 @@ async def test_rpc_cover_tilt(
     mutate_rpc_device_status(monkeypatch, mock_rpc_device, "cover:0", "slat_pos", 10)
     mock_rpc_device.mock_update()
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.attributes[ATTR_CURRENT_TILT_POSITION] == 10
diff --git a/tests/components/shelly/test_device_trigger.py b/tests/components/shelly/test_device_trigger.py
index fb68393304b..ca9edb19fa7 100644
--- a/tests/components/shelly/test_device_trigger.py
+++ b/tests/components/shelly/test_device_trigger.py
@@ -25,7 +25,7 @@ from homeassistant.setup import async_setup_component
 
 from . import init_integration
 
-from tests.common import MockConfigEntry, async_get_device_automations
+from tests.common import async_get_device_automations
 
 
 @pytest.mark.parametrize(
@@ -162,14 +162,16 @@ async def test_get_triggers_for_invalid_device_id(
 ) -> None:
     """Test error raised for invalid shelly device_id."""
     await init_integration(hass, 1)
-    config_entry = MockConfigEntry(domain=DOMAIN, data={})
-    config_entry.add_to_hass(hass)
+    config_entry = await init_integration(hass, 1, data={}, skip_setup=True)
     invalid_device = device_registry.async_get_or_create(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
 
-    with pytest.raises(InvalidDeviceAutomationConfig):
+    with pytest.raises(
+        InvalidDeviceAutomationConfig,
+        match="not found while configuring device automation triggers",
+    ):
         await async_get_device_automations(
             hass, DeviceAutomationType.TRIGGER, invalid_device.id
         )
@@ -385,7 +387,10 @@ async def test_validate_trigger_invalid_triggers(
         },
     )
 
-    assert "Invalid (type,subtype): ('single', 'button3')" in caplog.text
+    assert (
+        "Invalid device automation trigger (type, subtype): ('single', 'button3')"
+        in caplog.text
+    )
 
 
 async def test_rpc_no_runtime_data(
diff --git a/tests/components/shelly/test_diagnostics.py b/tests/components/shelly/test_diagnostics.py
index f576524ba60..84ebd50c425 100644
--- a/tests/components/shelly/test_diagnostics.py
+++ b/tests/components/shelly/test_diagnostics.py
@@ -109,6 +109,14 @@ async def test_rpc_config_entry_diagnostics(
         "bluetooth": {
             "scanner": {
                 "connectable": False,
+                "current_mode": {
+                    "__type": "<enum 'BluetoothScanningMode'>",
+                    "repr": "<BluetoothScanningMode.ACTIVE: 'active'>",
+                },
+                "requested_mode": {
+                    "__type": "<enum 'BluetoothScanningMode'>",
+                    "repr": "<BluetoothScanningMode.ACTIVE: 'active'>",
+                },
                 "discovered_device_timestamps": {"AA:BB:CC:DD:EE:FF": ANY},
                 "discovered_devices_and_advertisement_data": [
                     {
@@ -132,17 +140,17 @@ async def test_rpc_config_entry_diagnostics(
                             -62,
                             [],
                         ],
-                        "details": {"source": "12:34:56:78:9A:BC"},
+                        "details": {"source": "12:34:56:78:9A:BE"},
                         "name": None,
                         "rssi": -62,
                     }
                 ],
                 "last_detection": ANY,
                 "monotonic_time": ANY,
-                "name": "Mock Title (12:34:56:78:9A:BC)",
+                "name": "Mock Title (12:34:56:78:9A:BE)",
                 "scanning": True,
                 "start_time": ANY,
-                "source": "12:34:56:78:9A:BC",
+                "source": "12:34:56:78:9A:BE",
                 "time_since_last_device_detection": {"AA:BB:CC:DD:EE:FF": ANY},
                 "type": "ShellyBLEScanner",
             }
@@ -192,3 +200,21 @@ async def test_rpc_config_entry_diagnostics_ws_outbound(
         result["device_settings"]["ws_outbound_server_valid"]
         == ws_outbound_server_valid
     )
+
+
+async def test_rpc_config_entry_diagnostics_no_ws(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    mock_rpc_device: Mock,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Test config entry diagnostics for rpc device which doesn't support ws outbound."""
+    config = deepcopy(mock_rpc_device.config)
+    config.pop("ws")
+    monkeypatch.setattr(mock_rpc_device, "config", config)
+
+    entry = await init_integration(hass, 3)
+
+    result = await get_diagnostics_for_config_entry(hass, hass_client, entry)
+
+    assert result["device_settings"]["ws_outbound"] == "not supported"
diff --git a/tests/components/shelly/test_event.py b/tests/components/shelly/test_event.py
index 2465b016808..a5367408955 100644
--- a/tests/components/shelly/test_event.py
+++ b/tests/components/shelly/test_event.py
@@ -2,9 +2,11 @@
 
 from unittest.mock import Mock
 
+from aioshelly.ble.const import BLE_SCRIPT_NAME
 from aioshelly.const import MODEL_I3
 import pytest
 from pytest_unordered import unordered
+from syrupy import SnapshotAssertion
 
 from homeassistant.components.event import (
     ATTR_EVENT_TYPE,
@@ -31,8 +33,7 @@ async def test_rpc_button(
     await init_integration(hass, 2)
     entity_id = "event.test_name_input_0"
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_UNKNOWN
     assert state.attributes.get(ATTR_EVENT_TYPES) == unordered(
         ["btn_down", "btn_up", "double_push", "long_push", "single_push", "triple_push"]
@@ -40,8 +41,7 @@ async def test_rpc_button(
     assert state.attributes.get(ATTR_EVENT_TYPE) is None
     assert state.attributes.get(ATTR_DEVICE_CLASS) == EventDeviceClass.BUTTON
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-input:0"
 
     inject_rpc_device_event(
@@ -60,10 +60,97 @@ async def test_rpc_button(
     )
     await hass.async_block_till_done()
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.attributes.get(ATTR_EVENT_TYPE) == "single_push"
 
 
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_rpc_script_1_event(
+    hass: HomeAssistant,
+    mock_rpc_device: Mock,
+    entity_registry: EntityRegistry,
+    monkeypatch: pytest.MonkeyPatch,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test script event."""
+    await init_integration(hass, 2)
+    entity_id = "event.test_name_test_script_js"
+
+    assert hass.states.get(entity_id) == snapshot(name=f"{entity_id}-state")
+
+    assert entity_registry.async_get(entity_id) == snapshot(name=f"{entity_id}-entry")
+
+    inject_rpc_device_event(
+        monkeypatch,
+        mock_rpc_device,
+        {
+            "events": [
+                {
+                    "component": "script:1",
+                    "id": 1,
+                    "event": "script_start",
+                    "ts": 1668522399.2,
+                }
+            ],
+            "ts": 1668522399.2,
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert (state := hass.states.get(entity_id))
+    assert state.attributes.get(ATTR_EVENT_TYPE) == "script_start"
+
+    inject_rpc_device_event(
+        monkeypatch,
+        mock_rpc_device,
+        {
+            "events": [
+                {
+                    "component": "script:1",
+                    "id": 1,
+                    "event": "unknown_event",
+                    "ts": 1668522399.2,
+                }
+            ],
+            "ts": 1668522399.2,
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert (state := hass.states.get(entity_id))
+    assert state.attributes.get(ATTR_EVENT_TYPE) != "unknown_event"
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_rpc_script_2_event(
+    hass: HomeAssistant,
+    entity_registry: EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test that scripts without any emitEvent will not get an event entity."""
+    await init_integration(hass, 2)
+    entity_id = "event.test_name_test_script_2_js"
+
+    assert hass.states.get(entity_id) == snapshot(name=f"{entity_id}-state")
+
+    assert entity_registry.async_get(entity_id) == snapshot(name=f"{entity_id}-entry")
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_rpc_script_ble_event(
+    hass: HomeAssistant,
+    entity_registry: EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test that the ble script will not get an event entity."""
+    await init_integration(hass, 2)
+    entity_id = f"event.test_name_{BLE_SCRIPT_NAME}"
+
+    assert hass.states.get(entity_id) == snapshot(name=f"{entity_id}-state")
+
+    assert entity_registry.async_get(entity_id) == snapshot(name=f"{entity_id}-entry")
+
+
 async def test_rpc_event_removal(
     hass: HomeAssistant,
     mock_rpc_device: Mock,
@@ -91,15 +178,13 @@ async def test_block_event(
     await init_integration(hass, 1)
     entity_id = "event.test_name_channel_1"
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_UNKNOWN
     assert state.attributes.get(ATTR_EVENT_TYPES) == unordered(["single", "long"])
     assert state.attributes.get(ATTR_EVENT_TYPE) is None
     assert state.attributes.get(ATTR_DEVICE_CLASS) == EventDeviceClass.BUTTON
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-relay_0-1"
 
     monkeypatch.setattr(
@@ -111,7 +196,7 @@ async def test_block_event(
     mock_block_device.mock_update()
     await hass.async_block_till_done()
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.attributes.get(ATTR_EVENT_TYPE) == "long"
 
 
@@ -122,8 +207,7 @@ async def test_block_event_shix3_1(
     await init_integration(hass, 1, model=MODEL_I3)
     entity_id = "event.test_name_channel_1"
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.attributes.get(ATTR_EVENT_TYPES) == unordered(
         ["double", "long", "long_single", "single", "single_long", "triple"]
     )
diff --git a/tests/components/shelly/test_init.py b/tests/components/shelly/test_init.py
index 270e2163635..129aa812580 100644
--- a/tests/components/shelly/test_init.py
+++ b/tests/components/shelly/test_init.py
@@ -10,7 +10,9 @@ from aioshelly.exceptions import (
     DeviceConnectionError,
     InvalidAuthError,
     MacAddressMismatchError,
+    RpcCallError,
 )
+from aioshelly.rpc_device.utils import bluetooth_mac_from_primary_mac
 import pytest
 
 from homeassistant.components.shelly.const import (
@@ -24,19 +26,19 @@ from homeassistant.components.shelly.const import (
     BLEScannerMode,
 )
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntryState
-from homeassistant.const import CONF_HOST, CONF_PORT, STATE_ON, STATE_UNAVAILABLE
+from homeassistant.const import (
+    CONF_HOST,
+    CONF_MODEL,
+    CONF_PORT,
+    STATE_ON,
+    STATE_UNAVAILABLE,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import issue_registry as ir
-from homeassistant.helpers.device_registry import (
-    CONNECTION_NETWORK_MAC,
-    DeviceRegistry,
-    format_mac,
-)
+from homeassistant.helpers.device_registry import DeviceRegistry, format_mac
 from homeassistant.setup import async_setup_component
 
-from . import MOCK_MAC, init_integration, mutate_rpc_device_status
-
-from tests.common import MockConfigEntry
+from . import init_integration, mutate_rpc_device_status
 
 
 async def test_custom_coap_port(
@@ -121,12 +123,6 @@ async def test_shared_device_mac(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test first time shared device with another domain."""
-    config_entry = MockConfigEntry(domain="test", data={}, unique_id="some_id")
-    config_entry.add_to_hass(hass)
-    device_registry.async_get_or_create(
-        config_entry_id=config_entry.entry_id,
-        connections={(CONNECTION_NETWORK_MAC, format_mac(MOCK_MAC))},
-    )
     await init_integration(hass, gen, sleep_period=1000)
     assert "will resume when device is online" in caplog.text
 
@@ -135,12 +131,7 @@ async def test_setup_entry_not_shelly(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
     """Test not Shelly entry."""
-    entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
-    entry.add_to_hass(hass)
-
-    assert await hass.config_entries.async_setup(entry.entry_id) is False
-    await hass.async_block_till_done()
-
+    await init_integration(hass, 1, data={})
     assert "probably comes from a custom integration" in caplog.text
 
 
@@ -247,12 +238,7 @@ async def test_sleeping_block_device_online(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test sleeping block device online."""
-    config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id="shelly")
-    config_entry.add_to_hass(hass)
-    device_registry.async_get_or_create(
-        config_entry_id=config_entry.entry_id,
-        connections={(CONNECTION_NETWORK_MAC, format_mac(MOCK_MAC))},
-    )
+    await init_integration(hass, 1, data={})
 
     monkeypatch.setitem(
         mock_block_device.settings,
@@ -266,7 +252,7 @@ async def test_sleeping_block_device_online(
     await hass.async_block_till_done(wait_background_tasks=True)
 
     assert "online, resuming setup" in caplog.text
-    assert entry.data["sleep_period"] == device_sleep
+    assert entry.data[CONF_SLEEP_PERIOD] == device_sleep
 
 
 @pytest.mark.parametrize(("entry_sleep", "device_sleep"), [(None, 0), (1000, 1000)])
@@ -288,7 +274,7 @@ async def test_sleeping_rpc_device_online(
     await hass.async_block_till_done(wait_background_tasks=True)
 
     assert "online, resuming setup" in caplog.text
-    assert entry.data["sleep_period"] == device_sleep
+    assert entry.data[CONF_SLEEP_PERIOD] == device_sleep
 
 
 async def test_sleeping_rpc_device_online_new_firmware(
@@ -307,24 +293,22 @@ async def test_sleeping_rpc_device_online_new_firmware(
     await hass.async_block_till_done(wait_background_tasks=True)
 
     assert "online, resuming setup" in caplog.text
-    assert entry.data["sleep_period"] == 1500
+    assert entry.data[CONF_SLEEP_PERIOD] == 1500
 
 
 async def test_sleeping_rpc_device_online_during_setup(
     hass: HomeAssistant,
-    mock_rpc_device: Mock,
-    monkeypatch: pytest.MonkeyPatch,
+    mock_sleepy_rpc_device: Mock,
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test sleeping device Gen2 woke up by user during setup."""
-    monkeypatch.setattr(mock_rpc_device, "connected", False)
-    monkeypatch.setitem(mock_rpc_device.status["sys"], "wakeup_period", 1000)
     await init_integration(hass, 2, sleep_period=1000)
     await hass.async_block_till_done(wait_background_tasks=True)
 
     assert "will resume when device is online" in caplog.text
     assert "is online (source: setup)" in caplog.text
-    assert hass.states.get("sensor.test_name_temperature") is not None
+
+    assert hass.states.get("sensor.test_name_temperature")
 
 
 async def test_sleeping_rpc_device_offline_during_setup(
@@ -353,7 +337,7 @@ async def test_sleeping_rpc_device_offline_during_setup(
     mock_rpc_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert hass.states.get("sensor.test_name_temperature") is not None
+    assert hass.states.get("sensor.test_name_temperature")
 
 
 @pytest.mark.parametrize(
@@ -369,18 +353,23 @@ async def test_entry_unload(
     entity_id: str,
     mock_block_device: Mock,
     mock_rpc_device: Mock,
+    monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     """Test entry unload."""
+    monkeypatch.delitem(mock_rpc_device.status, "cover:0")
+    monkeypatch.setitem(mock_rpc_device.status["sys"], "relay_in_thermostat", False)
     entry = await init_integration(hass, gen)
 
     assert entry.state is ConfigEntryState.LOADED
-    assert hass.states.get(entity_id).state is STATE_ON
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
     await hass.config_entries.async_unload(entry.entry_id)
     await hass.async_block_till_done()
 
     assert entry.state is ConfigEntryState.NOT_LOADED
-    assert hass.states.get(entity_id).state is STATE_UNAVAILABLE
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_UNAVAILABLE
 
 
 @pytest.mark.parametrize(
@@ -398,9 +387,9 @@ async def test_entry_unload_device_not_ready(
     mock_rpc_device: Mock,
 ) -> None:
     """Test entry unload when device is not ready."""
-    entry = await init_integration(hass, gen, sleep_period=1000)
-
+    assert (entry := await init_integration(hass, gen, sleep_period=1000))
     assert entry.state is ConfigEntryState.LOADED
+
     assert hass.states.get(entity_id) is None
 
     await hass.config_entries.async_unload(entry.entry_id)
@@ -413,16 +402,21 @@ async def test_entry_unload_not_connected(
     hass: HomeAssistant, mock_rpc_device: Mock, monkeypatch: pytest.MonkeyPatch
 ) -> None:
     """Test entry unload when not connected."""
+    monkeypatch.delitem(mock_rpc_device.status, "cover:0")
+    monkeypatch.setitem(mock_rpc_device.status["sys"], "relay_in_thermostat", False)
+
     with patch(
         "homeassistant.components.shelly.coordinator.async_stop_scanner"
     ) as mock_stop_scanner:
-        entry = await init_integration(
-            hass, 2, options={CONF_BLE_SCANNER_MODE: BLEScannerMode.ACTIVE}
+        assert (
+            entry := await init_integration(
+                hass, 2, options={CONF_BLE_SCANNER_MODE: BLEScannerMode.ACTIVE}
+            )
         )
-        entity_id = "switch.test_switch_0"
-
         assert entry.state is ConfigEntryState.LOADED
-        assert hass.states.get(entity_id).state is STATE_ON
+
+        assert (state := hass.states.get("switch.test_switch_0"))
+        assert state.state == STATE_ON
         assert not mock_stop_scanner.call_count
 
         monkeypatch.setattr(mock_rpc_device, "connected", False)
@@ -438,17 +432,22 @@ async def test_entry_unload_not_connected_but_we_think_we_are(
     hass: HomeAssistant, mock_rpc_device: Mock, monkeypatch: pytest.MonkeyPatch
 ) -> None:
     """Test entry unload when not connected but we think we are still connected."""
+    monkeypatch.delitem(mock_rpc_device.status, "cover:0")
+    monkeypatch.setitem(mock_rpc_device.status["sys"], "relay_in_thermostat", False)
+
     with patch(
         "homeassistant.components.shelly.coordinator.async_stop_scanner",
         side_effect=DeviceConnectionError,
     ) as mock_stop_scanner:
-        entry = await init_integration(
-            hass, 2, options={CONF_BLE_SCANNER_MODE: BLEScannerMode.ACTIVE}
+        assert (
+            entry := await init_integration(
+                hass, 2, options={CONF_BLE_SCANNER_MODE: BLEScannerMode.ACTIVE}
+            )
         )
-        entity_id = "switch.test_switch_0"
-
         assert entry.state is ConfigEntryState.LOADED
-        assert hass.states.get(entity_id).state is STATE_ON
+
+        assert (state := hass.states.get("switch.test_switch_0"))
+        assert state.state == STATE_ON
         assert not mock_stop_scanner.call_count
 
         monkeypatch.setattr(mock_rpc_device, "connected", False)
@@ -481,7 +480,9 @@ async def test_entry_missing_gen(hass: HomeAssistant, mock_block_device: Mock) -
     entry = await init_integration(hass, None)
 
     assert entry.state is ConfigEntryState.LOADED
-    assert hass.states.get("switch.test_name_channel_1").state is STATE_ON
+
+    assert (state := hass.states.get("switch.test_name_channel_1"))
+    assert state.state == STATE_ON
 
 
 async def test_entry_missing_port(hass: HomeAssistant) -> None:
@@ -489,11 +490,10 @@ async def test_entry_missing_port(hass: HomeAssistant) -> None:
     data = {
         CONF_HOST: "192.168.1.37",
         CONF_SLEEP_PERIOD: 0,
-        "model": MODEL_PLUS_2PM,
+        CONF_MODEL: MODEL_PLUS_2PM,
         CONF_GEN: 2,
     }
-    entry = MockConfigEntry(domain=DOMAIN, data=data, unique_id=MOCK_MAC)
-    entry.add_to_hass(hass)
+    entry = await init_integration(hass, 2, data=data, skip_setup=True)
     with (
         patch("homeassistant.components.shelly.RpcDevice.initialize"),
         patch(
@@ -513,12 +513,11 @@ async def test_rpc_entry_custom_port(hass: HomeAssistant) -> None:
     data = {
         CONF_HOST: "192.168.1.37",
         CONF_SLEEP_PERIOD: 0,
-        "model": MODEL_PLUS_2PM,
+        CONF_MODEL: MODEL_PLUS_2PM,
         CONF_GEN: 2,
         CONF_PORT: 8001,
     }
-    entry = MockConfigEntry(domain=DOMAIN, data=data, unique_id=MOCK_MAC)
-    entry.add_to_hass(hass)
+    entry = await init_integration(hass, 2, data=data, skip_setup=True)
     with (
         patch("homeassistant.components.shelly.RpcDevice.initialize"),
         patch(
@@ -563,4 +562,20 @@ async def test_bluetooth_cleanup_on_remove_entry(
         await hass.config_entries.async_remove(entry.entry_id)
         await hass.async_block_till_done()
 
-    remove_mock.assert_called_once_with(hass, entry.unique_id.upper())
+    remove_mock.assert_called_once_with(
+        hass, format_mac(bluetooth_mac_from_primary_mac(entry.unique_id)).upper()
+    )
+
+
+async def test_device_script_getcode_error(
+    hass: HomeAssistant,
+    mock_rpc_device: Mock,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Test device script get code error."""
+    monkeypatch.setattr(
+        mock_rpc_device, "script_getcode", AsyncMock(side_effect=RpcCallError(0))
+    )
+
+    entry = await init_integration(hass, 2)
+    assert entry.state is ConfigEntryState.SETUP_RETRY
diff --git a/tests/components/shelly/test_light.py b/tests/components/shelly/test_light.py
index 482821aa966..0dab06f53a9 100644
--- a/tests/components/shelly/test_light.py
+++ b/tests/components/shelly/test_light.py
@@ -65,18 +65,17 @@ async def test_block_device_rgbw_bulb(
     await init_integration(hass, 1, model=MODEL_BULB)
 
     # Test initial
-    state = hass.states.get(entity_id)
-    attributes = state.attributes
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
-    assert attributes[ATTR_RGBW_COLOR] == (45, 55, 65, 70)
-    assert attributes[ATTR_BRIGHTNESS] == 48
-    assert attributes[ATTR_SUPPORTED_COLOR_MODES] == [
+    assert state.attributes[ATTR_RGBW_COLOR] == (45, 55, 65, 70)
+    assert state.attributes[ATTR_BRIGHTNESS] == 48
+    assert state.attributes[ATTR_SUPPORTED_COLOR_MODES] == [
         ColorMode.COLOR_TEMP,
         ColorMode.RGBW,
     ]
-    assert attributes[ATTR_SUPPORTED_FEATURES] == LightEntityFeature.EFFECT
-    assert len(attributes[ATTR_EFFECT_LIST]) == 7
-    assert attributes[ATTR_EFFECT] == "Off"
+    assert state.attributes[ATTR_SUPPORTED_FEATURES] == LightEntityFeature.EFFECT
+    assert len(state.attributes[ATTR_EFFECT_LIST]) == 7
+    assert state.attributes[ATTR_EFFECT] == "Off"
 
     # Turn off
     mock_block_device.blocks[LIGHT_BLOCK_ID].set_state.reset_mock()
@@ -89,7 +88,7 @@ async def test_block_device_rgbw_bulb(
     mock_block_device.blocks[LIGHT_BLOCK_ID].set_state.assert_called_once_with(
         turn="off"
     )
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_OFF
 
     # Turn on, RGBW = [70, 80, 90, 20], brightness = 33, effect = Flash
@@ -108,13 +107,12 @@ async def test_block_device_rgbw_bulb(
     mock_block_device.blocks[LIGHT_BLOCK_ID].set_state.assert_called_once_with(
         turn="on", gain=13, brightness=13, red=70, green=80, blue=90, white=30, effect=3
     )
-    state = hass.states.get(entity_id)
-    attributes = state.attributes
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
-    assert attributes[ATTR_COLOR_MODE] == ColorMode.RGBW
-    assert attributes[ATTR_RGBW_COLOR] == (70, 80, 90, 30)
-    assert attributes[ATTR_BRIGHTNESS] == 33
-    assert attributes[ATTR_EFFECT] == "Flash"
+    assert state.attributes[ATTR_COLOR_MODE] == ColorMode.RGBW
+    assert state.attributes[ATTR_RGBW_COLOR] == (70, 80, 90, 30)
+    assert state.attributes[ATTR_BRIGHTNESS] == 33
+    assert state.attributes[ATTR_EFFECT] == "Flash"
 
     # Turn on, COLOR_TEMP_KELVIN = 3500
     mock_block_device.blocks[LIGHT_BLOCK_ID].set_state.reset_mock()
@@ -127,14 +125,12 @@ async def test_block_device_rgbw_bulb(
     mock_block_device.blocks[LIGHT_BLOCK_ID].set_state.assert_called_once_with(
         turn="on", temp=3500, mode="white"
     )
-    state = hass.states.get(entity_id)
-    attributes = state.attributes
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
-    assert attributes[ATTR_COLOR_MODE] == ColorMode.COLOR_TEMP
-    assert attributes[ATTR_COLOR_TEMP_KELVIN] == 3500
+    assert state.attributes[ATTR_COLOR_MODE] == ColorMode.COLOR_TEMP
+    assert state.attributes[ATTR_COLOR_TEMP_KELVIN] == 3500
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-light_0"
 
 
@@ -154,21 +150,20 @@ async def test_block_device_rgb_bulb(
     await init_integration(hass, 1, model=MODEL_BULB_RGBW)
 
     # Test initial
-    state = hass.states.get(entity_id)
-    attributes = state.attributes
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
-    assert attributes[ATTR_RGB_COLOR] == (45, 55, 65)
-    assert attributes[ATTR_BRIGHTNESS] == 48
-    assert attributes[ATTR_SUPPORTED_COLOR_MODES] == [
+    assert state.attributes[ATTR_RGB_COLOR] == (45, 55, 65)
+    assert state.attributes[ATTR_BRIGHTNESS] == 48
+    assert state.attributes[ATTR_SUPPORTED_COLOR_MODES] == [
         ColorMode.COLOR_TEMP,
         ColorMode.RGB,
     ]
     assert (
-        attributes[ATTR_SUPPORTED_FEATURES]
+        state.attributes[ATTR_SUPPORTED_FEATURES]
         == LightEntityFeature.EFFECT | LightEntityFeature.TRANSITION
     )
-    assert len(attributes[ATTR_EFFECT_LIST]) == 4
-    assert attributes[ATTR_EFFECT] == "Off"
+    assert len(state.attributes[ATTR_EFFECT_LIST]) == 4
+    assert state.attributes[ATTR_EFFECT] == "Off"
 
     # Turn off
     mock_block_device.blocks[LIGHT_BLOCK_ID].set_state.reset_mock()
@@ -181,7 +176,7 @@ async def test_block_device_rgb_bulb(
     mock_block_device.blocks[LIGHT_BLOCK_ID].set_state.assert_called_once_with(
         turn="off"
     )
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_OFF
 
     # Turn on, RGB = [70, 80, 90], brightness = 33, effect = Flash
@@ -200,13 +195,12 @@ async def test_block_device_rgb_bulb(
     mock_block_device.blocks[LIGHT_BLOCK_ID].set_state.assert_called_once_with(
         turn="on", gain=13, brightness=13, red=70, green=80, blue=90, effect=3
     )
-    state = hass.states.get(entity_id)
-    attributes = state.attributes
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
-    assert attributes[ATTR_COLOR_MODE] == ColorMode.RGB
-    assert attributes[ATTR_RGB_COLOR] == (70, 80, 90)
-    assert attributes[ATTR_BRIGHTNESS] == 33
-    assert attributes[ATTR_EFFECT] == "Flash"
+    assert state.attributes[ATTR_COLOR_MODE] == ColorMode.RGB
+    assert state.attributes[ATTR_RGB_COLOR] == (70, 80, 90)
+    assert state.attributes[ATTR_BRIGHTNESS] == 33
+    assert state.attributes[ATTR_EFFECT] == "Flash"
 
     # Turn on, COLOR_TEMP_KELVIN = 3500
     mock_block_device.blocks[LIGHT_BLOCK_ID].set_state.reset_mock()
@@ -219,11 +213,10 @@ async def test_block_device_rgb_bulb(
     mock_block_device.blocks[LIGHT_BLOCK_ID].set_state.assert_called_once_with(
         turn="on", temp=3500, mode="white"
     )
-    state = hass.states.get(entity_id)
-    attributes = state.attributes
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
-    assert attributes[ATTR_COLOR_MODE] == ColorMode.COLOR_TEMP
-    assert attributes[ATTR_COLOR_TEMP_KELVIN] == 3500
+    assert state.attributes[ATTR_COLOR_MODE] == ColorMode.COLOR_TEMP
+    assert state.attributes[ATTR_COLOR_TEMP_KELVIN] == 3500
 
     # Turn on with unsupported effect
     mock_block_device.blocks[LIGHT_BLOCK_ID].set_state.reset_mock()
@@ -236,14 +229,13 @@ async def test_block_device_rgb_bulb(
     mock_block_device.blocks[LIGHT_BLOCK_ID].set_state.assert_called_once_with(
         turn="on", mode="color"
     )
-    state = hass.states.get(entity_id)
-    attributes = state.attributes
+
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
-    assert attributes[ATTR_EFFECT] == "Off"
+    assert state.attributes[ATTR_EFFECT] == "Off"
     assert "Effect 'Breath' not supported" in caplog.text
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-light_1"
 
 
@@ -272,12 +264,11 @@ async def test_block_device_white_bulb(
     await init_integration(hass, 1, model=MODEL_VINTAGE_V2)
 
     # Test initial
-    state = hass.states.get(entity_id)
-    attributes = state.attributes
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
-    assert attributes[ATTR_BRIGHTNESS] == 128
-    assert attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.BRIGHTNESS]
-    assert attributes[ATTR_SUPPORTED_FEATURES] == LightEntityFeature.TRANSITION
+    assert state.attributes[ATTR_BRIGHTNESS] == 128
+    assert state.attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.BRIGHTNESS]
+    assert state.attributes[ATTR_SUPPORTED_FEATURES] == LightEntityFeature.TRANSITION
 
     # Turn off
     mock_block_device.blocks[LIGHT_BLOCK_ID].set_state.reset_mock()
@@ -290,7 +281,7 @@ async def test_block_device_white_bulb(
     mock_block_device.blocks[LIGHT_BLOCK_ID].set_state.assert_called_once_with(
         turn="off"
     )
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_OFF
 
     # Turn on, brightness = 33
@@ -304,13 +295,11 @@ async def test_block_device_white_bulb(
     mock_block_device.blocks[LIGHT_BLOCK_ID].set_state.assert_called_once_with(
         turn="on", gain=13, brightness=13
     )
-    state = hass.states.get(entity_id)
-    attributes = state.attributes
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
-    assert attributes[ATTR_BRIGHTNESS] == 33
+    assert state.attributes[ATTR_BRIGHTNESS] == 33
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-light_1"
 
 
@@ -343,9 +332,8 @@ async def test_block_device_support_transition(
     await init_integration(hass, 1, model=model)
 
     # Test initial
-    state = hass.states.get(entity_id)
-    attributes = state.attributes
-    assert attributes[ATTR_SUPPORTED_FEATURES] & LightEntityFeature.TRANSITION
+    assert (state := hass.states.get(entity_id))
+    assert state.attributes[ATTR_SUPPORTED_FEATURES] & LightEntityFeature.TRANSITION
 
     # Turn on, TRANSITION = 4
     mock_block_device.blocks[LIGHT_BLOCK_ID].set_state.reset_mock()
@@ -358,7 +346,7 @@ async def test_block_device_support_transition(
     mock_block_device.blocks[LIGHT_BLOCK_ID].set_state.assert_called_once_with(
         turn="on", transition=4000
     )
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
 
     # Turn off, TRANSITION = 6, limit to 5000ms
@@ -372,11 +360,10 @@ async def test_block_device_support_transition(
     mock_block_device.blocks[LIGHT_BLOCK_ID].set_state.assert_called_once_with(
         turn="off", transition=5000
     )
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_OFF
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-light_1"
 
 
@@ -403,14 +390,14 @@ async def test_block_device_relay_app_type_light(
         mock_block_device.blocks[RELAY_BLOCK_ID], "description", "relay_1"
     )
     await init_integration(hass, 1)
+
     assert hass.states.get("switch.test_name_channel_1") is None
 
     # Test initial
-    state = hass.states.get(entity_id)
-    attributes = state.attributes
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
-    assert attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.ONOFF]
-    assert attributes[ATTR_SUPPORTED_FEATURES] == 0
+    assert state.attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.ONOFF]
+    assert state.attributes[ATTR_SUPPORTED_FEATURES] == 0
 
     # Turn off
     mock_block_device.blocks[RELAY_BLOCK_ID].set_state.reset_mock()
@@ -423,7 +410,7 @@ async def test_block_device_relay_app_type_light(
     mock_block_device.blocks[RELAY_BLOCK_ID].set_state.assert_called_once_with(
         turn="off"
     )
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_OFF
 
     # Turn on
@@ -437,11 +424,10 @@ async def test_block_device_relay_app_type_light(
     mock_block_device.blocks[RELAY_BLOCK_ID].set_state.assert_called_once_with(
         turn="on"
     )
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-relay_1"
 
 
@@ -451,6 +437,7 @@ async def test_block_device_no_light_blocks(
     """Test block device without light blocks."""
     monkeypatch.setattr(mock_block_device.blocks[LIGHT_BLOCK_ID], "type", "roller")
     await init_integration(hass, 1)
+
     assert hass.states.get("light.test_name_channel_1") is None
 
 
@@ -473,7 +460,9 @@ async def test_rpc_device_switch_type_lights_mode(
         {ATTR_ENTITY_ID: entity_id},
         blocking=True,
     )
-    assert hass.states.get(entity_id).state == STATE_ON
+
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
     mutate_rpc_device_status(monkeypatch, mock_rpc_device, "switch:0", "output", False)
     await hass.services.async_call(
@@ -483,10 +472,11 @@ async def test_rpc_device_switch_type_lights_mode(
         blocking=True,
     )
     mock_rpc_device.mock_update()
-    assert hass.states.get(entity_id).state == STATE_OFF
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_OFF
+
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-switch:0"
 
 
@@ -510,7 +500,8 @@ async def test_rpc_light(
     )
 
     mock_rpc_device.call_rpc.assert_called_once_with("Light.Set", {"id": 0, "on": True})
-    state = hass.states.get(entity_id)
+
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
     assert state.attributes[ATTR_BRIGHTNESS] == 135
 
@@ -528,7 +519,8 @@ async def test_rpc_light(
     mock_rpc_device.call_rpc.assert_called_once_with(
         "Light.Set", {"id": 0, "on": False}
     )
-    state = hass.states.get(entity_id)
+
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_OFF
 
     # Turn on, brightness = 33
@@ -547,7 +539,8 @@ async def test_rpc_light(
     mock_rpc_device.call_rpc.assert_called_once_with(
         "Light.Set", {"id": 0, "on": True, "brightness": 13}
     )
-    state = hass.states.get(entity_id)
+
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
     assert state.attributes[ATTR_BRIGHTNESS] == 33
 
@@ -565,7 +558,8 @@ async def test_rpc_light(
     mock_rpc_device.call_rpc.assert_called_once_with(
         "Light.Set", {"id": 0, "on": True, "transition_duration": 10.1}
     )
-    state = hass.states.get(entity_id)
+
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
 
     # Turn off, transition = 0.4, should be limited to 0.5
@@ -584,11 +578,10 @@ async def test_rpc_light(
         "Light.Set", {"id": 0, "on": False, "transition_duration": 0.5}
     )
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_OFF
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-light:0"
 
 
@@ -606,12 +599,11 @@ async def test_rpc_device_rgb_profile(
     await init_integration(hass, 2)
 
     # Test initial
-    state = hass.states.get(entity_id)
-    attributes = state.attributes
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
-    assert attributes[ATTR_RGB_COLOR] == (45, 55, 65)
-    assert attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.RGB]
-    assert attributes[ATTR_SUPPORTED_FEATURES] == LightEntityFeature.TRANSITION
+    assert state.attributes[ATTR_RGB_COLOR] == (45, 55, 65)
+    assert state.attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.RGB]
+    assert state.attributes[ATTR_SUPPORTED_FEATURES] == LightEntityFeature.TRANSITION
 
     # Turn on, RGB = [70, 80, 90]
     await hass.services.async_call(
@@ -628,14 +620,12 @@ async def test_rpc_device_rgb_profile(
         "RGB.Set", {"id": 0, "on": True, "rgb": [70, 80, 90]}
     )
 
-    state = hass.states.get(entity_id)
-    attributes = state.attributes
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
-    assert attributes[ATTR_COLOR_MODE] == ColorMode.RGB
-    assert attributes[ATTR_RGB_COLOR] == (70, 80, 90)
+    assert state.attributes[ATTR_COLOR_MODE] == ColorMode.RGB
+    assert state.attributes[ATTR_RGB_COLOR] == (70, 80, 90)
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-rgb:0"
 
 
@@ -653,12 +643,11 @@ async def test_rpc_device_rgbw_profile(
     await init_integration(hass, 2)
 
     # Test initial
-    state = hass.states.get(entity_id)
-    attributes = state.attributes
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
-    assert attributes[ATTR_RGBW_COLOR] == (21, 22, 23, 120)
-    assert attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.RGBW]
-    assert attributes[ATTR_SUPPORTED_FEATURES] == LightEntityFeature.TRANSITION
+    assert state.attributes[ATTR_RGBW_COLOR] == (21, 22, 23, 120)
+    assert state.attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.RGBW]
+    assert state.attributes[ATTR_SUPPORTED_FEATURES] == LightEntityFeature.TRANSITION
 
     # Turn on, RGBW = [72, 82, 92, 128]
     await hass.services.async_call(
@@ -678,14 +667,12 @@ async def test_rpc_device_rgbw_profile(
         "RGBW.Set", {"id": 0, "on": True, "rgb": [72, 82, 92], "white": 128}
     )
 
-    state = hass.states.get(entity_id)
-    attributes = state.attributes
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
-    assert attributes[ATTR_COLOR_MODE] == ColorMode.RGBW
-    assert attributes[ATTR_RGBW_COLOR] == (72, 82, 92, 128)
+    assert state.attributes[ATTR_COLOR_MODE] == ColorMode.RGBW
+    assert state.attributes[ATTR_RGBW_COLOR] == (72, 82, 92, 128)
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-rgbw:0"
 
 
@@ -730,9 +717,11 @@ async def test_rpc_rgbw_device_light_mode_remove_others(
     # verify we have 4 lights
     for i in range(SHELLY_PLUS_RGBW_CHANNELS):
         entity_id = f"light.test_light_{i}"
-        assert hass.states.get(entity_id).state == STATE_ON
-        entry = entity_registry.async_get(entity_id)
-        assert entry
+
+        assert (state := hass.states.get(entity_id))
+        assert state.state == STATE_ON
+
+        assert (entry := entity_registry.async_get(entity_id))
         assert entry.unique_id == f"123456789ABC-light:{i}"
 
     # verify RGB & RGBW entities removed
@@ -793,9 +782,11 @@ async def test_rpc_rgbw_device_rgb_w_modes_remove_others(
 
     # verify we have RGB/w light
     entity_id = f"light.test_{active_mode}_0"
-    assert hass.states.get(entity_id).state == STATE_ON
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
+
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == f"123456789ABC-{active_mode}:0"
 
     # verify light & RGB/W entities removed
@@ -823,8 +814,7 @@ async def test_rpc_cct_light(
 
     await init_integration(hass, 2)
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-cct:0"
 
     # Turn off
@@ -836,7 +826,8 @@ async def test_rpc_cct_light(
     )
 
     mock_rpc_device.call_rpc.assert_called_once_with("CCT.Set", {"id": 0, "on": False})
-    state = hass.states.get(entity_id)
+
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_OFF
 
     # Turn on
@@ -851,7 +842,8 @@ async def test_rpc_cct_light(
 
     mock_rpc_device.mock_update()
     mock_rpc_device.call_rpc.assert_called_once_with("CCT.Set", {"id": 0, "on": True})
-    state = hass.states.get(entity_id)
+
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
     assert state.attributes[ATTR_COLOR_MODE] == ColorMode.COLOR_TEMP
     assert state.attributes[ATTR_BRIGHTNESS] == 196  # 77% of 255
@@ -874,7 +866,8 @@ async def test_rpc_cct_light(
     mock_rpc_device.call_rpc.assert_called_once_with(
         "CCT.Set", {"id": 0, "on": True, "brightness": 88}
     )
-    state = hass.states.get(entity_id)
+
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
     assert state.attributes[ATTR_BRIGHTNESS] == 224  # 88% of 255
 
@@ -894,7 +887,8 @@ async def test_rpc_cct_light(
     mock_rpc_device.call_rpc.assert_called_once_with(
         "CCT.Set", {"id": 0, "on": True, "ct": 4444}
     )
-    state = hass.states.get(entity_id)
+
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
     assert state.attributes[ATTR_COLOR_TEMP_KELVIN] == 4444
 
diff --git a/tests/components/shelly/test_number.py b/tests/components/shelly/test_number.py
index 2a64ab839ea..41002917d86 100644
--- a/tests/components/shelly/test_number.py
+++ b/tests/components/shelly/test_number.py
@@ -3,7 +3,7 @@
 from copy import deepcopy
 from unittest.mock import AsyncMock, Mock
 
-from aioshelly.const import MODEL_BLU_GATEWAY_GEN3
+from aioshelly.const import BLU_TRV_TIMEOUT, MODEL_BLU_GATEWAY_G3
 from aioshelly.exceptions import DeviceConnectionError, InvalidAuthError
 import pytest
 from syrupy import SnapshotAssertion
@@ -54,15 +54,16 @@ async def test_block_number_update(
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert hass.states.get(entity_id).state == "50"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "50"
 
     monkeypatch.setattr(mock_block_device.blocks[DEVICE_BLOCK_ID], "valvePos", 30)
     mock_block_device.mock_update()
 
-    assert hass.states.get(entity_id).state == "30"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "30"
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-device_0-valvePos"
 
 
@@ -103,14 +104,16 @@ async def test_block_restored_number(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == "40"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "40"
 
     # Make device online
     monkeypatch.setattr(mock_block_device, "initialized", True)
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert hass.states.get(entity_id).state == "50"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "50"
 
 
 async def test_block_restored_number_no_last_state(
@@ -141,14 +144,16 @@ async def test_block_restored_number_no_last_state(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == STATE_UNKNOWN
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_UNKNOWN
 
     # Make device online
     monkeypatch.setattr(mock_block_device, "initialized", True)
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert hass.states.get(entity_id).state == "50"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "50"
 
 
 async def test_block_number_set_value(
@@ -200,7 +205,10 @@ async def test_block_set_value_connection_error(
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    with pytest.raises(HomeAssistantError):
+    with pytest.raises(
+        HomeAssistantError,
+        match="Device communication error occurred while calling action for number.test_name_valve_position of Test name",
+    ):
         await hass.services.async_call(
             NUMBER_DOMAIN,
             SERVICE_SET_VALUE,
@@ -302,8 +310,7 @@ async def test_rpc_device_virtual_number(
 
     await init_integration(hass, 3)
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == "12.3"
     assert state.attributes.get(ATTR_MIN) == 0
     assert state.attributes.get(ATTR_MAX) == 100
@@ -311,13 +318,13 @@ async def test_rpc_device_virtual_number(
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == expected_unit
     assert state.attributes.get(ATTR_MODE) is mode
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-number:203-number"
 
     monkeypatch.setitem(mock_rpc_device.status["number:203"], "value", 78.9)
     mock_rpc_device.mock_update()
-    assert hass.states.get(entity_id).state == "78.9"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "78.9"
 
     monkeypatch.setitem(mock_rpc_device.status["number:203"], "value", 56.7)
     await hass.services.async_call(
@@ -327,7 +334,8 @@ async def test_rpc_device_virtual_number(
         blocking=True,
     )
     mock_rpc_device.mock_update()
-    assert hass.states.get(entity_id).state == "56.7"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "56.7"
 
 
 async def test_rpc_remove_virtual_number_when_mode_label(
@@ -365,8 +373,7 @@ async def test_rpc_remove_virtual_number_when_mode_label(
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    entry = entity_registry.async_get(entity_id)
-    assert not entry
+    assert entity_registry.async_get(entity_id) is None
 
 
 async def test_rpc_remove_virtual_number_when_orphaned(
@@ -390,8 +397,7 @@ async def test_rpc_remove_virtual_number_when_orphaned(
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    entry = entity_registry.async_get(entity_id)
-    assert not entry
+    assert entity_registry.async_get(entity_id) is None
 
 
 async def test_blu_trv_number_entity(
@@ -405,7 +411,7 @@ async def test_blu_trv_number_entity(
     # disable automatic temperature control in the device
     monkeypatch.setitem(mock_blu_trv.config["blutrv:200"], "enable", False)
 
-    await init_integration(hass, 3, model=MODEL_BLU_GATEWAY_GEN3)
+    await init_integration(hass, 3, model=MODEL_BLU_GATEWAY_G3)
 
     for entity in ("external_temperature", "valve_position"):
         entity_id = f"{NUMBER_DOMAIN}.trv_name_{entity}"
@@ -415,3 +421,83 @@ async def test_blu_trv_number_entity(
 
         entry = entity_registry.async_get(entity_id)
         assert entry == snapshot(name=f"{entity_id}-entry")
+
+
+async def test_blu_trv_ext_temp_set_value(
+    hass: HomeAssistant, mock_blu_trv: Mock
+) -> None:
+    """Test the set value action for BLU TRV External Temperature number entity."""
+    await init_integration(hass, 3, model=MODEL_BLU_GATEWAY_G3)
+
+    entity_id = f"{NUMBER_DOMAIN}.trv_name_external_temperature"
+
+    # After HA start the state should be unknown because there was no previous external
+    # temperature report
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_UNKNOWN
+
+    await hass.services.async_call(
+        NUMBER_DOMAIN,
+        SERVICE_SET_VALUE,
+        {
+            ATTR_ENTITY_ID: entity_id,
+            ATTR_VALUE: 22.2,
+        },
+        blocking=True,
+    )
+    mock_blu_trv.mock_update()
+    mock_blu_trv.call_rpc.assert_called_once_with(
+        "BluTRV.Call",
+        {
+            "id": 200,
+            "method": "Trv.SetExternalTemperature",
+            "params": {"id": 0, "t_C": 22.2},
+        },
+        BLU_TRV_TIMEOUT,
+    )
+
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "22.2"
+
+
+async def test_blu_trv_valve_pos_set_value(
+    hass: HomeAssistant,
+    mock_blu_trv: Mock,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Test the set value action for BLU TRV Valve Position number entity."""
+    # disable automatic temperature control to enable valve position entity
+    monkeypatch.setitem(mock_blu_trv.config["blutrv:200"], "enable", False)
+
+    await init_integration(hass, 3, model=MODEL_BLU_GATEWAY_G3)
+
+    entity_id = f"{NUMBER_DOMAIN}.trv_name_valve_position"
+
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "0"
+
+    monkeypatch.setitem(mock_blu_trv.status["blutrv:200"], "pos", 20)
+    await hass.services.async_call(
+        NUMBER_DOMAIN,
+        SERVICE_SET_VALUE,
+        {
+            ATTR_ENTITY_ID: entity_id,
+            ATTR_VALUE: 20.0,
+        },
+        blocking=True,
+    )
+    mock_blu_trv.mock_update()
+    mock_blu_trv.call_rpc.assert_called_once_with(
+        "BluTRV.Call",
+        {
+            "id": 200,
+            "method": "Trv.SetPosition",
+            "params": {"id": 0, "pos": 20},
+        },
+        BLU_TRV_TIMEOUT,
+    )
+    # device only accepts int for 'pos' value
+    assert isinstance(mock_blu_trv.call_rpc.call_args[0][1]["params"]["pos"], int)
+
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "20"
diff --git a/tests/components/shelly/test_select.py b/tests/components/shelly/test_select.py
index 0a6eb2a5843..39e426baa58 100644
--- a/tests/components/shelly/test_select.py
+++ b/tests/components/shelly/test_select.py
@@ -56,8 +56,7 @@ async def test_rpc_device_virtual_enum(
 
     await init_integration(hass, 3)
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == expected_state
     assert state.attributes.get(ATTR_OPTIONS) == [
         "Title 1",
@@ -65,13 +64,14 @@ async def test_rpc_device_virtual_enum(
         "option 3",
     ]
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-enum:203-enum"
 
     monkeypatch.setitem(mock_rpc_device.status["enum:203"], "value", "option 2")
     mock_rpc_device.mock_update()
-    assert hass.states.get(entity_id).state == "option 2"
+
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "option 2"
 
     monkeypatch.setitem(mock_rpc_device.status["enum:203"], "value", "option 1")
     await hass.services.async_call(
@@ -83,7 +83,9 @@ async def test_rpc_device_virtual_enum(
     # 'Title 1' corresponds to 'option 1'
     assert mock_rpc_device.call_rpc.call_args[0][1] == {"id": 203, "value": "option 1"}
     mock_rpc_device.mock_update()
-    assert hass.states.get(entity_id).state == "Title 1"
+
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "Title 1"
 
 
 async def test_rpc_remove_virtual_enum_when_mode_label(
@@ -122,8 +124,7 @@ async def test_rpc_remove_virtual_enum_when_mode_label(
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    entry = entity_registry.async_get(entity_id)
-    assert not entry
+    assert entity_registry.async_get(entity_id) is None
 
 
 async def test_rpc_remove_virtual_enum_when_orphaned(
@@ -147,5 +148,4 @@ async def test_rpc_remove_virtual_enum_when_orphaned(
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    entry = entity_registry.async_get(entity_id)
-    assert not entry
+    assert entity_registry.async_get(entity_id) is None
diff --git a/tests/components/shelly/test_sensor.py b/tests/components/shelly/test_sensor.py
index 0bbb374012f..7edd38a4b31 100644
--- a/tests/components/shelly/test_sensor.py
+++ b/tests/components/shelly/test_sensor.py
@@ -3,7 +3,7 @@
 from copy import deepcopy
 from unittest.mock import Mock
 
-from aioshelly.const import MODEL_BLU_GATEWAY_GEN3
+from aioshelly.const import MODEL_BLU_GATEWAY_G3
 from freezegun.api import FrozenDateTimeFactory
 import pytest
 from syrupy import SnapshotAssertion
@@ -40,7 +40,6 @@ from homeassistant.helpers.entity_registry import EntityRegistry
 from homeassistant.setup import async_setup_component
 
 from . import (
-    get_entity_state,
     init_integration,
     mock_polling_rpc_update,
     mock_rest_update,
@@ -66,15 +65,16 @@ async def test_block_sensor(
     entity_id = f"{SENSOR_DOMAIN}.test_name_channel_1_power"
     await init_integration(hass, 1)
 
-    assert hass.states.get(entity_id).state == "53.4"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "53.4"
 
     monkeypatch.setattr(mock_block_device.blocks[RELAY_BLOCK_ID], "power", 60.1)
     mock_block_device.mock_update()
 
-    assert hass.states.get(entity_id).state == "60.1"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "60.1"
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-relay_0-power"
 
 
@@ -85,14 +85,13 @@ async def test_energy_sensor(
     entity_id = f"{SENSOR_DOMAIN}.test_name_channel_1_energy"
     await init_integration(hass, 1)
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     # 1234567.89 Wmin / 60 / 1000 = 20.5761315 kWh
     assert state.state == "20.5761315"
     # suggested unit is KWh
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-relay_0-energy"
 
 
@@ -111,13 +110,12 @@ async def test_power_factory_unit_migration(
     entity_id = f"{SENSOR_DOMAIN}.test_name_power_factor"
     await init_integration(hass, 1)
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     # Value of 0.98 is converted to 98.0%
     assert state.state == "98.0"
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == PERCENTAGE
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-emeter_0-powerFactor"
 
 
@@ -128,12 +126,11 @@ async def test_power_factory_without_unit_migration(
     entity_id = f"{SENSOR_DOMAIN}.test_name_power_factor"
     await init_integration(hass, 1)
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == "0.98"
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is None
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-emeter_0-powerFactor"
 
 
@@ -147,12 +144,14 @@ async def test_block_rest_sensor(
     entity_id = register_entity(hass, SENSOR_DOMAIN, "test_name_rssi", "rssi")
     await init_integration(hass, 1)
 
-    assert hass.states.get(entity_id).state == "-64"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "-64"
 
     monkeypatch.setitem(mock_block_device.status["wifi_sta"], "rssi", -71)
     await mock_rest_update(hass, freezer)
 
-    assert hass.states.get(entity_id).state == "-71"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "-71"
 
 
 async def test_block_sleeping_sensor(
@@ -175,15 +174,16 @@ async def test_block_sleeping_sensor(
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert hass.states.get(entity_id).state == "22.1"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "22.1"
 
     monkeypatch.setattr(mock_block_device.blocks[SENSOR_BLOCK_ID], "temp", 23.4)
     mock_block_device.mock_update()
 
-    assert hass.states.get(entity_id).state == "23.4"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "23.4"
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-sensor_0-temp"
 
 
@@ -211,8 +211,7 @@ async def test_block_restored_sleeping_sensor(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == "20.4"
     assert state.attributes[ATTR_STATE_CLASS] == SensorStateClass.MEASUREMENT
     assert state.attributes[ATTR_DEVICE_CLASS] == SensorDeviceClass.TEMPERATURE
@@ -222,7 +221,8 @@ async def test_block_restored_sleeping_sensor(
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert hass.states.get(entity_id).state == "22.1"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "22.1"
 
 
 async def test_block_restored_sleeping_sensor_no_last_state(
@@ -246,14 +246,16 @@ async def test_block_restored_sleeping_sensor_no_last_state(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == STATE_UNKNOWN
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_UNKNOWN
 
     # Make device online
     monkeypatch.setattr(mock_block_device, "initialized", True)
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert hass.states.get(entity_id).state == "22.1"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "22.1"
 
 
 async def test_block_sensor_error(
@@ -266,15 +268,16 @@ async def test_block_sensor_error(
     entity_id = f"{SENSOR_DOMAIN}.test_name_battery"
     await init_integration(hass, 1)
 
-    assert hass.states.get(entity_id).state == "98"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "98"
 
     monkeypatch.setattr(mock_block_device.blocks[DEVICE_BLOCK_ID], "battery", -1)
     mock_block_device.mock_update()
 
-    assert hass.states.get(entity_id).state == STATE_UNAVAILABLE
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_UNAVAILABLE
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-device_0-battery"
 
 
@@ -321,7 +324,8 @@ async def test_block_not_matched_restored_sleeping_sensor(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == "20.4"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "20.4"
 
     # Make device online
     monkeypatch.setattr(
@@ -331,7 +335,8 @@ async def test_block_not_matched_restored_sleeping_sensor(
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert hass.states.get(entity_id).state == "20.4"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "20.4"
 
 
 async def test_block_sensor_without_value(
@@ -345,17 +350,94 @@ async def test_block_sensor_without_value(
     assert hass.states.get(entity_id) is None
 
 
-async def test_block_sensor_unknown_value(
-    hass: HomeAssistant, mock_block_device: Mock, monkeypatch: pytest.MonkeyPatch
+@pytest.mark.parametrize(
+    ("entity", "initial_state", "block_id", "attribute", "value", "final_value"),
+    [
+        ("test_name_battery", "98", DEVICE_BLOCK_ID, "battery", None, STATE_UNKNOWN),
+        (
+            "test_name_operation",
+            "normal",
+            SENSOR_BLOCK_ID,
+            "sensorOp",
+            None,
+            STATE_UNKNOWN,
+        ),
+        (
+            "test_name_operation",
+            "normal",
+            SENSOR_BLOCK_ID,
+            "sensorOp",
+            "normal",
+            "normal",
+        ),
+        (
+            "test_name_self_test",
+            "pending",
+            SENSOR_BLOCK_ID,
+            "selfTest",
+            "completed",
+            "completed",
+        ),
+        (
+            "test_name_gas_detected",
+            "mild",
+            SENSOR_BLOCK_ID,
+            "gas",
+            "heavy",
+            "heavy",
+        ),
+    ],
+)
+async def test_block_sensor_values(
+    hass: HomeAssistant,
+    mock_block_device: Mock,
+    monkeypatch: pytest.MonkeyPatch,
+    entity: str,
+    initial_state: str,
+    block_id: int,
+    attribute: str,
+    value: str | None,
+    final_value: str,
 ) -> None:
     """Test block sensor unknown value."""
-    entity_id = f"{SENSOR_DOMAIN}.test_name_battery"
+    entity_id = f"{SENSOR_DOMAIN}.{entity}"
     await init_integration(hass, 1)
 
-    monkeypatch.setattr(mock_block_device.blocks[DEVICE_BLOCK_ID], "battery", None)
+    assert hass.states.get(entity_id).state == initial_state
+
+    monkeypatch.setattr(mock_block_device.blocks[block_id], attribute, value)
     mock_block_device.mock_update()
 
-    assert hass.states.get(entity_id).state == STATE_UNKNOWN
+    assert (state := hass.states.get(entity_id))
+    assert state.state == final_value
+
+
+@pytest.mark.parametrize(
+    ("lamp_life_seconds", "percentage"),
+    [
+        (0 * 3600, "100.0"),  # 0 hours, 100% remaining
+        (16 * 3600, "99.8222222222222"),
+        (4500 * 3600, "50.0"),  # 4500 hours, 50% remaining
+        (9000 * 3600, "0.0"),  # 9000 hours, 0% remaining
+        (10000 * 3600, "0.0"),  # > 9000 hours, 0% remaining
+    ],
+)
+async def test_block_shelly_air_lamp_life(
+    hass: HomeAssistant,
+    mock_block_device: Mock,
+    monkeypatch: pytest.MonkeyPatch,
+    lamp_life_seconds: int,
+    percentage: float,
+) -> None:
+    """Test block Shelly Air lamp life percentage sensor."""
+    entity_id = f"{SENSOR_DOMAIN}.{'test_name_channel_1_lamp_life'}"
+    monkeypatch.setattr(
+        mock_block_device.blocks[RELAY_BLOCK_ID], "totalWorkTime", lamp_life_seconds
+    )
+    await init_integration(hass, 1)
+
+    assert (state := hass.states.get(entity_id))
+    assert state.state == percentage
 
 
 async def test_rpc_sensor(
@@ -365,17 +447,20 @@ async def test_rpc_sensor(
     entity_id = f"{SENSOR_DOMAIN}.test_cover_0_power"
     await init_integration(hass, 2)
 
-    assert hass.states.get(entity_id).state == "85.3"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "85.3"
 
     mutate_rpc_device_status(monkeypatch, mock_rpc_device, "cover:0", "apower", "88.2")
     mock_rpc_device.mock_update()
 
-    assert hass.states.get(entity_id).state == "88.2"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "88.2"
 
     mutate_rpc_device_status(monkeypatch, mock_rpc_device, "cover:0", "apower", None)
     mock_rpc_device.mock_update()
 
-    assert hass.states.get(entity_id).state == STATE_UNKNOWN
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_UNKNOWN
 
 
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
@@ -389,7 +474,8 @@ async def test_rpc_rssi_sensor_removal(
     entry = await init_integration(hass, 2)
 
     # WiFi1 enabled, do not remove sensor
-    assert get_entity_state(hass, entity_id) == "-63"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "-63"
 
     # WiFi1 & WiFi2 disabled - remove sensor
     monkeypatch.setitem(mock_rpc_device.config["wifi"]["sta"], "enable", False)
@@ -401,7 +487,9 @@ async def test_rpc_rssi_sensor_removal(
     monkeypatch.setitem(mock_rpc_device.config["wifi"]["sta1"], "enable", True)
     await hass.config_entries.async_reload(entry.entry_id)
     await hass.async_block_till_done()
-    assert get_entity_state(hass, entity_id) == "-63"
+
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "-63"
 
 
 async def test_rpc_illuminance_sensor(
@@ -411,10 +499,10 @@ async def test_rpc_illuminance_sensor(
     entity_id = f"{SENSOR_DOMAIN}.test_name_illuminance"
     await init_integration(hass, 2)
 
-    assert hass.states.get(entity_id).state == "345"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "345"
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-illuminance:0-illuminance"
 
 
@@ -428,17 +516,18 @@ async def test_rpc_sensor_error(
     entity_id = f"{SENSOR_DOMAIN}.test_name_voltmeter"
     await init_integration(hass, 2)
 
-    assert hass.states.get(entity_id).state == "4.321"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "4.321"
 
     mutate_rpc_device_status(
         monkeypatch, mock_rpc_device, "voltmeter:100", "voltage", None
     )
     mock_rpc_device.mock_update()
 
-    assert hass.states.get(entity_id).state == STATE_UNAVAILABLE
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_UNAVAILABLE
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-voltmeter:100-voltmeter"
 
 
@@ -453,15 +542,16 @@ async def test_rpc_polling_sensor(
     entity_id = register_entity(hass, SENSOR_DOMAIN, "test_name_rssi", "wifi-rssi")
     await init_integration(hass, 2)
 
-    assert hass.states.get(entity_id).state == "-63"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "-63"
 
     mutate_rpc_device_status(monkeypatch, mock_rpc_device, "wifi", "rssi", "-70")
     await mock_polling_rpc_update(hass, freezer)
 
-    assert hass.states.get(entity_id).state == "-70"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "-70"
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-wifi-rssi"
 
 
@@ -492,12 +582,14 @@ async def test_rpc_sleeping_sensor(
     mock_rpc_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert hass.states.get(entity_id).state == "22.9"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "22.9"
 
     mutate_rpc_device_status(monkeypatch, mock_rpc_device, "temperature:0", "tC", 23.4)
     mock_rpc_device.mock_update()
 
-    assert hass.states.get(entity_id).state == "23.4"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "23.4"
 
 
 async def test_rpc_restored_sleeping_sensor(
@@ -525,7 +617,8 @@ async def test_rpc_restored_sleeping_sensor(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == "21.0"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "21.0"
 
     # Make device online
     monkeypatch.setattr(mock_rpc_device, "initialized", True)
@@ -536,7 +629,8 @@ async def test_rpc_restored_sleeping_sensor(
     mock_rpc_device.mock_update()
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == "22.9"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "22.9"
 
 
 async def test_rpc_restored_sleeping_sensor_no_last_state(
@@ -562,7 +656,8 @@ async def test_rpc_restored_sleeping_sensor_no_last_state(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == STATE_UNKNOWN
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_UNKNOWN
 
     # Make device online
     monkeypatch.setattr(mock_rpc_device, "initialized", True)
@@ -573,7 +668,8 @@ async def test_rpc_restored_sleeping_sensor_no_last_state(
     mock_rpc_device.mock_update()
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == "22.9"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "22.9"
 
 
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
@@ -583,36 +679,32 @@ async def test_rpc_em1_sensors(
     """Test RPC sensors for EM1 component."""
     await init_integration(hass, 2)
 
-    state = hass.states.get("sensor.test_name_em0_power")
-    assert state
+    assert (state := hass.states.get("sensor.test_name_em0_power"))
     assert state.state == "85.3"
 
-    entry = entity_registry.async_get("sensor.test_name_em0_power")
-    assert entry
+    assert (entry := entity_registry.async_get("sensor.test_name_em0_power"))
     assert entry.unique_id == "123456789ABC-em1:0-power_em1"
 
-    state = hass.states.get("sensor.test_name_em1_power")
-    assert state
+    assert (state := hass.states.get("sensor.test_name_em1_power"))
     assert state.state == "123.3"
 
-    entry = entity_registry.async_get("sensor.test_name_em1_power")
-    assert entry
+    assert (entry := entity_registry.async_get("sensor.test_name_em1_power"))
     assert entry.unique_id == "123456789ABC-em1:1-power_em1"
 
-    state = hass.states.get("sensor.test_name_em0_total_active_energy")
-    assert state
+    assert (state := hass.states.get("sensor.test_name_em0_total_active_energy"))
     assert state.state == "123.4564"
 
-    entry = entity_registry.async_get("sensor.test_name_em0_total_active_energy")
-    assert entry
+    assert (
+        entry := entity_registry.async_get("sensor.test_name_em0_total_active_energy")
+    )
     assert entry.unique_id == "123456789ABC-em1data:0-total_act_energy"
 
-    state = hass.states.get("sensor.test_name_em1_total_active_energy")
-    assert state
+    assert (state := hass.states.get("sensor.test_name_em1_total_active_energy"))
     assert state.state == "987.6543"
 
-    entry = entity_registry.async_get("sensor.test_name_em1_total_active_energy")
-    assert entry
+    assert (
+        entry := entity_registry.async_get("sensor.test_name_em1_total_active_energy")
+    )
     assert entry.unique_id == "123456789ABC-em1data:1-total_act_energy"
 
 
@@ -638,7 +730,7 @@ async def test_rpc_sleeping_update_entity_service(
     mock_rpc_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == "22.9"
 
     await hass.services.async_call(
@@ -649,11 +741,10 @@ async def test_rpc_sleeping_update_entity_service(
     )
 
     # Entity should be available after update_entity service call
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == "22.9"
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-temperature:0-temperature_0"
 
     assert (
@@ -687,7 +778,8 @@ async def test_block_sleeping_update_entity_service(
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert hass.states.get(entity_id).state == "22.1"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "22.1"
 
     await hass.services.async_call(
         HA_DOMAIN,
@@ -697,11 +789,10 @@ async def test_block_sleeping_update_entity_service(
     )
 
     # Entity should be available after update_entity service call
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == "22.1"
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-sensor_0-temp"
 
     assert (
@@ -734,20 +825,18 @@ async def test_rpc_analog_input_sensors(
     await init_integration(hass, 2)
 
     entity_id = f"{SENSOR_DOMAIN}.test_name_input_1_analog"
-    assert hass.states.get(entity_id).state == "89"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "89"
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-input:1-analoginput"
 
     entity_id = f"{SENSOR_DOMAIN}.test_name_input_1_analog_value"
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == "8.9"
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == expected_unit
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-input:1-analoginput_xpercent"
 
 
@@ -782,7 +871,8 @@ async def test_rpc_disabled_xpercent(
     await init_integration(hass, 2)
 
     entity_id = f"{SENSOR_DOMAIN}.test_name_input_1_analog"
-    assert hass.states.get(entity_id).state == "89"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "89"
 
     entity_id = f"{SENSOR_DOMAIN}.test_name_input_1_analog_value"
     assert hass.states.get(entity_id) is None
@@ -812,23 +902,20 @@ async def test_rpc_pulse_counter_sensors(
     await init_integration(hass, 2)
 
     entity_id = f"{SENSOR_DOMAIN}.gas_pulse_counter"
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == "56174"
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "pulse"
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-input:2-pulse_counter"
 
     entity_id = f"{SENSOR_DOMAIN}.gas_counter_value"
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == "561.74"
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == expected_unit
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-input:2-counter_value"
 
 
@@ -863,7 +950,8 @@ async def test_rpc_disabled_xtotal_counter(
     await init_integration(hass, 2)
 
     entity_id = f"{SENSOR_DOMAIN}.gas_pulse_counter"
-    assert hass.states.get(entity_id).state == "20635"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "20635"
 
     entity_id = f"{SENSOR_DOMAIN}.gas_counter_value"
     assert hass.states.get(entity_id) is None
@@ -893,23 +981,20 @@ async def test_rpc_pulse_counter_frequency_sensors(
     await init_integration(hass, 2)
 
     entity_id = f"{SENSOR_DOMAIN}.gas_pulse_counter_frequency"
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == "208.0"
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfFrequency.HERTZ
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-input:2-counter_frequency"
 
     entity_id = f"{SENSOR_DOMAIN}.gas_pulse_counter_frequency_value"
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == "6.11"
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == expected_unit
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-input:2-counter_frequency_value"
 
 
@@ -932,11 +1017,9 @@ async def test_rpc_disabled_xfreq(
 
     entity_id = f"{SENSOR_DOMAIN}.gas_pulse_counter_frequency_value"
 
-    state = hass.states.get(entity_id)
-    assert not state
+    assert hass.states.get(entity_id) is None
 
-    entry = entity_registry.async_get(entity_id)
-    assert not entry
+    assert entity_registry.async_get(entity_id) is None
 
 
 @pytest.mark.parametrize(
@@ -968,17 +1051,16 @@ async def test_rpc_device_virtual_text_sensor(
 
     await init_integration(hass, 3)
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == "lorem ipsum"
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-text:203-text"
 
     monkeypatch.setitem(mock_rpc_device.status["text:203"], "value", "dolor sit amet")
     mock_rpc_device.mock_update()
-    assert hass.states.get(entity_id).state == "dolor sit amet"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "dolor sit amet"
 
 
 async def test_rpc_remove_text_virtual_sensor_when_mode_field(
@@ -1011,8 +1093,7 @@ async def test_rpc_remove_text_virtual_sensor_when_mode_field(
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    entry = entity_registry.async_get(entity_id)
-    assert not entry
+    assert entity_registry.async_get(entity_id) is None
 
 
 async def test_rpc_remove_text_virtual_sensor_when_orphaned(
@@ -1036,8 +1117,7 @@ async def test_rpc_remove_text_virtual_sensor_when_orphaned(
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    entry = entity_registry.async_get(entity_id)
-    assert not entry
+    assert entity_registry.async_get(entity_id) is None
 
 
 @pytest.mark.parametrize(
@@ -1073,18 +1153,17 @@ async def test_rpc_device_virtual_number_sensor(
 
     await init_integration(hass, 3)
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == "34.5"
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == expected_unit
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-number:203-number"
 
     monkeypatch.setitem(mock_rpc_device.status["number:203"], "value", 56.7)
     mock_rpc_device.mock_update()
-    assert hass.states.get(entity_id).state == "56.7"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "56.7"
 
 
 async def test_rpc_remove_number_virtual_sensor_when_mode_field(
@@ -1122,8 +1201,7 @@ async def test_rpc_remove_number_virtual_sensor_when_mode_field(
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    entry = entity_registry.async_get(entity_id)
-    assert not entry
+    assert entity_registry.async_get(entity_id) is None
 
 
 async def test_rpc_remove_number_virtual_sensor_when_orphaned(
@@ -1147,8 +1225,7 @@ async def test_rpc_remove_number_virtual_sensor_when_orphaned(
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    entry = entity_registry.async_get(entity_id)
-    assert not entry
+    assert entity_registry.async_get(entity_id) is None
 
 
 @pytest.mark.parametrize(
@@ -1188,19 +1265,18 @@ async def test_rpc_device_virtual_enum_sensor(
 
     await init_integration(hass, 3)
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == expected_state
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENUM
     assert state.attributes.get(ATTR_OPTIONS) == ["Title 1", "two", "three"]
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-enum:203-enum"
 
     monkeypatch.setitem(mock_rpc_device.status["enum:203"], "value", "two")
     mock_rpc_device.mock_update()
-    assert hass.states.get(entity_id).state == "two"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "two"
 
 
 async def test_rpc_remove_enum_virtual_sensor_when_mode_dropdown(
@@ -1242,8 +1318,7 @@ async def test_rpc_remove_enum_virtual_sensor_when_mode_dropdown(
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    entry = entity_registry.async_get(entity_id)
-    assert not entry
+    assert entity_registry.async_get(entity_id) is None
 
 
 async def test_rpc_remove_enum_virtual_sensor_when_orphaned(
@@ -1267,8 +1342,7 @@ async def test_rpc_remove_enum_virtual_sensor_when_orphaned(
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    entry = entity_registry.async_get(entity_id)
-    assert not entry
+    assert entity_registry.async_get(entity_id) is None
 
 
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
@@ -1299,61 +1373,51 @@ async def test_rpc_rgbw_sensors(
 
     entity_id = f"sensor.test_name_{light_type}_light_0_power"
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == "12.2"
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == f"123456789ABC-{light_type}:0-power_{light_type}"
 
     entity_id = f"sensor.test_name_{light_type}_light_0_energy"
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == "0.045141"
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == f"123456789ABC-{light_type}:0-energy_{light_type}"
 
     entity_id = f"sensor.test_name_{light_type}_light_0_current"
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == "0.23"
     assert (
         state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfElectricCurrent.AMPERE
     )
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == f"123456789ABC-{light_type}:0-current_{light_type}"
 
     entity_id = f"sensor.test_name_{light_type}_light_0_voltage"
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == "12.4"
     assert (
         state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfElectricPotential.VOLT
     )
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == f"123456789ABC-{light_type}:0-voltage_{light_type}"
 
     entity_id = f"sensor.test_name_{light_type}_light_0_device_temperature"
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == "54.3"
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == f"123456789ABC-{light_type}:0-temperature_{light_type}"
 
 
@@ -1366,15 +1430,17 @@ async def test_rpc_device_sensor_goes_unavailable_on_disconnect(
 ) -> None:
     """Test RPC device with sensor goes unavailable on disconnect."""
     await init_integration(hass, 2)
-    temp_sensor_state = hass.states.get("sensor.test_name_temperature")
-    assert temp_sensor_state is not None
-    assert temp_sensor_state.state != STATE_UNAVAILABLE
+
+    assert (state := hass.states.get("sensor.test_name_temperature"))
+    assert state.state != STATE_UNAVAILABLE
+
     monkeypatch.setattr(mock_rpc_device, "connected", False)
     monkeypatch.setattr(mock_rpc_device, "initialized", False)
     mock_rpc_device.mock_disconnected()
     await hass.async_block_till_done()
-    temp_sensor_state = hass.states.get("sensor.test_name_temperature")
-    assert temp_sensor_state.state == STATE_UNAVAILABLE
+
+    assert (state := hass.states.get("sensor.test_name_temperature"))
+    assert state.state == STATE_UNAVAILABLE
 
     freezer.tick(60)
     async_fire_time_changed(hass)
@@ -1385,8 +1451,9 @@ async def test_rpc_device_sensor_goes_unavailable_on_disconnect(
     monkeypatch.setattr(mock_rpc_device, "initialized", True)
     mock_rpc_device.mock_initialized()
     await hass.async_block_till_done()
-    temp_sensor_state = hass.states.get("sensor.test_name_temperature")
-    assert temp_sensor_state.state != STATE_UNAVAILABLE
+
+    assert (state := hass.states.get("sensor.test_name_temperature"))
+    assert state.state != STATE_UNAVAILABLE
 
 
 async def test_rpc_voltmeter_value(
@@ -1399,13 +1466,11 @@ async def test_rpc_voltmeter_value(
 
     await init_integration(hass, 2)
 
-    state = hass.states.get(entity_id)
-
+    assert (state := hass.states.get(entity_id))
     assert state.state == "12.34"
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "ppm"
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-voltmeter:100-voltmeter_value"
 
 
@@ -1416,7 +1481,7 @@ async def test_blu_trv_sensor_entity(
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test BLU TRV sensor entity."""
-    await init_integration(hass, 3, model=MODEL_BLU_GATEWAY_GEN3)
+    await init_integration(hass, 3, model=MODEL_BLU_GATEWAY_G3)
 
     for entity in ("battery", "signal_strength", "valve_position"):
         entity_id = f"{SENSOR_DOMAIN}.trv_name_{entity}"
@@ -1426,3 +1491,31 @@ async def test_blu_trv_sensor_entity(
 
         entry = entity_registry.async_get(entity_id)
         assert entry == snapshot(name=f"{entity_id}-entry")
+
+
+async def test_rpc_device_virtual_number_sensor_with_device_class(
+    hass: HomeAssistant,
+    mock_rpc_device: Mock,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Test a virtual number sensor with device class for RPC device."""
+    config = deepcopy(mock_rpc_device.config)
+    config["number:203"] = {
+        "name": "Current humidity",
+        "min": 0,
+        "max": 100,
+        "meta": {"ui": {"step": 1, "unit": "%", "view": "label"}},
+        "role": "current_humidity",
+    }
+    monkeypatch.setattr(mock_rpc_device, "config", config)
+
+    status = deepcopy(mock_rpc_device.status)
+    status["number:203"] = {"value": 34}
+    monkeypatch.setattr(mock_rpc_device, "status", status)
+
+    await init_integration(hass, 3)
+
+    assert (state := hass.states.get("sensor.test_name_current_humidity"))
+    assert state.state == "34"
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == PERCENTAGE
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.HUMIDITY
diff --git a/tests/components/shelly/test_switch.py b/tests/components/shelly/test_switch.py
index 5aae9dfffc9..824742d1798 100644
--- a/tests/components/shelly/test_switch.py
+++ b/tests/components/shelly/test_switch.py
@@ -3,7 +3,7 @@
 from copy import deepcopy
 from unittest.mock import AsyncMock, Mock
 
-from aioshelly.const import MODEL_GAS
+from aioshelly.const import MODEL_1PM, MODEL_GAS, MODEL_MOTION
 from aioshelly.exceptions import DeviceConnectionError, InvalidAuthError, RpcCallError
 import pytest
 
@@ -28,7 +28,7 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceRegistry
 from homeassistant.helpers.entity_registry import EntityRegistry
 
-from . import get_entity_state, init_integration, register_device, register_entity
+from . import init_integration, register_device, register_entity
 
 from tests.common import mock_restore_cache
 
@@ -42,22 +42,25 @@ async def test_block_device_services(
 ) -> None:
     """Test block device turn on/off services."""
     await init_integration(hass, 1)
+    entity_id = "switch.test_name_channel_1"
 
     await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_ON,
-        {ATTR_ENTITY_ID: "switch.test_name_channel_1"},
+        {ATTR_ENTITY_ID: entity_id},
         blocking=True,
     )
-    assert hass.states.get("switch.test_name_channel_1").state == STATE_ON
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
     await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_OFF,
-        {ATTR_ENTITY_ID: "switch.test_name_channel_1"},
+        {ATTR_ENTITY_ID: entity_id},
         blocking=True,
     )
-    assert hass.states.get("switch.test_name_channel_1").state == STATE_OFF
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_OFF
 
 
 @pytest.mark.parametrize("model", MOTION_MODELS)
@@ -75,7 +78,8 @@ async def test_block_motion_switch(
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert get_entity_state(hass, entity_id) == STATE_ON
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
     # turn off
     await hass.services.async_call(
@@ -88,7 +92,9 @@ async def test_block_motion_switch(
     mock_block_device.mock_update()
 
     mock_block_device.set_shelly_motion_detection.assert_called_once_with(False)
-    assert get_entity_state(hass, entity_id) == STATE_OFF
+
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_OFF
 
     # turn on
     mock_block_device.set_shelly_motion_detection.reset_mock()
@@ -102,7 +108,9 @@ async def test_block_motion_switch(
     mock_block_device.mock_update()
 
     mock_block_device.set_shelly_motion_detection.assert_called_once_with(True)
-    assert get_entity_state(hass, entity_id) == STATE_ON
+
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
 
 @pytest.mark.parametrize("model", MOTION_MODELS)
@@ -132,14 +140,16 @@ async def test_block_restored_motion_switch(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert get_entity_state(hass, entity_id) == STATE_OFF
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_OFF
 
     # Make device online
     monkeypatch.setattr(mock_block_device, "initialized", True)
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert get_entity_state(hass, entity_id) == STATE_ON
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
 
 @pytest.mark.parametrize("model", MOTION_MODELS)
@@ -167,25 +177,48 @@ async def test_block_restored_motion_switch_no_last_state(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    assert get_entity_state(hass, entity_id) == STATE_UNKNOWN
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_UNKNOWN
 
     # Make device online
     monkeypatch.setattr(mock_block_device, "initialized", True)
     mock_block_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    assert get_entity_state(hass, entity_id) == STATE_ON
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
 
+@pytest.mark.parametrize(
+    ("model", "sleep", "entity", "unique_id"),
+    [
+        (MODEL_1PM, 0, "switch.test_name_channel_1", "123456789ABC-relay_0"),
+        (
+            MODEL_MOTION,
+            1000,
+            "switch.test_name_motion_detection",
+            "123456789ABC-sensor_0-motionActive",
+        ),
+    ],
+)
 async def test_block_device_unique_ids(
-    hass: HomeAssistant, entity_registry: EntityRegistry, mock_block_device: Mock
+    hass: HomeAssistant,
+    entity_registry: EntityRegistry,
+    mock_block_device: Mock,
+    model: str,
+    sleep: int,
+    entity: str,
+    unique_id: str,
 ) -> None:
     """Test block device unique_ids."""
-    await init_integration(hass, 1)
+    await init_integration(hass, 1, model=model, sleep_period=sleep)
 
-    entry = entity_registry.async_get("switch.test_name_channel_1")
-    assert entry
-    assert entry.unique_id == "123456789ABC-relay_0"
+    if sleep:
+        mock_block_device.mock_online()
+        await hass.async_block_till_done(wait_background_tasks=True)
+
+    assert (entry := entity_registry.async_get(entity))
+    assert entry.unique_id == unique_id
 
 
 async def test_block_set_state_connection_error(
@@ -199,7 +232,10 @@ async def test_block_set_state_connection_error(
     )
     await init_integration(hass, 1)
 
-    with pytest.raises(HomeAssistantError):
+    with pytest.raises(
+        HomeAssistantError,
+        match="Device communication error occurred while calling action for switch.test_name_channel_1 of Test name",
+    ):
         await hass.services.async_call(
             SWITCH_DOMAIN,
             SERVICE_TURN_OFF,
@@ -248,11 +284,15 @@ async def test_block_device_update(
     """Test block device update."""
     monkeypatch.setattr(mock_block_device.blocks[RELAY_BLOCK_ID], "output", False)
     await init_integration(hass, 1)
-    assert hass.states.get("switch.test_name_channel_1").state == STATE_OFF
+
+    entity_id = "switch.test_name_channel_1"
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_OFF
 
     monkeypatch.setattr(mock_block_device.blocks[RELAY_BLOCK_ID], "output", True)
     mock_block_device.mock_update()
-    assert hass.states.get("switch.test_name_channel_1").state == STATE_ON
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
 
 async def test_block_device_no_relay_blocks(
@@ -288,35 +328,44 @@ async def test_rpc_device_services(
     hass: HomeAssistant, mock_rpc_device: Mock, monkeypatch: pytest.MonkeyPatch
 ) -> None:
     """Test RPC device turn on/off services."""
+    monkeypatch.delitem(mock_rpc_device.status, "cover:0")
+    monkeypatch.setitem(mock_rpc_device.status["sys"], "relay_in_thermostat", False)
     await init_integration(hass, 2)
 
+    entity_id = "switch.test_switch_0"
     await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_ON,
-        {ATTR_ENTITY_ID: "switch.test_switch_0"},
+        {ATTR_ENTITY_ID: entity_id},
         blocking=True,
     )
-    assert hass.states.get("switch.test_switch_0").state == STATE_ON
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
     monkeypatch.setitem(mock_rpc_device.status["switch:0"], "output", False)
     await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_OFF,
-        {ATTR_ENTITY_ID: "switch.test_switch_0"},
+        {ATTR_ENTITY_ID: entity_id},
         blocking=True,
     )
     mock_rpc_device.mock_update()
-    assert hass.states.get("switch.test_switch_0").state == STATE_OFF
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_OFF
 
 
 async def test_rpc_device_unique_ids(
-    hass: HomeAssistant, mock_rpc_device: Mock, entity_registry: EntityRegistry
+    hass: HomeAssistant,
+    mock_rpc_device: Mock,
+    monkeypatch: pytest.MonkeyPatch,
+    entity_registry: EntityRegistry,
 ) -> None:
     """Test RPC device unique_ids."""
+    monkeypatch.delitem(mock_rpc_device.status, "cover:0")
+    monkeypatch.setitem(mock_rpc_device.status["sys"], "relay_in_thermostat", False)
     await init_integration(hass, 2)
 
-    entry = entity_registry.async_get("switch.test_switch_0")
-    assert entry
+    assert (entry := entity_registry.async_get("switch.test_switch_0"))
     assert entry.unique_id == "123456789ABC-switch:0"
 
 
@@ -328,21 +377,37 @@ async def test_rpc_device_switch_type_lights_mode(
         mock_rpc_device.config["sys"]["ui_data"], "consumption_types", ["lights"]
     )
     await init_integration(hass, 2)
+
     assert hass.states.get("switch.test_switch_0") is None
 
 
-@pytest.mark.parametrize("exc", [DeviceConnectionError, RpcCallError(-1, "error")])
+@pytest.mark.parametrize(
+    ("exc", "error"),
+    [
+        (
+            DeviceConnectionError,
+            "Device communication error occurred while calling action for switch.test_switch_0 of Test name",
+        ),
+        (
+            RpcCallError(-1, "error"),
+            "RPC call error occurred while calling action for switch.test_switch_0 of Test name",
+        ),
+    ],
+)
 async def test_rpc_set_state_errors(
     hass: HomeAssistant,
     exc: Exception,
+    error: str,
     mock_rpc_device: Mock,
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     """Test RPC device set state connection/call errors."""
     monkeypatch.setattr(mock_rpc_device, "call_rpc", AsyncMock(side_effect=exc))
+    monkeypatch.delitem(mock_rpc_device.status, "cover:0")
+    monkeypatch.setitem(mock_rpc_device.status["sys"], "relay_in_thermostat", False)
     await init_integration(hass, 2)
 
-    with pytest.raises(HomeAssistantError):
+    with pytest.raises(HomeAssistantError, match=error):
         await hass.services.async_call(
             SWITCH_DOMAIN,
             SERVICE_TURN_OFF,
@@ -360,6 +425,8 @@ async def test_rpc_auth_error(
         "call_rpc",
         AsyncMock(side_effect=InvalidAuthError),
     )
+    monkeypatch.delitem(mock_rpc_device.status, "cover:0")
+    monkeypatch.setitem(mock_rpc_device.status["sys"], "relay_in_thermostat", False)
     entry = await init_integration(hass, 2)
 
     assert entry.state is ConfigEntryState.LOADED
@@ -409,28 +476,34 @@ async def test_wall_display_relay_mode(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     """Test Wall Display in relay mode."""
-    climate_entity_id = "climate.test_name"
+    climate_entity_id = "climate.test_name_thermostat_0"
     switch_entity_id = "switch.test_switch_0"
 
+    config_entry = await init_integration(hass, 2, model=MODEL_WALL_DISPLAY)
+
+    assert (state := hass.states.get(climate_entity_id))
+    assert len(hass.states.async_entity_ids(CLIMATE_DOMAIN)) == 1
+
     new_status = deepcopy(mock_rpc_device.status)
     new_status["sys"]["relay_in_thermostat"] = False
     new_status.pop("thermostat:0")
+    new_status.pop("cover:0")
     monkeypatch.setattr(mock_rpc_device, "status", new_status)
 
-    await init_integration(hass, 2, model=MODEL_WALL_DISPLAY)
+    await hass.config_entries.async_reload(config_entry.entry_id)
+    await hass.async_block_till_done()
 
     # the climate entity should be removed
+
     assert hass.states.get(climate_entity_id) is None
     assert len(hass.states.async_entity_ids(CLIMATE_DOMAIN)) == 0
 
     # the switch entity should be created
-    state = hass.states.get(switch_entity_id)
-    assert state
+    assert (state := hass.states.get(switch_entity_id))
     assert state.state == STATE_ON
     assert len(hass.states.async_entity_ids(SWITCH_DOMAIN)) == 1
 
-    entry = entity_registry.async_get(switch_entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(switch_entity_id))
     assert entry.unique_id == "123456789ABC-switch:0"
 
 
@@ -463,12 +536,10 @@ async def test_rpc_device_virtual_switch(
 
     await init_integration(hass, 3)
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-boolean:200-boolean"
 
     monkeypatch.setitem(mock_rpc_device.status["boolean:200"], "value", False)
@@ -479,7 +550,8 @@ async def test_rpc_device_virtual_switch(
         blocking=True,
     )
     mock_rpc_device.mock_update()
-    assert hass.states.get(entity_id).state == STATE_OFF
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_OFF
 
     monkeypatch.setitem(mock_rpc_device.status["boolean:200"], "value", True)
     await hass.services.async_call(
@@ -489,7 +561,8 @@ async def test_rpc_device_virtual_switch(
         blocking=True,
     )
     mock_rpc_device.mock_update()
-    assert hass.states.get(entity_id).state == STATE_ON
+    assert (state := hass.states.get(entity_id))
+    assert state.state == STATE_ON
 
 
 async def test_rpc_device_virtual_binary_sensor(
@@ -510,8 +583,7 @@ async def test_rpc_device_virtual_binary_sensor(
 
     await init_integration(hass, 3)
 
-    state = hass.states.get(entity_id)
-    assert not state
+    assert hass.states.get(entity_id) is None
 
 
 async def test_rpc_remove_virtual_switch_when_mode_label(
@@ -544,8 +616,7 @@ async def test_rpc_remove_virtual_switch_when_mode_label(
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    entry = entity_registry.async_get(entity_id)
-    assert not entry
+    assert entity_registry.async_get(entity_id) is None
 
 
 async def test_rpc_remove_virtual_switch_when_orphaned(
@@ -569,8 +640,7 @@ async def test_rpc_remove_virtual_switch_when_orphaned(
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    entry = entity_registry.async_get(entity_id)
-    assert not entry
+    assert entity_registry.async_get(entity_id) is None
 
 
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
@@ -600,11 +670,10 @@ async def test_rpc_device_script_switch(
 
     await init_integration(hass, 3)
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == f"123456789ABC-{key}-script"
 
     monkeypatch.setitem(mock_rpc_device.status[key], "running", False)
@@ -615,8 +684,8 @@ async def test_rpc_device_script_switch(
         blocking=True,
     )
     mock_rpc_device.mock_update()
-    state = hass.states.get(entity_id)
-    assert state
+
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_OFF
 
     monkeypatch.setitem(mock_rpc_device.status[key], "running", True)
@@ -627,6 +696,6 @@ async def test_rpc_device_script_switch(
         blocking=True,
     )
     mock_rpc_device.mock_update()
-    state = hass.states.get(entity_id)
-    assert state
+
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
diff --git a/tests/components/shelly/test_text.py b/tests/components/shelly/test_text.py
index 19acb856f35..a4812cc4160 100644
--- a/tests/components/shelly/test_text.py
+++ b/tests/components/shelly/test_text.py
@@ -47,17 +47,17 @@ async def test_rpc_device_virtual_text(
 
     await init_integration(hass, 3)
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == "lorem ipsum"
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-text:203-text"
 
     monkeypatch.setitem(mock_rpc_device.status["text:203"], "value", "dolor sit amet")
     mock_rpc_device.mock_update()
-    assert hass.states.get(entity_id).state == "dolor sit amet"
+
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "dolor sit amet"
 
     monkeypatch.setitem(mock_rpc_device.status["text:203"], "value", "sed do eiusmod")
     await hass.services.async_call(
@@ -67,7 +67,9 @@ async def test_rpc_device_virtual_text(
         blocking=True,
     )
     mock_rpc_device.mock_update()
-    assert hass.states.get(entity_id).state == "sed do eiusmod"
+
+    assert (state := hass.states.get(entity_id))
+    assert state.state == "sed do eiusmod"
 
 
 async def test_rpc_remove_virtual_text_when_mode_label(
@@ -100,8 +102,7 @@ async def test_rpc_remove_virtual_text_when_mode_label(
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    entry = entity_registry.async_get(entity_id)
-    assert not entry
+    assert entity_registry.async_get(entity_id) is None
 
 
 async def test_rpc_remove_virtual_text_when_orphaned(
@@ -125,5 +126,4 @@ async def test_rpc_remove_virtual_text_when_orphaned(
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    entry = entity_registry.async_get(entity_id)
-    assert not entry
+    assert entity_registry.async_get(entity_id) is None
diff --git a/tests/components/shelly/test_update.py b/tests/components/shelly/test_update.py
index 9ea66c1acb7..51016f0cdaa 100644
--- a/tests/components/shelly/test_update.py
+++ b/tests/components/shelly/test_update.py
@@ -61,14 +61,16 @@ async def test_block_update(
     monkeypatch.setitem(mock_block_device.status, "cloud", {"connected": False})
     await init_integration(hass, 1)
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
     assert state.attributes[ATTR_INSTALLED_VERSION] == "1.0.0"
     assert state.attributes[ATTR_LATEST_VERSION] == "2.0.0"
     assert state.attributes[ATTR_IN_PROGRESS] is False
     assert state.attributes[ATTR_UPDATE_PERCENTAGE] is None
-    supported_feat = state.attributes[ATTR_SUPPORTED_FEATURES]
-    assert supported_feat == UpdateEntityFeature.INSTALL | UpdateEntityFeature.PROGRESS
+    assert (
+        state.attributes[ATTR_SUPPORTED_FEATURES]
+        == UpdateEntityFeature.INSTALL | UpdateEntityFeature.PROGRESS
+    )
 
     await hass.services.async_call(
         UPDATE_DOMAIN,
@@ -78,7 +80,7 @@ async def test_block_update(
     )
     assert mock_block_device.trigger_ota_update.call_count == 1
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
     assert state.attributes[ATTR_INSTALLED_VERSION] == "1.0.0"
     assert state.attributes[ATTR_LATEST_VERSION] == "2.0.0"
@@ -89,15 +91,14 @@ async def test_block_update(
     monkeypatch.setitem(mock_block_device.status["update"], "old_version", "2.0.0")
     await mock_rest_update(hass, freezer)
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_OFF
     assert state.attributes[ATTR_INSTALLED_VERSION] == "2.0.0"
     assert state.attributes[ATTR_LATEST_VERSION] == "2.0.0"
     assert state.attributes[ATTR_IN_PROGRESS] is False
     assert state.attributes[ATTR_UPDATE_PERCENTAGE] is None
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-fwupdate"
 
 
@@ -117,7 +118,7 @@ async def test_block_beta_update(
     monkeypatch.setitem(mock_block_device.status, "cloud", {"connected": False})
     await init_integration(hass, 1)
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_OFF
     assert state.attributes[ATTR_INSTALLED_VERSION] == "1.0.0"
     assert state.attributes[ATTR_LATEST_VERSION] == "1.0.0"
@@ -129,7 +130,7 @@ async def test_block_beta_update(
     )
     await mock_rest_update(hass, freezer)
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
     assert state.attributes[ATTR_INSTALLED_VERSION] == "1.0.0"
     assert state.attributes[ATTR_LATEST_VERSION] == "2.0.0-beta"
@@ -145,7 +146,7 @@ async def test_block_beta_update(
     )
     assert mock_block_device.trigger_ota_update.call_count == 1
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
     assert state.attributes[ATTR_INSTALLED_VERSION] == "1.0.0"
     assert state.attributes[ATTR_LATEST_VERSION] == "2.0.0-beta"
@@ -155,15 +156,14 @@ async def test_block_beta_update(
     monkeypatch.setitem(mock_block_device.status["update"], "old_version", "2.0.0-beta")
     await mock_rest_update(hass, freezer)
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_OFF
     assert state.attributes[ATTR_INSTALLED_VERSION] == "2.0.0-beta"
     assert state.attributes[ATTR_LATEST_VERSION] == "2.0.0-beta"
     assert state.attributes[ATTR_IN_PROGRESS] is False
     assert state.attributes[ATTR_UPDATE_PERCENTAGE] is None
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-fwupdate_beta"
 
 
@@ -184,14 +184,16 @@ async def test_block_update_connection_error(
     )
     await init_integration(hass, 1)
 
-    with pytest.raises(HomeAssistantError) as excinfo:
+    with pytest.raises(
+        HomeAssistantError,
+        match="Device communication error occurred while triggering OTA update for Test name",
+    ):
         await hass.services.async_call(
             UPDATE_DOMAIN,
             SERVICE_INSTALL,
             {ATTR_ENTITY_ID: "update.test_name_firmware"},
             blocking=True,
         )
-    assert "Error starting OTA update" in str(excinfo.value)
 
 
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
@@ -254,11 +256,12 @@ async def test_block_version_compare(
     monkeypatch.setitem(mock_block_device.status, "cloud", {"connected": False})
     await init_integration(hass, 1)
 
-    state = hass.states.get(entity_id_latest)
+    assert (state := hass.states.get(entity_id_latest))
     assert state.state == STATE_OFF
     assert state.attributes[ATTR_INSTALLED_VERSION] == STABLE
     assert state.attributes[ATTR_LATEST_VERSION] == STABLE
-    state = hass.states.get(entity_id_beta)
+
+    assert (state := hass.states.get(entity_id_beta))
     assert state.state == STATE_ON
     assert state.attributes[ATTR_INSTALLED_VERSION] == STABLE
     assert state.attributes[ATTR_LATEST_VERSION] == BETA
@@ -268,11 +271,12 @@ async def test_block_version_compare(
     monkeypatch.setitem(mock_block_device.status["update"], "beta_version", BETA)
     await mock_rest_update(hass, freezer)
 
-    state = hass.states.get(entity_id_latest)
+    assert (state := hass.states.get(entity_id_latest))
     assert state.state == STATE_OFF
     assert state.attributes[ATTR_INSTALLED_VERSION] == BETA
     assert state.attributes[ATTR_LATEST_VERSION] == STABLE
-    state = hass.states.get(entity_id_beta)
+
+    assert (state := hass.states.get(entity_id_beta))
     assert state.state == STATE_OFF
     assert state.attributes[ATTR_INSTALLED_VERSION] == BETA
     assert state.attributes[ATTR_LATEST_VERSION] == BETA
@@ -296,7 +300,7 @@ async def test_rpc_update(
     )
     await init_integration(hass, 2)
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
     assert state.attributes[ATTR_INSTALLED_VERSION] == "1"
     assert state.attributes[ATTR_LATEST_VERSION] == "2"
@@ -314,7 +318,7 @@ async def test_rpc_update(
 
     assert mock_rpc_device.trigger_ota_update.call_count == 1
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
     assert state.attributes[ATTR_INSTALLED_VERSION] == "1"
     assert state.attributes[ATTR_LATEST_VERSION] == "2"
@@ -337,7 +341,7 @@ async def test_rpc_update(
         },
     )
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.attributes[ATTR_IN_PROGRESS] is True
     assert state.attributes[ATTR_UPDATE_PERCENTAGE] == 0
 
@@ -357,7 +361,7 @@ async def test_rpc_update(
         },
     )
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.attributes[ATTR_IN_PROGRESS] is True
     assert state.attributes[ATTR_UPDATE_PERCENTAGE] == 50
 
@@ -378,15 +382,14 @@ async def test_rpc_update(
     monkeypatch.setitem(mock_rpc_device.shelly, "ver", "2")
     mock_rpc_device.mock_update()
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_OFF
     assert state.attributes[ATTR_INSTALLED_VERSION] == "2"
     assert state.attributes[ATTR_LATEST_VERSION] == "2"
     assert state.attributes[ATTR_IN_PROGRESS] is False
     assert state.attributes[ATTR_UPDATE_PERCENTAGE] is None
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-sys-fwupdate"
 
 
@@ -417,7 +420,7 @@ async def test_rpc_sleeping_update(
     mock_rpc_device.mock_online()
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
     assert state.attributes[ATTR_INSTALLED_VERSION] == "1"
     assert state.attributes[ATTR_LATEST_VERSION] == "2"
@@ -429,7 +432,7 @@ async def test_rpc_sleeping_update(
     monkeypatch.setitem(mock_rpc_device.shelly, "ver", "2")
     mock_rpc_device.mock_update()
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_OFF
     assert state.attributes[ATTR_INSTALLED_VERSION] == "2"
     assert state.attributes[ATTR_LATEST_VERSION] == "2"
@@ -437,8 +440,7 @@ async def test_rpc_sleeping_update(
     assert state.attributes[ATTR_UPDATE_PERCENTAGE] is None
     assert state.attributes[ATTR_SUPPORTED_FEATURES] == UpdateEntityFeature(0)
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-sys-fwupdate"
 
 
@@ -469,7 +471,7 @@ async def test_rpc_restored_sleeping_update(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
     assert state.attributes[ATTR_INSTALLED_VERSION] == "1"
     assert state.attributes[ATTR_LATEST_VERSION] == "2"
@@ -486,7 +488,7 @@ async def test_rpc_restored_sleeping_update(
     mock_rpc_device.mock_update()
     await hass.async_block_till_done()
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_OFF
     assert state.attributes[ATTR_INSTALLED_VERSION] == "2"
     assert state.attributes[ATTR_LATEST_VERSION] == "2"
@@ -525,7 +527,7 @@ async def test_rpc_restored_sleeping_update_no_last_state(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_UNKNOWN
 
     # Make device online
@@ -537,7 +539,7 @@ async def test_rpc_restored_sleeping_update_no_last_state(
     mock_rpc_device.mock_update()
     await hass.async_block_till_done()
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
     assert state.attributes[ATTR_INSTALLED_VERSION] == "1"
     assert state.attributes[ATTR_LATEST_VERSION] == "2"
@@ -567,7 +569,7 @@ async def test_rpc_beta_update(
     )
     await init_integration(hass, 2)
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_OFF
     assert state.attributes[ATTR_INSTALLED_VERSION] == "1"
     assert state.attributes[ATTR_LATEST_VERSION] == "1"
@@ -584,7 +586,7 @@ async def test_rpc_beta_update(
     )
     await mock_rest_update(hass, freezer)
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
     assert state.attributes[ATTR_INSTALLED_VERSION] == "1"
     assert state.attributes[ATTR_LATEST_VERSION] == "2b"
@@ -614,7 +616,7 @@ async def test_rpc_beta_update(
 
     assert mock_rpc_device.trigger_ota_update.call_count == 1
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_ON
     assert state.attributes[ATTR_INSTALLED_VERSION] == "1"
     assert state.attributes[ATTR_LATEST_VERSION] == "2b"
@@ -637,7 +639,7 @@ async def test_rpc_beta_update(
         },
     )
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.attributes[ATTR_IN_PROGRESS] is True
     assert state.attributes[ATTR_UPDATE_PERCENTAGE] == 40
 
@@ -658,23 +660,28 @@ async def test_rpc_beta_update(
     monkeypatch.setitem(mock_rpc_device.shelly, "ver", "2b")
     await mock_rest_update(hass, freezer)
 
-    state = hass.states.get(entity_id)
+    assert (state := hass.states.get(entity_id))
     assert state.state == STATE_OFF
     assert state.attributes[ATTR_INSTALLED_VERSION] == "2b"
     assert state.attributes[ATTR_LATEST_VERSION] == "2b"
     assert state.attributes[ATTR_IN_PROGRESS] is False
     assert state.attributes[ATTR_UPDATE_PERCENTAGE] is None
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-sys-fwupdate_beta"
 
 
 @pytest.mark.parametrize(
     ("exc", "error"),
     [
-        (DeviceConnectionError, "OTA update connection error: DeviceConnectionError()"),
-        (RpcCallError(-1, "error"), "OTA update request error"),
+        (
+            DeviceConnectionError,
+            "Device communication error occurred while triggering OTA update for Test name",
+        ),
+        (
+            RpcCallError(-1, "error"),
+            "RPC call error occurred while triggering OTA update for Test name",
+        ),
     ],
 )
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
@@ -701,14 +708,13 @@ async def test_rpc_update_errors(
     )
     await init_integration(hass, 2)
 
-    with pytest.raises(HomeAssistantError) as excinfo:
+    with pytest.raises(HomeAssistantError, match=error):
         await hass.services.async_call(
             UPDATE_DOMAIN,
             SERVICE_INSTALL,
             {ATTR_ENTITY_ID: "update.test_name_firmware"},
             blocking=True,
         )
-    assert error in str(excinfo.value)
 
 
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
diff --git a/tests/components/shelly/test_valve.py b/tests/components/shelly/test_valve.py
index 9dc8597120a..7bf9e3b5f1a 100644
--- a/tests/components/shelly/test_valve.py
+++ b/tests/components/shelly/test_valve.py
@@ -25,11 +25,11 @@ async def test_block_device_gas_valve(
     await init_integration(hass, 1, MODEL_GAS)
     entity_id = "valve.test_name_valve"
 
-    entry = entity_registry.async_get(entity_id)
-    assert entry
+    assert (entry := entity_registry.async_get(entity_id))
     assert entry.unique_id == "123456789ABC-valve_0-valve"
 
-    assert hass.states.get(entity_id).state == ValveState.CLOSED
+    assert (state := hass.states.get(entity_id))
+    assert state.state == ValveState.CLOSED
 
     await hass.services.async_call(
         VALVE_DOMAIN,
@@ -38,16 +38,14 @@ async def test_block_device_gas_valve(
         blocking=True,
     )
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == ValveState.OPENING
 
     monkeypatch.setattr(mock_block_device.blocks[GAS_VALVE_BLOCK_ID], "valve", "opened")
     mock_block_device.mock_update()
     await hass.async_block_till_done()
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == ValveState.OPEN
 
     await hass.services.async_call(
@@ -57,14 +55,12 @@ async def test_block_device_gas_valve(
         blocking=True,
     )
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == ValveState.CLOSING
 
     monkeypatch.setattr(mock_block_device.blocks[GAS_VALVE_BLOCK_ID], "valve", "closed")
     mock_block_device.mock_update()
     await hass.async_block_till_done()
 
-    state = hass.states.get(entity_id)
-    assert state
+    assert (state := hass.states.get(entity_id))
     assert state.state == ValveState.CLOSED
diff --git a/tests/components/sighthound/test_image_processing.py b/tests/components/sighthound/test_image_processing.py
index 5db6347a832..ba03f6fc804 100644
--- a/tests/components/sighthound/test_image_processing.py
+++ b/tests/components/sighthound/test_image_processing.py
@@ -11,7 +11,7 @@ import pytest
 import simplehound.core as hound
 
 from homeassistant.components.image_processing import DOMAIN as IP_DOMAIN, SERVICE_SCAN
-import homeassistant.components.sighthound.image_processing as sh
+from homeassistant.components.sighthound import image_processing as sh
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_API_KEY,
diff --git a/tests/components/simplefin/snapshots/test_binary_sensor.ambr b/tests/components/simplefin/snapshots/test_binary_sensor.ambr
index 44fe2a10b78..3123100205e 100644
--- a/tests/components/simplefin/snapshots/test_binary_sensor.ambr
+++ b/tests/components/simplefin/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -102,6 +104,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -198,6 +202,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -246,6 +251,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -294,6 +300,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -342,6 +349,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/simplefin/snapshots/test_sensor.ambr b/tests/components/simplefin/snapshots/test_sensor.ambr
index c7dced9300e..dd305f7528f 100644
--- a/tests/components/simplefin/snapshots/test_sensor.ambr
+++ b/tests/components/simplefin/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -109,6 +111,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -160,6 +163,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -210,6 +214,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -261,6 +266,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -311,6 +317,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -362,6 +369,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -412,6 +420,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -463,6 +472,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -513,6 +523,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -564,6 +575,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -614,6 +626,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -665,6 +678,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -715,6 +729,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -766,6 +781,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/simplisafe/test_diagnostics.py b/tests/components/simplisafe/test_diagnostics.py
index d5479f00b06..13c1e28aa36 100644
--- a/tests/components/simplisafe/test_diagnostics.py
+++ b/tests/components/simplisafe/test_diagnostics.py
@@ -32,6 +32,7 @@ async def test_entry_diagnostics(
             "created_at": ANY,
             "modified_at": ANY,
             "discovery_keys": {},
+            "subentries": [],
         },
         "subscription_data": {
             "12345": {
diff --git a/tests/components/slide_local/snapshots/test_button.ambr b/tests/components/slide_local/snapshots/test_button.ambr
index 549538f1361..7b363f4d9ba 100644
--- a/tests/components/slide_local/snapshots/test_button.ambr
+++ b/tests/components/slide_local/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/slide_local/snapshots/test_cover.ambr b/tests/components/slide_local/snapshots/test_cover.ambr
index d9283618a47..172f5411a94 100644
--- a/tests/components/slide_local/snapshots/test_cover.ambr
+++ b/tests/components/slide_local/snapshots/test_cover.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/slide_local/snapshots/test_diagnostics.ambr b/tests/components/slide_local/snapshots/test_diagnostics.ambr
index 63dab3f5a66..7606c2a399b 100644
--- a/tests/components/slide_local/snapshots/test_diagnostics.ambr
+++ b/tests/components/slide_local/snapshots/test_diagnostics.ambr
@@ -19,6 +19,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'slide',
       'unique_id': '12:34:56:78:90:ab',
       'version': 1,
diff --git a/tests/components/slide_local/snapshots/test_init.ambr b/tests/components/slide_local/snapshots/test_init.ambr
index d90f72e4b05..5b1a9f5ce2f 100644
--- a/tests/components/slide_local/snapshots/test_init.ambr
+++ b/tests/components/slide_local/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://127.0.0.2',
     'connections': set({
       tuple(
diff --git a/tests/components/slide_local/snapshots/test_switch.ambr b/tests/components/slide_local/snapshots/test_switch.ambr
index e19467c283e..9b1a7969539 100644
--- a/tests/components/slide_local/snapshots/test_switch.ambr
+++ b/tests/components/slide_local/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/sma/snapshots/test_diagnostics.ambr b/tests/components/sma/snapshots/test_diagnostics.ambr
index c7de3851b5f..14b0d120190 100644
--- a/tests/components/sma/snapshots/test_diagnostics.ambr
+++ b/tests/components/sma/snapshots/test_diagnostics.ambr
@@ -21,6 +21,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'import',
+      'subentries': list([
+      ]),
       'title': 'SMA Device Name',
       'unique_id': '123456789',
       'version': 1,
diff --git a/tests/components/smartthings/__init__.py b/tests/components/smartthings/__init__.py
index 5a3e9135963..fce344b57a7 100644
--- a/tests/components/smartthings/__init__.py
+++ b/tests/components/smartthings/__init__.py
@@ -1 +1,80 @@
-"""Tests for the SmartThings component."""
+"""Tests for the SmartThings integration."""
+
+from typing import Any
+from unittest.mock import AsyncMock
+
+from pysmartthings import Attribute, Capability, DeviceEvent
+from syrupy import SnapshotAssertion
+
+from homeassistant.components.smartthings.const import MAIN
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from tests.common import MockConfigEntry
+
+
+async def setup_integration(hass: HomeAssistant, config_entry: MockConfigEntry) -> None:
+    """Fixture for setting up the component."""
+    config_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+
+def snapshot_smartthings_entities(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+    platform: Platform,
+) -> None:
+    """Snapshot SmartThings entities."""
+    entities = hass.states.async_all(platform)
+    for entity_state in entities:
+        entity_entry = entity_registry.async_get(entity_state.entity_id)
+        assert entity_entry == snapshot(name=f"{entity_entry.entity_id}-entry")
+        assert entity_state == snapshot(name=f"{entity_entry.entity_id}-state")
+
+
+def set_attribute_value(
+    mock: AsyncMock,
+    capability: Capability,
+    attribute: Attribute,
+    value: Any,
+    component: str = MAIN,
+) -> None:
+    """Set the value of an attribute."""
+    mock.get_device_status.return_value[component][capability][attribute].value = value
+
+
+async def trigger_update(
+    hass: HomeAssistant,
+    mock: AsyncMock,
+    device_id: str,
+    capability: Capability,
+    attribute: Attribute,
+    value: str | float | dict[str, Any] | list[Any] | None,
+    data: dict[str, Any] | None = None,
+    component: str = MAIN,
+) -> None:
+    """Trigger an update."""
+    event = DeviceEvent(
+        "abc",
+        "abc",
+        "abc",
+        device_id,
+        component,
+        capability,
+        attribute,
+        value,
+        data,
+    )
+    for call in mock.add_unspecified_device_event_listener.call_args_list:
+        call[0][0](event)
+    for call in mock.add_device_event_listener.call_args_list:
+        if call[0][0] == device_id:
+            call[0][3](event)
+    for call in mock.add_device_capability_event_listener.call_args_list:
+        if call[0][0] == device_id and call[0][2] == capability:
+            call[0][3](event)
+    await hass.async_block_till_done()
diff --git a/tests/components/smartthings/conftest.py b/tests/components/smartthings/conftest.py
index 71a36c7885a..ef6b6f29011 100644
--- a/tests/components/smartthings/conftest.py
+++ b/tests/components/smartthings/conftest.py
@@ -1,358 +1,209 @@
 """Test configuration and mocks for the SmartThings component."""
 
-import secrets
-from typing import Any
-from unittest.mock import Mock, patch
-from uuid import uuid4
+from collections.abc import Generator
+import time
+from unittest.mock import AsyncMock, patch
 
 from pysmartthings import (
-    CLASSIFICATION_AUTOMATION,
-    AppEntity,
-    AppOAuthClient,
-    AppSettings,
-    DeviceEntity,
+    DeviceResponse,
     DeviceStatus,
-    InstalledApp,
-    InstalledAppStatus,
-    InstalledAppType,
-    Location,
-    SceneEntity,
-    SmartThings,
+    LocationResponse,
+    RoomResponse,
+    SceneResponse,
     Subscription,
 )
-from pysmartthings.api import Api
 import pytest
 
-from homeassistant.components import webhook
-from homeassistant.components.smartthings import DeviceBroker
+from homeassistant.components.application_credentials import (
+    ClientCredential,
+    async_import_client_credential,
+)
+from homeassistant.components.smartthings import CONF_INSTALLED_APP_ID
 from homeassistant.components.smartthings.const import (
-    APP_NAME_PREFIX,
-    CONF_APP_ID,
-    CONF_INSTALLED_APP_ID,
-    CONF_INSTANCE_ID,
     CONF_LOCATION_ID,
     CONF_REFRESH_TOKEN,
-    DATA_BROKERS,
     DOMAIN,
-    SETTINGS_INSTANCE_ID,
-    STORAGE_KEY,
-    STORAGE_VERSION,
-)
-from homeassistant.config_entries import SOURCE_USER, ConfigEntryState
-from homeassistant.const import (
-    CONF_ACCESS_TOKEN,
-    CONF_CLIENT_ID,
-    CONF_CLIENT_SECRET,
-    CONF_WEBHOOK_ID,
+    SCOPES,
 )
+from homeassistant.const import CONF_ACCESS_TOKEN, CONF_CLIENT_ID, CONF_CLIENT_SECRET
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.setup import async_setup_component
 
-from tests.common import MockConfigEntry
-from tests.components.light.conftest import mock_light_profiles  # noqa: F401
-
-COMPONENT_PREFIX = "homeassistant.components.smartthings."
+from tests.common import MockConfigEntry, load_fixture
 
 
-async def setup_platform(
-    hass: HomeAssistant, platform: str, *, devices=None, scenes=None
-):
-    """Set up the SmartThings platform and prerequisites."""
-    hass.config.components.add(DOMAIN)
-    config_entry = MockConfigEntry(
-        version=2,
-        domain=DOMAIN,
-        title="Test",
-        data={CONF_INSTALLED_APP_ID: str(uuid4())},
-    )
-    config_entry.add_to_hass(hass)
-    broker = DeviceBroker(
-        hass, config_entry, Mock(), Mock(), devices or [], scenes or []
-    )
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.smartthings.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        yield mock_setup_entry
 
-    hass.data[DOMAIN] = {DATA_BROKERS: {config_entry.entry_id: broker}}
-    config_entry.mock_state(hass, ConfigEntryState.LOADED)
-    await hass.config_entries.async_forward_entry_setups(config_entry, [platform])
-    await hass.async_block_till_done()
-    return config_entry
+
+@pytest.fixture(name="expires_at")
+def mock_expires_at() -> int:
+    """Fixture to set the oauth token expiration time."""
+    return time.time() + 3600
 
 
 @pytest.fixture(autouse=True)
-async def setup_component(
-    hass: HomeAssistant, config_file: dict[str, str], hass_storage: dict[str, Any]
-) -> None:
-    """Load the SmartThing component."""
-    hass_storage[STORAGE_KEY] = {"data": config_file, "version": STORAGE_VERSION}
-    await async_process_ha_core_config(
+async def setup_credentials(hass: HomeAssistant) -> None:
+    """Fixture to setup credentials."""
+    assert await async_setup_component(hass, "application_credentials", {})
+    await async_import_client_credential(
         hass,
-        {"external_url": "https://test.local"},
-    )
-    await async_setup_component(hass, "smartthings", {})
-
-
-def _create_location() -> Mock:
-    loc = Mock(Location)
-    loc.name = "Test Location"
-    loc.location_id = str(uuid4())
-    return loc
-
-
-@pytest.fixture(name="location")
-def location_fixture() -> Mock:
-    """Fixture for a single location."""
-    return _create_location()
-
-
-@pytest.fixture(name="locations")
-def locations_fixture(location: Mock) -> list[Mock]:
-    """Fixture for 2 locations."""
-    return [location, _create_location()]
-
-
-@pytest.fixture(name="app")
-async def app_fixture(hass: HomeAssistant, config_file: dict[str, str]) -> Mock:
-    """Fixture for a single app."""
-    app = Mock(AppEntity)
-    app.app_name = APP_NAME_PREFIX + str(uuid4())
-    app.app_id = str(uuid4())
-    app.app_type = "WEBHOOK_SMART_APP"
-    app.classifications = [CLASSIFICATION_AUTOMATION]
-    app.display_name = "Home Assistant"
-    app.description = f"{hass.config.location_name} at https://test.local"
-    app.single_instance = True
-    app.webhook_target_url = webhook.async_generate_url(
-        hass, hass.data[DOMAIN][CONF_WEBHOOK_ID]
+        DOMAIN,
+        ClientCredential("CLIENT_ID", "CLIENT_SECRET"),
+        DOMAIN,
     )
 
-    settings = Mock(AppSettings)
-    settings.app_id = app.app_id
-    settings.settings = {SETTINGS_INSTANCE_ID: config_file[CONF_INSTANCE_ID]}
-    app.settings.return_value = settings
-    return app
 
-
-@pytest.fixture(name="app_oauth_client")
-def app_oauth_client_fixture() -> Mock:
-    """Fixture for a single app's oauth."""
-    client = Mock(AppOAuthClient)
-    client.client_id = str(uuid4())
-    client.client_secret = str(uuid4())
-    return client
-
-
-@pytest.fixture(name="app_settings")
-def app_settings_fixture(app, config_file):
-    """Fixture for an app settings."""
-    settings = Mock(AppSettings)
-    settings.app_id = app.app_id
-    settings.settings = {SETTINGS_INSTANCE_ID: config_file[CONF_INSTANCE_ID]}
-    return settings
-
-
-def _create_installed_app(location_id: str, app_id: str) -> Mock:
-    item = Mock(InstalledApp)
-    item.installed_app_id = str(uuid4())
-    item.installed_app_status = InstalledAppStatus.AUTHORIZED
-    item.installed_app_type = InstalledAppType.WEBHOOK_SMART_APP
-    item.app_id = app_id
-    item.location_id = location_id
-    return item
-
-
-@pytest.fixture(name="installed_app")
-def installed_app_fixture(location: Mock, app: Mock) -> Mock:
-    """Fixture for a single installed app."""
-    return _create_installed_app(location.location_id, app.app_id)
-
-
-@pytest.fixture(name="installed_apps")
-def installed_apps_fixture(installed_app, locations, app):
-    """Fixture for 2 installed apps."""
-    return [installed_app, _create_installed_app(locations[1].location_id, app.app_id)]
-
-
-@pytest.fixture(name="config_file")
-def config_file_fixture() -> dict[str, str]:
-    """Fixture representing the local config file contents."""
-    return {CONF_INSTANCE_ID: str(uuid4()), CONF_WEBHOOK_ID: secrets.token_hex()}
-
-
-@pytest.fixture(name="smartthings_mock")
-def smartthings_mock_fixture(locations):
-    """Fixture to mock smartthings API calls."""
-
-    async def _location(location_id):
-        return next(
-            location for location in locations if location.location_id == location_id
-        )
-
-    smartthings_mock = Mock(SmartThings)
-    smartthings_mock.location.side_effect = _location
-    mock = Mock(return_value=smartthings_mock)
+@pytest.fixture
+def mock_smartthings() -> Generator[AsyncMock]:
+    """Mock a SmartThings client."""
     with (
-        patch(COMPONENT_PREFIX + "SmartThings", new=mock),
-        patch(COMPONENT_PREFIX + "config_flow.SmartThings", new=mock),
-        patch(COMPONENT_PREFIX + "smartapp.SmartThings", new=mock),
+        patch(
+            "homeassistant.components.smartthings.SmartThings",
+            autospec=True,
+        ) as mock_client,
+        patch(
+            "homeassistant.components.smartthings.config_flow.SmartThings",
+            new=mock_client,
+        ),
     ):
-        yield smartthings_mock
+        client = mock_client.return_value
+        client.get_scenes.return_value = SceneResponse.from_json(
+            load_fixture("scenes.json", DOMAIN)
+        ).items
+        client.get_locations.return_value = LocationResponse.from_json(
+            load_fixture("locations.json", DOMAIN)
+        ).items
+        client.get_rooms.return_value = RoomResponse.from_json(
+            load_fixture("rooms.json", DOMAIN)
+        ).items
+        client.create_subscription.return_value = Subscription.from_json(
+            load_fixture("subscription.json", DOMAIN)
+        )
+        yield client
 
 
-@pytest.fixture(name="device")
-def device_fixture(location):
-    """Fixture representing devices loaded."""
-    item = Mock(DeviceEntity)
-    item.device_id = "743de49f-036f-4e9c-839a-2f89d57607db"
-    item.name = "GE In-Wall Smart Dimmer"
-    item.label = "Front Porch Lights"
-    item.location_id = location.location_id
-    item.capabilities = [
-        "switch",
-        "switchLevel",
-        "refresh",
-        "indicator",
-        "sensor",
-        "actuator",
-        "healthCheck",
-        "light",
+@pytest.fixture(
+    params=[
+        "da_ac_airsensor_01001",
+        "da_ac_rac_000001",
+        "da_ac_rac_100001",
+        "da_ac_rac_01001",
+        "multipurpose_sensor",
+        "contact_sensor",
+        "base_electric_meter",
+        "smart_plug",
+        "vd_stv_2017_k",
+        "c2c_arlo_pro_3_switch",
+        "yale_push_button_deadbolt_lock",
+        "ge_in_wall_smart_dimmer",
+        "centralite",
+        "da_ref_normal_000001",
+        "vd_network_audio_002s",
+        "vd_sensor_light_2023",
+        "iphone",
+        "da_sac_ehs_000001_sub",
+        "da_wm_dw_000001",
+        "da_wm_wd_000001",
+        "da_wm_wd_000001_1",
+        "da_wm_wm_000001",
+        "da_wm_wm_000001_1",
+        "da_wm_sc_000001",
+        "da_rvc_normal_000001",
+        "da_ks_microwave_0101x",
+        "da_ks_cooktop_31001",
+        "da_ks_range_0101x",
+        "da_ks_oven_01061",
+        "hue_color_temperature_bulb",
+        "hue_rgbw_color_bulb",
+        "c2c_shade",
+        "sonos_player",
+        "aeotec_home_energy_meter_gen5",
+        "virtual_water_sensor",
+        "virtual_thermostat",
+        "virtual_valve",
+        "sensibo_airconditioner_1",
+        "ecobee_sensor",
+        "ecobee_thermostat",
+        "ecobee_thermostat_offline",
+        "fake_fan",
+        "generic_fan_3_speed",
+        "heatit_ztrm3_thermostat",
+        "heatit_zpushwall",
+        "generic_ef00_v1",
+        "bosch_radiator_thermostat_ii",
+        "im_speaker_ai_0001",
+        "abl_light_b_001",
+        "tplink_p110",
+        "ikea_kadrilj",
+        "aux_ac",
+        "hw_q80r_soundbar",
     ]
-    item.components = {"main": item.capabilities}
-    item.status = Mock(DeviceStatus)
-    return item
+)
+def device_fixture(
+    mock_smartthings: AsyncMock, request: pytest.FixtureRequest
+) -> Generator[str]:
+    """Return every device."""
+    return request.param
 
 
-@pytest.fixture(name="config_entry")
-def config_entry_fixture(installed_app: Mock, location: Mock) -> MockConfigEntry:
-    """Fixture representing a config entry."""
-    data = {
-        CONF_ACCESS_TOKEN: str(uuid4()),
-        CONF_INSTALLED_APP_ID: installed_app.installed_app_id,
-        CONF_APP_ID: installed_app.app_id,
-        CONF_LOCATION_ID: location.location_id,
-        CONF_REFRESH_TOKEN: str(uuid4()),
-        CONF_CLIENT_ID: str(uuid4()),
-        CONF_CLIENT_SECRET: str(uuid4()),
-    }
+@pytest.fixture
+def devices(mock_smartthings: AsyncMock, device_fixture: str) -> Generator[AsyncMock]:
+    """Return a specific device."""
+    mock_smartthings.get_devices.return_value = DeviceResponse.from_json(
+        load_fixture(f"devices/{device_fixture}.json", DOMAIN)
+    ).items
+    mock_smartthings.get_device_status.return_value = DeviceStatus.from_json(
+        load_fixture(f"device_status/{device_fixture}.json", DOMAIN)
+    ).components
+    return mock_smartthings
+
+
+@pytest.fixture
+def mock_config_entry(expires_at: int) -> MockConfigEntry:
+    """Mock a config entry."""
     return MockConfigEntry(
         domain=DOMAIN,
-        data=data,
-        title=location.name,
-        version=2,
-        source=SOURCE_USER,
+        title="My home",
+        unique_id="397678e5-9995-4a39-9d9f-ae6ba310236c",
+        data={
+            "auth_implementation": DOMAIN,
+            "token": {
+                "access_token": "mock-access-token",
+                "refresh_token": "mock-refresh-token",
+                "expires_at": expires_at,
+                "scope": " ".join(SCOPES),
+                "access_tier": 0,
+                "installed_app_id": "5aaaa925-2be1-4e40-b257-e4ef59083324",
+            },
+            CONF_LOCATION_ID: "397678e5-9995-4a39-9d9f-ae6ba310236c",
+            CONF_INSTALLED_APP_ID: "123",
+        },
+        version=3,
+        minor_version=2,
     )
 
 
-@pytest.fixture(name="subscription_factory")
-def subscription_factory_fixture():
-    """Fixture for creating mock subscriptions."""
-
-    def _factory(capability):
-        sub = Subscription()
-        sub.capability = capability
-        return sub
-
-    return _factory
-
-
-@pytest.fixture(name="device_factory")
-def device_factory_fixture():
-    """Fixture for creating mock devices."""
-    api = Mock(Api)
-    api.post_device_command.return_value = {"results": [{"status": "ACCEPTED"}]}
-
-    def _factory(label, capabilities, status: dict | None = None):
-        device_data = {
-            "deviceId": str(uuid4()),
-            "name": "Device Type Handler Name",
-            "label": label,
-            "deviceManufacturerCode": "9135fc86-0929-4436-bf73-5d75f523d9db",
-            "locationId": "fcd829e9-82f4-45b9-acfd-62fda029af80",
-            "components": [
-                {
-                    "id": "main",
-                    "capabilities": [
-                        {"id": capability, "version": 1} for capability in capabilities
-                    ],
-                }
-            ],
-            "dth": {
-                "deviceTypeId": "b678b29d-2726-4e4f-9c3f-7aa05bd08964",
-                "deviceTypeName": "Switch",
-                "deviceNetworkType": "ZWAVE",
-            },
-            "type": "DTH",
-        }
-        device = DeviceEntity(api, data=device_data)
-        if status:
-            for attribute, value in status.items():
-                device.status.apply_attribute_update("main", "", attribute, value)
-        return device
-
-    return _factory
-
-
-@pytest.fixture(name="scene_factory")
-def scene_factory_fixture(location):
-    """Fixture for creating mock devices."""
-
-    def _factory(name):
-        scene = Mock(SceneEntity)
-        scene.scene_id = str(uuid4())
-        scene.name = name
-        scene.icon = None
-        scene.color = None
-        scene.location_id = location.location_id
-        return scene
-
-    return _factory
-
-
-@pytest.fixture(name="scene")
-def scene_fixture(scene_factory):
-    """Fixture for an individual scene."""
-    return scene_factory("Test Scene")
-
-
-@pytest.fixture(name="event_factory")
-def event_factory_fixture():
-    """Fixture for creating mock devices."""
-
-    def _factory(
-        device_id,
-        event_type="DEVICE_EVENT",
-        capability="",
-        attribute="Updated",
-        value="Value",
-        data=None,
-    ):
-        event = Mock()
-        event.event_type = event_type
-        event.device_id = device_id
-        event.component_id = "main"
-        event.capability = capability
-        event.attribute = attribute
-        event.value = value
-        event.data = data
-        event.location_id = str(uuid4())
-        return event
-
-    return _factory
-
-
-@pytest.fixture(name="event_request_factory")
-def event_request_factory_fixture(event_factory):
-    """Fixture for creating mock smartapp event requests."""
-
-    def _factory(device_ids=None, events=None):
-        request = Mock()
-        request.installed_app_id = uuid4()
-        if events is None:
-            events = []
-        if device_ids:
-            events.extend([event_factory(device_id) for device_id in device_ids])
-            events.append(event_factory(uuid4()))
-            events.append(event_factory(device_ids[0], event_type="OTHER"))
-        request.events = events
-        return request
-
-    return _factory
+@pytest.fixture
+def mock_old_config_entry() -> MockConfigEntry:
+    """Mock the old config entry."""
+    return MockConfigEntry(
+        domain=DOMAIN,
+        title="My home",
+        unique_id="appid123-2be1-4e40-b257-e4ef59083324_397678e5-9995-4a39-9d9f-ae6ba310236c",
+        data={
+            CONF_ACCESS_TOKEN: "mock-access-token",
+            CONF_REFRESH_TOKEN: "mock-refresh-token",
+            CONF_CLIENT_ID: "CLIENT_ID",
+            CONF_CLIENT_SECRET: "CLIENT_SECRET",
+            CONF_LOCATION_ID: "397678e5-9995-4a39-9d9f-ae6ba310236c",
+            CONF_INSTALLED_APP_ID: "123aa123-2be1-4e40-b257-e4ef59083324",
+        },
+        version=2,
+    )
diff --git a/tests/components/smartthings/fixtures/device_status/abl_light_b_001.json b/tests/components/smartthings/fixtures/device_status/abl_light_b_001.json
new file mode 100644
index 00000000000..6dba85d7dc4
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/abl_light_b_001.json
@@ -0,0 +1,27 @@
+{
+  "components": {
+    "main": {
+      "switchLevel": {
+        "levelRange": {
+          "value": null
+        },
+        "level": {
+          "value": null
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": null
+        }
+      },
+      "colorTemperature": {
+        "colorTemperatureRange": {
+          "value": null
+        },
+        "colorTemperature": {
+          "value": null
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/aeotec_home_energy_meter_gen5.json b/tests/components/smartthings/fixtures/device_status/aeotec_home_energy_meter_gen5.json
new file mode 100644
index 00000000000..95ae6310be8
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/aeotec_home_energy_meter_gen5.json
@@ -0,0 +1,31 @@
+{
+  "components": {
+    "main": {
+      "powerMeter": {
+        "power": {
+          "value": 2859.743,
+          "unit": "W",
+          "timestamp": "2025-02-10T21:09:08.228Z"
+        }
+      },
+      "voltageMeasurement": {
+        "voltage": {
+          "value": null
+        }
+      },
+      "powerConsumptionReport": {
+        "powerConsumption": {
+          "value": null
+        }
+      },
+      "energyMeter": {
+        "energy": {
+          "value": 19978.536,
+          "unit": "kWh",
+          "timestamp": "2025-02-10T21:09:08.357Z"
+        }
+      },
+      "refresh": {}
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/aux_ac.json b/tests/components/smartthings/fixtures/device_status/aux_ac.json
new file mode 100644
index 00000000000..a3ebede7a10
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/aux_ac.json
@@ -0,0 +1,69 @@
+{
+  "components": {
+    "main": {
+      "partyvoice23922.vtempset": {
+        "vtemp": {
+          "value": 20,
+          "unit": "C",
+          "timestamp": "2024-12-05T20:03:33.161Z"
+        }
+      },
+      "airConditionerFanMode": {
+        "fanMode": {
+          "value": "auto",
+          "timestamp": "2024-12-05T20:03:32.930Z"
+        },
+        "supportedAcFanModes": {
+          "value": null
+        },
+        "availableAcFanModes": {
+          "value": null
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 20.0,
+          "unit": "C",
+          "timestamp": "2024-12-05T20:03:33.066Z"
+        }
+      },
+      "airConditionerMode": {
+        "availableAcModes": {
+          "value": null
+        },
+        "supportedAcModes": {
+          "value": null
+        },
+        "airConditionerMode": {
+          "value": "cool",
+          "timestamp": "2024-12-05T20:03:32.845Z"
+        }
+      },
+      "fanSpeed": {
+        "fanSpeed": {
+          "value": 0,
+          "timestamp": "2024-12-05T20:03:33.334Z"
+        }
+      },
+      "thermostatCoolingSetpoint": {
+        "coolingSetpointRange": {
+          "value": null
+        },
+        "coolingSetpoint": {
+          "value": 20.0,
+          "unit": "C",
+          "timestamp": "2024-12-05T20:03:33.243Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2024-12-05T20:03:32.662Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/base_electric_meter.json b/tests/components/smartthings/fixtures/device_status/base_electric_meter.json
new file mode 100644
index 00000000000..b4fa67b6f7e
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/base_electric_meter.json
@@ -0,0 +1,21 @@
+{
+  "components": {
+    "main": {
+      "powerMeter": {
+        "power": {
+          "value": 938.3,
+          "unit": "W",
+          "timestamp": "2025-02-09T17:56:21.748Z"
+        }
+      },
+      "energyMeter": {
+        "energy": {
+          "value": 1930.362,
+          "unit": "kWh",
+          "timestamp": "2025-02-09T17:56:21.918Z"
+        }
+      },
+      "refresh": {}
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/bosch_radiator_thermostat_ii.json b/tests/components/smartthings/fixtures/device_status/bosch_radiator_thermostat_ii.json
new file mode 100644
index 00000000000..6248eb05e93
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/bosch_radiator_thermostat_ii.json
@@ -0,0 +1,89 @@
+{
+  "components": {
+    "main": {
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 23.9,
+          "unit": "C",
+          "timestamp": "2025-03-07T19:55:13.328Z"
+        }
+      },
+      "thermostatHeatingSetpoint": {
+        "heatingSetpoint": {
+          "value": 22.0,
+          "unit": "C",
+          "timestamp": "2025-03-05T03:05:26.510Z"
+        },
+        "heatingSetpointRange": {
+          "value": {
+            "minimum": 5.0,
+            "maximum": 40.0,
+            "step": 0.1
+          },
+          "unit": "C",
+          "timestamp": "2025-03-05T03:05:26.510Z"
+        }
+      },
+      "refresh": {},
+      "thermostatMode": {
+        "thermostatMode": {
+          "value": "heat",
+          "data": {
+            "supportedThermostatModes": ["off", "heat"]
+          },
+          "timestamp": "2025-03-05T03:05:26.489Z"
+        },
+        "supportedThermostatModes": {
+          "value": ["off", "heat"],
+          "timestamp": "2025-03-05T03:05:26.509Z"
+        }
+      },
+      "battery": {
+        "quantity": {
+          "value": null
+        },
+        "battery": {
+          "value": 94,
+          "unit": "%",
+          "timestamp": "2025-03-07T20:47:27.362Z"
+        },
+        "type": {
+          "value": null
+        }
+      },
+      "firmwareUpdate": {
+        "lastUpdateStatusReason": {
+          "value": null
+        },
+        "availableVersion": {
+          "value": "2.00.09 (20009)",
+          "timestamp": "2024-11-29T19:55:02.005Z"
+        },
+        "lastUpdateStatus": {
+          "value": null
+        },
+        "supportedCommands": {
+          "value": null
+        },
+        "state": {
+          "value": "normalOperation",
+          "timestamp": "2024-11-29T19:55:02.009Z"
+        },
+        "updateAvailable": {
+          "value": false,
+          "timestamp": "2024-11-29T19:55:02.004Z"
+        },
+        "currentVersion": {
+          "value": "2.00.09 (20009)",
+          "timestamp": "2024-11-29T19:55:02.037Z"
+        },
+        "lastUpdateTime": {
+          "value": null
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/button.json b/tests/components/smartthings/fixtures/device_status/button.json
new file mode 100644
index 00000000000..93e320bcb7b
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/button.json
@@ -0,0 +1,21 @@
+{
+  "components": {
+    "main": {
+      "button": {
+        "button": {
+          "value": "pushed",
+          "timestamp": "2025-03-07T12:20:43.363Z"
+        },
+        "numberOfButtons": {
+          "value": 1,
+          "timestamp": "2025-03-07T12:20:43.363Z"
+        },
+        "supportedButtonValues": {
+          "value": ["pushed", "held", "pushed_2x"],
+          "timestamp": "2025-03-07T12:20:43.363Z"
+        }
+      },
+      "refresh": {}
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/c2c_arlo_pro_3_switch.json b/tests/components/smartthings/fixtures/device_status/c2c_arlo_pro_3_switch.json
new file mode 100644
index 00000000000..a3d2cabe837
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/c2c_arlo_pro_3_switch.json
@@ -0,0 +1,91 @@
+{
+  "components": {
+    "main": {
+      "videoCapture": {
+        "stream": {
+          "value": null
+        },
+        "clip": {
+          "value": null
+        }
+      },
+      "videoStream": {
+        "supportedFeatures": {
+          "value": null
+        },
+        "stream": {
+          "value": null
+        }
+      },
+      "healthCheck": {
+        "checkInterval": {
+          "value": 60,
+          "unit": "s",
+          "data": {
+            "deviceScheme": "UNTRACKED",
+            "protocol": "cloud"
+          },
+          "timestamp": "2025-02-03T21:55:57.991Z"
+        },
+        "healthStatus": {
+          "value": null
+        },
+        "DeviceWatch-Enroll": {
+          "value": null
+        },
+        "DeviceWatch-DeviceStatus": {
+          "value": "online",
+          "data": {},
+          "timestamp": "2025-02-08T21:56:09.761Z"
+        }
+      },
+      "alarm": {
+        "alarm": {
+          "value": "off",
+          "timestamp": "2025-02-08T21:56:09.761Z"
+        }
+      },
+      "refresh": {},
+      "soundSensor": {
+        "sound": {
+          "value": "not detected",
+          "timestamp": "2025-02-08T21:56:09.761Z"
+        }
+      },
+      "motionSensor": {
+        "motion": {
+          "value": "inactive",
+          "timestamp": "2025-02-08T21:56:09.761Z"
+        }
+      },
+      "powerConsumptionReport": {
+        "powerConsumption": {
+          "value": {
+            "start": "2025-02-09T15:45:29Z",
+            "end": "2025-02-09T16:15:33Z"
+          },
+          "timestamp": "2025-02-09T16:15:33.639Z"
+        }
+      },
+      "battery": {
+        "quantity": {
+          "value": null
+        },
+        "battery": {
+          "value": 100,
+          "unit": "%",
+          "timestamp": "2025-02-08T21:56:10.041Z"
+        },
+        "type": {
+          "value": null
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "on",
+          "timestamp": "2025-02-08T21:56:10.041Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/c2c_shade.json b/tests/components/smartthings/fixtures/device_status/c2c_shade.json
new file mode 100644
index 00000000000..cc5bcd84482
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/c2c_shade.json
@@ -0,0 +1,50 @@
+{
+  "components": {
+    "main": {
+      "healthCheck": {
+        "checkInterval": {
+          "value": 60,
+          "unit": "s",
+          "data": {
+            "deviceScheme": "UNTRACKED",
+            "protocol": "cloud"
+          },
+          "timestamp": "2025-02-07T23:01:15.966Z"
+        },
+        "healthStatus": {
+          "value": null
+        },
+        "DeviceWatch-Enroll": {
+          "value": null
+        },
+        "DeviceWatch-DeviceStatus": {
+          "value": "offline",
+          "data": {
+            "reason": "DEVICE-OFFLINE"
+          },
+          "timestamp": "2025-02-08T09:04:47.694Z"
+        }
+      },
+      "switchLevel": {
+        "levelRange": {
+          "value": null
+        },
+        "level": {
+          "value": 100,
+          "unit": "%",
+          "timestamp": "2025-02-08T09:04:47.694Z"
+        }
+      },
+      "refresh": {},
+      "windowShade": {
+        "supportedWindowShadeCommands": {
+          "value": null
+        },
+        "windowShade": {
+          "value": "open",
+          "timestamp": "2025-02-08T09:04:47.694Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/centralite.json b/tests/components/smartthings/fixtures/device_status/centralite.json
new file mode 100644
index 00000000000..efdf54d9128
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/centralite.json
@@ -0,0 +1,60 @@
+{
+  "components": {
+    "main": {
+      "powerMeter": {
+        "power": {
+          "value": 0.0,
+          "unit": "W",
+          "timestamp": "2025-02-09T17:49:15.190Z"
+        }
+      },
+      "switchLevel": {
+        "levelRange": {
+          "value": null
+        },
+        "level": {
+          "value": 0,
+          "unit": "%",
+          "timestamp": "2025-02-09T17:49:15.112Z"
+        }
+      },
+      "refresh": {},
+      "firmwareUpdate": {
+        "lastUpdateStatusReason": {
+          "value": null
+        },
+        "availableVersion": {
+          "value": "16015010",
+          "timestamp": "2025-01-26T10:19:54.783Z"
+        },
+        "lastUpdateStatus": {
+          "value": null
+        },
+        "supportedCommands": {
+          "value": null
+        },
+        "state": {
+          "value": "normalOperation",
+          "timestamp": "2025-01-26T10:19:54.788Z"
+        },
+        "updateAvailable": {
+          "value": false,
+          "timestamp": "2025-01-26T10:19:54.789Z"
+        },
+        "currentVersion": {
+          "value": "16015010",
+          "timestamp": "2025-01-26T10:19:54.775Z"
+        },
+        "lastUpdateTime": {
+          "value": null
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-02-09T17:24:16.864Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/contact_sensor.json b/tests/components/smartthings/fixtures/device_status/contact_sensor.json
new file mode 100644
index 00000000000..ca8c2628c99
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/contact_sensor.json
@@ -0,0 +1,66 @@
+{
+  "components": {
+    "main": {
+      "contactSensor": {
+        "contact": {
+          "value": "closed",
+          "timestamp": "2025-02-09T17:16:42.674Z"
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 59.0,
+          "unit": "F",
+          "timestamp": "2025-02-09T17:11:44.249Z"
+        }
+      },
+      "refresh": {},
+      "battery": {
+        "quantity": {
+          "value": null
+        },
+        "battery": {
+          "value": 100,
+          "unit": "%",
+          "timestamp": "2025-02-09T13:23:50.726Z"
+        },
+        "type": {
+          "value": null
+        }
+      },
+      "firmwareUpdate": {
+        "lastUpdateStatusReason": {
+          "value": null
+        },
+        "availableVersion": {
+          "value": "00000104",
+          "timestamp": "2025-02-09T13:59:19.101Z"
+        },
+        "lastUpdateStatus": {
+          "value": null
+        },
+        "supportedCommands": {
+          "value": null
+        },
+        "state": {
+          "value": "normalOperation",
+          "timestamp": "2025-02-09T13:59:19.101Z"
+        },
+        "updateAvailable": {
+          "value": false,
+          "timestamp": "2025-02-09T13:59:19.102Z"
+        },
+        "currentVersion": {
+          "value": "00000103",
+          "timestamp": "2025-02-09T13:59:19.102Z"
+        },
+        "lastUpdateTime": {
+          "value": null
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/da_ac_airsensor_01001.json b/tests/components/smartthings/fixtures/device_status/da_ac_airsensor_01001.json
new file mode 100644
index 00000000000..903b5163335
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/da_ac_airsensor_01001.json
@@ -0,0 +1,362 @@
+{
+  "components": {
+    "main": {
+      "samsungce.rechargeableBattery": {
+        "chargingStatus": {
+          "value": "charging",
+          "timestamp": "2025-02-18T05:20:27.966Z"
+        },
+        "battery": {
+          "value": 100,
+          "unit": "%",
+          "timestamp": "2025-02-22T04:50:19.633Z"
+        },
+        "resolution": {
+          "value": 1,
+          "timestamp": "2024-12-20T14:38:31.662Z"
+        }
+      },
+      "relativeHumidityMeasurement": {
+        "humidity": {
+          "value": 54,
+          "unit": "%",
+          "timestamp": "2025-03-21T07:26:16.872Z"
+        }
+      },
+      "refresh": {},
+      "carbonDioxideHealthConcern": {
+        "carbonDioxideHealthConcern": {
+          "value": "moderate",
+          "timestamp": "2025-03-21T13:40:56.560Z"
+        }
+      },
+      "execute": {
+        "data": {
+          "value": {
+            "payload": {
+              "rt": ["x.com.samsung.da.sensors"],
+              "if": ["oic.if.baseline", "oic.if.s"],
+              "x.com.samsung.da.cleanLevel": "2",
+              "x.com.samsung.da.refresh": "Off",
+              "x.com.samsung.da.lastSensingTime": "1740829045",
+              "x.com.samsung.da.items": [
+                {
+                  "x.com.samsung.da.id": "0",
+                  "x.com.samsung.da.description": "Sensor for CleanLevel",
+                  "x.com.samsung.da.type": "CleanLevel",
+                  "x.com.samsung.da.value": ["2"]
+                },
+                {
+                  "x.com.samsung.da.id": "1",
+                  "x.com.samsung.da.description": "Sensor for Odor",
+                  "x.com.samsung.da.type": "Odor",
+                  "x.com.samsung.da.value": ["2"]
+                },
+                {
+                  "x.com.samsung.da.id": "2",
+                  "x.com.samsung.da.description": "Sensor for Dust",
+                  "x.com.samsung.da.type": "Dust",
+                  "x.com.samsung.da.value": ["29", "1"]
+                },
+                {
+                  "x.com.samsung.da.id": "3",
+                  "x.com.samsung.da.description": "Sensor for FineDust",
+                  "x.com.samsung.da.type": "FineDust",
+                  "x.com.samsung.da.value": ["7", "1"]
+                },
+                {
+                  "x.com.samsung.da.id": "4",
+                  "x.com.samsung.da.description": "Sensor for SuperFineDust",
+                  "x.com.samsung.da.type": "SuperFineDust",
+                  "x.com.samsung.da.value": ["6", "1"]
+                },
+                {
+                  "x.com.samsung.da.id": "5",
+                  "x.com.samsung.da.description": "Sensor for CO2",
+                  "x.com.samsung.da.type": "CO2",
+                  "x.com.samsung.da.value": ["2527", "3"]
+                }
+              ]
+            }
+          },
+          "data": {
+            "href": "/sensors/vs/0"
+          },
+          "timestamp": "2025-03-01T11:37:26.334Z"
+        }
+      },
+      "carbonDioxideMeasurement": {
+        "carbonDioxide": {
+          "value": 1045,
+          "unit": "ppm",
+          "timestamp": "2025-03-21T15:05:44.312Z"
+        }
+      },
+      "samsungce.deviceIdentification": {
+        "micomAssayCode": {
+          "value": null
+        },
+        "modelName": {
+          "value": null
+        },
+        "serialNumber": {
+          "value": null
+        },
+        "serialNumberExtra": {
+          "value": null
+        },
+        "modelClassificationCode": {
+          "value": null
+        },
+        "description": {
+          "value": null
+        },
+        "releaseYear": {
+          "value": null
+        },
+        "binaryId": {
+          "value": "ASM-KR-TP1-22-ACMB1M",
+          "timestamp": "2025-03-20T23:08:07.388Z"
+        }
+      },
+      "airQualitySensor": {
+        "airQuality": {
+          "value": 2,
+          "unit": "CAQI",
+          "timestamp": "2025-03-21T15:06:39.609Z"
+        }
+      },
+      "fineDustHealthConcern": {
+        "fineDustHealthConcern": {
+          "value": "good",
+          "timestamp": "2025-03-21T10:25:04.548Z"
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": null
+        },
+        "mndt": {
+          "value": null
+        },
+        "mnfv": {
+          "value": "ASM-KR-TP1-22-ACMB1M_16240426",
+          "timestamp": "2024-08-19T07:28:01.277Z"
+        },
+        "mnhw": {
+          "value": "Realtek",
+          "timestamp": "2024-08-19T07:28:01.277Z"
+        },
+        "di": {
+          "value": "a3a970ea-e09c-9c04-161b-94c934e21666",
+          "timestamp": "2024-08-19T07:28:01.277Z"
+        },
+        "mnsl": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2024-08-19T07:28:01.277Z"
+        },
+        "dmv": {
+          "value": "1.2.1",
+          "timestamp": "2024-08-19T07:28:01.277Z"
+        },
+        "n": {
+          "value": "Samsung AirMonitor",
+          "timestamp": "2024-08-19T07:28:01.277Z"
+        },
+        "mnmo": {
+          "value": "ASM-KR-TP1-22-ACMB1M|10243041|75000000001611C40800020000080000",
+          "timestamp": "2024-08-19T07:28:01.277Z"
+        },
+        "vid": {
+          "value": "DA-AC-AIRSENSOR-01001",
+          "timestamp": "2024-08-19T07:28:01.277Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2024-08-19T07:28:01.277Z"
+        },
+        "mnml": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2024-08-19T07:28:01.277Z"
+        },
+        "mnpv": {
+          "value": "DAWIT 2.0",
+          "timestamp": "2024-08-19T07:28:01.277Z"
+        },
+        "mnos": {
+          "value": "TizenRT 4.0",
+          "timestamp": "2024-08-19T07:28:01.277Z"
+        },
+        "pi": {
+          "value": "a3a970ea-e09c-9c04-161b-94c934e21666",
+          "timestamp": "2024-08-19T07:28:01.277Z"
+        },
+        "icv": {
+          "value": "core.1.1.0",
+          "timestamp": "2024-08-19T07:28:01.277Z"
+        }
+      },
+      "odorSensor": {
+        "odorLevel": {
+          "value": 1,
+          "timestamp": "2025-03-21T13:29:15.650Z"
+        }
+      },
+      "veryFineDustHealthConcern": {
+        "veryFineDustHealthConcern": {
+          "value": "good",
+          "timestamp": "2025-03-21T02:56:21.007Z"
+        }
+      },
+      "samsungce.doNotDisturb": {
+        "settable": {
+          "value": true,
+          "timestamp": "2024-12-20T14:38:31.895Z"
+        },
+        "dayOfWeek": {
+          "value": null
+        },
+        "repeatMode": {
+          "value": null
+        },
+        "startTime": {
+          "value": "14:00:00Z",
+          "timestamp": "2024-12-20T14:38:31.895Z"
+        },
+        "endTime": {
+          "value": "22:00:00Z",
+          "timestamp": "2024-12-20T14:38:31.895Z"
+        },
+        "activated": {
+          "value": false,
+          "timestamp": "2024-12-20T14:38:31.895Z"
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": [],
+          "timestamp": "2025-03-01T11:37:26.334Z"
+        }
+      },
+      "samsungce.driverVersion": {
+        "versionNumber": {
+          "value": 22100101,
+          "timestamp": "2023-12-09T04:05:59.505Z"
+        }
+      },
+      "samsungce.softwareUpdate": {
+        "targetModule": {
+          "value": null
+        },
+        "otnDUID": {
+          "value": "EXCHUODPSCTZY",
+          "timestamp": "2024-12-20T14:38:31.716Z"
+        },
+        "lastUpdatedDate": {
+          "value": null
+        },
+        "availableModules": {
+          "value": [],
+          "timestamp": "2024-12-20T14:38:31.716Z"
+        },
+        "newVersionAvailable": {
+          "value": false,
+          "timestamp": "2024-12-20T14:38:31.716Z"
+        },
+        "operatingState": {
+          "value": null
+        },
+        "progress": {
+          "value": null
+        }
+      },
+      "sec.diagnosticsInformation": {
+        "logType": {
+          "value": ["errCode", "dump"],
+          "timestamp": "2024-12-20T14:38:31.716Z"
+        },
+        "endpoint": {
+          "value": "SSM",
+          "timestamp": "2024-12-20T14:38:31.716Z"
+        },
+        "minVersion": {
+          "value": "1.0",
+          "timestamp": "2024-12-20T14:38:31.716Z"
+        },
+        "signinPermission": {
+          "value": null
+        },
+        "setupId": {
+          "value": "AM0",
+          "timestamp": "2024-12-20T14:38:31.716Z"
+        },
+        "protocolType": {
+          "value": "wifi_https",
+          "timestamp": "2024-12-20T14:38:31.716Z"
+        },
+        "tsId": {
+          "value": null
+        },
+        "mnId": {
+          "value": "0AJT",
+          "timestamp": "2024-12-20T14:38:31.716Z"
+        },
+        "dumpType": {
+          "value": "file",
+          "timestamp": "2024-12-20T14:38:31.716Z"
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 23.0,
+          "unit": "C",
+          "timestamp": "2025-03-21T04:40:33.951Z"
+        }
+      },
+      "dustSensor": {
+        "dustLevel": {
+          "value": 31,
+          "unit": "\u03bcg/m^3",
+          "timestamp": "2025-03-21T15:06:39.609Z"
+        },
+        "fineDustLevel": {
+          "value": 7,
+          "unit": "\u03bcg/m^3",
+          "timestamp": "2025-03-21T15:06:28.515Z"
+        }
+      },
+      "veryFineDustSensor": {
+        "veryFineDustLevel": {
+          "value": 6,
+          "unit": "\u03bcg/m^3",
+          "timestamp": "2025-03-21T15:06:28.515Z"
+        }
+      },
+      "custom.deviceReportStateConfiguration": {
+        "reportStateRealtimePeriod": {
+          "value": "enabled",
+          "timestamp": "2024-12-20T14:38:31.769Z"
+        },
+        "reportStateRealtime": {
+          "value": {
+            "state": "disabled"
+          },
+          "timestamp": "2025-03-20T22:02:48.215Z"
+        },
+        "reportStatePeriod": {
+          "value": "enabled",
+          "timestamp": "2024-12-20T14:38:31.769Z"
+        }
+      },
+      "dustHealthConcern": {
+        "dustHealthConcern": {
+          "value": "moderate",
+          "timestamp": "2025-03-21T15:06:39.609Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/da_ac_rac_000001.json b/tests/components/smartthings/fixtures/device_status/da_ac_rac_000001.json
new file mode 100644
index 00000000000..c80fcf9c298
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/da_ac_rac_000001.json
@@ -0,0 +1,879 @@
+{
+  "components": {
+    "1": {
+      "relativeHumidityMeasurement": {
+        "humidity": {
+          "value": 0,
+          "unit": "%",
+          "timestamp": "2021-04-06T16:43:35.291Z"
+        }
+      },
+      "custom.airConditionerOdorController": {
+        "airConditionerOdorControllerProgress": {
+          "value": null,
+          "timestamp": "2021-04-08T04:11:38.269Z"
+        },
+        "airConditionerOdorControllerState": {
+          "value": null,
+          "timestamp": "2021-04-08T04:11:38.269Z"
+        }
+      },
+      "custom.thermostatSetpointControl": {
+        "minimumSetpoint": {
+          "value": null,
+          "timestamp": "2021-04-08T04:04:19.901Z"
+        },
+        "maximumSetpoint": {
+          "value": null,
+          "timestamp": "2021-04-08T04:04:19.901Z"
+        }
+      },
+      "airConditionerMode": {
+        "availableAcModes": {
+          "value": null
+        },
+        "supportedAcModes": {
+          "value": null,
+          "timestamp": "2021-04-08T03:50:50.930Z"
+        },
+        "airConditionerMode": {
+          "value": null,
+          "timestamp": "2021-04-08T03:50:50.930Z"
+        }
+      },
+      "custom.spiMode": {
+        "spiMode": {
+          "value": null,
+          "timestamp": "2021-04-06T16:57:57.686Z"
+        }
+      },
+      "airQualitySensor": {
+        "airQuality": {
+          "value": null,
+          "unit": "CAQI",
+          "timestamp": "2021-04-06T16:57:57.602Z"
+        }
+      },
+      "custom.airConditionerOptionalMode": {
+        "supportedAcOptionalMode": {
+          "value": null,
+          "timestamp": "2021-04-06T16:57:57.659Z"
+        },
+        "acOptionalMode": {
+          "value": null,
+          "timestamp": "2021-04-06T16:57:57.659Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.518Z"
+        }
+      },
+      "custom.airConditionerTropicalNightMode": {
+        "acTropicalNightModeLevel": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.498Z"
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.472Z"
+        },
+        "mndt": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.472Z"
+        },
+        "mnfv": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.472Z"
+        },
+        "mnhw": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.472Z"
+        },
+        "di": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.472Z"
+        },
+        "mnsl": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.472Z"
+        },
+        "dmv": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.472Z"
+        },
+        "n": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.472Z"
+        },
+        "mnmo": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.472Z"
+        },
+        "vid": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.472Z"
+        },
+        "mnmn": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.472Z"
+        },
+        "mnml": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.472Z"
+        },
+        "mnpv": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.472Z"
+        },
+        "mnos": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.472Z"
+        },
+        "pi": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.472Z"
+        },
+        "icv": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.472Z"
+        }
+      },
+      "airConditionerFanMode": {
+        "fanMode": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.381Z"
+        },
+        "supportedAcFanModes": {
+          "value": ["auto", "low", "medium", "high", "turbo"],
+          "timestamp": "2024-09-10T10:26:28.605Z"
+        },
+        "availableAcFanModes": {
+          "value": null
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": [
+            "remoteControlStatus",
+            "airQualitySensor",
+            "dustSensor",
+            "odorSensor",
+            "veryFineDustSensor",
+            "custom.dustFilter",
+            "custom.deodorFilter",
+            "custom.deviceReportStateConfiguration",
+            "audioVolume",
+            "custom.autoCleaningMode",
+            "custom.airConditionerTropicalNightMode",
+            "custom.airConditionerOdorController",
+            "demandResponseLoadControl",
+            "relativeHumidityMeasurement"
+          ],
+          "timestamp": "2024-09-10T10:26:28.605Z"
+        }
+      },
+      "fanOscillationMode": {
+        "supportedFanOscillationModes": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.325Z"
+        },
+        "availableFanOscillationModes": {
+          "value": null
+        },
+        "fanOscillationMode": {
+          "value": "fixed",
+          "timestamp": "2025-02-08T00:44:53.247Z"
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.373Z"
+        }
+      },
+      "dustSensor": {
+        "dustLevel": {
+          "value": null,
+          "unit": "\u03bcg/m^3",
+          "timestamp": "2021-04-06T16:44:10.122Z"
+        },
+        "fineDustLevel": {
+          "value": null,
+          "unit": "\u03bcg/m^3",
+          "timestamp": "2021-04-06T16:44:10.122Z"
+        }
+      },
+      "custom.deviceReportStateConfiguration": {
+        "reportStateRealtimePeriod": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:09.800Z"
+        },
+        "reportStateRealtime": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:09.800Z"
+        },
+        "reportStatePeriod": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:09.800Z"
+        }
+      },
+      "thermostatCoolingSetpoint": {
+        "coolingSetpointRange": {
+          "value": null
+        },
+        "coolingSetpoint": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:59.136Z"
+        }
+      },
+      "demandResponseLoadControl": {
+        "drlcStatus": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:54.748Z"
+        }
+      },
+      "audioVolume": {
+        "volume": {
+          "value": null,
+          "unit": "%",
+          "timestamp": "2021-04-06T16:43:53.541Z"
+        }
+      },
+      "powerConsumptionReport": {
+        "powerConsumption": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:53.364Z"
+        }
+      },
+      "custom.autoCleaningMode": {
+        "supportedAutoCleaningModes": {
+          "value": null
+        },
+        "timedCleanDuration": {
+          "value": null
+        },
+        "operatingState": {
+          "value": null
+        },
+        "timedCleanDurationRange": {
+          "value": null
+        },
+        "supportedOperatingStates": {
+          "value": null
+        },
+        "progress": {
+          "value": null
+        },
+        "autoCleaningMode": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:53.344Z"
+        }
+      },
+      "custom.dustFilter": {
+        "dustFilterUsageStep": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:39.145Z"
+        },
+        "dustFilterUsage": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:39.145Z"
+        },
+        "dustFilterLastResetDate": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:39.145Z"
+        },
+        "dustFilterStatus": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:39.145Z"
+        },
+        "dustFilterCapacity": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:39.145Z"
+        },
+        "dustFilterResetType": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:39.145Z"
+        }
+      },
+      "odorSensor": {
+        "odorLevel": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:38.992Z"
+        }
+      },
+      "remoteControlStatus": {
+        "remoteControlEnabled": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:39.097Z"
+        }
+      },
+      "custom.deodorFilter": {
+        "deodorFilterCapacity": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:39.118Z"
+        },
+        "deodorFilterLastResetDate": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:39.118Z"
+        },
+        "deodorFilterStatus": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:39.118Z"
+        },
+        "deodorFilterResetType": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:39.118Z"
+        },
+        "deodorFilterUsage": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:39.118Z"
+        },
+        "deodorFilterUsageStep": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:39.118Z"
+        }
+      },
+      "custom.energyType": {
+        "energyType": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:38.843Z"
+        },
+        "energySavingSupport": {
+          "value": null
+        },
+        "drMaxDuration": {
+          "value": null
+        },
+        "energySavingLevel": {
+          "value": null
+        },
+        "energySavingInfo": {
+          "value": null
+        },
+        "supportedEnergySavingLevels": {
+          "value": null
+        },
+        "energySavingOperation": {
+          "value": null
+        },
+        "notificationTemplateID": {
+          "value": null
+        },
+        "energySavingOperationSupport": {
+          "value": null
+        }
+      },
+      "veryFineDustSensor": {
+        "veryFineDustLevel": {
+          "value": null,
+          "unit": "\u03bcg/m^3",
+          "timestamp": "2021-04-06T16:43:38.529Z"
+        }
+      }
+    },
+    "main": {
+      "relativeHumidityMeasurement": {
+        "humidity": {
+          "value": 60,
+          "unit": "%",
+          "timestamp": "2024-12-30T13:10:23.759Z"
+        }
+      },
+      "custom.airConditionerOdorController": {
+        "airConditionerOdorControllerProgress": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:37.555Z"
+        },
+        "airConditionerOdorControllerState": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:37.555Z"
+        }
+      },
+      "custom.thermostatSetpointControl": {
+        "minimumSetpoint": {
+          "value": 16,
+          "unit": "C",
+          "timestamp": "2025-01-08T06:30:58.307Z"
+        },
+        "maximumSetpoint": {
+          "value": 30,
+          "unit": "C",
+          "timestamp": "2024-09-10T10:26:28.781Z"
+        }
+      },
+      "airConditionerMode": {
+        "availableAcModes": {
+          "value": null
+        },
+        "supportedAcModes": {
+          "value": ["cool", "dry", "wind", "auto", "heat"],
+          "timestamp": "2024-09-10T10:26:28.781Z"
+        },
+        "airConditionerMode": {
+          "value": "heat",
+          "timestamp": "2025-02-09T09:14:39.642Z"
+        }
+      },
+      "custom.spiMode": {
+        "spiMode": {
+          "value": "off",
+          "timestamp": "2025-02-09T09:14:39.642Z"
+        }
+      },
+      "samsungce.dongleSoftwareInstallation": {
+        "status": {
+          "value": "completed",
+          "timestamp": "2021-12-29T01:36:51.289Z"
+        }
+      },
+      "samsungce.deviceIdentification": {
+        "micomAssayCode": {
+          "value": null
+        },
+        "modelName": {
+          "value": null
+        },
+        "serialNumber": {
+          "value": null
+        },
+        "serialNumberExtra": {
+          "value": null
+        },
+        "modelClassificationCode": {
+          "value": null
+        },
+        "description": {
+          "value": null
+        },
+        "releaseYear": {
+          "value": null
+        },
+        "binaryId": {
+          "value": "ARTIK051_KRAC_18K",
+          "timestamp": "2025-02-08T00:44:53.855Z"
+        }
+      },
+      "airQualitySensor": {
+        "airQuality": {
+          "value": null,
+          "unit": "CAQI",
+          "timestamp": "2021-04-06T16:43:37.208Z"
+        }
+      },
+      "custom.airConditionerOptionalMode": {
+        "supportedAcOptionalMode": {
+          "value": ["off", "windFree"],
+          "timestamp": "2024-09-10T10:26:28.781Z"
+        },
+        "acOptionalMode": {
+          "value": "off",
+          "timestamp": "2025-02-09T09:14:39.642Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-02-09T16:37:54.072Z"
+        }
+      },
+      "custom.airConditionerTropicalNightMode": {
+        "acTropicalNightModeLevel": {
+          "value": 0,
+          "timestamp": "2025-02-09T09:14:39.642Z"
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:35.933Z"
+        },
+        "mndt": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:35.912Z"
+        },
+        "mnfv": {
+          "value": "0.1.0",
+          "timestamp": "2024-09-10T10:26:28.552Z"
+        },
+        "mnhw": {
+          "value": "1.0",
+          "timestamp": "2024-09-10T10:26:28.552Z"
+        },
+        "di": {
+          "value": "96a5ef74-5832-a84b-f1f7-ca799957065d",
+          "timestamp": "2024-09-10T10:26:28.552Z"
+        },
+        "mnsl": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:35.803Z"
+        },
+        "dmv": {
+          "value": "res.1.1.0,sh.1.1.0",
+          "timestamp": "2024-09-10T10:26:28.552Z"
+        },
+        "n": {
+          "value": "[room a/c] Samsung",
+          "timestamp": "2024-09-10T10:26:28.552Z"
+        },
+        "mnmo": {
+          "value": "ARTIK051_KRAC_18K|10193441|60010132001111110200000000000000",
+          "timestamp": "2024-09-10T10:26:28.781Z"
+        },
+        "vid": {
+          "value": "DA-AC-RAC-000001",
+          "timestamp": "2024-09-10T10:26:28.552Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2024-09-10T10:26:28.552Z"
+        },
+        "mnml": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2024-09-10T10:26:28.552Z"
+        },
+        "mnpv": {
+          "value": "0G3MPDCKA00010E",
+          "timestamp": "2024-09-10T10:26:28.552Z"
+        },
+        "mnos": {
+          "value": "TizenRT2.0",
+          "timestamp": "2024-09-10T10:26:28.552Z"
+        },
+        "pi": {
+          "value": "96a5ef74-5832-a84b-f1f7-ca799957065d",
+          "timestamp": "2024-09-10T10:26:28.552Z"
+        },
+        "icv": {
+          "value": "core.1.1.0",
+          "timestamp": "2024-09-10T10:26:28.552Z"
+        }
+      },
+      "airConditionerFanMode": {
+        "fanMode": {
+          "value": "low",
+          "timestamp": "2025-02-09T09:14:39.249Z"
+        },
+        "supportedAcFanModes": {
+          "value": ["auto", "low", "medium", "high", "turbo"],
+          "timestamp": "2025-02-09T09:14:39.249Z"
+        },
+        "availableAcFanModes": {
+          "value": null
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": [
+            "remoteControlStatus",
+            "airQualitySensor",
+            "dustSensor",
+            "veryFineDustSensor",
+            "custom.dustFilter",
+            "custom.deodorFilter",
+            "custom.deviceReportStateConfiguration",
+            "samsungce.dongleSoftwareInstallation",
+            "demandResponseLoadControl",
+            "custom.airConditionerOdorController"
+          ],
+          "timestamp": "2025-02-09T09:14:39.642Z"
+        }
+      },
+      "samsungce.driverVersion": {
+        "versionNumber": {
+          "value": 24070101,
+          "timestamp": "2024-09-04T06:35:09.557Z"
+        }
+      },
+      "fanOscillationMode": {
+        "supportedFanOscillationModes": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:35.782Z"
+        },
+        "availableFanOscillationModes": {
+          "value": null
+        },
+        "fanOscillationMode": {
+          "value": "fixed",
+          "timestamp": "2025-02-09T09:14:39.249Z"
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 25,
+          "unit": "C",
+          "timestamp": "2025-02-09T16:33:29.164Z"
+        }
+      },
+      "dustSensor": {
+        "dustLevel": {
+          "value": null,
+          "unit": "\u03bcg/m^3",
+          "timestamp": "2021-04-06T16:43:35.665Z"
+        },
+        "fineDustLevel": {
+          "value": null,
+          "unit": "\u03bcg/m^3",
+          "timestamp": "2021-04-06T16:43:35.665Z"
+        }
+      },
+      "custom.deviceReportStateConfiguration": {
+        "reportStateRealtimePeriod": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:35.643Z"
+        },
+        "reportStateRealtime": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:35.643Z"
+        },
+        "reportStatePeriod": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:35.643Z"
+        }
+      },
+      "thermostatCoolingSetpoint": {
+        "coolingSetpointRange": {
+          "value": null
+        },
+        "coolingSetpoint": {
+          "value": 25,
+          "unit": "C",
+          "timestamp": "2025-02-09T09:15:11.608Z"
+        }
+      },
+      "custom.disabledComponents": {
+        "disabledComponents": {
+          "value": ["1"],
+          "timestamp": "2025-02-09T09:14:39.642Z"
+        }
+      },
+      "demandResponseLoadControl": {
+        "drlcStatus": {
+          "value": {
+            "drlcType": 1,
+            "drlcLevel": -1,
+            "start": "1970-01-01T00:00:00Z",
+            "duration": 0,
+            "override": false
+          },
+          "timestamp": "2024-09-10T10:26:28.781Z"
+        }
+      },
+      "audioVolume": {
+        "volume": {
+          "value": 100,
+          "unit": "%",
+          "timestamp": "2025-02-09T09:14:39.642Z"
+        }
+      },
+      "powerConsumptionReport": {
+        "powerConsumption": {
+          "value": {
+            "energy": 2247300,
+            "deltaEnergy": 400,
+            "power": 0,
+            "powerEnergy": 0.0,
+            "persistedEnergy": 2247300,
+            "energySaved": 0,
+            "start": "2025-02-09T15:45:29Z",
+            "end": "2025-02-09T16:15:33Z"
+          },
+          "timestamp": "2025-02-09T16:15:33.639Z"
+        }
+      },
+      "custom.autoCleaningMode": {
+        "supportedAutoCleaningModes": {
+          "value": null
+        },
+        "timedCleanDuration": {
+          "value": null
+        },
+        "operatingState": {
+          "value": null
+        },
+        "timedCleanDurationRange": {
+          "value": null
+        },
+        "supportedOperatingStates": {
+          "value": null
+        },
+        "progress": {
+          "value": null
+        },
+        "autoCleaningMode": {
+          "value": "off",
+          "timestamp": "2025-02-09T09:14:39.642Z"
+        }
+      },
+      "refresh": {},
+      "execute": {
+        "data": {
+          "value": {
+            "payload": {
+              "rt": ["oic.r.temperature"],
+              "if": ["oic.if.baseline", "oic.if.a"],
+              "range": [16.0, 30.0],
+              "units": "C",
+              "temperature": 22.0
+            }
+          },
+          "data": {
+            "href": "/temperature/desired/0"
+          },
+          "timestamp": "2023-07-19T03:07:43.270Z"
+        }
+      },
+      "samsungce.selfCheck": {
+        "result": {
+          "value": null
+        },
+        "supportedActions": {
+          "value": ["start"],
+          "timestamp": "2024-09-04T06:35:09.557Z"
+        },
+        "progress": {
+          "value": null
+        },
+        "errors": {
+          "value": [],
+          "timestamp": "2025-02-08T00:44:53.349Z"
+        },
+        "status": {
+          "value": "ready",
+          "timestamp": "2025-02-08T00:44:53.549Z"
+        }
+      },
+      "custom.dustFilter": {
+        "dustFilterUsageStep": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:35.527Z"
+        },
+        "dustFilterUsage": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:35.527Z"
+        },
+        "dustFilterLastResetDate": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:35.527Z"
+        },
+        "dustFilterStatus": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:35.527Z"
+        },
+        "dustFilterCapacity": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:35.527Z"
+        },
+        "dustFilterResetType": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:35.527Z"
+        }
+      },
+      "remoteControlStatus": {
+        "remoteControlEnabled": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:35.379Z"
+        }
+      },
+      "custom.deodorFilter": {
+        "deodorFilterCapacity": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:35.502Z"
+        },
+        "deodorFilterLastResetDate": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:35.502Z"
+        },
+        "deodorFilterStatus": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:35.502Z"
+        },
+        "deodorFilterResetType": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:35.502Z"
+        },
+        "deodorFilterUsage": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:35.502Z"
+        },
+        "deodorFilterUsageStep": {
+          "value": null,
+          "timestamp": "2021-04-06T16:43:35.502Z"
+        }
+      },
+      "custom.energyType": {
+        "energyType": {
+          "value": "1.0",
+          "timestamp": "2024-09-10T10:26:28.781Z"
+        },
+        "energySavingSupport": {
+          "value": false,
+          "timestamp": "2021-12-29T07:29:17.526Z"
+        },
+        "drMaxDuration": {
+          "value": null
+        },
+        "energySavingLevel": {
+          "value": null
+        },
+        "energySavingInfo": {
+          "value": null
+        },
+        "supportedEnergySavingLevels": {
+          "value": null
+        },
+        "energySavingOperation": {
+          "value": null
+        },
+        "notificationTemplateID": {
+          "value": null
+        },
+        "energySavingOperationSupport": {
+          "value": null
+        }
+      },
+      "samsungce.softwareUpdate": {
+        "targetModule": {
+          "value": null
+        },
+        "otnDUID": {
+          "value": "43CEZFTFFL7Z2",
+          "timestamp": "2025-02-08T00:44:53.855Z"
+        },
+        "lastUpdatedDate": {
+          "value": null
+        },
+        "availableModules": {
+          "value": [],
+          "timestamp": "2025-02-08T00:44:53.855Z"
+        },
+        "newVersionAvailable": {
+          "value": false,
+          "timestamp": "2025-02-08T00:44:53.855Z"
+        },
+        "operatingState": {
+          "value": null
+        },
+        "progress": {
+          "value": null
+        }
+      },
+      "veryFineDustSensor": {
+        "veryFineDustLevel": {
+          "value": null,
+          "unit": "\u03bcg/m^3",
+          "timestamp": "2021-04-06T16:43:35.363Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/da_ac_rac_01001.json b/tests/components/smartthings/fixtures/device_status/da_ac_rac_01001.json
new file mode 100644
index 00000000000..e8e71c53ace
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/da_ac_rac_01001.json
@@ -0,0 +1,731 @@
+{
+  "components": {
+    "main": {
+      "samsungce.unavailableCapabilities": {
+        "unavailableCommands": {
+          "value": ["custom.spiMode.setSpiMode"],
+          "timestamp": "2025-02-09T05:44:01.769Z"
+        }
+      },
+      "relativeHumidityMeasurement": {
+        "humidity": {
+          "value": 42,
+          "unit": "%",
+          "timestamp": "2025-02-09T17:02:45.042Z"
+        }
+      },
+      "custom.thermostatSetpointControl": {
+        "minimumSetpoint": {
+          "value": 16,
+          "unit": "C",
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "maximumSetpoint": {
+          "value": 30,
+          "unit": "C",
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        }
+      },
+      "airConditionerMode": {
+        "availableAcModes": {
+          "value": [],
+          "timestamp": "2025-02-09T14:35:56.800Z"
+        },
+        "supportedAcModes": {
+          "value": ["auto", "cool", "dry", "wind", "heat", "dryClean"],
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "airConditionerMode": {
+          "value": "cool",
+          "timestamp": "2025-02-09T04:52:00.923Z"
+        }
+      },
+      "custom.spiMode": {
+        "spiMode": {
+          "value": null
+        }
+      },
+      "custom.airConditionerOptionalMode": {
+        "supportedAcOptionalMode": {
+          "value": [
+            "off",
+            "sleep",
+            "quiet",
+            "smart",
+            "speed",
+            "windFree",
+            "windFreeSleep"
+          ],
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "acOptionalMode": {
+          "value": "off",
+          "timestamp": "2025-02-09T05:44:01.853Z"
+        }
+      },
+      "samsungce.airConditionerBeep": {
+        "beep": {
+          "value": "off",
+          "timestamp": "2025-02-09T04:52:00.923Z"
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": null
+        },
+        "mndt": {
+          "value": null
+        },
+        "mnfv": {
+          "value": "ARA-WW-TP1-22-COMMON_11240702",
+          "timestamp": "2025-02-09T15:42:12.723Z"
+        },
+        "mnhw": {
+          "value": "Realtek",
+          "timestamp": "2025-02-09T15:42:12.723Z"
+        },
+        "di": {
+          "value": "4ece486b-89db-f06a-d54d-748b676b4d8e",
+          "timestamp": "2025-02-09T15:42:12.714Z"
+        },
+        "mnsl": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2025-02-09T15:42:12.723Z"
+        },
+        "dmv": {
+          "value": "res.1.1.0,sh.1.1.0",
+          "timestamp": "2025-02-09T15:42:12.714Z"
+        },
+        "n": {
+          "value": "Samsung-Room-Air-Conditioner",
+          "timestamp": "2025-02-09T15:42:12.714Z"
+        },
+        "mnmo": {
+          "value": "ARA-WW-TP1-22-COMMON|10229641|60010523001511014600083200800000",
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "vid": {
+          "value": "DA-AC-RAC-01001",
+          "timestamp": "2025-02-09T15:42:12.723Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2025-02-09T15:42:12.723Z"
+        },
+        "mnml": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2025-02-09T15:42:12.723Z"
+        },
+        "mnpv": {
+          "value": "DAWIT 2.0",
+          "timestamp": "2025-02-09T15:42:12.723Z"
+        },
+        "mnos": {
+          "value": "TizenRT 3.1",
+          "timestamp": "2025-02-09T15:42:12.723Z"
+        },
+        "pi": {
+          "value": "4ece486b-89db-f06a-d54d-748b676b4d8e",
+          "timestamp": "2025-02-09T15:42:12.723Z"
+        },
+        "icv": {
+          "value": "core.1.1.0",
+          "timestamp": "2025-02-09T15:42:12.714Z"
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": [
+            "custom.deodorFilter",
+            "custom.electricHepaFilter",
+            "custom.periodicSensing",
+            "custom.doNotDisturbMode",
+            "samsungce.deviceInfoPrivate",
+            "samsungce.quickControl",
+            "samsungce.welcomeCooling",
+            "samsungce.airConditionerBeep",
+            "samsungce.airConditionerLighting",
+            "samsungce.individualControlLock",
+            "samsungce.alwaysOnSensing",
+            "samsungce.buttonDisplayCondition",
+            "airQualitySensor",
+            "dustSensor",
+            "odorSensor",
+            "veryFineDustSensor",
+            "custom.spiMode",
+            "audioNotification"
+          ],
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        }
+      },
+      "samsungce.driverVersion": {
+        "versionNumber": {
+          "value": 24100102,
+          "timestamp": "2025-01-28T21:31:35.935Z"
+        }
+      },
+      "sec.diagnosticsInformation": {
+        "logType": {
+          "value": ["errCode", "dump"],
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "endpoint": {
+          "value": "SSM",
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "minVersion": {
+          "value": "1.0",
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "signinPermission": {
+          "value": null
+        },
+        "setupId": {
+          "value": "010",
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "protocolType": {
+          "value": "wifi_https",
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "tsId": {
+          "value": "DA01",
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "mnId": {
+          "value": "0AJT",
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "dumpType": {
+          "value": "file",
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        }
+      },
+      "fanOscillationMode": {
+        "supportedFanOscillationModes": {
+          "value": ["fixed", "vertical", "horizontal", "all"],
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "availableFanOscillationModes": {
+          "value": null
+        },
+        "fanOscillationMode": {
+          "value": "fixed",
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        }
+      },
+      "custom.periodicSensing": {
+        "automaticExecutionSetting": {
+          "value": null
+        },
+        "automaticExecutionMode": {
+          "value": null
+        },
+        "supportedAutomaticExecutionSetting": {
+          "value": null
+        },
+        "supportedAutomaticExecutionMode": {
+          "value": null
+        },
+        "periodicSensing": {
+          "value": null
+        },
+        "periodicSensingInterval": {
+          "value": null
+        },
+        "lastSensingTime": {
+          "value": null
+        },
+        "lastSensingLevel": {
+          "value": null
+        },
+        "periodicSensingStatus": {
+          "value": null
+        }
+      },
+      "demandResponseLoadControl": {
+        "drlcStatus": {
+          "value": {
+            "drlcType": 1,
+            "drlcLevel": 0,
+            "start": "1970-01-01T00:00:00Z",
+            "duration": 0,
+            "override": false
+          },
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        }
+      },
+      "audioVolume": {
+        "volume": {
+          "value": 0,
+          "unit": "%",
+          "timestamp": "2025-02-09T04:52:00.923Z"
+        }
+      },
+      "powerConsumptionReport": {
+        "powerConsumption": {
+          "value": {
+            "energy": 13836,
+            "deltaEnergy": 0,
+            "power": 0,
+            "powerEnergy": 0.0,
+            "persistedEnergy": 13836,
+            "energySaved": 0,
+            "persistedSavedEnergy": 0,
+            "start": "2025-02-09T16:08:15Z",
+            "end": "2025-02-09T17:02:44Z"
+          },
+          "timestamp": "2025-02-09T17:02:44.883Z"
+        }
+      },
+      "custom.autoCleaningMode": {
+        "supportedAutoCleaningModes": {
+          "value": null
+        },
+        "timedCleanDuration": {
+          "value": null
+        },
+        "operatingState": {
+          "value": null
+        },
+        "timedCleanDurationRange": {
+          "value": null
+        },
+        "supportedOperatingStates": {
+          "value": null
+        },
+        "progress": {
+          "value": null
+        },
+        "autoCleaningMode": {
+          "value": "on",
+          "timestamp": "2025-02-09T05:44:02.014Z"
+        }
+      },
+      "samsungce.individualControlLock": {
+        "lockState": {
+          "value": null
+        }
+      },
+      "audioNotification": {},
+      "execute": {
+        "data": {
+          "value": null
+        }
+      },
+      "samsungce.welcomeCooling": {
+        "latestRequestId": {
+          "value": null
+        },
+        "operatingState": {
+          "value": null
+        }
+      },
+      "sec.wifiConfiguration": {
+        "autoReconnection": {
+          "value": true,
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "minVersion": {
+          "value": "1.0",
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "supportedWiFiFreq": {
+          "value": ["2.4G"],
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "supportedAuthType": {
+          "value": ["OPEN", "WEP", "WPA-PSK", "WPA2-PSK", "SAE"],
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "protocolType": {
+          "value": ["helper_hotspot", "ble_ocf"],
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        }
+      },
+      "samsungce.selfCheck": {
+        "result": {
+          "value": null
+        },
+        "supportedActions": {
+          "value": ["start", "cancel"],
+          "timestamp": "2025-02-09T04:52:00.923Z"
+        },
+        "progress": {
+          "value": 1,
+          "unit": "%",
+          "timestamp": "2025-02-09T04:52:00.923Z"
+        },
+        "errors": {
+          "value": [],
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "status": {
+          "value": "ready",
+          "timestamp": "2025-02-09T04:52:00.923Z"
+        }
+      },
+      "custom.dustFilter": {
+        "dustFilterUsageStep": {
+          "value": 1,
+          "timestamp": "2025-02-09T12:00:10.310Z"
+        },
+        "dustFilterUsage": {
+          "value": 12,
+          "timestamp": "2025-02-09T12:00:10.310Z"
+        },
+        "dustFilterLastResetDate": {
+          "value": null
+        },
+        "dustFilterStatus": {
+          "value": "normal",
+          "timestamp": "2025-02-09T12:00:10.310Z"
+        },
+        "dustFilterCapacity": {
+          "value": 500,
+          "unit": "Hour",
+          "timestamp": "2025-02-09T12:00:10.310Z"
+        },
+        "dustFilterResetType": {
+          "value": ["replaceable", "washable"],
+          "timestamp": "2025-02-09T12:00:10.310Z"
+        }
+      },
+      "custom.energyType": {
+        "energyType": {
+          "value": "1.0",
+          "timestamp": "2025-01-28T21:31:39.517Z"
+        },
+        "energySavingSupport": {
+          "value": true,
+          "timestamp": "2025-01-28T21:38:35.560Z"
+        },
+        "drMaxDuration": {
+          "value": 99999999,
+          "unit": "min",
+          "timestamp": "2025-01-28T21:31:37.357Z"
+        },
+        "energySavingLevel": {
+          "value": null
+        },
+        "energySavingInfo": {
+          "value": null
+        },
+        "supportedEnergySavingLevels": {
+          "value": null
+        },
+        "energySavingOperation": {
+          "value": false,
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "notificationTemplateID": {
+          "value": null
+        },
+        "energySavingOperationSupport": {
+          "value": true,
+          "timestamp": "2025-01-28T21:38:35.731Z"
+        }
+      },
+      "bypassable": {
+        "bypassStatus": {
+          "value": "bypassed",
+          "timestamp": "2025-01-28T21:31:35.935Z"
+        }
+      },
+      "samsungce.airQualityHealthConcern": {
+        "supportedAirQualityHealthConcerns": {
+          "value": null
+        },
+        "airQualityHealthConcern": {
+          "value": null
+        }
+      },
+      "samsungce.softwareUpdate": {
+        "targetModule": {
+          "value": {},
+          "timestamp": "2025-02-05T20:07:11.459Z"
+        },
+        "otnDUID": {
+          "value": "U7CB2ZD4QPDUC",
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "lastUpdatedDate": {
+          "value": null
+        },
+        "availableModules": {
+          "value": [],
+          "timestamp": "2025-01-28T21:31:38.089Z"
+        },
+        "newVersionAvailable": {
+          "value": false,
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "operatingState": {
+          "value": "none",
+          "timestamp": "2025-02-05T20:07:11.459Z"
+        },
+        "progress": {
+          "value": null
+        }
+      },
+      "veryFineDustSensor": {
+        "veryFineDustLevel": {
+          "value": null
+        }
+      },
+      "custom.veryFineDustFilter": {
+        "veryFineDustFilterStatus": {
+          "value": null
+        },
+        "veryFineDustFilterResetType": {
+          "value": null
+        },
+        "veryFineDustFilterUsage": {
+          "value": null
+        },
+        "veryFineDustFilterLastResetDate": {
+          "value": null
+        },
+        "veryFineDustFilterUsageStep": {
+          "value": null
+        },
+        "veryFineDustFilterCapacity": {
+          "value": null
+        }
+      },
+      "samsungce.silentAction": {},
+      "custom.airConditionerOdorController": {
+        "airConditionerOdorControllerProgress": {
+          "value": 0,
+          "timestamp": "2025-02-09T04:52:00.923Z"
+        },
+        "airConditionerOdorControllerState": {
+          "value": "off",
+          "timestamp": "2025-02-09T04:52:00.923Z"
+        }
+      },
+      "samsungce.deviceIdentification": {
+        "micomAssayCode": {
+          "value": null
+        },
+        "modelName": {
+          "value": null
+        },
+        "serialNumber": {
+          "value": null
+        },
+        "serialNumberExtra": {
+          "value": null
+        },
+        "modelClassificationCode": {
+          "value": null
+        },
+        "description": {
+          "value": null
+        },
+        "releaseYear": {
+          "value": 21,
+          "timestamp": "2025-01-28T21:31:35.935Z"
+        },
+        "binaryId": {
+          "value": "ARA-WW-TP1-22-COMMON",
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        }
+      },
+      "airQualitySensor": {
+        "airQuality": {
+          "value": null
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        }
+      },
+      "samsungce.quickControl": {
+        "version": {
+          "value": null
+        }
+      },
+      "custom.airConditionerTropicalNightMode": {
+        "acTropicalNightModeLevel": {
+          "value": 6,
+          "timestamp": "2025-02-09T04:52:00.923Z"
+        }
+      },
+      "airConditionerFanMode": {
+        "fanMode": {
+          "value": "high",
+          "timestamp": "2025-02-09T14:07:45.816Z"
+        },
+        "supportedAcFanModes": {
+          "value": ["auto", "low", "medium", "high", "turbo"],
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "availableAcFanModes": {
+          "value": ["auto", "low", "medium", "high", "turbo"],
+          "timestamp": "2025-02-09T05:44:01.769Z"
+        }
+      },
+      "samsungce.dustFilterAlarm": {
+        "alarmThreshold": {
+          "value": 500,
+          "unit": "Hour",
+          "timestamp": "2025-02-09T12:00:10.310Z"
+        },
+        "supportedAlarmThresholds": {
+          "value": [180, 300, 500, 700],
+          "unit": "Hour",
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        }
+      },
+      "custom.electricHepaFilter": {
+        "electricHepaFilterCapacity": {
+          "value": null
+        },
+        "electricHepaFilterUsageStep": {
+          "value": null
+        },
+        "electricHepaFilterLastResetDate": {
+          "value": null
+        },
+        "electricHepaFilterStatus": {
+          "value": null
+        },
+        "electricHepaFilterUsage": {
+          "value": null
+        },
+        "electricHepaFilterResetType": {
+          "value": null
+        }
+      },
+      "samsungce.airConditionerLighting": {
+        "supportedLightingLevels": {
+          "value": ["on", "off"],
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "lighting": {
+          "value": "on",
+          "timestamp": "2025-02-09T09:30:03.213Z"
+        }
+      },
+      "samsungce.buttonDisplayCondition": {
+        "switch": {
+          "value": "enabled",
+          "timestamp": "2025-02-09T05:17:41.282Z"
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 27,
+          "unit": "C",
+          "timestamp": "2025-02-09T16:38:17.028Z"
+        }
+      },
+      "dustSensor": {
+        "dustLevel": {
+          "value": null
+        },
+        "fineDustLevel": {
+          "value": null
+        }
+      },
+      "sec.calmConnectionCare": {
+        "role": {
+          "value": ["things"],
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "protocols": {
+          "value": null
+        },
+        "version": {
+          "value": "1.0",
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        }
+      },
+      "custom.deviceReportStateConfiguration": {
+        "reportStateRealtimePeriod": {
+          "value": "disabled",
+          "timestamp": "2025-02-09T05:17:39.792Z"
+        },
+        "reportStateRealtime": {
+          "value": {
+            "state": "disabled"
+          },
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "reportStatePeriod": {
+          "value": "enabled",
+          "timestamp": "2025-02-09T05:17:39.792Z"
+        }
+      },
+      "thermostatCoolingSetpoint": {
+        "coolingSetpointRange": {
+          "value": {
+            "minimum": 16,
+            "maximum": 30,
+            "step": 1
+          },
+          "unit": "C",
+          "timestamp": "2025-02-09T05:17:41.533Z"
+        },
+        "coolingSetpoint": {
+          "value": 23,
+          "unit": "C",
+          "timestamp": "2025-02-09T14:07:45.643Z"
+        }
+      },
+      "samsungce.alwaysOnSensing": {
+        "origins": {
+          "value": [],
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        },
+        "alwaysOn": {
+          "value": "off",
+          "timestamp": "2025-02-09T15:42:13.444Z"
+        }
+      },
+      "refresh": {},
+      "odorSensor": {
+        "odorLevel": {
+          "value": null
+        }
+      },
+      "custom.deodorFilter": {
+        "deodorFilterCapacity": {
+          "value": null
+        },
+        "deodorFilterLastResetDate": {
+          "value": null
+        },
+        "deodorFilterStatus": {
+          "value": null
+        },
+        "deodorFilterResetType": {
+          "value": null
+        },
+        "deodorFilterUsage": {
+          "value": null
+        },
+        "deodorFilterUsageStep": {
+          "value": null
+        }
+      },
+      "custom.doNotDisturbMode": {
+        "doNotDisturb": {
+          "value": null
+        },
+        "startTime": {
+          "value": null
+        },
+        "endTime": {
+          "value": null
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/da_ac_rac_100001.json b/tests/components/smartthings/fixtures/device_status/da_ac_rac_100001.json
new file mode 100644
index 00000000000..5c062d904bb
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/da_ac_rac_100001.json
@@ -0,0 +1,171 @@
+{
+  "components": {
+    "main": {
+      "refresh": {},
+      "custom.thermostatSetpointControl": {
+        "minimumSetpoint": {
+          "value": 16,
+          "timestamp": "2024-11-25T22:17:38.251Z"
+        },
+        "maximumSetpoint": {
+          "value": 30,
+          "timestamp": "2024-11-25T22:17:38.251Z"
+        }
+      },
+      "airConditionerMode": {
+        "availableAcModes": {
+          "value": null
+        },
+        "supportedAcModes": {
+          "value": ["cool", "dry", "wind", "auto"],
+          "timestamp": "2025-03-02T10:16:19.519Z"
+        },
+        "airConditionerMode": {
+          "value": "cool",
+          "timestamp": "2025-03-02T10:16:19.519Z"
+        }
+      },
+      "execute": {
+        "data": {
+          "value": null
+        }
+      },
+      "airQualitySensor": {
+        "airQuality": {
+          "value": null
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-03-02T06:54:52.852Z"
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": null
+        },
+        "mndt": {
+          "value": null
+        },
+        "mnfv": {
+          "value": null
+        },
+        "mnhw": {
+          "value": null
+        },
+        "di": {
+          "value": "F8042E25-0E53-0000-0000-000000000000",
+          "timestamp": "2025-02-28T21:15:28.920Z"
+        },
+        "mnsl": {
+          "value": null
+        },
+        "dmv": {
+          "value": "res.1.1.0,sh.1.1.0",
+          "timestamp": "2025-02-28T21:15:28.920Z"
+        },
+        "n": {
+          "value": "Room A/C",
+          "timestamp": "2025-02-28T21:15:28.920Z"
+        },
+        "mnmo": {
+          "value": "TP6X_RAC_15K",
+          "timestamp": "2025-02-28T21:15:28.920Z"
+        },
+        "vid": {
+          "value": "DA-AC-RAC-100001",
+          "timestamp": "2025-02-28T21:15:28.920Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2025-02-28T21:15:28.920Z"
+        },
+        "mnml": {
+          "value": null
+        },
+        "mnpv": {
+          "value": null
+        },
+        "mnos": {
+          "value": null
+        },
+        "pi": {
+          "value": "shp",
+          "timestamp": "2025-02-28T21:15:28.920Z"
+        },
+        "icv": {
+          "value": "core.1.1.0",
+          "timestamp": "2025-02-28T21:15:28.920Z"
+        }
+      },
+      "odorSensor": {
+        "odorLevel": {
+          "value": null
+        }
+      },
+      "airConditionerFanMode": {
+        "fanMode": {
+          "value": "auto",
+          "timestamp": "2025-02-28T21:15:28.941Z"
+        },
+        "supportedAcFanModes": {
+          "value": ["auto", "low", "medium", "high", "turbo"],
+          "timestamp": "2025-02-28T21:15:28.941Z"
+        },
+        "availableAcFanModes": {
+          "value": null
+        }
+      },
+      "samsungce.driverState": {
+        "driverState": {
+          "value": null
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": ["odorSensor"],
+          "timestamp": "2024-11-25T22:17:38.251Z"
+        }
+      },
+      "samsungce.driverVersion": {
+        "versionNumber": {
+          "value": 22090101,
+          "timestamp": "2024-11-25T22:17:38.251Z"
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 27,
+          "unit": "C",
+          "timestamp": "2025-03-02T08:28:39.409Z"
+        }
+      },
+      "dustSensor": {
+        "dustLevel": {
+          "value": 46,
+          "unit": "\u03bcg/m^3",
+          "timestamp": "2025-03-06T16:01:49.656000+00:00"
+        },
+        "fineDustLevel": {
+          "value": 10,
+          "unit": "\u03bcg/m^3",
+          "timestamp": "2025-03-06T16:01:49.656000+00:00"
+        }
+      },
+      "thermostatCoolingSetpoint": {
+        "coolingSetpointRange": {
+          "value": null
+        },
+        "coolingSetpoint": {
+          "value": 18,
+          "unit": "C",
+          "timestamp": "2025-03-02T06:54:23.887Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/da_ks_cooktop_31001.json b/tests/components/smartthings/fixtures/device_status/da_ks_cooktop_31001.json
new file mode 100644
index 00000000000..5ca8f56fbbf
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/da_ks_cooktop_31001.json
@@ -0,0 +1,508 @@
+{
+  "components": {
+    "burner-02": {
+      "samsungce.surfaceResidualHeat": {
+        "surfaceResidualHeat": {
+          "value": "normal",
+          "timestamp": "2025-03-25T18:18:28.550Z"
+        }
+      },
+      "samsungce.cooktopHeatingPower": {
+        "manualLevel": {
+          "value": 0,
+          "timestamp": "2025-03-26T05:57:23.203Z"
+        },
+        "heatingMode": {
+          "value": "manual",
+          "timestamp": "2025-03-25T18:18:28.550Z"
+        },
+        "manualLevelMin": {
+          "value": 0,
+          "timestamp": "2025-03-25T18:18:28.550Z"
+        },
+        "supportedHeatingModes": {
+          "value": ["manual", "boost", "keepWarm"],
+          "timestamp": "2025-03-25T18:18:28.550Z"
+        },
+        "manualLevelMax": {
+          "value": 15,
+          "timestamp": "2025-03-25T18:18:28.550Z"
+        }
+      },
+      "samsungce.countDownTimer": {
+        "startValue": {
+          "value": 0,
+          "unit": "min",
+          "timestamp": "2025-03-25T18:18:28.550Z"
+        },
+        "currentValue": {
+          "value": 0,
+          "unit": "min",
+          "timestamp": "2025-03-25T18:18:28.550Z"
+        },
+        "status": {
+          "value": "idle",
+          "timestamp": "2025-03-25T18:18:28.550Z"
+        }
+      }
+    },
+    "burner-01": {
+      "samsungce.surfaceResidualHeat": {
+        "surfaceResidualHeat": {
+          "value": "normal",
+          "timestamp": "2025-03-25T18:18:28.518Z"
+        }
+      },
+      "samsungce.cooktopHeatingPower": {
+        "manualLevel": {
+          "value": 0,
+          "timestamp": "2025-03-26T05:57:23.203Z"
+        },
+        "heatingMode": {
+          "value": "manual",
+          "timestamp": "2025-03-25T18:18:28.518Z"
+        },
+        "manualLevelMin": {
+          "value": 0,
+          "timestamp": "2025-03-25T18:18:28.518Z"
+        },
+        "supportedHeatingModes": {
+          "value": ["manual", "boost", "keepWarm"],
+          "timestamp": "2025-03-25T18:18:28.518Z"
+        },
+        "manualLevelMax": {
+          "value": 15,
+          "timestamp": "2025-03-25T18:18:28.518Z"
+        }
+      },
+      "samsungce.countDownTimer": {
+        "startValue": {
+          "value": 0,
+          "unit": "min",
+          "timestamp": "2025-03-25T18:18:28.518Z"
+        },
+        "currentValue": {
+          "value": 0,
+          "unit": "min",
+          "timestamp": "2025-03-25T18:18:28.518Z"
+        },
+        "status": {
+          "value": "idle",
+          "timestamp": "2025-03-25T18:18:28.518Z"
+        }
+      }
+    },
+    "main": {
+      "custom.disabledComponents": {
+        "disabledComponents": {
+          "value": ["burner-6"],
+          "timestamp": "2025-03-25T18:18:28.464Z"
+        }
+      },
+      "custom.userNotification": {
+        "message": {
+          "value": null
+        }
+      },
+      "samsungce.remoteManagementData": {
+        "reportRawData": {
+          "value": "AgUBASCgAwAACaEDAAAM4AQAAAAA4QHwAw==",
+          "timestamp": "2025-03-26T07:27:58.282Z"
+        },
+        "version": {
+          "value": "CT-31.0001",
+          "timestamp": "2025-03-25T18:18:28.476Z"
+        }
+      },
+      "samsungce.deviceIdentification": {
+        "micomAssayCode": {
+          "value": "5828",
+          "timestamp": "2025-03-25T18:18:28.476Z"
+        },
+        "modelName": {
+          "value": "NZ64B5046GK",
+          "timestamp": "2025-03-25T18:18:28.476Z"
+        },
+        "serialNumber": {
+          "value": "B8C878DX900290H",
+          "timestamp": "2025-03-25T18:18:28.476Z"
+        },
+        "serialNumberExtra": {
+          "value": "N/A",
+          "timestamp": "2025-03-25T18:18:28.476Z"
+        },
+        "modelClassificationCode": {
+          "value": "50000204001611000E00000000000000",
+          "timestamp": "2025-03-25T18:18:28.476Z"
+        },
+        "description": {
+          "value": "N/A",
+          "timestamp": "2025-03-25T18:18:28.476Z"
+        },
+        "releaseYear": {
+          "value": null
+        },
+        "binaryId": {
+          "value": "TP2X_DA-KS-COOKTOP-31001",
+          "timestamp": "2025-03-25T18:18:28.476Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-03-26T07:27:58.478Z"
+        }
+      },
+      "samsungce.errorAndAlarmState": {
+        "events": {
+          "value": [],
+          "timestamp": "2025-03-25T18:18:28.476Z"
+        }
+      },
+      "samsungce.cooktopFlexZone": {
+        "flexZones": {
+          "value": [],
+          "timestamp": "2025-03-26T05:57:23.671Z"
+        }
+      },
+      "samsungce.softwareVersion": {
+        "versions": {
+          "value": [
+            {
+              "id": "Wifi",
+              "swType": "Wifi-Application",
+              "versionNumber": "80001A220811",
+              "description": "Aug 11 2022 08:38:36, Wifi:ws029_030, STDK : 1.7.4)"
+            },
+            {
+              "id": "Micom",
+              "swType": "Micom Software",
+              "versionNumber": "240617",
+              "description": "Description for this micom version"
+            }
+          ],
+          "timestamp": "2025-03-25T18:18:28.482Z"
+        }
+      },
+      "healthCheck": {
+        "checkInterval": {
+          "value": null
+        },
+        "healthStatus": {
+          "value": null
+        },
+        "DeviceWatch-Enroll": {
+          "value": null
+        },
+        "DeviceWatch-DeviceStatus": {
+          "value": null
+        }
+      },
+      "custom.cooktopOperatingState": {
+        "supportedCooktopOperatingState": {
+          "value": ["ready", "run", "paused"],
+          "timestamp": "2025-03-26T07:26:39.690Z"
+        },
+        "cooktopOperatingState": {
+          "value": "ready",
+          "timestamp": "2025-03-26T07:27:58.652Z"
+        }
+      },
+      "samsungce.kitchenDeviceIdentification": {
+        "regionCode": {
+          "value": "EU",
+          "timestamp": "2025-03-25T18:18:28.501Z"
+        },
+        "modelCode": {
+          "value": "OZ8500B/EU2",
+          "timestamp": "2025-03-25T18:18:28.501Z"
+        },
+        "fuel": {
+          "value": null
+        },
+        "type": {
+          "value": "cooktop",
+          "timestamp": "2025-03-25T18:18:28.501Z"
+        },
+        "representativeComponent": {
+          "value": null
+        }
+      },
+      "samsungce.softwareUpdate": {
+        "targetModule": {
+          "value": null
+        },
+        "otnDUID": {
+          "value": "JHCB2ZD4E2KRY",
+          "timestamp": "2025-03-25T18:18:28.482Z"
+        },
+        "lastUpdatedDate": {
+          "value": null
+        },
+        "availableModules": {
+          "value": [],
+          "timestamp": "2025-03-25T18:18:28.501Z"
+        },
+        "newVersionAvailable": {
+          "value": false,
+          "timestamp": "2025-03-25T18:18:28.501Z"
+        },
+        "operatingState": {
+          "value": null
+        },
+        "progress": {
+          "value": null
+        }
+      },
+      "samsungce.kidsLockControl": {
+        "lockState": {
+          "value": "unlocked",
+          "timestamp": "2025-03-25T18:18:28.476Z"
+        }
+      },
+      "audioMute": {
+        "mute": {
+          "value": "unmuted",
+          "timestamp": "2025-03-25T18:18:28.464Z"
+        }
+      }
+    },
+    "burner-06": {
+      "samsungce.surfaceResidualHeat": {
+        "surfaceResidualHeat": {
+          "value": "normal",
+          "timestamp": "2025-03-25T18:18:28.591Z"
+        }
+      },
+      "samsungce.cooktopHeatingPower": {
+        "manualLevel": {
+          "value": 0,
+          "timestamp": "2025-03-25T18:18:28.591Z"
+        },
+        "heatingMode": {
+          "value": "manual",
+          "timestamp": "2025-03-25T18:18:28.591Z"
+        },
+        "manualLevelMin": {
+          "value": 0,
+          "timestamp": "2025-03-25T18:18:28.591Z"
+        },
+        "supportedHeatingModes": {
+          "value": ["manual", "boost", "keepWarm"],
+          "timestamp": "2025-03-25T18:18:28.591Z"
+        },
+        "manualLevelMax": {
+          "value": 15,
+          "timestamp": "2025-03-25T18:18:28.591Z"
+        }
+      },
+      "samsungce.countDownTimer": {
+        "startValue": {
+          "value": 0,
+          "unit": "min",
+          "timestamp": "2025-03-25T18:18:28.591Z"
+        },
+        "currentValue": {
+          "value": 0,
+          "unit": "min",
+          "timestamp": "2025-03-25T18:18:28.591Z"
+        },
+        "status": {
+          "value": null
+        }
+      }
+    },
+    "hood": {
+      "samsungce.connectionState": {
+        "connectionState": {
+          "value": "disconnected",
+          "timestamp": "2025-03-25T18:18:28.650Z"
+        }
+      },
+      "samsungce.hoodFanSpeed": {
+        "settableMaxFanSpeed": {
+          "value": 5,
+          "timestamp": "2025-03-25T18:18:28.650Z"
+        },
+        "hoodFanSpeed": {
+          "value": 0,
+          "timestamp": "2025-03-25T18:18:28.650Z"
+        },
+        "supportedHoodFanSpeed": {
+          "value": [1, 2, 3, 4, 5],
+          "timestamp": "2025-03-25T18:18:28.650Z"
+        },
+        "settableMinFanSpeed": {
+          "value": 0,
+          "timestamp": "2025-03-25T18:18:28.650Z"
+        }
+      },
+      "samsungce.countDownTimer": {
+        "startValue": {
+          "value": 0,
+          "unit": "min",
+          "timestamp": "2025-03-25T18:18:28.650Z"
+        },
+        "currentValue": {
+          "value": 0,
+          "unit": "min",
+          "timestamp": "2025-03-25T18:18:28.646Z"
+        },
+        "status": {
+          "value": null
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": null
+        }
+      },
+      "samsungce.lamp": {
+        "brightnessLevel": {
+          "value": null
+        },
+        "supportedBrightnessLevel": {
+          "value": ["off", "mid"],
+          "timestamp": "2025-03-25T18:18:28.650Z"
+        }
+      }
+    },
+    "burner-05": {
+      "samsungce.surfaceResidualHeat": {
+        "surfaceResidualHeat": {
+          "value": "normal",
+          "timestamp": "2025-03-25T18:18:28.586Z"
+        }
+      },
+      "samsungce.cooktopHeatingPower": {
+        "manualLevel": {
+          "value": 0,
+          "timestamp": "2025-03-25T18:18:28.586Z"
+        },
+        "heatingMode": {
+          "value": "manual",
+          "timestamp": "2025-03-25T18:18:28.586Z"
+        },
+        "manualLevelMin": {
+          "value": 0,
+          "timestamp": "2025-03-25T18:18:28.586Z"
+        },
+        "supportedHeatingModes": {
+          "value": ["manual", "boost", "keepWarm"],
+          "timestamp": "2025-03-25T18:18:28.586Z"
+        },
+        "manualLevelMax": {
+          "value": 15,
+          "timestamp": "2025-03-25T18:18:28.586Z"
+        }
+      },
+      "samsungce.countDownTimer": {
+        "startValue": {
+          "value": 0,
+          "unit": "min",
+          "timestamp": "2025-03-25T18:18:28.586Z"
+        },
+        "currentValue": {
+          "value": 0,
+          "unit": "min",
+          "timestamp": "2025-03-25T18:18:28.591Z"
+        },
+        "status": {
+          "value": null
+        }
+      }
+    },
+    "burner-04": {
+      "samsungce.surfaceResidualHeat": {
+        "surfaceResidualHeat": {
+          "value": "normal",
+          "timestamp": "2025-03-25T18:18:28.578Z"
+        }
+      },
+      "samsungce.cooktopHeatingPower": {
+        "manualLevel": {
+          "value": 0,
+          "timestamp": "2025-03-25T18:49:25.153Z"
+        },
+        "heatingMode": {
+          "value": "manual",
+          "timestamp": "2025-03-25T18:18:28.578Z"
+        },
+        "manualLevelMin": {
+          "value": 0,
+          "timestamp": "2025-03-25T18:18:28.578Z"
+        },
+        "supportedHeatingModes": {
+          "value": ["manual", "boost", "keepWarm"],
+          "timestamp": "2025-03-25T18:18:28.578Z"
+        },
+        "manualLevelMax": {
+          "value": 15,
+          "timestamp": "2025-03-25T18:18:28.578Z"
+        }
+      },
+      "samsungce.countDownTimer": {
+        "startValue": {
+          "value": 0,
+          "unit": "min",
+          "timestamp": "2025-03-25T18:18:28.586Z"
+        },
+        "currentValue": {
+          "value": 0,
+          "unit": "min",
+          "timestamp": "2025-03-25T18:18:28.586Z"
+        },
+        "status": {
+          "value": "idle",
+          "timestamp": "2025-03-25T18:18:28.578Z"
+        }
+      }
+    },
+    "burner-03": {
+      "samsungce.surfaceResidualHeat": {
+        "surfaceResidualHeat": {
+          "value": "normal",
+          "timestamp": "2025-03-25T18:18:28.550Z"
+        }
+      },
+      "samsungce.cooktopHeatingPower": {
+        "manualLevel": {
+          "value": 0,
+          "timestamp": "2025-03-26T07:27:58.652Z"
+        },
+        "heatingMode": {
+          "value": "manual",
+          "timestamp": "2025-03-25T18:18:28.550Z"
+        },
+        "manualLevelMin": {
+          "value": 0,
+          "timestamp": "2025-03-25T18:18:28.550Z"
+        },
+        "supportedHeatingModes": {
+          "value": ["manual", "boost", "keepWarm"],
+          "timestamp": "2025-03-25T18:18:28.550Z"
+        },
+        "manualLevelMax": {
+          "value": 15,
+          "timestamp": "2025-03-25T18:18:28.550Z"
+        }
+      },
+      "samsungce.countDownTimer": {
+        "startValue": {
+          "value": 0,
+          "unit": "min",
+          "timestamp": "2025-03-25T18:18:28.550Z"
+        },
+        "currentValue": {
+          "value": 0,
+          "unit": "min",
+          "timestamp": "2025-03-25T18:18:28.550Z"
+        },
+        "status": {
+          "value": "idle",
+          "timestamp": "2025-03-25T18:18:28.550Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/da_ks_microwave_0101x.json b/tests/components/smartthings/fixtures/device_status/da_ks_microwave_0101x.json
new file mode 100644
index 00000000000..181b62666c7
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/da_ks_microwave_0101x.json
@@ -0,0 +1,600 @@
+{
+  "components": {
+    "main": {
+      "doorControl": {
+        "door": {
+          "value": null
+        }
+      },
+      "samsungce.kitchenDeviceDefaults": {
+        "defaultOperationTime": {
+          "value": 30,
+          "timestamp": "2022-03-23T15:59:12.609Z"
+        },
+        "defaultOvenMode": {
+          "value": "MicroWave",
+          "timestamp": "2025-02-08T21:13:36.289Z"
+        },
+        "defaultOvenSetpoint": {
+          "value": null
+        }
+      },
+      "samsungce.deviceIdentification": {
+        "micomAssayCode": {
+          "value": null
+        },
+        "modelName": {
+          "value": null
+        },
+        "serialNumber": {
+          "value": null
+        },
+        "serialNumberExtra": {
+          "value": null
+        },
+        "modelClassificationCode": {
+          "value": null
+        },
+        "description": {
+          "value": null
+        },
+        "releaseYear": {
+          "value": null
+        },
+        "binaryId": {
+          "value": "TP2X_DA-KS-MICROWAVE-0101X",
+          "timestamp": "2025-02-08T21:13:36.256Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-02-09T00:11:12.010Z"
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": null
+        },
+        "mndt": {
+          "value": null
+        },
+        "mnfv": {
+          "value": "AKS-WW-TP2-20-MICROWAVE-OTR_40230125",
+          "timestamp": "2023-07-03T06:44:54.757Z"
+        },
+        "mnhw": {
+          "value": "MediaTek",
+          "timestamp": "2022-03-23T15:59:12.742Z"
+        },
+        "di": {
+          "value": "2bad3237-4886-e699-1b90-4a51a3d55c8a",
+          "timestamp": "2022-03-23T15:59:12.742Z"
+        },
+        "mnsl": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2022-03-23T15:59:12.742Z"
+        },
+        "dmv": {
+          "value": "res.1.1.0,sh.1.1.0",
+          "timestamp": "2023-07-03T22:00:58.832Z"
+        },
+        "n": {
+          "value": "Samsung Microwave",
+          "timestamp": "2023-07-03T06:44:54.757Z"
+        },
+        "mnmo": {
+          "value": "TP2X_DA-KS-MICROWAVE-0101X|40436241|50040100011411000200000000000000",
+          "timestamp": "2023-07-03T06:44:54.757Z"
+        },
+        "vid": {
+          "value": "DA-KS-MICROWAVE-0101X",
+          "timestamp": "2022-03-23T15:59:12.742Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2022-03-23T15:59:12.742Z"
+        },
+        "mnml": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2022-03-23T15:59:12.742Z"
+        },
+        "mnpv": {
+          "value": "DAWIT 3.0",
+          "timestamp": "2023-07-03T06:44:54.757Z"
+        },
+        "mnos": {
+          "value": "TizenRT 2.0 + IPv6",
+          "timestamp": "2023-07-03T06:44:54.757Z"
+        },
+        "pi": {
+          "value": "2bad3237-4886-e699-1b90-4a51a3d55c8a",
+          "timestamp": "2022-03-23T15:59:12.742Z"
+        },
+        "icv": {
+          "value": "core.1.1.0",
+          "timestamp": "2022-03-23T15:59:12.742Z"
+        }
+      },
+      "samsungce.kitchenDeviceIdentification": {
+        "regionCode": {
+          "value": "US",
+          "timestamp": "2025-02-08T21:13:36.289Z"
+        },
+        "modelCode": {
+          "value": "ME8000T-/AA0",
+          "timestamp": "2025-02-08T21:13:36.289Z"
+        },
+        "fuel": {
+          "value": null
+        },
+        "type": {
+          "value": "microwave",
+          "timestamp": "2022-03-23T15:59:10.971Z"
+        },
+        "representativeComponent": {
+          "value": null
+        }
+      },
+      "samsungce.kitchenModeSpecification": {
+        "specification": {
+          "value": {
+            "single": [
+              {
+                "mode": "MicroWave",
+                "supportedOptions": {
+                  "operationTime": {
+                    "max": "01:40:00"
+                  },
+                  "powerLevel": {
+                    "default": "100%",
+                    "supportedValues": [
+                      "0%",
+                      "10%",
+                      "20%",
+                      "30%",
+                      "40%",
+                      "50%",
+                      "60%",
+                      "70%",
+                      "80%",
+                      "90%",
+                      "100%"
+                    ]
+                  }
+                }
+              },
+              {
+                "mode": "ConvectionBake",
+                "supportedOptions": {
+                  "temperature": {
+                    "F": {
+                      "min": 100,
+                      "max": 425,
+                      "default": 350,
+                      "supportedValues": [
+                        100, 200, 225, 250, 275, 300, 325, 350, 375, 400, 425
+                      ]
+                    }
+                  },
+                  "operationTime": {
+                    "max": "01:40:00"
+                  }
+                }
+              },
+              {
+                "mode": "ConvectionRoast",
+                "supportedOptions": {
+                  "temperature": {
+                    "F": {
+                      "min": 200,
+                      "max": 425,
+                      "default": 325,
+                      "supportedValues": [
+                        200, 225, 250, 275, 300, 325, 350, 375, 400, 425
+                      ]
+                    }
+                  },
+                  "operationTime": {
+                    "max": "01:40:00"
+                  }
+                }
+              },
+              {
+                "mode": "Grill",
+                "supportedOptions": {
+                  "temperature": {
+                    "F": {
+                      "min": 425,
+                      "max": 425,
+                      "default": 425,
+                      "resolution": 5
+                    }
+                  },
+                  "operationTime": {
+                    "max": "01:40:00"
+                  }
+                }
+              },
+              {
+                "mode": "SpeedBake",
+                "supportedOptions": {
+                  "operationTime": {
+                    "max": "01:40:00"
+                  },
+                  "powerLevel": {
+                    "default": "30%",
+                    "supportedValues": ["10%", "30%", "50%", "70%"]
+                  }
+                }
+              },
+              {
+                "mode": "SpeedRoast",
+                "supportedOptions": {
+                  "operationTime": {
+                    "max": "01:40:00"
+                  },
+                  "powerLevel": {
+                    "default": "30%",
+                    "supportedValues": ["10%", "30%", "50%", "70%"]
+                  }
+                }
+              },
+              {
+                "mode": "KeepWarm",
+                "supportedOptions": {
+                  "temperature": {
+                    "F": {
+                      "min": 175,
+                      "max": 175,
+                      "default": 175,
+                      "resolution": 5
+                    }
+                  },
+                  "operationTime": {
+                    "max": "01:40:00"
+                  }
+                }
+              },
+              {
+                "mode": "Autocook",
+                "supportedOptions": {}
+              },
+              {
+                "mode": "Cookie",
+                "supportedOptions": {
+                  "temperature": {
+                    "F": {
+                      "min": 325,
+                      "max": 325,
+                      "default": 325,
+                      "resolution": 5
+                    }
+                  },
+                  "operationTime": {
+                    "max": "01:40:00"
+                  }
+                }
+              },
+              {
+                "mode": "SteamClean",
+                "supportedOptions": {
+                  "operationTime": {
+                    "max": "00:06:30"
+                  }
+                }
+              }
+            ]
+          },
+          "timestamp": "2025-02-08T10:21:03.790Z"
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": ["doorControl", "samsungce.hoodFanSpeed"],
+          "timestamp": "2025-02-08T21:13:36.152Z"
+        }
+      },
+      "samsungce.driverVersion": {
+        "versionNumber": {
+          "value": 22120101,
+          "timestamp": "2023-07-03T09:36:13.282Z"
+        }
+      },
+      "sec.diagnosticsInformation": {
+        "logType": {
+          "value": ["errCode", "dump"],
+          "timestamp": "2025-02-08T21:13:36.256Z"
+        },
+        "endpoint": {
+          "value": "SSM",
+          "timestamp": "2025-02-08T21:13:36.256Z"
+        },
+        "minVersion": {
+          "value": "1.0",
+          "timestamp": "2025-02-08T21:13:36.256Z"
+        },
+        "signinPermission": {
+          "value": null
+        },
+        "setupId": {
+          "value": "621",
+          "timestamp": "2025-02-08T21:13:36.256Z"
+        },
+        "protocolType": {
+          "value": "wifi_https",
+          "timestamp": "2025-02-08T21:13:36.256Z"
+        },
+        "tsId": {
+          "value": null
+        },
+        "mnId": {
+          "value": "0AJT",
+          "timestamp": "2025-02-08T21:13:36.256Z"
+        },
+        "dumpType": {
+          "value": "file",
+          "timestamp": "2025-02-08T21:13:36.256Z"
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 1,
+          "unit": "F",
+          "timestamp": "2025-02-09T00:11:15.291Z"
+        }
+      },
+      "samsungce.ovenOperatingState": {
+        "completionTime": {
+          "value": "2025-02-08T21:13:36.184Z",
+          "timestamp": "2025-02-08T21:13:36.188Z"
+        },
+        "operatingState": {
+          "value": "ready",
+          "timestamp": "2025-02-08T21:13:36.188Z"
+        },
+        "progress": {
+          "value": 0,
+          "timestamp": "2025-02-08T21:13:36.188Z"
+        },
+        "ovenJobState": {
+          "value": "ready",
+          "timestamp": "2025-02-08T21:13:36.160Z"
+        },
+        "operationTime": {
+          "value": "00:00:00",
+          "timestamp": "2025-02-08T21:13:36.188Z"
+        }
+      },
+      "ovenMode": {
+        "supportedOvenModes": {
+          "value": [
+            "Microwave",
+            "ConvectionBake",
+            "ConvectionRoast",
+            "grill",
+            "Others",
+            "warming"
+          ],
+          "timestamp": "2025-02-08T10:21:03.790Z"
+        },
+        "ovenMode": {
+          "value": "Others",
+          "timestamp": "2025-02-08T21:13:36.289Z"
+        }
+      },
+      "samsungce.ovenMode": {
+        "supportedOvenModes": {
+          "value": [
+            "MicroWave",
+            "ConvectionBake",
+            "ConvectionRoast",
+            "Grill",
+            "SpeedBake",
+            "SpeedRoast",
+            "KeepWarm",
+            "Autocook",
+            "Cookie",
+            "SteamClean"
+          ],
+          "timestamp": "2025-02-08T10:21:03.790Z"
+        },
+        "ovenMode": {
+          "value": "NoOperation",
+          "timestamp": "2025-02-08T21:13:36.289Z"
+        }
+      },
+      "samsungce.kidsLock": {
+        "lockState": {
+          "value": "unlocked",
+          "timestamp": "2025-02-08T21:13:36.152Z"
+        }
+      },
+      "ovenSetpoint": {
+        "ovenSetpointRange": {
+          "value": null
+        },
+        "ovenSetpoint": {
+          "value": 0,
+          "timestamp": "2025-02-09T00:01:09.108Z"
+        }
+      },
+      "refresh": {},
+      "samsungce.hoodFanSpeed": {
+        "settableMaxFanSpeed": {
+          "value": 3,
+          "timestamp": "2025-02-09T00:01:06.959Z"
+        },
+        "hoodFanSpeed": {
+          "value": 0,
+          "timestamp": "2025-02-09T00:01:07.813Z"
+        },
+        "supportedHoodFanSpeed": {
+          "value": [0, 1, 2, 3, 4, 5],
+          "timestamp": "2022-03-23T15:59:12.796Z"
+        },
+        "settableMinFanSpeed": {
+          "value": 0,
+          "timestamp": "2025-02-09T00:01:06.959Z"
+        }
+      },
+      "samsungce.doorState": {
+        "doorState": {
+          "value": "closed",
+          "timestamp": "2025-02-08T21:13:36.227Z"
+        }
+      },
+      "samsungce.microwavePower": {
+        "supportedPowerLevels": {
+          "value": [
+            "0%",
+            "10%",
+            "20%",
+            "30%",
+            "40%",
+            "50%",
+            "60%",
+            "70%",
+            "80%",
+            "90%",
+            "100%"
+          ],
+          "timestamp": "2025-02-08T21:13:36.160Z"
+        },
+        "powerLevel": {
+          "value": "0%",
+          "timestamp": "2025-02-08T21:13:36.160Z"
+        }
+      },
+      "execute": {
+        "data": {
+          "value": {
+            "payload": {
+              "rt": ["x.com.samsung.da.temperatures"],
+              "if": ["oic.if.baseline", "oic.if.a"],
+              "x.com.samsung.da.items": [
+                {
+                  "x.com.samsung.da.id": "0",
+                  "x.com.samsung.da.description": "Temperature",
+                  "x.com.samsung.da.desired": "0",
+                  "x.com.samsung.da.current": "1",
+                  "x.com.samsung.da.increment": "5",
+                  "x.com.samsung.da.unit": "Fahrenheit"
+                }
+              ]
+            }
+          },
+          "data": {
+            "href": "/temperatures/vs/0"
+          },
+          "timestamp": "2023-07-19T05:50:12.609Z"
+        }
+      },
+      "remoteControlStatus": {
+        "remoteControlEnabled": {
+          "value": "false",
+          "timestamp": "2025-02-08T21:13:36.357Z"
+        }
+      },
+      "samsungce.definedRecipe": {
+        "definedRecipe": {
+          "value": {
+            "cavityId": "0",
+            "recipeType": "0",
+            "categoryId": 0,
+            "itemId": 0,
+            "servingSize": 0,
+            "browingLevel": 0,
+            "option": 0
+          },
+          "timestamp": "2025-02-08T21:13:36.160Z"
+        }
+      },
+      "samsungce.softwareUpdate": {
+        "targetModule": {
+          "value": null
+        },
+        "otnDUID": {
+          "value": "U7CNQWBWSCD7C",
+          "timestamp": "2025-02-08T21:13:36.256Z"
+        },
+        "lastUpdatedDate": {
+          "value": null
+        },
+        "availableModules": {
+          "value": [],
+          "timestamp": "2025-02-08T21:13:36.213Z"
+        },
+        "newVersionAvailable": {
+          "value": false,
+          "timestamp": "2025-02-08T21:13:36.213Z"
+        },
+        "operatingState": {
+          "value": null
+        },
+        "progress": {
+          "value": null
+        }
+      },
+      "ovenOperatingState": {
+        "completionTime": {
+          "value": "2025-02-08T21:13:36.184Z",
+          "timestamp": "2025-02-08T21:13:36.188Z"
+        },
+        "machineState": {
+          "value": "ready",
+          "timestamp": "2025-02-08T21:13:36.188Z"
+        },
+        "progress": {
+          "value": 0,
+          "unit": "%",
+          "timestamp": "2025-02-08T21:13:36.188Z"
+        },
+        "supportedMachineStates": {
+          "value": null
+        },
+        "ovenJobState": {
+          "value": "ready",
+          "timestamp": "2025-02-08T21:13:36.160Z"
+        },
+        "operationTime": {
+          "value": 0,
+          "timestamp": "2025-02-08T21:13:36.188Z"
+        }
+      }
+    },
+    "hood": {
+      "samsungce.hoodFanSpeed": {
+        "settableMaxFanSpeed": {
+          "value": 3,
+          "timestamp": "2025-02-09T00:01:06.959Z"
+        },
+        "hoodFanSpeed": {
+          "value": 0,
+          "timestamp": "2025-02-09T00:01:07.813Z"
+        },
+        "supportedHoodFanSpeed": {
+          "value": [0, 1, 2, 3, 4, 5],
+          "timestamp": "2022-03-23T15:59:12.796Z"
+        },
+        "settableMinFanSpeed": {
+          "value": 0,
+          "timestamp": "2025-02-09T00:01:06.959Z"
+        }
+      },
+      "samsungce.lamp": {
+        "brightnessLevel": {
+          "value": "off",
+          "timestamp": "2025-02-08T21:13:36.289Z"
+        },
+        "supportedBrightnessLevel": {
+          "value": ["off", "low", "high"],
+          "timestamp": "2025-02-08T21:13:36.289Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/da_ks_oven_01061.json b/tests/components/smartthings/fixtures/device_status/da_ks_oven_01061.json
new file mode 100644
index 00000000000..b8b403ba908
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/da_ks_oven_01061.json
@@ -0,0 +1,566 @@
+{
+  "components": {
+    "main": {
+      "ovenSetpoint": {
+        "ovenSetpointRange": {
+          "value": null
+        },
+        "ovenSetpoint": {
+          "value": 220,
+          "timestamp": "2025-03-15T12:06:07.818Z"
+        }
+      },
+      "refresh": {},
+      "samsungce.doorState": {
+        "doorState": {
+          "value": "closed",
+          "timestamp": "2025-03-15T09:25:35.157Z"
+        }
+      },
+      "samsungce.microwavePower": {
+        "supportedPowerLevels": {
+          "value": null
+        },
+        "powerLevel": {
+          "value": "0W",
+          "timestamp": "2025-03-15T12:06:07.803Z"
+        }
+      },
+      "samsungce.waterReservoir": {
+        "slotState": {
+          "value": null
+        }
+      },
+      "samsungce.kitchenDeviceDefaults": {
+        "defaultOperationTime": {
+          "value": null
+        },
+        "defaultOvenMode": {
+          "value": "Convection",
+          "timestamp": "2025-03-15T12:06:07.758Z"
+        },
+        "defaultOvenSetpoint": {
+          "value": null
+        }
+      },
+      "execute": {
+        "data": {
+          "value": null
+        }
+      },
+      "samsungce.deviceIdentification": {
+        "micomAssayCode": {
+          "value": null
+        },
+        "modelName": {
+          "value": null
+        },
+        "serialNumber": {
+          "value": null
+        },
+        "serialNumberExtra": {
+          "value": null
+        },
+        "modelClassificationCode": {
+          "value": null
+        },
+        "description": {
+          "value": null
+        },
+        "releaseYear": {
+          "value": null
+        },
+        "binaryId": {
+          "value": "TP1X_DA-KS-OVEN-01061",
+          "timestamp": "2025-03-13T20:35:02.073Z"
+        }
+      },
+      "samsungce.ovenDrainageRequirement": {
+        "drainageRequirement": {
+          "value": null
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": null
+        },
+        "mndt": {
+          "value": null
+        },
+        "mnfv": {
+          "value": "AKS-WW-TP1X-21-OVEN_40211229",
+          "timestamp": "2025-01-08T17:29:14.260Z"
+        },
+        "mnhw": {
+          "value": "Realtek",
+          "timestamp": "2025-01-08T17:29:14.260Z"
+        },
+        "di": {
+          "value": "9447959a-0dfa-6b27-d40d-650da525c53f",
+          "timestamp": "2025-01-08T17:29:14.260Z"
+        },
+        "mnsl": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2025-01-08T17:29:14.260Z"
+        },
+        "dmv": {
+          "value": "res.1.1.0,sh.1.1.0",
+          "timestamp": "2025-01-08T17:29:14.260Z"
+        },
+        "n": {
+          "value": "[oven] Samsung",
+          "timestamp": "2025-01-08T17:29:14.260Z"
+        },
+        "mnmo": {
+          "value": "TP1X_DA-KS-OVEN-01061|40457041|50030018001611000A00000000000000",
+          "timestamp": "2025-01-08T17:29:14.260Z"
+        },
+        "vid": {
+          "value": "DA-KS-OVEN-01061",
+          "timestamp": "2025-01-08T17:29:14.260Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2025-01-08T17:29:14.260Z"
+        },
+        "mnml": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2025-01-08T17:29:14.260Z"
+        },
+        "mnpv": {
+          "value": "DAWIT 3.0",
+          "timestamp": "2025-01-08T17:29:14.260Z"
+        },
+        "mnos": {
+          "value": "TizenRT 3.1",
+          "timestamp": "2025-01-08T17:29:14.260Z"
+        },
+        "pi": {
+          "value": "9447959a-0dfa-6b27-d40d-650da525c53f",
+          "timestamp": "2025-01-08T17:29:14.260Z"
+        },
+        "icv": {
+          "value": "core.1.1.0",
+          "timestamp": "2025-01-08T17:29:14.260Z"
+        }
+      },
+      "remoteControlStatus": {
+        "remoteControlEnabled": {
+          "value": "true",
+          "timestamp": "2025-03-15T09:47:55.406Z"
+        }
+      },
+      "samsungce.kitchenDeviceIdentification": {
+        "regionCode": {
+          "value": "EU",
+          "timestamp": "2025-03-15T12:06:07.758Z"
+        },
+        "modelCode": {
+          "value": "NQ7000B-/EU7",
+          "timestamp": "2025-03-15T12:06:07.758Z"
+        },
+        "fuel": {
+          "value": null
+        },
+        "type": {
+          "value": "oven",
+          "timestamp": "2025-01-08T17:29:12.924Z"
+        },
+        "representativeComponent": {
+          "value": null
+        }
+      },
+      "samsungce.kitchenModeSpecification": {
+        "specification": {
+          "value": {
+            "single": [
+              {
+                "mode": "NoOperation",
+                "supportedOperations": [],
+                "supportedOptions": {}
+              },
+              {
+                "mode": "Autocook",
+                "supportedOperations": [],
+                "supportedOptions": {}
+              },
+              {
+                "mode": "Convection",
+                "supportedOperations": ["start", "set"],
+                "supportedOptions": {
+                  "temperature": {
+                    "C": {
+                      "min": 40,
+                      "max": 230,
+                      "default": 160,
+                      "resolution": 5
+                    }
+                  },
+                  "operationTime": {
+                    "min": "00:01:00",
+                    "max": "10:00:00",
+                    "default": "01:00:00",
+                    "resolution": "00:01:00"
+                  }
+                }
+              },
+              {
+                "mode": "FanConventional",
+                "supportedOperations": ["start", "set"],
+                "supportedOptions": {
+                  "temperature": {
+                    "C": {
+                      "min": 40,
+                      "max": 230,
+                      "default": 180,
+                      "resolution": 5
+                    }
+                  },
+                  "operationTime": {
+                    "min": "00:01:00",
+                    "max": "10:00:00",
+                    "default": "01:00:00",
+                    "resolution": "00:01:00"
+                  }
+                }
+              },
+              {
+                "mode": "LargeGrill",
+                "supportedOperations": ["start", "set"],
+                "supportedOptions": {
+                  "temperature": {
+                    "C": {
+                      "min": 150,
+                      "max": 230,
+                      "default": 220,
+                      "resolution": 5
+                    }
+                  },
+                  "operationTime": {
+                    "min": "00:01:00",
+                    "max": "10:00:00",
+                    "default": "01:00:00",
+                    "resolution": "00:01:00"
+                  }
+                }
+              },
+              {
+                "mode": "FanGrill",
+                "supportedOperations": ["start", "set"],
+                "supportedOptions": {
+                  "temperature": {
+                    "C": {
+                      "min": 40,
+                      "max": 230,
+                      "default": 180,
+                      "resolution": 5
+                    }
+                  },
+                  "operationTime": {
+                    "min": "00:01:00",
+                    "max": "10:00:00",
+                    "default": "01:00:00",
+                    "resolution": "00:01:00"
+                  }
+                }
+              },
+              {
+                "mode": "MicroWaveGrill",
+                "supportedOperations": ["set"],
+                "supportedOptions": {
+                  "temperature": {
+                    "C": {
+                      "min": 40,
+                      "max": 200,
+                      "default": 200,
+                      "resolution": 5
+                    }
+                  },
+                  "operationTime": {
+                    "min": "00:00:10",
+                    "max": "01:30:00",
+                    "default": "00:00:30",
+                    "resolution": "00:00:10"
+                  },
+                  "powerLevel": {
+                    "default": "300W",
+                    "supportedValues": ["100W", "180W", "300W", "450W", "600W"]
+                  }
+                }
+              },
+              {
+                "mode": "MicroWaveConvection",
+                "supportedOperations": ["set"],
+                "supportedOptions": {
+                  "temperature": {
+                    "C": {
+                      "min": 40,
+                      "max": 200,
+                      "default": 180,
+                      "resolution": 5
+                    }
+                  },
+                  "operationTime": {
+                    "min": "00:00:10",
+                    "max": "01:30:00",
+                    "default": "00:00:30",
+                    "resolution": "00:00:10"
+                  },
+                  "powerLevel": {
+                    "default": "300W",
+                    "supportedValues": ["100W", "180W", "300W", "450W", "600W"]
+                  }
+                }
+              },
+              {
+                "mode": "AirFryer",
+                "supportedOperations": ["start", "set"],
+                "supportedOptions": {
+                  "temperature": {
+                    "C": {
+                      "min": 150,
+                      "max": 230,
+                      "default": 220,
+                      "resolution": 5
+                    }
+                  },
+                  "operationTime": {
+                    "min": "00:01:00",
+                    "max": "10:00:00",
+                    "default": "01:00:00",
+                    "resolution": "00:01:00"
+                  }
+                }
+              },
+              {
+                "mode": "MicroWave",
+                "supportedOperations": ["set"],
+                "supportedOptions": {
+                  "operationTime": {
+                    "min": "00:00:10",
+                    "max": "01:30:00",
+                    "default": "00:00:30",
+                    "resolution": "00:00:10"
+                  },
+                  "powerLevel": {
+                    "default": "800W",
+                    "supportedValues": [
+                      "100W",
+                      "180W",
+                      "300W",
+                      "450W",
+                      "600W",
+                      "700W",
+                      "800W"
+                    ]
+                  }
+                }
+              },
+              {
+                "mode": "Deodorization",
+                "supportedOperations": ["start", "set"],
+                "supportedOptions": {
+                  "operationTime": {
+                    "min": "00:00:10",
+                    "max": "00:15:00",
+                    "default": "00:05:00",
+                    "resolution": "00:00:10"
+                  }
+                }
+              },
+              {
+                "mode": "KeepWarm",
+                "supportedOperations": ["start", "set"],
+                "supportedOptions": {
+                  "temperature": {
+                    "C": {
+                      "min": 60,
+                      "max": 100,
+                      "default": 60,
+                      "resolution": 5
+                    }
+                  },
+                  "operationTime": {
+                    "min": "00:01:00",
+                    "max": "10:00:00",
+                    "default": "01:00:00",
+                    "resolution": "00:01:00"
+                  }
+                }
+              },
+              {
+                "mode": "SteamClean",
+                "supportedOperations": ["set"],
+                "supportedOptions": {}
+              }
+            ]
+          },
+          "timestamp": "2025-01-08T17:29:14.757Z"
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": [
+            "samsungce.waterReservoir",
+            "samsungce.ovenDrainageRequirement"
+          ],
+          "timestamp": "2025-03-15T12:06:07.758Z"
+        }
+      },
+      "samsungce.definedRecipe": {
+        "definedRecipe": {
+          "value": {
+            "cavityId": "0",
+            "recipeType": "0",
+            "categoryId": 0,
+            "itemId": 0,
+            "servingSize": 0,
+            "browingLevel": 0,
+            "option": 0
+          },
+          "timestamp": "2025-03-15T12:06:07.803Z"
+        }
+      },
+      "samsungce.driverVersion": {
+        "versionNumber": {
+          "value": 22100101,
+          "timestamp": "2025-01-08T17:29:12.924Z"
+        }
+      },
+      "samsungce.softwareUpdate": {
+        "targetModule": {
+          "value": null
+        },
+        "otnDUID": {
+          "value": "43CB2ZD4VUEGW",
+          "timestamp": "2025-03-13T20:35:02.073Z"
+        },
+        "lastUpdatedDate": {
+          "value": null
+        },
+        "availableModules": {
+          "value": [],
+          "timestamp": "2025-03-13T20:35:02.073Z"
+        },
+        "newVersionAvailable": {
+          "value": false,
+          "timestamp": "2025-03-13T20:35:02.073Z"
+        },
+        "operatingState": {
+          "value": null
+        },
+        "progress": {
+          "value": null
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 30,
+          "unit": "C",
+          "timestamp": "2025-03-15T12:06:32.918Z"
+        }
+      },
+      "samsungce.ovenOperatingState": {
+        "completionTime": {
+          "value": "2025-03-15T12:06:09.550Z",
+          "timestamp": "2025-03-15T12:06:09.554Z"
+        },
+        "operatingState": {
+          "value": "running",
+          "timestamp": "2025-03-15T12:06:07.866Z"
+        },
+        "progress": {
+          "value": 0,
+          "timestamp": "2025-03-15T12:06:07.866Z"
+        },
+        "ovenJobState": {
+          "value": "preheat",
+          "timestamp": "2025-03-15T12:06:07.803Z"
+        },
+        "operationTime": {
+          "value": "00:00:00",
+          "timestamp": "2025-03-15T12:06:07.866Z"
+        }
+      },
+      "ovenMode": {
+        "supportedOvenModes": {
+          "value": ["Others", "Bake", "Broil", "ConvectionBroil", "warming"],
+          "timestamp": "2025-01-08T17:29:14.757Z"
+        },
+        "ovenMode": {
+          "value": "Bake",
+          "timestamp": "2025-03-15T12:06:07.758Z"
+        }
+      },
+      "ovenOperatingState": {
+        "completionTime": {
+          "value": "2025-03-15T12:06:09.550Z",
+          "timestamp": "2025-03-15T12:06:09.554Z"
+        },
+        "machineState": {
+          "value": "running",
+          "timestamp": "2025-03-15T12:06:07.866Z"
+        },
+        "progress": {
+          "value": 0,
+          "unit": "%",
+          "timestamp": "2025-03-15T12:06:07.866Z"
+        },
+        "supportedMachineStates": {
+          "value": null
+        },
+        "ovenJobState": {
+          "value": "preheat",
+          "timestamp": "2025-03-15T12:06:07.803Z"
+        },
+        "operationTime": {
+          "value": 0,
+          "timestamp": "2025-03-15T12:06:07.866Z"
+        }
+      },
+      "samsungce.ovenMode": {
+        "supportedOvenModes": {
+          "value": [
+            "NoOperation",
+            "Autocook",
+            "Convection",
+            "FanConventional",
+            "LargeGrill",
+            "FanGrill",
+            "MicroWaveGrill",
+            "MicroWaveConvection",
+            "AirFryer",
+            "MicroWave",
+            "Deodorization",
+            "KeepWarm",
+            "SteamClean"
+          ],
+          "timestamp": "2025-01-08T17:29:14.757Z"
+        },
+        "ovenMode": {
+          "value": "Convection",
+          "timestamp": "2025-03-15T12:06:07.758Z"
+        }
+      },
+      "samsungce.lamp": {
+        "brightnessLevel": {
+          "value": "high",
+          "timestamp": "2025-03-15T12:06:07.956Z"
+        },
+        "supportedBrightnessLevel": {
+          "value": ["off", "high"],
+          "timestamp": "2025-03-15T12:06:07.758Z"
+        }
+      },
+      "samsungce.kidsLock": {
+        "lockState": {
+          "value": "unlocked",
+          "timestamp": "2025-03-13T20:35:02.170Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/da_ks_range_0101x.json b/tests/components/smartthings/fixtures/device_status/da_ks_range_0101x.json
new file mode 100644
index 00000000000..6d15aa4696d
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/da_ks_range_0101x.json
@@ -0,0 +1,688 @@
+{
+  "components": {
+    "cavity-01": {
+      "ovenSetpoint": {
+        "ovenSetpointRange": {
+          "value": null
+        },
+        "ovenSetpoint": {
+          "value": 0,
+          "timestamp": "2022-02-21T22:37:06.976Z"
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": [],
+          "timestamp": "2022-09-07T22:35:34.197Z"
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 175,
+          "unit": "F",
+          "timestamp": "2022-02-21T22:37:06.976Z"
+        }
+      },
+      "samsungce.ovenOperatingState": {
+        "completionTime": {
+          "value": "2024-05-14T19:00:04.579Z",
+          "timestamp": "2024-05-14T19:00:04.584Z"
+        },
+        "operatingState": {
+          "value": "ready",
+          "timestamp": "2022-02-21T22:37:05.415Z"
+        },
+        "progress": {
+          "value": 1,
+          "timestamp": "2022-02-21T22:37:05.415Z"
+        },
+        "ovenJobState": {
+          "value": "ready",
+          "timestamp": "2022-02-21T22:37:05.415Z"
+        },
+        "operationTime": {
+          "value": "00:00:00",
+          "timestamp": "2022-02-21T22:37:05.415Z"
+        }
+      },
+      "samsungce.kitchenDeviceDefaults": {
+        "defaultOperationTime": {
+          "value": null
+        },
+        "defaultOvenMode": {
+          "value": "ConvectionBake",
+          "timestamp": "2022-02-21T22:37:06.983Z"
+        },
+        "defaultOvenSetpoint": {
+          "value": 350,
+          "timestamp": "2022-02-21T22:37:06.976Z"
+        }
+      },
+      "custom.ovenCavityStatus": {
+        "ovenCavityStatus": {
+          "value": "off",
+          "timestamp": "2025-03-12T20:38:01.259Z"
+        }
+      },
+      "ovenMode": {
+        "supportedOvenModes": {
+          "value": ["Others"],
+          "timestamp": "2022-02-21T22:37:08.409Z"
+        },
+        "ovenMode": {
+          "value": "Others",
+          "timestamp": "2022-02-21T22:37:06.983Z"
+        }
+      },
+      "ovenOperatingState": {
+        "completionTime": {
+          "value": "2024-05-14T19:00:04.579Z",
+          "timestamp": "2024-05-14T19:00:04.584Z"
+        },
+        "machineState": {
+          "value": "ready",
+          "timestamp": "2022-02-21T22:37:05.415Z"
+        },
+        "progress": {
+          "value": 1,
+          "unit": "%",
+          "timestamp": "2022-02-21T22:37:05.415Z"
+        },
+        "supportedMachineStates": {
+          "value": null
+        },
+        "ovenJobState": {
+          "value": "ready",
+          "timestamp": "2022-02-21T22:37:05.415Z"
+        },
+        "operationTime": {
+          "value": 0,
+          "timestamp": "2022-02-21T22:37:05.415Z"
+        }
+      },
+      "samsungce.ovenMode": {
+        "supportedOvenModes": {
+          "value": ["SelfClean", "SteamClean", "NoOperation"],
+          "timestamp": "2022-02-21T22:37:08.409Z"
+        },
+        "ovenMode": {
+          "value": "NoOperation",
+          "timestamp": "2022-02-21T22:37:06.983Z"
+        }
+      }
+    },
+    "main": {
+      "ovenSetpoint": {
+        "ovenSetpointRange": {
+          "value": null
+        },
+        "ovenSetpoint": {
+          "value": 425,
+          "timestamp": "2025-03-13T21:42:23.492Z"
+        }
+      },
+      "samsungce.meatProbe": {
+        "temperatureSetpoint": {
+          "value": 0,
+          "unit": "F",
+          "timestamp": "2022-02-21T22:37:02.619Z"
+        },
+        "temperature": {
+          "value": 0,
+          "unit": "F",
+          "timestamp": "2022-02-21T22:37:02.619Z"
+        },
+        "status": {
+          "value": "disconnected",
+          "timestamp": "2022-02-21T22:37:02.679Z"
+        }
+      },
+      "refresh": {},
+      "samsungce.doorState": {
+        "doorState": {
+          "value": "closed",
+          "timestamp": "2025-03-12T20:38:01.255Z"
+        }
+      },
+      "samsungce.kitchenDeviceDefaults": {
+        "defaultOperationTime": {
+          "value": 3600,
+          "timestamp": "2025-03-13T21:23:24.771Z"
+        },
+        "defaultOvenMode": {
+          "value": "ConvectionBake",
+          "timestamp": "2025-03-13T21:23:27.659Z"
+        },
+        "defaultOvenSetpoint": {
+          "value": 350,
+          "timestamp": "2025-03-13T21:23:27.596Z"
+        }
+      },
+      "execute": {
+        "data": {
+          "value": {
+            "payload": {
+              "rt": ["x.com.samsung.da.information"],
+              "if": ["oic.if.baseline", "oic.if.a"],
+              "x.com.samsung.da.modelNum": "TP1X_DA-KS-RANGE-0101X|40445041|5001011E03151101020000000000000",
+              "x.com.samsung.da.description": "TP1X_DA-KS-OVEN-01011",
+              "x.com.samsung.da.serialNum": "0J4D7DARB03393K",
+              "x.com.samsung.da.otnDUID": "ZPCNQWBWXI47Q",
+              "x.com.samsung.da.items": [
+                {
+                  "x.com.samsung.da.id": "0",
+                  "x.com.samsung.da.description": "Version",
+                  "x.com.samsung.da.type": "Software",
+                  "x.com.samsung.da.number": "02144A221005",
+                  "x.com.samsung.da.newVersionAvailable": "0"
+                },
+                {
+                  "x.com.samsung.da.id": "1",
+                  "x.com.samsung.da.description": "Version",
+                  "x.com.samsung.da.type": "Firmware",
+                  "x.com.samsung.da.number": "20121600,FFFFFFFF",
+                  "x.com.samsung.da.newVersionAvailable": "0"
+                }
+              ]
+            }
+          },
+          "data": {
+            "href": "/information/vs/0"
+          },
+          "timestamp": "2023-11-28T22:49:09.333Z"
+        }
+      },
+      "samsungce.deviceIdentification": {
+        "micomAssayCode": {
+          "value": null
+        },
+        "modelName": {
+          "value": null
+        },
+        "serialNumber": {
+          "value": null
+        },
+        "serialNumberExtra": {
+          "value": null
+        },
+        "modelClassificationCode": {
+          "value": null
+        },
+        "description": {
+          "value": null
+        },
+        "releaseYear": {
+          "value": null
+        },
+        "binaryId": {
+          "value": "TP1X_DA-KS-RANGE-0101X",
+          "timestamp": "2025-03-12T20:40:29.034Z"
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": null
+        },
+        "mndt": {
+          "value": null
+        },
+        "mnfv": {
+          "value": "AKS-WW-TP1-20-OVEN-3-CR_40240205",
+          "timestamp": "2024-05-14T19:00:26.132Z"
+        },
+        "mnhw": {
+          "value": "Realtek",
+          "timestamp": "2024-05-14T19:00:26.132Z"
+        },
+        "di": {
+          "value": "2c3cbaa0-1899-5ddc-7b58-9d657bd48f18",
+          "timestamp": "2022-02-21T22:37:02.282Z"
+        },
+        "mnsl": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2022-02-21T22:37:02.282Z"
+        },
+        "dmv": {
+          "value": "1.2.1",
+          "timestamp": "2022-12-19T22:33:09.710Z"
+        },
+        "n": {
+          "value": "Samsung Range",
+          "timestamp": "2024-05-14T19:00:26.132Z"
+        },
+        "mnmo": {
+          "value": "TP1X_DA-KS-RANGE-0101X|40445041|5001011E031511010200000000000000",
+          "timestamp": "2024-05-14T19:00:26.132Z"
+        },
+        "vid": {
+          "value": "DA-KS-RANGE-0101X",
+          "timestamp": "2022-02-21T22:37:02.282Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2022-02-21T22:37:02.282Z"
+        },
+        "mnml": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2022-02-21T22:37:02.282Z"
+        },
+        "mnpv": {
+          "value": "DAWIT 3.0",
+          "timestamp": "2024-05-14T19:00:26.132Z"
+        },
+        "mnos": {
+          "value": "TizenRT 3.1",
+          "timestamp": "2024-05-14T19:00:26.132Z"
+        },
+        "pi": {
+          "value": "2c3cbaa0-1899-5ddc-7b58-9d657bd48f18",
+          "timestamp": "2022-02-21T22:37:02.282Z"
+        },
+        "icv": {
+          "value": "core.1.1.0",
+          "timestamp": "2022-02-21T22:37:02.282Z"
+        }
+      },
+      "remoteControlStatus": {
+        "remoteControlEnabled": {
+          "value": "true",
+          "timestamp": "2025-03-13T21:42:23.615Z"
+        }
+      },
+      "samsungce.customRecipe": {},
+      "samsungce.kitchenDeviceIdentification": {
+        "regionCode": {
+          "value": "US",
+          "timestamp": "2025-03-13T21:23:27.659Z"
+        },
+        "modelCode": {
+          "value": "NE6516A-/AA0",
+          "timestamp": "2025-03-13T21:23:27.659Z"
+        },
+        "fuel": {
+          "value": null
+        },
+        "type": {
+          "value": "range",
+          "timestamp": "2022-02-21T22:37:02.487Z"
+        },
+        "representativeComponent": {
+          "value": null
+        }
+      },
+      "samsungce.kitchenModeSpecification": {
+        "specification": {
+          "value": {
+            "single": [
+              {
+                "mode": "Bake",
+                "supportedOperations": ["start", "set"],
+                "supportedOptions": {
+                  "temperature": {
+                    "C": {
+                      "min": 80,
+                      "max": 285,
+                      "default": 175,
+                      "resolution": 0
+                    },
+                    "F": {
+                      "min": 175,
+                      "max": 550,
+                      "default": 350,
+                      "resolution": 0
+                    }
+                  },
+                  "operationTime": {
+                    "min": "00:01:00",
+                    "max": "09:59:00",
+                    "default": "01:00:00",
+                    "resolution": "00:01:00"
+                  }
+                }
+              },
+              {
+                "mode": "Broil",
+                "supportedOperations": ["set"],
+                "supportedOptions": {
+                  "temperature": {
+                    "C": {
+                      "min": 61441,
+                      "max": 61442,
+                      "default": 61441,
+                      "supportedValues": [61441, 61442]
+                    },
+                    "F": {
+                      "min": 61441,
+                      "max": 61442,
+                      "default": 61441,
+                      "supportedValues": [61441, 61442]
+                    }
+                  }
+                }
+              },
+              {
+                "mode": "ConvectionBake",
+                "supportedOperations": ["start", "set"],
+                "supportedOptions": {
+                  "temperature": {
+                    "C": {
+                      "min": 80,
+                      "max": 285,
+                      "default": 160,
+                      "resolution": 0
+                    },
+                    "F": {
+                      "min": 175,
+                      "max": 550,
+                      "default": 325,
+                      "resolution": 0
+                    }
+                  },
+                  "operationTime": {
+                    "min": "00:01:00",
+                    "max": "09:59:00",
+                    "default": "01:00:00",
+                    "resolution": "00:01:00"
+                  }
+                }
+              },
+              {
+                "mode": "ConvectionRoast",
+                "supportedOperations": ["start", "set"],
+                "supportedOptions": {
+                  "temperature": {
+                    "C": {
+                      "min": 80,
+                      "max": 285,
+                      "default": 160,
+                      "resolution": 0
+                    },
+                    "F": {
+                      "min": 175,
+                      "max": 550,
+                      "default": 325,
+                      "resolution": 0
+                    }
+                  },
+                  "operationTime": {
+                    "min": "00:01:00",
+                    "max": "09:59:00",
+                    "default": "01:00:00",
+                    "resolution": "00:01:00"
+                  }
+                }
+              },
+              {
+                "mode": "KeepWarm",
+                "supportedOperations": ["set"],
+                "supportedOptions": {
+                  "temperature": {
+                    "C": {
+                      "min": 80,
+                      "max": 80,
+                      "default": 80,
+                      "supportedValues": [80]
+                    },
+                    "F": {
+                      "min": 175,
+                      "max": 175,
+                      "default": 175,
+                      "supportedValues": [175]
+                    }
+                  }
+                }
+              },
+              {
+                "mode": "BreadProof",
+                "supportedOperations": ["set"],
+                "supportedOptions": {
+                  "temperature": {
+                    "C": {
+                      "min": 35,
+                      "max": 35,
+                      "default": 35,
+                      "supportedValues": [35]
+                    },
+                    "F": {
+                      "min": 95,
+                      "max": 95,
+                      "default": 95,
+                      "supportedValues": [95]
+                    }
+                  }
+                }
+              },
+              {
+                "mode": "AirFryer",
+                "supportedOperations": ["start", "set"],
+                "supportedOptions": {
+                  "temperature": {
+                    "C": {
+                      "min": 175,
+                      "max": 260,
+                      "default": 220,
+                      "resolution": 0
+                    },
+                    "F": {
+                      "min": 350,
+                      "max": 500,
+                      "default": 425,
+                      "resolution": 0
+                    }
+                  },
+                  "operationTime": {
+                    "min": "00:01:00",
+                    "max": "09:59:00",
+                    "default": "01:00:00",
+                    "resolution": "00:01:00"
+                  }
+                }
+              },
+              {
+                "mode": "Dehydrate",
+                "supportedOperations": ["start", "set"],
+                "supportedOptions": {
+                  "temperature": {
+                    "C": {
+                      "min": 40,
+                      "max": 105,
+                      "default": 65,
+                      "resolution": 0
+                    },
+                    "F": {
+                      "min": 100,
+                      "max": 225,
+                      "default": 150,
+                      "resolution": 0
+                    }
+                  },
+                  "operationTime": {
+                    "min": "00:01:00",
+                    "max": "09:59:00",
+                    "default": "01:00:00",
+                    "resolution": "00:01:00"
+                  }
+                }
+              },
+              {
+                "mode": "SelfClean",
+                "supportedOperations": [],
+                "supportedOptions": {}
+              },
+              {
+                "mode": "SteamClean",
+                "supportedOperations": [],
+                "supportedOptions": {}
+              }
+            ]
+          },
+          "timestamp": "2024-05-14T19:00:30.062Z"
+        }
+      },
+      "custom.cooktopOperatingState": {
+        "supportedCooktopOperatingState": {
+          "value": ["run", "ready"],
+          "timestamp": "2022-02-21T22:37:05.293Z"
+        },
+        "cooktopOperatingState": {
+          "value": "ready",
+          "timestamp": "2025-03-12T20:38:01.402Z"
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": [],
+          "timestamp": "2025-03-13T21:23:27.659Z"
+        }
+      },
+      "samsungce.driverVersion": {
+        "versionNumber": {
+          "value": 22100101,
+          "timestamp": "2022-11-01T21:37:51.304Z"
+        }
+      },
+      "samsungce.softwareUpdate": {
+        "targetModule": {
+          "value": null
+        },
+        "otnDUID": {
+          "value": "ZPCNQWBWXI47Q",
+          "timestamp": "2025-03-12T20:38:01.262Z"
+        },
+        "lastUpdatedDate": {
+          "value": null
+        },
+        "availableModules": {
+          "value": [],
+          "timestamp": "2025-03-12T20:38:01.262Z"
+        },
+        "newVersionAvailable": {
+          "value": false,
+          "timestamp": "2025-03-12T20:38:01.262Z"
+        },
+        "operatingState": {
+          "value": null
+        },
+        "progress": {
+          "value": null
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 425,
+          "unit": "F",
+          "timestamp": "2025-03-13T21:46:35.545Z"
+        }
+      },
+      "samsungce.ovenOperatingState": {
+        "completionTime": {
+          "value": "2025-03-14T03:23:28.048Z",
+          "timestamp": "2025-03-13T22:09:29.052Z"
+        },
+        "operatingState": {
+          "value": "running",
+          "timestamp": "2025-03-13T21:23:24.771Z"
+        },
+        "progress": {
+          "value": 13,
+          "timestamp": "2025-03-13T22:06:35.591Z"
+        },
+        "ovenJobState": {
+          "value": "cooking",
+          "timestamp": "2025-03-13T21:46:34.327Z"
+        },
+        "operationTime": {
+          "value": "06:00:00",
+          "timestamp": "2025-03-13T21:23:24.771Z"
+        }
+      },
+      "ovenMode": {
+        "supportedOvenModes": {
+          "value": [
+            "Bake",
+            "Broil",
+            "ConvectionBake",
+            "ConvectionRoast",
+            "warming",
+            "Others",
+            "Dehydrate"
+          ],
+          "timestamp": "2025-03-12T20:38:01.259Z"
+        },
+        "ovenMode": {
+          "value": "Bake",
+          "timestamp": "2025-03-13T21:23:27.659Z"
+        }
+      },
+      "ovenOperatingState": {
+        "completionTime": {
+          "value": "2025-03-14T03:23:28.048Z",
+          "timestamp": "2025-03-13T22:09:29.052Z"
+        },
+        "machineState": {
+          "value": "running",
+          "timestamp": "2025-03-13T21:23:24.771Z"
+        },
+        "progress": {
+          "value": 13,
+          "unit": "%",
+          "timestamp": "2025-03-13T22:06:35.591Z"
+        },
+        "supportedMachineStates": {
+          "value": null
+        },
+        "ovenJobState": {
+          "value": "cooking",
+          "timestamp": "2025-03-13T21:46:34.327Z"
+        },
+        "operationTime": {
+          "value": 21600,
+          "timestamp": "2025-03-13T21:23:24.771Z"
+        }
+      },
+      "samsungce.ovenMode": {
+        "supportedOvenModes": {
+          "value": [
+            "Bake",
+            "Broil",
+            "ConvectionBake",
+            "ConvectionRoast",
+            "KeepWarm",
+            "BreadProof",
+            "AirFryer",
+            "Dehydrate",
+            "SelfClean",
+            "SteamClean"
+          ],
+          "timestamp": "2025-03-12T20:38:01.259Z"
+        },
+        "ovenMode": {
+          "value": "Bake",
+          "timestamp": "2025-03-13T21:23:27.659Z"
+        }
+      },
+      "samsungce.lamp": {
+        "brightnessLevel": {
+          "value": "off",
+          "timestamp": "2025-03-13T21:23:27.659Z"
+        },
+        "supportedBrightnessLevel": {
+          "value": ["off", "high"],
+          "timestamp": "2025-03-13T21:23:27.659Z"
+        }
+      },
+      "samsungce.kidsLock": {
+        "lockState": {
+          "value": "unlocked",
+          "timestamp": "2025-03-12T20:38:01.400Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/da_ref_normal_000001.json b/tests/components/smartthings/fixtures/device_status/da_ref_normal_000001.json
new file mode 100644
index 00000000000..0c5a883b4f9
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/da_ref_normal_000001.json
@@ -0,0 +1,727 @@
+{
+  "components": {
+    "pantry-01": {
+      "samsungce.fridgePantryInfo": {
+        "name": {
+          "value": null
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": [],
+          "timestamp": "2022-02-07T10:47:54.524Z"
+        }
+      },
+      "samsungce.fridgePantryMode": {
+        "mode": {
+          "value": null
+        },
+        "supportedModes": {
+          "value": null
+        }
+      }
+    },
+    "pantry-02": {
+      "samsungce.fridgePantryInfo": {
+        "name": {
+          "value": null
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": [],
+          "timestamp": "2022-02-07T10:47:54.524Z"
+        }
+      },
+      "samsungce.fridgePantryMode": {
+        "mode": {
+          "value": null
+        },
+        "supportedModes": {
+          "value": null
+        }
+      }
+    },
+    "icemaker": {
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": [],
+          "timestamp": "2024-10-12T13:55:04.008Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-02-09T13:55:01.720Z"
+        }
+      }
+    },
+    "onedoor": {
+      "custom.fridgeMode": {
+        "fridgeModeValue": {
+          "value": null
+        },
+        "fridgeMode": {
+          "value": null
+        },
+        "supportedFridgeModes": {
+          "value": null
+        }
+      },
+      "contactSensor": {
+        "contact": {
+          "value": null
+        }
+      },
+      "samsungce.unavailableCapabilities": {
+        "unavailableCommands": {
+          "value": [],
+          "timestamp": "2024-11-08T04:14:59.899Z"
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": ["samsungce.freezerConvertMode", "custom.fridgeMode"],
+          "timestamp": "2024-11-12T08:23:59.944Z"
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": null
+        }
+      },
+      "custom.thermostatSetpointControl": {
+        "minimumSetpoint": {
+          "value": null
+        },
+        "maximumSetpoint": {
+          "value": null
+        }
+      },
+      "samsungce.freezerConvertMode": {
+        "supportedFreezerConvertModes": {
+          "value": null
+        },
+        "freezerConvertMode": {
+          "value": null
+        }
+      },
+      "thermostatCoolingSetpoint": {
+        "coolingSetpointRange": {
+          "value": null
+        },
+        "coolingSetpoint": {
+          "value": null
+        }
+      }
+    },
+    "cooler": {
+      "custom.fridgeMode": {
+        "fridgeModeValue": {
+          "value": null
+        },
+        "fridgeMode": {
+          "value": null
+        },
+        "supportedFridgeModes": {
+          "value": null
+        }
+      },
+      "contactSensor": {
+        "contact": {
+          "value": "closed",
+          "timestamp": "2025-02-09T16:26:21.425Z"
+        }
+      },
+      "samsungce.unavailableCapabilities": {
+        "unavailableCommands": {
+          "value": [],
+          "timestamp": "2024-11-08T04:14:59.899Z"
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": ["custom.fridgeMode"],
+          "timestamp": "2024-10-12T13:55:04.008Z"
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 37,
+          "unit": "F",
+          "timestamp": "2025-01-19T21:07:55.764Z"
+        }
+      },
+      "custom.thermostatSetpointControl": {
+        "minimumSetpoint": {
+          "value": 34,
+          "unit": "F",
+          "timestamp": "2025-01-19T21:07:55.764Z"
+        },
+        "maximumSetpoint": {
+          "value": 44,
+          "unit": "F",
+          "timestamp": "2025-01-19T21:07:55.764Z"
+        }
+      },
+      "thermostatCoolingSetpoint": {
+        "coolingSetpointRange": {
+          "value": {
+            "minimum": 34,
+            "maximum": 44,
+            "step": 1
+          },
+          "unit": "F",
+          "timestamp": "2025-01-19T21:07:55.764Z"
+        },
+        "coolingSetpoint": {
+          "value": 37,
+          "unit": "F",
+          "timestamp": "2025-01-19T21:07:55.764Z"
+        }
+      }
+    },
+    "freezer": {
+      "custom.fridgeMode": {
+        "fridgeModeValue": {
+          "value": null
+        },
+        "fridgeMode": {
+          "value": null
+        },
+        "supportedFridgeModes": {
+          "value": null
+        }
+      },
+      "contactSensor": {
+        "contact": {
+          "value": "closed",
+          "timestamp": "2025-02-09T14:48:16.247Z"
+        }
+      },
+      "samsungce.unavailableCapabilities": {
+        "unavailableCommands": {
+          "value": [],
+          "timestamp": "2024-11-08T04:14:59.899Z"
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": ["custom.fridgeMode", "samsungce.freezerConvertMode"],
+          "timestamp": "2024-11-08T01:09:17.382Z"
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 0,
+          "unit": "F",
+          "timestamp": "2025-01-23T04:42:18.178Z"
+        }
+      },
+      "custom.thermostatSetpointControl": {
+        "minimumSetpoint": {
+          "value": -8,
+          "unit": "F",
+          "timestamp": "2025-01-19T21:07:55.764Z"
+        },
+        "maximumSetpoint": {
+          "value": 5,
+          "unit": "F",
+          "timestamp": "2025-01-19T21:07:55.764Z"
+        }
+      },
+      "samsungce.freezerConvertMode": {
+        "supportedFreezerConvertModes": {
+          "value": null
+        },
+        "freezerConvertMode": {
+          "value": null
+        }
+      },
+      "thermostatCoolingSetpoint": {
+        "coolingSetpointRange": {
+          "value": {
+            "minimum": -8,
+            "maximum": 5,
+            "step": 1
+          },
+          "unit": "F",
+          "timestamp": "2025-01-19T21:07:55.764Z"
+        },
+        "coolingSetpoint": {
+          "value": 0,
+          "unit": "F",
+          "timestamp": "2025-01-19T21:07:55.764Z"
+        }
+      }
+    },
+    "main": {
+      "contactSensor": {
+        "contact": {
+          "value": "closed",
+          "timestamp": "2025-02-09T16:26:21.425Z"
+        }
+      },
+      "samsungce.dongleSoftwareInstallation": {
+        "status": {
+          "value": "completed",
+          "timestamp": "2022-02-07T10:47:54.524Z"
+        }
+      },
+      "samsungce.deviceIdentification": {
+        "micomAssayCode": {
+          "value": null
+        },
+        "modelName": {
+          "value": null
+        },
+        "serialNumber": {
+          "value": null
+        },
+        "serialNumberExtra": {
+          "value": null
+        },
+        "modelClassificationCode": {
+          "value": null
+        },
+        "description": {
+          "value": null
+        },
+        "releaseYear": {
+          "value": 20,
+          "timestamp": "2024-11-08T01:09:17.382Z"
+        },
+        "binaryId": {
+          "value": "TP2X_REF_20K",
+          "timestamp": "2025-02-09T13:55:01.720Z"
+        }
+      },
+      "samsungce.quickControl": {
+        "version": {
+          "value": null
+        }
+      },
+      "custom.fridgeMode": {
+        "fridgeModeValue": {
+          "value": null
+        },
+        "fridgeMode": {
+          "value": null
+        },
+        "supportedFridgeModes": {
+          "value": null
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": null
+        },
+        "mndt": {
+          "value": null
+        },
+        "mnfv": {
+          "value": "A-RFWW-TP2-21-COMMON_20220110",
+          "timestamp": "2024-12-21T22:04:22.037Z"
+        },
+        "mnhw": {
+          "value": "MediaTek",
+          "timestamp": "2024-12-21T22:04:22.037Z"
+        },
+        "di": {
+          "value": "7db87911-7dce-1cf2-7119-b953432a2f09",
+          "timestamp": "2024-12-21T22:04:22.037Z"
+        },
+        "mnsl": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2024-12-21T22:04:22.037Z"
+        },
+        "dmv": {
+          "value": "res.1.1.0,sh.1.1.0",
+          "timestamp": "2024-12-21T22:04:22.037Z"
+        },
+        "n": {
+          "value": "[refrigerator] Samsung",
+          "timestamp": "2024-12-21T22:04:22.037Z"
+        },
+        "mnmo": {
+          "value": "TP2X_REF_20K|00115641|0004014D011411200103000020000000",
+          "timestamp": "2024-12-21T22:04:22.037Z"
+        },
+        "vid": {
+          "value": "DA-REF-NORMAL-000001",
+          "timestamp": "2024-12-21T22:04:22.037Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2024-12-21T22:04:22.037Z"
+        },
+        "mnml": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2024-12-21T22:04:22.037Z"
+        },
+        "mnpv": {
+          "value": "DAWIT 2.0",
+          "timestamp": "2024-12-21T22:04:22.037Z"
+        },
+        "mnos": {
+          "value": "TizenRT 1.0 + IPv6",
+          "timestamp": "2024-12-21T22:04:22.037Z"
+        },
+        "pi": {
+          "value": "7db87911-7dce-1cf2-7119-b953432a2f09",
+          "timestamp": "2024-12-21T22:04:22.037Z"
+        },
+        "icv": {
+          "value": "core.1.1.0",
+          "timestamp": "2024-12-21T22:04:22.037Z"
+        }
+      },
+      "samsungce.fridgeVacationMode": {
+        "vacationMode": {
+          "value": null
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": [
+            "temperatureMeasurement",
+            "thermostatCoolingSetpoint",
+            "custom.fridgeMode",
+            "custom.deodorFilter",
+            "samsungce.dongleSoftwareInstallation",
+            "samsungce.quickControl",
+            "samsungce.deviceInfoPrivate",
+            "demandResponseLoadControl",
+            "samsungce.fridgeVacationMode",
+            "sec.diagnosticsInformation"
+          ],
+          "timestamp": "2025-02-09T13:55:01.720Z"
+        }
+      },
+      "samsungce.driverVersion": {
+        "versionNumber": {
+          "value": 24100101,
+          "timestamp": "2024-11-08T04:14:59.025Z"
+        }
+      },
+      "sec.diagnosticsInformation": {
+        "logType": {
+          "value": null
+        },
+        "endpoint": {
+          "value": null
+        },
+        "minVersion": {
+          "value": null
+        },
+        "signinPermission": {
+          "value": null
+        },
+        "setupId": {
+          "value": null
+        },
+        "protocolType": {
+          "value": null
+        },
+        "tsId": {
+          "value": null
+        },
+        "mnId": {
+          "value": null
+        },
+        "dumpType": {
+          "value": null
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": null
+        }
+      },
+      "custom.deviceReportStateConfiguration": {
+        "reportStateRealtimePeriod": {
+          "value": null
+        },
+        "reportStateRealtime": {
+          "value": {
+            "state": "disabled"
+          },
+          "timestamp": "2025-01-19T21:07:55.703Z"
+        },
+        "reportStatePeriod": {
+          "value": "enabled",
+          "timestamp": "2025-01-19T21:07:55.703Z"
+        }
+      },
+      "thermostatCoolingSetpoint": {
+        "coolingSetpointRange": {
+          "value": null
+        },
+        "coolingSetpoint": {
+          "value": null
+        }
+      },
+      "custom.disabledComponents": {
+        "disabledComponents": {
+          "value": [
+            "icemaker-02",
+            "pantry-01",
+            "pantry-02",
+            "cvroom",
+            "onedoor"
+          ],
+          "timestamp": "2024-11-08T01:09:17.382Z"
+        }
+      },
+      "demandResponseLoadControl": {
+        "drlcStatus": {
+          "value": {
+            "drlcType": 1,
+            "drlcLevel": 0,
+            "duration": 0,
+            "override": false
+          },
+          "timestamp": "2025-01-19T21:07:55.691Z"
+        }
+      },
+      "samsungce.sabbathMode": {
+        "supportedActions": {
+          "value": ["on", "off"],
+          "timestamp": "2025-01-19T21:07:55.799Z"
+        },
+        "status": {
+          "value": "off",
+          "timestamp": "2025-01-19T21:07:55.799Z"
+        }
+      },
+      "powerConsumptionReport": {
+        "powerConsumption": {
+          "value": {
+            "energy": 1568087,
+            "deltaEnergy": 7,
+            "power": 6,
+            "powerEnergy": 13.555977778169844,
+            "persistedEnergy": 0,
+            "energySaved": 0,
+            "start": "2025-02-09T17:38:01Z",
+            "end": "2025-02-09T17:49:00Z"
+          },
+          "timestamp": "2025-02-09T17:49:00.507Z"
+        }
+      },
+      "refresh": {},
+      "execute": {
+        "data": {
+          "value": {
+            "payload": {
+              "rt": ["x.com.samsung.da.rm.micomdata"],
+              "if": ["oic.if.baseline", "oic.if.a"],
+              "x.com.samsung.rm.micomdata": "D0C0022B00000000000DFE15051F5AA54400000000000000000000000000000000000000000000000001F04A00C5E0",
+              "x.com.samsung.rm.micomdataLength": 94
+            }
+          },
+          "data": {
+            "href": "/rm/micomdata/vs/0"
+          },
+          "timestamp": "2023-07-19T05:25:39.852Z"
+        }
+      },
+      "refrigeration": {
+        "defrost": {
+          "value": "off",
+          "timestamp": "2025-01-19T21:07:55.772Z"
+        },
+        "rapidCooling": {
+          "value": "off",
+          "timestamp": "2025-01-19T21:07:55.725Z"
+        },
+        "rapidFreezing": {
+          "value": "off",
+          "timestamp": "2025-01-19T21:07:55.725Z"
+        }
+      },
+      "custom.deodorFilter": {
+        "deodorFilterCapacity": {
+          "value": null
+        },
+        "deodorFilterLastResetDate": {
+          "value": null
+        },
+        "deodorFilterStatus": {
+          "value": null
+        },
+        "deodorFilterResetType": {
+          "value": null
+        },
+        "deodorFilterUsage": {
+          "value": null
+        },
+        "deodorFilterUsageStep": {
+          "value": null
+        }
+      },
+      "samsungce.powerCool": {
+        "activated": {
+          "value": false,
+          "timestamp": "2025-01-19T21:07:55.725Z"
+        }
+      },
+      "custom.energyType": {
+        "energyType": {
+          "value": "2.0",
+          "timestamp": "2022-02-07T10:47:54.524Z"
+        },
+        "energySavingSupport": {
+          "value": false,
+          "timestamp": "2022-02-07T10:47:54.524Z"
+        },
+        "drMaxDuration": {
+          "value": 1440,
+          "unit": "min",
+          "timestamp": "2022-02-07T11:39:47.504Z"
+        },
+        "energySavingLevel": {
+          "value": null
+        },
+        "energySavingInfo": {
+          "value": null
+        },
+        "supportedEnergySavingLevels": {
+          "value": null
+        },
+        "energySavingOperation": {
+          "value": null
+        },
+        "notificationTemplateID": {
+          "value": null
+        },
+        "energySavingOperationSupport": {
+          "value": false,
+          "timestamp": "2022-02-07T11:39:47.504Z"
+        }
+      },
+      "samsungce.softwareUpdate": {
+        "targetModule": {
+          "value": {},
+          "timestamp": "2025-01-19T21:07:55.725Z"
+        },
+        "otnDUID": {
+          "value": "P7CNQWBWM3XBW",
+          "timestamp": "2025-01-19T21:07:55.744Z"
+        },
+        "lastUpdatedDate": {
+          "value": null
+        },
+        "availableModules": {
+          "value": [],
+          "timestamp": "2025-01-19T21:07:55.744Z"
+        },
+        "newVersionAvailable": {
+          "value": false,
+          "timestamp": "2025-01-19T21:07:55.725Z"
+        },
+        "operatingState": {
+          "value": null
+        },
+        "progress": {
+          "value": null
+        }
+      },
+      "samsungce.powerFreeze": {
+        "activated": {
+          "value": false,
+          "timestamp": "2025-01-19T21:07:55.725Z"
+        }
+      },
+      "custom.waterFilter": {
+        "waterFilterUsageStep": {
+          "value": 1,
+          "timestamp": "2025-01-19T21:07:55.758Z"
+        },
+        "waterFilterResetType": {
+          "value": ["replaceable"],
+          "timestamp": "2025-01-19T21:07:55.758Z"
+        },
+        "waterFilterCapacity": {
+          "value": null
+        },
+        "waterFilterLastResetDate": {
+          "value": null
+        },
+        "waterFilterUsage": {
+          "value": 100,
+          "timestamp": "2025-02-09T04:02:12.910Z"
+        },
+        "waterFilterStatus": {
+          "value": "replace",
+          "timestamp": "2025-02-09T04:02:12.910Z"
+        }
+      }
+    },
+    "cvroom": {
+      "custom.fridgeMode": {
+        "fridgeModeValue": {
+          "value": null
+        },
+        "fridgeMode": {
+          "value": null
+        },
+        "supportedFridgeModes": {
+          "value": null
+        }
+      },
+      "contactSensor": {
+        "contact": {
+          "value": null
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": ["temperatureMeasurement", "thermostatCoolingSetpoint"],
+          "timestamp": "2022-02-07T11:39:42.105Z"
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": null
+        }
+      },
+      "thermostatCoolingSetpoint": {
+        "coolingSetpointRange": {
+          "value": null
+        },
+        "coolingSetpoint": {
+          "value": null
+        }
+      }
+    },
+    "icemaker-02": {
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": [],
+          "timestamp": "2022-02-07T11:39:42.105Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": null
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/da_rvc_normal_000001.json b/tests/components/smartthings/fixtures/device_status/da_rvc_normal_000001.json
new file mode 100644
index 00000000000..3bb2011a2b5
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/da_rvc_normal_000001.json
@@ -0,0 +1,274 @@
+{
+  "components": {
+    "main": {
+      "custom.disabledComponents": {
+        "disabledComponents": {
+          "value": ["station"],
+          "timestamp": "2020-11-03T04:43:07.114Z"
+        }
+      },
+      "powerConsumptionReport": {
+        "powerConsumption": {
+          "value": null,
+          "timestamp": "2020-11-03T04:43:07.092Z"
+        }
+      },
+      "refresh": {},
+      "samsungce.robotCleanerOperatingState": {
+        "supportedOperatingState": {
+          "value": [
+            "homing",
+            "error",
+            "idle",
+            "charging",
+            "chargingForRemainingJob",
+            "paused",
+            "cleaning"
+          ],
+          "timestamp": "2020-11-03T04:43:06.547Z"
+        },
+        "operatingState": {
+          "value": "idle",
+          "timestamp": "2023-06-18T15:59:24.580Z"
+        },
+        "cleaningStep": {
+          "value": null
+        },
+        "homingReason": {
+          "value": "none",
+          "timestamp": "2020-11-03T04:43:22.926Z"
+        },
+        "isMapBasedOperationAvailable": {
+          "value": null
+        }
+      },
+      "battery": {
+        "quantity": {
+          "value": null
+        },
+        "battery": {
+          "value": 100,
+          "unit": "%",
+          "timestamp": "2022-09-09T22:55:13.962Z"
+        },
+        "type": {
+          "value": null
+        }
+      },
+      "execute": {
+        "data": {
+          "value": {
+            "payload": {
+              "rt": ["x.com.samsung.da.alarms"],
+              "if": ["oic.if.baseline", "oic.if.a"],
+              "x.com.samsung.da.items": [
+                {
+                  "x.com.samsung.da.code": "4",
+                  "x.com.samsung.da.alarmType": "Device",
+                  "x.com.samsung.da.triggeredTime": "2023-06-18T15:59:30",
+                  "x.com.samsung.da.state": "deleted"
+                }
+              ]
+            }
+          },
+          "data": {
+            "href": "/alarms/vs/0"
+          },
+          "timestamp": "2023-06-18T15:59:28.267Z"
+        }
+      },
+      "samsungce.deviceIdentification": {
+        "micomAssayCode": {
+          "value": null
+        },
+        "modelName": {
+          "value": null
+        },
+        "serialNumber": {
+          "value": null
+        },
+        "serialNumberExtra": {
+          "value": null
+        },
+        "modelClassificationCode": {
+          "value": null
+        },
+        "description": {
+          "value": null
+        },
+        "releaseYear": {
+          "value": null
+        },
+        "binaryId": {
+          "value": null
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2023-06-18T15:59:27.658Z"
+        }
+      },
+      "robotCleanerTurboMode": {
+        "robotCleanerTurboMode": {
+          "value": "off",
+          "timestamp": "2022-09-08T02:53:49.826Z"
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": null,
+          "timestamp": "2020-06-02T23:30:52.793Z"
+        },
+        "mndt": {
+          "value": null,
+          "timestamp": "2020-06-03T13:34:18.508Z"
+        },
+        "mnfv": {
+          "value": "1.0",
+          "timestamp": "2019-07-07T19:45:19.771Z"
+        },
+        "mnhw": {
+          "value": "1.0",
+          "timestamp": "2019-07-07T19:45:19.771Z"
+        },
+        "di": {
+          "value": "3442dfc6-17c0-a65f-dae0-4c6e01786f44",
+          "timestamp": "2019-07-07T19:45:19.771Z"
+        },
+        "mnsl": {
+          "value": null,
+          "timestamp": "2020-06-03T00:49:53.813Z"
+        },
+        "dmv": {
+          "value": "res.1.1.0,sh.1.1.0",
+          "timestamp": "2021-12-23T07:09:40.610Z"
+        },
+        "n": {
+          "value": "[robot vacuum] Samsung",
+          "timestamp": "2019-07-07T19:45:19.771Z"
+        },
+        "mnmo": {
+          "value": "powerbot_7000_17M|50016055|80010404011141000100000000000000",
+          "timestamp": "2022-09-07T06:42:36.551Z"
+        },
+        "vid": {
+          "value": "DA-RVC-NORMAL-000001",
+          "timestamp": "2019-07-07T19:45:19.771Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2019-07-07T19:45:19.771Z"
+        },
+        "mnml": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2019-07-07T19:45:19.771Z"
+        },
+        "mnpv": {
+          "value": "00",
+          "timestamp": "2019-07-07T19:45:19.771Z"
+        },
+        "mnos": {
+          "value": "Tizen(3/0)",
+          "timestamp": "2019-07-07T19:45:19.771Z"
+        },
+        "pi": {
+          "value": "3442dfc6-17c0-a65f-dae0-4c6e01786f44",
+          "timestamp": "2019-07-07T19:45:19.771Z"
+        },
+        "icv": {
+          "value": "core.1.1.0",
+          "timestamp": "2019-07-07T19:45:19.771Z"
+        }
+      },
+      "samsungce.robotCleanerCleaningMode": {
+        "supportedCleaningMode": {
+          "value": ["auto", "spot", "manual", "stop"],
+          "timestamp": "2020-11-03T04:43:06.547Z"
+        },
+        "repeatModeEnabled": {
+          "value": false,
+          "timestamp": "2020-12-21T01:32:56.245Z"
+        },
+        "supportRepeatMode": {
+          "value": true,
+          "timestamp": "2020-11-03T04:43:06.547Z"
+        },
+        "cleaningMode": {
+          "value": "stop",
+          "timestamp": "2022-09-09T21:25:20.601Z"
+        }
+      },
+      "robotCleanerMovement": {
+        "robotCleanerMovement": {
+          "value": "idle",
+          "timestamp": "2023-06-18T15:59:24.580Z"
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": [
+            "samsungce.robotCleanerMapAreaInfo",
+            "samsungce.robotCleanerMapCleaningInfo",
+            "samsungce.robotCleanerPatrol",
+            "samsungce.robotCleanerPetMonitoring",
+            "samsungce.robotCleanerPetMonitoringReport",
+            "samsungce.robotCleanerPetCleaningSchedule",
+            "soundDetection",
+            "samsungce.soundDetectionSensitivity",
+            "samsungce.musicPlaylist",
+            "mediaPlayback",
+            "mediaTrackControl",
+            "imageCapture",
+            "videoCapture",
+            "audioVolume",
+            "audioMute",
+            "audioNotification",
+            "powerConsumptionReport",
+            "custom.hepaFilter",
+            "samsungce.robotCleanerMotorFilter",
+            "samsungce.robotCleanerRelayCleaning",
+            "audioTrackAddressing",
+            "samsungce.robotCleanerWelcome"
+          ],
+          "timestamp": "2022-09-08T01:03:48.820Z"
+        }
+      },
+      "robotCleanerCleaningMode": {
+        "robotCleanerCleaningMode": {
+          "value": "stop",
+          "timestamp": "2022-09-09T21:25:20.601Z"
+        }
+      },
+      "samsungce.softwareUpdate": {
+        "targetModule": {
+          "value": null
+        },
+        "otnDUID": {
+          "value": null
+        },
+        "lastUpdatedDate": {
+          "value": null
+        },
+        "availableModules": {
+          "value": null
+        },
+        "newVersionAvailable": {
+          "value": null
+        },
+        "operatingState": {
+          "value": null
+        },
+        "progress": {
+          "value": null
+        }
+      },
+      "samsungce.driverVersion": {
+        "versionNumber": {
+          "value": 22100101,
+          "timestamp": "2022-11-01T09:26:07.107Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/da_sac_ehs_000001_sub.json b/tests/components/smartthings/fixtures/device_status/da_sac_ehs_000001_sub.json
new file mode 100644
index 00000000000..e27c6c3de21
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/da_sac_ehs_000001_sub.json
@@ -0,0 +1,680 @@
+{
+  "components": {
+    "main": {
+      "demandResponseLoadControl": {
+        "drlcStatus": {
+          "value": {
+            "drlcType": 1,
+            "drlcLevel": -1,
+            "start": "1970-01-01T00:00:00Z",
+            "duration": 0,
+            "override": false
+          },
+          "timestamp": "2025-03-09T08:18:06.394Z"
+        }
+      },
+      "powerConsumptionReport": {
+        "powerConsumption": {
+          "value": {
+            "energy": 8193810.0,
+            "deltaEnergy": 0,
+            "power": 2.539,
+            "powerEnergy": 0.009404173966911105,
+            "persistedEnergy": 8193810.0,
+            "energySaved": 0,
+            "start": "2025-03-09T11:14:44Z",
+            "end": "2025-03-09T11:14:57Z"
+          },
+          "timestamp": "2025-03-09T11:14:57.338Z"
+        }
+      },
+      "samsungce.ehsCycleData": {
+        "outdoor": {
+          "value": [
+            {
+              "timestamp": "2025-03-09T02:00:29Z",
+              "data": "0038003870FF3C3B46020218019A00050000"
+            },
+            {
+              "timestamp": "2025-03-09T02:05:29Z",
+              "data": "0034003471FF3C3C46020218019A00050000"
+            },
+            {
+              "timestamp": "2025-03-09T02:10:29Z",
+              "data": "002D002D71FF3D3D460201C9019A00050000"
+            }
+          ],
+          "unit": "C",
+          "timestamp": "2025-03-09T11:11:30.786Z"
+        },
+        "indoor": {
+          "value": [
+            {
+              "timestamp": "2025-03-09T02:00:29Z",
+              "data": "5F055C050505002564000000000000000001FFFF00079440"
+            },
+            {
+              "timestamp": "2025-03-09T02:05:29Z",
+              "data": "60055E050505002563000000000000000001FFFF00079445"
+            },
+            {
+              "timestamp": "2025-03-09T02:10:29Z",
+              "data": "61055F050505002560000000000000000001FFFF0007944B"
+            }
+          ],
+          "unit": "C",
+          "timestamp": "2025-03-09T11:11:30.786Z"
+        }
+      },
+      "custom.outingMode": {
+        "outingMode": {
+          "value": "off",
+          "timestamp": "2025-03-09T08:00:05.571Z"
+        }
+      },
+      "samsungce.ehsThermostat": {
+        "connectionState": {
+          "value": "disconnected",
+          "timestamp": "2025-03-09T08:00:05.562Z"
+        }
+      },
+      "refresh": {},
+      "custom.thermostatSetpointControl": {
+        "minimumSetpoint": {
+          "value": 40,
+          "unit": "C",
+          "timestamp": "2025-03-09T08:18:06.394Z"
+        },
+        "maximumSetpoint": {
+          "value": 55,
+          "unit": "C",
+          "timestamp": "2025-03-09T08:18:06.394Z"
+        }
+      },
+      "airConditionerMode": {
+        "availableAcModes": {
+          "value": null
+        },
+        "supportedAcModes": {
+          "value": ["eco", "std", "force"],
+          "timestamp": "2025-03-09T08:18:06.394Z"
+        },
+        "airConditionerMode": {
+          "value": "std",
+          "timestamp": "2025-03-09T08:00:05.562Z"
+        }
+      },
+      "samsungce.ehsFsvSettings": {
+        "fsvSettings": {
+          "value": [
+            {
+              "id": "1031",
+              "inUse": true,
+              "resolution": 1,
+              "type": "temperature",
+              "minValue": 37,
+              "maxValue": 70,
+              "value": 70,
+              "isValid": true,
+              "temperatureUnit": "C"
+            },
+            {
+              "id": "1032",
+              "inUse": true,
+              "resolution": 1,
+              "type": "temperature",
+              "minValue": 15,
+              "maxValue": 37,
+              "value": 25,
+              "isValid": true,
+              "temperatureUnit": "C"
+            },
+            {
+              "id": "1051",
+              "inUse": true,
+              "resolution": 1,
+              "type": "temperature",
+              "minValue": 50,
+              "maxValue": 70,
+              "value": 55,
+              "isValid": true,
+              "temperatureUnit": "C"
+            },
+            {
+              "id": "1052",
+              "inUse": true,
+              "resolution": 1,
+              "type": "temperature",
+              "minValue": 30,
+              "maxValue": 40,
+              "value": 40,
+              "isValid": true,
+              "temperatureUnit": "C"
+            },
+            {
+              "id": "2011",
+              "inUse": true,
+              "resolution": 1,
+              "type": "temperature",
+              "minValue": -20,
+              "maxValue": 5,
+              "value": -3,
+              "isValid": true,
+              "temperatureUnit": "C"
+            },
+            {
+              "id": "2012",
+              "inUse": true,
+              "resolution": 1,
+              "type": "temperature",
+              "minValue": 10,
+              "maxValue": 20,
+              "value": 15,
+              "isValid": true,
+              "temperatureUnit": "C"
+            },
+            {
+              "id": "2021",
+              "inUse": true,
+              "resolution": 1,
+              "type": "temperature",
+              "minValue": 17,
+              "maxValue": 70,
+              "value": 50,
+              "isValid": true,
+              "temperatureUnit": "C"
+            },
+            {
+              "id": "2022",
+              "inUse": true,
+              "resolution": 1,
+              "type": "temperature",
+              "minValue": 17,
+              "maxValue": 70,
+              "value": 32,
+              "isValid": true,
+              "temperatureUnit": "C"
+            },
+            {
+              "id": "2031",
+              "inUse": true,
+              "resolution": 1,
+              "type": "temperature",
+              "minValue": 17,
+              "maxValue": 70,
+              "value": 50,
+              "isValid": true,
+              "temperatureUnit": "C"
+            },
+            {
+              "id": "2032",
+              "inUse": true,
+              "resolution": 1,
+              "type": "temperature",
+              "minValue": 17,
+              "maxValue": 70,
+              "value": 38,
+              "isValid": true,
+              "temperatureUnit": "C"
+            },
+            {
+              "id": "2091",
+              "inUse": true,
+              "resolution": 1,
+              "type": "etc",
+              "minValue": 0,
+              "maxValue": 4,
+              "value": 0,
+              "isValid": true
+            },
+            {
+              "id": "2092",
+              "inUse": true,
+              "resolution": 1,
+              "type": "etc",
+              "minValue": 0,
+              "maxValue": 4,
+              "value": 0,
+              "isValid": true
+            },
+            {
+              "id": "2093",
+              "inUse": true,
+              "resolution": 1,
+              "type": "etc",
+              "minValue": 1,
+              "maxValue": 4,
+              "value": 4,
+              "isValid": true
+            },
+            {
+              "id": "3011",
+              "inUse": true,
+              "resolution": 1,
+              "type": "etc",
+              "minValue": 0,
+              "maxValue": 2,
+              "value": 2,
+              "isValid": true
+            },
+            {
+              "id": "3071",
+              "inUse": true,
+              "resolution": 1,
+              "type": "etc",
+              "minValue": 0,
+              "maxValue": 1,
+              "value": 0,
+              "isValid": true
+            },
+            {
+              "id": "4011",
+              "inUse": true,
+              "resolution": 1,
+              "type": "etc",
+              "minValue": 0,
+              "maxValue": 1,
+              "value": 0,
+              "isValid": true
+            },
+            {
+              "id": "4012",
+              "inUse": true,
+              "resolution": 1,
+              "type": "temperature",
+              "minValue": -15,
+              "maxValue": 20,
+              "value": 0,
+              "isValid": true,
+              "temperatureUnit": "C"
+            },
+            {
+              "id": "4021",
+              "inUse": true,
+              "resolution": 1,
+              "type": "etc",
+              "minValue": 0,
+              "maxValue": 2,
+              "value": 0,
+              "isValid": true
+            },
+            {
+              "id": "4042",
+              "inUse": true,
+              "resolution": 1,
+              "type": "temperature",
+              "minValue": 5,
+              "maxValue": 15,
+              "value": 10,
+              "isValid": true,
+              "temperatureUnit": "C"
+            },
+            {
+              "id": "4061",
+              "inUse": true,
+              "resolution": 1,
+              "type": "etc",
+              "minValue": 0,
+              "maxValue": 1,
+              "value": 0,
+              "isValid": true
+            }
+          ],
+          "timestamp": "2025-03-09T08:18:06.394Z"
+        }
+      },
+      "execute": {
+        "data": {
+          "value": {
+            "payload": {
+              "rt": ["x.com.samsung.da.information"],
+              "if": ["oic.if.a"],
+              "x.com.samsung.da.modelNum": "SAC_EHS_MONO|220614|61007400001600000400000000000000",
+              "x.com.samsung.da.description": "EHS",
+              "x.com.samsung.da.serialNum": "",
+              "x.com.samsung.da.versionId": "Samsung Electronics",
+              "x.com.samsung.da.items": [
+                {
+                  "x.com.samsung.da.number": "DB91-02102A 2023-01-11",
+                  "x.com.samsung.da.type": "Software",
+                  "x.com.samsung.da.newVersionAvailable": "false",
+                  "x.com.samsung.da.id": "0",
+                  "x.com.samsung.da.description": "Version"
+                },
+                {
+                  "x.com.samsung.da.number": "DB91-02100A 2020-07-10",
+                  "x.com.samsung.da.type": "Firmware",
+                  "x.com.samsung.da.newVersionAvailable": "false",
+                  "x.com.samsung.da.id": "1",
+                  "x.com.samsung.da.description": "Version"
+                },
+                {
+                  "x.com.samsung.da.number": "DB91-02103B 2022-06-14",
+                  "x.com.samsung.da.type": "Firmware",
+                  "x.com.samsung.da.newVersionAvailable": "false",
+                  "x.com.samsung.da.id": "2",
+                  "x.com.samsung.da.description": ""
+                },
+                {
+                  "x.com.samsung.da.number": "DB91-02450A 2022-07-06",
+                  "x.com.samsung.da.type": "Firmware",
+                  "x.com.samsung.da.newVersionAvailable": "false",
+                  "x.com.samsung.da.id": "3",
+                  "x.com.samsung.da.description": "EHS MONO LOWTEMP"
+                }
+              ]
+            }
+          },
+          "data": {
+            "href": "/information/vs/0"
+          },
+          "timestamp": "2023-08-02T14:32:28.435Z"
+        }
+      },
+      "samsungce.deviceIdentification": {
+        "micomAssayCode": {
+          "value": null
+        },
+        "modelName": {
+          "value": null
+        },
+        "serialNumber": {
+          "value": null
+        },
+        "serialNumberExtra": {
+          "value": null
+        },
+        "modelClassificationCode": {
+          "value": null
+        },
+        "description": {
+          "value": null
+        },
+        "releaseYear": {
+          "value": null
+        },
+        "binaryId": {
+          "value": "SAC_EHS_MONO",
+          "timestamp": "2025-03-09T08:18:06.394Z"
+        }
+      },
+      "samsungce.sacDisplayCondition": {
+        "switch": {
+          "value": "enabled",
+          "timestamp": "2025-03-09T08:00:05.514Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-03-09T11:00:27.522Z"
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": "2025-03-06T08:37:35Z",
+          "timestamp": "2025-03-09T08:18:05.953Z"
+        },
+        "mndt": {
+          "value": "",
+          "timestamp": "2025-03-09T08:18:05.953Z"
+        },
+        "mnfv": {
+          "value": "20240611.1",
+          "timestamp": "2025-03-09T08:18:05.953Z"
+        },
+        "mnhw": {
+          "value": "",
+          "timestamp": "2025-03-09T08:18:05.953Z"
+        },
+        "di": {
+          "value": "1f98ebd0-ac48-d802-7f62-000001200100",
+          "timestamp": "2025-03-09T08:18:05.955Z"
+        },
+        "mnsl": {
+          "value": "",
+          "timestamp": "2025-03-09T08:18:05.953Z"
+        },
+        "dmv": {
+          "value": "res.1.1.0,sh.1.1.0",
+          "timestamp": "2025-03-09T08:18:05.955Z"
+        },
+        "n": {
+          "value": "Eco Heating System",
+          "timestamp": "2025-03-09T08:18:05.955Z"
+        },
+        "mnmo": {
+          "value": "SAC_EHS_MONO|220614|61007400001600000400000000000000",
+          "timestamp": "2025-03-09T08:18:06.394Z"
+        },
+        "vid": {
+          "value": "DA-SAC-EHS-000001-SUB",
+          "timestamp": "2025-03-09T08:18:05.953Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2025-03-09T08:18:05.953Z"
+        },
+        "mnml": {
+          "value": "",
+          "timestamp": "2025-03-09T08:18:05.953Z"
+        },
+        "mnpv": {
+          "value": "4.0",
+          "timestamp": "2025-03-09T08:18:05.953Z"
+        },
+        "mnos": {
+          "value": "Tizen",
+          "timestamp": "2025-03-09T08:18:05.953Z"
+        },
+        "pi": {
+          "value": "1f98ebd0-ac48-d802-7f62-000001200100",
+          "timestamp": "2025-03-09T08:18:05.953Z"
+        },
+        "icv": {
+          "value": "core.1.1.0",
+          "timestamp": "2025-03-09T08:18:05.955Z"
+        }
+      },
+      "remoteControlStatus": {
+        "remoteControlEnabled": {
+          "value": "true",
+          "timestamp": "2025-03-09T08:18:06.394Z"
+        }
+      },
+      "custom.energyType": {
+        "energyType": {
+          "value": "2.0",
+          "timestamp": "2025-03-09T08:18:06.394Z"
+        },
+        "energySavingSupport": {
+          "value": false,
+          "timestamp": "2023-08-02T14:36:25.480Z"
+        },
+        "drMaxDuration": {
+          "value": null
+        },
+        "energySavingLevel": {
+          "value": null
+        },
+        "energySavingInfo": {
+          "value": null
+        },
+        "supportedEnergySavingLevels": {
+          "value": null
+        },
+        "energySavingOperation": {
+          "value": null
+        },
+        "notificationTemplateID": {
+          "value": null
+        },
+        "energySavingOperationSupport": {
+          "value": null
+        }
+      },
+      "samsungce.toggleSwitch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-03-09T11:00:22.880Z"
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": ["remoteControlStatus", "demandResponseLoadControl"],
+          "timestamp": "2025-03-09T08:31:30.641Z"
+        }
+      },
+      "samsungce.driverVersion": {
+        "versionNumber": {
+          "value": 23070101,
+          "timestamp": "2023-08-02T14:32:26.195Z"
+        }
+      },
+      "samsungce.softwareUpdate": {
+        "targetModule": {
+          "value": null
+        },
+        "otnDUID": {
+          "value": null
+        },
+        "lastUpdatedDate": {
+          "value": null
+        },
+        "availableModules": {
+          "value": [],
+          "timestamp": "2025-03-09T08:18:06.394Z"
+        },
+        "newVersionAvailable": {
+          "value": false,
+          "timestamp": "2025-03-09T08:18:06.394Z"
+        },
+        "operatingState": {
+          "value": null
+        },
+        "progress": {
+          "value": null
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 54.3,
+          "unit": "C",
+          "timestamp": "2025-03-09T10:43:24.134Z"
+        }
+      },
+      "custom.deviceReportStateConfiguration": {
+        "reportStateRealtimePeriod": {
+          "value": "enabled",
+          "timestamp": "2024-11-08T01:41:37.280Z"
+        },
+        "reportStateRealtime": {
+          "value": {
+            "state": "disabled"
+          },
+          "timestamp": "2025-03-08T12:06:55.069Z"
+        },
+        "reportStatePeriod": {
+          "value": "enabled",
+          "timestamp": "2024-11-08T01:41:37.280Z"
+        }
+      },
+      "samsungce.ehsTemperatureReference": {
+        "temperatureReference": {
+          "value": "water",
+          "timestamp": "2025-03-09T07:15:48.438Z"
+        }
+      },
+      "thermostatCoolingSetpoint": {
+        "coolingSetpointRange": {
+          "value": null
+        },
+        "coolingSetpoint": {
+          "value": 48,
+          "unit": "C",
+          "timestamp": "2025-03-09T10:58:50.857Z"
+        }
+      }
+    },
+    "INDOOR": {
+      "samsungce.ehsThermostat": {
+        "connectionState": {
+          "value": "disconnected",
+          "timestamp": "2025-03-09T08:18:06.394Z"
+        }
+      },
+      "samsungce.toggleSwitch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-03-09T11:14:44.775Z"
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 39.2,
+          "unit": "C",
+          "timestamp": "2025-03-09T11:15:49.852Z"
+        }
+      },
+      "custom.thermostatSetpointControl": {
+        "minimumSetpoint": {
+          "value": 25,
+          "unit": "C",
+          "timestamp": "2025-03-09T07:06:20.699Z"
+        },
+        "maximumSetpoint": {
+          "value": 65,
+          "unit": "C",
+          "timestamp": "2025-03-09T07:06:20.699Z"
+        }
+      },
+      "airConditionerMode": {
+        "availableAcModes": {
+          "value": null
+        },
+        "supportedAcModes": {
+          "value": ["auto", "cool", "heat"],
+          "timestamp": "2025-03-09T08:18:06.394Z"
+        },
+        "airConditionerMode": {
+          "value": "heat",
+          "timestamp": "2025-03-09T08:18:06.394Z"
+        }
+      },
+      "samsungce.ehsTemperatureReference": {
+        "temperatureReference": {
+          "value": "water",
+          "timestamp": "2025-03-09T07:06:20.699Z"
+        }
+      },
+      "thermostatCoolingSetpoint": {
+        "coolingSetpointRange": {
+          "value": null
+        },
+        "coolingSetpoint": {
+          "value": 25,
+          "unit": "C",
+          "timestamp": "2025-03-09T11:14:44.734Z"
+        }
+      },
+      "samsungce.sacDisplayCondition": {
+        "switch": {
+          "value": "enabled",
+          "timestamp": "2025-03-09T08:18:06.394Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-03-09T11:14:57.238Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/da_wm_dw_000001.json b/tests/components/smartthings/fixtures/device_status/da_wm_dw_000001.json
new file mode 100644
index 00000000000..5535055f686
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/da_wm_dw_000001.json
@@ -0,0 +1,786 @@
+{
+  "components": {
+    "main": {
+      "samsungce.dishwasherWashingCourse": {
+        "customCourseCandidates": {
+          "value": null
+        },
+        "washingCourse": {
+          "value": "normal",
+          "timestamp": "2025-02-08T20:21:26.497Z"
+        },
+        "supportedCourses": {
+          "value": [
+            "auto",
+            "normal",
+            "heavy",
+            "delicate",
+            "express",
+            "rinseOnly",
+            "selfClean"
+          ],
+          "timestamp": "2025-02-08T18:00:37.194Z"
+        }
+      },
+      "dishwasherOperatingState": {
+        "completionTime": {
+          "value": "2025-02-08T22:49:26Z",
+          "timestamp": "2025-02-08T20:21:26.452Z"
+        },
+        "machineState": {
+          "value": "stop",
+          "timestamp": "2025-02-08T20:21:26.452Z"
+        },
+        "progress": {
+          "value": null
+        },
+        "supportedMachineStates": {
+          "value": ["stop", "run", "pause"],
+          "timestamp": "2024-09-10T10:21:02.853Z"
+        },
+        "dishwasherJobState": {
+          "value": "unknown",
+          "timestamp": "2025-02-08T20:21:26.452Z"
+        }
+      },
+      "samsungce.dishwasherWashingOptions": {
+        "dryPlus": {
+          "value": null
+        },
+        "stormWash": {
+          "value": null
+        },
+        "hotAirDry": {
+          "value": null
+        },
+        "selectedZone": {
+          "value": {
+            "value": "all",
+            "settable": ["none", "upper", "lower", "all"]
+          },
+          "timestamp": "2022-11-09T00:20:42.461Z"
+        },
+        "speedBooster": {
+          "value": {
+            "value": false,
+            "settable": [false, true]
+          },
+          "timestamp": "2023-11-24T14:46:55.375Z"
+        },
+        "highTempWash": {
+          "value": {
+            "value": false,
+            "settable": [false, true]
+          },
+          "timestamp": "2025-02-08T07:39:54.739Z"
+        },
+        "sanitizingWash": {
+          "value": null
+        },
+        "heatedDry": {
+          "value": null
+        },
+        "zoneBooster": {
+          "value": {
+            "value": "none",
+            "settable": ["none", "left", "right", "all"]
+          },
+          "timestamp": "2022-11-20T07:10:27.445Z"
+        },
+        "addRinse": {
+          "value": null
+        },
+        "supportedList": {
+          "value": [
+            "selectedZone",
+            "zoneBooster",
+            "speedBooster",
+            "sanitize",
+            "highTempWash"
+          ],
+          "timestamp": "2021-06-27T01:19:38.000Z"
+        },
+        "rinsePlus": {
+          "value": null
+        },
+        "sanitize": {
+          "value": {
+            "value": false,
+            "settable": [false, true]
+          },
+          "timestamp": "2025-01-18T23:49:09.964Z"
+        },
+        "steamSoak": {
+          "value": null
+        }
+      },
+      "samsungce.deviceIdentification": {
+        "micomAssayCode": {
+          "value": null
+        },
+        "modelName": {
+          "value": null
+        },
+        "serialNumber": {
+          "value": null
+        },
+        "serialNumberExtra": {
+          "value": null
+        },
+        "modelClassificationCode": {
+          "value": null
+        },
+        "description": {
+          "value": null
+        },
+        "releaseYear": {
+          "value": null
+        },
+        "binaryId": {
+          "value": "DA_DW_A51_20_COMMON",
+          "timestamp": "2025-02-08T19:29:30.987Z"
+        }
+      },
+      "custom.dishwasherOperatingProgress": {
+        "dishwasherOperatingProgress": {
+          "value": "none",
+          "timestamp": "2025-02-08T20:21:26.452Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-02-08T20:21:26.386Z"
+        }
+      },
+      "samsungce.quickControl": {
+        "version": {
+          "value": null
+        }
+      },
+      "samsungce.waterConsumptionReport": {
+        "waterConsumption": {
+          "value": null
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": null
+        },
+        "mndt": {
+          "value": null
+        },
+        "mnfv": {
+          "value": "DA_DW_A51_20_COMMON_30230714",
+          "timestamp": "2023-11-02T15:58:55.699Z"
+        },
+        "mnhw": {
+          "value": "ARTIK051",
+          "timestamp": "2021-06-27T01:19:37.615Z"
+        },
+        "di": {
+          "value": "f36dc7ce-cac0-0667-dc14-a3704eb5e676",
+          "timestamp": "2021-06-27T01:19:37.615Z"
+        },
+        "mnsl": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2021-06-27T01:19:37.615Z"
+        },
+        "dmv": {
+          "value": "res.1.1.0,sh.1.1.0",
+          "timestamp": "2024-07-04T13:53:32.032Z"
+        },
+        "n": {
+          "value": "[dishwasher] Samsung",
+          "timestamp": "2021-06-27T01:19:37.615Z"
+        },
+        "mnmo": {
+          "value": "DA_DW_A51_20_COMMON|30007242|40010201001311000101000000000000",
+          "timestamp": "2021-06-27T01:19:37.615Z"
+        },
+        "vid": {
+          "value": "DA-WM-DW-000001",
+          "timestamp": "2021-06-27T01:19:37.615Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2021-06-27T01:19:37.615Z"
+        },
+        "mnml": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2021-06-27T01:19:37.615Z"
+        },
+        "mnpv": {
+          "value": "DAWIT 2.0",
+          "timestamp": "2021-06-27T01:19:37.615Z"
+        },
+        "mnos": {
+          "value": "TizenRT 1.0 + IPv6",
+          "timestamp": "2021-06-27T01:19:37.615Z"
+        },
+        "pi": {
+          "value": "f36dc7ce-cac0-0667-dc14-a3704eb5e676",
+          "timestamp": "2021-06-27T01:19:37.615Z"
+        },
+        "icv": {
+          "value": "core.1.1.0",
+          "timestamp": "2021-06-27T01:19:37.615Z"
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": [
+            "samsungce.waterConsumptionReport",
+            "sec.wifiConfiguration",
+            "samsungce.quickControl",
+            "samsungce.deviceInfoPrivate",
+            "demandResponseLoadControl",
+            "sec.diagnosticsInformation",
+            "custom.waterFilter"
+          ],
+          "timestamp": "2025-02-08T19:29:32.447Z"
+        }
+      },
+      "samsungce.driverVersion": {
+        "versionNumber": {
+          "value": 24040105,
+          "timestamp": "2024-07-02T02:56:22.508Z"
+        }
+      },
+      "sec.diagnosticsInformation": {
+        "logType": {
+          "value": null
+        },
+        "endpoint": {
+          "value": null
+        },
+        "minVersion": {
+          "value": null
+        },
+        "signinPermission": {
+          "value": null
+        },
+        "setupId": {
+          "value": null
+        },
+        "protocolType": {
+          "value": null
+        },
+        "tsId": {
+          "value": null
+        },
+        "mnId": {
+          "value": null
+        },
+        "dumpType": {
+          "value": null
+        }
+      },
+      "samsungce.dishwasherOperation": {
+        "supportedOperatingState": {
+          "value": ["ready", "running", "paused"],
+          "timestamp": "2024-09-10T10:21:02.853Z"
+        },
+        "operatingState": {
+          "value": "ready",
+          "timestamp": "2025-02-08T20:21:26.452Z"
+        },
+        "reservable": {
+          "value": false,
+          "timestamp": "2025-02-08T18:00:37.194Z"
+        },
+        "progressPercentage": {
+          "value": 1,
+          "timestamp": "2025-02-08T20:21:26.452Z"
+        },
+        "remainingTimeStr": {
+          "value": "02:28",
+          "timestamp": "2025-02-08T20:21:26.452Z"
+        },
+        "operationTime": {
+          "value": null
+        },
+        "remainingTime": {
+          "value": 148.0,
+          "unit": "min",
+          "timestamp": "2025-02-08T20:21:26.452Z"
+        },
+        "timeLeftToStart": {
+          "value": 0.0,
+          "unit": "min",
+          "timestamp": "2025-02-08T18:00:37.482Z"
+        }
+      },
+      "samsungce.dishwasherJobState": {
+        "scheduledJobs": {
+          "value": [
+            {
+              "jobName": "washing",
+              "timeInSec": 3600
+            },
+            {
+              "jobName": "rinsing",
+              "timeInSec": 1020
+            },
+            {
+              "jobName": "drying",
+              "timeInSec": 1200
+            }
+          ],
+          "timestamp": "2025-02-08T20:21:26.928Z"
+        },
+        "dishwasherJobState": {
+          "value": "none",
+          "timestamp": "2025-02-08T20:21:26.452Z"
+        }
+      },
+      "samsungce.kidsLock": {
+        "lockState": {
+          "value": "unlocked",
+          "timestamp": "2025-02-08T18:00:37.450Z"
+        }
+      },
+      "demandResponseLoadControl": {
+        "drlcStatus": {
+          "value": null
+        }
+      },
+      "powerConsumptionReport": {
+        "powerConsumption": {
+          "value": {
+            "energy": 101600,
+            "deltaEnergy": 0,
+            "power": 0,
+            "powerEnergy": 0.0,
+            "persistedEnergy": 0,
+            "energySaved": 0,
+            "persistedSavedEnergy": 0,
+            "start": "2025-02-08T20:21:21Z",
+            "end": "2025-02-08T20:21:26Z"
+          },
+          "timestamp": "2025-02-08T20:21:26.596Z"
+        }
+      },
+      "refresh": {},
+      "samsungce.dishwasherWashingCourseDetails": {
+        "predefinedCourses": {
+          "value": [
+            {
+              "courseName": "auto",
+              "energyUsage": 3,
+              "waterUsage": 3,
+              "temperature": {
+                "min": 50,
+                "max": 60,
+                "unit": "C"
+              },
+              "expectedTime": {
+                "time": 136,
+                "unit": "min"
+              },
+              "options": {
+                "highTempWash": {
+                  "default": false,
+                  "settable": [false, true]
+                },
+                "sanitize": {
+                  "default": false,
+                  "settable": [false, true]
+                },
+                "speedBooster": {
+                  "default": false,
+                  "settable": [false, true]
+                },
+                "zoneBooster": {
+                  "default": "none",
+                  "settable": ["none", "left"]
+                },
+                "selectedZone": {
+                  "default": "all",
+                  "settable": ["none", "lower", "all"]
+                }
+              }
+            },
+            {
+              "courseName": "normal",
+              "energyUsage": 3,
+              "waterUsage": 4,
+              "temperature": {
+                "min": 45,
+                "max": 62,
+                "unit": "C"
+              },
+              "expectedTime": {
+                "time": 148,
+                "unit": "min"
+              },
+              "options": {
+                "highTempWash": {
+                  "default": false,
+                  "settable": [false, true]
+                },
+                "sanitize": {
+                  "default": false,
+                  "settable": [false, true]
+                },
+                "speedBooster": {
+                  "default": false,
+                  "settable": [false, true]
+                },
+                "zoneBooster": {
+                  "default": "none",
+                  "settable": ["none", "left"]
+                },
+                "selectedZone": {
+                  "default": "all",
+                  "settable": ["none", "lower", "all"]
+                }
+              }
+            },
+            {
+              "courseName": "heavy",
+              "energyUsage": 4,
+              "waterUsage": 5,
+              "temperature": {
+                "min": 65,
+                "max": 65,
+                "unit": "C"
+              },
+              "expectedTime": {
+                "time": 155,
+                "unit": "min"
+              },
+              "options": {
+                "highTempWash": {
+                  "default": false,
+                  "settable": [false, true]
+                },
+                "sanitize": {
+                  "default": false,
+                  "settable": [false, true]
+                },
+                "speedBooster": {
+                  "default": false,
+                  "settable": [false, true]
+                },
+                "zoneBooster": {
+                  "default": "none",
+                  "settable": ["none", "left"]
+                },
+                "selectedZone": {
+                  "default": "all",
+                  "settable": ["none", "lower", "all"]
+                }
+              }
+            },
+            {
+              "courseName": "delicate",
+              "energyUsage": 2,
+              "waterUsage": 3,
+              "temperature": {
+                "min": 50,
+                "max": 50,
+                "unit": "C"
+              },
+              "expectedTime": {
+                "time": 112,
+                "unit": "min"
+              },
+              "options": {
+                "highTempWash": {
+                  "default": false,
+                  "settable": []
+                },
+                "sanitize": {
+                  "default": false,
+                  "settable": []
+                },
+                "speedBooster": {
+                  "default": false,
+                  "settable": [false, true]
+                },
+                "zoneBooster": {
+                  "default": "none",
+                  "settable": []
+                },
+                "selectedZone": {
+                  "default": "all",
+                  "settable": ["none", "lower", "all"]
+                }
+              }
+            },
+            {
+              "courseName": "express",
+              "energyUsage": 2,
+              "waterUsage": 2,
+              "temperature": {
+                "min": 52,
+                "max": 52,
+                "unit": "C"
+              },
+              "expectedTime": {
+                "time": 60,
+                "unit": "min"
+              },
+              "options": {
+                "highTempWash": {
+                  "default": false,
+                  "settable": [false, true]
+                },
+                "sanitize": {
+                  "default": false,
+                  "settable": [false, true]
+                },
+                "speedBooster": {
+                  "default": false,
+                  "settable": []
+                },
+                "zoneBooster": {
+                  "default": "none",
+                  "settable": ["none", "left"]
+                },
+                "selectedZone": {
+                  "default": "all",
+                  "settable": ["none", "lower", "all"]
+                }
+              }
+            },
+            {
+              "courseName": "rinseOnly",
+              "energyUsage": 1,
+              "waterUsage": 1,
+              "temperature": {
+                "min": 40,
+                "max": 40,
+                "unit": "C"
+              },
+              "expectedTime": {
+                "time": 14,
+                "unit": "min"
+              },
+              "options": {
+                "highTempWash": {
+                  "default": false,
+                  "settable": []
+                },
+                "sanitize": {
+                  "default": false,
+                  "settable": []
+                },
+                "speedBooster": {
+                  "default": false,
+                  "settable": []
+                },
+                "zoneBooster": {
+                  "default": "none",
+                  "settable": []
+                },
+                "selectedZone": {
+                  "default": "all",
+                  "settable": ["none", "lower", "all"]
+                }
+              }
+            },
+            {
+              "courseName": "selfClean",
+              "energyUsage": 5,
+              "waterUsage": 4,
+              "temperature": {
+                "min": 70,
+                "max": 70,
+                "unit": "C"
+              },
+              "expectedTime": {
+                "time": 139,
+                "unit": "min"
+              },
+              "options": {
+                "highTempWash": {
+                  "default": false,
+                  "settable": []
+                },
+                "sanitize": {
+                  "default": false,
+                  "settable": []
+                },
+                "speedBooster": {
+                  "default": false,
+                  "settable": []
+                },
+                "zoneBooster": {
+                  "default": "none",
+                  "settable": []
+                },
+                "selectedZone": {
+                  "default": "all",
+                  "settable": ["none", "all"]
+                }
+              }
+            }
+          ],
+          "timestamp": "2025-02-08T18:00:37.194Z"
+        },
+        "waterUsageMax": {
+          "value": 5,
+          "timestamp": "2025-02-08T18:00:37.194Z"
+        },
+        "energyUsageMax": {
+          "value": 5,
+          "timestamp": "2025-02-08T18:00:37.194Z"
+        }
+      },
+      "execute": {
+        "data": {
+          "value": {
+            "payload": {
+              "rt": ["oic.r.operational.state"],
+              "if": ["oic.if.baseline", "oic.if.a"],
+              "currentMachineState": "idle",
+              "machineStates": ["pause", "active", "idle"],
+              "jobStates": [
+                "None",
+                "Predrain",
+                "Prewash",
+                "Wash",
+                "Rinse",
+                "Drying",
+                "Finish"
+              ],
+              "currentJobState": "None",
+              "remainingTime": "02:16:00",
+              "progressPercentage": "1"
+            }
+          },
+          "data": {
+            "href": "/operational/state/0"
+          },
+          "timestamp": "2023-07-19T04:23:15.606Z"
+        }
+      },
+      "sec.wifiConfiguration": {
+        "autoReconnection": {
+          "value": null
+        },
+        "minVersion": {
+          "value": null
+        },
+        "supportedWiFiFreq": {
+          "value": null
+        },
+        "supportedAuthType": {
+          "value": null
+        },
+        "protocolType": {
+          "value": null
+        }
+      },
+      "custom.dishwasherOperatingPercentage": {
+        "dishwasherOperatingPercentage": {
+          "value": 1,
+          "timestamp": "2025-02-08T20:21:26.452Z"
+        }
+      },
+      "remoteControlStatus": {
+        "remoteControlEnabled": {
+          "value": "false",
+          "timestamp": "2025-02-08T18:00:37.555Z"
+        }
+      },
+      "custom.supportedOptions": {
+        "course": {
+          "value": null
+        },
+        "referenceTable": {
+          "value": null
+        },
+        "supportedCourses": {
+          "value": ["82", "83", "84", "85", "86", "87", "88"],
+          "timestamp": "2025-02-08T18:00:37.194Z"
+        }
+      },
+      "custom.dishwasherDelayStartTime": {
+        "dishwasherDelayStartTime": {
+          "value": "00:00:00",
+          "timestamp": "2025-02-08T18:00:37.482Z"
+        }
+      },
+      "custom.energyType": {
+        "energyType": {
+          "value": "2.0",
+          "timestamp": "2023-08-25T03:23:06.667Z"
+        },
+        "energySavingSupport": {
+          "value": true,
+          "timestamp": "2024-10-01T00:08:09.813Z"
+        },
+        "drMaxDuration": {
+          "value": null
+        },
+        "energySavingLevel": {
+          "value": null
+        },
+        "energySavingInfo": {
+          "value": null
+        },
+        "supportedEnergySavingLevels": {
+          "value": null
+        },
+        "energySavingOperation": {
+          "value": null
+        },
+        "notificationTemplateID": {
+          "value": null
+        },
+        "energySavingOperationSupport": {
+          "value": null
+        }
+      },
+      "samsungce.softwareUpdate": {
+        "targetModule": {
+          "value": null
+        },
+        "otnDUID": {
+          "value": "MTCNQWBWIV6TS",
+          "timestamp": "2025-02-08T18:00:37.538Z"
+        },
+        "lastUpdatedDate": {
+          "value": null
+        },
+        "availableModules": {
+          "value": [],
+          "timestamp": "2022-07-20T03:37:30.706Z"
+        },
+        "newVersionAvailable": {
+          "value": false,
+          "timestamp": "2025-02-08T18:00:37.538Z"
+        },
+        "operatingState": {
+          "value": null
+        },
+        "progress": {
+          "value": null
+        }
+      },
+      "custom.waterFilter": {
+        "waterFilterUsageStep": {
+          "value": null
+        },
+        "waterFilterResetType": {
+          "value": null
+        },
+        "waterFilterCapacity": {
+          "value": null
+        },
+        "waterFilterLastResetDate": {
+          "value": null
+        },
+        "waterFilterUsage": {
+          "value": null
+        },
+        "waterFilterStatus": {
+          "value": null
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/da_wm_sc_000001.json b/tests/components/smartthings/fixtures/device_status/da_wm_sc_000001.json
new file mode 100644
index 00000000000..d52b5186db3
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/da_wm_sc_000001.json
@@ -0,0 +1,929 @@
+{
+  "components": {
+    "main": {
+      "samsungce.welcomeMessage": {
+        "welcomeMessage": {
+          "value": null
+        }
+      },
+      "samsungce.deviceIdentification": {
+        "micomAssayCode": {
+          "value": "20299141",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "modelName": {
+          "value": null
+        },
+        "serialNumber": {
+          "value": null
+        },
+        "serialNumberExtra": {
+          "value": null
+        },
+        "modelClassificationCode": {
+          "value": "3801010200151107020100FF00000000",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "description": {
+          "value": "DA_DF_TP2_20_COMMON_DF8500A/DC92-02995A_0010",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "releaseYear": {
+          "value": null
+        },
+        "binaryId": {
+          "value": "DA_DF_TP2_20_COMMON",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        }
+      },
+      "samsungce.steamClosetCycle": {
+        "supportedCycles": {
+          "value": [
+            {
+              "cycle": "22",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6106",
+                  "default": "off",
+                  "options": ["off", "on"]
+                }
+              }
+            },
+            {
+              "cycle": "23",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6102",
+                  "default": "off",
+                  "options": ["off"]
+                }
+              }
+            },
+            {
+              "cycle": "32",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6102",
+                  "default": "off",
+                  "options": ["off"]
+                }
+              }
+            },
+            {
+              "cycle": "09",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6102",
+                  "default": "off",
+                  "options": ["off"]
+                }
+              }
+            },
+            {
+              "cycle": "12",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6102",
+                  "default": "off",
+                  "options": ["off"]
+                }
+              }
+            },
+            {
+              "cycle": "0C",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6102",
+                  "default": "off",
+                  "options": ["off"]
+                }
+              }
+            },
+            {
+              "cycle": "31",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6102",
+                  "default": "off",
+                  "options": ["off"]
+                }
+              }
+            },
+            {
+              "cycle": "0B",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6102",
+                  "default": "off",
+                  "options": ["off"]
+                }
+              }
+            },
+            {
+              "cycle": "10",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6102",
+                  "default": "off",
+                  "options": ["off"]
+                }
+              }
+            },
+            {
+              "cycle": "0A",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6106",
+                  "default": "off",
+                  "options": ["off", "on"]
+                }
+              }
+            },
+            {
+              "cycle": "14",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6102",
+                  "default": "off",
+                  "options": ["off"]
+                }
+              }
+            },
+            {
+              "cycle": "13",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6106",
+                  "default": "off",
+                  "options": ["off", "on"]
+                }
+              }
+            },
+            {
+              "cycle": "16",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6102",
+                  "default": "off",
+                  "options": ["off"]
+                }
+              }
+            },
+            {
+              "cycle": "24",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6206",
+                  "default": "on",
+                  "options": ["off", "on"]
+                }
+              }
+            },
+            {
+              "cycle": "25",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6206",
+                  "default": "on",
+                  "options": ["off", "on"]
+                }
+              }
+            },
+            {
+              "cycle": "2F",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6206",
+                  "default": "on",
+                  "options": ["off", "on"]
+                }
+              }
+            },
+            {
+              "cycle": "20",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6204",
+                  "default": "on",
+                  "options": ["on"]
+                }
+              }
+            },
+            {
+              "cycle": "0F",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "66F0",
+                  "default": "off",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6204",
+                  "default": "on",
+                  "options": ["on"]
+                }
+              }
+            },
+            {
+              "cycle": "27",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6102",
+                  "default": "off",
+                  "options": ["off"]
+                }
+              }
+            },
+            {
+              "cycle": "30",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6102",
+                  "default": "off",
+                  "options": ["off"]
+                }
+              }
+            },
+            {
+              "cycle": "15",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6102",
+                  "default": "off",
+                  "options": ["off"]
+                }
+              }
+            },
+            {
+              "cycle": "1A",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6102",
+                  "default": "off",
+                  "options": ["off"]
+                }
+              }
+            },
+            {
+              "cycle": "1B",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6102",
+                  "default": "off",
+                  "options": ["off"]
+                }
+              }
+            },
+            {
+              "cycle": "1C",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6102",
+                  "default": "off",
+                  "options": ["off"]
+                }
+              }
+            },
+            {
+              "cycle": "2D",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "660F",
+                  "default": "on",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6102",
+                  "default": "off",
+                  "options": ["off"]
+                }
+              }
+            },
+            {
+              "cycle": "07",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "66F0",
+                  "default": "off",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6102",
+                  "default": "off",
+                  "options": ["off"]
+                }
+              }
+            },
+            {
+              "cycle": "08",
+              "supportedOptions": {
+                "keepFresh": {
+                  "raw": "66F0",
+                  "default": "off",
+                  "options": ["on", "off"]
+                },
+                "sanitize": {
+                  "raw": "6102",
+                  "default": "off",
+                  "options": ["off"]
+                }
+              }
+            }
+          ],
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "steamClosetCycle": {
+          "value": "Table_00_Course_22",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "referenceTable": {
+          "value": {
+            "id": "Table_00"
+          },
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        }
+      },
+      "samsungce.quickControl": {
+        "version": {
+          "value": null
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": null
+        },
+        "mndt": {
+          "value": null
+        },
+        "mnfv": {
+          "value": "DA_DF_TP2_20_COMMON_30230807",
+          "timestamp": "2025-01-14T01:42:53.834Z"
+        },
+        "mnhw": {
+          "value": "MediaTek",
+          "timestamp": "2025-01-14T01:42:53.834Z"
+        },
+        "di": {
+          "value": "b93211bf-9d96-bd21-3b2f-964fcc87f5cc",
+          "timestamp": "2025-01-14T01:42:53.834Z"
+        },
+        "mnsl": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2025-01-14T01:42:53.834Z"
+        },
+        "dmv": {
+          "value": "res.1.1.0,sh.1.1.0",
+          "timestamp": "2025-01-14T01:42:53.834Z"
+        },
+        "n": {
+          "value": "[airdresser] Samsung",
+          "timestamp": "2025-01-14T01:42:53.834Z"
+        },
+        "mnmo": {
+          "value": "DA_DF_TP2_20_COMMON|20299141|3801010200151107020100FF00000000",
+          "timestamp": "2025-01-14T01:42:53.834Z"
+        },
+        "vid": {
+          "value": "DA-WM-SC-000001",
+          "timestamp": "2025-01-14T01:42:53.834Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2025-01-14T01:42:53.834Z"
+        },
+        "mnml": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2025-01-14T01:42:53.834Z"
+        },
+        "mnpv": {
+          "value": "DAWIT 2.0",
+          "timestamp": "2025-01-14T01:42:53.834Z"
+        },
+        "mnos": {
+          "value": "TizenRT 2.0 + IPv6",
+          "timestamp": "2025-01-14T01:42:53.834Z"
+        },
+        "pi": {
+          "value": "b93211bf-9d96-bd21-3b2f-964fcc87f5cc",
+          "timestamp": "2025-01-14T01:42:53.834Z"
+        },
+        "icv": {
+          "value": "core.1.1.0",
+          "timestamp": "2025-01-14T01:42:53.834Z"
+        }
+      },
+      "samsungce.steamClosetCyclePreset": {
+        "maxNumberOfPresets": {
+          "value": 10,
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "presets": {
+          "value": {
+            "F1": {},
+            "F2": {},
+            "F3": {},
+            "F4": {},
+            "F5": {},
+            "F6": {},
+            "F7": {},
+            "F8": {},
+            "F9": {},
+            "FA": {}
+          },
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": [
+            "custom.steamClosetWrinklePrevent",
+            "custom.veryFineDustFilter",
+            "demandResponseLoadControl",
+            "sec.wifiConfiguration",
+            "samsungce.quickControl",
+            "samsungce.deviceInfoPrivate"
+          ],
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        }
+      },
+      "samsungce.driverVersion": {
+        "versionNumber": {
+          "value": 24110101,
+          "timestamp": "2024-12-02T07:55:47.237Z"
+        }
+      },
+      "sec.diagnosticsInformation": {
+        "logType": {
+          "value": ["errCode", "dump"],
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "endpoint": {
+          "value": "SSM",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "minVersion": {
+          "value": "1.0",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "signinPermission": {
+          "value": null
+        },
+        "setupId": {
+          "value": "A00",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "protocolType": {
+          "value": "wifi_https",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "tsId": {
+          "value": null
+        },
+        "mnId": {
+          "value": "0AJT",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "dumpType": {
+          "value": "file",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        }
+      },
+      "samsungce.steamClosetKeepFreshMode": {
+        "operatingState": {
+          "value": "ready",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "status": {
+          "value": "off",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        }
+      },
+      "samsungce.kidsLock": {
+        "lockState": {
+          "value": "unlocked",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        }
+      },
+      "demandResponseLoadControl": {
+        "drlcStatus": {
+          "value": null
+        }
+      },
+      "powerConsumptionReport": {
+        "powerConsumption": {
+          "value": {
+            "energy": 207500,
+            "deltaEnergy": 0,
+            "power": 0,
+            "powerEnergy": 0.0,
+            "persistedEnergy": 0,
+            "energySaved": 0,
+            "start": "2025-02-10T22:51:59Z",
+            "end": "2025-02-11T08:21:17Z"
+          },
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        }
+      },
+      "dryerOperatingState": {
+        "completionTime": {
+          "value": "2025-02-11T09:00:17Z",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "machineState": {
+          "value": "stop",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "supportedMachineStates": {
+          "value": ["stop", "run", "pause"],
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "dryerJobState": {
+          "value": "none",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        }
+      },
+      "refresh": {},
+      "samsungce.steamClosetSanitizeMode": {
+        "status": {
+          "value": "off",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        }
+      },
+      "custom.jobBeginningStatus": {
+        "jobBeginningStatus": {
+          "value": null
+        }
+      },
+      "execute": {
+        "data": {
+          "value": {
+            "payload": {
+              "rt": ["x.com.samsung.da.information"],
+              "if": ["oic.if.baseline", "oic.if.a"],
+              "x.com.samsung.da.modelNum": "DA_DF_TP2_20_COMMON|20299141|3801010200151107020100FF00000000",
+              "x.com.samsung.da.description": "DA_DF_TP2_20_COMMON_DF8500A/DC92-02995A_0010",
+              "x.com.samsung.da.serialNum": "1EG158TW400002M",
+              "x.com.samsung.da.otnDUID": "MTCHUODP5V4FA",
+              "x.com.samsung.da.diagProtocolType": "WIFI_HTTPS",
+              "x.com.samsung.da.diagLogType": ["errCode", "dump"],
+              "x.com.samsung.da.diagDumpType": "file",
+              "x.com.samsung.da.diagEndPoint": "SSM",
+              "x.com.samsung.da.diagMnid": "0AJT",
+              "x.com.samsung.da.diagSetupid": "A00",
+              "x.com.samsung.da.diagMinVersion": "1.0",
+              "x.com.samsung.da.items": [
+                {
+                  "x.com.samsung.da.id": "0",
+                  "x.com.samsung.da.description": "DA_DF_TP2_20_COMMON|20299141|3801010200151107020100FF00000000",
+                  "x.com.samsung.da.type": "Software",
+                  "x.com.samsung.da.number": "02673A230807(F821)",
+                  "x.com.samsung.da.newVersionAvailable": "0"
+                },
+                {
+                  "x.com.samsung.da.id": "1",
+                  "x.com.samsung.da.description": "Firmware_1_DB_20299141210618090FFFFF202995412203111604FFFF(015E2029914120299541_30000000)(FileDown:0)(Type:0)",
+                  "x.com.samsung.da.type": "Firmware",
+                  "x.com.samsung.da.number": "21061809,22031116",
+                  "x.com.samsung.da.newVersionAvailable": "0"
+                },
+                {
+                  "x.com.samsung.da.id": "2",
+                  "x.com.samsung.da.description": "Firmware_2_DB_2023564319111852041FFFFFFFFFFFFFFFFFFFFFFFFE(015E20235643FFFFFFFF_30000000)(FileDown:0)(Type:0)",
+                  "x.com.samsung.da.type": "Firmware",
+                  "x.com.samsung.da.number": "19111852,FFFFFFFF"
+                }
+              ]
+            }
+          },
+          "data": {
+            "href": "/information/vs/0"
+          },
+          "timestamp": "2024-03-06T11:24:05.312Z"
+        }
+      },
+      "samsungce.steamClosetDelayEnd": {
+        "remainingTime": {
+          "value": 0,
+          "unit": "min",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        }
+      },
+      "samsungce.steamClosetAutoCycleLink": {
+        "steamClosetAutoCycleLink": {
+          "value": "on",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        }
+      },
+      "sec.wifiConfiguration": {
+        "autoReconnection": {
+          "value": null
+        },
+        "minVersion": {
+          "value": null
+        },
+        "supportedWiFiFreq": {
+          "value": null
+        },
+        "supportedAuthType": {
+          "value": null
+        },
+        "protocolType": {
+          "value": null
+        }
+      },
+      "custom.steamClosetWrinklePrevent": {
+        "steamClosetWrinklePrevent": {
+          "value": "off",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        }
+      },
+      "remoteControlStatus": {
+        "remoteControlEnabled": {
+          "value": "false",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        }
+      },
+      "custom.supportedOptions": {
+        "course": {
+          "value": null
+        },
+        "referenceTable": {
+          "value": {
+            "id": "Table_00"
+          },
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "supportedCourses": {
+          "value": [
+            "22",
+            "23",
+            "32",
+            "09",
+            "12",
+            "0C",
+            "31",
+            "0B",
+            "10",
+            "0A",
+            "14",
+            "13",
+            "16",
+            "24",
+            "25",
+            "2F",
+            "20",
+            "0F",
+            "27",
+            "30",
+            "15",
+            "1A",
+            "1B",
+            "1C",
+            "2D",
+            "07",
+            "08"
+          ],
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        }
+      },
+      "custom.steamClosetOperatingState": {
+        "supportedSteamClosetJobState": {
+          "value": ["none", "steaming", "airwashing", "drying", "finish"],
+          "timestamp": "2025-02-09T22:16:19.221Z"
+        },
+        "completionTime": {
+          "value": "2025-02-11T09:00:17Z",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "steamClosetMachineState": {
+          "value": "stop",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "supportedSteamClosetMachineState": {
+          "value": ["stop", "run", "pause"],
+          "timestamp": "2023-06-23T16:00:41.238Z"
+        },
+        "steamClosetJobState": {
+          "value": "none",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "progress": {
+          "value": 1,
+          "unit": "%",
+          "timestamp": "2025-02-10T22:53:25.928Z"
+        },
+        "remainingTimeStr": {
+          "value": "00:39",
+          "timestamp": "2025-02-10T22:53:25.928Z"
+        },
+        "steamClosetDelayEndTime": {
+          "value": null
+        },
+        "remainingTime": {
+          "value": 39,
+          "unit": "min",
+          "timestamp": "2025-02-10T22:53:25.928Z"
+        }
+      },
+      "custom.energyType": {
+        "energyType": {
+          "value": "2.0",
+          "timestamp": "2024-03-06T11:24:06.106Z"
+        },
+        "energySavingSupport": {
+          "value": false,
+          "timestamp": "2024-03-06T11:24:06.106Z"
+        },
+        "drMaxDuration": {
+          "value": null
+        },
+        "energySavingLevel": {
+          "value": null
+        },
+        "energySavingInfo": {
+          "value": null
+        },
+        "supportedEnergySavingLevels": {
+          "value": null
+        },
+        "energySavingOperation": {
+          "value": null
+        },
+        "notificationTemplateID": {
+          "value": null
+        },
+        "energySavingOperationSupport": {
+          "value": null
+        }
+      },
+      "samsungce.softwareUpdate": {
+        "targetModule": {
+          "value": {},
+          "timestamp": "2025-02-09T17:33:28.019Z"
+        },
+        "otnDUID": {
+          "value": "MTCHUODP5V4FA",
+          "timestamp": "2025-02-11T08:21:17.534Z"
+        },
+        "lastUpdatedDate": {
+          "value": null
+        },
+        "availableModules": {
+          "value": [],
+          "timestamp": "2023-06-23T16:00:41.636Z"
+        },
+        "newVersionAvailable": {
+          "value": false,
+          "timestamp": "2025-02-09T17:33:28.019Z"
+        },
+        "operatingState": {
+          "value": null
+        },
+        "progress": {
+          "value": null
+        }
+      },
+      "custom.veryFineDustFilter": {
+        "veryFineDustFilterStatus": {
+          "value": null
+        },
+        "veryFineDustFilterResetType": {
+          "value": null
+        },
+        "veryFineDustFilterUsage": {
+          "value": null
+        },
+        "veryFineDustFilterLastResetDate": {
+          "value": null
+        },
+        "veryFineDustFilterUsageStep": {
+          "value": null
+        },
+        "veryFineDustFilterCapacity": {
+          "value": null
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/da_wm_wd_000001.json b/tests/components/smartthings/fixtures/device_status/da_wm_wd_000001.json
new file mode 100644
index 00000000000..fe43b490387
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/da_wm_wd_000001.json
@@ -0,0 +1,719 @@
+{
+  "components": {
+    "hca.main": {
+      "hca.dryerMode": {
+        "mode": {
+          "value": "normal",
+          "timestamp": "2025-02-08T18:10:11.023Z"
+        },
+        "supportedModes": {
+          "value": ["normal", "timeDry", "quickDry"],
+          "timestamp": "2025-02-08T18:10:10.497Z"
+        }
+      }
+    },
+    "main": {
+      "custom.dryerWrinklePrevent": {
+        "operatingState": {
+          "value": "ready",
+          "timestamp": "2025-02-08T18:10:10.497Z"
+        },
+        "dryerWrinklePrevent": {
+          "value": "off",
+          "timestamp": "2025-02-08T18:10:10.840Z"
+        }
+      },
+      "samsungce.dryerDryingTemperature": {
+        "dryingTemperature": {
+          "value": "medium",
+          "timestamp": "2025-02-08T18:10:10.840Z"
+        },
+        "supportedDryingTemperature": {
+          "value": ["none", "extraLow", "low", "mediumLow", "medium", "high"],
+          "timestamp": "2025-01-04T22:52:14.884Z"
+        }
+      },
+      "samsungce.welcomeMessage": {
+        "welcomeMessage": {
+          "value": null
+        }
+      },
+      "samsungce.dongleSoftwareInstallation": {
+        "status": {
+          "value": "completed",
+          "timestamp": "2022-06-14T06:49:02.183Z"
+        }
+      },
+      "samsungce.dryerCyclePreset": {
+        "maxNumberOfPresets": {
+          "value": 10,
+          "timestamp": "2025-02-08T18:10:10.990Z"
+        },
+        "presets": {
+          "value": null
+        }
+      },
+      "samsungce.deviceIdentification": {
+        "micomAssayCode": {
+          "value": "20233741",
+          "timestamp": "2025-02-08T18:10:11.113Z"
+        },
+        "modelName": {
+          "value": null
+        },
+        "serialNumber": {
+          "value": null
+        },
+        "serialNumberExtra": {
+          "value": null
+        },
+        "modelClassificationCode": {
+          "value": "3000000100111100020B000000000000",
+          "timestamp": "2025-02-08T18:10:11.113Z"
+        },
+        "description": {
+          "value": "DA_WM_A51_20_COMMON_DV6300R/DC92-02385A_0090",
+          "timestamp": "2025-02-08T18:10:11.113Z"
+        },
+        "releaseYear": {
+          "value": null
+        },
+        "binaryId": {
+          "value": "DA_WM_A51_20_COMMON",
+          "timestamp": "2025-02-08T18:10:11.113Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-02-08T18:10:10.911Z"
+        }
+      },
+      "samsungce.quickControl": {
+        "version": {
+          "value": null
+        }
+      },
+      "samsungce.dryerFreezePrevent": {
+        "operatingState": {
+          "value": null
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": null
+        },
+        "mndt": {
+          "value": null
+        },
+        "mnfv": {
+          "value": "DA_WM_A51_20_COMMON_30230708",
+          "timestamp": "2025-01-04T22:52:14.222Z"
+        },
+        "mnhw": {
+          "value": "ARTIK051",
+          "timestamp": "2025-01-04T22:52:14.222Z"
+        },
+        "di": {
+          "value": "02f7256e-8353-5bdd-547f-bd5b1647e01b",
+          "timestamp": "2025-01-04T22:52:14.222Z"
+        },
+        "mnsl": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2025-01-04T22:52:14.222Z"
+        },
+        "dmv": {
+          "value": "res.1.1.0,sh.1.1.0",
+          "timestamp": "2025-01-04T22:52:14.222Z"
+        },
+        "n": {
+          "value": "[dryer] Samsung",
+          "timestamp": "2025-01-04T22:52:14.222Z"
+        },
+        "mnmo": {
+          "value": "DA_WM_A51_20_COMMON|20233741|3000000100111100020B000000000000",
+          "timestamp": "2025-01-04T22:52:14.222Z"
+        },
+        "vid": {
+          "value": "DA-WM-WD-000001",
+          "timestamp": "2025-01-04T22:52:14.222Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2025-01-04T22:52:14.222Z"
+        },
+        "mnml": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2025-01-04T22:52:14.222Z"
+        },
+        "mnpv": {
+          "value": "DAWIT 2.0",
+          "timestamp": "2025-01-04T22:52:14.222Z"
+        },
+        "mnos": {
+          "value": "TizenRT 1.0 + IPv6",
+          "timestamp": "2025-01-04T22:52:14.222Z"
+        },
+        "pi": {
+          "value": "02f7256e-8353-5bdd-547f-bd5b1647e01b",
+          "timestamp": "2025-01-04T22:52:14.222Z"
+        },
+        "icv": {
+          "value": "core.1.1.0",
+          "timestamp": "2025-01-04T22:52:14.222Z"
+        }
+      },
+      "custom.dryerDryLevel": {
+        "dryerDryLevel": {
+          "value": "normal",
+          "timestamp": "2025-02-08T18:10:10.840Z"
+        },
+        "supportedDryerDryLevel": {
+          "value": ["none", "damp", "less", "normal", "more", "very"],
+          "timestamp": "2021-06-01T22:54:28.224Z"
+        }
+      },
+      "samsungce.dryerAutoCycleLink": {
+        "dryerAutoCycleLink": {
+          "value": "on",
+          "timestamp": "2025-02-08T18:10:11.986Z"
+        }
+      },
+      "samsungce.dryerCycle": {
+        "dryerCycle": {
+          "value": "Table_00_Course_01",
+          "timestamp": "2025-02-08T18:10:11.023Z"
+        },
+        "supportedCycles": {
+          "value": [
+            {
+              "cycle": "01",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D33E",
+                  "default": "normal",
+                  "options": ["damp", "less", "normal", "more", "very"]
+                },
+                "dryingTemperature": {
+                  "raw": "8410",
+                  "default": "medium",
+                  "options": ["medium"]
+                }
+              }
+            },
+            {
+              "cycle": "9C",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D33E",
+                  "default": "normal",
+                  "options": ["damp", "less", "normal", "more", "very"]
+                },
+                "dryingTemperature": {
+                  "raw": "8520",
+                  "default": "high",
+                  "options": ["high"]
+                }
+              }
+            },
+            {
+              "cycle": "A5",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D33E",
+                  "default": "normal",
+                  "options": ["damp", "less", "normal", "more", "very"]
+                },
+                "dryingTemperature": {
+                  "raw": "8520",
+                  "default": "high",
+                  "options": ["high"]
+                }
+              }
+            },
+            {
+              "cycle": "9E",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D33E",
+                  "default": "normal",
+                  "options": ["damp", "less", "normal", "more", "very"]
+                },
+                "dryingTemperature": {
+                  "raw": "8308",
+                  "default": "mediumLow",
+                  "options": ["mediumLow"]
+                }
+              }
+            },
+            {
+              "cycle": "9B",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D520",
+                  "default": "very",
+                  "options": ["very"]
+                },
+                "dryingTemperature": {
+                  "raw": "8520",
+                  "default": "high",
+                  "options": ["high"]
+                }
+              }
+            },
+            {
+              "cycle": "27",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D000",
+                  "default": "none",
+                  "options": []
+                },
+                "dryingTemperature": {
+                  "raw": "8520",
+                  "default": "high",
+                  "options": ["high"]
+                }
+              }
+            },
+            {
+              "cycle": "E5",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D000",
+                  "default": "none",
+                  "options": []
+                },
+                "dryingTemperature": {
+                  "raw": "8000",
+                  "default": "none",
+                  "options": []
+                }
+              }
+            },
+            {
+              "cycle": "A0",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D000",
+                  "default": "none",
+                  "options": []
+                },
+                "dryingTemperature": {
+                  "raw": "8000",
+                  "default": "none",
+                  "options": []
+                }
+              }
+            },
+            {
+              "cycle": "A4",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D000",
+                  "default": "none",
+                  "options": []
+                },
+                "dryingTemperature": {
+                  "raw": "853E",
+                  "default": "high",
+                  "options": ["extraLow", "low", "mediumLow", "medium", "high"]
+                }
+              }
+            },
+            {
+              "cycle": "A6",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D000",
+                  "default": "none",
+                  "options": []
+                },
+                "dryingTemperature": {
+                  "raw": "8520",
+                  "default": "high",
+                  "options": ["high"]
+                }
+              }
+            },
+            {
+              "cycle": "A3",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D308",
+                  "default": "normal",
+                  "options": ["normal"]
+                },
+                "dryingTemperature": {
+                  "raw": "8410",
+                  "default": "medium",
+                  "options": ["medium"]
+                }
+              }
+            },
+            {
+              "cycle": "A2",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D33E",
+                  "default": "normal",
+                  "options": ["damp", "less", "normal", "more", "very"]
+                },
+                "dryingTemperature": {
+                  "raw": "8102",
+                  "default": "extraLow",
+                  "options": ["extraLow"]
+                }
+              }
+            }
+          ],
+          "timestamp": "2025-01-04T22:52:14.884Z"
+        },
+        "referenceTable": {
+          "value": {
+            "id": "Table_00"
+          },
+          "timestamp": "2025-02-08T18:10:11.023Z"
+        },
+        "specializedFunctionClassification": {
+          "value": 4,
+          "timestamp": "2025-02-08T18:10:10.497Z"
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": [
+            "samsungce.dryerCyclePreset",
+            "samsungce.welcomeMessage",
+            "samsungce.dongleSoftwareInstallation",
+            "sec.wifiConfiguration",
+            "samsungce.quickControl",
+            "samsungce.deviceInfoPrivate",
+            "demandResponseLoadControl",
+            "samsungce.dryerFreezePrevent",
+            "sec.diagnosticsInformation"
+          ],
+          "timestamp": "2024-07-05T16:04:06.674Z"
+        }
+      },
+      "samsungce.driverVersion": {
+        "versionNumber": {
+          "value": 24110101,
+          "timestamp": "2024-12-03T02:59:11.115Z"
+        }
+      },
+      "sec.diagnosticsInformation": {
+        "logType": {
+          "value": null
+        },
+        "endpoint": {
+          "value": null
+        },
+        "minVersion": {
+          "value": null
+        },
+        "signinPermission": {
+          "value": null
+        },
+        "setupId": {
+          "value": null
+        },
+        "protocolType": {
+          "value": null
+        },
+        "tsId": {
+          "value": null
+        },
+        "mnId": {
+          "value": null
+        },
+        "dumpType": {
+          "value": null
+        }
+      },
+      "samsungce.kidsLock": {
+        "lockState": {
+          "value": "unlocked",
+          "timestamp": "2025-02-08T18:10:10.825Z"
+        }
+      },
+      "demandResponseLoadControl": {
+        "drlcStatus": {
+          "value": null
+        }
+      },
+      "samsungce.detergentOrder": {
+        "alarmEnabled": {
+          "value": false,
+          "timestamp": "2025-02-08T18:10:10.497Z"
+        },
+        "orderThreshold": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-02-08T18:10:10.497Z"
+        }
+      },
+      "powerConsumptionReport": {
+        "powerConsumption": {
+          "value": {
+            "energy": 4495500,
+            "deltaEnergy": 0,
+            "power": 0,
+            "powerEnergy": 0.0,
+            "persistedEnergy": 0,
+            "energySaved": 0,
+            "start": "2025-02-07T04:00:19Z",
+            "end": "2025-02-08T18:10:11Z"
+          },
+          "timestamp": "2025-02-08T18:10:11.053Z"
+        }
+      },
+      "dryerOperatingState": {
+        "completionTime": {
+          "value": "2025-02-08T19:25:10Z",
+          "timestamp": "2025-02-08T18:10:10.962Z"
+        },
+        "machineState": {
+          "value": "stop",
+          "timestamp": "2025-02-08T18:10:10.962Z"
+        },
+        "supportedMachineStates": {
+          "value": ["stop", "run", "pause"],
+          "timestamp": "2025-02-08T18:10:10.962Z"
+        },
+        "dryerJobState": {
+          "value": "none",
+          "timestamp": "2025-02-08T18:10:10.962Z"
+        }
+      },
+      "samsungce.detergentState": {
+        "remainingAmount": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-02-08T18:10:10.497Z"
+        },
+        "dosage": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-02-08T18:10:10.497Z"
+        },
+        "initialAmount": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-02-08T18:10:10.497Z"
+        },
+        "detergentType": {
+          "value": "none",
+          "timestamp": "2021-06-01T22:54:28.372Z"
+        }
+      },
+      "samsungce.dryerDelayEnd": {
+        "remainingTime": {
+          "value": 0,
+          "unit": "min",
+          "timestamp": "2025-02-08T18:10:10.962Z"
+        }
+      },
+      "refresh": {},
+      "custom.jobBeginningStatus": {
+        "jobBeginningStatus": {
+          "value": null
+        }
+      },
+      "execute": {
+        "data": {
+          "value": {
+            "payload": {
+              "rt": ["x.com.samsung.da.information"],
+              "if": ["oic.if.baseline", "oic.if.a"],
+              "x.com.samsung.da.modelNum": "DA_WM_A51_20_COMMON|20233741|3000000100111100020B000000000000",
+              "x.com.samsung.da.description": "DA_WM_A51_20_COMMON_DV6300R/DC92-02385A_0090",
+              "x.com.samsung.da.serialNum": "FFFFFFFFFFFFFFF",
+              "x.com.samsung.da.otnDUID": "7XCDM6YAIRCGM",
+              "x.com.samsung.da.items": [
+                {
+                  "x.com.samsung.da.id": "0",
+                  "x.com.samsung.da.description": "DA_WM_A51_20_COMMON|20233741|3000000100111100020B000000000000",
+                  "x.com.samsung.da.type": "Software",
+                  "x.com.samsung.da.number": "02198A220728(E256)",
+                  "x.com.samsung.da.newVersionAvailable": "0"
+                },
+                {
+                  "x.com.samsung.da.id": "1",
+                  "x.com.samsung.da.description": "DA_WM_A51_20_COMMON",
+                  "x.com.samsung.da.type": "Firmware",
+                  "x.com.samsung.da.number": "18112816,20112625",
+                  "x.com.samsung.da.newVersionAvailable": "0"
+                }
+              ]
+            }
+          },
+          "data": {
+            "href": "/information/vs/0"
+          },
+          "timestamp": "2023-08-06T22:48:43.192Z"
+        }
+      },
+      "sec.wifiConfiguration": {
+        "autoReconnection": {
+          "value": null
+        },
+        "minVersion": {
+          "value": null
+        },
+        "supportedWiFiFreq": {
+          "value": null
+        },
+        "supportedAuthType": {
+          "value": null
+        },
+        "protocolType": {
+          "value": null
+        }
+      },
+      "remoteControlStatus": {
+        "remoteControlEnabled": {
+          "value": "false",
+          "timestamp": "2025-02-08T18:10:10.970Z"
+        }
+      },
+      "custom.supportedOptions": {
+        "course": {
+          "value": null
+        },
+        "referenceTable": {
+          "value": {
+            "id": "Table_00"
+          },
+          "timestamp": "2025-02-08T18:10:11.023Z"
+        },
+        "supportedCourses": {
+          "value": [
+            "01",
+            "9C",
+            "A5",
+            "9E",
+            "9B",
+            "27",
+            "E5",
+            "A0",
+            "A4",
+            "A6",
+            "A3",
+            "A2"
+          ],
+          "timestamp": "2025-02-08T18:10:10.497Z"
+        }
+      },
+      "custom.energyType": {
+        "energyType": {
+          "value": "2.0",
+          "timestamp": "2022-06-14T06:49:02.183Z"
+        },
+        "energySavingSupport": {
+          "value": false,
+          "timestamp": "2022-06-14T06:49:02.721Z"
+        },
+        "drMaxDuration": {
+          "value": null
+        },
+        "energySavingLevel": {
+          "value": null
+        },
+        "energySavingInfo": {
+          "value": null
+        },
+        "supportedEnergySavingLevels": {
+          "value": null
+        },
+        "energySavingOperation": {
+          "value": null
+        },
+        "notificationTemplateID": {
+          "value": null
+        },
+        "energySavingOperationSupport": {
+          "value": null
+        }
+      },
+      "samsungce.dryerOperatingState": {
+        "operatingState": {
+          "value": "ready",
+          "timestamp": "2025-02-07T04:00:18.186Z"
+        },
+        "supportedOperatingStates": {
+          "value": ["ready", "running", "paused"],
+          "timestamp": "2022-11-01T13:43:26.961Z"
+        },
+        "scheduledJobs": {
+          "value": [
+            {
+              "jobName": "drying",
+              "timeInMin": 57
+            },
+            {
+              "jobName": "cooling",
+              "timeInMin": 3
+            }
+          ],
+          "timestamp": "2025-02-08T18:10:10.497Z"
+        },
+        "progress": {
+          "value": 1,
+          "unit": "%",
+          "timestamp": "2025-02-07T04:00:18.186Z"
+        },
+        "remainingTimeStr": {
+          "value": "01:15",
+          "timestamp": "2025-02-07T04:00:18.186Z"
+        },
+        "dryerJobState": {
+          "value": "none",
+          "timestamp": "2025-02-07T04:00:18.186Z"
+        },
+        "remainingTime": {
+          "value": 75,
+          "unit": "min",
+          "timestamp": "2025-02-07T04:00:18.186Z"
+        }
+      },
+      "samsungce.softwareUpdate": {
+        "targetModule": {
+          "value": null
+        },
+        "otnDUID": {
+          "value": "7XCDM6YAIRCGM",
+          "timestamp": "2025-02-08T18:10:11.113Z"
+        },
+        "lastUpdatedDate": {
+          "value": null
+        },
+        "availableModules": {
+          "value": [],
+          "timestamp": "2024-12-02T00:29:53.432Z"
+        },
+        "newVersionAvailable": {
+          "value": false,
+          "timestamp": "2024-12-02T00:29:53.432Z"
+        },
+        "operatingState": {
+          "value": null
+        },
+        "progress": {
+          "value": null
+        }
+      },
+      "samsungce.dryerDryingTime": {
+        "supportedDryingTime": {
+          "value": ["0", "20", "30", "40", "50", "60"],
+          "timestamp": "2021-06-01T22:54:28.224Z"
+        },
+        "dryingTime": {
+          "value": "0",
+          "unit": "min",
+          "timestamp": "2025-02-08T18:10:10.840Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/da_wm_wd_000001_1.json b/tests/components/smartthings/fixtures/device_status/da_wm_wd_000001_1.json
new file mode 100644
index 00000000000..b45bac95237
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/da_wm_wd_000001_1.json
@@ -0,0 +1,692 @@
+{
+  "components": {
+    "hca.main": {
+      "hca.dryerMode": {
+        "mode": {
+          "value": "normal",
+          "timestamp": "2025-03-09T16:31:41.247Z"
+        },
+        "supportedModes": {
+          "value": ["normal", "quickDry", "mix", "timeDry"],
+          "timestamp": "2025-03-09T16:31:40.486Z"
+        }
+      }
+    },
+    "main": {
+      "custom.dryerWrinklePrevent": {
+        "operatingState": {
+          "value": "ready",
+          "timestamp": "2025-03-09T16:31:40.486Z"
+        },
+        "dryerWrinklePrevent": {
+          "value": "off",
+          "timestamp": "2025-03-09T16:31:41.077Z"
+        }
+      },
+      "samsungce.dryerDryingTemperature": {
+        "dryingTemperature": {
+          "value": null,
+          "timestamp": "2021-04-02T18:31:36.756Z"
+        },
+        "supportedDryingTemperature": {
+          "value": null,
+          "timestamp": "2021-04-02T18:29:52.258Z"
+        }
+      },
+      "samsungce.welcomeMessage": {
+        "welcomeMessage": {
+          "value": null,
+          "timestamp": "2021-04-02T18:32:37.913Z"
+        }
+      },
+      "samsungce.dongleSoftwareInstallation": {
+        "status": {
+          "value": "completed",
+          "timestamp": "2022-06-17T17:07:35.734Z"
+        }
+      },
+      "samsungce.dryerCyclePreset": {
+        "maxNumberOfPresets": {
+          "value": 10,
+          "timestamp": "2025-03-09T16:31:41.229Z"
+        },
+        "presets": {
+          "value": null,
+          "timestamp": "2021-04-02T18:30:36.772Z"
+        }
+      },
+      "samsungce.deviceIdentification": {
+        "micomAssayCode": {
+          "value": "20221341",
+          "timestamp": "2025-03-09T16:31:40.834Z"
+        },
+        "modelName": {
+          "value": null,
+          "timestamp": "2021-04-02T18:29:53.622Z"
+        },
+        "serialNumber": {
+          "value": null,
+          "timestamp": "2021-04-02T18:29:52.641Z"
+        },
+        "serialNumberExtra": {
+          "value": null,
+          "timestamp": "2021-04-02T18:29:51.653Z"
+        },
+        "modelClassificationCode": {
+          "value": "30010102001211000103000000000000",
+          "timestamp": "2025-03-09T16:31:40.834Z"
+        },
+        "description": {
+          "value": "DA_WM_A51_20_COMMON_DV6800N/DC92-01967B_0404",
+          "timestamp": "2025-03-09T16:31:40.834Z"
+        },
+        "releaseYear": {
+          "value": null
+        },
+        "binaryId": {
+          "value": "DA_WM_A51_20_COMMON",
+          "timestamp": "2025-03-09T19:07:40.295Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-03-09T19:47:36.549Z"
+        }
+      },
+      "samsungce.quickControl": {
+        "version": {
+          "value": null
+        }
+      },
+      "samsungce.dryerFreezePrevent": {
+        "operatingState": {
+          "value": null
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": null,
+          "timestamp": "2020-06-20T10:01:02.741Z"
+        },
+        "mndt": {
+          "value": null,
+          "timestamp": "2020-06-25T01:53:25.278Z"
+        },
+        "mnfv": {
+          "value": "DA_WM_A51_20_COMMON_30230708",
+          "timestamp": "2024-12-15T10:53:49.561Z"
+        },
+        "mnhw": {
+          "value": "ARTIK051",
+          "timestamp": "2024-12-15T10:53:49.561Z"
+        },
+        "di": {
+          "value": "3a6c4e05-811d-5041-e956-3d04c424cbcd",
+          "timestamp": "2024-12-15T10:53:49.561Z"
+        },
+        "mnsl": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2024-12-15T10:53:49.561Z"
+        },
+        "dmv": {
+          "value": "res.1.1.0,sh.1.1.0",
+          "timestamp": "2024-12-15T10:53:49.561Z"
+        },
+        "n": {
+          "value": "[dryer] Samsung",
+          "timestamp": "2024-12-15T10:53:49.561Z"
+        },
+        "mnmo": {
+          "value": "DA_WM_A51_20_COMMON|20221341|30010102001211000103000000000000",
+          "timestamp": "2024-12-15T10:53:49.561Z"
+        },
+        "vid": {
+          "value": "DA-WM-WD-000001",
+          "timestamp": "2024-12-15T10:53:49.561Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2024-12-15T10:53:49.561Z"
+        },
+        "mnml": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2024-12-15T10:53:49.561Z"
+        },
+        "mnpv": {
+          "value": "DAWIT 2.0",
+          "timestamp": "2024-12-15T10:53:49.561Z"
+        },
+        "mnos": {
+          "value": "TizenRT 1.0 + IPv6",
+          "timestamp": "2024-12-15T10:53:49.561Z"
+        },
+        "pi": {
+          "value": "3a6c4e05-811d-5041-e956-3d04c424cbcd",
+          "timestamp": "2024-12-15T10:53:49.561Z"
+        },
+        "icv": {
+          "value": "core.1.1.0",
+          "timestamp": "2024-12-15T10:53:49.561Z"
+        }
+      },
+      "custom.dryerDryLevel": {
+        "dryerDryLevel": {
+          "value": "2",
+          "timestamp": "2025-03-09T19:47:36.806Z"
+        },
+        "supportedDryerDryLevel": {
+          "value": ["none", "1", "2", "3"],
+          "timestamp": "2020-11-18T20:16:43.428Z"
+        }
+      },
+      "samsungce.dryerAutoCycleLink": {
+        "dryerAutoCycleLink": {
+          "value": null,
+          "timestamp": "2020-08-11T12:41:38.646Z"
+        }
+      },
+      "samsungce.dryerCycle": {
+        "dryerCycle": {
+          "value": "Table_00_Course_9A",
+          "timestamp": "2025-03-09T16:31:41.247Z"
+        },
+        "supportedCycles": {
+          "value": [
+            {
+              "cycle": "9A",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D20E",
+                  "default": "2",
+                  "options": ["1", "2", "3"]
+                }
+              }
+            },
+            {
+              "cycle": "CA",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D10E",
+                  "default": "1",
+                  "options": ["1", "2", "3"]
+                }
+              }
+            },
+            {
+              "cycle": "DB",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D204",
+                  "default": "2",
+                  "options": ["2"]
+                }
+              }
+            },
+            {
+              "cycle": "99",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D20E",
+                  "default": "2",
+                  "options": ["1", "2", "3"]
+                }
+              }
+            },
+            {
+              "cycle": "93",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D102",
+                  "default": "1",
+                  "options": ["1"]
+                }
+              }
+            },
+            {
+              "cycle": "B5",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D102",
+                  "default": "1",
+                  "options": ["1"]
+                }
+              }
+            },
+            {
+              "cycle": "D7",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D204",
+                  "default": "2",
+                  "options": ["2"]
+                }
+              }
+            },
+            {
+              "cycle": "A5",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D204",
+                  "default": "2",
+                  "options": ["2"]
+                }
+              }
+            },
+            {
+              "cycle": "96",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D000",
+                  "default": "none",
+                  "options": []
+                }
+              }
+            },
+            {
+              "cycle": "97",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D000",
+                  "default": "none",
+                  "options": []
+                }
+              }
+            },
+            {
+              "cycle": "7F",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D000",
+                  "default": "none",
+                  "options": []
+                }
+              }
+            },
+            {
+              "cycle": "98",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D000",
+                  "default": "none",
+                  "options": []
+                }
+              }
+            },
+            {
+              "cycle": "EB",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D204",
+                  "default": "2",
+                  "options": ["2"]
+                }
+              }
+            },
+            {
+              "cycle": "B6",
+              "supportedOptions": {
+                "dryingLevel": {
+                  "raw": "D20E",
+                  "default": "2",
+                  "options": ["1", "2", "3"]
+                }
+              }
+            }
+          ],
+          "timestamp": "2025-02-10T02:24:03.524Z"
+        },
+        "referenceTable": {
+          "value": {
+            "id": "Table_00"
+          },
+          "timestamp": "2025-03-09T16:31:41.247Z"
+        },
+        "specializedFunctionClassification": {
+          "value": 4,
+          "timestamp": "2025-03-09T16:31:40.486Z"
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": [
+            "samsungce.dryerDelayEnd",
+            "dryerOperatingState",
+            "samsungce.dryerCyclePreset",
+            "samsungce.welcomeMessage",
+            "samsungce.dongleSoftwareInstallation",
+            "sec.wifiConfiguration",
+            "samsungce.quickControl",
+            "samsungce.deviceInfoPrivate",
+            "demandResponseLoadControl",
+            "samsungce.dryerFreezePrevent",
+            "samsungce.dryerDryingTemperature",
+            "sec.diagnosticsInformation"
+          ],
+          "timestamp": "2024-07-02T14:42:38.334Z"
+        }
+      },
+      "samsungce.driverVersion": {
+        "versionNumber": {
+          "value": 24110101,
+          "timestamp": "2024-12-02T07:43:41.263Z"
+        }
+      },
+      "sec.diagnosticsInformation": {
+        "logType": {
+          "value": null
+        },
+        "endpoint": {
+          "value": null
+        },
+        "minVersion": {
+          "value": null
+        },
+        "signinPermission": {
+          "value": null
+        },
+        "setupId": {
+          "value": null
+        },
+        "protocolType": {
+          "value": null
+        },
+        "tsId": {
+          "value": null
+        },
+        "mnId": {
+          "value": null
+        },
+        "dumpType": {
+          "value": null
+        }
+      },
+      "samsungce.kidsLock": {
+        "lockState": {
+          "value": "unlocked",
+          "timestamp": "2025-03-09T16:31:40.882Z"
+        }
+      },
+      "demandResponseLoadControl": {
+        "drlcStatus": {
+          "value": null
+        }
+      },
+      "samsungce.detergentOrder": {
+        "alarmEnabled": {
+          "value": false,
+          "timestamp": "2025-03-09T16:31:40.486Z"
+        },
+        "orderThreshold": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-03-09T16:31:40.486Z"
+        }
+      },
+      "powerConsumptionReport": {
+        "powerConsumption": {
+          "value": {
+            "energy": 796400,
+            "deltaEnergy": 0,
+            "power": 0,
+            "powerEnergy": 0.0,
+            "persistedEnergy": 0,
+            "energySaved": 0,
+            "start": "2025-03-09T19:47:26Z",
+            "end": "2025-03-09T19:47:37Z"
+          },
+          "timestamp": "2025-03-09T19:47:37.283Z"
+        }
+      },
+      "dryerOperatingState": {
+        "completionTime": {
+          "value": "2025-03-09T22:55:37Z",
+          "timestamp": "2025-03-09T19:47:37.015Z"
+        },
+        "machineState": {
+          "value": "stop",
+          "timestamp": "2025-03-09T19:47:37.015Z"
+        },
+        "supportedMachineStates": {
+          "value": ["stop", "run", "pause"],
+          "timestamp": "2025-03-09T16:31:41.172Z"
+        },
+        "dryerJobState": {
+          "value": "none",
+          "timestamp": "2025-03-09T19:47:37.015Z"
+        }
+      },
+      "samsungce.detergentState": {
+        "remainingAmount": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-03-09T16:31:40.486Z"
+        },
+        "dosage": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-03-09T16:31:40.486Z"
+        },
+        "initialAmount": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-03-09T16:31:40.486Z"
+        },
+        "detergentType": {
+          "value": "none",
+          "timestamp": "2021-04-02T18:29:51.428Z"
+        }
+      },
+      "samsungce.dryerDelayEnd": {
+        "remainingTime": {
+          "value": 0,
+          "unit": "min",
+          "timestamp": "2025-03-09T16:31:41.172Z"
+        }
+      },
+      "refresh": {},
+      "custom.jobBeginningStatus": {
+        "jobBeginningStatus": {
+          "value": null,
+          "timestamp": "2020-06-25T01:53:34.974Z"
+        }
+      },
+      "execute": {
+        "data": {
+          "value": {
+            "payload": {
+              "rt": ["x.com.samsung.da.information"],
+              "if": ["oic.if.baseline", "oic.if.a"],
+              "x.com.samsung.da.modelNum": "DA_WM_A51_20_COMMON|20221341|30010102001211000103000000000000",
+              "x.com.samsung.da.description": "DA_WM_A51_20_COMMON_DV6800N/DC92-01967B_0404",
+              "x.com.samsung.da.serialNum": "0T625AEN100200N",
+              "x.com.samsung.da.otnDUID": "SHCDM6YAPCCXC",
+              "x.com.samsung.da.items": [
+                {
+                  "x.com.samsung.da.id": "0",
+                  "x.com.samsung.da.description": "DA_WM_A51_20_COMMON|20221341|30010102001211000103000000000000",
+                  "x.com.samsung.da.type": "Software",
+                  "x.com.samsung.da.number": "02198A220728(E256)",
+                  "x.com.samsung.da.newVersionAvailable": "0"
+                },
+                {
+                  "x.com.samsung.da.id": "1",
+                  "x.com.samsung.da.description": "DA_WM_A51_20_COMMON",
+                  "x.com.samsung.da.type": "Firmware",
+                  "x.com.samsung.da.number": "17111305,19060420",
+                  "x.com.samsung.da.newVersionAvailable": "0"
+                }
+              ]
+            }
+          },
+          "data": {
+            "href": "/information/vs/0"
+          },
+          "timestamp": "2023-08-07T00:06:05.984Z"
+        }
+      },
+      "sec.wifiConfiguration": {
+        "autoReconnection": {
+          "value": null
+        },
+        "minVersion": {
+          "value": null
+        },
+        "supportedWiFiFreq": {
+          "value": null
+        },
+        "supportedAuthType": {
+          "value": null
+        },
+        "protocolType": {
+          "value": null
+        }
+      },
+      "remoteControlStatus": {
+        "remoteControlEnabled": {
+          "value": "false",
+          "timestamp": "2025-03-09T16:31:41.180Z"
+        }
+      },
+      "custom.supportedOptions": {
+        "course": {
+          "value": null
+        },
+        "referenceTable": {
+          "value": {
+            "id": "Table_00"
+          },
+          "timestamp": "2025-03-09T16:31:41.247Z"
+        },
+        "supportedCourses": {
+          "value": [
+            "9A",
+            "CA",
+            "DB",
+            "99",
+            "93",
+            "B5",
+            "D7",
+            "A5",
+            "96",
+            "97",
+            "7F",
+            "98",
+            "EB",
+            "B6"
+          ],
+          "timestamp": "2025-03-09T16:31:40.486Z"
+        }
+      },
+      "custom.energyType": {
+        "energyType": {
+          "value": "2.0",
+          "timestamp": "2022-06-17T17:07:35.734Z"
+        },
+        "energySavingSupport": {
+          "value": false,
+          "timestamp": "2022-06-17T17:07:35.734Z"
+        },
+        "drMaxDuration": {
+          "value": null
+        },
+        "energySavingLevel": {
+          "value": null
+        },
+        "energySavingInfo": {
+          "value": null
+        },
+        "supportedEnergySavingLevels": {
+          "value": null
+        },
+        "energySavingOperation": {
+          "value": null
+        },
+        "notificationTemplateID": {
+          "value": null
+        },
+        "energySavingOperationSupport": {
+          "value": null
+        }
+      },
+      "samsungce.dryerOperatingState": {
+        "operatingState": {
+          "value": "ready",
+          "timestamp": "2025-03-09T19:47:37.015Z"
+        },
+        "supportedOperatingStates": {
+          "value": ["ready", "running", "paused"],
+          "timestamp": "2022-11-01T12:48:22.390Z"
+        },
+        "scheduledJobs": {
+          "value": [
+            {
+              "jobName": "drying",
+              "timeInMin": 192
+            },
+            {
+              "jobName": "cooling",
+              "timeInMin": 1
+            }
+          ],
+          "timestamp": "2025-03-09T16:31:40.486Z"
+        },
+        "progress": {
+          "value": 1,
+          "unit": "%",
+          "timestamp": "2025-03-09T19:47:37.015Z"
+        },
+        "remainingTimeStr": {
+          "value": "03:08",
+          "timestamp": "2025-03-09T19:47:37.015Z"
+        },
+        "dryerJobState": {
+          "value": "none",
+          "timestamp": "2025-03-09T19:47:37.015Z"
+        },
+        "remainingTime": {
+          "value": 188,
+          "unit": "min",
+          "timestamp": "2025-03-09T19:47:37.015Z"
+        }
+      },
+      "samsungce.softwareUpdate": {
+        "targetModule": {
+          "value": null
+        },
+        "otnDUID": {
+          "value": "SHCDM6YAPCCXC",
+          "timestamp": "2025-03-09T16:31:40.834Z"
+        },
+        "lastUpdatedDate": {
+          "value": null
+        },
+        "availableModules": {
+          "value": [],
+          "timestamp": "2024-12-01T21:16:50.598Z"
+        },
+        "newVersionAvailable": {
+          "value": false,
+          "timestamp": "2024-12-01T21:16:50.598Z"
+        },
+        "operatingState": {
+          "value": null
+        },
+        "progress": {
+          "value": null
+        }
+      },
+      "samsungce.dryerDryingTime": {
+        "supportedDryingTime": {
+          "value": ["0", "30", "60", "90", "120", "150"],
+          "timestamp": "2021-04-02T18:29:51.428Z"
+        },
+        "dryingTime": {
+          "value": "0",
+          "unit": "min",
+          "timestamp": "2025-03-09T16:31:41.077Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/da_wm_wm_000001.json b/tests/components/smartthings/fixtures/device_status/da_wm_wm_000001.json
new file mode 100644
index 00000000000..6a141c9462e
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/da_wm_wm_000001.json
@@ -0,0 +1,1243 @@
+{
+  "components": {
+    "hca.main": {
+      "hca.washerMode": {
+        "mode": {
+          "value": "normal",
+          "timestamp": "2025-02-07T02:29:55.623Z"
+        },
+        "supportedModes": {
+          "value": ["normal", "quickWash"],
+          "timestamp": "2025-02-07T02:29:55.152Z"
+        }
+      }
+    },
+    "main": {
+      "samsungce.washerDelayEnd": {
+        "remainingTime": {
+          "value": 0,
+          "unit": "min",
+          "timestamp": "2025-02-07T02:29:55.546Z"
+        },
+        "minimumReservableTime": {
+          "value": 45,
+          "unit": "min",
+          "timestamp": "2025-02-07T03:09:45.594Z"
+        }
+      },
+      "samsungce.washerWaterLevel": {
+        "supportedWaterLevel": {
+          "value": null
+        },
+        "waterLevel": {
+          "value": null
+        }
+      },
+      "samsungce.welcomeMessage": {
+        "welcomeMessage": {
+          "value": null
+        }
+      },
+      "custom.washerWaterTemperature": {
+        "supportedWasherWaterTemperature": {
+          "value": ["none", "tapCold", "cold", "warm", "hot", "extraHot"],
+          "timestamp": "2024-12-25T22:13:27.760Z"
+        },
+        "washerWaterTemperature": {
+          "value": "warm",
+          "timestamp": "2025-02-07T02:29:55.691Z"
+        }
+      },
+      "samsungce.softenerAutoReplenishment": {
+        "regularSoftenerType": {
+          "value": null
+        },
+        "regularSoftenerAlarmEnabled": {
+          "value": null
+        },
+        "regularSoftenerInitialAmount": {
+          "value": null
+        },
+        "regularSoftenerRemainingAmount": {
+          "value": null
+        },
+        "regularSoftenerDosage": {
+          "value": null
+        },
+        "regularSoftenerOrderThreshold": {
+          "value": null
+        }
+      },
+      "samsungce.autoDispenseSoftener": {
+        "remainingAmount": {
+          "value": null
+        },
+        "amount": {
+          "value": null
+        },
+        "supportedDensity": {
+          "value": null
+        },
+        "density": {
+          "value": null
+        },
+        "supportedAmount": {
+          "value": null
+        }
+      },
+      "samsungce.dongleSoftwareInstallation": {
+        "status": {
+          "value": "completed",
+          "timestamp": "2022-06-15T14:11:34.909Z"
+        }
+      },
+      "samsungce.autoDispenseDetergent": {
+        "remainingAmount": {
+          "value": null
+        },
+        "amount": {
+          "value": null
+        },
+        "supportedDensity": {
+          "value": null
+        },
+        "density": {
+          "value": null
+        },
+        "supportedAmount": {
+          "value": null
+        },
+        "availableTypes": {
+          "value": null
+        },
+        "type": {
+          "value": null
+        },
+        "recommendedAmount": {
+          "value": null
+        }
+      },
+      "samsungce.deviceIdentification": {
+        "micomAssayCode": {
+          "value": "20233741",
+          "timestamp": "2025-02-07T02:29:55.453Z"
+        },
+        "modelName": {
+          "value": null
+        },
+        "serialNumber": {
+          "value": null
+        },
+        "serialNumberExtra": {
+          "value": null
+        },
+        "modelClassificationCode": {
+          "value": "2001000100131100022B010000000000",
+          "timestamp": "2025-02-07T02:29:55.453Z"
+        },
+        "description": {
+          "value": "DA_WM_TP2_20_COMMON_WF6300R/DC92-02338B_0080",
+          "timestamp": "2025-02-07T02:29:55.453Z"
+        },
+        "releaseYear": {
+          "value": null
+        },
+        "binaryId": {
+          "value": "DA_WM_TP2_20_COMMON",
+          "timestamp": "2025-02-07T02:29:55.453Z"
+        }
+      },
+      "samsungce.washerWaterValve": {
+        "waterValve": {
+          "value": null
+        },
+        "supportedWaterValve": {
+          "value": null
+        }
+      },
+      "washerOperatingState": {
+        "completionTime": {
+          "value": "2025-02-07T03:54:45Z",
+          "timestamp": "2025-02-07T03:09:45.534Z"
+        },
+        "machineState": {
+          "value": "stop",
+          "timestamp": "2025-02-07T03:09:45.534Z"
+        },
+        "washerJobState": {
+          "value": "none",
+          "timestamp": "2025-02-07T03:09:45.534Z"
+        },
+        "supportedMachineStates": {
+          "value": ["stop", "run", "pause"],
+          "timestamp": "2025-02-07T02:29:55.546Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-02-07T03:09:45.456Z"
+        }
+      },
+      "custom.washerAutoSoftener": {
+        "washerAutoSoftener": {
+          "value": null
+        }
+      },
+      "samsungce.washerFreezePrevent": {
+        "operatingState": {
+          "value": null
+        }
+      },
+      "samsungce.quickControl": {
+        "version": {
+          "value": null
+        }
+      },
+      "samsungce.washerCycle": {
+        "supportedCycles": {
+          "value": [
+            {
+              "cycle": "01",
+              "cycleType": "washingOnly",
+              "supportedOptions": {
+                "soilLevel": {
+                  "raw": "C33E",
+                  "default": "normal",
+                  "options": [
+                    "extraLight",
+                    "light",
+                    "normal",
+                    "heavy",
+                    "extraHeavy"
+                  ]
+                },
+                "spinLevel": {
+                  "raw": "A43B",
+                  "default": "high",
+                  "options": [
+                    "rinseHold",
+                    "noSpin",
+                    "medium",
+                    "high",
+                    "extraHigh"
+                  ]
+                },
+                "rinseCycle": {
+                  "raw": "923F",
+                  "default": "2",
+                  "options": ["0", "1", "2", "3", "4", "5"]
+                },
+                "waterTemperature": {
+                  "raw": "833E",
+                  "default": "warm",
+                  "options": ["tapCold", "cold", "warm", "hot", "extraHot"]
+                }
+              }
+            },
+            {
+              "cycle": "70",
+              "cycleType": "washingOnly",
+              "supportedOptions": {
+                "soilLevel": {
+                  "raw": "C53E",
+                  "default": "extraHeavy",
+                  "options": [
+                    "extraLight",
+                    "light",
+                    "normal",
+                    "heavy",
+                    "extraHeavy"
+                  ]
+                },
+                "spinLevel": {
+                  "raw": "A53F",
+                  "default": "extraHigh",
+                  "options": [
+                    "rinseHold",
+                    "noSpin",
+                    "low",
+                    "medium",
+                    "high",
+                    "extraHigh"
+                  ]
+                },
+                "rinseCycle": {
+                  "raw": "923F",
+                  "default": "2",
+                  "options": ["0", "1", "2", "3", "4", "5"]
+                },
+                "waterTemperature": {
+                  "raw": "843E",
+                  "default": "hot",
+                  "options": ["tapCold", "cold", "warm", "hot", "extraHot"]
+                }
+              }
+            },
+            {
+              "cycle": "55",
+              "cycleType": "washingOnly",
+              "supportedOptions": {
+                "soilLevel": {
+                  "raw": "C33E",
+                  "default": "normal",
+                  "options": [
+                    "extraLight",
+                    "light",
+                    "normal",
+                    "heavy",
+                    "extraHeavy"
+                  ]
+                },
+                "spinLevel": {
+                  "raw": "A43F",
+                  "default": "high",
+                  "options": [
+                    "rinseHold",
+                    "noSpin",
+                    "low",
+                    "medium",
+                    "high",
+                    "extraHigh"
+                  ]
+                },
+                "rinseCycle": {
+                  "raw": "923F",
+                  "default": "2",
+                  "options": ["0", "1", "2", "3", "4", "5"]
+                },
+                "waterTemperature": {
+                  "raw": "831E",
+                  "default": "warm",
+                  "options": ["tapCold", "cold", "warm", "hot"]
+                }
+              }
+            },
+            {
+              "cycle": "71",
+              "cycleType": "washingOnly",
+              "supportedOptions": {
+                "soilLevel": {
+                  "raw": "C33E",
+                  "default": "normal",
+                  "options": [
+                    "extraLight",
+                    "light",
+                    "normal",
+                    "heavy",
+                    "extraHeavy"
+                  ]
+                },
+                "spinLevel": {
+                  "raw": "A20F",
+                  "default": "low",
+                  "options": ["rinseHold", "noSpin", "low", "medium"]
+                },
+                "rinseCycle": {
+                  "raw": "923F",
+                  "default": "2",
+                  "options": ["0", "1", "2", "3", "4", "5"]
+                },
+                "waterTemperature": {
+                  "raw": "830E",
+                  "default": "warm",
+                  "options": ["tapCold", "cold", "warm"]
+                }
+              }
+            },
+            {
+              "cycle": "72",
+              "cycleType": "washingOnly",
+              "supportedOptions": {
+                "soilLevel": {
+                  "raw": "C33E",
+                  "default": "normal",
+                  "options": [
+                    "extraLight",
+                    "light",
+                    "normal",
+                    "heavy",
+                    "extraHeavy"
+                  ]
+                },
+                "spinLevel": {
+                  "raw": "A43F",
+                  "default": "high",
+                  "options": [
+                    "rinseHold",
+                    "noSpin",
+                    "low",
+                    "medium",
+                    "high",
+                    "extraHigh"
+                  ]
+                },
+                "rinseCycle": {
+                  "raw": "923F",
+                  "default": "2",
+                  "options": ["0", "1", "2", "3", "4", "5"]
+                },
+                "waterTemperature": {
+                  "raw": "8520",
+                  "default": "extraHot",
+                  "options": ["extraHot"]
+                }
+              }
+            },
+            {
+              "cycle": "77",
+              "cycleType": "washingOnly",
+              "supportedOptions": {
+                "soilLevel": {
+                  "raw": "C33E",
+                  "default": "normal",
+                  "options": [
+                    "extraLight",
+                    "light",
+                    "normal",
+                    "heavy",
+                    "extraHeavy"
+                  ]
+                },
+                "spinLevel": {
+                  "raw": "A21F",
+                  "default": "low",
+                  "options": ["rinseHold", "noSpin", "low", "medium", "high"]
+                },
+                "rinseCycle": {
+                  "raw": "923F",
+                  "default": "2",
+                  "options": ["0", "1", "2", "3", "4", "5"]
+                },
+                "waterTemperature": {
+                  "raw": "830E",
+                  "default": "warm",
+                  "options": ["tapCold", "cold", "warm"]
+                }
+              }
+            },
+            {
+              "cycle": "E5",
+              "cycleType": "washingOnly",
+              "supportedOptions": {
+                "soilLevel": {
+                  "raw": "C53E",
+                  "default": "extraHeavy",
+                  "options": [
+                    "extraLight",
+                    "light",
+                    "normal",
+                    "heavy",
+                    "extraHeavy"
+                  ]
+                },
+                "spinLevel": {
+                  "raw": "A43F",
+                  "default": "high",
+                  "options": [
+                    "rinseHold",
+                    "noSpin",
+                    "low",
+                    "medium",
+                    "high",
+                    "extraHigh"
+                  ]
+                },
+                "rinseCycle": {
+                  "raw": "923F",
+                  "default": "2",
+                  "options": ["0", "1", "2", "3", "4", "5"]
+                },
+                "waterTemperature": {
+                  "raw": "831E",
+                  "default": "warm",
+                  "options": ["tapCold", "cold", "warm", "hot"]
+                }
+              }
+            },
+            {
+              "cycle": "57",
+              "cycleType": "washingOnly",
+              "supportedOptions": {
+                "soilLevel": {
+                  "raw": "C000",
+                  "default": "none",
+                  "options": []
+                },
+                "spinLevel": {
+                  "raw": "A520",
+                  "default": "extraHigh",
+                  "options": ["extraHigh"]
+                },
+                "rinseCycle": {
+                  "raw": "9204",
+                  "default": "2",
+                  "options": ["2"]
+                },
+                "waterTemperature": {
+                  "raw": "8520",
+                  "default": "extraHot",
+                  "options": ["extraHot"]
+                }
+              }
+            },
+            {
+              "cycle": "73",
+              "cycleType": "washingOnly",
+              "supportedOptions": {
+                "soilLevel": {
+                  "raw": "C000",
+                  "default": "none",
+                  "options": []
+                },
+                "spinLevel": {
+                  "raw": "A43F",
+                  "default": "high",
+                  "options": [
+                    "rinseHold",
+                    "noSpin",
+                    "low",
+                    "medium",
+                    "high",
+                    "extraHigh"
+                  ]
+                },
+                "rinseCycle": {
+                  "raw": "913F",
+                  "default": "1",
+                  "options": ["0", "1", "2", "3", "4", "5"]
+                },
+                "waterTemperature": {
+                  "raw": "8000",
+                  "default": "none",
+                  "options": []
+                }
+              }
+            },
+            {
+              "cycle": "74",
+              "cycleType": "washingOnly",
+              "supportedOptions": {
+                "soilLevel": {
+                  "raw": "C33E",
+                  "default": "normal",
+                  "options": [
+                    "extraLight",
+                    "light",
+                    "normal",
+                    "heavy",
+                    "extraHeavy"
+                  ]
+                },
+                "spinLevel": {
+                  "raw": "A207",
+                  "default": "low",
+                  "options": ["rinseHold", "noSpin", "low"]
+                },
+                "rinseCycle": {
+                  "raw": "923F",
+                  "default": "2",
+                  "options": ["0", "1", "2", "3", "4", "5"]
+                },
+                "waterTemperature": {
+                  "raw": "830E",
+                  "default": "warm",
+                  "options": ["tapCold", "cold", "warm"]
+                }
+              }
+            },
+            {
+              "cycle": "75",
+              "cycleType": "washingOnly",
+              "supportedOptions": {
+                "soilLevel": {
+                  "raw": "C33E",
+                  "default": "normal",
+                  "options": [
+                    "extraLight",
+                    "light",
+                    "normal",
+                    "heavy",
+                    "extraHeavy"
+                  ]
+                },
+                "spinLevel": {
+                  "raw": "A30F",
+                  "default": "medium",
+                  "options": ["rinseHold", "noSpin", "low", "medium"]
+                },
+                "rinseCycle": {
+                  "raw": "920F",
+                  "default": "2",
+                  "options": ["0", "1", "2", "3"]
+                },
+                "waterTemperature": {
+                  "raw": "810E",
+                  "default": "tapCold",
+                  "options": ["tapCold", "cold", "warm"]
+                }
+              }
+            },
+            {
+              "cycle": "78",
+              "cycleType": "washingOnly",
+              "supportedOptions": {
+                "soilLevel": {
+                  "raw": "C13E",
+                  "default": "extraLight",
+                  "options": [
+                    "extraLight",
+                    "light",
+                    "normal",
+                    "heavy",
+                    "extraHeavy"
+                  ]
+                },
+                "spinLevel": {
+                  "raw": "A53F",
+                  "default": "extraHigh",
+                  "options": [
+                    "rinseHold",
+                    "noSpin",
+                    "low",
+                    "medium",
+                    "high",
+                    "extraHigh"
+                  ]
+                },
+                "rinseCycle": {
+                  "raw": "913F",
+                  "default": "1",
+                  "options": ["0", "1", "2", "3", "4", "5"]
+                },
+                "waterTemperature": {
+                  "raw": "831E",
+                  "default": "warm",
+                  "options": ["tapCold", "cold", "warm", "hot"]
+                }
+              }
+            }
+          ],
+          "timestamp": "2024-12-25T22:13:27.760Z"
+        },
+        "washerCycle": {
+          "value": "Table_00_Course_01",
+          "timestamp": "2025-02-07T02:29:55.623Z"
+        },
+        "referenceTable": {
+          "value": {
+            "id": "Table_00"
+          },
+          "timestamp": "2021-06-01T22:52:20.068Z"
+        },
+        "specializedFunctionClassification": {
+          "value": 4,
+          "timestamp": "2025-02-07T02:29:55.152Z"
+        }
+      },
+      "samsungce.waterConsumptionReport": {
+        "waterConsumption": {
+          "value": null
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": null
+        },
+        "mndt": {
+          "value": null
+        },
+        "mnfv": {
+          "value": "DA_WM_TP2_20_COMMON_30230804",
+          "timestamp": "2024-12-25T22:13:27.131Z"
+        },
+        "mnhw": {
+          "value": "MediaTek",
+          "timestamp": "2024-12-25T22:13:27.131Z"
+        },
+        "di": {
+          "value": "f984b91d-f250-9d42-3436-33f09a422a47",
+          "timestamp": "2024-12-25T22:13:27.131Z"
+        },
+        "mnsl": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2024-12-25T22:13:27.131Z"
+        },
+        "dmv": {
+          "value": "res.1.1.0,sh.1.1.0",
+          "timestamp": "2024-12-25T22:13:27.131Z"
+        },
+        "n": {
+          "value": "[washer] Samsung",
+          "timestamp": "2024-12-25T22:13:27.131Z"
+        },
+        "mnmo": {
+          "value": "DA_WM_TP2_20_COMMON|20233741|2001000100131100022B010000000000",
+          "timestamp": "2024-12-25T22:13:27.131Z"
+        },
+        "vid": {
+          "value": "DA-WM-WM-000001",
+          "timestamp": "2024-12-25T22:13:27.131Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2024-12-25T22:13:27.131Z"
+        },
+        "mnml": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2024-12-25T22:13:27.131Z"
+        },
+        "mnpv": {
+          "value": "DAWIT 2.0",
+          "timestamp": "2024-12-25T22:13:27.131Z"
+        },
+        "mnos": {
+          "value": "TizenRT 2.0 + IPv6",
+          "timestamp": "2024-12-25T22:13:27.131Z"
+        },
+        "pi": {
+          "value": "f984b91d-f250-9d42-3436-33f09a422a47",
+          "timestamp": "2024-12-25T22:13:27.131Z"
+        },
+        "icv": {
+          "value": "core.1.1.0",
+          "timestamp": "2024-12-25T22:13:27.131Z"
+        }
+      },
+      "custom.dryerDryLevel": {
+        "dryerDryLevel": {
+          "value": null
+        },
+        "supportedDryerDryLevel": {
+          "value": null
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": [
+            "samsungce.autoDispenseDetergent",
+            "samsungce.autoDispenseSoftener",
+            "samsungce.waterConsumptionReport",
+            "samsungce.washerCyclePreset",
+            "samsungce.welcomeMessage",
+            "samsungce.dongleSoftwareInstallation",
+            "sec.wifiConfiguration",
+            "samsungce.quickControl",
+            "samsungce.deviceInfoPrivate",
+            "samsungce.energyPlanner",
+            "demandResponseLoadControl",
+            "samsungce.softenerAutoReplenishment",
+            "samsungce.softenerOrder",
+            "samsungce.softenerState",
+            "samsungce.washerBubbleSoak",
+            "samsungce.washerFreezePrevent",
+            "custom.dryerDryLevel",
+            "samsungce.washerWaterLevel",
+            "samsungce.washerWaterValve",
+            "samsungce.washerWashingTime",
+            "custom.washerAutoDetergent",
+            "custom.washerAutoSoftener"
+          ],
+          "timestamp": "2024-07-01T16:13:35.173Z"
+        }
+      },
+      "custom.washerRinseCycles": {
+        "supportedWasherRinseCycles": {
+          "value": ["0", "1", "2", "3", "4", "5"],
+          "timestamp": "2024-12-25T22:13:27.760Z"
+        },
+        "washerRinseCycles": {
+          "value": "2",
+          "timestamp": "2025-02-07T02:29:55.691Z"
+        }
+      },
+      "samsungce.driverVersion": {
+        "versionNumber": {
+          "value": 24110101,
+          "timestamp": "2024-12-03T02:14:52.963Z"
+        }
+      },
+      "sec.diagnosticsInformation": {
+        "logType": {
+          "value": ["errCode", "dump"],
+          "timestamp": "2025-02-07T02:29:55.453Z"
+        },
+        "endpoint": {
+          "value": "SSM",
+          "timestamp": "2025-02-07T02:29:55.453Z"
+        },
+        "minVersion": {
+          "value": "1.0",
+          "timestamp": "2025-02-07T02:29:55.453Z"
+        },
+        "signinPermission": {
+          "value": null
+        },
+        "setupId": {
+          "value": "210",
+          "timestamp": "2025-02-07T02:29:55.453Z"
+        },
+        "protocolType": {
+          "value": "wifi_https",
+          "timestamp": "2025-02-07T02:29:55.453Z"
+        },
+        "tsId": {
+          "value": null
+        },
+        "mnId": {
+          "value": "0AJT",
+          "timestamp": "2025-02-07T02:29:55.453Z"
+        },
+        "dumpType": {
+          "value": "file",
+          "timestamp": "2025-02-07T02:29:55.453Z"
+        }
+      },
+      "samsungce.washerOperatingState": {
+        "washerJobState": {
+          "value": "none",
+          "timestamp": "2025-02-07T03:09:45.534Z"
+        },
+        "operatingState": {
+          "value": "ready",
+          "timestamp": "2025-02-07T03:09:45.534Z"
+        },
+        "supportedOperatingStates": {
+          "value": ["ready", "running", "paused"],
+          "timestamp": "2022-11-04T14:21:57.546Z"
+        },
+        "scheduledJobs": {
+          "value": [
+            {
+              "jobName": "wash",
+              "timeInMin": 23
+            },
+            {
+              "jobName": "rinse",
+              "timeInMin": 10
+            },
+            {
+              "jobName": "spin",
+              "timeInMin": 9
+            }
+          ],
+          "timestamp": "2025-02-07T02:30:43.851Z"
+        },
+        "scheduledPhases": {
+          "value": [
+            {
+              "phaseName": "wash",
+              "timeInMin": 23
+            },
+            {
+              "phaseName": "rinse",
+              "timeInMin": 10
+            },
+            {
+              "phaseName": "spin",
+              "timeInMin": 9
+            }
+          ],
+          "timestamp": "2025-02-07T02:30:43.851Z"
+        },
+        "progress": {
+          "value": 1,
+          "unit": "%",
+          "timestamp": "2025-02-07T03:09:45.534Z"
+        },
+        "remainingTimeStr": {
+          "value": "00:45",
+          "timestamp": "2025-02-07T03:09:45.534Z"
+        },
+        "washerJobPhase": {
+          "value": "none",
+          "timestamp": "2025-02-07T03:09:45.534Z"
+        },
+        "operationTime": {
+          "value": 45,
+          "unit": "min",
+          "timestamp": "2025-02-07T03:09:45.594Z"
+        },
+        "remainingTime": {
+          "value": 45,
+          "unit": "min",
+          "timestamp": "2025-02-07T03:09:45.534Z"
+        }
+      },
+      "samsungce.kidsLock": {
+        "lockState": {
+          "value": "unlocked",
+          "timestamp": "2025-02-07T02:29:55.407Z"
+        }
+      },
+      "demandResponseLoadControl": {
+        "drlcStatus": {
+          "value": null
+        }
+      },
+      "samsungce.detergentOrder": {
+        "alarmEnabled": {
+          "value": false,
+          "timestamp": "2025-02-07T02:29:55.152Z"
+        },
+        "orderThreshold": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-02-07T02:29:55.152Z"
+        }
+      },
+      "powerConsumptionReport": {
+        "powerConsumption": {
+          "value": {
+            "energy": 352800,
+            "deltaEnergy": 0,
+            "power": 0,
+            "powerEnergy": 0.0,
+            "persistedEnergy": 0,
+            "energySaved": 0,
+            "start": "2025-02-07T03:09:24Z",
+            "end": "2025-02-07T03:09:45Z"
+          },
+          "timestamp": "2025-02-07T03:09:45.703Z"
+        }
+      },
+      "samsungce.detergentAutoReplenishment": {
+        "neutralDetergentType": {
+          "value": null
+        },
+        "regularDetergentRemainingAmount": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-02-07T02:29:55.152Z"
+        },
+        "babyDetergentRemainingAmount": {
+          "value": null
+        },
+        "neutralDetergentRemainingAmount": {
+          "value": null
+        },
+        "neutralDetergentAlarmEnabled": {
+          "value": null
+        },
+        "neutralDetergentOrderThreshold": {
+          "value": null
+        },
+        "babyDetergentInitialAmount": {
+          "value": null
+        },
+        "babyDetergentType": {
+          "value": null
+        },
+        "neutralDetergentInitialAmount": {
+          "value": null
+        },
+        "regularDetergentDosage": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-02-07T02:29:55.152Z"
+        },
+        "babyDetergentDosage": {
+          "value": null
+        },
+        "regularDetergentOrderThreshold": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-02-07T02:29:55.152Z"
+        },
+        "regularDetergentType": {
+          "value": "none",
+          "timestamp": "2025-02-07T02:29:55.152Z"
+        },
+        "regularDetergentInitialAmount": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-02-07T02:29:55.152Z"
+        },
+        "regularDetergentAlarmEnabled": {
+          "value": false,
+          "timestamp": "2025-02-07T02:29:55.152Z"
+        },
+        "neutralDetergentDosage": {
+          "value": null
+        },
+        "babyDetergentOrderThreshold": {
+          "value": null
+        },
+        "babyDetergentAlarmEnabled": {
+          "value": null
+        }
+      },
+      "samsungce.softenerOrder": {
+        "alarmEnabled": {
+          "value": null
+        },
+        "orderThreshold": {
+          "value": null
+        }
+      },
+      "custom.washerSoilLevel": {
+        "supportedWasherSoilLevel": {
+          "value": [
+            "none",
+            "extraLight",
+            "light",
+            "normal",
+            "heavy",
+            "extraHeavy"
+          ],
+          "timestamp": "2024-12-25T22:13:27.760Z"
+        },
+        "washerSoilLevel": {
+          "value": "normal",
+          "timestamp": "2025-02-07T02:29:55.691Z"
+        }
+      },
+      "samsungce.washerBubbleSoak": {
+        "status": {
+          "value": null
+        }
+      },
+      "samsungce.washerCyclePreset": {
+        "maxNumberOfPresets": {
+          "value": 10,
+          "timestamp": "2025-02-07T02:29:55.805Z"
+        },
+        "presets": {
+          "value": null
+        }
+      },
+      "samsungce.detergentState": {
+        "remainingAmount": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-02-07T02:29:55.152Z"
+        },
+        "dosage": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-02-07T02:29:55.152Z"
+        },
+        "initialAmount": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-02-07T02:29:55.152Z"
+        },
+        "detergentType": {
+          "value": "none",
+          "timestamp": "2021-06-01T22:52:19.999Z"
+        }
+      },
+      "refresh": {},
+      "custom.jobBeginningStatus": {
+        "jobBeginningStatus": {
+          "value": null
+        }
+      },
+      "execute": {
+        "data": {
+          "value": {
+            "payload": {
+              "rt": ["x.com.samsung.da.information"],
+              "if": ["oic.if.baseline", "oic.if.a"],
+              "x.com.samsung.da.modelNum": "DA_WM_TP2_20_COMMON|20233741|2001000100131100022B010000000000",
+              "x.com.samsung.da.description": "DA_WM_TP2_20_COMMON_WF6300R/DC92-02338B_0080",
+              "x.com.samsung.da.serialNum": "01FW57AR401623N",
+              "x.com.samsung.da.otnDUID": "U7CNQWBWJM5U4",
+              "x.com.samsung.da.diagProtocolType": "WIFI_HTTPS",
+              "x.com.samsung.da.diagLogType": ["errCode", "dump"],
+              "x.com.samsung.da.diagDumpType": "file",
+              "x.com.samsung.da.diagEndPoint": "SSM",
+              "x.com.samsung.da.diagMnid": "0AJT",
+              "x.com.samsung.da.diagSetupid": "210",
+              "x.com.samsung.da.diagMinVersion": "1.0",
+              "x.com.samsung.da.items": [
+                {
+                  "x.com.samsung.da.id": "0",
+                  "x.com.samsung.da.description": "DA_WM_TP2_20_COMMON|20233741|2001000100131100022B010000000000",
+                  "x.com.samsung.da.type": "Software",
+                  "x.com.samsung.da.number": "02674A220725(F541)",
+                  "x.com.samsung.da.newVersionAvailable": "0"
+                },
+                {
+                  "x.com.samsung.da.id": "1",
+                  "x.com.samsung.da.description": "DA_WM_TP2_20_COMMON",
+                  "x.com.samsung.da.type": "Firmware",
+                  "x.com.samsung.da.number": "18112816,20050607",
+                  "x.com.samsung.da.newVersionAvailable": "0"
+                }
+              ]
+            }
+          },
+          "data": {
+            "href": "/information/vs/0"
+          },
+          "timestamp": "2023-08-06T16:52:15.994Z"
+        }
+      },
+      "samsungce.softenerState": {
+        "remainingAmount": {
+          "value": null
+        },
+        "dosage": {
+          "value": null
+        },
+        "softenerType": {
+          "value": null
+        },
+        "initialAmount": {
+          "value": null
+        }
+      },
+      "samsungce.energyPlanner": {
+        "data": {
+          "value": null
+        },
+        "plan": {
+          "value": null
+        }
+      },
+      "sec.wifiConfiguration": {
+        "autoReconnection": {
+          "value": null
+        },
+        "minVersion": {
+          "value": null
+        },
+        "supportedWiFiFreq": {
+          "value": null
+        },
+        "supportedAuthType": {
+          "value": null
+        },
+        "protocolType": {
+          "value": null
+        }
+      },
+      "remoteControlStatus": {
+        "remoteControlEnabled": {
+          "value": "false",
+          "timestamp": "2025-02-07T02:29:55.634Z"
+        }
+      },
+      "custom.supportedOptions": {
+        "course": {
+          "value": null
+        },
+        "referenceTable": {
+          "value": {
+            "id": "Table_00"
+          },
+          "timestamp": "2025-02-07T02:29:55.623Z"
+        },
+        "supportedCourses": {
+          "value": [
+            "01",
+            "70",
+            "55",
+            "71",
+            "72",
+            "77",
+            "E5",
+            "57",
+            "73",
+            "74",
+            "75",
+            "78"
+          ],
+          "timestamp": "2025-02-07T02:29:55.152Z"
+        }
+      },
+      "samsungce.washerWashingTime": {
+        "supportedWashingTimes": {
+          "value": null
+        },
+        "washingTime": {
+          "value": null
+        }
+      },
+      "custom.energyType": {
+        "energyType": {
+          "value": "2.0",
+          "timestamp": "2022-06-15T14:11:34.909Z"
+        },
+        "energySavingSupport": {
+          "value": false,
+          "timestamp": "2022-06-15T14:26:38.584Z"
+        },
+        "drMaxDuration": {
+          "value": 99999999,
+          "unit": "min",
+          "timestamp": "2022-06-15T14:11:37.255Z"
+        },
+        "energySavingLevel": {
+          "value": null
+        },
+        "energySavingInfo": {
+          "value": null
+        },
+        "supportedEnergySavingLevels": {
+          "value": null
+        },
+        "energySavingOperation": {
+          "value": null
+        },
+        "notificationTemplateID": {
+          "value": null
+        },
+        "energySavingOperationSupport": {
+          "value": false,
+          "timestamp": "2022-06-15T14:11:37.255Z"
+        }
+      },
+      "samsungce.softwareUpdate": {
+        "targetModule": {
+          "value": {},
+          "timestamp": "2025-02-07T02:29:55.548Z"
+        },
+        "otnDUID": {
+          "value": "U7CNQWBWJM5U4",
+          "timestamp": "2025-02-07T02:29:55.453Z"
+        },
+        "lastUpdatedDate": {
+          "value": null
+        },
+        "availableModules": {
+          "value": [],
+          "timestamp": "2024-12-01T23:36:22.798Z"
+        },
+        "newVersionAvailable": {
+          "value": false,
+          "timestamp": "2025-02-07T02:29:55.548Z"
+        },
+        "operatingState": {
+          "value": null
+        },
+        "progress": {
+          "value": null
+        }
+      },
+      "custom.washerAutoDetergent": {
+        "washerAutoDetergent": {
+          "value": null
+        }
+      },
+      "custom.washerSpinLevel": {
+        "washerSpinLevel": {
+          "value": "high",
+          "timestamp": "2025-02-07T02:29:55.691Z"
+        },
+        "supportedWasherSpinLevel": {
+          "value": [
+            "rinseHold",
+            "noSpin",
+            "low",
+            "medium",
+            "high",
+            "extraHigh"
+          ],
+          "timestamp": "2024-12-25T22:13:27.760Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/da_wm_wm_000001_1.json b/tests/components/smartthings/fixtures/device_status/da_wm_wm_000001_1.json
new file mode 100644
index 00000000000..157e5496625
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/da_wm_wm_000001_1.json
@@ -0,0 +1,1416 @@
+{
+  "components": {
+    "hca.main": {
+      "hca.washerMode": {
+        "mode": {
+          "value": "mix",
+          "timestamp": "2025-03-07T06:06:08.905Z"
+        },
+        "supportedModes": {
+          "value": ["normal", "quickWash", "mix", "eco"],
+          "timestamp": "2025-03-07T06:06:08.613Z"
+        }
+      }
+    },
+    "main": {
+      "samsungce.washerDelayEnd": {
+        "remainingTime": {
+          "value": 0,
+          "unit": "min",
+          "timestamp": "2025-03-07T06:06:08.806Z"
+        },
+        "minimumReservableTime": {
+          "value": 49,
+          "unit": "min",
+          "timestamp": "2025-03-07T06:06:08.613Z"
+        }
+      },
+      "samsungce.washerWaterLevel": {
+        "supportedWaterLevel": {
+          "value": null,
+          "timestamp": "2021-03-31T22:35:35.010Z"
+        },
+        "waterLevel": {
+          "value": null,
+          "timestamp": "2021-04-17T09:56:20.618Z"
+        }
+      },
+      "samsungce.welcomeMessage": {
+        "welcomeMessage": {
+          "value": null,
+          "timestamp": "2021-04-01T23:43:08.541Z"
+        }
+      },
+      "custom.washerWaterTemperature": {
+        "supportedWasherWaterTemperature": {
+          "value": ["none", "cold", "20", "30", "40", "60", "90"],
+          "timestamp": "2024-12-09T22:01:38.311Z"
+        },
+        "washerWaterTemperature": {
+          "value": "40",
+          "timestamp": "2025-03-07T06:06:08.901Z"
+        }
+      },
+      "samsungce.softenerAutoReplenishment": {
+        "regularSoftenerType": {
+          "value": null
+        },
+        "regularSoftenerAlarmEnabled": {
+          "value": null
+        },
+        "regularSoftenerInitialAmount": {
+          "value": null
+        },
+        "regularSoftenerRemainingAmount": {
+          "value": null
+        },
+        "regularSoftenerDosage": {
+          "value": null
+        },
+        "regularSoftenerOrderThreshold": {
+          "value": null
+        }
+      },
+      "samsungce.autoDispenseSoftener": {
+        "remainingAmount": {
+          "value": null,
+          "timestamp": "2021-01-29T10:38:25.844Z"
+        },
+        "amount": {
+          "value": null,
+          "timestamp": "2020-12-28T07:28:49.408Z"
+        },
+        "supportedDensity": {
+          "value": null,
+          "timestamp": "2020-12-28T07:28:49.408Z"
+        },
+        "density": {
+          "value": null,
+          "timestamp": "2020-12-28T07:28:49.408Z"
+        },
+        "supportedAmount": {
+          "value": null,
+          "timestamp": "2020-12-28T07:28:49.408Z"
+        }
+      },
+      "samsungce.dongleSoftwareInstallation": {
+        "status": {
+          "value": "completed",
+          "timestamp": "2022-06-14T22:23:10.096Z"
+        }
+      },
+      "samsungce.autoDispenseDetergent": {
+        "remainingAmount": {
+          "value": null,
+          "timestamp": "2021-01-26T01:49:50.635Z"
+        },
+        "amount": {
+          "value": null,
+          "timestamp": "2020-12-28T07:15:24.539Z"
+        },
+        "supportedDensity": {
+          "value": null,
+          "timestamp": "2020-12-28T07:15:24.539Z"
+        },
+        "density": {
+          "value": null,
+          "timestamp": "2020-12-28T07:15:24.539Z"
+        },
+        "supportedAmount": {
+          "value": null,
+          "timestamp": "2020-12-28T07:15:24.539Z"
+        },
+        "availableTypes": {
+          "value": null
+        },
+        "type": {
+          "value": null
+        },
+        "recommendedAmount": {
+          "value": null
+        }
+      },
+      "samsungce.deviceIdentification": {
+        "micomAssayCode": {
+          "value": "20224941",
+          "timestamp": "2025-03-07T06:06:08.719Z"
+        },
+        "modelName": {
+          "value": null,
+          "timestamp": "2021-04-01T23:32:40.512Z"
+        },
+        "serialNumber": {
+          "value": null,
+          "timestamp": "2021-04-01T23:32:38.884Z"
+        },
+        "serialNumberExtra": {
+          "value": null,
+          "timestamp": "2021-04-01T23:32:36.541Z"
+        },
+        "modelClassificationCode": {
+          "value": "20010102011211030203000000000000",
+          "timestamp": "2025-03-07T06:06:08.719Z"
+        },
+        "description": {
+          "value": "DA_WM_A51_20_COMMON_\u0018WD7800N/DC92-02249A_08CC",
+          "timestamp": "2025-03-07T06:06:08.719Z"
+        },
+        "releaseYear": {
+          "value": null
+        },
+        "binaryId": {
+          "value": "DA_WM_A51_20_COMMON",
+          "timestamp": "2025-03-07T06:06:08.719Z"
+        }
+      },
+      "samsungce.washerWaterValve": {
+        "waterValve": {
+          "value": null,
+          "timestamp": "2021-04-01T23:43:07.144Z"
+        },
+        "supportedWaterValve": {
+          "value": null,
+          "timestamp": "2021-03-31T22:35:34.371Z"
+        }
+      },
+      "washerOperatingState": {
+        "completionTime": {
+          "value": "2025-03-07T07:01:12Z",
+          "timestamp": "2025-03-07T06:12:12.191Z"
+        },
+        "machineState": {
+          "value": "run",
+          "timestamp": "2025-03-07T06:12:12.191Z"
+        },
+        "washerJobState": {
+          "value": "wash",
+          "timestamp": "2025-03-07T06:12:37.974Z"
+        },
+        "supportedMachineStates": {
+          "value": ["stop", "run", "pause"],
+          "timestamp": "2025-03-07T06:06:08.806Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "on",
+          "timestamp": "2025-03-07T06:06:08.856Z"
+        }
+      },
+      "custom.washerAutoSoftener": {
+        "washerAutoSoftener": {
+          "value": null,
+          "timestamp": "2020-08-07T21:22:34.172Z"
+        }
+      },
+      "samsungce.washerFreezePrevent": {
+        "operatingState": {
+          "value": null
+        }
+      },
+      "samsungce.quickControl": {
+        "version": {
+          "value": null
+        }
+      },
+      "samsungce.washerCycle": {
+        "supportedCycles": {
+          "value": [
+            {
+              "cycle": "D0",
+              "cycleType": "allInOne",
+              "supportedOptions": {
+                "bubbleSoak": {
+                  "raw": "35F0",
+                  "default": "off",
+                  "options": ["on", "off"]
+                },
+                "dryingLevel": {
+                  "raw": "B01F",
+                  "default": "none",
+                  "options": [
+                    "none",
+                    "cupboard",
+                    "30",
+                    "60",
+                    "90",
+                    "210",
+                    "240",
+                    "270"
+                  ]
+                },
+                "spinLevel": {
+                  "raw": "A67F",
+                  "default": "1400",
+                  "options": [
+                    "rinseHold",
+                    "noSpin",
+                    "400",
+                    "800",
+                    "1000",
+                    "1200",
+                    "1400"
+                  ]
+                },
+                "rinseCycle": {
+                  "raw": "923F",
+                  "default": "2",
+                  "options": ["0", "1", "2", "3", "4", "5"]
+                },
+                "waterTemperature": {
+                  "raw": "847E",
+                  "default": "40",
+                  "options": ["cold", "20", "30", "40", "60", "90"]
+                }
+              }
+            },
+            {
+              "cycle": "DC",
+              "cycleType": "allInOne",
+              "supportedOptions": {
+                "bubbleSoak": {
+                  "raw": "3500",
+                  "default": "off",
+                  "options": []
+                },
+                "dryingLevel": {
+                  "raw": "B01F",
+                  "default": "none",
+                  "options": [
+                    "none",
+                    "cupboard",
+                    "30",
+                    "60",
+                    "90",
+                    "210",
+                    "240",
+                    "270"
+                  ]
+                },
+                "spinLevel": {
+                  "raw": "A33F",
+                  "default": "800",
+                  "options": [
+                    "rinseHold",
+                    "noSpin",
+                    "400",
+                    "800",
+                    "1000",
+                    "1200"
+                  ]
+                },
+                "rinseCycle": {
+                  "raw": "933F",
+                  "default": "3",
+                  "options": ["0", "1", "2", "3", "4", "5"]
+                },
+                "waterTemperature": {
+                  "raw": "811E",
+                  "default": "cold",
+                  "options": ["cold", "20", "30", "40"]
+                }
+              }
+            },
+            {
+              "cycle": "E3",
+              "cycleType": "allInOne",
+              "supportedOptions": {
+                "bubbleSoak": {
+                  "raw": "35F0",
+                  "default": "off",
+                  "options": ["on", "off"]
+                },
+                "dryingLevel": {
+                  "raw": "B01F",
+                  "default": "none",
+                  "options": [
+                    "none",
+                    "cupboard",
+                    "30",
+                    "60",
+                    "90",
+                    "210",
+                    "240",
+                    "270"
+                  ]
+                },
+                "spinLevel": {
+                  "raw": "A67F",
+                  "default": "1400",
+                  "options": [
+                    "rinseHold",
+                    "noSpin",
+                    "400",
+                    "800",
+                    "1000",
+                    "1200",
+                    "1400"
+                  ]
+                },
+                "rinseCycle": {
+                  "raw": "923F",
+                  "default": "2",
+                  "options": ["0", "1", "2", "3", "4", "5"]
+                },
+                "waterTemperature": {
+                  "raw": "841E",
+                  "default": "40",
+                  "options": ["cold", "20", "30", "40"]
+                }
+              }
+            },
+            {
+              "cycle": "E4",
+              "cycleType": "allInOne",
+              "supportedOptions": {
+                "bubbleSoak": {
+                  "raw": "35F0",
+                  "default": "off",
+                  "options": ["on", "off"]
+                },
+                "dryingLevel": {
+                  "raw": "B01F",
+                  "default": "none",
+                  "options": [
+                    "none",
+                    "cupboard",
+                    "30",
+                    "60",
+                    "90",
+                    "210",
+                    "240",
+                    "270"
+                  ]
+                },
+                "spinLevel": {
+                  "raw": "A67F",
+                  "default": "1400",
+                  "options": [
+                    "rinseHold",
+                    "noSpin",
+                    "400",
+                    "800",
+                    "1000",
+                    "1200",
+                    "1400"
+                  ]
+                },
+                "rinseCycle": {
+                  "raw": "943F",
+                  "default": "4",
+                  "options": ["0", "1", "2", "3", "4", "5"]
+                },
+                "waterTemperature": {
+                  "raw": "8560",
+                  "default": "60",
+                  "options": ["60", "90"]
+                }
+              }
+            },
+            {
+              "cycle": "50",
+              "cycleType": "dryingOnly",
+              "supportedOptions": {
+                "bubbleSoak": {
+                  "raw": "3500",
+                  "default": "off",
+                  "options": []
+                },
+                "dryingLevel": {
+                  "raw": "B11E",
+                  "default": "cupboard",
+                  "options": ["cupboard", "30", "60", "90", "210", "240", "270"]
+                },
+                "spinLevel": {
+                  "raw": "A000",
+                  "default": "rinseHold",
+                  "options": []
+                },
+                "rinseCycle": {
+                  "raw": "9000",
+                  "default": "0",
+                  "options": []
+                },
+                "waterTemperature": {
+                  "raw": "8000",
+                  "default": "none",
+                  "options": []
+                }
+              }
+            },
+            {
+              "cycle": "51",
+              "cycleType": "dryingOnly",
+              "supportedOptions": {
+                "bubbleSoak": {
+                  "raw": "3500",
+                  "default": "off",
+                  "options": []
+                },
+                "dryingLevel": {
+                  "raw": "B11E",
+                  "default": "cupboard",
+                  "options": ["cupboard", "30", "60", "90", "210", "240", "270"]
+                },
+                "spinLevel": {
+                  "raw": "A000",
+                  "default": "rinseHold",
+                  "options": []
+                },
+                "rinseCycle": {
+                  "raw": "9000",
+                  "default": "0",
+                  "options": []
+                },
+                "waterTemperature": {
+                  "raw": "8000",
+                  "default": "none",
+                  "options": []
+                }
+              }
+            },
+            {
+              "cycle": "CA",
+              "cycleType": "dryingOnly",
+              "supportedOptions": {
+                "bubbleSoak": {
+                  "raw": "3500",
+                  "default": "off",
+                  "options": []
+                },
+                "dryingLevel": {
+                  "raw": "B000",
+                  "default": "none",
+                  "options": ["210", "240", "270"]
+                },
+                "spinLevel": {
+                  "raw": "A000",
+                  "default": "rinseHold",
+                  "options": []
+                },
+                "rinseCycle": {
+                  "raw": "9000",
+                  "default": "0",
+                  "options": []
+                },
+                "waterTemperature": {
+                  "raw": "8000",
+                  "default": "none",
+                  "options": []
+                }
+              }
+            },
+            {
+              "cycle": "E7",
+              "cycleType": "allInOne",
+              "supportedOptions": {
+                "bubbleSoak": {
+                  "raw": "35F0",
+                  "default": "off",
+                  "options": ["on", "off"]
+                },
+                "dryingLevel": {
+                  "raw": "B100",
+                  "default": "cupboard",
+                  "options": ["210", "240", "270"]
+                },
+                "spinLevel": {
+                  "raw": "A640",
+                  "default": "1400",
+                  "options": ["1400"]
+                },
+                "rinseCycle": {
+                  "raw": "923F",
+                  "default": "2",
+                  "options": ["0", "1", "2", "3", "4", "5"]
+                },
+                "waterTemperature": {
+                  "raw": "841E",
+                  "default": "40",
+                  "options": ["cold", "20", "30", "40"]
+                }
+              }
+            },
+            {
+              "cycle": "C7",
+              "cycleType": "allInOne",
+              "supportedOptions": {
+                "bubbleSoak": {
+                  "raw": "3500",
+                  "default": "off",
+                  "options": []
+                },
+                "dryingLevel": {
+                  "raw": "B000",
+                  "default": "none",
+                  "options": ["210", "240", "270"]
+                },
+                "spinLevel": {
+                  "raw": "A520",
+                  "default": "1200",
+                  "options": ["1200"]
+                },
+                "rinseCycle": {
+                  "raw": "9204",
+                  "default": "2",
+                  "options": ["2"]
+                },
+                "waterTemperature": {
+                  "raw": "8520",
+                  "default": "60",
+                  "options": ["60"]
+                }
+              }
+            },
+            {
+              "cycle": "D8",
+              "cycleType": "allInOne",
+              "supportedOptions": {
+                "bubbleSoak": {
+                  "raw": "3500",
+                  "default": "off",
+                  "options": []
+                },
+                "dryingLevel": {
+                  "raw": "B000",
+                  "default": "none",
+                  "options": ["210", "240", "270"]
+                },
+                "spinLevel": {
+                  "raw": "A30F",
+                  "default": "800",
+                  "options": ["rinseHold", "noSpin", "400", "800"]
+                },
+                "rinseCycle": {
+                  "raw": "920F",
+                  "default": "2",
+                  "options": ["0", "1", "2", "3"]
+                },
+                "waterTemperature": {
+                  "raw": "841E",
+                  "default": "40",
+                  "options": ["cold", "20", "30", "40"]
+                }
+              }
+            },
+            {
+              "cycle": "D4",
+              "cycleType": "allInOne",
+              "supportedOptions": {
+                "bubbleSoak": {
+                  "raw": "3500",
+                  "default": "off",
+                  "options": []
+                },
+                "dryingLevel": {
+                  "raw": "B01F",
+                  "default": "none",
+                  "options": [
+                    "none",
+                    "cupboard",
+                    "30",
+                    "60",
+                    "90",
+                    "210",
+                    "240",
+                    "270"
+                  ]
+                },
+                "spinLevel": {
+                  "raw": "A67F",
+                  "default": "1400",
+                  "options": [
+                    "rinseHold",
+                    "noSpin",
+                    "400",
+                    "800",
+                    "1000",
+                    "1200",
+                    "1400"
+                  ]
+                },
+                "rinseCycle": {
+                  "raw": "913F",
+                  "default": "1",
+                  "options": ["0", "1", "2", "3", "4", "5"]
+                },
+                "waterTemperature": {
+                  "raw": "8000",
+                  "default": "none",
+                  "options": []
+                }
+              }
+            },
+            {
+              "cycle": "D3",
+              "cycleType": "allInOne",
+              "supportedOptions": {
+                "bubbleSoak": {
+                  "raw": "3500",
+                  "default": "off",
+                  "options": []
+                },
+                "dryingLevel": {
+                  "raw": "B01F",
+                  "default": "none",
+                  "options": [
+                    "none",
+                    "cupboard",
+                    "30",
+                    "60",
+                    "90",
+                    "210",
+                    "240",
+                    "270"
+                  ]
+                },
+                "spinLevel": {
+                  "raw": "A30F",
+                  "default": "800",
+                  "options": ["rinseHold", "noSpin", "400", "800"]
+                },
+                "rinseCycle": {
+                  "raw": "920F",
+                  "default": "2",
+                  "options": ["0", "1", "2", "3"]
+                },
+                "waterTemperature": {
+                  "raw": "831E",
+                  "default": "30",
+                  "options": ["cold", "20", "30", "40"]
+                }
+              }
+            },
+            {
+              "cycle": "DA",
+              "cycleType": "allInOne",
+              "supportedOptions": {
+                "bubbleSoak": {
+                  "raw": "3500",
+                  "default": "off",
+                  "options": []
+                },
+                "dryingLevel": {
+                  "raw": "B01F",
+                  "default": "none",
+                  "options": [
+                    "none",
+                    "cupboard",
+                    "30",
+                    "60",
+                    "90",
+                    "210",
+                    "240",
+                    "270"
+                  ]
+                },
+                "spinLevel": {
+                  "raw": "A53F",
+                  "default": "1200",
+                  "options": [
+                    "rinseHold",
+                    "noSpin",
+                    "400",
+                    "800",
+                    "1000",
+                    "1200"
+                  ]
+                },
+                "rinseCycle": {
+                  "raw": "923F",
+                  "default": "2",
+                  "options": ["0", "1", "2", "3", "4", "5"]
+                },
+                "waterTemperature": {
+                  "raw": "8102",
+                  "default": "cold",
+                  "options": ["cold"]
+                }
+              }
+            },
+            {
+              "cycle": "D2",
+              "cycleType": "allInOne",
+              "supportedOptions": {
+                "bubbleSoak": {
+                  "raw": "35F0",
+                  "default": "off",
+                  "options": ["on", "off"]
+                },
+                "dryingLevel": {
+                  "raw": "B01F",
+                  "default": "none",
+                  "options": [
+                    "none",
+                    "cupboard",
+                    "30",
+                    "60",
+                    "90",
+                    "210",
+                    "240",
+                    "270"
+                  ]
+                },
+                "spinLevel": {
+                  "raw": "A67F",
+                  "default": "1400",
+                  "options": [
+                    "rinseHold",
+                    "noSpin",
+                    "400",
+                    "800",
+                    "1000",
+                    "1200",
+                    "1400"
+                  ]
+                },
+                "rinseCycle": {
+                  "raw": "923F",
+                  "default": "2",
+                  "options": ["0", "1", "2", "3", "4", "5"]
+                },
+                "waterTemperature": {
+                  "raw": "843E",
+                  "default": "40",
+                  "options": ["cold", "20", "30", "40", "60"]
+                }
+              }
+            }
+          ],
+          "timestamp": "2024-12-09T22:01:38.311Z"
+        },
+        "washerCycle": {
+          "value": "Table_00_Course_E3",
+          "timestamp": "2025-03-07T06:06:08.905Z"
+        },
+        "referenceTable": {
+          "value": {
+            "id": "Table_00"
+          },
+          "timestamp": "2021-12-01T23:55:08.740Z"
+        },
+        "specializedFunctionClassification": {
+          "value": 7,
+          "timestamp": "2025-03-07T06:06:08.613Z"
+        }
+      },
+      "samsungce.waterConsumptionReport": {
+        "waterConsumption": {
+          "value": null,
+          "timestamp": "2021-03-31T22:35:33.802Z"
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": null,
+          "timestamp": "2020-08-11T22:47:36.523Z"
+        },
+        "mndt": {
+          "value": null,
+          "timestamp": "2020-08-11T22:47:41.693Z"
+        },
+        "mnfv": {
+          "value": "DA_WM_A51_20_COMMON_30230708",
+          "timestamp": "2024-12-09T22:01:37.735Z"
+        },
+        "mnhw": {
+          "value": "ARTIK051",
+          "timestamp": "2024-12-09T22:01:37.735Z"
+        },
+        "di": {
+          "value": "63803fae-cbed-f356-a063-2cf148ae3ca7",
+          "timestamp": "2024-12-09T22:01:37.735Z"
+        },
+        "mnsl": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2024-12-09T22:01:37.735Z"
+        },
+        "dmv": {
+          "value": "1.2.1",
+          "timestamp": "2024-12-27T04:48:02.896Z"
+        },
+        "n": {
+          "value": "[washer] Samsung",
+          "timestamp": "2024-12-09T22:01:37.735Z"
+        },
+        "mnmo": {
+          "value": "DA_WM_A51_20_COMMON|20224941|20010102011211030203000000000000",
+          "timestamp": "2024-12-09T22:01:37.735Z"
+        },
+        "vid": {
+          "value": "DA-WM-WM-000001",
+          "timestamp": "2024-12-09T22:01:37.735Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2024-12-09T22:01:37.735Z"
+        },
+        "mnml": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2024-12-09T22:01:37.735Z"
+        },
+        "mnpv": {
+          "value": "DAWIT 2.0",
+          "timestamp": "2024-12-09T22:01:37.735Z"
+        },
+        "mnos": {
+          "value": "TizenRT 1.0 + IPv6",
+          "timestamp": "2024-12-09T22:01:37.735Z"
+        },
+        "pi": {
+          "value": "63803fae-cbed-f356-a063-2cf148ae3ca7",
+          "timestamp": "2024-12-09T22:01:37.735Z"
+        },
+        "icv": {
+          "value": "core.1.1.0",
+          "timestamp": "2024-12-27T04:48:02.896Z"
+        }
+      },
+      "custom.dryerDryLevel": {
+        "dryerDryLevel": {
+          "value": "none",
+          "timestamp": "2025-03-07T06:06:08.901Z"
+        },
+        "supportedDryerDryLevel": {
+          "value": [
+            "none",
+            "cupboard",
+            "30",
+            "60",
+            "90",
+            "120",
+            "150",
+            "180",
+            "210",
+            "240",
+            "270"
+          ],
+          "timestamp": "2024-12-09T22:01:38.311Z"
+        }
+      },
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": [
+            "samsungce.washerDelayEnd",
+            "washerOperatingState",
+            "samsungce.autoDispenseDetergent",
+            "samsungce.autoDispenseSoftener",
+            "samsungce.waterConsumptionReport",
+            "samsungce.washerCyclePreset",
+            "samsungce.welcomeMessage",
+            "samsungce.dongleSoftwareInstallation",
+            "sec.wifiConfiguration",
+            "samsungce.quickControl",
+            "samsungce.deviceInfoPrivate",
+            "samsungce.energyPlanner",
+            "demandResponseLoadControl",
+            "samsungce.softenerAutoReplenishment",
+            "samsungce.softenerOrder",
+            "samsungce.softenerState",
+            "samsungce.washerFreezePrevent",
+            "custom.washerSoilLevel",
+            "samsungce.washerWaterLevel",
+            "samsungce.washerWaterValve",
+            "samsungce.washerWashingTime",
+            "custom.washerAutoDetergent",
+            "custom.washerAutoSoftener",
+            "sec.diagnosticsInformation"
+          ],
+          "timestamp": "2024-07-03T08:44:32.524Z"
+        }
+      },
+      "custom.washerRinseCycles": {
+        "supportedWasherRinseCycles": {
+          "value": ["0", "1", "2", "3", "4", "5"],
+          "timestamp": "2024-12-09T22:01:38.311Z"
+        },
+        "washerRinseCycles": {
+          "value": "2",
+          "timestamp": "2025-03-07T06:06:08.901Z"
+        }
+      },
+      "samsungce.driverVersion": {
+        "versionNumber": {
+          "value": 24110101,
+          "timestamp": "2024-12-03T02:08:44.235Z"
+        }
+      },
+      "sec.diagnosticsInformation": {
+        "logType": {
+          "value": null
+        },
+        "endpoint": {
+          "value": null
+        },
+        "minVersion": {
+          "value": null
+        },
+        "signinPermission": {
+          "value": null
+        },
+        "setupId": {
+          "value": null
+        },
+        "protocolType": {
+          "value": null
+        },
+        "tsId": {
+          "value": null
+        },
+        "mnId": {
+          "value": null
+        },
+        "dumpType": {
+          "value": null
+        }
+      },
+      "samsungce.washerOperatingState": {
+        "washerJobState": {
+          "value": "wash",
+          "timestamp": "2025-03-07T06:12:37.974Z"
+        },
+        "operatingState": {
+          "value": "running",
+          "timestamp": "2025-03-07T06:12:12.191Z"
+        },
+        "supportedOperatingStates": {
+          "value": ["ready", "running", "paused"],
+          "timestamp": "2022-11-02T21:35:52.935Z"
+        },
+        "scheduledJobs": {
+          "value": [
+            {
+              "jobName": "wash",
+              "timeInMin": 21
+            },
+            {
+              "jobName": "rinse",
+              "timeInMin": 16
+            },
+            {
+              "jobName": "spin",
+              "timeInMin": 11
+            }
+          ],
+          "timestamp": "2025-03-07T06:06:08.613Z"
+        },
+        "scheduledPhases": {
+          "value": [
+            {
+              "phaseName": "wash",
+              "timeInMin": 21
+            },
+            {
+              "phaseName": "rinse",
+              "timeInMin": 16
+            },
+            {
+              "phaseName": "spin",
+              "timeInMin": 11
+            }
+          ],
+          "timestamp": "2025-03-07T06:06:08.613Z"
+        },
+        "progress": {
+          "value": 36,
+          "unit": "%",
+          "timestamp": "2025-03-07T06:30:10.639Z"
+        },
+        "remainingTimeStr": {
+          "value": "00:31",
+          "timestamp": "2025-03-07T06:30:10.639Z"
+        },
+        "washerJobPhase": {
+          "value": "wash",
+          "timestamp": "2025-03-07T06:12:37.974Z"
+        },
+        "operationTime": {
+          "value": 49,
+          "unit": "min",
+          "timestamp": "2025-03-06T02:24:50.104Z"
+        },
+        "remainingTime": {
+          "value": 31,
+          "unit": "min",
+          "timestamp": "2025-03-07T06:30:10.639Z"
+        }
+      },
+      "samsungce.kidsLock": {
+        "lockState": {
+          "value": "unlocked",
+          "timestamp": "2025-03-07T06:06:08.688Z"
+        }
+      },
+      "demandResponseLoadControl": {
+        "drlcStatus": {
+          "value": null
+        }
+      },
+      "samsungce.detergentOrder": {
+        "alarmEnabled": {
+          "value": false,
+          "timestamp": "2025-03-07T06:06:08.613Z"
+        },
+        "orderThreshold": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-03-07T06:06:08.613Z"
+        }
+      },
+      "powerConsumptionReport": {
+        "powerConsumption": {
+          "value": {
+            "energy": 1323600,
+            "deltaEnergy": 100,
+            "power": 0,
+            "powerEnergy": 0.0,
+            "persistedEnergy": 0,
+            "energySaved": 0,
+            "start": "2025-03-07T06:21:09Z",
+            "end": "2025-03-07T06:23:21Z"
+          },
+          "timestamp": "2025-03-07T06:23:21.062Z"
+        }
+      },
+      "samsungce.detergentAutoReplenishment": {
+        "neutralDetergentType": {
+          "value": null
+        },
+        "regularDetergentRemainingAmount": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-03-07T06:06:08.613Z"
+        },
+        "babyDetergentRemainingAmount": {
+          "value": null
+        },
+        "neutralDetergentRemainingAmount": {
+          "value": null
+        },
+        "neutralDetergentAlarmEnabled": {
+          "value": null
+        },
+        "neutralDetergentOrderThreshold": {
+          "value": null
+        },
+        "babyDetergentInitialAmount": {
+          "value": null
+        },
+        "babyDetergentType": {
+          "value": null
+        },
+        "neutralDetergentInitialAmount": {
+          "value": null
+        },
+        "regularDetergentDosage": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-03-07T06:06:08.613Z"
+        },
+        "babyDetergentDosage": {
+          "value": null
+        },
+        "regularDetergentOrderThreshold": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-03-07T06:06:08.613Z"
+        },
+        "regularDetergentType": {
+          "value": "none",
+          "timestamp": "2025-03-07T06:06:08.613Z"
+        },
+        "regularDetergentInitialAmount": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-03-07T06:06:08.613Z"
+        },
+        "regularDetergentAlarmEnabled": {
+          "value": false,
+          "timestamp": "2025-03-07T06:06:08.613Z"
+        },
+        "neutralDetergentDosage": {
+          "value": null
+        },
+        "babyDetergentOrderThreshold": {
+          "value": null
+        },
+        "babyDetergentAlarmEnabled": {
+          "value": null
+        }
+      },
+      "samsungce.softenerOrder": {
+        "alarmEnabled": {
+          "value": null,
+          "timestamp": "2020-12-28T11:12:47.109Z"
+        },
+        "orderThreshold": {
+          "value": null,
+          "unit": "cc",
+          "timestamp": "2020-12-28T11:12:47.109Z"
+        }
+      },
+      "custom.washerSoilLevel": {
+        "supportedWasherSoilLevel": {
+          "value": null,
+          "timestamp": "2020-08-11T22:49:08.023Z"
+        },
+        "washerSoilLevel": {
+          "value": null,
+          "timestamp": "2020-08-11T22:49:08.023Z"
+        }
+      },
+      "samsungce.washerBubbleSoak": {
+        "status": {
+          "value": "off",
+          "timestamp": "2025-03-07T06:06:08.613Z"
+        }
+      },
+      "samsungce.washerCyclePreset": {
+        "maxNumberOfPresets": {
+          "value": 10,
+          "timestamp": "2025-03-07T06:06:08.957Z"
+        },
+        "presets": {
+          "value": null,
+          "timestamp": "2021-03-31T08:11:41.657Z"
+        }
+      },
+      "samsungce.detergentState": {
+        "remainingAmount": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-03-07T06:06:08.613Z"
+        },
+        "dosage": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-03-07T06:06:08.613Z"
+        },
+        "initialAmount": {
+          "value": 0,
+          "unit": "cc",
+          "timestamp": "2025-03-07T06:06:08.613Z"
+        },
+        "detergentType": {
+          "value": "none",
+          "timestamp": "2021-03-31T22:35:33.949Z"
+        }
+      },
+      "refresh": {},
+      "custom.jobBeginningStatus": {
+        "jobBeginningStatus": {
+          "value": null,
+          "timestamp": "2020-08-11T22:48:26.262Z"
+        }
+      },
+      "execute": {
+        "data": {
+          "value": {
+            "payload": {
+              "rt": ["x.com.samsung.da.information"],
+              "if": ["oic.if.baseline", "oic.if.a"],
+              "x.com.samsung.da.modelNum": "DA_WM_A51_20_COMMON|20224941|20010102011211030203000000000000",
+              "x.com.samsung.da.description": "DA_WM_A51_20_COMMON_\u0018WD7800N/DC92-02249A_08CC",
+              "x.com.samsung.da.serialNum": "0TE65ADMC00093F",
+              "x.com.samsung.da.otnDUID": "EXCEZFTFQ53G2",
+              "x.com.samsung.da.items": [
+                {
+                  "x.com.samsung.da.id": "0",
+                  "x.com.samsung.da.description": "DA_WM_A51_20_COMMON|20224941|20010102011211030203000000000000",
+                  "x.com.samsung.da.type": "Software",
+                  "x.com.samsung.da.number": "02198A220728(E256)",
+                  "x.com.samsung.da.newVersionAvailable": "0"
+                },
+                {
+                  "x.com.samsung.da.id": "1",
+                  "x.com.samsung.da.description": "DA_WM_A51_20_COMMON",
+                  "x.com.samsung.da.type": "Firmware",
+                  "x.com.samsung.da.number": "18072525,18090310",
+                  "x.com.samsung.da.newVersionAvailable": "0"
+                }
+              ]
+            }
+          },
+          "data": {
+            "href": "/information/vs/0"
+          },
+          "timestamp": "2023-08-06T02:14:23.034Z"
+        }
+      },
+      "samsungce.softenerState": {
+        "remainingAmount": {
+          "value": null,
+          "unit": "cc",
+          "timestamp": "2020-12-28T07:11:13.285Z"
+        },
+        "dosage": {
+          "value": null,
+          "unit": "cc",
+          "timestamp": "2020-12-28T01:14:27.011Z"
+        },
+        "softenerType": {
+          "value": null,
+          "timestamp": "2020-11-19T21:57:19.712Z"
+        },
+        "initialAmount": {
+          "value": null,
+          "unit": "cc",
+          "timestamp": "2020-12-28T00:45:40.863Z"
+        }
+      },
+      "samsungce.energyPlanner": {
+        "data": {
+          "value": null
+        },
+        "plan": {
+          "value": null
+        }
+      },
+      "sec.wifiConfiguration": {
+        "autoReconnection": {
+          "value": null
+        },
+        "minVersion": {
+          "value": null
+        },
+        "supportedWiFiFreq": {
+          "value": null
+        },
+        "supportedAuthType": {
+          "value": null
+        },
+        "protocolType": {
+          "value": null
+        }
+      },
+      "remoteControlStatus": {
+        "remoteControlEnabled": {
+          "value": "true",
+          "timestamp": "2025-03-07T06:06:08.819Z"
+        }
+      },
+      "custom.supportedOptions": {
+        "course": {
+          "value": null
+        },
+        "referenceTable": {
+          "value": {
+            "id": "Table_00"
+          },
+          "timestamp": "2025-03-07T06:06:08.905Z"
+        },
+        "supportedCourses": {
+          "value": [
+            "D0",
+            "DC",
+            "E3",
+            "E4",
+            "50",
+            "51",
+            "CA",
+            "E7",
+            "C7",
+            "D8",
+            "D4",
+            "D3",
+            "DA",
+            "D2"
+          ],
+          "timestamp": "2025-03-07T06:06:08.613Z"
+        }
+      },
+      "samsungce.washerWashingTime": {
+        "supportedWashingTimes": {
+          "value": null,
+          "timestamp": "2021-03-31T08:10:28.542Z"
+        },
+        "washingTime": {
+          "value": null,
+          "unit": "min",
+          "timestamp": "2021-03-31T08:10:28.542Z"
+        }
+      },
+      "custom.energyType": {
+        "energyType": {
+          "value": "2.0",
+          "timestamp": "2022-06-14T22:23:10.096Z"
+        },
+        "energySavingSupport": {
+          "value": false,
+          "timestamp": "2022-06-14T22:38:10.576Z"
+        },
+        "drMaxDuration": {
+          "value": null
+        },
+        "energySavingLevel": {
+          "value": null
+        },
+        "energySavingInfo": {
+          "value": null
+        },
+        "supportedEnergySavingLevels": {
+          "value": null
+        },
+        "energySavingOperation": {
+          "value": null
+        },
+        "notificationTemplateID": {
+          "value": null
+        },
+        "energySavingOperationSupport": {
+          "value": null
+        }
+      },
+      "samsungce.softwareUpdate": {
+        "targetModule": {
+          "value": null
+        },
+        "otnDUID": {
+          "value": "EXCEZFTFQ53G2",
+          "timestamp": "2025-03-07T06:06:08.719Z"
+        },
+        "lastUpdatedDate": {
+          "value": null
+        },
+        "availableModules": {
+          "value": [],
+          "timestamp": "2024-12-01T10:37:29.975Z"
+        },
+        "newVersionAvailable": {
+          "value": false,
+          "timestamp": "2024-12-01T10:37:29.975Z"
+        },
+        "operatingState": {
+          "value": null
+        },
+        "progress": {
+          "value": null
+        }
+      },
+      "custom.washerAutoDetergent": {
+        "washerAutoDetergent": {
+          "value": null,
+          "timestamp": "2020-08-11T22:47:34.372Z"
+        }
+      },
+      "custom.washerSpinLevel": {
+        "washerSpinLevel": {
+          "value": "1400",
+          "timestamp": "2025-03-07T06:06:08.901Z"
+        },
+        "supportedWasherSpinLevel": {
+          "value": [
+            "rinseHold",
+            "noSpin",
+            "400",
+            "800",
+            "1000",
+            "1200",
+            "1400"
+          ],
+          "timestamp": "2024-12-09T22:01:38.311Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/ecobee_sensor.json b/tests/components/smartthings/fixtures/device_status/ecobee_sensor.json
new file mode 100644
index 00000000000..e9d8addfcb3
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/ecobee_sensor.json
@@ -0,0 +1,51 @@
+{
+  "components": {
+    "main": {
+      "presenceSensor": {
+        "presence": {
+          "value": "not present",
+          "timestamp": "2025-02-11T13:58:50.044Z"
+        }
+      },
+      "healthCheck": {
+        "checkInterval": {
+          "value": 60,
+          "unit": "s",
+          "data": {
+            "deviceScheme": "UNTRACKED",
+            "protocol": "cloud"
+          },
+          "timestamp": "2025-01-16T21:14:07.471Z"
+        },
+        "healthStatus": {
+          "value": null
+        },
+        "DeviceWatch-Enroll": {
+          "value": null
+        },
+        "DeviceWatch-DeviceStatus": {
+          "value": "online",
+          "data": {},
+          "timestamp": "2025-02-11T14:23:22.053Z"
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 71,
+          "unit": "F",
+          "timestamp": "2025-02-11T14:36:16.823Z"
+        }
+      },
+      "refresh": {},
+      "motionSensor": {
+        "motion": {
+          "value": "inactive",
+          "timestamp": "2025-02-11T13:58:50.044Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/ecobee_thermostat.json b/tests/components/smartthings/fixtures/device_status/ecobee_thermostat.json
new file mode 100644
index 00000000000..dd4b8717195
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/ecobee_thermostat.json
@@ -0,0 +1,98 @@
+{
+  "components": {
+    "main": {
+      "relativeHumidityMeasurement": {
+        "humidity": {
+          "value": 32,
+          "unit": "%",
+          "timestamp": "2025-02-11T14:36:17.275Z"
+        }
+      },
+      "thermostatOperatingState": {
+        "thermostatOperatingState": {
+          "value": "heating",
+          "timestamp": "2025-02-11T13:39:58.286Z"
+        }
+      },
+      "healthCheck": {
+        "checkInterval": {
+          "value": 60,
+          "unit": "s",
+          "data": {
+            "deviceScheme": "UNTRACKED",
+            "protocol": "cloud"
+          },
+          "timestamp": "2025-01-16T21:14:07.448Z"
+        },
+        "healthStatus": {
+          "value": null
+        },
+        "DeviceWatch-Enroll": {
+          "value": null
+        },
+        "DeviceWatch-DeviceStatus": {
+          "value": "online",
+          "data": {},
+          "timestamp": "2025-02-11T13:39:58.286Z"
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 71,
+          "unit": "F",
+          "timestamp": "2025-02-11T14:23:21.556Z"
+        }
+      },
+      "thermostatHeatingSetpoint": {
+        "heatingSetpoint": {
+          "value": 71,
+          "unit": "F",
+          "timestamp": "2025-02-11T13:39:58.286Z"
+        },
+        "heatingSetpointRange": {
+          "value": null
+        }
+      },
+      "thermostatFanMode": {
+        "thermostatFanMode": {
+          "value": "auto",
+          "data": {
+            "supportedThermostatFanModes": ["on", "auto"]
+          },
+          "timestamp": "2025-02-11T13:39:58.286Z"
+        },
+        "supportedThermostatFanModes": {
+          "value": ["on", "auto"],
+          "timestamp": "2025-02-11T13:39:58.286Z"
+        }
+      },
+      "refresh": {},
+      "thermostatMode": {
+        "thermostatMode": {
+          "value": "heat",
+          "data": {
+            "supportedThermostatModes": ["off", "cool", "auxheatonly", "auto"]
+          },
+          "timestamp": "2025-02-11T13:39:58.286Z"
+        },
+        "supportedThermostatModes": {
+          "value": ["off", "cool", "auxheatonly", "auto"],
+          "timestamp": "2025-02-11T13:39:58.286Z"
+        }
+      },
+      "thermostatCoolingSetpoint": {
+        "coolingSetpointRange": {
+          "value": null
+        },
+        "coolingSetpoint": {
+          "value": 73,
+          "unit": "F",
+          "timestamp": "2025-02-11T13:39:58.286Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/ecobee_thermostat_offline.json b/tests/components/smartthings/fixtures/device_status/ecobee_thermostat_offline.json
new file mode 100644
index 00000000000..fdda31783f6
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/ecobee_thermostat_offline.json
@@ -0,0 +1,81 @@
+{
+  "components": {
+    "main": {
+      "relativeHumidityMeasurement": {
+        "humidity": {
+          "value": null
+        }
+      },
+      "thermostatOperatingState": {
+        "thermostatOperatingState": {
+          "value": null
+        }
+      },
+      "healthCheck": {
+        "checkInterval": {
+          "value": 60,
+          "unit": "s",
+          "data": {
+            "deviceScheme": "UNTRACKED",
+            "protocol": "cloud"
+          },
+          "timestamp": "2025-03-10T00:57:26.866Z"
+        },
+        "healthStatus": {
+          "value": null
+        },
+        "DeviceWatch-Enroll": {
+          "value": null
+        },
+        "DeviceWatch-DeviceStatus": {
+          "value": "offline",
+          "data": {
+            "reason": "DEVICE-OFFLINE"
+          },
+          "timestamp": "2025-03-11T10:22:17.013Z"
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": null
+        }
+      },
+      "thermostatHeatingSetpoint": {
+        "heatingSetpoint": {
+          "value": null
+        },
+        "heatingSetpointRange": {
+          "value": null
+        }
+      },
+      "thermostatFanMode": {
+        "thermostatFanMode": {
+          "value": null
+        },
+        "supportedThermostatFanModes": {
+          "value": null
+        }
+      },
+      "refresh": {},
+      "thermostatMode": {
+        "thermostatMode": {
+          "value": null
+        },
+        "supportedThermostatModes": {
+          "value": null
+        }
+      },
+      "thermostatCoolingSetpoint": {
+        "coolingSetpointRange": {
+          "value": null
+        },
+        "coolingSetpoint": {
+          "value": null
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/fake_fan.json b/tests/components/smartthings/fixtures/device_status/fake_fan.json
new file mode 100644
index 00000000000..91efb69cee6
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/fake_fan.json
@@ -0,0 +1,31 @@
+{
+  "components": {
+    "main": {
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-02-08T23:21:22.908Z"
+        }
+      },
+      "fanSpeed": {
+        "fanSpeed": {
+          "value": 60,
+          "timestamp": "2025-02-10T21:09:08.357Z"
+        }
+      },
+      "airConditionerFanMode": {
+        "fanMode": {
+          "value": null,
+          "timestamp": "2021-04-06T16:44:10.381Z"
+        },
+        "supportedAcFanModes": {
+          "value": ["auto", "low", "medium", "high", "turbo"],
+          "timestamp": "2024-09-10T10:26:28.605Z"
+        },
+        "availableAcFanModes": {
+          "value": null
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/ge_in_wall_smart_dimmer.json b/tests/components/smartthings/fixtures/device_status/ge_in_wall_smart_dimmer.json
new file mode 100644
index 00000000000..bff74f135be
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/ge_in_wall_smart_dimmer.json
@@ -0,0 +1,23 @@
+{
+  "components": {
+    "main": {
+      "switchLevel": {
+        "levelRange": {
+          "value": null
+        },
+        "level": {
+          "value": 39,
+          "unit": "%",
+          "timestamp": "2025-02-07T02:39:25.819Z"
+        }
+      },
+      "refresh": {},
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-02-08T23:21:22.908Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/generic_ef00_v1.json b/tests/components/smartthings/fixtures/device_status/generic_ef00_v1.json
new file mode 100644
index 00000000000..cbfdf0d9092
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/generic_ef00_v1.json
@@ -0,0 +1,76 @@
+{
+  "components": {
+    "main02": {
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 200.0,
+          "unit": "C",
+          "timestamp": "2024-12-02T20:18:52.095Z"
+        }
+      }
+    },
+    "main": {
+      "thermostatOperatingState": {
+        "thermostatOperatingState": {
+          "value": null
+        }
+      },
+      "signalStrength": {
+        "rssi": {
+          "value": -84,
+          "unit": "dBm",
+          "timestamp": "2025-03-07T20:53:55.346Z"
+        },
+        "lqi": {
+          "value": 255,
+          "timestamp": "2025-03-07T20:53:55.387Z"
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 21.0,
+          "unit": "C",
+          "timestamp": "2025-03-07T16:58:23.773Z"
+        }
+      },
+      "thermostatHeatingSetpoint": {
+        "heatingSetpoint": {
+          "value": 23.0,
+          "unit": "C",
+          "timestamp": "2025-02-10T17:48:38.299Z"
+        },
+        "heatingSetpointRange": {
+          "value": null
+        }
+      },
+      "refresh": {},
+      "valleyboard16460.debug": {
+        "value": {
+          "value": "<table style=\"font-size:0.6em;min-width:100%\"><tbody>\n        <tr><th align=\"left\" style=\"width:35%\">Actual</th><td style=\"width:65%\">_TZE200_rxntag7i</td></tr>\n        <tr><th align=\"left\">Expected</th><td>_TZE200_4hbx5cvx</td></tr>\n        <tr><th align=\"left\">Profile</th><td>normal-thermostat-v3</td></tr>\n        <tr><th align=\"left\">Mode</th><td>Similarity</td></tr>\n        <tr><th align=\"left\">Preferences</th><td>Modified</td></tr>\n        <tr><th align=\"left\">Exposes EF00</th><td>Yes</td></tr>\n        <tr><th align=\"left\">Default DP</th><td>No</td></tr>\n        </tbody></table>",
+          "timestamp": "2025-03-05T03:04:54.025Z"
+        }
+      },
+      "thermostatMode": {
+        "thermostatMode": {
+          "value": "heat",
+          "data": {},
+          "timestamp": "2024-12-30T08:22:19.273Z"
+        },
+        "supportedThermostatModes": {
+          "value": null
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": null
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/generic_fan_3_speed.json b/tests/components/smartthings/fixtures/device_status/generic_fan_3_speed.json
new file mode 100644
index 00000000000..9335bd8e042
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/generic_fan_3_speed.json
@@ -0,0 +1,19 @@
+{
+  "components": {
+    "main": {
+      "refresh": {},
+      "fanSpeed": {
+        "fanSpeed": {
+          "value": 0,
+          "timestamp": "2025-03-06T11:47:32.683Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-03-06T11:47:32.697Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/heatit_zpushwall.json b/tests/components/smartthings/fixtures/device_status/heatit_zpushwall.json
new file mode 100644
index 00000000000..591d1128ea0
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/heatit_zpushwall.json
@@ -0,0 +1,116 @@
+{
+  "components": {
+    "button4": {
+      "button": {
+        "button": {
+          "value": "pushed",
+          "timestamp": "2025-02-10T08:01:11.326Z"
+        },
+        "numberOfButtons": {
+          "value": 1,
+          "timestamp": "2023-12-04T16:51:16.695Z"
+        },
+        "supportedButtonValues": {
+          "value": ["pushed", "held", "down_hold"],
+          "timestamp": "2023-12-04T16:51:16.717Z"
+        }
+      }
+    },
+    "button5": {
+      "button": {
+        "button": {
+          "value": "pushed",
+          "timestamp": "2025-03-09T16:37:40.792Z"
+        },
+        "numberOfButtons": {
+          "value": 1,
+          "timestamp": "2023-12-04T16:51:16.762Z"
+        },
+        "supportedButtonValues": {
+          "value": ["pushed", "held", "down_hold"],
+          "timestamp": "2023-12-04T16:51:16.813Z"
+        }
+      }
+    },
+    "button2": {
+      "button": {
+        "button": {
+          "value": "pushed",
+          "timestamp": "2025-02-10T08:00:57.171Z"
+        },
+        "numberOfButtons": {
+          "value": 1,
+          "timestamp": "2023-12-04T16:51:16.861Z"
+        },
+        "supportedButtonValues": {
+          "value": ["pushed", "held", "down_hold"],
+          "timestamp": "2023-12-04T16:51:16.906Z"
+        }
+      }
+    },
+    "button3": {
+      "button": {
+        "button": {
+          "value": "pushed",
+          "timestamp": "2025-01-30T05:53:00.663Z"
+        },
+        "numberOfButtons": {
+          "value": 1,
+          "timestamp": "2023-12-04T16:51:16.852Z"
+        },
+        "supportedButtonValues": {
+          "value": ["pushed", "held", "down_hold"],
+          "timestamp": "2023-12-04T16:51:16.848Z"
+        }
+      }
+    },
+    "button6": {
+      "button": {
+        "button": {
+          "value": "pushed",
+          "timestamp": "2024-10-02T13:11:07.346Z"
+        },
+        "numberOfButtons": {
+          "value": 1,
+          "timestamp": "2023-12-04T16:51:16.816Z"
+        },
+        "supportedButtonValues": {
+          "value": ["pushed", "held", "down_hold"],
+          "timestamp": "2023-12-04T16:51:16.848Z"
+        }
+      }
+    },
+    "main": {
+      "refresh": {},
+      "battery": {
+        "quantity": {
+          "value": null
+        },
+        "battery": {
+          "value": 100,
+          "unit": "%",
+          "timestamp": "2025-03-10T10:32:19.528Z"
+        },
+        "type": {
+          "value": null
+        }
+      }
+    },
+    "button1": {
+      "button": {
+        "button": {
+          "value": "pushed",
+          "timestamp": "2025-01-30T05:52:46.718Z"
+        },
+        "numberOfButtons": {
+          "value": 1,
+          "timestamp": "2023-12-04T16:51:16.717Z"
+        },
+        "supportedButtonValues": {
+          "value": ["pushed", "held", "down_hold"],
+          "timestamp": "2023-12-04T16:51:16.767Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/heatit_ztrm3_thermostat.json b/tests/components/smartthings/fixtures/device_status/heatit_ztrm3_thermostat.json
new file mode 100644
index 00000000000..c49cc55d2cb
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/heatit_ztrm3_thermostat.json
@@ -0,0 +1,60 @@
+{
+  "components": {
+    "main": {
+      "powerMeter": {
+        "power": {
+          "value": 368.17,
+          "unit": "W",
+          "timestamp": "2025-03-07T12:52:08.997Z"
+        }
+      },
+      "thermostatOperatingState": {
+        "thermostatOperatingState": {
+          "value": "heating",
+          "timestamp": "2025-03-07T12:49:53.638Z"
+        }
+      },
+      "energyMeter": {
+        "energy": {
+          "value": 2339.5,
+          "unit": "kWh",
+          "timestamp": "2025-03-07T12:26:37.133Z"
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 19.0,
+          "unit": "C",
+          "timestamp": "2025-03-07T12:52:39.210Z"
+        }
+      },
+      "thermostatHeatingSetpoint": {
+        "heatingSetpoint": {
+          "value": 19.0,
+          "unit": "C",
+          "timestamp": "2025-03-06T21:38:22.856Z"
+        },
+        "heatingSetpointRange": {
+          "value": null
+        }
+      },
+      "refresh": {},
+      "thermostatMode": {
+        "thermostatMode": {
+          "value": "heat",
+          "data": {
+            "supportedThermostatModes": ["off", "heat"]
+          },
+          "timestamp": "2025-03-06T21:38:23.046Z"
+        },
+        "supportedThermostatModes": {
+          "value": ["off", "heat"],
+          "timestamp": "2023-09-22T15:41:01.268Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/hub.json b/tests/components/smartthings/fixtures/device_status/hub.json
new file mode 100644
index 00000000000..98ff4c3a8b4
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/hub.json
@@ -0,0 +1,3 @@
+{
+  "components": {}
+}
diff --git a/tests/components/smartthings/fixtures/device_status/hue_color_temperature_bulb.json b/tests/components/smartthings/fixtures/device_status/hue_color_temperature_bulb.json
new file mode 100644
index 00000000000..6bdf7ceb2dd
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/hue_color_temperature_bulb.json
@@ -0,0 +1,75 @@
+{
+  "components": {
+    "main": {
+      "healthCheck": {
+        "checkInterval": {
+          "value": 60,
+          "unit": "s",
+          "data": {
+            "deviceScheme": "UNTRACKED",
+            "protocol": "cloud"
+          },
+          "timestamp": "2023-12-17T18:11:41.671Z"
+        },
+        "healthStatus": {
+          "value": null
+        },
+        "DeviceWatch-Enroll": {
+          "value": null
+        },
+        "DeviceWatch-DeviceStatus": {
+          "value": "online",
+          "data": {},
+          "timestamp": "2025-02-07T15:14:53.823Z"
+        }
+      },
+      "switchLevel": {
+        "levelRange": {
+          "value": {
+            "minimum": 1,
+            "maximum": 100
+          },
+          "unit": "%",
+          "timestamp": "2025-02-07T15:14:53.823Z"
+        },
+        "level": {
+          "value": 70,
+          "unit": "%",
+          "timestamp": "2025-02-07T21:56:04.127Z"
+        }
+      },
+      "refresh": {},
+      "synthetic.lightingEffectFade": {
+        "fade": {
+          "value": null
+        }
+      },
+      "colorTemperature": {
+        "colorTemperatureRange": {
+          "value": {
+            "minimum": 2000,
+            "maximum": 6535
+          },
+          "unit": "K",
+          "timestamp": "2025-02-07T15:14:53.823Z"
+        },
+        "colorTemperature": {
+          "value": 3000,
+          "unit": "K",
+          "timestamp": "2025-02-07T21:56:04.127Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "on",
+          "timestamp": "2025-02-07T21:56:04.127Z"
+        }
+      },
+      "synthetic.lightingEffectCircadian": {
+        "circadian": {
+          "value": null
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/hue_rgbw_color_bulb.json b/tests/components/smartthings/fixtures/device_status/hue_rgbw_color_bulb.json
new file mode 100644
index 00000000000..5868472267c
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/hue_rgbw_color_bulb.json
@@ -0,0 +1,94 @@
+{
+  "components": {
+    "main": {
+      "colorControl": {
+        "saturation": {
+          "value": 60,
+          "timestamp": "2025-02-07T15:14:53.812Z"
+        },
+        "color": {
+          "value": null
+        },
+        "hue": {
+          "value": 60.8072,
+          "timestamp": "2025-02-07T15:14:53.812Z"
+        }
+      },
+      "healthCheck": {
+        "checkInterval": {
+          "value": 60,
+          "unit": "s",
+          "data": {
+            "deviceScheme": "UNTRACKED",
+            "protocol": "cloud"
+          },
+          "timestamp": "2023-12-17T18:11:41.678Z"
+        },
+        "healthStatus": {
+          "value": null
+        },
+        "DeviceWatch-Enroll": {
+          "value": null
+        },
+        "DeviceWatch-DeviceStatus": {
+          "value": "online",
+          "data": {},
+          "timestamp": "2025-02-07T15:14:53.812Z"
+        }
+      },
+      "switchLevel": {
+        "levelRange": {
+          "value": {
+            "minimum": 1,
+            "maximum": 100
+          },
+          "unit": "%",
+          "timestamp": "2025-02-07T15:14:53.812Z"
+        },
+        "level": {
+          "value": 70,
+          "unit": "%",
+          "timestamp": "2025-02-07T21:56:02.381Z"
+        }
+      },
+      "refresh": {},
+      "synthetic.lightingEffectFade": {
+        "fade": {
+          "value": null
+        }
+      },
+      "samsungim.hueSyncMode": {
+        "mode": {
+          "value": "normal",
+          "timestamp": "2025-02-07T15:14:53.812Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-02-08T07:08:19.519Z"
+        }
+      },
+      "colorTemperature": {
+        "colorTemperatureRange": {
+          "value": {
+            "minimum": 2000,
+            "maximum": 6535
+          },
+          "unit": "K",
+          "timestamp": "2025-02-06T15:14:52.807Z"
+        },
+        "colorTemperature": {
+          "value": 3000,
+          "unit": "K",
+          "timestamp": "2025-02-07T21:56:02.381Z"
+        }
+      },
+      "synthetic.lightingEffectCircadian": {
+        "circadian": {
+          "value": null
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/hw_q80r_soundbar.json b/tests/components/smartthings/fixtures/device_status/hw_q80r_soundbar.json
new file mode 100644
index 00000000000..8cd0d3e35a9
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/hw_q80r_soundbar.json
@@ -0,0 +1,173 @@
+{
+  "components": {
+    "main": {
+      "mediaPlayback": {
+        "supportedPlaybackCommands": {
+          "value": ["play", "pause", "stop"],
+          "timestamp": "2025-03-23T01:10:02.207Z"
+        },
+        "playbackStatus": {
+          "value": "playing",
+          "timestamp": "2025-03-23T01:19:44.622Z"
+        }
+      },
+      "samsungvd.groupInfo": {
+        "role": {
+          "value": "none",
+          "timestamp": "2025-03-23T01:17:10.965Z"
+        },
+        "channel": {
+          "value": "all",
+          "timestamp": "2025-03-23T01:17:10.965Z"
+        },
+        "masterName": {
+          "value": "",
+          "timestamp": "2025-03-23T01:17:10.965Z"
+        },
+        "status": {
+          "value": "single",
+          "timestamp": "2025-03-23T01:17:10.965Z"
+        }
+      },
+      "audioVolume": {
+        "volume": {
+          "value": 1,
+          "unit": "%",
+          "timestamp": "2025-03-23T01:17:13.754Z"
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": "NONE",
+          "timestamp": "2024-12-18T21:07:25.406Z"
+        },
+        "mndt": {
+          "value": "2018-01-01",
+          "timestamp": "2024-12-18T21:07:25.406Z"
+        },
+        "mnfv": {
+          "value": "HW-Q80RWWB-1012.6",
+          "timestamp": "2024-12-18T21:07:25.406Z"
+        },
+        "mnhw": {
+          "value": "0-0",
+          "timestamp": "2024-12-18T21:07:25.406Z"
+        },
+        "di": {
+          "value": "afcf3b91-48fe-4c3b-ab44-ddff2a0a6577",
+          "timestamp": "2024-12-18T21:07:25.406Z"
+        },
+        "mnsl": {
+          "value": "http://www.samsung.com/sec/audio-video/",
+          "timestamp": "2024-12-18T21:07:25.406Z"
+        },
+        "dmv": {
+          "value": "res.1.1.0,sh.1.1.0",
+          "timestamp": "2024-12-18T21:07:25.406Z"
+        },
+        "n": {
+          "value": "[AV] Samsung Soundbar Q80R",
+          "timestamp": "2024-12-18T21:07:25.406Z"
+        },
+        "mnmo": {
+          "value": "Q80R",
+          "timestamp": "2024-12-18T21:07:25.406Z"
+        },
+        "vid": {
+          "value": "VD-NetworkAudio-001S",
+          "timestamp": "2024-12-18T21:07:25.406Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2024-12-18T21:07:25.406Z"
+        },
+        "mnml": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2024-12-18T21:07:25.406Z"
+        },
+        "mnpv": {
+          "value": "Tizen 4.0",
+          "timestamp": "2024-12-18T21:07:25.406Z"
+        },
+        "mnos": {
+          "value": "4.1.10",
+          "timestamp": "2024-12-18T21:07:25.406Z"
+        },
+        "pi": {
+          "value": "afcf3b91-48fe-4c3b-ab44-ddff2a0a6577",
+          "timestamp": "2024-12-18T21:07:25.406Z"
+        },
+        "icv": {
+          "value": "core.1.1.0",
+          "timestamp": "2024-12-18T21:07:25.406Z"
+        }
+      },
+      "mediaInputSource": {
+        "supportedInputSources": {
+          "value": ["wifi", "bluetooth", "HDMI1", "HDMI2", "digital"],
+          "timestamp": "2025-03-23T01:18:01.663Z"
+        },
+        "inputSource": {
+          "value": "wifi",
+          "timestamp": "2025-03-23T01:18:01.663Z"
+        }
+      },
+      "refresh": {},
+      "audioNotification": {},
+      "audioMute": {
+        "mute": {
+          "value": "unmuted",
+          "timestamp": "2025-03-23T01:17:11.024Z"
+        }
+      },
+      "execute": {
+        "data": {
+          "value": {
+            "payload": {
+              "rt": ["x.com.samsung.networkaudio.soundmode"],
+              "if": ["oic.if.a", "oic.if.baseline"],
+              "x.com.samsung.networkaudio.soundmode": "standard"
+            }
+          },
+          "data": {
+            "href": "/sec/networkaudio/soundmode"
+          },
+          "timestamp": "2023-07-16T23:16:55.582Z"
+        }
+      },
+      "samsungvd.audioInputSource": {
+        "supportedInputSources": {
+          "value": ["wifi", "bluetooth", "HDMI1", "HDMI2", "digital"],
+          "timestamp": "2025-03-23T01:18:01.663Z"
+        },
+        "inputSource": {
+          "value": "wificp",
+          "timestamp": "2025-03-23T01:18:01.663Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "on",
+          "timestamp": "2025-03-23T01:19:44.837Z"
+        }
+      },
+      "audioTrackData": {
+        "totalTime": {
+          "value": null,
+          "timestamp": "2020-07-30T16:09:09.109Z"
+        },
+        "audioTrackData": {
+          "value": {
+            "title": "Never Gonna Give You Up",
+            "artist": "Rick Astley"
+          },
+          "timestamp": "2025-03-23T01:19:15.067Z"
+        },
+        "elapsedTime": {
+          "value": null,
+          "timestamp": "2020-07-30T16:09:09.109Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/ikea_kadrilj.json b/tests/components/smartthings/fixtures/device_status/ikea_kadrilj.json
new file mode 100644
index 00000000000..56a2d9e762d
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/ikea_kadrilj.json
@@ -0,0 +1,68 @@
+{
+  "components": {
+    "main": {
+      "windowShadeLevel": {
+        "shadeLevel": {
+          "value": 32,
+          "unit": "%",
+          "timestamp": "2025-03-13T10:40:25.613Z"
+        }
+      },
+      "refresh": {},
+      "windowShadePreset": {},
+      "battery": {
+        "quantity": {
+          "value": null
+        },
+        "battery": {
+          "value": 37,
+          "unit": "%",
+          "timestamp": "2025-03-13T07:09:05.149Z"
+        },
+        "type": {
+          "value": null
+        }
+      },
+      "firmwareUpdate": {
+        "lastUpdateStatusReason": {
+          "value": null
+        },
+        "availableVersion": {
+          "value": "22007631",
+          "timestamp": "2025-03-12T20:35:04.576Z"
+        },
+        "lastUpdateStatus": {
+          "value": null
+        },
+        "supportedCommands": {
+          "value": null
+        },
+        "state": {
+          "value": "updateRequested",
+          "timestamp": "2025-03-12T20:35:03.879Z"
+        },
+        "updateAvailable": {
+          "value": false,
+          "timestamp": "2025-03-12T20:35:04.577Z"
+        },
+        "currentVersion": {
+          "value": "22007631",
+          "timestamp": "2025-03-12T20:35:04.508Z"
+        },
+        "lastUpdateTime": {
+          "value": null
+        }
+      },
+      "windowShade": {
+        "supportedWindowShadeCommands": {
+          "value": ["open", "close", "pause"],
+          "timestamp": "2025-03-13T10:33:48.402Z"
+        },
+        "windowShade": {
+          "value": "partially open",
+          "timestamp": "2025-03-13T10:55:58.205Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/im_speaker_ai_0001.json b/tests/components/smartthings/fixtures/device_status/im_speaker_ai_0001.json
new file mode 100644
index 00000000000..4b23ca7086f
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/im_speaker_ai_0001.json
@@ -0,0 +1,222 @@
+{
+  "components": {
+    "main": {
+      "mediaPlayback": {
+        "supportedPlaybackCommands": {
+          "value": ["play", "pause", "stop"],
+          "timestamp": "2025-03-08T12:06:24.496Z"
+        },
+        "playbackStatus": {
+          "value": "stopped",
+          "timestamp": "2025-03-08T12:06:24.496Z"
+        }
+      },
+      "audioVolume": {
+        "volume": {
+          "value": 52,
+          "unit": "%",
+          "timestamp": "2025-03-08T12:08:00.153Z"
+        }
+      },
+      "mediaInputSource": {
+        "supportedInputSources": {
+          "value": null
+        },
+        "inputSource": {
+          "value": null
+        }
+      },
+      "audioTrackAddressing": {},
+      "samsungim.networkAudioGroupInfo": {
+        "groupName": {
+          "value": "",
+          "timestamp": "2025-03-08T12:06:24.628Z"
+        },
+        "role": {
+          "value": "",
+          "timestamp": "2025-03-08T12:06:24.628Z"
+        },
+        "channel": {
+          "value": "",
+          "timestamp": "2025-03-08T12:06:24.628Z"
+        },
+        "stereoType": {
+          "value": "A",
+          "timestamp": "2025-03-08T12:06:24.628Z"
+        },
+        "masterDi": {
+          "value": "",
+          "timestamp": "2025-03-08T12:06:24.628Z"
+        },
+        "acmMode": {
+          "value": "",
+          "timestamp": "2025-03-08T12:06:24.628Z"
+        },
+        "status": {
+          "value": "single",
+          "timestamp": "2025-03-08T12:06:24.628Z"
+        },
+        "masterName": {
+          "value": "",
+          "timestamp": "2025-03-08T12:06:24.628Z"
+        }
+      },
+      "refresh": {},
+      "audioNotification": {},
+      "execute": {
+        "data": {
+          "value": null
+        }
+      },
+      "samsungim.networkAudioMode": {
+        "mode": {
+          "value": "wifi",
+          "timestamp": "2025-03-08T12:06:24.573Z"
+        }
+      },
+      "mediaPlaybackRepeat": {
+        "playbackRepeatMode": {
+          "value": "off",
+          "timestamp": "2025-03-08T12:06:24.519Z"
+        }
+      },
+      "musicPlayer": {
+        "trackDescription": {
+          "value": null
+        },
+        "level": {
+          "value": null
+        },
+        "mute": {
+          "value": null
+        },
+        "trackData": {
+          "value": null
+        },
+        "status": {
+          "value": null
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": null
+        },
+        "mndt": {
+          "value": null
+        },
+        "mnfv": {
+          "value": "V310XXU1AWK1",
+          "timestamp": "2025-03-08T12:06:18.931Z"
+        },
+        "mnhw": {
+          "value": "1.0",
+          "timestamp": "2025-03-08T12:06:18.931Z"
+        },
+        "di": {
+          "value": "c9276e43-fe3c-88c3-1dcc-2eb79e292b8c",
+          "timestamp": "2025-03-08T12:06:18.931Z"
+        },
+        "mnsl": {
+          "value": null
+        },
+        "dmv": {
+          "value": "IoTivity1.2.1",
+          "timestamp": "2025-03-08T12:06:18.942Z"
+        },
+        "n": {
+          "value": "Galaxy Home Mini (MQVL)",
+          "timestamp": "2025-03-08T12:06:18.931Z"
+        },
+        "mnmo": {
+          "value": "SM-V310",
+          "timestamp": "2025-03-08T12:06:18.931Z"
+        },
+        "vid": {
+          "value": "IM-SPEAKER-AI-0001",
+          "timestamp": "2025-03-08T12:06:18.931Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2025-03-08T12:06:18.931Z"
+        },
+        "mnml": {
+          "value": null
+        },
+        "mnpv": {
+          "value": "4.0.0.1",
+          "timestamp": "2025-03-08T12:06:18.931Z"
+        },
+        "mnos": {
+          "value": "Tizen",
+          "timestamp": "2025-03-08T12:06:18.931Z"
+        },
+        "pi": {
+          "value": "c9276e43-fe3c-88c3-1dcc-2eb79e292b8c",
+          "timestamp": "2025-03-08T12:06:18.931Z"
+        },
+        "icv": {
+          "value": "core0.0.1",
+          "timestamp": "2025-03-08T12:06:18.942Z"
+        }
+      },
+      "samsungim.announcement": {
+        "enableState": {
+          "value": null
+        },
+        "supportedCategories": {
+          "value": null
+        },
+        "supportedTypes": {
+          "value": null
+        },
+        "supportedMimes": {
+          "value": null
+        }
+      },
+      "samsungim.bixbyContent": {
+        "supportedModes": {
+          "value": ["news", "weather", "music", "search_all"],
+          "timestamp": "2025-03-08T12:06:24.817Z"
+        }
+      },
+      "mediaPlaybackShuffle": {
+        "playbackShuffle": {
+          "value": "disabled",
+          "timestamp": "2025-03-08T12:06:24.592Z"
+        }
+      },
+      "audioMute": {
+        "mute": {
+          "value": "unmuted",
+          "timestamp": "2025-03-08T12:06:24.478Z"
+        }
+      },
+      "mediaTrackControl": {
+        "supportedTrackControlCommands": {
+          "value": null
+        }
+      },
+      "speechSynthesis": {},
+      "samsungim.networkAudioTrackData": {
+        "appName": {
+          "value": null
+        },
+        "source": {
+          "value": "wifi",
+          "timestamp": "2025-03-08T12:06:24.540Z"
+        }
+      },
+      "audioTrackData": {
+        "totalTime": {
+          "value": null
+        },
+        "audioTrackData": {
+          "value": null
+        },
+        "elapsedTime": {
+          "value": null
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/iphone.json b/tests/components/smartthings/fixtures/device_status/iphone.json
new file mode 100644
index 00000000000..618ce440ff0
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/iphone.json
@@ -0,0 +1,12 @@
+{
+  "components": {
+    "main": {
+      "presenceSensor": {
+        "presence": {
+          "value": "present",
+          "timestamp": "2023-09-22T18:12:25.012Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/multipurpose_sensor.json b/tests/components/smartthings/fixtures/device_status/multipurpose_sensor.json
new file mode 100644
index 00000000000..e0b37de7e3c
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/multipurpose_sensor.json
@@ -0,0 +1,79 @@
+{
+  "components": {
+    "main": {
+      "contactSensor": {
+        "contact": {
+          "value": "closed",
+          "timestamp": "2025-02-08T14:00:28.332Z"
+        }
+      },
+      "threeAxis": {
+        "threeAxis": {
+          "value": [20, 8, -1042],
+          "unit": "mG",
+          "timestamp": "2025-02-09T17:27:36.673Z"
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": null
+        },
+        "temperature": {
+          "value": 67.0,
+          "unit": "F",
+          "timestamp": "2025-02-09T17:56:19.744Z"
+        }
+      },
+      "refresh": {},
+      "battery": {
+        "quantity": {
+          "value": null
+        },
+        "battery": {
+          "value": 50,
+          "unit": "%",
+          "timestamp": "2025-02-09T12:24:02.074Z"
+        },
+        "type": {
+          "value": null
+        }
+      },
+      "firmwareUpdate": {
+        "lastUpdateStatusReason": {
+          "value": null
+        },
+        "availableVersion": {
+          "value": "0000001B",
+          "timestamp": "2025-02-09T04:20:25.600Z"
+        },
+        "lastUpdateStatus": {
+          "value": null
+        },
+        "supportedCommands": {
+          "value": null
+        },
+        "state": {
+          "value": "normalOperation",
+          "timestamp": "2025-02-09T04:20:25.600Z"
+        },
+        "updateAvailable": {
+          "value": false,
+          "timestamp": "2025-02-09T04:20:25.601Z"
+        },
+        "currentVersion": {
+          "value": "0000001B",
+          "timestamp": "2025-02-09T04:20:25.593Z"
+        },
+        "lastUpdateTime": {
+          "value": null
+        }
+      },
+      "accelerationSensor": {
+        "acceleration": {
+          "value": "inactive",
+          "timestamp": "2025-02-09T17:27:46.812Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/sensibo_airconditioner_1.json b/tests/components/smartthings/fixtures/device_status/sensibo_airconditioner_1.json
new file mode 100644
index 00000000000..b4263e7eb87
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/sensibo_airconditioner_1.json
@@ -0,0 +1,57 @@
+{
+  "components": {
+    "main": {
+      "healthCheck": {
+        "checkInterval": {
+          "value": 60,
+          "unit": "s",
+          "data": {
+            "deviceScheme": "UNTRACKED",
+            "protocol": "cloud"
+          },
+          "timestamp": "2024-12-04T10:10:02.934Z"
+        },
+        "healthStatus": {
+          "value": null
+        },
+        "DeviceWatch-Enroll": {
+          "value": null
+        },
+        "DeviceWatch-DeviceStatus": {
+          "value": "online",
+          "data": {},
+          "timestamp": "2025-02-09T10:09:47.758Z"
+        }
+      },
+      "refresh": {},
+      "airConditionerMode": {
+        "availableAcModes": {
+          "value": null
+        },
+        "supportedAcModes": {
+          "value": null
+        },
+        "airConditionerMode": {
+          "value": "cool",
+          "timestamp": "2025-02-09T10:09:47.758Z"
+        }
+      },
+      "thermostatCoolingSetpoint": {
+        "coolingSetpointRange": {
+          "value": null
+        },
+        "coolingSetpoint": {
+          "value": 20,
+          "unit": "C",
+          "timestamp": "2025-02-09T10:09:47.758Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "off",
+          "timestamp": "2025-02-09T10:09:47.758Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/smart_plug.json b/tests/components/smartthings/fixtures/device_status/smart_plug.json
new file mode 100644
index 00000000000..f4f591483c6
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/smart_plug.json
@@ -0,0 +1,43 @@
+{
+  "components": {
+    "main": {
+      "refresh": {},
+      "firmwareUpdate": {
+        "lastUpdateStatusReason": {
+          "value": null
+        },
+        "availableVersion": {
+          "value": "00102101",
+          "timestamp": "2025-02-08T19:37:03.624Z"
+        },
+        "lastUpdateStatus": {
+          "value": null
+        },
+        "supportedCommands": {
+          "value": null
+        },
+        "state": {
+          "value": "normalOperation",
+          "timestamp": "2025-02-08T19:37:03.622Z"
+        },
+        "updateAvailable": {
+          "value": false,
+          "timestamp": "2025-02-08T19:37:03.624Z"
+        },
+        "currentVersion": {
+          "value": "00102101",
+          "timestamp": "2025-02-08T19:37:03.594Z"
+        },
+        "lastUpdateTime": {
+          "value": null
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "on",
+          "timestamp": "2025-02-09T17:31:12.210Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/sonos_player.json b/tests/components/smartthings/fixtures/device_status/sonos_player.json
new file mode 100644
index 00000000000..057b6c62d0d
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/sonos_player.json
@@ -0,0 +1,259 @@
+{
+  "components": {
+    "main": {
+      "mediaPlayback": {
+        "supportedPlaybackCommands": {
+          "value": ["play", "pause", "stop"],
+          "timestamp": "2025-02-02T13:18:40.078Z"
+        },
+        "playbackStatus": {
+          "value": "playing",
+          "timestamp": "2025-02-09T19:53:58.330Z"
+        }
+      },
+      "mediaPresets": {
+        "presets": {
+          "value": [
+            {
+              "id": "10",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000059036.jpg",
+              "mediaSource": "Storytel",
+              "name": "Dra \u00e5t skogen Sune!"
+            },
+            {
+              "id": "22",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000001894.jpg",
+              "mediaSource": "Storytel",
+              "name": "Fy katten Sune"
+            },
+            {
+              "id": "29",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000001896.jpg",
+              "mediaSource": "Storytel",
+              "name": "Gult \u00e4r fult, Sune"
+            },
+            {
+              "id": "2",
+              "imageUrl": "https://static.mytuner.mobi/media/tvos_radios/2l5zg6lhjbab.png",
+              "mediaSource": "myTuner Radio",
+              "name": "Kiss"
+            },
+            {
+              "id": "3",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000046017.jpg",
+              "mediaSource": "Storytel",
+              "name": "L\u00e4skigt Sune!"
+            },
+            {
+              "id": "16",
+              "imageUrl": "https://www.storytel.com//images/320x320/0002590598.jpg",
+              "mediaSource": "Storytel",
+              "name": "Pluggh\u00e4sten Sune"
+            },
+            {
+              "id": "14",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000000070.jpg",
+              "mediaSource": "Storytel",
+              "name": "Sagan om Sune"
+            },
+            {
+              "id": "18",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000006452.jpg",
+              "mediaSource": "Storytel",
+              "name": "Sk\u00e4mtaren Sune"
+            },
+            {
+              "id": "26",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000001892.jpg",
+              "mediaSource": "Storytel",
+              "name": "Spik och panik, Sune!"
+            },
+            {
+              "id": "7",
+              "imageUrl": "https://www.storytel.com//images/320x320/0003119145.jpg",
+              "mediaSource": "Storytel",
+              "name": "Sune - T\u00e5gsemestern"
+            },
+            {
+              "id": "25",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000000071.jpg",
+              "mediaSource": "Storytel",
+              "name": "Sune b\u00f6rjar tv\u00e5an"
+            },
+            {
+              "id": "9",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000006448.jpg",
+              "mediaSource": "Storytel",
+              "name": "Sune i Grekland"
+            },
+            {
+              "id": "8",
+              "imageUrl": "https://www.storytel.com//images/320x320/0002492498.jpg",
+              "mediaSource": "Storytel",
+              "name": "Sune i Ullared"
+            },
+            {
+              "id": "30",
+              "imageUrl": "https://www.storytel.com//images/320x320/0002072946.jpg",
+              "mediaSource": "Storytel",
+              "name": "Sune och familjen Anderssons sjuka jul"
+            },
+            {
+              "id": "17",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000000475.jpg",
+              "mediaSource": "Storytel",
+              "name": "Sune och klantpappan"
+            },
+            {
+              "id": "11",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000042688.jpg",
+              "mediaSource": "Storytel",
+              "name": "Sune och Mamma Mysko"
+            },
+            {
+              "id": "20",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000000072.jpg",
+              "mediaSource": "Storytel",
+              "name": "Sune och syster vampyr"
+            },
+            {
+              "id": "15",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000039918.jpg",
+              "mediaSource": "Storytel",
+              "name": "Sune slutar f\u00f6rsta klass"
+            },
+            {
+              "id": "5",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000017431.jpg",
+              "mediaSource": "Storytel",
+              "name": "Sune v\u00e4rsta killen!"
+            },
+            {
+              "id": "27",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000068900.jpg",
+              "mediaSource": "Storytel",
+              "name": "Sunes halloween"
+            },
+            {
+              "id": "19",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000000476.jpg",
+              "mediaSource": "Storytel",
+              "name": "Sunes hemligheter"
+            },
+            {
+              "id": "21",
+              "imageUrl": "https://www.storytel.com//images/320x320/0002370989.jpg",
+              "mediaSource": "Storytel",
+              "name": "Sunes hj\u00e4rnsl\u00e4pp"
+            },
+            {
+              "id": "24",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000001889.jpg",
+              "mediaSource": "Storytel",
+              "name": "Sunes jul"
+            },
+            {
+              "id": "28",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000034437.jpg",
+              "mediaSource": "Storytel",
+              "name": "Sunes party"
+            },
+            {
+              "id": "4",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000006450.jpg",
+              "mediaSource": "Storytel",
+              "name": "Sunes skolresa"
+            },
+            {
+              "id": "13",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000000477.jpg",
+              "mediaSource": "Storytel",
+              "name": "Sunes sommar"
+            },
+            {
+              "id": "12",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000046015.jpg",
+              "mediaSource": "Storytel",
+              "name": "Sunes Sommarstuga"
+            },
+            {
+              "id": "6",
+              "imageUrl": "https://www.storytel.com//images/320x320/0002099327.jpg",
+              "mediaSource": "Storytel",
+              "name": "Supersnuten Sune"
+            },
+            {
+              "id": "23",
+              "imageUrl": "https://www.storytel.com//images/320x320/0000563738.jpg",
+              "mediaSource": "Storytel",
+              "name": "Zunes stolpskott"
+            }
+          ],
+          "timestamp": "2025-02-02T13:18:48.272Z"
+        }
+      },
+      "audioVolume": {
+        "volume": {
+          "value": 15,
+          "unit": "%",
+          "timestamp": "2025-02-09T19:57:37.230Z"
+        }
+      },
+      "mediaGroup": {
+        "groupMute": {
+          "value": "unmuted",
+          "timestamp": "2025-02-07T01:19:54.911Z"
+        },
+        "groupPrimaryDeviceId": {
+          "value": "RINCON_38420B9108F601400",
+          "timestamp": "2025-02-09T19:52:24.000Z"
+        },
+        "groupId": {
+          "value": "RINCON_38420B9108F601400:3579458382",
+          "timestamp": "2025-02-09T19:54:06.936Z"
+        },
+        "groupVolume": {
+          "value": 12,
+          "unit": "%",
+          "timestamp": "2025-02-07T01:19:54.911Z"
+        },
+        "groupRole": {
+          "value": "ungrouped",
+          "timestamp": "2025-02-09T19:52:23.974Z"
+        }
+      },
+      "refresh": {},
+      "mediaTrackControl": {
+        "supportedTrackControlCommands": {
+          "value": ["nextTrack", "previousTrack"],
+          "timestamp": "2025-02-02T13:18:40.123Z"
+        }
+      },
+      "audioMute": {
+        "mute": {
+          "value": "unmuted",
+          "timestamp": "2025-02-09T19:57:35.487Z"
+        }
+      },
+      "audioNotification": {},
+      "audioTrackData": {
+        "totalTime": {
+          "value": null
+        },
+        "audioTrackData": {
+          "value": {
+            "album": "Forever Young",
+            "albumArtUrl": "http://192.168.1.123:1400/getaa?s=1&u=x-sonos-spotify%3aspotify%253atrack%253a3bg2qahpZmsg5wV2EMPXIk%3fsid%3d9%26flags%3d8232%26sn%3d9",
+            "artist": "David Guetta",
+            "mediaSource": "Spotify",
+            "title": "Forever Young"
+          },
+          "timestamp": "2025-02-09T19:53:55.615Z"
+        },
+        "elapsedTime": {
+          "value": null
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/tplink_p110.json b/tests/components/smartthings/fixtures/device_status/tplink_p110.json
new file mode 100644
index 00000000000..9e1d41ed66e
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/tplink_p110.json
@@ -0,0 +1,46 @@
+{
+  "components": {
+    "main": {
+      "powerConsumptionReport": {
+        "powerConsumption": {
+          "value": {
+            "start": "2025-03-10T14:43:42.500Z",
+            "end": "2025-03-10T14:59:42.500Z",
+            "energy": 15720,
+            "deltaEnergy": 0
+          },
+          "timestamp": "2025-03-10T14:59:50.010Z"
+        }
+      },
+      "healthCheck": {
+        "checkInterval": {
+          "value": 60,
+          "unit": "s",
+          "data": {
+            "deviceScheme": "UNTRACKED",
+            "protocol": "cloud"
+          },
+          "timestamp": "2024-03-07T21:14:59.839Z"
+        },
+        "healthStatus": {
+          "value": null
+        },
+        "DeviceWatch-Enroll": {
+          "value": null
+        },
+        "DeviceWatch-DeviceStatus": {
+          "value": "online",
+          "data": {},
+          "timestamp": "2025-03-10T14:14:37.232Z"
+        }
+      },
+      "refresh": {},
+      "switch": {
+        "switch": {
+          "value": "on",
+          "timestamp": "2025-03-10T14:14:37.232Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/vd_network_audio_002s.json b/tests/components/smartthings/fixtures/device_status/vd_network_audio_002s.json
new file mode 100644
index 00000000000..a0bcbd742f4
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/vd_network_audio_002s.json
@@ -0,0 +1,164 @@
+{
+  "components": {
+    "main": {
+      "mediaPlayback": {
+        "supportedPlaybackCommands": {
+          "value": ["play", "pause", "stop"],
+          "timestamp": "2025-02-09T15:42:12.923Z"
+        },
+        "playbackStatus": {
+          "value": "stopped",
+          "timestamp": "2025-02-09T15:42:12.923Z"
+        }
+      },
+      "samsungvd.soundFrom": {
+        "mode": {
+          "value": 3,
+          "timestamp": "2025-02-09T15:42:13.215Z"
+        },
+        "detailName": {
+          "value": "External Device",
+          "timestamp": "2025-02-09T15:42:13.215Z"
+        }
+      },
+      "audioVolume": {
+        "volume": {
+          "value": 17,
+          "unit": "%",
+          "timestamp": "2025-02-09T17:25:51.839Z"
+        }
+      },
+      "samsungvd.audioGroupInfo": {
+        "role": {
+          "value": null
+        },
+        "status": {
+          "value": null
+        }
+      },
+      "refresh": {},
+      "audioNotification": {},
+      "execute": {
+        "data": {
+          "value": null
+        }
+      },
+      "samsungvd.audioInputSource": {
+        "supportedInputSources": {
+          "value": ["digital", "HDMI1", "bluetooth", "wifi", "HDMI2"],
+          "timestamp": "2025-02-09T17:18:44.680Z"
+        },
+        "inputSource": {
+          "value": "HDMI1",
+          "timestamp": "2025-02-09T17:18:44.680Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "on",
+          "timestamp": "2025-02-09T17:25:51.536Z"
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": "2024-12-10T02:12:44Z",
+          "timestamp": "2024-12-31T01:03:42.587Z"
+        },
+        "mndt": {
+          "value": "2023-01-01",
+          "timestamp": "2024-12-31T01:03:42.587Z"
+        },
+        "mnfv": {
+          "value": "SAT-iMX8M23WWC-1010.5",
+          "timestamp": "2024-12-31T01:03:42.587Z"
+        },
+        "mnhw": {
+          "value": "",
+          "timestamp": "2024-12-31T01:03:42.587Z"
+        },
+        "di": {
+          "value": "0d94e5db-8501-2355-eb4f-214163702cac",
+          "timestamp": "2024-12-31T01:03:42.587Z"
+        },
+        "mnsl": {
+          "value": "",
+          "timestamp": "2024-12-31T01:03:42.587Z"
+        },
+        "dmv": {
+          "value": "res.1.1.0,sh.1.1.0",
+          "timestamp": "2024-12-31T01:03:42.587Z"
+        },
+        "n": {
+          "value": "Soundbar Living",
+          "timestamp": "2024-12-31T01:03:42.587Z"
+        },
+        "mnmo": {
+          "value": "HW-Q990C",
+          "timestamp": "2024-12-31T01:03:42.587Z"
+        },
+        "vid": {
+          "value": "VD-NetworkAudio-002S",
+          "timestamp": "2024-12-31T01:03:42.587Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2024-12-31T01:03:42.587Z"
+        },
+        "mnml": {
+          "value": "",
+          "timestamp": "2024-12-31T01:03:42.587Z"
+        },
+        "mnpv": {
+          "value": "7.0",
+          "timestamp": "2024-12-31T01:03:42.587Z"
+        },
+        "mnos": {
+          "value": "Tizen",
+          "timestamp": "2024-12-31T01:03:42.587Z"
+        },
+        "pi": {
+          "value": "0d94e5db-8501-2355-eb4f-214163702cac",
+          "timestamp": "2024-12-31T01:03:42.587Z"
+        },
+        "icv": {
+          "value": "core.1.1.0",
+          "timestamp": "2024-12-31T01:03:42.587Z"
+        }
+      },
+      "audioMute": {
+        "mute": {
+          "value": "unmuted",
+          "timestamp": "2025-02-09T17:18:44.787Z"
+        }
+      },
+      "samsungvd.thingStatus": {
+        "updatedTime": {
+          "value": 1739115734,
+          "timestamp": "2025-02-09T15:42:13.949Z"
+        },
+        "status": {
+          "value": "Idle",
+          "timestamp": "2025-02-09T15:42:13.949Z"
+        }
+      },
+      "audioTrackData": {
+        "totalTime": {
+          "value": 0,
+          "timestamp": "2024-12-31T00:29:29.953Z"
+        },
+        "audioTrackData": {
+          "value": {
+            "title": "",
+            "artist": "",
+            "album": ""
+          },
+          "timestamp": "2024-12-31T00:29:29.953Z"
+        },
+        "elapsedTime": {
+          "value": 0,
+          "timestamp": "2024-12-31T00:29:29.828Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/vd_sensor_light_2023.json b/tests/components/smartthings/fixtures/device_status/vd_sensor_light_2023.json
new file mode 100644
index 00000000000..cffefa20c4a
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/vd_sensor_light_2023.json
@@ -0,0 +1,95 @@
+{
+  "components": {
+    "main": {
+      "ocf": {
+        "st": {
+          "value": "2025-01-14T08:07:36Z",
+          "timestamp": "2025-01-14T08:07:40.220Z"
+        },
+        "mndt": {
+          "value": "2023-01-01",
+          "timestamp": "2025-01-14T08:07:40.220Z"
+        },
+        "mnfv": {
+          "value": "latest",
+          "timestamp": "2025-01-14T08:07:40.220Z"
+        },
+        "mnhw": {
+          "value": "",
+          "timestamp": "2025-01-14T08:07:40.220Z"
+        },
+        "di": {
+          "value": "5cc1c096-98b9-460c-8f1c-1045509ec605",
+          "timestamp": "2025-01-14T08:07:40.220Z"
+        },
+        "mnsl": {
+          "value": "",
+          "timestamp": "2025-01-14T08:07:40.220Z"
+        },
+        "dmv": {
+          "value": "res.1.1.0,sh.1.1.0",
+          "timestamp": "2025-01-14T08:07:40.220Z"
+        },
+        "n": {
+          "value": "Light Sensor - 55 The Frame",
+          "timestamp": "2025-01-14T08:07:40.220Z"
+        },
+        "mnmo": {
+          "value": "QE55LS03DAUXXN",
+          "timestamp": "2025-01-14T08:07:40.220Z"
+        },
+        "vid": {
+          "value": "VD-Sensor.Light-2023",
+          "timestamp": "2025-01-14T08:07:40.220Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2025-01-14T08:07:40.220Z"
+        },
+        "mnml": {
+          "value": "",
+          "timestamp": "2025-01-14T08:07:40.220Z"
+        },
+        "mnpv": {
+          "value": "8.0",
+          "timestamp": "2025-01-14T08:07:40.220Z"
+        },
+        "mnos": {
+          "value": "Tizen",
+          "timestamp": "2025-01-14T08:07:40.220Z"
+        },
+        "pi": {
+          "value": "5cc1c096-98b9-460c-8f1c-1045509ec605",
+          "timestamp": "2025-01-14T08:07:40.220Z"
+        },
+        "icv": {
+          "value": "core.1.1.0",
+          "timestamp": "2025-01-14T08:07:40.220Z"
+        }
+      },
+      "samsungvd.deviceCategory": {
+        "category": {
+          "value": null
+        }
+      },
+      "relativeBrightness": {
+        "brightnessIntensity": {
+          "value": 2,
+          "unit": "level",
+          "timestamp": "2025-02-11T19:08:25.539Z"
+        }
+      },
+      "refresh": {},
+      "execute": {
+        "data": {
+          "value": null
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": null
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/vd_stv_2017_k.json b/tests/components/smartthings/fixtures/device_status/vd_stv_2017_k.json
new file mode 100644
index 00000000000..18496942e2f
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/vd_stv_2017_k.json
@@ -0,0 +1,266 @@
+{
+  "components": {
+    "main": {
+      "mediaPlayback": {
+        "supportedPlaybackCommands": {
+          "value": ["play", "pause", "stop", "fastForward", "rewind"],
+          "timestamp": "2020-05-07T02:58:10.250Z"
+        },
+        "playbackStatus": {
+          "value": null,
+          "timestamp": "2020-08-04T21:53:22.108Z"
+        }
+      },
+      "audioVolume": {
+        "volume": {
+          "value": 13,
+          "unit": "%",
+          "timestamp": "2021-08-21T19:19:52.832Z"
+        }
+      },
+      "samsungvd.supportsPowerOnByOcf": {
+        "supportsPowerOnByOcf": {
+          "value": null,
+          "timestamp": "2020-10-29T10:47:20.305Z"
+        }
+      },
+      "samsungvd.mediaInputSource": {
+        "supportedInputSourcesMap": {
+          "value": [
+            {
+              "id": "dtv",
+              "name": "TV"
+            },
+            {
+              "id": "HDMI1",
+              "name": "PlayStation 4"
+            },
+            {
+              "id": "HDMI4",
+              "name": "HT-CT370"
+            },
+            {
+              "id": "HDMI4",
+              "name": "HT-CT370"
+            }
+          ],
+          "timestamp": "2021-10-16T15:18:11.622Z"
+        },
+        "inputSource": {
+          "value": "HDMI1",
+          "timestamp": "2021-08-28T16:29:59.716Z"
+        }
+      },
+      "mediaInputSource": {
+        "supportedInputSources": {
+          "value": ["digitalTv", "HDMI1", "HDMI4", "HDMI4"],
+          "timestamp": "2021-10-16T15:18:11.622Z"
+        },
+        "inputSource": {
+          "value": "HDMI1",
+          "timestamp": "2021-08-28T16:29:59.716Z"
+        }
+      },
+      "custom.tvsearch": {},
+      "samsungvd.ambient": {},
+      "refresh": {},
+      "custom.error": {
+        "error": {
+          "value": null,
+          "timestamp": "2020-08-04T21:53:22.148Z"
+        }
+      },
+      "execute": {
+        "data": {
+          "value": {
+            "payload": {
+              "rt": ["x.com.samsung.tv.deviceinfo"],
+              "if": ["oic.if.baseline", "oic.if.r"],
+              "x.com.samsung.country": "USA",
+              "x.com.samsung.infolinkversion": "T-INFOLINK2017-1008",
+              "x.com.samsung.modelid": "17_KANTM_UHD",
+              "x.com.samsung.tv.blemac": "CC:6E:A4:1F:4C:F7",
+              "x.com.samsung.tv.btmac": "CC:6E:A4:1F:4C:F7",
+              "x.com.samsung.tv.category": "tv",
+              "x.com.samsung.tv.countrycode": "US",
+              "x.com.samsung.tv.duid": "B2NBQRAG357IX",
+              "x.com.samsung.tv.ethmac": "c0:48:e6:e7:fc:2c",
+              "x.com.samsung.tv.p2pmac": "ce:6e:a4:1f:4c:f6",
+              "x.com.samsung.tv.udn": "717fb7ed-b310-4cfe-8954-1cd8211dd689",
+              "x.com.samsung.tv.wifimac": "cc:6e:a4:1f:4c:f6"
+            }
+          },
+          "data": {
+            "href": "/sec/tv/deviceinfo"
+          },
+          "timestamp": "2021-08-30T19:18:12.303Z"
+        }
+      },
+      "switch": {
+        "switch": {
+          "value": "on",
+          "timestamp": "2021-10-16T15:18:11.317Z"
+        }
+      },
+      "tvChannel": {
+        "tvChannel": {
+          "value": "",
+          "timestamp": "2020-05-07T02:58:10.479Z"
+        },
+        "tvChannelName": {
+          "value": "",
+          "timestamp": "2021-08-21T18:53:06.643Z"
+        }
+      },
+      "ocf": {
+        "st": {
+          "value": "2021-08-21T14:50:34Z",
+          "timestamp": "2021-08-21T19:19:51.890Z"
+        },
+        "mndt": {
+          "value": "2017-01-01",
+          "timestamp": "2021-08-21T19:19:51.890Z"
+        },
+        "mnfv": {
+          "value": "T-KTMAKUC-1290.3",
+          "timestamp": "2021-08-21T18:52:57.543Z"
+        },
+        "mnhw": {
+          "value": "0-0",
+          "timestamp": "2020-05-07T02:58:10.206Z"
+        },
+        "di": {
+          "value": "4588d2d9-a8cf-40f4-9a0b-ed5dfbaccda1",
+          "timestamp": "2020-05-07T02:58:10.206Z"
+        },
+        "mnsl": {
+          "value": "http://www.samsung.com/sec/tv/overview/",
+          "timestamp": "2021-08-21T19:19:51.890Z"
+        },
+        "dmv": {
+          "value": "res.1.1.0,sh.1.1.0",
+          "timestamp": "2021-08-21T18:52:58.071Z"
+        },
+        "n": {
+          "value": "[TV] Samsung 8 Series (49)",
+          "timestamp": "2020-05-07T02:58:10.206Z"
+        },
+        "mnmo": {
+          "value": "UN49MU8000",
+          "timestamp": "2020-05-07T02:58:10.206Z"
+        },
+        "vid": {
+          "value": "VD-STV_2017_K",
+          "timestamp": "2020-05-07T02:58:10.206Z"
+        },
+        "mnmn": {
+          "value": "Samsung Electronics",
+          "timestamp": "2020-05-07T02:58:10.206Z"
+        },
+        "mnml": {
+          "value": "http://www.samsung.com",
+          "timestamp": "2020-05-07T02:58:10.206Z"
+        },
+        "mnpv": {
+          "value": "Tizen 3.0",
+          "timestamp": "2020-05-07T02:58:10.206Z"
+        },
+        "mnos": {
+          "value": "4.1.10",
+          "timestamp": "2020-05-07T02:58:10.206Z"
+        },
+        "pi": {
+          "value": "4588d2d9-a8cf-40f4-9a0b-ed5dfbaccda1",
+          "timestamp": "2020-05-07T02:58:10.206Z"
+        },
+        "icv": {
+          "value": "core.1.1.0",
+          "timestamp": "2021-08-21T18:52:58.071Z"
+        }
+      },
+      "custom.picturemode": {
+        "pictureMode": {
+          "value": "Dynamic",
+          "timestamp": "2020-12-23T01:33:37.069Z"
+        },
+        "supportedPictureModes": {
+          "value": ["Dynamic", "Standard", "Natural", "Movie"],
+          "timestamp": "2020-05-07T02:58:10.585Z"
+        },
+        "supportedPictureModesMap": {
+          "value": [
+            {
+              "id": "modeDynamic",
+              "name": "Dynamic"
+            },
+            {
+              "id": "modeStandard",
+              "name": "Standard"
+            },
+            {
+              "id": "modeNatural",
+              "name": "Natural"
+            },
+            {
+              "id": "modeMovie",
+              "name": "Movie"
+            }
+          ],
+          "timestamp": "2020-12-23T01:33:37.069Z"
+        }
+      },
+      "samsungvd.ambientContent": {
+        "supportedAmbientApps": {
+          "value": [],
+          "timestamp": "2021-01-17T01:10:11.985Z"
+        }
+      },
+      "custom.accessibility": {},
+      "custom.recording": {},
+      "custom.disabledCapabilities": {
+        "disabledCapabilities": {
+          "value": ["samsungvd.ambient", "samsungvd.ambientContent"],
+          "timestamp": "2021-01-17T01:10:11.985Z"
+        }
+      },
+      "custom.soundmode": {
+        "supportedSoundModesMap": {
+          "value": [
+            {
+              "id": "modeStandard",
+              "name": "Standard"
+            }
+          ],
+          "timestamp": "2021-08-21T19:19:52.887Z"
+        },
+        "soundMode": {
+          "value": "Standard",
+          "timestamp": "2020-12-23T01:33:37.272Z"
+        },
+        "supportedSoundModes": {
+          "value": ["Standard"],
+          "timestamp": "2021-08-21T19:19:52.887Z"
+        }
+      },
+      "audioMute": {
+        "mute": {
+          "value": "muted",
+          "timestamp": "2021-08-21T19:19:52.832Z"
+        }
+      },
+      "mediaTrackControl": {
+        "supportedTrackControlCommands": {
+          "value": null,
+          "timestamp": "2020-08-04T21:53:22.384Z"
+        }
+      },
+      "custom.launchapp": {},
+      "samsungvd.firmwareVersion": {
+        "firmwareVersion": {
+          "value": null,
+          "timestamp": "2020-10-29T10:47:19.376Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/virtual_thermostat.json b/tests/components/smartthings/fixtures/device_status/virtual_thermostat.json
new file mode 100644
index 00000000000..c2c36fa249e
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/virtual_thermostat.json
@@ -0,0 +1,97 @@
+{
+  "components": {
+    "main": {
+      "thermostatOperatingState": {
+        "thermostatOperatingState": {
+          "value": "pending cool",
+          "timestamp": "2025-02-10T22:04:56.341Z"
+        }
+      },
+      "thermostatHeatingSetpoint": {
+        "heatingSetpoint": {
+          "value": 814.7469111058201,
+          "unit": "F",
+          "timestamp": "2025-02-10T22:04:56.341Z"
+        },
+        "heatingSetpointRange": {
+          "value": {
+            "maximum": 3226.693210895862,
+            "step": 9234.459191378826,
+            "minimum": 6214.940743832475
+          },
+          "unit": "F",
+          "timestamp": "2025-02-10T22:04:56.341Z"
+        }
+      },
+      "temperatureMeasurement": {
+        "temperatureRange": {
+          "value": {
+            "maximum": 1826.722761785079,
+            "step": 138.2080712609211,
+            "minimum": 9268.726934158902
+          },
+          "unit": "F",
+          "timestamp": "2025-02-10T22:04:56.341Z"
+        },
+        "temperature": {
+          "value": 8554.194688973037,
+          "unit": "F",
+          "timestamp": "2025-02-10T22:04:56.341Z"
+        }
+      },
+      "thermostatFanMode": {
+        "thermostatFanMode": {
+          "value": "followschedule",
+          "data": {},
+          "timestamp": "2025-02-10T22:04:56.341Z"
+        },
+        "supportedThermostatFanModes": {
+          "value": ["on"],
+          "timestamp": "2025-02-10T22:04:56.341Z"
+        }
+      },
+      "thermostatMode": {
+        "thermostatMode": {
+          "value": "auxheatonly",
+          "data": {},
+          "timestamp": "2025-02-10T22:04:56.341Z"
+        },
+        "supportedThermostatModes": {
+          "value": ["rush hour"],
+          "timestamp": "2025-02-10T22:04:56.341Z"
+        }
+      },
+      "battery": {
+        "quantity": {
+          "value": 51,
+          "timestamp": "2025-02-10T22:04:56.341Z"
+        },
+        "battery": {
+          "value": 100,
+          "unit": "%",
+          "timestamp": "2025-02-10T22:04:56.341Z"
+        },
+        "type": {
+          "value": "38140",
+          "timestamp": "2025-02-10T22:04:56.341Z"
+        }
+      },
+      "thermostatCoolingSetpoint": {
+        "coolingSetpointRange": {
+          "value": {
+            "maximum": 7288.145606306409,
+            "step": 7620.031701049315,
+            "minimum": 4997.721228739137
+          },
+          "unit": "F",
+          "timestamp": "2025-02-10T22:04:56.341Z"
+        },
+        "coolingSetpoint": {
+          "value": 244.33726326608746,
+          "unit": "F",
+          "timestamp": "2025-02-10T22:04:56.341Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/virtual_valve.json b/tests/components/smartthings/fixtures/device_status/virtual_valve.json
new file mode 100644
index 00000000000..8cb66c72595
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/virtual_valve.json
@@ -0,0 +1,13 @@
+{
+  "components": {
+    "main": {
+      "refresh": {},
+      "valve": {
+        "valve": {
+          "value": "closed",
+          "timestamp": "2025-02-11T11:27:02.262Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/virtual_water_sensor.json b/tests/components/smartthings/fixtures/device_status/virtual_water_sensor.json
new file mode 100644
index 00000000000..8200bfe81a1
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/virtual_water_sensor.json
@@ -0,0 +1,28 @@
+{
+  "components": {
+    "main": {
+      "waterSensor": {
+        "water": {
+          "value": "dry",
+          "timestamp": "2025-02-10T21:58:18.784Z"
+        }
+      },
+      "refresh": {},
+      "battery": {
+        "quantity": {
+          "value": 84,
+          "timestamp": "2025-02-10T21:58:18.784Z"
+        },
+        "battery": {
+          "value": 100,
+          "unit": "%",
+          "timestamp": "2025-02-10T21:58:18.784Z"
+        },
+        "type": {
+          "value": "46120",
+          "timestamp": "2025-02-10T21:58:18.784Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/device_status/yale_push_button_deadbolt_lock.json b/tests/components/smartthings/fixtures/device_status/yale_push_button_deadbolt_lock.json
new file mode 100644
index 00000000000..0bb1af96f70
--- /dev/null
+++ b/tests/components/smartthings/fixtures/device_status/yale_push_button_deadbolt_lock.json
@@ -0,0 +1,110 @@
+{
+  "components": {
+    "main": {
+      "lock": {
+        "supportedUnlockDirections": {
+          "value": null
+        },
+        "supportedLockValues": {
+          "value": null
+        },
+        "lock": {
+          "value": "locked",
+          "data": {},
+          "timestamp": "2025-02-09T17:29:56.641Z"
+        },
+        "supportedLockCommands": {
+          "value": null
+        }
+      },
+      "refresh": {},
+      "battery": {
+        "quantity": {
+          "value": null
+        },
+        "battery": {
+          "value": 86,
+          "unit": "%",
+          "timestamp": "2025-02-09T17:18:14.150Z"
+        },
+        "type": {
+          "value": null
+        }
+      },
+      "firmwareUpdate": {
+        "lastUpdateStatusReason": {
+          "value": null
+        },
+        "availableVersion": {
+          "value": "00840847",
+          "timestamp": "2025-02-09T11:48:45.331Z"
+        },
+        "lastUpdateStatus": {
+          "value": null
+        },
+        "supportedCommands": {
+          "value": null
+        },
+        "state": {
+          "value": "normalOperation",
+          "timestamp": "2025-02-09T11:48:45.331Z"
+        },
+        "updateAvailable": {
+          "value": false,
+          "timestamp": "2025-02-09T11:48:45.332Z"
+        },
+        "currentVersion": {
+          "value": "00840847",
+          "timestamp": "2025-02-09T11:48:45.328Z"
+        },
+        "lastUpdateTime": {
+          "value": null
+        }
+      },
+      "lockCodes": {
+        "codeLength": {
+          "value": null,
+          "timestamp": "2020-08-04T15:29:24.127Z"
+        },
+        "maxCodes": {
+          "value": 250,
+          "timestamp": "2023-08-22T01:34:19.751Z"
+        },
+        "maxCodeLength": {
+          "value": 8,
+          "timestamp": "2023-08-22T01:34:18.690Z"
+        },
+        "codeChanged": {
+          "value": "8 unset",
+          "data": {
+            "codeName": "Code 8"
+          },
+          "timestamp": "2025-01-06T04:56:31.712Z"
+        },
+        "lock": {
+          "value": "locked",
+          "data": {
+            "method": "manual"
+          },
+          "timestamp": "2023-07-10T23:03:42.305Z"
+        },
+        "minCodeLength": {
+          "value": 4,
+          "timestamp": "2023-08-22T01:34:18.781Z"
+        },
+        "codeReport": {
+          "value": 5,
+          "timestamp": "2022-08-01T01:36:58.424Z"
+        },
+        "scanCodes": {
+          "value": "Complete",
+          "timestamp": "2025-01-06T04:56:31.730Z"
+        },
+        "lockCodes": {
+          "value": "{\"1\":\"Salim\",\"2\":\"Saima\",\"3\":\"Sarah\",\"4\":\"Aisha\",\"5\":\"Moiz\"}",
+          "timestamp": "2025-01-06T04:56:28.325Z"
+        }
+      }
+    }
+  }
+}
diff --git a/tests/components/smartthings/fixtures/devices/abl_light_b_001.json b/tests/components/smartthings/fixtures/devices/abl_light_b_001.json
new file mode 100644
index 00000000000..bb4970b6d5a
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/abl_light_b_001.json
@@ -0,0 +1,59 @@
+{
+  "items": [
+    {
+      "deviceId": "7c16163e-c94e-482f-95f6-139ae0cd9d5e",
+      "name": "ABL Wafer Down Light(BLE)",
+      "label": "Kitchen Light 5",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "ABL-LIGHT-B-001",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "6c314222-8baf-48a0-9442-5b1102a8757f",
+      "ownerId": "f24ff388-700c-7d1e-91f2-1c37ae68ce2b",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "colorTemperature",
+              "version": 1
+            },
+            {
+              "id": "switchLevel",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Light",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2025-03-08T22:40:25.073Z",
+      "profile": {
+        "id": "65f5db53-9a78-4b19-8e40-d32187cd59ab"
+      },
+      "bleD2D": {
+        "encryptionKey": "f593369dcea915f6352a4a42cd4b2ea6",
+        "cipher": "AES_128-CBC-PKCS7Padding",
+        "advertisingId": "b13d7192",
+        "identifier": "88-57-1d-7c-cb-cf",
+        "configurationUrl": "https://apis.samsungiotcloud.com/v1/miniature/profile/65f5db53-9a78-4b19-8e40-d32187cd59ab",
+        "bleDeviceType": "BLE",
+        "metadata": null
+      },
+      "type": "BLE_D2D",
+      "restrictionTier": 0,
+      "allowed": null,
+      "executionContext": "CLOUD",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/aeotec_home_energy_meter_gen5.json b/tests/components/smartthings/fixtures/devices/aeotec_home_energy_meter_gen5.json
new file mode 100644
index 00000000000..ab2fe41c678
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/aeotec_home_energy_meter_gen5.json
@@ -0,0 +1,69 @@
+{
+  "items": [
+    {
+      "deviceId": "f0af21a2-d5a1-437c-b10a-b34a87394b71",
+      "name": "aeotec-home-energy-meter-gen5",
+      "label": "Aeotec Energy Monitor",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "3e0921d3-0a66-3d49-b458-752e596838e9",
+      "deviceManufacturerCode": "0086-0002-005F",
+      "locationId": "6911ddf5-f0cb-4516-a06a-3a2a6ec22bca",
+      "ownerId": "93257fc4-6471-2566-b06e-2fe72dd979fa",
+      "roomId": "cdf080f0-0542-41d7-a606-aff69683e04c",
+      "components": [
+        {
+          "id": "main",
+          "label": "Meter",
+          "capabilities": [
+            {
+              "id": "powerMeter",
+              "version": 1
+            },
+            {
+              "id": "energyMeter",
+              "version": 1
+            },
+            {
+              "id": "voltageMeasurement",
+              "version": 1
+            },
+            {
+              "id": "powerConsumptionReport",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "CurbPowerMeter",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2023-01-12T23:02:44.917Z",
+      "profile": {
+        "id": "6372c227-93c7-32ef-9be5-aef2221adff1"
+      },
+      "zwave": {
+        "networkId": "0A",
+        "driverId": "b98b34ce-1d1d-480c-bb17-41307a90cde0",
+        "executingLocally": true,
+        "hubId": "6a2d07a4-dd77-48bc-9acf-017029aaf099",
+        "networkSecurityLevel": "ZWAVE_S0_LEGACY",
+        "provisioningState": "PROVISIONED",
+        "manufacturerId": 134,
+        "productType": 2,
+        "productId": 95
+      },
+      "type": "ZWAVE",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "LOCAL"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/aux_ac.json b/tests/components/smartthings/fixtures/devices/aux_ac.json
new file mode 100644
index 00000000000..fcdb581748c
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/aux_ac.json
@@ -0,0 +1,81 @@
+{
+  "items": [
+    {
+      "deviceId": "bf53a150-f8a4-45d1-aac4-86252475d551",
+      "name": "vedgeaircon.v1",
+      "label": "AUX A/C on-off",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "ab252042-5669-3c2c-8b1b-d606bbcc9e04",
+      "deviceManufacturerCode": "SmartThings Community",
+      "locationId": "5db1e3d8-ea26-44b4-8ed0-1ba9c841fd57",
+      "ownerId": "5404aa57-6a68-4fe2-83ff-168ef769d1c7",
+      "roomId": "564cdd9a-fa9f-4187-902f-95656ef22989",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "airConditionerMode",
+              "version": 1
+            },
+            {
+              "id": "thermostatCoolingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "airConditionerFanMode",
+              "version": 1
+            },
+            {
+              "id": "fanSpeed",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "partyvoice23922.vtempset",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "AirConditioner",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2024-06-19T20:18:45.407Z",
+      "parentDeviceId": "e699599d-30f8-4cf0-8de7-6dbdba6a665f",
+      "profile": {
+        "id": "87f0ac35-e024-3c0a-8153-78ca27a6fe0c"
+      },
+      "lan": {
+        "networkId": "vEdge_A/C_1718828324.999",
+        "driverId": "0fd9a9a4-8863-4a83-97a7-5a288ff0f5a6",
+        "executingLocally": true,
+        "hubId": "e699599d-30f8-4cf0-8de7-6dbdba6a665f",
+        "provisioningState": "TYPED"
+      },
+      "type": "LAN",
+      "restrictionTier": 0,
+      "allowed": null,
+      "indoorMap": {
+        "coordinates": [130.0, 36.0, 378.0],
+        "rotation": [270.0, 0.0, 0.0],
+        "visible": true,
+        "data": null
+      },
+      "executionContext": "LOCAL",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/base_electric_meter.json b/tests/components/smartthings/fixtures/devices/base_electric_meter.json
new file mode 100644
index 00000000000..a81ca788b29
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/base_electric_meter.json
@@ -0,0 +1,61 @@
+{
+  "items": [
+    {
+      "deviceId": "68e786a6-7f61-4c3a-9e13-70b803cf782b",
+      "name": "base-electric-meter",
+      "label": "Aeon Energy Monitor",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "8e619cd9-c271-3ba0-9015-62bc074bc47f",
+      "deviceManufacturerCode": "0086-0002-0009",
+      "locationId": "c4d3b2a1-09f8-765e-4d3c-2b1a09f8e7d6 ",
+      "ownerId": "d47f2b19-3a6e-4c8d-bf21-9e8a7c5d134e",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "powerMeter",
+              "version": 1
+            },
+            {
+              "id": "energyMeter",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "CurbPowerMeter",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2023-06-03T16:23:57.284Z",
+      "profile": {
+        "id": "d382796f-8ed5-3088-8735-eb03e962203b"
+      },
+      "zwave": {
+        "networkId": "2A",
+        "driverId": "4fb7ec02-2697-4d73-977d-2b1c65c4484f",
+        "executingLocally": true,
+        "hubId": "074fa784-8be8-4c70-8e22-6f5ed6f81b7e",
+        "networkSecurityLevel": "ZWAVE_LEGACY_NON_SECURE",
+        "provisioningState": "PROVISIONED",
+        "manufacturerId": 134,
+        "productType": 2,
+        "productId": 9
+      },
+      "type": "ZWAVE",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "LOCAL"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/bosch_radiator_thermostat_ii.json b/tests/components/smartthings/fixtures/devices/bosch_radiator_thermostat_ii.json
new file mode 100644
index 00000000000..7a2e2d338cd
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/bosch_radiator_thermostat_ii.json
@@ -0,0 +1,102 @@
+{
+  "items": [
+    {
+      "deviceId": "286ba274-4093-4bcb-849c-a1a3efe7b1e5",
+      "name": "thermostat",
+      "label": "Radiator Thermostat II [+M] Wohnzimmer",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "2a1c9915-f61b-3f3a-a02b-703b8cccf3d6",
+      "deviceManufacturerCode": "BOSCH",
+      "locationId": "0b6618a6-c3ab-4b6e-968d-59cc8c2761bc",
+      "ownerId": "8a20b799-9d87-ecdc-39de-c93c6e4d3ea1",
+      "roomId": "11374ab5-9b4e-416b-91d1-745bbf9b6db4",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "thermostatMode",
+              "version": 1
+            },
+            {
+              "id": "thermostatHeatingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "battery",
+              "version": 1
+            },
+            {
+              "id": "firmwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Thermostat",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2024-11-29T19:55:00.910Z",
+      "parentDeviceId": "61bd280e-71c4-44fb-9b6e-53fdf14718a2",
+      "profile": {
+        "id": "4da5d086-111e-3084-a039-616974326833"
+      },
+      "matter": {
+        "driverId": "5f3c42eb-5704-4c95-9705-c51c1a6764bf",
+        "hubId": "61bd280e-71c4-44fb-9b6e-53fdf14718a2",
+        "provisioningState": "PROVISIONED",
+        "networkId": "8EF2CF7A212285B2-46C6B9F266A4521A",
+        "executingLocally": true,
+        "uniqueId": "8475B3FEFF6748D4",
+        "vendorId": 4617,
+        "productId": 12306,
+        "serialNumber": "D44867FFFEB37584",
+        "listeningType": "SLEEPY",
+        "supportedNetworkInterfaces": ["THREAD"],
+        "version": {
+          "hardware": 18,
+          "hardwareLabel": "1.2.0",
+          "software": 20009,
+          "softwareLabel": "2.00.09"
+        },
+        "endpoints": [
+          {
+            "endpointId": 0,
+            "deviceTypes": [
+              {
+                "deviceTypeId": 22
+              }
+            ]
+          },
+          {
+            "endpointId": 1,
+            "deviceTypes": [
+              {
+                "deviceTypeId": 769
+              }
+            ]
+          }
+        ],
+        "syncDrivers": true
+      },
+      "type": "MATTER",
+      "restrictionTier": 0,
+      "allowed": null,
+      "executionContext": "LOCAL",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/button.json b/tests/components/smartthings/fixtures/devices/button.json
new file mode 100644
index 00000000000..ba993ca6aa7
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/button.json
@@ -0,0 +1,49 @@
+{
+  "items": [
+    {
+      "deviceId": "c4bdd19f-85d1-4d58-8f9c-e75ac3cf113b",
+      "name": "button",
+      "label": "button",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "238c483a-10e8-359b-b032-1be2b2fcdee7",
+      "locationId": "88a3a314-f0c8-40b4-bb44-44ba06c9c42f",
+      "ownerId": "12d4af93-cb68-b108-87f5-625437d7371f",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "button",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2025-03-07T12:20:43.273Z",
+      "profile": {
+        "id": "b045d731-4d01-35bc-8018-b3da711d8904"
+      },
+      "virtual": {
+        "name": "button",
+        "executingLocally": false
+      },
+      "type": "VIRTUAL",
+      "restrictionTier": 0,
+      "allowed": null,
+      "executionContext": "CLOUD",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/c2c_arlo_pro_3_switch.json b/tests/components/smartthings/fixtures/devices/c2c_arlo_pro_3_switch.json
new file mode 100644
index 00000000000..21d4d475e7a
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/c2c_arlo_pro_3_switch.json
@@ -0,0 +1,79 @@
+{
+  "items": [
+    {
+      "deviceId": "10e06a70-ee7d-4832-85e9-a0a06a7a05bd",
+      "name": "c2c-arlo-pro-3-switch",
+      "label": "2nd Floor Hallway",
+      "manufacturerName": "SmartThings",
+      "presentationId": "SmartThings-smartthings-c2c_arlo_pro_3",
+      "deviceManufacturerCode": "Arlo",
+      "locationId": "c4d3b2a1-09f8-765e-4d3c-2b1a09f8e7d6 ",
+      "ownerId": "d47f2b19-3a6e-4c8d-bf21-9e8a7c5d134e",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "soundSensor",
+              "version": 1
+            },
+            {
+              "id": "healthCheck",
+              "version": 1
+            },
+            {
+              "id": "videoStream",
+              "version": 1
+            },
+            {
+              "id": "motionSensor",
+              "version": 1
+            },
+            {
+              "id": "videoCapture",
+              "version": 1
+            },
+            {
+              "id": "battery",
+              "version": 1
+            },
+            {
+              "id": "alarm",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Camera",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2024-11-21T21:55:59.340Z",
+      "profile": {
+        "id": "89aefc3a-e210-4678-944c-638d47d296f6"
+      },
+      "viper": {
+        "manufacturerName": "Arlo",
+        "modelName": "VMC4041PB",
+        "endpointAppId": "viper_555d6f40-b65a-11ea-8fe0-77cb99571462"
+      },
+      "type": "VIPER",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/c2c_shade.json b/tests/components/smartthings/fixtures/devices/c2c_shade.json
new file mode 100644
index 00000000000..265eab11ff5
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/c2c_shade.json
@@ -0,0 +1,59 @@
+{
+  "items": [
+    {
+      "deviceId": "571af102-15db-4030-b76b-245a691f74a5",
+      "name": "c2c-shade",
+      "label": "Curtain 1A",
+      "manufacturerName": "SmartThings",
+      "presentationId": "SmartThings-smartthings-c2c-shade",
+      "deviceManufacturerCode": "WonderLabs Company",
+      "locationId": "88a3a314-f0c8-40b4-bb44-44ba06c9c42f",
+      "ownerId": "12d4af93-cb68-b108-87f5-625437d7371f",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "windowShade",
+              "version": 1
+            },
+            {
+              "id": "switchLevel",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "healthCheck",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Blind",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2025-02-07T23:01:15.883Z",
+      "profile": {
+        "id": "0ceffb3e-10d3-4123-bb42-2a92c93c6e25"
+      },
+      "viper": {
+        "manufacturerName": "WonderLabs Company",
+        "modelName": "WoCurtain3",
+        "hwVersion": "WoCurtain3-WoCurtain3",
+        "endpointAppId": "viper_f18eb770-077d-11ea-bb72-9922e3ed0d38"
+      },
+      "type": "VIPER",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/centralite.json b/tests/components/smartthings/fixtures/devices/centralite.json
new file mode 100644
index 00000000000..d94043efbc8
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/centralite.json
@@ -0,0 +1,66 @@
+{
+  "items": [
+    {
+      "deviceId": "d0268a69-abfb-4c92-a646-61cec2e510ad",
+      "name": "plug-level-power",
+      "label": "Dimmer Debian",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "bb7c4cfb-6eaf-3efc-823b-06a54fc9ded9",
+      "deviceManufacturerCode": "CentraLite",
+      "locationId": "c4d3b2a1-09f8-765e-4d3c-2b1a09f8e7d6 ",
+      "ownerId": "d47f2b19-3a6e-4c8d-bf21-9e8a7c5d134e",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "switchLevel",
+              "version": 1
+            },
+            {
+              "id": "powerMeter",
+              "version": 1
+            },
+            {
+              "id": "firmwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "SmartPlug",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2024-08-15T22:16:37.926Z",
+      "profile": {
+        "id": "24195ea4-635c-3450-a235-71bc78ab3d1c"
+      },
+      "zigbee": {
+        "eui": "000D6F0003C04BC9",
+        "networkId": "F50E",
+        "driverId": "f2e891c6-00cc-446c-9192-8ebda63d9898",
+        "executingLocally": true,
+        "hubId": "074fa784-8be8-4c70-8e22-6f5ed6f81b7e",
+        "provisioningState": "PROVISIONED"
+      },
+      "type": "ZIGBEE",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "LOCAL"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/contact_sensor.json b/tests/components/smartthings/fixtures/devices/contact_sensor.json
new file mode 100644
index 00000000000..9823a70cb61
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/contact_sensor.json
@@ -0,0 +1,70 @@
+{
+  "items": [
+    {
+      "deviceId": "2d9a892b-1c93-45a5-84cb-0e81889498c6",
+      "name": "contact-profile",
+      "label": ".Front Door Open/Closed Sensor",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "a7f2c1d9-89b3-35a4-b217-fc68d9e4e752",
+      "deviceManufacturerCode": "Visonic",
+      "locationId": "c4d3b2a1-09f8-765e-4d3c-2b1a09f8e7d6 ",
+      "ownerId": "d47f2b19-3a6e-4c8d-bf21-9e8a7c5d134e",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "contactSensor",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "battery",
+              "version": 1
+            },
+            {
+              "id": "firmwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "ContactSensor",
+              "categoryType": "manufacturer"
+            },
+            {
+              "name": "GarageDoor",
+              "categoryType": "user"
+            }
+          ]
+        }
+      ],
+      "createTime": "2023-09-28T17:38:59.179Z",
+      "profile": {
+        "id": "22aa5a07-ac33-365f-b2f1-5ecef8cdb0eb"
+      },
+      "zigbee": {
+        "eui": "000D6F000576F604",
+        "networkId": "5A44",
+        "driverId": "408981c2-91d4-4dfc-bbfb-84ca0205d993",
+        "executingLocally": true,
+        "hubId": "074fa784-8be8-4c70-8e22-6f5ed6f81b7e",
+        "provisioningState": "PROVISIONED"
+      },
+      "type": "ZIGBEE",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "LOCAL"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/da_ac_airsensor_01001.json b/tests/components/smartthings/fixtures/devices/da_ac_airsensor_01001.json
new file mode 100644
index 00000000000..c8304e9c6d8
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/da_ac_airsensor_01001.json
@@ -0,0 +1,145 @@
+{
+  "items": [
+    {
+      "deviceId": "a3a970ea-e09c-9c04-161b-94c934e21666",
+      "name": "Samsung AirMonitor",
+      "label": "\uc5d0\uc5b4\ubaa8\ub2c8\ud130 \ud50c\ub7ec\uc2a4",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "DA-AC-AIRSENSOR-01001",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "33db9e71-abe9-43a0-acd3-3f0927bbe5b7",
+      "ownerId": "9a1ee192-04ba-46ca-9c3d-196d8dbcf807",
+      "roomId": "445c006d-1796-4dd6-8308-1c3cd045e8ff",
+      "deviceTypeName": "x.com.st.d.airqualitysensor",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "relativeHumidityMeasurement",
+              "version": 1
+            },
+            {
+              "id": "dustSensor",
+              "version": 1
+            },
+            {
+              "id": "dustHealthConcern",
+              "version": 1
+            },
+            {
+              "id": "fineDustHealthConcern",
+              "version": 1
+            },
+            {
+              "id": "veryFineDustSensor",
+              "version": 1
+            },
+            {
+              "id": "veryFineDustHealthConcern",
+              "version": 1
+            },
+            {
+              "id": "airQualitySensor",
+              "version": 1
+            },
+            {
+              "id": "odorSensor",
+              "version": 1
+            },
+            {
+              "id": "carbonDioxideMeasurement",
+              "version": 1
+            },
+            {
+              "id": "carbonDioxideHealthConcern",
+              "version": 1
+            },
+            {
+              "id": "samsungce.deviceIdentification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.rechargeableBattery",
+              "version": 1
+            },
+            {
+              "id": "samsungce.doNotDisturb",
+              "version": 1
+            },
+            {
+              "id": "samsungce.driverVersion",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "custom.deviceReportStateConfiguration",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            },
+            {
+              "id": "sec.diagnosticsInformation",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "AirQualityDetector",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2023-12-09T04:05:59.040Z",
+      "profile": {
+        "id": "1d34dd9d-6840-3df6-a6d0-5d9f4a4af2e1"
+      },
+      "ocf": {
+        "ocfDeviceType": "x.com.st.d.airqualitysensor",
+        "name": "Samsung AirMonitor",
+        "specVersion": "core.1.1.0",
+        "verticalDomainSpecVersion": "1.2.1",
+        "manufacturerName": "Samsung Electronics",
+        "modelNumber": "ASM-KR-TP1-22-ACMB1M|10243041|75000000001611C40800020000080000",
+        "platformVersion": "DAWIT 2.0",
+        "platformOS": "TizenRT 4.0",
+        "hwVersion": "Realtek",
+        "firmwareVersion": "ASM-KR-TP1-22-ACMB1M_16240426",
+        "vendorId": "DA-AC-AIRSENSOR-01001",
+        "vendorResourceClientServerVersion": "MediaTek Release 240426",
+        "lastSignupTime": "2023-12-09T04:05:54.816486Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": null,
+      "executionContext": "CLOUD",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/da_ac_rac_000001.json b/tests/components/smartthings/fixtures/devices/da_ac_rac_000001.json
new file mode 100644
index 00000000000..cc4e13784bf
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/da_ac_rac_000001.json
@@ -0,0 +1,303 @@
+{
+  "items": [
+    {
+      "deviceId": "96a5ef74-5832-a84b-f1f7-ca799957065d",
+      "name": "[room a/c] Samsung",
+      "label": "AC Office Granit",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "DA-AC-RAC-000001",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "58d3fd7c-c512-4da3-b500-ef269382756c",
+      "ownerId": "f9a28d7c-1ed5-d9e9-a81c-18971ec081db",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "deviceTypeName": "Samsung OCF Air Conditioner",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "airConditionerMode",
+              "version": 1
+            },
+            {
+              "id": "airConditionerFanMode",
+              "version": 1
+            },
+            {
+              "id": "fanOscillationMode",
+              "version": 1
+            },
+            {
+              "id": "airQualitySensor",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "thermostatCoolingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "relativeHumidityMeasurement",
+              "version": 1
+            },
+            {
+              "id": "dustSensor",
+              "version": 1
+            },
+            {
+              "id": "veryFineDustSensor",
+              "version": 1
+            },
+            {
+              "id": "audioVolume",
+              "version": 1
+            },
+            {
+              "id": "remoteControlStatus",
+              "version": 1
+            },
+            {
+              "id": "powerConsumptionReport",
+              "version": 1
+            },
+            {
+              "id": "demandResponseLoadControl",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "custom.spiMode",
+              "version": 1
+            },
+            {
+              "id": "custom.thermostatSetpointControl",
+              "version": 1
+            },
+            {
+              "id": "custom.airConditionerOptionalMode",
+              "version": 1
+            },
+            {
+              "id": "custom.airConditionerTropicalNightMode",
+              "version": 1
+            },
+            {
+              "id": "custom.autoCleaningMode",
+              "version": 1
+            },
+            {
+              "id": "custom.deviceReportStateConfiguration",
+              "version": 1
+            },
+            {
+              "id": "custom.energyType",
+              "version": 1
+            },
+            {
+              "id": "custom.dustFilter",
+              "version": 1
+            },
+            {
+              "id": "custom.airConditionerOdorController",
+              "version": 1
+            },
+            {
+              "id": "custom.deodorFilter",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledComponents",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            },
+            {
+              "id": "samsungce.deviceIdentification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dongleSoftwareInstallation",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "samsungce.selfCheck",
+              "version": 1
+            },
+            {
+              "id": "samsungce.driverVersion",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "AirConditioner",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "1",
+          "label": "1",
+          "capabilities": [
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "airConditionerMode",
+              "version": 1
+            },
+            {
+              "id": "airConditionerFanMode",
+              "version": 1
+            },
+            {
+              "id": "fanOscillationMode",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "thermostatCoolingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "relativeHumidityMeasurement",
+              "version": 1
+            },
+            {
+              "id": "airQualitySensor",
+              "version": 1
+            },
+            {
+              "id": "dustSensor",
+              "version": 1
+            },
+            {
+              "id": "veryFineDustSensor",
+              "version": 1
+            },
+            {
+              "id": "odorSensor",
+              "version": 1
+            },
+            {
+              "id": "remoteControlStatus",
+              "version": 1
+            },
+            {
+              "id": "audioVolume",
+              "version": 1
+            },
+            {
+              "id": "custom.thermostatSetpointControl",
+              "version": 1
+            },
+            {
+              "id": "custom.autoCleaningMode",
+              "version": 1
+            },
+            {
+              "id": "custom.airConditionerTropicalNightMode",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            },
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "powerConsumptionReport",
+              "version": 1
+            },
+            {
+              "id": "demandResponseLoadControl",
+              "version": 1
+            },
+            {
+              "id": "custom.spiMode",
+              "version": 1
+            },
+            {
+              "id": "custom.airConditionerOptionalMode",
+              "version": 1
+            },
+            {
+              "id": "custom.deviceReportStateConfiguration",
+              "version": 1
+            },
+            {
+              "id": "custom.energyType",
+              "version": 1
+            },
+            {
+              "id": "custom.dustFilter",
+              "version": 1
+            },
+            {
+              "id": "custom.airConditionerOdorController",
+              "version": 1
+            },
+            {
+              "id": "custom.deodorFilter",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2021-04-06T16:43:34.753Z",
+      "profile": {
+        "id": "60fbc713-8da5-315d-b31a-6d6dcde4be7b"
+      },
+      "ocf": {
+        "ocfDeviceType": "x.com.st.d.sensor.light",
+        "manufacturerName": "Samsung Electronics",
+        "vendorId": "VD-Sensor.Light-2023",
+        "lastSignupTime": "2025-01-08T02:32:04.631093137Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/da_ac_rac_01001.json b/tests/components/smartthings/fixtures/devices/da_ac_rac_01001.json
new file mode 100644
index 00000000000..db6f8d09673
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/da_ac_rac_01001.json
@@ -0,0 +1,264 @@
+{
+  "items": [
+    {
+      "deviceId": "4ece486b-89db-f06a-d54d-748b676b4d8e",
+      "name": "Samsung-Room-Air-Conditioner",
+      "label": "Aire Dormitorio Principal",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "DA-AC-RAC-01001",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "c4189ac1-208f-461a-8ab6-ea67937b3743",
+      "ownerId": "85ea07e1-7063-f673-3ba5-125293f297c8",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "deviceTypeName": "Samsung OCF Air Conditioner",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "airConditionerMode",
+              "version": 1
+            },
+            {
+              "id": "airConditionerFanMode",
+              "version": 1
+            },
+            {
+              "id": "bypassable",
+              "version": 1
+            },
+            {
+              "id": "fanOscillationMode",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "thermostatCoolingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "relativeHumidityMeasurement",
+              "version": 1
+            },
+            {
+              "id": "airQualitySensor",
+              "version": 1
+            },
+            {
+              "id": "odorSensor",
+              "version": 1
+            },
+            {
+              "id": "dustSensor",
+              "version": 1
+            },
+            {
+              "id": "veryFineDustSensor",
+              "version": 1
+            },
+            {
+              "id": "audioVolume",
+              "version": 1
+            },
+            {
+              "id": "powerConsumptionReport",
+              "version": 1
+            },
+            {
+              "id": "demandResponseLoadControl",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "audioNotification",
+              "version": 1
+            },
+            {
+              "id": "custom.spiMode",
+              "version": 1
+            },
+            {
+              "id": "custom.thermostatSetpointControl",
+              "version": 1
+            },
+            {
+              "id": "custom.airConditionerOptionalMode",
+              "version": 1
+            },
+            {
+              "id": "custom.airConditionerTropicalNightMode",
+              "version": 1
+            },
+            {
+              "id": "custom.autoCleaningMode",
+              "version": 1
+            },
+            {
+              "id": "custom.deviceReportStateConfiguration",
+              "version": 1
+            },
+            {
+              "id": "custom.energyType",
+              "version": 1
+            },
+            {
+              "id": "custom.dustFilter",
+              "version": 1
+            },
+            {
+              "id": "custom.veryFineDustFilter",
+              "version": 1
+            },
+            {
+              "id": "custom.deodorFilter",
+              "version": 1
+            },
+            {
+              "id": "custom.electricHepaFilter",
+              "version": 1
+            },
+            {
+              "id": "custom.doNotDisturbMode",
+              "version": 1
+            },
+            {
+              "id": "custom.periodicSensing",
+              "version": 1
+            },
+            {
+              "id": "custom.airConditionerOdorController",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            },
+            {
+              "id": "samsungce.alwaysOnSensing",
+              "version": 1
+            },
+            {
+              "id": "samsungce.airConditionerBeep",
+              "version": 1
+            },
+            {
+              "id": "samsungce.airConditionerLighting",
+              "version": 1
+            },
+            {
+              "id": "samsungce.airQualityHealthConcern",
+              "version": 1
+            },
+            {
+              "id": "samsungce.buttonDisplayCondition",
+              "version": 1
+            },
+            {
+              "id": "samsungce.deviceIdentification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.driverVersion",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dustFilterAlarm",
+              "version": 1
+            },
+            {
+              "id": "samsungce.individualControlLock",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "samsungce.selfCheck",
+              "version": 1
+            },
+            {
+              "id": "samsungce.silentAction",
+              "version": 1
+            },
+            {
+              "id": "samsungce.quickControl",
+              "version": 1
+            },
+            {
+              "id": "samsungce.welcomeCooling",
+              "version": 1
+            },
+            {
+              "id": "samsungce.unavailableCapabilities",
+              "version": 1
+            },
+            {
+              "id": "sec.diagnosticsInformation",
+              "version": 1
+            },
+            {
+              "id": "sec.wifiConfiguration",
+              "version": 1
+            },
+            {
+              "id": "sec.calmConnectionCare",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "AirConditioner",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2025-01-28T21:31:35.755Z",
+      "profile": {
+        "id": "091a55f4-7054-39fa-b23e-b56deb7580f8"
+      },
+      "ocf": {
+        "ocfDeviceType": "oic.d.airconditioner",
+        "name": "Samsung-Room-Air-Conditioner",
+        "specVersion": "core.1.1.0",
+        "verticalDomainSpecVersion": "1.2.1",
+        "manufacturerName": "Samsung Electronics",
+        "modelNumber": "ARA-WW-TP1-22-COMMON|10229641|60010523001511014600083200800000",
+        "platformVersion": "DAWIT 2.0",
+        "platformOS": "TizenRT 3.1",
+        "hwVersion": "Realtek",
+        "firmwareVersion": "ARA-WW-TP1-22-COMMON_11240702",
+        "vendorId": "DA-AC-RAC-01001",
+        "vendorResourceClientServerVersion": "Realtek Release 3.1.240221",
+        "lastSignupTime": "2025-01-28T21:31:30.090416369Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/da_ac_rac_100001.json b/tests/components/smartthings/fixtures/devices/da_ac_rac_100001.json
new file mode 100644
index 00000000000..3938ffc9d9b
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/da_ac_rac_100001.json
@@ -0,0 +1,112 @@
+{
+  "items": [
+    {
+      "deviceId": "F8042E25-0E53-0000-0000-000000000000",
+      "name": "Room A/C",
+      "label": "Corridor A/C",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "DA-AC-RAC-100001",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "5df0730b-38ed-43e4-b291-ec14feb3224c",
+      "ownerId": "63b9c79b-90fe-5262-9a6a-5e24db90915e",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "deviceTypeName": "Samsung OCF Air Conditioner",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "airConditionerMode",
+              "version": 1
+            },
+            {
+              "id": "airConditionerFanMode",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "thermostatCoolingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "airQualitySensor",
+              "version": 1
+            },
+            {
+              "id": "dustSensor",
+              "version": 1
+            },
+            {
+              "id": "odorSensor",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "samsungce.driverVersion",
+              "version": 1
+            },
+            {
+              "id": "samsungce.driverState",
+              "version": 1
+            },
+            {
+              "id": "custom.thermostatSetpointControl",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "AirConditioner",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2024-11-25T22:17:38.129Z",
+      "profile": {
+        "id": "9e3e03b1-7f8c-3ea2-8568-6902b79b99dd"
+      },
+      "ocf": {
+        "ocfDeviceType": "oic.d.airconditioner",
+        "name": "Room A/C",
+        "specVersion": "core.1.1.0",
+        "verticalDomainSpecVersion": "res.1.1.0,sh.1.1.0",
+        "manufacturerName": "Samsung Electronics",
+        "modelNumber": "TP6X_RAC_15K",
+        "vendorId": "DA-AC-RAC-100001",
+        "lastSignupTime": "2024-11-25T22:17:37.928118320Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/da_ks_cooktop_31001.json b/tests/components/smartthings/fixtures/devices/da_ks_cooktop_31001.json
new file mode 100644
index 00000000000..433e45dae7a
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/da_ks_cooktop_31001.json
@@ -0,0 +1,277 @@
+{
+  "items": [
+    {
+      "deviceId": "808dbd84-f357-47e2-a0cd-3b66fa22d584",
+      "name": "Builtin Cooktop",
+      "label": "Induction Hob",
+      "manufacturerName": "0A4H",
+      "presentationId": "DA-KS-COOKTOP-31001",
+      "deviceManufacturerCode": "0A4H",
+      "locationId": "7d27161a-0ef6-4294-91a0-80054ea5bc59",
+      "ownerId": "d52fb883-0f76-f4d9-0f6a-7ec2c0987b11",
+      "roomId": "afe14ff1-d444-420d-a766-4dd52f3e1c71",
+      "deviceTypeId": "Cooktop",
+      "deviceTypeName": "Samsung Cooktop",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "healthCheck",
+              "version": 1
+            },
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "audioMute",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledComponents",
+              "version": 1
+            },
+            {
+              "id": "custom.userNotification",
+              "version": 1
+            },
+            {
+              "id": "custom.cooktopOperatingState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.deviceIdentification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kitchenDeviceIdentification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softwareVersion",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "samsungce.errorAndAlarmState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.remoteManagementData",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kidsLockControl",
+              "version": 1
+            },
+            {
+              "id": "samsungce.cooktopFlexZone",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Cooktop",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "burner-01",
+          "label": "burner-01",
+          "capabilities": [
+            {
+              "id": "samsungce.surfaceResidualHeat",
+              "version": 1
+            },
+            {
+              "id": "samsungce.cooktopHeatingPower",
+              "version": 1
+            },
+            {
+              "id": "samsungce.countDownTimer",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "burner-02",
+          "label": "burner-02",
+          "capabilities": [
+            {
+              "id": "samsungce.surfaceResidualHeat",
+              "version": 1
+            },
+            {
+              "id": "samsungce.cooktopHeatingPower",
+              "version": 1
+            },
+            {
+              "id": "samsungce.countDownTimer",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "burner-03",
+          "label": "burner-03",
+          "capabilities": [
+            {
+              "id": "samsungce.surfaceResidualHeat",
+              "version": 1
+            },
+            {
+              "id": "samsungce.cooktopHeatingPower",
+              "version": 1
+            },
+            {
+              "id": "samsungce.countDownTimer",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "burner-04",
+          "label": "burner-04",
+          "capabilities": [
+            {
+              "id": "samsungce.surfaceResidualHeat",
+              "version": 1
+            },
+            {
+              "id": "samsungce.cooktopHeatingPower",
+              "version": 1
+            },
+            {
+              "id": "samsungce.countDownTimer",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "burner-05",
+          "label": "burner-05",
+          "capabilities": [
+            {
+              "id": "samsungce.surfaceResidualHeat",
+              "version": 1
+            },
+            {
+              "id": "samsungce.cooktopHeatingPower",
+              "version": 1
+            },
+            {
+              "id": "samsungce.countDownTimer",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "burner-06",
+          "label": "burner-06",
+          "capabilities": [
+            {
+              "id": "samsungce.surfaceResidualHeat",
+              "version": 1
+            },
+            {
+              "id": "samsungce.cooktopHeatingPower",
+              "version": 1
+            },
+            {
+              "id": "samsungce.countDownTimer",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "hood",
+          "label": "hood",
+          "capabilities": [
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "samsungce.connectionState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.hoodFanSpeed",
+              "version": 1
+            },
+            {
+              "id": "samsungce.lamp",
+              "version": 1
+            },
+            {
+              "id": "samsungce.countDownTimer",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2025-03-25T18:18:23.576Z",
+      "profile": {
+        "id": "a99bbcb8-51c9-468d-b9d5-0ce6dca09d5a"
+      },
+      "mqtt": {
+        "executingLocally": false,
+        "transferCandidate": false
+      },
+      "type": "MQTT",
+      "restrictionTier": 0,
+      "allowed": null,
+      "executionContext": "CLOUD",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/da_ks_microwave_0101x.json b/tests/components/smartthings/fixtures/devices/da_ks_microwave_0101x.json
new file mode 100644
index 00000000000..f636b069e38
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/da_ks_microwave_0101x.json
@@ -0,0 +1,176 @@
+{
+  "items": [
+    {
+      "deviceId": "2bad3237-4886-e699-1b90-4a51a3d55c8a",
+      "name": "Samsung Microwave",
+      "label": "Microwave",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "DA-KS-MICROWAVE-0101X",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "586e4602-34ab-4a22-993e-5f616b04604f",
+      "ownerId": "b603d7e8-6066-4e10-8102-afa752a63816",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "deviceTypeName": "oic.d.microwave",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "remoteControlStatus",
+              "version": 1
+            },
+            {
+              "id": "ovenSetpoint",
+              "version": 1
+            },
+            {
+              "id": "ovenMode",
+              "version": 1
+            },
+            {
+              "id": "ovenOperatingState",
+              "version": 1
+            },
+            {
+              "id": "doorControl",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "samsungce.deviceIdentification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.driverVersion",
+              "version": 1
+            },
+            {
+              "id": "samsungce.hoodFanSpeed",
+              "version": 1
+            },
+            {
+              "id": "samsungce.definedRecipe",
+              "version": 1
+            },
+            {
+              "id": "samsungce.doorState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kitchenDeviceIdentification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kitchenDeviceDefaults",
+              "version": 1
+            },
+            {
+              "id": "samsungce.ovenMode",
+              "version": 1
+            },
+            {
+              "id": "samsungce.ovenOperatingState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.microwavePower",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kitchenModeSpecification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kidsLock",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            },
+            {
+              "id": "sec.diagnosticsInformation",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Microwave",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "hood",
+          "label": "hood",
+          "capabilities": [
+            {
+              "id": "samsungce.lamp",
+              "version": 1
+            },
+            {
+              "id": "samsungce.hoodFanSpeed",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2022-03-23T15:59:10.704Z",
+      "profile": {
+        "id": "e5db3b6f-cad6-3caa-9775-9c9cae20f4a4"
+      },
+      "ocf": {
+        "ocfDeviceType": "oic.d.microwave",
+        "name": "Samsung Microwave",
+        "specVersion": "core.1.1.0",
+        "verticalDomainSpecVersion": "res.1.1.0,sh.1.1.0",
+        "manufacturerName": "Samsung Electronics",
+        "modelNumber": "TP2X_DA-KS-MICROWAVE-0101X|40436241|50040100011411000200000000000000",
+        "platformVersion": "DAWIT 3.0",
+        "platformOS": "TizenRT 2.0 + IPv6",
+        "hwVersion": "MediaTek",
+        "firmwareVersion": "AKS-WW-TP2-20-MICROWAVE-OTR_40230125",
+        "vendorId": "DA-KS-MICROWAVE-0101X",
+        "vendorResourceClientServerVersion": "MediaTek Release 2.220916.2",
+        "lastSignupTime": "2022-04-17T15:33:11.063457Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/da_ks_oven_01061.json b/tests/components/smartthings/fixtures/devices/da_ks_oven_01061.json
new file mode 100644
index 00000000000..e82e28d2275
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/da_ks_oven_01061.json
@@ -0,0 +1,153 @@
+{
+  "items": [
+    {
+      "deviceId": "9447959a-0dfa-6b27-d40d-650da525c53f",
+      "name": "[oven] Samsung",
+      "label": "Oven",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "DA-KS-OVEN-01061",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "a81dc8da-5a3f-43b6-8c8a-1309f37eeeb9",
+      "ownerId": "97ee2149-9de0-3287-8245-24d6fd1609aa",
+      "roomId": "eb2167dd-8b8d-4131-b59e-5dd391b2e151",
+      "deviceTypeName": "Samsung OCF Oven",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "remoteControlStatus",
+              "version": 1
+            },
+            {
+              "id": "ovenSetpoint",
+              "version": 1
+            },
+            {
+              "id": "ovenMode",
+              "version": 1
+            },
+            {
+              "id": "ovenOperatingState",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "samsungce.deviceIdentification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.doorState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.definedRecipe",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kitchenDeviceIdentification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kitchenDeviceDefaults",
+              "version": 1
+            },
+            {
+              "id": "samsungce.driverVersion",
+              "version": 1
+            },
+            {
+              "id": "samsungce.ovenMode",
+              "version": 1
+            },
+            {
+              "id": "samsungce.ovenOperatingState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.microwavePower",
+              "version": 1
+            },
+            {
+              "id": "samsungce.lamp",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kitchenModeSpecification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kidsLock",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "samsungce.waterReservoir",
+              "version": 1
+            },
+            {
+              "id": "samsungce.ovenDrainageRequirement",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Oven",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2025-01-08T17:29:12.549Z",
+      "profile": {
+        "id": "eb34598f-f96a-3420-a90a-71693052eaa3"
+      },
+      "ocf": {
+        "ocfDeviceType": "oic.d.oven",
+        "name": "[oven] Samsung",
+        "specVersion": "core.1.1.0",
+        "verticalDomainSpecVersion": "res.1.1.0,sh.1.1.0",
+        "manufacturerName": "Samsung Electronics",
+        "modelNumber": "TP1X_DA-KS-OVEN-01061|40457041|50030018001611000A00000000000000",
+        "platformVersion": "DAWIT 3.0",
+        "platformOS": "TizenRT 3.1",
+        "hwVersion": "Realtek",
+        "firmwareVersion": "AKS-WW-TP1X-21-OVEN_40211229",
+        "vendorId": "DA-KS-OVEN-01061",
+        "vendorResourceClientServerVersion": "Realtek Release 3.1.211122",
+        "lastSignupTime": "2025-01-08T17:29:08.536664213Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": null,
+      "executionContext": "CLOUD",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/da_ks_range_0101x.json b/tests/components/smartthings/fixtures/devices/da_ks_range_0101x.json
new file mode 100644
index 00000000000..e918e2d77ca
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/da_ks_range_0101x.json
@@ -0,0 +1,197 @@
+{
+  "items": [
+    {
+      "deviceId": "2c3cbaa0-1899-5ddc-7b58-9d657bd48f18",
+      "name": "Samsung Range",
+      "label": "Vulcan",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "DA-KS-RANGE-0101X",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "597a4912-13c9-47ab-9956-7ebc38b61abd",
+      "ownerId": "c4478c70-9014-e5c9-993c-f62707fa1e61",
+      "roomId": "fc407cd9-3b32-4fc0-bf23-e0d4995101e9",
+      "deviceTypeName": "Samsung OCF Range",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "remoteControlStatus",
+              "version": 1
+            },
+            {
+              "id": "ovenSetpoint",
+              "version": 1
+            },
+            {
+              "id": "ovenMode",
+              "version": 1
+            },
+            {
+              "id": "ovenOperatingState",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "samsungce.deviceIdentification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.driverVersion",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kitchenDeviceIdentification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kitchenDeviceDefaults",
+              "version": 1
+            },
+            {
+              "id": "samsungce.doorState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.customRecipe",
+              "version": 1
+            },
+            {
+              "id": "samsungce.ovenMode",
+              "version": 1
+            },
+            {
+              "id": "samsungce.ovenOperatingState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.meatProbe",
+              "version": 1
+            },
+            {
+              "id": "samsungce.lamp",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kitchenModeSpecification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kidsLock",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "custom.cooktopOperatingState",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Range",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "cavity-01",
+          "label": "cavity-01",
+          "capabilities": [
+            {
+              "id": "ovenSetpoint",
+              "version": 1
+            },
+            {
+              "id": "ovenMode",
+              "version": 1
+            },
+            {
+              "id": "ovenOperatingState",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "samsungce.ovenMode",
+              "version": 1
+            },
+            {
+              "id": "samsungce.ovenOperatingState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kitchenDeviceDefaults",
+              "version": 1
+            },
+            {
+              "id": "custom.ovenCavityStatus",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2022-02-21T22:37:01.648Z",
+      "profile": {
+        "id": "8e479dd0-9719-337a-9fbe-2c4572f95c71"
+      },
+      "ocf": {
+        "ocfDeviceType": "oic.d.range",
+        "name": "Samsung Range",
+        "specVersion": "core.1.1.0",
+        "verticalDomainSpecVersion": "1.2.1",
+        "manufacturerName": "Samsung Electronics",
+        "modelNumber": "TP1X_DA-KS-RANGE-0101X|40445041|5001011E031511010200000000000000",
+        "platformVersion": "DAWIT 3.0",
+        "platformOS": "TizenRT 3.1",
+        "hwVersion": "Realtek",
+        "firmwareVersion": "AKS-WW-TP1-20-OVEN-3-CR_40240205",
+        "vendorId": "DA-KS-RANGE-0101X",
+        "vendorResourceClientServerVersion": "Realtek Release 3.1.220727",
+        "lastSignupTime": "2023-11-28T22:49:01.876575Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": null,
+      "executionContext": "CLOUD",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/da_ref_normal_000001.json b/tests/components/smartthings/fixtures/devices/da_ref_normal_000001.json
new file mode 100644
index 00000000000..29372cac23c
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/da_ref_normal_000001.json
@@ -0,0 +1,412 @@
+{
+  "items": [
+    {
+      "deviceId": "7db87911-7dce-1cf2-7119-b953432a2f09",
+      "name": "[refrigerator] Samsung",
+      "label": "Refrigerator",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "DA-REF-NORMAL-000001",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "c4d3b2a1-09f8-765e-4d3c-2b1a09f8e7d6 ",
+      "ownerId": "d47f2b19-3a6e-4c8d-bf21-9e8a7c5d134e",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "deviceTypeName": "Samsung OCF Refrigerator",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "contactSensor",
+              "version": 1
+            },
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "powerConsumptionReport",
+              "version": 1
+            },
+            {
+              "id": "demandResponseLoadControl",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "refrigeration",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "thermostatCoolingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "custom.deodorFilter",
+              "version": 1
+            },
+            {
+              "id": "custom.deviceReportStateConfiguration",
+              "version": 1
+            },
+            {
+              "id": "custom.energyType",
+              "version": 1
+            },
+            {
+              "id": "custom.fridgeMode",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledComponents",
+              "version": 1
+            },
+            {
+              "id": "custom.waterFilter",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "samsungce.deviceIdentification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dongleSoftwareInstallation",
+              "version": 1
+            },
+            {
+              "id": "samsungce.driverVersion",
+              "version": 1
+            },
+            {
+              "id": "samsungce.fridgeVacationMode",
+              "version": 1
+            },
+            {
+              "id": "samsungce.powerCool",
+              "version": 1
+            },
+            {
+              "id": "samsungce.powerFreeze",
+              "version": 1
+            },
+            {
+              "id": "samsungce.sabbathMode",
+              "version": 1
+            },
+            {
+              "id": "samsungce.quickControl",
+              "version": 1
+            },
+            {
+              "id": "sec.diagnosticsInformation",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Refrigerator",
+              "categoryType": "manufacturer"
+            },
+            {
+              "name": "Refrigerator",
+              "categoryType": "user"
+            }
+          ]
+        },
+        {
+          "id": "freezer",
+          "label": "freezer",
+          "capabilities": [
+            {
+              "id": "contactSensor",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "thermostatCoolingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            },
+            {
+              "id": "custom.fridgeMode",
+              "version": 1
+            },
+            {
+              "id": "custom.thermostatSetpointControl",
+              "version": 1
+            },
+            {
+              "id": "samsungce.freezerConvertMode",
+              "version": 1
+            },
+            {
+              "id": "samsungce.unavailableCapabilities",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "cooler",
+          "label": "cooler",
+          "capabilities": [
+            {
+              "id": "contactSensor",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "thermostatCoolingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            },
+            {
+              "id": "custom.fridgeMode",
+              "version": 1
+            },
+            {
+              "id": "custom.thermostatSetpointControl",
+              "version": 1
+            },
+            {
+              "id": "samsungce.unavailableCapabilities",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "cvroom",
+          "label": "cvroom",
+          "capabilities": [
+            {
+              "id": "contactSensor",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "thermostatCoolingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            },
+            {
+              "id": "custom.fridgeMode",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "onedoor",
+          "label": "onedoor",
+          "capabilities": [
+            {
+              "id": "contactSensor",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "thermostatCoolingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            },
+            {
+              "id": "custom.fridgeMode",
+              "version": 1
+            },
+            {
+              "id": "custom.thermostatSetpointControl",
+              "version": 1
+            },
+            {
+              "id": "samsungce.freezerConvertMode",
+              "version": 1
+            },
+            {
+              "id": "samsungce.unavailableCapabilities",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "icemaker",
+          "label": "icemaker",
+          "capabilities": [
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "icemaker-02",
+          "label": "icemaker-02",
+          "capabilities": [
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "pantry-01",
+          "label": "pantry-01",
+          "capabilities": [
+            {
+              "id": "samsungce.fridgePantryInfo",
+              "version": 1
+            },
+            {
+              "id": "samsungce.fridgePantryMode",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "pantry-02",
+          "label": "pantry-02",
+          "capabilities": [
+            {
+              "id": "samsungce.fridgePantryInfo",
+              "version": 1
+            },
+            {
+              "id": "samsungce.fridgePantryMode",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2022-01-08T16:50:43.544Z",
+      "profile": {
+        "id": "f2a9af35-5df8-3477-91df-94941d302591"
+      },
+      "ocf": {
+        "ocfDeviceType": "oic.d.refrigerator",
+        "name": "[refrigerator] Samsung",
+        "specVersion": "core.1.1.0",
+        "verticalDomainSpecVersion": "res.1.1.0,sh.1.1.0",
+        "manufacturerName": "Samsung Electronics",
+        "modelNumber": "TP2X_REF_20K|00115641|0004014D011411200103000020000000",
+        "platformVersion": "DAWIT 2.0",
+        "platformOS": "TizenRT 1.0 + IPv6",
+        "hwVersion": "MediaTek",
+        "firmwareVersion": "A-RFWW-TP2-21-COMMON_20220110",
+        "vendorId": "DA-REF-NORMAL-000001",
+        "vendorResourceClientServerVersion": "MediaTek Release 2.210524.1",
+        "lastSignupTime": "2024-08-06T15:24:29.362093Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/da_rvc_normal_000001.json b/tests/components/smartthings/fixtures/devices/da_rvc_normal_000001.json
new file mode 100644
index 00000000000..b7f8ab2a42c
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/da_rvc_normal_000001.json
@@ -0,0 +1,119 @@
+{
+  "items": [
+    {
+      "deviceId": "3442dfc6-17c0-a65f-dae0-4c6e01786f44",
+      "name": "[robot vacuum] Samsung",
+      "label": "Robot vacuum",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "DA-RVC-NORMAL-000001",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "586e4602-34ab-4a22-993e-5f616b04604f",
+      "ownerId": "b603d7e8-6066-4e10-8102-afa752a63816",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "deviceTypeName": "Samsung OCF Robot Vacuum",
+      "components": [
+        {
+          "id": "main",
+          "label": "Robot vacuum",
+          "capabilities": [
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "battery",
+              "version": 1
+            },
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "powerConsumptionReport",
+              "version": 1
+            },
+            {
+              "id": "robotCleanerTurboMode",
+              "version": 1
+            },
+            {
+              "id": "robotCleanerMovement",
+              "version": 1
+            },
+            {
+              "id": "robotCleanerCleaningMode",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledComponents",
+              "version": 1
+            },
+            {
+              "id": "samsungce.deviceIdentification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "samsungce.robotCleanerCleaningMode",
+              "version": 1
+            },
+            {
+              "id": "samsungce.robotCleanerOperatingState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.driverVersion",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "RobotCleaner",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2018-06-06T23:04:25Z",
+      "profile": {
+        "id": "61b1c3cd-61cc-3dde-a4ba-9477d5e559cb"
+      },
+      "ocf": {
+        "ocfDeviceType": "oic.d.robotcleaner",
+        "name": "[robot vacuum] Samsung",
+        "specVersion": "core.1.1.0",
+        "verticalDomainSpecVersion": "res.1.1.0,sh.1.1.0",
+        "manufacturerName": "Samsung Electronics",
+        "modelNumber": "powerbot_7000_17M|50016055|80010404011141000100000000000000",
+        "platformVersion": "00",
+        "platformOS": "Tizen(3/0)",
+        "hwVersion": "1.0",
+        "firmwareVersion": "1.0",
+        "vendorId": "DA-RVC-NORMAL-000001",
+        "lastSignupTime": "2020-11-03T04:43:02.729Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/da_sac_ehs_000001_sub.json b/tests/components/smartthings/fixtures/devices/da_sac_ehs_000001_sub.json
new file mode 100644
index 00000000000..dffe57b3280
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/da_sac_ehs_000001_sub.json
@@ -0,0 +1,202 @@
+{
+  "items": [
+    {
+      "deviceId": "1f98ebd0-ac48-d802-7f62-000001200100",
+      "name": "Eco Heating System",
+      "label": "Eco Heating System",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "DA-SAC-EHS-000001-SUB",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "d22d6401-6070-4928-8e7b-b724e2dbf425",
+      "ownerId": "35445a41-3ae2-4bc0-6f51-31705de6b96f",
+      "roomId": "169ef666-a51d-4d74-9b45-e660ecd4a8d7",
+      "deviceTypeName": "Samsung OCF Air Conditioner",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "thermostatCoolingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "airConditionerMode",
+              "version": 1
+            },
+            {
+              "id": "powerConsumptionReport",
+              "version": 1
+            },
+            {
+              "id": "demandResponseLoadControl",
+              "version": 1
+            },
+            {
+              "id": "remoteControlStatus",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "custom.energyType",
+              "version": 1
+            },
+            {
+              "id": "custom.outingMode",
+              "version": 1
+            },
+            {
+              "id": "custom.thermostatSetpointControl",
+              "version": 1
+            },
+            {
+              "id": "custom.deviceReportStateConfiguration",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            },
+            {
+              "id": "samsungce.deviceIdentification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.driverVersion",
+              "version": 1
+            },
+            {
+              "id": "samsungce.sacDisplayCondition",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "samsungce.ehsFsvSettings",
+              "version": 1
+            },
+            {
+              "id": "samsungce.ehsCycleData",
+              "version": 1
+            },
+            {
+              "id": "samsungce.ehsTemperatureReference",
+              "version": 1
+            },
+            {
+              "id": "samsungce.ehsThermostat",
+              "version": 1
+            },
+            {
+              "id": "samsungce.toggleSwitch",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "AirConditioner",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "INDOOR",
+          "label": "INDOOR",
+          "capabilities": [
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "thermostatCoolingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "airConditionerMode",
+              "version": 1
+            },
+            {
+              "id": "custom.thermostatSetpointControl",
+              "version": 1
+            },
+            {
+              "id": "samsungce.ehsTemperatureReference",
+              "version": 1
+            },
+            {
+              "id": "samsungce.sacDisplayCondition",
+              "version": 1
+            },
+            {
+              "id": "samsungce.ehsThermostat",
+              "version": 1
+            },
+            {
+              "id": "samsungce.toggleSwitch",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2023-08-02T14:32:26.006Z",
+      "parentDeviceId": "1f98ebd0-ac48-d802-7f62-12592d8286b7",
+      "profile": {
+        "id": "54b9789f-2c8c-310d-9e14-9a84903c792b"
+      },
+      "ocf": {
+        "ocfDeviceType": "oic.d.airconditioner",
+        "name": "Eco Heating System",
+        "specVersion": "core.1.1.0",
+        "verticalDomainSpecVersion": "1.2.1",
+        "manufacturerName": "Samsung Electronics",
+        "modelNumber": "SAC_EHS_MONO|220614|61007400001600000400000000000000",
+        "platformVersion": "4.0",
+        "platformOS": "Tizen",
+        "hwVersion": "",
+        "firmwareVersion": "20240611.1",
+        "vendorId": "DA-SAC-EHS-000001-SUB",
+        "vendorResourceClientServerVersion": "3.2.20",
+        "lastSignupTime": "2023-08-02T14:32:25.282882Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": null,
+      "executionContext": "CLOUD",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/da_wm_dw_000001.json b/tests/components/smartthings/fixtures/devices/da_wm_dw_000001.json
new file mode 100644
index 00000000000..33392081bf5
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/da_wm_dw_000001.json
@@ -0,0 +1,168 @@
+{
+  "items": [
+    {
+      "deviceId": "f36dc7ce-cac0-0667-dc14-a3704eb5e676",
+      "name": "[dishwasher] Samsung",
+      "label": "Dishwasher",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "DA-WM-DW-000001",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "586e4602-34ab-4a22-993e-5f616b04604f",
+      "ownerId": "b603d7e8-6066-4e10-8102-afa752a63816",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "deviceTypeName": "Samsung OCF Dishwasher",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "powerConsumptionReport",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "remoteControlStatus",
+              "version": 1
+            },
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "demandResponseLoadControl",
+              "version": 1
+            },
+            {
+              "id": "dishwasherOperatingState",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            },
+            {
+              "id": "custom.dishwasherOperatingProgress",
+              "version": 1
+            },
+            {
+              "id": "custom.dishwasherOperatingPercentage",
+              "version": 1
+            },
+            {
+              "id": "custom.dishwasherDelayStartTime",
+              "version": 1
+            },
+            {
+              "id": "custom.energyType",
+              "version": 1
+            },
+            {
+              "id": "custom.supportedOptions",
+              "version": 1
+            },
+            {
+              "id": "custom.waterFilter",
+              "version": 1
+            },
+            {
+              "id": "samsungce.deviceIdentification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dishwasherJobState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dishwasherWashingCourse",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dishwasherWashingCourseDetails",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dishwasherOperation",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dishwasherWashingOptions",
+              "version": 1
+            },
+            {
+              "id": "samsungce.driverVersion",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kidsLock",
+              "version": 1
+            },
+            {
+              "id": "samsungce.waterConsumptionReport",
+              "version": 1
+            },
+            {
+              "id": "samsungce.quickControl",
+              "version": 1
+            },
+            {
+              "id": "sec.diagnosticsInformation",
+              "version": 1
+            },
+            {
+              "id": "sec.wifiConfiguration",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Dishwasher",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2021-06-27T01:19:35.408Z",
+      "profile": {
+        "id": "0cba797c-40ee-3473-aa01-4ee5b6cb8c67"
+      },
+      "ocf": {
+        "ocfDeviceType": "oic.d.dishwasher",
+        "name": "[dishwasher] Samsung",
+        "specVersion": "core.1.1.0",
+        "verticalDomainSpecVersion": "res.1.1.0,sh.1.1.0",
+        "manufacturerName": "Samsung Electronics",
+        "modelNumber": "DA_DW_A51_20_COMMON|30007242|40010201001311000101000000000000",
+        "platformVersion": "DAWIT 2.0",
+        "platformOS": "TizenRT 1.0 + IPv6",
+        "hwVersion": "ARTIK051",
+        "firmwareVersion": "DA_DW_A51_20_COMMON_30230714",
+        "vendorId": "DA-WM-DW-000001",
+        "vendorResourceClientServerVersion": "ARTIK051 Release 2.210224.1",
+        "lastSignupTime": "2021-10-16T17:28:59.984202Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/da_wm_sc_000001.json b/tests/components/smartthings/fixtures/devices/da_wm_sc_000001.json
new file mode 100644
index 00000000000..8b501cba9b7
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/da_wm_sc_000001.json
@@ -0,0 +1,172 @@
+{
+  "items": [
+    {
+      "deviceId": "b93211bf-9d96-bd21-3b2f-964fcc87f5cc",
+      "name": "[airdresser] Samsung",
+      "label": "AirDresser",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "DA-WM-SC-000001",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "df59873c-4e2c-43ba-bcd4-ade4efb0504a",
+      "ownerId": "71254e90-c144-45b6-aabe-709f78f48376",
+      "roomId": "4c9052ba-4430-4cb1-a788-f1e4449c43c9",
+      "deviceTypeName": "Samsung OCF Steam Closet",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "remoteControlStatus",
+              "version": 1
+            },
+            {
+              "id": "dryerOperatingState",
+              "version": 1
+            },
+            {
+              "id": "demandResponseLoadControl",
+              "version": 1
+            },
+            {
+              "id": "powerConsumptionReport",
+              "version": 1
+            },
+            {
+              "id": "custom.steamClosetOperatingState",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            },
+            {
+              "id": "custom.energyType",
+              "version": 1
+            },
+            {
+              "id": "custom.steamClosetWrinklePrevent",
+              "version": 1
+            },
+            {
+              "id": "custom.jobBeginningStatus",
+              "version": 1
+            },
+            {
+              "id": "custom.supportedOptions",
+              "version": 1
+            },
+            {
+              "id": "custom.veryFineDustFilter",
+              "version": 1
+            },
+            {
+              "id": "samsungce.deviceIdentification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.driverVersion",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "samsungce.steamClosetDelayEnd",
+              "version": 1
+            },
+            {
+              "id": "samsungce.steamClosetKeepFreshMode",
+              "version": 1
+            },
+            {
+              "id": "samsungce.steamClosetSanitizeMode",
+              "version": 1
+            },
+            {
+              "id": "samsungce.steamClosetAutoCycleLink",
+              "version": 1
+            },
+            {
+              "id": "samsungce.steamClosetCycle",
+              "version": 1
+            },
+            {
+              "id": "samsungce.steamClosetCyclePreset",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kidsLock",
+              "version": 1
+            },
+            {
+              "id": "samsungce.welcomeMessage",
+              "version": 1
+            },
+            {
+              "id": "samsungce.quickControl",
+              "version": 1
+            },
+            {
+              "id": "sec.diagnosticsInformation",
+              "version": 1
+            },
+            {
+              "id": "sec.wifiConfiguration",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "ClothingCareMachine",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2023-06-23T16:00:40.545Z",
+      "profile": {
+        "id": "a3623498-4747-3761-bac1-ba13f437d8ea"
+      },
+      "ocf": {
+        "ocfDeviceType": "x.com.st.d.steamcloset",
+        "name": "[airdresser] Samsung",
+        "specVersion": "core.1.1.0",
+        "verticalDomainSpecVersion": "res.1.1.0,sh.1.1.0",
+        "manufacturerName": "Samsung Electronics",
+        "modelNumber": "DA_DF_TP2_20_COMMON|20299141|3801010200151107020100FF00000000",
+        "platformVersion": "DAWIT 2.0",
+        "platformOS": "TizenRT 2.0 + IPv6",
+        "hwVersion": "MediaTek",
+        "firmwareVersion": "DA_DF_TP2_20_COMMON_30230807",
+        "vendorId": "DA-WM-SC-000001",
+        "vendorResourceClientServerVersion": "MediaTek Release 2.211214.1",
+        "lastSignupTime": "2023-06-23T16:00:36.793123Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/da_wm_wd_000001.json b/tests/components/smartthings/fixtures/devices/da_wm_wd_000001.json
new file mode 100644
index 00000000000..ef47260a989
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/da_wm_wd_000001.json
@@ -0,0 +1,204 @@
+{
+  "items": [
+    {
+      "deviceId": "02f7256e-8353-5bdd-547f-bd5b1647e01b",
+      "name": "[dryer] Samsung",
+      "label": "Dryer",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "DA-WM-WD-000001",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "781d5f1e-c87e-455e-87f7-8e954879e91d",
+      "ownerId": "b603d7e8-6066-4e10-8102-afa752a63816",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "deviceTypeName": "Samsung OCF Dryer",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "remoteControlStatus",
+              "version": 1
+            },
+            {
+              "id": "dryerOperatingState",
+              "version": 1
+            },
+            {
+              "id": "powerConsumptionReport",
+              "version": 1
+            },
+            {
+              "id": "demandResponseLoadControl",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            },
+            {
+              "id": "custom.dryerDryLevel",
+              "version": 1
+            },
+            {
+              "id": "custom.dryerWrinklePrevent",
+              "version": 1
+            },
+            {
+              "id": "custom.energyType",
+              "version": 1
+            },
+            {
+              "id": "custom.jobBeginningStatus",
+              "version": 1
+            },
+            {
+              "id": "custom.supportedOptions",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "samsungce.detergentOrder",
+              "version": 1
+            },
+            {
+              "id": "samsungce.detergentState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.deviceIdentification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dongleSoftwareInstallation",
+              "version": 1
+            },
+            {
+              "id": "samsungce.driverVersion",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dryerAutoCycleLink",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dryerCycle",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dryerCyclePreset",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dryerDelayEnd",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dryerDryingTemperature",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dryerDryingTime",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dryerFreezePrevent",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dryerOperatingState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kidsLock",
+              "version": 1
+            },
+            {
+              "id": "samsungce.welcomeMessage",
+              "version": 1
+            },
+            {
+              "id": "samsungce.quickControl",
+              "version": 1
+            },
+            {
+              "id": "sec.diagnosticsInformation",
+              "version": 1
+            },
+            {
+              "id": "sec.wifiConfiguration",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Dryer",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "hca.main",
+          "label": "hca.main",
+          "capabilities": [
+            {
+              "id": "hca.dryerMode",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2021-06-01T22:54:25.907Z",
+      "profile": {
+        "id": "53a1d049-eeda-396c-8324-e33438ef57be"
+      },
+      "ocf": {
+        "ocfDeviceType": "oic.d.dryer",
+        "name": "[dryer] Samsung",
+        "specVersion": "core.1.1.0",
+        "verticalDomainSpecVersion": "res.1.1.0,sh.1.1.0",
+        "manufacturerName": "Samsung Electronics",
+        "modelNumber": "DA_WM_A51_20_COMMON|20233741|3000000100111100020B000000000000",
+        "platformVersion": "DAWIT 2.0",
+        "platformOS": "TizenRT 1.0 + IPv6",
+        "hwVersion": "ARTIK051",
+        "firmwareVersion": "DA_WM_A51_20_COMMON_30230708",
+        "vendorId": "DA-WM-WD-000001",
+        "vendorResourceClientServerVersion": "ARTIK051 Release 2.210224.1",
+        "lastSignupTime": "2021-06-01T22:54:22.826697Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/da_wm_wd_000001_1.json b/tests/components/smartthings/fixtures/devices/da_wm_wd_000001_1.json
new file mode 100644
index 00000000000..995646438c4
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/da_wm_wd_000001_1.json
@@ -0,0 +1,205 @@
+{
+  "items": [
+    {
+      "deviceId": "3a6c4e05-811d-5041-e956-3d04c424cbcd",
+      "name": "[dryer] Samsung",
+      "label": "Seca-Roupa",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "DA-WM-WD-000001",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "06efa178-ad2f-4d22-838c-d63e05e5a58a",
+      "ownerId": "1a5f5619-e9ec-4302-beb9-633bb1657897",
+      "roomId": "dde24053-9707-49a5-ba0e-f19681514f37",
+      "deviceTypeName": "Samsung OCF Dryer",
+      "components": [
+        {
+          "id": "main",
+          "label": "Seca-Roupa",
+          "capabilities": [
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "remoteControlStatus",
+              "version": 1
+            },
+            {
+              "id": "dryerOperatingState",
+              "version": 1
+            },
+            {
+              "id": "powerConsumptionReport",
+              "version": 1
+            },
+            {
+              "id": "demandResponseLoadControl",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            },
+            {
+              "id": "custom.dryerDryLevel",
+              "version": 1
+            },
+            {
+              "id": "custom.dryerWrinklePrevent",
+              "version": 1
+            },
+            {
+              "id": "custom.energyType",
+              "version": 1
+            },
+            {
+              "id": "custom.jobBeginningStatus",
+              "version": 1
+            },
+            {
+              "id": "custom.supportedOptions",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "samsungce.detergentOrder",
+              "version": 1
+            },
+            {
+              "id": "samsungce.detergentState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.deviceIdentification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dongleSoftwareInstallation",
+              "version": 1
+            },
+            {
+              "id": "samsungce.driverVersion",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dryerAutoCycleLink",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dryerCycle",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dryerCyclePreset",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dryerDelayEnd",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dryerDryingTemperature",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dryerDryingTime",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dryerFreezePrevent",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dryerOperatingState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kidsLock",
+              "version": 1
+            },
+            {
+              "id": "samsungce.welcomeMessage",
+              "version": 1
+            },
+            {
+              "id": "samsungce.quickControl",
+              "version": 1
+            },
+            {
+              "id": "sec.diagnosticsInformation",
+              "version": 1
+            },
+            {
+              "id": "sec.wifiConfiguration",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Dryer",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "hca.main",
+          "label": "hca.main",
+          "capabilities": [
+            {
+              "id": "hca.dryerMode",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2020-06-20T10:00:42Z",
+      "profile": {
+        "id": "53a1d049-eeda-396c-8324-e33438ef57be"
+      },
+      "ocf": {
+        "ocfDeviceType": "oic.d.dryer",
+        "name": "[dryer] Samsung",
+        "specVersion": "core.1.1.0",
+        "verticalDomainSpecVersion": "res.1.1.0,sh.1.1.0",
+        "manufacturerName": "Samsung Electronics",
+        "modelNumber": "DA_WM_A51_20_COMMON|20221341|30010102001211000103000000000000",
+        "platformVersion": "DAWIT 2.0",
+        "platformOS": "TizenRT 1.0 + IPv6",
+        "hwVersion": "ARTIK051",
+        "firmwareVersion": "DA_WM_A51_20_COMMON_30230708",
+        "vendorId": "DA-WM-WD-000001",
+        "vendorResourceClientServerVersion": "ARTIK051 Release 2.210224.1",
+        "lastSignupTime": "2020-11-19T04:43:50.736Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": null,
+      "executionContext": "CLOUD",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/da_wm_wm_000001.json b/tests/components/smartthings/fixtures/devices/da_wm_wm_000001.json
new file mode 100644
index 00000000000..4996eebab96
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/da_wm_wm_000001.json
@@ -0,0 +1,260 @@
+{
+  "items": [
+    {
+      "deviceId": "f984b91d-f250-9d42-3436-33f09a422a47",
+      "name": "[washer] Samsung",
+      "label": "Washer",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "DA-WM-WM-000001",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "781d5f1e-c87e-455e-87f7-8e954879e91d",
+      "ownerId": "b603d7e8-6066-4e10-8102-afa752a63816",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "deviceTypeName": "Samsung OCF Washer",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "powerConsumptionReport",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "remoteControlStatus",
+              "version": 1
+            },
+            {
+              "id": "demandResponseLoadControl",
+              "version": 1
+            },
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "washerOperatingState",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            },
+            {
+              "id": "custom.dryerDryLevel",
+              "version": 1
+            },
+            {
+              "id": "custom.energyType",
+              "version": 1
+            },
+            {
+              "id": "custom.jobBeginningStatus",
+              "version": 1
+            },
+            {
+              "id": "custom.supportedOptions",
+              "version": 1
+            },
+            {
+              "id": "custom.washerAutoDetergent",
+              "version": 1
+            },
+            {
+              "id": "custom.washerAutoSoftener",
+              "version": 1
+            },
+            {
+              "id": "custom.washerRinseCycles",
+              "version": 1
+            },
+            {
+              "id": "custom.washerSoilLevel",
+              "version": 1
+            },
+            {
+              "id": "custom.washerSpinLevel",
+              "version": 1
+            },
+            {
+              "id": "custom.washerWaterTemperature",
+              "version": 1
+            },
+            {
+              "id": "samsungce.autoDispenseDetergent",
+              "version": 1
+            },
+            {
+              "id": "samsungce.autoDispenseSoftener",
+              "version": 1
+            },
+            {
+              "id": "samsungce.detergentOrder",
+              "version": 1
+            },
+            {
+              "id": "samsungce.detergentState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.deviceIdentification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dongleSoftwareInstallation",
+              "version": 1
+            },
+            {
+              "id": "samsungce.detergentAutoReplenishment",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softenerAutoReplenishment",
+              "version": 1
+            },
+            {
+              "id": "samsungce.driverVersion",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kidsLock",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softenerOrder",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softenerState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.washerBubbleSoak",
+              "version": 1
+            },
+            {
+              "id": "samsungce.washerCycle",
+              "version": 1
+            },
+            {
+              "id": "samsungce.washerCyclePreset",
+              "version": 1
+            },
+            {
+              "id": "samsungce.washerDelayEnd",
+              "version": 1
+            },
+            {
+              "id": "samsungce.washerFreezePrevent",
+              "version": 1
+            },
+            {
+              "id": "samsungce.washerOperatingState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.washerWashingTime",
+              "version": 1
+            },
+            {
+              "id": "samsungce.washerWaterLevel",
+              "version": 1
+            },
+            {
+              "id": "samsungce.washerWaterValve",
+              "version": 1
+            },
+            {
+              "id": "samsungce.welcomeMessage",
+              "version": 1
+            },
+            {
+              "id": "samsungce.waterConsumptionReport",
+              "version": 1
+            },
+            {
+              "id": "samsungce.quickControl",
+              "version": 1
+            },
+            {
+              "id": "samsungce.energyPlanner",
+              "version": 1
+            },
+            {
+              "id": "sec.diagnosticsInformation",
+              "version": 1
+            },
+            {
+              "id": "sec.wifiConfiguration",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Washer",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "hca.main",
+          "label": "hca.main",
+          "capabilities": [
+            {
+              "id": "hca.washerMode",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2021-06-01T22:52:18.023Z",
+      "profile": {
+        "id": "3f221c79-d81c-315f-8e8b-b5742802a1e3"
+      },
+      "ocf": {
+        "ocfDeviceType": "oic.d.washer",
+        "name": "[washer] Samsung",
+        "specVersion": "core.1.1.0",
+        "verticalDomainSpecVersion": "res.1.1.0,sh.1.1.0",
+        "manufacturerName": "Samsung Electronics",
+        "modelNumber": "DA_WM_TP2_20_COMMON|20233741|2001000100131100022B010000000000",
+        "platformVersion": "DAWIT 2.0",
+        "platformOS": "TizenRT 2.0 + IPv6",
+        "hwVersion": "MediaTek",
+        "firmwareVersion": "DA_WM_TP2_20_COMMON_30230804",
+        "vendorId": "DA-WM-WM-000001",
+        "vendorResourceClientServerVersion": "MediaTek Release 2.211214.1",
+        "lastSignupTime": "2021-06-01T22:52:13.923649Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/da_wm_wm_000001_1.json b/tests/components/smartthings/fixtures/devices/da_wm_wm_000001_1.json
new file mode 100644
index 00000000000..bb1831d6f03
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/da_wm_wm_000001_1.json
@@ -0,0 +1,261 @@
+{
+  "items": [
+    {
+      "deviceId": "63803fae-cbed-f356-a063-2cf148ae3ca7",
+      "name": "[washer] Samsung",
+      "label": "Washing Machine",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "DA-WM-WM-000001",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "ca23214d-d9ae-41e5-9d26-f1a604c864d8",
+      "ownerId": "9b53a4ba-4422-b04d-f436-33c0490e7c37",
+      "roomId": "e226f1ae-1112-4794-bd3a-0beddf811645",
+      "deviceTypeName": "Samsung OCF Washer",
+      "components": [
+        {
+          "id": "main",
+          "label": "Washing Machine",
+          "capabilities": [
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "powerConsumptionReport",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "remoteControlStatus",
+              "version": 1
+            },
+            {
+              "id": "demandResponseLoadControl",
+              "version": 1
+            },
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "washerOperatingState",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            },
+            {
+              "id": "custom.dryerDryLevel",
+              "version": 1
+            },
+            {
+              "id": "custom.energyType",
+              "version": 1
+            },
+            {
+              "id": "custom.jobBeginningStatus",
+              "version": 1
+            },
+            {
+              "id": "custom.supportedOptions",
+              "version": 1
+            },
+            {
+              "id": "custom.washerAutoDetergent",
+              "version": 1
+            },
+            {
+              "id": "custom.washerAutoSoftener",
+              "version": 1
+            },
+            {
+              "id": "custom.washerRinseCycles",
+              "version": 1
+            },
+            {
+              "id": "custom.washerSoilLevel",
+              "version": 1
+            },
+            {
+              "id": "custom.washerSpinLevel",
+              "version": 1
+            },
+            {
+              "id": "custom.washerWaterTemperature",
+              "version": 1
+            },
+            {
+              "id": "samsungce.autoDispenseDetergent",
+              "version": 1
+            },
+            {
+              "id": "samsungce.autoDispenseSoftener",
+              "version": 1
+            },
+            {
+              "id": "samsungce.detergentOrder",
+              "version": 1
+            },
+            {
+              "id": "samsungce.detergentState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.deviceIdentification",
+              "version": 1
+            },
+            {
+              "id": "samsungce.dongleSoftwareInstallation",
+              "version": 1
+            },
+            {
+              "id": "samsungce.detergentAutoReplenishment",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softenerAutoReplenishment",
+              "version": 1
+            },
+            {
+              "id": "samsungce.driverVersion",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "samsungce.kidsLock",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softenerOrder",
+              "version": 1
+            },
+            {
+              "id": "samsungce.softenerState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.washerBubbleSoak",
+              "version": 1
+            },
+            {
+              "id": "samsungce.washerCycle",
+              "version": 1
+            },
+            {
+              "id": "samsungce.washerCyclePreset",
+              "version": 1
+            },
+            {
+              "id": "samsungce.washerDelayEnd",
+              "version": 1
+            },
+            {
+              "id": "samsungce.washerFreezePrevent",
+              "version": 1
+            },
+            {
+              "id": "samsungce.washerOperatingState",
+              "version": 1
+            },
+            {
+              "id": "samsungce.washerWashingTime",
+              "version": 1
+            },
+            {
+              "id": "samsungce.washerWaterLevel",
+              "version": 1
+            },
+            {
+              "id": "samsungce.washerWaterValve",
+              "version": 1
+            },
+            {
+              "id": "samsungce.welcomeMessage",
+              "version": 1
+            },
+            {
+              "id": "samsungce.waterConsumptionReport",
+              "version": 1
+            },
+            {
+              "id": "samsungce.quickControl",
+              "version": 1
+            },
+            {
+              "id": "samsungce.energyPlanner",
+              "version": 1
+            },
+            {
+              "id": "sec.diagnosticsInformation",
+              "version": 1
+            },
+            {
+              "id": "sec.wifiConfiguration",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Washer",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "hca.main",
+          "label": "hca.main",
+          "capabilities": [
+            {
+              "id": "hca.washerMode",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Other",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2020-03-04T03:03:19Z",
+      "profile": {
+        "id": "3f221c79-d81c-315f-8e8b-b5742802a1e3"
+      },
+      "ocf": {
+        "ocfDeviceType": "oic.d.washer",
+        "name": "[washer] Samsung",
+        "specVersion": "core.1.1.0",
+        "verticalDomainSpecVersion": "1.2.1",
+        "manufacturerName": "Samsung Electronics",
+        "modelNumber": "DA_WM_A51_20_COMMON|20224941|20010102011211030203000000000000",
+        "platformVersion": "DAWIT 2.0",
+        "platformOS": "TizenRT 1.0 + IPv6",
+        "hwVersion": "ARTIK051",
+        "firmwareVersion": "DA_WM_A51_20_COMMON_30230708",
+        "vendorId": "DA-WM-WM-000001",
+        "vendorResourceClientServerVersion": "ARTIK051 Release 2.210224.1",
+        "lastSignupTime": "2024-12-27T04:47:59.763899737Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": null,
+      "executionContext": "CLOUD",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/ecobee_sensor.json b/tests/components/smartthings/fixtures/devices/ecobee_sensor.json
new file mode 100644
index 00000000000..4c37a17f1a0
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/ecobee_sensor.json
@@ -0,0 +1,64 @@
+{
+  "items": [
+    {
+      "deviceId": "d5dc3299-c266-41c7-bd08-f540aea54b89",
+      "name": "ecobee Sensor",
+      "label": "Child Bedroom",
+      "manufacturerName": "0A0b",
+      "presentationId": "ST_635a866e-a3ea-4184-9d60-9c72ea603dfd",
+      "deviceManufacturerCode": "ecobee",
+      "locationId": "b6fe1fcb-e82b-4ce8-a5e1-85e96adba06c",
+      "ownerId": "b473ee01-2b1f-7bb1-c433-3caec75960bc",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "motionSensor",
+              "version": 1
+            },
+            {
+              "id": "presenceSensor",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "healthCheck",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "MotionSensor",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2025-01-16T21:14:07.283Z",
+      "profile": {
+        "id": "8ab3ca07-0d07-471b-a276-065e46d7aa8a"
+      },
+      "viper": {
+        "manufacturerName": "ecobee",
+        "modelName": "aresSmart-ecobee3_remote_sensor",
+        "swVersion": "250206213001",
+        "hwVersion": "250206213001",
+        "endpointAppId": "viper_92ccdcc0-4184-11eb-b9c5-036180216747"
+      },
+      "type": "VIPER",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/ecobee_thermostat.json b/tests/components/smartthings/fixtures/devices/ecobee_thermostat.json
new file mode 100644
index 00000000000..9becb0923c2
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/ecobee_thermostat.json
@@ -0,0 +1,80 @@
+{
+  "items": [
+    {
+      "deviceId": "028469cb-6e89-4f14-8d9a-bfbca5e0fbfc",
+      "name": "v4 - ecobee Thermostat - Heat and Cool (F)",
+      "label": "Main Floor",
+      "manufacturerName": "0A0b",
+      "presentationId": "ST_5334da38-8076-4b40-9f6c-ac3fccaa5d24",
+      "deviceManufacturerCode": "ecobee",
+      "locationId": "b6fe1fcb-e82b-4ce8-a5e1-85e96adba06c",
+      "ownerId": "b473ee01-2b1f-7bb1-c433-3caec75960bc",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "relativeHumidityMeasurement",
+              "version": 1
+            },
+            {
+              "id": "thermostatHeatingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "thermostatCoolingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "thermostatOperatingState",
+              "version": 1
+            },
+            {
+              "id": "thermostatMode",
+              "version": 1
+            },
+            {
+              "id": "thermostatFanMode",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "healthCheck",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Thermostat",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2025-01-16T21:14:07.276Z",
+      "profile": {
+        "id": "234d537d-d388-497f-b0f4-2e25025119ba"
+      },
+      "viper": {
+        "manufacturerName": "ecobee",
+        "modelName": "aresSmart-thermostat",
+        "swVersion": "250206151734",
+        "hwVersion": "250206151734",
+        "endpointAppId": "viper_92ccdcc0-4184-11eb-b9c5-036180216747"
+      },
+      "type": "VIPER",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/ecobee_thermostat_offline.json b/tests/components/smartthings/fixtures/devices/ecobee_thermostat_offline.json
new file mode 100644
index 00000000000..5fe8d8d28be
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/ecobee_thermostat_offline.json
@@ -0,0 +1,82 @@
+{
+  "items": [
+    {
+      "deviceId": "1888b38f-6246-4f1e-911b-bfcfb66999db",
+      "name": "v4 - ecobee Thermostat - Heat and Cool (F)",
+      "label": "Downstairs",
+      "manufacturerName": "0A0b",
+      "presentationId": "ST_5334da38-8076-4b40-9f6c-ac3fccaa5d24",
+      "deviceManufacturerCode": "ecobee",
+      "locationId": "1030449a-22c1-4a80-9781-0bd4ab7f0f2f",
+      "ownerId": "e7dbb793-4351-4cdc-b037-e6e0b4f9df67",
+      "roomId": "d22e6f98-78fe-4a76-b904-6cad8628da59",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "relativeHumidityMeasurement",
+              "version": 1
+            },
+            {
+              "id": "thermostatHeatingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "thermostatCoolingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "thermostatOperatingState",
+              "version": 1
+            },
+            {
+              "id": "thermostatMode",
+              "version": 1
+            },
+            {
+              "id": "thermostatFanMode",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "healthCheck",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Thermostat",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2025-03-10T00:57:26.760Z",
+      "profile": {
+        "id": "234d537d-d388-497f-b0f4-2e25025119ba"
+      },
+      "viper": {
+        "manufacturerName": "ecobee",
+        "modelName": "nikeSmart-thermostat",
+        "swVersion": "250308073247",
+        "hwVersion": "250308073247",
+        "endpointAppId": "viper_92ccdcc0-4184-11eb-b9c5-036180216747"
+      },
+      "type": "VIPER",
+      "restrictionTier": 0,
+      "allowed": null,
+      "executionContext": "CLOUD",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/fake_fan.json b/tests/components/smartthings/fixtures/devices/fake_fan.json
new file mode 100644
index 00000000000..6a447ae7aff
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/fake_fan.json
@@ -0,0 +1,49 @@
+{
+  "items": [
+    {
+      "deviceId": "f1af21a2-d5a1-437c-b10a-b34a87394b71",
+      "name": "fake-fan",
+      "label": "Fake fan",
+      "manufacturerName": "Myself",
+      "presentationId": "3f0921d3-0a66-3d49-b458-752e596838e9",
+      "deviceManufacturerCode": "0086-0002-005F",
+      "locationId": "6f11ddf5-f0cb-4516-a06a-3a2a6ec22bca",
+      "ownerId": "9f257fc4-6471-2566-b06e-2fe72dd979fa",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "components": [
+        {
+          "id": "main",
+          "capabilities": [
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "fanSpeed",
+              "version": 1
+            },
+            {
+              "id": "airConditionerFanMode",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Fan",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2023-01-12T23:02:44.917Z",
+      "profile": {
+        "id": "6372cd27-93c7-32ef-9be5-aef2221adff1"
+      },
+      "type": "ZWAVE",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "LOCAL"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/ge_in_wall_smart_dimmer.json b/tests/components/smartthings/fixtures/devices/ge_in_wall_smart_dimmer.json
new file mode 100644
index 00000000000..646196fa980
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/ge_in_wall_smart_dimmer.json
@@ -0,0 +1,64 @@
+{
+  "items": [
+    {
+      "deviceId": "aaedaf28-2ae0-4c1d-b57e-87f6a420c298",
+      "name": "GE Dimmer Switch",
+      "label": "Basement Exit Light",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "31cf01ee-cb49-3d95-ac2d-2afab47f25c7",
+      "deviceManufacturerCode": "0063-4944-3130",
+      "locationId": "c4d3b2a1-09f8-765e-4d3c-2b1a09f8e7d6 ",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "components": [
+        {
+          "id": "main",
+          "label": "Basement Exit Light",
+          "capabilities": [
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "switchLevel",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Switch",
+              "categoryType": "manufacturer"
+            },
+            {
+              "name": "Switch",
+              "categoryType": "user"
+            }
+          ]
+        }
+      ],
+      "createTime": "2020-05-25T18:18:01Z",
+      "profile": {
+        "id": "ec5458c2-c011-3479-a59b-82b42820c2f7"
+      },
+      "zwave": {
+        "networkId": "14",
+        "driverId": "2cbf55e3-dbc2-48a2-8be5-4c3ce756b692",
+        "executingLocally": true,
+        "hubId": "074fa784-8be8-4c70-8e22-6f5ed6f81b7e",
+        "networkSecurityLevel": "ZWAVE_LEGACY_NON_SECURE",
+        "provisioningState": "NONFUNCTIONAL",
+        "manufacturerId": 99,
+        "productType": 18756,
+        "productId": 12592
+      },
+      "type": "ZWAVE",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "LOCAL"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/generic_ef00_v1.json b/tests/components/smartthings/fixtures/devices/generic_ef00_v1.json
new file mode 100644
index 00000000000..96937769b41
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/generic_ef00_v1.json
@@ -0,0 +1,95 @@
+{
+  "items": [
+    {
+      "deviceId": "656569c2-7976-4232-a789-34b4d1176c3a",
+      "name": "generic-ef00-v1",
+      "label": "Thermostat K\u00fcche",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "be641577-f796-315b-af6f-b3ad14dd7a58",
+      "deviceManufacturerCode": "_TZE200_rxntag7i",
+      "locationId": "0b6618a6-c3ab-4b6e-968d-59cc8c2761bc",
+      "ownerId": "8a20b799-9d87-ecdc-39de-c93c6e4d3ea1",
+      "roomId": "eeb2f9d2-19cc-4dad-9f23-28ec807de97e",
+      "components": [
+        {
+          "id": "main",
+          "label": "Thermostat",
+          "capabilities": [
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "thermostatMode",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "thermostatHeatingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "thermostatOperatingState",
+              "version": 1
+            },
+            {
+              "id": "signalStrength",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "valleyboard16460.debug",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Thermostat",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "main02",
+          "label": "Floor",
+          "capabilities": [
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Thermostat",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2024-12-02T15:58:01.598Z",
+      "profile": {
+        "id": "3ad2e1e3-8867-332c-85b5-b291602c324f"
+      },
+      "zigbee": {
+        "eui": "A4C1388B31017B5F",
+        "networkId": "162F",
+        "driverId": "585328e6-ac85-4ac5-bce4-286efd0ab980",
+        "executingLocally": true,
+        "hubId": "61bd280e-71c4-44fb-9b6e-53fdf14718a2",
+        "provisioningState": "DRIVER_SWITCH"
+      },
+      "type": "ZIGBEE",
+      "restrictionTier": 0,
+      "allowed": null,
+      "executionContext": "LOCAL",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/generic_fan_3_speed.json b/tests/components/smartthings/fixtures/devices/generic_fan_3_speed.json
new file mode 100644
index 00000000000..db218189c68
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/generic_fan_3_speed.json
@@ -0,0 +1,63 @@
+{
+  "items": [
+    {
+      "deviceId": "6d95a8b7-4ee3-429a-a13a-00ec9354170c",
+      "name": "GE In-Wall Smart Dimmer",
+      "label": "Bedroom Fan",
+      "manufacturerName": "SmartThingsEdge",
+      "presentationId": "generic-fan-3-speed",
+      "deviceManufacturerCode": "0063-4944-3131",
+      "locationId": "f1313f27-6732-481d-a2a9-c7bbf900f867",
+      "ownerId": "e5216062-ac82-79b8-20db-ea65fa3d3fdd",
+      "roomId": "5f77f7cf-ece8-485e-a409-98f7b128a41a",
+      "components": [
+        {
+          "id": "main",
+          "label": "Bedroom Fan",
+          "capabilities": [
+            {
+              "id": "fanSpeed",
+              "version": 1
+            },
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Fan",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2018-01-12T22:12:15Z",
+      "parentDeviceId": "4ceb9b86-2f0d-4e98-ba4e-3fbe705f7805",
+      "profile": {
+        "id": "9bd81754-fc81-3ed1-86c2-d1094d6cbf6d"
+      },
+      "zwave": {
+        "networkId": "02",
+        "driverId": "e7947a05-947d-4bb5-92c4-2aafaff6d69c",
+        "executingLocally": true,
+        "hubId": "4ceb9b86-2f0d-4e98-ba4e-3fbe705f7805",
+        "networkSecurityLevel": "ZWAVE_LEGACY_NON_SECURE",
+        "provisioningState": "PROVISIONED",
+        "manufacturerId": 99,
+        "productType": 18756,
+        "productId": 12593
+      },
+      "type": "ZWAVE",
+      "restrictionTier": 0,
+      "allowed": null,
+      "executionContext": "LOCAL",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/heatit_zpushwall.json b/tests/components/smartthings/fixtures/devices/heatit_zpushwall.json
new file mode 100644
index 00000000000..0cd42e0e2ce
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/heatit_zpushwall.json
@@ -0,0 +1,155 @@
+{
+  "items": [
+    {
+      "deviceId": "5e5b97f3-3094-44e6-abc0-f61283412d6a",
+      "name": "heatit-zpushwall",
+      "label": "Livingroom smart switch",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "52933933-7123-3315-a441-92d65df5f031",
+      "deviceManufacturerCode": "019B-0004-2403",
+      "locationId": "c85a9f8a-5d2e-4cdd-8bdb-bc49ba4a3544",
+      "ownerId": "7b68139b-d068-45d8-bf27-961320350024",
+      "roomId": "56e43461-2f7d-4c43-ba7c-29465f991289",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "battery",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "RemoteController",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "button1",
+          "label": "button1",
+          "capabilities": [
+            {
+              "id": "button",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "RemoteController",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "button2",
+          "label": "button2",
+          "capabilities": [
+            {
+              "id": "button",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "RemoteController",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "button3",
+          "label": "button3",
+          "capabilities": [
+            {
+              "id": "button",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "RemoteController",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "button4",
+          "label": "button4",
+          "capabilities": [
+            {
+              "id": "button",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "RemoteController",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "button5",
+          "label": "button5",
+          "capabilities": [
+            {
+              "id": "button",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "RemoteController",
+              "categoryType": "manufacturer"
+            }
+          ]
+        },
+        {
+          "id": "button6",
+          "label": "button6",
+          "capabilities": [
+            {
+              "id": "button",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "RemoteController",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2023-12-04T16:51:15.774Z",
+      "parentDeviceId": "4869d882-e898-40c3-a198-7611b72187a5",
+      "profile": {
+        "id": "2d6e59af-63df-3102-8515-66f3d75c9323"
+      },
+      "zwave": {
+        "networkId": "12",
+        "driverId": "1d39c140-ce10-490d-bf52-4de7b72caab6",
+        "executingLocally": true,
+        "hubId": "4869d882-e898-40c3-a198-7611b72187a5",
+        "networkSecurityLevel": "ZWAVE_S2_AUTHENTICATED",
+        "provisioningState": "NONFUNCTIONAL",
+        "manufacturerId": 411,
+        "productType": 4,
+        "productId": 9219
+      },
+      "type": "ZWAVE",
+      "restrictionTier": 0,
+      "allowed": null,
+      "executionContext": "LOCAL",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/heatit_ztrm3_thermostat.json b/tests/components/smartthings/fixtures/devices/heatit_ztrm3_thermostat.json
new file mode 100644
index 00000000000..e8928f6b3a8
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/heatit_ztrm3_thermostat.json
@@ -0,0 +1,79 @@
+{
+  "items": [
+    {
+      "deviceId": "69a271f6-6537-4982-8cd9-979866872692",
+      "name": "heatit-ztrm3-thermostat",
+      "label": "Hall thermostat",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "8c5c0adc-73d6-33db-a1bd-67d746ab0e00",
+      "deviceManufacturerCode": "019B-0003-0203",
+      "locationId": "6cf6637b-9bc5-4e52-bc99-7497e322fb0d",
+      "ownerId": "7b68139b-d068-45d8-bf27-961320350024",
+      "roomId": "746b4d54-8026-44f1-b50f-8833dafdeea3",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "thermostatHeatingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "thermostatOperatingState",
+              "version": 1
+            },
+            {
+              "id": "thermostatMode",
+              "version": 1
+            },
+            {
+              "id": "powerMeter",
+              "version": 1
+            },
+            {
+              "id": "energyMeter",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Thermostat",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2023-09-22T15:40:58.942Z",
+      "parentDeviceId": "d04f5ba0-1430-4826-9aa4-fba4efb57c24",
+      "profile": {
+        "id": "2677e0e8-9241-3163-815e-6b1d6743f280"
+      },
+      "zwave": {
+        "networkId": "28",
+        "driverId": "28198799-de20-4cfd-a9f3-67860a0877d5",
+        "executingLocally": true,
+        "hubId": "d04f5ba0-1430-4826-9aa4-fba4efb57c24",
+        "networkSecurityLevel": "ZWAVE_S2_AUTHENTICATED",
+        "provisioningState": "PROVISIONED",
+        "manufacturerId": 411,
+        "productType": 3,
+        "productId": 515
+      },
+      "type": "ZWAVE",
+      "restrictionTier": 0,
+      "allowed": null,
+      "executionContext": "LOCAL",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/hub.json b/tests/components/smartthings/fixtures/devices/hub.json
new file mode 100644
index 00000000000..81046859db6
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/hub.json
@@ -0,0 +1,718 @@
+{
+  "items": [
+    {
+      "deviceId": "074fa784-8be8-4c70-8e22-6f5ed6f81b7e",
+      "name": "SmartThings v2 Hub",
+      "label": "Home Hub",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "63f1469e-dc4a-3689-8cc5-69e293c1eb21",
+      "locationId": "c4d3b2a1-09f8-765e-4d3c-2b1a09f8e7d6 ",
+      "ownerId": "d47f2b19-3a6e-4c8d-bf21-9e8a7c5d134e",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "bridge",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Hub",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2016-11-13T18:18:07Z",
+      "childDevices": [
+        {
+          "deviceId": "0781c9d0-92cb-4c7b-bb5b-2f2dbe0c41f3",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "08ee0358-9f40-4afa-b5a0-3a6aba18c267",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "09076422-62cc-4b2d-8beb-b53bc451c704",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "0b5577db-5074-4b70-a2c5-efec286d264d",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "115236ea-59e5-4cd4-bade-d67c409967bc",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "1691801c-ae59-438b-89dc-f2c761fe937d",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "1a987293-0962-4447-99d4-aa82655ffb55",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "2533fdd0-e064-4fa2-b77b-1e17260b58d7",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "265e653b-3c0b-4fa6-8e2a-f6a69c7040f0",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "277e0a96-c8ec-41aa-b4cf-0bac57dc1cee",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "2d9a892b-1c93-45a5-84cb-0e81889498c6",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "374ba6fa-5a08-4ea2-969c-1fa43d86e21f",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "37c0cdda-9158-41ad-9635-4ca32df9fe5b",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "3f82e13c-bd39-4043-bb54-7432a4e47113",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "4339f999-1ad2-46fb-9103-cb628b30a022",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "4a59f635-9f0a-4a6c-a2f0-ffb7ef182a7c",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "4c3469c9-3556-4f19-a2e1-1c0a598341dc",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "4fddedf0-2662-476e-b1fd-aceaec17ad3a",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "550a1c72-65a0-4d55-b97b-75168e055398",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "630cf009-eb3b-409e-a77a-9b298540532f",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "6356b240-c7d8-403c-883e-ae438d432abe",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "68e786a6-7f61-4c3a-9e13-70b803cf782b",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "6a2e5058-36f3-4668-aa43-49a66f8df93d",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "6b5535c7-c039-42ee-9970-8af86c6b0775",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "6c1b7cfa-7429-4f35-9d02-ab1dfd2f1297",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "6ca56087-481f-4e93-9727-fb91049fe396",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "6e3e44b3-d84a-4efc-a97b-b5e0dae28ddc",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "6f4d2e72-7af4-4c96-97ab-d6b6a0d6bc4b",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "7111243f-39d6-4ed0-a277-f040e40a806d",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "7b9d924a-de0c-44f9-ac5c-f15869c59411",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "7bedac4c-5681-4897-a2ef-e9153cb19ba0",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "7d246592-93db-4d72-a10d-5a51793ece8c",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "803cb0d9-addd-4c2d-aaef-d4e20bf88228",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "829da938-6e92-4a93-8923-7c67f9663c03",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "84f1eaf0-592e-459a-a2b3-4fc43e004dae",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "8eacf25f-aa33-4d9e-ba90-0e4ac3ceb8e0",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "8f873071-a9aa-4580-a736-8f5f696e044a",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "91172212-e9ff-4ca6-9626-e7af0361c9ad",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "92138ee5-d3bf-4348-98e8-445dedc319cb",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "971b05df-6ed3-446e-b54f-5092eac01921",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "9a9cb299-5279-4dea-9249-b5c153d22ba1",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "9b479ba0-81e1-4877-87c5-c301a87cbdab",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "9dd17f8f-cf5e-4647-a11c-d8f24cdf9b2a",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "a1e6525c-1e24-403c-b18c-eecb65e22ccf",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "a9d42ef0-f972-44b0-86bc-efd6569a1aef",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "a9f587c5-5d8b-4273-8907-e7f609af5158",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "aaedaf28-2ae0-4c1d-b57e-87f6a420c298",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "b3a84295-ac3c-4fb1-95e4-4a4bbb1b0bce",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "b90c085d-7d1f-4abc-a66d-d5ce3f96be02",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "bafc5147-2e48-498b-97ff-34c93fae7814",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "c1107a0c-fa71-43c5-8ff9-a128ea6c4f20",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "c5209cd2-fcb5-46be-b685-5b05f22dcb2c",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "c5699ff6-af09-4922-901d-bb81b8345bc3",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "cfcd9a21-a943-4519-9972-3c7890cd25b1",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "d0268a69-abfb-4c92-a646-61cec2e510ad",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "d20891e5-59b4-46ce-9184-b7fdf0c7ae4c",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "d48848b9-25b0-4423-8fcf-96a022ac571e",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "ea2aa187-40fd-4140-9742-453e691c4469",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "f27d0b27-24fd-4d8c-b003-d3d7aaba1e70",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "f3c18803-cbec-48e3-8f15-3c31f302d68b",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "f3e184b2-631a-47b2-b583-32ac2fec9e3c",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        },
+        {
+          "deviceId": "f4e0517a-d94f-4bd6-a464-222c8c413a66",
+          "profile": {},
+          "allowed": null,
+          "executionContext": "CLOUD"
+        }
+      ],
+      "profile": {
+        "id": "d77ba2f6-c377-36f5-bb68-15db9d1aa0e1"
+      },
+      "hub": {
+        "hubEui": "D052A872947A0001",
+        "firmwareVersion": "000.055.00005",
+        "hubDrivers": [
+          {
+            "driverVersion": "2025-01-19T15:05:25.835006968",
+            "driverId": "00425c55-0932-416f-a1ba-78fae98ab614",
+            "channelId": "c8bb99e1-04a3-426b-9d94-2d260134d624"
+          },
+          {
+            "driverVersion": "2024-12-17T18:00:36.611958104",
+            "driverId": "01976eca-e7ff-4d1b-91db-9c980ce668d7",
+            "channelId": "15ea8adc-8be7-4ea6-8b51-4155f56dc6cf"
+          },
+          {
+            "driverVersion": "2024-12-17T18:00:48.572636846",
+            "driverId": "0f206d13-508e-4342-9cbb-937e02489141",
+            "channelId": "15ea8adc-8be7-4ea6-8b51-4155f56dc6cf"
+          },
+          {
+            "driverVersion": "2024-12-17T18:00:07.735400483",
+            "driverId": "2cbf55e3-dbc2-48a2-8be5-4c3ce756b692",
+            "channelId": "b1373fea-da9b-434b-b674-6694ce5d08cc"
+          },
+          {
+            "driverVersion": "2024-11-04T22:39:17.976631549",
+            "driverId": "3fb97b6c-f481-441b-a14e-f270d738764e",
+            "channelId": "15ea8adc-8be7-4ea6-8b51-4155f56dc6cf"
+          },
+          {
+            "driverVersion": "2024-10-10T18:17:51.437710641",
+            "driverId": "408981c2-91d4-4dfc-bbfb-84ca0205d993",
+            "channelId": "15ea8adc-8be7-4ea6-8b51-4155f56dc6cf"
+          },
+          {
+            "driverVersion": "2024-10-10T18:17:35.032104982",
+            "driverId": "4eb5b19a-7bbc-452f-859b-c6d7d857b2da",
+            "channelId": "15ea8adc-8be7-4ea6-8b51-4155f56dc6cf"
+          },
+          {
+            "driverVersion": "2023-08-08T18:58:32.479650566",
+            "driverId": "4fb7ec02-2697-4d73-977d-2b1c65c4484f",
+            "channelId": "b1373fea-da9b-434b-b674-6694ce5d08cc"
+          },
+          {
+            "driverVersion": "2024-12-17T18:00:47.743217473",
+            "driverId": "572a2641-2af8-47e4-bfe5-ad83748fd7a1",
+            "channelId": "15ea8adc-8be7-4ea6-8b51-4155f56dc6cf"
+          },
+          {
+            "driverVersion": "2023-07-12T03:33:26.23424277",
+            "driverId": "5ad2cc83-5503-4040-a98b-b0fc9931b9fe",
+            "channelId": "479886db-f6f5-41dd-979c-9c5f9366f070"
+          },
+          {
+            "driverVersion": "2024-09-17T20:08:25.82515546",
+            "driverId": "5db3363a-d954-412f-93e0-2ee40572658b",
+            "channelId": "2423da55-101c-4b21-af58-0903656b85ca"
+          },
+          {
+            "driverVersion": "2024-12-08T10:10:03.832334965",
+            "driverId": "6342be70-6da0-4535-afc1-ff6378d6c650",
+            "channelId": "c8bb99e1-04a3-426b-9d94-2d260134d624"
+          },
+          {
+            "driverVersion": "2022-02-01T21:35:33.624882",
+            "driverId": "6a90f7a0-e275-4366-bbf2-2e8a502efc5d",
+            "channelId": "479886db-f6f5-41dd-979c-9c5f9366f070"
+          },
+          {
+            "driverVersion": "2024-09-28T21:56:32.002090649",
+            "driverId": "7333473f-722c-465d-9e5d-f3a6ca760489",
+            "channelId": "f8900c5e-d591-4979-9826-75a867e9e0bd"
+          },
+          {
+            "driverVersion": "2025-02-03T22:38:47.582952919",
+            "driverId": "7beb8bc2-8dfa-45c2-8fdb-7373d4597b12",
+            "channelId": "15ea8adc-8be7-4ea6-8b51-4155f56dc6cf"
+          },
+          {
+            "driverVersion": "2024-11-15T16:18:24.739596514",
+            "driverId": "7ca45ba9-7cfe-4547-b752-fe41a0efb848",
+            "channelId": "c8bb99e1-04a3-426b-9d94-2d260134d624"
+          },
+          {
+            "driverVersion": "2024-02-06T21:13:39.427465986",
+            "driverId": "8bf71a5d-677b-4391-93c2-e76471f3d7eb",
+            "channelId": "15ea8adc-8be7-4ea6-8b51-4155f56dc6cf"
+          },
+          {
+            "driverVersion": "2024-10-21T19:06:49.949052991",
+            "driverId": "9050ac53-358c-47a1-a927-9a70f5f28cee",
+            "channelId": "15ea8adc-8be7-4ea6-8b51-4155f56dc6cf"
+          },
+          {
+            "driverVersion": "2024-10-10T19:30:29.754256377",
+            "driverId": "92f39ab3-7b2f-47ee-94a7-ba47c4ee8a47",
+            "channelId": "b1373fea-da9b-434b-b674-6694ce5d08cc"
+          },
+          {
+            "driverVersion": "2024-12-17T18:00:21.846431345",
+            "driverId": "9870bccd-2b3d-4edf-8940-532fcb11e946",
+            "channelId": "b1373fea-da9b-434b-b674-6694ce5d08cc"
+          },
+          {
+            "driverVersion": "2024-12-09T21:10:00.424854506",
+            "driverId": "a6994e70-93de-4a76-8b5d-42971a3427c9",
+            "channelId": "c8bb99e1-04a3-426b-9d94-2d260134d624"
+          },
+          {
+            "driverVersion": "2022-01-03T08:19:45.80869",
+            "driverId": "a89371c4-8765-404b-9de9-e9882cc48bd8",
+            "channelId": "14bcc056-f80d-416b-9445-467b0db325e3"
+          },
+          {
+            "driverVersion": "2025-01-11T20:03:43.842469565",
+            "driverId": "b1504ded-efa4-4ef0-acd5-ae24e7a92e6e",
+            "channelId": "c8bb99e1-04a3-426b-9d94-2d260134d624"
+          },
+          {
+            "driverVersion": "2024-12-08T09:45:01.460678797",
+            "driverId": "bb1b3fd4-dcba-4d55-8d85-58ed7f1979fb",
+            "channelId": "c8bb99e1-04a3-426b-9d94-2d260134d624"
+          },
+          {
+            "driverVersion": "2024-11-04T22:39:18.253781754",
+            "driverId": "c21a6c77-872c-474e-be5b-5f6f11a240ef",
+            "channelId": "15ea8adc-8be7-4ea6-8b51-4155f56dc6cf"
+          },
+          {
+            "driverVersion": "2024-01-30T21:36:15.547412569",
+            "driverId": "c856a3fd-69ee-4478-a224-d7279b6d978f",
+            "channelId": "15ea8adc-8be7-4ea6-8b51-4155f56dc6cf"
+          },
+          {
+            "driverVersion": "2025-01-13T18:55:57.509807915",
+            "driverId": "cd898d81-6c27-4d27-a529-dfadc8caae5a",
+            "channelId": "15ea8adc-8be7-4ea6-8b51-4155f56dc6cf"
+          },
+          {
+            "driverVersion": "2024-12-17T18:00:48.892833142",
+            "driverId": "ce930ffd-8155-4dca-aaa9-6c4158fc4278",
+            "channelId": "15ea8adc-8be7-4ea6-8b51-4155f56dc6cf"
+          },
+          {
+            "driverVersion": "2024-10-10T19:30:41.208767469",
+            "driverId": "d620900d-f7bc-4ab5-a171-6dd159872f7d",
+            "channelId": "b1373fea-da9b-434b-b674-6694ce5d08cc"
+          },
+          {
+            "driverVersion": "2024-10-10T19:30:33.46670456",
+            "driverId": "d6b43c85-1561-446b-9e3e-15e2ad81a952",
+            "channelId": "b1373fea-da9b-434b-b674-6694ce5d08cc"
+          },
+          {
+            "driverVersion": "2023-07-11T18:43:49.169154271",
+            "driverId": "d9c3f8b8-c3c3-4b77-9ddd-01d08102c84b",
+            "channelId": "15ea8adc-8be7-4ea6-8b51-4155f56dc6cf"
+          },
+          {
+            "driverVersion": "2024-10-10T18:17:54.195543653",
+            "driverId": "dbe192cb-f6a1-4369-a843-d1c42e5c91ba",
+            "channelId": "15ea8adc-8be7-4ea6-8b51-4155f56dc6cf"
+          },
+          {
+            "driverVersion": "2022-10-02T20:15:49.147522379",
+            "driverId": "e120daf2-8000-4a9d-93fa-653214ce70d1",
+            "channelId": "479886db-f6f5-41dd-979c-9c5f9366f070"
+          },
+          {
+            "driverVersion": "2023-08-15T20:08:28.115440571",
+            "driverId": "e7947a05-947d-4bb5-92c4-2aafaff6d69c",
+            "channelId": "b1373fea-da9b-434b-b674-6694ce5d08cc"
+          },
+          {
+            "driverVersion": "2025-02-05T18:49:13.3338494",
+            "driverId": "f2e891c6-00cc-446c-9192-8ebda63d9898",
+            "channelId": "b1373fea-da9b-434b-b674-6694ce5d08cc"
+          }
+        ],
+        "hubData": {
+          "zwaveStaticDsk": "13740-14339-50623-49310-29679-58685-46457-16097",
+          "zwaveS2": true,
+          "hardwareType": "V2_HUB",
+          "hardwareId": "000D",
+          "zigbeeFirmware": "5.7.10",
+          "zigbee3": true,
+          "zigbeeOta": "ENABLED_WITH_LIGHTS",
+          "otaEnable": "true",
+          "zigbeeUnsecureRejoin": true,
+          "zigbeeRequiresExternalHardware": false,
+          "threadRequiresExternalHardware": false,
+          "failoverAvailability": "Unsupported",
+          "primarySupportAvailability": "Unsupported",
+          "secondarySupportAvailability": "Unsupported",
+          "zigbeeAvailability": "Available",
+          "zwaveAvailability": "Available",
+          "lanAvailability": "Available",
+          "matterAvailability": "Available",
+          "localVirtualDeviceAvailability": "Available",
+          "childDeviceAvailability": "Unsupported",
+          "edgeDriversAvailability": "Available",
+          "hubReplaceAvailability": "Available",
+          "hubLocalApiAvailability": "Available",
+          "zigbeeManualFirmwareUpdateSupported": true,
+          "matterRendezvousHedgeSupported": true,
+          "matterSoftwareComponentVersion": "1.3-0",
+          "matterDeviceDiagnosticsAvailability": "Available",
+          "zigbeeDeviceDiagnosticsAvailability": "Available",
+          "hedgeTlsCertificate": "",
+          "zigbeeChannel": "14",
+          "zigbeePanId": "0EE7",
+          "zigbeeEui": "D052A872947A0001",
+          "zigbeeNodeID": "0000",
+          "zwaveNodeID": "01",
+          "zwaveHomeID": "CF0F089E",
+          "zwaveSucID": "01",
+          "zwaveVersion": "6.10",
+          "zwaveRegion": "US",
+          "macAddress": "D0:52:A8:72:91:02",
+          "localIP": "192.168.168.189",
+          "zigbeeRadioFunctional": true,
+          "zwaveRadioFunctional": true,
+          "zigbeeRadioEnabled": true,
+          "zwaveRadioEnabled": true,
+          "zigbeeRadioDetected": true,
+          "zwaveRadioDetected": true
+        }
+      },
+      "type": "HUB",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    },
+    {
+      "deviceId": "374ba6fa-5a08-4ea2-969c-1fa43d86e21f",
+      "name": "Multipurpose Sensor",
+      "label": "Mail Box",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "c385e2bc-acb8-317b-be2a-6efd1f879720",
+      "deviceManufacturerCode": "SmartThings",
+      "locationId": "c4d3b2a1-09f8-765e-4d3c-2b1a09f8e7d6 ",
+      "ownerId": "d47f2b19-3a6e-4c8d-bf21-9e8a7c5d134e",
+      "roomId": "f7f39cf6-ff3a-4bcb-8d1b-00a3324c016d",
+      "components": [
+        {
+          "id": "main",
+          "label": "Mail Box",
+          "capabilities": [
+            {
+              "id": "contactSensor",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "threeAxis",
+              "version": 1
+            },
+            {
+              "id": "accelerationSensor",
+              "version": 1
+            },
+            {
+              "id": "battery",
+              "version": 1
+            },
+            {
+              "id": "firmwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "MultiFunctionalSensor",
+              "categoryType": "manufacturer"
+            },
+            {
+              "name": "MultiFunctionalSensor",
+              "categoryType": "user"
+            }
+          ]
+        }
+      ],
+      "createTime": "2022-08-16T21:08:09.983Z",
+      "parentDeviceId": "074fa784-8be8-4c70-8e22-6f5ed6f81b7e",
+      "profile": {
+        "id": "4471213f-121b-38fd-b022-51df37ac1d4c"
+      },
+      "zigbee": {
+        "eui": "24FD5B00010A3A95",
+        "networkId": "E71B",
+        "driverId": "408981c2-91d4-4dfc-bbfb-84ca0205d993",
+        "executingLocally": true,
+        "hubId": "074fa784-8be8-4c70-8e22-6f5ed6f81b7e",
+        "provisioningState": "PROVISIONED"
+      },
+      "type": "ZIGBEE",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "LOCAL"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/hue_color_temperature_bulb.json b/tests/components/smartthings/fixtures/devices/hue_color_temperature_bulb.json
new file mode 100644
index 00000000000..7f729001453
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/hue_color_temperature_bulb.json
@@ -0,0 +1,73 @@
+{
+  "items": [
+    {
+      "deviceId": "440063de-a200-40b5-8a6b-f3399eaa0370",
+      "name": "hue-color-temperature-bulb",
+      "label": "Bathroom spot",
+      "manufacturerName": "0A2r",
+      "presentationId": "ST_b93bec0e-1a81-4471-83fc-4dddca504acd",
+      "deviceManufacturerCode": "Signify Netherlands B.V.",
+      "locationId": "88a3a314-f0c8-40b4-bb44-44ba06c9c42f",
+      "ownerId": "12d4af93-cb68-b108-87f5-625437d7371f",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "colorTemperature",
+              "version": 1
+            },
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "switchLevel",
+              "version": 1
+            },
+            {
+              "id": "healthCheck",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "synthetic.lightingEffectCircadian",
+              "version": 1
+            },
+            {
+              "id": "synthetic.lightingEffectFade",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Light",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2023-12-17T18:11:41.453Z",
+      "profile": {
+        "id": "a79e4507-ecaa-3c7e-b660-a3a71f30eafb"
+      },
+      "viper": {
+        "uniqueIdentifier": "ea409b82a6184ad9b49bd6318692cc1c",
+        "manufacturerName": "Signify Netherlands B.V.",
+        "modelName": "Hue ambiance spot",
+        "swVersion": "1.122.2",
+        "hwVersion": "LTG002",
+        "endpointAppId": "viper_71ee45b0-a794-11e9-86b2-fdd6b9f75ce6"
+      },
+      "type": "VIPER",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/hue_rgbw_color_bulb.json b/tests/components/smartthings/fixtures/devices/hue_rgbw_color_bulb.json
new file mode 100644
index 00000000000..eeca03fec01
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/hue_rgbw_color_bulb.json
@@ -0,0 +1,81 @@
+{
+  "items": [
+    {
+      "deviceId": "cb958955-b015-498c-9e62-fc0c51abd054",
+      "name": "hue-rgbw-color-bulb",
+      "label": "Standing light",
+      "manufacturerName": "0A2r",
+      "presentationId": "ST_2733b8dc-4b0f-4593-8e49-2432202abd52",
+      "deviceManufacturerCode": "Signify Netherlands B.V.",
+      "locationId": "88a3a314-f0c8-40b4-bb44-44ba06c9c42f",
+      "ownerId": "12d4af93-cb68-b108-87f5-625437d7371f",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "colorControl",
+              "version": 1
+            },
+            {
+              "id": "colorTemperature",
+              "version": 1
+            },
+            {
+              "id": "switchLevel",
+              "version": 1
+            },
+            {
+              "id": "healthCheck",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "samsungim.hueSyncMode",
+              "version": 1
+            },
+            {
+              "id": "synthetic.lightingEffectCircadian",
+              "version": 1
+            },
+            {
+              "id": "synthetic.lightingEffectFade",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Light",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2023-12-17T18:11:41.454Z",
+      "profile": {
+        "id": "71be1b96-c5b5-38f7-a22c-65f5392ce7ed"
+      },
+      "viper": {
+        "uniqueIdentifier": "f5f891a57b9d45408230b4228bdc2111",
+        "manufacturerName": "Signify Netherlands B.V.",
+        "modelName": "Hue color lamp",
+        "swVersion": "1.122.2",
+        "hwVersion": "LCA001",
+        "endpointAppId": "viper_71ee45b0-a794-11e9-86b2-fdd6b9f75ce6"
+      },
+      "type": "VIPER",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/hw_q80r_soundbar.json b/tests/components/smartthings/fixtures/devices/hw_q80r_soundbar.json
new file mode 100644
index 00000000000..5f99cefddcb
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/hw_q80r_soundbar.json
@@ -0,0 +1,106 @@
+{
+  "items": [
+    {
+      "deviceId": "afcf3b91-0000-1111-2222-ddff2a0a6577",
+      "name": "[AV] Samsung Soundbar Q80R",
+      "label": "Soundbar",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "VD-NetworkAudio-001S",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "c7f8e400-0000-1111-2222-76463f4eb484",
+      "ownerId": "bd0d9288-0000-1111-2222-68310a42a709",
+      "roomId": "be09ff51-0000-1111-2222-e48e2dab37fd",
+      "deviceTypeName": "Samsung OCF Network Audio Player",
+      "components": [
+        {
+          "id": "main",
+          "label": "Soundbar",
+          "capabilities": [
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "audioVolume",
+              "version": 1
+            },
+            {
+              "id": "audioMute",
+              "version": 1
+            },
+            {
+              "id": "audioTrackData",
+              "version": 1
+            },
+            {
+              "id": "mediaInputSource",
+              "version": 1
+            },
+            {
+              "id": "samsungvd.audioInputSource",
+              "version": 1
+            },
+            {
+              "id": "mediaPlayback",
+              "version": 1
+            },
+            {
+              "id": "audioNotification",
+              "version": 1
+            },
+            {
+              "id": "samsungvd.groupInfo",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "NetworkAudio",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2020-10-19T01:35:08Z",
+      "profile": {
+        "id": "c1036d88-000-1111-2222-a361463fd53f"
+      },
+      "ocf": {
+        "ocfDeviceType": "oic.d.networkaudio",
+        "name": "[AV] Samsung Soundbar Q80R",
+        "specVersion": "core.1.1.0",
+        "verticalDomainSpecVersion": "res.1.1.0,sh.1.1.0",
+        "manufacturerName": "Samsung Electronics",
+        "modelNumber": "Q80R",
+        "platformVersion": "Tizen 4.0",
+        "platformOS": "4.1.10",
+        "hwVersion": "0-0",
+        "firmwareVersion": "HW-Q80RWWB-1012.6",
+        "vendorId": "VD-NetworkAudio-001S",
+        "vendorResourceClientServerVersion": "1.2",
+        "locale": "KO",
+        "lastSignupTime": "2021-01-16T07:05:02.184545Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": null,
+      "executionContext": "CLOUD",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/ikea_kadrilj.json b/tests/components/smartthings/fixtures/devices/ikea_kadrilj.json
new file mode 100644
index 00000000000..36f9d40f7e4
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/ikea_kadrilj.json
@@ -0,0 +1,78 @@
+{
+  "items": [
+    {
+      "deviceId": "71afed1c-006d-4e48-b16e-e7f88f9fd638",
+      "name": "window-treatment-battery",
+      "label": "Kitchen IKEA KADRILJ Window blind",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "fa41d7d3-4c03-327f-b0ce-2edc829f0e34",
+      "deviceManufacturerCode": "IKEA of Sweden",
+      "locationId": "5b5f96b5-0286-4f4a-86ef-d5d5c1a78cb8",
+      "ownerId": "f43fd9e5-2ecd-4aae-aeac-73a8e5cb04da",
+      "roomId": "89f675a1-1f16-451c-8ab1-a7fdacc5852d",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "windowShade",
+              "version": 1
+            },
+            {
+              "id": "windowShadePreset",
+              "version": 1
+            },
+            {
+              "id": "windowShadeLevel",
+              "version": 1
+            },
+            {
+              "id": "battery",
+              "version": 1
+            },
+            {
+              "id": "firmwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Blind",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2023-04-26T18:19:06.792Z",
+      "parentDeviceId": "3ffe04c4-a12c-41f5-b83d-c1b28eca2b5f",
+      "profile": {
+        "id": "6d9804bc-9e56-3823-95be-4b315669c481"
+      },
+      "zigbee": {
+        "eui": "000D6FFFFE2AD0E7",
+        "networkId": "3009",
+        "driverId": "46b8bada-1a55-4f84-8915-47ce2cad3621",
+        "executingLocally": true,
+        "hubId": "3ffe04c4-a12c-41f5-b83d-c1b28eca2b5f",
+        "provisioningState": "NONFUNCTIONAL"
+      },
+      "type": "ZIGBEE",
+      "restrictionTier": 0,
+      "allowed": null,
+      "indoorMap": {
+        "coordinates": [10.0, 36.0, 98.0],
+        "rotation": [270.0, 0.0, 0.0],
+        "visible": true,
+        "data": null
+      },
+      "executionContext": "LOCAL",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/im_speaker_ai_0001.json b/tests/components/smartthings/fixtures/devices/im_speaker_ai_0001.json
new file mode 100644
index 00000000000..81fb1b07ff2
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/im_speaker_ai_0001.json
@@ -0,0 +1,136 @@
+{
+  "items": [
+    {
+      "deviceId": "c9276e43-fe3c-88c3-1dcc-2eb79e292b8c",
+      "name": "Galaxy Home Mini (MQVL)",
+      "label": "Galaxy Home Mini",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "IM-SPEAKER-AI-0001",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "33db9e71-abe9-43a0-acd3-3f0927bbe5b7",
+      "ownerId": "9a1ee192-04ba-46ca-9c3d-196d8dbcf807",
+      "roomId": "445c006d-1796-4dd6-8308-1c3cd045e8ff",
+      "deviceTypeName": "Samsung OCF Network Audio Player",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "audioMute",
+              "version": 1
+            },
+            {
+              "id": "audioVolume",
+              "version": 1
+            },
+            {
+              "id": "mediaInputSource",
+              "version": 1
+            },
+            {
+              "id": "mediaPlaybackRepeat",
+              "version": 1
+            },
+            {
+              "id": "mediaPlaybackShuffle",
+              "version": 1
+            },
+            {
+              "id": "mediaPlayback",
+              "version": 1
+            },
+            {
+              "id": "mediaTrackControl",
+              "version": 1
+            },
+            {
+              "id": "audioTrackAddressing",
+              "version": 1
+            },
+            {
+              "id": "audioTrackData",
+              "version": 1
+            },
+            {
+              "id": "musicPlayer",
+              "version": 1
+            },
+            {
+              "id": "audioNotification",
+              "version": 1
+            },
+            {
+              "id": "speechSynthesis",
+              "version": 1
+            },
+            {
+              "id": "samsungim.bixbyContent",
+              "version": 1
+            },
+            {
+              "id": "samsungim.announcement",
+              "version": 1
+            },
+            {
+              "id": "samsungim.networkAudioMode",
+              "version": 1
+            },
+            {
+              "id": "samsungim.networkAudioGroupInfo",
+              "version": 1
+            },
+            {
+              "id": "samsungim.networkAudioTrackData",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "NetworkAudio",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2025-03-08T12:06:18.865Z",
+      "profile": {
+        "id": "09df8e36-e94f-339c-9086-9639505e1fb2"
+      },
+      "ocf": {
+        "ocfDeviceType": "oic.d.networkaudio",
+        "name": "Galaxy Home Mini (MQVL)",
+        "specVersion": "core0.0.1",
+        "verticalDomainSpecVersion": "IoTivity1.2.1",
+        "manufacturerName": "Samsung Electronics",
+        "modelNumber": "SM-V310",
+        "platformVersion": "4.0.0.1",
+        "platformOS": "Tizen",
+        "hwVersion": "1.0",
+        "firmwareVersion": "V310XXU1AWK1",
+        "vendorId": "IM-SPEAKER-AI-0001",
+        "lastSignupTime": "2025-03-08T12:06:16.386696652Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": null,
+      "executionContext": "CLOUD",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/iphone.json b/tests/components/smartthings/fixtures/devices/iphone.json
new file mode 100644
index 00000000000..1ae79aa06ef
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/iphone.json
@@ -0,0 +1,40 @@
+{
+  "items": [
+    {
+      "deviceId": "184c67cc-69e2-44b6-8f73-55c963068ad9",
+      "name": "iPhone",
+      "label": "iPhone",
+      "manufacturerName": "SmartThings",
+      "presentationId": "SmartThings-smartthings-Mobile_Presence",
+      "locationId": "c4d3b2a1-09f8-765e-4d3c-2b1a09f8e7d6 ",
+      "ownerId": "d47f2b19-3a6e-4c8d-bf21-9e8a7c5d134e",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "presenceSensor",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "MobilePresence",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2021-12-02T16:14:24.394Z",
+      "profile": {
+        "id": "21d0f660-98b4-3f7b-8114-fe62e555628e"
+      },
+      "type": "MOBILE",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/multipurpose_sensor.json b/tests/components/smartthings/fixtures/devices/multipurpose_sensor.json
new file mode 100644
index 00000000000..c8088d6473d
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/multipurpose_sensor.json
@@ -0,0 +1,77 @@
+{
+  "items": [
+    {
+      "deviceId": "7d246592-93db-4d72-a10d-5a51793ece8c",
+      "name": "Multipurpose Sensor",
+      "label": "Deck Door",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "c385e2bc-acb8-317b-be2a-6efd1f879720",
+      "deviceManufacturerCode": "SmartThings",
+      "locationId": "c4d3b2a1-09f8-765e-4d3c-2b1a09f8e7d6 ",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "components": [
+        {
+          "id": "main",
+          "label": "Deck Door",
+          "capabilities": [
+            {
+              "id": "contactSensor",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "threeAxis",
+              "version": 1
+            },
+            {
+              "id": "accelerationSensor",
+              "version": 1
+            },
+            {
+              "id": "battery",
+              "version": 1
+            },
+            {
+              "id": "firmwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "MultiFunctionalSensor",
+              "categoryType": "manufacturer"
+            },
+            {
+              "name": "Door",
+              "categoryType": "user"
+            }
+          ]
+        }
+      ],
+      "createTime": "2019-02-23T16:53:57Z",
+      "profile": {
+        "id": "4471213f-121b-38fd-b022-51df37ac1d4c"
+      },
+      "zigbee": {
+        "eui": "24FD5B00010AED6B",
+        "networkId": "C972",
+        "driverId": "408981c2-91d4-4dfc-bbfb-84ca0205d993",
+        "executingLocally": true,
+        "hubId": "074fa784-8be8-4c70-8e22-6f5ed6f81b7e",
+        "provisioningState": "PROVISIONED"
+      },
+      "type": "ZIGBEE",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "LOCAL"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/sensibo_airconditioner_1.json b/tests/components/smartthings/fixtures/devices/sensibo_airconditioner_1.json
new file mode 100644
index 00000000000..ae6596755a3
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/sensibo_airconditioner_1.json
@@ -0,0 +1,64 @@
+{
+  "items": [
+    {
+      "deviceId": "bf4b1167-48a3-4af7-9186-0900a678ffa5",
+      "name": "sensibo-airconditioner-1",
+      "label": "Office",
+      "manufacturerName": "0ABU",
+      "presentationId": "sensibo-airconditioner-1",
+      "deviceManufacturerCode": "Sensibo",
+      "locationId": "fe14085e-bacb-4997-bc0c-df08204eaea2",
+      "ownerId": "49228038-22ca-1c78-d7ab-b774b4569480",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "thermostatCoolingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "airConditionerMode",
+              "version": 1
+            },
+            {
+              "id": "healthCheck",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "AirConditioner",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2024-12-04T10:10:02.873Z",
+      "profile": {
+        "id": "ddaffb28-8ebb-4bd6-9d6f-57c28dcb434d"
+      },
+      "viper": {
+        "manufacturerName": "Sensibo",
+        "modelName": "skyplus",
+        "swVersion": "SKY40147",
+        "hwVersion": "SKY40147",
+        "endpointAppId": "viper_5661d200-806e-11e9-abe0-3b2f83c8954c"
+      },
+      "type": "VIPER",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/smart_plug.json b/tests/components/smartthings/fixtures/devices/smart_plug.json
new file mode 100644
index 00000000000..e5ec6c38dad
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/smart_plug.json
@@ -0,0 +1,58 @@
+{
+  "items": [
+    {
+      "deviceId": "550a1c72-65a0-4d55-b97b-75168e055398",
+      "name": "SYLVANIA SMART+ Smart Plug",
+      "label": "Arlo Beta Basestation",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "28127039-043b-3df0-adf2-7541403dc4c1",
+      "deviceManufacturerCode": "LEDVANCE",
+      "locationId": "c4d3b2a1-09f8-765e-4d3c-2b1a09f8e7d6 ",
+      "ownerId": "d47f2b19-3a6e-4c8d-bf21-9e8a7c5d134e",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "components": [
+        {
+          "id": "main",
+          "label": "Pi Hole",
+          "capabilities": [
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "firmwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Switch",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2018-10-05T12:23:14Z",
+      "profile": {
+        "id": "daeff874-075a-32e3-8b11-bdb99d8e67c7"
+      },
+      "zigbee": {
+        "eui": "F0D1B80000051E05",
+        "networkId": "801E",
+        "driverId": "f2e891c6-00cc-446c-9192-8ebda63d9898",
+        "executingLocally": true,
+        "hubId": "074fa784-8be8-4c70-8e22-6f5ed6f81b7e",
+        "provisioningState": "PROVISIONED"
+      },
+      "type": "ZIGBEE",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "LOCAL"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/sonos_player.json b/tests/components/smartthings/fixtures/devices/sonos_player.json
new file mode 100644
index 00000000000..c84caf57475
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/sonos_player.json
@@ -0,0 +1,81 @@
+{
+  "items": [
+    {
+      "deviceId": "c85fced9-c474-4a47-93c2-037cc7829536",
+      "name": "sonos-player",
+      "label": "Elliots Rum",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "ef0a871d-9ed1-377d-8746-0da1dfd50598",
+      "deviceManufacturerCode": "Sonos",
+      "locationId": "eed0e167-e793-459b-80cb-a0b02e2b86c2",
+      "ownerId": "2c69cc36-85ae-c41a-9981-a4ee96cd9137",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "mediaPlayback",
+              "version": 1
+            },
+            {
+              "id": "mediaGroup",
+              "version": 1
+            },
+            {
+              "id": "mediaPresets",
+              "version": 1
+            },
+            {
+              "id": "mediaTrackControl",
+              "version": 1
+            },
+            {
+              "id": "audioMute",
+              "version": 1
+            },
+            {
+              "id": "audioNotification",
+              "version": 1
+            },
+            {
+              "id": "audioTrackData",
+              "version": 1
+            },
+            {
+              "id": "audioVolume",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Speaker",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2025-02-02T13:18:28.570Z",
+      "profile": {
+        "id": "0443d359-3f76-383f-82a4-6fc4a879ef1d"
+      },
+      "lan": {
+        "networkId": "38420B9108F6",
+        "driverId": "c21a6c77-872c-474e-be5b-5f6f11a240ef",
+        "executingLocally": true,
+        "hubId": "2f7f7d2b-e683-48ae-86f7-e57df6a0bce2",
+        "provisioningState": "TYPED"
+      },
+      "type": "LAN",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "LOCAL"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/tplink_p110.json b/tests/components/smartthings/fixtures/devices/tplink_p110.json
new file mode 100644
index 00000000000..ffe7de5ff68
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/tplink_p110.json
@@ -0,0 +1,73 @@
+{
+  "items": [
+    {
+      "deviceId": "6602696a-1e48-49e4-919f-69406f5b5da1",
+      "name": "plug-energy-usage-report",
+      "label": "Sp\u00fclmaschine",
+      "manufacturerName": "0AI2",
+      "presentationId": "ST_8f2be0ec-1113-46e0-ad56-3e92eb27410f",
+      "deviceManufacturerCode": "TP-Link",
+      "locationId": "70da36b0-bd25-410c-beed-7f0dbf658448",
+      "ownerId": "be5d4173-dd49-1eee-56f5-f98306ee872c",
+      "roomId": "bd13616d-b7e2-44ff-914c-eb38ea18c4b4",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "healthCheck",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "powerConsumptionReport",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "SmartPlug",
+              "categoryType": "manufacturer"
+            },
+            {
+              "name": "SmartPlug",
+              "categoryType": "user"
+            }
+          ]
+        }
+      ],
+      "createTime": "2024-03-07T21:14:59.762Z",
+      "profile": {
+        "id": "a25b207e-cbb9-40ae-8a88-906637c22ab6"
+      },
+      "viper": {
+        "uniqueIdentifier": "8022F7F6FE0A6EACA52B5D89C0D667352136D8C6",
+        "manufacturerName": "TP-Link",
+        "modelName": "P110",
+        "swVersion": "1.3.1 Build 240621 Rel.162048",
+        "hwVersion": "1.0",
+        "endpointAppId": "viper_7ea6bb80-b876-11eb-be42-952f31ab3f7b"
+      },
+      "type": "VIPER",
+      "restrictionTier": 0,
+      "allowed": null,
+      "indoorMap": {
+        "coordinates": [0.0, 0.0, 0.0],
+        "rotation": [0.0, 180.0, 0.0],
+        "visible": false,
+        "data": null
+      },
+      "executionContext": "CLOUD",
+      "relationships": []
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/vd_network_audio_002s.json b/tests/components/smartthings/fixtures/devices/vd_network_audio_002s.json
new file mode 100644
index 00000000000..20f4aa71fec
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/vd_network_audio_002s.json
@@ -0,0 +1,109 @@
+{
+  "items": [
+    {
+      "deviceId": "0d94e5db-8501-2355-eb4f-214163702cac",
+      "name": "Soundbar",
+      "label": "Soundbar Living",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "VD-NetworkAudio-002S",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "c4189ac1-208f-461a-8ab6-ea67937b3743",
+      "ownerId": "85ea07e1-7063-f673-3ba5-125293f297c8",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "deviceTypeName": "Samsung OCF Network Audio Player",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "audioVolume",
+              "version": 1
+            },
+            {
+              "id": "audioMute",
+              "version": 1
+            },
+            {
+              "id": "audioTrackData",
+              "version": 1
+            },
+            {
+              "id": "samsungvd.audioInputSource",
+              "version": 1
+            },
+            {
+              "id": "mediaPlayback",
+              "version": 1
+            },
+            {
+              "id": "audioNotification",
+              "version": 1
+            },
+            {
+              "id": "samsungvd.soundFrom",
+              "version": 1
+            },
+            {
+              "id": "samsungvd.thingStatus",
+              "version": 1
+            },
+            {
+              "id": "samsungvd.audioGroupInfo",
+              "version": 1,
+              "ephemeral": true
+            }
+          ],
+          "categories": [
+            {
+              "name": "NetworkAudio",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2024-10-26T02:58:40.549Z",
+      "profile": {
+        "id": "3a714028-20ea-3feb-9891-46092132c737"
+      },
+      "ocf": {
+        "ocfDeviceType": "oic.d.networkaudio",
+        "name": "Soundbar Living",
+        "specVersion": "core.1.1.0",
+        "verticalDomainSpecVersion": "res.1.1.0,sh.1.1.0",
+        "manufacturerName": "Samsung Electronics",
+        "modelNumber": "HW-Q990C",
+        "platformVersion": "7.0",
+        "platformOS": "Tizen",
+        "hwVersion": "",
+        "firmwareVersion": "SAT-iMX8M23WWC-1010.5",
+        "vendorId": "VD-NetworkAudio-002S",
+        "vendorResourceClientServerVersion": "3.2.41",
+        "lastSignupTime": "2024-10-26T02:58:36.491256384Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/vd_sensor_light_2023.json b/tests/components/smartthings/fixtures/devices/vd_sensor_light_2023.json
new file mode 100644
index 00000000000..ef1dd2e96bc
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/vd_sensor_light_2023.json
@@ -0,0 +1,81 @@
+{
+  "items": [
+    {
+      "deviceId": "5cc1c096-98b9-460c-8f1c-1045509ec605",
+      "name": "VD-Sensor.Light-2023",
+      "label": "Light Sensor - 55\" The Frame",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "VD-Sensor.Light-2023",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "df59873c-4e2c-43ba-bcd4-ade4efb0504a",
+      "ownerId": "71254e90-c144-45b6-aabe-709f78f48376",
+      "roomId": "8a4fac38-48d1-4a8c-922b-92620442363b",
+      "deviceTypeName": "x.com.st.d.sensor.light",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "relativeBrightness",
+              "version": 1
+            },
+            {
+              "id": "samsungvd.deviceCategory",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "LightSensor",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2024-11-15T22:21:27.908Z",
+      "parentDeviceId": "425ac77a-f7c9-a62d-ff12-cdad144952e3",
+      "profile": {
+        "id": "5f1633fb-0c63-34d3-9d04-a314d393d225"
+      },
+      "ocf": {
+        "ocfDeviceType": "x.com.st.d.sensor.light",
+        "name": "Light Sensor - 55 The Frame",
+        "specVersion": "core.1.1.0",
+        "verticalDomainSpecVersion": "res.1.1.0,sh.1.1.0",
+        "manufacturerName": "Samsung Electronics",
+        "modelNumber": "QE55LS03DAUXXN",
+        "platformVersion": "8.0",
+        "platformOS": "Tizen",
+        "hwVersion": "",
+        "firmwareVersion": "latest",
+        "vendorId": "VD-Sensor.Light-2023",
+        "vendorResourceClientServerVersion": "4.0.26",
+        "lastSignupTime": "2024-11-15T22:21:27.933740026Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/vd_stv_2017_k.json b/tests/components/smartthings/fixtures/devices/vd_stv_2017_k.json
new file mode 100644
index 00000000000..42630f452d5
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/vd_stv_2017_k.json
@@ -0,0 +1,148 @@
+{
+  "items": [
+    {
+      "deviceId": "4588d2d9-a8cf-40f4-9a0b-ed5dfbaccda1",
+      "name": "[TV] Samsung 8 Series (49)",
+      "label": "[TV] Samsung 8 Series (49)",
+      "manufacturerName": "Samsung Electronics",
+      "presentationId": "VD-STV_2017_K",
+      "deviceManufacturerCode": "Samsung Electronics",
+      "locationId": "c4d3b2a1-09f8-765e-4d3c-2b1a09f8e7d6 ",
+      "ownerId": "d47f2b19-3a6e-4c8d-bf21-9e8a7c5d134e",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "deviceTypeName": "Samsung OCF TV",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "ocf",
+              "version": 1
+            },
+            {
+              "id": "switch",
+              "version": 1
+            },
+            {
+              "id": "audioVolume",
+              "version": 1
+            },
+            {
+              "id": "audioMute",
+              "version": 1
+            },
+            {
+              "id": "tvChannel",
+              "version": 1
+            },
+            {
+              "id": "mediaInputSource",
+              "version": 1
+            },
+            {
+              "id": "mediaPlayback",
+              "version": 1
+            },
+            {
+              "id": "mediaTrackControl",
+              "version": 1
+            },
+            {
+              "id": "custom.error",
+              "version": 1
+            },
+            {
+              "id": "custom.picturemode",
+              "version": 1
+            },
+            {
+              "id": "custom.soundmode",
+              "version": 1
+            },
+            {
+              "id": "custom.accessibility",
+              "version": 1
+            },
+            {
+              "id": "custom.launchapp",
+              "version": 1
+            },
+            {
+              "id": "custom.recording",
+              "version": 1
+            },
+            {
+              "id": "custom.tvsearch",
+              "version": 1
+            },
+            {
+              "id": "custom.disabledCapabilities",
+              "version": 1
+            },
+            {
+              "id": "samsungvd.ambient",
+              "version": 1
+            },
+            {
+              "id": "samsungvd.ambientContent",
+              "version": 1
+            },
+            {
+              "id": "samsungvd.mediaInputSource",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            },
+            {
+              "id": "execute",
+              "version": 1
+            },
+            {
+              "id": "samsungvd.firmwareVersion",
+              "version": 1
+            },
+            {
+              "id": "samsungvd.supportsPowerOnByOcf",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Television",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2020-05-07T02:58:10Z",
+      "profile": {
+        "id": "bac5c673-8eea-3d00-b1d2-283b46539017"
+      },
+      "ocf": {
+        "ocfDeviceType": "oic.d.tv",
+        "name": "[TV] Samsung 8 Series (49)",
+        "specVersion": "core.1.1.0",
+        "verticalDomainSpecVersion": "res.1.1.0,sh.1.1.0",
+        "manufacturerName": "Samsung Electronics",
+        "modelNumber": "UN49MU8000",
+        "platformVersion": "Tizen 3.0",
+        "platformOS": "4.1.10",
+        "hwVersion": "0-0",
+        "firmwareVersion": "T-KTMAKUC-1290.3",
+        "vendorId": "VD-STV_2017_K",
+        "locale": "en_US",
+        "lastSignupTime": "2021-08-21T18:52:56.748359Z",
+        "transferCandidate": false,
+        "additionalAuthCodeRequired": false
+      },
+      "type": "OCF",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/virtual_thermostat.json b/tests/components/smartthings/fixtures/devices/virtual_thermostat.json
new file mode 100644
index 00000000000..1b7a55d779d
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/virtual_thermostat.json
@@ -0,0 +1,69 @@
+{
+  "items": [
+    {
+      "deviceId": "2894dc93-0f11-49cc-8a81-3a684cebebf6",
+      "name": "asd",
+      "label": "asd",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "78906115-bf23-3c43-9cd6-f42ca3d5517a",
+      "locationId": "88a3a314-f0c8-40b4-bb44-44ba06c9c42f",
+      "ownerId": "12d4af93-cb68-b108-87f5-625437d7371f",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "thermostatHeatingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "thermostatCoolingSetpoint",
+              "version": 1
+            },
+            {
+              "id": "thermostatOperatingState",
+              "version": 1
+            },
+            {
+              "id": "temperatureMeasurement",
+              "version": 1
+            },
+            {
+              "id": "thermostatMode",
+              "version": 1
+            },
+            {
+              "id": "thermostatFanMode",
+              "version": 1
+            },
+            {
+              "id": "battery",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "Thermostat",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2025-02-10T22:04:56.174Z",
+      "profile": {
+        "id": "e921d7f2-5851-363d-89d5-5e83f5ab44c6"
+      },
+      "virtual": {
+        "name": "asd",
+        "executingLocally": false
+      },
+      "type": "VIRTUAL",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/virtual_valve.json b/tests/components/smartthings/fixtures/devices/virtual_valve.json
new file mode 100644
index 00000000000..e46b7846631
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/virtual_valve.json
@@ -0,0 +1,49 @@
+{
+  "items": [
+    {
+      "deviceId": "612ab3c2-3bb0-48f7-b2c0-15b169cb2fc3",
+      "name": "volvo",
+      "label": "volvo",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "916408b6-c94e-38b8-9fbf-03c8a48af5c3",
+      "locationId": "88a3a314-f0c8-40b4-bb44-44ba06c9c42f",
+      "ownerId": "12d4af93-cb68-b108-87f5-625437d7371f",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "valve",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "WaterValve",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2025-02-11T11:27:02.052Z",
+      "profile": {
+        "id": "f8e25992-7f5d-31da-b04d-497012590113"
+      },
+      "virtual": {
+        "name": "volvo",
+        "executingLocally": false
+      },
+      "type": "VIRTUAL",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/virtual_water_sensor.json b/tests/components/smartthings/fixtures/devices/virtual_water_sensor.json
new file mode 100644
index 00000000000..ffea2664c88
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/virtual_water_sensor.json
@@ -0,0 +1,53 @@
+{
+  "items": [
+    {
+      "deviceId": "a2a6018b-2663-4727-9d1d-8f56953b5116",
+      "name": "asd",
+      "label": "asd",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "838ae989-b832-3610-968c-2940491600f6",
+      "locationId": "88a3a314-f0c8-40b4-bb44-44ba06c9c42f",
+      "ownerId": "12d4af93-cb68-b108-87f5-625437d7371f",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "components": [
+        {
+          "id": "main",
+          "label": "main",
+          "capabilities": [
+            {
+              "id": "waterSensor",
+              "version": 1
+            },
+            {
+              "id": "battery",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "LeakSensor",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2025-02-10T21:58:18.688Z",
+      "profile": {
+        "id": "39230a95-d42d-34d4-a33c-f79573495a30"
+      },
+      "virtual": {
+        "name": "asd",
+        "executingLocally": false
+      },
+      "type": "VIRTUAL",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "CLOUD"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/devices/yale_push_button_deadbolt_lock.json b/tests/components/smartthings/fixtures/devices/yale_push_button_deadbolt_lock.json
new file mode 100644
index 00000000000..20f0dd5ca26
--- /dev/null
+++ b/tests/components/smartthings/fixtures/devices/yale_push_button_deadbolt_lock.json
@@ -0,0 +1,66 @@
+{
+  "items": [
+    {
+      "deviceId": "a9f587c5-5d8b-4273-8907-e7f609af5158",
+      "name": "Yale Push Button Deadbolt Lock",
+      "label": "Basement Door Lock",
+      "manufacturerName": "SmartThingsCommunity",
+      "presentationId": "45f9424f-4e20-34b0-abb6-5f26b189acb0",
+      "deviceManufacturerCode": "Yale",
+      "locationId": "c4d3b2a1-09f8-765e-4d3c-2b1a09f8e7d6 ",
+      "ownerId": "d47f2b19-3a6e-4c8d-bf21-9e8a7c5d134e",
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "components": [
+        {
+          "id": "main",
+          "label": "Basement Door Lock",
+          "capabilities": [
+            {
+              "id": "lock",
+              "version": 1
+            },
+            {
+              "id": "lockCodes",
+              "version": 1
+            },
+            {
+              "id": "battery",
+              "version": 1
+            },
+            {
+              "id": "firmwareUpdate",
+              "version": 1
+            },
+            {
+              "id": "refresh",
+              "version": 1
+            }
+          ],
+          "categories": [
+            {
+              "name": "SmartLock",
+              "categoryType": "manufacturer"
+            }
+          ]
+        }
+      ],
+      "createTime": "2016-11-18T23:01:19Z",
+      "profile": {
+        "id": "51b76691-3c3a-3fce-8c7c-4f9d50e5885a"
+      },
+      "zigbee": {
+        "eui": "000D6F0002FB6E24",
+        "networkId": "C771",
+        "driverId": "ce930ffd-8155-4dca-aaa9-6c4158fc4278",
+        "executingLocally": true,
+        "hubId": "074fa784-8be8-4c70-8e22-6f5ed6f81b7e",
+        "provisioningState": "PROVISIONED"
+      },
+      "type": "ZIGBEE",
+      "restrictionTier": 0,
+      "allowed": [],
+      "executionContext": "LOCAL"
+    }
+  ],
+  "_links": {}
+}
diff --git a/tests/components/smartthings/fixtures/locations.json b/tests/components/smartthings/fixtures/locations.json
new file mode 100644
index 00000000000..abfa17dc4b7
--- /dev/null
+++ b/tests/components/smartthings/fixtures/locations.json
@@ -0,0 +1,9 @@
+{
+  "items": [
+    {
+      "locationId": "397678e5-9995-4a39-9d9f-ae6ba310236c",
+      "name": "Home"
+    }
+  ],
+  "_links": null
+}
diff --git a/tests/components/smartthings/fixtures/rooms.json b/tests/components/smartthings/fixtures/rooms.json
new file mode 100644
index 00000000000..355db9a3423
--- /dev/null
+++ b/tests/components/smartthings/fixtures/rooms.json
@@ -0,0 +1,17 @@
+{
+  "items": [
+    {
+      "roomId": "7715151d-0314-457a-a82c-5ce48900e065",
+      "locationId": "397678e5-9995-4a39-9d9f-ae6ba310236b",
+      "name": "Theater",
+      "backgroundImage": null
+    },
+    {
+      "roomId": "cdf080f0-0542-41d7-a606-aff69683e04c",
+      "locationId": "397678e5-9995-4a39-9d9f-ae6ba310236b",
+      "name": "Toilet",
+      "backgroundImage": null
+    }
+  ],
+  "_links": null
+}
diff --git a/tests/components/smartthings/fixtures/scenes.json b/tests/components/smartthings/fixtures/scenes.json
new file mode 100644
index 00000000000..aa4f1aaa3d1
--- /dev/null
+++ b/tests/components/smartthings/fixtures/scenes.json
@@ -0,0 +1,34 @@
+{
+  "items": [
+    {
+      "sceneId": "743b0f37-89b8-476c-aedf-eea8ad8cd29d",
+      "sceneName": "Away",
+      "sceneIcon": "203",
+      "sceneColor": null,
+      "locationId": "88a3a314-f0c8-40b4-bb44-44ba06c9c42f",
+      "createdBy": "12d4af93-cb68-b108-87f5-625437d7371f",
+      "createdDate": 1738964737000,
+      "lastUpdatedDate": 1738964737000,
+      "lastExecutedDate": null,
+      "editable": false,
+      "apiVersion": "20200501"
+    },
+    {
+      "sceneId": "f3341e8b-9b32-4509-af2e-4f7c952e98ba",
+      "sceneName": "Home",
+      "sceneIcon": "204",
+      "sceneColor": null,
+      "locationId": "88a3a314-f0c8-40b4-bb44-44ba06c9c42f",
+      "createdBy": "12d4af93-cb68-b108-87f5-625437d7371f",
+      "createdDate": 1738964731000,
+      "lastUpdatedDate": 1738964731000,
+      "lastExecutedDate": null,
+      "editable": false,
+      "apiVersion": "20200501"
+    }
+  ],
+  "_links": {
+    "next": null,
+    "previous": null
+  }
+}
diff --git a/tests/components/smartthings/fixtures/subscription.json b/tests/components/smartthings/fixtures/subscription.json
new file mode 100644
index 00000000000..80f37445524
--- /dev/null
+++ b/tests/components/smartthings/fixtures/subscription.json
@@ -0,0 +1,16 @@
+{
+  "subscriptionId": "f5768ce8-c9e5-4507-9020-912c0c60e0ab",
+  "registrationUrl": "https://spigot-regional.api.smartthings.com/filters/f5768ce8-c9e5-4507-9020-912c0c60e0ab/activate?filterRegion=eu-west-1",
+  "name": "My Home Assistant sub",
+  "version": 20250122,
+  "subscriptionFilters": [
+    {
+      "type": "LOCATIONIDS",
+      "value": ["88a3a314-f0c8-40b4-bb44-44ba06c9c42e"],
+      "eventType": ["DEVICE_EVENT"],
+      "attribute": null,
+      "capability": null,
+      "component": null
+    }
+  ]
+}
diff --git a/tests/components/smartthings/snapshots/test_binary_sensor.ambr b/tests/components/smartthings/snapshots/test_binary_sensor.ambr
new file mode 100644
index 00000000000..d6a5ac6a4e7
--- /dev/null
+++ b/tests/components/smartthings/snapshots/test_binary_sensor.ambr
@@ -0,0 +1,2093 @@
+# serializer version: 1
+# name: test_all_entities[c2c_arlo_pro_3_switch][binary_sensor.2nd_floor_hallway_motion-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.2nd_floor_hallway_motion',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.MOTION: 'motion'>,
+    'original_icon': None,
+    'original_name': 'Motion',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '10e06a70-ee7d-4832-85e9-a0a06a7a05bd_main_motionSensor_motion_motion',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[c2c_arlo_pro_3_switch][binary_sensor.2nd_floor_hallway_motion-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'motion',
+      'friendly_name': '2nd Floor Hallway Motion',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.2nd_floor_hallway_motion',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[c2c_arlo_pro_3_switch][binary_sensor.2nd_floor_hallway_sound-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.2nd_floor_hallway_sound',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.SOUND: 'sound'>,
+    'original_icon': None,
+    'original_name': 'Sound',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '10e06a70-ee7d-4832-85e9-a0a06a7a05bd_main_soundSensor_sound_sound',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[c2c_arlo_pro_3_switch][binary_sensor.2nd_floor_hallway_sound-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'sound',
+      'friendly_name': '2nd Floor Hallway Sound',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.2nd_floor_hallway_sound',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[contact_sensor][binary_sensor.front_door_open_closed_sensor-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.front_door_open_closed_sensor',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.GARAGE_DOOR: 'garage_door'>,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '2d9a892b-1c93-45a5-84cb-0e81889498c6_main_contactSensor_contact_contact',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[contact_sensor][binary_sensor.front_door_open_closed_sensor-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'garage_door',
+      'friendly_name': '.Front Door Open/Closed Sensor',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.front_door_open_closed_sensor',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_ks_cooktop_31001][binary_sensor.induction_hob_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.induction_hob_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '808dbd84-f357-47e2-a0cd-3b66fa22d584_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_cooktop_31001][binary_sensor.induction_hob_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Induction Hob Power',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.induction_hob_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][binary_sensor.microwave_child_lock-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.microwave_child_lock',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Child lock',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'child_lock',
+    'unique_id': '2bad3237-4886-e699-1b90-4a51a3d55c8a_main_samsungce.kidsLock_lockState_lockState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][binary_sensor.microwave_child_lock-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Microwave Child lock',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.microwave_child_lock',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][binary_sensor.microwave_door-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.microwave_door',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.OPENING: 'opening'>,
+    'original_icon': None,
+    'original_name': 'Door',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'door',
+    'unique_id': '2bad3237-4886-e699-1b90-4a51a3d55c8a_main_samsungce.doorState_doorState_doorState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][binary_sensor.microwave_door-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'opening',
+      'friendly_name': 'Microwave Door',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.microwave_door',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][binary_sensor.microwave_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.microwave_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '2bad3237-4886-e699-1b90-4a51a3d55c8a_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][binary_sensor.microwave_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Microwave Power',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.microwave_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][binary_sensor.microwave_remote_control-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.microwave_remote_control',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Remote control',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'remote_control',
+    'unique_id': '2bad3237-4886-e699-1b90-4a51a3d55c8a_main_remoteControlStatus_remoteControlEnabled_remoteControlEnabled',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][binary_sensor.microwave_remote_control-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Microwave Remote control',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.microwave_remote_control',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_ks_oven_01061][binary_sensor.oven_child_lock-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.oven_child_lock',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Child lock',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'child_lock',
+    'unique_id': '9447959a-0dfa-6b27-d40d-650da525c53f_main_samsungce.kidsLock_lockState_lockState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_oven_01061][binary_sensor.oven_child_lock-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Oven Child lock',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.oven_child_lock',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_ks_oven_01061][binary_sensor.oven_door-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.oven_door',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.OPENING: 'opening'>,
+    'original_icon': None,
+    'original_name': 'Door',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'door',
+    'unique_id': '9447959a-0dfa-6b27-d40d-650da525c53f_main_samsungce.doorState_doorState_doorState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_oven_01061][binary_sensor.oven_door-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'opening',
+      'friendly_name': 'Oven Door',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.oven_door',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_ks_oven_01061][binary_sensor.oven_remote_control-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.oven_remote_control',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Remote control',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'remote_control',
+    'unique_id': '9447959a-0dfa-6b27-d40d-650da525c53f_main_remoteControlStatus_remoteControlEnabled_remoteControlEnabled',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_oven_01061][binary_sensor.oven_remote_control-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Oven Remote control',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.oven_remote_control',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_all_entities[da_ks_range_0101x][binary_sensor.vulcan_child_lock-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.vulcan_child_lock',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Child lock',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'child_lock',
+    'unique_id': '2c3cbaa0-1899-5ddc-7b58-9d657bd48f18_main_samsungce.kidsLock_lockState_lockState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_range_0101x][binary_sensor.vulcan_child_lock-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Vulcan Child lock',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.vulcan_child_lock',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_ks_range_0101x][binary_sensor.vulcan_door-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.vulcan_door',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.OPENING: 'opening'>,
+    'original_icon': None,
+    'original_name': 'Door',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'door',
+    'unique_id': '2c3cbaa0-1899-5ddc-7b58-9d657bd48f18_main_samsungce.doorState_doorState_doorState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_range_0101x][binary_sensor.vulcan_door-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'opening',
+      'friendly_name': 'Vulcan Door',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.vulcan_door',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_ks_range_0101x][binary_sensor.vulcan_remote_control-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.vulcan_remote_control',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Remote control',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'remote_control',
+    'unique_id': '2c3cbaa0-1899-5ddc-7b58-9d657bd48f18_main_remoteControlStatus_remoteControlEnabled_remoteControlEnabled',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_range_0101x][binary_sensor.vulcan_remote_control-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Vulcan Remote control',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.vulcan_remote_control',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_all_entities[da_ref_normal_000001][binary_sensor.refrigerator_cooler_door-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.refrigerator_cooler_door',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.DOOR: 'door'>,
+    'original_icon': None,
+    'original_name': 'Cooler door',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'cooler_door',
+    'unique_id': '7db87911-7dce-1cf2-7119-b953432a2f09_cooler_contactSensor_contact_contact',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ref_normal_000001][binary_sensor.refrigerator_cooler_door-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'door',
+      'friendly_name': 'Refrigerator Cooler door',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.refrigerator_cooler_door',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_ref_normal_000001][binary_sensor.refrigerator_door-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.refrigerator_door',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.DOOR: 'door'>,
+    'original_icon': None,
+    'original_name': 'Door',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '7db87911-7dce-1cf2-7119-b953432a2f09_main_contactSensor_contact_contact',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ref_normal_000001][binary_sensor.refrigerator_door-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'door',
+      'friendly_name': 'Refrigerator Door',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.refrigerator_door',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_ref_normal_000001][binary_sensor.refrigerator_freezer_door-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.refrigerator_freezer_door',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.DOOR: 'door'>,
+    'original_icon': None,
+    'original_name': 'Freezer door',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'freezer_door',
+    'unique_id': '7db87911-7dce-1cf2-7119-b953432a2f09_freezer_contactSensor_contact_contact',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ref_normal_000001][binary_sensor.refrigerator_freezer_door-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'door',
+      'friendly_name': 'Refrigerator Freezer door',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.refrigerator_freezer_door',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][binary_sensor.dishwasher_child_lock-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.dishwasher_child_lock',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Child lock',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'child_lock',
+    'unique_id': 'f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_samsungce.kidsLock_lockState_lockState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][binary_sensor.dishwasher_child_lock-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Dishwasher Child lock',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.dishwasher_child_lock',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][binary_sensor.dishwasher_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.dishwasher_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][binary_sensor.dishwasher_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Dishwasher Power',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.dishwasher_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][binary_sensor.dishwasher_remote_control-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.dishwasher_remote_control',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Remote control',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'remote_control',
+    'unique_id': 'f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_remoteControlStatus_remoteControlEnabled_remoteControlEnabled',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][binary_sensor.dishwasher_remote_control-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Dishwasher Remote control',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.dishwasher_remote_control',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][binary_sensor.airdresser_child_lock-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.airdresser_child_lock',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Child lock',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'child_lock',
+    'unique_id': 'b93211bf-9d96-bd21-3b2f-964fcc87f5cc_main_samsungce.kidsLock_lockState_lockState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][binary_sensor.airdresser_child_lock-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'AirDresser Child lock',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.airdresser_child_lock',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][binary_sensor.airdresser_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.airdresser_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'b93211bf-9d96-bd21-3b2f-964fcc87f5cc_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][binary_sensor.airdresser_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'AirDresser Power',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.airdresser_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][binary_sensor.airdresser_remote_control-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.airdresser_remote_control',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Remote control',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'remote_control',
+    'unique_id': 'b93211bf-9d96-bd21-3b2f-964fcc87f5cc_main_remoteControlStatus_remoteControlEnabled_remoteControlEnabled',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][binary_sensor.airdresser_remote_control-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'AirDresser Remote control',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.airdresser_remote_control',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][binary_sensor.dryer_child_lock-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.dryer_child_lock',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Child lock',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'child_lock',
+    'unique_id': '02f7256e-8353-5bdd-547f-bd5b1647e01b_main_samsungce.kidsLock_lockState_lockState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][binary_sensor.dryer_child_lock-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Dryer Child lock',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.dryer_child_lock',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][binary_sensor.dryer_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.dryer_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '02f7256e-8353-5bdd-547f-bd5b1647e01b_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][binary_sensor.dryer_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Dryer Power',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.dryer_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][binary_sensor.dryer_remote_control-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.dryer_remote_control',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Remote control',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'remote_control',
+    'unique_id': '02f7256e-8353-5bdd-547f-bd5b1647e01b_main_remoteControlStatus_remoteControlEnabled_remoteControlEnabled',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][binary_sensor.dryer_remote_control-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Dryer Remote control',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.dryer_remote_control',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][binary_sensor.dryer_wrinkle_prevent_active-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.dryer_wrinkle_prevent_active',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Wrinkle prevent active',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'dryer_wrinkle_prevent_active',
+    'unique_id': '02f7256e-8353-5bdd-547f-bd5b1647e01b_main_custom.dryerWrinklePrevent_operatingState_operatingState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][binary_sensor.dryer_wrinkle_prevent_active-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Dryer Wrinkle prevent active',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.dryer_wrinkle_prevent_active',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][binary_sensor.seca_roupa_child_lock-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.seca_roupa_child_lock',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Child lock',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'child_lock',
+    'unique_id': '3a6c4e05-811d-5041-e956-3d04c424cbcd_main_samsungce.kidsLock_lockState_lockState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][binary_sensor.seca_roupa_child_lock-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Seca-Roupa Child lock',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.seca_roupa_child_lock',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][binary_sensor.seca_roupa_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.seca_roupa_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '3a6c4e05-811d-5041-e956-3d04c424cbcd_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][binary_sensor.seca_roupa_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Seca-Roupa Power',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.seca_roupa_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][binary_sensor.seca_roupa_remote_control-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.seca_roupa_remote_control',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Remote control',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'remote_control',
+    'unique_id': '3a6c4e05-811d-5041-e956-3d04c424cbcd_main_remoteControlStatus_remoteControlEnabled_remoteControlEnabled',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][binary_sensor.seca_roupa_remote_control-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Seca-Roupa Remote control',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.seca_roupa_remote_control',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][binary_sensor.seca_roupa_wrinkle_prevent_active-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.seca_roupa_wrinkle_prevent_active',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Wrinkle prevent active',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'dryer_wrinkle_prevent_active',
+    'unique_id': '3a6c4e05-811d-5041-e956-3d04c424cbcd_main_custom.dryerWrinklePrevent_operatingState_operatingState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][binary_sensor.seca_roupa_wrinkle_prevent_active-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Seca-Roupa Wrinkle prevent active',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.seca_roupa_wrinkle_prevent_active',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][binary_sensor.washer_child_lock-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.washer_child_lock',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Child lock',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'child_lock',
+    'unique_id': 'f984b91d-f250-9d42-3436-33f09a422a47_main_samsungce.kidsLock_lockState_lockState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][binary_sensor.washer_child_lock-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Washer Child lock',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.washer_child_lock',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][binary_sensor.washer_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.washer_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'f984b91d-f250-9d42-3436-33f09a422a47_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][binary_sensor.washer_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Washer Power',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.washer_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][binary_sensor.washer_remote_control-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.washer_remote_control',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Remote control',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'remote_control',
+    'unique_id': 'f984b91d-f250-9d42-3436-33f09a422a47_main_remoteControlStatus_remoteControlEnabled_remoteControlEnabled',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][binary_sensor.washer_remote_control-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Washer Remote control',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.washer_remote_control',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][binary_sensor.washing_machine_child_lock-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.washing_machine_child_lock',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Child lock',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'child_lock',
+    'unique_id': '63803fae-cbed-f356-a063-2cf148ae3ca7_main_samsungce.kidsLock_lockState_lockState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][binary_sensor.washing_machine_child_lock-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Washing Machine Child lock',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.washing_machine_child_lock',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][binary_sensor.washing_machine_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.washing_machine_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '63803fae-cbed-f356-a063-2cf148ae3ca7_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][binary_sensor.washing_machine_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Washing Machine Power',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.washing_machine_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][binary_sensor.washing_machine_remote_control-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.washing_machine_remote_control',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Remote control',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'remote_control',
+    'unique_id': '63803fae-cbed-f356-a063-2cf148ae3ca7_main_remoteControlStatus_remoteControlEnabled_remoteControlEnabled',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][binary_sensor.washing_machine_remote_control-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Washing Machine Remote control',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.washing_machine_remote_control',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_all_entities[ecobee_sensor][binary_sensor.child_bedroom_motion-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.child_bedroom_motion',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.MOTION: 'motion'>,
+    'original_icon': None,
+    'original_name': 'Motion',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'd5dc3299-c266-41c7-bd08-f540aea54b89_main_motionSensor_motion_motion',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[ecobee_sensor][binary_sensor.child_bedroom_motion-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'motion',
+      'friendly_name': 'Child Bedroom Motion',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.child_bedroom_motion',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[ecobee_sensor][binary_sensor.child_bedroom_presence-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.child_bedroom_presence',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PRESENCE: 'presence'>,
+    'original_icon': None,
+    'original_name': 'Presence',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'd5dc3299-c266-41c7-bd08-f540aea54b89_main_presenceSensor_presence_presence',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[ecobee_sensor][binary_sensor.child_bedroom_presence-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'presence',
+      'friendly_name': 'Child Bedroom Presence',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.child_bedroom_presence',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[iphone][binary_sensor.iphone_presence-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.iphone_presence',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PRESENCE: 'presence'>,
+    'original_icon': None,
+    'original_name': 'Presence',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '184c67cc-69e2-44b6-8f73-55c963068ad9_main_presenceSensor_presence_presence',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[iphone][binary_sensor.iphone_presence-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'presence',
+      'friendly_name': 'iPhone Presence',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.iphone_presence',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_all_entities[multipurpose_sensor][binary_sensor.deck_door-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.deck_door',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.DOOR: 'door'>,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '7d246592-93db-4d72-a10d-5a51793ece8c_main_contactSensor_contact_contact',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[multipurpose_sensor][binary_sensor.deck_door-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'door',
+      'friendly_name': 'Deck Door',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.deck_door',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[multipurpose_sensor][binary_sensor.deck_door_acceleration-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.deck_door_acceleration',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.MOVING: 'moving'>,
+    'original_icon': None,
+    'original_name': 'Acceleration',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'acceleration',
+    'unique_id': '7d246592-93db-4d72-a10d-5a51793ece8c_main_accelerationSensor_acceleration_acceleration',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[multipurpose_sensor][binary_sensor.deck_door_acceleration-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'moving',
+      'friendly_name': 'Deck Door Acceleration',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.deck_door_acceleration',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[virtual_valve][binary_sensor.volvo_valve-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.volvo_valve',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.OPENING: 'opening'>,
+    'original_icon': None,
+    'original_name': 'Valve',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'valve',
+    'unique_id': '612ab3c2-3bb0-48f7-b2c0-15b169cb2fc3_main_valve_valve_valve',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[virtual_valve][binary_sensor.volvo_valve-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'opening',
+      'friendly_name': 'volvo Valve',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.volvo_valve',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[virtual_water_sensor][binary_sensor.asd_moisture-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.asd_moisture',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.MOISTURE: 'moisture'>,
+    'original_icon': None,
+    'original_name': 'Moisture',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'a2a6018b-2663-4727-9d1d-8f56953b5116_main_waterSensor_water_water',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[virtual_water_sensor][binary_sensor.asd_moisture-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'moisture',
+      'friendly_name': 'asd Moisture',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.asd_moisture',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
diff --git a/tests/components/smartthings/snapshots/test_button.ambr b/tests/components/smartthings/snapshots/test_button.ambr
new file mode 100644
index 00000000000..2c9dbd008af
--- /dev/null
+++ b/tests/components/smartthings/snapshots/test_button.ambr
@@ -0,0 +1,189 @@
+# serializer version: 1
+# name: test_all_entities[da_ks_microwave_0101x][button.microwave_stop-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'button',
+    'entity_category': None,
+    'entity_id': 'button.microwave_stop',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Stop',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'stop',
+    'unique_id': '2bad3237-4886-e699-1b90-4a51a3d55c8a_main_ovenOperatingState_stop',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][button.microwave_stop-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Microwave Stop',
+    }),
+    'context': <ANY>,
+    'entity_id': 'button.microwave_stop',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_all_entities[da_ks_oven_01061][button.oven_stop-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'button',
+    'entity_category': None,
+    'entity_id': 'button.oven_stop',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Stop',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'stop',
+    'unique_id': '9447959a-0dfa-6b27-d40d-650da525c53f_main_ovenOperatingState_stop',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_oven_01061][button.oven_stop-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Oven Stop',
+    }),
+    'context': <ANY>,
+    'entity_id': 'button.oven_stop',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_all_entities[da_ks_range_0101x][button.vulcan_stop-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'button',
+    'entity_category': None,
+    'entity_id': 'button.vulcan_stop',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Stop',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'stop',
+    'unique_id': '2c3cbaa0-1899-5ddc-7b58-9d657bd48f18_main_ovenOperatingState_stop',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_range_0101x][button.vulcan_stop-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Vulcan Stop',
+    }),
+    'context': <ANY>,
+    'entity_id': 'button.vulcan_stop',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_all_entities[da_ref_normal_000001][button.refrigerator_reset_water_filter-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'button',
+    'entity_category': None,
+    'entity_id': 'button.refrigerator_reset_water_filter',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Reset water filter',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'reset_water_filter',
+    'unique_id': '7db87911-7dce-1cf2-7119-b953432a2f09_main_custom.waterFilter_resetWaterFilter',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ref_normal_000001][button.refrigerator_reset_water_filter-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Refrigerator Reset water filter',
+    }),
+    'context': <ANY>,
+    'entity_id': 'button.refrigerator_reset_water_filter',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
diff --git a/tests/components/smartthings/snapshots/test_climate.ambr b/tests/components/smartthings/snapshots/test_climate.ambr
new file mode 100644
index 00000000000..10e9dbd5489
--- /dev/null
+++ b/tests/components/smartthings/snapshots/test_climate.ambr
@@ -0,0 +1,756 @@
+# serializer version: 1
+# name: test_all_entities[aux_ac][climate.aux_a_c_on_off-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'fan_modes': None,
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+      ]),
+      'max_temp': 35,
+      'min_temp': 7,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'climate',
+    'entity_category': None,
+    'entity_id': 'climate.aux_a_c_on_off',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <ClimateEntityFeature: 393>,
+    'translation_key': None,
+    'unique_id': 'bf53a150-f8a4-45d1-aac4-86252475d551_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[aux_ac][climate.aux_a_c_on_off-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_temperature': 20.0,
+      'fan_mode': 'auto',
+      'fan_modes': None,
+      'friendly_name': 'AUX A/C on-off',
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+      ]),
+      'max_temp': 35,
+      'min_temp': 7,
+      'supported_features': <ClimateEntityFeature: 393>,
+      'temperature': 20.0,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.aux_a_c_on_off',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[bosch_radiator_thermostat_ii][climate.radiator_thermostat_ii_m_wohnzimmer-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'hvac_modes': list([
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'max_temp': 35,
+      'min_temp': 7,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'climate',
+    'entity_category': None,
+    'entity_id': 'climate.radiator_thermostat_ii_m_wohnzimmer',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <ClimateEntityFeature: 387>,
+    'translation_key': None,
+    'unique_id': '286ba274-4093-4bcb-849c-a1a3efe7b1e5_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[bosch_radiator_thermostat_ii][climate.radiator_thermostat_ii_m_wohnzimmer-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_temperature': 23.9,
+      'friendly_name': 'Radiator Thermostat II [+M] Wohnzimmer',
+      'hvac_modes': list([
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'max_temp': 35,
+      'min_temp': 7,
+      'supported_features': <ClimateEntityFeature: 387>,
+      'target_temp_high': None,
+      'target_temp_low': None,
+      'temperature': 22.0,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.radiator_thermostat_ii_m_wohnzimmer',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'heat',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_000001][climate.ac_office_granit-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'fan_modes': list([
+        'auto',
+        'low',
+        'medium',
+        'high',
+        'turbo',
+      ]),
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+        <HVACMode.COOL: 'cool'>,
+        <HVACMode.DRY: 'dry'>,
+        <HVACMode.FAN_ONLY: 'fan_only'>,
+        <HVACMode.HEAT_COOL: 'heat_cool'>,
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'max_temp': 35,
+      'min_temp': 7,
+      'preset_modes': list([
+        'windFree',
+      ]),
+      'swing_modes': None,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'climate',
+    'entity_category': None,
+    'entity_id': 'climate.ac_office_granit',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <ClimateEntityFeature: 441>,
+    'translation_key': None,
+    'unique_id': '96a5ef74-5832-a84b-f1f7-ca799957065d_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ac_rac_000001][climate.ac_office_granit-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_temperature': 25,
+      'drlc_status_duration': 0,
+      'drlc_status_level': -1,
+      'drlc_status_override': False,
+      'drlc_status_start': '1970-01-01T00:00:00Z',
+      'fan_mode': 'low',
+      'fan_modes': list([
+        'auto',
+        'low',
+        'medium',
+        'high',
+        'turbo',
+      ]),
+      'friendly_name': 'AC Office Granit',
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+        <HVACMode.COOL: 'cool'>,
+        <HVACMode.DRY: 'dry'>,
+        <HVACMode.FAN_ONLY: 'fan_only'>,
+        <HVACMode.HEAT_COOL: 'heat_cool'>,
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'max_temp': 35,
+      'min_temp': 7,
+      'preset_mode': None,
+      'preset_modes': list([
+        'windFree',
+      ]),
+      'supported_features': <ClimateEntityFeature: 441>,
+      'swing_mode': 'off',
+      'swing_modes': None,
+      'temperature': 25,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.ac_office_granit',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_01001][climate.aire_dormitorio_principal-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'fan_modes': list([
+        'auto',
+        'low',
+        'medium',
+        'high',
+        'turbo',
+      ]),
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+        <HVACMode.HEAT_COOL: 'heat_cool'>,
+        <HVACMode.COOL: 'cool'>,
+        <HVACMode.DRY: 'dry'>,
+        <HVACMode.FAN_ONLY: 'fan_only'>,
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'max_temp': 35,
+      'min_temp': 7,
+      'preset_modes': list([
+        'windFree',
+      ]),
+      'swing_modes': list([
+        'off',
+        'vertical',
+        'horizontal',
+        'both',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'climate',
+    'entity_category': None,
+    'entity_id': 'climate.aire_dormitorio_principal',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <ClimateEntityFeature: 441>,
+    'translation_key': None,
+    'unique_id': '4ece486b-89db-f06a-d54d-748b676b4d8e_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ac_rac_01001][climate.aire_dormitorio_principal-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_temperature': 27,
+      'drlc_status_duration': 0,
+      'drlc_status_level': 0,
+      'drlc_status_override': False,
+      'drlc_status_start': '1970-01-01T00:00:00Z',
+      'fan_mode': 'high',
+      'fan_modes': list([
+        'auto',
+        'low',
+        'medium',
+        'high',
+        'turbo',
+      ]),
+      'friendly_name': 'Aire Dormitorio Principal',
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+        <HVACMode.HEAT_COOL: 'heat_cool'>,
+        <HVACMode.COOL: 'cool'>,
+        <HVACMode.DRY: 'dry'>,
+        <HVACMode.FAN_ONLY: 'fan_only'>,
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'max_temp': 35,
+      'min_temp': 7,
+      'preset_mode': None,
+      'preset_modes': list([
+        'windFree',
+      ]),
+      'supported_features': <ClimateEntityFeature: 441>,
+      'swing_mode': 'off',
+      'swing_modes': list([
+        'off',
+        'vertical',
+        'horizontal',
+        'both',
+      ]),
+      'temperature': 23,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.aire_dormitorio_principal',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_100001][climate.corridor_a_c-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'fan_modes': list([
+        'auto',
+        'low',
+        'medium',
+        'high',
+        'turbo',
+      ]),
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+        <HVACMode.COOL: 'cool'>,
+        <HVACMode.DRY: 'dry'>,
+        <HVACMode.FAN_ONLY: 'fan_only'>,
+        <HVACMode.HEAT_COOL: 'heat_cool'>,
+      ]),
+      'max_temp': 35,
+      'min_temp': 7,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'climate',
+    'entity_category': None,
+    'entity_id': 'climate.corridor_a_c',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <ClimateEntityFeature: 393>,
+    'translation_key': None,
+    'unique_id': 'F8042E25-0E53-0000-0000-000000000000_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ac_rac_100001][climate.corridor_a_c-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_temperature': 27,
+      'fan_mode': 'auto',
+      'fan_modes': list([
+        'auto',
+        'low',
+        'medium',
+        'high',
+        'turbo',
+      ]),
+      'friendly_name': 'Corridor A/C',
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+        <HVACMode.COOL: 'cool'>,
+        <HVACMode.DRY: 'dry'>,
+        <HVACMode.FAN_ONLY: 'fan_only'>,
+        <HVACMode.HEAT_COOL: 'heat_cool'>,
+      ]),
+      'max_temp': 35,
+      'min_temp': 7,
+      'supported_features': <ClimateEntityFeature: 393>,
+      'temperature': 18,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.corridor_a_c',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[ecobee_thermostat][climate.main_floor-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'fan_modes': list([
+        'on',
+        'auto',
+      ]),
+      'hvac_modes': list([
+        <HVACMode.COOL: 'cool'>,
+        <HVACMode.HEAT_COOL: 'heat_cool'>,
+      ]),
+      'max_temp': 35.0,
+      'min_temp': 7.0,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'climate',
+    'entity_category': None,
+    'entity_id': 'climate.main_floor',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <ClimateEntityFeature: 395>,
+    'translation_key': None,
+    'unique_id': '028469cb-6e89-4f14-8d9a-bfbca5e0fbfc_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[ecobee_thermostat][climate.main_floor-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_humidity': 32,
+      'current_temperature': 21.7,
+      'fan_mode': 'auto',
+      'fan_modes': list([
+        'on',
+        'auto',
+      ]),
+      'friendly_name': 'Main Floor',
+      'hvac_action': <HVACAction.HEATING: 'heating'>,
+      'hvac_modes': list([
+        <HVACMode.COOL: 'cool'>,
+        <HVACMode.HEAT_COOL: 'heat_cool'>,
+      ]),
+      'max_temp': 35.0,
+      'min_temp': 7.0,
+      'supported_features': <ClimateEntityFeature: 395>,
+      'target_temp_high': None,
+      'target_temp_low': None,
+      'temperature': 21.7,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.main_floor',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'heat',
+  })
+# ---
+# name: test_all_entities[ecobee_thermostat_offline][climate.downstairs-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'fan_modes': None,
+      'hvac_modes': list([
+      ]),
+      'max_temp': 35,
+      'min_temp': 7,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'climate',
+    'entity_category': None,
+    'entity_id': 'climate.downstairs',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <ClimateEntityFeature: 395>,
+    'translation_key': None,
+    'unique_id': '1888b38f-6246-4f1e-911b-bfcfb66999db_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[ecobee_thermostat_offline][climate.downstairs-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_temperature': None,
+      'fan_mode': None,
+      'fan_modes': None,
+      'friendly_name': 'Downstairs',
+      'hvac_modes': list([
+      ]),
+      'max_temp': 35,
+      'min_temp': 7,
+      'supported_features': <ClimateEntityFeature: 395>,
+      'target_temp_high': None,
+      'target_temp_low': None,
+      'temperature': None,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.downstairs',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_all_entities[generic_ef00_v1][climate.thermostat_kuche-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'hvac_modes': list([
+      ]),
+      'max_temp': 35,
+      'min_temp': 7,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'climate',
+    'entity_category': None,
+    'entity_id': 'climate.thermostat_kuche',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <ClimateEntityFeature: 387>,
+    'translation_key': None,
+    'unique_id': '656569c2-7976-4232-a789-34b4d1176c3a_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[generic_ef00_v1][climate.thermostat_kuche-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_temperature': 21.0,
+      'friendly_name': 'Thermostat Küche',
+      'hvac_modes': list([
+      ]),
+      'max_temp': 35,
+      'min_temp': 7,
+      'supported_features': <ClimateEntityFeature: 387>,
+      'target_temp_high': None,
+      'target_temp_low': None,
+      'temperature': 23.0,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.thermostat_kuche',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'heat',
+  })
+# ---
+# name: test_all_entities[heatit_ztrm3_thermostat][climate.hall_thermostat-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'hvac_modes': list([
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'max_temp': 35,
+      'min_temp': 7,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'climate',
+    'entity_category': None,
+    'entity_id': 'climate.hall_thermostat',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <ClimateEntityFeature: 387>,
+    'translation_key': None,
+    'unique_id': '69a271f6-6537-4982-8cd9-979866872692_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[heatit_ztrm3_thermostat][climate.hall_thermostat-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_temperature': 19.0,
+      'friendly_name': 'Hall thermostat',
+      'hvac_action': <HVACAction.HEATING: 'heating'>,
+      'hvac_modes': list([
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'max_temp': 35,
+      'min_temp': 7,
+      'supported_features': <ClimateEntityFeature: 387>,
+      'target_temp_high': None,
+      'target_temp_low': None,
+      'temperature': 19.0,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.hall_thermostat',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'heat',
+  })
+# ---
+# name: test_all_entities[virtual_thermostat][climate.asd-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'fan_modes': list([
+        'on',
+      ]),
+      'hvac_modes': list([
+      ]),
+      'max_temp': 35.0,
+      'min_temp': 7.0,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'climate',
+    'entity_category': None,
+    'entity_id': 'climate.asd',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <ClimateEntityFeature: 395>,
+    'translation_key': None,
+    'unique_id': '2894dc93-0f11-49cc-8a81-3a684cebebf6_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[virtual_thermostat][climate.asd-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_temperature': 4734.6,
+      'fan_mode': 'followschedule',
+      'fan_modes': list([
+        'on',
+      ]),
+      'friendly_name': 'asd',
+      'hvac_action': <HVACAction.COOLING: 'cooling'>,
+      'hvac_modes': list([
+      ]),
+      'max_temp': 35.0,
+      'min_temp': 7.0,
+      'supported_features': <ClimateEntityFeature: 395>,
+      'target_temp_high': None,
+      'target_temp_low': None,
+      'temperature': None,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.asd',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
diff --git a/tests/components/smartthings/snapshots/test_cover.ambr b/tests/components/smartthings/snapshots/test_cover.ambr
new file mode 100644
index 00000000000..4b5cf705665
--- /dev/null
+++ b/tests/components/smartthings/snapshots/test_cover.ambr
@@ -0,0 +1,102 @@
+# serializer version: 1
+# name: test_all_entities[c2c_shade][cover.curtain_1a-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'cover',
+    'entity_category': None,
+    'entity_id': 'cover.curtain_1a',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <CoverDeviceClass.SHADE: 'shade'>,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <CoverEntityFeature: 7>,
+    'translation_key': None,
+    'unique_id': '571af102-15db-4030-b76b-245a691f74a5_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[c2c_shade][cover.curtain_1a-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_position': 100,
+      'device_class': 'shade',
+      'friendly_name': 'Curtain 1A',
+      'supported_features': <CoverEntityFeature: 7>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'cover.curtain_1a',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'open',
+  })
+# ---
+# name: test_all_entities[ikea_kadrilj][cover.kitchen_ikea_kadrilj_window_blind-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'cover',
+    'entity_category': None,
+    'entity_id': 'cover.kitchen_ikea_kadrilj_window_blind',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <CoverDeviceClass.SHADE: 'shade'>,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <CoverEntityFeature: 7>,
+    'translation_key': None,
+    'unique_id': '71afed1c-006d-4e48-b16e-e7f88f9fd638_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[ikea_kadrilj][cover.kitchen_ikea_kadrilj_window_blind-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'battery_level': 37,
+      'current_position': 32,
+      'device_class': 'shade',
+      'friendly_name': 'Kitchen IKEA KADRILJ Window blind',
+      'supported_features': <CoverEntityFeature: 7>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'cover.kitchen_ikea_kadrilj_window_blind',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'open',
+  })
+# ---
diff --git a/tests/components/smartthings/snapshots/test_diagnostics.ambr b/tests/components/smartthings/snapshots/test_diagnostics.ambr
new file mode 100644
index 00000000000..b9847bf9746
--- /dev/null
+++ b/tests/components/smartthings/snapshots/test_diagnostics.ambr
@@ -0,0 +1,1532 @@
+# serializer version: 1
+# name: test_config_entry_diagnostics[da_ac_rac_000001]
+  dict({
+    'devices': list([
+      dict({
+        '_links': dict({
+        }),
+        'items': list([
+          dict({
+            'allowed': list([
+            ]),
+            'components': list([
+              dict({
+                'capabilities': list([
+                  dict({
+                    'id': 'ocf',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'switch',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'airConditionerMode',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'airConditionerFanMode',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'fanOscillationMode',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'airQualitySensor',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'temperatureMeasurement',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'thermostatCoolingSetpoint',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'relativeHumidityMeasurement',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'dustSensor',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'veryFineDustSensor',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'audioVolume',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'remoteControlStatus',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'powerConsumptionReport',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'demandResponseLoadControl',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'refresh',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'execute',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.spiMode',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.thermostatSetpointControl',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.airConditionerOptionalMode',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.airConditionerTropicalNightMode',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.autoCleaningMode',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.deviceReportStateConfiguration',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.energyType',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.dustFilter',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.airConditionerOdorController',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.deodorFilter',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.disabledComponents',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.disabledCapabilities',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'samsungce.deviceIdentification',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'samsungce.dongleSoftwareInstallation',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'samsungce.softwareUpdate',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'samsungce.selfCheck',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'samsungce.driverVersion',
+                    'version': 1,
+                  }),
+                ]),
+                'categories': list([
+                  dict({
+                    'categoryType': 'manufacturer',
+                    'name': 'AirConditioner',
+                  }),
+                ]),
+                'id': 'main',
+                'label': 'main',
+              }),
+              dict({
+                'capabilities': list([
+                  dict({
+                    'id': 'switch',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'airConditionerMode',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'airConditionerFanMode',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'fanOscillationMode',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'temperatureMeasurement',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'thermostatCoolingSetpoint',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'relativeHumidityMeasurement',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'airQualitySensor',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'dustSensor',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'veryFineDustSensor',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'odorSensor',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'remoteControlStatus',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'audioVolume',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.thermostatSetpointControl',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.autoCleaningMode',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.airConditionerTropicalNightMode',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.disabledCapabilities',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'ocf',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'powerConsumptionReport',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'demandResponseLoadControl',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.spiMode',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.airConditionerOptionalMode',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.deviceReportStateConfiguration',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.energyType',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.dustFilter',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.airConditionerOdorController',
+                    'version': 1,
+                  }),
+                  dict({
+                    'id': 'custom.deodorFilter',
+                    'version': 1,
+                  }),
+                ]),
+                'categories': list([
+                  dict({
+                    'categoryType': 'manufacturer',
+                    'name': 'Other',
+                  }),
+                ]),
+                'id': '1',
+                'label': '1',
+              }),
+            ]),
+            'createTime': '2021-04-06T16:43:34.753Z',
+            'deviceId': '96a5ef74-5832-a84b-f1f7-ca799957065d',
+            'deviceManufacturerCode': 'Samsung Electronics',
+            'deviceTypeName': 'Samsung OCF Air Conditioner',
+            'executionContext': 'CLOUD',
+            'label': 'AC Office Granit',
+            'locationId': '58d3fd7c-c512-4da3-b500-ef269382756c',
+            'manufacturerName': 'Samsung Electronics',
+            'name': '[room a/c] Samsung',
+            'ocf': dict({
+              'additionalAuthCodeRequired': False,
+              'lastSignupTime': '2025-01-08T02:32:04.631093137Z',
+              'manufacturerName': 'Samsung Electronics',
+              'ocfDeviceType': 'x.com.st.d.sensor.light',
+              'transferCandidate': False,
+              'vendorId': 'VD-Sensor.Light-2023',
+            }),
+            'ownerId': 'f9a28d7c-1ed5-d9e9-a81c-18971ec081db',
+            'presentationId': 'DA-AC-RAC-000001',
+            'profile': dict({
+              'id': '60fbc713-8da5-315d-b31a-6d6dcde4be7b',
+            }),
+            'restrictionTier': 0,
+            'roomId': '7715151d-0314-457a-a82c-5ce48900e065',
+            'type': 'OCF',
+          }),
+        ]),
+      }),
+    ]),
+  })
+# ---
+# name: test_device_diagnostics[da_ac_rac_000001]
+  dict({
+    'events': list([
+    ]),
+    'info': dict({
+      'allowed': list([
+      ]),
+      'components': list([
+        dict({
+          'capabilities': list([
+            dict({
+              'id': 'ocf',
+              'version': 1,
+            }),
+            dict({
+              'id': 'switch',
+              'version': 1,
+            }),
+            dict({
+              'id': 'airConditionerMode',
+              'version': 1,
+            }),
+            dict({
+              'id': 'airConditionerFanMode',
+              'version': 1,
+            }),
+            dict({
+              'id': 'fanOscillationMode',
+              'version': 1,
+            }),
+            dict({
+              'id': 'airQualitySensor',
+              'version': 1,
+            }),
+            dict({
+              'id': 'temperatureMeasurement',
+              'version': 1,
+            }),
+            dict({
+              'id': 'thermostatCoolingSetpoint',
+              'version': 1,
+            }),
+            dict({
+              'id': 'relativeHumidityMeasurement',
+              'version': 1,
+            }),
+            dict({
+              'id': 'dustSensor',
+              'version': 1,
+            }),
+            dict({
+              'id': 'veryFineDustSensor',
+              'version': 1,
+            }),
+            dict({
+              'id': 'audioVolume',
+              'version': 1,
+            }),
+            dict({
+              'id': 'remoteControlStatus',
+              'version': 1,
+            }),
+            dict({
+              'id': 'powerConsumptionReport',
+              'version': 1,
+            }),
+            dict({
+              'id': 'demandResponseLoadControl',
+              'version': 1,
+            }),
+            dict({
+              'id': 'refresh',
+              'version': 1,
+            }),
+            dict({
+              'id': 'execute',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.spiMode',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.thermostatSetpointControl',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.airConditionerOptionalMode',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.airConditionerTropicalNightMode',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.autoCleaningMode',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.deviceReportStateConfiguration',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.energyType',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.dustFilter',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.airConditionerOdorController',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.deodorFilter',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.disabledComponents',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.disabledCapabilities',
+              'version': 1,
+            }),
+            dict({
+              'id': 'samsungce.deviceIdentification',
+              'version': 1,
+            }),
+            dict({
+              'id': 'samsungce.dongleSoftwareInstallation',
+              'version': 1,
+            }),
+            dict({
+              'id': 'samsungce.softwareUpdate',
+              'version': 1,
+            }),
+            dict({
+              'id': 'samsungce.selfCheck',
+              'version': 1,
+            }),
+            dict({
+              'id': 'samsungce.driverVersion',
+              'version': 1,
+            }),
+          ]),
+          'categories': list([
+            dict({
+              'categoryType': 'manufacturer',
+              'name': 'AirConditioner',
+            }),
+          ]),
+          'id': 'main',
+          'label': 'main',
+        }),
+        dict({
+          'capabilities': list([
+            dict({
+              'id': 'switch',
+              'version': 1,
+            }),
+            dict({
+              'id': 'airConditionerMode',
+              'version': 1,
+            }),
+            dict({
+              'id': 'airConditionerFanMode',
+              'version': 1,
+            }),
+            dict({
+              'id': 'fanOscillationMode',
+              'version': 1,
+            }),
+            dict({
+              'id': 'temperatureMeasurement',
+              'version': 1,
+            }),
+            dict({
+              'id': 'thermostatCoolingSetpoint',
+              'version': 1,
+            }),
+            dict({
+              'id': 'relativeHumidityMeasurement',
+              'version': 1,
+            }),
+            dict({
+              'id': 'airQualitySensor',
+              'version': 1,
+            }),
+            dict({
+              'id': 'dustSensor',
+              'version': 1,
+            }),
+            dict({
+              'id': 'veryFineDustSensor',
+              'version': 1,
+            }),
+            dict({
+              'id': 'odorSensor',
+              'version': 1,
+            }),
+            dict({
+              'id': 'remoteControlStatus',
+              'version': 1,
+            }),
+            dict({
+              'id': 'audioVolume',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.thermostatSetpointControl',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.autoCleaningMode',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.airConditionerTropicalNightMode',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.disabledCapabilities',
+              'version': 1,
+            }),
+            dict({
+              'id': 'ocf',
+              'version': 1,
+            }),
+            dict({
+              'id': 'powerConsumptionReport',
+              'version': 1,
+            }),
+            dict({
+              'id': 'demandResponseLoadControl',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.spiMode',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.airConditionerOptionalMode',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.deviceReportStateConfiguration',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.energyType',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.dustFilter',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.airConditionerOdorController',
+              'version': 1,
+            }),
+            dict({
+              'id': 'custom.deodorFilter',
+              'version': 1,
+            }),
+          ]),
+          'categories': list([
+            dict({
+              'categoryType': 'manufacturer',
+              'name': 'Other',
+            }),
+          ]),
+          'id': '1',
+          'label': '1',
+        }),
+      ]),
+      'createTime': '2021-04-06T16:43:34.753Z',
+      'deviceId': '96a5ef74-5832-a84b-f1f7-ca799957065d',
+      'deviceManufacturerCode': 'Samsung Electronics',
+      'deviceTypeName': 'Samsung OCF Air Conditioner',
+      'executionContext': 'CLOUD',
+      'label': 'AC Office Granit',
+      'locationId': '58d3fd7c-c512-4da3-b500-ef269382756c',
+      'manufacturerName': 'Samsung Electronics',
+      'name': '[room a/c] Samsung',
+      'ocf': dict({
+        'additionalAuthCodeRequired': False,
+        'lastSignupTime': '2025-01-08T02:32:04.631093137Z',
+        'manufacturerName': 'Samsung Electronics',
+        'ocfDeviceType': 'x.com.st.d.sensor.light',
+        'transferCandidate': False,
+        'vendorId': 'VD-Sensor.Light-2023',
+      }),
+      'ownerId': 'f9a28d7c-1ed5-d9e9-a81c-18971ec081db',
+      'presentationId': 'DA-AC-RAC-000001',
+      'profile': dict({
+        'id': '60fbc713-8da5-315d-b31a-6d6dcde4be7b',
+      }),
+      'restrictionTier': 0,
+      'roomId': '7715151d-0314-457a-a82c-5ce48900e065',
+      'type': 'OCF',
+    }),
+    'status': dict({
+      'components': dict({
+        '1': dict({
+          'airConditionerFanMode': dict({
+            'availableAcFanModes': dict({
+              'value': None,
+            }),
+            'fanMode': dict({
+              'timestamp': '2021-04-06T16:44:10.381Z',
+              'value': None,
+            }),
+            'supportedAcFanModes': dict({
+              'timestamp': '2024-09-10T10:26:28.605Z',
+              'value': list([
+                'auto',
+                'low',
+                'medium',
+                'high',
+                'turbo',
+              ]),
+            }),
+          }),
+          'airConditionerMode': dict({
+            'airConditionerMode': dict({
+              'timestamp': '2021-04-08T03:50:50.930Z',
+              'value': None,
+            }),
+            'availableAcModes': dict({
+              'value': None,
+            }),
+            'supportedAcModes': dict({
+              'timestamp': '2021-04-08T03:50:50.930Z',
+              'value': None,
+            }),
+          }),
+          'airQualitySensor': dict({
+            'airQuality': dict({
+              'timestamp': '2021-04-06T16:57:57.602Z',
+              'unit': 'CAQI',
+              'value': None,
+            }),
+          }),
+          'audioVolume': dict({
+            'volume': dict({
+              'timestamp': '2021-04-06T16:43:53.541Z',
+              'unit': '%',
+              'value': None,
+            }),
+          }),
+          'custom.airConditionerOdorController': dict({
+            'airConditionerOdorControllerProgress': dict({
+              'timestamp': '2021-04-08T04:11:38.269Z',
+              'value': None,
+            }),
+            'airConditionerOdorControllerState': dict({
+              'timestamp': '2021-04-08T04:11:38.269Z',
+              'value': None,
+            }),
+          }),
+          'custom.airConditionerOptionalMode': dict({
+            'acOptionalMode': dict({
+              'timestamp': '2021-04-06T16:57:57.659Z',
+              'value': None,
+            }),
+            'supportedAcOptionalMode': dict({
+              'timestamp': '2021-04-06T16:57:57.659Z',
+              'value': None,
+            }),
+          }),
+          'custom.airConditionerTropicalNightMode': dict({
+            'acTropicalNightModeLevel': dict({
+              'timestamp': '2021-04-06T16:44:10.498Z',
+              'value': None,
+            }),
+          }),
+          'custom.autoCleaningMode': dict({
+            'autoCleaningMode': dict({
+              'timestamp': '2021-04-06T16:43:53.344Z',
+              'value': None,
+            }),
+            'operatingState': dict({
+              'value': None,
+            }),
+            'progress': dict({
+              'value': None,
+            }),
+            'supportedAutoCleaningModes': dict({
+              'value': None,
+            }),
+            'supportedOperatingStates': dict({
+              'value': None,
+            }),
+            'timedCleanDuration': dict({
+              'value': None,
+            }),
+            'timedCleanDurationRange': dict({
+              'value': None,
+            }),
+          }),
+          'custom.deodorFilter': dict({
+            'deodorFilterCapacity': dict({
+              'timestamp': '2021-04-06T16:43:39.118Z',
+              'value': None,
+            }),
+            'deodorFilterLastResetDate': dict({
+              'timestamp': '2021-04-06T16:43:39.118Z',
+              'value': None,
+            }),
+            'deodorFilterResetType': dict({
+              'timestamp': '2021-04-06T16:43:39.118Z',
+              'value': None,
+            }),
+            'deodorFilterStatus': dict({
+              'timestamp': '2021-04-06T16:43:39.118Z',
+              'value': None,
+            }),
+            'deodorFilterUsage': dict({
+              'timestamp': '2021-04-06T16:43:39.118Z',
+              'value': None,
+            }),
+            'deodorFilterUsageStep': dict({
+              'timestamp': '2021-04-06T16:43:39.118Z',
+              'value': None,
+            }),
+          }),
+          'custom.deviceReportStateConfiguration': dict({
+            'reportStatePeriod': dict({
+              'timestamp': '2021-04-06T16:44:09.800Z',
+              'value': None,
+            }),
+            'reportStateRealtime': dict({
+              'timestamp': '2021-04-06T16:44:09.800Z',
+              'value': None,
+            }),
+            'reportStateRealtimePeriod': dict({
+              'timestamp': '2021-04-06T16:44:09.800Z',
+              'value': None,
+            }),
+          }),
+          'custom.disabledCapabilities': dict({
+            'disabledCapabilities': dict({
+              'timestamp': '2024-09-10T10:26:28.605Z',
+              'value': list([
+                'remoteControlStatus',
+                'airQualitySensor',
+                'dustSensor',
+                'odorSensor',
+                'veryFineDustSensor',
+                'custom.dustFilter',
+                'custom.deodorFilter',
+                'custom.deviceReportStateConfiguration',
+                'audioVolume',
+                'custom.autoCleaningMode',
+                'custom.airConditionerTropicalNightMode',
+                'custom.airConditionerOdorController',
+                'demandResponseLoadControl',
+                'relativeHumidityMeasurement',
+              ]),
+            }),
+          }),
+          'custom.dustFilter': dict({
+            'dustFilterCapacity': dict({
+              'timestamp': '2021-04-06T16:43:39.145Z',
+              'value': None,
+            }),
+            'dustFilterLastResetDate': dict({
+              'timestamp': '2021-04-06T16:43:39.145Z',
+              'value': None,
+            }),
+            'dustFilterResetType': dict({
+              'timestamp': '2021-04-06T16:43:39.145Z',
+              'value': None,
+            }),
+            'dustFilterStatus': dict({
+              'timestamp': '2021-04-06T16:43:39.145Z',
+              'value': None,
+            }),
+            'dustFilterUsage': dict({
+              'timestamp': '2021-04-06T16:43:39.145Z',
+              'value': None,
+            }),
+            'dustFilterUsageStep': dict({
+              'timestamp': '2021-04-06T16:43:39.145Z',
+              'value': None,
+            }),
+          }),
+          'custom.energyType': dict({
+            'drMaxDuration': dict({
+              'value': None,
+            }),
+            'energySavingInfo': dict({
+              'value': None,
+            }),
+            'energySavingLevel': dict({
+              'value': None,
+            }),
+            'energySavingOperation': dict({
+              'value': None,
+            }),
+            'energySavingOperationSupport': dict({
+              'value': None,
+            }),
+            'energySavingSupport': dict({
+              'value': None,
+            }),
+            'energyType': dict({
+              'timestamp': '2021-04-06T16:43:38.843Z',
+              'value': None,
+            }),
+            'notificationTemplateID': dict({
+              'value': None,
+            }),
+            'supportedEnergySavingLevels': dict({
+              'value': None,
+            }),
+          }),
+          'custom.spiMode': dict({
+            'spiMode': dict({
+              'timestamp': '2021-04-06T16:57:57.686Z',
+              'value': None,
+            }),
+          }),
+          'custom.thermostatSetpointControl': dict({
+            'maximumSetpoint': dict({
+              'timestamp': '2021-04-08T04:04:19.901Z',
+              'value': None,
+            }),
+            'minimumSetpoint': dict({
+              'timestamp': '2021-04-08T04:04:19.901Z',
+              'value': None,
+            }),
+          }),
+          'demandResponseLoadControl': dict({
+            'drlcStatus': dict({
+              'timestamp': '2021-04-06T16:43:54.748Z',
+              'value': None,
+            }),
+          }),
+          'dustSensor': dict({
+            'dustLevel': dict({
+              'timestamp': '2021-04-06T16:44:10.122Z',
+              'unit': 'μg/m^3',
+              'value': None,
+            }),
+            'fineDustLevel': dict({
+              'timestamp': '2021-04-06T16:44:10.122Z',
+              'unit': 'μg/m^3',
+              'value': None,
+            }),
+          }),
+          'fanOscillationMode': dict({
+            'availableFanOscillationModes': dict({
+              'value': None,
+            }),
+            'fanOscillationMode': dict({
+              'timestamp': '2025-02-08T00:44:53.247Z',
+              'value': 'fixed',
+            }),
+            'supportedFanOscillationModes': dict({
+              'timestamp': '2021-04-06T16:44:10.325Z',
+              'value': None,
+            }),
+          }),
+          'ocf': dict({
+            'di': dict({
+              'timestamp': '2021-04-06T16:44:10.472Z',
+              'value': None,
+            }),
+            'dmv': dict({
+              'timestamp': '2021-04-06T16:44:10.472Z',
+              'value': None,
+            }),
+            'icv': dict({
+              'timestamp': '2021-04-06T16:44:10.472Z',
+              'value': None,
+            }),
+            'mndt': dict({
+              'timestamp': '2021-04-06T16:44:10.472Z',
+              'value': None,
+            }),
+            'mnfv': dict({
+              'timestamp': '2021-04-06T16:44:10.472Z',
+              'value': None,
+            }),
+            'mnhw': dict({
+              'timestamp': '2021-04-06T16:44:10.472Z',
+              'value': None,
+            }),
+            'mnml': dict({
+              'timestamp': '2021-04-06T16:44:10.472Z',
+              'value': None,
+            }),
+            'mnmn': dict({
+              'timestamp': '2021-04-06T16:44:10.472Z',
+              'value': None,
+            }),
+            'mnmo': dict({
+              'timestamp': '2021-04-06T16:44:10.472Z',
+              'value': None,
+            }),
+            'mnos': dict({
+              'timestamp': '2021-04-06T16:44:10.472Z',
+              'value': None,
+            }),
+            'mnpv': dict({
+              'timestamp': '2021-04-06T16:44:10.472Z',
+              'value': None,
+            }),
+            'mnsl': dict({
+              'timestamp': '2021-04-06T16:44:10.472Z',
+              'value': None,
+            }),
+            'n': dict({
+              'timestamp': '2021-04-06T16:44:10.472Z',
+              'value': None,
+            }),
+            'pi': dict({
+              'timestamp': '2021-04-06T16:44:10.472Z',
+              'value': None,
+            }),
+            'st': dict({
+              'timestamp': '2021-04-06T16:44:10.472Z',
+              'value': None,
+            }),
+            'vid': dict({
+              'timestamp': '2021-04-06T16:44:10.472Z',
+              'value': None,
+            }),
+          }),
+          'odorSensor': dict({
+            'odorLevel': dict({
+              'timestamp': '2021-04-06T16:43:38.992Z',
+              'value': None,
+            }),
+          }),
+          'powerConsumptionReport': dict({
+            'powerConsumption': dict({
+              'timestamp': '2021-04-06T16:43:53.364Z',
+              'value': None,
+            }),
+          }),
+          'relativeHumidityMeasurement': dict({
+            'humidity': dict({
+              'timestamp': '2021-04-06T16:43:35.291Z',
+              'unit': '%',
+              'value': 0,
+            }),
+          }),
+          'remoteControlStatus': dict({
+            'remoteControlEnabled': dict({
+              'timestamp': '2021-04-06T16:43:39.097Z',
+              'value': None,
+            }),
+          }),
+          'switch': dict({
+            'switch': dict({
+              'timestamp': '2021-04-06T16:44:10.518Z',
+              'value': None,
+            }),
+          }),
+          'temperatureMeasurement': dict({
+            'temperature': dict({
+              'timestamp': '2021-04-06T16:44:10.373Z',
+              'value': None,
+            }),
+            'temperatureRange': dict({
+              'value': None,
+            }),
+          }),
+          'thermostatCoolingSetpoint': dict({
+            'coolingSetpoint': dict({
+              'timestamp': '2021-04-06T16:43:59.136Z',
+              'value': None,
+            }),
+            'coolingSetpointRange': dict({
+              'value': None,
+            }),
+          }),
+          'veryFineDustSensor': dict({
+            'veryFineDustLevel': dict({
+              'timestamp': '2021-04-06T16:43:38.529Z',
+              'unit': 'μg/m^3',
+              'value': None,
+            }),
+          }),
+        }),
+        'main': dict({
+          'airConditionerFanMode': dict({
+            'availableAcFanModes': dict({
+              'value': None,
+            }),
+            'fanMode': dict({
+              'timestamp': '2025-02-09T09:14:39.249Z',
+              'value': 'low',
+            }),
+            'supportedAcFanModes': dict({
+              'timestamp': '2025-02-09T09:14:39.249Z',
+              'value': list([
+                'auto',
+                'low',
+                'medium',
+                'high',
+                'turbo',
+              ]),
+            }),
+          }),
+          'airConditionerMode': dict({
+            'airConditionerMode': dict({
+              'timestamp': '2025-02-09T09:14:39.642Z',
+              'value': 'heat',
+            }),
+            'availableAcModes': dict({
+              'value': None,
+            }),
+            'supportedAcModes': dict({
+              'timestamp': '2024-09-10T10:26:28.781Z',
+              'value': list([
+                'cool',
+                'dry',
+                'wind',
+                'auto',
+                'heat',
+              ]),
+            }),
+          }),
+          'airQualitySensor': dict({
+            'airQuality': dict({
+              'timestamp': '2021-04-06T16:43:37.208Z',
+              'unit': 'CAQI',
+              'value': None,
+            }),
+          }),
+          'audioVolume': dict({
+            'volume': dict({
+              'timestamp': '2025-02-09T09:14:39.642Z',
+              'unit': '%',
+              'value': 100,
+            }),
+          }),
+          'custom.airConditionerOdorController': dict({
+            'airConditionerOdorControllerProgress': dict({
+              'timestamp': '2021-04-06T16:43:37.555Z',
+              'value': None,
+            }),
+            'airConditionerOdorControllerState': dict({
+              'timestamp': '2021-04-06T16:43:37.555Z',
+              'value': None,
+            }),
+          }),
+          'custom.airConditionerOptionalMode': dict({
+            'acOptionalMode': dict({
+              'timestamp': '2025-02-09T09:14:39.642Z',
+              'value': 'off',
+            }),
+            'supportedAcOptionalMode': dict({
+              'timestamp': '2024-09-10T10:26:28.781Z',
+              'value': list([
+                'off',
+                'windFree',
+              ]),
+            }),
+          }),
+          'custom.airConditionerTropicalNightMode': dict({
+            'acTropicalNightModeLevel': dict({
+              'timestamp': '2025-02-09T09:14:39.642Z',
+              'value': 0,
+            }),
+          }),
+          'custom.autoCleaningMode': dict({
+            'autoCleaningMode': dict({
+              'timestamp': '2025-02-09T09:14:39.642Z',
+              'value': 'off',
+            }),
+            'operatingState': dict({
+              'value': None,
+            }),
+            'progress': dict({
+              'value': None,
+            }),
+            'supportedAutoCleaningModes': dict({
+              'value': None,
+            }),
+            'supportedOperatingStates': dict({
+              'value': None,
+            }),
+            'timedCleanDuration': dict({
+              'value': None,
+            }),
+            'timedCleanDurationRange': dict({
+              'value': None,
+            }),
+          }),
+          'custom.deodorFilter': dict({
+            'deodorFilterCapacity': dict({
+              'timestamp': '2021-04-06T16:43:35.502Z',
+              'value': None,
+            }),
+            'deodorFilterLastResetDate': dict({
+              'timestamp': '2021-04-06T16:43:35.502Z',
+              'value': None,
+            }),
+            'deodorFilterResetType': dict({
+              'timestamp': '2021-04-06T16:43:35.502Z',
+              'value': None,
+            }),
+            'deodorFilterStatus': dict({
+              'timestamp': '2021-04-06T16:43:35.502Z',
+              'value': None,
+            }),
+            'deodorFilterUsage': dict({
+              'timestamp': '2021-04-06T16:43:35.502Z',
+              'value': None,
+            }),
+            'deodorFilterUsageStep': dict({
+              'timestamp': '2021-04-06T16:43:35.502Z',
+              'value': None,
+            }),
+          }),
+          'custom.deviceReportStateConfiguration': dict({
+            'reportStatePeriod': dict({
+              'timestamp': '2021-04-06T16:43:35.643Z',
+              'value': None,
+            }),
+            'reportStateRealtime': dict({
+              'timestamp': '2021-04-06T16:43:35.643Z',
+              'value': None,
+            }),
+            'reportStateRealtimePeriod': dict({
+              'timestamp': '2021-04-06T16:43:35.643Z',
+              'value': None,
+            }),
+          }),
+          'custom.disabledCapabilities': dict({
+            'disabledCapabilities': dict({
+              'timestamp': '2025-02-09T09:14:39.642Z',
+              'value': list([
+                'remoteControlStatus',
+                'airQualitySensor',
+                'dustSensor',
+                'veryFineDustSensor',
+                'custom.dustFilter',
+                'custom.deodorFilter',
+                'custom.deviceReportStateConfiguration',
+                'samsungce.dongleSoftwareInstallation',
+                'demandResponseLoadControl',
+                'custom.airConditionerOdorController',
+              ]),
+            }),
+          }),
+          'custom.disabledComponents': dict({
+            'disabledComponents': dict({
+              'timestamp': '2025-02-09T09:14:39.642Z',
+              'value': list([
+                '1',
+              ]),
+            }),
+          }),
+          'custom.dustFilter': dict({
+            'dustFilterCapacity': dict({
+              'timestamp': '2021-04-06T16:43:35.527Z',
+              'value': None,
+            }),
+            'dustFilterLastResetDate': dict({
+              'timestamp': '2021-04-06T16:43:35.527Z',
+              'value': None,
+            }),
+            'dustFilterResetType': dict({
+              'timestamp': '2021-04-06T16:43:35.527Z',
+              'value': None,
+            }),
+            'dustFilterStatus': dict({
+              'timestamp': '2021-04-06T16:43:35.527Z',
+              'value': None,
+            }),
+            'dustFilterUsage': dict({
+              'timestamp': '2021-04-06T16:43:35.527Z',
+              'value': None,
+            }),
+            'dustFilterUsageStep': dict({
+              'timestamp': '2021-04-06T16:43:35.527Z',
+              'value': None,
+            }),
+          }),
+          'custom.energyType': dict({
+            'drMaxDuration': dict({
+              'value': None,
+            }),
+            'energySavingInfo': dict({
+              'value': None,
+            }),
+            'energySavingLevel': dict({
+              'value': None,
+            }),
+            'energySavingOperation': dict({
+              'value': None,
+            }),
+            'energySavingOperationSupport': dict({
+              'value': None,
+            }),
+            'energySavingSupport': dict({
+              'timestamp': '2021-12-29T07:29:17.526Z',
+              'value': False,
+            }),
+            'energyType': dict({
+              'timestamp': '2024-09-10T10:26:28.781Z',
+              'value': '1.0',
+            }),
+            'notificationTemplateID': dict({
+              'value': None,
+            }),
+            'supportedEnergySavingLevels': dict({
+              'value': None,
+            }),
+          }),
+          'custom.spiMode': dict({
+            'spiMode': dict({
+              'timestamp': '2025-02-09T09:14:39.642Z',
+              'value': 'off',
+            }),
+          }),
+          'custom.thermostatSetpointControl': dict({
+            'maximumSetpoint': dict({
+              'timestamp': '2024-09-10T10:26:28.781Z',
+              'unit': 'C',
+              'value': 30,
+            }),
+            'minimumSetpoint': dict({
+              'timestamp': '2025-01-08T06:30:58.307Z',
+              'unit': 'C',
+              'value': 16,
+            }),
+          }),
+          'demandResponseLoadControl': dict({
+            'drlcStatus': dict({
+              'timestamp': '2024-09-10T10:26:28.781Z',
+              'value': dict({
+                'drlcLevel': -1,
+                'drlcType': 1,
+                'duration': 0,
+                'override': False,
+                'start': '1970-01-01T00:00:00Z',
+              }),
+            }),
+          }),
+          'dustSensor': dict({
+            'dustLevel': dict({
+              'timestamp': '2021-04-06T16:43:35.665Z',
+              'unit': 'μg/m^3',
+              'value': None,
+            }),
+            'fineDustLevel': dict({
+              'timestamp': '2021-04-06T16:43:35.665Z',
+              'unit': 'μg/m^3',
+              'value': None,
+            }),
+          }),
+          'execute': dict({
+            'data': dict({
+              'data': dict({
+                'href': '/temperature/desired/0',
+              }),
+              'timestamp': '2023-07-19T03:07:43.270Z',
+              'value': dict({
+                'payload': dict({
+                  'if': list([
+                    'oic.if.baseline',
+                    'oic.if.a',
+                  ]),
+                  'range': list([
+                    16.0,
+                    30.0,
+                  ]),
+                  'rt': list([
+                    'oic.r.temperature',
+                  ]),
+                  'temperature': 22.0,
+                  'units': 'C',
+                }),
+              }),
+            }),
+          }),
+          'fanOscillationMode': dict({
+            'availableFanOscillationModes': dict({
+              'value': None,
+            }),
+            'fanOscillationMode': dict({
+              'timestamp': '2025-02-09T09:14:39.249Z',
+              'value': 'fixed',
+            }),
+            'supportedFanOscillationModes': dict({
+              'timestamp': '2021-04-06T16:43:35.782Z',
+              'value': None,
+            }),
+          }),
+          'ocf': dict({
+            'di': dict({
+              'timestamp': '2024-09-10T10:26:28.552Z',
+              'value': '96a5ef74-5832-a84b-f1f7-ca799957065d',
+            }),
+            'dmv': dict({
+              'timestamp': '2024-09-10T10:26:28.552Z',
+              'value': 'res.1.1.0,sh.1.1.0',
+            }),
+            'icv': dict({
+              'timestamp': '2024-09-10T10:26:28.552Z',
+              'value': 'core.1.1.0',
+            }),
+            'mndt': dict({
+              'timestamp': '2021-04-06T16:43:35.912Z',
+              'value': None,
+            }),
+            'mnfv': dict({
+              'timestamp': '2024-09-10T10:26:28.552Z',
+              'value': '0.1.0',
+            }),
+            'mnhw': dict({
+              'timestamp': '2024-09-10T10:26:28.552Z',
+              'value': '1.0',
+            }),
+            'mnml': dict({
+              'timestamp': '2024-09-10T10:26:28.552Z',
+              'value': 'http://www.samsung.com',
+            }),
+            'mnmn': dict({
+              'timestamp': '2024-09-10T10:26:28.552Z',
+              'value': 'Samsung Electronics',
+            }),
+            'mnmo': dict({
+              'timestamp': '2024-09-10T10:26:28.781Z',
+              'value': 'ARTIK051_KRAC_18K|10193441|60010132001111110200000000000000',
+            }),
+            'mnos': dict({
+              'timestamp': '2024-09-10T10:26:28.552Z',
+              'value': 'TizenRT2.0',
+            }),
+            'mnpv': dict({
+              'timestamp': '2024-09-10T10:26:28.552Z',
+              'value': '0G3MPDCKA00010E',
+            }),
+            'mnsl': dict({
+              'timestamp': '2021-04-06T16:43:35.803Z',
+              'value': None,
+            }),
+            'n': dict({
+              'timestamp': '2024-09-10T10:26:28.552Z',
+              'value': '[room a/c] Samsung',
+            }),
+            'pi': dict({
+              'timestamp': '2024-09-10T10:26:28.552Z',
+              'value': '96a5ef74-5832-a84b-f1f7-ca799957065d',
+            }),
+            'st': dict({
+              'timestamp': '2021-04-06T16:43:35.933Z',
+              'value': None,
+            }),
+            'vid': dict({
+              'timestamp': '2024-09-10T10:26:28.552Z',
+              'value': 'DA-AC-RAC-000001',
+            }),
+          }),
+          'powerConsumptionReport': dict({
+            'powerConsumption': dict({
+              'timestamp': '2025-02-09T16:15:33.639Z',
+              'value': dict({
+                'deltaEnergy': 400,
+                'end': '2025-02-09T16:15:33Z',
+                'energy': 2247300,
+                'energySaved': 0,
+                'persistedEnergy': 2247300,
+                'power': 0,
+                'powerEnergy': 0.0,
+                'start': '2025-02-09T15:45:29Z',
+              }),
+            }),
+          }),
+          'refresh': dict({
+          }),
+          'relativeHumidityMeasurement': dict({
+            'humidity': dict({
+              'timestamp': '2024-12-30T13:10:23.759Z',
+              'unit': '%',
+              'value': 60,
+            }),
+          }),
+          'remoteControlStatus': dict({
+            'remoteControlEnabled': dict({
+              'timestamp': '2021-04-06T16:43:35.379Z',
+              'value': None,
+            }),
+          }),
+          'samsungce.deviceIdentification': dict({
+            'binaryId': dict({
+              'timestamp': '2025-02-08T00:44:53.855Z',
+              'value': 'ARTIK051_KRAC_18K',
+            }),
+            'description': dict({
+              'value': None,
+            }),
+            'micomAssayCode': dict({
+              'value': None,
+            }),
+            'modelClassificationCode': dict({
+              'value': None,
+            }),
+            'modelName': dict({
+              'value': None,
+            }),
+            'releaseYear': dict({
+              'value': None,
+            }),
+            'serialNumber': dict({
+              'value': None,
+            }),
+            'serialNumberExtra': dict({
+              'value': None,
+            }),
+          }),
+          'samsungce.dongleSoftwareInstallation': dict({
+            'status': dict({
+              'timestamp': '2021-12-29T01:36:51.289Z',
+              'value': 'completed',
+            }),
+          }),
+          'samsungce.driverVersion': dict({
+            'versionNumber': dict({
+              'timestamp': '2024-09-04T06:35:09.557Z',
+              'value': 24070101,
+            }),
+          }),
+          'samsungce.selfCheck': dict({
+            'errors': dict({
+              'timestamp': '2025-02-08T00:44:53.349Z',
+              'value': list([
+              ]),
+            }),
+            'progress': dict({
+              'value': None,
+            }),
+            'result': dict({
+              'value': None,
+            }),
+            'status': dict({
+              'timestamp': '2025-02-08T00:44:53.549Z',
+              'value': 'ready',
+            }),
+            'supportedActions': dict({
+              'timestamp': '2024-09-04T06:35:09.557Z',
+              'value': list([
+                'start',
+              ]),
+            }),
+          }),
+          'samsungce.softwareUpdate': dict({
+            'availableModules': dict({
+              'timestamp': '2025-02-08T00:44:53.855Z',
+              'value': list([
+              ]),
+            }),
+            'lastUpdatedDate': dict({
+              'value': None,
+            }),
+            'newVersionAvailable': dict({
+              'timestamp': '2025-02-08T00:44:53.855Z',
+              'value': False,
+            }),
+            'operatingState': dict({
+              'value': None,
+            }),
+            'otnDUID': dict({
+              'timestamp': '2025-02-08T00:44:53.855Z',
+              'value': '43CEZFTFFL7Z2',
+            }),
+            'progress': dict({
+              'value': None,
+            }),
+            'targetModule': dict({
+              'value': None,
+            }),
+          }),
+          'switch': dict({
+            'switch': dict({
+              'timestamp': '2025-02-09T16:37:54.072Z',
+              'value': 'off',
+            }),
+          }),
+          'temperatureMeasurement': dict({
+            'temperature': dict({
+              'timestamp': '2025-02-09T16:33:29.164Z',
+              'unit': 'C',
+              'value': 25,
+            }),
+            'temperatureRange': dict({
+              'value': None,
+            }),
+          }),
+          'thermostatCoolingSetpoint': dict({
+            'coolingSetpoint': dict({
+              'timestamp': '2025-02-09T09:15:11.608Z',
+              'unit': 'C',
+              'value': 25,
+            }),
+            'coolingSetpointRange': dict({
+              'value': None,
+            }),
+          }),
+          'veryFineDustSensor': dict({
+            'veryFineDustLevel': dict({
+              'timestamp': '2021-04-06T16:43:35.363Z',
+              'unit': 'μg/m^3',
+              'value': None,
+            }),
+          }),
+        }),
+      }),
+    }),
+  })
+# ---
diff --git a/tests/components/smartthings/snapshots/test_event.ambr b/tests/components/smartthings/snapshots/test_event.ambr
new file mode 100644
index 00000000000..79c57df5fd7
--- /dev/null
+++ b/tests/components/smartthings/snapshots/test_event.ambr
@@ -0,0 +1,361 @@
+# serializer version: 1
+# name: test_all_entities[heatit_zpushwall][event.livingroom_smart_switch_button1-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'event_types': list([
+        'pushed',
+        'held',
+        'down_hold',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'event',
+    'entity_category': None,
+    'entity_id': 'event.livingroom_smart_switch_button1',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <EventDeviceClass.BUTTON: 'button'>,
+    'original_icon': None,
+    'original_name': 'button1',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'button',
+    'unique_id': '5e5b97f3-3094-44e6-abc0-f61283412d6a_button1_button',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[heatit_zpushwall][event.livingroom_smart_switch_button1-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'button',
+      'event_type': None,
+      'event_types': list([
+        'pushed',
+        'held',
+        'down_hold',
+      ]),
+      'friendly_name': 'Livingroom smart switch button1',
+    }),
+    'context': <ANY>,
+    'entity_id': 'event.livingroom_smart_switch_button1',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_all_entities[heatit_zpushwall][event.livingroom_smart_switch_button2-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'event_types': list([
+        'pushed',
+        'held',
+        'down_hold',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'event',
+    'entity_category': None,
+    'entity_id': 'event.livingroom_smart_switch_button2',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <EventDeviceClass.BUTTON: 'button'>,
+    'original_icon': None,
+    'original_name': 'button2',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'button',
+    'unique_id': '5e5b97f3-3094-44e6-abc0-f61283412d6a_button2_button',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[heatit_zpushwall][event.livingroom_smart_switch_button2-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'button',
+      'event_type': None,
+      'event_types': list([
+        'pushed',
+        'held',
+        'down_hold',
+      ]),
+      'friendly_name': 'Livingroom smart switch button2',
+    }),
+    'context': <ANY>,
+    'entity_id': 'event.livingroom_smart_switch_button2',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_all_entities[heatit_zpushwall][event.livingroom_smart_switch_button3-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'event_types': list([
+        'pushed',
+        'held',
+        'down_hold',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'event',
+    'entity_category': None,
+    'entity_id': 'event.livingroom_smart_switch_button3',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <EventDeviceClass.BUTTON: 'button'>,
+    'original_icon': None,
+    'original_name': 'button3',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'button',
+    'unique_id': '5e5b97f3-3094-44e6-abc0-f61283412d6a_button3_button',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[heatit_zpushwall][event.livingroom_smart_switch_button3-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'button',
+      'event_type': None,
+      'event_types': list([
+        'pushed',
+        'held',
+        'down_hold',
+      ]),
+      'friendly_name': 'Livingroom smart switch button3',
+    }),
+    'context': <ANY>,
+    'entity_id': 'event.livingroom_smart_switch_button3',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_all_entities[heatit_zpushwall][event.livingroom_smart_switch_button4-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'event_types': list([
+        'pushed',
+        'held',
+        'down_hold',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'event',
+    'entity_category': None,
+    'entity_id': 'event.livingroom_smart_switch_button4',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <EventDeviceClass.BUTTON: 'button'>,
+    'original_icon': None,
+    'original_name': 'button4',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'button',
+    'unique_id': '5e5b97f3-3094-44e6-abc0-f61283412d6a_button4_button',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[heatit_zpushwall][event.livingroom_smart_switch_button4-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'button',
+      'event_type': None,
+      'event_types': list([
+        'pushed',
+        'held',
+        'down_hold',
+      ]),
+      'friendly_name': 'Livingroom smart switch button4',
+    }),
+    'context': <ANY>,
+    'entity_id': 'event.livingroom_smart_switch_button4',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_all_entities[heatit_zpushwall][event.livingroom_smart_switch_button5-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'event_types': list([
+        'pushed',
+        'held',
+        'down_hold',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'event',
+    'entity_category': None,
+    'entity_id': 'event.livingroom_smart_switch_button5',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <EventDeviceClass.BUTTON: 'button'>,
+    'original_icon': None,
+    'original_name': 'button5',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'button',
+    'unique_id': '5e5b97f3-3094-44e6-abc0-f61283412d6a_button5_button',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[heatit_zpushwall][event.livingroom_smart_switch_button5-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'button',
+      'event_type': None,
+      'event_types': list([
+        'pushed',
+        'held',
+        'down_hold',
+      ]),
+      'friendly_name': 'Livingroom smart switch button5',
+    }),
+    'context': <ANY>,
+    'entity_id': 'event.livingroom_smart_switch_button5',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_all_entities[heatit_zpushwall][event.livingroom_smart_switch_button6-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'event_types': list([
+        'pushed',
+        'held',
+        'down_hold',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'event',
+    'entity_category': None,
+    'entity_id': 'event.livingroom_smart_switch_button6',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <EventDeviceClass.BUTTON: 'button'>,
+    'original_icon': None,
+    'original_name': 'button6',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'button',
+    'unique_id': '5e5b97f3-3094-44e6-abc0-f61283412d6a_button6_button',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[heatit_zpushwall][event.livingroom_smart_switch_button6-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'button',
+      'event_type': None,
+      'event_types': list([
+        'pushed',
+        'held',
+        'down_hold',
+      ]),
+      'friendly_name': 'Livingroom smart switch button6',
+    }),
+    'context': <ANY>,
+    'entity_id': 'event.livingroom_smart_switch_button6',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
diff --git a/tests/components/smartthings/snapshots/test_fan.ambr b/tests/components/smartthings/snapshots/test_fan.ambr
new file mode 100644
index 00000000000..1196118b3b5
--- /dev/null
+++ b/tests/components/smartthings/snapshots/test_fan.ambr
@@ -0,0 +1,121 @@
+# serializer version: 1
+# name: test_all_entities[fake_fan][fan.fake_fan-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'preset_modes': list([
+        'auto',
+        'low',
+        'medium',
+        'high',
+        'turbo',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'fan',
+    'entity_category': None,
+    'entity_id': 'fan.fake_fan',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <FanEntityFeature: 57>,
+    'translation_key': None,
+    'unique_id': 'f1af21a2-d5a1-437c-b10a-b34a87394b71_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[fake_fan][fan.fake_fan-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Fake fan',
+      'percentage': 2000,
+      'percentage_step': 33.333333333333336,
+      'preset_mode': None,
+      'preset_modes': list([
+        'auto',
+        'low',
+        'medium',
+        'high',
+        'turbo',
+      ]),
+      'supported_features': <FanEntityFeature: 57>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'fan.fake_fan',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[generic_fan_3_speed][fan.bedroom_fan-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'preset_modes': None,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'fan',
+    'entity_category': None,
+    'entity_id': 'fan.bedroom_fan',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <FanEntityFeature: 49>,
+    'translation_key': None,
+    'unique_id': '6d95a8b7-4ee3-429a-a13a-00ec9354170c_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[generic_fan_3_speed][fan.bedroom_fan-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Bedroom Fan',
+      'percentage': 0,
+      'percentage_step': 33.333333333333336,
+      'preset_mode': None,
+      'preset_modes': None,
+      'supported_features': <FanEntityFeature: 49>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'fan.bedroom_fan',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
diff --git a/tests/components/smartthings/snapshots/test_init.ambr b/tests/components/smartthings/snapshots/test_init.ambr
new file mode 100644
index 00000000000..6a402182b82
--- /dev/null
+++ b/tests/components/smartthings/snapshots/test_init.ambr
@@ -0,0 +1,1790 @@
+# serializer version: 1
+# name: test_button_event[button]
+  <Event smartthings.button[L]: component_id=main, device_id=c4bdd19f-85d1-4d58-8f9c-e75ac3cf113b, location_id=abc, value=pushed, name=button, data=None>
+# ---
+# name: test_devices[abl_light_b_001]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '7c16163e-c94e-482f-95f6-139ae0cd9d5e',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'Kitchen Light 5',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[aeotec_home_energy_meter_gen5]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'toilet',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        'f0af21a2-d5a1-437c-b10a-b34a87394b71',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'Aeotec Energy Monitor',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Toilet',
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[aux_ac]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        'bf53a150-f8a4-45d1-aac4-86252475d551',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'AUX A/C on-off',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[base_electric_meter]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '68e786a6-7f61-4c3a-9e13-70b803cf782b',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'Aeon Energy Monitor',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[bosch_radiator_thermostat_ii]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '286ba274-4093-4bcb-849c-a1a3efe7b1e5',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'Radiator Thermostat II [+M] Wohnzimmer',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[c2c_arlo_pro_3_switch]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '10e06a70-ee7d-4832-85e9-a0a06a7a05bd',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Arlo',
+    'model': 'VMC4041PB',
+    'model_id': None,
+    'name': '2nd Floor Hallway',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[c2c_shade]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': 'WoCurtain3-WoCurtain3',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '571af102-15db-4030-b76b-245a691f74a5',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'WonderLabs Company',
+    'model': 'WoCurtain3',
+    'model_id': None,
+    'name': 'Curtain 1A',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[centralite]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        'd0268a69-abfb-4c92-a646-61cec2e510ad',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'Dimmer Debian',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[contact_sensor]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '2d9a892b-1c93-45a5-84cb-0e81889498c6',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': '.Front Door Open/Closed Sensor',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[da_ac_airsensor_01001]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': 'Realtek',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        'a3a970ea-e09c-9c04-161b-94c934e21666',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': 'ASM-KR-TP1-22-ACMB1M',
+    'model_id': None,
+    'name': '에어모니터 플러스',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': 'ASM-KR-TP1-22-ACMB1M_16240426',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[da_ac_rac_000001]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '96a5ef74-5832-a84b-f1f7-ca799957065d',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': None,
+    'model_id': None,
+    'name': 'AC Office Granit',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[da_ac_rac_01001]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': 'Realtek',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '4ece486b-89db-f06a-d54d-748b676b4d8e',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': 'ARA-WW-TP1-22-COMMON',
+    'model_id': None,
+    'name': 'Aire Dormitorio Principal',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': 'ARA-WW-TP1-22-COMMON_11240702',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[da_ac_rac_100001]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        'F8042E25-0E53-0000-0000-000000000000',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': 'TP6X_RAC_15K',
+    'model_id': None,
+    'name': 'Corridor A/C',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[da_ks_cooktop_31001]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '808dbd84-f357-47e2-a0cd-3b66fa22d584',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'Induction Hob',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[da_ks_microwave_0101x]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': 'MediaTek',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '2bad3237-4886-e699-1b90-4a51a3d55c8a',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': 'TP2X_DA-KS-MICROWAVE-0101X',
+    'model_id': None,
+    'name': 'Microwave',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': 'AKS-WW-TP2-20-MICROWAVE-OTR_40230125',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[da_ks_oven_01061]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': 'Realtek',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '9447959a-0dfa-6b27-d40d-650da525c53f',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': 'TP1X_DA-KS-OVEN-01061',
+    'model_id': None,
+    'name': 'Oven',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': 'AKS-WW-TP1X-21-OVEN_40211229',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[da_ks_range_0101x]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': 'Realtek',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '2c3cbaa0-1899-5ddc-7b58-9d657bd48f18',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': 'TP1X_DA-KS-RANGE-0101X',
+    'model_id': None,
+    'name': 'Vulcan',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': 'AKS-WW-TP1-20-OVEN-3-CR_40240205',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[da_ref_normal_000001]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': 'MediaTek',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '7db87911-7dce-1cf2-7119-b953432a2f09',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': 'TP2X_REF_20K',
+    'model_id': None,
+    'name': 'Refrigerator',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': 'A-RFWW-TP2-21-COMMON_20220110',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[da_rvc_normal_000001]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': '1.0',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '3442dfc6-17c0-a65f-dae0-4c6e01786f44',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': 'powerbot_7000_17M',
+    'model_id': None,
+    'name': 'Robot vacuum',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': '1.0',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[da_sac_ehs_000001_sub]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': '',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '1f98ebd0-ac48-d802-7f62-000001200100',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': 'SAC_EHS_MONO',
+    'model_id': None,
+    'name': 'Eco Heating System',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '20240611.1',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[da_wm_dw_000001]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': 'ARTIK051',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        'f36dc7ce-cac0-0667-dc14-a3704eb5e676',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': 'DA_DW_A51_20_COMMON',
+    'model_id': None,
+    'name': 'Dishwasher',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': 'DA_DW_A51_20_COMMON_30230714',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[da_wm_sc_000001]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': 'MediaTek',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        'b93211bf-9d96-bd21-3b2f-964fcc87f5cc',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': 'DA_DF_TP2_20_COMMON',
+    'model_id': None,
+    'name': 'AirDresser',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': 'DA_DF_TP2_20_COMMON_30230807',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[da_wm_wd_000001]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': 'ARTIK051',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '02f7256e-8353-5bdd-547f-bd5b1647e01b',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': 'DA_WM_A51_20_COMMON',
+    'model_id': None,
+    'name': 'Dryer',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': 'DA_WM_A51_20_COMMON_30230708',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[da_wm_wd_000001_1]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': 'ARTIK051',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '3a6c4e05-811d-5041-e956-3d04c424cbcd',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': 'DA_WM_A51_20_COMMON',
+    'model_id': None,
+    'name': 'Seca-Roupa',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': 'DA_WM_A51_20_COMMON_30230708',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[da_wm_wm_000001]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': 'MediaTek',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        'f984b91d-f250-9d42-3436-33f09a422a47',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': 'DA_WM_TP2_20_COMMON',
+    'model_id': None,
+    'name': 'Washer',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': 'DA_WM_TP2_20_COMMON_30230804',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[da_wm_wm_000001_1]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': 'ARTIK051',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '63803fae-cbed-f356-a063-2cf148ae3ca7',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': 'DA_WM_A51_20_COMMON',
+    'model_id': None,
+    'name': 'Washing Machine',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': 'DA_WM_A51_20_COMMON_30230708',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[ecobee_sensor]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': '250206213001',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        'd5dc3299-c266-41c7-bd08-f540aea54b89',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'ecobee',
+    'model': 'aresSmart-ecobee3_remote_sensor',
+    'model_id': None,
+    'name': 'Child Bedroom',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '250206213001',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[ecobee_thermostat]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': '250206151734',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '028469cb-6e89-4f14-8d9a-bfbca5e0fbfc',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'ecobee',
+    'model': 'aresSmart-thermostat',
+    'model_id': None,
+    'name': 'Main Floor',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '250206151734',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[ecobee_thermostat_offline]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': '250308073247',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '1888b38f-6246-4f1e-911b-bfcfb66999db',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'ecobee',
+    'model': 'nikeSmart-thermostat',
+    'model_id': None,
+    'name': 'Downstairs',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '250308073247',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[fake_fan]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        'f1af21a2-d5a1-437c-b10a-b34a87394b71',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'Fake fan',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[ge_in_wall_smart_dimmer]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        'aaedaf28-2ae0-4c1d-b57e-87f6a420c298',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'Basement Exit Light',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[generic_ef00_v1]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '656569c2-7976-4232-a789-34b4d1176c3a',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'Thermostat Küche',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[generic_fan_3_speed]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '6d95a8b7-4ee3-429a-a13a-00ec9354170c',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'Bedroom Fan',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[heatit_zpushwall]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '5e5b97f3-3094-44e6-abc0-f61283412d6a',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'Livingroom smart switch',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[heatit_ztrm3_thermostat]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '69a271f6-6537-4982-8cd9-979866872692',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'Hall thermostat',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[hue_color_temperature_bulb]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': 'LTG002',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '440063de-a200-40b5-8a6b-f3399eaa0370',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Signify Netherlands B.V.',
+    'model': 'Hue ambiance spot',
+    'model_id': None,
+    'name': 'Bathroom spot',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '1.122.2',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[hue_rgbw_color_bulb]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': 'LCA001',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        'cb958955-b015-498c-9e62-fc0c51abd054',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Signify Netherlands B.V.',
+    'model': 'Hue color lamp',
+    'model_id': None,
+    'name': 'Standing light',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '1.122.2',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[hw_q80r_soundbar]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': '0-0',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        'afcf3b91-0000-1111-2222-ddff2a0a6577',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': 'Q80R',
+    'model_id': None,
+    'name': 'Soundbar',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': 'HW-Q80RWWB-1012.6',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[ikea_kadrilj]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '71afed1c-006d-4e48-b16e-e7f88f9fd638',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'Kitchen IKEA KADRILJ Window blind',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[im_speaker_ai_0001]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': '1.0',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        'c9276e43-fe3c-88c3-1dcc-2eb79e292b8c',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': 'SM-V310',
+    'model_id': None,
+    'name': 'Galaxy Home Mini',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': 'V310XXU1AWK1',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[iphone]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '184c67cc-69e2-44b6-8f73-55c963068ad9',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'iPhone',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[multipurpose_sensor]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '7d246592-93db-4d72-a10d-5a51793ece8c',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'Deck Door',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[sensibo_airconditioner_1]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': 'SKY40147',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        'bf4b1167-48a3-4af7-9186-0900a678ffa5',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Sensibo',
+    'model': 'skyplus',
+    'model_id': None,
+    'name': 'Office',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': 'SKY40147',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[smart_plug]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '550a1c72-65a0-4d55-b97b-75168e055398',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'Arlo Beta Basestation',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[sonos_player]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        'c85fced9-c474-4a47-93c2-037cc7829536',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'Elliots Rum',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[tplink_p110]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': '1.0',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '6602696a-1e48-49e4-919f-69406f5b5da1',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'TP-Link',
+    'model': 'P110',
+    'model_id': None,
+    'name': 'Spülmaschine',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '1.3.1 Build 240621 Rel.162048',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[vd_network_audio_002s]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': '',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '0d94e5db-8501-2355-eb4f-214163702cac',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': 'HW-Q990C',
+    'model_id': None,
+    'name': 'Soundbar Living',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': 'SAT-iMX8M23WWC-1010.5',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[vd_sensor_light_2023]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': '',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '5cc1c096-98b9-460c-8f1c-1045509ec605',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': 'QE55LS03DAUXXN',
+    'model_id': None,
+    'name': 'Light Sensor - 55" The Frame',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': 'latest',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[vd_stv_2017_k]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': '0-0',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '4588d2d9-a8cf-40f4-9a0b-ed5dfbaccda1',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'Samsung Electronics',
+    'model': 'UN49MU8000',
+    'model_id': None,
+    'name': '[TV] Samsung 8 Series (49)',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': 'T-KTMAKUC-1290.3',
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[virtual_thermostat]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '2894dc93-0f11-49cc-8a81-3a684cebebf6',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'asd',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[virtual_valve]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '612ab3c2-3bb0-48f7-b2c0-15b169cb2fc3',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'volvo',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[virtual_water_sensor]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        'a2a6018b-2663-4727-9d1d-8f56953b5116',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'asd',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_devices[yale_push_button_deadbolt_lock]
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        'a9f587c5-5d8b-4273-8907-e7f609af5158',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'Basement Door Lock',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_hub_via_device
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'theater',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://account.smartthings.com',
+    'connections': set({
+      tuple(
+        'mac',
+        'd0:52:a8:72:91:02',
+      ),
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'smartthings',
+        '074fa784-8be8-4c70-8e22-6f5ed6f81b7e',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': 'V2_HUB',
+    'model_id': None,
+    'name': 'Home Hub',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Theater',
+    'sw_version': '000.055.00005',
+    'via_device_id': None,
+  })
+# ---
diff --git a/tests/components/smartthings/snapshots/test_light.ambr b/tests/components/smartthings/snapshots/test_light.ambr
new file mode 100644
index 00000000000..6826a555f6a
--- /dev/null
+++ b/tests/components/smartthings/snapshots/test_light.ambr
@@ -0,0 +1,337 @@
+# serializer version: 1
+# name: test_all_entities[abl_light_b_001][light.kitchen_light_5-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max_color_temp_kelvin': 9000,
+      'max_mireds': 500,
+      'min_color_temp_kelvin': 2000,
+      'min_mireds': 111,
+      'supported_color_modes': list([
+        <ColorMode.COLOR_TEMP: 'color_temp'>,
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'light',
+    'entity_category': None,
+    'entity_id': 'light.kitchen_light_5',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <LightEntityFeature: 32>,
+    'translation_key': None,
+    'unique_id': '7c16163e-c94e-482f-95f6-139ae0cd9d5e_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[abl_light_b_001][light.kitchen_light_5-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'brightness': None,
+      'color_mode': None,
+      'color_temp': None,
+      'color_temp_kelvin': None,
+      'friendly_name': 'Kitchen Light 5',
+      'hs_color': None,
+      'max_color_temp_kelvin': 9000,
+      'max_mireds': 500,
+      'min_color_temp_kelvin': 2000,
+      'min_mireds': 111,
+      'rgb_color': None,
+      'supported_color_modes': list([
+        <ColorMode.COLOR_TEMP: 'color_temp'>,
+      ]),
+      'supported_features': <LightEntityFeature: 32>,
+      'xy_color': None,
+    }),
+    'context': <ANY>,
+    'entity_id': 'light.kitchen_light_5',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_all_entities[centralite][light.dimmer_debian-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'supported_color_modes': list([
+        <ColorMode.BRIGHTNESS: 'brightness'>,
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'light',
+    'entity_category': None,
+    'entity_id': 'light.dimmer_debian',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <LightEntityFeature: 32>,
+    'translation_key': None,
+    'unique_id': 'd0268a69-abfb-4c92-a646-61cec2e510ad_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[centralite][light.dimmer_debian-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'brightness': None,
+      'color_mode': None,
+      'friendly_name': 'Dimmer Debian',
+      'supported_color_modes': list([
+        <ColorMode.BRIGHTNESS: 'brightness'>,
+      ]),
+      'supported_features': <LightEntityFeature: 32>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'light.dimmer_debian',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[ge_in_wall_smart_dimmer][light.basement_exit_light-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'supported_color_modes': list([
+        <ColorMode.BRIGHTNESS: 'brightness'>,
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'light',
+    'entity_category': None,
+    'entity_id': 'light.basement_exit_light',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <LightEntityFeature: 32>,
+    'translation_key': None,
+    'unique_id': 'aaedaf28-2ae0-4c1d-b57e-87f6a420c298_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[ge_in_wall_smart_dimmer][light.basement_exit_light-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'brightness': None,
+      'color_mode': None,
+      'friendly_name': 'Basement Exit Light',
+      'supported_color_modes': list([
+        <ColorMode.BRIGHTNESS: 'brightness'>,
+      ]),
+      'supported_features': <LightEntityFeature: 32>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'light.basement_exit_light',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[hue_color_temperature_bulb][light.bathroom_spot-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max_color_temp_kelvin': 9000,
+      'max_mireds': 500,
+      'min_color_temp_kelvin': 2000,
+      'min_mireds': 111,
+      'supported_color_modes': list([
+        <ColorMode.COLOR_TEMP: 'color_temp'>,
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'light',
+    'entity_category': None,
+    'entity_id': 'light.bathroom_spot',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <LightEntityFeature: 32>,
+    'translation_key': None,
+    'unique_id': '440063de-a200-40b5-8a6b-f3399eaa0370_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[hue_color_temperature_bulb][light.bathroom_spot-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'brightness': 178,
+      'color_mode': <ColorMode.COLOR_TEMP: 'color_temp'>,
+      'color_temp': 333,
+      'color_temp_kelvin': 3000,
+      'friendly_name': 'Bathroom spot',
+      'hs_color': tuple(
+        27.825,
+        56.895,
+      ),
+      'max_color_temp_kelvin': 9000,
+      'max_mireds': 500,
+      'min_color_temp_kelvin': 2000,
+      'min_mireds': 111,
+      'rgb_color': tuple(
+        255,
+        177,
+        110,
+      ),
+      'supported_color_modes': list([
+        <ColorMode.COLOR_TEMP: 'color_temp'>,
+      ]),
+      'supported_features': <LightEntityFeature: 32>,
+      'xy_color': tuple(
+        0.496,
+        0.383,
+      ),
+    }),
+    'context': <ANY>,
+    'entity_id': 'light.bathroom_spot',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_all_entities[hue_rgbw_color_bulb][light.standing_light-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max_color_temp_kelvin': 9000,
+      'max_mireds': 500,
+      'min_color_temp_kelvin': 2000,
+      'min_mireds': 111,
+      'supported_color_modes': list([
+        <ColorMode.COLOR_TEMP: 'color_temp'>,
+        <ColorMode.HS: 'hs'>,
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'light',
+    'entity_category': None,
+    'entity_id': 'light.standing_light',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <LightEntityFeature: 32>,
+    'translation_key': None,
+    'unique_id': 'cb958955-b015-498c-9e62-fc0c51abd054_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[hue_rgbw_color_bulb][light.standing_light-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'brightness': None,
+      'color_mode': None,
+      'color_temp': None,
+      'color_temp_kelvin': None,
+      'friendly_name': 'Standing light',
+      'hs_color': None,
+      'max_color_temp_kelvin': 9000,
+      'max_mireds': 500,
+      'min_color_temp_kelvin': 2000,
+      'min_mireds': 111,
+      'rgb_color': None,
+      'supported_color_modes': list([
+        <ColorMode.COLOR_TEMP: 'color_temp'>,
+        <ColorMode.HS: 'hs'>,
+      ]),
+      'supported_features': <LightEntityFeature: 32>,
+      'xy_color': None,
+    }),
+    'context': <ANY>,
+    'entity_id': 'light.standing_light',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
diff --git a/tests/components/smartthings/snapshots/test_lock.ambr b/tests/components/smartthings/snapshots/test_lock.ambr
new file mode 100644
index 00000000000..325ce0cc677
--- /dev/null
+++ b/tests/components/smartthings/snapshots/test_lock.ambr
@@ -0,0 +1,50 @@
+# serializer version: 1
+# name: test_all_entities[yale_push_button_deadbolt_lock][lock.basement_door_lock-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'lock',
+    'entity_category': None,
+    'entity_id': 'lock.basement_door_lock',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'a9f587c5-5d8b-4273-8907-e7f609af5158_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[yale_push_button_deadbolt_lock][lock.basement_door_lock-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Basement Door Lock',
+      'lock_state': 'locked',
+      'supported_features': <LockEntityFeature: 0>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'lock.basement_door_lock',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'locked',
+  })
+# ---
diff --git a/tests/components/smartthings/snapshots/test_media_player.ambr b/tests/components/smartthings/snapshots/test_media_player.ambr
new file mode 100644
index 00000000000..83f9d19b9fa
--- /dev/null
+++ b/tests/components/smartthings/snapshots/test_media_player.ambr
@@ -0,0 +1,298 @@
+# serializer version: 1
+# name: test_all_entities[hw_q80r_soundbar][media_player.soundbar-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'source_list': list([
+        'wifi',
+        'bluetooth',
+        'HDMI1',
+        'HDMI2',
+        'digital',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'media_player',
+    'entity_category': None,
+    'entity_id': 'media_player.soundbar',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <MediaPlayerDeviceClass.SPEAKER: 'speaker'>,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <MediaPlayerEntityFeature: 23949>,
+    'translation_key': None,
+    'unique_id': 'afcf3b91-0000-1111-2222-ddff2a0a6577_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[hw_q80r_soundbar][media_player.soundbar-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'speaker',
+      'friendly_name': 'Soundbar',
+      'is_volume_muted': False,
+      'media_artist': 'Rick Astley',
+      'media_title': 'Never Gonna Give You Up',
+      'source': 'wifi',
+      'source_list': list([
+        'wifi',
+        'bluetooth',
+        'HDMI1',
+        'HDMI2',
+        'digital',
+      ]),
+      'supported_features': <MediaPlayerEntityFeature: 23949>,
+      'volume_level': 0.01,
+    }),
+    'context': <ANY>,
+    'entity_id': 'media_player.soundbar',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'playing',
+  })
+# ---
+# name: test_all_entities[im_speaker_ai_0001][media_player.galaxy_home_mini-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'media_player',
+    'entity_category': None,
+    'entity_id': 'media_player.galaxy_home_mini',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <MediaPlayerDeviceClass.SPEAKER: 'speaker'>,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <MediaPlayerEntityFeature: 318477>,
+    'translation_key': None,
+    'unique_id': 'c9276e43-fe3c-88c3-1dcc-2eb79e292b8c_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[im_speaker_ai_0001][media_player.galaxy_home_mini-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'speaker',
+      'friendly_name': 'Galaxy Home Mini',
+      'is_volume_muted': False,
+      'repeat': <RepeatMode.OFF: 'off'>,
+      'shuffle': False,
+      'supported_features': <MediaPlayerEntityFeature: 318477>,
+      'volume_level': 0.52,
+    }),
+    'context': <ANY>,
+    'entity_id': 'media_player.galaxy_home_mini',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'idle',
+  })
+# ---
+# name: test_all_entities[sonos_player][media_player.elliots_rum-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'media_player',
+    'entity_category': None,
+    'entity_id': 'media_player.elliots_rum',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <MediaPlayerDeviceClass.SPEAKER: 'speaker'>,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <MediaPlayerEntityFeature: 21517>,
+    'translation_key': None,
+    'unique_id': 'c85fced9-c474-4a47-93c2-037cc7829536_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[sonos_player][media_player.elliots_rum-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'speaker',
+      'friendly_name': 'Elliots Rum',
+      'is_volume_muted': False,
+      'media_artist': 'David Guetta',
+      'media_title': 'Forever Young',
+      'supported_features': <MediaPlayerEntityFeature: 21517>,
+      'volume_level': 0.15,
+    }),
+    'context': <ANY>,
+    'entity_id': 'media_player.elliots_rum',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'playing',
+  })
+# ---
+# name: test_all_entities[vd_network_audio_002s][media_player.soundbar_living-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'media_player',
+    'entity_category': None,
+    'entity_id': 'media_player.soundbar_living',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <MediaPlayerDeviceClass.SPEAKER: 'speaker'>,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <MediaPlayerEntityFeature: 21901>,
+    'translation_key': None,
+    'unique_id': '0d94e5db-8501-2355-eb4f-214163702cac_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[vd_network_audio_002s][media_player.soundbar_living-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'speaker',
+      'friendly_name': 'Soundbar Living',
+      'is_volume_muted': False,
+      'media_artist': '',
+      'media_title': '',
+      'source': 'HDMI1',
+      'supported_features': <MediaPlayerEntityFeature: 21901>,
+      'volume_level': 0.17,
+    }),
+    'context': <ANY>,
+    'entity_id': 'media_player.soundbar_living',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_all_entities[vd_stv_2017_k][media_player.tv_samsung_8_series_49-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'source_list': list([
+        'digitalTv',
+        'HDMI1',
+        'HDMI4',
+        'HDMI4',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'media_player',
+    'entity_category': None,
+    'entity_id': 'media_player.tv_samsung_8_series_49',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <MediaPlayerDeviceClass.TV: 'tv'>,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <MediaPlayerEntityFeature: 23997>,
+    'translation_key': None,
+    'unique_id': '4588d2d9-a8cf-40f4-9a0b-ed5dfbaccda1_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[vd_stv_2017_k][media_player.tv_samsung_8_series_49-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'tv',
+      'friendly_name': '[TV] Samsung 8 Series (49)',
+      'is_volume_muted': True,
+      'source': 'HDMI1',
+      'source_list': list([
+        'digitalTv',
+        'HDMI1',
+        'HDMI4',
+        'HDMI4',
+      ]),
+      'supported_features': <MediaPlayerEntityFeature: 23997>,
+      'volume_level': 0.13,
+    }),
+    'context': <ANY>,
+    'entity_id': 'media_player.tv_samsung_8_series_49',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
diff --git a/tests/components/smartthings/snapshots/test_number.ambr b/tests/components/smartthings/snapshots/test_number.ambr
new file mode 100644
index 00000000000..66aade5b958
--- /dev/null
+++ b/tests/components/smartthings/snapshots/test_number.ambr
@@ -0,0 +1,115 @@
+# serializer version: 1
+# name: test_all_entities[da_wm_wm_000001][number.washer_rinse_cycles-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 5,
+      'min': 0,
+      'mode': <NumberMode.BOX: 'box'>,
+      'step': 1.0,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': None,
+    'entity_id': 'number.washer_rinse_cycles',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Rinse cycles',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'washer_rinse_cycles',
+    'unique_id': 'f984b91d-f250-9d42-3436-33f09a422a47_main_custom.washerRinseCycles_washerRinseCycles_washerRinseCycles',
+    'unit_of_measurement': 'cycles',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][number.washer_rinse_cycles-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Washer Rinse cycles',
+      'max': 5,
+      'min': 0,
+      'mode': <NumberMode.BOX: 'box'>,
+      'step': 1.0,
+      'unit_of_measurement': 'cycles',
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.washer_rinse_cycles',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][number.washing_machine_rinse_cycles-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 5,
+      'min': 0,
+      'mode': <NumberMode.BOX: 'box'>,
+      'step': 1.0,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': None,
+    'entity_id': 'number.washing_machine_rinse_cycles',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Rinse cycles',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'washer_rinse_cycles',
+    'unique_id': '63803fae-cbed-f356-a063-2cf148ae3ca7_main_custom.washerRinseCycles_washerRinseCycles_washerRinseCycles',
+    'unit_of_measurement': 'cycles',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][number.washing_machine_rinse_cycles-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Washing Machine Rinse cycles',
+      'max': 5,
+      'min': 0,
+      'mode': <NumberMode.BOX: 'box'>,
+      'step': 1.0,
+      'unit_of_measurement': 'cycles',
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.washing_machine_rinse_cycles',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2',
+  })
+# ---
diff --git a/tests/components/smartthings/snapshots/test_scene.ambr b/tests/components/smartthings/snapshots/test_scene.ambr
new file mode 100644
index 00000000000..fd9abc9fcca
--- /dev/null
+++ b/tests/components/smartthings/snapshots/test_scene.ambr
@@ -0,0 +1,101 @@
+# serializer version: 1
+# name: test_all_entities[scene.away-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'scene',
+    'entity_category': None,
+    'entity_id': 'scene.away',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Away',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '743b0f37-89b8-476c-aedf-eea8ad8cd29d',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[scene.away-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'color': None,
+      'friendly_name': 'Away',
+      'icon': '203',
+      'location_id': '88a3a314-f0c8-40b4-bb44-44ba06c9c42f',
+    }),
+    'context': <ANY>,
+    'entity_id': 'scene.away',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_all_entities[scene.home-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'scene',
+    'entity_category': None,
+    'entity_id': 'scene.home',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Home',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'f3341e8b-9b32-4509-af2e-4f7c952e98ba',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[scene.home-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'color': None,
+      'friendly_name': 'Home',
+      'icon': '204',
+      'location_id': '88a3a314-f0c8-40b4-bb44-44ba06c9c42f',
+    }),
+    'context': <ANY>,
+    'entity_id': 'scene.home',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
diff --git a/tests/components/smartthings/snapshots/test_select.ambr b/tests/components/smartthings/snapshots/test_select.ambr
new file mode 100644
index 00000000000..06185e09547
--- /dev/null
+++ b/tests/components/smartthings/snapshots/test_select.ambr
@@ -0,0 +1,349 @@
+# serializer version: 1
+# name: test_all_entities[da_wm_dw_000001][select.dishwasher-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'stop',
+        'run',
+        'pause',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'select',
+    'entity_category': None,
+    'entity_id': 'select.dishwasher',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'operating_state',
+    'unique_id': 'f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_dishwasherOperatingState_machineState_machineState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][select.dishwasher-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Dishwasher',
+      'options': list([
+        'stop',
+        'run',
+        'pause',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'select.dishwasher',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'stop',
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][select.airdresser-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'stop',
+        'run',
+        'pause',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'select',
+    'entity_category': None,
+    'entity_id': 'select.airdresser',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'operating_state',
+    'unique_id': 'b93211bf-9d96-bd21-3b2f-964fcc87f5cc_main_dryerOperatingState_machineState_machineState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][select.airdresser-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'AirDresser',
+      'options': list([
+        'stop',
+        'run',
+        'pause',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'select.airdresser',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'stop',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][select.dryer-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'stop',
+        'run',
+        'pause',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'select',
+    'entity_category': None,
+    'entity_id': 'select.dryer',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'operating_state',
+    'unique_id': '02f7256e-8353-5bdd-547f-bd5b1647e01b_main_dryerOperatingState_machineState_machineState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][select.dryer-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Dryer',
+      'options': list([
+        'stop',
+        'run',
+        'pause',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'select.dryer',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'stop',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][select.seca_roupa-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'stop',
+        'run',
+        'pause',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'select',
+    'entity_category': None,
+    'entity_id': 'select.seca_roupa',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'operating_state',
+    'unique_id': '3a6c4e05-811d-5041-e956-3d04c424cbcd_main_dryerOperatingState_machineState_machineState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][select.seca_roupa-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Seca-Roupa',
+      'options': list([
+        'stop',
+        'run',
+        'pause',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'select.seca_roupa',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'stop',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][select.washer-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'stop',
+        'run',
+        'pause',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'select',
+    'entity_category': None,
+    'entity_id': 'select.washer',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'operating_state',
+    'unique_id': 'f984b91d-f250-9d42-3436-33f09a422a47_main_washerOperatingState_machineState_machineState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][select.washer-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Washer',
+      'options': list([
+        'stop',
+        'run',
+        'pause',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'select.washer',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'stop',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][select.washing_machine-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'stop',
+        'run',
+        'pause',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'select',
+    'entity_category': None,
+    'entity_id': 'select.washing_machine',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'operating_state',
+    'unique_id': '63803fae-cbed-f356-a063-2cf148ae3ca7_main_washerOperatingState_machineState_machineState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][select.washing_machine-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Washing Machine',
+      'options': list([
+        'stop',
+        'run',
+        'pause',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'select.washing_machine',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'run',
+  })
+# ---
diff --git a/tests/components/smartthings/snapshots/test_sensor.ambr b/tests/components/smartthings/snapshots/test_sensor.ambr
new file mode 100644
index 00000000000..416a3d15947
--- /dev/null
+++ b/tests/components/smartthings/snapshots/test_sensor.ambr
@@ -0,0 +1,9334 @@
+# serializer version: 1
+# name: test_all_entities[aeotec_home_energy_meter_gen5][sensor.aeotec_energy_monitor_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.aeotec_energy_monitor_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'f0af21a2-d5a1-437c-b10a-b34a87394b71_main_energyMeter_energy_energy',
+    'unit_of_measurement': 'kWh',
+  })
+# ---
+# name: test_all_entities[aeotec_home_energy_meter_gen5][sensor.aeotec_energy_monitor_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Aeotec Energy Monitor Energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': 'kWh',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.aeotec_energy_monitor_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '19978.536',
+  })
+# ---
+# name: test_all_entities[aeotec_home_energy_meter_gen5][sensor.aeotec_energy_monitor_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.aeotec_energy_monitor_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'f0af21a2-d5a1-437c-b10a-b34a87394b71_main_powerMeter_power_power',
+    'unit_of_measurement': 'W',
+  })
+# ---
+# name: test_all_entities[aeotec_home_energy_meter_gen5][sensor.aeotec_energy_monitor_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Aeotec Energy Monitor Power',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'W',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.aeotec_energy_monitor_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2859.743',
+  })
+# ---
+# name: test_all_entities[aeotec_home_energy_meter_gen5][sensor.aeotec_energy_monitor_voltage-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.aeotec_energy_monitor_voltage',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Voltage',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'f0af21a2-d5a1-437c-b10a-b34a87394b71_main_voltageMeasurement_voltage_voltage',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[aeotec_home_energy_meter_gen5][sensor.aeotec_energy_monitor_voltage-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'friendly_name': 'Aeotec Energy Monitor Voltage',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.aeotec_energy_monitor_voltage',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_all_entities[aux_ac][sensor.aux_a_c_on_off_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.aux_a_c_on_off_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'bf53a150-f8a4-45d1-aac4-86252475d551_main_temperatureMeasurement_temperature_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[aux_ac][sensor.aux_a_c_on_off_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'AUX A/C on-off Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.aux_a_c_on_off_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '20.0',
+  })
+# ---
+# name: test_all_entities[base_electric_meter][sensor.aeon_energy_monitor_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.aeon_energy_monitor_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '68e786a6-7f61-4c3a-9e13-70b803cf782b_main_energyMeter_energy_energy',
+    'unit_of_measurement': 'kWh',
+  })
+# ---
+# name: test_all_entities[base_electric_meter][sensor.aeon_energy_monitor_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Aeon Energy Monitor Energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': 'kWh',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.aeon_energy_monitor_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '1930.362',
+  })
+# ---
+# name: test_all_entities[base_electric_meter][sensor.aeon_energy_monitor_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.aeon_energy_monitor_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '68e786a6-7f61-4c3a-9e13-70b803cf782b_main_powerMeter_power_power',
+    'unit_of_measurement': 'W',
+  })
+# ---
+# name: test_all_entities[base_electric_meter][sensor.aeon_energy_monitor_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Aeon Energy Monitor Power',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'W',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.aeon_energy_monitor_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '938.3',
+  })
+# ---
+# name: test_all_entities[bosch_radiator_thermostat_ii][sensor.radiator_thermostat_ii_m_wohnzimmer_battery-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.radiator_thermostat_ii_m_wohnzimmer_battery',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
+    'original_icon': None,
+    'original_name': 'Battery',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '286ba274-4093-4bcb-849c-a1a3efe7b1e5_main_battery_battery_battery',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[bosch_radiator_thermostat_ii][sensor.radiator_thermostat_ii_m_wohnzimmer_battery-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'battery',
+      'friendly_name': 'Radiator Thermostat II [+M] Wohnzimmer Battery',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.radiator_thermostat_ii_m_wohnzimmer_battery',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '94',
+  })
+# ---
+# name: test_all_entities[bosch_radiator_thermostat_ii][sensor.radiator_thermostat_ii_m_wohnzimmer_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.radiator_thermostat_ii_m_wohnzimmer_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '286ba274-4093-4bcb-849c-a1a3efe7b1e5_main_temperatureMeasurement_temperature_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[bosch_radiator_thermostat_ii][sensor.radiator_thermostat_ii_m_wohnzimmer_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Radiator Thermostat II [+M] Wohnzimmer Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.radiator_thermostat_ii_m_wohnzimmer_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '23.9',
+  })
+# ---
+# name: test_all_entities[c2c_arlo_pro_3_switch][sensor.2nd_floor_hallway_alarm-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'both',
+        'strobe',
+        'siren',
+        'off',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.2nd_floor_hallway_alarm',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Alarm',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'alarm',
+    'unique_id': '10e06a70-ee7d-4832-85e9-a0a06a7a05bd_main_alarm_alarm_alarm',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[c2c_arlo_pro_3_switch][sensor.2nd_floor_hallway_alarm-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': '2nd Floor Hallway Alarm',
+      'options': list([
+        'both',
+        'strobe',
+        'siren',
+        'off',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.2nd_floor_hallway_alarm',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[c2c_arlo_pro_3_switch][sensor.2nd_floor_hallway_battery-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.2nd_floor_hallway_battery',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
+    'original_icon': None,
+    'original_name': 'Battery',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '10e06a70-ee7d-4832-85e9-a0a06a7a05bd_main_battery_battery_battery',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[c2c_arlo_pro_3_switch][sensor.2nd_floor_hallway_battery-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'battery',
+      'friendly_name': '2nd Floor Hallway Battery',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.2nd_floor_hallway_battery',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '100',
+  })
+# ---
+# name: test_all_entities[centralite][sensor.dimmer_debian_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.dimmer_debian_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'd0268a69-abfb-4c92-a646-61cec2e510ad_main_powerMeter_power_power',
+    'unit_of_measurement': 'W',
+  })
+# ---
+# name: test_all_entities[centralite][sensor.dimmer_debian_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Dimmer Debian Power',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'W',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.dimmer_debian_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[contact_sensor][sensor.front_door_open_closed_sensor_battery-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.front_door_open_closed_sensor_battery',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
+    'original_icon': None,
+    'original_name': 'Battery',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '2d9a892b-1c93-45a5-84cb-0e81889498c6_main_battery_battery_battery',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[contact_sensor][sensor.front_door_open_closed_sensor_battery-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'battery',
+      'friendly_name': '.Front Door Open/Closed Sensor Battery',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.front_door_open_closed_sensor_battery',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '100',
+  })
+# ---
+# name: test_all_entities[contact_sensor][sensor.front_door_open_closed_sensor_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.front_door_open_closed_sensor_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '2d9a892b-1c93-45a5-84cb-0e81889498c6_main_temperatureMeasurement_temperature_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[contact_sensor][sensor.front_door_open_closed_sensor_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': '.Front Door Open/Closed Sensor Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.front_door_open_closed_sensor_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '15.0',
+  })
+# ---
+# name: test_all_entities[da_ac_airsensor_01001][sensor.eeomoniteo_peulreoseu_air_quality-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.eeomoniteo_peulreoseu_air_quality',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Air quality',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'air_quality',
+    'unique_id': 'a3a970ea-e09c-9c04-161b-94c934e21666_main_airQualitySensor_airQuality_airQuality',
+    'unit_of_measurement': 'CAQI',
+  })
+# ---
+# name: test_all_entities[da_ac_airsensor_01001][sensor.eeomoniteo_peulreoseu_air_quality-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': '에어모니터 플러스 Air quality',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'CAQI',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.eeomoniteo_peulreoseu_air_quality',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2',
+  })
+# ---
+# name: test_all_entities[da_ac_airsensor_01001][sensor.eeomoniteo_peulreoseu_carbon_dioxide-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.eeomoniteo_peulreoseu_carbon_dioxide',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.CO2: 'carbon_dioxide'>,
+    'original_icon': None,
+    'original_name': 'Carbon dioxide',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'a3a970ea-e09c-9c04-161b-94c934e21666_main_carbonDioxideMeasurement_carbonDioxide_carbonDioxide',
+    'unit_of_measurement': 'ppm',
+  })
+# ---
+# name: test_all_entities[da_ac_airsensor_01001][sensor.eeomoniteo_peulreoseu_carbon_dioxide-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'carbon_dioxide',
+      'friendly_name': '에어모니터 플러스 Carbon dioxide',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'ppm',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.eeomoniteo_peulreoseu_carbon_dioxide',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '1045',
+  })
+# ---
+# name: test_all_entities[da_ac_airsensor_01001][sensor.eeomoniteo_peulreoseu_humidity-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.eeomoniteo_peulreoseu_humidity',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.HUMIDITY: 'humidity'>,
+    'original_icon': None,
+    'original_name': 'Humidity',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'a3a970ea-e09c-9c04-161b-94c934e21666_main_relativeHumidityMeasurement_humidity_humidity',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[da_ac_airsensor_01001][sensor.eeomoniteo_peulreoseu_humidity-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'humidity',
+      'friendly_name': '에어모니터 플러스 Humidity',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.eeomoniteo_peulreoseu_humidity',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '54',
+  })
+# ---
+# name: test_all_entities[da_ac_airsensor_01001][sensor.eeomoniteo_peulreoseu_odor_sensor-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.eeomoniteo_peulreoseu_odor_sensor',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Odor sensor',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'odor_sensor',
+    'unique_id': 'a3a970ea-e09c-9c04-161b-94c934e21666_main_odorSensor_odorLevel_odorLevel',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ac_airsensor_01001][sensor.eeomoniteo_peulreoseu_odor_sensor-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': '에어모니터 플러스 Odor sensor',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.eeomoniteo_peulreoseu_odor_sensor',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '1',
+  })
+# ---
+# name: test_all_entities[da_ac_airsensor_01001][sensor.eeomoniteo_peulreoseu_pm1-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.eeomoniteo_peulreoseu_pm1',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.PM1: 'pm1'>,
+    'original_icon': None,
+    'original_name': 'PM1',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'a3a970ea-e09c-9c04-161b-94c934e21666_main_veryFineDustSensor_veryFineDustLevel_veryFineDustLevel',
+    'unit_of_measurement': 'µg/m³',
+  })
+# ---
+# name: test_all_entities[da_ac_airsensor_01001][sensor.eeomoniteo_peulreoseu_pm1-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'pm1',
+      'friendly_name': '에어모니터 플러스 PM1',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'µg/m³',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.eeomoniteo_peulreoseu_pm1',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '6',
+  })
+# ---
+# name: test_all_entities[da_ac_airsensor_01001][sensor.eeomoniteo_peulreoseu_pm10-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.eeomoniteo_peulreoseu_pm10',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.PM10: 'pm10'>,
+    'original_icon': None,
+    'original_name': 'PM10',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'a3a970ea-e09c-9c04-161b-94c934e21666_main_dustSensor_dustLevel_dustLevel',
+    'unit_of_measurement': 'µg/m³',
+  })
+# ---
+# name: test_all_entities[da_ac_airsensor_01001][sensor.eeomoniteo_peulreoseu_pm10-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'pm10',
+      'friendly_name': '에어모니터 플러스 PM10',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'µg/m³',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.eeomoniteo_peulreoseu_pm10',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '31',
+  })
+# ---
+# name: test_all_entities[da_ac_airsensor_01001][sensor.eeomoniteo_peulreoseu_pm2_5-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.eeomoniteo_peulreoseu_pm2_5',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.PM25: 'pm25'>,
+    'original_icon': None,
+    'original_name': 'PM2.5',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'a3a970ea-e09c-9c04-161b-94c934e21666_main_dustSensor_fineDustLevel_fineDustLevel',
+    'unit_of_measurement': 'µg/m³',
+  })
+# ---
+# name: test_all_entities[da_ac_airsensor_01001][sensor.eeomoniteo_peulreoseu_pm2_5-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'pm25',
+      'friendly_name': '에어모니터 플러스 PM2.5',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'µg/m³',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.eeomoniteo_peulreoseu_pm2_5',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '7',
+  })
+# ---
+# name: test_all_entities[da_ac_airsensor_01001][sensor.eeomoniteo_peulreoseu_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.eeomoniteo_peulreoseu_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'a3a970ea-e09c-9c04-161b-94c934e21666_main_temperatureMeasurement_temperature_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[da_ac_airsensor_01001][sensor.eeomoniteo_peulreoseu_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': '에어모니터 플러스 Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.eeomoniteo_peulreoseu_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '23.0',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_000001][sensor.ac_office_granit_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.ac_office_granit_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '96a5ef74-5832-a84b-f1f7-ca799957065d_main_powerConsumptionReport_powerConsumption_energy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_ac_rac_000001][sensor.ac_office_granit_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'AC Office Granit Energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.ac_office_granit_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2247.3',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_000001][sensor.ac_office_granit_energy_difference-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.ac_office_granit_energy_difference',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy difference',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_difference',
+    'unique_id': '96a5ef74-5832-a84b-f1f7-ca799957065d_main_powerConsumptionReport_powerConsumption_deltaEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_ac_rac_000001][sensor.ac_office_granit_energy_difference-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'AC Office Granit Energy difference',
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.ac_office_granit_energy_difference',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.4',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_000001][sensor.ac_office_granit_energy_saved-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.ac_office_granit_energy_saved',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy saved',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_saved',
+    'unique_id': '96a5ef74-5832-a84b-f1f7-ca799957065d_main_powerConsumptionReport_powerConsumption_energySaved_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_ac_rac_000001][sensor.ac_office_granit_energy_saved-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'AC Office Granit Energy saved',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.ac_office_granit_energy_saved',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_000001][sensor.ac_office_granit_humidity-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.ac_office_granit_humidity',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.HUMIDITY: 'humidity'>,
+    'original_icon': None,
+    'original_name': 'Humidity',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '96a5ef74-5832-a84b-f1f7-ca799957065d_main_relativeHumidityMeasurement_humidity_humidity',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_000001][sensor.ac_office_granit_humidity-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'humidity',
+      'friendly_name': 'AC Office Granit Humidity',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.ac_office_granit_humidity',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '60',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_000001][sensor.ac_office_granit_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.ac_office_granit_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '96a5ef74-5832-a84b-f1f7-ca799957065d_main_powerConsumptionReport_powerConsumption_power_meter',
+    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+  })
+# ---
+# name: test_all_entities[da_ac_rac_000001][sensor.ac_office_granit_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'AC Office Granit Power',
+      'power_consumption_end': '2025-02-09T16:15:33Z',
+      'power_consumption_start': '2025-02-09T15:45:29Z',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.ac_office_granit_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_000001][sensor.ac_office_granit_power_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.ac_office_granit_power_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Power energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'power_energy',
+    'unique_id': '96a5ef74-5832-a84b-f1f7-ca799957065d_main_powerConsumptionReport_powerConsumption_powerEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_ac_rac_000001][sensor.ac_office_granit_power_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'AC Office Granit Power energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.ac_office_granit_power_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_000001][sensor.ac_office_granit_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.ac_office_granit_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '96a5ef74-5832-a84b-f1f7-ca799957065d_main_temperatureMeasurement_temperature_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[da_ac_rac_000001][sensor.ac_office_granit_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'AC Office Granit Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.ac_office_granit_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '25',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_000001][sensor.ac_office_granit_volume-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.ac_office_granit_volume',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Volume',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'audio_volume',
+    'unique_id': '96a5ef74-5832-a84b-f1f7-ca799957065d_main_audioVolume_volume_volume',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_000001][sensor.ac_office_granit_volume-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'AC Office Granit Volume',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.ac_office_granit_volume',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '100',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_01001][sensor.aire_dormitorio_principal_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.aire_dormitorio_principal_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '4ece486b-89db-f06a-d54d-748b676b4d8e_main_powerConsumptionReport_powerConsumption_energy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_ac_rac_01001][sensor.aire_dormitorio_principal_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Aire Dormitorio Principal Energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.aire_dormitorio_principal_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '13.836',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_01001][sensor.aire_dormitorio_principal_energy_difference-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.aire_dormitorio_principal_energy_difference',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy difference',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_difference',
+    'unique_id': '4ece486b-89db-f06a-d54d-748b676b4d8e_main_powerConsumptionReport_powerConsumption_deltaEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_ac_rac_01001][sensor.aire_dormitorio_principal_energy_difference-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Aire Dormitorio Principal Energy difference',
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.aire_dormitorio_principal_energy_difference',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_01001][sensor.aire_dormitorio_principal_energy_saved-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.aire_dormitorio_principal_energy_saved',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy saved',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_saved',
+    'unique_id': '4ece486b-89db-f06a-d54d-748b676b4d8e_main_powerConsumptionReport_powerConsumption_energySaved_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_ac_rac_01001][sensor.aire_dormitorio_principal_energy_saved-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Aire Dormitorio Principal Energy saved',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.aire_dormitorio_principal_energy_saved',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_01001][sensor.aire_dormitorio_principal_humidity-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.aire_dormitorio_principal_humidity',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.HUMIDITY: 'humidity'>,
+    'original_icon': None,
+    'original_name': 'Humidity',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '4ece486b-89db-f06a-d54d-748b676b4d8e_main_relativeHumidityMeasurement_humidity_humidity',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_01001][sensor.aire_dormitorio_principal_humidity-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'humidity',
+      'friendly_name': 'Aire Dormitorio Principal Humidity',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.aire_dormitorio_principal_humidity',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '42',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_01001][sensor.aire_dormitorio_principal_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.aire_dormitorio_principal_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '4ece486b-89db-f06a-d54d-748b676b4d8e_main_powerConsumptionReport_powerConsumption_power_meter',
+    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+  })
+# ---
+# name: test_all_entities[da_ac_rac_01001][sensor.aire_dormitorio_principal_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Aire Dormitorio Principal Power',
+      'power_consumption_end': '2025-02-09T17:02:44Z',
+      'power_consumption_start': '2025-02-09T16:08:15Z',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.aire_dormitorio_principal_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_01001][sensor.aire_dormitorio_principal_power_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.aire_dormitorio_principal_power_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Power energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'power_energy',
+    'unique_id': '4ece486b-89db-f06a-d54d-748b676b4d8e_main_powerConsumptionReport_powerConsumption_powerEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_ac_rac_01001][sensor.aire_dormitorio_principal_power_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Aire Dormitorio Principal Power energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.aire_dormitorio_principal_power_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_01001][sensor.aire_dormitorio_principal_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.aire_dormitorio_principal_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '4ece486b-89db-f06a-d54d-748b676b4d8e_main_temperatureMeasurement_temperature_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[da_ac_rac_01001][sensor.aire_dormitorio_principal_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Aire Dormitorio Principal Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.aire_dormitorio_principal_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '27',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_01001][sensor.aire_dormitorio_principal_volume-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.aire_dormitorio_principal_volume',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Volume',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'audio_volume',
+    'unique_id': '4ece486b-89db-f06a-d54d-748b676b4d8e_main_audioVolume_volume_volume',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_01001][sensor.aire_dormitorio_principal_volume-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Aire Dormitorio Principal Volume',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.aire_dormitorio_principal_volume',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_100001][sensor.corridor_a_c_air_quality-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.corridor_a_c_air_quality',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Air quality',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'air_quality',
+    'unique_id': 'F8042E25-0E53-0000-0000-000000000000_main_airQualitySensor_airQuality_airQuality',
+    'unit_of_measurement': 'CAQI',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_100001][sensor.corridor_a_c_air_quality-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Corridor A/C Air quality',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'CAQI',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.corridor_a_c_air_quality',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_100001][sensor.corridor_a_c_pm10-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.corridor_a_c_pm10',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.PM10: 'pm10'>,
+    'original_icon': None,
+    'original_name': 'PM10',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'F8042E25-0E53-0000-0000-000000000000_main_dustSensor_dustLevel_dustLevel',
+    'unit_of_measurement': 'µg/m³',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_100001][sensor.corridor_a_c_pm10-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'pm10',
+      'friendly_name': 'Corridor A/C PM10',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'µg/m³',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.corridor_a_c_pm10',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '46',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_100001][sensor.corridor_a_c_pm2_5-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.corridor_a_c_pm2_5',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.PM25: 'pm25'>,
+    'original_icon': None,
+    'original_name': 'PM2.5',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'F8042E25-0E53-0000-0000-000000000000_main_dustSensor_fineDustLevel_fineDustLevel',
+    'unit_of_measurement': 'µg/m³',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_100001][sensor.corridor_a_c_pm2_5-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'pm25',
+      'friendly_name': 'Corridor A/C PM2.5',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'µg/m³',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.corridor_a_c_pm2_5',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '10',
+  })
+# ---
+# name: test_all_entities[da_ac_rac_100001][sensor.corridor_a_c_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.corridor_a_c_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'F8042E25-0E53-0000-0000-000000000000_main_temperatureMeasurement_temperature_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[da_ac_rac_100001][sensor.corridor_a_c_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Corridor A/C Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.corridor_a_c_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '27',
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][sensor.microwave_completion_time-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.microwave_completion_time',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Completion time',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'completion_time',
+    'unique_id': '2bad3237-4886-e699-1b90-4a51a3d55c8a_main_ovenOperatingState_completionTime_completionTime',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][sensor.microwave_completion_time-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'timestamp',
+      'friendly_name': 'Microwave Completion time',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.microwave_completion_time',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2025-02-08T21:13:36+00:00',
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][sensor.microwave_job_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'cleaning',
+        'cooking',
+        'cooling',
+        'draining',
+        'preheat',
+        'ready',
+        'rinsing',
+        'finished',
+        'scheduled_start',
+        'warming',
+        'defrosting',
+        'sensing',
+        'searing',
+        'fast_preheat',
+        'scheduled_end',
+        'stone_heating',
+        'time_hold_preheat',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.microwave_job_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Job state',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'oven_job_state',
+    'unique_id': '2bad3237-4886-e699-1b90-4a51a3d55c8a_main_ovenOperatingState_ovenJobState_ovenJobState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][sensor.microwave_job_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Microwave Job state',
+      'options': list([
+        'cleaning',
+        'cooking',
+        'cooling',
+        'draining',
+        'preheat',
+        'ready',
+        'rinsing',
+        'finished',
+        'scheduled_start',
+        'warming',
+        'defrosting',
+        'sensing',
+        'searing',
+        'fast_preheat',
+        'scheduled_end',
+        'stone_heating',
+        'time_hold_preheat',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.microwave_job_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'ready',
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][sensor.microwave_machine_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'ready',
+        'running',
+        'paused',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.microwave_machine_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Machine state',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'oven_machine_state',
+    'unique_id': '2bad3237-4886-e699-1b90-4a51a3d55c8a_main_ovenOperatingState_machineState_machineState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][sensor.microwave_machine_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Microwave Machine state',
+      'options': list([
+        'ready',
+        'running',
+        'paused',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.microwave_machine_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'ready',
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][sensor.microwave_oven_mode-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'conventional',
+        'bake',
+        'bottom_heat',
+        'convection_bake',
+        'convection_roast',
+        'broil',
+        'convection_broil',
+        'steam_cook',
+        'steam_bake',
+        'steam_roast',
+        'steam_bottom_heat_plus_convection',
+        'microwave',
+        'microwave_plus_grill',
+        'microwave_plus_convection',
+        'microwave_plus_hot_blast',
+        'microwave_plus_hot_blast_2',
+        'slim_middle',
+        'slim_strong',
+        'slow_cook',
+        'proof',
+        'dehydrate',
+        'others',
+        'strong_steam',
+        'descale',
+        'rinse',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.microwave_oven_mode',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Oven mode',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'oven_mode',
+    'unique_id': '2bad3237-4886-e699-1b90-4a51a3d55c8a_main_ovenMode_ovenMode_ovenMode',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][sensor.microwave_oven_mode-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Microwave Oven mode',
+      'options': list([
+        'conventional',
+        'bake',
+        'bottom_heat',
+        'convection_bake',
+        'convection_roast',
+        'broil',
+        'convection_broil',
+        'steam_cook',
+        'steam_bake',
+        'steam_roast',
+        'steam_bottom_heat_plus_convection',
+        'microwave',
+        'microwave_plus_grill',
+        'microwave_plus_convection',
+        'microwave_plus_hot_blast',
+        'microwave_plus_hot_blast_2',
+        'slim_middle',
+        'slim_strong',
+        'slow_cook',
+        'proof',
+        'dehydrate',
+        'others',
+        'strong_steam',
+        'descale',
+        'rinse',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.microwave_oven_mode',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'others',
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][sensor.microwave_set_point-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.microwave_set_point',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Set point',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'oven_setpoint',
+    'unique_id': '2bad3237-4886-e699-1b90-4a51a3d55c8a_main_ovenSetpoint_ovenSetpoint_ovenSetpoint',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][sensor.microwave_set_point-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Microwave Set point',
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.microwave_set_point',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][sensor.microwave_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.microwave_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '2bad3237-4886-e699-1b90-4a51a3d55c8a_main_temperatureMeasurement_temperature_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][sensor.microwave_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Microwave Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.microwave_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '-17',
+  })
+# ---
+# name: test_all_entities[da_ks_oven_01061][sensor.oven_completion_time-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.oven_completion_time',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Completion time',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'completion_time',
+    'unique_id': '9447959a-0dfa-6b27-d40d-650da525c53f_main_ovenOperatingState_completionTime_completionTime',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_oven_01061][sensor.oven_completion_time-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'timestamp',
+      'friendly_name': 'Oven Completion time',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.oven_completion_time',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2025-03-15T12:06:09+00:00',
+  })
+# ---
+# name: test_all_entities[da_ks_oven_01061][sensor.oven_job_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'cleaning',
+        'cooking',
+        'cooling',
+        'draining',
+        'preheat',
+        'ready',
+        'rinsing',
+        'finished',
+        'scheduled_start',
+        'warming',
+        'defrosting',
+        'sensing',
+        'searing',
+        'fast_preheat',
+        'scheduled_end',
+        'stone_heating',
+        'time_hold_preheat',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.oven_job_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Job state',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'oven_job_state',
+    'unique_id': '9447959a-0dfa-6b27-d40d-650da525c53f_main_ovenOperatingState_ovenJobState_ovenJobState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_oven_01061][sensor.oven_job_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Oven Job state',
+      'options': list([
+        'cleaning',
+        'cooking',
+        'cooling',
+        'draining',
+        'preheat',
+        'ready',
+        'rinsing',
+        'finished',
+        'scheduled_start',
+        'warming',
+        'defrosting',
+        'sensing',
+        'searing',
+        'fast_preheat',
+        'scheduled_end',
+        'stone_heating',
+        'time_hold_preheat',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.oven_job_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'preheat',
+  })
+# ---
+# name: test_all_entities[da_ks_oven_01061][sensor.oven_machine_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'ready',
+        'running',
+        'paused',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.oven_machine_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Machine state',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'oven_machine_state',
+    'unique_id': '9447959a-0dfa-6b27-d40d-650da525c53f_main_ovenOperatingState_machineState_machineState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_oven_01061][sensor.oven_machine_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Oven Machine state',
+      'options': list([
+        'ready',
+        'running',
+        'paused',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.oven_machine_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'running',
+  })
+# ---
+# name: test_all_entities[da_ks_oven_01061][sensor.oven_oven_mode-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'conventional',
+        'bake',
+        'bottom_heat',
+        'convection_bake',
+        'convection_roast',
+        'broil',
+        'convection_broil',
+        'steam_cook',
+        'steam_bake',
+        'steam_roast',
+        'steam_bottom_heat_plus_convection',
+        'microwave',
+        'microwave_plus_grill',
+        'microwave_plus_convection',
+        'microwave_plus_hot_blast',
+        'microwave_plus_hot_blast_2',
+        'slim_middle',
+        'slim_strong',
+        'slow_cook',
+        'proof',
+        'dehydrate',
+        'others',
+        'strong_steam',
+        'descale',
+        'rinse',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.oven_oven_mode',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Oven mode',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'oven_mode',
+    'unique_id': '9447959a-0dfa-6b27-d40d-650da525c53f_main_ovenMode_ovenMode_ovenMode',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_oven_01061][sensor.oven_oven_mode-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Oven Oven mode',
+      'options': list([
+        'conventional',
+        'bake',
+        'bottom_heat',
+        'convection_bake',
+        'convection_roast',
+        'broil',
+        'convection_broil',
+        'steam_cook',
+        'steam_bake',
+        'steam_roast',
+        'steam_bottom_heat_plus_convection',
+        'microwave',
+        'microwave_plus_grill',
+        'microwave_plus_convection',
+        'microwave_plus_hot_blast',
+        'microwave_plus_hot_blast_2',
+        'slim_middle',
+        'slim_strong',
+        'slow_cook',
+        'proof',
+        'dehydrate',
+        'others',
+        'strong_steam',
+        'descale',
+        'rinse',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.oven_oven_mode',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'bake',
+  })
+# ---
+# name: test_all_entities[da_ks_oven_01061][sensor.oven_set_point-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.oven_set_point',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Set point',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'oven_setpoint',
+    'unique_id': '9447959a-0dfa-6b27-d40d-650da525c53f_main_ovenSetpoint_ovenSetpoint_ovenSetpoint',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[da_ks_oven_01061][sensor.oven_set_point-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Oven Set point',
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.oven_set_point',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '220',
+  })
+# ---
+# name: test_all_entities[da_ks_oven_01061][sensor.oven_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.oven_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '9447959a-0dfa-6b27-d40d-650da525c53f_main_temperatureMeasurement_temperature_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[da_ks_oven_01061][sensor.oven_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Oven Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.oven_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '30',
+  })
+# ---
+# name: test_all_entities[da_ks_range_0101x][sensor.vulcan_completion_time-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.vulcan_completion_time',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Completion time',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'completion_time',
+    'unique_id': '2c3cbaa0-1899-5ddc-7b58-9d657bd48f18_main_ovenOperatingState_completionTime_completionTime',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_range_0101x][sensor.vulcan_completion_time-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'timestamp',
+      'friendly_name': 'Vulcan Completion time',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.vulcan_completion_time',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2025-03-14T03:23:28+00:00',
+  })
+# ---
+# name: test_all_entities[da_ks_range_0101x][sensor.vulcan_job_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'cleaning',
+        'cooking',
+        'cooling',
+        'draining',
+        'preheat',
+        'ready',
+        'rinsing',
+        'finished',
+        'scheduled_start',
+        'warming',
+        'defrosting',
+        'sensing',
+        'searing',
+        'fast_preheat',
+        'scheduled_end',
+        'stone_heating',
+        'time_hold_preheat',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.vulcan_job_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Job state',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'oven_job_state',
+    'unique_id': '2c3cbaa0-1899-5ddc-7b58-9d657bd48f18_main_ovenOperatingState_ovenJobState_ovenJobState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_range_0101x][sensor.vulcan_job_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Vulcan Job state',
+      'options': list([
+        'cleaning',
+        'cooking',
+        'cooling',
+        'draining',
+        'preheat',
+        'ready',
+        'rinsing',
+        'finished',
+        'scheduled_start',
+        'warming',
+        'defrosting',
+        'sensing',
+        'searing',
+        'fast_preheat',
+        'scheduled_end',
+        'stone_heating',
+        'time_hold_preheat',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.vulcan_job_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'cooking',
+  })
+# ---
+# name: test_all_entities[da_ks_range_0101x][sensor.vulcan_machine_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'ready',
+        'running',
+        'paused',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.vulcan_machine_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Machine state',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'oven_machine_state',
+    'unique_id': '2c3cbaa0-1899-5ddc-7b58-9d657bd48f18_main_ovenOperatingState_machineState_machineState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_range_0101x][sensor.vulcan_machine_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Vulcan Machine state',
+      'options': list([
+        'ready',
+        'running',
+        'paused',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.vulcan_machine_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'running',
+  })
+# ---
+# name: test_all_entities[da_ks_range_0101x][sensor.vulcan_oven_mode-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'conventional',
+        'bake',
+        'bottom_heat',
+        'convection_bake',
+        'convection_roast',
+        'broil',
+        'convection_broil',
+        'steam_cook',
+        'steam_bake',
+        'steam_roast',
+        'steam_bottom_heat_plus_convection',
+        'microwave',
+        'microwave_plus_grill',
+        'microwave_plus_convection',
+        'microwave_plus_hot_blast',
+        'microwave_plus_hot_blast_2',
+        'slim_middle',
+        'slim_strong',
+        'slow_cook',
+        'proof',
+        'dehydrate',
+        'others',
+        'strong_steam',
+        'descale',
+        'rinse',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.vulcan_oven_mode',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Oven mode',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'oven_mode',
+    'unique_id': '2c3cbaa0-1899-5ddc-7b58-9d657bd48f18_main_ovenMode_ovenMode_ovenMode',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_range_0101x][sensor.vulcan_oven_mode-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Vulcan Oven mode',
+      'options': list([
+        'conventional',
+        'bake',
+        'bottom_heat',
+        'convection_bake',
+        'convection_roast',
+        'broil',
+        'convection_broil',
+        'steam_cook',
+        'steam_bake',
+        'steam_roast',
+        'steam_bottom_heat_plus_convection',
+        'microwave',
+        'microwave_plus_grill',
+        'microwave_plus_convection',
+        'microwave_plus_hot_blast',
+        'microwave_plus_hot_blast_2',
+        'slim_middle',
+        'slim_strong',
+        'slow_cook',
+        'proof',
+        'dehydrate',
+        'others',
+        'strong_steam',
+        'descale',
+        'rinse',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.vulcan_oven_mode',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'bake',
+  })
+# ---
+# name: test_all_entities[da_ks_range_0101x][sensor.vulcan_set_point-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.vulcan_set_point',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Set point',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'oven_setpoint',
+    'unique_id': '2c3cbaa0-1899-5ddc-7b58-9d657bd48f18_main_ovenSetpoint_ovenSetpoint_ovenSetpoint',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[da_ks_range_0101x][sensor.vulcan_set_point-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Vulcan Set point',
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.vulcan_set_point',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '218',
+  })
+# ---
+# name: test_all_entities[da_ks_range_0101x][sensor.vulcan_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.vulcan_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '2c3cbaa0-1899-5ddc-7b58-9d657bd48f18_main_temperatureMeasurement_temperature_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[da_ks_range_0101x][sensor.vulcan_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Vulcan Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.vulcan_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '218',
+  })
+# ---
+# name: test_all_entities[da_ref_normal_000001][sensor.refrigerator_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.refrigerator_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '7db87911-7dce-1cf2-7119-b953432a2f09_main_powerConsumptionReport_powerConsumption_energy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_ref_normal_000001][sensor.refrigerator_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Refrigerator Energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.refrigerator_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '1568.087',
+  })
+# ---
+# name: test_all_entities[da_ref_normal_000001][sensor.refrigerator_energy_difference-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.refrigerator_energy_difference',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy difference',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_difference',
+    'unique_id': '7db87911-7dce-1cf2-7119-b953432a2f09_main_powerConsumptionReport_powerConsumption_deltaEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_ref_normal_000001][sensor.refrigerator_energy_difference-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Refrigerator Energy difference',
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.refrigerator_energy_difference',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.007',
+  })
+# ---
+# name: test_all_entities[da_ref_normal_000001][sensor.refrigerator_energy_saved-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.refrigerator_energy_saved',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy saved',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_saved',
+    'unique_id': '7db87911-7dce-1cf2-7119-b953432a2f09_main_powerConsumptionReport_powerConsumption_energySaved_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_ref_normal_000001][sensor.refrigerator_energy_saved-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Refrigerator Energy saved',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.refrigerator_energy_saved',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_ref_normal_000001][sensor.refrigerator_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.refrigerator_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '7db87911-7dce-1cf2-7119-b953432a2f09_main_powerConsumptionReport_powerConsumption_power_meter',
+    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+  })
+# ---
+# name: test_all_entities[da_ref_normal_000001][sensor.refrigerator_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Refrigerator Power',
+      'power_consumption_end': '2025-02-09T17:49:00Z',
+      'power_consumption_start': '2025-02-09T17:38:01Z',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.refrigerator_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '6',
+  })
+# ---
+# name: test_all_entities[da_ref_normal_000001][sensor.refrigerator_power_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.refrigerator_power_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Power energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'power_energy',
+    'unique_id': '7db87911-7dce-1cf2-7119-b953432a2f09_main_powerConsumptionReport_powerConsumption_powerEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_ref_normal_000001][sensor.refrigerator_power_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Refrigerator Power energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.refrigerator_power_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0135559777781698',
+  })
+# ---
+# name: test_all_entities[da_rvc_normal_000001][sensor.robot_vacuum_battery-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.robot_vacuum_battery',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
+    'original_icon': None,
+    'original_name': 'Battery',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '3442dfc6-17c0-a65f-dae0-4c6e01786f44_main_battery_battery_battery',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[da_rvc_normal_000001][sensor.robot_vacuum_battery-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'battery',
+      'friendly_name': 'Robot vacuum Battery',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.robot_vacuum_battery',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '100',
+  })
+# ---
+# name: test_all_entities[da_rvc_normal_000001][sensor.robot_vacuum_cleaning_mode-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'auto',
+        'part',
+        'repeat',
+        'manual',
+        'stop',
+        'map',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.robot_vacuum_cleaning_mode',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Cleaning mode',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'robot_cleaner_cleaning_mode',
+    'unique_id': '3442dfc6-17c0-a65f-dae0-4c6e01786f44_main_robotCleanerCleaningMode_robotCleanerCleaningMode_robotCleanerCleaningMode',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_rvc_normal_000001][sensor.robot_vacuum_cleaning_mode-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Robot vacuum Cleaning mode',
+      'options': list([
+        'auto',
+        'part',
+        'repeat',
+        'manual',
+        'stop',
+        'map',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.robot_vacuum_cleaning_mode',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'stop',
+  })
+# ---
+# name: test_all_entities[da_rvc_normal_000001][sensor.robot_vacuum_movement-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'homing',
+        'idle',
+        'charging',
+        'alarm',
+        'off',
+        'reserve',
+        'point',
+        'after',
+        'cleaning',
+        'pause',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.robot_vacuum_movement',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Movement',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'robot_cleaner_movement',
+    'unique_id': '3442dfc6-17c0-a65f-dae0-4c6e01786f44_main_robotCleanerMovement_robotCleanerMovement_robotCleanerMovement',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_rvc_normal_000001][sensor.robot_vacuum_movement-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Robot vacuum Movement',
+      'options': list([
+        'homing',
+        'idle',
+        'charging',
+        'alarm',
+        'off',
+        'reserve',
+        'point',
+        'after',
+        'cleaning',
+        'pause',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.robot_vacuum_movement',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'idle',
+  })
+# ---
+# name: test_all_entities[da_rvc_normal_000001][sensor.robot_vacuum_turbo_mode-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'on',
+        'off',
+        'silence',
+        'extra_silence',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.robot_vacuum_turbo_mode',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Turbo mode',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'robot_cleaner_turbo_mode',
+    'unique_id': '3442dfc6-17c0-a65f-dae0-4c6e01786f44_main_robotCleanerTurboMode_robotCleanerTurboMode_robotCleanerTurboMode',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_rvc_normal_000001][sensor.robot_vacuum_turbo_mode-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Robot vacuum Turbo mode',
+      'options': list([
+        'on',
+        'off',
+        'silence',
+        'extra_silence',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.robot_vacuum_turbo_mode',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_sac_ehs_000001_sub][sensor.eco_heating_system_cooling_set_point-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.eco_heating_system_cooling_set_point',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Cooling set point',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'thermostat_cooling_setpoint',
+    'unique_id': '1f98ebd0-ac48-d802-7f62-000001200100_main_thermostatCoolingSetpoint_coolingSetpoint_coolingSetpoint',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[da_sac_ehs_000001_sub][sensor.eco_heating_system_cooling_set_point-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Eco Heating System Cooling set point',
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.eco_heating_system_cooling_set_point',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '48',
+  })
+# ---
+# name: test_all_entities[da_sac_ehs_000001_sub][sensor.eco_heating_system_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.eco_heating_system_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '1f98ebd0-ac48-d802-7f62-000001200100_main_powerConsumptionReport_powerConsumption_energy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_sac_ehs_000001_sub][sensor.eco_heating_system_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Eco Heating System Energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.eco_heating_system_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '8193.81',
+  })
+# ---
+# name: test_all_entities[da_sac_ehs_000001_sub][sensor.eco_heating_system_energy_difference-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.eco_heating_system_energy_difference',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy difference',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_difference',
+    'unique_id': '1f98ebd0-ac48-d802-7f62-000001200100_main_powerConsumptionReport_powerConsumption_deltaEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_sac_ehs_000001_sub][sensor.eco_heating_system_energy_difference-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Eco Heating System Energy difference',
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.eco_heating_system_energy_difference',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_sac_ehs_000001_sub][sensor.eco_heating_system_energy_saved-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.eco_heating_system_energy_saved',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy saved',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_saved',
+    'unique_id': '1f98ebd0-ac48-d802-7f62-000001200100_main_powerConsumptionReport_powerConsumption_energySaved_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_sac_ehs_000001_sub][sensor.eco_heating_system_energy_saved-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Eco Heating System Energy saved',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.eco_heating_system_energy_saved',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_sac_ehs_000001_sub][sensor.eco_heating_system_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.eco_heating_system_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '1f98ebd0-ac48-d802-7f62-000001200100_main_powerConsumptionReport_powerConsumption_power_meter',
+    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+  })
+# ---
+# name: test_all_entities[da_sac_ehs_000001_sub][sensor.eco_heating_system_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Eco Heating System Power',
+      'power_consumption_end': '2025-03-09T11:14:57Z',
+      'power_consumption_start': '2025-03-09T11:14:44Z',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.eco_heating_system_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2.539',
+  })
+# ---
+# name: test_all_entities[da_sac_ehs_000001_sub][sensor.eco_heating_system_power_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.eco_heating_system_power_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Power energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'power_energy',
+    'unique_id': '1f98ebd0-ac48-d802-7f62-000001200100_main_powerConsumptionReport_powerConsumption_powerEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_sac_ehs_000001_sub][sensor.eco_heating_system_power_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Eco Heating System Power energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.eco_heating_system_power_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '9.4041739669111e-06',
+  })
+# ---
+# name: test_all_entities[da_sac_ehs_000001_sub][sensor.eco_heating_system_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.eco_heating_system_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '1f98ebd0-ac48-d802-7f62-000001200100_main_temperatureMeasurement_temperature_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[da_sac_ehs_000001_sub][sensor.eco_heating_system_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Eco Heating System Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.eco_heating_system_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '54.3',
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][sensor.dishwasher_completion_time-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.dishwasher_completion_time',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Completion time',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'completion_time',
+    'unique_id': 'f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_dishwasherOperatingState_completionTime_completionTime',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][sensor.dishwasher_completion_time-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'timestamp',
+      'friendly_name': 'Dishwasher Completion time',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.dishwasher_completion_time',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2025-02-08T22:49:26+00:00',
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][sensor.dishwasher_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.dishwasher_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_powerConsumptionReport_powerConsumption_energy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][sensor.dishwasher_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Dishwasher Energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.dishwasher_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '101.6',
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][sensor.dishwasher_energy_difference-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.dishwasher_energy_difference',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy difference',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_difference',
+    'unique_id': 'f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_powerConsumptionReport_powerConsumption_deltaEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][sensor.dishwasher_energy_difference-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Dishwasher Energy difference',
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.dishwasher_energy_difference',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][sensor.dishwasher_energy_saved-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.dishwasher_energy_saved',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy saved',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_saved',
+    'unique_id': 'f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_powerConsumptionReport_powerConsumption_energySaved_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][sensor.dishwasher_energy_saved-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Dishwasher Energy saved',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.dishwasher_energy_saved',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][sensor.dishwasher_job_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'air_wash',
+        'cooling',
+        'drying',
+        'finish',
+        'pre_drain',
+        'pre_wash',
+        'rinse',
+        'spin',
+        'wash',
+        'wrinkle_prevent',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.dishwasher_job_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Job state',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'dishwasher_job_state',
+    'unique_id': 'f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_dishwasherOperatingState_dishwasherJobState_dishwasherJobState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][sensor.dishwasher_job_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Dishwasher Job state',
+      'options': list([
+        'air_wash',
+        'cooling',
+        'drying',
+        'finish',
+        'pre_drain',
+        'pre_wash',
+        'rinse',
+        'spin',
+        'wash',
+        'wrinkle_prevent',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.dishwasher_job_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][sensor.dishwasher_machine_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'pause',
+        'run',
+        'stop',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.dishwasher_machine_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Machine state',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'dishwasher_machine_state',
+    'unique_id': 'f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_dishwasherOperatingState_machineState_machineState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][sensor.dishwasher_machine_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Dishwasher Machine state',
+      'options': list([
+        'pause',
+        'run',
+        'stop',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.dishwasher_machine_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'stop',
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][sensor.dishwasher_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.dishwasher_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_powerConsumptionReport_powerConsumption_power_meter',
+    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][sensor.dishwasher_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Dishwasher Power',
+      'power_consumption_end': '2025-02-08T20:21:26Z',
+      'power_consumption_start': '2025-02-08T20:21:21Z',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.dishwasher_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0',
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][sensor.dishwasher_power_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.dishwasher_power_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Power energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'power_energy',
+    'unique_id': 'f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_powerConsumptionReport_powerConsumption_powerEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][sensor.dishwasher_power_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Dishwasher Power energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.dishwasher_power_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][sensor.airdresser_completion_time-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.airdresser_completion_time',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Completion time',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'completion_time',
+    'unique_id': 'b93211bf-9d96-bd21-3b2f-964fcc87f5cc_main_dryerOperatingState_completionTime_completionTime',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][sensor.airdresser_completion_time-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'timestamp',
+      'friendly_name': 'AirDresser Completion time',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.airdresser_completion_time',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2025-02-11T09:00:17+00:00',
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][sensor.airdresser_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.airdresser_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'b93211bf-9d96-bd21-3b2f-964fcc87f5cc_main_powerConsumptionReport_powerConsumption_energy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][sensor.airdresser_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'AirDresser Energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.airdresser_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '207.5',
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][sensor.airdresser_energy_difference-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.airdresser_energy_difference',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy difference',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_difference',
+    'unique_id': 'b93211bf-9d96-bd21-3b2f-964fcc87f5cc_main_powerConsumptionReport_powerConsumption_deltaEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][sensor.airdresser_energy_difference-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'AirDresser Energy difference',
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.airdresser_energy_difference',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][sensor.airdresser_energy_saved-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.airdresser_energy_saved',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy saved',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_saved',
+    'unique_id': 'b93211bf-9d96-bd21-3b2f-964fcc87f5cc_main_powerConsumptionReport_powerConsumption_energySaved_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][sensor.airdresser_energy_saved-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'AirDresser Energy saved',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.airdresser_energy_saved',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][sensor.airdresser_job_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'cooling',
+        'delay_wash',
+        'drying',
+        'finished',
+        'none',
+        'refreshing',
+        'weight_sensing',
+        'wrinkle_prevent',
+        'dehumidifying',
+        'ai_drying',
+        'sanitizing',
+        'internal_care',
+        'freeze_protection',
+        'continuous_dehumidifying',
+        'thawing_frozen_inside',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.airdresser_job_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Job state',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'dryer_job_state',
+    'unique_id': 'b93211bf-9d96-bd21-3b2f-964fcc87f5cc_main_dryerOperatingState_dryerJobState_dryerJobState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][sensor.airdresser_job_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'AirDresser Job state',
+      'options': list([
+        'cooling',
+        'delay_wash',
+        'drying',
+        'finished',
+        'none',
+        'refreshing',
+        'weight_sensing',
+        'wrinkle_prevent',
+        'dehumidifying',
+        'ai_drying',
+        'sanitizing',
+        'internal_care',
+        'freeze_protection',
+        'continuous_dehumidifying',
+        'thawing_frozen_inside',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.airdresser_job_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'none',
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][sensor.airdresser_machine_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'pause',
+        'run',
+        'stop',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.airdresser_machine_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Machine state',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'dryer_machine_state',
+    'unique_id': 'b93211bf-9d96-bd21-3b2f-964fcc87f5cc_main_dryerOperatingState_machineState_machineState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][sensor.airdresser_machine_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'AirDresser Machine state',
+      'options': list([
+        'pause',
+        'run',
+        'stop',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.airdresser_machine_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'stop',
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][sensor.airdresser_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.airdresser_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'b93211bf-9d96-bd21-3b2f-964fcc87f5cc_main_powerConsumptionReport_powerConsumption_power_meter',
+    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][sensor.airdresser_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'AirDresser Power',
+      'power_consumption_end': '2025-02-11T08:21:17Z',
+      'power_consumption_start': '2025-02-10T22:51:59Z',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.airdresser_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0',
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][sensor.airdresser_power_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.airdresser_power_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Power energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'power_energy',
+    'unique_id': 'b93211bf-9d96-bd21-3b2f-964fcc87f5cc_main_powerConsumptionReport_powerConsumption_powerEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][sensor.airdresser_power_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'AirDresser Power energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.airdresser_power_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][sensor.dryer_completion_time-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.dryer_completion_time',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Completion time',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'completion_time',
+    'unique_id': '02f7256e-8353-5bdd-547f-bd5b1647e01b_main_dryerOperatingState_completionTime_completionTime',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][sensor.dryer_completion_time-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'timestamp',
+      'friendly_name': 'Dryer Completion time',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.dryer_completion_time',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2025-02-08T19:25:10+00:00',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][sensor.dryer_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.dryer_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '02f7256e-8353-5bdd-547f-bd5b1647e01b_main_powerConsumptionReport_powerConsumption_energy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][sensor.dryer_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Dryer Energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.dryer_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '4495.5',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][sensor.dryer_energy_difference-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.dryer_energy_difference',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy difference',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_difference',
+    'unique_id': '02f7256e-8353-5bdd-547f-bd5b1647e01b_main_powerConsumptionReport_powerConsumption_deltaEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][sensor.dryer_energy_difference-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Dryer Energy difference',
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.dryer_energy_difference',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][sensor.dryer_energy_saved-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.dryer_energy_saved',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy saved',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_saved',
+    'unique_id': '02f7256e-8353-5bdd-547f-bd5b1647e01b_main_powerConsumptionReport_powerConsumption_energySaved_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][sensor.dryer_energy_saved-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Dryer Energy saved',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.dryer_energy_saved',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][sensor.dryer_job_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'cooling',
+        'delay_wash',
+        'drying',
+        'finished',
+        'none',
+        'refreshing',
+        'weight_sensing',
+        'wrinkle_prevent',
+        'dehumidifying',
+        'ai_drying',
+        'sanitizing',
+        'internal_care',
+        'freeze_protection',
+        'continuous_dehumidifying',
+        'thawing_frozen_inside',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.dryer_job_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Job state',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'dryer_job_state',
+    'unique_id': '02f7256e-8353-5bdd-547f-bd5b1647e01b_main_dryerOperatingState_dryerJobState_dryerJobState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][sensor.dryer_job_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Dryer Job state',
+      'options': list([
+        'cooling',
+        'delay_wash',
+        'drying',
+        'finished',
+        'none',
+        'refreshing',
+        'weight_sensing',
+        'wrinkle_prevent',
+        'dehumidifying',
+        'ai_drying',
+        'sanitizing',
+        'internal_care',
+        'freeze_protection',
+        'continuous_dehumidifying',
+        'thawing_frozen_inside',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.dryer_job_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'none',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][sensor.dryer_machine_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'pause',
+        'run',
+        'stop',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.dryer_machine_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Machine state',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'dryer_machine_state',
+    'unique_id': '02f7256e-8353-5bdd-547f-bd5b1647e01b_main_dryerOperatingState_machineState_machineState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][sensor.dryer_machine_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Dryer Machine state',
+      'options': list([
+        'pause',
+        'run',
+        'stop',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.dryer_machine_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'stop',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][sensor.dryer_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.dryer_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '02f7256e-8353-5bdd-547f-bd5b1647e01b_main_powerConsumptionReport_powerConsumption_power_meter',
+    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][sensor.dryer_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Dryer Power',
+      'power_consumption_end': '2025-02-08T18:10:11Z',
+      'power_consumption_start': '2025-02-07T04:00:19Z',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.dryer_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][sensor.dryer_power_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.dryer_power_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Power energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'power_energy',
+    'unique_id': '02f7256e-8353-5bdd-547f-bd5b1647e01b_main_powerConsumptionReport_powerConsumption_powerEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][sensor.dryer_power_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Dryer Power energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.dryer_power_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][sensor.seca_roupa_completion_time-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.seca_roupa_completion_time',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Completion time',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'completion_time',
+    'unique_id': '3a6c4e05-811d-5041-e956-3d04c424cbcd_main_dryerOperatingState_completionTime_completionTime',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][sensor.seca_roupa_completion_time-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'timestamp',
+      'friendly_name': 'Seca-Roupa Completion time',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.seca_roupa_completion_time',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2025-03-09T22:55:37+00:00',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][sensor.seca_roupa_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.seca_roupa_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '3a6c4e05-811d-5041-e956-3d04c424cbcd_main_powerConsumptionReport_powerConsumption_energy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][sensor.seca_roupa_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Seca-Roupa Energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.seca_roupa_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '796.4',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][sensor.seca_roupa_energy_difference-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.seca_roupa_energy_difference',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy difference',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_difference',
+    'unique_id': '3a6c4e05-811d-5041-e956-3d04c424cbcd_main_powerConsumptionReport_powerConsumption_deltaEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][sensor.seca_roupa_energy_difference-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Seca-Roupa Energy difference',
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.seca_roupa_energy_difference',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][sensor.seca_roupa_energy_saved-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.seca_roupa_energy_saved',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy saved',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_saved',
+    'unique_id': '3a6c4e05-811d-5041-e956-3d04c424cbcd_main_powerConsumptionReport_powerConsumption_energySaved_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][sensor.seca_roupa_energy_saved-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Seca-Roupa Energy saved',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.seca_roupa_energy_saved',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][sensor.seca_roupa_job_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'cooling',
+        'delay_wash',
+        'drying',
+        'finished',
+        'none',
+        'refreshing',
+        'weight_sensing',
+        'wrinkle_prevent',
+        'dehumidifying',
+        'ai_drying',
+        'sanitizing',
+        'internal_care',
+        'freeze_protection',
+        'continuous_dehumidifying',
+        'thawing_frozen_inside',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.seca_roupa_job_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Job state',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'dryer_job_state',
+    'unique_id': '3a6c4e05-811d-5041-e956-3d04c424cbcd_main_dryerOperatingState_dryerJobState_dryerJobState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][sensor.seca_roupa_job_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Seca-Roupa Job state',
+      'options': list([
+        'cooling',
+        'delay_wash',
+        'drying',
+        'finished',
+        'none',
+        'refreshing',
+        'weight_sensing',
+        'wrinkle_prevent',
+        'dehumidifying',
+        'ai_drying',
+        'sanitizing',
+        'internal_care',
+        'freeze_protection',
+        'continuous_dehumidifying',
+        'thawing_frozen_inside',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.seca_roupa_job_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'none',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][sensor.seca_roupa_machine_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'pause',
+        'run',
+        'stop',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.seca_roupa_machine_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Machine state',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'dryer_machine_state',
+    'unique_id': '3a6c4e05-811d-5041-e956-3d04c424cbcd_main_dryerOperatingState_machineState_machineState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][sensor.seca_roupa_machine_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Seca-Roupa Machine state',
+      'options': list([
+        'pause',
+        'run',
+        'stop',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.seca_roupa_machine_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'stop',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][sensor.seca_roupa_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.seca_roupa_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '3a6c4e05-811d-5041-e956-3d04c424cbcd_main_powerConsumptionReport_powerConsumption_power_meter',
+    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][sensor.seca_roupa_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Seca-Roupa Power',
+      'power_consumption_end': '2025-03-09T19:47:37Z',
+      'power_consumption_start': '2025-03-09T19:47:26Z',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.seca_roupa_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][sensor.seca_roupa_power_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.seca_roupa_power_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Power energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'power_energy',
+    'unique_id': '3a6c4e05-811d-5041-e956-3d04c424cbcd_main_powerConsumptionReport_powerConsumption_powerEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][sensor.seca_roupa_power_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Seca-Roupa Power energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.seca_roupa_power_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][sensor.washer_completion_time-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.washer_completion_time',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Completion time',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'completion_time',
+    'unique_id': 'f984b91d-f250-9d42-3436-33f09a422a47_main_washerOperatingState_completionTime_completionTime',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][sensor.washer_completion_time-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'timestamp',
+      'friendly_name': 'Washer Completion time',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.washer_completion_time',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2025-02-07T03:54:45+00:00',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][sensor.washer_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.washer_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'f984b91d-f250-9d42-3436-33f09a422a47_main_powerConsumptionReport_powerConsumption_energy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][sensor.washer_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Washer Energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.washer_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '352.8',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][sensor.washer_energy_difference-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.washer_energy_difference',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy difference',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_difference',
+    'unique_id': 'f984b91d-f250-9d42-3436-33f09a422a47_main_powerConsumptionReport_powerConsumption_deltaEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][sensor.washer_energy_difference-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Washer Energy difference',
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.washer_energy_difference',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][sensor.washer_energy_saved-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.washer_energy_saved',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy saved',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_saved',
+    'unique_id': 'f984b91d-f250-9d42-3436-33f09a422a47_main_powerConsumptionReport_powerConsumption_energySaved_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][sensor.washer_energy_saved-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Washer Energy saved',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.washer_energy_saved',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][sensor.washer_job_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'air_wash',
+        'ai_rinse',
+        'ai_spin',
+        'ai_wash',
+        'cooling',
+        'delay_wash',
+        'drying',
+        'finish',
+        'none',
+        'pre_wash',
+        'rinse',
+        'spin',
+        'wash',
+        'weight_sensing',
+        'wrinkle_prevent',
+        'freeze_protection',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.washer_job_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Job state',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'washer_job_state',
+    'unique_id': 'f984b91d-f250-9d42-3436-33f09a422a47_main_washerOperatingState_washerJobState_washerJobState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][sensor.washer_job_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Washer Job state',
+      'options': list([
+        'air_wash',
+        'ai_rinse',
+        'ai_spin',
+        'ai_wash',
+        'cooling',
+        'delay_wash',
+        'drying',
+        'finish',
+        'none',
+        'pre_wash',
+        'rinse',
+        'spin',
+        'wash',
+        'weight_sensing',
+        'wrinkle_prevent',
+        'freeze_protection',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.washer_job_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'none',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][sensor.washer_machine_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'pause',
+        'run',
+        'stop',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.washer_machine_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Machine state',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'washer_machine_state',
+    'unique_id': 'f984b91d-f250-9d42-3436-33f09a422a47_main_washerOperatingState_machineState_machineState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][sensor.washer_machine_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Washer Machine state',
+      'options': list([
+        'pause',
+        'run',
+        'stop',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.washer_machine_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'stop',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][sensor.washer_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.washer_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'f984b91d-f250-9d42-3436-33f09a422a47_main_powerConsumptionReport_powerConsumption_power_meter',
+    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][sensor.washer_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Washer Power',
+      'power_consumption_end': '2025-02-07T03:09:45Z',
+      'power_consumption_start': '2025-02-07T03:09:24Z',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.washer_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][sensor.washer_power_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.washer_power_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Power energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'power_energy',
+    'unique_id': 'f984b91d-f250-9d42-3436-33f09a422a47_main_powerConsumptionReport_powerConsumption_powerEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][sensor.washer_power_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Washer Power energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.washer_power_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][sensor.washing_machine_completion_time-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.washing_machine_completion_time',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Completion time',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'completion_time',
+    'unique_id': '63803fae-cbed-f356-a063-2cf148ae3ca7_main_washerOperatingState_completionTime_completionTime',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][sensor.washing_machine_completion_time-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'timestamp',
+      'friendly_name': 'Washing Machine Completion time',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.washing_machine_completion_time',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2025-03-07T07:01:12+00:00',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][sensor.washing_machine_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.washing_machine_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '63803fae-cbed-f356-a063-2cf148ae3ca7_main_powerConsumptionReport_powerConsumption_energy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][sensor.washing_machine_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Washing Machine Energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.washing_machine_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '1323.6',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][sensor.washing_machine_energy_difference-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.washing_machine_energy_difference',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy difference',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_difference',
+    'unique_id': '63803fae-cbed-f356-a063-2cf148ae3ca7_main_powerConsumptionReport_powerConsumption_deltaEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][sensor.washing_machine_energy_difference-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Washing Machine Energy difference',
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.washing_machine_energy_difference',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.1',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][sensor.washing_machine_energy_saved-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.washing_machine_energy_saved',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy saved',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_saved',
+    'unique_id': '63803fae-cbed-f356-a063-2cf148ae3ca7_main_powerConsumptionReport_powerConsumption_energySaved_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][sensor.washing_machine_energy_saved-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Washing Machine Energy saved',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.washing_machine_energy_saved',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][sensor.washing_machine_job_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'air_wash',
+        'ai_rinse',
+        'ai_spin',
+        'ai_wash',
+        'cooling',
+        'delay_wash',
+        'drying',
+        'finish',
+        'none',
+        'pre_wash',
+        'rinse',
+        'spin',
+        'wash',
+        'weight_sensing',
+        'wrinkle_prevent',
+        'freeze_protection',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.washing_machine_job_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Job state',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'washer_job_state',
+    'unique_id': '63803fae-cbed-f356-a063-2cf148ae3ca7_main_washerOperatingState_washerJobState_washerJobState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][sensor.washing_machine_job_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Washing Machine Job state',
+      'options': list([
+        'air_wash',
+        'ai_rinse',
+        'ai_spin',
+        'ai_wash',
+        'cooling',
+        'delay_wash',
+        'drying',
+        'finish',
+        'none',
+        'pre_wash',
+        'rinse',
+        'spin',
+        'wash',
+        'weight_sensing',
+        'wrinkle_prevent',
+        'freeze_protection',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.washing_machine_job_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'wash',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][sensor.washing_machine_machine_state-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'pause',
+        'run',
+        'stop',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.washing_machine_machine_state',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Machine state',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'washer_machine_state',
+    'unique_id': '63803fae-cbed-f356-a063-2cf148ae3ca7_main_washerOperatingState_machineState_machineState',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][sensor.washing_machine_machine_state-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Washing Machine Machine state',
+      'options': list([
+        'pause',
+        'run',
+        'stop',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.washing_machine_machine_state',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'run',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][sensor.washing_machine_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.washing_machine_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '63803fae-cbed-f356-a063-2cf148ae3ca7_main_powerConsumptionReport_powerConsumption_power_meter',
+    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][sensor.washing_machine_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Washing Machine Power',
+      'power_consumption_end': '2025-03-07T06:23:21Z',
+      'power_consumption_start': '2025-03-07T06:21:09Z',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.washing_machine_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][sensor.washing_machine_power_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.washing_machine_power_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Power energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'power_energy',
+    'unique_id': '63803fae-cbed-f356-a063-2cf148ae3ca7_main_powerConsumptionReport_powerConsumption_powerEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][sensor.washing_machine_power_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Washing Machine Power energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.washing_machine_power_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[ecobee_sensor][sensor.child_bedroom_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.child_bedroom_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'd5dc3299-c266-41c7-bd08-f540aea54b89_main_temperatureMeasurement_temperature_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[ecobee_sensor][sensor.child_bedroom_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Child Bedroom Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.child_bedroom_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '22',
+  })
+# ---
+# name: test_all_entities[ecobee_thermostat][sensor.main_floor_humidity-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.main_floor_humidity',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.HUMIDITY: 'humidity'>,
+    'original_icon': None,
+    'original_name': 'Humidity',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '028469cb-6e89-4f14-8d9a-bfbca5e0fbfc_main_relativeHumidityMeasurement_humidity_humidity',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[ecobee_thermostat][sensor.main_floor_humidity-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'humidity',
+      'friendly_name': 'Main Floor Humidity',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.main_floor_humidity',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '32',
+  })
+# ---
+# name: test_all_entities[ecobee_thermostat][sensor.main_floor_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.main_floor_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '028469cb-6e89-4f14-8d9a-bfbca5e0fbfc_main_temperatureMeasurement_temperature_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[ecobee_thermostat][sensor.main_floor_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Main Floor Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.main_floor_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '22',
+  })
+# ---
+# name: test_all_entities[ecobee_thermostat_offline][sensor.downstairs_humidity-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.downstairs_humidity',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.HUMIDITY: 'humidity'>,
+    'original_icon': None,
+    'original_name': 'Humidity',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '1888b38f-6246-4f1e-911b-bfcfb66999db_main_relativeHumidityMeasurement_humidity_humidity',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[ecobee_thermostat_offline][sensor.downstairs_humidity-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'humidity',
+      'friendly_name': 'Downstairs Humidity',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.downstairs_humidity',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_all_entities[ecobee_thermostat_offline][sensor.downstairs_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.downstairs_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '1888b38f-6246-4f1e-911b-bfcfb66999db_main_temperatureMeasurement_temperature_temperature',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[ecobee_thermostat_offline][sensor.downstairs_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Downstairs Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.downstairs_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_all_entities[generic_ef00_v1][sensor.thermostat_kuche_link_quality-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.thermostat_kuche_link_quality',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Link quality',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'link_quality',
+    'unique_id': '656569c2-7976-4232-a789-34b4d1176c3a_main_signalStrength_lqi_lqi',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[generic_ef00_v1][sensor.thermostat_kuche_link_quality-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Thermostat Küche Link quality',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.thermostat_kuche_link_quality',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '255',
+  })
+# ---
+# name: test_all_entities[generic_ef00_v1][sensor.thermostat_kuche_signal_strength-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.thermostat_kuche_signal_strength',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.SIGNAL_STRENGTH: 'signal_strength'>,
+    'original_icon': None,
+    'original_name': 'Signal strength',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '656569c2-7976-4232-a789-34b4d1176c3a_main_signalStrength_rssi_rssi',
+    'unit_of_measurement': 'dBm',
+  })
+# ---
+# name: test_all_entities[generic_ef00_v1][sensor.thermostat_kuche_signal_strength-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'signal_strength',
+      'friendly_name': 'Thermostat Küche Signal strength',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'dBm',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.thermostat_kuche_signal_strength',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '-84',
+  })
+# ---
+# name: test_all_entities[generic_ef00_v1][sensor.thermostat_kuche_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.thermostat_kuche_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '656569c2-7976-4232-a789-34b4d1176c3a_main_temperatureMeasurement_temperature_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[generic_ef00_v1][sensor.thermostat_kuche_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Thermostat Küche Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.thermostat_kuche_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '21.0',
+  })
+# ---
+# name: test_all_entities[heatit_zpushwall][sensor.livingroom_smart_switch_battery-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.livingroom_smart_switch_battery',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
+    'original_icon': None,
+    'original_name': 'Battery',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '5e5b97f3-3094-44e6-abc0-f61283412d6a_main_battery_battery_battery',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[heatit_zpushwall][sensor.livingroom_smart_switch_battery-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'battery',
+      'friendly_name': 'Livingroom smart switch Battery',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.livingroom_smart_switch_battery',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '100',
+  })
+# ---
+# name: test_all_entities[heatit_ztrm3_thermostat][sensor.hall_thermostat_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.hall_thermostat_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '69a271f6-6537-4982-8cd9-979866872692_main_energyMeter_energy_energy',
+    'unit_of_measurement': 'kWh',
+  })
+# ---
+# name: test_all_entities[heatit_ztrm3_thermostat][sensor.hall_thermostat_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Hall thermostat Energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': 'kWh',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.hall_thermostat_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2339.5',
+  })
+# ---
+# name: test_all_entities[heatit_ztrm3_thermostat][sensor.hall_thermostat_power-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.hall_thermostat_power',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '69a271f6-6537-4982-8cd9-979866872692_main_powerMeter_power_power',
+    'unit_of_measurement': 'W',
+  })
+# ---
+# name: test_all_entities[heatit_ztrm3_thermostat][sensor.hall_thermostat_power-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Hall thermostat Power',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'W',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.hall_thermostat_power',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '368.17',
+  })
+# ---
+# name: test_all_entities[heatit_ztrm3_thermostat][sensor.hall_thermostat_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.hall_thermostat_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '69a271f6-6537-4982-8cd9-979866872692_main_temperatureMeasurement_temperature_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[heatit_ztrm3_thermostat][sensor.hall_thermostat_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Hall thermostat Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.hall_thermostat_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '19.0',
+  })
+# ---
+# name: test_all_entities[hw_q80r_soundbar][sensor.soundbar_media_input_source-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'wifi',
+        'bluetooth',
+        'hdmi1',
+        'hdmi2',
+        'digital',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.soundbar_media_input_source',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Media input source',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'media_input_source',
+    'unique_id': 'afcf3b91-0000-1111-2222-ddff2a0a6577_main_mediaInputSource_inputSource_inputSource',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[hw_q80r_soundbar][sensor.soundbar_media_input_source-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Soundbar Media input source',
+      'options': list([
+        'wifi',
+        'bluetooth',
+        'hdmi1',
+        'hdmi2',
+        'digital',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.soundbar_media_input_source',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'wifi',
+  })
+# ---
+# name: test_all_entities[hw_q80r_soundbar][sensor.soundbar_media_playback_status-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'paused',
+        'playing',
+        'stopped',
+        'fast_forwarding',
+        'rewinding',
+        'buffering',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.soundbar_media_playback_status',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Media playback status',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'media_playback_status',
+    'unique_id': 'afcf3b91-0000-1111-2222-ddff2a0a6577_main_mediaPlayback_playbackStatus_playbackStatus',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[hw_q80r_soundbar][sensor.soundbar_media_playback_status-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Soundbar Media playback status',
+      'options': list([
+        'paused',
+        'playing',
+        'stopped',
+        'fast_forwarding',
+        'rewinding',
+        'buffering',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.soundbar_media_playback_status',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'playing',
+  })
+# ---
+# name: test_all_entities[hw_q80r_soundbar][sensor.soundbar_volume-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.soundbar_volume',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Volume',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'audio_volume',
+    'unique_id': 'afcf3b91-0000-1111-2222-ddff2a0a6577_main_audioVolume_volume_volume',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[hw_q80r_soundbar][sensor.soundbar_volume-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Soundbar Volume',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.soundbar_volume',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '1',
+  })
+# ---
+# name: test_all_entities[ikea_kadrilj][sensor.kitchen_ikea_kadrilj_window_blind_battery-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.kitchen_ikea_kadrilj_window_blind_battery',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
+    'original_icon': None,
+    'original_name': 'Battery',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '71afed1c-006d-4e48-b16e-e7f88f9fd638_main_battery_battery_battery',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[ikea_kadrilj][sensor.kitchen_ikea_kadrilj_window_blind_battery-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'battery',
+      'friendly_name': 'Kitchen IKEA KADRILJ Window blind Battery',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.kitchen_ikea_kadrilj_window_blind_battery',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '37',
+  })
+# ---
+# name: test_all_entities[im_speaker_ai_0001][sensor.galaxy_home_mini_media_input_source-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.galaxy_home_mini_media_input_source',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Media input source',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'media_input_source',
+    'unique_id': 'c9276e43-fe3c-88c3-1dcc-2eb79e292b8c_main_mediaInputSource_inputSource_inputSource',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[im_speaker_ai_0001][sensor.galaxy_home_mini_media_input_source-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Galaxy Home Mini Media input source',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.galaxy_home_mini_media_input_source',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_all_entities[im_speaker_ai_0001][sensor.galaxy_home_mini_media_playback_repeat-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.galaxy_home_mini_media_playback_repeat',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Media playback repeat',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'media_playback_repeat',
+    'unique_id': 'c9276e43-fe3c-88c3-1dcc-2eb79e292b8c_main_mediaPlaybackRepeat_playbackRepeatMode_playbackRepeatMode',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[im_speaker_ai_0001][sensor.galaxy_home_mini_media_playback_repeat-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Galaxy Home Mini Media playback repeat',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.galaxy_home_mini_media_playback_repeat',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[im_speaker_ai_0001][sensor.galaxy_home_mini_media_playback_shuffle-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.galaxy_home_mini_media_playback_shuffle',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Media playback shuffle',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'media_playback_shuffle',
+    'unique_id': 'c9276e43-fe3c-88c3-1dcc-2eb79e292b8c_main_mediaPlaybackShuffle_playbackShuffle_playbackShuffle',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[im_speaker_ai_0001][sensor.galaxy_home_mini_media_playback_shuffle-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Galaxy Home Mini Media playback shuffle',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.galaxy_home_mini_media_playback_shuffle',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'disabled',
+  })
+# ---
+# name: test_all_entities[im_speaker_ai_0001][sensor.galaxy_home_mini_media_playback_status-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'paused',
+        'playing',
+        'stopped',
+        'fast_forwarding',
+        'rewinding',
+        'buffering',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.galaxy_home_mini_media_playback_status',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Media playback status',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'media_playback_status',
+    'unique_id': 'c9276e43-fe3c-88c3-1dcc-2eb79e292b8c_main_mediaPlayback_playbackStatus_playbackStatus',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[im_speaker_ai_0001][sensor.galaxy_home_mini_media_playback_status-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Galaxy Home Mini Media playback status',
+      'options': list([
+        'paused',
+        'playing',
+        'stopped',
+        'fast_forwarding',
+        'rewinding',
+        'buffering',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.galaxy_home_mini_media_playback_status',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'stopped',
+  })
+# ---
+# name: test_all_entities[im_speaker_ai_0001][sensor.galaxy_home_mini_volume-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.galaxy_home_mini_volume',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Volume',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'audio_volume',
+    'unique_id': 'c9276e43-fe3c-88c3-1dcc-2eb79e292b8c_main_audioVolume_volume_volume',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[im_speaker_ai_0001][sensor.galaxy_home_mini_volume-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Galaxy Home Mini Volume',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.galaxy_home_mini_volume',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '52',
+  })
+# ---
+# name: test_all_entities[multipurpose_sensor][sensor.deck_door_battery-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.deck_door_battery',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
+    'original_icon': None,
+    'original_name': 'Battery',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '7d246592-93db-4d72-a10d-5a51793ece8c_main_battery_battery_battery',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[multipurpose_sensor][sensor.deck_door_battery-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'battery',
+      'friendly_name': 'Deck Door Battery',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.deck_door_battery',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '50',
+  })
+# ---
+# name: test_all_entities[multipurpose_sensor][sensor.deck_door_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.deck_door_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '7d246592-93db-4d72-a10d-5a51793ece8c_main_temperatureMeasurement_temperature_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[multipurpose_sensor][sensor.deck_door_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Deck Door Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.deck_door_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '19.4',
+  })
+# ---
+# name: test_all_entities[multipurpose_sensor][sensor.deck_door_x_coordinate-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.deck_door_x_coordinate',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'X coordinate',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'x_coordinate',
+    'unique_id': '7d246592-93db-4d72-a10d-5a51793ece8c_main_threeAxis_threeAxis_x_coordinate',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[multipurpose_sensor][sensor.deck_door_x_coordinate-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Deck Door X coordinate',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.deck_door_x_coordinate',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '20',
+  })
+# ---
+# name: test_all_entities[multipurpose_sensor][sensor.deck_door_y_coordinate-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.deck_door_y_coordinate',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Y coordinate',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'y_coordinate',
+    'unique_id': '7d246592-93db-4d72-a10d-5a51793ece8c_main_threeAxis_threeAxis_y_coordinate',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[multipurpose_sensor][sensor.deck_door_y_coordinate-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Deck Door Y coordinate',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.deck_door_y_coordinate',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '8',
+  })
+# ---
+# name: test_all_entities[multipurpose_sensor][sensor.deck_door_z_coordinate-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.deck_door_z_coordinate',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Z coordinate',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'z_coordinate',
+    'unique_id': '7d246592-93db-4d72-a10d-5a51793ece8c_main_threeAxis_threeAxis_z_coordinate',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[multipurpose_sensor][sensor.deck_door_z_coordinate-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Deck Door Z coordinate',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.deck_door_z_coordinate',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '-1042',
+  })
+# ---
+# name: test_all_entities[sensibo_airconditioner_1][sensor.office_air_conditioner_mode-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.office_air_conditioner_mode',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Air conditioner mode',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'air_conditioner_mode',
+    'unique_id': 'bf4b1167-48a3-4af7-9186-0900a678ffa5_main_airConditionerMode_airConditionerMode_airConditionerMode',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[sensibo_airconditioner_1][sensor.office_air_conditioner_mode-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Office Air conditioner mode',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.office_air_conditioner_mode',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'cool',
+  })
+# ---
+# name: test_all_entities[sensibo_airconditioner_1][sensor.office_cooling_set_point-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.office_cooling_set_point',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Cooling set point',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'thermostat_cooling_setpoint',
+    'unique_id': 'bf4b1167-48a3-4af7-9186-0900a678ffa5_main_thermostatCoolingSetpoint_coolingSetpoint_coolingSetpoint',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[sensibo_airconditioner_1][sensor.office_cooling_set_point-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Office Cooling set point',
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.office_cooling_set_point',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '20',
+  })
+# ---
+# name: test_all_entities[sonos_player][sensor.elliots_rum_media_playback_status-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'paused',
+        'playing',
+        'stopped',
+        'fast_forwarding',
+        'rewinding',
+        'buffering',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.elliots_rum_media_playback_status',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Media playback status',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'media_playback_status',
+    'unique_id': 'c85fced9-c474-4a47-93c2-037cc7829536_main_mediaPlayback_playbackStatus_playbackStatus',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[sonos_player][sensor.elliots_rum_media_playback_status-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Elliots Rum Media playback status',
+      'options': list([
+        'paused',
+        'playing',
+        'stopped',
+        'fast_forwarding',
+        'rewinding',
+        'buffering',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.elliots_rum_media_playback_status',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'playing',
+  })
+# ---
+# name: test_all_entities[sonos_player][sensor.elliots_rum_volume-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.elliots_rum_volume',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Volume',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'audio_volume',
+    'unique_id': 'c85fced9-c474-4a47-93c2-037cc7829536_main_audioVolume_volume_volume',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[sonos_player][sensor.elliots_rum_volume-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Elliots Rum Volume',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.elliots_rum_volume',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '15',
+  })
+# ---
+# name: test_all_entities[tplink_p110][sensor.spulmaschine_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.spulmaschine_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '6602696a-1e48-49e4-919f-69406f5b5da1_main_powerConsumptionReport_powerConsumption_energy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[tplink_p110][sensor.spulmaschine_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Spülmaschine Energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.spulmaschine_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '15.72',
+  })
+# ---
+# name: test_all_entities[tplink_p110][sensor.spulmaschine_energy_difference-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.spulmaschine_energy_difference',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor': dict({
+        'suggested_display_precision': 2,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy difference',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'energy_difference',
+    'unique_id': '6602696a-1e48-49e4-919f-69406f5b5da1_main_powerConsumptionReport_powerConsumption_deltaEnergy_meter',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_all_entities[tplink_p110][sensor.spulmaschine_energy_difference-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Spülmaschine Energy difference',
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.spulmaschine_energy_difference',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_all_entities[vd_network_audio_002s][sensor.soundbar_living_media_playback_status-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'paused',
+        'playing',
+        'stopped',
+        'fast_forwarding',
+        'rewinding',
+        'buffering',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.soundbar_living_media_playback_status',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Media playback status',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'media_playback_status',
+    'unique_id': '0d94e5db-8501-2355-eb4f-214163702cac_main_mediaPlayback_playbackStatus_playbackStatus',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[vd_network_audio_002s][sensor.soundbar_living_media_playback_status-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Soundbar Living Media playback status',
+      'options': list([
+        'paused',
+        'playing',
+        'stopped',
+        'fast_forwarding',
+        'rewinding',
+        'buffering',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.soundbar_living_media_playback_status',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'stopped',
+  })
+# ---
+# name: test_all_entities[vd_network_audio_002s][sensor.soundbar_living_volume-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.soundbar_living_volume',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Volume',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'audio_volume',
+    'unique_id': '0d94e5db-8501-2355-eb4f-214163702cac_main_audioVolume_volume_volume',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[vd_network_audio_002s][sensor.soundbar_living_volume-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Soundbar Living Volume',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.soundbar_living_volume',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '17',
+  })
+# ---
+# name: test_all_entities[vd_sensor_light_2023][sensor.light_sensor_55_the_frame_brightness_intensity-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.light_sensor_55_the_frame_brightness_intensity',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Brightness intensity',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'brightness_intensity',
+    'unique_id': '5cc1c096-98b9-460c-8f1c-1045509ec605_main_relativeBrightness_brightnessIntensity_brightnessIntensity',
+    'unit_of_measurement': 'level',
+  })
+# ---
+# name: test_all_entities[vd_sensor_light_2023][sensor.light_sensor_55_the_frame_brightness_intensity-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Light Sensor - 55" The Frame Brightness intensity',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'level',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.light_sensor_55_the_frame_brightness_intensity',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '2',
+  })
+# ---
+# name: test_all_entities[vd_stv_2017_k][sensor.tv_samsung_8_series_49_media_input_source-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'digitaltv',
+        'hdmi1',
+        'hdmi4',
+        'hdmi4',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.tv_samsung_8_series_49_media_input_source',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Media input source',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'media_input_source',
+    'unique_id': '4588d2d9-a8cf-40f4-9a0b-ed5dfbaccda1_main_mediaInputSource_inputSource_inputSource',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[vd_stv_2017_k][sensor.tv_samsung_8_series_49_media_input_source-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': '[TV] Samsung 8 Series (49) Media input source',
+      'options': list([
+        'digitaltv',
+        'hdmi1',
+        'hdmi4',
+        'hdmi4',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.tv_samsung_8_series_49_media_input_source',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'hdmi1',
+  })
+# ---
+# name: test_all_entities[vd_stv_2017_k][sensor.tv_samsung_8_series_49_media_playback_status-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'paused',
+        'playing',
+        'stopped',
+        'fast_forwarding',
+        'rewinding',
+        'buffering',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.tv_samsung_8_series_49_media_playback_status',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Media playback status',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'media_playback_status',
+    'unique_id': '4588d2d9-a8cf-40f4-9a0b-ed5dfbaccda1_main_mediaPlayback_playbackStatus_playbackStatus',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[vd_stv_2017_k][sensor.tv_samsung_8_series_49_media_playback_status-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': '[TV] Samsung 8 Series (49) Media playback status',
+      'options': list([
+        'paused',
+        'playing',
+        'stopped',
+        'fast_forwarding',
+        'rewinding',
+        'buffering',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.tv_samsung_8_series_49_media_playback_status',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_all_entities[vd_stv_2017_k][sensor.tv_samsung_8_series_49_tv_channel-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.tv_samsung_8_series_49_tv_channel',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'TV channel',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'tv_channel',
+    'unique_id': '4588d2d9-a8cf-40f4-9a0b-ed5dfbaccda1_main_tvChannel_tvChannel_tvChannel',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[vd_stv_2017_k][sensor.tv_samsung_8_series_49_tv_channel-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': '[TV] Samsung 8 Series (49) TV channel',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.tv_samsung_8_series_49_tv_channel',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '',
+  })
+# ---
+# name: test_all_entities[vd_stv_2017_k][sensor.tv_samsung_8_series_49_tv_channel_name-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.tv_samsung_8_series_49_tv_channel_name',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'TV channel name',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'tv_channel_name',
+    'unique_id': '4588d2d9-a8cf-40f4-9a0b-ed5dfbaccda1_main_tvChannel_tvChannelName_tvChannelName',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[vd_stv_2017_k][sensor.tv_samsung_8_series_49_tv_channel_name-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': '[TV] Samsung 8 Series (49) TV channel name',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.tv_samsung_8_series_49_tv_channel_name',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '',
+  })
+# ---
+# name: test_all_entities[vd_stv_2017_k][sensor.tv_samsung_8_series_49_volume-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.tv_samsung_8_series_49_volume',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Volume',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'audio_volume',
+    'unique_id': '4588d2d9-a8cf-40f4-9a0b-ed5dfbaccda1_main_audioVolume_volume_volume',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[vd_stv_2017_k][sensor.tv_samsung_8_series_49_volume-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': '[TV] Samsung 8 Series (49) Volume',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.tv_samsung_8_series_49_volume',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '13',
+  })
+# ---
+# name: test_all_entities[virtual_thermostat][sensor.asd_battery-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.asd_battery',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
+    'original_icon': None,
+    'original_name': 'Battery',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '2894dc93-0f11-49cc-8a81-3a684cebebf6_main_battery_battery_battery',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[virtual_thermostat][sensor.asd_battery-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'battery',
+      'friendly_name': 'asd Battery',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.asd_battery',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '100',
+  })
+# ---
+# name: test_all_entities[virtual_thermostat][sensor.asd_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.asd_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '2894dc93-0f11-49cc-8a81-3a684cebebf6_main_temperatureMeasurement_temperature_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[virtual_thermostat][sensor.asd_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'asd Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.asd_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '4734.552604985020',
+  })
+# ---
+# name: test_all_entities[virtual_water_sensor][sensor.asd_battery-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.asd_battery',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
+    'original_icon': None,
+    'original_name': 'Battery',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'a2a6018b-2663-4727-9d1d-8f56953b5116_main_battery_battery_battery',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[virtual_water_sensor][sensor.asd_battery-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'battery',
+      'friendly_name': 'asd Battery',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.asd_battery',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '100',
+  })
+# ---
+# name: test_all_entities[yale_push_button_deadbolt_lock][sensor.basement_door_lock_battery-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.basement_door_lock_battery',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
+    'original_icon': None,
+    'original_name': 'Battery',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'a9f587c5-5d8b-4273-8907-e7f609af5158_main_battery_battery_battery',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_all_entities[yale_push_button_deadbolt_lock][sensor.basement_door_lock_battery-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'battery',
+      'friendly_name': 'Basement Door Lock Battery',
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.basement_door_lock_battery',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '86',
+  })
+# ---
diff --git a/tests/components/smartthings/snapshots/test_switch.ambr b/tests/components/smartthings/snapshots/test_switch.ambr
new file mode 100644
index 00000000000..8c95d2f20fc
--- /dev/null
+++ b/tests/components/smartthings/snapshots/test_switch.ambr
@@ -0,0 +1,1082 @@
+# serializer version: 1
+# name: test_all_entities[c2c_arlo_pro_3_switch][switch.2nd_floor_hallway-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.2nd_floor_hallway',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '10e06a70-ee7d-4832-85e9-a0a06a7a05bd_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[c2c_arlo_pro_3_switch][switch.2nd_floor_hallway-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': '2nd Floor Hallway',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.2nd_floor_hallway',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_all_entities[da_ks_cooktop_31001][switch.induction_hob-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.induction_hob',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '808dbd84-f357-47e2-a0cd-3b66fa22d584_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_cooktop_31001][switch.induction_hob-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Induction Hob',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.induction_hob',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][switch.microwave-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.microwave',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '2bad3237-4886-e699-1b90-4a51a3d55c8a_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ks_microwave_0101x][switch.microwave-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Microwave',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.microwave',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_ref_normal_000001][switch.refrigerator_ice_maker-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.refrigerator_ice_maker',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Ice maker',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'ice_maker',
+    'unique_id': '7db87911-7dce-1cf2-7119-b953432a2f09_icemaker_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_ref_normal_000001][switch.refrigerator_ice_maker-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Refrigerator Ice maker',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.refrigerator_ice_maker',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_rvc_normal_000001][switch.robot_vacuum-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.robot_vacuum',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '3442dfc6-17c0-a65f-dae0-4c6e01786f44_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_rvc_normal_000001][switch.robot_vacuum-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Robot vacuum',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.robot_vacuum',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_sac_ehs_000001_sub][switch.eco_heating_system-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.eco_heating_system',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '1f98ebd0-ac48-d802-7f62-000001200100_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_sac_ehs_000001_sub][switch.eco_heating_system-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Eco Heating System',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.eco_heating_system',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][switch.dishwasher-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.dishwasher',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_dw_000001][switch.dishwasher-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Dishwasher',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.dishwasher',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][switch.airdresser-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.airdresser',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'b93211bf-9d96-bd21-3b2f-964fcc87f5cc_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_sc_000001][switch.airdresser-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'AirDresser',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.airdresser',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][switch.dryer-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.dryer',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '02f7256e-8353-5bdd-547f-bd5b1647e01b_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][switch.dryer-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Dryer',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.dryer',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][switch.dryer_wrinkle_prevent-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.dryer_wrinkle_prevent',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Wrinkle prevent',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'wrinkle_prevent',
+    'unique_id': '02f7256e-8353-5bdd-547f-bd5b1647e01b_main_custom.dryerWrinklePrevent_dryerWrinklePrevent_dryerWrinklePrevent',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001][switch.dryer_wrinkle_prevent-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Dryer Wrinkle prevent',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.dryer_wrinkle_prevent',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][switch.seca_roupa-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.seca_roupa',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '3a6c4e05-811d-5041-e956-3d04c424cbcd_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][switch.seca_roupa-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Seca-Roupa',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.seca_roupa',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][switch.seca_roupa_wrinkle_prevent-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.seca_roupa_wrinkle_prevent',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Wrinkle prevent',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'wrinkle_prevent',
+    'unique_id': '3a6c4e05-811d-5041-e956-3d04c424cbcd_main_custom.dryerWrinklePrevent_dryerWrinklePrevent_dryerWrinklePrevent',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wd_000001_1][switch.seca_roupa_wrinkle_prevent-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Seca-Roupa Wrinkle prevent',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.seca_roupa_wrinkle_prevent',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][switch.washer-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.washer',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'f984b91d-f250-9d42-3436-33f09a422a47_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001][switch.washer-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Washer',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.washer',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][switch.washing_machine-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.washing_machine',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '63803fae-cbed-f356-a063-2cf148ae3ca7_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][switch.washing_machine-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Washing Machine',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.washing_machine',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][switch.washing_machine_bubble_soak-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.washing_machine_bubble_soak',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Bubble Soak',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'bubble_soak',
+    'unique_id': '63803fae-cbed-f356-a063-2cf148ae3ca7_main_samsungce.washerBubbleSoak_status_status',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[da_wm_wm_000001_1][switch.washing_machine_bubble_soak-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Washing Machine Bubble Soak',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.washing_machine_bubble_soak',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[generic_ef00_v1][switch.thermostat_kuche-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.thermostat_kuche',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '656569c2-7976-4232-a789-34b4d1176c3a_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[generic_ef00_v1][switch.thermostat_kuche-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Thermostat Küche',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.thermostat_kuche',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[hw_q80r_soundbar][switch.soundbar-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.soundbar',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'afcf3b91-0000-1111-2222-ddff2a0a6577_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[hw_q80r_soundbar][switch.soundbar-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Soundbar',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.soundbar',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_all_entities[sensibo_airconditioner_1][switch.office-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.office',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'bf4b1167-48a3-4af7-9186-0900a678ffa5_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[sensibo_airconditioner_1][switch.office-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Office',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.office',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[smart_plug][switch.arlo_beta_basestation-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.arlo_beta_basestation',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '550a1c72-65a0-4d55-b97b-75168e055398_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[smart_plug][switch.arlo_beta_basestation-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Arlo Beta Basestation',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.arlo_beta_basestation',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_all_entities[tplink_p110][switch.spulmaschine-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.spulmaschine',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '6602696a-1e48-49e4-919f-69406f5b5da1_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[tplink_p110][switch.spulmaschine-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Spülmaschine',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.spulmaschine',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_all_entities[vd_network_audio_002s][switch.soundbar_living-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.soundbar_living',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '0d94e5db-8501-2355-eb4f-214163702cac_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[vd_network_audio_002s][switch.soundbar_living-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Soundbar Living',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.soundbar_living',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_all_entities[vd_sensor_light_2023][switch.light_sensor_55_the_frame-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.light_sensor_55_the_frame',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '5cc1c096-98b9-460c-8f1c-1045509ec605_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[vd_sensor_light_2023][switch.light_sensor_55_the_frame-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Light Sensor - 55" The Frame',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.light_sensor_55_the_frame',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[vd_stv_2017_k][switch.tv_samsung_8_series_49-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.tv_samsung_8_series_49',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '4588d2d9-a8cf-40f4-9a0b-ed5dfbaccda1_main_switch_switch_switch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[vd_stv_2017_k][switch.tv_samsung_8_series_49-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': '[TV] Samsung 8 Series (49)',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.tv_samsung_8_series_49',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
diff --git a/tests/components/smartthings/snapshots/test_update.ambr b/tests/components/smartthings/snapshots/test_update.ambr
new file mode 100644
index 00000000000..c27a0b9f5fc
--- /dev/null
+++ b/tests/components/smartthings/snapshots/test_update.ambr
@@ -0,0 +1,421 @@
+# serializer version: 1
+# name: test_all_entities[bosch_radiator_thermostat_ii][update.radiator_thermostat_ii_m_wohnzimmer_firmware-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'update',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'update.radiator_thermostat_ii_m_wohnzimmer_firmware',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <UpdateDeviceClass.FIRMWARE: 'firmware'>,
+    'original_icon': None,
+    'original_name': 'Firmware',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <UpdateEntityFeature: 5>,
+    'translation_key': None,
+    'unique_id': '286ba274-4093-4bcb-849c-a1a3efe7b1e5_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[bosch_radiator_thermostat_ii][update.radiator_thermostat_ii_m_wohnzimmer_firmware-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'auto_update': False,
+      'device_class': 'firmware',
+      'display_precision': 0,
+      'entity_picture': 'https://brands.home-assistant.io/_/smartthings/icon.png',
+      'friendly_name': 'Radiator Thermostat II [+M] Wohnzimmer Firmware',
+      'in_progress': False,
+      'installed_version': '2.00.09 (20009)',
+      'latest_version': '2.00.09 (20009)',
+      'release_summary': None,
+      'release_url': None,
+      'skipped_version': None,
+      'supported_features': <UpdateEntityFeature: 5>,
+      'title': None,
+      'update_percentage': None,
+    }),
+    'context': <ANY>,
+    'entity_id': 'update.radiator_thermostat_ii_m_wohnzimmer_firmware',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[centralite][update.dimmer_debian_firmware-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'update',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'update.dimmer_debian_firmware',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <UpdateDeviceClass.FIRMWARE: 'firmware'>,
+    'original_icon': None,
+    'original_name': 'Firmware',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <UpdateEntityFeature: 5>,
+    'translation_key': None,
+    'unique_id': 'd0268a69-abfb-4c92-a646-61cec2e510ad_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[centralite][update.dimmer_debian_firmware-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'auto_update': False,
+      'device_class': 'firmware',
+      'display_precision': 0,
+      'entity_picture': 'https://brands.home-assistant.io/_/smartthings/icon.png',
+      'friendly_name': 'Dimmer Debian Firmware',
+      'in_progress': False,
+      'installed_version': '16015010',
+      'latest_version': '16015010',
+      'release_summary': None,
+      'release_url': None,
+      'skipped_version': None,
+      'supported_features': <UpdateEntityFeature: 5>,
+      'title': None,
+      'update_percentage': None,
+    }),
+    'context': <ANY>,
+    'entity_id': 'update.dimmer_debian_firmware',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[contact_sensor][update.front_door_open_closed_sensor_firmware-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'update',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'update.front_door_open_closed_sensor_firmware',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <UpdateDeviceClass.FIRMWARE: 'firmware'>,
+    'original_icon': None,
+    'original_name': 'Firmware',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <UpdateEntityFeature: 5>,
+    'translation_key': None,
+    'unique_id': '2d9a892b-1c93-45a5-84cb-0e81889498c6_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[contact_sensor][update.front_door_open_closed_sensor_firmware-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'auto_update': False,
+      'device_class': 'firmware',
+      'display_precision': 0,
+      'entity_picture': 'https://brands.home-assistant.io/_/smartthings/icon.png',
+      'friendly_name': '.Front Door Open/Closed Sensor Firmware',
+      'in_progress': False,
+      'installed_version': '00000103',
+      'latest_version': '00000104',
+      'release_summary': None,
+      'release_url': None,
+      'skipped_version': None,
+      'supported_features': <UpdateEntityFeature: 5>,
+      'title': None,
+      'update_percentage': None,
+    }),
+    'context': <ANY>,
+    'entity_id': 'update.front_door_open_closed_sensor_firmware',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_all_entities[ikea_kadrilj][update.kitchen_ikea_kadrilj_window_blind_firmware-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'update',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'update.kitchen_ikea_kadrilj_window_blind_firmware',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <UpdateDeviceClass.FIRMWARE: 'firmware'>,
+    'original_icon': None,
+    'original_name': 'Firmware',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <UpdateEntityFeature: 5>,
+    'translation_key': None,
+    'unique_id': '71afed1c-006d-4e48-b16e-e7f88f9fd638_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[ikea_kadrilj][update.kitchen_ikea_kadrilj_window_blind_firmware-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'auto_update': False,
+      'device_class': 'firmware',
+      'display_precision': 0,
+      'entity_picture': 'https://brands.home-assistant.io/_/smartthings/icon.png',
+      'friendly_name': 'Kitchen IKEA KADRILJ Window blind Firmware',
+      'in_progress': False,
+      'installed_version': '22007631',
+      'latest_version': '22007631',
+      'release_summary': None,
+      'release_url': None,
+      'skipped_version': None,
+      'supported_features': <UpdateEntityFeature: 5>,
+      'title': None,
+      'update_percentage': None,
+    }),
+    'context': <ANY>,
+    'entity_id': 'update.kitchen_ikea_kadrilj_window_blind_firmware',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[multipurpose_sensor][update.deck_door_firmware-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'update',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'update.deck_door_firmware',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <UpdateDeviceClass.FIRMWARE: 'firmware'>,
+    'original_icon': None,
+    'original_name': 'Firmware',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <UpdateEntityFeature: 5>,
+    'translation_key': None,
+    'unique_id': '7d246592-93db-4d72-a10d-5a51793ece8c_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[multipurpose_sensor][update.deck_door_firmware-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'auto_update': False,
+      'device_class': 'firmware',
+      'display_precision': 0,
+      'entity_picture': 'https://brands.home-assistant.io/_/smartthings/icon.png',
+      'friendly_name': 'Deck Door Firmware',
+      'in_progress': False,
+      'installed_version': '0000001B',
+      'latest_version': '0000001B',
+      'release_summary': None,
+      'release_url': None,
+      'skipped_version': None,
+      'supported_features': <UpdateEntityFeature: 5>,
+      'title': None,
+      'update_percentage': None,
+    }),
+    'context': <ANY>,
+    'entity_id': 'update.deck_door_firmware',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[smart_plug][update.arlo_beta_basestation_firmware-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'update',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'update.arlo_beta_basestation_firmware',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <UpdateDeviceClass.FIRMWARE: 'firmware'>,
+    'original_icon': None,
+    'original_name': 'Firmware',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <UpdateEntityFeature: 5>,
+    'translation_key': None,
+    'unique_id': '550a1c72-65a0-4d55-b97b-75168e055398_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[smart_plug][update.arlo_beta_basestation_firmware-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'auto_update': False,
+      'device_class': 'firmware',
+      'display_precision': 0,
+      'entity_picture': 'https://brands.home-assistant.io/_/smartthings/icon.png',
+      'friendly_name': 'Arlo Beta Basestation Firmware',
+      'in_progress': False,
+      'installed_version': '00102101',
+      'latest_version': '00102101',
+      'release_summary': None,
+      'release_url': None,
+      'skipped_version': None,
+      'supported_features': <UpdateEntityFeature: 5>,
+      'title': None,
+      'update_percentage': None,
+    }),
+    'context': <ANY>,
+    'entity_id': 'update.arlo_beta_basestation_firmware',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[yale_push_button_deadbolt_lock][update.basement_door_lock_firmware-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'update',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'update.basement_door_lock_firmware',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <UpdateDeviceClass.FIRMWARE: 'firmware'>,
+    'original_icon': None,
+    'original_name': 'Firmware',
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <UpdateEntityFeature: 5>,
+    'translation_key': None,
+    'unique_id': 'a9f587c5-5d8b-4273-8907-e7f609af5158_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[yale_push_button_deadbolt_lock][update.basement_door_lock_firmware-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'auto_update': False,
+      'device_class': 'firmware',
+      'display_precision': 0,
+      'entity_picture': 'https://brands.home-assistant.io/_/smartthings/icon.png',
+      'friendly_name': 'Basement Door Lock Firmware',
+      'in_progress': False,
+      'installed_version': '00840847',
+      'latest_version': '00840847',
+      'release_summary': None,
+      'release_url': None,
+      'skipped_version': None,
+      'supported_features': <UpdateEntityFeature: 5>,
+      'title': None,
+      'update_percentage': None,
+    }),
+    'context': <ANY>,
+    'entity_id': 'update.basement_door_lock_firmware',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
diff --git a/tests/components/smartthings/snapshots/test_valve.ambr b/tests/components/smartthings/snapshots/test_valve.ambr
new file mode 100644
index 00000000000..f82155c8499
--- /dev/null
+++ b/tests/components/smartthings/snapshots/test_valve.ambr
@@ -0,0 +1,50 @@
+# serializer version: 1
+# name: test_all_entities[virtual_valve][valve.volvo-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'valve',
+    'entity_category': None,
+    'entity_id': 'valve.volvo',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <ValveDeviceClass.WATER: 'water'>,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'smartthings',
+    'previous_unique_id': None,
+    'supported_features': <ValveEntityFeature: 3>,
+    'translation_key': None,
+    'unique_id': '612ab3c2-3bb0-48f7-b2c0-15b169cb2fc3_main',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[virtual_valve][valve.volvo-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'water',
+      'friendly_name': 'volvo',
+      'supported_features': <ValveEntityFeature: 3>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'valve.volvo',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'closed',
+  })
+# ---
diff --git a/tests/components/smartthings/test_binary_sensor.py b/tests/components/smartthings/test_binary_sensor.py
index 52fd5d28aa7..517de034613 100644
--- a/tests/components/smartthings/test_binary_sensor.py
+++ b/tests/components/smartthings/test_binary_sensor.py
@@ -1,139 +1,127 @@
-"""Test for the SmartThings binary_sensor platform.
+"""Test for the SmartThings binary_sensor platform."""
 
-The only mocking required is of the underlying SmartThings API object so
-real HTTP calls are not initiated during testing.
-"""
+from unittest.mock import AsyncMock
 
-from pysmartthings import ATTRIBUTES, CAPABILITIES, Attribute, Capability
+from pysmartthings import Attribute, Capability
+import pytest
+from syrupy import SnapshotAssertion
 
-from homeassistant.components.binary_sensor import (
-    DEVICE_CLASSES,
-    DOMAIN as BINARY_SENSOR_DOMAIN,
-)
-from homeassistant.components.smartthings import binary_sensor
-from homeassistant.components.smartthings.const import DOMAIN, SIGNAL_SMARTTHINGS_UPDATE
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import ATTR_FRIENDLY_NAME, STATE_UNAVAILABLE, EntityCategory
+from homeassistant.components import automation, script
+from homeassistant.components.automation import automations_with_entity
+from homeassistant.components.script import scripts_with_entity
+from homeassistant.components.smartthings import DOMAIN
+from homeassistant.const import STATE_OFF, STATE_ON, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers import entity_registry as er, issue_registry as ir
+from homeassistant.setup import async_setup_component
 
-from .conftest import setup_platform
+from . import setup_integration, snapshot_smartthings_entities, trigger_update
+
+from tests.common import MockConfigEntry
 
 
-async def test_mapping_integrity() -> None:
-    """Test ensures the map dicts have proper integrity."""
-    # Ensure every CAPABILITY_TO_ATTRIB key is in CAPABILITIES
-    # Ensure every CAPABILITY_TO_ATTRIB value is in ATTRIB_TO_CLASS keys
-    for capability, attrib in binary_sensor.CAPABILITY_TO_ATTRIB.items():
-        assert capability in CAPABILITIES, capability
-        assert attrib in ATTRIBUTES, attrib
-        assert attrib in binary_sensor.ATTRIB_TO_CLASS, attrib
-    # Ensure every ATTRIB_TO_CLASS value is in DEVICE_CLASSES
-    for attrib, device_class in binary_sensor.ATTRIB_TO_CLASS.items():
-        assert attrib in ATTRIBUTES, attrib
-        assert device_class in DEVICE_CLASSES, device_class
-
-
-async def test_entity_state(hass: HomeAssistant, device_factory) -> None:
-    """Tests the state attributes properly match the light types."""
-    device = device_factory(
-        "Motion Sensor 1", [Capability.motion_sensor], {Attribute.motion: "inactive"}
-    )
-    await setup_platform(hass, BINARY_SENSOR_DOMAIN, devices=[device])
-    state = hass.states.get("binary_sensor.motion_sensor_1_motion")
-    assert state.state == "off"
-    assert state.attributes[ATTR_FRIENDLY_NAME] == f"{device.label} {Attribute.motion}"
-
-
-async def test_entity_and_device_attributes(
+async def test_all_entities(
     hass: HomeAssistant,
-    device_registry: dr.DeviceRegistry,
+    snapshot: SnapshotAssertion,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
     entity_registry: er.EntityRegistry,
-    device_factory,
 ) -> None:
-    """Test the attributes of the entity are correct."""
-    # Arrange
-    device = device_factory(
-        "Motion Sensor 1",
-        [Capability.motion_sensor],
+    """Test all entities."""
+    await setup_integration(hass, mock_config_entry)
+
+    snapshot_smartthings_entities(
+        hass, entity_registry, snapshot, Platform.BINARY_SENSOR
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["da_ref_normal_000001"])
+async def test_state_update(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test state update."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.states.get("binary_sensor.refrigerator_door").state == STATE_OFF
+
+    await trigger_update(
+        hass,
+        devices,
+        "7db87911-7dce-1cf2-7119-b953432a2f09",
+        Capability.CONTACT_SENSOR,
+        Attribute.CONTACT,
+        "open",
+    )
+
+    assert hass.states.get("binary_sensor.refrigerator_door").state == STATE_ON
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+@pytest.mark.parametrize(
+    ("device_fixture", "issue_string", "entity_id"),
+    [
+        ("virtual_valve", "valve", "binary_sensor.volvo_valve"),
+        ("da_ref_normal_000001", "fridge_door", "binary_sensor.refrigerator_door"),
+    ],
+)
+async def test_create_issue(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    issue_registry: ir.IssueRegistry,
+    issue_string: str,
+    entity_id: str,
+) -> None:
+    """Test we create an issue when an automation or script is using a deprecated entity."""
+    issue_id = f"deprecated_binary_{issue_string}_{entity_id}"
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
         {
-            Attribute.motion: "inactive",
-            Attribute.mnmo: "123",
-            Attribute.mnmn: "Generic manufacturer",
-            Attribute.mnhw: "v4.56",
-            Attribute.mnfv: "v7.89",
+            automation.DOMAIN: {
+                "alias": "test",
+                "trigger": {"platform": "state", "entity_id": entity_id},
+                "action": {
+                    "action": "automation.turn_on",
+                    "target": {
+                        "entity_id": "automation.test",
+                    },
+                },
+            }
         },
     )
-    # Act
-    await setup_platform(hass, BINARY_SENSOR_DOMAIN, devices=[device])
-    # Assert
-    entry = entity_registry.async_get("binary_sensor.motion_sensor_1_motion")
-    assert entry
-    assert entry.unique_id == f"{device.device_id}.{Attribute.motion}"
-    entry = device_registry.async_get_device(identifiers={(DOMAIN, device.device_id)})
-    assert entry
-    assert entry.configuration_url == "https://account.smartthings.com"
-    assert entry.identifiers == {(DOMAIN, device.device_id)}
-    assert entry.name == device.label
-    assert entry.model == "123"
-    assert entry.manufacturer == "Generic manufacturer"
-    assert entry.hw_version == "v4.56"
-    assert entry.sw_version == "v7.89"
-
-
-async def test_update_from_signal(hass: HomeAssistant, device_factory) -> None:
-    """Test the binary_sensor updates when receiving a signal."""
-    # Arrange
-    device = device_factory(
-        "Motion Sensor 1", [Capability.motion_sensor], {Attribute.motion: "inactive"}
+    assert await async_setup_component(
+        hass,
+        script.DOMAIN,
+        {
+            script.DOMAIN: {
+                "test": {
+                    "sequence": [
+                        {
+                            "condition": "state",
+                            "entity_id": entity_id,
+                            "state": "on",
+                        },
+                    ],
+                }
+            }
+        },
     )
-    await setup_platform(hass, BINARY_SENSOR_DOMAIN, devices=[device])
-    device.status.apply_attribute_update(
-        "main", Capability.motion_sensor, Attribute.motion, "active"
-    )
-    # Act
-    async_dispatcher_send(hass, SIGNAL_SMARTTHINGS_UPDATE, [device.device_id])
-    # Assert
+
+    await setup_integration(hass, mock_config_entry)
+
+    assert automations_with_entity(hass, entity_id)[0] == "automation.test"
+    assert scripts_with_entity(hass, entity_id)[0] == "script.test"
+
+    assert len(issue_registry.issues) == 1
+    assert issue_registry.async_get_issue(DOMAIN, issue_id)
+
+    await hass.config_entries.async_unload(mock_config_entry.entry_id)
     await hass.async_block_till_done()
-    state = hass.states.get("binary_sensor.motion_sensor_1_motion")
-    assert state is not None
-    assert state.state == "on"
 
-
-async def test_unload_config_entry(hass: HomeAssistant, device_factory) -> None:
-    """Test the binary_sensor is removed when the config entry is unloaded."""
-    # Arrange
-    device = device_factory(
-        "Motion Sensor 1", [Capability.motion_sensor], {Attribute.motion: "inactive"}
-    )
-    config_entry = await setup_platform(hass, BINARY_SENSOR_DOMAIN, devices=[device])
-    config_entry.mock_state(hass, ConfigEntryState.LOADED)
-    # Act
-    await hass.config_entries.async_forward_entry_unload(config_entry, "binary_sensor")
-    # Assert
-    assert (
-        hass.states.get("binary_sensor.motion_sensor_1_motion").state
-        == STATE_UNAVAILABLE
-    )
-
-
-async def test_entity_category(
-    hass: HomeAssistant, entity_registry: er.EntityRegistry, device_factory
-) -> None:
-    """Tests the state attributes properly match the light types."""
-    device1 = device_factory(
-        "Motion Sensor 1", [Capability.motion_sensor], {Attribute.motion: "inactive"}
-    )
-    device2 = device_factory(
-        "Tamper Sensor 2", [Capability.tamper_alert], {Attribute.tamper: "inactive"}
-    )
-    await setup_platform(hass, BINARY_SENSOR_DOMAIN, devices=[device1, device2])
-
-    entry = entity_registry.async_get("binary_sensor.motion_sensor_1_motion")
-    assert entry
-    assert entry.entity_category is None
-
-    entry = entity_registry.async_get("binary_sensor.tamper_sensor_2_tamper")
-    assert entry
-    assert entry.entity_category is EntityCategory.DIAGNOSTIC
+    # Assert the issue is no longer present
+    assert not issue_registry.async_get_issue(DOMAIN, issue_id)
+    assert len(issue_registry.issues) == 0
diff --git a/tests/components/smartthings/test_button.py b/tests/components/smartthings/test_button.py
new file mode 100644
index 00000000000..4a348d079ca
--- /dev/null
+++ b/tests/components/smartthings/test_button.py
@@ -0,0 +1,56 @@
+"""Test for the SmartThings button platform."""
+
+from unittest.mock import AsyncMock
+
+from freezegun.api import FrozenDateTimeFactory
+from pysmartthings import Capability, Command
+import pytest
+from syrupy import SnapshotAssertion
+
+from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
+from homeassistant.components.smartthings import MAIN
+from homeassistant.const import ATTR_ENTITY_ID, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import setup_integration, snapshot_smartthings_entities
+
+from tests.common import MockConfigEntry
+
+
+async def test_all_entities(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test all entities."""
+    await setup_integration(hass, mock_config_entry)
+
+    snapshot_smartthings_entities(hass, entity_registry, snapshot, Platform.BUTTON)
+
+
+@pytest.mark.parametrize("device_fixture", ["da_ks_microwave_0101x"])
+async def test_press(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test state update."""
+    await setup_integration(hass, mock_config_entry)
+    freezer.move_to("2023-10-21")
+
+    await hass.services.async_call(
+        BUTTON_DOMAIN,
+        SERVICE_PRESS,
+        {ATTR_ENTITY_ID: "button.microwave_stop"},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "2bad3237-4886-e699-1b90-4a51a3d55c8a",
+        Capability.OVEN_OPERATING_STATE,
+        Command.STOP,
+        MAIN,
+    )
diff --git a/tests/components/smartthings/test_climate.py b/tests/components/smartthings/test_climate.py
index d39ee2d6bed..380c4072860 100644
--- a/tests/components/smartthings/test_climate.py
+++ b/tests/components/smartthings/test_climate.py
@@ -1,12 +1,11 @@
-"""Test for the SmartThings climate platform.
+"""Test for the SmartThings climate platform."""
 
-The only mocking required is of the underlying SmartThings API object so
-real HTTP calls are not initiated during testing.
-"""
+from typing import Any
+from unittest.mock import AsyncMock, call
 
-from pysmartthings import Attribute, Capability
-from pysmartthings.device import Status
+from pysmartthings import Attribute, Capability, Command, Status
 import pytest
+from syrupy import SnapshotAssertion
 
 from homeassistant.components.climate import (
     ATTR_CURRENT_HUMIDITY,
@@ -26,748 +25,835 @@ from homeassistant.components.climate import (
     SERVICE_SET_PRESET_MODE,
     SERVICE_SET_SWING_MODE,
     SERVICE_SET_TEMPERATURE,
-    ClimateEntityFeature,
+    SWING_HORIZONTAL,
+    SWING_OFF,
     HVACAction,
     HVACMode,
 )
-from homeassistant.components.smartthings import climate
-from homeassistant.components.smartthings.const import DOMAIN
+from homeassistant.components.smartthings.const import MAIN
 from homeassistant.const import (
     ATTR_ENTITY_ID,
-    ATTR_SUPPORTED_FEATURES,
     ATTR_TEMPERATURE,
     SERVICE_TURN_OFF,
     SERVICE_TURN_ON,
-    STATE_UNKNOWN,
+    Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
-from .conftest import setup_platform
+from . import (
+    set_attribute_value,
+    setup_integration,
+    snapshot_smartthings_entities,
+    trigger_update,
+)
+
+from tests.common import MockConfigEntry
 
 
-@pytest.fixture(name="legacy_thermostat")
-def legacy_thermostat_fixture(device_factory):
-    """Fixture returns a legacy thermostat."""
-    device = device_factory(
-        "Legacy Thermostat",
-        capabilities=[Capability.thermostat],
-        status={
-            Attribute.cooling_setpoint: 74,
-            Attribute.heating_setpoint: 68,
-            Attribute.thermostat_fan_mode: "auto",
-            Attribute.supported_thermostat_fan_modes: ["auto", "on"],
-            Attribute.thermostat_mode: "auto",
-            Attribute.supported_thermostat_modes: climate.MODE_TO_STATE.keys(),
-            Attribute.thermostat_operating_state: "idle",
-        },
-    )
-    device.status.attributes[Attribute.temperature] = Status(70, "F", None)
-    return device
-
-
-@pytest.fixture(name="basic_thermostat")
-def basic_thermostat_fixture(device_factory):
-    """Fixture returns a basic thermostat."""
-    device = device_factory(
-        "Basic Thermostat",
-        capabilities=[
-            Capability.temperature_measurement,
-            Capability.thermostat_cooling_setpoint,
-            Capability.thermostat_heating_setpoint,
-            Capability.thermostat_mode,
-        ],
-        status={
-            Attribute.cooling_setpoint: 74,
-            Attribute.heating_setpoint: 68,
-            Attribute.thermostat_mode: "off",
-            Attribute.supported_thermostat_modes: ["off", "auto", "heat", "cool"],
-        },
-    )
-    device.status.attributes[Attribute.temperature] = Status(70, "F", None)
-    return device
-
-
-@pytest.fixture(name="minimal_thermostat")
-def minimal_thermostat_fixture(device_factory):
-    """Fixture returns a minimal thermostat without cooling."""
-    device = device_factory(
-        "Minimal Thermostat",
-        capabilities=[
-            Capability.temperature_measurement,
-            Capability.thermostat_heating_setpoint,
-            Capability.thermostat_mode,
-        ],
-        status={
-            Attribute.heating_setpoint: 68,
-            Attribute.thermostat_mode: "off",
-            Attribute.supported_thermostat_modes: ["off", "heat"],
-        },
-    )
-    device.status.attributes[Attribute.temperature] = Status(70, "F", None)
-    return device
-
-
-@pytest.fixture(name="thermostat")
-def thermostat_fixture(device_factory):
-    """Fixture returns a fully-featured thermostat."""
-    device = device_factory(
-        "Thermostat",
-        capabilities=[
-            Capability.temperature_measurement,
-            Capability.relative_humidity_measurement,
-            Capability.thermostat_cooling_setpoint,
-            Capability.thermostat_heating_setpoint,
-            Capability.thermostat_mode,
-            Capability.thermostat_operating_state,
-            Capability.thermostat_fan_mode,
-        ],
-        status={
-            Attribute.cooling_setpoint: 74,
-            Attribute.heating_setpoint: 68,
-            Attribute.thermostat_fan_mode: "on",
-            Attribute.supported_thermostat_fan_modes: ["auto", "on"],
-            Attribute.thermostat_mode: "heat",
-            Attribute.supported_thermostat_modes: [
-                "auto",
-                "heat",
-                "cool",
-                "off",
-                "eco",
-            ],
-            Attribute.thermostat_operating_state: "idle",
-            Attribute.humidity: 34,
-            Attribute.mnmo: "123",
-            Attribute.mnmn: "Generic manufacturer",
-            Attribute.mnhw: "v4.56",
-            Attribute.mnfv: "v7.89",
-        },
-    )
-    device.status.attributes[Attribute.temperature] = Status(70, "F", None)
-    return device
-
-
-@pytest.fixture(name="buggy_thermostat")
-def buggy_thermostat_fixture(device_factory):
-    """Fixture returns a buggy thermostat."""
-    device = device_factory(
-        "Buggy Thermostat",
-        capabilities=[
-            Capability.temperature_measurement,
-            Capability.thermostat_cooling_setpoint,
-            Capability.thermostat_heating_setpoint,
-            Capability.thermostat_mode,
-        ],
-        status={
-            Attribute.thermostat_mode: "heating",
-            Attribute.cooling_setpoint: 74,
-            Attribute.heating_setpoint: 68,
-        },
-    )
-    device.status.attributes[Attribute.temperature] = Status(70, "F", None)
-    return device
-
-
-@pytest.fixture(name="air_conditioner")
-def air_conditioner_fixture(device_factory):
-    """Fixture returns a air conditioner."""
-    device = device_factory(
-        "Air Conditioner",
-        capabilities=[
-            Capability.air_conditioner_mode,
-            Capability.demand_response_load_control,
-            Capability.air_conditioner_fan_mode,
-            Capability.switch,
-            Capability.temperature_measurement,
-            Capability.thermostat_cooling_setpoint,
-            Capability.fan_oscillation_mode,
-        ],
-        status={
-            Attribute.air_conditioner_mode: "auto",
-            Attribute.supported_ac_modes: [
-                "cool",
-                "dry",
-                "wind",
-                "auto",
-                "heat",
-                "fanOnly",
-            ],
-            Attribute.drlc_status: {
-                "duration": 0,
-                "drlcLevel": -1,
-                "start": "1970-01-01T00:00:00Z",
-                "override": False,
-            },
-            Attribute.fan_mode: "medium",
-            Attribute.supported_ac_fan_modes: [
-                "auto",
-                "low",
-                "medium",
-                "high",
-                "turbo",
-            ],
-            Attribute.switch: "on",
-            Attribute.cooling_setpoint: 23,
-            "supportedAcOptionalMode": ["windFree"],
-            Attribute.supported_fan_oscillation_modes: [
-                "all",
-                "horizontal",
-                "vertical",
-                "fixed",
-            ],
-            Attribute.fan_oscillation_mode: "vertical",
-        },
-    )
-    device.status.attributes[Attribute.temperature] = Status(24, "C", None)
-    return device
-
-
-@pytest.fixture(name="air_conditioner_windfree")
-def air_conditioner_windfree_fixture(device_factory):
-    """Fixture returns a air conditioner."""
-    device = device_factory(
-        "Air Conditioner",
-        capabilities=[
-            Capability.air_conditioner_mode,
-            Capability.demand_response_load_control,
-            Capability.air_conditioner_fan_mode,
-            Capability.switch,
-            Capability.temperature_measurement,
-            Capability.thermostat_cooling_setpoint,
-            Capability.fan_oscillation_mode,
-        ],
-        status={
-            Attribute.air_conditioner_mode: "auto",
-            Attribute.supported_ac_modes: [
-                "cool",
-                "dry",
-                "wind",
-                "auto",
-                "heat",
-                "wind",
-            ],
-            Attribute.drlc_status: {
-                "duration": 0,
-                "drlcLevel": -1,
-                "start": "1970-01-01T00:00:00Z",
-                "override": False,
-            },
-            Attribute.fan_mode: "medium",
-            Attribute.supported_ac_fan_modes: [
-                "auto",
-                "low",
-                "medium",
-                "high",
-                "turbo",
-            ],
-            Attribute.switch: "on",
-            Attribute.cooling_setpoint: 23,
-            "supportedAcOptionalMode": ["windFree"],
-            Attribute.supported_fan_oscillation_modes: [
-                "all",
-                "horizontal",
-                "vertical",
-                "fixed",
-            ],
-            Attribute.fan_oscillation_mode: "vertical",
-        },
-    )
-    device.status.attributes[Attribute.temperature] = Status(24, "C", None)
-    return device
-
-
-async def test_legacy_thermostat_entity_state(
-    hass: HomeAssistant, legacy_thermostat
+async def test_all_entities(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
 ) -> None:
-    """Tests the state attributes properly match the thermostat type."""
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[legacy_thermostat])
-    state = hass.states.get("climate.legacy_thermostat")
-    assert state.state == HVACMode.HEAT_COOL
-    assert (
-        state.attributes[ATTR_SUPPORTED_FEATURES]
-        == ClimateEntityFeature.FAN_MODE
-        | ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
-        | ClimateEntityFeature.TARGET_TEMPERATURE
-        | ClimateEntityFeature.TURN_OFF
-        | ClimateEntityFeature.TURN_ON
-    )
-    assert state.attributes[ATTR_HVAC_ACTION] == HVACAction.IDLE
-    assert sorted(state.attributes[ATTR_HVAC_MODES]) == [
-        HVACMode.AUTO,
-        HVACMode.COOL,
-        HVACMode.HEAT,
-        HVACMode.HEAT_COOL,
-        HVACMode.OFF,
-    ]
-    assert state.attributes[ATTR_FAN_MODE] == "auto"
-    assert state.attributes[ATTR_FAN_MODES] == ["auto", "on"]
-    assert state.attributes[ATTR_TARGET_TEMP_LOW] == 20  # celsius
-    assert state.attributes[ATTR_TARGET_TEMP_HIGH] == 23.3  # celsius
-    assert state.attributes[ATTR_CURRENT_TEMPERATURE] == 21.1  # celsius
+    """Test all entities."""
+    await setup_integration(hass, mock_config_entry)
+
+    snapshot_smartthings_entities(hass, entity_registry, snapshot, Platform.CLIMATE)
 
 
-async def test_basic_thermostat_entity_state(
-    hass: HomeAssistant, basic_thermostat
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_ac_set_fan_mode(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
-    """Tests the state attributes properly match the thermostat type."""
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[basic_thermostat])
-    state = hass.states.get("climate.basic_thermostat")
-    assert state.state == HVACMode.OFF
-    assert (
-        state.attributes[ATTR_SUPPORTED_FEATURES]
-        == ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
-        | ClimateEntityFeature.TARGET_TEMPERATURE
-        | ClimateEntityFeature.TURN_OFF
-        | ClimateEntityFeature.TURN_ON
-    )
-    assert ATTR_HVAC_ACTION not in state.attributes
-    assert sorted(state.attributes[ATTR_HVAC_MODES]) == [
-        HVACMode.COOL,
-        HVACMode.HEAT,
-        HVACMode.HEAT_COOL,
-        HVACMode.OFF,
-    ]
-    assert state.attributes[ATTR_CURRENT_TEMPERATURE] == 21.1  # celsius
+    """Test climate set fan mode."""
+    await setup_integration(hass, mock_config_entry)
 
-
-async def test_minimal_thermostat_entity_state(
-    hass: HomeAssistant, minimal_thermostat
-) -> None:
-    """Tests the state attributes properly match the thermostat type."""
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[minimal_thermostat])
-    state = hass.states.get("climate.minimal_thermostat")
-    assert state.state == HVACMode.OFF
-    assert (
-        state.attributes[ATTR_SUPPORTED_FEATURES]
-        == ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
-        | ClimateEntityFeature.TARGET_TEMPERATURE
-        | ClimateEntityFeature.TURN_OFF
-        | ClimateEntityFeature.TURN_ON
-    )
-    assert ATTR_HVAC_ACTION not in state.attributes
-    assert sorted(state.attributes[ATTR_HVAC_MODES]) == [
-        HVACMode.HEAT,
-        HVACMode.OFF,
-    ]
-    assert state.attributes[ATTR_CURRENT_TEMPERATURE] == 21.1  # celsius
-
-
-async def test_thermostat_entity_state(hass: HomeAssistant, thermostat) -> None:
-    """Tests the state attributes properly match the thermostat type."""
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[thermostat])
-    state = hass.states.get("climate.thermostat")
-    assert state.state == HVACMode.HEAT
-    assert (
-        state.attributes[ATTR_SUPPORTED_FEATURES]
-        == ClimateEntityFeature.FAN_MODE
-        | ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
-        | ClimateEntityFeature.TARGET_TEMPERATURE
-        | ClimateEntityFeature.TURN_OFF
-        | ClimateEntityFeature.TURN_ON
-    )
-    assert state.attributes[ATTR_HVAC_ACTION] == HVACAction.IDLE
-    assert sorted(state.attributes[ATTR_HVAC_MODES]) == [
-        HVACMode.AUTO,
-        HVACMode.COOL,
-        HVACMode.HEAT,
-        HVACMode.HEAT_COOL,
-        HVACMode.OFF,
-    ]
-    assert state.attributes[ATTR_FAN_MODE] == "on"
-    assert state.attributes[ATTR_FAN_MODES] == ["auto", "on"]
-    assert state.attributes[ATTR_TEMPERATURE] == 20  # celsius
-    assert state.attributes[ATTR_CURRENT_TEMPERATURE] == 21.1  # celsius
-    assert state.attributes[ATTR_CURRENT_HUMIDITY] == 34
-
-
-async def test_buggy_thermostat_entity_state(
-    hass: HomeAssistant, buggy_thermostat
-) -> None:
-    """Tests the state attributes properly match the thermostat type."""
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[buggy_thermostat])
-    state = hass.states.get("climate.buggy_thermostat")
-    assert state.state == STATE_UNKNOWN
-    assert (
-        state.attributes[ATTR_SUPPORTED_FEATURES]
-        == ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
-        | ClimateEntityFeature.TARGET_TEMPERATURE
-        | ClimateEntityFeature.TURN_OFF
-        | ClimateEntityFeature.TURN_ON
-    )
-    assert state.state is STATE_UNKNOWN
-    assert state.attributes[ATTR_TEMPERATURE] is None
-    assert state.attributes[ATTR_CURRENT_TEMPERATURE] == 21.1  # celsius
-    assert state.attributes[ATTR_HVAC_MODES] == []
-
-
-async def test_buggy_thermostat_invalid_mode(
-    hass: HomeAssistant, buggy_thermostat
-) -> None:
-    """Tests when an invalid operation mode is included."""
-    buggy_thermostat.status.update_attribute_value(
-        Attribute.supported_thermostat_modes, ["heat", "emergency heat", "other"]
-    )
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[buggy_thermostat])
-    state = hass.states.get("climate.buggy_thermostat")
-    assert state.attributes[ATTR_HVAC_MODES] == [HVACMode.HEAT]
-
-
-async def test_air_conditioner_entity_state(
-    hass: HomeAssistant, air_conditioner
-) -> None:
-    """Tests when an invalid operation mode is included."""
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[air_conditioner])
-    state = hass.states.get("climate.air_conditioner")
-    assert state.state == HVACMode.HEAT_COOL
-    assert (
-        state.attributes[ATTR_SUPPORTED_FEATURES]
-        == ClimateEntityFeature.FAN_MODE
-        | ClimateEntityFeature.TARGET_TEMPERATURE
-        | ClimateEntityFeature.PRESET_MODE
-        | ClimateEntityFeature.SWING_MODE
-        | ClimateEntityFeature.TURN_OFF
-        | ClimateEntityFeature.TURN_ON
-    )
-    assert sorted(state.attributes[ATTR_HVAC_MODES]) == [
-        HVACMode.COOL,
-        HVACMode.DRY,
-        HVACMode.FAN_ONLY,
-        HVACMode.HEAT,
-        HVACMode.HEAT_COOL,
-        HVACMode.OFF,
-    ]
-    assert state.attributes[ATTR_FAN_MODE] == "medium"
-    assert sorted(state.attributes[ATTR_FAN_MODES]) == [
-        "auto",
-        "high",
-        "low",
-        "medium",
-        "turbo",
-    ]
-    assert state.attributes[ATTR_TEMPERATURE] == 23
-    assert state.attributes[ATTR_CURRENT_TEMPERATURE] == 24
-    assert state.attributes["drlc_status_duration"] == 0
-    assert state.attributes["drlc_status_level"] == -1
-    assert state.attributes["drlc_status_start"] == "1970-01-01T00:00:00Z"
-    assert state.attributes["drlc_status_override"] is False
-
-
-async def test_set_fan_mode(hass: HomeAssistant, thermostat, air_conditioner) -> None:
-    """Test the fan mode is set successfully."""
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[thermostat, air_conditioner])
-    entity_ids = ["climate.thermostat", "climate.air_conditioner"]
     await hass.services.async_call(
         CLIMATE_DOMAIN,
         SERVICE_SET_FAN_MODE,
-        {ATTR_ENTITY_ID: entity_ids, ATTR_FAN_MODE: "auto"},
+        {ATTR_ENTITY_ID: "climate.ac_office_granit", ATTR_FAN_MODE: "auto"},
         blocking=True,
     )
-    for entity_id in entity_ids:
-        state = hass.states.get(entity_id)
-        assert state.attributes[ATTR_FAN_MODE] == "auto", entity_id
+    devices.execute_device_command.assert_called_once_with(
+        "96a5ef74-5832-a84b-f1f7-ca799957065d",
+        Capability.AIR_CONDITIONER_FAN_MODE,
+        Command.SET_FAN_MODE,
+        MAIN,
+        argument="auto",
+    )
 
 
-async def test_set_hvac_mode(hass: HomeAssistant, thermostat, air_conditioner) -> None:
-    """Test the hvac mode is set successfully."""
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[thermostat, air_conditioner])
-    entity_ids = ["climate.thermostat", "climate.air_conditioner"]
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_ac_set_hvac_mode_off(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test setting AC HVAC mode to off."""
+    await setup_integration(hass, mock_config_entry)
+
     await hass.services.async_call(
         CLIMATE_DOMAIN,
         SERVICE_SET_HVAC_MODE,
-        {ATTR_ENTITY_ID: entity_ids, ATTR_HVAC_MODE: HVACMode.COOL},
+        {ATTR_ENTITY_ID: "climate.ac_office_granit", ATTR_HVAC_MODE: HVACMode.OFF},
         blocking=True,
     )
-
-    for entity_id in entity_ids:
-        state = hass.states.get(entity_id)
-        assert state.state == HVACMode.COOL, entity_id
-
-
-async def test_ac_set_hvac_mode_from_off(hass: HomeAssistant, air_conditioner) -> None:
-    """Test setting HVAC mode when the unit is off."""
-    air_conditioner.status.update_attribute_value(
-        Attribute.air_conditioner_mode, "heat"
+    devices.execute_device_command.assert_called_once_with(
+        "96a5ef74-5832-a84b-f1f7-ca799957065d",
+        Capability.SWITCH,
+        Command.OFF,
+        MAIN,
     )
-    air_conditioner.status.update_attribute_value(Attribute.switch, "off")
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[air_conditioner])
-    state = hass.states.get("climate.air_conditioner")
-    assert state.state == HVACMode.OFF
+
+
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+@pytest.mark.parametrize(
+    ("hvac_mode", "argument"),
+    [
+        (HVACMode.HEAT_COOL, "auto"),
+        (HVACMode.COOL, "cool"),
+        (HVACMode.DRY, "dry"),
+        (HVACMode.HEAT, "heat"),
+        (HVACMode.FAN_ONLY, "fanOnly"),
+    ],
+)
+async def test_ac_set_hvac_mode(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    hvac_mode: HVACMode,
+    argument: str,
+) -> None:
+    """Test setting AC HVAC mode."""
+    set_attribute_value(
+        devices,
+        Capability.AIR_CONDITIONER_MODE,
+        Attribute.SUPPORTED_AC_MODES,
+        ["auto", "cool", "dry", "heat", "fanOnly"],
+    )
+    set_attribute_value(devices, Capability.SWITCH, Attribute.SWITCH, "on")
+
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {ATTR_ENTITY_ID: "climate.ac_office_granit", ATTR_HVAC_MODE: hvac_mode},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "96a5ef74-5832-a84b-f1f7-ca799957065d",
+        Capability.AIR_CONDITIONER_MODE,
+        Command.SET_AIR_CONDITIONER_MODE,
+        MAIN,
+        argument=argument,
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_ac_set_hvac_mode_turns_on(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test setting AC HVAC mode turns on the device if it is off."""
+
+    await setup_integration(hass, mock_config_entry)
+
     await hass.services.async_call(
         CLIMATE_DOMAIN,
         SERVICE_SET_HVAC_MODE,
         {
-            ATTR_ENTITY_ID: "climate.air_conditioner",
+            ATTR_ENTITY_ID: "climate.ac_office_granit",
             ATTR_HVAC_MODE: HVACMode.HEAT_COOL,
         },
         blocking=True,
     )
-    state = hass.states.get("climate.air_conditioner")
-    assert state.state == HVACMode.HEAT_COOL
-
-
-async def test_ac_set_hvac_mode_off(hass: HomeAssistant, air_conditioner) -> None:
-    """Test the AC HVAC mode can be turned off set successfully."""
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[air_conditioner])
-    state = hass.states.get("climate.air_conditioner")
-    assert state.state != HVACMode.OFF
-    await hass.services.async_call(
-        CLIMATE_DOMAIN,
-        SERVICE_SET_HVAC_MODE,
-        {ATTR_ENTITY_ID: "climate.air_conditioner", ATTR_HVAC_MODE: HVACMode.OFF},
-        blocking=True,
-    )
-    state = hass.states.get("climate.air_conditioner")
-    assert state.state == HVACMode.OFF
+    assert devices.execute_device_command.mock_calls == [
+        call(
+            "96a5ef74-5832-a84b-f1f7-ca799957065d",
+            Capability.SWITCH,
+            Command.ON,
+            MAIN,
+        ),
+        call(
+            "96a5ef74-5832-a84b-f1f7-ca799957065d",
+            Capability.AIR_CONDITIONER_MODE,
+            Command.SET_AIR_CONDITIONER_MODE,
+            MAIN,
+            argument="auto",
+        ),
+    ]
 
 
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
 async def test_ac_set_hvac_mode_wind(
-    hass: HomeAssistant, air_conditioner_windfree
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
-    """Test the AC HVAC mode to fan only as wind mode for supported models."""
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[air_conditioner_windfree])
-    state = hass.states.get("climate.air_conditioner")
-    assert state.state != HVACMode.OFF
+    """Test setting AC HVAC mode to wind if the device supports it."""
+    set_attribute_value(
+        devices,
+        Capability.AIR_CONDITIONER_MODE,
+        Attribute.SUPPORTED_AC_MODES,
+        ["auto", "cool", "dry", "heat", "wind"],
+    )
+    set_attribute_value(devices, Capability.SWITCH, Attribute.SWITCH, "on")
+
+    await setup_integration(hass, mock_config_entry)
+
     await hass.services.async_call(
         CLIMATE_DOMAIN,
         SERVICE_SET_HVAC_MODE,
-        {ATTR_ENTITY_ID: "climate.air_conditioner", ATTR_HVAC_MODE: HVACMode.FAN_ONLY},
+        {ATTR_ENTITY_ID: "climate.ac_office_granit", ATTR_HVAC_MODE: HVACMode.FAN_ONLY},
         blocking=True,
     )
-    state = hass.states.get("climate.air_conditioner")
-    assert state.state == HVACMode.FAN_ONLY
+    devices.execute_device_command.assert_called_once_with(
+        "96a5ef74-5832-a84b-f1f7-ca799957065d",
+        Capability.AIR_CONDITIONER_MODE,
+        Command.SET_AIR_CONDITIONER_MODE,
+        MAIN,
+        argument="wind",
+    )
 
 
-async def test_set_temperature_heat_mode(hass: HomeAssistant, thermostat) -> None:
-    """Test the temperature is set successfully when in heat mode."""
-    thermostat.status.thermostat_mode = "heat"
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[thermostat])
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_ac_set_temperature(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test setting AC temperature."""
+    await setup_integration(hass, mock_config_entry)
+
     await hass.services.async_call(
         CLIMATE_DOMAIN,
         SERVICE_SET_TEMPERATURE,
-        {ATTR_ENTITY_ID: "climate.thermostat", ATTR_TEMPERATURE: 21},
+        {ATTR_ENTITY_ID: "climate.ac_office_granit", ATTR_TEMPERATURE: 23},
         blocking=True,
     )
-    state = hass.states.get("climate.thermostat")
-    assert state.state == HVACMode.HEAT
-    assert state.attributes[ATTR_TEMPERATURE] == 21
-    assert thermostat.status.heating_setpoint == 69.8
-
-
-async def test_set_temperature_cool_mode(hass: HomeAssistant, thermostat) -> None:
-    """Test the temperature is set successfully when in cool mode."""
-    thermostat.status.thermostat_mode = "cool"
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[thermostat])
-    await hass.services.async_call(
-        CLIMATE_DOMAIN,
-        SERVICE_SET_TEMPERATURE,
-        {ATTR_ENTITY_ID: "climate.thermostat", ATTR_TEMPERATURE: 21},
-        blocking=True,
+    devices.execute_device_command.assert_called_once_with(
+        "96a5ef74-5832-a84b-f1f7-ca799957065d",
+        Capability.THERMOSTAT_COOLING_SETPOINT,
+        Command.SET_COOLING_SETPOINT,
+        MAIN,
+        argument=23,
     )
-    state = hass.states.get("climate.thermostat")
-    assert state.attributes[ATTR_TEMPERATURE] == 21
 
 
-async def test_set_temperature(hass: HomeAssistant, thermostat) -> None:
-    """Test the temperature is set successfully."""
-    thermostat.status.thermostat_mode = "auto"
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[thermostat])
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_ac_set_temperature_and_hvac_mode_while_off(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test setting AC temperature and HVAC mode while off."""
+    await setup_integration(hass, mock_config_entry)
+
     await hass.services.async_call(
         CLIMATE_DOMAIN,
         SERVICE_SET_TEMPERATURE,
         {
-            ATTR_ENTITY_ID: "climate.thermostat",
-            ATTR_TARGET_TEMP_HIGH: 25.5,
-            ATTR_TARGET_TEMP_LOW: 22.2,
+            ATTR_ENTITY_ID: "climate.ac_office_granit",
+            ATTR_TEMPERATURE: 23,
+            ATTR_HVAC_MODE: HVACMode.HEAT_COOL,
         },
         blocking=True,
     )
-    state = hass.states.get("climate.thermostat")
-    assert state.attributes[ATTR_TARGET_TEMP_HIGH] == 25.5
-    assert state.attributes[ATTR_TARGET_TEMP_LOW] == 22.2
+    assert devices.execute_device_command.mock_calls == [
+        call(
+            "96a5ef74-5832-a84b-f1f7-ca799957065d",
+            Capability.SWITCH,
+            Command.ON,
+            MAIN,
+        ),
+        call(
+            "96a5ef74-5832-a84b-f1f7-ca799957065d",
+            Capability.THERMOSTAT_COOLING_SETPOINT,
+            Command.SET_COOLING_SETPOINT,
+            MAIN,
+            argument=23.0,
+        ),
+        call(
+            "96a5ef74-5832-a84b-f1f7-ca799957065d",
+            Capability.SWITCH,
+            Command.ON,
+            MAIN,
+        ),
+        call(
+            "96a5ef74-5832-a84b-f1f7-ca799957065d",
+            Capability.AIR_CONDITIONER_MODE,
+            Command.SET_AIR_CONDITIONER_MODE,
+            MAIN,
+            argument="auto",
+        ),
+    ]
 
 
-async def test_set_temperature_ac(hass: HomeAssistant, air_conditioner) -> None:
-    """Test the temperature is set successfully."""
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[air_conditioner])
-    await hass.services.async_call(
-        CLIMATE_DOMAIN,
-        SERVICE_SET_TEMPERATURE,
-        {ATTR_ENTITY_ID: "climate.air_conditioner", ATTR_TEMPERATURE: 27},
-        blocking=True,
-    )
-    state = hass.states.get("climate.air_conditioner")
-    assert state.attributes[ATTR_TEMPERATURE] == 27
-
-
-async def test_set_temperature_ac_with_mode(
-    hass: HomeAssistant, air_conditioner
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_ac_set_temperature_and_hvac_mode(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
-    """Test the temperature is set successfully."""
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[air_conditioner])
+    """Test setting AC temperature and HVAC mode."""
+    set_attribute_value(devices, Capability.SWITCH, Attribute.SWITCH, "on")
+    await setup_integration(hass, mock_config_entry)
+
     await hass.services.async_call(
         CLIMATE_DOMAIN,
         SERVICE_SET_TEMPERATURE,
         {
-            ATTR_ENTITY_ID: "climate.air_conditioner",
-            ATTR_TEMPERATURE: 27,
-            ATTR_HVAC_MODE: HVACMode.COOL,
+            ATTR_ENTITY_ID: "climate.ac_office_granit",
+            ATTR_TEMPERATURE: 23,
+            ATTR_HVAC_MODE: HVACMode.HEAT_COOL,
         },
         blocking=True,
     )
-    state = hass.states.get("climate.air_conditioner")
-    assert state.attributes[ATTR_TEMPERATURE] == 27
-    assert state.state == HVACMode.COOL
+    assert devices.execute_device_command.mock_calls == [
+        call(
+            "96a5ef74-5832-a84b-f1f7-ca799957065d",
+            Capability.THERMOSTAT_COOLING_SETPOINT,
+            Command.SET_COOLING_SETPOINT,
+            MAIN,
+            argument=23.0,
+        ),
+        call(
+            "96a5ef74-5832-a84b-f1f7-ca799957065d",
+            Capability.AIR_CONDITIONER_MODE,
+            Command.SET_AIR_CONDITIONER_MODE,
+            MAIN,
+            argument="auto",
+        ),
+    ]
 
 
-async def test_set_temperature_ac_with_mode_from_off(
-    hass: HomeAssistant, air_conditioner
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_ac_set_temperature_and_hvac_mode_off(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
-    """Test the temp and mode is set successfully when the unit is off."""
-    air_conditioner.status.update_attribute_value(
-        Attribute.air_conditioner_mode, "heat"
-    )
-    air_conditioner.status.update_attribute_value(Attribute.switch, "off")
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[air_conditioner])
-    assert hass.states.get("climate.air_conditioner").state == HVACMode.OFF
+    """Test setting AC temperature and HVAC mode OFF."""
+    set_attribute_value(devices, Capability.SWITCH, Attribute.SWITCH, "on")
+    await setup_integration(hass, mock_config_entry)
+
     await hass.services.async_call(
         CLIMATE_DOMAIN,
         SERVICE_SET_TEMPERATURE,
         {
-            ATTR_ENTITY_ID: "climate.air_conditioner",
-            ATTR_TEMPERATURE: 27,
-            ATTR_HVAC_MODE: HVACMode.COOL,
-        },
-        blocking=True,
-    )
-    state = hass.states.get("climate.air_conditioner")
-    assert state.attributes[ATTR_TEMPERATURE] == 27
-    assert state.state == HVACMode.COOL
-
-
-async def test_set_temperature_ac_with_mode_to_off(
-    hass: HomeAssistant, air_conditioner
-) -> None:
-    """Test the temp and mode is set successfully to turn off the unit."""
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[air_conditioner])
-    assert hass.states.get("climate.air_conditioner").state != HVACMode.OFF
-    await hass.services.async_call(
-        CLIMATE_DOMAIN,
-        SERVICE_SET_TEMPERATURE,
-        {
-            ATTR_ENTITY_ID: "climate.air_conditioner",
-            ATTR_TEMPERATURE: 27,
+            ATTR_ENTITY_ID: "climate.ac_office_granit",
+            ATTR_TEMPERATURE: 23,
             ATTR_HVAC_MODE: HVACMode.OFF,
         },
         blocking=True,
     )
-    state = hass.states.get("climate.air_conditioner")
-    assert state.attributes[ATTR_TEMPERATURE] == 27
-    assert state.state == HVACMode.OFF
+    assert devices.execute_device_command.mock_calls == [
+        call(
+            "96a5ef74-5832-a84b-f1f7-ca799957065d",
+            Capability.SWITCH,
+            Command.OFF,
+            MAIN,
+        ),
+        call(
+            "96a5ef74-5832-a84b-f1f7-ca799957065d",
+            Capability.THERMOSTAT_COOLING_SETPOINT,
+            Command.SET_COOLING_SETPOINT,
+            MAIN,
+            argument=23.0,
+        ),
+    ]
 
 
-async def test_set_temperature_with_mode(hass: HomeAssistant, thermostat) -> None:
-    """Test the temperature and mode is set successfully."""
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[thermostat])
-    await hass.services.async_call(
-        CLIMATE_DOMAIN,
-        SERVICE_SET_TEMPERATURE,
-        {
-            ATTR_ENTITY_ID: "climate.thermostat",
-            ATTR_TARGET_TEMP_HIGH: 25.5,
-            ATTR_TARGET_TEMP_LOW: 22.2,
-            ATTR_HVAC_MODE: HVACMode.HEAT_COOL,
-        },
-        blocking=True,
-    )
-    state = hass.states.get("climate.thermostat")
-    assert state.attributes[ATTR_TARGET_TEMP_HIGH] == 25.5
-    assert state.attributes[ATTR_TARGET_TEMP_LOW] == 22.2
-    assert state.state == HVACMode.HEAT_COOL
-
-
-async def test_set_turn_off(hass: HomeAssistant, air_conditioner) -> None:
-    """Test the a/c is turned off successfully."""
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[air_conditioner])
-    state = hass.states.get("climate.air_conditioner")
-    assert state.state == HVACMode.HEAT_COOL
-    await hass.services.async_call(
-        CLIMATE_DOMAIN, SERVICE_TURN_OFF, {"entity_id": "all"}, blocking=True
-    )
-    state = hass.states.get("climate.air_conditioner")
-    assert state.state == HVACMode.OFF
-
-
-async def test_set_turn_on(hass: HomeAssistant, air_conditioner) -> None:
-    """Test the a/c is turned on successfully."""
-    air_conditioner.status.update_attribute_value(Attribute.switch, "off")
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[air_conditioner])
-    state = hass.states.get("climate.air_conditioner")
-    assert state.state == HVACMode.OFF
-    await hass.services.async_call(
-        CLIMATE_DOMAIN, SERVICE_TURN_ON, {"entity_id": "all"}, blocking=True
-    )
-    state = hass.states.get("climate.air_conditioner")
-    assert state.state == HVACMode.HEAT_COOL
-
-
-async def test_entity_and_device_attributes(
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+@pytest.mark.parametrize(
+    ("service", "command"),
+    [
+        (SERVICE_TURN_ON, Command.ON),
+        (SERVICE_TURN_OFF, Command.OFF),
+    ],
+)
+async def test_ac_toggle_power(
     hass: HomeAssistant,
-    device_registry: dr.DeviceRegistry,
-    entity_registry: er.EntityRegistry,
-    thermostat,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    service: str,
+    command: Command,
 ) -> None:
-    """Test the attributes of the entries are correct."""
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[thermostat])
+    """Test toggling AC power."""
+    await setup_integration(hass, mock_config_entry)
 
-    entry = entity_registry.async_get("climate.thermostat")
-    assert entry
-    assert entry.unique_id == thermostat.device_id
-
-    entry = device_registry.async_get_device(
-        identifiers={(DOMAIN, thermostat.device_id)}
-    )
-    assert entry
-    assert entry.configuration_url == "https://account.smartthings.com"
-    assert entry.identifiers == {(DOMAIN, thermostat.device_id)}
-    assert entry.name == thermostat.label
-    assert entry.model == "123"
-    assert entry.manufacturer == "Generic manufacturer"
-    assert entry.hw_version == "v4.56"
-    assert entry.sw_version == "v7.89"
-
-
-async def test_set_windfree_off(hass: HomeAssistant, air_conditioner) -> None:
-    """Test if the windfree preset can be turned on and is turned off when fan mode is set."""
-    entity_ids = ["climate.air_conditioner"]
-    air_conditioner.status.update_attribute_value(Attribute.switch, "on")
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[air_conditioner])
     await hass.services.async_call(
         CLIMATE_DOMAIN,
-        SERVICE_SET_PRESET_MODE,
-        {ATTR_ENTITY_ID: entity_ids, ATTR_PRESET_MODE: "windFree"},
+        service,
+        {ATTR_ENTITY_ID: "climate.ac_office_granit"},
         blocking=True,
     )
-    state = hass.states.get("climate.air_conditioner")
-    assert state.attributes[ATTR_PRESET_MODE] == "windFree"
-    await hass.services.async_call(
-        CLIMATE_DOMAIN,
-        SERVICE_SET_FAN_MODE,
-        {ATTR_ENTITY_ID: entity_ids, ATTR_FAN_MODE: "low"},
-        blocking=True,
+    devices.execute_device_command.assert_called_once_with(
+        "96a5ef74-5832-a84b-f1f7-ca799957065d",
+        Capability.SWITCH,
+        command,
+        MAIN,
     )
-    state = hass.states.get("climate.air_conditioner")
-    assert not state.attributes[ATTR_PRESET_MODE]
 
 
-async def test_set_swing_mode(hass: HomeAssistant, air_conditioner) -> None:
-    """Test the fan swing is set successfully."""
-    await setup_platform(hass, CLIMATE_DOMAIN, devices=[air_conditioner])
-    entity_ids = ["climate.air_conditioner"]
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_ac_set_swing_mode(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test climate set swing mode."""
+    set_attribute_value(
+        devices,
+        Capability.FAN_OSCILLATION_MODE,
+        Attribute.SUPPORTED_FAN_OSCILLATION_MODES,
+        ["fixed"],
+    )
+    await setup_integration(hass, mock_config_entry)
+
     await hass.services.async_call(
         CLIMATE_DOMAIN,
         SERVICE_SET_SWING_MODE,
-        {ATTR_ENTITY_ID: entity_ids, ATTR_SWING_MODE: "vertical"},
+        {ATTR_ENTITY_ID: "climate.ac_office_granit", ATTR_SWING_MODE: SWING_OFF},
         blocking=True,
     )
-    state = hass.states.get("climate.air_conditioner")
-    assert state.attributes[ATTR_SWING_MODE] == "vertical"
+    devices.execute_device_command.assert_called_once_with(
+        "96a5ef74-5832-a84b-f1f7-ca799957065d",
+        Capability.FAN_OSCILLATION_MODE,
+        Command.SET_FAN_OSCILLATION_MODE,
+        MAIN,
+        argument="fixed",
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_ac_set_preset_mode(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test climate set preset mode."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_PRESET_MODE,
+        {ATTR_ENTITY_ID: "climate.ac_office_granit", ATTR_PRESET_MODE: "windFree"},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "96a5ef74-5832-a84b-f1f7-ca799957065d",
+        Capability.CUSTOM_AIR_CONDITIONER_OPTIONAL_MODE,
+        Command.SET_AC_OPTIONAL_MODE,
+        MAIN,
+        argument="windFree",
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_ac_state_update(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test state update."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.states.get("climate.ac_office_granit").state == HVACMode.OFF
+
+    await trigger_update(
+        hass,
+        devices,
+        "96a5ef74-5832-a84b-f1f7-ca799957065d",
+        Capability.SWITCH,
+        Attribute.SWITCH,
+        "on",
+    )
+
+    assert hass.states.get("climate.ac_office_granit").state == HVACMode.HEAT
+
+
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+@pytest.mark.parametrize(
+    (
+        "capability",
+        "attribute",
+        "value",
+        "state_attribute",
+        "original_value",
+        "expected_value",
+    ),
+    [
+        (
+            Capability.TEMPERATURE_MEASUREMENT,
+            Attribute.TEMPERATURE,
+            20,
+            ATTR_CURRENT_TEMPERATURE,
+            25,
+            20,
+        ),
+        (
+            Capability.AIR_CONDITIONER_FAN_MODE,
+            Attribute.FAN_MODE,
+            "auto",
+            ATTR_FAN_MODE,
+            "low",
+            "auto",
+        ),
+        (
+            Capability.AIR_CONDITIONER_FAN_MODE,
+            Attribute.SUPPORTED_AC_FAN_MODES,
+            ["low", "auto"],
+            ATTR_FAN_MODES,
+            ["auto", "low", "medium", "high", "turbo"],
+            ["low", "auto"],
+        ),
+        (
+            Capability.THERMOSTAT_COOLING_SETPOINT,
+            Attribute.COOLING_SETPOINT,
+            23,
+            ATTR_TEMPERATURE,
+            25,
+            23,
+        ),
+        (
+            Capability.FAN_OSCILLATION_MODE,
+            Attribute.FAN_OSCILLATION_MODE,
+            "horizontal",
+            ATTR_SWING_MODE,
+            SWING_OFF,
+            SWING_HORIZONTAL,
+        ),
+        (
+            Capability.FAN_OSCILLATION_MODE,
+            Attribute.FAN_OSCILLATION_MODE,
+            "direct",
+            ATTR_SWING_MODE,
+            SWING_OFF,
+            SWING_OFF,
+        ),
+    ],
+    ids=[
+        ATTR_CURRENT_TEMPERATURE,
+        ATTR_FAN_MODE,
+        ATTR_FAN_MODES,
+        ATTR_TEMPERATURE,
+        ATTR_SWING_MODE,
+        f"{ATTR_SWING_MODE}_off",
+    ],
+)
+async def test_ac_state_attributes_update(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    capability: Capability,
+    attribute: Attribute,
+    value: Any,
+    state_attribute: str,
+    original_value: Any,
+    expected_value: Any,
+) -> None:
+    """Test state attributes update."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert (
+        hass.states.get("climate.ac_office_granit").attributes[state_attribute]
+        == original_value
+    )
+
+    await trigger_update(
+        hass,
+        devices,
+        "96a5ef74-5832-a84b-f1f7-ca799957065d",
+        capability,
+        attribute,
+        value,
+    )
+
+    assert (
+        hass.states.get("climate.ac_office_granit").attributes[state_attribute]
+        == expected_value
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["virtual_thermostat"])
+async def test_thermostat_set_fan_mode(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test thermostat set fan mode."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_FAN_MODE,
+        {ATTR_ENTITY_ID: "climate.asd", ATTR_FAN_MODE: "on"},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "2894dc93-0f11-49cc-8a81-3a684cebebf6",
+        Capability.THERMOSTAT_FAN_MODE,
+        Command.SET_THERMOSTAT_FAN_MODE,
+        MAIN,
+        argument="on",
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["virtual_thermostat"])
+async def test_thermostat_set_hvac_mode(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test thermostat set HVAC mode."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {ATTR_ENTITY_ID: "climate.asd", ATTR_HVAC_MODE: HVACMode.HEAT_COOL},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "2894dc93-0f11-49cc-8a81-3a684cebebf6",
+        Capability.THERMOSTAT_MODE,
+        Command.SET_THERMOSTAT_MODE,
+        MAIN,
+        argument="auto",
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["virtual_thermostat"])
+@pytest.mark.parametrize(
+    ("state", "data", "calls"),
+    [
+        (
+            "auto",
+            {ATTR_TARGET_TEMP_LOW: 15, ATTR_TARGET_TEMP_HIGH: 23},
+            [
+                call(
+                    "2894dc93-0f11-49cc-8a81-3a684cebebf6",
+                    Capability.THERMOSTAT_HEATING_SETPOINT,
+                    Command.SET_HEATING_SETPOINT,
+                    MAIN,
+                    argument=59.0,
+                ),
+                call(
+                    "2894dc93-0f11-49cc-8a81-3a684cebebf6",
+                    Capability.THERMOSTAT_COOLING_SETPOINT,
+                    Command.SET_COOLING_SETPOINT,
+                    MAIN,
+                    argument=73.4,
+                ),
+            ],
+        ),
+        (
+            "cool",
+            {ATTR_TEMPERATURE: 15},
+            [
+                call(
+                    "2894dc93-0f11-49cc-8a81-3a684cebebf6",
+                    Capability.THERMOSTAT_COOLING_SETPOINT,
+                    Command.SET_COOLING_SETPOINT,
+                    MAIN,
+                    argument=59.0,
+                )
+            ],
+        ),
+        (
+            "heat",
+            {ATTR_TEMPERATURE: 23},
+            [
+                call(
+                    "2894dc93-0f11-49cc-8a81-3a684cebebf6",
+                    Capability.THERMOSTAT_HEATING_SETPOINT,
+                    Command.SET_HEATING_SETPOINT,
+                    MAIN,
+                    argument=73.4,
+                )
+            ],
+        ),
+        (
+            "heat",
+            {ATTR_TEMPERATURE: 23, ATTR_HVAC_MODE: HVACMode.COOL},
+            [
+                call(
+                    "2894dc93-0f11-49cc-8a81-3a684cebebf6",
+                    Capability.THERMOSTAT_MODE,
+                    Command.SET_THERMOSTAT_MODE,
+                    MAIN,
+                    argument="cool",
+                ),
+                call(
+                    "2894dc93-0f11-49cc-8a81-3a684cebebf6",
+                    Capability.THERMOSTAT_COOLING_SETPOINT,
+                    Command.SET_COOLING_SETPOINT,
+                    MAIN,
+                    argument=73.4,
+                ),
+            ],
+        ),
+    ],
+)
+async def test_thermostat_set_temperature(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    state: str,
+    data: dict[str, Any],
+    calls: list[call],
+) -> None:
+    """Test thermostat set temperature."""
+    set_attribute_value(
+        devices, Capability.THERMOSTAT_MODE, Attribute.THERMOSTAT_MODE, state
+    )
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {ATTR_ENTITY_ID: "climate.asd"} | data,
+        blocking=True,
+    )
+    assert devices.execute_device_command.mock_calls == calls
+
+
+@pytest.mark.parametrize("device_fixture", ["virtual_thermostat"])
+async def test_humidity(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test humidity extra state attribute."""
+    devices.get_device_status.return_value[MAIN][
+        Capability.RELATIVE_HUMIDITY_MEASUREMENT
+    ] = {Attribute.HUMIDITY: Status(50)}
+    await setup_integration(hass, mock_config_entry)
+
+    state = hass.states.get("climate.asd")
+    assert state
+    assert state.attributes[ATTR_CURRENT_HUMIDITY] == 50
+
+
+@pytest.mark.parametrize("device_fixture", ["virtual_thermostat"])
+async def test_updating_humidity(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test updating humidity extra state attribute."""
+    devices.get_device_status.return_value[MAIN][
+        Capability.RELATIVE_HUMIDITY_MEASUREMENT
+    ] = {Attribute.HUMIDITY: Status(50)}
+    await setup_integration(hass, mock_config_entry)
+
+    state = hass.states.get("climate.asd")
+    assert state
+    assert state.attributes[ATTR_CURRENT_HUMIDITY] == 50
+
+    await trigger_update(
+        hass,
+        devices,
+        "2894dc93-0f11-49cc-8a81-3a684cebebf6",
+        Capability.RELATIVE_HUMIDITY_MEASUREMENT,
+        Attribute.HUMIDITY,
+        40,
+    )
+
+    assert hass.states.get("climate.asd").attributes[ATTR_CURRENT_HUMIDITY] == 40
+
+
+@pytest.mark.parametrize("device_fixture", ["virtual_thermostat"])
+@pytest.mark.parametrize(
+    (
+        "capability",
+        "attribute",
+        "value",
+        "state_attribute",
+        "original_value",
+        "expected_value",
+    ),
+    [
+        (
+            Capability.TEMPERATURE_MEASUREMENT,
+            Attribute.TEMPERATURE,
+            20,
+            ATTR_CURRENT_TEMPERATURE,
+            4734.6,
+            -6.7,
+        ),
+        (
+            Capability.THERMOSTAT_FAN_MODE,
+            Attribute.THERMOSTAT_FAN_MODE,
+            "auto",
+            ATTR_FAN_MODE,
+            "followschedule",
+            "auto",
+        ),
+        (
+            Capability.THERMOSTAT_FAN_MODE,
+            Attribute.SUPPORTED_THERMOSTAT_FAN_MODES,
+            ["auto", "circulate"],
+            ATTR_FAN_MODES,
+            ["on"],
+            ["auto", "circulate"],
+        ),
+        (
+            Capability.THERMOSTAT_OPERATING_STATE,
+            Attribute.THERMOSTAT_OPERATING_STATE,
+            "fan only",
+            ATTR_HVAC_ACTION,
+            HVACAction.COOLING,
+            HVACAction.FAN,
+        ),
+        (
+            Capability.THERMOSTAT_MODE,
+            Attribute.SUPPORTED_THERMOSTAT_MODES,
+            ["coolClean", "dryClean"],
+            ATTR_HVAC_MODES,
+            [],
+            [HVACMode.COOL, HVACMode.DRY],
+        ),
+    ],
+    ids=[
+        ATTR_CURRENT_TEMPERATURE,
+        ATTR_FAN_MODE,
+        ATTR_FAN_MODES,
+        ATTR_HVAC_ACTION,
+        ATTR_HVAC_MODES,
+    ],
+)
+async def test_thermostat_state_attributes_update(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    capability: Capability,
+    attribute: Attribute,
+    value: Any,
+    state_attribute: str,
+    original_value: Any,
+    expected_value: Any,
+) -> None:
+    """Test state attributes update."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.states.get("climate.asd").attributes[state_attribute] == original_value
+
+    await trigger_update(
+        hass,
+        devices,
+        "2894dc93-0f11-49cc-8a81-3a684cebebf6",
+        capability,
+        attribute,
+        value,
+    )
+
+    assert hass.states.get("climate.asd").attributes[state_attribute] == expected_value
diff --git a/tests/components/smartthings/test_config_flow.py b/tests/components/smartthings/test_config_flow.py
index 05ddc3a71de..d6e8ef03290 100644
--- a/tests/components/smartthings/test_config_flow.py
+++ b/tests/components/smartthings/test_config_flow.py
@@ -1,813 +1,613 @@
 """Tests for the SmartThings config flow module."""
 
 from http import HTTPStatus
-from unittest.mock import AsyncMock, Mock, patch
-from uuid import uuid4
+from unittest.mock import AsyncMock
 
-from aiohttp import ClientResponseError
-from pysmartthings import APIResponseError
-from pysmartthings.installedapp import format_install_url
+import pytest
 
-from homeassistant import config_entries
-from homeassistant.components.smartthings import smartapp
+from homeassistant.components.smartthings import OLD_DATA
 from homeassistant.components.smartthings.const import (
-    CONF_APP_ID,
     CONF_INSTALLED_APP_ID,
     CONF_LOCATION_ID,
     CONF_REFRESH_TOKEN,
+    CONF_SUBSCRIPTION_ID,
     DOMAIN,
 )
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_CLIENT_ID, CONF_CLIENT_SECRET
+from homeassistant.config_entries import SOURCE_USER, ConfigEntryState
+from homeassistant.const import (
+    CONF_ACCESS_TOKEN,
+    CONF_CLIENT_ID,
+    CONF_CLIENT_SECRET,
+    CONF_TOKEN,
+)
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.helpers import config_entry_oauth2_flow
 
 from tests.common import MockConfigEntry
+from tests.test_util.aiohttp import AiohttpClientMocker
+from tests.typing import ClientSessionGenerator
 
 
-async def test_import_shows_user_step(hass: HomeAssistant) -> None:
-    """Test import source shows the user form."""
-    # Webhook confirmation shown
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_IMPORT}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-    assert result["description_placeholders"][
-        "webhook_url"
-    ] == smartapp.get_webhook_url(hass)
-
-
-async def test_entry_created(
-    hass: HomeAssistant, app, app_oauth_client, location, smartthings_mock
-) -> None:
-    """Test local webhook, new app, install event creates entry."""
-    token = str(uuid4())
-    installed_app_id = str(uuid4())
-    refresh_token = str(uuid4())
-    smartthings_mock.apps.return_value = []
-    smartthings_mock.create_app.return_value = (app, app_oauth_client)
-    smartthings_mock.locations.return_value = [location]
-    request = Mock()
-    request.installed_app_id = installed_app_id
-    request.auth_token = token
-    request.location_id = location.location_id
-    request.refresh_token = refresh_token
-
-    # Webhook confirmation shown
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-    assert result["description_placeholders"][
-        "webhook_url"
-    ] == smartapp.get_webhook_url(hass)
-
-    # Advance to PAT screen
-    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "pat"
-    assert "token_url" in result["description_placeholders"]
-    assert "component_url" in result["description_placeholders"]
-
-    # Enter token and advance to location screen
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_ACCESS_TOKEN: token}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "select_location"
-
-    # Select location and advance to external auth
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_LOCATION_ID: location.location_id}
-    )
-    assert result["type"] is FlowResultType.EXTERNAL_STEP
-    assert result["step_id"] == "authorize"
-    assert result["url"] == format_install_url(app.app_id, location.location_id)
-
-    # Complete external auth and advance to install
-    await smartapp.smartapp_install(hass, request, None, app)
-
-    # Finish
-    result = await hass.config_entries.flow.async_configure(result["flow_id"])
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["data"]["app_id"] == app.app_id
-    assert result["data"]["installed_app_id"] == installed_app_id
-    assert result["data"]["location_id"] == location.location_id
-    assert result["data"]["access_token"] == token
-    assert result["data"]["refresh_token"] == request.refresh_token
-    assert result["data"][CONF_CLIENT_SECRET] == app_oauth_client.client_secret
-    assert result["data"][CONF_CLIENT_ID] == app_oauth_client.client_id
-    assert result["title"] == location.name
-    entry = next(
-        (entry for entry in hass.config_entries.async_entries(DOMAIN)),
-        None,
-    )
-    assert entry.unique_id == smartapp.format_unique_id(
-        app.app_id, location.location_id
-    )
-
-
-async def test_entry_created_from_update_event(
-    hass: HomeAssistant, app, app_oauth_client, location, smartthings_mock
-) -> None:
-    """Test local webhook, new app, update event creates entry."""
-    token = str(uuid4())
-    installed_app_id = str(uuid4())
-    refresh_token = str(uuid4())
-    smartthings_mock.apps.return_value = []
-    smartthings_mock.create_app.return_value = (app, app_oauth_client)
-    smartthings_mock.locations.return_value = [location]
-    request = Mock()
-    request.installed_app_id = installed_app_id
-    request.auth_token = token
-    request.location_id = location.location_id
-    request.refresh_token = refresh_token
-
-    # Webhook confirmation shown
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-    assert result["description_placeholders"][
-        "webhook_url"
-    ] == smartapp.get_webhook_url(hass)
-
-    # Advance to PAT screen
-    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "pat"
-    assert "token_url" in result["description_placeholders"]
-    assert "component_url" in result["description_placeholders"]
-
-    # Enter token and advance to location screen
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_ACCESS_TOKEN: token}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "select_location"
-
-    # Select location and advance to external auth
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_LOCATION_ID: location.location_id}
-    )
-    assert result["type"] is FlowResultType.EXTERNAL_STEP
-    assert result["step_id"] == "authorize"
-    assert result["url"] == format_install_url(app.app_id, location.location_id)
-
-    # Complete external auth and advance to install
-    await smartapp.smartapp_update(hass, request, None, app)
-
-    # Finish
-    result = await hass.config_entries.flow.async_configure(result["flow_id"])
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["data"]["app_id"] == app.app_id
-    assert result["data"]["installed_app_id"] == installed_app_id
-    assert result["data"]["location_id"] == location.location_id
-    assert result["data"]["access_token"] == token
-    assert result["data"]["refresh_token"] == request.refresh_token
-    assert result["data"][CONF_CLIENT_SECRET] == app_oauth_client.client_secret
-    assert result["data"][CONF_CLIENT_ID] == app_oauth_client.client_id
-    assert result["title"] == location.name
-    entry = next(
-        (entry for entry in hass.config_entries.async_entries(DOMAIN)),
-        None,
-    )
-    assert entry.unique_id == smartapp.format_unique_id(
-        app.app_id, location.location_id
-    )
-
-
-async def test_entry_created_existing_app_new_oauth_client(
-    hass: HomeAssistant, app, app_oauth_client, location, smartthings_mock
-) -> None:
-    """Test entry is created with an existing app and generation of a new oauth client."""
-    token = str(uuid4())
-    installed_app_id = str(uuid4())
-    refresh_token = str(uuid4())
-    smartthings_mock.apps.return_value = [app]
-    smartthings_mock.generate_app_oauth.return_value = app_oauth_client
-    smartthings_mock.locations.return_value = [location]
-    smartthings_mock.create_app = AsyncMock(return_value=(app, app_oauth_client))
-    request = Mock()
-    request.installed_app_id = installed_app_id
-    request.auth_token = token
-    request.location_id = location.location_id
-    request.refresh_token = refresh_token
-
-    # Webhook confirmation shown
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-    assert result["description_placeholders"][
-        "webhook_url"
-    ] == smartapp.get_webhook_url(hass)
-
-    # Advance to PAT screen
-    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "pat"
-    assert "token_url" in result["description_placeholders"]
-    assert "component_url" in result["description_placeholders"]
-
-    # Enter token and advance to location screen
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_ACCESS_TOKEN: token}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "select_location"
-
-    # Select location and advance to external auth
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_LOCATION_ID: location.location_id}
-    )
-    assert result["type"] is FlowResultType.EXTERNAL_STEP
-    assert result["step_id"] == "authorize"
-    assert result["url"] == format_install_url(app.app_id, location.location_id)
-
-    # Complete external auth and advance to install
-    await smartapp.smartapp_install(hass, request, None, app)
-
-    # Finish
-    result = await hass.config_entries.flow.async_configure(result["flow_id"])
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["data"]["app_id"] == app.app_id
-    assert result["data"]["installed_app_id"] == installed_app_id
-    assert result["data"]["location_id"] == location.location_id
-    assert result["data"]["access_token"] == token
-    assert result["data"]["refresh_token"] == request.refresh_token
-    assert result["data"][CONF_CLIENT_SECRET] == app_oauth_client.client_secret
-    assert result["data"][CONF_CLIENT_ID] == app_oauth_client.client_id
-    assert result["title"] == location.name
-    entry = next(
-        (entry for entry in hass.config_entries.async_entries(DOMAIN)),
-        None,
-    )
-    assert entry.unique_id == smartapp.format_unique_id(
-        app.app_id, location.location_id
-    )
-
-
-async def test_entry_created_existing_app_copies_oauth_client(
-    hass: HomeAssistant, app, location, smartthings_mock
-) -> None:
-    """Test entry is created with an existing app and copies the oauth client from another entry."""
-    token = str(uuid4())
-    installed_app_id = str(uuid4())
-    refresh_token = str(uuid4())
-    oauth_client_id = str(uuid4())
-    oauth_client_secret = str(uuid4())
-    smartthings_mock.apps.return_value = [app]
-    smartthings_mock.locations.return_value = [location]
-    request = Mock()
-    request.installed_app_id = installed_app_id
-    request.auth_token = token
-    request.location_id = location.location_id
-    request.refresh_token = refresh_token
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={
-            CONF_APP_ID: app.app_id,
-            CONF_CLIENT_ID: oauth_client_id,
-            CONF_CLIENT_SECRET: oauth_client_secret,
-            CONF_LOCATION_ID: str(uuid4()),
-            CONF_INSTALLED_APP_ID: str(uuid4()),
-            CONF_ACCESS_TOKEN: token,
-        },
-    )
-    entry.add_to_hass(hass)
-
-    # Webhook confirmation shown
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-    assert result["description_placeholders"][
-        "webhook_url"
-    ] == smartapp.get_webhook_url(hass)
-
-    # Advance to PAT screen
-    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "pat"
-    assert "token_url" in result["description_placeholders"]
-    assert "component_url" in result["description_placeholders"]
-    # Assert access token is defaulted to an existing entry for convenience.
-    assert result["data_schema"]({}) == {CONF_ACCESS_TOKEN: token}
-
-    # Enter token and advance to location screen
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_ACCESS_TOKEN: token}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "select_location"
-
-    # Select location and advance to external auth
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_LOCATION_ID: location.location_id}
-    )
-    assert result["type"] is FlowResultType.EXTERNAL_STEP
-    assert result["step_id"] == "authorize"
-    assert result["url"] == format_install_url(app.app_id, location.location_id)
-
-    # Complete external auth and advance to install
-    await smartapp.smartapp_install(hass, request, None, app)
-
-    # Finish
-    result = await hass.config_entries.flow.async_configure(result["flow_id"])
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["data"]["app_id"] == app.app_id
-    assert result["data"]["installed_app_id"] == installed_app_id
-    assert result["data"]["location_id"] == location.location_id
-    assert result["data"]["access_token"] == token
-    assert result["data"]["refresh_token"] == request.refresh_token
-    assert result["data"][CONF_CLIENT_SECRET] == oauth_client_secret
-    assert result["data"][CONF_CLIENT_ID] == oauth_client_id
-    assert result["title"] == location.name
-    entry = next(
-        (
-            entry
-            for entry in hass.config_entries.async_entries(DOMAIN)
-            if entry.data[CONF_INSTALLED_APP_ID] == installed_app_id
-        ),
-        None,
-    )
-    assert entry.unique_id == smartapp.format_unique_id(
-        app.app_id, location.location_id
-    )
-
-
-async def test_entry_created_with_cloudhook(
-    hass: HomeAssistant, app, app_oauth_client, location, smartthings_mock
-) -> None:
-    """Test cloud, new app, install event creates entry."""
+@pytest.fixture
+def use_cloud(hass: HomeAssistant) -> None:
+    """Set up the cloud component."""
     hass.config.components.add("cloud")
-    # Unload the endpoint so we can reload it under the cloud.
-    await smartapp.unload_smartapp_endpoint(hass)
-    token = str(uuid4())
-    installed_app_id = str(uuid4())
-    refresh_token = str(uuid4())
-    smartthings_mock.apps.return_value = []
-    smartthings_mock.create_app = AsyncMock(return_value=(app, app_oauth_client))
-    smartthings_mock.locations = AsyncMock(return_value=[location])
-    request = Mock()
-    request.installed_app_id = installed_app_id
-    request.auth_token = token
-    request.location_id = location.location_id
-    request.refresh_token = refresh_token
-
-    with (
-        patch.object(
-            smartapp.cloud,
-            "async_active_subscription",
-            Mock(return_value=True),
-        ),
-        patch.object(
-            smartapp.cloud,
-            "async_create_cloudhook",
-            AsyncMock(return_value="http://cloud.test"),
-        ) as mock_create_cloudhook,
-    ):
-        await smartapp.setup_smartapp_endpoint(hass, True)
-
-        # Webhook confirmation shown
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": config_entries.SOURCE_USER}
-        )
-        assert result["type"] is FlowResultType.FORM
-        assert result["step_id"] == "user"
-        assert result["description_placeholders"][
-            "webhook_url"
-        ] == smartapp.get_webhook_url(hass)
-        # One is done by app fixture, one done by new config entry
-        assert mock_create_cloudhook.call_count == 2
-
-        # Advance to PAT screen
-        result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
-        assert result["type"] is FlowResultType.FORM
-        assert result["step_id"] == "pat"
-        assert "token_url" in result["description_placeholders"]
-        assert "component_url" in result["description_placeholders"]
-
-        # Enter token and advance to location screen
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"], {CONF_ACCESS_TOKEN: token}
-        )
-        assert result["type"] is FlowResultType.FORM
-        assert result["step_id"] == "select_location"
-
-        # Select location and advance to external auth
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"], {CONF_LOCATION_ID: location.location_id}
-        )
-        assert result["type"] is FlowResultType.EXTERNAL_STEP
-        assert result["step_id"] == "authorize"
-        assert result["url"] == format_install_url(app.app_id, location.location_id)
-
-        # Complete external auth and advance to install
-        await smartapp.smartapp_install(hass, request, None, app)
-
-        # Finish
-        result = await hass.config_entries.flow.async_configure(result["flow_id"])
-        assert result["type"] is FlowResultType.CREATE_ENTRY
-        assert result["data"]["app_id"] == app.app_id
-        assert result["data"]["installed_app_id"] == installed_app_id
-        assert result["data"]["location_id"] == location.location_id
-        assert result["data"]["access_token"] == token
-        assert result["data"]["refresh_token"] == request.refresh_token
-        assert result["data"][CONF_CLIENT_SECRET] == app_oauth_client.client_secret
-        assert result["data"][CONF_CLIENT_ID] == app_oauth_client.client_id
-        assert result["title"] == location.name
-        entry = next(
-            (entry for entry in hass.config_entries.async_entries(DOMAIN)),
-            None,
-        )
-        assert entry.unique_id == smartapp.format_unique_id(
-            app.app_id, location.location_id
-        )
 
 
-async def test_invalid_webhook_aborts(hass: HomeAssistant) -> None:
-    """Test flow aborts if webhook is invalid."""
-    # Webhook confirmation shown
-    await async_process_ha_core_config(
+@pytest.mark.usefixtures("current_request_with_host", "use_cloud")
+async def test_full_flow(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_smartthings: AsyncMock,
+    mock_setup_entry: AsyncMock,
+) -> None:
+    """Check a full flow."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+
+    state = config_entry_oauth2_flow._encode_jwt(
         hass,
-        {"external_url": "http://example.local:8123"},
-    )
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "invalid_webhook_url"
-    assert result["description_placeholders"][
-        "webhook_url"
-    ] == smartapp.get_webhook_url(hass)
-    assert "component_url" in result["description_placeholders"]
-
-
-async def test_invalid_token_shows_error(hass: HomeAssistant) -> None:
-    """Test an error is shown for invalid token formats."""
-    token = "123456789"
-
-    # Webhook confirmation shown
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-    assert result["description_placeholders"][
-        "webhook_url"
-    ] == smartapp.get_webhook_url(hass)
-
-    # Advance to PAT screen
-    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "pat"
-    assert "token_url" in result["description_placeholders"]
-    assert "component_url" in result["description_placeholders"]
-
-    # Enter token
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_ACCESS_TOKEN: token}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "pat"
-    assert result["data_schema"]({}) == {CONF_ACCESS_TOKEN: token}
-    assert result["errors"] == {CONF_ACCESS_TOKEN: "token_invalid_format"}
-    assert "token_url" in result["description_placeholders"]
-    assert "component_url" in result["description_placeholders"]
-
-
-async def test_unauthorized_token_shows_error(
-    hass: HomeAssistant, smartthings_mock
-) -> None:
-    """Test an error is shown for unauthorized token formats."""
-    token = str(uuid4())
-    request_info = Mock(real_url="http://example.com")
-    smartthings_mock.apps.side_effect = ClientResponseError(
-        request_info=request_info, history=None, status=HTTPStatus.UNAUTHORIZED
-    )
-
-    # Webhook confirmation shown
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-    assert result["description_placeholders"][
-        "webhook_url"
-    ] == smartapp.get_webhook_url(hass)
-
-    # Advance to PAT screen
-    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "pat"
-    assert "token_url" in result["description_placeholders"]
-    assert "component_url" in result["description_placeholders"]
-
-    # Enter token
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_ACCESS_TOKEN: token}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "pat"
-    assert result["data_schema"]({}) == {CONF_ACCESS_TOKEN: token}
-    assert result["errors"] == {CONF_ACCESS_TOKEN: "token_unauthorized"}
-    assert "token_url" in result["description_placeholders"]
-    assert "component_url" in result["description_placeholders"]
-
-
-async def test_forbidden_token_shows_error(
-    hass: HomeAssistant, smartthings_mock
-) -> None:
-    """Test an error is shown for forbidden token formats."""
-    token = str(uuid4())
-    request_info = Mock(real_url="http://example.com")
-    smartthings_mock.apps.side_effect = ClientResponseError(
-        request_info=request_info, history=None, status=HTTPStatus.FORBIDDEN
-    )
-
-    # Webhook confirmation shown
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-    assert result["description_placeholders"][
-        "webhook_url"
-    ] == smartapp.get_webhook_url(hass)
-
-    # Advance to PAT screen
-    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "pat"
-    assert "token_url" in result["description_placeholders"]
-    assert "component_url" in result["description_placeholders"]
-
-    # Enter token
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_ACCESS_TOKEN: token}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "pat"
-    assert result["data_schema"]({}) == {CONF_ACCESS_TOKEN: token}
-    assert result["errors"] == {CONF_ACCESS_TOKEN: "token_forbidden"}
-    assert "token_url" in result["description_placeholders"]
-    assert "component_url" in result["description_placeholders"]
-
-
-async def test_webhook_problem_shows_error(
-    hass: HomeAssistant, smartthings_mock
-) -> None:
-    """Test an error is shown when there's an problem with the webhook endpoint."""
-    token = str(uuid4())
-    data = {"error": {}}
-    request_info = Mock(real_url="http://example.com")
-    error = APIResponseError(
-        request_info=request_info,
-        history=None,
-        data=data,
-        status=HTTPStatus.UNPROCESSABLE_ENTITY,
-    )
-    error.is_target_error = Mock(return_value=True)
-    smartthings_mock.apps.side_effect = error
-
-    # Webhook confirmation shown
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-    assert result["description_placeholders"][
-        "webhook_url"
-    ] == smartapp.get_webhook_url(hass)
-
-    # Advance to PAT screen
-    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "pat"
-    assert "token_url" in result["description_placeholders"]
-    assert "component_url" in result["description_placeholders"]
-
-    # Enter token
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_ACCESS_TOKEN: token}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "pat"
-    assert result["data_schema"]({}) == {CONF_ACCESS_TOKEN: token}
-    assert result["errors"] == {"base": "webhook_error"}
-    assert "token_url" in result["description_placeholders"]
-    assert "component_url" in result["description_placeholders"]
-
-
-async def test_api_error_shows_error(hass: HomeAssistant, smartthings_mock) -> None:
-    """Test an error is shown when other API errors occur."""
-    token = str(uuid4())
-    data = {"error": {}}
-    request_info = Mock(real_url="http://example.com")
-    error = APIResponseError(
-        request_info=request_info,
-        history=None,
-        data=data,
-        status=HTTPStatus.BAD_REQUEST,
-    )
-    smartthings_mock.apps.side_effect = error
-
-    # Webhook confirmation shown
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-    assert result["description_placeholders"][
-        "webhook_url"
-    ] == smartapp.get_webhook_url(hass)
-
-    # Advance to PAT screen
-    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "pat"
-    assert "token_url" in result["description_placeholders"]
-    assert "component_url" in result["description_placeholders"]
-
-    # Enter token
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_ACCESS_TOKEN: token}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "pat"
-    assert result["data_schema"]({}) == {CONF_ACCESS_TOKEN: token}
-    assert result["errors"] == {"base": "app_setup_error"}
-    assert "token_url" in result["description_placeholders"]
-    assert "component_url" in result["description_placeholders"]
-
-
-async def test_unknown_response_error_shows_error(
-    hass: HomeAssistant, smartthings_mock
-) -> None:
-    """Test an error is shown when there is an unknown API error."""
-    token = str(uuid4())
-    request_info = Mock(real_url="http://example.com")
-    error = ClientResponseError(
-        request_info=request_info, history=None, status=HTTPStatus.NOT_FOUND
-    )
-    smartthings_mock.apps.side_effect = error
-
-    # Webhook confirmation shown
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-    assert result["description_placeholders"][
-        "webhook_url"
-    ] == smartapp.get_webhook_url(hass)
-
-    # Advance to PAT screen
-    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "pat"
-    assert "token_url" in result["description_placeholders"]
-    assert "component_url" in result["description_placeholders"]
-
-    # Enter token
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_ACCESS_TOKEN: token}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "pat"
-    assert result["data_schema"]({}) == {CONF_ACCESS_TOKEN: token}
-    assert result["errors"] == {"base": "app_setup_error"}
-    assert "token_url" in result["description_placeholders"]
-    assert "component_url" in result["description_placeholders"]
-
-
-async def test_unknown_error_shows_error(hass: HomeAssistant, smartthings_mock) -> None:
-    """Test an error is shown when there is an unknown API error."""
-    token = str(uuid4())
-    smartthings_mock.apps.side_effect = Exception("Unknown error")
-
-    # Webhook confirmation shown
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-    assert result["description_placeholders"][
-        "webhook_url"
-    ] == smartapp.get_webhook_url(hass)
-
-    # Advance to PAT screen
-    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "pat"
-    assert "token_url" in result["description_placeholders"]
-    assert "component_url" in result["description_placeholders"]
-
-    # Enter token
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_ACCESS_TOKEN: token}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "pat"
-    assert result["data_schema"]({}) == {CONF_ACCESS_TOKEN: token}
-    assert result["errors"] == {"base": "app_setup_error"}
-    assert "token_url" in result["description_placeholders"]
-    assert "component_url" in result["description_placeholders"]
-
-
-async def test_no_available_locations_aborts(
-    hass: HomeAssistant, app, app_oauth_client, location, smartthings_mock
-) -> None:
-    """Test select location aborts if no available locations."""
-    token = str(uuid4())
-    smartthings_mock.apps.return_value = []
-    smartthings_mock.create_app.return_value = (app, app_oauth_client)
-    smartthings_mock.locations.return_value = [location]
-    entry = MockConfigEntry(
-        domain=DOMAIN, data={CONF_LOCATION_ID: location.location_id}
-    )
-    entry.add_to_hass(hass)
-
-    # Webhook confirmation shown
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-    assert result["description_placeholders"][
-        "webhook_url"
-    ] == smartapp.get_webhook_url(hass)
-
-    # Advance to PAT screen
-    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "pat"
-    assert "token_url" in result["description_placeholders"]
-    assert "component_url" in result["description_placeholders"]
-
-    # Enter token and advance to location screen
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_ACCESS_TOKEN: token}
-    )
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "no_available_locations"
-
-
-async def test_reauth(
-    hass: HomeAssistant, app, app_oauth_client, location, smartthings_mock
-) -> None:
-    """Test reauth flow."""
-    token = str(uuid4())
-    installed_app_id = str(uuid4())
-    refresh_token = str(uuid4())
-    smartthings_mock.apps.return_value = []
-    smartthings_mock.create_app.return_value = (app, app_oauth_client)
-    smartthings_mock.locations.return_value = [location]
-    request = Mock()
-    request.installed_app_id = installed_app_id
-    request.auth_token = token
-    request.location_id = location.location_id
-    request.refresh_token = refresh_token
-
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={
-            CONF_APP_ID: app.app_id,
-            CONF_CLIENT_ID: app_oauth_client.client_id,
-            CONF_CLIENT_SECRET: app_oauth_client.client_secret,
-            CONF_LOCATION_ID: location.location_id,
-            CONF_INSTALLED_APP_ID: installed_app_id,
-            CONF_ACCESS_TOKEN: token,
-            CONF_REFRESH_TOKEN: "abc",
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
         },
-        unique_id=smartapp.format_unique_id(app.app_id, location.location_id),
     )
-    entry.add_to_hass(hass)
-    result = await entry.start_reauth_flow(hass)
+
+    assert result["type"] is FlowResultType.EXTERNAL_STEP
+    assert result["url"] == (
+        "https://api.smartthings.com/oauth/authorize"
+        "?response_type=code&client_id=CLIENT_ID"
+        "&redirect_uri=https://example.com/auth/external/callback"
+        f"&state={state}"
+        "&scope=r:devices:*+w:devices:*+x:devices:*+r:hubs:*+"
+        "r:locations:*+w:locations:*+x:locations:*+r:scenes:*+"
+        "x:scenes:*+r:rules:*+w:rules:*+sse+r:installedapps+"
+        "w:installedapps"
+    )
+
+    client = await hass_client_no_auth()
+    resp = await client.get(f"/auth/external/callback?code=abcd&state={state}")
+    assert resp.status == HTTPStatus.OK
+    assert resp.headers["content-type"] == "text/html; charset=utf-8"
+
+    aioclient_mock.clear_requests()
+    aioclient_mock.post(
+        "https://auth-global.api.smartthings.com/oauth/token",
+        json={
+            "refresh_token": "mock-refresh-token",
+            "access_token": "mock-access-token",
+            "token_type": "Bearer",
+            "expires_in": 82806,
+            "scope": "r:devices:* w:devices:* x:devices:* r:hubs:* "
+            "r:locations:* w:locations:* x:locations:* "
+            "r:scenes:* x:scenes:* r:rules:* w:rules:* sse",
+            "access_tier": 0,
+            "installed_app_id": "5aaaa925-2be1-4e40-b257-e4ef59083324",
+        },
+    )
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    result["data"]["token"].pop("expires_at")
+    assert result["data"][CONF_TOKEN] == {
+        "refresh_token": "mock-refresh-token",
+        "access_token": "mock-access-token",
+        "token_type": "Bearer",
+        "expires_in": 82806,
+        "scope": "r:devices:* w:devices:* x:devices:* r:hubs:* "
+        "r:locations:* w:locations:* x:locations:* "
+        "r:scenes:* x:scenes:* r:rules:* w:rules:* sse",
+        "access_tier": 0,
+        "installed_app_id": "5aaaa925-2be1-4e40-b257-e4ef59083324",
+    }
+    assert result["result"].unique_id == "397678e5-9995-4a39-9d9f-ae6ba310236c"
+
+
+@pytest.mark.usefixtures("current_request_with_host", "use_cloud")
+async def test_not_enough_scopes(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_smartthings: AsyncMock,
+    mock_setup_entry: AsyncMock,
+) -> None:
+    """Test we abort if we don't have enough scopes."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+
+    assert result["type"] is FlowResultType.EXTERNAL_STEP
+    assert result["url"] == (
+        "https://api.smartthings.com/oauth/authorize"
+        "?response_type=code&client_id=CLIENT_ID"
+        "&redirect_uri=https://example.com/auth/external/callback"
+        f"&state={state}"
+        "&scope=r:devices:*+w:devices:*+x:devices:*+r:hubs:*+"
+        "r:locations:*+w:locations:*+x:locations:*+r:scenes:*+"
+        "x:scenes:*+r:rules:*+w:rules:*+sse+r:installedapps+"
+        "w:installedapps"
+    )
+
+    client = await hass_client_no_auth()
+    resp = await client.get(f"/auth/external/callback?code=abcd&state={state}")
+    assert resp.status == HTTPStatus.OK
+    assert resp.headers["content-type"] == "text/html; charset=utf-8"
+
+    aioclient_mock.clear_requests()
+    aioclient_mock.post(
+        "https://auth-global.api.smartthings.com/oauth/token",
+        json={
+            "refresh_token": "mock-refresh-token",
+            "access_token": "mock-access-token",
+            "token_type": "Bearer",
+            "expires_in": 82806,
+            "scope": "r:devices:* w:devices:* x:devices:* r:hubs:* "
+            "r:locations:* w:locations:* x:locations:* "
+            "r:scenes:* x:scenes:* r:rules:* w:rules:* "
+            "r:installedapps w:installedapps",
+            "access_tier": 0,
+            "installed_app_id": "5aaaa925-2be1-4e40-b257-e4ef59083324",
+        },
+    )
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "missing_scopes"
+
+
+@pytest.mark.usefixtures("current_request_with_host", "use_cloud")
+async def test_duplicate_entry(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_smartthings: AsyncMock,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test duplicate entry is not able to set up."""
+    mock_config_entry.add_to_hass(hass)
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+
+    assert result["type"] is FlowResultType.EXTERNAL_STEP
+    assert result["url"] == (
+        "https://api.smartthings.com/oauth/authorize"
+        "?response_type=code&client_id=CLIENT_ID"
+        "&redirect_uri=https://example.com/auth/external/callback"
+        f"&state={state}"
+        "&scope=r:devices:*+w:devices:*+x:devices:*+r:hubs:*+"
+        "r:locations:*+w:locations:*+x:locations:*+r:scenes:*+"
+        "x:scenes:*+r:rules:*+w:rules:*+sse+r:installedapps+"
+        "w:installedapps"
+    )
+
+    client = await hass_client_no_auth()
+    resp = await client.get(f"/auth/external/callback?code=abcd&state={state}")
+    assert resp.status == HTTPStatus.OK
+    assert resp.headers["content-type"] == "text/html; charset=utf-8"
+
+    aioclient_mock.clear_requests()
+    aioclient_mock.post(
+        "https://auth-global.api.smartthings.com/oauth/token",
+        json={
+            "refresh_token": "mock-refresh-token",
+            "access_token": "mock-access-token",
+            "token_type": "Bearer",
+            "expires_in": 82806,
+            "scope": "r:devices:* w:devices:* x:devices:* r:hubs:* "
+            "r:locations:* w:locations:* x:locations:* "
+            "r:scenes:* x:scenes:* r:rules:* w:rules:* sse",
+            "access_tier": 0,
+            "installed_app_id": "5aaaa925-2be1-4e40-b257-e4ef59083324",
+        },
+    )
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+async def test_no_cloud(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_smartthings: AsyncMock,
+    mock_setup_entry: AsyncMock,
+) -> None:
+    """Check we abort when cloud is not enabled."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "cloud_not_enabled"
+
+
+@pytest.mark.usefixtures("current_request_with_host", "use_cloud")
+async def test_reauthentication(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_smartthings: AsyncMock,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test SmartThings reauthentication."""
+    mock_config_entry.add_to_hass(hass)
+
+    result = await mock_config_entry.start_reauth_flow(hass)
+
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "reauth_confirm"
 
     result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
-    assert result["type"] is FlowResultType.EXTERNAL_STEP
-    assert result["step_id"] == "authorize"
-    assert result["url"] == format_install_url(app.app_id, location.location_id)
 
-    await smartapp.smartapp_update(hass, request, None, app)
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+    client = await hass_client_no_auth()
+    await client.get(f"/auth/external/callback?code=abcd&state={state}")
+
+    aioclient_mock.post(
+        "https://auth-global.api.smartthings.com/oauth/token",
+        json={
+            "refresh_token": "new-refresh-token",
+            "access_token": "new-access-token",
+            "token_type": "Bearer",
+            "expires_in": 82806,
+            "scope": "r:devices:* w:devices:* x:devices:* r:hubs:* "
+            "r:locations:* w:locations:* x:locations:* "
+            "r:scenes:* x:scenes:* r:rules:* sse w:rules:*",
+            "access_tier": 0,
+            "installed_app_id": "5aaaa925-2be1-4e40-b257-e4ef59083324",
+        },
+    )
 
     result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reauth_successful"
+    mock_config_entry.data["token"].pop("expires_at")
+    assert mock_config_entry.data[CONF_TOKEN] == {
+        "refresh_token": "new-refresh-token",
+        "access_token": "new-access-token",
+        "token_type": "Bearer",
+        "expires_in": 82806,
+        "scope": "r:devices:* w:devices:* x:devices:* r:hubs:* "
+        "r:locations:* w:locations:* x:locations:* "
+        "r:scenes:* x:scenes:* r:rules:* sse w:rules:*",
+        "access_tier": 0,
+        "installed_app_id": "5aaaa925-2be1-4e40-b257-e4ef59083324",
+    }
+
+
+@pytest.mark.usefixtures("current_request_with_host", "use_cloud")
+async def test_reauthentication_wrong_scopes(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_smartthings: AsyncMock,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test SmartThings reauthentication with wrong scopes."""
+    mock_config_entry.add_to_hass(hass)
+
+    result = await mock_config_entry.start_reauth_flow(hass)
+
     assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "update_confirm"
+    assert result["step_id"] == "reauth_confirm"
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+    client = await hass_client_no_auth()
+    await client.get(f"/auth/external/callback?code=abcd&state={state}")
+
+    aioclient_mock.post(
+        "https://auth-global.api.smartthings.com/oauth/token",
+        json={
+            "refresh_token": "new-refresh-token",
+            "access_token": "new-access-token",
+            "token_type": "Bearer",
+            "expires_in": 82806,
+            "scope": "r:devices:* w:devices:* x:devices:* r:hubs:* "
+            "r:locations:* w:locations:* x:locations:* "
+            "r:scenes:* x:scenes:* r:rules:* w:rules:* "
+            "r:installedapps w:installedapps",
+            "access_tier": 0,
+            "installed_app_id": "5aaaa925-2be1-4e40-b257-e4ef59083324",
+        },
+    )
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "missing_scopes"
+
+
+@pytest.mark.usefixtures("current_request_with_host", "use_cloud")
+async def test_reauth_account_mismatch(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_smartthings: AsyncMock,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test SmartThings reauthentication with different account."""
+    mock_config_entry.add_to_hass(hass)
+
+    mock_smartthings.get_locations.return_value[
+        0
+    ].location_id = "123123123-2be1-4e40-b257-e4ef59083324"
+
+    result = await mock_config_entry.start_reauth_flow(hass)
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+    client = await hass_client_no_auth()
+    await client.get(f"/auth/external/callback?code=abcd&state={state}")
+
+    aioclient_mock.post(
+        "https://auth-global.api.smartthings.com/oauth/token",
+        json={
+            "refresh_token": "new-refresh-token",
+            "access_token": "new-access-token",
+            "token_type": "Bearer",
+            "expires_in": 82806,
+            "scope": "r:devices:* w:devices:* x:devices:* r:hubs:* "
+            "r:locations:* w:locations:* x:locations:* "
+            "r:scenes:* x:scenes:* r:rules:* w:rules:* sse",
+            "access_tier": 0,
+            "installed_app_id": "123123123-2be1-4e40-b257-e4ef59083324",
+        },
+    )
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reauth_account_mismatch"
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+async def test_reauthentication_no_cloud(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_smartthings: AsyncMock,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test SmartThings reauthentication without cloud."""
+    mock_config_entry.add_to_hass(hass)
+
+    result = await mock_config_entry.start_reauth_flow(hass)
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reauth_confirm"
 
     result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
 
     assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "reauth_successful"
+    assert result["reason"] == "cloud_not_enabled"
 
-    assert entry.data[CONF_REFRESH_TOKEN] == refresh_token
+
+@pytest.mark.usefixtures("current_request_with_host", "use_cloud")
+async def test_migration(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_smartthings: AsyncMock,
+    mock_old_config_entry: MockConfigEntry,
+) -> None:
+    """Test SmartThings reauthentication with different account."""
+    mock_old_config_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_old_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert mock_old_config_entry.state is ConfigEntryState.SETUP_ERROR
+
+    result = hass.config_entries.flow.async_progress()[0]
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+    client = await hass_client_no_auth()
+    await client.get(f"/auth/external/callback?code=abcd&state={state}")
+
+    aioclient_mock.post(
+        "https://auth-global.api.smartthings.com/oauth/token",
+        json={
+            "refresh_token": "new-refresh-token",
+            "access_token": "new-access-token",
+            "token_type": "Bearer",
+            "expires_in": 82806,
+            "scope": "r:devices:* w:devices:* x:devices:* r:hubs:* "
+            "r:locations:* w:locations:* x:locations:* "
+            "r:scenes:* x:scenes:* r:rules:* w:rules:* sse",
+            "access_tier": 0,
+            "installed_app_id": "123123123-2be1-4e40-b257-e4ef59083324",
+        },
+    )
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reauth_successful"
+    assert mock_old_config_entry.state is ConfigEntryState.LOADED
+    assert len(hass.config_entries.flow.async_progress()) == 0
+    mock_old_config_entry.data[CONF_TOKEN].pop("expires_at")
+    assert mock_old_config_entry.data == {
+        "auth_implementation": DOMAIN,
+        "old_data": {
+            CONF_ACCESS_TOKEN: "mock-access-token",
+            CONF_REFRESH_TOKEN: "mock-refresh-token",
+            CONF_CLIENT_ID: "CLIENT_ID",
+            CONF_CLIENT_SECRET: "CLIENT_SECRET",
+            CONF_LOCATION_ID: "397678e5-9995-4a39-9d9f-ae6ba310236c",
+            CONF_INSTALLED_APP_ID: "123aa123-2be1-4e40-b257-e4ef59083324",
+        },
+        CONF_TOKEN: {
+            "refresh_token": "new-refresh-token",
+            "access_token": "new-access-token",
+            "token_type": "Bearer",
+            "expires_in": 82806,
+            "scope": "r:devices:* w:devices:* x:devices:* r:hubs:* "
+            "r:locations:* w:locations:* x:locations:* "
+            "r:scenes:* x:scenes:* r:rules:* w:rules:* sse",
+            "access_tier": 0,
+            "installed_app_id": "123123123-2be1-4e40-b257-e4ef59083324",
+        },
+        CONF_LOCATION_ID: "397678e5-9995-4a39-9d9f-ae6ba310236c",
+        CONF_SUBSCRIPTION_ID: "f5768ce8-c9e5-4507-9020-912c0c60e0ab",
+    }
+    assert mock_old_config_entry.unique_id == "397678e5-9995-4a39-9d9f-ae6ba310236c"
+    assert mock_old_config_entry.version == 3
+    assert mock_old_config_entry.minor_version == 2
+
+
+@pytest.mark.usefixtures("current_request_with_host", "use_cloud")
+async def test_migration_wrong_location(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_smartthings: AsyncMock,
+    mock_old_config_entry: MockConfigEntry,
+) -> None:
+    """Test SmartThings reauthentication with wrong location."""
+    mock_old_config_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_old_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert mock_old_config_entry.state is ConfigEntryState.SETUP_ERROR
+
+    mock_smartthings.get_locations.return_value[
+        0
+    ].location_id = "123123123-2be1-4e40-b257-e4ef59083324"
+
+    result = hass.config_entries.flow.async_progress()[0]
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+    client = await hass_client_no_auth()
+    await client.get(f"/auth/external/callback?code=abcd&state={state}")
+
+    aioclient_mock.post(
+        "https://auth-global.api.smartthings.com/oauth/token",
+        json={
+            "refresh_token": "new-refresh-token",
+            "access_token": "new-access-token",
+            "token_type": "Bearer",
+            "expires_in": 82806,
+            "scope": "r:devices:* w:devices:* x:devices:* r:hubs:* "
+            "r:locations:* w:locations:* x:locations:* "
+            "r:scenes:* x:scenes:* r:rules:* w:rules:* sse",
+            "access_tier": 0,
+            "installed_app_id": "123123123-2be1-4e40-b257-e4ef59083324",
+        },
+    )
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reauth_location_mismatch"
+    assert mock_old_config_entry.state is ConfigEntryState.SETUP_ERROR
+    assert mock_old_config_entry.data == {
+        OLD_DATA: {
+            CONF_ACCESS_TOKEN: "mock-access-token",
+            CONF_REFRESH_TOKEN: "mock-refresh-token",
+            CONF_CLIENT_ID: "CLIENT_ID",
+            CONF_CLIENT_SECRET: "CLIENT_SECRET",
+            CONF_LOCATION_ID: "397678e5-9995-4a39-9d9f-ae6ba310236c",
+            CONF_INSTALLED_APP_ID: "123aa123-2be1-4e40-b257-e4ef59083324",
+        }
+    }
+    assert (
+        mock_old_config_entry.unique_id
+        == "appid123-2be1-4e40-b257-e4ef59083324_397678e5-9995-4a39-9d9f-ae6ba310236c"
+    )
+    assert mock_old_config_entry.version == 3
+    assert mock_old_config_entry.minor_version == 2
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+async def test_migration_no_cloud(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    mock_smartthings: AsyncMock,
+    mock_old_config_entry: MockConfigEntry,
+) -> None:
+    """Test SmartThings reauthentication with different account."""
+    mock_old_config_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_old_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert mock_old_config_entry.state is ConfigEntryState.SETUP_ERROR
+
+    result = hass.config_entries.flow.async_progress()[0]
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "cloud_not_enabled"
diff --git a/tests/components/smartthings/test_cover.py b/tests/components/smartthings/test_cover.py
index 31443c12ab2..37f12b44880 100644
--- a/tests/components/smartthings/test_cover.py
+++ b/tests/components/smartthings/test_cover.py
@@ -1,249 +1,192 @@
-"""Test for the SmartThings cover platform.
+"""Test for the SmartThings cover platform."""
 
-The only mocking required is of the underlying SmartThings API object so
-real HTTP calls are not initiated during testing.
-"""
+from unittest.mock import AsyncMock
 
-from pysmartthings import Attribute, Capability
+from pysmartthings import Attribute, Capability, Command, Status
+import pytest
+from syrupy import SnapshotAssertion
 
 from homeassistant.components.cover import (
     ATTR_CURRENT_POSITION,
     ATTR_POSITION,
     DOMAIN as COVER_DOMAIN,
+)
+from homeassistant.components.smartthings.const import MAIN
+from homeassistant.const import (
+    ATTR_BATTERY_LEVEL,
+    ATTR_ENTITY_ID,
     SERVICE_CLOSE_COVER,
     SERVICE_OPEN_COVER,
     SERVICE_SET_COVER_POSITION,
-    CoverState,
+    STATE_OPEN,
+    STATE_OPENING,
+    Platform,
 )
-from homeassistant.components.smartthings.const import DOMAIN, SIGNAL_SMARTTHINGS_UPDATE
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import ATTR_BATTERY_LEVEL, ATTR_ENTITY_ID, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers import entity_registry as er
 
-from .conftest import setup_platform
+from . import setup_integration, snapshot_smartthings_entities, trigger_update
+
+from tests.common import MockConfigEntry
 
 
-async def test_entity_and_device_attributes(
+async def test_all_entities(
     hass: HomeAssistant,
-    device_registry: dr.DeviceRegistry,
+    snapshot: SnapshotAssertion,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
     entity_registry: er.EntityRegistry,
-    device_factory,
 ) -> None:
-    """Test the attributes of the entity are correct."""
-    # Arrange
-    device = device_factory(
-        "Garage",
-        [Capability.garage_door_control],
-        {
-            Attribute.door: "open",
-            Attribute.mnmo: "123",
-            Attribute.mnmn: "Generic manufacturer",
-            Attribute.mnhw: "v4.56",
-            Attribute.mnfv: "v7.89",
-        },
+    """Test all entities."""
+    await setup_integration(hass, mock_config_entry)
+
+    snapshot_smartthings_entities(hass, entity_registry, snapshot, Platform.COVER)
+
+
+@pytest.mark.parametrize("device_fixture", ["c2c_shade"])
+@pytest.mark.parametrize(
+    ("action", "command"),
+    [
+        (SERVICE_OPEN_COVER, Command.OPEN),
+        (SERVICE_CLOSE_COVER, Command.CLOSE),
+    ],
+)
+async def test_cover_open_close(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    action: str,
+    command: Command,
+) -> None:
+    """Test cover open and close command."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        action,
+        {ATTR_ENTITY_ID: "cover.curtain_1a"},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "571af102-15db-4030-b76b-245a691f74a5",
+        Capability.WINDOW_SHADE,
+        command,
+        MAIN,
     )
-    # Act
-    await setup_platform(hass, COVER_DOMAIN, devices=[device])
-    # Assert
-    entry = entity_registry.async_get("cover.garage")
-    assert entry
-    assert entry.unique_id == device.device_id
-
-    entry = device_registry.async_get_device(identifiers={(DOMAIN, device.device_id)})
-    assert entry
-    assert entry.configuration_url == "https://account.smartthings.com"
-    assert entry.identifiers == {(DOMAIN, device.device_id)}
-    assert entry.name == device.label
-    assert entry.model == "123"
-    assert entry.manufacturer == "Generic manufacturer"
-    assert entry.hw_version == "v4.56"
-    assert entry.sw_version == "v7.89"
 
 
-async def test_open(hass: HomeAssistant, device_factory) -> None:
-    """Test the cover opens doors, garages, and shades successfully."""
-    # Arrange
-    devices = {
-        device_factory("Door", [Capability.door_control], {Attribute.door: "closed"}),
-        device_factory(
-            "Garage", [Capability.garage_door_control], {Attribute.door: "closed"}
-        ),
-        device_factory(
-            "Shade", [Capability.window_shade], {Attribute.window_shade: "closed"}
-        ),
+@pytest.mark.parametrize("device_fixture", ["c2c_shade"])
+async def test_cover_set_position(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test cover set position command."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_SET_COVER_POSITION,
+        {ATTR_ENTITY_ID: "cover.curtain_1a", ATTR_POSITION: 25},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "571af102-15db-4030-b76b-245a691f74a5",
+        Capability.SWITCH_LEVEL,
+        Command.SET_LEVEL,
+        MAIN,
+        argument=25,
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["c2c_shade"])
+async def test_cover_battery(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test battery extra state attribute."""
+    devices.get_device_status.return_value[MAIN][Capability.BATTERY] = {
+        Attribute.BATTERY: Status(50)
     }
-    await setup_platform(hass, COVER_DOMAIN, devices=devices)
-    entity_ids = ["cover.door", "cover.garage", "cover.shade"]
-    # Act
-    await hass.services.async_call(
-        COVER_DOMAIN, SERVICE_OPEN_COVER, {ATTR_ENTITY_ID: entity_ids}, blocking=True
-    )
-    # Assert
-    for entity_id in entity_ids:
-        state = hass.states.get(entity_id)
-        assert state is not None
-        assert state.state == CoverState.OPENING
+    await setup_integration(hass, mock_config_entry)
+
+    state = hass.states.get("cover.curtain_1a")
+    assert state
+    assert state.attributes[ATTR_BATTERY_LEVEL] == 50
 
 
-async def test_close(hass: HomeAssistant, device_factory) -> None:
-    """Test the cover closes doors, garages, and shades successfully."""
-    # Arrange
-    devices = {
-        device_factory("Door", [Capability.door_control], {Attribute.door: "open"}),
-        device_factory(
-            "Garage", [Capability.garage_door_control], {Attribute.door: "open"}
-        ),
-        device_factory(
-            "Shade", [Capability.window_shade], {Attribute.window_shade: "open"}
-        ),
+@pytest.mark.parametrize("device_fixture", ["c2c_shade"])
+async def test_cover_battery_updating(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test battery extra state attribute."""
+    devices.get_device_status.return_value[MAIN][Capability.BATTERY] = {
+        Attribute.BATTERY: Status(50)
     }
-    await setup_platform(hass, COVER_DOMAIN, devices=devices)
-    entity_ids = ["cover.door", "cover.garage", "cover.shade"]
-    # Act
-    await hass.services.async_call(
-        COVER_DOMAIN, SERVICE_CLOSE_COVER, {ATTR_ENTITY_ID: entity_ids}, blocking=True
+    await setup_integration(hass, mock_config_entry)
+
+    state = hass.states.get("cover.curtain_1a")
+    assert state
+    assert state.attributes[ATTR_BATTERY_LEVEL] == 50
+
+    await trigger_update(
+        hass,
+        devices,
+        "571af102-15db-4030-b76b-245a691f74a5",
+        Capability.BATTERY,
+        Attribute.BATTERY,
+        49,
     )
-    # Assert
-    for entity_id in entity_ids:
-        state = hass.states.get(entity_id)
-        assert state is not None
-        assert state.state == CoverState.CLOSING
+
+    state = hass.states.get("cover.curtain_1a")
+    assert state
+    assert state.attributes[ATTR_BATTERY_LEVEL] == 49
 
 
-async def test_set_cover_position_switch_level(
-    hass: HomeAssistant, device_factory
+@pytest.mark.parametrize("device_fixture", ["c2c_shade"])
+async def test_state_update(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
-    """Test the cover sets to the specific position for legacy devices that use Capability.switch_level."""
-    # Arrange
-    device = device_factory(
-        "Shade",
-        [Capability.window_shade, Capability.battery, Capability.switch_level],
-        {Attribute.window_shade: "opening", Attribute.battery: 95, Attribute.level: 10},
-    )
-    await setup_platform(hass, COVER_DOMAIN, devices=[device])
-    # Act
-    await hass.services.async_call(
-        COVER_DOMAIN,
-        SERVICE_SET_COVER_POSITION,
-        {ATTR_POSITION: 50, "entity_id": "all"},
-        blocking=True,
+    """Test state update."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.states.get("cover.curtain_1a").state == STATE_OPEN
+
+    await trigger_update(
+        hass,
+        devices,
+        "571af102-15db-4030-b76b-245a691f74a5",
+        Capability.WINDOW_SHADE,
+        Attribute.WINDOW_SHADE,
+        "opening",
     )
 
-    state = hass.states.get("cover.shade")
-    # Result of call does not update state
-    assert state.state == CoverState.OPENING
-    assert state.attributes[ATTR_BATTERY_LEVEL] == 95
-    assert state.attributes[ATTR_CURRENT_POSITION] == 10
-    # Ensure API called
-
-    assert device._api.post_device_command.call_count == 1
+    assert hass.states.get("cover.curtain_1a").state == STATE_OPENING
 
 
-async def test_set_cover_position(hass: HomeAssistant, device_factory) -> None:
-    """Test the cover sets to the specific position."""
-    # Arrange
-    device = device_factory(
-        "Shade",
-        [Capability.window_shade, Capability.battery, Capability.window_shade_level],
-        {
-            Attribute.window_shade: "opening",
-            Attribute.battery: 95,
-            Attribute.shade_level: 10,
-        },
-    )
-    await setup_platform(hass, COVER_DOMAIN, devices=[device])
-    # Act
-    await hass.services.async_call(
-        COVER_DOMAIN,
-        SERVICE_SET_COVER_POSITION,
-        {ATTR_POSITION: 50, "entity_id": "all"},
-        blocking=True,
-    )
-
-    state = hass.states.get("cover.shade")
-    # Result of call does not update state
-    assert state.state == CoverState.OPENING
-    assert state.attributes[ATTR_BATTERY_LEVEL] == 95
-    assert state.attributes[ATTR_CURRENT_POSITION] == 10
-    # Ensure API called
-
-    assert device._api.post_device_command.call_count == 1
-
-
-async def test_set_cover_position_unsupported(
-    hass: HomeAssistant, device_factory
+@pytest.mark.parametrize("device_fixture", ["c2c_shade"])
+async def test_position_update(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
-    """Test set position does nothing when not supported by device."""
-    # Arrange
-    device = device_factory(
-        "Shade", [Capability.window_shade], {Attribute.window_shade: "opening"}
-    )
-    await setup_platform(hass, COVER_DOMAIN, devices=[device])
-    # Act
-    await hass.services.async_call(
-        COVER_DOMAIN,
-        SERVICE_SET_COVER_POSITION,
-        {"entity_id": "all", ATTR_POSITION: 50},
-        blocking=True,
+    """Test position update."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.states.get("cover.curtain_1a").attributes[ATTR_CURRENT_POSITION] == 100
+
+    await trigger_update(
+        hass,
+        devices,
+        "571af102-15db-4030-b76b-245a691f74a5",
+        Capability.SWITCH_LEVEL,
+        Attribute.LEVEL,
+        50,
     )
 
-    state = hass.states.get("cover.shade")
-    assert ATTR_CURRENT_POSITION not in state.attributes
-
-    # Ensure API was not called
-
-    assert device._api.post_device_command.call_count == 0
-
-
-async def test_update_to_open_from_signal(hass: HomeAssistant, device_factory) -> None:
-    """Test the cover updates to open when receiving a signal."""
-    # Arrange
-    device = device_factory(
-        "Garage", [Capability.garage_door_control], {Attribute.door: "opening"}
-    )
-    await setup_platform(hass, COVER_DOMAIN, devices=[device])
-    device.status.update_attribute_value(Attribute.door, "open")
-    assert hass.states.get("cover.garage").state == CoverState.OPENING
-    # Act
-    async_dispatcher_send(hass, SIGNAL_SMARTTHINGS_UPDATE, [device.device_id])
-    # Assert
-    await hass.async_block_till_done()
-    state = hass.states.get("cover.garage")
-    assert state is not None
-    assert state.state == CoverState.OPEN
-
-
-async def test_update_to_closed_from_signal(
-    hass: HomeAssistant, device_factory
-) -> None:
-    """Test the cover updates to closed when receiving a signal."""
-    # Arrange
-    device = device_factory(
-        "Garage", [Capability.garage_door_control], {Attribute.door: "closing"}
-    )
-    await setup_platform(hass, COVER_DOMAIN, devices=[device])
-    device.status.update_attribute_value(Attribute.door, "closed")
-    assert hass.states.get("cover.garage").state == CoverState.CLOSING
-    # Act
-    async_dispatcher_send(hass, SIGNAL_SMARTTHINGS_UPDATE, [device.device_id])
-    # Assert
-    await hass.async_block_till_done()
-    state = hass.states.get("cover.garage")
-    assert state is not None
-    assert state.state == CoverState.CLOSED
-
-
-async def test_unload_config_entry(hass: HomeAssistant, device_factory) -> None:
-    """Test the lock is removed when the config entry is unloaded."""
-    # Arrange
-    device = device_factory(
-        "Garage", [Capability.garage_door_control], {Attribute.door: "open"}
-    )
-    config_entry = await setup_platform(hass, COVER_DOMAIN, devices=[device])
-    config_entry.mock_state(hass, ConfigEntryState.LOADED)
-    # Act
-    await hass.config_entries.async_forward_entry_unload(config_entry, COVER_DOMAIN)
-    # Assert
-    assert hass.states.get("cover.garage").state == STATE_UNAVAILABLE
+    assert hass.states.get("cover.curtain_1a").attributes[ATTR_CURRENT_POSITION] == 50
diff --git a/tests/components/smartthings/test_diagnostics.py b/tests/components/smartthings/test_diagnostics.py
new file mode 100644
index 00000000000..b28a3a1aff5
--- /dev/null
+++ b/tests/components/smartthings/test_diagnostics.py
@@ -0,0 +1,78 @@
+"""Test SmartThings diagnostics."""
+
+from unittest.mock import AsyncMock, patch
+
+import pytest
+from syrupy import SnapshotAssertion
+from syrupy.filters import props
+
+from homeassistant.components.smartthings.const import DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry, load_json_object_fixture
+from tests.components.diagnostics import (
+    get_diagnostics_for_config_entry,
+    get_diagnostics_for_device,
+)
+from tests.typing import ClientSessionGenerator
+
+
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_config_entry_diagnostics(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    devices: AsyncMock,
+    mock_smartthings: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test generating diagnostics for a device entry."""
+    mock_smartthings.get_raw_devices.return_value = [
+        load_json_object_fixture("devices/da_ac_rac_000001.json", DOMAIN)
+    ]
+    await setup_integration(hass, mock_config_entry)
+    assert (
+        await get_diagnostics_for_config_entry(hass, hass_client, mock_config_entry)
+        == snapshot
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_device_diagnostics(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    device_registry: dr.DeviceRegistry,
+    devices: AsyncMock,
+    mock_smartthings: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test generating diagnostics for a device entry."""
+    mock_smartthings.get_raw_device_status.return_value = load_json_object_fixture(
+        "device_status/da_ac_rac_000001.json", DOMAIN
+    )
+    mock_smartthings.get_raw_device.return_value = load_json_object_fixture(
+        "devices/da_ac_rac_000001.json", DOMAIN
+    )["items"][0]
+    await setup_integration(hass, mock_config_entry)
+
+    device = device_registry.async_get_device(
+        identifiers={(DOMAIN, "96a5ef74-5832-a84b-f1f7-ca799957065d")}
+    )
+
+    mock_smartthings.get_raw_device_status.reset_mock()
+
+    with patch("homeassistant.components.smartthings.diagnostics.EVENT_WAIT_TIME", 0.1):
+        diag = await get_diagnostics_for_device(
+            hass, hass_client, mock_config_entry, device
+        )
+
+    assert diag == snapshot(
+        exclude=props("last_changed", "last_reported", "last_updated")
+    )
+    mock_smartthings.get_raw_device_status.assert_called_once_with(
+        "96a5ef74-5832-a84b-f1f7-ca799957065d"
+    )
diff --git a/tests/components/smartthings/test_event.py b/tests/components/smartthings/test_event.py
new file mode 100644
index 00000000000..bdca7674981
--- /dev/null
+++ b/tests/components/smartthings/test_event.py
@@ -0,0 +1,61 @@
+"""Test for the SmartThings event platform."""
+
+from unittest.mock import AsyncMock
+
+from freezegun.api import FrozenDateTimeFactory
+from pysmartthings import Attribute, Capability
+import pytest
+from syrupy import SnapshotAssertion
+
+from homeassistant.const import STATE_UNKNOWN, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import setup_integration, snapshot_smartthings_entities, trigger_update
+
+from tests.common import MockConfigEntry
+
+
+async def test_all_entities(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test all entities."""
+    await setup_integration(hass, mock_config_entry)
+
+    snapshot_smartthings_entities(hass, entity_registry, snapshot, Platform.EVENT)
+
+
+@pytest.mark.parametrize("device_fixture", ["heatit_zpushwall"])
+async def test_state_update(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test state update."""
+    await setup_integration(hass, mock_config_entry)
+
+    freezer.move_to("2023-10-21")
+
+    assert (
+        hass.states.get("event.livingroom_smart_switch_button1").state == STATE_UNKNOWN
+    )
+
+    await trigger_update(
+        hass,
+        devices,
+        "5e5b97f3-3094-44e6-abc0-f61283412d6a",
+        Capability.BUTTON,
+        Attribute.BUTTON,
+        "pushed",
+        component="button1",
+    )
+
+    assert (
+        hass.states.get("event.livingroom_smart_switch_button1").state
+        == "2023-10-21T00:00:00.000+00:00"
+    )
diff --git a/tests/components/smartthings/test_fan.py b/tests/components/smartthings/test_fan.py
index b78c453b402..58287355381 100644
--- a/tests/components/smartthings/test_fan.py
+++ b/tests/components/smartthings/test_fan.py
@@ -1,433 +1,168 @@
-"""Test for the SmartThings fan platform.
+"""Test for the SmartThings fan platform."""
 
-The only mocking required is of the underlying SmartThings API object so
-real HTTP calls are not initiated during testing.
-"""
+from unittest.mock import AsyncMock
 
-from pysmartthings import Attribute, Capability
+from pysmartthings import Capability, Command
+import pytest
+from syrupy import SnapshotAssertion
 
 from homeassistant.components.fan import (
     ATTR_PERCENTAGE,
     ATTR_PRESET_MODE,
-    ATTR_PRESET_MODES,
     DOMAIN as FAN_DOMAIN,
-    FanEntityFeature,
+    SERVICE_SET_PERCENTAGE,
+    SERVICE_SET_PRESET_MODE,
 )
-from homeassistant.components.smartthings.const import DOMAIN, SIGNAL_SMARTTHINGS_UPDATE
-from homeassistant.config_entries import ConfigEntryState
+from homeassistant.components.smartthings import MAIN
 from homeassistant.const import (
     ATTR_ENTITY_ID,
-    ATTR_SUPPORTED_FEATURES,
-    STATE_UNAVAILABLE,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+    Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers import entity_registry as er
 
-from .conftest import setup_platform
+from . import setup_integration, snapshot_smartthings_entities
+
+from tests.common import MockConfigEntry
 
 
-async def test_entity_state(hass: HomeAssistant, device_factory) -> None:
-    """Tests the state attributes properly match the fan types."""
-    device = device_factory(
-        "Fan 1",
-        capabilities=[Capability.switch, Capability.fan_speed],
-        status={Attribute.switch: "on", Attribute.fan_speed: 2},
-    )
-    await setup_platform(hass, FAN_DOMAIN, devices=[device])
-
-    # Dimmer 1
-    state = hass.states.get("fan.fan_1")
-    assert state.state == "on"
-    assert (
-        state.attributes[ATTR_SUPPORTED_FEATURES]
-        == FanEntityFeature.SET_SPEED
-        | FanEntityFeature.TURN_OFF
-        | FanEntityFeature.TURN_ON
-    )
-    assert state.attributes[ATTR_PERCENTAGE] == 66
-
-
-async def test_entity_and_device_attributes(
+async def test_all_entities(
     hass: HomeAssistant,
-    device_registry: dr.DeviceRegistry,
+    snapshot: SnapshotAssertion,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
     entity_registry: er.EntityRegistry,
-    device_factory,
 ) -> None:
-    """Test the attributes of the entity are correct."""
-    # Arrange
-    device = device_factory(
-        "Fan 1",
-        capabilities=[Capability.switch, Capability.fan_speed],
-        status={
-            Attribute.switch: "on",
-            Attribute.fan_speed: 2,
-            Attribute.mnmo: "123",
-            Attribute.mnmn: "Generic manufacturer",
-            Attribute.mnhw: "v4.56",
-            Attribute.mnfv: "v7.89",
-        },
-    )
-    # Act
-    await setup_platform(hass, FAN_DOMAIN, devices=[device])
-    # Assert
-    entry = entity_registry.async_get("fan.fan_1")
-    assert entry
-    assert entry.unique_id == device.device_id
+    """Test all entities."""
+    await setup_integration(hass, mock_config_entry)
 
-    entry = device_registry.async_get_device(identifiers={(DOMAIN, device.device_id)})
-    assert entry
-    assert entry.configuration_url == "https://account.smartthings.com"
-    assert entry.identifiers == {(DOMAIN, device.device_id)}
-    assert entry.name == device.label
-    assert entry.model == "123"
-    assert entry.manufacturer == "Generic manufacturer"
-    assert entry.hw_version == "v4.56"
-    assert entry.sw_version == "v7.89"
+    snapshot_smartthings_entities(hass, entity_registry, snapshot, Platform.FAN)
 
 
-# Setup platform tests with varying capabilities
-async def test_setup_mode_capability(hass: HomeAssistant, device_factory) -> None:
-    """Test setting up a fan with only the mode capability."""
-    # Arrange
-    device = device_factory(
-        "Fan 1",
-        capabilities=[Capability.switch, Capability.air_conditioner_fan_mode],
-        status={
-            Attribute.switch: "off",
-            Attribute.fan_mode: "high",
-            Attribute.supported_ac_fan_modes: ["high", "low", "medium"],
-        },
-    )
-
-    await setup_platform(hass, FAN_DOMAIN, devices=[device])
-
-    # Assert
-    state = hass.states.get("fan.fan_1")
-    assert state is not None
-    assert (
-        state.attributes[ATTR_SUPPORTED_FEATURES]
-        == FanEntityFeature.PRESET_MODE
-        | FanEntityFeature.TURN_OFF
-        | FanEntityFeature.TURN_ON
-    )
-    assert state.attributes[ATTR_PRESET_MODE] == "high"
-    assert state.attributes[ATTR_PRESET_MODES] == ["high", "low", "medium"]
-
-
-async def test_setup_speed_capability(hass: HomeAssistant, device_factory) -> None:
-    """Test setting up a fan with only the speed capability."""
-    # Arrange
-    device = device_factory(
-        "Fan 1",
-        capabilities=[Capability.switch, Capability.fan_speed],
-        status={
-            Attribute.switch: "off",
-            Attribute.fan_speed: 2,
-        },
-    )
-
-    await setup_platform(hass, FAN_DOMAIN, devices=[device])
-
-    # Assert
-    state = hass.states.get("fan.fan_1")
-    assert state is not None
-    assert (
-        state.attributes[ATTR_SUPPORTED_FEATURES]
-        == FanEntityFeature.SET_SPEED
-        | FanEntityFeature.TURN_OFF
-        | FanEntityFeature.TURN_ON
-    )
-    assert state.attributes[ATTR_PERCENTAGE] == 66
-
-
-async def test_setup_both_capabilities(hass: HomeAssistant, device_factory) -> None:
-    """Test setting up a fan with both the mode and speed capability."""
-    # Arrange
-    device = device_factory(
-        "Fan 1",
-        capabilities=[
-            Capability.switch,
-            Capability.fan_speed,
-            Capability.air_conditioner_fan_mode,
-        ],
-        status={
-            Attribute.switch: "off",
-            Attribute.fan_speed: 2,
-            Attribute.fan_mode: "high",
-            Attribute.supported_ac_fan_modes: ["high", "low", "medium"],
-        },
-    )
-
-    await setup_platform(hass, FAN_DOMAIN, devices=[device])
-
-    # Assert
-    state = hass.states.get("fan.fan_1")
-    assert state is not None
-    assert (
-        state.attributes[ATTR_SUPPORTED_FEATURES]
-        == FanEntityFeature.SET_SPEED
-        | FanEntityFeature.PRESET_MODE
-        | FanEntityFeature.TURN_OFF
-        | FanEntityFeature.TURN_ON
-    )
-    assert state.attributes[ATTR_PERCENTAGE] == 66
-    assert state.attributes[ATTR_PRESET_MODE] == "high"
-    assert state.attributes[ATTR_PRESET_MODES] == ["high", "low", "medium"]
-
-
-# Speed Capability Tests
-
-
-async def test_turn_off_speed_capability(hass: HomeAssistant, device_factory) -> None:
-    """Test the fan turns of successfully."""
-    # Arrange
-    device = device_factory(
-        "Fan 1",
-        capabilities=[Capability.switch, Capability.fan_speed],
-        status={Attribute.switch: "on", Attribute.fan_speed: 2},
-    )
-    await setup_platform(hass, FAN_DOMAIN, devices=[device])
-    # Act
-    await hass.services.async_call(
-        "fan", "turn_off", {"entity_id": "fan.fan_1"}, blocking=True
-    )
-    # Assert
-    state = hass.states.get("fan.fan_1")
-    assert state is not None
-    assert state.state == "off"
-
-
-async def test_turn_on_speed_capability(hass: HomeAssistant, device_factory) -> None:
-    """Test the fan turns of successfully."""
-    # Arrange
-    device = device_factory(
-        "Fan 1",
-        capabilities=[Capability.switch, Capability.fan_speed],
-        status={Attribute.switch: "off", Attribute.fan_speed: 0},
-    )
-    await setup_platform(hass, FAN_DOMAIN, devices=[device])
-    # Act
-    await hass.services.async_call(
-        "fan", "turn_on", {ATTR_ENTITY_ID: "fan.fan_1"}, blocking=True
-    )
-    # Assert
-    state = hass.states.get("fan.fan_1")
-    assert state is not None
-    assert state.state == "on"
-
-
-async def test_turn_on_with_speed_speed_capability(
-    hass: HomeAssistant, device_factory
+@pytest.mark.parametrize("device_fixture", ["fake_fan"])
+@pytest.mark.parametrize(
+    ("action", "command"),
+    [
+        (SERVICE_TURN_ON, Command.ON),
+        (SERVICE_TURN_OFF, Command.OFF),
+    ],
+)
+async def test_turn_on_off(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    action: str,
+    command: Command,
 ) -> None:
-    """Test the fan turns on to the specified speed."""
-    # Arrange
-    device = device_factory(
-        "Fan 1",
-        capabilities=[Capability.switch, Capability.fan_speed],
-        status={Attribute.switch: "off", Attribute.fan_speed: 0},
-    )
-    await setup_platform(hass, FAN_DOMAIN, devices=[device])
-    # Act
+    """Test turning on and off."""
+    await setup_integration(hass, mock_config_entry)
+
     await hass.services.async_call(
-        "fan",
-        "turn_on",
-        {ATTR_ENTITY_ID: "fan.fan_1", ATTR_PERCENTAGE: 100},
+        FAN_DOMAIN,
+        action,
+        {ATTR_ENTITY_ID: "fan.fake_fan"},
         blocking=True,
     )
-    # Assert
-    state = hass.states.get("fan.fan_1")
-    assert state is not None
-    assert state.state == "on"
-    assert state.attributes[ATTR_PERCENTAGE] == 100
-
-
-async def test_turn_off_with_speed_speed_capability(
-    hass: HomeAssistant, device_factory
-) -> None:
-    """Test the fan turns off with the speed."""
-    # Arrange
-    device = device_factory(
-        "Fan 1",
-        capabilities=[Capability.switch, Capability.fan_speed],
-        status={Attribute.switch: "on", Attribute.fan_speed: 100},
+    devices.execute_device_command.assert_called_once_with(
+        "f1af21a2-d5a1-437c-b10a-b34a87394b71",
+        Capability.SWITCH,
+        command,
+        MAIN,
     )
-    await setup_platform(hass, FAN_DOMAIN, devices=[device])
-    # Act
+
+
+@pytest.mark.parametrize("device_fixture", ["fake_fan"])
+async def test_set_percentage(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test setting the speed percentage of the fan."""
+    await setup_integration(hass, mock_config_entry)
+
     await hass.services.async_call(
-        "fan",
-        "set_percentage",
-        {ATTR_ENTITY_ID: "fan.fan_1", ATTR_PERCENTAGE: 0},
+        FAN_DOMAIN,
+        SERVICE_SET_PERCENTAGE,
+        {ATTR_ENTITY_ID: "fan.fake_fan", ATTR_PERCENTAGE: 50},
         blocking=True,
     )
-    # Assert
-    state = hass.states.get("fan.fan_1")
-    assert state is not None
-    assert state.state == "off"
-
-
-async def test_set_percentage_speed_capability(
-    hass: HomeAssistant, device_factory
-) -> None:
-    """Test setting to specific fan speed."""
-    # Arrange
-    device = device_factory(
-        "Fan 1",
-        capabilities=[Capability.switch, Capability.fan_speed],
-        status={Attribute.switch: "off", Attribute.fan_speed: 0},
+    devices.execute_device_command.assert_called_once_with(
+        "f1af21a2-d5a1-437c-b10a-b34a87394b71",
+        Capability.FAN_SPEED,
+        Command.SET_FAN_SPEED,
+        MAIN,
+        argument=2,
     )
-    await setup_platform(hass, FAN_DOMAIN, devices=[device])
-    # Act
+
+
+@pytest.mark.parametrize("device_fixture", ["fake_fan"])
+async def test_set_percentage_off(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test setting the speed percentage of the fan."""
+    await setup_integration(hass, mock_config_entry)
+
     await hass.services.async_call(
-        "fan",
-        "set_percentage",
-        {ATTR_ENTITY_ID: "fan.fan_1", ATTR_PERCENTAGE: 100},
+        FAN_DOMAIN,
+        SERVICE_SET_PERCENTAGE,
+        {ATTR_ENTITY_ID: "fan.fake_fan", ATTR_PERCENTAGE: 0},
         blocking=True,
     )
-    # Assert
-    state = hass.states.get("fan.fan_1")
-    assert state is not None
-    assert state.state == "on"
-    assert state.attributes[ATTR_PERCENTAGE] == 100
+    devices.execute_device_command.assert_called_once_with(
+        "f1af21a2-d5a1-437c-b10a-b34a87394b71",
+        Capability.SWITCH,
+        Command.OFF,
+        MAIN,
+    )
 
 
-async def test_update_from_signal_speed_capability(
-    hass: HomeAssistant, device_factory
+@pytest.mark.parametrize("device_fixture", ["fake_fan"])
+async def test_set_percentage_on(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
-    """Test the fan updates when receiving a signal."""
-    # Arrange
-    device = device_factory(
-        "Fan 1",
-        capabilities=[Capability.switch, Capability.fan_speed],
-        status={Attribute.switch: "off", Attribute.fan_speed: 0},
-    )
-    await setup_platform(hass, FAN_DOMAIN, devices=[device])
-    await device.switch_on(True)
-    # Act
-    async_dispatcher_send(hass, SIGNAL_SMARTTHINGS_UPDATE, [device.device_id])
-    # Assert
-    await hass.async_block_till_done()
-    state = hass.states.get("fan.fan_1")
-    assert state is not None
-    assert state.state == "on"
+    """Test setting the speed percentage of the fan."""
+    await setup_integration(hass, mock_config_entry)
 
-
-async def test_unload_config_entry(hass: HomeAssistant, device_factory) -> None:
-    """Test the fan is removed when the config entry is unloaded."""
-    # Arrange
-    device = device_factory(
-        "Fan 1",
-        capabilities=[Capability.switch, Capability.fan_speed],
-        status={Attribute.switch: "off", Attribute.fan_speed: 0},
-    )
-    config_entry = await setup_platform(hass, FAN_DOMAIN, devices=[device])
-    config_entry.mock_state(hass, ConfigEntryState.LOADED)
-    # Act
-    await hass.config_entries.async_forward_entry_unload(config_entry, "fan")
-    # Assert
-    assert hass.states.get("fan.fan_1").state == STATE_UNAVAILABLE
-
-
-# Preset Mode Tests
-
-
-async def test_turn_off_mode_capability(hass: HomeAssistant, device_factory) -> None:
-    """Test the fan turns of successfully."""
-    # Arrange
-    device = device_factory(
-        "Fan 1",
-        capabilities=[Capability.switch, Capability.air_conditioner_fan_mode],
-        status={
-            Attribute.switch: "on",
-            Attribute.fan_mode: "high",
-            Attribute.supported_ac_fan_modes: ["high", "low", "medium"],
-        },
-    )
-    await setup_platform(hass, FAN_DOMAIN, devices=[device])
-    # Act
     await hass.services.async_call(
-        "fan", "turn_off", {"entity_id": "fan.fan_1"}, blocking=True
-    )
-    # Assert
-    state = hass.states.get("fan.fan_1")
-    assert state is not None
-    assert state.state == "off"
-    assert state.attributes[ATTR_PRESET_MODE] == "high"
-
-
-async def test_turn_on_mode_capability(hass: HomeAssistant, device_factory) -> None:
-    """Test the fan turns of successfully."""
-    # Arrange
-    device = device_factory(
-        "Fan 1",
-        capabilities=[Capability.switch, Capability.air_conditioner_fan_mode],
-        status={
-            Attribute.switch: "off",
-            Attribute.fan_mode: "high",
-            Attribute.supported_ac_fan_modes: ["high", "low", "medium"],
-        },
-    )
-    await setup_platform(hass, FAN_DOMAIN, devices=[device])
-    # Act
-    await hass.services.async_call(
-        "fan", "turn_on", {ATTR_ENTITY_ID: "fan.fan_1"}, blocking=True
-    )
-    # Assert
-    state = hass.states.get("fan.fan_1")
-    assert state is not None
-    assert state.state == "on"
-    assert state.attributes[ATTR_PRESET_MODE] == "high"
-
-
-async def test_update_from_signal_mode_capability(
-    hass: HomeAssistant, device_factory
-) -> None:
-    """Test the fan updates when receiving a signal."""
-    # Arrange
-    device = device_factory(
-        "Fan 1",
-        capabilities=[Capability.switch, Capability.air_conditioner_fan_mode],
-        status={
-            Attribute.switch: "off",
-            Attribute.fan_mode: "high",
-            Attribute.supported_ac_fan_modes: ["high", "low", "medium"],
-        },
-    )
-    await setup_platform(hass, FAN_DOMAIN, devices=[device])
-    await device.switch_on(True)
-    # Act
-    async_dispatcher_send(hass, SIGNAL_SMARTTHINGS_UPDATE, [device.device_id])
-    # Assert
-    await hass.async_block_till_done()
-    state = hass.states.get("fan.fan_1")
-    assert state is not None
-    assert state.state == "on"
-
-
-async def test_set_preset_mode_mode_capability(
-    hass: HomeAssistant, device_factory
-) -> None:
-    """Test setting to specific fan mode."""
-    # Arrange
-    device = device_factory(
-        "Fan 1",
-        capabilities=[Capability.switch, Capability.air_conditioner_fan_mode],
-        status={
-            Attribute.switch: "off",
-            Attribute.fan_mode: "high",
-            Attribute.supported_ac_fan_modes: ["high", "low", "medium"],
-        },
-    )
-
-    await setup_platform(hass, FAN_DOMAIN, devices=[device])
-    # Act
-    await hass.services.async_call(
-        "fan",
-        "set_preset_mode",
-        {ATTR_ENTITY_ID: "fan.fan_1", ATTR_PRESET_MODE: "low"},
+        FAN_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "fan.fake_fan", ATTR_PERCENTAGE: 50},
         blocking=True,
     )
-    # Assert
-    state = hass.states.get("fan.fan_1")
-    assert state is not None
-    assert state.attributes[ATTR_PRESET_MODE] == "low"
+    devices.execute_device_command.assert_called_once_with(
+        "f1af21a2-d5a1-437c-b10a-b34a87394b71",
+        Capability.FAN_SPEED,
+        Command.SET_FAN_SPEED,
+        MAIN,
+        argument=2,
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["fake_fan"])
+async def test_set_preset_mode(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test setting the speed percentage of the fan."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_SET_PRESET_MODE,
+        {ATTR_ENTITY_ID: "fan.fake_fan", ATTR_PRESET_MODE: "turbo"},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "f1af21a2-d5a1-437c-b10a-b34a87394b71",
+        Capability.AIR_CONDITIONER_FAN_MODE,
+        Command.SET_FAN_MODE,
+        MAIN,
+        argument="turbo",
+    )
diff --git a/tests/components/smartthings/test_init.py b/tests/components/smartthings/test_init.py
index 83372b58228..1d4b124c60d 100644
--- a/tests/components/smartthings/test_init.py
+++ b/tests/components/smartthings/test_init.py
@@ -1,568 +1,699 @@
 """Tests for the SmartThings component init module."""
 
-from collections.abc import Callable, Coroutine
-from datetime import datetime, timedelta
-from http import HTTPStatus
-from typing import Any
-from unittest.mock import Mock, patch
-from uuid import uuid4
+from unittest.mock import AsyncMock, patch
 
-from aiohttp import ClientConnectionError, ClientResponseError
-from pysmartthings import InstalledAppStatus, OAuthToken
-import pytest
-
-from homeassistant import config_entries
-from homeassistant.components import cloud, smartthings
-from homeassistant.components.smartthings.const import (
-    CONF_CLOUDHOOK_URL,
-    CONF_INSTALLED_APP_ID,
-    CONF_REFRESH_TOKEN,
-    DATA_BROKERS,
-    DOMAIN,
-    EVENT_BUTTON,
-    PLATFORMS,
-    SIGNAL_SMARTTHINGS_UPDATE,
+from aiohttp import ClientResponseError, RequestInfo
+from pysmartthings import (
+    Attribute,
+    Capability,
+    DeviceResponse,
+    DeviceStatus,
+    Lifecycle,
+    SmartThingsSinkError,
+    Subscription,
 )
+import pytest
+from syrupy import SnapshotAssertion
+
+from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
+from homeassistant.components.climate import DOMAIN as CLIMATE_DOMAIN, HVACMode
+from homeassistant.components.cover import DOMAIN as COVER_DOMAIN
+from homeassistant.components.fan import DOMAIN as FAN_DOMAIN
+from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN
+from homeassistant.components.lock import DOMAIN as LOCK_DOMAIN
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
+from homeassistant.components.smartthings import EVENT_BUTTON
+from homeassistant.components.smartthings.const import (
+    CONF_INSTALLED_APP_ID,
+    CONF_LOCATION_ID,
+    CONF_SUBSCRIPTION_ID,
+    DOMAIN,
+    SCOPES,
+)
+from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
-from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.const import EVENT_HOMEASSISTANT_STOP
+from homeassistant.core import Event, HomeAssistant
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 
-from tests.common import MockConfigEntry
+from . import setup_integration, trigger_update
+
+from tests.common import MockConfigEntry, load_fixture
 
 
-async def test_migration_creates_new_flow(
-    hass: HomeAssistant, smartthings_mock, config_entry
+async def test_devices(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    device_registry: dr.DeviceRegistry,
 ) -> None:
-    """Test migration deletes app and creates new flow."""
+    """Test all entities."""
+    await setup_integration(hass, mock_config_entry)
 
-    config_entry.add_to_hass(hass)
-    hass.config_entries.async_update_entry(config_entry, version=1)
+    device_id = devices.get_devices.return_value[0].device_id
 
-    await smartthings.async_migrate_entry(hass, config_entry)
-    await hass.async_block_till_done()
+    device = device_registry.async_get_device({(DOMAIN, device_id)})
 
-    assert smartthings_mock.delete_installed_app.call_count == 1
-    assert smartthings_mock.delete_app.call_count == 1
-    assert not hass.config_entries.async_entries(DOMAIN)
-    flows = hass.config_entries.flow.async_progress()
-    assert len(flows) == 1
-    assert flows[0]["handler"] == "smartthings"
-    assert flows[0]["context"] == {"source": config_entries.SOURCE_IMPORT}
+    assert device is not None
+    assert device == snapshot
 
 
-async def test_unrecoverable_api_errors_create_new_flow(
-    hass: HomeAssistant, config_entry, smartthings_mock
+@pytest.mark.parametrize("device_fixture", ["button"])
+async def test_button_event(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    snapshot: SnapshotAssertion,
 ) -> None:
-    """Test a new config flow is initiated when there are API errors.
+    """Test button event."""
+    await setup_integration(hass, mock_config_entry)
+    events = []
 
-    401 (unauthorized): Occurs when the access token is no longer valid.
-    403 (forbidden/not found): Occurs when the app or installed app could
-        not be retrieved/found (likely deleted?)
-    """
+    def capture_event(event: Event) -> None:
+        events.append(event)
 
-    config_entry.add_to_hass(hass)
-    request_info = Mock(real_url="http://example.com")
-    smartthings_mock.app.side_effect = ClientResponseError(
-        request_info=request_info, history=None, status=HTTPStatus.UNAUTHORIZED
-    )
+    hass.bus.async_listen_once(EVENT_BUTTON, capture_event)
 
-    # Assert setup returns false
-    result = await hass.config_entries.async_setup(config_entry.entry_id)
-    assert not result
-
-    assert config_entry.state == ConfigEntryState.SETUP_ERROR
-
-
-async def test_recoverable_api_errors_raise_not_ready(
-    hass: HomeAssistant, config_entry, smartthings_mock
-) -> None:
-    """Test config entry not ready raised for recoverable API errors."""
-    config_entry.add_to_hass(hass)
-    request_info = Mock(real_url="http://example.com")
-    smartthings_mock.app.side_effect = ClientResponseError(
-        request_info=request_info,
-        history=None,
-        status=HTTPStatus.INTERNAL_SERVER_ERROR,
-    )
-
-    with pytest.raises(ConfigEntryNotReady):
-        await smartthings.async_setup_entry(hass, config_entry)
-
-
-async def test_scenes_api_errors_raise_not_ready(
-    hass: HomeAssistant, config_entry, app, installed_app, smartthings_mock
-) -> None:
-    """Test if scenes are unauthorized we continue to load platforms."""
-    config_entry.add_to_hass(hass)
-    request_info = Mock(real_url="http://example.com")
-    smartthings_mock.app.return_value = app
-    smartthings_mock.installed_app.return_value = installed_app
-    smartthings_mock.scenes.side_effect = ClientResponseError(
-        request_info=request_info,
-        history=None,
-        status=HTTPStatus.INTERNAL_SERVER_ERROR,
-    )
-    with pytest.raises(ConfigEntryNotReady):
-        await smartthings.async_setup_entry(hass, config_entry)
-
-
-async def test_connection_errors_raise_not_ready(
-    hass: HomeAssistant, config_entry, smartthings_mock
-) -> None:
-    """Test config entry not ready raised for connection errors."""
-    config_entry.add_to_hass(hass)
-    smartthings_mock.app.side_effect = ClientConnectionError()
-
-    with pytest.raises(ConfigEntryNotReady):
-        await smartthings.async_setup_entry(hass, config_entry)
-
-
-async def test_base_url_no_longer_https_does_not_load(
-    hass: HomeAssistant, config_entry, app, smartthings_mock
-) -> None:
-    """Test base_url no longer valid creates a new flow."""
-    await async_process_ha_core_config(
+    await trigger_update(
         hass,
-        {"external_url": "http://example.local:8123"},
+        devices,
+        "c4bdd19f-85d1-4d58-8f9c-e75ac3cf113b",
+        Capability.BUTTON,
+        Attribute.BUTTON,
+        "pushed",
     )
-    config_entry.add_to_hass(hass)
-    smartthings_mock.app.return_value = app
 
-    # Assert setup returns false
-    result = await smartthings.async_setup_entry(hass, config_entry)
-    assert not result
+    assert len(events) == 1
+    assert events[0] == snapshot
 
 
-async def test_unauthorized_installed_app_raises_not_ready(
-    hass: HomeAssistant, config_entry, app, installed_app, smartthings_mock
-) -> None:
-    """Test config entry not ready raised when the app isn't authorized."""
-    config_entry.add_to_hass(hass)
-    installed_app.installed_app_status = InstalledAppStatus.PENDING
-
-    smartthings_mock.app.return_value = app
-    smartthings_mock.installed_app.return_value = installed_app
-
-    with pytest.raises(ConfigEntryNotReady):
-        await smartthings.async_setup_entry(hass, config_entry)
-
-
-async def test_scenes_unauthorized_loads_platforms(
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_create_subscription(
     hass: HomeAssistant,
-    config_entry,
-    app,
-    installed_app,
-    device,
-    smartthings_mock,
-    subscription_factory,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
-    """Test if scenes are unauthorized we continue to load platforms."""
-    config_entry.add_to_hass(hass)
-    request_info = Mock(real_url="http://example.com")
-    smartthings_mock.app.return_value = app
-    smartthings_mock.installed_app.return_value = installed_app
-    smartthings_mock.devices.return_value = [device]
-    smartthings_mock.scenes.side_effect = ClientResponseError(
-        request_info=request_info, history=None, status=HTTPStatus.FORBIDDEN
+    """Test creating a subscription."""
+    assert CONF_SUBSCRIPTION_ID not in mock_config_entry.data
+
+    await setup_integration(hass, mock_config_entry)
+
+    devices.create_subscription.assert_called_once()
+
+    assert (
+        mock_config_entry.data[CONF_SUBSCRIPTION_ID]
+        == "f5768ce8-c9e5-4507-9020-912c0c60e0ab"
     )
-    mock_token = Mock()
-    mock_token.access_token = str(uuid4())
-    mock_token.refresh_token = str(uuid4())
-    smartthings_mock.generate_tokens.return_value = mock_token
-    subscriptions = [
-        subscription_factory(capability) for capability in device.capabilities
-    ]
-    smartthings_mock.subscriptions.return_value = subscriptions
 
-    with patch.object(
-        hass.config_entries, "async_forward_entry_setups"
-    ) as forward_mock:
-        assert await hass.config_entries.async_setup(config_entry.entry_id)
-        # Assert platforms loaded
-        await hass.async_block_till_done()
-        forward_mock.assert_called_once_with(config_entry, PLATFORMS)
+    devices.subscribe.assert_called_once_with(
+        "397678e5-9995-4a39-9d9f-ae6ba310236c",
+        "5aaaa925-2be1-4e40-b257-e4ef59083324",
+        Subscription.from_json(load_fixture("subscription.json", DOMAIN)),
+    )
 
 
-async def test_config_entry_loads_platforms(
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_create_subscription_sink_error(
     hass: HomeAssistant,
-    config_entry,
-    app,
-    installed_app,
-    device,
-    smartthings_mock,
-    subscription_factory,
-    scene,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    snapshot: SnapshotAssertion,
 ) -> None:
-    """Test config entry loads properly and proxies to platforms."""
-    config_entry.add_to_hass(hass)
-    smartthings_mock.app.return_value = app
-    smartthings_mock.installed_app.return_value = installed_app
-    smartthings_mock.devices.return_value = [device]
-    smartthings_mock.scenes.return_value = [scene]
-    mock_token = Mock()
-    mock_token.access_token = str(uuid4())
-    mock_token.refresh_token = str(uuid4())
-    smartthings_mock.generate_tokens.return_value = mock_token
-    subscriptions = [
-        subscription_factory(capability) for capability in device.capabilities
-    ]
-    smartthings_mock.subscriptions.return_value = subscriptions
+    """Test handling an error when creating a subscription."""
+    assert CONF_SUBSCRIPTION_ID not in mock_config_entry.data
 
-    with patch.object(
-        hass.config_entries, "async_forward_entry_setups"
-    ) as forward_mock:
-        assert await hass.config_entries.async_setup(config_entry.entry_id)
-        # Assert platforms loaded
-        await hass.async_block_till_done()
-        forward_mock.assert_called_once_with(config_entry, PLATFORMS)
+    devices.create_subscription.side_effect = SmartThingsSinkError("Sink error")
+
+    await setup_integration(hass, mock_config_entry)
+
+    devices.subscribe.assert_not_called()
+
+    assert mock_config_entry.state is ConfigEntryState.SETUP_RETRY
+    assert CONF_SUBSCRIPTION_ID not in mock_config_entry.data
 
 
-async def test_config_entry_loads_unconnected_cloud(
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_update_subscription_identifier(
     hass: HomeAssistant,
-    config_entry,
-    app,
-    installed_app,
-    device,
-    smartthings_mock,
-    subscription_factory,
-    scene,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
-    """Test entry loads during startup when cloud isn't connected."""
-    config_entry.add_to_hass(hass)
-    hass.data[DOMAIN][CONF_CLOUDHOOK_URL] = "https://test.cloud"
-    smartthings_mock.app.return_value = app
-    smartthings_mock.installed_app.return_value = installed_app
-    smartthings_mock.devices.return_value = [device]
-    smartthings_mock.scenes.return_value = [scene]
-    mock_token = Mock()
-    mock_token.access_token = str(uuid4())
-    mock_token.refresh_token = str(uuid4())
-    smartthings_mock.generate_tokens.return_value = mock_token
-    subscriptions = [
-        subscription_factory(capability) for capability in device.capabilities
-    ]
-    smartthings_mock.subscriptions.return_value = subscriptions
-    with patch.object(
-        hass.config_entries, "async_forward_entry_setups"
-    ) as forward_mock:
-        assert await hass.config_entries.async_setup(config_entry.entry_id)
-        await hass.async_block_till_done()
-        forward_mock.assert_called_once_with(config_entry, PLATFORMS)
+    """Test updating the subscription identifier."""
+    await setup_integration(hass, mock_config_entry)
 
-
-async def test_unload_entry(hass: HomeAssistant, config_entry) -> None:
-    """Test entries are unloaded correctly."""
-    connect_disconnect = Mock()
-    smart_app = Mock()
-    smart_app.connect_event.return_value = connect_disconnect
-    broker = smartthings.DeviceBroker(hass, config_entry, Mock(), smart_app, [], [])
-    broker.connect()
-    hass.data[DOMAIN][DATA_BROKERS][config_entry.entry_id] = broker
-
-    with patch.object(
-        hass.config_entries, "async_forward_entry_unload", return_value=True
-    ) as forward_mock:
-        assert await smartthings.async_unload_entry(hass, config_entry)
-
-        assert connect_disconnect.call_count == 1
-        assert config_entry.entry_id not in hass.data[DOMAIN][DATA_BROKERS]
-        # Assert platforms unloaded
-        await hass.async_block_till_done()
-        assert forward_mock.call_count == len(PLATFORMS)
-
-
-async def test_remove_entry(
-    hass: HomeAssistant, config_entry, smartthings_mock
-) -> None:
-    """Test that the installed app and app are removed up."""
-    # Act
-    await smartthings.async_remove_entry(hass, config_entry)
-    # Assert
-    assert smartthings_mock.delete_installed_app.call_count == 1
-    assert smartthings_mock.delete_app.call_count == 1
-
-
-async def test_remove_entry_cloudhook(
-    hass: HomeAssistant, config_entry, smartthings_mock
-) -> None:
-    """Test that the installed app, app, and cloudhook are removed up."""
-    hass.config.components.add("cloud")
-    # Arrange
-    config_entry.add_to_hass(hass)
-    hass.data[DOMAIN][CONF_CLOUDHOOK_URL] = "https://test.cloud"
-    # Act
-    with (
-        patch.object(
-            cloud, "async_is_logged_in", return_value=True
-        ) as mock_async_is_logged_in,
-        patch.object(cloud, "async_delete_cloudhook") as mock_async_delete_cloudhook,
-    ):
-        await smartthings.async_remove_entry(hass, config_entry)
-    # Assert
-    assert smartthings_mock.delete_installed_app.call_count == 1
-    assert smartthings_mock.delete_app.call_count == 1
-    assert mock_async_is_logged_in.call_count == 1
-    assert mock_async_delete_cloudhook.call_count == 1
-
-
-async def test_remove_entry_app_in_use(
-    hass: HomeAssistant, config_entry, smartthings_mock
-) -> None:
-    """Test app is not removed if in use by another config entry."""
-    # Arrange
-    config_entry.add_to_hass(hass)
-    data = config_entry.data.copy()
-    data[CONF_INSTALLED_APP_ID] = str(uuid4())
-    entry2 = MockConfigEntry(version=2, domain=DOMAIN, data=data)
-    entry2.add_to_hass(hass)
-    # Act
-    await smartthings.async_remove_entry(hass, config_entry)
-    # Assert
-    assert smartthings_mock.delete_installed_app.call_count == 1
-    assert smartthings_mock.delete_app.call_count == 0
-
-
-async def test_remove_entry_already_deleted(
-    hass: HomeAssistant, config_entry, smartthings_mock
-) -> None:
-    """Test handles when the apps have already been removed."""
-    request_info = Mock(real_url="http://example.com")
-    # Arrange
-    smartthings_mock.delete_installed_app.side_effect = ClientResponseError(
-        request_info=request_info, history=None, status=HTTPStatus.FORBIDDEN
+    assert (
+        mock_config_entry.data[CONF_SUBSCRIPTION_ID]
+        == "f5768ce8-c9e5-4507-9020-912c0c60e0ab"
     )
-    smartthings_mock.delete_app.side_effect = ClientResponseError(
-        request_info=request_info, history=None, status=HTTPStatus.FORBIDDEN
+
+    devices.new_subscription_id_callback("abc")
+
+    await hass.async_block_till_done()
+
+    assert mock_config_entry.data[CONF_SUBSCRIPTION_ID] == "abc"
+
+
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_stale_subscription_id(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test updating the subscription identifier."""
+    mock_config_entry.add_to_hass(hass)
+
+    hass.config_entries.async_update_entry(
+        mock_config_entry,
+        data={**mock_config_entry.data, CONF_SUBSCRIPTION_ID: "test"},
     )
-    # Act
-    await smartthings.async_remove_entry(hass, config_entry)
-    # Assert
-    assert smartthings_mock.delete_installed_app.call_count == 1
-    assert smartthings_mock.delete_app.call_count == 1
 
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
 
-async def test_remove_entry_installedapp_api_error(
-    hass: HomeAssistant, config_entry, smartthings_mock
-) -> None:
-    """Test raises exceptions removing the installed app."""
-    request_info = Mock(real_url="http://example.com")
-    # Arrange
-    smartthings_mock.delete_installed_app.side_effect = ClientResponseError(
-        request_info=request_info,
-        history=None,
-        status=HTTPStatus.INTERNAL_SERVER_ERROR,
+    assert (
+        mock_config_entry.data[CONF_SUBSCRIPTION_ID]
+        == "f5768ce8-c9e5-4507-9020-912c0c60e0ab"
     )
-    # Act
-    with pytest.raises(ClientResponseError):
-        await smartthings.async_remove_entry(hass, config_entry)
-    # Assert
-    assert smartthings_mock.delete_installed_app.call_count == 1
-    assert smartthings_mock.delete_app.call_count == 0
+    devices.delete_subscription.assert_called_once_with("test")
 
 
-async def test_remove_entry_installedapp_unknown_error(
-    hass: HomeAssistant, config_entry, smartthings_mock
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_remove_subscription_identifier(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
-    """Test raises exceptions removing the installed app."""
-    # Arrange
-    smartthings_mock.delete_installed_app.side_effect = ValueError
-    # Act
-    with pytest.raises(ValueError):
-        await smartthings.async_remove_entry(hass, config_entry)
-    # Assert
-    assert smartthings_mock.delete_installed_app.call_count == 1
-    assert smartthings_mock.delete_app.call_count == 0
+    """Test removing the subscription identifier."""
+    await setup_integration(hass, mock_config_entry)
 
-
-async def test_remove_entry_app_api_error(
-    hass: HomeAssistant, config_entry, smartthings_mock
-) -> None:
-    """Test raises exceptions removing the app."""
-    # Arrange
-    request_info = Mock(real_url="http://example.com")
-    smartthings_mock.delete_app.side_effect = ClientResponseError(
-        request_info=request_info,
-        history=None,
-        status=HTTPStatus.INTERNAL_SERVER_ERROR,
+    assert (
+        mock_config_entry.data[CONF_SUBSCRIPTION_ID]
+        == "f5768ce8-c9e5-4507-9020-912c0c60e0ab"
     )
-    # Act
-    with pytest.raises(ClientResponseError):
-        await smartthings.async_remove_entry(hass, config_entry)
-    # Assert
-    assert smartthings_mock.delete_installed_app.call_count == 1
-    assert smartthings_mock.delete_app.call_count == 1
+
+    devices.new_subscription_id_callback(None)
+
+    await hass.async_block_till_done()
+
+    assert mock_config_entry.data[CONF_SUBSCRIPTION_ID] is None
 
 
-async def test_remove_entry_app_unknown_error(
-    hass: HomeAssistant, config_entry, smartthings_mock
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_max_connections_handling(
+    hass: HomeAssistant, devices: AsyncMock, mock_config_entry: MockConfigEntry
 ) -> None:
-    """Test raises exceptions removing the app."""
-    # Arrange
-    smartthings_mock.delete_app.side_effect = ValueError
-    # Act
-    with pytest.raises(ValueError):
-        await smartthings.async_remove_entry(hass, config_entry)
-    # Assert
-    assert smartthings_mock.delete_installed_app.call_count == 1
-    assert smartthings_mock.delete_app.call_count == 1
+    """Test handling reaching max connections."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert (
+        mock_config_entry.data[CONF_SUBSCRIPTION_ID]
+        == "f5768ce8-c9e5-4507-9020-912c0c60e0ab"
+    )
+
+    devices.create_subscription.side_effect = SmartThingsSinkError("Sink error")
+
+    devices.max_connections_reached_callback()
+
+    await hass.async_block_till_done()
+
+    assert mock_config_entry.state is ConfigEntryState.SETUP_RETRY
 
 
-async def test_broker_regenerates_token(hass: HomeAssistant, config_entry) -> None:
-    """Test the device broker regenerates the refresh token."""
-    token = Mock(OAuthToken)
-    token.refresh_token = str(uuid4())
-    stored_action = None
-    config_entry.add_to_hass(hass)
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_unloading(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test unloading the integration."""
+    await setup_integration(hass, mock_config_entry)
 
-    def async_track_time_interval(
-        hass: HomeAssistant,
-        action: Callable[[datetime], Coroutine[Any, Any, None] | None],
-        interval: timedelta,
-    ) -> None:
-        nonlocal stored_action
-        stored_action = action
+    await hass.config_entries.async_unload(mock_config_entry.entry_id)
+    devices.delete_subscription.assert_called_once_with(
+        "f5768ce8-c9e5-4507-9020-912c0c60e0ab"
+    )
+    # Deleting the subscription automatically deletes the subscription ID
+    devices.new_subscription_id_callback(None)
 
+    assert mock_config_entry.state is ConfigEntryState.NOT_LOADED
+    assert mock_config_entry.data[CONF_SUBSCRIPTION_ID] is None
+
+
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_shutdown(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test shutting down Home Assistant."""
+    await setup_integration(hass, mock_config_entry)
+
+    hass.bus.async_fire(EVENT_HOMEASSISTANT_STOP)
+    devices.delete_subscription.assert_called_once_with(
+        "f5768ce8-c9e5-4507-9020-912c0c60e0ab"
+    )
+    # Deleting the subscription automatically deletes the subscription ID
+    devices.new_subscription_id_callback(None)
+
+    assert mock_config_entry.state is ConfigEntryState.LOADED
+    assert mock_config_entry.data[CONF_SUBSCRIPTION_ID] is None
+
+
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_removing_stale_devices(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    device_registry: dr.DeviceRegistry,
+) -> None:
+    """Test removing stale devices."""
+    mock_config_entry.add_to_hass(hass)
+    device_registry.async_get_or_create(
+        config_entry_id=mock_config_entry.entry_id,
+        identifiers={(DOMAIN, "aaa-bbb-ccc")},
+    )
+
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert not device_registry.async_get_device({(DOMAIN, "aaa-bbb-ccc")})
+
+
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_refreshing_expired_token(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test removing stale devices."""
     with patch(
-        "homeassistant.components.smartthings.async_track_time_interval",
-        new=async_track_time_interval,
+        "homeassistant.components.smartthings.OAuth2Session.async_ensure_token_valid",
+        side_effect=ClientResponseError(
+            request_info=RequestInfo(
+                url="http://example.com",
+                method="GET",
+                headers={},
+                real_url="http://example.com",
+            ),
+            status=400,
+            history=(),
+        ),
     ):
-        broker = smartthings.DeviceBroker(hass, config_entry, token, Mock(), [], [])
-        broker.connect()
+        await setup_integration(hass, mock_config_entry)
 
-    assert stored_action
-    await stored_action(None)
-    assert token.refresh.call_count == 1
-    assert config_entry.data[CONF_REFRESH_TOKEN] == token.refresh_token
+    assert mock_config_entry.state is ConfigEntryState.SETUP_ERROR
+    assert len(hass.config_entries.flow.async_progress()) == 1
 
 
-async def test_event_handler_dispatches_updated_devices(
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_error_refreshing_token(
     hass: HomeAssistant,
-    config_entry,
-    device_factory,
-    event_request_factory,
-    event_factory,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
-    """Test the event handler dispatches updated devices."""
-    devices = [
-        device_factory("Bedroom 1 Switch", ["switch"]),
-        device_factory("Bathroom 1", ["switch"]),
-        device_factory("Sensor", ["motionSensor"]),
-        device_factory("Lock", ["lock"]),
-    ]
-    device_ids = [
-        devices[0].device_id,
-        devices[1].device_id,
-        devices[2].device_id,
-        devices[3].device_id,
-    ]
-    event = event_factory(
-        devices[3].device_id,
-        capability="lock",
-        attribute="lock",
-        value="locked",
-        data={"codeId": "1"},
-    )
-    request = event_request_factory(device_ids=device_ids, events=[event])
-    config_entry.add_to_hass(hass)
-    hass.config_entries.async_update_entry(
-        config_entry,
-        data={
-            **config_entry.data,
-            CONF_INSTALLED_APP_ID: request.installed_app_id,
-        },
-    )
-    called = False
+    """Test removing stale devices."""
+    with patch(
+        "homeassistant.components.smartthings.OAuth2Session.async_ensure_token_valid",
+        side_effect=ClientResponseError(
+            request_info=RequestInfo(
+                url="http://example.com",
+                method="GET",
+                headers={},
+                real_url="http://example.com",
+            ),
+            status=500,
+            history=(),
+        ),
+    ):
+        await setup_integration(hass, mock_config_entry)
 
-    def signal(ids):
-        nonlocal called
-        called = True
-        assert device_ids == ids
-
-    async_dispatcher_connect(hass, SIGNAL_SMARTTHINGS_UPDATE, signal)
-
-    broker = smartthings.DeviceBroker(hass, config_entry, Mock(), Mock(), devices, [])
-    broker.connect()
-
-    await broker._event_handler(request, None, None)
-    await hass.async_block_till_done()
-
-    assert called
-    for device in devices:
-        assert device.status.values["Updated"] == "Value"
-    assert devices[3].status.attributes["lock"].value == "locked"
-    assert devices[3].status.attributes["lock"].data == {"codeId": "1"}
-
-    broker.disconnect()
+    assert mock_config_entry.state is ConfigEntryState.SETUP_RETRY
 
 
-async def test_event_handler_ignores_other_installed_app(
-    hass: HomeAssistant, config_entry, device_factory, event_request_factory
-) -> None:
-    """Test the event handler dispatches updated devices."""
-    device = device_factory("Bedroom 1 Switch", ["switch"])
-    request = event_request_factory([device.device_id])
-    called = False
-
-    def signal(ids):
-        nonlocal called
-        called = True
-
-    async_dispatcher_connect(hass, SIGNAL_SMARTTHINGS_UPDATE, signal)
-    broker = smartthings.DeviceBroker(hass, config_entry, Mock(), Mock(), [device], [])
-    broker.connect()
-
-    await broker._event_handler(request, None, None)
-    await hass.async_block_till_done()
-
-    assert not called
-
-    broker.disconnect()
-
-
-async def test_event_handler_fires_button_events(
+async def test_hub_via_device(
     hass: HomeAssistant,
-    config_entry,
-    device_factory,
-    event_factory,
-    event_request_factory,
+    snapshot: SnapshotAssertion,
+    mock_config_entry: MockConfigEntry,
+    device_registry: dr.DeviceRegistry,
+    mock_smartthings: AsyncMock,
 ) -> None:
-    """Test the event handler fires button events."""
-    device = device_factory("Button 1", ["button"])
-    event = event_factory(
-        device.device_id, capability="button", attribute="button", value="pushed"
+    """Test hub with child devices."""
+    mock_smartthings.get_devices.return_value = DeviceResponse.from_json(
+        load_fixture("devices/hub.json", DOMAIN)
+    ).items
+    mock_smartthings.get_device_status.side_effect = [
+        DeviceStatus.from_json(
+            load_fixture(f"device_status/{fixture}.json", DOMAIN)
+        ).components
+        for fixture in ("hub", "multipurpose_sensor")
+    ]
+    await setup_integration(hass, mock_config_entry)
+
+    hub_device = device_registry.async_get_device(
+        {(DOMAIN, "074fa784-8be8-4c70-8e22-6f5ed6f81b7e")}
     )
-    request = event_request_factory(events=[event])
-    config_entry.add_to_hass(hass)
-    hass.config_entries.async_update_entry(
-        config_entry,
-        data={
-            **config_entry.data,
-            CONF_INSTALLED_APP_ID: request.installed_app_id,
-        },
+    assert hub_device == snapshot
+    assert (
+        device_registry.async_get_device(
+            {(DOMAIN, "374ba6fa-5a08-4ea2-969c-1fa43d86e21f")}
+        ).via_device_id
+        == hub_device.id
     )
-    called = False
 
-    def handler(evt):
-        nonlocal called
-        called = True
-        assert evt.data == {
-            "component_id": "main",
-            "device_id": device.device_id,
-            "location_id": event.location_id,
-            "value": "pushed",
-            "name": device.label,
-            "data": None,
-        }
 
-    hass.bus.async_listen(EVENT_BUTTON, handler)
-    broker = smartthings.DeviceBroker(hass, config_entry, Mock(), Mock(), [device], [])
-    broker.connect()
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_deleted_device_runtime(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test devices that are deleted in runtime."""
+    await setup_integration(hass, mock_config_entry)
 
-    await broker._event_handler(request, None, None)
+    assert hass.states.get("climate.ac_office_granit").state == HVACMode.OFF
+
+    for call in devices.add_device_lifecycle_event_listener.call_args_list:
+        if call[0][0] == Lifecycle.DELETE:
+            call[0][1]("96a5ef74-5832-a84b-f1f7-ca799957065d")
     await hass.async_block_till_done()
 
-    assert called
+    assert hass.states.get("climate.ac_office_granit") is None
 
-    broker.disconnect()
+
+@pytest.mark.parametrize(
+    (
+        "device_fixture",
+        "domain",
+        "old_unique_id",
+        "suggested_object_id",
+        "new_unique_id",
+    ),
+    [
+        (
+            "multipurpose_sensor",
+            BINARY_SENSOR_DOMAIN,
+            "7d246592-93db-4d72-a10d-5a51793ece8c.contact",
+            "deck_door",
+            "7d246592-93db-4d72-a10d-5a51793ece8c_main_contactSensor_contact_contact",
+        ),
+        (
+            "multipurpose_sensor",
+            SENSOR_DOMAIN,
+            "7d246592-93db-4d72-a10d-5a51793ece8c Y Coordinate",
+            "deck_door_y_coordinate",
+            "7d246592-93db-4d72-a10d-5a51793ece8c_main_threeAxis_threeAxis_y_coordinate",
+        ),
+        (
+            "da_ac_rac_000001",
+            SENSOR_DOMAIN,
+            "7d246592-93db-4d72-a10d-ca799957065d.energy_meter",
+            "ac_office_granit_energy",
+            "7d246592-93db-4d72-a10d-ca799957065d_main_powerConsumptionReport_powerConsumption_energy_meter",
+        ),
+        (
+            "da_ac_rac_000001",
+            CLIMATE_DOMAIN,
+            "7d246592-93db-4d72-a10d-ca799957065d",
+            "ac_office_granit",
+            "7d246592-93db-4d72-a10d-ca799957065d_main",
+        ),
+        (
+            "c2c_shade",
+            COVER_DOMAIN,
+            "571af102-15db-4030-b76b-245a691f74a5",
+            "curtain_1a",
+            "571af102-15db-4030-b76b-245a691f74a5_main",
+        ),
+        (
+            "generic_fan_3_speed",
+            FAN_DOMAIN,
+            "6d95a8b7-4ee3-429a-a13a-00ec9354170c",
+            "bedroom_fan",
+            "6d95a8b7-4ee3-429a-a13a-00ec9354170c_main",
+        ),
+        (
+            "hue_rgbw_color_bulb",
+            LIGHT_DOMAIN,
+            "cb958955-b015-498c-9e62-fc0c51abd054",
+            "standing_light",
+            "cb958955-b015-498c-9e62-fc0c51abd054_main",
+        ),
+        (
+            "yale_push_button_deadbolt_lock",
+            LOCK_DOMAIN,
+            "a9f587c5-5d8b-4273-8907-e7f609af5158",
+            "basement_door_lock",
+            "a9f587c5-5d8b-4273-8907-e7f609af5158_main",
+        ),
+        (
+            "smart_plug",
+            SWITCH_DOMAIN,
+            "550a1c72-65a0-4d55-b97b-75168e055398",
+            "arlo_beta_basestation",
+            "550a1c72-65a0-4d55-b97b-75168e055398_main_switch_switch_switch",
+        ),
+    ],
+)
+async def test_entity_unique_id_migration(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    expires_at: int,
+    entity_registry: er.EntityRegistry,
+    domain: str,
+    old_unique_id: str,
+    suggested_object_id: str,
+    new_unique_id: str,
+) -> None:
+    """Test entity unique ID migration."""
+    mock_config_entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="My home",
+        unique_id="397678e5-9995-4a39-9d9f-ae6ba310236c",
+        data={
+            "auth_implementation": DOMAIN,
+            "token": {
+                "access_token": "mock-access-token",
+                "refresh_token": "mock-refresh-token",
+                "expires_at": expires_at,
+                "scope": " ".join(SCOPES),
+                "access_tier": 0,
+                "installed_app_id": "5aaaa925-2be1-4e40-b257-e4ef59083324",
+            },
+            CONF_LOCATION_ID: "397678e5-9995-4a39-9d9f-ae6ba310236c",
+            CONF_INSTALLED_APP_ID: "123",
+        },
+        version=3,
+        minor_version=1,
+    )
+    mock_config_entry.add_to_hass(hass)
+    entry = entity_registry.async_get_or_create(
+        domain,
+        DOMAIN,
+        old_unique_id,
+        config_entry=mock_config_entry,
+        suggested_object_id=suggested_object_id,
+    )
+
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    entry = entity_registry.async_get(entry.entity_id)
+
+    assert entry.unique_id == new_unique_id
+
+
+@pytest.mark.parametrize(
+    (
+        "device_fixture",
+        "domain",
+        "other_unique_id",
+        "old_unique_id",
+        "suggested_object_id",
+        "new_unique_id",
+    ),
+    [
+        (
+            "da_ks_microwave_0101x",
+            SENSOR_DOMAIN,
+            "2bad3237-4886-e699-1b90-4a51a3d55c8a.ovenJobState",
+            "2bad3237-4886-e699-1b90-4a51a3d55c8a.machineState",
+            "microwave_machine_state",
+            "2bad3237-4886-e699-1b90-4a51a3d55c8a_main_ovenOperatingState_machineState_machineState",
+        ),
+        (
+            "da_ks_microwave_0101x",
+            SENSOR_DOMAIN,
+            "2bad3237-4886-e699-1b90-4a51a3d55c8a_main_ovenOperatingState_ovenJobState_ovenJobState",
+            "2bad3237-4886-e699-1b90-4a51a3d55c8a.machineState",
+            "microwave_machine_state",
+            "2bad3237-4886-e699-1b90-4a51a3d55c8a_main_ovenOperatingState_machineState_machineState",
+        ),
+        (
+            "da_ks_microwave_0101x",
+            SENSOR_DOMAIN,
+            "2bad3237-4886-e699-1b90-4a51a3d55c8a.ovenJobState",
+            "2bad3237-4886-e699-1b90-4a51a3d55c8a.completionTime",
+            "microwave_completion_time",
+            "2bad3237-4886-e699-1b90-4a51a3d55c8a_main_ovenOperatingState_completionTime_completionTime",
+        ),
+        (
+            "da_ks_microwave_0101x",
+            SENSOR_DOMAIN,
+            "2bad3237-4886-e699-1b90-4a51a3d55c8a_main_ovenOperatingState_ovenJobState_ovenJobState",
+            "2bad3237-4886-e699-1b90-4a51a3d55c8a.completionTime",
+            "microwave_completion_time",
+            "2bad3237-4886-e699-1b90-4a51a3d55c8a_main_ovenOperatingState_completionTime_completionTime",
+        ),
+        (
+            "da_wm_dw_000001",
+            SENSOR_DOMAIN,
+            "f36dc7ce-cac0-0667-dc14-a3704eb5e676.dishwasherJobState",
+            "f36dc7ce-cac0-0667-dc14-a3704eb5e676.machineState",
+            "dishwasher_machine_state",
+            "f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_dishwasherOperatingState_machineState_machineState",
+        ),
+        (
+            "da_wm_dw_000001",
+            SENSOR_DOMAIN,
+            "f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_dishwasherOperatingState_dishwasherJobState_dishwasherJobState",
+            "f36dc7ce-cac0-0667-dc14-a3704eb5e676.machineState",
+            "dishwasher_machine_state",
+            "f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_dishwasherOperatingState_machineState_machineState",
+        ),
+        (
+            "da_wm_dw_000001",
+            SENSOR_DOMAIN,
+            "f36dc7ce-cac0-0667-dc14-a3704eb5e676.dishwasherJobState",
+            "f36dc7ce-cac0-0667-dc14-a3704eb5e676.completionTime",
+            "dishwasher_completion_time",
+            "f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_dishwasherOperatingState_completionTime_completionTime",
+        ),
+        (
+            "da_wm_dw_000001",
+            SENSOR_DOMAIN,
+            "f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_dishwasherOperatingState_dishwasherJobState_dishwasherJobState",
+            "f36dc7ce-cac0-0667-dc14-a3704eb5e676.completionTime",
+            "dishwasher_completion_time",
+            "f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_dishwasherOperatingState_completionTime_completionTime",
+        ),
+        (
+            "da_wm_wd_000001",
+            SENSOR_DOMAIN,
+            "02f7256e-8353-5bdd-547f-bd5b1647e01b.dryerJobState",
+            "02f7256e-8353-5bdd-547f-bd5b1647e01b.machineState",
+            "dryer_machine_state",
+            "02f7256e-8353-5bdd-547f-bd5b1647e01b_main_dryerOperatingState_machineState_machineState",
+        ),
+        (
+            "da_wm_wd_000001",
+            SENSOR_DOMAIN,
+            "02f7256e-8353-5bdd-547f-bd5b1647e01b_main_dryerOperatingState_dryerJobState_dryerJobState",
+            "02f7256e-8353-5bdd-547f-bd5b1647e01b.machineState",
+            "dryer_machine_state",
+            "02f7256e-8353-5bdd-547f-bd5b1647e01b_main_dryerOperatingState_machineState_machineState",
+        ),
+        (
+            "da_wm_wd_000001",
+            SENSOR_DOMAIN,
+            "02f7256e-8353-5bdd-547f-bd5b1647e01b.dryerJobState",
+            "02f7256e-8353-5bdd-547f-bd5b1647e01b.completionTime",
+            "dryer_completion_time",
+            "02f7256e-8353-5bdd-547f-bd5b1647e01b_main_dryerOperatingState_completionTime_completionTime",
+        ),
+        (
+            "da_wm_wd_000001",
+            SENSOR_DOMAIN,
+            "02f7256e-8353-5bdd-547f-bd5b1647e01b_main_dryerOperatingState_dryerJobState_dryerJobState",
+            "02f7256e-8353-5bdd-547f-bd5b1647e01b.completionTime",
+            "dryer_completion_time",
+            "02f7256e-8353-5bdd-547f-bd5b1647e01b_main_dryerOperatingState_completionTime_completionTime",
+        ),
+        (
+            "da_wm_wm_000001",
+            SENSOR_DOMAIN,
+            "f984b91d-f250-9d42-3436-33f09a422a47.washerJobState",
+            "f984b91d-f250-9d42-3436-33f09a422a47.machineState",
+            "washer_machine_state",
+            "f984b91d-f250-9d42-3436-33f09a422a47_main_washerOperatingState_machineState_machineState",
+        ),
+        (
+            "da_wm_wm_000001",
+            SENSOR_DOMAIN,
+            "f984b91d-f250-9d42-3436-33f09a422a47_main_washerOperatingState_washerJobState_washerJobState",
+            "f984b91d-f250-9d42-3436-33f09a422a47.machineState",
+            "washer_machine_state",
+            "f984b91d-f250-9d42-3436-33f09a422a47_main_washerOperatingState_machineState_machineState",
+        ),
+        (
+            "da_wm_wm_000001",
+            SENSOR_DOMAIN,
+            "f984b91d-f250-9d42-3436-33f09a422a47.washerJobState",
+            "f984b91d-f250-9d42-3436-33f09a422a47.completionTime",
+            "washer_completion_time",
+            "f984b91d-f250-9d42-3436-33f09a422a47_main_washerOperatingState_completionTime_completionTime",
+        ),
+        (
+            "da_wm_wm_000001",
+            SENSOR_DOMAIN,
+            "f984b91d-f250-9d42-3436-33f09a422a47_main_washerOperatingState_washerJobState_washerJobState",
+            "f984b91d-f250-9d42-3436-33f09a422a47.completionTime",
+            "washer_completion_time",
+            "f984b91d-f250-9d42-3436-33f09a422a47_main_washerOperatingState_completionTime_completionTime",
+        ),
+    ],
+)
+async def test_entity_unique_id_migration_machine_state(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    expires_at: int,
+    entity_registry: er.EntityRegistry,
+    domain: str,
+    other_unique_id: str,
+    old_unique_id: str,
+    suggested_object_id: str,
+    new_unique_id: str,
+) -> None:
+    """Test entity unique ID migration."""
+    mock_config_entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="My home",
+        unique_id="397678e5-9995-4a39-9d9f-ae6ba310236c",
+        data={
+            "auth_implementation": DOMAIN,
+            "token": {
+                "access_token": "mock-access-token",
+                "refresh_token": "mock-refresh-token",
+                "expires_at": expires_at,
+                "scope": " ".join(SCOPES),
+                "access_tier": 0,
+                "installed_app_id": "5aaaa925-2be1-4e40-b257-e4ef59083324",
+            },
+            CONF_LOCATION_ID: "397678e5-9995-4a39-9d9f-ae6ba310236c",
+            CONF_INSTALLED_APP_ID: "123",
+        },
+        version=3,
+        minor_version=1,
+    )
+    mock_config_entry.add_to_hass(hass)
+    entity_registry.async_get_or_create(
+        domain,
+        DOMAIN,
+        other_unique_id,
+        config_entry=mock_config_entry,
+        suggested_object_id="job_state",
+    )
+    entry = entity_registry.async_get_or_create(
+        domain,
+        DOMAIN,
+        old_unique_id,
+        config_entry=mock_config_entry,
+        suggested_object_id=suggested_object_id,
+    )
+
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    entry = entity_registry.async_get(entry.entity_id)
+
+    assert entry.unique_id == new_unique_id
diff --git a/tests/components/smartthings/test_light.py b/tests/components/smartthings/test_light.py
index b46188b5b5f..56eadde748b 100644
--- a/tests/components/smartthings/test_light.py
+++ b/tests/components/smartthings/test_light.py
@@ -1,342 +1,415 @@
-"""Test for the SmartThings light platform.
+"""Test for the SmartThings light platform."""
 
-The only mocking required is of the underlying SmartThings API object so
-real HTTP calls are not initiated during testing.
-"""
+from typing import Any
+from unittest.mock import AsyncMock, call
 
-from pysmartthings import Attribute, Capability
+from pysmartthings import Attribute, Capability, Command
 import pytest
+from syrupy import SnapshotAssertion
 
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
+    ATTR_COLOR_MODE,
     ATTR_COLOR_TEMP_KELVIN,
     ATTR_HS_COLOR,
+    ATTR_MAX_COLOR_TEMP_KELVIN,
+    ATTR_MIN_COLOR_TEMP_KELVIN,
+    ATTR_RGB_COLOR,
     ATTR_SUPPORTED_COLOR_MODES,
     ATTR_TRANSITION,
+    ATTR_XY_COLOR,
     DOMAIN as LIGHT_DOMAIN,
     ColorMode,
-    LightEntityFeature,
 )
-from homeassistant.components.smartthings.const import DOMAIN, SIGNAL_SMARTTHINGS_UPDATE
-from homeassistant.config_entries import ConfigEntryState
+from homeassistant.components.smartthings.const import MAIN
 from homeassistant.const import (
     ATTR_ENTITY_ID,
-    ATTR_SUPPORTED_FEATURES,
-    STATE_UNAVAILABLE,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+    STATE_OFF,
+    STATE_ON,
+    Platform,
 )
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.core import HomeAssistant, State
+from homeassistant.helpers import entity_registry as er
 
-from .conftest import setup_platform
+from . import (
+    set_attribute_value,
+    setup_integration,
+    snapshot_smartthings_entities,
+    trigger_update,
+)
+
+from tests.common import MockConfigEntry, mock_restore_cache_with_extra_data
 
 
-@pytest.fixture(name="light_devices")
-def light_devices_fixture(device_factory):
-    """Fixture returns a set of mock light devices."""
-    return [
-        device_factory(
-            "Dimmer 1",
-            capabilities=[Capability.switch, Capability.switch_level],
-            status={Attribute.switch: "on", Attribute.level: 100},
-        ),
-        device_factory(
-            "Color Dimmer 1",
-            capabilities=[
-                Capability.switch,
-                Capability.switch_level,
-                Capability.color_control,
-            ],
-            status={
-                Attribute.switch: "off",
-                Attribute.level: 0,
-                Attribute.hue: 76.0,
-                Attribute.saturation: 55.0,
-            },
-        ),
-        device_factory(
-            "Color Dimmer 2",
-            capabilities=[
-                Capability.switch,
-                Capability.switch_level,
-                Capability.color_control,
-                Capability.color_temperature,
-            ],
-            status={
-                Attribute.switch: "on",
-                Attribute.level: 100,
-                Attribute.hue: 76.0,
-                Attribute.saturation: 0.0,
-                Attribute.color_temperature: 4500,
-            },
-        ),
-    ]
-
-
-async def test_entity_state(hass: HomeAssistant, light_devices) -> None:
-    """Tests the state attributes properly match the light types."""
-    await setup_platform(hass, LIGHT_DOMAIN, devices=light_devices)
-
-    # Dimmer 1
-    state = hass.states.get("light.dimmer_1")
-    assert state.state == "on"
-    assert state.attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.BRIGHTNESS]
-    assert state.attributes[ATTR_SUPPORTED_FEATURES] == LightEntityFeature.TRANSITION
-    assert isinstance(state.attributes[ATTR_BRIGHTNESS], int)
-    assert state.attributes[ATTR_BRIGHTNESS] == 255
-
-    # Color Dimmer 1
-    state = hass.states.get("light.color_dimmer_1")
-    assert state.state == "off"
-    assert state.attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.HS]
-    assert state.attributes[ATTR_SUPPORTED_FEATURES] == LightEntityFeature.TRANSITION
-
-    # Color Dimmer 2
-    state = hass.states.get("light.color_dimmer_2")
-    assert state.state == "on"
-    assert state.attributes[ATTR_SUPPORTED_COLOR_MODES] == [
-        ColorMode.COLOR_TEMP,
-        ColorMode.HS,
-    ]
-    assert state.attributes[ATTR_SUPPORTED_FEATURES] == LightEntityFeature.TRANSITION
-    assert state.attributes[ATTR_BRIGHTNESS] == 255
-    assert ATTR_HS_COLOR not in state.attributes[ATTR_HS_COLOR]
-    assert isinstance(state.attributes[ATTR_COLOR_TEMP_KELVIN], int)
-    assert state.attributes[ATTR_COLOR_TEMP_KELVIN] == 4500
-
-
-async def test_entity_and_device_attributes(
+async def test_all_entities(
     hass: HomeAssistant,
-    device_registry: dr.DeviceRegistry,
+    snapshot: SnapshotAssertion,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
     entity_registry: er.EntityRegistry,
-    device_factory,
 ) -> None:
-    """Test the attributes of the entity are correct."""
-    # Arrange
-    device = device_factory(
-        "Light 1",
-        [Capability.switch, Capability.switch_level],
-        {
-            Attribute.mnmo: "123",
-            Attribute.mnmn: "Generic manufacturer",
-            Attribute.mnhw: "v4.56",
-            Attribute.mnfv: "v7.89",
-        },
-    )
-    # Act
-    await setup_platform(hass, LIGHT_DOMAIN, devices=[device])
-    # Assert
-    entry = entity_registry.async_get("light.light_1")
-    assert entry
-    assert entry.unique_id == device.device_id
+    """Test all entities."""
+    await setup_integration(hass, mock_config_entry)
 
-    entry = device_registry.async_get_device(identifiers={(DOMAIN, device.device_id)})
-    assert entry
-    assert entry.configuration_url == "https://account.smartthings.com"
-    assert entry.identifiers == {(DOMAIN, device.device_id)}
-    assert entry.name == device.label
-    assert entry.model == "123"
-    assert entry.manufacturer == "Generic manufacturer"
-    assert entry.hw_version == "v4.56"
-    assert entry.sw_version == "v7.89"
+    snapshot_smartthings_entities(hass, entity_registry, snapshot, Platform.LIGHT)
 
 
-async def test_turn_off(hass: HomeAssistant, light_devices) -> None:
-    """Test the light turns of successfully."""
-    # Arrange
-    await setup_platform(hass, LIGHT_DOMAIN, devices=light_devices)
-    # Act
-    await hass.services.async_call(
-        "light", "turn_off", {"entity_id": "light.color_dimmer_2"}, blocking=True
-    )
-    # This test schedules and update right after the call
-    await hass.async_block_till_done()
-    # Assert
-    state = hass.states.get("light.color_dimmer_2")
-    assert state is not None
-    assert state.state == "off"
-
-
-async def test_turn_off_with_transition(hass: HomeAssistant, light_devices) -> None:
-    """Test the light turns of successfully with transition."""
-    # Arrange
-    await setup_platform(hass, LIGHT_DOMAIN, devices=light_devices)
-    # Act
-    await hass.services.async_call(
-        "light",
-        "turn_off",
-        {ATTR_ENTITY_ID: "light.color_dimmer_2", ATTR_TRANSITION: 2},
-        blocking=True,
-    )
-    # This test schedules and update right after the call
-    await hass.async_block_till_done()
-    # Assert
-    state = hass.states.get("light.color_dimmer_2")
-    assert state is not None
-    assert state.state == "off"
-
-
-async def test_turn_on(hass: HomeAssistant, light_devices) -> None:
-    """Test the light turns of successfully."""
-    # Arrange
-    await setup_platform(hass, LIGHT_DOMAIN, devices=light_devices)
-    # Act
-    await hass.services.async_call(
-        "light", "turn_on", {ATTR_ENTITY_ID: "light.color_dimmer_1"}, blocking=True
-    )
-    # This test schedules and update right after the call
-    await hass.async_block_till_done()
-    # Assert
-    state = hass.states.get("light.color_dimmer_1")
-    assert state is not None
-    assert state.state == "on"
-
-
-async def test_turn_on_with_brightness(hass: HomeAssistant, light_devices) -> None:
-    """Test the light turns on to the specified brightness."""
-    # Arrange
-    await setup_platform(hass, LIGHT_DOMAIN, devices=light_devices)
-    # Act
-    await hass.services.async_call(
-        "light",
-        "turn_on",
-        {
-            ATTR_ENTITY_ID: "light.color_dimmer_1",
-            ATTR_BRIGHTNESS: 75,
-            ATTR_TRANSITION: 2,
-        },
-        blocking=True,
-    )
-    # This test schedules and update right after the call
-    await hass.async_block_till_done()
-    # Assert
-    state = hass.states.get("light.color_dimmer_1")
-    assert state is not None
-    assert state.state == "on"
-    # round-trip rounding error (expected)
-    assert state.attributes[ATTR_BRIGHTNESS] == 74
-
-
-async def test_turn_on_with_minimal_brightness(
-    hass: HomeAssistant, light_devices
+@pytest.mark.parametrize("device_fixture", ["hue_rgbw_color_bulb"])
+@pytest.mark.parametrize(
+    ("data", "calls"),
+    [
+        (
+            {},
+            [
+                call(
+                    "cb958955-b015-498c-9e62-fc0c51abd054",
+                    Capability.SWITCH,
+                    Command.ON,
+                    MAIN,
+                )
+            ],
+        ),
+        (
+            {ATTR_COLOR_TEMP_KELVIN: 4000},
+            [
+                call(
+                    "cb958955-b015-498c-9e62-fc0c51abd054",
+                    Capability.COLOR_TEMPERATURE,
+                    Command.SET_COLOR_TEMPERATURE,
+                    MAIN,
+                    argument=4000,
+                ),
+                call(
+                    "cb958955-b015-498c-9e62-fc0c51abd054",
+                    Capability.SWITCH,
+                    Command.ON,
+                    MAIN,
+                ),
+            ],
+        ),
+        (
+            {ATTR_HS_COLOR: [350, 90]},
+            [
+                call(
+                    "cb958955-b015-498c-9e62-fc0c51abd054",
+                    Capability.COLOR_CONTROL,
+                    Command.SET_COLOR,
+                    MAIN,
+                    argument={"hue": 97.2222, "saturation": 90.0},
+                ),
+                call(
+                    "cb958955-b015-498c-9e62-fc0c51abd054",
+                    Capability.SWITCH,
+                    Command.ON,
+                    MAIN,
+                ),
+            ],
+        ),
+        (
+            {ATTR_BRIGHTNESS: 50},
+            [
+                call(
+                    "cb958955-b015-498c-9e62-fc0c51abd054",
+                    Capability.SWITCH_LEVEL,
+                    Command.SET_LEVEL,
+                    MAIN,
+                    argument=[20, 0],
+                )
+            ],
+        ),
+        (
+            {ATTR_BRIGHTNESS: 50, ATTR_TRANSITION: 3},
+            [
+                call(
+                    "cb958955-b015-498c-9e62-fc0c51abd054",
+                    Capability.SWITCH_LEVEL,
+                    Command.SET_LEVEL,
+                    MAIN,
+                    argument=[20, 3],
+                )
+            ],
+        ),
+    ],
+)
+async def test_turn_on_light(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    data: dict[str, Any],
+    calls: list[call],
 ) -> None:
-    """Test lights set to lowest brightness when converted scale would be zero.
+    """Test light turn on command."""
+    await setup_integration(hass, mock_config_entry)
 
-    SmartThings light brightness is a percentage (0-100), but Home Assistant uses a
-    0-255 scale.  This tests if a really low value (1-2) is passed, we don't
-    set the level to zero, which turns off the lights in SmartThings.
-    """
-    # Arrange
-    await setup_platform(hass, LIGHT_DOMAIN, devices=light_devices)
-    # Act
     await hass.services.async_call(
-        "light",
-        "turn_on",
-        {ATTR_ENTITY_ID: "light.color_dimmer_1", ATTR_BRIGHTNESS: 2},
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.standing_light"} | data,
         blocking=True,
     )
-    # This test schedules and update right after the call
-    await hass.async_block_till_done()
-    # Assert
-    state = hass.states.get("light.color_dimmer_1")
-    assert state is not None
-    assert state.state == "on"
-    # round-trip rounding error (expected)
-    assert state.attributes[ATTR_BRIGHTNESS] == 3
+    assert devices.execute_device_command.mock_calls == calls
 
 
-async def test_turn_on_with_color(hass: HomeAssistant, light_devices) -> None:
-    """Test the light turns on with color."""
-    # Arrange
-    await setup_platform(hass, LIGHT_DOMAIN, devices=light_devices)
-    # Act
+@pytest.mark.parametrize("device_fixture", ["hue_rgbw_color_bulb"])
+@pytest.mark.parametrize(
+    ("data", "calls"),
+    [
+        (
+            {},
+            [
+                call(
+                    "cb958955-b015-498c-9e62-fc0c51abd054",
+                    Capability.SWITCH,
+                    Command.OFF,
+                    MAIN,
+                )
+            ],
+        ),
+        (
+            {ATTR_TRANSITION: 3},
+            [
+                call(
+                    "cb958955-b015-498c-9e62-fc0c51abd054",
+                    Capability.SWITCH_LEVEL,
+                    Command.SET_LEVEL,
+                    MAIN,
+                    argument=[0, 3],
+                )
+            ],
+        ),
+    ],
+)
+async def test_turn_off_light(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    data: dict[str, Any],
+    calls: list[call],
+) -> None:
+    """Test light turn off command."""
+    await setup_integration(hass, mock_config_entry)
+
     await hass.services.async_call(
-        "light",
-        "turn_on",
-        {ATTR_ENTITY_ID: "light.color_dimmer_2", ATTR_HS_COLOR: (180, 50)},
+        LIGHT_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "light.standing_light"} | data,
         blocking=True,
     )
-    # This test schedules and update right after the call
-    await hass.async_block_till_done()
-    # Assert
-    state = hass.states.get("light.color_dimmer_2")
-    assert state is not None
-    assert state.state == "on"
-    assert state.attributes[ATTR_HS_COLOR] == (180, 50)
+    assert devices.execute_device_command.mock_calls == calls
 
 
-async def test_turn_on_with_color_temp(hass: HomeAssistant, light_devices) -> None:
-    """Test the light turns on with color temp."""
-    # Arrange
-    await setup_platform(hass, LIGHT_DOMAIN, devices=light_devices)
-    # Act
-    await hass.services.async_call(
-        "light",
-        "turn_on",
-        {ATTR_ENTITY_ID: "light.color_dimmer_2", ATTR_COLOR_TEMP_KELVIN: 3333},
-        blocking=True,
+@pytest.mark.parametrize("device_fixture", ["hue_rgbw_color_bulb"])
+async def test_state_update(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test state update."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.states.get("light.standing_light").state == STATE_OFF
+
+    await trigger_update(
+        hass,
+        devices,
+        "cb958955-b015-498c-9e62-fc0c51abd054",
+        Capability.SWITCH,
+        Attribute.SWITCH,
+        "on",
     )
-    # This test schedules and update right after the call
-    await hass.async_block_till_done()
-    # Assert
-    state = hass.states.get("light.color_dimmer_2")
-    assert state is not None
-    assert state.state == "on"
-    assert state.attributes[ATTR_COLOR_TEMP_KELVIN] == 3333
+
+    assert hass.states.get("light.standing_light").state == STATE_ON
 
 
-async def test_update_from_signal(hass: HomeAssistant, device_factory) -> None:
-    """Test the light updates when receiving a signal."""
-    # Arrange
-    device = device_factory(
-        "Color Dimmer 2",
-        capabilities=[
-            Capability.switch,
-            Capability.switch_level,
-            Capability.color_control,
-            Capability.color_temperature,
-        ],
-        status={
-            Attribute.switch: "off",
-            Attribute.level: 100,
-            Attribute.hue: 76.0,
-            Attribute.saturation: 55.0,
-            Attribute.color_temperature: 4500,
-        },
+@pytest.mark.parametrize("device_fixture", ["hue_rgbw_color_bulb"])
+async def test_updating_brightness(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test brightness update."""
+    set_attribute_value(devices, Capability.SWITCH, Attribute.SWITCH, "on")
+    await setup_integration(hass, mock_config_entry)
+
+    await trigger_update(
+        hass,
+        devices,
+        "cb958955-b015-498c-9e62-fc0c51abd054",
+        Capability.COLOR_CONTROL,
+        Attribute.HUE,
+        40,
     )
-    await setup_platform(hass, LIGHT_DOMAIN, devices=[device])
-    await device.switch_on(True)
-    # Act
-    async_dispatcher_send(hass, SIGNAL_SMARTTHINGS_UPDATE, [device.device_id])
-    # Assert
-    await hass.async_block_till_done()
-    state = hass.states.get("light.color_dimmer_2")
-    assert state is not None
-    assert state.state == "on"
 
+    assert hass.states.get("light.standing_light").attributes[ATTR_BRIGHTNESS] == 178
 
-async def test_unload_config_entry(hass: HomeAssistant, device_factory) -> None:
-    """Test the light is removed when the config entry is unloaded."""
-    # Arrange
-    device = device_factory(
-        "Color Dimmer 2",
-        capabilities=[
-            Capability.switch,
-            Capability.switch_level,
-            Capability.color_control,
-            Capability.color_temperature,
-        ],
-        status={
-            Attribute.switch: "off",
-            Attribute.level: 100,
-            Attribute.hue: 76.0,
-            Attribute.saturation: 55.0,
-            Attribute.color_temperature: 4500,
-        },
+    await trigger_update(
+        hass,
+        devices,
+        "cb958955-b015-498c-9e62-fc0c51abd054",
+        Capability.SWITCH_LEVEL,
+        Attribute.LEVEL,
+        20,
+    )
+
+    assert hass.states.get("light.standing_light").attributes[ATTR_BRIGHTNESS] == 51
+
+
+@pytest.mark.parametrize("device_fixture", ["hue_rgbw_color_bulb"])
+async def test_updating_hs(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test hue/saturation update."""
+    set_attribute_value(devices, Capability.SWITCH, Attribute.SWITCH, "on")
+    await setup_integration(hass, mock_config_entry)
+
+    await trigger_update(
+        hass,
+        devices,
+        "cb958955-b015-498c-9e62-fc0c51abd054",
+        Capability.COLOR_CONTROL,
+        Attribute.HUE,
+        40,
+    )
+
+    assert hass.states.get("light.standing_light").attributes[ATTR_HS_COLOR] == (
+        144.0,
+        60,
+    )
+
+    await trigger_update(
+        hass,
+        devices,
+        "cb958955-b015-498c-9e62-fc0c51abd054",
+        Capability.COLOR_CONTROL,
+        Attribute.HUE,
+        20,
+    )
+
+    assert hass.states.get("light.standing_light").attributes[ATTR_HS_COLOR] == (
+        72.0,
+        60,
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["hue_rgbw_color_bulb"])
+async def test_updating_color_temp(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test color temperature update."""
+    set_attribute_value(devices, Capability.SWITCH, Attribute.SWITCH, "on")
+    await setup_integration(hass, mock_config_entry)
+
+    await trigger_update(
+        hass,
+        devices,
+        "cb958955-b015-498c-9e62-fc0c51abd054",
+        Capability.COLOR_TEMPERATURE,
+        Attribute.COLOR_TEMPERATURE,
+        3000,
+    )
+
+    assert (
+        hass.states.get("light.standing_light").attributes[ATTR_COLOR_MODE]
+        is ColorMode.COLOR_TEMP
+    )
+    assert (
+        hass.states.get("light.standing_light").attributes[ATTR_COLOR_TEMP_KELVIN]
+        == 3000
+    )
+
+    await trigger_update(
+        hass,
+        devices,
+        "cb958955-b015-498c-9e62-fc0c51abd054",
+        Capability.COLOR_TEMPERATURE,
+        Attribute.COLOR_TEMPERATURE,
+        2000,
+    )
+
+    assert (
+        hass.states.get("light.standing_light").attributes[ATTR_COLOR_TEMP_KELVIN]
+        == 2000
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["hue_rgbw_color_bulb"])
+async def test_color_modes(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test color mode changes."""
+    set_attribute_value(devices, Capability.SWITCH, Attribute.SWITCH, "on")
+    set_attribute_value(devices, Capability.COLOR_CONTROL, Attribute.SATURATION, 50)
+    await setup_integration(hass, mock_config_entry)
+
+    assert (
+        hass.states.get("light.standing_light").attributes[ATTR_COLOR_MODE]
+        is ColorMode.HS
+    )
+
+    await trigger_update(
+        hass,
+        devices,
+        "cb958955-b015-498c-9e62-fc0c51abd054",
+        Capability.COLOR_TEMPERATURE,
+        Attribute.COLOR_TEMPERATURE,
+        2000,
+    )
+
+    assert (
+        hass.states.get("light.standing_light").attributes[ATTR_COLOR_MODE]
+        is ColorMode.COLOR_TEMP
+    )
+
+    await trigger_update(
+        hass,
+        devices,
+        "cb958955-b015-498c-9e62-fc0c51abd054",
+        Capability.COLOR_CONTROL,
+        Attribute.HUE,
+        20,
+    )
+
+    assert (
+        hass.states.get("light.standing_light").attributes[ATTR_COLOR_MODE]
+        is ColorMode.HS
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["hue_rgbw_color_bulb"])
+async def test_color_mode_after_startup(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test color mode after startup."""
+    set_attribute_value(devices, Capability.SWITCH, Attribute.SWITCH, "on")
+
+    RESTORE_DATA = {
+        ATTR_BRIGHTNESS: 178,
+        ATTR_COLOR_MODE: ColorMode.COLOR_TEMP,
+        ATTR_COLOR_TEMP_KELVIN: 3000,
+        ATTR_HS_COLOR: (144.0, 60),
+        ATTR_MAX_COLOR_TEMP_KELVIN: 9000,
+        ATTR_MIN_COLOR_TEMP_KELVIN: 2000,
+        ATTR_RGB_COLOR: (255, 128, 0),
+        ATTR_SUPPORTED_COLOR_MODES: [ColorMode.COLOR_TEMP, ColorMode.HS],
+        ATTR_XY_COLOR: (0.61, 0.35),
+    }
+
+    mock_restore_cache_with_extra_data(
+        hass, ((State("light.standing_light", STATE_ON), RESTORE_DATA),)
+    )
+    await setup_integration(hass, mock_config_entry)
+
+    assert (
+        hass.states.get("light.standing_light").attributes[ATTR_COLOR_MODE]
+        is ColorMode.COLOR_TEMP
     )
-    config_entry = await setup_platform(hass, LIGHT_DOMAIN, devices=[device])
-    config_entry.mock_state(hass, ConfigEntryState.LOADED)
-    # Act
-    await hass.config_entries.async_forward_entry_unload(config_entry, "light")
-    # Assert
-    assert hass.states.get("light.color_dimmer_2").state == STATE_UNAVAILABLE
diff --git a/tests/components/smartthings/test_lock.py b/tests/components/smartthings/test_lock.py
index 3c2a2651fb9..28191eceb9a 100644
--- a/tests/components/smartthings/test_lock.py
+++ b/tests/components/smartthings/test_lock.py
@@ -1,129 +1,85 @@
-"""Test for the SmartThings lock platform.
+"""Test for the SmartThings lock platform."""
 
-The only mocking required is of the underlying SmartThings API object so
-real HTTP calls are not initiated during testing.
-"""
+from unittest.mock import AsyncMock
 
-from pysmartthings import Attribute, Capability
-from pysmartthings.device import Status
+from pysmartthings import Attribute, Capability, Command
+import pytest
+from syrupy import SnapshotAssertion
 
-from homeassistant.components.lock import DOMAIN as LOCK_DOMAIN
-from homeassistant.components.smartthings.const import DOMAIN, SIGNAL_SMARTTHINGS_UPDATE
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import STATE_UNAVAILABLE
+from homeassistant.components.lock import DOMAIN as LOCK_DOMAIN, LockState
+from homeassistant.components.smartthings.const import MAIN
+from homeassistant.const import ATTR_ENTITY_ID, SERVICE_LOCK, SERVICE_UNLOCK, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers import entity_registry as er
 
-from .conftest import setup_platform
+from . import setup_integration, snapshot_smartthings_entities, trigger_update
+
+from tests.common import MockConfigEntry
 
 
-async def test_entity_and_device_attributes(
+async def test_all_entities(
     hass: HomeAssistant,
-    device_registry: dr.DeviceRegistry,
+    snapshot: SnapshotAssertion,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
     entity_registry: er.EntityRegistry,
-    device_factory,
 ) -> None:
-    """Test the attributes of the entity are correct."""
-    # Arrange
-    device = device_factory(
-        "Lock_1",
-        [Capability.lock],
-        {
-            Attribute.lock: "unlocked",
-            Attribute.mnmo: "123",
-            Attribute.mnmn: "Generic manufacturer",
-            Attribute.mnhw: "v4.56",
-            Attribute.mnfv: "v7.89",
-        },
-    )
-    # Act
-    await setup_platform(hass, LOCK_DOMAIN, devices=[device])
-    # Assert
-    entry = entity_registry.async_get("lock.lock_1")
-    assert entry
-    assert entry.unique_id == device.device_id
+    """Test all entities."""
+    await setup_integration(hass, mock_config_entry)
 
-    entry = device_registry.async_get_device(identifiers={(DOMAIN, device.device_id)})
-    assert entry
-    assert entry.configuration_url == "https://account.smartthings.com"
-    assert entry.identifiers == {(DOMAIN, device.device_id)}
-    assert entry.name == device.label
-    assert entry.model == "123"
-    assert entry.manufacturer == "Generic manufacturer"
-    assert entry.hw_version == "v4.56"
-    assert entry.sw_version == "v7.89"
+    snapshot_smartthings_entities(hass, entity_registry, snapshot, Platform.LOCK)
 
 
-async def test_lock(hass: HomeAssistant, device_factory) -> None:
-    """Test the lock locks successfully."""
-    # Arrange
-    device = device_factory("Lock_1", [Capability.lock])
-    device.status.attributes[Attribute.lock] = Status(
-        "unlocked",
-        None,
-        {
-            "method": "Manual",
-            "codeId": None,
-            "codeName": "Code 1",
-            "lockName": "Front Door",
-            "usedCode": "Code 2",
-        },
-    )
-    await setup_platform(hass, LOCK_DOMAIN, devices=[device])
-    # Act
+@pytest.mark.parametrize("device_fixture", ["yale_push_button_deadbolt_lock"])
+@pytest.mark.parametrize(
+    ("action", "command"),
+    [
+        (SERVICE_LOCK, Command.LOCK),
+        (SERVICE_UNLOCK, Command.UNLOCK),
+    ],
+)
+async def test_lock_unlock(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    action: str,
+    command: Command,
+) -> None:
+    """Test lock and unlock command."""
+    await setup_integration(hass, mock_config_entry)
+
     await hass.services.async_call(
-        LOCK_DOMAIN, "lock", {"entity_id": "lock.lock_1"}, blocking=True
+        LOCK_DOMAIN,
+        action,
+        {ATTR_ENTITY_ID: "lock.basement_door_lock"},
+        blocking=True,
     )
-    # Assert
-    state = hass.states.get("lock.lock_1")
-    assert state is not None
-    assert state.state == "locked"
-    assert state.attributes["method"] == "Manual"
-    assert state.attributes["lock_state"] == "locked"
-    assert state.attributes["code_name"] == "Code 1"
-    assert state.attributes["used_code"] == "Code 2"
-    assert state.attributes["lock_name"] == "Front Door"
-    assert "code_id" not in state.attributes
-
-
-async def test_unlock(hass: HomeAssistant, device_factory) -> None:
-    """Test the lock unlocks successfully."""
-    # Arrange
-    device = device_factory("Lock_1", [Capability.lock], {Attribute.lock: "locked"})
-    await setup_platform(hass, LOCK_DOMAIN, devices=[device])
-    # Act
-    await hass.services.async_call(
-        LOCK_DOMAIN, "unlock", {"entity_id": "lock.lock_1"}, blocking=True
+    devices.execute_device_command.assert_called_once_with(
+        "a9f587c5-5d8b-4273-8907-e7f609af5158",
+        Capability.LOCK,
+        command,
+        MAIN,
     )
-    # Assert
-    state = hass.states.get("lock.lock_1")
-    assert state is not None
-    assert state.state == "unlocked"
 
 
-async def test_update_from_signal(hass: HomeAssistant, device_factory) -> None:
-    """Test the lock updates when receiving a signal."""
-    # Arrange
-    device = device_factory("Lock_1", [Capability.lock], {Attribute.lock: "unlocked"})
-    await setup_platform(hass, LOCK_DOMAIN, devices=[device])
-    await device.lock(True)
-    # Act
-    async_dispatcher_send(hass, SIGNAL_SMARTTHINGS_UPDATE, [device.device_id])
-    # Assert
-    await hass.async_block_till_done()
-    state = hass.states.get("lock.lock_1")
-    assert state is not None
-    assert state.state == "locked"
+@pytest.mark.parametrize("device_fixture", ["yale_push_button_deadbolt_lock"])
+async def test_state_update(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test state update."""
+    await setup_integration(hass, mock_config_entry)
 
+    assert hass.states.get("lock.basement_door_lock").state == LockState.LOCKED
 
-async def test_unload_config_entry(hass: HomeAssistant, device_factory) -> None:
-    """Test the lock is removed when the config entry is unloaded."""
-    # Arrange
-    device = device_factory("Lock_1", [Capability.lock], {Attribute.lock: "locked"})
-    config_entry = await setup_platform(hass, LOCK_DOMAIN, devices=[device])
-    config_entry.mock_state(hass, ConfigEntryState.LOADED)
-    # Act
-    await hass.config_entries.async_forward_entry_unload(config_entry, "lock")
-    # Assert
-    assert hass.states.get("lock.lock_1").state == STATE_UNAVAILABLE
+    await trigger_update(
+        hass,
+        devices,
+        "a9f587c5-5d8b-4273-8907-e7f609af5158",
+        Capability.LOCK,
+        Attribute.LOCK,
+        "open",
+    )
+
+    assert hass.states.get("lock.basement_door_lock").state == LockState.UNLOCKED
diff --git a/tests/components/smartthings/test_media_player.py b/tests/components/smartthings/test_media_player.py
new file mode 100644
index 00000000000..b7cecfe8408
--- /dev/null
+++ b/tests/components/smartthings/test_media_player.py
@@ -0,0 +1,432 @@
+"""Test for the SmartThings media player platform."""
+
+from unittest.mock import AsyncMock
+
+from pysmartthings import Attribute, Capability, Command, Status
+import pytest
+from syrupy import SnapshotAssertion
+
+from homeassistant.components.media_player import (
+    ATTR_INPUT_SOURCE,
+    ATTR_MEDIA_REPEAT,
+    ATTR_MEDIA_SHUFFLE,
+    ATTR_MEDIA_VOLUME_LEVEL,
+    ATTR_MEDIA_VOLUME_MUTED,
+    DOMAIN as MEDIA_PLAYER_DOMAIN,
+    SERVICE_SELECT_SOURCE,
+    RepeatMode,
+)
+from homeassistant.components.smartthings.const import MAIN
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    SERVICE_MEDIA_NEXT_TRACK,
+    SERVICE_MEDIA_PAUSE,
+    SERVICE_MEDIA_PLAY,
+    SERVICE_MEDIA_PREVIOUS_TRACK,
+    SERVICE_MEDIA_STOP,
+    SERVICE_REPEAT_SET,
+    SERVICE_SHUFFLE_SET,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+    SERVICE_VOLUME_DOWN,
+    SERVICE_VOLUME_MUTE,
+    SERVICE_VOLUME_SET,
+    SERVICE_VOLUME_UP,
+    STATE_OFF,
+    STATE_PLAYING,
+    Platform,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import setup_integration, snapshot_smartthings_entities, trigger_update
+
+from tests.common import MockConfigEntry
+
+
+async def test_all_entities(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test all entities."""
+    await setup_integration(hass, mock_config_entry)
+
+    snapshot_smartthings_entities(
+        hass, entity_registry, snapshot, Platform.MEDIA_PLAYER
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["hw_q80r_soundbar"])
+@pytest.mark.parametrize(
+    ("action", "command"),
+    [
+        (SERVICE_TURN_ON, Command.ON),
+        (SERVICE_TURN_OFF, Command.OFF),
+    ],
+)
+async def test_turn_on_off(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    action: str,
+    command: Command,
+) -> None:
+    """Test media player turn on and off command."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        action,
+        {ATTR_ENTITY_ID: "media_player.soundbar"},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "afcf3b91-0000-1111-2222-ddff2a0a6577", Capability.SWITCH, command, MAIN
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["hw_q80r_soundbar"])
+@pytest.mark.parametrize(
+    ("muted", "argument"),
+    [
+        (True, "muted"),
+        (False, "unmuted"),
+    ],
+)
+async def test_mute_unmute(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    muted: bool,
+    argument: str,
+) -> None:
+    """Test media player mute and unmute command."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_VOLUME_MUTE,
+        {ATTR_ENTITY_ID: "media_player.soundbar", ATTR_MEDIA_VOLUME_MUTED: muted},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "afcf3b91-0000-1111-2222-ddff2a0a6577",
+        Capability.AUDIO_MUTE,
+        Command.SET_MUTE,
+        MAIN,
+        argument=argument,
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["hw_q80r_soundbar"])
+async def test_set_volume_level(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test media player set volume level command."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_VOLUME_SET,
+        {ATTR_ENTITY_ID: "media_player.soundbar", ATTR_MEDIA_VOLUME_LEVEL: 0.31},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "afcf3b91-0000-1111-2222-ddff2a0a6577",
+        Capability.AUDIO_VOLUME,
+        Command.SET_VOLUME,
+        MAIN,
+        argument=31,
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["hw_q80r_soundbar"])
+async def test_volume_up(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test media player increase volume level command."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_VOLUME_UP,
+        {ATTR_ENTITY_ID: "media_player.soundbar"},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "afcf3b91-0000-1111-2222-ddff2a0a6577",
+        Capability.AUDIO_VOLUME,
+        Command.VOLUME_UP,
+        MAIN,
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["hw_q80r_soundbar"])
+async def test_volume_down(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test media player decrease volume level command."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_VOLUME_DOWN,
+        {ATTR_ENTITY_ID: "media_player.soundbar"},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "afcf3b91-0000-1111-2222-ddff2a0a6577",
+        Capability.AUDIO_VOLUME,
+        Command.VOLUME_DOWN,
+        MAIN,
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["hw_q80r_soundbar"])
+async def test_media_play(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test media player play command."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_MEDIA_PLAY,
+        {ATTR_ENTITY_ID: "media_player.soundbar"},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "afcf3b91-0000-1111-2222-ddff2a0a6577",
+        Capability.MEDIA_PLAYBACK,
+        Command.PLAY,
+        MAIN,
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["hw_q80r_soundbar"])
+async def test_media_pause(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test media player pause command."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_MEDIA_PAUSE,
+        {ATTR_ENTITY_ID: "media_player.soundbar"},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "afcf3b91-0000-1111-2222-ddff2a0a6577",
+        Capability.MEDIA_PLAYBACK,
+        Command.PAUSE,
+        MAIN,
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["hw_q80r_soundbar"])
+async def test_media_stop(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test media player stop command."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_MEDIA_STOP,
+        {ATTR_ENTITY_ID: "media_player.soundbar"},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "afcf3b91-0000-1111-2222-ddff2a0a6577",
+        Capability.MEDIA_PLAYBACK,
+        Command.STOP,
+        MAIN,
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["hw_q80r_soundbar"])
+async def test_media_previous_track(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test media player previous track command."""
+    devices.get_device_status.return_value[MAIN][Capability.MEDIA_PLAYBACK] = {
+        Attribute.SUPPORTED_PLAYBACK_COMMANDS: Status(["rewind"])
+    }
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_MEDIA_PREVIOUS_TRACK,
+        {ATTR_ENTITY_ID: "media_player.soundbar"},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "afcf3b91-0000-1111-2222-ddff2a0a6577",
+        Capability.MEDIA_PLAYBACK,
+        Command.REWIND,
+        MAIN,
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["hw_q80r_soundbar"])
+async def test_media_next_track(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test media player next track command."""
+    devices.get_device_status.return_value[MAIN][Capability.MEDIA_PLAYBACK] = {
+        Attribute.SUPPORTED_PLAYBACK_COMMANDS: Status(["fastForward"])
+    }
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_MEDIA_NEXT_TRACK,
+        {ATTR_ENTITY_ID: "media_player.soundbar"},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "afcf3b91-0000-1111-2222-ddff2a0a6577",
+        Capability.MEDIA_PLAYBACK,
+        Command.FAST_FORWARD,
+        MAIN,
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["hw_q80r_soundbar"])
+async def test_select_source(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test media player stop command."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_SELECT_SOURCE,
+        {ATTR_ENTITY_ID: "media_player.soundbar", ATTR_INPUT_SOURCE: "digital"},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "afcf3b91-0000-1111-2222-ddff2a0a6577",
+        Capability.MEDIA_INPUT_SOURCE,
+        Command.SET_INPUT_SOURCE,
+        MAIN,
+        "digital",
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["hw_q80r_soundbar"])
+@pytest.mark.parametrize(
+    ("shuffle", "argument"),
+    [
+        (True, "enabled"),
+        (False, "disabled"),
+    ],
+)
+async def test_media_shuffle_on_off(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    shuffle: bool,
+    argument: bool,
+) -> None:
+    """Test media player media shuffle command."""
+    devices.get_device_status.return_value[MAIN][Capability.MEDIA_PLAYBACK_SHUFFLE] = {
+        Attribute.PLAYBACK_SHUFFLE: Status(True)
+    }
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_SHUFFLE_SET,
+        {ATTR_ENTITY_ID: "media_player.soundbar", ATTR_MEDIA_SHUFFLE: shuffle},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "afcf3b91-0000-1111-2222-ddff2a0a6577",
+        Capability.MEDIA_PLAYBACK_SHUFFLE,
+        Command.SET_PLAYBACK_SHUFFLE,
+        MAIN,
+        argument=argument,
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["hw_q80r_soundbar"])
+@pytest.mark.parametrize(
+    ("repeat", "argument"),
+    [
+        (RepeatMode.OFF, "off"),
+        (RepeatMode.ONE, "one"),
+        (RepeatMode.ALL, "all"),
+    ],
+)
+async def test_media_repeat_mode(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    repeat: RepeatMode,
+    argument: bool,
+) -> None:
+    """Test media player repeat mode command."""
+    devices.get_device_status.return_value[MAIN][Capability.MEDIA_PLAYBACK_REPEAT] = {
+        Attribute.REPEAT_MODE: Status("one")
+    }
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_REPEAT_SET,
+        {ATTR_ENTITY_ID: "media_player.soundbar", ATTR_MEDIA_REPEAT: repeat},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "afcf3b91-0000-1111-2222-ddff2a0a6577",
+        Capability.MEDIA_PLAYBACK_REPEAT,
+        Command.SET_PLAYBACK_REPEAT_MODE,
+        MAIN,
+        argument=argument,
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["hw_q80r_soundbar"])
+async def test_state_update(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test state update."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.states.get("media_player.soundbar").state == STATE_PLAYING
+
+    await trigger_update(
+        hass,
+        devices,
+        "afcf3b91-0000-1111-2222-ddff2a0a6577",
+        Capability.SWITCH,
+        Attribute.SWITCH,
+        "off",
+    )
+
+    assert hass.states.get("media_player.soundbar").state == STATE_OFF
diff --git a/tests/components/smartthings/test_number.py b/tests/components/smartthings/test_number.py
new file mode 100644
index 00000000000..578b94e050f
--- /dev/null
+++ b/tests/components/smartthings/test_number.py
@@ -0,0 +1,81 @@
+"""Test for the SmartThings number platform."""
+
+from unittest.mock import AsyncMock
+
+from pysmartthings import Attribute, Capability, Command
+import pytest
+from syrupy import SnapshotAssertion
+
+from homeassistant.components.number import (
+    ATTR_VALUE,
+    DOMAIN as NUMBER_DOMAIN,
+    SERVICE_SET_VALUE,
+)
+from homeassistant.components.smartthings import MAIN
+from homeassistant.const import ATTR_ENTITY_ID, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import setup_integration, snapshot_smartthings_entities, trigger_update
+
+from tests.common import MockConfigEntry
+
+
+async def test_all_entities(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test all entities."""
+    await setup_integration(hass, mock_config_entry)
+
+    snapshot_smartthings_entities(hass, entity_registry, snapshot, Platform.NUMBER)
+
+
+@pytest.mark.parametrize("device_fixture", ["da_wm_wm_000001"])
+async def test_set_value(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test setting a value."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        NUMBER_DOMAIN,
+        SERVICE_SET_VALUE,
+        {ATTR_ENTITY_ID: "number.washer_rinse_cycles", ATTR_VALUE: 3},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "f984b91d-f250-9d42-3436-33f09a422a47",
+        Capability.CUSTOM_WASHER_RINSE_CYCLES,
+        Command.SET_WASHER_RINSE_CYCLES,
+        MAIN,
+        argument="3",
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["da_wm_wm_000001"])
+async def test_state_update(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test state update."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.states.get("number.washer_rinse_cycles").state == "2"
+
+    await trigger_update(
+        hass,
+        devices,
+        "f984b91d-f250-9d42-3436-33f09a422a47",
+        Capability.CUSTOM_WASHER_RINSE_CYCLES,
+        Attribute.WASHER_RINSE_CYCLES,
+        "3",
+    )
+
+    assert hass.states.get("number.washer_rinse_cycles").state == "3"
diff --git a/tests/components/smartthings/test_scene.py b/tests/components/smartthings/test_scene.py
index a20db1aaae8..7ef287b9e96 100644
--- a/tests/components/smartthings/test_scene.py
+++ b/tests/components/smartthings/test_scene.py
@@ -1,52 +1,47 @@
-"""Test for the SmartThings scene platform.
+"""Test for the SmartThings scene platform."""
 
-The only mocking required is of the underlying SmartThings API object so
-real HTTP calls are not initiated during testing.
-"""
+from unittest.mock import AsyncMock
+
+from syrupy import SnapshotAssertion
 
 from homeassistant.components.scene import DOMAIN as SCENE_DOMAIN
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import ATTR_ENTITY_ID, SERVICE_TURN_ON, STATE_UNAVAILABLE
+from homeassistant.const import ATTR_ENTITY_ID, SERVICE_TURN_ON, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
-from .conftest import setup_platform
+from . import setup_integration, snapshot_smartthings_entities
+
+from tests.common import MockConfigEntry
 
 
-async def test_entity_and_device_attributes(
-    hass: HomeAssistant, entity_registry: er.EntityRegistry, scene
+async def test_all_entities(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    mock_smartthings: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
 ) -> None:
-    """Test the attributes of the entity are correct."""
-    # Act
-    await setup_platform(hass, SCENE_DOMAIN, scenes=[scene])
-    # Assert
-    entry = entity_registry.async_get("scene.test_scene")
-    assert entry
-    assert entry.unique_id == scene.scene_id
+    """Test all entities."""
+    await setup_integration(hass, mock_config_entry)
+
+    snapshot_smartthings_entities(hass, entity_registry, snapshot, Platform.SCENE)
 
 
-async def test_scene_activate(hass: HomeAssistant, scene) -> None:
-    """Test the scene is activated."""
-    await setup_platform(hass, SCENE_DOMAIN, scenes=[scene])
+async def test_activate_scene(
+    hass: HomeAssistant,
+    mock_smartthings: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test activating a scene."""
+    await setup_integration(hass, mock_config_entry)
+
     await hass.services.async_call(
         SCENE_DOMAIN,
         SERVICE_TURN_ON,
-        {ATTR_ENTITY_ID: "scene.test_scene"},
+        {ATTR_ENTITY_ID: "scene.away"},
         blocking=True,
     )
-    state = hass.states.get("scene.test_scene")
-    assert state.attributes["icon"] == scene.icon
-    assert state.attributes["color"] == scene.color
-    assert state.attributes["location_id"] == scene.location_id
-    assert scene.execute.call_count == 1
 
-
-async def test_unload_config_entry(hass: HomeAssistant, scene) -> None:
-    """Test the scene is removed when the config entry is unloaded."""
-    # Arrange
-    config_entry = await setup_platform(hass, SCENE_DOMAIN, scenes=[scene])
-    config_entry.mock_state(hass, ConfigEntryState.LOADED)
-    # Act
-    await hass.config_entries.async_forward_entry_unload(config_entry, SCENE_DOMAIN)
-    # Assert
-    assert hass.states.get("scene.test_scene").state == STATE_UNAVAILABLE
+    mock_smartthings.execute_scene.assert_called_once_with(
+        "743b0f37-89b8-476c-aedf-eea8ad8cd29d"
+    )
diff --git a/tests/components/smartthings/test_select.py b/tests/components/smartthings/test_select.py
new file mode 100644
index 00000000000..2c5c55239f2
--- /dev/null
+++ b/tests/components/smartthings/test_select.py
@@ -0,0 +1,121 @@
+"""Test for the SmartThings select platform."""
+
+from unittest.mock import AsyncMock
+
+from pysmartthings import Attribute, Capability, Command
+import pytest
+from syrupy import SnapshotAssertion
+
+from homeassistant.components.select import (
+    ATTR_OPTION,
+    DOMAIN as SELECT_DOMAIN,
+    SERVICE_SELECT_OPTION,
+)
+from homeassistant.components.smartthings import MAIN
+from homeassistant.const import ATTR_ENTITY_ID, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ServiceValidationError
+from homeassistant.helpers import entity_registry as er
+
+from . import (
+    set_attribute_value,
+    setup_integration,
+    snapshot_smartthings_entities,
+    trigger_update,
+)
+
+from tests.common import MockConfigEntry
+
+
+async def test_all_entities(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test all entities."""
+    await setup_integration(hass, mock_config_entry)
+
+    snapshot_smartthings_entities(hass, entity_registry, snapshot, Platform.SELECT)
+
+
+@pytest.mark.parametrize("device_fixture", ["da_wm_wd_000001"])
+async def test_state_update(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test state update."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.states.get("select.dryer").state == "stop"
+
+    await trigger_update(
+        hass,
+        devices,
+        "02f7256e-8353-5bdd-547f-bd5b1647e01b",
+        Capability.DRYER_OPERATING_STATE,
+        Attribute.MACHINE_STATE,
+        "run",
+    )
+
+    assert hass.states.get("select.dryer").state == "run"
+
+
+@pytest.mark.parametrize("device_fixture", ["da_wm_wd_000001"])
+async def test_select_option(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test state update."""
+    set_attribute_value(
+        devices,
+        Capability.REMOTE_CONTROL_STATUS,
+        Attribute.REMOTE_CONTROL_ENABLED,
+        "true",
+    )
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        SELECT_DOMAIN,
+        SERVICE_SELECT_OPTION,
+        {ATTR_ENTITY_ID: "select.dryer", ATTR_OPTION: "run"},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "02f7256e-8353-5bdd-547f-bd5b1647e01b",
+        Capability.DRYER_OPERATING_STATE,
+        Command.SET_MACHINE_STATE,
+        MAIN,
+        argument="run",
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["da_wm_wd_000001"])
+async def test_select_option_without_remote_control(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test state update."""
+    set_attribute_value(
+        devices,
+        Capability.REMOTE_CONTROL_STATUS,
+        Attribute.REMOTE_CONTROL_ENABLED,
+        "false",
+    )
+    await setup_integration(hass, mock_config_entry)
+
+    with pytest.raises(
+        ServiceValidationError,
+        match="Can only be updated when remote control is enabled",
+    ):
+        await hass.services.async_call(
+            SELECT_DOMAIN,
+            SERVICE_SELECT_OPTION,
+            {ATTR_ENTITY_ID: "select.dryer", ATTR_OPTION: "run"},
+            blocking=True,
+        )
+    devices.execute_device_command.assert_not_called()
diff --git a/tests/components/smartthings/test_sensor.py b/tests/components/smartthings/test_sensor.py
index 7e6768e4d7d..cf49d02b910 100644
--- a/tests/components/smartthings/test_sensor.py
+++ b/tests/components/smartthings/test_sensor.py
@@ -1,307 +1,145 @@
-"""Test for the SmartThings sensors platform.
+"""Test for the SmartThings sensors platform."""
 
-The only mocking required is of the underlying SmartThings API object so
-real HTTP calls are not initiated during testing.
-"""
+from unittest.mock import AsyncMock
 
-from pysmartthings import ATTRIBUTES, CAPABILITIES, Attribute, Capability
+from pysmartthings import Attribute, Capability
+import pytest
+from syrupy import SnapshotAssertion
 
-from homeassistant.components.sensor import (
-    DEVICE_CLASSES,
-    DOMAIN as SENSOR_DOMAIN,
-    STATE_CLASSES,
-)
-from homeassistant.components.smartthings import sensor
-from homeassistant.components.smartthings.const import DOMAIN, SIGNAL_SMARTTHINGS_UPDATE
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import (
-    ATTR_FRIENDLY_NAME,
-    ATTR_UNIT_OF_MEASUREMENT,
-    PERCENTAGE,
-    STATE_UNAVAILABLE,
-    STATE_UNKNOWN,
-    EntityCategory,
-)
+from homeassistant.components import automation, script
+from homeassistant.components.automation import automations_with_entity
+from homeassistant.components.script import scripts_with_entity
+from homeassistant.components.smartthings.const import DOMAIN
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers import entity_registry as er, issue_registry as ir
+from homeassistant.setup import async_setup_component
 
-from .conftest import setup_platform
+from . import setup_integration, snapshot_smartthings_entities, trigger_update
+
+from tests.common import MockConfigEntry
 
 
-async def test_mapping_integrity() -> None:
-    """Test ensures the map dicts have proper integrity."""
-    for capability, maps in sensor.CAPABILITY_TO_SENSORS.items():
-        assert capability in CAPABILITIES, capability
-        for sensor_map in maps:
-            assert sensor_map.attribute in ATTRIBUTES, sensor_map.attribute
-            if sensor_map.device_class:
-                assert sensor_map.device_class in DEVICE_CLASSES, (
-                    sensor_map.device_class
-                )
-            if sensor_map.state_class:
-                assert sensor_map.state_class in STATE_CLASSES, sensor_map.state_class
-
-
-async def test_entity_state(hass: HomeAssistant, device_factory) -> None:
-    """Tests the state attributes properly match the sensor types."""
-    device = device_factory("Sensor 1", [Capability.battery], {Attribute.battery: 100})
-    await setup_platform(hass, SENSOR_DOMAIN, devices=[device])
-    state = hass.states.get("sensor.sensor_1_battery")
-    assert state.state == "100"
-    assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == PERCENTAGE
-    assert state.attributes[ATTR_FRIENDLY_NAME] == f"{device.label} Battery"
-
-
-async def test_entity_three_axis_state(hass: HomeAssistant, device_factory) -> None:
-    """Tests the state attributes properly match the three axis types."""
-    device = device_factory(
-        "Three Axis", [Capability.three_axis], {Attribute.three_axis: [100, 75, 25]}
-    )
-    await setup_platform(hass, SENSOR_DOMAIN, devices=[device])
-    state = hass.states.get("sensor.three_axis_x_coordinate")
-    assert state.state == "100"
-    assert state.attributes[ATTR_FRIENDLY_NAME] == f"{device.label} X Coordinate"
-    state = hass.states.get("sensor.three_axis_y_coordinate")
-    assert state.state == "75"
-    assert state.attributes[ATTR_FRIENDLY_NAME] == f"{device.label} Y Coordinate"
-    state = hass.states.get("sensor.three_axis_z_coordinate")
-    assert state.state == "25"
-    assert state.attributes[ATTR_FRIENDLY_NAME] == f"{device.label} Z Coordinate"
-
-
-async def test_entity_three_axis_invalid_state(
-    hass: HomeAssistant, device_factory
-) -> None:
-    """Tests the state attributes properly match the three axis types."""
-    device = device_factory(
-        "Three Axis", [Capability.three_axis], {Attribute.three_axis: []}
-    )
-    await setup_platform(hass, SENSOR_DOMAIN, devices=[device])
-    state = hass.states.get("sensor.three_axis_x_coordinate")
-    assert state.state == STATE_UNKNOWN
-    state = hass.states.get("sensor.three_axis_y_coordinate")
-    assert state.state == STATE_UNKNOWN
-    state = hass.states.get("sensor.three_axis_z_coordinate")
-    assert state.state == STATE_UNKNOWN
-
-
-async def test_entity_and_device_attributes(
+async def test_all_entities(
     hass: HomeAssistant,
-    device_registry: dr.DeviceRegistry,
+    snapshot: SnapshotAssertion,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
     entity_registry: er.EntityRegistry,
-    device_factory,
 ) -> None:
-    """Test the attributes of the entity are correct."""
-    # Arrange
-    device = device_factory(
-        "Sensor 1",
-        [Capability.battery],
-        {
-            Attribute.battery: 100,
-            Attribute.mnmo: "123",
-            Attribute.mnmn: "Generic manufacturer",
-            Attribute.mnhw: "v4.56",
-            Attribute.mnfv: "v7.89",
-        },
-    )
-    # Act
-    await setup_platform(hass, SENSOR_DOMAIN, devices=[device])
-    # Assert
-    entry = entity_registry.async_get("sensor.sensor_1_battery")
-    assert entry
-    assert entry.unique_id == f"{device.device_id}.{Attribute.battery}"
-    assert entry.entity_category is EntityCategory.DIAGNOSTIC
-    entry = device_registry.async_get_device(identifiers={(DOMAIN, device.device_id)})
-    assert entry
-    assert entry.configuration_url == "https://account.smartthings.com"
-    assert entry.identifiers == {(DOMAIN, device.device_id)}
-    assert entry.name == device.label
-    assert entry.model == "123"
-    assert entry.manufacturer == "Generic manufacturer"
-    assert entry.hw_version == "v4.56"
-    assert entry.sw_version == "v7.89"
+    """Test all entities."""
+    await setup_integration(hass, mock_config_entry)
+
+    snapshot_smartthings_entities(hass, entity_registry, snapshot, Platform.SENSOR)
 
 
-async def test_energy_sensors_for_switch_device(
+@pytest.mark.parametrize("device_fixture", ["da_ac_rac_000001"])
+async def test_state_update(
     hass: HomeAssistant,
-    device_registry: dr.DeviceRegistry,
-    entity_registry: er.EntityRegistry,
-    device_factory,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
-    """Test the attributes of the entity are correct."""
-    # Arrange
-    device = device_factory(
-        "Switch_1",
-        [Capability.switch, Capability.power_meter, Capability.energy_meter],
-        {
-            Attribute.switch: "off",
-            Attribute.power: 355,
-            Attribute.energy: 11.422,
-            Attribute.mnmo: "123",
-            Attribute.mnmn: "Generic manufacturer",
-            Attribute.mnhw: "v4.56",
-            Attribute.mnfv: "v7.89",
-        },
+    """Test state update."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.states.get("sensor.ac_office_granit_temperature").state == "25"
+
+    await trigger_update(
+        hass,
+        devices,
+        "96a5ef74-5832-a84b-f1f7-ca799957065d",
+        Capability.TEMPERATURE_MEASUREMENT,
+        Attribute.TEMPERATURE,
+        20,
     )
-    # Act
-    await setup_platform(hass, SENSOR_DOMAIN, devices=[device])
-    # Assert
-    state = hass.states.get("sensor.switch_1_energy_meter")
-    assert state
-    assert state.state == "11.422"
-    entry = entity_registry.async_get("sensor.switch_1_energy_meter")
-    assert entry
-    assert entry.unique_id == f"{device.device_id}.{Attribute.energy}"
-    assert entry.entity_category is None
-    entry = device_registry.async_get_device(identifiers={(DOMAIN, device.device_id)})
-    assert entry
-    assert entry.configuration_url == "https://account.smartthings.com"
-    assert entry.identifiers == {(DOMAIN, device.device_id)}
-    assert entry.name == device.label
-    assert entry.model == "123"
-    assert entry.manufacturer == "Generic manufacturer"
-    assert entry.hw_version == "v4.56"
-    assert entry.sw_version == "v7.89"
 
-    state = hass.states.get("sensor.switch_1_power_meter")
-    assert state
-    assert state.state == "355"
-    entry = entity_registry.async_get("sensor.switch_1_power_meter")
-    assert entry
-    assert entry.unique_id == f"{device.device_id}.{Attribute.power}"
-    assert entry.entity_category is None
-    entry = device_registry.async_get_device(identifiers={(DOMAIN, device.device_id)})
-    assert entry
-    assert entry.configuration_url == "https://account.smartthings.com"
-    assert entry.identifiers == {(DOMAIN, device.device_id)}
-    assert entry.name == device.label
-    assert entry.model == "123"
-    assert entry.manufacturer == "Generic manufacturer"
-    assert entry.hw_version == "v4.56"
-    assert entry.sw_version == "v7.89"
+    assert hass.states.get("sensor.ac_office_granit_temperature").state == "20"
 
 
-async def test_power_consumption_sensor(
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+@pytest.mark.parametrize(
+    ("device_fixture", "entity_id", "translation_key"),
+    [
+        ("da_wm_wm_000001", "sensor.washer_machine_state", "machine_state"),
+        ("da_wm_wd_000001", "sensor.dryer_machine_state", "machine_state"),
+        ("hw_q80r_soundbar", "sensor.soundbar_volume", "media_player"),
+        ("hw_q80r_soundbar", "sensor.soundbar_media_playback_status", "media_player"),
+        ("hw_q80r_soundbar", "sensor.soundbar_media_input_source", "media_player"),
+        (
+            "im_speaker_ai_0001",
+            "sensor.galaxy_home_mini_media_playback_shuffle",
+            "media_player",
+        ),
+        (
+            "im_speaker_ai_0001",
+            "sensor.galaxy_home_mini_media_playback_repeat",
+            "media_player",
+        ),
+    ],
+)
+async def test_create_issue(
     hass: HomeAssistant,
-    device_registry: dr.DeviceRegistry,
-    entity_registry: er.EntityRegistry,
-    device_factory,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    issue_registry: ir.IssueRegistry,
+    entity_id: str,
+    translation_key: str,
 ) -> None:
-    """Test the attributes of the entity are correct."""
-    # Arrange
-    device = device_factory(
-        "refrigerator",
-        [Capability.power_consumption_report],
+    """Test we create an issue when an automation or script is using a deprecated entity."""
+    issue_id = f"deprecated_{translation_key}_{entity_id}"
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
         {
-            Attribute.power_consumption: {
-                "energy": 1412002,
-                "deltaEnergy": 25,
-                "power": 109,
-                "powerEnergy": 24.304498331745464,
-                "persistedEnergy": 0,
-                "energySaved": 0,
-                "start": "2021-07-30T16:45:25Z",
-                "end": "2021-07-30T16:58:33Z",
-            },
-            Attribute.mnmo: "123",
-            Attribute.mnmn: "Generic manufacturer",
-            Attribute.mnhw: "v4.56",
-            Attribute.mnfv: "v7.89",
+            automation.DOMAIN: {
+                "id": "test",
+                "alias": "test",
+                "trigger": {"platform": "state", "entity_id": entity_id},
+                "action": {
+                    "action": "automation.turn_on",
+                    "target": {
+                        "entity_id": "automation.test",
+                    },
+                },
+            }
         },
     )
-    # Act
-    await setup_platform(hass, SENSOR_DOMAIN, devices=[device])
-    # Assert
-    state = hass.states.get("sensor.refrigerator_energy")
-    assert state
-    assert state.state == "1412.002"
-    entry = entity_registry.async_get("sensor.refrigerator_energy")
-    assert entry
-    assert entry.unique_id == f"{device.device_id}.energy_meter"
-    entry = device_registry.async_get_device(identifiers={(DOMAIN, device.device_id)})
-    assert entry
-    assert entry.configuration_url == "https://account.smartthings.com"
-    assert entry.identifiers == {(DOMAIN, device.device_id)}
-    assert entry.name == device.label
-    assert entry.model == "123"
-    assert entry.manufacturer == "Generic manufacturer"
-    assert entry.hw_version == "v4.56"
-    assert entry.sw_version == "v7.89"
-
-    state = hass.states.get("sensor.refrigerator_power")
-    assert state
-    assert state.state == "109"
-    assert state.attributes["power_consumption_start"] == "2021-07-30T16:45:25Z"
-    assert state.attributes["power_consumption_end"] == "2021-07-30T16:58:33Z"
-    entry = entity_registry.async_get("sensor.refrigerator_power")
-    assert entry
-    assert entry.unique_id == f"{device.device_id}.power_meter"
-    entry = device_registry.async_get_device(identifiers={(DOMAIN, device.device_id)})
-    assert entry
-    assert entry.configuration_url == "https://account.smartthings.com"
-    assert entry.identifiers == {(DOMAIN, device.device_id)}
-    assert entry.name == device.label
-    assert entry.model == "123"
-    assert entry.manufacturer == "Generic manufacturer"
-    assert entry.hw_version == "v4.56"
-    assert entry.sw_version == "v7.89"
-
-    device = device_factory(
-        "vacuum",
-        [Capability.power_consumption_report],
+    assert await async_setup_component(
+        hass,
+        script.DOMAIN,
         {
-            Attribute.power_consumption: {},
-            Attribute.mnmo: "123",
-            Attribute.mnmn: "Generic manufacturer",
-            Attribute.mnhw: "v4.56",
-            Attribute.mnfv: "v7.89",
+            script.DOMAIN: {
+                "test": {
+                    "sequence": [
+                        {
+                            "condition": "state",
+                            "entity_id": entity_id,
+                            "state": "on",
+                        },
+                    ],
+                }
+            }
         },
     )
-    # Act
-    await setup_platform(hass, SENSOR_DOMAIN, devices=[device])
-    # Assert
-    state = hass.states.get("sensor.vacuum_energy")
-    assert state
-    assert state.state == "unknown"
-    entry = entity_registry.async_get("sensor.vacuum_energy")
-    assert entry
-    assert entry.unique_id == f"{device.device_id}.energy_meter"
-    entry = device_registry.async_get_device(identifiers={(DOMAIN, device.device_id)})
-    assert entry
-    assert entry.configuration_url == "https://account.smartthings.com"
-    assert entry.identifiers == {(DOMAIN, device.device_id)}
-    assert entry.name == device.label
-    assert entry.model == "123"
-    assert entry.manufacturer == "Generic manufacturer"
-    assert entry.hw_version == "v4.56"
-    assert entry.sw_version == "v7.89"
 
+    await setup_integration(hass, mock_config_entry)
 
-async def test_update_from_signal(hass: HomeAssistant, device_factory) -> None:
-    """Test the binary_sensor updates when receiving a signal."""
-    # Arrange
-    device = device_factory("Sensor 1", [Capability.battery], {Attribute.battery: 100})
-    await setup_platform(hass, SENSOR_DOMAIN, devices=[device])
-    device.status.apply_attribute_update(
-        "main", Capability.battery, Attribute.battery, 75
-    )
-    # Act
-    async_dispatcher_send(hass, SIGNAL_SMARTTHINGS_UPDATE, [device.device_id])
-    # Assert
+    assert automations_with_entity(hass, entity_id)[0] == "automation.test"
+    assert scripts_with_entity(hass, entity_id)[0] == "script.test"
+
+    assert len(issue_registry.issues) == 1
+    issue = issue_registry.async_get_issue(DOMAIN, issue_id)
+    assert issue is not None
+    assert issue.translation_key == f"deprecated_{translation_key}"
+    assert issue.translation_placeholders == {
+        "entity": entity_id,
+        "items": "- [test](/config/automation/edit/test)\n- [test](/config/script/edit/test)",
+    }
+
+    await hass.config_entries.async_unload(mock_config_entry.entry_id)
     await hass.async_block_till_done()
-    state = hass.states.get("sensor.sensor_1_battery")
-    assert state is not None
-    assert state.state == "75"
 
-
-async def test_unload_config_entry(hass: HomeAssistant, device_factory) -> None:
-    """Test the binary_sensor is removed when the config entry is unloaded."""
-    # Arrange
-    device = device_factory("Sensor 1", [Capability.battery], {Attribute.battery: 100})
-    config_entry = await setup_platform(hass, SENSOR_DOMAIN, devices=[device])
-    config_entry.mock_state(hass, ConfigEntryState.LOADED)
-    # Act
-    await hass.config_entries.async_forward_entry_unload(config_entry, "sensor")
-    # Assert
-    assert hass.states.get("sensor.sensor_1_battery").state == STATE_UNAVAILABLE
+    # Assert the issue is no longer present
+    assert not issue_registry.async_get_issue(DOMAIN, issue_id)
+    assert len(issue_registry.issues) == 0
diff --git a/tests/components/smartthings/test_smartapp.py b/tests/components/smartthings/test_smartapp.py
deleted file mode 100644
index c7861866fad..00000000000
--- a/tests/components/smartthings/test_smartapp.py
+++ /dev/null
@@ -1,186 +0,0 @@
-"""Tests for the smartapp module."""
-
-from unittest.mock import AsyncMock, Mock, patch
-from uuid import uuid4
-
-from pysmartthings import CAPABILITIES, AppEntity, Capability
-import pytest
-
-from homeassistant.components.smartthings import smartapp
-from homeassistant.components.smartthings.const import (
-    CONF_REFRESH_TOKEN,
-    DATA_MANAGER,
-    DOMAIN,
-)
-from homeassistant.core import HomeAssistant
-
-from tests.common import MockConfigEntry
-
-
-async def test_update_app(hass: HomeAssistant, app) -> None:
-    """Test update_app does not save if app is current."""
-    await smartapp.update_app(hass, app)
-    assert app.save.call_count == 0
-
-
-async def test_update_app_updated_needed(hass: HomeAssistant, app) -> None:
-    """Test update_app updates when an app is needed."""
-    mock_app = Mock(AppEntity)
-    mock_app.app_name = "Test"
-
-    await smartapp.update_app(hass, mock_app)
-
-    assert mock_app.save.call_count == 1
-    assert mock_app.app_name == "Test"
-    assert mock_app.display_name == app.display_name
-    assert mock_app.description == app.description
-    assert mock_app.webhook_target_url == app.webhook_target_url
-    assert mock_app.app_type == app.app_type
-    assert mock_app.single_instance == app.single_instance
-    assert mock_app.classifications == app.classifications
-
-
-async def test_smartapp_update_saves_token(
-    hass: HomeAssistant, smartthings_mock, location, device_factory
-) -> None:
-    """Test update saves token."""
-    # Arrange
-    entry = MockConfigEntry(
-        domain=DOMAIN, data={"installed_app_id": str(uuid4()), "app_id": str(uuid4())}
-    )
-    entry.add_to_hass(hass)
-    app = Mock()
-    app.app_id = entry.data["app_id"]
-    request = Mock()
-    request.installed_app_id = entry.data["installed_app_id"]
-    request.auth_token = str(uuid4())
-    request.refresh_token = str(uuid4())
-    request.location_id = location.location_id
-
-    # Act
-    await smartapp.smartapp_update(hass, request, None, app)
-    # Assert
-    assert entry.data[CONF_REFRESH_TOKEN] == request.refresh_token
-
-
-async def test_smartapp_uninstall(hass: HomeAssistant, config_entry) -> None:
-    """Test the config entry is unloaded when the app is uninstalled."""
-    config_entry.add_to_hass(hass)
-    app = Mock()
-    app.app_id = config_entry.data["app_id"]
-    request = Mock()
-    request.installed_app_id = config_entry.data["installed_app_id"]
-
-    with patch.object(hass.config_entries, "async_remove") as remove:
-        await smartapp.smartapp_uninstall(hass, request, None, app)
-        assert remove.call_count == 1
-
-
-async def test_smartapp_webhook(hass: HomeAssistant) -> None:
-    """Test the smartapp webhook calls the manager."""
-    manager = Mock()
-    manager.handle_request = AsyncMock(return_value={})
-    hass.data[DOMAIN][DATA_MANAGER] = manager
-    request = Mock()
-    request.headers = []
-    request.json = AsyncMock(return_value={})
-    result = await smartapp.smartapp_webhook(hass, "", request)
-
-    assert result.body == b"{}"
-
-
-async def test_smartapp_sync_subscriptions(
-    hass: HomeAssistant, smartthings_mock, device_factory, subscription_factory
-) -> None:
-    """Test synchronization adds and removes and ignores unused."""
-    smartthings_mock.subscriptions.return_value = [
-        subscription_factory(Capability.thermostat),
-        subscription_factory(Capability.switch),
-        subscription_factory(Capability.switch_level),
-    ]
-    devices = [
-        device_factory("", [Capability.battery, "ping"]),
-        device_factory("", [Capability.switch, Capability.switch_level]),
-        device_factory("", [Capability.switch, Capability.execute]),
-    ]
-
-    await smartapp.smartapp_sync_subscriptions(
-        hass, str(uuid4()), str(uuid4()), str(uuid4()), devices
-    )
-
-    assert smartthings_mock.subscriptions.call_count == 1
-    assert smartthings_mock.delete_subscription.call_count == 1
-    assert smartthings_mock.create_subscription.call_count == 1
-
-
-async def test_smartapp_sync_subscriptions_up_to_date(
-    hass: HomeAssistant, smartthings_mock, device_factory, subscription_factory
-) -> None:
-    """Test synchronization does nothing when current."""
-    smartthings_mock.subscriptions.return_value = [
-        subscription_factory(Capability.battery),
-        subscription_factory(Capability.switch),
-        subscription_factory(Capability.switch_level),
-    ]
-    devices = [
-        device_factory("", [Capability.battery, "ping"]),
-        device_factory("", [Capability.switch, Capability.switch_level]),
-        device_factory("", [Capability.switch]),
-    ]
-
-    await smartapp.smartapp_sync_subscriptions(
-        hass, str(uuid4()), str(uuid4()), str(uuid4()), devices
-    )
-
-    assert smartthings_mock.subscriptions.call_count == 1
-    assert smartthings_mock.delete_subscription.call_count == 0
-    assert smartthings_mock.create_subscription.call_count == 0
-
-
-async def test_smartapp_sync_subscriptions_limit_warning(
-    hass: HomeAssistant,
-    smartthings_mock,
-    device_factory,
-    subscription_factory,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test synchronization over the limit logs a warning."""
-    smartthings_mock.subscriptions.return_value = []
-    devices = [
-        device_factory("", CAPABILITIES),
-    ]
-
-    await smartapp.smartapp_sync_subscriptions(
-        hass, str(uuid4()), str(uuid4()), str(uuid4()), devices
-    )
-
-    assert (
-        "Some device attributes may not receive push updates and there may be "
-        "subscription creation failures" in caplog.text
-    )
-
-
-async def test_smartapp_sync_subscriptions_handles_exceptions(
-    hass: HomeAssistant, smartthings_mock, device_factory, subscription_factory
-) -> None:
-    """Test synchronization does nothing when current."""
-    smartthings_mock.delete_subscription.side_effect = Exception
-    smartthings_mock.create_subscription.side_effect = Exception
-    smartthings_mock.subscriptions.return_value = [
-        subscription_factory(Capability.battery),
-        subscription_factory(Capability.switch),
-        subscription_factory(Capability.switch_level),
-    ]
-    devices = [
-        device_factory("", [Capability.thermostat, "ping"]),
-        device_factory("", [Capability.switch, Capability.switch_level]),
-        device_factory("", [Capability.switch]),
-    ]
-
-    await smartapp.smartapp_sync_subscriptions(
-        hass, str(uuid4()), str(uuid4()), str(uuid4()), devices
-    )
-
-    assert smartthings_mock.subscriptions.call_count == 1
-    assert smartthings_mock.delete_subscription.call_count == 1
-    assert smartthings_mock.create_subscription.call_count == 1
diff --git a/tests/components/smartthings/test_switch.py b/tests/components/smartthings/test_switch.py
index fadd7600e87..2e360ff68e3 100644
--- a/tests/components/smartthings/test_switch.py
+++ b/tests/components/smartthings/test_switch.py
@@ -1,115 +1,203 @@
-"""Test for the SmartThings switch platform.
+"""Test for the SmartThings switch platform."""
 
-The only mocking required is of the underlying SmartThings API object so
-real HTTP calls are not initiated during testing.
-"""
+from unittest.mock import AsyncMock
 
-from pysmartthings import Attribute, Capability
+from pysmartthings import Attribute, Capability, Command
+import pytest
+from syrupy import SnapshotAssertion
 
-from homeassistant.components.smartthings.const import DOMAIN, SIGNAL_SMARTTHINGS_UPDATE
+from homeassistant.components import automation, script
+from homeassistant.components.automation import automations_with_entity
+from homeassistant.components.script import scripts_with_entity
+from homeassistant.components.smartthings.const import DOMAIN, MAIN
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import STATE_UNAVAILABLE
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+    STATE_OFF,
+    STATE_ON,
+    Platform,
+)
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers import entity_registry as er, issue_registry as ir
+from homeassistant.setup import async_setup_component
 
-from .conftest import setup_platform
+from . import setup_integration, snapshot_smartthings_entities, trigger_update
+
+from tests.common import MockConfigEntry
 
 
-async def test_entity_and_device_attributes(
+async def test_all_entities(
     hass: HomeAssistant,
-    device_registry: dr.DeviceRegistry,
+    snapshot: SnapshotAssertion,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
     entity_registry: er.EntityRegistry,
-    device_factory,
 ) -> None:
-    """Test the attributes of the entity are correct."""
-    # Arrange
-    device = device_factory(
-        "Switch_1",
-        [Capability.switch],
+    """Test all entities."""
+    await setup_integration(hass, mock_config_entry)
+
+    snapshot_smartthings_entities(hass, entity_registry, snapshot, Platform.SWITCH)
+
+
+@pytest.mark.parametrize("device_fixture", ["c2c_arlo_pro_3_switch"])
+@pytest.mark.parametrize(
+    ("action", "command"),
+    [
+        (SERVICE_TURN_ON, Command.ON),
+        (SERVICE_TURN_OFF, Command.OFF),
+    ],
+)
+async def test_switch_turn_on_off(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    action: str,
+    command: Command,
+) -> None:
+    """Test switch turn on and off command."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        action,
+        {ATTR_ENTITY_ID: "switch.2nd_floor_hallway"},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "10e06a70-ee7d-4832-85e9-a0a06a7a05bd", Capability.SWITCH, command, MAIN
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["da_wm_wd_000001"])
+@pytest.mark.parametrize(
+    ("action", "argument"),
+    [
+        (SERVICE_TURN_ON, "on"),
+        (SERVICE_TURN_OFF, "off"),
+    ],
+)
+async def test_command_switch_turn_on_off(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    action: str,
+    argument: str,
+) -> None:
+    """Test switch turn on and off command."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        action,
+        {ATTR_ENTITY_ID: "switch.dryer_wrinkle_prevent"},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "02f7256e-8353-5bdd-547f-bd5b1647e01b",
+        Capability.CUSTOM_DRYER_WRINKLE_PREVENT,
+        Command.SET_DRYER_WRINKLE_PREVENT,
+        MAIN,
+        argument,
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["c2c_arlo_pro_3_switch"])
+async def test_state_update(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test state update."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.states.get("switch.2nd_floor_hallway").state == STATE_ON
+
+    await trigger_update(
+        hass,
+        devices,
+        "10e06a70-ee7d-4832-85e9-a0a06a7a05bd",
+        Capability.SWITCH,
+        Attribute.SWITCH,
+        "off",
+    )
+
+    assert hass.states.get("switch.2nd_floor_hallway").state == STATE_OFF
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+@pytest.mark.parametrize(
+    ("device_fixture", "entity_id", "translation_key"),
+    [
+        ("da_wm_wm_000001", "switch.washer", "deprecated_switch_appliance"),
+        ("da_wm_wd_000001", "switch.dryer", "deprecated_switch_appliance"),
+        ("hw_q80r_soundbar", "switch.soundbar", "deprecated_switch_media_player"),
+    ],
+)
+async def test_create_issue(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    issue_registry: ir.IssueRegistry,
+    entity_id: str,
+    translation_key: str,
+) -> None:
+    """Test we create an issue when an automation or script is using a deprecated entity."""
+    issue_id = f"deprecated_switch_{entity_id}"
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
         {
-            Attribute.switch: "on",
-            Attribute.mnmo: "123",
-            Attribute.mnmn: "Generic manufacturer",
-            Attribute.mnhw: "v4.56",
-            Attribute.mnfv: "v7.89",
+            automation.DOMAIN: {
+                "id": "test",
+                "alias": "test",
+                "trigger": {"platform": "state", "entity_id": entity_id},
+                "action": {
+                    "action": "automation.turn_on",
+                    "target": {
+                        "entity_id": "automation.test",
+                    },
+                },
+            }
         },
     )
-    # Act
-    await setup_platform(hass, SWITCH_DOMAIN, devices=[device])
-    # Assert
-    entry = entity_registry.async_get("switch.switch_1")
-    assert entry
-    assert entry.unique_id == device.device_id
-
-    entry = device_registry.async_get_device(identifiers={(DOMAIN, device.device_id)})
-    assert entry
-    assert entry.configuration_url == "https://account.smartthings.com"
-    assert entry.identifiers == {(DOMAIN, device.device_id)}
-    assert entry.name == device.label
-    assert entry.model == "123"
-    assert entry.manufacturer == "Generic manufacturer"
-    assert entry.hw_version == "v4.56"
-    assert entry.sw_version == "v7.89"
-
-
-async def test_turn_off(hass: HomeAssistant, device_factory) -> None:
-    """Test the switch turns of successfully."""
-    # Arrange
-    device = device_factory("Switch_1", [Capability.switch], {Attribute.switch: "on"})
-    await setup_platform(hass, SWITCH_DOMAIN, devices=[device])
-    # Act
-    await hass.services.async_call(
-        "switch", "turn_off", {"entity_id": "switch.switch_1"}, blocking=True
+    assert await async_setup_component(
+        hass,
+        script.DOMAIN,
+        {
+            script.DOMAIN: {
+                "test": {
+                    "sequence": [
+                        {
+                            "condition": "state",
+                            "entity_id": entity_id,
+                            "state": "on",
+                        },
+                    ],
+                }
+            }
+        },
     )
-    # Assert
-    state = hass.states.get("switch.switch_1")
-    assert state is not None
-    assert state.state == "off"
 
+    await setup_integration(hass, mock_config_entry)
 
-async def test_turn_on(hass: HomeAssistant, device_factory) -> None:
-    """Test the switch turns of successfully."""
-    # Arrange
-    device = device_factory(
-        "Switch_1",
-        [Capability.switch, Capability.power_meter, Capability.energy_meter],
-        {Attribute.switch: "off", Attribute.power: 355, Attribute.energy: 11.422},
-    )
-    await setup_platform(hass, SWITCH_DOMAIN, devices=[device])
-    # Act
-    await hass.services.async_call(
-        "switch", "turn_on", {"entity_id": "switch.switch_1"}, blocking=True
-    )
-    # Assert
-    state = hass.states.get("switch.switch_1")
-    assert state is not None
-    assert state.state == "on"
+    assert automations_with_entity(hass, entity_id)[0] == "automation.test"
+    assert scripts_with_entity(hass, entity_id)[0] == "script.test"
 
+    assert len(issue_registry.issues) == 1
+    issue = issue_registry.async_get_issue(DOMAIN, issue_id)
+    assert issue is not None
+    assert issue.translation_key == translation_key
+    assert issue.translation_placeholders == {
+        "entity": entity_id,
+        "items": "- [test](/config/automation/edit/test)\n- [test](/config/script/edit/test)",
+    }
 
-async def test_update_from_signal(hass: HomeAssistant, device_factory) -> None:
-    """Test the switch updates when receiving a signal."""
-    # Arrange
-    device = device_factory("Switch_1", [Capability.switch], {Attribute.switch: "off"})
-    await setup_platform(hass, SWITCH_DOMAIN, devices=[device])
-    await device.switch_on(True)
-    # Act
-    async_dispatcher_send(hass, SIGNAL_SMARTTHINGS_UPDATE, [device.device_id])
-    # Assert
+    await hass.config_entries.async_unload(mock_config_entry.entry_id)
     await hass.async_block_till_done()
-    state = hass.states.get("switch.switch_1")
-    assert state is not None
-    assert state.state == "on"
 
-
-async def test_unload_config_entry(hass: HomeAssistant, device_factory) -> None:
-    """Test the switch is removed when the config entry is unloaded."""
-    # Arrange
-    device = device_factory("Switch 1", [Capability.switch], {Attribute.switch: "on"})
-    config_entry = await setup_platform(hass, SWITCH_DOMAIN, devices=[device])
-    config_entry.mock_state(hass, ConfigEntryState.LOADED)
-    # Act
-    await hass.config_entries.async_forward_entry_unload(config_entry, "switch")
-    # Assert
-    assert hass.states.get("switch.switch_1").state == STATE_UNAVAILABLE
+    # Assert the issue is no longer present
+    assert not issue_registry.async_get_issue(DOMAIN, issue_id)
+    assert len(issue_registry.issues) == 0
diff --git a/tests/components/smartthings/test_update.py b/tests/components/smartthings/test_update.py
new file mode 100644
index 00000000000..8c3d9e1a968
--- /dev/null
+++ b/tests/components/smartthings/test_update.py
@@ -0,0 +1,142 @@
+"""Test for the SmartThings update platform."""
+
+from unittest.mock import AsyncMock
+
+from pysmartthings import Attribute, Capability, Command
+import pytest
+from syrupy import SnapshotAssertion
+
+from homeassistant.components.smartthings.const import MAIN
+from homeassistant.components.update import (
+    ATTR_IN_PROGRESS,
+    DOMAIN as UPDATE_DOMAIN,
+    SERVICE_INSTALL,
+)
+from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import setup_integration, snapshot_smartthings_entities, trigger_update
+
+from tests.common import MockConfigEntry
+
+
+async def test_all_entities(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test all entities."""
+    await setup_integration(hass, mock_config_entry)
+
+    snapshot_smartthings_entities(hass, entity_registry, snapshot, Platform.UPDATE)
+
+
+@pytest.mark.parametrize("device_fixture", ["contact_sensor"])
+async def test_installing_update(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test installing an update."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        UPDATE_DOMAIN,
+        SERVICE_INSTALL,
+        {ATTR_ENTITY_ID: "update.front_door_open_closed_sensor_firmware"},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "2d9a892b-1c93-45a5-84cb-0e81889498c6",
+        Capability.FIRMWARE_UPDATE,
+        Command.UPDATE_FIRMWARE,
+        MAIN,
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["contact_sensor"])
+async def test_state_update(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test state update."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert (
+        hass.states.get("update.front_door_open_closed_sensor_firmware").state
+        == STATE_ON
+    )
+
+    await trigger_update(
+        hass,
+        devices,
+        "2d9a892b-1c93-45a5-84cb-0e81889498c6",
+        Capability.FIRMWARE_UPDATE,
+        Attribute.CURRENT_VERSION,
+        "00000104",
+    )
+
+    assert (
+        hass.states.get("update.front_door_open_closed_sensor_firmware").state
+        == STATE_OFF
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["contact_sensor"])
+async def test_state_progress_update(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test state progress update."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert (
+        hass.states.get("update.front_door_open_closed_sensor_firmware").attributes[
+            ATTR_IN_PROGRESS
+        ]
+        is False
+    )
+
+    await trigger_update(
+        hass,
+        devices,
+        "2d9a892b-1c93-45a5-84cb-0e81889498c6",
+        Capability.FIRMWARE_UPDATE,
+        Attribute.STATE,
+        "updateInProgress",
+    )
+
+    assert (
+        hass.states.get("update.front_door_open_closed_sensor_firmware").attributes[
+            ATTR_IN_PROGRESS
+        ]
+        is True
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["centralite"])
+async def test_state_update_available(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test state update available."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.states.get("update.dimmer_debian_firmware").state == STATE_OFF
+
+    await trigger_update(
+        hass,
+        devices,
+        "d0268a69-abfb-4c92-a646-61cec2e510ad",
+        Capability.FIRMWARE_UPDATE,
+        Attribute.AVAILABLE_VERSION,
+        "16015011",
+    )
+
+    assert hass.states.get("update.dimmer_debian_firmware").state == STATE_ON
diff --git a/tests/components/smartthings/test_valve.py b/tests/components/smartthings/test_valve.py
new file mode 100644
index 00000000000..f0ba34c8264
--- /dev/null
+++ b/tests/components/smartthings/test_valve.py
@@ -0,0 +1,87 @@
+"""Test for the SmartThings valve platform."""
+
+from unittest.mock import AsyncMock
+
+from pysmartthings import Attribute, Capability, Command
+import pytest
+from syrupy import SnapshotAssertion
+
+from homeassistant.components.smartthings import MAIN
+from homeassistant.components.valve import DOMAIN as VALVE_DOMAIN, ValveState
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    SERVICE_CLOSE_VALVE,
+    SERVICE_OPEN_VALVE,
+    Platform,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import setup_integration, snapshot_smartthings_entities, trigger_update
+
+from tests.common import MockConfigEntry
+
+
+async def test_all_entities(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test all entities."""
+    await setup_integration(hass, mock_config_entry)
+
+    snapshot_smartthings_entities(hass, entity_registry, snapshot, Platform.VALVE)
+
+
+@pytest.mark.parametrize("device_fixture", ["virtual_valve"])
+@pytest.mark.parametrize(
+    ("action", "command"),
+    [
+        (SERVICE_OPEN_VALVE, Command.OPEN),
+        (SERVICE_CLOSE_VALVE, Command.CLOSE),
+    ],
+)
+async def test_valve_open_close(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    action: str,
+    command: Command,
+) -> None:
+    """Test valve open and close command."""
+    await setup_integration(hass, mock_config_entry)
+
+    await hass.services.async_call(
+        VALVE_DOMAIN,
+        action,
+        {ATTR_ENTITY_ID: "valve.volvo"},
+        blocking=True,
+    )
+    devices.execute_device_command.assert_called_once_with(
+        "612ab3c2-3bb0-48f7-b2c0-15b169cb2fc3", Capability.VALVE, command, MAIN
+    )
+
+
+@pytest.mark.parametrize("device_fixture", ["virtual_valve"])
+async def test_state_update(
+    hass: HomeAssistant,
+    devices: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test state update."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert hass.states.get("valve.volvo").state == ValveState.CLOSED
+
+    await trigger_update(
+        hass,
+        devices,
+        "612ab3c2-3bb0-48f7-b2c0-15b169cb2fc3",
+        Capability.VALVE,
+        Attribute.VALVE,
+        "open",
+    )
+
+    assert hass.states.get("valve.volvo").state == ValveState.OPEN
diff --git a/tests/components/smarty/snapshots/test_binary_sensor.ambr b/tests/components/smarty/snapshots/test_binary_sensor.ambr
index 2f943a25012..ad4b61f5070 100644
--- a/tests/components/smarty/snapshots/test_binary_sensor.ambr
+++ b/tests/components/smarty/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -99,6 +101,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/smarty/snapshots/test_button.ambr b/tests/components/smarty/snapshots/test_button.ambr
index 38849bd2b2e..b5b86c80beb 100644
--- a/tests/components/smarty/snapshots/test_button.ambr
+++ b/tests/components/smarty/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/smarty/snapshots/test_fan.ambr b/tests/components/smarty/snapshots/test_fan.ambr
index 8ca95beeb86..2502bd6f09f 100644
--- a/tests/components/smarty/snapshots/test_fan.ambr
+++ b/tests/components/smarty/snapshots/test_fan.ambr
@@ -8,6 +8,7 @@
       'preset_modes': None,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/smarty/snapshots/test_init.ambr b/tests/components/smarty/snapshots/test_init.ambr
index b25cdb9dc3a..a292cc97f47 100644
--- a/tests/components/smarty/snapshots/test_init.ambr
+++ b/tests/components/smarty/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/smarty/snapshots/test_sensor.ambr b/tests/components/smarty/snapshots/test_sensor.ambr
index 2f713db7f83..c32740fa38c 100644
--- a/tests/components/smarty/snapshots/test_sensor.ambr
+++ b/tests/components/smarty/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -101,6 +103,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -148,6 +151,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -196,6 +200,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -244,6 +249,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/smarty/snapshots/test_switch.ambr b/tests/components/smarty/snapshots/test_switch.ambr
index be1da7c6961..33c829adf31 100644
--- a/tests/components/smarty/snapshots/test_switch.ambr
+++ b/tests/components/smarty/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/smhi/test_config_flow.py b/tests/components/smhi/test_config_flow.py
index 362adebe416..524aad873f9 100644
--- a/tests/components/smhi/test_config_flow.py
+++ b/tests/components/smhi/test_config_flow.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from unittest.mock import patch
 
-from smhi.smhi_lib import SmhiForecastException
+from pysmhi import SmhiForecastException
 
 from homeassistant import config_entries
 from homeassistant.components.smhi.const import DOMAIN
@@ -31,7 +31,7 @@ async def test_form(hass: HomeAssistant) -> None:
 
     with (
         patch(
-            "homeassistant.components.smhi.config_flow.Smhi.async_get_forecast",
+            "homeassistant.components.smhi.config_flow.SMHIPointForecast.async_get_daily_forecast",
             return_value={"test": "something", "test2": "something else"},
         ),
         patch(
@@ -66,7 +66,7 @@ async def test_form(hass: HomeAssistant) -> None:
     )
     with (
         patch(
-            "homeassistant.components.smhi.config_flow.Smhi.async_get_forecast",
+            "homeassistant.components.smhi.config_flow.SMHIPointForecast.async_get_daily_forecast",
             return_value={"test": "something", "test2": "something else"},
         ),
         patch(
@@ -102,7 +102,7 @@ async def test_form_invalid_coordinates(hass: HomeAssistant) -> None:
     )
 
     with patch(
-        "homeassistant.components.smhi.config_flow.Smhi.async_get_forecast",
+        "homeassistant.components.smhi.config_flow.SMHIPointForecast.async_get_daily_forecast",
         side_effect=SmhiForecastException,
     ):
         result2 = await hass.config_entries.flow.async_configure(
@@ -122,7 +122,7 @@ async def test_form_invalid_coordinates(hass: HomeAssistant) -> None:
     # Continue flow with new coordinates
     with (
         patch(
-            "homeassistant.components.smhi.config_flow.Smhi.async_get_forecast",
+            "homeassistant.components.smhi.config_flow.SMHIPointForecast.async_get_daily_forecast",
             return_value={"test": "something", "test2": "something else"},
         ),
         patch(
@@ -170,7 +170,7 @@ async def test_form_unique_id_exist(hass: HomeAssistant) -> None:
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
     with patch(
-        "homeassistant.components.smhi.config_flow.Smhi.async_get_forecast",
+        "homeassistant.components.smhi.config_flow.SMHIPointForecast.async_get_daily_forecast",
         return_value={"test": "something", "test2": "something else"},
     ):
         result2 = await hass.config_entries.flow.async_configure(
@@ -218,7 +218,7 @@ async def test_reconfigure_flow(
     assert result["type"] is FlowResultType.FORM
 
     with patch(
-        "homeassistant.components.smhi.config_flow.Smhi.async_get_forecast",
+        "homeassistant.components.smhi.config_flow.SMHIPointForecast.async_get_daily_forecast",
         side_effect=SmhiForecastException,
     ):
         result = await hass.config_entries.flow.async_configure(
@@ -237,7 +237,7 @@ async def test_reconfigure_flow(
 
     with (
         patch(
-            "homeassistant.components.smhi.config_flow.Smhi.async_get_forecast",
+            "homeassistant.components.smhi.config_flow.SMHIPointForecast.async_get_daily_forecast",
             return_value={"test": "something", "test2": "something else"},
         ),
         patch(
diff --git a/tests/components/smhi/test_init.py b/tests/components/smhi/test_init.py
index d00742d4900..f301e684e3e 100644
--- a/tests/components/smhi/test_init.py
+++ b/tests/components/smhi/test_init.py
@@ -1,6 +1,6 @@
 """Test SMHI component setup process."""
 
-from smhi.smhi_lib import APIURL_TEMPLATE
+from pysmhi.const import API_POINT_FORECAST
 
 from homeassistant.components.smhi.const import DOMAIN
 from homeassistant.config_entries import ConfigEntryState
@@ -17,7 +17,7 @@ async def test_setup_entry(
     hass: HomeAssistant, aioclient_mock: AiohttpClientMocker, api_response: str
 ) -> None:
     """Test setup entry."""
-    uri = APIURL_TEMPLATE.format(
+    uri = API_POINT_FORECAST.format(
         TEST_CONFIG["location"]["longitude"], TEST_CONFIG["location"]["latitude"]
     )
     aioclient_mock.get(uri, text=api_response)
@@ -35,7 +35,7 @@ async def test_remove_entry(
     hass: HomeAssistant, aioclient_mock: AiohttpClientMocker, api_response: str
 ) -> None:
     """Test remove entry."""
-    uri = APIURL_TEMPLATE.format(
+    uri = API_POINT_FORECAST.format(
         TEST_CONFIG["location"]["longitude"], TEST_CONFIG["location"]["latitude"]
     )
     aioclient_mock.get(uri, text=api_response)
@@ -62,7 +62,7 @@ async def test_migrate_entry(
     api_response: str,
 ) -> None:
     """Test migrate entry data."""
-    uri = APIURL_TEMPLATE.format(
+    uri = API_POINT_FORECAST.format(
         TEST_CONFIG_MIGRATE["longitude"], TEST_CONFIG_MIGRATE["latitude"]
     )
     aioclient_mock.get(uri, text=api_response)
@@ -97,7 +97,7 @@ async def test_migrate_from_future_version(
     hass: HomeAssistant, aioclient_mock: AiohttpClientMocker, api_response: str
 ) -> None:
     """Test migrate entry not possible from future version."""
-    uri = APIURL_TEMPLATE.format(
+    uri = API_POINT_FORECAST.format(
         TEST_CONFIG_MIGRATE["longitude"], TEST_CONFIG_MIGRATE["latitude"]
     )
     aioclient_mock.get(uri, text=api_response)
diff --git a/tests/components/smhi/test_weather.py b/tests/components/smhi/test_weather.py
index cc6902710bd..a09a9689d52 100644
--- a/tests/components/smhi/test_weather.py
+++ b/tests/components/smhi/test_weather.py
@@ -4,28 +4,27 @@ from datetime import datetime, timedelta
 from unittest.mock import patch
 
 from freezegun import freeze_time
+from freezegun.api import FrozenDateTimeFactory
+from pysmhi import SMHIForecast, SmhiForecastException
+from pysmhi.const import API_POINT_FORECAST
 import pytest
-from smhi.smhi_lib import APIURL_TEMPLATE, SmhiForecast, SmhiForecastException
 from syrupy.assertion import SnapshotAssertion
 
-from homeassistant.components.smhi.const import ATTR_SMHI_THUNDER_PROBABILITY
-from homeassistant.components.smhi.weather import CONDITION_CLASSES, RETRY_TIMEOUT
+from homeassistant.components.smhi.weather import CONDITION_CLASSES
 from homeassistant.components.weather import (
     ATTR_CONDITION_CLEAR_NIGHT,
     ATTR_FORECAST_CONDITION,
-    ATTR_WEATHER_CLOUD_COVERAGE,
-    ATTR_WEATHER_HUMIDITY,
-    ATTR_WEATHER_PRESSURE,
-    ATTR_WEATHER_TEMPERATURE,
-    ATTR_WEATHER_VISIBILITY,
-    ATTR_WEATHER_WIND_BEARING,
     ATTR_WEATHER_WIND_GUST_SPEED,
-    ATTR_WEATHER_WIND_SPEED,
     ATTR_WEATHER_WIND_SPEED_UNIT,
     DOMAIN as WEATHER_DOMAIN,
     SERVICE_GET_FORECASTS,
 )
-from homeassistant.const import ATTR_ATTRIBUTION, STATE_UNKNOWN, UnitOfSpeed
+from homeassistant.const import (
+    ATTR_ATTRIBUTION,
+    STATE_UNAVAILABLE,
+    STATE_UNKNOWN,
+    UnitOfSpeed,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.util import dt as dt_util
@@ -44,7 +43,7 @@ async def test_setup_hass(
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test for successfully setting up the smhi integration."""
-    uri = APIURL_TEMPLATE.format(
+    uri = API_POINT_FORECAST.format(
         TEST_CONFIG["location"]["longitude"], TEST_CONFIG["location"]["latitude"]
     )
     aioclient_mock.get(uri, text=api_response)
@@ -54,7 +53,7 @@ async def test_setup_hass(
 
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
-    assert aioclient_mock.call_count == 2
+    assert aioclient_mock.call_count == 1
 
     #  Testing the actual entity state for
     #  deeper testing than normal unity test
@@ -75,7 +74,7 @@ async def test_clear_night(
     """Test for successfully setting up the smhi integration."""
     hass.config.latitude = "59.32624"
     hass.config.longitude = "17.84197"
-    uri = APIURL_TEMPLATE.format(
+    uri = API_POINT_FORECAST.format(
         TEST_CONFIG["location"]["longitude"], TEST_CONFIG["location"]["latitude"]
     )
     aioclient_mock.get(uri, text=api_response_night)
@@ -85,7 +84,7 @@ async def test_clear_night(
 
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
-    assert aioclient_mock.call_count == 2
+    assert aioclient_mock.call_count == 1
 
     state = hass.states.get(ENTITY_ID)
 
@@ -103,92 +102,113 @@ async def test_clear_night(
     assert response == snapshot(name="clear-night_forecast")
 
 
-async def test_properties_no_data(hass: HomeAssistant) -> None:
+async def test_properties_no_data(
+    hass: HomeAssistant,
+    aioclient_mock: AiohttpClientMocker,
+    api_response: str,
+    freezer: FrozenDateTimeFactory,
+) -> None:
     """Test properties when no API data available."""
+    uri = API_POINT_FORECAST.format(
+        TEST_CONFIG["location"]["longitude"], TEST_CONFIG["location"]["latitude"]
+    )
+    aioclient_mock.get(uri, text=api_response)
+
     entry = MockConfigEntry(domain="smhi", title="test", data=TEST_CONFIG, version=3)
     entry.add_to_hass(hass)
 
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
     with patch(
-        "homeassistant.components.smhi.weather.Smhi.async_get_forecast",
+        "homeassistant.components.smhi.coordinator.SMHIPointForecast.async_get_daily_forecast",
         side_effect=SmhiForecastException("boom"),
     ):
-        await hass.config_entries.async_setup(entry.entry_id)
+        freezer.tick(timedelta(minutes=35))
+        async_fire_time_changed(hass)
         await hass.async_block_till_done()
 
     state = hass.states.get(ENTITY_ID)
 
     assert state
     assert state.name == "test"
-    assert state.state == STATE_UNKNOWN
+    assert state.state == STATE_UNAVAILABLE
     assert state.attributes[ATTR_ATTRIBUTION] == "Swedish weather institute (SMHI)"
-    assert ATTR_WEATHER_HUMIDITY not in state.attributes
-    assert ATTR_WEATHER_PRESSURE not in state.attributes
-    assert ATTR_WEATHER_TEMPERATURE not in state.attributes
-    assert ATTR_WEATHER_VISIBILITY not in state.attributes
-    assert ATTR_WEATHER_WIND_SPEED not in state.attributes
-    assert ATTR_WEATHER_WIND_BEARING not in state.attributes
-    assert ATTR_WEATHER_CLOUD_COVERAGE not in state.attributes
-    assert ATTR_SMHI_THUNDER_PROBABILITY not in state.attributes
-    assert ATTR_WEATHER_WIND_GUST_SPEED not in state.attributes
 
 
 async def test_properties_unknown_symbol(hass: HomeAssistant) -> None:
     """Test behaviour when unknown symbol from API."""
-    data = SmhiForecast(
-        temperature=5,
-        temperature_max=10,
-        temperature_min=0,
-        humidity=5,
-        pressure=1008,
-        thunder=0,
-        cloudiness=52,
-        precipitation=1,
-        wind_direction=180,
-        wind_speed=10,
-        horizontal_visibility=6,
-        wind_gust=1.5,
-        mean_precipitation=0.5,
-        total_precipitation=1,
+    data = SMHIForecast(
+        frozen_precipitation=0,
+        high_cloud=100,
+        humidity=96,
+        low_cloud=100,
+        max_precipitation=0.0,
+        mean_precipitation=0.0,
+        median_precipitation=0.0,
+        medium_cloud=75,
+        min_precipitation=0.0,
+        precipitation_category=0,
+        pressure=1018.9,
         symbol=100,  # Faulty symbol
-        valid_time=datetime(2018, 1, 1, 0, 1, 2),
+        temperature=1.0,
+        temperature_max=1.0,
+        temperature_min=1.0,
+        thunder=0,
+        total_cloud=100,
+        valid_time=datetime(2018, 1, 1, 0, 0, 0),
+        visibility=8.8,
+        wind_direction=114,
+        wind_gust=5.8,
+        wind_speed=2.5,
     )
-
-    data2 = SmhiForecast(
-        temperature=5,
-        temperature_max=10,
-        temperature_min=0,
-        humidity=5,
-        pressure=1008,
-        thunder=0,
-        cloudiness=52,
-        precipitation=1,
-        wind_direction=180,
-        wind_speed=10,
-        horizontal_visibility=6,
-        wind_gust=1.5,
-        mean_precipitation=0.5,
-        total_precipitation=1,
+    data2 = SMHIForecast(
+        frozen_precipitation=0,
+        high_cloud=100,
+        humidity=96,
+        low_cloud=100,
+        max_precipitation=0.0,
+        mean_precipitation=0.0,
+        median_precipitation=0.0,
+        medium_cloud=75,
+        min_precipitation=0.0,
+        precipitation_category=0,
+        pressure=1018.9,
         symbol=100,  # Faulty symbol
-        valid_time=datetime(2018, 1, 1, 12, 1, 2),
+        temperature=1.0,
+        temperature_max=1.0,
+        temperature_min=1.0,
+        thunder=0,
+        total_cloud=100,
+        valid_time=datetime(2018, 1, 1, 12, 0, 0),
+        visibility=8.8,
+        wind_direction=114,
+        wind_gust=5.8,
+        wind_speed=2.5,
     )
-
-    data3 = SmhiForecast(
-        temperature=5,
-        temperature_max=10,
-        temperature_min=0,
-        humidity=5,
-        pressure=1008,
-        thunder=0,
-        cloudiness=52,
-        precipitation=1,
-        wind_direction=180,
-        wind_speed=10,
-        horizontal_visibility=6,
-        wind_gust=1.5,
-        mean_precipitation=0.5,
-        total_precipitation=1,
+    data3 = SMHIForecast(
+        frozen_precipitation=0,
+        high_cloud=100,
+        humidity=96,
+        low_cloud=100,
+        max_precipitation=0.0,
+        mean_precipitation=0.0,
+        median_precipitation=0.0,
+        medium_cloud=75,
+        min_precipitation=0.0,
+        precipitation_category=0,
+        pressure=1018.9,
         symbol=100,  # Faulty symbol
-        valid_time=datetime(2018, 1, 2, 12, 1, 2),
+        temperature=1.0,
+        temperature_max=1.0,
+        temperature_min=1.0,
+        thunder=0,
+        total_cloud=100,
+        valid_time=datetime(2018, 1, 2, 0, 0, 0),
+        visibility=8.8,
+        wind_direction=114,
+        wind_gust=5.8,
+        wind_speed=2.5,
     )
 
     testdata = [data, data2, data3]
@@ -198,11 +218,11 @@ async def test_properties_unknown_symbol(hass: HomeAssistant) -> None:
 
     with (
         patch(
-            "homeassistant.components.smhi.weather.Smhi.async_get_forecast",
+            "homeassistant.components.smhi.coordinator.SMHIPointForecast.async_get_daily_forecast",
             return_value=testdata,
         ),
         patch(
-            "homeassistant.components.smhi.weather.Smhi.async_get_forecast_hour",
+            "homeassistant.components.smhi.coordinator.SMHIPointForecast.async_get_hourly_forecast",
             return_value=None,
         ),
     ):
@@ -229,55 +249,48 @@ async def test_properties_unknown_symbol(hass: HomeAssistant) -> None:
 
 @pytest.mark.parametrize("error", [SmhiForecastException(), TimeoutError()])
 async def test_refresh_weather_forecast_retry(
-    hass: HomeAssistant, error: Exception
+    hass: HomeAssistant,
+    error: Exception,
+    aioclient_mock: AiohttpClientMocker,
+    api_response: str,
+    freezer: FrozenDateTimeFactory,
 ) -> None:
     """Test the refresh weather forecast function."""
+    uri = API_POINT_FORECAST.format(
+        TEST_CONFIG["location"]["longitude"], TEST_CONFIG["location"]["latitude"]
+    )
+    aioclient_mock.get(uri, text=api_response)
+
     entry = MockConfigEntry(domain="smhi", title="test", data=TEST_CONFIG, version=3)
     entry.add_to_hass(hass)
-    now = dt_util.utcnow()
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
 
     with patch(
-        "homeassistant.components.smhi.weather.Smhi.async_get_forecast",
+        "homeassistant.components.smhi.coordinator.SMHIPointForecast.async_get_daily_forecast",
         side_effect=error,
     ) as mock_get_forecast:
-        await hass.config_entries.async_setup(entry.entry_id)
+        freezer.tick(timedelta(minutes=35))
+        async_fire_time_changed(hass)
         await hass.async_block_till_done()
 
         state = hass.states.get(ENTITY_ID)
 
         assert state
         assert state.name == "test"
-        assert state.state == STATE_UNKNOWN
+        assert state.state == STATE_UNAVAILABLE
         assert mock_get_forecast.call_count == 1
 
-        future = now + timedelta(seconds=RETRY_TIMEOUT + 1)
-        async_fire_time_changed(hass, future)
+        freezer.tick(timedelta(minutes=35))
+        async_fire_time_changed(hass)
         await hass.async_block_till_done()
 
         state = hass.states.get(ENTITY_ID)
         assert state
-        assert state.state == STATE_UNKNOWN
+        assert state.state == STATE_UNAVAILABLE
         assert mock_get_forecast.call_count == 2
 
-        future = future + timedelta(seconds=RETRY_TIMEOUT + 1)
-        async_fire_time_changed(hass, future)
-        await hass.async_block_till_done()
-
-        state = hass.states.get(ENTITY_ID)
-        assert state
-        assert state.state == STATE_UNKNOWN
-        assert mock_get_forecast.call_count == 3
-
-        future = future + timedelta(seconds=RETRY_TIMEOUT + 1)
-        async_fire_time_changed(hass, future)
-        await hass.async_block_till_done()
-
-        state = hass.states.get(ENTITY_ID)
-        assert state
-        assert state.state == STATE_UNKNOWN
-        # after three failed retries we stop retrying and go back to normal interval
-        assert mock_get_forecast.call_count == 3
-
 
 def test_condition_class() -> None:
     """Test condition class."""
@@ -352,7 +365,7 @@ async def test_custom_speed_unit(
     api_response: str,
 ) -> None:
     """Test Wind Gust speed with custom unit."""
-    uri = APIURL_TEMPLATE.format(
+    uri = API_POINT_FORECAST.format(
         TEST_CONFIG["location"]["longitude"], TEST_CONFIG["location"]["latitude"]
     )
     aioclient_mock.get(uri, text=api_response)
@@ -389,7 +402,7 @@ async def test_forecast_services(
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test multiple forecast."""
-    uri = APIURL_TEMPLATE.format(
+    uri = API_POINT_FORECAST.format(
         TEST_CONFIG["location"]["longitude"], TEST_CONFIG["location"]["latitude"]
     )
     aioclient_mock.get(uri, text=api_response)
@@ -440,7 +453,7 @@ async def test_forecast_services(
     assert msg["type"] == "event"
     forecast1 = msg["event"]["forecast"]
 
-    assert len(forecast1) == 72
+    assert len(forecast1) == 52
     assert forecast1[0] == snapshot
     assert forecast1[6] == snapshot
 
@@ -453,7 +466,7 @@ async def test_forecast_services_lack_of_data(
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test forecast lacking data."""
-    uri = APIURL_TEMPLATE.format(
+    uri = API_POINT_FORECAST.format(
         TEST_CONFIG["location"]["longitude"], TEST_CONFIG["location"]["latitude"]
     )
     aioclient_mock.get(uri, text=api_response_lack_data)
@@ -498,7 +511,7 @@ async def test_forecast_service(
     service: str,
 ) -> None:
     """Test forecast service."""
-    uri = APIURL_TEMPLATE.format(
+    uri = API_POINT_FORECAST.format(
         TEST_CONFIG["location"]["longitude"], TEST_CONFIG["location"]["latitude"]
     )
     aioclient_mock.get(uri, text=api_response)
diff --git a/tests/components/smlight/conftest.py b/tests/components/smlight/conftest.py
index 665a55ba880..7a1b16f1d6b 100644
--- a/tests/components/smlight/conftest.py
+++ b/tests/components/smlight/conftest.py
@@ -3,6 +3,7 @@
 from collections.abc import AsyncGenerator, Generator
 from unittest.mock import AsyncMock, MagicMock, patch
 
+from pysmlight.exceptions import SmlightAuthError
 from pysmlight.sse import sseClient
 from pysmlight.web import CmdWrapper, Firmware, Info, Sensors
 import pytest
@@ -18,7 +19,8 @@ from tests.common import (
     load_json_object_fixture,
 )
 
-MOCK_HOST = "slzb-06.local"
+MOCK_DEVICE_NAME = "slzb-06"
+MOCK_HOST = "192.168.1.161"
 MOCK_USERNAME = "test-user"
 MOCK_PASSWORD = "test-pass"
 
@@ -80,9 +82,16 @@ def mock_smlight_client(request: pytest.FixtureRequest) -> Generator[MagicMock]:
     ):
         api = smlight_mock.return_value
         api.host = MOCK_HOST
-        api.get_info.return_value = Info.from_dict(
-            load_json_object_fixture("info.json", DOMAIN)
-        )
+
+        def get_info_side_effect(*args, **kwargs) -> Info:
+            """Return the info."""
+            if api.check_auth_needed.return_value and not api.authenticate.called:
+                raise SmlightAuthError
+
+            return Info.from_dict(load_json_object_fixture("info.json", DOMAIN))
+
+        api.get_info.side_effect = get_info_side_effect
+
         api.get_sensors.return_value = Sensors.from_dict(
             load_json_object_fixture("sensors.json", DOMAIN)
         )
@@ -91,7 +100,10 @@ def mock_smlight_client(request: pytest.FixtureRequest) -> Generator[MagicMock]:
             """Return the firmware version."""
             fw_list = []
             if kwargs.get("mode") == "zigbee":
-                fw_list = load_json_array_fixture("zb_firmware.json", DOMAIN)
+                if kwargs.get("zb_type") == 0:
+                    fw_list = load_json_array_fixture("zb_firmware.json", DOMAIN)
+                else:
+                    fw_list = load_json_array_fixture("zb_firmware_router.json", DOMAIN)
             else:
                 fw_list = load_json_array_fixture("esp_firmware.json", DOMAIN)
 
diff --git a/tests/components/smlight/fixtures/esp_firmware.json b/tests/components/smlight/fixtures/esp_firmware.json
index 6ea0e1a8b44..f0ee9eb989a 100644
--- a/tests/components/smlight/fixtures/esp_firmware.json
+++ b/tests/components/smlight/fixtures/esp_firmware.json
@@ -2,10 +2,10 @@
   {
     "mode": "ESP",
     "type": null,
-    "notes": "CHANGELOG (Current 2.5.2 vs. Previous 2.3.6):\\r\\nFixed incorrect device type detection for some devices\\r\\nFixed web interface not working on some devices\\r\\nFixed disabled SSID/pass fields\\r\\n",
+    "notes": "CHANGELOG (Current 2.7.5 vs. Previous 2.3.6):\\r\\nFixed incorrect device type detection for some devices\\r\\nFixed web interface not working on some devices\\r\\nFixed disabled SSID/pass fields\\r\\n",
     "rev": "20240830",
     "link": "https://smlight.tech/flasher/firmware/bin/slzb06x/core/slzb-06-v2.5.2-ota.bin",
-    "ver": "v2.5.2",
+    "ver": "v2.7.5",
     "dev": false,
     "prod": true,
     "baud": null
diff --git a/tests/components/smlight/fixtures/info-2.3.6.json b/tests/components/smlight/fixtures/info-2.3.6.json
new file mode 100644
index 00000000000..e3defb4410e
--- /dev/null
+++ b/tests/components/smlight/fixtures/info-2.3.6.json
@@ -0,0 +1,19 @@
+{
+  "coord_mode": 0,
+  "device_ip": "192.168.1.161",
+  "fs_total": 3456,
+  "fw_channel": "dev",
+  "legacy_api": 0,
+  "hostname": "SLZB-06p7",
+  "MAC": "AA:BB:CC:DD:EE:FF",
+  "model": "SLZB-06p7",
+  "ram_total": 296,
+  "sw_version": "v2.3.6",
+  "wifi_mode": 0,
+  "zb_flash_size": 704,
+  "zb_channel": 0,
+  "zb_hw": "CC2652P7",
+  "zb_ram_size": 152,
+  "zb_version": "20240314",
+  "zb_type": 0
+}
diff --git a/tests/components/smlight/fixtures/info-MR1.json b/tests/components/smlight/fixtures/info-MR1.json
new file mode 100644
index 00000000000..df1c0b0f789
--- /dev/null
+++ b/tests/components/smlight/fixtures/info-MR1.json
@@ -0,0 +1,41 @@
+{
+  "coord_mode": 0,
+  "device_ip": "192.168.1.161",
+  "fs_total": 3456,
+  "fw_channel": "dev",
+  "legacy_api": 0,
+  "hostname": "SLZB-MR1",
+  "MAC": "AA:BB:CC:DD:EE:FF",
+  "model": "SLZB-MR1",
+  "ram_total": 296,
+  "sw_version": "v2.7.3",
+  "wifi_mode": 0,
+  "zb_flash_size": 704,
+  "zb_channel": 0,
+  "zb_hw": "CC2652P7",
+  "zb_ram_size": 152,
+  "zb_version": "20240314",
+  "zb_type": 0,
+  "radios": [
+    {
+      "chip_index": 0,
+      "zb_hw": "EFR32MG21",
+      "zb_version": 20241127,
+      "zb_type": 0,
+      "zb_channel": 0,
+      "zb_ram_size": 152,
+      "zb_flash_size": 704,
+      "radioModes": [true, true, true, false, false]
+    },
+    {
+      "chip_index": 1,
+      "zb_hw": "CC2652P7",
+      "zb_version": 20240314,
+      "zb_type": 1,
+      "zb_channel": 0,
+      "zb_ram_size": 152,
+      "zb_flash_size": 704,
+      "radioModes": [true, true, true, false, false]
+    }
+  ]
+}
diff --git a/tests/components/smlight/fixtures/info.json b/tests/components/smlight/fixtures/info.json
index e3defb4410e..b94fdc3d61c 100644
--- a/tests/components/smlight/fixtures/info.json
+++ b/tests/components/smlight/fixtures/info.json
@@ -15,5 +15,17 @@
   "zb_hw": "CC2652P7",
   "zb_ram_size": 152,
   "zb_version": "20240314",
-  "zb_type": 0
+  "zb_type": 0,
+  "radios": [
+    {
+      "chip_index": 0,
+      "zb_hw": "CC2652P7",
+      "zb_version": "20240314",
+      "zb_type": 0,
+      "zb_channel": 0,
+      "zb_ram_size": 152,
+      "zb_flash_size": 704,
+      "radioModes": [true, true, true, false, false]
+    }
+  ]
 }
diff --git a/tests/components/smlight/fixtures/zb_firmware.json b/tests/components/smlight/fixtures/zb_firmware.json
index ca9d10f87ac..b35bb20d64e 100644
--- a/tests/components/smlight/fixtures/zb_firmware.json
+++ b/tests/components/smlight/fixtures/zb_firmware.json
@@ -3,24 +3,13 @@
     "mode": "ZB",
     "type": 0,
     "notes": "<b>SMLIGHT latest Coordinator release for CC2674P10 chips [16-Jul-2024]</b>:<br>- +20dB TRANSMIT POWER SUPPORT;<br>- SDK 7.41 based (latest);<br>",
-    "rev": "20240716",
+    "rev": "20250201",
     "link": "https://smlight.tech/flasher/firmware/bin/slzb06x/zigbee/slzb06p10/znp-SLZB-06P10-20240716.bin",
-    "ver": "20240716",
+    "ver": "20250201",
     "dev": false,
     "prod": true,
     "baud": 115200
   },
-  {
-    "mode": "ZB",
-    "type": 1,
-    "notes": "<b>SMLIGHT latest ROUTER release for CC2674P10 chips [16-Jul-2024]</b>:<br>- SDK 7.41 based (latest);<br><a href='https://smlight.tech/legal/licenses/restrictive-smlight-slzb06-v20240328.txt' target='_blank' aria-current='true'><span>Terms of use</span></a><span>",
-    "rev": "20240716",
-    "link": "https://smlight.tech/flasher/firmware/bin/slzb06x/zigbee/slzb06p10/zr-ZR_SLZB-06P10-20240716.bin",
-    "ver": "20240716",
-    "dev": false,
-    "prod": true,
-    "baud": 0
-  },
   {
     "mode": "ZB",
     "type": 0,
diff --git a/tests/components/smlight/fixtures/zb_firmware_router.json b/tests/components/smlight/fixtures/zb_firmware_router.json
new file mode 100644
index 00000000000..320fef89347
--- /dev/null
+++ b/tests/components/smlight/fixtures/zb_firmware_router.json
@@ -0,0 +1,13 @@
+[
+  {
+    "mode": "ZB",
+    "type": 1,
+    "notes": "<b>SMLIGHT latest ROUTER release for CC2652P7 chips [16-Jul-2024]</b>:<br>- SDK 7.41 based (latest);<br><a href='https://smlight.tech/legal/licenses/restrictive-smlight-slzb06-v20240328.txt' target='_blank' aria-current='true'><span>Terms of use</span></a><span> - by downloading and installing this firmware, you agree to the aforementioned terms.",
+    "rev": "20240716",
+    "link": "https://smlight.tech/flasher/firmware/bin/slzb06x/zigbee/slzb06p10/znp-SLZB-06P10-20240716.bin",
+    "ver": "20240716",
+    "dev": false,
+    "prod": true,
+    "baud": 115200
+  }
+]
diff --git a/tests/components/smlight/snapshots/test_binary_sensor.ambr b/tests/components/smlight/snapshots/test_binary_sensor.ambr
index 8becf5b2567..edb2a914a5d 100644
--- a/tests/components/smlight/snapshots/test_binary_sensor.ambr
+++ b/tests/components/smlight/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/smlight/snapshots/test_diagnostics.ambr b/tests/components/smlight/snapshots/test_diagnostics.ambr
index 97177de1704..5ee6cd19676 100644
--- a/tests/components/smlight/snapshots/test_diagnostics.ambr
+++ b/tests/components/smlight/snapshots/test_diagnostics.ambr
@@ -10,6 +10,24 @@
       'hostname': 'SLZB-06p7',
       'legacy_api': 0,
       'model': 'SLZB-06p7',
+      'radios': list([
+        dict({
+          'chip_index': 0,
+          'radioModes': list([
+            True,
+            True,
+            True,
+            False,
+            False,
+          ]),
+          'zb_channel': 0,
+          'zb_flash_size': 704,
+          'zb_hw': 'CC2652P7',
+          'zb_ram_size': 152,
+          'zb_type': 0,
+          'zb_version': '20240314',
+        }),
+      ]),
       'ram_total': 296,
       'sw_version': 'v2.3.6',
       'wifi_mode': 0,
diff --git a/tests/components/smlight/snapshots/test_init.ambr b/tests/components/smlight/snapshots/test_init.ambr
index 598166e537b..ba374199254 100644
--- a/tests/components/smlight/snapshots/test_init.ambr
+++ b/tests/components/smlight/snapshots/test_init.ambr
@@ -3,7 +3,8 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
-    'configuration_url': 'http://slzb-06.local',
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'http://192.168.1.161',
     'connections': set({
       tuple(
         'mac',
diff --git a/tests/components/smlight/snapshots/test_sensor.ambr b/tests/components/smlight/snapshots/test_sensor.ambr
index 262ecfe1544..542338e4dbf 100644
--- a/tests/components/smlight/snapshots/test_sensor.ambr
+++ b/tests/components/smlight/snapshots/test_sensor.ambr
@@ -12,6 +12,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -66,6 +67,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -118,6 +120,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -165,6 +168,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -218,6 +222,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -269,6 +274,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -319,6 +325,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -377,6 +384,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -429,6 +437,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/smlight/snapshots/test_switch.ambr b/tests/components/smlight/snapshots/test_switch.ambr
index 733d002be0f..b748202a557 100644
--- a/tests/components/smlight/snapshots/test_switch.ambr
+++ b/tests/components/smlight/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/smlight/snapshots/test_update.ambr b/tests/components/smlight/snapshots/test_update.ambr
index ed0085dcdc8..dc6b8f46ca5 100644
--- a/tests/components/smlight/snapshots/test_update.ambr
+++ b/tests/components/smlight/snapshots/test_update.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -42,7 +43,7 @@
       'friendly_name': 'Mock Title Core firmware',
       'in_progress': False,
       'installed_version': 'v2.3.6',
-      'latest_version': 'v2.5.2',
+      'latest_version': 'v2.7.5',
       'release_summary': None,
       'release_url': None,
       'skipped_version': None,
@@ -65,6 +66,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -101,7 +103,7 @@
       'friendly_name': 'Mock Title Zigbee firmware',
       'in_progress': False,
       'installed_version': '20240314',
-      'latest_version': '20240716',
+      'latest_version': '20250201',
       'release_summary': None,
       'release_url': None,
       'skipped_version': None,
diff --git a/tests/components/smlight/test_button.py b/tests/components/smlight/test_button.py
index 3721ee815e6..51e9414c00e 100644
--- a/tests/components/smlight/test_button.py
+++ b/tests/components/smlight/test_button.py
@@ -45,6 +45,7 @@ async def test_buttons(
     mock_smlight_client: MagicMock,
 ) -> None:
     """Test creation of button entities."""
+    mock_smlight_client.get_info.side_effect = None
     mock_smlight_client.get_info.return_value = MOCK_ROUTER
     await setup_integration(hass, mock_config_entry)
 
@@ -78,6 +79,7 @@ async def test_disabled_by_default_buttons(
     mock_smlight_client: MagicMock,
 ) -> None:
     """Test the disabled by default buttons."""
+    mock_smlight_client.get_info.side_effect = None
     mock_smlight_client.get_info.return_value = MOCK_ROUTER
     await setup_integration(hass, mock_config_entry)
 
@@ -96,7 +98,8 @@ async def test_remove_router_reconnect(
     mock_smlight_client: MagicMock,
 ) -> None:
     """Test removal of orphaned router reconnect button."""
-    save_mock = mock_smlight_client.get_info.return_value
+    save_mock = mock_smlight_client.get_info.side_effect
+    mock_smlight_client.get_info.side_effect = None
     mock_smlight_client.get_info.return_value = MOCK_ROUTER
     mock_config_entry = await setup_integration(hass, mock_config_entry)
 
@@ -106,7 +109,7 @@ async def test_remove_router_reconnect(
     assert len(entities) == 4
     assert entities[3].unique_id == "aa:bb:cc:dd:ee:ff-reconnect_zigbee_router"
 
-    mock_smlight_client.get_info.return_value = save_mock
+    mock_smlight_client.get_info.side_effect = save_mock
 
     freezer.tick(SCAN_INTERVAL)
     async_fire_time_changed(hass)
diff --git a/tests/components/smlight/test_config_flow.py b/tests/components/smlight/test_config_flow.py
index c4aea195aa7..4ecfe9366e3 100644
--- a/tests/components/smlight/test_config_flow.py
+++ b/tests/components/smlight/test_config_flow.py
@@ -8,19 +8,20 @@ from pysmlight.exceptions import SmlightAuthError, SmlightConnectionError
 import pytest
 
 from homeassistant.components.smlight.const import DOMAIN
-from homeassistant.config_entries import SOURCE_USER, SOURCE_ZEROCONF
+from homeassistant.config_entries import SOURCE_DHCP, SOURCE_USER, SOURCE_ZEROCONF
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
-from .conftest import MOCK_HOST, MOCK_PASSWORD, MOCK_USERNAME
+from .conftest import MOCK_DEVICE_NAME, MOCK_HOST, MOCK_PASSWORD, MOCK_USERNAME
 
 from tests.common import MockConfigEntry
 
 DISCOVERY_INFO = ZeroconfServiceInfo(
-    ip_address=ip_address("127.0.0.1"),
-    ip_addresses=[ip_address("127.0.0.1")],
+    ip_address=ip_address("192.168.1.161"),
+    ip_addresses=[ip_address("192.168.1.161")],
     hostname="slzb-06.local.",
     name="mock_name",
     port=6638,
@@ -29,8 +30,8 @@ DISCOVERY_INFO = ZeroconfServiceInfo(
 )
 
 DISCOVERY_INFO_LEGACY = ZeroconfServiceInfo(
-    ip_address=ip_address("127.0.0.1"),
-    ip_addresses=[ip_address("127.0.0.1")],
+    ip_address=ip_address("192.168.1.161"),
+    ip_addresses=[ip_address("192.168.1.161")],
     hostname="slzb-06.local.",
     name="mock_name",
     port=6638,
@@ -52,7 +53,7 @@ async def test_user_flow(hass: HomeAssistant, mock_setup_entry: AsyncMock) -> No
     result2 = await hass.config_entries.flow.async_configure(
         result["flow_id"],
         {
-            CONF_HOST: MOCK_HOST,
+            CONF_HOST: "slzb-06p7.local",
         },
     )
 
@@ -65,6 +66,46 @@ async def test_user_flow(hass: HomeAssistant, mock_setup_entry: AsyncMock) -> No
     assert len(mock_setup_entry.mock_calls) == 1
 
 
+async def test_user_flow_auth(
+    hass: HomeAssistant, mock_smlight_client: MagicMock, mock_setup_entry: AsyncMock
+) -> None:
+    """Test the full manual user flow with authentication."""
+
+    mock_smlight_client.check_auth_needed.return_value = True
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_HOST: "slzb-06p7.local",
+        },
+    )
+    assert result2["type"] is FlowResultType.FORM
+    assert result2["step_id"] == "auth"
+
+    result3 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_USERNAME: MOCK_USERNAME,
+            CONF_PASSWORD: MOCK_PASSWORD,
+        },
+    )
+    assert result3["type"] is FlowResultType.CREATE_ENTRY
+    assert result3["title"] == "SLZB-06p7"
+    assert result3["data"] == {
+        CONF_USERNAME: MOCK_USERNAME,
+        CONF_PASSWORD: MOCK_PASSWORD,
+        CONF_HOST: MOCK_HOST,
+    }
+    assert result3["context"]["unique_id"] == "aa:bb:cc:dd:ee:ff"
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
 async def test_zeroconf_flow(
     hass: HomeAssistant,
     mock_smlight_client: MagicMock,
@@ -76,7 +117,7 @@ async def test_zeroconf_flow(
         DOMAIN, context={"source": SOURCE_ZEROCONF}, data=DISCOVERY_INFO
     )
 
-    assert result["description_placeholders"] == {"host": MOCK_HOST}
+    assert result["description_placeholders"] == {"host": MOCK_DEVICE_NAME}
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "confirm_discovery"
 
@@ -113,7 +154,7 @@ async def test_zeroconf_flow_auth(
         DOMAIN, context={"source": SOURCE_ZEROCONF}, data=DISCOVERY_INFO
     )
 
-    assert result["description_placeholders"] == {"host": MOCK_HOST}
+    assert result["description_placeholders"] == {"host": MOCK_DEVICE_NAME}
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "confirm_discovery"
 
@@ -144,7 +185,7 @@ async def test_zeroconf_flow_auth(
     assert result3["type"] is FlowResultType.CREATE_ENTRY
     assert result3["context"]["source"] == "zeroconf"
     assert result3["context"]["unique_id"] == "aa:bb:cc:dd:ee:ff"
-    assert result3["title"] == "slzb-06"
+    assert result3["title"] == "SLZB-06p7"
     assert result3["data"] == {
         CONF_USERNAME: MOCK_USERNAME,
         CONF_PASSWORD: MOCK_PASSWORD,
@@ -152,7 +193,7 @@ async def test_zeroconf_flow_auth(
     }
 
     assert len(mock_setup_entry.mock_calls) == 1
-    assert len(mock_smlight_client.get_info.mock_calls) == 3
+    assert len(mock_smlight_client.get_info.mock_calls) == 2
 
 
 async def test_zeroconf_unsupported_abort(
@@ -161,13 +202,14 @@ async def test_zeroconf_unsupported_abort(
     mock_smlight_client: MagicMock,
 ) -> None:
     """Test we abort zeroconf flow if device unsupported."""
+    mock_smlight_client.get_info.side_effect = None
     mock_smlight_client.get_info.return_value = Info(model="SLZB-X")
 
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": SOURCE_ZEROCONF}, data=DISCOVERY_INFO
     )
 
-    assert result["description_placeholders"] == {"host": MOCK_HOST}
+    assert result["description_placeholders"] == {"host": MOCK_DEVICE_NAME}
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "confirm_discovery"
 
@@ -185,6 +227,7 @@ async def test_user_unsupported_abort(
     mock_smlight_client: MagicMock,
 ) -> None:
     """Test we abort user flow if unsupported device."""
+    mock_smlight_client.get_info.side_effect = None
     mock_smlight_client.get_info.return_value = Info(model="SLZB-X")
 
     result = await hass.config_entries.flow.async_init(
@@ -205,15 +248,13 @@ async def test_user_unsupported_abort(
     assert result2["reason"] == "unsupported_device"
 
 
-async def test_user_unsupported_abort_auth(
+async def test_user_unsupported_device_abort_auth(
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,
     mock_smlight_client: MagicMock,
 ) -> None:
     """Test we abort user flow if unsupported device (with auth)."""
     mock_smlight_client.check_auth_needed.return_value = True
-    mock_smlight_client.authenticate.side_effect = SmlightAuthError
-    mock_smlight_client.get_info.side_effect = SmlightAuthError
 
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
@@ -261,6 +302,44 @@ async def test_user_device_exists_abort(
     assert result["reason"] == "already_configured"
 
 
+@pytest.mark.usefixtures("mock_smlight_client")
+async def test_user_flow_can_override_discovery(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_setup_entry: AsyncMock,
+) -> None:
+    """Test manual user flow can override discovery in progress."""
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_ZEROCONF}, data=DISCOVERY_INFO
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "confirm_discovery"
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == SOURCE_USER
+    assert result["errors"] == {}
+
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_HOST: MOCK_HOST,
+        },
+    )
+
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["context"]["source"] == SOURCE_USER
+    assert result2["data"] == {
+        CONF_HOST: MOCK_HOST,
+    }
+    assert result2["context"]["unique_id"] == "aa:bb:cc:dd:ee:ff"
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
 @pytest.mark.usefixtures("mock_smlight_client")
 async def test_zeroconf_device_exists_abort(
     hass: HomeAssistant, mock_config_entry: MockConfigEntry
@@ -327,7 +406,7 @@ async def test_user_invalid_auth(
     }
 
     assert len(mock_setup_entry.mock_calls) == 1
-    assert len(mock_smlight_client.get_info.mock_calls) == 4
+    assert len(mock_smlight_client.get_info.mock_calls) == 2
 
 
 async def test_user_cannot_connect(
@@ -364,7 +443,7 @@ async def test_user_cannot_connect(
     assert result2["title"] == "SLZB-06p7"
 
     assert len(mock_setup_entry.mock_calls) == 1
-    assert len(mock_smlight_client.get_info.mock_calls) == 3
+    assert len(mock_smlight_client.get_info.mock_calls) == 2
 
 
 async def test_auth_cannot_connect(
@@ -451,7 +530,7 @@ async def test_zeroconf_legacy_mac(
         data=DISCOVERY_INFO_LEGACY,
     )
 
-    assert result["description_placeholders"] == {"host": MOCK_HOST}
+    assert result["description_placeholders"] == {"host": MOCK_DEVICE_NAME}
 
     result2 = await hass.config_entries.flow.async_configure(
         result["flow_id"], user_input={}
@@ -469,6 +548,76 @@ async def test_zeroconf_legacy_mac(
     assert len(mock_smlight_client.get_info.mock_calls) == 3
 
 
+@pytest.mark.usefixtures("mock_smlight_client")
+async def test_zeroconf_updates_host(
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test zeroconf discovery updates host ip."""
+    mock_config_entry.add_to_hass(hass)
+
+    service_info = DISCOVERY_INFO
+    service_info.ip_address = ip_address("192.168.1.164")
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_ZEROCONF}, data=service_info
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+
+    assert mock_config_entry.data[CONF_HOST] == "192.168.1.164"
+
+
+@pytest.mark.usefixtures("mock_smlight_client")
+async def test_dhcp_discovery_updates_host(
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test dhcp discovery updates host ip."""
+    mock_config_entry.add_to_hass(hass)
+
+    service_info = DhcpServiceInfo(
+        ip="192.168.1.164",
+        hostname="slzb-06",
+        macaddress="aabbccddeeff",
+    )
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_DHCP}, data=service_info
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+
+    assert mock_config_entry.data[CONF_HOST] == "192.168.1.164"
+
+
+@pytest.mark.usefixtures("mock_smlight_client")
+async def test_dhcp_discovery_aborts(
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test dhcp discovery updates host ip."""
+    mock_config_entry.add_to_hass(hass)
+
+    service_info = DhcpServiceInfo(
+        ip="192.168.1.161",
+        hostname="slzb-06",
+        macaddress="000000000000",
+    )
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_DHCP}, data=service_info
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+
+    assert mock_config_entry.data[CONF_HOST] == "192.168.1.161"
+
+
 async def test_reauth_flow(
     hass: HomeAssistant,
     mock_smlight_client: MagicMock,
diff --git a/tests/components/smlight/test_init.py b/tests/components/smlight/test_init.py
index afc53932fb0..692255a53e6 100644
--- a/tests/components/smlight/test_init.py
+++ b/tests/components/smlight/test_init.py
@@ -8,9 +8,14 @@ from pysmlight.exceptions import SmlightAuthError, SmlightConnectionError, Smlig
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
-from homeassistant.components.smlight.const import DOMAIN, SCAN_INTERVAL
+from homeassistant.components.smlight.const import (
+    DOMAIN,
+    SCAN_FIRMWARE_INTERVAL,
+    SCAN_INTERVAL,
+)
+from homeassistant.components.update import ATTR_INSTALLED_VERSION
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import STATE_UNAVAILABLE
+from homeassistant.const import STATE_ON, STATE_UNAVAILABLE, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.issue_registry import IssueRegistry
@@ -73,6 +78,42 @@ async def test_async_setup_missing_credentials(
     assert progress[0]["context"]["unique_id"] == "aa:bb:cc:dd:ee:ff"
 
 
+async def test_async_setup_no_internet(
+    hass: HomeAssistant,
+    mock_config_entry_host: MockConfigEntry,
+    mock_smlight_client: MagicMock,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test we still load integration when no internet is available."""
+    side_effect = mock_smlight_client.get_firmware_version.side_effect
+    mock_smlight_client.get_firmware_version.side_effect = SmlightConnectionError
+
+    await setup_integration(hass, mock_config_entry_host)
+
+    entity = hass.states.get("update.mock_title_core_firmware")
+    assert entity is not None
+    assert entity.state == STATE_UNKNOWN
+
+    freezer.tick(SCAN_FIRMWARE_INTERVAL)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    entity = hass.states.get("update.mock_title_core_firmware")
+    assert entity is not None
+    assert entity.state == STATE_UNKNOWN
+
+    mock_smlight_client.get_firmware_version.side_effect = side_effect
+
+    freezer.tick(SCAN_FIRMWARE_INTERVAL)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    entity = hass.states.get("update.mock_title_core_firmware")
+    assert entity is not None
+    assert entity.state == STATE_ON
+    assert entity.attributes[ATTR_INSTALLED_VERSION] == "v2.3.6"
+
+
 @pytest.mark.parametrize("error", [SmlightConnectionError, SmlightAuthError])
 async def test_update_failed(
     hass: HomeAssistant,
@@ -124,6 +165,7 @@ async def test_device_legacy_firmware(
     """Test device setup for old firmware version that dont support required API."""
     LEGACY_VERSION = "v0.9.9"
     mock_smlight_client.get_sensors.side_effect = SmlightError
+    mock_smlight_client.get_info.side_effect = None
     mock_smlight_client.get_info.return_value = Info(
         legacy_api=2, sw_version=LEGACY_VERSION, MAC="AA:BB:CC:DD:EE:FF"
     )
diff --git a/tests/components/smlight/test_sensor.py b/tests/components/smlight/test_sensor.py
index f130d7ccf30..bec73bc514a 100644
--- a/tests/components/smlight/test_sensor.py
+++ b/tests/components/smlight/test_sensor.py
@@ -2,17 +2,18 @@
 
 from unittest.mock import MagicMock
 
-from pysmlight import Sensors
+from pysmlight import Info, Sensors
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
+from homeassistant.components.smlight.const import DOMAIN
 from homeassistant.const import STATE_UNKNOWN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 
 from .conftest import setup_integration
 
-from tests.common import MockConfigEntry, snapshot_platform
+from tests.common import MockConfigEntry, load_json_object_fixture, snapshot_platform
 
 pytestmark = [
     pytest.mark.usefixtures(
@@ -73,3 +74,38 @@ async def test_zigbee_uptime_disconnected(
 
     state = hass.states.get("sensor.mock_title_zigbee_uptime")
     assert state.state == STATE_UNKNOWN
+
+
+async def test_zigbee2_temp_sensor(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_smlight_client: MagicMock,
+) -> None:
+    """Test for zb_temp2 if device has second radio."""
+    mock_smlight_client.get_sensors.return_value = Sensors(zb_temp2=20.45)
+    await setup_integration(hass, mock_config_entry)
+
+    state = hass.states.get("sensor.mock_title_zigbee_chip_temp_2")
+    assert state
+    assert state.state == "20.45"
+
+
+async def test_zigbee_type_sensors(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_smlight_client: MagicMock,
+) -> None:
+    """Test for zigbee type sensor with second radio."""
+    mock_smlight_client.get_info.side_effect = None
+    mock_smlight_client.get_info.return_value = Info.from_dict(
+        load_json_object_fixture("info-MR1.json", DOMAIN)
+    )
+    await setup_integration(hass, mock_config_entry)
+
+    state = hass.states.get("sensor.mock_title_zigbee_type")
+    assert state
+    assert state.state == "coordinator"
+
+    state = hass.states.get("sensor.mock_title_zigbee_type_2")
+    assert state
+    assert state.state == "router"
diff --git a/tests/components/smlight/test_update.py b/tests/components/smlight/test_update.py
index 0bb2e34d7ca..d120a08d519 100644
--- a/tests/components/smlight/test_update.py
+++ b/tests/components/smlight/test_update.py
@@ -4,13 +4,13 @@ from datetime import timedelta
 from unittest.mock import MagicMock, patch
 
 from freezegun.api import FrozenDateTimeFactory
-from pysmlight import Firmware, Info
+from pysmlight import Firmware, Info, Radio
 from pysmlight.const import Events as SmEvents
 from pysmlight.sse import MessageEvent
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
-from homeassistant.components.smlight.const import SCAN_FIRMWARE_INTERVAL
+from homeassistant.components.smlight.const import DOMAIN, SCAN_FIRMWARE_INTERVAL
 from homeassistant.components.update import (
     ATTR_IN_PROGRESS,
     ATTR_INSTALLED_VERSION,
@@ -27,7 +27,12 @@ from homeassistant.helpers import entity_registry as er
 from . import get_mock_event_function
 from .conftest import setup_integration
 
-from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
+from tests.common import (
+    MockConfigEntry,
+    async_fire_time_changed,
+    load_json_object_fixture,
+    snapshot_platform,
+)
 from tests.typing import WebSocketGenerator
 
 pytestmark = [
@@ -62,12 +67,14 @@ MOCK_FIRMWARE_FAIL = MessageEvent(
 
 MOCK_FIRMWARE_NOTES = [
     Firmware(
-        ver="v2.3.6",
+        ver="v2.7.2",
         mode="ESP",
         notes=None,
     )
 ]
 
+MOCK_RADIO = Radio(chip_index=1, zb_channel=0, zb_type=0, zb_version="20240716")
+
 
 @pytest.fixture
 def platforms() -> list[Platform]:
@@ -81,7 +88,7 @@ async def test_update_setup(
     mock_config_entry: MockConfigEntry,
     snapshot: SnapshotAssertion,
 ) -> None:
-    """Test setup of SMLIGHT switches."""
+    """Test setup of SMLIGHT update entities."""
     entry = await setup_integration(hass, mock_config_entry)
 
     await snapshot_platform(hass, entity_registry, snapshot, entry.entry_id)
@@ -103,7 +110,7 @@ async def test_update_firmware(
     state = hass.states.get(entity_id)
     assert state.state == STATE_ON
     assert state.attributes[ATTR_INSTALLED_VERSION] == "v2.3.6"
-    assert state.attributes[ATTR_LATEST_VERSION] == "v2.5.2"
+    assert state.attributes[ATTR_LATEST_VERSION] == "v2.7.5"
 
     await hass.services.async_call(
         PLATFORM,
@@ -125,8 +132,9 @@ async def test_update_firmware(
 
     event_function(MOCK_FIRMWARE_DONE)
 
+    mock_smlight_client.get_info.side_effect = None
     mock_smlight_client.get_info.return_value = Info(
-        sw_version="v2.5.2",
+        sw_version="v2.7.5",
     )
 
     freezer.tick(timedelta(seconds=5))
@@ -135,8 +143,50 @@ async def test_update_firmware(
 
     state = hass.states.get(entity_id)
     assert state.state == STATE_OFF
-    assert state.attributes[ATTR_INSTALLED_VERSION] == "v2.5.2"
-    assert state.attributes[ATTR_LATEST_VERSION] == "v2.5.2"
+    assert state.attributes[ATTR_INSTALLED_VERSION] == "v2.7.5"
+    assert state.attributes[ATTR_LATEST_VERSION] == "v2.7.5"
+
+
+async def test_update_zigbee2_firmware(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    mock_config_entry: MockConfigEntry,
+    mock_smlight_client: MagicMock,
+) -> None:
+    """Test update of zigbee2 firmware where available."""
+    mock_info = Info.from_dict(load_json_object_fixture("info-MR1.json", DOMAIN))
+    mock_smlight_client.get_info.side_effect = None
+    mock_smlight_client.get_info.return_value = mock_info
+    await setup_integration(hass, mock_config_entry)
+    entity_id = "update.mock_title_zigbee_firmware_2"
+    state = hass.states.get(entity_id)
+    assert state.state == STATE_ON
+    assert state.attributes[ATTR_INSTALLED_VERSION] == "20240314"
+    assert state.attributes[ATTR_LATEST_VERSION] == "20240716"
+
+    await hass.services.async_call(
+        PLATFORM,
+        SERVICE_INSTALL,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=False,
+    )
+
+    assert len(mock_smlight_client.fw_update.mock_calls) == 1
+
+    event_function = get_mock_event_function(mock_smlight_client, SmEvents.FW_UPD_done)
+
+    event_function(MOCK_FIRMWARE_DONE)
+
+    mock_info.radios[1] = MOCK_RADIO
+
+    freezer.tick(timedelta(seconds=5))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(entity_id)
+    assert state.state == STATE_OFF
+    assert state.attributes[ATTR_INSTALLED_VERSION] == "20240716"
+    assert state.attributes[ATTR_LATEST_VERSION] == "20240716"
 
 
 async def test_update_legacy_firmware_v2(
@@ -146,6 +196,7 @@ async def test_update_legacy_firmware_v2(
     mock_smlight_client: MagicMock,
 ) -> None:
     """Test firmware update for legacy v2 firmware."""
+    mock_smlight_client.get_info.side_effect = None
     mock_smlight_client.get_info.return_value = Info(
         sw_version="v2.0.18",
         legacy_api=1,
@@ -156,7 +207,7 @@ async def test_update_legacy_firmware_v2(
     state = hass.states.get(entity_id)
     assert state.state == STATE_ON
     assert state.attributes[ATTR_INSTALLED_VERSION] == "v2.0.18"
-    assert state.attributes[ATTR_LATEST_VERSION] == "v2.5.2"
+    assert state.attributes[ATTR_LATEST_VERSION] == "v2.7.5"
 
     await hass.services.async_call(
         PLATFORM,
@@ -171,8 +222,9 @@ async def test_update_legacy_firmware_v2(
 
     event_function(MOCK_FIRMWARE_DONE)
 
+    mock_smlight_client.get_info.side_effect = None
     mock_smlight_client.get_info.return_value = Info(
-        sw_version="v2.5.2",
+        sw_version="v2.7.5",
     )
 
     freezer.tick(SCAN_FIRMWARE_INTERVAL)
@@ -181,8 +233,8 @@ async def test_update_legacy_firmware_v2(
 
     state = hass.states.get(entity_id)
     assert state.state == STATE_OFF
-    assert state.attributes[ATTR_INSTALLED_VERSION] == "v2.5.2"
-    assert state.attributes[ATTR_LATEST_VERSION] == "v2.5.2"
+    assert state.attributes[ATTR_INSTALLED_VERSION] == "v2.7.5"
+    assert state.attributes[ATTR_LATEST_VERSION] == "v2.7.5"
 
 
 async def test_update_firmware_failed(
@@ -196,7 +248,7 @@ async def test_update_firmware_failed(
     state = hass.states.get(entity_id)
     assert state.state == STATE_ON
     assert state.attributes[ATTR_INSTALLED_VERSION] == "v2.3.6"
-    assert state.attributes[ATTR_LATEST_VERSION] == "v2.5.2"
+    assert state.attributes[ATTR_LATEST_VERSION] == "v2.7.5"
 
     await hass.services.async_call(
         PLATFORM,
@@ -233,7 +285,7 @@ async def test_update_reboot_timeout(
     state = hass.states.get(entity_id)
     assert state.state == STATE_ON
     assert state.attributes[ATTR_INSTALLED_VERSION] == "v2.3.6"
-    assert state.attributes[ATTR_LATEST_VERSION] == "v2.5.2"
+    assert state.attributes[ATTR_LATEST_VERSION] == "v2.7.5"
 
     with (
         patch(
@@ -267,18 +319,30 @@ async def test_update_reboot_timeout(
         mock_warning.assert_called_once()
 
 
+@pytest.mark.parametrize(
+    "entity_id",
+    [
+        "update.mock_title_core_firmware",
+        "update.mock_title_zigbee_firmware",
+        "update.mock_title_zigbee_firmware_2",
+    ],
+)
 async def test_update_release_notes(
     hass: HomeAssistant,
+    entity_id: str,
     freezer: FrozenDateTimeFactory,
     mock_config_entry: MockConfigEntry,
     mock_smlight_client: MagicMock,
     hass_ws_client: WebSocketGenerator,
 ) -> None:
     """Test firmware release notes."""
+    mock_smlight_client.get_info.side_effect = None
+    mock_smlight_client.get_info.return_value = Info.from_dict(
+        load_json_object_fixture("info-MR1.json", DOMAIN)
+    )
     await setup_integration(hass, mock_config_entry)
     ws_client = await hass_ws_client(hass)
     await hass.async_block_till_done()
-    entity_id = "update.mock_title_core_firmware"
 
     state = hass.states.get(entity_id)
     assert state
@@ -294,16 +358,30 @@ async def test_update_release_notes(
     result = await ws_client.receive_json()
     assert result["result"] is not None
 
+
+async def test_update_blank_release_notes(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_smlight_client: MagicMock,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test firmware missing release notes."""
+
+    entity_id = "update.mock_title_core_firmware"
     mock_smlight_client.get_firmware_version.side_effect = None
     mock_smlight_client.get_firmware_version.return_value = MOCK_FIRMWARE_NOTES
 
-    freezer.tick(SCAN_FIRMWARE_INTERVAL)
-    async_fire_time_changed(hass)
+    await setup_integration(hass, mock_config_entry)
+    ws_client = await hass_ws_client(hass)
     await hass.async_block_till_done()
 
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == STATE_ON
+
     await ws_client.send_json(
         {
-            "id": 2,
+            "id": 1,
             "type": "update/release_notes",
             "entity_id": entity_id,
         }
diff --git a/tests/components/snoo/__init__.py b/tests/components/snoo/__init__.py
new file mode 100644
index 00000000000..b4692e6f08b
--- /dev/null
+++ b/tests/components/snoo/__init__.py
@@ -0,0 +1,54 @@
+"""Tests for the Happiest Baby Snoo integration."""
+
+from collections.abc import Awaitable, Callable
+from unittest.mock import AsyncMock
+
+import pytest
+from python_snoo.containers import SnooData
+
+from homeassistant.components.snoo.const import DOMAIN
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+def create_entry(
+    hass: HomeAssistant,
+) -> ConfigEntry:
+    """Add config entry in Home Assistant."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="test-username",
+        data={
+            CONF_USERNAME: "test-username",
+            CONF_PASSWORD: "sample",
+        },
+        # This is also gotten from the fake jwt
+        unique_id="123e4567-e89b-12d3-a456-426614174000",
+        version=1,
+    )
+    entry.add_to_hass(hass)
+    return entry
+
+
+async def async_init_integration(hass: HomeAssistant) -> ConfigEntry:
+    """Set up the Snoo integration in Home Assistant."""
+
+    entry = create_entry(hass)
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    return entry
+
+
+def find_update_callback(
+    mock: AsyncMock, serial_number: str
+) -> Callable[[SnooData], Awaitable[None]]:
+    """Find the update callback for a specific identifier."""
+    for call in mock.subscribe.call_args_list:
+        if call[0][0].serialNumber == serial_number:
+            return call[0][1]
+    pytest.fail(f"Callback for identifier {serial_number} not found")
diff --git a/tests/components/snoo/conftest.py b/tests/components/snoo/conftest.py
new file mode 100644
index 00000000000..6163fa56b7f
--- /dev/null
+++ b/tests/components/snoo/conftest.py
@@ -0,0 +1,31 @@
+"""Common fixtures for the Happiest Baby Snoo tests."""
+
+from collections.abc import Generator
+from unittest.mock import AsyncMock, patch
+
+import pytest
+from python_snoo.containers import SnooDevice
+
+from .const import MOCK_SNOO_DEVICES, MOCKED_AUTH
+
+
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.snoo.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
+@pytest.fixture(name="bypass_api")
+def bypass_api() -> Generator[AsyncMock]:
+    """Bypass the Snoo api."""
+    with (
+        patch("homeassistant.components.snoo.Snoo", autospec=True) as mock_client,
+        patch("homeassistant.components.snoo.config_flow.Snoo", new=mock_client),
+    ):
+        client = mock_client.return_value
+        client.get_devices.return_value = [SnooDevice.from_dict(MOCK_SNOO_DEVICES[0])]
+        client.authorize.return_value = MOCKED_AUTH
+        yield client
diff --git a/tests/components/snoo/const.py b/tests/components/snoo/const.py
new file mode 100644
index 00000000000..2657048afb8
--- /dev/null
+++ b/tests/components/snoo/const.py
@@ -0,0 +1,71 @@
+"""Snoo constants for testing."""
+
+import time
+
+from python_snoo.containers import AuthorizationInfo, SnooData
+
+MOCK_AMAZON_AUTH = {
+    # This is a JWT with random values.
+    "AccessToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJhMWIyYzNkNC1lNWY2"
+    "LTQ3ODktOTBhYi1jZGVmMDEyMzQ1NjciLCJpc3MiOiJodHRwczovL2NvZ25pdG8taWRwLnVzLXdlc3Qt"
+    "Mi5hbWF6b25hd3MuY29tL3VzLXdlc3QtMl9FeGFtcGxlVXNlclBvb2xJZCIsImNsaWVudF9pZCI6ImFiY"
+    "2RlZmdoMTIzNDU2Nzg5MGFiY2RlZmdoMTIiLCJvcmlnaW5fanRpIjoiYjhkOWUwZjEtMmczaC00aTVqLT"
+    "ZrN2wtOG05bjBvMXAycTNyIiwiZXZlbnRfaWQiOiJmMGcxaDJpMy00ajVrLTZsN20tOG45by0wcDFxMnI"
+    "zczR0NXUiLCJ0b2tlbl91c2UiOiJhY2Nlc3MiLCJzY29wZSI6ImF3cy5jb2duaXRvLnNpZ25pbi51c2Vy"
+    "LmFkbWluIiwiYXV0aF90aW1lIjoxNzAwMDAwMDAwLCJleHAiOjE3MDAwMDM2MDAsImlhdCI6MTcwMDAwM"
+    "DAwMCwianRpIjoidjZ3N3g4eTktMHoxYS0yYjNjLTRkNWUtNmY3ZzhoOWkwajFrIiwidXNlcm5hbWUiOi"
+    "IxMjNlNDU2Ny1lODliLTEyZDMtYTQ1Ni00MjY2MTQxNzQwMDAifQ.zH5vy5itWot_5-rdJgYoygeKx696"
+    "Uge46zxXMhdn5RE",
+    "IdToken": "random_id",
+    "RefreshToken": "refresh_token",
+}
+
+MOCK_SNOO_AUTH = {"expiresIn": 10800, "snoo": {"token": "random_snoo_token"}}
+
+MOCK_SNOO_DEVICES = [
+    {
+        "serialNumber": "random_num",
+        "deviceType": 1,
+        "firmwareVersion": 1.0,
+        "babyIds": ["35235-211235-dfasdf-32523"],
+        "name": "Test Snoo",
+        "presence": {},
+        "presenceIoT": {},
+        "awsIoT": {},
+        "lastSSID": {},
+        "provisionedAt": "random_time",
+    }
+]
+
+MOCK_SNOO_DATA = SnooData.from_dict(
+    {
+        "system_state": "normal",
+        "sw_version": "v1.14.27",
+        "state_machine": {
+            "session_id": "0",
+            "state": "ONLINE",
+            "is_active_session": "false",
+            "since_session_start_ms": -1,
+            "time_left": -1,
+            "hold": "off",
+            "weaning": "off",
+            "audio": "on",
+            "up_transition": "NONE",
+            "down_transition": "NONE",
+            "sticky_white_noise": "off",
+        },
+        "left_safety_clip": 1,
+        "right_safety_clip": 1,
+        "event": "status_requested",
+        "event_time_ms": int(time.time()),
+        "rx_signal": {"rssi": -45, "strength": 100},
+    }
+)
+
+
+MOCKED_AUTH = AuthorizationInfo(
+    snoo=MOCK_SNOO_AUTH,
+    aws_access=MOCK_AMAZON_AUTH["AccessToken"],
+    aws_id=MOCK_AMAZON_AUTH["IdToken"],
+    aws_refresh=MOCK_AMAZON_AUTH["RefreshToken"],
+)
diff --git a/tests/components/snoo/test_binary_sensor.py b/tests/components/snoo/test_binary_sensor.py
new file mode 100644
index 00000000000..77b2e36c1fe
--- /dev/null
+++ b/tests/components/snoo/test_binary_sensor.py
@@ -0,0 +1,30 @@
+"""Test Snoo Binary Sensors."""
+
+from unittest.mock import AsyncMock
+
+from homeassistant.const import STATE_ON, STATE_UNAVAILABLE
+from homeassistant.core import HomeAssistant
+
+from . import async_init_integration, find_update_callback
+from .const import MOCK_SNOO_DATA
+
+
+async def test_binary_sensors(hass: HomeAssistant, bypass_api: AsyncMock) -> None:
+    """Test binary sensors and check test values are correctly set."""
+    await async_init_integration(hass)
+    assert len(hass.states.async_all("binary_sensor")) == 2
+    assert (
+        hass.states.get("binary_sensor.test_snoo_left_safety_clip").state
+        == STATE_UNAVAILABLE
+    )
+    assert (
+        hass.states.get("binary_sensor.test_snoo_right_safety_clip").state
+        == STATE_UNAVAILABLE
+    )
+    find_update_callback(bypass_api, "random_num")(MOCK_SNOO_DATA)
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all("binary_sensor")) == 2
+    assert hass.states.get("binary_sensor.test_snoo_left_safety_clip").state == STATE_ON
+    assert (
+        hass.states.get("binary_sensor.test_snoo_right_safety_clip").state == STATE_ON
+    )
diff --git a/tests/components/snoo/test_config_flow.py b/tests/components/snoo/test_config_flow.py
new file mode 100644
index 00000000000..9e07f011cd4
--- /dev/null
+++ b/tests/components/snoo/test_config_flow.py
@@ -0,0 +1,115 @@
+"""Test the Happiest Baby Snoo config flow."""
+
+from unittest.mock import AsyncMock
+
+import pytest
+from python_snoo.exceptions import InvalidSnooAuth, SnooAuthException
+
+from homeassistant import config_entries
+from homeassistant.components.snoo.const import DOMAIN
+from homeassistant.config_entries import SOURCE_USER
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from . import create_entry
+
+
+async def test_config_flow_success(
+    hass: HomeAssistant, mock_setup_entry: AsyncMock, bypass_api: AsyncMock
+) -> None:
+    """Test we create the entry successfully."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_USERNAME: "test-username",
+            CONF_PASSWORD: "test-password",
+        },
+    )
+
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["title"] == "test-username"
+    assert result["data"] == {
+        CONF_USERNAME: "test-username",
+        CONF_PASSWORD: "test-password",
+    }
+    assert result["result"].unique_id == "123e4567-e89b-12d3-a456-426614174000"
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+@pytest.mark.parametrize(
+    ("exception", "error_msg"),
+    [
+        (InvalidSnooAuth, "invalid_auth"),
+        (SnooAuthException, "cannot_connect"),
+        (Exception, "unknown"),
+    ],
+)
+async def test_form_auth_issues(
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    bypass_api: AsyncMock,
+    exception,
+    error_msg,
+) -> None:
+    """Test we handle invalid auth."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    # Set Authorize to fail.
+    bypass_api.authorize.side_effect = exception
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_USERNAME: "test-username",
+            CONF_PASSWORD: "test-password",
+        },
+    )
+    # Reset auth back to the original
+    assert result["type"] == FlowResultType.FORM
+    assert result["errors"] == {"base": error_msg}
+    bypass_api.authorize.side_effect = None
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_USERNAME: "test-username",
+            CONF_PASSWORD: "test-password",
+        },
+    )
+
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["title"] == "test-username"
+    assert result["data"] == {
+        CONF_USERNAME: "test-username",
+        CONF_PASSWORD: "test-password",
+    }
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_account_already_configured(
+    hass: HomeAssistant, mock_setup_entry: AsyncMock, bypass_api: AsyncMock
+) -> None:
+    """Ensure we abort if the config flow already exists."""
+    create_entry(hass)
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_USERNAME: "test-username",
+            CONF_PASSWORD: "test-password",
+        },
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
diff --git a/tests/components/snoo/test_event.py b/tests/components/snoo/test_event.py
new file mode 100644
index 00000000000..41cb386a599
--- /dev/null
+++ b/tests/components/snoo/test_event.py
@@ -0,0 +1,45 @@
+"""Test Snoo Events."""
+
+from unittest.mock import AsyncMock
+
+from freezegun import freeze_time
+
+from homeassistant.const import STATE_UNAVAILABLE
+from homeassistant.core import HomeAssistant
+
+from . import async_init_integration, find_update_callback
+from .const import MOCK_SNOO_DATA
+
+
+@freeze_time("2025-01-01 12:00:00")
+async def test_events(hass: HomeAssistant, bypass_api: AsyncMock) -> None:
+    """Test events and check test values are correctly set."""
+    await async_init_integration(hass)
+    assert len(hass.states.async_all("event")) == 1
+    assert hass.states.get("event.test_snoo_snoo_event").state == STATE_UNAVAILABLE
+    find_update_callback(bypass_api, "random_num")(MOCK_SNOO_DATA)
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all("event")) == 1
+    assert (
+        hass.states.get("event.test_snoo_snoo_event").state
+        == "2025-01-01T12:00:00.000+00:00"
+    )
+
+
+@freeze_time("2025-01-01 12:00:00")
+async def test_events_data_on_startup(
+    hass: HomeAssistant, bypass_api: AsyncMock
+) -> None:
+    """Test events and check test values are correctly set if data exists on first update."""
+
+    def update_status(_):
+        find_update_callback(bypass_api, "random_num")(MOCK_SNOO_DATA)
+
+    bypass_api.get_status.side_effect = update_status
+    await async_init_integration(hass)
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all("event")) == 1
+    assert (
+        hass.states.get("event.test_snoo_snoo_event").state
+        == "2025-01-01T12:00:00.000+00:00"
+    )
diff --git a/tests/components/snoo/test_init.py b/tests/components/snoo/test_init.py
new file mode 100644
index 00000000000..72c4b6fb8ab
--- /dev/null
+++ b/tests/components/snoo/test_init.py
@@ -0,0 +1,32 @@
+"""Test init for Snoo."""
+
+from unittest.mock import AsyncMock
+
+from python_snoo.exceptions import SnooAuthException
+
+from homeassistant.components.snoo import SnooDeviceError
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+
+from . import async_init_integration
+
+
+async def test_async_setup_entry(hass: HomeAssistant, bypass_api: AsyncMock) -> None:
+    """Test a successful setup entry."""
+    entry = await async_init_integration(hass)
+    assert len(hass.states.async_all("sensor")) == 2
+    assert entry.state == ConfigEntryState.LOADED
+
+
+async def test_cannot_auth(hass: HomeAssistant, bypass_api: AsyncMock) -> None:
+    """Test that we are put into retry when we fail to auth."""
+    bypass_api.authorize.side_effect = SnooAuthException
+    entry = await async_init_integration(hass)
+    assert entry.state is ConfigEntryState.SETUP_RETRY
+
+
+async def test_failed_devices(hass: HomeAssistant, bypass_api: AsyncMock) -> None:
+    """Test that we are put into retry when we fail to get devices."""
+    bypass_api.get_devices.side_effect = SnooDeviceError
+    entry = await async_init_integration(hass)
+    assert entry.state is ConfigEntryState.SETUP_RETRY
diff --git a/tests/components/snoo/test_select.py b/tests/components/snoo/test_select.py
new file mode 100644
index 00000000000..e00721b2ab8
--- /dev/null
+++ b/tests/components/snoo/test_select.py
@@ -0,0 +1,75 @@
+"""Test Snoo Selects."""
+
+import copy
+from unittest.mock import AsyncMock
+
+import pytest
+from python_snoo.containers import SnooDevice, SnooLevels, SnooStates
+
+from homeassistant.components.select import SERVICE_SELECT_OPTION
+from homeassistant.components.snoo.select import SnooCommandException
+from homeassistant.const import STATE_UNAVAILABLE
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+
+from . import async_init_integration, find_update_callback
+from .const import MOCK_SNOO_DATA
+
+
+async def test_select(hass: HomeAssistant, bypass_api: AsyncMock) -> None:
+    """Test select and check test values are correctly set."""
+    await async_init_integration(hass)
+    assert len(hass.states.async_all("select")) == 1
+    assert hass.states.get("select.test_snoo_intensity").state == STATE_UNAVAILABLE
+    find_update_callback(bypass_api, "random_num")(MOCK_SNOO_DATA)
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all("select")) == 1
+    assert hass.states.get("select.test_snoo_intensity").state == "stop"
+
+
+async def test_update_success(hass: HomeAssistant, bypass_api: AsyncMock) -> None:
+    """Test changing values for select entities."""
+    await async_init_integration(hass)
+
+    find_update_callback(bypass_api, "random_num")(MOCK_SNOO_DATA)
+    assert hass.states.get("select.test_snoo_intensity").state == "stop"
+
+    async def update_level(device: SnooDevice, level: SnooStates, _hold: bool = False):
+        new_data = copy.deepcopy(MOCK_SNOO_DATA)
+        new_data.state_machine.level = SnooLevels(level.value)
+        find_update_callback(bypass_api, device.serialNumber)(new_data)
+
+    bypass_api.set_level.side_effect = update_level
+    await hass.services.async_call(
+        "select",
+        SERVICE_SELECT_OPTION,
+        service_data={"option": "level1"},
+        blocking=True,
+        target={"entity_id": "select.test_snoo_intensity"},
+    )
+
+    assert bypass_api.set_level.assert_called_once
+    assert hass.states.get("select.test_snoo_intensity").state == "level1"
+
+
+async def test_update_failed(hass: HomeAssistant, bypass_api: AsyncMock) -> None:
+    """Test failing to change values for select entities."""
+    await async_init_integration(hass)
+
+    find_update_callback(bypass_api, "random_num")(MOCK_SNOO_DATA)
+    assert hass.states.get("select.test_snoo_intensity").state == "stop"
+
+    bypass_api.set_level.side_effect = SnooCommandException
+    with pytest.raises(
+        HomeAssistantError, match="Error while updating Intensity to level1"
+    ):
+        await hass.services.async_call(
+            "select",
+            SERVICE_SELECT_OPTION,
+            service_data={"option": "level1"},
+            blocking=True,
+            target={"entity_id": "select.test_snoo_intensity"},
+        )
+
+    assert bypass_api.set_level.assert_called_once
+    assert hass.states.get("select.test_snoo_intensity").state == "stop"
diff --git a/tests/components/snoo/test_sensor.py b/tests/components/snoo/test_sensor.py
new file mode 100644
index 00000000000..96a22e548b8
--- /dev/null
+++ b/tests/components/snoo/test_sensor.py
@@ -0,0 +1,22 @@
+"""Test Snoo Sensors."""
+
+from unittest.mock import AsyncMock
+
+from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN
+from homeassistant.core import HomeAssistant
+
+from . import async_init_integration, find_update_callback
+from .const import MOCK_SNOO_DATA
+
+
+async def test_sensors(hass: HomeAssistant, bypass_api: AsyncMock) -> None:
+    """Test sensors and check test values are correctly set."""
+    await async_init_integration(hass)
+    assert len(hass.states.async_all("sensor")) == 2
+    assert hass.states.get("sensor.test_snoo_state").state == STATE_UNAVAILABLE
+    assert hass.states.get("sensor.test_snoo_time_left").state == STATE_UNAVAILABLE
+    find_update_callback(bypass_api, "random_num")(MOCK_SNOO_DATA)
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all("sensor")) == 2
+    assert hass.states.get("sensor.test_snoo_state").state == "stop"
+    assert hass.states.get("sensor.test_snoo_time_left").state == STATE_UNKNOWN
diff --git a/tests/components/snoo/test_switch.py b/tests/components/snoo/test_switch.py
new file mode 100644
index 00000000000..2343ff6c0d8
--- /dev/null
+++ b/tests/components/snoo/test_switch.py
@@ -0,0 +1,88 @@
+"""Test Snoo Switches."""
+
+import copy
+from unittest.mock import AsyncMock
+
+import pytest
+from python_snoo.containers import SnooDevice
+from python_snoo.exceptions import SnooCommandException
+
+from homeassistant.components.switch import (
+    SERVICE_TOGGLE,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+)
+from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+
+from . import async_init_integration, find_update_callback
+from .const import MOCK_SNOO_DATA
+
+
+async def test_switch(hass: HomeAssistant, bypass_api: AsyncMock) -> None:
+    """Test switch and check test values are correctly set."""
+    await async_init_integration(hass)
+    assert len(hass.states.async_all("switch")) == 2
+    assert hass.states.get("switch.test_snoo_level_lock").state == STATE_UNAVAILABLE
+    assert (
+        hass.states.get("switch.test_snoo_sleepytime_sounds").state == STATE_UNAVAILABLE
+    )
+    find_update_callback(bypass_api, "random_num")(MOCK_SNOO_DATA)
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all("switch")) == 2
+    assert hass.states.get("switch.test_snoo_sleepytime_sounds").state == STATE_OFF
+    assert hass.states.get("switch.test_snoo_level_lock").state == STATE_OFF
+
+
+async def test_update_success(hass: HomeAssistant, bypass_api: AsyncMock) -> None:
+    """Test changing values for switch entities."""
+    await async_init_integration(hass)
+
+    find_update_callback(bypass_api, "random_num")(MOCK_SNOO_DATA)
+    assert hass.states.get("switch.test_snoo_sleepytime_sounds").state == STATE_OFF
+
+    async def set_sticky_white_noise(device: SnooDevice, state: bool):
+        new_data = copy.deepcopy(MOCK_SNOO_DATA)
+        new_data.state_machine.sticky_white_noise = "off" if not state else "on"
+        find_update_callback(bypass_api, device.serialNumber)(new_data)
+
+    bypass_api.set_sticky_white_noise.side_effect = set_sticky_white_noise
+    await hass.services.async_call(
+        "switch",
+        SERVICE_TOGGLE,
+        blocking=True,
+        target={"entity_id": "switch.test_snoo_sleepytime_sounds"},
+    )
+
+    assert bypass_api.set_sticky_white_noise.assert_called_once
+    assert hass.states.get("switch.test_snoo_sleepytime_sounds").state == STATE_ON
+
+
+@pytest.mark.parametrize(
+    ("command", "error_str"),
+    [
+        (SERVICE_TURN_ON, "Turning Sleepytime sounds on failed"),
+        (SERVICE_TURN_OFF, "Turning Sleepytime sounds off failed"),
+    ],
+)
+async def test_update_failed(
+    hass: HomeAssistant, bypass_api: AsyncMock, command: str, error_str: str
+) -> None:
+    """Test failing to change values for switch entities."""
+    await async_init_integration(hass)
+
+    find_update_callback(bypass_api, "random_num")(MOCK_SNOO_DATA)
+    assert hass.states.get("switch.test_snoo_sleepytime_sounds").state == STATE_OFF
+
+    bypass_api.set_sticky_white_noise.side_effect = SnooCommandException
+    with pytest.raises(HomeAssistantError, match=error_str):
+        await hass.services.async_call(
+            "switch",
+            command,
+            blocking=True,
+            target={"entity_id": "switch.test_snoo_sleepytime_sounds"},
+        )
+
+    assert bypass_api.set_level.assert_called_once
+    assert hass.states.get("switch.test_snoo_sleepytime_sounds").state == STATE_OFF
diff --git a/tests/components/solarlog/snapshots/test_diagnostics.ambr b/tests/components/solarlog/snapshots/test_diagnostics.ambr
index e0f1bc2623c..6aef72ebbd5 100644
--- a/tests/components/solarlog/snapshots/test_diagnostics.ambr
+++ b/tests/components/solarlog/snapshots/test_diagnostics.ambr
@@ -18,6 +18,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'solarlog',
       'unique_id': None,
       'version': 1,
diff --git a/tests/components/solarlog/snapshots/test_sensor.ambr b/tests/components/solarlog/snapshots/test_sensor.ambr
index 06bc01f9d39..c51f7627efc 100644
--- a/tests/components/solarlog/snapshots/test_sensor.ambr
+++ b/tests/components/solarlog/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -65,6 +66,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -116,6 +118,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -173,6 +176,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -224,6 +228,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -275,6 +280,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -329,6 +335,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -380,6 +387,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -437,6 +445,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -494,6 +503,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -551,6 +561,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -606,6 +617,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -662,6 +674,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -716,6 +729,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -765,6 +779,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -814,6 +829,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -865,6 +881,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -916,6 +933,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -967,6 +985,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1018,6 +1037,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1072,6 +1092,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1123,6 +1144,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1174,6 +1196,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1231,6 +1254,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1288,6 +1312,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1345,6 +1370,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1397,6 +1423,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/sonarr/test_sensor.py b/tests/components/sonarr/test_sensor.py
index 3ccff4c88ba..78f03e8b6de 100644
--- a/tests/components/sonarr/test_sensor.py
+++ b/tests/components/sonarr/test_sensor.py
@@ -49,7 +49,7 @@ async def test_sensors(
 
     state = hass.states.get("sensor.sonarr_commands")
     assert state
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "Commands"
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "commands"
     assert state.state == "2"
 
     state = hass.states.get("sensor.sonarr_disk_space")
@@ -60,25 +60,25 @@ async def test_sensors(
 
     state = hass.states.get("sensor.sonarr_queue")
     assert state
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "Episodes"
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "episodes"
     assert state.attributes.get("The Andy Griffith Show S01E01") == "100.00%"
     assert state.state == "1"
 
     state = hass.states.get("sensor.sonarr_shows")
     assert state
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "Series"
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "series"
     assert state.attributes.get("The Andy Griffith Show") == "0/0 Episodes"
     assert state.state == "1"
 
     state = hass.states.get("sensor.sonarr_upcoming")
     assert state
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "Episodes"
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "episodes"
     assert state.attributes.get("Bob's Burgers") == "S04E11"
     assert state.state == "1"
 
     state = hass.states.get("sensor.sonarr_wanted")
     assert state
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "Episodes"
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "episodes"
     assert state.attributes.get("Bob's Burgers S04E11") == "2014-01-26T17:30:00-08:00"
     assert (
         state.attributes.get("The Andy Griffith Show S01E01")
diff --git a/tests/components/sonos/conftest.py b/tests/components/sonos/conftest.py
index 0f56794b9f2..e22f18c6d77 100644
--- a/tests/components/sonos/conftest.py
+++ b/tests/components/sonos/conftest.py
@@ -580,13 +580,19 @@ def alarm_clock_fixture_extended():
     return alarm_clock
 
 
+@pytest.fixture(name="speaker_model")
+def speaker_model_fixture(request: pytest.FixtureRequest):
+    """Create fixture for the speaker model."""
+    return getattr(request, "param", "Model Name")
+
+
 @pytest.fixture(name="speaker_info")
-def speaker_info_fixture():
+def speaker_info_fixture(speaker_model):
     """Create speaker_info fixture."""
     return {
         "zone_name": "Zone A",
         "uid": "RINCON_test",
-        "model_name": "Model Name",
+        "model_name": speaker_model,
         "model_number": "S12",
         "hardware_version": "1.20.1.6-1.1",
         "software_version": "49.2-64250",
diff --git a/tests/components/sonos/fixtures/sonos_favorites.json b/tests/components/sonos/fixtures/sonos_favorites.json
index 21ee68f4872..40213ea8715 100644
--- a/tests/components/sonos/fixtures/sonos_favorites.json
+++ b/tests/components/sonos/fixtures/sonos_favorites.json
@@ -27,6 +27,7 @@
     "title": "1984",
     "parent_id": "FV:2",
     "item_id": "FV:2/8",
+    "album_art_uri": "http://192.168.42.2:1400/getaa?u=x-file-cifs%3a%2f%2f192.168.42.2%2fmusic%2fiTunes%2520Music%2fAerosmith%2f1984&v=742",
     "resource_meta_data": "<DIDL-Lite xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:upnp=\"urn:schemas-upnp-org:metadata-1-0/upnp/\" xmlns:r=\"urn:schemas-rinconnetworks-com:metadata-1-0/\" xmlns=\"urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/\"><item id=\"A:ALBUMARTIST/Aerosmith/1984\" parentID=\"A:ALBUMARTIST/Aerosmith\" restricted=\"true\"><dc:title>1984</dc:title><upnp:class>object.container.album.musicAlbum</upnp:class><desc id=\"cdudn\" nameSpace=\"urn:schemas-rinconnetworks-com:metadata-1-0/\">RINCON_AssociatedZPUDN</desc></item></DIDL-Lite>",
     "resources": [
       {
@@ -34,5 +35,23 @@
         "protocol_info": "a:b:c:d"
       }
     ]
+  },
+  {
+    "title": "American Tall Tales",
+    "parent_id": "FV:2",
+    "item_id": "FV:2/66",
+    "restricted": false,
+    "resource_meta_data": "<DIDL-Lite xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:upnp=\"urn:schemas-upnp-org:metadata-1-0/upnp/\" xmlns:r=\"urn:schemas-rinconnetworks-com:metadata-1-0/\" xmlns=\"urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/\"><item id=\"101340c8reftitleC9F27_com\" parentID=\"101340c8reftitleC9F27_com\" restricted=\"true\"><dc:title>American Tall Tales</dc:title><upnp:class>object.item.audioItem.audioBook</upnp:class><desc id=\"cdudn\" nameSpace=\"urn:schemas-rinconnetworks-com:metadata-1-0/\">SA_RINCON61191_X_#Svc6-0-Token</desc></item></DIDL-Lite>",
+    "resources": [
+      {
+        "uri": "x-rincon-cpcontainer:101340c8reftitle%C9F27_com?sid=239&flags=16584&sn=5",
+        "protocol_info": "x-rincon-cpcontainer:*:*:*"
+      }
+    ],
+    "desc": null,
+    "album_art_uri": "https://m.media-amazon.com/images/I/810lqLo5m0L._SL600_.jpg",
+    "type": "instantPlay",
+    "description": "Audible",
+    "favorite_nr": "0"
   }
 ]
diff --git a/tests/components/sonos/snapshots/test_media_browser.ambr b/tests/components/sonos/snapshots/test_media_browser.ambr
index ae8e813ae5d..24f08eaf95b 100644
--- a/tests/components/sonos/snapshots/test_media_browser.ambr
+++ b/tests/components/sonos/snapshots/test_media_browser.ambr
@@ -1,4 +1,99 @@
 # serializer version: 1
+# name: test_browse_media_favorites[-favorites]
+  dict({
+    'can_expand': True,
+    'can_play': False,
+    'children': list([
+      dict({
+        'can_expand': True,
+        'can_play': False,
+        'children_media_class': None,
+        'media_class': 'album',
+        'media_content_id': 'object.container.album.musicAlbum',
+        'media_content_type': 'favorites_folder',
+        'thumbnail': None,
+        'title': 'Albums',
+      }),
+      dict({
+        'can_expand': True,
+        'can_play': False,
+        'children_media_class': None,
+        'media_class': 'track',
+        'media_content_id': 'object.item.audioItem.audioBook',
+        'media_content_type': 'favorites_folder',
+        'thumbnail': None,
+        'title': 'Audio Book',
+      }),
+      dict({
+        'can_expand': True,
+        'can_play': False,
+        'children_media_class': None,
+        'media_class': 'genre',
+        'media_content_id': 'object.item.audioItem.audioBroadcast',
+        'media_content_type': 'favorites_folder',
+        'thumbnail': None,
+        'title': 'Radio',
+      }),
+    ]),
+    'children_media_class': 'directory',
+    'media_class': 'directory',
+    'media_content_id': '',
+    'media_content_type': 'favorites',
+    'not_shown': 0,
+    'thumbnail': None,
+    'title': 'Favorites',
+  })
+# ---
+# name: test_browse_media_favorites[object.container.album.musicAlbum-favorites_folder]
+  dict({
+    'can_expand': True,
+    'can_play': False,
+    'children': list([
+      dict({
+        'can_expand': False,
+        'can_play': True,
+        'children_media_class': None,
+        'media_class': 'album',
+        'media_content_id': 'FV:2/8',
+        'media_content_type': 'favorite_item_id',
+        'thumbnail': 'http://192.168.42.2:1400/getaa?u=x-file-cifs://192.168.42.2/music/iTunes%20Music/Aerosmith/1984&v=742',
+        'title': '1984',
+      }),
+    ]),
+    'children_media_class': 'album',
+    'media_class': 'directory',
+    'media_content_id': '',
+    'media_content_type': 'favorites',
+    'not_shown': 0,
+    'thumbnail': None,
+    'title': 'Albums',
+  })
+# ---
+# name: test_browse_media_favorites[object.item.audioItem.audioBook-favorites_folder]
+  dict({
+    'can_expand': True,
+    'can_play': False,
+    'children': list([
+      dict({
+        'can_expand': False,
+        'can_play': True,
+        'children_media_class': None,
+        'media_class': 'track',
+        'media_content_id': 'FV:2/66',
+        'media_content_type': 'favorite_item_id',
+        'thumbnail': 'https://m.media-amazon.com/images/I/810lqLo5m0L._SL600_.jpg',
+        'title': 'American Tall Tales',
+      }),
+    ]),
+    'children_media_class': 'track',
+    'media_class': 'directory',
+    'media_content_id': '',
+    'media_content_type': 'favorites',
+    'not_shown': 0,
+    'thumbnail': None,
+    'title': 'Audio Book',
+  })
+# ---
 # name: test_browse_media_library
   list([
     dict({
diff --git a/tests/components/sonos/snapshots/test_media_player.ambr b/tests/components/sonos/snapshots/test_media_player.ambr
index 8ef298de3db..7f4681d8915 100644
--- a/tests/components/sonos/snapshots/test_media_player.ambr
+++ b/tests/components/sonos/snapshots/test_media_player.ambr
@@ -7,6 +7,7 @@
     'capabilities': dict({
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/sonos/test_config_flow.py b/tests/components/sonos/test_config_flow.py
index 70605092da1..8454b4ad673 100644
--- a/tests/components/sonos/test_config_flow.py
+++ b/tests/components/sonos/test_config_flow.py
@@ -123,6 +123,22 @@ async def test_zeroconf_form(
     assert len(mock_manager.mock_calls) == 2
 
 
+async def test_zeroconf_form_not_ipv4(
+    hass: HomeAssistant, zeroconf_payload: ZeroconfServiceInfo
+) -> None:
+    """Test we pass Zeroconf discoveries to the manager."""
+    mock_manager = hass.data[DATA_SONOS_DISCOVERY_MANAGER] = MagicMock()
+    zeroconf_payload.ip_address = ip_address("2001:db8:3333:4444:5555:6666:7777:8888")
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_ZEROCONF},
+        data=zeroconf_payload,
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "not_ipv4_address"
+    assert mock_manager.call_count == 0
+
+
 async def test_ssdp_discovery(hass: HomeAssistant, soco) -> None:
     """Test that SSDP discoveries create a config flow."""
 
diff --git a/tests/components/sonos/test_init.py b/tests/components/sonos/test_init.py
index 3fc8da6a952..c6be606eb20 100644
--- a/tests/components/sonos/test_init.py
+++ b/tests/components/sonos/test_init.py
@@ -21,7 +21,7 @@ from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import MockSoCo, SoCoMockFactory
 
@@ -455,3 +455,32 @@ async def test_async_poll_manual_hosts_8(
     assert "media_player.garage" in entity_registry.entities
     assert "media_player.studio" in entity_registry.entities
     await hass.async_block_till_done(wait_background_tasks=True)
+
+
+async def _setup_hass_ipv6_address_not_supported(hass: HomeAssistant):
+    await async_setup_component(
+        hass,
+        sonos.DOMAIN,
+        {
+            "sonos": {
+                "media_player": {
+                    "interface_addr": "127.0.0.1",
+                    "hosts": ["2001:db8:3333:4444:5555:6666:7777:8888"],
+                }
+            }
+        },
+    )
+    await hass.async_block_till_done()
+
+
+async def test_ipv6_not_supported(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Tests that invalid ipv4 addresses do not generate stack dump."""
+    with caplog.at_level(logging.DEBUG):
+        caplog.clear()
+        await _setup_hass_ipv6_address_not_supported(hass)
+        await hass.async_block_till_done()
+    assert "invalid ip_address received" in caplog.text
+    assert "2001:db8:3333:4444:5555:6666:7777:8888" in caplog.text
diff --git a/tests/components/sonos/test_media_browser.py b/tests/components/sonos/test_media_browser.py
index 6e03935f7f6..ce6e103be58 100644
--- a/tests/components/sonos/test_media_browser.py
+++ b/tests/components/sonos/test_media_browser.py
@@ -2,6 +2,7 @@
 
 from functools import partial
 
+import pytest
 from syrupy import SnapshotAssertion
 
 from homeassistant.components.media_player import BrowseMedia, MediaClass, MediaType
@@ -176,3 +177,43 @@ async def test_browse_media_library_albums(
     assert response["success"]
     assert response["result"]["children"] == snapshot
     assert soco_mock.music_library.browse_by_idstring.call_count == 1
+
+
+@pytest.mark.parametrize(
+    ("media_content_id", "media_content_type"),
+    [
+        (
+            "",
+            "favorites",
+        ),
+        (
+            "object.item.audioItem.audioBook",
+            "favorites_folder",
+        ),
+        (
+            "object.container.album.musicAlbum",
+            "favorites_folder",
+        ),
+    ],
+)
+async def test_browse_media_favorites(
+    async_autosetup_sonos,
+    hass_ws_client: WebSocketGenerator,
+    snapshot: SnapshotAssertion,
+    media_content_id,
+    media_content_type,
+) -> None:
+    """Test the async_browse_media method."""
+    client = await hass_ws_client()
+    await client.send_json(
+        {
+            "id": 1,
+            "type": "media_player/browse_media",
+            "entity_id": "media_player.zone_a",
+            "media_content_id": media_content_id,
+            "media_content_type": media_content_type,
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == snapshot
diff --git a/tests/components/sonos/test_media_player.py b/tests/components/sonos/test_media_player.py
index 63b2c8889ec..78d88a1ea98 100644
--- a/tests/components/sonos/test_media_player.py
+++ b/tests/components/sonos/test_media_player.py
@@ -10,6 +10,7 @@ from syrupy import SnapshotAssertion
 
 from homeassistant.components.media_player import (
     ATTR_INPUT_SOURCE,
+    ATTR_INPUT_SOURCE_LIST,
     ATTR_MEDIA_ANNOUNCE,
     ATTR_MEDIA_CONTENT_ID,
     ATTR_MEDIA_CONTENT_TYPE,
@@ -691,6 +692,7 @@ async def test_select_source_line_in_tv(
                 "play_uri": 1,
                 "play_uri_uri": "x-sonosapi-radio:ST%3aetc",
                 "play_uri_title": "James Taylor Radio",
+                "play_uri_meta": '<DIDL-Lite xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/" xmlns:r="urn:schemas-rinconnetworks-com:metadata-1-0/" xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/"><item id="100c2068ST%3a1683194971234567890" parentID="10fe2064myStations" restricted="true"><dc:title>James Taylor Radio</dc:title><upnp:class>object.item.audioItem.audioBroadcast.#station</upnp:class><desc id="cdudn" nameSpace="urn:schemas-rinconnetworks-com:metadata-1-0/">SA_RINCON60423_X_#Svc60423-99999999-Token</desc></item></DIDL-Lite>',
             },
         ),
         (
@@ -699,6 +701,16 @@ async def test_select_source_line_in_tv(
                 "play_uri": 1,
                 "play_uri_uri": "x-sonosapi-hls:Api%3atune%3aliveAudio%3ajazzcafe%3aetc",
                 "play_uri_title": "66 - Watercolors",
+                "play_uri_meta": '<DIDL-Lite xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/" xmlns:r="urn:schemas-rinconnetworks-com:metadata-1-0/" xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/"><item id="10090120Api%3atune%3aliveAudio%3ajazzcafe%3ae4b5402c-9999-9999-9999-4bc8e2cdccce" parentID="10086064live%3f93b0b9cb-9999-9999-9999-bcf75971fcfe" restricted="false"><dc:title>66 - Watercolors</dc:title><upnp:class>object.item.audioItem.audioBroadcast</upnp:class><desc id="cdudn" nameSpace="urn:schemas-rinconnetworks-com:metadata-1-0/">SA_RINCON9479_X_#Svc9479-99999999-Token</desc></item></DIDL-Lite>',
+            },
+        ),
+        (
+            "American Tall Tales",
+            {
+                "play_uri": 1,
+                "play_uri_uri": "x-rincon-cpcontainer:101340c8reftitle%C9F27_com?sid=239&flags=16584&sn=5",
+                "play_uri_title": "American Tall Tales",
+                "play_uri_meta": '<DIDL-Lite xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/" xmlns:r="urn:schemas-rinconnetworks-com:metadata-1-0/" xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/"><item id="101340c8reftitleC9F27_com" parentID="101340c8reftitleC9F27_com" restricted="true"><dc:title>American Tall Tales</dc:title><upnp:class>object.item.audioItem.audioBook</upnp:class><desc id="cdudn" nameSpace="urn:schemas-rinconnetworks-com:metadata-1-0/">SA_RINCON61191_X_#Svc6-0-Token</desc></item></DIDL-Lite>',
             },
         ),
     ],
@@ -725,6 +737,7 @@ async def test_select_source_play_uri(
     soco_mock.play_uri.assert_called_with(
         result.get("play_uri_uri"),
         title=result.get("play_uri_title"),
+        meta=result.get("play_uri_meta"),
         timeout=LONG_SERVICE_TIMEOUT,
     )
 
@@ -1205,3 +1218,27 @@ async def test_media_get_queue(
     )
     soco_mock.get_queue.assert_called_with(max_items=0)
     assert result == snapshot
+
+
+@pytest.mark.parametrize(
+    ("speaker_model", "source_list"),
+    [
+        ("Sonos Arc Ultra", [SOURCE_TV]),
+        ("Sonos Arc", [SOURCE_TV]),
+        ("Sonos Playbar", [SOURCE_TV]),
+        ("Sonos Connect", [SOURCE_LINEIN]),
+        ("Sonos Play:5", [SOURCE_LINEIN]),
+        ("Sonos Amp", [SOURCE_LINEIN, SOURCE_TV]),
+        ("Sonos Era", None),
+    ],
+    indirect=["speaker_model"],
+)
+async def test_media_source_list(
+    hass: HomeAssistant,
+    async_autosetup_sonos,
+    speaker_model: str,
+    source_list: list[str] | None,
+) -> None:
+    """Test the mapping between the speaker model name and source_list."""
+    state = hass.states.get("media_player.zone_a")
+    assert state.attributes.get(ATTR_INPUT_SOURCE_LIST) == source_list
diff --git a/tests/components/speedtestdotnet/test_init.py b/tests/components/speedtestdotnet/test_init.py
index 2e20aaa259c..1dd30c425b3 100644
--- a/tests/components/speedtestdotnet/test_init.py
+++ b/tests/components/speedtestdotnet/test_init.py
@@ -16,7 +16,7 @@ from homeassistant.components.speedtestdotnet.coordinator import (
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/spider/test_init.py b/tests/components/spider/test_init.py
index 6d1d87cfa6a..f28fc9d5871 100644
--- a/tests/components/spider/test_init.py
+++ b/tests/components/spider/test_init.py
@@ -1,7 +1,11 @@
 """Tests for the Spider integration."""
 
 from homeassistant.components.spider import DOMAIN
-from homeassistant.config_entries import ConfigEntryState
+from homeassistant.config_entries import (
+    SOURCE_IGNORE,
+    ConfigEntryDisabler,
+    ConfigEntryState,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import issue_registry as ir
 
@@ -33,6 +37,28 @@ async def test_spider_repair_issue(
     assert config_entry_2.state is ConfigEntryState.LOADED
     assert issue_registry.async_get_issue(DOMAIN, DOMAIN)
 
+    # Add an ignored entry
+    config_entry_3 = MockConfigEntry(
+        source=SOURCE_IGNORE,
+        domain=DOMAIN,
+    )
+    config_entry_3.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry_3.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry_3.state is ConfigEntryState.NOT_LOADED
+
+    # Add a disabled entry
+    config_entry_4 = MockConfigEntry(
+        disabled_by=ConfigEntryDisabler.USER,
+        domain=DOMAIN,
+    )
+    config_entry_4.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry_4.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry_4.state is ConfigEntryState.NOT_LOADED
+
     # Remove the first one
     await hass.config_entries.async_remove(config_entry_1.entry_id)
     await hass.async_block_till_done()
@@ -48,3 +74,6 @@ async def test_spider_repair_issue(
     assert config_entry_1.state is ConfigEntryState.NOT_LOADED
     assert config_entry_2.state is ConfigEntryState.NOT_LOADED
     assert issue_registry.async_get_issue(DOMAIN, DOMAIN) is None
+
+    # Check the ignored and disabled entries are removed
+    assert not hass.config_entries.async_entries(DOMAIN)
diff --git a/tests/components/spotify/snapshots/test_media_player.ambr b/tests/components/spotify/snapshots/test_media_player.ambr
index 9692d59cfd1..74dbcb50f92 100644
--- a/tests/components/spotify/snapshots/test_media_player.ambr
+++ b/tests/components/spotify/snapshots/test_media_player.ambr
@@ -10,6 +10,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -79,6 +80,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/squeezebox/conftest.py b/tests/components/squeezebox/conftest.py
index 7b007114420..769e611bf28 100644
--- a/tests/components/squeezebox/conftest.py
+++ b/tests/components/squeezebox/conftest.py
@@ -33,6 +33,9 @@ from homeassistant.helpers.device_registry import format_mac
 # from homeassistant.setup import async_setup_component
 from tests.common import MockConfigEntry
 
+CONF_VOLUME_STEP = "volume_step"
+TEST_VOLUME_STEP = 10
+
 TEST_HOST = "1.2.3.4"
 TEST_PORT = "9000"
 TEST_USE_HTTPS = False
@@ -109,11 +112,19 @@ def config_entry(hass: HomeAssistant) -> MockConfigEntry:
             CONF_PORT: TEST_PORT,
             const.CONF_HTTPS: TEST_USE_HTTPS,
         },
+        options={
+            CONF_VOLUME_STEP: TEST_VOLUME_STEP,
+        },
     )
     config_entry.add_to_hass(hass)
     return config_entry
 
 
+async def mock_async_play_announcement(media_id: str) -> bool:
+    """Mock the announcement."""
+    return True
+
+
 async def mock_async_browse(
     media_type: MediaType, limit: int, browse_id: tuple | None = None
 ) -> dict | None:
@@ -121,6 +132,7 @@ async def mock_async_browse(
     child_types = {
         "favorites": "favorites",
         "new music": "album",
+        "album artists": "artists",
         "albums": "album",
         "album": "track",
         "genres": "genre",
@@ -131,6 +143,9 @@ async def mock_async_browse(
         "title": "title",
         "playlists": "playlist",
         "playlist": "title",
+        "apps": "app",
+        "radios": "app",
+        "app-fakecommand": "track",
     }
     fake_items = [
         {
@@ -141,15 +156,19 @@ async def mock_async_browse(
             "item_type": child_types[media_type],
             "artwork_track_id": "b35bb9e9",
             "url": "file:///var/lib/squeezeboxserver/music/track_1.mp3",
+            "cmd": "fakecommand",
+            "icon": "plugins/Qobuz/html/images/qobuz.png",
         },
         {
             "title": "Fake Item 2",
             "id": FAKE_VALID_ITEM_ID + "_2",
             "hasitems": media_type == "favorites",
-            "isaudio": True,
+            "isaudio": False,
             "item_type": child_types[media_type],
             "image_url": "http://lms.internal:9000/html/images/favorites.png",
             "url": "file:///var/lib/squeezeboxserver/music/track_2.mp3",
+            "cmd": "fakecommand",
+            "icon": "plugins/Qobuz/html/images/qobuz.png",
         },
         {
             "title": "Fake Item 3",
@@ -158,6 +177,19 @@ async def mock_async_browse(
             "isaudio": True,
             "album_id": FAKE_VALID_ITEM_ID if media_type == "favorites" else None,
             "url": "file:///var/lib/squeezeboxserver/music/track_3.mp3",
+            "cmd": "fakecommand",
+            "icon": "plugins/Qobuz/html/images/qobuz.png",
+        },
+        {
+            "title": "Fake Invalid Item 1",
+            "id": FAKE_VALID_ITEM_ID + "invalid_3",
+            "hasitems": media_type == "favorites",
+            "isaudio": True,
+            "album_id": FAKE_VALID_ITEM_ID if media_type == "favorites" else None,
+            "url": "file:///var/lib/squeezeboxserver/music/track_3.mp3",
+            "cmd": "fakecommand",
+            "icon": "plugins/Qobuz/html/images/qobuz.png",
+            "type": "text",
         },
     ]
 
@@ -187,7 +219,10 @@ async def mock_async_browse(
                 "items": fake_items,
             }
         return None
-    if media_type in MEDIA_TYPE_TO_SQUEEZEBOX.values():
+    if (
+        media_type in MEDIA_TYPE_TO_SQUEEZEBOX.values()
+        or media_type == "app-fakecommand"
+    ):
         return {
             "title": media_type,
             "items": fake_items,
@@ -216,6 +251,14 @@ def mock_pysqueezebox_player(uuid: str) -> MagicMock:
         mock_player.generate_image_url_from_track_id = MagicMock(
             return_value="http://lms.internal:9000/html/images/favorites.png"
         )
+        mock_player.set_announce_volume = MagicMock(return_value=True)
+        mock_player.set_announce_timeout = MagicMock(return_value=True)
+        mock_player.async_play_announcement = AsyncMock(
+            side_effect=mock_async_play_announcement
+        )
+        mock_player.generate_image_url = MagicMock(
+            return_value="http://lms.internal:9000/html/images/favorites.png"
+        )
         mock_player.name = TEST_PLAYER_NAME
         mock_player.player_id = uuid
         mock_player.mode = "stop"
@@ -226,6 +269,7 @@ def mock_pysqueezebox_player(uuid: str) -> MagicMock:
         mock_player.title = None
         mock_player.image_url = None
         mock_player.model = "SqueezeLite"
+        mock_player.creator = "Ralph Irving & Adrian Smith"
 
         return mock_player
 
@@ -266,7 +310,27 @@ async def configure_squeezebox_media_player_platform(
 ) -> None:
     """Configure a squeezebox config entry with appropriate mocks for media_player."""
     with (
-        patch("homeassistant.components.squeezebox.PLATFORMS", [Platform.MEDIA_PLAYER]),
+        patch(
+            "homeassistant.components.squeezebox.PLATFORMS",
+            [Platform.MEDIA_PLAYER],
+        ),
+        patch("homeassistant.components.squeezebox.Server", return_value=lms),
+    ):
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done(wait_background_tasks=True)
+
+
+async def configure_squeezebox_media_player_button_platform(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    lms: MagicMock,
+) -> None:
+    """Configure a squeezebox config entry with appropriate mocks for media_player."""
+    with (
+        patch(
+            "homeassistant.components.squeezebox.PLATFORMS",
+            [Platform.BUTTON],
+        ),
         patch("homeassistant.components.squeezebox.Server", return_value=lms),
     ):
         await hass.config_entries.async_setup(config_entry.entry_id)
@@ -282,6 +346,15 @@ async def configured_player(
     return (await lms.async_get_players())[0]
 
 
+@pytest.fixture
+async def configured_player_with_button(
+    hass: HomeAssistant, config_entry: MockConfigEntry, lms: MagicMock
+) -> MagicMock:
+    """Fixture mocking calls to pysqueezebox Player from a configured squeezebox."""
+    await configure_squeezebox_media_player_button_platform(hass, config_entry, lms)
+    return (await lms.async_get_players())[0]
+
+
 @pytest.fixture
 async def configured_players(
     hass: HomeAssistant, config_entry: MockConfigEntry, lms_factory: MagicMock
diff --git a/tests/components/squeezebox/snapshots/test_media_player.ambr b/tests/components/squeezebox/snapshots/test_media_player.ambr
index ddd5b9868a1..c0633035a84 100644
--- a/tests/components/squeezebox/snapshots/test_media_player.ambr
+++ b/tests/components/squeezebox/snapshots/test_media_player.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -23,7 +24,7 @@
     'is_new': False,
     'labels': set({
     }),
-    'manufacturer': 'Ralph Irving',
+    'manufacturer': 'Ralph Irving & Adrian Smith',
     'model': 'SqueezeLite',
     'model_id': None,
     'name': 'Test Player',
@@ -43,6 +44,7 @@
     'capabilities': dict({
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -63,7 +65,7 @@
     'original_name': None,
     'platform': 'squeezebox',
     'previous_unique_id': None,
-    'supported_features': <MediaPlayerEntityFeature: 3077055>,
+    'supported_features': <MediaPlayerEntityFeature: 4126655>,
     'translation_key': None,
     'unique_id': 'aa:bb:cc:dd:ee:ff',
     'unit_of_measurement': None,
@@ -86,7 +88,7 @@
       }),
       'repeat': <RepeatMode.OFF: 'off'>,
       'shuffle': False,
-      'supported_features': <MediaPlayerEntityFeature: 3077055>,
+      'supported_features': <MediaPlayerEntityFeature: 4126655>,
       'volume_level': 0.01,
     }),
     'context': <ANY>,
diff --git a/tests/components/squeezebox/test_button.py b/tests/components/squeezebox/test_button.py
new file mode 100644
index 00000000000..16ced65be61
--- /dev/null
+++ b/tests/components/squeezebox/test_button.py
@@ -0,0 +1,23 @@
+"""Tests for the squeezebox button component."""
+
+from unittest.mock import MagicMock
+
+from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.core import HomeAssistant
+
+
+async def test_squeezebox_press(
+    hass: HomeAssistant, configured_player_with_button: MagicMock
+) -> None:
+    """Test press service call."""
+    await hass.services.async_call(
+        BUTTON_DOMAIN,
+        SERVICE_PRESS,
+        {ATTR_ENTITY_ID: "button.test_player_preset_1"},
+        blocking=True,
+    )
+
+    configured_player_with_button.async_query.assert_called_with(
+        "button", "preset_1.single"
+    )
diff --git a/tests/components/squeezebox/test_config_flow.py b/tests/components/squeezebox/test_config_flow.py
index c5efe66152f..cae3672061b 100644
--- a/tests/components/squeezebox/test_config_flow.py
+++ b/tests/components/squeezebox/test_config_flow.py
@@ -6,7 +6,12 @@ from unittest.mock import patch
 from pysqueezebox import Server
 
 from homeassistant import config_entries
-from homeassistant.components.squeezebox.const import CONF_HTTPS, DOMAIN
+from homeassistant.components.squeezebox.const import (
+    CONF_BROWSE_LIMIT,
+    CONF_HTTPS,
+    CONF_VOLUME_STEP,
+    DOMAIN,
+)
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
@@ -19,6 +24,8 @@ HOST2 = "2.2.2.2"
 PORT = 9000
 UUID = "test-uuid"
 UNKNOWN_ERROR = "1234"
+BROWSE_LIMIT = 10
+VOLUME_STEP = 1
 
 
 async def mock_discover(_discovery_callback):
@@ -87,6 +94,45 @@ async def test_user_form(hass: HomeAssistant) -> None:
         assert len(mock_setup_entry.mock_calls) == 1
 
 
+async def test_options_form(hass: HomeAssistant) -> None:
+    """Test we can configure options."""
+    entry = MockConfigEntry(
+        data={
+            CONF_HOST: HOST,
+            CONF_PORT: PORT,
+            CONF_USERNAME: "",
+            CONF_PASSWORD: "",
+            CONF_HTTPS: False,
+        },
+        unique_id=UUID,
+        domain=DOMAIN,
+        options={CONF_BROWSE_LIMIT: 1000, CONF_VOLUME_STEP: 5},
+    )
+
+    entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "init"
+
+    # simulate manual input of options
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={CONF_BROWSE_LIMIT: BROWSE_LIMIT, CONF_VOLUME_STEP: VOLUME_STEP},
+    )
+
+    # put some meaningful asserts here
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+
+    assert result["data"] == {
+        CONF_BROWSE_LIMIT: BROWSE_LIMIT,
+        CONF_VOLUME_STEP: VOLUME_STEP,
+    }
+
+
 async def test_user_form_timeout(hass: HomeAssistant) -> None:
     """Test we handle server search timeout."""
     with (
diff --git a/tests/components/squeezebox/test_media_browser.py b/tests/components/squeezebox/test_media_browser.py
index c03c1b6344d..7b11ef30a87 100644
--- a/tests/components/squeezebox/test_media_browser.py
+++ b/tests/components/squeezebox/test_media_browser.py
@@ -19,6 +19,8 @@ from homeassistant.components.squeezebox.browse_media import (
 from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
 
+from .conftest import FAKE_VALID_ITEM_ID
+
 from tests.common import MockConfigEntry
 from tests.typing import WebSocketGenerator
 
@@ -66,56 +68,144 @@ async def test_async_browse_media_root(
         assert item["title"] == LIBRARY[idx]
 
 
+@pytest.mark.parametrize(
+    ("category", "child_count"),
+    [
+        ("Favorites", 4),
+        ("Artists", 4),
+        ("Albums", 4),
+        ("Playlists", 4),
+        ("Genres", 4),
+        ("New Music", 4),
+        ("Album Artists", 4),
+        ("Apps", 3),
+        ("Radios", 3),
+    ],
+)
 async def test_async_browse_media_with_subitems(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
     hass_ws_client: WebSocketGenerator,
+    category: str,
+    child_count: int,
 ) -> None:
     """Test each category with subitems."""
-    for category in (
-        "Favorites",
-        "Artists",
-        "Albums",
-        "Playlists",
-        "Genres",
-        "New Music",
+    with patch(
+        "homeassistant.components.squeezebox.browse_media.is_internal_request",
+        return_value=False,
     ):
-        with patch(
-            "homeassistant.components.squeezebox.browse_media.is_internal_request",
-            return_value=False,
-        ):
-            client = await hass_ws_client()
-            await client.send_json(
-                {
-                    "id": 1,
-                    "type": "media_player/browse_media",
-                    "entity_id": "media_player.test_player",
-                    "media_content_id": "",
-                    "media_content_type": category,
-                }
-            )
-            response = await client.receive_json()
-            assert response["success"]
-            category_level = response["result"]
-            assert category_level["title"] == MEDIA_TYPE_TO_SQUEEZEBOX[category]
-            assert category_level["children"][0]["title"] == "Fake Item 1"
+        client = await hass_ws_client()
+        await client.send_json(
+            {
+                "id": 1,
+                "type": "media_player/browse_media",
+                "entity_id": "media_player.test_player",
+                "media_content_id": "",
+                "media_content_type": category,
+            }
+        )
+        response = await client.receive_json()
+        assert response["success"]
+        category_level = response["result"]
+        assert category_level["title"] == MEDIA_TYPE_TO_SQUEEZEBOX[category]
+        assert category_level["children"][0]["title"] == "Fake Item 1"
+        assert len(category_level["children"]) == child_count
 
-            # Look up a subitem
-            search_type = category_level["children"][0]["media_content_type"]
-            search_id = category_level["children"][0]["media_content_id"]
-            await client.send_json(
+        # Look up a subitem
+        search_type = category_level["children"][0]["media_content_type"]
+        search_id = category_level["children"][0]["media_content_id"]
+        await client.send_json(
+            {
+                "id": 2,
+                "type": "media_player/browse_media",
+                "entity_id": "media_player.test_player",
+                "media_content_id": search_id,
+                "media_content_type": search_type,
+            }
+        )
+        response = await client.receive_json()
+        assert response["success"]
+        search = response["result"]
+        assert search["title"] == "Fake Item 1"
+
+
+async def test_async_browse_media_for_apps(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test browsing for app category."""
+    with patch(
+        "homeassistant.components.squeezebox.browse_media.is_internal_request",
+        return_value=False,
+    ):
+        category = "Apps"
+        client = await hass_ws_client()
+        await client.send_json(
+            {
+                "id": 1,
+                "type": "media_player/browse_media",
+                "entity_id": "media_player.test_player",
+                "media_content_id": "",
+                "media_content_type": category,
+            }
+        )
+        response = await client.receive_json()
+        assert response["success"]
+
+        # Look up a subitem
+        await client.send_json(
+            {
+                "id": 2,
+                "type": "media_player/browse_media",
+                "entity_id": "media_player.test_player",
+                "media_content_id": "",
+                "media_content_type": "app-fakecommand",
+            }
+        )
+        response = await client.receive_json()
+        assert response["success"]
+        search = response["result"]
+        assert search["children"][0]["title"] == "Fake Item 1"
+        assert "Fake Invalid Item 1" not in search
+
+
+async def test_generate_playlist_for_app(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test the generate_playlist for app-fakecommand media type."""
+    with patch(
+        "homeassistant.components.squeezebox.browse_media.is_internal_request",
+        return_value=False,
+    ):
+        category = "Apps"
+        client = await hass_ws_client()
+        await client.send_json(
+            {
+                "id": 1,
+                "type": "media_player/browse_media",
+                "entity_id": "media_player.test_player",
+                "media_content_id": "",
+                "media_content_type": category,
+            }
+        )
+        response = await client.receive_json()
+        assert response["success"]
+
+        try:
+            await hass.services.async_call(
+                MEDIA_PLAYER_DOMAIN,
+                SERVICE_PLAY_MEDIA,
                 {
-                    "id": 2,
-                    "type": "media_player/browse_media",
-                    "entity_id": "media_player.test_player",
-                    "media_content_id": search_id,
-                    "media_content_type": search_type,
-                }
+                    ATTR_ENTITY_ID: "media_player.test_player",
+                    ATTR_MEDIA_CONTENT_TYPE: "app-fakecommand",
+                    ATTR_MEDIA_CONTENT_ID: FAKE_VALID_ITEM_ID,
+                },
+                blocking=True,
             )
-            response = await client.receive_json()
-            assert response["success"]
-            search = response["result"]
-            assert search["title"] == "Fake Item 1"
+        except BrowseError:
+            pytest.fail("generate_playlist fails for app")
 
 
 async def test_async_browse_tracks(
@@ -142,7 +232,7 @@ async def test_async_browse_tracks(
         assert response["success"]
         tracks = response["result"]
         assert tracks["title"] == "titles"
-        assert len(tracks["children"]) == 3
+        assert len(tracks["children"]) == 4
 
 
 async def test_async_browse_error(
diff --git a/tests/components/squeezebox/test_media_player.py b/tests/components/squeezebox/test_media_player.py
index 080a2161b4d..f3292f1b469 100644
--- a/tests/components/squeezebox/test_media_player.py
+++ b/tests/components/squeezebox/test_media_player.py
@@ -10,9 +10,11 @@ from syrupy import SnapshotAssertion
 
 from homeassistant.components.media_player import (
     ATTR_GROUP_MEMBERS,
+    ATTR_MEDIA_ANNOUNCE,
     ATTR_MEDIA_CONTENT_ID,
     ATTR_MEDIA_CONTENT_TYPE,
     ATTR_MEDIA_ENQUEUE,
+    ATTR_MEDIA_EXTRA,
     ATTR_MEDIA_POSITION,
     ATTR_MEDIA_POSITION_UPDATED_AT,
     ATTR_MEDIA_REPEAT,
@@ -31,6 +33,8 @@ from homeassistant.components.media_player import (
     RepeatMode,
 )
 from homeassistant.components.squeezebox.const import (
+    ATTR_ANNOUNCE_TIMEOUT,
+    ATTR_ANNOUNCE_VOLUME,
     DISCOVERY_INTERVAL,
     DOMAIN,
     PLAYER_UPDATE_INTERVAL,
@@ -68,7 +72,7 @@ from homeassistant.helpers.device_registry import DeviceRegistry
 from homeassistant.helpers.entity_registry import EntityRegistry
 from homeassistant.util.dt import utcnow
 
-from .conftest import FAKE_VALID_ITEM_ID, TEST_MAC
+from .conftest import FAKE_VALID_ITEM_ID, TEST_MAC, TEST_VOLUME_STEP
 
 from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
 
@@ -183,26 +187,32 @@ async def test_squeezebox_volume_up(
     hass: HomeAssistant, configured_player: MagicMock
 ) -> None:
     """Test volume up service call."""
+    configured_player.volume = 50
     await hass.services.async_call(
         MEDIA_PLAYER_DOMAIN,
         SERVICE_VOLUME_UP,
         {ATTR_ENTITY_ID: "media_player.test_player"},
         blocking=True,
     )
-    configured_player.async_set_volume.assert_called_once_with("+5")
+    configured_player.async_set_volume.assert_called_once_with(
+        str(configured_player.volume + TEST_VOLUME_STEP)
+    )
 
 
 async def test_squeezebox_volume_down(
     hass: HomeAssistant, configured_player: MagicMock
 ) -> None:
     """Test volume down service call."""
+    configured_player.volume = 50
     await hass.services.async_call(
         MEDIA_PLAYER_DOMAIN,
         SERVICE_VOLUME_DOWN,
         {ATTR_ENTITY_ID: "media_player.test_player"},
         blocking=True,
     )
-    configured_player.async_set_volume.assert_called_once_with("-5")
+    configured_player.async_set_volume.assert_called_once_with(
+        str(configured_player.volume - TEST_VOLUME_STEP)
+    )
 
 
 async def test_squeezebox_volume_set(
@@ -430,6 +440,115 @@ async def test_squeezebox_play(
     configured_player.async_play.assert_called_once()
 
 
+async def test_squeezebox_play_media_with_announce(
+    hass: HomeAssistant, configured_player: MagicMock
+) -> None:
+    """Test play service call with announce."""
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_PLAY_MEDIA,
+        {
+            ATTR_ENTITY_ID: "media_player.test_player",
+            ATTR_MEDIA_CONTENT_TYPE: MediaType.MUSIC,
+            ATTR_MEDIA_CONTENT_ID: FAKE_VALID_ITEM_ID,
+            ATTR_MEDIA_ANNOUNCE: True,
+        },
+        blocking=True,
+    )
+    configured_player.async_load_url.assert_called_once_with(
+        FAKE_VALID_ITEM_ID, "announce"
+    )
+
+
+@pytest.mark.parametrize(
+    "announce_volume",
+    ["0.2", 0.2],
+)
+async def test_squeezebox_play_media_with_announce_volume(
+    hass: HomeAssistant, configured_player: MagicMock, announce_volume: str | int
+) -> None:
+    """Test play service call with announce."""
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_PLAY_MEDIA,
+        {
+            ATTR_ENTITY_ID: "media_player.test_player",
+            ATTR_MEDIA_CONTENT_TYPE: MediaType.MUSIC,
+            ATTR_MEDIA_CONTENT_ID: FAKE_VALID_ITEM_ID,
+            ATTR_MEDIA_ANNOUNCE: True,
+            ATTR_MEDIA_EXTRA: {ATTR_ANNOUNCE_VOLUME: announce_volume},
+        },
+        blocking=True,
+    )
+    configured_player.set_announce_volume.assert_called_once_with(20)
+    configured_player.async_load_url.assert_called_once_with(
+        FAKE_VALID_ITEM_ID, "announce"
+    )
+
+
+@pytest.mark.parametrize("announce_volume", ["1.1", 1.1, "text", "-1", -1, 0, "0"])
+async def test_squeezebox_play_media_with_announce_volume_invalid(
+    hass: HomeAssistant, configured_player: MagicMock, announce_volume: str | int
+) -> None:
+    """Test play service call with announce and volume zero."""
+    with pytest.raises(ServiceValidationError):
+        await hass.services.async_call(
+            MEDIA_PLAYER_DOMAIN,
+            SERVICE_PLAY_MEDIA,
+            {
+                ATTR_ENTITY_ID: "media_player.test_player",
+                ATTR_MEDIA_CONTENT_TYPE: MediaType.MUSIC,
+                ATTR_MEDIA_CONTENT_ID: FAKE_VALID_ITEM_ID,
+                ATTR_MEDIA_ANNOUNCE: True,
+                ATTR_MEDIA_EXTRA: {ATTR_ANNOUNCE_VOLUME: announce_volume},
+            },
+            blocking=True,
+        )
+
+
+@pytest.mark.parametrize("announce_timeout", ["-1", "text", -1, 0, "0"])
+async def test_squeezebox_play_media_with_announce_timeout_invalid(
+    hass: HomeAssistant, configured_player: MagicMock, announce_timeout: str | int
+) -> None:
+    """Test play service call with announce and invalid timeout."""
+    with pytest.raises(ServiceValidationError):
+        await hass.services.async_call(
+            MEDIA_PLAYER_DOMAIN,
+            SERVICE_PLAY_MEDIA,
+            {
+                ATTR_ENTITY_ID: "media_player.test_player",
+                ATTR_MEDIA_CONTENT_TYPE: MediaType.MUSIC,
+                ATTR_MEDIA_CONTENT_ID: FAKE_VALID_ITEM_ID,
+                ATTR_MEDIA_ANNOUNCE: True,
+                ATTR_MEDIA_EXTRA: {ATTR_ANNOUNCE_TIMEOUT: announce_timeout},
+            },
+            blocking=True,
+        )
+
+
+@pytest.mark.parametrize("announce_timeout", ["100", 100])
+async def test_squeezebox_play_media_with_announce_timeout(
+    hass: HomeAssistant, configured_player: MagicMock, announce_timeout: str | int
+) -> None:
+    """Test play service call with announce."""
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_PLAY_MEDIA,
+        {
+            ATTR_ENTITY_ID: "media_player.test_player",
+            ATTR_MEDIA_CONTENT_TYPE: MediaType.MUSIC,
+            ATTR_MEDIA_CONTENT_ID: FAKE_VALID_ITEM_ID,
+            ATTR_MEDIA_ANNOUNCE: True,
+            ATTR_MEDIA_EXTRA: {ATTR_ANNOUNCE_TIMEOUT: announce_timeout},
+        },
+        blocking=True,
+    )
+    configured_player.set_announce_timeout.assert_called_once_with(100)
+    configured_player.async_load_url.assert_called_once_with(
+        FAKE_VALID_ITEM_ID, "announce"
+    )
+
+
 async def test_squeezebox_play_pause(
     hass: HomeAssistant, configured_player: MagicMock
 ) -> None:
diff --git a/tests/components/srp_energy/conftest.py b/tests/components/srp_energy/conftest.py
index b612bc9f3f3..b1d5b958d47 100644
--- a/tests/components/srp_energy/conftest.py
+++ b/tests/components/srp_energy/conftest.py
@@ -12,7 +12,7 @@ import pytest
 from homeassistant.components.srp_energy.const import DOMAIN, PHOENIX_TIME_ZONE
 from homeassistant.const import CONF_ID
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import MOCK_USAGE, TEST_CONFIG_HOME
 
diff --git a/tests/components/ssdp/test_init.py b/tests/components/ssdp/test_init.py
index 839509e756b..56623b51bb5 100644
--- a/tests/components/ssdp/test_init.py
+++ b/tests/components/ssdp/test_init.py
@@ -39,7 +39,7 @@ from homeassistant.helpers.service_info.ssdp import (
     SsdpServiceInfo,
 )
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/starlink/test_init.py b/tests/components/starlink/test_init.py
index 7e04c21562a..f15a80771cf 100644
--- a/tests/components/starlink/test_init.py
+++ b/tests/components/starlink/test_init.py
@@ -33,8 +33,9 @@ async def test_successful_entry(hass: HomeAssistant) -> None:
         await hass.config_entries.async_setup(entry.entry_id)
         await hass.async_block_till_done()
 
+        assert entry.runtime_data
+        assert entry.runtime_data.data
         assert entry.state is ConfigEntryState.LOADED
-        assert entry.entry_id in hass.data[DOMAIN]
 
 
 async def test_unload_entry(hass: HomeAssistant) -> None:
@@ -59,4 +60,3 @@ async def test_unload_entry(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
         assert entry.state is ConfigEntryState.NOT_LOADED
-        assert entry.entry_id not in hass.data[DOMAIN]
diff --git a/tests/components/steamist/test_switch.py b/tests/components/steamist/test_switch.py
index a20bebc4052..cd62c18590a 100644
--- a/tests/components/steamist/test_switch.py
+++ b/tests/components/steamist/test_switch.py
@@ -8,7 +8,7 @@ from unittest.mock import AsyncMock
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
 from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import (
     MOCK_ASYNC_GET_STATUS_ACTIVE,
diff --git a/tests/components/stookwijzer/conftest.py b/tests/components/stookwijzer/conftest.py
index 3f7303e97f6..dd7f2a7bbc3 100644
--- a/tests/components/stookwijzer/conftest.py
+++ b/tests/components/stookwijzer/conftest.py
@@ -1,6 +1,7 @@
 """Fixtures for Stookwijzer integration tests."""
 
 from collections.abc import Generator
+from typing import Required, TypedDict
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
@@ -12,6 +13,14 @@ from homeassistant.core import HomeAssistant
 from tests.common import MockConfigEntry
 
 
+class Forecast(TypedDict):
+    """Typed Stookwijzer forecast dict."""
+
+    datetime: Required[str]
+    advice: str | None
+    final: bool | None
+
+
 @pytest.fixture
 def mock_config_entry() -> MockConfigEntry:
     """Return the default mocked config entry."""
@@ -70,16 +79,38 @@ def mock_stookwijzer() -> Generator[MagicMock]:
             new=stookwijzer_mock,
         ),
     ):
-        stookwijzer_mock.async_transform_coordinates.return_value = (
-            200000.123456789,
-            450000.123456789,
-        )
+        stookwijzer_mock.async_transform_coordinates.return_value = {
+            "x": 450000.123456789,
+            "y": 200000.123456789,
+        }
 
         client = stookwijzer_mock.return_value
         client.lki = 2
         client.windspeed_ms = 2.5
         client.windspeed_bft = 2
         client.advice = "code_yellow"
+        client.async_get_forecast.return_value = (
+            Forecast(
+                datetime="2025-02-12T17:00:00+01:00",
+                advice="code_yellow",
+                final=True,
+            ),
+            Forecast(
+                datetime="2025-02-12T23:00:00+01:00",
+                advice="code_yellow",
+                final=True,
+            ),
+            Forecast(
+                datetime="2025-02-13T05:00:00+01:00",
+                advice="code_orange",
+                final=False,
+            ),
+            Forecast(
+                datetime="2025-02-13T11:00:00+01:00",
+                advice="code_orange",
+                final=False,
+            ),
+        )
 
         yield stookwijzer_mock
 
diff --git a/tests/components/stookwijzer/snapshots/test_diagnostics.ambr b/tests/components/stookwijzer/snapshots/test_diagnostics.ambr
index e2535d54466..452b5bd0a30 100644
--- a/tests/components/stookwijzer/snapshots/test_diagnostics.ambr
+++ b/tests/components/stookwijzer/snapshots/test_diagnostics.ambr
@@ -3,6 +3,28 @@
   dict({
     'advice': 'code_yellow',
     'air_quality_index': 2,
+    'forecast': list([
+      dict({
+        'advice': 'code_yellow',
+        'datetime': '2025-02-12T17:00:00+01:00',
+        'final': True,
+      }),
+      dict({
+        'advice': 'code_yellow',
+        'datetime': '2025-02-12T23:00:00+01:00',
+        'final': True,
+      }),
+      dict({
+        'advice': 'code_orange',
+        'datetime': '2025-02-13T05:00:00+01:00',
+        'final': False,
+      }),
+      dict({
+        'advice': 'code_orange',
+        'datetime': '2025-02-13T11:00:00+01:00',
+        'final': False,
+      }),
+    ]),
     'windspeed_ms': 2.5,
   })
 # ---
diff --git a/tests/components/stookwijzer/snapshots/test_sensor.ambr b/tests/components/stookwijzer/snapshots/test_sensor.ambr
index f6751a84f22..ff1f6a12b8a 100644
--- a/tests/components/stookwijzer/snapshots/test_sensor.ambr
+++ b/tests/components/stookwijzer/snapshots/test_sensor.ambr
@@ -12,6 +12,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -67,6 +68,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -118,6 +120,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/stookwijzer/test_config_flow.py b/tests/components/stookwijzer/test_config_flow.py
index 6dddf83c27a..060d2bdc26c 100644
--- a/tests/components/stookwijzer/test_config_flow.py
+++ b/tests/components/stookwijzer/test_config_flow.py
@@ -32,8 +32,8 @@ async def test_full_user_flow(
     assert result["type"] is FlowResultType.CREATE_ENTRY
     assert result["title"] == "Stookwijzer"
     assert result["data"] == {
-        CONF_LATITUDE: 200000.123456789,
-        CONF_LONGITUDE: 450000.123456789,
+        CONF_LATITUDE: 450000.123456789,
+        CONF_LONGITUDE: 200000.123456789,
     }
 
     assert len(mock_setup_entry.mock_calls) == 1
@@ -47,7 +47,7 @@ async def test_connection_error(
 ) -> None:
     """Test user configuration flow while connection fails."""
     original_return_value = mock_stookwijzer.async_transform_coordinates.return_value
-    mock_stookwijzer.async_transform_coordinates.return_value = (None, None)
+    mock_stookwijzer.async_transform_coordinates.return_value = None
 
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": SOURCE_USER}
diff --git a/tests/components/stookwijzer/test_init.py b/tests/components/stookwijzer/test_init.py
index ddefb6be772..4306b9afc26 100644
--- a/tests/components/stookwijzer/test_init.py
+++ b/tests/components/stookwijzer/test_init.py
@@ -66,8 +66,8 @@ async def test_migrate_entry(
 
     assert mock_v1_config_entry.version == 2
     assert mock_v1_config_entry.data == {
-        CONF_LATITUDE: 200000.123456789,
-        CONF_LONGITUDE: 450000.123456789,
+        CONF_LATITUDE: 450000.123456789,
+        CONF_LONGITUDE: 200000.123456789,
     }
 
 
@@ -81,7 +81,7 @@ async def test_entry_migration_failure(
     assert mock_v1_config_entry.version == 1
 
     # Failed getting the transformed coordinates
-    mock_stookwijzer.async_transform_coordinates.return_value = (None, None)
+    mock_stookwijzer.async_transform_coordinates.return_value = None
 
     mock_v1_config_entry.add_to_hass(hass)
     await hass.config_entries.async_setup(mock_v1_config_entry.entry_id)
diff --git a/tests/components/stream/conftest.py b/tests/components/stream/conftest.py
index 39e4de13fed..296505271c0 100644
--- a/tests/components/stream/conftest.py
+++ b/tests/components/stream/conftest.py
@@ -27,6 +27,8 @@ from homeassistant.components.stream.worker import StreamState
 
 from .common import generate_h264_video, stream_teardown
 
+_LOGGER = logging.getLogger(__name__)
+
 TEST_TIMEOUT = 7.0  # Lower than 9s home assistant timeout
 
 
@@ -44,7 +46,7 @@ class WorkerSync:
 
     def resume(self):
         """Allow the worker thread to finalize the stream."""
-        logging.debug("waking blocked worker")
+        _LOGGER.debug("waking blocked worker")
         self._event.set()
 
     def blocking_discontinuity(self, stream_state: StreamState):
@@ -52,7 +54,7 @@ class WorkerSync:
         # Worker is ending the stream, which clears all output buffers.
         # Block the worker thread until the test has a chance to verify
         # the segments under test.
-        logging.debug("blocking worker")
+        _LOGGER.debug("blocking worker")
         if self._event:
             self._event.wait()
 
diff --git a/tests/components/stream/test_hls.py b/tests/components/stream/test_hls.py
index cd48fd94c24..c96b7d9427f 100644
--- a/tests/components/stream/test_hls.py
+++ b/tests/components/stream/test_hls.py
@@ -19,7 +19,7 @@ from homeassistant.components.stream.const import (
 from homeassistant.components.stream.core import Orientation, Part
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import (
     FAKE_TIME,
diff --git a/tests/components/stream/test_ll_hls.py b/tests/components/stream/test_ll_hls.py
index 443103fdf92..1eb638237af 100644
--- a/tests/components/stream/test_ll_hls.py
+++ b/tests/components/stream/test_ll_hls.py
@@ -202,7 +202,7 @@ async def test_ll_hls_stream(
     datetime_re = re.compile(r"#EXT-X-PROGRAM-DATE-TIME:(?P<datetime>.+)")
     inf_re = re.compile(r"#EXTINF:(?P<segment_duration>[0-9]{1,}.[0-9]{3,}),")
     # keep track of which tests were done (indexed by re)
-    tested = {regex: False for regex in (part_re, datetime_re, inf_re)}
+    tested = dict.fromkeys((part_re, datetime_re, inf_re), False)
     # keep track of times and durations along playlist for checking consistency
     part_durations = []
     segment_duration = 0
diff --git a/tests/components/stream/test_recorder.py b/tests/components/stream/test_recorder.py
index 8e079cded45..7c856180f77 100644
--- a/tests/components/stream/test_recorder.py
+++ b/tests/components/stream/test_recorder.py
@@ -21,7 +21,7 @@ from homeassistant.components.stream.fmp4utils import find_box
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import (
     DefaultSegment as Segment,
diff --git a/tests/components/stream/test_worker.py b/tests/components/stream/test_worker.py
index 2be972cc6a2..276b4109652 100644
--- a/tests/components/stream/test_worker.py
+++ b/tests/components/stream/test_worker.py
@@ -56,6 +56,8 @@ from .test_ll_hls import TEST_PART_DURATION
 
 from tests.components.camera.common import EMPTY_8_6_JPEG, mock_turbo_jpeg
 
+_LOGGER = logging.getLogger(__name__)
+
 STREAM_SOURCE = "some-stream-source"
 # Formats here are arbitrary, not exercised by tests
 AUDIO_STREAM_FORMAT = "mp3"
@@ -229,7 +231,7 @@ class FakePyAvBuffer:
                 return
 
             def mux(self, packet):
-                logging.debug("Muxed packet: %s", packet)
+                _LOGGER.debug("Muxed packet: %s", packet)
                 self.capture_packets.append(packet)
 
             def __str__(self) -> str:
diff --git a/tests/components/streamlabswater/snapshots/test_binary_sensor.ambr b/tests/components/streamlabswater/snapshots/test_binary_sensor.ambr
index c74df76e71b..d13a19bc656 100644
--- a/tests/components/streamlabswater/snapshots/test_binary_sensor.ambr
+++ b/tests/components/streamlabswater/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/streamlabswater/snapshots/test_sensor.ambr b/tests/components/streamlabswater/snapshots/test_sensor.ambr
index d54cdcafb93..c1248f2c0a0 100644
--- a/tests/components/streamlabswater/snapshots/test_sensor.ambr
+++ b/tests/components/streamlabswater/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -57,6 +58,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -108,6 +110,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/stt/test_init.py b/tests/components/stt/test_init.py
index 3d5daab2bec..cada4b0c533 100644
--- a/tests/components/stt/test_init.py
+++ b/tests/components/stt/test_init.py
@@ -16,7 +16,7 @@ from homeassistant.components.stt import (
 )
 from homeassistant.config_entries import ConfigEntry, ConfigEntryState, ConfigFlow
 from homeassistant.core import HomeAssistant, State
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.setup import async_setup_component
 
 from .common import (
@@ -34,7 +34,6 @@ from tests.common import (
     mock_integration,
     mock_platform,
     mock_restore_cache,
-    reset_translation_cache,
 )
 from tests.typing import ClientSessionGenerator, WebSocketGenerator
 
@@ -145,7 +144,7 @@ async def mock_config_entry_setup(
     async def async_setup_entry_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test stt platform via config entry."""
         async_add_entities([mock_provider_entity])
@@ -519,9 +518,6 @@ async def test_default_engine_prefer_cloud_entity(
     assert provider_engine.name == "test"
     assert async_default_engine(hass) == "stt.cloud_stt_entity"
 
-    # Reset the `cloud` translations cache to avoid flaky translation checks
-    reset_translation_cache(hass, ["cloud"])
-
 
 async def test_get_engine_legacy(
     hass: HomeAssistant, tmp_path: Path, mock_provider: MockSTTProvider
diff --git a/tests/components/subaru/conftest.py b/tests/components/subaru/conftest.py
index e18ea8fd398..84d2fde97f7 100644
--- a/tests/components/subaru/conftest.py
+++ b/tests/components/subaru/conftest.py
@@ -33,7 +33,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.typing import UNDEFINED, UndefinedType
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .api_responses import TEST_VIN_2_EV, VEHICLE_DATA, VEHICLE_STATUS_EV
 
diff --git a/tests/components/subaru/test_config_flow.py b/tests/components/subaru/test_config_flow.py
index 6abc544c92a..0b45546902b 100644
--- a/tests/components/subaru/test_config_flow.py
+++ b/tests/components/subaru/test_config_flow.py
@@ -136,6 +136,7 @@ async def test_user_form_pin_not_required(
         "data": deepcopy(TEST_CONFIG),
         "options": {},
         "minor_version": 1,
+        "subentries": (),
     }
 
     expected["data"][CONF_PIN] = None
@@ -341,6 +342,7 @@ async def test_pin_form_success(hass: HomeAssistant, pin_form) -> None:
         "data": TEST_CONFIG,
         "options": {},
         "minor_version": 1,
+        "subentries": (),
     }
     result["data"][CONF_DEVICE_ID] = TEST_DEVICE_ID
     assert result == expected
diff --git a/tests/components/suez_water/snapshots/test_sensor.ambr b/tests/components/suez_water/snapshots/test_sensor.ambr
index da0ed3df7dd..536e79df606 100644
--- a/tests/components/suez_water/snapshots/test_sensor.ambr
+++ b/tests/components/suez_water/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -55,6 +56,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/sun/test_init.py b/tests/components/sun/test_init.py
index a30076d6d3c..3896498bbb0 100644
--- a/tests/components/sun/test_init.py
+++ b/tests/components/sun/test_init.py
@@ -13,7 +13,7 @@ from homeassistant.components.sun import entity
 from homeassistant.const import EVENT_STATE_CHANGED
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/sun/test_sensor.py b/tests/components/sun/test_sensor.py
index cb97ae565c7..59e4e4c700b 100644
--- a/tests/components/sun/test_sensor.py
+++ b/tests/components/sun/test_sensor.py
@@ -10,9 +10,9 @@ import pytest
 from homeassistant.components import sun
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
diff --git a/tests/components/sun/test_trigger.py b/tests/components/sun/test_trigger.py
index 303ca3b80cd..a7aeae25ac7 100644
--- a/tests/components/sun/test_trigger.py
+++ b/tests/components/sun/test_trigger.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed, mock_component
 
diff --git a/tests/components/swiss_public_transport/snapshots/test_sensor.ambr b/tests/components/swiss_public_transport/snapshots/test_sensor.ambr
index dbd689fc8f6..5ba65b2bd70 100644
--- a/tests/components/swiss_public_transport/snapshots/test_sensor.ambr
+++ b/tests/components/swiss_public_transport/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -55,6 +56,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -103,6 +105,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -151,6 +154,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -192,55 +196,6 @@
     'state': '2024-01-06T17:05:00+00:00',
   })
 # ---
-# name: test_all_entities[sensor.zurich_bern_duration-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': None,
-    'entity_id': 'sensor.zurich_bern_duration',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
-    'original_icon': None,
-    'original_name': 'Duration',
-    'platform': 'swiss_public_transport',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'Zürich Bern_duration',
-    'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
-  })
-# ---
-# name: test_all_entities[sensor.zurich_bern_duration-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by transport.opendata.ch',
-      'device_class': 'duration',
-      'friendly_name': 'Zürich Bern Duration',
-      'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.zurich_bern_duration',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '10',
-  })
-# ---
 # name: test_all_entities[sensor.zurich_bern_line-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -248,6 +203,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -295,6 +251,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -342,6 +299,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -382,3 +340,56 @@
     'state': '0',
   })
 # ---
+# name: test_all_entities[sensor.zurich_bern_trip_duration-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.zurich_bern_trip_duration',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Trip duration',
+    'platform': 'swiss_public_transport',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'trip_duration',
+    'unique_id': 'Zürich Bern_duration',
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+  })
+# ---
+# name: test_all_entities[sensor.zurich_bern_trip_duration-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'attribution': 'Data provided by transport.opendata.ch',
+      'device_class': 'duration',
+      'friendly_name': 'Zürich Bern Trip duration',
+      'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.zurich_bern_trip_duration',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.003',
+  })
+# ---
diff --git a/tests/components/swiss_public_transport/test_sensor.py b/tests/components/swiss_public_transport/test_sensor.py
index 4afdd88c9de..6e832728277 100644
--- a/tests/components/swiss_public_transport/test_sensor.py
+++ b/tests/components/swiss_public_transport/test_sensor.py
@@ -83,7 +83,7 @@ async def test_fetching_data(
         hass.states.get("sensor.zurich_bern_departure_2").state
         == "2024-01-06T17:05:00+00:00"
     )
-    assert hass.states.get("sensor.zurich_bern_duration").state == "10"
+    assert hass.states.get("sensor.zurich_bern_trip_duration").state == "0.003"
     assert hass.states.get("sensor.zurich_bern_platform").state == "0"
     assert hass.states.get("sensor.zurich_bern_transfers").state == "0"
     assert hass.states.get("sensor.zurich_bern_delay").state == "0"
diff --git a/tests/components/switch/test_device_condition.py b/tests/components/switch/test_device_condition.py
index 7c4f434b0a4..5c5737804e1 100644
--- a/tests/components/switch/test_device_condition.py
+++ b/tests/components/switch/test_device_condition.py
@@ -14,7 +14,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/switch/test_device_trigger.py b/tests/components/switch/test_device_trigger.py
index 08e6ab6d0f6..81f8a93611d 100644
--- a/tests/components/switch/test_device_trigger.py
+++ b/tests/components/switch/test_device_trigger.py
@@ -13,7 +13,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/switchbot/__init__.py b/tests/components/switchbot/__init__.py
index 9ecffd395a3..d123c93a873 100644
--- a/tests/components/switchbot/__init__.py
+++ b/tests/components/switchbot/__init__.py
@@ -274,3 +274,48 @@ LEAK_SERVICE_INFO = BluetoothServiceInfoBleak(
     connectable=False,
     tx_power=-127,
 )
+
+REMOTE_SERVICE_INFO = BluetoothServiceInfoBleak(
+    name="Any",
+    manufacturer_data={89: b"\xaa\xbb\xcc\xdd\xee\xff"},
+    service_data={"00000d00-0000-1000-8000-00805f9b34fb": b"b V\x00"},
+    service_uuids=["cba20d00-224d-11e6-9fb8-0002a5d5c51b"],
+    address="AA:BB:CC:DD:EE:FF",
+    rssi=-60,
+    source="local",
+    advertisement=generate_advertisement_data(
+        local_name="Any",
+        manufacturer_data={89: b"\xaa\xbb\xcc\xdd\xee\xff"},
+        service_data={"00000d00-0000-1000-8000-00805f9b34fb": b"b V\x00"},
+        service_uuids=["cba20d00-224d-11e6-9fb8-0002a5d5c51b"],
+    ),
+    device=generate_ble_device("AA:BB:CC:DD:EE:FF", "Any"),
+    time=0,
+    connectable=False,
+    tx_power=-127,
+)
+
+
+WOHUB2_SERVICE_INFO = BluetoothServiceInfoBleak(
+    name="WoHub2",
+    manufacturer_data={
+        2409: b"\xe7\x06\x1dx\x99y\x00\xffg\xe2\xbf]\x84\x04\x9a,\x00",
+    },
+    service_data={"0000fd3d-0000-1000-8000-00805f9b34fb": b"v\x00"},
+    service_uuids=["cba20d00-224d-11e6-9fb8-0002a5d5c51b"],
+    address="AA:BB:CC:DD:EE:FF",
+    rssi=-60,
+    source="local",
+    advertisement=generate_advertisement_data(
+        local_name="WoHub2",
+        manufacturer_data={
+            2409: b"\xe7\x06\x1dx\x99y\x00\xffg\xe2\xbf]\x84\x04\x9a,\x00",
+        },
+        service_data={"0000fd3d-0000-1000-8000-00805f9b34fb": b"v\x00"},
+        service_uuids=["cba20d00-224d-11e6-9fb8-0002a5d5c51b"],
+    ),
+    device=generate_ble_device("AA:BB:CC:DD:EE:FF", "WoHub2"),
+    time=0,
+    connectable=True,
+    tx_power=-127,
+)
diff --git a/tests/components/switchbot/test_config_flow.py b/tests/components/switchbot/test_config_flow.py
index 3caa2a1f0df..1038bd318f5 100644
--- a/tests/components/switchbot/test_config_flow.py
+++ b/tests/components/switchbot/test_config_flow.py
@@ -10,7 +10,7 @@ from homeassistant.components.switchbot.const import (
     CONF_LOCK_NIGHTLATCH,
     CONF_RETRY_COUNT,
 )
-from homeassistant.config_entries import SOURCE_BLUETOOTH, SOURCE_USER
+from homeassistant.config_entries import SOURCE_BLUETOOTH, SOURCE_IGNORE, SOURCE_USER
 from homeassistant.const import (
     CONF_ADDRESS,
     CONF_NAME,
@@ -303,6 +303,39 @@ async def test_user_setup_wohand_already_configured(hass: HomeAssistant) -> None
     assert result["reason"] == "no_devices_found"
 
 
+async def test_user_setup_wohand_replaces_ignored(hass: HomeAssistant) -> None:
+    """Test setting up a switchbot replaces an ignored entry."""
+    entry = MockConfigEntry(
+        domain=DOMAIN, data={}, unique_id="aabbccddeeff", source=SOURCE_IGNORE
+    )
+    entry.add_to_hass(hass)
+    with patch(
+        "homeassistant.components.switchbot.config_flow.async_discovered_service_info",
+        return_value=[WOHAND_SERVICE_INFO],
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_USER}
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "confirm"
+
+    with patch_async_setup_entry() as mock_setup_entry:
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {},
+        )
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "Bot EEFF"
+    assert result["data"] == {
+        CONF_ADDRESS: "AA:BB:CC:DD:EE:FF",
+        CONF_SENSOR_TYPE: "bot",
+    }
+
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
 async def test_user_setup_wocurtain(hass: HomeAssistant) -> None:
     """Test the user initiated form with password and valid mac."""
 
diff --git a/tests/components/switchbot/test_sensor.py b/tests/components/switchbot/test_sensor.py
index acf1bacc054..5fd270b3393 100644
--- a/tests/components/switchbot/test_sensor.py
+++ b/tests/components/switchbot/test_sensor.py
@@ -23,7 +23,9 @@ from homeassistant.setup import async_setup_component
 
 from . import (
     LEAK_SERVICE_INFO,
+    REMOTE_SERVICE_INFO,
     WOHAND_SERVICE_INFO,
+    WOHUB2_SERVICE_INFO,
     WOMETERTHPC_SERVICE_INFO,
     WORELAY_SWITCH_1PM_SERVICE_INFO,
 )
@@ -194,3 +196,100 @@ async def test_leak_sensor(hass: HomeAssistant) -> None:
 
     assert await hass.config_entries.async_unload(entry.entry_id)
     await hass.async_block_till_done()
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_remote(hass: HomeAssistant) -> None:
+    """Test setting up the remote sensor."""
+    await async_setup_component(hass, DOMAIN, {})
+    inject_bluetooth_service_info(hass, REMOTE_SERVICE_INFO)
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            CONF_ADDRESS: "aa:bb:cc:dd:ee:ff",
+            CONF_NAME: "test-name",
+            CONF_SENSOR_TYPE: "remote",
+        },
+        unique_id="aabbccddeeff",
+    )
+    entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert len(hass.states.async_all("sensor")) == 2
+
+    battery_sensor = hass.states.get("sensor.test_name_battery")
+    battery_sensor_attrs = battery_sensor.attributes
+    assert battery_sensor.state == "86"
+    assert battery_sensor_attrs[ATTR_FRIENDLY_NAME] == "test-name Battery"
+    assert battery_sensor_attrs[ATTR_UNIT_OF_MEASUREMENT] == "%"
+    assert battery_sensor_attrs[ATTR_STATE_CLASS] == "measurement"
+
+    rssi_sensor = hass.states.get("sensor.test_name_bluetooth_signal")
+    rssi_sensor_attrs = rssi_sensor.attributes
+    assert rssi_sensor.state == "-60"
+    assert rssi_sensor_attrs[ATTR_FRIENDLY_NAME] == "test-name Bluetooth signal"
+    assert rssi_sensor_attrs[ATTR_UNIT_OF_MEASUREMENT] == "dBm"
+
+    assert await hass.config_entries.async_unload(entry.entry_id)
+    await hass.async_block_till_done()
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_hub2_sensor(hass: HomeAssistant) -> None:
+    """Test setting up creates the sensor for WoHub2."""
+    await async_setup_component(hass, DOMAIN, {})
+    inject_bluetooth_service_info(hass, WOHUB2_SERVICE_INFO)
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            CONF_ADDRESS: "AA:BB:CC:DD:EE:FF",
+            CONF_NAME: "test-name",
+            CONF_SENSOR_TYPE: "hub2",
+        },
+        unique_id="aabbccddeeff",
+    )
+    entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert len(hass.states.async_all("sensor")) == 5
+
+    temperature_sensor = hass.states.get("sensor.test_name_temperature")
+    temperature_sensor_attrs = temperature_sensor.attributes
+    assert temperature_sensor.state == "26.4"
+    assert temperature_sensor_attrs[ATTR_FRIENDLY_NAME] == "test-name Temperature"
+    assert temperature_sensor_attrs[ATTR_UNIT_OF_MEASUREMENT] == "°C"
+    assert temperature_sensor_attrs[ATTR_STATE_CLASS] == "measurement"
+
+    humidity_sensor = hass.states.get("sensor.test_name_humidity")
+    humidity_sensor_attrs = humidity_sensor.attributes
+    assert humidity_sensor.state == "44"
+    assert humidity_sensor_attrs[ATTR_FRIENDLY_NAME] == "test-name Humidity"
+    assert humidity_sensor_attrs[ATTR_UNIT_OF_MEASUREMENT] == "%"
+    assert humidity_sensor_attrs[ATTR_STATE_CLASS] == "measurement"
+
+    light_level_sensor = hass.states.get("sensor.test_name_light_level")
+    light_level_sensor_attrs = light_level_sensor.attributes
+    assert light_level_sensor.state == "4"
+    assert light_level_sensor_attrs[ATTR_FRIENDLY_NAME] == "test-name Light level"
+    assert light_level_sensor_attrs[ATTR_UNIT_OF_MEASUREMENT] == "Level"
+
+    light_level_sensor = hass.states.get("sensor.test_name_illuminance")
+    light_level_sensor_attrs = light_level_sensor.attributes
+    assert light_level_sensor.state == "30"
+    assert light_level_sensor_attrs[ATTR_FRIENDLY_NAME] == "test-name Illuminance"
+    assert light_level_sensor_attrs[ATTR_UNIT_OF_MEASUREMENT] == "lx"
+
+    rssi_sensor = hass.states.get("sensor.test_name_bluetooth_signal")
+    rssi_sensor_attrs = rssi_sensor.attributes
+    assert rssi_sensor.state == "-60"
+    assert rssi_sensor_attrs[ATTR_FRIENDLY_NAME] == "test-name Bluetooth signal"
+    assert rssi_sensor_attrs[ATTR_UNIT_OF_MEASUREMENT] == "dBm"
+
+    assert await hass.config_entries.async_unload(entry.entry_id)
+    await hass.async_block_till_done()
diff --git a/tests/components/switchbot_cloud/__init__.py b/tests/components/switchbot_cloud/__init__.py
index ce570499b3a..42fe3e4f543 100644
--- a/tests/components/switchbot_cloud/__init__.py
+++ b/tests/components/switchbot_cloud/__init__.py
@@ -7,7 +7,7 @@ from homeassistant.core import HomeAssistant
 from tests.common import MockConfigEntry
 
 
-def configure_integration(hass: HomeAssistant) -> MockConfigEntry:
+async def configure_integration(hass: HomeAssistant) -> MockConfigEntry:
     """Configure the integration."""
     config = {
         CONF_API_TOKEN: "test-token",
@@ -17,5 +17,7 @@ def configure_integration(hass: HomeAssistant) -> MockConfigEntry:
         domain=DOMAIN, data=config, entry_id="123456", unique_id="123456"
     )
     entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
 
     return entry
diff --git a/tests/components/switchbot_cloud/fixtures/meter_status.json b/tests/components/switchbot_cloud/fixtures/meter_status.json
new file mode 100644
index 00000000000..8b5bcd0c031
--- /dev/null
+++ b/tests/components/switchbot_cloud/fixtures/meter_status.json
@@ -0,0 +1,9 @@
+{
+  "version": "V3.3",
+  "temperature": 21.8,
+  "battery": 100,
+  "humidity": 32,
+  "deviceId": "meter-id-1",
+  "deviceType": "Meter",
+  "hubDeviceId": "test-hub-id"
+}
diff --git a/tests/components/switchbot_cloud/snapshots/test_sensor.ambr b/tests/components/switchbot_cloud/snapshots/test_sensor.ambr
new file mode 100644
index 00000000000..2446add959b
--- /dev/null
+++ b/tests/components/switchbot_cloud/snapshots/test_sensor.ambr
@@ -0,0 +1,313 @@
+# serializer version: 1
+# name: test_meter[sensor.meter_1_battery-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.meter_1_battery',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
+    'original_icon': None,
+    'original_name': 'Battery',
+    'platform': 'switchbot_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'meter-id-1_battery',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_meter[sensor.meter_1_battery-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'battery',
+      'friendly_name': 'meter-1 Battery',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.meter_1_battery',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '100',
+  })
+# ---
+# name: test_meter[sensor.meter_1_humidity-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.meter_1_humidity',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.HUMIDITY: 'humidity'>,
+    'original_icon': None,
+    'original_name': 'Humidity',
+    'platform': 'switchbot_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'meter-id-1_humidity',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_meter[sensor.meter_1_humidity-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'humidity',
+      'friendly_name': 'meter-1 Humidity',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.meter_1_humidity',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '32',
+  })
+# ---
+# name: test_meter[sensor.meter_1_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.meter_1_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'switchbot_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'meter-id-1_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_meter[sensor.meter_1_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'meter-1 Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.meter_1_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '21.8',
+  })
+# ---
+# name: test_meter_no_coordinator_data[sensor.meter_1_battery-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.meter_1_battery',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
+    'original_icon': None,
+    'original_name': 'Battery',
+    'platform': 'switchbot_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'meter-id-1_battery',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_meter_no_coordinator_data[sensor.meter_1_battery-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'battery',
+      'friendly_name': 'meter-1 Battery',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.meter_1_battery',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_meter_no_coordinator_data[sensor.meter_1_humidity-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.meter_1_humidity',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.HUMIDITY: 'humidity'>,
+    'original_icon': None,
+    'original_name': 'Humidity',
+    'platform': 'switchbot_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'meter-id-1_humidity',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_meter_no_coordinator_data[sensor.meter_1_humidity-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'humidity',
+      'friendly_name': 'meter-1 Humidity',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.meter_1_humidity',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_meter_no_coordinator_data[sensor.meter_1_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.meter_1_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature',
+    'platform': 'switchbot_cloud',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'meter-id-1_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_meter_no_coordinator_data[sensor.meter_1_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'meter-1 Temperature',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.meter_1_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
diff --git a/tests/components/switchbot_cloud/test_button.py b/tests/components/switchbot_cloud/test_button.py
index df5b7569100..0779e54ee03 100644
--- a/tests/components/switchbot_cloud/test_button.py
+++ b/tests/components/switchbot_cloud/test_button.py
@@ -28,10 +28,7 @@ async def test_pressmode_bot(
 
     mock_get_status.return_value = {"deviceMode": "pressMode"}
 
-    entry = configure_integration(hass)
-    await hass.config_entries.async_setup(entry.entry_id)
-    await hass.async_block_till_done()
-
+    entry = await configure_integration(hass)
     assert entry.state is ConfigEntryState.LOADED
 
     entity_id = "button.bot_1"
@@ -63,9 +60,6 @@ async def test_switchmode_bot_no_button_entity(
 
     mock_get_status.return_value = {"deviceMode": "switchMode"}
 
-    entry = configure_integration(hass)
-    await hass.config_entries.async_setup(entry.entry_id)
-    await hass.async_block_till_done()
-
+    entry = await configure_integration(hass)
     assert entry.state is ConfigEntryState.LOADED
     assert not hass.states.async_entity_ids(BUTTON_DOMAIN)
diff --git a/tests/components/switchbot_cloud/test_init.py b/tests/components/switchbot_cloud/test_init.py
index d5728faf369..f4837c4e97e 100644
--- a/tests/components/switchbot_cloud/test_init.py
+++ b/tests/components/switchbot_cloud/test_init.py
@@ -64,9 +64,7 @@ async def test_setup_entry_success(
         ),
     ]
     mock_get_status.return_value = {"power": PowerState.ON.value}
-    entry = configure_integration(hass)
-    await hass.config_entries.async_setup(entry.entry_id)
-    await hass.async_block_till_done()
+    entry = await configure_integration(hass)
     assert entry.state is ConfigEntryState.LOADED
 
     hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
@@ -91,8 +89,7 @@ async def test_setup_entry_fails_when_listing_devices(
 ) -> None:
     """Test error handling when list_devices in setup of entry."""
     mock_list_devices.side_effect = error
-    entry = configure_integration(hass)
-    await hass.config_entries.async_setup(entry.entry_id)
+    entry = await configure_integration(hass)
     assert entry.state == state
 
     hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
@@ -114,8 +111,7 @@ async def test_setup_entry_fails_when_refreshing(
         )
     ]
     mock_get_status.side_effect = CannotConnect
-    entry = configure_integration(hass)
-    await hass.config_entries.async_setup(entry.entry_id)
+    entry = await configure_integration(hass)
     assert entry.state is ConfigEntryState.SETUP_RETRY
 
     hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
diff --git a/tests/components/switchbot_cloud/test_lock.py b/tests/components/switchbot_cloud/test_lock.py
index a09d7241794..fcb81abfc51 100644
--- a/tests/components/switchbot_cloud/test_lock.py
+++ b/tests/components/switchbot_cloud/test_lock.py
@@ -26,9 +26,7 @@ async def test_lock(hass: HomeAssistant, mock_list_devices, mock_get_status) ->
 
     mock_get_status.return_value = {"lockState": "locked"}
 
-    entry = configure_integration(hass)
-    await hass.config_entries.async_setup(entry.entry_id)
-    await hass.async_block_till_done()
+    entry = await configure_integration(hass)
 
     assert entry.state is ConfigEntryState.LOADED
 
diff --git a/tests/components/switchbot_cloud/test_sensor.py b/tests/components/switchbot_cloud/test_sensor.py
new file mode 100644
index 00000000000..6b0a52800f3
--- /dev/null
+++ b/tests/components/switchbot_cloud/test_sensor.py
@@ -0,0 +1,65 @@
+"""Test for the switchbot_cloud sensors."""
+
+from unittest.mock import patch
+
+from switchbot_api import Device
+from syrupy import SnapshotAssertion
+
+from homeassistant.components.switchbot_cloud.const import DOMAIN
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import configure_integration
+
+from tests.common import load_json_object_fixture, snapshot_platform
+
+
+async def test_meter(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+    mock_list_devices,
+    mock_get_status,
+) -> None:
+    """Test Meter sensors."""
+
+    mock_list_devices.return_value = [
+        Device(
+            deviceId="meter-id-1",
+            deviceName="meter-1",
+            deviceType="Meter",
+            hubDeviceId="test-hub-id",
+        ),
+    ]
+    mock_get_status.return_value = load_json_object_fixture("meter_status.json", DOMAIN)
+
+    with patch("homeassistant.components.switchbot_cloud.PLATFORMS", [Platform.SENSOR]):
+        entry = await configure_integration(hass)
+
+    await snapshot_platform(hass, entity_registry, snapshot, entry.entry_id)
+
+
+async def test_meter_no_coordinator_data(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+    mock_list_devices,
+    mock_get_status,
+) -> None:
+    """Test meter sensors are unknown without coordinator data."""
+    mock_list_devices.return_value = [
+        Device(
+            deviceId="meter-id-1",
+            deviceName="meter-1",
+            deviceType="Meter",
+            hubDeviceId="test-hub-id",
+        ),
+    ]
+
+    mock_get_status.return_value = None
+
+    with patch("homeassistant.components.switchbot_cloud.PLATFORMS", [Platform.SENSOR]):
+        entry = await configure_integration(hass)
+
+    await snapshot_platform(hass, entity_registry, snapshot, entry.entry_id)
diff --git a/tests/components/switchbot_cloud/test_switch.py b/tests/components/switchbot_cloud/test_switch.py
index b1c6fb81b96..99e0f50aa53 100644
--- a/tests/components/switchbot_cloud/test_switch.py
+++ b/tests/components/switchbot_cloud/test_switch.py
@@ -34,10 +34,7 @@ async def test_relay_switch(
 
     mock_get_status.return_value = {"switchStatus": 0}
 
-    entry = configure_integration(hass)
-    await hass.config_entries.async_setup(entry.entry_id)
-    await hass.async_block_till_done()
-
+    entry = await configure_integration(hass)
     assert entry.state is ConfigEntryState.LOADED
 
     entity_id = "switch.relay_switch_1"
@@ -71,10 +68,7 @@ async def test_switchmode_bot(
 
     mock_get_status.return_value = {"deviceMode": "switchMode", "power": "off"}
 
-    entry = configure_integration(hass)
-    await hass.config_entries.async_setup(entry.entry_id)
-    await hass.async_block_till_done()
-
+    entry = await configure_integration(hass)
     assert entry.state is ConfigEntryState.LOADED
 
     entity_id = "switch.bot_1"
@@ -108,9 +102,6 @@ async def test_pressmode_bot_no_switch_entity(
 
     mock_get_status.return_value = {"deviceMode": "pressMode"}
 
-    entry = configure_integration(hass)
-    await hass.config_entries.async_setup(entry.entry_id)
-    await hass.async_block_till_done()
-
+    entry = await configure_integration(hass)
     assert entry.state is ConfigEntryState.LOADED
     assert not hass.states.async_entity_ids(SWITCH_DOMAIN)
diff --git a/tests/components/switcher_kis/test_diagnostics.py b/tests/components/switcher_kis/test_diagnostics.py
index 53572085f9b..f59958420c4 100644
--- a/tests/components/switcher_kis/test_diagnostics.py
+++ b/tests/components/switcher_kis/test_diagnostics.py
@@ -69,5 +69,6 @@ async def test_diagnostics(
             "created_at": ANY,
             "modified_at": ANY,
             "discovery_keys": {},
+            "subentries": [],
         },
     }
diff --git a/tests/components/synology_dsm/common.py b/tests/components/synology_dsm/common.py
new file mode 100644
index 00000000000..e98b0d21d66
--- /dev/null
+++ b/tests/components/synology_dsm/common.py
@@ -0,0 +1,22 @@
+"""Configure Synology DSM tests."""
+
+from __future__ import annotations
+
+from unittest.mock import AsyncMock, Mock
+
+from awesomeversion import AwesomeVersion
+
+from .consts import SERIAL
+
+
+def mock_dsm_information(
+    serial: str | None = SERIAL,
+    update_result: bool = True,
+    awesome_version: str = "7.2",
+) -> Mock:
+    """Mock SynologyDSM information."""
+    return Mock(
+        serial=serial,
+        update=AsyncMock(return_value=update_result),
+        awesome_version=AwesomeVersion(awesome_version),
+    )
diff --git a/tests/components/synology_dsm/conftest.py b/tests/components/synology_dsm/conftest.py
index 0e8f79ffd40..96d6453cf16 100644
--- a/tests/components/synology_dsm/conftest.py
+++ b/tests/components/synology_dsm/conftest.py
@@ -8,6 +8,8 @@ import pytest
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
+from .common import mock_dsm_information
+
 
 @pytest.fixture
 def mock_setup_entry() -> Generator[AsyncMock]:
@@ -31,8 +33,9 @@ def fixture_dsm():
         dsm.login = AsyncMock(return_value=True)
         dsm.update = AsyncMock(return_value=True)
 
+        dsm.information = mock_dsm_information()
         dsm.network.update = AsyncMock(return_value=True)
         dsm.surveillance_station.update = AsyncMock(return_value=True)
         dsm.upgrade.update = AsyncMock(return_value=True)
-
+        dsm.file = AsyncMock(get_shared_folders=AsyncMock(return_value=None))
     return dsm
diff --git a/tests/components/synology_dsm/snapshots/test_config_flow.ambr b/tests/components/synology_dsm/snapshots/test_config_flow.ambr
index 807ec764e52..384f6b885d7 100644
--- a/tests/components/synology_dsm/snapshots/test_config_flow.ambr
+++ b/tests/components/synology_dsm/snapshots/test_config_flow.ambr
@@ -84,3 +84,17 @@
     'verify_ssl': False,
   })
 # ---
+# name: test_user_with_filestation
+  dict({
+    'host': 'nas.meontheinternet.com',
+    'mac': list([
+      '00-11-32-XX-XX-59',
+      '00-11-32-XX-XX-5A',
+    ]),
+    'password': 'password',
+    'port': 1234,
+    'ssl': True,
+    'username': 'Home_Assistant',
+    'verify_ssl': False,
+  })
+# ---
diff --git a/tests/components/synology_dsm/test_backup.py b/tests/components/synology_dsm/test_backup.py
new file mode 100644
index 00000000000..db0062b45bf
--- /dev/null
+++ b/tests/components/synology_dsm/test_backup.py
@@ -0,0 +1,804 @@
+"""Tests for the Synology DSM backup agent."""
+
+from io import StringIO
+from typing import Any
+from unittest.mock import ANY, AsyncMock, MagicMock, Mock, patch
+
+from freezegun.api import FrozenDateTimeFactory
+import pytest
+from synology_dsm.api.file_station.models import SynoFileFile, SynoFileSharedFolder
+from synology_dsm.exceptions import (
+    SynologyDSMAPIErrorException,
+    SynologyDSMRequestException,
+)
+
+from homeassistant.components.backup import (
+    DOMAIN as BACKUP_DOMAIN,
+    AddonInfo,
+    AgentBackup,
+    Folder,
+)
+from homeassistant.components.synology_dsm.const import (
+    CONF_BACKUP_PATH,
+    CONF_BACKUP_SHARE,
+    DOMAIN,
+)
+from homeassistant.const import (
+    CONF_HOST,
+    CONF_MAC,
+    CONF_PASSWORD,
+    CONF_PORT,
+    CONF_SSL,
+    CONF_USERNAME,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.backup import async_initialize_backup
+from homeassistant.setup import async_setup_component
+from homeassistant.util.aiohttp import MockStreamReader
+
+from .common import mock_dsm_information
+from .consts import HOST, MACS, PASSWORD, PORT, USE_SSL, USERNAME
+
+from tests.common import MockConfigEntry
+from tests.typing import ClientSessionGenerator, WebSocketGenerator
+
+BASE_FILENAME = "Automatic_backup_2025.2.0.dev0_2025-01-09_20.14_35457323"
+
+
+class MockStreamReaderChunked(MockStreamReader):
+    """Mock a stream reader with simulated chunked data."""
+
+    async def readchunk(self) -> tuple[bytes, bool]:
+        """Read bytes."""
+        return (self._content.read(), False)
+
+
+async def _mock_download_file(path: str, filename: str) -> MockStreamReader:
+    if filename == f"{BASE_FILENAME}_meta.json":
+        return MockStreamReader(
+            b'{"addons":[],"backup_id":"abcd12ef","date":"2025-01-09T20:14:35.457323+01:00",'
+            b'"database_included":true,"extra_metadata":{"instance_id":"36b3b7e984da43fc89f7bafb2645fa36",'
+            b'"with_automatic_settings":true},"folders":[],"homeassistant_included":true,'
+            b'"homeassistant_version":"2025.2.0.dev0","name":"Automatic backup 2025.2.0.dev0","protected":true,"size":13916160}'
+        )
+    if filename == f"{BASE_FILENAME}.tar":
+        return MockStreamReaderChunked(b"backup data")
+    raise MockStreamReaderChunked(b"")
+
+
+async def _mock_download_file_meta_ok_tar_missing(
+    path: str, filename: str
+) -> MockStreamReader:
+    if filename == f"{BASE_FILENAME}_meta.json":
+        return MockStreamReader(
+            b'{"addons":[],"backup_id":"abcd12ef","date":"2025-01-09T20:14:35.457323+01:00",'
+            b'"database_included":true,"extra_metadata":{"instance_id":"36b3b7e984da43fc89f7bafb2645fa36",'
+            b'"with_automatic_settings":true},"folders":[],"homeassistant_included":true,'
+            b'"homeassistant_version":"2025.2.0.dev0","name":"Automatic backup 2025.2.0.dev0","protected":true,"size":13916160}'
+        )
+    if filename == f"{BASE_FILENAME}.tar":
+        raise SynologyDSMAPIErrorException("api", "900", [{"code": 408}])
+    raise MockStreamReaderChunked(b"")
+
+
+async def _mock_download_file_meta_defect(path: str, filename: str) -> MockStreamReader:
+    if filename == f"{BASE_FILENAME}_meta.json":
+        return MockStreamReader(b"im not a json")
+    if filename == f"{BASE_FILENAME}.tar":
+        return MockStreamReaderChunked(b"backup data")
+    raise MockStreamReaderChunked(b"")
+
+
+@pytest.fixture
+def mock_dsm_with_filestation():
+    """Mock a successful service with filestation support."""
+    with patch("homeassistant.components.synology_dsm.common.SynologyDSM") as dsm:
+        dsm.login = AsyncMock(return_value=True)
+        dsm.update = AsyncMock(return_value=True)
+
+        dsm.surveillance_station.update = AsyncMock(return_value=True)
+        dsm.upgrade.update = AsyncMock(return_value=True)
+        dsm.utilisation = Mock(cpu_user_load=1, update=AsyncMock(return_value=True))
+        dsm.network = Mock(update=AsyncMock(return_value=True), macs=MACS)
+        dsm.storage = Mock(
+            disks_ids=["sda", "sdb", "sdc"],
+            volumes_ids=["volume_1"],
+            update=AsyncMock(return_value=True),
+        )
+        dsm.information = mock_dsm_information()
+        dsm.file = AsyncMock(
+            get_shared_folders=AsyncMock(
+                return_value=[
+                    SynoFileSharedFolder(
+                        additional=None,
+                        is_dir=True,
+                        name="HA Backup",
+                        path="/ha_backup",
+                    )
+                ]
+            ),
+            get_files=AsyncMock(
+                return_value=[
+                    SynoFileFile(
+                        additional=None,
+                        is_dir=False,
+                        name=f"{BASE_FILENAME}_meta.json",
+                        path=f"/ha_backup/my_backup_path/{BASE_FILENAME}_meta.json",
+                    ),
+                    SynoFileFile(
+                        additional=None,
+                        is_dir=False,
+                        name=f"{BASE_FILENAME}.tar",
+                        path=f"/ha_backup/my_backup_path/{BASE_FILENAME}.tar",
+                    ),
+                ]
+            ),
+            download_file=_mock_download_file,
+            upload_file=AsyncMock(return_value=True),
+            delete_file=AsyncMock(return_value=True),
+        )
+        dsm.logout = AsyncMock(return_value=True)
+        yield dsm
+
+
+@pytest.fixture
+def mock_dsm_without_filestation():
+    """Mock a successful service with filestation support."""
+
+    with patch("homeassistant.components.synology_dsm.common.SynologyDSM") as dsm:
+        dsm.login = AsyncMock(return_value=True)
+        dsm.update = AsyncMock(return_value=True)
+
+        dsm.surveillance_station.update = AsyncMock(return_value=True)
+        dsm.upgrade.update = AsyncMock(return_value=True)
+        dsm.utilisation = Mock(cpu_user_load=1, update=AsyncMock(return_value=True))
+        dsm.network = Mock(update=AsyncMock(return_value=True), macs=MACS)
+        dsm.information = mock_dsm_information()
+        dsm.storage = Mock(
+            disks_ids=["sda", "sdb", "sdc"],
+            volumes_ids=["volume_1"],
+            update=AsyncMock(return_value=True),
+        )
+        dsm.file = None
+
+        yield dsm
+
+
+@pytest.fixture
+async def setup_dsm_with_filestation(
+    hass: HomeAssistant,
+    mock_dsm_with_filestation: MagicMock,
+):
+    """Mock setup of synology dsm config entry and backup integration."""
+    async_initialize_backup(hass)
+    with (
+        patch(
+            "homeassistant.components.synology_dsm.common.SynologyDSM",
+            return_value=mock_dsm_with_filestation,
+        ),
+        patch("homeassistant.components.synology_dsm.PLATFORMS", return_value=[]),
+    ):
+        entry = MockConfigEntry(
+            domain=DOMAIN,
+            data={
+                CONF_HOST: HOST,
+                CONF_PORT: PORT,
+                CONF_SSL: USE_SSL,
+                CONF_USERNAME: USERNAME,
+                CONF_PASSWORD: PASSWORD,
+                CONF_MAC: MACS[0],
+            },
+            options={
+                CONF_BACKUP_PATH: "my_backup_path",
+                CONF_BACKUP_SHARE: "/ha_backup",
+            },
+            unique_id="mocked_syno_dsm_entry",
+        )
+        entry.add_to_hass(hass)
+        assert await hass.config_entries.async_setup(entry.entry_id)
+        assert await async_setup_component(hass, BACKUP_DOMAIN, {BACKUP_DOMAIN: {}})
+        await hass.async_block_till_done()
+
+        yield mock_dsm_with_filestation
+
+
+async def test_agents_info(
+    hass: HomeAssistant,
+    setup_dsm_with_filestation: MagicMock,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test backup agent info."""
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id({"type": "backup/agents/info"})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {
+        "agents": [
+            {"agent_id": "synology_dsm.mocked_syno_dsm_entry", "name": "Mock Title"},
+            {"agent_id": "backup.local", "name": "local"},
+        ],
+    }
+
+
+async def test_agents_not_loaded(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test backup agent with no loaded config entry."""
+    with patch("homeassistant.components.backup.is_hassio", return_value=False):
+        async_initialize_backup(hass)
+        assert await async_setup_component(hass, BACKUP_DOMAIN, {BACKUP_DOMAIN: {}})
+        assert await async_setup_component(hass, DOMAIN, {DOMAIN: {}})
+        await hass.async_block_till_done()
+        client = await hass_ws_client(hass)
+
+        await client.send_json_auto_id({"type": "backup/agents/info"})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {
+        "agents": [
+            {"agent_id": "backup.local", "name": "local"},
+        ],
+    }
+
+
+async def test_agents_on_unload(
+    hass: HomeAssistant,
+    setup_dsm_with_filestation: MagicMock,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test backup agent on un-loading config entry."""
+    # config entry is loaded
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id({"type": "backup/agents/info"})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {
+        "agents": [
+            {"agent_id": "synology_dsm.mocked_syno_dsm_entry", "name": "Mock Title"},
+            {"agent_id": "backup.local", "name": "local"},
+        ],
+    }
+
+    # unload config entry
+    entries = hass.config_entries.async_loaded_entries(DOMAIN)
+    await hass.config_entries.async_unload(entries[0].entry_id)
+    await hass.async_block_till_done(wait_background_tasks=True)
+
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id({"type": "backup/agents/info"})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {
+        "agents": [
+            {"agent_id": "backup.local", "name": "local"},
+        ],
+    }
+
+
+async def test_agents_on_changed_update_success(
+    hass: HomeAssistant,
+    setup_dsm_with_filestation: MagicMock,
+    hass_ws_client: WebSocketGenerator,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test backup agent on changed update success of coordintaor."""
+    client = await hass_ws_client(hass)
+
+    # config entry is loaded
+    await client.send_json_auto_id({"type": "backup/agents/info"})
+    response = await client.receive_json()
+    assert response["success"]
+    assert len(response["result"]["agents"]) == 2
+
+    # coordinator update was successful
+    freezer.tick(910)  # 15 min interval + 10s
+    await hass.async_block_till_done(wait_background_tasks=True)
+    await client.send_json_auto_id({"type": "backup/agents/info"})
+    response = await client.receive_json()
+    assert response["success"]
+    assert len(response["result"]["agents"]) == 2
+
+    # coordinator update was un-successful
+    setup_dsm_with_filestation.update.side_effect = SynologyDSMRequestException(
+        OSError()
+    )
+    freezer.tick(910)
+    await hass.async_block_till_done(wait_background_tasks=True)
+    await client.send_json_auto_id({"type": "backup/agents/info"})
+    response = await client.receive_json()
+    assert response["success"]
+    assert len(response["result"]["agents"]) == 1
+
+    # coordinator update was successful again
+    setup_dsm_with_filestation.update.side_effect = None
+    freezer.tick(910)
+    await hass.async_block_till_done(wait_background_tasks=True)
+    await client.send_json_auto_id({"type": "backup/agents/info"})
+    response = await client.receive_json()
+    assert response["success"]
+    assert len(response["result"]["agents"]) == 2
+
+
+async def test_agents_list_backups(
+    hass: HomeAssistant,
+    setup_dsm_with_filestation: MagicMock,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test agent list backups."""
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id({"type": "backup/info"})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"]["agent_errors"] == {}
+    assert response["result"]["backups"] == [
+        {
+            "addons": [],
+            "agents": {
+                "synology_dsm.mocked_syno_dsm_entry": {
+                    "protected": True,
+                    "size": 13916160,
+                }
+            },
+            "backup_id": "abcd12ef",
+            "date": "2025-01-09T20:14:35.457323+01:00",
+            "database_included": True,
+            "extra_metadata": {"instance_id": ANY, "with_automatic_settings": True},
+            "folders": [],
+            "homeassistant_included": True,
+            "homeassistant_version": "2025.2.0.dev0",
+            "name": "Automatic backup 2025.2.0.dev0",
+            "failed_agent_ids": [],
+            "with_automatic_settings": None,
+        }
+    ]
+
+
+async def test_agents_list_backups_error(
+    hass: HomeAssistant,
+    setup_dsm_with_filestation: MagicMock,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test agent error while list backups."""
+    client = await hass_ws_client(hass)
+
+    setup_dsm_with_filestation.file.get_files.side_effect = (
+        SynologyDSMAPIErrorException("api", "500", "error")
+    )
+
+    await client.send_json_auto_id({"type": "backup/info"})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {
+        "agent_errors": {
+            "synology_dsm.mocked_syno_dsm_entry": "Failed to list backups"
+        },
+        "backups": [],
+        "last_attempted_automatic_backup": None,
+        "last_completed_automatic_backup": None,
+        "last_action_event": None,
+        "next_automatic_backup": None,
+        "next_automatic_backup_additional": False,
+        "state": "idle",
+    }
+
+
+async def test_agents_list_backups_disabled_filestation(
+    hass: HomeAssistant,
+    mock_dsm_without_filestation: MagicMock,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test agent error while list backups when file station is disabled."""
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id({"type": "backup/info"})
+    response = await client.receive_json()
+
+    assert not response["success"]
+
+
+@pytest.mark.parametrize(
+    ("backup_id", "expected_result"),
+    [
+        (
+            "abcd12ef",
+            {
+                "addons": [],
+                "agents": {
+                    "synology_dsm.mocked_syno_dsm_entry": {
+                        "protected": True,
+                        "size": 13916160,
+                    }
+                },
+                "backup_id": "abcd12ef",
+                "date": "2025-01-09T20:14:35.457323+01:00",
+                "database_included": True,
+                "extra_metadata": {"instance_id": ANY, "with_automatic_settings": True},
+                "folders": [],
+                "homeassistant_included": True,
+                "homeassistant_version": "2025.2.0.dev0",
+                "name": "Automatic backup 2025.2.0.dev0",
+                "failed_agent_ids": [],
+                "with_automatic_settings": None,
+            },
+        ),
+        (
+            "12345",
+            None,
+        ),
+    ],
+    ids=["found", "not_found"],
+)
+async def test_agents_get_backup(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    setup_dsm_with_filestation: MagicMock,
+    backup_id: str,
+    expected_result: dict[str, Any] | None,
+) -> None:
+    """Test agent get backup."""
+    client = await hass_ws_client(hass)
+    await client.send_json_auto_id({"type": "backup/details", "backup_id": backup_id})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"]["agent_errors"] == {}
+    assert response["result"]["backup"] == expected_result
+
+
+async def test_agents_get_backup_not_existing(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    setup_dsm_with_filestation: MagicMock,
+) -> None:
+    """Test agent get not existing backup."""
+    client = await hass_ws_client(hass)
+    backup_id = "ef34ab12"
+
+    setup_dsm_with_filestation.file.download_file = AsyncMock(
+        side_effect=SynologyDSMAPIErrorException("api", "404", "not found")
+    )
+
+    await client.send_json_auto_id({"type": "backup/details", "backup_id": backup_id})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {"agent_errors": {}, "backup": None}
+
+
+async def test_agents_get_backup_error(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    setup_dsm_with_filestation: MagicMock,
+) -> None:
+    """Test agent error while get backup."""
+    client = await hass_ws_client(hass)
+    backup_id = "ef34ab12"
+
+    setup_dsm_with_filestation.file.get_files.side_effect = (
+        SynologyDSMAPIErrorException("api", "500", "error")
+    )
+
+    await client.send_json_auto_id({"type": "backup/details", "backup_id": backup_id})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {
+        "agent_errors": {
+            "synology_dsm.mocked_syno_dsm_entry": "Failed to list backups"
+        },
+        "backup": None,
+    }
+
+
+async def test_agents_get_backup_defect_meta(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    setup_dsm_with_filestation: MagicMock,
+) -> None:
+    """Test agent error while get backup."""
+    client = await hass_ws_client(hass)
+    backup_id = "ef34ab12"
+
+    setup_dsm_with_filestation.file.download_file = _mock_download_file_meta_defect
+
+    await client.send_json_auto_id({"type": "backup/details", "backup_id": backup_id})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {"agent_errors": {}, "backup": None}
+
+
+async def test_agents_download(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    setup_dsm_with_filestation: MagicMock,
+) -> None:
+    """Test agent download backup."""
+    client = await hass_client()
+    backup_id = "abcd12ef"
+
+    resp = await client.get(
+        f"/api/backup/download/{backup_id}?agent_id=synology_dsm.mocked_syno_dsm_entry"
+    )
+    assert resp.status == 200
+    assert await resp.content.read() == b"backup data"
+
+
+async def test_agents_download_not_existing(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    setup_dsm_with_filestation: MagicMock,
+) -> None:
+    """Test agent download not existing backup."""
+    client = await hass_client()
+    backup_id = "abcd12ef"
+
+    setup_dsm_with_filestation.file.download_file = (
+        _mock_download_file_meta_ok_tar_missing
+    )
+
+    resp = await client.get(
+        f"/api/backup/download/{backup_id}?agent_id=synology_dsm.mocked_syno_dsm_entry"
+    )
+    assert resp.reason == "Internal Server Error"
+    assert resp.status == 500
+
+
+async def test_agents_upload(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    caplog: pytest.LogCaptureFixture,
+    setup_dsm_with_filestation: MagicMock,
+) -> None:
+    """Test agent upload backup."""
+    client = await hass_client()
+    backup_id = "test-backup"
+    test_backup = AgentBackup(
+        addons=[AddonInfo(name="Test", slug="test", version="1.0.0")],
+        backup_id=backup_id,
+        database_included=True,
+        date="1970-01-01T00:00:00.000Z",
+        extra_metadata={},
+        folders=[Folder.MEDIA, Folder.SHARE],
+        homeassistant_included=True,
+        homeassistant_version="2024.12.0",
+        name="Test",
+        protected=True,
+        size=0,
+    )
+    base_filename = "Test_1970-01-01_00.00_00000000"
+
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_get_backup",
+        ) as fetch_backup,
+        patch(
+            "homeassistant.components.backup.manager.read_backup",
+            return_value=test_backup,
+        ),
+        patch("pathlib.Path.open") as mocked_open,
+    ):
+        mocked_open.return_value.read = Mock(side_effect=[b"test", b""])
+        fetch_backup.return_value = test_backup
+        resp = await client.post(
+            "/api/backup/upload?agent_id=synology_dsm.mocked_syno_dsm_entry",
+            data={"file": StringIO("test")},
+        )
+
+    assert resp.status == 201
+    assert f"Uploading backup {backup_id}" in caplog.text
+    mock: AsyncMock = setup_dsm_with_filestation.file.upload_file
+    assert len(mock.mock_calls) == 2
+    assert mock.call_args_list[0].kwargs["filename"] == f"{base_filename}.tar"
+    assert mock.call_args_list[0].kwargs["path"] == "/ha_backup/my_backup_path"
+    assert mock.call_args_list[1].kwargs["filename"] == f"{base_filename}_meta.json"
+    assert mock.call_args_list[1].kwargs["path"] == "/ha_backup/my_backup_path"
+
+
+async def test_agents_upload_error(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    caplog: pytest.LogCaptureFixture,
+    setup_dsm_with_filestation: MagicMock,
+) -> None:
+    """Test agent error while uploading backup."""
+    client = await hass_client()
+    backup_id = "test-backup"
+    test_backup = AgentBackup(
+        addons=[AddonInfo(name="Test", slug="test", version="1.0.0")],
+        backup_id=backup_id,
+        database_included=True,
+        date="1970-01-01T00:00:00.000Z",
+        extra_metadata={},
+        folders=[Folder.MEDIA, Folder.SHARE],
+        homeassistant_included=True,
+        homeassistant_version="2024.12.0",
+        name="Test",
+        protected=True,
+        size=0,
+    )
+    base_filename = "Test_1970-01-01_00.00_00000000"
+
+    # fail to upload the tar file
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_get_backup",
+        ) as fetch_backup,
+        patch(
+            "homeassistant.components.backup.manager.read_backup",
+            return_value=test_backup,
+        ),
+        patch("pathlib.Path.open") as mocked_open,
+    ):
+        mocked_open.return_value.read = Mock(side_effect=[b"test", b""])
+        fetch_backup.return_value = test_backup
+        setup_dsm_with_filestation.file.upload_file.side_effect = (
+            SynologyDSMAPIErrorException("api", "500", "error")
+        )
+        resp = await client.post(
+            "/api/backup/upload?agent_id=synology_dsm.mocked_syno_dsm_entry",
+            data={"file": StringIO("test")},
+        )
+
+    assert resp.status == 201
+    assert f"Uploading backup {backup_id}" in caplog.text
+    assert "Failed to upload backup" in caplog.text
+    mock: AsyncMock = setup_dsm_with_filestation.file.upload_file
+    assert len(mock.mock_calls) == 1
+    assert mock.call_args_list[0].kwargs["filename"] == f"{base_filename}.tar"
+    assert mock.call_args_list[0].kwargs["path"] == "/ha_backup/my_backup_path"
+
+    # fail to upload the meta json file
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_get_backup",
+        ) as fetch_backup,
+        patch(
+            "homeassistant.components.backup.manager.read_backup",
+            return_value=test_backup,
+        ),
+        patch("pathlib.Path.open") as mocked_open,
+    ):
+        mocked_open.return_value.read = Mock(side_effect=[b"test", b""])
+        fetch_backup.return_value = test_backup
+        setup_dsm_with_filestation.file.upload_file.side_effect = [
+            True,
+            SynologyDSMAPIErrorException("api", "500", "error"),
+        ]
+
+        resp = await client.post(
+            "/api/backup/upload?agent_id=synology_dsm.mocked_syno_dsm_entry",
+            data={"file": StringIO("test")},
+        )
+
+    assert resp.status == 201
+    assert f"Uploading backup {backup_id}" in caplog.text
+    assert "Failed to upload backup" in caplog.text
+    mock: AsyncMock = setup_dsm_with_filestation.file.upload_file
+    assert len(mock.mock_calls) == 3
+    assert mock.call_args_list[1].kwargs["filename"] == f"{base_filename}.tar"
+    assert mock.call_args_list[1].kwargs["path"] == "/ha_backup/my_backup_path"
+    assert mock.call_args_list[2].kwargs["filename"] == f"{base_filename}_meta.json"
+    assert mock.call_args_list[2].kwargs["path"] == "/ha_backup/my_backup_path"
+
+
+async def test_agents_delete(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    setup_dsm_with_filestation: MagicMock,
+) -> None:
+    """Test agent delete backup."""
+    client = await hass_ws_client(hass)
+    backup_id = "abcd12ef"
+
+    await client.send_json_auto_id(
+        {
+            "type": "backup/delete",
+            "backup_id": backup_id,
+        }
+    )
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {"agent_errors": {}}
+    mock: AsyncMock = setup_dsm_with_filestation.file.delete_file
+    assert len(mock.mock_calls) == 2
+    assert mock.call_args_list[0].kwargs["filename"] == f"{BASE_FILENAME}.tar"
+    assert mock.call_args_list[0].kwargs["path"] == "/ha_backup/my_backup_path"
+    assert mock.call_args_list[1].kwargs["filename"] == f"{BASE_FILENAME}_meta.json"
+    assert mock.call_args_list[1].kwargs["path"] == "/ha_backup/my_backup_path"
+
+
+async def test_agents_delete_not_existing(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    setup_dsm_with_filestation: MagicMock,
+) -> None:
+    """Test delete not existing backup."""
+    client = await hass_ws_client(hass)
+    backup_id = "ef34ab12"
+
+    setup_dsm_with_filestation.file.download_file = (
+        _mock_download_file_meta_ok_tar_missing
+    )
+    setup_dsm_with_filestation.file.delete_file = AsyncMock(
+        side_effect=SynologyDSMAPIErrorException(
+            "api",
+            "900",
+            [{"code": 408, "path": f"/ha_backup/my_backup_path/{backup_id}.tar"}],
+        )
+    )
+
+    await client.send_json_auto_id(
+        {
+            "type": "backup/delete",
+            "backup_id": backup_id,
+        }
+    )
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {"agent_errors": {}}
+
+
+@pytest.mark.parametrize(
+    ("error", "expected_log"),
+    [
+        (
+            SynologyDSMAPIErrorException("api", "100", "Unknown error"),
+            "{'api': 'api', 'code': '100', 'reason': 'Unknown', 'details': 'Unknown error'}",
+        ),
+        (
+            SynologyDSMAPIErrorException("api", "900", [{"code": 407}]),
+            "{'api': 'api', 'code': '900', 'reason': 'Unknown', 'details': [{'code': 407}]",
+        ),
+        (
+            SynologyDSMAPIErrorException("api", "900", [{"code": 417}]),
+            "{'api': 'api', 'code': '900', 'reason': 'Unknown', 'details': [{'code': 417}]",
+        ),
+    ],
+)
+async def test_agents_delete_error(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    caplog: pytest.LogCaptureFixture,
+    setup_dsm_with_filestation: MagicMock,
+    error: SynologyDSMAPIErrorException,
+    expected_log: str,
+) -> None:
+    """Test error while delete backup."""
+    client = await hass_ws_client(hass)
+
+    # error while delete
+    backup_id = "abcd12ef"
+    setup_dsm_with_filestation.file.delete_file.side_effect = error
+    await client.send_json_auto_id(
+        {
+            "type": "backup/delete",
+            "backup_id": backup_id,
+        }
+    )
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {
+        "agent_errors": {
+            "synology_dsm.mocked_syno_dsm_entry": "Failed to delete backup"
+        }
+    }
+    assert f"Failed to delete backup: {expected_log}" in caplog.text
+    mock: AsyncMock = setup_dsm_with_filestation.file.delete_file
+    assert len(mock.mock_calls) == 1
+    assert mock.call_args_list[0].kwargs["filename"] == f"{BASE_FILENAME}.tar"
+    assert mock.call_args_list[0].kwargs["path"] == "/ha_backup/my_backup_path"
diff --git a/tests/components/synology_dsm/test_config_flow.py b/tests/components/synology_dsm/test_config_flow.py
index 3ef47292a9b..932cf057d3d 100644
--- a/tests/components/synology_dsm/test_config_flow.py
+++ b/tests/components/synology_dsm/test_config_flow.py
@@ -4,6 +4,7 @@ from ipaddress import ip_address
 from unittest.mock import AsyncMock, MagicMock, Mock, patch
 
 import pytest
+from synology_dsm.api.file_station.models import SynoFileSharedFolder
 from synology_dsm.exceptions import (
     SynologyDSMException,
     SynologyDSMLogin2SAFailedException,
@@ -15,9 +16,9 @@ from syrupy import SnapshotAssertion
 
 from homeassistant.components.synology_dsm.config_flow import CONF_OTP_CODE
 from homeassistant.components.synology_dsm.const import (
+    CONF_BACKUP_PATH,
+    CONF_BACKUP_SHARE,
     CONF_SNAPSHOT_QUALITY,
-    DEFAULT_SCAN_INTERVAL,
-    DEFAULT_SNAPSHOT_QUALITY,
     DOMAIN,
 )
 from homeassistant.config_entries import SOURCE_SSDP, SOURCE_USER, SOURCE_ZEROCONF
@@ -26,7 +27,6 @@ from homeassistant.const import (
     CONF_MAC,
     CONF_PASSWORD,
     CONF_PORT,
-    CONF_SCAN_INTERVAL,
     CONF_SSL,
     CONF_USERNAME,
     CONF_VERIFY_SSL,
@@ -40,6 +40,7 @@ from homeassistant.helpers.service_info.ssdp import (
 )
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
+from .common import mock_dsm_information
 from .consts import (
     DEVICE_TOKEN,
     HOST,
@@ -72,8 +73,8 @@ def mock_controller_service():
             volumes_ids=["volume_1"],
             update=AsyncMock(return_value=True),
         )
-        dsm.information = Mock(serial=SERIAL)
-
+        dsm.information = mock_dsm_information()
+        dsm.file = AsyncMock(get_shared_folders=AsyncMock(return_value=None))
         yield dsm
 
 
@@ -95,7 +96,8 @@ def mock_controller_service_2sa():
             volumes_ids=["volume_1"],
             update=AsyncMock(return_value=True),
         )
-        dsm.information = Mock(serial=SERIAL)
+        dsm.information = mock_dsm_information()
+        dsm.file = AsyncMock(get_shared_folders=AsyncMock(return_value=None))
         yield dsm
 
 
@@ -115,7 +117,40 @@ def mock_controller_service_vdsm():
             volumes_ids=["volume_1"],
             update=AsyncMock(return_value=True),
         )
-        dsm.information = Mock(serial=SERIAL)
+        dsm.information = mock_dsm_information()
+        dsm.file = AsyncMock(get_shared_folders=AsyncMock(return_value=None))
+        yield dsm
+
+
+@pytest.fixture(name="service_with_filestation")
+def mock_controller_service_with_filestation():
+    """Mock a successful service with filestation support."""
+    with patch("homeassistant.components.synology_dsm.config_flow.SynologyDSM") as dsm:
+        dsm.login = AsyncMock(return_value=True)
+        dsm.update = AsyncMock(return_value=True)
+
+        dsm.surveillance_station.update = AsyncMock(return_value=True)
+        dsm.upgrade.update = AsyncMock(return_value=True)
+        dsm.utilisation = Mock(cpu_user_load=1, update=AsyncMock(return_value=True))
+        dsm.network = Mock(update=AsyncMock(return_value=True), macs=MACS)
+        dsm.storage = Mock(
+            disks_ids=["sda", "sdb", "sdc"],
+            volumes_ids=["volume_1"],
+            update=AsyncMock(return_value=True),
+        )
+        dsm.information = mock_dsm_information()
+        dsm.file = AsyncMock(
+            get_shared_folders=AsyncMock(
+                return_value=[
+                    SynoFileSharedFolder(
+                        additional=None,
+                        is_dir=True,
+                        name="HA Backup",
+                        path="/ha_backup",
+                    )
+                ]
+            )
+        )
 
         yield dsm
 
@@ -136,8 +171,8 @@ def mock_controller_service_failed():
             volumes_ids=[],
             update=AsyncMock(return_value=True),
         )
-        dsm.information = Mock(serial=None)
-
+        dsm.information = mock_dsm_information(serial=None)
+        dsm.file = AsyncMock(get_shared_folders=AsyncMock(return_value=None))
         yield dsm
 
 
@@ -283,6 +318,55 @@ async def test_user_vdsm(
     assert result["data"] == snapshot
 
 
+@pytest.mark.usefixtures("mock_setup_entry")
+async def test_user_with_filestation(
+    hass: HomeAssistant,
+    service_with_filestation: MagicMock,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test user config."""
+    with patch(
+        "homeassistant.components.synology_dsm.config_flow.SynologyDSM",
+        return_value=service_with_filestation,
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_USER}, data=None
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+
+    with patch(
+        "homeassistant.components.synology_dsm.config_flow.SynologyDSM",
+        return_value=service_with_filestation,
+    ):
+        # test with all provided
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": SOURCE_USER},
+            data={
+                CONF_HOST: HOST,
+                CONF_PORT: PORT,
+                CONF_SSL: USE_SSL,
+                CONF_VERIFY_SSL: VERIFY_SSL,
+                CONF_USERNAME: USERNAME,
+                CONF_PASSWORD: PASSWORD,
+            },
+        )
+
+        assert result["type"] is FlowResultType.FORM
+        assert result["step_id"] == "backup_share"
+
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_BACKUP_SHARE: "/ha_backup", CONF_BACKUP_PATH: "automatic_ha_backups"},
+        )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["result"].unique_id == SERIAL
+    assert result["title"] == HOST
+    assert result["data"] == snapshot
+
+
 @pytest.mark.usefixtures("mock_setup_entry")
 async def test_reauth(hass: HomeAssistant, service: MagicMock) -> None:
     """Test reauthentication."""
@@ -560,46 +644,52 @@ async def test_existing_ssdp(hass: HomeAssistant, service: MagicMock) -> None:
     assert result["reason"] == "already_configured"
 
 
-@pytest.mark.usefixtures("mock_setup_entry")
-async def test_options_flow(hass: HomeAssistant, service: MagicMock) -> None:
+async def test_options_flow(
+    hass: HomeAssistant, service_with_filestation: MagicMock
+) -> None:
     """Test config flow options."""
-    config_entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={
-            CONF_HOST: HOST,
-            CONF_USERNAME: USERNAME,
-            CONF_PASSWORD: PASSWORD,
-            CONF_MAC: MACS,
-        },
-        unique_id=SERIAL,
-    )
-    config_entry.add_to_hass(hass)
+    with (
+        patch(
+            "homeassistant.components.synology_dsm.common.SynologyDSM",
+            return_value=service_with_filestation,
+        ),
+        patch("homeassistant.components.synology_dsm.PLATFORMS", return_value=[]),
+    ):
+        config_entry = MockConfigEntry(
+            domain=DOMAIN,
+            data={
+                CONF_HOST: HOST,
+                CONF_PORT: PORT,
+                CONF_SSL: USE_SSL,
+                CONF_USERNAME: USERNAME,
+                CONF_PASSWORD: PASSWORD,
+                CONF_MAC: MACS[0],
+            },
+            unique_id=SERIAL,
+        )
+        config_entry.add_to_hass(hass)
+        assert await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
 
-    assert config_entry.options == {}
+        assert config_entry.options == {CONF_BACKUP_SHARE: None, CONF_BACKUP_PATH: None}
 
     result = await hass.config_entries.options.async_init(config_entry.entry_id)
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "init"
 
-    # Scan interval
-    # Default
-    result = await hass.config_entries.options.async_configure(
-        result["flow_id"],
-        user_input={},
-    )
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert config_entry.options[CONF_SCAN_INTERVAL] == DEFAULT_SCAN_INTERVAL
-    assert config_entry.options[CONF_SNAPSHOT_QUALITY] == DEFAULT_SNAPSHOT_QUALITY
-
-    # Manual
     result = await hass.config_entries.options.async_init(config_entry.entry_id)
     result = await hass.config_entries.options.async_configure(
         result["flow_id"],
-        user_input={CONF_SCAN_INTERVAL: 2, CONF_SNAPSHOT_QUALITY: 0},
+        user_input={
+            CONF_SNAPSHOT_QUALITY: 0,
+            CONF_BACKUP_PATH: "my_nackup_path",
+            CONF_BACKUP_SHARE: "/ha_backup",
+        },
     )
     assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert config_entry.options[CONF_SCAN_INTERVAL] == 2
     assert config_entry.options[CONF_SNAPSHOT_QUALITY] == 0
+    assert config_entry.options[CONF_BACKUP_PATH] == "my_nackup_path"
+    assert config_entry.options[CONF_BACKUP_SHARE] == "/ha_backup"
 
 
 @pytest.mark.usefixtures("mock_setup_entry")
diff --git a/tests/components/synology_dsm/test_init.py b/tests/components/synology_dsm/test_init.py
index 13d568e6137..7fe58719aa4 100644
--- a/tests/components/synology_dsm/test_init.py
+++ b/tests/components/synology_dsm/test_init.py
@@ -4,14 +4,22 @@ from unittest.mock import MagicMock, patch
 
 from synology_dsm.exceptions import SynologyDSMLoginInvalidException
 
-from homeassistant.components.synology_dsm.const import DOMAIN, SERVICES
+from homeassistant.components.synology_dsm.const import (
+    CONF_BACKUP_PATH,
+    CONF_BACKUP_SHARE,
+    DEFAULT_VERIFY_SSL,
+    DOMAIN,
+    SERVICES,
+)
 from homeassistant.const import (
     CONF_HOST,
     CONF_MAC,
     CONF_PASSWORD,
     CONF_PORT,
+    CONF_SCAN_INTERVAL,
     CONF_SSL,
     CONF_USERNAME,
+    CONF_VERIFY_SSL,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
@@ -78,3 +86,40 @@ async def test_reauth_triggered(hass: HomeAssistant) -> None:
         assert not await hass.config_entries.async_setup(entry.entry_id)
         await hass.async_block_till_done()
         mock_async_step_reauth.assert_called_once()
+
+
+async def test_config_entry_migrations(
+    hass: HomeAssistant, mock_dsm: MagicMock
+) -> None:
+    """Test if reauthentication flow is triggered."""
+    with (
+        patch(
+            "homeassistant.components.synology_dsm.common.SynologyDSM",
+            return_value=mock_dsm,
+        ),
+        patch("homeassistant.components.synology_dsm.PLATFORMS", return_value=[]),
+    ):
+        entry = MockConfigEntry(
+            domain=DOMAIN,
+            data={
+                CONF_HOST: HOST,
+                CONF_PORT: PORT,
+                CONF_SSL: USE_SSL,
+                CONF_USERNAME: USERNAME,
+                CONF_PASSWORD: PASSWORD,
+                CONF_MAC: MACS[0],
+            },
+            options={CONF_SCAN_INTERVAL: 30},
+        )
+        entry.add_to_hass(hass)
+
+        assert CONF_VERIFY_SSL not in entry.data
+        assert CONF_BACKUP_SHARE not in entry.options
+        assert CONF_BACKUP_PATH not in entry.options
+
+        assert await hass.config_entries.async_setup(entry.entry_id)
+
+        assert entry.data[CONF_VERIFY_SSL] == DEFAULT_VERIFY_SSL
+        assert CONF_SCAN_INTERVAL not in entry.options
+        assert entry.options[CONF_BACKUP_SHARE] is None
+        assert entry.options[CONF_BACKUP_PATH] is None
diff --git a/tests/components/synology_dsm/test_media_source.py b/tests/components/synology_dsm/test_media_source.py
index 0c7ab6bc1cc..dd454f92137 100644
--- a/tests/components/synology_dsm/test_media_source.py
+++ b/tests/components/synology_dsm/test_media_source.py
@@ -33,6 +33,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.util.aiohttp import MockRequest
 
+from .common import mock_dsm_information
 from .consts import HOST, MACS, PASSWORD, PORT, USE_SSL, USERNAME
 
 from tests.common import MockConfigEntry
@@ -44,6 +45,7 @@ def dsm_with_photos() -> MagicMock:
     dsm = MagicMock()
     dsm.login = AsyncMock(return_value=True)
     dsm.update = AsyncMock(return_value=True)
+    dsm.information = mock_dsm_information()
     dsm.network.update = AsyncMock(return_value=True)
     dsm.surveillance_station.update = AsyncMock(return_value=True)
     dsm.upgrade.update = AsyncMock(return_value=True)
@@ -62,6 +64,7 @@ def dsm_with_photos() -> MagicMock:
     dsm.photos.get_item_thumbnail_url = AsyncMock(
         return_value="http://my.thumbnail.url"
     )
+    dsm.file = AsyncMock(get_shared_folders=AsyncMock(return_value=None))
     return dsm
 
 
diff --git a/tests/components/synology_dsm/test_repairs.py b/tests/components/synology_dsm/test_repairs.py
new file mode 100644
index 00000000000..a094928b837
--- /dev/null
+++ b/tests/components/synology_dsm/test_repairs.py
@@ -0,0 +1,322 @@
+"""Test repairs for synology dsm."""
+
+from __future__ import annotations
+
+from unittest.mock import AsyncMock, MagicMock, Mock, patch
+
+import pytest
+from synology_dsm.api.file_station.models import SynoFileSharedFolder
+
+from homeassistant.components.repairs import DOMAIN as REPAIRS_DOMAIN
+from homeassistant.components.synology_dsm.const import (
+    CONF_BACKUP_PATH,
+    CONF_BACKUP_SHARE,
+    DOMAIN,
+)
+from homeassistant.const import (
+    CONF_HOST,
+    CONF_MAC,
+    CONF_PASSWORD,
+    CONF_PORT,
+    CONF_SSL,
+    CONF_USERNAME,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import issue_registry as ir
+from homeassistant.setup import async_setup_component
+
+from .common import mock_dsm_information
+from .consts import HOST, MACS, PASSWORD, PORT, USE_SSL, USERNAME
+
+from tests.common import ANY, MockConfigEntry
+from tests.components.repairs import process_repair_fix_flow, start_repair_fix_flow
+from tests.typing import ClientSessionGenerator, WebSocketGenerator
+
+
+@pytest.fixture
+def mock_dsm_with_filestation():
+    """Mock a successful service with filestation support."""
+    with patch("homeassistant.components.synology_dsm.common.SynologyDSM") as dsm:
+        dsm.login = AsyncMock(return_value=True)
+        dsm.update = AsyncMock(return_value=True)
+
+        dsm.surveillance_station.update = AsyncMock(return_value=True)
+        dsm.upgrade.update = AsyncMock(return_value=True)
+        dsm.utilisation = Mock(cpu_user_load=1, update=AsyncMock(return_value=True))
+        dsm.network = Mock(update=AsyncMock(return_value=True), macs=MACS)
+        dsm.storage = Mock(
+            disks_ids=["sda", "sdb", "sdc"],
+            volumes_ids=["volume_1"],
+            update=AsyncMock(return_value=True),
+        )
+        dsm.information = mock_dsm_information()
+        dsm.file = AsyncMock(
+            get_shared_folders=AsyncMock(
+                return_value=[
+                    SynoFileSharedFolder(
+                        additional=None,
+                        is_dir=True,
+                        name="HA Backup",
+                        path="/ha_backup",
+                    )
+                ]
+            ),
+        )
+        dsm.logout = AsyncMock(return_value=True)
+        yield dsm
+
+
+@pytest.fixture
+async def setup_dsm_with_filestation(
+    hass: HomeAssistant,
+    mock_dsm_with_filestation: MagicMock,
+):
+    """Mock setup of synology dsm config entry."""
+    with (
+        patch(
+            "homeassistant.components.synology_dsm.common.SynologyDSM",
+            return_value=mock_dsm_with_filestation,
+        ),
+        patch("homeassistant.components.synology_dsm.PLATFORMS", return_value=[]),
+    ):
+        entry = MockConfigEntry(
+            domain=DOMAIN,
+            data={
+                CONF_HOST: HOST,
+                CONF_PORT: PORT,
+                CONF_SSL: USE_SSL,
+                CONF_USERNAME: USERNAME,
+                CONF_PASSWORD: PASSWORD,
+                CONF_MAC: MACS[0],
+            },
+            options={
+                CONF_BACKUP_PATH: None,
+                CONF_BACKUP_SHARE: None,
+            },
+            unique_id="my_serial",
+        )
+        entry.add_to_hass(hass)
+        assert await hass.config_entries.async_setup(entry.entry_id)
+        assert await async_setup_component(hass, REPAIRS_DOMAIN, {})
+        await hass.async_block_till_done()
+
+        yield mock_dsm_with_filestation
+
+
+async def test_create_issue(
+    hass: HomeAssistant,
+    setup_dsm_with_filestation: MagicMock,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test the issue is created."""
+    ws_client = await hass_ws_client(hass)
+    await ws_client.send_json({"id": 1, "type": "repairs/list_issues"})
+    msg = await ws_client.receive_json()
+
+    assert msg["success"]
+    assert len(msg["result"]["issues"]) == 1
+    issue = msg["result"]["issues"][0]
+    assert issue["breaks_in_ha_version"] is None
+    assert issue["domain"] == DOMAIN
+    assert issue["issue_id"] == "missing_backup_setup_my_serial"
+    assert issue["translation_key"] == "missing_backup_setup"
+
+
+async def test_missing_backup_ignore(
+    hass: HomeAssistant,
+    setup_dsm_with_filestation: MagicMock,
+    hass_client: ClientSessionGenerator,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test missing backup location setup issue is ignored by the user."""
+    ws_client = await hass_ws_client(hass)
+    client = await hass_client()
+
+    # get repair issues
+    await ws_client.send_json({"id": 1, "type": "repairs/list_issues"})
+    msg = await ws_client.receive_json()
+    assert msg["success"]
+    assert len(msg["result"]["issues"]) == 1
+    issue = msg["result"]["issues"][0]
+    assert not issue["ignored"]
+
+    # start repair flow
+    data = await start_repair_fix_flow(client, DOMAIN, "missing_backup_setup_my_serial")
+
+    flow_id = data["flow_id"]
+    assert data["description_placeholders"] == {
+        "docs_url": "https://www.home-assistant.io/integrations/synology_dsm/#backup-location"
+    }
+    assert data["step_id"] == "init"
+    assert data["menu_options"] == ["confirm", "ignore"]
+
+    # seelct to ignore the flow
+    data = await process_repair_fix_flow(
+        client, flow_id, json={"next_step_id": "ignore"}
+    )
+    assert data["type"] == "abort"
+    assert data["reason"] == "ignored"
+
+    # check issue is ignored
+    await ws_client.send_json({"id": 2, "type": "repairs/list_issues"})
+    msg = await ws_client.receive_json()
+    assert msg["success"]
+    assert len(msg["result"]["issues"]) == 1
+    issue = msg["result"]["issues"][0]
+    assert issue["ignored"]
+
+
+async def test_missing_backup_success(
+    hass: HomeAssistant,
+    setup_dsm_with_filestation: MagicMock,
+    hass_client: ClientSessionGenerator,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test the missing backup location setup repair flow is fully processed by the user."""
+    ws_client = await hass_ws_client(hass)
+    client = await hass_client()
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert len(entries) == 1
+    entry = entries[0]
+    assert entry.options == {"backup_path": None, "backup_share": None}
+
+    # get repair issues
+    await ws_client.send_json({"id": 1, "type": "repairs/list_issues"})
+    msg = await ws_client.receive_json()
+    assert msg["success"]
+    assert len(msg["result"]["issues"]) == 1
+    issue = msg["result"]["issues"][0]
+    assert not issue["ignored"]
+
+    # start repair flow
+    data = await start_repair_fix_flow(client, DOMAIN, "missing_backup_setup_my_serial")
+
+    flow_id = data["flow_id"]
+    assert data["description_placeholders"] == {
+        "docs_url": "https://www.home-assistant.io/integrations/synology_dsm/#backup-location"
+    }
+    assert data["step_id"] == "init"
+    assert data["menu_options"] == ["confirm", "ignore"]
+
+    # seelct to confirm the flow
+    data = await process_repair_fix_flow(
+        client, flow_id, json={"next_step_id": "confirm"}
+    )
+    assert data["step_id"] == "confirm"
+    assert data["type"] == "form"
+
+    # fill out the form and submit
+    data = await process_repair_fix_flow(
+        client,
+        flow_id,
+        json={"backup_share": "/ha_backup", "backup_path": "backup_ha_dev"},
+    )
+    assert data["type"] == "create_entry"
+    assert entry.options == {
+        "backup_path": "backup_ha_dev",
+        "backup_share": "/ha_backup",
+    }
+
+
+async def test_missing_backup_no_shares(
+    hass: HomeAssistant,
+    setup_dsm_with_filestation: MagicMock,
+    hass_client: ClientSessionGenerator,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test the missing backup location setup repair flow errors out."""
+    ws_client = await hass_ws_client(hass)
+    client = await hass_client()
+
+    # get repair issues
+    await ws_client.send_json({"id": 1, "type": "repairs/list_issues"})
+    msg = await ws_client.receive_json()
+    assert msg["success"]
+    assert len(msg["result"]["issues"]) == 1
+
+    # start repair flow
+    data = await start_repair_fix_flow(client, DOMAIN, "missing_backup_setup_my_serial")
+
+    flow_id = data["flow_id"]
+    assert data["description_placeholders"] == {
+        "docs_url": "https://www.home-assistant.io/integrations/synology_dsm/#backup-location"
+    }
+    assert data["step_id"] == "init"
+    assert data["menu_options"] == ["confirm", "ignore"]
+
+    # inject error
+    setup_dsm_with_filestation.file.get_shared_folders.return_value = []
+
+    # select to confirm the flow
+    data = await process_repair_fix_flow(
+        client, flow_id, json={"next_step_id": "confirm"}
+    )
+    assert data["type"] == "abort"
+    assert data["reason"] == "no_shares"
+
+
+@pytest.mark.parametrize(
+    "ignore_missing_translations",
+    ["component.synology_dsm.issues.other_issue.title"],
+)
+async def test_other_fixable_issues(
+    hass: HomeAssistant,
+    setup_dsm_with_filestation: MagicMock,
+    hass_client: ClientSessionGenerator,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test fixing another issue."""
+    ws_client = await hass_ws_client(hass)
+    client = await hass_client()
+
+    await ws_client.send_json({"id": 1, "type": "repairs/list_issues"})
+    msg = await ws_client.receive_json()
+
+    assert msg["success"]
+
+    issue = {
+        "breaks_in_ha_version": None,
+        "domain": DOMAIN,
+        "issue_id": "other_issue",
+        "is_fixable": True,
+        "severity": "error",
+        "translation_key": "other_issue",
+    }
+    ir.async_create_issue(
+        hass,
+        issue["domain"],
+        issue["issue_id"],
+        is_fixable=issue["is_fixable"],
+        severity=issue["severity"],
+        translation_key=issue["translation_key"],
+    )
+
+    await ws_client.send_json({"id": 2, "type": "repairs/list_issues"})
+    msg = await ws_client.receive_json()
+
+    assert msg["success"]
+    results = msg["result"]["issues"]
+    assert {
+        "breaks_in_ha_version": None,
+        "created": ANY,
+        "dismissed_version": None,
+        "domain": "synology_dsm",
+        "ignored": False,
+        "is_fixable": True,
+        "issue_domain": None,
+        "issue_id": "other_issue",
+        "learn_more_url": None,
+        "severity": "error",
+        "translation_key": "other_issue",
+        "translation_placeholders": None,
+    } in results
+
+    data = await start_repair_fix_flow(client, DOMAIN, "other_issue")
+
+    flow_id = data["flow_id"]
+    assert data["step_id"] == "confirm"
+
+    data = await process_repair_fix_flow(client, flow_id)
+
+    assert data["type"] == "create_entry"
+    await hass.async_block_till_done()
diff --git a/tests/components/systemmonitor/snapshots/test_diagnostics.ambr b/tests/components/systemmonitor/snapshots/test_diagnostics.ambr
index 75d942fc601..afa508cc004 100644
--- a/tests/components/systemmonitor/snapshots/test_diagnostics.ambr
+++ b/tests/components/systemmonitor/snapshots/test_diagnostics.ambr
@@ -56,6 +56,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'System Monitor',
       'unique_id': None,
       'version': 1,
@@ -111,6 +113,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'System Monitor',
       'unique_id': None,
       'version': 1,
diff --git a/tests/components/systemmonitor/snapshots/test_sensor.ambr b/tests/components/systemmonitor/snapshots/test_sensor.ambr
index 1ee9067a528..8108e4777c8 100644
--- a/tests/components/systemmonitor/snapshots/test_sensor.ambr
+++ b/tests/components/systemmonitor/snapshots/test_sensor.ambr
@@ -114,34 +114,34 @@
 # name: test_sensor[System Monitor Last boot - state]
   '2024-02-24T15:00:00+00:00'
 # ---
-# name: test_sensor[System Monitor Load (15m) - attributes]
+# name: test_sensor[System Monitor Load (15 min) - attributes]
   ReadOnlyDict({
-    'friendly_name': 'System Monitor Load (15m)',
+    'friendly_name': 'System Monitor Load (15 min)',
     'icon': 'mdi:cpu-64-bit',
     'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
   })
 # ---
-# name: test_sensor[System Monitor Load (15m) - state]
+# name: test_sensor[System Monitor Load (15 min) - state]
   '3'
 # ---
-# name: test_sensor[System Monitor Load (1m) - attributes]
+# name: test_sensor[System Monitor Load (1 min) - attributes]
   ReadOnlyDict({
-    'friendly_name': 'System Monitor Load (1m)',
+    'friendly_name': 'System Monitor Load (1 min)',
     'icon': 'mdi:cpu-64-bit',
     'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
   })
 # ---
-# name: test_sensor[System Monitor Load (1m) - state]
+# name: test_sensor[System Monitor Load (1 min) - state]
   '1'
 # ---
-# name: test_sensor[System Monitor Load (5m) - attributes]
+# name: test_sensor[System Monitor Load (5 min) - attributes]
   ReadOnlyDict({
-    'friendly_name': 'System Monitor Load (5m)',
+    'friendly_name': 'System Monitor Load (5 min)',
     'icon': 'mdi:cpu-64-bit',
     'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
   })
 # ---
-# name: test_sensor[System Monitor Load (5m) - state]
+# name: test_sensor[System Monitor Load (5 min) - state]
   '2'
 # ---
 # name: test_sensor[System Monitor Memory free - attributes]
diff --git a/tests/components/tado/__init__.py b/tests/components/tado/__init__.py
index 11d199f01a1..e6b6257e6ea 100644
--- a/tests/components/tado/__init__.py
+++ b/tests/components/tado/__init__.py
@@ -1 +1 @@
-"""Tests for the tado integration."""
+"""Tests for the Tado integration."""
diff --git a/tests/components/tado/conftest.py b/tests/components/tado/conftest.py
new file mode 100644
index 00000000000..1aa62b218a2
--- /dev/null
+++ b/tests/components/tado/conftest.py
@@ -0,0 +1,50 @@
+"""Fixtures for Tado tests."""
+
+from collections.abc import Generator
+from unittest.mock import AsyncMock, MagicMock, patch
+
+from PyTado.http import DeviceActivationStatus
+import pytest
+
+from homeassistant.components.tado import CONF_REFRESH_TOKEN, DOMAIN
+
+from tests.common import MockConfigEntry, load_json_object_fixture
+
+
+@pytest.fixture
+def mock_tado_api() -> Generator[MagicMock]:
+    """Mock the Tado API."""
+    with (
+        patch("homeassistant.components.tado.Tado") as mock_tado,
+        patch("homeassistant.components.tado.config_flow.Tado", new=mock_tado),
+    ):
+        client = mock_tado.return_value
+        client.device_verification_url.return_value = (
+            "https://login.tado.com/oauth2/device?user_code=TEST"
+        )
+        client.device_activation_status.return_value = DeviceActivationStatus.COMPLETED
+        client.get_me.return_value = load_json_object_fixture("me.json", DOMAIN)
+        client.get_refresh_token.return_value = "refresh"
+        yield client
+
+
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock]:
+    """Mock the setup entry."""
+    with patch(
+        "homeassistant.components.tado.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
+@pytest.fixture
+def mock_config_entry() -> MockConfigEntry:
+    """Mock a config entry."""
+    return MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            CONF_REFRESH_TOKEN: "refresh",
+        },
+        unique_id="1",
+        version=2,
+    )
diff --git a/tests/components/tado/fixtures/device_authorize.json b/tests/components/tado/fixtures/device_authorize.json
new file mode 100644
index 00000000000..aacd171fafd
--- /dev/null
+++ b/tests/components/tado/fixtures/device_authorize.json
@@ -0,0 +1,8 @@
+{
+  "device_code": "ABCD",
+  "expires_in": 300,
+  "interval": 5,
+  "user_code": "TEST",
+  "verification_uri": "https://login.tado.com/oauth2/device",
+  "verification_uri_complete": "https://login.tado.com/oauth2/device?user_code=TEST"
+}
diff --git a/tests/components/tado/fixtures/devices.json b/tests/components/tado/fixtures/devices.json
index 6d990082b96..a9313ae051b 100644
--- a/tests/components/tado/fixtures/devices.json
+++ b/tests/components/tado/fixtures/devices.json
@@ -15,5 +15,24 @@
       "value": true
     },
     "shortSerialNo": "WR1"
+  },
+  {
+    "duties": ["ZONE_UI", "ZONE_DRIVER", "ZONE_LEADER"],
+    "currentFwVersion": "59.4",
+    "deviceType": "WR02",
+    "serialNo": "WR4",
+    "shortSerialNo": "WR4",
+    "commandTableUploadState": "FINISHED",
+    "connectionState": {
+      "value": true,
+      "timestamp": "2020-03-23T18:30:07.377Z"
+    },
+    "accessPointWiFi": {
+      "ssid": "tado8480"
+    },
+    "characteristics": {
+      "capabilities": ["INSIDE_TEMPERATURE_MEASUREMENT", "IDENTIFY"]
+    },
+    "childLockEnabled": false
   }
 ]
diff --git a/tests/components/tado/fixtures/zones.json b/tests/components/tado/fixtures/zones.json
index e1d2ec759ba..acc4612b393 100644
--- a/tests/components/tado/fixtures/zones.json
+++ b/tests/components/tado/fixtures/zones.json
@@ -27,7 +27,8 @@
         },
         "characteristics": {
           "capabilities": ["INSIDE_TEMPERATURE_MEASUREMENT", "IDENTIFY"]
-        }
+        },
+        "childLockEnabled": false
       }
     ],
     "dateCreated": "2019-11-28T15:58:48.968Z",
diff --git a/tests/components/tado/test_config_flow.py b/tests/components/tado/test_config_flow.py
index 19acb0aecbd..2fd8e6a0468 100644
--- a/tests/components/tado/test_config_flow.py
+++ b/tests/components/tado/test_config_flow.py
@@ -1,20 +1,20 @@
 """Test the Tado config flow."""
 
-from http import HTTPStatus
 from ipaddress import ip_address
-from unittest.mock import MagicMock, patch
+import threading
+from unittest.mock import AsyncMock, MagicMock, patch
 
-import PyTado
+from PyTado.http import DeviceActivationStatus
 import pytest
-import requests
 
-from homeassistant import config_entries
-from homeassistant.components.tado.config_flow import NoHomes
+from homeassistant.components.tado.config_flow import TadoException
 from homeassistant.components.tado.const import (
     CONF_FALLBACK,
+    CONF_REFRESH_TOKEN,
     CONST_OVERLAY_TADO_DEFAULT,
     DOMAIN,
 )
+from homeassistant.config_entries import SOURCE_HOMEKIT, SOURCE_USER
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
@@ -26,92 +26,186 @@ from homeassistant.helpers.service_info.zeroconf import (
 from tests.common import MockConfigEntry
 
 
-def _get_mock_tado_api(get_me=None) -> MagicMock:
-    mock_tado = MagicMock()
-    if isinstance(get_me, Exception):
-        type(mock_tado).get_me = MagicMock(side_effect=get_me)
-    else:
-        type(mock_tado).get_me = MagicMock(return_value=get_me)
-    return mock_tado
+async def test_full_flow(
+    hass: HomeAssistant,
+    mock_tado_api: MagicMock,
+    mock_setup_entry: AsyncMock,
+) -> None:
+    """Test the full flow of the config flow."""
+
+    event = threading.Event()
+
+    def mock_tado_api_device_activation() -> None:
+        # Simulate the device activation process
+        event.wait(timeout=5)
+
+    mock_tado_api.device_activation = mock_tado_api_device_activation
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.SHOW_PROGRESS
+    assert result["step_id"] == "user"
+
+    event.set()
+    await hass.async_block_till_done()
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "home name"
+    assert result["data"] == {CONF_REFRESH_TOKEN: "refresh"}
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_full_flow_reauth(
+    hass: HomeAssistant,
+    mock_tado_api: MagicMock,
+    mock_setup_entry: AsyncMock,
+) -> None:
+    """Test the full flow of the config when reauthticating."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id="ABC-123-DEF-456",
+        data={CONF_REFRESH_TOKEN: "totally_refresh_for_reauth"},
+    )
+    entry.add_to_hass(hass)
+
+    result = await entry.start_reauth_flow(hass)
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reauth_confirm"
+
+    # The no user input
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reauth_confirm"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input={}
+    )
+
+    event = threading.Event()
+
+    def mock_tado_api_device_activation() -> None:
+        # Simulate the device activation process
+        event.wait(timeout=5)
+
+    mock_tado_api.device_activation = mock_tado_api_device_activation
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.SHOW_PROGRESS
+    assert result["step_id"] == "user"
+
+    event.set()
+    await hass.async_block_till_done()
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "home name"
+    assert result["data"] == {CONF_REFRESH_TOKEN: "refresh"}
+
+
+async def test_auth_timeout(
+    hass: HomeAssistant,
+    mock_tado_api: MagicMock,
+    mock_setup_entry: AsyncMock,
+) -> None:
+    """Test the auth timeout."""
+    mock_tado_api.device_activation_status.return_value = DeviceActivationStatus.PENDING
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.SHOW_PROGRESS_DONE
+    assert result["step_id"] == "timeout"
+
+    mock_tado_api.device_activation_status.return_value = (
+        DeviceActivationStatus.COMPLETED
+    )
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "timeout"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input={}
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "home name"
+    assert result["data"] == {CONF_REFRESH_TOKEN: "refresh"}
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_no_homes(hass: HomeAssistant, mock_tado_api: MagicMock) -> None:
+    """Test the full flow of the config flow."""
+    mock_tado_api.get_me.return_value["homes"] = []
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.SHOW_PROGRESS_DONE
+    assert result["step_id"] == "finish_login"
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "no_homes"
+
+
+async def test_tado_creation(hass: HomeAssistant) -> None:
+    """Test we handle Form Exceptions."""
+
+    with patch(
+        "homeassistant.components.tado.config_flow.Tado",
+        side_effect=TadoException("Test exception"),
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_USER}
+        )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "cannot_connect"
 
 
 @pytest.mark.parametrize(
     ("exception", "error"),
     [
-        (KeyError, "invalid_auth"),
-        (RuntimeError, "cannot_connect"),
-        (ValueError, "unknown"),
+        (Exception, "timeout"),
+        (TadoException, "timeout"),
     ],
 )
-async def test_form_exceptions(
-    hass: HomeAssistant, exception: Exception, error: str
+async def test_wait_for_login_exception(
+    hass: HomeAssistant,
+    mock_tado_api: MagicMock,
+    exception: Exception,
+    error: str,
 ) -> None:
-    """Test we handle Form Exceptions."""
+    """Test that an exception in wait for login is handled properly."""
+    mock_tado_api.device_activation.side_effect = exception
+
     result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
+        DOMAIN, context={"source": SOURCE_USER}
     )
-
-    with patch(
-        "homeassistant.components.tado.config_flow.Tado",
-        side_effect=exception,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {"username": "test-username", "password": "test-password"},
-        )
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {"base": error}
-
-    # Test a retry to recover, upon failure
-    mock_tado_api = _get_mock_tado_api(get_me={"homes": [{"id": 1, "name": "myhome"}]})
-
-    with (
-        patch(
-            "homeassistant.components.tado.config_flow.Tado",
-            return_value=mock_tado_api,
-        ),
-        patch(
-            "homeassistant.components.tado.async_setup_entry",
-            return_value=True,
-        ) as mock_setup_entry,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {"username": "test-username", "password": "test-password"},
-        )
-        await hass.async_block_till_done()
-
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == "myhome"
-    assert result["data"] == {
-        "username": "test-username",
-        "password": "test-password",
-    }
-    assert len(mock_setup_entry.mock_calls) == 1
+    # @joostlek: I think the timeout step is not rightfully named, but heck, it works
+    assert result["type"] is FlowResultType.SHOW_PROGRESS_DONE
+    assert result["step_id"] == error
 
 
-async def test_options_flow(hass: HomeAssistant) -> None:
+async def test_options_flow(
+    hass: HomeAssistant,
+    mock_tado_api: MagicMock,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
     """Test config flow options."""
-    entry = MockConfigEntry(domain=DOMAIN, data={"username": "test-username"})
-    entry.add_to_hass(hass)
+    mock_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
 
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {}
-
-    with patch(
-        "homeassistant.components.tado.async_setup_entry",
-        return_value=True,
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-    result = await hass.config_entries.options.async_init(
-        entry.entry_id, context={"source": config_entries.SOURCE_USER}
-    )
+    result = await hass.config_entries.options.async_init(mock_config_entry.entry_id)
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "init"
 
@@ -119,125 +213,17 @@ async def test_options_flow(hass: HomeAssistant) -> None:
         result["flow_id"],
         {CONF_FALLBACK: CONST_OVERLAY_TADO_DEFAULT},
     )
-    await hass.async_block_till_done()
 
     assert result["type"] is FlowResultType.CREATE_ENTRY
     assert result["data"] == {CONF_FALLBACK: CONST_OVERLAY_TADO_DEFAULT}
 
 
-async def test_create_entry(hass: HomeAssistant) -> None:
-    """Test we can setup though the user path."""
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {}
-
-    mock_tado_api = _get_mock_tado_api(get_me={"homes": [{"id": 1, "name": "myhome"}]})
-
-    with (
-        patch(
-            "homeassistant.components.tado.config_flow.Tado",
-            return_value=mock_tado_api,
-        ),
-        patch(
-            "homeassistant.components.tado.async_setup_entry",
-            return_value=True,
-        ) as mock_setup_entry,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {"username": "test-username", "password": "test-password"},
-        )
-        await hass.async_block_till_done()
-
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == "myhome"
-    assert result["data"] == {
-        "username": "test-username",
-        "password": "test-password",
-    }
-    assert len(mock_setup_entry.mock_calls) == 1
-
-
-async def test_form_invalid_auth(hass: HomeAssistant) -> None:
-    """Test we handle invalid auth."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-
-    response_mock = MagicMock()
-    type(response_mock).status_code = HTTPStatus.UNAUTHORIZED
-    mock_tado_api = _get_mock_tado_api(
-        get_me=requests.HTTPError(response=response_mock)
-    )
-
-    with patch(
-        "homeassistant.components.tado.config_flow.Tado",
-        return_value=mock_tado_api,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {"username": "test-username", "password": "test-password"},
-        )
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {"base": "invalid_auth"}
-
-
-async def test_form_cannot_connect(hass: HomeAssistant) -> None:
-    """Test we handle cannot connect error."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-
-    response_mock = MagicMock()
-    type(response_mock).status_code = HTTPStatus.INTERNAL_SERVER_ERROR
-    mock_tado_api = _get_mock_tado_api(
-        get_me=requests.HTTPError(response=response_mock)
-    )
-
-    with patch(
-        "homeassistant.components.tado.config_flow.Tado",
-        return_value=mock_tado_api,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {"username": "test-username", "password": "test-password"},
-        )
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {"base": "cannot_connect"}
-
-
-async def test_no_homes(hass: HomeAssistant) -> None:
-    """Test we handle no homes error."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-
-    mock_tado_api = _get_mock_tado_api(get_me={"homes": []})
-
-    with patch(
-        "homeassistant.components.tado.config_flow.Tado",
-        return_value=mock_tado_api,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {"username": "test-username", "password": "test-password"},
-        )
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {"base": "no_homes"}
-
-
-async def test_form_homekit(hass: HomeAssistant) -> None:
+async def test_homekit(hass: HomeAssistant, mock_tado_api: MagicMock) -> None:
     """Test that we abort from homekit if tado is already setup."""
 
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
-        context={"source": config_entries.SOURCE_HOMEKIT},
+        context={"source": SOURCE_HOMEKIT},
         data=ZeroconfServiceInfo(
             ip_address=ip_address("127.0.0.1"),
             ip_addresses=[ip_address("127.0.0.1")],
@@ -249,13 +235,18 @@ async def test_form_homekit(hass: HomeAssistant) -> None:
         ),
     )
     assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {}
-    flow = next(
-        flow
-        for flow in hass.config_entries.flow.async_progress()
-        if flow["flow_id"] == result["flow_id"]
-    )
-    assert flow["context"]["unique_id"] == "AA:BB:CC:DD:EE:FF"
+    assert result["step_id"] == "homekit_confirm"
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["result"].unique_id == "1"
+
+
+async def test_homekit_already_setup(
+    hass: HomeAssistant, mock_tado_api: MagicMock
+) -> None:
+    """Test that we abort from homekit if tado is already setup."""
 
     entry = MockConfigEntry(
         domain=DOMAIN, data={CONF_USERNAME: "mock", CONF_PASSWORD: "mock"}
@@ -264,7 +255,7 @@ async def test_form_homekit(hass: HomeAssistant) -> None:
 
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
-        context={"source": config_entries.SOURCE_HOMEKIT},
+        context={"source": SOURCE_HOMEKIT},
         data=ZeroconfServiceInfo(
             ip_address=ip_address("127.0.0.1"),
             ip_addresses=[ip_address("127.0.0.1")],
@@ -276,77 +267,4 @@ async def test_form_homekit(hass: HomeAssistant) -> None:
         ),
     )
     assert result["type"] is FlowResultType.ABORT
-
-
-@pytest.mark.parametrize(
-    ("exception", "error"),
-    [
-        (PyTado.exceptions.TadoWrongCredentialsException, "invalid_auth"),
-        (RuntimeError, "cannot_connect"),
-        (NoHomes, "no_homes"),
-        (ValueError, "unknown"),
-    ],
-)
-async def test_reconfigure_flow(
-    hass: HomeAssistant, exception: Exception, error: str
-) -> None:
-    """Test re-configuration flow."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={
-            "username": "test-username",
-            "password": "test-password",
-            "home_id": 1,
-        },
-        unique_id="unique_id",
-    )
-    entry.add_to_hass(hass)
-
-    result = await entry.start_reconfigure_flow(hass)
-
-    assert result["type"] is FlowResultType.FORM
-
-    with patch(
-        "homeassistant.components.tado.config_flow.Tado",
-        side_effect=exception,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                CONF_PASSWORD: "test-password",
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {"base": error}
-
-    mock_tado_api = _get_mock_tado_api(get_me={"homes": [{"id": 1, "name": "myhome"}]})
-    with (
-        patch(
-            "homeassistant.components.tado.config_flow.Tado",
-            return_value=mock_tado_api,
-        ),
-        patch(
-            "homeassistant.components.tado.async_setup_entry",
-            return_value=True,
-        ),
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                CONF_PASSWORD: "test-password",
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "reconfigure_successful"
-    entry = hass.config_entries.async_get_entry(entry.entry_id)
-    assert entry
-    assert entry.title == "Mock Title"
-    assert entry.data == {
-        "username": "test-username",
-        "password": "test-password",
-        "home_id": 1,
-    }
+    assert result["reason"] == "already_configured"
diff --git a/tests/components/tado/test_helper.py b/tests/components/tado/test_helper.py
index da959c2124a..7f798e3797c 100644
--- a/tests/components/tado/test_helper.py
+++ b/tests/components/tado/test_helper.py
@@ -5,7 +5,7 @@ from unittest.mock import MagicMock, patch
 from PyTado.interface import Tado
 import pytest
 
-from homeassistant.components.tado import TadoDataUpdateCoordinator
+from homeassistant.components.tado import CONF_REFRESH_TOKEN, TadoDataUpdateCoordinator
 from homeassistant.components.tado.const import (
     CONST_OVERLAY_MANUAL,
     CONST_OVERLAY_TADO_DEFAULT,
@@ -28,13 +28,13 @@ def entry(request: pytest.FixtureRequest) -> MockConfigEntry:
         request.param if hasattr(request, "param") else CONST_OVERLAY_TADO_DEFAULT
     )
     return MockConfigEntry(
-        version=1,
-        minor_version=1,
+        version=2,
         domain=DOMAIN,
         title="Tado",
         data={
             CONF_USERNAME: "test-username",
             CONF_PASSWORD: "test-password",
+            CONF_REFRESH_TOKEN: "test-refresh",
         },
         options={
             "fallback": fallback,
diff --git a/tests/components/tado/test_init.py b/tests/components/tado/test_init.py
new file mode 100644
index 00000000000..2f2ccacf3c0
--- /dev/null
+++ b/tests/components/tado/test_init.py
@@ -0,0 +1,30 @@
+"""Test the Tado integration."""
+
+from homeassistant.components.tado import DOMAIN
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+async def test_v1_migration(hass: HomeAssistant) -> None:
+    """Test migration from v1 to v2 config entry."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            CONF_USERNAME: "test",
+            CONF_PASSWORD: "test",
+        },
+        unique_id="1",
+        version=1,
+    )
+    entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+    assert entry.version == 2
+    assert CONF_USERNAME not in entry.data
+    assert CONF_PASSWORD not in entry.data
+
+    assert entry.state is ConfigEntryState.SETUP_ERROR
+    assert len(hass.config_entries.flow.async_progress()) == 1
diff --git a/tests/components/tado/test_switch.py b/tests/components/tado/test_switch.py
new file mode 100644
index 00000000000..2112f3a1ac7
--- /dev/null
+++ b/tests/components/tado/test_switch.py
@@ -0,0 +1,47 @@
+"""The sensor tests for the tado platform."""
+
+from unittest.mock import patch
+
+import pytest
+
+from homeassistant.components.switch import (
+    DOMAIN as SWITCH_DOMAIN,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+)
+from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF
+from homeassistant.core import HomeAssistant
+
+from .util import async_init_integration
+
+CHILD_LOCK_SWITCH_ENTITY = "switch.baseboard_heater_child_lock"
+
+
+async def test_child_lock(hass: HomeAssistant) -> None:
+    """Test creation of child lock entity."""
+
+    await async_init_integration(hass)
+    state = hass.states.get(CHILD_LOCK_SWITCH_ENTITY)
+    assert state.state == STATE_OFF
+
+
+@pytest.mark.parametrize(
+    ("method", "expected"), [(SERVICE_TURN_ON, True), (SERVICE_TURN_OFF, False)]
+)
+async def test_set_child_lock(hass: HomeAssistant, method, expected) -> None:
+    """Test enable child lock on switch."""
+
+    await async_init_integration(hass)
+
+    with patch(
+        "homeassistant.components.tado.PyTado.interface.api.Tado.set_child_lock"
+    ) as mock_set_state:
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            method,
+            {ATTR_ENTITY_ID: CHILD_LOCK_SWITCH_ENTITY},
+            blocking=True,
+        )
+
+    mock_set_state.assert_called_once()
+    assert mock_set_state.call_args[0][1] is expected
diff --git a/tests/components/tado/util.py b/tests/components/tado/util.py
index 5bf87dbed33..6fd333dff51 100644
--- a/tests/components/tado/util.py
+++ b/tests/components/tado/util.py
@@ -2,8 +2,7 @@
 
 import requests_mock
 
-from homeassistant.components.tado import DOMAIN
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.components.tado import CONF_REFRESH_TOKEN, DOMAIN
 from homeassistant.core import HomeAssistant
 
 from tests.common import MockConfigEntry, load_fixture
@@ -178,9 +177,16 @@ async def async_init_integration(
             "https://my.tado.com/api/v2/homes/1/zones/1/state",
             text=load_fixture(zone_1_state_fixture),
         )
+        m.post(
+            "https://login.tado.com/oauth2/token",
+            text=load_fixture(token_fixture),
+        )
         entry = MockConfigEntry(
             domain=DOMAIN,
-            data={CONF_USERNAME: "mock", CONF_PASSWORD: "mock"},
+            version=2,
+            data={
+                CONF_REFRESH_TOKEN: "mock-token",
+            },
             options={"fallback": "NEXT_TIME_BLOCK"},
         )
         entry.add_to_hass(hass)
diff --git a/tests/components/tailwind/snapshots/test_binary_sensor.ambr b/tests/components/tailwind/snapshots/test_binary_sensor.ambr
index 064b391c43a..d04f2e726b5 100644
--- a/tests/components/tailwind/snapshots/test_binary_sensor.ambr
+++ b/tests/components/tailwind/snapshots/test_binary_sensor.ambr
@@ -20,6 +20,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -50,6 +51,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -99,6 +101,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -129,6 +132,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/tailwind/snapshots/test_button.ambr b/tests/components/tailwind/snapshots/test_button.ambr
index 17b656ec5fd..7d3d10aa609 100644
--- a/tests/components/tailwind/snapshots/test_button.ambr
+++ b/tests/components/tailwind/snapshots/test_button.ambr
@@ -20,6 +20,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -50,6 +51,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
diff --git a/tests/components/tailwind/snapshots/test_cover.ambr b/tests/components/tailwind/snapshots/test_cover.ambr
index b69bd9e6410..1a26a6c98a7 100644
--- a/tests/components/tailwind/snapshots/test_cover.ambr
+++ b/tests/components/tailwind/snapshots/test_cover.ambr
@@ -21,6 +21,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -51,6 +52,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -101,6 +103,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -131,6 +134,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/tailwind/snapshots/test_number.ambr b/tests/components/tailwind/snapshots/test_number.ambr
index 3e2e0577ad5..7b906ef1976 100644
--- a/tests/components/tailwind/snapshots/test_number.ambr
+++ b/tests/components/tailwind/snapshots/test_number.ambr
@@ -29,6 +29,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
diff --git a/tests/components/tankerkoenig/const.py b/tests/components/tankerkoenig/const.py
index 2c28753a7f3..9a2ecb3a2be 100644
--- a/tests/components/tankerkoenig/const.py
+++ b/tests/components/tankerkoenig/const.py
@@ -2,7 +2,7 @@
 
 from aiotankerkoenig import PriceInfo, Station, Status
 
-from homeassistant.components.tankerkoenig.const import CONF_FUEL_TYPES, CONF_STATIONS
+from homeassistant.components.tankerkoenig.const import CONF_STATIONS
 from homeassistant.const import (
     CONF_API_KEY,
     CONF_LATITUDE,
@@ -98,7 +98,6 @@ PRICES_MISSING_FUELTYPE = {
 CONFIG_DATA = {
     CONF_NAME: "Home",
     CONF_API_KEY: "269534f6-xxxx-xxxx-xxxx-yyyyzzzzxxxx",
-    CONF_FUEL_TYPES: ["e5"],
     CONF_LOCATION: {CONF_LATITUDE: 51.0, CONF_LONGITUDE: 13.0},
     CONF_RADIUS: 2.0,
     CONF_STATIONS: [
diff --git a/tests/components/tankerkoenig/snapshots/test_diagnostics.ambr b/tests/components/tankerkoenig/snapshots/test_diagnostics.ambr
index 3180c7c0b1d..71d9d9c75f8 100644
--- a/tests/components/tankerkoenig/snapshots/test_diagnostics.ambr
+++ b/tests/components/tankerkoenig/snapshots/test_diagnostics.ambr
@@ -12,9 +12,6 @@
     'entry': dict({
       'data': dict({
         'api_key': '**REDACTED**',
-        'fuel_types': list([
-          'e5',
-        ]),
         'location': dict({
           'latitude': '**REDACTED**',
           'longitude': '**REDACTED**',
@@ -37,6 +34,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': '**REDACTED**',
       'version': 1,
diff --git a/tests/components/tankerkoenig/test_config_flow.py b/tests/components/tankerkoenig/test_config_flow.py
index bb1e943bbb9..967470c2c16 100644
--- a/tests/components/tankerkoenig/test_config_flow.py
+++ b/tests/components/tankerkoenig/test_config_flow.py
@@ -4,11 +4,7 @@ from unittest.mock import AsyncMock, patch
 
 from aiotankerkoenig.exceptions import TankerkoenigInvalidKeyError
 
-from homeassistant.components.tankerkoenig.const import (
-    CONF_FUEL_TYPES,
-    CONF_STATIONS,
-    DOMAIN,
-)
+from homeassistant.components.tankerkoenig.const import CONF_STATIONS, DOMAIN
 from homeassistant.config_entries import SOURCE_USER
 from homeassistant.const import (
     CONF_API_KEY,
@@ -30,7 +26,6 @@ from tests.common import MockConfigEntry
 MOCK_USER_DATA = {
     CONF_NAME: "Home",
     CONF_API_KEY: "269534f6-xxxx-xxxx-xxxx-yyyyzzzzxxxx",
-    CONF_FUEL_TYPES: ["e5"],
     CONF_LOCATION: {CONF_LATITUDE: 51.0, CONF_LONGITUDE: 13.0},
     CONF_RADIUS: 2.0,
 }
@@ -81,7 +76,6 @@ async def test_user(hass: HomeAssistant) -> None:
         assert result["type"] is FlowResultType.CREATE_ENTRY
         assert result["data"][CONF_NAME] == "Home"
         assert result["data"][CONF_API_KEY] == "269534f6-xxxx-xxxx-xxxx-yyyyzzzzxxxx"
-        assert result["data"][CONF_FUEL_TYPES] == ["e5"]
         assert result["data"][CONF_LOCATION] == {"latitude": 51.0, "longitude": 13.0}
         assert result["data"][CONF_RADIUS] == 2.0
         assert result["data"][CONF_STATIONS] == [
diff --git a/tests/components/tankerkoenig/test_coordinator.py b/tests/components/tankerkoenig/test_coordinator.py
index 3ba0dc31c5f..ff2ceca7442 100644
--- a/tests/components/tankerkoenig/test_coordinator.py
+++ b/tests/components/tankerkoenig/test_coordinator.py
@@ -25,7 +25,7 @@ from homeassistant.const import ATTR_ID, CONF_SHOW_ON_MAP, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import CONFIG_DATA
 
diff --git a/tests/components/tasmota/snapshots/test_sensor.ambr b/tests/components/tasmota/snapshots/test_sensor.ambr
index be011e595b9..8a5a78cd366 100644
--- a/tests/components/tasmota/snapshots/test_sensor.ambr
+++ b/tests/components/tasmota/snapshots/test_sensor.ambr
@@ -24,6 +24,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -103,6 +104,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -149,6 +151,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -254,6 +257,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -401,6 +405,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -452,6 +457,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -503,6 +509,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -586,6 +593,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -632,6 +640,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -741,6 +750,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -824,6 +834,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -875,6 +886,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -990,6 +1002,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1041,6 +1054,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1156,6 +1170,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1239,6 +1254,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1290,6 +1306,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1405,6 +1422,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1552,6 +1570,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1603,6 +1622,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1654,6 +1674,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1732,6 +1753,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1860,6 +1882,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1909,6 +1932,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1958,6 +1982,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tasmota/test_binary_sensor.py b/tests/components/tasmota/test_binary_sensor.py
index 5abb9ab9bf2..ff951e058cb 100644
--- a/tests/components/tasmota/test_binary_sensor.py
+++ b/tests/components/tasmota/test_binary_sensor.py
@@ -13,6 +13,7 @@ from hatasmota.utils import (
 )
 import pytest
 
+from homeassistant import core as ha
 from homeassistant.components.tasmota.const import DEFAULT_PREFIX
 from homeassistant.const import (
     ATTR_ASSUMED_STATE,
@@ -22,9 +23,8 @@ from homeassistant.const import (
     STATE_UNKNOWN,
     Platform,
 )
-import homeassistant.core as ha
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .test_common import (
     DEFAULT_CONFIG,
diff --git a/tests/components/tasmota/test_common.py b/tests/components/tasmota/test_common.py
index 4d2c821fff4..674ae316ecc 100644
--- a/tests/components/tasmota/test_common.py
+++ b/tests/components/tasmota/test_common.py
@@ -27,7 +27,7 @@ from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 
-from tests.common import async_fire_mqtt_message
+from tests.common import MockMqttReasonCode, async_fire_mqtt_message
 from tests.typing import MqttMockHAClient, MqttMockPahoClient, WebSocketGenerator
 
 DEFAULT_CONFIG = {
@@ -165,7 +165,7 @@ async def help_test_availability_when_connection_lost(
 
     # Disconnected from MQTT server -> state changed to unavailable
     mqtt_mock.connected = False
-    mqtt_client_mock.on_disconnect(None, None, 0)
+    mqtt_client_mock.on_disconnect(None, None, 0, MockMqttReasonCode())
     await hass.async_block_till_done()
     await hass.async_block_till_done()
     await hass.async_block_till_done()
@@ -174,7 +174,7 @@ async def help_test_availability_when_connection_lost(
 
     # Reconnected to MQTT server -> state still unavailable
     mqtt_mock.connected = True
-    mqtt_client_mock.on_connect(None, None, None, 0)
+    mqtt_client_mock.on_connect(None, None, None, MockMqttReasonCode())
     await hass.async_block_till_done()
     await hass.async_block_till_done()
     await hass.async_block_till_done()
@@ -226,7 +226,7 @@ async def help_test_deep_sleep_availability_when_connection_lost(
 
     # Disconnected from MQTT server -> state changed to unavailable
     mqtt_mock.connected = False
-    mqtt_client_mock.on_disconnect(None, None, 0)
+    mqtt_client_mock.on_disconnect(None, None, 0, MockMqttReasonCode())
     await hass.async_block_till_done()
     await hass.async_block_till_done()
     await hass.async_block_till_done()
@@ -235,7 +235,7 @@ async def help_test_deep_sleep_availability_when_connection_lost(
 
     # Reconnected to MQTT server -> state no longer unavailable
     mqtt_mock.connected = True
-    mqtt_client_mock.on_connect(None, None, None, 0)
+    mqtt_client_mock.on_connect(None, None, None, MockMqttReasonCode())
     await hass.async_block_till_done()
     await hass.async_block_till_done()
     await hass.async_block_till_done()
@@ -478,7 +478,7 @@ async def help_test_availability_poll_state(
 
     # Disconnected from MQTT server
     mqtt_mock.connected = False
-    mqtt_client_mock.on_disconnect(None, None, 0)
+    mqtt_client_mock.on_disconnect(None, None, 0, MockMqttReasonCode())
     await hass.async_block_till_done()
     await hass.async_block_till_done()
     await hass.async_block_till_done()
@@ -486,7 +486,7 @@ async def help_test_availability_poll_state(
 
     # Reconnected to MQTT server
     mqtt_mock.connected = True
-    mqtt_client_mock.on_connect(None, None, None, 0)
+    mqtt_client_mock.on_connect(None, None, None, MockMqttReasonCode())
     await hass.async_block_till_done()
     await hass.async_block_till_done()
     await hass.async_block_till_done()
diff --git a/tests/components/tcp/test_sensor.py b/tests/components/tcp/test_sensor.py
index 27003df46cd..ade4b9f93d4 100644
--- a/tests/components/tcp/test_sensor.py
+++ b/tests/components/tcp/test_sensor.py
@@ -5,7 +5,7 @@ from unittest.mock import call, patch
 
 import pytest
 
-import homeassistant.components.tcp.common as tcp
+from homeassistant.components.tcp import common as tcp
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
diff --git a/tests/components/technove/snapshots/test_binary_sensor.ambr b/tests/components/technove/snapshots/test_binary_sensor.ambr
index f08dd6970fe..5d9bcd2175a 100644
--- a/tests/components/technove/snapshots/test_binary_sensor.ambr
+++ b/tests/components/technove/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -190,6 +194,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/technove/snapshots/test_diagnostics.ambr b/tests/components/technove/snapshots/test_diagnostics.ambr
index 175e8f2022a..e16c51a2e98 100644
--- a/tests/components/technove/snapshots/test_diagnostics.ambr
+++ b/tests/components/technove/snapshots/test_diagnostics.ambr
@@ -6,7 +6,7 @@
     'current': 23.75,
     'energy_session': 12.34,
     'energy_total': 1234,
-    'high_charge_period_active': False,
+    'high_tariff_period_active': False,
     'in_sharing_mode': False,
     'is_battery_protected': False,
     'is_session_active': True,
diff --git a/tests/components/technove/snapshots/test_number.ambr b/tests/components/technove/snapshots/test_number.ambr
index 622c04d542a..eea4b0cb64c 100644
--- a/tests/components/technove/snapshots/test_number.ambr
+++ b/tests/components/technove/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/technove/snapshots/test_sensor.ambr b/tests/components/technove/snapshots/test_sensor.ambr
index 149155519d4..aaec5667e55 100644
--- a/tests/components/technove/snapshots/test_sensor.ambr
+++ b/tests/components/technove/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -110,6 +112,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -161,6 +164,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -212,6 +216,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -263,6 +268,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -316,10 +322,11 @@
         'plugged_waiting',
         'plugged_charging',
         'out_of_activation_period',
-        'high_charge_period',
+        'high_tariff_period',
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -356,7 +363,7 @@
         'plugged_waiting',
         'plugged_charging',
         'out_of_activation_period',
-        'high_charge_period',
+        'high_tariff_period',
       ]),
     }),
     'context': <ANY>,
@@ -376,6 +383,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -425,6 +433,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/technove/snapshots/test_switch.ambr b/tests/components/technove/snapshots/test_switch.ambr
index 6febc8c768c..a5f8411747b 100644
--- a/tests/components/technove/snapshots/test_switch.ambr
+++ b/tests/components/technove/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tedee/snapshots/test_binary_sensor.ambr b/tests/components/tedee/snapshots/test_binary_sensor.ambr
index e3238dacda1..c2210a7ca5d 100644
--- a/tests/components/tedee/snapshots/test_binary_sensor.ambr
+++ b/tests/components/tedee/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -146,6 +149,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -192,6 +196,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -239,6 +244,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -286,6 +292,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -332,6 +339,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tedee/snapshots/test_init.ambr b/tests/components/tedee/snapshots/test_init.ambr
index af559f561b2..28b5ef7a7ed 100644
--- a/tests/components/tedee/snapshots/test_init.ambr
+++ b/tests/components/tedee/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -35,6 +36,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/tedee/snapshots/test_lock.ambr b/tests/components/tedee/snapshots/test_lock.ambr
index cca988663d2..432c3ebd19f 100644
--- a/tests/components/tedee/snapshots/test_lock.ambr
+++ b/tests/components/tedee/snapshots/test_lock.ambr
@@ -20,6 +20,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -50,6 +51,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -85,6 +87,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -132,6 +135,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tedee/snapshots/test_sensor.ambr b/tests/components/tedee/snapshots/test_sensor.ambr
index 297fe9b0d37..22679c4153a 100644
--- a/tests/components/tedee/snapshots/test_sensor.ambr
+++ b/tests/components/tedee/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -110,6 +112,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -161,6 +164,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/telegram_bot/test_telegram_bot.py b/tests/components/telegram_bot/test_telegram_bot.py
index be6b5b31325..c9038003cfc 100644
--- a/tests/components/telegram_bot/test_telegram_bot.py
+++ b/tests/components/telegram_bot/test_telegram_bot.py
@@ -184,7 +184,7 @@ async def test_send_message_thread(hass: HomeAssistant, webhook_platform) -> Non
 
     assert len(events) == 1
     assert events[0].context == context
-    assert events[0].data[ATTR_MESSAGE_THREAD_ID] == "123"
+    assert events[0].data[ATTR_MESSAGE_THREAD_ID] == 123
 
 
 async def test_webhook_endpoint_generates_telegram_text_event(
diff --git a/tests/components/temper/test_sensor.py b/tests/components/temper/test_sensor.py
index d1e74f1ab0f..445adc0b5bd 100644
--- a/tests/components/temper/test_sensor.py
+++ b/tests/components/temper/test_sensor.py
@@ -5,7 +5,7 @@ from unittest.mock import Mock, patch
 
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
diff --git a/tests/components/template/conftest.py b/tests/components/template/conftest.py
index bdca84ba071..86a30535e92 100644
--- a/tests/components/template/conftest.py
+++ b/tests/components/template/conftest.py
@@ -1,5 +1,7 @@
 """template conftest."""
 
+from enum import Enum
+
 import pytest
 
 from homeassistant.core import HomeAssistant, ServiceCall
@@ -9,6 +11,13 @@ from homeassistant.setup import async_setup_component
 from tests.common import assert_setup_component, async_mock_service
 
 
+class ConfigurationStyle(Enum):
+    """Configuration Styles for template testing."""
+
+    LEGACY = "Legacy"
+    MODERN = "Modern"
+
+
 @pytest.fixture
 def calls(hass: HomeAssistant) -> list[ServiceCall]:
     """Track calls to a mock service."""
diff --git a/tests/components/template/snapshots/test_switch.ambr b/tests/components/template/snapshots/test_switch.ambr
index c240a9436a0..909110fdbc8 100644
--- a/tests/components/template/snapshots/test_switch.ambr
+++ b/tests/components/template/snapshots/test_switch.ambr
@@ -1,5 +1,18 @@
 # serializer version: 1
-# name: test_setup_config_entry
+# name: test_setup_config_entry[state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'My template',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.my_template',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_setup_config_entry[value_template]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'friendly_name': 'My template',
diff --git a/tests/components/template/test_binary_sensor.py b/tests/components/template/test_binary_sensor.py
index 3e3a629b4be..a7ee953bb09 100644
--- a/tests/components/template/test_binary_sensor.py
+++ b/tests/components/template/test_binary_sensor.py
@@ -23,7 +23,7 @@ from homeassistant.core import Context, CoreState, HomeAssistant, State
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_component import async_update_entity
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/template/test_blueprint.py b/tests/components/template/test_blueprint.py
index cb4e83d934c..66630ecf739 100644
--- a/tests/components/template/test_blueprint.py
+++ b/tests/components/template/test_blueprint.py
@@ -16,10 +16,10 @@ from homeassistant.components.blueprint import (
     DomainBlueprints,
 )
 from homeassistant.components.template import DOMAIN, SERVICE_RELOAD
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import Context, HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.setup import async_setup_component
-from homeassistant.util import yaml as yaml_util
+from homeassistant.util import dt as dt_util, yaml as yaml_util
 
 from tests.common import async_mock_service
 
@@ -149,6 +149,124 @@ async def test_inverted_binary_sensor(
         )
 
 
+async def test_reload_template_when_blueprint_changes(hass: HomeAssistant) -> None:
+    """Test a template is updated at reload if the blueprint has changed."""
+    hass.states.async_set("binary_sensor.foo", "on", {"friendly_name": "Foo"})
+    config = {
+        DOMAIN: [
+            {
+                "use_blueprint": {
+                    "path": "inverted_binary_sensor.yaml",
+                    "input": {"reference_entity": "binary_sensor.foo"},
+                },
+                "name": "Inverted foo",
+            },
+        ]
+    }
+    with patch_blueprint(
+        "inverted_binary_sensor.yaml",
+        BUILTIN_BLUEPRINT_FOLDER / "inverted_binary_sensor.yaml",
+    ):
+        assert await async_setup_component(hass, DOMAIN, config)
+
+    hass.states.async_set("binary_sensor.foo", "off", {"friendly_name": "Foo"})
+    await hass.async_block_till_done()
+
+    assert hass.states.get("binary_sensor.foo").state == "off"
+
+    inverted = hass.states.get("binary_sensor.inverted_foo")
+    assert inverted
+    assert inverted.state == "on"
+
+    # Reload the automations without any change, but with updated blueprint
+    blueprint_config = yaml_util.load_yaml(
+        BUILTIN_BLUEPRINT_FOLDER / "inverted_binary_sensor.yaml"
+    )
+    blueprint_config["binary_sensor"]["state"] = "{{ states(reference_entity) }}"
+    with (
+        patch(
+            "homeassistant.config.load_yaml_config_file",
+            autospec=True,
+            return_value=config,
+        ),
+        patch(
+            "homeassistant.components.blueprint.models.yaml_util.load_yaml_dict",
+            autospec=True,
+            return_value=blueprint_config,
+        ),
+    ):
+        await hass.services.async_call(DOMAIN, SERVICE_RELOAD, blocking=True)
+
+    hass.states.async_set("binary_sensor.foo", "off", {"friendly_name": "Foo"})
+    await hass.async_block_till_done()
+
+    not_inverted = hass.states.get("binary_sensor.inverted_foo")
+    assert not_inverted
+    assert not_inverted.state == "off"
+
+    hass.states.async_set("binary_sensor.foo", "on", {"friendly_name": "Foo"})
+    await hass.async_block_till_done()
+
+    not_inverted = hass.states.get("binary_sensor.inverted_foo")
+    assert not_inverted
+    assert not_inverted.state == "on"
+
+
+async def test_trigger_event_sensor(
+    hass: HomeAssistant, device_registry: dr.DeviceRegistry
+) -> None:
+    """Test event sensor blueprint."""
+    blueprint = "test_event_sensor.yaml"
+    assert await async_setup_component(
+        hass,
+        "template",
+        {
+            "template": [
+                {
+                    "use_blueprint": {
+                        "path": blueprint,
+                        "input": {
+                            "event_type": "my_custom_event",
+                            "event_data": {"foo": "bar"},
+                        },
+                    },
+                    "name": "My Custom Event",
+                },
+            ]
+        },
+    )
+
+    context = Context()
+    now = dt_util.utcnow()
+    with patch("homeassistant.util.dt.now", return_value=now):
+        hass.bus.async_fire(
+            "my_custom_event", {"foo": "bar", "beer": 2}, context=context
+        )
+        await hass.async_block_till_done()
+
+    date_state = hass.states.get("sensor.my_custom_event")
+    assert date_state is not None
+    assert date_state.state == now.isoformat(timespec="seconds")
+    data = date_state.attributes.get("data")
+    assert data is not None
+    assert data != ""
+    assert data.get("foo") == "bar"
+    assert data.get("beer") == 2
+
+    inverted_foo_template = template.helpers.blueprint_in_template(
+        hass, "sensor.my_custom_event"
+    )
+    assert inverted_foo_template == blueprint
+
+    inverted_binary_sensor_blueprint_entity_ids = (
+        template.helpers.templates_with_blueprint(hass, blueprint)
+    )
+    assert len(inverted_binary_sensor_blueprint_entity_ids) == 1
+
+    with pytest.raises(BlueprintInUse):
+        await template.async_get_blueprints(hass).async_remove_blueprint(blueprint)
+
+
 async def test_domain_blueprint(hass: HomeAssistant) -> None:
     """Test DomainBlueprint services."""
     reload_handler_calls = async_mock_service(hass, DOMAIN, SERVICE_RELOAD)
@@ -199,7 +317,8 @@ async def test_invalid_blueprint(
         )
 
     assert "more than one platform defined per blueprint" in caplog.text
-    assert await template.async_get_blueprints(hass).async_get_blueprints() == {}
+    blueprints = await template.async_get_blueprints(hass).async_get_blueprints()
+    assert "invalid.yaml" not in blueprints
 
 
 async def test_no_blueprint(hass: HomeAssistant) -> None:
diff --git a/tests/components/template/test_config.py b/tests/components/template/test_config.py
new file mode 100644
index 00000000000..b14ff0efa5a
--- /dev/null
+++ b/tests/components/template/test_config.py
@@ -0,0 +1,50 @@
+"""Test Template config."""
+
+from __future__ import annotations
+
+import pytest
+import voluptuous as vol
+
+from homeassistant.components.template.config import CONFIG_SECTION_SCHEMA
+from homeassistant.core import HomeAssistant
+
+
+@pytest.mark.parametrize(
+    "config",
+    [
+        {
+            "trigger": {"trigger": "event", "event_type": "my_event"},
+            "button": {
+                "press": {
+                    "service": "test.automation",
+                    "data_template": {"caller": "{{ this.entity_id }}"},
+                },
+                "device_class": "restart",
+                "unique_id": "test",
+                "name": "test",
+                "icon": "mdi:test",
+            },
+        },
+        {
+            "trigger": {"trigger": "event", "event_type": "my_event"},
+            "action": {
+                "service": "test.automation",
+                "data_template": {"caller": "{{ this.entity_id }}"},
+            },
+            "button": {
+                "press": {
+                    "service": "test.automation",
+                    "data_template": {"caller": "{{ this.entity_id }}"},
+                },
+                "device_class": "restart",
+                "unique_id": "test",
+                "name": "test",
+                "icon": "mdi:test",
+            },
+        },
+    ],
+)
+async def test_invalid_schema(hass: HomeAssistant, config: dict) -> None:
+    """Test invalid config schemas."""
+    with pytest.raises(vol.Invalid):
+        CONFIG_SECTION_SCHEMA(config)
diff --git a/tests/components/template/test_config_flow.py b/tests/components/template/test_config_flow.py
index 2c9b81e7c91..21d740b165b 100644
--- a/tests/components/template/test_config_flow.py
+++ b/tests/components/template/test_config_flow.py
@@ -16,6 +16,36 @@ from homeassistant.helpers import device_registry as dr
 from tests.common import MockConfigEntry
 from tests.typing import WebSocketGenerator
 
+SWITCH_BEFORE_OPTIONS = {
+    "name": "test_template_switch",
+    "template_type": "switch",
+    "turn_off": [{"event": "test_template_switch", "event_data": {"event": "off"}}],
+    "turn_on": [{"event": "test_template_switch", "event_data": {"event": "on"}}],
+    "value_template": "{{ now().minute % 2 == 0 }}",
+}
+
+
+SWITCH_AFTER_OPTIONS = {
+    "name": "test_template_switch",
+    "template_type": "switch",
+    "turn_off": [{"event": "test_template_switch", "event_data": {"event": "off"}}],
+    "turn_on": [{"event": "test_template_switch", "event_data": {"event": "on"}}],
+    "state": "{{ now().minute % 2 == 0 }}",
+    "value_template": "{{ now().minute % 2 == 0 }}",
+}
+
+SENSOR_OPTIONS = {
+    "name": "test_template_sensor",
+    "template_type": "sensor",
+    "state": "{{ 'a' if now().minute % 2 == 0 else 'b' }}",
+}
+
+BINARY_SENSOR_OPTIONS = {
+    "name": "test_template_sensor",
+    "template_type": "binary_sensor",
+    "state": "{{ now().minute % 2 == 0 else }}",
+}
+
 
 @pytest.mark.parametrize(
     (
diff --git a/tests/components/template/test_entity.py b/tests/components/template/test_entity.py
new file mode 100644
index 00000000000..67a85839982
--- /dev/null
+++ b/tests/components/template/test_entity.py
@@ -0,0 +1,17 @@
+"""Test abstract template entity."""
+
+import pytest
+
+from homeassistant.components.template import entity as abstract_entity
+from homeassistant.core import HomeAssistant
+
+
+async def test_template_entity_not_implemented(hass: HomeAssistant) -> None:
+    """Test abstract template entity raises not implemented error."""
+
+    entity = abstract_entity.AbstractTemplateEntity(None)
+    with pytest.raises(NotImplementedError):
+        _ = entity.referenced_blueprint
+
+    with pytest.raises(NotImplementedError):
+        entity._render_script_variables()
diff --git a/tests/components/template/test_light.py b/tests/components/template/test_light.py
index b5ba93a4bd0..1a739b4921e 100644
--- a/tests/components/template/test_light.py
+++ b/tests/components/template/test_light.py
@@ -4,7 +4,7 @@ from typing import Any
 
 import pytest
 
-from homeassistant.components import light
+from homeassistant.components import light, template
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
     ATTR_COLOR_TEMP_KELVIN,
@@ -17,6 +17,7 @@ from homeassistant.components.light import (
     ColorMode,
     LightEntityFeature,
 )
+from homeassistant.components.template.light import rewrite_legacy_to_modern_conf
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     SERVICE_TURN_OFF,
@@ -26,8 +27,12 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
 )
 from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.template import Template
 from homeassistant.setup import async_setup_component
 
+from .conftest import ConfigurationStyle
+
 from tests.common import assert_setup_component
 
 # Represent for light's availability
@@ -154,10 +159,245 @@ OPTIMISTIC_RGBWW_COLOR_LIGHT_CONFIG = {
 }
 
 
-async def async_setup_light(
+TEST_MISSING_KEY_CONFIG = {
+    "turn_on": {
+        "service": "light.turn_on",
+        "entity_id": "light.test_state",
+    },
+    "set_level": {
+        "service": "light.turn_on",
+        "data_template": {
+            "entity_id": "light.test_state",
+            "brightness": "{{brightness}}",
+        },
+    },
+}
+
+
+TEST_ON_ACTION_WITH_TRANSITION_CONFIG = {
+    "turn_on": {
+        "service": "test.automation",
+        "data_template": {
+            "transition": "{{transition}}",
+        },
+    },
+    "turn_off": {
+        "service": "light.turn_off",
+        "entity_id": "light.test_state",
+    },
+    "set_level": {
+        "service": "light.turn_on",
+        "data_template": {
+            "entity_id": "light.test_state",
+            "brightness": "{{brightness}}",
+            "transition": "{{transition}}",
+        },
+    },
+}
+
+
+TEST_OFF_ACTION_WITH_TRANSITION_CONFIG = {
+    "turn_on": {
+        "service": "light.turn_on",
+        "entity_id": "light.test_state",
+    },
+    "turn_off": {
+        "service": "test.automation",
+        "data_template": {
+            "transition": "{{transition}}",
+        },
+    },
+    "set_level": {
+        "service": "light.turn_on",
+        "data_template": {
+            "entity_id": "light.test_state",
+            "brightness": "{{brightness}}",
+            "transition": "{{transition}}",
+        },
+    },
+}
+
+
+TEST_ALL_COLORS_NO_TEMPLATE_CONFIG = {
+    "set_hs": {
+        "service": "test.automation",
+        "data_template": {
+            "entity_id": "test.test_state",
+            "h": "{{h}}",
+            "s": "{{s}}",
+        },
+    },
+    "set_temperature": {
+        "service": "test.automation",
+        "data_template": {
+            "entity_id": "test.test_state",
+            "color_temp": "{{color_temp}}",
+        },
+    },
+    "set_rgb": {
+        "service": "test.automation",
+        "data_template": {
+            "entity_id": "test.test_state",
+            "r": "{{r}}",
+            "g": "{{g}}",
+            "b": "{{b}}",
+        },
+    },
+    "set_rgbw": {
+        "service": "test.automation",
+        "data_template": {
+            "entity_id": "test.test_state",
+            "r": "{{r}}",
+            "g": "{{g}}",
+            "b": "{{b}}",
+            "w": "{{w}}",
+        },
+    },
+    "set_rgbww": {
+        "service": "test.automation",
+        "data_template": {
+            "entity_id": "test.test_state",
+            "r": "{{r}}",
+            "g": "{{g}}",
+            "b": "{{b}}",
+            "cw": "{{cw}}",
+            "ww": "{{ww}}",
+        },
+    },
+}
+
+
+TEST_UNIQUE_ID_CONFIG = {
+    **OPTIMISTIC_ON_OFF_LIGHT_CONFIG,
+    "unique_id": "not-so-unique-anymore",
+}
+
+
+@pytest.mark.parametrize(
+    ("old_attr", "new_attr", "attr_template"),
+    [
+        (
+            "value_template",
+            "state",
+            "{{ 1 == 1 }}",
+        ),
+        (
+            "rgb_template",
+            "rgb",
+            "{{ (255,255,255) }}",
+        ),
+        (
+            "rgbw_template",
+            "rgbw",
+            "{{ (255,255,255,255) }}",
+        ),
+        (
+            "rgbww_template",
+            "rgbww",
+            "{{ (255,255,255,255,255) }}",
+        ),
+        (
+            "effect_list_template",
+            "effect_list",
+            "{{ ['a', 'b'] }}",
+        ),
+        (
+            "effect_template",
+            "effect",
+            "{{ 'a' }}",
+        ),
+        (
+            "level_template",
+            "level",
+            "{{ 255 }}",
+        ),
+        (
+            "max_mireds_template",
+            "max_mireds",
+            "{{ 255 }}",
+        ),
+        (
+            "min_mireds_template",
+            "min_mireds",
+            "{{ 255 }}",
+        ),
+        (
+            "supports_transition_template",
+            "supports_transition",
+            "{{ True }}",
+        ),
+        (
+            "temperature_template",
+            "temperature",
+            "{{ 255 }}",
+        ),
+        (
+            "white_value_template",
+            "white_value",
+            "{{ 255 }}",
+        ),
+        (
+            "hs_template",
+            "hs",
+            "{{ (255, 255) }}",
+        ),
+        (
+            "color_template",
+            "hs",
+            "{{ (255, 255) }}",
+        ),
+    ],
+)
+async def test_legacy_to_modern_config(
+    hass: HomeAssistant, old_attr: str, new_attr: str, attr_template: str
+) -> None:
+    """Test the conversion of legacy template to modern template."""
+    config = {
+        "foo": {
+            "friendly_name": "foo bar",
+            "unique_id": "foo-bar-light",
+            "icon_template": "{{ 'mdi.abc' }}",
+            "entity_picture_template": "{{ 'mypicture.jpg' }}",
+            "availability_template": "{{ 1 == 1 }}",
+            old_attr: attr_template,
+            **OPTIMISTIC_ON_OFF_LIGHT_CONFIG,
+        }
+    }
+    altered_configs = rewrite_legacy_to_modern_conf(hass, config)
+
+    assert len(altered_configs) == 1
+
+    assert [
+        {
+            "availability": Template("{{ 1 == 1 }}", hass),
+            "icon": Template("{{ 'mdi.abc' }}", hass),
+            "name": Template("foo bar", hass),
+            "object_id": "foo",
+            "picture": Template("{{ 'mypicture.jpg' }}", hass),
+            "turn_off": {
+                "data_template": {
+                    "action": "turn_off",
+                    "caller": "{{ this.entity_id }}",
+                },
+                "service": "test.automation",
+            },
+            "turn_on": {
+                "data_template": {
+                    "action": "turn_on",
+                    "caller": "{{ this.entity_id }}",
+                },
+                "service": "test.automation",
+            },
+            "unique_id": "foo-bar-light",
+            new_attr: Template(attr_template, hass),
+        }
+    ] == altered_configs
+
+
+async def async_setup_legacy_format(
     hass: HomeAssistant, count: int, light_config: dict[str, Any]
 ) -> None:
-    """Do setup of light integration."""
+    """Do setup of light integration via legacy format."""
     config = {"light": {"platform": "template", "lights": light_config}}
 
     with assert_setup_component(count, light.DOMAIN):
@@ -172,12 +412,291 @@ async def async_setup_light(
     await hass.async_block_till_done()
 
 
-@pytest.fixture
-async def setup_light(
+async def async_setup_legacy_format_with_attribute(
+    hass: HomeAssistant,
+    count: int,
+    attribute: str,
+    attribute_template: str,
+    extra_config: dict,
+) -> None:
+    """Do setup of a legacy light that has a single templated attribute."""
+    extra = {attribute: attribute_template} if attribute and attribute_template else {}
+    await async_setup_legacy_format(
+        hass,
+        count,
+        {
+            "test_template_light": {
+                **extra_config,
+                "value_template": "{{ 1 == 1 }}",
+                **extra,
+            }
+        },
+    )
+
+
+async def async_setup_new_format(
     hass: HomeAssistant, count: int, light_config: dict[str, Any]
+) -> None:
+    """Do setup of light integration via new format."""
+    config = {"template": {"light": light_config}}
+
+    with assert_setup_component(count, template.DOMAIN):
+        assert await async_setup_component(
+            hass,
+            template.DOMAIN,
+            config,
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+
+async def async_setup_modern_format_with_attribute(
+    hass: HomeAssistant,
+    count: int,
+    attribute: str,
+    attribute_template: str,
+    extra_config: dict,
+) -> None:
+    """Do setup of a legacy light that has a single templated attribute."""
+    extra = {attribute: attribute_template} if attribute and attribute_template else {}
+    await async_setup_new_format(
+        hass,
+        count,
+        {
+            "name": "test_template_light",
+            **extra_config,
+            "state": "{{ 1 == 1 }}",
+            **extra,
+        },
+    )
+
+
+@pytest.fixture
+async def setup_light(
+    hass: HomeAssistant,
+    count: int,
+    style: ConfigurationStyle,
+    light_config: dict[str, Any],
 ) -> None:
     """Do setup of light integration."""
-    await async_setup_light(hass, count, light_config)
+    if style == ConfigurationStyle.LEGACY:
+        await async_setup_legacy_format(hass, count, light_config)
+    elif style == ConfigurationStyle.MODERN:
+        await async_setup_new_format(hass, count, light_config)
+
+
+@pytest.fixture
+async def setup_state_light(
+    hass: HomeAssistant,
+    count: int,
+    style: ConfigurationStyle,
+    state_template: str,
+):
+    """Do setup of light integration."""
+    if style == ConfigurationStyle.LEGACY:
+        await async_setup_legacy_format(
+            hass,
+            count,
+            {
+                "test_template_light": {
+                    **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
+                    "value_template": state_template,
+                }
+            },
+        )
+    elif style == ConfigurationStyle.MODERN:
+        await async_setup_new_format(
+            hass,
+            count,
+            {
+                **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
+                "name": "test_template_light",
+                "state": state_template,
+            },
+        )
+
+
+@pytest.fixture
+async def setup_single_attribute_light(
+    hass: HomeAssistant,
+    count: int,
+    style: ConfigurationStyle,
+    attribute: str,
+    attribute_template: str,
+    extra_config: dict,
+) -> None:
+    """Do setup of light integration."""
+    if style == ConfigurationStyle.LEGACY:
+        await async_setup_legacy_format_with_attribute(
+            hass, count, attribute, attribute_template, extra_config
+        )
+    elif style == ConfigurationStyle.MODERN:
+        await async_setup_modern_format_with_attribute(
+            hass, count, attribute, attribute_template, extra_config
+        )
+
+
+@pytest.fixture
+async def setup_single_action_light(
+    hass: HomeAssistant,
+    count: int,
+    style: ConfigurationStyle,
+    extra_config: dict,
+) -> None:
+    """Do setup of light integration."""
+    if style == ConfigurationStyle.LEGACY:
+        await async_setup_legacy_format_with_attribute(
+            hass, count, "", "", extra_config
+        )
+    elif style == ConfigurationStyle.MODERN:
+        await async_setup_modern_format_with_attribute(
+            hass, count, "", "", extra_config
+        )
+
+
+@pytest.fixture
+async def setup_light_with_effects(
+    hass: HomeAssistant,
+    count: int,
+    style: ConfigurationStyle,
+    effect_list_template: str,
+    effect_template: str,
+) -> None:
+    """Do setup of light with effects."""
+    common = {
+        "set_effect": {
+            "service": "test.automation",
+            "data_template": {
+                "action": "set_effect",
+                "caller": "{{ this.entity_id }}",
+                "entity_id": "test.test_state",
+                "effect": "{{effect}}",
+            },
+        },
+    }
+    if style == ConfigurationStyle.LEGACY:
+        await async_setup_legacy_format(
+            hass,
+            count,
+            {
+                "test_template_light": {
+                    **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
+                    "value_template": "{{true}}",
+                    **common,
+                    "effect_list_template": effect_list_template,
+                    "effect_template": effect_template,
+                }
+            },
+        )
+    elif style == ConfigurationStyle.MODERN:
+        await async_setup_new_format(
+            hass,
+            count,
+            {
+                "name": "test_template_light",
+                **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
+                "state": "{{true}}",
+                **common,
+                "effect_list": effect_list_template,
+                "effect": effect_template,
+            },
+        )
+
+
+@pytest.fixture
+async def setup_light_with_mireds(
+    hass: HomeAssistant,
+    count: int,
+    style: ConfigurationStyle,
+    attribute: str,
+    attribute_template: str,
+) -> None:
+    """Do setup of light that uses mireds."""
+    common = {
+        "set_temperature": {
+            "service": "light.turn_on",
+            "data_template": {
+                "entity_id": "light.test_state",
+                "color_temp": "{{color_temp}}",
+            },
+        },
+        attribute: attribute_template,
+    }
+    if style == ConfigurationStyle.LEGACY:
+        await async_setup_legacy_format(
+            hass,
+            count,
+            {
+                "test_template_light": {
+                    **OPTIMISTIC_ON_OFF_LIGHT_CONFIG,
+                    "value_template": "{{ 1 == 1 }}",
+                    **common,
+                    "temperature_template": "{{200}}",
+                }
+            },
+        )
+    elif style == ConfigurationStyle.MODERN:
+        await async_setup_new_format(
+            hass,
+            count,
+            {
+                "name": "test_template_light",
+                **OPTIMISTIC_ON_OFF_LIGHT_CONFIG,
+                "state": "{{ 1 == 1 }}",
+                **common,
+                "temperature": "{{200}}",
+            },
+        )
+
+
+@pytest.fixture
+async def setup_light_with_transition_template(
+    hass: HomeAssistant,
+    count: int,
+    style: ConfigurationStyle,
+    transition_template: str,
+) -> None:
+    """Do setup of light that uses mireds."""
+    common = {
+        "set_effect": {
+            "service": "test.automation",
+            "data_template": {
+                "entity_id": "test.test_state",
+                "effect": "{{effect}}",
+            },
+        },
+    }
+    if style == ConfigurationStyle.LEGACY:
+        await async_setup_legacy_format(
+            hass,
+            count,
+            {
+                "test_template_light": {
+                    **OPTIMISTIC_COLOR_TEMP_LIGHT_CONFIG,
+                    "value_template": "{{ 1 == 1 }}",
+                    **common,
+                    "effect_list_template": "{{ ['Disco', 'Police'] }}",
+                    "effect_template": "{{ None }}",
+                    "supports_transition_template": transition_template,
+                }
+            },
+        )
+    elif style == ConfigurationStyle.MODERN:
+        await async_setup_new_format(
+            hass,
+            count,
+            {
+                "name": "test_template_light",
+                **OPTIMISTIC_COLOR_TEMP_LIGHT_CONFIG,
+                "state": "{{ 1 == 1 }}",
+                **common,
+                "effect_list": "{{ ['Disco', 'Police'] }}",
+                "effect": "{{ None }}",
+                "supports_transition": transition_template,
+            },
+        )
 
 
 @pytest.mark.parametrize("count", [1])
@@ -186,18 +705,15 @@ async def setup_light(
     [(0, [ColorMode.BRIGHTNESS])],
 )
 @pytest.mark.parametrize(
-    "light_config",
+    "style",
     [
-        {
-            "test_template_light": {
-                **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
-                "value_template": "{{states.test['big.fat...']}}",
-            }
-        },
+        ConfigurationStyle.LEGACY,
+        ConfigurationStyle.MODERN,
     ],
 )
+@pytest.mark.parametrize("state_template", ["{{states.test['big.fat...']}}"])
 async def test_template_state_invalid(
-    hass: HomeAssistant, supported_features, supported_color_modes, setup_light
+    hass: HomeAssistant, supported_features, supported_color_modes, setup_state_light
 ) -> None:
     """Test template state with render error."""
     state = hass.states.get("light.test_template_light")
@@ -209,17 +725,14 @@ async def test_template_state_invalid(
 
 @pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    "style",
     [
-        {
-            "test_template_light": {
-                **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
-                "value_template": "{{ states.light.test_state.state }}",
-            }
-        },
+        ConfigurationStyle.LEGACY,
+        ConfigurationStyle.MODERN,
     ],
 )
-async def test_template_state_text(hass: HomeAssistant, setup_light) -> None:
+@pytest.mark.parametrize("state_template", ["{{ states.light.test_state.state }}"])
+async def test_template_state_text(hass: HomeAssistant, setup_state_light) -> None:
     """Test the state text of a template."""
     set_state = STATE_ON
     hass.states.async_set("light.test_state", set_state)
@@ -242,7 +755,14 @@ async def test_template_state_text(hass: HomeAssistant, setup_light) -> None:
 
 @pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    ("value_template", "expected_state", "expected_color_mode"),
+    "style",
+    [
+        ConfigurationStyle.LEGACY,
+        ConfigurationStyle.MODERN,
+    ],
+)
+@pytest.mark.parametrize(
+    ("state_template", "expected_state", "expected_color_mode"),
     [
         (
             "{{ 1 == 1 }}",
@@ -256,21 +776,13 @@ async def test_template_state_text(hass: HomeAssistant, setup_light) -> None:
         ),
     ],
 )
-async def test_templatex_state_boolean(
+async def test_legacy_template_state_boolean(
     hass: HomeAssistant,
     expected_color_mode,
     expected_state,
-    count,
-    value_template,
+    setup_state_light,
 ) -> None:
     """Test the setting of the state with boolean on."""
-    light_config = {
-        "test_template_light": {
-            **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
-            "value_template": value_template,
-        }
-    }
-    await async_setup_light(hass, count, light_config)
     state = hass.states.get("light.test_template_light")
     assert state.state == expected_state
     assert state.attributes.get("color_mode") == expected_color_mode
@@ -280,48 +792,56 @@ async def test_templatex_state_boolean(
 
 @pytest.mark.parametrize("count", [0])
 @pytest.mark.parametrize(
-    "light_config",
+    ("light_config", "style"),
     [
-        {
-            "test_template_light": {
+        (
+            {
+                "test_template_light": {
+                    **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
+                    "value_template": "{%- if false -%}",
+                }
+            },
+            ConfigurationStyle.LEGACY,
+        ),
+        (
+            {
+                "bad name here": {
+                    **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
+                    "value_template": "{{ 1== 1}}",
+                }
+            },
+            ConfigurationStyle.LEGACY,
+        ),
+        (
+            {"test_template_light": "Invalid"},
+            ConfigurationStyle.LEGACY,
+        ),
+        (
+            {
                 **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
-                "value_template": "{%- if false -%}",
-            }
-        },
-        {
-            "bad name here": {
-                **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
-                "value_template": "{{ 1== 1}}",
-            }
-        },
-        {"test_template_light": "Invalid"},
+                "name": "test_template_light",
+                "state": "{%- if false -%}",
+            },
+            ConfigurationStyle.MODERN,
+        ),
     ],
 )
-async def test_template_syntax_error(hass: HomeAssistant, setup_light) -> None:
-    """Test templating syntax error."""
+async def test_template_config_errors(hass: HomeAssistant, setup_light) -> None:
+    """Test template light configuration errors."""
     assert hass.states.async_all("light") == []
 
 
 @pytest.mark.parametrize(
-    ("light_config", "count"),
+    ("light_config", "style", "count"),
     [
         (
-            {
-                "light_one": {
-                    "value_template": "{{ 1== 1}}",
-                    "turn_on": {
-                        "service": "light.turn_on",
-                        "entity_id": "light.test_state",
-                    },
-                    "set_level": {
-                        "service": "light.turn_on",
-                        "data_template": {
-                            "entity_id": "light.test_state",
-                            "brightness": "{{brightness}}",
-                        },
-                    },
-                }
-            },
+            {"light_one": {"value_template": "{{ 1== 1}}", **TEST_MISSING_KEY_CONFIG}},
+            ConfigurationStyle.LEGACY,
+            0,
+        ),
+        (
+            {"name": "light_one", "state": "{{ 1== 1}}", **TEST_MISSING_KEY_CONFIG},
+            ConfigurationStyle.MODERN,
             0,
         ),
     ],
@@ -336,18 +856,15 @@ async def test_missing_key(hass: HomeAssistant, count, setup_light) -> None:
 
 @pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    "style",
     [
-        {
-            "test_template_light": {
-                **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
-                "value_template": "{{states.light.test_state.state}}",
-            }
-        },
+        ConfigurationStyle.LEGACY,
+        ConfigurationStyle.MODERN,
     ],
 )
+@pytest.mark.parametrize("state_template", ["{{ states.light.test_state.state }}"])
 async def test_on_action(
-    hass: HomeAssistant, setup_light, calls: list[ServiceCall]
+    hass: HomeAssistant, setup_state_light, calls: list[ServiceCall]
 ) -> None:
     """Test on action."""
     hass.states.async_set("light.test_state", STATE_OFF)
@@ -378,32 +895,26 @@ async def test_on_action(
 
 @pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    ("light_config", "style"),
     [
-        {
-            "test_template_light": {
-                "value_template": "{{states.light.test_state.state}}",
-                "turn_on": {
-                    "service": "test.automation",
-                    "data_template": {
-                        "transition": "{{transition}}",
-                    },
-                },
-                "turn_off": {
-                    "service": "light.turn_off",
-                    "entity_id": "light.test_state",
-                },
-                "supports_transition_template": "{{true}}",
-                "set_level": {
-                    "service": "light.turn_on",
-                    "data_template": {
-                        "entity_id": "light.test_state",
-                        "brightness": "{{brightness}}",
-                        "transition": "{{transition}}",
-                    },
-                },
-            }
-        },
+        (
+            {
+                "test_template_light": {
+                    "value_template": "{{states.light.test_state.state}}",
+                    **TEST_ON_ACTION_WITH_TRANSITION_CONFIG,
+                    "supports_transition_template": "{{true}}",
+                }
+            },
+            ConfigurationStyle.LEGACY,
+        ),
+        (
+            {
+                "name": "test_template_light",
+                **TEST_ON_ACTION_WITH_TRANSITION_CONFIG,
+                "supports_transition": "{{true}}",
+            },
+            ConfigurationStyle.MODERN,
+        ),
     ],
 )
 async def test_on_action_with_transition(
@@ -437,13 +948,23 @@ async def test_on_action_with_transition(
 
 @pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    ("light_config", "style"),
     [
-        {
-            "test_template_light": {
+        (
+            {
+                "test_template_light": {
+                    **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
+                }
+            },
+            ConfigurationStyle.LEGACY,
+        ),
+        (
+            {
+                "name": "test_template_light",
                 **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
-            }
-        },
+            },
+            ConfigurationStyle.MODERN,
+        ),
     ],
 )
 async def test_on_action_optimistic(
@@ -497,18 +1018,15 @@ async def test_on_action_optimistic(
 
 @pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    "style",
     [
-        {
-            "test_template_light": {
-                **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
-                "value_template": "{{states.light.test_state.state}}",
-            }
-        },
+        ConfigurationStyle.LEGACY,
+        ConfigurationStyle.MODERN,
     ],
 )
+@pytest.mark.parametrize("state_template", ["{{ states.light.test_state.state }}"])
 async def test_off_action(
-    hass: HomeAssistant, setup_light, calls: list[ServiceCall]
+    hass: HomeAssistant, setup_state_light, calls: list[ServiceCall]
 ) -> None:
     """Test off action."""
     hass.states.async_set("light.test_state", STATE_ON)
@@ -538,32 +1056,27 @@ async def test_off_action(
 
 @pytest.mark.parametrize("count", [(1)])
 @pytest.mark.parametrize(
-    "light_config",
+    ("light_config", "style"),
     [
-        {
-            "test_template_light": {
-                "value_template": "{{states.light.test_state.state}}",
-                "turn_on": {
-                    "service": "light.turn_on",
-                    "entity_id": "light.test_state",
-                },
-                "turn_off": {
-                    "service": "test.automation",
-                    "data_template": {
-                        "transition": "{{transition}}",
-                    },
-                },
-                "supports_transition_template": "{{true}}",
-                "set_level": {
-                    "service": "light.turn_on",
-                    "data_template": {
-                        "entity_id": "light.test_state",
-                        "brightness": "{{brightness}}",
-                        "transition": "{{transition}}",
-                    },
-                },
-            }
-        },
+        (
+            {
+                "test_template_light": {
+                    "value_template": "{{states.light.test_state.state}}",
+                    **TEST_OFF_ACTION_WITH_TRANSITION_CONFIG,
+                    "supports_transition_template": "{{true}}",
+                }
+            },
+            ConfigurationStyle.LEGACY,
+        ),
+        (
+            {
+                "name": "test_template_light",
+                "state": "{{states.light.test_state.state}}",
+                **TEST_OFF_ACTION_WITH_TRANSITION_CONFIG,
+                "supports_transition": "{{true}}",
+            },
+            ConfigurationStyle.MODERN,
+        ),
     ],
 )
 async def test_off_action_with_transition(
@@ -596,13 +1109,23 @@ async def test_off_action_with_transition(
 
 @pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    ("light_config", "style"),
     [
-        {
-            "test_template_light": {
+        (
+            {
+                "test_template_light": {
+                    **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
+                }
+            },
+            ConfigurationStyle.LEGACY,
+        ),
+        (
+            {
+                "name": "test_template_light",
                 **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
-            }
-        },
+            },
+            ConfigurationStyle.MODERN,
+        ),
     ],
 )
 async def test_off_action_optimistic(
@@ -632,19 +1155,16 @@ async def test_off_action_optimistic(
 
 @pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    "style",
     [
-        {
-            "test_template_light": {
-                **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
-                "value_template": "{{1 == 1}}",
-            }
-        },
+        ConfigurationStyle.LEGACY,
+        ConfigurationStyle.MODERN,
     ],
 )
+@pytest.mark.parametrize("state_template", ["{{1 == 1}}"])
 async def test_level_action_no_template(
     hass: HomeAssistant,
-    setup_light,
+    setup_state_light,
     calls: list[ServiceCall],
 ) -> None:
     """Test setting brightness with optimistic template."""
@@ -671,9 +1191,18 @@ async def test_level_action_no_template(
     assert state.attributes["supported_features"] == 0
 
 
-@pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    ("expected_level", "level_template", "expected_color_mode"),
+    ("count", "extra_config"), [(1, OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG)]
+)
+@pytest.mark.parametrize(
+    ("style", "attribute"),
+    [
+        (ConfigurationStyle.LEGACY, "level_template"),
+        (ConfigurationStyle.MODERN, "level"),
+    ],
+)
+@pytest.mark.parametrize(
+    ("expected_level", "attribute_template", "expected_color_mode"),
     [
         (255, "{{255}}", ColorMode.BRIGHTNESS),
         (None, "{{256}}", ColorMode.BRIGHTNESS),
@@ -690,20 +1219,11 @@ async def test_level_action_no_template(
 )
 async def test_level_template(
     hass: HomeAssistant,
-    expected_level,
-    expected_color_mode,
-    count,
-    level_template,
+    expected_level: Any,
+    expected_color_mode: ColorMode,
+    setup_single_attribute_light,
 ) -> None:
     """Test the template for the level."""
-    light_config = {
-        "test_template_light": {
-            **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
-            "value_template": "{{ 1 == 1 }}",
-            "level_template": level_template,
-        }
-    }
-    await async_setup_light(hass, count, light_config)
     state = hass.states.get("light.test_template_light")
     assert state.attributes.get("brightness") == expected_level
     assert state.state == STATE_ON
@@ -712,9 +1232,18 @@ async def test_level_template(
     assert state.attributes["supported_features"] == 0
 
 
-@pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    ("expected_temp", "temperature_template", "expected_color_mode"),
+    ("count", "extra_config"), [(1, OPTIMISTIC_COLOR_TEMP_LIGHT_CONFIG)]
+)
+@pytest.mark.parametrize(
+    ("style", "attribute"),
+    [
+        (ConfigurationStyle.LEGACY, "temperature_template"),
+        (ConfigurationStyle.MODERN, "temperature"),
+    ],
+)
+@pytest.mark.parametrize(
+    ("expected_temp", "attribute_template", "expected_color_mode"),
     [
         (500, "{{500}}", ColorMode.COLOR_TEMP),
         (None, "{{501}}", ColorMode.COLOR_TEMP),
@@ -727,20 +1256,11 @@ async def test_level_template(
 )
 async def test_temperature_template(
     hass: HomeAssistant,
-    expected_temp,
-    expected_color_mode,
-    count,
-    temperature_template,
+    expected_temp: Any,
+    expected_color_mode: ColorMode,
+    setup_single_attribute_light,
 ) -> None:
     """Test the template for the temperature."""
-    light_config = {
-        "test_template_light": {
-            **OPTIMISTIC_COLOR_TEMP_LIGHT_CONFIG,
-            "value_template": "{{ 1 == 1 }}",
-            "temperature_template": temperature_template,
-        }
-    }
-    await async_setup_light(hass, count, light_config)
     state = hass.states.get("light.test_template_light")
     assert state.attributes.get("color_temp") == expected_temp
     assert state.state == STATE_ON
@@ -749,21 +1269,19 @@ async def test_temperature_template(
     assert state.attributes["supported_features"] == 0
 
 
-@pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    ("count", "extra_config"), [(1, OPTIMISTIC_COLOR_TEMP_LIGHT_CONFIG)]
+)
+@pytest.mark.parametrize(
+    "style",
     [
-        {
-            "test_template_light": {
-                **OPTIMISTIC_COLOR_TEMP_LIGHT_CONFIG,
-                "value_template": "{{1 == 1}}",
-            }
-        },
+        ConfigurationStyle.LEGACY,
+        ConfigurationStyle.MODERN,
     ],
 )
 async def test_temperature_action_no_template(
     hass: HomeAssistant,
-    setup_light,
+    setup_single_action_light,
     calls: list[ServiceCall],
 ) -> None:
     """Test setting temperature with optimistic template."""
@@ -793,43 +1311,53 @@ async def test_temperature_action_no_template(
 
 @pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    ("light_config", "style", "entity_id"),
     [
-        {
-            "test_template_light": {
+        (
+            {
+                "test_template_light": {
+                    **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
+                    "friendly_name": "Template light",
+                    "value_template": "{{ 1 == 1 }}",
+                }
+            },
+            ConfigurationStyle.LEGACY,
+            "light.test_template_light",
+        ),
+        (
+            {
                 **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
-                "friendly_name": "Template light",
-                "value_template": "{{ 1 == 1 }}",
-            }
-        },
+                "name": "Template light",
+                "state": "{{ 1 == 1 }}",
+            },
+            ConfigurationStyle.MODERN,
+            "light.template_light",
+        ),
     ],
 )
-async def test_friendly_name(hass: HomeAssistant, setup_light) -> None:
+async def test_friendly_name(hass: HomeAssistant, entity_id: str, setup_light) -> None:
     """Test the accessibility of the friendly_name attribute."""
 
-    state = hass.states.get("light.test_template_light")
+    state = hass.states.get(entity_id)
     assert state is not None
 
     assert state.attributes.get("friendly_name") == "Template light"
 
 
-@pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    ("count", "extra_config"), [(1, OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG)]
+)
+@pytest.mark.parametrize(
+    ("style", "attribute"),
     [
-        {
-            "test_template_light": {
-                **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
-                "friendly_name": "Template light",
-                "value_template": "{{ 1 == 1 }}",
-                "icon_template": (
-                    "{% if states.light.test_state.state %}mdi:check{% endif %}"
-                ),
-            }
-        },
+        (ConfigurationStyle.LEGACY, "icon_template"),
+        (ConfigurationStyle.MODERN, "icon"),
     ],
 )
-async def test_icon_template(hass: HomeAssistant, setup_light) -> None:
+@pytest.mark.parametrize(
+    "attribute_template", ["{% if states.light.test_state.state %}mdi:check{% endif %}"]
+)
+async def test_icon_template(hass: HomeAssistant, setup_single_attribute_light) -> None:
     """Test icon template."""
     state = hass.states.get("light.test_template_light")
     assert state.attributes.get("icon") == ""
@@ -842,23 +1370,23 @@ async def test_icon_template(hass: HomeAssistant, setup_light) -> None:
     assert state.attributes["icon"] == "mdi:check"
 
 
-@pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    ("count", "extra_config"), [(1, OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG)]
+)
+@pytest.mark.parametrize(
+    ("style", "attribute"),
     [
-        {
-            "test_template_light": {
-                **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
-                "friendly_name": "Template light",
-                "value_template": "{{ 1 == 1 }}",
-                "entity_picture_template": (
-                    "{% if states.light.test_state.state %}/local/light.png{% endif %}"
-                ),
-            }
-        },
+        (ConfigurationStyle.LEGACY, "entity_picture_template"),
+        (ConfigurationStyle.MODERN, "picture"),
     ],
 )
-async def test_entity_picture_template(hass: HomeAssistant, setup_light) -> None:
+@pytest.mark.parametrize(
+    "attribute_template",
+    ["{% if states.light.test_state.state %}/local/light.png{% endif %}"],
+)
+async def test_entity_picture_template(
+    hass: HomeAssistant, setup_single_attribute_light
+) -> None:
     """Test entity_picture template."""
     state = hass.states.get("light.test_template_light")
     assert state.attributes.get("entity_picture") == ""
@@ -871,21 +1399,21 @@ async def test_entity_picture_template(hass: HomeAssistant, setup_light) -> None
     assert state.attributes["entity_picture"] == "/local/light.png"
 
 
-@pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    ("count", "extra_config"),
     [
-        {
-            "test_template_light": {
-                **OPTIMISTIC_LEGACY_COLOR_LIGHT_CONFIG,
-                "value_template": "{{1 == 1}}",
-            }
-        },
+        (1, OPTIMISTIC_LEGACY_COLOR_LIGHT_CONFIG),
+    ],
+)
+@pytest.mark.parametrize(
+    "style",
+    [
+        ConfigurationStyle.LEGACY,
     ],
 )
 async def test_legacy_color_action_no_template(
     hass: HomeAssistant,
-    setup_light,
+    setup_single_action_light,
     calls: list[ServiceCall],
 ) -> None:
     """Test setting color with optimistic template."""
@@ -913,24 +1441,25 @@ async def test_legacy_color_action_no_template(
     assert state.attributes["supported_features"] == 0
 
 
-@pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    ("count", "extra_config"),
     [
-        {
-            "test_template_light": {
-                **OPTIMISTIC_HS_COLOR_LIGHT_CONFIG,
-                "value_template": "{{1 == 1}}",
-            }
-        },
+        (1, OPTIMISTIC_HS_COLOR_LIGHT_CONFIG),
+    ],
+)
+@pytest.mark.parametrize(
+    "style",
+    [
+        ConfigurationStyle.LEGACY,
+        ConfigurationStyle.MODERN,
     ],
 )
 async def test_hs_color_action_no_template(
     hass: HomeAssistant,
-    setup_light,
+    setup_single_action_light,
     calls: list[ServiceCall],
 ) -> None:
-    """Test setting hs color with optimistic template."""
+    """Test setting color with optimistic template."""
     state = hass.states.get("light.test_template_light")
     assert state.attributes.get("hs_color") is None
 
@@ -955,21 +1484,20 @@ async def test_hs_color_action_no_template(
     assert state.attributes["supported_features"] == 0
 
 
-@pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    ("count", "extra_config"),
+    [(1, OPTIMISTIC_RGB_COLOR_LIGHT_CONFIG)],
+)
+@pytest.mark.parametrize(
+    "style",
     [
-        {
-            "test_template_light": {
-                **OPTIMISTIC_RGB_COLOR_LIGHT_CONFIG,
-                "value_template": "{{1 == 1}}",
-            }
-        },
+        ConfigurationStyle.LEGACY,
+        ConfigurationStyle.MODERN,
     ],
 )
 async def test_rgb_color_action_no_template(
     hass: HomeAssistant,
-    setup_light,
+    setup_single_action_light,
     calls: list[ServiceCall],
 ) -> None:
     """Test setting rgb color with optimistic template."""
@@ -998,21 +1526,20 @@ async def test_rgb_color_action_no_template(
     assert state.attributes["supported_features"] == 0
 
 
-@pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    ("count", "extra_config"),
+    [(1, OPTIMISTIC_RGBW_COLOR_LIGHT_CONFIG)],
+)
+@pytest.mark.parametrize(
+    "style",
     [
-        {
-            "test_template_light": {
-                **OPTIMISTIC_RGBW_COLOR_LIGHT_CONFIG,
-                "value_template": "{{1 == 1}}",
-            }
-        },
+        ConfigurationStyle.LEGACY,
+        ConfigurationStyle.MODERN,
     ],
 )
 async def test_rgbw_color_action_no_template(
     hass: HomeAssistant,
-    setup_light,
+    setup_single_action_light,
     calls: list[ServiceCall],
 ) -> None:
     """Test setting rgbw color with optimistic template."""
@@ -1045,21 +1572,20 @@ async def test_rgbw_color_action_no_template(
     assert state.attributes["supported_features"] == 0
 
 
-@pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    ("count", "extra_config"),
+    [(1, OPTIMISTIC_RGBWW_COLOR_LIGHT_CONFIG)],
+)
+@pytest.mark.parametrize(
+    "style",
     [
-        {
-            "test_template_light": {
-                **OPTIMISTIC_RGBWW_COLOR_LIGHT_CONFIG,
-                "value_template": "{{1 == 1}}",
-            }
-        },
+        ConfigurationStyle.LEGACY,
+        ConfigurationStyle.MODERN,
     ],
 )
 async def test_rgbww_color_action_no_template(
     hass: HomeAssistant,
-    setup_light,
+    setup_single_action_light,
     calls: list[ServiceCall],
 ) -> None:
     """Test setting rgbww color with optimistic template."""
@@ -1123,7 +1649,7 @@ async def test_legacy_color_template(
             "color_template": color_template,
         }
     }
-    await async_setup_light(hass, count, light_config)
+    await async_setup_legacy_format(hass, count, light_config)
     state = hass.states.get("light.test_template_light")
     assert state.attributes.get("hs_color") == expected_hs
     assert state.state == STATE_ON
@@ -1132,9 +1658,18 @@ async def test_legacy_color_template(
     assert state.attributes["supported_features"] == 0
 
 
-@pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    ("expected_hs", "hs_template", "expected_color_mode"),
+    ("count", "extra_config"), [(1, OPTIMISTIC_HS_COLOR_LIGHT_CONFIG)]
+)
+@pytest.mark.parametrize(
+    ("style", "attribute"),
+    [
+        (ConfigurationStyle.LEGACY, "hs_template"),
+        (ConfigurationStyle.MODERN, "hs"),
+    ],
+)
+@pytest.mark.parametrize(
+    ("expected_hs", "attribute_template", "expected_color_mode"),
     [
         ((360, 100), "{{(360, 100)}}", ColorMode.HS),
         ((360, 100), "(360, 100)", ColorMode.HS),
@@ -1152,18 +1687,9 @@ async def test_hs_template(
     hass: HomeAssistant,
     expected_hs,
     expected_color_mode,
-    count,
-    hs_template,
+    setup_single_attribute_light,
 ) -> None:
     """Test the template for the color."""
-    light_config = {
-        "test_template_light": {
-            **OPTIMISTIC_HS_COLOR_LIGHT_CONFIG,
-            "value_template": "{{ 1 == 1 }}",
-            "hs_template": hs_template,
-        }
-    }
-    await async_setup_light(hass, count, light_config)
     state = hass.states.get("light.test_template_light")
     assert state.attributes.get("hs_color") == expected_hs
     assert state.state == STATE_ON
@@ -1172,9 +1698,18 @@ async def test_hs_template(
     assert state.attributes["supported_features"] == 0
 
 
-@pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    ("expected_rgb", "rgb_template", "expected_color_mode"),
+    ("count", "extra_config"), [(1, OPTIMISTIC_RGB_COLOR_LIGHT_CONFIG)]
+)
+@pytest.mark.parametrize(
+    ("style", "attribute"),
+    [
+        (ConfigurationStyle.LEGACY, "rgb_template"),
+        (ConfigurationStyle.MODERN, "rgb"),
+    ],
+)
+@pytest.mark.parametrize(
+    ("expected_rgb", "attribute_template", "expected_color_mode"),
     [
         ((160, 78, 192), "{{(160, 78, 192)}}", ColorMode.RGB),
         ((160, 78, 192), "{{[160, 78, 192]}}", ColorMode.RGB),
@@ -1193,18 +1728,9 @@ async def test_rgb_template(
     hass: HomeAssistant,
     expected_rgb,
     expected_color_mode,
-    count,
-    rgb_template,
+    setup_single_attribute_light,
 ) -> None:
     """Test the template for the color."""
-    light_config = {
-        "test_template_light": {
-            **OPTIMISTIC_RGB_COLOR_LIGHT_CONFIG,
-            "value_template": "{{ 1 == 1 }}",
-            "rgb_template": rgb_template,
-        }
-    }
-    await async_setup_light(hass, count, light_config)
     state = hass.states.get("light.test_template_light")
     assert state.attributes.get("rgb_color") == expected_rgb
     assert state.state == STATE_ON
@@ -1213,9 +1739,18 @@ async def test_rgb_template(
     assert state.attributes["supported_features"] == 0
 
 
-@pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    ("expected_rgbw", "rgbw_template", "expected_color_mode"),
+    ("count", "extra_config"), [(1, OPTIMISTIC_RGBW_COLOR_LIGHT_CONFIG)]
+)
+@pytest.mark.parametrize(
+    ("style", "attribute"),
+    [
+        (ConfigurationStyle.LEGACY, "rgbw_template"),
+        (ConfigurationStyle.MODERN, "rgbw"),
+    ],
+)
+@pytest.mark.parametrize(
+    ("expected_rgbw", "attribute_template", "expected_color_mode"),
     [
         ((160, 78, 192, 25), "{{(160, 78, 192, 25)}}", ColorMode.RGBW),
         ((160, 78, 192, 25), "{{[160, 78, 192, 25]}}", ColorMode.RGBW),
@@ -1235,18 +1770,9 @@ async def test_rgbw_template(
     hass: HomeAssistant,
     expected_rgbw,
     expected_color_mode,
-    count,
-    rgbw_template,
+    setup_single_attribute_light,
 ) -> None:
     """Test the template for the color."""
-    light_config = {
-        "test_template_light": {
-            **OPTIMISTIC_RGBW_COLOR_LIGHT_CONFIG,
-            "value_template": "{{ 1 == 1 }}",
-            "rgbw_template": rgbw_template,
-        }
-    }
-    await async_setup_light(hass, count, light_config)
     state = hass.states.get("light.test_template_light")
     assert state.attributes.get("rgbw_color") == expected_rgbw
     assert state.state == STATE_ON
@@ -1255,9 +1781,18 @@ async def test_rgbw_template(
     assert state.attributes["supported_features"] == 0
 
 
-@pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    ("expected_rgbww", "rgbww_template", "expected_color_mode"),
+    ("count", "extra_config"), [(1, OPTIMISTIC_RGBWW_COLOR_LIGHT_CONFIG)]
+)
+@pytest.mark.parametrize(
+    ("style", "attribute"),
+    [
+        (ConfigurationStyle.LEGACY, "rgbww_template"),
+        (ConfigurationStyle.MODERN, "rgbww"),
+    ],
+)
+@pytest.mark.parametrize(
+    ("expected_rgbww", "attribute_template", "expected_color_mode"),
     [
         ((160, 78, 192, 25, 55), "{{(160, 78, 192, 25, 55)}}", ColorMode.RGBWW),
         ((160, 78, 192, 25, 55), "(160, 78, 192, 25, 55)", ColorMode.RGBWW),
@@ -1282,18 +1817,9 @@ async def test_rgbww_template(
     hass: HomeAssistant,
     expected_rgbww,
     expected_color_mode,
-    count,
-    rgbww_template,
+    setup_single_attribute_light,
 ) -> None:
     """Test the template for the color."""
-    light_config = {
-        "test_template_light": {
-            **OPTIMISTIC_RGBWW_COLOR_LIGHT_CONFIG,
-            "value_template": "{{ 1 == 1 }}",
-            "rgbww_template": rgbww_template,
-        }
-    }
-    await async_setup_light(hass, count, light_config)
     state = hass.states.get("light.test_template_light")
     assert state.attributes.get("rgbww_color") == expected_rgbww
     assert state.state == STATE_ON
@@ -1304,59 +1830,27 @@ async def test_rgbww_template(
 
 @pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    ("light_config", "style"),
     [
-        {
-            "test_template_light": {
+        (
+            {
+                "test_template_light": {
+                    **OPTIMISTIC_ON_OFF_LIGHT_CONFIG,
+                    "value_template": "{{1 == 1}}",
+                    **TEST_ALL_COLORS_NO_TEMPLATE_CONFIG,
+                }
+            },
+            ConfigurationStyle.LEGACY,
+        ),
+        (
+            {
+                "name": "test_template_light",
                 **OPTIMISTIC_ON_OFF_LIGHT_CONFIG,
-                "value_template": "{{1 == 1}}",
-                "set_hs": {
-                    "service": "test.automation",
-                    "data_template": {
-                        "entity_id": "test.test_state",
-                        "h": "{{h}}",
-                        "s": "{{s}}",
-                    },
-                },
-                "set_temperature": {
-                    "service": "test.automation",
-                    "data_template": {
-                        "entity_id": "test.test_state",
-                        "color_temp": "{{color_temp}}",
-                    },
-                },
-                "set_rgb": {
-                    "service": "test.automation",
-                    "data_template": {
-                        "entity_id": "test.test_state",
-                        "r": "{{r}}",
-                        "g": "{{g}}",
-                        "b": "{{b}}",
-                    },
-                },
-                "set_rgbw": {
-                    "service": "test.automation",
-                    "data_template": {
-                        "entity_id": "test.test_state",
-                        "r": "{{r}}",
-                        "g": "{{g}}",
-                        "b": "{{b}}",
-                        "w": "{{w}}",
-                    },
-                },
-                "set_rgbww": {
-                    "service": "test.automation",
-                    "data_template": {
-                        "entity_id": "test.test_state",
-                        "r": "{{r}}",
-                        "g": "{{g}}",
-                        "b": "{{b}}",
-                        "cw": "{{cw}}",
-                        "ww": "{{ww}}",
-                    },
-                },
-            }
-        },
+                "state": "{{1 == 1}}",
+                **TEST_ALL_COLORS_NO_TEMPLATE_CONFIG,
+            },
+            ConfigurationStyle.MODERN,
+        ),
     ],
 )
 async def test_all_colors_mode_no_template(
@@ -1554,29 +2048,21 @@ async def test_all_colors_mode_no_template(
 
 @pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    "style", [ConfigurationStyle.LEGACY, ConfigurationStyle.MODERN]
+)
+@pytest.mark.parametrize(
+    ("effect_list_template", "effect_template", "effect", "expected"),
     [
-        {
-            "test_template_light": {
-                **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
-                "value_template": "{{true}}",
-                "set_effect": {
-                    "service": "test.automation",
-                    "data_template": {
-                        "action": "set_effect",
-                        "caller": "{{ this.entity_id }}",
-                        "entity_id": "test.test_state",
-                        "effect": "{{effect}}",
-                    },
-                },
-                "effect_list_template": "{{ ['Disco', 'Police'] }}",
-                "effect_template": "{{ 'Disco' }}",
-            }
-        },
+        ("{{ ['Disco', 'Police'] }}", "{{ 'Disco' }}", "Disco", "Disco"),
+        ("{{ ['Disco', 'Police'] }}", "{{ 'None' }}", "RGB", None),
     ],
 )
-async def test_effect_action_valid_effect(
-    hass: HomeAssistant, setup_light, calls: list[ServiceCall]
+async def test_effect_action(
+    hass: HomeAssistant,
+    effect: str,
+    expected: Any,
+    setup_light_with_effects,
+    calls: list[ServiceCall],
 ) -> None:
     """Test setting valid effect with template."""
     state = hass.states.get("light.test_template_light")
@@ -1585,64 +2071,24 @@ async def test_effect_action_valid_effect(
     await hass.services.async_call(
         light.DOMAIN,
         SERVICE_TURN_ON,
-        {ATTR_ENTITY_ID: "light.test_template_light", ATTR_EFFECT: "Disco"},
+        {ATTR_ENTITY_ID: "light.test_template_light", ATTR_EFFECT: effect},
         blocking=True,
     )
 
     assert len(calls) == 1
     assert calls[-1].data["action"] == "set_effect"
     assert calls[-1].data["caller"] == "light.test_template_light"
-    assert calls[-1].data["effect"] == "Disco"
+    assert calls[-1].data["effect"] == effect
 
     state = hass.states.get("light.test_template_light")
     assert state is not None
-    assert state.attributes.get("effect") == "Disco"
+    assert state.attributes.get("effect") == expected
 
 
-@pytest.mark.parametrize("count", [1])
+@pytest.mark.parametrize(("count", "effect_template"), [(1, "{{ None }}")])
 @pytest.mark.parametrize(
-    "light_config",
-    [
-        {
-            "test_template_light": {
-                **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
-                "value_template": "{{true}}",
-                "set_effect": {
-                    "service": "test.automation",
-                    "data_template": {
-                        "entity_id": "test.test_state",
-                        "effect": "{{effect}}",
-                    },
-                },
-                "effect_list_template": "{{ ['Disco', 'Police'] }}",
-                "effect_template": "{{ None }}",
-            }
-        },
-    ],
+    "style", [ConfigurationStyle.LEGACY, ConfigurationStyle.MODERN]
 )
-async def test_effect_action_invalid_effect(
-    hass: HomeAssistant, setup_light, calls: list[ServiceCall]
-) -> None:
-    """Test setting invalid effect with template."""
-    state = hass.states.get("light.test_template_light")
-    assert state is not None
-
-    await hass.services.async_call(
-        light.DOMAIN,
-        SERVICE_TURN_ON,
-        {ATTR_ENTITY_ID: "light.test_template_light", ATTR_EFFECT: "RGB"},
-        blocking=True,
-    )
-
-    assert len(calls) == 1
-    assert calls[0].data["effect"] == "RGB"
-
-    state = hass.states.get("light.test_template_light")
-    assert state is not None
-    assert state.attributes.get("effect") is None
-
-
-@pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
     ("expected_effect_list", "effect_list_template"),
     [
@@ -1663,31 +2109,21 @@ async def test_effect_action_invalid_effect(
     ],
 )
 async def test_effect_list_template(
-    hass: HomeAssistant, expected_effect_list, count, effect_list_template
+    hass: HomeAssistant, expected_effect_list, setup_light_with_effects
 ) -> None:
     """Test the template for the effect list."""
-    light_config = {
-        "test_template_light": {
-            **OPTIMISTIC_ON_OFF_LIGHT_CONFIG,
-            "value_template": "{{ 1 == 1 }}",
-            "set_effect": {
-                "service": "test.automation",
-                "data_template": {
-                    "entity_id": "test.test_state",
-                    "effect": "{{effect}}",
-                },
-            },
-            "effect_template": "{{ None }}",
-            "effect_list_template": effect_list_template,
-        }
-    }
-    await async_setup_light(hass, count, light_config)
     state = hass.states.get("light.test_template_light")
     assert state is not None
     assert state.attributes.get("effect_list") == expected_effect_list
 
 
-@pytest.mark.parametrize("count", [1])
+@pytest.mark.parametrize(
+    ("count", "effect_list_template"),
+    [(1, "{{ ['Strobe color', 'Police', 'Christmas', 'RGB', 'Random Loop'] }}")],
+)
+@pytest.mark.parametrize(
+    "style", [ConfigurationStyle.LEGACY, ConfigurationStyle.MODERN]
+)
 @pytest.mark.parametrize(
     ("expected_effect", "effect_template"),
     [
@@ -1699,27 +2135,9 @@ async def test_effect_list_template(
     ],
 )
 async def test_effect_template(
-    hass: HomeAssistant, expected_effect, count, effect_template
+    hass: HomeAssistant, expected_effect, setup_light_with_effects
 ) -> None:
     """Test the template for the effect."""
-    light_config = {
-        "test_template_light": {
-            **OPTIMISTIC_ON_OFF_LIGHT_CONFIG,
-            "value_template": "{{ 1 == 1 }}",
-            "set_effect": {
-                "service": "test.automation",
-                "data_template": {
-                    "entity_id": "test.test_state",
-                    "effect": "{{effect}}",
-                },
-            },
-            "effect_list_template": (
-                "{{ ['Strobe color', 'Police', 'Christmas', 'RGB', 'Random Loop'] }}"
-            ),
-            "effect_template": effect_template,
-        }
-    }
-    await async_setup_light(hass, count, light_config)
     state = hass.states.get("light.test_template_light")
     assert state is not None
     assert state.attributes.get("effect") == expected_effect
@@ -1727,7 +2145,14 @@ async def test_effect_template(
 
 @pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    ("expected_min_mireds", "min_mireds_template"),
+    ("style", "attribute"),
+    [
+        (ConfigurationStyle.LEGACY, "min_mireds_template"),
+        (ConfigurationStyle.MODERN, "min_mireds"),
+    ],
+)
+@pytest.mark.parametrize(
+    ("expected_min_mireds", "attribute_template"),
     [
         (118, "{{118}}"),
         (153, "{{x - 12}}"),
@@ -1738,25 +2163,9 @@ async def test_effect_template(
     ],
 )
 async def test_min_mireds_template(
-    hass: HomeAssistant, expected_min_mireds, count, min_mireds_template
+    hass: HomeAssistant, expected_min_mireds, setup_light_with_mireds
 ) -> None:
     """Test the template for the min mireds."""
-    light_config = {
-        "test_template_light": {
-            **OPTIMISTIC_ON_OFF_LIGHT_CONFIG,
-            "value_template": "{{ 1 == 1 }}",
-            "set_temperature": {
-                "service": "light.turn_on",
-                "data_template": {
-                    "entity_id": "light.test_state",
-                    "color_temp": "{{color_temp}}",
-                },
-            },
-            "temperature_template": "{{200}}",
-            "min_mireds_template": min_mireds_template,
-        }
-    }
-    await async_setup_light(hass, count, light_config)
     state = hass.states.get("light.test_template_light")
     assert state is not None
     assert state.attributes.get("min_mireds") == expected_min_mireds
@@ -1764,7 +2173,14 @@ async def test_min_mireds_template(
 
 @pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    ("expected_max_mireds", "max_mireds_template"),
+    ("style", "attribute"),
+    [
+        (ConfigurationStyle.LEGACY, "max_mireds_template"),
+        (ConfigurationStyle.MODERN, "max_mireds"),
+    ],
+)
+@pytest.mark.parametrize(
+    ("expected_max_mireds", "attribute_template"),
     [
         (488, "{{488}}"),
         (500, "{{x - 12}}"),
@@ -1775,33 +2191,26 @@ async def test_min_mireds_template(
     ],
 )
 async def test_max_mireds_template(
-    hass: HomeAssistant, expected_max_mireds, count, max_mireds_template
+    hass: HomeAssistant, expected_max_mireds, setup_light_with_mireds
 ) -> None:
     """Test the template for the max mireds."""
-    light_config = {
-        "test_template_light": {
-            **OPTIMISTIC_ON_OFF_LIGHT_CONFIG,
-            "value_template": "{{ 1 == 1 }}",
-            "set_temperature": {
-                "service": "light.turn_on",
-                "data_template": {
-                    "entity_id": "light.test_state",
-                    "color_temp": "{{color_temp}}",
-                },
-            },
-            "temperature_template": "{{200}}",
-            "max_mireds_template": max_mireds_template,
-        }
-    }
-    await async_setup_light(hass, count, light_config)
     state = hass.states.get("light.test_template_light")
     assert state is not None
     assert state.attributes.get("max_mireds") == expected_max_mireds
 
 
-@pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    ("expected_supports_transition", "supports_transition_template"),
+    ("count", "extra_config"), [(1, OPTIMISTIC_COLOR_TEMP_LIGHT_CONFIG)]
+)
+@pytest.mark.parametrize(
+    ("style", "attribute"),
+    [
+        (ConfigurationStyle.LEGACY, "supports_transition_template"),
+        (ConfigurationStyle.MODERN, "supports_transition"),
+    ],
+)
+@pytest.mark.parametrize(
+    ("expected_supports_transition", "attribute_template"),
     [
         (True, "{{true}}"),
         (True, "{{1 == 1}}"),
@@ -1812,28 +2221,9 @@ async def test_max_mireds_template(
     ],
 )
 async def test_supports_transition_template(
-    hass: HomeAssistant,
-    expected_supports_transition,
-    count,
-    supports_transition_template,
+    hass: HomeAssistant, expected_supports_transition, setup_single_attribute_light
 ) -> None:
     """Test the template for the supports transition."""
-    light_config = {
-        "test_template_light": {
-            "value_template": "{{ 1 == 1 }}",
-            "turn_on": {"service": "light.turn_on", "entity_id": "light.test_state"},
-            "turn_off": {"service": "light.turn_off", "entity_id": "light.test_state"},
-            "set_temperature": {
-                "service": "light.turn_on",
-                "data_template": {
-                    "entity_id": "light.test_state",
-                    "color_temp": "{{color_temp}}",
-                },
-            },
-            "supports_transition_template": supports_transition_template,
-        }
-    }
-    await async_setup_light(hass, count, light_config)
     state = hass.states.get("light.test_template_light")
 
     expected_value = 1
@@ -1847,22 +2237,59 @@ async def test_supports_transition_template(
     ) != expected_value
 
 
-@pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    ("count", "transition_template"), [(1, "{{ states('sensor.test') }}")]
+)
+@pytest.mark.parametrize(
+    "style", [ConfigurationStyle.LEGACY, ConfigurationStyle.MODERN]
+)
+async def test_supports_transition_template_updates(
+    hass: HomeAssistant, setup_light_with_transition_template
+) -> None:
+    """Test the template for the supports transition dynamically."""
+    state = hass.states.get("light.test_template_light")
+    assert state is not None
+
+    hass.states.async_set("sensor.test", 0)
+    await hass.async_block_till_done()
+    state = hass.states.get("light.test_template_light")
+    supported_features = state.attributes.get("supported_features")
+    assert supported_features == LightEntityFeature.EFFECT
+
+    hass.states.async_set("sensor.test", 1)
+    await hass.async_block_till_done()
+    state = hass.states.get("light.test_template_light")
+    supported_features = state.attributes.get("supported_features")
+    assert (
+        supported_features == LightEntityFeature.TRANSITION | LightEntityFeature.EFFECT
+    )
+
+    hass.states.async_set("sensor.test", 0)
+    await hass.async_block_till_done()
+    state = hass.states.get("light.test_template_light")
+    supported_features = state.attributes.get("supported_features")
+    assert supported_features == LightEntityFeature.EFFECT
+
+
+@pytest.mark.parametrize(
+    ("count", "extra_config", "attribute_template"),
     [
-        {
-            "test_template_light": {
-                **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
-                "availability_template": (
-                    "{{ is_state('availability_boolean.state', 'on') }}"
-                ),
-            }
-        },
+        (
+            1,
+            OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
+            "{{ is_state('availability_boolean.state', 'on') }}",
+        )
+    ],
+)
+@pytest.mark.parametrize(
+    ("style", "attribute"),
+    [
+        (ConfigurationStyle.LEGACY, "availability_template"),
+        (ConfigurationStyle.MODERN, "availability"),
     ],
 )
 async def test_available_template_with_entities(
-    hass: HomeAssistant, setup_light
+    hass: HomeAssistant, setup_single_attribute_light
 ) -> None:
     """Test availability templates with values from other entities."""
     # When template returns true..
@@ -1880,20 +2307,25 @@ async def test_available_template_with_entities(
     assert hass.states.get("light.test_template_light").state == STATE_UNAVAILABLE
 
 
-@pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    ("count", "extra_config", "attribute_template"),
     [
-        {
-            "test_template_light": {
-                **OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
-                "availability_template": "{{ x - 12 }}",
-            }
-        },
+        (
+            1,
+            OPTIMISTIC_BRIGHTNESS_LIGHT_CONFIG,
+            "{{ x - 12 }}",
+        )
+    ],
+)
+@pytest.mark.parametrize(
+    ("style", "attribute"),
+    [
+        (ConfigurationStyle.LEGACY, "availability_template"),
+        (ConfigurationStyle.MODERN, "availability"),
     ],
 )
 async def test_invalid_availability_template_keeps_component_available(
-    hass: HomeAssistant, setup_light, caplog_setup_text
+    hass: HomeAssistant, setup_single_attribute_light, caplog_setup_text
 ) -> None:
     """Test that an invalid availability keeps the device available."""
     assert hass.states.get("light.test_template_light").state != STATE_UNAVAILABLE
@@ -1902,20 +2334,73 @@ async def test_invalid_availability_template_keeps_component_available(
 
 @pytest.mark.parametrize("count", [1])
 @pytest.mark.parametrize(
-    "light_config",
+    ("light_config", "style"),
     [
-        {
-            "test_template_light_01": {
-                **OPTIMISTIC_ON_OFF_LIGHT_CONFIG,
-                "unique_id": "not-so-unique-anymore",
+        (
+            {
+                "test_template_light_01": TEST_UNIQUE_ID_CONFIG,
+                "test_template_light_02": TEST_UNIQUE_ID_CONFIG,
             },
-            "test_template_light_02": {
-                **OPTIMISTIC_ON_OFF_LIGHT_CONFIG,
-                "unique_id": "not-so-unique-anymore",
-            },
-        },
+            ConfigurationStyle.LEGACY,
+        ),
+        (
+            [
+                {
+                    "name": "test_template_light_01",
+                    **TEST_UNIQUE_ID_CONFIG,
+                },
+                {
+                    "name": "test_template_light_02",
+                    **TEST_UNIQUE_ID_CONFIG,
+                },
+            ],
+            ConfigurationStyle.MODERN,
+        ),
     ],
 )
 async def test_unique_id(hass: HomeAssistant, setup_light) -> None:
     """Test unique_id option only creates one light per id."""
     assert len(hass.states.async_all("light")) == 1
+
+
+async def test_nested_unique_id(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test unique_id option creates one light per nested id."""
+
+    with assert_setup_component(1, template.DOMAIN):
+        assert await async_setup_component(
+            hass,
+            template.DOMAIN,
+            {
+                "template": {
+                    "unique_id": "x",
+                    "light": [
+                        {
+                            "name": "test_a",
+                            **OPTIMISTIC_ON_OFF_LIGHT_CONFIG,
+                            "unique_id": "a",
+                        },
+                        {
+                            "name": "test_b",
+                            **OPTIMISTIC_ON_OFF_LIGHT_CONFIG,
+                            "unique_id": "b",
+                        },
+                    ],
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    assert len(hass.states.async_all("light")) == 2
+
+    entry = entity_registry.async_get("light.test_a")
+    assert entry
+    assert entry.unique_id == "x-a"
+
+    entry = entity_registry.async_get("light.test_b")
+    assert entry
+    assert entry.unique_id == "x-b"
diff --git a/tests/components/template/test_number.py b/tests/components/template/test_number.py
index ec96245b4d0..f73a943e752 100644
--- a/tests/components/template/test_number.py
+++ b/tests/components/template/test_number.py
@@ -330,7 +330,10 @@ async def test_trigger_number(hass: HomeAssistant) -> None:
                             "max": "{{ trigger.event.data.max_beers }}",
                             "step": "{{ trigger.event.data.step }}",
                             "unit_of_measurement": "beer",
-                            "set_value": {"event": "test_number_event"},
+                            "set_value": {
+                                "event": "test_number_event",
+                                "event_data": {"entity_id": "{{ this.entity_id }}"},
+                            },
                             "optimistic": True,
                         },
                     ],
@@ -379,6 +382,9 @@ async def test_trigger_number(hass: HomeAssistant) -> None:
     )
     assert len(events) == 1
     assert events[0].event_type == "test_number_event"
+    entity_id = events[0].data.get("entity_id")
+    assert entity_id is not None
+    assert entity_id == "number.hello_name"
 
 
 def _verify(
diff --git a/tests/components/template/test_select.py b/tests/components/template/test_select.py
index 5b4723a3034..59ab45aeb36 100644
--- a/tests/components/template/test_select.py
+++ b/tests/components/template/test_select.py
@@ -264,6 +264,7 @@ async def test_templates_with_entities(
 async def test_trigger_select(hass: HomeAssistant) -> None:
     """Test trigger based template select."""
     events = async_capture_events(hass, "test_number_event")
+    action_events = async_capture_events(hass, "action_event")
     assert await setup.async_setup_component(
         hass,
         "template",
@@ -274,13 +275,23 @@ async def test_trigger_select(hass: HomeAssistant) -> None:
                 {
                     "unique_id": "listening-test-event",
                     "trigger": {"platform": "event", "event_type": "test_event"},
+                    "variables": {"beer": "{{ trigger.event.data.beer }}"},
+                    "action": [
+                        {"event": "action_event", "event_data": {"beer": "{{ beer }}"}}
+                    ],
                     "select": [
                         {
                             "name": "Hello Name",
                             "unique_id": "hello_name-id",
                             "state": "{{ trigger.event.data.beer }}",
                             "options": "{{ trigger.event.data.beers }}",
-                            "select_option": {"event": "test_number_event"},
+                            "select_option": {
+                                "event": "test_number_event",
+                                "event_data": {
+                                    "entity_id": "{{ this.entity_id }}",
+                                    "beer": "{{ beer }}",
+                                },
+                            },
                             "optimistic": True,
                         },
                     ],
@@ -308,6 +319,12 @@ async def test_trigger_select(hass: HomeAssistant) -> None:
     assert state.state == "duff"
     assert state.attributes["options"] == ["duff", "alamo"]
 
+    assert len(action_events) == 1
+    assert action_events[0].event_type == "action_event"
+    beer = action_events[0].data.get("beer")
+    assert beer is not None
+    assert beer == "duff"
+
     await hass.services.async_call(
         SELECT_DOMAIN,
         SELECT_SERVICE_SELECT_OPTION,
@@ -316,6 +333,13 @@ async def test_trigger_select(hass: HomeAssistant) -> None:
     )
     assert len(events) == 1
     assert events[0].event_type == "test_number_event"
+    entity_id = events[0].data.get("entity_id")
+    assert entity_id is not None
+    assert entity_id == "select.hello_name"
+
+    beer = events[0].data.get("beer")
+    assert beer is not None
+    assert beer == "duff"
 
 
 def _verify(
diff --git a/tests/components/template/test_sensor.py b/tests/components/template/test_sensor.py
index 929a890ab38..6f0e6be8a2a 100644
--- a/tests/components/template/test_sensor.py
+++ b/tests/components/template/test_sensor.py
@@ -24,11 +24,11 @@ from homeassistant.const import (
 from homeassistant.core import Context, CoreState, HomeAssistant, State, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_component import async_update_entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.setup import ATTR_COMPONENT, async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
@@ -393,7 +393,7 @@ async def test_creating_sensor_loads_group(hass: HomeAssistant) -> None:
     async def async_setup_template(
         hass: HomeAssistant,
         config: ConfigType,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
         discovery_info: DiscoveryInfoType | None = None,
     ) -> bool:
         order.append("sensor.template")
diff --git a/tests/components/template/test_switch.py b/tests/components/template/test_switch.py
index 2fc0f29acaf..f0dbe43b51e 100644
--- a/tests/components/template/test_switch.py
+++ b/tests/components/template/test_switch.py
@@ -1,11 +1,13 @@
 """The tests for the  Template switch platform."""
 
+from typing import Any
+
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
-from homeassistant import setup
-from homeassistant.components import template
+from homeassistant.components import switch, template
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
+from homeassistant.components.template.switch import rewrite_legacy_to_modern_conf
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     SERVICE_TURN_OFF,
@@ -16,8 +18,11 @@ from homeassistant.const import (
 )
 from homeassistant.core import CoreState, HomeAssistant, ServiceCall, State
 from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.helpers.template import Template
 from homeassistant.setup import async_setup_component
 
+from .conftest import ConfigurationStyle
+
 from tests.common import (
     MockConfigEntry,
     assert_setup_component,
@@ -25,26 +30,225 @@ from tests.common import (
     mock_restore_cache,
 )
 
-OPTIMISTIC_SWITCH_CONFIG = {
-    "turn_on": {
-        "service": "test.automation",
-        "data_template": {
-            "action": "turn_on",
-            "caller": "{{ this.entity_id }}",
-        },
+TEST_OBJECT_ID = "test_template_switch"
+TEST_ENTITY_ID = f"switch.{TEST_OBJECT_ID}"
+TEST_STATE_ENTITY_ID = "switch.test_state"
+
+SWITCH_TURN_ON = {
+    "service": "test.automation",
+    "data_template": {
+        "action": "turn_on",
+        "caller": "{{ this.entity_id }}",
     },
-    "turn_off": {
-        "service": "test.automation",
-        "data_template": {
-            "action": "turn_off",
-            "caller": "{{ this.entity_id }}",
-        },
+}
+SWITCH_TURN_OFF = {
+    "service": "test.automation",
+    "data_template": {
+        "action": "turn_off",
+        "caller": "{{ this.entity_id }}",
     },
 }
+SWITCH_ACTIONS = {
+    "turn_on": SWITCH_TURN_ON,
+    "turn_off": SWITCH_TURN_OFF,
+}
+NAMED_SWITCH_ACTIONS = {
+    **SWITCH_ACTIONS,
+    "name": TEST_OBJECT_ID,
+}
+UNIQUE_ID_CONFIG = {
+    **SWITCH_ACTIONS,
+    "unique_id": "not-so-unique-anymore",
+}
 
 
+async def async_setup_legacy_format(
+    hass: HomeAssistant, count: int, switch_config: dict[str, Any]
+) -> None:
+    """Do setup of switch integration via legacy format."""
+    config = {"switch": {"platform": "template", "switches": switch_config}}
+
+    with assert_setup_component(count, switch.DOMAIN):
+        assert await async_setup_component(
+            hass,
+            switch.DOMAIN,
+            config,
+        )
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+
+async def async_setup_modern_format(
+    hass: HomeAssistant, count: int, switch_config: dict[str, Any]
+) -> None:
+    """Do setup of switch integration via modern format."""
+    config = {"template": {"switch": switch_config}}
+
+    with assert_setup_component(count, template.DOMAIN):
+        assert await async_setup_component(
+            hass,
+            template.DOMAIN,
+            config,
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+
+@pytest.fixture
+async def setup_switch(
+    hass: HomeAssistant,
+    count: int,
+    style: ConfigurationStyle,
+    switch_config: dict[str, Any],
+) -> None:
+    """Do setup of switch integration."""
+    if style == ConfigurationStyle.LEGACY:
+        await async_setup_legacy_format(hass, count, switch_config)
+    elif style == ConfigurationStyle.MODERN:
+        await async_setup_modern_format(hass, count, switch_config)
+
+
+@pytest.fixture
+async def setup_state_switch(
+    hass: HomeAssistant,
+    count: int,
+    style: ConfigurationStyle,
+    state_template: str,
+):
+    """Do setup of switch integration using a state template."""
+    if style == ConfigurationStyle.LEGACY:
+        await async_setup_legacy_format(
+            hass,
+            count,
+            {
+                TEST_OBJECT_ID: {
+                    **SWITCH_ACTIONS,
+                    "value_template": state_template,
+                }
+            },
+        )
+    elif style == ConfigurationStyle.MODERN:
+        await async_setup_modern_format(
+            hass,
+            count,
+            {
+                **NAMED_SWITCH_ACTIONS,
+                "state": state_template,
+            },
+        )
+
+
+@pytest.fixture
+async def setup_single_attribute_switch(
+    hass: HomeAssistant,
+    count: int,
+    style: ConfigurationStyle,
+    attribute: str,
+    attribute_template: str,
+) -> None:
+    """Do setup of switch integration testing a single attribute."""
+    extra = {attribute: attribute_template} if attribute and attribute_template else {}
+    if style == ConfigurationStyle.LEGACY:
+        await async_setup_legacy_format(
+            hass,
+            count,
+            {
+                TEST_OBJECT_ID: {
+                    **SWITCH_ACTIONS,
+                    "value_template": "{{ 1 == 1 }}",
+                    **extra,
+                }
+            },
+        )
+    elif style == ConfigurationStyle.MODERN:
+        await async_setup_modern_format(
+            hass,
+            count,
+            {
+                **NAMED_SWITCH_ACTIONS,
+                "state": "{{ 1 == 1 }}",
+                **extra,
+            },
+        )
+
+
+@pytest.fixture
+async def setup_optimistic_switch(
+    hass: HomeAssistant,
+    count: int,
+    style: ConfigurationStyle,
+) -> None:
+    """Do setup of an optimistic switch."""
+    if style == ConfigurationStyle.LEGACY:
+        await async_setup_legacy_format(
+            hass,
+            count,
+            {
+                TEST_OBJECT_ID: {
+                    **SWITCH_ACTIONS,
+                }
+            },
+        )
+    elif style == ConfigurationStyle.MODERN:
+        await async_setup_modern_format(
+            hass,
+            count,
+            {
+                **NAMED_SWITCH_ACTIONS,
+            },
+        )
+
+
+async def test_legacy_to_modern_config(hass: HomeAssistant) -> None:
+    """Test the conversion of legacy template to modern template."""
+    config = {
+        "foo": {
+            "friendly_name": "foo bar",
+            "value_template": "{{ 1 == 1 }}",
+            "unique_id": "foo-bar-switch",
+            "icon_template": "{{ 'mdi.abc' }}",
+            "entity_picture_template": "{{ 'mypicture.jpg' }}",
+            "availability_template": "{{ 1 == 1 }}",
+            **SWITCH_ACTIONS,
+        }
+    }
+    altered_configs = rewrite_legacy_to_modern_conf(hass, config)
+
+    assert len(altered_configs) == 1
+    assert [
+        {
+            "availability": Template("{{ 1 == 1 }}", hass),
+            "icon": Template("{{ 'mdi.abc' }}", hass),
+            "name": Template("foo bar", hass),
+            "object_id": "foo",
+            "picture": Template("{{ 'mypicture.jpg' }}", hass),
+            "turn_off": SWITCH_TURN_OFF,
+            "turn_on": SWITCH_TURN_ON,
+            "unique_id": "foo-bar-switch",
+            "state": Template("{{ 1 == 1 }}", hass),
+        }
+    ] == altered_configs
+
+
+@pytest.mark.parametrize(("count", "state_template"), [(1, "{{ True }}")])
+@pytest.mark.parametrize(
+    "style", [ConfigurationStyle.LEGACY, ConfigurationStyle.MODERN]
+)
+async def test_setup(hass: HomeAssistant, setup_state_switch) -> None:
+    """Test template."""
+    state = hass.states.get(TEST_ENTITY_ID)
+    assert state is not None
+    assert state.name == TEST_OBJECT_ID
+    assert state.state == STATE_ON
+
+
+@pytest.mark.parametrize("state_key", ["value_template", "state"])
 async def test_setup_config_entry(
     hass: HomeAssistant,
+    state_key: str,
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test the config flow."""
@@ -60,7 +264,7 @@ async def test_setup_config_entry(
         domain=template.DOMAIN,
         options={
             "name": "My template",
-            "value_template": "{{ states('switch.one') }}",
+            state_key: "{{ states('switch.one') }}",
             "template_type": SWITCH_DOMAIN,
         },
         title="My template",
@@ -75,200 +279,108 @@ async def test_setup_config_entry(
     assert state == snapshot
 
 
-async def test_template_state_text(hass: HomeAssistant) -> None:
+@pytest.mark.parametrize(
+    ("count", "state_template"), [(1, "{{ states.switch.test_state.state }}")]
+)
+@pytest.mark.parametrize(
+    "style", [ConfigurationStyle.LEGACY, ConfigurationStyle.MODERN]
+)
+async def test_template_state_text(hass: HomeAssistant, setup_state_switch) -> None:
     """Test the state text of a template."""
-    with assert_setup_component(1, "switch"):
-        assert await async_setup_component(
-            hass,
-            "switch",
-            {
-                "switch": {
-                    "platform": "template",
-                    "switches": {
-                        "test_template_switch": {
-                            **OPTIMISTIC_SWITCH_CONFIG,
-                            "value_template": "{{ states.switch.test_state.state }}",
-                        }
-                    },
-                }
-            },
-        )
-
-    await hass.async_block_till_done()
-    await hass.async_start()
+    hass.states.async_set(TEST_STATE_ENTITY_ID, STATE_ON)
     await hass.async_block_till_done()
 
-    hass.states.async_set("switch.test_state", STATE_ON)
-    await hass.async_block_till_done()
-
-    state = hass.states.get("switch.test_template_switch")
+    state = hass.states.get(TEST_ENTITY_ID)
     assert state.state == STATE_ON
 
-    hass.states.async_set("switch.test_state", STATE_OFF)
+    hass.states.async_set(TEST_STATE_ENTITY_ID, STATE_OFF)
     await hass.async_block_till_done()
 
-    state = hass.states.get("switch.test_template_switch")
+    state = hass.states.get(TEST_ENTITY_ID)
     assert state.state == STATE_OFF
 
 
-async def test_template_state_boolean_on(hass: HomeAssistant) -> None:
-    """Test the setting of the state with boolean on."""
-    with assert_setup_component(1, "switch"):
-        assert await async_setup_component(
-            hass,
-            "switch",
-            {
-                "switch": {
-                    "platform": "template",
-                    "switches": {
-                        "test_template_switch": {
-                            **OPTIMISTIC_SWITCH_CONFIG,
-                            "value_template": "{{ 1 == 1 }}",
-                        }
-                    },
-                }
-            },
-        )
-
-    await hass.async_block_till_done()
-    await hass.async_start()
-    await hass.async_block_till_done()
-
-    state = hass.states.get("switch.test_template_switch")
-    assert state.state == STATE_ON
+@pytest.mark.parametrize("count", [1])
+@pytest.mark.parametrize(
+    ("expected", "state_template"),
+    [
+        (STATE_ON, "{{ 1 == 1 }}"),
+        (STATE_OFF, "{{ 1 == 2 }}"),
+    ],
+)
+@pytest.mark.parametrize(
+    "style", [ConfigurationStyle.LEGACY, ConfigurationStyle.MODERN]
+)
+async def test_template_state_boolean(
+    hass: HomeAssistant, expected: str, setup_state_switch
+) -> None:
+    """Test the setting of the state with boolean template."""
+    state = hass.states.get(TEST_ENTITY_ID)
+    assert state.state == expected
 
 
-async def test_template_state_boolean_off(hass: HomeAssistant) -> None:
-    """Test the setting of the state with off."""
-    with assert_setup_component(1, "switch"):
-        assert await async_setup_component(
-            hass,
-            "switch",
-            {
-                "switch": {
-                    "platform": "template",
-                    "switches": {
-                        "test_template_switch": {
-                            **OPTIMISTIC_SWITCH_CONFIG,
-                            "value_template": "{{ 1 == 2 }}",
-                        }
-                    },
-                }
-            },
-        )
-
-    await hass.async_block_till_done()
-    await hass.async_start()
-    await hass.async_block_till_done()
-
-    state = hass.states.get("switch.test_template_switch")
-    assert state.state == STATE_OFF
-
-
-async def test_icon_template(hass: HomeAssistant) -> None:
-    """Test icon template."""
-    with assert_setup_component(1, "switch"):
-        assert await async_setup_component(
-            hass,
-            "switch",
-            {
-                "switch": {
-                    "platform": "template",
-                    "switches": {
-                        "test_template_switch": {
-                            **OPTIMISTIC_SWITCH_CONFIG,
-                            "value_template": "{{ states.switch.test_state.state }}",
-                            "icon_template": (
-                                "{% if states.switch.test_state.state %}"
-                                "mdi:check"
-                                "{% endif %}"
-                            ),
-                        }
-                    },
-                }
-            },
-        )
-
-    await hass.async_block_till_done()
-    await hass.async_start()
-    await hass.async_block_till_done()
-
-    state = hass.states.get("switch.test_template_switch")
+@pytest.mark.parametrize(
+    ("count", "attribute_template"),
+    [(1, "{% if states.switch.test_state.state %}mdi:check{% endif %}")],
+)
+@pytest.mark.parametrize(
+    ("style", "attribute"),
+    [
+        (ConfigurationStyle.LEGACY, "icon_template"),
+        (ConfigurationStyle.MODERN, "icon"),
+    ],
+)
+async def test_icon_template(
+    hass: HomeAssistant, setup_single_attribute_switch
+) -> None:
+    """Test the state text of a template."""
+    state = hass.states.get(TEST_ENTITY_ID)
     assert state.attributes.get("icon") == ""
 
-    hass.states.async_set("switch.test_state", STATE_ON)
+    hass.states.async_set(TEST_STATE_ENTITY_ID, STATE_ON)
     await hass.async_block_till_done()
 
-    state = hass.states.get("switch.test_template_switch")
+    state = hass.states.get(TEST_ENTITY_ID)
     assert state.attributes["icon"] == "mdi:check"
 
 
-async def test_entity_picture_template(hass: HomeAssistant) -> None:
+@pytest.mark.parametrize(
+    ("count", "attribute_template"),
+    [(1, "{% if states.switch.test_state.state %}/local/switch.png{% endif %}")],
+)
+@pytest.mark.parametrize(
+    ("style", "attribute"),
+    [
+        (ConfigurationStyle.LEGACY, "entity_picture_template"),
+        (ConfigurationStyle.MODERN, "picture"),
+    ],
+)
+async def test_entity_picture_template(
+    hass: HomeAssistant, setup_single_attribute_switch
+) -> None:
     """Test entity_picture template."""
-    with assert_setup_component(1, "switch"):
-        assert await async_setup_component(
-            hass,
-            "switch",
-            {
-                "switch": {
-                    "platform": "template",
-                    "switches": {
-                        "test_template_switch": {
-                            **OPTIMISTIC_SWITCH_CONFIG,
-                            "value_template": "{{ states.switch.test_state.state }}",
-                            "entity_picture_template": (
-                                "{% if states.switch.test_state.state %}"
-                                "/local/switch.png"
-                                "{% endif %}"
-                            ),
-                        }
-                    },
-                }
-            },
-        )
-
-    await hass.async_block_till_done()
-    await hass.async_start()
-    await hass.async_block_till_done()
-
-    state = hass.states.get("switch.test_template_switch")
+    state = hass.states.get(TEST_ENTITY_ID)
     assert state.attributes.get("entity_picture") == ""
 
-    hass.states.async_set("switch.test_state", STATE_ON)
+    hass.states.async_set(TEST_STATE_ENTITY_ID, STATE_ON)
     await hass.async_block_till_done()
 
-    state = hass.states.get("switch.test_template_switch")
+    state = hass.states.get(TEST_ENTITY_ID)
     assert state.attributes["entity_picture"] == "/local/switch.png"
 
 
-async def test_template_syntax_error(hass: HomeAssistant) -> None:
+@pytest.mark.parametrize(("count", "state_template"), [(0, "{% if rubbish %}")])
+@pytest.mark.parametrize(
+    "style",
+    [ConfigurationStyle.LEGACY, ConfigurationStyle.MODERN],
+)
+async def test_template_syntax_error(hass: HomeAssistant, setup_state_switch) -> None:
     """Test templating syntax error."""
-    with assert_setup_component(0, "switch"):
-        assert await async_setup_component(
-            hass,
-            "switch",
-            {
-                "switch": {
-                    "platform": "template",
-                    "switches": {
-                        "test_template_switch": {
-                            **OPTIMISTIC_SWITCH_CONFIG,
-                            "value_template": "{% if rubbish %}",
-                        }
-                    },
-                }
-            },
-        )
-
-    await hass.async_block_till_done()
-    await hass.async_start()
-    await hass.async_block_till_done()
-
     assert hass.states.async_all("switch") == []
 
 
-async def test_invalid_name_does_not_create(hass: HomeAssistant) -> None:
-    """Test invalid name."""
+async def test_invalid_legacy_slug_does_not_create(hass: HomeAssistant) -> None:
+    """Test invalid legacy slug."""
     with assert_setup_component(0, "switch"):
         assert await async_setup_component(
             hass,
@@ -278,7 +390,7 @@ async def test_invalid_name_does_not_create(hass: HomeAssistant) -> None:
                     "platform": "template",
                     "switches": {
                         "test INVALID switch": {
-                            **OPTIMISTIC_SWITCH_CONFIG,
+                            **SWITCH_ACTIONS,
                             "value_template": "{{ rubbish }",
                         }
                     },
@@ -293,19 +405,32 @@ async def test_invalid_name_does_not_create(hass: HomeAssistant) -> None:
     assert hass.states.async_all("switch") == []
 
 
-async def test_invalid_switch_does_not_create(hass: HomeAssistant) -> None:
+@pytest.mark.parametrize(
+    ("config", "domain"),
+    [
+        (
+            {
+                "template": {"switch": "Invalid"},
+            },
+            template.DOMAIN,
+        ),
+        (
+            {
+                "switch": {
+                    "platform": "template",
+                    "switches": {TEST_OBJECT_ID: "Invalid"},
+                }
+            },
+            switch.DOMAIN,
+        ),
+    ],
+)
+async def test_invalid_switch_does_not_create(
+    hass: HomeAssistant, config: dict, domain: str
+) -> None:
     """Test invalid switch."""
-    with assert_setup_component(0, "switch"):
-        assert await async_setup_component(
-            hass,
-            "switch",
-            {
-                "switch": {
-                    "platform": "template",
-                    "switches": {"test_template_switch": "Invalid"},
-                }
-            },
-        )
+    with assert_setup_component(0, domain):
+        assert await async_setup_component(hass, domain, config)
 
     await hass.async_block_till_done()
     await hass.async_start()
@@ -314,12 +439,33 @@ async def test_invalid_switch_does_not_create(hass: HomeAssistant) -> None:
     assert hass.states.async_all("switch") == []
 
 
-async def test_no_switches_does_not_create(hass: HomeAssistant) -> None:
+@pytest.mark.parametrize(
+    ("config", "domain", "count"),
+    [
+        (
+            {
+                "template": {"switch": []},
+            },
+            template.DOMAIN,
+            1,
+        ),
+        (
+            {
+                "switch": {
+                    "platform": "template",
+                }
+            },
+            switch.DOMAIN,
+            0,
+        ),
+    ],
+)
+async def test_no_switches_does_not_create(
+    hass: HomeAssistant, config: dict, domain: str, count: int
+) -> None:
     """Test if there are no switches no creation."""
-    with assert_setup_component(0, "switch"):
-        assert await async_setup_component(
-            hass, "switch", {"switch": {"platform": "template"}}
-        )
+    with assert_setup_component(count, domain):
+        assert await async_setup_component(hass, domain, config)
 
     await hass.async_block_till_done()
     await hass.async_start()
@@ -328,239 +474,254 @@ async def test_no_switches_does_not_create(hass: HomeAssistant) -> None:
     assert hass.states.async_all("switch") == []
 
 
-async def test_missing_on_does_not_create(hass: HomeAssistant) -> None:
-    """Test missing on."""
-    with assert_setup_component(0, "switch"):
-        assert await async_setup_component(
-            hass,
-            "switch",
+@pytest.mark.parametrize(
+    ("config", "domain"),
+    [
+        (
             {
-                "switch": {
-                    "platform": "template",
-                    "switches": {
-                        "test_template_switch": {
-                            "value_template": "{{ states.switch.test_state.state }}",
-                            "not_on": {
-                                "service": "switch.turn_on",
-                                "entity_id": "switch.test_state",
-                            },
-                            "turn_off": {
-                                "service": "switch.turn_off",
-                                "entity_id": "switch.test_state",
-                            },
-                        }
-                    },
-                }
-            },
-        )
-
-    await hass.async_block_till_done()
-    await hass.async_start()
-    await hass.async_block_till_done()
-
-    assert hass.states.async_all("switch") == []
-
-
-async def test_missing_off_does_not_create(hass: HomeAssistant) -> None:
-    """Test missing off."""
-    with assert_setup_component(0, "switch"):
-        assert await async_setup_component(
-            hass,
-            "switch",
-            {
-                "switch": {
-                    "platform": "template",
-                    "switches": {
-                        "test_template_switch": {
-                            "value_template": "{{ states.switch.test_state.state }}",
-                            "turn_on": {
-                                "service": "switch.turn_on",
-                                "entity_id": "switch.test_state",
-                            },
-                            "not_off": {
-                                "service": "switch.turn_off",
-                                "entity_id": "switch.test_state",
-                            },
-                        }
-                    },
-                }
-            },
-        )
-
-    await hass.async_block_till_done()
-    await hass.async_start()
-    await hass.async_block_till_done()
-
-    assert hass.states.async_all("switch") == []
-
-
-async def test_on_action(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
-    """Test on action."""
-    assert await async_setup_component(
-        hass,
-        "switch",
-        {
-            "switch": {
-                "platform": "template",
-                "switches": {
-                    "test_template_switch": {
-                        **OPTIMISTIC_SWITCH_CONFIG,
-                        "value_template": "{{ states.switch.test_state.state }}",
+                "template": {
+                    "switch": {
+                        "not_on": SWITCH_TURN_ON,
+                        "turn_off": SWITCH_TURN_OFF,
+                        "state": "{{ states.switch.test_state.state }}",
                     }
                 },
-            }
-        },
-    )
+            },
+            template.DOMAIN,
+        ),
+        (
+            {
+                "switch": {
+                    "platform": "template",
+                    "switches": {
+                        TEST_OBJECT_ID: {
+                            "not_on": SWITCH_TURN_ON,
+                            "turn_off": SWITCH_TURN_OFF,
+                            "value_template": "{{ states.switch.test_state.state }}",
+                        }
+                    },
+                }
+            },
+            switch.DOMAIN,
+        ),
+    ],
+)
+async def test_missing_on_does_not_create(
+    hass: HomeAssistant, config: dict, domain: str
+) -> None:
+    """Test missing on."""
+    with assert_setup_component(0, domain):
+        assert await async_setup_component(hass, domain, config)
 
     await hass.async_block_till_done()
     await hass.async_start()
     await hass.async_block_till_done()
 
-    hass.states.async_set("switch.test_state", STATE_OFF)
+    assert hass.states.async_all("switch") == []
+
+
+@pytest.mark.parametrize(
+    ("config", "domain"),
+    [
+        (
+            {
+                "template": {
+                    "switch": {
+                        "turn_on": SWITCH_TURN_ON,
+                        "not_off": SWITCH_TURN_OFF,
+                        "state": "{{ states.switch.test_state.state }}",
+                    }
+                },
+            },
+            template.DOMAIN,
+        ),
+        (
+            {
+                "switch": {
+                    "platform": "template",
+                    "switches": {
+                        TEST_OBJECT_ID: {
+                            "turn_on": SWITCH_TURN_ON,
+                            "not_off": SWITCH_TURN_OFF,
+                            "value_template": "{{ states.switch.test_state.state }}",
+                        }
+                    },
+                }
+            },
+            switch.DOMAIN,
+        ),
+    ],
+)
+async def test_missing_off_does_not_create(
+    hass: HomeAssistant, config: dict, domain: str
+) -> None:
+    """Test missing off."""
+    with assert_setup_component(0, domain):
+        assert await async_setup_component(hass, domain, config)
+
+    await hass.async_block_till_done()
+    await hass.async_start()
     await hass.async_block_till_done()
 
-    state = hass.states.get("switch.test_template_switch")
+    assert hass.states.async_all("switch") == []
+
+
+@pytest.mark.parametrize(
+    ("count", "state_template"), [(1, "{{ states('switch.test_state') }}")]
+)
+@pytest.mark.parametrize(
+    "style", [ConfigurationStyle.LEGACY, ConfigurationStyle.MODERN]
+)
+async def test_on_action(
+    hass: HomeAssistant, setup_state_switch, calls: list[ServiceCall]
+) -> None:
+    """Test on action."""
+    hass.states.async_set(TEST_STATE_ENTITY_ID, STATE_OFF)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(TEST_ENTITY_ID)
     assert state.state == STATE_OFF
 
     await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_ON,
-        {ATTR_ENTITY_ID: "switch.test_template_switch"},
+        {ATTR_ENTITY_ID: TEST_ENTITY_ID},
         blocking=True,
     )
 
     assert len(calls) == 1
     assert calls[-1].data["action"] == "turn_on"
-    assert calls[-1].data["caller"] == "switch.test_template_switch"
+    assert calls[-1].data["caller"] == TEST_ENTITY_ID
 
 
+@pytest.mark.parametrize("count", [1])
+@pytest.mark.parametrize(
+    "style", [ConfigurationStyle.LEGACY, ConfigurationStyle.MODERN]
+)
 async def test_on_action_optimistic(
-    hass: HomeAssistant, calls: list[ServiceCall]
+    hass: HomeAssistant, setup_optimistic_switch, calls: list[ServiceCall]
 ) -> None:
     """Test on action in optimistic mode."""
-    assert await async_setup_component(
-        hass,
-        "switch",
-        {
-            "switch": {
-                "platform": "template",
-                "switches": {
-                    "test_template_switch": {
-                        **OPTIMISTIC_SWITCH_CONFIG,
-                    }
-                },
-            }
-        },
-    )
-
-    await hass.async_start()
+    hass.states.async_set(TEST_ENTITY_ID, STATE_OFF)
     await hass.async_block_till_done()
 
-    hass.states.async_set("switch.test_template_switch", STATE_OFF)
-    await hass.async_block_till_done()
-
-    state = hass.states.get("switch.test_template_switch")
+    state = hass.states.get(TEST_ENTITY_ID)
     assert state.state == STATE_OFF
 
     await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_ON,
-        {ATTR_ENTITY_ID: "switch.test_template_switch"},
+        {ATTR_ENTITY_ID: TEST_ENTITY_ID},
         blocking=True,
     )
 
-    state = hass.states.get("switch.test_template_switch")
+    state = hass.states.get(TEST_ENTITY_ID)
     assert state.state == STATE_ON
 
     assert len(calls) == 1
     assert calls[-1].data["action"] == "turn_on"
-    assert calls[-1].data["caller"] == "switch.test_template_switch"
+    assert calls[-1].data["caller"] == TEST_ENTITY_ID
 
 
-async def test_off_action(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
+@pytest.mark.parametrize(
+    ("count", "state_template"), [(1, "{{ states.switch.test_state.state }}")]
+)
+@pytest.mark.parametrize(
+    "style", [ConfigurationStyle.LEGACY, ConfigurationStyle.MODERN]
+)
+async def test_off_action(
+    hass: HomeAssistant, setup_state_switch, calls: list[ServiceCall]
+) -> None:
     """Test off action."""
-    assert await async_setup_component(
-        hass,
-        "switch",
-        {
-            "switch": {
-                "platform": "template",
-                "switches": {
-                    "test_template_switch": {
-                        **OPTIMISTIC_SWITCH_CONFIG,
-                        "value_template": "{{ states.switch.test_state.state }}",
-                    }
-                },
-            }
-        },
-    )
-
-    await hass.async_block_till_done()
-    await hass.async_start()
+    hass.states.async_set(TEST_STATE_ENTITY_ID, STATE_ON)
     await hass.async_block_till_done()
 
-    hass.states.async_set("switch.test_state", STATE_ON)
-    await hass.async_block_till_done()
-
-    state = hass.states.get("switch.test_template_switch")
+    state = hass.states.get(TEST_ENTITY_ID)
     assert state.state == STATE_ON
 
     await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_OFF,
-        {ATTR_ENTITY_ID: "switch.test_template_switch"},
+        {ATTR_ENTITY_ID: TEST_ENTITY_ID},
         blocking=True,
     )
 
     assert len(calls) == 1
     assert calls[-1].data["action"] == "turn_off"
-    assert calls[-1].data["caller"] == "switch.test_template_switch"
+    assert calls[-1].data["caller"] == TEST_ENTITY_ID
 
 
+@pytest.mark.parametrize("count", [1])
+@pytest.mark.parametrize(
+    "style", [ConfigurationStyle.LEGACY, ConfigurationStyle.MODERN]
+)
 async def test_off_action_optimistic(
-    hass: HomeAssistant, calls: list[ServiceCall]
+    hass: HomeAssistant, setup_optimistic_switch, calls: list[ServiceCall]
 ) -> None:
     """Test off action in optimistic mode."""
-    assert await async_setup_component(
-        hass,
-        "switch",
-        {
-            "switch": {
-                "platform": "template",
-                "switches": {
-                    "test_template_switch": {
-                        **OPTIMISTIC_SWITCH_CONFIG,
-                    }
-                },
-            }
-        },
-    )
-
-    await hass.async_start()
+    hass.states.async_set(TEST_ENTITY_ID, STATE_ON)
     await hass.async_block_till_done()
 
-    hass.states.async_set("switch.test_template_switch", STATE_ON)
-    await hass.async_block_till_done()
-
-    state = hass.states.get("switch.test_template_switch")
+    state = hass.states.get(TEST_ENTITY_ID)
     assert state.state == STATE_ON
 
     await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_OFF,
-        {ATTR_ENTITY_ID: "switch.test_template_switch"},
+        {ATTR_ENTITY_ID: TEST_ENTITY_ID},
         blocking=True,
     )
 
-    state = hass.states.get("switch.test_template_switch")
+    state = hass.states.get(TEST_ENTITY_ID)
     assert state.state == STATE_OFF
 
     assert len(calls) == 1
     assert calls[-1].data["action"] == "turn_off"
-    assert calls[-1].data["caller"] == "switch.test_template_switch"
+    assert calls[-1].data["caller"] == TEST_ENTITY_ID
 
 
-async def test_restore_state(hass: HomeAssistant) -> None:
+@pytest.mark.parametrize("count", [1])
+@pytest.mark.parametrize(
+    ("config", "domain"),
+    [
+        (
+            {
+                "switch": {
+                    "platform": "template",
+                    "switches": {
+                        "s1": {
+                            **SWITCH_ACTIONS,
+                        },
+                        "s2": {
+                            **SWITCH_ACTIONS,
+                        },
+                    },
+                }
+            },
+            switch.DOMAIN,
+        ),
+        (
+            {
+                "template": {
+                    "switch": [
+                        {
+                            "name": "s1",
+                            **SWITCH_ACTIONS,
+                        },
+                        {
+                            "name": "s2",
+                            **SWITCH_ACTIONS,
+                        },
+                    ],
+                }
+            },
+            template.DOMAIN,
+        ),
+    ],
+)
+async def test_restore_state(
+    hass: HomeAssistant, count: int, domain: str, config: dict[str, Any]
+) -> None:
     """Test state restoration."""
     mock_restore_cache(
         hass,
@@ -573,23 +734,9 @@ async def test_restore_state(hass: HomeAssistant) -> None:
     hass.set_state(CoreState.starting)
     mock_component(hass, "recorder")
 
-    await async_setup_component(
-        hass,
-        "switch",
-        {
-            "switch": {
-                "platform": "template",
-                "switches": {
-                    "s1": {
-                        **OPTIMISTIC_SWITCH_CONFIG,
-                    },
-                    "s2": {
-                        **OPTIMISTIC_SWITCH_CONFIG,
-                    },
-                },
-            }
-        },
-    )
+    with assert_setup_component(count, domain):
+        await async_setup_component(hass, domain, config)
+
     await hass.async_block_till_done()
 
     state = hass.states.get("switch.s1")
@@ -601,100 +748,157 @@ async def test_restore_state(hass: HomeAssistant) -> None:
     assert state.state == STATE_OFF
 
 
-async def test_available_template_with_entities(hass: HomeAssistant) -> None:
+@pytest.mark.parametrize(
+    ("count", "attribute_template"),
+    [(1, "{{ is_state('switch.test_state', 'on') }}")],
+)
+@pytest.mark.parametrize(
+    ("style", "attribute"),
+    [
+        (ConfigurationStyle.LEGACY, "availability_template"),
+        (ConfigurationStyle.MODERN, "availability"),
+    ],
+)
+async def test_available_template_with_entities(
+    hass: HomeAssistant, setup_single_attribute_switch
+) -> None:
     """Test availability templates with values from other entities."""
-    await setup.async_setup_component(
-        hass,
-        "switch",
-        {
-            "switch": {
-                "platform": "template",
-                "switches": {
-                    "test_template_switch": {
-                        **OPTIMISTIC_SWITCH_CONFIG,
-                        "value_template": "{{ 1 == 1 }}",
-                        "availability_template": (
-                            "{{ is_state('availability_state.state', 'on') }}"
-                        ),
-                    }
-                },
-            }
-        },
-    )
-
-    await hass.async_block_till_done()
-    await hass.async_start()
+    hass.states.async_set(TEST_STATE_ENTITY_ID, STATE_ON)
     await hass.async_block_till_done()
 
-    hass.states.async_set("availability_state.state", STATE_ON)
+    assert hass.states.get(TEST_ENTITY_ID).state != STATE_UNAVAILABLE
+
+    hass.states.async_set(TEST_STATE_ENTITY_ID, STATE_OFF)
     await hass.async_block_till_done()
 
-    assert hass.states.get("switch.test_template_switch").state != STATE_UNAVAILABLE
-
-    hass.states.async_set("availability_state.state", STATE_OFF)
-    await hass.async_block_till_done()
-
-    assert hass.states.get("switch.test_template_switch").state == STATE_UNAVAILABLE
+    assert hass.states.get(TEST_ENTITY_ID).state == STATE_UNAVAILABLE
 
 
+@pytest.mark.parametrize("count", [1])
+@pytest.mark.parametrize(
+    ("config", "domain"),
+    [
+        (
+            {
+                "switch": {
+                    "platform": "template",
+                    "switches": {
+                        TEST_OBJECT_ID: {
+                            **SWITCH_ACTIONS,
+                            "value_template": "{{ true }}",
+                            "availability_template": "{{ x - 12 }}",
+                        }
+                    },
+                }
+            },
+            switch.DOMAIN,
+        ),
+        (
+            {
+                "template": {
+                    "switch": {
+                        **NAMED_SWITCH_ACTIONS,
+                        "state": "{{ true }}",
+                        "availability": "{{ x - 12 }}",
+                    },
+                }
+            },
+            template.DOMAIN,
+        ),
+    ],
+)
 async def test_invalid_availability_template_keeps_component_available(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+    hass: HomeAssistant,
+    count: int,
+    config: dict[str, Any],
+    domain: str,
+    caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test that an invalid availability keeps the device available."""
-    await setup.async_setup_component(
-        hass,
-        "switch",
-        {
-            "switch": {
-                "platform": "template",
-                "switches": {
-                    "test_template_switch": {
-                        **OPTIMISTIC_SWITCH_CONFIG,
-                        "value_template": "{{ true }}",
-                        "availability_template": "{{ x - 12 }}",
-                    }
-                },
-            }
-        },
-    )
+    with assert_setup_component(count, domain):
+        await async_setup_component(hass, domain, config)
 
     await hass.async_block_till_done()
     await hass.async_start()
     await hass.async_block_till_done()
 
-    assert hass.states.get("switch.test_template_switch").state != STATE_UNAVAILABLE
+    assert hass.states.get(TEST_ENTITY_ID).state != STATE_UNAVAILABLE
     assert "UndefinedError: 'x' is undefined" in caplog.text
 
 
-async def test_unique_id(hass: HomeAssistant) -> None:
-    """Test unique_id option only creates one switch per id."""
-    await setup.async_setup_component(
-        hass,
-        "switch",
-        {
-            "switch": {
-                "platform": "template",
-                "switches": {
-                    "test_template_switch_01": {
-                        **OPTIMISTIC_SWITCH_CONFIG,
-                        "unique_id": "not-so-unique-anymore",
-                        "value_template": "{{ true }}",
-                    },
-                    "test_template_switch_02": {
-                        **OPTIMISTIC_SWITCH_CONFIG,
-                        "unique_id": "not-so-unique-anymore",
-                        "value_template": "{{ false }}",
-                    },
+@pytest.mark.parametrize("count", [1])
+@pytest.mark.parametrize(
+    ("switch_config", "style"),
+    [
+        (
+            {
+                "test_template_switch_01": UNIQUE_ID_CONFIG,
+                "test_template_switch_02": UNIQUE_ID_CONFIG,
+            },
+            ConfigurationStyle.LEGACY,
+        ),
+        (
+            [
+                {
+                    "name": "test_template_switch_01",
+                    **UNIQUE_ID_CONFIG,
                 },
-            }
-        },
-    )
+                {
+                    "name": "test_template_switch_02",
+                    **UNIQUE_ID_CONFIG,
+                },
+            ],
+            ConfigurationStyle.MODERN,
+        ),
+    ],
+)
+async def test_unique_id(hass: HomeAssistant, setup_switch) -> None:
+    """Test unique_id option only creates one switch per id."""
+    assert len(hass.states.async_all("switch")) == 1
+
+
+async def test_nested_unique_id(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test a template unique_id propagates to switch unique_ids."""
+    with assert_setup_component(1, template.DOMAIN):
+        assert await async_setup_component(
+            hass,
+            template.DOMAIN,
+            {
+                "template": {
+                    "unique_id": "x",
+                    "switch": [
+                        {
+                            **SWITCH_ACTIONS,
+                            "name": "test_a",
+                            "unique_id": "a",
+                            "state": "{{ true }}",
+                        },
+                        {
+                            **SWITCH_ACTIONS,
+                            "name": "test_b",
+                            "unique_id": "b",
+                            "state": "{{ true }}",
+                        },
+                    ],
+                },
+            },
+        )
 
     await hass.async_block_till_done()
     await hass.async_start()
     await hass.async_block_till_done()
 
-    assert len(hass.states.async_all("switch")) == 1
+    assert len(hass.states.async_all("switch")) == 2
+
+    entry = entity_registry.async_get("switch.test_a")
+    assert entry
+    assert entry.unique_id == "x-a"
+
+    entry = entity_registry.async_get("switch.test_b")
+    assert entry
+    assert entry.unique_id == "x-b"
 
 
 async def test_device_id(
@@ -720,7 +924,7 @@ async def test_device_id(
         domain=template.DOMAIN,
         options={
             "name": "My template",
-            "value_template": "{{ true }}",
+            "state": "{{ true }}",
             "template_type": "switch",
             "device_id": device_entry.id,
         },
diff --git a/tests/components/template/test_template_entity.py b/tests/components/template/test_template_entity.py
index c09a09750fe..d66fc2710c9 100644
--- a/tests/components/template/test_template_entity.py
+++ b/tests/components/template/test_template_entity.py
@@ -9,7 +9,7 @@ from homeassistant.helpers import template
 
 async def test_template_entity_requires_hass_set(hass: HomeAssistant) -> None:
     """Test template entity requires hass to be set before accepting templates."""
-    entity = template_entity.TemplateEntity(hass)
+    entity = template_entity.TemplateEntity(None)
 
     with pytest.raises(ValueError, match="^hass cannot be None"):
         entity.add_template_attribute("_hello", template.Template("Hello"))
diff --git a/tests/components/template/test_trigger.py b/tests/components/template/test_trigger.py
index a131f5f606b..49b89b61d34 100644
--- a/tests/components/template/test_trigger.py
+++ b/tests/components/template/test_trigger.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Context, HomeAssistant, ServiceCall, callback
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed, mock_component
 
diff --git a/tests/components/template/test_trigger_entity.py b/tests/components/template/test_trigger_entity.py
new file mode 100644
index 00000000000..99aa2d65df9
--- /dev/null
+++ b/tests/components/template/test_trigger_entity.py
@@ -0,0 +1,13 @@
+"""Test trigger template entity."""
+
+from homeassistant.components.template import trigger_entity
+from homeassistant.components.template.coordinator import TriggerUpdateCoordinator
+from homeassistant.core import HomeAssistant
+
+
+async def test_reference_blueprints_is_none(hass: HomeAssistant) -> None:
+    """Test template entity requires hass to be set before accepting templates."""
+    coordinator = TriggerUpdateCoordinator(hass, {})
+    entity = trigger_entity.TriggerEntity(hass, coordinator, {})
+
+    assert entity.referenced_blueprint is None
diff --git a/tests/components/tesla_fleet/conftest.py b/tests/components/tesla_fleet/conftest.py
index 06d2b54c936..10b01caca96 100644
--- a/tests/components/tesla_fleet/conftest.py
+++ b/tests/components/tesla_fleet/conftest.py
@@ -1,4 +1,4 @@
-"""Fixtures for Tessie."""
+"""Fixtures for Tesla Fleet."""
 
 from __future__ import annotations
 
@@ -113,7 +113,7 @@ def mock_products() -> Generator[AsyncMock]:
 def mock_vehicle_state() -> Generator[AsyncMock]:
     """Mock Tesla Fleet API Vehicle Specific vehicle method."""
     with patch(
-        "homeassistant.components.tesla_fleet.VehicleSpecific.vehicle",
+        "tesla_fleet_api.tesla.VehicleFleet.vehicle",
         return_value=VEHICLE_ONLINE,
     ) as mock_vehicle:
         yield mock_vehicle
@@ -123,7 +123,7 @@ def mock_vehicle_state() -> Generator[AsyncMock]:
 def mock_vehicle_data() -> Generator[AsyncMock]:
     """Mock Tesla Fleet API Vehicle Specific vehicle_data method."""
     with patch(
-        "homeassistant.components.tesla_fleet.VehicleSpecific.vehicle_data",
+        "tesla_fleet_api.tesla.VehicleFleet.vehicle_data",
         return_value=VEHICLE_DATA,
     ) as mock_vehicle_data:
         yield mock_vehicle_data
@@ -133,7 +133,7 @@ def mock_vehicle_data() -> Generator[AsyncMock]:
 def mock_wake_up() -> Generator[AsyncMock]:
     """Mock Tesla Fleet API Vehicle Specific wake_up method."""
     with patch(
-        "homeassistant.components.tesla_fleet.VehicleSpecific.wake_up",
+        "tesla_fleet_api.tesla.VehicleFleet.wake_up",
         return_value=VEHICLE_ONLINE,
     ) as mock_wake_up:
         yield mock_wake_up
@@ -143,7 +143,7 @@ def mock_wake_up() -> Generator[AsyncMock]:
 def mock_live_status() -> Generator[AsyncMock]:
     """Mock Tesla Fleet API Energy Specific live_status method."""
     with patch(
-        "homeassistant.components.tesla_fleet.EnergySpecific.live_status",
+        "tesla_fleet_api.tesla.EnergySite.live_status",
         side_effect=lambda: deepcopy(LIVE_STATUS),
     ) as mock_live_status:
         yield mock_live_status
@@ -153,7 +153,7 @@ def mock_live_status() -> Generator[AsyncMock]:
 def mock_site_info() -> Generator[AsyncMock]:
     """Mock Tesla Fleet API Energy Specific site_info method."""
     with patch(
-        "homeassistant.components.tesla_fleet.EnergySpecific.site_info",
+        "tesla_fleet_api.tesla.EnergySite.site_info",
         side_effect=lambda: deepcopy(SITE_INFO),
     ) as mock_live_status:
         yield mock_live_status
@@ -182,7 +182,7 @@ def mock_request():
 def mock_energy_history():
     """Mock Teslemetry Energy Specific site_info method."""
     with patch(
-        "homeassistant.components.teslemetry.EnergySpecific.energy_history",
+        "tesla_fleet_api.tesla.EnergySite.energy_history",
         return_value=ENERGY_HISTORY,
     ) as mock_live_status:
         yield mock_live_status
@@ -192,7 +192,7 @@ def mock_energy_history():
 def mock_signed_command() -> Generator[AsyncMock]:
     """Mock Tesla Fleet Api signed_command method."""
     with patch(
-        "homeassistant.components.tesla_fleet.VehicleSigned.signed_command",
+        "tesla_fleet_api.tesla.VehicleSigned.signed_command",
         return_value=COMMAND_OK,
     ) as mock_signed_command:
         yield mock_signed_command
diff --git a/tests/components/tesla_fleet/snapshots/test_binary_sensor.ambr b/tests/components/tesla_fleet/snapshots/test_binary_sensor.ambr
index 479d647e1c7..4e34f586280 100644
--- a/tests/components/tesla_fleet/snapshots/test_binary_sensor.ambr
+++ b/tests/components/tesla_fleet/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -190,6 +194,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -237,6 +242,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -284,6 +290,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -331,6 +338,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -377,6 +385,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -424,6 +433,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -471,6 +481,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -518,6 +529,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -565,6 +577,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -612,6 +625,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -658,6 +672,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -704,6 +719,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -751,6 +767,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -798,6 +815,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -845,6 +863,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -892,6 +911,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -938,6 +958,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -985,6 +1006,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1032,6 +1054,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1079,6 +1102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1126,6 +1150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1173,6 +1198,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1219,6 +1245,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tesla_fleet/snapshots/test_button.ambr b/tests/components/tesla_fleet/snapshots/test_button.ambr
index 8b5270d4852..145b10112b3 100644
--- a/tests/components/tesla_fleet/snapshots/test_button.ambr
+++ b/tests/components/tesla_fleet/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -190,6 +194,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +241,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tesla_fleet/snapshots/test_climate.ambr b/tests/components/tesla_fleet/snapshots/test_climate.ambr
index 696f8c37f08..f3b36730c3f 100644
--- a/tests/components/tesla_fleet/snapshots/test_climate.ambr
+++ b/tests/components/tesla_fleet/snapshots/test_climate.ambr
@@ -15,6 +15,7 @@
       'target_temp_step': 5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -85,6 +86,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -156,6 +158,7 @@
       'target_temp_step': 5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -225,6 +228,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -296,6 +300,7 @@
       'target_temp_step': 5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -365,6 +370,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tesla_fleet/snapshots/test_cover.ambr b/tests/components/tesla_fleet/snapshots/test_cover.ambr
index dbdb003d802..ed6969262f1 100644
--- a/tests/components/tesla_fleet/snapshots/test_cover.ambr
+++ b/tests/components/tesla_fleet/snapshots/test_cover.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -102,6 +104,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -198,6 +202,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -246,6 +251,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -294,6 +300,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -342,6 +349,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -390,6 +398,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -438,6 +447,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -486,6 +496,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -534,6 +545,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -582,6 +594,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -630,6 +643,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -678,6 +692,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tesla_fleet/snapshots/test_device_tracker.ambr b/tests/components/tesla_fleet/snapshots/test_device_tracker.ambr
index 02ad4b01002..dc142c4ffeb 100644
--- a/tests/components/tesla_fleet/snapshots/test_device_tracker.ambr
+++ b/tests/components/tesla_fleet/snapshots/test_device_tracker.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -56,6 +57,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tesla_fleet/snapshots/test_init.ambr b/tests/components/tesla_fleet/snapshots/test_init.ambr
index e9828db9f1b..c482d33de86 100644
--- a/tests/components/tesla_fleet/snapshots/test_init.ambr
+++ b/tests/components/tesla_fleet/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -35,6 +36,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -67,6 +69,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -99,6 +102,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/tesla_fleet/snapshots/test_lock.ambr b/tests/components/tesla_fleet/snapshots/test_lock.ambr
index 3384bb0eb97..e98ad09caad 100644
--- a/tests/components/tesla_fleet/snapshots/test_lock.ambr
+++ b/tests/components/tesla_fleet/snapshots/test_lock.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tesla_fleet/snapshots/test_media_player.ambr b/tests/components/tesla_fleet/snapshots/test_media_player.ambr
index cc3018364a5..77c46faedd7 100644
--- a/tests/components/tesla_fleet/snapshots/test_media_player.ambr
+++ b/tests/components/tesla_fleet/snapshots/test_media_player.ambr
@@ -7,6 +7,7 @@
     'capabilities': dict({
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -85,6 +86,7 @@
     'capabilities': dict({
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tesla_fleet/snapshots/test_number.ambr b/tests/components/tesla_fleet/snapshots/test_number.ambr
index 00dd67015fe..1981544a024 100644
--- a/tests/components/tesla_fleet/snapshots/test_number.ambr
+++ b/tests/components/tesla_fleet/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -69,6 +70,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -127,6 +129,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -184,6 +187,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tesla_fleet/snapshots/test_select.ambr b/tests/components/tesla_fleet/snapshots/test_select.ambr
index f29ce841113..171b52decf1 100644
--- a/tests/components/tesla_fleet/snapshots/test_select.ambr
+++ b/tests/components/tesla_fleet/snapshots/test_select.ambr
@@ -12,6 +12,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -69,6 +70,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -127,6 +129,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -186,6 +189,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -245,6 +249,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -304,6 +309,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -363,6 +369,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -422,6 +429,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -481,6 +489,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -539,6 +548,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tesla_fleet/snapshots/test_sensor.ambr b/tests/components/tesla_fleet/snapshots/test_sensor.ambr
index d6b646d7794..f7349c9e2d8 100644
--- a/tests/components/tesla_fleet/snapshots/test_sensor.ambr
+++ b/tests/components/tesla_fleet/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -81,6 +82,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -154,6 +156,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -227,6 +230,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -300,6 +304,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -373,6 +378,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -446,6 +452,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -519,6 +526,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -592,6 +600,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -665,6 +674,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -738,6 +748,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -811,6 +822,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -884,6 +896,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -957,6 +970,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1030,6 +1044,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1103,6 +1118,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1176,6 +1192,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1249,6 +1266,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1322,6 +1340,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1395,6 +1414,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1468,6 +1488,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1541,6 +1562,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1614,6 +1636,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1693,6 +1716,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1770,6 +1794,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1843,6 +1868,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1916,6 +1942,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1986,6 +2013,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2059,6 +2087,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2132,6 +2161,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2205,6 +2235,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2276,6 +2307,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2335,6 +2367,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2400,6 +2433,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2467,6 +2501,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2538,6 +2573,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2599,6 +2635,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2669,6 +2706,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2739,6 +2777,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2806,6 +2845,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2873,6 +2913,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2947,6 +2988,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3026,6 +3068,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3096,6 +3139,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3166,6 +3210,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3237,6 +3282,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3298,6 +3344,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3371,6 +3418,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3441,6 +3489,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3514,6 +3563,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3584,6 +3634,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3654,6 +3705,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3726,6 +3778,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3801,6 +3854,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3871,6 +3925,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3936,6 +3991,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3997,6 +4053,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4060,6 +4117,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4133,6 +4191,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4206,6 +4265,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4279,6 +4339,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4352,6 +4413,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4419,6 +4481,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4484,6 +4547,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4543,6 +4607,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4604,6 +4669,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4677,6 +4743,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4748,6 +4815,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4807,6 +4875,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4866,6 +4935,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4925,6 +4995,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tesla_fleet/snapshots/test_switch.ambr b/tests/components/tesla_fleet/snapshots/test_switch.ambr
index 2d69a7d314a..2ea3bcc5ee5 100644
--- a/tests/components/tesla_fleet/snapshots/test_switch.ambr
+++ b/tests/components/tesla_fleet/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -194,6 +198,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -241,6 +246,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -262,7 +268,7 @@
     'platform': 'tesla_fleet',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': 'charge_state_user_charge_enable_request',
+    'translation_key': 'charge_state_charging_state',
     'unique_id': 'LRWXF7EK4KC700000-charge_state_user_charge_enable_request',
     'unit_of_measurement': None,
   })
@@ -278,7 +284,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'on',
+    'state': 'off',
   })
 # ---
 # name: test_switch[switch.test_defrost-entry]
@@ -288,6 +294,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -335,6 +342,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -456,7 +464,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'on',
+    'state': 'off',
   })
 # ---
 # name: test_switch_alt[switch.test_defrost-statealt]
diff --git a/tests/components/tesla_fleet/test_button.py b/tests/components/tesla_fleet/test_button.py
index ef1cfd90357..d43f7448379 100644
--- a/tests/components/tesla_fleet/test_button.py
+++ b/tests/components/tesla_fleet/test_button.py
@@ -56,7 +56,7 @@ async def test_press(
     await setup_platform(hass, normal_config_entry, [Platform.BUTTON])
 
     with patch(
-        f"homeassistant.components.tesla_fleet.VehicleSpecific.{func}",
+        f"tesla_fleet_api.tesla.VehicleFleet.{func}",
         return_value=COMMAND_OK,
     ) as command:
         await hass.services.async_call(
@@ -85,7 +85,7 @@ async def test_press_signing_error(
     with (
         patch("homeassistant.components.tesla_fleet.TeslaFleetApi.get_private_key"),
         patch(
-            "homeassistant.components.tesla_fleet.VehicleSigned.flash_lights",
+            "tesla_fleet_api.tesla.VehicleSigned.flash_lights",
             side_effect=NotOnWhitelistFault,
         ),
         pytest.raises(HomeAssistantError) as error,
diff --git a/tests/components/tesla_fleet/test_climate.py b/tests/components/tesla_fleet/test_climate.py
index b45e5259a5c..fae79c795c2 100644
--- a/tests/components/tesla_fleet/test_climate.py
+++ b/tests/components/tesla_fleet/test_climate.py
@@ -257,7 +257,7 @@ async def test_invalid_error(
 
     with (
         patch(
-            "homeassistant.components.tesla_fleet.VehicleSpecific.auto_conditioning_start",
+            "tesla_fleet_api.tesla.VehicleFleet.auto_conditioning_start",
             side_effect=InvalidCommand,
         ) as mock_on,
         pytest.raises(
@@ -285,7 +285,7 @@ async def test_errors(
 
     with (
         patch(
-            "homeassistant.components.tesla_fleet.VehicleSpecific.auto_conditioning_start",
+            "tesla_fleet_api.tesla.VehicleFleet.auto_conditioning_start",
             return_value=response,
         ) as mock_on,
         pytest.raises(HomeAssistantError),
@@ -308,7 +308,7 @@ async def test_ignored_error(
     await setup_platform(hass, normal_config_entry, [Platform.CLIMATE])
     entity_id = "climate.test_climate"
     with patch(
-        "homeassistant.components.tesla_fleet.VehicleSpecific.auto_conditioning_start",
+        "tesla_fleet_api.tesla.VehicleFleet.auto_conditioning_start",
         return_value=COMMAND_IGNORED_REASON,
     ) as mock_on:
         await hass.services.async_call(
diff --git a/tests/components/tesla_fleet/test_cover.py b/tests/components/tesla_fleet/test_cover.py
index ac5307b2fdd..15d14f34a87 100644
--- a/tests/components/tesla_fleet/test_cover.py
+++ b/tests/components/tesla_fleet/test_cover.py
@@ -89,7 +89,7 @@ async def test_cover_services(
     # Vent Windows
     entity_id = "cover.test_windows"
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.window_control",
+        "tesla_fleet_api.tesla.VehicleFleet.window_control",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -118,7 +118,7 @@ async def test_cover_services(
     # Charge Port Door
     entity_id = "cover.test_charge_port_door"
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.charge_port_door_open",
+        "tesla_fleet_api.tesla.VehicleFleet.charge_port_door_open",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -133,7 +133,7 @@ async def test_cover_services(
         assert state.state == CoverState.OPEN
 
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.charge_port_door_close",
+        "tesla_fleet_api.tesla.VehicleFleet.charge_port_door_close",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -150,7 +150,7 @@ async def test_cover_services(
     # Frunk
     entity_id = "cover.test_frunk"
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.actuate_trunk",
+        "tesla_fleet_api.tesla.VehicleFleet.actuate_trunk",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -167,7 +167,7 @@ async def test_cover_services(
     # Trunk
     entity_id = "cover.test_trunk"
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.actuate_trunk",
+        "tesla_fleet_api.tesla.VehicleFleet.actuate_trunk",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -196,7 +196,7 @@ async def test_cover_services(
     # Sunroof
     entity_id = "cover.test_sunroof"
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.sun_roof_control",
+        "tesla_fleet_api.tesla.VehicleFleet.sun_roof_control",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
diff --git a/tests/components/tesla_fleet/test_init.py b/tests/components/tesla_fleet/test_init.py
index 2162226efb0..ff103ce03c2 100644
--- a/tests/components/tesla_fleet/test_init.py
+++ b/tests/components/tesla_fleet/test_init.py
@@ -156,14 +156,15 @@ async def test_vehicle_refresh_offline(
     mock_vehicle_state.reset_mock()
     mock_vehicle_data.reset_mock()
 
-    # Then the vehicle goes offline
+    # Then the vehicle goes offline despite saying its online
     mock_vehicle_data.side_effect = VehicleOffline
     freezer.tick(VEHICLE_INTERVAL)
     async_fire_time_changed(hass)
     await hass.async_block_till_done()
 
-    mock_vehicle_state.assert_not_called()
+    mock_vehicle_state.assert_called_once()
     mock_vehicle_data.assert_called_once()
+    mock_vehicle_state.reset_mock()
     mock_vehicle_data.reset_mock()
 
     # And stays offline
@@ -212,20 +213,15 @@ async def test_vehicle_refresh_ratelimited(
 
     assert (state := hass.states.get("sensor.test_battery_level"))
     assert state.state == "unknown"
-    assert mock_vehicle_data.call_count == 1
+
+    mock_vehicle_data.reset_mock()
 
     freezer.tick(VEHICLE_INTERVAL)
     async_fire_time_changed(hass)
     await hass.async_block_till_done()
 
-    # Should not call for another 10 seconds
-    assert mock_vehicle_data.call_count == 1
-
-    freezer.tick(VEHICLE_INTERVAL)
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-
-    assert mock_vehicle_data.call_count == 2
+    assert (state := hass.states.get("sensor.test_battery_level"))
+    assert state.state == "unknown"
 
 
 async def test_vehicle_sleep(
diff --git a/tests/components/tesla_fleet/test_lock.py b/tests/components/tesla_fleet/test_lock.py
index 00b77aefcaf..ac9a7b49b55 100644
--- a/tests/components/tesla_fleet/test_lock.py
+++ b/tests/components/tesla_fleet/test_lock.py
@@ -59,7 +59,7 @@ async def test_lock_services(
     entity_id = "lock.test_lock"
 
     with patch(
-        "homeassistant.components.tesla_fleet.VehicleSpecific.door_lock",
+        "tesla_fleet_api.tesla.VehicleFleet.door_lock",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -73,7 +73,7 @@ async def test_lock_services(
         call.assert_called_once()
 
     with patch(
-        "homeassistant.components.tesla_fleet.VehicleSpecific.door_unlock",
+        "tesla_fleet_api.tesla.VehicleFleet.door_unlock",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -97,7 +97,7 @@ async def test_lock_services(
         )
 
     with patch(
-        "homeassistant.components.tesla_fleet.VehicleSpecific.charge_port_door_open",
+        "tesla_fleet_api.tesla.VehicleFleet.charge_port_door_open",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
diff --git a/tests/components/tesla_fleet/test_media_player.py b/tests/components/tesla_fleet/test_media_player.py
index 4c833e7499f..b2900d96c80 100644
--- a/tests/components/tesla_fleet/test_media_player.py
+++ b/tests/components/tesla_fleet/test_media_player.py
@@ -88,7 +88,7 @@ async def test_media_player_services(
     entity_id = "media_player.test_media_player"
 
     with patch(
-        "homeassistant.components.tesla_fleet.VehicleSpecific.adjust_volume",
+        "tesla_fleet_api.tesla.VehicleFleet.adjust_volume",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -102,7 +102,7 @@ async def test_media_player_services(
         call.assert_called_once()
 
     with patch(
-        "homeassistant.components.tesla_fleet.VehicleSpecific.media_toggle_playback",
+        "tesla_fleet_api.tesla.VehicleFleet.media_toggle_playback",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -117,7 +117,7 @@ async def test_media_player_services(
 
     # This test will fail without the previous call to pause playback
     with patch(
-        "homeassistant.components.tesla_fleet.VehicleSpecific.media_toggle_playback",
+        "tesla_fleet_api.tesla.VehicleFleet.media_toggle_playback",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -131,7 +131,7 @@ async def test_media_player_services(
         call.assert_called_once()
 
     with patch(
-        "homeassistant.components.tesla_fleet.VehicleSpecific.media_next_track",
+        "tesla_fleet_api.tesla.VehicleFleet.media_next_track",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -144,7 +144,7 @@ async def test_media_player_services(
         call.assert_called_once()
 
     with patch(
-        "homeassistant.components.tesla_fleet.VehicleSpecific.media_prev_track",
+        "tesla_fleet_api.tesla.VehicleFleet.media_prev_track",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
diff --git a/tests/components/tesla_fleet/test_number.py b/tests/components/tesla_fleet/test_number.py
index 8551a99ee29..4ade98852c8 100644
--- a/tests/components/tesla_fleet/test_number.py
+++ b/tests/components/tesla_fleet/test_number.py
@@ -57,7 +57,7 @@ async def test_number_services(
 
     entity_id = "number.test_charge_current"
     with patch(
-        "homeassistant.components.tesla_fleet.VehicleSpecific.set_charging_amps",
+        "tesla_fleet_api.tesla.VehicleFleet.set_charging_amps",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -72,7 +72,7 @@ async def test_number_services(
 
     entity_id = "number.test_charge_limit"
     with patch(
-        "homeassistant.components.tesla_fleet.VehicleSpecific.set_charge_limit",
+        "tesla_fleet_api.tesla.VehicleFleet.set_charge_limit",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -87,7 +87,7 @@ async def test_number_services(
 
     entity_id = "number.energy_site_backup_reserve"
     with patch(
-        "homeassistant.components.tesla_fleet.EnergySpecific.backup",
+        "tesla_fleet_api.tesla.EnergySite.backup",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -105,7 +105,7 @@ async def test_number_services(
 
     entity_id = "number.energy_site_off_grid_reserve"
     with patch(
-        "homeassistant.components.tesla_fleet.EnergySpecific.off_grid_vehicle_charging_reserve",
+        "tesla_fleet_api.tesla.EnergySite.off_grid_vehicle_charging_reserve",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
diff --git a/tests/components/tesla_fleet/test_select.py b/tests/components/tesla_fleet/test_select.py
index 902b28ddb7a..f06d67041c9 100644
--- a/tests/components/tesla_fleet/test_select.py
+++ b/tests/components/tesla_fleet/test_select.py
@@ -61,11 +61,11 @@ async def test_select_services(
     entity_id = "select.test_seat_heater_front_left"
     with (
         patch(
-            "homeassistant.components.tesla_fleet.VehicleSpecific.remote_seat_heater_request",
+            "tesla_fleet_api.tesla.VehicleFleet.remote_seat_heater_request",
             return_value=COMMAND_OK,
         ) as remote_seat_heater_request,
         patch(
-            "homeassistant.components.tesla_fleet.VehicleSpecific.auto_conditioning_start",
+            "tesla_fleet_api.tesla.VehicleFleet.auto_conditioning_start",
             return_value=COMMAND_OK,
         ) as auto_conditioning_start,
     ):
@@ -83,11 +83,11 @@ async def test_select_services(
     entity_id = "select.test_steering_wheel_heater"
     with (
         patch(
-            "homeassistant.components.tesla_fleet.VehicleSpecific.remote_steering_wheel_heat_level_request",
+            "tesla_fleet_api.tesla.VehicleFleet.remote_steering_wheel_heat_level_request",
             return_value=COMMAND_OK,
         ) as remote_steering_wheel_heat_level_request,
         patch(
-            "homeassistant.components.tesla_fleet.VehicleSpecific.auto_conditioning_start",
+            "tesla_fleet_api.tesla.VehicleFleet.auto_conditioning_start",
             return_value=COMMAND_OK,
         ) as auto_conditioning_start,
     ):
@@ -104,7 +104,7 @@ async def test_select_services(
 
     entity_id = "select.energy_site_operation_mode"
     with patch(
-        "homeassistant.components.tesla_fleet.EnergySpecific.operation",
+        "tesla_fleet_api.tesla.EnergySite.operation",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -122,7 +122,7 @@ async def test_select_services(
 
     entity_id = "select.energy_site_allow_export"
     with patch(
-        "homeassistant.components.tesla_fleet.EnergySpecific.grid_import_export",
+        "tesla_fleet_api.tesla.EnergySite.grid_import_export",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
diff --git a/tests/components/tesla_fleet/test_switch.py b/tests/components/tesla_fleet/test_switch.py
index fba4fc05cc4..022c3a0ab18 100644
--- a/tests/components/tesla_fleet/test_switch.py
+++ b/tests/components/tesla_fleet/test_switch.py
@@ -71,41 +71,41 @@ async def test_switch_offline(
 @pytest.mark.parametrize(
     ("name", "on", "off"),
     [
-        ("test_charge", "VehicleSpecific.charge_start", "VehicleSpecific.charge_stop"),
+        ("test_charge", "VehicleFleet.charge_start", "VehicleFleet.charge_stop"),
         (
             "test_auto_seat_climate_left",
-            "VehicleSpecific.remote_auto_seat_climate_request",
-            "VehicleSpecific.remote_auto_seat_climate_request",
+            "VehicleFleet.remote_auto_seat_climate_request",
+            "VehicleFleet.remote_auto_seat_climate_request",
         ),
         (
             "test_auto_seat_climate_right",
-            "VehicleSpecific.remote_auto_seat_climate_request",
-            "VehicleSpecific.remote_auto_seat_climate_request",
+            "VehicleFleet.remote_auto_seat_climate_request",
+            "VehicleFleet.remote_auto_seat_climate_request",
         ),
         (
             "test_auto_steering_wheel_heater",
-            "VehicleSpecific.remote_auto_steering_wheel_heat_climate_request",
-            "VehicleSpecific.remote_auto_steering_wheel_heat_climate_request",
+            "VehicleFleet.remote_auto_steering_wheel_heat_climate_request",
+            "VehicleFleet.remote_auto_steering_wheel_heat_climate_request",
         ),
         (
             "test_defrost",
-            "VehicleSpecific.set_preconditioning_max",
-            "VehicleSpecific.set_preconditioning_max",
+            "VehicleFleet.set_preconditioning_max",
+            "VehicleFleet.set_preconditioning_max",
         ),
         (
             "energy_site_storm_watch",
-            "EnergySpecific.storm_mode",
-            "EnergySpecific.storm_mode",
+            "EnergySite.storm_mode",
+            "EnergySite.storm_mode",
         ),
         (
             "energy_site_allow_charging_from_grid",
-            "EnergySpecific.grid_import_export",
-            "EnergySpecific.grid_import_export",
+            "EnergySite.grid_import_export",
+            "EnergySite.grid_import_export",
         ),
         (
             "test_sentry_mode",
-            "VehicleSpecific.set_sentry_mode",
-            "VehicleSpecific.set_sentry_mode",
+            "VehicleFleet.set_sentry_mode",
+            "VehicleFleet.set_sentry_mode",
         ),
     ],
 )
@@ -122,7 +122,7 @@ async def test_switch_services(
 
     entity_id = f"switch.{name}"
     with patch(
-        f"homeassistant.components.tesla_fleet.{on}",
+        f"tesla_fleet_api.tesla.{on}",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -136,7 +136,7 @@ async def test_switch_services(
         call.assert_called_once()
 
     with patch(
-        f"homeassistant.components.tesla_fleet.{off}",
+        f"tesla_fleet_api.tesla.{off}",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
diff --git a/tests/components/tesla_wall_connector/conftest.py b/tests/components/tesla_wall_connector/conftest.py
index 9533b7e691e..e4499d6e308 100644
--- a/tests/components/tesla_wall_connector/conftest.py
+++ b/tests/components/tesla_wall_connector/conftest.py
@@ -14,7 +14,7 @@ from homeassistant.components.tesla_wall_connector.const import (
 )
 from homeassistant.const import CONF_HOST, CONF_SCAN_INTERVAL
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/teslemetry/__init__.py b/tests/components/teslemetry/__init__.py
index b6b9df7eb4b..59727926f03 100644
--- a/tests/components/teslemetry/__init__.py
+++ b/tests/components/teslemetry/__init__.py
@@ -14,7 +14,9 @@ from .const import CONFIG
 from tests.common import MockConfigEntry
 
 
-async def setup_platform(hass: HomeAssistant, platforms: list[Platform] | None = None):
+async def setup_platform(
+    hass: HomeAssistant, platforms: list[Platform] | None = None
+) -> MockConfigEntry:
     """Set up the Teslemetry platform."""
 
     mock_entry = MockConfigEntry(
@@ -32,6 +34,19 @@ async def setup_platform(hass: HomeAssistant, platforms: list[Platform] | None =
     return mock_entry
 
 
+async def reload_platform(
+    hass: HomeAssistant, entry: MockConfigEntry, platforms: list[Platform] | None = None
+):
+    """Reload the Teslemetry platform."""
+
+    if platforms is None:
+        await hass.config_entries.async_reload(entry.entry_id)
+    else:
+        with patch("homeassistant.components.teslemetry.PLATFORMS", platforms):
+            await hass.config_entries.async_reload(entry.entry_id)
+    await hass.async_block_till_done()
+
+
 def assert_entities(
     hass: HomeAssistant,
     entry_id: str,
diff --git a/tests/components/teslemetry/conftest.py b/tests/components/teslemetry/conftest.py
index e89bab9eff1..0152543e512 100644
--- a/tests/components/teslemetry/conftest.py
+++ b/tests/components/teslemetry/conftest.py
@@ -25,7 +25,7 @@ from .const import (
 def mock_metadata():
     """Mock Tesla Fleet Api metadata method."""
     with patch(
-        "homeassistant.components.teslemetry.Teslemetry.metadata", return_value=METADATA
+        "tesla_fleet_api.teslemetry.Teslemetry.metadata", return_value=METADATA
     ) as mock_products:
         yield mock_products
 
@@ -34,7 +34,7 @@ def mock_metadata():
 def mock_products():
     """Mock Tesla Fleet Api products method."""
     with patch(
-        "homeassistant.components.teslemetry.Teslemetry.products", return_value=PRODUCTS
+        "tesla_fleet_api.teslemetry.Teslemetry.products", return_value=PRODUCTS
     ) as mock_products:
         yield mock_products
 
@@ -43,7 +43,7 @@ def mock_products():
 def mock_vehicle_data() -> Generator[AsyncMock]:
     """Mock Tesla Fleet API Vehicle Specific vehicle_data method."""
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.vehicle_data",
+        "tesla_fleet_api.teslemetry.Vehicle.vehicle_data",
         return_value=VEHICLE_DATA,
     ) as mock_vehicle_data:
         yield mock_vehicle_data
@@ -53,7 +53,7 @@ def mock_vehicle_data() -> Generator[AsyncMock]:
 def mock_legacy():
     """Mock Tesla Fleet Api products method."""
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.pre2021", return_value=True
+        "tesla_fleet_api.teslemetry.Vehicle.pre2021", return_value=True
     ) as mock_pre2021:
         yield mock_pre2021
 
@@ -62,7 +62,7 @@ def mock_legacy():
 def mock_wake_up():
     """Mock Tesla Fleet API Vehicle Specific wake_up method."""
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.wake_up",
+        "tesla_fleet_api.teslemetry.Vehicle.wake_up",
         return_value=WAKE_UP_ONLINE,
     ) as mock_wake_up:
         yield mock_wake_up
@@ -72,7 +72,7 @@ def mock_wake_up():
 def mock_vehicle() -> Generator[AsyncMock]:
     """Mock Tesla Fleet API Vehicle Specific vehicle method."""
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.vehicle",
+        "tesla_fleet_api.teslemetry.Vehicle.vehicle",
         return_value=WAKE_UP_ONLINE,
     ) as mock_vehicle:
         yield mock_vehicle
@@ -82,7 +82,7 @@ def mock_vehicle() -> Generator[AsyncMock]:
 def mock_request():
     """Mock Tesla Fleet API Vehicle Specific class."""
     with patch(
-        "homeassistant.components.teslemetry.Teslemetry._request",
+        "tesla_fleet_api.teslemetry.Teslemetry._request",
         return_value=COMMAND_OK,
     ) as mock_request:
         yield mock_request
@@ -92,7 +92,7 @@ def mock_request():
 def mock_live_status():
     """Mock Teslemetry Energy Specific live_status method."""
     with patch(
-        "homeassistant.components.teslemetry.EnergySpecific.live_status",
+        "tesla_fleet_api.tesla.energysite.EnergySite.live_status",
         side_effect=lambda: deepcopy(LIVE_STATUS),
     ) as mock_live_status:
         yield mock_live_status
@@ -102,7 +102,7 @@ def mock_live_status():
 def mock_site_info():
     """Mock Teslemetry Energy Specific site_info method."""
     with patch(
-        "homeassistant.components.teslemetry.EnergySpecific.site_info",
+        "tesla_fleet_api.tesla.energysite.EnergySite.site_info",
         side_effect=lambda: deepcopy(SITE_INFO),
     ) as mock_live_status:
         yield mock_live_status
@@ -112,7 +112,7 @@ def mock_site_info():
 def mock_energy_history():
     """Mock Teslemetry Energy Specific site_info method."""
     with patch(
-        "homeassistant.components.teslemetry.EnergySpecific.energy_history",
+        "tesla_fleet_api.tesla.energysite.EnergySite.energy_history",
         return_value=ENERGY_HISTORY,
     ) as mock_live_status:
         yield mock_live_status
@@ -122,7 +122,7 @@ def mock_energy_history():
 def mock_add_listener():
     """Mock Teslemetry Stream listen method."""
     with patch(
-        "homeassistant.components.teslemetry.TeslemetryStream.async_add_listener",
+        "teslemetry_stream.TeslemetryStream.async_add_listener",
     ) as mock_add_listener:
         mock_add_listener.listeners = []
 
@@ -165,7 +165,7 @@ def mock_stream_update_config():
 def mock_stream_connected():
     """Mock Teslemetry Stream listen method."""
     with patch(
-        "homeassistant.components.teslemetry.TeslemetryStream.connected",
+        "teslemetry_stream.TeslemetryStream.connected",
         return_value=True,
     ) as mock_stream_connected:
         yield mock_stream_connected
diff --git a/tests/components/teslemetry/const.py b/tests/components/teslemetry/const.py
index 40d55dab71f..31915630951 100644
--- a/tests/components/teslemetry/const.py
+++ b/tests/components/teslemetry/const.py
@@ -18,7 +18,6 @@ VEHICLE_DATA_ALT = load_json_object_fixture("vehicle_data_alt.json", DOMAIN)
 LIVE_STATUS = load_json_object_fixture("live_status.json", DOMAIN)
 SITE_INFO = load_json_object_fixture("site_info.json", DOMAIN)
 ENERGY_HISTORY = load_json_object_fixture("energy_history.json", DOMAIN)
-METADATA = load_json_object_fixture("metadata.json", DOMAIN)
 
 COMMAND_OK = {"response": {"result": True, "reason": ""}}
 COMMAND_REASON = {"response": {"result": False, "reason": "already closed"}}
@@ -52,7 +51,7 @@ METADATA = {
             "proxy": False,
             "access": True,
             "polling": True,
-            "firmware": "2024.44.25",
+            "firmware": "2026.0.0",
         }
     },
 }
diff --git a/tests/components/teslemetry/fixtures/metadata.json b/tests/components/teslemetry/fixtures/metadata.json
deleted file mode 100644
index 60282afc934..00000000000
--- a/tests/components/teslemetry/fixtures/metadata.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "uid": "abc-123",
-  "region": "NA",
-  "scopes": [
-    "openid",
-    "offline_access",
-    "user_data",
-    "vehicle_device_data",
-    "vehicle_cmds",
-    "vehicle_charging_cmds",
-    "energy_device_data",
-    "energy_cmds"
-  ],
-  "vehicles": {
-    "LRW3F7EK4NC700000": {
-      "access": true,
-      "polling": true,
-      "proxy": true,
-      "firmware": "2024.44.25"
-    }
-  }
-}
diff --git a/tests/components/teslemetry/fixtures/vehicle_data.json b/tests/components/teslemetry/fixtures/vehicle_data.json
index 0cd238c4e52..051c7199d00 100644
--- a/tests/components/teslemetry/fixtures/vehicle_data.json
+++ b/tests/components/teslemetry/fixtures/vehicle_data.json
@@ -192,7 +192,7 @@
       "api_version": 71,
       "autopark_state_v2": "unavailable",
       "calendar_supported": true,
-      "car_version": "2024.44.25 06f534d46010",
+      "car_version": "2026.0.0 06f534d46010",
       "center_display_state": 0,
       "dashcam_clip_save_available": true,
       "dashcam_state": "Recording",
diff --git a/tests/components/teslemetry/fixtures/vehicle_data_alt.json b/tests/components/teslemetry/fixtures/vehicle_data_alt.json
index 25b3878f4dd..ec524614d49 100644
--- a/tests/components/teslemetry/fixtures/vehicle_data_alt.json
+++ b/tests/components/teslemetry/fixtures/vehicle_data_alt.json
@@ -35,7 +35,7 @@
       "charge_port_cold_weather_mode": false,
       "charge_port_color": "<invalid>",
       "charge_port_door_open": true,
-      "charge_port_latch": "Engaged",
+      "charge_port_latch": null,
       "charge_rate": 0,
       "charger_actual_current": 0,
       "charger_phases": null,
diff --git a/tests/components/teslemetry/snapshots/test_binary_sensor.ambr b/tests/components/teslemetry/snapshots/test_binary_sensor.ambr
index e90cc9ced55..a295dc16344 100644
--- a/tests/components/teslemetry/snapshots/test_binary_sensor.ambr
+++ b/tests/components/teslemetry/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -190,6 +194,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +241,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -282,6 +288,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -329,6 +336,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -375,6 +383,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -421,6 +430,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -467,6 +477,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -514,6 +525,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -561,6 +573,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -607,6 +620,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -653,6 +667,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -700,6 +715,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -746,6 +762,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -792,6 +809,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -838,6 +856,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -884,6 +903,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -930,6 +950,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -976,6 +997,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1022,6 +1044,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1069,6 +1092,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1116,6 +1140,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1163,6 +1188,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1210,6 +1236,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1257,6 +1284,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1303,6 +1331,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1342,6 +1371,147 @@
     'state': 'unknown',
   })
 # ---
+# name: test_binary_sensor[binary_sensor.test_located_at_favorite-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.test_located_at_favorite',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Located at favorite',
+    'platform': 'teslemetry',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'located_at_favorite',
+    'unique_id': 'LRW3F7EK4NC700000-located_at_favorite',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_binary_sensor[binary_sensor.test_located_at_favorite-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Located at favorite',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_located_at_favorite',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_binary_sensor[binary_sensor.test_located_at_home-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.test_located_at_home',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Located at home',
+    'platform': 'teslemetry',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'located_at_home',
+    'unique_id': 'LRW3F7EK4NC700000-located_at_home',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_binary_sensor[binary_sensor.test_located_at_home-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Located at home',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_located_at_home',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_binary_sensor[binary_sensor.test_located_at_work-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.test_located_at_work',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Located at work',
+    'platform': 'teslemetry',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'located_at_work',
+    'unique_id': 'LRW3F7EK4NC700000-located_at_work',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_binary_sensor[binary_sensor.test_located_at_work-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Located at work',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_located_at_work',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
 # name: test_binary_sensor[binary_sensor.test_offroad_lightbar-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -1349,6 +1519,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1395,6 +1566,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1441,6 +1613,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1458,7 +1631,7 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': 'Pin to drive enabled',
+    'original_name': 'PIN to Drive enabled',
     'platform': 'teslemetry',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -1470,7 +1643,7 @@
 # name: test_binary_sensor[binary_sensor.test_pin_to_drive_enabled-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Test Pin to drive enabled',
+      'friendly_name': 'Test PIN to Drive enabled',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.test_pin_to_drive_enabled',
@@ -1487,6 +1660,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1533,6 +1707,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1579,6 +1754,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1625,6 +1801,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1672,6 +1849,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1719,6 +1897,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1766,6 +1945,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1813,6 +1993,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1859,6 +2040,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1905,6 +2087,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1951,6 +2134,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1998,6 +2182,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2044,6 +2229,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2091,6 +2277,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2138,6 +2325,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2185,6 +2373,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2232,6 +2421,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2278,6 +2468,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2325,6 +2516,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2750,6 +2942,45 @@
     'state': 'unknown',
   })
 # ---
+# name: test_binary_sensor_refresh[binary_sensor.test_located_at_favorite-statealt]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Located at favorite',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_located_at_favorite',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_binary_sensor_refresh[binary_sensor.test_located_at_home-statealt]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Located at home',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_located_at_home',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_binary_sensor_refresh[binary_sensor.test_located_at_work-statealt]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Located at work',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.test_located_at_work',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
 # name: test_binary_sensor_refresh[binary_sensor.test_offroad_lightbar-statealt]
   StateSnapshot({
     'attributes': ReadOnlyDict({
@@ -2779,7 +3010,7 @@
 # name: test_binary_sensor_refresh[binary_sensor.test_pin_to_drive_enabled-statealt]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Test Pin to drive enabled',
+      'friendly_name': 'Test PIN to Drive enabled',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.test_pin_to_drive_enabled',
diff --git a/tests/components/teslemetry/snapshots/test_button.ambr b/tests/components/teslemetry/snapshots/test_button.ambr
index 6d3016186ae..e4e20215020 100644
--- a/tests/components/teslemetry/snapshots/test_button.ambr
+++ b/tests/components/teslemetry/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -190,6 +194,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +241,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/teslemetry/snapshots/test_climate.ambr b/tests/components/teslemetry/snapshots/test_climate.ambr
index 7064309e98b..e0e68f23c79 100644
--- a/tests/components/teslemetry/snapshots/test_climate.ambr
+++ b/tests/components/teslemetry/snapshots/test_climate.ambr
@@ -1,10 +1,4 @@
 # serializer version: 1
-# name: test_asleep_or_offline[HomeAssistantError]
-  'Timed out trying to wake up vehicle'
-# ---
-# name: test_asleep_or_offline[InvalidCommand]
-  'Failed to wake up vehicle: The data request or command is unknown.'
-# ---
 # name: test_climate[climate.test_cabin_overheat_protection-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -21,6 +15,7 @@
       'target_temp_step': 5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -77,6 +72,10 @@
     }),
     'area_id': None,
     'capabilities': dict({
+      'fan_modes': list([
+        'off',
+        'bioweapon',
+      ]),
       'hvac_modes': list([
         <HVACMode.HEAT_COOL: 'heat_cool'>,
         <HVACMode.OFF: 'off'>,
@@ -91,6 +90,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -111,7 +111,7 @@
     'original_name': 'Climate',
     'platform': 'teslemetry',
     'previous_unique_id': None,
-    'supported_features': <ClimateEntityFeature: 401>,
+    'supported_features': <ClimateEntityFeature: 409>,
     'translation_key': <TeslemetryClimateSide.DRIVER: 'driver_temp'>,
     'unique_id': 'LRW3F7EK4NC700000-driver_temp',
     'unit_of_measurement': None,
@@ -121,6 +121,11 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'current_temperature': 30.0,
+      'fan_mode': 'off',
+      'fan_modes': list([
+        'off',
+        'bioweapon',
+      ]),
       'friendly_name': 'Test Climate',
       'hvac_modes': list([
         <HVACMode.HEAT_COOL: 'heat_cool'>,
@@ -135,7 +140,7 @@
         'dog',
         'camp',
       ]),
-      'supported_features': <ClimateEntityFeature: 401>,
+      'supported_features': <ClimateEntityFeature: 409>,
       'temperature': 22.0,
     }),
     'context': <ANY>,
@@ -162,6 +167,7 @@
       'target_temp_step': 5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -217,6 +223,10 @@
     }),
     'area_id': None,
     'capabilities': dict({
+      'fan_modes': list([
+        'off',
+        'bioweapon',
+      ]),
       'hvac_modes': list([
         <HVACMode.HEAT_COOL: 'heat_cool'>,
         <HVACMode.OFF: 'off'>,
@@ -231,6 +241,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -251,7 +262,7 @@
     'original_name': 'Climate',
     'platform': 'teslemetry',
     'previous_unique_id': None,
-    'supported_features': <ClimateEntityFeature: 401>,
+    'supported_features': <ClimateEntityFeature: 409>,
     'translation_key': <TeslemetryClimateSide.DRIVER: 'driver_temp'>,
     'unique_id': 'LRW3F7EK4NC700000-driver_temp',
     'unit_of_measurement': None,
@@ -261,6 +272,11 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'current_temperature': 30.0,
+      'fan_mode': 'off',
+      'fan_modes': list([
+        'off',
+        'bioweapon',
+      ]),
       'friendly_name': 'Test Climate',
       'hvac_modes': list([
         <HVACMode.HEAT_COOL: 'heat_cool'>,
@@ -275,7 +291,7 @@
         'dog',
         'camp',
       ]),
-      'supported_features': <ClimateEntityFeature: 401>,
+      'supported_features': <ClimateEntityFeature: 409>,
       'temperature': 22.0,
     }),
     'context': <ANY>,
@@ -293,13 +309,16 @@
     'area_id': None,
     'capabilities': dict({
       'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
         <HVACMode.COOL: 'cool'>,
+        <HVACMode.FAN_ONLY: 'fan_only'>,
       ]),
       'max_temp': 40,
       'min_temp': 30,
       'target_temp_step': 5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -334,11 +353,13 @@
     'capabilities': dict({
       'hvac_modes': list([
         <HVACMode.HEAT_COOL: 'heat_cool'>,
+        <HVACMode.OFF: 'off'>,
       ]),
       'max_temp': 28.0,
       'min_temp': 15.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -368,3 +389,85 @@
 # name: test_invalid_error[error]
   'Command returned exception: The data request or command is unknown.'
 # ---
+# name: test_select_streaming[climate.test_cabin_overheat_protection]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_temperature': None,
+      'friendly_name': 'Test Cabin overheat protection',
+      'hvac_modes': list([
+        <HVACMode.OFF: 'off'>,
+        <HVACMode.COOL: 'cool'>,
+        <HVACMode.FAN_ONLY: 'fan_only'>,
+      ]),
+      'max_temp': 40,
+      'min_temp': 30,
+      'supported_features': <ClimateEntityFeature: 385>,
+      'target_temp_step': 5,
+      'temperature': None,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.test_cabin_overheat_protection',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'cool',
+  })
+# ---
+# name: test_select_streaming[climate.test_climate LHD]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_temperature': 26.0,
+      'friendly_name': 'Test Climate',
+      'hvac_modes': list([
+        <HVACMode.HEAT_COOL: 'heat_cool'>,
+        <HVACMode.OFF: 'off'>,
+      ]),
+      'max_temp': 28.0,
+      'min_temp': 15.0,
+      'preset_mode': None,
+      'preset_modes': list([
+        'off',
+        'keep',
+        'dog',
+        'camp',
+      ]),
+      'supported_features': <ClimateEntityFeature: 401>,
+      'temperature': 21.0,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.test_climate',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'heat_cool',
+  })
+# ---
+# name: test_select_streaming[climate.test_climate]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_temperature': 26.0,
+      'friendly_name': 'Test Climate',
+      'hvac_modes': list([
+        <HVACMode.HEAT_COOL: 'heat_cool'>,
+        <HVACMode.OFF: 'off'>,
+      ]),
+      'max_temp': 28.0,
+      'min_temp': 15.0,
+      'preset_mode': None,
+      'preset_modes': list([
+        'off',
+        'keep',
+        'dog',
+        'camp',
+      ]),
+      'supported_features': <ClimateEntityFeature: 401>,
+      'temperature': 21.0,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.test_climate',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'heat_cool',
+  })
+# ---
diff --git a/tests/components/teslemetry/snapshots/test_cover.ambr b/tests/components/teslemetry/snapshots/test_cover.ambr
index 8364f2a6a6e..9548a911cf9 100644
--- a/tests/components/teslemetry/snapshots/test_cover.ambr
+++ b/tests/components/teslemetry/snapshots/test_cover.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -102,6 +104,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -198,6 +202,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -246,6 +251,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -294,6 +300,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -342,6 +349,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -390,6 +398,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -438,6 +447,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -486,6 +496,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -534,6 +545,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -582,6 +594,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -630,6 +643,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/teslemetry/snapshots/test_device_tracker.ambr b/tests/components/teslemetry/snapshots/test_device_tracker.ambr
index 0bc371b2d2d..b9e381ee42d 100644
--- a/tests/components/teslemetry/snapshots/test_device_tracker.ambr
+++ b/tests/components/teslemetry/snapshots/test_device_tracker.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -56,6 +57,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/teslemetry/snapshots/test_diagnostics.ambr b/tests/components/teslemetry/snapshots/test_diagnostics.ambr
index 16cabfddd09..a39e8a0ff74 100644
--- a/tests/components/teslemetry/snapshots/test_diagnostics.ambr
+++ b/tests/components/teslemetry/snapshots/test_diagnostics.ambr
@@ -3,6 +3,29 @@
   dict({
     'energysites': list([
       dict({
+        'history': dict({
+          'battery_energy_exported': 36,
+          'battery_energy_imported_from_generator': 0,
+          'battery_energy_imported_from_grid': 0,
+          'battery_energy_imported_from_solar': 684,
+          'consumer_energy_imported_from_battery': 36,
+          'consumer_energy_imported_from_generator': 0,
+          'consumer_energy_imported_from_grid': 0,
+          'consumer_energy_imported_from_solar': 38,
+          'generator_energy_exported': 0,
+          'grid_energy_exported_from_battery': 0,
+          'grid_energy_exported_from_generator': 0,
+          'grid_energy_exported_from_solar': 2,
+          'grid_energy_imported': 0,
+          'grid_services_energy_exported': 0,
+          'grid_services_energy_imported': 0,
+          'solar_energy_exported': 724,
+          'total_battery_charge': 684,
+          'total_battery_discharge': 36,
+          'total_grid_energy_exported': 2,
+          'total_home_usage': 74,
+          'total_solar_generation': 724,
+        }),
         'info': dict({
           'backup_reserve_percent': 0,
           'battery_count': 2,
@@ -352,7 +375,7 @@
           'vehicle_state_api_version': 71,
           'vehicle_state_autopark_state_v2': 'unavailable',
           'vehicle_state_calendar_supported': True,
-          'vehicle_state_car_version': '2024.44.25 06f534d46010',
+          'vehicle_state_car_version': '2026.0.0 06f534d46010',
           'vehicle_state_center_display_state': 0,
           'vehicle_state_dashcam_clip_save_available': True,
           'vehicle_state_dashcam_state': 'Recording',
@@ -432,6 +455,13 @@
           'vehicle_state_webcam_available': True,
           'vin': '**REDACTED**',
         }),
+        'stream': dict({
+          'config': dict({
+            'fields': dict({
+            }),
+            'prefer_typed': None,
+          }),
+        }),
       }),
     ]),
   })
diff --git a/tests/components/teslemetry/snapshots/test_init.ambr b/tests/components/teslemetry/snapshots/test_init.ambr
index 7d60ed82859..f1011034d63 100644
--- a/tests/components/teslemetry/snapshots/test_init.ambr
+++ b/tests/components/teslemetry/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://teslemetry.com/console',
     'connections': set({
     }),
@@ -35,6 +36,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://teslemetry.com/console',
     'connections': set({
     }),
@@ -67,6 +69,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://teslemetry.com/console',
     'connections': set({
     }),
@@ -99,6 +102,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://teslemetry.com/console',
     'connections': set({
     }),
diff --git a/tests/components/teslemetry/snapshots/test_lock.ambr b/tests/components/teslemetry/snapshots/test_lock.ambr
index 2130c4d9574..d6b29f0d7d4 100644
--- a/tests/components/teslemetry/snapshots/test_lock.ambr
+++ b/tests/components/teslemetry/snapshots/test_lock.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -93,3 +95,111 @@
     'state': 'unlocked',
   })
 # ---
+# name: test_lock_alt[lock.test_charge_cable_lock-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'lock',
+    'entity_category': None,
+    'entity_id': 'lock.test_charge_cable_lock',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Charge cable lock',
+    'platform': 'teslemetry',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'charge_state_charge_port_latch',
+    'unique_id': 'LRW3F7EK4NC700000-charge_state_charge_port_latch',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_lock_alt[lock.test_charge_cable_lock-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Charge cable lock',
+      'supported_features': <LockEntityFeature: 0>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'lock.test_charge_cable_lock',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unlocked',
+  })
+# ---
+# name: test_lock_alt[lock.test_lock-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'lock',
+    'entity_category': None,
+    'entity_id': 'lock.test_lock',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Lock',
+    'platform': 'teslemetry',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'vehicle_state_locked',
+    'unique_id': 'LRW3F7EK4NC700000-vehicle_state_locked',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_lock_alt[lock.test_lock-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Lock',
+      'supported_features': <LockEntityFeature: 0>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'lock.test_lock',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unlocked',
+  })
+# ---
+# name: test_lock_streaming[lock.test_charge_cable_lock-locked]
+  'locked'
+# ---
+# name: test_lock_streaming[lock.test_charge_cable_lock-unlocked]
+  'unlocked'
+# ---
+# name: test_lock_streaming[lock.test_lock-locked]
+  'locked'
+# ---
+# name: test_lock_streaming[lock.test_lock-unlocked]
+  'unlocked'
+# ---
diff --git a/tests/components/teslemetry/snapshots/test_media_player.ambr b/tests/components/teslemetry/snapshots/test_media_player.ambr
index a9d2569c637..7f721b95289 100644
--- a/tests/components/teslemetry/snapshots/test_media_player.ambr
+++ b/tests/components/teslemetry/snapshots/test_media_player.ambr
@@ -7,6 +7,7 @@
     'capabilities': dict({
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -46,7 +47,7 @@
       'media_title': 'Chapter 51: Cybertruck: Tesla, 2018–2019',
       'source': 'Audible',
       'supported_features': <MediaPlayerEntityFeature: 16437>,
-      'volume_level': 0.16129355359011466,
+      'volume_level': 0.16129354838709678,
     }),
     'context': <ANY>,
     'entity_id': 'media_player.test_media_player',
@@ -63,10 +64,12 @@
       'friendly_name': 'Test Media player',
       'media_album_name': '',
       'media_artist': '',
+      'media_duration': 0.0,
       'media_playlist': '',
       'media_title': '',
       'source': 'Spotify',
       'supported_features': <MediaPlayerEntityFeature: 16437>,
+      'volume_level': 0.0,
     }),
     'context': <ANY>,
     'entity_id': 'media_player.test_media_player',
@@ -84,6 +87,7 @@
     'capabilities': dict({
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -123,7 +127,43 @@
       'media_title': 'Chapter 51: Cybertruck: Tesla, 2018–2019',
       'source': 'Audible',
       'supported_features': <MediaPlayerEntityFeature: 0>,
-      'volume_level': 0.16129355359011466,
+      'volume_level': 0.16129354838709678,
+    }),
+    'context': <ANY>,
+    'entity_id': 'media_player.test_media_player',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'playing',
+  })
+# ---
+# name: test_update_streaming[off]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'speaker',
+      'friendly_name': 'Test Media player',
+      'supported_features': <MediaPlayerEntityFeature: 16437>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'media_player.test_media_player',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_update_streaming[on]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'speaker',
+      'friendly_name': 'Test Media player',
+      'media_album_name': 'Test Album',
+      'media_artist': 'Test Artist',
+      'media_duration': 60,
+      'media_position': 5,
+      'source': 'Spotify',
+      'supported_features': <MediaPlayerEntityFeature: 16437>,
+      'volume_level': 0.1935483870967742,
     }),
     'context': <ANY>,
     'entity_id': 'media_player.test_media_player',
diff --git a/tests/components/teslemetry/snapshots/test_number.ambr b/tests/components/teslemetry/snapshots/test_number.ambr
index 0f30daf635e..5ca9feb22f2 100644
--- a/tests/components/teslemetry/snapshots/test_number.ambr
+++ b/tests/components/teslemetry/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -69,6 +70,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -127,6 +129,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -184,6 +187,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -229,3 +233,9 @@
     'state': '80',
   })
 # ---
+# name: test_number_streaming[number.test_charge_current-state]
+  '24'
+# ---
+# name: test_number_streaming[number.test_charge_limit-state]
+  '99'
+# ---
diff --git a/tests/components/teslemetry/snapshots/test_select.ambr b/tests/components/teslemetry/snapshots/test_select.ambr
index 0c2547f309d..755a1a82c41 100644
--- a/tests/components/teslemetry/snapshots/test_select.ambr
+++ b/tests/components/teslemetry/snapshots/test_select.ambr
@@ -12,6 +12,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -69,6 +70,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -127,6 +129,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -186,6 +189,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -245,6 +249,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -304,6 +309,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -363,6 +369,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -408,3 +415,79 @@
     'state': 'off',
   })
 # ---
+# name: test_select[select.test_steering_wheel_heater-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'off',
+        'low',
+        'high',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'select',
+    'entity_category': None,
+    'entity_id': 'select.test_steering_wheel_heater',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Steering wheel heater',
+    'platform': 'teslemetry',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'climate_state_steering_wheel_heat_level',
+    'unique_id': 'LRW3F7EK4NC700000-climate_state_steering_wheel_heat_level',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_select[select.test_steering_wheel_heater-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Test Steering wheel heater',
+      'options': list([
+        'off',
+        'low',
+        'high',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'select.test_steering_wheel_heater',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_select_streaming[select.test_seat_heater_front_left]
+  'off'
+# ---
+# name: test_select_streaming[select.test_seat_heater_front_right]
+  'low'
+# ---
+# name: test_select_streaming[select.test_seat_heater_rear_center]
+  'unknown'
+# ---
+# name: test_select_streaming[select.test_seat_heater_rear_left]
+  'medium'
+# ---
+# name: test_select_streaming[select.test_seat_heater_rear_right]
+  'high'
+# ---
+# name: test_select_streaming[select.test_steering_wheel_heater]
+  'off'
+# ---
diff --git a/tests/components/teslemetry/snapshots/test_sensor.ambr b/tests/components/teslemetry/snapshots/test_sensor.ambr
index 6439e74eecc..c5d98abc95c 100644
--- a/tests/components/teslemetry/snapshots/test_sensor.ambr
+++ b/tests/components/teslemetry/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -81,6 +82,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -154,6 +156,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -227,6 +230,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -300,6 +304,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -373,6 +378,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -446,6 +452,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -519,6 +526,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -592,6 +600,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -665,6 +674,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -738,6 +748,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -811,6 +822,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -884,6 +896,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -957,6 +970,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1030,6 +1044,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1103,6 +1118,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1176,6 +1192,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1249,6 +1266,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1322,6 +1340,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1395,6 +1414,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1468,6 +1488,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1541,6 +1562,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1614,6 +1636,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1687,6 +1710,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1766,6 +1790,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1843,6 +1868,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1916,6 +1942,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1986,6 +2013,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2059,6 +2087,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2132,6 +2161,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2205,6 +2235,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2276,6 +2307,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2335,6 +2367,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2400,6 +2433,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2470,6 +2504,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2541,6 +2576,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2602,6 +2638,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2672,6 +2709,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2742,6 +2780,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2809,6 +2848,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2876,6 +2916,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2950,6 +2991,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3029,6 +3071,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3099,6 +3142,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3169,6 +3213,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3240,6 +3285,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3301,6 +3347,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3374,6 +3421,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3444,6 +3492,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3517,6 +3566,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3587,6 +3637,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3657,6 +3708,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3729,6 +3781,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3804,6 +3857,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3874,6 +3928,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3939,6 +3994,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4000,6 +4056,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4063,6 +4120,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4136,6 +4194,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4209,6 +4268,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4282,6 +4342,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4355,6 +4416,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4422,6 +4484,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4487,6 +4550,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4546,6 +4610,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4607,6 +4672,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4680,6 +4746,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4751,6 +4818,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4810,6 +4878,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4869,6 +4938,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -4928,6 +4998,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/teslemetry/snapshots/test_switch.ambr b/tests/components/teslemetry/snapshots/test_switch.ambr
index 5693d4bdd5e..0586b454a91 100644
--- a/tests/components/teslemetry/snapshots/test_switch.ambr
+++ b/tests/components/teslemetry/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -194,6 +198,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -241,6 +246,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -262,7 +268,7 @@
     'platform': 'teslemetry',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': 'charge_state_user_charge_enable_request',
+    'translation_key': 'charge_state_charging_state',
     'unique_id': 'LRW3F7EK4NC700000-charge_state_user_charge_enable_request',
     'unit_of_measurement': None,
   })
@@ -278,7 +284,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'on',
+    'state': 'off',
   })
 # ---
 # name: test_switch[switch.test_defrost-entry]
@@ -288,6 +294,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -335,6 +342,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -456,7 +464,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'on',
+    'state': 'off',
   })
 # ---
 # name: test_switch_alt[switch.test_defrost-statealt]
@@ -487,3 +495,21 @@
     'state': 'off',
   })
 # ---
+# name: test_switch_streaming[switch.test_auto_seat_climate_left]
+  'on'
+# ---
+# name: test_switch_streaming[switch.test_auto_seat_climate_right]
+  'off'
+# ---
+# name: test_switch_streaming[switch.test_auto_steering_wheel_heater]
+  'on'
+# ---
+# name: test_switch_streaming[switch.test_charge]
+  'on'
+# ---
+# name: test_switch_streaming[switch.test_defrost]
+  'off'
+# ---
+# name: test_switch_streaming[switch.test_sentry_mode]
+  'on'
+# ---
diff --git a/tests/components/teslemetry/snapshots/test_update.ambr b/tests/components/teslemetry/snapshots/test_update.ambr
index 2411d047135..391d81c086e 100644
--- a/tests/components/teslemetry/snapshots/test_update.ambr
+++ b/tests/components/teslemetry/snapshots/test_update.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -40,7 +41,7 @@
       'entity_picture': 'https://brands.home-assistant.io/_/teslemetry/icon.png',
       'friendly_name': 'Test Update',
       'in_progress': False,
-      'installed_version': '2024.44.25',
+      'installed_version': '2026.0.0',
       'latest_version': '2024.12.0.0',
       'release_summary': None,
       'release_url': None,
@@ -64,6 +65,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -115,3 +117,128 @@
     'state': 'off',
   })
 # ---
+# name: test_update_streaming[downloading]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'auto_update': False,
+      'display_precision': 0,
+      'entity_picture': 'https://brands.home-assistant.io/_/teslemetry/icon.png',
+      'friendly_name': 'Test Update',
+      'in_progress': False,
+      'installed_version': '2025.1.1',
+      'latest_version': '2025.2.1',
+      'release_summary': None,
+      'release_url': None,
+      'skipped_version': None,
+      'supported_features': <UpdateEntityFeature: 4>,
+      'title': None,
+      'update_percentage': None,
+    }),
+    'context': <ANY>,
+    'entity_id': 'update.test_update',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_update_streaming[installing]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'auto_update': False,
+      'display_precision': 0,
+      'entity_picture': 'https://brands.home-assistant.io/_/teslemetry/icon.png',
+      'friendly_name': 'Test Update',
+      'in_progress': False,
+      'installed_version': '2025.1.1',
+      'latest_version': '2025.2.1',
+      'release_summary': None,
+      'release_url': None,
+      'skipped_version': None,
+      'supported_features': <UpdateEntityFeature: 5>,
+      'title': None,
+      'update_percentage': None,
+    }),
+    'context': <ANY>,
+    'entity_id': 'update.test_update',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_update_streaming[ready]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'auto_update': False,
+      'display_precision': 0,
+      'entity_picture': 'https://brands.home-assistant.io/_/teslemetry/icon.png',
+      'friendly_name': 'Test Update',
+      'in_progress': False,
+      'installed_version': '2025.1.1',
+      'latest_version': '2025.2.1',
+      'release_summary': None,
+      'release_url': None,
+      'skipped_version': None,
+      'supported_features': <UpdateEntityFeature: 5>,
+      'title': None,
+      'update_percentage': None,
+    }),
+    'context': <ANY>,
+    'entity_id': 'update.test_update',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
+# name: test_update_streaming[restored]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'auto_update': False,
+      'display_precision': 0,
+      'entity_picture': 'https://brands.home-assistant.io/_/teslemetry/icon.png',
+      'friendly_name': 'Test Update',
+      'in_progress': False,
+      'installed_version': '2025.2.1',
+      'latest_version': '2025.1.1',
+      'release_summary': None,
+      'release_url': None,
+      'skipped_version': None,
+      'supported_features': <UpdateEntityFeature: 4>,
+      'title': None,
+      'update_percentage': None,
+    }),
+    'context': <ANY>,
+    'entity_id': 'update.test_update',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_update_streaming[updated]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'auto_update': False,
+      'display_precision': 0,
+      'entity_picture': 'https://brands.home-assistant.io/_/teslemetry/icon.png',
+      'friendly_name': 'Test Update',
+      'in_progress': False,
+      'installed_version': '2025.2.1',
+      'latest_version': '2025.1.1',
+      'release_summary': None,
+      'release_url': None,
+      'skipped_version': None,
+      'supported_features': <UpdateEntityFeature: 4>,
+      'title': None,
+      'update_percentage': None,
+    }),
+    'context': <ANY>,
+    'entity_id': 'update.test_update',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
diff --git a/tests/components/teslemetry/test_button.py b/tests/components/teslemetry/test_button.py
index 75f94342f1e..46db33ce913 100644
--- a/tests/components/teslemetry/test_button.py
+++ b/tests/components/teslemetry/test_button.py
@@ -42,7 +42,7 @@ async def test_press(hass: HomeAssistant, name: str, func: str) -> None:
     await setup_platform(hass, [Platform.BUTTON])
 
     with patch(
-        f"homeassistant.components.teslemetry.VehicleSpecific.{func}",
+        f"tesla_fleet_api.teslemetry.Vehicle.{func}",
         return_value=COMMAND_OK,
     ) as command:
         await hass.services.async_call(
diff --git a/tests/components/teslemetry/test_climate.py b/tests/components/teslemetry/test_climate.py
index 33f2e134806..27bed45c51f 100644
--- a/tests/components/teslemetry/test_climate.py
+++ b/tests/components/teslemetry/test_climate.py
@@ -2,10 +2,10 @@
 
 from unittest.mock import AsyncMock, patch
 
-from freezegun.api import FrozenDateTimeFactory
 import pytest
 from syrupy.assertion import SnapshotAssertion
 from tesla_fleet_api.exceptions import InvalidCommand
+from teslemetry_stream import Signal
 
 from homeassistant.components.climate import (
     ATTR_HVAC_MODE,
@@ -24,15 +24,12 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import entity_registry as er
 
-from . import assert_entities, setup_platform
+from . import assert_entities, reload_platform, setup_platform
 from .const import (
     COMMAND_ERRORS,
     COMMAND_IGNORED_REASON,
     METADATA_NOSCOPE,
     VEHICLE_DATA_ALT,
-    VEHICLE_DATA_ASLEEP,
-    WAKE_UP_ASLEEP,
-    WAKE_UP_ONLINE,
 )
 
 
@@ -41,6 +38,7 @@ async def test_climate(
     hass: HomeAssistant,
     snapshot: SnapshotAssertion,
     entity_registry: er.EntityRegistry,
+    mock_legacy: AsyncMock,
 ) -> None:
     """Tests that the climate entity is correct."""
 
@@ -195,6 +193,7 @@ async def test_climate_alt(
     snapshot: SnapshotAssertion,
     entity_registry: er.EntityRegistry,
     mock_vehicle_data: AsyncMock,
+    mock_legacy: AsyncMock,
 ) -> None:
     """Tests that the climate entity is correct."""
 
@@ -211,7 +210,7 @@ async def test_invalid_error(hass: HomeAssistant, snapshot: SnapshotAssertion) -
 
     with (
         patch(
-            "homeassistant.components.teslemetry.VehicleSpecific.auto_conditioning_start",
+            "tesla_fleet_api.teslemetry.Vehicle.auto_conditioning_start",
             side_effect=InvalidCommand,
         ) as mock_on,
         pytest.raises(HomeAssistantError) as error,
@@ -235,7 +234,7 @@ async def test_errors(hass: HomeAssistant, response: str) -> None:
 
     with (
         patch(
-            "homeassistant.components.teslemetry.VehicleSpecific.auto_conditioning_start",
+            "tesla_fleet_api.teslemetry.Vehicle.auto_conditioning_start",
             return_value=response,
         ) as mock_on,
         pytest.raises(HomeAssistantError),
@@ -257,7 +256,7 @@ async def test_ignored_error(
     await setup_platform(hass, [Platform.CLIMATE])
     entity_id = "climate.test_climate"
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.auto_conditioning_start",
+        "tesla_fleet_api.teslemetry.Vehicle.auto_conditioning_start",
         return_value=COMMAND_IGNORED_REASON,
     ) as mock_on:
         await hass.services.async_call(
@@ -269,71 +268,12 @@ async def test_ignored_error(
         mock_on.assert_called_once()
 
 
-@pytest.mark.usefixtures("entity_registry_enabled_by_default")
-async def test_asleep_or_offline(
-    hass: HomeAssistant,
-    mock_vehicle_data: AsyncMock,
-    mock_wake_up: AsyncMock,
-    mock_vehicle: AsyncMock,
-    freezer: FrozenDateTimeFactory,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Tests asleep is handled."""
-
-    mock_vehicle_data.return_value = VEHICLE_DATA_ASLEEP
-    await setup_platform(hass, [Platform.CLIMATE])
-    entity_id = "climate.test_climate"
-
-    # Run a command but fail trying to wake up the vehicle
-    mock_wake_up.side_effect = InvalidCommand
-    with pytest.raises(HomeAssistantError) as error:
-        await hass.services.async_call(
-            CLIMATE_DOMAIN,
-            SERVICE_TURN_ON,
-            {ATTR_ENTITY_ID: [entity_id]},
-            blocking=True,
-        )
-    assert str(error.value) == snapshot(name="InvalidCommand")
-    mock_wake_up.assert_called_once()
-
-    mock_wake_up.side_effect = None
-    mock_wake_up.reset_mock()
-
-    # Run a command but timeout trying to wake up the vehicle
-    mock_wake_up.return_value = WAKE_UP_ASLEEP
-    mock_vehicle.return_value = WAKE_UP_ASLEEP
-    with (
-        patch("homeassistant.components.teslemetry.helpers.asyncio.sleep"),
-        pytest.raises(HomeAssistantError) as error,
-    ):
-        await hass.services.async_call(
-            CLIMATE_DOMAIN,
-            SERVICE_TURN_ON,
-            {ATTR_ENTITY_ID: [entity_id]},
-            blocking=True,
-        )
-    assert str(error.value) == snapshot(name="HomeAssistantError")
-    mock_wake_up.assert_called_once()
-    mock_vehicle.assert_called()
-
-    mock_wake_up.reset_mock()
-    mock_vehicle.reset_mock()
-    mock_wake_up.return_value = WAKE_UP_ONLINE
-    mock_vehicle.return_value = WAKE_UP_ONLINE
-
-    # Run a command and wake up the vehicle immediately
-    await hass.services.async_call(
-        CLIMATE_DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: [entity_id]}, blocking=True
-    )
-    await hass.async_block_till_done()
-    mock_wake_up.assert_called_once()
-
-
 async def test_climate_noscope(
     hass: HomeAssistant,
     snapshot: SnapshotAssertion,
     entity_registry: er.EntityRegistry,
     mock_metadata: AsyncMock,
+    mock_legacy: AsyncMock,
 ) -> None:
     """Tests that the climate entity is correct."""
     mock_metadata.return_value = METADATA_NOSCOPE
@@ -363,3 +303,47 @@ async def test_climate_noscope(
             {ATTR_ENTITY_ID: [entity_id], ATTR_TEMPERATURE: 20},
             blocking=True,
         )
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_select_streaming(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    mock_vehicle_data: AsyncMock,
+    mock_add_listener: AsyncMock,
+) -> None:
+    """Tests that the select entities with streaming are correct."""
+
+    entry = await setup_platform(hass, [Platform.CLIMATE])
+
+    # Stream update
+    mock_add_listener.send(
+        {
+            "vin": VEHICLE_DATA_ALT["response"]["vin"],
+            "data": {
+                Signal.INSIDE_TEMP: 26,
+                Signal.HVAC_AC_ENABLED: True,
+                Signal.CLIMATE_KEEPER_MODE: "ClimateKeeperModeOn",
+                Signal.RIGHT_HAND_DRIVE: True,
+                Signal.HVAC_LEFT_TEMPERATURE_REQUEST: 22,
+                Signal.HVAC_RIGHT_TEMPERATURE_REQUEST: 21,
+                Signal.CABIN_OVERHEAT_PROTECTION_MODE: "CabinOverheatProtectionModeStateOn",
+                Signal.CABIN_OVERHEAT_PROTECTION_TEMPERATURE_LIMIT: 35,
+            },
+            "createdAt": "2024-10-04T10:45:17.537Z",
+        }
+    )
+    await hass.async_block_till_done()
+
+    assert hass.states.get("climate.test_climate") == snapshot(
+        name="climate.test_climate LHD"
+    )
+
+    await reload_platform(hass, entry, [Platform.CLIMATE])
+
+    # Assert the entities restored their values
+    for entity_id in (
+        "climate.test_climate",
+        "climate.test_cabin_overheat_protection",
+    ):
+        assert hass.states.get(entity_id) == snapshot(name=entity_id)
diff --git a/tests/components/teslemetry/test_cover.py b/tests/components/teslemetry/test_cover.py
index 14af1e732fe..e3933931c9f 100644
--- a/tests/components/teslemetry/test_cover.py
+++ b/tests/components/teslemetry/test_cover.py
@@ -75,7 +75,7 @@ async def test_cover_services(
     # Vent Windows
     entity_id = "cover.test_windows"
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.window_control",
+        "tesla_fleet_api.teslemetry.Vehicle.window_control",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -104,7 +104,7 @@ async def test_cover_services(
     # Charge Port Door
     entity_id = "cover.test_charge_port_door"
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.charge_port_door_open",
+        "tesla_fleet_api.teslemetry.Vehicle.charge_port_door_open",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -119,7 +119,7 @@ async def test_cover_services(
         assert state.state == CoverState.OPEN
 
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.charge_port_door_close",
+        "tesla_fleet_api.teslemetry.Vehicle.charge_port_door_close",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -136,7 +136,7 @@ async def test_cover_services(
     # Frunk
     entity_id = "cover.test_frunk"
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.actuate_trunk",
+        "tesla_fleet_api.teslemetry.Vehicle.actuate_trunk",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -153,7 +153,7 @@ async def test_cover_services(
     # Trunk
     entity_id = "cover.test_trunk"
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.actuate_trunk",
+        "tesla_fleet_api.teslemetry.Vehicle.actuate_trunk",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -182,7 +182,7 @@ async def test_cover_services(
     # Sunroof
     entity_id = "cover.test_sunroof"
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.sun_roof_control",
+        "tesla_fleet_api.teslemetry.Vehicle.sun_roof_control",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
diff --git a/tests/components/teslemetry/test_init.py b/tests/components/teslemetry/test_init.py
index 5481e6cc034..fcf9c76c939 100644
--- a/tests/components/teslemetry/test_init.py
+++ b/tests/components/teslemetry/test_init.py
@@ -2,17 +2,14 @@
 
 from unittest.mock import AsyncMock
 
-from freezegun.api import FrozenDateTimeFactory
 import pytest
 from syrupy.assertion import SnapshotAssertion
 from tesla_fleet_api.exceptions import (
     InvalidToken,
     SubscriptionRequired,
     TeslaFleetError,
-    VehicleOffline,
 )
 
-from homeassistant.components.teslemetry.coordinator import VEHICLE_INTERVAL
 from homeassistant.components.teslemetry.models import TeslemetryData
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import STATE_OFF, STATE_ON, Platform
@@ -22,8 +19,6 @@ from homeassistant.helpers import device_registry as dr
 from . import setup_platform
 from .const import VEHICLE_DATA_ALT
 
-from tests.common import async_fire_time_changed
-
 ERRORS = [
     (InvalidToken, ConfigEntryState.SETUP_ERROR),
     (SubscriptionRequired, ConfigEntryState.SETUP_ERROR),
@@ -69,22 +64,6 @@ async def test_devices(
         assert device == snapshot(name=f"{device.identifiers}")
 
 
-async def test_vehicle_refresh_offline(
-    hass: HomeAssistant, mock_vehicle_data: AsyncMock, freezer: FrozenDateTimeFactory
-) -> None:
-    """Test coordinator refresh with an error."""
-    entry = await setup_platform(hass, [Platform.CLIMATE])
-    assert entry.state is ConfigEntryState.LOADED
-    mock_vehicle_data.assert_called_once()
-    mock_vehicle_data.reset_mock()
-
-    mock_vehicle_data.side_effect = VehicleOffline
-    freezer.tick(VEHICLE_INTERVAL)
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-    mock_vehicle_data.assert_called_once()
-
-
 @pytest.mark.parametrize(("side_effect", "state"), ERRORS)
 async def test_vehicle_refresh_error(
     hass: HomeAssistant,
diff --git a/tests/components/teslemetry/test_lock.py b/tests/components/teslemetry/test_lock.py
index f7c9fea1400..a74d613859f 100644
--- a/tests/components/teslemetry/test_lock.py
+++ b/tests/components/teslemetry/test_lock.py
@@ -1,9 +1,10 @@
 """Test the Teslemetry lock platform."""
 
-from unittest.mock import patch
+from unittest.mock import AsyncMock, patch
 
 import pytest
 from syrupy.assertion import SnapshotAssertion
+from teslemetry_stream.const import Signal
 
 from homeassistant.components.lock import (
     DOMAIN as LOCK_DOMAIN,
@@ -16,14 +17,15 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import entity_registry as er
 
-from . import assert_entities, setup_platform
-from .const import COMMAND_OK
+from . import assert_entities, reload_platform, setup_platform
+from .const import COMMAND_OK, VEHICLE_DATA_ALT
 
 
 async def test_lock(
     hass: HomeAssistant,
     snapshot: SnapshotAssertion,
     entity_registry: er.EntityRegistry,
+    mock_legacy: AsyncMock,
 ) -> None:
     """Tests that the lock entities are correct."""
 
@@ -31,6 +33,20 @@ async def test_lock(
     assert_entities(hass, entry.entry_id, entity_registry, snapshot)
 
 
+async def test_lock_alt(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    entity_registry: er.EntityRegistry,
+    mock_vehicle_data: AsyncMock,
+    mock_legacy: AsyncMock,
+) -> None:
+    """Tests that the lock entities are correct."""
+
+    mock_vehicle_data.return_value = VEHICLE_DATA_ALT
+    entry = await setup_platform(hass, [Platform.LOCK])
+    assert_entities(hass, entry.entry_id, entity_registry, snapshot)
+
+
 async def test_lock_services(
     hass: HomeAssistant,
 ) -> None:
@@ -41,7 +57,7 @@ async def test_lock_services(
     entity_id = "lock.test_lock"
 
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.door_lock",
+        "tesla_fleet_api.teslemetry.Vehicle.door_lock",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -55,7 +71,7 @@ async def test_lock_services(
         call.assert_called_once()
 
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.door_unlock",
+        "tesla_fleet_api.teslemetry.Vehicle.door_unlock",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -79,7 +95,7 @@ async def test_lock_services(
         )
 
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.charge_port_door_open",
+        "tesla_fleet_api.teslemetry.Vehicle.charge_port_door_open",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -91,3 +107,60 @@ async def test_lock_services(
         state = hass.states.get(entity_id)
         assert state.state == LockState.UNLOCKED
         call.assert_called_once()
+
+
+async def test_lock_streaming(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    mock_vehicle_data: AsyncMock,
+    mock_add_listener: AsyncMock,
+) -> None:
+    """Tests that the lock entities with streaming are correct."""
+
+    entry = await setup_platform(hass, [Platform.LOCK])
+
+    # Stream update
+    mock_add_listener.send(
+        {
+            "vin": VEHICLE_DATA_ALT["response"]["vin"],
+            "data": {
+                Signal.LOCKED: True,
+                Signal.CHARGE_PORT_LATCH: "ChargePortLatchEngaged",
+            },
+            "createdAt": "2024-10-04T10:45:17.537Z",
+        }
+    )
+    await hass.async_block_till_done()
+
+    await reload_platform(hass, entry, [Platform.LOCK])
+
+    # Assert the entities restored their values
+    for entity_id in (
+        "lock.test_lock",
+        "lock.test_charge_cable_lock",
+    ):
+        state = hass.states.get(entity_id)
+        assert state.state == snapshot(name=f"{entity_id}-locked")
+
+    # Stream update
+    mock_add_listener.send(
+        {
+            "vin": VEHICLE_DATA_ALT["response"]["vin"],
+            "data": {
+                Signal.LOCKED: False,
+                Signal.CHARGE_PORT_LATCH: "ChargePortLatchDisengaged",
+            },
+            "createdAt": "2024-10-04T10:45:17.537Z",
+        }
+    )
+    await hass.async_block_till_done()
+
+    await reload_platform(hass, entry, [Platform.LOCK])
+
+    # Assert the entities restored their values
+    for entity_id in (
+        "lock.test_lock",
+        "lock.test_charge_cable_lock",
+    ):
+        state = hass.states.get(entity_id)
+        assert state.state == snapshot(name=f"{entity_id}-unlocked")
diff --git a/tests/components/teslemetry/test_media_player.py b/tests/components/teslemetry/test_media_player.py
index ae462bfd026..ab8f21ceda4 100644
--- a/tests/components/teslemetry/test_media_player.py
+++ b/tests/components/teslemetry/test_media_player.py
@@ -2,7 +2,9 @@
 
 from unittest.mock import AsyncMock, patch
 
+import pytest
 from syrupy.assertion import SnapshotAssertion
+from teslemetry_stream import Signal
 
 from homeassistant.components.media_player import (
     ATTR_MEDIA_VOLUME_LEVEL,
@@ -18,7 +20,7 @@ from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
-from . import assert_entities, assert_entities_alt, setup_platform
+from . import assert_entities, assert_entities_alt, reload_platform, setup_platform
 from .const import COMMAND_OK, METADATA_NOSCOPE, VEHICLE_DATA_ALT
 
 
@@ -26,6 +28,7 @@ async def test_media_player(
     hass: HomeAssistant,
     snapshot: SnapshotAssertion,
     entity_registry: er.EntityRegistry,
+    mock_legacy: AsyncMock,
 ) -> None:
     """Tests that the media player entities are correct."""
 
@@ -38,6 +41,7 @@ async def test_media_player_alt(
     snapshot: SnapshotAssertion,
     entity_registry: er.EntityRegistry,
     mock_vehicle_data: AsyncMock,
+    mock_legacy: AsyncMock,
 ) -> None:
     """Tests that the media player entities are correct."""
 
@@ -51,6 +55,7 @@ async def test_media_player_noscope(
     snapshot: SnapshotAssertion,
     entity_registry: er.EntityRegistry,
     mock_metadata: AsyncMock,
+    mock_legacy: AsyncMock,
 ) -> None:
     """Tests that the media player entities are correct without required scope."""
 
@@ -62,6 +67,7 @@ async def test_media_player_noscope(
 async def test_media_player_services(
     hass: HomeAssistant,
     snapshot: SnapshotAssertion,
+    mock_legacy: AsyncMock,
 ) -> None:
     """Tests that the media player services work."""
 
@@ -70,7 +76,7 @@ async def test_media_player_services(
     entity_id = "media_player.test_media_player"
 
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.adjust_volume",
+        "tesla_fleet_api.teslemetry.Vehicle.adjust_volume",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -84,7 +90,7 @@ async def test_media_player_services(
         call.assert_called_once()
 
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.media_toggle_playback",
+        "tesla_fleet_api.teslemetry.Vehicle.media_toggle_playback",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -99,7 +105,7 @@ async def test_media_player_services(
 
     # This test will fail without the previous call to pause playback
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.media_toggle_playback",
+        "tesla_fleet_api.teslemetry.Vehicle.media_toggle_playback",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -113,7 +119,7 @@ async def test_media_player_services(
         call.assert_called_once()
 
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.media_next_track",
+        "tesla_fleet_api.teslemetry.Vehicle.media_next_track",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -126,7 +132,7 @@ async def test_media_player_services(
         call.assert_called_once()
 
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.media_prev_track",
+        "tesla_fleet_api.teslemetry.Vehicle.media_prev_track",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -137,3 +143,62 @@ async def test_media_player_services(
         )
         state = hass.states.get(entity_id)
         call.assert_called_once()
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_update_streaming(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    mock_vehicle_data: AsyncMock,
+    mock_add_listener: AsyncMock,
+) -> None:
+    """Tests that the media player entities with streaming are correct."""
+
+    entry = await setup_platform(hass, [Platform.MEDIA_PLAYER])
+
+    # Stream update
+    mock_add_listener.send(
+        {
+            "vin": VEHICLE_DATA_ALT["response"]["vin"],
+            "data": {
+                Signal.CENTER_DISPLAY: "Off",
+                Signal.MEDIA_PLAYBACK_STATUS: None,
+                Signal.MEDIA_PLAYBACK_SOURCE: None,
+                Signal.MEDIA_AUDIO_VOLUME: None,
+                Signal.MEDIA_NOW_PLAYING_DURATION: None,
+                Signal.MEDIA_NOW_PLAYING_ELAPSED: None,
+                Signal.MEDIA_NOW_PLAYING_ARTIST: None,
+                Signal.MEDIA_NOW_PLAYING_ALBUM: None,
+            },
+            "createdAt": "2024-10-04T10:45:17.537Z",
+        }
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("media_player.test_media_player")
+    assert state == snapshot(name="off")
+
+    mock_add_listener.send(
+        {
+            "vin": VEHICLE_DATA_ALT["response"]["vin"],
+            "data": {
+                Signal.CENTER_DISPLAY: "Driving",
+                Signal.MEDIA_PLAYBACK_STATUS: "Playing",
+                Signal.MEDIA_PLAYBACK_SOURCE: "Spotify",
+                Signal.MEDIA_AUDIO_VOLUME: 2,
+                Signal.MEDIA_NOW_PLAYING_DURATION: 60000,
+                Signal.MEDIA_NOW_PLAYING_ELAPSED: 5000,
+                Signal.MEDIA_NOW_PLAYING_ARTIST: "Test Artist",
+                Signal.MEDIA_NOW_PLAYING_ALBUM: "Test Album",
+            },
+            "createdAt": "2024-10-04T10:55:17.000Z",
+        }
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("media_player.test_media_player")
+    assert state == snapshot(name="on")
+
+    await reload_platform(hass, entry, [Platform.MEDIA_PLAYER])
+
+    # Ensure the restored state is the same as the previous state
+    state = hass.states.get("media_player.test_media_player")
+    assert state == snapshot(name="on")
diff --git a/tests/components/teslemetry/test_number.py b/tests/components/teslemetry/test_number.py
index 65c03514d22..2c45631a060 100644
--- a/tests/components/teslemetry/test_number.py
+++ b/tests/components/teslemetry/test_number.py
@@ -4,6 +4,7 @@ from unittest.mock import AsyncMock, patch
 
 import pytest
 from syrupy.assertion import SnapshotAssertion
+from teslemetry_stream import Signal
 
 from homeassistant.components.number import (
     ATTR_VALUE,
@@ -14,7 +15,7 @@ from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
-from . import assert_entities, setup_platform
+from . import assert_entities, reload_platform, setup_platform
 from .const import COMMAND_OK, VEHICLE_DATA_ALT
 
 
@@ -23,6 +24,7 @@ async def test_number(
     hass: HomeAssistant,
     snapshot: SnapshotAssertion,
     entity_registry: er.EntityRegistry,
+    mock_legacy: AsyncMock,
 ) -> None:
     """Tests that the number entities are correct."""
 
@@ -40,7 +42,7 @@ async def test_number_services(
 
     entity_id = "number.test_charge_current"
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.set_charging_amps",
+        "tesla_fleet_api.teslemetry.Vehicle.set_charging_amps",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -55,7 +57,7 @@ async def test_number_services(
 
     entity_id = "number.test_charge_limit"
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.set_charge_limit",
+        "tesla_fleet_api.teslemetry.Vehicle.set_charge_limit",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -70,7 +72,7 @@ async def test_number_services(
 
     entity_id = "number.energy_site_backup_reserve"
     with patch(
-        "homeassistant.components.teslemetry.EnergySpecific.backup",
+        "tesla_fleet_api.teslemetry.EnergySite.backup",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -88,7 +90,7 @@ async def test_number_services(
 
     entity_id = "number.energy_site_off_grid_reserve"
     with patch(
-        "homeassistant.components.teslemetry.EnergySpecific.off_grid_vehicle_charging_reserve",
+        "tesla_fleet_api.teslemetry.EnergySite.off_grid_vehicle_charging_reserve",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -100,3 +102,38 @@ async def test_number_services(
         state = hass.states.get(entity_id)
         assert state.state == "88"
         call.assert_called_once()
+
+
+async def test_number_streaming(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    mock_vehicle_data: AsyncMock,
+    mock_add_listener: AsyncMock,
+) -> None:
+    """Tests that the number entities with streaming are correct."""
+
+    entry = await setup_platform(hass, [Platform.NUMBER])
+
+    # Stream update
+    mock_add_listener.send(
+        {
+            "vin": VEHICLE_DATA_ALT["response"]["vin"],
+            "data": {
+                Signal.CHARGE_CURRENT_REQUEST: 24,
+                Signal.CHARGE_CURRENT_REQUEST_MAX: 32,
+                Signal.CHARGE_LIMIT_SOC: 99,
+            },
+            "createdAt": "2024-10-04T10:45:17.537Z",
+        }
+    )
+    await hass.async_block_till_done()
+
+    await reload_platform(hass, entry, [Platform.NUMBER])
+
+    # Assert the entities restored their values
+    for entity_id in (
+        "number.test_charge_current",
+        "number.test_charge_limit",
+    ):
+        state = hass.states.get(entity_id)
+        assert state.state == snapshot(name=f"{entity_id}-state")
diff --git a/tests/components/teslemetry/test_select.py b/tests/components/teslemetry/test_select.py
index 005a6a2004e..b17b52903fa 100644
--- a/tests/components/teslemetry/test_select.py
+++ b/tests/components/teslemetry/test_select.py
@@ -5,6 +5,7 @@ from unittest.mock import AsyncMock, patch
 import pytest
 from syrupy.assertion import SnapshotAssertion
 from tesla_fleet_api.const import EnergyExportMode, EnergyOperationMode
+from teslemetry_stream.const import Signal
 
 from homeassistant.components.select import (
     ATTR_OPTION,
@@ -16,7 +17,7 @@ from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
-from . import assert_entities, setup_platform
+from . import assert_entities, reload_platform, setup_platform
 from .const import COMMAND_OK, VEHICLE_DATA_ALT
 
 
@@ -25,6 +26,7 @@ async def test_select(
     hass: HomeAssistant,
     snapshot: SnapshotAssertion,
     entity_registry: er.EntityRegistry,
+    mock_legacy: AsyncMock,
 ) -> None:
     """Tests that the select entities are correct."""
 
@@ -39,7 +41,7 @@ async def test_select_services(hass: HomeAssistant, mock_vehicle_data) -> None:
 
     entity_id = "select.test_seat_heater_front_left"
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.remote_seat_heater_request",
+        "tesla_fleet_api.teslemetry.Vehicle.remote_seat_heater_request",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -54,7 +56,7 @@ async def test_select_services(hass: HomeAssistant, mock_vehicle_data) -> None:
 
     entity_id = "select.test_steering_wheel_heater"
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.remote_steering_wheel_heat_level_request",
+        "tesla_fleet_api.teslemetry.Vehicle.remote_steering_wheel_heat_level_request",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -69,7 +71,7 @@ async def test_select_services(hass: HomeAssistant, mock_vehicle_data) -> None:
 
     entity_id = "select.energy_site_operation_mode"
     with patch(
-        "homeassistant.components.teslemetry.EnergySpecific.operation",
+        "tesla_fleet_api.teslemetry.EnergySite.operation",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -87,7 +89,7 @@ async def test_select_services(hass: HomeAssistant, mock_vehicle_data) -> None:
 
     entity_id = "select.energy_site_allow_export"
     with patch(
-        "homeassistant.components.teslemetry.EnergySpecific.grid_import_export",
+        "tesla_fleet_api.teslemetry.EnergySite.grid_import_export",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -106,6 +108,7 @@ async def test_select_invalid_data(
     snapshot: SnapshotAssertion,
     entity_registry: er.EntityRegistry,
     mock_vehicle_data: AsyncMock,
+    mock_legacy: AsyncMock,
 ) -> None:
     """Tests that the select entities handle invalid data."""
 
@@ -119,3 +122,45 @@ async def test_select_invalid_data(
     assert state.state == STATE_UNKNOWN
     state = hass.states.get("select.test_steering_wheel_heater")
     assert state.state == STATE_UNKNOWN
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_select_streaming(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    mock_vehicle_data: AsyncMock,
+    mock_add_listener: AsyncMock,
+) -> None:
+    """Tests that the select entities with streaming are correct."""
+
+    entry = await setup_platform(hass, [Platform.SELECT])
+
+    # Stream update
+    mock_add_listener.send(
+        {
+            "vin": VEHICLE_DATA_ALT["response"]["vin"],
+            "data": {
+                Signal.SEAT_HEATER_LEFT: 0,
+                Signal.SEAT_HEATER_RIGHT: 1,
+                Signal.SEAT_HEATER_REAR_LEFT: 2,
+                Signal.SEAT_HEATER_REAR_RIGHT: 3,
+                Signal.HVAC_STEERING_WHEEL_HEAT_LEVEL: 0,
+            },
+            "createdAt": "2024-10-04T10:45:17.537Z",
+        }
+    )
+    await hass.async_block_till_done()
+
+    await reload_platform(hass, entry, [Platform.SELECT])
+
+    # Assert the entities restored their values
+    for entity_id in (
+        "select.test_seat_heater_front_left",
+        "select.test_seat_heater_front_right",
+        "select.test_seat_heater_rear_left",
+        "select.test_seat_heater_rear_center",
+        "select.test_seat_heater_rear_right",
+        "select.test_steering_wheel_heater",
+    ):
+        state = hass.states.get(entity_id)
+        assert state.state == snapshot(name=entity_id)
diff --git a/tests/components/teslemetry/test_sensor.py b/tests/components/teslemetry/test_sensor.py
index a488ebc8a06..213811f6ea0 100644
--- a/tests/components/teslemetry/test_sensor.py
+++ b/tests/components/teslemetry/test_sensor.py
@@ -31,9 +31,7 @@ async def test_sensors(
     freezer.move_to("2024-01-01 00:00:00+00:00")
 
     # Force the vehicle to use polling
-    with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.pre2021", return_value=True
-    ):
+    with patch("tesla_fleet_api.teslemetry.Vehicle.pre2021", return_value=True):
         entry = await setup_platform(hass, [Platform.SENSOR])
 
     assert_entities(hass, entry.entry_id, entity_registry, snapshot)
@@ -72,7 +70,7 @@ async def test_sensors_streaming(
                 Signal.AC_CHARGING_ENERGY_IN: 10,
                 Signal.AC_CHARGING_POWER: 2,
                 Signal.CHARGING_CABLE_TYPE: None,
-                Signal.TIME_TO_FULL_CHARGE: 10,
+                Signal.TIME_TO_FULL_CHARGE: 0.166666667,
                 Signal.MINUTES_TO_ARRIVAL: None,
             },
             "createdAt": "2024-10-04T10:45:17.537Z",
diff --git a/tests/components/teslemetry/test_services.py b/tests/components/teslemetry/test_services.py
index a5b55f5dcc5..bcf5407999f 100644
--- a/tests/components/teslemetry/test_services.py
+++ b/tests/components/teslemetry/test_services.py
@@ -51,7 +51,7 @@ async def test_services(
     ).device_id
 
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.navigation_gps_request",
+        "tesla_fleet_api.teslemetry.Vehicle.navigation_gps_request",
         return_value=COMMAND_OK,
     ) as navigation_gps_request:
         await hass.services.async_call(
@@ -66,7 +66,7 @@ async def test_services(
         navigation_gps_request.assert_called_once()
 
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.set_scheduled_charging",
+        "tesla_fleet_api.teslemetry.Vehicle.set_scheduled_charging",
         return_value=COMMAND_OK,
     ) as set_scheduled_charging:
         await hass.services.async_call(
@@ -93,7 +93,7 @@ async def test_services(
         )
 
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.set_scheduled_departure",
+        "tesla_fleet_api.teslemetry.Vehicle.set_scheduled_departure",
         return_value=COMMAND_OK,
     ) as set_scheduled_departure:
         await hass.services.async_call(
@@ -138,7 +138,7 @@ async def test_services(
         )
 
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.set_valet_mode",
+        "tesla_fleet_api.teslemetry.Vehicle.set_valet_mode",
         return_value=COMMAND_OK,
     ) as set_valet_mode:
         await hass.services.async_call(
@@ -154,7 +154,7 @@ async def test_services(
         set_valet_mode.assert_called_once()
 
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.speed_limit_activate",
+        "tesla_fleet_api.teslemetry.Vehicle.speed_limit_activate",
         return_value=COMMAND_OK,
     ) as speed_limit_activate:
         await hass.services.async_call(
@@ -170,7 +170,7 @@ async def test_services(
         speed_limit_activate.assert_called_once()
 
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.speed_limit_deactivate",
+        "tesla_fleet_api.teslemetry.Vehicle.speed_limit_deactivate",
         return_value=COMMAND_OK,
     ) as speed_limit_deactivate:
         await hass.services.async_call(
@@ -186,7 +186,7 @@ async def test_services(
         speed_limit_deactivate.assert_called_once()
 
     with patch(
-        "homeassistant.components.teslemetry.EnergySpecific.time_of_use_settings",
+        "tesla_fleet_api.teslemetry.EnergySite.time_of_use_settings",
         return_value=COMMAND_OK,
     ) as set_time_of_use:
         await hass.services.async_call(
@@ -202,7 +202,7 @@ async def test_services(
 
     with (
         patch(
-            "homeassistant.components.teslemetry.EnergySpecific.time_of_use_settings",
+            "tesla_fleet_api.teslemetry.EnergySite.time_of_use_settings",
             return_value=COMMAND_ERROR,
         ) as set_time_of_use,
         pytest.raises(HomeAssistantError),
diff --git a/tests/components/teslemetry/test_switch.py b/tests/components/teslemetry/test_switch.py
index 6a1ddb430ce..6b31a28db59 100644
--- a/tests/components/teslemetry/test_switch.py
+++ b/tests/components/teslemetry/test_switch.py
@@ -4,6 +4,7 @@ from unittest.mock import AsyncMock, patch
 
 import pytest
 from syrupy.assertion import SnapshotAssertion
+from teslemetry_stream import Signal
 
 from homeassistant.components.switch import (
     DOMAIN as SWITCH_DOMAIN,
@@ -14,7 +15,7 @@ from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
-from . import assert_entities, assert_entities_alt, setup_platform
+from . import assert_entities, assert_entities_alt, reload_platform, setup_platform
 from .const import COMMAND_OK, VEHICLE_DATA_ALT
 
 
@@ -22,6 +23,7 @@ async def test_switch(
     hass: HomeAssistant,
     snapshot: SnapshotAssertion,
     entity_registry: er.EntityRegistry,
+    mock_legacy: AsyncMock,
 ) -> None:
     """Tests that the switch entities are correct."""
 
@@ -34,6 +36,7 @@ async def test_switch_alt(
     snapshot: SnapshotAssertion,
     entity_registry: er.EntityRegistry,
     mock_vehicle_data: AsyncMock,
+    mock_legacy: AsyncMock,
 ) -> None:
     """Tests that the switch entities are correct."""
 
@@ -46,41 +49,41 @@ async def test_switch_alt(
 @pytest.mark.parametrize(
     ("name", "on", "off"),
     [
-        ("test_charge", "VehicleSpecific.charge_start", "VehicleSpecific.charge_stop"),
+        ("test_charge", "Vehicle.charge_start", "Vehicle.charge_stop"),
         (
             "test_auto_seat_climate_left",
-            "VehicleSpecific.remote_auto_seat_climate_request",
-            "VehicleSpecific.remote_auto_seat_climate_request",
+            "Vehicle.remote_auto_seat_climate_request",
+            "Vehicle.remote_auto_seat_climate_request",
         ),
         (
             "test_auto_seat_climate_right",
-            "VehicleSpecific.remote_auto_seat_climate_request",
-            "VehicleSpecific.remote_auto_seat_climate_request",
+            "Vehicle.remote_auto_seat_climate_request",
+            "Vehicle.remote_auto_seat_climate_request",
         ),
         (
             "test_auto_steering_wheel_heater",
-            "VehicleSpecific.remote_auto_steering_wheel_heat_climate_request",
-            "VehicleSpecific.remote_auto_steering_wheel_heat_climate_request",
+            "Vehicle.remote_auto_steering_wheel_heat_climate_request",
+            "Vehicle.remote_auto_steering_wheel_heat_climate_request",
         ),
         (
             "test_defrost",
-            "VehicleSpecific.set_preconditioning_max",
-            "VehicleSpecific.set_preconditioning_max",
+            "Vehicle.set_preconditioning_max",
+            "Vehicle.set_preconditioning_max",
         ),
         (
             "energy_site_storm_watch",
-            "EnergySpecific.storm_mode",
-            "EnergySpecific.storm_mode",
+            "EnergySite.storm_mode",
+            "EnergySite.storm_mode",
         ),
         (
             "energy_site_allow_charging_from_grid",
-            "EnergySpecific.grid_import_export",
-            "EnergySpecific.grid_import_export",
+            "EnergySite.grid_import_export",
+            "EnergySite.grid_import_export",
         ),
         (
             "test_sentry_mode",
-            "VehicleSpecific.set_sentry_mode",
-            "VehicleSpecific.set_sentry_mode",
+            "Vehicle.set_sentry_mode",
+            "Vehicle.set_sentry_mode",
         ),
     ],
 )
@@ -93,7 +96,7 @@ async def test_switch_services(
 
     entity_id = f"switch.{name}"
     with patch(
-        f"homeassistant.components.teslemetry.{on}",
+        f"tesla_fleet_api.teslemetry.{on}",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -107,7 +110,7 @@ async def test_switch_services(
         call.assert_called_once()
 
     with patch(
-        f"homeassistant.components.teslemetry.{off}",
+        f"tesla_fleet_api.teslemetry.{off}",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -119,3 +122,47 @@ async def test_switch_services(
         state = hass.states.get(entity_id)
         assert state.state == STATE_OFF
         call.assert_called_once()
+
+
+async def test_switch_streaming(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    entity_registry: er.EntityRegistry,
+    mock_vehicle_data: AsyncMock,
+    mock_add_listener: AsyncMock,
+) -> None:
+    """Tests that the switch entities with streaming are correct."""
+
+    entry = await setup_platform(hass, [Platform.SWITCH])
+
+    # Stream update
+    mock_add_listener.send(
+        {
+            "vin": VEHICLE_DATA_ALT["response"]["vin"],
+            "data": {
+                Signal.SENTRY_MODE: "SentryModeStateIdle",
+                Signal.AUTO_SEAT_CLIMATE_LEFT: True,
+                Signal.AUTO_SEAT_CLIMATE_RIGHT: False,
+                Signal.HVAC_STEERING_WHEEL_HEAT_AUTO: True,
+                Signal.DEFROST_MODE: "DefrostModeStateOff",
+                Signal.DETAILED_CHARGE_STATE: "DetailedChargeStateCharging",
+            },
+            "createdAt": "2024-10-04T10:45:17.537Z",
+        }
+    )
+    await hass.async_block_till_done()
+
+    # Reload the entry
+    await reload_platform(hass, entry, [Platform.SWITCH])
+
+    # Assert the entities restored their values
+    for entity_id in (
+        "switch.test_sentry_mode",
+        "switch.test_auto_seat_climate_left",
+        "switch.test_auto_seat_climate_right",
+        "switch.test_auto_steering_wheel_heater",
+        "switch.test_defrost",
+        "switch.test_charge",
+    ):
+        state = hass.states.get(entity_id)
+        assert state.state == snapshot(name=entity_id)
diff --git a/tests/components/teslemetry/test_update.py b/tests/components/teslemetry/test_update.py
index 448f31afd67..af6c9d847f1 100644
--- a/tests/components/teslemetry/test_update.py
+++ b/tests/components/teslemetry/test_update.py
@@ -4,7 +4,9 @@ import copy
 from unittest.mock import AsyncMock, patch
 
 from freezegun.api import FrozenDateTimeFactory
+import pytest
 from syrupy.assertion import SnapshotAssertion
+from teslemetry_stream import Signal
 
 from homeassistant.components.teslemetry.coordinator import VEHICLE_INTERVAL
 from homeassistant.components.teslemetry.update import INSTALLING
@@ -13,7 +15,7 @@ from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
-from . import assert_entities, setup_platform
+from . import assert_entities, reload_platform, setup_platform
 from .const import COMMAND_OK, VEHICLE_DATA, VEHICLE_DATA_ALT
 
 from tests.common import async_fire_time_changed
@@ -23,6 +25,7 @@ async def test_update(
     hass: HomeAssistant,
     snapshot: SnapshotAssertion,
     entity_registry: er.EntityRegistry,
+    mock_legacy: AsyncMock,
 ) -> None:
     """Tests that the update entities are correct."""
 
@@ -35,6 +38,7 @@ async def test_update_alt(
     snapshot: SnapshotAssertion,
     entity_registry: er.EntityRegistry,
     mock_vehicle_data: AsyncMock,
+    mock_legacy: AsyncMock,
 ) -> None:
     """Tests that the update entities are correct."""
 
@@ -48,6 +52,7 @@ async def test_update_services(
     mock_vehicle_data: AsyncMock,
     freezer: FrozenDateTimeFactory,
     snapshot: SnapshotAssertion,
+    mock_legacy: AsyncMock,
 ) -> None:
     """Tests that the update services work."""
 
@@ -56,7 +61,7 @@ async def test_update_services(
     entity_id = "update.test_update"
 
     with patch(
-        "homeassistant.components.teslemetry.VehicleSpecific.schedule_software_update",
+        "tesla_fleet_api.teslemetry.Vehicle.schedule_software_update",
         return_value=COMMAND_OK,
     ) as call:
         await hass.services.async_call(
@@ -78,3 +83,90 @@ async def test_update_services(
 
     state = hass.states.get(entity_id)
     assert state.attributes["in_progress"] == 1
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_update_streaming(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    mock_vehicle_data: AsyncMock,
+    mock_add_listener: AsyncMock,
+) -> None:
+    """Tests that the select entities with streaming are correct."""
+
+    entry = await setup_platform(hass, [Platform.UPDATE])
+
+    # Stream update
+    mock_add_listener.send(
+        {
+            "vin": VEHICLE_DATA_ALT["response"]["vin"],
+            "data": {
+                Signal.SOFTWARE_UPDATE_DOWNLOAD_PERCENT_COMPLETE: 50,
+                Signal.SOFTWARE_UPDATE_INSTALLATION_PERCENT_COMPLETE: None,
+                Signal.SOFTWARE_UPDATE_SCHEDULED_START_TIME: None,
+                Signal.SOFTWARE_UPDATE_VERSION: "2025.2.1",
+                Signal.VERSION: "2025.1.1",
+            },
+            "createdAt": "2024-10-04T10:45:17.537Z",
+        }
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("update.test_update")
+    assert state == snapshot(name="downloading")
+
+    mock_add_listener.send(
+        {
+            "vin": VEHICLE_DATA_ALT["response"]["vin"],
+            "data": {
+                Signal.SOFTWARE_UPDATE_DOWNLOAD_PERCENT_COMPLETE: 100,
+                Signal.SOFTWARE_UPDATE_INSTALLATION_PERCENT_COMPLETE: 1,
+                Signal.SOFTWARE_UPDATE_SCHEDULED_START_TIME: None,
+                Signal.SOFTWARE_UPDATE_VERSION: "2025.2.1",
+                Signal.VERSION: "2025.1.1",
+            },
+            "createdAt": "2024-10-04T10:45:17.537Z",
+        }
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("update.test_update")
+    assert state == snapshot(name="ready")
+
+    mock_add_listener.send(
+        {
+            "vin": VEHICLE_DATA_ALT["response"]["vin"],
+            "data": {
+                Signal.SOFTWARE_UPDATE_DOWNLOAD_PERCENT_COMPLETE: 100,
+                Signal.SOFTWARE_UPDATE_INSTALLATION_PERCENT_COMPLETE: 50,
+                Signal.SOFTWARE_UPDATE_SCHEDULED_START_TIME: None,
+                Signal.SOFTWARE_UPDATE_VERSION: "2025.2.1",
+                Signal.VERSION: "2025.1.1",
+            },
+            "createdAt": "2024-10-04T10:45:17.537Z",
+        }
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("update.test_update")
+    assert state == snapshot(name="installing")
+
+    mock_add_listener.send(
+        {
+            "vin": VEHICLE_DATA_ALT["response"]["vin"],
+            "data": {
+                Signal.SOFTWARE_UPDATE_DOWNLOAD_PERCENT_COMPLETE: None,
+                Signal.SOFTWARE_UPDATE_INSTALLATION_PERCENT_COMPLETE: None,
+                Signal.SOFTWARE_UPDATE_SCHEDULED_START_TIME: None,
+                Signal.SOFTWARE_UPDATE_VERSION: "",
+                Signal.VERSION: "2025.2.1",
+            },
+            "createdAt": "2024-10-04T10:45:17.537Z",
+        }
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("update.test_update")
+    assert state == snapshot(name="updated")
+
+    await reload_platform(hass, entry, [Platform.UPDATE])
+
+    state = hass.states.get("update.test_update")
+    assert state == snapshot(name="restored")
diff --git a/tests/components/tessie/conftest.py b/tests/components/tessie/conftest.py
index e0aba73af17..5fb844ff6b4 100644
--- a/tests/components/tessie/conftest.py
+++ b/tests/components/tessie/conftest.py
@@ -85,7 +85,7 @@ def mock_request():
 def mock_live_status():
     """Mock Tesla Fleet API EnergySpecific live_status method."""
     with patch(
-        "homeassistant.components.tessie.EnergySpecific.live_status",
+        "tesla_fleet_api.tessie.EnergySite.live_status",
         side_effect=lambda: deepcopy(LIVE_STATUS),
     ) as mock_live_status:
         yield mock_live_status
@@ -95,7 +95,7 @@ def mock_live_status():
 def mock_site_info():
     """Mock Tesla Fleet API EnergySpecific site_info method."""
     with patch(
-        "homeassistant.components.tessie.EnergySpecific.site_info",
+        "tesla_fleet_api.tessie.EnergySite.site_info",
         side_effect=lambda: deepcopy(SITE_INFO),
     ) as mock_live_status:
         yield mock_live_status
diff --git a/tests/components/tessie/snapshots/test_binary_sensor.ambr b/tests/components/tessie/snapshots/test_binary_sensor.ambr
index 6c0da044df2..2fe97b88811 100644
--- a/tests/components/tessie/snapshots/test_binary_sensor.ambr
+++ b/tests/components/tessie/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -190,6 +194,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +241,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -282,6 +288,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -328,6 +335,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -375,6 +383,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -422,6 +431,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -469,6 +479,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -516,6 +527,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -563,6 +575,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -610,6 +623,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -657,6 +671,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -704,6 +719,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -751,6 +767,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -798,6 +815,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -844,6 +862,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -891,6 +910,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -938,6 +958,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -985,6 +1006,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1032,6 +1054,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1078,6 +1101,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1125,6 +1149,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1172,6 +1197,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1219,6 +1245,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1266,6 +1293,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1313,6 +1341,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1359,6 +1388,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tessie/snapshots/test_button.ambr b/tests/components/tessie/snapshots/test_button.ambr
index 7757d1f2fea..96ece94a1c9 100644
--- a/tests/components/tessie/snapshots/test_button.ambr
+++ b/tests/components/tessie/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -190,6 +194,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +241,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tessie/snapshots/test_climate.ambr b/tests/components/tessie/snapshots/test_climate.ambr
index 959b42cea53..415988e783e 100644
--- a/tests/components/tessie/snapshots/test_climate.ambr
+++ b/tests/components/tessie/snapshots/test_climate.ambr
@@ -19,6 +19,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tessie/snapshots/test_cover.ambr b/tests/components/tessie/snapshots/test_cover.ambr
index 6338758afb7..fdf2a967048 100644
--- a/tests/components/tessie/snapshots/test_cover.ambr
+++ b/tests/components/tessie/snapshots/test_cover.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -102,6 +104,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -198,6 +202,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tessie/snapshots/test_device_tracker.ambr b/tests/components/tessie/snapshots/test_device_tracker.ambr
index 61f89db8637..92502340aa2 100644
--- a/tests/components/tessie/snapshots/test_device_tracker.ambr
+++ b/tests/components/tessie/snapshots/test_device_tracker.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -58,6 +59,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tessie/snapshots/test_lock.ambr b/tests/components/tessie/snapshots/test_lock.ambr
index cea2bebbddb..f819281d79b 100644
--- a/tests/components/tessie/snapshots/test_lock.ambr
+++ b/tests/components/tessie/snapshots/test_lock.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tessie/snapshots/test_media_player.ambr b/tests/components/tessie/snapshots/test_media_player.ambr
index 6c355c8ddca..911598004a6 100644
--- a/tests/components/tessie/snapshots/test_media_player.ambr
+++ b/tests/components/tessie/snapshots/test_media_player.ambr
@@ -7,6 +7,7 @@
     'capabilities': dict({
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tessie/snapshots/test_number.ambr b/tests/components/tessie/snapshots/test_number.ambr
index 6e641bdf5b7..0e43695ca78 100644
--- a/tests/components/tessie/snapshots/test_number.ambr
+++ b/tests/components/tessie/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -69,6 +70,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -127,6 +129,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -184,6 +187,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -241,6 +245,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tessie/snapshots/test_select.ambr b/tests/components/tessie/snapshots/test_select.ambr
index acc1946aab5..f118633aded 100644
--- a/tests/components/tessie/snapshots/test_select.ambr
+++ b/tests/components/tessie/snapshots/test_select.ambr
@@ -12,6 +12,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -69,6 +70,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -127,6 +129,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -186,6 +189,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -245,6 +249,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -304,6 +309,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -363,6 +369,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -422,6 +429,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -481,6 +489,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tessie/snapshots/test_sensor.ambr b/tests/components/tessie/snapshots/test_sensor.ambr
index 0a5ff4603aa..b40cf204bca 100644
--- a/tests/components/tessie/snapshots/test_sensor.ambr
+++ b/tests/components/tessie/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -65,6 +66,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -122,6 +124,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -179,6 +182,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +240,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -293,6 +298,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -350,6 +356,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -404,6 +411,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -461,6 +469,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -516,6 +525,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -566,6 +576,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -617,6 +628,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -674,6 +686,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -731,6 +744,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -788,6 +802,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -842,6 +857,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -896,6 +912,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -947,6 +964,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -998,6 +1016,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1056,6 +1075,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1111,6 +1131,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1159,6 +1180,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1213,6 +1235,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1267,6 +1290,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1321,6 +1345,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1378,6 +1403,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1432,6 +1458,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1486,6 +1513,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1542,6 +1570,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1585,7 +1614,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'unknown',
+    'state': 'p',
   })
 # ---
 # name: test_sensors[sensor.test_speed-entry]
@@ -1597,6 +1626,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1651,6 +1681,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1700,6 +1731,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1747,6 +1779,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1796,6 +1829,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1853,6 +1887,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1910,6 +1945,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1967,6 +2003,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2024,6 +2061,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2075,6 +2113,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2132,6 +2171,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2200,6 +2240,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2272,6 +2313,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2331,6 +2373,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2377,6 +2420,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tessie/snapshots/test_switch.ambr b/tests/components/tessie/snapshots/test_switch.ambr
index 3b7a3623de8..371ef822122 100644
--- a/tests/components/tessie/snapshots/test_switch.ambr
+++ b/tests/components/tessie/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -119,7 +122,7 @@
     'platform': 'tessie',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': 'charge_state_charge_enable_request',
+    'translation_key': 'charge_state_charging_state',
     'unique_id': 'VINVINVIN-charge_state_charge_enable_request',
     'unit_of_measurement': None,
   })
@@ -145,6 +148,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -192,6 +196,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -239,6 +244,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -286,6 +292,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -351,6 +358,6 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'on',
+    'state': 'off',
   })
 # ---
diff --git a/tests/components/tessie/snapshots/test_update.ambr b/tests/components/tessie/snapshots/test_update.ambr
index 1728c13b0ad..e4c25e2230f 100644
--- a/tests/components/tessie/snapshots/test_update.ambr
+++ b/tests/components/tessie/snapshots/test_update.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tessie/test_number.py b/tests/components/tessie/test_number.py
index 0fb13779183..69bbe1c9087 100644
--- a/tests/components/tessie/test_number.py
+++ b/tests/components/tessie/test_number.py
@@ -67,7 +67,7 @@ async def test_numbers(
 
     entity_id = "number.energy_site_backup_reserve"
     with patch(
-        "homeassistant.components.teslemetry.EnergySpecific.backup",
+        "tesla_fleet_api.tessie.EnergySite.backup",
         return_value=TEST_RESPONSE,
     ) as call:
         await hass.services.async_call(
@@ -85,7 +85,7 @@ async def test_numbers(
 
     entity_id = "number.energy_site_off_grid_reserve"
     with patch(
-        "homeassistant.components.teslemetry.EnergySpecific.off_grid_vehicle_charging_reserve",
+        "tesla_fleet_api.tessie.EnergySite.off_grid_vehicle_charging_reserve",
         return_value=TEST_RESPONSE,
     ) as call:
         await hass.services.async_call(
diff --git a/tests/components/tessie/test_select.py b/tests/components/tessie/test_select.py
index c78923fbf5b..64380d363fc 100644
--- a/tests/components/tessie/test_select.py
+++ b/tests/components/tessie/test_select.py
@@ -52,7 +52,7 @@ async def test_select(
     # Test site operation mode
     entity_id = "select.energy_site_operation_mode"
     with patch(
-        "homeassistant.components.teslemetry.EnergySpecific.operation",
+        "tesla_fleet_api.tessie.EnergySite.operation",
         return_value=TEST_RESPONSE,
     ) as call:
         await hass.services.async_call(
@@ -71,7 +71,7 @@ async def test_select(
     # Test site export mode
     entity_id = "select.energy_site_allow_export"
     with patch(
-        "homeassistant.components.teslemetry.EnergySpecific.grid_import_export",
+        "tesla_fleet_api.tessie.EnergySite.grid_import_export",
         return_value=TEST_RESPONSE,
     ) as call:
         await hass.services.async_call(
@@ -129,7 +129,7 @@ async def test_errors(hass: HomeAssistant) -> None:
     # Test changing energy select with unknown error
     with (
         patch(
-            "homeassistant.components.tessie.EnergySpecific.operation",
+            "tesla_fleet_api.tessie.EnergySite.operation",
             side_effect=UnsupportedVehicle,
         ) as mock_set,
         pytest.raises(HomeAssistantError) as error,
diff --git a/tests/components/tessie/test_switch.py b/tests/components/tessie/test_switch.py
index 499e529b2e8..f58468edfb7 100644
--- a/tests/components/tessie/test_switch.py
+++ b/tests/components/tessie/test_switch.py
@@ -20,7 +20,7 @@ from .common import RESPONSE_OK, assert_entities, setup_platform
 async def test_switches(
     hass: HomeAssistant, snapshot: SnapshotAssertion, entity_registry: er.EntityRegistry
 ) -> None:
-    """Tests that the switche entities are correct."""
+    """Tests that the switch entities are correct."""
 
     entry = await setup_platform(hass, [Platform.SWITCH])
 
@@ -61,13 +61,13 @@ async def test_switches(
     [
         (
             "energy_site_storm_watch",
-            "EnergySpecific.storm_mode",
-            "EnergySpecific.storm_mode",
+            "storm_mode",
+            "storm_mode",
         ),
         (
             "energy_site_allow_charging_from_grid",
-            "EnergySpecific.grid_import_export",
-            "EnergySpecific.grid_import_export",
+            "grid_import_export",
+            "grid_import_export",
         ),
     ],
 )
@@ -80,7 +80,7 @@ async def test_switch_services(
 
     entity_id = f"switch.{name}"
     with patch(
-        f"homeassistant.components.teslemetry.{on}",
+        f"tesla_fleet_api.tessie.EnergySite.{on}",
         return_value=RESPONSE_OK,
     ) as call:
         await hass.services.async_call(
@@ -94,7 +94,7 @@ async def test_switch_services(
         call.assert_called_once()
 
     with patch(
-        f"homeassistant.components.teslemetry.{off}",
+        f"tesla_fleet_api.tessie.EnergySite.{off}",
         return_value=RESPONSE_OK,
     ) as call:
         await hass.services.async_call(
diff --git a/tests/components/thermobeacon/test_config_flow.py b/tests/components/thermobeacon/test_config_flow.py
index a26a2b70c5e..2194168c25d 100644
--- a/tests/components/thermobeacon/test_config_flow.py
+++ b/tests/components/thermobeacon/test_config_flow.py
@@ -79,6 +79,38 @@ async def test_async_step_user_with_found_devices(hass: HomeAssistant) -> None:
     assert result2["result"].unique_id == "aa:bb:cc:dd:ee:ff"
 
 
+async def test_async_step_user_replace_ignored(hass: HomeAssistant) -> None:
+    """Test setup from service info can replace an ignored entry."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=THERMOBEACON_SERVICE_INFO.address,
+        data={},
+        source=config_entries.SOURCE_IGNORE,
+    )
+    entry.add_to_hass(hass)
+    with patch(
+        "homeassistant.components.thermobeacon.config_flow.async_discovered_service_info",
+        return_value=[THERMOBEACON_SERVICE_INFO],
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_USER},
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    with patch(
+        "homeassistant.components.thermobeacon.async_setup_entry", return_value=True
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input={"address": "aa:bb:cc:dd:ee:ff"},
+        )
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "Lanyard/mini hygrometer EEFF"
+    assert result2["data"] == {}
+    assert result2["result"].unique_id == "aa:bb:cc:dd:ee:ff"
+
+
 async def test_async_step_user_device_added_between_steps(hass: HomeAssistant) -> None:
     """Test the device gets added via another flow between steps."""
     with patch(
diff --git a/tests/components/thermopro/__init__.py b/tests/components/thermopro/__init__.py
index 264e556756c..d3cba26858f 100644
--- a/tests/components/thermopro/__init__.py
+++ b/tests/components/thermopro/__init__.py
@@ -23,6 +23,16 @@ TP357_SERVICE_INFO = BluetoothServiceInfo(
     source="local",
 )
 
+TP358_SERVICE_INFO = BluetoothServiceInfo(
+    name="TP358 (4221)",
+    manufacturer_data={61890: b"\x00\x1d\x02,"},
+    service_uuids=[],
+    address="aa:bb:cc:dd:ee:ff",
+    rssi=-65,
+    service_data={},
+    source="local",
+)
+
 TP962R_SERVICE_INFO = BluetoothServiceInfo(
     name="TP962R (0000)",
     manufacturer_data={14081: b"\x00;\x0b7\x00"},
diff --git a/tests/components/thermopro/conftest.py b/tests/components/thermopro/conftest.py
index 445f52b7844..0dcc03ae7f4 100644
--- a/tests/components/thermopro/conftest.py
+++ b/tests/components/thermopro/conftest.py
@@ -1,8 +1,64 @@
 """ThermoPro session fixtures."""
 
+from datetime import datetime
+from unittest.mock import AsyncMock, MagicMock
+
 import pytest
+from thermopro_ble import ThermoProDevice
+
+from homeassistant.components.thermopro.const import DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.util.dt import now
+
+from tests.common import MockConfigEntry
 
 
 @pytest.fixture(autouse=True)
 def mock_bluetooth(enable_bluetooth: None) -> None:
     """Auto mock bluetooth."""
+
+
+@pytest.fixture
+def dummy_thermoprodevice(monkeypatch: pytest.MonkeyPatch) -> ThermoProDevice:
+    """Mock for downstream library."""
+    client = ThermoProDevice("")
+    monkeypatch.setattr(client, "set_datetime", AsyncMock())
+    return client
+
+
+@pytest.fixture
+def mock_thermoprodevice(
+    monkeypatch: pytest.MonkeyPatch, dummy_thermoprodevice: ThermoProDevice
+) -> ThermoProDevice:
+    """Return downstream library mock."""
+    monkeypatch.setattr(
+        "homeassistant.components.thermopro.button.ThermoProDevice",
+        MagicMock(return_value=dummy_thermoprodevice),
+    )
+    return dummy_thermoprodevice
+
+
+@pytest.fixture
+def mock_now(monkeypatch: pytest.MonkeyPatch) -> datetime:
+    """Return fixed datetime for comparison."""
+    fixed_now = now()
+    monkeypatch.setattr(
+        "homeassistant.components.thermopro.button.now",
+        MagicMock(return_value=fixed_now),
+    )
+    return fixed_now
+
+
+@pytest.fixture
+async def setup_thermopro(
+    hass: HomeAssistant, mock_thermoprodevice: ThermoProDevice
+) -> None:
+    """Set up the Thermopro integration."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id="aa:bb:cc:dd:ee:ff",
+    )
+    entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+    return entry
diff --git a/tests/components/thermopro/test_button.py b/tests/components/thermopro/test_button.py
new file mode 100644
index 00000000000..e4c73af11be
--- /dev/null
+++ b/tests/components/thermopro/test_button.py
@@ -0,0 +1,135 @@
+"""Test the ThermoPro button platform."""
+
+from datetime import datetime, timedelta
+import time
+
+import pytest
+from thermopro_ble import ThermoProDevice
+
+from homeassistant.components.bluetooth import (
+    FALLBACK_MAXIMUM_STALE_ADVERTISEMENT_SECONDS,
+)
+from homeassistant.const import ATTR_ENTITY_ID, STATE_UNAVAILABLE, STATE_UNKNOWN
+from homeassistant.core import HomeAssistant
+from homeassistant.util import dt as dt_util
+
+from . import TP357_SERVICE_INFO, TP358_SERVICE_INFO
+
+from tests.common import async_fire_time_changed
+from tests.components.bluetooth import (
+    inject_bluetooth_service_info,
+    patch_all_discovered_devices,
+    patch_bluetooth_time,
+)
+
+
+@pytest.mark.usefixtures("setup_thermopro")
+async def test_buttons_tp357(hass: HomeAssistant) -> None:
+    """Test setting up creates the sensors."""
+    assert not hass.states.async_all()
+    assert not hass.states.get("button.tp358_4221_set_date_time")
+    inject_bluetooth_service_info(hass, TP357_SERVICE_INFO)
+    await hass.async_block_till_done()
+    assert not hass.states.get("button.tp358_4221_set_date_time")
+
+
+@pytest.mark.usefixtures("setup_thermopro")
+async def test_buttons_tp358_discovery(hass: HomeAssistant) -> None:
+    """Test discovery of device with button."""
+    assert not hass.states.async_all()
+    assert not hass.states.get("button.tp358_4221_set_date_time")
+    inject_bluetooth_service_info(hass, TP358_SERVICE_INFO)
+    await hass.async_block_till_done()
+
+    button = hass.states.get("button.tp358_4221_set_date_time")
+    assert button is not None
+    assert button.state == STATE_UNKNOWN
+
+
+@pytest.mark.usefixtures("setup_thermopro")
+async def test_buttons_tp358_unavailable(hass: HomeAssistant) -> None:
+    """Test tp358 set date&time button goes to unavailability."""
+    start_monotonic = time.monotonic()
+    assert not hass.states.async_all()
+    assert not hass.states.get("button.tp358_4221_set_date_time")
+    inject_bluetooth_service_info(hass, TP358_SERVICE_INFO)
+    await hass.async_block_till_done()
+
+    button = hass.states.get("button.tp358_4221_set_date_time")
+    assert button is not None
+    assert button.state == STATE_UNKNOWN
+
+    # Fast-forward time without BLE advertisements
+    monotonic_now = start_monotonic + FALLBACK_MAXIMUM_STALE_ADVERTISEMENT_SECONDS + 15
+
+    with patch_bluetooth_time(monotonic_now), patch_all_discovered_devices([]):
+        async_fire_time_changed(
+            hass,
+            dt_util.utcnow()
+            + timedelta(seconds=FALLBACK_MAXIMUM_STALE_ADVERTISEMENT_SECONDS + 15),
+        )
+        await hass.async_block_till_done()
+
+    button = hass.states.get("button.tp358_4221_set_date_time")
+
+    assert button.state == STATE_UNAVAILABLE
+
+
+@pytest.mark.usefixtures("setup_thermopro")
+async def test_buttons_tp358_reavailable(hass: HomeAssistant) -> None:
+    """Test TP358/TP393 set date&time button goes to unavailablity and recovers."""
+    start_monotonic = time.monotonic()
+    assert not hass.states.async_all()
+    assert not hass.states.get("button.tp358_4221_set_date_time")
+    inject_bluetooth_service_info(hass, TP358_SERVICE_INFO)
+    await hass.async_block_till_done()
+
+    button = hass.states.get("button.tp358_4221_set_date_time")
+    assert button is not None
+    assert button.state == STATE_UNKNOWN
+
+    # Fast-forward time without BLE advertisements
+    monotonic_now = start_monotonic + FALLBACK_MAXIMUM_STALE_ADVERTISEMENT_SECONDS + 15
+
+    with patch_bluetooth_time(monotonic_now), patch_all_discovered_devices([]):
+        async_fire_time_changed(
+            hass,
+            dt_util.utcnow()
+            + timedelta(seconds=FALLBACK_MAXIMUM_STALE_ADVERTISEMENT_SECONDS + 15),
+        )
+        await hass.async_block_till_done()
+
+        button = hass.states.get("button.tp358_4221_set_date_time")
+
+        assert button.state == STATE_UNAVAILABLE
+
+        inject_bluetooth_service_info(hass, TP358_SERVICE_INFO)
+        await hass.async_block_till_done()
+
+        button = hass.states.get("button.tp358_4221_set_date_time")
+
+        assert button.state == STATE_UNKNOWN
+
+
+@pytest.mark.usefixtures("setup_thermopro")
+async def test_buttons_tp358_press(
+    hass: HomeAssistant, mock_now: datetime, mock_thermoprodevice: ThermoProDevice
+) -> None:
+    """Test TP358/TP393 set date&time button press."""
+    assert not hass.states.async_all()
+    assert not hass.states.get("button.tp358_4221_set_date_time")
+    inject_bluetooth_service_info(hass, TP358_SERVICE_INFO)
+    await hass.async_block_till_done()
+    assert hass.states.get("button.tp358_4221_set_date_time")
+
+    await hass.services.async_call(
+        "button",
+        "press",
+        {ATTR_ENTITY_ID: "button.tp358_4221_set_date_time"},
+        blocking=True,
+    )
+
+    mock_thermoprodevice.set_datetime.assert_awaited_once_with(mock_now, am_pm=False)
+
+    button_state = hass.states.get("button.tp358_4221_set_date_time")
+    assert button_state.state != STATE_UNKNOWN
diff --git a/tests/components/thermopro/test_config_flow.py b/tests/components/thermopro/test_config_flow.py
index 9b9fdd67334..3cf68fb612c 100644
--- a/tests/components/thermopro/test_config_flow.py
+++ b/tests/components/thermopro/test_config_flow.py
@@ -79,6 +79,38 @@ async def test_async_step_user_with_found_devices(hass: HomeAssistant) -> None:
     assert result2["result"].unique_id == "4125DDBA-2774-4851-9889-6AADDD4CAC3D"
 
 
+async def test_async_step_user_replace_ignored(hass: HomeAssistant) -> None:
+    """Test setup from service info and replace an ignored entry."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=TP357_SERVICE_INFO.address,
+        data={},
+        source=config_entries.SOURCE_IGNORE,
+    )
+    entry.add_to_hass(hass)
+    with patch(
+        "homeassistant.components.thermopro.config_flow.async_discovered_service_info",
+        return_value=[TP357_SERVICE_INFO],
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_USER},
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    with patch(
+        "homeassistant.components.thermopro.async_setup_entry", return_value=True
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input={"address": "4125DDBA-2774-4851-9889-6AADDD4CAC3D"},
+        )
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "TP357 (2142) AC3D"
+    assert result2["data"] == {}
+    assert result2["result"].unique_id == "4125DDBA-2774-4851-9889-6AADDD4CAC3D"
+
+
 async def test_async_step_user_device_added_between_steps(hass: HomeAssistant) -> None:
     """Test the device gets added via another flow between steps."""
     with patch(
diff --git a/tests/components/tibber/test_statistics.py b/tests/components/tibber/test_statistics.py
index d817c9612aa..845df86a88c 100644
--- a/tests/components/tibber/test_statistics.py
+++ b/tests/components/tibber/test_statistics.py
@@ -10,10 +10,13 @@ from homeassistant.util import dt as dt_util
 
 from .test_common import CONSUMPTION_DATA_1, PRODUCTION_DATA_1, mock_get_homes
 
+from tests.common import MockConfigEntry
 from tests.components.recorder.common import async_wait_recording_done
 
 
-async def test_async_setup_entry(recorder_mock: Recorder, hass: HomeAssistant) -> None:
+async def test_async_setup_entry(
+    recorder_mock: Recorder, hass: HomeAssistant, config_entry: MockConfigEntry
+) -> None:
     """Test setup Tibber."""
     tibber_connection = AsyncMock()
     tibber_connection.name = "tibber"
@@ -21,7 +24,7 @@ async def test_async_setup_entry(recorder_mock: Recorder, hass: HomeAssistant) -
     tibber_connection.fetch_production_data_active_homes.return_value = None
     tibber_connection.get_homes = mock_get_homes
 
-    coordinator = TibberDataCoordinator(hass, tibber_connection)
+    coordinator = TibberDataCoordinator(hass, config_entry, tibber_connection)
     await coordinator._async_update_data()
     await async_wait_recording_done(hass)
 
diff --git a/tests/components/tile/snapshots/test_binary_sensor.ambr b/tests/components/tile/snapshots/test_binary_sensor.ambr
index 5f72f53fa1e..6de356ebf51 100644
--- a/tests/components/tile/snapshots/test_binary_sensor.ambr
+++ b/tests/components/tile/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tile/snapshots/test_device_tracker.ambr b/tests/components/tile/snapshots/test_device_tracker.ambr
index 15108331e66..f5de1511c99 100644
--- a/tests/components/tile/snapshots/test_device_tracker.ambr
+++ b/tests/components/tile/snapshots/test_device_tracker.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tile/snapshots/test_init.ambr b/tests/components/tile/snapshots/test_init.ambr
index 90f165d1e6e..ffdf6a6251a 100644
--- a/tests/components/tile/snapshots/test_init.ambr
+++ b/tests/components/tile/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/tilt_ble/test_config_flow.py b/tests/components/tilt_ble/test_config_flow.py
index fd996228034..9c9450f3996 100644
--- a/tests/components/tilt_ble/test_config_flow.py
+++ b/tests/components/tilt_ble/test_config_flow.py
@@ -79,6 +79,37 @@ async def test_async_step_user_with_found_devices(hass: HomeAssistant) -> None:
     assert result2["result"].unique_id == "F6:0F:28:F2:1F:CB"
 
 
+async def test_async_step_user_replaces_ignored(hass: HomeAssistant) -> None:
+    """Test setup from service info can replace an ignored entry."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=TILT_GREEN_SERVICE_INFO.address,
+        source=config_entries.SOURCE_IGNORE,
+    )
+    entry.add_to_hass(hass)
+    with patch(
+        "homeassistant.components.tilt_ble.config_flow.async_discovered_service_info",
+        return_value=[TILT_GREEN_SERVICE_INFO],
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_USER},
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    with patch(
+        "homeassistant.components.tilt_ble.async_setup_entry", return_value=True
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input={"address": "F6:0F:28:F2:1F:CB"},
+        )
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "Tilt Green"
+    assert result2["data"] == {}
+    assert result2["result"].unique_id == "F6:0F:28:F2:1F:CB"
+
+
 async def test_async_step_user_device_added_between_steps(hass: HomeAssistant) -> None:
     """Test the device gets added via another flow between steps."""
     with patch(
diff --git a/tests/components/time_date/test_sensor.py b/tests/components/time_date/test_sensor.py
index ddeec48b3d2..3daa0314cbd 100644
--- a/tests/components/time_date/test_sensor.py
+++ b/tests/components/time_date/test_sensor.py
@@ -8,7 +8,7 @@ import pytest
 from homeassistant.components.time_date.const import OPTION_TYPES
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import event
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import load_int
 
diff --git a/tests/components/timer/test_init.py b/tests/components/timer/test_init.py
index 95baa07eaa9..6e68b354087 100644
--- a/tests/components/timer/test_init.py
+++ b/tests/components/timer/test_init.py
@@ -196,6 +196,12 @@ async def test_methods_and_events(hass: HomeAssistant) -> None:
             "event": EVENT_TIMER_CANCELLED,
             "data": {},
         },
+        {
+            "call": SERVICE_CANCEL,
+            "state": STATUS_IDLE,
+            "event": None,
+            "data": {},
+        },
         {
             "call": SERVICE_START,
             "state": STATUS_ACTIVE,
@@ -208,6 +214,12 @@ async def test_methods_and_events(hass: HomeAssistant) -> None:
             "event": EVENT_TIMER_FINISHED,
             "data": {},
         },
+        {
+            "call": SERVICE_FINISH,
+            "state": STATUS_IDLE,
+            "event": None,
+            "data": {},
+        },
         {
             "call": SERVICE_START,
             "state": STATUS_ACTIVE,
@@ -244,6 +256,18 @@ async def test_methods_and_events(hass: HomeAssistant) -> None:
             "event": EVENT_TIMER_RESTARTED,
             "data": {},
         },
+        {
+            "call": SERVICE_PAUSE,
+            "state": STATUS_PAUSED,
+            "event": EVENT_TIMER_PAUSED,
+            "data": {},
+        },
+        {
+            "call": SERVICE_FINISH,
+            "state": STATUS_IDLE,
+            "event": EVENT_TIMER_FINISHED,
+            "data": {},
+        },
     ]
 
     expected_events = 0
diff --git a/tests/components/tod/test_binary_sensor.py b/tests/components/tod/test_binary_sensor.py
index b4b6b13d8e3..8b9a81d7542 100644
--- a/tests/components/tod/test_binary_sensor.py
+++ b/tests/components/tod/test_binary_sensor.py
@@ -7,10 +7,10 @@ import pytest
 
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.sun import get_astral_event_date, get_astral_event_next
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import assert_setup_component, async_fire_time_changed
 
diff --git a/tests/components/todo/__init__.py b/tests/components/todo/__init__.py
index 0138e561fad..239b586d366 100644
--- a/tests/components/todo/__init__.py
+++ b/tests/components/todo/__init__.py
@@ -3,7 +3,7 @@
 from homeassistant.components.todo import DOMAIN, TodoItem, TodoListEntity
 from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from tests.common import MockConfigEntry, MockPlatform, mock_platform
 
@@ -34,6 +34,13 @@ class MockTodoListEntity(TodoListEntity):
         """Delete an item in the To-do list."""
         self._attr_todo_items = [item for item in self.items if item.uid not in uids]
 
+    async def async_update_todo_item(self, item: TodoItem) -> None:
+        """Update an item in the To-do list."""
+        for idx, existing_item in enumerate(self.items):
+            if existing_item.uid == item.uid:
+                self._attr_todo_items[idx] = item
+                break
+
 
 async def create_mock_platform(
     hass: HomeAssistant,
@@ -44,7 +51,7 @@ async def create_mock_platform(
     async def async_setup_entry_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test event platform via config entry."""
         async_add_entities(entities)
diff --git a/tests/components/todo/test_init.py b/tests/components/todo/test_init.py
index 8e8c010f758..11ef3d6f044 100644
--- a/tests/components/todo/test_init.py
+++ b/tests/components/todo/test_init.py
@@ -7,8 +7,6 @@ import zoneinfo
 import pytest
 import voluptuous as vol
 
-from homeassistant.components import conversation
-from homeassistant.components.homeassistant.exposed_entities import async_expose_entity
 from homeassistant.components.todo import (
     ATTR_DESCRIPTION,
     ATTR_DUE_DATE,
@@ -22,7 +20,6 @@ from homeassistant.components.todo import (
     TodoListEntity,
     TodoListEntityFeature,
     TodoServices,
-    intent as todo_intent,
 )
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import ATTR_ENTITY_ID, ATTR_SUPPORTED_FEATURES
@@ -32,10 +29,9 @@ from homeassistant.exceptions import (
     ServiceNotSupported,
     ServiceValidationError,
 )
-from homeassistant.helpers import intent
 from homeassistant.setup import async_setup_component
 
-from . import MockTodoListEntity, create_mock_platform
+from . import create_mock_platform
 
 from tests.typing import WebSocketGenerator
 
@@ -989,116 +985,6 @@ async def test_move_item_unsupported(
     assert resp.get("error", {}).get("code") == "not_supported"
 
 
-async def test_add_item_intent(
-    hass: HomeAssistant,
-    hass_ws_client: WebSocketGenerator,
-) -> None:
-    """Test adding items to lists using an intent."""
-    assert await async_setup_component(hass, "homeassistant", {})
-    await todo_intent.async_setup_intents(hass)
-
-    entity1 = MockTodoListEntity()
-    entity1._attr_name = "List 1"
-    entity1.entity_id = "todo.list_1"
-
-    entity2 = MockTodoListEntity()
-    entity2._attr_name = "List 2"
-    entity2.entity_id = "todo.list_2"
-
-    await create_mock_platform(hass, [entity1, entity2])
-
-    # Add to first list
-    response = await intent.async_handle(
-        hass,
-        "test",
-        todo_intent.INTENT_LIST_ADD_ITEM,
-        {ATTR_ITEM: {"value": " beer "}, "name": {"value": "list 1"}},
-        assistant=conversation.DOMAIN,
-    )
-    assert response.response_type == intent.IntentResponseType.ACTION_DONE
-    assert response.success_results[0].name == "list 1"
-    assert response.success_results[0].type == intent.IntentResponseTargetType.ENTITY
-    assert response.success_results[0].id == entity1.entity_id
-
-    assert len(entity1.items) == 1
-    assert len(entity2.items) == 0
-    assert entity1.items[0].summary == "beer"  # summary is trimmed
-    assert entity1.items[0].status == TodoItemStatus.NEEDS_ACTION
-    entity1.items.clear()
-
-    # Add to second list
-    response = await intent.async_handle(
-        hass,
-        "test",
-        todo_intent.INTENT_LIST_ADD_ITEM,
-        {ATTR_ITEM: {"value": "cheese"}, "name": {"value": "List 2"}},
-        assistant=conversation.DOMAIN,
-    )
-    assert response.response_type == intent.IntentResponseType.ACTION_DONE
-
-    assert len(entity1.items) == 0
-    assert len(entity2.items) == 1
-    assert entity2.items[0].summary == "cheese"
-    assert entity2.items[0].status == TodoItemStatus.NEEDS_ACTION
-
-    # List name is case insensitive
-    response = await intent.async_handle(
-        hass,
-        "test",
-        todo_intent.INTENT_LIST_ADD_ITEM,
-        {ATTR_ITEM: {"value": "wine"}, "name": {"value": "lIST 2"}},
-        assistant=conversation.DOMAIN,
-    )
-    assert response.response_type == intent.IntentResponseType.ACTION_DONE
-
-    assert len(entity1.items) == 0
-    assert len(entity2.items) == 2
-    assert entity2.items[1].summary == "wine"
-    assert entity2.items[1].status == TodoItemStatus.NEEDS_ACTION
-
-    # Should fail if lists are not exposed
-    async_expose_entity(hass, conversation.DOMAIN, entity1.entity_id, False)
-    async_expose_entity(hass, conversation.DOMAIN, entity2.entity_id, False)
-    with pytest.raises(intent.MatchFailedError) as err:
-        await intent.async_handle(
-            hass,
-            "test",
-            todo_intent.INTENT_LIST_ADD_ITEM,
-            {"item": {"value": "cookies"}, "name": {"value": "list 1"}},
-            assistant=conversation.DOMAIN,
-        )
-    assert err.value.result.no_match_reason == intent.MatchFailedReason.ASSISTANT
-
-    # Missing list
-    with pytest.raises(intent.MatchFailedError):
-        await intent.async_handle(
-            hass,
-            "test",
-            todo_intent.INTENT_LIST_ADD_ITEM,
-            {"item": {"value": "wine"}, "name": {"value": "This list does not exist"}},
-            assistant=conversation.DOMAIN,
-        )
-
-    # Fail with empty name/item
-    with pytest.raises(intent.InvalidSlotInfo):
-        await intent.async_handle(
-            hass,
-            "test",
-            todo_intent.INTENT_LIST_ADD_ITEM,
-            {"item": {"value": "wine"}, "name": {"value": ""}},
-            assistant=conversation.DOMAIN,
-        )
-
-    with pytest.raises(intent.InvalidSlotInfo):
-        await intent.async_handle(
-            hass,
-            "test",
-            todo_intent.INTENT_LIST_ADD_ITEM,
-            {"item": {"value": ""}, "name": {"value": "list 1"}},
-            assistant=conversation.DOMAIN,
-        )
-
-
 async def test_remove_completed_items_service(
     hass: HomeAssistant,
     test_entity: TodoListEntity,
diff --git a/tests/components/todo/test_intent.py b/tests/components/todo/test_intent.py
new file mode 100644
index 00000000000..3f86347d1b7
--- /dev/null
+++ b/tests/components/todo/test_intent.py
@@ -0,0 +1,292 @@
+"""Tests for the todo intents."""
+
+from unittest.mock import patch
+
+import pytest
+
+from homeassistant.components import conversation
+from homeassistant.components.homeassistant.exposed_entities import async_expose_entity
+from homeassistant.components.todo import (
+    ATTR_ITEM,
+    DOMAIN,
+    TodoItem,
+    TodoItemStatus,
+    TodoListEntity,
+    intent as todo_intent,
+)
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import ATTR_NAME
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import intent
+from homeassistant.setup import async_setup_component
+
+from . import MockTodoListEntity, create_mock_platform
+
+from tests.common import async_mock_service
+from tests.typing import WebSocketGenerator
+
+
+@pytest.fixture(autouse=True)
+async def setup_intents(hass: HomeAssistant) -> None:
+    """Set up the intents."""
+    assert await async_setup_component(hass, "homeassistant", {})
+    await todo_intent.async_setup_intents(hass)
+
+
+async def test_add_item_intent(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test adding items to lists using an intent."""
+    assert await async_setup_component(hass, "homeassistant", {})
+    await todo_intent.async_setup_intents(hass)
+
+    entity1 = MockTodoListEntity()
+    entity1._attr_name = "List 1"
+    entity1.entity_id = "todo.list_1"
+
+    entity2 = MockTodoListEntity()
+    entity2._attr_name = "List 2"
+    entity2.entity_id = "todo.list_2"
+
+    await create_mock_platform(hass, [entity1, entity2])
+
+    # Add to first list
+    response = await intent.async_handle(
+        hass,
+        "test",
+        todo_intent.INTENT_LIST_ADD_ITEM,
+        {ATTR_ITEM: {"value": " beer "}, "name": {"value": "list 1"}},
+        assistant=conversation.DOMAIN,
+    )
+    assert response.response_type == intent.IntentResponseType.ACTION_DONE
+    assert response.success_results[0].name == "list 1"
+    assert response.success_results[0].type == intent.IntentResponseTargetType.ENTITY
+    assert response.success_results[0].id == entity1.entity_id
+
+    assert len(entity1.items) == 1
+    assert len(entity2.items) == 0
+    assert entity1.items[0].summary == "beer"  # summary is trimmed
+    assert entity1.items[0].status == TodoItemStatus.NEEDS_ACTION
+    entity1.items.clear()
+
+    # Add to second list
+    response = await intent.async_handle(
+        hass,
+        "test",
+        todo_intent.INTENT_LIST_ADD_ITEM,
+        {ATTR_ITEM: {"value": "cheese"}, "name": {"value": "List 2"}},
+        assistant=conversation.DOMAIN,
+    )
+    assert response.response_type == intent.IntentResponseType.ACTION_DONE
+
+    assert len(entity1.items) == 0
+    assert len(entity2.items) == 1
+    assert entity2.items[0].summary == "cheese"
+    assert entity2.items[0].status == TodoItemStatus.NEEDS_ACTION
+
+    # List name is case insensitive
+    response = await intent.async_handle(
+        hass,
+        "test",
+        todo_intent.INTENT_LIST_ADD_ITEM,
+        {ATTR_ITEM: {"value": "wine"}, "name": {"value": "lIST 2"}},
+        assistant=conversation.DOMAIN,
+    )
+    assert response.response_type == intent.IntentResponseType.ACTION_DONE
+
+    assert len(entity1.items) == 0
+    assert len(entity2.items) == 2
+    assert entity2.items[1].summary == "wine"
+    assert entity2.items[1].status == TodoItemStatus.NEEDS_ACTION
+
+    # Should fail if lists are not exposed
+    async_expose_entity(hass, conversation.DOMAIN, entity1.entity_id, False)
+    async_expose_entity(hass, conversation.DOMAIN, entity2.entity_id, False)
+    with pytest.raises(intent.MatchFailedError) as err:
+        await intent.async_handle(
+            hass,
+            "test",
+            todo_intent.INTENT_LIST_ADD_ITEM,
+            {"item": {"value": "cookies"}, "name": {"value": "list 1"}},
+            assistant=conversation.DOMAIN,
+        )
+    assert err.value.result.no_match_reason == intent.MatchFailedReason.ASSISTANT
+
+    # Missing list
+    with pytest.raises(intent.MatchFailedError):
+        await intent.async_handle(
+            hass,
+            "test",
+            todo_intent.INTENT_LIST_ADD_ITEM,
+            {"item": {"value": "wine"}, "name": {"value": "This list does not exist"}},
+            assistant=conversation.DOMAIN,
+        )
+
+    # Fail with empty name/item
+    with pytest.raises(intent.InvalidSlotInfo):
+        await intent.async_handle(
+            hass,
+            "test",
+            todo_intent.INTENT_LIST_ADD_ITEM,
+            {"item": {"value": "wine"}, "name": {"value": ""}},
+            assistant=conversation.DOMAIN,
+        )
+
+    with pytest.raises(intent.InvalidSlotInfo):
+        await intent.async_handle(
+            hass,
+            "test",
+            todo_intent.INTENT_LIST_ADD_ITEM,
+            {"item": {"value": ""}, "name": {"value": "list 1"}},
+            assistant=conversation.DOMAIN,
+        )
+
+
+async def test_add_item_intent_errors(
+    hass: HomeAssistant,
+    test_entity: TodoListEntity,
+) -> None:
+    """Test errors with the add item intent."""
+    test_entity._attr_name = "List 1"
+    await create_mock_platform(hass, [test_entity])
+
+    # Try to add item in list that does not exist
+    with pytest.raises(intent.MatchFailedError):
+        await intent.async_handle(
+            hass,
+            "test",
+            todo_intent.INTENT_LIST_ADD_ITEM,
+            {
+                ATTR_ITEM: {"value": "wine"},
+                ATTR_NAME: {"value": "This list does not exist"},
+            },
+            assistant=conversation.DOMAIN,
+        )
+
+    # Mock the get_entity method to return None
+    hass.data[DOMAIN].get_entity = lambda entity_id: None
+
+    # Try to add item in a list that exists but get_entity returns None
+    with pytest.raises(intent.IntentHandleError, match="No to-do list: List 1"):
+        await intent.async_handle(
+            hass,
+            "test",
+            todo_intent.INTENT_LIST_ADD_ITEM,
+            {
+                ATTR_ITEM: {"value": "wine"},
+                ATTR_NAME: {"value": "List 1"},
+            },
+            assistant=conversation.DOMAIN,
+        )
+
+
+async def test_complete_item_intent(
+    hass: HomeAssistant,
+) -> None:
+    """Test the complete item intent."""
+    entity1 = MockTodoListEntity(
+        [
+            TodoItem(summary="beer", uid="1", status=TodoItemStatus.NEEDS_ACTION),
+            TodoItem(summary="wine", uid="2", status=TodoItemStatus.NEEDS_ACTION),
+        ]
+    )
+    entity1._attr_name = "List 1"
+    entity1.entity_id = "todo.list_1"
+
+    # Add entities to hass
+    config_entry = await create_mock_platform(hass, [entity1])
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    assert len(entity1.items) == 2
+    assert entity1.items[0].status == TodoItemStatus.NEEDS_ACTION
+
+    # Complete item
+    async_mock_service(hass, DOMAIN, todo_intent.INTENT_LIST_COMPLETE_ITEM)
+    response = await intent.async_handle(
+        hass,
+        DOMAIN,
+        todo_intent.INTENT_LIST_COMPLETE_ITEM,
+        {ATTR_ITEM: {"value": "beer"}, ATTR_NAME: {"value": "list 1"}},
+        assistant=conversation.DOMAIN,
+    )
+    assert response.response_type == intent.IntentResponseType.ACTION_DONE
+
+    assert len(entity1.items) == 2
+    assert entity1.items[0].status == TodoItemStatus.COMPLETED
+
+
+async def test_complete_item_intent_errors(
+    hass: HomeAssistant,
+    test_entity: TodoListEntity,
+) -> None:
+    """Test errors with the complete item intent."""
+    entity1 = MockTodoListEntity(
+        [
+            TodoItem(summary="beer", uid="1", status=TodoItemStatus.COMPLETED),
+        ]
+    )
+    entity1._attr_name = "List 1"
+    entity1.entity_id = "todo.list_1"
+
+    # Add entities to hass
+    await create_mock_platform(hass, [entity1])
+
+    # Try to complete item in list that does not exist
+    with pytest.raises(intent.MatchFailedError):
+        await intent.async_handle(
+            hass,
+            "test",
+            todo_intent.INTENT_LIST_COMPLETE_ITEM,
+            {
+                ATTR_ITEM: {"value": "wine"},
+                ATTR_NAME: {"value": "This list does not exist"},
+            },
+            assistant=conversation.DOMAIN,
+        )
+
+    # Try to complete item that does not exist
+    with pytest.raises(intent.IntentHandleError):
+        await intent.async_handle(
+            hass,
+            "test",
+            todo_intent.INTENT_LIST_COMPLETE_ITEM,
+            {ATTR_ITEM: {"value": "bread"}, ATTR_NAME: {"value": "list 1"}},
+            assistant=conversation.DOMAIN,
+        )
+
+    # Item is already completed
+    with pytest.raises(intent.IntentHandleError):
+        await intent.async_handle(
+            hass,
+            "test",
+            todo_intent.INTENT_LIST_COMPLETE_ITEM,
+            {ATTR_ITEM: {"value": "beer"}, ATTR_NAME: {"value": "list 1"}},
+            assistant=conversation.DOMAIN,
+        )
+
+
+async def test_complete_item_intent_ha_errors(
+    hass: HomeAssistant,
+    test_entity: TodoListEntity,
+) -> None:
+    """Test error handling of HA errors with the complete item intent."""
+    test_entity._attr_name = "List 1"
+    test_entity.entity_id = "todo.list_1"
+    await create_mock_platform(hass, [test_entity])
+
+    # Mock the get_entity method to return None
+    with (
+        patch(
+            "homeassistant.helpers.entity_component.EntityComponent.get_entity",
+            return_value=None,
+        ),
+        pytest.raises(intent.IntentHandleError),
+    ):
+        await intent.async_handle(
+            hass,
+            DOMAIN,
+            todo_intent.INTENT_LIST_COMPLETE_ITEM,
+            {ATTR_ITEM: {"value": "wine"}, ATTR_NAME: {"value": "List 1"}},
+            assistant=conversation.DOMAIN,
+        )
diff --git a/tests/components/todoist/conftest.py b/tests/components/todoist/conftest.py
index 4b2bfea2e30..84f0fa740e9 100644
--- a/tests/components/todoist/conftest.py
+++ b/tests/components/todoist/conftest.py
@@ -70,6 +70,7 @@ def make_api_task(
         section_id=None,
         url="https://todoist.com",
         sync_id=None,
+        duration=None,
     )
 
 
@@ -94,6 +95,7 @@ def mock_api(tasks: list[Task]) -> AsyncMock:
             url="",
             is_inbox_project=False,
             is_team_inbox=False,
+            can_assign_tasks=False,
             order=1,
             parent_id=None,
             view_style="list",
diff --git a/tests/components/tomato/test_device_tracker.py b/tests/components/tomato/test_device_tracker.py
index f50d999548f..e4f08f55dba 100644
--- a/tests/components/tomato/test_device_tracker.py
+++ b/tests/components/tomato/test_device_tracker.py
@@ -8,7 +8,7 @@ import requests_mock
 import voluptuous as vol
 
 from homeassistant.components.device_tracker import DOMAIN as DEVICE_TRACKER_DOMAIN
-import homeassistant.components.tomato.device_tracker as tomato
+from homeassistant.components.tomato import device_tracker as tomato
 from homeassistant.const import (
     CONF_HOST,
     CONF_PASSWORD,
diff --git a/tests/components/totalconnect/common.py b/tests/components/totalconnect/common.py
index 828cad71e07..34d451ec0b8 100644
--- a/tests/components/totalconnect/common.py
+++ b/tests/components/totalconnect/common.py
@@ -49,20 +49,15 @@ USER = {
     "UserFeatureList": "Master=0,User Administration=0,Configuration Administration=0",
 }
 
-RESPONSE_AUTHENTICATE = {
+RESPONSE_SESSION_DETAILS = {
     "ResultCode": ResultCode.SUCCESS.value,
-    "SessionID": 1,
+    "ResultData": "Success",
+    "SessionID": "12345",
     "Locations": LOCATIONS,
     "ModuleFlags": MODULE_FLAGS,
     "UserInfo": USER,
 }
 
-RESPONSE_AUTHENTICATE_FAILED = {
-    "ResultCode": ResultCode.BAD_USER_OR_PASSWORD.value,
-    "ResultData": "test bad authentication",
-}
-
-
 PARTITION_DISARMED = {
     "PartitionID": "1",
     "ArmingState": ArmingState.DISARMED,
@@ -359,13 +354,13 @@ OPTIONS_DATA = {AUTO_BYPASS: False, CODE_REQUIRED: False}
 OPTIONS_DATA_CODE_REQUIRED = {AUTO_BYPASS: False, CODE_REQUIRED: True}
 
 PARTITION_DETAILS_1 = {
-    "PartitionID": 1,
+    "PartitionID": "1",
     "ArmingState": ArmingState.DISARMED.value,
     "PartitionName": "Test1",
 }
 
 PARTITION_DETAILS_2 = {
-    "PartitionID": 2,
+    "PartitionID": "2",
     "ArmingState": ArmingState.DISARMED.value,
     "PartitionName": "Test2",
 }
@@ -402,6 +397,12 @@ RESPONSE_GET_ZONE_DETAILS_SUCCESS = {
 TOTALCONNECT_REQUEST = (
     "homeassistant.components.totalconnect.TotalConnectClient.request"
 )
+TOTALCONNECT_GET_CONFIG = (
+    "homeassistant.components.totalconnect.TotalConnectClient._get_configuration"
+)
+TOTALCONNECT_REQUEST_TOKEN = (
+    "homeassistant.components.totalconnect.TotalConnectClient._request_token"
+)
 
 
 async def setup_platform(
@@ -420,7 +421,7 @@ async def setup_platform(
     mock_entry.add_to_hass(hass)
 
     responses = [
-        RESPONSE_AUTHENTICATE,
+        RESPONSE_SESSION_DETAILS,
         RESPONSE_PARTITION_DETAILS,
         RESPONSE_GET_ZONE_DETAILS_SUCCESS,
         RESPONSE_DISARMED,
@@ -433,6 +434,8 @@ async def setup_platform(
             TOTALCONNECT_REQUEST,
             side_effect=responses,
         ) as mock_request,
+        patch(TOTALCONNECT_GET_CONFIG, side_effect=None),
+        patch(TOTALCONNECT_REQUEST_TOKEN, side_effect=None),
     ):
         assert await async_setup_component(hass, DOMAIN, {})
         assert mock_request.call_count == 5
@@ -448,17 +451,21 @@ async def init_integration(hass: HomeAssistant) -> MockConfigEntry:
     mock_entry.add_to_hass(hass)
 
     responses = [
-        RESPONSE_AUTHENTICATE,
+        RESPONSE_SESSION_DETAILS,
         RESPONSE_PARTITION_DETAILS,
         RESPONSE_GET_ZONE_DETAILS_SUCCESS,
         RESPONSE_DISARMED,
         RESPONSE_DISARMED,
     ]
 
-    with patch(
-        TOTALCONNECT_REQUEST,
-        side_effect=responses,
-    ) as mock_request:
+    with (
+        patch(
+            TOTALCONNECT_REQUEST,
+            side_effect=responses,
+        ) as mock_request,
+        patch(TOTALCONNECT_GET_CONFIG, side_effect=None),
+        patch(TOTALCONNECT_REQUEST_TOKEN, side_effect=None),
+    ):
         await hass.config_entries.async_setup(mock_entry.entry_id)
         assert mock_request.call_count == 5
     await hass.async_block_till_done()
diff --git a/tests/components/totalconnect/snapshots/test_alarm_control_panel.ambr b/tests/components/totalconnect/snapshots/test_alarm_control_panel.ambr
index ef7cb386b33..a63319a6c76 100644
--- a/tests/components/totalconnect/snapshots/test_alarm_control_panel.ambr
+++ b/tests/components/totalconnect/snapshots/test_alarm_control_panel.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -64,6 +65,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/totalconnect/snapshots/test_binary_sensor.ambr b/tests/components/totalconnect/snapshots/test_binary_sensor.ambr
index 1eccff1dfc3..ac79455a0d5 100644
--- a/tests/components/totalconnect/snapshots/test_binary_sensor.ambr
+++ b/tests/components/totalconnect/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -56,6 +57,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -106,6 +108,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -156,6 +159,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -206,6 +210,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -256,6 +261,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -306,6 +312,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -356,6 +363,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -406,6 +414,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -456,6 +465,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -506,6 +516,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -556,6 +567,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -606,6 +618,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -656,6 +669,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -706,6 +720,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -756,6 +771,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -806,6 +822,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -854,6 +871,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -902,6 +920,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -949,6 +968,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -997,6 +1017,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1045,6 +1066,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1093,6 +1115,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1143,6 +1166,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1193,6 +1217,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/totalconnect/snapshots/test_button.ambr b/tests/components/totalconnect/snapshots/test_button.ambr
index af3318591c6..96d38567236 100644
--- a/tests/components/totalconnect/snapshots/test_button.ambr
+++ b/tests/components/totalconnect/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -190,6 +194,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +241,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/totalconnect/test_button.py b/tests/components/totalconnect/test_button.py
index 80de004be1d..87764e55186 100644
--- a/tests/components/totalconnect/test_button.py
+++ b/tests/components/totalconnect/test_button.py
@@ -11,12 +11,7 @@ from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
-from .common import (
-    RESPONSE_ZONE_BYPASS_FAILURE,
-    RESPONSE_ZONE_BYPASS_SUCCESS,
-    TOTALCONNECT_REQUEST,
-    setup_platform,
-)
+from .common import setup_platform
 
 from tests.common import snapshot_platform
 
@@ -34,12 +29,23 @@ async def test_entity_registry(
     await snapshot_platform(hass, entity_registry, snapshot, entry.entry_id)
 
 
-@pytest.mark.parametrize("entity_id", [ZONE_BYPASS_ID, PANEL_BYPASS_ID])
-async def test_bypass_button(hass: HomeAssistant, entity_id: str) -> None:
+@pytest.mark.parametrize(
+    ("entity_id", "tcc_request"),
+    [
+        (ZONE_BYPASS_ID, "total_connect_client.zone.TotalConnectZone.bypass"),
+        (
+            PANEL_BYPASS_ID,
+            "total_connect_client.location.TotalConnectLocation.zone_bypass_all",
+        ),
+    ],
+)
+async def test_bypass_button(
+    hass: HomeAssistant, entity_id: str, tcc_request: str
+) -> None:
     """Test pushing a bypass button."""
-    responses = [RESPONSE_ZONE_BYPASS_FAILURE, RESPONSE_ZONE_BYPASS_SUCCESS]
+    responses = [FailedToBypassZone, None]
     await setup_platform(hass, BUTTON)
-    with patch(TOTALCONNECT_REQUEST, side_effect=responses) as mock_request:
+    with patch(tcc_request, side_effect=responses) as mock_request:
         # try to bypass, but fails
         with pytest.raises(FailedToBypassZone):
             await hass.services.async_call(
diff --git a/tests/components/totalconnect/test_config_flow.py b/tests/components/totalconnect/test_config_flow.py
index 86419bff817..b7ac42c84b5 100644
--- a/tests/components/totalconnect/test_config_flow.py
+++ b/tests/components/totalconnect/test_config_flow.py
@@ -18,14 +18,17 @@ from homeassistant.data_entry_flow import FlowResultType
 from .common import (
     CONFIG_DATA,
     CONFIG_DATA_NO_USERCODES,
-    RESPONSE_AUTHENTICATE,
     RESPONSE_DISARMED,
     RESPONSE_GET_ZONE_DETAILS_SUCCESS,
     RESPONSE_PARTITION_DETAILS,
+    RESPONSE_SESSION_DETAILS,
     RESPONSE_SUCCESS,
     RESPONSE_USER_CODE_INVALID,
+    TOTALCONNECT_GET_CONFIG,
     TOTALCONNECT_REQUEST,
+    TOTALCONNECT_REQUEST_TOKEN,
     USERNAME,
+    init_integration,
 )
 
 from tests.common import MockConfigEntry
@@ -48,7 +51,7 @@ async def test_user_show_locations(hass: HomeAssistant) -> None:
     """Test user locations form."""
     # user/pass provided, so check if valid then ask for usercodes on locations form
     responses = [
-        RESPONSE_AUTHENTICATE,
+        RESPONSE_SESSION_DETAILS,
         RESPONSE_PARTITION_DETAILS,
         RESPONSE_GET_ZONE_DETAILS_SUCCESS,
         RESPONSE_DISARMED,
@@ -61,6 +64,8 @@ async def test_user_show_locations(hass: HomeAssistant) -> None:
             TOTALCONNECT_REQUEST,
             side_effect=responses,
         ) as mock_request,
+        patch(TOTALCONNECT_GET_CONFIG, side_effect=None),
+        patch(TOTALCONNECT_REQUEST_TOKEN, side_effect=None),
         patch(
             "homeassistant.components.totalconnect.async_setup_entry", return_value=True
         ),
@@ -180,7 +185,7 @@ async def test_reauth(hass: HomeAssistant) -> None:
 async def test_no_locations(hass: HomeAssistant) -> None:
     """Test with no user locations."""
     responses = [
-        RESPONSE_AUTHENTICATE,
+        RESPONSE_SESSION_DETAILS,
         RESPONSE_PARTITION_DETAILS,
         RESPONSE_GET_ZONE_DETAILS_SUCCESS,
         RESPONSE_DISARMED,
@@ -191,6 +196,8 @@ async def test_no_locations(hass: HomeAssistant) -> None:
             TOTALCONNECT_REQUEST,
             side_effect=responses,
         ) as mock_request,
+        patch(TOTALCONNECT_GET_CONFIG, side_effect=None),
+        patch(TOTALCONNECT_REQUEST_TOKEN, side_effect=None),
         patch(
             "homeassistant.components.totalconnect.async_setup_entry", return_value=True
         ),
@@ -213,38 +220,19 @@ async def test_no_locations(hass: HomeAssistant) -> None:
 
 async def test_options_flow(hass: HomeAssistant) -> None:
     """Test config flow options."""
-    config_entry = MockConfigEntry(
-        domain=DOMAIN,
-        data=CONFIG_DATA,
-        unique_id=USERNAME,
+    config_entry = await init_integration(hass)
+    result = await hass.config_entries.options.async_init(config_entry.entry_id)
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "init"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"], user_input={AUTO_BYPASS: True, CODE_REQUIRED: False}
     )
-    config_entry.add_to_hass(hass)
 
-    responses = [
-        RESPONSE_AUTHENTICATE,
-        RESPONSE_PARTITION_DETAILS,
-        RESPONSE_GET_ZONE_DETAILS_SUCCESS,
-        RESPONSE_DISARMED,
-        RESPONSE_DISARMED,
-        RESPONSE_DISARMED,
-    ]
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert config_entry.options == {AUTO_BYPASS: True, CODE_REQUIRED: False}
+    await hass.async_block_till_done()
 
-    with patch(TOTALCONNECT_REQUEST, side_effect=responses):
-        assert await hass.config_entries.async_setup(config_entry.entry_id)
-        await hass.async_block_till_done()
-
-        result = await hass.config_entries.options.async_init(config_entry.entry_id)
-
-        assert result["type"] is FlowResultType.FORM
-        assert result["step_id"] == "init"
-
-        result = await hass.config_entries.options.async_configure(
-            result["flow_id"], user_input={AUTO_BYPASS: True, CODE_REQUIRED: False}
-        )
-
-        assert result["type"] is FlowResultType.CREATE_ENTRY
-        assert config_entry.options == {AUTO_BYPASS: True, CODE_REQUIRED: False}
-        await hass.async_block_till_done()
-
-        assert await hass.config_entries.async_unload(config_entry.entry_id)
-        await hass.async_block_till_done()
+    assert await hass.config_entries.async_unload(config_entry.entry_id)
+    await hass.async_block_till_done()
diff --git a/tests/components/tplink/__init__.py b/tests/components/tplink/__init__.py
index a056555f4c0..ac5bb347765 100644
--- a/tests/components/tplink/__init__.py
+++ b/tests/components/tplink/__init__.py
@@ -2,7 +2,7 @@
 
 from collections import namedtuple
 from dataclasses import replace
-from datetime import datetime
+from datetime import datetime, timedelta
 from typing import Any
 from unittest.mock import AsyncMock, MagicMock, patch
 
@@ -16,7 +16,9 @@ from kasa import (
     ThermostatState,
 )
 from kasa.interfaces import Fan, Light, LightEffect, LightState, Thermostat
+from kasa.smart.modules import Speaker
 from kasa.smart.modules.alarm import Alarm
+from kasa.smart.modules.clean import AreaUnit, Clean, ErrorCode, Status
 from kasa.smartcam.modules.camera import LOCAL_STREAMING_PORT, Camera
 from syrupy import SnapshotAssertion
 
@@ -58,6 +60,7 @@ def _load_feature_fixtures():
 
 
 FEATURES_FIXTURE = _load_feature_fixtures()
+FIXTURE_ENUM_TYPES = {"CleanErrorCode": ErrorCode, "CleanAreaUnit": AreaUnit}
 
 
 async def setup_platform_for_device(
@@ -103,7 +106,7 @@ async def snapshot_platform(
         if entity_entry.translation_key:
             key = f"component.{DOMAIN}.entity.{entity_entry.domain}.{entity_entry.translation_key}.name"
             single_device_class_translation = False
-            if key not in translations and entity_entry.original_device_class:
+            if key not in translations:  # No name translation
                 if entity_entry.original_device_class not in unique_device_classes:
                     single_device_class_translation = True
                     unique_device_classes.append(entity_entry.original_device_class)
@@ -178,12 +181,6 @@ def _mocked_device(
         device_config.host = ip_address
     device.host = ip_address
 
-    if modules:
-        device.modules = {
-            module_name: MODULE_TO_MOCK_GEN[module_name](device)
-            for module_name in modules
-        }
-
     device_features = {}
     if features:
         device_features = {
@@ -201,9 +198,33 @@ def _mocked_device(
         )
     device.features = device_features
 
+    # Add modules after features so modules can add any required features
+    if modules:
+        device.modules = {
+            module_name: MODULE_TO_MOCK_GEN[module_name](device)
+            for module_name in modules
+        }
+
+    # module features are accessed from a module via get_feature which is
+    # keyed on the module attribute name. Usually this is the same as the
+    # feature.id but not always so accept overrides.
+    module_features = {
+        mod_key if (mod_key := v.expected_module_key) else k: v
+        for k, v in device_features.items()
+    }
     for mod in device.modules.values():
-        mod.get_feature.side_effect = device_features.get
-        mod.has_feature.side_effect = lambda id: id in device_features
+        # Some tests remove the feature from device_features to test missing
+        # features, so check the key is still present there.
+        mod.get_feature.side_effect = (
+            lambda mod_id: mod_feat
+            if (mod_feat := module_features.get(mod_id))
+            and mod_feat.id in device_features
+            else None
+        )
+        mod.has_feature.side_effect = (
+            lambda mod_id: (mod_feat := module_features.get(mod_id))
+            and mod_feat.id in device_features
+        )
 
     device.parent = None
     device.children = []
@@ -242,6 +263,7 @@ def _mocked_feature(
     unit=None,
     minimum_value=None,
     maximum_value=None,
+    expected_module_key=None,
 ) -> Feature:
     """Get a mocked feature.
 
@@ -251,7 +273,21 @@ def _mocked_feature(
     feature.id = id
     feature.name = name or id.upper()
     feature.set_value = AsyncMock()
-    if not (fixture := FEATURES_FIXTURE.get(id)):
+    if fixture := FEATURES_FIXTURE.get(id):
+        # copy the fixture so tests do not interfere with each other
+        fixture = dict(fixture)
+
+        if enum_type := fixture.get("enum_type"):
+            val = FIXTURE_ENUM_TYPES[enum_type](fixture["value"])
+            fixture["value"] = val
+        if timedelta_type := fixture.get("timedelta_type"):
+            fixture["value"] = timedelta(**{timedelta_type: fixture["value"]})
+
+        if unit_enum_type := fixture.get("unit_enum_type"):
+            val = FIXTURE_ENUM_TYPES[unit_enum_type](fixture["unit"])
+            fixture["unit"] = val
+
+    else:
         assert require_fixture is False, (
             f"No fixture defined for feature {id} and require_fixture is True"
         )
@@ -259,7 +295,8 @@ def _mocked_feature(
             f"Value must be provided if feature {id} not defined in features.json"
         )
         fixture = {"value": value, "category": "Primary", "type": "Sensor"}
-    elif value is not UNDEFINED:
+
+    if value is not UNDEFINED:
         fixture["value"] = value
     feature.value = fixture["value"]
 
@@ -279,6 +316,16 @@ def _mocked_feature(
     # select
     feature.choices = choices or fixture.get("choices")
 
+    # module features are accessed from a module via get_feature which is
+    # keyed on the module attribute name. Usually this is the same as the
+    # feature.id but not always. module_key indicates the key of the feature
+    # in the module.
+    feature.expected_module_key = (
+        mod_key
+        if (mod_key := fixture.get("expected_module_key", expected_module_key))
+        else None
+    )
+
     return feature
 
 
@@ -352,9 +399,23 @@ def _mocked_fan_module(effect) -> Fan:
 def _mocked_alarm_module(device):
     alarm = MagicMock(auto_spec=Alarm, name="Mocked alarm")
     alarm.active = False
+    alarm.alarm_sounds = "Foo", "Bar"
     alarm.play = AsyncMock()
     alarm.stop = AsyncMock()
 
+    device.features["alarm_volume"] = _mocked_feature(
+        "alarm_volume",
+        minimum_value=0,
+        maximum_value=3,
+        value=None,
+    )
+    device.features["alarm_duration"] = _mocked_feature(
+        "alarm_duration",
+        minimum_value=0,
+        maximum_value=300,
+        value=None,
+    )
+
     return alarm
 
 
@@ -381,6 +442,43 @@ def _mocked_thermostat_module(device):
     return therm
 
 
+def _mocked_clean_module(device):
+    clean = MagicMock(auto_spec=Clean, name="Mocked clean")
+
+    # methods
+    clean.start = AsyncMock()
+    clean.pause = AsyncMock()
+    clean.resume = AsyncMock()
+    clean.return_home = AsyncMock()
+    clean.set_fan_speed_preset = AsyncMock()
+
+    # properties
+    clean.fan_speed_preset = "Max"
+    clean.error = ErrorCode.Ok
+    clean.battery = 100
+    clean.status = Status.Charged
+
+    # Need to manually create the fan speed preset feature,
+    # as we are going to read its choices through it
+    device.features["vacuum_fan_speed"] = _mocked_feature(
+        "vacuum_fan_speed",
+        type_=Feature.Type.Choice,
+        category=Feature.Category.Config,
+        choices=["Quiet", "Max"],
+        value="Max",
+        expected_module_key="fan_speed_preset",
+    )
+
+    return clean
+
+
+def _mocked_speaker_module(device):
+    speaker = MagicMock(auto_spec=Speaker, name="Mocked speaker")
+    speaker.locate = AsyncMock()
+
+    return speaker
+
+
 def _mocked_strip_children(features=None, alias=None) -> list[Device]:
     plug0 = _mocked_device(
         alias="Plug0" if alias is None else alias,
@@ -450,6 +548,8 @@ MODULE_TO_MOCK_GEN = {
     Module.Alarm: _mocked_alarm_module,
     Module.Camera: _mocked_camera_module,
     Module.Thermostat: _mocked_thermostat_module,
+    Module.Clean: _mocked_clean_module,
+    Module.Speaker: _mocked_speaker_module,
 }
 
 
diff --git a/tests/components/tplink/const.py b/tests/components/tplink/const.py
index 57829a7aa34..54aab1e2f3c 100644
--- a/tests/components/tplink/const.py
+++ b/tests/components/tplink/const.py
@@ -55,7 +55,6 @@ DEVICE_CONFIG_KLAP = DeviceConfig(
     IP_ADDRESS,
     credentials=CREDENTIALS,
     connection_type=CONN_PARAMS_KLAP,
-    uses_http=True,
 )
 CONN_PARAMS_AES = DeviceConnectionParameters(
     DeviceFamily.SmartTapoPlug, DeviceEncryptionType.Aes
@@ -84,7 +83,6 @@ DEVICE_CONFIG_AES = DeviceConfig(
     IP_ADDRESS2,
     credentials=CREDENTIALS,
     connection_type=CONN_PARAMS_AES,
-    uses_http=True,
     aes_keys=AES_KEYS,
 )
 CONN_PARAMS_AES_CAMERA = DeviceConnectionParameters(
@@ -94,7 +92,6 @@ DEVICE_CONFIG_AES_CAMERA = DeviceConfig(
     IP_ADDRESS3,
     credentials=CREDENTIALS,
     connection_type=CONN_PARAMS_AES_CAMERA,
-    uses_http=True,
 )
 
 DEVICE_CONFIG_DICT_KLAP = {
diff --git a/tests/components/tplink/fixtures/features.json b/tests/components/tplink/fixtures/features.json
index 3d27e63b06a..81277ddd3ae 100644
--- a/tests/components/tplink/fixtures/features.json
+++ b/tests/components/tplink/fixtures/features.json
@@ -195,6 +195,11 @@
     "type": "BinarySensor",
     "category": "Info"
   },
+  "overloaded": {
+    "value": false,
+    "type": "BinarySensor",
+    "category": "Info"
+  },
   "battery_low": {
     "value": false,
     "type": "BinarySensor",
@@ -284,6 +289,12 @@
     "minimum_value": -10,
     "maximum_value": 10
   },
+  "power_protection_threshold": {
+    "value": 100,
+    "type": "Number",
+    "category": "Config",
+    "minimum_value": 0
+  },
   "target_temperature": {
     "value": false,
     "type": "Number",
@@ -330,6 +341,61 @@
       "Connection 2"
     ]
   },
+  "clean_time": {
+    "type": "Sensor",
+    "category": "Info",
+    "value": 12,
+    "timedelta_type": "minutes"
+  },
+  "clean_area": {
+    "type": "Sensor",
+    "category": "Info",
+    "value": 2,
+    "unit": 1,
+    "unit_enum_type": "CleanAreaUnit"
+  },
+  "clean_progress": {
+    "type": "Sensor",
+    "category": "Info",
+    "value": 30,
+    "unit": "%"
+  },
+  "total_clean_time": {
+    "type": "Sensor",
+    "category": "Debug",
+    "value": 120,
+    "timedelta_type": "minutes"
+  },
+  "total_clean_area": {
+    "type": "Sensor",
+    "category": "Debug",
+    "value": 2,
+    "unit": 1,
+    "unit_enum_type": "CleanAreaUnit"
+  },
+  "last_clean_time": {
+    "type": "Sensor",
+    "category": "Debug",
+    "value": 60,
+    "timedelta_type": "minutes"
+  },
+  "last_clean_area": {
+    "type": "Sensor",
+    "category": "Debug",
+    "value": 2,
+    "unit": 1,
+    "unit_enum_type": "CleanAreaUnit"
+  },
+  "last_clean_timestamp": {
+    "type": "Sensor",
+    "category": "Debug",
+    "value": "2024-06-24 10:03:11.046643+01:00"
+  },
+  "total_clean_count": {
+    "type": "Sensor",
+    "category": "Debug",
+    "value": 12
+  },
   "alarm_volume": {
     "value": "normal",
     "type": "Choice",
@@ -370,5 +436,116 @@
     "value": 10,
     "type": "Number",
     "category": "Config"
+  },
+  "clean_count": {
+    "value": 1,
+    "type": "Number",
+    "category": "Config"
+  },
+  "carpet_boost": {
+    "value": true,
+    "type": "Switch",
+    "category": "Config"
+  },
+  "vacuum_error": {
+    "value": 0,
+    "type": "Sensor",
+    "category": "Info",
+    "enum_type": "CleanErrorCode"
+  },
+  "pair": {
+    "value": "<Action>",
+    "type": "Action",
+    "category": "Config"
+  },
+  "unpair": {
+    "value": "<Action>",
+    "type": "Action",
+    "category": "Debug"
+  },
+  "main_brush_reset": {
+    "value": "<Action>",
+    "type": "Action",
+    "category": "Debug"
+  },
+  "side_brush_reset": {
+    "value": "<Action>",
+    "type": "Action",
+    "category": "Debug"
+  },
+  "sensor_reset": {
+    "value": "<Action>",
+    "type": "Action",
+    "category": "Debug"
+  },
+  "filter_reset": {
+    "value": "<Action>",
+    "type": "Action",
+    "category": "Debug"
+  },
+  "charging_contacts_reset": {
+    "value": "<Action>",
+    "type": "Action",
+    "category": "Debug"
+  },
+  "main_brush_remaining": {
+    "value": 360,
+    "type": "Sensor",
+    "category": "Debug",
+    "timedelta_type": "minutes"
+  },
+  "main_brush_used": {
+    "value": 360,
+    "type": "Sensor",
+    "category": "Debug",
+    "timedelta_type": "minutes"
+  },
+  "side_brush_remaining": {
+    "value": 360,
+    "type": "Sensor",
+    "category": "Debug",
+    "timedelta_type": "minutes"
+  },
+  "side_brush_used": {
+    "value": 360,
+    "type": "Sensor",
+    "category": "Debug",
+    "timedelta_type": "minutes"
+  },
+  "filter_remaining": {
+    "value": 360,
+    "type": "Sensor",
+    "category": "Debug",
+    "timedelta_type": "minutes"
+  },
+  "filter_used": {
+    "value": 360,
+    "type": "Sensor",
+    "category": "Debug",
+    "timedelta_type": "minutes"
+  },
+  "sensor_remaining": {
+    "value": 360,
+    "type": "Sensor",
+    "category": "Debug",
+    "timedelta_type": "minutes"
+  },
+  "sensor_used": {
+    "value": 360,
+    "type": "Sensor",
+    "category": "Debug",
+    "timedelta_type": "minutes"
+  },
+  "charging_contacts_remaining": {
+    "value": 360,
+    "type": "Sensor",
+    "category": "Debug",
+    "timedelta_type": "minutes"
+  },
+  "charging_contacts_used": {
+    "value": 360,
+    "type": "Sensor",
+    "category": "Debug",
+    "timedelta_type": "minutes"
   }
 }
diff --git a/tests/components/tplink/snapshots/test_binary_sensor.ambr b/tests/components/tplink/snapshots/test_binary_sensor.ambr
index e16d4409511..17aa2c248e5 100644
--- a/tests/components/tplink/snapshots/test_binary_sensor.ambr
+++ b/tests/components/tplink/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -39,6 +40,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -86,6 +88,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -133,6 +136,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -166,6 +170,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -213,6 +218,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -260,6 +266,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -300,6 +307,54 @@
     'state': 'off',
   })
 # ---
+# name: test_states[binary_sensor.my_device_overloaded-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.my_device_overloaded',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
+    'original_icon': None,
+    'original_name': 'Overloaded',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'overloaded',
+    'unique_id': '123456789ABCDEFGH_overloaded',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_states[binary_sensor.my_device_overloaded-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'problem',
+      'friendly_name': 'my_device Overloaded',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.my_device_overloaded',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
 # name: test_states[binary_sensor.my_device_temperature_warning-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -307,6 +362,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -337,6 +393,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
diff --git a/tests/components/tplink/snapshots/test_button.ambr b/tests/components/tplink/snapshots/test_button.ambr
index de626cd5818..bb4e9f85d58 100644
--- a/tests/components/tplink/snapshots/test_button.ambr
+++ b/tests/components/tplink/snapshots/test_button.ambr
@@ -1,4 +1,51 @@
 # serializer version: 1
+# name: test_states[button.my_device_pair_new_device-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'button',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'button.my_device_pair_new_device',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Pair new device',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'pair',
+    'unique_id': '123456789ABCDEFGH_pair',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_states[button.my_device_pair_new_device-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'my_device Pair new device',
+    }),
+    'context': <ANY>,
+    'entity_id': 'button.my_device_pair_new_device',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
 # name: test_states[button.my_device_pan_left-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -6,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -91,6 +140,176 @@
     'state': 'unknown',
   })
 # ---
+# name: test_states[button.my_device_reset_charging_contacts_consumable-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'button',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'button.my_device_reset_charging_contacts_consumable',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Reset charging contacts consumable',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'charging_contacts_reset',
+    'unique_id': '123456789ABCDEFGH_charging_contacts_reset',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_states[button.my_device_reset_filter_consumable-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'button',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'button.my_device_reset_filter_consumable',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Reset filter consumable',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'filter_reset',
+    'unique_id': '123456789ABCDEFGH_filter_reset',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_states[button.my_device_reset_main_brush_consumable-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'button',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'button.my_device_reset_main_brush_consumable',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Reset main brush consumable',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'main_brush_reset',
+    'unique_id': '123456789ABCDEFGH_main_brush_reset',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_states[button.my_device_reset_sensor_consumable-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'button',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'button.my_device_reset_sensor_consumable',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Reset sensor consumable',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'sensor_reset',
+    'unique_id': '123456789ABCDEFGH_sensor_reset',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_states[button.my_device_reset_side_brush_consumable-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'button',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'button.my_device_reset_side_brush_consumable',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Reset side brush consumable',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'side_brush_reset',
+    'unique_id': '123456789ABCDEFGH_side_brush_reset',
+    'unit_of_measurement': None,
+  })
+# ---
 # name: test_states[button.my_device_restart-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -98,6 +317,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -131,6 +351,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -177,6 +398,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -223,6 +445,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -269,6 +492,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -308,10 +532,45 @@
     'state': 'unknown',
   })
 # ---
+# name: test_states[button.my_device_unpair_device-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'button',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'button.my_device_unpair_device',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Unpair device',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'unpair',
+    'unique_id': '123456789ABCDEFGH_unpair',
+    'unit_of_measurement': None,
+  })
+# ---
 # name: test_states[my_device-entry]
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
diff --git a/tests/components/tplink/snapshots/test_camera.ambr b/tests/components/tplink/snapshots/test_camera.ambr
index 4417395078a..e037c2c9e40 100644
--- a/tests/components/tplink/snapshots/test_camera.ambr
+++ b/tests/components/tplink/snapshots/test_camera.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
diff --git a/tests/components/tplink/snapshots/test_climate.ambr b/tests/components/tplink/snapshots/test_climate.ambr
index e0173e8f59e..02492de92b9 100644
--- a/tests/components/tplink/snapshots/test_climate.ambr
+++ b/tests/components/tplink/snapshots/test_climate.ambr
@@ -13,6 +13,7 @@
       'min_temp': 5,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -66,6 +67,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/tplink/snapshots/test_fan.ambr b/tests/components/tplink/snapshots/test_fan.ambr
index 1a7392dc63a..9c395dc2f21 100644
--- a/tests/components/tplink/snapshots/test_fan.ambr
+++ b/tests/components/tplink/snapshots/test_fan.ambr
@@ -8,6 +8,7 @@
       'preset_modes': None,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -61,6 +62,7 @@
       'preset_modes': None,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -114,6 +116,7 @@
       'preset_modes': None,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -162,6 +165,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
diff --git a/tests/components/tplink/snapshots/test_number.ambr b/tests/components/tplink/snapshots/test_number.ambr
index df5ef71bf44..0415039a0ce 100644
--- a/tests/components/tplink/snapshots/test_number.ambr
+++ b/tests/components/tplink/snapshots/test_number.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -35,6 +36,62 @@
     'via_device_id': None,
   })
 # ---
+# name: test_states[number.my_device_clean_count-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 65536,
+      'min': 0,
+      'mode': <NumberMode.SLIDER: 'slider'>,
+      'step': 1.0,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'number.my_device_clean_count',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Clean count',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'clean_count',
+    'unique_id': '123456789ABCDEFGH_clean_count',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_states[number.my_device_clean_count-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'my_device Clean count',
+      'max': 65536,
+      'min': 0,
+      'mode': <NumberMode.SLIDER: 'slider'>,
+      'step': 1.0,
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.my_device_clean_count',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '1',
+  })
+# ---
 # name: test_states[number.my_device_pan_degrees-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -47,6 +104,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -90,6 +148,62 @@
     'state': '10',
   })
 # ---
+# name: test_states[number.my_device_power_protection-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 65536,
+      'min': 0,
+      'mode': <NumberMode.SLIDER: 'slider'>,
+      'step': 1.0,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'number.my_device_power_protection',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Power protection',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'power_protection_threshold',
+    'unique_id': '123456789ABCDEFGH_power_protection_threshold',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_states[number.my_device_power_protection-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'my_device Power protection',
+      'max': 65536,
+      'min': 0,
+      'mode': <NumberMode.SLIDER: 'slider'>,
+      'step': 1.0,
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.my_device_power_protection',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '100',
+  })
+# ---
 # name: test_states[number.my_device_smooth_off-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -102,6 +216,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -157,6 +272,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -212,6 +328,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -267,6 +384,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -322,6 +440,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tplink/snapshots/test_select.ambr b/tests/components/tplink/snapshots/test_select.ambr
index c851979f34c..e5191937ee9 100644
--- a/tests/components/tplink/snapshots/test_select.ambr
+++ b/tests/components/tplink/snapshots/test_select.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -64,6 +65,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -137,6 +139,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -194,6 +197,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tplink/snapshots/test_sensor.ambr b/tests/components/tplink/snapshots/test_sensor.ambr
index 461e8c6e505..72198e579a1 100644
--- a/tests/components/tplink/snapshots/test_sensor.ambr
+++ b/tests/components/tplink/snapshots/test_sensor.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -42,6 +43,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -75,6 +77,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -124,6 +127,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -166,6 +170,223 @@
     'state': '85',
   })
 # ---
+# name: test_states[sensor.my_device_charging_contacts_remaining-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_device_charging_contacts_remaining',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Charging contacts remaining',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'charging_contacts_remaining',
+    'unique_id': '123456789ABCDEFGH_charging_contacts_remaining',
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+  })
+# ---
+# name: test_states[sensor.my_device_charging_contacts_used-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_device_charging_contacts_used',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Charging contacts used',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'charging_contacts_used',
+    'unique_id': '123456789ABCDEFGH_charging_contacts_used',
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+  })
+# ---
+# name: test_states[sensor.my_device_cleaning_area-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_device_cleaning_area',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfArea.SQUARE_METERS: 'm²'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.AREA: 'area'>,
+    'original_icon': None,
+    'original_name': 'Cleaning area',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'clean_area',
+    'unique_id': '123456789ABCDEFGH_clean_area',
+    'unit_of_measurement': <UnitOfArea.SQUARE_METERS: 'm²'>,
+  })
+# ---
+# name: test_states[sensor.my_device_cleaning_area-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'area',
+      'friendly_name': 'my_device Cleaning area',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfArea.SQUARE_METERS: 'm²'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.my_device_cleaning_area',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.2',
+  })
+# ---
+# name: test_states[sensor.my_device_cleaning_progress-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_device_cleaning_progress',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Cleaning progress',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'clean_progress',
+    'unique_id': '123456789ABCDEFGH_clean_progress',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_states[sensor.my_device_cleaning_time-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_device_cleaning_time',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Cleaning time',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'clean_time',
+    'unique_id': '123456789ABCDEFGH_clean_time',
+    'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+  })
+# ---
+# name: test_states[sensor.my_device_cleaning_time-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'duration',
+      'friendly_name': 'my_device Cleaning time',
+      'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.my_device_cleaning_time',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '12.00',
+  })
+# ---
 # name: test_states[sensor.my_device_current-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -175,6 +396,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -229,6 +451,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -281,6 +504,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -307,6 +531,157 @@
     'unit_of_measurement': None,
   })
 # ---
+# name: test_states[sensor.my_device_error-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        'ok',
+        'sidebrushstuck',
+        'mainbrushstuck',
+        'wheelblocked',
+        'trapped',
+        'trappedcliff',
+        'dustbinremoved',
+        'unabletomove',
+        'lidarblocked',
+        'unabletofinddock',
+        'batterylow',
+        'unknowninternal',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_device_error',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Error',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'vacuum_error',
+    'unique_id': '123456789ABCDEFGH_vacuum_error',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_states[sensor.my_device_error-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'my_device Error',
+      'options': list([
+        'ok',
+        'sidebrushstuck',
+        'mainbrushstuck',
+        'wheelblocked',
+        'trapped',
+        'trappedcliff',
+        'dustbinremoved',
+        'unabletomove',
+        'lidarblocked',
+        'unabletofinddock',
+        'batterylow',
+        'unknowninternal',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.my_device_error',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'ok',
+  })
+# ---
+# name: test_states[sensor.my_device_filter_remaining-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_device_filter_remaining',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Filter remaining',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'filter_remaining',
+    'unique_id': '123456789ABCDEFGH_filter_remaining',
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+  })
+# ---
+# name: test_states[sensor.my_device_filter_used-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_device_filter_used',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Filter used',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'filter_used',
+    'unique_id': '123456789ABCDEFGH_filter_used',
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+  })
+# ---
 # name: test_states[sensor.my_device_humidity-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -316,6 +691,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -358,6 +734,116 @@
     'state': '12',
   })
 # ---
+# name: test_states[sensor.my_device_last_clean_start-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_device_last_clean_start',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+    'original_icon': None,
+    'original_name': 'Last clean start',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'last_clean_timestamp',
+    'unique_id': '123456789ABCDEFGH_last_clean_timestamp',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_states[sensor.my_device_last_cleaned_area-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_device_last_cleaned_area',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfArea.SQUARE_METERS: 'm²'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.AREA: 'area'>,
+    'original_icon': None,
+    'original_name': 'Last cleaned area',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'last_clean_area',
+    'unique_id': '123456789ABCDEFGH_last_clean_area',
+    'unit_of_measurement': <UnitOfArea.SQUARE_METERS: 'm²'>,
+  })
+# ---
+# name: test_states[sensor.my_device_last_cleaned_time-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_device_last_cleaned_time',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Last cleaned time',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'last_clean_time',
+    'unique_id': '123456789ABCDEFGH_last_clean_time',
+    'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+  })
+# ---
 # name: test_states[sensor.my_device_last_water_leak_alert-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -365,6 +851,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -405,6 +892,80 @@
     'state': '2024-06-24T09:03:11+00:00',
   })
 # ---
+# name: test_states[sensor.my_device_main_brush_remaining-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_device_main_brush_remaining',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Main brush remaining',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'main_brush_remaining',
+    'unique_id': '123456789ABCDEFGH_main_brush_remaining',
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+  })
+# ---
+# name: test_states[sensor.my_device_main_brush_used-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_device_main_brush_used',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Main brush used',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'main_brush_used',
+    'unique_id': '123456789ABCDEFGH_main_brush_used',
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+  })
+# ---
 # name: test_states[sensor.my_device_on_since-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -412,6 +973,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -445,6 +1007,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -471,6 +1034,154 @@
     'unit_of_measurement': '%',
   })
 # ---
+# name: test_states[sensor.my_device_sensor_remaining-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_device_sensor_remaining',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Sensor remaining',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'sensor_remaining',
+    'unique_id': '123456789ABCDEFGH_sensor_remaining',
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+  })
+# ---
+# name: test_states[sensor.my_device_sensor_used-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_device_sensor_used',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Sensor used',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'sensor_used',
+    'unique_id': '123456789ABCDEFGH_sensor_used',
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+  })
+# ---
+# name: test_states[sensor.my_device_side_brush_remaining-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_device_side_brush_remaining',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Side brush remaining',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'side_brush_remaining',
+    'unique_id': '123456789ABCDEFGH_side_brush_remaining',
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+  })
+# ---
+# name: test_states[sensor.my_device_side_brush_used-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_device_side_brush_used',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Side brush used',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'side_brush_used',
+    'unique_id': '123456789ABCDEFGH_side_brush_used',
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+  })
+# ---
 # name: test_states[sensor.my_device_signal_level-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -480,6 +1191,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -529,6 +1241,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -562,6 +1275,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -597,6 +1311,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
@@ -632,6 +1347,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -686,6 +1402,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -731,6 +1448,120 @@
     'state': '5.23',
   })
 # ---
+# name: test_states[sensor.my_device_total_cleaning_area-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_device_total_cleaning_area',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfArea.SQUARE_METERS: 'm²'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.AREA: 'area'>,
+    'original_icon': None,
+    'original_name': 'Total cleaning area',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'total_clean_area',
+    'unique_id': '123456789ABCDEFGH_total_clean_area',
+    'unit_of_measurement': <UnitOfArea.SQUARE_METERS: 'm²'>,
+  })
+# ---
+# name: test_states[sensor.my_device_total_cleaning_count-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_device_total_cleaning_count',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Total cleaning count',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'total_clean_count',
+    'unique_id': '123456789ABCDEFGH_total_clean_count',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_states[sensor.my_device_total_cleaning_time-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': <RegistryEntryDisabler.INTEGRATION: 'integration'>,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.my_device_total_cleaning_time',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+      }),
+    }),
+    'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
+    'original_icon': None,
+    'original_name': 'Total cleaning time',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'total_clean_time',
+    'unique_id': '123456789ABCDEFGH_total_clean_time',
+    'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+  })
+# ---
 # name: test_states[sensor.my_device_total_consumption-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -740,6 +1571,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -794,6 +1626,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tplink/snapshots/test_siren.ambr b/tests/components/tplink/snapshots/test_siren.ambr
index b144288bd1c..7365e449707 100644
--- a/tests/components/tplink/snapshots/test_siren.ambr
+++ b/tests/components/tplink/snapshots/test_siren.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -40,8 +41,14 @@
     'aliases': set({
     }),
     'area_id': None,
-    'capabilities': None,
+    'capabilities': dict({
+      'available_tones': tuple(
+        'Foo',
+        'Bar',
+      ),
+    }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -62,7 +69,7 @@
     'original_name': None,
     'platform': 'tplink',
     'previous_unique_id': None,
-    'supported_features': <SirenEntityFeature: 3>,
+    'supported_features': <SirenEntityFeature: 31>,
     'translation_key': None,
     'unique_id': '123456789ABCDEFGH',
     'unit_of_measurement': None,
@@ -71,8 +78,12 @@
 # name: test_states[siren.hub-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
+      'available_tones': tuple(
+        'Foo',
+        'Bar',
+      ),
       'friendly_name': 'hub',
-      'supported_features': <SirenEntityFeature: 3>,
+      'supported_features': <SirenEntityFeature: 31>,
     }),
     'context': <ANY>,
     'entity_id': 'siren.hub',
diff --git a/tests/components/tplink/snapshots/test_switch.ambr b/tests/components/tplink/snapshots/test_switch.ambr
index 7adda900c02..bd89da8e841 100644
--- a/tests/components/tplink/snapshots/test_switch.ambr
+++ b/tests/components/tplink/snapshots/test_switch.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
       tuple(
@@ -42,6 +43,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -88,6 +90,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -134,6 +137,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -180,6 +184,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -219,6 +224,53 @@
     'state': 'on',
   })
 # ---
+# name: test_states[switch.my_device_carpet_boost-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'switch.my_device_carpet_boost',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Carpet boost',
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'carpet_boost',
+    'unique_id': '123456789ABCDEFGH_carpet_boost',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_states[switch.my_device_carpet_boost-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'my_device Carpet boost',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.my_device_carpet_boost',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---
 # name: test_states[switch.my_device_child_lock-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -226,6 +278,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -272,6 +325,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -318,6 +372,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -364,6 +419,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -410,6 +466,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -456,6 +513,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -502,6 +560,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -548,6 +607,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tplink/snapshots/test_vacuum.ambr b/tests/components/tplink/snapshots/test_vacuum.ambr
new file mode 100644
index 00000000000..e010c9545d1
--- /dev/null
+++ b/tests/components/tplink/snapshots/test_vacuum.ambr
@@ -0,0 +1,98 @@
+# serializer version: 1
+# name: test_states[my_vacuum-entry]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+      tuple(
+        'mac',
+        'aa:bb:cc:dd:ee:ff',
+      ),
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': '1.0.0',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'tplink',
+        '123456789ABCDEFGH',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'TP-Link',
+    'model': 'HS100',
+    'model_id': None,
+    'name': 'my_vacuum',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': '1.0.0',
+    'via_device_id': None,
+  })
+# ---
+# name: test_states[vacuum.my_vacuum-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'fan_speed_list': list([
+        'quiet',
+        'max',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'vacuum',
+    'entity_category': None,
+    'entity_id': 'vacuum.my_vacuum',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'tplink',
+    'previous_unique_id': None,
+    'supported_features': <VacuumEntityFeature: 12916>,
+    'translation_key': 'vacuum',
+    'unique_id': '123456789ABCDEFGH-vacuum',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_states[vacuum.my_vacuum-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'battery_icon': 'mdi:battery-charging-100',
+      'battery_level': 100,
+      'fan_speed': 'max',
+      'fan_speed_list': list([
+        'quiet',
+        'max',
+      ]),
+      'friendly_name': 'my_vacuum',
+      'supported_features': <VacuumEntityFeature: 12916>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'vacuum.my_vacuum',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'docked',
+  })
+# ---
diff --git a/tests/components/tplink/test_config_flow.py b/tests/components/tplink/test_config_flow.py
index b093847869e..35fd4f418de 100644
--- a/tests/components/tplink/test_config_flow.py
+++ b/tests/components/tplink/test_config_flow.py
@@ -1169,7 +1169,6 @@ async def test_manual_port_override(
         host,
         credentials=None,
         port_override=port,
-        uses_http=True,
         connection_type=CONN_PARAMS_KLAP,
     )
     mock_device = _mocked_device(
@@ -1491,7 +1490,6 @@ async def test_integration_discovery_with_ip_change(
     # Check that init set the new host correctly before calling connect
     assert config.host == IP_ADDRESS
     config.host = IP_ADDRESS2
-    config.uses_http = False  # Not passed in to new config class
     config.http_client = "Foo"
     mock_connect["connect"].assert_awaited_once_with(config=config)
 
@@ -1578,7 +1576,6 @@ async def test_integration_discovery_with_connection_change(
     assert mock_config_entry.state is ConfigEntryState.LOADED
 
     config.host = IP_ADDRESS2
-    config.uses_http = False  # Not passed in to new config class
     config.http_client = "Foo"
     config.aes_keys = AES_KEYS
     mock_connect["connect"].assert_awaited_once_with(config=config)
@@ -1847,7 +1844,6 @@ async def test_reauth_update_with_encryption_change(
         connection_type=Device.ConnectionParameters(
             Device.Family.SmartTapoPlug, Device.EncryptionType.Klap
         ),
-        uses_http=True,
     )
     mock_device = _mocked_device(
         alias="my_device",
diff --git a/tests/components/tplink/test_init.py b/tests/components/tplink/test_init.py
index ffcadc79faf..972ca73c45c 100644
--- a/tests/components/tplink/test_init.py
+++ b/tests/components/tplink/test_init.py
@@ -246,7 +246,6 @@ async def test_config_entry_with_stored_credentials(
     await hass.async_block_till_done()
     assert mock_config_entry.state is ConfigEntryState.LOADED
     config = DeviceConfig.from_dict(DEVICE_CONFIG_KLAP.to_dict())
-    config.uses_http = False
     config.http_client = "Foo"
     assert config.credentials != stored_credentials
     config.credentials = stored_credentials
@@ -762,7 +761,6 @@ async def test_credentials_hash_auth_error(
     expected_config = DeviceConfig.from_dict(
         {**DEVICE_CONFIG_DICT_KLAP, "credentials_hash": "theHash"}
     )
-    expected_config.uses_http = False
     expected_config.http_client = "Foo"
     connect_mock.assert_called_with(config=expected_config)
     assert entry.state is ConfigEntryState.SETUP_ERROR
@@ -794,13 +792,20 @@ async def test_migrate_remove_device_config(
     As async_setup_entry will succeed the hash on the parent is updated
     from the device.
     """
+    old_device_config = {
+        k: v for k, v in device_config.to_dict().items() if k != "credentials"
+    }
+    device_config_dict = {
+        **old_device_config,
+        "uses_http": device_config.connection_type.encryption_type
+        is not Device.EncryptionType.Xor,
+    }
+
     OLD_CREATE_ENTRY_DATA = {
         CONF_HOST: expected_entry_data[CONF_HOST],
         CONF_ALIAS: ALIAS,
         CONF_MODEL: MODEL,
-        CONF_DEVICE_CONFIG: {
-            k: v for k, v in device_config.to_dict().items() if k != "credentials"
-        },
+        CONF_DEVICE_CONFIG: device_config_dict,
     }
 
     entry = MockConfigEntry(
diff --git a/tests/components/tplink/test_light.py b/tests/components/tplink/test_light.py
index 565d4f1221a..7ae21fb4a26 100644
--- a/tests/components/tplink/test_light.py
+++ b/tests/components/tplink/test_light.py
@@ -61,7 +61,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import (
     _mocked_device,
diff --git a/tests/components/tplink/test_siren.py b/tests/components/tplink/test_siren.py
index 8c3328558b0..1d820bca1d1 100644
--- a/tests/components/tplink/test_siren.py
+++ b/tests/components/tplink/test_siren.py
@@ -7,12 +7,16 @@ import pytest
 from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components.siren import (
+    ATTR_DURATION,
+    ATTR_TONE,
+    ATTR_VOLUME_LEVEL,
     DOMAIN as SIREN_DOMAIN,
     SERVICE_TURN_OFF,
     SERVICE_TURN_ON,
 )
 from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 
 from . import _mocked_device, setup_platform_for_device, snapshot_platform
@@ -74,3 +78,91 @@ async def test_turn_on_and_off(
     )
 
     alarm_module.play.assert_called()
+
+
+@pytest.mark.parametrize(
+    ("max_volume", "volume_level", "expected_volume"),
+    [
+        pytest.param(3, 0.1, 1, id="smart-10%"),
+        pytest.param(3, 0.3, 1, id="smart-30%"),
+        pytest.param(3, 0.99, 3, id="smart-99%"),
+        pytest.param(3, 1, 3, id="smart-100%"),
+        pytest.param(10, 0.1, 1, id="smartcam-10%"),
+        pytest.param(10, 0.3, 3, id="smartcam-30%"),
+        pytest.param(10, 0.99, 10, id="smartcam-99%"),
+        pytest.param(10, 1, 10, id="smartcam-100%"),
+    ],
+)
+async def test_turn_on_with_volume(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mocked_hub: Device,
+    max_volume: int,
+    volume_level: float,
+    expected_volume: int,
+) -> None:
+    """Test that turn_on volume parameters work as expected."""
+
+    alarm_module = mocked_hub.modules[Module.Alarm]
+    alarm_volume_feat = alarm_module.get_feature("alarm_volume")
+    assert alarm_volume_feat
+    alarm_volume_feat.maximum_value = max_volume
+
+    await setup_platform_for_device(hass, mock_config_entry, Platform.SIREN, mocked_hub)
+
+    await hass.services.async_call(
+        SIREN_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: [ENTITY_ID], ATTR_VOLUME_LEVEL: volume_level},
+        blocking=True,
+    )
+
+    alarm_module.play.assert_called_with(
+        volume=expected_volume, duration=None, sound=None
+    )
+
+
+async def test_turn_on_with_duration_and_sound(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mocked_hub: Device,
+) -> None:
+    """Test that turn_on tone and duration parameters work as expected."""
+
+    alarm_module = mocked_hub.modules[Module.Alarm]
+
+    await setup_platform_for_device(hass, mock_config_entry, Platform.SIREN, mocked_hub)
+
+    await hass.services.async_call(
+        SIREN_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: [ENTITY_ID], ATTR_DURATION: 5, ATTR_TONE: "Foo"},
+        blocking=True,
+    )
+
+    alarm_module.play.assert_called_with(volume=None, duration=5, sound="Foo")
+
+
+@pytest.mark.parametrize(("duration"), [0, 301])
+async def test_turn_on_with_invalid_duration(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mocked_hub: Device,
+    duration: int,
+) -> None:
+    """Test that turn_on with invalid_duration raises an error."""
+
+    await setup_platform_for_device(hass, mock_config_entry, Platform.SIREN, mocked_hub)
+
+    msg = f"Invalid duration {duration} available: 1-300s"
+
+    with pytest.raises(ServiceValidationError, match=msg):
+        await hass.services.async_call(
+            SIREN_DOMAIN,
+            SERVICE_TURN_ON,
+            {
+                ATTR_ENTITY_ID: [ENTITY_ID],
+                ATTR_DURATION: duration,
+            },
+            blocking=True,
+        )
diff --git a/tests/components/tplink/test_vacuum.py b/tests/components/tplink/test_vacuum.py
new file mode 100644
index 00000000000..55bb8c0b504
--- /dev/null
+++ b/tests/components/tplink/test_vacuum.py
@@ -0,0 +1,133 @@
+"""Tests for vacuum platform."""
+
+from __future__ import annotations
+
+from kasa import Device, Module
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.vacuum import (
+    ATTR_BATTERY_LEVEL,
+    ATTR_FAN_SPEED,
+    DOMAIN as VACUUM_DOMAIN,
+    SERVICE_LOCATE,
+    SERVICE_PAUSE,
+    SERVICE_RETURN_TO_BASE,
+    SERVICE_SET_FAN_SPEED,
+    SERVICE_START,
+    VacuumActivity,
+)
+from homeassistant.const import ATTR_ENTITY_ID, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import (
+    device_registry as dr,
+    entity_registry as er,
+    translation,
+)
+
+from . import DEVICE_ID, _mocked_device, setup_platform_for_device, snapshot_platform
+
+from tests.common import MockConfigEntry
+
+ENTITY_ID = "vacuum.my_vacuum"
+
+
+@pytest.fixture
+async def mocked_vacuum(hass: HomeAssistant) -> Device:
+    """Return mocked tplink vacuum."""
+
+    return _mocked_device(modules=[Module.Clean, Module.Speaker], alias="my_vacuum")
+
+
+async def test_vacuum(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+    device_registry: dr.DeviceRegistry,
+    mocked_vacuum: Device,
+) -> None:
+    """Test initialization."""
+    await setup_platform_for_device(
+        hass, mock_config_entry, Platform.VACUUM, mocked_vacuum
+    )
+
+    device_entries = dr.async_entries_for_config_entry(
+        device_registry, mock_config_entry.entry_id
+    )
+    assert device_entries
+
+    entity = entity_registry.async_get(ENTITY_ID)
+    assert entity
+    assert entity.unique_id == f"{DEVICE_ID}-vacuum"
+
+    state = hass.states.get(ENTITY_ID)
+    assert state.state == VacuumActivity.DOCKED
+
+    assert state.attributes[ATTR_FAN_SPEED] == "max"
+    assert state.attributes[ATTR_BATTERY_LEVEL] == 100
+    result = translation.async_translate_state(
+        hass, "max", "vacuum", "tplink", "vacuum.state_attributes.fan_speed", None
+    )
+    assert result == "Max"
+
+
+async def test_states(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+    device_registry: dr.DeviceRegistry,
+    snapshot: SnapshotAssertion,
+    mocked_vacuum: Device,
+) -> None:
+    """Test vacuum states."""
+    await setup_platform_for_device(
+        hass, mock_config_entry, Platform.VACUUM, mocked_vacuum
+    )
+    await snapshot_platform(
+        hass, entity_registry, device_registry, snapshot, mock_config_entry.entry_id
+    )
+
+
+@pytest.mark.parametrize(
+    ("service_call", "module_name", "method", "params"),
+    [
+        (SERVICE_START, Module.Clean, "start", {}),
+        (SERVICE_PAUSE, Module.Clean, "pause", {}),
+        (SERVICE_RETURN_TO_BASE, Module.Clean, "return_home", {}),
+        (
+            SERVICE_SET_FAN_SPEED,
+            Module.Clean,
+            "set_fan_speed_preset",
+            {ATTR_FAN_SPEED: "quiet"},
+        ),
+        (SERVICE_LOCATE, Module.Speaker, "locate", {}),
+    ],
+)
+async def test_vacuum_module(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mocked_vacuum: Device,
+    service_call: str,
+    module_name: str,
+    method: str,
+    params: dict,
+) -> None:
+    """Test that all vacuum commands work correctly."""
+    vacuum = mocked_vacuum
+    module = vacuum.modules[module_name]
+
+    await setup_platform_for_device(hass, mock_config_entry, Platform.VACUUM, vacuum)
+
+    mock_method = getattr(module, method)
+
+    service_data = {ATTR_ENTITY_ID: ENTITY_ID}
+    service_data |= params
+
+    await hass.services.async_call(
+        VACUUM_DOMAIN, service_call, service_data, blocking=True
+    )
+
+    # Is this required when using blocking=True?
+    await hass.async_block_till_done(wait_background_tasks=True)
+
+    mock_method.assert_called()
diff --git a/tests/components/tplink_omada/snapshots/test_sensor.ambr b/tests/components/tplink_omada/snapshots/test_sensor.ambr
index 6c332eb9696..62167fc9d40 100644
--- a/tests/components/tplink_omada/snapshots/test_sensor.ambr
+++ b/tests/components/tplink_omada/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -66,6 +67,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -124,6 +126,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -174,6 +177,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -232,6 +236,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -290,6 +295,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tplink_omada/snapshots/test_switch.ambr b/tests/components/tplink_omada/snapshots/test_switch.ambr
index a13d386e721..dde196deaaf 100644
--- a/tests/components/tplink_omada/snapshots/test_switch.ambr
+++ b/tests/components/tplink_omada/snapshots/test_switch.ambr
@@ -71,6 +71,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -117,6 +118,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tractive/snapshots/test_binary_sensor.ambr b/tests/components/tractive/snapshots/test_binary_sensor.ambr
index 4b610e927d5..761626347a7 100644
--- a/tests/components/tractive/snapshots/test_binary_sensor.ambr
+++ b/tests/components/tractive/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tractive/snapshots/test_device_tracker.ambr b/tests/components/tractive/snapshots/test_device_tracker.ambr
index 4e7c5bfe173..ef511299e68 100644
--- a/tests/components/tractive/snapshots/test_device_tracker.ambr
+++ b/tests/components/tractive/snapshots/test_device_tracker.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tractive/snapshots/test_diagnostics.ambr b/tests/components/tractive/snapshots/test_diagnostics.ambr
index 11427a84801..3613f7e5997 100644
--- a/tests/components/tractive/snapshots/test_diagnostics.ambr
+++ b/tests/components/tractive/snapshots/test_diagnostics.ambr
@@ -17,6 +17,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': '**REDACTED**',
       'unique_id': 'very_unique_string',
       'version': 1,
diff --git a/tests/components/tractive/snapshots/test_sensor.ambr b/tests/components/tractive/snapshots/test_sensor.ambr
index f10cfb29226..4551492e36e 100644
--- a/tests/components/tractive/snapshots/test_sensor.ambr
+++ b/tests/components/tractive/snapshots/test_sensor.ambr
@@ -12,6 +12,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -66,6 +67,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -116,6 +118,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -164,6 +167,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -213,6 +217,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -263,6 +268,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -313,6 +319,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -367,6 +374,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -419,6 +427,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -475,6 +484,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tractive/snapshots/test_switch.ambr b/tests/components/tractive/snapshots/test_switch.ambr
index 08e0c984d0c..d443611ef92 100644
--- a/tests/components/tractive/snapshots/test_switch.ambr
+++ b/tests/components/tractive/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/tractive/test_device_tracker.py b/tests/components/tractive/test_device_tracker.py
index ff78173ef7b..ff9c7ca88ef 100644
--- a/tests/components/tractive/test_device_tracker.py
+++ b/tests/components/tractive/test_device_tracker.py
@@ -59,3 +59,31 @@ async def test_source_type_phone(
         hass.states.get("device_tracker.test_pet_tracker").attributes["source_type"]
         is SourceType.BLUETOOTH
     )
+
+
+async def test_source_type_gps(
+    hass: HomeAssistant,
+    mock_tractive_client: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test if the source type is GPS when the location sensor is KNOWN WIFI."""
+    await init_integration(hass, mock_config_entry)
+
+    mock_tractive_client.send_position_event(
+        mock_config_entry,
+        {
+            "tracker_id": "device_id_123",
+            "position": {
+                "latlong": [22.333, 44.555],
+                "accuracy": 99,
+                "sensor_used": "KNOWN_WIFI",
+            },
+        },
+    )
+    mock_tractive_client.send_hardware_event(mock_config_entry)
+    await hass.async_block_till_done()
+
+    assert (
+        hass.states.get("device_tracker.test_pet_tracker").attributes["source_type"]
+        is SourceType.GPS
+    )
diff --git a/tests/components/tradfri/__init__.py b/tests/components/tradfri/__init__.py
index 37792ae7e32..f73d887d16c 100644
--- a/tests/components/tradfri/__init__.py
+++ b/tests/components/tradfri/__init__.py
@@ -1,4 +1,6 @@
 """Tests for the tradfri component."""
 
 GATEWAY_ID = "mock-gateway-id"
+GATEWAY_ID1 = "mockgatewayid1"
+GATEWAY_ID2 = "mockgatewayid2"
 TRADFRI_PATH = "homeassistant.components.tradfri"
diff --git a/tests/components/tradfri/test_init.py b/tests/components/tradfri/test_init.py
index 54ce469f3c5..a1a4b8d9627 100644
--- a/tests/components/tradfri/test_init.py
+++ b/tests/components/tradfri/test_init.py
@@ -2,13 +2,19 @@
 
 from unittest.mock import MagicMock
 
+from pytradfri.const import ATTR_FIRMWARE_VERSION, ATTR_GATEWAY_ID
+from pytradfri.gateway import Gateway
+
 from homeassistant.components import tradfri
+from homeassistant.components.tradfri.const import DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
+from homeassistant.setup import async_setup_component
 
-from . import GATEWAY_ID
+from . import GATEWAY_ID, GATEWAY_ID1, GATEWAY_ID2
+from .common import CommandStore
 
-from tests.common import MockConfigEntry
+from tests.common import MockConfigEntry, load_json_object_fixture
 
 
 async def test_entry_setup_unload(
@@ -66,6 +72,7 @@ async def test_remove_stale_devices(
     device_registry.async_get_or_create(
         config_entry_id=config_entry.entry_id,
         identifiers={(tradfri.DOMAIN, "stale_device_id")},
+        name="stale-device",
     )
     device_entries = dr.async_entries_for_config_entry(
         device_registry, config_entry.entry_id
@@ -91,3 +98,178 @@ async def test_remove_stale_devices(
     assert device_entry.manufacturer == "IKEA of Sweden"
     assert device_entry.name == "Gateway"
     assert device_entry.model == "E1526"
+
+
+async def test_migrate_config_entry_and_identifiers(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    command_store: CommandStore,
+) -> None:
+    """Test correction of device registry entries."""
+    config_entry1 = MockConfigEntry(
+        domain=tradfri.DOMAIN,
+        data={
+            tradfri.CONF_HOST: "mock-host1",
+            tradfri.CONF_IDENTITY: "mock-identity1",
+            tradfri.CONF_KEY: "mock-key1",
+            tradfri.CONF_GATEWAY_ID: GATEWAY_ID1,
+        },
+    )
+
+    gateway1 = mock_gateway_fixture(command_store, GATEWAY_ID1)
+    command_store.register_device(
+        gateway1, load_json_object_fixture("bulb_w.json", DOMAIN)
+    )
+    config_entry1.add_to_hass(hass)
+
+    config_entry2 = MockConfigEntry(
+        domain=tradfri.DOMAIN,
+        data={
+            tradfri.CONF_HOST: "mock-host2",
+            tradfri.CONF_IDENTITY: "mock-identity2",
+            tradfri.CONF_KEY: "mock-key2",
+            tradfri.CONF_GATEWAY_ID: GATEWAY_ID2,
+        },
+    )
+
+    config_entry2.add_to_hass(hass)
+
+    # Add non-tradfri config entry for use in testing negation logic
+    config_entry3 = MockConfigEntry(
+        domain="test_domain",
+    )
+
+    config_entry3.add_to_hass(hass)
+
+    # Create gateway device for config entry 1
+    gateway1_device = device_registry.async_get_or_create(
+        config_entry_id=config_entry1.entry_id,
+        identifiers={(config_entry1.domain, config_entry1.data["gateway_id"])},
+        name="Gateway",
+    )
+
+    # Create bulb 1 on gateway 1 in Device Registry - this has the old identifiers format
+    gateway1_bulb1 = device_registry.async_get_or_create(
+        config_entry_id=config_entry1.entry_id,
+        identifiers={(tradfri.DOMAIN, 65537)},
+        name="bulb1",
+    )
+
+    # Update bulb 1 device to have both config entry IDs
+    # This is to simulate existing data scenario with older version of tradfri component
+    device_registry.async_update_device(
+        gateway1_bulb1.id,
+        add_config_entry_id=config_entry2.entry_id,
+    )
+
+    # Create bulb 2 on gateway 1 in Device Registry - this has the new identifiers format
+    gateway1_bulb2 = device_registry.async_get_or_create(
+        config_entry_id=config_entry1.entry_id,
+        identifiers={(tradfri.DOMAIN, f"{GATEWAY_ID1}-65538")},
+        name="bulb2",
+    )
+
+    # Update bulb 2 device to have an additional config entry from config_entry3
+    # This is to simulate scenario whereby a device entry
+    # is shared by multiple config entries
+    # and where at least one of those config entries is not the 'tradfri' domain
+    device_registry.async_update_device(
+        gateway1_bulb2.id,
+        add_config_entry_id=config_entry3.entry_id,
+        merge_identifiers={("test_domain", "config_entry_3-device2")},
+    )
+
+    # Create a device on config entry 3 in Device Registry
+    config_entry3_device = device_registry.async_get_or_create(
+        config_entry_id=config_entry3.entry_id,
+        identifiers={("test_domain", "config_entry_3-device1")},
+        name="device",
+    )
+
+    # Set up all tradfri config entries.
+    await async_setup_component(hass, DOMAIN, {})
+    await hass.async_block_till_done()
+
+    # Validate that gateway 1 bulb 1 is still the same device entry
+    # This inherently also validates that the device's identifiers
+    # have been updated to the new unique format
+    device_entries = dr.async_entries_for_config_entry(
+        device_registry, config_entry1.entry_id
+    )
+    assert (
+        device_registry.async_get_device(
+            identifiers={(tradfri.DOMAIN, f"{GATEWAY_ID1}-65537")}
+        ).id
+        == gateway1_bulb1.id
+    )
+
+    # Validate that gateway 1 bulb 1 only has gateway 1's config ID associated to it
+    # (Device at index 0 is the gateway)
+    assert device_entries[1].config_entries == {config_entry1.entry_id}
+
+    # Validate that the gateway 1 device is unchanged
+    assert device_entries[0].id == gateway1_device.id
+    assert device_entries[0].identifiers == gateway1_device.identifiers
+    assert device_entries[0].config_entries == gateway1_device.config_entries
+
+    # Validate that gateway 1 bulb 2 now only exists associated to config entry 3.
+    # The device will have had its identifiers updated to the new format (for the tradfri
+    # domain) per migrate_config_entry_and_identifiers().
+    # The device will have then been removed from config entry 1 (gateway1)
+    # due to it not matching a device in the command store.
+    device_entry = device_registry.async_get_device(
+        identifiers={(tradfri.DOMAIN, f"{GATEWAY_ID1}-65538")}
+    )
+
+    assert device_entry.id == gateway1_bulb2.id
+    # Assert that the only config entry associated to this device is config entry 3
+    assert device_entry.config_entries == {config_entry3.entry_id}
+    # Assert that that device's other identifiers remain untouched
+    assert device_entry.identifiers == {
+        (tradfri.DOMAIN, f"{GATEWAY_ID1}-65538"),
+        ("test_domain", "config_entry_3-device2"),
+    }
+
+    # Validate that gateway 2 bulb 1 has been added to device registry and with correct unique identifiers
+    # (This bulb device exists on gateway 2 because the command_store created above will be executed
+    # for each gateway being set up.)
+    device_entries = dr.async_entries_for_config_entry(
+        device_registry, config_entry2.entry_id
+    )
+    assert len(device_entries) == 2
+    assert device_entries[1].identifiers == {(tradfri.DOMAIN, f"{GATEWAY_ID2}-65537")}
+
+    # Validate that gateway 2 bulb 1 only has gateway 2's config ID associated to it
+    assert device_entries[1].config_entries == {config_entry2.entry_id}
+
+    # Validate that config entry 3 device 1 is still present,
+    # and has not had its config entries or identifiers changed
+    # N.B. The gateway1_bulb2 device will qualify in this set
+    # because the config entry 3 was added to it above
+    device_entries = dr.async_entries_for_config_entry(
+        device_registry, config_entry3.entry_id
+    )
+    assert len(device_entries) == 2
+    assert device_entries[0].id == config_entry3_device.id
+    assert device_entries[0].identifiers == {("test_domain", "config_entry_3-device1")}
+    assert device_entries[0].config_entries == {config_entry3.entry_id}
+
+    # Assert that the tradfri config entries have been migrated to v2 and
+    # the non-tradfri config entry remains at v1
+    assert config_entry1.version == 2
+    assert config_entry2.version == 2
+    assert config_entry3.version == 1
+
+
+def mock_gateway_fixture(command_store: CommandStore, gateway_id: str) -> Gateway:
+    """Mock a Tradfri gateway."""
+    gateway = Gateway()
+    command_store.register_response(
+        gateway.get_gateway_info(),
+        {ATTR_GATEWAY_ID: gateway_id, ATTR_FIRMWARE_VERSION: "1.2.1234"},
+    )
+    command_store.register_response(
+        gateway.get_devices(),
+        [],
+    )
+    return gateway
diff --git a/tests/components/tts/common.py b/tests/components/tts/common.py
index b1eae12d694..99c698771f7 100644
--- a/tests/components/tts/common.py
+++ b/tests/components/tts/common.py
@@ -14,9 +14,11 @@ import voluptuous as vol
 from homeassistant.components import media_source
 from homeassistant.components.tts import (
     CONF_LANG,
+    DATA_TTS_MANAGER,
     DOMAIN as TTS_DOMAIN,
     PLATFORM_SCHEMA as TTS_PLATFORM_SCHEMA,
     Provider,
+    ResultStream,
     TextToSpeechEntity,
     TtsAudioType,
     Voice,
@@ -24,7 +26,7 @@ from homeassistant.components.tts import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.setup import async_setup_component
 
@@ -249,7 +251,7 @@ async def mock_config_entry_setup(
     async def async_setup_entry_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test tts platform via config entry."""
         async_add_entities([tts_entity])
@@ -263,3 +265,33 @@ async def mock_config_entry_setup(
     await hass.async_block_till_done()
 
     return config_entry
+
+
+class MockResultStream(ResultStream):
+    """Mock result stream."""
+
+    test_set_message: str | None = None
+
+    def __init__(self, hass: HomeAssistant, extension: str, data: bytes) -> None:
+        """Initialize the result stream."""
+        super().__init__(
+            token="test-token",
+            extension=extension,
+            content_type=f"audio/mock-{extension}",
+            engine="test-engine",
+            use_file_cache=True,
+            language="en",
+            options={},
+            _manager=hass.data[DATA_TTS_MANAGER],
+        )
+        hass.data[DATA_TTS_MANAGER].token_to_stream[self.token] = self
+        self._mock_data = data
+
+    @callback
+    def async_set_message(self, message: str) -> None:
+        """Set message to be generated."""
+        self.test_set_message = message
+
+    async def async_stream_result(self):
+        """Stream the result."""
+        yield self._mock_data
diff --git a/tests/components/tts/test_entity.py b/tests/components/tts/test_entity.py
new file mode 100644
index 00000000000..d82ec6a5d2b
--- /dev/null
+++ b/tests/components/tts/test_entity.py
@@ -0,0 +1,144 @@
+"""Tests for the TTS entity."""
+
+import pytest
+
+from homeassistant.components import tts
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant, State
+
+from .common import (
+    DEFAULT_LANG,
+    SUPPORT_LANGUAGES,
+    TEST_DOMAIN,
+    MockTTSEntity,
+    mock_config_entry_setup,
+)
+
+from tests.common import mock_restore_cache
+
+
+class DefaultEntity(tts.TextToSpeechEntity):
+    """Test entity."""
+
+    _attr_supported_languages = SUPPORT_LANGUAGES
+    _attr_default_language = DEFAULT_LANG
+
+
+async def test_default_entity_attributes() -> None:
+    """Test default entity attributes."""
+    entity = DefaultEntity()
+
+    assert entity.hass is None
+    assert entity.default_language == DEFAULT_LANG
+    assert entity.supported_languages == SUPPORT_LANGUAGES
+    assert entity.supported_options is None
+    assert entity.default_options is None
+    assert entity.async_get_supported_voices("test") is None
+
+
+async def test_restore_state(
+    hass: HomeAssistant,
+    mock_tts_entity: MockTTSEntity,
+) -> None:
+    """Test we restore state in the integration."""
+    entity_id = f"{tts.DOMAIN}.{TEST_DOMAIN}"
+    timestamp = "2023-01-01T23:59:59+00:00"
+    mock_restore_cache(hass, (State(entity_id, timestamp),))
+
+    config_entry = await mock_config_entry_setup(hass, mock_tts_entity)
+    await hass.async_block_till_done()
+
+    assert config_entry.state is ConfigEntryState.LOADED
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == timestamp
+
+
+async def test_tts_entity_subclass_properties(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test for errors when subclasses of the TextToSpeechEntity are missing required properties."""
+
+    class TestClass1(tts.TextToSpeechEntity):
+        _attr_default_language = DEFAULT_LANG
+        _attr_supported_languages = SUPPORT_LANGUAGES
+
+    await mock_config_entry_setup(hass, TestClass1())
+
+    class TestClass2(tts.TextToSpeechEntity):
+        @property
+        def default_language(self) -> str:
+            return DEFAULT_LANG
+
+        @property
+        def supported_languages(self) -> list[str]:
+            return SUPPORT_LANGUAGES
+
+    await mock_config_entry_setup(hass, TestClass2())
+
+    assert all(record.exc_info is None for record in caplog.records)
+
+    caplog.clear()
+
+    class TestClass3(tts.TextToSpeechEntity):
+        _attr_default_language = DEFAULT_LANG
+
+    await mock_config_entry_setup(hass, TestClass3())
+
+    assert (
+        "TTS entities must either set the '_attr_supported_languages' attribute or override the 'supported_languages' property"
+        in [
+            str(record.exc_info[1])
+            for record in caplog.records
+            if record.exc_info is not None
+        ]
+    )
+    caplog.clear()
+
+    class TestClass4(tts.TextToSpeechEntity):
+        _attr_supported_languages = SUPPORT_LANGUAGES
+
+    await mock_config_entry_setup(hass, TestClass4())
+
+    assert (
+        "TTS entities must either set the '_attr_default_language' attribute or override the 'default_language' property"
+        in [
+            str(record.exc_info[1])
+            for record in caplog.records
+            if record.exc_info is not None
+        ]
+    )
+    caplog.clear()
+
+    class TestClass5(tts.TextToSpeechEntity):
+        @property
+        def default_language(self) -> str:
+            return DEFAULT_LANG
+
+    await mock_config_entry_setup(hass, TestClass5())
+
+    assert (
+        "TTS entities must either set the '_attr_supported_languages' attribute or override the 'supported_languages' property"
+        in [
+            str(record.exc_info[1])
+            for record in caplog.records
+            if record.exc_info is not None
+        ]
+    )
+    caplog.clear()
+
+    class TestClass6(tts.TextToSpeechEntity):
+        @property
+        def supported_languages(self) -> list[str]:
+            return SUPPORT_LANGUAGES
+
+    await mock_config_entry_setup(hass, TestClass6())
+
+    assert (
+        "TTS entities must either set the '_attr_default_language' attribute or override the 'default_language' property"
+        in [
+            str(record.exc_info[1])
+            for record in caplog.records
+            if record.exc_info is not None
+        ]
+    )
diff --git a/tests/components/tts/test_init.py b/tests/components/tts/test_init.py
index 2159d92ae4b..4e17bc68a5e 100644
--- a/tests/components/tts/test_init.py
+++ b/tests/components/tts/test_init.py
@@ -20,15 +20,15 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN
-from homeassistant.core import HomeAssistant, State
+from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import (
     DEFAULT_LANG,
-    SUPPORT_LANGUAGES,
     TEST_DOMAIN,
+    MockResultStream,
     MockTTS,
     MockTTSEntity,
     MockTTSProvider,
@@ -38,38 +38,12 @@ from .common import (
     retrieve_media,
 )
 
-from tests.common import (
-    MockModule,
-    async_mock_service,
-    mock_integration,
-    mock_platform,
-    mock_restore_cache,
-    reset_translation_cache,
-)
+from tests.common import MockModule, async_mock_service, mock_integration, mock_platform
 from tests.typing import ClientSessionGenerator, WebSocketGenerator
 
 ORIG_WRITE_TAGS = tts.SpeechManager.write_tags
 
 
-class DefaultEntity(tts.TextToSpeechEntity):
-    """Test entity."""
-
-    _attr_supported_languages = SUPPORT_LANGUAGES
-    _attr_default_language = DEFAULT_LANG
-
-
-async def test_default_entity_attributes() -> None:
-    """Test default entity attributes."""
-    entity = DefaultEntity()
-
-    assert entity.hass is None
-    assert entity.default_language == DEFAULT_LANG
-    assert entity.supported_languages == SUPPORT_LANGUAGES
-    assert entity.supported_options is None
-    assert entity.default_options is None
-    assert entity.async_get_supported_voices("test") is None
-
-
 async def test_config_entry_unload(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
@@ -121,24 +95,6 @@ async def test_config_entry_unload(
     assert state is None
 
 
-async def test_restore_state(
-    hass: HomeAssistant,
-    mock_tts_entity: MockTTSEntity,
-) -> None:
-    """Test we restore state in the integration."""
-    entity_id = f"{tts.DOMAIN}.{TEST_DOMAIN}"
-    timestamp = "2023-01-01T23:59:59+00:00"
-    mock_restore_cache(hass, (State(entity_id, timestamp),))
-
-    config_entry = await mock_config_entry_setup(hass, mock_tts_entity)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-    state = hass.states.get(entity_id)
-    assert state
-    assert state.state == timestamp
-
-
 @pytest.mark.parametrize(
     "setup", ["mock_setup", "mock_config_entry_setup"], indirect=True
 )
@@ -212,7 +168,7 @@ async def test_service(
         assert await get_media_source_url(
             hass, calls[0].data[ATTR_MEDIA_CONTENT_ID]
         ) == ("/api/tts_proxy/test_token.mp3")
-        await hass.async_block_till_done()
+        await hass.async_block_till_done(wait_background_tasks=True)
         assert (
             mock_tts_cache_dir
             / f"42f18378fd4393d18c8dd11d03fa9563c1e54491_en-us_-_{expected_url_suffix}.mp3"
@@ -274,7 +230,7 @@ async def test_service_default_language(
         assert await get_media_source_url(
             hass, calls[0].data[ATTR_MEDIA_CONTENT_ID]
         ) == ("/api/tts_proxy/test_token.mp3")
-        await hass.async_block_till_done()
+        await hass.async_block_till_done(wait_background_tasks=True)
         assert (
             mock_tts_cache_dir
             / (
@@ -338,7 +294,7 @@ async def test_service_default_special_language(
         assert await get_media_source_url(
             hass, calls[0].data[ATTR_MEDIA_CONTENT_ID]
         ) == ("/api/tts_proxy/test_token.mp3")
-        await hass.async_block_till_done()
+        await hass.async_block_till_done(wait_background_tasks=True)
         assert (
             mock_tts_cache_dir
             / f"42f18378fd4393d18c8dd11d03fa9563c1e54491_en-us_-_{expected_url_suffix}.mp3"
@@ -398,7 +354,7 @@ async def test_service_language(
         assert await get_media_source_url(
             hass, calls[0].data[ATTR_MEDIA_CONTENT_ID]
         ) == ("/api/tts_proxy/test_token.mp3")
-        await hass.async_block_till_done()
+        await hass.async_block_till_done(wait_background_tasks=True)
         assert (
             mock_tts_cache_dir
             / f"42f18378fd4393d18c8dd11d03fa9563c1e54491_de-de_-_{expected_url_suffix}.mp3"
@@ -514,7 +470,7 @@ async def test_service_options(
         assert await get_media_source_url(
             hass, calls[0].data[ATTR_MEDIA_CONTENT_ID]
         ) == ("/api/tts_proxy/test_token.mp3")
-        await hass.async_block_till_done()
+        await hass.async_block_till_done(wait_background_tasks=True)
         assert (
             mock_tts_cache_dir
             / (
@@ -598,7 +554,7 @@ async def test_service_default_options(
         assert await get_media_source_url(
             hass, calls[0].data[ATTR_MEDIA_CONTENT_ID]
         ) == ("/api/tts_proxy/test_token.mp3")
-        await hass.async_block_till_done()
+        await hass.async_block_till_done(wait_background_tasks=True)
         assert (
             mock_tts_cache_dir
             / (
@@ -672,7 +628,7 @@ async def test_merge_default_service_options(
         assert await get_media_source_url(
             hass, calls[0].data[ATTR_MEDIA_CONTENT_ID]
         ) == ("/api/tts_proxy/test_token.mp3")
-        await hass.async_block_till_done()
+        await hass.async_block_till_done(wait_background_tasks=True)
         assert (
             mock_tts_cache_dir
             / (
@@ -787,7 +743,7 @@ async def test_service_clear_cache(
     # To make sure the file is persisted
     assert len(calls) == 1
     await get_media_source_url(hass, calls[0].data[ATTR_MEDIA_CONTENT_ID])
-    await hass.async_block_till_done()
+    await hass.async_block_till_done(wait_background_tasks=True)
     assert (
         mock_tts_cache_dir
         / f"42f18378fd4393d18c8dd11d03fa9563c1e54491_en-us_-_{expected_url_suffix}.mp3"
@@ -1198,7 +1154,7 @@ async def test_service_get_tts_error(
     assert len(calls) == 1
     assert (
         await retrieve_media(hass, hass_client, calls[0].data[ATTR_MEDIA_CONTENT_ID])
-        == HTTPStatus.NOT_FOUND
+        == HTTPStatus.INTERNAL_SERVER_ERROR
     )
 
 
@@ -1421,29 +1377,6 @@ def test_resolve_engine(hass: HomeAssistant, setup: str, engine_id: str) -> None
         assert tts.async_resolve_engine(hass, None) is None
 
 
-@pytest.mark.parametrize(
-    ("setup", "engine_id"),
-    [
-        ("mock_setup", "test"),
-        ("mock_config_entry_setup", "tts.test"),
-    ],
-    indirect=["setup"],
-)
-async def test_support_options(hass: HomeAssistant, setup: str, engine_id: str) -> None:
-    """Test supporting options."""
-    assert await tts.async_support_options(hass, engine_id, "en_US") is True
-    assert await tts.async_support_options(hass, engine_id, "nl") is False
-    assert (
-        await tts.async_support_options(
-            hass, engine_id, "en_US", {"invalid_option": "yo"}
-        )
-        is False
-    )
-
-    with pytest.raises(HomeAssistantError):
-        await tts.async_support_options(hass, "non-existing")
-
-
 async def test_legacy_fetching_in_async(
     hass: HomeAssistant, hass_client: ClientSessionGenerator
 ) -> None:
@@ -1836,99 +1769,15 @@ async def test_async_convert_audio_error(hass: HomeAssistant) -> None:
     """Test that ffmpeg failing during audio conversion will raise an error."""
     assert await async_setup_component(hass, ffmpeg.DOMAIN, {})
 
+    async def bad_data_gen():
+        yield bytes(0)
+
     with pytest.raises(RuntimeError):
         # Simulate a bad WAV file
-        await tts.async_convert_audio(hass, "wav", bytes(0), "mp3")
-
-
-async def test_ttsentity_subclass_properties(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
-) -> None:
-    """Test for errors when subclasses of the TextToSpeechEntity are missing required properties."""
-
-    class TestClass1(tts.TextToSpeechEntity):
-        _attr_default_language = DEFAULT_LANG
-        _attr_supported_languages = SUPPORT_LANGUAGES
-
-    await mock_config_entry_setup(hass, TestClass1())
-
-    class TestClass2(tts.TextToSpeechEntity):
-        @property
-        def default_language(self) -> str:
-            return DEFAULT_LANG
-
-        @property
-        def supported_languages(self) -> list[str]:
-            return SUPPORT_LANGUAGES
-
-    await mock_config_entry_setup(hass, TestClass2())
-
-    assert all(record.exc_info is None for record in caplog.records)
-
-    caplog.clear()
-
-    class TestClass3(tts.TextToSpeechEntity):
-        _attr_default_language = DEFAULT_LANG
-
-    await mock_config_entry_setup(hass, TestClass3())
-
-    assert (
-        "TTS entities must either set the '_attr_supported_languages' attribute or override the 'supported_languages' property"
-        in [
-            str(record.exc_info[1])
-            for record in caplog.records
-            if record.exc_info is not None
-        ]
-    )
-    caplog.clear()
-
-    class TestClass4(tts.TextToSpeechEntity):
-        _attr_supported_languages = SUPPORT_LANGUAGES
-
-    await mock_config_entry_setup(hass, TestClass4())
-
-    assert (
-        "TTS entities must either set the '_attr_default_language' attribute or override the 'default_language' property"
-        in [
-            str(record.exc_info[1])
-            for record in caplog.records
-            if record.exc_info is not None
-        ]
-    )
-    caplog.clear()
-
-    class TestClass5(tts.TextToSpeechEntity):
-        @property
-        def default_language(self) -> str:
-            return DEFAULT_LANG
-
-    await mock_config_entry_setup(hass, TestClass5())
-
-    assert (
-        "TTS entities must either set the '_attr_supported_languages' attribute or override the 'supported_languages' property"
-        in [
-            str(record.exc_info[1])
-            for record in caplog.records
-            if record.exc_info is not None
-        ]
-    )
-    caplog.clear()
-
-    class TestClass6(tts.TextToSpeechEntity):
-        @property
-        def supported_languages(self) -> list[str]:
-            return SUPPORT_LANGUAGES
-
-    await mock_config_entry_setup(hass, TestClass6())
-
-    assert (
-        "TTS entities must either set the '_attr_default_language' attribute or override the 'default_language' property"
-        in [
-            str(record.exc_info[1])
-            for record in caplog.records
-            if record.exc_info is not None
-        ]
-    )
+        async for _chunk in tts._async_convert_audio(
+            hass, "wav", bad_data_gen(), "mp3"
+        ):
+            pass
 
 
 async def test_default_engine_prefer_entity(
@@ -1988,5 +1837,101 @@ async def test_default_engine_prefer_cloud_entity(
     assert provider_engine == "test"
     assert tts.async_default_engine(hass) == "tts.cloud_tts_entity"
 
-    # Reset the `cloud` translations cache to avoid flaky translation checks
-    reset_translation_cache(hass, ["cloud"])
+
+async def test_stream(hass: HomeAssistant, mock_tts_entity: MockTTSEntity) -> None:
+    """Test creating streams."""
+    await mock_config_entry_setup(hass, mock_tts_entity)
+    stream = tts.async_create_stream(hass, mock_tts_entity.entity_id)
+    assert stream.language == mock_tts_entity.default_language
+    assert stream.options == (mock_tts_entity.default_options or {})
+    assert tts.async_get_stream(hass, stream.token) is stream
+
+    data = b"beer"
+    stream2 = MockResultStream(hass, "wav", data)
+    assert tts.async_get_stream(hass, stream2.token) is stream2
+    assert stream2.extension == "wav"
+    result_data = b"".join([chunk async for chunk in stream2.async_stream_result()])
+    assert result_data == data
+
+
+async def test_tts_cache() -> None:
+    """Test TTSCache."""
+
+    async def data_gen(queue: asyncio.Queue[bytes | None | Exception]):
+        while chunk := await queue.get():
+            if isinstance(chunk, Exception):
+                raise chunk
+            yield chunk
+
+    queue = asyncio.Queue()
+    cache = tts.TTSCache("test-key", "mp3", data_gen(queue))
+    assert cache.cache_key == "test-key"
+    assert cache.extension == "mp3"
+
+    for i in range(10):
+        queue.put_nowait(f"{i}".encode())
+    queue.put_nowait(None)
+
+    assert await cache.async_load_data() == b"0123456789"
+
+    with pytest.raises(RuntimeError):
+        await cache.async_load_data()
+
+    # When data is loaded, we get it all in 1 chunk
+    cur = 0
+    async for chunk in cache.async_stream_data():
+        assert chunk == b"0123456789"
+        cur += 1
+    assert cur == 1
+
+    # Show we can stream the data while it's still being generated
+    async def consume_cache(cache: tts.TTSCache):
+        return b"".join([chunk async for chunk in cache.async_stream_data()])
+
+    queue = asyncio.Queue()
+    cache = tts.TTSCache("test-key", "mp3", data_gen(queue))
+
+    load_data_task = asyncio.create_task(cache.async_load_data())
+    consume_pre_data_loaded_task = asyncio.create_task(consume_cache(cache))
+    queue.put_nowait(b"0")
+    await asyncio.sleep(0)
+    queue.put_nowait(b"1")
+    await asyncio.sleep(0)
+    consume_mid_data_task = asyncio.create_task(consume_cache(cache))
+    queue.put_nowait(b"2")
+    await asyncio.sleep(0)
+    queue.put_nowait(None)
+    consume_post_data_loaded_task = asyncio.create_task(consume_cache(cache))
+    await asyncio.sleep(0)
+    assert await load_data_task == b"012"
+    assert await consume_post_data_loaded_task == b"012"
+    assert await consume_mid_data_task == b"012"
+    assert await consume_pre_data_loaded_task == b"012"
+
+    # Now with errors
+    async def consume_cache(cache: tts.TTSCache):
+        return b"".join([chunk async for chunk in cache.async_stream_data()])
+
+    queue = asyncio.Queue()
+    cache = tts.TTSCache("test-key", "mp3", data_gen(queue))
+
+    load_data_task = asyncio.create_task(cache.async_load_data())
+    consume_pre_data_loaded_task = asyncio.create_task(consume_cache(cache))
+    queue.put_nowait(b"0")
+    await asyncio.sleep(0)
+    queue.put_nowait(b"1")
+    await asyncio.sleep(0)
+    consume_mid_data_task = asyncio.create_task(consume_cache(cache))
+    queue.put_nowait(ValueError("Boom!"))
+    await asyncio.sleep(0)
+    queue.put_nowait(None)
+    consume_post_data_loaded_task = asyncio.create_task(consume_cache(cache))
+    await asyncio.sleep(0)
+    with pytest.raises(ValueError):
+        assert await load_data_task == b"012"
+    with pytest.raises(ValueError):
+        assert await consume_post_data_loaded_task == b"012"
+    with pytest.raises(ValueError):
+        assert await consume_mid_data_task == b"012"
+    with pytest.raises(ValueError):
+        assert await consume_pre_data_loaded_task == b"012"
diff --git a/tests/components/tts/test_media_source.py b/tests/components/tts/test_media_source.py
index d90923b02ab..9e50cc6b512 100644
--- a/tests/components/tts/test_media_source.py
+++ b/tests/components/tts/test_media_source.py
@@ -268,7 +268,7 @@ async def test_generate_media_source_id_and_media_source_id_to_kwargs(
         "message": "hello",
         "language": "en_US",
         "options": {"age": 5},
-        "cache": True,
+        "use_file_cache": True,
     }
 
     kwargs = {
@@ -284,7 +284,7 @@ async def test_generate_media_source_id_and_media_source_id_to_kwargs(
         "message": "hello",
         "language": "en_US",
         "options": {"age": [5, 6]},
-        "cache": True,
+        "use_file_cache": True,
     }
 
     kwargs = {
@@ -300,5 +300,5 @@ async def test_generate_media_source_id_and_media_source_id_to_kwargs(
         "message": "hello",
         "language": "en_US",
         "options": {"age": {"k1": [5, 6], "k2": "v2"}},
-        "cache": True,
+        "use_file_cache": True,
     }
diff --git a/tests/components/tuya/snapshots/test_config_flow.ambr b/tests/components/tuya/snapshots/test_config_flow.ambr
index a5a68a12a22..90d83d69814 100644
--- a/tests/components/tuya/snapshots/test_config_flow.ambr
+++ b/tests/components/tuya/snapshots/test_config_flow.ambr
@@ -24,6 +24,8 @@
     'pref_disable_new_entities': False,
     'pref_disable_polling': False,
     'source': 'user',
+    'subentries': list([
+    ]),
     'title': '12345',
     'unique_id': '12345',
     'version': 1,
@@ -54,6 +56,8 @@
     'pref_disable_new_entities': False,
     'pref_disable_polling': False,
     'source': 'user',
+    'subentries': list([
+    ]),
     'title': 'Old Tuya configuration entry',
     'unique_id': '12345',
     'version': 1,
@@ -107,10 +111,14 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'mocked_username',
       'unique_id': None,
       'version': 1,
     }),
+    'subentries': tuple(
+    ),
     'title': 'mocked_username',
     'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
     'version': 1,
diff --git a/tests/components/twentemilieu/snapshots/test_calendar.ambr b/tests/components/twentemilieu/snapshots/test_calendar.ambr
index 1df4beb4232..0576fcd6a70 100644
--- a/tests/components/twentemilieu/snapshots/test_calendar.ambr
+++ b/tests/components/twentemilieu/snapshots/test_calendar.ambr
@@ -51,6 +51,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -81,6 +82,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://www.twentemilieu.nl',
     'connections': set({
     }),
diff --git a/tests/components/twentemilieu/snapshots/test_sensor.ambr b/tests/components/twentemilieu/snapshots/test_sensor.ambr
index 86ffc171082..b40ac0ba9e6 100644
--- a/tests/components/twentemilieu/snapshots/test_sensor.ambr
+++ b/tests/components/twentemilieu/snapshots/test_sensor.ambr
@@ -20,6 +20,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -50,6 +51,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://www.twentemilieu.nl',
     'connections': set({
     }),
@@ -99,6 +101,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -129,6 +132,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://www.twentemilieu.nl',
     'connections': set({
     }),
@@ -178,6 +182,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -208,6 +213,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://www.twentemilieu.nl',
     'connections': set({
     }),
@@ -257,6 +263,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -287,6 +294,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://www.twentemilieu.nl',
     'connections': set({
     }),
@@ -336,6 +344,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -366,6 +375,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://www.twentemilieu.nl',
     'connections': set({
     }),
diff --git a/tests/components/twinkly/snapshots/test_diagnostics.ambr b/tests/components/twinkly/snapshots/test_diagnostics.ambr
index 814dc7dfc1f..511bf9addd3 100644
--- a/tests/components/twinkly/snapshots/test_diagnostics.ambr
+++ b/tests/components/twinkly/snapshots/test_diagnostics.ambr
@@ -69,6 +69,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Twinkly',
       'unique_id': '00:2d:13:3b:aa:bb',
       'version': 1,
diff --git a/tests/components/twinkly/snapshots/test_light.ambr b/tests/components/twinkly/snapshots/test_light.ambr
index a97c3f941ff..77a97a0cdd9 100644
--- a/tests/components/twinkly/snapshots/test_light.ambr
+++ b/tests/components/twinkly/snapshots/test_light.ambr
@@ -14,6 +14,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/twinkly/snapshots/test_select.ambr b/tests/components/twinkly/snapshots/test_select.ambr
index 21e09d6b022..6700aecd1f2 100644
--- a/tests/components/twinkly/snapshots/test_select.ambr
+++ b/tests/components/twinkly/snapshots/test_select.ambr
@@ -16,6 +16,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -37,7 +38,7 @@
     'platform': 'twinkly',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'mode',
     'unique_id': '00:2d:13:3b:aa:bb_mode',
     'unit_of_measurement': None,
   })
diff --git a/tests/components/twinkly/test_light.py b/tests/components/twinkly/test_light.py
index acf30764bab..f8289cb95e3 100644
--- a/tests/components/twinkly/test_light.py
+++ b/tests/components/twinkly/test_light.py
@@ -140,7 +140,7 @@ async def test_turn_on_with_color_rgbw(
     )
 
     mock_twinkly_client.interview.assert_called_once_with()
-    mock_twinkly_client.set_static_colour.assert_called_once_with((128, 64, 32))
+    mock_twinkly_client.set_static_colour.assert_called_once_with((0, 128, 64, 32))
     mock_twinkly_client.set_mode.assert_called_once_with("color")
     assert mock_twinkly_client.default_mode == "color"
 
diff --git a/tests/components/uk_transport/test_sensor.py b/tests/components/uk_transport/test_sensor.py
index a4a9aea18c8..ba547c5eecc 100644
--- a/tests/components/uk_transport/test_sensor.py
+++ b/tests/components/uk_transport/test_sensor.py
@@ -8,6 +8,7 @@ import requests_mock
 from homeassistant.components.uk_transport.sensor import (
     ATTR_ATCOCODE,
     ATTR_CALLING_AT,
+    ATTR_LAST_UPDATED,
     ATTR_LOCALITY,
     ATTR_NEXT_BUSES,
     ATTR_NEXT_TRAINS,
@@ -90,3 +91,4 @@ async def test_train(hass: HomeAssistant) -> None:
         == "London Waterloo"
     )
     assert train_state.attributes[ATTR_NEXT_TRAINS][0]["estimated"] == "06:13"
+    assert train_state.attributes[ATTR_LAST_UPDATED] == "2017-07-10T06:10:05+01:00"
diff --git a/tests/components/unifi/conftest.py b/tests/components/unifi/conftest.py
index 702f8629219..4075aa0ad59 100644
--- a/tests/components/unifi/conftest.py
+++ b/tests/components/unifi/conftest.py
@@ -26,7 +26,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 from tests.test_util.aiohttp import AiohttpClientMocker
@@ -172,6 +172,7 @@ def fixture_request(
     device_payload: list[dict[str, Any]],
     dpi_app_payload: list[dict[str, Any]],
     dpi_group_payload: list[dict[str, Any]],
+    firewall_policy_payload: list[dict[str, Any]],
     port_forward_payload: list[dict[str, Any]],
     traffic_rule_payload: list[dict[str, Any]],
     traffic_route_payload: list[dict[str, Any]],
@@ -211,6 +212,9 @@ def fixture_request(
         mock_get_request(f"/api/s/{site_id}/stat/device", device_payload)
         mock_get_request(f"/api/s/{site_id}/rest/dpiapp", dpi_app_payload)
         mock_get_request(f"/api/s/{site_id}/rest/dpigroup", dpi_group_payload)
+        mock_get_request(
+            f"/v2/api/site/{site_id}/firewall-policies", firewall_policy_payload
+        )
         mock_get_request(f"/api/s/{site_id}/rest/portforward", port_forward_payload)
         mock_get_request(f"/api/s/{site_id}/stat/sysinfo", system_information_payload)
         mock_get_request(f"/api/s/{site_id}/rest/wlanconf", wlan_payload)
@@ -253,6 +257,12 @@ def fixture_dpi_group_data() -> list[dict[str, Any]]:
     return []
 
 
+@pytest.fixture(name="firewall_policy_payload")
+def firewall_policy_payload_data() -> list[dict[str, Any]]:
+    """Firewall policy data."""
+    return []
+
+
 @pytest.fixture(name="port_forward_payload")
 def fixture_port_forward_data() -> list[dict[str, Any]]:
     """Port forward data."""
diff --git a/tests/components/unifi/snapshots/test_button.ambr b/tests/components/unifi/snapshots/test_button.ambr
index 3729bd31cf0..369b0823063 100644
--- a/tests/components/unifi/snapshots/test_button.ambr
+++ b/tests/components/unifi/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/unifi/snapshots/test_device_tracker.ambr b/tests/components/unifi/snapshots/test_device_tracker.ambr
index 3debd512050..5d3407e4e8e 100644
--- a/tests/components/unifi/snapshots/test_device_tracker.ambr
+++ b/tests/components/unifi/snapshots/test_device_tracker.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -55,6 +56,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -104,6 +106,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/unifi/snapshots/test_diagnostics.ambr b/tests/components/unifi/snapshots/test_diagnostics.ambr
index 4ba90a00113..aa7337be0ba 100644
--- a/tests/components/unifi/snapshots/test_diagnostics.ambr
+++ b/tests/components/unifi/snapshots/test_diagnostics.ambr
@@ -42,6 +42,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': '1',
       'version': 1,
diff --git a/tests/components/unifi/snapshots/test_image.ambr b/tests/components/unifi/snapshots/test_image.ambr
index 32e1a5ff622..05cca2c305b 100644
--- a/tests/components/unifi/snapshots/test_image.ambr
+++ b/tests/components/unifi/snapshots/test_image.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/unifi/snapshots/test_sensor.ambr b/tests/components/unifi/snapshots/test_sensor.ambr
index e14658b2b96..4d109f630c5 100644
--- a/tests/components/unifi/snapshots/test_sensor.ambr
+++ b/tests/components/unifi/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -70,6 +71,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -131,6 +133,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -179,6 +182,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -228,6 +232,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -282,6 +287,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -336,6 +342,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -385,6 +392,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -435,6 +443,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -485,6 +494,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -549,6 +559,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -610,6 +621,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -659,6 +671,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -708,6 +721,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -759,6 +773,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -810,6 +825,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -861,6 +877,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -912,6 +929,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -963,6 +981,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1014,6 +1033,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1065,6 +1085,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1119,6 +1140,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1173,6 +1195,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1224,6 +1247,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1278,6 +1302,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1332,6 +1357,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1386,6 +1412,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1440,6 +1467,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1491,6 +1519,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1545,6 +1574,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1612,6 +1642,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1673,6 +1704,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1722,6 +1754,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1771,6 +1804,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1822,6 +1856,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1871,6 +1906,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1920,6 +1956,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1971,6 +2008,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2020,6 +2058,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/unifi/snapshots/test_switch.ambr b/tests/components/unifi/snapshots/test_switch.ambr
index 45e6188a3f4..c07a4799b5a 100644
--- a/tests/components/unifi/snapshots/test_switch.ambr
+++ b/tests/components/unifi/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -99,6 +101,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -146,6 +149,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -193,6 +197,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -240,6 +245,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -287,6 +293,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -334,6 +341,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -381,6 +389,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -428,6 +437,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -475,6 +485,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/unifi/snapshots/test_update.ambr b/tests/components/unifi/snapshots/test_update.ambr
index 405cb9d52a6..ef3803ac53d 100644
--- a/tests/components/unifi/snapshots/test_update.ambr
+++ b/tests/components/unifi/snapshots/test_update.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -65,6 +66,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -124,6 +126,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -183,6 +186,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/unifi/test_button.py b/tests/components/unifi/test_button.py
index 6a493e32b02..94343d12ba2 100644
--- a/tests/components/unifi/test_button.py
+++ b/tests/components/unifi/test_button.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryDisabler
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import (
     ConfigEntryFactoryType,
diff --git a/tests/components/unifi/test_device_tracker.py b/tests/components/unifi/test_device_tracker.py
index b37e4f47137..39b70344db7 100644
--- a/tests/components/unifi/test_device_tracker.py
+++ b/tests/components/unifi/test_device_tracker.py
@@ -26,7 +26,7 @@ from homeassistant.components.unifi.const import (
 from homeassistant.const import STATE_HOME, STATE_NOT_HOME, STATE_UNAVAILABLE, Platform
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers import entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import (
     ConfigEntryFactoryType,
diff --git a/tests/components/unifi/test_hub.py b/tests/components/unifi/test_hub.py
index af134c7449b..8b129d3d648 100644
--- a/tests/components/unifi/test_hub.py
+++ b/tests/components/unifi/test_hub.py
@@ -15,7 +15,7 @@ from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import ConfigEntryFactoryType, WebsocketStateManager
 
@@ -76,7 +76,7 @@ async def test_reset_fails(
         return_value=False,
     ):
         assert not await hass.config_entries.async_unload(config_entry_setup.entry_id)
-        assert config_entry_setup.state is ConfigEntryState.LOADED
+        assert config_entry_setup.state is ConfigEntryState.FAILED_UNLOAD
 
 
 @pytest.mark.usefixtures("mock_device_registry")
diff --git a/tests/components/unifi/test_sensor.py b/tests/components/unifi/test_sensor.py
index 5e47d263079..ee8b102edaa 100644
--- a/tests/components/unifi/test_sensor.py
+++ b/tests/components/unifi/test_sensor.py
@@ -37,7 +37,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryDisabler
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import (
     ConfigEntryFactoryType,
diff --git a/tests/components/unifi/test_switch.py b/tests/components/unifi/test_switch.py
index e4765d1181e..c8ee786895c 100644
--- a/tests/components/unifi/test_switch.py
+++ b/tests/components/unifi/test_switch.py
@@ -827,6 +827,45 @@ TRAFFIC_ROUTE = {
     ],
 }
 
+FIREWALL_POLICY = {
+    "_id": "678ceb9fe3849d293243405c",
+    "action": "ALLOW",
+    "connection_state_type": "ALL",
+    "connection_states": [],
+    "create_allow_respond": True,
+    "description": "",
+    "destination": {
+        "match_opposite_ports": False,
+        "matching_target": "ANY",
+        "port_matching_type": "ANY",
+        "zone_id": "678ccc26e3849d2932432e26",
+    },
+    "enabled": True,
+    "icmp_typename": "ANY",
+    "icmp_v6_typename": "ANY",
+    "index": 10000,
+    "ip_version": "BOTH",
+    "logging": False,
+    "match_ip_sec": False,
+    "match_opposite_protocol": False,
+    "name": "Allow internal to IoT",
+    "predefined": False,
+    "protocol": "all",
+    "schedule": {
+        "mode": "EVERY_DAY",
+        "repeat_on_days": [],
+        "time_all_day": False,
+        "time_range_end": "12:00",
+        "time_range_start": "09:00",
+    },
+    "source": {
+        "match_opposite_ports": False,
+        "matching_target": "ANY",
+        "port_matching_type": "ANY",
+        "zone_id": "678c63bc2d97692f08adcdfa",
+    },
+}
+
 
 @pytest.mark.parametrize(
     "config_entry_options", [{CONF_BLOCK_CLIENT: [BLOCKED["mac"]]}]
@@ -1226,6 +1265,62 @@ async def test_traffic_routes(
     assert aioclient_mock.mock_calls[call_count][2] == expected_enable_call
 
 
+@pytest.mark.parametrize(("firewall_policy_payload"), [([FIREWALL_POLICY])])
+async def test_firewall_policies(
+    hass: HomeAssistant,
+    aioclient_mock: AiohttpClientMocker,
+    config_entry_setup: MockConfigEntry,
+    firewall_policy_payload: list[dict[str, Any]],
+) -> None:
+    """Test control of UniFi firewall policies."""
+    assert len(hass.states.async_entity_ids(SWITCH_DOMAIN)) == 1
+
+    # Validate state object
+    assert (
+        hass.states.get("switch.unifi_network_allow_internal_to_iot").state == STATE_ON
+    )
+
+    firewall_policy = deepcopy(firewall_policy_payload[0])
+
+    # Disable firewall policy
+    aioclient_mock.put(
+        f"https://{config_entry_setup.data[CONF_HOST]}:1234"
+        f"/v2/api/site/{config_entry_setup.data[CONF_SITE_ID]}"
+        f"/firewall-policies/{firewall_policy['_id']}",
+    )
+
+    call_count = aioclient_mock.call_count
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        "turn_off",
+        {"entity_id": "switch.unifi_network_allow_internal_to_iot"},
+        blocking=True,
+    )
+    # Updating the value for firewall policies will make another call to retrieve the values
+    assert aioclient_mock.call_count == call_count + 2
+    expected_disable_call = deepcopy(firewall_policy)
+    expected_disable_call["enabled"] = False
+
+    assert aioclient_mock.mock_calls[call_count][2] == expected_disable_call
+
+    call_count = aioclient_mock.call_count
+
+    # Enable firewall policy
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        "turn_on",
+        {"entity_id": "switch.unifi_network_allow_internal_to_iot"},
+        blocking=True,
+    )
+
+    expected_enable_call = deepcopy(firewall_policy)
+    expected_enable_call["enabled"] = True
+
+    assert aioclient_mock.call_count == call_count + 2
+    assert aioclient_mock.mock_calls[call_count][2] == expected_enable_call
+
+
 @pytest.mark.parametrize(
     ("device_payload", "entity_id", "outlet_index", "expected_switches"),
     [
@@ -1677,6 +1772,7 @@ async def test_updating_unique_id(
 @pytest.mark.parametrize("dpi_group_payload", [DPI_GROUPS])
 @pytest.mark.parametrize("port_forward_payload", [[PORT_FORWARD_PLEX]])
 @pytest.mark.parametrize(("traffic_rule_payload"), [([TRAFFIC_RULE])])
+@pytest.mark.parametrize("firewall_policy_payload", [[FIREWALL_POLICY]])
 @pytest.mark.parametrize("wlan_payload", [[WLAN]])
 @pytest.mark.usefixtures("config_entry_setup")
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
@@ -1691,6 +1787,7 @@ async def test_hub_state_change(
         "switch.block_media_streaming",
         "switch.unifi_network_plex",
         "switch.unifi_network_test_traffic_rule",
+        "switch.unifi_network_allow_internal_to_iot",
         "switch.ssid_1",
     )
     for entity_id in entity_ids:
diff --git a/tests/components/unifiprotect/conftest.py b/tests/components/unifiprotect/conftest.py
index 352c33297ba..c49ade514bc 100644
--- a/tests/components/unifiprotect/conftest.py
+++ b/tests/components/unifiprotect/conftest.py
@@ -33,7 +33,7 @@ from uiprotect.websocket import WebsocketState
 
 from homeassistant.components.unifiprotect.const import DOMAIN
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import _patch_discovery
 from .utils import MockUFPFixture
diff --git a/tests/components/unifiprotect/test_camera.py b/tests/components/unifiprotect/test_camera.py
index 12b92beedd0..975e93edf09 100644
--- a/tests/components/unifiprotect/test_camera.py
+++ b/tests/components/unifiprotect/test_camera.py
@@ -174,7 +174,7 @@ def validate_common_camera_state(
     entity_id: str,
     features: int = CameraEntityFeature.STREAM,
 ):
-    """Validate state that is common to all camera entity, regradless of type."""
+    """Validate state that is common to all camera entity, regardless of type."""
     entity_state = hass.states.get(entity_id)
     assert entity_state
     assert entity_state.attributes[ATTR_ATTRIBUTION] == DEFAULT_ATTRIBUTION
diff --git a/tests/components/unifiprotect/utils.py b/tests/components/unifiprotect/utils.py
index 5a1ffa8258e..7dd0362f17c 100644
--- a/tests/components/unifiprotect/utils.py
+++ b/tests/components/unifiprotect/utils.py
@@ -26,7 +26,7 @@ from homeassistant.core import HomeAssistant, split_entity_id
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/universal/test_media_player.py b/tests/components/universal/test_media_player.py
index 5be9cb3fe02..351e11db512 100644
--- a/tests/components/universal/test_media_player.py
+++ b/tests/components/universal/test_media_player.py
@@ -13,7 +13,7 @@ from homeassistant.components.media_player import (
     MediaClass,
     MediaPlayerEntityFeature,
 )
-import homeassistant.components.universal.media_player as universal
+from homeassistant.components.universal import media_player as universal
 from homeassistant.const import (
     SERVICE_RELOAD,
     STATE_OFF,
diff --git a/tests/components/upb/test_config_flow.py b/tests/components/upb/test_config_flow.py
index 59a4e97d22b..3909c7e5dc4 100644
--- a/tests/components/upb/test_config_flow.py
+++ b/tests/components/upb/test_config_flow.py
@@ -13,15 +13,20 @@ from homeassistant.data_entry_flow import FlowResultType
 def mocked_upb(sync_complete=True, config_ok=True):
     """Mock UPB lib."""
 
-    def _upb_lib_connect(callback):
+    def _add_handler(_, callback):
         callback()
 
+    def _dummy_add_handler(_, _callback):
+        pass
+
     upb_mock = AsyncMock()
     type(upb_mock).network_id = PropertyMock(return_value="42")
     type(upb_mock).config_ok = PropertyMock(return_value=config_ok)
     type(upb_mock).disconnect = MagicMock()
-    if sync_complete:
-        upb_mock.async_connect.side_effect = _upb_lib_connect
+    type(upb_mock).add_handler = MagicMock()
+    upb_mock.add_handler.side_effect = (
+        _add_handler if sync_complete else _dummy_add_handler
+    )
     return patch(
         "homeassistant.components.upb.config_flow.upb_lib.UpbPim", return_value=upb_mock
     )
diff --git a/tests/components/update/test_device_trigger.py b/tests/components/update/test_device_trigger.py
index 202b3d32509..55138430ca0 100644
--- a/tests/components/update/test_device_trigger.py
+++ b/tests/components/update/test_device_trigger.py
@@ -12,7 +12,7 @@ from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON, EntityCatego
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import MockUpdateEntity
 
diff --git a/tests/components/update/test_init.py b/tests/components/update/test_init.py
index d4916de8039..f3eb3f9344c 100644
--- a/tests/components/update/test_init.py
+++ b/tests/components/update/test_init.py
@@ -43,7 +43,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, State, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.setup import async_setup_component
 
@@ -857,7 +857,7 @@ async def test_name(hass: HomeAssistant) -> None:
     async def async_setup_entry_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test update platform via config entry."""
         async_add_entities([entity1, entity2, entity3, entity4])
diff --git a/tests/components/upnp/test_binary_sensor.py b/tests/components/upnp/test_binary_sensor.py
index 087cd9e9fb4..d9b5b442b00 100644
--- a/tests/components/upnp/test_binary_sensor.py
+++ b/tests/components/upnp/test_binary_sensor.py
@@ -6,7 +6,7 @@ from async_upnp_client.profiles.igd import IgdDevice, IgdState
 
 from homeassistant.components.upnp.const import DEFAULT_SCAN_INTERVAL
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/upnp/test_sensor.py b/tests/components/upnp/test_sensor.py
index e9d8a9cce8f..e7461c91da4 100644
--- a/tests/components/upnp/test_sensor.py
+++ b/tests/components/upnp/test_sensor.py
@@ -7,7 +7,7 @@ import pytest
 
 from homeassistant.components.upnp.const import DEFAULT_SCAN_INTERVAL
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/uptime/snapshots/test_config_flow.ambr b/tests/components/uptime/snapshots/test_config_flow.ambr
index 38312667375..93b1da60998 100644
--- a/tests/components/uptime/snapshots/test_config_flow.ambr
+++ b/tests/components/uptime/snapshots/test_config_flow.ambr
@@ -27,10 +27,14 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Uptime',
       'unique_id': None,
       'version': 1,
     }),
+    'subentries': tuple(
+    ),
     'title': 'Uptime',
     'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
     'version': 1,
diff --git a/tests/components/uptime/snapshots/test_sensor.ambr b/tests/components/uptime/snapshots/test_sensor.ambr
index 561e4b83320..d6d896dbcec 100644
--- a/tests/components/uptime/snapshots/test_sensor.ambr
+++ b/tests/components/uptime/snapshots/test_sensor.ambr
@@ -20,6 +20,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -49,6 +50,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/usb/test_init.py b/tests/components/usb/test_init.py
index 8f8ed672374..9730dba53d7 100644
--- a/tests/components/usb/test_init.py
+++ b/tests/components/usb/test_init.py
@@ -7,6 +7,7 @@ import os
 from typing import Any
 from unittest.mock import MagicMock, Mock, call, patch, sentinel
 
+from aiousbwatcher import InotifyNotAvailableError
 import pytest
 
 from homeassistant.components import usb
@@ -15,58 +16,29 @@ from homeassistant.const import EVENT_HOMEASSISTANT_STARTED, EVENT_HOMEASSISTANT
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.service_info.usb import UsbServiceInfo
 from homeassistant.setup import async_setup_component
+from homeassistant.util import dt as dt_util
 
 from . import conbee_device, slae_sh_device
 
-from tests.common import import_and_test_deprecated_constant
+from tests.common import async_fire_time_changed, import_and_test_deprecated_constant
 from tests.typing import WebSocketGenerator
 
 
-@pytest.fixture(name="operating_system")
-def mock_operating_system():
-    """Mock running Home Assistant Operating system."""
+@pytest.fixture(name="aiousbwatcher_no_inotify")
+def aiousbwatcher_no_inotify():
+    """Patch AIOUSBWatcher to not use inotify."""
     with patch(
-        "homeassistant.components.usb.system_info.async_get_system_info",
-        return_value={
-            "hassio": True,
-            "docker": True,
-        },
+        "homeassistant.components.usb.AIOUSBWatcher.async_start",
+        side_effect=InotifyNotAvailableError,
     ):
         yield
 
 
-@pytest.fixture(name="docker")
-def mock_docker():
-    """Mock running Home Assistant in docker container."""
-    with patch(
-        "homeassistant.components.usb.system_info.async_get_system_info",
-        return_value={
-            "hassio": False,
-            "docker": True,
-        },
-    ):
-        yield
-
-
-@pytest.fixture(name="venv")
-def mock_venv():
-    """Mock running Home Assistant in a venv container."""
-    with patch(
-        "homeassistant.components.usb.system_info.async_get_system_info",
-        return_value={
-            "hassio": False,
-            "docker": False,
-            "virtualenv": True,
-        },
-    ):
-        yield
-
-
-async def test_observer_discovery(
-    hass: HomeAssistant, hass_ws_client: WebSocketGenerator, venv
+async def test_aiousbwatcher_discovery(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
-    """Test that observer can discover a device without raising an exception."""
-    new_usb = [{"domain": "test1", "vid": "3039"}]
+    """Test that aiousbwatcher can discover a device without raising an exception."""
+    new_usb = [{"domain": "test1", "vid": "3039"}, {"domain": "test2", "vid": "0FA0"}]
 
     mock_comports = [
         MagicMock(
@@ -78,26 +50,23 @@ async def test_observer_discovery(
             description=slae_sh_device.description,
         )
     ]
-    mock_observer = None
 
-    async def _mock_monitor_observer_callback(callback):
-        await hass.async_add_executor_job(
-            callback, MagicMock(action="add", device_path="/dev/new")
-        )
+    aiousbwatcher_callback = None
 
-    def _create_mock_monitor_observer(monitor, callback, name):
-        nonlocal mock_observer
-        hass.create_task(_mock_monitor_observer_callback(callback))
-        mock_observer = MagicMock()
-        return mock_observer
+    def async_register_callback(callback):
+        nonlocal aiousbwatcher_callback
+        aiousbwatcher_callback = callback
+
+    MockAIOUSBWatcher = MagicMock()
+    MockAIOUSBWatcher.async_register_callback = async_register_callback
 
     with (
         patch("sys.platform", "linux"),
-        patch("pyudev.Context"),
-        patch("pyudev.MonitorObserver", new=_create_mock_monitor_observer),
-        patch("pyudev.Monitor.filter_by"),
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
         patch("homeassistant.components.usb.comports", return_value=mock_comports),
+        patch(
+            "homeassistant.components.usb.AIOUSBWatcher", return_value=MockAIOUSBWatcher
+        ),
         patch.object(hass.config_entries.flow, "async_init") as mock_config_flow,
     ):
         assert await async_setup_component(hass, "usb", {"usb": {}})
@@ -105,18 +74,42 @@ async def test_observer_discovery(
         hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
         await hass.async_block_till_done()
 
-    assert len(mock_config_flow.mock_calls) == 1
-    assert mock_config_flow.mock_calls[0][1][0] == "test1"
+        assert aiousbwatcher_callback is not None
 
-    hass.bus.async_fire(EVENT_HOMEASSISTANT_STOP)
-    await hass.async_block_till_done()
+        assert len(mock_config_flow.mock_calls) == 1
+        assert mock_config_flow.mock_calls[0][1][0] == "test1"
+        await hass.async_block_till_done()
+        assert len(mock_config_flow.mock_calls) == 1
 
-    # pylint:disable-next=unnecessary-dunder-call
-    assert mock_observer.mock_calls == [call.start(), call.__bool__(), call.stop()]
+        mock_comports.append(
+            MagicMock(
+                device=slae_sh_device.device,
+                vid=4000,
+                pid=4000,
+                serial_number=slae_sh_device.serial_number,
+                manufacturer=slae_sh_device.manufacturer,
+                description=slae_sh_device.description,
+            )
+        )
+
+        aiousbwatcher_callback()
+        await hass.async_block_till_done()
+
+        async_fire_time_changed(
+            hass, dt_util.utcnow() + timedelta(seconds=usb.ADD_REMOVE_SCAN_COOLDOWN)
+        )
+        await hass.async_block_till_done(wait_background_tasks=True)
+
+        assert len(mock_config_flow.mock_calls) == 2
+        assert mock_config_flow.mock_calls[1][1][0] == "test2"
+
+        hass.bus.async_fire(EVENT_HOMEASSISTANT_STOP)
+        await hass.async_block_till_done()
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 async def test_polling_discovery(
-    hass: HomeAssistant, hass_ws_client: WebSocketGenerator, venv
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
     """Test that polling can discover a device without raising an exception."""
     new_usb = [{"domain": "test1", "vid": "3039"}]
@@ -143,10 +136,6 @@ async def test_polling_discovery(
 
     with (
         patch("sys.platform", "linux"),
-        patch(
-            "homeassistant.components.usb.USBDiscovery._get_monitor_observer",
-            return_value=None,
-        ),
         patch(
             "homeassistant.components.usb.POLLING_MONITOR_SCAN_PERIOD",
             timedelta(seconds=0.01),
@@ -174,19 +163,9 @@ async def test_polling_discovery(
     await hass.async_block_till_done()
 
 
-async def test_removal_by_observer_before_started(
-    hass: HomeAssistant, operating_system
-) -> None:
-    """Test a device is removed by the observer before started."""
-
-    async def _mock_monitor_observer_callback(callback):
-        await hass.async_add_executor_job(
-            callback, MagicMock(action="remove", device_path="/dev/new")
-        )
-
-    def _create_mock_monitor_observer(monitor, callback, name):
-        hass.async_create_task(_mock_monitor_observer_callback(callback))
-
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
+async def test_removal_by_aiousbwatcher_before_started(hass: HomeAssistant) -> None:
+    """Test a device is removed by the aiousbwatcher before started."""
     new_usb = [{"domain": "test1", "vid": "3039", "pid": "3039"}]
 
     mock_comports = [
@@ -203,7 +182,6 @@ async def test_removal_by_observer_before_started(
     with (
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
         patch("homeassistant.components.usb.comports", return_value=mock_comports),
-        patch("pyudev.MonitorObserver", new=_create_mock_monitor_observer),
         patch.object(hass.config_entries.flow, "async_init") as mock_config_flow,
     ):
         assert await async_setup_component(hass, "usb", {"usb": {}})
@@ -219,6 +197,7 @@ async def test_removal_by_observer_before_started(
     await hass.async_block_till_done()
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 async def test_discovered_by_websocket_scan(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -237,7 +216,6 @@ async def test_discovered_by_websocket_scan(
     ]
 
     with (
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
         patch("homeassistant.components.usb.comports", return_value=mock_comports),
         patch.object(hass.config_entries.flow, "async_init") as mock_config_flow,
@@ -256,6 +234,7 @@ async def test_discovered_by_websocket_scan(
     assert mock_config_flow.mock_calls[0][1][0] == "test1"
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 async def test_discovered_by_websocket_scan_limited_by_description_matcher(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -276,7 +255,6 @@ async def test_discovered_by_websocket_scan_limited_by_description_matcher(
     ]
 
     with (
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
         patch("homeassistant.components.usb.comports", return_value=mock_comports),
         patch.object(hass.config_entries.flow, "async_init") as mock_config_flow,
@@ -295,6 +273,7 @@ async def test_discovered_by_websocket_scan_limited_by_description_matcher(
     assert mock_config_flow.mock_calls[0][1][0] == "test1"
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 async def test_most_targeted_matcher_wins(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -316,7 +295,6 @@ async def test_most_targeted_matcher_wins(
     ]
 
     with (
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
         patch("homeassistant.components.usb.comports", return_value=mock_comports),
         patch.object(hass.config_entries.flow, "async_init") as mock_config_flow,
@@ -335,6 +313,7 @@ async def test_most_targeted_matcher_wins(
     assert mock_config_flow.mock_calls[0][1][0] == "more"
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 async def test_discovered_by_websocket_scan_rejected_by_description_matcher(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -355,7 +334,6 @@ async def test_discovered_by_websocket_scan_rejected_by_description_matcher(
     ]
 
     with (
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
         patch("homeassistant.components.usb.comports", return_value=mock_comports),
         patch.object(hass.config_entries.flow, "async_init") as mock_config_flow,
@@ -373,6 +351,7 @@ async def test_discovered_by_websocket_scan_rejected_by_description_matcher(
     assert len(mock_config_flow.mock_calls) == 0
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 async def test_discovered_by_websocket_scan_limited_by_serial_number_matcher(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -398,7 +377,6 @@ async def test_discovered_by_websocket_scan_limited_by_serial_number_matcher(
     ]
 
     with (
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
         patch("homeassistant.components.usb.comports", return_value=mock_comports),
         patch.object(hass.config_entries.flow, "async_init") as mock_config_flow,
@@ -417,6 +395,7 @@ async def test_discovered_by_websocket_scan_limited_by_serial_number_matcher(
     assert mock_config_flow.mock_calls[0][1][0] == "test1"
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 async def test_discovered_by_websocket_scan_rejected_by_serial_number_matcher(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -437,7 +416,6 @@ async def test_discovered_by_websocket_scan_rejected_by_serial_number_matcher(
     ]
 
     with (
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
         patch("homeassistant.components.usb.comports", return_value=mock_comports),
         patch.object(hass.config_entries.flow, "async_init") as mock_config_flow,
@@ -455,6 +433,7 @@ async def test_discovered_by_websocket_scan_rejected_by_serial_number_matcher(
     assert len(mock_config_flow.mock_calls) == 0
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 async def test_discovered_by_websocket_scan_limited_by_manufacturer_matcher(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -480,7 +459,6 @@ async def test_discovered_by_websocket_scan_limited_by_manufacturer_matcher(
     ]
 
     with (
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
         patch("homeassistant.components.usb.comports", return_value=mock_comports),
         patch.object(hass.config_entries.flow, "async_init") as mock_config_flow,
@@ -499,6 +477,7 @@ async def test_discovered_by_websocket_scan_limited_by_manufacturer_matcher(
     assert mock_config_flow.mock_calls[0][1][0] == "test1"
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 async def test_discovered_by_websocket_scan_rejected_by_manufacturer_matcher(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -524,7 +503,6 @@ async def test_discovered_by_websocket_scan_rejected_by_manufacturer_matcher(
     ]
 
     with (
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
         patch("homeassistant.components.usb.comports", return_value=mock_comports),
         patch.object(hass.config_entries.flow, "async_init") as mock_config_flow,
@@ -542,6 +520,7 @@ async def test_discovered_by_websocket_scan_rejected_by_manufacturer_matcher(
     assert len(mock_config_flow.mock_calls) == 0
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 async def test_discovered_by_websocket_rejected_with_empty_serial_number_only(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -562,7 +541,6 @@ async def test_discovered_by_websocket_rejected_with_empty_serial_number_only(
     ]
 
     with (
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
         patch("homeassistant.components.usb.comports", return_value=mock_comports),
         patch.object(hass.config_entries.flow, "async_init") as mock_config_flow,
@@ -580,6 +558,7 @@ async def test_discovered_by_websocket_rejected_with_empty_serial_number_only(
     assert len(mock_config_flow.mock_calls) == 0
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 async def test_discovered_by_websocket_scan_match_vid_only(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -598,7 +577,6 @@ async def test_discovered_by_websocket_scan_match_vid_only(
     ]
 
     with (
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
         patch("homeassistant.components.usb.comports", return_value=mock_comports),
         patch.object(hass.config_entries.flow, "async_init") as mock_config_flow,
@@ -617,6 +595,7 @@ async def test_discovered_by_websocket_scan_match_vid_only(
     assert mock_config_flow.mock_calls[0][1][0] == "test1"
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 async def test_discovered_by_websocket_scan_match_vid_wrong_pid(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -635,7 +614,6 @@ async def test_discovered_by_websocket_scan_match_vid_wrong_pid(
     ]
 
     with (
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
         patch("homeassistant.components.usb.comports", return_value=mock_comports),
         patch.object(hass.config_entries.flow, "async_init") as mock_config_flow,
@@ -653,6 +631,7 @@ async def test_discovered_by_websocket_scan_match_vid_wrong_pid(
     assert len(mock_config_flow.mock_calls) == 0
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 async def test_discovered_by_websocket_no_vid_pid(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -671,7 +650,6 @@ async def test_discovered_by_websocket_no_vid_pid(
     ]
 
     with (
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
         patch("homeassistant.components.usb.comports", return_value=mock_comports),
         patch.object(hass.config_entries.flow, "async_init") as mock_config_flow,
@@ -689,9 +667,9 @@ async def test_discovered_by_websocket_no_vid_pid(
     assert len(mock_config_flow.mock_calls) == 0
 
 
-@pytest.mark.parametrize("exception_type", [ImportError, OSError])
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 async def test_non_matching_discovered_by_scanner_after_started(
-    hass: HomeAssistant, exception_type, hass_ws_client: WebSocketGenerator
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
     """Test a websocket scan that does not match."""
     new_usb = [{"domain": "test1", "vid": "4444", "pid": "4444"}]
@@ -708,7 +686,6 @@ async def test_non_matching_discovered_by_scanner_after_started(
     ]
 
     with (
-        patch("pyudev.Context", side_effect=exception_type),
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
         patch("homeassistant.components.usb.comports", return_value=mock_comports),
         patch.object(hass.config_entries.flow, "async_init") as mock_config_flow,
@@ -726,10 +703,10 @@ async def test_non_matching_discovered_by_scanner_after_started(
     assert len(mock_config_flow.mock_calls) == 0
 
 
-async def test_observer_on_wsl_fallback_without_throwing_exception(
-    hass: HomeAssistant, hass_ws_client: WebSocketGenerator, venv
+async def test_aiousbwatcher_on_wsl_fallback_without_throwing_exception(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
-    """Test that observer on WSL failure results in fallback to scanning without raising an exception."""
+    """Test that aiousbwatcher on WSL failure results in fallback to scanning without raising an exception."""
     new_usb = [{"domain": "test1", "vid": "3039"}]
 
     mock_comports = [
@@ -744,8 +721,6 @@ async def test_observer_on_wsl_fallback_without_throwing_exception(
     ]
 
     with (
-        patch("pyudev.Context"),
-        patch("pyudev.Monitor.filter_by", side_effect=ValueError),
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
         patch("homeassistant.components.usb.comports", return_value=mock_comports),
         patch.object(hass.config_entries.flow, "async_init") as mock_config_flow,
@@ -764,20 +739,8 @@ async def test_observer_on_wsl_fallback_without_throwing_exception(
     assert mock_config_flow.mock_calls[0][1][0] == "test1"
 
 
-async def test_not_discovered_by_observer_before_started_on_docker(
-    hass: HomeAssistant, docker
-) -> None:
-    """Test a device is not discovered since observer is not running on bare docker."""
-
-    async def _mock_monitor_observer_callback(callback):
-        await hass.async_add_executor_job(
-            callback, MagicMock(action="add", device_path="/dev/new")
-        )
-
-    def _create_mock_monitor_observer(monitor, callback, name):
-        hass.async_create_task(_mock_monitor_observer_callback(callback))
-        return MagicMock()
-
+async def test_discovered_by_aiousbwatcher_before_started(hass: HomeAssistant) -> None:
+    """Test a device is discovered since aiousbwatcher is now running."""
     new_usb = [{"domain": "test1", "vid": "3039", "pid": "3039"}]
 
     mock_comports = [
@@ -790,23 +753,45 @@ async def test_not_discovered_by_observer_before_started_on_docker(
             description=slae_sh_device.description,
         )
     ]
+    initial_mock_comports = []
+    aiousbwatcher_callback = None
+
+    def async_register_callback(callback):
+        nonlocal aiousbwatcher_callback
+        aiousbwatcher_callback = callback
+
+    MockAIOUSBWatcher = MagicMock()
+    MockAIOUSBWatcher.async_register_callback = async_register_callback
 
     with (
+        patch("sys.platform", "linux"),
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
-        patch("homeassistant.components.usb.comports", return_value=mock_comports),
-        patch("pyudev.MonitorObserver", new=_create_mock_monitor_observer),
+        patch(
+            "homeassistant.components.usb.comports", return_value=initial_mock_comports
+        ),
+        patch(
+            "homeassistant.components.usb.AIOUSBWatcher", return_value=MockAIOUSBWatcher
+        ),
+        patch.object(hass.config_entries.flow, "async_init") as mock_config_flow,
     ):
         assert await async_setup_component(hass, "usb", {"usb": {}})
         await hass.async_block_till_done()
 
-    with (
-        patch("homeassistant.components.usb.comports", return_value=[]),
-        patch.object(hass.config_entries.flow, "async_init") as mock_config_flow,
-    ):
         hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
         await hass.async_block_till_done()
 
-    assert len(mock_config_flow.mock_calls) == 0
+        assert len(mock_config_flow.mock_calls) == 0
+
+        initial_mock_comports.extend(mock_comports)
+        aiousbwatcher_callback()
+        await hass.async_block_till_done()
+
+        async_fire_time_changed(
+            hass, dt_util.utcnow() + timedelta(seconds=usb.ADD_REMOVE_SCAN_COOLDOWN)
+        )
+        await hass.async_block_till_done(wait_background_tasks=True)
+
+        assert len(mock_config_flow.mock_calls) == 1
 
 
 def test_get_serial_by_id_no_dir() -> None:
@@ -889,6 +874,7 @@ def test_human_readable_device_name() -> None:
     assert "8A2A" in name
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 async def test_async_is_plugged_in(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -912,7 +898,6 @@ async def test_async_is_plugged_in(
     }
 
     with (
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
         patch("homeassistant.components.usb.comports", return_value=[]),
         patch.object(hass.config_entries.flow, "async_init"),
@@ -935,6 +920,7 @@ async def test_async_is_plugged_in(
         assert usb.async_is_plugged_in(hass, matcher)
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 @pytest.mark.parametrize(
     "matcher",
     [
@@ -953,7 +939,6 @@ async def test_async_is_plugged_in_case_enforcement(
     new_usb = [{"domain": "test1", "vid": "ABCD"}]
 
     with (
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
         patch("homeassistant.components.usb.comports", return_value=[]),
         patch.object(hass.config_entries.flow, "async_init"),
@@ -967,6 +952,7 @@ async def test_async_is_plugged_in_case_enforcement(
             usb.async_is_plugged_in(hass, matcher)
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 async def test_web_socket_triggers_discovery_request_callbacks(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -974,7 +960,6 @@ async def test_web_socket_triggers_discovery_request_callbacks(
     mock_callback = Mock()
 
     with (
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.async_get_usb", return_value=[]),
         patch("homeassistant.components.usb.comports", return_value=[]),
         patch.object(hass.config_entries.flow, "async_init"),
@@ -1002,6 +987,7 @@ async def test_web_socket_triggers_discovery_request_callbacks(
         assert len(mock_callback.mock_calls) == 1
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 async def test_initial_scan_callback(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -1010,7 +996,6 @@ async def test_initial_scan_callback(
     mock_callback_2 = Mock()
 
     with (
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.async_get_usb", return_value=[]),
         patch("homeassistant.components.usb.comports", return_value=[]),
         patch.object(hass.config_entries.flow, "async_init"),
@@ -1038,6 +1023,7 @@ async def test_initial_scan_callback(
         cancel_2()
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 async def test_cancel_initial_scan_callback(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -1045,7 +1031,6 @@ async def test_cancel_initial_scan_callback(
     mock_callback = Mock()
 
     with (
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.async_get_usb", return_value=[]),
         patch("homeassistant.components.usb.comports", return_value=[]),
         patch.object(hass.config_entries.flow, "async_init"),
@@ -1064,6 +1049,7 @@ async def test_cancel_initial_scan_callback(
         assert len(mock_callback.mock_calls) == 0
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 async def test_resolve_serial_by_id(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -1082,7 +1068,6 @@ async def test_resolve_serial_by_id(
     ]
 
     with (
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
         patch("homeassistant.components.usb.comports", return_value=mock_comports),
         patch(
@@ -1106,6 +1091,7 @@ async def test_resolve_serial_by_id(
     assert mock_config_flow.mock_calls[0][2]["data"].device == "/dev/serial/by-id/bla"
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 @pytest.mark.parametrize(
     "ports",
     [
@@ -1190,7 +1176,6 @@ async def test_cp2102n_ordering_on_macos(
 
     with (
         patch("sys.platform", "darwin"),
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.async_get_usb", return_value=new_usb),
         patch("homeassistant.components.usb.comports", return_value=ports),
         patch.object(hass.config_entries.flow, "async_init") as mock_config_flow,
@@ -1239,6 +1224,7 @@ def test_deprecated_constants(
     )
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 @patch("homeassistant.components.usb.REQUEST_SCAN_COOLDOWN", 0)
 async def test_register_port_event_callback(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
@@ -1273,7 +1259,6 @@ async def test_register_port_event_callback(
 
     # Start off with no ports
     with (
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.comports", return_value=[]),
     ):
         assert await async_setup_component(hass, "usb", {"usb": {}})
@@ -1335,6 +1320,7 @@ async def test_register_port_event_callback(
     assert mock_callback2.mock_calls == []
 
 
+@pytest.mark.usefixtures("aiousbwatcher_no_inotify")
 @patch("homeassistant.components.usb.REQUEST_SCAN_COOLDOWN", 0)
 async def test_register_port_event_callback_failure(
     hass: HomeAssistant,
@@ -1371,7 +1357,6 @@ async def test_register_port_event_callback_failure(
 
     # Start off with no ports
     with (
-        patch("pyudev.Context", side_effect=ImportError),
         patch("homeassistant.components.usb.comports", return_value=[]),
     ):
         assert await async_setup_component(hass, "usb", {"usb": {}})
diff --git a/tests/components/usgs_earthquakes_feed/test_geo_location.py b/tests/components/usgs_earthquakes_feed/test_geo_location.py
index 40d19422ced..e412d53a0d0 100644
--- a/tests/components/usgs_earthquakes_feed/test_geo_location.py
+++ b/tests/components/usgs_earthquakes_feed/test_geo_location.py
@@ -35,7 +35,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import assert_setup_component, async_fire_time_changed
 
diff --git a/tests/components/utility_meter/snapshots/test_diagnostics.ambr b/tests/components/utility_meter/snapshots/test_diagnostics.ambr
index 6cdf121d7e3..ef235bba99d 100644
--- a/tests/components/utility_meter/snapshots/test_diagnostics.ambr
+++ b/tests/components/utility_meter/snapshots/test_diagnostics.ambr
@@ -25,6 +25,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Energy Bill',
       'unique_id': None,
       'version': 2,
diff --git a/tests/components/utility_meter/test_init.py b/tests/components/utility_meter/test_init.py
index cd549c77913..eba7cf913db 100644
--- a/tests/components/utility_meter/test_init.py
+++ b/tests/components/utility_meter/test_init.py
@@ -12,9 +12,11 @@ from homeassistant.components.select import (
     DOMAIN as SELECT_DOMAIN,
     SERVICE_SELECT_OPTION,
 )
+from homeassistant.components.utility_meter import (
+    select as um_select,
+    sensor as um_sensor,
+)
 from homeassistant.components.utility_meter.const import DOMAIN, SERVICE_RESET
-import homeassistant.components.utility_meter.select as um_select
-import homeassistant.components.utility_meter.sensor as um_sensor
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_UNIT_OF_MEASUREMENT,
@@ -26,7 +28,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, mock_restore_cache
 
diff --git a/tests/components/utility_meter/test_sensor.py b/tests/components/utility_meter/test_sensor.py
index 348afac57f7..c671969c5ac 100644
--- a/tests/components/utility_meter/test_sensor.py
+++ b/tests/components/utility_meter/test_sensor.py
@@ -44,7 +44,7 @@ from homeassistant.const import (
 from homeassistant.core import CoreState, HomeAssistant, State
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/v2c/snapshots/test_diagnostics.ambr b/tests/components/v2c/snapshots/test_diagnostics.ambr
index 96567b80c54..780a00acd64 100644
--- a/tests/components/v2c/snapshots/test_diagnostics.ambr
+++ b/tests/components/v2c/snapshots/test_diagnostics.ambr
@@ -16,6 +16,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': '**REDACTED**',
       'unique_id': 'ABC123',
       'version': 1,
diff --git a/tests/components/v2c/snapshots/test_sensor.ambr b/tests/components/v2c/snapshots/test_sensor.ambr
index 7b9ae4a9ff3..46054b21324 100644
--- a/tests/components/v2c/snapshots/test_sensor.ambr
+++ b/tests/components/v2c/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -110,6 +112,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -161,6 +164,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -212,6 +216,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -263,6 +268,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -312,6 +318,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -396,6 +403,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -482,6 +490,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -533,6 +542,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -580,6 +590,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/vacuum/conftest.py b/tests/components/vacuum/conftest.py
index 6e6639431d0..2c700daece0 100644
--- a/tests/components/vacuum/conftest.py
+++ b/tests/components/vacuum/conftest.py
@@ -9,7 +9,7 @@ from homeassistant.components.vacuum import DOMAIN as VACUUM_DOMAIN, VacuumEntit
 from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er, frame
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import MockVacuum
 
@@ -87,7 +87,7 @@ async def setup_vacuum_platform_test_entity(
     async def async_setup_entry_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test vacuum platform via config entry."""
         async_add_entities([entity])
diff --git a/tests/components/vacuum/test_device_trigger.py b/tests/components/vacuum/test_device_trigger.py
index 3a0cbafb4a1..381cc1caa47 100644
--- a/tests/components/vacuum/test_device_trigger.py
+++ b/tests/components/vacuum/test_device_trigger.py
@@ -13,7 +13,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/vacuum/test_init.py b/tests/components/vacuum/test_init.py
index 8ae054b5646..967b9672805 100644
--- a/tests/components/vacuum/test_init.py
+++ b/tests/components/vacuum/test_init.py
@@ -5,7 +5,6 @@ from __future__ import annotations
 from enum import Enum
 from types import ModuleType
 from typing import Any
-from unittest.mock import patch
 
 import pytest
 
@@ -25,7 +24,6 @@ from homeassistant.components.vacuum import (
     VacuumEntityFeature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import frame
 
 from . import MockVacuum, help_async_setup_entry_init, help_async_unload_entry
 from .common import async_start
@@ -326,7 +324,6 @@ async def test_vacuum_not_log_deprecated_state_warning(
 
 
 @pytest.mark.usefixtures("mock_as_custom_component")
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
 async def test_vacuum_log_deprecated_state_warning_using_state_prop(
     hass: HomeAssistant,
     config_flow_fixture: None,
@@ -356,6 +353,7 @@ async def test_vacuum_log_deprecated_state_warning_using_state_prop(
             async_setup_entry=help_async_setup_entry_init,
             async_unload_entry=help_async_unload_entry,
         ),
+        built_in=False,
     )
     setup_test_component_platform(hass, VACUUM_DOMAIN, [entity], from_config_entry=True)
     assert await hass.config_entries.async_setup(config_entry.entry_id)
@@ -370,7 +368,6 @@ async def test_vacuum_log_deprecated_state_warning_using_state_prop(
 
 
 @pytest.mark.usefixtures("mock_as_custom_component")
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
 async def test_vacuum_log_deprecated_state_warning_using_attr_state_attr(
     hass: HomeAssistant,
     config_flow_fixture: None,
@@ -399,6 +396,7 @@ async def test_vacuum_log_deprecated_state_warning_using_attr_state_attr(
             async_setup_entry=help_async_setup_entry_init,
             async_unload_entry=help_async_unload_entry,
         ),
+        built_in=False,
     )
     setup_test_component_platform(hass, VACUUM_DOMAIN, [entity], from_config_entry=True)
     assert await hass.config_entries.async_setup(config_entry.entry_id)
@@ -427,8 +425,7 @@ async def test_vacuum_log_deprecated_state_warning_using_attr_state_attr(
 
 
 @pytest.mark.usefixtures("mock_as_custom_component")
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
-async def test_alarm_control_panel_deprecated_state_does_not_break_state(
+async def test_vacuum_deprecated_state_does_not_break_state(
     hass: HomeAssistant,
     config_flow_fixture: None,
     caplog: pytest.LogCaptureFixture,
@@ -463,6 +460,7 @@ async def test_alarm_control_panel_deprecated_state_does_not_break_state(
             async_setup_entry=help_async_setup_entry_init,
             async_unload_entry=help_async_unload_entry,
         ),
+        built_in=False,
     )
     setup_test_component_platform(hass, VACUUM_DOMAIN, [entity], from_config_entry=True)
     assert await hass.config_entries.async_setup(config_entry.entry_id)
diff --git a/tests/components/valve/test_init.py b/tests/components/valve/test_init.py
index d8eb38a3b9b..a26f88f6982 100644
--- a/tests/components/valve/test_init.py
+++ b/tests/components/valve/test_init.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from tests.common import (
     MockConfigEntry,
@@ -174,7 +174,7 @@ def mock_config_entry(hass: HomeAssistant) -> tuple[MockConfigEntry, list[ValveE
     async def async_setup_entry_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test platform via config entry."""
         async_add_entities(entities)
diff --git a/tests/components/velbus/snapshots/test_binary_sensor.ambr b/tests/components/velbus/snapshots/test_binary_sensor.ambr
index 58630b9f6c9..70db53257a1 100644
--- a/tests/components/velbus/snapshots/test_binary_sensor.ambr
+++ b/tests/components/velbus/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/velbus/snapshots/test_button.ambr b/tests/components/velbus/snapshots/test_button.ambr
index 952af21b43c..856ebdb1e21 100644
--- a/tests/components/velbus/snapshots/test_button.ambr
+++ b/tests/components/velbus/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/velbus/snapshots/test_climate.ambr b/tests/components/velbus/snapshots/test_climate.ambr
index b1933e51868..1d1f49d14d9 100644
--- a/tests/components/velbus/snapshots/test_climate.ambr
+++ b/tests/components/velbus/snapshots/test_climate.ambr
@@ -19,6 +19,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/velbus/snapshots/test_cover.ambr b/tests/components/velbus/snapshots/test_cover.ambr
index a9cbd4aae73..0be18034bc0 100644
--- a/tests/components/velbus/snapshots/test_cover.ambr
+++ b/tests/components/velbus/snapshots/test_cover.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/velbus/snapshots/test_diagnostics.ambr b/tests/components/velbus/snapshots/test_diagnostics.ambr
index 406a5f2d84e..a280bf4c9c2 100644
--- a/tests/components/velbus/snapshots/test_diagnostics.ambr
+++ b/tests/components/velbus/snapshots/test_diagnostics.ambr
@@ -10,12 +10,14 @@
       'discovery_keys': dict({
       }),
       'domain': 'velbus',
-      'minor_version': 1,
+      'minor_version': 2,
       'options': dict({
       }),
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': None,
       'version': 2,
diff --git a/tests/components/velbus/snapshots/test_init.ambr b/tests/components/velbus/snapshots/test_init.ambr
index a55a00ef0f2..1e17753a02f 100644
--- a/tests/components/velbus/snapshots/test_init.ambr
+++ b/tests/components/velbus/snapshots/test_init.ambr
@@ -4,6 +4,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -34,6 +35,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -64,6 +66,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -94,6 +97,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -124,6 +128,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -154,6 +159,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -184,6 +190,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -214,6 +221,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
diff --git a/tests/components/velbus/snapshots/test_light.ambr b/tests/components/velbus/snapshots/test_light.ambr
index b7009a0c66a..6dd2ca4939d 100644
--- a/tests/components/velbus/snapshots/test_light.ambr
+++ b/tests/components/velbus/snapshots/test_light.ambr
@@ -10,6 +10,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -65,6 +66,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/velbus/snapshots/test_select.ambr b/tests/components/velbus/snapshots/test_select.ambr
index 288eb10a3c3..94bb109fc71 100644
--- a/tests/components/velbus/snapshots/test_select.ambr
+++ b/tests/components/velbus/snapshots/test_select.ambr
@@ -13,6 +13,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/velbus/snapshots/test_sensor.ambr b/tests/components/velbus/snapshots/test_sensor.ambr
index 6860ad73e2c..6f562f399af 100644
--- a/tests/components/velbus/snapshots/test_sensor.ambr
+++ b/tests/components/velbus/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -111,6 +113,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -161,6 +164,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -211,6 +215,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/velbus/snapshots/test_switch.ambr b/tests/components/velbus/snapshots/test_switch.ambr
index e9090c396d1..60458b196a8 100644
--- a/tests/components/velbus/snapshots/test_switch.ambr
+++ b/tests/components/velbus/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/velbus/test_config_flow.py b/tests/components/velbus/test_config_flow.py
index 04b6a51043f..36d658f9633 100644
--- a/tests/components/velbus/test_config_flow.py
+++ b/tests/components/velbus/test_config_flow.py
@@ -7,14 +7,14 @@ import pytest
 import serial.tools.list_ports
 from velbusaio.exceptions import VelbusConnectionFailed
 
-from homeassistant.components.velbus.const import DOMAIN
+from homeassistant.components.velbus.const import CONF_TLS, DOMAIN
 from homeassistant.config_entries import SOURCE_USB, SOURCE_USER
-from homeassistant.const import CONF_NAME, CONF_PORT, CONF_SOURCE
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_SOURCE
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers.service_info.usb import UsbServiceInfo
 
-from .const import PORT_SERIAL, PORT_TCP
+from .const import PORT_SERIAL
 
 from tests.common import MockConfigEntry
 
@@ -27,6 +27,8 @@ DISCOVERY_INFO = UsbServiceInfo(
     manufacturer="Velleman",
 )
 
+USB_DEV = "/dev/ttyACME100 - Some serial port, s/n: 1234 - Virtual serial port"
+
 
 def com_port():
     """Mock of a serial port."""
@@ -38,23 +40,15 @@ def com_port():
     return port
 
 
-@pytest.fixture(name="controller")
-def mock_controller() -> Generator[MagicMock]:
-    """Mock a successful velbus controller."""
-    with patch(
-        "homeassistant.components.velbus.config_flow.velbusaio.controller.Velbus",
-        autospec=True,
-    ) as controller:
-        yield controller
-
-
 @pytest.fixture(autouse=True)
 def override_async_setup_entry() -> Generator[AsyncMock]:
     """Override async_setup_entry."""
-    with patch(
-        "homeassistant.components.velbus.async_setup_entry", return_value=True
-    ) as mock_setup_entry:
-        yield mock_setup_entry
+    with (
+        patch(
+            "homeassistant.components.velbus.async_setup_entry", return_value=True
+        ) as mock,
+    ):
+        yield mock
 
 
 @pytest.fixture(name="controller_connection_failed")
@@ -65,73 +59,112 @@ def mock_controller_connection_failed():
 
 
 @pytest.mark.usefixtures("controller")
-async def test_user(hass: HomeAssistant) -> None:
-    """Test user config."""
-    # simple user form
+@pytest.mark.parametrize(
+    ("inputParams", "expected"),
+    [
+        (
+            {
+                CONF_TLS: True,
+                CONF_PASSWORD: "password",
+            },
+            "tls://password@velbus:6000",
+        ),
+        (
+            {
+                CONF_TLS: True,
+                CONF_PASSWORD: "",
+            },
+            "tls://velbus:6000",
+        ),
+        ({CONF_TLS: True}, "tls://velbus:6000"),
+        ({CONF_TLS: False}, "velbus:6000"),
+    ],
+)
+async def test_user_network_succes(
+    hass: HomeAssistant, inputParams: str, expected: str
+) -> None:
+    """Test user network config."""
+    # inttial menu show
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": SOURCE_USER}
     )
     assert result
     assert result.get("flow_id")
-    assert result.get("type") is FlowResultType.FORM
+    assert result.get("type") is FlowResultType.MENU
     assert result.get("step_id") == "user"
-
-    # try with a serial port
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-        data={CONF_NAME: "Velbus Test Serial", CONF_PORT: PORT_SERIAL},
+    assert result.get("menu_options") == ["network", "usbselect"]
+    # select the network option
+    result = await hass.config_entries.flow.async_configure(
+        result.get("flow_id"),
+        {"next_step_id": "network"},
+    )
+    assert result["type"] is FlowResultType.FORM
+    # fill in the network form
+    result = await hass.config_entries.flow.async_configure(
+        result.get("flow_id"),
+        {
+            CONF_HOST: "velbus",
+            CONF_PORT: 6000,
+            **inputParams,
+        },
     )
     assert result
     assert result.get("type") is FlowResultType.CREATE_ENTRY
-    assert result.get("title") == "velbus_test_serial"
+    assert result.get("title") == "Velbus Network"
+    data = result.get("data")
+    assert data
+    assert data[CONF_PORT] == expected
+
+
+@pytest.mark.usefixtures("controller")
+@patch("serial.tools.list_ports.comports", MagicMock(return_value=[com_port()]))
+async def test_user_usb_succes(hass: HomeAssistant) -> None:
+    """Test user usb step."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    result = await hass.config_entries.flow.async_configure(
+        result.get("flow_id"),
+        {"next_step_id": "usbselect"},
+    )
+    assert result["type"] is FlowResultType.FORM
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_PORT: USB_DEV,
+        },
+    )
+    assert result
+    assert result.get("type") is FlowResultType.CREATE_ENTRY
+    assert result.get("title") == "Velbus USB"
     data = result.get("data")
     assert data
     assert data[CONF_PORT] == PORT_SERIAL
 
-    # try with a ip:port combination
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-        data={CONF_NAME: "Velbus Test TCP", CONF_PORT: PORT_TCP},
-    )
-    assert result
-    assert result.get("type") is FlowResultType.CREATE_ENTRY
-    assert result.get("title") == "velbus_test_tcp"
-    data = result.get("data")
-    assert data
-    assert data[CONF_PORT] == PORT_TCP
 
-
-@pytest.mark.usefixtures("controller_connection_failed")
-async def test_user_fail(hass: HomeAssistant) -> None:
-    """Test user config."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-        data={CONF_NAME: "Velbus Test Serial", CONF_PORT: PORT_SERIAL},
-    )
-    assert result
-    assert result.get("type") is FlowResultType.FORM
-    assert result.get("errors") == {CONF_PORT: "cannot_connect"}
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-        data={CONF_NAME: "Velbus Test TCP", CONF_PORT: PORT_TCP},
-    )
-    assert result
-    assert result.get("type") is FlowResultType.FORM
-    assert result.get("errors") == {CONF_PORT: "cannot_connect"}
-
-
-@pytest.mark.usefixtures("config_entry")
-async def test_abort_if_already_setup(hass: HomeAssistant) -> None:
+@pytest.mark.usefixtures("controller")
+async def test_network_abort_if_already_setup(hass: HomeAssistant) -> None:
     """Test we abort if Velbus is already setup."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={CONF_PORT: "127.0.0.1:3788"},
+    )
+    entry.add_to_hass(hass)
     result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-        data={CONF_PORT: PORT_TCP, CONF_NAME: "velbus test"},
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    result = await hass.config_entries.flow.async_configure(
+        result.get("flow_id"),
+        {"next_step_id": "network"},
+    )
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_TLS: False,
+            CONF_HOST: "127.0.0.1",
+            CONF_PORT: 3788,
+            CONF_PASSWORD: "",
+        },
     )
     assert result
     assert result.get("type") is FlowResultType.ABORT
@@ -156,7 +189,7 @@ async def test_flow_usb(hass: HomeAssistant) -> None:
         user_input={},
     )
     assert result
-    assert result["result"].unique_id == "0B1B:10CF_1234_Velleman_Velbus VMB1USB"
+    assert result["result"].unique_id == "1234"
     assert result.get("type") is FlowResultType.CREATE_ENTRY
 
 
@@ -167,13 +200,23 @@ async def test_flow_usb_if_already_setup(hass: HomeAssistant) -> None:
     entry = MockConfigEntry(
         domain=DOMAIN,
         data={CONF_PORT: PORT_SERIAL},
-        unique_id="0B1B:10CF_1234_Velleman_Velbus VMB1USB",
     )
     entry.add_to_hass(hass)
+
     result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={CONF_SOURCE: SOURCE_USB},
-        data=DISCOVERY_INFO,
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    result = await hass.config_entries.flow.async_configure(
+        result.get("flow_id"),
+        {"next_step_id": "usbselect"},
+    )
+    assert result
+    assert result["type"] is FlowResultType.FORM
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_PORT: USB_DEV,
+        },
     )
     assert result
     assert result.get("type") is FlowResultType.ABORT
diff --git a/tests/components/velbus/test_init.py b/tests/components/velbus/test_init.py
index 3285099f2a2..2d28ba81cb1 100644
--- a/tests/components/velbus/test_init.py
+++ b/tests/components/velbus/test_init.py
@@ -16,6 +16,7 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 
 from . import init_integration
+from .const import PORT_TCP
 
 from tests.common import MockConfigEntry
 
@@ -107,16 +108,41 @@ async def test_migrate_config_entry(
     """Test successful migration of entry data."""
     legacy_config = {CONF_NAME: "fake_name", CONF_PORT: "1.2.3.4:5678"}
     entry = MockConfigEntry(domain=DOMAIN, unique_id="my own id", data=legacy_config)
-    entry.add_to_hass(hass)
-
-    assert dict(entry.data) == legacy_config
     assert entry.version == 1
+    assert entry.minor_version == 1
+
+    entry.add_to_hass(hass)
 
     # test in case we do not have a cache
     with patch("os.path.isdir", return_value=True), patch("shutil.rmtree"):
         await hass.config_entries.async_setup(entry.entry_id)
         assert dict(entry.data) == legacy_config
         assert entry.version == 2
+        assert entry.minor_version == 2
+
+
+@pytest.mark.parametrize(
+    ("unique_id", "expected"),
+    [("vid:pid_serial_manufacturer_decription", "serial"), (None, None)],
+)
+async def test_migrate_config_entry_unique_id(
+    hass: HomeAssistant,
+    controller: AsyncMock,
+    unique_id: str,
+    expected: str,
+) -> None:
+    """Test the migration of unique id."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={CONF_PORT: PORT_TCP, CONF_NAME: "velbus home"},
+        unique_id=unique_id,
+    )
+    entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    assert entry.unique_id == expected
+    assert entry.version == 2
+    assert entry.minor_version == 2
 
 
 async def test_api_call(
diff --git a/tests/components/velbus/test_services.py b/tests/components/velbus/test_services.py
index 2bcbac7b80d..94ba91e6dc3 100644
--- a/tests/components/velbus/test_services.py
+++ b/tests/components/velbus/test_services.py
@@ -18,7 +18,7 @@ from homeassistant.components.velbus.const import (
 from homeassistant.const import CONF_ADDRESS
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
-import homeassistant.helpers.issue_registry as ir
+from homeassistant.helpers import issue_registry as ir
 
 from . import init_integration
 
diff --git a/tests/components/vesync/common.py b/tests/components/vesync/common.py
index ead3ecdc173..39a92778727 100644
--- a/tests/components/vesync/common.py
+++ b/tests/components/vesync/common.py
@@ -13,6 +13,7 @@ from tests.common import load_fixture, load_json_object_fixture
 ENTITY_HUMIDIFIER = "humidifier.humidifier_200s"
 ENTITY_HUMIDIFIER_MIST_LEVEL = "number.humidifier_200s_mist_level"
 ENTITY_HUMIDIFIER_HUMIDITY = "sensor.humidifier_200s_humidity"
+ENTITY_HUMIDIFIER_300S_NIGHT_LIGHT_SELECT = "select.humidifier_300s_night_light_level"
 
 ALL_DEVICES = load_json_object_fixture("vesync-devices.json", DOMAIN)
 ALL_DEVICE_NAMES: list[str] = [
@@ -51,6 +52,9 @@ DEVICE_FIXTURES: dict[str, list[tuple[str, str, str]]] = {
         ("post", "/inwallswitch/v1/device/devicedetail", "device-detail.json")
     ],
     "Dimmer Switch": [("post", "/dimmer/v1/device/devicedetail", "dimmer-detail.json")],
+    "SmartTowerFan": [
+        ("post", "/cloud/v2/deviceManaged/bypassV2", "SmartTowerFan-detail.json")
+    ],
 }
 
 
diff --git a/tests/components/vesync/conftest.py b/tests/components/vesync/conftest.py
index 8272da8dfad..df6ebbdf6e7 100644
--- a/tests/components/vesync/conftest.py
+++ b/tests/components/vesync/conftest.py
@@ -107,8 +107,60 @@ def outlet_fixture():
 
 @pytest.fixture(name="humidifier")
 def humidifier_fixture():
-    """Create a mock VeSync humidifier fixture."""
-    return Mock(VeSyncHumid200300S)
+    """Create a mock VeSync Classic200S humidifier fixture."""
+    return Mock(
+        VeSyncHumid200300S,
+        cid="200s-humidifier",
+        config={
+            "auto_target_humidity": 40,
+            "display": "true",
+            "automatic_stop": "true",
+        },
+        details={
+            "humidity": 35,
+            "mode": "manual",
+        },
+        device_type="Classic200S",
+        device_name="Humidifier 200s",
+        device_status="on",
+        mist_level=6,
+        mist_modes=["auto", "manual"],
+        mode=None,
+        sub_device_no=0,
+        config_module="configModule",
+        connection_status="online",
+        current_firm_version="1.0.0",
+        water_lacks=False,
+        water_tank_lifted=False,
+    )
+
+
+@pytest.fixture(name="humidifier_300s")
+def humidifier_300s_fixture():
+    """Create a mock VeSync Classic300S humidifier fixture."""
+    return Mock(
+        VeSyncHumid200300S,
+        cid="300s-humidifier",
+        config={
+            "auto_target_humidity": 40,
+            "display": "true",
+            "automatic_stop": "true",
+        },
+        details={"humidity": 35, "mode": "manual", "night_light_brightness": 50},
+        device_type="Classic300S",
+        device_name="Humidifier 300s",
+        device_status="on",
+        mist_level=6,
+        mist_modes=["auto", "manual"],
+        mode=None,
+        night_light=True,
+        sub_device_no=0,
+        config_module="configModule",
+        connection_status="online",
+        current_firm_version="1.0.0",
+        water_lacks=False,
+        water_tank_lifted=False,
+    )
 
 
 @pytest.fixture(name="humidifier_config_entry")
@@ -129,3 +181,40 @@ async def humidifier_config_entry(
     await hass.async_block_till_done()
 
     return entry
+
+
+@pytest.fixture
+async def install_humidifier_device(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    manager,
+    request: pytest.FixtureRequest,
+) -> None:
+    """Create a mock VeSync config entry with the specified humidifier device."""
+
+    # Install the defined humidifier
+    manager._dev_list["fans"].append(request.getfixturevalue(request.param))
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+
+@pytest.fixture(name="switch_old_id_config_entry")
+async def switch_old_id_config_entry(
+    hass: HomeAssistant, requests_mock: requests_mock.Mocker, config
+) -> MockConfigEntry:
+    """Create a mock VeSync config entry for `switch` with the old unique ID approach."""
+    entry = MockConfigEntry(
+        title="VeSync",
+        domain=DOMAIN,
+        data=config[DOMAIN],
+        version=1,
+        minor_version=1,
+    )
+    entry.add_to_hass(hass)
+
+    wall_switch = "Wall Switch"
+    humidifer = "Humidifier 200s"
+
+    mock_multiple_device_responses(requests_mock, [wall_switch, humidifer])
+
+    return entry
diff --git a/tests/components/vesync/fixtures/SmartTowerFan-detail.json b/tests/components/vesync/fixtures/SmartTowerFan-detail.json
new file mode 100644
index 00000000000..061dcb5b0d0
--- /dev/null
+++ b/tests/components/vesync/fixtures/SmartTowerFan-detail.json
@@ -0,0 +1,37 @@
+{
+  "traceId": "0000000000",
+  "code": 0,
+  "msg": "request success",
+  "module": null,
+  "stacktrace": null,
+  "result": {
+    "traceId": "0000000000",
+    "code": 0,
+    "result": {
+      "powerSwitch": 0,
+      "workMode": "normal",
+      "manualSpeedLevel": 1,
+      "fanSpeedLevel": 0,
+      "screenState": 0,
+      "screenSwitch": 0,
+      "oscillationSwitch": 1,
+      "oscillationState": 1,
+      "muteSwitch": 1,
+      "muteState": 1,
+      "timerRemain": 0,
+      "temperature": 717,
+      "humidity": 40,
+      "thermalComfort": 65,
+      "errorCode": 0,
+      "sleepPreference": {
+        "sleepPreferenceType": "default",
+        "oscillationSwitch": 0,
+        "initFanSpeedLevel": 0,
+        "fallAsleepRemain": 0,
+        "autoChangeFanLevelSwitch": 0
+      },
+      "scheduleCount": 0,
+      "displayingType": 0
+    }
+  }
+}
diff --git a/tests/components/vesync/fixtures/vesync-devices.json b/tests/components/vesync/fixtures/vesync-devices.json
index eac2bf9f5fa..3109fd3ea40 100644
--- a/tests/components/vesync/fixtures/vesync-devices.json
+++ b/tests/components/vesync/fixtures/vesync-devices.json
@@ -6,7 +6,7 @@
         "cid": "200s-humidifier",
         "deviceType": "Classic200S",
         "deviceName": "Humidifier 200s",
-        "subDeviceNo": null,
+        "subDeviceNo": 4321,
         "deviceStatus": "on",
         "connectionStatus": "online",
         "uuid": "00000000-1111-2222-3333-444444444444",
@@ -108,6 +108,15 @@
         "deviceStatus": "on",
         "connectionStatus": "online",
         "configModule": "configModule"
+      },
+      {
+        "cid": "smarttowerfan",
+        "deviceType": "LTF-F422S-KEU",
+        "deviceName": "SmartTowerFan",
+        "subDeviceNo": null,
+        "deviceStatus": "on",
+        "connectionStatus": "online",
+        "configModule": "configModule"
       }
     ]
   }
diff --git a/tests/components/vesync/snapshots/test_diagnostics.ambr b/tests/components/vesync/snapshots/test_diagnostics.ambr
index 54ed8acf2d7..407e18d65b6 100644
--- a/tests/components/vesync/snapshots/test_diagnostics.ambr
+++ b/tests/components/vesync/snapshots/test_diagnostics.ambr
@@ -128,7 +128,7 @@
             'sleep',
             'manual',
           ]),
-          'mode': None,
+          'mode': 'humidity',
           'night_light': True,
           'pid': None,
           'speed': None,
@@ -160,6 +160,31 @@
 # ---
 # name: test_async_get_device_diagnostics__single_fan
   dict({
+    '_config_dict': dict({
+      'features': list([
+        'air_quality',
+      ]),
+      'levels': list([
+        1,
+        2,
+      ]),
+      'models': list([
+        'LV-PUR131S',
+        'LV-RH131S',
+        'LV-RH131S-WM',
+      ]),
+      'modes': list([
+        'manual',
+        'auto',
+        'sleep',
+        'off',
+      ]),
+      'module': 'VeSyncAir131',
+    }),
+    '_features': list([
+      'air_quality',
+    ]),
+    'air_quality_feature': True,
     'cid': 'abcdefghabcdefghabcdefghabcdefgh',
     'config': dict({
     }),
@@ -180,6 +205,7 @@
     'device_region': 'US',
     'device_status': 'unknown',
     'device_type': 'LV-PUR131S',
+    'enabled': True,
     'extension': None,
     'home_assistant': dict({
       'disabled': False,
@@ -271,6 +297,12 @@
     'mac_id': '**REDACTED**',
     'manager': '**REDACTED**',
     'mode': None,
+    'modes': list([
+      'manual',
+      'auto',
+      'sleep',
+      'off',
+    ]),
     'pid': None,
     'speed': None,
     'sub_device_no': None,
diff --git a/tests/components/vesync/snapshots/test_fan.ambr b/tests/components/vesync/snapshots/test_fan.ambr
index 1dea5f28f2c..0b56a08eeff 100644
--- a/tests/components/vesync/snapshots/test_fan.ambr
+++ b/tests/components/vesync/snapshots/test_fan.ambr
@@ -4,6 +4,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -46,6 +47,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -96,6 +98,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -137,6 +140,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -193,6 +197,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -235,6 +240,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -292,6 +298,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -334,6 +341,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -391,6 +399,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -429,6 +438,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -467,6 +477,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -477,7 +488,7 @@
       'identifiers': set({
         tuple(
           'vesync',
-          '200s-humidifier',
+          '200s-humidifier4321',
         ),
       }),
       'is_new': False,
@@ -505,6 +516,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -543,6 +555,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -576,11 +589,117 @@
   list([
   ])
 # ---
+# name: test_fan_state[SmartTowerFan][devices]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'vesync',
+          'smarttowerfan',
+        ),
+      }),
+      'is_new': False,
+      'labels': set({
+      }),
+      'manufacturer': 'VeSync',
+      'model': 'LTF-F422S-KEU',
+      'model_id': None,
+      'name': 'SmartTowerFan',
+      'name_by_user': None,
+      'primary_config_entry': <ANY>,
+      'serial_number': None,
+      'suggested_area': None,
+      'sw_version': None,
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_fan_state[SmartTowerFan][entities]
+  list([
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'preset_modes': list([
+          'advancedSleep',
+          'auto',
+          'turbo',
+          'normal',
+        ]),
+      }),
+      'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'fan',
+      'entity_category': None,
+      'entity_id': 'fan.smarttowerfan',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'labels': set({
+      }),
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': None,
+      'original_name': None,
+      'platform': 'vesync',
+      'previous_unique_id': None,
+      'supported_features': <FanEntityFeature: 57>,
+      'translation_key': 'vesync',
+      'unique_id': 'smarttowerfan',
+      'unit_of_measurement': None,
+    }),
+  ])
+# ---
+# name: test_fan_state[SmartTowerFan][fan.smarttowerfan]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'child_lock': False,
+      'friendly_name': 'SmartTowerFan',
+      'mode': 'normal',
+      'night_light': 'off',
+      'percentage': None,
+      'percentage_step': 7.6923076923076925,
+      'preset_mode': None,
+      'preset_modes': list([
+        'advancedSleep',
+        'auto',
+        'turbo',
+        'normal',
+      ]),
+      'screen_status': False,
+      'supported_features': <FanEntityFeature: 57>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'fan.smarttowerfan',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
 # name: test_fan_state[Temperature Light][devices]
   list([
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -619,6 +738,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
diff --git a/tests/components/vesync/snapshots/test_light.ambr b/tests/components/vesync/snapshots/test_light.ambr
index ba6c7ab51b9..bed711b1040 100644
--- a/tests/components/vesync/snapshots/test_light.ambr
+++ b/tests/components/vesync/snapshots/test_light.ambr
@@ -4,6 +4,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -42,6 +43,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -80,6 +82,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -118,6 +121,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -156,6 +160,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -197,6 +202,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -246,6 +252,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -287,6 +294,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -338,6 +346,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -348,7 +357,7 @@
       'identifiers': set({
         tuple(
           'vesync',
-          '200s-humidifier',
+          '200s-humidifier4321',
         ),
       }),
       'is_new': False,
@@ -376,6 +385,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -414,6 +424,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -447,11 +458,51 @@
   list([
   ])
 # ---
+# name: test_light_state[SmartTowerFan][devices]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'vesync',
+          'smarttowerfan',
+        ),
+      }),
+      'is_new': False,
+      'labels': set({
+      }),
+      'manufacturer': 'VeSync',
+      'model': 'LTF-F422S-KEU',
+      'model_id': None,
+      'name': 'SmartTowerFan',
+      'name_by_user': None,
+      'primary_config_entry': <ANY>,
+      'serial_number': None,
+      'suggested_area': None,
+      'sw_version': None,
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_light_state[SmartTowerFan][entities]
+  list([
+  ])
+# ---
 # name: test_light_state[Temperature Light][devices]
   list([
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -497,6 +548,7 @@
         ]),
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -557,6 +609,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
diff --git a/tests/components/vesync/snapshots/test_sensor.ambr b/tests/components/vesync/snapshots/test_sensor.ambr
index 50bee417a28..c701fa8a324 100644
--- a/tests/components/vesync/snapshots/test_sensor.ambr
+++ b/tests/components/vesync/snapshots/test_sensor.ambr
@@ -4,6 +4,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -43,6 +44,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -74,6 +76,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -134,6 +137,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -173,6 +177,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -220,6 +225,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -259,6 +265,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -290,6 +297,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -323,6 +331,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -399,6 +408,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -438,6 +448,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -469,6 +480,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -502,6 +514,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -578,6 +591,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -616,6 +630,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -654,6 +669,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -664,7 +680,7 @@
       'identifiers': set({
         tuple(
           'vesync',
-          '200s-humidifier',
+          '200s-humidifier4321',
         ),
       }),
       'is_new': False,
@@ -693,6 +709,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -715,7 +732,7 @@
       'previous_unique_id': None,
       'supported_features': 0,
       'translation_key': None,
-      'unique_id': '200s-humidifier-humidity',
+      'unique_id': '200s-humidifier4321-humidity',
       'unit_of_measurement': '%',
     }),
   ])
@@ -741,6 +758,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -780,6 +798,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -828,6 +847,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -867,6 +887,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -900,6 +921,7 @@
         'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -933,6 +955,7 @@
         'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -966,6 +989,7 @@
         'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -999,6 +1023,7 @@
         'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1032,6 +1057,7 @@
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       }),
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -1155,11 +1181,51 @@
     'state': '0',
   })
 # ---
+# name: test_sensor_state[SmartTowerFan][devices]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'vesync',
+          'smarttowerfan',
+        ),
+      }),
+      'is_new': False,
+      'labels': set({
+      }),
+      'manufacturer': 'VeSync',
+      'model': 'LTF-F422S-KEU',
+      'model_id': None,
+      'name': 'SmartTowerFan',
+      'name_by_user': None,
+      'primary_config_entry': <ANY>,
+      'serial_number': None,
+      'suggested_area': None,
+      'sw_version': None,
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_sensor_state[SmartTowerFan][entities]
+  list([
+  ])
+# ---
 # name: test_sensor_state[Temperature Light][devices]
   list([
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -1198,6 +1264,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
diff --git a/tests/components/vesync/snapshots/test_switch.ambr b/tests/components/vesync/snapshots/test_switch.ambr
index 596aa0c94ad..1faed941338 100644
--- a/tests/components/vesync/snapshots/test_switch.ambr
+++ b/tests/components/vesync/snapshots/test_switch.ambr
@@ -4,6 +4,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -42,6 +43,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -80,6 +82,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -118,6 +121,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -156,6 +160,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -194,6 +199,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -232,6 +238,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -242,7 +249,7 @@
       'identifiers': set({
         tuple(
           'vesync',
-          '200s-humidifier',
+          '200s-humidifier4321',
         ),
       }),
       'is_new': False,
@@ -270,6 +277,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -308,6 +316,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -345,6 +354,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -360,14 +370,14 @@
       'name': None,
       'options': dict({
       }),
-      'original_device_class': None,
+      'original_device_class': <SwitchDeviceClass.OUTLET: 'outlet'>,
       'original_icon': None,
       'original_name': None,
       'platform': 'vesync',
       'previous_unique_id': None,
       'supported_features': 0,
       'translation_key': None,
-      'unique_id': 'outlet',
+      'unique_id': 'outlet-device_status',
       'unit_of_measurement': None,
     }),
   ])
@@ -375,6 +385,7 @@
 # name: test_switch_state[Outlet][switch.outlet]
   StateSnapshot({
     'attributes': ReadOnlyDict({
+      'device_class': 'outlet',
       'friendly_name': 'Outlet',
     }),
     'context': <ANY>,
@@ -385,11 +396,51 @@
     'state': 'on',
   })
 # ---
+# name: test_switch_state[SmartTowerFan][devices]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'vesync',
+          'smarttowerfan',
+        ),
+      }),
+      'is_new': False,
+      'labels': set({
+      }),
+      'manufacturer': 'VeSync',
+      'model': 'LTF-F422S-KEU',
+      'model_id': None,
+      'name': 'SmartTowerFan',
+      'name_by_user': None,
+      'primary_config_entry': <ANY>,
+      'serial_number': None,
+      'suggested_area': None,
+      'sw_version': None,
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_switch_state[SmartTowerFan][entities]
+  list([
+  ])
+# ---
 # name: test_switch_state[Temperature Light][devices]
   list([
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -428,6 +479,7 @@
     DeviceRegistryEntrySnapshot({
       'area_id': None,
       'config_entries': <ANY>,
+      'config_entries_subentries': <ANY>,
       'configuration_url': None,
       'connections': set({
       }),
@@ -465,6 +517,7 @@
       'area_id': None,
       'capabilities': None,
       'config_entry_id': <ANY>,
+      'config_subentry_id': <ANY>,
       'device_class': None,
       'device_id': <ANY>,
       'disabled_by': None,
@@ -480,14 +533,14 @@
       'name': None,
       'options': dict({
       }),
-      'original_device_class': None,
+      'original_device_class': <SwitchDeviceClass.SWITCH: 'switch'>,
       'original_icon': None,
       'original_name': None,
       'platform': 'vesync',
       'previous_unique_id': None,
       'supported_features': 0,
       'translation_key': None,
-      'unique_id': 'switch',
+      'unique_id': 'switch-device_status',
       'unit_of_measurement': None,
     }),
   ])
@@ -495,6 +548,7 @@
 # name: test_switch_state[Wall Switch][switch.wall_switch]
   StateSnapshot({
     'attributes': ReadOnlyDict({
+      'device_class': 'switch',
       'friendly_name': 'Wall Switch',
     }),
     'context': <ANY>,
diff --git a/tests/components/vesync/test_config_flow.py b/tests/components/vesync/test_config_flow.py
index 22a93e1ba56..38f28e73aed 100644
--- a/tests/components/vesync/test_config_flow.py
+++ b/tests/components/vesync/test_config_flow.py
@@ -48,3 +48,59 @@ async def test_config_flow_user_input(hass: HomeAssistant) -> None:
         assert result["type"] is FlowResultType.CREATE_ENTRY
         assert result["data"][CONF_USERNAME] == "user"
         assert result["data"][CONF_PASSWORD] == "pass"
+
+
+async def test_reauth_flow(hass: HomeAssistant) -> None:
+    """Test a successful reauth flow."""
+    mock_entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id="test-username",
+    )
+    mock_entry.add_to_hass(hass)
+
+    result = await mock_entry.start_reauth_flow(hass)
+
+    assert result["step_id"] == "reauth_confirm"
+    assert result["type"] is FlowResultType.FORM
+    with patch("pyvesync.vesync.VeSync.login", return_value=True):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_USERNAME: "new-username", CONF_PASSWORD: "new-password"},
+        )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reauth_successful"
+    assert mock_entry.data == {
+        CONF_USERNAME: "new-username",
+        CONF_PASSWORD: "new-password",
+    }
+
+
+async def test_reauth_flow_invalid_auth(hass: HomeAssistant) -> None:
+    """Test an authorization error reauth flow."""
+
+    mock_entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id="test-username",
+    )
+    mock_entry.add_to_hass(hass)
+
+    result = await mock_entry.start_reauth_flow(hass)
+    assert result["step_id"] == "reauth_confirm"
+    assert result["type"] is FlowResultType.FORM
+
+    with patch("pyvesync.vesync.VeSync.login", return_value=False):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_USERNAME: "new-username", CONF_PASSWORD: "new-password"},
+        )
+
+    assert result["type"] is FlowResultType.FORM
+    with patch("pyvesync.vesync.VeSync.login", return_value=True):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_USERNAME: "new-username", CONF_PASSWORD: "new-password"},
+        )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reauth_successful"
diff --git a/tests/components/vesync/test_diagnostics.py b/tests/components/vesync/test_diagnostics.py
index b948053c3a0..25aa5337281 100644
--- a/tests/components/vesync/test_diagnostics.py
+++ b/tests/components/vesync/test_diagnostics.py
@@ -101,6 +101,9 @@ async def test_async_get_device_diagnostics__single_fan(
                 "home_assistant.entities.2.state.last_changed": (str,),
                 "home_assistant.entities.2.state.last_reported": (str,),
                 "home_assistant.entities.2.state.last_updated": (str,),
+                "home_assistant.entities.3.state.last_changed": (str,),
+                "home_assistant.entities.3.state.last_reported": (str,),
+                "home_assistant.entities.3.state.last_updated": (str,),
             }
         )
     )
diff --git a/tests/components/vesync/test_humidifier.py b/tests/components/vesync/test_humidifier.py
index 3b89ba8e742..d5057c44951 100644
--- a/tests/components/vesync/test_humidifier.py
+++ b/tests/components/vesync/test_humidifier.py
@@ -1,6 +1,7 @@
 """Tests for the humidifier platform."""
 
 from contextlib import nullcontext
+import logging
 from unittest.mock import patch
 
 import pytest
@@ -9,10 +10,17 @@ from homeassistant.components.humidifier import (
     ATTR_HUMIDITY,
     ATTR_MODE,
     DOMAIN as HUMIDIFIER_DOMAIN,
+    MODE_AUTO,
+    MODE_SLEEP,
     SERVICE_SET_HUMIDITY,
     SERVICE_SET_MODE,
 )
-from homeassistant.config_entries import ConfigEntryState
+from homeassistant.components.vesync.const import (
+    VS_HUMIDIFIER_MODE_AUTO,
+    VS_HUMIDIFIER_MODE_MANUAL,
+    VS_HUMIDIFIER_MODE_SLEEP,
+)
+from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     SERVICE_TURN_OFF,
@@ -21,6 +29,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
+from homeassistant.helpers import entity_registry as er
 
 from .common import (
     ENTITY_HUMIDIFIER,
@@ -220,8 +229,101 @@ async def test_set_mode(
         await hass.services.async_call(
             HUMIDIFIER_DOMAIN,
             SERVICE_SET_MODE,
-            {ATTR_ENTITY_ID: ENTITY_HUMIDIFIER, ATTR_MODE: "auto"},
+            {ATTR_ENTITY_ID: ENTITY_HUMIDIFIER, ATTR_MODE: MODE_AUTO},
             blocking=True,
         )
     await hass.async_block_till_done()
     method_mock.assert_called_once()
+
+
+async def test_base_unique_id(
+    hass: HomeAssistant,
+    humidifier_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that unique_id is based on subDeviceNo."""
+    # vesync-device.json defines subDeviceNo for 200s-humidifier as 4321.
+    entity = entity_registry.async_get(ENTITY_HUMIDIFIER)
+    assert entity.unique_id.endswith("4321")
+
+
+async def test_invalid_mist_modes(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    humidifier,
+    manager,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test unsupported mist mode."""
+
+    humidifier.mist_modes = ["invalid_mode"]
+
+    with patch(
+        "homeassistant.components.vesync.async_generate_device_list",
+        return_value=[humidifier],
+    ):
+        caplog.clear()
+        caplog.set_level(logging.WARNING)
+
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
+        assert "Unknown mode 'invalid_mode'" in caplog.text
+
+
+async def test_valid_mist_modes(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    humidifier,
+    manager,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test supported mist mode."""
+
+    humidifier.mist_modes = ["auto", "manual"]
+
+    with patch(
+        "homeassistant.components.vesync.async_generate_device_list",
+        return_value=[humidifier],
+    ):
+        caplog.clear()
+        caplog.set_level(logging.WARNING)
+
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
+        assert "Unknown mode 'auto'" not in caplog.text
+        assert "Unknown mode 'manual'" not in caplog.text
+
+
+async def test_set_mode_sleep_turns_display_off(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    humidifier,
+    manager,
+) -> None:
+    """Test update of display for sleep mode."""
+
+    # First define valid mist modes
+    humidifier.mist_modes = [
+        VS_HUMIDIFIER_MODE_AUTO,
+        VS_HUMIDIFIER_MODE_MANUAL,
+        VS_HUMIDIFIER_MODE_SLEEP,
+    ]
+
+    with patch(
+        "homeassistant.components.vesync.async_generate_device_list",
+        return_value=[humidifier],
+    ):
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    with (
+        patch.object(humidifier, "set_humidity_mode", return_value=True),
+        patch.object(humidifier, "set_display") as display_mock,
+    ):
+        await hass.services.async_call(
+            HUMIDIFIER_DOMAIN,
+            SERVICE_SET_MODE,
+            {ATTR_ENTITY_ID: ENTITY_HUMIDIFIER, ATTR_MODE: MODE_SLEEP},
+            blocking=True,
+        )
+        display_mock.assert_called_once_with(False)
diff --git a/tests/components/vesync/test_init.py b/tests/components/vesync/test_init.py
index 3b0df128240..31df2418b3d 100644
--- a/tests/components/vesync/test_init.py
+++ b/tests/components/vesync/test_init.py
@@ -2,7 +2,6 @@
 
 from unittest.mock import Mock, patch
 
-import pytest
 from pyvesync import VeSync
 
 from homeassistant.components.vesync import SERVICE_UPDATE_DEVS, async_setup_entry
@@ -10,31 +9,26 @@ from homeassistant.components.vesync.const import DOMAIN, VS_DEVICES, VS_MANAGER
 from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from tests.common import MockConfigEntry
 
 
 async def test_async_setup_entry__not_login(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
     manager: VeSync,
-    caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test setup does not create config entry when not logged in."""
     manager.login = Mock(return_value=False)
 
-    with (
-        patch.object(hass.config_entries, "async_forward_entry_setups") as setups_mock,
-        patch(
-            "homeassistant.components.vesync.async_generate_device_list"
-        ) as process_mock,
-    ):
-        assert not await async_setup_entry(hass, config_entry)
-        await hass.async_block_till_done()
-        assert setups_mock.call_count == 0
-        assert process_mock.call_count == 0
+    assert not await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
 
     assert manager.login.call_count == 1
-    assert DOMAIN not in hass.data
-    assert "Unable to login to the VeSync server" in caplog.text
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    assert config_entry.state is ConfigEntryState.SETUP_ERROR
+    assert not hass.data.get(DOMAIN)
 
 
 async def test_async_setup_entry__no_devices(
@@ -48,10 +42,12 @@ async def test_async_setup_entry__no_devices(
         assert setups_mock.call_count == 1
         assert setups_mock.call_args.args[0] == config_entry
         assert setups_mock.call_args.args[1] == [
+            Platform.BINARY_SENSOR,
             Platform.FAN,
             Platform.HUMIDIFIER,
             Platform.LIGHT,
             Platform.NUMBER,
+            Platform.SELECT,
             Platform.SENSOR,
             Platform.SWITCH,
         ]
@@ -78,10 +74,12 @@ async def test_async_setup_entry__loads_fans(
         assert setups_mock.call_count == 1
         assert setups_mock.call_args.args[0] == config_entry
         assert setups_mock.call_args.args[1] == [
+            Platform.BINARY_SENSOR,
             Platform.FAN,
             Platform.HUMIDIFIER,
             Platform.LIGHT,
             Platform.NUMBER,
+            Platform.SELECT,
             Platform.SENSOR,
             Platform.SWITCH,
         ]
@@ -90,23 +88,88 @@ async def test_async_setup_entry__loads_fans(
     assert hass.data[DOMAIN][VS_DEVICES] == [fan]
 
 
-async def test_async_new_device_discovery__loads_fans(
-    hass: HomeAssistant, config_entry: ConfigEntry, manager: VeSync, fan
+async def test_async_new_device_discovery(
+    hass: HomeAssistant, config_entry: ConfigEntry, manager: VeSync, fan, humidifier
 ) -> None:
-    """Test setup connects to vesync and loads fan as an update call."""
+    """Test new device discovery."""
 
     assert await hass.config_entries.async_setup(config_entry.entry_id)
     # Assert platforms loaded
     await hass.async_block_till_done()
     assert config_entry.state is ConfigEntryState.LOADED
     assert not hass.data[DOMAIN][VS_DEVICES]
-    fans = [fan]
-    manager.fans = fans
-    manager._dev_list = {
-        "fans": fans,
-    }
-    await hass.services.async_call(DOMAIN, SERVICE_UPDATE_DEVS, {}, blocking=True)
 
-    assert manager.login.call_count == 1
-    assert hass.data[DOMAIN][VS_MANAGER] == manager
-    assert hass.data[DOMAIN][VS_DEVICES] == [fan]
+    # Mock discovery of new fan which would get added to VS_DEVICES.
+    with patch(
+        "homeassistant.components.vesync.async_generate_device_list",
+        return_value=[fan],
+    ):
+        await hass.services.async_call(DOMAIN, SERVICE_UPDATE_DEVS, {}, blocking=True)
+
+        assert manager.login.call_count == 1
+        assert hass.data[DOMAIN][VS_MANAGER] == manager
+        assert hass.data[DOMAIN][VS_DEVICES] == [fan]
+
+    # Mock discovery of new humidifier which would invoke discovery in all platforms.
+    # The mocked humidifier needs to have all properties populated for correct processing.
+    with patch(
+        "homeassistant.components.vesync.async_generate_device_list",
+        return_value=[humidifier],
+    ):
+        await hass.services.async_call(DOMAIN, SERVICE_UPDATE_DEVS, {}, blocking=True)
+
+        assert manager.login.call_count == 1
+        assert hass.data[DOMAIN][VS_MANAGER] == manager
+        assert hass.data[DOMAIN][VS_DEVICES] == [fan, humidifier]
+
+
+async def test_migrate_config_entry(
+    hass: HomeAssistant,
+    switch_old_id_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test migration of config entry. Only migrates switches to a new unique_id."""
+    switch: er.RegistryEntry = entity_registry.async_get_or_create(
+        domain="switch",
+        platform="vesync",
+        unique_id="switch",
+        config_entry=switch_old_id_config_entry,
+        suggested_object_id="switch",
+    )
+
+    humidifer: er.RegistryEntry = entity_registry.async_get_or_create(
+        domain="humidifer",
+        platform="vesync",
+        unique_id="humidifer",
+        config_entry=switch_old_id_config_entry,
+        suggested_object_id="humidifer",
+    )
+
+    assert switch.unique_id == "switch"
+    assert switch_old_id_config_entry.minor_version == 1
+    assert humidifer.unique_id == "humidifer"
+
+    await hass.config_entries.async_setup(switch_old_id_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert switch_old_id_config_entry.minor_version == 2
+
+    migrated_switch = entity_registry.async_get(switch.entity_id)
+    assert migrated_switch is not None
+    assert migrated_switch.entity_id.startswith("switch")
+    assert migrated_switch.unique_id == "switch-device_status"
+    # Confirm humidifer was not impacted
+    migrated_humidifer = entity_registry.async_get(humidifer.entity_id)
+    assert migrated_humidifer is not None
+    assert migrated_humidifer.unique_id == "humidifer"
+
+    # Assert that only one entity exists in the switch domain
+    switch_entities = [
+        e for e in entity_registry.entities.values() if e.domain == "switch"
+    ]
+    assert len(switch_entities) == 1
+
+    humidifer_entities = [
+        e for e in entity_registry.entities.values() if e.domain == "humidifer"
+    ]
+    assert len(humidifer_entities) == 1
diff --git a/tests/components/vesync/test_select.py b/tests/components/vesync/test_select.py
new file mode 100644
index 00000000000..c96d687dfd2
--- /dev/null
+++ b/tests/components/vesync/test_select.py
@@ -0,0 +1,58 @@
+"""Tests for the select platform."""
+
+import pytest
+
+from homeassistant.components.select import (
+    ATTR_OPTION,
+    DOMAIN as SELECT_DOMAIN,
+    SERVICE_SELECT_OPTION,
+)
+from homeassistant.components.vesync.const import HUMIDIFIER_NIGHT_LIGHT_LEVEL_DIM
+from homeassistant.components.vesync.select import (
+    HA_TO_VS_HUMIDIFIER_NIGHT_LIGHT_LEVEL_MAP,
+)
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.core import HomeAssistant
+
+from .common import ENTITY_HUMIDIFIER_300S_NIGHT_LIGHT_SELECT
+
+
+@pytest.mark.parametrize(
+    "install_humidifier_device", ["humidifier_300s"], indirect=True
+)
+async def test_humidifier_set_nightlight_level(
+    hass: HomeAssistant, manager, humidifier_300s, install_humidifier_device
+) -> None:
+    """Test set of humidifier night light level."""
+
+    await hass.services.async_call(
+        SELECT_DOMAIN,
+        SERVICE_SELECT_OPTION,
+        {
+            ATTR_ENTITY_ID: ENTITY_HUMIDIFIER_300S_NIGHT_LIGHT_SELECT,
+            ATTR_OPTION: HUMIDIFIER_NIGHT_LIGHT_LEVEL_DIM,
+        },
+        blocking=True,
+    )
+
+    # Assert that setter API was invoked with the expected translated value
+    humidifier_300s.set_night_light_brightness.assert_called_once_with(
+        HA_TO_VS_HUMIDIFIER_NIGHT_LIGHT_LEVEL_MAP[HUMIDIFIER_NIGHT_LIGHT_LEVEL_DIM]
+    )
+    # Assert that devices were refreshed
+    manager.update_all_devices.assert_called_once()
+
+
+@pytest.mark.parametrize(
+    "install_humidifier_device", ["humidifier_300s"], indirect=True
+)
+async def test_humidifier_nightlight_level(
+    hass: HomeAssistant, install_humidifier_device
+) -> None:
+    """Test the state of humidifier night light level select entity."""
+
+    # The mocked device has night_light_brightness=50 which is "dim"
+    assert (
+        hass.states.get(ENTITY_HUMIDIFIER_300S_NIGHT_LIGHT_SELECT).state
+        == HUMIDIFIER_NIGHT_LIGHT_LEVEL_DIM
+    )
diff --git a/tests/components/vicare/fixtures/RoomSensor1.json b/tests/components/vicare/fixtures/RoomSensor1.json
index b970e54a48c..6c2f38db8d1 100644
--- a/tests/components/vicare/fixtures/RoomSensor1.json
+++ b/tests/components/vicare/fixtures/RoomSensor1.json
@@ -51,6 +51,24 @@
       "timestamp": "2024-03-01T04:40:59.911Z",
       "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/zigbee-d87a3bfffe5d844a/features/device.name"
     },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "zigbee-d87a3bfffe5d844a",
+      "feature": "device.power.battery",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "level": {
+          "type": "number",
+          "unit": "percent",
+          "value": 89
+        }
+      },
+      "timestamp": "2025-02-03T02:30:52.279Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/zigbee-d87a3bfffe5d844a/features/device.power.battery"
+    },
     {
       "apiVersion": 1,
       "commands": {},
diff --git a/tests/components/vicare/fixtures/VitoPure.json b/tests/components/vicare/fixtures/VitoPure.json
new file mode 100644
index 00000000000..1e1cdef97ec
--- /dev/null
+++ b/tests/components/vicare/fixtures/VitoPure.json
@@ -0,0 +1,645 @@
+{
+  "data": [
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "ventilation",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": true
+        }
+      },
+      "timestamp": "2024-12-17T07:50:28.062Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "ventilation.levels.levelFour",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2024-12-17T08:16:15.525Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.levels.levelFour"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "ventilation.levels.levelOne",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2024-12-17T08:16:15.525Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.levels.levelOne"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "ventilation.levels.levelThree",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2024-12-17T08:16:15.525Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.levels.levelThree"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "ventilation.levels.levelTwo",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2024-12-17T08:16:15.525Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.levels.levelTwo"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "ventilation.operating.modes.filterChange",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        }
+      },
+      "timestamp": "2024-12-17T07:50:28.062Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.operating.modes.filterChange"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "setLevel": {
+          "isExecutable": true,
+          "name": "setLevel",
+          "params": {
+            "level": {
+              "constraints": {
+                "enum": ["levelOne", "levelTwo", "levelThree", "levelFour"]
+              },
+              "required": true,
+              "type": "string"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.operating.modes.permanent/commands/setLevel"
+        }
+      },
+      "deviceId": "0",
+      "feature": "ventilation.operating.modes.permanent",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        }
+      },
+      "timestamp": "2024-12-17T13:24:03.411Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.operating.modes.permanent"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "ventilation.operating.modes.sensorDriven",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": true
+        }
+      },
+      "timestamp": "2024-12-17T08:16:15.525Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.operating.modes.sensorDriven"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "ventilation.operating.modes.ventilation",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        }
+      },
+      "timestamp": "2024-12-17T07:50:28.062Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.operating.modes.ventilation"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "ventilation.operating.programs.active",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "value": {
+          "type": "string",
+          "value": "levelTwo"
+        }
+      },
+      "timestamp": "2024-12-17T13:24:03.411Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.operating.programs.active"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "activate": {
+          "isExecutable": true,
+          "name": "activate",
+          "params": {
+            "timeout": {
+              "constraints": {
+                "max": 1440,
+                "min": 1,
+                "stepping": 1
+              },
+              "required": false,
+              "type": "number"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.forcedLevelFour/commands/activate"
+        },
+        "deactivate": {
+          "isExecutable": true,
+          "name": "deactivate",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.forcedLevelFour/commands/deactivate"
+        },
+        "setDefaultRuntime": {
+          "isExecutable": true,
+          "name": "setDefaultRuntime",
+          "params": {
+            "defaultRuntime": {
+              "constraints": {
+                "max": 1440,
+                "min": 1,
+                "stepping": 1
+              },
+              "required": true,
+              "type": "number"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.forcedLevelFour/commands/setDefaultRuntime"
+        },
+        "setTimeout": {
+          "isExecutable": true,
+          "name": "setTimeout",
+          "params": {
+            "timeout": {
+              "constraints": {
+                "max": 1440,
+                "min": 1,
+                "stepping": 1
+              },
+              "required": true,
+              "type": "number"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.forcedLevelFour/commands/setTimeout"
+        }
+      },
+      "deviceId": "0",
+      "feature": "ventilation.quickmodes.forcedLevelFour",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        },
+        "defaultRuntime": {
+          "type": "number",
+          "unit": "minutes",
+          "value": 30
+        },
+        "isActiveWritable": {
+          "type": "boolean",
+          "value": true
+        }
+      },
+      "timestamp": "2024-12-17T13:24:04.515Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.forcedLevelFour"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "activate": {
+          "isExecutable": true,
+          "name": "activate",
+          "params": {
+            "timeout": {
+              "constraints": {
+                "max": 1440,
+                "min": 1,
+                "stepping": 1
+              },
+              "required": false,
+              "type": "number"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.silent/commands/activate"
+        },
+        "deactivate": {
+          "isExecutable": true,
+          "name": "deactivate",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.silent/commands/deactivate"
+        },
+        "setDefaultRuntime": {
+          "isExecutable": true,
+          "name": "setDefaultRuntime",
+          "params": {
+            "defaultRuntime": {
+              "constraints": {
+                "max": 1440,
+                "min": 1,
+                "stepping": 1
+              },
+              "required": true,
+              "type": "number"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.silent/commands/setDefaultRuntime"
+        },
+        "setTimeout": {
+          "isExecutable": true,
+          "name": "setTimeout",
+          "params": {
+            "timeout": {
+              "constraints": {
+                "max": 1440,
+                "min": 1,
+                "stepping": 1
+              },
+              "required": true,
+              "type": "number"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.silent/commands/setTimeout"
+        }
+      },
+      "deviceId": "0",
+      "feature": "ventilation.quickmodes.silent",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        },
+        "defaultRuntime": {
+          "type": "number",
+          "unit": "minutes",
+          "value": 30
+        },
+        "isActiveWritable": {
+          "type": "boolean",
+          "value": true
+        }
+      },
+      "timestamp": "2024-12-17T13:24:04.515Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.silent"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "activate": {
+          "isExecutable": true,
+          "name": "activate",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.standby/commands/activate"
+        },
+        "deactivate": {
+          "isExecutable": true,
+          "name": "deactivate",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.standby/commands/deactivate"
+        }
+      },
+      "deviceId": "0",
+      "feature": "ventilation.quickmodes.standby",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": true
+        }
+      },
+      "timestamp": "2024-12-17T13:24:04.515Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.standby"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "device.productIdentification",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "product": {
+          "type": "object",
+          "value": {
+            "busAddress": 0,
+            "busType": "OwnBus",
+            "productFamily": "B_00059_VP300",
+            "viessmannIdentificationNumber": "################"
+          }
+        }
+      },
+      "timestamp": "2024-12-17T07:50:28.062Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/device.productIdentification"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "device.messages.errors.raw",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "entries": {
+          "type": "array",
+          "value": []
+        }
+      },
+      "timestamp": "2024-12-17T07:50:28.062Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/device.messages.errors.raw"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "activate": {
+          "isExecutable": true,
+          "name": "activate",
+          "params": {
+            "begin": {
+              "constraints": {
+                "regEx": "^[\\d]{2}-[\\d]{2}$"
+              },
+              "required": true,
+              "type": "string"
+            },
+            "end": {
+              "constraints": {
+                "regEx": "^[\\d]{2}-[\\d]{2}$"
+              },
+              "required": true,
+              "type": "string"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/device.time.daylightSaving/commands/activate"
+        },
+        "deactivate": {
+          "isExecutable": true,
+          "name": "deactivate",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/device.time.daylightSaving/commands/deactivate"
+        }
+      },
+      "deviceId": "0",
+      "feature": "device.time.daylightSaving",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        }
+      },
+      "timestamp": "2024-12-17T07:50:28.062Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/device.time.daylightSaving"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.boiler.serial",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "value": {
+          "type": "string",
+          "value": "################"
+        }
+      },
+      "timestamp": "2024-12-17T07:50:28.062Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.boiler.serial"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.device.variant",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "value": {
+          "type": "string",
+          "value": "Vitopure350"
+        }
+      },
+      "timestamp": "2024-12-17T07:50:28.062Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.device.variant"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "setMode": {
+          "isExecutable": true,
+          "name": "setMode",
+          "params": {
+            "mode": {
+              "constraints": {
+                "enum": ["permanent", "ventilation", "sensorDriven"]
+              },
+              "required": true,
+              "type": "string"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.operating.modes.active/commands/setMode"
+        },
+        "setModeContinuousSensorOverride": {
+          "isExecutable": false,
+          "name": "setModeContinuousSensorOverride",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.operating.modes.active/commands/setModeContinuousSensorOverride"
+        }
+      },
+      "deviceId": "0",
+      "feature": "ventilation.operating.modes.active",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "value": {
+          "type": "string",
+          "value": "sensorDriven"
+        }
+      },
+      "timestamp": "2024-12-17T08:16:15.525Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.operating.modes.active"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "ventilation.operating.state",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "demand": {
+          "type": "string",
+          "value": "unknown"
+        },
+        "level": {
+          "type": "string",
+          "value": "unknown"
+        },
+        "reason": {
+          "type": "string",
+          "value": "standby"
+        }
+      },
+      "timestamp": "2024-12-17T13:24:04.515Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.operating.state"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "resetSchedule": {
+          "isExecutable": false,
+          "name": "resetSchedule",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.schedule/commands/resetSchedule"
+        },
+        "setSchedule": {
+          "isExecutable": true,
+          "name": "setSchedule",
+          "params": {
+            "newSchedule": {
+              "constraints": {
+                "defaultMode": "standby",
+                "maxEntries": 4,
+                "modes": ["levelOne", "levelTwo", "levelThree", "levelFour"],
+                "overlapAllowed": false,
+                "resolution": 10
+              },
+              "required": true,
+              "type": "Schedule"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.schedule/commands/setSchedule"
+        }
+      },
+      "deviceId": "0",
+      "feature": "ventilation.schedule",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": true
+        },
+        "entries": {
+          "type": "Schedule",
+          "value": {
+            "fri": [
+              {
+                "end": "22:00",
+                "mode": "levelTwo",
+                "position": 0,
+                "start": "06:00"
+              }
+            ],
+            "mon": [
+              {
+                "end": "22:00",
+                "mode": "levelTwo",
+                "position": 0,
+                "start": "06:00"
+              }
+            ],
+            "sat": [
+              {
+                "end": "22:00",
+                "mode": "levelTwo",
+                "position": 0,
+                "start": "06:00"
+              }
+            ],
+            "sun": [
+              {
+                "end": "22:00",
+                "mode": "levelTwo",
+                "position": 0,
+                "start": "06:00"
+              }
+            ],
+            "thu": [
+              {
+                "end": "22:00",
+                "mode": "levelTwo",
+                "position": 0,
+                "start": "06:00"
+              }
+            ],
+            "tue": [
+              {
+                "end": "22:00",
+                "mode": "levelTwo",
+                "position": 0,
+                "start": "06:00"
+              }
+            ],
+            "wed": [
+              {
+                "end": "22:00",
+                "mode": "levelTwo",
+                "position": 0,
+                "start": "06:00"
+              }
+            ]
+          }
+        }
+      },
+      "timestamp": "2024-12-17T07:50:28.062Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.schedule"
+    }
+  ]
+}
diff --git a/tests/components/vicare/fixtures/Vitocal222G_Vitovent300W.json b/tests/components/vicare/fixtures/Vitocal222G_Vitovent300W.json
new file mode 100644
index 00000000000..a733d33a12a
--- /dev/null
+++ b/tests/components/vicare/fixtures/Vitocal222G_Vitovent300W.json
@@ -0,0 +1,3019 @@
+{
+  "data": [
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "device.messages.errors.raw",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "entries": {
+          "type": "array",
+          "value": []
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/device.messages.errors.raw"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "device.serial",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "value": {
+          "type": "string",
+          "value": "################"
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/device.serial"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.boiler.sensors.temperature.commonSupply",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "notConnected"
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.boiler.sensors.temperature.commonSupply"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.boiler.serial",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "value": {
+          "type": "string",
+          "value": "################"
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.boiler.serial"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deprecated": {
+        "info": "replaced by heating.bufferCylinder.sensors.temperature.main",
+        "removalDate": "2024-09-15"
+      },
+      "deviceId": "0",
+      "feature": "heating.buffer.sensors.temperature.main",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "notConnected"
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.buffer.sensors.temperature.main"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deprecated": {
+        "info": "replaced by heating.bufferCylinder.sensors.temperature.top",
+        "removalDate": "2024-09-15"
+      },
+      "deviceId": "0",
+      "feature": "heating.buffer.sensors.temperature.top",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "notConnected"
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.buffer.sensors.temperature.top"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.bufferCylinder.sensors.temperature.main",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "notConnected"
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.bufferCylinder.sensors.temperature.main"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.bufferCylinder.sensors.temperature.top",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "notConnected"
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.bufferCylinder.sensors.temperature.top"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "enabled": {
+          "type": "array",
+          "value": ["0"]
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.0.circulation.pump",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "on"
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.circulation.pump"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.circulation.pump",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.circulation.pump"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.circulation.pump",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.circulation.pump"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.0.frostprotection",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "on"
+        }
+      },
+      "timestamp": "2025-02-11T20:58:18.395Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.frostprotection"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.frostprotection",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.frostprotection"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.frostprotection",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.frostprotection"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "setCurve": {
+          "isExecutable": true,
+          "name": "setCurve",
+          "params": {
+            "shift": {
+              "constraints": {
+                "max": 40,
+                "min": -15,
+                "stepping": 1
+              },
+              "required": true,
+              "type": "number"
+            },
+            "slope": {
+              "constraints": {
+                "max": 3.5,
+                "min": 0,
+                "stepping": 0.1
+              },
+              "required": true,
+              "type": "number"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.heating.curve/commands/setCurve"
+        }
+      },
+      "deviceId": "0",
+      "feature": "heating.circuits.0.heating.curve",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "shift": {
+          "type": "number",
+          "unit": "",
+          "value": 0
+        },
+        "slope": {
+          "type": "number",
+          "unit": "",
+          "value": 0.4
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.heating.curve"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.heating.curve",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.heating.curve"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.heating.curve",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.heating.curve"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "resetSchedule": {
+          "isExecutable": false,
+          "name": "resetSchedule",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.heating.schedule/commands/resetSchedule"
+        },
+        "setSchedule": {
+          "isExecutable": true,
+          "name": "setSchedule",
+          "params": {
+            "newSchedule": {
+              "constraints": {
+                "defaultMode": "standby",
+                "maxEntries": 8,
+                "modes": ["reduced", "normal", "fixed"],
+                "overlapAllowed": true,
+                "resolution": 10
+              },
+              "required": true,
+              "type": "Schedule"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.heating.schedule/commands/setSchedule"
+        }
+      },
+      "deviceId": "0",
+      "feature": "heating.circuits.0.heating.schedule",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": true
+        },
+        "entries": {
+          "type": "Schedule",
+          "value": {
+            "fri": [
+              {
+                "end": "24:00",
+                "mode": "normal",
+                "position": 0,
+                "start": "00:00"
+              }
+            ],
+            "mon": [
+              {
+                "end": "24:00",
+                "mode": "normal",
+                "position": 0,
+                "start": "00:00"
+              }
+            ],
+            "sat": [
+              {
+                "end": "24:00",
+                "mode": "normal",
+                "position": 0,
+                "start": "00:00"
+              }
+            ],
+            "sun": [
+              {
+                "end": "24:00",
+                "mode": "normal",
+                "position": 0,
+                "start": "00:00"
+              }
+            ],
+            "thu": [
+              {
+                "end": "24:00",
+                "mode": "normal",
+                "position": 0,
+                "start": "00:00"
+              }
+            ],
+            "tue": [
+              {
+                "end": "24:00",
+                "mode": "normal",
+                "position": 0,
+                "start": "00:00"
+              }
+            ],
+            "wed": [
+              {
+                "end": "24:00",
+                "mode": "normal",
+                "position": 0,
+                "start": "00:00"
+              }
+            ]
+          }
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.heating.schedule"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.heating.schedule",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.heating.schedule"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.heating.schedule",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.heating.schedule"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "setMode": {
+          "isExecutable": true,
+          "name": "setMode",
+          "params": {
+            "mode": {
+              "constraints": {
+                "enum": ["dhw", "dhwAndHeating", "standby"]
+              },
+              "required": true,
+              "type": "string"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.modes.active/commands/setMode"
+        }
+      },
+      "deviceId": "0",
+      "feature": "heating.circuits.0.operating.modes.active",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "value": {
+          "type": "string",
+          "value": "dhwAndHeating"
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.modes.active"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.operating.modes.active",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.operating.modes.active"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.operating.modes.active",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.operating.modes.active"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.0.operating.modes.cooling",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.modes.cooling"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.operating.modes.cooling",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.operating.modes.cooling"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.operating.modes.cooling",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.operating.modes.cooling"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.0.operating.modes.dhw",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.modes.dhw"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.operating.modes.dhw",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.operating.modes.dhw"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.operating.modes.dhw",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.operating.modes.dhw"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.0.operating.modes.dhwAndHeating",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": true
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.modes.dhwAndHeating"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.operating.modes.dhwAndHeating",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.operating.modes.dhwAndHeating"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.operating.modes.dhwAndHeating",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.operating.modes.dhwAndHeating"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.0.operating.modes.dhwAndHeatingCooling",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.modes.dhwAndHeatingCooling"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.operating.modes.dhwAndHeatingCooling",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.operating.modes.dhwAndHeatingCooling"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.operating.modes.dhwAndHeatingCooling",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.operating.modes.dhwAndHeatingCooling"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.0.operating.modes.forcedNormal",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.modes.forcedNormal"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.operating.modes.forcedNormal",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.operating.modes.forcedNormal"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.operating.modes.forcedNormal",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.operating.modes.forcedNormal"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.0.operating.modes.forcedReduced",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.modes.forcedReduced"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.operating.modes.forcedReduced",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.operating.modes.forcedReduced"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.operating.modes.forcedReduced",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.operating.modes.forcedReduced"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.0.operating.modes.heating",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.modes.heating"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.operating.modes.heating",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.operating.modes.heating"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.operating.modes.heating",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.operating.modes.heating"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.0.operating.modes.heatingCooling",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.modes.heatingCooling"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.operating.modes.heatingCooling",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.operating.modes.heatingCooling"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.operating.modes.heatingCooling",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.operating.modes.heatingCooling"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.0.operating.modes.normalStandby",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.modes.normalStandby"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.operating.modes.normalStandby",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.operating.modes.normalStandby"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.operating.modes.normalStandby",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.operating.modes.normalStandby"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.0.operating.modes.standby",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.modes.standby"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.operating.modes.standby",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.operating.modes.standby"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.operating.modes.standby",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.operating.modes.standby"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.0.operating.programs.active",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "value": {
+          "type": "string",
+          "value": "normal"
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.programs.active"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.operating.programs.active",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.operating.programs.active"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.operating.programs.active",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.operating.programs.active"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "activate": {
+          "isExecutable": true,
+          "name": "activate",
+          "params": {
+            "temperature": {
+              "constraints": {
+                "max": 30,
+                "min": 10,
+                "stepping": 1
+              },
+              "required": false,
+              "type": "number"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.programs.comfort/commands/activate"
+        },
+        "deactivate": {
+          "isExecutable": true,
+          "name": "deactivate",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.programs.comfort/commands/deactivate"
+        },
+        "setTemperature": {
+          "isExecutable": true,
+          "name": "setTemperature",
+          "params": {
+            "targetTemperature": {
+              "constraints": {
+                "max": 30,
+                "min": 10,
+                "stepping": 1
+              },
+              "required": true,
+              "type": "number"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.programs.comfort/commands/setTemperature"
+        }
+      },
+      "deviceId": "0",
+      "feature": "heating.circuits.0.operating.programs.comfort",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        },
+        "demand": {
+          "type": "string",
+          "value": "unknown"
+        },
+        "temperature": {
+          "type": "number",
+          "unit": "celsius",
+          "value": 20
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.programs.comfort"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.operating.programs.comfort",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.operating.programs.comfort"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.operating.programs.comfort",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.operating.programs.comfort"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "activate": {
+          "isExecutable": true,
+          "name": "activate",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.programs.eco/commands/activate"
+        },
+        "deactivate": {
+          "isExecutable": true,
+          "name": "deactivate",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.programs.eco/commands/deactivate"
+        }
+      },
+      "deviceId": "0",
+      "feature": "heating.circuits.0.operating.programs.eco",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        },
+        "temperature": {
+          "type": "number",
+          "unit": "celsius",
+          "value": 22
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.programs.eco"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.operating.programs.eco",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.operating.programs.eco"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.operating.programs.eco",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.operating.programs.eco"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.0.operating.programs.fixed",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.programs.fixed"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.operating.programs.fixed",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.operating.programs.fixed"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.operating.programs.fixed",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.operating.programs.fixed"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "setTemperature": {
+          "isExecutable": true,
+          "name": "setTemperature",
+          "params": {
+            "targetTemperature": {
+              "constraints": {
+                "max": 30,
+                "min": 10,
+                "stepping": 1
+              },
+              "required": true,
+              "type": "number"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.programs.normal/commands/setTemperature"
+        }
+      },
+      "deviceId": "0",
+      "feature": "heating.circuits.0.operating.programs.normal",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": true
+        },
+        "demand": {
+          "type": "string",
+          "value": "unknown"
+        },
+        "temperature": {
+          "type": "number",
+          "unit": "celsius",
+          "value": 22
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.programs.normal"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.operating.programs.normal",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.operating.programs.normal"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.operating.programs.normal",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.operating.programs.normal"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "setTemperature": {
+          "isExecutable": true,
+          "name": "setTemperature",
+          "params": {
+            "targetTemperature": {
+              "constraints": {
+                "max": 30,
+                "min": 10,
+                "stepping": 1
+              },
+              "required": true,
+              "type": "number"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.programs.reduced/commands/setTemperature"
+        }
+      },
+      "deviceId": "0",
+      "feature": "heating.circuits.0.operating.programs.reduced",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        },
+        "demand": {
+          "type": "string",
+          "value": "unknown"
+        },
+        "temperature": {
+          "type": "number",
+          "unit": "celsius",
+          "value": 20
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.programs.reduced"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.operating.programs.reduced",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.operating.programs.reduced"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.operating.programs.reduced",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.operating.programs.reduced"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.0.operating.programs.standby",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.operating.programs.standby"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.operating.programs.standby",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.operating.programs.standby"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.operating.programs.standby",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.operating.programs.standby"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.0.sensors.temperature.room",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.sensors.temperature.room"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.sensors.temperature.room",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.sensors.temperature.room"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.sensors.temperature.room",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.sensors.temperature.room"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.0.sensors.temperature.supply",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "connected"
+        },
+        "value": {
+          "type": "number",
+          "unit": "celsius",
+          "value": 26.3
+        }
+      },
+      "timestamp": "2025-02-11T20:49:01.456Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.sensors.temperature.supply"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.sensors.temperature.supply",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.sensors.temperature.supply"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.sensors.temperature.supply",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.sensors.temperature.supply"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.0.temperature",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "value": {
+          "type": "number",
+          "unit": "celsius",
+          "value": 33.2
+        }
+      },
+      "timestamp": "2025-02-11T19:48:05.380Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.temperature"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.temperature",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.temperature"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.temperature",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.temperature"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "setLevels": {
+          "isExecutable": true,
+          "name": "setLevels",
+          "params": {
+            "maxTemperature": {
+              "constraints": {
+                "max": 70,
+                "min": 10,
+                "stepping": 1
+              },
+              "required": true,
+              "type": "number"
+            },
+            "minTemperature": {
+              "constraints": {
+                "max": 30,
+                "min": 1,
+                "stepping": 1
+              },
+              "required": true,
+              "type": "number"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.temperature.levels/commands/setLevels"
+        },
+        "setMax": {
+          "isExecutable": true,
+          "name": "setMax",
+          "params": {
+            "temperature": {
+              "constraints": {
+                "max": 70,
+                "min": 10,
+                "stepping": 1
+              },
+              "required": true,
+              "type": "number"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.temperature.levels/commands/setMax"
+        },
+        "setMin": {
+          "isExecutable": true,
+          "name": "setMin",
+          "params": {
+            "temperature": {
+              "constraints": {
+                "max": 30,
+                "min": 1,
+                "stepping": 1
+              },
+              "required": true,
+              "type": "number"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.temperature.levels/commands/setMin"
+        }
+      },
+      "deviceId": "0",
+      "feature": "heating.circuits.0.temperature.levels",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "max": {
+          "type": "number",
+          "unit": "celsius",
+          "value": 44
+        },
+        "min": {
+          "type": "number",
+          "unit": "celsius",
+          "value": 15
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.temperature.levels"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1.temperature.levels",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.temperature.levels"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2.temperature.levels",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.temperature.levels"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "setName": {
+          "isExecutable": true,
+          "name": "setName",
+          "params": {
+            "name": {
+              "constraints": {
+                "maxLength": 20,
+                "minLength": 1
+              },
+              "required": true,
+              "type": "string"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0/commands/setName"
+        }
+      },
+      "deviceId": "0",
+      "feature": "heating.circuits.0",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": true
+        },
+        "name": {
+          "type": "string",
+          "value": ""
+        },
+        "type": {
+          "type": "string",
+          "value": "heatingCircuit"
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.1",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.circuits.2",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.compressors",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "enabled": {
+          "type": "array",
+          "value": ["0"]
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.compressors"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.compressors.0.statistics",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "hours": {
+          "type": "number",
+          "unit": "hour",
+          "value": 4332.4
+        },
+        "starts": {
+          "type": "number",
+          "unit": "",
+          "value": 21314
+        }
+      },
+      "timestamp": "2025-02-11T20:34:55.482Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.compressors.0.statistics"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.compressors.1.statistics",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.compressors.1.statistics"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.compressors.0",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        },
+        "phase": {
+          "type": "string",
+          "value": "off"
+        }
+      },
+      "timestamp": "2025-02-11T20:45:56.068Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.compressors.0"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.compressors.1",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.compressors.1"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.controller.serial",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "value": {
+          "type": "string",
+          "value": "################"
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.controller.serial"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.dhw",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": true
+        },
+        "status": {
+          "type": "string",
+          "value": "on"
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.dhw.charging",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        }
+      },
+      "timestamp": "2025-02-11T19:42:36.300Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.charging"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "activate": {
+          "isExecutable": true,
+          "name": "activate",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.oneTimeCharge/commands/activate"
+        },
+        "deactivate": {
+          "isExecutable": true,
+          "name": "deactivate",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.oneTimeCharge/commands/deactivate"
+        }
+      },
+      "deviceId": "0",
+      "feature": "heating.dhw.oneTimeCharge",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.oneTimeCharge"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.dhw.pumps.circulation",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "on"
+        }
+      },
+      "timestamp": "2025-02-11T19:42:36.300Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.pumps.circulation"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "resetSchedule": {
+          "isExecutable": false,
+          "name": "resetSchedule",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.pumps.circulation.schedule/commands/resetSchedule"
+        },
+        "setSchedule": {
+          "isExecutable": true,
+          "name": "setSchedule",
+          "params": {
+            "newSchedule": {
+              "constraints": {
+                "defaultMode": "off",
+                "maxEntries": 8,
+                "modes": ["5/25-cycles", "5/10-cycles", "on"],
+                "overlapAllowed": true,
+                "resolution": 10
+              },
+              "required": true,
+              "type": "Schedule"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.pumps.circulation.schedule/commands/setSchedule"
+        }
+      },
+      "deviceId": "0",
+      "feature": "heating.dhw.pumps.circulation.schedule",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": true
+        },
+        "entries": {
+          "type": "Schedule",
+          "value": {
+            "fri": [
+              {
+                "end": "22:00",
+                "mode": "on",
+                "position": 0,
+                "start": "06:50"
+              }
+            ],
+            "mon": [
+              {
+                "end": "22:00",
+                "mode": "on",
+                "position": 0,
+                "start": "06:50"
+              }
+            ],
+            "sat": [
+              {
+                "end": "22:00",
+                "mode": "on",
+                "position": 0,
+                "start": "07:30"
+              }
+            ],
+            "sun": [
+              {
+                "end": "22:00",
+                "mode": "on",
+                "position": 0,
+                "start": "07:30"
+              }
+            ],
+            "thu": [
+              {
+                "end": "22:00",
+                "mode": "on",
+                "position": 0,
+                "start": "06:50"
+              }
+            ],
+            "tue": [
+              {
+                "end": "22:00",
+                "mode": "on",
+                "position": 0,
+                "start": "06:50"
+              }
+            ],
+            "wed": [
+              {
+                "end": "22:00",
+                "mode": "on",
+                "position": 0,
+                "start": "06:50"
+              }
+            ]
+          }
+        }
+      },
+      "timestamp": "2025-02-11T17:50:12.565Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.pumps.circulation.schedule"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.dhw.pumps.primary",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.pumps.primary"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "resetSchedule": {
+          "isExecutable": false,
+          "name": "resetSchedule",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.schedule/commands/resetSchedule"
+        },
+        "setSchedule": {
+          "isExecutable": true,
+          "name": "setSchedule",
+          "params": {
+            "newSchedule": {
+              "constraints": {
+                "defaultMode": "off",
+                "maxEntries": 8,
+                "modes": ["top", "normal", "temp-2"],
+                "overlapAllowed": true,
+                "resolution": 10
+              },
+              "required": true,
+              "type": "Schedule"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.schedule/commands/setSchedule"
+        }
+      },
+      "deviceId": "0",
+      "feature": "heating.dhw.schedule",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": true
+        },
+        "entries": {
+          "type": "Schedule",
+          "value": {
+            "fri": [
+              {
+                "end": "22:00",
+                "mode": "normal",
+                "position": 0,
+                "start": "06:00"
+              }
+            ],
+            "mon": [
+              {
+                "end": "22:00",
+                "mode": "normal",
+                "position": 0,
+                "start": "06:00"
+              }
+            ],
+            "sat": [
+              {
+                "end": "22:00",
+                "mode": "normal",
+                "position": 0,
+                "start": "06:00"
+              }
+            ],
+            "sun": [
+              {
+                "end": "22:00",
+                "mode": "normal",
+                "position": 0,
+                "start": "06:00"
+              }
+            ],
+            "thu": [
+              {
+                "end": "22:00",
+                "mode": "normal",
+                "position": 0,
+                "start": "06:00"
+              }
+            ],
+            "tue": [
+              {
+                "end": "22:00",
+                "mode": "normal",
+                "position": 0,
+                "start": "06:00"
+              }
+            ],
+            "wed": [
+              {
+                "end": "22:00",
+                "mode": "normal",
+                "position": 0,
+                "start": "06:00"
+              }
+            ]
+          }
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.schedule"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.dhw.sensors.temperature.dhwCylinder",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "connected"
+        },
+        "value": {
+          "type": "number",
+          "unit": "celsius",
+          "value": 47.9
+        }
+      },
+      "timestamp": "2025-02-11T20:39:18.305Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.sensors.temperature.dhwCylinder"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.dhw.sensors.temperature.dhwCylinder.bottom",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "notConnected"
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.sensors.temperature.dhwCylinder.bottom"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.dhw.sensors.temperature.dhwCylinder.top",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "connected"
+        },
+        "value": {
+          "type": "number",
+          "unit": "celsius",
+          "value": 47.9
+        }
+      },
+      "timestamp": "2025-02-11T20:39:18.305Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.sensors.temperature.dhwCylinder.top"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deprecated": {
+        "info": "replaced by heating.dhw.sensors.temperature.dhwCylinder",
+        "removalDate": "2024-09-15"
+      },
+      "deviceId": "0",
+      "feature": "heating.dhw.sensors.temperature.hotWaterStorage",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "connected"
+        },
+        "value": {
+          "type": "number",
+          "unit": "celsius",
+          "value": 47.9
+        }
+      },
+      "timestamp": "2025-02-11T20:39:18.305Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.sensors.temperature.hotWaterStorage"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deprecated": {
+        "info": "replaced by heating.dhw.sensors.temperature.dhwCylinder.bottom",
+        "removalDate": "2024-09-15"
+      },
+      "deviceId": "0",
+      "feature": "heating.dhw.sensors.temperature.hotWaterStorage.bottom",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "notConnected"
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.sensors.temperature.hotWaterStorage.bottom"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deprecated": {
+        "info": "replaced by heating.dhw.sensors.temperature.dhwCylinder.top",
+        "removalDate": "2024-09-15"
+      },
+      "deviceId": "0",
+      "feature": "heating.dhw.sensors.temperature.hotWaterStorage.top",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "connected"
+        },
+        "value": {
+          "type": "number",
+          "unit": "celsius",
+          "value": 47.9
+        }
+      },
+      "timestamp": "2025-02-11T20:39:18.305Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.sensors.temperature.hotWaterStorage.top"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.dhw.sensors.temperature.outlet",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "notConnected"
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.sensors.temperature.outlet"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "setHysteresis": {
+          "isExecutable": true,
+          "name": "setHysteresis",
+          "params": {
+            "hysteresis": {
+              "constraints": {
+                "max": 10,
+                "min": 1,
+                "stepping": 0.5
+              },
+              "required": true,
+              "type": "number"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.temperature.hysteresis/commands/setHysteresis"
+        },
+        "setHysteresisSwitchOffValue": {
+          "isExecutable": false,
+          "name": "setHysteresisSwitchOffValue",
+          "params": {
+            "hysteresis": {
+              "constraints": {
+                "max": 10,
+                "min": 1,
+                "stepping": 0.5
+              },
+              "required": true,
+              "type": "number"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.temperature.hysteresis/commands/setHysteresisSwitchOffValue"
+        },
+        "setHysteresisSwitchOnValue": {
+          "isExecutable": true,
+          "name": "setHysteresisSwitchOnValue",
+          "params": {
+            "hysteresis": {
+              "constraints": {
+                "max": 10,
+                "min": 1,
+                "stepping": 0.5
+              },
+              "required": true,
+              "type": "number"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.temperature.hysteresis/commands/setHysteresisSwitchOnValue"
+        }
+      },
+      "deviceId": "0",
+      "feature": "heating.dhw.temperature.hysteresis",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "switchOffValue": {
+          "type": "number",
+          "unit": "kelvin",
+          "value": 5
+        },
+        "switchOnValue": {
+          "type": "number",
+          "unit": "kelvin",
+          "value": 5
+        },
+        "value": {
+          "type": "number",
+          "unit": "kelvin",
+          "value": 5
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.temperature.hysteresis"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "setTargetTemperature": {
+          "isExecutable": true,
+          "name": "setTargetTemperature",
+          "params": {
+            "temperature": {
+              "constraints": {
+                "efficientLowerBorder": 10,
+                "efficientUpperBorder": 60,
+                "max": 60,
+                "min": 10,
+                "stepping": 1
+              },
+              "required": true,
+              "type": "number"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.temperature.main/commands/setTargetTemperature"
+        }
+      },
+      "deviceId": "0",
+      "feature": "heating.dhw.temperature.main",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "value": {
+          "type": "number",
+          "unit": "celsius",
+          "value": 50
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.temperature.main"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "setTargetTemperature": {
+          "isExecutable": true,
+          "name": "setTargetTemperature",
+          "params": {
+            "temperature": {
+              "constraints": {
+                "max": 60,
+                "min": 10,
+                "stepping": 1
+              },
+              "required": true,
+              "type": "number"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.temperature.temp2/commands/setTargetTemperature"
+        }
+      },
+      "deviceId": "0",
+      "feature": "heating.dhw.temperature.temp2",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "value": {
+          "type": "number",
+          "unit": "celsius",
+          "value": 60
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.dhw.temperature.temp2"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "changeEndDate": {
+          "isExecutable": false,
+          "name": "changeEndDate",
+          "params": {
+            "end": {
+              "constraints": {
+                "regEx": "^[\\d]{4}-[\\d]{2}-[\\d]{2}$",
+                "sameDayAllowed": false
+              },
+              "required": true,
+              "type": "string"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.operating.programs.holiday/commands/changeEndDate"
+        },
+        "schedule": {
+          "isExecutable": true,
+          "name": "schedule",
+          "params": {
+            "end": {
+              "constraints": {
+                "regEx": "^[\\d]{4}-[\\d]{2}-[\\d]{2}$",
+                "sameDayAllowed": false
+              },
+              "required": true,
+              "type": "string"
+            },
+            "start": {
+              "constraints": {
+                "regEx": "^[\\d]{4}-[\\d]{2}-[\\d]{2}$"
+              },
+              "required": true,
+              "type": "string"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.operating.programs.holiday/commands/schedule"
+        },
+        "unschedule": {
+          "isExecutable": true,
+          "name": "unschedule",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.operating.programs.holiday/commands/unschedule"
+        }
+      },
+      "deviceId": "0",
+      "feature": "heating.operating.programs.holiday",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        },
+        "end": {
+          "type": "string",
+          "value": ""
+        },
+        "start": {
+          "type": "string",
+          "value": ""
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.operating.programs.holiday"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.primaryCircuit.sensors.temperature.return",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "connected"
+        },
+        "value": {
+          "type": "number",
+          "unit": "celsius",
+          "value": 6.9
+        }
+      },
+      "timestamp": "2025-02-11T20:58:31.054Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.primaryCircuit.sensors.temperature.return"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.primaryCircuit.sensors.temperature.supply",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "connected"
+        },
+        "value": {
+          "type": "number",
+          "unit": "celsius",
+          "value": 5.2
+        }
+      },
+      "timestamp": "2025-02-11T20:48:38.307Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.primaryCircuit.sensors.temperature.supply"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.secondaryCircuit.sensors.temperature.supply",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "connected"
+        },
+        "value": {
+          "type": "number",
+          "unit": "celsius",
+          "value": 26.9
+        }
+      },
+      "timestamp": "2025-02-11T20:46:37.502Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.secondaryCircuit.sensors.temperature.supply"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.sensors.temperature.outside",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "connected"
+        },
+        "value": {
+          "type": "number",
+          "unit": "celsius",
+          "value": 1.9
+        }
+      },
+      "timestamp": "2025-02-11T21:00:13.154Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.sensors.temperature.outside"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.sensors.temperature.return",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "status": {
+          "type": "string",
+          "value": "connected"
+        },
+        "value": {
+          "type": "number",
+          "unit": "celsius",
+          "value": 26.5
+        }
+      },
+      "timestamp": "2025-02-11T20:48:00.474Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.sensors.temperature.return"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.solar",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.solar"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.solar.power.cumulativeProduced",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.solar.power.cumulativeProduced"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.solar.power.production",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.solar.power.production"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.solar.pumps.circuit",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.solar.pumps.circuit"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.solar.sensors.temperature.collector",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.solar.sensors.temperature.collector"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "heating.solar.sensors.temperature.dhw",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.solar.sensors.temperature.dhw"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "ventilation",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": true
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "ventilation.levels.levelFour",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.levels.levelFour"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "ventilation.levels.levelOne",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.levels.levelOne"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "ventilation.levels.levelThree",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.levels.levelThree"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "ventilation.levels.levelTwo",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.levels.levelTwo"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "setMode": {
+          "isExecutable": true,
+          "name": "setMode",
+          "params": {
+            "mode": {
+              "constraints": {
+                "enum": ["standby", "standard", "ventilation"]
+              },
+              "required": true,
+              "type": "string"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.operating.modes.active/commands/setMode"
+        },
+        "setModeContinuousSensorOverride": {
+          "isExecutable": false,
+          "name": "setModeContinuousSensorOverride",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.operating.modes.active/commands/setModeContinuousSensorOverride"
+        }
+      },
+      "deviceId": "0",
+      "feature": "ventilation.operating.modes.active",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "value": {
+          "type": "string",
+          "value": "ventilation"
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.operating.modes.active"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "ventilation.operating.modes.standard",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.operating.modes.standard"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "ventilation.operating.modes.ventilation",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": true
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.operating.modes.ventilation"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "ventilation.operating.programs.active",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "value": {
+          "type": "string",
+          "value": "levelThree"
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.operating.programs.active"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "deviceId": "0",
+      "feature": "ventilation.operating.state",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "demand": {
+          "type": "string",
+          "value": "ventilation"
+        },
+        "level": {
+          "type": "string",
+          "value": "levelThree"
+        },
+        "reason": {
+          "type": "string",
+          "value": "schedule"
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.operating.state"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "activate": {
+          "isExecutable": true,
+          "name": "activate",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.comfort/commands/activate"
+        },
+        "deactivate": {
+          "isExecutable": true,
+          "name": "deactivate",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.comfort/commands/deactivate"
+        }
+      },
+      "deviceId": "0",
+      "feature": "ventilation.quickmodes.comfort",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.comfort"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "activate": {
+          "isExecutable": true,
+          "name": "activate",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.eco/commands/activate"
+        },
+        "deactivate": {
+          "isExecutable": true,
+          "name": "deactivate",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.eco/commands/deactivate"
+        }
+      },
+      "deviceId": "0",
+      "feature": "ventilation.quickmodes.eco",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.eco"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "changeEndDate": {
+          "isExecutable": false,
+          "name": "changeEndDate",
+          "params": {
+            "end": {
+              "constraints": {
+                "regEx": "^[\\d]{4}-[\\d]{2}-[\\d]{2}$",
+                "sameDayAllowed": false
+              },
+              "required": true,
+              "type": "string"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.holiday/commands/changeEndDate"
+        },
+        "schedule": {
+          "isExecutable": true,
+          "name": "schedule",
+          "params": {
+            "end": {
+              "constraints": {
+                "regEx": "^[\\d]{4}-[\\d]{2}-[\\d]{2}$",
+                "sameDayAllowed": false
+              },
+              "required": true,
+              "type": "string"
+            },
+            "start": {
+              "constraints": {
+                "regEx": "^[\\d]{4}-[\\d]{2}-[\\d]{2}$"
+              },
+              "required": true,
+              "type": "string"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.holiday/commands/schedule"
+        },
+        "unschedule": {
+          "isExecutable": true,
+          "name": "unschedule",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.holiday/commands/unschedule"
+        }
+      },
+      "deviceId": "0",
+      "feature": "ventilation.quickmodes.holiday",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": false
+        },
+        "end": {
+          "type": "string",
+          "value": ""
+        },
+        "start": {
+          "type": "string",
+          "value": ""
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.quickmodes.holiday"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "resetSchedule": {
+          "isExecutable": false,
+          "name": "resetSchedule",
+          "params": {},
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.schedule/commands/resetSchedule"
+        },
+        "setSchedule": {
+          "isExecutable": true,
+          "name": "setSchedule",
+          "params": {
+            "newSchedule": {
+              "constraints": {
+                "defaultMode": "levelOne",
+                "maxEntries": 8,
+                "modes": ["levelTwo", "levelThree", "levelFour"],
+                "overlapAllowed": true,
+                "resolution": 10
+              },
+              "required": true,
+              "type": "Schedule"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.schedule/commands/setSchedule"
+        }
+      },
+      "deviceId": "0",
+      "feature": "ventilation.schedule",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "active": {
+          "type": "boolean",
+          "value": true
+        },
+        "entries": {
+          "type": "Schedule",
+          "value": {
+            "fri": [
+              {
+                "end": "24:00",
+                "mode": "levelThree",
+                "position": 0,
+                "start": "00:00"
+              }
+            ],
+            "mon": [
+              {
+                "end": "24:00",
+                "mode": "levelThree",
+                "position": 0,
+                "start": "00:00"
+              }
+            ],
+            "sat": [
+              {
+                "end": "24:00",
+                "mode": "levelThree",
+                "position": 0,
+                "start": "00:00"
+              }
+            ],
+            "sun": [
+              {
+                "end": "24:00",
+                "mode": "levelThree",
+                "position": 0,
+                "start": "00:00"
+              }
+            ],
+            "thu": [
+              {
+                "end": "24:00",
+                "mode": "levelThree",
+                "position": 0,
+                "start": "00:00"
+              }
+            ],
+            "tue": [
+              {
+                "end": "24:00",
+                "mode": "levelThree",
+                "position": 0,
+                "start": "00:00"
+              }
+            ],
+            "wed": [
+              {
+                "end": "24:00",
+                "mode": "levelThree",
+                "position": 0,
+                "start": "00:00"
+              }
+            ]
+          }
+        }
+      },
+      "timestamp": "2025-02-10T14:01:48.216Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/ventilation.schedule"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {
+        "setName": {
+          "isExecutable": true,
+          "name": "setName",
+          "params": {
+            "name": {
+              "constraints": {
+                "maxLength": 20,
+                "minLength": 1
+              },
+              "required": true,
+              "type": "string"
+            }
+          },
+          "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.name/commands/setName"
+        }
+      },
+      "components": [],
+      "deviceId": "0",
+      "feature": "heating.circuits.0.name",
+      "gatewayId": "################",
+      "isEnabled": true,
+      "isReady": true,
+      "properties": {
+        "name": {
+          "type": "string",
+          "value": ""
+        }
+      },
+      "timestamp": "2025-01-12T22:36:28.706Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.0.name"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "components": [],
+      "deviceId": "0",
+      "feature": "heating.circuits.1.name",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2024-02-02T01:29:44.670Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.1.name"
+    },
+    {
+      "apiVersion": 1,
+      "commands": {},
+      "components": [],
+      "deviceId": "0",
+      "feature": "heating.circuits.2.name",
+      "gatewayId": "################",
+      "isEnabled": false,
+      "isReady": true,
+      "properties": {},
+      "timestamp": "2024-02-02T01:29:44.670Z",
+      "uri": "https://api.viessmann.com/iot/v1/features/installations/#######/gateways/################/devices/0/features/heating.circuits.2.name"
+    }
+  ]
+}
diff --git a/tests/components/vicare/snapshots/test_binary_sensor.ambr b/tests/components/vicare/snapshots/test_binary_sensor.ambr
index f3e4d4e1c84..93e407ea505 100644
--- a/tests/components/vicare/snapshots/test_binary_sensor.ambr
+++ b/tests/components/vicare/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -194,6 +198,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -241,6 +246,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -288,6 +294,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -334,6 +341,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -373,6 +381,54 @@
     'state': 'unavailable',
   })
 # ---
+# name: test_all_entities[binary_sensor.model0_one_time_charge-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': None,
+    'entity_id': 'binary_sensor.model0_one_time_charge',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.RUNNING: 'running'>,
+    'original_icon': None,
+    'original_name': 'One-time charge',
+    'platform': 'vicare',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'one_time_charge',
+    'unique_id': 'gateway0_deviceSerialVitodens300W-one_time_charge',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[binary_sensor.model0_one_time_charge-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'running',
+      'friendly_name': 'model0 One-time charge',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.model0_one_time_charge',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unavailable',
+  })
+# ---
 # name: test_binary_sensors[burner]
   StateSnapshot({
     'attributes': ReadOnlyDict({
diff --git a/tests/components/vicare/snapshots/test_button.ambr b/tests/components/vicare/snapshots/test_button.ambr
index 9fadc6a983f..17dfc29e96e 100644
--- a/tests/components/vicare/snapshots/test_button.ambr
+++ b/tests/components/vicare/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/vicare/snapshots/test_climate.ambr b/tests/components/vicare/snapshots/test_climate.ambr
index aea0ea879c2..e1709acea42 100644
--- a/tests/components/vicare/snapshots/test_climate.ambr
+++ b/tests/components/vicare/snapshots/test_climate.ambr
@@ -18,6 +18,7 @@
       'target_temp_step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -101,6 +102,7 @@
       'target_temp_step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/vicare/snapshots/test_diagnostics.ambr b/tests/components/vicare/snapshots/test_diagnostics.ambr
index ae9b05389c7..0b1dcef5a29 100644
--- a/tests/components/vicare/snapshots/test_diagnostics.ambr
+++ b/tests/components/vicare/snapshots/test_diagnostics.ambr
@@ -4731,6 +4731,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': 'ViCare',
       'version': 1,
diff --git a/tests/components/vicare/snapshots/test_fan.ambr b/tests/components/vicare/snapshots/test_fan.ambr
index 3ecc4277fd9..2c9e815f7bf 100644
--- a/tests/components/vicare/snapshots/test_fan.ambr
+++ b/tests/components/vicare/snapshots/test_fan.ambr
@@ -13,6 +13,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -60,6 +61,130 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'on',
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[fan.model1_ventilation-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'preset_modes': list([
+        <VentilationMode.PERMANENT: 'permanent'>,
+        <VentilationMode.VENTILATION: 'ventilation'>,
+        <VentilationMode.SENSOR_DRIVEN: 'sensor_driven'>,
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'fan',
+    'entity_category': None,
+    'entity_id': 'fan.model1_ventilation',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': 'mdi:fan-off',
+    'original_name': 'Ventilation',
+    'platform': 'vicare',
+    'previous_unique_id': None,
+    'supported_features': <FanEntityFeature: 25>,
+    'translation_key': 'ventilation',
+    'unique_id': 'gateway1_deviceId1-ventilation',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[fan.model1_ventilation-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'model1 Ventilation',
+      'icon': 'mdi:fan-off',
+      'percentage': 0,
+      'percentage_step': 25.0,
+      'preset_mode': None,
+      'preset_modes': list([
+        <VentilationMode.PERMANENT: 'permanent'>,
+        <VentilationMode.VENTILATION: 'ventilation'>,
+        <VentilationMode.SENSOR_DRIVEN: 'sensor_driven'>,
+      ]),
+      'supported_features': <FanEntityFeature: 25>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'fan.model1_ventilation',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_all_entities[fan.model2_ventilation-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'preset_modes': list([
+        <VentilationMode.VENTILATION: 'ventilation'>,
+        <VentilationMode.STANDBY: 'standby'>,
+        <VentilationMode.STANDARD: 'standard'>,
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'fan',
+    'entity_category': None,
+    'entity_id': 'fan.model2_ventilation',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': 'mdi:fan',
+    'original_name': 'Ventilation',
+    'platform': 'vicare',
+    'previous_unique_id': None,
+    'supported_features': <FanEntityFeature: 8>,
+    'translation_key': 'ventilation',
+    'unique_id': 'gateway2_################-ventilation',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[fan.model2_ventilation-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'model2 Ventilation',
+      'icon': 'mdi:fan',
+      'preset_mode': None,
+      'preset_modes': list([
+        <VentilationMode.VENTILATION: 'ventilation'>,
+        <VentilationMode.STANDBY: 'standby'>,
+        <VentilationMode.STANDARD: 'standard'>,
+      ]),
+      'supported_features': <FanEntityFeature: 8>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'fan.model2_ventilation',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
   })
 # ---
diff --git a/tests/components/vicare/snapshots/test_number.ambr b/tests/components/vicare/snapshots/test_number.ambr
index 5a030fc0213..b26d2d33590 100644
--- a/tests/components/vicare/snapshots/test_number.ambr
+++ b/tests/components/vicare/snapshots/test_number.ambr
@@ -11,6 +11,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -68,6 +69,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -113,6 +115,64 @@
     'state': 'unavailable',
   })
 # ---
+# name: test_all_entities[number.model0_dhw_temperature-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'max': 100.0,
+      'min': 0.0,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'number',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'number.model0_dhw_temperature',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <NumberDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'DHW temperature',
+    'platform': 'vicare',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'dhw_temperature',
+    'unique_id': 'gateway0_deviceSerialVitodens300W-dhw_temperature',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_all_entities[number.model0_dhw_temperature-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'model0 DHW temperature',
+      'max': 100.0,
+      'min': 0.0,
+      'mode': <NumberMode.AUTO: 'auto'>,
+      'step': 1,
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'number.model0_dhw_temperature',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unavailable',
+  })
+# ---
 # name: test_all_entities[number.model0_heating_curve_shift-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -125,6 +185,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -182,6 +243,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -239,6 +301,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -294,6 +357,7 @@
       'step': 0.1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -349,6 +413,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -406,6 +471,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -463,6 +529,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -520,6 +587,7 @@
       'step': 1.0,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -565,60 +633,3 @@
     'state': 'unavailable',
   })
 # ---
-# name: test_all_entities[number.model0_dhw_temperature-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'max': 100.0,
-      'min': 0.0,
-      'mode': <NumberMode.AUTO: 'auto'>,
-      'step': 1,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'number',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'number.model0_dhw_temperature',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <NumberDeviceClass.TEMPERATURE: 'temperature'>,
-    'original_icon': None,
-    'original_name': 'DHW temperature',
-    'platform': 'vicare',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'dhw_temperature',
-    'unique_id': 'gateway0_deviceSerialVitodens300W-dhw_temperature',
-    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
-  })
-# ---
-# name: test_all_entities[number.model0_dhw_temperature-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'temperature',
-      'friendly_name': 'model0 DHW temperature',
-      'max': 100.0,
-      'min': 0.0,
-      'mode': <NumberMode.AUTO: 'auto'>,
-      'step': 1,
-      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'number.model0_dhw_temperature',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unavailable',
-  })
-# ---
diff --git a/tests/components/vicare/snapshots/test_sensor.ambr b/tests/components/vicare/snapshots/test_sensor.ambr
index aaf75e6753a..a0d4bf374c8 100644
--- a/tests/components/vicare/snapshots/test_sensor.ambr
+++ b/tests/components/vicare/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -109,6 +111,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -159,6 +162,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -208,6 +212,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -257,6 +262,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -306,6 +312,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -355,6 +362,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -404,6 +412,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -455,6 +464,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -506,6 +516,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -557,6 +568,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -608,6 +620,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -659,6 +672,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -710,6 +724,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -759,6 +774,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -808,6 +824,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -857,6 +874,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -906,6 +924,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -957,6 +976,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1008,6 +1028,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1059,6 +1080,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1110,6 +1132,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1158,6 +1181,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1206,6 +1230,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1255,6 +1280,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1306,6 +1332,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1357,6 +1384,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1408,6 +1436,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1459,6 +1488,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1510,6 +1540,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1561,6 +1592,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1612,6 +1644,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1663,6 +1696,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1714,6 +1748,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1765,6 +1800,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1816,6 +1852,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1858,6 +1895,107 @@
     'state': '16.4',
   })
 # ---
+# name: test_all_entities[type:heatpump-vicare/Vitocal250A.json][sensor.model0_heating_rod_hours-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.model0_heating_rod_hours',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Heating rod hours',
+    'platform': 'vicare',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'heating_rod_hours',
+    'unique_id': 'gateway0_deviceSerialVitocal250A-heating_rod_hours',
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+  })
+# ---
+# name: test_all_entities[type:heatpump-vicare/Vitocal250A.json][sensor.model0_heating_rod_hours-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'model0 Heating rod hours',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.model0_heating_rod_hours',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0',
+  })
+# ---
+# name: test_all_entities[type:heatpump-vicare/Vitocal250A.json][sensor.model0_heating_rod_starts-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.model0_heating_rod_starts',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Heating rod starts',
+    'platform': 'vicare',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'heating_rod_starts',
+    'unique_id': 'gateway0_deviceSerialVitocal250A-heating_rod_starts',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[type:heatpump-vicare/Vitocal250A.json][sensor.model0_heating_rod_starts-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'model0 Heating rod starts',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.model0_heating_rod_starts',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0',
+  })
+# ---
 # name: test_all_entities[type:heatpump-vicare/Vitocal250A.json][sensor.model0_outside_temperature-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -1867,6 +2005,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1918,6 +2057,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1969,6 +2109,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2011,6 +2152,156 @@
     'state': '35.3',
   })
 # ---
+# name: test_all_entities[type:heatpump-vicare/Vitocal250A.json][sensor.model0_seasonal_performance_factor-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.model0_seasonal_performance_factor',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Seasonal performance factor',
+    'platform': 'vicare',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'spf_total',
+    'unique_id': 'gateway0_deviceSerialVitocal250A-spf_total',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[type:heatpump-vicare/Vitocal250A.json][sensor.model0_seasonal_performance_factor-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'model0 Seasonal performance factor',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.model0_seasonal_performance_factor',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '3.9',
+  })
+# ---
+# name: test_all_entities[type:heatpump-vicare/Vitocal250A.json][sensor.model0_seasonal_performance_factor_domestic_hot_water-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.model0_seasonal_performance_factor_domestic_hot_water',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Seasonal performance factor - domestic hot water',
+    'platform': 'vicare',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'spf_dhw',
+    'unique_id': 'gateway0_deviceSerialVitocal250A-spf_dhw',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[type:heatpump-vicare/Vitocal250A.json][sensor.model0_seasonal_performance_factor_domestic_hot_water-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'model0 Seasonal performance factor - domestic hot water',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.model0_seasonal_performance_factor_domestic_hot_water',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '4.1',
+  })
+# ---
+# name: test_all_entities[type:heatpump-vicare/Vitocal250A.json][sensor.model0_seasonal_performance_factor_heating-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.model0_seasonal_performance_factor_heating',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Seasonal performance factor - heating',
+    'platform': 'vicare',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'spf_heating',
+    'unique_id': 'gateway0_deviceSerialVitocal250A-spf_heating',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[type:heatpump-vicare/Vitocal250A.json][sensor.model0_seasonal_performance_factor_heating-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'model0 Seasonal performance factor - heating',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.model0_seasonal_performance_factor_heating',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '3.2',
+  })
+# ---
 # name: test_all_entities[type:heatpump-vicare/Vitocal250A.json][sensor.model0_secondary_circuit_supply_temperature-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -2020,6 +2311,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2071,6 +2363,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2121,6 +2414,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2172,6 +2466,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2228,6 +2523,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2291,6 +2587,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2339,6 +2636,58 @@
     'state': 'permanent',
   })
 # ---
+# name: test_room_sensors[sensor.model0_battery-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'sensor.model0_battery',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
+    'original_icon': None,
+    'original_name': 'Battery',
+    'platform': 'vicare',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': 'gateway0_zigbee_d87a3bfffe5d844a-battery_level',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_room_sensors[sensor.model0_battery-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'battery',
+      'friendly_name': 'model0 Battery',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': '%',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.model0_battery',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '89',
+  })
+# ---
 # name: test_room_sensors[sensor.model0_humidity-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -2348,6 +2697,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2399,6 +2749,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2450,6 +2801,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2501,6 +2853,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/vicare/snapshots/test_water_heater.ambr b/tests/components/vicare/snapshots/test_water_heater.ambr
index bca04b1bbfa..7b7ab91e086 100644
--- a/tests/components/vicare/snapshots/test_water_heater.ambr
+++ b/tests/components/vicare/snapshots/test_water_heater.ambr
@@ -9,6 +9,7 @@
       'min_temp': 10,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -65,6 +66,7 @@
       'min_temp': 10,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/vicare/test_climate.py b/tests/components/vicare/test_climate.py
index f48a8988cf0..9299f6567b1 100644
--- a/tests/components/vicare/test_climate.py
+++ b/tests/components/vicare/test_climate.py
@@ -23,7 +23,9 @@ async def test_all_entities(
     entity_registry: er.EntityRegistry,
 ) -> None:
     """Test all entities."""
-    fixtures: list[Fixture] = [Fixture({"type:boiler"}, "vicare/Vitodens300W.json")]
+    fixtures: list[Fixture] = [
+        Fixture({"type:boiler"}, "vicare/Vitodens300W.json"),
+    ]
     with (
         patch(f"{MODULE}.login", return_value=MockPyViCare(fixtures)),
         patch(f"{MODULE}.PLATFORMS", [Platform.CLIMATE]),
diff --git a/tests/components/vicare/test_fan.py b/tests/components/vicare/test_fan.py
index aaf6a968ffd..8c42c92fb50 100644
--- a/tests/components/vicare/test_fan.py
+++ b/tests/components/vicare/test_fan.py
@@ -23,7 +23,11 @@ async def test_all_entities(
     entity_registry: er.EntityRegistry,
 ) -> None:
     """Test all entities."""
-    fixtures: list[Fixture] = [Fixture({"type:ventilation"}, "vicare/ViAir300F.json")]
+    fixtures: list[Fixture] = [
+        Fixture({"type:ventilation"}, "vicare/ViAir300F.json"),
+        Fixture({"type:ventilation"}, "vicare/VitoPure.json"),
+        Fixture({"type:heatpump"}, "vicare/Vitocal222G_Vitovent300W.json"),
+    ]
     with (
         patch(f"{MODULE}.login", return_value=MockPyViCare(fixtures)),
         patch(f"{MODULE}.PLATFORMS", [Platform.FAN]),
diff --git a/tests/components/vizio/test_init.py b/tests/components/vizio/test_init.py
index e004255ec6d..9d776ba6a59 100644
--- a/tests/components/vizio/test_init.py
+++ b/tests/components/vizio/test_init.py
@@ -7,7 +7,7 @@ import pytest
 from homeassistant.components.vizio.const import DOMAIN
 from homeassistant.const import STATE_UNAVAILABLE, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import MOCK_SPEAKER_CONFIG, MOCK_USER_VALID_TV_CONFIG, UNIQUE_ID
 
diff --git a/tests/components/vodafone_station/conftest.py b/tests/components/vodafone_station/conftest.py
index 7763db5044a..a065a1e8065 100644
--- a/tests/components/vodafone_station/conftest.py
+++ b/tests/components/vodafone_station/conftest.py
@@ -8,7 +8,7 @@ import pytest
 from homeassistant.components.vodafone_station import DOMAIN
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 
-from .const import DEVICE_1_MAC
+from .const import DEVICE_1_HOST, DEVICE_1_MAC, DEVICE_2_MAC
 
 from tests.common import (
     AsyncMock,
@@ -48,11 +48,20 @@ def mock_vodafone_station_router() -> Generator[AsyncMock]:
                 connected=True,
                 connection_type="wifi",
                 ip_address="192.168.1.10",
-                name="WifiDevice0",
+                name=DEVICE_1_HOST,
                 mac=DEVICE_1_MAC,
                 type="laptop",
                 wifi="2.4G",
             ),
+            DEVICE_2_MAC: VodafoneStationDevice(
+                connected=False,
+                connection_type="lan",
+                ip_address="192.168.1.11",
+                name="LanDevice1",
+                mac=DEVICE_2_MAC,
+                type="desktop",
+                wifi="",
+            ),
         }
         router.get_sensor_data.return_value = load_json_object_fixture(
             "get_sensor_data.json", DOMAIN
diff --git a/tests/components/vodafone_station/const.py b/tests/components/vodafone_station/const.py
index 0f1ed2ba7da..cf6c274e5d5 100644
--- a/tests/components/vodafone_station/const.py
+++ b/tests/components/vodafone_station/const.py
@@ -1,3 +1,6 @@
 """Common stuff for Vodafone Station tests."""
 
+DEVICE_1_HOST = "WifiDevice0"
 DEVICE_1_MAC = "xx:xx:xx:xx:xx:xx"
+DEVICE_2_HOST = "LanDevice1"
+DEVICE_2_MAC = "yy:yy:yy:yy:yy:yy"
diff --git a/tests/components/vodafone_station/snapshots/test_button.ambr b/tests/components/vodafone_station/snapshots/test_button.ambr
index dc7953ac42a..736f590241a 100644
--- a/tests/components/vodafone_station/snapshots/test_button.ambr
+++ b/tests/components/vodafone_station/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/vodafone_station/snapshots/test_device_tracker.ambr b/tests/components/vodafone_station/snapshots/test_device_tracker.ambr
index 834c8b14459..7f98aad1405 100644
--- a/tests/components/vodafone_station/snapshots/test_device_tracker.ambr
+++ b/tests/components/vodafone_station/snapshots/test_device_tracker.ambr
@@ -1,18 +1,19 @@
 # serializer version: 1
-# name: test_all_entities[device_tracker.vodafone_station_xx_xx_xx_xx_xx_xx-entry]
+# name: test_all_entities[device_tracker.landevice1-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'device_tracker',
     'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-    'entity_id': 'device_tracker.vodafone_station_xx_xx_xx_xx_xx_xx',
-    'has_entity_name': False,
+    'entity_id': 'device_tracker.landevice1',
+    'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
     'id': <ANY>,
@@ -23,7 +24,58 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'LanDevice1',
+    'platform': 'vodafone_station',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'device_tracker',
+    'unique_id': 'yy:yy:yy:yy:yy:yy',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_all_entities[device_tracker.landevice1-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'LanDevice1',
+      'host_name': 'LanDevice1',
+      'ip': '192.168.1.11',
+      'mac': 'yy:yy:yy:yy:yy:yy',
+      'source_type': <SourceType.ROUTER: 'router'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'device_tracker.landevice1',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'not_home',
+  })
+# ---
+# name: test_all_entities[device_tracker.wifidevice0-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'device_tracker',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'device_tracker.wifidevice0',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'WifiDevice0',
     'platform': 'vodafone_station',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -32,16 +84,17 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_all_entities[device_tracker.vodafone_station_xx_xx_xx_xx_xx_xx-state]
+# name: test_all_entities[device_tracker.wifidevice0-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
+      'friendly_name': 'WifiDevice0',
       'host_name': 'WifiDevice0',
       'ip': '192.168.1.10',
       'mac': 'xx:xx:xx:xx:xx:xx',
       'source_type': <SourceType.ROUTER: 'router'>,
     }),
     'context': <ANY>,
-    'entity_id': 'device_tracker.vodafone_station_xx_xx_xx_xx_xx_xx',
+    'entity_id': 'device_tracker.wifidevice0',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
diff --git a/tests/components/vodafone_station/snapshots/test_diagnostics.ambr b/tests/components/vodafone_station/snapshots/test_diagnostics.ambr
index c258b14dc2d..be2956e0aab 100644
--- a/tests/components/vodafone_station/snapshots/test_diagnostics.ambr
+++ b/tests/components/vodafone_station/snapshots/test_diagnostics.ambr
@@ -9,6 +9,12 @@
           'hostname': 'WifiDevice0',
           'type': 'laptop',
         }),
+        dict({
+          'connected': False,
+          'connection_type': 'lan',
+          'hostname': 'LanDevice1',
+          'type': 'desktop',
+        }),
       ]),
       'last_exception': None,
       'last_update success': True,
@@ -35,6 +41,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': None,
       'version': 1,
diff --git a/tests/components/vodafone_station/snapshots/test_sensor.ambr b/tests/components/vodafone_station/snapshots/test_sensor.ambr
index eb1676938b5..169ee92a24b 100644
--- a/tests/components/vodafone_station/snapshots/test_sensor.ambr
+++ b/tests/components/vodafone_station/snapshots/test_sensor.ambr
@@ -12,6 +12,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -64,6 +65,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -111,6 +113,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -158,6 +161,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -204,6 +208,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/vodafone_station/test_button.py b/tests/components/vodafone_station/test_button.py
index d5f377d3f6f..ade5eb78965 100644
--- a/tests/components/vodafone_station/test_button.py
+++ b/tests/components/vodafone_station/test_button.py
@@ -2,11 +2,20 @@
 
 from unittest.mock import AsyncMock, patch
 
+from aiovodafone.exceptions import (
+    AlreadyLogged,
+    CannotAuthenticate,
+    CannotConnect,
+    GenericLoginError,
+)
+import pytest
 from syrupy import SnapshotAssertion
 
 from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
+from homeassistant.components.vodafone_station.const import DOMAIN
 from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
 
 from . import setup_integration
@@ -46,3 +55,39 @@ async def test_pressing_button(
         blocking=True,
     )
     mock_vodafone_station_router.restart_router.assert_called_once()
+
+
+@pytest.mark.parametrize(
+    ("side_effect", "key", "error"),
+    [
+        (CannotConnect, "cannot_execute_action", "CannotConnect()"),
+        (AlreadyLogged, "cannot_execute_action", "AlreadyLogged()"),
+        (GenericLoginError, "cannot_execute_action", "GenericLoginError()"),
+        (CannotAuthenticate, "cannot_authenticate", "CannotAuthenticate()"),
+    ],
+)
+async def test_button_fails(
+    hass: HomeAssistant,
+    mock_vodafone_station_router: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    side_effect: Exception,
+    key: str,
+    error: str,
+) -> None:
+    """Test button action fails."""
+
+    await setup_integration(hass, mock_config_entry)
+
+    mock_vodafone_station_router.restart_router.side_effect = side_effect
+
+    with pytest.raises(HomeAssistantError) as exc_info:
+        await hass.services.async_call(
+            BUTTON_DOMAIN,
+            SERVICE_PRESS,
+            {ATTR_ENTITY_ID: "button.vodafone_station_m123456789_restart"},
+            blocking=True,
+        )
+
+    assert exc_info.value.translation_domain == DOMAIN
+    assert exc_info.value.translation_key == key
+    assert exc_info.value.translation_placeholders == {"error": error}
diff --git a/tests/components/vodafone_station/test_config_flow.py b/tests/components/vodafone_station/test_config_flow.py
index 68f8247bdf9..0648987eb27 100644
--- a/tests/components/vodafone_station/test_config_flow.py
+++ b/tests/components/vodafone_station/test_config_flow.py
@@ -228,3 +228,75 @@ async def test_options_flow(
     assert result["data"] == {
         CONF_CONSIDER_HOME: 37,
     }
+
+
+async def test_reconfigure_successful(
+    hass: HomeAssistant,
+    mock_vodafone_station_router: AsyncMock,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test that the host can be reconfigured."""
+    mock_config_entry.add_to_hass(hass)
+    result = await mock_config_entry.start_reconfigure_flow(hass)
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reconfigure"
+
+    # original entry
+    assert mock_config_entry.data["host"] == "fake_host"
+
+    reconfigure_result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            "host": "192.168.100.60",
+            "password": "fake_password",
+            "username": "fake_username",
+        },
+    )
+
+    assert reconfigure_result["type"] is FlowResultType.ABORT
+    assert reconfigure_result["reason"] == "reconfigure_successful"
+
+    # changed entry
+    assert mock_config_entry.data["host"] == "192.168.100.60"
+
+
+@pytest.mark.parametrize(
+    ("side_effect", "error"),
+    [
+        (CannotConnect, "cannot_connect"),
+        (CannotAuthenticate, "invalid_auth"),
+        (AlreadyLogged, "already_logged"),
+        (ConnectionResetError, "unknown"),
+    ],
+)
+async def test_reconfigure_fails(
+    hass: HomeAssistant,
+    mock_vodafone_station_router: AsyncMock,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    side_effect: Exception,
+    error: str,
+) -> None:
+    """Test that the host can be reconfigured."""
+    mock_config_entry.add_to_hass(hass)
+    result = await mock_config_entry.start_reconfigure_flow(hass)
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reconfigure"
+
+    mock_vodafone_station_router.login.side_effect = side_effect
+
+    reconfigure_result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            "host": "192.168.100.60",
+            "password": "fake_password",
+            "username": "fake_username",
+        },
+    )
+
+    assert reconfigure_result["type"] is FlowResultType.FORM
+    assert reconfigure_result["step_id"] == "reconfigure"
+    assert reconfigure_result["errors"] == {"base": error}
diff --git a/tests/components/vodafone_station/test_coordinator.py b/tests/components/vodafone_station/test_coordinator.py
new file mode 100644
index 00000000000..1a9470245c7
--- /dev/null
+++ b/tests/components/vodafone_station/test_coordinator.py
@@ -0,0 +1,68 @@
+"""Define tests for the Vodafone Station coordinator."""
+
+import logging
+from unittest.mock import AsyncMock
+
+from aiovodafone import VodafoneStationDevice
+from freezegun.api import FrozenDateTimeFactory
+import pytest
+
+from homeassistant.components.vodafone_station.const import DOMAIN, SCAN_INTERVAL
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr
+
+from . import setup_integration
+from .const import DEVICE_1_HOST, DEVICE_1_MAC, DEVICE_2_HOST, DEVICE_2_MAC
+
+from tests.common import MockConfigEntry, async_fire_time_changed
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_coordinator_device_cleanup(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    mock_vodafone_station_router: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    caplog: pytest.LogCaptureFixture,
+    device_registry: dr.DeviceRegistry,
+) -> None:
+    """Test Device cleanup on coordinator update."""
+
+    caplog.set_level(logging.DEBUG)
+    await setup_integration(hass, mock_config_entry)
+
+    device = device_registry.async_get_or_create(
+        config_entry_id=mock_config_entry.entry_id,
+        identifiers={(DOMAIN, DEVICE_1_MAC)},
+        name=DEVICE_1_HOST,
+    )
+    assert device is not None
+
+    device_tracker = f"device_tracker.{DEVICE_1_HOST}"
+
+    state = hass.states.get(device_tracker)
+    assert state is not None
+
+    mock_vodafone_station_router.get_devices_data.return_value = {
+        DEVICE_2_MAC: VodafoneStationDevice(
+            connected=True,
+            connection_type="lan",
+            ip_address="192.168.1.11",
+            name=DEVICE_2_HOST,
+            mac=DEVICE_2_MAC,
+            type="desktop",
+            wifi="",
+        ),
+    }
+
+    freezer.tick(SCAN_INTERVAL)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done(wait_background_tasks=True)
+
+    state = hass.states.get(device_tracker)
+    assert state is None
+    assert f"Skipping entity {DEVICE_2_HOST}" in caplog.text
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, DEVICE_1_MAC)})
+    assert device is None
+    assert f"Removing device: {DEVICE_1_HOST}" in caplog.text
diff --git a/tests/components/vodafone_station/test_device_tracker.py b/tests/components/vodafone_station/test_device_tracker.py
index 5133d0da980..e172fa76de5 100644
--- a/tests/components/vodafone_station/test_device_tracker.py
+++ b/tests/components/vodafone_station/test_device_tracker.py
@@ -13,7 +13,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
 from . import setup_integration
-from .const import DEVICE_1_MAC
+from .const import DEVICE_1_HOST, DEVICE_1_MAC
 
 from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
 
@@ -45,7 +45,7 @@ async def test_consider_home(
     """Test if device is considered not_home when disconnected."""
     await setup_integration(hass, mock_config_entry)
 
-    device_tracker = "device_tracker.vodafone_station_xx_xx_xx_xx_xx_xx"
+    device_tracker = f"device_tracker.{DEVICE_1_HOST}"
 
     state = hass.states.get(device_tracker)
     assert state
diff --git a/tests/components/vodafone_station/test_init.py b/tests/components/vodafone_station/test_init.py
new file mode 100644
index 00000000000..12b3c3dce8f
--- /dev/null
+++ b/tests/components/vodafone_station/test_init.py
@@ -0,0 +1,33 @@
+"""Tests for Vodafone Station init."""
+
+from unittest.mock import AsyncMock
+
+from homeassistant.components.device_tracker import CONF_CONSIDER_HOME
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry
+
+
+async def test_reload_config_entry_with_options(
+    hass: HomeAssistant,
+    mock_vodafone_station_router: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test the the config entry is reloaded with options."""
+    await setup_integration(hass, mock_config_entry)
+
+    result = await hass.config_entries.options.async_init(mock_config_entry.entry_id)
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            CONF_CONSIDER_HOME: 37,
+        },
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["data"] == {
+        CONF_CONSIDER_HOME: 37,
+    }
diff --git a/tests/components/voicerss/test_tts.py b/tests/components/voicerss/test_tts.py
index 776c0ac153a..e6a30d7fac2 100644
--- a/tests/components/voicerss/test_tts.py
+++ b/tests/components/voicerss/test_tts.py
@@ -200,7 +200,7 @@ async def test_service_say_error(
 
     assert (
         await retrieve_media(hass, hass_client, calls[0].data[ATTR_MEDIA_CONTENT_ID])
-        == HTTPStatus.NOT_FOUND
+        == HTTPStatus.INTERNAL_SERVER_ERROR
     )
     assert len(aioclient_mock.mock_calls) == 1
     assert aioclient_mock.mock_calls[0][2] == FORM_DATA
@@ -234,7 +234,7 @@ async def test_service_say_timeout(
 
     assert (
         await retrieve_media(hass, hass_client, calls[0].data[ATTR_MEDIA_CONTENT_ID])
-        == HTTPStatus.NOT_FOUND
+        == HTTPStatus.INTERNAL_SERVER_ERROR
     )
     assert len(aioclient_mock.mock_calls) == 1
     assert aioclient_mock.mock_calls[0][2] == FORM_DATA
@@ -273,7 +273,7 @@ async def test_service_say_error_msg(
 
     assert (
         await retrieve_media(hass, hass_client, calls[0].data[ATTR_MEDIA_CONTENT_ID])
-        == HTTPStatus.NOT_FOUND
+        == HTTPStatus.INTERNAL_SERVER_ERROR
     )
     assert len(aioclient_mock.mock_calls) == 1
     assert aioclient_mock.mock_calls[0][2] == FORM_DATA
diff --git a/tests/components/voip/conftest.py b/tests/components/voip/conftest.py
index 99707297230..d47db58d585 100644
--- a/tests/components/voip/conftest.py
+++ b/tests/components/voip/conftest.py
@@ -57,6 +57,7 @@ def call_info() -> CallInfo:
     """Fake call info."""
     return CallInfo(
         caller_endpoint=get_sip_endpoint("192.168.1.210", 5060),
+        local_endpoint=get_sip_endpoint("192.168.1.10", 5060),
         caller_rtp_port=5004,
         server_ip="192.168.1.10",
         headers={
diff --git a/tests/components/voip/test_assist_satellite.py b/tests/components/voip/test_assist_satellite.py
new file mode 100644
index 00000000000..f3e2611631e
--- /dev/null
+++ b/tests/components/voip/test_assist_satellite.py
@@ -0,0 +1,62 @@
+"""Test the Assist Satellite platform."""
+
+from unittest.mock import patch
+
+import pytest
+
+from homeassistant.components.voip.devices import VoIPDevice
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import intent as intent_helper
+
+
+@pytest.mark.parametrize(
+    ("intent_args", "message"),
+    [
+        (
+            {},
+            "0:02:00 timer finished",
+        ),
+        (
+            {"name": {"value": "pizza"}},
+            "pizza finished",
+        ),
+    ],
+)
+async def test_timer_events(
+    hass: HomeAssistant, voip_device: VoIPDevice, intent_args: dict, message: str
+) -> None:
+    """Test for timer events."""
+
+    await intent_helper.async_handle(
+        hass,
+        "test",
+        intent_helper.INTENT_START_TIMER,
+        {
+            "minutes": {"value": 2},
+        }
+        | intent_args,
+        device_id=voip_device.device_id,
+    )
+
+    with (
+        patch(
+            "homeassistant.components.voip.assist_satellite.VoipAssistSatellite._resolve_announcement_media_id",
+        ) as mock_resolve,
+        patch(
+            "homeassistant.components.voip.assist_satellite.VoipAssistSatellite.async_announce",
+        ) as mock_announce,
+    ):
+        await intent_helper.async_handle(
+            hass,
+            "test",
+            intent_helper.INTENT_DECREASE_TIMER,
+            {
+                "minutes": {"value": 2},
+            },
+            device_id=voip_device.device_id,
+        )
+        await hass.async_block_till_done(wait_background_tasks=True)
+
+    assert len(mock_resolve.mock_calls) == 1
+    assert len(mock_announce.mock_calls) == 1
+    assert mock_resolve.mock_calls[0][1][0] == message
diff --git a/tests/components/voip/test_config_flow.py b/tests/components/voip/test_config_flow.py
index 1b7aaad7c03..05f14afa4e7 100644
--- a/tests/components/voip/test_config_flow.py
+++ b/tests/components/voip/test_config_flow.py
@@ -80,3 +80,30 @@ async def test_options_flow(hass: HomeAssistant) -> None:
     )
     assert result["type"] is FlowResultType.CREATE_ENTRY
     assert config_entry.options == {"sip_port": 5061}
+
+    # Manual with user
+    result = await hass.config_entries.options.async_init(
+        config_entry.entry_id,
+    )
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={"sip_port": 5061, "sip_user": "HA"},
+    )
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert config_entry.options == {"sip_port": 5061, "sip_user": "HA"}
+
+    # Manual remove user
+    result = await hass.config_entries.options.async_init(
+        config_entry.entry_id,
+    )
+
+    assert config_entry.options == {"sip_port": 5061, "sip_user": "HA"}
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={"sip_port": 5060, "sip_user": ""},
+    )
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert config_entry.options == {"sip_port": 5060}
diff --git a/tests/components/voip/test_voip.py b/tests/components/voip/test_voip.py
index 17af2748c1c..459ab020336 100644
--- a/tests/components/voip/test_voip.py
+++ b/tests/components/voip/test_voip.py
@@ -16,16 +16,19 @@ from homeassistant.components.assist_satellite import AssistSatelliteEntity
 
 # pylint: disable-next=hass-component-root-import
 from homeassistant.components.assist_satellite.entity import AssistSatelliteState
-from homeassistant.components.voip import HassVoipDatagramProtocol
+from homeassistant.components.voip import DOMAIN, HassVoipDatagramProtocol
 from homeassistant.components.voip.assist_satellite import Tones, VoipAssistSatellite
 from homeassistant.components.voip.devices import VoIPDevice, VoIPDevices
 from homeassistant.components.voip.voip import PreRecordMessageProtocol, make_protocol
 from homeassistant.const import STATE_OFF, STATE_ON, Platform
 from homeassistant.core import Context, HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.setup import async_setup_component
 
+from tests.components.tts.common import MockResultStream
+
 _ONE_SECOND = 16000 * 2  # 16Khz 16-bit
 _MEDIA_ID = "12345"
 
@@ -844,3 +847,355 @@ async def test_pipeline_error(
 
         assert sum(played_audio_bytes) > 0
         assert played_audio_bytes == snapshot()
+
+
+@pytest.mark.usefixtures("socket_enabled")
+async def test_announce(
+    hass: HomeAssistant,
+    voip_devices: VoIPDevices,
+    voip_device: VoIPDevice,
+) -> None:
+    """Test announcement."""
+    assert await async_setup_component(hass, "voip", {})
+
+    satellite = async_get_satellite_entity(hass, voip.DOMAIN, voip_device.voip_id)
+    assert isinstance(satellite, VoipAssistSatellite)
+    assert (
+        satellite.supported_features
+        & assist_satellite.AssistSatelliteEntityFeature.ANNOUNCE
+    )
+
+    with pytest.raises(HomeAssistantError) as err:
+        await hass.services.async_call(
+            "assist_satellite",
+            "announce",
+            service_data={"media_id": "http://example.com"},
+            blocking=True,
+            target={
+                "entity_id": satellite.entity_id,
+            },
+        )
+    assert err.value.translation_domain == "voip"
+    assert err.value.translation_key == "non_tts_announcement"
+
+    announcement = assist_satellite.AssistSatelliteAnnouncement(
+        message="test announcement",
+        media_id=_MEDIA_ID,
+        tts_token="test-token",
+        original_media_id=_MEDIA_ID,
+        media_id_source="tts",
+    )
+
+    # Protocol has already been mocked, but "outgoing_call" is not async
+    mock_protocol: AsyncMock = hass.data[DOMAIN].protocol
+    mock_protocol.outgoing_call = Mock()
+
+    with (
+        patch(
+            "homeassistant.components.voip.assist_satellite.VoipAssistSatellite._send_tts",
+        ) as mock_send_tts,
+    ):
+        satellite.transport = Mock()
+        announce_task = hass.async_create_background_task(
+            satellite.async_announce(announcement), "voip_announce"
+        )
+        await asyncio.sleep(0)
+        mock_protocol.outgoing_call.assert_called_once()
+
+        # Trigger announcement
+        satellite.on_chunk(bytes(_ONE_SECOND))
+        async with asyncio.timeout(1):
+            await announce_task
+
+        mock_send_tts.assert_called_once_with(_MEDIA_ID, wait_for_tone=False)
+
+
+@pytest.mark.usefixtures("socket_enabled")
+async def test_voip_id_is_ip_address(
+    hass: HomeAssistant,
+    voip_devices: VoIPDevices,
+    voip_device: VoIPDevice,
+) -> None:
+    """Test announcement when VoIP is an IP address instead of a SIP header."""
+    assert await async_setup_component(hass, "voip", {})
+
+    satellite = async_get_satellite_entity(hass, voip.DOMAIN, voip_device.voip_id)
+    assert isinstance(satellite, VoipAssistSatellite)
+    assert (
+        satellite.supported_features
+        & assist_satellite.AssistSatelliteEntityFeature.ANNOUNCE
+    )
+
+    announcement = assist_satellite.AssistSatelliteAnnouncement(
+        message="test announcement",
+        media_id=_MEDIA_ID,
+        tts_token="test-token",
+        original_media_id=_MEDIA_ID,
+        media_id_source="tts",
+    )
+
+    # Protocol has already been mocked, but "outgoing_call" is not async
+    mock_protocol: AsyncMock = hass.data[DOMAIN].protocol
+    mock_protocol.outgoing_call = Mock()
+
+    with (
+        patch.object(voip_device, "voip_id", "192.168.68.10"),
+        patch(
+            "homeassistant.components.voip.assist_satellite.VoipAssistSatellite._send_tts",
+        ) as mock_send_tts,
+    ):
+        satellite.transport = Mock()
+        announce_task = hass.async_create_background_task(
+            satellite.async_announce(announcement), "voip_announce"
+        )
+        await asyncio.sleep(0)
+        mock_protocol.outgoing_call.assert_called_once()
+        assert (
+            mock_protocol.outgoing_call.call_args.kwargs["destination"].host
+            == "192.168.68.10"
+        )
+
+        # Trigger announcement
+        satellite.on_chunk(bytes(_ONE_SECOND))
+        async with asyncio.timeout(1):
+            await announce_task
+
+        mock_send_tts.assert_called_once_with(_MEDIA_ID, wait_for_tone=False)
+
+
+@pytest.mark.usefixtures("socket_enabled")
+async def test_announce_timeout(
+    hass: HomeAssistant,
+    voip_devices: VoIPDevices,
+    voip_device: VoIPDevice,
+) -> None:
+    """Test announcement when user does not pick up the phone in time."""
+    assert await async_setup_component(hass, "voip", {})
+
+    satellite = async_get_satellite_entity(hass, voip.DOMAIN, voip_device.voip_id)
+    assert isinstance(satellite, VoipAssistSatellite)
+    assert (
+        satellite.supported_features
+        & assist_satellite.AssistSatelliteEntityFeature.ANNOUNCE
+    )
+
+    announcement = assist_satellite.AssistSatelliteAnnouncement(
+        message="test announcement",
+        media_id=_MEDIA_ID,
+        tts_token="test-token",
+        original_media_id=_MEDIA_ID,
+        media_id_source="tts",
+    )
+
+    # Protocol has already been mocked, but some methods are not async
+    mock_protocol: AsyncMock = hass.data[DOMAIN].protocol
+    mock_protocol.outgoing_call = Mock()
+    mock_protocol.cancel_call = Mock()
+
+    # Very short timeout which will trigger because we don't send any audio in
+    with (
+        patch(
+            "homeassistant.components.voip.assist_satellite._ANNOUNCEMENT_RING_TIMEOUT",
+            0.01,
+        ),
+    ):
+        satellite.transport = Mock()
+        with pytest.raises(TimeoutError):
+            await satellite.async_announce(announcement)
+
+
+@pytest.mark.usefixtures("socket_enabled")
+async def test_start_conversation(
+    hass: HomeAssistant,
+    voip_devices: VoIPDevices,
+    voip_device: VoIPDevice,
+) -> None:
+    """Test start conversation."""
+    assert await async_setup_component(hass, "voip", {})
+
+    satellite = async_get_satellite_entity(hass, voip.DOMAIN, voip_device.voip_id)
+    assert isinstance(satellite, VoipAssistSatellite)
+    assert (
+        satellite.supported_features
+        & assist_satellite.AssistSatelliteEntityFeature.START_CONVERSATION
+    )
+
+    announcement = assist_satellite.AssistSatelliteAnnouncement(
+        message="test announcement",
+        media_id=_MEDIA_ID,
+        tts_token="test-token",
+        original_media_id=_MEDIA_ID,
+        media_id_source="tts",
+    )
+
+    # Protocol has already been mocked, but "outgoing_call" is not async
+    mock_protocol: AsyncMock = hass.data[DOMAIN].protocol
+    mock_protocol.outgoing_call = Mock()
+
+    tts_sent = asyncio.Event()
+
+    async def _send_tts(*args, **kwargs):
+        tts_sent.set()
+
+    async def async_pipeline_from_audio_stream(
+        hass: HomeAssistant,
+        context: Context,
+        *args,
+        device_id: str | None,
+        tts_audio_output: str | dict[str, Any] | None,
+        **kwargs,
+    ):
+        event_callback = kwargs["event_callback"]
+
+        # Fake tts result
+        event_callback(
+            assist_pipeline.PipelineEvent(
+                type=assist_pipeline.PipelineEventType.TTS_START,
+                data={
+                    "engine": "test",
+                    "language": hass.config.language,
+                    "voice": "test",
+                    "tts_input": "fake-text",
+                },
+            )
+        )
+
+        # Proceed with media output
+        event_callback(
+            assist_pipeline.PipelineEvent(
+                type=assist_pipeline.PipelineEventType.TTS_END,
+                data={"tts_output": {"media_id": _MEDIA_ID}},
+            )
+        )
+
+        event_callback(
+            assist_pipeline.PipelineEvent(
+                type=assist_pipeline.PipelineEventType.RUN_END
+            )
+        )
+
+    with (
+        patch(
+            "homeassistant.components.voip.assist_satellite.VoipAssistSatellite._send_tts",
+            new=_send_tts,
+        ),
+        patch(
+            "homeassistant.components.assist_satellite.entity.async_pipeline_from_audio_stream",
+            new=async_pipeline_from_audio_stream,
+        ),
+    ):
+        satellite.transport = Mock()
+        conversation_task = hass.async_create_background_task(
+            satellite.async_start_conversation(announcement), "voip_start_conversation"
+        )
+        await asyncio.sleep(0)
+        mock_protocol.outgoing_call.assert_called_once()
+
+        # Trigger announcement and wait for it to finish
+        satellite.on_chunk(bytes(_ONE_SECOND))
+        async with asyncio.timeout(1):
+            await tts_sent.wait()
+
+        tts_sent.clear()
+
+        # Trigger pipeline
+        satellite.on_chunk(bytes(_ONE_SECOND))
+        async with asyncio.timeout(1):
+            # Wait for TTS
+            await tts_sent.wait()
+            await conversation_task
+
+
+@pytest.mark.usefixtures("socket_enabled")
+async def test_start_conversation_user_doesnt_pick_up(
+    hass: HomeAssistant,
+    voip_devices: VoIPDevices,
+    voip_device: VoIPDevice,
+) -> None:
+    """Test start conversation when the user doesn't pick up."""
+    assert await async_setup_component(hass, "voip", {})
+
+    pipeline = assist_pipeline.Pipeline(
+        conversation_engine="test engine",
+        conversation_language="en",
+        language="en",
+        name="test pipeline",
+        stt_engine="test stt",
+        stt_language="en",
+        tts_engine="test tts",
+        tts_language="en",
+        tts_voice=None,
+        wake_word_entity=None,
+        wake_word_id=None,
+    )
+
+    satellite = async_get_satellite_entity(hass, voip.DOMAIN, voip_device.voip_id)
+    assert isinstance(satellite, VoipAssistSatellite)
+    assert (
+        satellite.supported_features
+        & assist_satellite.AssistSatelliteEntityFeature.START_CONVERSATION
+    )
+
+    # Protocol has already been mocked, but "outgoing_call" is not async
+    mock_protocol: AsyncMock = hass.data[DOMAIN].protocol
+    mock_protocol.outgoing_call = Mock()
+
+    pipeline_started = asyncio.Event()
+
+    async def async_pipeline_from_audio_stream(
+        hass: HomeAssistant,
+        context: Context,
+        *args,
+        conversation_extra_system_prompt: str | None = None,
+        **kwargs,
+    ):
+        # System prompt should be not be set due to timeout (user not picking up)
+        assert conversation_extra_system_prompt is None
+
+        pipeline_started.set()
+
+    with (
+        patch(
+            "homeassistant.components.assist_satellite.entity.async_get_pipeline",
+            return_value=pipeline,
+        ),
+        patch(
+            "homeassistant.components.voip.assist_satellite.VoipAssistSatellite.async_start_conversation",
+            side_effect=TimeoutError,
+        ),
+        patch(
+            "homeassistant.components.assist_satellite.entity.async_pipeline_from_audio_stream",
+            new=async_pipeline_from_audio_stream,
+        ),
+        patch(
+            "homeassistant.components.tts.generate_media_source_id",
+            return_value="media-source://bla",
+        ),
+        patch(
+            "homeassistant.components.tts.async_resolve_engine",
+            return_value="test tts",
+        ),
+        patch(
+            "homeassistant.components.tts.async_create_stream",
+            return_value=MockResultStream(hass, "wav", b""),
+        ),
+    ):
+        satellite.transport = Mock()
+
+        # Error should clear system prompt
+        with pytest.raises(TimeoutError):
+            await hass.services.async_call(
+                assist_satellite.DOMAIN,
+                "start_conversation",
+                {
+                    "entity_id": satellite.entity_id,
+                    "start_message": "test announcement",
+                    "extra_system_prompt": "test prompt",
+                },
+                blocking=True,
+            )
+
+        # Trigger a pipeline so we can check if the system prompt was cleared
+        satellite.on_chunk(bytes(_ONE_SECOND))
+        async with asyncio.timeout(1):
+            await pipeline_started.wait()
diff --git a/tests/components/vultr/test_sensor.py b/tests/components/vultr/test_sensor.py
index f9f922b35d4..65be23fc168 100644
--- a/tests/components/vultr/test_sensor.py
+++ b/tests/components/vultr/test_sensor.py
@@ -4,8 +4,7 @@ import pytest
 import voluptuous as vol
 
 from homeassistant.components import vultr as base_vultr
-from homeassistant.components.vultr import CONF_SUBSCRIPTION
-import homeassistant.components.vultr.sensor as vultr
+from homeassistant.components.vultr import CONF_SUBSCRIPTION, sensor as vultr
 from homeassistant.const import (
     CONF_MONITORED_CONDITIONS,
     CONF_NAME,
diff --git a/tests/components/wake_word/test_init.py b/tests/components/wake_word/test_init.py
index cdaf7e0e3f0..e6e8ff72a6d 100644
--- a/tests/components/wake_word/test_init.py
+++ b/tests/components/wake_word/test_init.py
@@ -13,7 +13,7 @@ from homeassistant.components import wake_word
 from homeassistant.config_entries import ConfigEntry, ConfigEntryState, ConfigFlow
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, State
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.setup import async_setup_component
 
 from .common import mock_wake_word_entity_platform
@@ -143,7 +143,7 @@ async def mock_config_entry_setup(
     async def async_setup_entry_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test stt platform via config entry."""
         async_add_entities([mock_provider_entity])
diff --git a/tests/components/waqi/snapshots/test_sensor.ambr b/tests/components/waqi/snapshots/test_sensor.ambr
index 3d00f1cff26..08e58a74524 100644
--- a/tests/components/waqi/snapshots/test_sensor.ambr
+++ b/tests/components/waqi/snapshots/test_sensor.ambr
@@ -36,11 +36,11 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'attribution': 'RIVM - Rijksinstituut voor Volksgezondheid en Milieum, Landelijk Meetnet Luchtkwaliteit and World Air Quality Index Project',
-      'friendly_name': 'de Jongweg, Utrecht Visbility using nephelometry',
+      'friendly_name': 'de Jongweg, Utrecht Visibility using nephelometry',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.de_jongweg_utrecht_visbility_using_nephelometry',
+    'entity_id': 'sensor.de_jongweg_utrecht_visibility_using_nephelometry',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
diff --git a/tests/components/water_heater/test_init.py b/tests/components/water_heater/test_init.py
index 09a0a711582..191acdf24f9 100644
--- a/tests/components/water_heater/test_init.py
+++ b/tests/components/water_heater/test_init.py
@@ -2,19 +2,20 @@
 
 from __future__ import annotations
 
+from typing import Any
 from unittest import mock
 from unittest.mock import AsyncMock, MagicMock
 
 import pytest
 import voluptuous as vol
 
+from homeassistant.components import water_heater
 from homeassistant.components.water_heater import (
     DOMAIN,
     SERVICE_SET_OPERATION_MODE,
     SET_TEMPERATURE_SCHEMA,
     WaterHeaterEntity,
     WaterHeaterEntityDescription,
-    WaterHeaterEntityEntityDescription,
     WaterHeaterEntityFeature,
 )
 from homeassistant.config_entries import ConfigEntry
@@ -22,13 +23,14 @@ from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from tests.common import (
     MockConfigEntry,
     MockModule,
     MockPlatform,
     async_mock_service,
+    import_and_test_deprecated_constant,
     mock_integration,
     mock_platform,
 )
@@ -143,7 +145,7 @@ async def test_operation_mode_validation(
     async def async_setup_entry_water_heater_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test water_heater platform via config entry."""
         async_add_entities([water_heater_entity])
@@ -209,12 +211,27 @@ async def test_operation_mode_validation(
 
 
 @pytest.mark.parametrize(
-    ("class_name", "expected_log"),
-    [(WaterHeaterEntityDescription, False), (WaterHeaterEntityEntityDescription, True)],
+    ("constant_name", "replacement_name", "replacement"),
+    [
+        (
+            "WaterHeaterEntityEntityDescription",
+            "WaterHeaterEntityDescription",
+            WaterHeaterEntityDescription,
+        ),
+    ],
 )
-async def test_deprecated_entity_description(
-    caplog: pytest.LogCaptureFixture, class_name: type, expected_log: bool
+def test_deprecated_constants(
+    caplog: pytest.LogCaptureFixture,
+    constant_name: str,
+    replacement_name: str,
+    replacement: Any,
 ) -> None:
-    """Test deprecated WaterHeaterEntityEntityDescription logs warning."""
-    class_name(key="test")
-    assert ("is a deprecated class" in caplog.text) is expected_log
+    """Test deprecated automation constants."""
+    import_and_test_deprecated_constant(
+        caplog,
+        water_heater,
+        constant_name,
+        replacement_name,
+        replacement,
+        "2026.1",
+    )
diff --git a/tests/components/watergate/snapshots/test_event.ambr b/tests/components/watergate/snapshots/test_event.ambr
new file mode 100644
index 00000000000..97f453697ca
--- /dev/null
+++ b/tests/components/watergate/snapshots/test_event.ambr
@@ -0,0 +1,111 @@
+# serializer version: 1
+# name: test_event[event.sonic_duration_auto_shut_off-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'event_types': list([
+        'duration_threshold',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'event',
+    'entity_category': None,
+    'entity_id': 'event.sonic_duration_auto_shut_off',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Duration auto shut-off',
+    'platform': 'watergate',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'auto_shut_off_duration',
+    'unique_id': 'a63182948ce2896a.auto_shut_off_duration',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_event[event.sonic_duration_auto_shut_off-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'event_type': None,
+      'event_types': list([
+        'duration_threshold',
+      ]),
+      'friendly_name': 'Sonic Duration auto shut-off',
+    }),
+    'context': <ANY>,
+    'entity_id': 'event.sonic_duration_auto_shut_off',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
+# name: test_event[event.sonic_volume_auto_shut_off-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'event_types': list([
+        'volume_threshold',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'event',
+    'entity_category': None,
+    'entity_id': 'event.sonic_volume_auto_shut_off',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Volume auto shut-off',
+    'platform': 'watergate',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'auto_shut_off_volume',
+    'unique_id': 'a63182948ce2896a.auto_shut_off_volume',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_event[event.sonic_volume_auto_shut_off-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'event_type': None,
+      'event_types': list([
+        'volume_threshold',
+      ]),
+      'friendly_name': 'Sonic Volume auto shut-off',
+    }),
+    'context': <ANY>,
+    'entity_id': 'event.sonic_volume_auto_shut_off',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'unknown',
+  })
+# ---
diff --git a/tests/components/watergate/snapshots/test_sensor.ambr b/tests/components/watergate/snapshots/test_sensor.ambr
index a58c7c0eab8..b4b6c4ee0a4 100644
--- a/tests/components/watergate/snapshots/test_sensor.ambr
+++ b/tests/components/watergate/snapshots/test_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -113,6 +115,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -162,6 +165,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -211,6 +215,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -262,6 +267,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -313,6 +319,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -364,6 +371,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -415,6 +423,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -464,6 +473,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/watergate/test_event.py b/tests/components/watergate/test_event.py
new file mode 100644
index 00000000000..6997c3f1fdf
--- /dev/null
+++ b/tests/components/watergate/test_event.py
@@ -0,0 +1,84 @@
+"""Tests for the Watergate event entity platform."""
+
+from collections.abc import Generator
+
+from freezegun.api import FrozenDateTimeFactory
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.typing import StateType
+
+from . import init_integration
+from .const import MOCK_WEBHOOK_ID
+
+from tests.common import AsyncMock, MockConfigEntry, patch, snapshot_platform
+from tests.typing import ClientSessionGenerator
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_event(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    mock_entry: MockConfigEntry,
+    mock_watergate_client: Generator[AsyncMock],
+    freezer: FrozenDateTimeFactory,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test states of the sensor."""
+    freezer.move_to("2021-01-09 12:00:00+00:00")
+    with patch("homeassistant.components.watergate.PLATFORMS", [Platform.EVENT]):
+        await init_integration(hass, mock_entry)
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_entry.entry_id)
+
+
+@pytest.mark.parametrize(
+    ("entity_id", "event_type"),
+    [
+        ("sonic_volume_auto_shut_off", "volume_threshold"),
+        ("sonic_duration_auto_shut_off", "duration_threshold"),
+    ],
+)
+async def test_auto_shut_off_webhook(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    mock_entry: MockConfigEntry,
+    mock_watergate_client: Generator[AsyncMock],
+    entity_id: str,
+    event_type: str,
+) -> None:
+    """Test if water flow webhook is handled correctly."""
+    await init_integration(hass, mock_entry)
+
+    def assert_state(entity_id: str, expected_state: str):
+        state = hass.states.get(f"event.{entity_id}")
+        assert state.state == str(expected_state)
+
+    assert_state(entity_id, "unknown")
+
+    telemetry_change_data = {
+        "type": "auto-shut-off-report",
+        "data": {
+            "type": event_type,
+            "volume": 1500,
+            "duration": 30,
+            "timestamp": 1730148016,
+        },
+    }
+    client = await hass_client_no_auth()
+    await client.post(f"/api/webhook/{MOCK_WEBHOOK_ID}", json=telemetry_change_data)
+
+    await hass.async_block_till_done()
+
+    def assert_extra_state(
+        entity_id: str, attribute: str, expected_attribute: StateType
+    ):
+        attributes = hass.states.get(f"event.{entity_id}").attributes
+        assert attributes.get(attribute) == expected_attribute
+
+    assert_extra_state(entity_id, "event_type", event_type)
+    assert_extra_state(entity_id, "volume", 1500)
+    assert_extra_state(entity_id, "duration", 30)
diff --git a/tests/components/watergate/test_sensor.py b/tests/components/watergate/test_sensor.py
index 78e375857ed..0bf883a1955 100644
--- a/tests/components/watergate/test_sensor.py
+++ b/tests/components/watergate/test_sensor.py
@@ -1,4 +1,4 @@
-"""Tests for the Watergate valve platform."""
+"""Tests for the Watergate sensor platform."""
 
 from collections.abc import Generator
 
diff --git a/tests/components/watttime/snapshots/test_diagnostics.ambr b/tests/components/watttime/snapshots/test_diagnostics.ambr
index 0c137acc36b..3cc5e1d6f66 100644
--- a/tests/components/watttime/snapshots/test_diagnostics.ambr
+++ b/tests/components/watttime/snapshots/test_diagnostics.ambr
@@ -27,6 +27,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': '**REDACTED**',
       'unique_id': '**REDACTED**',
       'version': 1,
diff --git a/tests/components/weather/__init__.py b/tests/components/weather/__init__.py
index 2dbffbbd617..301e055129d 100644
--- a/tests/components/weather/__init__.py
+++ b/tests/components/weather/__init__.py
@@ -21,7 +21,7 @@ from homeassistant.components.weather import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from tests.common import (
     MockConfigEntry,
@@ -90,7 +90,7 @@ async def create_entity(
     async def async_setup_entry_weather_platform(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Set up test weather platform via config entry."""
         async_add_entities([weather_entity])
diff --git a/tests/components/weatherflow_cloud/snapshots/test_sensor.ambr b/tests/components/weatherflow_cloud/snapshots/test_sensor.ambr
index 95be86664a2..c06229302c5 100644
--- a/tests/components/weatherflow_cloud/snapshots/test_sensor.ambr
+++ b/tests/components/weatherflow_cloud/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -62,6 +63,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -117,6 +119,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -172,6 +175,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -227,6 +231,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -277,6 +282,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -327,6 +333,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -377,6 +384,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -427,6 +435,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -477,6 +486,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -535,6 +545,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -593,6 +604,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -648,6 +660,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -703,6 +716,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -758,6 +772,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/weatherflow_cloud/snapshots/test_weather.ambr b/tests/components/weatherflow_cloud/snapshots/test_weather.ambr
index 569b744529c..0b0d66c34a7 100644
--- a/tests/components/weatherflow_cloud/snapshots/test_weather.ambr
+++ b/tests/components/weatherflow_cloud/snapshots/test_weather.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/webdav/__init__.py b/tests/components/webdav/__init__.py
new file mode 100644
index 00000000000..3b901bdd308
--- /dev/null
+++ b/tests/components/webdav/__init__.py
@@ -0,0 +1,14 @@
+"""Tests for the WebDAV integration."""
+
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+async def setup_integration(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry
+) -> None:
+    """Set up the WebDAV integration for testing."""
+    mock_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
diff --git a/tests/components/webdav/conftest.py b/tests/components/webdav/conftest.py
new file mode 100644
index 00000000000..5fa972e5fae
--- /dev/null
+++ b/tests/components/webdav/conftest.py
@@ -0,0 +1,66 @@
+"""Common fixtures for the WebDAV tests."""
+
+from collections.abc import AsyncIterator, Generator
+from json import dumps
+from unittest.mock import AsyncMock, patch
+
+import pytest
+
+from homeassistant.components.webdav.const import DOMAIN
+from homeassistant.const import CONF_PASSWORD, CONF_URL, CONF_USERNAME
+
+from .const import BACKUP_METADATA, MOCK_LIST_FILES
+
+from tests.common import MockConfigEntry
+
+
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.webdav.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
+@pytest.fixture
+def mock_config_entry() -> MockConfigEntry:
+    """Return the default mocked config entry."""
+    return MockConfigEntry(
+        title="user@webdav.demo",
+        domain=DOMAIN,
+        data={
+            CONF_URL: "https://webdav.demo",
+            CONF_USERNAME: "user",
+            CONF_PASSWORD: "supersecretpassword",
+        },
+        entry_id="01JKXV07ASC62D620DGYNG2R8H",
+    )
+
+
+async def _download_mock(path: str, timeout=None) -> AsyncIterator[bytes]:
+    """Mock the download function."""
+    if path.endswith(".json"):
+        yield dumps(BACKUP_METADATA).encode()
+
+    yield b"backup data"
+
+
+@pytest.fixture(name="webdav_client")
+def mock_webdav_client() -> Generator[AsyncMock]:
+    """Mock the aiowebdav client."""
+    with (
+        patch(
+            "homeassistant.components.webdav.helpers.Client",
+            autospec=True,
+        ) as mock_webdav_client,
+    ):
+        mock = mock_webdav_client.return_value
+        mock.check.return_value = True
+        mock.mkdir.return_value = True
+        mock.list_files.return_value = MOCK_LIST_FILES
+        mock.download_iter.side_effect = _download_mock
+        mock.upload_iter.return_value = None
+        mock.clean.return_value = None
+        mock.move.return_value = None
+        yield mock
diff --git a/tests/components/webdav/const.py b/tests/components/webdav/const.py
new file mode 100644
index 00000000000..0147826a777
--- /dev/null
+++ b/tests/components/webdav/const.py
@@ -0,0 +1,20 @@
+"""Constants for WebDAV tests."""
+
+BACKUP_METADATA = {
+    "addons": [],
+    "backup_id": "23e64aec",
+    "date": "2025-02-10T17:47:22.727189+01:00",
+    "database_included": True,
+    "extra_metadata": {},
+    "folders": [],
+    "homeassistant_included": True,
+    "homeassistant_version": "2025.2.1",
+    "name": "Automatic backup 2025.2.1",
+    "protected": False,
+    "size": 34519040,
+}
+
+MOCK_LIST_FILES = [
+    "/Automatic_backup_2025.2.1_2025-02-10_18.31_30202686.tar",
+    "/Automatic_backup_2025.2.1_2025-02-10_18.31_30202686.metadata.json",
+]
diff --git a/tests/components/webdav/test_backup.py b/tests/components/webdav/test_backup.py
new file mode 100644
index 00000000000..ca20467484f
--- /dev/null
+++ b/tests/components/webdav/test_backup.py
@@ -0,0 +1,324 @@
+"""Test the backups for WebDAV."""
+
+from __future__ import annotations
+
+from collections.abc import AsyncGenerator
+from io import StringIO
+from unittest.mock import Mock, patch
+
+from aiowebdav2.exceptions import UnauthorizedError, WebDavError
+import pytest
+
+from homeassistant.components.backup import DOMAIN as BACKUP_DOMAIN, AgentBackup
+from homeassistant.components.webdav.backup import async_register_backup_agents_listener
+from homeassistant.components.webdav.const import DATA_BACKUP_AGENT_LISTENERS, DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.backup import async_initialize_backup
+from homeassistant.setup import async_setup_component
+
+from .const import BACKUP_METADATA
+
+from tests.common import AsyncMock, MockConfigEntry
+from tests.typing import ClientSessionGenerator, WebSocketGenerator
+
+
+@pytest.fixture(autouse=True)
+async def setup_backup_integration(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry, webdav_client: AsyncMock
+) -> AsyncGenerator[None]:
+    """Set up webdav integration."""
+    with (
+        patch("homeassistant.components.backup.is_hassio", return_value=False),
+        patch("homeassistant.components.backup.store.STORE_DELAY_SAVE", 0),
+    ):
+        async_initialize_backup(hass)
+        assert await async_setup_component(hass, BACKUP_DOMAIN, {})
+        mock_config_entry.add_to_hass(hass)
+        await hass.config_entries.async_setup(mock_config_entry.entry_id)
+        await hass.async_block_till_done()
+
+        yield
+
+
+async def test_agents_info(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test backup agent info."""
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id({"type": "backup/agents/info"})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {
+        "agents": [
+            {"agent_id": "backup.local", "name": "local"},
+            {
+                "agent_id": f"{DOMAIN}.{mock_config_entry.entry_id}",
+                "name": mock_config_entry.title,
+            },
+        ],
+    }
+
+
+async def test_agents_list_backups(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test agent list backups."""
+
+    client = await hass_ws_client(hass)
+    await client.send_json_auto_id({"type": "backup/info"})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"]["agent_errors"] == {}
+    assert response["result"]["backups"] == [
+        {
+            "addons": [],
+            "agents": {
+                "webdav.01JKXV07ASC62D620DGYNG2R8H": {
+                    "protected": False,
+                    "size": 34519040,
+                }
+            },
+            "backup_id": "23e64aec",
+            "date": "2025-02-10T17:47:22.727189+01:00",
+            "database_included": True,
+            "extra_metadata": {},
+            "folders": [],
+            "homeassistant_included": True,
+            "homeassistant_version": "2025.2.1",
+            "name": "Automatic backup 2025.2.1",
+            "failed_agent_ids": [],
+            "with_automatic_settings": None,
+        }
+    ]
+
+
+async def test_agents_get_backup(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test agent get backup."""
+
+    backup_id = BACKUP_METADATA["backup_id"]
+    client = await hass_ws_client(hass)
+    await client.send_json_auto_id({"type": "backup/details", "backup_id": backup_id})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"]["agent_errors"] == {}
+    assert response["result"]["backup"] == {
+        "addons": [],
+        "agents": {
+            f"{DOMAIN}.{mock_config_entry.entry_id}": {
+                "protected": False,
+                "size": 34519040,
+            }
+        },
+        "backup_id": "23e64aec",
+        "date": "2025-02-10T17:47:22.727189+01:00",
+        "database_included": True,
+        "extra_metadata": {},
+        "folders": [],
+        "homeassistant_included": True,
+        "homeassistant_version": "2025.2.1",
+        "name": "Automatic backup 2025.2.1",
+        "failed_agent_ids": [],
+        "with_automatic_settings": None,
+    }
+
+
+async def test_agents_delete(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    webdav_client: AsyncMock,
+) -> None:
+    """Test agent delete backup."""
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id(
+        {
+            "type": "backup/delete",
+            "backup_id": BACKUP_METADATA["backup_id"],
+        }
+    )
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {"agent_errors": {}}
+    assert webdav_client.clean.call_count == 2
+
+
+async def test_agents_upload(
+    hass_client: ClientSessionGenerator,
+    webdav_client: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test agent upload backup."""
+    client = await hass_client()
+    test_backup = AgentBackup.from_dict(BACKUP_METADATA)
+
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_get_backup",
+        ) as fetch_backup,
+        patch(
+            "homeassistant.components.backup.manager.read_backup",
+            return_value=test_backup,
+        ),
+        patch("pathlib.Path.open") as mocked_open,
+    ):
+        mocked_open.return_value.read = Mock(side_effect=[b"test", b""])
+        fetch_backup.return_value = test_backup
+        resp = await client.post(
+            f"/api/backup/upload?agent_id={DOMAIN}.{mock_config_entry.entry_id}",
+            data={"file": StringIO("test")},
+        )
+
+    assert resp.status == 201
+    assert webdav_client.upload_iter.call_count == 2
+
+
+async def test_agents_download(
+    hass_client: ClientSessionGenerator,
+    webdav_client: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test agent download backup."""
+    client = await hass_client()
+    backup_id = BACKUP_METADATA["backup_id"]
+
+    resp = await client.get(
+        f"/api/backup/download/{backup_id}?agent_id={DOMAIN}.{mock_config_entry.entry_id}"
+    )
+    assert resp.status == 200
+    assert await resp.content.read() == b"backup data"
+
+
+async def test_error_on_agents_download(
+    hass_client: ClientSessionGenerator,
+    webdav_client: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test we get not found on a not existing backup on download."""
+    client = await hass_client()
+    backup_id = BACKUP_METADATA["backup_id"]
+    webdav_client.list_files.return_value = []
+
+    resp = await client.get(
+        f"/api/backup/download/{backup_id}?agent_id={DOMAIN}.{mock_config_entry.entry_id}"
+    )
+    assert resp.status == 404
+
+
+@pytest.mark.parametrize(
+    ("side_effect", "error"),
+    [
+        (
+            WebDavError("Unknown path"),
+            "Backup operation failed: Unknown path",
+        ),
+        (TimeoutError(), "Backup operation timed out"),
+    ],
+)
+async def test_delete_error(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    webdav_client: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    side_effect: Exception,
+    error: str,
+) -> None:
+    """Test error during delete."""
+    webdav_client.clean.side_effect = side_effect
+
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id(
+        {
+            "type": "backup/delete",
+            "backup_id": BACKUP_METADATA["backup_id"],
+        }
+    )
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {
+        "agent_errors": {f"{DOMAIN}.{mock_config_entry.entry_id}": error}
+    }
+
+
+async def test_agents_delete_not_found_does_not_throw(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    webdav_client: AsyncMock,
+) -> None:
+    """Test agent delete backup."""
+    webdav_client.list_files.return_value = {}
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id(
+        {
+            "type": "backup/delete",
+            "backup_id": BACKUP_METADATA["backup_id"],
+        }
+    )
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"] == {"agent_errors": {}}
+
+
+async def test_agents_backup_not_found(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    webdav_client: AsyncMock,
+) -> None:
+    """Test backup not found."""
+    webdav_client.list_files.return_value = []
+    backup_id = BACKUP_METADATA["backup_id"]
+    client = await hass_ws_client(hass)
+    await client.send_json_auto_id({"type": "backup/details", "backup_id": backup_id})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"]["backup"] is None
+
+
+async def test_raises_on_403(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    webdav_client: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test we raise on 403."""
+    webdav_client.list_files.side_effect = UnauthorizedError(
+        "https://webdav.example.com"
+    )
+    backup_id = BACKUP_METADATA["backup_id"]
+    client = await hass_ws_client(hass)
+    await client.send_json_auto_id({"type": "backup/details", "backup_id": backup_id})
+    response = await client.receive_json()
+
+    assert response["success"]
+    assert response["result"]["agent_errors"] == {
+        f"{DOMAIN}.{mock_config_entry.entry_id}": "Authentication error"
+    }
+
+
+async def test_listeners_get_cleaned_up(hass: HomeAssistant) -> None:
+    """Test listener gets cleaned up."""
+    listener = AsyncMock()
+    remove_listener = async_register_backup_agents_listener(hass, listener=listener)
+
+    # make sure it's the last listener
+    hass.data[DATA_BACKUP_AGENT_LISTENERS] = [listener]
+    remove_listener()
+
+    assert hass.data.get(DATA_BACKUP_AGENT_LISTENERS) is None
diff --git a/tests/components/webdav/test_config_flow.py b/tests/components/webdav/test_config_flow.py
new file mode 100644
index 00000000000..9204e6eadab
--- /dev/null
+++ b/tests/components/webdav/test_config_flow.py
@@ -0,0 +1,150 @@
+"""Test the WebDAV config flow."""
+
+from unittest.mock import AsyncMock
+
+from aiowebdav2.exceptions import MethodNotSupportedError, UnauthorizedError
+import pytest
+
+from homeassistant import config_entries
+from homeassistant.components.webdav.const import CONF_BACKUP_PATH, DOMAIN
+from homeassistant.config_entries import SOURCE_USER
+from homeassistant.const import CONF_PASSWORD, CONF_URL, CONF_USERNAME, CONF_VERIFY_SSL
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from tests.common import MockConfigEntry
+
+
+@pytest.mark.usefixtures("mock_setup_entry")
+async def test_form(hass: HomeAssistant, webdav_client: AsyncMock) -> None:
+    """Test we get the form and create a entry on success."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_URL: "https://webdav.demo",
+            CONF_USERNAME: "user",
+            CONF_PASSWORD: "supersecretpassword",
+            CONF_BACKUP_PATH: "/backups",
+            CONF_VERIFY_SSL: False,
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "user@webdav.demo"
+    assert result["data"] == {
+        CONF_URL: "https://webdav.demo",
+        CONF_USERNAME: "user",
+        CONF_PASSWORD: "supersecretpassword",
+        CONF_BACKUP_PATH: "/backups",
+        CONF_VERIFY_SSL: False,
+    }
+    assert len(webdav_client.mock_calls) == 1
+
+
+@pytest.mark.usefixtures("mock_setup_entry")
+async def test_form_fail(hass: HomeAssistant, webdav_client: AsyncMock) -> None:
+    """Test to handle exceptions."""
+    webdav_client.check.return_value = False
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_USER},
+        data={
+            CONF_URL: "https://webdav.demo",
+            CONF_USERNAME: "user",
+            CONF_PASSWORD: "supersecretpassword",
+        },
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {"base": "cannot_connect"}
+
+    # reset and test for success
+    webdav_client.check.return_value = True
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_URL: "https://webdav.demo",
+            CONF_USERNAME: "user",
+            CONF_PASSWORD: "supersecretpassword",
+        },
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "user@webdav.demo"
+    assert "errors" not in result
+
+
+@pytest.mark.parametrize(
+    ("exception", "expected_error"),
+    [
+        (UnauthorizedError("https://webdav.demo"), "invalid_auth"),
+        (MethodNotSupportedError("check", "https://webdav.demo"), "invalid_method"),
+        (Exception("Unexpected error"), "unknown"),
+    ],
+)
+async def test_form_unauthorized(
+    hass: HomeAssistant,
+    webdav_client: AsyncMock,
+    exception: Exception,
+    expected_error: str,
+) -> None:
+    """Test to handle unauthorized."""
+    webdav_client.check.side_effect = exception
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_USER},
+        data={
+            CONF_URL: "https://webdav.demo",
+            CONF_USERNAME: "user",
+            CONF_PASSWORD: "supersecretpassword",
+        },
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {"base": expected_error}
+
+    # reset and test for success
+    webdav_client.check.side_effect = None
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_URL: "https://webdav.demo",
+            CONF_USERNAME: "user",
+            CONF_PASSWORD: "supersecretpassword",
+        },
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "user@webdav.demo"
+    assert "errors" not in result
+
+
+async def test_duplicate_entry(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry, webdav_client: AsyncMock
+) -> None:
+    """Test we get the form and create a entry on success."""
+    mock_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_USER},
+        data={
+            CONF_URL: "https://webdav.demo",
+            CONF_USERNAME: "user",
+            CONF_PASSWORD: "supersecretpassword",
+        },
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
diff --git a/tests/components/webdav/test_init.py b/tests/components/webdav/test_init.py
new file mode 100644
index 00000000000..124a644fa93
--- /dev/null
+++ b/tests/components/webdav/test_init.py
@@ -0,0 +1,112 @@
+"""Test WebDAV component setup."""
+
+from unittest.mock import AsyncMock
+
+from aiowebdav2.exceptions import WebDavError
+import pytest
+
+from homeassistant.components.webdav.const import CONF_BACKUP_PATH, DOMAIN
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import CONF_PASSWORD, CONF_URL, CONF_USERNAME
+from homeassistant.core import HomeAssistant
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry
+
+
+async def test_migrate_wrong_path(
+    hass: HomeAssistant, webdav_client: AsyncMock
+) -> None:
+    """Test migration of wrong encoded folder path."""
+    webdav_client.list_with_properties.return_value = [
+        {"/wrong%20path": []},
+    ]
+
+    config_entry = MockConfigEntry(
+        title="user@webdav.demo",
+        domain=DOMAIN,
+        data={
+            CONF_URL: "https://webdav.demo",
+            CONF_USERNAME: "user",
+            CONF_PASSWORD: "supersecretpassword",
+            CONF_BACKUP_PATH: "/wrong path",
+        },
+        entry_id="01JKXV07ASC62D620DGYNG2R8H",
+    )
+    await setup_integration(hass, config_entry)
+
+    webdav_client.move.assert_called_once_with("/wrong%20path", "/wrong path")
+
+
+@pytest.mark.parametrize(
+    ("expected_path", "remote_path_check"),
+    [
+        (
+            "/correct path",
+            False,
+        ),  # remote_path_check is False as /correct%20path is not there
+        ("/", True),
+        ("/folder_with_underscores", True),
+    ],
+)
+async def test_migrate_non_wrong_path(
+    hass: HomeAssistant,
+    webdav_client: AsyncMock,
+    expected_path: str,
+    remote_path_check: bool,
+) -> None:
+    """Test no migration of correct folder path."""
+    webdav_client.list_with_properties.return_value = [
+        {expected_path: []},
+    ]
+    # first return is used to check the connectivity
+    # second is used in the migration to determine if wrong quoted path is there
+    webdav_client.check.side_effect = [True, remote_path_check]
+
+    config_entry = MockConfigEntry(
+        title="user@webdav.demo",
+        domain=DOMAIN,
+        data={
+            CONF_URL: "https://webdav.demo",
+            CONF_USERNAME: "user",
+            CONF_PASSWORD: "supersecretpassword",
+            CONF_BACKUP_PATH: expected_path,
+        },
+        entry_id="01JKXV07ASC62D620DGYNG2R8H",
+    )
+
+    await setup_integration(hass, config_entry)
+
+    webdav_client.move.assert_not_called()
+
+
+async def test_migrate_error(
+    hass: HomeAssistant,
+    webdav_client: AsyncMock,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test migration of wrong encoded folder path with error."""
+    webdav_client.list_with_properties.return_value = [
+        {"/wrong%20path": []},
+    ]
+    webdav_client.move.side_effect = WebDavError("Failed to move")
+
+    config_entry = MockConfigEntry(
+        title="user@webdav.demo",
+        domain=DOMAIN,
+        data={
+            CONF_URL: "https://webdav.demo",
+            CONF_USERNAME: "user",
+            CONF_PASSWORD: "supersecretpassword",
+            CONF_BACKUP_PATH: "/wrong path",
+        },
+        entry_id="01JKXV07ASC62D620DGYNG2R8H",
+    )
+    await setup_integration(hass, config_entry)
+
+    assert config_entry.state is ConfigEntryState.SETUP_RETRY
+    assert (
+        'Failed to migrate wrong encoded folder "/wrong%20path" to "/wrong path"'
+        in caplog.text
+    )
diff --git a/tests/components/webmin/snapshots/test_diagnostics.ambr b/tests/components/webmin/snapshots/test_diagnostics.ambr
index 8299b0eafba..c64fa212a98 100644
--- a/tests/components/webmin/snapshots/test_diagnostics.ambr
+++ b/tests/components/webmin/snapshots/test_diagnostics.ambr
@@ -253,6 +253,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': '**REDACTED**',
       'unique_id': None,
       'version': 1,
diff --git a/tests/components/webmin/snapshots/test_sensor.ambr b/tests/components/webmin/snapshots/test_sensor.ambr
index 6af768d63a8..1af5fe46b5c 100644
--- a/tests/components/webmin/snapshots/test_sensor.ambr
+++ b/tests/components/webmin/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -57,6 +58,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -106,6 +108,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -155,6 +158,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -212,6 +216,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -269,6 +274,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -326,6 +332,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -376,6 +383,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -426,6 +434,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -476,6 +485,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -525,6 +535,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -574,6 +585,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -623,6 +635,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -680,6 +693,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -737,6 +751,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -794,6 +809,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -844,6 +860,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -894,6 +911,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -944,6 +962,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -993,6 +1012,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1042,6 +1062,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1091,6 +1112,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1148,6 +1170,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1205,6 +1228,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1262,6 +1286,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1319,6 +1344,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1376,6 +1402,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1424,7 +1451,7 @@
     'state': '8794.3125',
   })
 # ---
-# name: test_sensor[sensor.192_168_1_1_load_15m-entry]
+# name: test_sensor[sensor.192_168_1_1_load_15_min-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -1433,12 +1460,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.192_168_1_1_load_15m',
+    'entity_id': 'sensor.192_168_1_1_load_15_min',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -1450,7 +1478,7 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': 'Load (15m)',
+    'original_name': 'Load (15 min)',
     'platform': 'webmin',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -1459,21 +1487,21 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[sensor.192_168_1_1_load_15m-state]
+# name: test_sensor[sensor.192_168_1_1_load_15_min-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': '192.168.1.1 Load (15m)',
+      'friendly_name': '192.168.1.1 Load (15 min)',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.192_168_1_1_load_15m',
+    'entity_id': 'sensor.192_168_1_1_load_15_min',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '1.37',
   })
 # ---
-# name: test_sensor[sensor.192_168_1_1_load_1m-entry]
+# name: test_sensor[sensor.192_168_1_1_load_1_min-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -1482,12 +1510,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.192_168_1_1_load_1m',
+    'entity_id': 'sensor.192_168_1_1_load_1_min',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -1499,7 +1528,7 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': 'Load (1m)',
+    'original_name': 'Load (1 min)',
     'platform': 'webmin',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -1508,21 +1537,21 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[sensor.192_168_1_1_load_1m-state]
+# name: test_sensor[sensor.192_168_1_1_load_1_min-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': '192.168.1.1 Load (1m)',
+      'friendly_name': '192.168.1.1 Load (1 min)',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.192_168_1_1_load_1m',
+    'entity_id': 'sensor.192_168_1_1_load_1_min',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '1.29',
   })
 # ---
-# name: test_sensor[sensor.192_168_1_1_load_5m-entry]
+# name: test_sensor[sensor.192_168_1_1_load_5_min-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -1531,12 +1560,13 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.192_168_1_1_load_5m',
+    'entity_id': 'sensor.192_168_1_1_load_5_min',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -1548,7 +1578,7 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': 'Load (5m)',
+    'original_name': 'Load (5 min)',
     'platform': 'webmin',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -1557,14 +1587,14 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_sensor[sensor.192_168_1_1_load_5m-state]
+# name: test_sensor[sensor.192_168_1_1_load_5_min-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': '192.168.1.1 Load (5m)',
+      'friendly_name': '192.168.1.1 Load (5 min)',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.192_168_1_1_load_5m',
+    'entity_id': 'sensor.192_168_1_1_load_5_min',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -1580,6 +1610,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1637,6 +1668,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1694,6 +1726,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1751,6 +1784,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/webostv/conftest.py b/tests/components/webostv/conftest.py
index bf007f5b936..7fbd8d667e2 100644
--- a/tests/components/webostv/conftest.py
+++ b/tests/components/webostv/conftest.py
@@ -3,6 +3,7 @@
 from collections.abc import Generator
 from unittest.mock import AsyncMock, Mock, patch
 
+from aiowebostv import WebOsTvInfo, WebOsTvState
 import pytest
 
 from homeassistant.components.webostv.const import LIVE_TV_APP_ID
@@ -40,26 +41,30 @@ def client_fixture():
         ),
     ):
         client = mock_client_class.return_value
-        client.hello_info = {"deviceUUID": FAKE_UUID}
-        client.software_info = {"major_ver": "major", "minor_ver": "minor"}
-        client.system_info = {"modelName": TV_MODEL}
+        client.tv_info = WebOsTvInfo(
+            hello={"deviceUUID": FAKE_UUID},
+            system={"modelName": TV_MODEL, "serialNumber": "1234567890"},
+            software={"major_ver": "major", "minor_ver": "minor"},
+        )
         client.client_key = CLIENT_KEY
-        client.apps = MOCK_APPS
-        client.inputs = MOCK_INPUTS
-        client.current_app_id = LIVE_TV_APP_ID
+        client.tv_state = WebOsTvState(
+            apps=MOCK_APPS,
+            inputs=MOCK_INPUTS,
+            current_app_id=LIVE_TV_APP_ID,
+            channels=[CHANNEL_1, CHANNEL_2],
+            current_channel=CHANNEL_1,
+            volume=37,
+            sound_output="speaker",
+            muted=False,
+            is_on=True,
+            media_state=[{"playState": ""}],
+        )
 
-        client.channels = [CHANNEL_1, CHANNEL_2]
-        client.current_channel = CHANNEL_1
-
-        client.volume = 37
-        client.sound_output = "speaker"
-        client.muted = False
-        client.is_on = True
         client.is_registered = Mock(return_value=True)
         client.is_connected = Mock(return_value=True)
 
         async def mock_state_update_callback():
-            await client.register_state_update_callback.call_args[0][0](client)
+            await client.register_state_update_callback.call_args[0][0](client.tv_state)
 
         client.mock_state_update = AsyncMock(side_effect=mock_state_update_callback)
 
diff --git a/tests/components/webostv/snapshots/test_diagnostics.ambr b/tests/components/webostv/snapshots/test_diagnostics.ambr
index a9bd6e91ee0..2febee15deb 100644
--- a/tests/components/webostv/snapshots/test_diagnostics.ambr
+++ b/tests/components/webostv/snapshots/test_diagnostics.ambr
@@ -2,45 +2,73 @@
 # name: test_diagnostics
   dict({
     'client': dict({
-      'apps': dict({
-        'com.webos.app.livetv': dict({
-          'icon': '**REDACTED**',
-          'id': 'com.webos.app.livetv',
-          'largeIcon': '**REDACTED**',
-          'title': 'Live TV',
-        }),
-      }),
-      'current_app_id': 'com.webos.app.livetv',
-      'current_channel': dict({
-        'channelId': 'ch1id',
-        'channelName': 'Channel 1',
-        'channelNumber': '1',
-      }),
-      'hello_info': dict({
-        'deviceUUID': '**REDACTED**',
-      }),
-      'inputs': dict({
-        'in1': dict({
-          'appId': 'app0',
-          'id': 'in1',
-          'label': 'Input01',
-        }),
-        'in2': dict({
-          'appId': 'app1',
-          'id': 'in2',
-          'label': 'Input02',
-        }),
-      }),
       'is_connected': True,
-      'is_on': True,
       'is_registered': True,
-      'software_info': dict({
-        'major_ver': 'major',
-        'minor_ver': 'minor',
+      'tv_info': dict({
+        'hello': dict({
+          'deviceUUID': '**REDACTED**',
+        }),
+        'software': dict({
+          'major_ver': 'major',
+          'minor_ver': 'minor',
+        }),
+        'system': dict({
+          'modelName': 'MODEL',
+          'serialNumber': '1234567890',
+        }),
       }),
-      'sound_output': 'speaker',
-      'system_info': dict({
-        'modelName': 'MODEL',
+      'tv_state': dict({
+        'apps': dict({
+          'com.webos.app.livetv': dict({
+            'icon': '**REDACTED**',
+            'id': 'com.webos.app.livetv',
+            'largeIcon': '**REDACTED**',
+            'title': 'Live TV',
+          }),
+        }),
+        'channel_info': None,
+        'channels': list([
+          dict({
+            'channelId': 'ch1id',
+            'channelName': 'Channel 1',
+            'channelNumber': '1',
+          }),
+          dict({
+            'channelId': 'ch2id',
+            'channelName': 'Channel Name 2',
+            'channelNumber': '20',
+          }),
+        ]),
+        'current_app_id': 'com.webos.app.livetv',
+        'current_channel': dict({
+          'channelId': 'ch1id',
+          'channelName': 'Channel 1',
+          'channelNumber': '1',
+        }),
+        'inputs': dict({
+          'in1': dict({
+            'appId': 'app0',
+            'id': 'in1',
+            'label': 'Input01',
+          }),
+          'in2': dict({
+            'appId': 'app1',
+            'id': 'in2',
+            'label': 'Input02',
+          }),
+        }),
+        'is_on': True,
+        'is_screen_on': False,
+        'media_state': list([
+          dict({
+            'playState': '',
+          }),
+        ]),
+        'muted': False,
+        'power_state': dict({
+        }),
+        'sound_output': 'speaker',
+        'volume': 37,
       }),
     }),
     'entry': dict({
@@ -58,6 +86,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'LG webOS TV MODEL',
       'unique_id': '**REDACTED**',
       'version': 1,
diff --git a/tests/components/webostv/snapshots/test_media_player.ambr b/tests/components/webostv/snapshots/test_media_player.ambr
index 78c0bd517a6..9c097b166ec 100644
--- a/tests/components/webostv/snapshots/test_media_player.ambr
+++ b/tests/components/webostv/snapshots/test_media_player.ambr
@@ -1,4 +1,14 @@
 # serializer version: 1
+# name: test_command
+  dict({
+    'media_player.lg_webos_tv_model': dict({
+      'muted': False,
+      'returnValue': True,
+      'scenario': 'mastervolume_tv_speaker_ext',
+      'volume': 1,
+    }),
+  })
+# ---
 # name: test_entity_attributes
   StateSnapshot({
     'attributes': ReadOnlyDict({
@@ -29,6 +39,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -51,9 +62,17 @@
     'name': 'LG webOS TV MODEL',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
-    'serial_number': None,
+    'serial_number': '1234567890',
     'suggested_area': None,
     'sw_version': 'major.minor',
     'via_device_id': None,
   })
 # ---
+# name: test_select_sound_output
+  dict({
+    'media_player.lg_webos_tv_model': dict({
+      'method': 'setSystemSettings',
+      'returnValue': True,
+    }),
+  })
+# ---
diff --git a/tests/components/webostv/test_config_flow.py b/tests/components/webostv/test_config_flow.py
index 34ab39618d8..564ff9afa9b 100644
--- a/tests/components/webostv/test_config_flow.py
+++ b/tests/components/webostv/test_config_flow.py
@@ -84,8 +84,8 @@ async def test_options_flow_live_tv_in_apps(
     hass: HomeAssistant, client, apps, inputs
 ) -> None:
     """Test options config flow Live TV found in apps."""
-    client.apps = apps
-    client.inputs = inputs
+    client.tv_state.apps = apps
+    client.tv_state.inputs = inputs
     entry = await setup_webostv(hass)
 
     result = await hass.config_entries.options.async_init(entry.entry_id)
@@ -411,7 +411,7 @@ async def test_reconfigure_wrong_device(hass: HomeAssistant, client) -> None:
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "reconfigure"
 
-    client.hello_info = {"deviceUUID": "wrong_uuid"}
+    client.tv_info.hello = {"deviceUUID": "wrong_uuid"}
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"],
         user_input={CONF_HOST: "new_host"},
diff --git a/tests/components/webostv/test_media_player.py b/tests/components/webostv/test_media_player.py
index d5241dbe668..59e3fc68cf7 100644
--- a/tests/components/webostv/test_media_player.py
+++ b/tests/components/webostv/test_media_player.py
@@ -156,7 +156,7 @@ async def test_media_next_previous_track(
     getattr(client, client_call[1]).assert_called_once()
 
     # check next/previous for not Live TV channels
-    client.current_app_id = "in1"
+    client.tv_state.current_app_id = "in1"
     data = {ATTR_ENTITY_ID: ENTITY_ID}
     await hass.services.async_call(MP_DOMAIN, service, data, True)
 
@@ -229,17 +229,30 @@ async def test_button(hass: HomeAssistant, client) -> None:
     client.button.assert_called_with("test")
 
 
-async def test_command(hass: HomeAssistant, client) -> None:
+async def test_command(
+    hass: HomeAssistant,
+    client,
+    snapshot: SnapshotAssertion,
+) -> None:
     """Test generic command functionality."""
     await setup_webostv(hass)
+    client.request.return_value = {
+        "returnValue": True,
+        "scenario": "mastervolume_tv_speaker_ext",
+        "volume": 1,
+        "muted": False,
+    }
 
     data = {
         ATTR_ENTITY_ID: ENTITY_ID,
-        ATTR_COMMAND: "test",
+        ATTR_COMMAND: "audio/getVolume",
     }
-    await hass.services.async_call(DOMAIN, SERVICE_COMMAND, data, True)
+    response = await hass.services.async_call(
+        DOMAIN, SERVICE_COMMAND, data, True, return_response=True
+    )
     await hass.async_block_till_done()
-    client.request.assert_called_with("test", payload=None)
+    client.request.assert_called_with("audio/getVolume", payload=None)
+    assert response == snapshot
 
 
 async def test_command_with_optional_arg(hass: HomeAssistant, client) -> None:
@@ -258,25 +271,40 @@ async def test_command_with_optional_arg(hass: HomeAssistant, client) -> None:
     )
 
 
-async def test_select_sound_output(hass: HomeAssistant, client) -> None:
+async def test_select_sound_output(
+    hass: HomeAssistant,
+    client,
+    snapshot: SnapshotAssertion,
+) -> None:
     """Test select sound output service."""
     await setup_webostv(hass)
+    client.change_sound_output.return_value = {
+        "returnValue": True,
+        "method": "setSystemSettings",
+    }
 
     data = {
         ATTR_ENTITY_ID: ENTITY_ID,
         ATTR_SOUND_OUTPUT: "external_speaker",
     }
-    await hass.services.async_call(DOMAIN, SERVICE_SELECT_SOUND_OUTPUT, data, True)
+    response = await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SELECT_SOUND_OUTPUT,
+        data,
+        True,
+        return_response=True,
+    )
     await hass.async_block_till_done()
     client.change_sound_output.assert_called_once_with("external_speaker")
+    assert response == snapshot
 
 
 async def test_device_info_startup_off(
     hass: HomeAssistant, client, device_registry: dr.DeviceRegistry
 ) -> None:
     """Test device info when device is off at startup."""
-    client.system_info = None
-    client.is_on = False
+    client.tv_info.system = {}
+    client.tv_state.is_on = False
     entry = await setup_webostv(hass)
     await client.mock_state_update()
 
@@ -307,14 +335,14 @@ async def test_entity_attributes(
     assert state == snapshot(exclude=props("entity_picture"))
 
     # Volume level not available
-    client.volume = None
+    client.tv_state.volume = None
     await client.mock_state_update()
     attrs = hass.states.get(ENTITY_ID).attributes
 
     assert attrs.get(ATTR_MEDIA_VOLUME_LEVEL) is None
 
     # Channel change
-    client.current_channel = CHANNEL_2
+    client.tv_state.current_channel = CHANNEL_2
     await client.mock_state_update()
     attrs = hass.states.get(ENTITY_ID).attributes
 
@@ -325,8 +353,8 @@ async def test_entity_attributes(
     assert device == snapshot
 
     # Sound output when off
-    client.sound_output = None
-    client.is_on = False
+    client.tv_state.sound_output = None
+    client.tv_state.is_on = False
     await client.mock_state_update()
     state = hass.states.get(ENTITY_ID)
 
@@ -382,13 +410,13 @@ async def test_update_sources_live_tv_find(hass: HomeAssistant, client) -> None:
     assert len(sources) == 3
 
     # Live TV is current app
-    client.apps = {
+    client.tv_state.apps = {
         LIVE_TV_APP_ID: {
             "title": "Live TV",
             "id": "some_id",
         },
     }
-    client.current_app_id = "some_id"
+    client.tv_state.current_app_id = "some_id"
     await client.mock_state_update()
     sources = hass.states.get(ENTITY_ID).attributes[ATTR_INPUT_SOURCE_LIST]
 
@@ -396,7 +424,7 @@ async def test_update_sources_live_tv_find(hass: HomeAssistant, client) -> None:
     assert len(sources) == 3
 
     # Live TV is is in inputs
-    client.inputs = {
+    client.tv_state.inputs = {
         LIVE_TV_APP_ID: {
             "label": "Live TV",
             "id": "some_id",
@@ -410,7 +438,7 @@ async def test_update_sources_live_tv_find(hass: HomeAssistant, client) -> None:
     assert len(sources) == 1
 
     # Live TV is current input
-    client.inputs = {
+    client.tv_state.inputs = {
         LIVE_TV_APP_ID: {
             "label": "Live TV",
             "id": "some_id",
@@ -424,7 +452,7 @@ async def test_update_sources_live_tv_find(hass: HomeAssistant, client) -> None:
     assert len(sources) == 1
 
     # Live TV not found
-    client.current_app_id = "other_id"
+    client.tv_state.current_app_id = "other_id"
     await client.mock_state_update()
     sources = hass.states.get(ENTITY_ID).attributes[ATTR_INPUT_SOURCE_LIST]
 
@@ -432,8 +460,8 @@ async def test_update_sources_live_tv_find(hass: HomeAssistant, client) -> None:
     assert len(sources) == 1
 
     # Live TV not found in sources/apps but is current app
-    client.apps = {}
-    client.current_app_id = LIVE_TV_APP_ID
+    client.tv_state.apps = {}
+    client.tv_state.current_app_id = LIVE_TV_APP_ID
     await client.mock_state_update()
     sources = hass.states.get(ENTITY_ID).attributes[ATTR_INPUT_SOURCE_LIST]
 
@@ -441,7 +469,7 @@ async def test_update_sources_live_tv_find(hass: HomeAssistant, client) -> None:
     assert len(sources) == 1
 
     # Bad update, keep old update
-    client.inputs = {}
+    client.tv_state.inputs = {}
     await client.mock_state_update()
     sources = hass.states.get(ENTITY_ID).attributes[ATTR_INPUT_SOURCE_LIST]
 
@@ -515,7 +543,7 @@ async def test_control_error_handling(
     """Test control errors handling."""
     await setup_webostv(hass)
     client.play.side_effect = exception
-    client.is_on = is_on
+    client.tv_state.is_on = is_on
     await client.mock_state_update()
 
     data = {ATTR_ENTITY_ID: ENTITY_ID}
@@ -525,9 +553,20 @@ async def test_control_error_handling(
     assert client.play.call_count == int(is_on)
 
 
+async def test_turn_off_when_device_is_off(hass: HomeAssistant, client) -> None:
+    """Test no error when turning off device that is already off."""
+    await setup_webostv(hass)
+    client.is_on = False
+    await client.mock_state_update()
+
+    data = {ATTR_ENTITY_ID: ENTITY_ID}
+    await hass.services.async_call(MP_DOMAIN, SERVICE_TURN_OFF, data, True)
+    assert client.power_off.call_count == 1
+
+
 async def test_supported_features(hass: HomeAssistant, client) -> None:
     """Test test supported features."""
-    client.sound_output = "lineout"
+    client.tv_state.sound_output = "lineout"
     await setup_webostv(hass)
     await client.mock_state_update()
 
@@ -538,7 +577,7 @@ async def test_supported_features(hass: HomeAssistant, client) -> None:
     assert attrs[ATTR_SUPPORTED_FEATURES] == supported
 
     # Support volume mute, step
-    client.sound_output = "external_speaker"
+    client.tv_state.sound_output = "external_speaker"
     await client.mock_state_update()
     supported = supported | SUPPORT_WEBOSTV_VOLUME
     attrs = hass.states.get(ENTITY_ID).attributes
@@ -546,7 +585,7 @@ async def test_supported_features(hass: HomeAssistant, client) -> None:
     assert attrs[ATTR_SUPPORTED_FEATURES] == supported
 
     # Support volume mute, step, set
-    client.sound_output = "speaker"
+    client.tv_state.sound_output = "speaker"
     await client.mock_state_update()
     supported = supported | SUPPORT_WEBOSTV_VOLUME | MediaPlayerEntityFeature.VOLUME_SET
     attrs = hass.states.get(ENTITY_ID).attributes
@@ -584,8 +623,8 @@ async def test_supported_features(hass: HomeAssistant, client) -> None:
 
 async def test_cached_supported_features(hass: HomeAssistant, client) -> None:
     """Test test supported features."""
-    client.is_on = False
-    client.sound_output = None
+    client.tv_state.is_on = False
+    client.tv_state.sound_output = None
     supported = (
         SUPPORT_WEBOSTV | SUPPORT_WEBOSTV_VOLUME | MediaPlayerEntityFeature.TURN_ON
     )
@@ -613,8 +652,8 @@ async def test_cached_supported_features(hass: HomeAssistant, client) -> None:
     )
 
     # TV on, support volume mute, step
-    client.is_on = True
-    client.sound_output = "external_speaker"
+    client.tv_state.is_on = True
+    client.tv_state.sound_output = "external_speaker"
     await client.mock_state_update()
 
     supported = SUPPORT_WEBOSTV | SUPPORT_WEBOSTV_VOLUME
@@ -623,8 +662,8 @@ async def test_cached_supported_features(hass: HomeAssistant, client) -> None:
     assert attrs[ATTR_SUPPORTED_FEATURES] == supported
 
     # TV off, support volume mute, step
-    client.is_on = False
-    client.sound_output = None
+    client.tv_state.is_on = False
+    client.tv_state.sound_output = None
     await client.mock_state_update()
 
     supported = SUPPORT_WEBOSTV | SUPPORT_WEBOSTV_VOLUME
@@ -633,8 +672,8 @@ async def test_cached_supported_features(hass: HomeAssistant, client) -> None:
     assert attrs[ATTR_SUPPORTED_FEATURES] == supported
 
     # TV on, support volume mute, step, set
-    client.is_on = True
-    client.sound_output = "speaker"
+    client.tv_state.is_on = True
+    client.tv_state.sound_output = "speaker"
     await client.mock_state_update()
 
     supported = (
@@ -645,8 +684,8 @@ async def test_cached_supported_features(hass: HomeAssistant, client) -> None:
     assert attrs[ATTR_SUPPORTED_FEATURES] == supported
 
     # TV off, support volume mute, step, set
-    client.is_on = False
-    client.sound_output = None
+    client.tv_state.is_on = False
+    client.tv_state.sound_output = None
     await client.mock_state_update()
 
     supported = (
@@ -689,8 +728,8 @@ async def test_cached_supported_features(hass: HomeAssistant, client) -> None:
 
 async def test_supported_features_no_cache(hass: HomeAssistant, client) -> None:
     """Test supported features if device is off and no cache."""
-    client.is_on = False
-    client.sound_output = None
+    client.tv_state.is_on = False
+    client.tv_state.sound_output = None
     await setup_webostv(hass)
 
     supported = (
@@ -733,7 +772,7 @@ async def test_get_image_http(
 ) -> None:
     """Test get image via http."""
     url = "http://something/valid_icon"
-    client.apps[LIVE_TV_APP_ID]["icon"] = url
+    client.tv_state.apps[LIVE_TV_APP_ID]["icon"] = url
     await setup_webostv(hass)
     await client.mock_state_update()
 
@@ -758,7 +797,7 @@ async def test_get_image_http_error(
 ) -> None:
     """Test get image via http error."""
     url = "http://something/icon_error"
-    client.apps[LIVE_TV_APP_ID]["icon"] = url
+    client.tv_state.apps[LIVE_TV_APP_ID]["icon"] = url
     await setup_webostv(hass)
     await client.mock_state_update()
 
@@ -784,7 +823,7 @@ async def test_get_image_https(
 ) -> None:
     """Test get image via http."""
     url = "https://something/valid_icon_https"
-    client.apps[LIVE_TV_APP_ID]["icon"] = url
+    client.tv_state.apps[LIVE_TV_APP_ID]["icon"] = url
     await setup_webostv(hass)
     await client.mock_state_update()
 
@@ -832,18 +871,18 @@ async def test_update_media_state(hass: HomeAssistant, client) -> None:
     """Test updating media state."""
     await setup_webostv(hass)
 
-    client.media_state = [{"playState": "playing"}]
+    client.tv_state.media_state = [{"playState": "playing"}]
     await client.mock_state_update()
     assert hass.states.get(ENTITY_ID).state == MediaPlayerState.PLAYING
 
-    client.media_state = [{"playState": "paused"}]
+    client.tv_state.media_state = [{"playState": "paused"}]
     await client.mock_state_update()
     assert hass.states.get(ENTITY_ID).state == MediaPlayerState.PAUSED
 
-    client.media_state = [{"playState": "unloaded"}]
+    client.tv_state.media_state = [{"playState": "unloaded"}]
     await client.mock_state_update()
     assert hass.states.get(ENTITY_ID).state == MediaPlayerState.IDLE
 
-    client.is_on = False
+    client.tv_state.is_on = False
     await client.mock_state_update()
     assert hass.states.get(ENTITY_ID).state == STATE_OFF
diff --git a/tests/components/webostv/test_notify.py b/tests/components/webostv/test_notify.py
index fd56f0ea0bb..e64d58b8f91 100644
--- a/tests/components/webostv/test_notify.py
+++ b/tests/components/webostv/test_notify.py
@@ -104,7 +104,7 @@ async def test_errors(
 ) -> None:
     """Test error scenarios."""
     await setup_webostv(hass)
-    client.is_on = is_on
+    client.tv_state.is_on = is_on
 
     assert hass.services.has_service("notify", SERVICE_NAME)
 
diff --git a/tests/components/websocket_api/test_auth.py b/tests/components/websocket_api/test_auth.py
index d55d2f97017..49ee593fed7 100644
--- a/tests/components/websocket_api/test_auth.py
+++ b/tests/components/websocket_api/test_auth.py
@@ -3,7 +3,7 @@
 from unittest.mock import patch
 
 import aiohttp
-from aiohttp import WSMsgType
+from aiohttp import WSMsgType, web
 import pytest
 
 from homeassistant.auth.providers.homeassistant import HassAuthProvider
@@ -258,7 +258,7 @@ async def test_auth_sending_binary_disconnects(
         await ws.send_bytes(b"[INVALID]")
 
         auth_msg = await ws.receive()
-        assert auth_msg.type == WSMsgType.close
+        assert auth_msg.type is WSMsgType.CLOSE
 
 
 async def test_auth_close_disconnects(
@@ -277,7 +277,40 @@ async def test_auth_close_disconnects(
         await ws.close()
 
         auth_msg = await ws.receive()
-        assert auth_msg.type == WSMsgType.CLOSED
+        assert auth_msg.type is WSMsgType.CLOSED
+
+
+async def test_auth_error_disconnects(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test error during auth."""
+    assert await async_setup_component(hass, "websocket_api", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client_no_auth()
+    ws_response = web.WebSocketResponse()
+
+    with patch(
+        "homeassistant.components.websocket_api.http.web.WebSocketResponse",
+        return_value=ws_response,
+    ):
+        async with client.ws_connect(URL) as ws:
+            auth_msg = await ws.receive_json()
+            assert auth_msg["type"] == TYPE_AUTH_REQUIRED
+
+            ws_response._reader.feed_data(
+                aiohttp.WSMessage(
+                    type=WSMsgType.ERROR, data=Exception("explode"), extra=None
+                ),
+                0,
+            )
+
+            auth_msg = await ws.receive()
+            assert auth_msg.type is WSMsgType.CLOSE
+
+    assert "Received error message during auth phase: explode" in caplog.text
 
 
 async def test_auth_sending_unknown_type_disconnects(
@@ -296,3 +329,41 @@ async def test_auth_sending_unknown_type_disconnects(
         await ws._writer.send_frame(b"1" * 130, 0x30)
         auth_msg = await ws.receive()
         assert auth_msg.type == WSMsgType.close
+
+
+async def test_error_right_after_auth_disconnects(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    hass_access_token: str,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test error right after auth."""
+    assert await async_setup_component(hass, "websocket_api", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client_no_auth()
+    ws_response = web.WebSocketResponse()
+
+    with patch(
+        "homeassistant.components.websocket_api.http.web.WebSocketResponse",
+        return_value=ws_response,
+    ):
+        async with client.ws_connect(URL) as ws:
+            auth_msg = await ws.receive_json()
+            assert auth_msg["type"] == TYPE_AUTH_REQUIRED
+
+            await ws.send_json({"type": TYPE_AUTH, "access_token": hass_access_token})
+            auth_msg = await ws.receive_json()
+            assert auth_msg["type"] == TYPE_AUTH_OK
+
+            ws_response._reader.feed_data(
+                aiohttp.WSMessage(
+                    type=WSMsgType.ERROR, data=Exception("explode"), extra=None
+                ),
+                0,
+            )
+
+            close_error_msg = await ws.receive()
+            assert close_error_msg.type is WSMsgType.CLOSE
+
+    assert "Received error message during command phase: explode" in caplog.text
diff --git a/tests/components/websocket_api/test_commands.py b/tests/components/websocket_api/test_commands.py
index 22e839d84e4..c0114cde42b 100644
--- a/tests/components/websocket_api/test_commands.py
+++ b/tests/components/websocket_api/test_commands.py
@@ -460,10 +460,10 @@ async def test_call_service_child_not_found(
         "domain_test.test_service which was not found."
     )
     assert msg["error"]["translation_placeholders"] == {
-        "domain": "non",
-        "service": "existing",
-        "child_domain": "domain_test",
-        "child_service": "test_service",
+        "domain": "domain_test",
+        "service": "test_service",
+        "child_domain": "non",
+        "child_service": "existing",
     }
     assert msg["error"]["translation_key"] == "child_service_not_found"
     assert msg["error"]["translation_domain"] == "websocket_api"
@@ -540,6 +540,7 @@ async def test_call_service_schema_validation_error(
     assert len(calls) == 0
 
 
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 async def test_call_service_error(
     hass: HomeAssistant, websocket_client: MockHAClientWebSocket
 ) -> None:
@@ -2390,9 +2391,7 @@ async def test_execute_script(
         ),
     ],
 )
-@pytest.mark.parametrize(
-    "ignore_translations", ["component.test.exceptions.test_error.message"]
-)
+@pytest.mark.parametrize("ignore_translations_for_mock_domains", ["test"])
 async def test_execute_script_err_localization(
     hass: HomeAssistant,
     websocket_client: MockHAClientWebSocket,
diff --git a/tests/components/weheat/snapshots/test_binary_sensor.ambr b/tests/components/weheat/snapshots/test_binary_sensor.ambr
index 08d609ca610..bdcd727fbcc 100644
--- a/tests/components/weheat/snapshots/test_binary_sensor.ambr
+++ b/tests/components/weheat/snapshots/test_binary_sensor.ambr
@@ -1,17 +1,18 @@
 # serializer version: 1
-# name: test_binary_entities[binary_sensor.test_model_indoor_unit_auxilary_water_pump-entry]
+# name: test_binary_entities[binary_sensor.test_model_indoor_unit_auxiliary_water_pump-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'binary_sensor',
     'entity_category': None,
-    'entity_id': 'binary_sensor.test_model_indoor_unit_auxilary_water_pump',
+    'entity_id': 'binary_sensor.test_model_indoor_unit_auxiliary_water_pump',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -23,7 +24,7 @@
     }),
     'original_device_class': <BinarySensorDeviceClass.RUNNING: 'running'>,
     'original_icon': None,
-    'original_name': 'Indoor unit auxilary water pump',
+    'original_name': 'Indoor unit auxiliary water pump',
     'platform': 'weheat',
     'previous_unique_id': None,
     'supported_features': 0,
@@ -32,14 +33,14 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_binary_entities[binary_sensor.test_model_indoor_unit_auxilary_water_pump-state]
+# name: test_binary_entities[binary_sensor.test_model_indoor_unit_auxiliary_water_pump-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'running',
-      'friendly_name': 'Test Model Indoor unit auxilary water pump',
+      'friendly_name': 'Test Model Indoor unit auxiliary water pump',
     }),
     'context': <ANY>,
-    'entity_id': 'binary_sensor.test_model_indoor_unit_auxilary_water_pump',
+    'entity_id': 'binary_sensor.test_model_indoor_unit_auxiliary_water_pump',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -146,6 +149,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/weheat/snapshots/test_sensor.ambr b/tests/components/weheat/snapshots/test_sensor.ambr
index 1a54711d6c5..77f85224913 100644
--- a/tests/components/weheat/snapshots/test_sensor.ambr
+++ b/tests/components/weheat/snapshots/test_sensor.ambr
@@ -18,6 +18,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -78,6 +79,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -132,6 +134,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -182,6 +185,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -232,6 +236,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -284,6 +289,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -338,6 +344,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -392,6 +399,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -446,6 +454,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -497,6 +506,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -551,6 +561,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -605,6 +616,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -659,6 +671,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -713,6 +726,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -764,6 +778,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -818,6 +833,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -872,6 +888,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/whirlpool/__init__.py b/tests/components/whirlpool/__init__.py
index ca00975941a..97d9b4d61d5 100644
--- a/tests/components/whirlpool/__init__.py
+++ b/tests/components/whirlpool/__init__.py
@@ -31,5 +31,4 @@ async def init_integration_with_entry(
     entry.add_to_hass(hass)
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
-
     return entry
diff --git a/tests/components/whirlpool/conftest.py b/tests/components/whirlpool/conftest.py
index c302922fe25..93881d3735a 100644
--- a/tests/components/whirlpool/conftest.py
+++ b/tests/components/whirlpool/conftest.py
@@ -8,10 +8,7 @@ import whirlpool
 import whirlpool.aircon
 from whirlpool.backendselector import Brand, Region
 
-MOCK_SAID1 = "said1"
-MOCK_SAID2 = "said2"
-MOCK_SAID3 = "said3"
-MOCK_SAID4 = "said4"
+from .const import MOCK_SAID1, MOCK_SAID2, MOCK_SAID3, MOCK_SAID4
 
 
 @pytest.fixture(
@@ -36,7 +33,7 @@ def fixture_brand(request: pytest.FixtureRequest) -> tuple[str, Brand]:
     return request.param
 
 
-@pytest.fixture(name="mock_auth_api")
+@pytest.fixture(name="mock_auth_api", autouse=True)
 def fixture_mock_auth_api():
     """Set up Auth fixture."""
     with (
@@ -50,8 +47,10 @@ def fixture_mock_auth_api():
         yield mock_auth
 
 
-@pytest.fixture(name="mock_appliances_manager_api")
-def fixture_mock_appliances_manager_api():
+@pytest.fixture(name="mock_appliances_manager_api", autouse=True)
+def fixture_mock_appliances_manager_api(
+    mock_aircon1_api, mock_aircon2_api, mock_sensor1_api, mock_sensor2_api
+):
     """Set up AppliancesManager fixture."""
     with (
         mock.patch(
@@ -63,28 +62,15 @@ def fixture_mock_appliances_manager_api():
         ),
     ):
         mock_appliances_manager.return_value.fetch_appliances = AsyncMock()
+        mock_appliances_manager.return_value.connect = AsyncMock()
+        mock_appliances_manager.return_value.disconnect = AsyncMock()
         mock_appliances_manager.return_value.aircons = [
-            {"SAID": MOCK_SAID1, "NAME": "TestZone"},
-            {"SAID": MOCK_SAID2, "NAME": "TestZone"},
+            mock_aircon1_api,
+            mock_aircon2_api,
         ]
         mock_appliances_manager.return_value.washer_dryers = [
-            {"SAID": MOCK_SAID3, "NAME": "washer"},
-            {"SAID": MOCK_SAID4, "NAME": "dryer"},
-        ]
-        yield mock_appliances_manager
-
-
-@pytest.fixture(name="mock_appliances_manager_laundry_api")
-def fixture_mock_appliances_manager_laundry_api():
-    """Set up AppliancesManager fixture."""
-    with mock.patch(
-        "homeassistant.components.whirlpool.AppliancesManager"
-    ) as mock_appliances_manager:
-        mock_appliances_manager.return_value.fetch_appliances = AsyncMock()
-        mock_appliances_manager.return_value.aircons = None
-        mock_appliances_manager.return_value.washer_dryers = [
-            {"SAID": MOCK_SAID3, "NAME": "washer"},
-            {"SAID": MOCK_SAID4, "NAME": "dryer"},
+            mock_sensor1_api,
+            mock_sensor2_api,
         ]
         yield mock_appliances_manager
 
@@ -107,9 +93,11 @@ def fixture_mock_backend_selector_api():
 def get_aircon_mock(said):
     """Get a mock of an air conditioner."""
     mock_aircon = mock.Mock(said=said)
-    mock_aircon.connect = AsyncMock()
-    mock_aircon.disconnect = AsyncMock()
+    mock_aircon.name = f"Aircon {said}"
     mock_aircon.register_attr_callback = MagicMock()
+    mock_aircon.appliance_info.data_model = "aircon_model"
+    mock_aircon.appliance_info.category = "aircon"
+    mock_aircon.appliance_info.model_number = "12345"
     mock_aircon.get_online.return_value = True
     mock_aircon.get_power_on.return_value = True
     mock_aircon.get_mode.return_value = whirlpool.aircon.Mode.Cool
@@ -132,13 +120,13 @@ def get_aircon_mock(said):
 
 
 @pytest.fixture(name="mock_aircon1_api", autouse=False)
-def fixture_mock_aircon1_api(mock_auth_api, mock_appliances_manager_api):
+def fixture_mock_aircon1_api():
     """Set up air conditioner API fixture."""
     return get_aircon_mock(MOCK_SAID1)
 
 
 @pytest.fixture(name="mock_aircon2_api", autouse=False)
-def fixture_mock_aircon2_api(mock_auth_api, mock_appliances_manager_api):
+def fixture_mock_aircon2_api():
     """Set up air conditioner API fixture."""
     return get_aircon_mock(MOCK_SAID2)
 
@@ -168,9 +156,11 @@ def side_effect_function(*args, **kwargs):
 def get_sensor_mock(said):
     """Get a mock of a sensor."""
     mock_sensor = mock.Mock(said=said)
-    mock_sensor.connect = AsyncMock()
-    mock_sensor.disconnect = AsyncMock()
+    mock_sensor.name = f"WasherDryer {said}"
     mock_sensor.register_attr_callback = MagicMock()
+    mock_sensor.appliance_info.data_model = "washer_dryer_model"
+    mock_sensor.appliance_info.category = "washer_dryer"
+    mock_sensor.appliance_info.model_number = "12345"
     mock_sensor.get_online.return_value = True
     mock_sensor.get_machine_state.return_value = (
         whirlpool.washerdryer.MachineState.Standby
@@ -187,13 +177,13 @@ def get_sensor_mock(said):
 
 
 @pytest.fixture(name="mock_sensor1_api", autouse=False)
-def fixture_mock_sensor1_api(mock_auth_api, mock_appliances_manager_laundry_api):
+def fixture_mock_sensor1_api():
     """Set up sensor API fixture."""
     return get_sensor_mock(MOCK_SAID3)
 
 
 @pytest.fixture(name="mock_sensor2_api", autouse=False)
-def fixture_mock_sensor2_api(mock_auth_api, mock_appliances_manager_laundry_api):
+def fixture_mock_sensor2_api():
     """Set up sensor API fixture."""
     return get_sensor_mock(MOCK_SAID4)
 
diff --git a/tests/components/whirlpool/const.py b/tests/components/whirlpool/const.py
new file mode 100644
index 00000000000..04ea5c0645c
--- /dev/null
+++ b/tests/components/whirlpool/const.py
@@ -0,0 +1,6 @@
+"""Constants for the Whirlpool Sixth Sense integration tests."""
+
+MOCK_SAID1 = "said1"
+MOCK_SAID2 = "said2"
+MOCK_SAID3 = "said3"
+MOCK_SAID4 = "said4"
diff --git a/tests/components/whirlpool/snapshots/test_diagnostics.ambr b/tests/components/whirlpool/snapshots/test_diagnostics.ambr
index c60ce17b952..7ffae8bc808 100644
--- a/tests/components/whirlpool/snapshots/test_diagnostics.ambr
+++ b/tests/components/whirlpool/snapshots/test_diagnostics.ambr
@@ -2,24 +2,32 @@
 # name: test_entry_diagnostics
   dict({
     'appliances': dict({
-      'Washer_dryers': dict({
-        'dryer': dict({
-          'NAME': 'dryer',
-          'SAID': '**REDACTED**',
-        }),
-        'washer': dict({
-          'NAME': 'washer',
-          'SAID': '**REDACTED**',
-        }),
-      }),
       'aircons': dict({
-        'TestZone': dict({
-          'NAME': 'TestZone',
-          'SAID': '**REDACTED**',
+        'Aircon said1': dict({
+          'category': 'aircon',
+          'data_model': 'aircon_model',
+          'model_number': '12345',
+        }),
+        'Aircon said2': dict({
+          'category': 'aircon',
+          'data_model': 'aircon_model',
+          'model_number': '12345',
         }),
       }),
       'ovens': dict({
       }),
+      'washer_dryers': dict({
+        'WasherDryer said3': dict({
+          'category': 'washer_dryer',
+          'data_model': 'washer_dryer_model',
+          'model_number': '12345',
+        }),
+        'WasherDryer said4': dict({
+          'category': 'washer_dryer',
+          'data_model': 'washer_dryer_model',
+          'model_number': '12345',
+        }),
+      }),
     }),
     'config_entry': dict({
       'data': dict({
@@ -38,6 +46,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': None,
       'version': 1,
diff --git a/tests/components/whirlpool/test_climate.py b/tests/components/whirlpool/test_climate.py
index cdae28f4432..0586d654f7f 100644
--- a/tests/components/whirlpool/test_climate.py
+++ b/tests/components/whirlpool/test_climate.py
@@ -68,6 +68,7 @@ async def test_no_appliances(
 ) -> None:
     """Test the setup of the climate entities when there are no appliances available."""
     mock_appliances_manager_api.return_value.aircons = []
+    mock_appliances_manager_api.return_value.washer_dryers = []
     await init_integration(hass)
     assert len(hass.states.async_all()) == 0
 
@@ -75,16 +76,15 @@ async def test_no_appliances(
 async def test_static_attributes(
     hass: HomeAssistant,
     entity_registry: er.EntityRegistry,
-    mock_aircon1_api: MagicMock,
-    mock_aircon_api_instances: MagicMock,
 ) -> None:
     """Test static climate attributes."""
     await init_integration(hass)
 
-    for entity_id in ("climate.said1", "climate.said2"):
+    for said in ("said1", "said2"):
+        entity_id = f"climate.{said}"
         entry = entity_registry.async_get(entity_id)
         assert entry
-        assert entry.unique_id == entity_id.split(".")[1]
+        assert entry.unique_id == said
 
         state = hass.states.get(entity_id)
         assert state is not None
@@ -92,7 +92,7 @@ async def test_static_attributes(
         assert state.state == HVACMode.COOL
 
         attributes = state.attributes
-        assert attributes[ATTR_FRIENDLY_NAME] == "TestZone"
+        assert attributes[ATTR_FRIENDLY_NAME] == f"Aircon {said}"
 
         assert (
             attributes[ATTR_SUPPORTED_FEATURES]
@@ -123,7 +123,6 @@ async def test_static_attributes(
 
 async def test_dynamic_attributes(
     hass: HomeAssistant,
-    mock_aircon_api_instances: MagicMock,
     mock_aircon1_api: MagicMock,
     mock_aircon2_api: MagicMock,
 ) -> None:
@@ -212,7 +211,6 @@ async def test_dynamic_attributes(
 
 async def test_service_calls(
     hass: HomeAssistant,
-    mock_aircon_api_instances: MagicMock,
     mock_aircon1_api: MagicMock,
     mock_aircon2_api: MagicMock,
 ) -> None:
diff --git a/tests/components/whirlpool/test_config_flow.py b/tests/components/whirlpool/test_config_flow.py
index 94a34c96e2c..e01fbc07b51 100644
--- a/tests/components/whirlpool/test_config_flow.py
+++ b/tests/components/whirlpool/test_config_flow.py
@@ -3,8 +3,8 @@
 from unittest.mock import MagicMock, patch
 
 import aiohttp
-from aiohttp.client_exceptions import ClientConnectionError
 import pytest
+from whirlpool.auth import AccountLockedError
 
 from homeassistant import config_entries
 from homeassistant.components.whirlpool.const import CONF_BRAND, DOMAIN
@@ -20,9 +20,22 @@ CONFIG_INPUT = {
 }
 
 
+@pytest.fixture(name="mock_whirlpool_setup_entry")
+def fixture_mock_whirlpool_setup_entry():
+    """Set up async_setup_entry fixture."""
+    with patch(
+        "homeassistant.components.whirlpool.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
 @pytest.mark.usefixtures("mock_auth_api", "mock_appliances_manager_api")
 async def test_form(
-    hass: HomeAssistant, region, brand, mock_backend_selector_api: MagicMock
+    hass: HomeAssistant,
+    region,
+    brand,
+    mock_backend_selector_api: MagicMock,
+    mock_whirlpool_setup_entry: MagicMock,
 ) -> None:
     """Test we get the form."""
     result = await hass.config_entries.flow.async_init(
@@ -32,14 +45,10 @@ async def test_form(
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == config_entries.SOURCE_USER
 
-    with patch(
-        "homeassistant.components.whirlpool.async_setup_entry", return_value=True
-    ) as mock_setup_entry:
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            CONFIG_INPUT | {"region": region[0], "brand": brand[0]},
-        )
-        await hass.async_block_till_done()
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        CONFIG_INPUT | {"region": region[0], "brand": brand[0]},
+    )
 
     assert result2["type"] is FlowResultType.CREATE_ENTRY
     assert result2["title"] == "test-username"
@@ -49,7 +58,7 @@ async def test_form(
         "region": region[0],
         "brand": brand[0],
     }
-    assert len(mock_setup_entry.mock_calls) == 1
+    assert len(mock_whirlpool_setup_entry.mock_calls) == 1
     mock_backend_selector_api.assert_called_once_with(brand[1], region[1])
 
 
@@ -70,19 +79,32 @@ async def test_form_invalid_auth(
     assert result2["errors"] == {"base": "invalid_auth"}
 
 
-async def test_form_cannot_connect(
+@pytest.mark.usefixtures("mock_appliances_manager_api")
+@pytest.mark.parametrize(
+    ("exception", "expected_error"),
+    [
+        (AccountLockedError, "account_locked"),
+        (aiohttp.ClientConnectionError, "cannot_connect"),
+        (TimeoutError, "cannot_connect"),
+        (Exception, "unknown"),
+    ],
+)
+async def test_form_auth_error(
     hass: HomeAssistant,
+    exception: Exception,
+    expected_error: str,
     region,
     brand,
     mock_auth_api: MagicMock,
+    mock_whirlpool_setup_entry: MagicMock,
 ) -> None:
     """Test we handle cannot connect error."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
 
-    mock_auth_api.return_value.do_auth.side_effect = aiohttp.ClientConnectionError
-    result2 = await hass.config_entries.flow.async_configure(
+    mock_auth_api.return_value.do_auth.side_effect = exception
+    result = await hass.config_entries.flow.async_configure(
         result["flow_id"],
         CONFIG_INPUT
         | {
@@ -90,56 +112,25 @@ async def test_form_cannot_connect(
             "brand": brand[0],
         },
     )
-    assert result2["type"] is FlowResultType.FORM
-    assert result2["errors"] == {"base": "cannot_connect"}
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {"base": expected_error}
 
-
-async def test_form_auth_timeout(
-    hass: HomeAssistant,
-    region,
-    brand,
-    mock_auth_api: MagicMock,
-) -> None:
-    """Test we handle auth timeout error."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-
-    mock_auth_api.return_value.do_auth.side_effect = TimeoutError
-    result2 = await hass.config_entries.flow.async_configure(
+    # Test that it succeeds after the error is cleared
+    mock_auth_api.return_value.do_auth.side_effect = None
+    result = await hass.config_entries.flow.async_configure(
         result["flow_id"],
-        CONFIG_INPUT
-        | {
-            "region": region[0],
-            "brand": brand[0],
-        },
-    )
-    assert result2["type"] is FlowResultType.FORM
-    assert result2["errors"] == {"base": "cannot_connect"}
-
-
-async def test_form_generic_auth_exception(
-    hass: HomeAssistant,
-    region,
-    brand,
-    mock_auth_api: MagicMock,
-) -> None:
-    """Test we handle cannot connect error."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
+        CONFIG_INPUT | {"region": region[0], "brand": brand[0]},
     )
 
-    mock_auth_api.return_value.do_auth.side_effect = Exception
-    result2 = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        CONFIG_INPUT
-        | {
-            "region": region[0],
-            "brand": brand[0],
-        },
-    )
-    assert result2["type"] is FlowResultType.FORM
-    assert result2["errors"] == {"base": "unknown"}
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "test-username"
+    assert result["data"] == {
+        "username": "test-username",
+        "password": "test-password",
+        "region": region[0],
+        "brand": brand[0],
+    }
+    assert len(mock_whirlpool_setup_entry.mock_calls) == 1
 
 
 @pytest.mark.usefixtures("mock_auth_api", "mock_appliances_manager_api")
@@ -167,7 +158,6 @@ async def test_form_already_configured(hass: HomeAssistant, region, brand) -> No
             "brand": brand[0],
         },
     )
-    await hass.async_block_till_done()
 
     assert result2["type"] is FlowResultType.ABORT
     assert result2["reason"] == "already_configured"
@@ -191,13 +181,14 @@ async def test_no_appliances_flow(
         result["flow_id"],
         CONFIG_INPUT | {"region": region[0], "brand": brand[0]},
     )
-    await hass.async_block_till_done()
 
     assert result2["type"] is FlowResultType.FORM
     assert result2["errors"] == {"base": "no_appliances"}
 
 
-@pytest.mark.usefixtures("mock_auth_api", "mock_appliances_manager_api")
+@pytest.mark.usefixtures(
+    "mock_auth_api", "mock_appliances_manager_api", "mock_whirlpool_setup_entry"
+)
 async def test_reauth_flow(hass: HomeAssistant, region, brand) -> None:
     """Test a successful reauth flow."""
     mock_entry = MockConfigEntry(
@@ -213,14 +204,10 @@ async def test_reauth_flow(hass: HomeAssistant, region, brand) -> None:
     assert result["type"] is FlowResultType.FORM
     assert result["errors"] == {}
 
-    with patch(
-        "homeassistant.components.whirlpool.async_setup_entry", return_value=True
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {CONF_PASSWORD: "new-password", CONF_BRAND: brand[0]},
-        )
-        await hass.async_block_till_done()
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_PASSWORD: "new-password", CONF_BRAND: brand[0]},
+    )
 
     assert result2["type"] is FlowResultType.ABORT
     assert result2["reason"] == "reauth_successful"
@@ -232,8 +219,8 @@ async def test_reauth_flow(hass: HomeAssistant, region, brand) -> None:
     }
 
 
-@pytest.mark.usefixtures("mock_appliances_manager_api")
-async def test_reauth_flow_auth_error(
+@pytest.mark.usefixtures("mock_appliances_manager_api", "mock_whirlpool_setup_entry")
+async def test_reauth_flow_invalid_auth(
     hass: HomeAssistant, region, brand, mock_auth_api: MagicMock
 ) -> None:
     """Test an authorization error reauth flow."""
@@ -251,22 +238,32 @@ async def test_reauth_flow_auth_error(
     assert result["errors"] == {}
 
     mock_auth_api.return_value.is_access_token_valid.return_value = False
-    with patch(
-        "homeassistant.components.whirlpool.async_setup_entry", return_value=True
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {CONF_PASSWORD: "new-password", CONF_BRAND: brand[0]},
-        )
-        await hass.async_block_till_done()
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_PASSWORD: "new-password", CONF_BRAND: brand[0]},
+    )
 
     assert result2["type"] is FlowResultType.FORM
     assert result2["errors"] == {"base": "invalid_auth"}
 
 
-@pytest.mark.usefixtures("mock_appliances_manager_api")
-async def test_reauth_flow_connnection_error(
-    hass: HomeAssistant, region, brand, mock_auth_api: MagicMock
+@pytest.mark.usefixtures("mock_appliances_manager_api", "mock_whirlpool_setup_entry")
+@pytest.mark.parametrize(
+    ("exception", "expected_error"),
+    [
+        (AccountLockedError, "account_locked"),
+        (aiohttp.ClientConnectionError, "cannot_connect"),
+        (TimeoutError, "cannot_connect"),
+        (Exception, "unknown"),
+    ],
+)
+async def test_reauth_flow_auth_error(
+    hass: HomeAssistant,
+    exception: Exception,
+    expected_error: str,
+    region,
+    brand,
+    mock_auth_api: MagicMock,
 ) -> None:
     """Test a connection error reauth flow."""
 
@@ -283,14 +280,10 @@ async def test_reauth_flow_connnection_error(
     assert result["type"] is FlowResultType.FORM
     assert result["errors"] == {}
 
-    mock_auth_api.return_value.do_auth.side_effect = ClientConnectionError
-    with patch(
-        "homeassistant.components.whirlpool.async_setup_entry", return_value=True
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {CONF_PASSWORD: "new-password", CONF_BRAND: brand[0]},
-        )
-        await hass.async_block_till_done()
+    mock_auth_api.return_value.do_auth.side_effect = exception
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_PASSWORD: "new-password", CONF_BRAND: brand[0]},
+    )
     assert result2["type"] is FlowResultType.FORM
-    assert result2["errors"] == {"base": "cannot_connect"}
+    assert result2["errors"] == {"base": expected_error}
diff --git a/tests/components/whirlpool/test_diagnostics.py b/tests/components/whirlpool/test_diagnostics.py
index 2a0b2e6fd18..192339156e1 100644
--- a/tests/components/whirlpool/test_diagnostics.py
+++ b/tests/components/whirlpool/test_diagnostics.py
@@ -1,7 +1,5 @@
 """Test Blink diagnostics."""
 
-from unittest.mock import MagicMock
-
 from syrupy import SnapshotAssertion
 from syrupy.filters import props
 
@@ -19,9 +17,6 @@ async def test_entry_diagnostics(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
     snapshot: SnapshotAssertion,
-    mock_appliances_manager_api: MagicMock,
-    mock_aircon1_api: MagicMock,
-    mock_aircon_api_instances: MagicMock,
 ) -> None:
     """Test config entry diagnostics."""
 
diff --git a/tests/components/whirlpool/test_init.py b/tests/components/whirlpool/test_init.py
index f9d28e78a06..5f04bf84b9e 100644
--- a/tests/components/whirlpool/test_init.py
+++ b/tests/components/whirlpool/test_init.py
@@ -3,6 +3,7 @@
 from unittest.mock import AsyncMock, MagicMock
 
 import aiohttp
+from whirlpool.auth import AccountLockedError
 from whirlpool.backendselector import Brand, Region
 
 from homeassistant.components.whirlpool.const import DOMAIN
@@ -20,7 +21,6 @@ async def test_setup(
     mock_backend_selector_api: MagicMock,
     region,
     brand,
-    mock_aircon_api_instances: MagicMock,
 ) -> None:
     """Test setup."""
     entry = await init_integration(hass, region[0], brand[0])
@@ -32,7 +32,6 @@ async def test_setup(
 async def test_setup_region_fallback(
     hass: HomeAssistant,
     mock_backend_selector_api: MagicMock,
-    mock_aircon_api_instances: MagicMock,
 ) -> None:
     """Test setup when no region is available on the ConfigEntry.
 
@@ -56,7 +55,6 @@ async def test_setup_brand_fallback(
     hass: HomeAssistant,
     region,
     mock_backend_selector_api: MagicMock,
-    mock_aircon_api_instances: MagicMock,
 ) -> None:
     """Test setup when no brand is available on the ConfigEntry.
 
@@ -80,7 +78,6 @@ async def test_setup_brand_fallback(
 async def test_setup_http_exception(
     hass: HomeAssistant,
     mock_auth_api: MagicMock,
-    mock_aircon_api_instances: MagicMock,
 ) -> None:
     """Test setup with an http exception."""
     mock_auth_api.return_value.do_auth = AsyncMock(
@@ -94,7 +91,6 @@ async def test_setup_http_exception(
 async def test_setup_auth_failed(
     hass: HomeAssistant,
     mock_auth_api: MagicMock,
-    mock_aircon_api_instances: MagicMock,
 ) -> None:
     """Test setup with failed auth."""
     mock_auth_api.return_value.do_auth = AsyncMock()
@@ -104,10 +100,20 @@ async def test_setup_auth_failed(
     assert entry.state is ConfigEntryState.SETUP_ERROR
 
 
+async def test_setup_auth_account_locked(
+    hass: HomeAssistant,
+    mock_auth_api: MagicMock,
+) -> None:
+    """Test setup with failed auth due to account being locked."""
+    mock_auth_api.return_value.do_auth.side_effect = AccountLockedError
+    entry = await init_integration(hass)
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    assert entry.state is ConfigEntryState.SETUP_ERROR
+
+
 async def test_setup_fetch_appliances_failed(
     hass: HomeAssistant,
     mock_appliances_manager_api: MagicMock,
-    mock_aircon_api_instances: MagicMock,
 ) -> None:
     """Test setup with failed fetch_appliances."""
     mock_appliances_manager_api.return_value.fetch_appliances.return_value = False
@@ -116,11 +122,7 @@ async def test_setup_fetch_appliances_failed(
     assert entry.state is ConfigEntryState.SETUP_ERROR
 
 
-async def test_unload_entry(
-    hass: HomeAssistant,
-    mock_aircon_api_instances: MagicMock,
-    mock_sensor_api_instances: MagicMock,
-) -> None:
+async def test_unload_entry(hass: HomeAssistant) -> None:
     """Test successful unload of entry."""
     entry = await init_integration(hass)
     assert len(hass.config_entries.async_entries(DOMAIN)) == 1
diff --git a/tests/components/whirlpool/test_sensor.py b/tests/components/whirlpool/test_sensor.py
index 548025e29bd..95fca331707 100644
--- a/tests/components/whirlpool/test_sensor.py
+++ b/tests/components/whirlpool/test_sensor.py
@@ -12,14 +12,13 @@ from homeassistant.helpers import entity_registry as er
 from homeassistant.util.dt import as_timestamp, utc_from_timestamp, utcnow
 
 from . import init_integration
+from .const import MOCK_SAID3, MOCK_SAID4
 
 from tests.common import async_fire_time_changed, mock_restore_cache_with_extra_data
 
 
 async def update_sensor_state(
-    hass: HomeAssistant,
-    entity_id: str,
-    mock_sensor_api_instance: MagicMock,
+    hass: HomeAssistant, entity_id: str, mock_sensor_api_instance: MagicMock
 ) -> State:
     """Simulate an update trigger from the API."""
 
@@ -46,10 +45,7 @@ def side_effect_function_open_door(*args, **kwargs):
 
 
 async def test_dryer_sensor_values(
-    hass: HomeAssistant,
-    mock_sensor_api_instances: MagicMock,
-    mock_sensor2_api: MagicMock,
-    entity_registry: er.EntityRegistry,
+    hass: HomeAssistant, mock_sensor2_api: MagicMock, entity_registry: er.EntityRegistry
 ) -> None:
     """Test the sensor value callbacks."""
     hass.set_state(CoreState.not_running)
@@ -58,14 +54,11 @@ async def test_dryer_sensor_values(
         hass,
         (
             (
-                State(
-                    "sensor.washer_end_time",
-                    "1",
-                ),
+                State(f"sensor.washerdryer_{MOCK_SAID3}_end_time", "1"),
                 {"native_value": thetimestamp, "native_unit_of_measurement": None},
             ),
             (
-                State("sensor.dryer_end_time", "1"),
+                State(f"sensor.washerdryer_{MOCK_SAID4}_end_time", "1"),
                 {"native_value": thetimestamp, "native_unit_of_measurement": None},
             ),
         ),
@@ -73,7 +66,7 @@ async def test_dryer_sensor_values(
 
     await init_integration(hass)
 
-    entity_id = "sensor.dryer_state"
+    entity_id = f"sensor.washerdryer_{MOCK_SAID4}_state"
     mock_instance = mock_sensor2_api
     entry = entity_registry.async_get(entity_id)
     assert entry
@@ -83,7 +76,7 @@ async def test_dryer_sensor_values(
 
     state = await update_sensor_state(hass, entity_id, mock_instance)
     assert state is not None
-    state_id = f"{entity_id.split('_', maxsplit=1)[0]}_end_time"
+    state_id = f"sensor.washerdryer_{MOCK_SAID3}_end_time"
     state = hass.states.get(state_id)
     assert state.state == thetimestamp.isoformat()
 
@@ -110,10 +103,7 @@ async def test_dryer_sensor_values(
 
 
 async def test_washer_sensor_values(
-    hass: HomeAssistant,
-    mock_sensor_api_instances: MagicMock,
-    mock_sensor1_api: MagicMock,
-    entity_registry: er.EntityRegistry,
+    hass: HomeAssistant, mock_sensor1_api: MagicMock, entity_registry: er.EntityRegistry
 ) -> None:
     """Test the sensor value callbacks."""
     hass.set_state(CoreState.not_running)
@@ -122,14 +112,11 @@ async def test_washer_sensor_values(
         hass,
         (
             (
-                State(
-                    "sensor.washer_end_time",
-                    "1",
-                ),
+                State(f"sensor.washerdryer_{MOCK_SAID3}_end_time", "1"),
                 {"native_value": thetimestamp, "native_unit_of_measurement": None},
             ),
             (
-                State("sensor.dryer_end_time", "1"),
+                State(f"sensor.washerdryer_{MOCK_SAID4}_end_time", "1"),
                 {"native_value": thetimestamp, "native_unit_of_measurement": None},
             ),
         ),
@@ -143,7 +130,7 @@ async def test_washer_sensor_values(
     )
     await hass.async_block_till_done()
 
-    entity_id = "sensor.washer_state"
+    entity_id = f"sensor.washerdryer_{MOCK_SAID3}_state"
     mock_instance = mock_sensor1_api
     entry = entity_registry.async_get(entity_id)
     assert entry
@@ -153,11 +140,11 @@ async def test_washer_sensor_values(
 
     state = await update_sensor_state(hass, entity_id, mock_instance)
     assert state is not None
-    state_id = f"{entity_id.split('_', maxsplit=1)[0]}_end_time"
+    state_id = f"sensor.washerdryer_{MOCK_SAID3}_end_time"
     state = hass.states.get(state_id)
     assert state.state == thetimestamp.isoformat()
 
-    state_id = f"{entity_id.split('_', maxsplit=1)[0]}_detergent_level"
+    state_id = f"sensor.washerdryer_{MOCK_SAID3}_detergent_level"
     entry = entity_registry.async_get(state_id)
     assert entry
     assert entry.disabled
@@ -277,10 +264,7 @@ async def test_washer_sensor_values(
     assert state.state == "door_open"
 
 
-async def test_restore_state(
-    hass: HomeAssistant,
-    mock_sensor_api_instances: MagicMock,
-) -> None:
+async def test_restore_state(hass: HomeAssistant) -> None:
     """Test sensor restore state."""
     # Home assistant is not running yet
     hass.set_state(CoreState.not_running)
@@ -289,14 +273,11 @@ async def test_restore_state(
         hass,
         (
             (
-                State(
-                    "sensor.washer_end_time",
-                    "1",
-                ),
+                State(f"sensor.washerdryer_{MOCK_SAID3}_end_time", "1"),
                 {"native_value": thetimestamp, "native_unit_of_measurement": None},
             ),
             (
-                State("sensor.dryer_end_time", "1"),
+                State(f"sensor.washerdryer_{MOCK_SAID4}_end_time", "1"),
                 {"native_value": thetimestamp, "native_unit_of_measurement": None},
             ),
         ),
@@ -305,20 +286,18 @@ async def test_restore_state(
     # create and add entry
     await init_integration(hass)
     # restore from cache
-    state = hass.states.get("sensor.washer_end_time")
+    state = hass.states.get(f"sensor.washerdryer_{MOCK_SAID3}_end_time")
     assert state.state == thetimestamp.isoformat()
-    state = hass.states.get("sensor.dryer_end_time")
+    state = hass.states.get(f"sensor.washerdryer_{MOCK_SAID4}_end_time")
     assert state.state == thetimestamp.isoformat()
 
 
 async def test_no_restore_state(
-    hass: HomeAssistant,
-    mock_sensor_api_instances: MagicMock,
-    mock_sensor1_api: MagicMock,
+    hass: HomeAssistant, mock_sensor1_api: MagicMock
 ) -> None:
     """Test sensor restore state with no restore."""
     # create and add entry
-    entity_id = "sensor.washer_end_time"
+    entity_id = f"sensor.washerdryer_{MOCK_SAID3}_end_time"
     await init_integration(hass)
     # restore from cache
     state = hass.states.get(entity_id)
@@ -330,11 +309,7 @@ async def test_no_restore_state(
 
 
 @pytest.mark.freeze_time("2022-11-30 00:00:00")
-async def test_callback(
-    hass: HomeAssistant,
-    mock_sensor_api_instances: MagicMock,
-    mock_sensor1_api: MagicMock,
-) -> None:
+async def test_callback(hass: HomeAssistant, mock_sensor1_api: MagicMock) -> None:
     """Test callback timestamp callback function."""
     hass.set_state(CoreState.not_running)
     thetimestamp: datetime = datetime(2022, 11, 29, 00, 00, 00, 00, UTC)
@@ -342,14 +317,11 @@ async def test_callback(
         hass,
         (
             (
-                State(
-                    "sensor.washer_end_time",
-                    "1",
-                ),
+                State(f"sensor.washerdryer_{MOCK_SAID3}_end_time", "1"),
                 {"native_value": thetimestamp, "native_unit_of_measurement": None},
             ),
             (
-                State("sensor.dryer_end_time", "1"),
+                State(f"sensor.washerdryer_{MOCK_SAID4}_end_time", "1"),
                 {"native_value": thetimestamp, "native_unit_of_measurement": None},
             ),
         ),
@@ -358,12 +330,12 @@ async def test_callback(
     # create and add entry
     await init_integration(hass)
     # restore from cache
-    state = hass.states.get("sensor.washer_end_time")
+    state = hass.states.get(f"sensor.washerdryer_{MOCK_SAID3}_end_time")
     assert state.state == thetimestamp.isoformat()
     callback = mock_sensor1_api.register_attr_callback.call_args_list[1][0][0]
     callback()
 
-    state = hass.states.get("sensor.washer_end_time")
+    state = hass.states.get(f"sensor.washerdryer_{MOCK_SAID3}_end_time")
     assert state.state == thetimestamp.isoformat()
     mock_sensor1_api.get_machine_state.return_value = MachineState.RunningMainCycle
     mock_sensor1_api.get_attribute.side_effect = None
@@ -371,19 +343,19 @@ async def test_callback(
     callback()
 
     # Test new timestamp when machine starts a cycle.
-    state = hass.states.get("sensor.washer_end_time")
+    state = hass.states.get(f"sensor.washerdryer_{MOCK_SAID3}_end_time")
     time = state.state
     assert state.state != thetimestamp.isoformat()
 
     # Test no timestamp change for < 60 seconds time change.
     mock_sensor1_api.get_attribute.return_value = "65"
     callback()
-    state = hass.states.get("sensor.washer_end_time")
+    state = hass.states.get(f"sensor.washerdryer_{MOCK_SAID3}_end_time")
     assert state.state == time
 
     # Test timestamp change for > 60 seconds.
     mock_sensor1_api.get_attribute.return_value = "125"
     callback()
-    state = hass.states.get("sensor.washer_end_time")
+    state = hass.states.get(f"sensor.washerdryer_{MOCK_SAID3}_end_time")
     newtime = utc_from_timestamp(as_timestamp(time) + 65)
     assert state.state == newtime.isoformat()
diff --git a/tests/components/whois/snapshots/test_config_flow.ambr b/tests/components/whois/snapshots/test_config_flow.ambr
index 937502d4d6c..97d6fde6376 100644
--- a/tests/components/whois/snapshots/test_config_flow.ambr
+++ b/tests/components/whois/snapshots/test_config_flow.ambr
@@ -30,10 +30,14 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Example.com',
       'unique_id': 'example.com',
       'version': 1,
     }),
+    'subentries': tuple(
+    ),
     'title': 'Example.com',
     'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
     'version': 1,
@@ -70,10 +74,14 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Example.com',
       'unique_id': 'example.com',
       'version': 1,
     }),
+    'subentries': tuple(
+    ),
     'title': 'Example.com',
     'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
     'version': 1,
@@ -110,10 +118,14 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Example.com',
       'unique_id': 'example.com',
       'version': 1,
     }),
+    'subentries': tuple(
+    ),
     'title': 'Example.com',
     'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
     'version': 1,
@@ -150,10 +162,102 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Example.com',
       'unique_id': 'example.com',
       'version': 1,
     }),
+    'subentries': tuple(
+    ),
+    'title': 'Example.com',
+    'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
+    'version': 1,
+  })
+# ---
+# name: test_full_flow_with_error[WhoisPrivateRegistry-private_registry]
+  FlowResultSnapshot({
+    'context': dict({
+      'source': 'user',
+      'unique_id': 'example.com',
+    }),
+    'data': dict({
+      'domain': 'example.com',
+    }),
+    'description': None,
+    'description_placeholders': None,
+    'flow_id': <ANY>,
+    'handler': 'whois',
+    'minor_version': 1,
+    'options': dict({
+    }),
+    'result': ConfigEntrySnapshot({
+      'data': dict({
+        'domain': 'example.com',
+      }),
+      'disabled_by': None,
+      'discovery_keys': dict({
+      }),
+      'domain': 'whois',
+      'entry_id': <ANY>,
+      'minor_version': 1,
+      'options': dict({
+      }),
+      'pref_disable_new_entities': False,
+      'pref_disable_polling': False,
+      'source': 'user',
+      'subentries': list([
+      ]),
+      'title': 'Example.com',
+      'unique_id': 'example.com',
+      'version': 1,
+    }),
+    'subentries': tuple(
+    ),
+    'title': 'Example.com',
+    'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
+    'version': 1,
+  })
+# ---
+# name: test_full_flow_with_error[WhoisQuotaExceeded-quota_exceeded]
+  FlowResultSnapshot({
+    'context': dict({
+      'source': 'user',
+      'unique_id': 'example.com',
+    }),
+    'data': dict({
+      'domain': 'example.com',
+    }),
+    'description': None,
+    'description_placeholders': None,
+    'flow_id': <ANY>,
+    'handler': 'whois',
+    'minor_version': 1,
+    'options': dict({
+    }),
+    'result': ConfigEntrySnapshot({
+      'data': dict({
+        'domain': 'example.com',
+      }),
+      'disabled_by': None,
+      'discovery_keys': dict({
+      }),
+      'domain': 'whois',
+      'entry_id': <ANY>,
+      'minor_version': 1,
+      'options': dict({
+      }),
+      'pref_disable_new_entities': False,
+      'pref_disable_polling': False,
+      'source': 'user',
+      'subentries': list([
+      ]),
+      'title': 'Example.com',
+      'unique_id': 'example.com',
+      'version': 1,
+    }),
+    'subentries': tuple(
+    ),
     'title': 'Example.com',
     'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
     'version': 1,
@@ -190,10 +294,14 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Example.com',
       'unique_id': 'example.com',
       'version': 1,
     }),
+    'subentries': tuple(
+    ),
     'title': 'Example.com',
     'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
     'version': 1,
diff --git a/tests/components/whois/snapshots/test_sensor.ambr b/tests/components/whois/snapshots/test_sensor.ambr
index 4310bc77ebf..b5b1dde1c3d 100644
--- a/tests/components/whois/snapshots/test_sensor.ambr
+++ b/tests/components/whois/snapshots/test_sensor.ambr
@@ -19,6 +19,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -49,6 +50,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -128,6 +131,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -181,6 +185,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -211,6 +216,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -260,6 +266,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -290,6 +297,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -339,6 +347,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -369,6 +378,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -417,6 +427,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -447,6 +458,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -495,6 +507,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -525,6 +538,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -573,6 +587,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -603,6 +618,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -651,6 +667,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -681,6 +698,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -730,6 +748,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/whois/test_config_flow.py b/tests/components/whois/test_config_flow.py
index 35e40c4e809..6ab02887be2 100644
--- a/tests/components/whois/test_config_flow.py
+++ b/tests/components/whois/test_config_flow.py
@@ -9,6 +9,8 @@ from whois.exceptions import (
     UnknownDateFormat,
     UnknownTld,
     WhoisCommandFailed,
+    WhoisPrivateRegistry,
+    WhoisQuotaExceeded,
 )
 
 from homeassistant.components.whois.const import DOMAIN
@@ -52,6 +54,8 @@ async def test_full_user_flow(
         (FailedParsingWhoisOutput, "unexpected_response"),
         (UnknownDateFormat, "unknown_date_format"),
         (WhoisCommandFailed, "whois_command_failed"),
+        (WhoisPrivateRegistry, "private_registry"),
+        (WhoisQuotaExceeded, "quota_exceeded"),
     ],
 )
 async def test_full_flow_with_error(
diff --git a/tests/components/whois/test_sensor.py b/tests/components/whois/test_sensor.py
index d58cc342745..d290bc347a9 100644
--- a/tests/components/whois/test_sensor.py
+++ b/tests/components/whois/test_sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.whois.const import SCAN_INTERVAL
 from homeassistant.const import STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
diff --git a/tests/components/withings/snapshots/test_init.ambr b/tests/components/withings/snapshots/test_init.ambr
index be221cad313..ec711def829 100644
--- a/tests/components/withings/snapshots/test_init.ambr
+++ b/tests/components/withings/snapshots/test_init.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
@@ -35,6 +36,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': None,
     'connections': set({
     }),
diff --git a/tests/components/withings/snapshots/test_sensor.ambr b/tests/components/withings/snapshots/test_sensor.ambr
index cfecfb1e28e..f735c506f65 100644
--- a/tests/components/withings/snapshots/test_sensor.ambr
+++ b/tests/components/withings/snapshots/test_sensor.ambr
@@ -12,6 +12,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -66,6 +67,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -120,6 +122,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -175,6 +178,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -225,6 +229,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -275,6 +280,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -326,6 +332,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -380,6 +387,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -427,6 +435,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -479,6 +488,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -493,6 +503,9 @@
     }),
     'name': None,
     'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+      }),
     }),
     'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
     'original_icon': None,
@@ -502,7 +515,7 @@
     'supported_features': 0,
     'translation_key': 'deep_sleep',
     'unique_id': 'withings_12345_sleep_deep_duration_seconds',
-    'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
   })
 # ---
 # name: test_all_entities[sensor.henk_deep_sleep-state]
@@ -511,14 +524,14 @@
       'device_class': 'duration',
       'friendly_name': 'henk Deep sleep',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+      'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
     }),
     'context': <ANY>,
     'entity_id': 'sensor.henk_deep_sleep',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '5820',
+    'state': '1.617',
   })
 # ---
 # name: test_all_entities[sensor.henk_diastolic_blood_pressure-entry]
@@ -530,6 +543,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -578,6 +592,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -631,6 +646,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -684,6 +700,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -731,6 +748,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -778,6 +796,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -825,6 +844,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -875,6 +895,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -927,6 +948,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -978,6 +1000,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1032,6 +1055,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1086,6 +1110,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1140,6 +1165,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1194,6 +1220,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1248,6 +1275,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1302,6 +1330,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1356,6 +1385,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1410,6 +1440,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1464,6 +1495,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1518,6 +1550,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1572,6 +1605,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1626,6 +1660,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1679,6 +1714,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1729,6 +1765,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1744,7 +1781,7 @@
     'name': None,
     'options': dict({
       'sensor': dict({
-        'suggested_display_precision': 1,
+        'suggested_display_precision': 2,
       }),
     }),
     'original_device_class': <SensorDeviceClass.DISTANCE: 'distance'>,
@@ -1783,6 +1820,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1834,6 +1872,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1889,6 +1928,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1938,6 +1978,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -1989,6 +2030,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2087,6 +2129,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2187,6 +2230,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2201,6 +2245,9 @@
     }),
     'name': None,
     'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+      }),
     }),
     'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
     'original_icon': None,
@@ -2210,7 +2257,7 @@
     'supported_features': 0,
     'translation_key': 'light_sleep',
     'unique_id': 'withings_12345_sleep_light_duration_seconds',
-    'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
   })
 # ---
 # name: test_all_entities[sensor.henk_light_sleep-state]
@@ -2219,14 +2266,14 @@
       'device_class': 'duration',
       'friendly_name': 'henk Light sleep',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+      'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
     }),
     'context': <ANY>,
     'entity_id': 'sensor.henk_light_sleep',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '10440',
+    'state': '2.900',
   })
 # ---
 # name: test_all_entities[sensor.henk_maximum_heart_rate-entry]
@@ -2238,6 +2285,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2288,6 +2336,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2338,6 +2387,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2388,6 +2438,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2438,6 +2489,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2493,6 +2545,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2547,6 +2600,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2601,6 +2655,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2655,6 +2710,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2709,6 +2765,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2763,6 +2820,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2815,6 +2873,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2868,6 +2927,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2919,6 +2979,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -2933,6 +2994,9 @@
     }),
     'name': None,
     'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+      }),
     }),
     'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
     'original_icon': None,
@@ -2942,7 +3006,7 @@
     'supported_features': 0,
     'translation_key': 'rem_sleep',
     'unique_id': 'withings_12345_sleep_rem_duration_seconds',
-    'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
   })
 # ---
 # name: test_all_entities[sensor.henk_rem_sleep-state]
@@ -2951,14 +3015,14 @@
       'device_class': 'duration',
       'friendly_name': 'henk REM sleep',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+      'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
     }),
     'context': <ANY>,
     'entity_id': 'sensor.henk_rem_sleep',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '2400',
+    'state': '0.667',
   })
 # ---
 # name: test_all_entities[sensor.henk_skin_temperature-entry]
@@ -2970,6 +3034,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3021,6 +3086,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3075,6 +3141,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3125,6 +3192,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3139,8 +3207,11 @@
     }),
     'name': None,
     'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+      }),
     }),
-    'original_device_class': None,
+    'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
     'original_icon': None,
     'original_name': 'Snoring',
     'platform': 'withings',
@@ -3148,21 +3219,23 @@
     'supported_features': 0,
     'translation_key': 'snoring',
     'unique_id': 'withings_12345_sleep_snoring',
-    'unit_of_measurement': None,
+    'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
   })
 # ---
 # name: test_all_entities[sensor.henk_snoring-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
+      'device_class': 'duration',
       'friendly_name': 'henk Snoring',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
     }),
     'context': <ANY>,
     'entity_id': 'sensor.henk_snoring',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '1080',
+    'state': '18.0',
   })
 # ---
 # name: test_all_entities[sensor.henk_snoring_episode_count-entry]
@@ -3174,6 +3247,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3223,6 +3297,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3278,6 +3353,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3328,6 +3404,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3378,6 +3455,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3429,6 +3507,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3479,6 +3558,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3530,6 +3610,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3544,6 +3625,9 @@
     }),
     'name': None,
     'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+      }),
     }),
     'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
     'original_icon': None,
@@ -3553,7 +3637,7 @@
     'supported_features': 0,
     'translation_key': 'time_to_sleep',
     'unique_id': 'withings_12345_sleep_tosleep_duration_seconds',
-    'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
   })
 # ---
 # name: test_all_entities[sensor.henk_time_to_sleep-state]
@@ -3562,14 +3646,14 @@
       'device_class': 'duration',
       'friendly_name': 'henk Time to sleep',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+      'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
     }),
     'context': <ANY>,
     'entity_id': 'sensor.henk_time_to_sleep',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '540',
+    'state': '0.150',
   })
 # ---
 # name: test_all_entities[sensor.henk_time_to_wakeup-entry]
@@ -3581,6 +3665,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3595,6 +3680,9 @@
     }),
     'name': None,
     'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+      }),
     }),
     'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
     'original_icon': None,
@@ -3604,7 +3692,7 @@
     'supported_features': 0,
     'translation_key': 'time_to_wakeup',
     'unique_id': 'withings_12345_sleep_towakeup_duration_seconds',
-    'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
   })
 # ---
 # name: test_all_entities[sensor.henk_time_to_wakeup-state]
@@ -3613,14 +3701,14 @@
       'device_class': 'duration',
       'friendly_name': 'henk Time to wakeup',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+      'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
     }),
     'context': <ANY>,
     'entity_id': 'sensor.henk_time_to_wakeup',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '1140',
+    'state': '0.317',
   })
 # ---
 # name: test_all_entities[sensor.henk_total_calories_burnt_today-entry]
@@ -3632,6 +3720,7 @@
       'state_class': <SensorStateClass.TOTAL: 'total'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3684,6 +3773,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3730,6 +3820,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3778,6 +3869,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3828,6 +3920,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3878,6 +3971,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3892,6 +3986,9 @@
     }),
     'name': None,
     'options': dict({
+      'sensor.private': dict({
+        'suggested_unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+      }),
     }),
     'original_device_class': <SensorDeviceClass.DURATION: 'duration'>,
     'original_icon': None,
@@ -3901,7 +3998,7 @@
     'supported_features': 0,
     'translation_key': 'wakeup_time',
     'unique_id': 'withings_12345_sleep_wakeup_duration_seconds',
-    'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
   })
 # ---
 # name: test_all_entities[sensor.henk_wakeup_time-state]
@@ -3910,14 +4007,14 @@
       'device_class': 'duration',
       'friendly_name': 'henk Wakeup time',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
+      'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
     }),
     'context': <ANY>,
     'entity_id': 'sensor.henk_wakeup_time',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '3060',
+    'state': '0.850',
   })
 # ---
 # name: test_all_entities[sensor.henk_weight-entry]
@@ -3929,6 +4026,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -3983,6 +4081,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/wled/snapshots/test_button.ambr b/tests/components/wled/snapshots/test_button.ambr
index 4e6260bc9bd..a22c1a3fb85 100644
--- a/tests/components/wled/snapshots/test_button.ambr
+++ b/tests/components/wled/snapshots/test_button.ambr
@@ -20,6 +20,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -50,6 +51,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://127.0.0.1',
     'connections': set({
       tuple(
diff --git a/tests/components/wled/snapshots/test_number.ambr b/tests/components/wled/snapshots/test_number.ambr
index 0fb6cff3d51..a99831d1440 100644
--- a/tests/components/wled/snapshots/test_number.ambr
+++ b/tests/components/wled/snapshots/test_number.ambr
@@ -28,6 +28,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -58,6 +59,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://127.0.0.1',
     'connections': set({
       tuple(
@@ -119,6 +121,7 @@
       'step': 1,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -149,6 +152,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://127.0.0.1',
     'connections': set({
       tuple(
diff --git a/tests/components/wled/snapshots/test_select.ambr b/tests/components/wled/snapshots/test_select.ambr
index 2998583f8b3..ca3b0a5dc6e 100644
--- a/tests/components/wled/snapshots/test_select.ambr
+++ b/tests/components/wled/snapshots/test_select.ambr
@@ -30,6 +30,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -60,6 +61,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://127.0.0.1',
     'connections': set({
       tuple(
@@ -259,6 +261,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -289,6 +292,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://127.0.0.1',
     'connections': set({
       tuple(
@@ -350,6 +354,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -380,6 +385,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://127.0.0.1',
     'connections': set({
       tuple(
@@ -441,6 +447,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -471,6 +478,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://127.0.0.1',
     'connections': set({
       tuple(
diff --git a/tests/components/wled/snapshots/test_switch.ambr b/tests/components/wled/snapshots/test_switch.ambr
index ee3a72ba872..99358153fe1 100644
--- a/tests/components/wled/snapshots/test_switch.ambr
+++ b/tests/components/wled/snapshots/test_switch.ambr
@@ -21,6 +21,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -51,6 +52,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://127.0.0.1',
     'connections': set({
       tuple(
@@ -103,6 +105,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -133,6 +136,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://127.0.0.1',
     'connections': set({
       tuple(
@@ -186,6 +190,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -216,6 +221,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://127.0.0.1',
     'connections': set({
       tuple(
@@ -269,6 +275,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -299,6 +306,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://127.0.0.1',
     'connections': set({
       tuple(
diff --git a/tests/components/wled/test_coordinator.py b/tests/components/wled/test_coordinator.py
index 14e8b620983..e2935290f03 100644
--- a/tests/components/wled/test_coordinator.py
+++ b/tests/components/wled/test_coordinator.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/wmspro/snapshots/test_cover.ambr b/tests/components/wmspro/snapshots/test_cover.ambr
index 0456f074d49..53b2f6205cb 100644
--- a/tests/components/wmspro/snapshots/test_cover.ambr
+++ b/tests/components/wmspro/snapshots/test_cover.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': 'terrasse',
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://webcontrol/control',
     'connections': set({
     }),
diff --git a/tests/components/wmspro/snapshots/test_light.ambr b/tests/components/wmspro/snapshots/test_light.ambr
index d13e444645d..d6ccebfb5ea 100644
--- a/tests/components/wmspro/snapshots/test_light.ambr
+++ b/tests/components/wmspro/snapshots/test_light.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': 'terrasse',
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://webcontrol/control',
     'connections': set({
     }),
diff --git a/tests/components/wmspro/snapshots/test_scene.ambr b/tests/components/wmspro/snapshots/test_scene.ambr
index 940d4e31e83..b5dddb368c9 100644
--- a/tests/components/wmspro/snapshots/test_scene.ambr
+++ b/tests/components/wmspro/snapshots/test_scene.ambr
@@ -17,6 +17,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': 'raum_0',
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://webcontrol/control',
     'connections': set({
     }),
diff --git a/tests/components/wolflink/__init__.py b/tests/components/wolflink/__init__.py
index dea7c5195ad..11c82ad9f61 100644
--- a/tests/components/wolflink/__init__.py
+++ b/tests/components/wolflink/__init__.py
@@ -1 +1,14 @@
 """Tests for the Wolf SmartSet Service integration."""
+
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+async def setup_integration(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry
+) -> None:
+    """Set up the wolflink integration for testing."""
+    mock_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
diff --git a/tests/components/wolflink/conftest.py b/tests/components/wolflink/conftest.py
new file mode 100644
index 00000000000..5142762b5e4
--- /dev/null
+++ b/tests/components/wolflink/conftest.py
@@ -0,0 +1,125 @@
+"""Fixtures for Wolflink integration tests."""
+
+from __future__ import annotations
+
+from collections.abc import Generator
+from unittest.mock import MagicMock, patch
+
+import pytest
+from wolf_comm import (
+    EnergyParameter,
+    FlowParameter,
+    FrequencyParameter,
+    HoursParameter,
+    ListItem,
+    ListItemParameter,
+    PercentageParameter,
+    PowerParameter,
+    Pressure,
+    RPMParameter,
+    SimpleParameter,
+    Temperature,
+    Value,
+)
+
+from homeassistant.components.wolflink.const import (
+    DEVICE_GATEWAY,
+    DEVICE_ID,
+    DEVICE_NAME,
+    DOMAIN,
+)
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.core import HomeAssistant
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry
+
+
+@pytest.fixture
+def mock_config_entry() -> MockConfigEntry:
+    """Return the default mocked config entry."""
+    return MockConfigEntry(
+        title="Wolf SmartSet",
+        domain=DOMAIN,
+        data={
+            CONF_USERNAME: "test-username",
+            CONF_PASSWORD: "test-password",
+            DEVICE_NAME: "test-device",
+            DEVICE_GATEWAY: "5678",
+            DEVICE_ID: "1234",
+        },
+        unique_id="1234",
+        version=1,
+        minor_version=2,
+    )
+
+
+@pytest.fixture
+def mock_wolflink() -> Generator[MagicMock]:
+    """Return a mocked wolflink client."""
+    with (
+        patch(
+            "homeassistant.components.wolflink.WolfClient", autospec=True
+        ) as wolflink_mock,
+        patch(
+            "homeassistant.components.wolflink.config_flow.WolfClient",
+            new=wolflink_mock,
+        ),
+    ):
+        wolflink = wolflink_mock.return_value
+
+        wolflink.fetch_parameters.return_value = [
+            EnergyParameter(
+                6002800000, "Energy Parameter", "Heating", 6005200000, 2000
+            ),
+            ListItemParameter(
+                8002800000,
+                "List Item Parameter",
+                "Heating",
+                [ListItem("0", "Aus"), ListItem("1", "Ein")],
+                8005200000,
+                3001,
+            ),
+            PowerParameter(5002800000, "Power Parameter", "Heating", 5005200000, 1000),
+            Pressure(4002800000, "Pressure Parameter", "Heating", 4005200000, 1000),
+            Temperature(3002800000, "Temperature Parameter", "Solar", 3005200000, 1000),
+            PercentageParameter(
+                2002800000, "Percentage Parameter", "Solar", 2005200000, 1000
+            ),
+            HoursParameter(7002800000, "Hours Parameter", "Heating", 7005200000, 1000),
+            SimpleParameter(1002800000, "Simple Parameter", "DHW", 1005200000, 1000),
+            FrequencyParameter(
+                9002800000, "Frequency Parameter", "Heating", 9005200000, 1000
+            ),
+            RPMParameter(1000280001, "RPM Parameter", "Heating", 10005200000, 7000),
+            FlowParameter(1100280001, "Flow Parameter", "Heating", 11005200000, 8000),
+            HoursParameter(7002800000, "Hours Parameter", "Heating", 7005200000, 1000),
+            SimpleParameter(1002800000, "Simple Parameter", "DHW", 1005200000, 1000),
+        ]
+
+        wolflink.fetch_value.return_value = [
+            Value(6002800000, "183", 1),
+            Value(8002800000, "1", 1),
+            Value(5002800000, "50", 1),
+            Value(4002800000, "3", 1),
+            Value(3002800000, "65", 1),
+            Value(2002800000, "20", 1),
+            Value(7002800000, "10", 1),
+            Value(1002800000, "12", 1),
+            Value(9002800000, "50", 1),
+            Value(1000280001, "1500", 1),
+            Value(1100280001, "5", 1),
+        ]
+
+        yield wolflink
+
+
+@pytest.fixture
+async def init_integration(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry, mock_wolflink: MagicMock
+) -> MockConfigEntry:
+    """Set up the Wolflink integration for testing."""
+    await setup_integration(hass, mock_config_entry)
+
+    return mock_config_entry
diff --git a/tests/components/wolflink/snapshots/test_sensor.ambr b/tests/components/wolflink/snapshots/test_sensor.ambr
new file mode 100644
index 00000000000..c1ff80c9630
--- /dev/null
+++ b/tests/components/wolflink/snapshots/test_sensor.ambr
@@ -0,0 +1,603 @@
+# serializer version: 1
+# name: test_device_entry
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'https://www.wolf-smartset.com/',
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'wolflink',
+        '1234',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'WOLF GmbH',
+    'model': None,
+    'model_id': None,
+    'name': 'Wolf SmartSet',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_sensors[sensor.energy_parameter-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.energy_parameter',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy Parameter',
+    'platform': 'wolflink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '1234:6005200000',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_sensors[sensor.energy_parameter-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Energy Parameter',
+      'parameter_id': 6005200000,
+      'parent': 'Heating',
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+      'value_id': 6002800000,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.energy_parameter',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '183',
+  })
+# ---
+# name: test_sensors[sensor.flow_parameter-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.flow_parameter',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLUME_FLOW_RATE: 'volume_flow_rate'>,
+    'original_icon': None,
+    'original_name': 'Flow Parameter',
+    'platform': 'wolflink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '1234:11005200000',
+    'unit_of_measurement': <UnitOfVolumeFlowRate.LITERS_PER_MINUTE: 'L/min'>,
+  })
+# ---
+# name: test_sensors[sensor.flow_parameter-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'volume_flow_rate',
+      'friendly_name': 'Flow Parameter',
+      'parameter_id': 11005200000,
+      'parent': 'Heating',
+      'unit_of_measurement': <UnitOfVolumeFlowRate.LITERS_PER_MINUTE: 'L/min'>,
+      'value_id': 1100280001,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.flow_parameter',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '5',
+  })
+# ---
+# name: test_sensors[sensor.frequency_parameter-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.frequency_parameter',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.FREQUENCY: 'frequency'>,
+    'original_icon': None,
+    'original_name': 'Frequency Parameter',
+    'platform': 'wolflink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '1234:9005200000',
+    'unit_of_measurement': <UnitOfFrequency.HERTZ: 'Hz'>,
+  })
+# ---
+# name: test_sensors[sensor.frequency_parameter-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'frequency',
+      'friendly_name': 'Frequency Parameter',
+      'parameter_id': 9005200000,
+      'parent': 'Heating',
+      'unit_of_measurement': <UnitOfFrequency.HERTZ: 'Hz'>,
+      'value_id': 9002800000,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.frequency_parameter',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '50',
+  })
+# ---
+# name: test_sensors[sensor.hours_parameter-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.hours_parameter',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': 'mdi:clock',
+    'original_name': 'Hours Parameter',
+    'platform': 'wolflink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '1234:7005200000',
+    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+  })
+# ---
+# name: test_sensors[sensor.hours_parameter-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Hours Parameter',
+      'icon': 'mdi:clock',
+      'parameter_id': 7005200000,
+      'parent': 'Heating',
+      'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
+      'value_id': 7002800000,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.hours_parameter',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '10',
+  })
+# ---
+# name: test_sensors[sensor.list_item_parameter-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.list_item_parameter',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'List Item Parameter',
+    'platform': 'wolflink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'state',
+    'unique_id': '1234:8005200000',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensors[sensor.list_item_parameter-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'List Item Parameter',
+      'parameter_id': 8005200000,
+      'parent': 'Heating',
+      'value_id': 8002800000,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.list_item_parameter',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'ein',
+  })
+# ---
+# name: test_sensors[sensor.percentage_parameter-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.percentage_parameter',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Percentage Parameter',
+    'platform': 'wolflink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '1234:2005200000',
+    'unit_of_measurement': '%',
+  })
+# ---
+# name: test_sensors[sensor.percentage_parameter-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Percentage Parameter',
+      'parameter_id': 2005200000,
+      'parent': 'Solar',
+      'unit_of_measurement': '%',
+      'value_id': 2002800000,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.percentage_parameter',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '20',
+  })
+# ---
+# name: test_sensors[sensor.power_parameter-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.power_parameter',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power Parameter',
+    'platform': 'wolflink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '1234:5005200000',
+    'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
+  })
+# ---
+# name: test_sensors[sensor.power_parameter-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Power Parameter',
+      'parameter_id': 5005200000,
+      'parent': 'Heating',
+      'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
+      'value_id': 5002800000,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.power_parameter',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '50',
+  })
+# ---
+# name: test_sensors[sensor.pressure_parameter-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.pressure_parameter',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.PRESSURE: 'pressure'>,
+    'original_icon': None,
+    'original_name': 'Pressure Parameter',
+    'platform': 'wolflink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '1234:4005200000',
+    'unit_of_measurement': <UnitOfPressure.BAR: 'bar'>,
+  })
+# ---
+# name: test_sensors[sensor.pressure_parameter-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'pressure',
+      'friendly_name': 'Pressure Parameter',
+      'parameter_id': 4005200000,
+      'parent': 'Heating',
+      'unit_of_measurement': <UnitOfPressure.BAR: 'bar'>,
+      'value_id': 4002800000,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.pressure_parameter',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '3',
+  })
+# ---
+# name: test_sensors[sensor.rpm_parameter-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.rpm_parameter',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'RPM Parameter',
+    'platform': 'wolflink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '1234:10005200000',
+    'unit_of_measurement': 'rpm',
+  })
+# ---
+# name: test_sensors[sensor.rpm_parameter-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'RPM Parameter',
+      'parameter_id': 10005200000,
+      'parent': 'Heating',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': 'rpm',
+      'value_id': 1000280001,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.rpm_parameter',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '1500',
+  })
+# ---
+# name: test_sensors[sensor.simple_parameter-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.simple_parameter',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Simple Parameter',
+    'platform': 'wolflink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '1234:1005200000',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensors[sensor.simple_parameter-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Simple Parameter',
+      'parameter_id': 1005200000,
+      'parent': 'DHW',
+      'value_id': 1002800000,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.simple_parameter',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '12',
+  })
+# ---
+# name: test_sensors[sensor.temperature_parameter-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.temperature_parameter',
+    'has_entity_name': False,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+    'original_icon': None,
+    'original_name': 'Temperature Parameter',
+    'platform': 'wolflink',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '1234:3005200000',
+    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+  })
+# ---
+# name: test_sensors[sensor.temperature_parameter-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'temperature',
+      'friendly_name': 'Temperature Parameter',
+      'parameter_id': 3005200000,
+      'parent': 'Solar',
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+      'value_id': 3002800000,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.temperature_parameter',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '65',
+  })
+# ---
diff --git a/tests/components/wolflink/test_sensor.py b/tests/components/wolflink/test_sensor.py
new file mode 100644
index 00000000000..8fc78f707d5
--- /dev/null
+++ b/tests/components/wolflink/test_sensor.py
@@ -0,0 +1,45 @@
+"""Test the Wolf SmartSet Service Sensor platform."""
+
+from unittest.mock import MagicMock
+
+from syrupy import SnapshotAssertion
+
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr, entity_registry as er
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry, patch, snapshot_platform
+
+
+async def test_device_entry(
+    hass: HomeAssistant,
+    mock_wolflink: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    device_registry: dr.DeviceRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test device entry creation."""
+
+    mock_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device({(mock_config_entry.domain, "1234")})
+    assert device == snapshot
+
+
+async def test_sensors(
+    hass: HomeAssistant,
+    mock_wolflink: MagicMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test wolflink sensors."""
+
+    with patch("homeassistant.components.wolflink.PLATFORMS", [Platform.SENSOR]):
+        await setup_integration(hass, mock_config_entry)
+
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/workday/snapshots/test_diagnostics.ambr b/tests/components/workday/snapshots/test_diagnostics.ambr
index f41b86b7f6d..e7331b911a8 100644
--- a/tests/components/workday/snapshots/test_diagnostics.ambr
+++ b/tests/components/workday/snapshots/test_diagnostics.ambr
@@ -40,6 +40,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': None,
       'version': 1,
diff --git a/tests/components/workday/test_repairs.py b/tests/components/workday/test_repairs.py
index adbae5676e6..09b0149a424 100644
--- a/tests/components/workday/test_repairs.py
+++ b/tests/components/workday/test_repairs.py
@@ -430,7 +430,7 @@ async def test_bad_date_holiday(
 
 
 @pytest.mark.parametrize(
-    "ignore_translations",
+    "ignore_missing_translations",
     ["component.workday.issues.issue_1.title"],
 )
 async def test_other_fixable_issues(
diff --git a/tests/components/worldclock/test_sensor.py b/tests/components/worldclock/test_sensor.py
index f901f605730..4941462cb14 100644
--- a/tests/components/worldclock/test_sensor.py
+++ b/tests/components/worldclock/test_sensor.py
@@ -7,7 +7,7 @@ import pytest
 from homeassistant.components.worldclock.const import CONF_TIME_FORMAT, DEFAULT_NAME
 from homeassistant.const import CONF_NAME, CONF_TIME_ZONE
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry
 
diff --git a/tests/components/wsdot/test_sensor.py b/tests/components/wsdot/test_sensor.py
index 9f5ec92a5b6..ff3d4960735 100644
--- a/tests/components/wsdot/test_sensor.py
+++ b/tests/components/wsdot/test_sensor.py
@@ -5,7 +5,7 @@ import re
 
 import requests_mock
 
-import homeassistant.components.wsdot.sensor as wsdot
+from homeassistant.components.wsdot import sensor as wsdot
 from homeassistant.components.wsdot.sensor import (
     ATTR_DESCRIPTION,
     ATTR_TIME_UPDATED,
diff --git a/tests/components/wyoming/conftest.py b/tests/components/wyoming/conftest.py
index 018fff33821..125edc547c6 100644
--- a/tests/components/wyoming/conftest.py
+++ b/tests/components/wyoming/conftest.py
@@ -121,7 +121,9 @@ def handle_config_entry(hass: HomeAssistant) -> ConfigEntry:
 
 
 @pytest.fixture
-async def init_wyoming_stt(hass: HomeAssistant, stt_config_entry: ConfigEntry):
+async def init_wyoming_stt(
+    hass: HomeAssistant, stt_config_entry: ConfigEntry
+) -> ConfigEntry:
     """Initialize Wyoming STT."""
     with patch(
         "homeassistant.components.wyoming.data.load_wyoming_info",
@@ -129,9 +131,13 @@ async def init_wyoming_stt(hass: HomeAssistant, stt_config_entry: ConfigEntry):
     ):
         await hass.config_entries.async_setup(stt_config_entry.entry_id)
 
+    return stt_config_entry
+
 
 @pytest.fixture
-async def init_wyoming_tts(hass: HomeAssistant, tts_config_entry: ConfigEntry):
+async def init_wyoming_tts(
+    hass: HomeAssistant, tts_config_entry: ConfigEntry
+) -> ConfigEntry:
     """Initialize Wyoming TTS."""
     with patch(
         "homeassistant.components.wyoming.data.load_wyoming_info",
@@ -139,11 +145,13 @@ async def init_wyoming_tts(hass: HomeAssistant, tts_config_entry: ConfigEntry):
     ):
         await hass.config_entries.async_setup(tts_config_entry.entry_id)
 
+    return tts_config_entry
+
 
 @pytest.fixture
 async def init_wyoming_wake_word(
     hass: HomeAssistant, wake_word_config_entry: ConfigEntry
-):
+) -> ConfigEntry:
     """Initialize Wyoming Wake Word."""
     with patch(
         "homeassistant.components.wyoming.data.load_wyoming_info",
@@ -151,6 +159,8 @@ async def init_wyoming_wake_word(
     ):
         await hass.config_entries.async_setup(wake_word_config_entry.entry_id)
 
+    return wake_word_config_entry
+
 
 @pytest.fixture
 async def init_wyoming_intent(
diff --git a/tests/components/wyoming/snapshots/test_config_flow.ambr b/tests/components/wyoming/snapshots/test_config_flow.ambr
index bdead0f2028..d288c531407 100644
--- a/tests/components/wyoming/snapshots/test_config_flow.ambr
+++ b/tests/components/wyoming/snapshots/test_config_flow.ambr
@@ -36,10 +36,14 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'hassio',
+      'subentries': list([
+      ]),
       'title': 'Piper',
       'unique_id': '1234',
       'version': 1,
     }),
+    'subentries': tuple(
+    ),
     'title': 'Piper',
     'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
     'version': 1,
@@ -82,10 +86,14 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'hassio',
+      'subentries': list([
+      ]),
       'title': 'Piper',
       'unique_id': '1234',
       'version': 1,
     }),
+    'subentries': tuple(
+    ),
     'title': 'Piper',
     'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
     'version': 1,
@@ -127,10 +135,14 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'zeroconf',
+      'subentries': list([
+      ]),
       'title': 'Test Satellite',
       'unique_id': 'test_zeroconf_name._wyoming._tcp.local._Test Satellite',
       'version': 1,
     }),
+    'subentries': tuple(
+    ),
     'title': 'Test Satellite',
     'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
     'version': 1,
diff --git a/tests/components/wyoming/test_satellite.py b/tests/components/wyoming/test_satellite.py
index f293f976242..0e4bb3da78c 100644
--- a/tests/components/wyoming/test_satellite.py
+++ b/tests/components/wyoming/test_satellite.py
@@ -5,6 +5,7 @@ from __future__ import annotations
 import asyncio
 from collections.abc import Callable
 import io
+import tempfile
 from typing import Any
 from unittest.mock import patch
 import wave
@@ -17,17 +18,18 @@ from wyoming.info import Info
 from wyoming.ping import Ping, Pong
 from wyoming.pipeline import PipelineStage, RunPipeline
 from wyoming.satellite import RunSatellite
+from wyoming.snd import Played
 from wyoming.timer import TimerCancelled, TimerFinished, TimerStarted, TimerUpdated
 from wyoming.tts import Synthesize
 from wyoming.vad import VoiceStarted, VoiceStopped
 from wyoming.wake import Detect, Detection
 
-from homeassistant.components import assist_pipeline, wyoming
+from homeassistant.components import assist_pipeline, assist_satellite, wyoming
 from homeassistant.components.wyoming.assist_satellite import WyomingAssistSatellite
 from homeassistant.components.wyoming.devices import SatelliteDevice
 from homeassistant.const import STATE_ON
 from homeassistant.core import HomeAssistant, State
-from homeassistant.helpers import intent as intent_helper
+from homeassistant.helpers import entity_registry as er, intent as intent_helper
 from homeassistant.setup import async_setup_component
 
 from . import SATELLITE_INFO, WAKE_WORD_INFO, MockAsyncTcpClient
@@ -65,7 +67,7 @@ def get_test_wav() -> bytes:
             wav_file.setnchannels(1)
 
             # Single frame
-            wav_file.writeframes(b"123")
+            wav_file.writeframes(b"1234")
 
         return wav_io.getvalue()
 
@@ -73,10 +75,15 @@ def get_test_wav() -> bytes:
 class SatelliteAsyncTcpClient(MockAsyncTcpClient):
     """Satellite AsyncTcpClient."""
 
-    def __init__(self, responses: list[Event]) -> None:
+    def __init__(
+        self, responses: list[Event], block_until_inject: bool = False
+    ) -> None:
         """Initialize client."""
         super().__init__(responses)
 
+        self.block_until_inject = block_until_inject
+        self._responses_ready = asyncio.Event()
+
         self.connect_event = asyncio.Event()
         self.run_satellite_event = asyncio.Event()
         self.detect_event = asyncio.Event()
@@ -188,6 +195,9 @@ class SatelliteAsyncTcpClient(MockAsyncTcpClient):
 
     async def read_event(self) -> Event | None:
         """Receive."""
+        if self.block_until_inject and (not self.responses):
+            await self._responses_ready.wait()
+
         event = await super().read_event()
 
         # Keep sending audio chunks instead of None
@@ -196,6 +206,7 @@ class SatelliteAsyncTcpClient(MockAsyncTcpClient):
     def inject_event(self, event: Event) -> None:
         """Put an event in as the next response."""
         self.responses = [event, *self.responses]
+        self._responses_ready.set()
 
 
 async def test_satellite_pipeline(hass: HomeAssistant) -> None:
@@ -416,7 +427,7 @@ async def test_satellite_pipeline(hass: HomeAssistant) -> None:
         assert mock_client.tts_audio_chunk.rate == 22050
         assert mock_client.tts_audio_chunk.width == 2
         assert mock_client.tts_audio_chunk.channels == 1
-        assert mock_client.tts_audio_chunk.audio == b"123"
+        assert mock_client.tts_audio_chunk.audio == b"1234"
 
         # Pipeline finished
         pipeline_event_callback(
@@ -1283,3 +1294,85 @@ async def test_timers(hass: HomeAssistant) -> None:
             timer_finished = mock_client.timer_finished
             assert timer_finished is not None
             assert timer_finished.id == timer_started.id
+
+
+async def test_announce(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test announce on satellite."""
+    assert await async_setup_component(hass, assist_pipeline.DOMAIN, {})
+
+    def async_process_play_media_url(hass: HomeAssistant, media_id: str) -> str:
+        # Don't create a URL
+        return media_id
+
+    with (
+        tempfile.NamedTemporaryFile(mode="wb+", suffix=".wav") as temp_wav_file,
+        patch(
+            "homeassistant.components.wyoming.data.load_wyoming_info",
+            return_value=SATELLITE_INFO,
+        ),
+        patch(
+            "homeassistant.components.wyoming.assist_satellite.AsyncTcpClient",
+            SatelliteAsyncTcpClient(responses=[], block_until_inject=True),
+        ) as mock_client,
+        patch(
+            "homeassistant.components.assist_satellite.entity.async_process_play_media_url",
+            new=async_process_play_media_url,
+        ),
+    ):
+        # Use test WAV data for media
+        with wave.open(temp_wav_file.name, "wb") as wav_file:
+            wav_file.setframerate(22050)
+            wav_file.setsampwidth(2)
+            wav_file.setnchannels(1)
+            wav_file.writeframes(bytes(22050 * 2))  # 1 sec
+
+        temp_wav_file.seek(0)
+
+        entry = await setup_config_entry(hass)
+        device: SatelliteDevice = hass.data[wyoming.DOMAIN][entry.entry_id].device
+        assert device is not None
+
+        satellite_entry = next(
+            (
+                maybe_entry
+                for maybe_entry in er.async_entries_for_device(
+                    entity_registry, device.device_id
+                )
+                if maybe_entry.domain == assist_satellite.DOMAIN
+            ),
+            None,
+        )
+        assert satellite_entry is not None
+
+        async with asyncio.timeout(1):
+            await mock_client.connect_event.wait()
+            await mock_client.run_satellite_event.wait()
+
+        announce_task = hass.async_create_background_task(
+            hass.services.async_call(
+                assist_satellite.DOMAIN,
+                "announce",
+                {
+                    "entity_id": satellite_entry.entity_id,
+                    "media_id": temp_wav_file.name,
+                },
+                blocking=True,
+            ),
+            "wyoming_satellite_announce",
+        )
+
+        # Wait for audio to come from ffmpeg
+        async with asyncio.timeout(1):
+            await mock_client.tts_audio_start_event.wait()
+            await mock_client.tts_audio_chunk_event.wait()
+            await mock_client.tts_audio_stop_event.wait()
+
+            # Stop announcement from blocking
+            mock_client.inject_event(Played().event())
+            await announce_task
+
+        # Stop the satellite
+        await hass.config_entries.async_unload(entry.entry_id)
+        await hass.async_block_till_done()
diff --git a/tests/components/wyoming/test_tts.py b/tests/components/wyoming/test_tts.py
index 263804787b1..6e0edc022c0 100644
--- a/tests/components/wyoming/test_tts.py
+++ b/tests/components/wyoming/test_tts.py
@@ -150,17 +150,15 @@ async def test_get_tts_audio_connection_lost(
     hass: HomeAssistant, init_wyoming_tts
 ) -> None:
     """Test streaming audio and losing connection."""
-    with (
-        patch(
-            "homeassistant.components.wyoming.tts.AsyncTcpClient",
-            MockAsyncTcpClient([None]),
-        ),
-        pytest.raises(HomeAssistantError),
+    stream = tts.async_create_stream(hass, "tts.test_tts", "en-US")
+    with patch(
+        "homeassistant.components.wyoming.tts.AsyncTcpClient",
+        MockAsyncTcpClient([None]),
     ):
-        await tts.async_get_media_source_audio(
-            hass,
-            tts.generate_media_source_id(hass, "Hello world", "tts.test_tts", "en-US"),
-        )
+        stream.async_set_message("Hello world")
+        with pytest.raises(HomeAssistantError):
+            async for _chunk in stream.async_stream_result():
+                pass
 
 
 async def test_get_tts_audio_audio_oserror(
diff --git a/tests/components/wyoming/test_websocket.py b/tests/components/wyoming/test_websocket.py
new file mode 100644
index 00000000000..18b43321354
--- /dev/null
+++ b/tests/components/wyoming/test_websocket.py
@@ -0,0 +1,58 @@
+"""Websocket tests for Wyoming integration."""
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+
+from tests.typing import WebSocketGenerator
+
+
+async def test_info(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    init_components,
+    init_wyoming_stt: ConfigEntry,
+    init_wyoming_tts: ConfigEntry,
+    init_wyoming_wake_word: ConfigEntry,
+    init_wyoming_intent: ConfigEntry,
+    init_wyoming_handle: ConfigEntry,
+) -> None:
+    """Test info websocket command."""
+    client = await hass_ws_client(hass)
+
+    await client.send_json_auto_id({"type": "wyoming/info"})
+
+    # result
+    msg = await client.receive_json()
+    assert msg["success"]
+
+    info = msg.get("result", {}).get("info", {})
+
+    # stt (speech-to-text) = asr (automated speech recognition)
+    assert init_wyoming_stt.entry_id in info
+    asr_info = info[init_wyoming_stt.entry_id].get("asr", [])
+    assert len(asr_info) == 1
+    assert asr_info[0].get("name") == "Test ASR"
+
+    # tts (text-to-speech)
+    assert init_wyoming_tts.entry_id in info
+    tts_info = info[init_wyoming_tts.entry_id].get("tts", [])
+    assert len(tts_info) == 1
+    assert tts_info[0].get("name") == "Test TTS"
+
+    # wake word detection
+    assert init_wyoming_wake_word.entry_id in info
+    wake_info = info[init_wyoming_wake_word.entry_id].get("wake", [])
+    assert len(wake_info) == 1
+    assert wake_info[0].get("name") == "Test Wake Word"
+
+    # intent recognition
+    assert init_wyoming_intent.entry_id in info
+    intent_info = info[init_wyoming_intent.entry_id].get("intent", [])
+    assert len(intent_info) == 1
+    assert intent_info[0].get("name") == "Test Intent"
+
+    # intent handling
+    assert init_wyoming_handle.entry_id in info
+    handle_info = info[init_wyoming_handle.entry_id].get("handle", [])
+    assert len(handle_info) == 1
+    assert handle_info[0].get("name") == "Test Handle"
diff --git a/tests/components/xiaomi/test_device_tracker.py b/tests/components/xiaomi/test_device_tracker.py
index 625e6f404ad..e3cc1898ce9 100644
--- a/tests/components/xiaomi/test_device_tracker.py
+++ b/tests/components/xiaomi/test_device_tracker.py
@@ -7,7 +7,7 @@ from unittest.mock import MagicMock, call, patch
 import requests
 
 from homeassistant.components.device_tracker import DOMAIN as DEVICE_TRACKER_DOMAIN
-import homeassistant.components.xiaomi.device_tracker as xiaomi
+from homeassistant.components.xiaomi import device_tracker as xiaomi
 from homeassistant.components.xiaomi.device_tracker import get_scanner
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PLATFORM, CONF_USERNAME
 from homeassistant.core import HomeAssistant
diff --git a/tests/components/xiaomi_ble/test_config_flow.py b/tests/components/xiaomi_ble/test_config_flow.py
index e25ac939a53..3d8a4dab244 100644
--- a/tests/components/xiaomi_ble/test_config_flow.py
+++ b/tests/components/xiaomi_ble/test_config_flow.py
@@ -634,6 +634,38 @@ async def test_async_step_user_with_found_devices(hass: HomeAssistant) -> None:
     assert result2["result"].unique_id == "58:2D:34:35:93:21"
 
 
+async def test_async_step_user_replace_ignored_entry(hass: HomeAssistant) -> None:
+    """Test setup from service info can replace an ignored entry."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=LYWSDCGQ_SERVICE_INFO.address,
+        data={},
+        source=config_entries.SOURCE_IGNORE,
+    )
+    entry.add_to_hass(hass)
+    with patch(
+        "homeassistant.components.xiaomi_ble.config_flow.async_discovered_service_info",
+        return_value=[LYWSDCGQ_SERVICE_INFO],
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_USER},
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    with patch(
+        "homeassistant.components.xiaomi_ble.async_setup_entry", return_value=True
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input={"address": "58:2D:34:35:93:21"},
+        )
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "Temperature/Humidity Sensor 9321 (LYWSDCGQ)"
+    assert result2["data"] == {}
+    assert result2["result"].unique_id == "58:2D:34:35:93:21"
+
+
 async def test_async_step_user_short_payload(hass: HomeAssistant) -> None:
     """Test setup from service info cache with devices found but short payloads."""
     with patch(
diff --git a/tests/components/yale/snapshots/test_binary_sensor.ambr b/tests/components/yale/snapshots/test_binary_sensor.ambr
index e294cb7c76c..9db0d760efb 100644
--- a/tests/components/yale/snapshots/test_binary_sensor.ambr
+++ b/tests/components/yale/snapshots/test_binary_sensor.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': 'tmt100_name',
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://account.aaecosystem.com',
     'connections': set({
     }),
diff --git a/tests/components/yale/snapshots/test_lock.ambr b/tests/components/yale/snapshots/test_lock.ambr
index b1a9f6a4d86..00653a9b0c1 100644
--- a/tests/components/yale/snapshots/test_lock.ambr
+++ b/tests/components/yale/snapshots/test_lock.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': 'online_with_doorsense_name',
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'https://account.aaecosystem.com',
     'connections': set({
       tuple(
diff --git a/tests/components/yale/test_binary_sensor.py b/tests/components/yale/test_binary_sensor.py
index 811c845e359..16ec0ffbeb4 100644
--- a/tests/components/yale/test_binary_sensor.py
+++ b/tests/components/yale/test_binary_sensor.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .mocks import (
     _create_yale_with_devices,
diff --git a/tests/components/yale/test_event.py b/tests/components/yale/test_event.py
index 7aeb9d8f12b..ce7f2635eea 100644
--- a/tests/components/yale/test_event.py
+++ b/tests/components/yale/test_event.py
@@ -4,7 +4,7 @@ from freezegun.api import FrozenDateTimeFactory
 
 from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .mocks import (
     _create_yale_with_devices,
diff --git a/tests/components/yale/test_lock.py b/tests/components/yale/test_lock.py
index f6b96120d0d..1a99cf967ba 100644
--- a/tests/components/yale/test_lock.py
+++ b/tests/components/yale/test_lock.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceNotSupported
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .mocks import (
     _create_yale_with_devices,
diff --git a/tests/components/yale_smart_alarm/snapshots/test_alarm_control_panel.ambr b/tests/components/yale_smart_alarm/snapshots/test_alarm_control_panel.ambr
index fcdb7baca03..daa232ab141 100644
--- a/tests/components/yale_smart_alarm/snapshots/test_alarm_control_panel.ambr
+++ b/tests/components/yale_smart_alarm/snapshots/test_alarm_control_panel.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/yale_smart_alarm/snapshots/test_binary_sensor.ambr b/tests/components/yale_smart_alarm/snapshots/test_binary_sensor.ambr
index e519a880de9..39b3ef09196 100644
--- a/tests/components/yale_smart_alarm/snapshots/test_binary_sensor.ambr
+++ b/tests/components/yale_smart_alarm/snapshots/test_binary_sensor.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -53,6 +54,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -100,6 +102,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -147,6 +150,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -194,6 +198,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -241,6 +246,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -288,6 +294,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -335,6 +342,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -382,6 +390,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -429,6 +438,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/yale_smart_alarm/snapshots/test_button.ambr b/tests/components/yale_smart_alarm/snapshots/test_button.ambr
index 951caced170..7d52d1d7206 100644
--- a/tests/components/yale_smart_alarm/snapshots/test_button.ambr
+++ b/tests/components/yale_smart_alarm/snapshots/test_button.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/yale_smart_alarm/snapshots/test_lock.ambr b/tests/components/yale_smart_alarm/snapshots/test_lock.ambr
index 34da7db087a..e7c97b9001b 100644
--- a/tests/components/yale_smart_alarm/snapshots/test_lock.ambr
+++ b/tests/components/yale_smart_alarm/snapshots/test_lock.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -54,6 +55,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -102,6 +104,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -150,6 +153,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -198,6 +202,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -246,6 +251,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/yale_smart_alarm/snapshots/test_select.ambr b/tests/components/yale_smart_alarm/snapshots/test_select.ambr
index 52ec7a99c2c..2899e716ea1 100644
--- a/tests/components/yale_smart_alarm/snapshots/test_select.ambr
+++ b/tests/components/yale_smart_alarm/snapshots/test_select.ambr
@@ -12,6 +12,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -69,6 +70,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -126,6 +128,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -183,6 +186,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -240,6 +244,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -297,6 +302,7 @@
       ]),
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/yale_smart_alarm/snapshots/test_switch.ambr b/tests/components/yale_smart_alarm/snapshots/test_switch.ambr
index f631a6fcbfe..17c44bf6ebf 100644
--- a/tests/components/yale_smart_alarm/snapshots/test_switch.ambr
+++ b/tests/components/yale_smart_alarm/snapshots/test_switch.ambr
@@ -6,6 +6,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -52,6 +53,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -98,6 +100,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -144,6 +147,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -190,6 +194,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -236,6 +241,7 @@
     'area_id': None,
     'capabilities': None,
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/yalexs_ble/test_config_flow.py b/tests/components/yalexs_ble/test_config_flow.py
index c546e754239..1b0df05db2c 100644
--- a/tests/components/yalexs_ble/test_config_flow.py
+++ b/tests/components/yalexs_ble/test_config_flow.py
@@ -92,6 +92,58 @@ async def test_user_step_success(hass: HomeAssistant, slot: int) -> None:
     assert len(mock_setup_entry.mock_calls) == 1
 
 
+@pytest.mark.parametrize("slot", [0, 1, 66])
+async def test_user_step_from_ignored(hass: HomeAssistant, slot: int) -> None:
+    """Test user step replaces an ignored entry."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={},
+        unique_id=YALE_ACCESS_LOCK_DISCOVERY_INFO.address,
+        source=config_entries.SOURCE_IGNORE,
+    )
+    entry.add_to_hass(hass)
+    with patch(
+        "homeassistant.components.yalexs_ble.config_flow.async_discovered_service_info",
+        return_value=[NOT_YALE_DISCOVERY_INFO, YALE_ACCESS_LOCK_DISCOVERY_INFO],
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": config_entries.SOURCE_USER}
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    with (
+        patch(
+            "homeassistant.components.yalexs_ble.config_flow.PushLock.validate",
+        ),
+        patch(
+            "homeassistant.components.yalexs_ble.async_setup_entry",
+            return_value=True,
+        ) as mock_setup_entry,
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                CONF_ADDRESS: YALE_ACCESS_LOCK_DISCOVERY_INFO.address,
+                CONF_KEY: "2fd51b8621c6a139eaffbedcb846b60f",
+                CONF_SLOT: slot,
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == YALE_ACCESS_LOCK_DISCOVERY_INFO.name
+    assert result2["data"] == {
+        CONF_LOCAL_NAME: YALE_ACCESS_LOCK_DISCOVERY_INFO.name,
+        CONF_ADDRESS: YALE_ACCESS_LOCK_DISCOVERY_INFO.address,
+        CONF_KEY: "2fd51b8621c6a139eaffbedcb846b60f",
+        CONF_SLOT: slot,
+    }
+    assert result2["result"].unique_id == YALE_ACCESS_LOCK_DISCOVERY_INFO.address
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
 async def test_user_step_no_devices_found(hass: HomeAssistant) -> None:
     """Test user step with no devices found."""
     with patch(
diff --git a/tests/components/yandex_transport/test_sensor.py b/tests/components/yandex_transport/test_sensor.py
index 13432850b2b..dd8e82278f3 100644
--- a/tests/components/yandex_transport/test_sensor.py
+++ b/tests/components/yandex_transport/test_sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components import sensor
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import assert_setup_component, load_fixture
 
diff --git a/tests/components/yandextts/test_tts.py b/tests/components/yandextts/test_tts.py
index 77878c2be51..098fc025bf3 100644
--- a/tests/components/yandextts/test_tts.py
+++ b/tests/components/yandextts/test_tts.py
@@ -223,7 +223,7 @@ async def test_service_say_timeout(
     assert len(calls) == 1
     assert (
         await retrieve_media(hass, hass_client, calls[0].data[ATTR_MEDIA_CONTENT_ID])
-        == HTTPStatus.NOT_FOUND
+        == HTTPStatus.INTERNAL_SERVER_ERROR
     )
 
     assert len(aioclient_mock.mock_calls) == 1
@@ -269,7 +269,7 @@ async def test_service_say_http_error(
     assert len(calls) == 1
     assert (
         await retrieve_media(hass, hass_client, calls[0].data[ATTR_MEDIA_CONTENT_ID])
-        == HTTPStatus.NOT_FOUND
+        == HTTPStatus.INTERNAL_SERVER_ERROR
     )
 
 
diff --git a/tests/components/youless/__init__.py b/tests/components/youless/__init__.py
index 8770a7e2dc8..03db24cb7f7 100644
--- a/tests/components/youless/__init__.py
+++ b/tests/components/youless/__init__.py
@@ -25,6 +25,11 @@ async def init_component(hass: HomeAssistant) -> MockConfigEntry:
             json=load_json_array_fixture("enologic.json", youless.DOMAIN),
             headers={"Content-Type": "application/json"},
         )
+        mock.get(
+            "http://1.1.1.1/f",
+            json=load_json_object_fixture("phase.json", youless.DOMAIN),
+            headers={"Content-Type": "application/json"},
+        )
 
         entry = MockConfigEntry(
             domain=youless.DOMAIN,
diff --git a/tests/components/youless/fixtures/device.json b/tests/components/youless/fixtures/device.json
index 7d089851923..82d07dba739 100644
--- a/tests/components/youless/fixtures/device.json
+++ b/tests/components/youless/fixtures/device.json
@@ -1,5 +1,5 @@
 {
   "model": "LS120",
-  "fw": "1.4.2-EL",
+  "fw": "1.5.1-EL",
   "mac": "de2:2d2:3d23"
 }
diff --git a/tests/components/youless/fixtures/phase.json b/tests/components/youless/fixtures/phase.json
new file mode 100644
index 00000000000..8a5aa3215ef
--- /dev/null
+++ b/tests/components/youless/fixtures/phase.json
@@ -0,0 +1,15 @@
+{
+  "tr": 1,
+  "i1": 0.123,
+  "v1": 240,
+  "l1": 462,
+  "v2": 240,
+  "l2": 230,
+  "i2": 0.123,
+  "v3": 240,
+  "l3": 230,
+  "i3": 0.123,
+  "pp": 1200,
+  "pts": 2501301621,
+  "pa": 400
+}
diff --git a/tests/components/youless/snapshots/test_sensor.ambr b/tests/components/youless/snapshots/test_sensor.ambr
index 3424a264f48..8cb28776d74 100644
--- a/tests/components/youless/snapshots/test_sensor.ambr
+++ b/tests/components/youless/snapshots/test_sensor.ambr
@@ -1,5 +1,5 @@
 # serializer version: 1
-# name: test_sensors[sensor.energy_delivery_high-entry]
+# name: test_sensors[sensor.energy_delivery_meter_energy_export_tariff_1-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -8,13 +8,14 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.energy_delivery_high',
-    'has_entity_name': False,
+    'entity_id': 'sensor.energy_delivery_meter_energy_export_tariff_1',
+    'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
     'id': <ANY>,
@@ -24,86 +25,33 @@
     'options': dict({
     }),
     'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': 'mdi:transmission-tower-import',
-    'original_name': 'Energy delivery high',
+    'original_icon': None,
+    'original_name': 'Energy export tariff 1',
     'platform': 'youless',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'youless_localhost_delivery_high',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.energy_delivery_high-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'energy',
-      'friendly_name': 'Energy delivery high',
-      'icon': 'mdi:transmission-tower-import',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.energy_delivery_high',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.0',
-  })
-# ---
-# name: test_sensors[sensor.energy_delivery_low-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': None,
-    'entity_id': 'sensor.energy_delivery_low',
-    'has_entity_name': False,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': 'mdi:transmission-tower-import',
-    'original_name': 'Energy delivery low',
-    'platform': 'youless',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'total_energy_export_tariff_kwh',
     'unique_id': 'youless_localhost_delivery_low',
     'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
   })
 # ---
-# name: test_sensors[sensor.energy_delivery_low-state]
+# name: test_sensors[sensor.energy_delivery_meter_energy_export_tariff_1-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'energy',
-      'friendly_name': 'Energy delivery low',
-      'icon': 'mdi:transmission-tower-import',
+      'friendly_name': 'Energy delivery meter Energy export tariff 1',
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.energy_delivery_low',
+    'entity_id': 'sensor.energy_delivery_meter_energy_export_tariff_1',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.029',
   })
 # ---
-# name: test_sensors[sensor.energy_high-entry]
+# name: test_sensors[sensor.energy_delivery_meter_energy_export_tariff_2-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -112,13 +60,14 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.energy_high',
-    'has_entity_name': False,
+    'entity_id': 'sensor.energy_delivery_meter_energy_export_tariff_2',
+    'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
     'id': <ANY>,
@@ -128,242 +77,33 @@
     'options': dict({
     }),
     'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': 'mdi:transmission-tower-export',
-    'original_name': 'Energy high',
+    'original_icon': None,
+    'original_name': 'Energy export tariff 2',
     'platform': 'youless',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'youless_localhost_power_high',
+    'translation_key': 'total_energy_export_tariff_kwh',
+    'unique_id': 'youless_localhost_delivery_high',
     'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
   })
 # ---
-# name: test_sensors[sensor.energy_high-state]
+# name: test_sensors[sensor.energy_delivery_meter_energy_export_tariff_2-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'energy',
-      'friendly_name': 'Energy high',
-      'icon': 'mdi:transmission-tower-export',
+      'friendly_name': 'Energy delivery meter Energy export tariff 2',
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.energy_high',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '4490.631',
-  })
-# ---
-# name: test_sensors[sensor.energy_low-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': None,
-    'entity_id': 'sensor.energy_low',
-    'has_entity_name': False,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': 'mdi:transmission-tower-export',
-    'original_name': 'Energy low',
-    'platform': 'youless',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'youless_localhost_power_low',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.energy_low-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'energy',
-      'friendly_name': 'Energy low',
-      'icon': 'mdi:transmission-tower-export',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.energy_low',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '4703.562',
-  })
-# ---
-# name: test_sensors[sensor.energy_total-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': None,
-    'entity_id': 'sensor.energy_total',
-    'has_entity_name': False,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': 'mdi:transmission-tower-export',
-    'original_name': 'Energy total',
-    'platform': 'youless',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'youless_localhost_power_total',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.energy_total-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'energy',
-      'friendly_name': 'Energy total',
-      'icon': 'mdi:transmission-tower-export',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.energy_total',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '9194.164',
-  })
-# ---
-# name: test_sensors[sensor.extra_total-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': None,
-    'entity_id': 'sensor.extra_total',
-    'has_entity_name': False,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': 'mdi:meter-electric',
-    'original_name': 'Extra total',
-    'platform': 'youless',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'youless_localhost_extra_total',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.extra_total-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'energy',
-      'friendly_name': 'Extra total',
-      'icon': 'mdi:meter-electric',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.extra_total',
+    'entity_id': 'sensor.energy_delivery_meter_energy_export_tariff_2',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0.0',
   })
 # ---
-# name: test_sensors[sensor.extra_usage-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': None,
-    'entity_id': 'sensor.extra_usage',
-    'has_entity_name': False,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
-    'original_icon': 'mdi:lightning-bolt',
-    'original_name': 'Extra usage',
-    'platform': 'youless',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'youless_localhost_extra_usage',
-    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
-  })
-# ---
-# name: test_sensors[sensor.extra_usage-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'power',
-      'friendly_name': 'Extra usage',
-      'icon': 'mdi:lightning-bolt',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.extra_usage',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0',
-  })
-# ---
-# name: test_sensors[sensor.gas_usage-entry]
+# name: test_sensors[sensor.gas_meter_total_gas_usage-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -372,13 +112,14 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.gas_usage',
-    'has_entity_name': False,
+    'entity_id': 'sensor.gas_meter_total_gas_usage',
+    'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
     'id': <ANY>,
@@ -388,34 +129,33 @@
     'options': dict({
     }),
     'original_device_class': <SensorDeviceClass.GAS: 'gas'>,
-    'original_icon': 'mdi:fire',
-    'original_name': 'Gas usage',
+    'original_icon': None,
+    'original_name': 'Total gas usage',
     'platform': 'youless',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'total_gas_m3',
     'unique_id': 'youless_localhost_gas',
     'unit_of_measurement': <UnitOfVolume.CUBIC_METERS: 'm³'>,
   })
 # ---
-# name: test_sensors[sensor.gas_usage-state]
+# name: test_sensors[sensor.gas_meter_total_gas_usage-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'gas',
-      'friendly_name': 'Gas usage',
-      'icon': 'mdi:fire',
+      'friendly_name': 'Gas meter Total gas usage',
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       'unit_of_measurement': <UnitOfVolume.CUBIC_METERS: 'm³'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.gas_usage',
+    'entity_id': 'sensor.gas_meter_total_gas_usage',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '1624.264',
   })
 # ---
-# name: test_sensors[sensor.phase_1_current-entry]
+# name: test_sensors[sensor.power_meter_average_peak-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -424,13 +164,66 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.phase_1_current',
-    'has_entity_name': False,
+    'entity_id': 'sensor.power_meter_average_peak',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Average peak',
+    'platform': 'youless',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'average_peak',
+    'unique_id': 'youless_localhost_average_peak',
+    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+  })
+# ---
+# name: test_sensors[sensor.power_meter_average_peak-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Power meter Average peak',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.power_meter_average_peak',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '400',
+  })
+# ---
+# name: test_sensors[sensor.power_meter_current_phase_1-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.power_meter_current_phase_1',
+    'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
     'id': <ANY>,
@@ -441,32 +234,32 @@
     }),
     'original_device_class': <SensorDeviceClass.CURRENT: 'current'>,
     'original_icon': None,
-    'original_name': 'Phase 1 current',
+    'original_name': 'Current phase 1',
     'platform': 'youless',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'active_current_phase_a',
     'unique_id': 'youless_localhost_phase_1_current',
     'unit_of_measurement': <UnitOfElectricCurrent.AMPERE: 'A'>,
   })
 # ---
-# name: test_sensors[sensor.phase_1_current-state]
+# name: test_sensors[sensor.power_meter_current_phase_1-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'current',
-      'friendly_name': 'Phase 1 current',
+      'friendly_name': 'Power meter Current phase 1',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfElectricCurrent.AMPERE: 'A'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.phase_1_current',
+    'entity_id': 'sensor.power_meter_current_phase_1',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'unknown',
+    'state': '0.123',
   })
 # ---
-# name: test_sensors[sensor.phase_1_power-entry]
+# name: test_sensors[sensor.power_meter_current_phase_2-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -475,115 +268,14 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.phase_1_power',
-    'has_entity_name': False,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
-    'original_icon': None,
-    'original_name': 'Phase 1 power',
-    'platform': 'youless',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'youless_localhost_phase_1_power',
-    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
-  })
-# ---
-# name: test_sensors[sensor.phase_1_power-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'power',
-      'friendly_name': 'Phase 1 power',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.phase_1_power',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_sensors[sensor.phase_1_voltage-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': None,
-    'entity_id': 'sensor.phase_1_voltage',
-    'has_entity_name': False,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
-    'original_icon': None,
-    'original_name': 'Phase 1 voltage',
-    'platform': 'youless',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'youless_localhost_phase_1_voltage',
-    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
-  })
-# ---
-# name: test_sensors[sensor.phase_1_voltage-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'voltage',
-      'friendly_name': 'Phase 1 voltage',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.phase_1_voltage',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_sensors[sensor.phase_2_current-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': None,
-    'entity_id': 'sensor.phase_2_current',
-    'has_entity_name': False,
+    'entity_id': 'sensor.power_meter_current_phase_2',
+    'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
     'id': <ANY>,
@@ -594,32 +286,32 @@
     }),
     'original_device_class': <SensorDeviceClass.CURRENT: 'current'>,
     'original_icon': None,
-    'original_name': 'Phase 2 current',
+    'original_name': 'Current phase 2',
     'platform': 'youless',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'active_current_phase_a',
     'unique_id': 'youless_localhost_phase_2_current',
     'unit_of_measurement': <UnitOfElectricCurrent.AMPERE: 'A'>,
   })
 # ---
-# name: test_sensors[sensor.phase_2_current-state]
+# name: test_sensors[sensor.power_meter_current_phase_2-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'current',
-      'friendly_name': 'Phase 2 current',
+      'friendly_name': 'Power meter Current phase 2',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfElectricCurrent.AMPERE: 'A'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.phase_2_current',
+    'entity_id': 'sensor.power_meter_current_phase_2',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'unknown',
+    'state': '0.123',
   })
 # ---
-# name: test_sensors[sensor.phase_2_power-entry]
+# name: test_sensors[sensor.power_meter_current_phase_3-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -628,115 +320,14 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.phase_2_power',
-    'has_entity_name': False,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
-    'original_icon': None,
-    'original_name': 'Phase 2 power',
-    'platform': 'youless',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'youless_localhost_phase_2_power',
-    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
-  })
-# ---
-# name: test_sensors[sensor.phase_2_power-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'power',
-      'friendly_name': 'Phase 2 power',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.phase_2_power',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_sensors[sensor.phase_2_voltage-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': None,
-    'entity_id': 'sensor.phase_2_voltage',
-    'has_entity_name': False,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
-    'original_icon': None,
-    'original_name': 'Phase 2 voltage',
-    'platform': 'youless',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'youless_localhost_phase_2_voltage',
-    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
-  })
-# ---
-# name: test_sensors[sensor.phase_2_voltage-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'voltage',
-      'friendly_name': 'Phase 2 voltage',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.phase_2_voltage',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_sensors[sensor.phase_3_current-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': None,
-    'entity_id': 'sensor.phase_3_current',
-    'has_entity_name': False,
+    'entity_id': 'sensor.power_meter_current_phase_3',
+    'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
     'id': <ANY>,
@@ -747,32 +338,32 @@
     }),
     'original_device_class': <SensorDeviceClass.CURRENT: 'current'>,
     'original_icon': None,
-    'original_name': 'Phase 3 current',
+    'original_name': 'Current phase 3',
     'platform': 'youless',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'active_current_phase_a',
     'unique_id': 'youless_localhost_phase_3_current',
     'unit_of_measurement': <UnitOfElectricCurrent.AMPERE: 'A'>,
   })
 # ---
-# name: test_sensors[sensor.phase_3_current-state]
+# name: test_sensors[sensor.power_meter_current_phase_3-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'current',
-      'friendly_name': 'Phase 3 current',
+      'friendly_name': 'Power meter Current phase 3',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfElectricCurrent.AMPERE: 'A'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.phase_3_current',
+    'entity_id': 'sensor.power_meter_current_phase_3',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'unknown',
+    'state': '0.123',
   })
 # ---
-# name: test_sensors[sensor.phase_3_power-entry]
+# name: test_sensors[sensor.power_meter_current_power_usage-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -781,13 +372,14 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.phase_3_power',
-    'has_entity_name': False,
+    'entity_id': 'sensor.power_meter_current_power_usage',
+    'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
     'id': <ANY>,
@@ -798,135 +390,32 @@
     }),
     'original_device_class': <SensorDeviceClass.POWER: 'power'>,
     'original_icon': None,
-    'original_name': 'Phase 3 power',
+    'original_name': 'Current power usage',
     'platform': 'youless',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'youless_localhost_phase_3_power',
-    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
-  })
-# ---
-# name: test_sensors[sensor.phase_3_power-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'power',
-      'friendly_name': 'Phase 3 power',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.phase_3_power',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_sensors[sensor.phase_3_voltage-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': None,
-    'entity_id': 'sensor.phase_3_voltage',
-    'has_entity_name': False,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
-    'original_icon': None,
-    'original_name': 'Phase 3 voltage',
-    'platform': 'youless',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'youless_localhost_phase_3_voltage',
-    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
-  })
-# ---
-# name: test_sensors[sensor.phase_3_voltage-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'voltage',
-      'friendly_name': 'Phase 3 voltage',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.phase_3_voltage',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_sensors[sensor.power_usage-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': None,
-    'entity_id': 'sensor.power_usage',
-    'has_entity_name': False,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
-    'original_icon': 'mdi:meter-electric',
-    'original_name': 'Power Usage',
-    'platform': 'youless',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'active_power_w',
     'unique_id': 'youless_localhost_usage',
     'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
   })
 # ---
-# name: test_sensors[sensor.power_usage-state]
+# name: test_sensors[sensor.power_meter_current_power_usage-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'power',
-      'friendly_name': 'Power Usage',
-      'icon': 'mdi:meter-electric',
+      'friendly_name': 'Power meter Current power usage',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.power_usage',
+    'entity_id': 'sensor.power_meter_current_power_usage',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '2382',
   })
 # ---
-# name: test_sensors[sensor.water_usage-entry]
+# name: test_sensors[sensor.power_meter_energy_import_tariff_1-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -935,13 +424,695 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.water_usage',
-    'has_entity_name': False,
+    'entity_id': 'sensor.power_meter_energy_import_tariff_1',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy import tariff 1',
+    'platform': 'youless',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'total_energy_import_tariff_kwh',
+    'unique_id': 'youless_localhost_power_low',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_sensors[sensor.power_meter_energy_import_tariff_1-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Power meter Energy import tariff 1',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.power_meter_energy_import_tariff_1',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '4703.562',
+  })
+# ---
+# name: test_sensors[sensor.power_meter_energy_import_tariff_2-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.power_meter_energy_import_tariff_2',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Energy import tariff 2',
+    'platform': 'youless',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'total_energy_import_tariff_kwh',
+    'unique_id': 'youless_localhost_power_high',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_sensors[sensor.power_meter_energy_import_tariff_2-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Power meter Energy import tariff 2',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.power_meter_energy_import_tariff_2',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '4490.631',
+  })
+# ---
+# name: test_sensors[sensor.power_meter_month_peak-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.power_meter_month_peak',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Month peak',
+    'platform': 'youless',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'month_peak',
+    'unique_id': 'youless_localhost_month_peak',
+    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+  })
+# ---
+# name: test_sensors[sensor.power_meter_month_peak-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Power meter Month peak',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.power_meter_month_peak',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '1200',
+  })
+# ---
+# name: test_sensors[sensor.power_meter_power_phase_1-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.power_meter_power_phase_1',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power phase 1',
+    'platform': 'youless',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'active_power_phase_w',
+    'unique_id': 'youless_localhost_phase_1_power',
+    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+  })
+# ---
+# name: test_sensors[sensor.power_meter_power_phase_1-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Power meter Power phase 1',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.power_meter_power_phase_1',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '462',
+  })
+# ---
+# name: test_sensors[sensor.power_meter_power_phase_2-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.power_meter_power_phase_2',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power phase 2',
+    'platform': 'youless',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'active_power_phase_w',
+    'unique_id': 'youless_localhost_phase_2_power',
+    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+  })
+# ---
+# name: test_sensors[sensor.power_meter_power_phase_2-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Power meter Power phase 2',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.power_meter_power_phase_2',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '230',
+  })
+# ---
+# name: test_sensors[sensor.power_meter_power_phase_3-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.power_meter_power_phase_3',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Power phase 3',
+    'platform': 'youless',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'active_power_phase_w',
+    'unique_id': 'youless_localhost_phase_3_power',
+    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+  })
+# ---
+# name: test_sensors[sensor.power_meter_power_phase_3-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'Power meter Power phase 3',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.power_meter_power_phase_3',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '230',
+  })
+# ---
+# name: test_sensors[sensor.power_meter_tariff-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'options': list([
+        '1',
+        '2',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.power_meter_tariff',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+    'original_icon': None,
+    'original_name': 'Tariff',
+    'platform': 'youless',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'active_tariff',
+    'unique_id': 'youless_localhost_tariff',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_sensors[sensor.power_meter_tariff-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'enum',
+      'friendly_name': 'Power meter Tariff',
+      'options': list([
+        '1',
+        '2',
+      ]),
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.power_meter_tariff',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '1',
+  })
+# ---
+# name: test_sensors[sensor.power_meter_total_energy_import-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.power_meter_total_energy_import',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Total energy import',
+    'platform': 'youless',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'total_energy_import_kwh',
+    'unique_id': 'youless_localhost_power_total',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_sensors[sensor.power_meter_total_energy_import-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'Power meter Total energy import',
+      'state_class': <SensorStateClass.TOTAL: 'total'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.power_meter_total_energy_import',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '9194.164',
+  })
+# ---
+# name: test_sensors[sensor.power_meter_voltage_phase_1-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.power_meter_voltage_phase_1',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Voltage phase 1',
+    'platform': 'youless',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'active_voltage_phase_v',
+    'unique_id': 'youless_localhost_phase_1_voltage',
+    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+  })
+# ---
+# name: test_sensors[sensor.power_meter_voltage_phase_1-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'friendly_name': 'Power meter Voltage phase 1',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.power_meter_voltage_phase_1',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '240',
+  })
+# ---
+# name: test_sensors[sensor.power_meter_voltage_phase_2-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.power_meter_voltage_phase_2',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Voltage phase 2',
+    'platform': 'youless',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'active_voltage_phase_v',
+    'unique_id': 'youless_localhost_phase_2_voltage',
+    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+  })
+# ---
+# name: test_sensors[sensor.power_meter_voltage_phase_2-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'friendly_name': 'Power meter Voltage phase 2',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.power_meter_voltage_phase_2',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '240',
+  })
+# ---
+# name: test_sensors[sensor.power_meter_voltage_phase_3-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.power_meter_voltage_phase_3',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
+    'original_icon': None,
+    'original_name': 'Voltage phase 3',
+    'platform': 'youless',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'active_voltage_phase_v',
+    'unique_id': 'youless_localhost_phase_3_voltage',
+    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+  })
+# ---
+# name: test_sensors[sensor.power_meter_voltage_phase_3-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'voltage',
+      'friendly_name': 'Power meter Voltage phase 3',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.power_meter_voltage_phase_3',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '240',
+  })
+# ---
+# name: test_sensors[sensor.s0_meter_current_usage-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.s0_meter_current_usage',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+    'original_icon': None,
+    'original_name': 'Current usage',
+    'platform': 'youless',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'active_s0_w',
+    'unique_id': 'youless_localhost_extra_usage',
+    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+  })
+# ---
+# name: test_sensors[sensor.s0_meter_current_usage-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'power',
+      'friendly_name': 'S0 meter Current usage',
+      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.s0_meter_current_usage',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0',
+  })
+# ---
+# name: test_sensors[sensor.s0_meter_total_energy-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.s0_meter_total_energy',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+    'original_icon': None,
+    'original_name': 'Total energy',
+    'platform': 'youless',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': 'total_s0_kwh',
+    'unique_id': 'youless_localhost_extra_total',
+    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+  })
+# ---
+# name: test_sensors[sensor.s0_meter_total_energy-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'energy',
+      'friendly_name': 'S0 meter Total energy',
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.s0_meter_total_energy',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '0.0',
+  })
+# ---
+# name: test_sensors[sensor.water_meter_total_water_usage-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.water_meter_total_water_usage',
+    'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
     'id': <ANY>,
@@ -951,27 +1122,26 @@
     'options': dict({
     }),
     'original_device_class': <SensorDeviceClass.WATER: 'water'>,
-    'original_icon': 'mdi:water',
-    'original_name': 'Water usage',
+    'original_icon': None,
+    'original_name': 'Total water usage',
     'platform': 'youless',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'total_water',
     'unique_id': 'youless_localhost_water',
     'unit_of_measurement': <UnitOfVolume.CUBIC_METERS: 'm³'>,
   })
 # ---
-# name: test_sensors[sensor.water_usage-state]
+# name: test_sensors[sensor.water_meter_total_water_usage-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'water',
-      'friendly_name': 'Water usage',
-      'icon': 'mdi:water',
+      'friendly_name': 'Water meter Total water usage',
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       'unit_of_measurement': <UnitOfVolume.CUBIC_METERS: 'm³'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.water_usage',
+    'entity_id': 'sensor.water_meter_total_water_usage',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
diff --git a/tests/components/youless/test_init.py b/tests/components/youless/test_init.py
index 29db8c66af0..9f0956cea35 100644
--- a/tests/components/youless/test_init.py
+++ b/tests/components/youless/test_init.py
@@ -15,4 +15,4 @@ async def test_async_setup_entry(hass: HomeAssistant) -> None:
 
     assert await setup.async_setup_component(hass, youless.DOMAIN, {})
     assert entry.state is ConfigEntryState.LOADED
-    assert len(hass.states.async_entity_ids()) == 19
+    assert len(hass.states.async_entity_ids()) == 22
diff --git a/tests/components/zeroconf/test_init.py b/tests/components/zeroconf/test_init.py
index 3586f54a59a..56262600511 100644
--- a/tests/components/zeroconf/test_init.py
+++ b/tests/components/zeroconf/test_init.py
@@ -1090,7 +1090,7 @@ async def test_async_detect_interfaces_setting_non_loopback_route(
         patch.object(hass.config_entries.flow, "async_init"),
         patch.object(zeroconf, "AsyncServiceBrowser", side_effect=service_update_mock),
         patch(
-            "homeassistant.components.zeroconf.network.async_get_adapters",
+            "homeassistant.components.zeroconf.network.async_get_loaded_adapters",
             return_value=_ADAPTER_WITH_DEFAULT_ENABLED,
         ),
         patch(
@@ -1178,7 +1178,7 @@ async def test_async_detect_interfaces_setting_empty_route_linux(
         patch.object(hass.config_entries.flow, "async_init"),
         patch.object(zeroconf, "AsyncServiceBrowser", side_effect=service_update_mock),
         patch(
-            "homeassistant.components.zeroconf.network.async_get_adapters",
+            "homeassistant.components.zeroconf.network.async_get_loaded_adapters",
             return_value=_ADAPTERS_WITH_MANUAL_CONFIG,
         ),
         patch(
@@ -1212,7 +1212,7 @@ async def test_async_detect_interfaces_setting_empty_route_freebsd(
         patch.object(hass.config_entries.flow, "async_init"),
         patch.object(zeroconf, "AsyncServiceBrowser", side_effect=service_update_mock),
         patch(
-            "homeassistant.components.zeroconf.network.async_get_adapters",
+            "homeassistant.components.zeroconf.network.async_get_loaded_adapters",
             return_value=_ADAPTERS_WITH_MANUAL_CONFIG,
         ),
         patch(
@@ -1263,7 +1263,7 @@ async def test_async_detect_interfaces_explicitly_set_ipv6_linux(
         patch.object(hass.config_entries.flow, "async_init"),
         patch.object(zeroconf, "AsyncServiceBrowser", side_effect=service_update_mock),
         patch(
-            "homeassistant.components.zeroconf.network.async_get_adapters",
+            "homeassistant.components.zeroconf.network.async_get_loaded_adapters",
             return_value=_ADAPTER_WITH_DEFAULT_ENABLED_AND_IPV6,
         ),
         patch(
@@ -1292,7 +1292,7 @@ async def test_async_detect_interfaces_explicitly_set_ipv6_freebsd(
         patch.object(hass.config_entries.flow, "async_init"),
         patch.object(zeroconf, "AsyncServiceBrowser", side_effect=service_update_mock),
         patch(
-            "homeassistant.components.zeroconf.network.async_get_adapters",
+            "homeassistant.components.zeroconf.network.async_get_loaded_adapters",
             return_value=_ADAPTER_WITH_DEFAULT_ENABLED_AND_IPV6,
         ),
         patch(
@@ -1310,6 +1310,36 @@ async def test_async_detect_interfaces_explicitly_set_ipv6_freebsd(
     )
 
 
+@pytest.mark.usefixtures("mock_async_zeroconf")
+async def test_async_detect_interfaces_explicitly_before_setup(
+    hass: HomeAssistant,
+) -> None:
+    """Test interfaces are explicitly set with IPv6 before setup is called."""
+    with (
+        patch("homeassistant.components.zeroconf.sys.platform", "linux"),
+        patch("homeassistant.components.zeroconf.HaZeroconf") as mock_zc,
+        patch.object(hass.config_entries.flow, "async_init"),
+        patch.object(zeroconf, "AsyncServiceBrowser", side_effect=service_update_mock),
+        patch(
+            "homeassistant.components.zeroconf.network.async_get_loaded_adapters",
+            return_value=_ADAPTER_WITH_DEFAULT_ENABLED_AND_IPV6,
+        ),
+        patch(
+            "homeassistant.components.zeroconf.AsyncServiceInfo",
+            side_effect=get_service_info_mock,
+        ),
+    ):
+        # Call before async_setup has been called
+        await zeroconf.async_get_async_instance(hass)
+        hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
+        await hass.async_block_till_done()
+
+    assert mock_zc.mock_calls[0] == call(
+        interfaces=["192.168.1.5", "fe80::dead:beef:dead:beef%3"],
+        ip_version=IPVersion.All,
+    )
+
+
 async def test_no_name(hass: HomeAssistant, mock_async_zeroconf: MagicMock) -> None:
     """Test fallback to Home for mDNS announcement if the name is missing."""
     hass.config.location_name = ""
diff --git a/tests/components/zerproc/test_light.py b/tests/components/zerproc/test_light.py
index 724414b5965..6cadc025385 100644
--- a/tests/components/zerproc/test_light.py
+++ b/tests/components/zerproc/test_light.py
@@ -29,7 +29,7 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/zeversolar/snapshots/test_sensor.ambr b/tests/components/zeversolar/snapshots/test_sensor.ambr
index aaef2c43d79..f948eec79df 100644
--- a/tests/components/zeversolar/snapshots/test_sensor.ambr
+++ b/tests/components/zeversolar/snapshots/test_sensor.ambr
@@ -8,6 +8,7 @@
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
@@ -59,6 +60,7 @@
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
     }),
     'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
     'disabled_by': None,
diff --git a/tests/components/zha/common.py b/tests/components/zha/common.py
index 1dd1e5f81aa..89526f6431e 100644
--- a/tests/components/zha/common.py
+++ b/tests/components/zha/common.py
@@ -9,7 +9,7 @@ import zigpy.zcl.foundation as zcl_f
 from homeassistant.components.zha.helpers import ZHADeviceProxy
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
diff --git a/tests/components/zha/conftest.py b/tests/components/zha/conftest.py
index 1b280ea499a..96a61a6628b 100644
--- a/tests/components/zha/conftest.py
+++ b/tests/components/zha/conftest.py
@@ -25,7 +25,7 @@ from zigpy.zcl.clusters.general import Basic, Groups
 from zigpy.zcl.foundation import Status
 import zigpy.zdo.types as zdo_t
 
-import homeassistant.components.zha.const as zha_const
+from homeassistant.components.zha import const as zha_const
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
@@ -155,6 +155,7 @@ async def zigpy_app_controller():
     app.state.node_info.ieee = zigpy.types.EUI64.convert("00:15:8d:00:02:32:4f:32")
     app.state.node_info.manufacturer = "Coordinator Manufacturer"
     app.state.node_info.model = "Coordinator Model"
+    app.state.node_info.version = "7.1.4.0 build 389"
     app.state.network_info.pan_id = 0x1234
     app.state.network_info.extended_pan_id = app.state.node_info.ieee
     app.state.network_info.channel = 15
diff --git a/tests/components/zha/snapshots/test_diagnostics.ambr b/tests/components/zha/snapshots/test_diagnostics.ambr
index f46a06e84b8..7a599b00a21 100644
--- a/tests/components/zha/snapshots/test_diagnostics.ambr
+++ b/tests/components/zha/snapshots/test_diagnostics.ambr
@@ -75,7 +75,7 @@
         'manufacturer': 'Coordinator Manufacturer',
         'model': 'Coordinator Model',
         'nwk': 0,
-        'version': None,
+        'version': '7.1.4.0 build 389',
       }),
     }),
     'config': dict({
@@ -113,6 +113,8 @@
       'pref_disable_new_entities': False,
       'pref_disable_polling': False,
       'source': 'user',
+      'subentries': list([
+      ]),
       'title': 'Mock Title',
       'unique_id': None,
       'version': 4,
diff --git a/tests/components/zha/test_config_flow.py b/tests/components/zha/test_config_flow.py
index 573a04e9b57..94566be2f87 100644
--- a/tests/components/zha/test_config_flow.py
+++ b/tests/components/zha/test_config_flow.py
@@ -1914,9 +1914,18 @@ async def test_options_flow_migration_reset_old_adapter(
     assert result4["step_id"] == "choose_serial_port"
 
 
-async def test_config_flow_port_yellow_port_name(hass: HomeAssistant) -> None:
+@pytest.mark.parametrize(
+    "device",
+    [
+        "/dev/ttyAMA1",  # CM4
+        "/dev/ttyAMA10",  # CM5, erroneously detected by pyserial
+    ],
+)
+async def test_config_flow_port_yellow_port_name(
+    hass: HomeAssistant, device: str
+) -> None:
     """Test config flow serial port name for Yellow Zigbee radio."""
-    port = com_port(device="/dev/ttyAMA1")
+    port = com_port(device=device)
     port.serial_number = None
     port.manufacturer = None
     port.description = None
diff --git a/tests/components/zha/test_cover.py b/tests/components/zha/test_cover.py
index e5d588aa1bf..4bc4d6c97cf 100644
--- a/tests/components/zha/test_cover.py
+++ b/tests/components/zha/test_cover.py
@@ -81,7 +81,7 @@ async def test_cover(hass: HomeAssistant, setup_zha, zigpy_device_mock) -> None:
     cluster = zigpy_device.endpoints[1].window_covering
     cluster.PLUGGED_ATTR_READS = {
         WCAttrs.current_position_lift_percentage.name: 0,
-        WCAttrs.current_position_tilt_percentage.name: 42,
+        WCAttrs.current_position_tilt_percentage.name: 100,
         WCAttrs.window_covering_type.name: WCT.Tilt_blind_tilt_and_lift,
         WCAttrs.config_status.name: WCCS(~WCCS.Open_up_commands_reversed),
     }
@@ -115,33 +115,33 @@ async def test_cover(hass: HomeAssistant, setup_zha, zigpy_device_mock) -> None:
     assert state
     assert state.state == CoverState.OPEN
     assert state.attributes[ATTR_CURRENT_POSITION] == 100
-    assert state.attributes[ATTR_CURRENT_TILT_POSITION] == 58
+    assert state.attributes[ATTR_CURRENT_TILT_POSITION] == 0
 
-    # test that the state has changed from unavailable to off
+    # test that the state has changed from open to closed
     await send_attributes_report(
         hass, cluster, {WCAttrs.current_position_lift_percentage.id: 100}
     )
     assert hass.states.get(entity_id).state == CoverState.CLOSED
 
-    # test to see if it opens
+    # test that it opens
     await send_attributes_report(
         hass, cluster, {WCAttrs.current_position_lift_percentage.id: 0}
     )
     assert hass.states.get(entity_id).state == CoverState.OPEN
 
-    # test that the state remains after tilting to 100%
-    await send_attributes_report(
-        hass, cluster, {WCAttrs.current_position_tilt_percentage.id: 100}
-    )
-    assert hass.states.get(entity_id).state == CoverState.OPEN
-
-    # test to see the state remains after tilting to 0%
+    # test that the state remains after tilting to 0% (open)
     await send_attributes_report(
         hass, cluster, {WCAttrs.current_position_tilt_percentage.id: 0}
     )
     assert hass.states.get(entity_id).state == CoverState.OPEN
 
-    # close from UI
+    # test that the state remains after tilting to 100% (closed)
+    await send_attributes_report(
+        hass, cluster, {WCAttrs.current_position_tilt_percentage.id: 100}
+    )
+    assert hass.states.get(entity_id).state == CoverState.OPEN
+
+    # close lift from UI
     with patch("zigpy.zcl.Cluster.request", return_value=[0x1, zcl_f.Status.SUCCESS]):
         await hass.services.async_call(
             COVER_DOMAIN, SERVICE_CLOSE_COVER, {"entity_id": entity_id}, blocking=True
@@ -160,6 +160,11 @@ async def test_cover(hass: HomeAssistant, setup_zha, zigpy_device_mock) -> None:
 
         assert hass.states.get(entity_id).state == CoverState.CLOSED
 
+    # close tilt from UI, needs re-opening first
+    await send_attributes_report(
+        hass, cluster, {WCAttrs.current_position_tilt_percentage.id: 0}
+    )
+    assert hass.states.get(entity_id).state == CoverState.OPEN
     with patch("zigpy.zcl.Cluster.request", return_value=[0x1, zcl_f.Status.SUCCESS]):
         await hass.services.async_call(
             COVER_DOMAIN,
@@ -185,7 +190,7 @@ async def test_cover(hass: HomeAssistant, setup_zha, zigpy_device_mock) -> None:
 
         assert hass.states.get(entity_id).state == CoverState.CLOSED
 
-    # open from UI
+    # open lift from UI
     with patch("zigpy.zcl.Cluster.request", return_value=[0x0, zcl_f.Status.SUCCESS]):
         await hass.services.async_call(
             COVER_DOMAIN, SERVICE_OPEN_COVER, {"entity_id": entity_id}, blocking=True
@@ -204,6 +209,7 @@ async def test_cover(hass: HomeAssistant, setup_zha, zigpy_device_mock) -> None:
 
         assert hass.states.get(entity_id).state == CoverState.OPEN
 
+    # open tilt from UI
     with patch("zigpy.zcl.Cluster.request", return_value=[0x0, zcl_f.Status.SUCCESS]):
         await hass.services.async_call(
             COVER_DOMAIN,
@@ -229,7 +235,7 @@ async def test_cover(hass: HomeAssistant, setup_zha, zigpy_device_mock) -> None:
 
         assert hass.states.get(entity_id).state == CoverState.OPEN
 
-    # set position UI
+    # set lift position from UI
     with patch("zigpy.zcl.Cluster.request", return_value=[0x5, zcl_f.Status.SUCCESS]):
         await hass.services.async_call(
             COVER_DOMAIN,
@@ -261,6 +267,7 @@ async def test_cover(hass: HomeAssistant, setup_zha, zigpy_device_mock) -> None:
 
         assert hass.states.get(entity_id).state == CoverState.OPEN
 
+    # set tilt position from UI
     with patch("zigpy.zcl.Cluster.request", return_value=[0x5, zcl_f.Status.SUCCESS]):
         await hass.services.async_call(
             COVER_DOMAIN,
@@ -281,13 +288,13 @@ async def test_cover(hass: HomeAssistant, setup_zha, zigpy_device_mock) -> None:
         assert hass.states.get(entity_id).state == CoverState.CLOSING
 
         await send_attributes_report(
-            hass, cluster, {WCAttrs.current_position_lift_percentage.id: 35}
+            hass, cluster, {WCAttrs.current_position_tilt_percentage.id: 35}
         )
 
         assert hass.states.get(entity_id).state == CoverState.CLOSING
 
         await send_attributes_report(
-            hass, cluster, {WCAttrs.current_position_lift_percentage.id: 53}
+            hass, cluster, {WCAttrs.current_position_tilt_percentage.id: 53}
         )
 
         assert hass.states.get(entity_id).state == CoverState.OPEN
@@ -338,7 +345,7 @@ async def test_cover_failures(
     # load up cover domain
     cluster = zigpy_device.endpoints[1].window_covering
     cluster.PLUGGED_ATTR_READS = {
-        WCAttrs.current_position_tilt_percentage.name: 42,
+        WCAttrs.current_position_tilt_percentage.name: 100,
         WCAttrs.window_covering_type.name: WCT.Tilt_blind_tilt_and_lift,
     }
     update_attribute_cache(cluster)
@@ -355,7 +362,7 @@ async def test_cover_failures(
     await send_attributes_report(hass, cluster, {0: 0, 8: 100, 1: 1})
     assert hass.states.get(entity_id).state == CoverState.CLOSED
 
-    # test to see if it opens
+    # test that it opens
     await send_attributes_report(hass, cluster, {0: 1, 8: 0, 1: 100})
     assert hass.states.get(entity_id).state == CoverState.OPEN
 
diff --git a/tests/components/zha/test_device_tracker.py b/tests/components/zha/test_device_tracker.py
index ae96de44f17..8a587966f81 100644
--- a/tests/components/zha/test_device_tracker.py
+++ b/tests/components/zha/test_device_tracker.py
@@ -18,7 +18,7 @@ from homeassistant.components.zha.helpers import (
 )
 from homeassistant.const import STATE_HOME, STATE_NOT_HOME, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import find_entity_id, send_attributes_report
 from .conftest import SIG_EP_INPUT, SIG_EP_OUTPUT, SIG_EP_PROFILE, SIG_EP_TYPE
diff --git a/tests/components/zha/test_helpers.py b/tests/components/zha/test_helpers.py
index f8a809df51e..f52b403869e 100644
--- a/tests/components/zha/test_helpers.py
+++ b/tests/components/zha/test_helpers.py
@@ -9,7 +9,7 @@ from zigpy.application import ControllerApplication
 from zigpy.types.basic import uint16_t
 from zigpy.zcl.clusters import lighting
 
-import homeassistant.components.zha.const as zha_const
+from homeassistant.components.zha import const as zha_const
 from homeassistant.components.zha.helpers import (
     cluster_command_schema_to_vol_schema,
     convert_to_zcl_values,
@@ -18,7 +18,7 @@ from homeassistant.components.zha.helpers import (
     get_zha_data,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry
diff --git a/tests/components/zha/test_homeassistant_hardware.py b/tests/components/zha/test_homeassistant_hardware.py
new file mode 100644
index 00000000000..72285521182
--- /dev/null
+++ b/tests/components/zha/test_homeassistant_hardware.py
@@ -0,0 +1,120 @@
+"""Test Home Assistant Hardware platform for ZHA."""
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+from zigpy.application import ControllerApplication
+
+from homeassistant.components.homeassistant_hardware.helpers import (
+    async_register_firmware_info_callback,
+)
+from homeassistant.components.homeassistant_hardware.util import (
+    ApplicationType,
+    FirmwareInfo,
+    OwningIntegration,
+)
+from homeassistant.components.zha.homeassistant_hardware import get_firmware_info
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.common import MockConfigEntry
+
+
+async def test_get_firmware_info_normal(hass: HomeAssistant) -> None:
+    """Test `get_firmware_info`."""
+
+    zha = MockConfigEntry(
+        domain="zha",
+        unique_id="some_unique_id",
+        data={
+            "device": {
+                "path": "/dev/ttyUSB1",
+                "baudrate": 115200,
+                "flow_control": None,
+            },
+            "radio_type": "ezsp",
+        },
+        version=4,
+    )
+    zha.add_to_hass(hass)
+    zha.mock_state(hass, ConfigEntryState.LOADED)
+
+    # With ZHA running
+    with patch(
+        "homeassistant.components.zha.homeassistant_hardware.get_zha_gateway"
+    ) as mock_get_zha_gateway:
+        mock_get_zha_gateway.return_value.state.node_info.version = "1.2.3.4"
+        fw_info_running = get_firmware_info(hass, zha)
+
+    assert fw_info_running == FirmwareInfo(
+        device="/dev/ttyUSB1",
+        firmware_type=ApplicationType.EZSP,
+        firmware_version="1.2.3.4",
+        source="zha",
+        owners=[OwningIntegration(config_entry_id=zha.entry_id)],
+    )
+    assert await fw_info_running.is_running(hass) is True
+
+    # With ZHA not running
+    zha.mock_state(hass, ConfigEntryState.NOT_LOADED)
+    fw_info_not_running = get_firmware_info(hass, zha)
+
+    assert fw_info_not_running == FirmwareInfo(
+        device="/dev/ttyUSB1",
+        firmware_type=ApplicationType.EZSP,
+        firmware_version=None,
+        source="zha",
+        owners=[OwningIntegration(config_entry_id=zha.entry_id)],
+    )
+    assert await fw_info_not_running.is_running(hass) is False
+
+
+@pytest.mark.parametrize(
+    "data",
+    [
+        # Missing data
+        {},
+        # Bad radio type
+        {"device": {"path": "/dev/ttyUSB1"}, "radio_type": "znp"},
+    ],
+)
+async def test_get_firmware_info_errors(
+    hass: HomeAssistant, data: dict[str, str | int | None]
+) -> None:
+    """Test `get_firmware_info` with config entry data format errors."""
+    zha = MockConfigEntry(
+        domain="zha",
+        unique_id="some_unique_id",
+        data=data,
+        version=4,
+    )
+    zha.add_to_hass(hass)
+
+    assert (get_firmware_info(hass, zha)) is None
+
+
+async def test_hardware_firmware_info_provider_notification(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    mock_zigpy_connect: ControllerApplication,
+) -> None:
+    """Test that the ZHA gateway provides hardware and firmware information."""
+    config_entry.add_to_hass(hass)
+
+    await async_setup_component(hass, "homeassistant_hardware", {})
+
+    callback = MagicMock()
+    async_register_firmware_info_callback(hass, "/dev/ttyUSB0", callback)
+
+    await hass.config_entries.async_setup(config_entry.entry_id)
+
+    callback.assert_called_once_with(
+        FirmwareInfo(
+            device="/dev/ttyUSB0",
+            firmware_type=ApplicationType.EZSP,
+            firmware_version="7.1.4.0 build 389",
+            source="zha",
+            owners=[OwningIntegration(config_entry_id=config_entry.entry_id)],
+        )
+    )
diff --git a/tests/components/zha/test_sensor.py b/tests/components/zha/test_sensor.py
index 2d69cf1ff36..88fb9974c1b 100644
--- a/tests/components/zha/test_sensor.py
+++ b/tests/components/zha/test_sensor.py
@@ -30,6 +30,7 @@ from homeassistant.core import HomeAssistant
 from .common import send_attributes_report
 from .conftest import SIG_EP_INPUT, SIG_EP_OUTPUT, SIG_EP_PROFILE, SIG_EP_TYPE
 
+ENTITY_ID_NO_PREFIX = "sensor.fakemanufacturer_fakemodel"
 ENTITY_ID_PREFIX = "sensor.fakemanufacturer_fakemodel_{}"
 
 
@@ -335,7 +336,7 @@ async def async_test_pi_heating_demand(
             "humidity",
             async_test_humidity,
             1,
-            None,
+            {},
             None,
             STATE_UNKNOWN,
         ),
@@ -344,7 +345,7 @@ async def async_test_pi_heating_demand(
             "temperature",
             async_test_temperature,
             1,
-            None,
+            {},
             None,
             STATE_UNKNOWN,
         ),
@@ -353,7 +354,7 @@ async def async_test_pi_heating_demand(
             "pressure",
             async_test_pressure,
             1,
-            None,
+            {},
             None,
             STATE_UNKNOWN,
         ),
@@ -362,7 +363,7 @@ async def async_test_pi_heating_demand(
             "illuminance",
             async_test_illuminance,
             1,
-            None,
+            {},
             None,
             STATE_UNKNOWN,
         ),
@@ -492,7 +493,7 @@ async def async_test_pi_heating_demand(
             "device_temperature",
             async_test_device_temperature,
             1,
-            None,
+            {},
             None,
             STATE_UNKNOWN,
         ),
@@ -501,7 +502,7 @@ async def async_test_pi_heating_demand(
             "setpoint_change_source",
             async_test_setpoint_change_source,
             10,
-            None,
+            {},
             None,
             STATE_UNKNOWN,
         ),
@@ -510,7 +511,7 @@ async def async_test_pi_heating_demand(
             "pi_heating_demand",
             async_test_pi_heating_demand,
             10,
-            None,
+            {},
             None,
             STATE_UNKNOWN,
         ),
@@ -558,7 +559,6 @@ async def test_sensor(
     gateway.get_or_create_device(zigpy_device)
     await gateway.async_device_initialized(zigpy_device)
     await hass.async_block_till_done(wait_background_tasks=True)
-    entity_id = ENTITY_ID_PREFIX.format(entity_suffix)
 
     zigpy_device = zigpy_device_mock(
         {
@@ -570,6 +570,11 @@ async def test_sensor(
         }
     )
 
+    if hass.states.get(ENTITY_ID_NO_PREFIX):
+        entity_id = ENTITY_ID_NO_PREFIX
+    else:
+        entity_id = ENTITY_ID_PREFIX.format(entity_suffix)
+
     assert hass.states.get(entity_id).state == initial_sensor_state
 
     # test sensor associated logic
diff --git a/tests/components/zha/test_siren.py b/tests/components/zha/test_siren.py
index f9837a7d016..5849cc6f233 100644
--- a/tests/components/zha/test_siren.py
+++ b/tests/components/zha/test_siren.py
@@ -28,7 +28,7 @@ from homeassistant.components.zha.helpers import (
 )
 from homeassistant.const import STATE_OFF, STATE_ON, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import find_entity_id
 
diff --git a/tests/components/zha/test_websocket_api.py b/tests/components/zha/test_websocket_api.py
index f6afee9eb83..ae1ea90d1f9 100644
--- a/tests/components/zha/test_websocket_api.py
+++ b/tests/components/zha/test_websocket_api.py
@@ -420,8 +420,11 @@ async def test_list_groupable_devices(
             assert entity_reference[ATTR_NAME] is not None
             assert entity_reference["entity_id"] is not None
 
-        for entity_reference in endpoint["entities"]:
-            assert entity_reference["original_name"] is not None
+        if len(endpoint["entities"]) == 1:
+            assert endpoint["entities"][0]["original_name"] is None
+        else:
+            for entity_reference in endpoint["entities"]:
+                assert entity_reference["original_name"] is not None
 
     # Make sure there are no groupable devices when the device is unavailable
     # Make device unavailable
diff --git a/tests/components/zodiac/test_sensor.py b/tests/components/zodiac/test_sensor.py
index 19b9733e4f5..880e5c889ec 100644
--- a/tests/components/zodiac/test_sensor.py
+++ b/tests/components/zodiac/test_sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import ATTR_DEVICE_CLASS
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry
 
diff --git a/tests/components/zwave_js/conftest.py b/tests/components/zwave_js/conftest.py
index bcdc0c3ce16..ce7b0e0109e 100644
--- a/tests/components/zwave_js/conftest.py
+++ b/tests/components/zwave_js/conftest.py
@@ -13,7 +13,9 @@ from zwave_js_server.model.node import Node
 from zwave_js_server.model.node.data_model import NodeDataType
 from zwave_js_server.version import VersionInfo
 
+from homeassistant.components.zwave_js import PLATFORMS
 from homeassistant.components.zwave_js.const import DOMAIN
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.util.json import JsonArrayType
 
@@ -511,18 +513,25 @@ def aeotec_smart_switch_7_state_fixture() -> NodeDataType:
 
 
 @pytest.fixture(name="listen_block")
-def mock_listen_block_fixture():
+def mock_listen_block_fixture() -> asyncio.Event:
     """Mock a listen block."""
     return asyncio.Event()
 
 
+@pytest.fixture(name="listen_result")
+def listen_result_fixture() -> asyncio.Future[None]:
+    """Mock a listen result."""
+    return asyncio.Future()
+
+
 @pytest.fixture(name="client")
 def mock_client_fixture(
-    controller_state,
-    controller_node_state,
-    version_state,
-    log_config_state,
-    listen_block,
+    controller_state: dict[str, Any],
+    controller_node_state: dict[str, Any],
+    version_state: dict[str, Any],
+    log_config_state: dict[str, Any],
+    listen_block: asyncio.Event,
+    listen_result: asyncio.Future[None],
 ):
     """Mock a client."""
     with patch(
@@ -537,6 +546,7 @@ def mock_client_fixture(
         async def listen(driver_ready: asyncio.Event) -> None:
             driver_ready.set()
             await listen_block.wait()
+            await listen_result
 
         async def disconnect():
             client.connected = False
@@ -817,18 +827,29 @@ def nortek_thermostat_removed_event_fixture(client) -> Node:
 
 
 @pytest.fixture(name="integration")
-async def integration_fixture(hass: HomeAssistant, client) -> MockConfigEntry:
+async def integration_fixture(
+    hass: HomeAssistant,
+    client: MagicMock,
+    platforms: list[Platform],
+) -> MockConfigEntry:
     """Set up the zwave_js integration."""
     entry = MockConfigEntry(domain="zwave_js", data={"url": "ws://test.org"})
     entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(entry.entry_id)
-    await hass.async_block_till_done()
+    with patch("homeassistant.components.zwave_js.PLATFORMS", platforms):
+        await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
 
     client.async_send_command.reset_mock()
 
     return entry
 
 
+@pytest.fixture
+def platforms() -> list[Platform]:
+    """Fixture to specify platforms to test."""
+    return PLATFORMS
+
+
 @pytest.fixture(name="chain_actuator_zws12")
 def window_cover_fixture(client, chain_actuator_zws12_state) -> Node:
     """Mock a window cover node."""
diff --git a/tests/components/zwave_js/fixtures/controller_state.json b/tests/components/zwave_js/fixtures/controller_state.json
index d6d9dcacd9e..c3b9de4bdec 100644
--- a/tests/components/zwave_js/fixtures/controller_state.json
+++ b/tests/components/zwave_js/fixtures/controller_state.json
@@ -23,6 +23,7 @@
     ],
     "sucNodeId": 1,
     "supportsTimers": false,
+    "supportsLongRange": true,
     "isHealNetworkActive": false,
     "inclusionState": 0,
     "status": 0
diff --git a/tests/components/zwave_js/test_api.py b/tests/components/zwave_js/test_api.py
index a3f70e92dcf..f0134c7c43c 100644
--- a/tests/components/zwave_js/test_api.py
+++ b/tests/components/zwave_js/test_api.py
@@ -5,7 +5,7 @@ from http import HTTPStatus
 from io import BytesIO
 import json
 from typing import Any
-from unittest.mock import MagicMock, PropertyMock, patch
+from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch
 
 import pytest
 from zwave_js_server.const import (
@@ -103,6 +103,12 @@ from tests.typing import ClientSessionGenerator, WebSocketGenerator
 CONTROLLER_PATCH_PREFIX = "zwave_js_server.model.controller.Controller"
 
 
+@pytest.fixture
+def platforms() -> list[str]:
+    """Fixture to specify platforms to test."""
+    return []
+
+
 def get_device(hass: HomeAssistant, node):
     """Get device ID for a node."""
     dev_reg = dr.async_get(hass)
@@ -168,6 +174,7 @@ async def test_network_status(
     assert result["client"]["server_version"] == "1.0.0"
     assert not result["client"]["server_logging_enabled"]
     assert result["controller"]["inclusion_state"] == InclusionState.IDLE
+    assert result["controller"]["supports_long_range"]
 
     # Try API call with device ID
     device = device_registry.async_get_device(
@@ -1094,52 +1101,27 @@ async def test_provision_smart_start_node(
 
     client.async_send_command.return_value = {"success": True}
 
-    # Test provisioning entry
-    await ws_client.send_json(
-        {
-            ID: 2,
-            TYPE: "zwave_js/provision_smart_start_node",
-            ENTRY_ID: entry.entry_id,
-            PLANNED_PROVISIONING_ENTRY: {
-                DSK: "test",
-                SECURITY_CLASSES: [0],
-            },
-        }
-    )
-
-    msg = await ws_client.receive_json()
-    assert msg["success"]
-
-    assert len(client.async_send_command.call_args_list) == 1
-    assert client.async_send_command.call_args[0][0] == {
-        "command": "controller.provision_smart_start_node",
-        "entry": ProvisioningEntry(
-            "test", [SecurityClass.S2_UNAUTHENTICATED]
-        ).to_dict(),
+    valid_qr_info = {
+        VERSION: 1,
+        SECURITY_CLASSES: [0],
+        DSK: "test",
+        GENERIC_DEVICE_CLASS: 1,
+        SPECIFIC_DEVICE_CLASS: 1,
+        INSTALLER_ICON_TYPE: 1,
+        MANUFACTURER_ID: 1,
+        PRODUCT_TYPE: 1,
+        PRODUCT_ID: 1,
+        APPLICATION_VERSION: "test",
+        "name": "test",
     }
 
-    client.async_send_command.reset_mock()
-    client.async_send_command.return_value = {"success": True}
-
     # Test QR provisioning information
     await ws_client.send_json(
         {
             ID: 3,
             TYPE: "zwave_js/provision_smart_start_node",
             ENTRY_ID: entry.entry_id,
-            QR_PROVISIONING_INFORMATION: {
-                VERSION: 1,
-                SECURITY_CLASSES: [0],
-                DSK: "test",
-                GENERIC_DEVICE_CLASS: 1,
-                SPECIFIC_DEVICE_CLASS: 1,
-                INSTALLER_ICON_TYPE: 1,
-                MANUFACTURER_ID: 1,
-                PRODUCT_TYPE: 1,
-                PRODUCT_ID: 1,
-                APPLICATION_VERSION: "test",
-                "name": "test",
-            },
+            QR_PROVISIONING_INFORMATION: valid_qr_info,
         }
     )
 
@@ -1170,28 +1152,6 @@ async def test_provision_smart_start_node(
     client.async_send_command.reset_mock()
     client.async_send_command.return_value = {"success": True}
 
-    # Test QR code string
-    await ws_client.send_json(
-        {
-            ID: 4,
-            TYPE: "zwave_js/provision_smart_start_node",
-            ENTRY_ID: entry.entry_id,
-            QR_CODE_STRING: "90testtesttesttesttesttesttesttesttesttesttesttesttest",
-        }
-    )
-
-    msg = await ws_client.receive_json()
-    assert msg["success"]
-
-    assert len(client.async_send_command.call_args_list) == 1
-    assert client.async_send_command.call_args[0][0] == {
-        "command": "controller.provision_smart_start_node",
-        "entry": "90testtesttesttesttesttesttesttesttesttesttesttesttest",
-    }
-
-    client.async_send_command.reset_mock()
-    client.async_send_command.return_value = {"success": True}
-
     # Test QR provisioning information with S2 version throws error
     await ws_client.send_json(
         {
@@ -1242,9 +1202,7 @@ async def test_provision_smart_start_node(
                 ID: 7,
                 TYPE: "zwave_js/provision_smart_start_node",
                 ENTRY_ID: entry.entry_id,
-                QR_CODE_STRING: (
-                    "90testtesttesttesttesttesttesttesttesttesttesttesttest"
-                ),
+                QR_PROVISIONING_INFORMATION: valid_qr_info,
             }
         )
         msg = await ws_client.receive_json()
@@ -1262,7 +1220,7 @@ async def test_provision_smart_start_node(
             ID: 8,
             TYPE: "zwave_js/provision_smart_start_node",
             ENTRY_ID: entry.entry_id,
-            QR_CODE_STRING: "90testtesttesttesttesttesttesttesttesttesttesttesttest",
+            QR_PROVISIONING_INFORMATION: valid_qr_info,
         }
     )
     msg = await ws_client.receive_json()
@@ -4930,6 +4888,9 @@ async def test_subscribe_node_statistics(
     assert msg["error"]["code"] == ERR_NOT_LOADED
 
 
+@pytest.mark.skip(
+    reason="The test needs to be updated to reflect what happens when resetting the controller"
+)
 async def test_hard_reset_controller(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
@@ -5197,6 +5158,242 @@ async def test_get_integration_settings(
     }
 
 
+async def test_backup_nvm(
+    hass: HomeAssistant,
+    integration,
+    client,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test the backup NVM websocket command."""
+    ws_client = await hass_ws_client(hass)
+
+    # Set up mocks for the controller events
+    controller = client.driver.controller
+
+    # Test subscription and events
+    with patch.object(
+        controller, "async_backup_nvm_raw_base64", return_value="test"
+    ) as mock_backup:
+        # Send the subscription request
+        await ws_client.send_json_auto_id(
+            {
+                "type": "zwave_js/backup_nvm",
+                "entry_id": integration.entry_id,
+            }
+        )
+
+        # Verify the finished event with data first
+        msg = await ws_client.receive_json()
+        assert msg["type"] == "event"
+        assert msg["event"]["event"] == "finished"
+        assert msg["event"]["data"] == "test"
+
+        # Verify subscription success
+        msg = await ws_client.receive_json()
+        assert msg["type"] == "result"
+        assert msg["success"] is True
+
+        # Simulate progress events
+        event = Event(
+            "nvm backup progress",
+            {
+                "source": "controller",
+                "event": "nvm backup progress",
+                "bytesRead": 25,
+                "total": 100,
+            },
+        )
+        controller.receive_event(event)
+        msg = await ws_client.receive_json()
+        assert msg["event"]["event"] == "nvm backup progress"
+        assert msg["event"]["bytesRead"] == 25
+        assert msg["event"]["total"] == 100
+
+        event = Event(
+            "nvm backup progress",
+            {
+                "source": "controller",
+                "event": "nvm backup progress",
+                "bytesRead": 50,
+                "total": 100,
+            },
+        )
+        controller.receive_event(event)
+        msg = await ws_client.receive_json()
+        assert msg["event"]["event"] == "nvm backup progress"
+        assert msg["event"]["bytesRead"] == 50
+        assert msg["event"]["total"] == 100
+
+        # Wait for the backup to complete
+        await hass.async_block_till_done()
+
+        # Verify the backup was called
+        assert mock_backup.called
+
+    # Test backup failure
+    with patch.object(
+        controller,
+        "async_backup_nvm_raw_base64",
+        side_effect=FailedCommand("failed_command", "Backup failed"),
+    ):
+        # Send the subscription request
+        await ws_client.send_json_auto_id(
+            {
+                "type": "zwave_js/backup_nvm",
+                "entry_id": integration.entry_id,
+            }
+        )
+
+        # Verify error response
+        msg = await ws_client.receive_json()
+        assert not msg["success"]
+        assert msg["error"]["code"] == "Backup failed"
+
+    # Test config entry not found
+    await ws_client.send_json_auto_id(
+        {
+            "type": "zwave_js/backup_nvm",
+            "entry_id": "invalid_entry_id",
+        }
+    )
+    msg = await ws_client.receive_json()
+    assert not msg["success"]
+    assert msg["error"]["code"] == "not_found"
+
+    # Test config entry not loaded
+    await hass.config_entries.async_unload(integration.entry_id)
+    await hass.async_block_till_done()
+
+    await ws_client.send_json_auto_id(
+        {
+            "type": "zwave_js/backup_nvm",
+            "entry_id": integration.entry_id,
+        }
+    )
+    msg = await ws_client.receive_json()
+    assert msg["error"]["code"] == "not_loaded"
+
+
+async def test_restore_nvm(
+    hass: HomeAssistant,
+    integration,
+    client,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test the restore NVM websocket command."""
+    ws_client = await hass_ws_client(hass)
+
+    # Set up mocks for the controller events
+    controller = client.driver.controller
+
+    # Test restore success
+    with patch.object(
+        controller, "async_restore_nvm_base64", return_value=None
+    ) as mock_restore:
+        # Send the subscription request
+        await ws_client.send_json_auto_id(
+            {
+                "type": "zwave_js/restore_nvm",
+                "entry_id": integration.entry_id,
+                "data": "dGVzdA==",  # base64 encoded "test"
+            }
+        )
+
+        # Verify the finished event first
+        msg = await ws_client.receive_json()
+        assert msg["type"] == "event"
+        assert msg["event"]["event"] == "finished"
+
+        # Verify subscription success
+        msg = await ws_client.receive_json()
+        assert msg["type"] == "result"
+        assert msg["success"] is True
+
+        # Simulate progress events
+        event = Event(
+            "nvm restore progress",
+            {
+                "source": "controller",
+                "event": "nvm restore progress",
+                "bytesWritten": 25,
+                "total": 100,
+            },
+        )
+        controller.receive_event(event)
+        msg = await ws_client.receive_json()
+        assert msg["event"]["event"] == "nvm restore progress"
+        assert msg["event"]["bytesWritten"] == 25
+        assert msg["event"]["total"] == 100
+
+        event = Event(
+            "nvm restore progress",
+            {
+                "source": "controller",
+                "event": "nvm restore progress",
+                "bytesWritten": 50,
+                "total": 100,
+            },
+        )
+        controller.receive_event(event)
+        msg = await ws_client.receive_json()
+        assert msg["event"]["event"] == "nvm restore progress"
+        assert msg["event"]["bytesWritten"] == 50
+        assert msg["event"]["total"] == 100
+
+        # Wait for the restore to complete
+        await hass.async_block_till_done()
+
+        # Verify the restore was called
+        assert mock_restore.called
+
+    # Test restore failure
+    with patch.object(
+        controller,
+        "async_restore_nvm_base64",
+        side_effect=FailedCommand("failed_command", "Restore failed"),
+    ):
+        # Send the subscription request
+        await ws_client.send_json_auto_id(
+            {
+                "type": "zwave_js/restore_nvm",
+                "entry_id": integration.entry_id,
+                "data": "dGVzdA==",  # base64 encoded "test"
+            }
+        )
+
+        # Verify error response
+        msg = await ws_client.receive_json()
+        assert not msg["success"]
+        assert msg["error"]["code"] == "Restore failed"
+
+    # Test entry_id not found
+    await ws_client.send_json_auto_id(
+        {
+            "type": "zwave_js/restore_nvm",
+            "entry_id": "invalid_entry_id",
+            "data": "dGVzdA==",  # base64 encoded "test"
+        }
+    )
+    msg = await ws_client.receive_json()
+    assert not msg["success"]
+    assert msg["error"]["code"] == "not_found"
+
+    # Test config entry not loaded
+    await hass.config_entries.async_unload(integration.entry_id)
+    await hass.async_block_till_done()
+
+    await ws_client.send_json_auto_id(
+        {
+            "type": "zwave_js/restore_nvm",
+            "entry_id": integration.entry_id,
+            "data": "dGVzdA==",  # base64 encoded "test"
+        }
+    )
+    msg = await ws_client.receive_json()
+    assert not msg["success"]
+    assert msg["error"]["code"] == "not_loaded"
+
+
 async def test_cancel_secure_bootstrap_s2(
     hass: HomeAssistant, client, integration, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -5281,6 +5478,20 @@ async def test_subscribe_s2_inclusion(
     assert msg["success"]
     assert msg["result"] is None
 
+    # Test receiving requested grant event
+    event = Event(
+        type="grant security classes",
+        data={
+            "source": "controller",
+            "event": "grant security classes",
+            "requested": {
+                "securityClasses": [SecurityClass.S2_UNAUTHENTICATED],
+                "clientSideAuth": False,
+            },
+        },
+    )
+    client.driver.receive_event(event)
+
     # Test receiving DSK request event
     event = Event(
         type="validate dsk and enter pin",
@@ -5323,3 +5534,127 @@ async def test_subscribe_s2_inclusion(
     msg = await ws_client.receive_json()
     assert not msg["success"]
     assert msg["error"]["code"] == ERR_NOT_FOUND
+
+
+async def test_lookup_device(
+    hass: HomeAssistant,
+    integration: MockConfigEntry,
+    client: MagicMock,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test lookup_device websocket command."""
+    entry = integration
+    ws_client = await hass_ws_client(hass)
+
+    # Create mock device response
+    mock_device = MagicMock()
+    mock_device.to_dict.return_value = {
+        "manufacturer": "Test Manufacturer",
+        "label": "Test Device",
+        "description": "Test Device Description",
+        "devices": [{"productType": 1, "productId": 2}],
+        "firmwareVersion": {"min": "1.0", "max": "2.0"},
+    }
+
+    # Test successful lookup
+    client.driver.config_manager.lookup_device = AsyncMock(return_value=mock_device)
+
+    await ws_client.send_json_auto_id(
+        {
+            TYPE: "zwave_js/lookup_device",
+            ENTRY_ID: entry.entry_id,
+            MANUFACTURER_ID: 1,
+            PRODUCT_TYPE: 2,
+            PRODUCT_ID: 3,
+            APPLICATION_VERSION: "1.5",
+        }
+    )
+    msg = await ws_client.receive_json()
+
+    assert msg["success"]
+    assert msg["result"] == mock_device.to_dict.return_value
+
+    client.driver.config_manager.lookup_device.assert_called_once_with(1, 2, 3, "1.5")
+
+    # Reset mock
+    client.driver.config_manager.lookup_device.reset_mock()
+
+    # Test lookup without optional application_version
+    await ws_client.send_json_auto_id(
+        {
+            TYPE: "zwave_js/lookup_device",
+            ENTRY_ID: entry.entry_id,
+            MANUFACTURER_ID: 4,
+            PRODUCT_TYPE: 5,
+            PRODUCT_ID: 6,
+        }
+    )
+    msg = await ws_client.receive_json()
+
+    assert msg["success"]
+    assert msg["result"] == mock_device.to_dict.return_value
+
+    client.driver.config_manager.lookup_device.assert_called_once_with(4, 5, 6, None)
+
+    # Test device not found
+    with patch.object(
+        client.driver.config_manager,
+        "lookup_device",
+        return_value=None,
+    ):
+        await ws_client.send_json_auto_id(
+            {
+                TYPE: "zwave_js/lookup_device",
+                ENTRY_ID: entry.entry_id,
+                MANUFACTURER_ID: 99,
+                PRODUCT_TYPE: 99,
+                PRODUCT_ID: 99,
+                APPLICATION_VERSION: "9.9",
+            }
+        )
+        msg = await ws_client.receive_json()
+
+        assert not msg["success"]
+        assert msg["error"]["code"] == ERR_NOT_FOUND
+        assert msg["error"]["message"] == "Device not found"
+
+    # Test sending command with improper entry ID fails
+    await ws_client.send_json_auto_id(
+        {
+            TYPE: "zwave_js/lookup_device",
+            ENTRY_ID: "invalid_entry_id",
+            MANUFACTURER_ID: 1,
+            PRODUCT_TYPE: 1,
+            PRODUCT_ID: 1,
+            APPLICATION_VERSION: "1.0",
+        }
+    )
+    msg = await ws_client.receive_json()
+    assert not msg["success"]
+    assert msg["error"]["code"] == ERR_NOT_FOUND
+    assert msg["error"]["message"] == "Config entry invalid_entry_id not found"
+
+    # Test FailedCommand exception
+    error_message = "Failed to execute lookup_device command"
+    with patch.object(
+        client.driver.config_manager,
+        "lookup_device",
+        side_effect=FailedCommand("lookup_device", error_message),
+    ):
+        # Send the subscription request
+        await ws_client.send_json_auto_id(
+            {
+                TYPE: "zwave_js/lookup_device",
+                ENTRY_ID: entry.entry_id,
+                MANUFACTURER_ID: 1,
+                PRODUCT_TYPE: 2,
+                PRODUCT_ID: 3,
+                APPLICATION_VERSION: "1.0",
+            }
+        )
+
+        # Verify error response
+        msg = await ws_client.receive_json()
+        assert not msg["success"]
+        assert msg["error"]["code"] == error_message
+        assert msg["error"]["message"] == f"Command failed: {error_message}"
diff --git a/tests/components/zwave_js/test_binary_sensor.py b/tests/components/zwave_js/test_binary_sensor.py
index 0054439ef1d..657dd337bf9 100644
--- a/tests/components/zwave_js/test_binary_sensor.py
+++ b/tests/components/zwave_js/test_binary_sensor.py
@@ -1,5 +1,6 @@
 """Test the Z-Wave JS binary sensor platform."""
 
+import pytest
 from zwave_js_server.event import Event
 from zwave_js_server.model.node import Node
 
@@ -10,6 +11,7 @@ from homeassistant.const import (
     STATE_ON,
     STATE_UNKNOWN,
     EntityCategory,
+    Platform,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
@@ -26,6 +28,12 @@ from .common import (
 from tests.common import MockConfigEntry
 
 
+@pytest.fixture
+def platforms() -> list[str]:
+    """Fixture to specify platforms to test."""
+    return [Platform.BINARY_SENSOR]
+
+
 async def test_low_battery_sensor(
     hass: HomeAssistant, entity_registry: er.EntityRegistry, multisensor_6, integration
 ) -> None:
diff --git a/tests/components/zwave_js/test_button.py b/tests/components/zwave_js/test_button.py
index b0c06668926..0282a268b54 100644
--- a/tests/components/zwave_js/test_button.py
+++ b/tests/components/zwave_js/test_button.py
@@ -5,11 +5,17 @@ import pytest
 from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
 from homeassistant.components.zwave_js.const import DOMAIN, SERVICE_REFRESH_VALUE
 from homeassistant.components.zwave_js.helpers import get_valueless_base_unique_id
-from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
 
+@pytest.fixture
+def platforms() -> list[str]:
+    """Fixture to specify platforms to test."""
+    return [Platform.BUTTON]
+
+
 async def test_ping_entity(
     hass: HomeAssistant,
     entity_registry: er.EntityRegistry,
diff --git a/tests/components/zwave_js/test_climate.py b/tests/components/zwave_js/test_climate.py
index 5d711528a28..f312284d897 100644
--- a/tests/components/zwave_js/test_climate.py
+++ b/tests/components/zwave_js/test_climate.py
@@ -42,6 +42,7 @@ from homeassistant.const import (
     ATTR_TEMPERATURE,
     SERVICE_TURN_OFF,
     SERVICE_TURN_ON,
+    Platform,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
@@ -56,6 +57,12 @@ from .common import (
 )
 
 
+@pytest.fixture
+def platforms() -> list[str]:
+    """Fixture to specify platforms to test."""
+    return [Platform.CLIMATE]
+
+
 async def test_thermostat_v2(
     hass: HomeAssistant,
     client,
diff --git a/tests/components/zwave_js/test_cover.py b/tests/components/zwave_js/test_cover.py
index b13d4f9787f..13f519725fd 100644
--- a/tests/components/zwave_js/test_cover.py
+++ b/tests/components/zwave_js/test_cover.py
@@ -2,6 +2,7 @@
 
 import logging
 
+import pytest
 from zwave_js_server.const import (
     CURRENT_STATE_PROPERTY,
     CURRENT_VALUE_PROPERTY,
@@ -35,6 +36,7 @@ from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_SUPPORTED_FEATURES,
     STATE_UNKNOWN,
+    Platform,
 )
 from homeassistant.core import HomeAssistant
 
@@ -50,6 +52,12 @@ FIBARO_FGR_223_SHUTTER_COVER_ENTITY = "cover.fgr_223_test_cover"
 LOGGER.setLevel(logging.DEBUG)
 
 
+@pytest.fixture
+def platforms() -> list[str]:
+    """Fixture to specify platforms to test."""
+    return [Platform.COVER]
+
+
 async def test_window_cover(
     hass: HomeAssistant, client, chain_actuator_zws12, integration
 ) -> None:
diff --git a/tests/components/zwave_js/test_event.py b/tests/components/zwave_js/test_event.py
index 1db02662f4e..84b1ade2632 100644
--- a/tests/components/zwave_js/test_event.py
+++ b/tests/components/zwave_js/test_event.py
@@ -3,11 +3,12 @@
 from datetime import timedelta
 
 from freezegun import freeze_time
+import pytest
 from zwave_js_server.event import Event
 
 from homeassistant.components.event import ATTR_EVENT_TYPE
 from homeassistant.components.zwave_js.const import ATTR_VALUE
-from homeassistant.const import STATE_UNKNOWN
+from homeassistant.const import STATE_UNKNOWN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.util import dt as dt_util
 
@@ -15,6 +16,12 @@ BASIC_EVENT_VALUE_ENTITY = "event.honeywell_in_wall_smart_fan_control_event_valu
 CENTRAL_SCENE_ENTITY = "event.node_51_scene_002"
 
 
+@pytest.fixture
+def platforms() -> list[str]:
+    """Fixture to specify platforms to test."""
+    return [Platform.EVENT]
+
+
 async def test_basic(
     hass: HomeAssistant, client, fan_honeywell_39358, integration
 ) -> None:
diff --git a/tests/components/zwave_js/test_events.py b/tests/components/zwave_js/test_events.py
index 0bb6376a02b..8cdaef3e63d 100644
--- a/tests/components/zwave_js/test_events.py
+++ b/tests/components/zwave_js/test_events.py
@@ -6,11 +6,18 @@ import pytest
 from zwave_js_server.const import CommandClass
 from zwave_js_server.event import Event
 
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
 from tests.common import async_capture_events
 
 
+@pytest.fixture
+def platforms() -> list[str]:
+    """Fixture to specify platforms to test."""
+    return []
+
+
 async def test_scenes(
     hass: HomeAssistant, hank_binary_switch, integration, client
 ) -> None:
@@ -244,6 +251,7 @@ async def test_notifications(
     assert events[2].data["command_class_name"] == "Multilevel Switch"
 
 
+@pytest.mark.parametrize("platforms", [[Platform.SWITCH]])
 async def test_value_updated(
     hass: HomeAssistant, vision_security_zl7432, integration, client
 ) -> None:
diff --git a/tests/components/zwave_js/test_fan.py b/tests/components/zwave_js/test_fan.py
index 2551fc7b34a..25ab6a87200 100644
--- a/tests/components/zwave_js/test_fan.py
+++ b/tests/components/zwave_js/test_fan.py
@@ -29,12 +29,19 @@ from homeassistant.const import (
     STATE_ON,
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
+    Platform,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
 
 
+@pytest.fixture
+def platforms() -> list[str]:
+    """Fixture to specify platforms to test."""
+    return [Platform.FAN]
+
+
 async def test_generic_fan(
     hass: HomeAssistant, client, fan_generic, integration
 ) -> None:
diff --git a/tests/components/zwave_js/test_init.py b/tests/components/zwave_js/test_init.py
index 4f858f3e545..91e333f7c7d 100644
--- a/tests/components/zwave_js/test_init.py
+++ b/tests/components/zwave_js/test_init.py
@@ -3,14 +3,19 @@
 import asyncio
 from copy import deepcopy
 import logging
-from unittest.mock import AsyncMock, call, patch
+from typing import Any
+from unittest.mock import AsyncMock, MagicMock, call, patch
 
 from aiohasupervisor import SupervisorError
 from aiohasupervisor.models import AddonsOptions
 import pytest
 from zwave_js_server.client import Client
 from zwave_js_server.event import Event
-from zwave_js_server.exceptions import BaseZwaveJSServerError, InvalidServerVersion
+from zwave_js_server.exceptions import (
+    BaseZwaveJSServerError,
+    InvalidServerVersion,
+    NotConnected,
+)
 from zwave_js_server.model.node import Node
 from zwave_js_server.model.version import VersionInfo
 
@@ -21,7 +26,7 @@ from homeassistant.components.zwave_js import DOMAIN
 from homeassistant.components.zwave_js.helpers import get_device_id
 from homeassistant.config_entries import ConfigEntryDisabler, ConfigEntryState
 from homeassistant.const import STATE_UNAVAILABLE
-from homeassistant.core import HomeAssistant
+from homeassistant.core import CoreState, HomeAssistant
 from homeassistant.helpers import (
     area_registry as ar,
     device_registry as dr,
@@ -32,7 +37,11 @@ from homeassistant.setup import async_setup_component
 
 from .common import AIR_TEMPERATURE_SENSOR, EATON_RF9640_ENTITY
 
-from tests.common import MockConfigEntry, async_get_persistent_notifications
+from tests.common import (
+    MockConfigEntry,
+    async_fire_time_changed,
+    async_get_persistent_notifications,
+)
 from tests.typing import WebSocketGenerator
 
 
@@ -127,24 +136,215 @@ async def test_noop_statistics(hass: HomeAssistant, client) -> None:
         assert not mock_cmd2.called
 
 
-@pytest.mark.parametrize("error", [BaseZwaveJSServerError("Boom"), Exception("Boom")])
-async def test_listen_failure(hass: HomeAssistant, client, error) -> None:
-    """Test we handle errors during client listen."""
+async def test_driver_ready_timeout_during_setup(
+    hass: HomeAssistant,
+    client: MagicMock,
+    listen_block: asyncio.Event,
+) -> None:
+    """Test we handle driver ready timeout during setup."""
 
-    async def listen(driver_ready):
-        """Mock the client listen method."""
-        # Set the connect side effect to stop an endless loop on reload.
-        client.connect.side_effect = BaseZwaveJSServerError("Boom")
-        raise error
+    async def listen(driver_ready: asyncio.Event) -> None:
+        """Mock listen."""
+        await listen_block.wait()
 
     client.listen.side_effect = listen
+
+    entry = MockConfigEntry(
+        domain="zwave_js",
+        data={"url": "ws://test.org", "data_collection_opted_in": True},
+    )
+    entry.add_to_hass(hass)
+    assert client.disconnect.call_count == 0
+
+    with patch("homeassistant.components.zwave_js.DRIVER_READY_TIMEOUT", new=0):
+        await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+    assert entry.state is ConfigEntryState.SETUP_RETRY
+    assert client.disconnect.call_count == 1
+
+
+@pytest.mark.parametrize("core_state", [CoreState.running, CoreState.stopping])
+@pytest.mark.parametrize(
+    ("listen_future_result_method", "listen_future_result"),
+    [
+        ("set_exception", BaseZwaveJSServerError("Boom")),
+        ("set_exception", Exception("Boom")),
+        ("set_result", None),
+    ],
+)
+async def test_listen_done_during_setup_before_forward_entry(
+    hass: HomeAssistant,
+    client: MagicMock,
+    listen_block: asyncio.Event,
+    listen_result: asyncio.Future[None],
+    core_state: CoreState,
+    listen_future_result_method: str,
+    listen_future_result: Exception | None,
+) -> None:
+    """Test listen task finishing during setup before forward entry."""
+    assert hass.state is CoreState.running
+
+    async def listen(driver_ready: asyncio.Event) -> None:
+        await listen_block.wait()
+        await listen_result
+        async_fire_time_changed(hass, fire_all=True)
+
+    client.listen.side_effect = listen
+    hass.set_state(core_state)
+    listen_block.set()
+    getattr(listen_result, listen_future_result_method)(listen_future_result)
+
     entry = MockConfigEntry(domain="zwave_js", data={"url": "ws://test.org"})
     entry.add_to_hass(hass)
+    assert client.disconnect.call_count == 0
 
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
     assert entry.state is ConfigEntryState.SETUP_RETRY
+    assert client.disconnect.call_count == 1
+
+
+async def test_not_connected_during_setup_after_forward_entry(
+    hass: HomeAssistant,
+    client: MagicMock,
+    listen_block: asyncio.Event,
+    listen_result: asyncio.Future[None],
+) -> None:
+    """Test we handle not connected client during setup after forward entry."""
+
+    async def send_command_side_effect(*args: Any, **kwargs: Any) -> None:
+        """Mock send command."""
+        listen_block.set()
+        listen_result.set_result(None)
+        # Yield to allow the listen task to run
+        await asyncio.sleep(0)
+        raise NotConnected("Boom")
+
+    async def listen(driver_ready: asyncio.Event) -> None:
+        """Mock listen."""
+        driver_ready.set()
+        client.async_send_command.side_effect = send_command_side_effect
+        await listen_block.wait()
+        await listen_result
+
+    client.listen.side_effect = listen
+
+    entry = MockConfigEntry(
+        domain="zwave_js",
+        data={"url": "ws://test.org", "data_collection_opted_in": True},
+    )
+    entry.add_to_hass(hass)
+    assert client.disconnect.call_count == 0
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert entry.state is ConfigEntryState.SETUP_RETRY
+    assert client.disconnect.call_count == 1
+
+
+@pytest.mark.parametrize("core_state", [CoreState.running, CoreState.stopping])
+@pytest.mark.parametrize(
+    ("listen_future_result_method", "listen_future_result"),
+    [
+        ("set_exception", BaseZwaveJSServerError("Boom")),
+        ("set_exception", Exception("Boom")),
+        ("set_result", None),
+    ],
+)
+async def test_listen_done_during_setup_after_forward_entry(
+    hass: HomeAssistant,
+    client: MagicMock,
+    listen_block: asyncio.Event,
+    listen_result: asyncio.Future[None],
+    core_state: CoreState,
+    listen_future_result_method: str,
+    listen_future_result: Exception | None,
+) -> None:
+    """Test listen task finishing during setup after forward entry."""
+    assert hass.state is CoreState.running
+
+    async def send_command_side_effect(*args: Any, **kwargs: Any) -> None:
+        """Mock send command."""
+        listen_block.set()
+        getattr(listen_result, listen_future_result_method)(listen_future_result)
+        # Yield to allow the listen task to run
+        await asyncio.sleep(0)
+
+    async def listen(driver_ready: asyncio.Event) -> None:
+        """Mock listen."""
+        driver_ready.set()
+        client.async_send_command.side_effect = send_command_side_effect
+        await listen_block.wait()
+        await listen_result
+
+    client.listen.side_effect = listen
+    hass.set_state(core_state)
+
+    entry = MockConfigEntry(
+        domain="zwave_js",
+        data={"url": "ws://test.org", "data_collection_opted_in": True},
+    )
+    entry.add_to_hass(hass)
+    assert client.disconnect.call_count == 0
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert entry.state is ConfigEntryState.SETUP_RETRY
+    assert client.disconnect.call_count == 1
+
+
+@pytest.mark.parametrize(
+    ("core_state", "final_config_entry_state", "disconnect_call_count"),
+    [
+        (
+            CoreState.running,
+            ConfigEntryState.SETUP_RETRY,
+            2,
+        ),  # the reload will cause a disconnect call too
+        (
+            CoreState.stopping,
+            ConfigEntryState.LOADED,
+            0,
+        ),  # the home assistant stop event will handle the disconnect
+    ],
+)
+@pytest.mark.parametrize(
+    ("listen_future_result_method", "listen_future_result"),
+    [
+        ("set_exception", BaseZwaveJSServerError("Boom")),
+        ("set_exception", Exception("Boom")),
+        ("set_result", None),
+    ],
+)
+async def test_listen_done_after_setup(
+    hass: HomeAssistant,
+    client: MagicMock,
+    integration: MockConfigEntry,
+    listen_block: asyncio.Event,
+    listen_result: asyncio.Future[None],
+    core_state: CoreState,
+    listen_future_result_method: str,
+    listen_future_result: Exception | None,
+    final_config_entry_state: ConfigEntryState,
+    disconnect_call_count: int,
+) -> None:
+    """Test listen task finishing after setup."""
+    config_entry = integration
+    assert config_entry.state is ConfigEntryState.LOADED
+    assert hass.state is CoreState.running
+    assert client.disconnect.call_count == 0
+
+    hass.set_state(core_state)
+    listen_block.set()
+    getattr(listen_result, listen_future_result_method)(listen_future_result)
+    await hass.async_block_till_done()
+
+    assert config_entry.state is final_config_entry_state
+    assert client.disconnect.call_count == disconnect_call_count
 
 
 async def test_new_entity_on_value_added(
@@ -847,7 +1047,7 @@ async def test_issue_registry(
     ("stop_addon_side_effect", "entry_state"),
     [
         (None, ConfigEntryState.NOT_LOADED),
-        (SupervisorError("Boom"), ConfigEntryState.LOADED),
+        (SupervisorError("Boom"), ConfigEntryState.FAILED_UNLOAD),
     ],
 )
 async def test_stop_addon(
diff --git a/tests/components/zwave_js/test_repairs.py b/tests/components/zwave_js/test_repairs.py
index d237a6e410a..1d0f74c7269 100644
--- a/tests/components/zwave_js/test_repairs.py
+++ b/tests/components/zwave_js/test_repairs.py
@@ -10,8 +10,7 @@ from zwave_js_server.model.node import Node
 from homeassistant.components.zwave_js import DOMAIN
 from homeassistant.components.zwave_js.helpers import get_device_id
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.device_registry as dr
-import homeassistant.helpers.issue_registry as ir
+from homeassistant.helpers import device_registry as dr, issue_registry as ir
 
 from tests.components.repairs import (
     async_process_repairs_platforms,
@@ -181,7 +180,7 @@ async def test_device_config_file_changed_ignore_step(
 
 
 @pytest.mark.parametrize(
-    "ignore_translations",
+    "ignore_missing_translations",
     ["component.zwave_js.issues.invalid_issue.title"],
 )
 async def test_invalid_issue(
diff --git a/tests/components/zwave_js/test_select.py b/tests/components/zwave_js/test_select.py
index ddfd205b017..d26cccbc7d5 100644
--- a/tests/components/zwave_js/test_select.py
+++ b/tests/components/zwave_js/test_select.py
@@ -10,7 +10,7 @@ from homeassistant.components.zwave_js.helpers import ZwaveValueMatcher
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_UNKNOWN, EntityCategory
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers import entity_registry as er
 
 from .common import replace_value_of_zwave_value
 
diff --git a/tests/components/zwave_js/test_siren.py b/tests/components/zwave_js/test_siren.py
index 4eb872954d1..d932338f9dc 100644
--- a/tests/components/zwave_js/test_siren.py
+++ b/tests/components/zwave_js/test_siren.py
@@ -1,5 +1,6 @@
 """Test the Z-Wave JS siren platform."""
 
+import pytest
 from zwave_js_server.event import Event
 
 from homeassistant.components.siren import (
@@ -7,7 +8,7 @@ from homeassistant.components.siren import (
     ATTR_TONE,
     ATTR_VOLUME_LEVEL,
 )
-from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNKNOWN
+from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNKNOWN, Platform
 from homeassistant.core import HomeAssistant
 
 SIREN_ENTITY = "siren.indoor_siren_6_play_tone_2"
@@ -64,6 +65,12 @@ TONE_ID_VALUE_ID = {
 }
 
 
+@pytest.fixture
+def platforms() -> list[str]:
+    """Fixture to specify platforms to test."""
+    return [Platform.SIREN]
+
+
 async def test_siren(
     hass: HomeAssistant, client, aeotec_zw164_siren, integration
 ) -> None:
diff --git a/tests/components/zwave_js/test_update.py b/tests/components/zwave_js/test_update.py
index d6683fa24cb..6a4f48a0dc5 100644
--- a/tests/components/zwave_js/test_update.py
+++ b/tests/components/zwave_js/test_update.py
@@ -658,8 +658,10 @@ async def test_update_entity_delay(
 
     assert len(client.async_send_command.call_args_list) == 2
 
-    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=5))
-    await hass.async_block_till_done(wait_background_tasks=True)
+    update_interval = timedelta(minutes=5)
+    freezer.tick(update_interval)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
 
     nodes: set[int] = set()
 
@@ -668,8 +670,9 @@ async def test_update_entity_delay(
     assert args["command"] == "controller.get_available_firmware_updates"
     nodes.add(args["nodeId"])
 
-    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=10))
-    await hass.async_block_till_done(wait_background_tasks=True)
+    freezer.tick(update_interval)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
 
     assert len(client.async_send_command.call_args_list) == 4
     args = client.async_send_command.call_args_list[3][0][0]
diff --git a/tests/conftest.py b/tests/conftest.py
index de627925941..65e3518956e 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -11,10 +11,12 @@ import gc
 import itertools
 import logging
 import os
+import pathlib
 import reprlib
 from shutil import rmtree
 import sqlite3
 import ssl
+import sys
 import threading
 from typing import TYPE_CHECKING, Any, cast
 from unittest.mock import AsyncMock, MagicMock, Mock, _patch, patch
@@ -49,7 +51,7 @@ from . import patch_recorder
 # Setup patching of dt_util time functions before any other Home Assistant imports
 from . import patch_time  # noqa: F401, isort:skip
 
-from homeassistant import core as ha, loader, runner
+from homeassistant import components, core as ha, loader, runner
 from homeassistant.auth.const import GROUP_ID_ADMIN, GROUP_ID_READ_ONLY
 from homeassistant.auth.models import Credentials
 from homeassistant.auth.providers import homeassistant
@@ -65,7 +67,12 @@ from homeassistant.components.websocket_api.auth import (
 # pylint: disable-next=hass-component-root-import
 from homeassistant.components.websocket_api.http import URL
 from homeassistant.config import YAML_CONFIG_FILE
-from homeassistant.config_entries import ConfigEntries, ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import (
+    ConfigEntries,
+    ConfigEntry,
+    ConfigEntryState,
+    ConfigSubentryData,
+)
 from homeassistant.const import BASE_PLATFORMS, HASSIO_USER_NAME
 from homeassistant.core import (
     Context,
@@ -82,9 +89,11 @@ from homeassistant.helpers import (
     device_registry as dr,
     entity_registry as er,
     floor_registry as fr,
+    frame,
     issue_registry as ir,
     label_registry as lr,
     recorder as recorder_helper,
+    translation as translation_helper,
 )
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.translation import _TranslationsCacheData
@@ -118,6 +127,7 @@ from .common import (  # noqa: E402, isort:skip
     CLIENT_ID,
     INSTANCES,
     MockConfigEntry,
+    MockMqttReasonCode,
     MockUser,
     async_fire_mqtt_message,
     async_test_home_assistant,
@@ -425,11 +435,17 @@ def verify_cleanup(
 
 
 @pytest.fixture(autouse=True)
-def reset_hass_threading_local_object() -> Generator[None]:
-    """Reset the _Hass threading.local object for every test case."""
+def reset_globals() -> Generator[None]:
+    """Reset global objects for every test case."""
     yield
+
+    # Reset the _Hass threading.local object
     ha._hass.__dict__.clear()
 
+    # Reset the frame helper globals
+    frame.async_setup(None)
+    frame._REPORTED_INTEGRATIONS.clear()
+
 
 @pytest.fixture(autouse=True, scope="session")
 def bcrypt_cost() -> Generator[None]:
@@ -595,6 +611,7 @@ async def hass(
     async with async_test_home_assistant(loop, load_registries) as hass:
         orig_exception_handler = loop.get_exception_handler()
         loop.set_exception_handler(exc_handle)
+        frame.async_setup(hass)
 
         yield hass
 
@@ -934,6 +951,12 @@ def mqtt_config_entry_data() -> dict[str, Any] | None:
     return None
 
 
+@pytest.fixture
+def mqtt_config_subentries_data() -> tuple[ConfigSubentryData] | None:
+    """Fixture to allow overriding MQTT subentries data."""
+    return None
+
+
 @pytest.fixture
 def mqtt_config_entry_options() -> dict[str, Any] | None:
     """Fixture to allow overriding MQTT entry options."""
@@ -969,17 +992,23 @@ def mqtt_client_mock(hass: HomeAssistant) -> Generator[MqttMockPahoClient]:
         def _async_fire_mqtt_message(topic, payload, qos, retain):
             async_fire_mqtt_message(hass, topic, payload or b"", qos, retain)
             mid = get_mid()
-            hass.loop.call_soon(mock_client.on_publish, 0, 0, mid)
+            hass.loop.call_soon(
+                mock_client.on_publish, Mock(), 0, mid, MockMqttReasonCode(), None
+            )
             return FakeInfo(mid)
 
         def _subscribe(topic, qos=0):
             mid = get_mid()
-            hass.loop.call_soon(mock_client.on_subscribe, 0, 0, mid)
+            hass.loop.call_soon(
+                mock_client.on_subscribe, Mock(), 0, mid, [MockMqttReasonCode()], None
+            )
             return (0, mid)
 
         def _unsubscribe(topic):
             mid = get_mid()
-            hass.loop.call_soon(mock_client.on_unsubscribe, 0, 0, mid)
+            hass.loop.call_soon(
+                mock_client.on_unsubscribe, Mock(), 0, mid, [MockMqttReasonCode()], None
+            )
             return (0, mid)
 
         def _connect(*args, **kwargs):
@@ -988,7 +1017,7 @@ def mqtt_client_mock(hass: HomeAssistant) -> Generator[MqttMockPahoClient]:
             # the behavior.
             mock_client.reconnect()
             hass.loop.call_soon_threadsafe(
-                mock_client.on_connect, mock_client, None, 0, 0, 0
+                mock_client.on_connect, mock_client, None, 0, MockMqttReasonCode()
             )
             mock_client.on_socket_open(
                 mock_client, None, Mock(fileno=Mock(return_value=-1))
@@ -1014,6 +1043,7 @@ async def mqtt_mock(
     mqtt_client_mock: MqttMockPahoClient,
     mqtt_config_entry_data: dict[str, Any] | None,
     mqtt_config_entry_options: dict[str, Any] | None,
+    mqtt_config_subentries_data: tuple[ConfigSubentryData] | None,
     mqtt_mock_entry: MqttMockHAClientGenerator,
 ) -> AsyncGenerator[MqttMockHAClient]:
     """Fixture to mock MQTT component."""
@@ -1026,6 +1056,7 @@ async def _mqtt_mock_entry(
     mqtt_client_mock: MqttMockPahoClient,
     mqtt_config_entry_data: dict[str, Any] | None,
     mqtt_config_entry_options: dict[str, Any] | None,
+    mqtt_config_subentries_data: tuple[ConfigSubentryData] | None,
 ) -> AsyncGenerator[MqttMockHAClientGenerator]:
     """Fixture to mock a delayed setup of the MQTT config entry."""
     # Local import to avoid processing MQTT modules when running a testcase
@@ -1042,6 +1073,7 @@ async def _mqtt_mock_entry(
     entry = MockConfigEntry(
         data=mqtt_config_entry_data,
         options=mqtt_config_entry_options,
+        subentries_data=mqtt_config_subentries_data,
         domain=mqtt.DOMAIN,
         title="MQTT",
         version=1,
@@ -1065,7 +1097,7 @@ async def _mqtt_mock_entry(
 
         # connected set to True to get a more realistic behavior when subscribing
         mock_mqtt_instance.connected = True
-        mqtt_client_mock.on_connect(mqtt_client_mock, None, 0, 0, 0)
+        mqtt_client_mock.on_connect(mqtt_client_mock, None, 0, MockMqttReasonCode())
 
         async_dispatcher_send(hass, mqtt.MQTT_CONNECTION_STATE, True)
         await hass.async_block_till_done()
@@ -1156,6 +1188,7 @@ async def mqtt_mock_entry(
     mqtt_client_mock: MqttMockPahoClient,
     mqtt_config_entry_data: dict[str, Any] | None,
     mqtt_config_entry_options: dict[str, Any] | None,
+    mqtt_config_subentries_data: tuple[ConfigSubentryData] | None,
 ) -> AsyncGenerator[MqttMockHAClientGenerator]:
     """Set up an MQTT config entry."""
 
@@ -1172,7 +1205,11 @@ async def mqtt_mock_entry(
         return await mqtt_mock_entry(_async_setup_config_entry)
 
     async with _mqtt_mock_entry(
-        hass, mqtt_client_mock, mqtt_config_entry_data, mqtt_config_entry_options
+        hass,
+        mqtt_client_mock,
+        mqtt_config_entry_data,
+        mqtt_config_entry_options,
+        mqtt_config_subentries_data,
     ) as mqtt_mock_entry:
         yield _setup_mqtt_entry
 
@@ -1180,15 +1217,31 @@ async def mqtt_mock_entry(
 @pytest.fixture(autouse=True, scope="session")
 def mock_network() -> Generator[None]:
     """Mock network."""
-    with patch(
-        "homeassistant.components.network.util.ifaddr.get_adapters",
-        return_value=[
-            Mock(
-                nice_name="eth0",
-                ips=[Mock(is_IPv6=False, ip="10.10.10.10", network_prefix=24)],
-                index=0,
-            )
-        ],
+    with (
+        patch(
+            "homeassistant.components.network.util.ifaddr.get_adapters",
+            return_value=[
+                Mock(
+                    nice_name="eth0",
+                    ips=[Mock(is_IPv6=False, ip="10.10.10.10", network_prefix=24)],
+                    index=0,
+                )
+            ],
+        ),
+        patch(
+            "homeassistant.components.network.async_get_loaded_adapters",
+            return_value=[
+                {
+                    "auto": True,
+                    "default": True,
+                    "enabled": True,
+                    "index": 0,
+                    "ipv4": [{"address": "10.10.10.10", "network_prefix": 24}],
+                    "ipv6": [],
+                    "name": "eth0",
+                }
+            ],
+        ),
     ):
         yield
 
@@ -1211,9 +1264,8 @@ def mock_get_source_ip() -> Generator[_patch]:
 def translations_once() -> Generator[_patch]:
     """Only load translations once per session.
 
-    Warning: having this as a session fixture can cause issues with tests that
-    create mock integrations, overriding the real integration translations
-    with empty ones. Translations should be reset after such tests (see #131628)
+    Note: To avoid issues with tests that mock integrations, translations for
+    mocked integrations are cleaned up by the evict_faked_translations fixture.
     """
     cache = _TranslationsCacheData({}, {})
     patcher = patch(
@@ -1227,6 +1279,30 @@ def translations_once() -> Generator[_patch]:
         patcher.stop()
 
 
+@pytest.fixture(autouse=True, scope="module")
+def evict_faked_translations(translations_once) -> Generator[_patch]:
+    """Clear translations for mocked integrations from the cache after each module."""
+    real_component_strings = translation_helper._async_get_component_strings
+    with patch(
+        "homeassistant.helpers.translation._async_get_component_strings",
+        wraps=real_component_strings,
+    ) as mock_component_strings:
+        yield
+    cache: _TranslationsCacheData = translations_once.kwargs["return_value"]
+    component_paths = components.__path__
+
+    for call in mock_component_strings.mock_calls:
+        integrations: dict[str, loader.Integration] = call.args[3]
+        for domain, integration in integrations.items():
+            if any(
+                pathlib.Path(f"{component_path}/{domain}") == integration.file_path
+                for component_path in component_paths
+            ):
+                continue
+            for loaded_for_lang in cache.loaded.values():
+                loaded_for_lang.discard(domain)
+
+
 @pytest.fixture
 def disable_translations_once(
     translations_once: _patch,
@@ -1509,7 +1585,7 @@ async def _async_init_recorder_component(
             assert (recorder.DOMAIN in hass.config.components) == expected_setup_result
         else:
             # Wait for recorder to connect to the database
-            await recorder_helper.async_wait_recorder(hass)
+            await hass.data[recorder_helper.DATA_RECORDER].db_connected
     _LOGGER.info(
         "Test recorder successfully started, database location: %s",
         config[recorder.CONF_DB_URL],
@@ -1841,12 +1917,15 @@ def mock_integration_frame(integration_frame_path: str) -> Generator[Mock]:
     Defaults to calling from `hue` core integration, and can be parametrized
     with `integration_frame_path`.
     """
+    correct_filename = f"/home/paulus/{integration_frame_path}/light.py"
+    correct_module_name = f"{integration_frame_path.replace('/', '.')}.light"
     correct_frame = Mock(
         filename=f"/home/paulus/{integration_frame_path}/light.py",
         lineno="23",
         line="self.light.is_on",
     )
     with (
+        patch.dict(sys.modules, {correct_module_name: Mock(__file__=correct_filename)}),
         patch(
             "homeassistant.helpers.frame.linecache.getline",
             return_value=correct_frame.line,
diff --git a/tests/helpers/snapshots/test_entity_platform.ambr b/tests/helpers/snapshots/test_entity_platform.ambr
index 84cbb07bd73..55ff772e08e 100644
--- a/tests/helpers/snapshots/test_entity_platform.ambr
+++ b/tests/helpers/snapshots/test_entity_platform.ambr
@@ -3,6 +3,7 @@
   DeviceRegistryEntrySnapshot({
     'area_id': 'heliport',
     'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
     'configuration_url': 'http://192.168.0.100/config',
     'connections': set({
       tuple(
@@ -35,3 +36,40 @@
     'via_device_id': <ANY>,
   })
 # ---
+# name: test_device_info_called.1
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'heliport',
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': 'http://192.168.0.100/config',
+    'connections': set({
+      tuple(
+        'mac',
+        'efgh',
+      ),
+    }),
+    'disabled_by': None,
+    'entry_type': <DeviceEntryType.SERVICE: 'service'>,
+    'hw_version': 'test-hw',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'hue',
+        'efgh',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': 'test-manuf',
+    'model': 'test-model',
+    'model_id': None,
+    'name': 'test-name',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Heliport',
+    'sw_version': 'test-sw',
+    'via_device_id': <ANY>,
+  })
+# ---
diff --git a/tests/helpers/snapshots/test_frame.ambr b/tests/helpers/snapshots/test_frame.ambr
new file mode 100644
index 00000000000..e74a4b2947a
--- /dev/null
+++ b/tests/helpers/snapshots/test_frame.ambr
@@ -0,0 +1,82 @@
+# serializer version: 1
+# name: test_report_usage[core default]
+  list([
+  ])
+# ---
+# name: test_report_usage[core integration default]
+  list([
+    "Detected that integration 'test_core_integration' test_report_string at homeassistant/components/test_core_integration/light.py, line 23: self.light.is_on. Please create a bug report at https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue+label%3A%22integration%3A+test_core_integration%22",
+  ])
+# ---
+# name: test_report_usage[core_behavior ignore]
+  list([
+  ])
+# ---
+# name: test_report_usage[core_behavior log]
+  list([
+    'Detected code that test_report_string. Please report this issue',
+  ])
+# ---
+# name: test_report_usage[core_integration_behavior error]
+  list([
+    "Detected that integration 'test_integration_frame' test_report_string at homeassistant/components/test_integration_frame/light.py, line 23: self.light.is_on. Please create a bug report at https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue+label%3A%22integration%3A+test_integration_frame%22",
+  ])
+# ---
+# name: test_report_usage[core_integration_behavior ignore]
+  list([
+  ])
+# ---
+# name: test_report_usage[custom integration default]
+  list([
+    "Detected that custom integration 'test_custom_integration' test_report_string at custom_components/test_custom_integration/light.py, line 23: self.light.is_on. Please report it to the author of the 'test_custom_integration' custom integration",
+  ])
+# ---
+# name: test_report_usage[custom integration error]
+  list([
+    "Detected that custom integration 'test_custom_integration' test_report_string at custom_components/test_custom_integration/light.py, line 23: self.light.is_on. Please report it to the author of the 'test_custom_integration' custom integration",
+  ])
+# ---
+# name: test_report_usage[custom integration ignore]
+  list([
+  ])
+# ---
+# name: test_report_usage_find_issue_tracker[core integration]
+  list([
+    "Detected that integration 'test_core_integration' test_report_string at homeassistant/components/test_core_integration/light.py, line 23: self.light.is_on. Please create a bug report at https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue+label%3A%22integration%3A+test_core_integration%22",
+  ])
+# ---
+# name: test_report_usage_find_issue_tracker[core]
+  list([
+    'Detected code that test_report_string. Please report this issue',
+  ])
+# ---
+# name: test_report_usage_find_issue_tracker[custom integration]
+  list([
+    "Detected that custom integration 'test_custom_integration' test_report_string at custom_components/test_custom_integration/light.py, line 23: self.light.is_on. Please create a bug report at https://blablabla.com",
+  ])
+# ---
+# name: test_report_usage_find_issue_tracker[unknown custom integration]
+  list([
+    "Detected that custom integration 'unknown_custom_integration' test_report_string at custom_components/unknown_custom_integration/light.py, line 23: self.light.is_on. Please report it to the author of the 'unknown_custom_integration' custom integration",
+  ])
+# ---
+# name: test_report_usage_find_issue_tracker_other_thread[core integration]
+  list([
+    "Detected that integration 'test_core_integration' test_report_string at homeassistant/components/test_core_integration/light.py, line 23: self.light.is_on. Please create a bug report at https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue+label%3A%22integration%3A+test_core_integration%22",
+  ])
+# ---
+# name: test_report_usage_find_issue_tracker_other_thread[core]
+  list([
+    'Detected code that test_report_string. Please report this issue',
+  ])
+# ---
+# name: test_report_usage_find_issue_tracker_other_thread[custom integration]
+  list([
+    "Detected that custom integration 'test_custom_integration' test_report_string at custom_components/test_custom_integration/light.py, line 23: self.light.is_on. Please create a bug report at https://blablabla.com",
+  ])
+# ---
+# name: test_report_usage_find_issue_tracker_other_thread[unknown custom integration]
+  list([
+    "Detected that custom integration 'unknown_custom_integration' test_report_string at custom_components/unknown_custom_integration/light.py, line 23: self.light.is_on. Please report it to the author of the 'unknown_custom_integration' custom integration",
+  ])
+# ---
diff --git a/tests/helpers/test_aiohttp_client.py b/tests/helpers/test_aiohttp_client.py
index 13cb25bc516..6d2a7e7a8bb 100644
--- a/tests/helpers/test_aiohttp_client.py
+++ b/tests/helpers/test_aiohttp_client.py
@@ -249,7 +249,6 @@ async def test_get_clientsession_patched_close(hass: HomeAssistant) -> None:
         assert mock_close.call_count == 0
 
 
-@patch("homeassistant.helpers.frame._REPORTED_INTEGRATIONS", set())
 async def test_warning_close_session_integration(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
@@ -292,7 +291,6 @@ async def test_warning_close_session_integration(
     ) in caplog.text
 
 
-@patch("homeassistant.helpers.frame._REPORTED_INTEGRATIONS", set())
 async def test_warning_close_session_custom(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
diff --git a/tests/helpers/test_area_registry.py b/tests/helpers/test_area_registry.py
index c69f039027e..3496c41ecf4 100644
--- a/tests/helpers/test_area_registry.py
+++ b/tests/helpers/test_area_registry.py
@@ -494,6 +494,29 @@ async def test_async_get_area_by_name(area_registry: ar.AreaRegistry) -> None:
     assert area_registry.async_get_area_by_name("M o c k 1").normalized_name == "mock1"
 
 
+async def test_async_get_areas_by_alias(
+    area_registry: ar.AreaRegistry,
+) -> None:
+    """Make sure we can get the areas by alias."""
+    area1 = area_registry.async_create("Mock1", aliases=("alias_1", "alias_2"))
+    area2 = area_registry.async_create("Mock2", aliases=("alias_1", "alias_3"))
+
+    assert len(area_registry.areas) == 2
+
+    alias1_list = area_registry.async_get_areas_by_alias("A l i a s_1")
+    alias2_list = area_registry.async_get_areas_by_alias("A l i a s_2")
+    alias3_list = area_registry.async_get_areas_by_alias("A l i a s_3")
+
+    assert len(alias1_list) == 2
+    assert len(alias2_list) == 1
+    assert len(alias3_list) == 1
+
+    assert area1 in alias1_list
+    assert area1 in alias2_list
+    assert area2 in alias1_list
+    assert area2 in alias3_list
+
+
 async def test_async_get_area_by_name_not_found(area_registry: ar.AreaRegistry) -> None:
     """Make sure we return None for non-existent areas."""
     area_registry.async_create("Mock1")
diff --git a/tests/helpers/test_backup.py b/tests/helpers/test_backup.py
new file mode 100644
index 00000000000..10ff5cb855f
--- /dev/null
+++ b/tests/helpers/test_backup.py
@@ -0,0 +1,42 @@
+"""The tests for the backup helpers."""
+
+import asyncio
+from unittest.mock import patch
+
+import pytest
+
+from homeassistant.components.backup import DOMAIN as BACKUP_DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import backup as backup_helper
+from homeassistant.setup import async_setup_component
+
+
+async def test_async_get_manager(hass: HomeAssistant) -> None:
+    """Test async_get_manager."""
+    backup_helper.async_initialize_backup(hass)
+    task = asyncio.create_task(backup_helper.async_get_manager(hass))
+    assert await async_setup_component(hass, BACKUP_DOMAIN, {})
+    manager = await task
+    assert manager is hass.data[backup_helper.DATA_MANAGER]
+
+
+async def test_async_get_manager_no_backup(hass: HomeAssistant) -> None:
+    """Test async_get_manager when the backup integration is not enabled."""
+    with pytest.raises(HomeAssistantError, match="Backup integration is not available"):
+        await backup_helper.async_get_manager(hass)
+
+
+async def test_async_get_manager_backup_failed_setup(hass: HomeAssistant) -> None:
+    """Test test_async_get_manager when the backup integration can't be set up."""
+    backup_helper.async_initialize_backup(hass)
+
+    with patch(
+        "homeassistant.components.backup.manager.BackupManager.async_setup",
+        side_effect=Exception("Boom!"),
+    ):
+        assert not await async_setup_component(hass, BACKUP_DOMAIN, {})
+    with (
+        pytest.raises(Exception, match="Boom!"),
+    ):
+        await backup_helper.async_get_manager(hass)
diff --git a/tests/helpers/test_chat_session.py b/tests/helpers/test_chat_session.py
new file mode 100644
index 00000000000..f6c2fe5057d
--- /dev/null
+++ b/tests/helpers/test_chat_session.py
@@ -0,0 +1,96 @@
+"""Test the chat session helper."""
+
+from collections.abc import Generator
+from datetime import timedelta
+from unittest.mock import Mock, patch
+
+import pytest
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import chat_session
+from homeassistant.util import dt as dt_util, ulid as ulid_util
+
+from tests.common import async_fire_time_changed
+
+
+@pytest.fixture
+def mock_ulid() -> Generator[Mock]:
+    """Mock the ulid library."""
+    with patch("homeassistant.helpers.chat_session.ulid_now") as mock_ulid_now:
+        mock_ulid_now.return_value = "mock-ulid"
+        yield mock_ulid_now
+
+
+@pytest.mark.parametrize(
+    ("start_id", "given_id"),
+    [
+        (None, "mock-ulid"),
+        # This ULID is not known as a session
+        ("01JHXE0952TSJCFJZ869AW6HMD", "mock-ulid"),
+        ("not-a-ulid", "not-a-ulid"),
+    ],
+)
+async def test_conversation_id(
+    hass: HomeAssistant,
+    start_id: str | None,
+    given_id: str,
+    mock_ulid: Mock,
+) -> None:
+    """Test conversation ID generation."""
+    with chat_session.async_get_chat_session(hass, start_id) as session:
+        assert session.conversation_id == given_id
+
+
+async def test_context_var(hass: HomeAssistant) -> None:
+    """Test context var."""
+    with chat_session.async_get_chat_session(hass) as session:
+        with chat_session.async_get_chat_session(
+            hass, session.conversation_id
+        ) as session2:
+            assert session is session2
+
+        with chat_session.async_get_chat_session(hass, None) as session2:
+            assert session.conversation_id != session2.conversation_id
+
+        with chat_session.async_get_chat_session(hass, "something else") as session2:
+            assert session.conversation_id != session2.conversation_id
+
+        with chat_session.async_get_chat_session(
+            hass, ulid_util.ulid_now()
+        ) as session2:
+            assert session.conversation_id != session2.conversation_id
+
+
+async def test_cleanup(
+    hass: HomeAssistant,
+) -> None:
+    """Test cleanup of the chat session."""
+    with chat_session.async_get_chat_session(hass) as session:
+        conversation_id = session.conversation_id
+
+    # Reuse conversation ID to ensure we can chat with same session
+    with chat_session.async_get_chat_session(hass, conversation_id) as session:
+        assert session.conversation_id == conversation_id
+
+    # Set the last updated to be older than the timeout
+    hass.data[chat_session.DATA_CHAT_SESSION][conversation_id].last_updated = (
+        dt_util.utcnow() + chat_session.CONVERSATION_TIMEOUT
+    )
+
+    async_fire_time_changed(
+        hass,
+        dt_util.utcnow() + chat_session.CONVERSATION_TIMEOUT + timedelta(seconds=1),
+    )
+
+    # Should not be cleaned up, but it should have scheduled another cleanup
+    with chat_session.async_get_chat_session(hass, conversation_id) as session:
+        assert session.conversation_id == conversation_id
+
+    async_fire_time_changed(
+        hass,
+        dt_util.utcnow() + chat_session.CONVERSATION_TIMEOUT * 2 + timedelta(seconds=1),
+    )
+
+    # It should be cleaned up now and we start a new conversation
+    with chat_session.async_get_chat_session(hass, conversation_id) as session:
+        assert session.conversation_id != conversation_id
diff --git a/tests/helpers/test_condition.py b/tests/helpers/test_condition.py
index b8c8c8a18c8..aac64f6139a 100644
--- a/tests/helpers/test_condition.py
+++ b/tests/helpers/test_condition.py
@@ -2080,6 +2080,7 @@ async def test_multiple_zones(hass: HomeAssistant) -> None:
     assert not test(hass)
 
 
+@pytest.mark.usefixtures("hass")
 async def test_extract_entities() -> None:
     """Test extracting entities."""
     assert condition.async_extract_entities(
@@ -2153,6 +2154,7 @@ async def test_extract_entities() -> None:
     }
 
 
+@pytest.mark.usefixtures("hass")
 async def test_extract_devices() -> None:
     """Test extracting devices."""
     assert condition.async_extract_devices(
diff --git a/tests/helpers/test_config_entry_oauth2_flow.py b/tests/helpers/test_config_entry_oauth2_flow.py
index 52def52f3f0..5d16a9a62fd 100644
--- a/tests/helpers/test_config_entry_oauth2_flow.py
+++ b/tests/helpers/test_config_entry_oauth2_flow.py
@@ -1,11 +1,11 @@
 """Tests for the Somfy config flow."""
 
-from collections.abc import Generator
+from collections.abc import AsyncGenerator, Generator
 from http import HTTPStatus
 import logging
 import time
 from typing import Any
-from unittest.mock import patch
+from unittest.mock import AsyncMock, patch
 
 import aiohttp
 import pytest
@@ -15,7 +15,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_entry_oauth2_flow
 from homeassistant.helpers.network import NoURLAvailableError
 
-from tests.common import MockConfigEntry, mock_platform
+from tests.common import MockConfigEntry, MockModule, mock_integration, mock_platform
 from tests.test_util.aiohttp import AiohttpClientMocker
 from tests.typing import ClientSessionGenerator
 
@@ -27,6 +27,11 @@ ACCESS_TOKEN_1 = "mock-access-token-1"
 ACCESS_TOKEN_2 = "mock-access-token-2"
 AUTHORIZE_URL = "https://example.como/auth/authorize"
 TOKEN_URL = "https://example.como/auth/token"
+MOCK_SECRET_TOKEN_URLSAFE = (
+    "token-"
+    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+)
 
 
 @pytest.fixture
@@ -40,6 +45,22 @@ async def local_impl(
     )
 
 
+@pytest.fixture
+async def local_impl_pkce(
+    hass: HomeAssistant,
+) -> AsyncGenerator[config_entry_oauth2_flow.LocalOAuth2ImplementationWithPkce]:
+    """Local implementation."""
+    assert await setup.async_setup_component(hass, "auth", {})
+    with patch(
+        "homeassistant.helpers.config_entry_oauth2_flow.secrets.token_urlsafe",
+        return_value=MOCK_SECRET_TOKEN_URLSAFE
+        + "bbbbbb",  # Add some characters that should be removed by the logic.
+    ):
+        yield config_entry_oauth2_flow.LocalOAuth2ImplementationWithPkce(
+            hass, TEST_DOMAIN, CLIENT_ID, AUTHORIZE_URL, TOKEN_URL
+        )
+
+
 @pytest.fixture
 def flow_handler(
     hass: HomeAssistant,
@@ -595,6 +616,13 @@ async def test_abort_discovered_existing_entries(
     assert result["reason"] == "already_configured"
 
 
+@pytest.mark.parametrize(
+    ("additional_components", "expected_redirect_uri"),
+    [
+        ([], "https://example.com/auth/external/callback"),
+        (["my"], "https://my.home-assistant.io/redirect/oauth"),
+    ],
+)
 @pytest.mark.usefixtures("current_request_with_host")
 async def test_full_flow(
     hass: HomeAssistant,
@@ -602,8 +630,12 @@ async def test_full_flow(
     local_impl: config_entry_oauth2_flow.LocalOAuth2Implementation,
     hass_client_no_auth: ClientSessionGenerator,
     aioclient_mock: AiohttpClientMocker,
+    additional_components: list[str],
+    expected_redirect_uri: str,
 ) -> None:
     """Check full flow."""
+    for component in additional_components:
+        assert await setup.async_setup_component(hass, component, {})
     flow_handler.async_register_implementation(hass, local_impl)
     config_entry_oauth2_flow.async_register_implementation(
         hass, TEST_DOMAIN, MockOAuth2Implementation()
@@ -625,14 +657,14 @@ async def test_full_flow(
         hass,
         {
             "flow_id": result["flow_id"],
-            "redirect_uri": "https://example.com/auth/external/callback",
+            "redirect_uri": expected_redirect_uri,
         },
     )
 
     assert result["type"] == data_entry_flow.FlowResultType.EXTERNAL_STEP
     assert result["url"] == (
         f"{AUTHORIZE_URL}?response_type=code&client_id={CLIENT_ID}"
-        "&redirect_uri=https://example.com/auth/external/callback"
+        f"&redirect_uri={expected_redirect_uri}"
         f"&state={state}&scope=read+write"
     )
 
@@ -952,3 +984,143 @@ async def test_oauth2_without_secret_init(
     client = await hass_client_no_auth()
     resp = await client.get("/auth/external/callback?code=abcd&state=qwer")
     assert resp.status == 400
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+async def test_abort_oauth_with_pkce_rejected(
+    hass: HomeAssistant,
+    flow_handler: type[config_entry_oauth2_flow.AbstractOAuth2FlowHandler],
+    local_impl_pkce: config_entry_oauth2_flow.LocalOAuth2ImplementationWithPkce,
+    hass_client_no_auth: ClientSessionGenerator,
+) -> None:
+    """Check bad oauth token."""
+    flow_handler.async_register_implementation(hass, local_impl_pkce)
+
+    result = await hass.config_entries.flow.async_init(
+        TEST_DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+
+    code_challenge = local_impl_pkce.compute_code_challenge(MOCK_SECRET_TOKEN_URLSAFE)
+    assert result["type"] == data_entry_flow.FlowResultType.EXTERNAL_STEP
+
+    assert result["url"].startswith(f"{AUTHORIZE_URL}?")
+    assert f"client_id={CLIENT_ID}" in result["url"]
+    assert "redirect_uri=https://example.com/auth/external/callback" in result["url"]
+    assert f"state={state}" in result["url"]
+    assert "scope=read+write" in result["url"]
+    assert "response_type=code" in result["url"]
+    assert f"code_challenge={code_challenge}" in result["url"]
+    assert "code_challenge_method=S256" in result["url"]
+
+    client = await hass_client_no_auth()
+    resp = await client.get(
+        f"/auth/external/callback?error=access_denied&state={state}"
+    )
+    assert resp.status == 200
+    assert resp.headers["content-type"] == "text/html; charset=utf-8"
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert result["type"] == data_entry_flow.FlowResultType.ABORT
+    assert result["reason"] == "user_rejected_authorize"
+    assert result["description_placeholders"] == {"error": "access_denied"}
+
+
+@pytest.mark.usefixtures("current_request_with_host")
+async def test_oauth_with_pkce_adds_code_verifier_to_token_resolve(
+    hass: HomeAssistant,
+    flow_handler: type[config_entry_oauth2_flow.AbstractOAuth2FlowHandler],
+    local_impl_pkce: config_entry_oauth2_flow.LocalOAuth2ImplementationWithPkce,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+) -> None:
+    """Check pkce flow."""
+
+    mock_integration(
+        hass,
+        MockModule(
+            domain=TEST_DOMAIN,
+            async_setup_entry=AsyncMock(return_value=True),
+        ),
+    )
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow", None)
+    flow_handler.async_register_implementation(hass, local_impl_pkce)
+
+    result = await hass.config_entries.flow.async_init(
+        TEST_DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+
+    code_challenge = local_impl_pkce.compute_code_challenge(MOCK_SECRET_TOKEN_URLSAFE)
+    assert result["type"] == data_entry_flow.FlowResultType.EXTERNAL_STEP
+
+    assert result["url"].startswith(f"{AUTHORIZE_URL}?")
+    assert f"client_id={CLIENT_ID}" in result["url"]
+    assert "redirect_uri=https://example.com/auth/external/callback" in result["url"]
+    assert f"state={state}" in result["url"]
+    assert "scope=read+write" in result["url"]
+    assert "response_type=code" in result["url"]
+    assert f"code_challenge={code_challenge}" in result["url"]
+    assert "code_challenge_method=S256" in result["url"]
+
+    # Setup the response when HA tries to fetch a token with the code
+    aioclient_mock.post(
+        TOKEN_URL,
+        json={
+            "refresh_token": REFRESH_TOKEN,
+            "access_token": ACCESS_TOKEN_1,
+            "type": "bearer",
+            "expires_in": 60,
+        },
+    )
+
+    client = await hass_client_no_auth()
+    # trigger the callback
+    resp = await client.get(f"/auth/external/callback?code=abcd&state={state}")
+    assert resp.status == 200
+    assert resp.headers["content-type"] == "text/html; charset=utf-8"
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    # Verify the token resolve request occurred
+    assert len(aioclient_mock.mock_calls) == 1
+    assert aioclient_mock.mock_calls[0][2] == {
+        "client_id": CLIENT_ID,
+        "grant_type": "authorization_code",
+        "code": "abcd",
+        "redirect_uri": "https://example.com/auth/external/callback",
+        "code_verifier": MOCK_SECRET_TOKEN_URLSAFE,
+    }
+
+
+@pytest.mark.parametrize("code_verifier_length", [40, 129])
+def test_generate_code_verifier_invalid_length(code_verifier_length: int) -> None:
+    """Test generate_code_verifier with an invalid length."""
+    with pytest.raises(ValueError):
+        config_entry_oauth2_flow.LocalOAuth2ImplementationWithPkce.generate_code_verifier(
+            code_verifier_length
+        )
+
+
+@pytest.mark.parametrize("code_verifier", ["", "yyy", "a" * 129])
+def test_compute_code_challenge_invalid_code_verifier(code_verifier: str) -> None:
+    """Test compute_code_challenge with an invalid code_verifier."""
+    with pytest.raises(ValueError):
+        config_entry_oauth2_flow.LocalOAuth2ImplementationWithPkce.compute_code_challenge(
+            code_verifier
+        )
diff --git a/tests/helpers/test_config_validation.py b/tests/helpers/test_config_validation.py
index 7202cef6f5f..c72295493e8 100644
--- a/tests/helpers/test_config_validation.py
+++ b/tests/helpers/test_config_validation.py
@@ -773,6 +773,7 @@ async def test_dynamic_template_no_hass(hass: HomeAssistant) -> None:
         await hass.async_add_executor_job(schema, value)
 
 
+@pytest.mark.usefixtures("hass")
 def test_template_complex() -> None:
     """Test template_complex validator."""
     schema = vol.Schema(cv.template_complex)
@@ -1414,6 +1415,7 @@ def test_key_value_schemas() -> None:
         schema({"mode": mode, "data": data})
 
 
+@pytest.mark.usefixtures("hass")
 def test_key_value_schemas_with_default() -> None:
     """Test key value schemas."""
     schema = vol.Schema(
@@ -1492,6 +1494,7 @@ def test_key_value_schemas_with_default() -> None:
         ),
     ],
 )
+@pytest.mark.usefixtures("hass")
 def test_script(caplog: pytest.LogCaptureFixture, config: dict, error: str) -> None:
     """Test script validation is user friendly."""
     with pytest.raises(vol.Invalid, match=error):
@@ -1570,6 +1573,7 @@ def test_language() -> None:
         assert schema(value)
 
 
+@pytest.mark.usefixtures("hass")
 def test_positive_time_period_template() -> None:
     """Test positive time period template validation."""
     schema = vol.Schema(cv.positive_time_period_template)
diff --git a/tests/helpers/test_debounce.py b/tests/helpers/test_debounce.py
index 6fa758aec6e..b2dd8943e78 100644
--- a/tests/helpers/test_debounce.py
+++ b/tests/helpers/test_debounce.py
@@ -4,6 +4,7 @@ import asyncio
 from datetime import timedelta
 import logging
 from unittest.mock import AsyncMock, Mock
+import weakref
 
 import pytest
 
@@ -529,3 +530,37 @@ async def test_background(
     async_fire_time_changed(hass, utcnow() + timedelta(seconds=1))
     await hass.async_block_till_done(wait_background_tasks=False)
     assert len(calls) == 2
+
+
+async def test_shutdown_releases_parent_class(hass: HomeAssistant) -> None:
+    """Test shutdown releases parent class.
+
+    See https://github.com/home-assistant/core/issues/137237
+    """
+    calls = []
+
+    class SomeClass:
+        def run_func(self) -> None:
+            calls.append(None)
+
+    my_class = SomeClass()
+    my_class_weak_ref = weakref.ref(my_class)
+
+    debouncer = debounce.Debouncer(
+        hass,
+        _LOGGER,
+        cooldown=0.01,
+        immediate=True,
+        function=my_class.run_func,
+    )
+
+    # Debouncer keeps a reference to the function, prevening GC
+    del my_class
+    await debouncer.async_call()
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert my_class_weak_ref() is not None
+
+    # Debouncer shutdown releases the class
+    debouncer.async_shutdown()
+    assert my_class_weak_ref() is None
diff --git a/tests/helpers/test_device_registry.py b/tests/helpers/test_device_registry.py
index 08b984a0477..29edfb3fea7 100644
--- a/tests/helpers/test_device_registry.py
+++ b/tests/helpers/test_device_registry.py
@@ -173,6 +173,109 @@ async def test_multiple_config_entries(
     assert entry3.primary_config_entry == config_entry_1.entry_id
 
 
+async def test_multiple_config_subentries(
+    hass: HomeAssistant, device_registry: dr.DeviceRegistry
+) -> None:
+    """Make sure we do not get duplicate entries."""
+    config_entry_1 = MockConfigEntry(
+        subentries_data=(
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-1-1",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-1-2",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+        )
+    )
+    config_entry_1.add_to_hass(hass)
+    config_entry_2 = MockConfigEntry(
+        subentries_data=(
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-2-1",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+        )
+    )
+    config_entry_2.add_to_hass(hass)
+
+    entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry_1.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+        identifiers={("bridgeid", "0123")},
+        manufacturer="manufacturer",
+        model="model",
+    )
+    assert entry.config_entries == {config_entry_1.entry_id}
+    assert entry.config_entries_subentries == {config_entry_1.entry_id: {None}}
+    entry_id = entry.id
+
+    entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry_1.entry_id,
+        config_subentry_id=None,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+        identifiers={("bridgeid", "0123")},
+        manufacturer="manufacturer",
+        model="model",
+    )
+    assert entry.id == entry_id
+    assert entry.config_entries == {config_entry_1.entry_id}
+    assert entry.config_entries_subentries == {config_entry_1.entry_id: {None}}
+
+    entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry_1.entry_id,
+        config_subentry_id="mock-subentry-id-1-1",
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+        identifiers={("bridgeid", "0123")},
+        manufacturer="manufacturer",
+        model="model",
+    )
+    assert entry.id == entry_id
+    assert entry.config_entries == {config_entry_1.entry_id}
+    assert entry.config_entries_subentries == {
+        config_entry_1.entry_id: {None, "mock-subentry-id-1-1"}
+    }
+
+    entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry_1.entry_id,
+        config_subentry_id="mock-subentry-id-1-2",
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+        identifiers={("bridgeid", "0123")},
+        manufacturer="manufacturer",
+        model="model",
+    )
+    assert entry.id == entry_id
+    assert entry.config_entries == {config_entry_1.entry_id}
+    assert entry.config_entries_subentries == {
+        config_entry_1.entry_id: {None, "mock-subentry-id-1-1", "mock-subentry-id-1-2"}
+    }
+
+    entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry_2.entry_id,
+        config_subentry_id="mock-subentry-id-2-1",
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+        identifiers={("bridgeid", "0123")},
+        manufacturer="manufacturer",
+        model="model",
+    )
+    assert entry.id == entry_id
+    assert entry.config_entries == {config_entry_1.entry_id, config_entry_2.entry_id}
+    assert entry.config_entries_subentries == {
+        config_entry_1.entry_id: {None, "mock-subentry-id-1-1", "mock-subentry-id-1-2"},
+        config_entry_2.entry_id: {"mock-subentry-id-2-1"},
+    }
+
+
 @pytest.mark.parametrize("load_registries", [False])
 @pytest.mark.usefixtures("freezer")
 async def test_loading_from_storage(
@@ -191,6 +294,7 @@ async def test_loading_from_storage(
                 {
                     "area_id": "12345A",
                     "config_entries": [mock_config_entry.entry_id],
+                    "config_entries_subentries": {mock_config_entry.entry_id: [None]},
                     "configuration_url": "https://example.com/config",
                     "connections": [["Zigbee", "01.23.45.67.89"]],
                     "created_at": created_at,
@@ -215,6 +319,7 @@ async def test_loading_from_storage(
             "deleted_devices": [
                 {
                     "config_entries": [mock_config_entry.entry_id],
+                    "config_entries_subentries": {mock_config_entry.entry_id: [None]},
                     "connections": [["Zigbee", "23.45.67.89.01"]],
                     "created_at": created_at,
                     "id": "bcdefghijklmn",
@@ -233,6 +338,7 @@ async def test_loading_from_storage(
 
     assert registry.deleted_devices["bcdefghijklmn"] == dr.DeletedDeviceEntry(
         config_entries={mock_config_entry.entry_id},
+        config_entries_subentries={mock_config_entry.entry_id: {None}},
         connections={("Zigbee", "23.45.67.89.01")},
         created_at=datetime.fromisoformat(created_at),
         id="bcdefghijklmn",
@@ -251,6 +357,7 @@ async def test_loading_from_storage(
     assert entry == dr.DeviceEntry(
         area_id="12345A",
         config_entries={mock_config_entry.entry_id},
+        config_entries_subentries={mock_config_entry.entry_id: {None}},
         configuration_url="https://example.com/config",
         connections={("Zigbee", "01.23.45.67.89")},
         created_at=datetime.fromisoformat(created_at),
@@ -285,6 +392,7 @@ async def test_loading_from_storage(
     )
     assert entry == dr.DeviceEntry(
         config_entries={mock_config_entry.entry_id},
+        config_entries_subentries={mock_config_entry.entry_id: {None}},
         connections={("Zigbee", "23.45.67.89.01")},
         created_at=datetime.fromisoformat(created_at),
         id="bcdefghijklmn",
@@ -384,6 +492,7 @@ async def test_migration_from_1_1(
                 {
                     "area_id": None,
                     "config_entries": [mock_config_entry.entry_id],
+                    "config_entries_subentries": {mock_config_entry.entry_id: [None]},
                     "configuration_url": None,
                     "connections": [["Zigbee", "01.23.45.67.89"]],
                     "created_at": "1970-01-01T00:00:00+00:00",
@@ -407,6 +516,7 @@ async def test_migration_from_1_1(
                 {
                     "area_id": None,
                     "config_entries": ["234567"],
+                    "config_entries_subentries": {"234567": [None]},
                     "configuration_url": None,
                     "connections": [],
                     "created_at": "1970-01-01T00:00:00+00:00",
@@ -431,6 +541,7 @@ async def test_migration_from_1_1(
             "deleted_devices": [
                 {
                     "config_entries": ["123456"],
+                    "config_entries_subentries": {"123456": [None]},
                     "connections": [],
                     "created_at": "1970-01-01T00:00:00+00:00",
                     "id": "deletedid",
@@ -528,6 +639,7 @@ async def test_migration_from_1_2(
                 {
                     "area_id": None,
                     "config_entries": [mock_config_entry.entry_id],
+                    "config_entries_subentries": {mock_config_entry.entry_id: [None]},
                     "configuration_url": None,
                     "connections": [["Zigbee", "01.23.45.67.89"]],
                     "created_at": "1970-01-01T00:00:00+00:00",
@@ -551,6 +663,7 @@ async def test_migration_from_1_2(
                 {
                     "area_id": None,
                     "config_entries": ["234567"],
+                    "config_entries_subentries": {"234567": [None]},
                     "configuration_url": None,
                     "connections": [],
                     "created_at": "1970-01-01T00:00:00+00:00",
@@ -662,6 +775,7 @@ async def test_migration_fom_1_3(
                 {
                     "area_id": None,
                     "config_entries": [mock_config_entry.entry_id],
+                    "config_entries_subentries": {mock_config_entry.entry_id: [None]},
                     "configuration_url": None,
                     "connections": [["Zigbee", "01.23.45.67.89"]],
                     "created_at": "1970-01-01T00:00:00+00:00",
@@ -685,6 +799,7 @@ async def test_migration_fom_1_3(
                 {
                     "area_id": None,
                     "config_entries": ["234567"],
+                    "config_entries_subentries": {"234567": [None]},
                     "configuration_url": None,
                     "connections": [],
                     "created_at": "1970-01-01T00:00:00+00:00",
@@ -798,6 +913,7 @@ async def test_migration_from_1_4(
                 {
                     "area_id": None,
                     "config_entries": [mock_config_entry.entry_id],
+                    "config_entries_subentries": {mock_config_entry.entry_id: [None]},
                     "configuration_url": None,
                     "connections": [["Zigbee", "01.23.45.67.89"]],
                     "created_at": "1970-01-01T00:00:00+00:00",
@@ -821,6 +937,7 @@ async def test_migration_from_1_4(
                 {
                     "area_id": None,
                     "config_entries": ["234567"],
+                    "config_entries_subentries": {"234567": [None]},
                     "configuration_url": None,
                     "connections": [],
                     "created_at": "1970-01-01T00:00:00+00:00",
@@ -936,6 +1053,7 @@ async def test_migration_from_1_5(
                 {
                     "area_id": None,
                     "config_entries": [mock_config_entry.entry_id],
+                    "config_entries_subentries": {mock_config_entry.entry_id: [None]},
                     "configuration_url": None,
                     "connections": [["Zigbee", "01.23.45.67.89"]],
                     "created_at": "1970-01-01T00:00:00+00:00",
@@ -959,6 +1077,7 @@ async def test_migration_from_1_5(
                 {
                     "area_id": None,
                     "config_entries": ["234567"],
+                    "config_entries_subentries": {"234567": [None]},
                     "configuration_url": None,
                     "connections": [],
                     "created_at": "1970-01-01T00:00:00+00:00",
@@ -1076,6 +1195,7 @@ async def test_migration_from_1_6(
                 {
                     "area_id": None,
                     "config_entries": [mock_config_entry.entry_id],
+                    "config_entries_subentries": {mock_config_entry.entry_id: [None]},
                     "configuration_url": None,
                     "connections": [["Zigbee", "01.23.45.67.89"]],
                     "created_at": "1970-01-01T00:00:00+00:00",
@@ -1099,6 +1219,7 @@ async def test_migration_from_1_6(
                 {
                     "area_id": None,
                     "config_entries": ["234567"],
+                    "config_entries_subentries": {"234567": [None]},
                     "configuration_url": None,
                     "connections": [],
                     "created_at": "1970-01-01T00:00:00+00:00",
@@ -1218,6 +1339,7 @@ async def test_migration_from_1_7(
                 {
                     "area_id": None,
                     "config_entries": [mock_config_entry.entry_id],
+                    "config_entries_subentries": {mock_config_entry.entry_id: [None]},
                     "configuration_url": None,
                     "connections": [["Zigbee", "01.23.45.67.89"]],
                     "created_at": "1970-01-01T00:00:00+00:00",
@@ -1241,6 +1363,7 @@ async def test_migration_from_1_7(
                 {
                     "area_id": None,
                     "config_entries": ["234567"],
+                    "config_entries_subentries": {"234567": [None]},
                     "configuration_url": None,
                     "connections": [],
                     "created_at": "1970-01-01T00:00:00+00:00",
@@ -1303,6 +1426,10 @@ async def test_removing_config_entries(
     assert entry.id == entry2.id
     assert entry.id != entry3.id
     assert entry2.config_entries == {config_entry_1.entry_id, config_entry_2.entry_id}
+    assert entry2.config_entries_subentries == {
+        config_entry_1.entry_id: {None},
+        config_entry_2.entry_id: {None},
+    }
 
     device_registry.async_clear_config_entry(config_entry_1.entry_id)
     entry = device_registry.async_get_device(identifiers={("bridgeid", "0123")})
@@ -1311,6 +1438,7 @@ async def test_removing_config_entries(
     )
 
     assert entry.config_entries == {config_entry_2.entry_id}
+    assert entry.config_entries_subentries == {config_entry_2.entry_id: {None}}
     assert entry3_removed is None
 
     await hass.async_block_till_done()
@@ -1325,6 +1453,7 @@ async def test_removing_config_entries(
         "device_id": entry.id,
         "changes": {
             "config_entries": {config_entry_1.entry_id},
+            "config_entries_subentries": {config_entry_1.entry_id: {None}},
         },
     }
     assert update_events[2].data == {
@@ -1336,6 +1465,10 @@ async def test_removing_config_entries(
         "device_id": entry.id,
         "changes": {
             "config_entries": {config_entry_1.entry_id, config_entry_2.entry_id},
+            "config_entries_subentries": {
+                config_entry_1.entry_id: {None},
+                config_entry_2.entry_id: {None},
+            },
             "primary_config_entry": config_entry_1.entry_id,
         },
     }
@@ -1382,6 +1515,10 @@ async def test_deleted_device_removing_config_entries(
     assert entry.id == entry2.id
     assert entry.id != entry3.id
     assert entry2.config_entries == {config_entry_1.entry_id, config_entry_2.entry_id}
+    assert entry2.config_entries_subentries == {
+        config_entry_1.entry_id: {None},
+        config_entry_2.entry_id: {None},
+    }
 
     device_registry.async_remove_device(entry.id)
     device_registry.async_remove_device(entry3.id)
@@ -1400,6 +1537,7 @@ async def test_deleted_device_removing_config_entries(
         "device_id": entry2.id,
         "changes": {
             "config_entries": {config_entry_1.entry_id},
+            "config_entries_subentries": {config_entry_1.entry_id: {None}},
         },
     }
     assert update_events[2].data == {
@@ -1418,10 +1556,16 @@ async def test_deleted_device_removing_config_entries(
     device_registry.async_clear_config_entry(config_entry_1.entry_id)
     assert len(device_registry.devices) == 0
     assert len(device_registry.deleted_devices) == 2
+    entry = device_registry.deleted_devices.get_entry({("bridgeid", "0123")}, None)
+    assert entry.config_entries == {config_entry_2.entry_id}
+    assert entry.config_entries_subentries == {config_entry_2.entry_id: {None}}
 
     device_registry.async_clear_config_entry(config_entry_2.entry_id)
     assert len(device_registry.devices) == 0
     assert len(device_registry.deleted_devices) == 2
+    entry = device_registry.deleted_devices.get_entry({("bridgeid", "0123")}, None)
+    assert entry.config_entries == set()
+    assert entry.config_entries_subentries == {}
 
     # No event when a deleted device is purged
     await hass.async_block_till_done()
@@ -1454,6 +1598,427 @@ async def test_deleted_device_removing_config_entries(
     assert entry3.id != entry4.id
 
 
+async def test_removing_config_subentries(
+    hass: HomeAssistant, device_registry: dr.DeviceRegistry
+) -> None:
+    """Make sure we do not get duplicate entries."""
+    update_events = async_capture_events(hass, dr.EVENT_DEVICE_REGISTRY_UPDATED)
+    config_entry_1 = MockConfigEntry(
+        subentries_data=(
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-1-1",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-1-2",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+        )
+    )
+    config_entry_1.add_to_hass(hass)
+    config_entry_2 = MockConfigEntry(
+        subentries_data=(
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-2-1",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+        )
+    )
+    config_entry_2.add_to_hass(hass)
+
+    entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry_1.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+        identifiers={("bridgeid", "0123")},
+        manufacturer="manufacturer",
+        model="model",
+    )
+    entry2 = device_registry.async_get_or_create(
+        config_entry_id=config_entry_1.entry_id,
+        config_subentry_id="mock-subentry-id-1-1",
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+        identifiers={("bridgeid", "0123")},
+        manufacturer="manufacturer",
+        model="model",
+    )
+    entry3 = device_registry.async_get_or_create(
+        config_entry_id=config_entry_1.entry_id,
+        config_subentry_id="mock-subentry-id-1-2",
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+        identifiers={("bridgeid", "0123")},
+        manufacturer="manufacturer",
+        model="model",
+    )
+    entry4 = device_registry.async_get_or_create(
+        config_entry_id=config_entry_2.entry_id,
+        config_subentry_id="mock-subentry-id-2-1",
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+        identifiers={("bridgeid", "4567")},
+        manufacturer="manufacturer",
+        model="model",
+    )
+
+    assert len(device_registry.devices) == 1
+    assert entry.id == entry2.id
+    assert entry.id == entry3.id
+    assert entry.id == entry4.id
+    assert entry4.config_entries == {config_entry_1.entry_id, config_entry_2.entry_id}
+    assert entry4.config_entries_subentries == {
+        config_entry_1.entry_id: {None, "mock-subentry-id-1-1", "mock-subentry-id-1-2"},
+        config_entry_2.entry_id: {"mock-subentry-id-2-1"},
+    }
+
+    device_registry.async_update_device(
+        entry.id,
+        remove_config_entry_id=config_entry_1.entry_id,
+        remove_config_subentry_id=None,
+    )
+    entry = device_registry.async_get_device(identifiers={("bridgeid", "0123")})
+    assert entry.config_entries == {config_entry_1.entry_id, config_entry_2.entry_id}
+    assert entry.config_entries_subentries == {
+        config_entry_1.entry_id: {"mock-subentry-id-1-1", "mock-subentry-id-1-2"},
+        config_entry_2.entry_id: {"mock-subentry-id-2-1"},
+    }
+
+    hass.config_entries.async_remove_subentry(config_entry_1, "mock-subentry-id-1-1")
+    entry = device_registry.async_get_device(identifiers={("bridgeid", "0123")})
+    assert entry.config_entries == {config_entry_1.entry_id, config_entry_2.entry_id}
+    assert entry.config_entries_subentries == {
+        config_entry_1.entry_id: {"mock-subentry-id-1-2"},
+        config_entry_2.entry_id: {"mock-subentry-id-2-1"},
+    }
+
+    hass.config_entries.async_remove_subentry(config_entry_1, "mock-subentry-id-1-2")
+    entry = device_registry.async_get_device(identifiers={("bridgeid", "0123")})
+    assert entry.config_entries == {config_entry_2.entry_id}
+    assert entry.config_entries_subentries == {
+        config_entry_2.entry_id: {"mock-subentry-id-2-1"}
+    }
+
+    hass.config_entries.async_remove_subentry(config_entry_2, "mock-subentry-id-2-1")
+    assert device_registry.async_get_device(identifiers={("bridgeid", "0123")}) is None
+    assert device_registry.async_get_device(identifiers={("bridgeid", "4567")}) is None
+
+    await hass.async_block_till_done()
+
+    assert len(update_events) == 8
+    assert update_events[0].data == {
+        "action": "create",
+        "device_id": entry.id,
+    }
+    assert update_events[1].data == {
+        "action": "update",
+        "device_id": entry.id,
+        "changes": {
+            "config_entries_subentries": {config_entry_1.entry_id: {None}},
+        },
+    }
+    assert update_events[2].data == {
+        "action": "update",
+        "device_id": entry.id,
+        "changes": {
+            "config_entries_subentries": {
+                config_entry_1.entry_id: {None, "mock-subentry-id-1-1"}
+            },
+        },
+    }
+    assert update_events[3].data == {
+        "action": "update",
+        "device_id": entry.id,
+        "changes": {
+            "config_entries": {config_entry_1.entry_id},
+            "config_entries_subentries": {
+                config_entry_1.entry_id: {
+                    None,
+                    "mock-subentry-id-1-1",
+                    "mock-subentry-id-1-2",
+                }
+            },
+            "identifiers": {("bridgeid", "0123")},
+        },
+    }
+    assert update_events[4].data == {
+        "action": "update",
+        "device_id": entry.id,
+        "changes": {
+            "config_entries_subentries": {
+                config_entry_1.entry_id: {
+                    None,
+                    "mock-subentry-id-1-1",
+                    "mock-subentry-id-1-2",
+                },
+                config_entry_2.entry_id: {
+                    "mock-subentry-id-2-1",
+                },
+            },
+        },
+    }
+    assert update_events[5].data == {
+        "action": "update",
+        "device_id": entry.id,
+        "changes": {
+            "config_entries_subentries": {
+                config_entry_1.entry_id: {
+                    "mock-subentry-id-1-1",
+                    "mock-subentry-id-1-2",
+                },
+                config_entry_2.entry_id: {
+                    "mock-subentry-id-2-1",
+                },
+            },
+        },
+    }
+    assert update_events[6].data == {
+        "action": "update",
+        "device_id": entry.id,
+        "changes": {
+            "config_entries": {config_entry_1.entry_id, config_entry_2.entry_id},
+            "config_entries_subentries": {
+                config_entry_1.entry_id: {
+                    "mock-subentry-id-1-2",
+                },
+                config_entry_2.entry_id: {
+                    "mock-subentry-id-2-1",
+                },
+            },
+            "primary_config_entry": config_entry_1.entry_id,
+        },
+    }
+    assert update_events[7].data == {
+        "action": "remove",
+        "device_id": entry.id,
+    }
+
+
+async def test_deleted_device_removing_config_subentries(
+    hass: HomeAssistant, device_registry: dr.DeviceRegistry
+) -> None:
+    """Make sure we do not get duplicate entries."""
+    update_events = async_capture_events(hass, dr.EVENT_DEVICE_REGISTRY_UPDATED)
+    config_entry_1 = MockConfigEntry(
+        subentries_data=(
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-1-1",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-1-2",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+        )
+    )
+    config_entry_1.add_to_hass(hass)
+    config_entry_2 = MockConfigEntry(
+        subentries_data=(
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-2-1",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+        )
+    )
+    config_entry_2.add_to_hass(hass)
+
+    entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry_1.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+        identifiers={("bridgeid", "0123")},
+        manufacturer="manufacturer",
+        model="model",
+    )
+    entry2 = device_registry.async_get_or_create(
+        config_entry_id=config_entry_1.entry_id,
+        config_subentry_id="mock-subentry-id-1-1",
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+        identifiers={("bridgeid", "0123")},
+        manufacturer="manufacturer",
+        model="model",
+    )
+    entry3 = device_registry.async_get_or_create(
+        config_entry_id=config_entry_1.entry_id,
+        config_subentry_id="mock-subentry-id-1-2",
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+        identifiers={("bridgeid", "0123")},
+        manufacturer="manufacturer",
+        model="model",
+    )
+    entry4 = device_registry.async_get_or_create(
+        config_entry_id=config_entry_2.entry_id,
+        config_subentry_id="mock-subentry-id-2-1",
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+        identifiers={("bridgeid", "4567")},
+        manufacturer="manufacturer",
+        model="model",
+    )
+
+    assert len(device_registry.devices) == 1
+    assert len(device_registry.deleted_devices) == 0
+    assert entry.id == entry2.id
+    assert entry.id == entry3.id
+    assert entry.id == entry4.id
+    assert entry4.config_entries == {config_entry_1.entry_id, config_entry_2.entry_id}
+    assert entry4.config_entries_subentries == {
+        config_entry_1.entry_id: {None, "mock-subentry-id-1-1", "mock-subentry-id-1-2"},
+        config_entry_2.entry_id: {"mock-subentry-id-2-1"},
+    }
+
+    device_registry.async_remove_device(entry.id)
+
+    assert len(device_registry.devices) == 0
+    assert len(device_registry.deleted_devices) == 1
+
+    await hass.async_block_till_done()
+
+    assert len(update_events) == 5
+    assert update_events[0].data == {
+        "action": "create",
+        "device_id": entry.id,
+    }
+    assert update_events[1].data == {
+        "action": "update",
+        "device_id": entry.id,
+        "changes": {
+            "config_entries_subentries": {config_entry_1.entry_id: {None}},
+        },
+    }
+    assert update_events[2].data == {
+        "action": "update",
+        "device_id": entry.id,
+        "changes": {
+            "config_entries_subentries": {
+                config_entry_1.entry_id: {None, "mock-subentry-id-1-1"}
+            },
+        },
+    }
+    assert update_events[3].data == {
+        "action": "update",
+        "device_id": entry.id,
+        "changes": {
+            "config_entries": {config_entry_1.entry_id},
+            "config_entries_subentries": {
+                config_entry_1.entry_id: {
+                    None,
+                    "mock-subentry-id-1-1",
+                    "mock-subentry-id-1-2",
+                }
+            },
+            "identifiers": {("bridgeid", "0123")},
+        },
+    }
+    assert update_events[4].data == {
+        "action": "remove",
+        "device_id": entry.id,
+    }
+
+    device_registry.async_clear_config_subentry(config_entry_1.entry_id, None)
+    entry = device_registry.deleted_devices.get_entry({("bridgeid", "0123")}, None)
+    assert entry.config_entries == {config_entry_1.entry_id, config_entry_2.entry_id}
+    assert entry.config_entries_subentries == {
+        config_entry_1.entry_id: {"mock-subentry-id-1-1", "mock-subentry-id-1-2"},
+        config_entry_2.entry_id: {"mock-subentry-id-2-1"},
+    }
+    assert entry.orphaned_timestamp is None
+
+    hass.config_entries.async_remove_subentry(config_entry_1, "mock-subentry-id-1-1")
+    entry = device_registry.deleted_devices.get_entry({("bridgeid", "0123")}, None)
+    assert entry.config_entries == {config_entry_1.entry_id, config_entry_2.entry_id}
+    assert entry.config_entries_subentries == {
+        config_entry_1.entry_id: {"mock-subentry-id-1-2"},
+        config_entry_2.entry_id: {"mock-subentry-id-2-1"},
+    }
+    assert entry.orphaned_timestamp is None
+
+    # Remove the same subentry again
+    device_registry.async_clear_config_subentry(
+        config_entry_1.entry_id, "mock-subentry-id-1-1"
+    )
+    assert (
+        device_registry.deleted_devices.get_entry({("bridgeid", "0123")}, None) is entry
+    )
+
+    hass.config_entries.async_remove_subentry(config_entry_1, "mock-subentry-id-1-2")
+    entry = device_registry.deleted_devices.get_entry({("bridgeid", "0123")}, None)
+    assert entry.config_entries == {config_entry_2.entry_id}
+    assert entry.config_entries_subentries == {
+        config_entry_2.entry_id: {"mock-subentry-id-2-1"}
+    }
+    assert entry.orphaned_timestamp is None
+
+    hass.config_entries.async_remove_subentry(config_entry_2, "mock-subentry-id-2-1")
+    entry = device_registry.deleted_devices.get_entry({("bridgeid", "0123")}, None)
+    assert entry.config_entries == set()
+    assert entry.config_entries_subentries == {}
+    assert entry.orphaned_timestamp is not None
+
+    # No event when a deleted device is purged
+    await hass.async_block_till_done()
+    assert len(update_events) == 5
+
+    # Re-add, expect to keep the device id
+    hass.config_entries.async_add_subentry(
+        config_entry_2,
+        config_entries.ConfigSubentry(
+            data={},
+            subentry_id="mock-subentry-id-2-1",
+            subentry_type="test",
+            title="Mock title",
+            unique_id="test",
+        ),
+    )
+    restored_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry_2.entry_id,
+        config_subentry_id="mock-subentry-id-2-1",
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+        identifiers={("bridgeid", "0123")},
+        manufacturer="manufacturer",
+        model="model",
+    )
+    assert restored_entry.id == entry.id
+
+    # Remove again, and trigger purge
+    device_registry.async_remove_device(entry.id)
+    hass.config_entries.async_remove_subentry(config_entry_2, "mock-subentry-id-2-1")
+    entry = device_registry.deleted_devices.get_entry({("bridgeid", "0123")}, None)
+    assert entry.config_entries == set()
+    assert entry.config_entries_subentries == {}
+    assert entry.orphaned_timestamp is not None
+
+    future_time = time.time() + dr.ORPHANED_DEVICE_KEEP_SECONDS + 1
+
+    with patch("time.time", return_value=future_time):
+        device_registry.async_purge_expired_orphaned_devices()
+
+    assert len(device_registry.devices) == 0
+    assert len(device_registry.deleted_devices) == 0
+
+    # Re-add, expect to get a new device id after the purge
+    new_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry_1.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+        identifiers={("bridgeid", "0123")},
+        manufacturer="manufacturer",
+        model="model",
+    )
+    assert new_entry.id != entry.id
+
+
 async def test_removing_area_id(
     device_registry: dr.DeviceRegistry, mock_config_entry: MockConfigEntry
 ) -> None:
@@ -1834,6 +2399,7 @@ async def test_update(
     assert updated_entry == dr.DeviceEntry(
         area_id="12345A",
         config_entries={mock_config_entry.entry_id},
+        config_entries_subentries={mock_config_entry.entry_id: {None}},
         configuration_url="https://example.com/config",
         connections={("mac", "65:43:21:fe:dc:ba")},
         created_at=created_at,
@@ -2090,6 +2656,7 @@ async def test_update_remove_config_entries(
         "device_id": entry2.id,
         "changes": {
             "config_entries": {config_entry_1.entry_id},
+            "config_entries_subentries": {config_entry_1.entry_id: {None}},
         },
     }
     assert update_events[2].data == {
@@ -2100,7 +2667,11 @@ async def test_update_remove_config_entries(
         "action": "update",
         "device_id": entry.id,
         "changes": {
-            "config_entries": {config_entry_1.entry_id, config_entry_2.entry_id}
+            "config_entries": {config_entry_1.entry_id, config_entry_2.entry_id},
+            "config_entries_subentries": {
+                config_entry_1.entry_id: {None},
+                config_entry_2.entry_id: {None},
+            },
         },
     }
     assert update_events[4].data == {
@@ -2112,6 +2683,11 @@ async def test_update_remove_config_entries(
                 config_entry_2.entry_id,
                 config_entry_3.entry_id,
             },
+            "config_entries_subentries": {
+                config_entry_1.entry_id: {None},
+                config_entry_2.entry_id: {None},
+                config_entry_3.entry_id: {None},
+            },
             "primary_config_entry": config_entry_1.entry_id,
         },
     }
@@ -2119,7 +2695,11 @@ async def test_update_remove_config_entries(
         "action": "update",
         "device_id": entry2.id,
         "changes": {
-            "config_entries": {config_entry_2.entry_id, config_entry_3.entry_id}
+            "config_entries": {config_entry_2.entry_id, config_entry_3.entry_id},
+            "config_entries_subentries": {
+                config_entry_2.entry_id: {None},
+                config_entry_3.entry_id: {None},
+            },
         },
     }
     assert update_events[6].data == {
@@ -2128,6 +2708,282 @@ async def test_update_remove_config_entries(
     }
 
 
+async def test_update_remove_config_subentries(
+    hass: HomeAssistant, device_registry: dr.DeviceRegistry
+) -> None:
+    """Make sure we do not get duplicate entries."""
+    update_events = async_capture_events(hass, dr.EVENT_DEVICE_REGISTRY_UPDATED)
+    config_entry_1 = MockConfigEntry(
+        subentries_data=(
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-1-1",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-1-2",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+        )
+    )
+    config_entry_1.add_to_hass(hass)
+    config_entry_2 = MockConfigEntry(
+        subentries_data=(
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-2-1",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+        )
+    )
+    config_entry_2.add_to_hass(hass)
+    config_entry_3 = MockConfigEntry()
+    config_entry_3.add_to_hass(hass)
+
+    entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry_1.entry_id,
+        config_subentry_id="mock-subentry-id-1-1",
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+        identifiers={("bridgeid", "0123")},
+        manufacturer="manufacturer",
+        model="model",
+    )
+    entry_id = entry.id
+    assert entry.config_entries == {config_entry_1.entry_id}
+    assert entry.config_entries_subentries == {
+        config_entry_1.entry_id: {"mock-subentry-id-1-1"}
+    }
+
+    entry = device_registry.async_update_device(
+        entry_id,
+        add_config_entry_id=config_entry_1.entry_id,
+        add_config_subentry_id="mock-subentry-id-1-2",
+    )
+    assert entry.config_entries == {config_entry_1.entry_id}
+    assert entry.config_entries_subentries == {
+        config_entry_1.entry_id: {"mock-subentry-id-1-1", "mock-subentry-id-1-2"}
+    }
+
+    # Try adding the same subentry again
+    assert (
+        device_registry.async_update_device(
+            entry_id,
+            add_config_entry_id=config_entry_1.entry_id,
+            add_config_subentry_id="mock-subentry-id-1-2",
+        )
+        is entry
+    )
+
+    entry = device_registry.async_update_device(
+        entry_id,
+        add_config_entry_id=config_entry_2.entry_id,
+        add_config_subentry_id="mock-subentry-id-2-1",
+    )
+    assert entry.config_entries == {config_entry_1.entry_id, config_entry_2.entry_id}
+    assert entry.config_entries_subentries == {
+        config_entry_1.entry_id: {"mock-subentry-id-1-1", "mock-subentry-id-1-2"},
+        config_entry_2.entry_id: {"mock-subentry-id-2-1"},
+    }
+
+    entry = device_registry.async_update_device(
+        entry_id,
+        add_config_entry_id=config_entry_3.entry_id,
+        add_config_subentry_id=None,
+    )
+    assert entry.config_entries == {
+        config_entry_1.entry_id,
+        config_entry_2.entry_id,
+        config_entry_3.entry_id,
+    }
+    assert entry.config_entries_subentries == {
+        config_entry_1.entry_id: {"mock-subentry-id-1-1", "mock-subentry-id-1-2"},
+        config_entry_2.entry_id: {"mock-subentry-id-2-1"},
+        config_entry_3.entry_id: {None},
+    }
+
+    # Try to add a subentry without specifying entry
+    with pytest.raises(
+        HomeAssistantError,
+        match="Can't add config subentry without specifying config entry",
+    ):
+        device_registry.async_update_device(entry_id, add_config_subentry_id="blabla")
+
+    # Try to add an unknown subentry
+    with pytest.raises(
+        HomeAssistantError,
+        match=f"Config entry {config_entry_3.entry_id} has no subentry blabla",
+    ):
+        device_registry.async_update_device(
+            entry_id,
+            add_config_entry_id=config_entry_3.entry_id,
+            add_config_subentry_id="blabla",
+        )
+
+    # Try to remove a subentry without specifying entry
+    with pytest.raises(
+        HomeAssistantError,
+        match="Can't remove config subentry without specifying config entry",
+    ):
+        device_registry.async_update_device(
+            entry_id, remove_config_subentry_id="blabla"
+        )
+
+    assert len(device_registry.devices) == 1
+
+    entry = device_registry.async_update_device(
+        entry_id,
+        remove_config_entry_id=config_entry_1.entry_id,
+        remove_config_subentry_id="mock-subentry-id-1-1",
+    )
+    assert entry.config_entries == {
+        config_entry_1.entry_id,
+        config_entry_2.entry_id,
+        config_entry_3.entry_id,
+    }
+    assert entry.config_entries_subentries == {
+        config_entry_1.entry_id: {"mock-subentry-id-1-2"},
+        config_entry_2.entry_id: {"mock-subentry-id-2-1"},
+        config_entry_3.entry_id: {None},
+    }
+
+    # Try removing the same subentry again
+    assert (
+        device_registry.async_update_device(
+            entry_id,
+            remove_config_entry_id=config_entry_1.entry_id,
+            remove_config_subentry_id="mock-subentry-id-1-1",
+        )
+        is entry
+    )
+
+    entry = device_registry.async_update_device(
+        entry_id,
+        remove_config_entry_id=config_entry_1.entry_id,
+        remove_config_subentry_id="mock-subentry-id-1-2",
+    )
+    assert entry.config_entries == {config_entry_2.entry_id, config_entry_3.entry_id}
+    assert entry.config_entries_subentries == {
+        config_entry_2.entry_id: {"mock-subentry-id-2-1"},
+        config_entry_3.entry_id: {None},
+    }
+
+    entry = device_registry.async_update_device(
+        entry_id,
+        remove_config_entry_id=config_entry_2.entry_id,
+        remove_config_subentry_id="mock-subentry-id-2-1",
+    )
+    assert entry.config_entries == {config_entry_3.entry_id}
+    assert entry.config_entries_subentries == {
+        config_entry_3.entry_id: {None},
+    }
+
+    entry = device_registry.async_update_device(
+        entry_id,
+        remove_config_entry_id=config_entry_3.entry_id,
+        remove_config_subentry_id=None,
+    )
+    assert entry is None
+
+    await hass.async_block_till_done()
+
+    assert len(update_events) == 8
+    assert update_events[0].data == {
+        "action": "create",
+        "device_id": entry_id,
+    }
+    assert update_events[1].data == {
+        "action": "update",
+        "device_id": entry_id,
+        "changes": {
+            "config_entries_subentries": {
+                config_entry_1.entry_id: {"mock-subentry-id-1-1"}
+            },
+        },
+    }
+    assert update_events[2].data == {
+        "action": "update",
+        "device_id": entry_id,
+        "changes": {
+            "config_entries": {config_entry_1.entry_id},
+            "config_entries_subentries": {
+                config_entry_1.entry_id: {
+                    "mock-subentry-id-1-1",
+                    "mock-subentry-id-1-2",
+                }
+            },
+        },
+    }
+    assert update_events[3].data == {
+        "action": "update",
+        "device_id": entry_id,
+        "changes": {
+            "config_entries": {config_entry_1.entry_id, config_entry_2.entry_id},
+            "config_entries_subentries": {
+                config_entry_1.entry_id: {
+                    "mock-subentry-id-1-1",
+                    "mock-subentry-id-1-2",
+                },
+                config_entry_2.entry_id: {"mock-subentry-id-2-1"},
+            },
+        },
+    }
+    assert update_events[4].data == {
+        "action": "update",
+        "device_id": entry_id,
+        "changes": {
+            "config_entries_subentries": {
+                config_entry_1.entry_id: {
+                    "mock-subentry-id-1-1",
+                    "mock-subentry-id-1-2",
+                },
+                config_entry_2.entry_id: {"mock-subentry-id-2-1"},
+                config_entry_3.entry_id: {None},
+            },
+        },
+    }
+    assert update_events[5].data == {
+        "action": "update",
+        "device_id": entry_id,
+        "changes": {
+            "config_entries": {
+                config_entry_1.entry_id,
+                config_entry_2.entry_id,
+                config_entry_3.entry_id,
+            },
+            "config_entries_subentries": {
+                config_entry_1.entry_id: {
+                    "mock-subentry-id-1-2",
+                },
+                config_entry_2.entry_id: {"mock-subentry-id-2-1"},
+                config_entry_3.entry_id: {None},
+            },
+            "primary_config_entry": config_entry_1.entry_id,
+        },
+    }
+    assert update_events[6].data == {
+        "action": "update",
+        "device_id": entry_id,
+        "changes": {
+            "config_entries": {config_entry_2.entry_id, config_entry_3.entry_id},
+            "config_entries_subentries": {
+                config_entry_2.entry_id: {"mock-subentry-id-2-1"},
+                config_entry_3.entry_id: {None},
+            },
+        },
+    }
+    assert update_events[7].data == {
+        "action": "remove",
+        "device_id": entry_id,
+    }
+
+
 async def test_update_suggested_area(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
@@ -2542,6 +3398,7 @@ async def test_restore_shared_device(
         "device_id": entry.id,
         "changes": {
             "config_entries": {config_entry_1.entry_id},
+            "config_entries_subentries": {config_entry_1.entry_id: {None}},
             "identifiers": {("entry_123", "0123")},
         },
     }
@@ -2566,6 +3423,7 @@ async def test_restore_shared_device(
         "device_id": entry.id,
         "changes": {
             "config_entries": {config_entry_2.entry_id},
+            "config_entries_subentries": {config_entry_2.entry_id: {None}},
             "identifiers": {("entry_234", "2345")},
         },
     }
@@ -2871,6 +3729,7 @@ async def test_loading_invalid_configuration_url_from_storage(
                 {
                     "area_id": None,
                     "config_entries": ["1234"],
+                    "config_entries_subentries": {"1234": [None]},
                     "configuration_url": "invalid",
                     "connections": [],
                     "created_at": "2024-01-01T00:00:00+00:00",
@@ -3378,6 +4237,39 @@ async def test_device_registry_identifiers_collision(
     assert not device1_refetched.identifiers.isdisjoint(device3_refetched.identifiers)
 
 
+async def test_device_registry_deleted_device_collision(
+    hass: HomeAssistant, device_registry: dr.DeviceRegistry
+) -> None:
+    """Test update collisions with deleted devices in the device registry."""
+    config_entry = MockConfigEntry()
+    config_entry.add_to_hass(hass)
+
+    device1 = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "EE:EE:EE:EE:EE:EE")},
+        manufacturer="manufacturer",
+        model="model",
+    )
+    assert len(device_registry.deleted_devices) == 0
+
+    device_registry.async_remove_device(device1.id)
+    assert len(device_registry.deleted_devices) == 1
+
+    device2 = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        identifiers={("bridgeid", "0123")},
+        manufacturer="manufacturer",
+        model="model",
+    )
+    assert len(device_registry.deleted_devices) == 1
+
+    device_registry.async_update_device(
+        device2.id,
+        merge_connections={(dr.CONNECTION_NETWORK_MAC, "EE:EE:EE:EE:EE:EE")},
+    )
+    assert len(device_registry.deleted_devices) == 0
+
+
 async def test_primary_config_entry(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
diff --git a/tests/helpers/test_entity.py b/tests/helpers/test_entity.py
index 5e8c9fc88f7..6cf0e7c54d2 100644
--- a/tests/helpers/test_entity.py
+++ b/tests/helpers/test_entity.py
@@ -35,7 +35,7 @@ from homeassistant.core import (
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr, entity, entity_registry as er
 from homeassistant.helpers.entity_component import async_update_entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import UNDEFINED, UndefinedType
 
 from tests.common import (
@@ -986,7 +986,7 @@ async def _test_friendly_name(
     async def async_setup_entry(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setup entry method."""
         async_add_entities([ent])
@@ -1314,7 +1314,7 @@ async def test_entity_name_translation_placeholder_errors(
     async def async_setup_entry(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setup entry method."""
         async_add_entities([ent])
@@ -1542,7 +1542,7 @@ async def test_friendly_name_updated(
     async def async_setup_entry(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setup entry method."""
         async_add_entities(
diff --git a/tests/helpers/test_entity_platform.py b/tests/helpers/test_entity_platform.py
index eb076eb9f25..41b7271150a 100644
--- a/tests/helpers/test_entity_platform.py
+++ b/tests/helpers/test_entity_platform.py
@@ -11,7 +11,7 @@ import pytest
 from syrupy.assertion import SnapshotAssertion
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.config_entries import ConfigEntry, ConfigSubentryData
 from homeassistant.const import EVENT_HOMEASSISTANT_STARTED, PERCENTAGE, EntityCategory
 from homeassistant.core import (
     CoreState,
@@ -36,7 +36,10 @@ from homeassistant.helpers.entity_component import (
     DEFAULT_SCAN_INTERVAL,
     EntityComponent,
 )
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util
 
@@ -223,7 +226,7 @@ async def test_set_scan_interval_via_platform(hass: HomeAssistant) -> None:
     def platform_setup(
         hass: HomeAssistant,
         config: ConfigType,
-        add_entities: entity_platform.AddEntitiesCallback,
+        add_entities: AddEntitiesCallback,
         discovery_info: DiscoveryInfoType | None = None,
     ) -> None:
         """Test the platform setup."""
@@ -862,13 +865,28 @@ async def test_setup_entry(
     async def async_setup_entry(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setup entry method."""
-        async_add_entities([MockEntity(name="test1", unique_id="unique")])
+        async_add_entities([MockEntity(name="test1", unique_id="unique1")])
+        async_add_entities(
+            [MockEntity(name="test2", unique_id="unique2")],
+            config_subentry_id="mock-subentry-id-1",
+        )
 
     platform = MockPlatform(async_setup_entry=async_setup_entry)
-    config_entry = MockConfigEntry(entry_id="super-mock-id")
+    config_entry = MockConfigEntry(
+        entry_id="super-mock-id",
+        subentries_data=(
+            ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-1",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+        ),
+    )
     config_entry.add_to_hass(hass)
     entity_platform = MockEntityPlatform(
         hass, platform_name=config_entry.domain, platform=platform
@@ -878,11 +896,16 @@ async def test_setup_entry(
     await hass.async_block_till_done()
     full_name = f"{config_entry.domain}.{entity_platform.domain}"
     assert full_name in hass.config.components
-    assert len(hass.states.async_entity_ids()) == 1
-    assert len(entity_registry.entities) == 1
+    assert len(hass.states.async_entity_ids()) == 2
+    assert len(entity_registry.entities) == 2
 
     entity_registry_entry = entity_registry.entities["test_domain.test1"]
     assert entity_registry_entry.config_entry_id == "super-mock-id"
+    assert entity_registry_entry.config_subentry_id is None
+
+    entity_registry_entry = entity_registry.entities["test_domain.test2"]
+    assert entity_registry_entry.config_entry_id == "super-mock-id"
+    assert entity_registry_entry.config_subentry_id == "mock-subentry-id-1"
 
 
 async def test_setup_entry_platform_not_ready(
@@ -1138,7 +1161,18 @@ async def test_device_info_called(
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test device info is forwarded correctly."""
-    config_entry = MockConfigEntry(entry_id="super-mock-id")
+    config_entry = MockConfigEntry(
+        entry_id="super-mock-id",
+        subentries_data=(
+            ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-1",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+        ),
+    )
     config_entry.add_to_hass(hass)
     via = device_registry.async_get_or_create(
         config_entry_id=config_entry.entry_id,
@@ -1151,7 +1185,7 @@ async def test_device_info_called(
     async def async_setup_entry(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setup entry method."""
         async_add_entities(
@@ -1177,6 +1211,28 @@ async def test_device_info_called(
                 ),
             ]
         )
+        async_add_entities(
+            [
+                # Valid device info
+                MockEntity(
+                    unique_id="efgh",
+                    device_info={
+                        "identifiers": {("hue", "efgh")},
+                        "configuration_url": "http://192.168.0.100/config",
+                        "connections": {(dr.CONNECTION_NETWORK_MAC, "efgh")},
+                        "manufacturer": "test-manuf",
+                        "model": "test-model",
+                        "name": "test-name",
+                        "sw_version": "test-sw",
+                        "hw_version": "test-hw",
+                        "suggested_area": "Heliport",
+                        "entry_type": dr.DeviceEntryType.SERVICE,
+                        "via_device": ("hue", "via-id"),
+                    },
+                ),
+            ],
+            config_subentry_id="mock-subentry-id-1",
+        )
 
     platform = MockPlatform(async_setup_entry=async_setup_entry)
     entity_platform = MockEntityPlatform(
@@ -1186,11 +1242,20 @@ async def test_device_info_called(
     assert await entity_platform.async_setup_entry(config_entry)
     await hass.async_block_till_done()
 
-    assert len(hass.states.async_entity_ids()) == 2
+    assert len(hass.states.async_entity_ids()) == 3
 
     device = device_registry.async_get_device(identifiers={("hue", "1234")})
     assert device == snapshot
     assert device.config_entries == {config_entry.entry_id}
+    assert device.config_entries_subentries == {config_entry.entry_id: {None}}
+    assert device.primary_config_entry == config_entry.entry_id
+    assert device.via_device_id == via.id
+    device = device_registry.async_get_device(identifiers={("hue", "efgh")})
+    assert device == snapshot
+    assert device.config_entries == {config_entry.entry_id}
+    assert device.config_entries_subentries == {
+        config_entry.entry_id: {"mock-subentry-id-1"}
+    }
     assert device.primary_config_entry == config_entry.entry_id
     assert device.via_device_id == via.id
 
@@ -1214,7 +1279,7 @@ async def test_device_info_not_overrides(
     async def async_setup_entry(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setup entry method."""
         async_add_entities(
@@ -1267,7 +1332,7 @@ async def test_device_info_homeassistant_url(
     async def async_setup_entry(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setup entry method."""
         async_add_entities(
@@ -1319,7 +1384,7 @@ async def test_device_info_change_to_no_url(
     async def async_setup_entry(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setup entry method."""
         async_add_entities(
@@ -1391,7 +1456,7 @@ async def test_entity_disabled_by_device(
     async def async_setup_entry(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setup entry method."""
         async_add_entities([entity_disabled])
@@ -1877,7 +1942,7 @@ async def test_setup_entry_with_entities_that_block_forever(
     async def async_setup_entry(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setup entry method."""
         async_add_entities(
@@ -1926,7 +1991,7 @@ async def test_cancellation_is_not_blocked(
     async def async_setup_entry(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setup entry method."""
         async_add_entities(
@@ -2024,7 +2089,7 @@ async def test_entity_name_influences_entity_id(
     async def async_setup_entry(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setup entry method."""
         async_add_entities(
@@ -2112,7 +2177,7 @@ async def test_translated_entity_name_influences_entity_id(
     async def async_setup_entry(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setup entry method."""
         async_add_entities(
@@ -2200,7 +2265,7 @@ async def test_translated_device_class_name_influences_entity_id(
     async def async_setup_entry(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setup entry method."""
         async_add_entities([TranslatedDeviceClassEntity(device_class, has_entity_name)])
@@ -2262,7 +2327,7 @@ async def test_device_name_defaulting_config_entry(
     async def async_setup_entry(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setup entry method."""
         async_add_entities([DeviceNameEntity()])
@@ -2318,7 +2383,7 @@ async def test_device_type_error_checking(
     async def async_setup_entry(
         hass: HomeAssistant,
         config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setup entry method."""
         async_add_entities([DeviceNameEntity()])
@@ -2337,3 +2402,41 @@ async def test_device_type_error_checking(
     assert len(device_registry.devices) == 0
     assert len(entity_registry.entities) == number_of_entities
     assert len(hass.states.async_all()) == number_of_entities
+
+
+async def test_add_entity_unknown_subentry(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test adding an entity to an unknown subentry."""
+
+    async def async_setup_entry(
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        async_add_entities: AddConfigEntryEntitiesCallback,
+    ) -> None:
+        """Mock setup entry method."""
+        async_add_entities(
+            [MockEntity(name="test", unique_id="unique")],
+            config_subentry_id="unknown-subentry",
+        )
+
+    platform = MockPlatform(async_setup_entry=async_setup_entry)
+    config_entry = MockConfigEntry(entry_id="super-mock-id")
+    config_entry.add_to_hass(hass)
+    entity_platform = MockEntityPlatform(
+        hass, platform_name=config_entry.domain, platform=platform
+    )
+
+    assert not await entity_platform.async_setup_entry(config_entry)
+    await hass.async_block_till_done()
+    full_name = f"{config_entry.domain}.{entity_platform.domain}"
+    assert full_name not in hass.config.components
+    assert len(hass.states.async_entity_ids()) == 0
+    assert len(entity_registry.entities) == 0
+
+    assert (
+        "Can't add entities to unknown subentry unknown-subentry "
+        "of config entry super-mock-id"
+    ) in caplog.text
diff --git a/tests/helpers/test_entity_registry.py b/tests/helpers/test_entity_registry.py
index 19289b09f95..416f2d5121d 100644
--- a/tests/helpers/test_entity_registry.py
+++ b/tests/helpers/test_entity_registry.py
@@ -78,7 +78,19 @@ def test_get_or_create_updates_data(
     freezer: FrozenDateTimeFactory,
 ) -> None:
     """Test that we update data in get_or_create."""
-    orig_config_entry = MockConfigEntry(domain="light")
+    config_subentry_id = "blabla"
+    orig_config_entry = MockConfigEntry(
+        domain="light",
+        subentries_data=[
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id=config_subentry_id,
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            )
+        ],
+    )
     orig_config_entry.add_to_hass(hass)
     orig_device_entry = device_registry.async_get_or_create(
         config_entry_id=orig_config_entry.entry_id,
@@ -93,6 +105,7 @@ def test_get_or_create_updates_data(
         "5678",
         capabilities={"max": 100},
         config_entry=orig_config_entry,
+        config_subentry_id=config_subentry_id,
         device_id=orig_device_entry.id,
         disabled_by=er.RegistryEntryDisabler.HASS,
         entity_category=EntityCategory.CONFIG,
@@ -114,6 +127,7 @@ def test_get_or_create_updates_data(
         "hue",
         capabilities={"max": 100},
         config_entry_id=orig_config_entry.entry_id,
+        config_subentry_id=config_subentry_id,
         created_at=created,
         device_class=None,
         device_id=orig_device_entry.id,
@@ -148,6 +162,7 @@ def test_get_or_create_updates_data(
         "5678",
         capabilities={"new-max": 150},
         config_entry=new_config_entry,
+        config_subentry_id=None,
         device_id=new_device_entry.id,
         disabled_by=er.RegistryEntryDisabler.USER,
         entity_category=EntityCategory.DIAGNOSTIC,
@@ -169,6 +184,7 @@ def test_get_or_create_updates_data(
         area_id=None,
         capabilities={"new-max": 150},
         config_entry_id=new_config_entry.entry_id,
+        config_subentry_id=None,
         created_at=created,
         device_class=None,
         device_id=new_device_entry.id,
@@ -496,6 +512,7 @@ async def test_load_bad_data(
                     "capabilities": None,
                     "categories": {},
                     "config_entry_id": None,
+                    "config_subentry_id": None,
                     "created_at": "2024-02-14T12:00:00.900075+00:00",
                     "device_class": None,
                     "device_id": None,
@@ -526,6 +543,7 @@ async def test_load_bad_data(
                     "capabilities": None,
                     "categories": {},
                     "config_entry_id": None,
+                    "config_subentry_id": None,
                     "created_at": "2024-02-14T12:00:00.900075+00:00",
                     "device_class": None,
                     "device_id": None,
@@ -554,6 +572,7 @@ async def test_load_bad_data(
             "deleted_entities": [
                 {
                     "config_entry_id": None,
+                    "config_subentry_id": None,
                     "created_at": "2024-02-14T12:00:00.900075+00:00",
                     "entity_id": "test.test3",
                     "id": "00003",
@@ -564,6 +583,7 @@ async def test_load_bad_data(
                 },
                 {
                     "config_entry_id": None,
+                    "config_subentry_id": None,
                     "created_at": "2024-02-14T12:00:00.900075+00:00",
                     "entity_id": "test.test4",
                     "id": "00004",
@@ -711,6 +731,118 @@ async def test_deleted_entity_removing_config_entry_id(
     assert entity_registry.deleted_entities[("light", "hue", "1234")] == deleted_entry2
 
 
+async def test_removing_config_subentry_id(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test that we update config subentry id in registry."""
+    update_events = async_capture_events(hass, er.EVENT_ENTITY_REGISTRY_UPDATED)
+    mock_config = MockConfigEntry(
+        domain="light",
+        entry_id="mock-id-1",
+        subentries_data=[
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-1",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            )
+        ],
+    )
+    mock_config.add_to_hass(hass)
+
+    entry = entity_registry.async_get_or_create(
+        "light",
+        "hue",
+        "5678",
+        config_entry=mock_config,
+        config_subentry_id="mock-subentry-id-1",
+    )
+    assert entry.config_subentry_id == "mock-subentry-id-1"
+    hass.config_entries.async_remove_subentry(mock_config, "mock-subentry-id-1")
+
+    assert not entity_registry.entities
+
+    await hass.async_block_till_done()
+
+    assert len(update_events) == 2
+    assert update_events[0].data == {
+        "action": "create",
+        "entity_id": entry.entity_id,
+    }
+    assert update_events[1].data == {
+        "action": "remove",
+        "entity_id": entry.entity_id,
+    }
+
+
+async def test_deleted_entity_removing_config_subentry_id(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that we update config subentry id in registry on deleted entity."""
+    mock_config = MockConfigEntry(
+        domain="light",
+        entry_id="mock-id-1",
+        subentries_data=[
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-1",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-2",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+        ],
+    )
+    mock_config.add_to_hass(hass)
+
+    entry1 = entity_registry.async_get_or_create(
+        "light",
+        "hue",
+        "5678",
+        config_entry=mock_config,
+        config_subentry_id="mock-subentry-id-1",
+    )
+    assert entry1.config_subentry_id == "mock-subentry-id-1"
+    entry2 = entity_registry.async_get_or_create(
+        "light",
+        "hue",
+        "1234",
+        config_entry=mock_config,
+        config_subentry_id="mock-subentry-id-2",
+    )
+    assert entry2.config_subentry_id == "mock-subentry-id-2"
+    entity_registry.async_remove(entry1.entity_id)
+    entity_registry.async_remove(entry2.entity_id)
+
+    assert len(entity_registry.entities) == 0
+    assert len(entity_registry.deleted_entities) == 2
+    deleted_entry1 = entity_registry.deleted_entities[("light", "hue", "5678")]
+    assert deleted_entry1.config_entry_id == "mock-id-1"
+    assert deleted_entry1.config_subentry_id == "mock-subentry-id-1"
+    assert deleted_entry1.orphaned_timestamp is None
+    deleted_entry2 = entity_registry.deleted_entities[("light", "hue", "1234")]
+    assert deleted_entry2.config_entry_id == "mock-id-1"
+    assert deleted_entry2.config_subentry_id == "mock-subentry-id-2"
+    assert deleted_entry2.orphaned_timestamp is None
+
+    hass.config_entries.async_remove_subentry(mock_config, "mock-subentry-id-1")
+    assert len(entity_registry.entities) == 0
+    assert len(entity_registry.deleted_entities) == 2
+    deleted_entry1 = entity_registry.deleted_entities[("light", "hue", "5678")]
+    assert deleted_entry1.config_entry_id is None
+    assert deleted_entry1.config_subentry_id is None
+    assert deleted_entry1.orphaned_timestamp is not None
+    assert entity_registry.deleted_entities[("light", "hue", "1234")] == deleted_entry2
+
+
 async def test_removing_area_id(entity_registry: er.EntityRegistry) -> None:
     """Make sure we can clear area id."""
     entry = entity_registry.async_get_or_create("light", "hue", "5678")
@@ -766,6 +898,7 @@ async def test_migration_1_1(hass: HomeAssistant, hass_storage: dict[str, Any])
                     "capabilities": {},
                     "categories": {},
                     "config_entry_id": None,
+                    "config_subentry_id": None,
                     "created_at": "1970-01-01T00:00:00+00:00",
                     "device_id": None,
                     "disabled_by": None,
@@ -944,6 +1077,7 @@ async def test_migration_1_11(
                     "capabilities": {},
                     "categories": {},
                     "config_entry_id": None,
+                    "config_subentry_id": None,
                     "created_at": "1970-01-01T00:00:00+00:00",
                     "device_id": None,
                     "disabled_by": None,
@@ -972,6 +1106,7 @@ async def test_migration_1_11(
             "deleted_entities": [
                 {
                     "config_entry_id": None,
+                    "config_subentry_id": None,
                     "created_at": "1970-01-01T00:00:00+00:00",
                     "entity_id": "test.deleted_entity",
                     "id": "23456",
@@ -1431,7 +1566,7 @@ async def test_remove_config_entry_from_device_removes_entities_2(
         config_entry_2.entry_id,
     }
 
-    # Create one entity for each config entry
+    # Create an entity without config entry
     entry_1 = entity_registry.async_get_or_create(
         "light",
         "hue",
@@ -1451,6 +1586,208 @@ async def test_remove_config_entry_from_device_removes_entities_2(
     assert entity_registry.async_is_registered(entry_1.entity_id)
 
 
+async def test_remove_config_subentry_from_device_removes_entities(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that we remove entities tied to a device when config subentry is removed."""
+    config_entry_1 = MockConfigEntry(
+        domain="hue",
+        subentries_data=[
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-1",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-2",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+        ],
+    )
+    config_entry_1.add_to_hass(hass)
+
+    # Create device with three config subentries
+    device_registry.async_get_or_create(
+        config_entry_id=config_entry_1.entry_id,
+        config_subentry_id="mock-subentry-id-1",
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    device_registry.async_get_or_create(
+        config_entry_id=config_entry_1.entry_id,
+        config_subentry_id="mock-subentry-id-2",
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry_1.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    assert device_entry.config_entries == {config_entry_1.entry_id}
+    assert device_entry.config_entries_subentries == {
+        config_entry_1.entry_id: {None, "mock-subentry-id-1", "mock-subentry-id-2"},
+    }
+
+    # Create one entity entry for each config entry or subentry
+    entry_1 = entity_registry.async_get_or_create(
+        "light",
+        "hue",
+        "1234",
+        config_entry=config_entry_1,
+        config_subentry_id="mock-subentry-id-1",
+        device_id=device_entry.id,
+    )
+
+    entry_2 = entity_registry.async_get_or_create(
+        "light",
+        "hue",
+        "5678",
+        config_entry=config_entry_1,
+        config_subentry_id="mock-subentry-id-2",
+        device_id=device_entry.id,
+    )
+
+    entry_3 = entity_registry.async_get_or_create(
+        "sensor",
+        "device_tracker",
+        "6789",
+        config_entry=config_entry_1,
+        config_subentry_id=None,
+        device_id=device_entry.id,
+    )
+
+    assert entity_registry.async_is_registered(entry_1.entity_id)
+    assert entity_registry.async_is_registered(entry_2.entity_id)
+    assert entity_registry.async_is_registered(entry_3.entity_id)
+
+    # Remove the first config subentry from the device, the entity associated with it
+    # should be removed
+    device_registry.async_update_device(
+        device_entry.id,
+        remove_config_entry_id=config_entry_1.entry_id,
+        remove_config_subentry_id="mock-subentry-id-1",
+    )
+    await hass.async_block_till_done()
+
+    assert device_registry.async_get(device_entry.id)
+    assert not entity_registry.async_is_registered(entry_1.entity_id)
+    assert entity_registry.async_is_registered(entry_2.entity_id)
+    assert entity_registry.async_is_registered(entry_3.entity_id)
+
+    # Remove the second config subentry from the device, the entity associated with it
+    # should be removed
+    device_registry.async_update_device(
+        device_entry.id,
+        remove_config_entry_id=config_entry_1.entry_id,
+        remove_config_subentry_id=None,
+    )
+    await hass.async_block_till_done()
+
+    assert device_registry.async_get(device_entry.id)
+    assert not entity_registry.async_is_registered(entry_1.entity_id)
+    assert entity_registry.async_is_registered(entry_2.entity_id)
+    assert not entity_registry.async_is_registered(entry_3.entity_id)
+
+    # Remove the third config subentry from the device, the entity associated with it
+    # (and the device itself) should be removed
+    device_registry.async_update_device(
+        device_entry.id,
+        remove_config_entry_id=config_entry_1.entry_id,
+        remove_config_subentry_id="mock-subentry-id-2",
+    )
+    await hass.async_block_till_done()
+
+    assert not device_registry.async_get(device_entry.id)
+    assert not entity_registry.async_is_registered(entry_1.entity_id)
+    assert not entity_registry.async_is_registered(entry_2.entity_id)
+    assert not entity_registry.async_is_registered(entry_3.entity_id)
+
+
+async def test_remove_config_subentry_from_device_removes_entities_2(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that we don't remove entities with no config entry when device is modified."""
+    config_entry_1 = MockConfigEntry(
+        domain="hue",
+        subentries_data=[
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-1",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-2",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+        ],
+    )
+    config_entry_1.add_to_hass(hass)
+
+    # Create device with three config subentries
+    device_registry.async_get_or_create(
+        config_entry_id=config_entry_1.entry_id,
+        config_subentry_id="mock-subentry-id-1",
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    device_registry.async_get_or_create(
+        config_entry_id=config_entry_1.entry_id,
+        config_subentry_id="mock-subentry-id-2",
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry_1.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    assert device_entry.config_entries == {config_entry_1.entry_id}
+    assert device_entry.config_entries_subentries == {
+        config_entry_1.entry_id: {None, "mock-subentry-id-1", "mock-subentry-id-2"},
+    }
+
+    # Create an entity without config entry or subentry
+    entry_1 = entity_registry.async_get_or_create(
+        "light",
+        "hue",
+        "5678",
+        device_id=device_entry.id,
+    )
+
+    assert entity_registry.async_is_registered(entry_1.entity_id)
+
+    # Remove the first config subentry from the device
+    device_registry.async_update_device(
+        device_entry.id,
+        remove_config_entry_id=config_entry_1.entry_id,
+        remove_config_subentry_id=None,
+    )
+    await hass.async_block_till_done()
+
+    assert device_registry.async_get(device_entry.id)
+    assert entity_registry.async_is_registered(entry_1.entity_id)
+
+    # Remove the second config subentry from the device
+    device_registry.async_update_device(
+        device_entry.id,
+        remove_config_entry_id=config_entry_1.entry_id,
+        remove_config_subentry_id="mock-subentry-id-1",
+    )
+    await hass.async_block_till_done()
+
+    assert device_registry.async_get(device_entry.id)
+    assert entity_registry.async_is_registered(entry_1.entity_id)
+
+
 async def test_update_device_race(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
@@ -1881,11 +2218,45 @@ async def test_unique_id_non_string(
     )
 
 
+@pytest.mark.parametrize(
+    ("create_kwargs", "migrate_kwargs", "new_subentry_id"),
+    [
+        ({}, {}, None),
+        ({"config_subentry_id": None}, {}, None),
+        ({}, {"new_config_subentry_id": None}, None),
+        ({}, {"new_config_subentry_id": "mock-subentry-id-2"}, "mock-subentry-id-2"),
+        (
+            {"config_subentry_id": "mock-subentry-id-1"},
+            {"new_config_subentry_id": None},
+            None,
+        ),
+        (
+            {"config_subentry_id": "mock-subentry-id-1"},
+            {"new_config_subentry_id": "mock-subentry-id-2"},
+            "mock-subentry-id-2",
+        ),
+    ],
+)
 def test_migrate_entity_to_new_platform(
-    hass: HomeAssistant, entity_registry: er.EntityRegistry
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    create_kwargs: dict,
+    migrate_kwargs: dict,
+    new_subentry_id: str | None,
 ) -> None:
     """Test migrate_entity_to_new_platform."""
-    orig_config_entry = MockConfigEntry(domain="light")
+    orig_config_entry = MockConfigEntry(
+        domain="light",
+        subentries_data=[
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-1",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+        ],
+    )
     orig_config_entry.add_to_hass(hass)
     orig_unique_id = "5678"
 
@@ -1900,6 +2271,7 @@ def test_migrate_entity_to_new_platform(
         original_device_class="mock-device-class",
         original_icon="initial-original_icon",
         original_name="initial-original_name",
+        **create_kwargs,
     )
     assert entity_registry.async_get("light.light") is orig_entry
     entity_registry.async_update_entity(
@@ -1908,7 +2280,18 @@ def test_migrate_entity_to_new_platform(
         icon="new_icon",
     )
 
-    new_config_entry = MockConfigEntry(domain="light")
+    new_config_entry = MockConfigEntry(
+        domain="light",
+        subentries_data=[
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-2",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+        ],
+    )
     new_config_entry.add_to_hass(hass)
     new_unique_id = "1234"
 
@@ -1917,6 +2300,7 @@ def test_migrate_entity_to_new_platform(
         "hue2",
         new_unique_id=new_unique_id,
         new_config_entry_id=new_config_entry.entry_id,
+        **migrate_kwargs,
     )
 
     assert not entity_registry.async_get_entity_id("light", "hue", orig_unique_id)
@@ -1924,6 +2308,7 @@ def test_migrate_entity_to_new_platform(
     assert (new_entry := entity_registry.async_get("light.light")) is not orig_entry
 
     assert new_entry.config_entry_id == new_config_entry.entry_id
+    assert new_entry.config_subentry_id == new_subentry_id
     assert new_entry.unique_id == new_unique_id
     assert new_entry.name == "new_name"
     assert new_entry.icon == "new_icon"
@@ -1956,6 +2341,99 @@ def test_migrate_entity_to_new_platform(
         )
 
 
+def test_migrate_entity_to_new_platform_error_handling(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test migrate_entity_to_new_platform."""
+    orig_config_entry = MockConfigEntry(
+        domain="light",
+        subentries_data=[
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-1",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+        ],
+    )
+    orig_config_entry.add_to_hass(hass)
+    orig_unique_id = "5678"
+
+    orig_entry = entity_registry.async_get_or_create(
+        "light",
+        "hue",
+        orig_unique_id,
+        suggested_object_id="light",
+        config_entry=orig_config_entry,
+        config_subentry_id="mock-subentry-id-1",
+        disabled_by=er.RegistryEntryDisabler.USER,
+        entity_category=EntityCategory.CONFIG,
+        original_device_class="mock-device-class",
+        original_icon="initial-original_icon",
+        original_name="initial-original_name",
+    )
+    assert entity_registry.async_get("light.light") is orig_entry
+
+    new_config_entry = MockConfigEntry(
+        domain="light",
+        subentries_data=[
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-2",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+        ],
+    )
+    new_config_entry.add_to_hass(hass)
+    new_unique_id = "1234"
+
+    # Test migrating nonexisting entity
+    with pytest.raises(KeyError, match="'light.not_a_real_light'"):
+        entity_registry.async_update_entity_platform(
+            "light.not_a_real_light",
+            "hue2",
+            new_unique_id=new_unique_id,
+            new_config_entry_id=new_config_entry.entry_id,
+        )
+
+    # Test migrate entity without new config entry ID
+    with pytest.raises(
+        ValueError,
+        match="new_config_entry_id required because light.light is already linked to a config entry",
+    ):
+        entity_registry.async_update_entity_platform(
+            "light.light",
+            "hue3",
+        )
+
+    # Test migrate entity without new config subentry ID
+    with pytest.raises(
+        ValueError,
+        match="Can't change config entry without changing subentry",
+    ):
+        entity_registry.async_update_entity_platform(
+            "light.light",
+            "hue3",
+            new_config_entry_id=new_config_entry.entry_id,
+        )
+
+    # Test entity with a state
+    hass.states.async_set("light.light", "on")
+    with pytest.raises(
+        ValueError, match="Only entities that haven't been loaded can be migrated"
+    ):
+        entity_registry.async_update_entity_platform(
+            "light.light",
+            "hue2",
+            new_unique_id=new_unique_id,
+            new_config_entry_id=new_config_entry.entry_id,
+        )
+
+
 async def test_restore_entity(
     hass: HomeAssistant,
     entity_registry: er.EntityRegistry,
@@ -1963,13 +2441,28 @@ async def test_restore_entity(
 ) -> None:
     """Make sure entity registry id is stable and entity_id is reused if possible."""
     update_events = async_capture_events(hass, er.EVENT_ENTITY_REGISTRY_UPDATED)
-    config_entry = MockConfigEntry(domain="light")
+    config_entry = MockConfigEntry(
+        domain="light",
+        subentries_data=[
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-1-1",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+        ],
+    )
     config_entry.add_to_hass(hass)
     entry1 = entity_registry.async_get_or_create(
         "light", "hue", "1234", config_entry=config_entry
     )
     entry2 = entity_registry.async_get_or_create(
-        "light", "hue", "5678", config_entry=config_entry
+        "light",
+        "hue",
+        "5678",
+        config_entry=config_entry,
+        config_subentry_id="mock-subentry-id-1-1",
     )
 
     entry1 = entity_registry.async_update_entity(
@@ -1993,8 +2486,11 @@ async def test_restore_entity(
     # entity_id is not restored
     assert attr.evolve(entry1, entity_id="light.hue_1234") == entry1_restored
     assert entry2 != entry2_restored
-    # Config entry is not restored
-    assert attr.evolve(entry2, config_entry_id=None) == entry2_restored
+    # Config entry and subentry are not restored
+    assert (
+        attr.evolve(entry2, config_entry_id=None, config_subentry_id=None)
+        == entry2_restored
+    )
 
     # Remove two of the entities again, then bump time
     entity_registry.async_remove(entry1_restored.entity_id)
@@ -2305,3 +2801,132 @@ async def test_async_remove_thread_safety(
         match="Detected code that calls entity_registry.async_remove from a thread.",
     ):
         await hass.async_add_executor_job(entity_registry.async_remove, entry.entity_id)
+
+
+async def test_subentry(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test subentry error handling."""
+    entry1 = MockConfigEntry(
+        domain="light",
+        entry_id="mock-id-1",
+        subentries_data=[
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-1-1",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-1-2",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            ),
+        ],
+    )
+    entry1.add_to_hass(hass)
+    entry2 = MockConfigEntry(
+        domain="light",
+        entry_id="mock-id-2",
+        subentries_data=[
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="mock-subentry-id-2-1",
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            )
+        ],
+    )
+    entry2.add_to_hass(hass)
+
+    with pytest.raises(
+        ValueError, match="Config entry mock-id-1 has no subentry bad-subentry-id"
+    ):
+        entry = entity_registry.async_get_or_create(
+            "light",
+            "hue",
+            "5678",
+            config_entry=entry1,
+            config_subentry_id="bad-subentry-id",
+        )
+
+    entry = entity_registry.async_get_or_create(
+        "light",
+        "hue",
+        "5678",
+        config_entry=entry1,
+        config_subentry_id="mock-subentry-id-1-1",
+    )
+    assert entry.config_subentry_id == "mock-subentry-id-1-1"
+
+    # Try updating subentry
+    with pytest.raises(
+        ValueError, match="Config entry mock-id-1 has no subentry bad-subentry-id"
+    ):
+        entry = entity_registry.async_get_or_create(
+            "light",
+            "hue",
+            "5678",
+            config_entry=entry1,
+            config_subentry_id="bad-subentry-id",
+        )
+
+    entry = entity_registry.async_get_or_create(
+        "light",
+        "hue",
+        "5678",
+        config_entry=entry1,
+        config_subentry_id="mock-subentry-id-1-2",
+    )
+    assert entry.config_subentry_id == "mock-subentry-id-1-2"
+
+    with pytest.raises(
+        ValueError, match="Can't change config entry without changing subentry"
+    ):
+        entry = entity_registry.async_get_or_create(
+            "light",
+            "hue",
+            "5678",
+            config_entry=entry2,
+        )
+
+    with pytest.raises(
+        ValueError, match="Config entry mock-id-2 has no subentry mock-subentry-id-1-2"
+    ):
+        entry = entity_registry.async_get_or_create(
+            "light",
+            "hue",
+            "5678",
+            config_entry=entry2,
+            config_subentry_id="mock-subentry-id-1-2",
+        )
+
+    entry = entity_registry.async_get_or_create(
+        "light",
+        "hue",
+        "5678",
+        config_entry=entry2,
+        config_subentry_id="mock-subentry-id-2-1",
+    )
+    assert entry.config_subentry_id == "mock-subentry-id-2-1"
+
+    entry = entity_registry.async_get_or_create(
+        "light",
+        "hue",
+        "5678",
+        config_entry=entry1,
+        config_subentry_id=None,
+    )
+    assert entry.config_subentry_id is None
+
+    entry = entity_registry.async_update_entity(
+        entry.entity_id,
+        config_entry_id=entry2.entry_id,
+        config_subentry_id="mock-subentry-id-2-1",
+    )
+    assert entry.config_subentry_id == "mock-subentry-id-2-1"
diff --git a/tests/helpers/test_floor_registry.py b/tests/helpers/test_floor_registry.py
index 6a672399522..5ebd63ae302 100644
--- a/tests/helpers/test_floor_registry.py
+++ b/tests/helpers/test_floor_registry.py
@@ -327,7 +327,7 @@ async def test_loading_floors_from_storage(
     assert len(registry.floors) == 1
 
 
-async def test_getting_floor(floor_registry: fr.FloorRegistry) -> None:
+async def test_getting_floor_by_name(floor_registry: fr.FloorRegistry) -> None:
     """Make sure we can get the floors by name."""
     floor = floor_registry.async_create("First floor")
     floor2 = floor_registry.async_get_floor_by_name("first floor")
@@ -341,6 +341,27 @@ async def test_getting_floor(floor_registry: fr.FloorRegistry) -> None:
     assert get_floor == floor
 
 
+async def test_async_get_floors_by_alias(
+    floor_registry: fr.FloorRegistry,
+) -> None:
+    """Make sure we can get the floors by alias."""
+    floor1 = floor_registry.async_create("First floor", aliases=("alias_1", "alias_2"))
+    floor2 = floor_registry.async_create("Second floor", aliases=("alias_1", "alias_3"))
+
+    alias1_list = floor_registry.async_get_floors_by_alias("A l i a s_1")
+    alias2_list = floor_registry.async_get_floors_by_alias("A l i a s_2")
+    alias3_list = floor_registry.async_get_floors_by_alias("A l i a s_3")
+
+    assert len(alias1_list) == 2
+    assert len(alias2_list) == 1
+    assert len(alias3_list) == 1
+
+    assert floor1 in alias1_list
+    assert floor1 in alias2_list
+    assert floor2 in alias1_list
+    assert floor2 in alias3_list
+
+
 async def test_async_get_floor_by_name_not_found(
     floor_registry: fr.FloorRegistry,
 ) -> None:
diff --git a/tests/helpers/test_frame.py b/tests/helpers/test_frame.py
index fb98111fd42..e99db76dcbc 100644
--- a/tests/helpers/test_frame.py
+++ b/tests/helpers/test_frame.py
@@ -1,15 +1,17 @@
 """Test the frame helper."""
 
+from contextlib import AbstractContextManager, nullcontext as does_not_raise
 from typing import Any
 from unittest.mock import ANY, Mock, patch
 
 import pytest
+from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import frame
 from homeassistant.loader import async_get_integration
 
-from tests.common import extract_stack_to_frame
+from tests.common import MockModule, extract_stack_to_frame, mock_integration
 
 
 async def test_extract_frame_integration(
@@ -21,7 +23,7 @@ async def test_extract_frame_integration(
         custom_integration=False,
         frame=mock_integration_frame,
         integration="hue",
-        module=None,
+        module="homeassistant.components.hue.light",
         relative_filename="homeassistant/components/hue/light.py",
     )
 
@@ -34,8 +36,8 @@ async def test_get_integration_logger(
     assert logger.name == "homeassistant.components.hue"
 
 
-@pytest.mark.usefixtures("enable_custom_integrations")
-async def test_extract_frame_resolve_module(hass: HomeAssistant) -> None:
+@pytest.mark.usefixtures("enable_custom_integrations", "hass")
+async def test_extract_frame_resolve_module() -> None:
     """Test extracting the current frame from integration context."""
     # pylint: disable-next=import-outside-toplevel
     from custom_components.test_integration_frame import call_get_integration_frame
@@ -51,8 +53,8 @@ async def test_extract_frame_resolve_module(hass: HomeAssistant) -> None:
     )
 
 
-@pytest.mark.usefixtures("enable_custom_integrations")
-async def test_get_integration_logger_resolve_module(hass: HomeAssistant) -> None:
+@pytest.mark.usefixtures("enable_custom_integrations", "hass")
+async def test_get_integration_logger_resolve_module() -> None:
     """Test getting the logger from integration context."""
     # pylint: disable-next=import-outside-toplevel
     from custom_components.test_integration_frame import call_get_integration_logger
@@ -159,99 +161,224 @@ async def test_get_integration_logger_no_integration(
 
 
 @pytest.mark.parametrize(
-    ("integration_frame_path", "keywords", "expected_error", "expected_log"),
+    ("integration_frame_path", "keywords", "expected_result", "expected_log"),
     [
         pytest.param(
             "homeassistant/test_core",
             {},
-            True,
+            pytest.raises(RuntimeError, match="test_report_string"),
             0,
             id="core default",
         ),
         pytest.param(
             "homeassistant/components/test_core_integration",
             {},
-            False,
+            does_not_raise(),
             1,
             id="core integration default",
         ),
         pytest.param(
             "custom_components/test_custom_integration",
             {},
-            False,
+            does_not_raise(),
             1,
             id="custom integration default",
         ),
         pytest.param(
             "custom_components/test_custom_integration",
             {"custom_integration_behavior": frame.ReportBehavior.IGNORE},
-            False,
+            does_not_raise(),
             0,
             id="custom integration ignore",
         ),
         pytest.param(
             "custom_components/test_custom_integration",
             {"custom_integration_behavior": frame.ReportBehavior.ERROR},
-            True,
+            pytest.raises(RuntimeError, match="test_report_string"),
             1,
             id="custom integration error",
         ),
         pytest.param(
             "homeassistant/components/test_integration_frame",
             {"core_integration_behavior": frame.ReportBehavior.IGNORE},
-            False,
+            does_not_raise(),
             0,
             id="core_integration_behavior ignore",
         ),
         pytest.param(
             "homeassistant/components/test_integration_frame",
             {"core_integration_behavior": frame.ReportBehavior.ERROR},
-            True,
+            pytest.raises(RuntimeError, match="test_report_string"),
             1,
             id="core_integration_behavior error",
         ),
         pytest.param(
             "homeassistant/test_integration_frame",
             {"core_behavior": frame.ReportBehavior.IGNORE},
-            False,
+            does_not_raise(),
             0,
             id="core_behavior ignore",
         ),
         pytest.param(
             "homeassistant/test_integration_frame",
             {"core_behavior": frame.ReportBehavior.LOG},
-            False,
+            does_not_raise(),
             1,
             id="core_behavior log",
         ),
     ],
 )
-@pytest.mark.usefixtures("mock_integration_frame")
+@pytest.mark.usefixtures("hass", "mock_integration_frame")
 async def test_report_usage(
     caplog: pytest.LogCaptureFixture,
+    snapshot: SnapshotAssertion,
     keywords: dict[str, Any],
-    expected_error: bool,
+    expected_result: AbstractContextManager,
     expected_log: int,
 ) -> None:
-    """Test report."""
+    """Test report_usage.
+
+    Note: This test doesn't set up mock integrations, so it will not
+    find the correct issue tracker URL, and we don't check for that.
+    """
 
     what = "test_report_string"
 
-    errored = False
-    try:
-        with patch.object(frame, "_REPORTED_INTEGRATIONS", set()):
-            frame.report_usage(what, **keywords)
-    except RuntimeError:
-        errored = True
-
-    assert errored == expected_error
+    with patch.object(frame, "_REPORTED_INTEGRATIONS", set()), expected_result:
+        frame.report_usage(what, **keywords)
 
     assert caplog.text.count(what) == expected_log
+    reports = [
+        rec.message for rec in caplog.records if rec.message.startswith("Detected")
+    ]
+    assert reports == snapshot
 
 
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
+async def test_report_usage_no_hass() -> None:
+    """Test report_usage when frame helper is not set up."""
+
+    with pytest.raises(RuntimeError, match="Frame helper not set up"):
+        frame.report_usage("blablabla")
+
+
+@pytest.mark.parametrize(
+    "integration_frame_path",
+    [
+        pytest.param(
+            "homeassistant/test_core",
+            id="core",
+        ),
+        pytest.param(
+            "homeassistant/components/test_core_integration",
+            id="core integration",
+        ),
+        pytest.param(
+            "custom_components/test_custom_integration",
+            id="custom integration",
+        ),
+        pytest.param(
+            "custom_components/unknown_custom_integration",
+            id="unknown custom integration",
+        ),
+    ],
+)
+@pytest.mark.usefixtures("mock_integration_frame")
+async def test_report_usage_find_issue_tracker(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test report_usage finds the correct issue tracker.
+
+    Note: The issue tracker is found by loader.async_suggest_report_issue, this
+    test is a sanity check to ensure async_suggest_report_issue is given the
+    right parameters.
+    """
+
+    what = "test_report_string"
+    mock_integration(hass, MockModule("test_core_integration"))
+    mock_integration(
+        hass,
+        MockModule(
+            "test_custom_integration",
+            partial_manifest={"issue_tracker": "https://blablabla.com"},
+        ),
+        built_in=False,
+    )
+
+    with patch.object(frame, "_REPORTED_INTEGRATIONS", set()):
+        frame.report_usage(what, core_behavior=frame.ReportBehavior.LOG)
+
+    assert caplog.text.count(what) == 1
+    reports = [
+        rec.message for rec in caplog.records if rec.message.startswith("Detected")
+    ]
+    assert reports == snapshot
+
+
+@pytest.mark.parametrize(
+    "integration_frame_path",
+    [
+        pytest.param(
+            "homeassistant/test_core",
+            id="core",
+        ),
+        pytest.param(
+            "homeassistant/components/test_core_integration",
+            id="core integration",
+        ),
+        pytest.param(
+            "custom_components/test_custom_integration",
+            id="custom integration",
+        ),
+        pytest.param(
+            "custom_components/unknown_custom_integration",
+            id="unknown custom integration",
+        ),
+    ],
+)
+@pytest.mark.usefixtures("mock_integration_frame")
+async def test_report_usage_find_issue_tracker_other_thread(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test report_usage finds the correct issue tracker.
+
+    In this test, we run the report_usage in a separate thread.
+
+    Note: The issue tracker is found by loader.async_suggest_report_issue, this
+    test is a sanity check to ensure async_suggest_report_issue is given the
+    right parameters.
+    """
+
+    what = "test_report_string"
+    mock_integration(hass, MockModule("test_core_integration"))
+    mock_integration(
+        hass,
+        MockModule(
+            "test_custom_integration",
+            partial_manifest={"issue_tracker": "https://blablabla.com"},
+        ),
+        built_in=False,
+    )
+
+    def sync_job() -> None:
+        with patch.object(frame, "_REPORTED_INTEGRATIONS", set()):
+            frame.report_usage(what, core_behavior=frame.ReportBehavior.LOG)
+
+    await hass.async_add_executor_job(sync_job)
+
+    assert caplog.text.count(what) == 1
+    reports = [
+        rec.message for rec in caplog.records if rec.message.startswith("Detected")
+    ]
+    assert reports == snapshot
+
+
+@pytest.mark.usefixtures("hass", "mock_integration_frame")
 async def test_prevent_flooding(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture, mock_integration_frame: Mock
+    caplog: pytest.LogCaptureFixture, mock_integration_frame: Mock
 ) -> None:
     """Test to ensure a report is only written once to the log."""
 
@@ -267,22 +394,22 @@ async def test_prevent_flooding(
         f"q=is%3Aopen+is%3Aissue+label%3A%22integration%3A+{integration}%22"
     )
 
-    frame.report(what, error_if_core=False)
+    frame.report_usage(what, core_behavior=frame.ReportBehavior.LOG)
     assert expected_message in caplog.text
     assert key in frame._REPORTED_INTEGRATIONS
     assert len(frame._REPORTED_INTEGRATIONS) == 1
 
     caplog.clear()
 
-    frame.report(what, error_if_core=False)
+    frame.report_usage(what, core_behavior=frame.ReportBehavior.LOG)
     assert expected_message not in caplog.text
     assert key in frame._REPORTED_INTEGRATIONS
     assert len(frame._REPORTED_INTEGRATIONS) == 1
 
 
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
+@pytest.mark.usefixtures("hass", "mock_integration_frame")
 async def test_breaks_in_ha_version(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture, mock_integration_frame: Mock
+    caplog: pytest.LogCaptureFixture, mock_integration_frame: Mock
 ) -> None:
     """Test to ensure a report is only written once to the log."""
 
@@ -302,6 +429,7 @@ async def test_breaks_in_ha_version(
     assert expected_message in caplog.text
 
 
+@pytest.mark.usefixtures("hass")
 async def test_report_missing_integration_frame(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
@@ -312,19 +440,20 @@ async def test_report_missing_integration_frame(
         "homeassistant.helpers.frame.get_integration_frame",
         side_effect=frame.MissingIntegrationFrame,
     ):
-        frame.report(what, error_if_core=False)
+        frame.report_usage(what, core_behavior=frame.ReportBehavior.LOG)
         assert what in caplog.text
         assert caplog.text.count(what) == 1
 
         caplog.clear()
 
-        frame.report(what, error_if_core=False, log_custom_component_only=True)
+        frame.report_usage(what, core_behavior=frame.ReportBehavior.IGNORE)
         assert caplog.text == ""
 
 
 @pytest.mark.parametrize("run_count", [1, 2])
 # Run this twice to make sure the flood check does not
 # kick in when error_if_integration=True
+@pytest.mark.usefixtures("hass")
 async def test_report_error_if_integration(
     caplog: pytest.LogCaptureFixture, run_count: int
 ) -> None:
@@ -361,99 +490,24 @@ async def test_report_error_if_integration(
             ),
         ),
     ):
-        frame.report("did a bad thing", error_if_integration=True)
+        frame.report_usage(
+            "did a bad thing", core_integration_behavior=frame.ReportBehavior.ERROR
+        )
 
 
 @pytest.mark.parametrize(
-    ("integration_frame_path", "keywords", "expected_error", "expected_log"),
-    [
-        pytest.param(
-            "homeassistant/test_core",
-            {},
-            True,
-            0,
-            id="core default",
-        ),
-        pytest.param(
-            "homeassistant/components/test_core_integration",
-            {},
-            False,
-            1,
-            id="core integration default",
-        ),
-        pytest.param(
-            "custom_components/test_custom_integration",
-            {},
-            False,
-            1,
-            id="custom integration default",
-        ),
-        pytest.param(
-            "custom_components/test_integration_frame",
-            {"log_custom_component_only": True},
-            False,
-            1,
-            id="log_custom_component_only with custom integration",
-        ),
-        pytest.param(
-            "homeassistant/components/test_integration_frame",
-            {"log_custom_component_only": True},
-            False,
-            0,
-            id="log_custom_component_only with core integration",
-        ),
-        pytest.param(
-            "homeassistant/test_integration_frame",
-            {"error_if_core": False},
-            False,
-            1,
-            id="disable error_if_core",
-        ),
-        pytest.param(
-            "custom_components/test_integration_frame",
-            {"error_if_integration": True},
-            True,
-            1,
-            id="error_if_integration with custom integration",
-        ),
-        pytest.param(
-            "homeassistant/components/test_integration_frame",
-            {"error_if_integration": True},
-            True,
-            1,
-            id="error_if_integration with core integration",
-        ),
-    ],
-)
-@pytest.mark.usefixtures("mock_integration_frame")
-async def test_report(
-    caplog: pytest.LogCaptureFixture,
-    keywords: dict[str, Any],
-    expected_error: bool,
-    expected_log: int,
-) -> None:
-    """Test report."""
-
-    what = "test_report_string"
-
-    errored = False
-    try:
-        with patch.object(frame, "_REPORTED_INTEGRATIONS", set()):
-            frame.report(what, **keywords)
-    except RuntimeError:
-        errored = True
-
-    assert errored == expected_error
-
-    assert caplog.text.count(what) == expected_log
-
-
-@pytest.mark.parametrize(
-    ("behavior", "integration_domain", "source", "logs_again"),
+    (
+        "behavior",
+        "integration_domain",
+        "integration_frame_path",
+        "source",
+        "logs_again",
+    ),
     [
         pytest.param(
             "core_behavior",
             None,
+            "homeassistant",
             "code that",
             True,
             id="core",
@@ -461,6 +515,7 @@ async def test_report(
         pytest.param(
             "core_behavior",
             "unknown_integration",
+            "homeassistant",
             "code that",
             True,
             id="unknown integration",
@@ -468,6 +523,7 @@ async def test_report(
         pytest.param(
             "core_integration_behavior",
             "sensor",
+            "homeassistant",
             "that integration 'sensor'",
             False,
             id="core integration",
@@ -475,13 +531,32 @@ async def test_report(
         pytest.param(
             "custom_integration_behavior",
             "test_package",
+            "homeassistant",
             "that custom integration 'test_package'",
             False,
             id="custom integration",
         ),
+        # Assert integration_domain has priority over integration found in stack frame
+        pytest.param(
+            "core_integration_behavior",
+            "sensor",
+            "homeassistant/components/hue",
+            "that integration 'sensor'",
+            False,
+            id="core integration stack mismatch",
+        ),
+        # Assert integration_domain has priority over integration found in stack frame
+        pytest.param(
+            "custom_integration_behavior",
+            "test_package",
+            "custom_components/hue",
+            "that custom integration 'test_package'",
+            False,
+            id="custom integration stack mismatch",
+        ),
     ],
 )
-@pytest.mark.usefixtures("enable_custom_integrations")
+@pytest.mark.usefixtures("enable_custom_integrations", "mock_integration_frame")
 async def test_report_integration_domain(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
@@ -490,7 +565,7 @@ async def test_report_integration_domain(
     source: str,
     logs_again: bool,
 ) -> None:
-    """Test report."""
+    """Test report_usage when integration_domain is specified."""
     await async_get_integration(hass, "sensor")
     await async_get_integration(hass, "test_package")
 
diff --git a/tests/helpers/test_httpx_client.py b/tests/helpers/test_httpx_client.py
index 4b9f2fa2bf6..c3b9c1f9de8 100644
--- a/tests/helpers/test_httpx_client.py
+++ b/tests/helpers/test_httpx_client.py
@@ -100,7 +100,6 @@ async def test_get_async_client_context_manager(hass: HomeAssistant) -> None:
         assert mock_aclose.call_count == 0
 
 
-@patch("homeassistant.helpers.frame._REPORTED_INTEGRATIONS", set())
 async def test_warning_close_session_integration(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
@@ -144,7 +143,6 @@ async def test_warning_close_session_integration(
     ) in caplog.text
 
 
-@patch("homeassistant.helpers.frame._REPORTED_INTEGRATIONS", set())
 async def test_warning_close_session_custom(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
diff --git a/tests/helpers/test_intent.py b/tests/helpers/test_intent.py
index ae8c2ed65d0..bf0df305c35 100644
--- a/tests/helpers/test_intent.py
+++ b/tests/helpers/test_intent.py
@@ -234,7 +234,7 @@ async def test_async_match_targets(
 
     # Floor 2
     floor_2 = floor_registry.async_create("second floor", aliases={"upstairs"})
-    area_bedroom_2 = area_registry.async_get_or_create("bedroom")
+    area_bedroom_2 = area_registry.async_get_or_create("second floor bedroom")
     area_bedroom_2 = area_registry.async_update(
         area_bedroom_2.id, floor_id=floor_2.floor_id
     )
@@ -269,7 +269,7 @@ async def test_async_match_targets(
 
     # Floor 3
     floor_3 = floor_registry.async_create("third floor", aliases={"upstairs"})
-    area_bedroom_3 = area_registry.async_get_or_create("bedroom")
+    area_bedroom_3 = area_registry.async_get_or_create("third floor bedroom")
     area_bedroom_3 = area_registry.async_update(
         area_bedroom_3.id, floor_id=floor_3.floor_id
     )
@@ -510,6 +510,37 @@ async def test_async_match_targets(
         bathroom_light_3.entity_id,
     }
 
+    # Check single target constraint
+    result = intent.async_match_targets(
+        hass,
+        intent.MatchTargetsConstraints(domains={"light"}, single_target=True),
+        states=states,
+    )
+    assert not result.is_match
+    assert result.no_match_reason == intent.MatchFailedReason.MULTIPLE_TARGETS
+
+    # Only one light on the ground floor
+    result = intent.async_match_targets(
+        hass,
+        intent.MatchTargetsConstraints(domains={"light"}, single_target=True),
+        preferences=intent.MatchTargetsPreferences(floor_id=floor_1.floor_id),
+        states=states,
+    )
+    assert result.is_match
+    assert len(result.states) == 1
+    assert result.states[0].entity_id == bathroom_light_1.entity_id
+
+    # Only one switch in bedroom
+    result = intent.async_match_targets(
+        hass,
+        intent.MatchTargetsConstraints(domains={"switch"}, single_target=True),
+        preferences=intent.MatchTargetsPreferences(area_id=area_bedroom_2.id),
+        states=states,
+    )
+    assert result.is_match
+    assert len(result.states) == 1
+    assert result.states[0].entity_id == bedroom_switch_2.entity_id
+
 
 async def test_match_device_area(
     hass: HomeAssistant,
diff --git a/tests/helpers/test_llm.py b/tests/helpers/test_llm.py
index 57e151ba8eb..19ada407550 100644
--- a/tests/helpers/test_llm.py
+++ b/tests/helpers/test_llm.py
@@ -181,19 +181,19 @@ async def test_assist_api(
 
     assert len(llm.async_get_apis(hass)) == 1
     api = await llm.async_get_api(hass, "assist", llm_context)
-    assert len(api.tools) == 0
+    assert [tool.name for tool in api.tools] == ["get_home_state"]
 
     # Match all
     intent_handler.platforms = None
 
     api = await llm.async_get_api(hass, "assist", llm_context)
-    assert len(api.tools) == 1
+    assert [tool.name for tool in api.tools] == ["test_intent", "get_home_state"]
 
     # Match specific domain
     intent_handler.platforms = {"light"}
 
     api = await llm.async_get_api(hass, "assist", llm_context)
-    assert len(api.tools) == 1
+    assert len(api.tools) == 2
     tool = api.tools[0]
     assert tool.name == "test_intent"
     assert tool.description == "Execute Home Assistant test_intent intent"
@@ -622,6 +622,40 @@ async def test_assist_api_prompt(
   domain: light
   state: unavailable
   areas: Test Area 2
+"""
+    stateless_exposed_entities_prompt = """An overview of the areas and the devices in this smart home:
+- names: Kitchen
+  domain: light
+- names: Living Room
+  domain: light
+  areas: Test Area, Alternative name
+- names: Test Device, my test light
+  domain: light
+  areas: Test Area, Alternative name
+- names: Test Service
+  domain: light
+  areas: Test Area, Alternative name
+- names: Test Service
+  domain: light
+  areas: Test Area, Alternative name
+- names: Test Service
+  domain: light
+  areas: Test Area, Alternative name
+- names: Test Device 2
+  domain: light
+  areas: Test Area 2
+- names: Test Device 3
+  domain: light
+  areas: Test Area 2
+- names: Test Device 4
+  domain: light
+  areas: Test Area 2
+- names: Unnamed Device
+  domain: light
+  areas: Test Area 2
+- names: '1'
+  domain: light
+  areas: Test Area 2
 """
     first_part_prompt = (
         "When controlling Home Assistant always call the intent tools. "
@@ -640,9 +674,18 @@ async def test_assist_api_prompt(
         f"""{first_part_prompt}
 {area_prompt}
 {no_timer_prompt}
-{exposed_entities_prompt}"""
+{stateless_exposed_entities_prompt}"""
     )
 
+    # Verify that the get_home_state tool returns the same results as the exposed_entities_prompt
+    result = await api.async_call_tool(
+        llm.ToolInput(tool_name="get_home_state", tool_args={})
+    )
+    assert result == {
+        "success": True,
+        "result": exposed_entities_prompt,
+    }
+
     # Fake that request is made from a specific device ID with an area
     llm_context.device_id = device.id
     area_prompt = (
@@ -654,7 +697,7 @@ async def test_assist_api_prompt(
         f"""{first_part_prompt}
 {area_prompt}
 {no_timer_prompt}
-{exposed_entities_prompt}"""
+{stateless_exposed_entities_prompt}"""
     )
 
     # Add floor
@@ -669,7 +712,7 @@ async def test_assist_api_prompt(
         f"""{first_part_prompt}
 {area_prompt}
 {no_timer_prompt}
-{exposed_entities_prompt}"""
+{stateless_exposed_entities_prompt}"""
     )
 
     # Register device for timers
@@ -680,7 +723,7 @@ async def test_assist_api_prompt(
     assert api.api_prompt == (
         f"""{first_part_prompt}
 {area_prompt}
-{exposed_entities_prompt}"""
+{stateless_exposed_entities_prompt}"""
     )
 
 
@@ -745,7 +788,7 @@ async def test_script_tool(
     area = area_registry.async_create("Living room")
     floor = floor_registry.async_create("2")
 
-    assert llm.SCRIPT_PARAMETERS_CACHE not in hass.data
+    assert llm.ACTION_PARAMETERS_CACHE not in hass.data
 
     api = await llm.async_get_api(hass, "assist", llm_context)
 
@@ -769,7 +812,7 @@ async def test_script_tool(
     }
     assert tool.parameters.schema == schema
 
-    assert hass.data[llm.SCRIPT_PARAMETERS_CACHE] == {
+    assert hass.data[llm.ACTION_PARAMETERS_CACHE]["script"] == {
         "test_script": (
             "This is a test script. Aliases: ['script name', 'script alias']",
             vol.Schema(schema),
@@ -866,7 +909,7 @@ async def test_script_tool(
     ):
         await hass.services.async_call("script", "reload", blocking=True)
 
-    assert hass.data[llm.SCRIPT_PARAMETERS_CACHE] == {}
+    assert hass.data[llm.ACTION_PARAMETERS_CACHE]["script"] == {}
 
     api = await llm.async_get_api(hass, "assist", llm_context)
 
@@ -882,7 +925,7 @@ async def test_script_tool(
     schema = {vol.Required("beer", description="Number of beers"): cv.string}
     assert tool.parameters.schema == schema
 
-    assert hass.data[llm.SCRIPT_PARAMETERS_CACHE] == {
+    assert hass.data[llm.ACTION_PARAMETERS_CACHE]["script"] == {
         "test_script": (
             "This is a new test script. Aliases: ['script name', 'script alias']",
             vol.Schema(schema),
@@ -1170,7 +1213,9 @@ async def test_selector_serializer(
 async def test_calendar_get_events_tool(hass: HomeAssistant) -> None:
     """Test the calendar get events tool."""
     assert await async_setup_component(hass, "homeassistant", {})
-    hass.states.async_set("calendar.test_calendar", "on", {"friendly_name": "Test"})
+    hass.states.async_set(
+        "calendar.test_calendar", "on", {"friendly_name": "Mock Calendar Name"}
+    )
     async_expose_entity(hass, "conversation", "calendar.test_calendar", True)
     context = Context()
     llm_context = llm.LLMContext(
@@ -1182,7 +1227,11 @@ async def test_calendar_get_events_tool(hass: HomeAssistant) -> None:
         device_id=None,
     )
     api = await llm.async_get_api(hass, "assist", llm_context)
-    assert [tool for tool in api.tools if tool.name == "calendar_get_events"]
+    tool = next(
+        (tool for tool in api.tools if tool.name == "calendar_get_events"), None
+    )
+    assert tool is not None
+    assert tool.parameters.schema["calendar"].container == ["Mock Calendar Name"]
 
     calls = async_mock_service(
         hass,
@@ -1212,7 +1261,10 @@ async def test_calendar_get_events_tool(hass: HomeAssistant) -> None:
 
     tool_input = llm.ToolInput(
         tool_name="calendar_get_events",
-        tool_args={"calendar": "calendar.test_calendar", "range": "today"},
+        tool_args={
+            "calendar": "Mock Calendar Name",
+            "range": "today",
+        },
     )
     now = dt_util.now()
     with patch("homeassistant.util.dt.now", return_value=now):
@@ -1258,3 +1310,19 @@ async def test_calendar_get_events_tool(hass: HomeAssistant) -> None:
         "start_date_time": now,
         "end_date_time": dt_util.start_of_local_day() + timedelta(days=7),
     }
+
+
+async def test_no_tools_exposed(hass: HomeAssistant) -> None:
+    """Test that tools are not exposed when no entities are exposed."""
+    assert await async_setup_component(hass, "homeassistant", {})
+    context = Context()
+    llm_context = llm.LLMContext(
+        platform="test_platform",
+        context=context,
+        user_prompt="test_text",
+        language="*",
+        assistant="conversation",
+        device_id=None,
+    )
+    api = await llm.async_get_api(hass, "assist", llm_context)
+    assert api.tools == []
diff --git a/tests/helpers/test_script.py b/tests/helpers/test_script.py
index f3cbb982ad0..f8552fcefed 100644
--- a/tests/helpers/test_script.py
+++ b/tests/helpers/test_script.py
@@ -452,6 +452,68 @@ async def test_service_response_data_errors(
         await script_obj.async_run(context=context)
 
 
+async def test_calling_service_response_data_in_scopes(hass: HomeAssistant) -> None:
+    """Test response variable is still set after scopes end."""
+    expected_var = {"data": "value-12345"}
+
+    def mock_service(call: ServiceCall) -> ServiceResponse:
+        """Mock service call."""
+        if call.return_response:
+            return expected_var
+        return None
+
+    hass.services.async_register(
+        "test", "script", mock_service, supports_response=SupportsResponse.OPTIONAL
+    )
+
+    sequence = cv.SCRIPT_SCHEMA(
+        {
+            "parallel": [
+                {
+                    "alias": "Sequential group",
+                    "sequence": [
+                        {
+                            "alias": "variables",
+                            "variables": {"state": "off"},
+                        },
+                        {
+                            "alias": "service step1",
+                            "action": "test.script",
+                            "response_variable": "my_response",
+                        },
+                    ],
+                }
+            ]
+        }
+    )
+
+    script_obj = script.Script(hass, sequence, "Test Name", "test_domain")
+
+    result = await script_obj.async_run(context=Context())
+
+    assert result.variables["my_response"] == expected_var
+
+    expected_trace = {
+        "0": [{"variables": {"my_response": expected_var, "state": "off"}}],
+        "0/parallel/0/sequence/0": [{"variables": {"state": "off"}}],
+        "0/parallel/0/sequence/1": [
+            {
+                "result": {
+                    "params": {
+                        "domain": "test",
+                        "service": "script",
+                        "service_data": {},
+                        "target": {},
+                    },
+                    "running_script": False,
+                },
+                "variables": {"my_response": expected_var},
+            }
+        ],
+    }
+    assert_action_trace(expected_trace)
+
+
 async def test_data_template_with_templated_key(hass: HomeAssistant) -> None:
     """Test the calling of a service with a data_template with a templated key."""
     context = Context()
@@ -1706,6 +1768,90 @@ async def test_wait_variables_out(hass: HomeAssistant, mode, action_type) -> Non
             assert float(remaining) == 0.0
 
 
+async def test_wait_in_sequence(hass: HomeAssistant) -> None:
+    """Test wait variable is still set after sequence ends."""
+    sequence = cv.SCRIPT_SCHEMA(
+        [
+            {
+                "alias": "Sequential group",
+                "sequence": [
+                    {
+                        "alias": "variables",
+                        "variables": {"state": "off"},
+                    },
+                    {
+                        "alias": "wait template",
+                        "wait_template": "{{ state == 'off' }}",
+                    },
+                ],
+            },
+        ]
+    )
+
+    script_obj = script.Script(hass, sequence, "Test Name", "test_domain")
+
+    result = await script_obj.async_run(context=Context())
+
+    expected_var = {"completed": True, "remaining": None}
+
+    assert result.variables["wait"] == expected_var
+
+    expected_trace = {
+        "0": [{"variables": {"wait": expected_var, "state": "off"}}],
+        "0/sequence/0": [{"variables": {"state": "off"}}],
+        "0/sequence/1": [
+            {
+                "result": {"wait": expected_var},
+                "variables": {"wait": expected_var},
+            }
+        ],
+    }
+    assert_action_trace(expected_trace)
+
+
+async def test_wait_in_parallel(hass: HomeAssistant) -> None:
+    """Test wait variable is not set after parallel ends."""
+    sequence = cv.SCRIPT_SCHEMA(
+        {
+            "parallel": [
+                {
+                    "alias": "Sequential group",
+                    "sequence": [
+                        {
+                            "alias": "variables",
+                            "variables": {"state": "off"},
+                        },
+                        {
+                            "alias": "wait template",
+                            "wait_template": "{{ state == 'off' }}",
+                        },
+                    ],
+                }
+            ]
+        }
+    )
+
+    script_obj = script.Script(hass, sequence, "Test Name", "test_domain")
+
+    result = await script_obj.async_run(context=Context())
+
+    expected_var = {"completed": True, "remaining": None}
+
+    assert "wait" not in result.variables
+
+    expected_trace = {
+        "0": [{"variables": {"state": "off"}}],
+        "0/parallel/0/sequence/0": [{"variables": {"state": "off"}}],
+        "0/parallel/0/sequence/1": [
+            {
+                "result": {"wait": expected_var},
+                "variables": {"wait": expected_var},
+            }
+        ],
+    }
+    assert_action_trace(expected_trace)
+
+
 async def test_wait_for_trigger_bad(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
@@ -5131,11 +5277,23 @@ async def test_set_variable(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
     """Test setting variables in scripts."""
-    alias = "variables step"
     sequence = cv.SCRIPT_SCHEMA(
         [
-            {"alias": alias, "variables": {"variable": "value"}},
-            {"action": "test.script", "data": {"value": "{{ variable }}"}},
+            {"alias": "variables", "variables": {"x": 1, "y": 1}},
+            {
+                "alias": "scope",
+                "sequence": [
+                    {"variables": {"y": 3, "z": 3}},
+                    {
+                        "action": "test.script",
+                        "data": {"value": "x={{ x }}, y={{ y }}, z={{ z }}"},
+                    },
+                ],
+            },
+            {
+                "action": "test.script",
+                "data": {"value": "x={{ x }}, y={{ y }}, z={{ z }}"},
+            },
         ]
     )
     script_obj = script.Script(hass, sequence, "test script", "test_domain")
@@ -5145,18 +5303,36 @@ async def test_set_variable(
     await script_obj.async_run(context=Context())
     await hass.async_block_till_done()
 
-    assert mock_calls[0].data["value"] == "value"
-    assert f"Executing step {alias}" in caplog.text
+    assert len(mock_calls) == 2
+    assert mock_calls[0].data["value"] == "x=1, y=3, z=3"
+    assert mock_calls[1].data["value"] == "x=1, y=3, z=3"
+
+    assert "Executing step variables" in caplog.text
 
     expected_trace = {
-        "0": [{"variables": {"variable": "value"}}],
-        "1": [
+        "0": [{"variables": {"x": 1, "y": 1}}],
+        "1": [{"variables": {"y": 3, "z": 3}}],
+        "1/sequence/0": [{"variables": {"y": 3, "z": 3}}],
+        "1/sequence/1": [
             {
                 "result": {
                     "params": {
                         "domain": "test",
                         "service": "script",
-                        "service_data": {"value": "value"},
+                        "service_data": {"value": "x=1, y=3, z=3"},
+                        "target": {},
+                    },
+                    "running_script": False,
+                },
+            }
+        ],
+        "2": [
+            {
+                "result": {
+                    "params": {
+                        "domain": "test",
+                        "service": "script",
+                        "service_data": {"value": "x=1, y=3, z=3"},
                         "target": {},
                     },
                     "running_script": False,
@@ -5753,7 +5929,9 @@ async def test_stop_action_nested_response_variables(
                 "variables": {"var": var, "output": {"value": "Testing 123"}},
             }
         ],
-        "1": [{"result": {"choice": choice}}],
+        "1": [
+            {"result": {"choice": choice}, "variables": {"output": {"value": response}}}
+        ],
         "1/if": [{"result": {"result": if_result}}],
         "1/if/condition/0": [{"result": {"result": var == 1, "entities": []}}],
         f"1/{choice}/0": [{"variables": {"output": {"value": response}}}],
diff --git a/tests/helpers/test_script_variables.py b/tests/helpers/test_script_variables.py
index 3675c857279..974a91674a7 100644
--- a/tests/helpers/test_script_variables.py
+++ b/tests/helpers/test_script_variables.py
@@ -5,12 +5,13 @@ import pytest
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import TemplateError
 from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.script_variables import ScriptRunVariables, ScriptVariables
 
 
 async def test_static_vars() -> None:
     """Test static vars."""
     orig = {"hello": "world"}
-    var = cv.SCRIPT_VARIABLES_SCHEMA(orig)
+    var = ScriptVariables(orig)
     rendered = var.async_render(None, None)
     assert rendered is not orig
     assert rendered == orig
@@ -20,31 +21,28 @@ async def test_static_vars_run_args() -> None:
     """Test static vars."""
     orig = {"hello": "world"}
     orig_copy = dict(orig)
-    var = cv.SCRIPT_VARIABLES_SCHEMA(orig)
+    var = ScriptVariables(orig)
     rendered = var.async_render(None, {"hello": "override", "run": "var"})
     assert rendered == {"hello": "override", "run": "var"}
     # Make sure we don't change original vars
     assert orig == orig_copy
 
 
-async def test_static_vars_no_default() -> None:
+async def test_static_vars_simple() -> None:
     """Test static vars."""
     orig = {"hello": "world"}
-    var = cv.SCRIPT_VARIABLES_SCHEMA(orig)
-    rendered = var.async_render(None, None, render_as_defaults=False)
-    assert rendered is not orig
-    assert rendered == orig
+    var = ScriptVariables(orig)
+    rendered = var.async_simple_render({})
+    assert rendered is orig
 
 
-async def test_static_vars_run_args_no_default() -> None:
+async def test_static_vars_run_args_simple() -> None:
     """Test static vars."""
     orig = {"hello": "world"}
     orig_copy = dict(orig)
-    var = cv.SCRIPT_VARIABLES_SCHEMA(orig)
-    rendered = var.async_render(
-        None, {"hello": "override", "run": "var"}, render_as_defaults=False
-    )
-    assert rendered == {"hello": "world", "run": "var"}
+    var = ScriptVariables(orig)
+    rendered = var.async_simple_render({"hello": "override", "run": "var"})
+    assert rendered is orig
     # Make sure we don't change original vars
     assert orig == orig_copy
 
@@ -78,14 +76,14 @@ async def test_template_vars_run_args(hass: HomeAssistant) -> None:
     }
 
 
-async def test_template_vars_no_default(hass: HomeAssistant) -> None:
+async def test_template_vars_simple(hass: HomeAssistant) -> None:
     """Test template vars."""
     var = cv.SCRIPT_VARIABLES_SCHEMA({"hello": "{{ 1 + 1 }}"})
-    rendered = var.async_render(hass, None, render_as_defaults=False)
+    rendered = var.async_simple_render({})
     assert rendered == {"hello": 2}
 
 
-async def test_template_vars_run_args_no_default(hass: HomeAssistant) -> None:
+async def test_template_vars_run_args_simple(hass: HomeAssistant) -> None:
     """Test template vars."""
     var = cv.SCRIPT_VARIABLES_SCHEMA(
         {
@@ -93,16 +91,13 @@ async def test_template_vars_run_args_no_default(hass: HomeAssistant) -> None:
             "something_2": "{{ run_var_ex + 1 }}",
         }
     )
-    rendered = var.async_render(
-        hass,
+    rendered = var.async_simple_render(
         {
             "run_var_ex": 5,
             "something_2": 1,
-        },
-        render_as_defaults=False,
+        }
     )
     assert rendered == {
-        "run_var_ex": 5,
         "something": 6,
         "something_2": 6,
     }
@@ -113,3 +108,90 @@ async def test_template_vars_error(hass: HomeAssistant) -> None:
     var = cv.SCRIPT_VARIABLES_SCHEMA({"hello": "{{ canont.work }}"})
     with pytest.raises(TemplateError):
         var.async_render(hass, None)
+
+
+async def test_script_vars_exit_top_level() -> None:
+    """Test exiting top level script run variables."""
+    script_vars = ScriptRunVariables.create_top_level()
+    with pytest.raises(ValueError):
+        script_vars.exit_scope()
+
+
+async def test_script_vars_delete_var() -> None:
+    """Test deleting from script run variables."""
+    script_vars = ScriptRunVariables.create_top_level({"x": 1, "y": 2})
+    with pytest.raises(TypeError):
+        del script_vars["x"]
+    with pytest.raises(TypeError):
+        script_vars.pop("y")
+    assert script_vars._full_scope == {"x": 1, "y": 2}
+
+
+async def test_script_vars_scopes() -> None:
+    """Test script run variables scopes."""
+    script_vars = ScriptRunVariables.create_top_level()
+    script_vars["x"] = 1
+    script_vars["y"] = 1
+    assert script_vars["x"] == 1
+    assert script_vars["y"] == 1
+
+    script_vars_2 = script_vars.enter_scope()
+    script_vars_2.define_local("x", 2)
+    assert script_vars_2["x"] == 2
+    assert script_vars_2["y"] == 1
+
+    script_vars_3 = script_vars_2.enter_scope()
+    script_vars_3["x"] = 3
+    script_vars_3["y"] = 3
+    assert script_vars_3["x"] == 3
+    assert script_vars_3["y"] == 3
+
+    script_vars_4 = script_vars_3.enter_scope()
+    assert script_vars_4["x"] == 3
+    assert script_vars_4["y"] == 3
+
+    assert script_vars_4.exit_scope() is script_vars_3
+
+    assert script_vars_3._full_scope == {"x": 3, "y": 3}
+    assert script_vars_3.local_scope == {}
+
+    assert script_vars_3.exit_scope() is script_vars_2
+
+    assert script_vars_2._full_scope == {"x": 3, "y": 3}
+    assert script_vars_2.local_scope == {"x": 3}
+
+    assert script_vars_2.exit_scope() is script_vars
+
+    assert script_vars._full_scope == {"x": 1, "y": 3}
+    assert script_vars.local_scope == {"x": 1, "y": 3}
+
+
+async def test_script_vars_parallel() -> None:
+    """Test script run variables parallel support."""
+    script_vars = ScriptRunVariables.create_top_level({"x": 1, "y": 1, "z": 1})
+
+    script_vars_2a = script_vars.enter_scope(parallel=True)
+    script_vars_3a = script_vars_2a.enter_scope()
+
+    script_vars_2b = script_vars.enter_scope(parallel=True)
+    script_vars_3b = script_vars_2b.enter_scope()
+
+    script_vars_3a["x"] = "a"
+    script_vars_3a.assign_parallel_protected("y", "a")
+
+    script_vars_3b["x"] = "b"
+    script_vars_3b.assign_parallel_protected("y", "b")
+
+    assert script_vars_3a._full_scope == {"x": "b", "y": "a", "z": 1}
+    assert script_vars_3a.non_parallel_scope == {"x": "a", "y": "a"}
+
+    assert script_vars_3b._full_scope == {"x": "b", "y": "b", "z": 1}
+    assert script_vars_3b.non_parallel_scope == {"x": "b", "y": "b"}
+
+    assert script_vars_3a.exit_scope() is script_vars_2a
+    assert script_vars_2a.exit_scope() is script_vars
+    assert script_vars_3b.exit_scope() is script_vars_2b
+    assert script_vars_2b.exit_scope() is script_vars
+
+    assert script_vars._full_scope == {"x": "b", "y": 1, "z": 1}
+    assert script_vars.local_scope == {"x": "b", "y": 1, "z": 1}
diff --git a/tests/helpers/test_selector.py b/tests/helpers/test_selector.py
index d07bb7458e9..3ddbecaf48d 100644
--- a/tests/helpers/test_selector.py
+++ b/tests/helpers/test_selector.py
@@ -88,6 +88,7 @@ def _test_selector(
         ({"integration": "zha"}, ("abc123",), (None,)),
         ({"manufacturer": "mock-manuf"}, ("abc123",), (None,)),
         ({"model": "mock-model"}, ("abc123",), (None,)),
+        ({"model_id": "mock-model_id"}, ("abc123",), (None,)),
         ({"manufacturer": "mock-manuf", "model": "mock-model"}, ("abc123",), (None,)),
         (
             {"integration": "zha", "manufacturer": "mock-manuf", "model": "mock-model"},
@@ -979,6 +980,7 @@ def test_datetime_selector_schema(schema, valid_selections, invalid_selections)
     ("schema", "valid_selections", "invalid_selections"),
     [({}, ("abc123", "{{ now() }}"), (None, "{{ incomplete }", "{% if True %}Hi!"))],
 )
+@pytest.mark.usefixtures("hass")
 def test_template_selector_schema(schema, valid_selections, invalid_selections) -> None:
     """Test template selector."""
     _test_selector("template", schema, valid_selections, invalid_selections)
diff --git a/tests/helpers/test_service.py b/tests/helpers/test_service.py
index 142f7a23f81..70ab20e87fa 100644
--- a/tests/helpers/test_service.py
+++ b/tests/helpers/test_service.py
@@ -961,7 +961,7 @@ async def test_async_get_all_descriptions_dot_keys(hass: HomeAssistant) -> None:
             side_effect=service._load_services_files,
         ) as proxy_load_services_files,
         patch(
-            "homeassistant.util.yaml.loader.load_yaml",
+            "annotatedyaml.loader.load_yaml",
             side_effect=load_yaml,
         ) as mock_load_yaml,
     ):
@@ -1033,7 +1033,7 @@ async def test_async_get_all_descriptions_filter(hass: HomeAssistant) -> None:
             side_effect=service._load_services_files,
         ) as proxy_load_services_files,
         patch(
-            "homeassistant.util.yaml.loader.load_yaml",
+            "annotatedyaml.loader.load_yaml",
             side_effect=load_yaml,
         ) as mock_load_yaml,
     ):
diff --git a/tests/helpers/test_template.py b/tests/helpers/test_template.py
index b3a30806cbd..89d1c307fd7 100644
--- a/tests/helpers/test_template.py
+++ b/tests/helpers/test_template.py
@@ -15,6 +15,7 @@ from unittest.mock import patch
 from freezegun import freeze_time
 import orjson
 import pytest
+from pytest_unordered import unordered
 from syrupy import SnapshotAssertion
 import voluptuous as vol
 
@@ -149,6 +150,7 @@ async def test_template_render_info_collision(hass: HomeAssistant) -> None:
         template_obj.async_render_to_info()
 
 
+@pytest.mark.usefixtures("hass")
 def test_template_equality() -> None:
     """Test template comparison and hashing."""
     template_one = template.Template("{{ template_one }}")
@@ -5166,6 +5168,7 @@ def test_iif(hass: HomeAssistant) -> None:
     assert tpl.async_render() == "no"
 
 
+@pytest.mark.usefixtures("hass")
 async def test_cache_garbage_collection() -> None:
     """Test caching a template."""
     template_string = (
@@ -5881,6 +5884,75 @@ async def test_floor_areas(
     assert info.rate_limit is None
 
 
+async def test_floor_entities(
+    hass: HomeAssistant,
+    floor_registry: fr.FloorRegistry,
+    area_registry: ar.AreaRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test floor_entities function."""
+
+    # Test non existing floor ID
+    info = render_to_info(hass, "{{ floor_entities('skyring') }}")
+    assert_result_info(info, [])
+    assert info.rate_limit is None
+
+    info = render_to_info(hass, "{{ 'skyring' | floor_entities }}")
+    assert_result_info(info, [])
+    assert info.rate_limit is None
+
+    # Test wrong value type
+    info = render_to_info(hass, "{{ floor_entities(42) }}")
+    assert_result_info(info, [])
+    assert info.rate_limit is None
+
+    info = render_to_info(hass, "{{ 42 | floor_entities }}")
+    assert_result_info(info, [])
+    assert info.rate_limit is None
+
+    floor = floor_registry.async_create("First floor")
+    area1 = area_registry.async_create("Living room")
+    area2 = area_registry.async_create("Dining room")
+    area_registry.async_update(area1.id, floor_id=floor.floor_id)
+    area_registry.async_update(area2.id, floor_id=floor.floor_id)
+
+    config_entry = MockConfigEntry(domain="light")
+    config_entry.add_to_hass(hass)
+    entity_entry = entity_registry.async_get_or_create(
+        "light",
+        "hue",
+        "living_room",
+        config_entry=config_entry,
+    )
+    entity_registry.async_update_entity(entity_entry.entity_id, area_id=area1.id)
+    entity_entry = entity_registry.async_get_or_create(
+        "light",
+        "hue",
+        "dining_room",
+        config_entry=config_entry,
+    )
+    entity_registry.async_update_entity(entity_entry.entity_id, area_id=area2.id)
+
+    # Get entities by floor ID
+    expected = ["light.hue_living_room", "light.hue_dining_room"]
+    info = render_to_info(hass, f"{{{{ floor_entities('{floor.floor_id}') }}}}")
+    assert_result_info(info, expected)
+    assert info.rate_limit is None
+
+    info = render_to_info(hass, f"{{{{ '{floor.floor_id}' | floor_entities }}}}")
+    assert_result_info(info, expected)
+    assert info.rate_limit is None
+
+    # Get entities by floor name
+    info = render_to_info(hass, f"{{{{ floor_entities('{floor.name}') }}}}")
+    assert_result_info(info, expected)
+    assert info.rate_limit is None
+
+    info = render_to_info(hass, f"{{{{ '{floor.name}' | floor_entities }}}}")
+    assert_result_info(info, expected)
+    assert info.rate_limit is None
+
+
 async def test_labels(
     hass: HomeAssistant,
     label_registry: lr.LabelRegistry,
@@ -6601,3 +6673,384 @@ async def test_merge_response_not_mutate_original_object(
 
     tpl = template.Template(_template, hass)
     assert tpl.async_render()
+
+
+def test_shuffle(hass: HomeAssistant) -> None:
+    """Test the shuffle function and filter."""
+    assert list(
+        template.Template("{{ [1, 2, 3] | shuffle }}", hass).async_render()
+    ) == unordered([1, 2, 3])
+
+    assert list(
+        template.Template("{{ shuffle([1, 2, 3]) }}", hass).async_render()
+    ) == unordered([1, 2, 3])
+
+    assert list(
+        template.Template("{{ shuffle(1, 2, 3) }}", hass).async_render()
+    ) == unordered([1, 2, 3])
+
+    assert list(template.Template("{{ shuffle([]) }}", hass).async_render()) == []
+
+    assert list(template.Template("{{ [] | shuffle }}", hass).async_render()) == []
+
+    # Testing using seed
+    assert list(
+        template.Template("{{ shuffle([1, 2, 3], 'seed') }}", hass).async_render()
+    ) == [2, 3, 1]
+
+    assert list(
+        template.Template(
+            "{{ shuffle([1, 2, 3], seed='seed') }}",
+            hass,
+        ).async_render()
+    ) == [2, 3, 1]
+
+    assert list(
+        template.Template(
+            "{{ [1, 2, 3] | shuffle('seed') }}",
+            hass,
+        ).async_render()
+    ) == [2, 3, 1]
+
+    assert list(
+        template.Template(
+            "{{ [1, 2, 3] | shuffle(seed='seed') }}",
+            hass,
+        ).async_render()
+    ) == [2, 3, 1]
+
+    with pytest.raises(TemplateError):
+        template.Template("{{ 1 | shuffle }}", hass).async_render()
+
+    with pytest.raises(TemplateError):
+        template.Template("{{ shuffle() }}", hass).async_render()
+
+
+def test_typeof(hass: HomeAssistant) -> None:
+    """Test the typeof debug filter/function."""
+    assert template.Template("{{ True | typeof }}", hass).async_render() == "bool"
+    assert template.Template("{{ typeof(True) }}", hass).async_render() == "bool"
+
+    assert template.Template("{{ [1, 2, 3] | typeof }}", hass).async_render() == "list"
+    assert template.Template("{{ typeof([1, 2, 3]) }}", hass).async_render() == "list"
+
+    assert template.Template("{{ 1 | typeof }}", hass).async_render() == "int"
+    assert template.Template("{{ typeof(1) }}", hass).async_render() == "int"
+
+    assert template.Template("{{ 1.1 | typeof }}", hass).async_render() == "float"
+    assert template.Template("{{ typeof(1.1) }}", hass).async_render() == "float"
+
+    assert template.Template("{{ None | typeof }}", hass).async_render() == "NoneType"
+    assert template.Template("{{ typeof(None) }}", hass).async_render() == "NoneType"
+
+    assert (
+        template.Template("{{ 'Home Assistant' | typeof }}", hass).async_render()
+        == "str"
+    )
+    assert (
+        template.Template("{{ typeof('Home Assistant') }}", hass).async_render()
+        == "str"
+    )
+
+
+def test_flatten(hass: HomeAssistant) -> None:
+    """Test the flatten function and filter."""
+    assert template.Template(
+        "{{ flatten([1, [2, [3]], 4, [5 , 6]]) }}", hass
+    ).async_render() == [1, 2, 3, 4, 5, 6]
+
+    assert template.Template(
+        "{{ [1, [2, [3]], 4, [5 , 6]] | flatten }}", hass
+    ).async_render() == [1, 2, 3, 4, 5, 6]
+
+    assert template.Template(
+        "{{ flatten([1, [2, [3]], 4, [5 , 6]], 1) }}", hass
+    ).async_render() == [1, 2, [3], 4, 5, 6]
+
+    assert template.Template(
+        "{{ flatten([1, [2, [3]], 4, [5 , 6]], levels=1) }}", hass
+    ).async_render() == [1, 2, [3], 4, 5, 6]
+
+    assert template.Template(
+        "{{ [1, [2, [3]], 4, [5 , 6]] | flatten(1) }}", hass
+    ).async_render() == [1, 2, [3], 4, 5, 6]
+
+    assert template.Template(
+        "{{ [1, [2, [3]], 4, [5 , 6]] | flatten(levels=1) }}", hass
+    ).async_render() == [1, 2, [3], 4, 5, 6]
+
+    assert template.Template("{{ flatten([]) }}", hass).async_render() == []
+
+    assert template.Template("{{ [] | flatten }}", hass).async_render() == []
+
+    with pytest.raises(TemplateError):
+        template.Template("{{ 'string' | flatten }}", hass).async_render()
+
+    with pytest.raises(TemplateError):
+        template.Template("{{ flatten() }}", hass).async_render()
+
+
+def test_intersect(hass: HomeAssistant) -> None:
+    """Test the intersect function and filter."""
+    assert list(
+        template.Template(
+            "{{ intersect([1, 2, 5, 3, 4, 10], [1, 2, 3, 4, 5, 11, 99]) }}", hass
+        ).async_render()
+    ) == unordered([1, 2, 3, 4, 5])
+
+    assert list(
+        template.Template(
+            "{{ [1, 2, 5, 3, 4, 10] | intersect([1, 2, 3, 4, 5, 11, 99]) }}", hass
+        ).async_render()
+    ) == unordered([1, 2, 3, 4, 5])
+
+    assert list(
+        template.Template(
+            "{{ intersect(['a', 'b', 'c'], ['b', 'c', 'd']) }}", hass
+        ).async_render()
+    ) == unordered(["b", "c"])
+
+    assert list(
+        template.Template(
+            "{{ ['a', 'b', 'c'] | intersect(['b', 'c', 'd']) }}", hass
+        ).async_render()
+    ) == unordered(["b", "c"])
+
+    assert (
+        template.Template("{{ intersect([], [1, 2, 3]) }}", hass).async_render() == []
+    )
+
+    assert (
+        template.Template("{{ [] | intersect([1, 2, 3]) }}", hass).async_render() == []
+    )
+
+    with pytest.raises(TemplateError, match="intersect expected a list, got str"):
+        template.Template("{{ 'string' | intersect([1, 2, 3]) }}", hass).async_render()
+
+    with pytest.raises(TemplateError, match="intersect expected a list, got str"):
+        template.Template("{{ [1, 2, 3] | intersect('string') }}", hass).async_render()
+
+
+def test_difference(hass: HomeAssistant) -> None:
+    """Test the difference function and filter."""
+    assert list(
+        template.Template(
+            "{{ difference([1, 2, 5, 3, 4, 10], [1, 2, 3, 4, 5, 11, 99]) }}", hass
+        ).async_render()
+    ) == [10]
+
+    assert list(
+        template.Template(
+            "{{ [1, 2, 5, 3, 4, 10] | difference([1, 2, 3, 4, 5, 11, 99]) }}", hass
+        ).async_render()
+    ) == [10]
+
+    assert list(
+        template.Template(
+            "{{ difference(['a', 'b', 'c'], ['b', 'c', 'd']) }}", hass
+        ).async_render()
+    ) == ["a"]
+
+    assert list(
+        template.Template(
+            "{{ ['a', 'b', 'c'] | difference(['b', 'c', 'd']) }}", hass
+        ).async_render()
+    ) == ["a"]
+
+    assert (
+        template.Template("{{ difference([], [1, 2, 3]) }}", hass).async_render() == []
+    )
+
+    assert (
+        template.Template("{{ [] | difference([1, 2, 3]) }}", hass).async_render() == []
+    )
+
+    with pytest.raises(TemplateError, match="difference expected a list, got str"):
+        template.Template("{{ 'string' | difference([1, 2, 3]) }}", hass).async_render()
+
+    with pytest.raises(TemplateError, match="difference expected a list, got str"):
+        template.Template("{{ [1, 2, 3] | difference('string') }}", hass).async_render()
+
+
+def test_union(hass: HomeAssistant) -> None:
+    """Test the union function and filter."""
+    assert list(
+        template.Template(
+            "{{ union([1, 2, 5, 3, 4, 10], [1, 2, 3, 4, 5, 11, 99]) }}", hass
+        ).async_render()
+    ) == unordered([1, 2, 3, 4, 5, 10, 11, 99])
+
+    assert list(
+        template.Template(
+            "{{ [1, 2, 5, 3, 4, 10] | union([1, 2, 3, 4, 5, 11, 99]) }}", hass
+        ).async_render()
+    ) == unordered([1, 2, 3, 4, 5, 10, 11, 99])
+
+    assert list(
+        template.Template(
+            "{{ union(['a', 'b', 'c'], ['b', 'c', 'd']) }}", hass
+        ).async_render()
+    ) == unordered(["a", "b", "c", "d"])
+
+    assert list(
+        template.Template(
+            "{{ ['a', 'b', 'c'] | union(['b', 'c', 'd']) }}", hass
+        ).async_render()
+    ) == unordered(["a", "b", "c", "d"])
+
+    assert list(
+        template.Template("{{ union([], [1, 2, 3]) }}", hass).async_render()
+    ) == unordered([1, 2, 3])
+
+    assert list(
+        template.Template("{{ [] | union([1, 2, 3]) }}", hass).async_render()
+    ) == unordered([1, 2, 3])
+
+    with pytest.raises(TemplateError, match="union expected a list, got str"):
+        template.Template("{{ 'string' | union([1, 2, 3]) }}", hass).async_render()
+
+    with pytest.raises(TemplateError, match="union expected a list, got str"):
+        template.Template("{{ [1, 2, 3] | union('string') }}", hass).async_render()
+
+
+def test_symmetric_difference(hass: HomeAssistant) -> None:
+    """Test the symmetric_difference function and filter."""
+    assert list(
+        template.Template(
+            "{{ symmetric_difference([1, 2, 5, 3, 4, 10], [1, 2, 3, 4, 5, 11, 99]) }}",
+            hass,
+        ).async_render()
+    ) == unordered([10, 11, 99])
+
+    assert list(
+        template.Template(
+            "{{ [1, 2, 5, 3, 4, 10] | symmetric_difference([1, 2, 3, 4, 5, 11, 99]) }}",
+            hass,
+        ).async_render()
+    ) == unordered([10, 11, 99])
+
+    assert list(
+        template.Template(
+            "{{ symmetric_difference(['a', 'b', 'c'], ['b', 'c', 'd']) }}", hass
+        ).async_render()
+    ) == unordered(["a", "d"])
+
+    assert list(
+        template.Template(
+            "{{ ['a', 'b', 'c'] | symmetric_difference(['b', 'c', 'd']) }}", hass
+        ).async_render()
+    ) == unordered(["a", "d"])
+
+    assert list(
+        template.Template(
+            "{{ symmetric_difference([], [1, 2, 3]) }}", hass
+        ).async_render()
+    ) == unordered([1, 2, 3])
+
+    assert list(
+        template.Template(
+            "{{ [] | symmetric_difference([1, 2, 3]) }}", hass
+        ).async_render()
+    ) == unordered([1, 2, 3])
+
+    with pytest.raises(
+        TemplateError, match="symmetric_difference expected a list, got str"
+    ):
+        template.Template(
+            "{{ 'string' | symmetric_difference([1, 2, 3]) }}", hass
+        ).async_render()
+
+    with pytest.raises(
+        TemplateError, match="symmetric_difference expected a list, got str"
+    ):
+        template.Template(
+            "{{ [1, 2, 3] | symmetric_difference('string') }}", hass
+        ).async_render()
+
+
+def test_md5(hass: HomeAssistant) -> None:
+    """Test the md5 function and filter."""
+    assert (
+        template.Template("{{ md5('Home Assistant') }}", hass).async_render()
+        == "3d15e5c102c3413d0337393c3287e006"
+    )
+
+    assert (
+        template.Template("{{ 'Home Assistant' | md5 }}", hass).async_render()
+        == "3d15e5c102c3413d0337393c3287e006"
+    )
+
+
+def test_sha1(hass: HomeAssistant) -> None:
+    """Test the sha1 function and filter."""
+    assert (
+        template.Template("{{ sha1('Home Assistant') }}", hass).async_render()
+        == "c8fd3bb19b94312664faa619af7729bdbf6e9f8a"
+    )
+
+    assert (
+        template.Template("{{ 'Home Assistant' | sha1 }}", hass).async_render()
+        == "c8fd3bb19b94312664faa619af7729bdbf6e9f8a"
+    )
+
+
+def test_sha256(hass: HomeAssistant) -> None:
+    """Test the sha256 function and filter."""
+    assert (
+        template.Template("{{ sha256('Home Assistant') }}", hass).async_render()
+        == "2a366abb0cd47f51f3725bf0fb7ebcb4fefa6e20f4971e25fe2bb8da8145ce2b"
+    )
+
+    assert (
+        template.Template("{{ 'Home Assistant' | sha256 }}", hass).async_render()
+        == "2a366abb0cd47f51f3725bf0fb7ebcb4fefa6e20f4971e25fe2bb8da8145ce2b"
+    )
+
+
+def test_sha512(hass: HomeAssistant) -> None:
+    """Test the sha512 function and filter."""
+    assert (
+        template.Template("{{ sha512('Home Assistant') }}", hass).async_render()
+        == "9e3c2cdd1fbab0037378d37e1baf8a3a4bf92c54b56ad1d459deee30ccbb2acbebd7a3614552ea08992ad27dedeb7b4c5473525ba90cb73dbe8b9ec5f69295bb"
+    )
+
+    assert (
+        template.Template("{{ 'Home Assistant' | sha512 }}", hass).async_render()
+        == "9e3c2cdd1fbab0037378d37e1baf8a3a4bf92c54b56ad1d459deee30ccbb2acbebd7a3614552ea08992ad27dedeb7b4c5473525ba90cb73dbe8b9ec5f69295bb"
+    )
+
+
+def test_combine(hass: HomeAssistant) -> None:
+    """Test combine filter and function."""
+    assert template.Template(
+        "{{ {'a': 1, 'b': 2} | combine({'b': 3, 'c': 4}) }}", hass
+    ).async_render() == {"a": 1, "b": 3, "c": 4}
+
+    assert template.Template(
+        "{{ combine({'a': 1, 'b': 2}, {'b': 3, 'c': 4}) }}", hass
+    ).async_render() == {"a": 1, "b": 3, "c": 4}
+
+    assert template.Template(
+        "{{ combine({'a': 1, 'b': {'x': 1}}, {'b': {'y': 2}, 'c': 4}, recursive=True) }}",
+        hass,
+    ).async_render() == {"a": 1, "b": {"x": 1, "y": 2}, "c": 4}
+
+    # Test that recursive=False does not merge nested dictionaries
+    assert template.Template(
+        "{{ combine({'a': 1, 'b': {'x': 1}}, {'b': {'y': 2}, 'c': 4}, recursive=False) }}",
+        hass,
+    ).async_render() == {"a": 1, "b": {"y": 2}, "c": 4}
+
+    # Test that None values are handled correctly in recursive merge
+    assert template.Template(
+        "{{ combine({'a': 1, 'b': none}, {'b': {'y': 2}, 'c': 4}, recursive=True) }}",
+        hass,
+    ).async_render() == {"a": 1, "b": {"y": 2}, "c": 4}
+
+    with pytest.raises(
+        TemplateError, match="combine expected at least 1 argument, got 0"
+    ):
+        template.Template("{{ combine() }}", hass).async_render()
+
+    with pytest.raises(TemplateError, match="combine expected a dict, got str"):
+        template.Template("{{ {'a': 1} | combine('not a dict') }}", hass).async_render()
diff --git a/tests/helpers/test_update_coordinator.py b/tests/helpers/test_update_coordinator.py
index 539762a60ff..5fd9f9e39fd 100644
--- a/tests/helpers/test_update_coordinator.py
+++ b/tests/helpers/test_update_coordinator.py
@@ -4,6 +4,7 @@ from datetime import datetime, timedelta
 import logging
 from unittest.mock import AsyncMock, Mock, patch
 import urllib.error
+import weakref
 
 import aiohttp
 from freezegun.api import FrozenDateTimeFactory
@@ -12,13 +13,13 @@ import requests
 
 from homeassistant import config_entries
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
-from homeassistant.core import CoreState, HomeAssistant, callback
+from homeassistant.core import CALLBACK_TYPE, CoreState, HomeAssistant, callback
 from homeassistant.exceptions import (
     ConfigEntryAuthFailed,
     ConfigEntryError,
     ConfigEntryNotReady,
 )
-from homeassistant.helpers import frame, update_coordinator
+from homeassistant.helpers import update_coordinator
 from homeassistant.util.dt import utcnow
 
 from tests.common import MockConfigEntry, async_fire_time_changed
@@ -637,7 +638,6 @@ async def test_async_config_entry_first_refresh_invalid_state(
 
 
 @pytest.mark.usefixtures("mock_integration_frame")
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
 async def test_async_config_entry_first_refresh_invalid_state_in_integration(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
@@ -898,3 +898,41 @@ async def test_config_entry(hass: HomeAssistant) -> None:
         hass, _LOGGER, name="test", config_entry=another_entry
     )
     assert crd.config_entry is another_entry
+
+
+async def test_listener_unsubscribe_releases_coordinator(hass: HomeAssistant) -> None:
+    """Test listener subscribe/unsubscribe releases parent class.
+
+    See https://github.com/home-assistant/core/issues/137237
+    And https://github.com/home-assistant/core/pull/137338
+    """
+
+    class Subscriber:
+        _unsub: CALLBACK_TYPE | None = None
+
+        def start_listen(
+            self, coordinator: update_coordinator.DataUpdateCoordinator
+        ) -> None:
+            self._unsub = coordinator.async_add_listener(lambda: None)
+
+        def stop_listen(self) -> None:
+            self._unsub()
+            self._unsub = None
+
+    coordinator = update_coordinator.DataUpdateCoordinator[int](
+        hass, _LOGGER, name="test"
+    )
+    subscriber = Subscriber()
+    subscriber.start_listen(coordinator)
+
+    # Keep weak reference to the coordinator
+    weak_ref = weakref.ref(coordinator)
+    assert weak_ref() is not None
+
+    # Unload the subscriber, then shutdown the coordinator
+    subscriber.stop_listen()
+    await coordinator.async_shutdown()
+    del coordinator
+
+    # Ensure the coordinator is released
+    assert weak_ref() is None
diff --git a/tests/pylint/test_enforce_type_hints.py b/tests/pylint/test_enforce_type_hints.py
index 6c53e9832d9..efa3ca9523a 100644
--- a/tests/pylint/test_enforce_type_hints.py
+++ b/tests/pylint/test_enforce_type_hints.py
@@ -1370,7 +1370,7 @@ def test_valid_generic(
     async def async_setup_entry( #@
         hass: HomeAssistant,
         entry: {entry_annotation},
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         pass
     """,
@@ -1402,7 +1402,7 @@ def test_invalid_generic(
     async def async_setup_entry( #@
         hass: HomeAssistant,
         entry: {entry_annotation}, #@
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         pass
     """,
diff --git a/tests/script/test_gen_requirements_all.py b/tests/script/test_gen_requirements_all.py
index 519a5c21855..b667bdd3ddf 100644
--- a/tests/script/test_gen_requirements_all.py
+++ b/tests/script/test_gen_requirements_all.py
@@ -41,9 +41,9 @@ def test_requirement_override_markers() -> None:
     ):
         assert (
             gen_requirements_all.process_action_requirement(
-                "env-canada==0.7.2", "pytest"
+                "env-canada==0.8.0", "pytest"
             )
-            == "env-canada==0.7.2;python_version<'3.13'"
+            == "env-canada==0.8.0;python_version<'3.13'"
         )
         assert (
             gen_requirements_all.process_action_requirement("other==1.0", "pytest")
diff --git a/tests/snapshots/test_config.ambr b/tests/snapshots/test_config.ambr
index 6fcbce7d8d6..7531bf5a663 100644
--- a/tests/snapshots/test_config.ambr
+++ b/tests/snapshots/test_config.ambr
@@ -434,7 +434,7 @@
 # name: test_yaml_error[basic]
   '''
   mapping values are not allowed here
-    in "configuration.yaml", line 4, column 14
+    in "<BASE_PATH>/fixtures/core/config/yaml_errors/basic/configuration.yaml", line 4, column 14
   '''
 # ---
 # name: test_yaml_error[basic].1
@@ -448,7 +448,7 @@
 # name: test_yaml_error[basic_include]
   '''
   mapping values are not allowed here
-    in "integrations/iot_domain.yaml", line 3, column 12
+    in "<BASE_PATH>/fixtures/core/config/yaml_errors/basic_include/integrations/iot_domain.yaml", line 3, column 12
   '''
 # ---
 # name: test_yaml_error[basic_include].1
@@ -462,7 +462,7 @@
 # name: test_yaml_error[include_dir_list]
   '''
   mapping values are not allowed here
-    in "iot_domain/iot_domain_1.yaml", line 3, column 10
+    in "<BASE_PATH>/fixtures/core/config/yaml_errors/include_dir_list/iot_domain/iot_domain_1.yaml", line 3, column 10
   '''
 # ---
 # name: test_yaml_error[include_dir_list].1
@@ -476,7 +476,7 @@
 # name: test_yaml_error[include_dir_merge_list]
   '''
   mapping values are not allowed here
-    in "iot_domain/iot_domain_1.yaml", line 3, column 12
+    in "<BASE_PATH>/fixtures/core/config/yaml_errors/include_dir_merge_list/iot_domain/iot_domain_1.yaml", line 3, column 12
   '''
 # ---
 # name: test_yaml_error[include_dir_merge_list].1
@@ -490,7 +490,7 @@
 # name: test_yaml_error[packages_include_dir_named]
   '''
   mapping values are not allowed here
-    in "integrations/adr_0007_1.yaml", line 4, column 9
+    in "<BASE_PATH>/fixtures/core/config/yaml_errors/packages_include_dir_named/integrations/adr_0007_1.yaml", line 4, column 9
   '''
 # ---
 # name: test_yaml_error[packages_include_dir_named].1
diff --git a/tests/snapshots/test_config_entries.ambr b/tests/snapshots/test_config_entries.ambr
index 51e56f4874e..08b532677f4 100644
--- a/tests/snapshots/test_config_entries.ambr
+++ b/tests/snapshots/test_config_entries.ambr
@@ -16,6 +16,8 @@
     'pref_disable_new_entities': False,
     'pref_disable_polling': False,
     'source': 'user',
+    'subentries': list([
+    ]),
     'title': 'Mock Title',
     'unique_id': None,
     'version': 1,
diff --git a/tests/syrupy.py b/tests/syrupy.py
index 5b1e5faa23d..e028d5839cb 100644
--- a/tests/syrupy.py
+++ b/tests/syrupy.py
@@ -109,7 +109,11 @@ class HomeAssistantSnapshotSerializer(AmberDataSerializer):
             serializable_data = cls._serializable_issue_registry_entry(data)
         elif isinstance(data, dict) and "flow_id" in data and "handler" in data:
             serializable_data = cls._serializable_flow_result(data)
-        elif isinstance(data, dict) and set(data) == {"conversation_id", "response"}:
+        elif isinstance(data, dict) and set(data) == {
+            "conversation_id",
+            "response",
+            "continue_conversation",
+        }:
             serializable_data = cls._serializable_conversation_result(data)
         elif isinstance(data, vol.Schema):
             serializable_data = voluptuous_serialize.convert(data)
@@ -160,6 +164,7 @@ class HomeAssistantSnapshotSerializer(AmberDataSerializer):
             attrs.asdict(data)
             | {
                 "config_entries": ANY,
+                "config_entries_subentries": ANY,
                 "id": ANY,
             }
         )
@@ -188,6 +193,7 @@ class HomeAssistantSnapshotSerializer(AmberDataSerializer):
             attrs.asdict(data)
             | {
                 "config_entry_id": ANY,
+                "config_subentry_id": ANY,
                 "device_id": ANY,
                 "id": ANY,
                 "options": {k: dict(v) for k, v in data.options.items()},
diff --git a/tests/test_backup_restore.py b/tests/test_backup_restore.py
index 10ea64a6a61..7efe25c8428 100644
--- a/tests/test_backup_restore.py
+++ b/tests/test_backup_restore.py
@@ -1,7 +1,10 @@
 """Test methods in backup_restore."""
 
+from collections.abc import Generator
+import json
 from pathlib import Path
 import tarfile
+from typing import Any
 from unittest import mock
 
 import pytest
@@ -11,6 +14,23 @@ from homeassistant import backup_restore
 from .common import get_test_config_dir
 
 
+@pytest.fixture(autouse=True)
+def remove_restore_result_file() -> Generator[None]:
+    """Remove the restore result file."""
+    yield
+    Path(get_test_config_dir(".HA_RESTORE_RESULT")).unlink(missing_ok=True)
+
+
+def restore_result_file_content() -> dict[str, Any] | None:
+    """Return the content of the restore result file."""
+    try:
+        return json.loads(
+            Path(get_test_config_dir(".HA_RESTORE_RESULT")).read_text("utf-8")
+        )
+    except FileNotFoundError:
+        return None
+
+
 @pytest.mark.parametrize(
     ("side_effect", "content", "expected"),
     [
@@ -87,6 +107,11 @@ def test_restoring_backup_that_does_not_exist() -> None:
         ),
     ):
         assert backup_restore.restore_backup(Path(get_test_config_dir())) is False
+    assert restore_result_file_content() == {
+        "error": f"Backup file {backup_file_path} does not exist",
+        "error_type": "ValueError",
+        "success": False,
+    }
 
 
 def test_restoring_backup_when_instructions_can_not_be_read() -> None:
@@ -98,6 +123,7 @@ def test_restoring_backup_when_instructions_can_not_be_read() -> None:
         ),
     ):
         assert backup_restore.restore_backup(Path(get_test_config_dir())) is False
+    assert restore_result_file_content() is None
 
 
 def test_restoring_backup_that_is_not_a_file() -> None:
@@ -121,6 +147,11 @@ def test_restoring_backup_that_is_not_a_file() -> None:
         ),
     ):
         assert backup_restore.restore_backup(Path(get_test_config_dir())) is False
+    assert restore_result_file_content() == {
+        "error": f"Backup file {backup_file_path} does not exist",
+        "error_type": "ValueError",
+        "success": False,
+    }
 
 
 def test_aborting_for_older_versions() -> None:
@@ -152,6 +183,13 @@ def test_aborting_for_older_versions() -> None:
         ),
     ):
         assert backup_restore.restore_backup(config_dir) is True
+    assert restore_result_file_content() == {
+        "error": (
+            "You need at least Home Assistant version 9999.99.99 to restore this backup"
+        ),
+        "error_type": "ValueError",
+        "success": False,
+    }
 
 
 @pytest.mark.parametrize(
@@ -280,6 +318,11 @@ def test_removal_of_current_configuration_when_restoring(
         assert removed_directories == {
             Path(config_dir, d) for d in expected_removed_directories
         }
+    assert restore_result_file_content() == {
+        "error": None,
+        "error_type": None,
+        "success": True,
+    }
 
 
 def test_extracting_the_contents_of_a_backup_file() -> None:
@@ -332,6 +375,11 @@ def test_extracting_the_contents_of_a_backup_file() -> None:
         assert {
             member.name for member in extractall_mock.mock_calls[-1].kwargs["members"]
         } == {"data", "data/.HA_VERSION", "data/.storage", "data/www"}
+    assert restore_result_file_content() == {
+        "error": None,
+        "error_type": None,
+        "success": True,
+    }
 
 
 @pytest.mark.parametrize(
@@ -362,6 +410,11 @@ def test_remove_backup_file_after_restore(
     assert mock_unlink.call_count == unlink_calls
     for call in mock_unlink.mock_calls:
         assert call.args[0] == backup_file_path
+    assert restore_result_file_content() == {
+        "error": None,
+        "error_type": None,
+        "success": True,
+    }
 
 
 @pytest.mark.parametrize(
diff --git a/tests/test_block_async_io.py b/tests/test_block_async_io.py
index f42fbb9f4ef..337e5500718 100644
--- a/tests/test_block_async_io.py
+++ b/tests/test_block_async_io.py
@@ -459,3 +459,14 @@ async def test_open_calls_ignored_in_tests(caplog: pytest.LogCaptureFixture) ->
         pass
 
     assert "Detected blocking call to open with args" not in caplog.text
+
+
+async def test_protect_loop_set_default_verify_paths(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test SSLContext.set_default_verify_paths calls in the loop are logged."""
+    with patch.object(block_async_io, "_IN_TESTS", False):
+        block_async_io.enable()
+    context = ssl.create_default_context()
+    context.set_default_verify_paths()
+    assert "Detected blocking call to set_default_verify_paths" in caplog.text
diff --git a/tests/test_bootstrap.py b/tests/test_bootstrap.py
index 5adfe4fc40b..1fb87ac5ef6 100644
--- a/tests/test_bootstrap.py
+++ b/tests/test_bootstrap.py
@@ -12,7 +12,7 @@ from unittest.mock import AsyncMock, Mock, patch
 
 import pytest
 
-from homeassistant import bootstrap, config as config_util, loader, runner
+from homeassistant import bootstrap, config as config_util, core, loader, runner
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     BASE_PLATFORMS,
@@ -572,7 +572,7 @@ async def test_setup_after_deps_not_present(hass: HomeAssistant) -> None:
         MockModule(
             domain="second_dep",
             async_setup=gen_domain_setup("second_dep"),
-            partial_manifest={"after_dependencies": ["first_dep"]},
+            partial_manifest={"after_dependencies": ["first_dep", "root"]},
         ),
     )
 
@@ -787,6 +787,9 @@ async def test_setup_hass_recovery_mode(
 ) -> None:
     """Test it works."""
     with (
+        patch(
+            "homeassistant.core.HomeAssistant", wraps=core.HomeAssistant
+        ) as mock_hass,
         patch("homeassistant.components.browser.setup") as browser_setup,
         patch(
             "homeassistant.config_entries.ConfigEntries.async_domains",
@@ -805,6 +808,8 @@ async def test_setup_hass_recovery_mode(
             ),
         )
 
+    mock_hass.assert_called_once()
+
     assert "recovery_mode" in hass.config.components
     assert len(mock_mount_local_lib_path.mock_calls) == 0
 
@@ -1090,7 +1095,7 @@ async def test_tasks_logged_that_block_stage_1(
         patch.object(bootstrap, "STAGE_1_TIMEOUT", 0),
         patch.object(bootstrap, "COOLDOWN_TIME", 0),
         patch.object(
-            bootstrap, "STAGE_1_INTEGRATIONS", [*original_stage_1, "normal_integration"]
+            bootstrap, "STAGE_1_INTEGRATIONS", {*original_stage_1, "normal_integration"}
         ),
     ):
         await bootstrap._async_set_up_integrations(hass, {"normal_integration": {}})
@@ -1164,6 +1169,7 @@ async def test_bootstrap_is_cancellation_safe(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
     """Test cancellation during async_setup_component does not cancel bootstrap."""
+    mock_integration(hass, MockModule(domain="cancel_integration"))
     with patch.object(
         bootstrap, "async_setup_component", side_effect=asyncio.CancelledError
     ):
@@ -1176,10 +1182,22 @@ async def test_bootstrap_is_cancellation_safe(
 @pytest.mark.parametrize("load_registries", [False])
 async def test_bootstrap_empty_integrations(hass: HomeAssistant) -> None:
     """Test setting up an empty integrations does not raise."""
-    await bootstrap.async_setup_multi_components(hass, set(), {})
+    await bootstrap._async_setup_multi_components(hass, set(), {})
     await hass.async_block_till_done()
 
 
+@pytest.mark.parametrize("load_registries", [False])
+async def test_bootstrap_log_already_setup_stage(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test logging when all integrations in a stage were already setup."""
+    with patch.object(bootstrap, "STAGE_1_INTEGRATIONS", {"frontend"}):
+        await bootstrap._async_set_up_integrations(hass, {})
+        await hass.async_block_till_done()
+
+    assert "Already set up stage 1: {'frontend'}" in caplog.text
+
+
 @pytest.fixture(name="mock_mqtt_config_flow")
 def mock_mqtt_config_flow_fixture() -> Generator[None]:
     """Mock MQTT config flow."""
@@ -1311,7 +1329,7 @@ async def test_bootstrap_dependencies(
         ),
     ):
         bootstrap.async_set_domains_to_be_loaded(hass, {integration})
-        await bootstrap.async_setup_multi_components(hass, {integration}, {})
+        await bootstrap._async_setup_multi_components(hass, {integration}, {})
         await hass.async_block_till_done()
 
     for assertion in assertions:
@@ -1373,11 +1391,11 @@ async def test_pre_import_no_requirements(hass: HomeAssistant) -> None:
 
 
 @pytest.mark.timeout(20)
-async def test_bootstrap_does_not_preload_stage_1_integrations() -> None:
-    """Test that the bootstrap does not preload stage 1 integrations.
+async def test_bootstrap_does_not_preimport_stage_1_integrations() -> None:
+    """Test that the bootstrap does not preimport stage 1 integrations.
 
     If this test fails it means that stage1 integrations are being
-    loaded too soon and will not get their requirements updated
+    imported too soon and will not get their requirements updated
     before they are loaded at runtime.
     """
 
@@ -1391,13 +1409,9 @@ async def test_bootstrap_does_not_preload_stage_1_integrations() -> None:
     assert process.returncode == 0
     decoded_stdout = stdout.decode()
 
-    disallowed_integrations = bootstrap.STAGE_1_INTEGRATIONS.copy()
-    # zeroconf is a top level dep now
-    disallowed_integrations.remove("zeroconf")
-
     # Ensure no stage1 integrations have been imported
     # as a side effect of importing the pre-imports
-    for integration in disallowed_integrations:
+    for integration in bootstrap.STAGE_1_INTEGRATIONS:
         assert f"homeassistant.components.{integration}" not in decoded_stdout
 
 
@@ -1407,7 +1421,7 @@ async def test_cancellation_does_not_leak_upward_from_async_setup(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
     """Test setting up an integration that raises asyncio.CancelledError."""
-    await bootstrap.async_setup_multi_components(
+    await bootstrap._async_setup_multi_components(
         hass, {"test_package_raises_cancelled_error"}, {}
     )
     await hass.async_block_till_done()
@@ -1428,12 +1442,12 @@ async def test_cancellation_does_not_leak_upward_from_async_setup_entry(
         domain="test_package_raises_cancelled_error_config_entry", data={}
     )
     entry.add_to_hass(hass)
-    await bootstrap.async_setup_multi_components(
+    await bootstrap._async_setup_multi_components(
         hass, {"test_package_raises_cancelled_error_config_entry"}, {}
     )
     await hass.async_block_till_done()
 
-    await bootstrap.async_setup_multi_components(hass, {"test_package"}, {})
+    await bootstrap._async_setup_multi_components(hass, {"test_package"}, {})
     await hass.async_block_till_done()
     assert (
         "Error setting up entry Mock Title for test_package_raises_cancelled_error_config_entry"
@@ -1527,3 +1541,73 @@ def test_should_rollover_is_always_false() -> None:
         ).shouldRollover(Mock())
         is False
     )
+
+
+async def test_no_base_platforms_loaded_before_recorder(hass: HomeAssistant) -> None:
+    """Verify stage 0 not load base platforms before recorder.
+
+    If a stage 0 integration implements base platforms or has a base
+    platform in its dependencies and it loads before the recorder,
+    because of platform-based YAML schema, it may inadvertently
+    load integrations that expect the recorder to already be loaded.
+    We need to ensure that doesn't happen.
+    """
+    IGNORE_BASE_PLATFORM_FILES = {
+        # config/scene.py is not a platform
+        "config": {"scene.py"},
+        # websocket_api/sensor.py is using the platform YAML schema
+        # we must not migrate it to an integration key until
+        # we remove the platform YAML schema support for sensors
+        "websocket_api": {"sensor.py"},
+    }
+
+    integrations_before_recorder: set[str] = set()
+    for _, integrations, _ in bootstrap.STAGE_0_INTEGRATIONS:
+        integrations_before_recorder |= integrations
+        if "recorder" in integrations:
+            break
+    else:
+        pytest.fail("recorder not in stage 0")
+
+    integrations_or_excs = await loader.async_get_integrations(
+        hass, integrations_before_recorder
+    )
+    integrations: dict[str, Integration] = {}
+    for domain, integration in integrations_or_excs.items():
+        assert not isinstance(integrations_or_excs, Exception)
+        integrations[domain] = integration
+
+    integrations_all_dependencies = await loader.resolve_integrations_dependencies(
+        hass, integrations.values()
+    )
+    all_integrations = integrations.copy()
+    all_integrations.update(
+        (domain, loader.async_get_loaded_integration(hass, domain))
+        for domains in integrations_all_dependencies.values()
+        for domain in domains
+    )
+
+    problems: dict[str, set[str]] = {}
+    for domain in integrations:
+        domain_with_base_platforms_deps = (
+            integrations_all_dependencies[domain] & BASE_PLATFORMS
+        )
+        if domain_with_base_platforms_deps:
+            problems[domain] = domain_with_base_platforms_deps
+    assert not problems, (
+        f"Integrations that are setup before recorder have base platforms in their dependencies: {problems}"
+    )
+
+    base_platform_py_files = {f"{base_platform}.py" for base_platform in BASE_PLATFORMS}
+
+    for domain, integration in all_integrations.items():
+        integration_base_platforms_files = (
+            integration._top_level_files & base_platform_py_files
+        )
+        if ignore := IGNORE_BASE_PLATFORM_FILES.get(domain):
+            integration_base_platforms_files -= ignore
+        if integration_base_platforms_files:
+            problems[domain] = integration_base_platforms_files
+    assert not problems, (
+        f"Integrations that are setup before recorder implement base platforms: {problems}"
+    )
diff --git a/tests/test_circular_imports.py b/tests/test_circular_imports.py
index dfdee65b2b0..d6e730aae5e 100644
--- a/tests/test_circular_imports.py
+++ b/tests/test_circular_imports.py
@@ -7,11 +7,8 @@ import pytest
 
 from homeassistant.bootstrap import (
     CORE_INTEGRATIONS,
-    DEBUGGER_INTEGRATIONS,
     DEFAULT_INTEGRATIONS,
-    FRONTEND_INTEGRATIONS,
-    LOGGING_AND_HTTP_DEPS_INTEGRATIONS,
-    RECORDER_INTEGRATIONS,
+    STAGE_0_INTEGRATIONS,
     STAGE_1_INTEGRATIONS,
 )
 
@@ -21,11 +18,12 @@ from homeassistant.bootstrap import (
     "component",
     sorted(
         {
-            *DEBUGGER_INTEGRATIONS,
             *CORE_INTEGRATIONS,
-            *LOGGING_AND_HTTP_DEPS_INTEGRATIONS,
-            *FRONTEND_INTEGRATIONS,
-            *RECORDER_INTEGRATIONS,
+            *(
+                domain
+                for name, domains, timeout in STAGE_0_INTEGRATIONS
+                for domain in domains
+            ),
             *STAGE_1_INTEGRATIONS,
             *DEFAULT_INTEGRATIONS,
         }
diff --git a/tests/test_config_entries.py b/tests/test_config_entries.py
index 3ea1a16e898..e3b80ecc03f 100644
--- a/tests/test_config_entries.py
+++ b/tests/test_config_entries.py
@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import asyncio
 from collections.abc import Generator
+from contextlib import AbstractContextManager, nullcontext as does_not_raise
 from datetime import timedelta
 import logging
 import re
@@ -38,7 +39,7 @@ from homeassistant.exceptions import (
 )
 from homeassistant.helpers import entity_registry as er, frame, issue_registry as ir
 from homeassistant.helpers.discovery_flow import DiscoveryKey
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.json import json_dumps
 from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 from homeassistant.helpers.service_info.hassio import HassioServiceInfo
@@ -461,14 +462,22 @@ async def test_remove_entry(
         assert result
         return result
 
-    mock_remove_entry = AsyncMock(return_value=None)
+    remove_entry_calls = []
+
+    async def mock_remove_entry(
+        hass: HomeAssistant, entry: config_entries.ConfigEntry
+    ) -> None:
+        """Mock removing an entry."""
+        # Check that the entry is no longer in the config entries
+        assert not hass.config_entries.async_get_entry(entry.entry_id)
+        remove_entry_calls.append(None)
 
     entity = MockEntity(unique_id="1234", name="Test Entity")
 
     async def mock_setup_entry_platform(
         hass: HomeAssistant,
         entry: config_entries.ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setting up platform."""
         async_add_entities([entity])
@@ -511,6 +520,7 @@ async def test_remove_entry(
     assert len(entity_registry.entities) == 1
     entity_entry = list(entity_registry.entities.values())[0]
     assert entity_entry.config_entry_id == entry.entry_id
+    assert entity_entry.config_subentry_id is None
 
     # Remove entry
     result = await manager.async_remove("test2")
@@ -520,7 +530,7 @@ async def test_remove_entry(
     assert result == {"require_restart": False}
 
     # Check the remove callback was invoked.
-    assert mock_remove_entry.call_count == 1
+    assert len(remove_entry_calls) == 1
 
     # Check that config entry was removed.
     assert manager.async_entry_ids() == ["test1", "test3"]
@@ -534,6 +544,118 @@ async def test_remove_entry(
     assert not entity_entry_list
 
 
+async def test_remove_subentry(
+    hass: HomeAssistant,
+    manager: config_entries.ConfigEntries,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test that we can remove a subentry."""
+    subentry_id = "blabla"
+    update_listener_calls = []
+
+    async def mock_setup_entry(
+        hass: HomeAssistant, entry: config_entries.ConfigEntry
+    ) -> bool:
+        """Mock setting up entry."""
+        await hass.config_entries.async_forward_entry_setups(entry, ["light"])
+        return True
+
+    mock_remove_entry = AsyncMock(return_value=None)
+
+    entry_entity = MockEntity(unique_id="0001", name="Test Entry Entity")
+    subentry_entity = MockEntity(unique_id="0002", name="Test Subentry Entity")
+
+    async def mock_setup_entry_platform(
+        hass: HomeAssistant,
+        entry: config_entries.ConfigEntry,
+        async_add_entities: AddConfigEntryEntitiesCallback,
+    ) -> None:
+        """Mock setting up platform."""
+        async_add_entities([entry_entity])
+        async_add_entities([subentry_entity], config_subentry_id=subentry_id)
+
+    mock_integration(
+        hass,
+        MockModule(
+            "test",
+            async_setup_entry=mock_setup_entry,
+            async_remove_entry=mock_remove_entry,
+        ),
+    )
+    mock_platform(
+        hass, "test.light", MockPlatform(async_setup_entry=mock_setup_entry_platform)
+    )
+    mock_platform(hass, "test.config_flow", None)
+
+    entry = MockConfigEntry(
+        subentries_data=[
+            config_entries.ConfigSubentryData(
+                data={"first": True},
+                subentry_id=subentry_id,
+                subentry_type="test",
+                unique_id="unique",
+                title="Mock title",
+            )
+        ]
+    )
+
+    async def update_listener(
+        hass: HomeAssistant, entry: config_entries.ConfigEntry
+    ) -> None:
+        """Test function."""
+        assert entry.subentries == {}
+        update_listener_calls.append(None)
+
+    entry.add_update_listener(update_listener)
+    entry.add_to_manager(manager)
+
+    # Setup entry
+    await manager.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    # Check entity states got added
+    assert hass.states.get("light.test_entry_entity") is not None
+    assert hass.states.get("light.test_subentry_entity") is not None
+    assert len(hass.states.async_all()) == 2
+
+    # Check entities got added to entity registry
+    assert len(entity_registry.entities) == 2
+    entry_entity_entry = entity_registry.entities["light.test_entry_entity"]
+    assert entry_entity_entry.config_entry_id == entry.entry_id
+    assert entry_entity_entry.config_subentry_id is None
+    subentry_entity_entry = entity_registry.entities["light.test_subentry_entity"]
+    assert subentry_entity_entry.config_entry_id == entry.entry_id
+    assert subentry_entity_entry.config_subentry_id == subentry_id
+
+    # Remove subentry
+    result = manager.async_remove_subentry(entry, subentry_id)
+    assert len(update_listener_calls) == 1
+    await hass.async_block_till_done()
+
+    # Check that remove went well
+    assert result is True
+
+    # Check the remove callback was not invoked.
+    assert mock_remove_entry.call_count == 0
+
+    # Check that the config subentry was removed.
+    assert entry.subentries == {}
+
+    # Check that entity state has been removed
+    assert hass.states.get("light.test_entry_entity") is not None
+    assert hass.states.get("light.test_subentry_entity") is None
+    assert len(hass.states.async_all()) == 1
+
+    # Check that entity registry entry has been removed
+    entity_entry_list = list(entity_registry.entities)
+    assert entity_entry_list == ["light.test_entry_entity"]
+
+    # Try to remove the subentry again
+    with pytest.raises(config_entries.UnknownSubEntry):
+        manager.async_remove_subentry(entry, subentry_id)
+    assert len(update_listener_calls) == 1
+
+
 async def test_remove_entry_non_unique_unique_id(
     hass: HomeAssistant,
     manager: config_entries.ConfigEntries,
@@ -905,7 +1027,7 @@ async def test_entries_excludes_ignore_and_disabled(
 
 
 async def test_saving_and_loading(
-    hass: HomeAssistant, freezer: FrozenDateTimeFactory
+    hass: HomeAssistant, freezer: FrozenDateTimeFactory, hass_storage: dict[str, Any]
 ) -> None:
     """Test that we're saving and loading correctly."""
     mock_integration(
@@ -922,7 +1044,20 @@ async def test_saving_and_loading(
         async def async_step_user(self, user_input=None):
             """Test user step."""
             await self.async_set_unique_id("unique")
-            return self.async_create_entry(title="Test Title", data={"token": "abcd"})
+            subentries = [
+                config_entries.ConfigSubentryData(
+                    data={"foo": "bar"}, subentry_type="test", title="subentry 1"
+                ),
+                config_entries.ConfigSubentryData(
+                    data={"sun": "moon"},
+                    subentry_type="test",
+                    title="subentry 2",
+                    unique_id="very_unique",
+                ),
+            ]
+            return self.async_create_entry(
+                title="Test Title", data={"token": "abcd"}, subentries=subentries
+            )
 
     with mock_config_flow("test", TestFlow):
         await hass.config_entries.flow.async_init(
@@ -971,6 +1106,100 @@ async def test_saving_and_loading(
     # To execute the save
     await hass.async_block_till_done()
 
+    stored_data = hass_storage["core.config_entries"]
+    assert stored_data == {
+        "data": {
+            "entries": [
+                {
+                    "created_at": ANY,
+                    "data": {
+                        "token": "abcd",
+                    },
+                    "disabled_by": None,
+                    "discovery_keys": {},
+                    "domain": "test",
+                    "entry_id": ANY,
+                    "minor_version": 1,
+                    "modified_at": ANY,
+                    "options": {},
+                    "pref_disable_new_entities": True,
+                    "pref_disable_polling": True,
+                    "source": "user",
+                    "subentries": [
+                        {
+                            "data": {"foo": "bar"},
+                            "subentry_id": ANY,
+                            "subentry_type": "test",
+                            "title": "subentry 1",
+                            "unique_id": None,
+                        },
+                        {
+                            "data": {"sun": "moon"},
+                            "subentry_id": ANY,
+                            "subentry_type": "test",
+                            "title": "subentry 2",
+                            "unique_id": "very_unique",
+                        },
+                    ],
+                    "title": "Test Title",
+                    "unique_id": "unique",
+                    "version": 5,
+                },
+                {
+                    "created_at": ANY,
+                    "data": {
+                        "username": "bla",
+                    },
+                    "disabled_by": None,
+                    "discovery_keys": {
+                        "test": [
+                            {"domain": "test", "key": "blah", "version": 1},
+                        ],
+                    },
+                    "domain": "test",
+                    "entry_id": ANY,
+                    "minor_version": 1,
+                    "modified_at": ANY,
+                    "options": {},
+                    "pref_disable_new_entities": False,
+                    "pref_disable_polling": False,
+                    "source": "user",
+                    "subentries": [],
+                    "title": "Test 2 Title",
+                    "unique_id": None,
+                    "version": 3,
+                },
+                {
+                    "created_at": ANY,
+                    "data": {
+                        "username": "bla",
+                    },
+                    "disabled_by": None,
+                    "discovery_keys": {
+                        "test": [
+                            {"domain": "test", "key": ["a", "b"], "version": 1},
+                        ],
+                    },
+                    "domain": "test",
+                    "entry_id": ANY,
+                    "minor_version": 1,
+                    "modified_at": ANY,
+                    "options": {},
+                    "pref_disable_new_entities": False,
+                    "pref_disable_polling": False,
+                    "source": "user",
+                    "subentries": [],
+                    "title": "Test 2 Title",
+                    "unique_id": None,
+                    "version": 3,
+                },
+            ],
+        },
+        "key": "core.config_entries",
+        "minor_version": 5,
+        "version": 1,
+    }
+
     # Now load written data in new config manager
     manager = config_entries.ConfigEntries(hass, {})
     await manager.async_initialize()
@@ -983,6 +1212,25 @@ async def test_saving_and_loading(
     ):
         assert orig.as_dict() == loaded.as_dict()
 
+    hass.config_entries.async_update_entry(
+        entry_1,
+        pref_disable_polling=False,
+        pref_disable_new_entities=False,
+    )
+
+    # To trigger the call_later
+    freezer.tick(1.0)
+    async_fire_time_changed(hass)
+    # To execute the save
+    await hass.async_block_till_done()
+
+    # Assert no data is lost when storing again
+    expected_stored_data = stored_data
+    expected_stored_data["data"]["entries"][0]["modified_at"] = ANY
+    expected_stored_data["data"]["entries"][0]["pref_disable_new_entities"] = False
+    expected_stored_data["data"]["entries"][0]["pref_disable_polling"] = False
+    assert hass_storage["core.config_entries"] == expected_stored_data | {}
+
 
 @freeze_time("2024-02-14 12:00:00")
 async def test_as_dict(snapshot: SnapshotAssertion) -> None:
@@ -1144,7 +1392,7 @@ async def test_discovery_notification(
         notifications = async_get_persistent_notifications(hass)
         assert "config_entry_discovery" not in notifications
 
-        # Start first discovery flow to assert that reconfigure notification fires
+        # Start first discovery flow to assert that discovery notification fires
         flow1 = await hass.config_entries.flow.async_init(
             "test", context={"source": config_entries.SOURCE_DISCOVERY}
         )
@@ -1173,83 +1421,6 @@ async def test_discovery_notification(
         assert "config_entry_discovery" not in notifications
 
 
-async def test_reauth_notification(hass: HomeAssistant) -> None:
-    """Test that we create/dismiss a notification when source is reauth."""
-    mock_integration(hass, MockModule("test"))
-    mock_platform(hass, "test.config_flow", None)
-
-    entry = MockConfigEntry(title="test_title", domain="test")
-    entry.add_to_hass(hass)
-
-    class TestFlow(config_entries.ConfigFlow):
-        """Test flow."""
-
-        VERSION = 5
-
-        async def async_step_user(self, user_input):
-            """Test user step."""
-            return self.async_show_form(step_id="user_confirm")
-
-        async def async_step_user_confirm(self, user_input):
-            """Test user confirm step."""
-            return self.async_show_form(step_id="user_confirm")
-
-        async def async_step_reauth(self, user_input):
-            """Test reauth step."""
-            return self.async_show_form(step_id="reauth_confirm")
-
-        async def async_step_reauth_confirm(self, user_input):
-            """Test reauth confirm step."""
-            return self.async_abort(reason="test")
-
-    with mock_config_flow("test", TestFlow):
-        # Start user flow to assert that reconfigure notification doesn't fire
-        await hass.config_entries.flow.async_init(
-            "test", context={"source": config_entries.SOURCE_USER}
-        )
-
-        await hass.async_block_till_done()
-        notifications = async_get_persistent_notifications(hass)
-        assert "config_entry_reconfigure" not in notifications
-
-        # Start first reauth flow to assert that reconfigure notification fires
-        flow1 = await hass.config_entries.flow.async_init(
-            "test",
-            context={
-                "source": config_entries.SOURCE_REAUTH,
-                "entry_id": entry.entry_id,
-            },
-        )
-
-        await hass.async_block_till_done()
-        notifications = async_get_persistent_notifications(hass)
-        assert "config_entry_reconfigure" in notifications
-
-        # Start a second reauth flow so we can finish the first and assert that
-        # the reconfigure notification persists until the second one is complete
-        flow2 = await hass.config_entries.flow.async_init(
-            "test",
-            context={
-                "source": config_entries.SOURCE_REAUTH,
-                "entry_id": entry.entry_id,
-            },
-        )
-
-        flow1 = await hass.config_entries.flow.async_configure(flow1["flow_id"], {})
-        assert flow1["type"] == data_entry_flow.FlowResultType.ABORT
-
-        await hass.async_block_till_done()
-        notifications = async_get_persistent_notifications(hass)
-        assert "config_entry_reconfigure" in notifications
-
-        flow2 = await hass.config_entries.flow.async_configure(flow2["flow_id"], {})
-        assert flow2["type"] == data_entry_flow.FlowResultType.ABORT
-
-        await hass.async_block_till_done()
-        notifications = async_get_persistent_notifications(hass)
-        assert "config_entry_reconfigure" not in notifications
-
-
 async def test_reauth_issue(
     hass: HomeAssistant,
     manager: config_entries.ConfigEntries,
@@ -1416,6 +1587,117 @@ async def test_update_entry_options_and_trigger_listener(
     assert len(update_listener_calls) == 1
 
 
+async def test_updating_subentry_data(
+    manager: config_entries.ConfigEntries, freezer: FrozenDateTimeFactory
+) -> None:
+    """Test that we can update an entry data."""
+    created = dt_util.utcnow()
+    subentry_id = "blabla"
+    entry = MockConfigEntry(
+        subentries_data=[
+            config_entries.ConfigSubentryData(
+                data={"first": True},
+                subentry_id=subentry_id,
+                subentry_type="test",
+                unique_id="unique",
+                title="Mock title",
+            )
+        ]
+    )
+    subentry = entry.subentries[subentry_id]
+    entry.add_to_manager(manager)
+
+    assert len(manager.async_entries()) == 1
+    assert manager.async_entries()[0] == entry
+    assert entry.created_at == created
+    assert entry.modified_at == created
+
+    freezer.tick()
+
+    assert manager.async_update_subentry(entry, subentry) is False
+    assert entry.subentries == {
+        subentry_id: config_entries.ConfigSubentry(
+            data={"first": True},
+            subentry_id=subentry_id,
+            subentry_type="test",
+            title="Mock title",
+            unique_id="unique",
+        )
+    }
+    assert entry.modified_at == created
+    assert manager.async_entries()[0].modified_at == created
+
+    freezer.tick()
+    modified = dt_util.utcnow()
+
+    assert manager.async_update_subentry(entry, subentry, data={"second": True}) is True
+    assert entry.subentries == {
+        subentry_id: config_entries.ConfigSubentry(
+            data={"second": True},
+            subentry_id=subentry_id,
+            subentry_type="test",
+            title="Mock title",
+            unique_id="unique",
+        )
+    }
+    assert entry.modified_at == modified
+    assert manager.async_entries()[0].modified_at == modified
+
+
+async def test_update_subentry_and_trigger_listener(
+    hass: HomeAssistant, manager: config_entries.ConfigEntries
+) -> None:
+    """Test that we can update subentry and trigger listener."""
+    entry = MockConfigEntry(domain="test", options={"first": True})
+    entry.add_to_manager(manager)
+    update_listener_calls = []
+
+    subentry = config_entries.ConfigSubentry(
+        data={"test": "test"},
+        subentry_type="test",
+        unique_id="test",
+        title="Mock title",
+    )
+
+    async def update_listener(
+        hass: HomeAssistant, entry: config_entries.ConfigEntry
+    ) -> None:
+        """Test function."""
+        assert entry.subentries == expected_subentries
+        update_listener_calls.append(None)
+
+    entry.add_update_listener(update_listener)
+
+    expected_subentries = {subentry.subentry_id: subentry}
+    assert manager.async_add_subentry(entry, subentry) is True
+
+    await hass.async_block_till_done(wait_background_tasks=True)
+    assert entry.subentries == expected_subentries
+    assert len(update_listener_calls) == 1
+
+    assert (
+        manager.async_update_subentry(
+            entry,
+            subentry,
+            data={"test": "test2"},
+            title="New title",
+            unique_id="test2",
+        )
+        is True
+    )
+
+    await hass.async_block_till_done(wait_background_tasks=True)
+    assert entry.subentries == expected_subentries
+    assert len(update_listener_calls) == 2
+
+    expected_subentries = {}
+    assert manager.async_remove_subentry(entry, subentry.subentry_id) is True
+
+    await hass.async_block_till_done(wait_background_tasks=True)
+    assert entry.subentries == expected_subentries
+    assert len(update_listener_calls) == 3
+
+
 async def test_setup_raise_not_ready(
     hass: HomeAssistant,
     manager: config_entries.ConfigEntries,
@@ -1742,20 +2024,465 @@ async def test_entry_options_unknown_config_entry(
     mock_integration(hass, MockModule("test"))
     mock_platform(hass, "test.config_flow", None)
 
-    class TestFlow:
-        """Test flow."""
-
-        @staticmethod
-        @callback
-        def async_get_options_flow(config_entry):
-            """Test options flow."""
-
     with pytest.raises(config_entries.UnknownEntry):
         await manager.options.async_create_flow(
             "blah", context={"source": "test"}, data=None
         )
 
 
+async def test_create_entry_subentries(
+    hass: HomeAssistant, manager: config_entries.ConfigEntries
+) -> None:
+    """Test a config entry being created with subentries."""
+
+    subentrydata = config_entries.ConfigSubentryData(
+        data={"test": "test"},
+        title="Mock title",
+        subentry_type="test",
+        unique_id="test",
+    )
+
+    async def mock_async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+        """Mock setup."""
+        hass.async_create_task(
+            hass.config_entries.flow.async_init(
+                "comp",
+                context={"source": config_entries.SOURCE_IMPORT},
+                data={"data": "data", "subentry": subentrydata},
+            )
+        )
+        return True
+
+    async_setup_entry = AsyncMock(return_value=True)
+    mock_integration(
+        hass,
+        MockModule(
+            "comp", async_setup=mock_async_setup, async_setup_entry=async_setup_entry
+        ),
+    )
+    mock_platform(hass, "comp.config_flow", None)
+
+    class TestFlow(config_entries.ConfigFlow):
+        """Test flow."""
+
+        VERSION = 1
+
+        async def async_step_import(self, user_input):
+            """Test import step creating entry, with subentry."""
+            return self.async_create_entry(
+                title="title",
+                data={"example": user_input["data"]},
+                subentries=[user_input["subentry"]],
+            )
+
+    with patch.dict(config_entries.HANDLERS, {"comp": TestFlow}):
+        assert await async_setup_component(hass, "comp", {})
+
+        await hass.async_block_till_done()
+
+        assert len(async_setup_entry.mock_calls) == 1
+
+        entries = hass.config_entries.async_entries("comp")
+        assert len(entries) == 1
+        assert entries[0].supported_subentry_types == {}
+        assert entries[0].data == {"example": "data"}
+        assert len(entries[0].subentries) == 1
+        subentry_id = list(entries[0].subentries)[0]
+        subentry = config_entries.ConfigSubentry(
+            data=subentrydata["data"],
+            subentry_id=subentry_id,
+            subentry_type="test",
+            title=subentrydata["title"],
+            unique_id="test",
+        )
+        assert entries[0].subentries == {subentry_id: subentry}
+
+
+async def test_entry_subentry(
+    hass: HomeAssistant, manager: config_entries.ConfigEntries
+) -> None:
+    """Test that we can add a subentry to an entry."""
+    mock_integration(hass, MockModule("test"))
+    mock_platform(hass, "test.config_flow", None)
+    entry = MockConfigEntry(domain="test", data={"first": True})
+    entry.add_to_manager(manager)
+
+    class TestFlow(config_entries.ConfigFlow):
+        """Test flow."""
+
+        class SubentryFlowHandler(config_entries.ConfigSubentryFlow):
+            """Test subentry flow handler."""
+
+        @classmethod
+        @callback
+        def async_get_supported_subentry_types(
+            cls, config_entry: ConfigEntry
+        ) -> dict[str, type[config_entries.ConfigSubentryFlow]]:
+            return {"test": TestFlow.SubentryFlowHandler}
+
+    with mock_config_flow("test", TestFlow):
+        flow = await manager.subentries.async_create_flow(
+            (entry.entry_id, "test"), context={"source": "test"}, data=None
+        )
+
+        flow.handler = (entry.entry_id, "test")  # Set to keep reference to config entry
+
+        await manager.subentries.async_finish_flow(
+            flow,
+            {
+                "data": {"second": True},
+                "title": "Mock title",
+                "type": data_entry_flow.FlowResultType.CREATE_ENTRY,
+                "unique_id": "test",
+            },
+        )
+
+        assert entry.data == {"first": True}
+        assert entry.options == {}
+        subentry_id = list(entry.subentries)[0]
+        assert entry.subentries == {
+            subentry_id: config_entries.ConfigSubentry(
+                data={"second": True},
+                subentry_id=subentry_id,
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            )
+        }
+        assert entry.supported_subentry_types == {
+            "test": {"supports_reconfigure": False}
+        }
+
+
+async def test_subentry_flow(
+    hass: HomeAssistant, manager: config_entries.ConfigEntries
+) -> None:
+    """Test that we can execute a subentry flow."""
+    mock_integration(hass, MockModule("test"))
+    mock_platform(hass, "test.config_flow", None)
+    entry = MockConfigEntry(domain="test", data={"first": True})
+    entry.add_to_manager(manager)
+
+    class TestFlow(config_entries.ConfigFlow):
+        """Test flow."""
+
+        class SubentryFlowHandler(config_entries.ConfigSubentryFlow):
+            """Test subentry flow handler."""
+
+            async def async_step_user(self, user_input=None):
+                return self.async_create_entry(
+                    title="Mock title",
+                    data={"second": True},
+                    unique_id="test",
+                )
+
+        @classmethod
+        @callback
+        def async_get_supported_subentry_types(
+            cls, config_entry: ConfigEntry
+        ) -> dict[str, type[config_entries.ConfigSubentryFlow]]:
+            return {"test": TestFlow.SubentryFlowHandler}
+
+    with mock_config_flow("test", TestFlow):
+        result = await manager.subentries.async_init(
+            (entry.entry_id, "test"), context={"source": "user"}
+        )
+        assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+
+        assert entry.data == {"first": True}
+        assert entry.options == {}
+        subentry_id = list(entry.subentries)[0]
+        assert entry.subentries == {
+            subentry_id: config_entries.ConfigSubentry(
+                data={"second": True},
+                subentry_id=subentry_id,
+                subentry_type="test",
+                title="Mock title",
+                unique_id="test",
+            )
+        }
+        assert entry.supported_subentry_types == {
+            "test": {"supports_reconfigure": False}
+        }
+
+
+async def test_entry_subentry_non_string(
+    hass: HomeAssistant, manager: config_entries.ConfigEntries
+) -> None:
+    """Test adding an invalid subentry to an entry."""
+    mock_integration(hass, MockModule("test"))
+    mock_platform(hass, "test.config_flow", None)
+    entry = MockConfigEntry(domain="test", data={"first": True})
+    entry.add_to_manager(manager)
+
+    class TestFlow(config_entries.ConfigFlow):
+        """Test flow."""
+
+        class SubentryFlowHandler(config_entries.ConfigSubentryFlow):
+            """Test subentry flow handler."""
+
+        @classmethod
+        @callback
+        def async_get_supported_subentry_types(
+            cls, config_entry: ConfigEntry
+        ) -> dict[str, type[config_entries.ConfigSubentryFlow]]:
+            return {"test": TestFlow.SubentryFlowHandler}
+
+    with mock_config_flow("test", TestFlow):
+        flow = await manager.subentries.async_create_flow(
+            (entry.entry_id, "test"), context={"source": "test"}, data=None
+        )
+
+        flow.handler = (entry.entry_id, "test")  # Set to keep reference to config entry
+
+        with pytest.raises(HomeAssistantError):
+            await manager.subentries.async_finish_flow(
+                flow,
+                {
+                    "data": {"second": True},
+                    "title": "Mock title",
+                    "type": data_entry_flow.FlowResultType.CREATE_ENTRY,
+                    "unique_id": 123,
+                },
+            )
+
+
+@pytest.mark.parametrize("context", [None, {}, {"bla": "bleh"}])
+async def test_entry_subentry_no_context(
+    hass: HomeAssistant, manager: config_entries.ConfigEntries, context: dict | None
+) -> None:
+    """Test starting a subentry flow without "source" in context."""
+    mock_integration(hass, MockModule("test"))
+    mock_platform(hass, "test.config_flow", None)
+    entry = MockConfigEntry(domain="test", data={"first": True})
+    entry.add_to_manager(manager)
+
+    class TestFlow(config_entries.ConfigFlow):
+        """Test flow."""
+
+        class SubentryFlowHandler(config_entries.ConfigSubentryFlow):
+            """Test subentry flow handler."""
+
+        @classmethod
+        @callback
+        def async_get_supported_subentry_types(
+            cls, config_entry: ConfigEntry
+        ) -> dict[str, type[config_entries.ConfigSubentryFlow]]:
+            return {"test": TestFlow.SubentryFlowHandler}
+
+    with mock_config_flow("test", TestFlow), pytest.raises(KeyError):
+        await manager.subentries.async_create_flow(
+            (entry.entry_id, "test"), context=context, data=None
+        )
+
+
+@pytest.mark.parametrize(
+    ("unique_id", "expected_result"),
+    [(None, does_not_raise()), ("test", pytest.raises(HomeAssistantError))],
+)
+async def test_entry_subentry_duplicate(
+    hass: HomeAssistant,
+    manager: config_entries.ConfigEntries,
+    unique_id: str | None,
+    expected_result: AbstractContextManager,
+) -> None:
+    """Test adding a duplicated subentry to an entry."""
+    mock_integration(hass, MockModule("test"))
+    mock_platform(hass, "test.config_flow", None)
+    entry = MockConfigEntry(
+        domain="test",
+        data={"first": True},
+        subentries_data=[
+            config_entries.ConfigSubentryData(
+                data={},
+                subentry_id="blabla",
+                subentry_type="test",
+                title="Mock title",
+                unique_id=unique_id,
+            )
+        ],
+    )
+    entry.add_to_manager(manager)
+
+    class TestFlow(config_entries.ConfigFlow):
+        """Test flow."""
+
+        class SubentryFlowHandler(config_entries.ConfigSubentryFlow):
+            """Test subentry flow handler."""
+
+        @classmethod
+        @callback
+        def async_get_supported_subentry_types(
+            cls, config_entry: ConfigEntry
+        ) -> dict[str, type[config_entries.ConfigSubentryFlow]]:
+            return {"test": TestFlow.SubentryFlowHandler}
+
+    with mock_config_flow("test", TestFlow):
+        flow = await manager.subentries.async_create_flow(
+            (entry.entry_id, "test"), context={"source": "test"}, data=None
+        )
+
+        flow.handler = (entry.entry_id, "test")  # Set to keep reference to config entry
+
+        with expected_result:
+            await manager.subentries.async_finish_flow(
+                flow,
+                {
+                    "data": {"second": True},
+                    "title": "Mock title",
+                    "type": data_entry_flow.FlowResultType.CREATE_ENTRY,
+                    "unique_id": unique_id,
+                },
+            )
+
+
+async def test_entry_subentry_abort(
+    hass: HomeAssistant, manager: config_entries.ConfigEntries
+) -> None:
+    """Test that we can abort subentry flow."""
+    mock_integration(hass, MockModule("test"))
+    mock_platform(hass, "test.config_flow", None)
+    entry = MockConfigEntry(domain="test", data={"first": True})
+    entry.add_to_manager(manager)
+
+    class TestFlow(config_entries.ConfigFlow):
+        """Test flow."""
+
+        class SubentryFlowHandler(config_entries.ConfigSubentryFlow):
+            """Test subentry flow handler."""
+
+        @classmethod
+        @callback
+        def async_get_supported_subentry_types(
+            cls, config_entry: ConfigEntry
+        ) -> dict[str, type[config_entries.ConfigSubentryFlow]]:
+            return {"test": TestFlow.SubentryFlowHandler}
+
+    with mock_config_flow("test", TestFlow):
+        flow = await manager.subentries.async_create_flow(
+            (entry.entry_id, "test"), context={"source": "test"}, data=None
+        )
+
+        flow.handler = (entry.entry_id, "test")  # Set to keep reference to config entry
+
+        assert await manager.subentries.async_finish_flow(
+            flow, {"type": data_entry_flow.FlowResultType.ABORT, "reason": "test"}
+        )
+
+
+async def test_entry_subentry_unknown_config_entry(
+    hass: HomeAssistant, manager: config_entries.ConfigEntries
+) -> None:
+    """Test attempting to start a subentry flow for an unknown config entry."""
+    mock_integration(hass, MockModule("test"))
+    mock_platform(hass, "test.config_flow", None)
+
+    with pytest.raises(config_entries.UnknownEntry):
+        await manager.subentries.async_create_flow(
+            ("blah", "blah"), context={"source": "test"}, data=None
+        )
+
+
+async def test_entry_subentry_deleted_config_entry(
+    hass: HomeAssistant, manager: config_entries.ConfigEntries
+) -> None:
+    """Test attempting to finish a subentry flow for a deleted config entry."""
+    mock_integration(hass, MockModule("test"))
+    mock_platform(hass, "test.config_flow", None)
+    entry = MockConfigEntry(domain="test", data={"first": True})
+    entry.add_to_manager(manager)
+
+    class TestFlow(config_entries.ConfigFlow):
+        """Test flow."""
+
+        class SubentryFlowHandler(config_entries.ConfigSubentryFlow):
+            """Test subentry flow handler."""
+
+        @classmethod
+        @callback
+        def async_get_supported_subentry_types(
+            cls, config_entry: ConfigEntry
+        ) -> dict[str, type[config_entries.ConfigSubentryFlow]]:
+            return {"test": TestFlow.SubentryFlowHandler}
+
+    with mock_config_flow("test", TestFlow):
+        flow = await manager.subentries.async_create_flow(
+            (entry.entry_id, "test"), context={"source": "test"}, data=None
+        )
+
+        flow.handler = (entry.entry_id, "test")  # Set to keep reference to config entry
+
+        await hass.config_entries.async_remove(entry.entry_id)
+
+        with pytest.raises(config_entries.UnknownEntry):
+            await manager.subentries.async_finish_flow(
+                flow,
+                {
+                    "data": {"second": True},
+                    "title": "Mock title",
+                    "type": data_entry_flow.FlowResultType.CREATE_ENTRY,
+                    "unique_id": "test",
+                },
+            )
+
+
+async def test_entry_subentry_unsupported_subentry_type(
+    hass: HomeAssistant, manager: config_entries.ConfigEntries
+) -> None:
+    """Test attempting to start a subentry flow for a config entry without support."""
+    mock_integration(hass, MockModule("test"))
+    mock_platform(hass, "test.config_flow", None)
+    entry = MockConfigEntry(domain="test", data={"first": True})
+    entry.add_to_manager(manager)
+
+    class TestFlow(config_entries.ConfigFlow):
+        """Test flow."""
+
+        class SubentryFlowHandler(config_entries.ConfigSubentryFlow):
+            """Test subentry flow handler."""
+
+        @classmethod
+        @callback
+        def async_get_supported_subentry_types(
+            cls, config_entry: ConfigEntry
+        ) -> dict[str, type[config_entries.ConfigSubentryFlow]]:
+            return {"test": TestFlow.SubentryFlowHandler}
+
+    with (
+        mock_config_flow("test", TestFlow),
+        pytest.raises(data_entry_flow.UnknownHandler),
+    ):
+        await manager.subentries.async_create_flow(
+            (
+                entry.entry_id,
+                "unknown",
+            ),
+            context={"source": "test"},
+            data=None,
+        )
+
+
+async def test_entry_subentry_unsupported(
+    hass: HomeAssistant, manager: config_entries.ConfigEntries
+) -> None:
+    """Test attempting to start a subentry flow for a config entry without support."""
+    mock_integration(hass, MockModule("test"))
+    mock_platform(hass, "test.config_flow", None)
+    entry = MockConfigEntry(domain="test", data={"first": True})
+    entry.add_to_manager(manager)
+
+    class TestFlow(config_entries.ConfigFlow):
+        """Test flow."""
+
+    with (
+        mock_config_flow("test", TestFlow),
+        pytest.raises(data_entry_flow.UnknownHandler),
+    ):
+        await manager.subentries.async_create_flow(
+            (entry.entry_id, "test"), context={"source": "test"}, data=None
+        )
+
+
 async def test_entry_setup_succeed(
     hass: HomeAssistant, manager: config_entries.ConfigEntries
 ) -> None:
@@ -1815,29 +2542,49 @@ async def test_entry_setup_invalid_state(
     assert entry.state is state
 
 
-async def test_entry_unload_succeed(
-    hass: HomeAssistant, manager: config_entries.ConfigEntries
+@pytest.mark.parametrize(
+    ("unload_result", "expected_result", "expected_state", "has_runtime_data"),
+    [
+        (True, True, config_entries.ConfigEntryState.NOT_LOADED, False),
+        (False, False, config_entries.ConfigEntryState.FAILED_UNLOAD, True),
+    ],
+)
+async def test_entry_unload(
+    hass: HomeAssistant,
+    manager: config_entries.ConfigEntries,
+    unload_result: bool,
+    expected_result: bool,
+    expected_state: config_entries.ConfigEntryState,
+    has_runtime_data: bool,
 ) -> None:
     """Test that we can unload an entry."""
-    unloads_called = []
+    unload_entry_calls = []
 
-    async def verify_runtime_data(*args):
+    @callback
+    def verify_runtime_data() -> None:
         """Verify runtime data."""
         assert entry.runtime_data == 2
-        unloads_called.append(args)
-        return True
+
+    async def async_unload_entry(
+        hass: HomeAssistant, entry: config_entries.ConfigEntry
+    ) -> bool:
+        """Mock unload entry."""
+        unload_entry_calls.append(None)
+        verify_runtime_data()
+        assert entry.state is config_entries.ConfigEntryState.UNLOAD_IN_PROGRESS
+        return unload_result
 
     entry = MockConfigEntry(domain="comp", state=config_entries.ConfigEntryState.LOADED)
     entry.add_to_hass(hass)
     entry.async_on_unload(verify_runtime_data)
     entry.runtime_data = 2
 
-    mock_integration(hass, MockModule("comp", async_unload_entry=verify_runtime_data))
+    mock_integration(hass, MockModule("comp", async_unload_entry=async_unload_entry))
 
-    assert await manager.async_unload(entry.entry_id)
-    assert len(unloads_called) == 2
-    assert entry.state is config_entries.ConfigEntryState.NOT_LOADED
-    assert not hasattr(entry, "runtime_data")
+    assert await manager.async_unload(entry.entry_id) == expected_result
+    assert len(unload_entry_calls) == 1
+    assert entry.state is expected_state
+    assert hasattr(entry, "runtime_data") == has_runtime_data
 
 
 @pytest.mark.parametrize(
@@ -2742,37 +3489,97 @@ async def test_unique_id_not_update_existing_entry(
     assert len(async_reload.mock_calls) == 0
 
 
+ABORT_IN_PROGRESS = {
+    "type": data_entry_flow.FlowResultType.ABORT,
+    "reason": "already_in_progress",
+}
+
+
+@pytest.mark.parametrize(
+    ("existing_flow_source", "expected_result"),
+    # Test all sources except SOURCE_IGNORE
+    [
+        (config_entries.SOURCE_BLUETOOTH, ABORT_IN_PROGRESS),
+        (config_entries.SOURCE_DHCP, ABORT_IN_PROGRESS),
+        (config_entries.SOURCE_DISCOVERY, ABORT_IN_PROGRESS),
+        (config_entries.SOURCE_HARDWARE, ABORT_IN_PROGRESS),
+        (config_entries.SOURCE_HASSIO, ABORT_IN_PROGRESS),
+        (config_entries.SOURCE_HOMEKIT, ABORT_IN_PROGRESS),
+        (config_entries.SOURCE_IMPORT, ABORT_IN_PROGRESS),
+        (config_entries.SOURCE_INTEGRATION_DISCOVERY, ABORT_IN_PROGRESS),
+        (config_entries.SOURCE_MQTT, ABORT_IN_PROGRESS),
+        (config_entries.SOURCE_REAUTH, {"type": data_entry_flow.FlowResultType.FORM}),
+        (config_entries.SOURCE_RECONFIGURE, ABORT_IN_PROGRESS),
+        (config_entries.SOURCE_SSDP, ABORT_IN_PROGRESS),
+        (config_entries.SOURCE_SYSTEM, ABORT_IN_PROGRESS),
+        (config_entries.SOURCE_USB, ABORT_IN_PROGRESS),
+        (config_entries.SOURCE_USER, ABORT_IN_PROGRESS),
+        (config_entries.SOURCE_ZEROCONF, ABORT_IN_PROGRESS),
+    ],
+)
 async def test_unique_id_in_progress(
-    hass: HomeAssistant, manager: config_entries.ConfigEntries
+    hass: HomeAssistant,
+    manager: config_entries.ConfigEntries,
+    existing_flow_source: str,
+    expected_result: dict,
 ) -> None:
     """Test that we abort if there is already a flow in progress with same unique id."""
     mock_integration(hass, MockModule("comp"))
     mock_platform(hass, "comp.config_flow", None)
+    entry = MockConfigEntry(domain="comp")
+    entry.add_to_hass(hass)
 
     class TestFlow(config_entries.ConfigFlow):
         """Test flow."""
 
         VERSION = 1
 
+        async def _async_step_discovery_without_unique_id(self):
+            """Handle a flow initialized by discovery."""
+            return await self._async_step()
+
+        async def async_step_hardware(self, user_input=None):
+            """Test hardware step."""
+            return await self._async_step()
+
+        async def async_step_import(self, user_input=None):
+            """Test import step."""
+            return await self._async_step()
+
+        async def async_step_reauth(self, user_input=None):
+            """Test reauth step."""
+            return await self._async_step()
+
+        async def async_step_reconfigure(self, user_input=None):
+            """Test reconfigure step."""
+            return await self._async_step()
+
+        async def async_step_system(self, user_input=None):
+            """Test system step."""
+            return await self._async_step()
+
         async def async_step_user(self, user_input=None):
             """Test user step."""
+            return await self._async_step()
+
+        async def _async_step(self, user_input=None):
+            """Test step."""
             await self.async_set_unique_id("mock-unique-id")
             return self.async_show_form(step_id="discovery")
 
     with mock_config_flow("comp", TestFlow):
         # Create one to be in progress
         result = await manager.flow.async_init(
-            "comp", context={"source": config_entries.SOURCE_USER}
+            "comp", context={"source": existing_flow_source, "entry_id": entry.entry_id}
         )
         assert result["type"] == data_entry_flow.FlowResultType.FORM
 
-        # Will be canceled
         result2 = await manager.flow.async_init(
             "comp", context={"source": config_entries.SOURCE_USER}
         )
 
-    assert result2["type"] == data_entry_flow.FlowResultType.ABORT
-    assert result2["reason"] == "already_in_progress"
+    for k, v in expected_result.items():
+        assert result2[k] == v
 
 
 async def test_finish_flow_aborts_progress(
@@ -3909,21 +4716,20 @@ async def test_updating_entry_with_and_without_changes(
 
     assert manager.async_update_entry(entry) is False
 
-    for change in (
-        {"data": {"second": True, "third": 456}},
-        {"data": {"second": True}},
-        {"minor_version": 2},
-        {"options": {"hello": True}},
-        {"pref_disable_new_entities": True},
-        {"pref_disable_polling": True},
-        {"title": "sometitle"},
-        {"unique_id": "abcd1234"},
-        {"version": 2},
+    for change, expected_value in (
+        ({"data": {"second": True, "third": 456}}, {"second": True, "third": 456}),
+        ({"data": {"second": True}}, {"second": True}),
+        ({"minor_version": 2}, 2),
+        ({"options": {"hello": True}}, {"hello": True}),
+        ({"pref_disable_new_entities": True}, True),
+        ({"pref_disable_polling": True}, True),
+        ({"title": "sometitle"}, "sometitle"),
+        ({"unique_id": "abcd1234"}, "abcd1234"),
+        ({"version": 2}, 2),
     ):
         assert manager.async_update_entry(entry, **change) is True
         key = next(iter(change))
-        value = next(iter(change.values()))
-        assert getattr(entry, key) == value
+        assert getattr(entry, key) == expected_value
         assert manager.async_update_entry(entry, **change) is False
 
     assert manager.async_entry_for_domain_unique_id("test", "abc123") is None
@@ -3973,6 +4779,136 @@ async def test_entry_reload_calls_on_unload_listeners(
     assert entry.state is config_entries.ConfigEntryState.LOADED
 
 
+@pytest.mark.parametrize(
+    ("source_state", "target_state", "transition_method_name", "call_count"),
+    [
+        (
+            config_entries.ConfigEntryState.NOT_LOADED,
+            config_entries.ConfigEntryState.LOADED,
+            "async_setup",
+            2,
+        ),
+        (
+            config_entries.ConfigEntryState.LOADED,
+            config_entries.ConfigEntryState.NOT_LOADED,
+            "async_unload",
+            2,
+        ),
+        (
+            config_entries.ConfigEntryState.LOADED,
+            config_entries.ConfigEntryState.LOADED,
+            "async_reload",
+            4,
+        ),
+    ],
+)
+async def test_entry_state_change_calls_listener(
+    hass: HomeAssistant,
+    manager: config_entries.ConfigEntries,
+    source_state: config_entries.ConfigEntryState,
+    target_state: config_entries.ConfigEntryState,
+    transition_method_name: str,
+    call_count: int,
+) -> None:
+    """Test listeners get called on entry state changes."""
+    entry = MockConfigEntry(domain="comp", state=source_state)
+    entry.add_to_hass(hass)
+
+    mock_integration(
+        hass,
+        MockModule(
+            "comp",
+            async_setup=AsyncMock(return_value=True),
+            async_setup_entry=AsyncMock(return_value=True),
+            async_unload_entry=AsyncMock(return_value=True),
+        ),
+    )
+    mock_platform(hass, "comp.config_flow", None)
+    hass.config.components.add("comp")
+
+    mock_state_change_callback = Mock()
+    entry.async_on_state_change(mock_state_change_callback)
+
+    transition_method = getattr(manager, transition_method_name)
+    await transition_method(entry.entry_id)
+
+    assert len(mock_state_change_callback.mock_calls) == call_count
+    assert entry.state is target_state
+
+
+async def test_entry_state_change_listener_removed(
+    hass: HomeAssistant,
+    manager: config_entries.ConfigEntries,
+) -> None:
+    """Test state_change listener can be removed."""
+    entry = MockConfigEntry(
+        domain="comp", state=config_entries.ConfigEntryState.NOT_LOADED
+    )
+    entry.add_to_hass(hass)
+
+    mock_integration(
+        hass,
+        MockModule(
+            "comp",
+            async_setup=AsyncMock(return_value=True),
+            async_setup_entry=AsyncMock(return_value=True),
+            async_unload_entry=AsyncMock(return_value=True),
+        ),
+    )
+    mock_platform(hass, "comp.config_flow", None)
+    hass.config.components.add("comp")
+
+    mock_state_change_callback = Mock()
+    remove = entry.async_on_state_change(mock_state_change_callback)
+
+    await manager.async_setup(entry.entry_id)
+
+    assert len(mock_state_change_callback.mock_calls) == 2
+    assert entry.state is config_entries.ConfigEntryState.LOADED
+
+    remove()
+
+    await manager.async_unload(entry.entry_id)
+
+    # the listener should no longer be called
+    assert len(mock_state_change_callback.mock_calls) == 2
+    assert entry.state is config_entries.ConfigEntryState.NOT_LOADED
+
+
+async def test_entry_state_change_error_does_not_block_transition(
+    hass: HomeAssistant,
+    manager: config_entries.ConfigEntries,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test we transition states normally even if the callback throws in on_state_change."""
+    entry = MockConfigEntry(
+        title="test", domain="comp", state=config_entries.ConfigEntryState.NOT_LOADED
+    )
+    entry.add_to_hass(hass)
+
+    mock_integration(
+        hass,
+        MockModule(
+            "comp",
+            async_setup=AsyncMock(return_value=True),
+            async_setup_entry=AsyncMock(return_value=True),
+            async_unload_entry=AsyncMock(return_value=True),
+        ),
+    )
+    mock_platform(hass, "comp.config_flow", None)
+    hass.config.components.add("comp")
+
+    mock_state_change_callback = Mock(side_effect=Exception())
+
+    entry.async_on_state_change(mock_state_change_callback)
+
+    await manager.async_setup(entry.entry_id)
+
+    assert len(mock_state_change_callback.mock_calls) == 2
+    assert entry.state is config_entries.ConfigEntryState.LOADED
+    assert "Error calling on_state_change callback for test (comp)" in caplog.text
+
+
 async def test_setup_raise_entry_error(
     hass: HomeAssistant,
     manager: config_entries.ConfigEntries,
@@ -4810,7 +5746,6 @@ async def test_reauth_reconfigure_missing_entry(
 
 
 @pytest.mark.usefixtures("mock_integration_frame")
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
 @pytest.mark.parametrize(
     "source", [config_entries.SOURCE_REAUTH, config_entries.SOURCE_RECONFIGURE]
 )
@@ -5042,7 +5977,7 @@ async def test_async_wait_component_startup(hass: HomeAssistant) -> None:
     "integration_frame_path",
     ["homeassistant/components/my_integration", "homeassistant.core"],
 )
-@pytest.mark.usefixtures("mock_integration_frame")
+@pytest.mark.usefixtures("hass", "mock_integration_frame")
 async def test_options_flow_with_config_entry_core() -> None:
     """Test that OptionsFlowWithConfigEntry cannot be used in core."""
     entry = MockConfigEntry(
@@ -5056,8 +5991,7 @@ async def test_options_flow_with_config_entry_core() -> None:
 
 
 @pytest.mark.parametrize("integration_frame_path", ["custom_components/my_integration"])
-@pytest.mark.usefixtures("mock_integration_frame")
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
+@pytest.mark.usefixtures("hass", "mock_integration_frame")
 async def test_options_flow_with_config_entry(caplog: pytest.LogCaptureFixture) -> None:
     """Test that OptionsFlowWithConfigEntry doesn't mutate entry options."""
     entry = MockConfigEntry(
@@ -5443,6 +6377,207 @@ async def test_update_entry_and_reload(
     assert len(comp.async_unload_entry.mock_calls) == calls_entry_load_unload[1]
 
 
+@pytest.mark.parametrize(
+    (
+        "kwargs",
+        "expected_title",
+        "expected_unique_id",
+        "expected_data",
+        "raises",
+    ),
+    [
+        (
+            {
+                "unique_id": "5678",
+                "title": "Updated title",
+                "data": {"vendor": "data2"},
+            },
+            "Updated title",
+            "5678",
+            {"vendor": "data2"},
+            None,
+        ),
+        (
+            {
+                "unique_id": "1234",
+                "title": "Test",
+                "data": {"vendor": "data"},
+            },
+            "Test",
+            "1234",
+            {"vendor": "data"},
+            None,
+        ),
+        (
+            {},
+            "Test",
+            "1234",
+            {"vendor": "data"},
+            None,
+        ),
+        (
+            {
+                "data": {"buyer": "me"},
+            },
+            "Test",
+            "1234",
+            {"buyer": "me"},
+            None,
+        ),
+        (
+            {"data_updates": {"buyer": "me"}},
+            "Test",
+            "1234",
+            {"vendor": "data", "buyer": "me"},
+            None,
+        ),
+        (
+            {
+                "unique_id": "5678",
+                "title": "Updated title",
+                "data": {"vendor": "data2"},
+                "data_updates": {"buyer": "me"},
+            },
+            "Test",
+            "1234",
+            {"vendor": "data"},
+            ValueError,
+        ),
+    ],
+    ids=[
+        "changed_entry_default",
+        "unchanged_entry_default",
+        "no_kwargs",
+        "replace_data",
+        "update_data",
+        "update_and_data_raises",
+    ],
+)
+async def test_update_subentry_and_abort(
+    hass: HomeAssistant,
+    expected_title: str,
+    expected_unique_id: str,
+    expected_data: dict[str, Any],
+    kwargs: dict[str, Any],
+    raises: type[Exception] | None,
+) -> None:
+    """Test updating an entry and reloading."""
+    subentry_id = "blabla"
+    entry = MockConfigEntry(
+        domain="comp",
+        unique_id="entry_unique_id",
+        title="entry_title",
+        data={},
+        subentries_data=[
+            config_entries.ConfigSubentryData(
+                data={"vendor": "data"},
+                subentry_id=subentry_id,
+                subentry_type="test",
+                unique_id="1234",
+                title="Test",
+            )
+        ],
+    )
+    entry.add_to_hass(hass)
+    subentry = entry.subentries[subentry_id]
+
+    comp = MockModule("comp")
+    mock_integration(hass, comp)
+    mock_platform(hass, "comp.config_flow", None)
+
+    class TestFlow(config_entries.ConfigFlow):
+        class SubentryFlowHandler(config_entries.ConfigSubentryFlow):
+            async def async_step_reconfigure(self, user_input=None):
+                return self.async_update_and_abort(
+                    self._get_entry(),
+                    self._get_reconfigure_subentry(),
+                    **kwargs,
+                )
+
+        @classmethod
+        @callback
+        def async_get_supported_subentry_types(
+            cls, config_entry: config_entries.ConfigEntry
+        ) -> dict[str, type[config_entries.ConfigSubentryFlow]]:
+            return {"test": TestFlow.SubentryFlowHandler}
+
+    err: Exception
+    with mock_config_flow("comp", TestFlow):
+        try:
+            result = await entry.start_subentry_reconfigure_flow(
+                hass, "test", subentry_id
+            )
+        except Exception as ex:  # noqa: BLE001
+            err = ex
+
+    await hass.async_block_till_done()
+
+    subentry = entry.subentries[subentry_id]
+    assert subentry.title == expected_title
+    assert subentry.unique_id == expected_unique_id
+    assert subentry.data == expected_data
+    if raises:
+        assert isinstance(err, raises)
+    else:
+        assert result["type"] == FlowResultType.ABORT
+        assert result["reason"] == "reconfigure_successful"
+
+
+async def test_reconfigure_subentry_create_subentry(hass: HomeAssistant) -> None:
+    """Test it's not allowed to create a subentry from a subentry reconfigure flow."""
+    subentry_id = "blabla"
+    entry = MockConfigEntry(
+        domain="comp",
+        unique_id="entry_unique_id",
+        title="entry_title",
+        data={},
+        subentries_data=[
+            config_entries.ConfigSubentryData(
+                data={"vendor": "data"},
+                subentry_id=subentry_id,
+                subentry_type="test",
+                unique_id="1234",
+                title="Test",
+            )
+        ],
+    )
+    entry.add_to_hass(hass)
+
+    comp = MockModule("comp")
+    mock_integration(hass, comp)
+    mock_platform(hass, "comp.config_flow", None)
+
+    class TestFlow(config_entries.ConfigFlow):
+        class SubentryFlowHandler(config_entries.ConfigSubentryFlow):
+            async def async_step_reconfigure(self, user_input=None):
+                return self.async_create_entry(title="New Subentry", data={})
+
+        @classmethod
+        @callback
+        def async_get_supported_subentry_types(
+            cls, config_entry: config_entries.ConfigEntry
+        ) -> dict[str, type[config_entries.ConfigSubentryFlow]]:
+            return {"test": TestFlow.SubentryFlowHandler}
+
+    with (
+        mock_config_flow("comp", TestFlow),
+        pytest.raises(ValueError, match="Source is reconfigure, expected user"),
+    ):
+        await entry.start_subentry_reconfigure_flow(hass, "test", subentry_id)
+
+    await hass.async_block_till_done()
+
+    assert entry.subentries == {
+        subentry_id: config_entries.ConfigSubentry(
+            data={"vendor": "data"},
+            subentry_id=subentry_id,
+            subentry_type="test",
+            title="Test",
+            unique_id="1234",
+        )
+    }
+
+
 @pytest.mark.parametrize("unique_id", [["blah", "bleh"], {"key": "value"}])
 async def test_unhashable_unique_id_fails(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture, unique_id: Any
@@ -5457,6 +6592,7 @@ async def test_unhashable_unique_id_fails(
         minor_version=1,
         options={},
         source="test",
+        subentries_data=(),
         title="title",
         unique_id=unique_id,
         version=1,
@@ -5492,6 +6628,7 @@ async def test_unhashable_unique_id_fails_on_update(
         minor_version=1,
         options={},
         source="test",
+        subentries_data=(),
         title="title",
         unique_id="123",
         version=1,
@@ -5522,6 +6659,7 @@ async def test_string_unique_id_no_warning(
         minor_version=1,
         options={},
         source="test",
+        subentries_data=(),
         title="title",
         unique_id="123",
         version=1,
@@ -5564,6 +6702,7 @@ async def test_hashable_unique_id(
         minor_version=1,
         options={},
         source="test",
+        subentries_data=(),
         title="title",
         unique_id=unique_id,
         version=1,
@@ -5598,6 +6737,7 @@ async def test_no_unique_id_no_warning(
         minor_version=1,
         options={},
         source="test",
+        subentries_data=(),
         title="title",
         unique_id=None,
         version=1,
@@ -5981,6 +7121,23 @@ async def test_updating_non_added_entry_raises(hass: HomeAssistant) -> None:
         hass.config_entries.async_update_entry(entry, unique_id="new_id")
 
 
+async def test_updating_non_added_subentry_raises(hass: HomeAssistant) -> None:
+    """Test updating a non added entry raises UnknownEntry."""
+    entry = MockConfigEntry(domain="test")
+    subentry = config_entries.ConfigSubentry(
+        data={},
+        subentry_type="test",
+        title="Mock title",
+        unique_id="unique",
+    )
+
+    with pytest.raises(config_entries.UnknownEntry, match=entry.entry_id):
+        hass.config_entries.async_update_subentry(entry, subentry, unique_id="new_id")
+    entry.add_to_hass(hass)
+    with pytest.raises(config_entries.UnknownSubEntry, match=subentry.subentry_id):
+        hass.config_entries.async_update_subentry(entry, subentry, unique_id="new_id")
+
+
 async def test_reload_during_setup(hass: HomeAssistant) -> None:
     """Test reload during setup waits."""
     entry = MockConfigEntry(domain="comp", data={"value": "initial"})
@@ -6062,7 +7219,7 @@ async def test_raise_wrong_exception_in_forwarded_platform(
     async def mock_setup_entry_platform(
         hass: HomeAssistant,
         entry: config_entries.ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setting up platform."""
         raise exc
@@ -6136,7 +7293,7 @@ async def test_config_entry_unloaded_during_platform_setups(
     async def mock_setup_entry_platform(
         hass: HomeAssistant,
         entry: config_entries.ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setting up platform."""
         await asyncio.sleep(0)
@@ -6208,7 +7365,7 @@ async def test_non_awaited_async_forward_entry_setups(
     async def mock_setup_entry_platform(
         hass: HomeAssistant,
         entry: config_entries.ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setting up platform."""
         await forward_event.wait()
@@ -6280,7 +7437,7 @@ async def test_non_awaited_async_forward_entry_setup(
     async def mock_setup_entry_platform(
         hass: HomeAssistant,
         entry: config_entries.ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setting up platform."""
         await forward_event.wait()
@@ -6355,7 +7512,7 @@ async def test_config_entry_unloaded_during_platform_setup(
     async def mock_setup_entry_platform(
         hass: HomeAssistant,
         entry: config_entries.ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setting up platform."""
         await asyncio.sleep(0)
@@ -6430,7 +7587,7 @@ async def test_config_entry_late_platform_setup(
     async def mock_setup_entry_platform(
         hass: HomeAssistant,
         entry: config_entries.ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
+        async_add_entities: AddConfigEntryEntitiesCallback,
     ) -> None:
         """Mock setting up platform."""
         await asyncio.sleep(0)
@@ -6522,6 +7679,7 @@ async def test_migration_from_1_2(
                     "pref_disable_new_entities": False,
                     "pref_disable_polling": False,
                     "source": "import",
+                    "subentries": {},
                     "title": "Sun",
                     "unique_id": None,
                     "version": 1,
@@ -6848,7 +8006,7 @@ async def test_get_reauth_entry(
 async def test_get_reconfigure_entry(
     hass: HomeAssistant, manager: config_entries.ConfigEntries
 ) -> None:
-    """Test _get_context_entry behavior."""
+    """Test _get_reconfigure_entry behavior."""
     entry = MockConfigEntry(
         title="test_title",
         domain="test",
@@ -6923,6 +8081,114 @@ async def test_get_reconfigure_entry(
         assert result["reason"] == "Source is user, expected reconfigure: -"
 
 
+async def test_subentry_get_entry(
+    hass: HomeAssistant, manager: config_entries.ConfigEntries
+) -> None:
+    """Test subentry _get_entry and _get_reconfigure_subentry behavior."""
+    subentry_id = "mock_subentry_id"
+    entry = MockConfigEntry(
+        data={},
+        domain="test",
+        entry_id="mock_entry_id",
+        title="entry_title",
+        unique_id="entry_unique_id",
+        subentries_data=[
+            config_entries.ConfigSubentryData(
+                data={"vendor": "data"},
+                subentry_id=subentry_id,
+                subentry_type="test",
+                unique_id="1234",
+                title="Test",
+            )
+        ],
+    )
+
+    entry.add_to_hass(hass)
+
+    mock_integration(hass, MockModule("test"))
+    mock_platform(hass, "test.config_flow", None)
+
+    class TestFlow(config_entries.ConfigFlow):
+        class SubentryFlowHandler(config_entries.ConfigSubentryFlow):
+            async def async_step_user(self, user_input=None):
+                """Test user step."""
+                return await self._async_step_confirm()
+
+            async def async_step_reconfigure(self, user_input=None):
+                """Test reauth step."""
+                return await self._async_step_confirm()
+
+            async def _async_step_confirm(self):
+                """Confirm input."""
+                try:
+                    entry = self._get_entry()
+                except ValueError as err:
+                    reason = str(err)
+                else:
+                    reason = f"Found entry {entry.title}"
+                try:
+                    entry_id = self._entry_id
+                except ValueError:
+                    reason = f"{reason}: -"
+                else:
+                    reason = f"{reason}: {entry_id}"
+
+                try:
+                    subentry = self._get_reconfigure_subentry()
+                except ValueError as err:
+                    reason = f"{reason}/{err}"
+                except config_entries.UnknownSubEntry:
+                    reason = f"{reason}/Subentry not found"
+                else:
+                    reason = f"{reason}/Found subentry {subentry.title}"
+                try:
+                    subentry_id = self._reconfigure_subentry_id
+                except ValueError:
+                    reason = f"{reason}: -"
+                else:
+                    reason = f"{reason}: {subentry_id}"
+                return self.async_abort(reason=reason)
+
+        @classmethod
+        @callback
+        def async_get_supported_subentry_types(
+            cls, config_entry: config_entries.ConfigEntry
+        ) -> dict[str, type[config_entries.ConfigSubentryFlow]]:
+            return {"test": TestFlow.SubentryFlowHandler}
+
+    # A reconfigure flow finds the config entry and subentry
+    with mock_config_flow("test", TestFlow):
+        result = await entry.start_subentry_reconfigure_flow(hass, "test", subentry_id)
+        assert (
+            result["reason"]
+            == "Found entry entry_title: mock_entry_id/Found subentry Test: mock_subentry_id"
+        )
+
+    # The subentry_id does not exist
+    with mock_config_flow("test", TestFlow):
+        result = await manager.subentries.async_init(
+            (entry.entry_id, "test"),
+            context={
+                "source": config_entries.SOURCE_RECONFIGURE,
+                "subentry_id": "01JRemoved",
+            },
+        )
+        assert (
+            result["reason"]
+            == "Found entry entry_title: mock_entry_id/Subentry not found: 01JRemoved"
+        )
+
+    # A user flow finds the config entry but not the subentry
+    with mock_config_flow("test", TestFlow):
+        result = await manager.subentries.async_init(
+            (entry.entry_id, "test"), context={"source": config_entries.SOURCE_USER}
+        )
+        assert (
+            result["reason"]
+            == "Found entry entry_title: mock_entry_id/Source is user, expected reconfigure: -"
+        )
+
+
 async def test_reauth_helper_alignment(
     hass: HomeAssistant,
     manager: config_entries.ConfigEntries,
@@ -7504,7 +8770,6 @@ async def test_options_flow_config_entry(
 
 @pytest.mark.parametrize("integration_frame_path", ["custom_components/my_integration"])
 @pytest.mark.usefixtures("mock_integration_frame")
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
 async def test_options_flow_deprecated_config_entry_setter(
     hass: HomeAssistant,
     manager: config_entries.ConfigEntries,
@@ -7564,7 +8829,8 @@ async def test_options_flow_deprecated_config_entry_setter(
         "config_entry explicitly, which is deprecated at "
         "custom_components/my_integration/light.py, line 23: "
         "self.light.is_on. This will stop working in Home Assistant 2025.12, please "
-        "create a bug report at " in caplog.text
+        "report it to the author of the 'my_integration' custom integration"
+        in caplog.text
     )
 
 
@@ -7614,3 +8880,63 @@ async def test_add_description_placeholder_automatically_not_overwrites(
     result = await hass.config_entries.flow.async_configure(flows[0]["flow_id"], None)
     assert result["type"] == FlowResultType.FORM
     assert result["description_placeholders"] == {"name": "Custom title"}
+
+
+@pytest.mark.parametrize(
+    ("domain", "expected_log"),
+    [
+        ("some_integration", True),
+        ("mobile_app", False),
+    ],
+)
+async def test_create_entry_existing_unique_id(
+    hass: HomeAssistant,
+    domain: str,
+    expected_log: bool,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test to highlight unexpected behavior on create_entry."""
+    entry = MockConfigEntry(
+        title="From config flow",
+        domain=domain,
+        entry_id="01J915Q6T9F6G5V0QJX6HBC94T",
+        data={"host": "any", "port": 123},
+        unique_id="mock-unique-id",
+    )
+    entry.add_to_hass(hass)
+
+    assert len(hass.config_entries.async_entries(domain)) == 1
+
+    mock_setup_entry = AsyncMock(return_value=True)
+
+    mock_integration(hass, MockModule(domain, async_setup_entry=mock_setup_entry))
+    mock_platform(hass, f"{domain}.config_flow", None)
+
+    class TestFlow(config_entries.ConfigFlow):
+        """Test flow."""
+
+        VERSION = 1
+
+        async def async_step_user(self, user_input=None):
+            """Test user step."""
+            await self.async_set_unique_id("mock-unique-id")
+            return self.async_create_entry(title="mock-title", data={})
+
+    with (
+        mock_config_flow(domain, TestFlow),
+        patch.object(frame, "_REPORTED_INTEGRATIONS", set()),
+    ):
+        result = await hass.config_entries.flow.async_init(
+            domain, context={"source": config_entries.SOURCE_USER}
+        )
+        await hass.async_block_till_done()
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+
+    assert len(hass.config_entries.async_entries(domain)) == 1
+
+    log_text = (
+        f"Detected that integration '{domain}' creates a config entry "
+        "when another entry with the same unique ID exists. Please "
+        "create a bug report at https:"
+    )
+    assert (log_text in caplog.text) == expected_log
diff --git a/tests/test_data_entry_flow.py b/tests/test_data_entry_flow.py
index 74a55cb4989..86ba5257001 100644
--- a/tests/test_data_entry_flow.py
+++ b/tests/test_data_entry_flow.py
@@ -133,6 +133,61 @@ async def test_show_form(manager: MockFlowManager) -> None:
     assert form["errors"] == {"username": "Should be unique."}
 
 
+async def test_form_shows_with_added_suggested_values(manager: MockFlowManager) -> None:
+    """Test that we can show a form with suggested values."""
+    schema = vol.Schema(
+        {
+            vol.Required("username"): str,
+            vol.Required("password"): str,
+            vol.Required("section_1"): data_entry_flow.section(
+                vol.Schema(
+                    {
+                        vol.Optional("full_name"): str,
+                    }
+                ),
+                {"collapsed": False},
+            ),
+        }
+    )
+
+    @manager.mock_reg_handler("test")
+    class TestFlow(data_entry_flow.FlowHandler):
+        async def async_step_init(self, user_input=None):
+            data_schema = self.add_suggested_values_to_schema(
+                schema,
+                {
+                    "username": "doej",
+                    "password": "verySecret1",
+                    "section_1": {"full_name": "John Doe"},
+                },
+            )
+            return self.async_show_form(
+                step_id="init",
+                data_schema=data_schema,
+            )
+
+    form = await manager.async_init("test")
+    assert form["type"] == data_entry_flow.FlowResultType.FORM
+    assert form["data_schema"].schema == schema.schema
+    markers = list(form["data_schema"].schema)
+    assert len(markers) == 3
+    assert markers[0] == "username"
+    assert markers[0].description == {"suggested_value": "doej"}
+    assert markers[1] == "password"
+    assert markers[1].description == {"suggested_value": "verySecret1"}
+    assert markers[2] == "section_1"
+    section_validator = form["data_schema"].schema["section_1"]
+    assert isinstance(section_validator, data_entry_flow.section)
+    # The section class was not replaced
+    assert section_validator is schema.schema["section_1"]
+    # The section schema was not replaced
+    assert section_validator.schema is schema.schema["section_1"].schema
+    section_markers = list(section_validator.schema.schema)
+    assert len(section_markers) == 1
+    assert section_markers[0] == "full_name"
+    assert section_markers[0].description == {"suggested_value": "John Doe"}
+
+
 async def test_abort_removes_instance(manager: MockFlowManager) -> None:
     """Test that abort removes the flow from progress."""
 
diff --git a/tests/test_loader.py b/tests/test_loader.py
index 4c3c4eb309f..0b83ddee3ea 100644
--- a/tests/test_loader.py
+++ b/tests/test_loader.py
@@ -15,7 +15,6 @@ from homeassistant import loader
 from homeassistant.components import http, hue
 from homeassistant.components.hue import light as hue_light
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import frame
 from homeassistant.helpers.json import json_dumps
 from homeassistant.util.json import json_loads
 
@@ -28,40 +27,91 @@ async def test_circular_component_dependencies(hass: HomeAssistant) -> None:
     mock_integration(hass, MockModule("mod2", dependencies=["mod1"]))
     mock_integration(hass, MockModule("mod3", dependencies=["mod1"]))
     mod_4 = mock_integration(hass, MockModule("mod4", dependencies=["mod2", "mod3"]))
+    all_domains = {"mod1", "mod2", "mod3", "mod4"}
 
-    deps = await loader._async_component_dependencies(hass, mod_4)
-    assert deps == {"mod1", "mod2", "mod3", "mod4"}
+    deps = await loader._do_resolve_dependencies(mod_4, cache={})
+    assert deps == {"mod1", "mod2", "mod3"}
 
     # Create a circular dependency
     mock_integration(hass, MockModule("mod1", dependencies=["mod4"]))
     with pytest.raises(loader.CircularDependency):
-        await loader._async_component_dependencies(hass, mod_4)
+        await loader._do_resolve_dependencies(mod_4, cache={})
 
     # Create a different circular dependency
     mock_integration(hass, MockModule("mod1", dependencies=["mod3"]))
     with pytest.raises(loader.CircularDependency):
-        await loader._async_component_dependencies(hass, mod_4)
+        await loader._do_resolve_dependencies(mod_4, cache={})
 
     # Create a circular after_dependency
     mock_integration(
         hass, MockModule("mod1", partial_manifest={"after_dependencies": ["mod4"]})
     )
     with pytest.raises(loader.CircularDependency):
-        await loader._async_component_dependencies(hass, mod_4)
+        await loader._do_resolve_dependencies(
+            mod_4,
+            cache={},
+            possible_after_dependencies=all_domains,
+        )
 
     # Create a different circular after_dependency
     mock_integration(
         hass, MockModule("mod1", partial_manifest={"after_dependencies": ["mod3"]})
     )
     with pytest.raises(loader.CircularDependency):
-        await loader._async_component_dependencies(hass, mod_4)
+        await loader._do_resolve_dependencies(
+            mod_4,
+            cache={},
+            possible_after_dependencies=all_domains,
+        )
+
+    # Create a circular after_dependency without a hard dependency
+    mock_integration(
+        hass, MockModule("mod1", partial_manifest={"after_dependencies": ["mod4"]})
+    )
+    mod_4 = mock_integration(
+        hass, MockModule("mod4", partial_manifest={"after_dependencies": ["mod2"]})
+    )
+    with pytest.raises(loader.CircularDependency):
+        await loader._do_resolve_dependencies(
+            mod_4,
+            cache={},
+            possible_after_dependencies=all_domains,
+        )
+
+    result = await loader.resolve_integrations_after_dependencies(hass, (mod_4,))
+    assert result == {}
+    result = await loader.resolve_integrations_after_dependencies(
+        hass, (mod_4,), ignore_exceptions=True
+    )
+    assert result["mod4"] == {"mod4", "mod2", "mod1"}
 
 
 async def test_nonexistent_component_dependencies(hass: HomeAssistant) -> None:
     """Test if we can detect nonexistent dependencies of components."""
     mod_1 = mock_integration(hass, MockModule("mod1", dependencies=["nonexistent"]))
+    mod_2 = mock_integration(hass, MockModule("mod2", dependencies=["mod1"]))
+
+    assert await mod_2.resolve_dependencies() is None
+    assert mod_2.all_dependencies_resolved
     with pytest.raises(loader.IntegrationNotFound):
-        await loader._async_component_dependencies(hass, mod_1)
+        mod_2.all_dependencies  # noqa: B018
+
+    assert mod_1.all_dependencies_resolved
+    assert await mod_1.resolve_dependencies() is None
+    with pytest.raises(loader.IntegrationNotFound):
+        mod_1.all_dependencies  # noqa: B018
+
+    result = await loader.resolve_integrations_dependencies(hass, (mod_2, mod_1))
+    assert result == {}
+
+    mod_1 = mock_integration(
+        hass,
+        MockModule("mod1", partial_manifest={"after_dependencies": ["non.existent"]}),
+    )
+    mod_2 = mock_integration(hass, MockModule("mod2", dependencies=["mod1"]))
+
+    result = await loader.resolve_integrations_after_dependencies(hass, (mod_2, mod_1))
+    assert result == {}
 
 
 def test_component_loader(hass: HomeAssistant) -> None:
@@ -1314,7 +1364,6 @@ async def test_config_folder_not_in_path() -> None:
     ],
 )
 @pytest.mark.usefixtures("mock_integration_frame")
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
 async def test_hass_components_use_reported(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
@@ -2010,7 +2059,6 @@ async def test_has_services(hass: HomeAssistant) -> None:
     ],
 )
 @pytest.mark.usefixtures("mock_integration_frame")
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
 async def test_hass_helpers_use_reported(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
@@ -2039,3 +2087,59 @@ async def test_manifest_json_fragment_round_trip(hass: HomeAssistant) -> None:
         json_loads(json_dumps(integration.manifest_json_fragment))
         == integration.manifest
     )
+
+
+async def test_async_get_integrations_multiple_non_existent(
+    hass: HomeAssistant,
+) -> None:
+    """Test async_get_integrations with multiple non-existent integrations."""
+    integrations = await loader.async_get_integrations(hass, ["does_not_exist"])
+    assert isinstance(integrations["does_not_exist"], loader.IntegrationNotFound)
+
+    async def slow_load_failure(
+        *args: Any, **kwargs: Any
+    ) -> dict[str, loader.Integration]:
+        await asyncio.sleep(0.1)
+        return {}
+
+    with patch.object(hass, "async_add_executor_job", slow_load_failure):
+        task1 = hass.async_create_task(
+            loader.async_get_integrations(hass, ["does_not_exist", "does_not_exist2"])
+        )
+        # Task one should now be waiting for executor job
+    task2 = hass.async_create_task(
+        loader.async_get_integrations(hass, ["does_not_exist"])
+    )
+    # Task two should be waiting for the futures created in task one
+    task3 = hass.async_create_task(
+        loader.async_get_integrations(hass, ["does_not_exist2", "does_not_exist"])
+    )
+    # Task three should be waiting for the futures created in task one
+    integrations_1 = await task1
+    assert isinstance(integrations_1["does_not_exist"], loader.IntegrationNotFound)
+    assert isinstance(integrations_1["does_not_exist2"], loader.IntegrationNotFound)
+    integrations_2 = await task2
+    assert isinstance(integrations_2["does_not_exist"], loader.IntegrationNotFound)
+    integrations_3 = await task3
+    assert isinstance(integrations_3["does_not_exist2"], loader.IntegrationNotFound)
+    assert isinstance(integrations_3["does_not_exist"], loader.IntegrationNotFound)
+
+    # Make sure IntegrationNotFound is not cached
+    # so configuration errors can be fixed as to
+    # not prevent Home Assistant from being restarted
+    integration = loader.Integration(
+        hass,
+        "custom_components.does_not_exist",
+        None,
+        {
+            "name": "Does not exist",
+            "domain": "does_not_exist",
+        },
+    )
+    with patch.object(
+        loader,
+        "_resolve_integrations_from_root",
+        return_value={"does_not_exist": integration},
+    ):
+        integrations = await loader.async_get_integrations(hass, ["does_not_exist"])
+    assert integrations["does_not_exist"] is integration
diff --git a/tests/test_setup.py b/tests/test_setup.py
index 2d15c670cf7..bb221c7cb4c 100644
--- a/tests/test_setup.py
+++ b/tests/test_setup.py
@@ -363,20 +363,24 @@ async def test_component_failing_setup(hass: HomeAssistant) -> None:
 
 async def test_component_exception_setup(hass: HomeAssistant) -> None:
     """Test component that raises exception during setup."""
-    setup.async_set_domains_to_be_loaded(hass, {"comp"})
+    domain = "comp"
+    setup.async_set_domains_to_be_loaded(hass, {domain})
 
     def exception_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         """Raise exception."""
         raise Exception("fail!")  # noqa: TRY002
 
-    mock_integration(hass, MockModule("comp", setup=exception_setup))
+    mock_integration(hass, MockModule(domain, setup=exception_setup))
 
-    assert not await setup.async_setup_component(hass, "comp", {})
-    assert "comp" not in hass.config.components
+    assert not await setup.async_setup_component(hass, domain, {})
+    assert domain in hass.data[setup.DATA_SETUP]
+    assert domain not in hass.data[setup.DATA_SETUP_DONE]
+    assert domain not in hass.config.components
 
 
 async def test_component_base_exception_setup(hass: HomeAssistant) -> None:
     """Test component that raises exception during setup."""
+    domain = "comp"
     setup.async_set_domains_to_be_loaded(hass, {"comp"})
 
     def exception_setup(hass: HomeAssistant, config: ConfigType) -> bool:
@@ -389,7 +393,69 @@ async def test_component_base_exception_setup(hass: HomeAssistant) -> None:
         await setup.async_setup_component(hass, "comp", {})
     assert str(exc_info.value) == "fail!"
 
-    assert "comp" not in hass.config.components
+    assert domain in hass.data[setup.DATA_SETUP]
+    assert domain not in hass.data[setup.DATA_SETUP_DONE]
+    assert domain not in hass.config.components
+
+
+async def test_set_domains_to_be_loaded(hass: HomeAssistant) -> None:
+    """Test async_set_domains_to_be_loaded."""
+    domain_good = "comp_good"
+    domain_bad = "comp_bad"
+    domain_base_exception = "comp_base_exception"
+    domain_exception = "comp_exception"
+    domains = {domain_good, domain_bad, domain_exception, domain_base_exception}
+    setup.async_set_domains_to_be_loaded(hass, domains)
+
+    assert set(hass.data[setup.DATA_SETUP_DONE]) == domains
+    setup_done = dict(hass.data[setup.DATA_SETUP_DONE])
+
+    # Calling async_set_domains_to_be_loaded again should not create new futures
+    setup.async_set_domains_to_be_loaded(hass, domains)
+    assert setup_done == hass.data[setup.DATA_SETUP_DONE]
+
+    def good_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+        """Success."""
+        return True
+
+    def bad_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+        """Fail."""
+        return False
+
+    def base_exception_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+        """Raise exception."""
+        raise BaseException("fail!")  # noqa: TRY002
+
+    def exception_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+        """Raise exception."""
+        raise Exception("fail!")  # noqa: TRY002
+
+    mock_integration(hass, MockModule(domain_good, setup=good_setup))
+    mock_integration(hass, MockModule(domain_bad, setup=bad_setup))
+    mock_integration(
+        hass, MockModule(domain_base_exception, setup=base_exception_setup)
+    )
+    mock_integration(hass, MockModule(domain_exception, setup=exception_setup))
+
+    # Set up the four components
+    assert await setup.async_setup_component(hass, domain_good, {})
+    assert not await setup.async_setup_component(hass, domain_bad, {})
+    assert not await setup.async_setup_component(hass, domain_exception, {})
+    with pytest.raises(BaseException, match="fail!"):
+        await setup.async_setup_component(hass, domain_base_exception, {})
+
+    # Check the result of the setup
+    assert not hass.data[setup.DATA_SETUP_DONE]
+    assert set(hass.data[setup.DATA_SETUP]) == {
+        domain_bad,
+        domain_exception,
+        domain_base_exception,
+    }
+    assert set(hass.config.components) == {domain_good}
+
+    # Calling async_set_domains_to_be_loaded again should not create any new futures
+    setup.async_set_domains_to_be_loaded(hass, domains)
+    assert not hass.data[setup.DATA_SETUP_DONE]
 
 
 async def test_component_setup_with_validation_and_dependency(
diff --git a/tests/test_test_fixtures.py b/tests/test_test_fixtures.py
index 78f66ceb549..0b8fd20a7c0 100644
--- a/tests/test_test_fixtures.py
+++ b/tests/test_test_fixtures.py
@@ -1,6 +1,8 @@
 """Test test fixture configuration."""
 
+from collections.abc import Generator
 from http import HTTPStatus
+import pathlib
 import socket
 
 from aiohttp import web
@@ -9,8 +11,11 @@ import pytest_socket
 
 from homeassistant.components.http import HomeAssistantView
 from homeassistant.core import HomeAssistant, async_get_hass
+from homeassistant.helpers import translation
 from homeassistant.setup import async_setup_component
 
+from .common import MockModule, mock_integration
+from .conftest import evict_faked_translations
 from .typing import ClientSessionGenerator
 
 
@@ -70,3 +75,46 @@ async def test_aiohttp_client_frozen_router_view(
     assert response.status == HTTPStatus.OK
     result = await response.json()
     assert result["test"] is True
+
+
+async def test_evict_faked_translations_assumptions(hass: HomeAssistant) -> None:
+    """Test assumptions made when detecting translations for mocked integrations.
+
+    If this test fails, the evict_faked_translations may need to be updated.
+    """
+    integration = mock_integration(hass, MockModule("test"), built_in=True)
+    assert integration.file_path == pathlib.Path("")
+
+
+async def test_evict_faked_translations(hass: HomeAssistant, translations_once) -> None:
+    """Test the evict_faked_translations fixture."""
+    cache: translation._TranslationsCacheData = translations_once.kwargs["return_value"]
+    fake_domain = "test"
+    real_domain = "homeassistant"
+
+    # Evict the real domain from the cache in case it's been loaded before
+    cache.loaded["en"].discard(real_domain)
+
+    assert fake_domain not in cache.loaded["en"]
+    assert real_domain not in cache.loaded["en"]
+
+    # The evict_faked_translations fixture has module scope, so we set it up and
+    # tear it down manually
+    real_func = evict_faked_translations.__pytest_wrapped__.obj
+    gen: Generator = real_func(translations_once)
+
+    # Set up the evict_faked_translations fixture
+    next(gen)
+
+    mock_integration(hass, MockModule(fake_domain), built_in=True)
+    await translation.async_load_integrations(hass, {fake_domain, real_domain})
+    assert fake_domain in cache.loaded["en"]
+    assert real_domain in cache.loaded["en"]
+
+    # Tear down the evict_faked_translations fixture
+    with pytest.raises(StopIteration):
+        next(gen)
+
+    # The mock integration should be removed from the cache, the real domain should still be there
+    assert fake_domain not in cache.loaded["en"]
+    assert real_domain in cache.loaded["en"]
diff --git a/tests/testing_config/blueprints/template/test_event_sensor.yaml b/tests/testing_config/blueprints/template/test_event_sensor.yaml
new file mode 100644
index 00000000000..8b615eb90ba
--- /dev/null
+++ b/tests/testing_config/blueprints/template/test_event_sensor.yaml
@@ -0,0 +1,27 @@
+blueprint:
+  name: Create Sensor from Event
+  description: Creates a timestamp sensor from an event
+  domain: template
+  source_url: https://github.com/home-assistant/core/blob/dev/homeassistant/components/template/blueprints/event_sensor.yaml
+  input:
+    event_type:
+      name: Name of the event_type
+      description: The event_type for the event trigger
+      selector:
+        text:
+    event_data:
+      name: The data for the event
+      description: The event_data for the event trigger
+      selector:
+        object:
+trigger:
+  - trigger: event
+    event_type: !input event_type
+    event_data: !input event_data
+variables:
+  event_data: "{{ trigger.event.data }}"
+sensor:
+  state: "{{ now() }}"
+  device_class: timestamp
+  attributes:
+    data: "{{ event_data }}"
diff --git a/tests/util/test_async.py b/tests/util/test_async.py
index cfa78228f0c..e2310e6acd5 100644
--- a/tests/util/test_async.py
+++ b/tests/util/test_async.py
@@ -134,8 +134,10 @@ async def test_create_eager_task_312(hass: HomeAssistant) -> None:
 async def test_create_eager_task_from_thread(hass: HomeAssistant) -> None:
     """Test we report trying to create an eager task from a thread."""
 
+    coro = asyncio.sleep(0)
+
     def create_task():
-        hasync.create_eager_task(asyncio.sleep(0))
+        hasync.create_eager_task(coro)
 
     with pytest.raises(
         RuntimeError,
@@ -145,14 +147,19 @@ async def test_create_eager_task_from_thread(hass: HomeAssistant) -> None:
     ):
         await hass.async_add_executor_job(create_task)
 
+    # Avoid `RuntimeWarning: coroutine 'sleep' was never awaited`
+    await coro
+
 
 async def test_create_eager_task_from_thread_in_integration(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
     """Test we report trying to create an eager task from a thread."""
 
+    coro = asyncio.sleep(0)
+
     def create_task():
-        hasync.create_eager_task(asyncio.sleep(0))
+        hasync.create_eager_task(coro)
 
     frames = extract_stack_to_frame(
         [
@@ -200,6 +207,9 @@ async def test_create_eager_task_from_thread_in_integration(
         "self.light.is_on"
     ) in caplog.text
 
+    # Avoid `RuntimeWarning: coroutine 'sleep' was never awaited`
+    await coro
+
 
 async def test_get_scheduled_timer_handles(hass: HomeAssistant) -> None:
     """Test get_scheduled_timer_handles returns all scheduled timer handles."""
diff --git a/tests/util/test_logging.py b/tests/util/test_logging.py
index e5b85f35693..d213a68d7f2 100644
--- a/tests/util/test_logging.py
+++ b/tests/util/test_logging.py
@@ -6,6 +6,7 @@ import logging
 import queue
 from unittest.mock import patch
 
+from freezegun.api import FrozenDateTimeFactory
 import pytest
 
 from homeassistant.core import (
@@ -17,6 +18,13 @@ from homeassistant.core import (
 from homeassistant.util import logging as logging_util
 
 
+async def empty_log_queue() -> None:
+    """Empty the log queue."""
+    log_queue: queue.SimpleQueue = logging.root.handlers[0].queue
+    while not log_queue.empty():
+        await asyncio.sleep(0)
+
+
 async def test_logging_with_queue_handler() -> None:
     """Test logging with HomeAssistantQueueHandler."""
 
@@ -149,3 +157,115 @@ async def test_catch_log_exception_catches_and_logs() -> None:
     func("failure sync passed")
 
     assert saved_args == [("failure sync passed",)]
+
+
+@patch("homeassistant.util.logging.HomeAssistantQueueListener.MAX_LOGS_COUNT", 5)
+@pytest.mark.parametrize(
+    (
+        "logger1_count",
+        "logger1_expected_notices",
+        "logger2_count",
+        "logger2_expected_notices",
+    ),
+    [(4, 0, 0, 0), (5, 1, 1, 0), (11, 1, 5, 1), (20, 1, 20, 1)],
+)
+async def test_noisy_loggers(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    logger1_count: int,
+    logger1_expected_notices: int,
+    logger2_count: int,
+    logger2_expected_notices: int,
+) -> None:
+    """Test that noisy loggers all logged as warnings."""
+
+    logging_util.async_activate_log_queue_handler(hass)
+    logger1 = logging.getLogger("noisy1")
+    logger2 = logging.getLogger("noisy2.module")
+
+    for _ in range(logger1_count):
+        logger1.info("This is a log")
+
+    for _ in range(logger2_count):
+        logger2.info("This is another log")
+
+    await empty_log_queue()
+
+    assert (
+        caplog.text.count(
+            "Module noisy1 is logging too frequently. 5 messages since last count"
+        )
+        == logger1_expected_notices
+    )
+    assert (
+        caplog.text.count(
+            "Module noisy2.module is logging too frequently. 5 messages since last count"
+        )
+        == logger2_expected_notices
+    )
+
+    # close the handler so the queue thread stops
+    logging.root.handlers[0].close()
+
+
+@patch("homeassistant.util.logging.HomeAssistantQueueListener.MAX_LOGS_COUNT", 5)
+async def test_noisy_loggers_ignores_lower_than_info(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test that noisy loggers all logged as warnings, except for levels lower than INFO."""
+
+    logging_util.async_activate_log_queue_handler(hass)
+    logger = logging.getLogger("noisy_module")
+
+    for _ in range(5):
+        logger.debug("This is a log")
+
+    await empty_log_queue()
+    expected_warning = "Module noisy_module is logging too frequently"
+    assert caplog.text.count(expected_warning) == 0
+
+    logger.info("This is a log")
+    logger.info("This is a log")
+    logger.warning("This is a log")
+    logger.error("This is a log")
+    logger.critical("This is a log")
+
+    await empty_log_queue()
+    assert caplog.text.count(expected_warning) == 1
+
+    # close the handler so the queue thread stops
+    logging.root.handlers[0].close()
+
+
+@patch("homeassistant.util.logging.HomeAssistantQueueListener.MAX_LOGS_COUNT", 3)
+async def test_noisy_loggers_counters_reset(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test that noisy logger counters reset periodically."""
+
+    logging_util.async_activate_log_queue_handler(hass)
+    logger = logging.getLogger("noisy_module")
+
+    expected_warning = "Module noisy_module is logging too frequently"
+
+    # Do multiple iterations to ensure the reset is periodic
+    for _ in range(logging_util.HomeAssistantQueueListener.MAX_LOGS_COUNT * 2):
+        logger.info("This is log 0")
+        await empty_log_queue()
+
+        freezer.tick(
+            logging_util.HomeAssistantQueueListener.LOG_COUNTS_RESET_INTERVAL + 1
+        )
+
+        logger.info("This is log 1")
+        await empty_log_queue()
+        assert caplog.text.count(expected_warning) == 0
+
+    logger.info("This is log 2")
+    logger.info("This is log 3")
+    await empty_log_queue()
+    assert caplog.text.count(expected_warning) == 1
+    # close the handler so the queue thread stops
+    logging.root.handlers[0].close()
diff --git a/tests/util/test_unit_conversion.py b/tests/util/test_unit_conversion.py
index 1336364f4cb..3f55ceef242 100644
--- a/tests/util/test_unit_conversion.py
+++ b/tests/util/test_unit_conversion.py
@@ -18,6 +18,7 @@ from homeassistant.const import (
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
+    UnitOfEnergyDistance,
     UnitOfInformation,
     UnitOfLength,
     UnitOfMass,
@@ -43,6 +44,7 @@ from homeassistant.util.unit_conversion import (
     ElectricCurrentConverter,
     ElectricPotentialConverter,
     EnergyConverter,
+    EnergyDistanceConverter,
     InformationConverter,
     MassConverter,
     PowerConverter,
@@ -79,6 +81,7 @@ _ALL_CONVERTERS: dict[type[BaseUnitConverter], list[str | None]] = {
         SpeedConverter,
         TemperatureConverter,
         UnitlessRatioConverter,
+        EnergyDistanceConverter,
         VolumeConverter,
         VolumeFlowRateConverter,
     )
@@ -115,6 +118,11 @@ _GET_UNIT_RATIO: dict[type[BaseUnitConverter], tuple[str | None, str | None, flo
         1000,
     ),
     EnergyConverter: (UnitOfEnergy.WATT_HOUR, UnitOfEnergy.KILO_WATT_HOUR, 1000),
+    EnergyDistanceConverter: (
+        UnitOfEnergyDistance.MILES_PER_KILO_WATT_HOUR,
+        UnitOfEnergyDistance.KM_PER_KILO_WATT_HOUR,
+        0.621371,
+    ),
     InformationConverter: (UnitOfInformation.BITS, UnitOfInformation.BYTES, 8),
     MassConverter: (UnitOfMass.STONES, UnitOfMass.KILOGRAMS, 0.157473),
     PowerConverter: (UnitOfPower.WATT, UnitOfPower.KILO_WATT, 1000),
@@ -486,6 +494,38 @@ _CONVERTED_VALUE: dict[
         (10, UnitOfEnergy.GIGA_CALORIE, 10000, UnitOfEnergy.MEGA_CALORIE),
         (10, UnitOfEnergy.GIGA_CALORIE, 11.622222, UnitOfEnergy.MEGA_WATT_HOUR),
     ],
+    EnergyDistanceConverter: [
+        (
+            10,
+            UnitOfEnergyDistance.KILO_WATT_HOUR_PER_100_KM,
+            6.213712,
+            UnitOfEnergyDistance.MILES_PER_KILO_WATT_HOUR,
+        ),
+        (
+            25,
+            UnitOfEnergyDistance.KILO_WATT_HOUR_PER_100_KM,
+            4,
+            UnitOfEnergyDistance.KM_PER_KILO_WATT_HOUR,
+        ),
+        (
+            20,
+            UnitOfEnergyDistance.MILES_PER_KILO_WATT_HOUR,
+            3.106856,
+            UnitOfEnergyDistance.KILO_WATT_HOUR_PER_100_KM,
+        ),
+        (
+            10,
+            UnitOfEnergyDistance.MILES_PER_KILO_WATT_HOUR,
+            16.09344,
+            UnitOfEnergyDistance.KM_PER_KILO_WATT_HOUR,
+        ),
+        (
+            16.09344,
+            UnitOfEnergyDistance.KM_PER_KILO_WATT_HOUR,
+            10,
+            UnitOfEnergyDistance.MILES_PER_KILO_WATT_HOUR,
+        ),
+    ],
     InformationConverter: [
         (8e3, UnitOfInformation.BITS, 8, UnitOfInformation.KILOBITS),
         (8e6, UnitOfInformation.BITS, 8, UnitOfInformation.MEGABITS),
@@ -862,8 +902,8 @@ def test_convert_nonnumeric_value(
     ("converter", "from_unit", "to_unit", "expected"),
     [
         # Process all items in _GET_UNIT_RATIO
-        (converter, item[0], item[1], item[2])
-        for converter, item in _GET_UNIT_RATIO.items()
+        (converter, from_unit, to_unit, expected)
+        for converter, (from_unit, to_unit, expected) in _GET_UNIT_RATIO.items()
     ],
 )
 def test_get_unit_ratio(
@@ -875,13 +915,34 @@ def test_get_unit_ratio(
     assert converter.get_unit_ratio(to_unit, from_unit) == pytest.approx(1 / ratio)
 
 
+@pytest.mark.parametrize(
+    ("converter", "from_unit", "to_unit", "expected"),
+    [
+        # Process all items in _GET_UNIT_RATIO
+        (converter, from_unit, to_unit, expected)
+        for converter, (from_unit, to_unit, expected) in _GET_UNIT_RATIO.items()
+    ],
+)
+def get_unit_floored_log_ratio(
+    converter: type[BaseUnitConverter], from_unit: str, to_unit: str, expected: float
+) -> None:
+    """Test floored log unit ratio.
+
+    Should not use pytest.approx since we are checking these
+    values are exact.
+    """
+    ratio = converter.get_unit_floored_log_ratio(from_unit, to_unit)
+    assert ratio == expected
+    assert converter.get_unit_floored_log_ratio(to_unit, from_unit) == 1 / ratio
+
+
 @pytest.mark.parametrize(
     ("converter", "value", "from_unit", "expected", "to_unit"),
     [
         # Process all items in _CONVERTED_VALUE
-        (converter, list_item[0], list_item[1], list_item[2], list_item[3])
+        (converter, value, from_unit, expected, to_unit)
         for converter, item in _CONVERTED_VALUE.items()
-        for list_item in item
+        for value, from_unit, expected, to_unit in item
     ],
 )
 def test_unit_conversion(
diff --git a/tests/util/yaml/test_init.py b/tests/util/yaml/test_init.py
index 0346e21044f..dacbd2c1247 100644
--- a/tests/util/yaml/test_init.py
+++ b/tests/util/yaml/test_init.py
@@ -374,7 +374,7 @@ def test_include_dir_merge_named_recursive(mock_walk: Mock) -> None:
         }
 
 
-@patch("homeassistant.util.yaml.loader.open", create=True)
+@patch("annotatedyaml.loader.open", create=True)
 @pytest.mark.usefixtures("try_both_loaders")
 def test_load_yaml_encoding_error(mock_open: Mock) -> None:
     """Test raising a UnicodeDecodeError."""
@@ -598,7 +598,7 @@ def test_load_yaml_wrap_oserror(
 ) -> None:
     """Test load_yaml wraps OSError in HomeAssistantError."""
     with (
-        patch("homeassistant.util.yaml.loader.open", side_effect=open_exception),
+        patch("annotatedyaml.loader.open", side_effect=open_exception),
         pytest.raises(load_yaml_exception),
     ):
         yaml_loader.load_yaml("bla")